From ce38e64ee73b7339f5aaff07a52fa1dd48f59133 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Tue, 17 Mar 2026 15:43:07 -0700
Subject: [PATCH 001/298] Add release notes for 7.0 (#4053)

---
 .github/prompts/release-notes.prompt.md       |   4 +
 CHANGELOG.md                                  | 131 ++++++
 release-notes/7.0/7.0.0.md                    | 410 ++++++++++++++++++
 release-notes/7.0/README.md                   |   1 +
 .../Extensions/Abstractions/1.0/1.0.0.md      |  30 ++
 .../Extensions/Abstractions/1.0/README.md     |   1 +
 release-notes/Extensions/Azure/1.0/1.0.0.md   |  66 +++
 release-notes/Extensions/Azure/1.0/README.md  |   1 +
 .../Extensions/Logging/1.0/README.md          |   3 +
 release-notes/Internal/Logging/1.0/1.0.0.md   |  37 ++
 release-notes/Internal/Logging/1.0/README.md  |  11 +
 release-notes/README.md                       |  11 +-
 .../AzureKeyVaultProvider/7.0/7.0.0.md        |  54 +++
 .../AzureKeyVaultProvider/7.0/README.md       |   1 +
 14 files changed, 756 insertions(+), 5 deletions(-)
 create mode 100644 release-notes/7.0/7.0.0.md
 create mode 100644 release-notes/Extensions/Abstractions/1.0/1.0.0.md
 create mode 100644 release-notes/Extensions/Azure/1.0/1.0.0.md
 create mode 100644 release-notes/Internal/Logging/1.0/1.0.0.md
 create mode 100644 release-notes/Internal/Logging/1.0/README.md
 create mode 100644 release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.0.md

diff --git a/.github/prompts/release-notes.prompt.md b/.github/prompts/release-notes.prompt.md
index ca03933236..55cc7785e2 100644
--- a/.github/prompts/release-notes.prompt.md
+++ b/.github/prompts/release-notes.prompt.md
@@ -86,6 +86,10 @@ For each package that has relevant PRs in the milestone:
    - Look up dependencies using the Dependency Sources from the lookup table above. Resolve concrete versions from [Directory.Packages.props](Directory.Packages.props).
    - List dependencies per target framework. Use the project file's `<TargetFrameworks>` to determine which frameworks to list.
    - Omit the Contributors section for packages with no public contributors.
+   - **GA releases (all packages):** When the release is a stable (non-preview) version, structure the notes with two sections:
+     1. **"Changes Since [last preview]"** — only the delta since the most recent preview of this package.
+     2. **"Cumulative Changes Since [last stable]"** — all changes since the last stable release of this package, synthesized from all preview release notes plus the GA milestone. This applies to every package (MDS, AKV, Extensions.Azure, Abstractions, Internal.Logging, etc.), not just the core driver. Apply the cross-referencing from Step 3 to eliminate items already shipped in prior stable patch releases.
+   - **Preview releases:** Only include the delta since the previous release (preview or stable). No cumulative section is needed.
 
 3. **Create or update the version README** at `<Directory>/README.md`. Follow the existing format — see [release-notes/add-ons/AzureKeyVaultProvider/6.1/README.md](release-notes/add-ons/AzureKeyVaultProvider/6.1/README.md) for reference:
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc51c7d2bc..fedf1ad568 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,137 @@ 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 7.0.0] - 2026-03-17
+
+This section summarizes all changes across the 7.0 preview cycle for users upgrading from the latest 6.1 stable release.
+See the [full release notes](release-notes/7.0/7.0.0.md) for detailed descriptions.
+
+Also released as part of this milestone:
+- Released Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0. See [release notes](release-notes/Extensions/Abstractions/1.0/1.0.0.md).
+- Released Microsoft.Data.SqlClient.Extensions.Azure 1.0.0. See [release notes](release-notes/Extensions/Azure/1.0/1.0.0.md).
+- Released Microsoft.Data.SqlClient.Internal.Logging 1.0.0. See [release notes](release-notes/Internal/Logging/1.0/1.0.0.md).
+- Released Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 7.0.0. See [release notes](release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.0.md).
+
+### Changed
+
+- **Breaking:** Removed Azure dependencies from the core package. Entra ID authentication (`ActiveDirectoryAuthenticationProvider` and related types) has been extracted into a new `Microsoft.Data.SqlClient.Extensions.Azure` package. The core `Microsoft.Data.SqlClient` package no longer depends on `Azure.Core`, `Azure.Identity`, or their transitive dependencies. Applications using Entra ID authentication must now install `Microsoft.Data.SqlClient.Extensions.Azure` separately.
+  ([#1108](https://github.com/dotnet/SqlClient/issues/1108),
+   [#3680](https://github.com/dotnet/SqlClient/pull/3680),
+   [#3902](https://github.com/dotnet/SqlClient/pull/3902),
+   [#3904](https://github.com/dotnet/SqlClient/pull/3904),
+   [#3908](https://github.com/dotnet/SqlClient/pull/3908),
+   [#3917](https://github.com/dotnet/SqlClient/pull/3917),
+   [#3982](https://github.com/dotnet/SqlClient/pull/3982),
+   [#3978](https://github.com/dotnet/SqlClient/pull/3978),
+   [#3986](https://github.com/dotnet/SqlClient/pull/3986))
+
+- Two additional packages were introduced to support this separation: `Microsoft.Data.SqlClient.Extensions.Abstractions` (shared types between the core driver and extensions) and `Microsoft.Data.SqlClient.Internal.Logging` (shared ETW tracing infrastructure).
+  ([#3626](https://github.com/dotnet/SqlClient/pull/3626),
+   [#3628](https://github.com/dotnet/SqlClient/pull/3628),
+   [#3967](https://github.com/dotnet/SqlClient/pull/3967),
+   [#4038](https://github.com/dotnet/SqlClient/pull/4038))
+
+- Deprecated `SqlAuthenticationMethod.ActiveDirectoryPassword` (ROPC flow). The method is now marked `[Obsolete]` and will generate compiler warnings. Migrate to `ActiveDirectoryInteractive`, `ActiveDirectoryServicePrincipal`, `ActiveDirectoryManagedIdentity`, or `ActiveDirectoryDefault`.
+  ([#3671](https://github.com/dotnet/SqlClient/pull/3671))
+
+- Reverted public visibility of internal interop enums (`IoControlCodeAccess` and `IoControlTransferType`) that were accidentally made public during the project merge.
+  ([#3900](https://github.com/dotnet/SqlClient/pull/3900))
+
+- Removed `Constrained Execution Region` error handling blocks and associated `SqlConnection` cleanup.
+  ([#3535](https://github.com/dotnet/SqlClient/pull/3535))
+
+- Performance improvements across SqlStatistics timing, Always Encrypted scenarios, and connection opening:
+  ([#3609](https://github.com/dotnet/SqlClient/pull/3609),
+   [#3612](https://github.com/dotnet/SqlClient/pull/3612),
+   [#3732](https://github.com/dotnet/SqlClient/pull/3732),
+   [#3660](https://github.com/dotnet/SqlClient/pull/3660),
+   [#3791](https://github.com/dotnet/SqlClient/pull/3791),
+   [#3772](https://github.com/dotnet/SqlClient/pull/3772),
+   [#3554](https://github.com/dotnet/SqlClient/pull/3554))
+
+- Allow `SqlBulkCopy` to operate on hidden columns.
+  ([#3590](https://github.com/dotnet/SqlClient/pull/3590))
+
+- Updated UserAgent feature to use a pipe-delimited format, replacing the previous JSON format.
+  ([#3826](https://github.com/dotnet/SqlClient/pull/3826))
+
+- Minor improvements to Managed SNI tracing to capture continuation events and errors.
+  ([#3859](https://github.com/dotnet/SqlClient/pull/3859))
+
+### Added
+
+- Added `SspiContextProvider` abstract class and `SqlConnection.SspiContextProvider` property, enabling custom SSPI authentication for scenarios like cross-domain Kerberos negotiation and NTLM username/password authentication.
+  ([#2253](https://github.com/dotnet/SqlClient/issues/2253),
+   [#2494](https://github.com/dotnet/SqlClient/pull/2494))
+
+- Continued refinement of packet multiplexing with bug fixes and stability improvements, plus new app context switches for opt-in control.
+  ([#3534](https://github.com/dotnet/SqlClient/pull/3534),
+   [#3537](https://github.com/dotnet/SqlClient/pull/3537),
+   [#3605](https://github.com/dotnet/SqlClient/pull/3605))
+
+- Added support for enhanced routing, a TDS feature that allows the server to redirect connections to a specific server and database during login, enabling Azure SQL Hyperscale read replica load balancing.
+  ([#3641](https://github.com/dotnet/SqlClient/issues/3641),
+   [#3969](https://github.com/dotnet/SqlClient/pull/3969),
+   [#3970](https://github.com/dotnet/SqlClient/pull/3970),
+   [#3973](https://github.com/dotnet/SqlClient/pull/3973))
+
+- Updated pipelines and test suites to compile the driver using the .NET 10 SDK.
+  ([#3686](https://github.com/dotnet/SqlClient/pull/3686))
+
+- Added `SqlConfigurableRetryFactory.BaselineTransientErrors` static property exposing the default transient error codes list as a `ReadOnlyCollection<int>`.
+  ([#3903](https://github.com/dotnet/SqlClient/pull/3903))
+
+- Added app context switch `Switch.Microsoft.Data.SqlClient.EnableMultiSubnetFailoverByDefault` to set `MultiSubnetFailover=true` globally without modifying connection strings.
+  ([#3841](https://github.com/dotnet/SqlClient/pull/3841))
+
+- Added app context switch `Switch.Microsoft.Data.SqlClient.IgnoreServerProvidedFailoverPartner` to let the client ignore server-provided failover partner info in Basic Availability Groups.
+  ([#3625](https://github.com/dotnet/SqlClient/pull/3625))
+
+- Enabled `SqlClientDiagnosticListener` for `SqlCommand` on .NET Framework, closing a long-standing observability gap where diagnostic events were previously only available on .NET Core.
+  ([#3658](https://github.com/dotnet/SqlClient/pull/3658))
+
+- Brought the 15 strongly-typed diagnostic event classes in the `Microsoft.Data.SqlClient.Diagnostics` namespace (e.g., `SqlClientCommandBefore`, `SqlClientConnectionOpenAfter`, `SqlClientTransactionCommitError`) to .NET Framework as part of the codebase merge. These types were originally introduced for .NET Core in 6.0.
+  ([#3493](https://github.com/dotnet/SqlClient/pull/3493))
+
+- Enabled User Agent Feature Extension (opt-in via `Switch.Microsoft.Data.SqlClient.EnableUserAgent`).
+  ([#3606](https://github.com/dotnet/SqlClient/pull/3606))
+
+- Added actionable error message when Entra ID authentication methods are used without the `Microsoft.Data.SqlClient.Extensions.Azure` package installed.
+  ([#3962](https://github.com/dotnet/SqlClient/issues/3962),
+   [#4046](https://github.com/dotnet/SqlClient/pull/4046))
+
+### Fixed
+
+- Fixed a connection performance regression where SPN generation was triggered for non-integrated authentication modes (e.g., SQL authentication) on the native SNI path.
+  ([#3929](https://github.com/dotnet/SqlClient/pull/3929))
+
+- Fixed `ExecuteScalar` to propagate errors when the server sends data followed by an error token.
+  ([#3912](https://github.com/dotnet/SqlClient/pull/3912))
+
+- Fixed `NullReferenceException` in `SqlDataAdapter` when processing batch scenarios.
+  ([#3857](https://github.com/dotnet/SqlClient/pull/3857))
+
+- Fixed reading of multiple app context switches from a single `AppContextSwitchOverrides` configuration field.
+  ([#3960](https://github.com/dotnet/SqlClient/pull/3960))
+
+- Fixed an edge case in `TdsParserStateObject.TryReadPlpBytes` where zero-length reads returned `null` instead of an empty array.
+  ([#3872](https://github.com/dotnet/SqlClient/pull/3872))
+
+- Fixed issue where extra connection deactivation was occurring.
+  ([#3758](https://github.com/dotnet/SqlClient/pull/3758))
+
+- Fixed debug assertion in connection pool (no impact to production code).
+  ([#3587](https://github.com/dotnet/SqlClient/pull/3587))
+
+- Prevented uninitialized performance counters escaping `CreatePerformanceCounters`.
+  ([#3623](https://github.com/dotnet/SqlClient/pull/3623))
+
+- Fixed `SetProvider` to return immediately if user-defined authentication provider found.
+  ([#3620](https://github.com/dotnet/SqlClient/pull/3620))
+
+- Fixed connection pool concurrency issue.
+  ([#3632](https://github.com/dotnet/SqlClient/pull/3632))
+
 ## [Preview Release 7.0.0-preview4.26064.3] - 2026-03-05
 
 This update brings the below changes over the previous preview release:
diff --git a/release-notes/7.0/7.0.0.md b/release-notes/7.0/7.0.0.md
new file mode 100644
index 0000000000..f62178076b
--- /dev/null
+++ b/release-notes/7.0/7.0.0.md
@@ -0,0 +1,410 @@
+# Release Notes
+
+## Stable Release 7.0.0 - 2026-03-17
+
+This is the general availability release of **Microsoft.Data.SqlClient 7.0**, a major milestone for the .NET data provider for SQL Server. This release addresses the most upvoted issue in the repository's history — extracting Azure dependencies from the core package — introduces pluggable SSPI authentication, adds enhanced routing for Azure SQL Hyperscale, and delivers async read performance improvements.
+
+Also released as part of this milestone:
+- Released Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0. See [release notes](../Extensions/Abstractions/1.0/1.0.0.md).
+- Released Microsoft.Data.SqlClient.Extensions.Azure 1.0.0. See [release notes](../Extensions/Azure/1.0/1.0.0.md).
+- Released Microsoft.Data.SqlClient.Internal.Logging 1.0.0. See [release notes](../Internal/Logging/1.0/1.0.0.md).
+- Released Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 7.0.0. See [release notes](../add-ons/AzureKeyVaultProvider/7.0/7.0.0.md).
+
+## Changes Since [7.0.0-preview4](7.0.0-preview4.md)
+
+### Added
+
+- Added actionable error message when Entra ID authentication methods are used without the `Microsoft.Data.SqlClient.Extensions.Azure` package installed, guiding users to install the correct package.
+  ([#3962](https://github.com/dotnet/SqlClient/issues/3962),
+   [#4046](https://github.com/dotnet/SqlClient/pull/4046))
+
+- Added Azure authentication sample application.
+  ([#3988](https://github.com/dotnet/SqlClient/pull/3988))
+
+### Changed
+
+#### Other changes
+
+- Renamed the `Microsoft.Data.SqlClient.Extensions.Logging` package to `Microsoft.Data.SqlClient.Internal.Logging` to indicate it is for internal use only and should not be referenced directly by application code.
+  ([#4038](https://github.com/dotnet/SqlClient/pull/4038))
+
+- Fixed non-localized exception strings.
+  ([#4022](https://github.com/dotnet/SqlClient/pull/4022))
+
+- Codebase merge and cleanup:
+  ([#3997](https://github.com/dotnet/SqlClient/pull/3997),
+   [#4052](https://github.com/dotnet/SqlClient/pull/4052))
+
+- Various test improvements:
+  ([#3891](https://github.com/dotnet/SqlClient/pull/3891),
+   [#3996](https://github.com/dotnet/SqlClient/pull/3996),
+   [#4002](https://github.com/dotnet/SqlClient/pull/4002),
+   [#4034](https://github.com/dotnet/SqlClient/pull/4034),
+   [#4041](https://github.com/dotnet/SqlClient/pull/4041),
+   [#4044](https://github.com/dotnet/SqlClient/pull/4044))
+
+- Documentation improvements (including Entra ID branding updates):
+  ([#4021](https://github.com/dotnet/SqlClient/pull/4021),
+   [#4047](https://github.com/dotnet/SqlClient/pull/4047),
+   [#4049](https://github.com/dotnet/SqlClient/pull/4049))
+
+- Updated Dependencies
+  ([#4045](https://github.com/dotnet/SqlClient/pull/4045)):
+  - Updated `Azure.Core` to v1.51.1
+  - Updated `Azure.Identity` to v1.18.0
+  - Updated `Azure.Security.KeyVault.Keys` to v4.9.0
+  - Updated `Microsoft.Extensions.Caching.Memory` to v9.0.13 (.NET 9.0)
+  - Updated `Microsoft.IdentityModel.JsonWebTokens` to v8.16.0
+  - Updated `Microsoft.IdentityModel.Protocols.OpenIdConnect` to v8.16.0
+  - Updated `Microsoft.Bcl.Cryptography` to v9.0.13 (.NET 9.0)
+  - Updated `System.Configuration.ConfigurationManager` to v9.0.13 (.NET 9.0)
+  - Updated `System.Diagnostics.DiagnosticSource` to v10.0.3
+  - Updated `System.Security.Cryptography.Pkcs` to v9.0.13 (.NET 9.0)
+  - Updated `System.Text.Json` to v10.0.3
+  - Updated `System.Threading.Channels` to v10.0.3
+  - Updated `System.ValueTuple` to v4.6.2
+
+## Cumulative Changes Since [6.1](../6.1/README.md)
+
+This section summarizes all changes across the 7.0 preview cycle for users upgrading from the latest 6.1 stable release.
+
+### Changed
+
+#### Azure Dependencies Removed from Core Package
+
+*What Changed:*
+
+- The core `Microsoft.Data.SqlClient` package no longer depends on `Azure.Core`, `Azure.Identity`, or their transitive dependencies (e.g., `Microsoft.Identity.Client`, `Microsoft.Web.WebView2`). Azure Active Directory / Entra ID authentication functionality (`ActiveDirectoryAuthenticationProvider` and related types) has been extracted into a new `Microsoft.Data.SqlClient.Extensions.Azure` package.
+  ([#1108](https://github.com/dotnet/SqlClient/issues/1108),
+   [#3680](https://github.com/dotnet/SqlClient/pull/3680),
+   [#3902](https://github.com/dotnet/SqlClient/pull/3902),
+   [#3904](https://github.com/dotnet/SqlClient/pull/3904),
+   [#3908](https://github.com/dotnet/SqlClient/pull/3908),
+   [#3917](https://github.com/dotnet/SqlClient/pull/3917),
+   [#3982](https://github.com/dotnet/SqlClient/pull/3982),
+   [#3978](https://github.com/dotnet/SqlClient/pull/3978),
+   [#3986](https://github.com/dotnet/SqlClient/pull/3986))
+- Two additional packages were introduced to support this separation: `Microsoft.Data.SqlClient.Extensions.Abstractions` (shared types between the core driver and extensions) and `Microsoft.Data.SqlClient.Internal.Logging` (shared ETW tracing infrastructure).
+  ([#3626](https://github.com/dotnet/SqlClient/pull/3626),
+   [#3628](https://github.com/dotnet/SqlClient/pull/3628),
+   [#3967](https://github.com/dotnet/SqlClient/pull/3967),
+   [#4038](https://github.com/dotnet/SqlClient/pull/4038))
+
+*Who Benefits:*
+
+- All users benefit from a significantly lighter core package. Previously, the Azure dependency chain pulled in numerous assemblies even for applications that only needed basic SQL Server connectivity. This was the [most upvoted open issue](https://github.com/dotnet/SqlClient/issues/1108) in the repository.
+- Users who do not use Entra ID authentication no longer carry Azure-related assemblies in their build output.
+- Users who do use Entra ID authentication can now manage Azure dependency versions independently from the core driver.
+
+*Impact:*
+
+- Applications using Entra ID authentication (e.g., `ActiveDirectoryInteractive`, `ActiveDirectoryDefault`, `ActiveDirectoryManagedIdentity`, etc.) must now install the `Microsoft.Data.SqlClient.Extensions.Azure` NuGet package separately:
+
+```
+dotnet add package Microsoft.Data.SqlClient.Extensions.Azure
+```
+
+- No code changes are required beyond adding the package reference.
+- If an Entra ID authentication method is used without the Azure package installed, the driver now provides an actionable error message guiding users to install the correct package.
+
+### Added
+
+#### Pluggable Authentication with SspiContextProvider
+
+*What Changed:*
+
+- Added a public `SspiContextProvider` property on `SqlConnection`, completing the SSPI extensibility work begun in 6.1.0. Applications can now supply a custom SSPI context provider for integrated authentication, enabling custom Kerberos ticket negotiation and NTLM username/password authentication scenarios.
+  ([#2253](https://github.com/dotnet/SqlClient/issues/2253),
+   [#2494](https://github.com/dotnet/SqlClient/pull/2494))
+
+*Who Benefits:*
+
+- Users authenticating across untrusted domains, non-domain-joined machines, or cross-platform environments where configuring integrated authentication is difficult.
+- Users running in containers who need manual Kerberos negotiation without deploying sidecars or external ticket-refresh mechanisms.
+- Users who need NTLM username/password authentication to SQL Server, which the driver does not provide natively.
+
+*Impact:*
+
+- Applications can set a custom `SspiContextProvider` on `SqlConnection` before opening the connection:
+
+```c#
+var connection = new SqlConnection(connectionString);
+connection.SspiContextProvider = new MyKerberosProvider();
+connection.Open();
+```
+
+- The provider handles the authentication token exchange during integrated authentication. Existing authentication behavior is unchanged when no custom provider is set. See [SspiContextProvider_CustomProvider.cs](../../doc/samples/SspiContextProvider_CustomProvider.cs) for a sample implementation.
+- **Note:** The `SspiContextProvider` is part of the connection pool key. Care should be taken when using this property to ensure the implementation returns a stable identity per resource.
+
+#### Async Read Performance: Packet Multiplexing (Preview)
+
+*What Changed:*
+
+- Continued refinement of packet multiplexing with bug fixes and stability improvements since 6.1.0, plus new app context switches for opt-in control.
+  ([#3534](https://github.com/dotnet/SqlClient/pull/3534),
+   [#3537](https://github.com/dotnet/SqlClient/pull/3537),
+   [#3605](https://github.com/dotnet/SqlClient/pull/3605))
+
+*Who Benefits:*
+
+- Applications performing large async reads (`ExecuteReaderAsync` with big result sets, streaming scenarios, or bulk data retrieval).
+
+*Impact:*
+
+- Packet multiplexing ships behind two opt-in feature switches:
+
+```c#
+AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.UseCompatibilityAsyncBehaviour", false);
+AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.UseCompatibilityProcessSni", false);
+```
+
+- Setting both switches to `false` enables the new async processing path. By default, the driver uses the existing (compatible) behavior.
+
+#### Enhanced Routing Support
+
+*What Changed:*
+
+- Added support for enhanced routing, a TDS feature that allows the server to redirect connections to a specific server *and* database during login.
+  ([#3641](https://github.com/dotnet/SqlClient/issues/3641),
+   [#3969](https://github.com/dotnet/SqlClient/pull/3969),
+   [#3970](https://github.com/dotnet/SqlClient/pull/3970),
+   [#3973](https://github.com/dotnet/SqlClient/pull/3973))
+
+*Who Benefits:*
+
+- Users connecting to Azure SQL Hyperscale environments that use named read replicas and gateway-based load balancing.
+
+*Impact:*
+
+- Enhanced routing is negotiated automatically during login when the server supports it. No application code changes are required.
+
+#### Support for .NET 10
+
+*What Changed:*
+
+- Updated pipelines and test suites to compile the driver using the .NET 10 SDK.
+  ([#3686](https://github.com/dotnet/SqlClient/pull/3686))
+
+*Who Benefits:*
+
+- Developers targeting .NET 10 on day one.
+
+*Impact:*
+
+- SqlClient 7.0 compiles and tests against .NET 10, ensuring compatibility.
+
+#### Strongly-Typed Diagnostic Events on .NET Framework
+
+*What Changed:*
+
+- Enabled `SqlClientDiagnosticListener` for `SqlCommand` on .NET Framework, closing a long-standing observability gap where diagnostic events were previously only emitted on .NET Core.
+  ([#3658](https://github.com/dotnet/SqlClient/pull/3658))
+
+- Brought the 15 strongly-typed diagnostic event classes in the `Microsoft.Data.SqlClient.Diagnostics` namespace — originally introduced for .NET Core in 6.0 — to .NET Framework as part of the codebase merge. Both platforms now use the same strongly-typed event model. The types cover command, connection, and transaction lifecycle events:
+  - `SqlClientCommandBefore`, `SqlClientCommandAfter`, `SqlClientCommandError`
+  - `SqlClientConnectionOpenBefore`, `SqlClientConnectionOpenAfter`, `SqlClientConnectionOpenError`
+  - `SqlClientConnectionCloseBefore`, `SqlClientConnectionCloseAfter`, `SqlClientConnectionCloseError`
+  - `SqlClientTransactionCommitBefore`, `SqlClientTransactionCommitAfter`, `SqlClientTransactionCommitError`
+  - `SqlClientTransactionRollbackBefore`, `SqlClientTransactionRollbackAfter`, `SqlClientTransactionRollbackError`
+
+  ([#3493](https://github.com/dotnet/SqlClient/pull/3493))
+
+*Who Benefits:*
+
+- .NET Framework users subscribing to `SqlClientDiagnosticListener` events for observability, distributed tracing, or custom telemetry. These users now have parity with .NET Core, gaining IntelliSense, compile-time safety, and eliminating the need to access diagnostic payloads via reflection or dictionary lookups.
+
+*Impact:*
+
+- On .NET Framework, `SqlCommand` now emits the same diagnostic events that were previously only available on .NET Core. Subscribers to `DiagnosticListener` events (e.g., `Microsoft.Data.SqlClient.WriteCommandBefore`) receive the strongly-typed objects:
+
+```c#
+listener.Subscribe(new Observer<KeyValuePair<string, object?>>(kvp =>
+{
+    if (kvp.Value is SqlClientCommandBefore before)
+    {
+        Console.WriteLine($"Executing: {before.Command.CommandText}");
+    }
+}));
+```
+
+- The types implement `IReadOnlyList<KeyValuePair<string, object>>` for backward compatibility with code that iterates properties generically.
+
+#### Other Additions
+
+- Added `SqlConfigurableRetryFactory.BaselineTransientErrors` static property exposing the default transient error codes list as a `ReadOnlyCollection<int>`, making it easier to extend the default list with application-specific error codes.
+  ([#3903](https://github.com/dotnet/SqlClient/pull/3903))
+
+- Added app context switch `Switch.Microsoft.Data.SqlClient.EnableMultiSubnetFailoverByDefault` to set `MultiSubnetFailover=true` globally without modifying connection strings.
+  ([#3841](https://github.com/dotnet/SqlClient/pull/3841))
+
+- Added app context switch `Switch.Microsoft.Data.SqlClient.IgnoreServerProvidedFailoverPartner` to let the client ignore server-provided failover partner info in Basic Availability Groups.
+  ([#3625](https://github.com/dotnet/SqlClient/pull/3625))
+
+- Enabled User Agent Feature Extension (opt-in via `Switch.Microsoft.Data.SqlClient.EnableUserAgent`).
+  ([#3606](https://github.com/dotnet/SqlClient/pull/3606))
+
+### Changed
+
+#### Deprecation of `SqlAuthenticationMethod.ActiveDirectoryPassword`
+
+*What Changed:*
+
+- `SqlAuthenticationMethod.ActiveDirectoryPassword` (the ROPC flow) is now marked `[Obsolete]` and will generate compiler warnings. This aligns with Microsoft's move toward [mandatory multifactor authentication](https://learn.microsoft.com/entra/identity/authentication/concept-mandatory-multifactor-authentication).
+  ([#3671](https://github.com/dotnet/SqlClient/pull/3671))
+
+*Who Benefits:*
+
+- Teams moving toward stronger, passwordless or MFA-compliant authentication.
+
+*Impact:*
+
+- If you use `Authentication=Active Directory Password`, migrate to a supported alternative:
+
+| Scenario | Recommended Authentication |
+|----------|---------------------------|
+| Interactive / desktop apps | `Active Directory Interactive` |
+| Service-to-service | `Active Directory Service Principal` |
+| Azure-hosted workloads | `Active Directory Managed Identity` |
+| Developer / CI environments | `Active Directory Default` |
+
+- See [Connect to Azure SQL with Microsoft Entra authentication](https://learn.microsoft.com/sql/connect/ado-net/sql/azure-active-directory-authentication) for more information.
+
+#### Breaking Changes
+
+- Reverted public visibility of internal interop enums (`IoControlCodeAccess` and `IoControlTransferType`) that were accidentally made public during the project merge.
+  ([#3900](https://github.com/dotnet/SqlClient/pull/3900))
+
+#### Other Changes
+
+- Removed `Constrained Execution Region` error handling blocks and associated `SqlConnection` cleanup.
+  ([#3535](https://github.com/dotnet/SqlClient/pull/3535))
+
+- Performance improvements across SqlStatistics timing, Always Encrypted scenarios, and connection opening:
+  ([#3609](https://github.com/dotnet/SqlClient/pull/3609),
+   [#3612](https://github.com/dotnet/SqlClient/pull/3612),
+   [#3732](https://github.com/dotnet/SqlClient/pull/3732),
+   [#3660](https://github.com/dotnet/SqlClient/pull/3660),
+   [#3791](https://github.com/dotnet/SqlClient/pull/3791),
+   [#3772](https://github.com/dotnet/SqlClient/pull/3772),
+   [#3554](https://github.com/dotnet/SqlClient/pull/3554))
+
+- Allow `SqlBulkCopy` to operate on hidden columns.
+  ([#3590](https://github.com/dotnet/SqlClient/pull/3590))
+
+- Updated UserAgent feature to use a pipe-delimited format, replacing the previous JSON format.
+  ([#3826](https://github.com/dotnet/SqlClient/pull/3826))
+
+- Minor improvements to Managed SNI tracing to capture continuation events and errors.
+  ([#3859](https://github.com/dotnet/SqlClient/pull/3859))
+
+### Fixed
+
+- Fixed a connection performance regression where SPN generation was triggered for non-integrated authentication modes (e.g., SQL authentication) on the native SNI path.
+  ([#3929](https://github.com/dotnet/SqlClient/pull/3929))
+
+- Fixed `ExecuteScalar` to propagate errors when the server sends data followed by an error token.
+  ([#3912](https://github.com/dotnet/SqlClient/pull/3912))
+
+- Fixed `NullReferenceException` in `SqlDataAdapter` when processing batch scenarios.
+  ([#3857](https://github.com/dotnet/SqlClient/pull/3857))
+
+- Fixed reading of multiple app context switches from a single `AppContextSwitchOverrides` configuration field.
+  ([#3960](https://github.com/dotnet/SqlClient/pull/3960))
+
+- Fixed an edge case in `TdsParserStateObject.TryReadPlpBytes` where zero-length reads returned `null` instead of an empty array.
+  ([#3872](https://github.com/dotnet/SqlClient/pull/3872))
+
+- Fixed issue where extra connection deactivation was occurring.
+  ([#3758](https://github.com/dotnet/SqlClient/pull/3758))
+
+- Fixed debug assertion in connection pool (no impact to production code).
+  ([#3587](https://github.com/dotnet/SqlClient/pull/3587))
+
+- Prevented uninitialized performance counters escaping `CreatePerformanceCounters`.
+  ([#3623](https://github.com/dotnet/SqlClient/pull/3623))
+
+- Fixed `SetProvider` to return immediately if user-defined authentication provider found.
+  ([#3620](https://github.com/dotnet/SqlClient/pull/3620))
+
+- Fixed connection pool concurrency issue.
+  ([#3632](https://github.com/dotnet/SqlClient/pull/3632))
+
+
+## Contributors
+
+We thank the following public contributors. Their efforts toward this project are very much appreciated.
+
+- [edwardneal](https://github.com/edwardneal)
+- [ErikEJ](https://github.com/ErikEJ)
+- [frankbuckley](https://github.com/frankbuckley)
+- [MatthiasHuygelen](https://github.com/MatthiasHuygelen)
+- [ShreyaLaxminarayan](https://github.com/ShreyaLaxminarayan)
+- [tetolv](https://github.com/tetolv)
+- [twsouthwick](https://github.com/twsouthwick)
+- [Wraith2](https://github.com/Wraith2)
+
+## Target Platform Support
+
+- .NET Framework 4.6.2+ (Windows x86, Windows x64, Windows ARM64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM, Windows ARM64, Linux, macOS)
+
+### Dependencies
+
+#### .NET 9.0
+
+- Microsoft.Bcl.Cryptography 9.0.13
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 9.0.13
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.13
+- System.Security.Cryptography.Pkcs 9.0.13
+
+#### .NET 8.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+
+#### .NET Standard 2.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+
+#### .NET Framework 4.6.2+
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- System.Buffers 4.6.1
+- System.Diagnostics.DiagnosticSource 10.0.3
+- System.Memory 4.6.3
+- System.Runtime.InteropServices.RuntimeInformation 4.3.0
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+- System.ValueTuple 4.6.2
diff --git a/release-notes/7.0/README.md b/release-notes/7.0/README.md
index e8bfcc25f3..70cfdc3835 100644
--- a/release-notes/7.0/README.md
+++ b/release-notes/7.0/README.md
@@ -4,6 +4,7 @@ The following Microsoft.Data.SqlClient 7.0 releases have been shipped:
 
 | Release Date | Version | Notes |
 | :-- | :-- | :--: |
+| 2026-03-17 | 7.0.0 | [Release Notes](7.0.0.md) |
 | 2026-03-05 | 7.0.0-preview4.26064.3 | [Release Notes](7.0.0-preview4.md) |
 | 2025-12-08 | 7.0.0-preview3.25342.7 | [Release Notes](7.0.0-preview3.md) |
 | 2025-10-16 | 7.0.0-preview2.25289.6 | [Release Notes](7.0.0-preview2.md) |
diff --git a/release-notes/Extensions/Abstractions/1.0/1.0.0.md b/release-notes/Extensions/Abstractions/1.0/1.0.0.md
new file mode 100644
index 0000000000..82157224ff
--- /dev/null
+++ b/release-notes/Extensions/Abstractions/1.0/1.0.0.md
@@ -0,0 +1,30 @@
+# Release Notes
+
+## Stable Release 1.0.0 - 2026-03-17
+
+This is the first stable release of `Microsoft.Data.SqlClient.Extensions.Abstractions`, providing shared types and interfaces between the core `Microsoft.Data.SqlClient` driver and its extension packages (e.g., `Microsoft.Data.SqlClient.Extensions.Azure`).
+
+## Changes Since [1.0.0-preview1](1.0.0-preview1.md)
+
+No changes to this package since preview1.
+
+## Cumulative Changes (First Stable Release)
+
+This is the first stable release of this package. The following summarizes all changes across the preview cycle.
+
+### Added
+
+- Shared abstraction types for the SqlClient extensions model.
+  ([#3626](https://github.com/dotnet/SqlClient/pull/3626),
+   [#3628](https://github.com/dotnet/SqlClient/pull/3628),
+   [#3967](https://github.com/dotnet/SqlClient/pull/3967))
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
diff --git a/release-notes/Extensions/Abstractions/1.0/README.md b/release-notes/Extensions/Abstractions/1.0/README.md
index 2e91111742..347ae77335 100644
--- a/release-notes/Extensions/Abstractions/1.0/README.md
+++ b/release-notes/Extensions/Abstractions/1.0/README.md
@@ -5,4 +5,5 @@ The following `Microsoft.Data.SqlClient.Extensions.Abstractions`
 
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
+| 2026-03-17 | 1.0.0 | [Release Notes](1.0.0.md) |
 | 2026-03-05 | 1.0.0-preview1.26064.3 | [Release Notes](1.0.0-preview1.md) |
diff --git a/release-notes/Extensions/Azure/1.0/1.0.0.md b/release-notes/Extensions/Azure/1.0/1.0.0.md
new file mode 100644
index 0000000000..c371669493
--- /dev/null
+++ b/release-notes/Extensions/Azure/1.0/1.0.0.md
@@ -0,0 +1,66 @@
+# Release Notes
+
+## Stable Release 1.0.0 - 2026-03-17
+
+This is the first stable release of `Microsoft.Data.SqlClient.Extensions.Azure`, providing Microsoft Entra ID (Azure Active Directory) authentication support for Microsoft.Data.SqlClient. This package was extracted from the core driver to address the [most requested feature](https://github.com/dotnet/SqlClient/issues/1108) — making the core package lighter by removing Azure dependencies.
+
+## Changes Since [1.0.0-preview1](1.0.0-preview1.md)
+
+### Changed
+
+- Renamed dependency from `Microsoft.Data.SqlClient.Extensions.Logging` to `Microsoft.Data.SqlClient.Internal.Logging`.
+  ([#4038](https://github.com/dotnet/SqlClient/pull/4038))
+
+- Updated Dependencies
+  ([#4045](https://github.com/dotnet/SqlClient/pull/4045)):
+  - Updated `Azure.Core` to v1.51.1
+  - Updated `Azure.Identity` to v1.18.0
+  - Updated `Microsoft.Identity.Client` to v4.83.0
+
+## Cumulative Changes (First Stable Release)
+
+This is the first stable release of this package. The following summarizes all changes across the preview cycle.
+
+### Added
+
+- Entra ID authentication provider (`ActiveDirectoryAuthenticationProvider`) supporting:
+  - `ActiveDirectoryInteractive`
+  - `ActiveDirectoryDefault`
+  - `ActiveDirectoryManagedIdentity`
+  - `ActiveDirectoryServicePrincipal`
+  - `ActiveDirectoryDeviceCodeFlow`
+  - `ActiveDirectoryWorkloadIdentity`
+  - `ActiveDirectoryPassword` (deprecated)
+  ([#3680](https://github.com/dotnet/SqlClient/pull/3680),
+   [#3902](https://github.com/dotnet/SqlClient/pull/3902),
+   [#3904](https://github.com/dotnet/SqlClient/pull/3904),
+   [#3908](https://github.com/dotnet/SqlClient/pull/3908),
+   [#3917](https://github.com/dotnet/SqlClient/pull/3917),
+   [#3982](https://github.com/dotnet/SqlClient/pull/3982),
+   [#3978](https://github.com/dotnet/SqlClient/pull/3978),
+   [#3986](https://github.com/dotnet/SqlClient/pull/3986))
+
+## Target Platform Support
+
+- .NET Standard 2.0
+- .NET Framework 4.6.2+
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.51.1
+- Azure.Identity 1.18.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.83.0
+
+#### .NET Framework 4.6.2+
+
+- Azure.Core 1.51.1
+- Azure.Identity 1.18.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.83.0
diff --git a/release-notes/Extensions/Azure/1.0/README.md b/release-notes/Extensions/Azure/1.0/README.md
index 19dc060723..dd0030f110 100644
--- a/release-notes/Extensions/Azure/1.0/README.md
+++ b/release-notes/Extensions/Azure/1.0/README.md
@@ -5,4 +5,5 @@ The following `Microsoft.Data.SqlClient.Extensions.Azure`
 
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
+| 2026-03-17 | 1.0.0 | [Release Notes](1.0.0.md) |
 | 2026-03-05 | 1.0.0-preview1.26064.3 | [Release Notes](1.0.0-preview1.md) |
diff --git a/release-notes/Extensions/Logging/1.0/README.md b/release-notes/Extensions/Logging/1.0/README.md
index b31406665b..f5cbea90ea 100644
--- a/release-notes/Extensions/Logging/1.0/README.md
+++ b/release-notes/Extensions/Logging/1.0/README.md
@@ -1,5 +1,8 @@
 # Microsoft.Data.SqlClient.Extensions.Logging 1.0 Releases
 
+> **Note:** This package has been renamed to `Microsoft.Data.SqlClient.Internal.Logging` starting
+> with the 1.0.0 stable release. See [Internal/Logging release notes](../../../Internal/Logging/1.0/1.0.0.md).
+
 > **Note:** This package is for internal use by other Microsoft.Data.SqlClient packages only
 > and should not be referenced directly by application code.
 
diff --git a/release-notes/Internal/Logging/1.0/1.0.0.md b/release-notes/Internal/Logging/1.0/1.0.0.md
new file mode 100644
index 0000000000..5cbf4d886b
--- /dev/null
+++ b/release-notes/Internal/Logging/1.0/1.0.0.md
@@ -0,0 +1,37 @@
+# Release Notes
+
+## Stable Release 1.0.0 - 2026-03-17
+
+> **Note:** This package is for internal use by other Microsoft.Data.SqlClient packages only
+> and should not be referenced directly by application code.
+
+This is the first stable release of `Microsoft.Data.SqlClient.Internal.Logging`, providing shared ETW EventSource tracing infrastructure for the Microsoft.Data.SqlClient package family.
+
+## Changes Since [1.0.0-preview1](../../../Extensions/Logging/1.0/1.0.0-preview1.md)
+
+### Changed
+
+- Renamed from `Microsoft.Data.SqlClient.Extensions.Logging` to `Microsoft.Data.SqlClient.Internal.Logging` to clarify that this package is for internal use only.
+  ([#4038](https://github.com/dotnet/SqlClient/pull/4038))
+
+## Cumulative Changes (First Stable Release)
+
+This is the first stable release of this package. The following summarizes all changes across the preview cycle.
+
+### Added
+
+- Shared ETW EventSource tracing infrastructure for internal use by `Microsoft.Data.SqlClient` and its extension packages.
+  ([#3626](https://github.com/dotnet/SqlClient/pull/3626),
+   [#3628](https://github.com/dotnet/SqlClient/pull/3628),
+   [#3967](https://github.com/dotnet/SqlClient/pull/3967))
+
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- None
diff --git a/release-notes/Internal/Logging/1.0/README.md b/release-notes/Internal/Logging/1.0/README.md
new file mode 100644
index 0000000000..15978c4843
--- /dev/null
+++ b/release-notes/Internal/Logging/1.0/README.md
@@ -0,0 +1,11 @@
+# Microsoft.Data.SqlClient.Internal.Logging 1.0 Releases
+
+> **Note:** This package is for internal use by other Microsoft.Data.SqlClient packages only
+> and should not be referenced directly by application code.
+
+The following `Microsoft.Data.SqlClient.Internal.Logging`
+1.0 releases have been shipped:
+
+| Release Date | Description | Notes |
+| :-- | :-- | :--: |
+| 2026-03-17 | 1.0.0 | [Release Notes](1.0.0.md) |
diff --git a/release-notes/README.md b/release-notes/README.md
index 4e2c67bc33..a511a589bc 100644
--- a/release-notes/README.md
+++ b/release-notes/README.md
@@ -1,6 +1,6 @@
 # Microsoft.Data.SqlClient Release Notes
 
-The latest stable release is [Microsoft.Data.SqlClient 6.1](6.1).
+The latest stable release is [Microsoft.Data.SqlClient 7.0](7.0).
 
 ## Release Information
 
@@ -22,7 +22,7 @@ The latest stable release is [Microsoft.Data.SqlClient 6.1](6.1).
 # Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider Release Notes
 
 The latest stable release is
-[Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 6.1](add-ons/AzureKeyVaultProvider/6.1).
+[Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 7.0](add-ons/AzureKeyVaultProvider/7.0).
 
 ## Release Information
 
@@ -54,14 +54,15 @@ The latest release is
 
 - [Microsoft.Data.SqlClient.Extensions.Azure 1.0](Extensions/Azure/1.0)
 
-# Microsoft.Data.SqlClient.Extensions.Logging Release Notes
+
+# Microsoft.Data.SqlClient.Internal.Logging Release Notes
 
 The latest release is
-[Microsoft.Data.SqlClient.Extensions.Logging 1.0](Extensions/Logging/1.0).
+[Microsoft.Data.SqlClient.Internal.Logging 1.0](Internal/Logging/1.0).
 
 ## Release Information
 
-- [Microsoft.Data.SqlClient.Extensions.Logging 1.0](Extensions/Logging/1.0)
+- [Microsoft.Data.SqlClient.Internal.Logging 1.0](Internal/Logging/1.0)
 
 # Microsoft.SqlServer.Server Release Notes
 
diff --git a/release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.0.md b/release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.0.md
new file mode 100644
index 0000000000..6a6f31054b
--- /dev/null
+++ b/release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.0.md
@@ -0,0 +1,54 @@
+# Release Notes
+
+## Stable Release 7.0.0 - 2026-03-17
+
+## Changes Since [7.0.0-preview1](7.0.0-preview1.md)
+
+### Changed
+
+- Changed AKV Provider to target .NET Standard 2.0 instead of multi-targeting .NET Framework and .NET Core. Since the package contains no framework-specific code, this simplifies the package and reduces its footprint.
+  ([#4036](https://github.com/dotnet/SqlClient/pull/4036))
+
+- Renamed dependency from `Microsoft.Data.SqlClient.Extensions.Logging` to `Microsoft.Data.SqlClient.Internal.Logging`.
+  ([#4038](https://github.com/dotnet/SqlClient/pull/4038))
+
+- Updated Dependencies
+  ([#4045](https://github.com/dotnet/SqlClient/pull/4045)):
+  - Updated `Azure.Core` to v1.51.1
+  - Updated `Azure.Security.KeyVault.Keys` to v4.9.0
+
+## Cumulative Changes Since [6.1](../6.1/README.md)
+
+This section summarizes all changes across the 7.0 preview cycle for users upgrading from the latest 6.1 stable release.
+
+### Changed
+
+- Changed AKV Provider to target .NET Standard 2.0 instead of multi-targeting .NET Framework and .NET Core. Since the package contains no framework-specific code, this simplifies the package and reduces its footprint.
+  ([#4036](https://github.com/dotnet/SqlClient/pull/4036))
+
+- Performance improvements for all built-in `SqlColumnEncryptionKeyStoreProvider` implementations, including `SqlColumnEncryptionAzureKeyVaultProvider`.
+  ([#3554](https://github.com/dotnet/SqlClient/pull/3554))
+
+- Added dependency on `Microsoft.Data.SqlClient.Internal.Logging` to align with the new extensions infrastructure.
+  ([#3626](https://github.com/dotnet/SqlClient/pull/3626),
+   [#3628](https://github.com/dotnet/SqlClient/pull/3628),
+   [#3967](https://github.com/dotnet/SqlClient/pull/3967),
+   [#4038](https://github.com/dotnet/SqlClient/pull/4038))
+
+- Updated Dependencies:
+  - Updated `Azure.Core` to v1.51.1
+  - Updated `Azure.Security.KeyVault.Keys` to v4.9.0
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.51.1
+- Azure.Security.KeyVault.Keys 4.9.0
+- Microsoft.Data.SqlClient (>= 7.0.0)
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Extensions.Caching.Memory 8.0.1
diff --git a/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md b/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md
index c63a0bc71f..22593ef05c 100644
--- a/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md
+++ b/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md
@@ -5,4 +5,5 @@ The following `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
 
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
+| 2026-03-17 | 7.0.0 | [Release Notes](7.0.0.md) |
 | 2026-03-05 | 7.0.0-preview1.26064.3 | [Release Notes](7.0.0-preview1.md) |

From 86492a1fa139b001efbfb349a971acc30d601db5 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Wed, 18 Mar 2026 09:20:05 -0700
Subject: [PATCH 002/298] Validate milestone assignment on pull requests.
 (#4055)

* Validate milestone assignment on pull requests.

* Update json checks to avoid jq.
---
 .github/workflows/check-milestone.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/check-milestone.yml

diff --git a/.github/workflows/check-milestone.yml b/.github/workflows/check-milestone.yml
new file mode 100644
index 0000000000..da4681fd7b
--- /dev/null
+++ b/.github/workflows/check-milestone.yml
@@ -0,0 +1,24 @@
+name: Check Milestone
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize, milestoned, demilestoned]
+
+jobs:
+  check-milestone:
+    name: Validate milestone
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    steps:
+      - name: Check milestone is set
+        if: github.event.pull_request.milestone == null
+        run: |
+          echo "::error::This PR does not have a milestone set. Please assign a milestone before merging."
+          exit 1
+
+      - name: Check milestone is open
+        if: github.event.pull_request.milestone != null && github.event.pull_request.milestone.state != 'open'
+        run: |
+          echo "::error::Milestone '${{ github.event.pull_request.milestone.title }}' is ${{ github.event.pull_request.milestone.state }}. Please assign an open milestone."
+          exit 1

From 07a9280494d62a9a2381a1215abb6587c0a4379d Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Thu, 19 Mar 2026 16:27:39 -0500
Subject: [PATCH 003/298] Merge | Pack Mds Target, Wire PR/CI Pipelines to
 Build2.proj (#4033)

* In progress work for pack target ... kinda working

* Add config to genapi path.
Remove unnecessary dependencies from genapi project

* Fix generation of docs in ref project

* Dump reference type specific builds
Fix xml documentation file generation for implementation project

* Generating a package file works!!!

* Resync pipelines folder in solution

* Add an assembly build number argument?
... it doesn't work

* Wiring up build numbers through build2.proj

* Build number argument

* Maybe wiring it up?!?

* Reinstate the assemblybuildnumber property

* Build all of MDS, once

* PR comments from copilot

* Specify test results folder for CI builds

* TargetFramework => TestFramework

* Fixing a couple more comments

* Couple more comments from copilot

* downgrade back to 7.0.0 :)

* I dunno, fixing some stuff, I guess.

* Fix indenting

* Back out changes to official pipelines

* A couple more comments from CoPilot

* Generate AKV documentation file during CI build ... idk why this is only a problem *now*

* Comments from Copilot ... I'd love it if it could give the same comments across commits.
---
 build2.proj                                   | 272 +++++++++++++-----
 .../templates/steps/ci-project-build-step.yml | 104 +------
 .../templates/steps/run-all-tests-step.yml    | 248 ++++++++--------
 .../sqlclient-pr-package-ref-pipeline.yml     |   1 +
 .../sqlclient-pr-project-ref-pipeline.yml     |   1 +
 src/Microsoft.Data.SqlClient.sln              |  87 +++---
 .../MdsVersions.props                         |  35 +++
 .../Microsoft.Data.SqlClient.csproj           |  12 +-
 .../ref/Microsoft.Data.SqlClient.cs           |  10 +-
 .../ref/Microsoft.Data.SqlClient.csproj       |  17 +-
 .../src/Microsoft.Data.SqlClient.csproj       |  20 +-
 .../Microsoft/Data/SqlClient/SqlDataReader.cs |  16 +-
 .../src/Microsoft/Data/SqlDbTypeExtensions.cs |   6 +-
 .../src/Microsoft/Data/SqlTypes/SqlJson.cs    |  22 +-
 .../src/Microsoft/Data/SqlTypes/SqlVector.cs  |  20 +-
 tools/intellisense/TrimDocs.ps1               |   5 +-
 tools/props/Versions.props                    |  33 +--
 tools/specs/Microsoft.Data.SqlClient.nuspec   | 204 ++++++-------
 tools/targets/GenerateThisAssemblyCs.targets  |   3 +
 19 files changed, 615 insertions(+), 501 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/MdsVersions.props

diff --git a/build2.proj b/build2.proj
index a5fb6b89a2..b9b08f9a4a 100644
--- a/build2.proj
+++ b/build2.proj
@@ -6,6 +6,25 @@
   <!-- Build Parameters ================================================ -->
   <!-- @TODO: Add a Help target that lists targets and these descriptions of the parameters -->
   <PropertyGroup>
+    <!--
+      BuildNumber
+      Applies to:     BuildMds*, PackMds
+      Description:    Number that identifies the build.
+                      For local developer builds, this does not need to be used. The developer
+                      should either specify an entire package version override (via
+                      PackageVersionMds, et. al.) or by omitting the package version.
+                      For automated builds, this should always be specified instead of
+                      a package version. Thus, the version base is controlled via source and the
+                      build number is simply appended as a revision number.
+      Default value:  [blank]
+      Example:        1234
+    -->
+    <!-- @TODO: Currently this is defaulted to 0 by Directory.Build.props, which is the same default used later on anyhow. -->
+    <BuildNumber Condition="'$(BuildNumber)' == ''" />
+    <BuildNumberArgument Condition="'$(BuildNumber)' != ''">
+      -p:BuildNumber=$(BuildNumber)
+    </BuildNumberArgument>
+
     <!--
       Configuration
       Applies to:     All targets
@@ -16,7 +35,7 @@
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
 
     <!--
-      DotNetPath
+      DotnetPath
       Applies to:    All targets
       Description:   Path to folder containing the `dotnet` binary. Override this if a specific
                      version (eg, x86) is required. Otherwise, this defaults to using the dotnet
@@ -25,12 +44,23 @@
       Default value: [blank]
       Example:       C:\x86\
     -->
-    <DotNetPath Condition="'$(DotNetPath)' == ''" />
+    <DotnetPath Condition="'$(DotnetPath)' == ''" />
+
+    <!--
+      NugetPath
+      Applies to:     PackMds
+      Description:    Path to NuGet executable. Override if `nuget` is not included in the PATH
+                      variable.
+      Default value:  nuget
+      Example:        C:\nuget\nuget.exe
+    -->
+    <NugetPath Condition="'$(NugetPath)' == ''">nuget</NugetPath>
 
     <!--
       PackageVersionAbstractions
       Applies to:     BuildMds, BuildMdsRef, BuildMdsUnix, BuildMdsWindows
-                      TestMdsFunctional, TestMdsManual
+                      PackMds
+                      TestMds, TestMdsFunctional, TestMdsManual
       Description:    Specifies what version of the Microsoft.Data.SqlClient.Abstractions to use
                       when compiling MDS. If not specified, the version defined in
                       Directory.Packages.props is used. This argument only has effect if the
@@ -46,7 +76,8 @@
     <!--
       PackageVersionLogging
       Applies to:     BuildMds, BuildMdsUnix, BuildMdsWindows
-                      TestMdsFunctional, TestMdsManual
+                      PackMds
+                      TestMds, TestMdsFunctional, TestMdsManual
       Description:    Specifies what version of the Microsoft.Data.SqlClient.Internal.Logging to use
                       when compiling MDS. If not specified, the version defined in
                       Directory.Packages.props is used. This argument only has effect if the
@@ -61,11 +92,19 @@
 
     <!--
       PackageVersionMds
-      Applies to:     TestMdsFunctional, TestMdsManual
+      Applies to:     TestMdsFunctional, TestMdsManual (when ReferenceType is Package)
       Description:    Specifies what version of the Microsoft.Data.SqlClient package to run tests
-                      against. If not specified, the version defined in Versions.props is used.
-                      This argument only has effect if the ReferenceType argument is set to
-                      "Package".
+                      against. If not specified, the version pinned in Directory.Packages.props
+                      will be used.
+
+      Applies to:     BuildMds*
+      Description:    Specifies the version to assign to the MDS NuGet package and assembly files.
+                      If this is not specified, the version defined in MdsVersions.props is used.
+
+      Applies to:     PackMds
+      Description:    Specifies the version to assign to the MDS NuGet package. If not specified,
+                      the target will fail (@TODO).
+
       Default value:  [blank]
       Example:        7.0.0-preview4
     -->
@@ -97,6 +136,19 @@
       -p:ReferenceType=Package
     </ReferenceTypeArgument>
 
+    <!--
+      SigningKeyPath
+      Applies to:     Build*
+      Description:    Path to the key to use to strong name sign binaries. If omitted, binaries
+                      will not be strong name signed.
+      Default value:  [blank]
+      Example:        C:\path\to\my\signing\key.snk
+    -->
+    <SigningKeyPath Condition="'$(SigningKeyPath)' == ''" />
+    <SigningKeyPathArgument Condition="'$(SigningKeyPath)' != ''">
+      -p:SigningKeyPath="$(SigningKeyPath)"
+    </SigningKeyPathArgument>
+
     <!--
       TestBlameTimeout
       Applies to:     Test* targets
@@ -115,17 +167,17 @@
     </TestBlameArgument>
 
     <!--
-      TestCollectCodeCoverage
+      TestCodeCoverage
       Applies to:     Test* targets
       Description:    Whether code coverage data should be collected during test target execution.
       Default value:  true
       Allowed value:  (true|false)
     -->
-    <TestCollectCodeCoverage Condition="'$(TestCollectCodeCoverage)' == ''">true</TestCollectCodeCoverage>
-    <TestCollectArgument Condition="'$(TestCollectCodeCoverage.ToLower())' == 'true'">
+    <TestCodeCoverage Condition="'$(TestCodeCoverage)' == ''">true</TestCodeCoverage>
+    <TestCodeCoverageArgument Condition="'$(TestCodeCoverage.ToLower())' == 'true'">
       --collect "Code coverage"
       --settings "$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings"
-    </TestCollectArgument>
+    </TestCodeCoverageArgument>
 
     <!--
       TestFilters
@@ -184,20 +236,23 @@
   <!-- Microsoft.Data.SqlClient Targets -->
   <PropertyGroup>
     <!-- Root for MDS projects -->
-    <MdsRoot>$(RepoRoot)src/Microsoft.Data.SqlClient/</MdsRoot>
+    <MdsSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient/</MdsSrcRoot>
+    <MdsArtifactRoot>$(RepoRoot)artifacts/Microsoft.Data.SqlClient/</MdsArtifactRoot>
+
+    <!-- Project Path -->
+    <MdsProjectPath>$(MdsSrcRoot)src/Microsoft.Data.SqlClient.csproj</MdsProjectPath>
+    <MdsRefProjectPath>$(MdsSrcRoot)ref/Microsoft.Data.SqlClient.csproj</MdsRefProjectPath>
+    <MdsNotSupportedProjectPath>$(MdsSrcRoot)notsupported/Microsoft.Data.SqlClient.csproj</MdsNotSupportedProjectPath>
+
+    <!-- Test Project Paths -->
+    <MdsFunctionalTestProjectPath>$(MdsSrcRoot)tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj</MdsFunctionalTestProjectPath>
+    <MdsManualTestProjectPath>$(MdsSrcRoot)tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj</MdsManualTestProjectPath>
+    <MdsUnitTestProjectPath>$(MdsSrcRoot)tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj</MdsUnitTestProjectPath>
 
     <!-- Tools/Specs Paths -->
     <MdsNuspecPath>$(RepoRoot)tools/specs/Microsoft.Data.SqlClient.nuspec</MdsNuspecPath>
     <GenApiPath>$(RepoRoot)tools/GenAPI/Microsoft.DotNet.GenAPI/</GenApiPath>
     <GenApiProjectPath>$(GenApiPath)Microsoft.DotNet.GenAPI.csproj</GenApiProjectPath>
-
-    <!-- Project Paths -->
-    <MdsFunctionalTestProjectPath>$(MdsRoot)tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj</MdsFunctionalTestProjectPath>
-    <MdsManualTestProjectPath>$(MdsRoot)tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj</MdsManualTestProjectPath>
-    <MdsNotSupportedProjectPath>$(MdsRoot)notsupported/Microsoft.Data.SqlClient.csproj</MdsNotSupportedProjectPath>
-    <MdsProjectPath>$(MdsRoot)src/Microsoft.Data.SqlClient.csproj</MdsProjectPath>
-    <MdsRefProjectPath>$(MdsRoot)ref/Microsoft.Data.SqlClient.csproj</MdsRefProjectPath>
-    <MdsUnitTestProjectPath>$(MdsRoot)tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj</MdsUnitTestProjectPath>
   </PropertyGroup>
 
   <!-- Build MDS Targets =============================================== -->
@@ -211,98 +266,163 @@
   -->
   <Target Name="BuildMdsNotSupported">
     <PropertyGroup>
-      <DotNetCommand>
-        "$(DotNetPath)dotnet" build "$(GenApiProjectPath)"
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(GenApiProjectPath)"
         -p:Configuration=$(Configuration)
-      </DotNetCommand>
+      </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
-      <DotNetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotNetCommand), "\s+", " "))</DotNetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building GenAPI project via command: '$(DotNetCommand)'"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+    <Message Text=">>> Building GenAPI project via command: '$(DotnetCommand)'"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 
     <!-- Get the path to the GenAPI artifact -->
     <ItemGroup>
-      <GenApiArtifactPath Include="$(GenApiPath)bin/**/Microsoft.DotNet.GenAPI.dll" />
+      <GenApiArtifactPath Include="$(GenApiPath)bin/$(Configuration)/**/Microsoft.DotNet.GenAPI.dll" />
     </ItemGroup>
 
     <PropertyGroup>
-      <DotNetCommand>
-        "$(DotNetPath)dotnet" build "$(MdsNotSupportedProjectPath)"
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(MdsNotSupportedProjectPath)"
         -p:Configuration=$(Configuration)
         -p:GenApiPath="@(GenApiArtifactPath->'%(FullPath)')"
-      </DotNetCommand>
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(PacakgeVersionMdsArgument)
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+      </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
-      <DotNetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotNetCommand), "\s+", " "))</DotNetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building not supported binaries project via command: '$(DotNetCommand)'"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+    <Message Text=">>> Building not supported binaries project via command: '$(DotnetCommand)'"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- BuildMdsRef: Builds the ref binaries project for MDS, which is OS-agnostic -->
   <Target Name="BuildMdsRef">
     <PropertyGroup>
-      <DotNetCommand>
-        $(DotNetPath)dotnet build $(MdsRefProjectPath)
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build $(MdsRefProjectPath)
         -p:Configuration=$(Configuration)
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(PacakgeVersionMdsArgument)
+
+        <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
         $(PackageVersionAbstractionsArgument)
-      </DotNetCommand>
+      </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
-      <DotNetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotNetCommand), "\s+", " "))</DotNetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building MDS ref binaries via command: $(DotNetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+    <Message Text=">>> Building MDS ref binaries via command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- BuildMdsUnix: Builds all unix-specific MDS binaries -->
   <Target Name="BuildMdsUnix">
     <PropertyGroup>
-      <DotNetCommand>
-        $(DotNetPath)dotnet build $(MdsProjectPath)
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build $(MdsProjectPath)
         -p:Configuration=$(Configuration)
         -p:TargetOs=Unix
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(PackageVersionMdsArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
-      </DotNetCommand>
+      </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
-      <DotNetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotNetCommand), "\s+", " "))</DotNetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building MDS for Unix via command: $(DotNetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+    <Message Text=">>> Building MDS for Unix via command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- BuildMdsWindows: Builds all windows-specific MDS binaries -->
   <Target Name="BuildMdsWindows">
     <PropertyGroup>
-      <DotNetCommand>
-        $(DotNetPath)dotnet build $(MdsProjectPath)
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build $(MdsProjectPath)
         -p:Configuration=$(Configuration)
         -p:TargetOs=Windows_NT
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning Arguments -->
+        $(BuildNumberArgument)
+        $(PackageVersionMdsArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
-      </DotNetCommand>
+      </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
-      <DotNetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotNetCommand), "\s+", " "))</DotNetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Text=">>> Building MDS for Windows via command: $(DotNetCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+    <Message Text=">>> Building MDS for Windows via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- Pack MDS Target ===================================================== -->
-  <!-- PackMds: Packages MDS binaries into a NuGet package -->
-  <Target Name="PackMds">
-    <!-- @TODO -->
+  <!--
+    PackMds: Packages MDS binaries into a NuGet package.
+    Because the MDS package depends on the "not supported" and ref projects, we can't use dotnet to
+    automatically build before packaging. Instead, we rely on target dependency to handle building
+    the same binaries that will be packaged.
+  -->
+  <Target Name="PackMds" DependsOnTargets="BuildMds">
+    <Error Text="PackageVersionAbstractions must be set!"
+           Condition="'$(PackageVersionAbstractions)' == ''" />
+    <Error Text="PackageVersionLogging must be set!"
+           Condition="'$(PackageVersionLogging)' == ''" />
+    <Error Text="PackageVersionMds must be set !"
+           Condition="'$(PackageVersionMds)' == ''" />
+
+    <PropertyGroup>
+      <GitCommand>
+        git rev-parse HEAD
+      </GitCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <GitCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GitCommand), "\s+", " "))</GitCommand>
+    </PropertyGroup>
+    <Message Text=">>> Fetching latest git commit hash via command: $(GitCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(GitCommand)">
+      <Output TaskParameter="ConsoleOutput" PropertyName="CommitId" />
+    </Exec>
+
+    <PropertyGroup>
+      <CommitId>$([System.Text.RegularExpressions.Regex]::Replace($(CommitId), "\s", ""))</CommitId>
+      <NuGetCommand>
+        "$(NugetPath)" pack "$(MdsNuspecPath)"
+        -Symbols
+        -SymbolPackageFormat snupkg
+        -Version "$(PackageVersionMds)"
+        -OutputDirectory "$(MdsArtifactRoot)/$(ReferenceType)-$(Configuration)"
+        -properties "COMMITID=$(CommitId);Configuration=$(Configuration);ReferenceType=$(ReferenceType);AbstractionsPackageVersion=$(PackageVersionAbstractions);LoggingPackageVersion=$(PackageVersionLogging)"
+      </NuGetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <NuGetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(NuGetCommand), "\s+", " "))</NuGetCommand>
+    </PropertyGroup>
+    <Message Text=">>> Packing MDS nuget via command: $(NuGetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(NuGetCommand)" />
   </Target>
 
   <!-- Test MDS Targets ==================================================== -->
@@ -316,11 +436,11 @@
       <LogFilePrefix>MdsFunctional-$(OS)</LogFilePrefix>
       <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
 
-      <DotNetCommand>
-        $(DotNetPath)dotnet test "$(MdsFunctionalTestProjectPath)"
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(MdsFunctionalTestProjectPath)"
         -p:Configuration=$(Configuration)
         $(TestBlameArgument)
-        $(TestCollectArgument)
+        $(TestCodeCoverageArgument)
         $(TestFiltersArgument)
         $(TestFrameworkArgument)
         --results-directory "$(TestResultsFolderPath)"
@@ -331,12 +451,12 @@
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
         $(PackageVersionMdsArgument)
-      </DotNetCommand>
+      </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
-      <DotNetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotNetCommand), "\s+", " "))</DotNetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Text=">>> Running functional tests for MDS via command: $(DotNetCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+    <Message Text=">>> Running functional tests for MDS via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- TestMdsManual: Runs manual tests for MDS -->
@@ -346,11 +466,11 @@
       <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
       <LogFilePrefix Condition="'$(TestSet)' != ''">$(LogFilePrefix)-$(TestSet)</LogFilePrefix>
 
-      <DotNetCommand>
-        $(DotNetPath)dotnet test "$(MdsManualTestProjectPath)"
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(MdsManualTestProjectPath)"
         -p:Configuration=$(Configuration)
         $(TestBlameArgument)
-        $(TestCollectArgument)
+        $(TestCodeCoverageArgument)
         $(TestFiltersArgument)
         $(TestFrameworkArgument)
         $(TestSetArgument)
@@ -362,12 +482,12 @@
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
         $(PackageVersionMdsArgument)
-      </DotNetCommand>
+      </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
-      <DotNetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotNetCommand), "\s+", " "))</DotNetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Text=">>> Running manual tests for MDS via command: $(DotNetCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+    <Message Text=">>> Running manual tests for MDS via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- TestMdsUnit: Runs unit tests for MDS -->
@@ -380,21 +500,21 @@
       <LogFilePrefix>MdsUnit-$(OS)</LogFilePrefix>
       <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
 
-      <DotNetCommand>
-        $(DotNetPath)dotnet test "$(MdsUnitTestProjectPath)"
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(MdsUnitTestProjectPath)"
         -p:Configuration=$(Configuration)
         $(TestBlameArgument)
-        $(TestCollectArgument)
+        $(TestCodeCoverageArgument)
         $(TestFiltersArgument)
         $(TestFrameworkArgument)
         --results-directory "$(TestResultsFolderPath)"
         --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
-      </DotNetCommand>
+      </DotnetCommand>
 
       <!-- Convert more than one whitespace character into one space -->
-      <DotNetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotNetCommand), "\s+", " "))</DotNetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Text=">>> Running unit tests for MDS via command: $(DotNetCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+    <Message Text=">>> Running unit tests for MDS via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 </Project>
diff --git a/eng/pipelines/common/templates/steps/ci-project-build-step.yml b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
index e496aa2b71..d43222bfd1 100644
--- a/eng/pipelines/common/templates/steps/ci-project-build-step.yml
+++ b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
@@ -71,61 +71,25 @@ parameters:
     default: $(akvPackageVersion)
 
 steps:
-- ${{ if or(eq(parameters.operatingSystem, 'Windows'), eq(parameters.operatingSystem, 'deferedToRuntime')) }}:
+  # Build MDS
   - ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
     - task: MSBuild@1
-      displayName: 'Restore [Win]'
+      displayName: 'Build Driver'
       condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
       inputs:
-        solution: build.proj
+        solution: build2.proj
         msbuildArchitecture: x64
-        msbuildArguments: >-
-          -t:restore
+        platform: '${{ parameters.platform }}'
+        configuration: '${{ parameters.buildConfiguration }}'
+        msbuildArguments:
+          -t:BuildMds
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-      retryCountOnTaskFailure: 1
-
-    - ${{ if eq(parameters.build, 'allNoDocs') }}:
-      - task: MSBuild@1
-        displayName: 'Build Driver (no docs) [Win]'
-        condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-        inputs:
-          solution: build.proj
-          msbuildArchitecture: x64
-          platform: '${{ parameters.platform }}'
-          configuration: '${{ parameters.buildConfiguration }}'
-          msbuildArguments: >-
-            -t:BuildAllConfigurations
-            -p:ReferenceType=${{ parameters.referenceType }}
-            -p:GenerateNuget=false
-            -p:GenerateDocumentationFile=false
-            -p:BuildNumber=${{ parameters.buildNumber }}
-            -p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
-            -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-            -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-            -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-
-    - ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all')) }}:
-      - task: MSBuild@1
-        displayName: 'Build Driver [Win]'
-        condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-        inputs:
-          solution: build.proj
-          msbuildArchitecture: x64
-          platform: '${{ parameters.platform }}'
-          configuration: '${{ parameters.buildConfiguration }}'
-          msbuildArguments:
-            -t:BuildAllConfigurations
-            -p:ReferenceType=${{ parameters.referenceType }}
-            -p:GenerateNuget=false
-            -p:BuildNumber=${{ parameters.buildNumber }}
-            -p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
-            -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-            -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-            -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+          -p:BuildNumber=${{ parameters.buildNumber }}
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
 
+  # Build AKV Provider
   - ${{ if or(eq(parameters.build, 'AkvProvider'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
     - task: MSBuild@1
       displayName: 'Build AKV Provider'
@@ -136,53 +100,10 @@ steps:
         platform: '${{ parameters.platform }}'
         configuration: '${{ parameters.buildConfiguration }}'
         msbuildArguments: >-
-          -t:BuildAkvProvider
-          -p:ReferenceType=${{ parameters.referenceType }}
-          -p:GenerateNuget=false
-          -p:BuildNumber=${{ parameters.buildNumber }}
-          -p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:AkvPackageVersion=${{ parameters.akvPackageVersion }}
-
-- ${{ if or(eq(parameters.operatingSystem, 'Linux'), eq(parameters.operatingSystem, 'MacOS'), eq(parameters.operatingSystem, 'deferedToRuntime')) }}:
-  - ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
-    - task: DotNetCoreCLI@2
-      displayName: 'Build SqlClient [${{ parameters.operatingSystem }}]'
-      condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))
-      inputs:
-        command: custom
-        projects: build.proj
-        custom: build
-        arguments: >-
-          -t:BuildSqlClient
-          -p:ReferenceType=${{ parameters.referenceType }}
-          -p:TestEnabled=true
-          -p:GenerateNuget=false
-          -p:GenerateDocumentationFile=false
-          -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:BuildNumber=${{ parameters.buildNumber }}
-          -p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-        verbosityRestore: Detailed
-        verbosityPack: Detailed
-
-  - ${{ if or(eq(parameters.build, 'AkvProvider'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
-    - task: DotNetCoreCLI@2
-      displayName: 'Build AKV Provider [${{ parameters.operatingSystem }}]'
-      condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))
-      inputs:
-        command: custom
-        projects: build.proj
-        custom: build
-        arguments: >-
           -t:BuildAkvProvider
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:TestEnabled=true
           -p:GenerateNuget=false
-          -p:GenerateDocumentationFile=false
           -p:Configuration=${{ parameters.buildConfiguration }}
           -p:BuildNumber=${{ parameters.buildNumber }}
           -p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
@@ -192,3 +113,4 @@ steps:
           -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
         verbosityRestore: Detailed
         verbosityPack: Detailed
+
diff --git a/eng/pipelines/common/templates/steps/run-all-tests-step.yml b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
index b1d0261abc..2c407f7d1e 100644
--- a/eng/pipelines/common/templates/steps/run-all-tests-step.yml
+++ b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
@@ -81,168 +81,176 @@ steps:
       displayName: 'Run Unit Tests ${{parameters.msbuildArchitecture }}'
       condition: succeededOrFailed()
       inputs:
-        solution: build.proj
+        solution: build2.proj
         msbuildArchitecture: ${{parameters.msbuildArchitecture }}
         platform: '${{parameters.platform }}'
         configuration: '${{parameters.buildConfiguration }}'
         ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
           msbuildArguments: >-
-            -t:RunUnitTests
-            -p:TF=${{ parameters.targetFramework }}
+            -t:TestMdsUnit
+            -p:TestFramework=${{ parameters.targetFramework }}
             -p:ReferenceType=${{ parameters.referenceType }}
+            -p:TestResultsFolderPath=TestResults
         ${{ else }}: # x86
           msbuildArguments: >-
-            -t:RunUnitTests
-            -p:TF=${{ parameters.targetFramework }}
+            -t:TestMdsUnit
+            -p:TestFramework=${{ parameters.targetFramework }}
             -p:ReferenceType=${{ parameters.referenceType }}
             -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
+            -p:TestResultsFolderPath=TestResults
 
     - task: MSBuild@1
       displayName: 'Run Flaky Unit Tests ${{parameters.msbuildArchitecture }}'
       condition: succeededOrFailed()
       inputs:
-        solution: build.proj
+        solution: build2.proj
         msbuildArchitecture: ${{parameters.msbuildArchitecture }}
         platform: '${{parameters.platform }}'
         configuration: '${{parameters.buildConfiguration }}'
         ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
           msbuildArguments: >-
-            -t:RunUnitTests
-            -p:TF=${{ parameters.targetFramework }}
+            -t:TestMdsUnit
+            -p:TestFramework=${{ parameters.targetFramework }}
             -p:ReferenceType=${{ parameters.referenceType }}
-            -p:Filter="category=flaky"
-            -p:CollectCodeCoverage=false
+            -p:TestFilters="category=flaky"
+            -p:TestResultsFolderPath=TestResults
+            -p:TestCodeCoverage=false
         ${{ else }}: # x86
           msbuildArguments: >-
-            -t:RunUnitTests
-            -p:TF=${{ parameters.targetFramework }}
+            -t:TestMdsUnit
+            -p:TestFramework=${{ parameters.targetFramework }}
             -p:ReferenceType=${{ parameters.referenceType }}
             -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
-            -p:Filter="category=flaky"
-            -p:CollectCodeCoverage=false
+            -p:TestFilters="category=flaky"
+            -p:TestResultsFolderPath=TestResults
+            -p:TestCodeCoverage=false
       continueOnError: true
 
   - task: MSBuild@1
     displayName: 'Run Functional Tests ${{parameters.msbuildArchitecture }}'
     condition: succeededOrFailed()
     inputs:
-      solution: build.proj
+      solution: build2.proj
       msbuildArchitecture: ${{parameters.msbuildArchitecture }}
       platform: '${{parameters.platform }}'
       configuration: '${{parameters.buildConfiguration }}'
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
         msbuildArguments: >-
-          -t:RunFunctionalTests
-          -p:TF=${{ parameters.targetFramework }}
-          -p:TestSet=${{ parameters.testSet }}
+          -t:TestMdsFunctional
+          -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
         msbuildArguments: >-
-          -t:RunFunctionalTests
-          -p:TF=${{ parameters.targetFramework }}
-          -p:TestSet=${{ parameters.testSet }}
+          -t:TestMdsFunctional
+          -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
+          -p:TestResultsFolderPath=TestResults
 
   - task: MSBuild@1
     condition: succeededOrFailed()
     displayName: 'Run Flaky Functional Tests ${{parameters.msbuildArchitecture }}'
     inputs:
-      solution: build.proj
+      solution: build2.proj
       msbuildArchitecture: ${{parameters.msbuildArchitecture }}
       platform: '${{parameters.platform }}'
       configuration: '${{parameters.buildConfiguration }}'
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
         msbuildArguments: >-
-          -t:RunFunctionalTests
-          -p:TF=${{ parameters.targetFramework }}
-          -p:TestSet=${{ parameters.testSet }}
+          -t:TestMdsFunctional
+          -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-          -p:Filter="category=flaky"
-          -p:CollectCodeCoverage=false
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:TestFilters="category=flaky"
+          -p:TestResultsFolderPath=TestResults
+          -p:TestCodeCoverage=false
       ${{ else }}: # x86
         msbuildArguments: >-
-          -t:RunFunctionalTests
-          -p:TF=${{ parameters.targetFramework }}
-          -p:TestSet=${{ parameters.testSet }}
+          -t:TestMdsFunctional
+          -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
-          -p:Filter="category=flaky"
-          -p:CollectCodeCoverage=false
+          -p:TestFilters="category=flaky"
+          -p:TestResultsFolderPath=TestResults
+          -p:TestCodeCoverage=false
     continueOnError: true
 
   - task: MSBuild@1
     condition: succeededOrFailed()
     displayName: 'Run Manual Tests ${{parameters.msbuildArchitecture }}'
     inputs:
-      solution: build.proj
+      solution: build2.proj
       msbuildArchitecture: ${{parameters.msbuildArchitecture }}
       platform: '${{parameters.platform }}'
       configuration: '${{parameters.buildConfiguration }}'
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
         msbuildArguments: >-
-          -t:RunManualTests
-          -p:TF=${{ parameters.targetFramework }}
+          -t:TestMdsManual
+          -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
         msbuildArguments: >-
-          -t:RunManualTests
-          -p:TF=${{ parameters.targetFramework }}
+          -t:TestMdsManual
+          -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
+          -p:TestResultsFolderPath=TestResults
     retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
 
   - task: MSBuild@1
     condition: succeededOrFailed()
     displayName: 'Run Flaky Manual Tests ${{parameters.msbuildArchitecture }}'
     inputs:
-      solution: build.proj
+      solution: build2.proj
       msbuildArchitecture: ${{parameters.msbuildArchitecture }}
       platform: '${{parameters.platform }}'
       configuration: '${{parameters.buildConfiguration }}'
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
         msbuildArguments: >-
-          -t:RunManualTests
-          -p:TF=${{ parameters.targetFramework }}
+          -t:TestMdsManual
+          -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-          -p:Filter="category=flaky"
-          -p:CollectCodeCoverage=false
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:TestFilters="category=flaky"
+          -p:TestResultsFolderPath=TestResults
+          -p:TestCodeCoverage=false
       ${{ else }}: # x86
         msbuildArguments: >-
-          -t:RunManualTests
-          -p:TF=${{ parameters.targetFramework }}
+          -t:TestMdsManual
+          -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
-          -p:Filter="category=flaky"
-          -p:CollectCodeCoverage=false
+          -p:TestFilters="category=flaky"
+          -p:TestResultsFolderPath=TestResults
+          -p:TestCodeCoverage=false
     continueOnError: true
 
 - ${{ else }}: # Linux or macOS
@@ -252,18 +260,17 @@ steps:
       condition: succeededOrFailed()
       inputs:
         command: custom
-        projects: build.proj
+        projects: build2.proj
         custom: msbuild
         arguments: >-
-          -t:RunUnitTests
-          -p:TF=${{ parameters.targetFramework }}
-          -p:TestSet=${{ parameters.testSet }}
+          -t:TestMdsUnit
+          -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-          -p:Platform=${{ parameters.platform }}
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
           -p:Configuration=${{ parameters.buildConfiguration }}
+          -p:TestResultsFolderPath=TestResults
         verbosityRestore: Detailed
         verbosityPack: Detailed
 
@@ -272,20 +279,19 @@ steps:
       condition: succeededOrFailed()
       inputs:
         command: custom
-        projects: build.proj
+        projects: build2.proj
         custom: msbuild
         arguments: >-
-          -t:RunUnitTests
-          -p:TF=${{ parameters.targetFramework }}
-          -p:TestSet=${{ parameters.testSet }}
+          -t:TestMdsUnit
+          -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-          -p:Platform=${{ parameters.platform }}
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:Filter="category=flaky"
-          -p:CollectCodeCoverage=false
+          -p:TestFilters="category=flaky"
+          -p:TestResultsFolderPath=TestResults
+          -p:TestCodeCoverage=false
         verbosityRestore: Detailed
         verbosityPack: Detailed
       continueOnError: true
@@ -295,18 +301,17 @@ steps:
     condition: succeededOrFailed()
     inputs:
       command: custom
-      projects: build.proj
+      projects: build2.proj
       custom: msbuild
       arguments: >-
-        -t:RunFunctionalTests
-        -p:TF=${{ parameters.targetFramework }}
-        -p:TestSet=${{ parameters.testSet }}
+        -t:TestMdsFunctional
+        -p:TestFramework=${{ parameters.targetFramework }}
         -p:ReferenceType=${{ parameters.referenceType }}
-        -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-        -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-        -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-        -p:Platform=${{ parameters.platform }}
+        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+        -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
         -p:Configuration=${{ parameters.buildConfiguration }}
+        -p:TestResultsFolderPath=TestResults
       verbosityRestore: Detailed
       verbosityPack: Detailed
 
@@ -315,20 +320,19 @@ steps:
     displayName: 'Run Flaky Functional Tests'
     inputs:
       command: custom
-      projects: build.proj
+      projects: build2.proj
       custom: msbuild
       arguments: >-
-        -t:RunFunctionalTests
-        -p:TF=${{ parameters.targetFramework }}
-        -p:TestSet=${{ parameters.testSet }}
+        -t:TestMdsFunctional
+        -p:TestFramework=${{ parameters.targetFramework }}
         -p:ReferenceType=${{ parameters.referenceType }}
-        -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-        -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-        -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-        -p:Platform=${{ parameters.platform }}
+        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+        -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
         -p:Configuration=${{ parameters.buildConfiguration }}
-        -p:Filter="category=flaky"
-        -p:CollectCodeCoverage=false
+        -p:TestFilters="category=flaky"
+        -p:TestResultsFolderPath=TestResults
+        -p:TestCodeCoverage=false
       verbosityRestore: Detailed
       verbosityPack: Detailed
     continueOnError: true
@@ -338,18 +342,18 @@ steps:
     condition: succeededOrFailed()
     inputs:
       command: custom
-      projects: build.proj
+      projects: build2.proj
       custom: msbuild
       arguments: >-
-        -t:RunManualTests
-        -p:TF=${{ parameters.targetFramework }}
+        -t:TestMdsManual
+        -p:TestFramework=${{ parameters.targetFramework }}
         -p:TestSet=${{ parameters.testSet }}
         -p:ReferenceType=${{ parameters.referenceType }}
-        -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-        -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-        -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-        -p:platform=${{ parameters.platform }}
+        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+        -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
         -p:Configuration=${{ parameters.buildConfiguration }}
+        -p:TestResultsFolderPath=TestResults
       verbosityRestore: Detailed
       verbosityPack: Detailed
     retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
@@ -359,20 +363,20 @@ steps:
     condition: succeededOrFailed()
     inputs:
       command: custom
-      projects: build.proj
+      projects: build2.proj
       custom: msbuild
       arguments: >-
-        -t:RunManualTests
-        -p:TF=${{ parameters.targetFramework }}
+        -t:TestMdsManual
+        -p:TestFramework=${{ parameters.targetFramework }}
         -p:TestSet=${{ parameters.testSet }}
         -p:ReferenceType=${{ parameters.referenceType }}
-        -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-        -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-        -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-        -p:Platform=${{ parameters.platform }}
+        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+        -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
         -p:Configuration=${{ parameters.buildConfiguration }}
-        -p:Filter="category=flaky"
-        -p:CollectCodeCoverage=false
+        -p:TestFilters="category=flaky"
+        -p:TestResultsFolderPath=TestResults
+        -p:TestCodeCoverage=false
       verbosityRestore: Detailed
       verbosityPack: Detailed
     continueOnError: true
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index 663532b905..a575d2dd6a 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -44,6 +44,7 @@ pr:
       - tools/*
       - azurepipelines-coverage.yml
       - build.proj
+      - build2.proj
       - Directory.Packages.props
       - dotnet-tools.json
       - global.json
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index 868b3010ff..dd8f34e58b 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -44,6 +44,7 @@ pr:
       - tools/*
       - azurepipelines-coverage.yml
       - build.proj
+      - build2.proj
       - Directory.Packages.props
       - dotnet-tools.json
       - global.json
diff --git a/src/Microsoft.Data.SqlClient.sln b/src/Microsoft.Data.SqlClient.sln
index 0a80e8f0ca..b25ed21444 100644
--- a/src/Microsoft.Data.SqlClient.sln
+++ b/src/Microsoft.Data.SqlClient.sln
@@ -220,11 +220,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{4600328C-C13
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipelines", "pipelines", "{4CAE9195-4F1A-4D48-854C-1C9FBC512C66}"
 	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\akv-official-pipeline.yml = ..\eng\pipelines\akv-official-pipeline.yml
 		..\eng\pipelines\dotnet-sqlclient-ci-core.yml = ..\eng\pipelines\dotnet-sqlclient-ci-core.yml
 		..\eng\pipelines\dotnet-sqlclient-ci-package-reference-pipeline.yml = ..\eng\pipelines\dotnet-sqlclient-ci-package-reference-pipeline.yml
 		..\eng\pipelines\dotnet-sqlclient-ci-project-reference-pipeline.yml = ..\eng\pipelines\dotnet-sqlclient-ci-project-reference-pipeline.yml
-		..\eng\pipelines\dotnet-sqlclient-signing-pipeline.yml = ..\eng\pipelines\dotnet-sqlclient-signing-pipeline.yml
 		..\eng\pipelines\sqlclient-pr-package-ref-pipeline.yml = ..\eng\pipelines\sqlclient-pr-package-ref-pipeline.yml
 		..\eng\pipelines\sqlclient-pr-project-ref-pipeline.yml = ..\eng\pipelines\sqlclient-pr-project-ref-pipeline.yml
 		..\eng\pipelines\stress-tests-pipeline.yml = ..\eng\pipelines\stress-tests-pipeline.yml
@@ -236,12 +234,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "jobs", "jobs", "{3850810F-535E-443A-A9B4-7EE85B327E0A}"
 	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\common\templates\jobs\build-signed-package-job.yml = ..\eng\pipelines\common\templates\jobs\build-signed-package-job.yml
 		..\eng\pipelines\common\templates\jobs\ci-build-nugets-job.yml = ..\eng\pipelines\common\templates\jobs\ci-build-nugets-job.yml
 		..\eng\pipelines\common\templates\jobs\ci-code-coverage-job.yml = ..\eng\pipelines\common\templates\jobs\ci-code-coverage-job.yml
 		..\eng\pipelines\common\templates\jobs\ci-run-tests-job.yml = ..\eng\pipelines\common\templates\jobs\ci-run-tests-job.yml
-		..\eng\pipelines\common\templates\jobs\run-tests-package-reference-job.yml = ..\eng\pipelines\common\templates\jobs\run-tests-package-reference-job.yml
-		..\eng\pipelines\common\templates\jobs\validate-signed-package-job.yml = ..\eng\pipelines\common\templates\jobs\validate-signed-package-job.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stages", "stages", "{01FA4774-E594-4A2D-B839-EA7A56D09A8B}"
@@ -251,22 +246,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stages", "stages", "{01FA47
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "steps", "steps", "{EABE3A3E-D505-418A-B1B8-1B0AC4872F3D}"
 	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\common\templates\steps\build-all-configurations-signed-dlls-step.yml = ..\eng\pipelines\common\templates\steps\build-all-configurations-signed-dlls-step.yml
 		..\eng\pipelines\common\templates\steps\build-and-run-tests-netcore-step.yml = ..\eng\pipelines\common\templates\steps\build-and-run-tests-netcore-step.yml
 		..\eng\pipelines\common\templates\steps\build-and-run-tests-netfx-step.yml = ..\eng\pipelines\common\templates\steps\build-and-run-tests-netfx-step.yml
 		..\eng\pipelines\common\templates\steps\ci-project-build-step.yml = ..\eng\pipelines\common\templates\steps\ci-project-build-step.yml
-		..\eng\pipelines\common\templates\steps\code-analyze-step.yml = ..\eng\pipelines\common\templates\steps\code-analyze-step.yml
 		..\eng\pipelines\common\templates\steps\configure-sql-server-linux-step.yml = ..\eng\pipelines\common\templates\steps\configure-sql-server-linux-step.yml
 		..\eng\pipelines\common\templates\steps\configure-sql-server-macos-step.yml = ..\eng\pipelines\common\templates\steps\configure-sql-server-macos-step.yml
 		..\eng\pipelines\common\templates\steps\configure-sql-server-step.yml = ..\eng\pipelines\common\templates\steps\configure-sql-server-step.yml
 		..\eng\pipelines\common\templates\steps\configure-sql-server-win-step.yml = ..\eng\pipelines\common\templates\steps\configure-sql-server-win-step.yml
-		..\eng\pipelines\common\templates\steps\copy-dlls-for-test-step.yml = ..\eng\pipelines\common\templates\steps\copy-dlls-for-test-step.yml
-		..\eng\pipelines\common\templates\steps\esrp-code-signing-step.yml = ..\eng\pipelines\common\templates\steps\esrp-code-signing-step.yml
 		..\eng\pipelines\common\templates\steps\generate-nuget-package-step.yml = ..\eng\pipelines\common\templates\steps\generate-nuget-package-step.yml
 		..\eng\pipelines\common\templates\steps\override-sni-version.yml = ..\eng\pipelines\common\templates\steps\override-sni-version.yml
 		..\eng\pipelines\common\templates\steps\pre-build-step.yml = ..\eng\pipelines\common\templates\steps\pre-build-step.yml
 		..\eng\pipelines\common\templates\steps\prepare-test-db-step.yml = ..\eng\pipelines\common\templates\steps\prepare-test-db-step.yml
-		..\eng\pipelines\common\templates\steps\publish-symbols-step.yml = ..\eng\pipelines\common\templates\steps\publish-symbols-step.yml
 		..\eng\pipelines\common\templates\steps\publish-test-results-step.yml = ..\eng\pipelines\common\templates\steps\publish-test-results-step.yml
 		..\eng\pipelines\common\templates\steps\run-all-tests-step.yml = ..\eng\pipelines\common\templates\steps\run-all-tests-step.yml
 		..\eng\pipelines\common\templates\steps\update-config-file-step.yml = ..\eng\pipelines\common\templates\steps\update-config-file-step.yml
@@ -274,27 +264,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "steps", "steps", "{EABE3A3E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libraries", "libraries", "{75BAE755-3A1F-41F2-9176-9F8FF9FEE2DD}"
 	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\libraries\build-variables.yml = ..\eng\pipelines\libraries\build-variables.yml
 		..\eng\pipelines\libraries\ci-build-variables.yml = ..\eng\pipelines\libraries\ci-build-variables.yml
-		..\eng\pipelines\libraries\common-variables.yml = ..\eng\pipelines\libraries\common-variables.yml
-		..\eng\pipelines\libraries\mds-validation-variables.yml = ..\eng\pipelines\libraries\mds-validation-variables.yml
-		..\eng\pipelines\libraries\mds-variables.yml = ..\eng\pipelines\libraries\mds-variables.yml
-		..\eng\pipelines\libraries\variables.yml = ..\eng\pipelines\libraries\variables.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "variables", "variables", "{1C796A8E-3529-481B-9D4F-88C67D03DCA2}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\variables\akv-official-variables.yml = ..\eng\pipelines\variables\akv-official-variables.yml
-		..\eng\pipelines\variables\common-variables.yml = ..\eng\pipelines\variables\common-variables.yml
-		..\eng\pipelines\variables\esrp-signing-variables.yml = ..\eng\pipelines\variables\esrp-signing-variables.yml
-		..\eng\pipelines\variables\onebranch-variables.yml = ..\eng\pipelines\variables\onebranch-variables.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "jobs", "jobs", "{09352F1D-878F-4F55-8AA2-6E47F1AD37D5}"
 	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\jobs\build-akv-official-job.yml = ..\eng\pipelines\jobs\build-akv-official-job.yml
 		..\eng\pipelines\jobs\pack-abstractions-package-ci-job.yml = ..\eng\pipelines\jobs\pack-abstractions-package-ci-job.yml
 		..\eng\pipelines\jobs\pack-azure-package-ci-job.yml = ..\eng\pipelines\jobs\pack-azure-package-ci-job.yml
+		..\eng\pipelines\jobs\pack-logging-package-ci-job.yml = ..\eng\pipelines\jobs\pack-logging-package-ci-job.yml
 		..\eng\pipelines\jobs\stress-tests-ci-job.yml = ..\eng\pipelines\jobs\stress-tests-ci-job.yml
 		..\eng\pipelines\jobs\test-abstractions-package-ci-job.yml = ..\eng\pipelines\jobs\test-abstractions-package-ci-job.yml
 		..\eng\pipelines\jobs\test-azure-package-ci-job.yml = ..\eng\pipelines\jobs\test-azure-package-ci-job.yml
@@ -302,16 +279,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "jobs", "jobs", "{09352F1D-8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "steps", "steps", "{AD738BD4-6A02-4B88-8F93-FBBBA49A74C8}"
 	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\steps\compound-build-akv-step.yml = ..\eng\pipelines\steps\compound-build-akv-step.yml
-		..\eng\pipelines\steps\compound-esrp-dll-signing-step.yml = ..\eng\pipelines\steps\compound-esrp-dll-signing-step.yml
-		..\eng\pipelines\steps\compound-esrp-nuget-signing-step.yml = ..\eng\pipelines\steps\compound-esrp-nuget-signing-step.yml
-		..\eng\pipelines\steps\compound-extract-akv-apiscan-files-step.yml = ..\eng\pipelines\steps\compound-extract-akv-apiscan-files-step.yml
-		..\eng\pipelines\steps\compound-nuget-pack-step.yml = ..\eng\pipelines\steps\compound-nuget-pack-step.yml
-		..\eng\pipelines\steps\compound-publish-symbols-step.yml = ..\eng\pipelines\steps\compound-publish-symbols-step.yml
 		..\eng\pipelines\steps\install-dotnet.yml = ..\eng\pipelines\steps\install-dotnet.yml
 		..\eng\pipelines\steps\install-dotnet-arm64.ps1 = ..\eng\pipelines\steps\install-dotnet-arm64.ps1
-		..\eng\pipelines\steps\roslyn-analyzers-akv-step.yml = ..\eng\pipelines\steps\roslyn-analyzers-akv-step.yml
-		..\eng\pipelines\steps\script-output-environment-variables-step.yml = ..\eng\pipelines\steps\script-output-environment-variables-step.yml
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient.UnitTests", "Microsoft.Data.SqlClient\tests\UnitTests\Microsoft.Data.SqlClient.UnitTests.csproj", "{4461063D-2F2B-274C-7E6F-F235119D258E}"
@@ -363,6 +332,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient.Internal", "Microsoft.Data.SqlClient.Internal", "{C1D2E3F4-A5B6-7C8D-9E0F-1A2B3C4D5E6F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient", "{7289C27E-D7DF-2C71-84B4-151F3A162493}"
+	ProjectSection(SolutionItems) = preProject
+		Microsoft.Data.SqlClient\MdsVersions.props = Microsoft.Data.SqlClient\MdsVersions.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7E0602AC-7F0A-362A-D734-0FDDFCC600B5}"
 EndProject
@@ -372,6 +344,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stages", "stages", "{E9D12A
 	ProjectSection(SolutionItems) = preProject
 		..\eng\pipelines\stages\build-abstractions-package-ci-stage.yml = ..\eng\pipelines\stages\build-abstractions-package-ci-stage.yml
 		..\eng\pipelines\stages\build-azure-package-ci-stage.yml = ..\eng\pipelines\stages\build-azure-package-ci-stage.yml
+		..\eng\pipelines\stages\build-logging-package-ci-stage.yml = ..\eng\pipelines\stages\build-logging-package-ci-stage.yml
+		..\eng\pipelines\stages\build-sqlclient-package-ci-stage.yml = ..\eng\pipelines\stages\build-sqlclient-package-ci-stage.yml
+		..\eng\pipelines\stages\generate-secrets-ci-stage.yml = ..\eng\pipelines\stages\generate-secrets-ci-stage.yml
 		..\eng\pipelines\stages\stress-tests-ci-stage.yml = ..\eng\pipelines\stages\stress-tests-ci-stage.yml
 	EndProjectSection
 EndProject
@@ -391,6 +366,48 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.GenAPI", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Cci.Extensions", "..\tools\GenAPI\Microsoft.Cci.Extensions\Microsoft.Cci.Extensions.csproj", "{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "onebranch", "onebranch", "{5EC4C165-25BB-4346-9DCC-5EFEEAC00C02}"
+	ProjectSection(SolutionItems) = preProject
+		..\eng\pipelines\onebranch\sqlclient-non-official.yml = ..\eng\pipelines\onebranch\sqlclient-non-official.yml
+		..\eng\pipelines\onebranch\sqlclient-official.yml = ..\eng\pipelines\onebranch\sqlclient-official.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "jobs", "jobs", "{B3061B34-2A1C-49B9-A3A9-D4D37B4704B2}"
+	ProjectSection(SolutionItems) = preProject
+		..\eng\pipelines\onebranch\jobs\build-signed-csproj-package-job.yml = ..\eng\pipelines\onebranch\jobs\build-signed-csproj-package-job.yml
+		..\eng\pipelines\onebranch\jobs\build-signed-sqlclient-package-job.yml = ..\eng\pipelines\onebranch\jobs\build-signed-sqlclient-package-job.yml
+		..\eng\pipelines\onebranch\jobs\publish-nuget-package-job.yml = ..\eng\pipelines\onebranch\jobs\publish-nuget-package-job.yml
+		..\eng\pipelines\onebranch\jobs\validate-signed-package-job.yml = ..\eng\pipelines\onebranch\jobs\validate-signed-package-job.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stages", "stages", "{3654906C-6852-48AF-BC7E-B3A62F3E9DB9}"
+	ProjectSection(SolutionItems) = preProject
+		..\eng\pipelines\onebranch\stages\build-stages.yml = ..\eng\pipelines\onebranch\stages\build-stages.yml
+		..\eng\pipelines\onebranch\stages\release-stages.yml = ..\eng\pipelines\onebranch\stages\release-stages.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "steps", "steps", "{45B9E5C3-DED5-4DB6-B1E6-4EAC4E68BA83}"
+	ProjectSection(SolutionItems) = preProject
+		..\eng\pipelines\onebranch\steps\build-all-configurations-signed-dlls-step.yml = ..\eng\pipelines\onebranch\steps\build-all-configurations-signed-dlls-step.yml
+		..\eng\pipelines\onebranch\steps\code-analyze-step.yml = ..\eng\pipelines\onebranch\steps\code-analyze-step.yml
+		..\eng\pipelines\onebranch\steps\compound-build-csproj-step.yml = ..\eng\pipelines\onebranch\steps\compound-build-csproj-step.yml
+		..\eng\pipelines\onebranch\steps\compound-esrp-dll-signing-step.yml = ..\eng\pipelines\onebranch\steps\compound-esrp-dll-signing-step.yml
+		..\eng\pipelines\onebranch\steps\compound-esrp-nuget-signing-step.yml = ..\eng\pipelines\onebranch\steps\compound-esrp-nuget-signing-step.yml
+		..\eng\pipelines\onebranch\steps\compound-nuget-pack-step.yml = ..\eng\pipelines\onebranch\steps\compound-nuget-pack-step.yml
+		..\eng\pipelines\onebranch\steps\compound-pack-csproj-step.yml = ..\eng\pipelines\onebranch\steps\compound-pack-csproj-step.yml
+		..\eng\pipelines\onebranch\steps\compound-publish-symbols-step.yml = ..\eng\pipelines\onebranch\steps\compound-publish-symbols-step.yml
+		..\eng\pipelines\onebranch\steps\esrp-code-signing-step.yml = ..\eng\pipelines\onebranch\steps\esrp-code-signing-step.yml
+		..\eng\pipelines\onebranch\steps\publish-symbols-step.yml = ..\eng\pipelines\onebranch\steps\publish-symbols-step.yml
+		..\eng\pipelines\onebranch\steps\script-output-environment-variables-step.yml = ..\eng\pipelines\onebranch\steps\script-output-environment-variables-step.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "variables", "variables", "{E849E6FB-1AB0-4922-A060-0062EA669FD0}"
+	ProjectSection(SolutionItems) = preProject
+		..\eng\pipelines\onebranch\variables\common-variables.yml = ..\eng\pipelines\onebranch\variables\common-variables.yml
+		..\eng\pipelines\onebranch\variables\onebranch-variables.yml = ..\eng\pipelines\onebranch\variables\onebranch-variables.yml
+		..\eng\pipelines\onebranch\variables\sqlclient-validation-variables.yml = ..\eng\pipelines\onebranch\variables\sqlclient-validation-variables.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -883,7 +900,6 @@ Global
 		{01FA4774-E594-4A2D-B839-EA7A56D09A8B} = {E76A4ED5-9137-4E4B-AE91-7AEDB2683823}
 		{EABE3A3E-D505-418A-B1B8-1B0AC4872F3D} = {E76A4ED5-9137-4E4B-AE91-7AEDB2683823}
 		{75BAE755-3A1F-41F2-9176-9F8FF9FEE2DD} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
-		{1C796A8E-3529-481B-9D4F-88C67D03DCA2} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
 		{09352F1D-878F-4F55-8AA2-6E47F1AD37D5} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
 		{AD738BD4-6A02-4B88-8F93-FBBBA49A74C8} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
 		{4461063D-2F2B-274C-7E6F-F235119D258E} = {0CC4817A-12F3-4357-912C-09315FAAD008}
@@ -918,6 +934,11 @@ Global
 		{1DB299CE-95EA-4566-84DD-171768758291} = {351BE847-A0BF-450C-A5BC-8337AFA49EAA}
 		{583E2B51-A90B-4F34-AD8B-4061504E855E} = {351BE847-A0BF-450C-A5BC-8337AFA49EAA}
 		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC} = {351BE847-A0BF-450C-A5BC-8337AFA49EAA}
+		{5EC4C165-25BB-4346-9DCC-5EFEEAC00C02} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
+		{B3061B34-2A1C-49B9-A3A9-D4D37B4704B2} = {5EC4C165-25BB-4346-9DCC-5EFEEAC00C02}
+		{3654906C-6852-48AF-BC7E-B3A62F3E9DB9} = {5EC4C165-25BB-4346-9DCC-5EFEEAC00C02}
+		{45B9E5C3-DED5-4DB6-B1E6-4EAC4E68BA83} = {5EC4C165-25BB-4346-9DCC-5EFEEAC00C02}
+		{E849E6FB-1AB0-4922-A060-0062EA669FD0} = {5EC4C165-25BB-4346-9DCC-5EFEEAC00C02}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {01D48116-37A2-4D33-B9EC-94793C702431}
diff --git a/src/Microsoft.Data.SqlClient/MdsVersions.props b/src/Microsoft.Data.SqlClient/MdsVersions.props
new file mode 100644
index 0000000000..e50e813f66
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/MdsVersions.props
@@ -0,0 +1,35 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- This file contains versioning information for the Microsoft.Data.SqlClient package. -->
+  <PropertyGroup>
+    <MdsVersionDefault>7.0.0</MdsVersionDefault>
+
+    <BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
+
+    <!--
+      This is the version that is used as the AssemblyVersion and FileVersion fields in the
+      assembly's manifest. If it is not overridden, it will default to the above default version
+      with the build number appended.
+      As a convenience feature, if a package version but not an assembly version is supplied, the
+      package version will have any suffix trimmed to generate valid assembly version.
+
+      NOTE: It is possible that the build number can be in the format xxxxx.yy which *may* overflow
+      the 16-bit integer for the revision part of the assembly version. For that reason, we simply
+      discard everything after the first part of the build number for the assembly version.
+    -->
+    <MdsAssemblyVersion Condition="'$(MdsAssemblyVersion)' == '' AND '$(MdsPackageVersion)' == ''">$(MdsVersionDefault).$(BuildNumber.Split('.')[0])</MdsAssemblyVersion>
+    <MdsAssemblyVersion Condition="'$(MdsAssemblyVersion)' == '' AND '$(MdsPackageVersion)' != ''">$(MdsPackageVersion.Split('-')[0])</MdsAssemblyVersion>
+
+    <!--
+      This is the version that is used as the version for the NuGet package. If it is not
+      overridden, the above default version will be used with the build number and a string suffix
+      appended (to indicate the version is pre-production).
+
+      NOTE: NuGet versioning can handle arbitrary version strings, so we do not need to trim the
+      build number like we do for the assembly version.
+
+      NOTE/@TODO: Since the PackMds target in build2.proj directly calls nuget.exe, it will not
+          pick up this property.
+    -->
+    <MdsPackageVersion Condition="'$(MdsPackageVersion)' == ''">$(MdsVersionDefault).$(BuildNumber)-dev</MdsPackageVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
index 065e10dcd3..6f5fc44f59 100644
--- a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
@@ -67,6 +67,14 @@
     <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>
 
+  <!-- Versioning ====================================================== -->
+  <Import Project="../MdsVersions.props" />
+  <PropertyGroup>
+    <AssemblyVersion>$(MdsAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(MdsAssemblyVersion)</FileVersion>
+    <Version>$(MdsPackageVersion)</Version>
+  </PropertyGroup>
+
   <!-- Build Output ==================================================== -->
   <PropertyGroup>
     <!--
@@ -74,7 +82,7 @@
       is possible but also requires specifying the IntermediateOutputPath. So while it would be
       nice to have a flatter directory structure, it's more hassle than its worth.
     -->
-    <OutputPath>$(RepoRoot)artifacts/$(AssemblyName).notsupported/$(Configuration)/</OutputPath>
+    <OutputPath>$(RepoRoot)artifacts/$(AssemblyName).notsupported/$(ReferenceType)-$(Configuration)/</OutputPath>
   </PropertyGroup>
 
   <!-- References ====================================================== -->
@@ -86,7 +94,7 @@
   -->
   <PropertyGroup>
     <RefProjectPath>$(RepoRoot)src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj</RefProjectPath>
-    <RefArtifactPath>$(RepoRoot)artifacts/Microsoft.Data.SqlClient.ref/$(Configuration)/$(TargetFramework)/Microsoft.Data.SqlClient.dll</RefArtifactPath>
+    <RefArtifactPath>$(RepoRoot)artifacts/Microsoft.Data.SqlClient.ref/$(ReferenceType)-$(Configuration)/$(TargetFramework)/Microsoft.Data.SqlClient.dll</RefArtifactPath>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(RefProjectPath)"
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
index 69a29c5b02..ce6e481434 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
@@ -818,7 +818,7 @@ protected override void SetRowUpdatingHandler(System.Data.Common.DbDataAdapter a
 /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConfigurableRetryFactory.xml' path='docs/members[@name="SqlConfigurableRetryFactory"]/SqlConfigurableRetryFactory/*' />
 public sealed class SqlConfigurableRetryFactory
 {
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConfigurableRetryFactory.xml' path='docs/members[@name="SqlConfigurableRetryFactory"]/BaselineTransientErrors/*' />
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConfigurableRetryFactory.xml' path='docs/members[@name="SqlConfigurableRetryFactory"]/BaselineTransientErrors/*' />
     public static System.Collections.ObjectModel.ReadOnlyCollection<int> BaselineTransientErrors { get { throw null; } }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConfigurableRetryFactory.xml' path='docs/members[@name="SqlConfigurableRetryFactory"]/CreateExponentialRetryProvider/*' />
     public static SqlRetryLogicBaseProvider CreateExponentialRetryProvider(SqlRetryLogicOption retryLogicOption) { throw null; }
@@ -885,7 +885,7 @@ public SqlConnection(string connectionString, Microsoft.Data.SqlClient.SqlCreden
     [System.ComponentModel.BrowsableAttribute(false)]
     [System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
     public Microsoft.Data.SqlClient.SqlCredential Credential { get { throw null; } set { } }
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/SspiContextProvider/*' />
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/SspiContextProvider/*' />
     public SspiContextProvider SspiContextProvider { get { throw null; } set { } }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/Database/*'/>
     [System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
@@ -1359,7 +1359,7 @@ public SqlDataAdapter(string selectCommandText, string selectConnectionString) {
     public event Microsoft.Data.SqlClient.SqlRowUpdatedEventHandler RowUpdated { add { } remove { } }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/RowUpdating/*'/>
     public event Microsoft.Data.SqlClient.SqlRowUpdatingEventHandler RowUpdating { add { } remove { } }
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/OnRowUpdated/*'/>
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/OnRowUpdated/*'/>
     protected override void OnRowUpdated(System.Data.Common.RowUpdatedEventArgs value) { }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/OnRowUpdating/*'/>
     protected override void OnRowUpdating(System.Data.Common.RowUpdatingEventArgs value) { }
@@ -2181,7 +2181,7 @@ public sealed class SspiAuthenticationParameters
 {
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SspiAuthenticationParameters.xml' path='docs/members[@name="SspiAuthenticationParameters"]/SspiAuthenticationParameters/ctor'/>
     public SspiAuthenticationParameters(
-        string serverName, 
+        string serverName,
         string resource,
         string userId = null,
         string databaseName = null,
@@ -2201,4 +2201,4 @@ public SspiAuthenticationParameters(
 
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SspiAuthenticationParameters.xml' path='docs/members[@name="SspiAuthenticationParameters"]/SspiAuthenticationParameters/Password'/>
     public string Password { get { throw null; } }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
index 447fb01182..dbdf7e9338 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -2,6 +2,15 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
     <TargetFrameworks>net462;net8.0;net9.0;netstandard2.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <!-- Versioning ====================================================== -->
+  <Import Project="../MdsVersions.props" />
+  <PropertyGroup>
+    <AssemblyVersion>$(MdsAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(MdsAssemblyVersion)</FileVersion>
+    <Version>$(MdsPackageVersion)</Version>
   </PropertyGroup>
 
   <!-- CLS Compliance ================================================== -->
@@ -24,7 +33,7 @@
       is possible but also requires specifying the IntermediateOutputPath. So while it would be
       nice to have a flatter directory structure, it's more hassle than its worth.
     -->
-    <OutputPath>$(ArtifactPath)$(AssemblyName).ref/$(Configuration)/</OutputPath>
+    <OutputPath>$(ArtifactPath)$(AssemblyName).ref/$(ReferenceType)-$(Configuration)/</OutputPath>
   </PropertyGroup>
 
   <!-- Trim Docs for IntelliSense ====================================== -->
@@ -35,7 +44,9 @@
     have the full documentation.
   -->
   <!-- This target runs after Build, and trims XML documentation generated in the $(OutputPath) of the project where this target is included.-->
-  <Target Name="TrimDocsForIntelliSense" AfterTargets="Build">
+  <Target Name="TrimDocsForIntelliSense"
+          AfterTargets="Build"
+          Condition="'$(IsCrossTargetingBuild)' != 'true' AND '$(GenerateDocumentationFile)' == 'true'">
     <PropertyGroup>
       <PowerShellCommand Condition="'$(OS)' == 'Windows_NT'">powershell.exe</PowerShellCommand>
       <PowerShellCommand Condition="'$(OS)' != 'Windows_NT'">pwsh</PowerShellCommand>
@@ -43,7 +54,7 @@
         $(PowerShellCommand)
           -NonInteractive
           -ExecutionPolicy Unrestricted
-          -Command "$(RepoRoot)tools\intellisense\TrimDocs.ps1 -inputFile '$(OutputPath)\Microsoft.Data.SqlClient.xml' -outputFile '$(OutputPath)\Microsoft.Data.SqlClient.xml'"
+          -Command "$(RepoRoot)tools\intellisense\TrimDocs.ps1 -inputFile '$(DocumentationFile)' -outputFile '$(DocumentationFile)'"
       </PowerShellCommand>
 
       <!-- Convert more than one whitespace character into one space -->
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index d0713280e6..49f5677535 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -1,11 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<!-- General Properties ============================================== -->
+  <!-- General Properties ============================================== -->
   <PropertyGroup>
     <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
     <Configurations>Debug;Release;</Configurations>
     <RootNamespace />
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	</PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <!-- Versioning ====================================================== -->
+  <Import Project="../MdsVersions.props" />
+  <PropertyGroup>
+    <AssemblyVersion>$(MdsAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(MdsAssemblyVersion)</FileVersion>
+    <Version>$(MdsPackageVersion)</Version>
+  </PropertyGroup>
 
   <!-- CLS Compliance ================================================== -->
   <ItemGroup>
@@ -62,7 +72,7 @@
     <!-- MSBuild will add the target framework to the end of this path by default. Telling it not -->
     <!-- to is possible but requires also specifying the IntermediateOutputPath. So while it      -->
     <!-- would be nice to have a flat directory structure, it's more hassle than its worth.       -->
-    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)/$(NormalizedTargetOs)/</OutputPath>
+    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(ReferenceType)-$(Configuration)/$(NormalizedTargetOs)/</OutputPath>
   </PropertyGroup>
 
   <!-- Embedded resources ============================================== -->
@@ -124,7 +134,7 @@
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.Threading.Channels" />
     <PackageReference Include="System.ValueTuple" />
-	</ItemGroup>
+  </ItemGroup>
 
   <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index 0d6203c08d..8806df9432 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -845,7 +845,7 @@ private TdsOperationStatus TryCleanPartialRead()
         private void CleanPartialReadReliable()
         {
             AssertReaderState(requireData: true, permitAsync: false);
-            
+
             TdsOperationStatus result = TryCleanPartialRead();
             Debug.Assert(result == TdsOperationStatus.Done, "Should not pend on sync call");
             Debug.Assert(!_sharedState._dataReady, "_dataReady should be cleared");
@@ -1054,7 +1054,7 @@ private TdsOperationStatus TryCloseInternal(bool closeReader)
                     {
                         Connection.RemoveWeakReference(this);  // This doesn't catch everything -- the connection may be closed, but it prevents dead readers from clogging the collection
                     }
-                    
+
                     // IsClosed may be true if CloseReaderFromConnection was called - in which case, the session has already been closed
                     if (!wasClosed && stateObj != null)
                     {
@@ -1073,7 +1073,7 @@ private TdsOperationStatus TryCloseInternal(bool closeReader)
                         }
                     }
                     // @TODO: CER Exception Handling was removed here (see GH#3581)
-                    
+
                     // DO NOT USE stateObj after this point - it has been returned to the TdsParser's session pool and potentially handed out to another thread
 
                     // do not retry here
@@ -1658,7 +1658,7 @@ private TdsOperationStatus TryGetBytesInternal(int i, long dataIndex, byte[] buf
         {
             remaining = 0;
             TdsOperationStatus result;
-            
+
             int cbytes = 0;
             AssertReaderState(requireData: true, permitAsync: true, columnIndex: i, enforceSequentialAccess: true);
 
@@ -2598,7 +2598,7 @@ virtual public SqlXml GetSqlXml(int i)
             return sx;
         }
 
-        /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlJson/*' />
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlJson/*' />
         virtual public SqlJson GetSqlJson(int i)
         {
             ReadColumn(i);
@@ -2606,7 +2606,7 @@ virtual public SqlJson GetSqlJson(int i)
             return json;
         }
 
-        /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlVector/*' />
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlVector/*' />
         virtual public SqlVector<T> GetSqlVector<T>(int i) where T : unmanaged
         {
             if (typeof(T) != typeof(float))
@@ -3139,7 +3139,7 @@ private T GetFieldValueFromSqlBufferInternal<T>(SqlBuffer data, _SqlMetaData met
                         return (T)(object)data.String;
                     }
                     // the requested type is likely to be one that isn't supported so try the cast and
-                    // unless there is a null value conversion then feedback the cast exception with 
+                    // unless there is a null value conversion then feedback the cast exception with
                     // type named to the user so they know what went wrong. Supported types are listed
                     // in the documentation
                     try
@@ -3909,7 +3909,7 @@ private TdsOperationStatus TryReadColumnHeader(int i)
             {
                 throw SQL.InvalidRead();
             }
-            
+
             return TryReadColumnInternal(i, readHeaderOnly: true);
             // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlDbTypeExtensions.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlDbTypeExtensions.cs
index 96244fb7a8..0b6780f900 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlDbTypeExtensions.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlDbTypeExtensions.cs
@@ -6,16 +6,16 @@
 
 namespace Microsoft.Data
 {
-    /// <include file='../../../../doc/snippets/Microsoft.Data/SqlDbTypeExtensions.xml' path='docs/members[@name="SqlDbTypeExtensions"]/SqlDbTypeExtensions/*' />
+    /// <include file='../../../../../doc/snippets/Microsoft.Data/SqlDbTypeExtensions.xml' path='docs/members[@name="SqlDbTypeExtensions"]/SqlDbTypeExtensions/*' />
     public static class SqlDbTypeExtensions
     {
-        /// <include file='../../../../doc/snippets/Microsoft.Data/SqlDbTypeExtensions.xml' path='docs/members[@name="SqlDbTypeExtensions"]/SqlJson[@name="default"]' />
+        /// <include file='../../../../../doc/snippets/Microsoft.Data/SqlDbTypeExtensions.xml' path='docs/members[@name="SqlDbTypeExtensions"]/SqlJson[@name="default"]' />
 #if NET9_0_OR_GREATER
         public const SqlDbType Json = SqlDbType.Json;
 #else
         public const SqlDbType Json = (SqlDbType)35;
 #endif
-        /// <include file='../../../../doc/snippets/Microsoft.Data/SqlDbTypeExtensions.xml' path='docs/members[@name="SqlDbTypeExtensions"]/SqlVector[@name="default"]' />
+        /// <include file='../../../../../doc/snippets/Microsoft.Data/SqlDbTypeExtensions.xml' path='docs/members[@name="SqlDbTypeExtensions"]/SqlVector[@name="default"]' />
 #if NET10_0_OR_GREATER
         public const SqlDbType Vector = SqlDbType.Vector;
 #else
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlJson.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlJson.cs
index 8d0ee74cc6..0c1047ee6d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlJson.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlJson.cs
@@ -12,18 +12,18 @@
 
 namespace Microsoft.Data.SqlTypes
 {
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/SqlJson/*' />
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/SqlJson/*' />
     public class SqlJson : INullable
     {
         // Our serialized JSON string, or null.
         private readonly string? _jsonString = null;
 
-        /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/ctor1/*' />
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/ctor1/*' />
         public SqlJson()
         {
         }
 
-        /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/ctor2/*' />
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/ctor2/*' />
         #if NET
         public SqlJson([StringSyntax(StringSyntaxAttribute.Json)] string? jsonString)
         #else
@@ -45,8 +45,8 @@ public SqlJson(string? jsonString)
             _jsonString = jsonString;
         }
 
-        /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/ctor3/*' />
-        public SqlJson(JsonDocument? jsonDoc) 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/ctor3/*' />
+        public SqlJson(JsonDocument? jsonDoc)
         {
             if (jsonDoc == null)
             {
@@ -57,15 +57,15 @@ public SqlJson(JsonDocument? jsonDoc)
             _jsonString = jsonDoc.RootElement.GetRawText();
         }
 
-        /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/IsNull/*' />
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/IsNull/*' />
         public bool IsNull => _jsonString is null;
 
-        /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/Null/*' />
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/Null/*' />
         public static SqlJson Null => new();
 
-        /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/Value/*' />
-        public string Value 
-        { 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/Value/*' />
+        public string Value
+        {
             get
             {
                 if (IsNull)
@@ -77,7 +77,7 @@ public string Value
             }
         }
 
-        /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/ToString/*' />
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml' path='docs/members[@name="SqlJson"]/ToString/*' />
         public override string? ToString()
         {
             return _jsonString;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs
index cf04ff8636..14e790e977 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs
@@ -15,7 +15,7 @@
 
 namespace Microsoft.Data.SqlTypes;
 
-/// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/SqlVector/*' />
+/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/SqlVector/*' />
 public readonly struct SqlVector<T> : INullable, ISqlVector
 where T : unmanaged
 {
@@ -55,10 +55,10 @@ private SqlVector(int length)
         Memory = new();
     }
 
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/CreateNull/*' />
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/CreateNull/*' />
     public static SqlVector<T> CreateNull(int length) => new(length);
 
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/ctor1/*' />
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/ctor1/*' />
     public SqlVector(ReadOnlyMemory<T> memory)
     {
         (_elementType, _elementSize) = GetTypeFieldsOrThrow();
@@ -101,16 +101,16 @@ internal string GetString()
 
     #region Properties
 
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/IsNull/*' />
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/IsNull/*' />
     public bool IsNull { get; }
 
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/Null/*' />
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/Null/*' />
     public static SqlVector<T>? Null => null;
 
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/Length/*' />
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/Length/*' />
     public int Length { get; }
-    
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/Memory/*' />
+
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/Memory/*' />
     public ReadOnlyMemory<T> Memory { get; }
 
     #endregion
@@ -206,7 +206,7 @@ private byte[] MakeTdsBytes(ReadOnlyMemory<T> values)
 
         // The vector length is an unsigned 16-bit integer, little-endian.
         int length = BinaryPrimitives.ReadUInt16LittleEndian(rawBytes.AsSpan(2));
-        
+
         // The vector size is the number of bytes required to represent the vector in TDS.
         int size = TdsEnums.VECTOR_HEADER_SIZE + (_elementSize * length);
 
@@ -237,6 +237,6 @@ private T[] MakeArray()
         return MemoryMarshal.Cast<byte, T>(dataSpan).ToArray();
 #endif
     }
-    
+
     #endregion
 }
diff --git a/tools/intellisense/TrimDocs.ps1 b/tools/intellisense/TrimDocs.ps1
index c5e7eeb893..b09b8fc9d7 100644
--- a/tools/intellisense/TrimDocs.ps1
+++ b/tools/intellisense/TrimDocs.ps1
@@ -7,10 +7,11 @@ param (
     [string]$outputFile=""
 )
 
+$ErrorActionPreference = 'Stop'
+
 # Validate inputFile exists
 if (-not (Test-Path $inputFile)) {
-    Write-Host "XML File not found: $inputFile"
-    exit
+    throw "XML File not found: $inputFile"
 }
 
 [xml]$xml = Get-Content $inputFile
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 739055dbf0..858b41628b 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -29,38 +29,7 @@
   <!-- Logging Package Properties -->
   <Import Project="..\..\src\Microsoft.Data.SqlClient.Internal\Logging\src\LoggingVersions.props" />
 
-  <!-- MDS Package Properties -->
-  <PropertyGroup>
-    <MdsVersionDefault>7.0.0</MdsVersionDefault>
-
-    <MdsPackageVersion Condition="'$(MdsPackageVersion)' == ''">$(MdsVersionDefault).$(BuildNumber)-dev</MdsPackageVersion>
-
-    <!--
-      TODO: The remaining properties in this group should be renamed to be
-      specific to MDS, and then used in the MDS project.  As-is, these names are
-      used by the build tooling and may be unintentionally included in other
-      (non-MDS) projects.
-    -->
-
-    <!--
-      GOTCHA: These two Assembly properties must appear in the third
-      <PropertyGroup> in this file due to hardcoded XML processing in:
-
-      eng/pipelines/common/templates/jobs/validate-signed-package-job.yml
-    -->
-    <AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">$(MdsVersionDefault).$(AssemblyBuildNumber)</AssemblyFileVersion>
-
-    <!-- Only update the major version number here. -->
-    <AssemblyVersion>7.0.0.0</AssemblyVersion>
-
-    <FileVersion>$(AssemblyFileVersion)</FileVersion>
-
-    <!--
-      GOTCHA: This pollutes the AssemblyInfo.cs AssemblyInformationalVersion
-      attribute's value generated by the build tooling for all projects!
-    -->
-    <Version>$(MdsPackageVersion)</Version>
-  </PropertyGroup>
+  <!-- For MDS Versioning, see src/Microsoft.Data.SqlClient/MdsVersions.props -->
 
   <!-- Azure Package Properties -->
   <Import Project="..\..\src\Microsoft.Data.SqlClient.Extensions\Azure\src\AzureVersions.props" />
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index cbea2140c7..2e80556c98 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -123,103 +123,111 @@
       command line to indicate where the DLLs are.
     -->
 
-    <!-- ref NetFx -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient\ref\net462\Microsoft.Data.SqlClient.dll" target="ref\net462\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient\ref\net462\Microsoft.Data.SqlClient.xml" target="ref\net462\" exclude="" />
-
-    <!-- ref NetCore for Net 8 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net8.0\Microsoft.Data.SqlClient.dll" target="ref\net8.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net8.0\Microsoft.Data.SqlClient.xml" target="ref\net8.0\" exclude="" />
-
-    <!-- ref NetCore for Net 9 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net9.0\Microsoft.Data.SqlClient.dll" target="ref\net9.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net9.0\Microsoft.Data.SqlClient.xml" target="ref\net9.0\" exclude="" />
-
-    <!-- ref NetCore for NetStandard2.0 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\netstandard2.0\Microsoft.Data.SqlClient.dll" target="ref\netstandard2.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\netstandard2.0\Microsoft.Data.SqlClient.xml" target="ref\netstandard2.0\" exclude="" />
-
-    <!-- Localized Resource Files for NetFx -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\cs\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\de\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\es\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\fr\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\it\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ja\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ko\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pl\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pt-BR\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ru\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\tr\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hans\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hant\" exclude="" />
-
-    <!-- lib NetFx -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.dll" target="lib\net462\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.pdb" target="lib\net462\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.xml" target="lib\net462\" exclude="" />
-
-    <!-- lib NetCore for Net 8 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.dll" target="lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.pdb" target="lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.xml" target="lib\net8.0\" exclude="" />
-
-    <!-- lib NetCore for Net 9 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.dll" target="lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.pdb" target="lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.xml" target="lib\net9.0\" exclude="" />
-
-    <!-- lib NetCore for NetStandard2.0 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netstandard\netstandard2.0\Microsoft.Data.SqlClient.dll" target="lib\netstandard2.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netstandard\netstandard2.0\Microsoft.Data.SqlClient.pdb" target="lib\netstandard2.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netstandard\netstandard2.0\Microsoft.Data.SqlClient.xml" target="lib\netstandard2.0\" exclude="" />
-
-    <!-- Localization files for Net 8 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\cs\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\de\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\es\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\fr\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\it\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ja\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ko\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pl\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pt-BR\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ru\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\tr\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hans\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hant\" exclude="" />
-    <!-- End of Localization files for Net 8 -->
-
-    <!-- Localization files for Net 9 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\cs\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\de\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\es\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\fr\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\it\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ja\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ko\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pl\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pt-BR\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ru\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\tr\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hans\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hant\" exclude="" />
-    <!-- End of Localization files for Net 9 -->
-
-    <!-- runtimes NetFx -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net462\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net462\" exclude="" />
-
-    <!-- runtimes NetCore for Net 8 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
-
-    <!-- runtimes NetCore for Net 9 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net9.0\" exclude="" />
+    <!-- Lib Binaries ================================================== -->
+    <!-- lib/net462 - These contain the implementation -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.dll" target="lib\net462\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.pdb" target="lib\net462\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.xml" target="lib\net462\" exclude="" />
+
+    <!-- lib/net462 Localized Resources -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\cs\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\de\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\es\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\fr\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\it\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ja\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ko\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pl\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pt-BR\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ru\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\tr\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hans\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hant\" exclude="" />
+
+    <!-- lib/net8.0 - These are PlatformNotSupportedException assemblies -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.dll" target="lib\net8.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.pdb" target="lib\net8.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.xml" target="lib\net8.0\" exclude="" />
+
+    <!-- lib/net8.0 Localized Resources -->
+    <!-- Note: although these come from windows_nt, they will work on any OS -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\cs\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\de\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\es\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\fr\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\it\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ja\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ko\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pl\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pt-BR\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ru\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\tr\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hans\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hant\" exclude="" />
+
+    <!-- lib/net9.0 - These are PlatformNotSupportedException assemblies -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.dll" target="lib\net9.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.pdb" target="lib\net9.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.xml" target="lib\net9.0\" exclude="" />
+
+    <!-- lib/net9.0 Localized Resources -->
+    <!-- Note: although these come from windows_nt, they will work on any OS -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\cs\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\de\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\es\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\fr\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\it\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ja\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ko\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pl\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pt-BR\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ru\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\tr\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hans\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hant\" exclude="" />
+
+    <!-- lib/netstandard2.0 - These are PlatformNotSupportedException assemblies -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.dll" target="lib\netstandard2.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.pdb" target="lib\netstandard2.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.xml" target="lib\netstandard2.0\" exclude="" />
+
+    <!-- Ref Binaries ================================================== -->
+    <!-- ref/net462 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.dll" target="ref\net462\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.xml" target="ref\net462\" exclude="" />
+
+    <!-- ref/net8.0 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.dll" target="ref\net8.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.xml" target="ref\net8.0\" exclude="" />
+
+    <!-- ref/net9.0 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.dll" target="ref\net9.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.xml" target="ref\net9.0\" exclude="" />
+
+    <!-- ref/netstandard2.0 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.dll" target="ref\netstandard2.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.xml" target="ref\netstandard2.0\" exclude="" />
+
+    <!-- Runtime Binaries ============================================== -->
+    <!-- runtimes/win/lib/net462 -->
+    <!-- @TODO: We include the impl version in the lib folder - is the runtimes version necessary? -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net462\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net462\" exclude="" />
+
+    <!-- runtimes/unix/lib/net8.0 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net8.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
+
+    <!-- runtimes/win/lib/net8.0 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net8.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net8.0\" exclude="" />
+
+    <!-- runtimes/unix/lib/net9.0 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net9.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net9.0\" exclude="" />
+
+    <!-- runtimes/win/lib/net9.0 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net9.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net9.0\" exclude="" />
   </files>
 </package>
diff --git a/tools/targets/GenerateThisAssemblyCs.targets b/tools/targets/GenerateThisAssemblyCs.targets
index dc12b40322..6dfd670c5c 100644
--- a/tools/targets/GenerateThisAssemblyCs.targets
+++ b/tools/targets/GenerateThisAssemblyCs.targets
@@ -8,6 +8,9 @@
 
     <PropertyGroup>
 
+      <!-- If an AssemblyFileVersion was provided, use that. Otherwise, use the AssemblyVersion -->
+      <AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">$(AssemblyVersion)</AssemblyFileVersion>
+
       <!-- Put the ThisAssembly class in the System namespace by default. -->
       <ThisAssemblyNamespace Condition="'$(ThisAssemblyNamespace)' == ''">System</ThisAssemblyNamespace>
 

From e65124a251a3a8805abf8aac1bf03d18928f0a0c Mon Sep 17 00:00:00 2001
From: samsharma2700 <sarasharma@microsoft.com>
Date: Fri, 20 Mar 2026 09:29:02 -0700
Subject: [PATCH 004/298] Scope NuGet package signing to specific packages
 (#4058)

---
 .../onebranch/jobs/build-signed-csproj-package-job.yml   | 1 +
 .../jobs/build-signed-sqlclient-package-job.yml          | 1 +
 .../onebranch/steps/compound-esrp-nuget-signing-step.yml | 9 +++++++--
 eng/pipelines/onebranch/steps/esrp-code-signing-step.yml | 9 ++++++---
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
index 809690a886..01d9b61da1 100644
--- a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
@@ -191,6 +191,7 @@ jobs:
           authSignCertName: ${{ parameters.authSignCertName }}
           esrpClientId: ${{ parameters.esrpClientId }}
           esrpConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
+          pattern: '${{ parameters.packageFullName }}.*nupkg'
 
       # Publish symbols to servers
       - ${{ if eq(parameters.publishSymbols, true) }}:
diff --git a/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
index a422a5351c..98f5c811aa 100644
--- a/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
@@ -108,6 +108,7 @@ jobs:
   - template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
     parameters:
       artifactType: pkg
+      nupkgPattern: 'Microsoft.Data.SqlClient.$(mdsPackageVersion).*nupkg'
 
   # Copy signed DLLs and PDBs to APIScan folders.
   - task: CopyFiles@2
diff --git a/eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml b/eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml
index 34e903465f..e86964cf3d 100644
--- a/eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml
+++ b/eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml
@@ -30,6 +30,11 @@ parameters:
   - name: esrpClientId
     type: string
 
+  # Glob pattern to match NuGet packages for scanning and signing.
+  - name: pattern
+    type: string
+    default: '*.*nupkg'
+
 steps:
   # See: https://aka.ms/esrp.scantask
   - task: EsrpMalwareScanning@6
@@ -41,7 +46,7 @@ steps:
       ConnectedServiceName: '${{ parameters.esrpConnectedServiceName }}'
       EsrpClientId: '${{ parameters.esrpClientId }}'
       FolderPath: '$(PACK_OUTPUT)'
-      Pattern: '*.*nupkg'
+      Pattern: '${{ parameters.pattern }}'
       UseMSIAuthentication: true
       VerboseLogin: 1
 
@@ -56,7 +61,7 @@ steps:
       AuthAKVName: '${{ parameters.authAkvName }}'
       AuthSignCertName: '${{ parameters.authSignCertName }}'
       FolderPath: '$(PACK_OUTPUT)'
-      Pattern: '*.*nupkg'
+      Pattern: '${{ parameters.pattern }}'
       signConfigType: 'inlineSignParams'
       UseMSIAuthentication: true
       inlineOperation: |
diff --git a/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml b/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml
index 59322d67aa..83053a8d29 100644
--- a/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml
+++ b/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml
@@ -17,6 +17,10 @@ parameters:
     type: string
     default: 'Microsoft.Data.SqlClient*.dll'
 
+  - name: nupkgPattern
+    type: string
+    default: '*.*nupkg'
+
   - name: artifactDirectory
     type: string
     default: $(PACK_OUTPUT)
@@ -125,7 +129,7 @@ steps:
       EsrpClientId: '${{parameters.EsrpClientId }}'
       UseMSIAuthentication: true
       FolderPath: '${{parameters.artifactDirectory }}'
-      Pattern: '*.*nupkg'
+      Pattern: '${{ parameters.nupkgPattern }}'
       CleanupTempStorage: 1
       VerboseLogin: 1
 
@@ -133,7 +137,6 @@ steps:
   - task: EsrpCodeSigning@6
     displayName: 'ESRP CodeSigning Nuget Package'
     inputs:
-      inputs:
       ConnectedServiceName: '${{parameters.ESRPConnectedServiceName }}'
       AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
       AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
@@ -142,7 +145,7 @@ steps:
       AuthAKVName: '${{parameters.AuthAKVName }}'
       AuthSignCertName: '${{parameters.AuthSignCertName }}'
       FolderPath: '${{parameters.artifactDirectory }}'
-      Pattern: '*.*nupkg'
+      Pattern: '${{ parameters.nupkgPattern }}'
       signConfigType: inlineSignParams
       inlineOperation: |
         [

From 40db478f1bced18c184ad1b23acef6490fd63d6d Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 20 Mar 2026 15:44:30 -0300
Subject: [PATCH 005/298] Migrate to slnx solution file format (#4070)

---
 .devcontainer/devcontainer.json   |   2 +-
 .github/workflows/codeql.yml      |   2 +-
 src/Microsoft.Data.SqlClient.sln  | 946 ------------------------------
 src/Microsoft.Data.SqlClient.slnx | 335 +++++++++++
 4 files changed, 337 insertions(+), 948 deletions(-)
 delete mode 100644 src/Microsoft.Data.SqlClient.sln
 create mode 100644 src/Microsoft.Data.SqlClient.slnx

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c424e37834..db5f1c5da5 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -16,7 +16,7 @@
                 "ms-mssql.mssql"
             ],
             "settings": {
-                "dotnet.defaultSolution": "src/Microsoft.Data.SqlClient.sln"
+                "dotnet.defaultSolution": "src/Microsoft.Data.SqlClient.slnx"
             }
         }
     },
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 64584746df..464c0401f0 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -94,7 +94,7 @@ jobs:
     - name: Run manual build steps
       if: matrix.build-mode == 'manual'
       shell: bash
-      run: dotnet build src/Microsoft.Data.SqlClient.sln
+      run: dotnet build src/Microsoft.Data.SqlClient.slnx
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v4
diff --git a/src/Microsoft.Data.SqlClient.sln b/src/Microsoft.Data.SqlClient.sln
deleted file mode 100644
index b25ed21444..0000000000
--- a/src/Microsoft.Data.SqlClient.sln
+++ /dev/null
@@ -1,946 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31912.275
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient\netfx\src\Microsoft.Data.SqlClient.csproj", "{407890AC-9876-4FEF-A6F1-F36A876BAADE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0CC4817A-12F3-4357-912C-09315FAAD008}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TDS.EndPoint", "Microsoft.Data.SqlClient\tests\tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj", "{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TDS.Servers", "Microsoft.Data.SqlClient\tests\tools\TDS\TDS.Servers\TDS.Servers.csproj", "{978063D3-FBB5-4E10-8C45-67C90BE1B931}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TDS", "Microsoft.Data.SqlClient\tests\tools\TDS\TDS\TDS.csproj", "{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.FunctionalTests", "Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.FunctionalTests.csproj", "{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient\netcore\src\Microsoft.Data.SqlClient.csproj", "{37431336-5307-4184-9356-C4B7E47DC714}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore", "netcore", "{28E5EFE6-C9DD-4FF9-9FEC-532F72DFFA6E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netfx", "netfx", "{3FDD425C-FE01-4B56-863E-1FCDD0677CF5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Address", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Address\Address.csproj", "{D1392B54-998A-4F27-BC17-4CE149117BCC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE} = {407890AC-9876-4FEF-A6F1-F36A876BAADE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.ManualTests", "Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTests.csproj", "{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Circle", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Circle\Circle.csproj", "{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shapes", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Shapes\Shapes.csproj", "{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utf8String", "Microsoft.Data.SqlClient\tests\ManualTests\SQL\UdtTest\UDTs\Utf8String\Utf8String.csproj", "{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A2E7E470-5EFF-4828-B55E-FCBA3650F51C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient\netcore\ref\Microsoft.Data.SqlClient.csproj", "{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{771F3F1E-7A68-4A9D-ADA8-A24F1D5BE71D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient\netfx\ref\Microsoft.Data.SqlClient.csproj", "{412BCCC8-19F6-489A-B594-E9A506816155}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider", "Microsoft.Data.SqlClient\add-ons\AzureKeyVaultProvider\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj", "{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B} = {1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}
-		{412BCCC8-19F6-489A-B594-E9A506816155} = {412BCCC8-19F6-489A-B594-E9A506816155}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{ED952CF7-84DF-437A-B066-F516E9BE1C2C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "snippets", "snippets", "{71F356DC-DFA3-4163-8BFE-D268722CE189}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data", "Microsoft.Data", "{908C7DD3-C999-40A6-9433-9F5ACA7C36F5}"
-	ProjectSection(SolutionItems) = preProject
-		..\doc\snippets\Microsoft.Data\OperationAbortedException.xml = ..\doc\snippets\Microsoft.Data\OperationAbortedException.xml
-		..\doc\snippets\Microsoft.Data\SqlDbTypeExtensions.xml = ..\doc\snippets\Microsoft.Data\SqlDbTypeExtensions.xml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.Sql", "Microsoft.Data.Sql", "{0CE216CE-8072-4985-B248-61F0D0BE9C2E}"
-	ProjectSection(SolutionItems) = preProject
-		..\doc\snippets\Microsoft.Data.Sql\SqlDataSourceEnumerator.xml = ..\doc\snippets\Microsoft.Data.Sql\SqlDataSourceEnumerator.xml
-		..\doc\snippets\Microsoft.Data.Sql\SqlNotificationRequest.xml = ..\doc\snippets\Microsoft.Data.Sql\SqlNotificationRequest.xml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient", "{C05F4FFE-6A14-4409-AA0A-10630BE4F1EE}"
-	ProjectSection(SolutionItems) = preProject
-		..\doc\snippets\Microsoft.Data.SqlClient\ActiveDirectoryAuthenticationProvider.xml = ..\doc\snippets\Microsoft.Data.SqlClient\ActiveDirectoryAuthenticationProvider.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\ApplicationIntent.xml = ..\doc\snippets\Microsoft.Data.SqlClient\ApplicationIntent.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\OnChangeEventHandler.xml = ..\doc\snippets\Microsoft.Data.SqlClient\OnChangeEventHandler.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\PoolBlockingPeriod.xml = ..\doc\snippets\Microsoft.Data.SqlClient\PoolBlockingPeriod.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SortOrder.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SortOrder.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlAuthenticationInitializer.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlAuthenticationInitializer.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlAuthenticationMethod.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlAuthenticationMethod.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlAuthenticationParameters.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlAuthenticationParameters.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlAuthenticationProvider.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlAuthenticationProvider.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlAuthenticationToken.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlAuthenticationToken.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlBatch.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlBatch.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlBatchCommand.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlBatchCommand.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlBatchCommandCollection.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlBatchCommandCollection.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopy.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopy.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnMapping.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnMapping.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnMappingCollection.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnMappingCollection.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnOrderHint.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnOrderHint.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnOrderHintCollection.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnOrderHintCollection.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyOptions.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyOptions.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlClientDiagnostic.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlClientDiagnostic.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlClientFactory.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlClientFactory.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlClientLogger.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlClientLogger.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlClientMetaDataCollectionNames.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlClientMetaDataCollectionNames.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlClientPermission.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlClientPermission.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlClientPermissionAttribute.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlClientPermissionAttribute.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlColumnEncryptionCertificateStoreProvider.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlColumnEncryptionCertificateStoreProvider.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlColumnEncryptionCngProvider.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlColumnEncryptionCngProvider.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlColumnEncryptionCspProvider.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlColumnEncryptionCspProvider.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlColumnEncryptionEnclaveProvider.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlColumnEncryptionEnclaveProvider.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlColumnEncryptionKeyStoreProvider.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlColumnEncryptionKeyStoreProvider.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlCommand.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlCommand.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlCommandBuilder.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlCommandBuilder.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlCommandColumnEncryptionSetting.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlCommandColumnEncryptionSetting.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlConfigurableRetryFactory.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlConfigurableRetryFactory.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlConnection.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlConnection.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionAttestationProtocol.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionAttestationProtocol.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionColumnEncryptionSetting.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionColumnEncryptionSetting.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionEncryptOption.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionEncryptOption.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionIPAddressPreference.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionIPAddressPreference.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionOverrides.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionOverrides.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionStringBuilder.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionStringBuilder.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlCredential.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlCredential.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlDataAdapter.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlDataAdapter.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlDataReader.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlDataReader.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlDependency.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlDependency.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlEnclaveAttestationParameters.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlEnclaveAttestationParameters.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlEnclaveSession.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlEnclaveSession.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlError.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlError.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlErrorCollection.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlErrorCollection.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlException.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlException.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlInfoMessageEventArgs.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlInfoMessageEventArgs.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlInfoMessageEventHandler.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlInfoMessageEventHandler.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlNotificationEventArgs.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlNotificationEventArgs.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlNotificationInfo.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlNotificationInfo.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlNotificationSource.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlNotificationSource.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlNotificationType.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlNotificationType.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlParameter.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlParameter.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlParameterCollection.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlParameterCollection.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryingEventArgs.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryingEventArgs.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryIntervalBaseEnumerator.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryIntervalBaseEnumerator.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicBase.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicBase.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicBaseProvider.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicBaseProvider.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicOption.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicOption.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRowsCopiedEventArgs.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRowsCopiedEventArgs.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRowsCopiedEventHandler.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRowsCopiedEventHandler.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatedEventArgs.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatedEventArgs.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatedEventHandler.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatedEventHandler.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatingEventArgs.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatingEventArgs.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatingEventHandler.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatingEventHandler.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SqlTransaction.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlTransaction.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SspiAuthenticationParameters.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SspiAuthenticationParameters.xml
-		..\doc\snippets\Microsoft.Data.SqlClient\SspiContextProvider.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SspiContextProvider.xml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient.DataClassification", "Microsoft.Data.SqlClient.DataClassification", "{5D1F0032-7B0D-4FB6-A969-FCFB25C9EA1D}"
-	ProjectSection(SolutionItems) = preProject
-		..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\ColumnSensitivity.xml = ..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\ColumnSensitivity.xml
-		..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\InformationType.xml = ..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\InformationType.xml
-		..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\Label.xml = ..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\Label.xml
-		..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityClassification.xml = ..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityClassification.xml
-		..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityProperty.xml = ..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityProperty.xml
-		..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityRank.xml = ..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityRank.xml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient.Server", "Microsoft.Data.SqlClient.Server", "{650EB7FA-EB0D-4F8E-AB2C-161C3AD8E363}"
-	ProjectSection(SolutionItems) = preProject
-		..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlDataRecord.xml = ..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlDataRecord.xml
-		..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlMetaData.xml = ..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlMetaData.xml
-		..\doc\snippets\Microsoft.Data.SqlClient.Server\TriggerAction.xml = ..\doc\snippets\Microsoft.Data.SqlClient.Server\TriggerAction.xml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlTypes", "Microsoft.Data.SqlTypes", "{5A7600BD-AED8-44AB-8F2A-7CB33A8D9C02}"
-	ProjectSection(SolutionItems) = preProject
-		..\doc\snippets\Microsoft.Data.SqlTypes\SqlFileStream.xml = ..\doc\snippets\Microsoft.Data.SqlTypes\SqlFileStream.xml
-		..\doc\snippets\Microsoft.Data.SqlTypes\SqlJson.xml = ..\doc\snippets\Microsoft.Data.SqlTypes\SqlJson.xml
-		..\doc\snippets\Microsoft.Data.SqlTypes\SqlVector.xml = ..\doc\snippets\Microsoft.Data.SqlTypes\SqlVector.xml
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.TestUtilities", "Microsoft.Data.SqlClient\tests\tools\Microsoft.Data.SqlClient.TestUtilities\Microsoft.Data.SqlClient.TestUtilities.csproj", "{89D6D382-9B36-43C9-A912-03802FDA8E36}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.ExtUtilities", "Microsoft.Data.SqlClient\tests\tools\Microsoft.Data.SqlClient.ExtUtilities\Microsoft.Data.SqlClient.ExtUtilities.csproj", "{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomRetryLogicProvider", "Microsoft.Data.SqlClient\tests\CustomConfigurableRetryLogic\CustomRetryLogicProvider.csproj", "{B499E477-C9B1-4087-A5CF-5C762D90E433}"
-	ProjectSection(ProjectDependencies) = postProject
-		{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.PerformanceTests", "Microsoft.Data.SqlClient\tests\PerformanceTests\Microsoft.Data.SqlClient.PerformanceTests.csproj", "{599A336B-2A5F-473D-8442-1223ED37C93E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4F3CD363-B1E6-4D6D-9466-97D78A56BE45}"
-	ProjectSection(SolutionItems) = preProject
-		Directory.Build.props = Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SqlServer.Server", "Microsoft.SqlServer.Server\Microsoft.SqlServer.Server.csproj", "{A314812A-7820-4565-A2A8-ABBE391C11E4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.SqlServer.Server", "Microsoft.SqlServer.Server", "{869A9BCC-D303-4365-9BF7-958CD6387916}"
-	ProjectSection(SolutionItems) = preProject
-		..\doc\snippets\Microsoft.SqlServer.Server\DataAccessKind.xml = ..\doc\snippets\Microsoft.SqlServer.Server\DataAccessKind.xml
-		..\doc\snippets\Microsoft.SqlServer.Server\Format.xml = ..\doc\snippets\Microsoft.SqlServer.Server\Format.xml
-		..\doc\snippets\Microsoft.SqlServer.Server\IBinarySerialize.xml = ..\doc\snippets\Microsoft.SqlServer.Server\IBinarySerialize.xml
-		..\doc\snippets\Microsoft.SqlServer.Server\InvalidUdtException.xml = ..\doc\snippets\Microsoft.SqlServer.Server\InvalidUdtException.xml
-		..\doc\snippets\Microsoft.SqlServer.Server\SqlFacetAttribute.xml = ..\doc\snippets\Microsoft.SqlServer.Server\SqlFacetAttribute.xml
-		..\doc\snippets\Microsoft.SqlServer.Server\SqlFunctionAttribute.xml = ..\doc\snippets\Microsoft.SqlServer.Server\SqlFunctionAttribute.xml
-		..\doc\snippets\Microsoft.SqlServer.Server\SqlMethodAttribute.xml = ..\doc\snippets\Microsoft.SqlServer.Server\SqlMethodAttribute.xml
-		..\doc\snippets\Microsoft.SqlServer.Server\SqlUserDefinedAggregateAttribute.xml = ..\doc\snippets\Microsoft.SqlServer.Server\SqlUserDefinedAggregateAttribute.xml
-		..\doc\snippets\Microsoft.SqlServer.Server\SqlUserDefinedTypeAttribute.xml = ..\doc\snippets\Microsoft.SqlServer.Server\SqlUserDefinedTypeAttribute.xml
-		..\doc\snippets\Microsoft.SqlServer.Server\SystemDataAccessKind.xml = ..\doc\snippets\Microsoft.SqlServer.Server\SystemDataAccessKind.xml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestClr", "TestClr", "{CDE508A5-F5D0-4A59-A4EF-978833830727}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{4600328C-C134-499F-AAE2-964E8AD5472C}"
-	ProjectSection(SolutionItems) = preProject
-		..\build.proj = ..\build.proj
-		..\build2.proj = ..\build2.proj
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pipelines", "pipelines", "{4CAE9195-4F1A-4D48-854C-1C9FBC512C66}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\dotnet-sqlclient-ci-core.yml = ..\eng\pipelines\dotnet-sqlclient-ci-core.yml
-		..\eng\pipelines\dotnet-sqlclient-ci-package-reference-pipeline.yml = ..\eng\pipelines\dotnet-sqlclient-ci-package-reference-pipeline.yml
-		..\eng\pipelines\dotnet-sqlclient-ci-project-reference-pipeline.yml = ..\eng\pipelines\dotnet-sqlclient-ci-project-reference-pipeline.yml
-		..\eng\pipelines\sqlclient-pr-package-ref-pipeline.yml = ..\eng\pipelines\sqlclient-pr-package-ref-pipeline.yml
-		..\eng\pipelines\sqlclient-pr-project-ref-pipeline.yml = ..\eng\pipelines\sqlclient-pr-project-ref-pipeline.yml
-		..\eng\pipelines\stress-tests-pipeline.yml = ..\eng\pipelines\stress-tests-pipeline.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{FD4D7A96-79B1-4F89-B64D-29FACCC9232F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{E76A4ED5-9137-4E4B-AE91-7AEDB2683823}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "jobs", "jobs", "{3850810F-535E-443A-A9B4-7EE85B327E0A}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\common\templates\jobs\ci-build-nugets-job.yml = ..\eng\pipelines\common\templates\jobs\ci-build-nugets-job.yml
-		..\eng\pipelines\common\templates\jobs\ci-code-coverage-job.yml = ..\eng\pipelines\common\templates\jobs\ci-code-coverage-job.yml
-		..\eng\pipelines\common\templates\jobs\ci-run-tests-job.yml = ..\eng\pipelines\common\templates\jobs\ci-run-tests-job.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stages", "stages", "{01FA4774-E594-4A2D-B839-EA7A56D09A8B}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\common\templates\stages\ci-run-tests-stage.yml = ..\eng\pipelines\common\templates\stages\ci-run-tests-stage.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "steps", "steps", "{EABE3A3E-D505-418A-B1B8-1B0AC4872F3D}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\common\templates\steps\build-and-run-tests-netcore-step.yml = ..\eng\pipelines\common\templates\steps\build-and-run-tests-netcore-step.yml
-		..\eng\pipelines\common\templates\steps\build-and-run-tests-netfx-step.yml = ..\eng\pipelines\common\templates\steps\build-and-run-tests-netfx-step.yml
-		..\eng\pipelines\common\templates\steps\ci-project-build-step.yml = ..\eng\pipelines\common\templates\steps\ci-project-build-step.yml
-		..\eng\pipelines\common\templates\steps\configure-sql-server-linux-step.yml = ..\eng\pipelines\common\templates\steps\configure-sql-server-linux-step.yml
-		..\eng\pipelines\common\templates\steps\configure-sql-server-macos-step.yml = ..\eng\pipelines\common\templates\steps\configure-sql-server-macos-step.yml
-		..\eng\pipelines\common\templates\steps\configure-sql-server-step.yml = ..\eng\pipelines\common\templates\steps\configure-sql-server-step.yml
-		..\eng\pipelines\common\templates\steps\configure-sql-server-win-step.yml = ..\eng\pipelines\common\templates\steps\configure-sql-server-win-step.yml
-		..\eng\pipelines\common\templates\steps\generate-nuget-package-step.yml = ..\eng\pipelines\common\templates\steps\generate-nuget-package-step.yml
-		..\eng\pipelines\common\templates\steps\override-sni-version.yml = ..\eng\pipelines\common\templates\steps\override-sni-version.yml
-		..\eng\pipelines\common\templates\steps\pre-build-step.yml = ..\eng\pipelines\common\templates\steps\pre-build-step.yml
-		..\eng\pipelines\common\templates\steps\prepare-test-db-step.yml = ..\eng\pipelines\common\templates\steps\prepare-test-db-step.yml
-		..\eng\pipelines\common\templates\steps\publish-test-results-step.yml = ..\eng\pipelines\common\templates\steps\publish-test-results-step.yml
-		..\eng\pipelines\common\templates\steps\run-all-tests-step.yml = ..\eng\pipelines\common\templates\steps\run-all-tests-step.yml
-		..\eng\pipelines\common\templates\steps\update-config-file-step.yml = ..\eng\pipelines\common\templates\steps\update-config-file-step.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libraries", "libraries", "{75BAE755-3A1F-41F2-9176-9F8FF9FEE2DD}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\libraries\ci-build-variables.yml = ..\eng\pipelines\libraries\ci-build-variables.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "jobs", "jobs", "{09352F1D-878F-4F55-8AA2-6E47F1AD37D5}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\jobs\pack-abstractions-package-ci-job.yml = ..\eng\pipelines\jobs\pack-abstractions-package-ci-job.yml
-		..\eng\pipelines\jobs\pack-azure-package-ci-job.yml = ..\eng\pipelines\jobs\pack-azure-package-ci-job.yml
-		..\eng\pipelines\jobs\pack-logging-package-ci-job.yml = ..\eng\pipelines\jobs\pack-logging-package-ci-job.yml
-		..\eng\pipelines\jobs\stress-tests-ci-job.yml = ..\eng\pipelines\jobs\stress-tests-ci-job.yml
-		..\eng\pipelines\jobs\test-abstractions-package-ci-job.yml = ..\eng\pipelines\jobs\test-abstractions-package-ci-job.yml
-		..\eng\pipelines\jobs\test-azure-package-ci-job.yml = ..\eng\pipelines\jobs\test-azure-package-ci-job.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "steps", "steps", "{AD738BD4-6A02-4B88-8F93-FBBBA49A74C8}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\steps\install-dotnet.yml = ..\eng\pipelines\steps\install-dotnet.yml
-		..\eng\pipelines\steps\install-dotnet-arm64.ps1 = ..\eng\pipelines\steps\install-dotnet-arm64.ps1
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient.UnitTests", "Microsoft.Data.SqlClient\tests\UnitTests\Microsoft.Data.SqlClient.UnitTests.csproj", "{4461063D-2F2B-274C-7E6F-F235119D258E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stress", "Stress", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IMonitorLoader", "Microsoft.Data.SqlClient\tests\StressTests\IMonitorLoader\IMonitorLoader.csproj", "{1A29B520-D16A-35F2-5CAC-64573C86E63D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlClient.Stress.Common", "Microsoft.Data.SqlClient\tests\StressTests\SqlClient.Stress.Common\SqlClient.Stress.Common.csproj", "{2AA12D54-540B-E515-CB82-80D691C9DCF1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlClient.Stress.Framework", "Microsoft.Data.SqlClient\tests\StressTests\SqlClient.Stress.Framework\SqlClient.Stress.Framework.csproj", "{92D9C6D6-6925-1AD1-69FA-485F83943BD2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlClient.Stress.Runner", "Microsoft.Data.SqlClient\tests\StressTests\SqlClient.Stress.Runner\SqlClient.Stress.Runner.csproj", "{4A9C11F4-9577-ABEC-C070-83A194746D9B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlClient.Stress.Tests", "Microsoft.Data.SqlClient\tests\StressTests\SqlClient.Stress.Tests\SqlClient.Stress.Tests.csproj", "{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient.Samples", "..\doc\samples\Microsoft.Data.SqlClient.Samples.csproj", "{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient.TestCommon", "Microsoft.Data.SqlClient\tests\Common\Microsoft.Data.SqlClient.TestCommon.csproj", "{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient.Extensions", "Microsoft.Data.SqlClient.Extensions", "{19F1F1E5-3013-7660-661A-2A15F7D606C1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abstractions", "Abstractions", "{556B486E-F9B0-7EA9-6A25-DA560C312761}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{210228A5-979A-DE06-EE1F-B35C65E1583C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abstractions", "Microsoft.Data.SqlClient.Extensions\Abstractions\src\Abstractions.csproj", "{089582DC-FC8E-4DDE-99AC-E31BF95175B0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{59667E4C-0BD2-9F48-FB50-9E55DD8B1011}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abstractions.Test", "Microsoft.Data.SqlClient.Extensions\Abstractions\test\Abstractions.Test.csproj", "{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Azure", "Azure", "{A20114E1-82D8-903A-C389-726EB4FD943F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0D2F834B-6D91-18D0-3F09-672D448751BD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure", "Microsoft.Data.SqlClient.Extensions\Azure\src\Azure.csproj", "{DCD79241-612B-4081-A8CC-BD7A4ABC1662}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5AF52CDD-DF78-3712-7516-5B49F94F9491}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Test", "Microsoft.Data.SqlClient.Extensions\Azure\test\Azure.Test.csproj", "{4B953573-C3CD-4845-896B-EA0A0B7A7B27}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logging", "Logging", "{B3A1F1C2-7D4E-4A5B-9C6D-8E2F0A1B3C4D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D4E5F6A7-1B2C-3D4E-5F6A-7B8C9D0E1F2A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logging", "Microsoft.Data.SqlClient.Internal\Logging\src\Logging.csproj", "{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient.Internal", "Microsoft.Data.SqlClient.Internal", "{C1D2E3F4-A5B6-7C8D-9E0F-1A2B3C4D5E6F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient", "{7289C27E-D7DF-2C71-84B4-151F3A162493}"
-	ProjectSection(SolutionItems) = preProject
-		Microsoft.Data.SqlClient\MdsVersions.props = Microsoft.Data.SqlClient\MdsVersions.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7E0602AC-7F0A-362A-D734-0FDDFCC600B5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2B71F605-037E-5629-6E23-0FA3C297446D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stages", "stages", "{E9D12AEC-2F11-4871-89BB-343BF1CAEA4C}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\stages\build-abstractions-package-ci-stage.yml = ..\eng\pipelines\stages\build-abstractions-package-ci-stage.yml
-		..\eng\pipelines\stages\build-azure-package-ci-stage.yml = ..\eng\pipelines\stages\build-azure-package-ci-stage.yml
-		..\eng\pipelines\stages\build-logging-package-ci-stage.yml = ..\eng\pipelines\stages\build-logging-package-ci-stage.yml
-		..\eng\pipelines\stages\build-sqlclient-package-ci-stage.yml = ..\eng\pipelines\stages\build-sqlclient-package-ci-stage.yml
-		..\eng\pipelines\stages\generate-secrets-ci-stage.yml = ..\eng\pipelines\stages\generate-secrets-ci-stage.yml
-		..\eng\pipelines\stages\stress-tests-ci-stage.yml = ..\eng\pipelines\stages\stress-tests-ci-stage.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{020A7E7B-04C9-4326-985F-045B42CC2200}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient\ref\Microsoft.Data.SqlClient.csproj", "{D433ED2D-5E47-4A4B-B94A-EC71482715C7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient\src\Microsoft.Data.SqlClient.csproj", "{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureAuthentication", "..\doc\apps\AzureAuthentication\AzureAuthentication.csproj", "{C3FE67C1-D288-45ED-A35C-08107396F8BB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "notsupported", "notsupported", "{351BE847-A0BF-450C-A5BC-8337AFA49EAA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient\notsupported\Microsoft.Data.SqlClient.csproj", "{1DB299CE-95EA-4566-84DD-171768758291}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.GenAPI", "..\tools\GenAPI\Microsoft.DotNet.GenAPI\Microsoft.DotNet.GenAPI.csproj", "{583E2B51-A90B-4F34-AD8B-4061504E855E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Cci.Extensions", "..\tools\GenAPI\Microsoft.Cci.Extensions\Microsoft.Cci.Extensions.csproj", "{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "onebranch", "onebranch", "{5EC4C165-25BB-4346-9DCC-5EFEEAC00C02}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\onebranch\sqlclient-non-official.yml = ..\eng\pipelines\onebranch\sqlclient-non-official.yml
-		..\eng\pipelines\onebranch\sqlclient-official.yml = ..\eng\pipelines\onebranch\sqlclient-official.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "jobs", "jobs", "{B3061B34-2A1C-49B9-A3A9-D4D37B4704B2}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\onebranch\jobs\build-signed-csproj-package-job.yml = ..\eng\pipelines\onebranch\jobs\build-signed-csproj-package-job.yml
-		..\eng\pipelines\onebranch\jobs\build-signed-sqlclient-package-job.yml = ..\eng\pipelines\onebranch\jobs\build-signed-sqlclient-package-job.yml
-		..\eng\pipelines\onebranch\jobs\publish-nuget-package-job.yml = ..\eng\pipelines\onebranch\jobs\publish-nuget-package-job.yml
-		..\eng\pipelines\onebranch\jobs\validate-signed-package-job.yml = ..\eng\pipelines\onebranch\jobs\validate-signed-package-job.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stages", "stages", "{3654906C-6852-48AF-BC7E-B3A62F3E9DB9}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\onebranch\stages\build-stages.yml = ..\eng\pipelines\onebranch\stages\build-stages.yml
-		..\eng\pipelines\onebranch\stages\release-stages.yml = ..\eng\pipelines\onebranch\stages\release-stages.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "steps", "steps", "{45B9E5C3-DED5-4DB6-B1E6-4EAC4E68BA83}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\onebranch\steps\build-all-configurations-signed-dlls-step.yml = ..\eng\pipelines\onebranch\steps\build-all-configurations-signed-dlls-step.yml
-		..\eng\pipelines\onebranch\steps\code-analyze-step.yml = ..\eng\pipelines\onebranch\steps\code-analyze-step.yml
-		..\eng\pipelines\onebranch\steps\compound-build-csproj-step.yml = ..\eng\pipelines\onebranch\steps\compound-build-csproj-step.yml
-		..\eng\pipelines\onebranch\steps\compound-esrp-dll-signing-step.yml = ..\eng\pipelines\onebranch\steps\compound-esrp-dll-signing-step.yml
-		..\eng\pipelines\onebranch\steps\compound-esrp-nuget-signing-step.yml = ..\eng\pipelines\onebranch\steps\compound-esrp-nuget-signing-step.yml
-		..\eng\pipelines\onebranch\steps\compound-nuget-pack-step.yml = ..\eng\pipelines\onebranch\steps\compound-nuget-pack-step.yml
-		..\eng\pipelines\onebranch\steps\compound-pack-csproj-step.yml = ..\eng\pipelines\onebranch\steps\compound-pack-csproj-step.yml
-		..\eng\pipelines\onebranch\steps\compound-publish-symbols-step.yml = ..\eng\pipelines\onebranch\steps\compound-publish-symbols-step.yml
-		..\eng\pipelines\onebranch\steps\esrp-code-signing-step.yml = ..\eng\pipelines\onebranch\steps\esrp-code-signing-step.yml
-		..\eng\pipelines\onebranch\steps\publish-symbols-step.yml = ..\eng\pipelines\onebranch\steps\publish-symbols-step.yml
-		..\eng\pipelines\onebranch\steps\script-output-environment-variables-step.yml = ..\eng\pipelines\onebranch\steps\script-output-environment-variables-step.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "variables", "variables", "{E849E6FB-1AB0-4922-A060-0062EA669FD0}"
-	ProjectSection(SolutionItems) = preProject
-		..\eng\pipelines\onebranch\variables\common-variables.yml = ..\eng\pipelines\onebranch\variables\common-variables.yml
-		..\eng\pipelines\onebranch\variables\onebranch-variables.yml = ..\eng\pipelines\onebranch\variables\onebranch-variables.yml
-		..\eng\pipelines\onebranch\variables\sqlclient-validation-variables.yml = ..\eng\pipelines\onebranch\variables\sqlclient-validation-variables.yml
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Debug|x64.Build.0 = Debug|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Debug|x86.Build.0 = Debug|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Release|x64.ActiveCfg = Release|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Release|x64.Build.0 = Release|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Release|x86.ActiveCfg = Release|Any CPU
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE}.Release|x86.Build.0 = Release|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|x64.Build.0 = Debug|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|x86.Build.0 = Debug|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|x64.ActiveCfg = Release|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|x64.Build.0 = Release|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|x86.ActiveCfg = Release|Any CPU
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|x86.Build.0 = Release|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|x64.Build.0 = Debug|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|x86.Build.0 = Debug|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|Any CPU.Build.0 = Release|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|x64.ActiveCfg = Release|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|x64.Build.0 = Release|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|x86.ActiveCfg = Release|Any CPU
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|x86.Build.0 = Release|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|x64.Build.0 = Debug|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|x86.Build.0 = Debug|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|x64.ActiveCfg = Release|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|x64.Build.0 = Release|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|x86.ActiveCfg = Release|Any CPU
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|x86.Build.0 = Release|Any CPU
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Debug|x64.ActiveCfg = Debug|x64
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Debug|x64.Build.0 = Debug|x64
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Debug|x86.ActiveCfg = Debug|x86
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Debug|x86.Build.0 = Debug|x86
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Release|x64.ActiveCfg = Release|x64
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Release|x64.Build.0 = Release|x64
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Release|x86.ActiveCfg = Release|x86
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9}.Release|x86.Build.0 = Release|x86
-		{37431336-5307-4184-9356-C4B7E47DC714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Debug|x64.Build.0 = Debug|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Debug|x86.Build.0 = Debug|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Release|Any CPU.Build.0 = Release|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Release|x64.ActiveCfg = Release|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Release|x64.Build.0 = Release|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Release|x86.ActiveCfg = Release|Any CPU
-		{37431336-5307-4184-9356-C4B7E47DC714}.Release|x86.Build.0 = Release|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|x64.Build.0 = Debug|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Debug|x86.Build.0 = Debug|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|x64.ActiveCfg = Release|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|x64.Build.0 = Release|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|x86.ActiveCfg = Release|Any CPU
-		{D1392B54-998A-4F27-BC17-4CE149117BCC}.Release|x86.Build.0 = Release|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|x64.Build.0 = Debug|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|x86.Build.0 = Debug|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|x64.ActiveCfg = Release|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|x64.Build.0 = Release|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|x86.ActiveCfg = Release|Any CPU
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|x86.Build.0 = Release|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|x64.Build.0 = Debug|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Debug|x86.Build.0 = Debug|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|x64.ActiveCfg = Release|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|x64.Build.0 = Release|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|x86.ActiveCfg = Release|Any CPU
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}.Release|x86.Build.0 = Release|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|x64.Build.0 = Debug|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Debug|x86.Build.0 = Debug|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|x64.ActiveCfg = Release|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|x64.Build.0 = Release|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|x86.ActiveCfg = Release|Any CPU
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}.Release|x86.Build.0 = Release|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|x64.Build.0 = Debug|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Debug|x86.Build.0 = Debug|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|x64.ActiveCfg = Release|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|x64.Build.0 = Release|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|x86.ActiveCfg = Release|Any CPU
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}.Release|x86.Build.0 = Release|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Debug|x64.Build.0 = Debug|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Debug|x86.Build.0 = Debug|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Release|x64.ActiveCfg = Release|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Release|x64.Build.0 = Release|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Release|x86.ActiveCfg = Release|Any CPU
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B}.Release|x86.Build.0 = Release|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Debug|x64.Build.0 = Debug|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Debug|x86.Build.0 = Debug|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Release|Any CPU.Build.0 = Release|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Release|x64.ActiveCfg = Release|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Release|x64.Build.0 = Release|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Release|x86.ActiveCfg = Release|Any CPU
-		{412BCCC8-19F6-489A-B594-E9A506816155}.Release|x86.Build.0 = Release|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Debug|x64.Build.0 = Debug|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Debug|x86.Build.0 = Debug|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|x64.ActiveCfg = Release|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|x64.Build.0 = Release|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|x86.ActiveCfg = Release|Any CPU
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7}.Release|x86.Build.0 = Release|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Debug|x64.Build.0 = Debug|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Debug|x86.Build.0 = Debug|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Release|x64.ActiveCfg = Release|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Release|x64.Build.0 = Release|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Release|x86.ActiveCfg = Release|Any CPU
-		{89D6D382-9B36-43C9-A912-03802FDA8E36}.Release|x86.Build.0 = Release|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Debug|x64.Build.0 = Debug|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Debug|x86.Build.0 = Debug|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Release|x64.ActiveCfg = Release|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Release|x64.Build.0 = Release|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Release|x86.ActiveCfg = Release|Any CPU
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B}.Release|x86.Build.0 = Release|Any CPU
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Debug|x64.ActiveCfg = Debug|x64
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Debug|x64.Build.0 = Debug|x64
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Debug|x86.ActiveCfg = Debug|x86
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Debug|x86.Build.0 = Debug|x86
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Release|x64.ActiveCfg = Release|x64
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Release|x64.Build.0 = Release|x64
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Release|x86.ActiveCfg = Release|x86
-		{B499E477-C9B1-4087-A5CF-5C762D90E433}.Release|x86.Build.0 = Release|x86
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Debug|x64.ActiveCfg = Debug|x64
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Debug|x64.Build.0 = Debug|x64
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Debug|x86.ActiveCfg = Debug|x86
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Debug|x86.Build.0 = Debug|x86
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Release|x64.ActiveCfg = Release|x64
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Release|x64.Build.0 = Release|x64
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Release|x86.ActiveCfg = Release|x86
-		{599A336B-2A5F-473D-8442-1223ED37C93E}.Release|x86.Build.0 = Release|x86
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Debug|x64.Build.0 = Debug|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Debug|x86.Build.0 = Debug|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Release|x64.ActiveCfg = Release|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Release|x64.Build.0 = Release|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Release|x86.ActiveCfg = Release|Any CPU
-		{A314812A-7820-4565-A2A8-ABBE391C11E4}.Release|x86.Build.0 = Release|Any CPU
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|x64.ActiveCfg = Debug|x64
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|x64.Build.0 = Debug|x64
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|x86.ActiveCfg = Debug|x86
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|x86.Build.0 = Debug|x86
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Release|x64.ActiveCfg = Release|x64
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Release|x64.Build.0 = Release|x64
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Release|x86.ActiveCfg = Release|x86
-		{4461063D-2F2B-274C-7E6F-F235119D258E}.Release|x86.Build.0 = Release|x86
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Debug|x64.Build.0 = Debug|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Debug|x86.Build.0 = Debug|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Release|x64.ActiveCfg = Release|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Release|x64.Build.0 = Release|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Release|x86.ActiveCfg = Release|Any CPU
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D}.Release|x86.Build.0 = Release|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Debug|x64.Build.0 = Debug|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Debug|x86.Build.0 = Debug|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Release|x64.ActiveCfg = Release|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Release|x64.Build.0 = Release|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Release|x86.ActiveCfg = Release|Any CPU
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1}.Release|x86.Build.0 = Release|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Debug|x64.Build.0 = Debug|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Debug|x86.Build.0 = Debug|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Release|x64.ActiveCfg = Release|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Release|x64.Build.0 = Release|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Release|x86.ActiveCfg = Release|Any CPU
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2}.Release|x86.Build.0 = Release|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Debug|x64.Build.0 = Debug|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Debug|x86.Build.0 = Debug|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Release|x64.ActiveCfg = Release|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Release|x64.Build.0 = Release|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Release|x86.ActiveCfg = Release|Any CPU
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B}.Release|x86.Build.0 = Release|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Debug|x64.Build.0 = Debug|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Debug|x86.Build.0 = Debug|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Release|x64.ActiveCfg = Release|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Release|x64.Build.0 = Release|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Release|x86.ActiveCfg = Release|Any CPU
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C}.Release|x86.Build.0 = Release|Any CPU
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Debug|x64.ActiveCfg = Debug|x64
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Debug|x64.Build.0 = Debug|x64
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Debug|x86.ActiveCfg = Debug|x86
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Debug|x86.Build.0 = Debug|x86
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Release|x64.ActiveCfg = Release|x64
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Release|x64.Build.0 = Release|x64
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Release|x86.ActiveCfg = Release|x86
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277}.Release|x86.Build.0 = Release|x86
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Debug|x64.ActiveCfg = Debug|x64
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Debug|x64.Build.0 = Debug|x64
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Debug|x86.ActiveCfg = Debug|x86
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Debug|x86.Build.0 = Debug|x86
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Release|x64.ActiveCfg = Release|x64
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Release|x64.Build.0 = Release|x64
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Release|x86.ActiveCfg = Release|x86
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B}.Release|x86.Build.0 = Release|x86
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Debug|x64.Build.0 = Debug|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Debug|x86.Build.0 = Debug|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Release|x64.ActiveCfg = Release|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Release|x64.Build.0 = Release|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Release|x86.ActiveCfg = Release|Any CPU
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0}.Release|x86.Build.0 = Release|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Debug|x64.Build.0 = Debug|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Debug|x86.Build.0 = Debug|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Release|x64.ActiveCfg = Release|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Release|x64.Build.0 = Release|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Release|x86.ActiveCfg = Release|Any CPU
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3}.Release|x86.Build.0 = Release|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Debug|x64.Build.0 = Debug|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Debug|x86.Build.0 = Debug|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Release|x64.ActiveCfg = Release|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Release|x64.Build.0 = Release|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Release|x86.ActiveCfg = Release|Any CPU
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662}.Release|x86.Build.0 = Release|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Debug|x64.Build.0 = Debug|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Debug|x86.Build.0 = Debug|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Release|x64.ActiveCfg = Release|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Release|x64.Build.0 = Release|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Release|x86.ActiveCfg = Release|Any CPU
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27}.Release|x86.Build.0 = Release|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Debug|x64.Build.0 = Debug|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Debug|x86.Build.0 = Debug|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Release|x64.ActiveCfg = Release|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Release|x64.Build.0 = Release|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Release|x86.ActiveCfg = Release|Any CPU
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D}.Release|x86.Build.0 = Release|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Debug|x64.Build.0 = Debug|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Debug|x86.Build.0 = Debug|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Release|x64.ActiveCfg = Release|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Release|x64.Build.0 = Release|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Release|x86.ActiveCfg = Release|Any CPU
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7}.Release|x86.Build.0 = Release|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Debug|x64.Build.0 = Debug|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Debug|x86.Build.0 = Debug|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Release|x64.ActiveCfg = Release|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Release|x64.Build.0 = Release|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Release|x86.ActiveCfg = Release|Any CPU
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Release|x86.Build.0 = Release|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Debug|x64.Build.0 = Debug|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Debug|x86.Build.0 = Debug|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Release|x64.ActiveCfg = Release|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Release|x64.Build.0 = Release|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Release|x86.ActiveCfg = Release|Any CPU
-		{C3FE67C1-D288-45ED-A35C-08107396F8BB}.Release|x86.Build.0 = Release|Any CPU
-		{1DB299CE-95EA-4566-84DD-171768758291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1DB299CE-95EA-4566-84DD-171768758291}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1DB299CE-95EA-4566-84DD-171768758291}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1DB299CE-95EA-4566-84DD-171768758291}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1DB299CE-95EA-4566-84DD-171768758291}.Release|x64.ActiveCfg = Release|Any CPU
-		{1DB299CE-95EA-4566-84DD-171768758291}.Release|x86.ActiveCfg = Release|Any CPU
-		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Release|x64.ActiveCfg = Release|Any CPU
-		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Release|x86.ActiveCfg = Release|Any CPU
-		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Release|x64.ActiveCfg = Release|Any CPU
-		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Release|x86.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{407890AC-9876-4FEF-A6F1-F36A876BAADE} = {3FDD425C-FE01-4B56-863E-1FCDD0677CF5}
-		{1FF891B4-D3DE-4CCE-887C-CB48F5351A45} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{978063D3-FBB5-4E10-8C45-67C90BE1B931} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{8DC9D1A0-351B-47BC-A90F-B9DA542550E9} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{37431336-5307-4184-9356-C4B7E47DC714} = {28E5EFE6-C9DD-4FF9-9FEC-532F72DFFA6E}
-		{28E5EFE6-C9DD-4FF9-9FEC-532F72DFFA6E} = {4F3CD363-B1E6-4D6D-9466-97D78A56BE45}
-		{3FDD425C-FE01-4B56-863E-1FCDD0677CF5} = {4F3CD363-B1E6-4D6D-9466-97D78A56BE45}
-		{D1392B54-998A-4F27-BC17-4CE149117BCC} = {CDE508A5-F5D0-4A59-A4EF-978833830727}
-		{45DB5F86-7AE3-45C6-870D-F9357B66BDB5} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{6C88F00F-9597-43AD-9E5F-9B344DA3B16F} = {CDE508A5-F5D0-4A59-A4EF-978833830727}
-		{B73A7063-37C3-415D-AD53-BB3DA20ABD6E} = {CDE508A5-F5D0-4A59-A4EF-978833830727}
-		{E0A6BB21-574B-43D9-890D-6E1144F2EE9E} = {CDE508A5-F5D0-4A59-A4EF-978833830727}
-		{A2E7E470-5EFF-4828-B55E-FCBA3650F51C} = {28E5EFE6-C9DD-4FF9-9FEC-532F72DFFA6E}
-		{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B} = {A2E7E470-5EFF-4828-B55E-FCBA3650F51C}
-		{771F3F1E-7A68-4A9D-ADA8-A24F1D5BE71D} = {3FDD425C-FE01-4B56-863E-1FCDD0677CF5}
-		{412BCCC8-19F6-489A-B594-E9A506816155} = {771F3F1E-7A68-4A9D-ADA8-A24F1D5BE71D}
-		{9073ABEF-92E0-4702-BB23-2C99CEF9BDD7} = {4F3CD363-B1E6-4D6D-9466-97D78A56BE45}
-		{71F356DC-DFA3-4163-8BFE-D268722CE189} = {ED952CF7-84DF-437A-B066-F516E9BE1C2C}
-		{908C7DD3-C999-40A6-9433-9F5ACA7C36F5} = {71F356DC-DFA3-4163-8BFE-D268722CE189}
-		{0CE216CE-8072-4985-B248-61F0D0BE9C2E} = {71F356DC-DFA3-4163-8BFE-D268722CE189}
-		{C05F4FFE-6A14-4409-AA0A-10630BE4F1EE} = {71F356DC-DFA3-4163-8BFE-D268722CE189}
-		{5D1F0032-7B0D-4FB6-A969-FCFB25C9EA1D} = {71F356DC-DFA3-4163-8BFE-D268722CE189}
-		{650EB7FA-EB0D-4F8E-AB2C-161C3AD8E363} = {71F356DC-DFA3-4163-8BFE-D268722CE189}
-		{5A7600BD-AED8-44AB-8F2A-7CB33A8D9C02} = {71F356DC-DFA3-4163-8BFE-D268722CE189}
-		{89D6D382-9B36-43C9-A912-03802FDA8E36} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{E4C08DCE-DC29-4FEB-B655-1E7287DB5A2B} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{B499E477-C9B1-4087-A5CF-5C762D90E433} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{599A336B-2A5F-473D-8442-1223ED37C93E} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{A314812A-7820-4565-A2A8-ABBE391C11E4} = {4F3CD363-B1E6-4D6D-9466-97D78A56BE45}
-		{869A9BCC-D303-4365-9BF7-958CD6387916} = {71F356DC-DFA3-4163-8BFE-D268722CE189}
-		{CDE508A5-F5D0-4A59-A4EF-978833830727} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{4CAE9195-4F1A-4D48-854C-1C9FBC512C66} = {4600328C-C134-499F-AAE2-964E8AD5472C}
-		{FD4D7A96-79B1-4F89-B64D-29FACCC9232F} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
-		{E76A4ED5-9137-4E4B-AE91-7AEDB2683823} = {FD4D7A96-79B1-4F89-B64D-29FACCC9232F}
-		{3850810F-535E-443A-A9B4-7EE85B327E0A} = {E76A4ED5-9137-4E4B-AE91-7AEDB2683823}
-		{01FA4774-E594-4A2D-B839-EA7A56D09A8B} = {E76A4ED5-9137-4E4B-AE91-7AEDB2683823}
-		{EABE3A3E-D505-418A-B1B8-1B0AC4872F3D} = {E76A4ED5-9137-4E4B-AE91-7AEDB2683823}
-		{75BAE755-3A1F-41F2-9176-9F8FF9FEE2DD} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
-		{09352F1D-878F-4F55-8AA2-6E47F1AD37D5} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
-		{AD738BD4-6A02-4B88-8F93-FBBBA49A74C8} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
-		{4461063D-2F2B-274C-7E6F-F235119D258E} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{1A29B520-D16A-35F2-5CAC-64573C86E63D} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{2AA12D54-540B-E515-CB82-80D691C9DCF1} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{92D9C6D6-6925-1AD1-69FA-485F83943BD2} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{4A9C11F4-9577-ABEC-C070-83A194746D9B} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{FAA1E517-581A-D3DC-BAC9-FAD1D5A5142C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{C09B9D2F-E463-BEBD-34E4-E8F2C201A277} = {ED952CF7-84DF-437A-B066-F516E9BE1C2C}
-		{3FF03FA9-E3C3-49E3-9DCB-C703A5B0278B} = {0CC4817A-12F3-4357-912C-09315FAAD008}
-		{556B486E-F9B0-7EA9-6A25-DA560C312761} = {19F1F1E5-3013-7660-661A-2A15F7D606C1}
-		{210228A5-979A-DE06-EE1F-B35C65E1583C} = {556B486E-F9B0-7EA9-6A25-DA560C312761}
-		{089582DC-FC8E-4DDE-99AC-E31BF95175B0} = {210228A5-979A-DE06-EE1F-B35C65E1583C}
-		{59667E4C-0BD2-9F48-FB50-9E55DD8B1011} = {556B486E-F9B0-7EA9-6A25-DA560C312761}
-		{21F71821-AC58-43A1-A0B1-A7DB5FA892D3} = {59667E4C-0BD2-9F48-FB50-9E55DD8B1011}
-		{A20114E1-82D8-903A-C389-726EB4FD943F} = {19F1F1E5-3013-7660-661A-2A15F7D606C1}
-		{0D2F834B-6D91-18D0-3F09-672D448751BD} = {A20114E1-82D8-903A-C389-726EB4FD943F}
-		{DCD79241-612B-4081-A8CC-BD7A4ABC1662} = {0D2F834B-6D91-18D0-3F09-672D448751BD}
-		{5AF52CDD-DF78-3712-7516-5B49F94F9491} = {A20114E1-82D8-903A-C389-726EB4FD943F}
-		{4B953573-C3CD-4845-896B-EA0A0B7A7B27} = {5AF52CDD-DF78-3712-7516-5B49F94F9491}
-		{B3A1F1C2-7D4E-4A5B-9C6D-8E2F0A1B3C4D} = {C1D2E3F4-A5B6-7C8D-9E0F-1A2B3C4D5E6F}
-		{D4E5F6A7-1B2C-3D4E-5F6A-7B8C9D0E1F2A} = {B3A1F1C2-7D4E-4A5B-9C6D-8E2F0A1B3C4D}
-		{A1B2C3D4-E5F6-7A8B-9C0D-1E2F3A4B5C6D} = {D4E5F6A7-1B2C-3D4E-5F6A-7B8C9D0E1F2A}
-		{7E0602AC-7F0A-362A-D734-0FDDFCC600B5} = {7289C27E-D7DF-2C71-84B4-151F3A162493}
-		{2B71F605-037E-5629-6E23-0FA3C297446D} = {7289C27E-D7DF-2C71-84B4-151F3A162493}
-		{E9D12AEC-2F11-4871-89BB-343BF1CAEA4C} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
-		{020A7E7B-04C9-4326-985F-045B42CC2200} = {7289C27E-D7DF-2C71-84B4-151F3A162493}
-		{D433ED2D-5E47-4A4B-B94A-EC71482715C7} = {020A7E7B-04C9-4326-985F-045B42CC2200}
-		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01} = {2B71F605-037E-5629-6E23-0FA3C297446D}
-		{351BE847-A0BF-450C-A5BC-8337AFA49EAA} = {7289C27E-D7DF-2C71-84B4-151F3A162493}
-		{1DB299CE-95EA-4566-84DD-171768758291} = {351BE847-A0BF-450C-A5BC-8337AFA49EAA}
-		{583E2B51-A90B-4F34-AD8B-4061504E855E} = {351BE847-A0BF-450C-A5BC-8337AFA49EAA}
-		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC} = {351BE847-A0BF-450C-A5BC-8337AFA49EAA}
-		{5EC4C165-25BB-4346-9DCC-5EFEEAC00C02} = {4CAE9195-4F1A-4D48-854C-1C9FBC512C66}
-		{B3061B34-2A1C-49B9-A3A9-D4D37B4704B2} = {5EC4C165-25BB-4346-9DCC-5EFEEAC00C02}
-		{3654906C-6852-48AF-BC7E-B3A62F3E9DB9} = {5EC4C165-25BB-4346-9DCC-5EFEEAC00C02}
-		{45B9E5C3-DED5-4DB6-B1E6-4EAC4E68BA83} = {5EC4C165-25BB-4346-9DCC-5EFEEAC00C02}
-		{E849E6FB-1AB0-4922-A060-0062EA669FD0} = {5EC4C165-25BB-4346-9DCC-5EFEEAC00C02}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {01D48116-37A2-4D33-B9EC-94793C702431}
-	EndGlobalSection
-EndGlobal
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
new file mode 100644
index 0000000000..0452cba60c
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -0,0 +1,335 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/doc/">
+    <Project Path="../doc/samples/Microsoft.Data.SqlClient.Samples.csproj">
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+    </Project>
+  </Folder>
+  <Folder Name="/doc/snippets/" />
+  <Folder Name="/doc/snippets/Microsoft.Data.Sql/">
+    <File Path="../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.Sql/SqlNotificationRequest.xml" />
+  </Folder>
+  <Folder Name="/doc/snippets/Microsoft.Data.SqlClient.DataClassification/">
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient.DataClassification/ColumnSensitivity.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient.DataClassification/InformationType.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient.DataClassification/Label.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient.DataClassification/SensitivityClassification.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient.DataClassification/SensitivityProperty.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient.DataClassification/SensitivityRank.xml" />
+  </Folder>
+  <Folder Name="/doc/snippets/Microsoft.Data.SqlClient.Server/">
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient.Server/TriggerAction.xml" />
+  </Folder>
+  <Folder Name="/doc/snippets/Microsoft.Data.SqlClient/">
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/ActiveDirectoryAuthenticationProvider.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/ApplicationIntent.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/OnChangeEventHandler.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/PoolBlockingPeriod.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SortOrder.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlAuthenticationInitializer.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlAuthenticationMethod.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlAuthenticationParameters.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlAuthenticationProvider.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlAuthenticationToken.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopy.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMapping.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMappingCollection.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHint.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnOrderHintCollection.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyOptions.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlClientDiagnostic.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlClientFactory.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlClientLogger.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlClientPermission.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlClientPermissionAttribute.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCertificateStoreProvider.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionEnclaveProvider.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlCommandBuilder.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlCommandColumnEncryptionSetting.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlConfigurableRetryFactory.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionAttestationProtocol.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionColumnEncryptionSetting.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionEncryptOption.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionIPAddressPreference.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionOverrides.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlCredential.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlDependency.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlEnclaveAttestationParameters.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlEnclaveSession.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlError.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlErrorCollection.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlException.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlInfoMessageEventArgs.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlInfoMessageEventHandler.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlNotificationEventArgs.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlNotificationInfo.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlNotificationSource.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlNotificationType.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlParameterCollection.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRetryingEventArgs.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRetryIntervalBaseEnumerator.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRetryLogicBase.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRetryLogicBaseProvider.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRetryLogicOption.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRowsCopiedEventArgs.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRowsCopiedEventHandler.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRowUpdatedEventArgs.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRowUpdatedEventHandler.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRowUpdatingEventArgs.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlRowUpdatingEventHandler.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SqlTransaction.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SspiAuthenticationParameters.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlClient/SspiContextProvider.xml" />
+  </Folder>
+  <Folder Name="/doc/snippets/Microsoft.Data.SqlTypes/">
+    <File Path="../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlTypes/SqlJson.xml" />
+    <File Path="../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml" />
+  </Folder>
+  <Folder Name="/doc/snippets/Microsoft.Data/">
+    <File Path="../doc/snippets/Microsoft.Data/OperationAbortedException.xml" />
+    <File Path="../doc/snippets/Microsoft.Data/SqlDbTypeExtensions.xml" />
+  </Folder>
+  <Folder Name="/doc/snippets/Microsoft.SqlServer.Server/">
+    <File Path="../doc/snippets/Microsoft.SqlServer.Server/DataAccessKind.xml" />
+    <File Path="../doc/snippets/Microsoft.SqlServer.Server/Format.xml" />
+    <File Path="../doc/snippets/Microsoft.SqlServer.Server/IBinarySerialize.xml" />
+    <File Path="../doc/snippets/Microsoft.SqlServer.Server/InvalidUdtException.xml" />
+    <File Path="../doc/snippets/Microsoft.SqlServer.Server/SqlFacetAttribute.xml" />
+    <File Path="../doc/snippets/Microsoft.SqlServer.Server/SqlFunctionAttribute.xml" />
+    <File Path="../doc/snippets/Microsoft.SqlServer.Server/SqlMethodAttribute.xml" />
+    <File Path="../doc/snippets/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.xml" />
+    <File Path="../doc/snippets/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.xml" />
+    <File Path="../doc/snippets/Microsoft.SqlServer.Server/SystemDataAccessKind.xml" />
+  </Folder>
+  <Folder Name="/eng/">
+    <File Path="../build.proj" />
+    <File Path="../build2.proj" />
+  </Folder>
+  <Folder Name="/eng/pipelines/">
+    <File Path="../eng/pipelines/dotnet-sqlclient-ci-core.yml" />
+    <File Path="../eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml" />
+    <File Path="../eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml" />
+    <File Path="../eng/pipelines/sqlclient-pr-package-ref-pipeline.yml" />
+    <File Path="../eng/pipelines/sqlclient-pr-project-ref-pipeline.yml" />
+    <File Path="../eng/pipelines/stress-tests-pipeline.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/common/" />
+  <Folder Name="/eng/pipelines/common/templates/" />
+  <Folder Name="/eng/pipelines/common/templates/jobs/">
+    <File Path="../eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml" />
+    <File Path="../eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml" />
+    <File Path="../eng/pipelines/common/templates/jobs/ci-run-tests-job.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/common/templates/stages/">
+    <File Path="../eng/pipelines/common/templates/stages/ci-run-tests-stage.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/common/templates/steps/">
+    <File Path="../eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/ci-project-build-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/configure-sql-server-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/generate-nuget-package-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/override-sni-version.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/pre-build-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/prepare-test-db-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/publish-test-results-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/run-all-tests-step.yml" />
+    <File Path="../eng/pipelines/common/templates/steps/update-config-file-step.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/jobs/">
+    <File Path="../eng/pipelines/jobs/pack-abstractions-package-ci-job.yml" />
+    <File Path="../eng/pipelines/jobs/pack-azure-package-ci-job.yml" />
+    <File Path="../eng/pipelines/jobs/pack-logging-package-ci-job.yml" />
+    <File Path="../eng/pipelines/jobs/stress-tests-ci-job.yml" />
+    <File Path="../eng/pipelines/jobs/test-abstractions-package-ci-job.yml" />
+    <File Path="../eng/pipelines/jobs/test-azure-package-ci-job.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/libraries/">
+    <File Path="../eng/pipelines/libraries/ci-build-variables.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/onebranch/">
+    <File Path="../eng/pipelines/onebranch/sqlclient-non-official.yml" />
+    <File Path="../eng/pipelines/onebranch/sqlclient-official.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/onebranch/jobs/">
+    <File Path="../eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml" />
+    <File Path="../eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml" />
+    <File Path="../eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml" />
+    <File Path="../eng/pipelines/onebranch/jobs/validate-signed-package-job.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/onebranch/stages/">
+    <File Path="../eng/pipelines/onebranch/stages/build-stages.yml" />
+    <File Path="../eng/pipelines/onebranch/stages/release-stages.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/onebranch/steps/">
+    <File Path="../eng/pipelines/onebranch/steps/build-all-configurations-signed-dlls-step.yml" />
+    <File Path="../eng/pipelines/onebranch/steps/code-analyze-step.yml" />
+    <File Path="../eng/pipelines/onebranch/steps/compound-build-csproj-step.yml" />
+    <File Path="../eng/pipelines/onebranch/steps/compound-esrp-dll-signing-step.yml" />
+    <File Path="../eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml" />
+    <File Path="../eng/pipelines/onebranch/steps/compound-nuget-pack-step.yml" />
+    <File Path="../eng/pipelines/onebranch/steps/compound-pack-csproj-step.yml" />
+    <File Path="../eng/pipelines/onebranch/steps/compound-publish-symbols-step.yml" />
+    <File Path="../eng/pipelines/onebranch/steps/esrp-code-signing-step.yml" />
+    <File Path="../eng/pipelines/onebranch/steps/publish-symbols-step.yml" />
+    <File Path="../eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/onebranch/variables/">
+    <File Path="../eng/pipelines/onebranch/variables/common-variables.yml" />
+    <File Path="../eng/pipelines/onebranch/variables/onebranch-variables.yml" />
+    <File Path="../eng/pipelines/onebranch/variables/sqlclient-validation-variables.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/stages/">
+    <File Path="../eng/pipelines/stages/build-abstractions-package-ci-stage.yml" />
+    <File Path="../eng/pipelines/stages/build-azure-package-ci-stage.yml" />
+    <File Path="../eng/pipelines/stages/build-logging-package-ci-stage.yml" />
+    <File Path="../eng/pipelines/stages/build-sqlclient-package-ci-stage.yml" />
+    <File Path="../eng/pipelines/stages/generate-secrets-ci-stage.yml" />
+    <File Path="../eng/pipelines/stages/stress-tests-ci-stage.yml" />
+  </Folder>
+  <Folder Name="/eng/pipelines/steps/">
+    <File Path="../eng/pipelines/steps/install-dotnet-arm64.ps1" />
+    <File Path="../eng/pipelines/steps/install-dotnet.yml" />
+  </Folder>
+  <Folder Name="/Microsoft.Data.SqlClient.Extensions/" />
+  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/" />
+  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/src/">
+    <Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
+  </Folder>
+  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/test/">
+    <Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj" />
+  </Folder>
+  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/" />
+  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/src/">
+    <Project Path="Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
+  </Folder>
+  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/test/">
+    <Project Path="Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj" />
+  </Folder>
+  <Folder Name="/Microsoft.Data.SqlClient.Internal/" />
+  <Folder Name="/Microsoft.Data.SqlClient.Internal/Logging/" />
+  <Folder Name="/Microsoft.Data.SqlClient.Internal/Logging/src/">
+    <Project Path="Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
+  </Folder>
+  <Folder Name="/Microsoft.Data.SqlClient/">
+    <File Path="Microsoft.Data.SqlClient/MdsVersions.props" />
+  </Folder>
+  <Folder Name="/Microsoft.Data.SqlClient/notsupported/">
+    <Project Path="../tools/GenAPI/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj">
+      <Build Project="false" />
+    </Project>
+    <Project Path="../tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj">
+      <Build Project="false" />
+    </Project>
+    <Project Path="Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj">
+      <Build Project="false" />
+    </Project>
+  </Folder>
+  <Folder Name="/Microsoft.Data.SqlClient/ref/">
+    <Project Path="Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj" />
+  </Folder>
+  <Folder Name="/Microsoft.Data.SqlClient/src/">
+    <Project Path="Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
+  </Folder>
+  <Folder Name="/Microsoft.Data.SqlClient/tests/" />
+  <Folder Name="/src/">
+    <File Path="Directory.Build.props" />
+    <Project Path="Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj">
+      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj" />
+      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
+      <BuildDependency Project="Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj" />
+    </Project>
+    <Project Path="Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj" />
+  </Folder>
+  <Folder Name="/src/netcore/">
+    <Project Path="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
+  </Folder>
+  <Folder Name="/src/netcore/ref/">
+    <Project Path="Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj" />
+  </Folder>
+  <Folder Name="/src/netfx/">
+    <Project Path="Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj" />
+  </Folder>
+  <Folder Name="/src/netfx/ref/">
+    <Project Path="Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj">
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj">
+      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj">
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj">
+      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
+    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj">
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj">
+      <Platform Solution="*|x64" Project="x64" />
+      <Platform Solution="*|x86" Project="x86" />
+    </Project>
+  </Folder>
+  <Folder Name="/test/Stress/">
+    <Project Path="Microsoft.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/SqlClient.Stress.Common.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/SqlClient.Stress.Framework.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj" />
+  </Folder>
+  <Folder Name="/test/TestClr/">
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj">
+      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
+      <BuildDependency Project="Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj" />
+    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj">
+      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
+    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj">
+      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
+    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj">
+      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
+    </Project>
+  </Folder>
+  <Project Path="../doc/apps/AzureAuthentication/AzureAuthentication.csproj" />
+</Solution>

From 60d4b92f2c1ae510f0ab6b206f1a3af5688b4a92 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 23 Mar 2026 11:46:34 -0700
Subject: [PATCH 006/298] Add missing package reference to System.Data.Common
 (#4063)

---
 Directory.Packages.props                                         | 1 +
 .../netfx/ref/Microsoft.Data.SqlClient.csproj                    | 1 +
 src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj | 1 +
 tools/specs/Microsoft.Data.SqlClient.nuspec                      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index d043543e78..b1a858bf72 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -94,6 +94,7 @@
     <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.16.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.16.0" />
     <PackageVersion Include="System.Buffers" Version="4.6.1" />
+    <PackageVersion Include="System.Data.Common" Version="4.3.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.3" />
     <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
index 6765e009db..208181ffb6 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
@@ -43,6 +43,7 @@
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
     <PackageReference Include="System.Buffers" />
+    <PackageReference Include="System.Data.Common" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 49f5677535..0f1c3c2d40 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -127,6 +127,7 @@
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
     <PackageReference Include="System.Buffers" />
+    <PackageReference Include="System.Data.Common" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
     <PackageReference Include="System.Memory" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 2e80556c98..75aa9e786d 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -44,6 +44,7 @@
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
         <dependency id="System.Buffers" version="4.6.1" />
+        <dependency id="System.Data.Common" version="4.3.0" />
         <dependency id="System.Diagnostics.DiagnosticSource" version="10.0.3" />
         <dependency id="System.Memory" version="4.6.3" />
         <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />

From f0e6f6c9af361f876f68080c2d4562872cda01e7 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 24 Mar 2026 20:26:35 -0700
Subject: [PATCH 007/298] Eng | Disable ESRP steps on non-official pipelines
 (#4077)

* Disable ESRP steps on non-official pipelines

* Update copilot instructions

* Skip Signature verification for non-official builds

* Address comments

* Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* touch-ups

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../ado-pipelines.instructions.md             | 292 +++-----
 .../onebranch-pipeline-design.instructions.md | 659 ++++--------------
 .../jobs/build-signed-csproj-package-job.yml  |  51 +-
 .../build-signed-sqlclient-package-job.yml    | 245 +++----
 .../jobs/validate-signed-package-job.yml      | 483 ++++++-------
 .../onebranch/sqlclient-non-official.yml      |  53 +-
 .../onebranch/sqlclient-official.yml          |  53 +-
 .../onebranch/stages/build-stages.yml         | 274 ++++----
 .../compound-esrp-nuget-signing-step.yml      |  36 +-
 .../steps/esrp-code-signing-step.yml          | 232 +++---
 10 files changed, 973 insertions(+), 1405 deletions(-)

diff --git a/.github/instructions/ado-pipelines.instructions.md b/.github/instructions/ado-pipelines.instructions.md
index 82b8046dee..db053130e0 100644
--- a/.github/instructions/ado-pipelines.instructions.md
+++ b/.github/instructions/ado-pipelines.instructions.md
@@ -1,195 +1,121 @@
 ---
 applyTo: "eng/pipelines/**/*.yml"
 ---
-# Azure DevOps Pipelines Guide
-
-## Overview
-
-This repository uses Azure DevOps Pipelines for CI/CD. The pipeline configurations are located in `eng/pipelines/`.
-
-**ADO Organization**: sqlclientdrivers
-**ADO Project**: ADO.NET
-
-## Pipeline Structure
-
-```
-eng/pipelines/
-├── abstractions/               # Abstractions package pipelines
-├── azure/                      # Azure package pipelines
-├── common/                     # Shared templates
-│   └── templates/
-│       ├── jobs/               # Reusable job templates
-│       ├── stages/             # Reusable stage templates
-│       └── steps/              # Reusable step templates
-├── jobs/                       # Top-level job definitions
-├── libraries/                  # Shared variable definitions
-├── stages/                     # Stage definitions
-├── steps/                      # Step definitions
-├── variables/                  # Variable templates
-├── akv-official-pipeline.yml                   # AKV provider official/signing build
-├── dotnet-sqlclient-ci-core.yml                # Core CI pipeline (reusable)
-├── dotnet-sqlclient-ci-package-reference-pipeline.yml  # CI with package references
-├── dotnet-sqlclient-ci-project-reference-pipeline.yml  # CI with project references
-├── dotnet-sqlclient-signing-pipeline.yml       # Package signing pipeline
-├── sqlclient-pr-package-ref-pipeline.yml       # PR validation (package ref)
-├── sqlclient-pr-project-ref-pipeline.yml       # PR validation (project ref)
-└── stress-tests-pipeline.yml                   # Stress testing
-```
-
-## Main Pipelines
-
-### CI Core Pipeline (`dotnet-sqlclient-ci-core.yml`)
-Reusable core CI pipeline consumed by both project-reference and package-reference CI pipelines. Configurable parameters:
-
-| Parameter | Description | Default |
-|-----------|-------------|---------|
-| `targetFrameworks` | Windows test frameworks | `[net462, net8.0, net9.0, net10.0]` |
-| `targetFrameworksUnix` | Unix test frameworks | `[net8.0, net9.0, net10.0]` |
-| `referenceType` | Project or Package reference | Required |
-| `buildConfiguration` | Debug or Release | Required |
-| `useManagedSNI` | Test with managed SNI | `[false, true]` |
-| `testJobTimeout` | Test job timeout (minutes) | Required |
-| `runAlwaysEncryptedTests` | Include AE tests | `true` |
-| `enableStressTests` | Include stress test stage | `false` |
-
-### CI Reference Pipelines
-- `dotnet-sqlclient-ci-project-reference-pipeline.yml` — Full CI using project references (builds from source)
-- `dotnet-sqlclient-ci-package-reference-pipeline.yml` — Full CI using package references (tests against published NuGet packages)
-
-### PR Validation Pipelines
-- `sqlclient-pr-project-ref-pipeline.yml` — PR validation with project references
-- `sqlclient-pr-package-ref-pipeline.yml` — PR validation with package references
-
-These pipelines trigger on pull requests and run a subset of the full CI matrix to provide fast feedback.
-
-### Official/Signing Pipeline (`dotnet-sqlclient-signing-pipeline.yml`)
-Signs and publishes NuGet packages. Used for official releases. Requires secure service connections and key vault access for code signing.
-
-### AKV Official Pipeline (`akv-official-pipeline.yml`)
-Builds and signs the `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` add-on package separately from the main driver. Uses 1ES pipeline templates for compliance.
-
-### Stress Tests Pipeline (`stress-tests-pipeline.yml`)
-Optional pipeline for long-running stress and endurance testing. Enabled via `enableStressTests` parameter in CI core.
-
-## Build Stages
-
-1. **build_abstractions_package_stage**: Build and pack abstractions
-2. **build_sqlclient_package_stage**: Build main driver and AKV packages
-3. **build_azure_package_stage**: Build Azure extensions package
-4. **stress_tests_stage**: Optional stress testing
-5. **run_tests_stage**: Execute all test suites
+# Azure DevOps CI/CD Pipeline Guidelines
+
+## Purpose
+
+Rules and conventions for editing the Azure DevOps CI/CD pipelines that build, test, and validate Microsoft.Data.SqlClient. These pipelines live under `eng/pipelines/` (excluding `onebranch/`, which is covered by separate instructions).
+
+**ADO Organization**: sqlclientdrivers | **ADO Project**: ADO.NET
+
+## Pipeline Layout
+
+Two categories of pipelines exist in this repository:
+
+- **CI/PR pipelines** (`eng/pipelines/`) — Build, test, and validate on every push/PR
+- **OneBranch pipelines** (`eng/pipelines/onebranch/`) — Official signing/release builds (separate instructions file)
+
+Top-level CI/PR pipeline files:
+- `dotnet-sqlclient-ci-core.yml` — Reusable core template; all CI and PR pipelines extend this
+- `dotnet-sqlclient-ci-package-reference-pipeline.yml` — CI with Package references (Release)
+- `dotnet-sqlclient-ci-project-reference-pipeline.yml` — CI with Project references (Release)
+- `sqlclient-pr-package-ref-pipeline.yml` — PR validation with Package references
+- `sqlclient-pr-project-ref-pipeline.yml` — PR validation with Project references
+- `stress-tests-pipeline.yml` — Stress tests triggered after successful CI-Package runs
+
+Reusable templates are organized under:
+- `common/templates/jobs/` — Job templates (`ci-build-nugets-job`, `ci-code-coverage-job`, `ci-run-tests-job`)
+- `common/templates/stages/` — Stage templates (`ci-run-tests-stage`)
+- `common/templates/steps/` — Step templates (build, test, config, publish)
+- `jobs/` — Package-specific CI jobs (pack/test Abstractions, Azure, Logging, stress)
+- `stages/` — Package-specific CI stages (build Logging → Abstractions → SqlClient → Azure → verify → stress)
+- `libraries/` — Shared variables (`ci-build-variables.yml`)
+- `steps/` — SDK install steps
+
+## CI Core Template
+
+`dotnet-sqlclient-ci-core.yml` is the central orchestrator. All CI and PR pipelines extend it with different parameters.
+
+Key parameters:
+- `referenceType` (required) — `Package` or `Project`; controls how sibling packages are referenced
+- `buildConfiguration` (required) — `Debug` or `Release`
+- `testJobTimeout` (required) — test job timeout in minutes
+- `targetFrameworks` — Windows test TFMs; default `[net462, net8.0, net9.0, net10.0]`
+- `targetFrameworksUnix` — Unix test TFMs; default `[net8.0, net9.0, net10.0]`
+- `testSets` — test partitions; default `[1, 2, 3]`
+- `useManagedSNI` — SNI variants to test; default `[false, true]`
+- `runAlwaysEncryptedTests` — include AE test set; default `true`
+- `enableStressTests` — enable stress test stage; default `false`
+- `debug` — enable debug output; default `false`
+- `dotnetVerbosity` — MSBuild verbosity; default `normal`
+
+## Build Stage Order
+
+Stages execute in dependency order (Package reference mode requires artifacts from prior stages):
+1. `generate_secrets` — Generate test secrets
+2. `build_logging_package_stage` — Build Logging package
+3. `build_abstractions_package_stage` — Build Abstractions (depends on Logging)
+4. `build_sqlclient_package_stage` — Build SqlClient + AKV Provider (depends on Abstractions + Logging)
+5. `build_azure_package_stage` — Build Azure extensions (depends on Abstractions + Logging + SqlClient)
+6. `verify_nuget_packages_stage` — Verify NuGet package metadata
+7. `stress_tests_stage` — Optional stress tests
+8. `ci_run_tests_stage` — Run MDS and AKV test suites
+
+When adding a new build stage, respect the dependency graph and pass artifact names/versions to downstream stages.
+
+## PR vs CI Pipeline Differences
+
+PR pipelines:
+- Trigger on PRs to `dev/*`, `feat/*`, `main`; exclude `eng/pipelines/onebranch/*` paths
+- Use reduced TFM matrix: `[net462, net8.0, net9.0]` (excludes net10.0)
+- Timeout: 90 minutes
+- Package-ref PR disables Always Encrypted tests in Debug config
+
+CI pipelines:
+- Trigger on push to `main` (GitHub) and `internal/main` (ADO) with `batch: true`
+- Scheduled weekday builds (see individual pipeline files for cron times)
+- Full TFM matrix including net10.0
 
 ## Test Configuration
 
-### Test Sets
-Tests are divided into sets for parallelization:
-- `TestSet=1` — First partition of tests
-- `TestSet=2` — Second partition
-- `TestSet=3` — Third partition
-- `TestSet=AE` — Always Encrypted tests
-
-### Test Filters
-Tests use category-based filtering. The default filter excludes both `failing` and `flaky` tests:
-```
-category!=failing&category!=flaky
-```
-
-Category values:
-- `nonnetfxtests` — Excluded on .NET Framework
-- `nonnetcoreapptests` — Excluded on .NET Core
-- `nonwindowstests` — Excluded on Windows
-- `nonlinuxtests` — Excluded on Linux
-- `failing` — Known permanent failures (excluded from all runs)
-- `flaky` — Intermittently failing tests (quarantined, run separately)
-
-### Flaky Test Quarantine in Pipelines
-Quarantined tests (`[Trait("Category", "flaky")]`) run in **separate pipeline steps** after the main test steps. This ensures:
-- Main test runs are **not blocked** by intermittent failures
-- Flaky tests are still **monitored** for regression or resolution
-- Code coverage is **not collected** for flaky test runs
-- Results appear in pipeline output for visibility
-
-The quarantine steps are configured in:
-- `eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml`
-- `eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml`
-- `eng/pipelines/common/templates/steps/run-all-tests-step.yml`
-
-### Test Timeout
-All test runs use `--blame-hang-timeout 10m` (configured in `build.proj`). Tests exceeding 10 minutes are killed and reported as failures.
-
-### SNI Testing
-The `useManagedSNI` parameter controls testing with:
-- Native SNI (`false`) - Windows native library
-- Managed SNI (`true`) - Cross-platform managed implementation
+Test partitioning:
+- Tests split into `TestSet=1`, `TestSet=2`, `TestSet=3` for parallelization
+- `TestSet=AE` — Always Encrypted tests (controlled by `runAlwaysEncryptedTests`)
 
-## Variables
-
-### Build Variables (`ci-build-variables.yml`)
-Common build configuration:
-- Package versions
-- Build paths
-- Signing configuration
-
-### Runtime Variables
-Set via pipeline parameters or UI:
-- `Configuration` - Debug/Release
-- `Platform` - AnyCPU/x86/x64
-- `TF` - Target framework
-
-## Creating Pipeline Changes
-
-### Adding New Test Categories
-1. Add category attribute to tests: `[Category("newcategory")]`
-2. Update filter expressions in test job templates
-3. Document category purpose in test documentation
-
-### Adding New Pipeline Parameters
-1. Define parameter in appropriate `.yml` file
-2. Add to parameter passing in calling templates
-3. Document in this file
-
-### Modifying Build Steps
-1. Changes should be made in template files for reusability
-2. Test changes locally when possible
-3. Submit as PR - validation will run
+Test filters — default excludes `failing` and `flaky` categories:
+- `failing` — known permanent failures, always excluded
+- `flaky` — intermittent failures, quarantined in separate pipeline steps
+- `nonnetfxtests` / `nonnetcoreapptests` — platform-specific exclusions
+- `nonwindowstests` / `nonlinuxtests` — OS-specific exclusions
 
-## Best Practices
+Flaky test quarantine:
+- Quarantined tests (`[Trait("Category", "flaky")]`) run in separate steps after main tests
+- Main test runs are not blocked by flaky failures
+- No code coverage collected for flaky runs
+- Configured in `common/templates/steps/build-and-run-tests-netcore-step.yml`, `build-and-run-tests-netfx-step.yml`, and `run-all-tests-step.yml`
 
-### Template Design
-- Use templates for reusable definitions
-- Pass parameters explicitly (avoid global variables)
-- Use descriptive stage/job/step names
+SNI testing — `useManagedSNI` controls testing with native SNI (`false`) or managed SNI (`true`)
 
-### Variable Management
-- Use template variables for shared values
-- Use pipeline parameters for per-run configuration
-- Avoid hardcoding versions (use Directory.Packages.props)
+Test timeout — `--blame-hang-timeout 10m` (configured in `build.proj`); tests exceeding 10 minutes are killed
 
-### Test Infrastructure
-- Ensure tests are properly categorized
-- Handle test configuration files properly
-- Use test matrix for cross-platform coverage
-
-## Troubleshooting
-
-### Common Issues
-1. **Test failures due to missing config**: Ensure `config.json` exists
-2. **Platform-specific failures**: Check platform exclusion categories
-3. **Timeout issues**: Increase `testJobTimeout` parameter
-
-### Debugging Pipelines
-- Enable debug mode via `debug: true` parameter
-- Use `dotnetVerbosity: diagnostic` for detailed output
-- Check build logs in Azure DevOps
-
-## Security Considerations
-
-- Pipelines use service connections for artifact publishing
-- Signing uses secure key vault integration
-- Sensitive configuration should use pipeline secrets
-- Never commit credentials in pipeline files
-
-## Related Documentation
+## Variables
 
-- [BUILDGUIDE.md](../../BUILDGUIDE.md) - Local build instructions
-- [Azure DevOps Documentation](https://learn.microsoft.com/azure/devops/pipelines/)
+- All CI build variables centralized in `libraries/ci-build-variables.yml`
+- Package versions use `-ci` suffix (e.g., `7.0.0.$(Build.BuildNumber)-ci`)
+- `assemblyBuildNumber` derived from first segment of `Build.BuildNumber` (16-bit safe)
+- `localFeedPath` = `$(Build.SourcesDirectory)/packages` — local NuGet feed for inter-package deps
+- `packagePath` = `$(Build.SourcesDirectory)/output` — NuGet pack output
+
+## Conventions When Editing Pipelines
+
+- Always use templates for reusable logic — do not inline complex steps
+- Pass parameters explicitly; avoid relying on global variables
+- Use descriptive stage/job/step display names
+- When adding parameters, define them in the core template and thread through calling pipelines
+- When adding test categories, update filter expressions in test step templates
+- PR pipelines should run a minimal matrix for fast feedback
+- Test changes via PR pipeline first — validation runs automatically
+- Enable `debug: true` and `dotnetVerbosity: diagnostic` for troubleshooting
+- Never commit credentials or secrets in pipeline files
+- Signing and release are handled by OneBranch pipelines — not these CI/PR pipelines
diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index 1c848e2493..f2319ee5b2 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -1,534 +1,139 @@
 ---
 applyTo: "eng/pipelines/**/*.yml"
 ---
-# Multi-Product Azure DevOps Pipeline in dotnet/sqlclient — Design Specification
+# OneBranch Pipeline Guidelines
 
-## 1. Overview
+## Purpose
 
-This document describes the design of the unified Azure DevOps YAML pipeline that builds, signs, packages, and optionally releases six NuGet packages with interdependencies. The pipeline uses **stages** and **jobs** to maximize parallelism while respecting dependency order. It comprises five stages: three build stages, a validation stage, and an on-demand release stage.
+Rules and conventions for editing the OneBranch Azure DevOps YAML pipelines that build, sign, package, and release six NuGet packages with interdependencies.
 
-Two pipeline variants exist from the same stage/job structure:
+## Pipeline Variants
+
+- `sqlclient-official.yml` — Official pipeline; uses `OneBranch.Official.CrossPlat.yml`; CI trigger on `internal/main` + daily schedule at 04:30 UTC
+- `sqlclient-non-official.yml` — Non-Official pipeline; uses `OneBranch.NonOfficial.CrossPlat.yml`; manual only (`pr: none`, `trigger: none`)
+- Both live under `eng/pipelines/onebranch/` and extend OneBranch governed templates
+- Never parameterize the OneBranch template name — hardcode it per pipeline for PRC compliance
+- Official pipeline must never be run on PRs or dev branches.
 
-| Pipeline | Template | Trigger | Purpose |
-|----------|----------|---------|---------|
-| `dotnet-sqlclient-official-pipeline.yml` | `OneBranch.Official.CrossPlat.yml` | CI + scheduled | Production-signed builds |
-| `dotnet-sqlclient-non-official-pipeline.yml` | `OneBranch.NonOfficial.CrossPlat.yml` | Manual only | Validation / test builds (release in dry-run mode) |
-
-Both pipelines use the **OneBranch (1ES) governed template** infrastructure and share identical stage definitions, job templates, and variable chains.
-
----
-
-## 2. Products and Dependencies
-
-| # | Package | Dependencies |
-|---|---------|-------------|
-| 1 | `Microsoft.SqlServer.Server` | — |
-| 2 | `Microsoft.Data.SqlClient.Internal.Logging` | — |
-| 3 | `Microsoft.Data.SqlClient.Extensions.Abstractions` | `Internal.Logging` |
-| 4 | `Microsoft.Data.SqlClient` | `Internal.Logging`, `Extensions.Abstractions` |
-| 5 | `Microsoft.Data.SqlClient.Extensions.Azure` | `Extensions.Abstractions`, `Internal.Logging` |
-| 6 | `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` | `SqlClient`, `Internal.Logging` |
-
----
-
-## 3. Pipeline Flow — Sequence Diagram
-
-```mermaid
-sequenceDiagram
-    participant T as Trigger / User
-    participant P as Pipeline Orchestrator
-    participant B1a as Job: Build Internal.Logging
-    participant B1c as Job: Build SqlServer.Server
-    participant B1b as Job: Build Extensions.Abstractions
-    participant B2a as Job: Build SqlClient
-    participant B2b as Job: Build Extensions.Azure
-    participant V as Job: Validate MDS Package
-    participant B3 as Job: Build AKV Provider
-    participant R as Stage: Release
-
-    Note over T,R: ══════ BUILD & SIGN PHASE ══════
-
-    T->>P: Pipeline triggered (CI / Scheduled / Manual)
-
-    Note over P: Stage 1 — build_independent (parallel, no deps)
-
-    par Stage 1 jobs (parallel)
-        P->>B1a: Build DLLs → ESRP sign DLLs → Pack → ESRP sign NuGet (Logging)
-        B1a-->>P: ✅ Signed .nupkg
-    and
-        P->>B1c: Build + ESRP sign + pack SqlServer.Server
-        B1c-->>P: ✅ Signed .nupkg
-    end
-
-    Note over P: Stage 2 — build_abstractions (dependsOn: build_independent)
-
-    P->>B1b: Build DLLs → ESRP sign DLLs → Pack → ESRP sign NuGet (Abstractions)
-    Note right of B1b: Downloads: Internal.Logging artifact
-    B1b-->>P: ✅ Signed .nupkg
-
-    Note over P: Stage 3 — build_dependent (dependsOn: build_abstractions)
-
-    par Stage 3 jobs (parallel)
-        P->>B2a: Build + ESRP sign + pack SqlClient
-        Note right of B2a: Downloads: Internal.Logging,<br/>Extensions.Abstractions artifacts
-        B2a-->>P: ✅ Signed .nupkg + .snupkg
-    and
-        P->>B2b: Build DLLs → ESRP sign DLLs → Pack → ESRP sign NuGet (Azure)
-        Note right of B2b: Downloads: Extensions.Abstractions,<br/>Internal.Logging artifacts
-        B2b-->>P: ✅ Signed .nupkg
-    end
-
-    Note over P: Validation + Stage 4 (both dependsOn: build_dependent, run in parallel)
-
-    par Validation and Stage 4 (parallel)
-        P->>V: Validate signed MDS package
-        V-->>P: ✅ Package validation passed
-    and
-        P->>B3: Build + ESRP sign + pack AKV Provider
-        Note right of B3: Downloads: SqlClient,<br/>Internal.Logging artifacts
-        B3-->>P: ✅ Signed .nupkg
-    end
-
-    Note over T,R: ══════ RELEASE PHASE (on-demand) ══════
-
-    alt At least one release parameter is true
-        P->>R: Stage: release (dependsOn: conditional on build stages)
-        Note right of R: ADO Environment Approval<br/>(NuGet-Production environment)
-        R-->>P: ✅ Approved
-        Note right of R: Publish selected packages<br/>via NuGetCommand@2
-        R-->>P: ✅ Published to NuGet
-    else No release parameters set
-        Note over P: Release stage skipped
-    end
-
-    Note over T,R: Pipeline complete 🎉
-```
-
----
-
-## 4. Stage Design
-
-### 4.1 Build Phase
-
-The build phase runs automatically on every CI trigger, scheduled run, or manual queue. It is divided into four build stages plus a validation stage, based on the dependency graph.
-
-#### Stage 1 — `build_independent`: Independent Packages (no dependencies)
-
-| Job Template | Package | Build Target | Condition |
-|--------------|---------|--------------|-----------|
-| `build-signed-csproj-package-job.yml` | `Microsoft.Data.SqlClient.Internal.Logging` | `BuildLogging` / `PackLogging` | `buildAKVProvider OR buildSqlClient` |
-| `build-signed-csproj-package-job.yml` | `Microsoft.SqlServer.Server` | `PackSqlServer` | `buildSqlServerServer` |
-
-- **`dependsOn`**: none
-- **Parallelism**: Jobs run in parallel (depending on which are enabled)
-- **Conditional builds**: Each job is wrapped with compile-time `${{ if }}` conditionals based on build parameters
-- csproj-based jobs (`build-signed-csproj-package-job.yml`) perform: **Build DLLs → ESRP DLL signing → NuGet pack (NoBuild=true) → ESRP NuGet signing** → publish artifact
-
-#### Stage 2 — `build_abstractions`: Abstractions Package (depends on Stage 1)
-
-| Job Template | Package | Build Target | Artifact Dependencies |
-|--------------|---------|--------------|----------------------|
-| `build-signed-csproj-package-job.yml` | `Microsoft.Data.SqlClient.Extensions.Abstractions` | `BuildAbstractions` / `PackAbstractions` | `Internal.Logging` |
-
-- **Stage condition**: `buildSqlClient = true` (entire stage is excluded when false)
-- **`dependsOn`**: `build_independent`
-- Downloads `Microsoft.Data.SqlClient.Internal.Logging.nupkg` (from Stage 1) pipeline artifact
-
-#### Stage 3 — `build_dependent`: Core Packages (depend on Stage 2)
-
-| Job Template | Package | Build Target | Artifact Dependencies |
-|--------------|---------|--------------|----------------------|
-| `build-signed-package-job.yml` | `Microsoft.Data.SqlClient` | *(nuspec-based)* | `Internal.Logging`, `Extensions.Abstractions` |
-| `build-signed-csproj-package-job.yml` | `Microsoft.Data.SqlClient.Extensions.Azure` | `BuildAzure` / `PackAzure` | `Extensions.Abstractions`, `Internal.Logging` |
-
-- **Stage condition**: `buildSqlClient = true` (entire stage is excluded when false)
-- **`dependsOn`**: `build_abstractions`
-- **Parallelism**: Both jobs run in parallel
-- The MDS (SqlClient) job also publishes symbol packages (`.snupkg`) when `publishSymbols` is true
-- All jobs configure APIScan with job-level `ob_sdl_apiscan_*` variables targeting package-specific folders
-
-#### Stage 4 — `build_addons`: Add-on Packages (depend on Stage 3)
-
-| Job Template | Package | Artifact Dependencies |
-|--------------|---------|----------------------|
-| `build-akv-official-job.yml` | `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` | `SqlClient`, `Internal.Logging` |
-
-- **Stage condition**: `buildAKVProvider AND buildSqlClient` (both must be true)
-- **`dependsOn`**: `build_dependent`
-- Downloads `Microsoft.Data.SqlClient.nupkg` (from Stage 3) and `Microsoft.Data.SqlClient.Internal.Logging.nupkg` (from Stage 1) pipeline artifacts
-- Uses separate ESRP signing credentials (`Signing`-prefixed variables from `esrp-variables-v2` group)
-
-### 4.2 Validation Stage — `mds_package_validation`
-
-Validates the signed MDS (SqlClient) package after Stage 3 completes.
-
-- **Stage condition**: `buildSqlClient = true`
-- **`dependsOn`**: `build_dependent`
-- Runs in parallel with Stage 4 (`build_addons`)
-- Uses `validate-signed-package-job.yml` template
-- Downloads the `drop_build_dependent_build_signed_package` artifact and validates against `CurrentNetFxVersion` (default: `net462`)
-
-### 4.3 Release Phase — `release`
-
-The release stage is gated and only executes on demand when at least one release parameter is set to `true` at queue time.
-
-- **`dependsOn`**: Conditional based on which build stages are enabled:
-  - `build_independent` (when releasing SqlServer.Server or Logging)
-  - `build_abstractions` (when releasing Abstractions)
-  - `build_dependent`, `mds_package_validation` (when `buildSqlClient = true`)
-  - `build_addons` (when `buildAKVProvider AND buildSqlClient`)
-- **Gate**: ADO Environment approvals (official pipeline only):
-  - Official: `NuGet-Production` environment with configured approvals
-  - Non-Official: `NuGet-DryRun` environment (no approvals, validation only)
-- **Package selection**: Controlled by 6 runtime boolean parameters (see Section 5.2)
-- **Stage condition**: The entire stage is skipped unless at least one release parameter is `true`:
-  ```yaml
-  - ${{ if or(parameters.releaseSqlServerServer, parameters.releaseLogging, ...) }}:
-    - stage: release
-  ```
-- **Publish jobs**: Each package has a conditional publish job that is included at compile time only when its parameter is `true`:
-  ```yaml
-  - ${{ if eq(parameters.releaseXxx, true) }}:
-    - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
-  ```
-- **Environment variables**: Stage sets `ob_release_usedeploymentjob: true` for OneBranch integration:
-  - Official: `ob_release_environment: 'NuGet-Production'`
-  - Non-Official: `ob_release_environment: 'NuGet-DryRun'`
-
-#### Artifact → Publish Job Mapping
-
-| Package | Artifact Name | Publish Job |
-|---------|---------------|-------------|
-| `Microsoft.SqlServer.Server` | `drop_build_independent_build_package_SqlServer` | `publish_SqlServer_Server` |
-| `Microsoft.Data.SqlClient.Internal.Logging` | `drop_build_independent_build_package_Logging` | `publish_Logging` |
-| `Microsoft.Data.SqlClient.Extensions.Abstractions` | `drop_build_abstractions_build_package_Abstractions` | `publish_Abstractions` |
-| `Microsoft.Data.SqlClient` | `drop_build_dependent_build_package_SqlClient` | `publish_SqlClient` |
-| `Microsoft.Data.SqlClient.Extensions.Azure` | `drop_build_dependent_build_package_Azure` | `publish_Extensions_Azure` |
-| `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` | `drop_build_addons_buildSignedAkvPackage` | `publish_AKVProvider` |
-
-Each publish job uses the reusable `publish-nuget-package-job.yml` template, which downloads the artifact and pushes `.nupkg`/`.snupkg` files via `NuGetCommand@2` with an external feed service connection.
-
-#### Dry-Run Mode
-
-Two ADO environments control release behavior:
-
-| Environment | Pipeline | Behavior |
-|------------|----------|----------|
-| `NuGet-DryRun` | Non-Official | Validation only — packages are never pushed |
-| `NuGet-Production` | Official | Real releases with approval gate |
-
-**Non-official pipeline**: Always runs in dry-run mode. There is no `releaseDryRun` parameter — `dryRun: true` is hardcoded in every publish job. This prevents accidental publication from validation builds.
-
-**Official pipeline**: Exposes a `releaseDryRun` parameter (default: `true` for safety). When enabled, the template downloads artifacts and lists the `.nupkg`/`.snupkg` files that *would* be published but skips the actual `NuGetCommand@2` push. Set `releaseDryRun: false` to perform real pushes after final validation.
-
----
-
-## 5. Runtime Parameters
-
-### 5.1 Build Parameters
-
-The pipeline exposes the following parameters at queue time:
-
-```yaml
-parameters:
-  - name: debug
-    displayName: 'Enable debug output'
-    type: boolean
-    default: false
-
-  - name: publishSymbols
-    displayName: 'Publish symbols'
-    type: boolean
-    default: false
-
-  - name: CurrentNetFxVersion
-    displayName: 'Lowest supported .NET Framework version (MDS validation)'
-    type: string
-    default: 'net462'
-
-  - name: isPreview
-    displayName: 'Is this a preview build?'
-    type: boolean
-    default: false
-
-  - name: testJobTimeout
-    displayName: 'Test job timeout (in minutes)'
-    type: number
-    default: 60
-
-  # Build parameters — control which packages to build
-  - name: buildSqlServerServer
-    displayName: 'Build Microsoft.SqlServer.Server'
-    type: boolean
-    default: true
-
-  - name: buildSqlClient
-    displayName: 'Build Microsoft.Data.SqlClient and Extensions'
-    type: boolean
-    default: true
-
-  - name: buildAKVProvider
-    displayName: 'Build Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
-    type: boolean
-    default: true
-```
-
-The `isPreview` parameter controls version resolution — when `true`, each package uses its preview version (e.g., `loggingPackagePreviewVersion`) instead of the GA version (e.g., `loggingPackageVersion`). All versions are defined in the centralized `libraries/common-variables.yml`.
-
-The build parameters enable selective package building:
-- `buildSqlServerServer` — controls SqlServer.Server build job
-- `buildSqlClient` — controls MDS, Extensions.Azure, Abstractions, Logging (when AKV is disabled), and validation stages
-- `buildAKVProvider` — controls AKV Provider build (also requires `buildSqlClient=true`) and Logging (when SqlClient is disabled)
-
-When set to `false`, the respective jobs/stages are excluded at compile-time using `${{ if }}` conditionals. This allows faster pipeline runs when only certain packages need to be built.
-
-### 5.2 Release Parameters
-
-Six boolean parameters control selective package release. All default to `false` so the release stage is skipped on normal CI/scheduled builds:
-
-```yaml
-parameters:
-  - name: releaseSqlServerServer
-    displayName: 'Release Microsoft.SqlServer.Server'
-    type: boolean
-    default: false
-
-  - name: releaseLogging
-    displayName: 'Release Microsoft.Data.SqlClient.Internal.Logging'
-    type: boolean
-    default: false
-
-  - name: releaseAbstractions
-    displayName: 'Release Microsoft.Data.SqlClient.Extensions.Abstractions'
-    type: boolean
-    default: false
-
-  - name: releaseSqlClient
-    displayName: 'Release Microsoft.Data.SqlClient'
-    type: boolean
-    default: false
-
-  - name: releaseAzure
-    displayName: 'Release Microsoft.Data.SqlClient.Extensions.Azure'
-    type: boolean
-    default: false
-
-  - name: releaseAKVProvider
-    displayName: 'Release Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
-    type: boolean
-    default: false
-```
-
-#### Dry-Run Parameter (Official Pipeline Only)
-
-The **official pipeline** includes a `releaseDryRun` parameter that defaults to `true` for safety:
-
-```yaml
-  - name: releaseDryRun
-    displayName: 'Release Dry Run (do not push to NuGet)'
-    type: boolean
-    default: true    # safety default — must explicitly disable for real releases
-```
-
-When `releaseDryRun: true`, publish jobs download artifacts and list packages but skip actual NuGet push. Set to `false` for production releases.
-
-> **Note**: The non-official pipeline does **not** expose this parameter — dry-run mode is hardcoded and cannot be disabled.
-
----
-
-## 6. Variable & Version Management
-
-### 6.1 Variable Chain
-
-Variables are defined in a layered template chain. All variable groups live inside the templates — none are declared inline at the pipeline level:
-
-```
-dotnet-sqlclient-official-pipeline.yml
-  └─ libraries/variables.yml
-       └─ libraries/build-variables.yml
-            ├─ group: 'Release Variables'
-            ├─ group: 'Symbols publishing'          ← SymbolsPublishServer, SymbolsPublishTokenUri, etc.
-            └─ libraries/common-variables.yml
-                 ├─ group: 'ESRP Federated Creds (AME)'  ← ESRP signing credentials
-                 ├─ SymbolServer / SymbolTokenUri aliases ← mapped from Symbols publishing group
-                 └─ all package versions, paths, build variables
-```
-
-### 6.2 Package Version Variables
-
-All package versions are centralized in `libraries/common-variables.yml`:
-
-| Package | GA Version Var | Preview Version Var | Assembly Version Var |
-|---------|---------------|--------------------|--------------------|
-| Logging | `loggingPackageVersion` | `loggingPackagePreviewVersion` | `loggingAssemblyFileVersion` |
-| Abstractions | `abstractionsPackageVersion` | `abstractionsPackagePreviewVersion` | `abstractionsAssemblyFileVersion` |
-| SqlServer.Server | `sqlServerPackageVersion` | `sqlServerPackagePreviewVersion` | `sqlServerAssemblyFileVersion` |
-| SqlClient (MDS) | `mdsPackageVersion` | `mdsPackagePreviewVersion` | `mdsAssemblyFileVersion` |
-| Extensions.Azure | `azurePackageVersion` | `azurePackagePreviewVersion` | `azureAssemblyFileVersion` |
-| AKV Provider | `akvPackageVersion` | `akvPackagePreviewVersion` | `akvAssemblyFileVersion` |
-
-The pipeline resolves `effective*Version` variables at compile time based on the `isPreview` parameter.
-
-### 6.3 Release & Symbol Variables
-
-| Variable | Defined In | Purpose |
-|----------|-----------|---------|
-| `NuGetServiceConnection` | `libraries/common-variables.yml` | External NuGet service connection name for `NuGetCommand@2` push |
-| `SymbolServer` | `libraries/common-variables.yml` (alias) | Alias for `$(SymbolsPublishServer)` — used by MDS `publish-symbols-step.yml` |
-| `SymbolTokenUri` | `libraries/common-variables.yml` (alias) | Alias for `$(SymbolsPublishTokenUri)` — used by MDS `publish-symbols-step.yml` |
-
-### 6.4 Variable Groups
-
-| Group | Included In | Purpose |
-|-------|------------|---------|
-| `Release Variables` | `build-variables.yml` | Release-specific configuration |
-| `Symbols publishing` | `build-variables.yml` | Symbol publishing credentials (`SymbolsAzureSubscription`, `SymbolsPublishServer`, `SymbolsPublishTokenUri`, `SymbolsUploadAccount`, `SymbolsPublishProjectName`) |
-| `ESRP Federated Creds (AME)` | `common-variables.yml` | Federated identity for ESRP signing (`ESRPConnectedServiceName`, `ESRPClientId`, `AppRegistrationClientId`, `AppRegistrationTenantId`, `AuthAKVName`, `AuthSignCertName`) |
-
----
-
-## 7. Code Signing (ESRP)
-
-All packages are signed using **ESRP (Enterprise Security Release Pipeline)** with federated identity authentication.
-
-### Signing Flow (per job)
-
-#### csproj-based Extension Packages (Logging, Abstractions, Azure)
-1. **Build DLLs only** — `build.proj` target (e.g., `BuildLogging`) compiles assemblies without creating NuGet packages
-2. **ESRP DLL signing** — Assemblies are signed with Authenticode certificates via ESRP
-3. **NuGet pack** — `build.proj` pack target (e.g., `PackLogging`) creates `.nupkg` from signed DLLs using `NoBuild=true`
-4. **ESRP NuGet signing** — The `.nupkg` files are signed with NuGet certificates via ESRP
-
-This workflow ensures the NuGet package contains **signed DLLs** rather than signing the NuGet package around unsigned assemblies.
-
-#### nuspec-based Packages (SqlServer.Server, SqlClient, AKV Provider)
-1. **Build + pack** — MSBuild creates both assemblies and NuGet packages
-2. **ESRP DLL signing** — Assemblies are signed with Authenticode certificates via ESRP
-3. **ESRP NuGet signing** — The `.nupkg` files are signed with NuGet certificates via ESRP
-
-### Credential Model
-
-- Extension packages (Logging, Abstractions, Azure, SqlServer.Server, SqlClient) use the primary ESRP credentials from the `ESRP Federated Creds (AME)` variable group (loaded via `common-variables.yml`)
-- AKV Provider uses separate `Signing`-prefixed credential parameters that are passed explicitly to the `build-akv-official-job.yml` template
-- All credentials are sourced from Azure Key Vault and federated identity — no secrets stored in pipeline YAML
-
----
-
-## 8. SDL & Compliance (OneBranch)
-
-Both pipelines use **OneBranch governed templates** for 1ES compliance. The SDL configuration differs between Official and Non-Official:
-
-| SDL Tool | Official | Non-Official | Purpose |
-|----------|----------|--------------|---------|
-| **TSA** | ✅ `enabled: true` | ❌ `enabled: false` | Uploads SDL results to TSA for downstream analysis |
-| **ApiScan** | ✅ `enabled: true`, `break: true` | ✅ `enabled: true`, `break: true` | Scans APIs for compliance issues |
-| **CodeQL** | ✅ (non-preview) | ✅ (non-preview) | Static analysis for security vulnerabilities |
-| **SBOM** | ✅ (non-preview) | ✅ (non-preview) | Software Bill of Materials generation |
-| **Policheck** | ✅ `break: true` | ✅ `break: true` | Scans for policy-violating content |
-| **BinSkim** | ✅ (async, non-preview) | ✅ (async, non-preview) | Binary security analysis |
-| **CredScan** | ✅ (async, non-preview) | ✅ (async, non-preview) | Credential leak detection |
-| **Roslyn** | ✅ (async, non-preview) | ✅ (async, non-preview) | Roslyn-based security analyzers |
-| **Armory** | ✅ `break: true` | ✅ `break: true` | Additional security scanning |
-
-### APIScan Configuration
-
-APIScan is configured at **both pipeline level and job level**:
-
-**Pipeline-level** (`globalSdl:apiscan:`): Sets default configuration inherited by all jobs. This is configured for MDS (Microsoft.Data.SqlClient) as the primary product.
-
-**Job-level** (`ob_sdl_apiscan_*` variables): Each build job overrides the pipeline defaults with package-specific settings:
-
-| Variable | Purpose |
-|----------|---------|
-| `ob_sdl_apiscan_enabled` | Enable/disable APIScan for this job (`true`) |
-| `ob_sdl_apiscan_softwareFolder` | Path to signed DLLs for scanning |
-| `ob_sdl_apiscan_symbolsFolder` | Path to PDBs for scanning |
-| `ob_sdl_apiscan_softwarename` | Package name (e.g., `Microsoft.Data.SqlClient.Internal.Logging`) |
-| `ob_sdl_apiscan_versionNumber` | Assembly file version |
-
-Each job copies its signed DLLs and PDBs to a package-specific folder under `$(Build.SourcesDirectory)/apiScan/<PackageName>/` after ESRP DLL signing, ensuring APIScan analyzes the correct signed binaries for each package.
-
-> **PRC Compliance**: The Official pipeline hardcodes `OneBranch.Official.CrossPlat.yml` (not parameterized) to satisfy Production Readiness Check static verification requirements.
-
----
-
-## 9. Artifact Strategy
-
-- Each build job publishes its output as a **pipeline artifact** managed by OneBranch's `ob_outputDirectory` convention.
-- Artifact names follow the OneBranch auto-generated pattern: `drop_<stageName>_<jobName>` (e.g., `drop_build_dependent_build_package_SqlClient`).
-- Downstream stages use `DownloadPipelineArtifact@2` to pull required packages into a local directory.
-- A local NuGet source is configured at build time pointing to the downloaded artifacts directory so `dotnet restore` resolves internal dependencies.
-
----
-
-## 10. Trigger Configuration
-
-### Official Pipeline (`dotnet-sqlclient-official-pipeline.yml`)
-
-```yaml
-trigger:
-  branches:
-    include:
-      - internal/main
-  paths:
-    include:
-      - .azuredevops
-      - .config
-      - doc
-      - eng/pipelines
-      - src
-      - tools
-      - azurepipelines-coverage.yml
-      - build.proj
-      - NuGet.config
-
-schedules:
-  - cron: '30 4 * * Mon'           # Weekly Sunday 9:30 PM (UTC-7)
-    branches: { include: [internal/main] }
-    always: true
-  - cron: '30 3 * * Mon-Fri'       # Weekday 8:30 PM (UTC-7)
-    branches: { include: [internal/main] }
-```
-
-- **CI trigger**: Runs on pushes to `internal/main` when relevant paths change
-- **Scheduled**: Weekly full build (Sundays) + weekday builds (Mon–Fri)
-- **No PR trigger**: Official pipeline should not run on PRs (separate PR pipelines exist)
-
-### Non-Official Pipeline (`dotnet-sqlclient-non-official-pipeline.yml`)
-
-```yaml
-trigger: none
-pr: none
-```
-
-- **Manual only**: Queued on-demand for validation/test builds
-
----
-
-## 11. Infrastructure
-
-| Concern | Implementation |
-|---------|---------------|
-| **Pipeline template** | OneBranch governed templates (`OneBranch.Pipelines/GovernedTemplates`) |
-| **Build agents** | OneBranch-managed Windows containers (`WindowsHostVersion: 1ESWindows2022`) |
-| **.NET SDK** | Pinned via `global.json` (with `useGlobalJson: true` in install steps) |
-| **Code signing** | ESRP v2 with federated identity (Azure Key Vault backed) |
-| **Symbol publishing** | Optional, controlled by `publishSymbols` parameter; uses `Symbols publishing` variable group (aliases `SymbolServer`/`SymbolTokenUri` defined in `common-variables.yml`) |
-
----
-
-## 12. Key Design Decisions
-
-1. **Single pipeline, multiple stages** — avoids managing 6 separate pipelines while keeping clear separation of concerns.
-2. **Official + Non-Official variants** — hardcoded OneBranch templates (no parameterized `oneBranchType`) for PRC compliance; Non-Official variant allows manual validation builds.
-3. **Parallel jobs within stages** — minimizes total wall-clock time; only waits where dependencies demand it.
-4. **Pipeline artifacts over Universal Packages** — faster, ephemeral, scoped to the run; appropriate for build-time dependency resolution.
-5. **ESRP-based code signing** — all DLLs and NuGet packages are signed in-pipeline using ESRP with federated identity; no secrets in YAML.
-6. **Centralized version management** — all 6 package versions (GA + preview) defined once in `libraries/common-variables.yml`; `isPreview` toggle selects the active set.
-7. **Dependency-aware stage ordering** — ensures packages are always built after their dependencies, guaranteeing consistent, reproducible builds.
-8. **Validation in parallel with Stage 3** — MDS package validation runs alongside AKV Provider build (both depend on Stage 2), reducing total pipeline duration.
-9. **Selective on-demand release** — 6 boolean parameters control which packages are published; the release stage is entirely skipped when none are selected, keeping normal CI builds unaffected.
-10. **ADO Environment approval gate** — two environments: `NuGet-Production` (official, with configured approvals) and `NuGet-DryRun` (non-official, validation only). Both use `ob_release_environment` for OneBranch integration.
-11. **Compile-time conditional publish jobs** — `${{ if eq(parameters.releaseXxx, true) }}` template expansion ensures unselected publish jobs are excluded entirely from the pipeline run (not just skipped at runtime).
-12. **Mandatory dry-run for non-official** — the non-official variant hardcodes `dryRun: true` (no parameter), preventing accidental publication. The official variant defaults `releaseDryRun: true` for safety but allows override for actual releases.
-13. **Selective build parameters** — `buildSqlClient`, `buildSqlServerServer`, and `buildAKVProvider` allow building subsets of packages, with dependency-aware conditionals ensuring Logging builds when either SqlClient or AKV is needed.
+## Package Dependency Order
+
+Respect this graph when modifying build stages:
+
+1. `Microsoft.SqlServer.Server` — no dependencies
+2. `Microsoft.Data.SqlClient.Internal.Logging` — no dependencies
+3. `Microsoft.Data.SqlClient.Extensions.Abstractions` — depends on Logging
+4. `Microsoft.Data.SqlClient` — depends on Logging + Abstractions
+5. `Microsoft.Data.SqlClient.Extensions.Azure` — depends on Abstractions + Logging
+6. `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` — depends on SqlClient + Abstractions + Logging
+
+## Build Stages
+
+Defined in `stages/build-stages.yml`. Four build stages plus validation, ordered by dependency:
+
+- **`build_independent`** (Stage 1) — Logging and SqlServer.Server in parallel; no inter-package dependencies
+- **`build_abstractions`** (Stage 2) — Abstractions; `dependsOn: build_independent`; downloads Logging artifact
+- **`build_dependent`** (Stage 3) — SqlClient and Extensions.Azure in parallel; `dependsOn: build_abstractions`; downloads Abstractions + Logging artifacts
+- **`build_addons`** (Stage 4) — AKV Provider; `dependsOn: build_dependent`; downloads SqlClient + Abstractions + Logging artifacts
+- **`mds_package_validation`** — Validates signed SqlClient package; `dependsOn: build_dependent`; runs in parallel with Stage 4
+
+Stage conditional rules:
+- Wrap stages/jobs in `${{ if }}` compile-time conditionals based on build parameters
+- `buildSqlClient` controls Stages 2, 3, validation, and Logging (when AKV is disabled)
+- `buildAKVProvider AND buildSqlClient` controls Stage 4
+- `buildSqlServerServer` controls SqlServer.Server job in Stage 1
+- Logging builds when `buildAKVProvider OR buildSqlClient` is true
+
+## Job Templates
+
+- **`build-signed-csproj-package-job.yml`** — Generic job for csproj-based packages (Logging, SqlServer.Server, Abstractions, Azure, AKV Provider). Flow: Build DLLs → ESRP DLL signing → NuGet pack (`NoBuild=true`) → ESRP NuGet signing
+- **`build-signed-sqlclient-package-job.yml`** — SqlClient-specific job (nuspec-based). Flow: Build all configurations → ESRP DLL signing (main + resource DLLs) → NuGet pack via nuspec → ESRP NuGet signing
+- **`validate-signed-package-job.yml`** — Validates signed MDS package (signature, strong names, folder structure, target frameworks)
+- **`publish-nuget-package-job.yml`** — Reusable release job using OneBranch `templateContext.type: releaseJob` with `inputs` for artifact download; pushes via `NuGetCommand@2`
+
+When adding a new csproj-based package:
+- Use `build-signed-csproj-package-job.yml` with appropriate `packageName`, `packageFullName`, `versionProperties`, and `downloadArtifacts`
+- Add build and pack targets to `build.proj`
+- Add version variables to `variables/common-variables.yml`
+- Add artifact name variable to `variables/onebranch-variables.yml`
+
+## Release Stage
+
+- Defined in `stages/release-stages.yml`; produces stage `release_production` (official) or `release_test` (non-official) via `stageNameSuffix` parameter
+- Entire stage excluded at compile time when no release parameters are true
+- `dependsOn` is conditional based on which release parameters are set
+- `releaseToProduction` parameter controls NuGet target feed:
+  - `true` → service connection `ADO Nuget Org Connection` (NuGet Production)
+  - `false` → service connection `ADO Nuget Org Test Connection` (NuGet Test)
+- Non-official pipeline always sets `releaseToProduction: false`
+- Environment gating:
+  - Official: `ob_release_environment: Production`, `ob_deploymentjob_environment: NuGet-Production`
+  - Non-official: `ob_release_environment: Test`, `ob_deploymentjob_environment: NuGet-DryRun`
+- Each publish job uses OneBranch deployment job syntax (`templateContext.type: releaseJob` with `inputs` for artifact download)
+
+## Parameters
+
+Build parameters (all boolean, default `true`):
+- `debug` — enable debug output (default `false`)
+- `isPreview` — use preview version numbers (default `false`)
+- `publishSymbols` — publish symbols to servers (default `false`)
+- `buildSqlServerServer` — build SqlServer.Server package
+- `buildSqlClient` — build SqlClient, Extensions.Azure, Abstractions, and Logging
+- `buildAKVProvider` — build AKV Provider (requires `buildSqlClient`)
+
+Release parameters (all boolean, default `false`):
+- `releaseSqlServerServer`, `releaseLogging`, `releaseAbstractions`, `releaseSqlClient`, `releaseAzure`, `releaseAKVProvider`
+
+Official-only parameter:
+- `releaseToProduction` — push to NuGet Production feed (default `false`)
+
+When `isPreview` is true, pipeline resolves `effective*Version` variables to preview versions; otherwise GA versions. All versions defined in `variables/common-variables.yml`.
+
+## Variables and Versions
+
+- Variable chain: pipeline YAML → `variables/onebranch-variables.yml` → `variables/common-variables.yml`
+- All package versions (GA, preview, assembly file) centralized in `variables/common-variables.yml`
+- `effective*Version` pipeline variables map to selected version set based on `isPreview`
+- Artifact name variables defined in `variables/onebranch-variables.yml` following `drop_<stageName>_<jobName>` pattern
+- `assemblyBuildNumber` derived from first segment of `Build.BuildNumber` only (16-bit limit)
+- When adding a new package, add GA version, preview version, and assembly file version entries
+
+Variable groups:
+- `Release Variables` — release configuration (in `common-variables.yml`)
+- `Symbols publishing` — symbol publishing credentials (in `common-variables.yml`)
+- `ESRP Federated Creds (AME)` — ESRP signing credentials (in `common-variables.yml`)
+
+## Code Signing (ESRP)
+
+- Uses ESRP v6 tasks (`EsrpMalwareScanning@6`, `EsrpCodeSigning@6`) with MSI/federated identity authentication
+- Signing only runs when `isOfficial: true` — non-official pipelines skip ESRP steps
+- csproj-based packages: sign DLLs first → pack with `NoBuild=true` → sign NuGet package (ensures NuGet contains signed DLLs)
+- SqlClient: sign DLLs (including resource DLLs) → nuspec pack → sign NuGet package
+- DLL signing uses keyCode `CP-230012` (Authenticode); NuGet signing uses keyCode `CP-401405`
+- All ESRP credentials come from variable groups — never hardcode secrets in YAML
+
+## SDL and Compliance
+
+- TSA: enabled only in official pipeline; disabled in non-official to avoid spurious alerts
+- ApiScan: enabled in both; currently `break: false` pending package registration
+- Each build job sets `ob_sdl_apiscan_*` variables pointing to `$(Build.SourcesDirectory)/apiScan/<PackageName>/`
+- CodeQL, SBOM, Policheck (`break: true`): enabled in both pipelines
+- asyncSdl `enabled: false` in both; individual sub-tools (CredScan, BinSkim, Armory, Roslyn) configured underneath
+- Policheck exclusions: `$(REPO_ROOT)\.config\PolicheckExclusions.xml`
+- CredScan suppressions: `$(REPO_ROOT)/.config/CredScanSuppressions.json`
+
+## Artifact Conventions
+
+- `ob_outputDirectory` set to `$(PACK_OUTPUT)` (= `$(REPO_ROOT)/output`) — OneBranch auto-publishes this directory
+- Artifact names follow `drop_<stageName>_<jobName>` — defined in `variables/onebranch-variables.yml`
+- Downstream jobs download artifacts via `DownloadPipelineArtifact@2` into `$(Build.SourcesDirectory)/packages`
+- Downloaded packages serve as a local NuGet source for `dotnet restore`
+- If stage or job names change, update artifact name variables in `onebranch-variables.yml`
+
+## Common Pitfalls
+
+- Do not use `PublishPipelineArtifacts` task — OneBranch auto-publishes from `ob_outputDirectory`
+- Do not add `NuGetToolInstaller@1` in OneBranch containers — NuGet is pre-installed
+- Variable templates are under `variables/` not `libraries/`
+- Always test parameter changes in the non-official pipeline first
+- When modifying stage names, update all `dependsOn` references and artifact name variables
+- Release jobs must use `templateContext.type: releaseJob` with `inputs` for artifact download — deployment jobs do not auto-download artifacts
diff --git a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
index 01d9b61da1..e257386918 100644
--- a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
@@ -70,6 +70,11 @@ parameters:
   - name: publishSymbols
     type: boolean
 
+  # True to enable ESRP malware scanning and code signing steps, which should not be
+  # run on non-official pipelines as they access production resources.
+  - name: isOfficial
+    type: boolean
+
   # Values required by ESRP tasks.
   - name: esrpConnectedServiceName
     type: string
@@ -144,18 +149,19 @@ jobs:
           buildConfiguration: ${{ parameters.buildConfiguration }}
           versionProperties: ${{ parameters.versionProperties }}
 
-      # ESRP sign the DLLs.
-      - template: /eng/pipelines/onebranch/steps/compound-esrp-dll-signing-step.yml@self
-        parameters:
-          appRegistrationClientId: ${{ parameters.appRegistrationClientId }}
-          appRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
-          authAkvName: ${{ parameters.authAkvName }}
-          authSignCertName: ${{ parameters.authSignCertName }}
-          esrpClientId: ${{ parameters.esrpClientId }}
-          esrpConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
-          pattern: ${{ parameters.packageFullName }}.dll
-
-      # Copy signed DLLs and PDBs to APIScan folders.
+      - ${{ if eq(parameters.isOfficial, true) }}:
+          # ESRP sign the DLLs.
+          - template: /eng/pipelines/onebranch/steps/compound-esrp-dll-signing-step.yml@self
+            parameters:
+              appRegistrationClientId: ${{ parameters.appRegistrationClientId }}
+              appRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
+              authAkvName: ${{ parameters.authAkvName }}
+              authSignCertName: ${{ parameters.authSignCertName }}
+              esrpClientId: ${{ parameters.esrpClientId }}
+              esrpConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
+              pattern: ${{ parameters.packageFullName }}.dll
+
+      # Copy signed/unsigned DLLs and PDBs to APIScan folders.
       - task: CopyFiles@2
         displayName: Copy DLLs for APIScan
         inputs:
@@ -182,16 +188,17 @@ jobs:
           buildConfiguration: ${{ parameters.buildConfiguration }}
           versionProperties: ${{ parameters.versionProperties }}
 
-      # ESRP sign the NuGet package.
-      - template: /eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml@self
-        parameters:
-          appRegistrationClientId: ${{ parameters.appRegistrationClientId }}
-          appRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
-          authAkvName: ${{ parameters.authAkvName }}
-          authSignCertName: ${{ parameters.authSignCertName }}
-          esrpClientId: ${{ parameters.esrpClientId }}
-          esrpConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
-          pattern: '${{ parameters.packageFullName }}.*nupkg'
+      - ${{ if eq(parameters.isOfficial, true) }}:
+          # ESRP sign the NuGet package.
+          - template: /eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml@self
+            parameters:
+              appRegistrationClientId: ${{ parameters.appRegistrationClientId }}
+              appRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
+              authAkvName: ${{ parameters.authAkvName }}
+              authSignCertName: ${{ parameters.authSignCertName }}
+              esrpClientId: ${{ parameters.esrpClientId }}
+              esrpConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
+              pattern: ${{ parameters.packageFullName }}.*nupkg
 
       # Publish symbols to servers
       - ${{ if eq(parameters.publishSymbols, true) }}:
diff --git a/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
index 98f5c811aa..f3033b07f0 100644
--- a/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
@@ -16,123 +16,130 @@ parameters:
   - name: isPreview
     type: boolean
 
+  # True to enable ESRP malware scanning and code signing steps, which should not
+  # be run on non-official pipelines as they access production resources.
+  - name: isOfficial
+    type: boolean
+
 jobs:
-- job: build_package_SqlClient
-  displayName: 'Build Microsoft.Data.SqlClient'
-  pool:
-    type: windows  # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
-
-  variables:
-    ob_outputDirectory: $(PACK_OUTPUT)
-    # APIScan configuration for this Extension package
-    ob_sdl_apiscan_enabled: true
-    ob_sdl_apiscan_softwareFolder: $(Build.SourcesDirectory)/apiScan/SqlClient/dlls
-    ob_sdl_apiscan_symbolsFolder: $(Build.SourcesDirectory)/apiScan/SqlClient/pdbs
-    ob_sdl_apiscan_softwarename: Microsoft.Data.SqlClient
-    ob_sdl_apiscan_versionNumber: $(assemblyBuildNumber)
-
-    ${{ if parameters.isPreview }}:
-      abstractionsPackageVersion: $(abstractionsPackagePreviewVersion)
-      loggingPackageVersion: $(loggingPackagePreviewVersion)
-      mdsPackageVersion: $(mdsPackagePreviewVersion)
-
-  steps:
-  - script: SET
-    displayName: 'Print Environment Variables'
-
-  # Download the Abstractions and Logging packages from the previous stage into
-  # packages/ so that they're available via the local NuGet feed when restoring MDS.
-  # MDS depends on both Extensions.Abstractions and Internal.Logging.
-  - task: DownloadPipelineArtifact@2
-    displayName: Download Abstractions Package
-    inputs:
-      artifactName: $(abstractionsArtifactsName)
-      targetPath: $(Build.SourcesDirectory)/packages
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download Logging Package
-    inputs:
-      artifactName: $(loggingArtifactsName)
-      targetPath: $(Build.SourcesDirectory)/packages
-
-  # Install the .NET SDK.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
-
-  # Build our tooling, which is required by the analysis step below, but
-  # shouldn't be analyzed itself.
-  - task: MSBuild@1
-    displayName: 'Build Tooling'
-    inputs:
-      solution: '**/build.proj'
-      configuration: Release
-      msbuildArguments: -t:BuildTools
-
-  # Perform analysis before building, since this step will clobber build output.
-  - template: /eng/pipelines/onebranch/steps/code-analyze-step.yml@self
-
-  # Build MDS, producing signed DLLs.
-  - template: /eng/pipelines/onebranch/steps/build-all-configurations-signed-dlls-step.yml@self
-    parameters:
-      # These variables are sourced from common-variables.yml.
-      abstractionsAssemblyFileVersion: $(abstractionsAssemblyFileVersion)
-      abstractionsPackageVersion: $(abstractionsPackageVersion)
-      loggingAssemblyFileVersion: $(loggingAssemblyFileVersion)
-      loggingPackageVersion: $(loggingPackageVersion)
-      mdsAssemblyFileVersion: $(mdsAssemblyFileVersion)
-      mdsPackageVersion: $(mdsPackageVersion)
-
-  - template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
-    parameters:
-      artifactType: dll
-      sourceRoot: $(BUILD_OUTPUT)
-      dllPattern: 'Microsoft.Data.SqlClient.dll'
-
-  - template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
-    parameters:
-      artifactType: dll
-      sourceRoot: $(BUILD_OUTPUT)
-      dllPattern: 'Microsoft.Data.SqlClient.resources.dll'
-
-  - template: /eng/pipelines/common/templates/steps/generate-nuget-package-step.yml@self
-    parameters:
-      buildConfiguration: Release
-      displayName: 'Create MDS NuGet Package'
-      generateSymbolsPackage: true
-      installNuget: false
-      nuspecPath: $(nuspecPath)
-      outputDirectory: $(PACK_OUTPUT)
-      packageVersion: $(mdsPackageVersion)
-      properties: 'AbstractionsPackageVersion=$(abstractionsPackageVersion);LoggingPackageVersion=$(loggingPackageVersion)'
-      referenceType: Package
-
-  - template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
-    parameters:
-      artifactType: pkg
-      nupkgPattern: 'Microsoft.Data.SqlClient.$(mdsPackageVersion).*nupkg'
-
-  # Copy signed DLLs and PDBs to APIScan folders.
-  - task: CopyFiles@2
-    displayName: Copy DLLs for APIScan
-    inputs:
-      SourceFolder: $(BUILD_OUTPUT)/Package/bin
-      Contents: '**/Microsoft.Data.SqlClient.dll'
-      TargetFolder: $(ob_sdl_apiscan_softwareFolder)
-      # We must preserve the folder structure since our C# projects may produce multiple
-      # identically named DLLs for different target frameworks (e.g. netstandard2.0, net5.0,
-      # etc.), and we need to keep those separate for APIScan to work correctly.
-      flattenFolders: false
-
-  - task: CopyFiles@2
-    displayName: Copy PDBs for APIScan
-    inputs:
-      SourceFolder: $(BUILD_OUTPUT)/Package/bin
-      Contents: '**/Microsoft.Data.SqlClient.pdb'
-      TargetFolder: $(ob_sdl_apiscan_symbolsFolder)
-      flattenFolders: false
-
-  # Publish symbols to servers
-  - ${{ if eq(parameters.publishSymbols, true) }}:
-    - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
-      parameters:
-        packageFullName: Microsoft.Data.SqlClient
-        packageVersion: $(mdsPackageVersion)
+  - job: build_package_SqlClient
+    displayName: "Build Microsoft.Data.SqlClient"
+    pool:
+      type: windows # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
+
+    variables:
+      ob_outputDirectory: $(PACK_OUTPUT)
+      # APIScan configuration for this Extension package
+      ob_sdl_apiscan_enabled: true
+      ob_sdl_apiscan_softwareFolder: $(Build.SourcesDirectory)/apiScan/SqlClient/dlls
+      ob_sdl_apiscan_symbolsFolder: $(Build.SourcesDirectory)/apiScan/SqlClient/pdbs
+      ob_sdl_apiscan_softwarename: Microsoft.Data.SqlClient
+      ob_sdl_apiscan_versionNumber: $(assemblyBuildNumber)
+
+      ${{ if parameters.isPreview }}:
+        abstractionsPackageVersion: $(abstractionsPackagePreviewVersion)
+        loggingPackageVersion: $(loggingPackagePreviewVersion)
+        mdsPackageVersion: $(mdsPackagePreviewVersion)
+
+    steps:
+      - script: SET
+        displayName: "Print Environment Variables"
+
+      # Download the Abstractions and Logging packages from the previous stage into
+      # packages/ so that they're available via the local NuGet feed when restoring MDS.
+      # MDS depends on both Extensions.Abstractions and Internal.Logging.
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Abstractions Package
+        inputs:
+          artifactName: $(abstractionsArtifactsName)
+          targetPath: $(Build.SourcesDirectory)/packages
+
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Logging Package
+        inputs:
+          artifactName: $(loggingArtifactsName)
+          targetPath: $(Build.SourcesDirectory)/packages
+
+      # Install the .NET SDK.
+      - template: /eng/pipelines/steps/install-dotnet.yml@self
+
+      # Build our tooling, which is required by the analysis step below, but
+      # shouldn't be analyzed itself.
+      - task: MSBuild@1
+        displayName: "Build Tooling"
+        inputs:
+          solution: "**/build.proj"
+          configuration: Release
+          msbuildArguments: -t:BuildTools
+
+      # Perform analysis before building, since this step will clobber build output.
+      - template: /eng/pipelines/onebranch/steps/code-analyze-step.yml@self
+
+      # Build MDS, producing signed DLLs.
+      - template: /eng/pipelines/onebranch/steps/build-all-configurations-signed-dlls-step.yml@self
+        parameters:
+          # These variables are sourced from common-variables.yml.
+          abstractionsAssemblyFileVersion: $(abstractionsAssemblyFileVersion)
+          abstractionsPackageVersion: $(abstractionsPackageVersion)
+          loggingAssemblyFileVersion: $(loggingAssemblyFileVersion)
+          loggingPackageVersion: $(loggingPackageVersion)
+          mdsAssemblyFileVersion: $(mdsAssemblyFileVersion)
+          mdsPackageVersion: $(mdsPackageVersion)
+
+      - ${{ if eq(parameters.isOfficial, true) }}:
+          - template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
+            parameters:
+              artifactType: dll
+              sourceRoot: $(BUILD_OUTPUT)
+              dllPattern: "Microsoft.Data.SqlClient.dll"
+
+          - template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
+            parameters:
+              artifactType: dll
+              sourceRoot: $(BUILD_OUTPUT)
+              dllPattern: "Microsoft.Data.SqlClient.resources.dll"
+
+      - template: /eng/pipelines/common/templates/steps/generate-nuget-package-step.yml@self
+        parameters:
+          buildConfiguration: Release
+          displayName: "Create MDS NuGet Package"
+          generateSymbolsPackage: true
+          installNuget: false
+          nuspecPath: $(nuspecPath)
+          outputDirectory: $(PACK_OUTPUT)
+          packageVersion: $(mdsPackageVersion)
+          properties: "AbstractionsPackageVersion=$(abstractionsPackageVersion);LoggingPackageVersion=$(loggingPackageVersion)"
+          referenceType: Package
+
+      - ${{ if eq(parameters.isOfficial, true) }}:
+          - template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
+            parameters:
+              artifactType: pkg
+              nupkgPattern: "Microsoft.Data.SqlClient.$(mdsPackageVersion).*nupkg"
+
+      # Copy signed DLLs and PDBs to APIScan folders.
+      - task: CopyFiles@2
+        displayName: Copy DLLs for APIScan
+        inputs:
+          SourceFolder: $(BUILD_OUTPUT)/Package/bin
+          Contents: "**/Microsoft.Data.SqlClient.dll"
+          TargetFolder: $(ob_sdl_apiscan_softwareFolder)
+          # We must preserve the folder structure since our C# projects may produce multiple
+          # identically named DLLs for different target frameworks (e.g. netstandard2.0, net5.0,
+          # etc.), and we need to keep those separate for APIScan to work correctly.
+          flattenFolders: false
+
+      - task: CopyFiles@2
+        displayName: Copy PDBs for APIScan
+        inputs:
+          SourceFolder: $(BUILD_OUTPUT)/Package/bin
+          Contents: "**/Microsoft.Data.SqlClient.pdb"
+          TargetFolder: $(ob_sdl_apiscan_symbolsFolder)
+          flattenFolders: false
+
+      # Publish symbols to servers
+      - ${{ if eq(parameters.publishSymbols, true) }}:
+          - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
+            parameters:
+              packageFullName: Microsoft.Data.SqlClient
+              packageVersion: $(mdsPackageVersion)
diff --git a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
index 656ea8f181..3b463d0b81 100644
--- a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
@@ -4,7 +4,6 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 parameters:
-
   # The name of the pipeline artifacts to download prior to building the tests.
   - name: artifactName
     type: string
@@ -13,269 +12,277 @@ parameters:
   - name: isPreview
     type: boolean
 
+  # True if this build is an official build. This will be used to gate some checks 
+  # that only apply to official builds, such as signature verification.
+  - name: isOfficial
+    type: boolean
+
 jobs:
-- job: validate_signed_package
-  displayName: 'Verify signed package'
-
-  pool:
-    type: windows  # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
-    isCustom: true
-    name: ADO-1ES-Pool
-    vmImage: 'ADO-MMS22-SQL19'
-
-  variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
-  - template: /eng/pipelines/onebranch/variables/sqlclient-validation-variables.yml@self
-
-  - name: pathToDownloadedNuget # path to the downloaded nuget files
-    value: $(Pipeline.Workspace)\${{parameters.artifactName }}
-
-  - ${{ if parameters.isPreview }}:
-    - name: extractedNugetPath
-      value: $(extractedNugetRootPath).$(mdsPackagePreviewVersion)
-    - name: mdsPackageVersion
-      value: $(mdsPackagePreviewVersion)
-
-  steps:
-  - script: SET
-    displayName: 'Print Environment Variables'
-
-  - task: NuGetToolInstaller@1
-    displayName: 'Use NuGet'
-
-  - powershell: |
-      # Displays the paths of all the local cache directories
-      nuget locals all -List
-
-      #Clears all files from all local cache directories
-      nuget locals all -Clear
-    displayName: 'Clear local cache'
-
-  - download: current
-    artifact: ${{parameters.artifactName}}
-    patterns: '**/*.*nupkg'
-    displayName: 'Download NuGet Package'
-
-  - powershell: |
-      # Install nuget package
-      Install-Package -Name "Microsoft.Data.SqlClient" -Destination "$(TempFolderName)" -Force -Source $(pathToDownloadedNuget) -SkipDependencies
-
-      Write-Host "--------------------------------------------------"
-      Write-Host '$(TempFolderName)'
-      ls $(TempFolderName)
-      Write-Host "--------------------------------------------------"
-    displayName: 'Extract Nuget in temp folder'
-
-  - powershell: |
-      Write-Host "--------------------------------------------------"
-      Write-Host "This will verify the artifact signature" -ForegroundColor Green
-      Write-Host "--------------------------------------------------"
-
-      nuget verify -All $(pathToDownloadedNuget)\*.nupkg
-      nuget verify -All $(pathToDownloadedNuget)\*.snupkg
-    displayName: 'Verify nuget signature'
-
-  - powershell: |
-      # Recursively find all .dll files in TempFolder (installed nuget folder)
-      # Microsoft.Data.SqlClient.dll and Microsoft.Data.SqlClient.resources.dll (in localized folders) should have strong name
-      $dllFiles = Get-ChildItem -Path $(TempFolderName) -Recurse -Filter *.dll
-      $badDlls = @()
-      foreach ($file in $dllFiles)
-      {
-        # Run sn.exe to verify the strong name on each dll
-        $result = & "C:\Program Files (x86)\Microsoft SDKs\Windows\*\bin\NETFX 4.8.1 Tools\sn.exe" -vf $file.FullName
-        Write-OutPut $result
-
-        # if the dll is not valid, it would be delay signed or test-signed which is not meant for production
-        if($result[$result.Length-1] -notlike "* is valid")
-        {
-          $badDlls += $result[$result.Length-1]
-        }
-      }
-      if($badDlls.Count -gt 0)
-      {
-        Write-OutPut "Error: Invalid dlls are detected. Check the list below:"
-        foreach($dll in $badDlls)
-        {
-          Write-Output $dll
-        }
-        Exit -1
-      }
-      Write-Host "Strong name has been verified for all dlls"
-    displayName: 'Verify assembly strong names'
-
-  - powershell: |
-      # Checks the expected folder names such as lib, ref, runtimes
-      Get-ChildItem -Path $(extractedNugetPath) -Directory  | select Name | foreach {
-          if('$(expectedFolderNames)'.contains($_.Name)){
-              Write-Host expected folder name verfied: $_.Name
-          }
-      }
-    displayName: 'Check expected folder names'
-
-  - powershell: |
-      # Checks the version of DotNetFramework and DotNet
-      $countErr = 0
-      $countPass = 0
-      $excludNamesFromRuntimeFolder = 'lib','win','unix'
-
-      Get-ChildItem -Path $(extractedNugetPath) -Directory | foreach {
-        $parentname=$_.Name
-        Write-Host $_.FullName -ForegroundColor yellow
-
-        if($_.Name -ne 'runtimes') {
-          Get-ChildItem -Path $_.FullName -Directory | select Name | foreach {
-            if('$(expectedDotnetVersions)'.Contains($_.Name)){
-              Write-Host "`tExpected version verified in $parentname": $_.Name -ForegroundColor green
-              $countPass += 1
+  - job: validate_nuget_package
+    displayName: "Validate NuGet package"
+
+    pool:
+      type: windows # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
+      isCustom: true
+      name: ADO-1ES-Pool
+      vmImage: "ADO-MMS22-SQL19"
+
+    variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
+      - template: /eng/pipelines/onebranch/variables/sqlclient-validation-variables.yml@self
+
+      - name: pathToDownloadedNuget # path to the downloaded nuget files
+        value: $(Pipeline.Workspace)\${{parameters.artifactName }}
+
+      - ${{ if parameters.isPreview }}:
+          - name: extractedNugetPath
+            value: $(extractedNugetRootPath).$(mdsPackagePreviewVersion)
+          - name: mdsPackageVersion
+            value: $(mdsPackagePreviewVersion)
+
+    steps:
+      - script: SET
+        displayName: "Print Environment Variables"
+
+      - task: NuGetToolInstaller@1
+        displayName: "Use NuGet"
+
+      - powershell: |
+          # Displays the paths of all the local cache directories
+          nuget locals all -List
+
+          #Clears all files from all local cache directories
+          nuget locals all -Clear
+        displayName: "Clear local cache"
+
+      - download: current
+        artifact: ${{parameters.artifactName}}
+        patterns: "**/*.*nupkg"
+        displayName: "Download NuGet Package"
+
+      - powershell: |
+          # Install nuget package
+          Install-Package -Name "Microsoft.Data.SqlClient" -Destination "$(TempFolderName)" -Force -Source $(pathToDownloadedNuget) -SkipDependencies
+
+          Write-Host "--------------------------------------------------"
+          Write-Host '$(TempFolderName)'
+          ls $(TempFolderName)
+          Write-Host "--------------------------------------------------"
+        displayName: "Extract Nuget in temp folder"
+
+      - ${{ if eq(parameters.isOfficial, true) }}:
+          - powershell: |
+              Write-Host "--------------------------------------------------"
+              Write-Host "This will verify the artifact signature" -ForegroundColor Green
+              Write-Host "--------------------------------------------------"
+
+              nuget verify -All $(pathToDownloadedNuget)\*.nupkg
+              nuget verify -All $(pathToDownloadedNuget)\*.snupkg
+            displayName: "Verify nuget signature"
+
+      - powershell: |
+          # Recursively find all .dll files in TempFolder (installed nuget folder)
+          # Microsoft.Data.SqlClient.dll and Microsoft.Data.SqlClient.resources.dll (in localized folders) should have strong name
+          $dllFiles = Get-ChildItem -Path $(TempFolderName) -Recurse -Filter *.dll
+          $badDlls = @()
+          foreach ($file in $dllFiles)
+          {
+            # Run sn.exe to verify the strong name on each dll
+            $result = & "C:\Program Files (x86)\Microsoft SDKs\Windows\*\bin\NETFX 4.8.1 Tools\sn.exe" -vf $file.FullName
+            Write-OutPut $result
+
+            # if the dll is not valid, it would be delay signed or test-signed which is not meant for production
+            if($result[$result.Length-1] -notlike "* is valid")
+            {
+              $badDlls += $result[$result.Length-1]
             }
-            else{
-              Write-Host "`tUnexpected version detected in $parentname": $_.Name
-              $countErr += 1
+          }
+          if($badDlls.Count -gt 0)
+          {
+            Write-OutPut "Error: Invalid dlls are detected. Check the list below:"
+            foreach($dll in $badDlls)
+            {
+              Write-Output $dll
             }
+            Exit -1
+          }
+          Write-Host "Strong name has been verified for all dlls"
+        displayName: "Verify assembly strong names"
+
+      - powershell: |
+          # Checks the expected folder names such as lib, ref, runtimes
+          Get-ChildItem -Path $(extractedNugetPath) -Directory  | select Name | foreach {
+              if('$(expectedFolderNames)'.contains($_.Name)){
+                  Write-Host expected folder name verfied: $_.Name
+              }
           }
-        }
+        displayName: "Check expected folder names"
+
+      - powershell: |
+          # Checks the version of DotNetFramework and DotNet
+          $countErr = 0
+          $countPass = 0
+          $excludNamesFromRuntimeFolder = 'lib','win','unix'
+
+          Get-ChildItem -Path $(extractedNugetPath) -Directory | foreach {
+            $parentname=$_.Name
+            Write-Host $_.FullName -ForegroundColor yellow
+
+            if($_.Name -ne 'runtimes') {
+              Get-ChildItem -Path $_.FullName -Directory | select Name | foreach {
+                if('$(expectedDotnetVersions)'.Contains($_.Name)){
+                  Write-Host "`tExpected version verified in $parentname": $_.Name -ForegroundColor green
+                  $countPass += 1
+                }
+                else{
+                  Write-Host "`tUnexpected version detected in $parentname": $_.Name
+                  $countErr += 1
+                }
+              }
+            }
 
-        elseif ($_.Name -eq 'runtimes'){
-          Get-ChildItem -Depth 3 -Path $_.FullName -Exclude $excludNamesFromRuntimeFolder -Directory | foreach{
-            if('$(expectedDotnetVersions)'.Contains($_.Name)){
-              Write-Host "`tExpected version verfied in $parentname": $_.Name
-              $countPass += 1
+            elseif ($_.Name -eq 'runtimes'){
+              Get-ChildItem -Depth 3 -Path $_.FullName -Exclude $excludNamesFromRuntimeFolder -Directory | foreach{
+                if('$(expectedDotnetVersions)'.Contains($_.Name)){
+                  Write-Host "`tExpected version verfied in $parentname": $_.Name
+                  $countPass += 1
+                }
+                else{
+                  Write-Host "`tUnexpected version detected": $_.Name -ForegroundColor Red
+                  $countErr += 1
+                }
+              }
             }
             else{
-              Write-Host "`tUnexpected version detected": $_.Name -ForegroundColor Red
-              $countErr += 1
+              Write-Host "`tUnknown folder " $_.Name -ForegroundColor Red
+              Exit -1
             }
           }
-        }
-        else{
-          Write-Host "`tUnknown folder " $_.Name -ForegroundColor Red
-          Exit -1
-        }
-      }
-
-      Write-Host "_______________"
-      Write-Host "Expected: $countPass"
-      Write-Host "Unexpected: $countErr"
-      Write-Host "_______________"
-      if ($countErr -ne 0)
-      {
-        Write-Host "Unexpected versions are detected!" -ForegroundColor Red
-        Exit -1
-      }
-    displayName: 'Check Expected framework'
-
-  - powershell: |
-      # list all the child items of created temp folder
-
-      #Verify all DLLs unzipped match "expected" hierarchy
-
-      foreach( $folderName in (Get-ChildItem -Path $(extractedNugetPath) -Directory).Name)
-      {
-        # List all Childerns of the Path
-        Get-ChildItem -Path $(extractedNugetPath)\$folderName -Recurse -File
-        $subFiles = Get-ChildItem -Path $(extractedNugetPath)\$folderName -Recurse -File
-
-        foreach($file in $subFiles)
-        {
-          if($subFiles[0].Name -like "*.dll" )
+
+          Write-Host "_______________"
+          Write-Host "Expected: $countPass"
+          Write-Host "Unexpected: $countErr"
+          Write-Host "_______________"
+          if ($countErr -ne 0)
           {
-            Write-Host $subFiles[0].Name  -ForegroundColor Green
-            Write-Host $subFiles[1].Name  -ForegroundColor Green
-            if(($folderName -eq 'lib') -or ($folderName -eq 'ref'))
+            Write-Host "Unexpected versions are detected!" -ForegroundColor Red
+            Exit -1
+          }
+        displayName: "Check Expected framework"
+
+      - powershell: |
+          # list all the child items of created temp folder
+
+          #Verify all DLLs unzipped match "expected" hierarchy
+
+          foreach( $folderName in (Get-ChildItem -Path $(extractedNugetPath) -Directory).Name)
+          {
+            # List all Childerns of the Path
+            Get-ChildItem -Path $(extractedNugetPath)\$folderName -Recurse -File
+            $subFiles = Get-ChildItem -Path $(extractedNugetPath)\$folderName -Recurse -File
+
+            foreach($file in $subFiles)
             {
-              if($subFiles[2].Name -like "*.dll")
+              if($subFiles[0].Name -like "*.dll" )
               {
-                Write-Host $subFiles[2].Name  -ForegroundColor Green
+                Write-Host $subFiles[0].Name  -ForegroundColor Green
+                Write-Host $subFiles[1].Name  -ForegroundColor Green
+                if(($folderName -eq 'lib') -or ($folderName -eq 'ref'))
+                {
+                  if($subFiles[2].Name -like "*.dll")
+                  {
+                    Write-Host $subFiles[2].Name  -ForegroundColor Green
+                  }
+                  else
+                  {
+                    $subFiles[2].Name
+                    Write-Host "Expected file pattern for localization did not match to *.dll" -ForegroundColor Red
+                    Exit -1
+                  }
+                }
               }
               else
               {
-                $subFiles[2].Name
-                Write-Host "Expected file pattern for localization did not match to *.dll" -ForegroundColor Red
+                $subFiles[0].Name
+                $subFiles[1].Name
+                Write-Host "Expected file pattern did not match to *.dll" -ForegroundColor Red
                 Exit -1
               }
             }
           }
-          else
-          {
-            $subFiles[0].Name
-            $subFiles[1].Name
-            Write-Host "Expected file pattern did not match to *.dll" -ForegroundColor Red
-            Exit -1
-          }
-        }
-      }
-    displayName: 'Verify all DLLs unzipped match "expected" hierarchy'
-  - powershell: |
-      # Verify all dlls status are Valid
-
-      $dlls = Get-ChildItem -Path $(extractedNugetPath) -Recurse -Include *.dll
-      foreach ($status in $dlls | Get-AuthenticodeSignature)
-      {
-          if ($status.Status -eq "Valid")
+        displayName: 'Verify all DLLs unzipped match "expected" hierarchy'
+      
+      - ${{ if eq(parameters.isOfficial, true) }}:
+          - powershell: |
+              # Verify all dlls status are Valid
+
+              $dlls = Get-ChildItem -Path $(extractedNugetPath) -Recurse -Include *.dll
+              foreach ($status in $dlls | Get-AuthenticodeSignature)
+              {
+                  if ($status.Status -eq "Valid")
+                  {
+                      Write-Host $status.Status $status.Path
+                  }
+                  else
+                  {
+                      Write-Host "dll status of '$status.Path' is not valid!" -ForegroundColor Red
+                      $status
+                      Exit -1
+                  }
+              }
+            displayName: "Verify all dlls status are Valid"
+
+      - powershell: |
+          # This will check each DLL's ProductVersion and FileVersion against
+          # expected values.
+          $failed = 0
+
+          foreach ( $pVersion in Get-ChildItem *.dll -Path $(extractedNugetPath)  -Recurse | ForEach-Object versioninfo )
           {
-              Write-Host $status.Status $status.Path
+              if ($pVersion.ProductVersion -Like '$(mdsPackageVersion)*')
+              {
+                  Write-Host -ForegroundColor Green "Correct ProductVersion detected for $($pVersion.FileName): $($pVersion.ProductVersion)"
+              }
+              else
+              {
+                    Write-Host -ForegroundColor Red "Wrong ProductVersion detected for $($pVersion.FileName); expected: $(mdsPackageVersion); found: $($pVersion.ProductVersion)"
+                    $failed = 1
+              }
+
+              if ($pVersion.FileVersion -eq '$(mdsAssemblyFileVersion)')
+              {
+                  Write-Host -ForegroundColor Green "Correct FileVersion detected for $($pVersion.FileName): $($pVersion.FileVersion)"
+              }
+              else
+              {
+                  Write-Host -ForegroundColor Red "Wrong FileVersion detected for $($pVersion.FileName); expected $(mdsAssemblyFileVersion); found: $($pVersion.FileVersion)"
+                  $failed = 1
+              }
           }
-          else
+
+          if ($failed -ne 0)
           {
-              Write-Host "dll status of '$status.Path' is not valid!" -ForegroundColor Red
-              $status
               Exit -1
           }
-      }
-    displayName: 'Verify all dlls status are Valid'
 
-  - powershell: |
-      # This will check each DLL's ProductVersion and FileVersion against
-      # expected values.
-      $failed = 0
+          Get-ChildItem *.dll -Path $(extractedNugetPath)  -Recurse | ForEach-Object VersionInfo | Format-List
+        displayName: 'Verify "File Version" matches expected values for DLLs'
 
-      foreach ( $pVersion in Get-ChildItem *.dll -Path $(extractedNugetPath)  -Recurse | ForEach-Object versioninfo )
-      {
-          if ($pVersion.ProductVersion -Like '$(mdsPackageVersion)*')
-          {
-              Write-Host -ForegroundColor Green "Correct ProductVersion detected for $($pVersion.FileName): $($pVersion.ProductVersion)"
-          }
-          else
-          {
-                Write-Host -ForegroundColor Red "Wrong ProductVersion detected for $($pVersion.FileName); expected: $(mdsPackageVersion); found: $($pVersion.ProductVersion)"
-                $failed = 1
-          }
+      - powershell: |
+          # Check assembly versions.
+          #
+          # GOTCHA: This expects the Versions.props file having XML elements in a
+          # certain order.  If the order changes, this check will fail!
+          #
+          # TODO: This also isn't checking the versions of the actual assemblies in
+          # the package, so it isn't terribly useful.
 
-          if ($pVersion.FileVersion -eq '$(mdsAssemblyFileVersion)')
-          {
-              Write-Host -ForegroundColor Green "Correct FileVersion detected for $($pVersion.FileName): $($pVersion.FileVersion)"
-          }
-          else
+          [Xml] $versionprops = Get-Content -Path "tools/props/Versions.props"
+          $AssemblyFileVersion =  $versionprops.Project.PropertyGroup[2].AssemblyFileVersion
+          $AssemblyVersion = $versionprops.Project.PropertyGroup[2].AssemblyVersion
+
+          if($AssemblyFileVersion -eq $AssemblyVersion)
           {
-              Write-Host -ForegroundColor Red "Wrong FileVersion detected for $($pVersion.FileName); expected $(mdsAssemblyFileVersion); found: $($pVersion.FileVersion)"
-              $failed = 1
+              Write-Host AssemblyFileVersion: $AssemblyFileVersion should not be equal to: $AssemblyVersion
+              Exit -1
           }
-      }
-
-      if ($failed -ne 0)
-      {
-          Exit -1
-      }
-
-      Get-ChildItem *.dll -Path $(extractedNugetPath)  -Recurse | ForEach-Object VersionInfo | Format-List
-    displayName: 'Verify "File Version" matches expected values for DLLs'
-
-  - powershell: |
-      # Check assembly versions.
-      #
-      # GOTCHA: This expects the Versions.props file having XML elements in a
-      # certain order.  If the order changes, this check will fail!
-      #
-      # TODO: This also isn't checking the versions of the actual assemblies in
-      # the package, so it isn't terribly useful.
-
-      [Xml] $versionprops = Get-Content -Path "tools/props/Versions.props"
-      $AssemblyFileVersion =  $versionprops.Project.PropertyGroup[2].AssemblyFileVersion
-      $AssemblyVersion = $versionprops.Project.PropertyGroup[2].AssemblyVersion
-
-      if($AssemblyFileVersion -eq $AssemblyVersion)
-      {
-          Write-Host AssemblyFileVersion: $AssemblyFileVersion should not be equal to: $AssemblyVersion
-          Exit -1
-      }
-    displayName: 'Check "AssemblyFileVersion" is not same as "AssemblyVersion" in version.props'
+        displayName: 'Check "AssemblyFileVersion" is not same as "AssemblyVersion" in version.props'
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index 2274d8cccf..25dbe98097 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -94,31 +94,31 @@ variables:
 
   # Define the effective versions for all of the packages we build and release.
   - ${{ if parameters.isPreview }}:
-    - name: effectiveSqlServerVersion
-      value: $(sqlServerPackagePreviewVersion)
-    - name: effectiveLoggingVersion
-      value: $(loggingPackagePreviewVersion)
-    - name: effectiveAbstractionsVersion
-      value: $(abstractionsPackagePreviewVersion)
-    - name: effectiveSqlClientVersion
-      value: $(mdsPackagePreviewVersion)
-    - name: effectiveAzureVersion
-      value: $(azurePackagePreviewVersion)
-    - name: effectiveAkvProviderVersion
-      value: $(akvPackagePreviewVersion)
+      - name: effectiveSqlServerVersion
+        value: $(sqlServerPackagePreviewVersion)
+      - name: effectiveLoggingVersion
+        value: $(loggingPackagePreviewVersion)
+      - name: effectiveAbstractionsVersion
+        value: $(abstractionsPackagePreviewVersion)
+      - name: effectiveSqlClientVersion
+        value: $(mdsPackagePreviewVersion)
+      - name: effectiveAzureVersion
+        value: $(azurePackagePreviewVersion)
+      - name: effectiveAkvProviderVersion
+        value: $(akvPackagePreviewVersion)
   - ${{ else }}:
-    - name: effectiveSqlServerVersion
-      value: $(sqlServerPackageVersion)
-    - name: effectiveLoggingVersion
-      value: $(loggingPackageVersion)
-    - name: effectiveAbstractionsVersion
-      value: $(abstractionsPackageVersion)
-    - name: effectiveSqlClientVersion
-      value: $(mdsPackageVersion)
-    - name: effectiveAzureVersion
-      value: $(azurePackageVersion)
-    - name: effectiveAkvProviderVersion
-      value: $(akvPackageVersion)
+      - name: effectiveSqlServerVersion
+        value: $(sqlServerPackageVersion)
+      - name: effectiveLoggingVersion
+        value: $(loggingPackageVersion)
+      - name: effectiveAbstractionsVersion
+        value: $(abstractionsPackageVersion)
+      - name: effectiveSqlClientVersion
+        value: $(mdsPackageVersion)
+      - name: effectiveAzureVersion
+        value: $(azurePackageVersion)
+      - name: effectiveAkvProviderVersion
+        value: $(akvPackageVersion)
 
 resources:
   repositories:
@@ -132,8 +132,8 @@ extends:
   template: /v2/OneBranch.NonOfficial.CrossPlat.yml@templates
   parameters:
     release:
-       # This indicates the pipeline category to deploy Box products.  See:
-       # https://eng.ms/docs/products/onebranch/release/yamlreleasepipelines/deployboxproducts
+      # This indicates the pipeline category to deploy Box products.  See:
+      # https://eng.ms/docs/products/onebranch/release/yamlreleasepipelines/deployboxproducts
       category: NonAzure
     featureFlags:
       EnableCDPxPAT: false
@@ -183,6 +183,7 @@ extends:
         parameters:
           debug: ${{ parameters.debug }}
           isPreview: ${{ parameters.isPreview }}
+          isOfficial: false # This is a non-official pipeline.
           publishSymbols: ${{ parameters.publishSymbols }}
           buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
           buildSqlClient: ${{ parameters.buildSqlClient }}
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index c9548b25d6..1754918116 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -115,31 +115,31 @@ variables:
 
   # Define the effective versions for all of the packages we build and release.
   - ${{ if parameters.isPreview }}:
-    - name: effectiveSqlServerVersion
-      value: $(sqlServerPackagePreviewVersion)
-    - name: effectiveLoggingVersion
-      value: $(loggingPackagePreviewVersion)
-    - name: effectiveAbstractionsVersion
-      value: $(abstractionsPackagePreviewVersion)
-    - name: effectiveSqlClientVersion
-      value: $(mdsPackagePreviewVersion)
-    - name: effectiveAzureVersion
-      value: $(azurePackagePreviewVersion)
-    - name: effectiveAkvProviderVersion
-      value: $(akvPackagePreviewVersion)
+      - name: effectiveSqlServerVersion
+        value: $(sqlServerPackagePreviewVersion)
+      - name: effectiveLoggingVersion
+        value: $(loggingPackagePreviewVersion)
+      - name: effectiveAbstractionsVersion
+        value: $(abstractionsPackagePreviewVersion)
+      - name: effectiveSqlClientVersion
+        value: $(mdsPackagePreviewVersion)
+      - name: effectiveAzureVersion
+        value: $(azurePackagePreviewVersion)
+      - name: effectiveAkvProviderVersion
+        value: $(akvPackagePreviewVersion)
   - ${{ else }}:
-    - name: effectiveSqlServerVersion
-      value: $(sqlServerPackageVersion)
-    - name: effectiveLoggingVersion
-      value: $(loggingPackageVersion)
-    - name: effectiveAbstractionsVersion
-      value: $(abstractionsPackageVersion)
-    - name: effectiveSqlClientVersion
-      value: $(mdsPackageVersion)
-    - name: effectiveAzureVersion
-      value: $(azurePackageVersion)
-    - name: effectiveAkvProviderVersion
-      value: $(akvPackageVersion)
+      - name: effectiveSqlServerVersion
+        value: $(sqlServerPackageVersion)
+      - name: effectiveLoggingVersion
+        value: $(loggingPackageVersion)
+      - name: effectiveAbstractionsVersion
+        value: $(abstractionsPackageVersion)
+      - name: effectiveSqlClientVersion
+        value: $(mdsPackageVersion)
+      - name: effectiveAzureVersion
+        value: $(azurePackageVersion)
+      - name: effectiveAkvProviderVersion
+        value: $(akvPackageVersion)
 
 resources:
   repositories:
@@ -153,8 +153,8 @@ extends:
   template: /v2/OneBranch.Official.CrossPlat.yml@templates
   parameters:
     release:
-       # This indicates the pipeline category to deploy Box products.  See:
-       # https://eng.ms/docs/products/onebranch/release/yamlreleasepipelines/deployboxproducts
+      # This indicates the pipeline category to deploy Box products.  See:
+      # https://eng.ms/docs/products/onebranch/release/yamlreleasepipelines/deployboxproducts
       category: NonAzure
     featureFlags:
       EnableCDPxPAT: false
@@ -208,6 +208,7 @@ extends:
         parameters:
           debug: ${{ parameters.debug }}
           isPreview: ${{ parameters.isPreview }}
+          isOfficial: true # This is an official pipeline.
           publishSymbols: ${{ parameters.publishSymbols }}
           buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
           buildSqlClient: ${{ parameters.buildSqlClient }}
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index 0b6962f1af..fad5c9a699 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -35,6 +35,11 @@ parameters:
   - name: isPreview
     type: boolean
 
+  # True if this is an official build, which runs additional ESRP malware scanning
+  # and codesigning steps.
+  - name: isOfficial
+    type: boolean
+
   # True to publish symbols to public and private servers.
   - name: publishSymbols
     type: boolean
@@ -60,40 +65,42 @@ stages:
 
     jobs:
       - ${{ if or(eq(parameters.buildAKVProvider, true), eq(parameters.buildSqlClient, true)) }}:
-        - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
-          parameters:
-            packageName: Logging
-            packageFullName: Microsoft.Data.SqlClient.Internal.Logging
-            packageVersion: $(effectiveLoggingVersion)
-            versionProperties: >-
-              -p:LoggingPackageVersion=$(effectiveLoggingVersion)
-              -p:LoggingAssemblyFileVersion=$(loggingAssemblyFileVersion)
-            assemblyFileVersion: $(loggingAssemblyFileVersion)
-            publishSymbols: ${{ parameters.publishSymbols }}
-            esrpConnectedServiceName: $(ESRPConnectedServiceName)
-            esrpClientId: $(ESRPClientId)
-            appRegistrationClientId: $(AppRegistrationClientId)
-            appRegistrationTenantId: $(AppRegistrationTenantId)
-            authAkvName: $(AuthAKVName)
-            authSignCertName: $(AuthSignCertName)
+          - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+            parameters:
+              packageName: Logging
+              packageFullName: Microsoft.Data.SqlClient.Internal.Logging
+              packageVersion: $(effectiveLoggingVersion)
+              versionProperties: >-
+                -p:LoggingPackageVersion=$(effectiveLoggingVersion)
+                -p:LoggingAssemblyFileVersion=$(loggingAssemblyFileVersion)
+              assemblyFileVersion: $(loggingAssemblyFileVersion)
+              publishSymbols: ${{ parameters.publishSymbols }}
+              isOfficial: ${{ parameters.isOfficial }}
+              esrpConnectedServiceName: $(ESRPConnectedServiceName)
+              esrpClientId: $(ESRPClientId)
+              appRegistrationClientId: $(AppRegistrationClientId)
+              appRegistrationTenantId: $(AppRegistrationTenantId)
+              authAkvName: $(AuthAKVName)
+              authSignCertName: $(AuthSignCertName)
 
       - ${{ if eq(parameters.buildSqlServerServer, true) }}:
-        - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
-          parameters:
-            packageName: SqlServer
-            packageFullName: Microsoft.SqlServer.Server
-            packageVersion: $(effectiveSqlServerVersion)
-            versionProperties: >-
-              -p:SqlServerAssemblyFileVersion=$(sqlServerAssemblyFileVersion)
-              -p:SqlServerPackageVersion=$(effectiveSqlServerVersion)
-            assemblyFileVersion: $(sqlServerAssemblyFileVersion)
-            publishSymbols: ${{ parameters.publishSymbols }}
-            esrpConnectedServiceName: $(ESRPConnectedServiceName)
-            esrpClientId: $(ESRPClientId)
-            appRegistrationClientId: $(AppRegistrationClientId)
-            appRegistrationTenantId: $(AppRegistrationTenantId)
-            authAkvName: $(AuthAKVName)
-            authSignCertName: $(AuthSignCertName)
+          - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+            parameters:
+              packageName: SqlServer
+              packageFullName: Microsoft.SqlServer.Server
+              packageVersion: $(effectiveSqlServerVersion)
+              versionProperties: >-
+                -p:SqlServerAssemblyFileVersion=$(sqlServerAssemblyFileVersion)
+                -p:SqlServerPackageVersion=$(effectiveSqlServerVersion)
+              assemblyFileVersion: $(sqlServerAssemblyFileVersion)
+              publishSymbols: ${{ parameters.publishSymbols }}
+              isOfficial: ${{ parameters.isOfficial }}
+              esrpConnectedServiceName: $(ESRPConnectedServiceName)
+              esrpClientId: $(ESRPClientId)
+              appRegistrationClientId: $(AppRegistrationClientId)
+              appRegistrationTenantId: $(AppRegistrationTenantId)
+              authAkvName: $(AuthAKVName)
+              authSignCertName: $(AuthSignCertName)
 
   # ====================================================================
   # Stage 2: Abstractions package (depends on Logging from Stage 1)
@@ -101,31 +108,32 @@ stages:
   # dependency on Internal.Logging.
   # ====================================================================
   - ${{ if eq(parameters.buildSqlClient, true) }}:
-    - stage: build_abstractions
-      displayName: "Build Abstractions Package"
-      dependsOn: build_independent
-
-      jobs:
-        - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
-          parameters:
-            packageName: Abstractions
-            packageFullName: Microsoft.Data.SqlClient.Extensions.Abstractions
-            packageVersion: $(effectiveAbstractionsVersion)
-            versionProperties: >-
-              -p:AbstractionsPackageVersion=$(effectiveAbstractionsVersion)
-              -p:AbstractionsAssemblyFileVersion=$(abstractionsAssemblyFileVersion)
-              -p:LoggingPackageVersion=$(effectiveLoggingVersion)
-            assemblyFileVersion: $(abstractionsAssemblyFileVersion)
-            publishSymbols: ${{ parameters.publishSymbols }}
-            esrpConnectedServiceName: $(ESRPConnectedServiceName)
-            esrpClientId: $(ESRPClientId)
-            appRegistrationClientId: $(AppRegistrationClientId)
-            appRegistrationTenantId: $(AppRegistrationTenantId)
-            authAkvName: $(AuthAKVName)
-            authSignCertName: $(AuthSignCertName)
-            downloadArtifacts:
-              - artifactName: $(loggingArtifactsName)
-                displayName: Logging Package
+      - stage: build_abstractions
+        displayName: "Build Abstractions Package"
+        dependsOn: build_independent
+
+        jobs:
+          - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+            parameters:
+              packageName: Abstractions
+              packageFullName: Microsoft.Data.SqlClient.Extensions.Abstractions
+              packageVersion: $(effectiveAbstractionsVersion)
+              versionProperties: >-
+                -p:AbstractionsPackageVersion=$(effectiveAbstractionsVersion)
+                -p:AbstractionsAssemblyFileVersion=$(abstractionsAssemblyFileVersion)
+                -p:LoggingPackageVersion=$(effectiveLoggingVersion)
+              assemblyFileVersion: $(abstractionsAssemblyFileVersion)
+              publishSymbols: ${{ parameters.publishSymbols }}
+              isOfficial: ${{ parameters.isOfficial }}
+              esrpConnectedServiceName: $(ESRPConnectedServiceName)
+              esrpClientId: $(ESRPClientId)
+              appRegistrationClientId: $(AppRegistrationClientId)
+              appRegistrationTenantId: $(AppRegistrationTenantId)
+              authAkvName: $(AuthAKVName)
+              authSignCertName: $(AuthSignCertName)
+              downloadArtifacts:
+                - artifactName: $(loggingArtifactsName)
+                  displayName: Logging Package
 
   # ====================================================================
   # Stage 3: Core packages (depend on Abstractions)
@@ -133,88 +141,92 @@ stages:
   # Stage name kept as 'build_dependent' for validate job compatibility.
   # ====================================================================
   - ${{ if eq(parameters.buildSqlClient, true) }}:
-    - stage: build_dependent
-      displayName: "Build Core Packages"
-      dependsOn: build_abstractions
-
-      jobs:
-        - template: /eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml@self
-          parameters:
-            publishSymbols: ${{ parameters.publishSymbols }}
-            isPreview: ${{ parameters.isPreview }}
-            # TODO: This job should use the effective versions for Abstractions, Logging,
-            # SqlServer, and SqlClient.
-
-        - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
-          parameters:
-            packageName: Azure
-            packageFullName: Microsoft.Data.SqlClient.Extensions.Azure
-            packageVersion: $(effectiveAzureVersion)
-            versionProperties: >-
-              -p:AzurePackageVersion=$(effectiveAzureVersion)
-              -p:AzureAssemblyFileVersion=$(azureAssemblyFileVersion)
-              -p:AbstractionsPackageVersion=$(effectiveAbstractionsVersion)
-              -p:LoggingPackageVersion=$(effectiveLoggingVersion)
-            assemblyFileVersion: $(azureAssemblyFileVersion)
-            publishSymbols: ${{ parameters.publishSymbols }}
-            esrpConnectedServiceName: $(ESRPConnectedServiceName)
-            esrpClientId: $(ESRPClientId)
-            appRegistrationClientId: $(AppRegistrationClientId)
-            appRegistrationTenantId: $(AppRegistrationTenantId)
-            authAkvName: $(AuthAKVName)
-            authSignCertName: $(AuthSignCertName)
-            downloadArtifacts:
-              - artifactName: $(abstractionsArtifactsName)
-                displayName: Abstractions Package
-              - artifactName: $(loggingArtifactsName)
-                displayName: Logging Package
+      - stage: build_dependent
+        displayName: "Build Core Packages"
+        dependsOn: build_abstractions
+
+        jobs:
+          - template: /eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml@self
+            parameters:
+              publishSymbols: ${{ parameters.publishSymbols }}
+              isPreview: ${{ parameters.isPreview }}
+              isOfficial: ${{ parameters.isOfficial }}
+              # TODO: This job should use the effective versions for Abstractions, Logging,
+              # SqlServer, and SqlClient.
+
+          - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+            parameters:
+              packageName: Azure
+              packageFullName: Microsoft.Data.SqlClient.Extensions.Azure
+              packageVersion: $(effectiveAzureVersion)
+              versionProperties: >-
+                -p:AzurePackageVersion=$(effectiveAzureVersion)
+                -p:AzureAssemblyFileVersion=$(azureAssemblyFileVersion)
+                -p:AbstractionsPackageVersion=$(effectiveAbstractionsVersion)
+                -p:LoggingPackageVersion=$(effectiveLoggingVersion)
+              assemblyFileVersion: $(azureAssemblyFileVersion)
+              publishSymbols: ${{ parameters.publishSymbols }}
+              isOfficial: ${{ parameters.isOfficial }}
+              esrpConnectedServiceName: $(ESRPConnectedServiceName)
+              esrpClientId: $(ESRPClientId)
+              appRegistrationClientId: $(AppRegistrationClientId)
+              appRegistrationTenantId: $(AppRegistrationTenantId)
+              authAkvName: $(AuthAKVName)
+              authSignCertName: $(AuthSignCertName)
+              downloadArtifacts:
+                - artifactName: $(abstractionsArtifactsName)
+                  displayName: Abstractions Package
+                - artifactName: $(loggingArtifactsName)
+                  displayName: Logging Package
 
   # ====================================================================
   # Stage 4: Add-on packages (depend on core packages)
   # AKV Provider builds after MDS completes.
   # ====================================================================
   - ${{ if and(eq(parameters.buildAKVProvider, true), eq(parameters.buildSqlClient, true)) }}:
-    - stage: build_addons
-      displayName: "Build Add-on Packages"
-      dependsOn: build_dependent
-
-      jobs:
-        - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
-          parameters:
-            packageName: AkvProvider
-            packageFullName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
-            packageVersion: $(effectiveAkvProviderVersion)
-            versionProperties: >-
-              -p:AkvPackageVersion=$(effectiveAkvProviderVersion)
-              -p:AkvAssemblyFileVersion=$(akvAssemblyFileVersion)
-              -p:MdsPackageVersion=$(effectiveSqlClientVersion)
-              -p:LoggingPackageVersion=$(effectiveLoggingVersion)
-              -p:AbstractionsPackageVersion=$(effectiveAbstractionsVersion)
-            assemblyFileVersion: $(akvAssemblyFileVersion)
-            publishSymbols: ${{ parameters.publishSymbols }}
-            esrpConnectedServiceName: $(ESRPConnectedServiceName)
-            esrpClientId: $(ESRPClientId)
-            appRegistrationClientId: $(AppRegistrationClientId)
-            appRegistrationTenantId: $(AppRegistrationTenantId)
-            authAkvName: $(AuthAKVName)
-            authSignCertName: $(AuthSignCertName)
-            downloadArtifacts:
-              - artifactName: $(sqlClientArtifactsName)
-                displayName: SqlClient Package
-              - artifactName: $(abstractionsArtifactsName)
-                displayName: Abstractions Package
-              - artifactName: $(loggingArtifactsName)
-                displayName: Logging Package
+      - stage: build_addons
+        displayName: "Build Add-on Packages"
+        dependsOn: build_dependent
+
+        jobs:
+          - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+            parameters:
+              packageName: AkvProvider
+              packageFullName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
+              packageVersion: $(effectiveAkvProviderVersion)
+              versionProperties: >-
+                -p:AkvPackageVersion=$(effectiveAkvProviderVersion)
+                -p:AkvAssemblyFileVersion=$(akvAssemblyFileVersion)
+                -p:MdsPackageVersion=$(effectiveSqlClientVersion)
+                -p:LoggingPackageVersion=$(effectiveLoggingVersion)
+                -p:AbstractionsPackageVersion=$(effectiveAbstractionsVersion)
+              assemblyFileVersion: $(akvAssemblyFileVersion)
+              publishSymbols: ${{ parameters.publishSymbols }}
+              isOfficial: ${{ parameters.isOfficial }}
+              esrpConnectedServiceName: $(ESRPConnectedServiceName)
+              esrpClientId: $(ESRPClientId)
+              appRegistrationClientId: $(AppRegistrationClientId)
+              appRegistrationTenantId: $(AppRegistrationTenantId)
+              authAkvName: $(AuthAKVName)
+              authSignCertName: $(AuthSignCertName)
+              downloadArtifacts:
+                - artifactName: $(sqlClientArtifactsName)
+                  displayName: SqlClient Package
+                - artifactName: $(abstractionsArtifactsName)
+                  displayName: Abstractions Package
+                - artifactName: $(loggingArtifactsName)
+                  displayName: Logging Package
 
   # ====================================================================
   # Validation
   # ====================================================================
   - ${{ if eq(parameters.buildSqlClient, true) }}:
-    - stage: mds_package_validation
-      displayName: "MDS Package Validation"
-      dependsOn: build_dependent
-      jobs:
-        - template: /eng/pipelines/onebranch/jobs/validate-signed-package-job.yml@self
-          parameters:
-            artifactName: $(sqlClientArtifactsName)
-            isPreview: ${{ parameters.isPreview }}
+      - stage: mds_package_validation
+        displayName: "MDS Package Validation"
+        dependsOn: build_dependent
+        jobs:
+          - template: /eng/pipelines/onebranch/jobs/validate-signed-package-job.yml@self
+            parameters:
+              artifactName: $(sqlClientArtifactsName)
+              isPreview: ${{ parameters.isPreview }}
+              isOfficial: ${{ parameters.isOfficial }}
diff --git a/eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml b/eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml
index e86964cf3d..824b3fab65 100644
--- a/eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml
+++ b/eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml
@@ -33,36 +33,36 @@ parameters:
   # Glob pattern to match NuGet packages for scanning and signing.
   - name: pattern
     type: string
-    default: '*.*nupkg'
+    default: "*.*nupkg"
 
 steps:
   # See: https://aka.ms/esrp.scantask
   - task: EsrpMalwareScanning@6
-    displayName: 'ESRP Nuget Malware Scanning'
+    displayName: "ESRP Nuget Malware Scanning"
     inputs:
-      AppRegistrationClientId: '${{ parameters.appRegistrationClientId }}'
-      AppRegistrationTenantId: '${{ parameters.appRegistrationTenantId }}'
+      AppRegistrationClientId: "${{ parameters.appRegistrationClientId }}"
+      AppRegistrationTenantId: "${{ parameters.appRegistrationTenantId }}"
       CleanupTempStorage: 1
-      ConnectedServiceName: '${{ parameters.esrpConnectedServiceName }}'
-      EsrpClientId: '${{ parameters.esrpClientId }}'
-      FolderPath: '$(PACK_OUTPUT)'
-      Pattern: '${{ parameters.pattern }}'
+      ConnectedServiceName: "${{ parameters.esrpConnectedServiceName }}"
+      EsrpClientId: "${{ parameters.esrpClientId }}"
+      FolderPath: "$(PACK_OUTPUT)"
+      Pattern: "${{ parameters.pattern }}"
       UseMSIAuthentication: true
       VerboseLogin: 1
 
   # See: https://aka.ms/esrp.signtask
   - task: EsrpCodeSigning@6
-    displayName: 'ESRP Signing NuGet Package'
+    displayName: "ESRP Signing NuGet Package"
     inputs:
-      AppRegistrationClientId: '${{ parameters.appRegistrationClientId }}'
-      AppRegistrationTenantId: '${{ parameters.appRegistrationTenantId }}'
-      ConnectedServiceName: '${{ parameters.esrpConnectedServiceName }}'
-      EsrpClientId: '${{ parameters.esrpClientId }}'
-      AuthAKVName: '${{ parameters.authAkvName }}'
-      AuthSignCertName: '${{ parameters.authSignCertName }}'
-      FolderPath: '$(PACK_OUTPUT)'
-      Pattern: '${{ parameters.pattern }}'
-      signConfigType: 'inlineSignParams'
+      AppRegistrationClientId: "${{ parameters.appRegistrationClientId }}"
+      AppRegistrationTenantId: "${{ parameters.appRegistrationTenantId }}"
+      ConnectedServiceName: "${{ parameters.esrpConnectedServiceName }}"
+      EsrpClientId: "${{ parameters.esrpClientId }}"
+      AuthAKVName: "${{ parameters.authAkvName }}"
+      AuthSignCertName: "${{ parameters.authSignCertName }}"
+      FolderPath: "$(PACK_OUTPUT)"
+      Pattern: "${{ parameters.pattern }}"
+      signConfigType: "inlineSignParams"
       UseMSIAuthentication: true
       inlineOperation: |
         [
diff --git a/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml b/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml
index 83053a8d29..09f7715145 100644
--- a/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml
+++ b/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml
@@ -3,11 +3,12 @@
 # The .NET Foundation licenses this file to you under the MIT license.          #
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
+
 parameters:
   - name: artifactType
     values:
-    - dll
-    - pkg
+      - dll
+      - pkg
 
   - name: sourceRoot
     type: string
@@ -15,11 +16,11 @@ parameters:
 
   - name: dllPattern
     type: string
-    default: 'Microsoft.Data.SqlClient*.dll'
+    default: "Microsoft.Data.SqlClient*.dll"
 
   - name: nupkgPattern
     type: string
-    default: '*.*nupkg'
+    default: "*.*nupkg"
 
   - name: artifactDirectory
     type: string
@@ -50,117 +51,118 @@ parameters:
     default: $(EsrpClientId)
 
 steps:
-- ${{ if eq(parameters.artifactType, 'dll') }}:
-  # See: https://aka.ms/esrp.scantask
-  - task: EsrpMalwareScanning@6
-    displayName: 'ESRP MalwareScanning'
-    inputs:
-      ConnectedServiceName: '${{parameters.ESRPConnectedServiceName }}'
-      AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
-      AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
-      EsrpClientId: '${{parameters.EsrpClientId }}'
-      UseMSIAuthentication: true
-      FolderPath: '${{parameters.sourceRoot }}'
-      Pattern: '${{ parameters.dllPattern }}'
-      CleanupTempStorage: 1
-      VerboseLogin: 1
+  # ESRP scan and sign the DLLs or NuGet packages, depending on the artifact type.
+  - ${{ if eq(parameters.artifactType, 'dll') }}:
+      # See: https://aka.ms/esrp.scantask
+      - task: EsrpMalwareScanning@6
+        displayName: "ESRP MalwareScanning"
+        inputs:
+          ConnectedServiceName: "${{parameters.ESRPConnectedServiceName }}"
+          AppRegistrationClientId: "${{parameters.appRegistrationClientId }}"
+          AppRegistrationTenantId: "${{parameters.appRegistrationTenantId }}"
+          EsrpClientId: "${{parameters.EsrpClientId }}"
+          UseMSIAuthentication: true
+          FolderPath: "${{parameters.sourceRoot }}"
+          Pattern: "${{ parameters.dllPattern }}"
+          CleanupTempStorage: 1
+          VerboseLogin: 1
 
-  # See: https://aka.ms/esrp.signtask
-  - task: EsrpCodeSigning@6
-    displayName: 'ESRP CodeSigning'
-    inputs:
-      ConnectedServiceName: '${{parameters.ESRPConnectedServiceName }}'
-      AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
-      AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
-      EsrpClientId: '${{parameters.EsrpClientId }}'
-      UseMSIAuthentication: true
-      AuthAKVName: '${{parameters.AuthAKVName }}'
-      AuthSignCertName: '${{parameters.AuthSignCertName }}'
-      FolderPath: '${{parameters.sourceRoot }}'
-      Pattern: '${{ parameters.dllPattern }}'
-      signConfigType: inlineSignParams
-      inlineOperation: |
-          [
-              {
-                  "keyCode": "CP-230012",
-                  "operationSetCode": "SigntoolSign",
-                  "parameters": [
-                  {
-                      "parameterName": "OpusName",
-                      "parameterValue": "Microsoft Data SqlClient Data Provider for SQL Server"
-                  },
-                  {
-                      "parameterName": "OpusInfo",
-                      "parameterValue": "http://www.microsoft.com"
-                  },
-                  {
-                      "parameterName": "FileDigest",
-                      "parameterValue": "/fd \"SHA256\""
-                  },
-                  {
-                      "parameterName": "PageHash",
-                      "parameterValue": "/NPH"
-                  },
-                  {
-                      "parameterName": "TimeStamp",
-                      "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                  }
-                  ],
-                  "toolName": "sign",
-                  "toolVersion": "1.0"
-              },
-              {
-                  "keyCode": "CP-230012",
-                  "operationSetCode": "SigntoolVerify",
-                  "parameters": [ ],
-                  "toolName": "sign",
-                  "toolVersion": "1.0"
-              }
-          ]
+      # See: https://aka.ms/esrp.signtask
+      - task: EsrpCodeSigning@6
+        displayName: "ESRP CodeSigning"
+        inputs:
+          ConnectedServiceName: "${{parameters.ESRPConnectedServiceName }}"
+          AppRegistrationClientId: "${{parameters.appRegistrationClientId }}"
+          AppRegistrationTenantId: "${{parameters.appRegistrationTenantId }}"
+          EsrpClientId: "${{parameters.EsrpClientId }}"
+          UseMSIAuthentication: true
+          AuthAKVName: "${{parameters.AuthAKVName }}"
+          AuthSignCertName: "${{parameters.AuthSignCertName }}"
+          FolderPath: "${{parameters.sourceRoot }}"
+          Pattern: "${{ parameters.dllPattern }}"
+          signConfigType: inlineSignParams
+          inlineOperation: |
+            [
+                {
+                    "keyCode": "CP-230012",
+                    "operationSetCode": "SigntoolSign",
+                    "parameters": [
+                    {
+                        "parameterName": "OpusName",
+                        "parameterValue": "Microsoft Data SqlClient Data Provider for SQL Server"
+                    },
+                    {
+                        "parameterName": "OpusInfo",
+                        "parameterValue": "http://www.microsoft.com"
+                    },
+                    {
+                        "parameterName": "FileDigest",
+                        "parameterValue": "/fd \"SHA256\""
+                    },
+                    {
+                        "parameterName": "PageHash",
+                        "parameterValue": "/NPH"
+                    },
+                    {
+                        "parameterName": "TimeStamp",
+                        "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                    }
+                    ],
+                    "toolName": "sign",
+                    "toolVersion": "1.0"
+                },
+                {
+                    "keyCode": "CP-230012",
+                    "operationSetCode": "SigntoolVerify",
+                    "parameters": [ ],
+                    "toolName": "sign",
+                    "toolVersion": "1.0"
+                }
+            ]
 
-- ${{ if eq(parameters.artifactType, 'pkg') }}:
-  # See: https://aka.ms/esrp.scantask
-  - task: EsrpMalwareScanning@6
-    displayName: 'ESRP MalwareScanning Nuget Package'
-    inputs:
-      ConnectedServiceName: '${{parameters.ESRPConnectedServiceName }}'
-      AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
-      AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
-      EsrpClientId: '${{parameters.EsrpClientId }}'
-      UseMSIAuthentication: true
-      FolderPath: '${{parameters.artifactDirectory }}'
-      Pattern: '${{ parameters.nupkgPattern }}'
-      CleanupTempStorage: 1
-      VerboseLogin: 1
+  - ${{ if eq(parameters.artifactType, 'pkg') }}:
+      # See: https://aka.ms/esrp.scantask
+      - task: EsrpMalwareScanning@6
+        displayName: "ESRP MalwareScanning Nuget Package"
+        inputs:
+          ConnectedServiceName: "${{parameters.ESRPConnectedServiceName }}"
+          AppRegistrationClientId: "${{parameters.appRegistrationClientId }}"
+          AppRegistrationTenantId: "${{parameters.appRegistrationTenantId }}"
+          EsrpClientId: "${{parameters.EsrpClientId }}"
+          UseMSIAuthentication: true
+          FolderPath: "${{parameters.artifactDirectory }}"
+          Pattern: "${{ parameters.nupkgPattern }}"
+          CleanupTempStorage: 1
+          VerboseLogin: 1
 
-  # See: https://aka.ms/esrp.signtask
-  - task: EsrpCodeSigning@6
-    displayName: 'ESRP CodeSigning Nuget Package'
-    inputs:
-      ConnectedServiceName: '${{parameters.ESRPConnectedServiceName }}'
-      AppRegistrationClientId: '${{parameters.appRegistrationClientId }}'
-      AppRegistrationTenantId: '${{parameters.appRegistrationTenantId }}'
-      EsrpClientId: '${{parameters.EsrpClientId }}'
-      UseMSIAuthentication: true
-      AuthAKVName: '${{parameters.AuthAKVName }}'
-      AuthSignCertName: '${{parameters.AuthSignCertName }}'
-      FolderPath: '${{parameters.artifactDirectory }}'
-      Pattern: '${{ parameters.nupkgPattern }}'
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-            {
-                "keyCode": "CP-401405",
-                "operationSetCode": "NuGetSign",
-                "parameters": [ ],
-                "toolName": "sign",
-                "toolVersion": "1.0"
-            },
-            {
-                "keyCode": "CP-401405",
-                "operationSetCode": "NuGetVerify",
-                "parameters": [ ],
-                "toolName": "sign",
-                "toolVersion": "1.0"
-            }
-        ]
+      # See: https://aka.ms/esrp.signtask
+      - task: EsrpCodeSigning@6
+        displayName: "ESRP CodeSigning Nuget Package"
+        inputs:
+          ConnectedServiceName: "${{parameters.ESRPConnectedServiceName }}"
+          AppRegistrationClientId: "${{parameters.appRegistrationClientId }}"
+          AppRegistrationTenantId: "${{parameters.appRegistrationTenantId }}"
+          EsrpClientId: "${{parameters.EsrpClientId }}"
+          UseMSIAuthentication: true
+          AuthAKVName: "${{parameters.AuthAKVName }}"
+          AuthSignCertName: "${{parameters.AuthSignCertName }}"
+          FolderPath: "${{parameters.artifactDirectory }}"
+          Pattern: "${{ parameters.nupkgPattern }}"
+          signConfigType: inlineSignParams
+          inlineOperation: |
+            [
+                {
+                    "keyCode": "CP-401405",
+                    "operationSetCode": "NuGetSign",
+                    "parameters": [ ],
+                    "toolName": "sign",
+                    "toolVersion": "1.0"
+                },
+                {
+                    "keyCode": "CP-401405",
+                    "operationSetCode": "NuGetVerify",
+                    "parameters": [ ],
+                    "toolName": "sign",
+                    "toolVersion": "1.0"
+                }
+            ]

From 59afd23a47b2a1da5598220df54b786a2bf4d019 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 25 Mar 2026 09:51:58 -0700
Subject: [PATCH 008/298] Test | Fix Transient Fault handling and other flaky
 unit tests (#4080)

* Test | Fix Transient Fault handling flaky tests

* Attempt to fix

* Fix the MultiPartIdentifier tests getting skipped

* Fix serialization issue of SqlTypeWorkaroundsTests

* Fix one more cases of possible error scenarios
---
 .../Data/Common/MultipartIdentifierTests.cs   |  8 ++++
 .../Data/SqlTypes/SqlTypeWorkaroundsTests.cs  |  6 +--
 .../ConnectionFailoverTests.cs                | 29 ++++++++----
 .../ConnectionRoutingTests.cs                 |  5 +-
 .../ConnectionRoutingTestsAzure.cs            |  5 +-
 .../SimulatedServerTests/ConnectionTests.cs   | 47 ++++++++++---------
 .../tools/TDS/TDS.Servers/GenericTdsServer.cs | 28 +++++++++--
 .../TDS.Servers/TransientTdsErrorTdsServer.cs |  2 +
 8 files changed, 85 insertions(+), 45 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Common/MultipartIdentifierTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Common/MultipartIdentifierTests.cs
index 72f07573a1..a826f70447 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Common/MultipartIdentifierTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Common/MultipartIdentifierTests.cs
@@ -26,6 +26,7 @@ public static TheoryData<string, string[]> ValidSinglePartIdentifierVariations
         {
             ReadOnlySpan<string> part1Words = ["word1", "word 1"];
             TheoryData<string, string[]> data = [];
+            HashSet<string> seen = [];
 
             // Combination 1: embedded and non-embedded whitespace.
             // Combination 2: leading and/or trailing whitespace, and no whitespace
@@ -36,6 +37,13 @@ public static TheoryData<string, string[]> ValidSinglePartIdentifierVariations
             {
                 foreach ((string p1Combination, string p1Expected) in GeneratePartCombinations(part1))
                 {
+                    // Skip duplicates — different generation paths can produce
+                    // identical (input, expected) pairs, which xUnit rejects.
+                    if (!seen.Add(p1Combination))
+                    {
+                        continue;
+                    }
+
                     string onePartCombination = p1Combination;
                     string[] onePartExpected = [p1Expected];
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlTypeWorkaroundsTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlTypeWorkaroundsTests.cs
index cf97f21a39..0697ea6376 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlTypeWorkaroundsTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlTypeWorkaroundsTests.cs
@@ -63,7 +63,7 @@ public void ByteArrayToSqlBinary_NullInput()
             };
         
         [Theory]
-        [MemberData(nameof(SqlDecimalWriteTdsValue_NonNullInput_Data))]
+        [MemberData(nameof(SqlDecimalWriteTdsValue_NonNullInput_Data), DisableDiscoveryEnumeration = true)]
         public void SqlDecimalWriteTdsValue_NonNullInput(SqlDecimal input)
         {
             // Arrange
@@ -155,7 +155,7 @@ public void ByteArrayToSqlGuid_ValidInput(byte[] input)
             };
         
         [Theory]
-        [MemberData(nameof(LongToSqlMoney_Data))]
+        [MemberData(nameof(LongToSqlMoney_Data), DisableDiscoveryEnumeration = true)]
         public void LongToSqlMoney(long input, SqlMoney expected)
         {
             // Act
@@ -176,7 +176,7 @@ public void LongToSqlMoney(long input, SqlMoney expected)
             };
         
         [Theory]
-        [MemberData(nameof(SqlMoneyToLong_NonNullInput_Data))]
+        [MemberData(nameof(SqlMoneyToLong_NonNullInput_Data), DisableDiscoveryEnumeration = true)]
         public void SqlMoneyToLong_NonNullInput(SqlMoney input, long expected)
         {
             // Act
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index d23fc9c532..7c8e67a09a 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -11,7 +11,6 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
-    [Trait("Category", "flaky")]
     [Collection("SimulatedServerTests")]
     public class ConnectionFailoverTests
     {
@@ -70,7 +69,7 @@ public void TransientFault_NoFailover_DoesNotClearPool(uint errorCode)
             Assert.Equal($"localhost,{initialServer.EndPoint.Port}", secondConnection.DataSource);
 
             // 1 for the initial connection, 2 for the second connection
-            Assert.Equal(3, initialServer.PreLoginCount);
+            Assert.Equal(3, initialServer.PreLoginCount - initialServer.AbandonedPreLoginCount);
             // A failover should not be triggered, so prelogin count to the failover server should be 0
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
@@ -219,6 +218,7 @@ public void NetworkDelay_ShouldConnectToPrimary()
                 InitialCatalog = "master", // Required for failover partner to work
                 ConnectTimeout = 5,
                 Encrypt = false,
+                Pooling = false, // Disable pooling to ensure a fresh connection attempt is made
                 MultiSubnetFailover = false,
 #if NETFRAMEWORK
                 TransparentNetworkIPResolution = false,
@@ -268,6 +268,7 @@ public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFa
                 ConnectRetryCount = 0, // Disable retry
                 FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}", // User provided failover partner
                 Encrypt = false,
+                Pooling = false, // Disable pooling to ensure a fresh connection attempt is made on failover
             };
             using SqlConnection connection = new(builder.ConnectionString);
 
@@ -313,6 +314,9 @@ public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFai
                 ConnectRetryInterval = 1,
                 FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}", // User provided failover partner
                 Encrypt = false,
+#if NETFRAMEWORK
+                TransparentNetworkIPResolution = false,
+#endif
             };
             using SqlConnection connection = new(builder.ConnectionString);
             // Act
@@ -324,7 +328,8 @@ public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFai
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", connection.DataSource);
             Assert.Equal(1, server.PreLoginCount);
-            Assert.Equal(1, failoverServer.PreLoginCount);
+            Assert.Equal(0, server.Login7Count);
+            Assert.Equal(1, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
         }
 
         [Theory]
@@ -357,7 +362,8 @@ public void TransientFault_ShouldConnectToPrimary(uint errorCode)
                 InitialCatalog = "master",
                 ConnectTimeout = 30,
                 ConnectRetryInterval = 1,
-                Encrypt = false
+                Encrypt = false,
+                Pooling = false, // Disable pooling to ensure a fresh connection attempt is made
             };
             using SqlConnection connection = new(builder.ConnectionString);
 
@@ -369,7 +375,7 @@ public void TransientFault_ShouldConnectToPrimary(uint errorCode)
             Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
 
             // Failures should prompt the client to return to the original server, resulting in a login count of 2
-            Assert.Equal(2, server.PreLoginCount);
+            Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
         [Theory]
@@ -454,7 +460,7 @@ public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint e
                 FailoverPartner = $"localhost:{failoverServer.EndPoint.Port}", // User provided failover partner
             };
             using SqlConnection connection = new(builder.ConnectionString);
-                
+
             // Act
             connection.Open();
 
@@ -463,7 +469,7 @@ public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint e
             Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
 
             // Failures should prompt the client to return to the original server, resulting in a login count of 2
-            Assert.Equal(2, server.PreLoginCount);
+            Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
         [Theory]
@@ -559,11 +565,14 @@ public void TransientFault_IgnoreServerProvidedFailoverPartner_ShouldConnectToUs
             // Close the connection to return it to the pool
             connection.Close();
 
-
             // Act
             // Dispose of the server to trigger a failover
             server.Dispose();
 
+            // Clear the pool to ensure the next connection attempt doesn't reuse
+            // the pooled connection to the now-disposed primary server.
+            SqlConnection.ClearAllPools();
+
             // Opening a new connection will use the failover partner stored in the pool group.
             // This will fail if the server provided failover partner was stored to the pool group.
             using SqlConnection failoverConnection = new(builder.ConnectionString);
@@ -573,9 +582,9 @@ public void TransientFault_IgnoreServerProvidedFailoverPartner_ShouldConnectToUs
             Assert.Equal(ConnectionState.Open, failoverConnection.State);
             Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", failoverConnection.DataSource);
             // 1 for the initial connection
-            Assert.Equal(1, server.PreLoginCount);
+            Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
             // 1 for the failover connection
-            Assert.Equal(1, failoverServer.PreLoginCount);
+            Assert.Equal(1, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
index 108118dda7..b763f2b55c 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
-    [Trait("Category", "flaky")]
     [Collection("SimulatedServerTests")]
     public class ConnectionRoutingTests
     {
@@ -58,8 +57,8 @@ public void TransientFaultAtRoutedLocation_ShouldReturnToGateway(uint errorCode)
             Assert.Equal($"localhost,{router.EndPoint.Port}", connection.DataSource);
 
             // Failures should prompt the client to return to the original server, resulting in a login count of 2
-            Assert.Equal(2, router.PreLoginCount);
-            Assert.Equal(2, server.PreLoginCount);
+            Assert.Equal(2, router.PreLoginCount - router.AbandonedPreLoginCount);
+            Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
         [Theory]
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
index dd945e37f3..84c3452826 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
-    [Trait("Category", "flaky")]
     [Collection("SimulatedServerTests")]
     public class ConnectionRoutingTestsAzure : IDisposable
     {
@@ -76,8 +75,8 @@ public void TransientFaultAtRoutedLocation_ShouldReturnToGateway(uint errorCode)
             Assert.Equal($"localhost,{router.EndPoint.Port}", connection.DataSource);
 
             // Failures should prompt the client to return to the original server, resulting in a login count of 2
-            Assert.Equal(2, router.PreLoginCount);
-            Assert.Equal(2, server.PreLoginCount);
+            Assert.Equal(2, router.PreLoginCount - router.AbandonedPreLoginCount);
+            Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
         [Theory]
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index a729e6afe2..21a6cb65de 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -29,7 +29,8 @@ public void ConnectionTest()
         {
             using TdsServer server = new(new TdsServerArguments() { });
             server.Start();
-            var connStr = new SqlConnectionStringBuilder() {
+            var connStr = new SqlConnectionStringBuilder()
+            {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 Encrypt = SqlConnectionEncryptOption.Optional,
             }.ConnectionString;
@@ -43,7 +44,8 @@ public void IntegratedAuthConnectionTest()
         {
             using TdsServer server = new(new TdsServerArguments() { });
             server.Start();
-            var connStr = new SqlConnectionStringBuilder() {
+            var connStr = new SqlConnectionStringBuilder()
+            {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 Encrypt = SqlConnectionEncryptOption.Optional,
             }.ConnectionString;
@@ -61,9 +63,10 @@ public void IntegratedAuthConnectionTest()
         [Fact]
         public async Task RequestEncryption_ServerDoesNotSupportEncryption_ShouldFail()
         {
-            using TdsServer server = new(new TdsServerArguments() {Encryption = TDSPreLoginTokenEncryptionType.None });
+            using TdsServer server = new(new TdsServerArguments() { Encryption = TDSPreLoginTokenEncryptionType.None });
             server.Start();
-            var connStr = new SqlConnectionStringBuilder() {
+            var connStr = new SqlConnectionStringBuilder()
+            {
                 DataSource = $"localhost,{server.EndPoint.Port}"
             }.ConnectionString;
 
@@ -72,7 +75,6 @@ public async Task RequestEncryption_ServerDoesNotSupportEncryption_ShouldFail()
             Assert.Contains("The instance of SQL Server you attempted to connect to does not support encryption.", ex.Message, StringComparison.OrdinalIgnoreCase);
         }
 
-        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -80,26 +82,28 @@ public async Task RequestEncryption_ServerDoesNotSupportEncryption_ShouldFail()
         public async Task TransientFault_RetryEnabled_ShouldSucceed_Async(uint errorCode)
         {
             using TransientTdsErrorTdsServer server = new(
-                new TransientTdsErrorTdsServerArguments() 
+                new TransientTdsErrorTdsServerArguments()
                 {
-                  IsEnabledTransientError = true,
-                  Number = errorCode,
+                    IsEnabledTransientError = true,
+                    Number = errorCode,
                 });
             server.Start();
             SqlConnectionStringBuilder builder = new()
             {
                 DataSource = "localhost," + server.EndPoint.Port,
-                Encrypt = SqlConnectionEncryptOption.Optional
+                Encrypt = SqlConnectionEncryptOption.Optional,
+#if NETFRAMEWORK
+                TransparentNetworkIPResolution = false
+#endif
             };
 
             using SqlConnection connection = new(builder.ConnectionString);
             await connection.OpenAsync();
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
-            Assert.Equal(2, server.PreLoginCount);
+            Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -123,10 +127,9 @@ public void TransientFault_RetryEnabled_ShouldSucceed(uint errorCode)
             connection.Open();
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
-            Assert.Equal(2, server.PreLoginCount);
+            Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -151,10 +154,9 @@ public async Task TransientFault_RetryDisabled_ShouldFail_Async(uint errorCode)
             SqlException e = await Assert.ThrowsAsync<SqlException>(async () => await connection.OpenAsync());
             Assert.Equal((int)errorCode, e.Number);
             Assert.Equal(ConnectionState.Closed, connection.State);
-            Assert.Equal(1, server.PreLoginCount);
+            Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -179,10 +181,9 @@ public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
             SqlException e = Assert.Throws<SqlException>(() => connection.Open());
             Assert.Equal((int)errorCode, e.Number);
             Assert.Equal(ConnectionState.Closed, connection.State);
-            Assert.Equal(1, server.PreLoginCount);
+            Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
@@ -200,6 +201,7 @@ public async Task NetworkError_RetryEnabled_ShouldSucceed_Async(bool multiSubnet
                 DataSource = "localhost," + server.EndPoint.Port,
                 Encrypt = SqlConnectionEncryptOption.Optional,
                 ConnectTimeout = 5,
+                Pooling = false, // Disable pooling to ensure a fresh connection attempt is made
                 MultiSubnetFailover = multiSubnetFailoverEnabled,
 #if NETFRAMEWORK
                 TransparentNetworkIPResolution = multiSubnetFailoverEnabled
@@ -216,11 +218,10 @@ public async Task NetworkError_RetryEnabled_ShouldSucceed_Async(bool multiSubnet
             }
             else
             {
-                Assert.Equal(1, server.PreLoginCount);
+                Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
             }
         }
 
-        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
@@ -261,11 +262,10 @@ public async Task NetworkDelay_RetryDisabled_Async(bool multiSubnetFailoverEnabl
             }
             else
             {
-                Assert.Equal(1, server.PreLoginCount);
+                Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
             }
         }
 
-        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
@@ -306,7 +306,7 @@ public void NetworkDelay_RetryDisabled(bool multiSubnetFailoverEnabled)
             }
             else
             {
-                Assert.Equal(1, server.PreLoginCount);
+                Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
             }
         }
 
@@ -467,7 +467,8 @@ public void ConnectionTimeoutTest(int timeout)
             //TODO: do we even need a server for this test?
             using TdsServer server = new();
             server.Start();
-            var connStr = new SqlConnectionStringBuilder() {
+            var connStr = new SqlConnectionStringBuilder()
+            {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 ConnectTimeout = timeout,
                 Encrypt = SqlConnectionEncryptOption.Optional
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTdsServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTdsServer.cs
index d2c81e6ca1..1eb8bdf8c6 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTdsServer.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTdsServer.cs
@@ -95,6 +95,11 @@ public delegate void OnAuthenticationCompletedDelegate(
         /// </summary>
         private int _preLoginCount = 0;
 
+        /// <summary>
+        /// Counts Login7 requests to the server.
+        /// </summary>
+        protected int _login7Count = 0;
+
         private TDSServerEndPoint _endpoint;
 
         /// <summary>
@@ -137,6 +142,18 @@ public GenericTdsServer(T arguments, QueryEngine queryEngine)
         /// </summary>
         public int PreLoginCount => _preLoginCount;
 
+        /// <summary>
+        /// Counts Login7 requests to the server.
+        /// </summary>
+        public int Login7Count => _login7Count;
+
+        /// <summary>
+        /// Counts pre-login requests that did not result in a Login7 request,
+        /// which indicates the client abandoned the connection (e.g. interval
+        /// timer timeout during TNIR or failover).
+        /// </summary>
+        public int AbandonedPreLoginCount => _preLoginCount - _login7Count;
+
         public OnAuthenticationCompletedDelegate OnAuthenticationResponseCompleted { private get; set; }
 
         public OnLogin7ValidatedDelegate OnLogin7Validated { private get; set; }
@@ -148,9 +165,12 @@ public void Start([CallerMemberName] string methodName = "")
             {
                 throw new InvalidOperationException("Server is already started");
             }
-            _endpoint = new TDSServerEndPoint(this) { ServerEndPoint = new IPEndPoint(IPAddress.Any, 0) };
-            _endpoint.EndpointName = methodName;
-            _endpoint.EventLog = Arguments.Log;
+            _endpoint = new TDSServerEndPoint(this)
+            {
+                ServerEndPoint = new IPEndPoint(IPAddress.Any, 0),
+                EndpointName = methodName,
+                EventLog = Arguments.Log
+            };
             _endpoint.Start();
         }
 
@@ -245,6 +265,8 @@ public virtual TDSMessageCollection OnPreLoginRequest(ITDSServerSession session,
         /// </summary>
         public virtual TDSMessageCollection OnLogin7Request(ITDSServerSession session, TDSMessage request)
         {
+            Interlocked.Increment(ref _login7Count);
+
             // Inflate login7 request from the message
             TDSLogin7Token loginRequest = request[0] as TDSLogin7Token;
 
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs
index ecd89f5812..6ec7ac2528 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs
@@ -60,6 +60,8 @@ public override TDSMessageCollection OnLogin7Request(ITDSServerSession session,
             // Check if we're still going to raise transient error
             if (Arguments.IsEnabledTransientError && RequestCounter < Arguments.RepeatCount)
             {
+                // Increment Login7 count since we won't call base.OnLogin7Request
+                Interlocked.Increment(ref _login7Count);
                 return GenerateErrorMessage(request);
             }
 

From ab95f6f35d1aabfdcad4ea50a57b926932e77956 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Thu, 26 Mar 2026 07:08:57 +1100
Subject: [PATCH 009/298] remove duplicate dictionary lookups (#4000)

---
 ...taSourceEnumeratorManagedHelper.netcore.cs | 16 ++++-----
 .../Data/SqlClient/SQLFallbackDNSCache.cs     |  9 ++---
 .../Microsoft/Data/SqlClient/SqlDependency.cs | 33 +++++--------------
 .../Data/SqlClient/SqlDependencyListener.cs   | 22 ++++++-------
 .../Data/SqlClient/SqlDependencyUtils.cs      |  6 +---
 5 files changed, 30 insertions(+), 56 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorManagedHelper.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorManagedHelper.netcore.cs
index 2bc42aa38c..73a164a108 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorManagedHelper.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorManagedHelper.netcore.cs
@@ -61,14 +61,14 @@ private static DataTable ParseServerEnumString(string serverInstances)
                 if (InstanceDetails.Count > 0)
                 {
                     dataRow = dataTable.NewRow();
-                    dataRow[0] = InstanceDetails.ContainsKey(SqlDataSourceEnumeratorUtil.ServerNameCol) == true ?
-                                 InstanceDetails[SqlDataSourceEnumeratorUtil.ServerNameCol] : string.Empty;
-                    dataRow[1] = InstanceDetails.ContainsKey(SqlDataSourceEnumeratorUtil.InstanceNameCol) == true ?
-                                 InstanceDetails[SqlDataSourceEnumeratorUtil.InstanceNameCol] : string.Empty;
-                    dataRow[2] = InstanceDetails.ContainsKey(SqlDataSourceEnumeratorUtil.IsClusteredCol) == true ?
-                                 InstanceDetails[SqlDataSourceEnumeratorUtil.IsClusteredCol] : string.Empty;
-                    dataRow[3] = InstanceDetails.ContainsKey(SqlDataSourceEnumeratorUtil.VersionNameCol) == true ?
-                                 InstanceDetails[SqlDataSourceEnumeratorUtil.VersionNameCol] : string.Empty;
+                    dataRow[0] = InstanceDetails.TryGetValue(SqlDataSourceEnumeratorUtil.ServerNameCol, out string serverName) ?
+                                 serverName : string.Empty;
+                    dataRow[1] = InstanceDetails.TryGetValue(SqlDataSourceEnumeratorUtil.InstanceNameCol, out string instanceName) ?
+                                 instanceName : string.Empty;
+                    dataRow[2] = InstanceDetails.TryGetValue(SqlDataSourceEnumeratorUtil.IsClusteredCol, out string isClustered) ?
+                                 isClustered : string.Empty;
+                    dataRow[3] = InstanceDetails.TryGetValue(SqlDataSourceEnumeratorUtil.VersionNameCol, out string versionName) ?
+                                 versionName : string.Empty;
 
                     dataTable.Rows.Add(dataRow);
                 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SQLFallbackDNSCache.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SQLFallbackDNSCache.cs
index 4dd3086b45..07ddd6fd50 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SQLFallbackDNSCache.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SQLFallbackDNSCache.cs
@@ -28,13 +28,8 @@ internal bool AddDNSInfo(SQLDNSInfo item)
         {
             if (item != null)
             {
-                if (DNSInfoCache.ContainsKey(item.FQDN))
-                {
-
-                    DeleteDNSInfo(item.FQDN);
-                }
-
-                return DNSInfoCache.TryAdd(item.FQDN, item);
+                DNSInfoCache[item.FQDN] = item;
+                return true;
             }
 
             return false;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
index 83d9753799..10efdd9e05 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
@@ -817,29 +817,21 @@ private static bool AddToServerUserHash(string server, IdentityUserNamePair iden
                 {
                     Dictionary<IdentityUserNamePair, List<DatabaseServicePair>> identityDatabaseHash;
 
-                    if (!s_serverUserHash.ContainsKey(server))
+                    if (!s_serverUserHash.TryGetValue(server, out identityDatabaseHash))
                     {
                         SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependency.AddToServerUserHash|DEP> Hash did not contain server, adding.");
                         identityDatabaseHash = new Dictionary<IdentityUserNamePair, List<DatabaseServicePair>>();
                         s_serverUserHash.Add(server, identityDatabaseHash);
                     }
-                    else
-                    {
-                        identityDatabaseHash = s_serverUserHash[server];
-                    }
 
                     List<DatabaseServicePair> databaseServiceList;
 
-                    if (!identityDatabaseHash.ContainsKey(identityUser))
+                    if (!identityDatabaseHash.TryGetValue(identityUser, out databaseServiceList))
                     {
                         SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependency.AddToServerUserHash|DEP> Hash contained server but not user, adding user.");
                         databaseServiceList = new List<DatabaseServicePair>();
                         identityDatabaseHash.Add(identityUser, databaseServiceList);
                     }
-                    else
-                    {
-                        databaseServiceList = identityDatabaseHash[identityUser];
-                    }
 
                     if (!databaseServiceList.Contains(databaseService))
                     {
@@ -870,15 +862,12 @@ private static void RemoveFromServerUserHash(string server, IdentityUserNamePair
                 {
                     Dictionary<IdentityUserNamePair, List<DatabaseServicePair>> identityDatabaseHash;
 
-                    if (s_serverUserHash.ContainsKey(server))
+                    if (s_serverUserHash.TryGetValue(server, out identityDatabaseHash))
                     {
-                        identityDatabaseHash = s_serverUserHash[server];
-
                         List<DatabaseServicePair> databaseServiceList;
 
-                        if (identityDatabaseHash.ContainsKey(identityUser))
+                        if (identityDatabaseHash.TryGetValue(identityUser, out databaseServiceList))
                         {
-                            databaseServiceList = identityDatabaseHash[identityUser];
 
                             int index = databaseServiceList.IndexOf(databaseService);
                             if (index >= 0)
@@ -934,7 +923,9 @@ internal static string GetDefaultComposedOptions(string server, string failoverS
 
                 lock (s_serverUserHash)
                 {
-                    if (!s_serverUserHash.ContainsKey(server))
+                    Dictionary<IdentityUserNamePair, List<DatabaseServicePair>> identityDatabaseHash;
+
+                    if (!s_serverUserHash.TryGetValue(server, out identityDatabaseHash))
                     {
                         if (0 == s_serverUserHash.Count)
                         {
@@ -942,7 +933,7 @@ internal static string GetDefaultComposedOptions(string server, string failoverS
                             SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependency.GetDefaultComposedOptions|DEP|ERR> ERROR - no start calls have been made, about to throw.");
                             throw SQL.SqlDepDefaultOptionsButNoStart();
                         }
-                        else if (!string.IsNullOrEmpty(failoverServer) && s_serverUserHash.ContainsKey(failoverServer))
+                        else if (!string.IsNullOrEmpty(failoverServer) && s_serverUserHash.TryGetValue(failoverServer, out identityDatabaseHash))
                         {
                             SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependency.GetDefaultComposedOptions|DEP> using failover server instead\n");
                             server = failoverServer;
@@ -954,11 +945,9 @@ internal static string GetDefaultComposedOptions(string server, string failoverS
                         }
                     }
 
-                    Dictionary<IdentityUserNamePair, List<DatabaseServicePair>> identityDatabaseHash = s_serverUserHash[server];
-
                     List<DatabaseServicePair> databaseList = null;
 
-                    if (!identityDatabaseHash.ContainsKey(identityUser))
+                    if (!identityDatabaseHash.TryGetValue(identityUser, out databaseList))
                     {
                         if (identityDatabaseHash.Count > 1)
                         {
@@ -977,10 +966,6 @@ internal static string GetDefaultComposedOptions(string server, string failoverS
                             }
                         }
                     }
-                    else
-                    {
-                        databaseList = identityDatabaseHash[identityUser];
-                    }
 
                     DatabaseServicePair pair = new(database, null);
                     DatabaseServicePair resultingPair = null;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
index 306b36b747..e97d8589a3 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
@@ -252,11 +252,10 @@ internal bool AppDomainUnload(string appDomainKey)
                 // For each decrement, subtract from count, and delete if we reach 0.
                 lock (_appDomainKeyHash)
                 {
-                    if (_appDomainKeyHash.ContainsKey(appDomainKey))
+                    if (_appDomainKeyHash.TryGetValue(appDomainKey, out int value))
                     {
                         // Do nothing if AppDomain did not call Start!
                         SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlConnectionContainer.AppDomainUnload|DEP> _appDomainKeyHash contained AppDomainKey: '{0}'.", appDomainKey);
-                        int value = _appDomainKeyHash[appDomainKey];
                         SqlClientEventSource.Log.TryNotificationTraceEvent("SqlConnectionContainer.AppDomainUnload|DEP> _appDomainKeyHash for AppDomainKey: '{0}' count: '{1}'.", appDomainKey, value);
                         Debug.Assert(value > 0, "Why is value 0 or less?");
 
@@ -272,9 +271,9 @@ internal bool AppDomainUnload(string appDomainKey)
                         Debug.Assert(0 == value, "We did not reach 0 at end of loop in AppDomainUnload!");
                         Debug.Assert(!_appDomainKeyHash.ContainsKey(appDomainKey), "Key not removed after AppDomainUnload!");
 
-                        if (_appDomainKeyHash.ContainsKey(appDomainKey))
+                        if (_appDomainKeyHash.TryGetValue(appDomainKey, out int remainingCount))
                         {
-                            SqlClientEventSource.Log.TryNotificationTraceEvent("SqlConnectionContainer.AppDomainUnload|DEP|ERR> ERROR - after the Stop() loop, _appDomainKeyHash for AppDomainKey: '{0}' entry not removed from hash.  Count: {1}'", appDomainKey, _appDomainKeyHash[appDomainKey]);
+                            SqlClientEventSource.Log.TryNotificationTraceEvent("SqlConnectionContainer.AppDomainUnload|DEP|ERR> ERROR - after the Stop() loop, _appDomainKeyHash for AppDomainKey: '{0}' entry not removed from hash.  Count: {1}'", appDomainKey, remainingCount);
                         }
                     }
                     else
@@ -510,10 +509,11 @@ internal void IncrementStartCount(string appDomainKey, out bool appDomainStart)
                 // For each increment, add to count, and create entry if not present.
                 lock (_appDomainKeyHash)
                 {
-                    if (_appDomainKeyHash.ContainsKey(appDomainKey))
+                    if (_appDomainKeyHash.TryGetValue(appDomainKey, out int count))
                     {
-                        _appDomainKeyHash[appDomainKey] = _appDomainKeyHash[appDomainKey] + 1;
-                        SqlClientEventSource.Log.TryNotificationTraceEvent("SqlConnectionContainer.IncrementStartCount|DEP> _appDomainKeyHash contained AppDomainKey: '{0}', incremented count: '{1}'.", appDomainKey, _appDomainKeyHash[appDomainKey]);
+                        count++;
+                        _appDomainKeyHash[appDomainKey] = count;
+                        SqlClientEventSource.Log.TryNotificationTraceEvent("SqlConnectionContainer.IncrementStartCount|DEP> _appDomainKeyHash contained AppDomainKey: '{0}', incremented count: '{1}'.", appDomainKey, count);
                     }
                     else
                     {
@@ -1618,7 +1618,7 @@ private bool Start(
             {
                 if (!_sqlDependencyPerAppDomainDispatchers.ContainsKey(appDomainKey))
                 {
-                    _sqlDependencyPerAppDomainDispatchers[appDomainKey] = dispatcher;
+                    _sqlDependencyPerAppDomainDispatchers.Add(appDomainKey, dispatcher);
                 }
             }
 
@@ -1637,7 +1637,7 @@ private bool Start(
             SqlConnectionContainer container = null;
             lock (_connectionContainers)
             {
-                if (!_connectionContainers.ContainsKey(hashHelper))
+                if (!_connectionContainers.TryGetValue(hashHelper, out container))
                 {
                     SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependencyProcessDispatcher.Start|DEP> {0}, hashtable miss, creating new container.", ObjectID);
                     container = new SqlConnectionContainer(hashHelper, appDomainKey, useDefaults);
@@ -1647,7 +1647,6 @@ private bool Start(
                 }
                 else
                 {
-                    container = _connectionContainers[hashHelper];
                     SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependencyProcessDispatcher.Start|DEP> {0}, hashtable hit, container: {1}", ObjectID, container.ObjectID);
                     if (container.InErrorState)
                     {
@@ -1713,9 +1712,8 @@ internal bool Stop(
 
             lock (_connectionContainers)
             {
-                if (_connectionContainers.ContainsKey(hashHelper))
+                if (_connectionContainers.TryGetValue(hashHelper, out SqlConnectionContainer container))
                 {
-                    SqlConnectionContainer container = _connectionContainers[hashHelper];
                     SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependencyProcessDispatcher.Stop|DEP> {0}, hashtable hit, container: {1}", ObjectID, container.ObjectID);
                     server = container.Server;   // Return server, database, and queue info for use by calling SqlDependency.
                     database = container.Database;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs
index 59b36d23cc..b990270924 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs
@@ -365,11 +365,7 @@ internal SqlDependency LookupDependencyEntry(string id)
 
                 lock (_instanceLock)
                 {
-                    if (_dependencyIdToDependencyHash.ContainsKey(id))
-                    {
-                        entry = _dependencyIdToDependencyHash[id];
-                    }
-                    else
+                    if (!_dependencyIdToDependencyHash.TryGetValue(id, out entry))
                     {
                         SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependencyPerAppDomainDispatcher.LookupDependencyEntry|DEP|ERR> ERROR - dependency ID mismatch - not throwing.");
                     }

From aea5ade9e0d379b202e7fe3117709fcc50f75f5b Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 25 Mar 2026 18:25:03 -0300
Subject: [PATCH 010/298] Added CI test stages for SQL Server 16 and 17.
 (#4087)

---
 eng/pipelines/dotnet-sqlclient-ci-core.yml    | 62 +++++++++++++++++++
 .../sqlclient-pr-package-ref-pipeline.yml     |  2 +
 .../sqlclient-pr-project-ref-pipeline.yml     |  2 +
 3 files changed, 66 insertions(+)

diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index f9ead686ff..e4d6d70a7f 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -93,6 +93,12 @@ parameters:
     type: boolean
     default: true
 
+  # If true, run manual tests against legacy SQL Server versions (2016, 2017).
+  # Enabled for CI pipelines; disabled for PR pipelines to keep validation fast.
+  - name: runLegacySqlTests
+    type: boolean
+    default: true
+
   - name: dotnetVerbosity
     type: string
     default: normal
@@ -289,6 +295,62 @@ stages:
       # Configuration of test jobs.  Each entry in this object will become a test job, and the
       # properties of each entry will be supplied as parameters to the test job template.
       testConfigurations:
+        # SQL Server 2016 and 2017 on Windows Server 2022 (x64 only).
+        # x86 testing is intentionally skipped for these legacy SQL versions
+        # because x86 support is already validated via SQL 2019 and 2022 images.
+        ${{ if eq(parameters.runLegacySqlTests, true) }}:
+          # Windows Server 22 with local SQL Server 2016, x64 build platform.
+          windows_sql_16_x64:
+            pool: ${{parameters.defaultPoolName }}
+            images:
+              Win22_Sql16: ADO-MMS22-SQL16
+            TargetFrameworks: ${{parameters.targetFrameworks }}
+            netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
+            buildPlatforms: ${{parameters.buildPlatforms }}
+            testSets: ${{parameters.testSets }}
+            useManagedSNI: ${{parameters.useManagedSNI }}
+            configSqlFor: local
+            operatingSystem: Windows
+            configProperties:
+              TCPConnectionString: $(SQL_TCP_CONN_STRING)
+              NPConnectionString: $(SQL_NP_CONN_STRING)
+              AzureKeyVaultUrl: $(AzureKeyVaultUrl)
+              AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
+              SupportsIntegratedSecurity: true
+              UserManagedIdentityClientId: $(UserManagedIdentityClientId)
+              FileStreamDirectory: $(FileStreamDirectory)
+              LocalDbAppName: $(LocalDbAppName)
+              LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
+              AliasName: $(SQLAliasName)
+              SQLRootPath: $(SQL16RootPath)
+              enableLocalDB: true
+
+          # Windows Server 22 with local SQL Server 2017, x64 build platform.
+          windows_sql_17_x64:
+            pool: ${{parameters.defaultPoolName }}
+            images:
+              Win22_Sql17: ADO-MMS22-SQL17
+            TargetFrameworks: ${{parameters.targetFrameworks }}
+            netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
+            buildPlatforms: ${{parameters.buildPlatforms }}
+            testSets: ${{parameters.testSets }}
+            useManagedSNI: ${{parameters.useManagedSNI }}
+            configSqlFor: local
+            operatingSystem: Windows
+            configProperties:
+              TCPConnectionString: $(SQL_TCP_CONN_STRING)
+              NPConnectionString: $(SQL_NP_CONN_STRING)
+              AzureKeyVaultUrl: $(AzureKeyVaultUrl)
+              AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
+              SupportsIntegratedSecurity: true
+              UserManagedIdentityClientId: $(UserManagedIdentityClientId)
+              FileStreamDirectory: $(FileStreamDirectory)
+              LocalDbAppName: $(LocalDbAppName)
+              LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
+              AliasName: $(SQLAliasName)
+              SQLRootPath: $(SQL17RootPath)
+              enableLocalDB: true
+
         # Windows Server 22 with local SQL Server 2019, x64 build platform.
         windows_sql_19_x64:
           pool: ${{parameters.defaultPoolName }}
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index a575d2dd6a..440d7afa27 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -139,6 +139,8 @@ extends:
     testJobTimeout: ${{ parameters.testJobTimeout }}
     testSets: ${{ parameters.testSets }}
     useManagedSNI: ${{ parameters.useManagedSNI }}
+    # Legacy SQL Server tests (2016/2017) run in CI only, not on PRs.
+    runLegacySqlTests: false
     # Don't run the AE tests in Debug mode; they rarely succeed.
     ${{ if eq(parameters.buildConfiguration, 'Debug') }}:
       runAlwaysEncryptedTests: false
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index dd8f34e58b..d3ae773181 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -139,6 +139,8 @@ extends:
     testJobTimeout: ${{ parameters.testJobTimeout }}
     testSets: ${{ parameters.testSets }}
     useManagedSNI: ${{ parameters.useManagedSNI }}
+    # Legacy SQL Server tests (2016/2017) run in CI only, not on PRs.
+    runLegacySqlTests: false
     # Don't run the AE tests in Debug mode; they rarely succeed.
     ${{ if eq(parameters.buildConfiguration, 'Debug') }}:
       runAlwaysEncryptedTests: false

From 39ae09b4abecc328423f157f43fccccd1b1535da Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 26 Mar 2026 08:48:30 -0700
Subject: [PATCH 011/298] Test | Fix Diagnostic Tests and remove Remote
 Executor (#4078)

---
 .../Microsoft/Data/SqlClient/SqlConnection.cs |    4 +-
 .../tests/Directory.Packages.props            |    1 -
 ...icrosoft.Data.SqlClient.ManualTests.csproj |    6 +-
 .../TracingTests/DiagnosticTest.cs            | 1053 ++++-------------
 4 files changed, 268 insertions(+), 796 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index e22988b35d..b96e6f654d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -1937,8 +1937,10 @@ private Task InternalOpenAsync(SqlConnectionOverrides overrides, CancellationTok
                         s_diagnosticListener.IsEnabled(SqlClientConnectionOpenError.Name))
                     {
                         result.Task.ContinueWith(
-                            continuationAction: s_openAsyncComplete,
+                            continuationAction: static (task, state) => s_openAsyncComplete(task, state),
                             state: operationId, // connection is passed in TaskCompletionSource async state
+                            cancellationToken: CancellationToken.None, // we want the continuation task to run even if the original operation was cancelled
+                            continuationOptions: TaskContinuationOptions.ExecuteSynchronously,
                             scheduler: TaskScheduler.Default
                         );
                     }
diff --git a/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props b/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
index 78ea36f1fa..72bddcc898 100644
--- a/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
+++ b/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
@@ -12,7 +12,6 @@
   <!-- SqlClient test dependencies. -->
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
-    <PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25476.3" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.13" />
     <PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="181.15.0" />
     <PackageVersion Include="Microsoft.SqlServer.Types" Version="170.1000.7" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 336838b068..25a1d53d0d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -342,7 +342,8 @@
     <!-- to "Package". If this is not specified, the build will revert to default behavior of     -->
     <!-- referencing MDS via the project.                                                         -->
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\src\Microsoft.Data.SqlClient.csproj"
-                      Condition="'$(ReferenceType)' != 'Package'"  />
+                      Condition="'$(ReferenceType)' != 'Package'"
+                      Private="true" />
     <PackageReference Include="Microsoft.Data.SqlClient"
                       Condition="'$(ReferenceType)' == 'Package'" />
 
@@ -360,7 +361,6 @@
     <PackageReference Include="System.ValueTuple" />
     <PackageReference Include="Microsoft.Data.SqlClient.SNI"
                       Condition="'$(ReferenceType)' != 'Package'" />
-    <PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
@@ -395,7 +395,6 @@
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime"
                       Condition="'$(ReferenceType)' != 'Package'" />
-    <PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
@@ -422,4 +421,5 @@
     <ProjectReference Include="$(TestsPath)tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
     <ProjectReference Include="$(TestsPath)tools/TDS/TDS.Servers/TDS.Servers.csproj" />
   </ItemGroup>
+  
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs
index f550e7db70..db49fc7c32 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs
@@ -2,31 +2,30 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Collections;
+using System.Collections.Generic;
+using System.Data;
 using System.Diagnostics;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using System.Xml;
 using Microsoft.SqlServer.TDS;
 using Microsoft.SqlServer.TDS.Done;
 using Microsoft.SqlServer.TDS.EndPoint;
 using Microsoft.SqlServer.TDS.Error;
-using Microsoft.SqlServer.TDS.Servers;
 using Microsoft.SqlServer.TDS.SQLBatch;
+using Microsoft.SqlServer.TDS.Servers;
 using Xunit;
-using System.Runtime.CompilerServices;
-using System;
-using System.Data;
-using Microsoft.DotNet.RemoteExecutor;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
-    // TODO(ADO-39873): Re-enable these tests after addressing their flakiness.
-    [Trait("Category", "flaky")]
+    // Serialized execution: DiagnosticListener is global state, so these tests
+    // must not run in parallel with each other.
+    [Collection("DiagnosticTests")]
     public class DiagnosticTest
     {
-        private const string BadConnectionString = "data source = bad; initial catalog = bad; integrated security = true; connection timeout = 1;";
-
         private const string WriteCommandBefore = "Microsoft.Data.SqlClient.WriteCommandBefore";
         private const string WriteCommandAfter = "Microsoft.Data.SqlClient.WriteCommandAfter";
         private const string WriteCommandError = "Microsoft.Data.SqlClient.WriteCommandError";
@@ -35,969 +34,441 @@ public class DiagnosticTest
         private const string WriteConnectionOpenError = "Microsoft.Data.SqlClient.WriteConnectionOpenError";
         private const string WriteConnectionCloseBefore = "Microsoft.Data.SqlClient.WriteConnectionCloseBefore";
         private const string WriteConnectionCloseAfter = "Microsoft.Data.SqlClient.WriteConnectionCloseAfter";
-        private const string WriteConnectionCloseError = "Microsoft.Data.SqlClient.WriteConnectionCloseError";
+        private const string BadConnectionString = "data source = bad; initial catalog = bad; integrated security = true; connection timeout = 1;";
+
+        #region Sync tests
 
         [Fact]
         public void ExecuteScalarTest()
         {
-            RemoteExecutor.Invoke(() =>
+            CollectStatisticsDiagnostics(connectionString =>
             {
-                CollectStatisticsDiagnostics(connectionString =>
-                {
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();";
-
-                        conn.Open();
-                        cmd.ExecuteScalar();
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();", conn);
+                conn.Open();
+                cmd.ExecuteScalar();
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
         public void ExecuteScalarErrorTest()
         {
-            RemoteExecutor.Invoke(() =>
+            CollectStatisticsDiagnostics(connectionString =>
             {
-                CollectStatisticsDiagnostics(connectionString =>
-                {
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT 1 / 0;";
-
-                        conn.Open();
-                        Assert.Throws<SqlException>(() => cmd.ExecuteScalar());
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT 1 / 0;", conn);
+                conn.Open();
+                Assert.Throws<SqlException>(() => cmd.ExecuteScalar());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
         public void ExecuteNonQueryTest()
         {
-            RemoteExecutor.Invoke(() =>
+            CollectStatisticsDiagnostics(connectionString =>
             {
-                CollectStatisticsDiagnostics(connectionString =>
-                {
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();";
-
-                        conn.Open();
-                        cmd.ExecuteNonQuery();
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();", conn);
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
         public void ExecuteNonQueryErrorTest()
         {
-            RemoteExecutor.Invoke(() =>
+            CollectStatisticsDiagnostics(connectionString =>
             {
-                CollectStatisticsDiagnostics(connectionString =>
-                {
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT 1 / 0;";
-
-                        // Limiting the command timeout to 3 seconds. This should be lower than the Process timeout.
-                        cmd.CommandTimeout = 3;
-                        conn.Open();
-
-                        Assert.Throws<SqlException>(() => cmd.ExecuteNonQuery());
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT 1 / 0;", conn);
+                cmd.CommandTimeout = 3;
+                conn.Open();
+                Assert.Throws<SqlException>(() => cmd.ExecuteNonQuery());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
         public void ExecuteReaderTest()
         {
-            RemoteExecutor.Invoke(() =>
+            CollectStatisticsDiagnostics(connectionString =>
             {
-                CollectStatisticsDiagnostics(connectionString =>
-                {
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();";
-
-                        conn.Open();
-                        SqlDataReader reader = cmd.ExecuteReader();
-                        while (reader.Read())
-                        {
-                            // Read until end.
-                        }
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();", conn);
+                conn.Open();
+                using SqlDataReader reader = cmd.ExecuteReader();
+                while (reader.Read()) { }
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
         public void ExecuteReaderErrorTest()
         {
-            RemoteExecutor.Invoke(() =>
+            CollectStatisticsDiagnostics(connectionString =>
             {
-                CollectStatisticsDiagnostics(connectionString =>
-                {
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT 1 / 0;";
-
-                        conn.Open();
-                        // @TODO: TestTdsServer should not throw on ExecuteReader, it should throw on reader.Read
-                        Assert.Throws<SqlException>(() => cmd.ExecuteReader());
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT 1 / 0;", conn);
+                conn.Open();
+                Assert.Throws<SqlException>(() => cmd.ExecuteReader());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
         public void ExecuteReaderWithCommandBehaviorTest()
         {
-            RemoteExecutor.Invoke(() =>
+            CollectStatisticsDiagnostics(connectionString =>
             {
-                CollectStatisticsDiagnostics(connectionString =>
-                {
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();";
-
-                        conn.Open();
-                        SqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default);
-                        while (reader.Read())
-                        {
-                            // Read to end
-                        }
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();", conn);
+                conn.Open();
+                using SqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default);
+                while (reader.Read()) { }
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
-        // Synapse: Parse error at line: 1, column: 27: Incorrect syntax near 'for'.
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [Fact]
         public void ExecuteXmlReaderTest()
         {
-            RemoteExecutor.Invoke(() =>
+            // The TDS test server does not return XML-formatted results, so
+            // ExecuteXmlReader will throw. We verify the error diagnostic path.
+            CollectStatisticsDiagnostics(connectionString =>
             {
-                CollectStatisticsDiagnostics(_ =>
-                {
-                    // @TODO: Test TDS server doesn't support ExecuteXmlReader, so connect to real server as workaround
-                    using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT TOP 10 * FROM sys.objects FOR xml auto, xmldata;";
-
-                        conn.Open();
-                        XmlReader reader = cmd.ExecuteXmlReader();
-                        while (reader.Read())
-                        {
-                            // Read to end
-                        }
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT TOP 10 * FROM sys.objects FOR xml auto, xmldata;", conn);
+                conn.Open();
+                Assert.Throws<InvalidOperationException>(() => cmd.ExecuteXmlReader());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [Fact]
         public void ExecuteXmlReaderErrorTest()
         {
-            RemoteExecutor.Invoke(() =>
+            CollectStatisticsDiagnostics(connectionString =>
             {
-                CollectStatisticsDiagnostics(connectionString =>
-                {
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT *, baddata = 1 / 0 FROM sys.objects FOR xml auto, xmldata;";
-
-                        conn.Open();
-                        // @TODO: TestTdsServer should not throw on ExecuteXmlReader, should throw on reader.Read
-                        Assert.Throws<SqlException>(() => cmd.ExecuteXmlReader());
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT *, baddata = 1 / 0 FROM sys.objects FOR xml auto, xmldata;", conn);
+                conn.Open();
+                Assert.Throws<SqlException>(() => cmd.ExecuteXmlReader());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
-        public void ExecuteScalarAsyncTest()
+        public void ConnectionOpenTest()
         {
-            RemoteExecutor.Invoke(() =>
+            CollectStatisticsDiagnostics(connectionString =>
             {
-                CollectStatisticsDiagnosticsAsync(async connectionString =>
-                {
-#if NET
-                    await using (SqlConnection conn = new SqlConnection(connectionString))
-                    await using (SqlCommand cmd = new SqlCommand())
-#else
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-#endif
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();";
-
-                        conn.Open();
-                        await cmd.ExecuteScalarAsync();
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]).Wait();
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(connectionString);
+                conn.Open();
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
-        public void ExecuteScalarAsyncErrorTest()
+        public void ConnectionOpenErrorTest()
         {
-            RemoteExecutor.Invoke(() =>
+            CollectStatisticsDiagnostics(_ =>
             {
-                CollectStatisticsDiagnosticsAsync(async connectionString =>
-                {
-#if NET
-                    await using (SqlConnection conn = new SqlConnection(connectionString))
-                    await using (SqlCommand cmd = new SqlCommand())
-#else
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
-#endif
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT 1 / 0;";
-
-                        conn.Open();
-                        await Assert.ThrowsAsync<SqlException>(() => cmd.ExecuteScalarAsync());
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]).Wait();
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                using SqlConnection conn = new(BadConnectionString);
+                Assert.Throws<SqlException>(() => conn.Open());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenError]);
         }
 
+        #endregion
+
+        #region Async tests
+
         [Fact]
-        public void ExecuteNonQueryAsyncTest()
+        public async Task ExecuteScalarAsyncTest()
         {
-            RemoteExecutor.Invoke(() =>
+            await CollectStatisticsDiagnosticsAsync(async connectionString =>
             {
-                CollectStatisticsDiagnosticsAsync(async connectionString =>
-                {
 #if NET
-                    await using (SqlConnection conn = new SqlConnection(connectionString))
-                    await using (SqlCommand cmd = new SqlCommand())
+                await using SqlConnection conn = new(connectionString);
+                await using SqlCommand cmd = new("SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();", conn);
 #else
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();", conn);
 #endif
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();";
-
-                        conn.Open();
-                        await cmd.ExecuteNonQueryAsync();
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]).Wait();
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                conn.Open();
+                await cmd.ExecuteScalarAsync();
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
-        public void ExecuteNonQueryAsyncErrorTest()
+        public async Task ExecuteScalarAsyncErrorTest()
         {
-            RemoteExecutor.Invoke(() =>
+            await CollectStatisticsDiagnosticsAsync(async connectionString =>
             {
-                CollectStatisticsDiagnosticsAsync(async connectionString =>
-                {
 #if NET
-                    await using (SqlConnection conn = new SqlConnection(connectionString))
-                    await using (SqlCommand cmd = new SqlCommand())
+                await using SqlConnection conn = new(connectionString);
+                await using SqlCommand cmd = new("SELECT 1 / 0;", conn);
 #else
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT 1 / 0;", conn);
 #endif
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT 1 / 0;";
-
-                        conn.Open();
-                        await Assert.ThrowsAsync<SqlException>(() => cmd.ExecuteNonQueryAsync());
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]).Wait();
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                conn.Open();
+                await Assert.ThrowsAsync<SqlException>(() => cmd.ExecuteScalarAsync());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
-        public void ExecuteReaderAsyncTest()
+        public async Task ExecuteNonQueryAsyncTest()
         {
-            RemoteExecutor.Invoke(() =>
+            await CollectStatisticsDiagnosticsAsync(async connectionString =>
             {
-                CollectStatisticsDiagnosticsAsync(async connectionString =>
-                {
 #if NET
-                    await using (SqlConnection conn = new SqlConnection(connectionString))
-                    await using (SqlCommand cmd = new SqlCommand())
+                await using SqlConnection conn = new(connectionString);
+                await using SqlCommand cmd = new("SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();", conn);
 #else
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();", conn);
 #endif
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();";
-
-                        conn.Open();
-                        SqlDataReader reader = await cmd.ExecuteReaderAsync();
-                        while (reader.Read())
-                        {
-                            // Read to end
-                        }
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]).Wait();
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                conn.Open();
+                await cmd.ExecuteNonQueryAsync();
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
-        public void ExecuteReaderAsyncErrorTest()
+        public async Task ExecuteNonQueryAsyncErrorTest()
         {
-            RemoteExecutor.Invoke(() =>
+            await CollectStatisticsDiagnosticsAsync(async connectionString =>
             {
-                CollectStatisticsDiagnosticsAsync(async connectionString =>
-                {
 #if NET
-                    await using (SqlConnection conn = new SqlConnection(connectionString))
-                    await using (SqlCommand cmd = new SqlCommand())
+                await using SqlConnection conn = new(connectionString);
+                await using SqlCommand cmd = new("SELECT 1 / 0;", conn);
 #else
-                    using (SqlConnection conn = new SqlConnection(connectionString))
-                    using (SqlCommand cmd = new SqlCommand())
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT 1 / 0;", conn);
 #endif
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT 1 / 0;";
-
-                        conn.Open();
-                        // @TODO: TestTdsServer should not throw on ExecuteReader, should throw on reader.Read
-                        await Assert.ThrowsAsync<SqlException>(() => cmd.ExecuteReaderAsync());
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]).Wait();
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                conn.Open();
+                await Assert.ThrowsAsync<SqlException>(() => cmd.ExecuteNonQueryAsync());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
-        // Synapse:  Parse error at line: 1, column: 27: Incorrect syntax near 'for'.
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
-        public void ExecuteXmlReaderAsyncTest()
+        [Fact]
+        public async Task ExecuteReaderAsyncTest()
         {
-            // @TODO: TestTdsServer does not handle xml reader, so connect to a real server as a workaround
-            RemoteExecutor.Invoke(() =>
+            await CollectStatisticsDiagnosticsAsync(async connectionString =>
             {
-                CollectStatisticsDiagnosticsAsync(async _ =>
-                {
 #if NET
-                    await using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
-                    await using (SqlCommand cmd = new SqlCommand())
+                await using SqlConnection conn = new(connectionString);
+                await using SqlCommand cmd = new("SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();", conn);
 #else
-                    using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
-                    using (SqlCommand cmd = new SqlCommand())
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT [name], [state] FROM [sys].[databases] WHERE [name] = db_name();", conn);
 #endif
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "SELECT TOP 10 * FROM sys.objects FOR xml auto, xmldata;";
-
-                        conn.Open();
-                        XmlReader reader = await cmd.ExecuteXmlReaderAsync();
-                        while (reader.Read())
-                        {
-                            // Read to end
-                        }
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]).Wait();
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                conn.Open();
+                using SqlDataReader reader = await cmd.ExecuteReaderAsync();
+                while (reader.Read()) { }
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
-        public void ExecuteXmlReaderAsyncErrorTest()
+        public async Task ExecuteReaderAsyncErrorTest()
         {
-            // @TODO: TestTdsServer does not handle xml reader, so connect to a real server as a workaround
-            RemoteExecutor.Invoke(() =>
+            await CollectStatisticsDiagnosticsAsync(async connectionString =>
             {
-
-                CollectStatisticsDiagnosticsAsync(async _ =>
-                {
 #if NET
-                    await using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
-                    await using (SqlCommand cmd = new SqlCommand())
+                await using SqlConnection conn = new(connectionString);
+                await using SqlCommand cmd = new("SELECT 1 / 0;", conn);
 #else
-                    using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
-                    using (SqlCommand cmd = new SqlCommand())
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT 1 / 0;", conn);
 #endif
-                    {
-                        cmd.Connection = conn;
-                        cmd.CommandText = "select *, baddata = 1 / 0 from sys.objects for xml auto, xmldata;";
-
-                        // @TODO: Since this test uses a real database connection, the exception is
-                        //     thrown during reader.Read. (ie, TestTdsServer does not obey proper
-                        //     exception behavior)
-                        // NB: As a result of the exception being thrown during reader.Read, 
-                        // cmd.ExecuteXmlReaderAsync returns successfully. This means that we receive
-                        // a WriteCommandAfter event rather than WriteCommandError.
-                        await conn.OpenAsync();
-                        XmlReader reader = await cmd.ExecuteXmlReaderAsync();
-                        await Assert.ThrowsAsync<SqlException>(() => reader.ReadAsync());
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]).Wait();
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                conn.Open();
+                await Assert.ThrowsAsync<SqlException>(() => cmd.ExecuteReaderAsync());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
-        public void ConnectionOpenTest()
+        public async Task ExecuteXmlReaderAsyncTest()
         {
-            RemoteExecutor.Invoke(() =>
+            // The TDS test server does not return XML-formatted results, so
+            // ExecuteXmlReaderAsync will throw. We verify the error diagnostic path.
+            await CollectStatisticsDiagnosticsAsync(async connectionString =>
             {
-                CollectStatisticsDiagnostics(connectionString =>
-                {
-                    using (SqlConnection sqlConnection = new SqlConnection(connectionString))
-                    {
-                        sqlConnection.Open();
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+#if NET
+                await using SqlConnection conn = new(connectionString);
+                await using SqlCommand cmd = new("SELECT TOP 10 * FROM sys.objects FOR xml auto, xmldata;", conn);
+#else
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT TOP 10 * FROM sys.objects FOR xml auto, xmldata;", conn);
+#endif
+                conn.Open();
+                await Assert.ThrowsAsync<InvalidOperationException>(() => cmd.ExecuteXmlReaderAsync());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
-        public void ConnectionOpenErrorTest()
+        public async Task ExecuteXmlReaderAsyncErrorTest()
         {
-            RemoteExecutor.Invoke(() =>
+            await CollectStatisticsDiagnosticsAsync(async connectionString =>
             {
-                CollectStatisticsDiagnostics(_ =>
-                {
-                    using (SqlConnection sqlConnection = new SqlConnection(BadConnectionString))
-                    {
-                        Assert.Throws<SqlException>(() => sqlConnection.Open());
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenError]);
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+#if NET
+                await using SqlConnection conn = new(connectionString);
+                await using SqlCommand cmd = new("SELECT *, baddata = 1 / 0 FROM sys.objects FOR xml auto, xmldata;", conn);
+#else
+                using SqlConnection conn = new(connectionString);
+                using SqlCommand cmd = new("SELECT *, baddata = 1 / 0 FROM sys.objects FOR xml auto, xmldata;", conn);
+#endif
+                conn.Open();
+                Assert.Throws<SqlException>(() => cmd.ExecuteXmlReader());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteCommandBefore, WriteCommandError, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
-        public void ConnectionOpenAsyncTest()
+        public async Task ConnectionOpenAsyncTest()
         {
-            RemoteExecutor.Invoke(() =>
+            await CollectStatisticsDiagnosticsAsync(async connectionString =>
             {
-                CollectStatisticsDiagnosticsAsync(async connectionString =>
-                {
 #if NET
-                    await using (SqlConnection sqlConnection = new SqlConnection(connectionString))
+                await using SqlConnection conn = new(connectionString);
 #else
-                    using (SqlConnection sqlConnection = new SqlConnection(connectionString))
+                using SqlConnection conn = new(connectionString);
 #endif
-                    {
-                        await sqlConnection.OpenAsync();
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]).Wait();
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                await conn.OpenAsync();
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenAfter, WriteConnectionCloseBefore, WriteConnectionCloseAfter]);
         }
 
         [Fact]
-        public void ConnectionOpenAsyncErrorTest()
+        public async Task ConnectionOpenAsyncErrorTest()
         {
-            RemoteExecutor.Invoke(() =>
+            await CollectStatisticsDiagnosticsAsync(async _ =>
             {
-                CollectStatisticsDiagnosticsAsync(async _ =>
-                {
 #if NET
-                    await using (SqlConnection sqlConnection = new SqlConnection(BadConnectionString))
+                await using SqlConnection conn = new(BadConnectionString);
 #else
-                    using (SqlConnection sqlConnection = new SqlConnection(BadConnectionString))
+                using SqlConnection conn = new(BadConnectionString);
 #endif
-                    {
-                        await Assert.ThrowsAsync<SqlException>(() => sqlConnection.OpenAsync());
-                    }
-                }, [WriteConnectionOpenBefore, WriteConnectionOpenError]).Wait();
-                return RemoteExecutor.SuccessExitCode;
-            }).Dispose();
+                await Assert.ThrowsAsync<SqlException>(() => conn.OpenAsync());
+            }, [WriteConnectionOpenBefore, WriteConnectionOpenError]);
         }
 
-        private static void CollectStatisticsDiagnostics(Action<string> sqlOperation, string[] expectedDiagnostics, [CallerMemberName] string methodName = "")
-        {
-            bool statsLogged = false;
-            bool operationHasError = false;
-            Guid beginOperationId = Guid.Empty;
-
-            FakeDiagnosticListenerObserver diagnosticListenerObserver = new FakeDiagnosticListenerObserver(kvp =>
-                {
-                    IDictionary statistics;
-
-                    if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteCommandBefore"))
-                    {
-                        Assert.NotNull(kvp.Value);
-
-                        Guid retrievedOperationId = GetPropertyValueFromType<Guid>(kvp.Value, "OperationId");
-                        Assert.NotEqual(retrievedOperationId, Guid.Empty);
-
-                        SqlCommand sqlCommand = GetPropertyValueFromType<SqlCommand>(kvp.Value, "Command");
-                        Assert.NotNull(sqlCommand);
-
-                        string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                        Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                        Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                        if (sqlCommand.Connection.State == ConnectionState.Open)
-                        {
-                            Assert.NotEqual(connectionId, Guid.Empty);
-                        }
-
-                        beginOperationId = retrievedOperationId;
-
-                        statsLogged = true;
-                    }
-                    else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteCommandAfter"))
-                    {
-                        Assert.NotNull(kvp.Value);
-
-                        Guid retrievedOperationId = GetPropertyValueFromType<Guid>(kvp.Value, "OperationId");
-                        Assert.NotEqual(retrievedOperationId, Guid.Empty);
-
-                        SqlCommand sqlCommand = GetPropertyValueFromType<SqlCommand>(kvp.Value, "Command");
-                        Assert.NotNull(sqlCommand);
-
-                        statistics = GetPropertyValueFromType<IDictionary>(kvp.Value, "Statistics");
-                        if (!operationHasError)
-                        {
-                            Assert.NotNull(statistics);
-                        }
-
-                        string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                        Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                        Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                        if (sqlCommand.Connection.State == ConnectionState.Open)
-                        {
-                            Assert.NotEqual(connectionId, Guid.Empty);
-                        }
-
-                        // if we get to this point, then statistics exist and this must be the "end" 
-                        // event, so we need to make sure the operation IDs match
-                        Assert.Equal(retrievedOperationId, beginOperationId);
-                        beginOperationId = Guid.Empty;
-
-                        statsLogged = true;
-                    }
-                    else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteCommandError"))
-                    {
-                        operationHasError = true;
-                        Assert.NotNull(kvp.Value);
-
-                        SqlCommand sqlCommand = GetPropertyValueFromType<SqlCommand>(kvp.Value, "Command");
-                        Assert.NotNull(sqlCommand);
-
-                        Exception ex = GetPropertyValueFromType<Exception>(kvp.Value, "Exception");
-                        Assert.NotNull(ex);
-
-                        string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                        Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                        Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                        if (sqlCommand.Connection.State == ConnectionState.Open)
-                        {
-                            Assert.NotEqual(connectionId, Guid.Empty);
-                        }
-
-                        statsLogged = true;
-                    }
-                    else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionOpenBefore"))
-                    {
-                        Assert.NotNull(kvp.Value);
-
-                        SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                        Assert.NotNull(sqlConnection);
-
-                        string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                        Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                        statsLogged = true;
-                    }
-                    else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionOpenAfter"))
-                    {
-                        Assert.NotNull(kvp.Value);
-
-                        SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                        Assert.NotNull(sqlConnection);
-
-                        string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                        Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                        statistics = GetPropertyValueFromType<IDictionary>(kvp.Value, "Statistics");
-                        Assert.NotNull(statistics);
-
-                        Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                        Assert.NotEqual(connectionId, Guid.Empty);
-
-                        statsLogged = true;
-                    }
-                    else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionOpenError"))
-                    {
-                        Assert.NotNull(kvp.Value);
-
-                        SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                        Assert.NotNull(sqlConnection);
-
-                        string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                        Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                        Exception ex = GetPropertyValueFromType<Exception>(kvp.Value, "Exception");
-                        Assert.NotNull(ex);
-
-                        statsLogged = true;
-                    }
-                    else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionCloseBefore"))
-                    {
-                        Assert.NotNull(kvp.Value);
-
-                        SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                        Assert.NotNull(sqlConnection);
-
-                        string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                        Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                        Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                        Assert.NotEqual(connectionId, Guid.Empty);
-
-                        statsLogged = true;
-                    }
-                    else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionCloseAfter"))
-                    {
-                        Assert.NotNull(kvp.Value);
-
-                        SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                        Assert.NotNull(sqlConnection);
+        #endregion
 
-                        string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                        Assert.False(string.IsNullOrWhiteSpace(operation));
+        #region Helpers
 
-                        statistics = GetPropertyValueFromType<IDictionary>(kvp.Value, "Statistics");
-
-                        Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                        Assert.NotEqual(connectionId, Guid.Empty);
-
-                        statsLogged = true;
-                    }
-                    else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionCloseError"))
-                    {
-                        Assert.NotNull(kvp.Value);
-
-                        SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                        Assert.NotNull(sqlConnection);
-
-                        string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                        Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                        Exception ex = GetPropertyValueFromType<Exception>(kvp.Value, "Exception");
-                        Assert.NotNull(ex);
-
-                        Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                        Assert.NotEqual(connectionId, Guid.Empty);
-
-                        statsLogged = true;
-                    }
-                });
-
-            diagnosticListenerObserver.Enable();
-            using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver))
+        private static void CollectStatisticsDiagnostics(
+            Action<string> sqlOperation,
+            string[] expectedDiagnostics,
+            [CallerMemberName] string methodName = "")
+        {
+            bool statsLogged = false;
+            FakeDiagnosticListenerObserver observer = new(kvp =>
             {
+                ValidateDiagnosticPayload(kvp);
+                statsLogged = true;
+            });
 
-                Console.WriteLine(string.Format("Test: {0} Enabled Listeners", methodName));
-
-                using (var server = new TdsServer(new DiagnosticsQueryEngine(), new TdsServerArguments()))
+            observer.Enable();
+            using (DiagnosticListener.AllListeners.Subscribe(observer))
+            using (var server = new TdsServer(new DiagnosticsQueryEngine(), new TdsServerArguments()))
+            {
+                server.Start(methodName);
+                string connectionString = new SqlConnectionStringBuilder
                 {
-                    server.Start(methodName);
-                    Console.WriteLine(string.Format("Test: {0} Started Server", methodName));
-
-                    var connectionString = new SqlConnectionStringBuilder
-                    {
-                        DataSource = $"localhost,{server.EndPoint.Port}",
-                        Encrypt = SqlConnectionEncryptOption.Optional
-                    }.ConnectionString;
-
-                    sqlOperation(connectionString);
+                    DataSource = $"localhost,{server.EndPoint.Port}",
+                    Encrypt = SqlConnectionEncryptOption.Optional
+                }.ConnectionString;
 
-                    Console.WriteLine(string.Format("Test: {0} SqlOperation Successful", methodName));
+                sqlOperation(connectionString);
 
-                    Assert.True(statsLogged);
+                Assert.True(statsLogged, "Expected at least one diagnostic event");
+                observer.Disable();
 
-                    diagnosticListenerObserver.Disable();
-                    foreach (string expected in expectedDiagnostics)
-                    {
-                        Assert.True(diagnosticListenerObserver.HasReceivedDiagnostic(expected), $"Missing diagnostic '{expected}'");
-                    }
-
-                    Console.WriteLine(string.Format("Test: {0} Listeners Disabled", methodName));
+                foreach (string expected in expectedDiagnostics)
+                {
+                    Assert.True(observer.HasReceivedDiagnostic(expected), $"Missing diagnostic '{expected}'");
                 }
-                Console.WriteLine(string.Format("Test: {0} Server Disposed", methodName));
             }
-            Console.WriteLine(string.Format("Test: {0} Listeners Disposed Successfully", methodName));
         }
 
-        private static async Task CollectStatisticsDiagnosticsAsync(Func<string, Task> sqlOperation, string[] expectedDiagnostics, [CallerMemberName] string methodName = "")
+        private static async Task CollectStatisticsDiagnosticsAsync(
+            Func<string, Task> sqlOperation,
+            string[] expectedDiagnostics,
+            [CallerMemberName] string methodName = "")
         {
             bool statsLogged = false;
-            bool operationHasError = false;
-            Guid beginOperationId = Guid.Empty;
-
-            FakeDiagnosticListenerObserver diagnosticListenerObserver = new FakeDiagnosticListenerObserver(kvp =>
+            FakeDiagnosticListenerObserver observer = new(kvp =>
             {
-                IDictionary statistics;
-
-                if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteCommandBefore"))
-                {
-                    Assert.NotNull(kvp.Value);
-
-                    Guid retrievedOperationId = GetPropertyValueFromType<Guid>(kvp.Value, "OperationId");
-                    Assert.NotEqual(retrievedOperationId, Guid.Empty);
-
-                    SqlCommand sqlCommand = GetPropertyValueFromType<SqlCommand>(kvp.Value, "Command");
-                    Assert.NotNull(sqlCommand);
-
-                    string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                    Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                    beginOperationId = retrievedOperationId;
-
-                    statsLogged = true;
-                }
-                else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteCommandAfter"))
-                {
-                    Assert.NotNull(kvp.Value);
-
-                    Guid retrievedOperationId = GetPropertyValueFromType<Guid>(kvp.Value, "OperationId");
-                    Assert.NotEqual(retrievedOperationId, Guid.Empty);
-
-                    SqlCommand sqlCommand = GetPropertyValueFromType<SqlCommand>(kvp.Value, "Command");
-                    Assert.NotNull(sqlCommand);
-
-                    statistics = GetPropertyValueFromType<IDictionary>(kvp.Value, "Statistics");
-                    if (!operationHasError)
-                    {
-                        Assert.NotNull(statistics);
-                    }
-
-                    string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                    Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                    // if we get to this point, then statistics exist and this must be the "end" 
-                    // event, so we need to make sure the operation IDs match
-                    Assert.Equal(retrievedOperationId, beginOperationId);
-                    beginOperationId = Guid.Empty;
-
-                    statsLogged = true;
-                }
-                else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteCommandError"))
-                {
-                    operationHasError = true;
-                    Assert.NotNull(kvp.Value);
-
-                    SqlCommand sqlCommand = GetPropertyValueFromType<SqlCommand>(kvp.Value, "Command");
-                    Assert.NotNull(sqlCommand);
-
-                    Exception ex = GetPropertyValueFromType<Exception>(kvp.Value, "Exception");
-                    Assert.NotNull(ex);
-
-                    string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                    Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                    statsLogged = true;
-                }
-                else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionOpenBefore"))
-                {
-                    Assert.NotNull(kvp.Value);
-
-                    SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                    Assert.NotNull(sqlConnection);
-
-                    string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                    Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                    statsLogged = true;
-                }
-                else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionOpenAfter"))
-                {
-                    Assert.NotNull(kvp.Value);
-
-                    SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                    Assert.NotNull(sqlConnection);
-
-                    string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                    Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                    statistics = GetPropertyValueFromType<IDictionary>(kvp.Value, "Statistics");
-                    Assert.NotNull(statistics);
-
-                    Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                    if (sqlConnection.State == ConnectionState.Open)
-                    {
-                        Assert.NotEqual(connectionId, Guid.Empty);
-                    }
-
-                    statsLogged = true;
-                }
-                else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionOpenError"))
-                {
-                    Assert.NotNull(kvp.Value);
-
-                    SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                    Assert.NotNull(sqlConnection);
-
-                    string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                    Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                    Exception ex = GetPropertyValueFromType<Exception>(kvp.Value, "Exception");
-                    Assert.NotNull(ex);
+                ValidateDiagnosticPayload(kvp);
+                statsLogged = true;
+            });
 
-                    statsLogged = true;
-                }
-                else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionCloseBefore"))
+            observer.Enable();
+            using (DiagnosticListener.AllListeners.Subscribe(observer))
+            using (var server = new TdsServer(new DiagnosticsQueryEngine(), new TdsServerArguments()))
+            {
+                server.Start(methodName);
+                string connectionString = new SqlConnectionStringBuilder
                 {
-                    Assert.NotNull(kvp.Value);
+                    DataSource = $"localhost,{server.EndPoint.Port}",
+                    Encrypt = SqlConnectionEncryptOption.Optional
+                }.ConnectionString;
 
-                    SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                    Assert.NotNull(sqlConnection);
+                await sqlOperation(connectionString);
 
-                    string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                    Assert.False(string.IsNullOrWhiteSpace(operation));
+                Assert.True(statsLogged, "Expected at least one diagnostic event");
+                observer.Disable();
 
-                    Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                    Assert.NotEqual(connectionId, Guid.Empty);
-
-                    statsLogged = true;
-                }
-                else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionCloseAfter"))
+                foreach (string expected in expectedDiagnostics)
                 {
-                    Assert.NotNull(kvp.Value);
-
-                    SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                    Assert.NotNull(sqlConnection);
-
-                    string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                    Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                    statistics = GetPropertyValueFromType<IDictionary>(kvp.Value, "Statistics");
-
-                    Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                    Assert.NotEqual(connectionId, Guid.Empty);
-
-                    statsLogged = true;
+                    Assert.True(observer.HasReceivedDiagnostic(expected), $"Missing diagnostic '{expected}'");
                 }
-                else if (kvp.Key.Equals("Microsoft.Data.SqlClient.WriteConnectionCloseError"))
-                {
-                    Assert.NotNull(kvp.Value);
-
-                    SqlConnection sqlConnection = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
-                    Assert.NotNull(sqlConnection);
-
-                    string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
-                    Assert.False(string.IsNullOrWhiteSpace(operation));
-
-                    Exception ex = GetPropertyValueFromType<Exception>(kvp.Value, "Exception");
-                    Assert.NotNull(ex);
-
-                    Guid connectionId = GetPropertyValueFromType<Guid>(kvp.Value, "ConnectionId");
-                    Assert.NotEqual(connectionId, Guid.Empty);
+            }
+        }
 
-                    statsLogged = true;
-                }
-            });
+        private static void ValidateDiagnosticPayload(KeyValuePair<string, object> kvp)
+        {
+            Assert.NotNull(kvp.Value);
 
-            diagnosticListenerObserver.Enable();
-            using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver))
+            if (kvp.Key.Contains("Command"))
             {
-                Console.WriteLine(string.Format("Test: {0} Enabled Listeners", methodName));
-                using (var server = new TdsServer(new DiagnosticsQueryEngine(), new TdsServerArguments()))
-                {
-                    server.Start(methodName);
-                    Console.WriteLine(string.Format("Test: {0} Started Server", methodName));
-
-                    var connectionString = new SqlConnectionStringBuilder
-                    {
-                        DataSource = $"localhost,{server.EndPoint.Port}",
-                        Encrypt = SqlConnectionEncryptOption.Optional
-                    }.ConnectionString;
-                    await sqlOperation(connectionString);
-
-                    Console.WriteLine(string.Format("Test: {0} SqlOperation Successful", methodName));
-
-                    Assert.True(statsLogged);
-
-                    diagnosticListenerObserver.Disable();
-                    foreach (string expected in expectedDiagnostics)
-                    {
-                        Assert.True(diagnosticListenerObserver.HasReceivedDiagnostic(expected), $"Missing diagnostic '{expected}'");
-                    }
+                SqlCommand cmd = GetPropertyValueFromType<SqlCommand>(kvp.Value, "Command");
+                Assert.NotNull(cmd);
+            }
+            else if (kvp.Key.Contains("Connection"))
+            {
+                SqlConnection conn = GetPropertyValueFromType<SqlConnection>(kvp.Value, "Connection");
+                Assert.NotNull(conn);
+            }
 
-                    Console.WriteLine(string.Format("Test: {0} Listeners Disabled", methodName));
-                }
-                Console.WriteLine(string.Format("Test: {0} Server Disposed", methodName));
+            if (kvp.Key.Contains("Error"))
+            {
+                Exception ex = GetPropertyValueFromType<Exception>(kvp.Value, "Exception");
+                Assert.NotNull(ex);
             }
-            Console.WriteLine(string.Format("Test: {0} Listeners Disposed Successfully", methodName));
+
+            string operation = GetPropertyValueFromType<string>(kvp.Value, "Operation");
+            Assert.False(string.IsNullOrWhiteSpace(operation));
         }
 
         private static T GetPropertyValueFromType<T>(object obj, string propName)
         {
             Type type = obj.GetType();
             PropertyInfo pi = type.GetRuntimeProperty(propName);
-
-            var propertyValue = pi.GetValue(obj);
-            return (T)propertyValue;
+            return (T)pi.GetValue(obj);
         }
+
+        #endregion
     }
 
+    /// <summary>
+    /// Query engine that handles error queries (division by zero).
+    /// </summary>
     public class DiagnosticsQueryEngine : QueryEngine
     {
-        public DiagnosticsQueryEngine() : base(new TdsServerArguments())
-        {
-        }
+        public DiagnosticsQueryEngine() : base(new TdsServerArguments()) { }
 
         protected override TDSMessageCollection CreateQueryResponse(ITDSServerSession session, TDSSQLBatchToken batchRequest)
         {
             string lowerBatchText = batchRequest.Text.ToLowerInvariant();
-
-            if (lowerBatchText.Contains("1 / 0")) // SELECT 1/0 
+            if (lowerBatchText.Contains("1 / 0"))
             {
-                TDSErrorToken errorToken = new TDSErrorToken(8134, 1, 16, "Divide by zero error encountered.");
-                TDSDoneToken doneToken = new TDSDoneToken(TDSDoneTokenStatusType.Final | TDSDoneTokenStatusType.Count, TDSDoneTokenCommandType.Select, 1);
-                TDSMessage responseMessage = new TDSMessage(TDSMessageType.Response, errorToken, doneToken);
+                TDSErrorToken errorToken = new(8134, 1, 16, "Divide by zero error encountered.");
+                TDSDoneToken doneToken = new(TDSDoneTokenStatusType.Final | TDSDoneTokenStatusType.Count, TDSDoneTokenCommandType.Select, 1);
+                TDSMessage responseMessage = new(TDSMessageType.Response, errorToken, doneToken);
                 return new TDSMessageCollection(responseMessage);
             }
-            else
-            {
-                return base.CreateQueryResponse(session, batchRequest);
-            }
+            return base.CreateQueryResponse(session, batchRequest);
         }
     }
 }

From 49db91a7d028e73258f2d9b5eac0297ac936e65e Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 26 Mar 2026 14:11:12 -0700
Subject: [PATCH 012/298] Add type forwards to public Abstractions types
 (#4067)

---
 .../ref/Microsoft.Data.SqlClient.csproj       |  3 ++
 .../src/Microsoft.Data.SqlClient.csproj       |  3 ++
 .../netfx/ref/Microsoft.Data.SqlClient.csproj |  3 ++
 .../netfx/src/Microsoft.Data.SqlClient.csproj |  3 ++
 .../src/TypeForwards.Abstractions.cs          |  9 +++++
 .../tests/UnitTests/TypeForwardTests.cs       | 34 +++++++++++++++++++
 6 files changed, 55 insertions(+)
 create mode 100644 src/Microsoft.Data.SqlClient/src/TypeForwards.Abstractions.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/TypeForwardTests.cs

diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
index f3d5bdc844..3215e42068 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
@@ -31,6 +31,9 @@
     <Compile Include="../../ref/Microsoft.Data.SqlClient.Diagnostics.cs" />
     <Compile Include="../../ref/Microsoft.Data.SqlClient.Server.cs" />
     <Compile Include="../../ref/Microsoft.Data.SqlTypes.cs" />
+    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
+      <Link>TypeForwards.Abstractions.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <!-- References -->
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
index 6c54000f9c..7145dbac28 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -1023,6 +1023,9 @@
     <Compile Include="$(CommonSourceRoot)TypeForwards.netcore.cs">
       <Link>TypeForwards.netcore.cs</Link>
     </Compile>
+    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
+      <Link>TypeForwards.Abstractions.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <!-- Resource Files ================================================== -->
diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
index 208181ffb6..93fc5a5375 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
@@ -26,6 +26,9 @@
     <Compile Include="../../ref/Microsoft.Data.SqlClient.Diagnostics.cs" />
     <Compile Include="../../ref/Microsoft.Data.SqlClient.Server.cs" />
     <Compile Include="../../ref/Microsoft.Data.SqlTypes.cs" />
+    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
+      <Link>TypeForwards.Abstractions.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <!-- References -->
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index 05a4284565..8408dabc0d 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -1006,6 +1006,9 @@
     <Compile Include="$(CommonSourceRoot)System\Runtime\CompilerServices\IsExternalInit.netfx.cs">
       <Link>System\Runtime\CompilerServices\IsExternalInit.netfx.cs</Link>
     </Compile>
+    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
+      <Link>TypeForwards.Abstractions.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <!-- Resource Files ================================================== -->
diff --git a/src/Microsoft.Data.SqlClient/src/TypeForwards.Abstractions.cs b/src/Microsoft.Data.SqlClient/src/TypeForwards.Abstractions.cs
new file mode 100644
index 0000000000..f8272c5d2b
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/TypeForwards.Abstractions.cs
@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Data.SqlClient.SqlAuthenticationMethod))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Data.SqlClient.SqlAuthenticationParameters))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Data.SqlClient.SqlAuthenticationProvider))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Data.SqlClient.SqlAuthenticationProviderException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Data.SqlClient.SqlAuthenticationToken))]
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/TypeForwardTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/TypeForwardTests.cs
new file mode 100644
index 0000000000..8cb9811933
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/TypeForwardTests.cs
@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Reflection;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests
+{
+    public class TypeForwardTests
+    {
+        private static readonly Assembly s_sqlClientAssembly = typeof(SqlConnection).Assembly;
+
+        [Theory]
+        [InlineData("Microsoft.Data.SqlClient.SqlAuthenticationMethod", true)]
+        [InlineData("Microsoft.Data.SqlClient.SqlAuthenticationParameters", false)]
+        [InlineData("Microsoft.Data.SqlClient.SqlAuthenticationProvider", false)]
+        [InlineData("Microsoft.Data.SqlClient.SqlAuthenticationProviderException", false)]
+        [InlineData("Microsoft.Data.SqlClient.SqlAuthenticationToken", false)]
+        public void AbstractionsType_CanBeLoadedFromSqlClientAssembly(string typeName, bool isEnum)
+        {
+            // Types moved to the Abstractions assembly must remain loadable via the
+            // Microsoft.Data.SqlClient assembly for backward compatibility.
+            Type? type = s_sqlClientAssembly.GetType(typeName, throwOnError: true);
+
+            Assert.NotNull(type);
+            Assert.Equal(isEnum, type.IsEnum);
+
+            // Assert that the assembly containing the type is the Abstractions assembly.
+            Assert.Equal("Microsoft.Data.SqlClient.Extensions.Abstractions", type.Assembly.GetName().Name);
+        }
+    }
+}

From ccdd846a99f4ec33e39d0de089712ea570de7ed2 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 27 Mar 2026 17:24:12 -0300
Subject: [PATCH 013/298] Create stress test pipeline (#3867)

* Task 40503: Create stress test pipeline

- Added initial placeholder pipeline entry point file.
- Wired up the new top-level stress test pipeline to the existing stages/jobs.
- Using human friendly triggering pipeline names.
- Removed PR pipeline as upstream trigger.
- When triggered manually, we must choose one of the upstream pipelines to use for artifact download.
- Temporarily added PR-SqlClient-Package to help with PR-based testing.
- Sorted template parameters alphabetically.
- Added debugging for artifact details.

* Changed the pipeline to expect project-references to SqlClient projects.

* Moved stress test pipeline files into a stress/ directory.

* Fixed expansion errors.

* Addressed Copilot feedback.

* Addressed my own comments.
---
 eng/pipelines/dotnet-sqlclient-ci-core.yml    |  18 --
 ...qlclient-ci-package-reference-pipeline.yml |   7 -
 ...qlclient-ci-project-reference-pipeline.yml |   7 -
 .../jobs/pack-abstractions-package-ci-job.yml |   4 +-
 .../jobs/pack-azure-package-ci-job.yml        |   4 +-
 eng/pipelines/jobs/stress-tests-ci-job.yml    | 194 -----------------
 .../jobs/test-abstractions-package-ci-job.yml |   6 +-
 .../jobs/test-azure-package-ci-job.yml        |   6 +-
 .../sqlclient-pr-package-ref-pipeline.yml     |   8 +-
 .../sqlclient-pr-project-ref-pipeline.yml     |   8 +-
 .../stages/stress-tests-ci-stage.yml          | 205 ------------------
 eng/pipelines/stress-tests-pipeline.yml       |  81 -------
 eng/pipelines/stress/stress-tests-job.yml     | 180 +++++++++++++++
 .../stress/stress-tests-pipeline.yml          | 101 +++++++++
 eng/pipelines/stress/stress-tests-stage.yml   | 130 +++++++++++
 .../tests/StressTests/Readme.md               |  94 +++-----
 .../tests/StressTests/StressTests.slnx        |   7 -
 17 files changed, 449 insertions(+), 611 deletions(-)
 delete mode 100644 eng/pipelines/jobs/stress-tests-ci-job.yml
 delete mode 100644 eng/pipelines/stages/stress-tests-ci-stage.yml
 delete mode 100644 eng/pipelines/stress-tests-pipeline.yml
 create mode 100644 eng/pipelines/stress/stress-tests-job.yml
 create mode 100644 eng/pipelines/stress/stress-tests-pipeline.yml
 create mode 100644 eng/pipelines/stress/stress-tests-stage.yml
 delete mode 100644 src/Microsoft.Data.SqlClient/tests/StressTests/StressTests.slnx

diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index e4d6d70a7f..d39c590efc 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -78,11 +78,6 @@ parameters:
     type: string
     default: $(ci_var_defaultPoolName)
 
-  # True to add a Stress Test stage to the pipeline.
-  - name: enableStressTests
-    type: boolean
-    default: false
-
   # The timeout, in minutes, for each test job.
   - name: testJobTimeout
     type: number
@@ -218,19 +213,6 @@ stages:
       loggingArtifactsName: $(loggingArtifactsName)
       mdsArtifactsName: $(mdsArtifactsName)
 
-  # Run the stress tests, if desired.
-  - ${{ if eq(parameters.enableStressTests, true) }}:
-      - template: /eng/pipelines/stages/stress-tests-ci-stage.yml@self
-        parameters:
-          buildConfiguration: ${{ parameters.buildConfiguration }}
-          additionalDependsOn:
-            - build_sqlclient_package_stage
-            - build_azure_package_stage
-          mdsArtifactsName: $(mdsArtifactsName)
-          mdsPackageVersion: $(mdsPackageVersion)
-          azurePackageVersion: $(azurePackageVersion)
-          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-
   # Run the MDS and AKV tests.
   - template: /eng/pipelines/common/templates/stages/ci-run-tests-stage.yml@self
     parameters:
diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
index 262c2b909a..d38fb14d57 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
@@ -103,12 +103,6 @@ parameters:
     type: boolean
     default: false
 
-  # True to run the stress tests stage.
-  - name: enableStressTests
-    displayName: Enable Stress Tests
-    type: boolean
-    default: false
-
   # The target frameworks to build and run tests for on Windows.
   #
   # These are _not_ the target frameworks to build the driver packages for.
@@ -173,7 +167,6 @@ extends:
     referenceType: Package
     debug: ${{ parameters.debug }}
     dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-    enableStressTests: ${{ parameters.enableStressTests }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
     targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
     testJobTimeout: ${{ parameters.testJobTimeout }}
diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
index a5a78f0f8b..7fef476e59 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
@@ -103,12 +103,6 @@ parameters:
     type: boolean
     default: false
 
-  # True to run the stress tests stage.
-  - name: enableStressTests
-    displayName: Enable Stress Tests
-    type: boolean
-    default: false
-
   # The target frameworks to build and run tests for on Windows.
   #
   # These are _not_ the target frameworks to build the driver packages for.
@@ -173,7 +167,6 @@ extends:
     referenceType: Project
     debug: ${{ parameters.debug }}
     dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-    enableStressTests: ${{ parameters.enableStressTests }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
     targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
     testJobTimeout: ${{ parameters.testJobTimeout }}
diff --git a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
index 9db1c05696..aed7672618 100644
--- a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
@@ -78,9 +78,7 @@ jobs:
       # Explicitly unset the $PLATFORM environment variable that is set by the
       # 'ADO Build properties' Library in the ADO SqlClientDrivers public project.
       # This is defined with a non-standard Platform of 'AnyCPU', and will fail
-      # the builds if left defined.  The stress tests solution does not require
-      # any specific Platform, and so its solution file doesn't support any
-      # non-standard platforms.
+      # the builds if left defined.
       #
       # Note that Azure Pipelines will inject this variable as PLATFORM into the
       # environment of all tasks in this job.
diff --git a/eng/pipelines/jobs/pack-azure-package-ci-job.yml b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
index 95853d43e0..3b03dc0adc 100644
--- a/eng/pipelines/jobs/pack-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
@@ -107,9 +107,7 @@ jobs:
       # Explicitly unset the $PLATFORM environment variable that is set by the
       # 'ADO Build properties' Library in the ADO SqlClientDrivers public
       # project.  This is defined with a non-standard Platform of 'AnyCPU', and
-      # will fail the builds if left defined.  The stress tests solution does
-      # not require any specific Platform, and so its solution file doesn't
-      # support any non-standard platforms.
+      # will fail the builds if left defined.
       #
       # Note that Azure Pipelines will inject this variable as PLATFORM into the
       # environment of all tasks in this job.
diff --git a/eng/pipelines/jobs/stress-tests-ci-job.yml b/eng/pipelines/jobs/stress-tests-ci-job.yml
deleted file mode 100644
index 7477295f54..0000000000
--- a/eng/pipelines/jobs/stress-tests-ci-job.yml
+++ /dev/null
@@ -1,194 +0,0 @@
-################################################################################
-# Licensed to the .NET Foundation under one or more agreements.  The .NET
-# Foundation licenses this file to you under the MIT license.  See the LICENSE
-# file in the project root for more information.
-################################################################################
-
-# This job builds and runs stress tests against an MDS NuGet package available
-# as a pipeline artifact.
-#
-# The stress tests are located here:
-#
-#   src/Microsoft.Data.SqlClient/tests/StressTests
-#
-# This template defines a job named 'run_stress_tests_job_<suffix>' that can be
-# depended on by downstream jobs.
-
-parameters:
-  # The suffix to append to the job name.
-  - name: jobNameSuffix
-    type: string
-    default: ''
-
-  # The prefix to prepend to the job's display name:
-  #
-  #   [<prefix>] Run Stress Tests
-  #
-  - name: displayNamePrefix
-    type: string
-    default: ''
-
-  # The name of the Azure Pipelines pool to use.
-  - name: poolName
-    type: string
-    default: ''
-
-  # The pool VM image to use.
-  - name: vmImage
-    type: string
-    default: ''
-
-  # The pipeline step to run to configure SQL Server.
-  - name: sqlSetupStep
-    type: step
-
-  # The name of the MDS pipeline artifacts to download.
-  - name: mdsArtifactsName
-    type: string
-    default: ''
-
-  # The solution file to restore/build.
-  - name: solution
-    type: string
-    default: ''
-
-  # The test project to run.
-  - name: testProject
-    type: string
-    default: ''
-
-  # dotnet CLI arguments for the restore step.
-  - name: restoreArguments
-    type: string
-    default: ''
-
-  # dotnet CLI arguments for the build and run steps.
-  - name: buildArguments
-    type: string
-    default: ''
-
-  # The list of .NET runtimes to test against.
-  - name: netTestRuntimes
-    type: object
-    default: []
-
-  # The list of .NET Framework runtimes to test against.
-  - name: netFrameworkTestRuntimes
-    type: object
-    default: []
-
-  # The stress test config file contents to write to the config file.
-  - name: configContent
-    type: string
-    default: ''
-
-jobs:
-- job: run_stress_tests_job_${{ parameters.jobNameSuffix }}
-  displayName: '[${{ parameters.displayNamePrefix }}] Run Stress Tests'
-  pool:
-    name: ${{ parameters.poolName }}
-    ${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
-      vmImage: ${{ parameters.vmImage }}
-    ${{ else }}:
-      demands:
-        - imageOverride -equals ${{ parameters.vmImage }}
-
-  variables:
-    # Stress test command-line arguments.
-    - name: testArguments
-      value: -a SqlClient.Stress.Tests -console
-
-    # Explicitly unset the $PLATFORM environment variable that is set by the
-    # 'ADO Build properties' Library in the ADO SqlClientDrivers public project.
-    # This is defined with a non-standard Platform of 'AnyCPU', and will fail
-    # the builds if left defined.  The stress tests solution does not require
-    # any specific Platform, and so its solution file doesn't support any
-    # non-standard platforms.
-    #
-    # Note that Azure Pipelines will inject this variable as PLATFORM into the
-    # environment of all tasks in this job.
-    #
-    # See:
-    #   https://learn.microsoft.com/en-us/azure/devops/pipelines/process/variables?view=azure-devops&tabs=yaml%2Cbatch
-    #
-    - name: Platform
-      value: ''
-
-    # Do the same for $CONFIGURATION since we explicitly set it using our
-    # 'buildConfiguration' parameter, and we don't want the environment to
-    # override us.
-    - name: Configuration
-      value: ''
-
-  steps:
-
-  # Install the .NET SDK and Runtimes.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
-    parameters:
-      runtimes: [8.x, 9.x]
-
-  # Download the pipeline artifact that contains the MDS package to test.
-  - task: DownloadPipelineArtifact@2
-    displayName: Download MDS Artifacts
-    inputs:
-      artifactName: ${{ parameters.mdsArtifactsName }}
-      targetPath: $(Build.SourcesDirectory)/packages
-
-  # Setup the local SQL Server.
-  - ${{ parameters.sqlSetupStep }}
-
-  # We use the 'custom' command because the DotNetCoreCLI@2 task doesn't support
-  # all of our argument combinations for the different build steps.
-
-  # Restore the solution.
-  - task: DotNetCoreCLI@2
-    displayName: Restore Solution
-    inputs:
-      command: custom
-      custom: restore
-      projects: ${{ parameters.solution }}
-      arguments: ${{ parameters.restoreArguments }}
-
-  # Build the solution.
-  - task: DotNetCoreCLI@2
-    displayName: Build Solution
-    inputs:
-      command: custom
-      custom: build
-      projects: ${{ parameters.solution }}
-      arguments: ${{ parameters.buildArguments }} --no-restore
-
-  # Write the config file.
-  - task: PowerShell@2
-    displayName: Write Config File
-    inputs:
-      pwsh: true
-      targetType: inline
-      script: |
-        # Capture the multi-line JSON content into a variable.
-        $content = @"
-        ${{ parameters.configContent }}
-        "@
-
-        # Write the JSON content to the config file.
-        $content | Out-File -FilePath "config.json"
-
-  # Run the stress tests for each .NET runtime.
-  - ${{ each runtime in parameters.netTestRuntimes }}:
-    - task: DotNetCoreCLI@2
-      displayName: Test [${{runtime}}]
-      inputs:
-        command: custom
-        custom: run
-        projects: ${{ parameters.testProject }}
-        arguments: ${{ parameters.buildArguments }} --no-build -f ${{runtime}} -e STRESS_CONFIG_FILE=config.json -- $(testArguments)
-
-  # Run the stress tests for each .NET Framework runtime.
-  - ${{ each runtime in parameters.netFrameworkTestRuntimes }}:
-    - task: DotNetCoreCLI@2
-      displayName: Test [${{runtime}}]
-      inputs:
-        command: custom
-        custom: run
-        projects: ${{ parameters.testProject }}
-        arguments: ${{ parameters.buildArguments }} --no-build -f ${{runtime}} -e STRESS_CONFIG_FILE=config.json -- $(testArguments)
diff --git a/eng/pipelines/jobs/test-abstractions-package-ci-job.yml b/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
index 9d205b5108..a88d4dc347 100644
--- a/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
@@ -27,7 +27,7 @@ parameters:
 
   # The prefix to prepend to the job's display name:
   #
-  #   [<prefix>] Run Stress Tests
+  #   [<prefix>] Test Abstractions Package
   #
   - name: displayNamePrefix
     type: string
@@ -97,9 +97,7 @@ jobs:
       # Explicitly unset the $PLATFORM environment variable that is set by the
       # 'ADO Build properties' Library in the ADO SqlClientDrivers public project.
       # This is defined with a non-standard Platform of 'AnyCPU', and will fail
-      # the builds if left defined.  The stress tests solution does not require
-      # any specific Platform, and so its solution file doesn't support any
-      # non-standard platforms.
+      # the builds if left defined.
       #
       # Note that Azure Pipelines will inject this variable as PLATFORM into the
       # environment of all tasks in this job.
diff --git a/eng/pipelines/jobs/test-azure-package-ci-job.yml b/eng/pipelines/jobs/test-azure-package-ci-job.yml
index 53ca26366f..5e5dffe381 100644
--- a/eng/pipelines/jobs/test-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-azure-package-ci-job.yml
@@ -46,7 +46,7 @@ parameters:
 
   # The prefix to prepend to the job's display name:
   #
-  #   [<prefix>] Run Stress Tests
+  #   [<prefix>] Test Azure Package
   #
   - name: displayNamePrefix
     type: string
@@ -158,9 +158,7 @@ jobs:
       # Explicitly unset the $PLATFORM environment variable that is set by the
       # 'ADO Build properties' Library in the ADO SqlClientDrivers public
       # project.  This is defined with a non-standard Platform of 'AnyCPU', and
-      # will fail the builds if left defined.  The stress tests solution does
-      # not require any specific Platform, and so its solution file doesn't
-      # support any non-standard platforms.
+      # will fail the builds if left defined.
       #
       # Note that Azure Pipelines will inject this variable as PLATFORM into the
       # environment of all tasks in this job.
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index 440d7afa27..c454da710a 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -51,6 +51,7 @@ pr:
       - NuGet.config
     exclude:
       - eng/pipelines/onebranch/*
+      - eng/pipelines/stress/*
 
 # Do not trigger commit or schedule runs for this pipeline.
 trigger: none
@@ -78,12 +79,6 @@ parameters:
     type: boolean
     default: false
 
-  # True to run the stress tests stage.
-  - name: enableStressTests
-    displayName: Enable Stress Tests
-    type: boolean
-    default: false
-
   # The target frameworks to build and run tests for on Windows.
   #
   # These are _not_ the target frameworks to build the driver packages for.
@@ -133,7 +128,6 @@ extends:
     buildPlatforms: ${{ parameters.buildPlatforms }}
     referenceType: Package
     debug: ${{ parameters.debug }}
-    enableStressTests: ${{ parameters.enableStressTests }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
     targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
     testJobTimeout: ${{ parameters.testJobTimeout }}
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index d3ae773181..539d03fe82 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -51,6 +51,7 @@ pr:
       - NuGet.config
     exclude:
       - eng/pipelines/onebranch/*
+      - eng/pipelines/stress/*
 
 # Do not trigger commit or schedule runs for this pipeline.
 trigger: none
@@ -78,12 +79,6 @@ parameters:
     type: boolean
     default: false
 
-  # True to run the stress tests stage.
-  - name: enableStressTests
-    displayName: Enable Stress Tests
-    type: boolean
-    default: false
-
   # The target frameworks to build and run tests for on Windows.
   #
   # These are _not_ the target frameworks to build the driver packages for.
@@ -133,7 +128,6 @@ extends:
     buildPlatforms: ${{ parameters.buildPlatforms }}
     referenceType: Project
     debug: ${{ parameters.debug }}
-    enableStressTests: ${{ parameters.enableStressTests }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
     targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
     testJobTimeout: ${{ parameters.testJobTimeout }}
diff --git a/eng/pipelines/stages/stress-tests-ci-stage.yml b/eng/pipelines/stages/stress-tests-ci-stage.yml
deleted file mode 100644
index 978105d580..0000000000
--- a/eng/pipelines/stages/stress-tests-ci-stage.yml
+++ /dev/null
@@ -1,205 +0,0 @@
-################################################################################
-# Licensed to the .NET Foundation under one or more agreements.  The .NET
-# Foundation licenses this file to you under the MIT license.  See the LICENSE
-# file in the project root for more information.
-################################################################################
-
-# This stage builds and runs stress tests against an MDS NuGet package available
-# as a pipeline artifact.
-#
-# The stress tests are located here:
-#
-#   src/Microsoft.Data.SqlClient/tests/StressTests
-#
-# All tests use a localhost SQL Server configured for SQL auth via the 'sa' user
-# and the provided password.
-#
-# This stage depends on the secrets_stage.
-#
-# This template defines a stage named 'run_stress_tests_stage' that can be
-# depended on by downstream stages.
-
-parameters:
-
-  # The names of any additional stages this stage depends on, for example the stages that publish
-  # the MDS package artifacts we will test.
-  - name: additionalDependsOn
-    type: object
-    default: []
-
-  # The Azure package version to stress test.  This version must be available in
-  # one of the configured NuGet sources.
-  - name: azurePackageVersion
-    displayName: Azure Package Version
-    type: string
-
-  # The type of build to produce (Debug or Release)
-  - name: buildConfiguration
-    type: string
-    default: Debug
-    values:
-      - Debug
-      - Release
-
-  # The verbosity level for the dotnet CLI commands.
-  - name: dotnetVerbosity
-    type: string
-    default: normal
-    values:
-    - quiet
-    - minimal
-    - normal
-    - detailed
-    - diagnostic
-
-  # The name of the MDS pipeline artifacts to download.
-  - name: mdsArtifactsName
-    type: string
-    default: MDS.Artifacts
-
-  # The MDS package version found in the pipeline artifacts we will download.
-  - name: mdsPackageVersion
-    type: string
-
-  # The list of .NET Framework runtimes to test against.
-  - name: netFrameworkTestRuntimes
-    type: object
-    default: [net462]
-
-  # The list of .NET runtimes to test against.
-  - name: netTestRuntimes
-    type: object
-    default: [net8.0, net9.0, net10.0]
-
-stages:
-  - stage: run_stress_tests_stage
-    displayName: Run Stress Tests
-    dependsOn:
-      - secrets_stage
-      - ${{ each dep in parameters.additionalDependsOn }}:
-        - ${{ dep }}
-
-    variables:
-      # The directory where dotnet artifacts will be staged.  Not to be
-      # confused with pipeline artifact.
-      - name: dotnetArtifactsDir
-        value: $(Build.StagingDirectory)/dotnetArtifacts
-
-      # The solution file to use for all dotnet CLI commands.
-      - name: solution
-        value: src/Microsoft.Data.SqlClient/tests/StressTests/StressTests.slnx
-
-      # The stress test project to run.
-      - name: testProject
-        value: src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
-
-      # dotnet CLI arguments common to all commands.
-      - name: commonArguments
-        value: >-
-          --verbosity ${{parameters.dotnetVerbosity}}
-          --artifacts-path $(dotnetArtifactsDir)
-          -p:MdsPackageVersion=${{parameters.mdsPackageVersion}}
-          -p:AzurePackageVersion=${{parameters.azurePackageVersion}}
-
-      # dotnet CLI arguments for build/run commands.
-      - name: buildArguments
-        value: >-
-          $(commonArguments)
-          --configuration ${{parameters.buildConfiguration}}
-
-      # Bring the SA password from the secrets_stage into scope here.
-      - name: saPassword
-        value: $[stageDependencies.secrets_stage.secrets_job.outputs['SaPassword.Value']]
-
-      # The contents of the config file to use for all tests.  We will write
-      # this to a JSON file for each test job, and then point to it via the
-      # STRESS_CONFIG_FILE environment variable.
-      - name: ConfigContent
-        value: |
-          [
-            {
-              "name": "Azure SQL",
-              "type": "SqlServer",
-              "isDefault": true,
-              "dataSource": "localhost",
-              "user": "sa",
-              "password": "$(saPassword)",
-              "supportsWindowsAuthentication": false,
-              "isLocal": false,
-              "disableMultiSubnetFailover": true,
-              "disableNamedPipes": true,
-              "encrypt": false
-            }
-          ]
-
-    jobs:
-
-    # --------------------------------------------------------------------------
-    # Build and test on Linux.
-
-    - template: /eng/pipelines/jobs/stress-tests-ci-job.yml@self
-      parameters:
-        jobNameSuffix: linux
-        displayNamePrefix: Linux
-        poolName: $(ci_var_defaultPoolName)
-        vmImage: ADO-UB22-SQL22
-        sqlSetupStep:
-          template: /eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml@self
-          parameters:
-            saPassword: $(saPassword)
-        mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-        solution: $(solution)
-        testProject: $(testProject)
-        restoreArguments: $(commonArguments)
-        buildArguments: $(buildArguments)
-        netTestRuntimes: ${{ parameters.netTestRuntimes }}
-        configContent: $(ConfigContent)
-
-    # --------------------------------------------------------------------------
-    # Build and test on Windows
-
-    - template: /eng/pipelines/jobs/stress-tests-ci-job.yml@self
-      parameters:
-        jobNameSuffix: windows
-        displayNamePrefix: Win
-        poolName: $(ci_var_defaultPoolName)
-        # The Windows images include a suitable .NET Framework runtime, so we
-        # don't have to install one explicitly.
-        vmImage: ADO-MMS22-SQL22
-        sqlSetupStep:
-          template: /eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml@self
-          parameters:
-            saPassword: $(saPassword)
-        mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-        solution: $(solution)
-        testProject: $(testProject)
-        restoreArguments: $(commonArguments)
-        buildArguments: $(buildArguments)
-        netTestRuntimes: ${{ parameters.netTestRuntimes }}
-        # Note that we include the .NET Framework runtimes for test runs on
-        # Windows.
-        netFrameworkTestRuntimes: ${{ parameters.netFrameworkTestRuntimes }}
-        configContent: $(ConfigContent)
-
-    # --------------------------------------------------------------------------
-    # Build and test on macOS.
-
-    - template: /eng/pipelines/jobs/stress-tests-ci-job.yml@self
-      parameters:
-        jobNameSuffix: macos
-        displayNamePrefix: macOS
-        # We don't have any 1ES Hosted Pool images for macOS, so we use a
-        # generic one from Azure Pipelines.
-        poolName: Azure Pipelines
-        vmImage: macos-latest
-        sqlSetupStep:
-          template: /eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml@self
-          parameters:
-            saPassword: $(saPassword)
-        mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-        solution: $(solution)
-        testProject: $(testProject)
-        restoreArguments: $(commonArguments)
-        buildArguments: $(buildArguments)
-        netTestRuntimes: ${{ parameters.netTestRuntimes }}
-        configContent: $(ConfigContent)
diff --git a/eng/pipelines/stress-tests-pipeline.yml b/eng/pipelines/stress-tests-pipeline.yml
deleted file mode 100644
index e08f255e5a..0000000000
--- a/eng/pipelines/stress-tests-pipeline.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# This pipeline runs the stress test suite using the most recent artifacts from
-# the CI-SqlClient-Package pipeline.
-#
-# It runs after every successful run of the following pipelines:
-#
-# Public project:
-#   - PR-SqlClient-Package
-#   - CI-SqlClient-Package
-#
-# ADO.net project:
-#   - MDS Main CI-Package
-#
-# This pipeline definition is mapped to the Stress-SqlClient pipelines:
-#
-# Public project:
-#
-#   TODO
-#
-# ADO.net project:
-#
-#   TODO
-
-# Set the pipeline run name to the day-of-year and the daily run counter.
-name: $(DayOfYear)$(Rev:rr)
-
-# Do not trigger this pipeline for PRs, commits, or schedules.
-pr: none
-trigger: none
-
-# Trigger this pipeline after successful runs of each of the following pipelines.
-resources:
-  pipelines:
-    # The PR-SqlClient-Package pipeline in the Public project.
-    - pipeline: upstreamPipeline1
-      project: Public
-      source: /ADO/PR-SqlClient-Package
-      trigger: true
-    # The CI-SqlClient-Package pipeline in the Public project.
-    - pipeline: upstreamPipeline2
-      project: Public
-      source: /ADO/CI-SqlClient-Package
-      trigger: true
-    # The MDS Main CI-Package pipeline in the ADO.net project.
-    - pipeline: upstreamPipeline3
-      project: ADO.net
-      source: /Internal CI/MDS Main CI-Package
-      trigger: true
-
-# Pipeline parameters, visible in the Azure DevOps UI.
-parameters:
-
-  # The build configuration to use; defaults to Release.
-  - name: buildConfiguration
-    displayName: Build Configuration
-    type: string
-    default: Release
-    values:
-      - Debug
-      - Release
-
-  # True to emit debug information and steps.
-  - name: debug
-    displayName: Enable debug output
-    type: boolean
-    default: false
-
-stages:
-- stage: Placeholder
-  displayName: Placeholder Stage
-  jobs:
-  - job: PlaceholderJob
-    displayName: Placeholder Job
-    steps:
-    - script: echo "This is a placeholder stage."
-      displayName: Placeholder Step
diff --git a/eng/pipelines/stress/stress-tests-job.yml b/eng/pipelines/stress/stress-tests-job.yml
new file mode 100644
index 0000000000..40cecf6e93
--- /dev/null
+++ b/eng/pipelines/stress/stress-tests-job.yml
@@ -0,0 +1,180 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# This job builds and runs stress tests by compiling the SqlClient projects transitively.
+#
+# The stress tests are located here:
+#
+#   src/Microsoft.Data.SqlClient/tests/StressTests
+#
+# This template defines a job named 'stress_tests_job_<suffix>' that can be depended on by
+# downstream jobs.
+
+parameters:
+
+  # The type of build to produce (Debug or Release)
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # True to enable debugging steps.
+  - name: debug
+    type: boolean
+    default: false
+
+  # The prefix to prepend to the job's display name:
+  #
+  #   [<prefix>] Run Stress Tests
+  #
+  - name: displayNamePrefix
+    type: string
+
+  # The verbosity level for the dotnet CLI commands.
+  - name: dotnetVerbosity
+    type: string
+    default: normal
+    values:
+    - quiet
+    - minimal
+    - normal
+    - detailed
+    - diagnostic
+
+  # The suffix to append to the job name.
+  - name: jobNameSuffix
+    type: string
+
+  # The list of .NET Framework runtimes to test against.
+  - name: netFrameworkTestRuntimes
+    type: object
+    default: []
+
+  # The list of .NET runtimes to test against.
+  - name: netTestRuntimes
+    type: object
+    default: []
+
+  # The name of the Azure Pipelines pool to use.
+  - name: poolName
+    type: string
+
+  # The local SQL Server instance's 'sa' password, for use in the config file.
+  - name: saPassword
+    type: string
+
+  # The step to run to configure SQL Server.  This should configure a local SQL Server instance with
+  # an 'sa' login using the same password provided by the saPassword parameter.
+  - name: sqlSetupStep
+    type: step
+
+  # The pool VM image to use.
+  - name: vmImage
+    type: string
+
+jobs:
+  - job: stress_tests_job_${{ parameters.jobNameSuffix }}
+    displayName: '[${{ parameters.displayNamePrefix }}] Run Stress Tests'
+    pool:
+      name: ${{ parameters.poolName }}
+      ${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
+        vmImage: ${{ parameters.vmImage }}
+      ${{ else }}:
+        demands:
+          - imageOverride -equals ${{ parameters.vmImage }}
+
+    variables:
+
+      # The directory where dotnet artifacts will be staged.  Not to be
+      # confused with pipeline artifacts.
+      - name: dotnetArtifactsDir
+        value: $(Build.StagingDirectory)/dotnetArtifacts
+
+      # The top-level project file to build and run.
+      - name: project
+        value: $(Build.SourcesDirectory)/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
+
+      # dotnet CLI arguments.
+      - name: dotnetArguments
+        value: >-
+          --verbosity ${{ parameters.dotnetVerbosity }}
+          --artifacts-path $(dotnetArtifactsDir)
+          --configuration ${{ parameters.buildConfiguration }}
+
+      # The contents of the config file to use for all tests.  We will write this to a JSON file and
+      # then point to it via the STRESS_CONFIG_FILE environment variable.
+      - name: configContent
+        value: |
+          [
+            {
+              "name": "Azure SQL",
+              "type": "SqlServer",
+              "isDefault": true,
+              "dataSource": "localhost",
+              "user": "sa",
+              "password": "${{ parameters.saPassword }}",
+              "supportsWindowsAuthentication": false,
+              "isLocal": false,
+              "disableMultiSubnetFailover": true,
+              "disableNamedPipes": true,
+              "encrypt": false
+            }
+          ]
+
+      # Stress test command-line arguments.
+      - name: testArguments
+        value: -a SqlClient.Stress.Tests -console
+
+    steps:
+
+      # Install the .NET SDK and Runtimes.
+      - template: /eng/pipelines/steps/install-dotnet.yml@self
+        parameters:
+          runtimes: [8.x, 9.x]
+
+      # Setup the local SQL Server.
+      - ${{ parameters.sqlSetupStep }}
+
+      # Write the config file.
+      - task: PowerShell@2
+        displayName: Write Config File
+        inputs:
+          pwsh: true
+          targetType: inline
+          script: |
+            # Capture the multi-line JSON content into a variable.
+            $content = @"
+            $(configContent)
+            "@
+
+            # Write the JSON content to the config file.
+            $content | Out-File -FilePath "config.json"
+
+      # Build the project.
+      - task: DotNetCoreCLI@2
+        displayName: Build Project
+        inputs:
+          command: build
+          projects: $(project)
+          arguments: $(dotnetArguments)
+
+      # Run the stress tests for each .NET runtime.
+      - ${{ each runtime in parameters.netTestRuntimes }}:
+        - task: DotNetCoreCLI@2
+          displayName: Test [${{ runtime }}]
+          inputs:
+            command: run
+            projects: $(project)
+            arguments: $(dotnetArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.json -- $(testArguments)
+
+      # Run the stress tests for each .NET Framework runtime.
+      - ${{ each runtime in parameters.netFrameworkTestRuntimes }}:
+        - task: DotNetCoreCLI@2
+          displayName: Test [${{ runtime }}]
+          inputs:
+            command: run
+            projects: $(project)
+            arguments: $(dotnetArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.json -- $(testArguments)
diff --git a/eng/pipelines/stress/stress-tests-pipeline.yml b/eng/pipelines/stress/stress-tests-pipeline.yml
new file mode 100644
index 0000000000..cec68912fb
--- /dev/null
+++ b/eng/pipelines/stress/stress-tests-pipeline.yml
@@ -0,0 +1,101 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# This pipeline runs the stress test suite against the SqlClient projects, building them
+# transitively as necessary, triggered by successful runs of the following pipelines:
+#
+# Public project:
+#   Triggering pipelines: PR-SqlClient-Project, CI-SqlClient (branch main only)
+#   Pipeline name:        Stress-SqlClient
+#   Pipeline URL:         TODO: Create the Azure DevOps pipeline.
+#
+# ADO.Net project:
+#   Triggering pipeline:  MDS Main CI (branch internal/main only)
+#   Pipeline name:        Stress-SqlClient
+#   Pipeline URL:         TODO: Create the Azure DevOps pipeline.
+
+# Set the pipeline run name to the day-of-year and the daily run counter.
+name: $(DayOfYear)$(Rev:rr)
+
+# Do not trigger this pipeline for PRs, commits, or schedules.
+pr: none
+trigger: none
+
+# Trigger this pipeline after successful runs of the desired pipelines.
+#
+# The pipeline identifiers are displayed in the Azure DevOps UI, so it is helpful if they indicate
+# the project, folder, and pipeline name, hence the verbose values below.
+#
+resources:
+  pipelines:
+
+    # The PR-SqlClient-Project pipeline in the Public project.
+    - pipeline: Public-ADO-PR-SqlClient-Project
+      project: Public
+      source: /ADO/PR-SqlClient-Project
+      trigger: true
+
+    # The CI-SqlClient pipeline in the Public project.
+    - pipeline: Public-ADO-CI-SqlClient
+      project: Public
+      source: /ADO/CI-SqlClient
+      trigger:
+        branches:
+          include:
+            - main
+
+    # The MDS Main CI pipeline in the ADO.Net project.
+    - pipeline: ADO-Net-Internal-CI-MDS-Main-CI
+      project: ADO.Net
+      source: /Internal CI/MDS Main CI
+      trigger:
+        branches:
+          include:
+            - internal/main
+
+# Pipeline parameters, visible in the Azure DevOps UI.
+parameters:
+
+  # The build configuration to use; defaults to Release.
+  - name: buildConfiguration
+    displayName: Build Configuration
+    type: string
+    default: Release
+    values:
+      - Debug
+      - Release
+
+  # True to emit debug information and steps.
+  - name: debug
+    displayName: Enable debug output
+    type: boolean
+    default: false
+
+  # Dotnet CLI verbosity level.
+  - name: dotnetVerbosity
+    displayName: dotnet CLI Verbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
+# The stages to run.
+stages:
+
+  # Generate secrets.  We use these for the local SQL Server 'sa' logins.
+  - template: /eng/pipelines/stages/generate-secrets-ci-stage.yml@self
+    parameters:
+      debug: ${{ parameters.debug }}
+
+  # Run the stress tests.
+  - template: /eng/pipelines/stress/stress-tests-stage.yml@self
+    parameters:
+      buildConfiguration: ${{ parameters.buildConfiguration }}
+      debug: ${{ parameters.debug }}
+      dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/stress/stress-tests-stage.yml b/eng/pipelines/stress/stress-tests-stage.yml
new file mode 100644
index 0000000000..0f0000f99a
--- /dev/null
+++ b/eng/pipelines/stress/stress-tests-stage.yml
@@ -0,0 +1,130 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# This stage builds and runs stress tests against the SqlClient projects, building them transitively
+# as necessary.
+#
+# The stress tests are located here:
+#
+#   src/Microsoft.Data.SqlClient/tests/StressTests
+#
+# All tests use a localhost SQL Server configured for SQL auth via the 'sa' user and the generated
+# password.
+#
+# This stage depends on the secrets_stage.
+#
+# This template defines a stage named 'stress_tests_stage' that can be depended on by downstream
+# stages.
+
+parameters:
+
+  # The type of build to produce (Debug or Release)
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # True to enable debugging steps.
+  - name: debug
+    type: boolean
+    default: false
+
+  # The verbosity level for the dotnet CLI commands.
+  - name: dotnetVerbosity
+    type: string
+    default: normal
+    values:
+    - quiet
+    - minimal
+    - normal
+    - detailed
+    - diagnostic
+
+  # The list of .NET Framework runtimes to test against.
+  - name: netFrameworkTestRuntimes
+    type: object
+    default: [net462]
+
+  # The list of .NET runtimes to test against.
+  - name: netTestRuntimes
+    type: object
+    default: [net8.0, net9.0, net10.0]
+
+stages:
+  - stage: stress_tests_stage
+    displayName: Run Stress Tests
+    dependsOn:
+      - secrets_stage
+
+    variables:
+      # Bring the SA password from the secrets_stage into scope here.
+      - name: saPassword
+        value: $[stageDependencies.secrets_stage.secrets_job.outputs['SaPassword.Value']]
+
+    jobs:
+
+    # ----------------------------------------------------------------------------------------------
+    # Build and test on Linux.
+
+    - template: /eng/pipelines/stress/stress-tests-job.yml@self
+      parameters:
+        buildConfiguration: ${{ parameters.buildConfiguration }}
+        debug: ${{ parameters.debug }}
+        displayNamePrefix: Linux
+        dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+        jobNameSuffix: linux
+        netTestRuntimes: ${{ parameters.netTestRuntimes }}
+        poolName: ADO-CI-1ES-Pool
+        saPassword: $(saPassword)
+        sqlSetupStep:
+          template: /eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml@self
+          parameters:
+            saPassword: $(saPassword)
+        vmImage: ADO-UB22-SQL22
+
+    # ----------------------------------------------------------------------------------------------
+    # Build and test on Windows
+
+    - template: /eng/pipelines/stress/stress-tests-job.yml@self
+      parameters:
+        buildConfiguration: ${{ parameters.buildConfiguration }}
+        debug: ${{ parameters.debug }}
+        displayNamePrefix: Win
+        dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+        jobNameSuffix: windows
+        # Note that we include the .NET Framework runtimes for test runs on Windows.
+        netFrameworkTestRuntimes: ${{ parameters.netFrameworkTestRuntimes }}
+        netTestRuntimes: ${{ parameters.netTestRuntimes }}
+        poolName: ADO-CI-1ES-Pool
+        saPassword: $(saPassword)
+        sqlSetupStep:
+          template: /eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml@self
+          parameters:
+            saPassword: $(saPassword)
+        # The Windows images include a suitable .NET Framework runtime, so we don't have to install
+        # one explicitly.
+        vmImage: ADO-MMS22-SQL22
+
+    # ----------------------------------------------------------------------------------------------
+    # Build and test on macOS.
+
+    - template: /eng/pipelines/stress/stress-tests-job.yml@self
+      parameters:
+        buildConfiguration: ${{ parameters.buildConfiguration }}
+        debug: ${{ parameters.debug }}
+        displayNamePrefix: macOS
+        dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+        jobNameSuffix: macos
+        netTestRuntimes: ${{ parameters.netTestRuntimes }}
+        # We don't have any 1ES Hosted Pool images for macOS, so we use a generic one from Azure
+        # Pipelines.
+        poolName: Azure Pipelines
+        saPassword: $(saPassword)
+        sqlSetupStep:
+          template: /eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml@self
+          parameters:
+            saPassword: $(saPassword)
+        vmImage: macos-latest
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/Readme.md b/src/Microsoft.Data.SqlClient/tests/StressTests/Readme.md
index f0723c3189..546428dbe9 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/Readme.md
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/Readme.md
@@ -1,26 +1,21 @@
 # Microsoft.Data.SqlClient Stress Test
 
-This Stress testing application for `Microsoft.Data.SqlClient` is under progress.
+This Stress testing application for the `Microsoft.Data.SqlClient` suite is a work in progress.
 
-This project intends to help finding a certain level of effectiveness under
-unfavorable conditions, and verifying the mode of failures.
+This project intends to help finding a certain level of effectiveness under unfavorable conditions,
+and verifying the mode of failures.
 
-This is a console application targeting all frameworks supported by MDS,
-currently:
+This is a console application targeting all frameworks supported by MDS, currently:
 
-- .NET 8.0
+- .NET 10.0
 - .NET 9.0
-- .NET Framework 4.6.2
-- .NET Framework 4.7
-- .NET Framework 4.7.1
-- .NET Framework 4.7.2
-- .NET Framework 4.8
-- .NET Framework 4.8.1
+- .NET 8.0
+- .NET Framework 4.6.2 (Windows only; higher .NET Framework versions are supported at runtime via
+  compatibility)
 
 ## Purpose of application for developers
 
-Define fuzz tests for all new features/APIs in the driver and to be run before
-every GA release.
+Define fuzz tests for all new features/APIs in the driver and to be run before every GA release.
 
 ## Pre-Requisites
 
@@ -40,14 +35,13 @@ Required in the config file:
 |`disableNamedPipes`|`true`, `false`|`true` means the connections will create just using tcp protocol.|
 |`encrypt`|`true`, `false`|Assigns the encrypt property of the connection strings.|
 
-Note: The database user must have permission to create and drop databases.
-Each execution of the stress tests will create a database with a name like:
+Note: The database user must have permission to create and drop databases.  Each execution of the
+stress tests will create a database with a name like:
 
 - `StressTests-<GUID>`
 
-The database will be dropped as a best effort once testing is complete.  This
-allows for multiple test runs to execute in parallel against the same database
-server without colliding.
+The database will be dropped as a best effort once testing is complete.  This allows for multiple
+test runs to execute in parallel against the same database server without colliding.
 
 ## Adding new Tests
 
@@ -55,83 +49,55 @@ server without colliding.
 
 ## Building the application
 
-To build the application using the `StressTests.slnx` solution:
-
-```bash
-dotnet build [-c|--configuration <Release|Debug>]
-```
-
-```bash
-# Builds the application for the Client Os in `Debug` Configuration for `AnyCpu`
-# platform.
-#
-# All supported target frameworks are built by default.
-
-$ dotnet build
-```
-
-```bash
-# Build the application for .Net framework 4.8.1 with `Debug` configuration.
-
-$ dotnet build -f net481
-```
+Build the application using the top-level project `SqlClient.Stress.Runner`:
 
 ```bash
-# Build the application for .Net 9.0 with `Release` configuration.
-
-$ dotnet build -f net9.0 -c Release
-```
-
-```bash
-# Cleans all build directories
-
-$ dotnet clean
+$ cd .../src/Microsoft.Data.SqlClient/tests/StressTests
+dotnet build SqlClient.Stress.Runner [-c <Release|Debug>]
 ```
 
 ## Running tests
 
-After building the application, find the built folder with target framework and
-run the `stresstest.exe` file with required arguments.
+After building the application, find the built folder with target framework and run the
+`stresstest.exe` file with required arguments.
 
-Find the result in a log file inside the `logs` folder besides the command
-prompt.
+Find the result in a log file inside the `logs` folder besides the command prompt.
 
-You may specify the config file by supplying an environment variable that
-points to the file:
+You may specify the config file by supplying an environment variable that points to the file:
 
 - `STRESS_CONFIG_FILE=/path/to/my/config.jsonc`
 
 ## Command prompt
 
-You must run the stress tests from the root of the Stress Tests project
-directory (i.e. the same directory this readme file is in).
+You must run the stress tests from the root of the Stress Tests project directory (i.e. the same
+directory this readme file is in).
 
 ```bash
 # Linux
-$ cd /home/paul/dev/SqlClient/src/Microsoft.Data.SqlClient/tests/StressTests
+$ cd .../src/Microsoft.Data.SqlClient/tests/StressTests
 
 # Via dotnet run CLI:
-$ dotnet run --no-build -f net9.0 --project SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj -- -a SqlClient.Stress.Tests
+$ dotnet run --no-build -f net9.0 --project SqlClient.Stress.Runner -- -a SqlClient.Stress.Tests
 
 # Via dotnet CLI:
 $ dotnet SqlClient.Stress.Runner/bin/Debug/net9.0/stresstest.dll -a SqlClient.Stress.Tests
 
 # With a specific config file and all output to console:
-$ dotnet run --no-build -f net9.0 --project SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj -e STRESS_CONFIG_FILE=/path/to/config.jsonc -- -a SqlClient.Stress.Tests -console
+$ dotnet run --no-build -f net9.0 --project SqlClient.Stress.Runner -e STRESS_CONFIG_FILE=/path/to/config.jsonc -- -a SqlClient.Stress.Tests -console
 ```
 
 ```powershell
 # Windows
-> cd \dev\SqlClient\src\Microsoft.Data.SqlClient\tests\StressTests
+> cd ...\src\Microsoft.Data.SqlClient\tests\StressTests
 
 # Via dotnet run CLI:
-> dotnet run --no-build -f net9.0 --project SqlClient.Stress.Runner\SqlClient.Stress.Runner.csproj -- -a SqlClient.Stress.Tests
+> dotnet run --no-build -f net9.0 --project SqlClient.Stress.Runner -- -a SqlClient.Stress.Tests
 
 # Via executable:
 > .\SqlClient.Stress.Runner\bin\Debug\net481\stresstest.exe -a SqlClient.Stress.Tests
 
 # With a specific config file and all output to console:
-> dotnet run --no-build -f net9.0 --project SqlClient.Stress.Runner\SqlClient.Stress.Runner.csproj -e STRESS_CONFIG_FILE=c:\path\to\config.jsonc -- -a SqlClient.Stress.Tests -console
+> dotnet run --no-build -f net9.0 --project SqlClient.Stress.Runner -e STRESS_CONFIG_FILE=c:\path\to\config.jsonc -- -a SqlClient.Stress.Tests -console
 ```
 
 ## Supported arguments
@@ -164,14 +130,14 @@ $ dotnet run --no-build -f net9.0 --project SqlClient.Stress.Runner/SqlClient.St
 # Run the application for a built target framework and all discovered tests
 # without debugger attached and shows the test methods' names.
 
-> .\stresstest.exe -a SqlClient.Stress.Tests -all -printMethodName 
+> .\stresstest.exe -a SqlClient.Stress.Tests -all -printMethodName
 ```
 
 ```powershell
 # Run the application for a built target framework and all discovered tests and
 # will wait for debugger to be attached.
 
-> .\stresstest.exe -a SqlClient.Stress.Tests -all -debug 
+> .\stresstest.exe -a SqlClient.Stress.Tests -all -debug
 ```
 
 ```powershell
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/StressTests.slnx b/src/Microsoft.Data.SqlClient/tests/StressTests/StressTests.slnx
deleted file mode 100644
index a0dfd5e503..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/StressTests.slnx
+++ /dev/null
@@ -1,7 +0,0 @@
-<Solution>
-  <Project Path="IMonitorLoader/IMonitorLoader.csproj" />
-  <Project Path="SqlClient.Stress.Common/SqlClient.Stress.Common.csproj" />
-  <Project Path="SqlClient.Stress.Framework/SqlClient.Stress.Framework.csproj" />
-  <Project Path="SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj" />
-  <Project Path="SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj" />
-</Solution>

From 8c887846aaa2846d7a3ab3718b61a24b60e1b394 Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Sat, 28 Mar 2026 01:57:23 +0530
Subject: [PATCH 014/298] Fix API docs (#4084)

---
 .../Microsoft.Data.SqlClient/SqlCommand.xml   | 414 +++++++++---------
 .../SqlDataAdapter.xml                        | 224 +++++-----
 .../SqlDataReader.xml                         |  38 +-
 3 files changed, 338 insertions(+), 338 deletions(-)

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml
index a3d87c843d..7509f756b3 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml
@@ -357,35 +357,35 @@ Next, compile and execute the following:
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Class1
           {
               static void Main()
               {
-                  // This is a simple example that demonstrates the usage of the 
+                  // This is a simple example that demonstrates the usage of the
                   // BeginExecuteNonQuery functionality.
-                  // The WAITFOR statement simply adds enough time to prove the 
+                  // The WAITFOR statement simply adds enough time to prove the
                   // asynchronous nature of the command.
-          
+
                   string commandText =
                       "UPDATE Production.Product SET ReorderPoint = ReorderPoint + 1 " +
                       "WHERE ReorderPoint Is Not Null;" +
                       "WAITFOR DELAY '0:0:3';" +
                       "UPDATE Production.Product SET ReorderPoint = ReorderPoint - 1 " +
                       "WHERE ReorderPoint Is Not Null";
-          
+
                   RunCommandAsynchronously(commandText, GetConnectionString());
-          
+
                   Console.WriteLine("Press ENTER to continue.");
                   Console.ReadLine();
               }
-          
+
               private static void RunCommandAsynchronously(string commandText, string connectionString)
               {
                   // Given command text and connection string, asynchronously execute
                   // the specified command against the connection. For this example,
-                  // the code displays an indicator as it is working, verifying the 
-                  // asynchronous behavior. 
+                  // the code displays an indicator as it is working, verifying the
+                  // asynchronous behavior.
                   using (SqlConnection connection = new SqlConnection(connectionString))
                   {
                       try
@@ -393,17 +393,17 @@ Next, compile and execute the following:
                           int count = 0;
                           SqlCommand command = new SqlCommand(commandText, connection);
                           connection.Open();
-          
+
                           IAsyncResult result = command.BeginExecuteNonQuery();
                           while (!result.IsCompleted)
                           {
                               Console.WriteLine("Waiting ({0})", count++);
                               // Wait for 1/10 second, so the counter
-                              // does not consume all available resources 
+                              // does not consume all available resources
                               // on the main thread.
                               System.Threading.Thread.Sleep(100);
                           }
-                        
+
                           Console.WriteLine("Command complete. Affected {0} rows.",
                               command.EndExecuteNonQuery(result));
                       }
@@ -423,11 +423,11 @@ Next, compile and execute the following:
                       }
                   }
               }
-          
+
               private static string GetConnectionString()
               {
-                  // To avoid storing the connection string in your code,            
-                  // you can retrieve it from a configuration file. 
+                  // To avoid storing the connection string in your code,
+                  // you can retrieve it from a configuration file.
                   return "Data Source=(local);Integrated Security=SSPI;" +
                          "Initial Catalog=AdventureWorks";
               }
@@ -527,7 +527,7 @@ Next, compile and execute the following:
           using System.Text;
           using System.Windows.Forms;
           using Microsoft.Data.SqlClient;
-          
+
           namespace Microsoft.AdoDotNet.CodeSamples
           {
               public partial class Form1 : Form
@@ -536,9 +536,9 @@ Next, compile and execute the following:
                   {
                       InitializeComponent();
                   }
-          
-                  // Hook up the form's Load event handler (you can double-click on 
-                  // the form's design surface in Visual Studio), and then add 
+
+                  // Hook up the form's Load event handler (you can double-click on
+                  // the form's design surface in Visual Studio), and then add
                   // this code to the form's class:
                   private void Form1_Load(object sender, EventArgs e)
                   {
@@ -546,42 +546,42 @@ Next, compile and execute the following:
                       this.FormClosing += new System.Windows.Forms.
                           FormClosingEventHandler(this.Form1_FormClosing);
                   }
-          
+
                   // You need this delegate in order to display text from a thread
                   // other than the form's thread. See the HandleCallback
                   // procedure for more information.
-                  // This same delegate matches both the DisplayStatus 
+                  // This same delegate matches both the DisplayStatus
                   // and DisplayResults methods.
                   private delegate void DisplayInfoDelegate(string Text);
-          
+
                   // This flag ensures that the user does not attempt
-                  // to restart the command or close the form while the 
+                  // to restart the command or close the form while the
                   // asynchronous command is executing.
                   private bool isExecuting;
-          
-                  // This example maintains the connection object 
+
+                  // This example maintains the connection object
                   // externally, so that it is available for closing.
                   private SqlConnection connection;
-          
+
                   private static string GetConnectionString()
                   {
-                      // To avoid storing the connection string in your code,            
+                      // To avoid storing the connection string in your code,
                       // you can retrieve it from a configuration file.
                       return "Data Source=(local);Integrated Security=true;" +
                              "Initial Catalog=AdventureWorks";
                   }
-          
+
                   private void DisplayStatus(string Text)
                   {
                       this.label1.Text = Text;
                   }
-          
+
                   private void DisplayResults(string Text)
                   {
                       this.label1.Text = Text;
                       DisplayStatus("Ready");
                   }
-          
+
                   private void Form1_FormClosing(object sender, System.Windows.Forms.FormClosingEventArgs e)
                   {
                       if (isExecuting)
@@ -591,7 +591,7 @@ Next, compile and execute the following:
                           e.Cancel = true;
                       }
                   }
-          
+
                   private void button1_Click(object sender, System.EventArgs e)
                   {
                       if (isExecuting)
@@ -608,7 +608,7 @@ Next, compile and execute the following:
                               DisplayResults("");
                               DisplayStatus("Connecting...");
                               connection = new SqlConnection(GetConnectionString());
-                              // To emulate a long-running query, wait for 
+                              // To emulate a long-running query, wait for
                               // a few seconds before working with the data.
                               // This command does not do much, but that's the point--
                               // it does not change your data, in the long run.
@@ -618,19 +618,19 @@ Next, compile and execute the following:
                                   "WHERE ReorderPoint Is Not Null;" +
                                   "UPDATE Production.Product SET ReorderPoint = ReorderPoint - 1 " +
                                   "WHERE ReorderPoint Is Not Null";
-          
+
                               command = new SqlCommand(commandText, connection);
                               connection.Open();
-          
+
                               DisplayStatus("Executing...");
                               isExecuting = true;
-                              // Although it is not required that you pass the 
-                              // SqlCommand object as the second parameter in the 
+                              // Although it is not required that you pass the
+                              // SqlCommand object as the second parameter in the
                               // BeginExecuteNonQuery call, doing so makes it easier
                               // to call EndExecuteNonQuery in the callback procedure.
                               AsyncCallback callback = new AsyncCallback(HandleCallback);
                               command.BeginExecuteNonQuery(callback, command);
-          
+
                           }
                           catch (Exception ex)
                           {
@@ -643,7 +643,7 @@ Next, compile and execute the following:
                           }
                       }
                   }
-          
+
                   private void HandleCallback(IAsyncResult result)
                   {
                       try
@@ -658,38 +658,38 @@ Next, compile and execute the following:
                           {
                               rowText = " row affected.";
                           }
-                        
+
                           rowText = rowCount + rowText;
-          
+
                           // You may not interact with the form and its contents
                           // from a different thread, and this callback procedure
                           // is all but guaranteed to be running from a different thread
-                          // than the form. Therefore you cannot simply call code that 
+                          // than the form. Therefore you cannot simply call code that
                           // displays the results, like this:
                           // DisplayResults(rowText)
-          
+
                           // Instead, you must call the procedure from the form's thread.
                           // One simple way to accomplish this is to call the Invoke
                           // method of the form, which calls the delegate you supply
-                          // from the form's thread. 
+                          // from the form's thread.
                           DisplayInfoDelegate del = new DisplayInfoDelegate(DisplayResults);
                           this.Invoke(del, rowText);
-          
+
                       }
                       catch (Exception ex)
                       {
-                          // Because you are now running code in a separate thread, 
+                          // Because you are now running code in a separate thread,
                           // if you do not handle the exception here, none of your other
-                          // code catches the exception. Because none of 
+                          // code catches the exception. Because none of
                           // your code is on the call stack in this thread, there is nothing
-                          // higher up the stack to catch the exception if you do not 
-                          // handle it here. You can either log the exception or 
-                          // invoke a delegate (as in the non-error case in this 
+                          // higher up the stack to catch the exception if you do not
+                          // handle it here. You can either log the exception or
+                          // invoke a delegate (as in the non-error case in this
                           // example) to display the error on the form. In no case
                           // can you simply display the error without executing a delegate
-                          // as in the try block here. 
-          
-                          // You can create the delegate instance as you 
+                          // as in the try block here.
+
+                          // You can create the delegate instance as you
                           // invoke it, like this:
                           this.Invoke(new DisplayInfoDelegate(DisplayStatus),
                               String.Format("Ready(last error: {0}", ex.Message));
@@ -851,7 +851,7 @@ Next, compile and execute the following:
                   // Display the data within the reader.
                   while (reader.Read())
                   {
-                      // Display all the columns. 
+                      // Display all the columns.
                       for (int i = 0; i &lt; reader.FieldCount; i++)
                       {
                           Console.Write("{0}\t", reader.GetValue(i));
@@ -862,8 +862,8 @@ Next, compile and execute the following:
 
               private static string GetConnectionString()
               {
-                  // To avoid storing the connection string in your code,            
-                  // you can retrieve it from a configuration file. 
+                  // To avoid storing the connection string in your code,
+                  // you can retrieve it from a configuration file.
 
                   return "Data Source=(local);Integrated Security=true;" +
                       "Initial Catalog=AdventureWorks";
@@ -953,54 +953,54 @@ Next, compile and execute the following:
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Class1
           {
               static void Main()
               {
                   // This example is not terribly useful, but it proves a point.
-                  // The WAITFOR statement simply adds enough time to prove the 
+                  // The WAITFOR statement simply adds enough time to prove the
                   // asynchronous nature of the command.
                   string commandText = "WAITFOR DELAY '00:00:03';" +
                       "SELECT ProductID, Name FROM Production.Product WHERE ListPrice &lt; 100";
-          
+
                   RunCommandAsynchronously(commandText, GetConnectionString());
-          
+
                   Console.WriteLine("Press ENTER to continue.");
                   Console.ReadLine();
               }
-          
+
               private static void RunCommandAsynchronously(string commandText, string connectionString)
               {
                   // Given command text and connection string, asynchronously execute
                   // the specified command against the connection. For this example,
-                  // the code displays an indicator as it is working, verifying the 
-                  // asynchronous behavior. 
+                  // the code displays an indicator as it is working, verifying the
+                  // asynchronous behavior.
                   try
                   {
                       // The code does not need to handle closing the connection explicitly--
                       // the use of the CommandBehavior.CloseConnection option takes care
-                      // of that for you. 
+                      // of that for you.
                       SqlConnection connection = new SqlConnection(connectionString);
                       SqlCommand command = new SqlCommand(commandText, connection);
-          
+
                       connection.Open();
                       IAsyncResult result = command.BeginExecuteReader(CommandBehavior.CloseConnection);
-          
+
                       // Although it is not necessary, the following code
-                      // displays a counter in the console window, indicating that 
-                      // the main thread is not blocked while awaiting the command 
+                      // displays a counter in the console window, indicating that
+                      // the main thread is not blocked while awaiting the command
                       // results.
                       int count = 0;
                       while (!result.IsCompleted)
                       {
                           Console.WriteLine("Waiting ({0})", count++);
                           // Wait for 1/10 second, so the counter
-                          // does not consume all available resources 
+                          // does not consume all available resources
                           // on the main thread.
                           System.Threading.Thread.Sleep(100);
                       }
-          
+
                       using (SqlDataReader reader = command.EndExecuteReader(result))
                       {
                           DisplayResults(reader);
@@ -1021,26 +1021,26 @@ Next, compile and execute the following:
                       Console.WriteLine("Error: {0}", ex.Message);
                   }
               }
-          
+
               private static void DisplayResults(SqlDataReader reader)
               {
                   // Display the data within the reader.
                   while (reader.Read())
                   {
-                      // Display all the columns. 
+                      // Display all the columns.
                       for (int i = 0; i &lt; reader.FieldCount; i++)
                       {
                           Console.Write("{0}\t", reader.GetValue(i));
                       }
-                    
+
                       Console.WriteLine();
                   }
               }
-          
+
               private static string GetConnectionString()
               {
-                  // To avoid storing the connection string in your code,            
-                  // you can retrieve it from a configuration file. 
+                  // To avoid storing the connection string in your code,
+                  // you can retrieve it from a configuration file.
                   return "Data Source=(local);Integrated Security=true;" +
                          "Initial Catalog=AdventureWorks";
               }
@@ -1138,54 +1138,54 @@ Next, compile and execute the following:
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Class1
           {
               static void Main()
               {
                   // This example is not terribly useful, but it proves a point.
-                  // The WAITFOR statement simply adds enough time to prove the 
+                  // The WAITFOR statement simply adds enough time to prove the
                   // asynchronous nature of the command.
                   string commandText = "WAITFOR DELAY '00:00:03';" +
                       "SELECT ProductID, Name FROM Production.Product WHERE ListPrice &lt; 100";
-          
+
                   RunCommandAsynchronously(commandText, GetConnectionString());
-          
+
                   Console.WriteLine("Press ENTER to continue.");
                   Console.ReadLine();
               }
-          
+
               private static void RunCommandAsynchronously(string commandText, string connectionString)
               {
                   // Given command text and connection string, asynchronously execute
                   // the specified command against the connection. For this example,
-                  // the code displays an indicator as it is working, verifying the 
-                  // asynchronous behavior. 
+                  // the code displays an indicator as it is working, verifying the
+                  // asynchronous behavior.
                   try
                   {
                       // The code does not need to handle closing the connection explicitly--
                       // the use of the CommandBehavior.CloseConnection option takes care
-                      // of that for you. 
+                      // of that for you.
                       SqlConnection connection = new SqlConnection(connectionString);
                       SqlCommand command = new SqlCommand(commandText, connection);
-          
+
                       connection.Open();
                       IAsyncResult result = command.BeginExecuteReader(CommandBehavior.CloseConnection);
-          
+
                       // Although it is not necessary, the following code
-                      // displays a counter in the console window, indicating that 
-                      // the main thread is not blocked while awaiting the command 
+                      // displays a counter in the console window, indicating that
+                      // the main thread is not blocked while awaiting the command
                       // results.
                       int count = 0;
                       while (!result.IsCompleted)
                       {
                           Console.WriteLine("Waiting ({0})", count++);
                           // Wait for 1/10 second, so the counter
-                          // does not consume all available resources 
+                          // does not consume all available resources
                           // on the main thread.
                           System.Threading.Thread.Sleep(100);
                       }
-          
+
                       using (SqlDataReader reader = command.EndExecuteReader(result))
                       {
                           DisplayResults(reader);
@@ -1206,26 +1206,26 @@ Next, compile and execute the following:
                       Console.WriteLine("Error: {0}", ex.Message);
                   }
               }
-          
+
               private static void DisplayResults(SqlDataReader reader)
               {
                   // Display the data within the reader.
                   while (reader.Read())
                   {
-                      // Display all the columns. 
+                      // Display all the columns.
                       for (int i = 0; i &lt; reader.FieldCount; i++)
                       {
                           Console.Write("{0}\t", reader.GetValue(i));
                       }
-                    
+
                       Console.WriteLine();
                   }
               }
-          
+
               private static string GetConnectionString()
               {
-                  // To avoid storing the connection string in your code,            
-                  // you can retrieve it from a configuration file. 
+                  // To avoid storing the connection string in your code,
+                  // you can retrieve it from a configuration file.
                   return "Data Source=(local);Integrated Security=true;" +
                          "Initial Catalog=AdventureWorks";
               }
@@ -1335,7 +1335,7 @@ Next, compile and execute the following:
           using System.Text;
           using System.Windows.Forms;
           using Microsoft.Data.SqlClient;
-          
+
           namespace Microsoft.AdoDotNet.CodeSamples
           {
               public partial class Form1 : Form
@@ -1344,28 +1344,28 @@ Next, compile and execute the following:
                   {
                       InitializeComponent();
                   }
-                
-                  // Hook up the form's Load event handler (you can double-click on 
-                  // the form's design surface in Visual Studio), and then add 
+
+                  // Hook up the form's Load event handler (you can double-click on
+                  // the form's design surface in Visual Studio), and then add
                   // this code to the form's class:
                   // You need this delegate in order to fill the grid from
                   // a thread other than the form's thread. See the HandleCallback
                   // procedure for more information.
                   private delegate void FillGridDelegate(SqlDataReader reader);
-          
+
                   // You need this delegate to update the status bar.
                   private delegate void DisplayStatusDelegate(string Text);
-          
+
                   // This flag ensures that the user does not attempt
-                  // to restart the command or close the form while the 
+                  // to restart the command or close the form while the
                   // asynchronous command is executing.
                   private bool isExecuting;
-          
+
                   private void DisplayStatus(string Text)
                   {
                       this.label1.Text = Text;
                   }
-          
+
                   private void FillGrid(SqlDataReader reader)
                   {
                       try
@@ -1385,7 +1385,7 @@ Next, compile and execute the following:
                       finally
                       {
                           // Closing the reader also closes the connection,
-                          // because this reader was created using the 
+                          // because this reader was created using the
                           // CommandBehavior.CloseConnection value.
                           if (reader != null)
                           {
@@ -1393,7 +1393,7 @@ Next, compile and execute the following:
                           }
                       }
                   }
-          
+
                   private void HandleCallback(IAsyncResult result)
                   {
                       try
@@ -1403,37 +1403,37 @@ Next, compile and execute the following:
                           // of the IAsyncResult parameter.
                           SqlCommand command = (SqlCommand)result.AsyncState;
                           SqlDataReader reader = command.EndExecuteReader(result);
-                        
+
                           // You may not interact with the form and its contents
                           // from a different thread, and this callback procedure
                           // is all but guaranteed to be running from a different thread
-                          // than the form. Therefore you cannot simply call code that 
+                          // than the form. Therefore you cannot simply call code that
                           // fills the grid, like this:
                           // FillGrid(reader);
                           // Instead, you must call the procedure from the form's thread.
                           // One simple way to accomplish this is to call the Invoke
                           // method of the form, which calls the delegate you supply
-                          // from the form's thread. 
+                          // from the form's thread.
                           FillGridDelegate del = new FillGridDelegate(FillGrid);
                           this.Invoke(del, reader);
-                        
-                          // Do not close the reader here, because it is being used in 
+
+                          // Do not close the reader here, because it is being used in
                           // a separate thread. Instead, have the procedure you have
                           // called close the reader once it is done with it.
                       }
                       catch (Exception ex)
                       {
-                          // Because you are now running code in a separate thread, 
+                          // Because you are now running code in a separate thread,
                           // if you do not handle the exception here, none of your other
-                          // code catches the exception. Because there is none of 
+                          // code catches the exception. Because there is none of
                           // your code on the call stack in this thread, there is nothing
-                          // higher up the stack to catch the exception if you do not 
-                          // handle it here. You can either log the exception or 
-                          // invoke a delegate (as in the non-error case in this 
+                          // higher up the stack to catch the exception if you do not
+                          // handle it here. You can either log the exception or
+                          // invoke a delegate (as in the non-error case in this
                           // example) to display the error on the form. In no case
                           // can you simply display the error without executing a delegate
-                          // as in the try block here. 
-                          // You can create the delegate instance as you 
+                          // as in the try block here.
+                          // You can create the delegate instance as you
                           // invoke it, like this:
                           this.Invoke(new DisplayStatusDelegate(DisplayStatus), "Error: " + ex.Message);
                       }
@@ -1442,15 +1442,15 @@ Next, compile and execute the following:
                           isExecuting = false;
                       }
                   }
-          
+
                   private string GetConnectionString()
                   {
-                      // To avoid storing the connection string in your code, 
-                      // you can retrieve it from a configuration file. 
+                      // To avoid storing the connection string in your code,
+                      // you can retrieve it from a configuration file.
                       return "Data Source=(local);Integrated Security=true;" +
                              "Initial Catalog=AdventureWorks";
                   }
-          
+
                   private void button1_Click(object sender, System.EventArgs e)
                   {
                       if (isExecuting)
@@ -1467,17 +1467,17 @@ Next, compile and execute the following:
                           {
                               DisplayStatus("Connecting...");
                               connection = new SqlConnection(GetConnectionString());
-                              // To emulate a long-running query, wait for 
+                              // To emulate a long-running query, wait for
                               // a few seconds before retrieving the real data.
                               command = new SqlCommand("WAITFOR DELAY '0:0:5';" +
                                   "SELECT ProductID, Name, ListPrice, Weight FROM Production.Product",
                                   connection);
                               connection.Open();
-          
+
                               DisplayStatus("Executing...");
                               isExecuting = true;
-                              // Although it is not required that you pass the 
-                              // SqlCommand object as the second parameter in the 
+                              // Although it is not required that you pass the
+                              // SqlCommand object as the second parameter in the
                               // BeginExecuteReader call, doing so makes it easier
                               // to call EndExecuteReader in the callback procedure.
                               AsyncCallback callback = new AsyncCallback(HandleCallback);
@@ -1494,13 +1494,13 @@ Next, compile and execute the following:
                           }
                       }
                   }
-          
+
                   private void Form1_Load(object sender, System.EventArgs e)
                   {
                       this.button1.Click += new System.EventHandler(this.button1_Click);
                       this.FormClosing += new FormClosingEventHandler(Form1_FormClosing);
                   }
-          
+
                   void Form1_FormClosing(object sender, FormClosingEventArgs e)
                   {
                       if (isExecuting)
@@ -1605,58 +1605,58 @@ Next, compile and execute the following:
           using System.Data;
           using Microsoft.Data.SqlClient;
           using System.Xml;
-          
+
           class Class1
           {
               static void Main()
               {
                   // This example is not terribly effective, but it proves a point.
-                  // The WAITFOR statement simply adds enough time to prove the 
+                  // The WAITFOR statement simply adds enough time to prove the
                   // asynchronous nature of the command.
                   string commandText =
                       "WAITFOR DELAY '00:00:03';" +
                       "SELECT Name, ListPrice FROM Production.Product " +
                       "WHERE ListPrice &lt; 100 " +
                       "FOR XML AUTO, XMLDATA";
-          
+
                   RunCommandAsynchronously(commandText, GetConnectionString());
-          
+
                   Console.WriteLine("Press ENTER to continue.");
                   Console.ReadLine();
               }
-          
+
               private static void RunCommandAsynchronously(string commandText, string connectionString)
               {
                   // Given command text and connection string, asynchronously execute
                   // the specified command against the connection. For this example,
-                  // the code displays an indicator as it is working, verifying the 
-                  // asynchronous behavior. 
+                  // the code displays an indicator as it is working, verifying the
+                  // asynchronous behavior.
                   using (SqlConnection connection = new SqlConnection(connectionString))
                   {
                       SqlCommand command = new SqlCommand(commandText, connection);
-          
+
                       connection.Open();
                       IAsyncResult result = command.BeginExecuteXmlReader();
-          
+
                       // Although it is not necessary, the following procedure
-                      // displays a counter in the console window, indicating that 
-                      // the main thread is not blocked while awaiting the command 
+                      // displays a counter in the console window, indicating that
+                      // the main thread is not blocked while awaiting the command
                       // results.
                       int count = 0;
                       while (!result.IsCompleted)
                       {
                           Console.WriteLine("Waiting ({0})", count++);
                           // Wait for 1/10 second, so the counter
-                          // does not consume all available resources 
+                          // does not consume all available resources
                           // on the main thread.
                           System.Threading.Thread.Sleep(100);
                       }
-          
+
                       XmlReader reader = command.EndExecuteXmlReader(result);
                       DisplayProductInfo(reader);
                   }
               }
-          
+
               private static void DisplayProductInfo(XmlReader reader)
               {
                   // Display the data within the reader.
@@ -1670,11 +1670,11 @@ Next, compile and execute the following:
                       }
                   }
               }
-          
+
               private static string GetConnectionString()
               {
-                  // To avoid storing the connection string in your code,            
-                  // you can retrieve it from a configuration file. 
+                  // To avoid storing the connection string in your code,
+                  // you can retrieve it from a configuration file.
                   return "Data Source=(local);Integrated Security=true;" +
                          "Initial Catalog=AdventureWorks";
               }
@@ -1788,49 +1788,49 @@ Next, compile and execute the following:
           using System.Windows.Forms;
           using System.Xml;
           using Microsoft.Data.SqlClient;
-          
+
           namespace Microsoft.AdoDotNet.CodeSamples
           {
               public partial class Form1 : Form
               {
-                  // Hook up the form's Load event handler and then add 
+                  // Hook up the form's Load event handler and then add
                   // this code to the form's class:
                   // You need these delegates in order to display text from a thread
                   // other than the form's thread. See the HandleCallback
                   // procedure for more information.
                   private delegate void DisplayInfoDelegate(string Text);
                   private delegate void DisplayReaderDelegate(XmlReader reader);
-          
+
                   private bool isExecuting;
-          
-                  // This example maintains the connection object 
+
+                  // This example maintains the connection object
                   // externally, so that it is available for closing.
                   private SqlConnection connection;
-          
+
                   public Form1()
                   {
                       InitializeComponent();
                   }
-          
+
                   private string GetConnectionString()
                   {
-                      // To avoid storing the connection string in your code, 
-                      // you can retrieve it from a configuration file. 
+                      // To avoid storing the connection string in your code,
+                      // you can retrieve it from a configuration file.
                       return "Data Source=(local);Integrated Security=true;" +
                              "Initial Catalog=AdventureWorks";
                   }
-          
+
                   private void DisplayStatus(string Text)
                   {
                       this.label1.Text = Text;
                   }
-          
+
                   private void ClearProductInfo()
                   {
                       // Clear the list box.
                       this.listBox1.Items.Clear();
                   }
-          
+
                   private void DisplayProductInfo(XmlReader reader)
                   {
                       // Display the data within the reader.
@@ -1845,7 +1845,7 @@ Next, compile and execute the following:
                       }
                       DisplayStatus("Ready");
                   }
-          
+
                   private void Form1_FormClosing(object sender,
                       System.Windows.Forms.FormClosingEventArgs e)
                   {
@@ -1856,7 +1856,7 @@ Next, compile and execute the following:
                           e.Cancel = true;
                       }
                   }
-          
+
                   private void button1_Click(object sender, System.EventArgs e)
                   {
                       if (isExecuting)
@@ -1873,27 +1873,27 @@ Next, compile and execute the following:
                               ClearProductInfo();
                               DisplayStatus("Connecting...");
                               connection = new SqlConnection(GetConnectionString());
-          
-                              // To emulate a long-running query, wait for 
+
+                              // To emulate a long-running query, wait for
                               // a few seconds before working with the data.
                               string commandText =
                                   "WAITFOR DELAY '00:00:03';" +
                                   "SELECT Name, ListPrice FROM Production.Product " +
                                   "WHERE ListPrice &lt; 100 " +
                                   "FOR XML AUTO, XMLDATA";
-          
+
                               command = new SqlCommand(commandText, connection);
                               connection.Open();
-          
+
                               DisplayStatus("Executing...");
                               isExecuting = true;
-                              // Although it is not required that you pass the 
-                              // SqlCommand object as the second parameter in the 
+                              // Although it is not required that you pass the
+                              // SqlCommand object as the second parameter in the
                               // BeginExecuteXmlReader call, doing so makes it easier
                               // to call EndExecuteXmlReader in the callback procedure.
                               AsyncCallback callback = new AsyncCallback(HandleCallback);
                               command.BeginExecuteXmlReader(callback, command);
-          
+
                           }
                           catch (Exception ex)
                           {
@@ -1906,7 +1906,7 @@ Next, compile and execute the following:
                           }
                       }
                   }
-          
+
                   private void HandleCallback(IAsyncResult result)
                   {
                       try
@@ -1916,34 +1916,34 @@ Next, compile and execute the following:
                           // of the IAsyncResult parameter.
                           SqlCommand command = (SqlCommand)result.AsyncState;
                           XmlReader reader = command.EndExecuteXmlReader(result);
-          
+
                           // You may not interact with the form and its contents
                           // from a different thread, and this callback procedure
                           // is all but guaranteed to be running from a different thread
-                          // than the form. 
-          
+                          // than the form.
+
                           // Instead, you must call the procedure from the form's thread.
                           // One simple way to accomplish this is to call the Invoke
                           // method of the form, which calls the delegate you supply
-                          // from the form's thread. 
+                          // from the form's thread.
                           DisplayReaderDelegate del = new DisplayReaderDelegate(DisplayProductInfo);
                           this.Invoke(del, reader);
-          
+
                       }
                       catch (Exception ex)
                       {
-                          // Because you are now running code in a separate thread, 
+                          // Because you are now running code in a separate thread,
                           // if you do not handle the exception here, none of your other
-                          // code catches the exception. Because none of 
+                          // code catches the exception. Because none of
                           // your code is on the call stack in this thread, there is nothing
-                          // higher up the stack to catch the exception if you do not 
-                          // handle it here. You can either log the exception or 
-                          // invoke a delegate (as in the non-error case in this 
+                          // higher up the stack to catch the exception if you do not
+                          // handle it here. You can either log the exception or
+                          // invoke a delegate (as in the non-error case in this
                           // example) to display the error on the form. In no case
                           // can you simply display the error without executing a delegate
-                          // as in the try block here. 
-          
-                          // You can create the delegate instance as you 
+                          // as in the try block here.
+
+                          // You can create the delegate instance as you
                           // invoke it, like this:
                           this.Invoke(new DisplayInfoDelegate(DisplayStatus),
                           String.Format("Ready(last error: {0}", ex.Message));
@@ -1957,7 +1957,7 @@ Next, compile and execute the following:
                           }
                       }
                   }
-          
+
                   private void Form1_Load(object sender, System.EventArgs e)
                   {
                       this.button1.Click += new System.EventHandler(this.button1_Click);
@@ -2031,22 +2031,22 @@ Next, compile and execute the following:
           using System.Data;
           using System.Threading;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               private static SqlCommand m_rCommand;
-          
+
               public static SqlCommand Command
               {
                   get { return m_rCommand; }
                   set { m_rCommand = value; }
               }
-          
+
               public static void Thread_Cancel()
               {
                   Command.Cancel();
               }
-          
+
               static void Main()
               {
                   string connectionString = GetConnectionString();
@@ -2055,7 +2055,7 @@ Next, compile and execute the following:
                       using (SqlConnection connection = new SqlConnection(connectionString))
                       {
                           connection.Open();
-          
+
                           Command = connection.CreateCommand();
                           Command.CommandText = "DROP TABLE TestCancel";
                           try
@@ -2063,19 +2063,19 @@ Next, compile and execute the following:
                               Command.ExecuteNonQuery();
                           }
                           catch { }
-          
+
                           Command.CommandText = "CREATE TABLE TestCancel(co1 int, co2 char(10))";
                           Command.ExecuteNonQuery();
                           Command.CommandText = "INSERT INTO TestCancel VALUES (1, '1')";
                           Command.ExecuteNonQuery();
-          
+
                           Command.CommandText = "SELECT * FROM TestCancel";
                           SqlDataReader reader = Command.ExecuteReader();
-          
+
                           Thread rThread2 = new Thread(new ThreadStart(Thread_Cancel));
                           rThread2.Start();
                           rThread2.Join();
-          
+
                           reader.Read();
                           System.Console.WriteLine(reader.FieldCount);
                           reader.Close();
@@ -2088,7 +2088,7 @@ Next, compile and execute the following:
               }
               static private string GetConnectionString()
               {
-                  // To avoid storing the connection string in your code, 
+                  // To avoid storing the connection string in your code,
                   // you can retrieve it from a configuration file.
                   return "Data Source=(local);Initial Catalog=AdventureWorks;"
                        + "Integrated Security=SSPI";
@@ -2528,7 +2528,7 @@ If the option is enabled and a parameter with Direction Output or InputOutput is
           Although the <see cref="M:Microsoft.Data.SqlClient.SqlCommand.ExecuteNonQuery" /> returns no rows, any output parameters or return values mapped to parameters are populated with data.
         </para>
         <para>
-          For UPDATE, INSERT, and DELETE statements, the return value is the number of rows affected by the command. For all other types of statements, the return value is -1. When a trigger exists on a table being inserted or updated, the return value includes the number of rows affected by both the insert or update operation and the number of rows affected by the trigger or triggers. When SET NOCOUNT ON is set on the connection (before or as part of executing the command, or as part of a trigger initiated by the execution of the command) the rows affected by individual statements stop contributing to the count of rows affected that is returned by this method. If no statements are detected that contribute to the count, the return value is -1. If a rollback occurs, the return value is also -1. 
+          For UPDATE, INSERT, and DELETE statements, the return value is the number of rows affected by the command. For all other types of statements, the return value is -1. When a trigger exists on a table being inserted or updated, the return value includes the number of rows affected by both the insert or update operation and the number of rows affected by the trigger or triggers. When SET NOCOUNT ON is set on the connection (before or as part of executing the command, or as part of a trigger initiated by the execution of the command) the rows affected by individual statements stop contributing to the count of rows affected that is returned by this method. If no statements are detected that contribute to the count, the return value is -1. If a rollback occurs, the return value is also -1.
         </para>
       </remarks>
       <example>
@@ -2540,7 +2540,7 @@ If the option is enabled and a parameter with Direction Output or InputOutput is
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           namespace SqlCommandCS
           {
               class Program
@@ -2762,7 +2762,7 @@ The following example creates a <xref:Microsoft.Data.SqlClient.SqlCommand>, and
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main()
@@ -2772,7 +2772,7 @@ The following example creates a <xref:Microsoft.Data.SqlClient.SqlCommand>, and
                   string qs = "SELECT OrderID, CustomerID FROM dbo.Orders;";
                   CreateCommand(qs, str);
               }
-          
+
               private static void CreateCommand(string queryString, string connectionString)
               {
                   using (SqlConnection connection = new SqlConnection(connectionString))
@@ -3076,7 +3076,7 @@ For more information about asynchronous programming in the .NET Framework Data P
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           public class Sample
           {
               public void CreateSqlCommand(string queryString, SqlConnection connection)
@@ -3218,7 +3218,7 @@ For more information about asynchronous programming in the .NET Framework Data P
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           private static void CreateXMLReader(string queryString, string connectionString)
           {
               using (SqlConnection connection = new SqlConnection(connectionString))
@@ -3474,9 +3474,9 @@ The blocking connection simulates a situation like a command still running in th
 
 ### How to use with legacy asynchronous commands
 Besides assigning the provider to the command and executing the command, it's possible to run it directly using the following <xref:Microsoft.Data.SqlClient.SqlRetryLogicBaseProvider> methods:  
-- <xref:Microsoft.Data.SqlClient.SqlRetryLogicBaseProvider.Execute%60%601(System.Object,System.Func{%60%600})>
+- <xref:Microsoft.Data.SqlClient.SqlRetryLogicBaseProvider.Execute``1(System.Object,System.Func{``0})>
 - <xref:Microsoft.Data.SqlClient.SqlRetryLogicBaseProvider.ExecuteAsync(System.Object,System.Func{System.Threading.Tasks.Task},System.Threading.CancellationToken)>
-- <xref:Microsoft.Data.SqlClient.SqlRetryLogicBaseProvider.ExecuteAsync%60%601(System.Object,System.Func{System.Threading.Tasks.Task{%60%600}},System.Threading.CancellationToken)>
+- <xref:Microsoft.Data.SqlClient.SqlRetryLogicBaseProvider.ExecuteAsync``1(System.Object,System.Func{System.Threading.Tasks.Task{``0}},System.Threading.CancellationToken)>
 
 [!code-csharp[SqlConfigurableRetryLogic_SqlCommand#4](~/../sqlclient/doc/samples/SqlConfigurableRetryLogic_SqlCommand.cs#4)]
 
@@ -3535,7 +3535,7 @@ The following example demonstrates how to create a <xref:Microsoft.Data.SqlClien
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main()
@@ -3549,21 +3549,21 @@ The following example demonstrates how to create a <xref:Microsoft.Data.SqlClien
               private static void UpdateDemographics(Int32 customerID,
                   string demoXml, string connectionString)
               {
-                  // Update the demographics for a store, which is stored 
-                  // in an xml column. 
+                  // Update the demographics for a store, which is stored
+                  // in an xml column.
                   string commandText = "UPDATE Sales.Store SET Demographics = @demographics "
                       + "WHERE CustomerID = @ID;";
-          
+
                   using (SqlConnection connection = new SqlConnection(connectionString))
                   {
                       SqlCommand command = new SqlCommand(commandText, connection);
                       command.Parameters.Add("@ID", SqlDbType.Int);
                       command.Parameters["@ID"].Value = customerID;
-          
+
                       // Use AddWithValue to assign Demographics.
                       // SQL Server will implicitly convert strings into XML.
                       command.Parameters.AddWithValue("@demographics", demoXml);
-          
+
                       try
                       {
                           connection.Open();
@@ -3579,7 +3579,7 @@ The following example demonstrates how to create a <xref:Microsoft.Data.SqlClien
 
               static private string GetConnectionString()
               {
-                  // To avoid storing the connection string in your code, 
+                  // To avoid storing the connection string in your code,
                   // you can retrieve it from a configuration file.
                   return "Data Source=(local);Initial Catalog=AdventureWorks;"
                        + "Integrated Security=SSPI";
@@ -3606,7 +3606,7 @@ If you call an `Execute` method after calling <xref:Microsoft.Data.SqlClient.Sql
 
 Output parameters (whether prepared or not) must have a user-specified data type. If you specify a variable length data type except vector, you must also specify the maximum <xref:Microsoft.Data.SqlClient.SqlParameter.Size%2A>.
 
-For vector data types, the <xref:Microsoft.Data.SqlClient.SqlParameter.Size%2A> property is ignored. The size of the vector is inferred from the <xref:Microsoft.Data.SqlClient.SqlParameter.Value%2A> of type <xref:Microsoft.Data.SqlTypes.SqlVector%2A>.
+For vector data types, the <xref:Microsoft.Data.SqlClient.SqlParameter.Size%2A> property is ignored. The size of the vector is inferred from the <xref:Microsoft.Data.SqlClient.SqlParameter.Value%2A> of type <xref:Microsoft.Data.SqlTypes.SqlVector`1>.
 
 Prior to Visual Studio 2010, <xref:Microsoft.Data.SqlClient.SqlCommand.Prepare%2A> threw an exception.  Beginning in Visual Studio 2010, this method does not throw an exception.
 
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml
index 7a2f32a0bf..468c5046a6 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml
@@ -72,7 +72,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main()
@@ -84,7 +84,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                   // Assumes that connection is a valid SqlConnection object
                   SqlDataAdapter adapter = new SqlDataAdapter();
                   adapter.MissingSchemaAction = MissingSchemaAction.AddWithKey;
-          
+
                   // Create the commands.
                   adapter.SelectCommand = new SqlCommand(
                       "SELECT CustomerID, CompanyName FROM CUSTOMERS", connection);
@@ -96,7 +96,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       "WHERE CustomerID = @oldCustomerID", connection);
                   adapter.DeleteCommand = new SqlCommand(
                       "DELETE FROM Customers WHERE CustomerID = @CustomerID", connection);
-          
+
                   // Create the parameters.
                   adapter.InsertCommand.Parameters.Add(
                       "@CustomerID",
@@ -108,7 +108,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       SqlDbType.VarChar,
                       40,
                       "CompanyName");
-          
+
                   adapter.UpdateCommand.Parameters.Add(
                       "@CustomerID",
                       SqlDbType.Char,
@@ -125,22 +125,22 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       5,
                       "CustomerID"
                   ).SourceVersion = DataRowVersion.Original;
-          
+
                   adapter.DeleteCommand.Parameters.Add(
                     "@CustomerID",
                     SqlDbType.Char,
                     5,
                     "CustomerID"
                   ).SourceVersion = DataRowVersion.Original;
-          
+
                   return adapter;
               }
-          
+
               public static SqlDataAdapter CustomerUpdateCommand(SqlDataAdapter adapter)
               {
                   // Assumes that connection is a valid SqlAdapter object
                   adapter.UpdateCommand.Parameters.Add(
-                      "@CompanyName", 
+                      "@CompanyName",
                       SqlDbType.VarChar,
                       15,
                       "CompanyName");
@@ -197,7 +197,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main()
@@ -208,19 +208,19 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
               {
                   SqlDataAdapter adapter = new SqlDataAdapter(selectCommand);
                   adapter.MissingSchemaAction = MissingSchemaAction.AddWithKey;
-          
+
                   // Create the other commands.
                   adapter.InsertCommand = new SqlCommand(
                       "INSERT INTO Customers (CustomerID, CompanyName) " +
                       "VALUES (@CustomerID, @CompanyName)", connection);
-          
+
                   adapter.UpdateCommand = new SqlCommand(
                       "UPDATE Customers SET CustomerID = @CustomerID, CompanyName = @CompanyName " +
                       "WHERE CustomerID = @oldCustomerID", connection);
-          
+
                   adapter.DeleteCommand = new SqlCommand(
                       "DELETE FROM Customers WHERE CustomerID = @CustomerID", connection);
-          
+
                   // Create the parameters.
                   adapter.InsertCommand.Parameters.Add(
                       "@CustomerID",
@@ -232,7 +232,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       SqlDbType.VarChar,
                       40,
                       "CompanyName");
-          
+
                   adapter.UpdateCommand.Parameters.Add(
                       "@CustomerID",
                       SqlDbType.Char,
@@ -249,14 +249,14 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       5,
                       "CustomerID"
                   ).SourceVersion = DataRowVersion.Original;
-          
+
                   adapter.DeleteCommand.Parameters.Add(
                       "@CustomerID",
                       SqlDbType.Char,
                       5,
                       "CustomerID"
                   ).SourceVersion = DataRowVersion.Original;
-          
+
                   return adapter;
               }
           }
@@ -311,31 +311,31 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main()
               {
               }
-            
+
               public static SqlDataAdapter CreateSqlDataAdapter(string commandText, SqlConnection connection)
               {
                   SqlDataAdapter adapter = new SqlDataAdapter(commandText, connection);
-          
+
                   adapter.MissingSchemaAction = MissingSchemaAction.AddWithKey;
-          
+
                   // Create the other commands.
                   adapter.InsertCommand = new SqlCommand(
                       "INSERT INTO Customers (CustomerID, CompanyName) " +
                       "VALUES (@CustomerID, @CompanyName)");
-          
+
                   adapter.UpdateCommand = new SqlCommand(
                       "UPDATE Customers SET CustomerID = @CustomerID, CompanyName = @CompanyName " +
                       "WHERE CustomerID = @oldCustomerID");
-          
+
                   adapter.DeleteCommand = new SqlCommand(
                       "DELETE FROM Customers WHERE CustomerID = @CustomerID");
-          
+
                   // Create the parameters.
                   adapter.InsertCommand.Parameters.Add(
                       "@CustomerID",
@@ -347,7 +347,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       SqlDbType.VarChar,
                       40,
                       "CompanyName");
-          
+
                   adapter.UpdateCommand.Parameters.Add(
                       "@CustomerID",
                       SqlDbType.Char,
@@ -364,14 +364,14 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       5,
                       "CustomerID"
                   ).SourceVersion = DataRowVersion.Original;
-          
+
                   adapter.DeleteCommand.Parameters.Add(
                       "@CustomerID",
                       SqlDbType.Char,
                       5,
                       "CustomerID"
                   ).SourceVersion = DataRowVersion.Original;
-          
+
                   return adapter;
               }
           }
@@ -426,32 +426,32 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main()
               {
               }
-            
+
               public static SqlDataAdapter CreateSqlDataAdapter(string commandText, string connectionString)
               {
                   SqlDataAdapter adapter = new SqlDataAdapter(commandText, connectionString);
                   SqlConnection connection = adapter.SelectCommand.Connection;
-          
+
                   adapter.MissingSchemaAction = MissingSchemaAction.AddWithKey;
-          
+
                   // Create the commands.
                   adapter.InsertCommand = new SqlCommand(
                       "INSERT INTO Customers (CustomerID, CompanyName) " +
                       "VALUES (@CustomerID, @CompanyName)", connection);
-          
+
                   adapter.UpdateCommand = new SqlCommand(
                       "UPDATE Customers SET CustomerID = @CustomerID, CompanyName = @CompanyName " +
                       "WHERE CustomerID = @oldCustomerID", connection);
-          
+
                   adapter.DeleteCommand = new SqlCommand(
                       "DELETE FROM Customers WHERE CustomerID = @CustomerID", connection);
-          
+
                   // Create the parameters.
                   adapter.InsertCommand.Parameters.Add(
                       "@CustomerID",
@@ -463,7 +463,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       SqlDbType.VarChar,
                       40,
                       "CompanyName");
-          
+
                   adapter.UpdateCommand.Parameters.Add(
                       "@CustomerID",
                       SqlDbType.Char,
@@ -480,14 +480,14 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       5,
                       "CustomerID"
                   ).SourceVersion = DataRowVersion.Original;
-          
+
                   adapter.DeleteCommand.Parameters.Add(
                       "@CustomerID",
                       SqlDbType.Char,
                       5,
                       "CustomerID"
                   ).SourceVersion = DataRowVersion.Original;
-          
+
                   return adapter;
               }
           }
@@ -589,7 +589,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main()
@@ -599,53 +599,53 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
               public static SqlDataAdapter CreateCustomerAdapter(SqlConnection connection)
               {
                   SqlDataAdapter adapter = new SqlDataAdapter();
-          
+
                   // Create the SelectCommand.
                   SqlCommand command = new SqlCommand("SELECT * FROM Customers " +
                       "WHERE Country = @Country AND City = @City", connection);
-          
+
                   // Add the parameters for the SelectCommand.
                   command.Parameters.Add("@Country", SqlDbType.NVarChar, 15);
                   command.Parameters.Add("@City", SqlDbType.NVarChar, 15);
-          
+
                   adapter.SelectCommand = command;
-          
+
                   // Create the InsertCommand.
                   command = new SqlCommand(
                       "INSERT INTO Customers (CustomerID, CompanyName) " +
                       "VALUES (@CustomerID, @CompanyName)", connection);
-          
+
                   // Add the parameters for the InsertCommand.
                   command.Parameters.Add("@CustomerID", SqlDbType.NChar, 5, "CustomerID");
                   command.Parameters.Add("@CompanyName", SqlDbType.NVarChar, 40, "CompanyName");
-          
+
                   adapter.InsertCommand = command;
-          
+
                   // Create the UpdateCommand.
                   command = new SqlCommand(
                       "UPDATE Customers SET CustomerID = @CustomerID, CompanyName = @CompanyName " +
                       "WHERE CustomerID = @oldCustomerID", connection);
-          
+
                   // Add the parameters for the UpdateCommand.
                   command.Parameters.Add("@CustomerID", SqlDbType.NChar, 5, "CustomerID");
                   command.Parameters.Add("@CompanyName", SqlDbType.NVarChar, 40, "CompanyName");
                   SqlParameter parameter = command.Parameters.Add(
                       "@oldCustomerID", SqlDbType.NChar, 5, "CustomerID");
                   parameter.SourceVersion = DataRowVersion.Original;
-          
+
                   adapter.UpdateCommand = command;
-          
+
                   // Create the DeleteCommand.
                   command = new SqlCommand(
                       "DELETE FROM Customers WHERE CustomerID = @CustomerID", connection);
-          
+
                   // Add the parameters for the DeleteCommand.
                   parameter = command.Parameters.Add(
                       "@CustomerID", SqlDbType.NChar, 5, "CustomerID");
                   parameter.SourceVersion = DataRowVersion.Original;
-          
+
                   adapter.DeleteCommand = command;
-          
+
                   return adapter;
               }
           }
@@ -738,63 +738,63 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main()
               {
               }
-            
+
               public static SqlDataAdapter CreateCustomerAdapter(SqlConnection connection)
               {
                   SqlDataAdapter adapter = new SqlDataAdapter();
-          
+
                   // Create the SelectCommand.
                   SqlCommand command = new SqlCommand("SELECT * FROM Customers " +
                       "WHERE Country = @Country AND City = @City", connection);
-          
+
                   // Add the parameters for the SelectCommand.
                   command.Parameters.Add("@Country", SqlDbType.NVarChar, 15);
                   command.Parameters.Add("@City", SqlDbType.NVarChar, 15);
-          
+
                   adapter.SelectCommand = command;
-          
+
                   // Create the InsertCommand.
                   command = new SqlCommand(
                       "INSERT INTO Customers (CustomerID, CompanyName) " +
                       "VALUES (@CustomerID, @CompanyName)", connection);
-          
+
                   // Add the parameters for the InsertCommand.
                   command.Parameters.Add("@CustomerID", SqlDbType.NChar, 5, "CustomerID");
                   command.Parameters.Add("@CompanyName", SqlDbType.NVarChar, 40, "CompanyName");
-          
+
                   adapter.InsertCommand = command;
-          
+
                   // Create the UpdateCommand.
                   command = new SqlCommand(
                       "UPDATE Customers SET CustomerID = @CustomerID, CompanyName = @CompanyName " +
                       "WHERE CustomerID = @oldCustomerID", connection);
-          
+
                   // Add the parameters for the UpdateCommand.
                   command.Parameters.Add("@CustomerID", SqlDbType.NChar, 5, "CustomerID");
                   command.Parameters.Add("@CompanyName", SqlDbType.NVarChar, 40, "CompanyName");
                   SqlParameter parameter = command.Parameters.Add(
                       "@oldCustomerID", SqlDbType.NChar, 5, "CustomerID");
                   parameter.SourceVersion = DataRowVersion.Original;
-          
+
                   adapter.UpdateCommand = command;
-          
+
                   // Create the DeleteCommand.
                   command = new SqlCommand(
                       "DELETE FROM Customers WHERE CustomerID = @CustomerID", connection);
-          
+
                   // Add the parameters for the DeleteCommand.
                   parameter = command.Parameters.Add(
                       "@CustomerID", SqlDbType.NChar, 5, "CustomerID");
                   parameter.SourceVersion = DataRowVersion.Original;
-          
+
                   adapter.DeleteCommand = command;
-          
+
                   return adapter;
               }
           }
@@ -833,11 +833,11 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
         </para>
         <list type="number">
           <item><description>The values in the <see cref="T:System.Data.DataRow" /> are moved to the parameter values.</description></item>
-          <item><description>The <see cref="M:Microsoft.Data.SqlClient.SqlDataAdapter.OnRowUpdating(System.Data.Common.RowUpdatingEventArgs)" /> event is raised.</description></item>
+          <item><description>The <see cref="E:Microsoft.Data.SqlClient.SqlDataAdapter.RowUpdating" /> event is raised.</description></item>
           <item><description>The command executes.</description></item>
           <item><description>If the command is set to <c>FirstReturnedRecord</c>, the first returned result is placed in the <see cref="T:System.Data.DataRow" />.</description></item>
           <item><description>If there are output parameters, they are placed in the <see cref="T:System.Data.DataRow" />.</description></item>
-          <item><description>The <see cref="M:Microsoft.Data.SqlClient.SqlDataAdapter.OnRowUpdated(System.Data.Common.RowUpdatedEventArgs)" /> event is raised.</description></item>
+          <item><description>The <see cref="E:Microsoft.Data.SqlClient.SqlDataAdapter.RowUpdated" /> event is raised.</description></item>
           <item><description><see cref="M:System.Data.DataRow.AcceptChanges" /> is called.</description></item>
         </list>
       </remarks>
@@ -853,55 +853,55 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
           using System.Windows.Forms;
           using System.Xml;
           using Microsoft.Data.SqlClient;
-          
+
           public class Form1 : Form
           {
               private DataSet DataSet1;
               private DataGrid dataGrid1;
-          
+
               // handler for RowUpdating event
               private static void OnRowUpdating(object sender, SqlRowUpdatingEventArgs e)
               {
                   PrintEventArgs(e);
               }
-          
+
               // handler for RowUpdated event
               private static void OnRowUpdated(object sender, SqlRowUpdatedEventArgs e)
               {
                   PrintEventArgs(e);
               }
-          
+
               public static int Main()
               {
                   const string connectionString = "Integrated Security=SSPI;database=Northwind;server=MSSQL1";
                   const string queryString = "SELECT * FROMProducts";
-          
+
                   // create DataAdapter
                   SqlDataAdapter adapter = new SqlDataAdapter(queryString, connectionString);
                   SqlCommandBuilder builder = new SqlCommandBuilder(adapter);
-          
+
                   // Create and fill DataSet (select only first 5 rows)
                   DataSet dataSet = new DataSet();
                   adapter.Fill(dataSet, 0, 5, "Table");
-          
+
                   // Modify DataSet
                   DataTable table = dataSet.Tables["Table"];
                   table.Rows[0][1] = "new product";
-          
+
                   // add handlers
                   adapter.RowUpdating += new SqlRowUpdatingEventHandler(OnRowUpdating);
                   adapter.RowUpdated += new SqlRowUpdatedEventHandler(OnRowUpdated);
-          
-                  // update, this operation fires two events 
-                  // (RowUpdating/RowUpdated) per changed row 
+
+                  // update, this operation fires two events
+                  // (RowUpdating/RowUpdated) per changed row
                   adapter.Update(dataSet, "Table");
-          
+
                   // remove handlers
                   adapter.RowUpdating -= new SqlRowUpdatingEventHandler(OnRowUpdating);
                   adapter.RowUpdated -= new SqlRowUpdatedEventHandler(OnRowUpdated);
                   return 0;
               }
-          
+
               private static void PrintEventArgs(SqlRowUpdatingEventArgs args)
               {
                   Console.WriteLine("OnRowUpdating");
@@ -910,7 +910,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       " commandType=" + args.StatementType +
                       " status=" + args.Status + ")");
               }
-          
+
               private static void PrintEventArgs(SqlRowUpdatedEventArgs args)
               {
                   Console.WriteLine("OnRowUpdated");
@@ -946,11 +946,11 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
         </para>
         <list type="number">
           <item><description>The values in the <see cref="T:System.Data.DataRow" /> are moved to the parameter values.</description></item>
-          <item><description>The <see cref="M:Microsoft.Data.SqlClient.SqlDataAdapter.OnRowUpdating(System.Data.Common.RowUpdatingEventArgs)" /> event is raised.</description></item>
+          <item><description>The <see cref="E:Microsoft.Data.SqlClient.SqlDataAdapter.RowUpdating" /> event is raised.</description></item>
           <item><description>The command executes.</description></item>
           <item><description>If the command is set to <c>FirstReturnedRecord</c>, the first returned result is placed in the <see cref="T:System.Data.DataRow" />.</description></item>
           <item><description>If there are output parameters, they are placed in the <see cref="T:System.Data.DataRow" />.</description></item>
-          <item><description>The <see cref="M:Microsoft.Data.SqlClient.SqlDataAdapter.OnRowUpdated(System.Data.Common.RowUpdatedEventArgs)" /> event is raised.</description></item>
+          <item><description>The <see cref="E:Microsoft.Data.SqlClient.SqlDataAdapter.RowUpdated" /> event is raised.</description></item>
           <item><description><see cref="M:System.Data.DataRow.AcceptChanges" /> is called.</description></item>
         </list>
       </remarks>
@@ -966,55 +966,55 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
           using System.Windows.Forms;
           using System.Xml;
           using Microsoft.Data.SqlClient;
-          
+
           public class Form1 : Form
           {
               private DataSet DataSet1;
               private DataGrid dataGrid1;
-          
+
               // handler for RowUpdating event
               private static void OnRowUpdating(object sender, SqlRowUpdatingEventArgs e)
               {
                   PrintEventArgs(e);
               }
-          
+
               // handler for RowUpdated event
               private static void OnRowUpdated(object sender, SqlRowUpdatedEventArgs e)
               {
                   PrintEventArgs(e);
               }
-          
+
               public static int Main()
               {
                   const string connectionString = "Integrated Security=SSPI;database=Northwind;server=MSSQL1";
                   const string queryString = "SELECT * FROMProducts";
-          
+
                   // create DataAdapter
                   SqlDataAdapter adapter = new SqlDataAdapter(queryString, connectionString);
                   SqlCommandBuilder builder = new SqlCommandBuilder(adapter);
-          
+
                   // Create and fill DataSet (select only first 5 rows)
                   DataSet dataSet = new DataSet();
                   adapter.Fill(dataSet, 0, 5, "Table");
-          
+
                   // Modify DataSet
                   DataTable table = dataSet.Tables["Table"];
                   table.Rows[0][1] = "new product";
-          
+
                   // add handlers
                   adapter.RowUpdating += new SqlRowUpdatingEventHandler(OnRowUpdating);
                   adapter.RowUpdated += new SqlRowUpdatedEventHandler(OnRowUpdated);
-          
-                  // update, this operation fires two events 
-                  // (RowUpdating/RowUpdated) per changed row 
+
+                  // update, this operation fires two events
+                  // (RowUpdating/RowUpdated) per changed row
                   adapter.Update(dataSet, "Table");
-          
+
                   // remove handlers
                   adapter.RowUpdating -= new SqlRowUpdatingEventHandler(OnRowUpdating);
                   adapter.RowUpdated -= new SqlRowUpdatedEventHandler(OnRowUpdated);
                   return 0;
               }
-          
+
               private static void PrintEventArgs(SqlRowUpdatingEventArgs args)
               {
                   Console.WriteLine("OnRowUpdating");
@@ -1023,7 +1023,7 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
                       " commandType=" + args.StatementType +
                       " status=" + args.Status + ")");
               }
-          
+
               private static void PrintEventArgs(SqlRowUpdatedEventArgs args)
               {
                   Console.WriteLine("OnRowUpdated");
@@ -1073,63 +1073,63 @@ The following example uses the <xref:Microsoft.Data.SqlClient.SqlCommand>, <xref
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main()
               {
               }
-            
+
               public static SqlDataAdapter CreateCustomerAdapter(SqlConnection connection)
               {
                   SqlDataAdapter adapter = new SqlDataAdapter();
-          
+
                   // Create the SelectCommand.
                   SqlCommand command = new SqlCommand("SELECT * FROM Customers " +
                       "WHERE Country = @Country AND City = @City", connection);
-          
+
                   // Add the parameters for the SelectCommand.
                   command.Parameters.Add("@Country", SqlDbType.NVarChar, 15);
                   command.Parameters.Add("@City", SqlDbType.NVarChar, 15);
-          
+
                   adapter.SelectCommand = command;
-          
+
                   // Create the InsertCommand.
                   command = new SqlCommand(
                       "INSERT INTO Customers (CustomerID, CompanyName) " +
                       "VALUES (@CustomerID, @CompanyName)", connection);
-          
+
                   // Add the parameters for the InsertCommand.
                   command.Parameters.Add("@CustomerID", SqlDbType.NChar, 5, "CustomerID");
                   command.Parameters.Add("@CompanyName", SqlDbType.NVarChar, 40, "CompanyName");
-          
+
                   adapter.InsertCommand = command;
-          
+
                   // Create the UpdateCommand.
                   command = new SqlCommand(
                       "UPDATE Customers SET CustomerID = @CustomerID, CompanyName = @CompanyName " +
                       "WHERE CustomerID = @oldCustomerID", connection);
-          
+
                   // Add the parameters for the UpdateCommand.
                   command.Parameters.Add("@CustomerID", SqlDbType.NChar, 5, "CustomerID");
                   command.Parameters.Add("@CompanyName", SqlDbType.NVarChar, 40, "CompanyName");
                   SqlParameter parameter = command.Parameters.Add(
                       "@oldCustomerID", SqlDbType.NChar, 5, "CustomerID");
                   parameter.SourceVersion = DataRowVersion.Original;
-          
+
                   adapter.UpdateCommand = command;
-          
+
                   // Create the DeleteCommand.
                   command = new SqlCommand(
                       "DELETE FROM Customers WHERE CustomerID = @CustomerID", connection);
-          
+
                   // Add the parameters for the DeleteCommand.
                   parameter = command.Parameters.Add(
                       "@CustomerID", SqlDbType.NChar, 5, "CustomerID");
                   parameter.SourceVersion = DataRowVersion.Original;
-          
+
                   adapter.DeleteCommand = command;
-          
+
                   return adapter;
               }
           }
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml
index ff54d18a17..10c67a4890 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml
@@ -667,7 +667,7 @@ No conversions are performed; therefore. the data retrieved must already be a ch
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main()
@@ -676,7 +676,7 @@ No conversions are performed; therefore. the data retrieved must already be a ch
                              + "Integrated Security=SSPI";
                   ReadGetOrdinal(str);
               }
-          
+
               private static void ReadGetOrdinal(string connectionString)
               {
                   string queryString = "SELECT DISTINCT CustomerID FROM dbo.Orders;";
@@ -684,18 +684,18 @@ No conversions are performed; therefore. the data retrieved must already be a ch
                   {
                       SqlCommand command = new SqlCommand(queryString, connection);
                       connection.Open();
-          
+
                       SqlDataReader reader = command.ExecuteReader();
-          
+
                       // Call GetOrdinal and assign value to variable.
                       int customerID = reader.GetOrdinal("CustomerID");
-          
+
                       // Use variable with GetString inside of loop.
                       while (reader.Read())
                       {
                           Console.WriteLine("CustomerID={0}", reader.GetString(customerID));
                       }
-          
+
                       // Call Close when done reading.
                       reader.Close();
                   }
@@ -967,10 +967,10 @@ The <xref:Microsoft.Data.SqlClient.SqlDataReader.GetSchemaTable%2A> method retur
     <GetSqlVector>
       <param name="i"></param>
       <summary>
-        Gets the value of the specified column as a <see cref="T:Microsoft.Data.SqlTypes.SqlVector"/>.
+        Gets the value of the specified column as a <see cref="T:Microsoft.Data.SqlTypes.SqlVector`1" />.
       </summary>
       <returns>
-        A <see cref="T:Microsoft.Data.SqlTypes.SqlVector"/> object representing the column at the given ordinal.
+        A <see cref="T:Microsoft.Data.SqlTypes.SqlVector`1"/> object representing the column at the given ordinal.
       </returns>
       <exception cref="T:System.ArgumentOutOfRangeException">
         The index passed was outside the range of 0 to <see cref="P:System.Data.DataTableReader.FieldCount" /> - 1
@@ -979,7 +979,7 @@ The <xref:Microsoft.Data.SqlClient.SqlDataReader.GetSchemaTable%2A> method retur
         An attempt was made to read or access columns in a closed <see cref="T:Microsoft.Data.SqlClient.SqlDataReader" />.
       </exception>
       <exception cref="T:System.InvalidCastException">
-        The retrieved data is not compatible with the <see cref="T:Microsoft.Data.SqlTypes.SqlVector" /> type.
+        The retrieved data is not compatible with the <see cref="T:Microsoft.Data.SqlTypes.SqlVector`1" /> type.
       </exception>
       <remarks>
         No conversions are performed; therefore, the data retrieved must already be a vector value, or an exception is generated.
@@ -1193,7 +1193,7 @@ The <xref:Microsoft.Data.SqlClient.SqlDataReader.GetSchemaTable%2A> method retur
           <item><description>There is no data ready to be read (for example, the first <see cref="M:Microsoft.Data.SqlClient.SqlDataReader.Read" /> hasn't been called, or returned false).</description></item>
           <item><description>Tried to read a previously-read column in sequential mode.</description></item>
           <item><description>There was an asynchronous operation in progress. This applies to all Get* methods when running in sequential mode, as they could be called while reading a stream.</description></item>
-        </list>         
+        </list>
       </exception>
       <exception cref="T:System.IndexOutOfRangeException">
         Trying to read a column that does not exist.
@@ -1282,21 +1282,21 @@ The <xref:Microsoft.Data.SqlClient.SqlDataReader.GetSchemaTable%2A> method retur
               // enough for all the columns.
               Object[] values = new Object[reader.FieldCount];
               int fieldCount = reader.GetValues(values);
-      
+
               Console.WriteLine("reader.GetValues retrieved {0} columns.",
                   fieldCount);
               for (int i = 0; i &lt; fieldCount; i++)
               {
                   Console.WriteLine(values[i]);
               }
-      
+
               Console.WriteLine();
-      
-              // Now repeat, using an array that may contain a different 
+
+              // Now repeat, using an array that may contain a different
               // number of columns than the original data. This should work correctly,
-              // whether the size of the array is larger or smaller than 
+              // whether the size of the array is larger or smaller than
               // the number of columns.
-      
+
               // Attempt to retrieve three columns of data.
               values = new Object[3];
               fieldCount = reader.GetValues(values);
@@ -1334,7 +1334,7 @@ The <xref:Microsoft.Data.SqlClient.SqlDataReader.GetSchemaTable%2A> method retur
           <item><description>There is no data ready to be read (for example, the first <see cref="M:Microsoft.Data.SqlClient.SqlDataReader.Read" /> hasn't been called, or returned false).</description></item>
           <item><description>Trying to read a previously read column in sequential mode.</description></item>
           <item><description>There was an asynchronous operation in progress. This applies to all Get* methods when running in sequential mode, as they could be called while reading a stream.</description></item>
-        </list>         
+        </list>
       </exception>
       <exception cref="T:System.IndexOutOfRangeException">
         Trying to read a column that does not exist.
@@ -1394,7 +1394,7 @@ The <xref:Microsoft.Data.SqlClient.SqlDataReader.GetSchemaTable%2A> method retur
           using System;
           using System.Data;
           using Microsoft.Data.SqlClient;
-          
+
           class Program
           {
               static void Main(string[] args)
@@ -1448,7 +1448,7 @@ The <xref:Microsoft.Data.SqlClient.SqlDataReader.GetSchemaTable%2A> method retur
           <item><description>There is no data ready to be read (for example, the first <see cref="M:Microsoft.Data.SqlClient.SqlDataReader.Read" /> hasn't been called, or returned false).</description></item>
           <item><description>Trying to read a previously read column in sequential mode.</description></item>
           <item><description>There was an asynchronous operation in progress. This applies to all Get* methods when running in sequential mode, as they could be called while reading a stream.</description></item>
-        </list>         
+        </list>
       </exception>
       <exception cref="T:System.IndexOutOfRangeException">
         Trying to read a column that does not exist.

From 14bbf42e44ae35eaa95decf08c9b8863af2f617e Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Fri, 27 Mar 2026 20:29:06 +0000
Subject: [PATCH 015/298] Merge SqlType resource methodology, removed unused
 strings (#3733)

---
 .../src/Microsoft.Data.SqlClient.csproj       |  3 -
 .../netfx/src/Microsoft.Data.SqlClient.csproj |  3 -
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |  3 +
 .../src/Microsoft/Data/SqlClient/SqlBuffer.cs |  4 +-
 .../src/Microsoft/Data/SqlClient/SqlUtil.cs   | 11 ++-
 .../Microsoft/Data/SqlTypes/SQLResource.cs    | 77 -------------------
 .../src/Microsoft/Data/SqlTypes/SqlVector.cs  |  4 +-
 .../Microsoft/Data/SqlTypes/SqlVectorTest.cs  |  4 +-
 8 files changed, 19 insertions(+), 90 deletions(-)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SQLResource.cs

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
index 7145dbac28..c2fdb27f3f 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -1002,9 +1002,6 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlJson.cs">
       <Link>Microsoft\Data\SqlTypes\SqlJson.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SQLResource.cs">
-      <Link>Microsoft\Data\SQLTypes\SQLResource.cs</Link>
-    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs">
       <Link>Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs</Link>
     </Compile>
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index 8408dabc0d..eb14ccc985 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -979,9 +979,6 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlVector.cs">
       <Link>Microsoft\Data\SqlTypes\SqlVector.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SQLResource.cs">
-      <Link>Microsoft\Data\SqlTypes\SQLResource.cs</Link>
-    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs">
       <Link>Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs</Link>
     </Compile>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index e2a84bad04..7868c8c876 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -378,6 +378,9 @@ internal static AuthenticationException SSLCertificateAuthenticationException(st
         internal static ArgumentOutOfRangeException NotSupportedEnumerationValue(Type type, string value, string method)
             => ArgumentOutOfRange(StringsHelper.GetString(Strings.ADP_NotSupportedEnumerationValue, type.Name, value, method), type.Name);
 
+        internal static ArgumentOutOfRangeException InvalidArraySize(string parameterName) =>
+            ArgumentOutOfRange(StringsHelper.GetString(Strings.SqlMisc_InvalidArraySizeMessage), parameterName);
+
         internal static void CheckArgumentNull(object value, string parameterName)
         {
             if (value is null)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBuffer.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBuffer.cs
index 385a49c802..0ec34003f7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBuffer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBuffer.cs
@@ -271,11 +271,11 @@ internal decimal Decimal
                                 }
                                 catch (OverflowException)
                                 {
-                                    throw new OverflowException(SQLResource.ConversionOverflowMessage);
+                                    throw SQL.ConversionOverflow();
                                 }
                             }
                         }
-                        throw new OverflowException(SQLResource.ConversionOverflowMessage);
+                        throw SQL.ConversionOverflow();
                     }
                     return new decimal(_value._numericInfo._data1, _value._numericInfo._data2, _value._numericInfo._data3, !_value._numericInfo._positive, _value._numericInfo._scale);
                 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
index 8f0d7fcba0..ab2261f0e9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
@@ -830,9 +830,14 @@ internal static Exception UDTUnexpectedResult(string exceptionText)
             return ADP.TypeLoad(StringsHelper.GetString(Strings.SQLUDT_Unexpected, exceptionText));
         }
 
+        internal static Exception ConversionOverflow()
+        {
+            return new OverflowException(StringsHelper.GetString(Strings.SqlMisc_ConversionOverflowMessage));
+        }
+
         internal static Exception DateTimeOverflow()
         {
-            return new OverflowException(SqlTypes.SQLResource.DateTimeOverflowMessage);
+            return new OverflowException(StringsHelper.GetString(Strings.SqlMisc_DateTimeOverflowMessage));
         }
 
         //
@@ -2285,6 +2290,10 @@ internal static string ExRoutingDestination()
         {
             return StringsHelper.GetString(Strings.SQL_ExRoutingDestination);
         }
+        internal static string NullString()
+        {
+            return StringsHelper.GetString(Strings.SqlMisc_NullString);
+        }
     }
 
     /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SQLResource.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SQLResource.cs
deleted file mode 100644
index 327d182d03..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SQLResource.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Data.SqlTypes
-{
-
-    using System;
-    using Microsoft.Data;
-
-    internal sealed class SQLResource
-    {
-
-        private SQLResource() { /* prevent utility class from being instantiated*/ }
-
-        internal static readonly String NullString = StringsHelper.GetString(Strings.SqlMisc_NullString);
-
-        internal static readonly String MessageString = StringsHelper.GetString(Strings.SqlMisc_MessageString);
-
-        internal static readonly String ArithOverflowMessage = StringsHelper.GetString(Strings.SqlMisc_ArithOverflowMessage);
-
-        internal static readonly String DivideByZeroMessage = StringsHelper.GetString(Strings.SqlMisc_DivideByZeroMessage);
-
-        internal static readonly String NullValueMessage = StringsHelper.GetString(Strings.SqlMisc_NullValueMessage);
-
-        internal static readonly String TruncationMessage = StringsHelper.GetString(Strings.SqlMisc_TruncationMessage);
-
-        internal static readonly String DateTimeOverflowMessage = StringsHelper.GetString(Strings.SqlMisc_DateTimeOverflowMessage);
-
-        internal static readonly String ConcatDiffCollationMessage = StringsHelper.GetString(Strings.SqlMisc_ConcatDiffCollationMessage);
-
-        internal static readonly String CompareDiffCollationMessage = StringsHelper.GetString(Strings.SqlMisc_CompareDiffCollationMessage);
-
-        internal static readonly String InvalidFlagMessage = StringsHelper.GetString(Strings.SqlMisc_InvalidFlagMessage);
-
-        internal static readonly String NumeToDecOverflowMessage = StringsHelper.GetString(Strings.SqlMisc_NumeToDecOverflowMessage);
-
-        internal static readonly String ConversionOverflowMessage = StringsHelper.GetString(Strings.SqlMisc_ConversionOverflowMessage);
-
-        internal static readonly String InvalidDateTimeMessage = StringsHelper.GetString(Strings.SqlMisc_InvalidDateTimeMessage);
-
-        internal static readonly String TimeZoneSpecifiedMessage = StringsHelper.GetString(Strings.SqlMisc_TimeZoneSpecifiedMessage);
-
-        internal static readonly String InvalidArraySizeMessage = StringsHelper.GetString(Strings.SqlMisc_InvalidArraySizeMessage);
-
-        internal static readonly String InvalidPrecScaleMessage = StringsHelper.GetString(Strings.SqlMisc_InvalidPrecScaleMessage);
-
-        internal static readonly String FormatMessage = StringsHelper.GetString(Strings.SqlMisc_FormatMessage);
-
-        internal static readonly String NotFilledMessage = StringsHelper.GetString(Strings.SqlMisc_NotFilledMessage);
-
-        internal static readonly String AlreadyFilledMessage = StringsHelper.GetString(Strings.SqlMisc_AlreadyFilledMessage);
-
-        internal static readonly String ClosedXmlReaderMessage = StringsHelper.GetString(Strings.SqlMisc_ClosedXmlReaderMessage);
-
-        internal static String InvalidOpStreamClosed(String method)
-        {
-            return StringsHelper.GetString(Strings.SqlMisc_InvalidOpStreamClosed, method);
-        }
-
-        internal static String InvalidOpStreamNonWritable(String method)
-        {
-            return StringsHelper.GetString(Strings.SqlMisc_InvalidOpStreamNonWritable, method);
-        }
-
-        internal static String InvalidOpStreamNonReadable(String method)
-        {
-            return StringsHelper.GetString(Strings.SqlMisc_InvalidOpStreamNonReadable, method);
-        }
-
-        internal static String InvalidOpStreamNonSeekable(String method)
-        {
-            return StringsHelper.GetString(Strings.SqlMisc_InvalidOpStreamNonSeekable, method);
-        }
-    } // SqlResource
-
-} // namespace System
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs
index 14e790e977..2e83b8daff 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs
@@ -41,7 +41,7 @@ private SqlVector(int length)
     {
         if (length < 0)
         {
-            throw ADP.ArgumentOutOfRange(nameof(length), SQLResource.InvalidArraySizeMessage);
+            throw ADP.InvalidArraySize(nameof(length));
         }
 
         (_elementType, _elementSize) = GetTypeFieldsOrThrow();
@@ -92,7 +92,7 @@ internal string GetString()
     {
         if (IsNull)
         {
-            return SQLResource.NullString;
+            return SQLMessage.NullString();
         }
         return JsonSerializer.Serialize(Memory);
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlVectorTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlVectorTest.cs
index adca0e2b99..1b34c66298 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlVectorTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlVectorTest.cs
@@ -38,7 +38,7 @@ public void Construct_Length()
         // to the same memory.  We want to check memory content equality, so we
         // compare their arrays instead.
         Assert.Equal(new ReadOnlyMemory<float>().ToArray(), vec.Memory.ToArray());
-        Assert.Equal(SQLResource.NullString, vec.GetString());
+        Assert.Equal(SQLMessage.NullString(), vec.GetString());
 
         var ivec = vec as ISqlVector;
         Assert.Equal(0x00, ivec.ElementType);
@@ -58,7 +58,7 @@ public void Construct_WithLengthZero()
         // to the same memory.  We want to check memory content equality, so we
         // compare their arrays instead.
         Assert.Equal(new ReadOnlyMemory<float>().ToArray(), vec.Memory.ToArray());
-        Assert.Equal(SQLResource.NullString, vec.GetString());
+        Assert.Equal(SQLMessage.NullString(), vec.GetString());
 
         var ivec = vec as ISqlVector;
         Assert.Equal(0x00, ivec.ElementType);

From 938d245026622ad80cabbf3ebde17565fe45d157 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 30 Mar 2026 08:12:11 -0300
Subject: [PATCH 016/298] Changed SBOM package version to use build number
 (#4095)

---
 eng/pipelines/onebranch/sqlclient-non-official.yml | 2 +-
 eng/pipelines/onebranch/sqlclient-official.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index 25dbe98097..d4b62ac5e8 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -154,7 +154,7 @@ extends:
       sbom:
         enabled: true
         packageName: Microsoft.Data.SqlClient
-        packageVersion: $(mdsPackageVersion)
+        packageVersion: $(Build.BuildNumber)
       policheck:
         enabled: true
         break: true
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 1754918116..93287c3c51 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -179,7 +179,7 @@ extends:
       sbom:
         enabled: true
         packageName: Microsoft.Data.SqlClient
-        packageVersion: $(mdsPackageVersion)
+        packageVersion: $(Build.BuildNumber)
       policheck:
         enabled: true
         break: true

From 2c37eb979b7be6616700832637788d941aa3a4cb Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Tue, 31 Mar 2026 15:39:36 -0500
Subject: [PATCH 017/298] Merge | Official Builds From Common Project (#4068)

* Drop compound-* from onebranch step files for my own sanity

* Consolidate compound-publish-symbols and publish-symbols-step into publish-symbols-step.

* Rename code-analyze-step to roslyn-analyzers-csproj-step (for later changes)

* Add mds-specific job/steps

* Swap in build-signed-mds-package-job.yml for build-signed-sqlclient-package-job.yml

* Remove dead job/steps

* Fix folder path for DLL signing steps.

* Addressing comments, round 1

* Addressing comments, round 2

Not sure how the PackBuild target got lost, but I brought it back

* Add the new parameters to the csproj build job

* Use variables artifact names in release stage

* Two more quick fixes as per comments

* ESRP searches recursively?

* Fine, I give up, I will put the package output in PACK_OUTPUT.

* Reinstate job-level apiscan parameter assignment

* Wire isOfficial to MDS build job after rebase

* Rework versioning logic and move package version calculation (outside of pipelines) entirely to MdsVersions.props

* Add build number to PackMds target call in official pipeline

* Remove assembly "file" versions as it is not necessary.

* CI pipelines to automatic versioning system.

* Rework the package version for CI to match the package version for OneBranch. This band-aid avoids completely messing with the CI properties.

* Assembly version = major.0.0.0
File version = major.minor.patch.build
Package version = major.minor.patch[-suffixbuildnumber]

* Comment that Malcolm is holding the build up for.

* Can I please be done with this PR now?
---
 build2.proj                                   |  78 +++++-
 .../templates/steps/ci-project-build-step.yml |   6 +-
 .../libraries/ci-build-variables.yml          |  10 +-
 .../jobs/build-signed-csproj-package-job.yml  |  27 +-
 .../jobs/build-signed-mds-package-job.yml     | 182 ++++++++++++
 .../build-signed-sqlclient-package-job.yml    | 145 ----------
 .../jobs/validate-signed-package-job.yml      |  29 +-
 .../onebranch/stages/build-stages.yml         |  27 +-
 .../onebranch/stages/release-stages.yml       |  12 +-
 ...ld-all-configurations-signed-dlls-step.yml |  58 ----
 ...-csproj-step.yml => build-csproj-step.yml} |   2 +-
 .../onebranch/steps/build-mds-step.yml        |  41 +++
 .../steps/compound-nuget-pack-step.yml        |  86 ------
 .../steps/compound-publish-symbols-step.yml   | 162 -----------
 .../steps/copy-apiscan-files-mds-step.yml     |  39 +++
 .../steps/esrp-code-signing-step.yml          | 168 -----------
 ...ing-step.yml => esrp-dll-signing-step.yml} |  30 +-
 ...g-step.yml => esrp-nuget-signing-step.yml} |  44 +--
 ...k-csproj-step.yml => pack-csproj-step.yml} |   0
 .../onebranch/steps/pack-mds-step.yml         |  42 +++
 .../onebranch/steps/publish-symbols-step.yml  | 264 ++++++++++--------
 ...p.yml => roslyn-analyzers-csproj-step.yml} |   0
 .../steps/roslyn-analyzers-mds-step.yml       |  40 +++
 .../onebranch/variables/common-variables.yml  |   3 +-
 .../variables/onebranch-variables.yml         |   2 +-
 .../MdsVersions.props                         | 102 +++++--
 .../Microsoft.Data.SqlClient.csproj           |   2 +-
 .../ref/Microsoft.Data.SqlClient.csproj       |   2 +-
 .../src/Microsoft.Data.SqlClient.csproj       |   2 +-
 tools/targets/GenerateThisAssemblyCs.targets  |   4 +-
 30 files changed, 751 insertions(+), 858 deletions(-)
 create mode 100644 eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml
 delete mode 100644 eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
 delete mode 100644 eng/pipelines/onebranch/steps/build-all-configurations-signed-dlls-step.yml
 rename eng/pipelines/onebranch/steps/{compound-build-csproj-step.yml => build-csproj-step.yml} (95%)
 create mode 100644 eng/pipelines/onebranch/steps/build-mds-step.yml
 delete mode 100644 eng/pipelines/onebranch/steps/compound-nuget-pack-step.yml
 delete mode 100644 eng/pipelines/onebranch/steps/compound-publish-symbols-step.yml
 create mode 100644 eng/pipelines/onebranch/steps/copy-apiscan-files-mds-step.yml
 delete mode 100644 eng/pipelines/onebranch/steps/esrp-code-signing-step.yml
 rename eng/pipelines/onebranch/steps/{compound-esrp-dll-signing-step.yml => esrp-dll-signing-step.yml} (78%)
 rename eng/pipelines/onebranch/steps/{compound-esrp-nuget-signing-step.yml => esrp-nuget-signing-step.yml} (59%)
 rename eng/pipelines/onebranch/steps/{compound-pack-csproj-step.yml => pack-csproj-step.yml} (100%)
 create mode 100644 eng/pipelines/onebranch/steps/pack-mds-step.yml
 rename eng/pipelines/onebranch/steps/{code-analyze-step.yml => roslyn-analyzers-csproj-step.yml} (100%)
 create mode 100644 eng/pipelines/onebranch/steps/roslyn-analyzers-mds-step.yml

diff --git a/build2.proj b/build2.proj
index b9b08f9a4a..e2f760af75 100644
--- a/build2.proj
+++ b/build2.proj
@@ -25,6 +25,25 @@
       -p:BuildNumber=$(BuildNumber)
     </BuildNumberArgument>
 
+    <!--
+      BuildSuffix
+      Aplies to:      BuildMds*, PackMds
+      Description:    Suffix to add at the end of the package version to indicate the generated
+                      version is a pre-release.
+                      For local developer builds, this does not need to be set. If a specific
+                      package version is needed, specify PackageVersionMds. Otherwise, the
+                      generated package version will eg, 1.2.3.dev.
+                      For automated builds, this should only be specified on pre-release builds, ie
+                      PR/CI pipeline runs. For official, production-ready builds, omit this field
+                      and include a BuildNumber.
+      Default value:  [blank]
+      Example:        prbuild
+    -->
+    <BuildSuffix Condition="'$(BuildSuffix)' == ''" />
+    <BuildSuffixArgument Condition="'$(BuildSuffix)' != ''">
+      -p:BuildSuffix=$(BuildSuffix)
+    </BuildSuffixArgument>
+
     <!--
       Configuration
       Applies to:     All targets
@@ -56,6 +75,27 @@
     -->
     <NugetPath Condition="'$(NugetPath)' == ''">nuget</NugetPath>
 
+    <!--
+      PackBuild
+      Applies to:     PackMds
+      Description:    Whether the PackMds target should run BuildMds before packing. If true,
+                      BuildMds will be called as a dependency of PackMds. If false, it will not.
+                      For most developers, building immediately before packing is the norm, and
+                      this functionality is added for convenience. However, for official builds,
+                      binaries are signed between building and packing, so building immediately
+                      before packing would clobber the signed binaries.
+      Default value:  true
+      Allowed values: (true|false)
+    -->
+    <!--
+      @TODO: This is kinda hacky, ideally we can pack via dotnet pack, which will handle building,
+        and can thus be switched off by passing -no-build. However, we're not there because we need
+        to build multiple projects before packaging, and thus need to use nuget. So, until then we
+        will switch off dependency building dynamically building the target dependencies
+    -->
+    <PackBuild Condition="'$(PackBuild)' == ''">true</PackBuild>
+    <PackMdsDependsOn Condition="'$(PackBuild.ToLower())' == 'true'">BuildMds</PackMdsDependsOn>
+
     <!--
       PackageVersionAbstractions
       Applies to:     BuildMds, BuildMdsRef, BuildMdsUnix, BuildMdsWindows
@@ -291,7 +331,8 @@
 
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
-        $(PacakgeVersionMdsArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionMdsArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -316,7 +357,8 @@
 
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
-        $(PacakgeVersionMdsArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionMdsArgument)
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
@@ -341,6 +383,7 @@
 
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
+        $(BuildSuffixArgument)
         $(PackageVersionMdsArgument)
 
         <!-- Reference Type Arguments -->
@@ -367,6 +410,7 @@
 
         <!-- Versioning Arguments -->
         $(BuildNumberArgument)
+        $(BuildSuffixArgument)
         $(PackageVersionMdsArgument)
 
         <!-- Reference Type Arguments -->
@@ -388,13 +432,11 @@
     automatically build before packaging. Instead, we rely on target dependency to handle building
     the same binaries that will be packaged.
   -->
-  <Target Name="PackMds" DependsOnTargets="BuildMds">
+  <Target Name="PackMds" DependsOnTargets="$(PackMdsDependsOn)">
     <Error Text="PackageVersionAbstractions must be set!"
            Condition="'$(PackageVersionAbstractions)' == ''" />
     <Error Text="PackageVersionLogging must be set!"
            Condition="'$(PackageVersionLogging)' == ''" />
-    <Error Text="PackageVersionMds must be set !"
-           Condition="'$(PackageVersionMds)' == ''" />
 
     <PropertyGroup>
       <GitCommand>
@@ -408,13 +450,37 @@
       <Output TaskParameter="ConsoleOutput" PropertyName="CommitId" />
     </Exec>
 
+    <!-- This is a bit hacky, and can be (@TODO:) removed once packaging is done w/o a nuspec from dotnet -->
+    <PropertyGroup>
+      <GetMdsPackageVersionCommand>
+        "$(DotnetPath)dotnet" msbuild "$(MdsProjectPath)"
+        -nologo
+        -verbosity:quiet
+        -getProperty:MdsPackageVersion
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionMdsArgument)
+      </GetMdsPackageVersionCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <GetMdsPackageVersionCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GetMdsPackageVersionCommand), "\s+", " "))</GetMdsPackageVersionCommand>
+    </PropertyGroup>
+    <Message Text=">>> Evaluating MDS package version via command: $(GetMdsPackageVersionCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(GetMdsPackageVersionCommand)">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_EvaluatedMdsPackageVersion" />
+    </Exec>
+    <Error Text="Failed to evaluate MdsPackageVersion for PackMds."
+           Condition="'$(_EvaluatedMdsPackageVersion)' == ''" />
+
     <PropertyGroup>
+      <_EvaluatedMdsPackageVersion>$([System.Text.RegularExpressions.Regex]::Replace($(_EvaluatedMdsPackageVersion), "\s", ""))</_EvaluatedMdsPackageVersion>
       <CommitId>$([System.Text.RegularExpressions.Regex]::Replace($(CommitId), "\s", ""))</CommitId>
       <NuGetCommand>
         "$(NugetPath)" pack "$(MdsNuspecPath)"
         -Symbols
         -SymbolPackageFormat snupkg
-        -Version "$(PackageVersionMds)"
+        -Version "$(_EvaluatedMdsPackageVersion)"
         -OutputDirectory "$(MdsArtifactRoot)/$(ReferenceType)-$(Configuration)"
         -properties "COMMITID=$(CommitId);Configuration=$(Configuration);ReferenceType=$(ReferenceType);AbstractionsPackageVersion=$(PackageVersionAbstractions);LoggingPackageVersion=$(PackageVersionLogging)"
       </NuGetCommand>
diff --git a/eng/pipelines/common/templates/steps/ci-project-build-step.yml b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
index d43222bfd1..d2604e0b3d 100644
--- a/eng/pipelines/common/templates/steps/ci-project-build-step.yml
+++ b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
@@ -60,7 +60,9 @@ parameters:
     type: string
     default: $(loggingPackageVersion)
 
-  # Necessary to build AKV Provider when referenceType is Package.  Ignored when referenceType is Project.
+  # Package version to use for MDS package. Because we explicitly provide this version, the
+  # assembly version will be generated based on this package version and the build number.
+  # See MdsVersions.props for details on how this works.
   - name: mdsPackageVersion
     type: string
     default: $(mdsPackageVersion)
@@ -84,7 +86,7 @@ steps:
         msbuildArguments:
           -t:BuildMds
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:BuildNumber=${{ parameters.buildNumber }}
+          -p:BuildNumber=${{ parameters.assemblyBuildNumber }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
diff --git a/eng/pipelines/libraries/ci-build-variables.yml b/eng/pipelines/libraries/ci-build-variables.yml
index 2779277678..027501df0f 100644
--- a/eng/pipelines/libraries/ci-build-variables.yml
+++ b/eng/pipelines/libraries/ci-build-variables.yml
@@ -54,13 +54,13 @@ variables:
   - name: loggingPackageVersion
     value: 1.0.0.$(Build.BuildNumber)-ci
 
-  # MDS library assembly file version
-  - name: mdsAssemblyFileVersion
-    value: 7.0.0.$(assemblyBuildNumber)
-
   # MDS library NuGet package version
+  # NOTE: This differs from the other structures! MdsVersions.props will deconstruct a provided
+  #    package version and build an assembly version from it. If the build number is included
+  #    before the "-" the build number will be appended again, generating an invalid file version.
+  # @TODO: This is a band-aid to ensure that CI builds until we can centralize versioning.
   - name: mdsPackageVersion
-    value: 7.0.0.$(Build.BuildNumber)-ci
+    value: 7.0.0-ci$(AssemblyBuildNumber)
 
   # Local NuGet feed directory where downloaded pipeline artifacts are placed.
   # NuGet.config references this as a local package source for restore.
diff --git a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
index e257386918..653d9419bc 100644
--- a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
@@ -134,7 +134,7 @@ jobs:
       - template: /eng/pipelines/steps/install-dotnet.yml@self
 
       # Perform Roslyn analysis before building, since this step will clobber build output.
-      - template: /eng/pipelines/onebranch/steps/code-analyze-step.yml@self
+      - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml@self
         parameters:
           msBuildArguments: >-
             -t:$(buildTarget)
@@ -143,7 +143,7 @@ jobs:
             ${{ parameters.versionProperties }}
 
       # Build the package, producing DLLs only (no NuGet package yet).
-      - template: /eng/pipelines/onebranch/steps/compound-build-csproj-step.yml@self
+      - template: /eng/pipelines/onebranch/steps/build-csproj-step.yml@self
         parameters:
           buildTarget: $(buildTarget)
           buildConfiguration: ${{ parameters.buildConfiguration }}
@@ -151,7 +151,7 @@ jobs:
 
       - ${{ if eq(parameters.isOfficial, true) }}:
           # ESRP sign the DLLs.
-          - template: /eng/pipelines/onebranch/steps/compound-esrp-dll-signing-step.yml@self
+          - template: /eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml@self
             parameters:
               appRegistrationClientId: ${{ parameters.appRegistrationClientId }}
               appRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
@@ -182,7 +182,7 @@ jobs:
           flattenFolders: false
 
       # Pack the signed DLLs into NuGet package (NoBuild=true).
-      - template: /eng/pipelines/onebranch/steps/compound-pack-csproj-step.yml@self
+      - template: /eng/pipelines/onebranch/steps/pack-csproj-step.yml@self
         parameters:
           packTarget: $(packTarget)
           buildConfiguration: ${{ parameters.buildConfiguration }}
@@ -190,7 +190,7 @@ jobs:
 
       - ${{ if eq(parameters.isOfficial, true) }}:
           # ESRP sign the NuGet package.
-          - template: /eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml@self
+          - template: /eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml@self
             parameters:
               appRegistrationClientId: ${{ parameters.appRegistrationClientId }}
               appRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
@@ -198,11 +198,22 @@ jobs:
               authSignCertName: ${{ parameters.authSignCertName }}
               esrpClientId: ${{ parameters.esrpClientId }}
               esrpConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
-              pattern: ${{ parameters.packageFullName }}.*nupkg
+              searchPath: $(PACK_OUTPUT)
+              searchPattern: '${{ parameters.packageFullName }}.*nupkg'
 
       # Publish symbols to servers
+      # @TODO: Get these parameters from variables/libraries
       - ${{ if eq(parameters.publishSymbols, true) }}:
           - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
             parameters:
-              packageFullName: ${{ parameters.packageFullName }}
-              packageVersion: ${{ parameters.packageVersion }}
+              artifactName: '${{ parameters.packageFullName }}_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.packageVersion }}_$(System.TimelineId)'
+              azureSubscription: 'Symbols publishing Workload Identity federation service-ADO.Net'
+              packageName: '${{ parameters.packageFullName }}'
+              publishProjectName: 'Microsoft.Data.SqlClient.SNI' # This is used for all SqlClient packages. Don't know why, but it is.
+              publishServer: '$(SymbolServer)'
+              publishToInternal: 'true'
+              publishToPublic: 'true'
+              publishTokenUri: '$(SymbolTokenUri)'
+              searchPattern: '**/${{ parameters.packageFullName }}*.pdb'
+              uploadAccount: 'SqlClientDrivers'
+              version: '${{ parameters.packageVersion }}'
diff --git a/eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml
new file mode 100644
index 0000000000..4464a3a9f1
--- /dev/null
+++ b/eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml
@@ -0,0 +1,182 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Job that performs a build of Microsoft.Data.SqlClient using the build2.proj file.
+
+parameters:
+  - name: apiScanDllPath
+    type: string
+
+  - name: apiScanPdbPath
+    type: string
+
+  # Whether this build is for an "official" OneBranch pipeline. This is used to enable ESRP signing
+  # on the artifacts of this job.
+  - name: isOfficial
+    type: boolean
+
+  - name: publishSymbols
+    type: boolean
+
+  - name: signingAppRegistrationClientId
+    type: string
+
+  - name: signingAppRegistrationTenantId
+    type: string
+
+  - name: signingAuthAkvName
+    type: string
+
+  - name: signingAuthSignCertName
+    type: string
+
+  - name: signingEsrpClientId
+    type: string
+
+  - name: signingEsrpConnectedServiceName
+    type: string
+
+  - name: symbolsAzureSubscription
+    type: string
+
+  - name: symbolsPublishProjectName
+    type: string
+
+  - name: symbolsPublishServer
+    type: string
+
+  - name: symbolsPublishTokenUri
+    type: string
+
+  - name: symbolsUploadAccount
+    type: string
+
+  # Package Parameters
+  - name: abstractionsArtifactName
+    type: string
+
+  - name: abstractionsPackageVersion
+    type: string
+
+  - name: loggingArtifactName
+    type: string
+
+  - name: loggingPackageVersion
+    type: string
+
+  - name: mdsAssemblyFileVersion
+    type: string
+
+  - name: mdsPackageVersion
+    type: string
+
+jobs:
+  - job: build_package_Mds
+    displayName: 'Build Microsoft.Data.SqlClient'
+    pool:
+      type: windows
+
+    variables:
+      ob_outputDirectory: '$(PACK_OUTPUT)'
+      ob_sdl_apiscan_softwareFolder: ${{ parameters.apiScanDllPath }}
+      ob_sdl_apiscan_symbolsFolder: ${{ parameters.apiScanPdbPath }}
+      ob_sdl_apiscan_softwarename: 'Microsoft.Data.SqlClient'
+      ob_sdl_apiscan_versionNumber: ${{ parameters.mdsAssemblyFileVersion }}
+
+    steps:
+      # Dump environment and parameters
+      - template: /eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self
+
+      - powershell: |
+          $jsonParams = '${{ convertToJson(parameters) }}' -replace '\\', '\\'
+          $jsonParams | ConvertFrom-Json | Format-List
+        displayName: 'Output Job Parameters'
+
+      # Download Abstractions and Logging packages from previous stages into /packages/ so they
+      # are available via the local NuGet feed when restoring.
+      # @TODO: With the new build2.proj pack targets, this technically is not necessary.
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Microsoft.Data.SqlClient.Extensions.Abstractions Artifact
+        inputs:
+          artifactName: '${{ parameters.abstractionsArtifactName }}'
+          targetPath: '$(REPO_ROOT)/packages'
+
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Microsoft.Data.SqlClient.Extensions.Logging Artifact
+        inputs:
+          artifactName: '${{ parameters.loggingArtifactName }}'
+          targetPath: '$(REPO_ROOT)/packages'
+
+      # Install the .NET SDK
+      - template: /eng/pipelines/steps/install-dotnet.yml@self
+
+      # Perform analysis before building, since this step will clobber build output
+      - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-mds-step.yml@self
+        parameters:
+          abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
+          loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
+          mdsPackageVersion: '${{ parameters.mdsPackageVersion }}'
+
+      # Perform the actual build
+      - template: /eng/pipelines/onebranch/steps/build-mds-step.yml@self
+        parameters:
+          abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
+          loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
+          mdsPackageVersion: '${{ parameters.mdsPackageVersion }}'
+
+      # Copy the built DLLs and PDBs to the APIScan output folder for APIScanning post-build
+      - template: /eng/pipelines/onebranch/steps/copy-apiscan-files-mds-step.yml@self
+        parameters:
+          dllPath: '${{ parameters.apiScanDllPath }}'
+          pdbPath: '${{ parameters.apiScanPdbPath }}'
+          referenceType: 'Package'
+
+      # Sign the DLLs
+      - ${{ if parameters.isOfficial }}:
+          - template: /eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml@self
+            parameters:
+              appRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+              appRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+              authAkvName: '${{ parameters.signingAuthAkvName }}'
+              authSignCertName: '${{ parameters.signingAuthSignCertName }}'
+              esrpClientId: '${{ parameters.signingEsrpClientId }}'
+              esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+              pattern: 'Microsoft.Data.SqlClient*.dll'
+
+      # Package the build output into a NuGet package
+      - template: /eng/pipelines/onebranch/steps/pack-mds-step.yml
+        parameters:
+          abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
+          loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
+          mdsPackageVersion: '${{ parameters.mdsPackageVersion }}'
+
+      # Sign the NuGet packages
+      - ${{ if parameters.isOfficial }}:
+          - template: /eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml@self
+            parameters:
+              appRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+              appRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+              authAkvName: '${{ parameters.signingAuthAkvName }}'
+              authSignCertName: '${{ parameters.signingAuthSignCertName }}'
+              esrpClientId: '${{ parameters.signingEsrpClientId }}'
+              esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+              searchPath: '$(PACK_OUTPUT)'
+              searchPattern: 'Microsoft.Data.SqlClient.*nupkg'
+
+      - ${{ if parameters.publishSymbols }}:
+          - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
+            parameters:
+              artifactName: 'Microsoft.Data.SqlClient_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.mdsPackageVersion }}_$(System.TimelineId)'
+              azureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              packageName: 'Microsoft.Data.SqlClient'
+              publishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              publishServer: '${{ parameters.symbolsPublishServer }}'
+              publishToInternal: true
+              publishToPublic: true
+              publishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              searchPattern: '**/Microsoft.Data.SqlClient*.pdb' # @TODO: This seems very heavy
+              uploadAccount: '${{ parameters.symbolsUploadAccount }}'
+              version: '${{ parameters.mdsPackageVersion }}'
diff --git a/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
deleted file mode 100644
index f3033b07f0..0000000000
--- a/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
+++ /dev/null
@@ -1,145 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# This file is only included in MDS OneBranch Official pipelines.
-
-parameters:
-  # True to publish symbols to public and private feeds after the build completes.
-  - name: publishSymbols
-    type: boolean
-
-  # True if this is a preview build, which uses the preview version numbers from
-  # common-variables.yml.
-  - name: isPreview
-    type: boolean
-
-  # True to enable ESRP malware scanning and code signing steps, which should not
-  # be run on non-official pipelines as they access production resources.
-  - name: isOfficial
-    type: boolean
-
-jobs:
-  - job: build_package_SqlClient
-    displayName: "Build Microsoft.Data.SqlClient"
-    pool:
-      type: windows # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
-
-    variables:
-      ob_outputDirectory: $(PACK_OUTPUT)
-      # APIScan configuration for this Extension package
-      ob_sdl_apiscan_enabled: true
-      ob_sdl_apiscan_softwareFolder: $(Build.SourcesDirectory)/apiScan/SqlClient/dlls
-      ob_sdl_apiscan_symbolsFolder: $(Build.SourcesDirectory)/apiScan/SqlClient/pdbs
-      ob_sdl_apiscan_softwarename: Microsoft.Data.SqlClient
-      ob_sdl_apiscan_versionNumber: $(assemblyBuildNumber)
-
-      ${{ if parameters.isPreview }}:
-        abstractionsPackageVersion: $(abstractionsPackagePreviewVersion)
-        loggingPackageVersion: $(loggingPackagePreviewVersion)
-        mdsPackageVersion: $(mdsPackagePreviewVersion)
-
-    steps:
-      - script: SET
-        displayName: "Print Environment Variables"
-
-      # Download the Abstractions and Logging packages from the previous stage into
-      # packages/ so that they're available via the local NuGet feed when restoring MDS.
-      # MDS depends on both Extensions.Abstractions and Internal.Logging.
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Abstractions Package
-        inputs:
-          artifactName: $(abstractionsArtifactsName)
-          targetPath: $(Build.SourcesDirectory)/packages
-
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Logging Package
-        inputs:
-          artifactName: $(loggingArtifactsName)
-          targetPath: $(Build.SourcesDirectory)/packages
-
-      # Install the .NET SDK.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
-
-      # Build our tooling, which is required by the analysis step below, but
-      # shouldn't be analyzed itself.
-      - task: MSBuild@1
-        displayName: "Build Tooling"
-        inputs:
-          solution: "**/build.proj"
-          configuration: Release
-          msbuildArguments: -t:BuildTools
-
-      # Perform analysis before building, since this step will clobber build output.
-      - template: /eng/pipelines/onebranch/steps/code-analyze-step.yml@self
-
-      # Build MDS, producing signed DLLs.
-      - template: /eng/pipelines/onebranch/steps/build-all-configurations-signed-dlls-step.yml@self
-        parameters:
-          # These variables are sourced from common-variables.yml.
-          abstractionsAssemblyFileVersion: $(abstractionsAssemblyFileVersion)
-          abstractionsPackageVersion: $(abstractionsPackageVersion)
-          loggingAssemblyFileVersion: $(loggingAssemblyFileVersion)
-          loggingPackageVersion: $(loggingPackageVersion)
-          mdsAssemblyFileVersion: $(mdsAssemblyFileVersion)
-          mdsPackageVersion: $(mdsPackageVersion)
-
-      - ${{ if eq(parameters.isOfficial, true) }}:
-          - template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
-            parameters:
-              artifactType: dll
-              sourceRoot: $(BUILD_OUTPUT)
-              dllPattern: "Microsoft.Data.SqlClient.dll"
-
-          - template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
-            parameters:
-              artifactType: dll
-              sourceRoot: $(BUILD_OUTPUT)
-              dllPattern: "Microsoft.Data.SqlClient.resources.dll"
-
-      - template: /eng/pipelines/common/templates/steps/generate-nuget-package-step.yml@self
-        parameters:
-          buildConfiguration: Release
-          displayName: "Create MDS NuGet Package"
-          generateSymbolsPackage: true
-          installNuget: false
-          nuspecPath: $(nuspecPath)
-          outputDirectory: $(PACK_OUTPUT)
-          packageVersion: $(mdsPackageVersion)
-          properties: "AbstractionsPackageVersion=$(abstractionsPackageVersion);LoggingPackageVersion=$(loggingPackageVersion)"
-          referenceType: Package
-
-      - ${{ if eq(parameters.isOfficial, true) }}:
-          - template: /eng/pipelines/onebranch/steps/esrp-code-signing-step.yml@self
-            parameters:
-              artifactType: pkg
-              nupkgPattern: "Microsoft.Data.SqlClient.$(mdsPackageVersion).*nupkg"
-
-      # Copy signed DLLs and PDBs to APIScan folders.
-      - task: CopyFiles@2
-        displayName: Copy DLLs for APIScan
-        inputs:
-          SourceFolder: $(BUILD_OUTPUT)/Package/bin
-          Contents: "**/Microsoft.Data.SqlClient.dll"
-          TargetFolder: $(ob_sdl_apiscan_softwareFolder)
-          # We must preserve the folder structure since our C# projects may produce multiple
-          # identically named DLLs for different target frameworks (e.g. netstandard2.0, net5.0,
-          # etc.), and we need to keep those separate for APIScan to work correctly.
-          flattenFolders: false
-
-      - task: CopyFiles@2
-        displayName: Copy PDBs for APIScan
-        inputs:
-          SourceFolder: $(BUILD_OUTPUT)/Package/bin
-          Contents: "**/Microsoft.Data.SqlClient.pdb"
-          TargetFolder: $(ob_sdl_apiscan_symbolsFolder)
-          flattenFolders: false
-
-      # Publish symbols to servers
-      - ${{ if eq(parameters.publishSymbols, true) }}:
-          - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
-            parameters:
-              packageFullName: Microsoft.Data.SqlClient
-              packageVersion: $(mdsPackageVersion)
diff --git a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
index 3b463d0b81..2a4bf08e97 100644
--- a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
@@ -12,7 +12,7 @@ parameters:
   - name: isPreview
     type: boolean
 
-  # True if this build is an official build. This will be used to gate some checks 
+  # True if this build is an official build. This will be used to gate some checks
   # that only apply to official builds, such as signature verification.
   - name: isOfficial
     type: boolean
@@ -210,7 +210,7 @@ jobs:
             }
           }
         displayName: 'Verify all DLLs unzipped match "expected" hierarchy'
-      
+
       - ${{ if eq(parameters.isOfficial, true) }}:
           - powershell: |
               # Verify all dlls status are Valid
@@ -235,6 +235,7 @@ jobs:
           # This will check each DLL's ProductVersion and FileVersion against
           # expected values.
           $failed = 0
+          $expectedFileVersion = "$(mdsPackageVersion)".Split('-')[0] + ".$(assemblyBuildNumber)"
 
           foreach ( $pVersion in Get-ChildItem *.dll -Path $(extractedNugetPath)  -Recurse | ForEach-Object versioninfo )
           {
@@ -248,13 +249,13 @@ jobs:
                     $failed = 1
               }
 
-              if ($pVersion.FileVersion -eq '$(mdsAssemblyFileVersion)')
+              if ($pVersion.FileVersion -eq $expectedFileVersion)
               {
                   Write-Host -ForegroundColor Green "Correct FileVersion detected for $($pVersion.FileName): $($pVersion.FileVersion)"
               }
               else
               {
-                  Write-Host -ForegroundColor Red "Wrong FileVersion detected for $($pVersion.FileName); expected $(mdsAssemblyFileVersion); found: $($pVersion.FileVersion)"
+                  Write-Host -ForegroundColor Red "Wrong FileVersion detected for $($pVersion.FileName); expected $expectedFileVersion; found: $($pVersion.FileVersion)"
                   $failed = 1
               }
           }
@@ -266,23 +267,3 @@ jobs:
 
           Get-ChildItem *.dll -Path $(extractedNugetPath)  -Recurse | ForEach-Object VersionInfo | Format-List
         displayName: 'Verify "File Version" matches expected values for DLLs'
-
-      - powershell: |
-          # Check assembly versions.
-          #
-          # GOTCHA: This expects the Versions.props file having XML elements in a
-          # certain order.  If the order changes, this check will fail!
-          #
-          # TODO: This also isn't checking the versions of the actual assemblies in
-          # the package, so it isn't terribly useful.
-
-          [Xml] $versionprops = Get-Content -Path "tools/props/Versions.props"
-          $AssemblyFileVersion =  $versionprops.Project.PropertyGroup[2].AssemblyFileVersion
-          $AssemblyVersion = $versionprops.Project.PropertyGroup[2].AssemblyVersion
-
-          if($AssemblyFileVersion -eq $AssemblyVersion)
-          {
-              Write-Host AssemblyFileVersion: $AssemblyFileVersion should not be equal to: $AssemblyVersion
-              Exit -1
-          }
-        displayName: 'Check "AssemblyFileVersion" is not same as "AssemblyVersion" in version.props'
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index fad5c9a699..738e91d26f 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -146,13 +146,30 @@ stages:
         dependsOn: build_abstractions
 
         jobs:
-          - template: /eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml@self
+          - template: /eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml@self
             parameters:
-              publishSymbols: ${{ parameters.publishSymbols }}
-              isPreview: ${{ parameters.isPreview }}
+              apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/dlls'
+              apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/pdbs'
               isOfficial: ${{ parameters.isOfficial }}
-              # TODO: This job should use the effective versions for Abstractions, Logging,
-              # SqlServer, and SqlClient.
+              publishSymbols: ${{ parameters.publishSymbols }}
+              signingAppRegistrationClientId: '$(AppRegistrationClientId)'
+              signingAppRegistrationTenantId: '$(AppRegistrationTenantId)'
+              signingAuthAkvName: '$(AuthAKVName)'
+              signingAuthSignCertName: '$(AuthSignCertName)'
+              signingEsrpClientId: '$(ESRPClientId)'
+              signingEsrpConnectedServiceName: '$(ESRPConnectedServiceName)'
+              symbolsAzureSubscription: 'Symbols publishing Workload Identity federation service-ADO.Net'
+              symbolsPublishProjectName: 'Microsoft.Data.SqlClient.SNI'
+              symbolsPublishServer: '$(SymbolServer)'
+              symbolsPublishTokenUri: '$(SymbolTokenUri)'
+              symbolsUploadAccount: 'SqlClientDrivers'
+
+              abstractionsArtifactName: '$(abstractionsArtifactsName)'
+              abstractionsPackageVersion: '$(effectiveAbstractionsVersion)'
+              loggingArtifactName: '$(loggingArtifactsName)'
+              loggingPackageVersion: '$(effectiveLoggingVersion)'
+              mdsAssemblyFileVersion: '$(mdsAssemblyFileVersion)'
+              mdsPackageVersion: '$(effectiveSqlClientVersion)'
 
           - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
             parameters:
diff --git a/eng/pipelines/onebranch/stages/release-stages.yml b/eng/pipelines/onebranch/stages/release-stages.yml
index 51eea6e5f0..a9810f1251 100644
--- a/eng/pipelines/onebranch/stages/release-stages.yml
+++ b/eng/pipelines/onebranch/stages/release-stages.yml
@@ -153,7 +153,7 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.SqlServer.Server
-              artifactName: drop_build_independent_build_package_SqlServer
+              artifactName: $(sqlServerArtifactsName)
               packagePath: Microsoft.SqlServer.Server.$(effectiveSqlServerVersion).nupkg
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
@@ -163,7 +163,7 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Internal.Logging
-              artifactName: drop_build_independent_build_package_Logging
+              artifactName: $(loggingArtifactsName)
               packagePath: Microsoft.Data.SqlClient.Internal.Logging.$(effectiveLoggingVersion).nupkg
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
@@ -173,7 +173,7 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Abstractions
-              artifactName: drop_build_abstractions_build_package_Abstractions
+              artifactName: $(abstractionsArtifactsName)
               packagePath: Microsoft.Data.SqlClient.Extensions.Abstractions.$(effectiveAbstractionsVersion).nupkg
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
@@ -183,7 +183,7 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient
-              artifactName: drop_build_dependent_build_package_SqlClient
+              artifactName: $(sqlClientArtifactsName)
               packagePath: Microsoft.Data.SqlClient.$(effectiveSqlClientVersion).nupkg
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
@@ -193,7 +193,7 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Azure
-              artifactName: drop_build_dependent_build_package_Azure
+              artifactName: $(azureArtifactsName)
               packagePath: Microsoft.Data.SqlClient.Extensions.Azure.$(effectiveAzureVersion).nupkg
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
@@ -203,7 +203,7 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
-              artifactName: drop_build_addons_build_package_AkvProvider
+              artifactName: $(akvArtifactsName)
               packagePath: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.$(effectiveAkvProviderVersion).nupkg
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
diff --git a/eng/pipelines/onebranch/steps/build-all-configurations-signed-dlls-step.yml b/eng/pipelines/onebranch/steps/build-all-configurations-signed-dlls-step.yml
deleted file mode 100644
index b1429e1fd3..0000000000
--- a/eng/pipelines/onebranch/steps/build-all-configurations-signed-dlls-step.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-parameters:
-
-  # The assembly file version to apply to the Abstractions package.
-  - name: abstractionsAssemblyFileVersion
-    type: string
-
-  # The version to apply to the Abstractions package.
-  - name: abstractionsPackageVersion
-    type: string
-
-  # The assembly file version to apply to the Logging package.
-  - name: loggingAssemblyFileVersion
-    type: string
-
-  # The version to apply to the Logging package.
-  - name: loggingPackageVersion
-    type: string
-
-  # The assembly file version to apply to the Mds package.
-  - name: mdsAssemblyFileVersion
-    type: string
-
-  # The version to apply to the Mds package.
-  - name: mdsPackageVersion
-    type: string
-
-steps:
-  # Download our signing key.
-  - task: DownloadSecureFile@1
-    displayName: 'Download Key Pair'
-    inputs:
-      secureFile: netfxKeypair.snk
-    name: keyFile
-
-  # Install the .NET SDK.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
-
-  - task: MSBuild@1
-    displayName: 'BuildAllConfigurations using build.proj'
-    inputs:
-      solution: '**/build.proj'
-      configuration: Release
-      msbuildArguments: >-
-        -t:BuildAllConfigurations
-        -p:ReferenceType=Package
-        -p:GenerateNuget=false
-        -p:SigningKeyPath=$(keyFile.secureFilePath)
-        -p:AssemblyFileVersion=${{ parameters.mdsAssemblyFileVersion }}
-        -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-        -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-        -p:AbstractionsAssemblyFileVersion=${{ parameters.abstractionsAssemblyFileVersion }}
-        -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-        -p:LoggingAssemblyFileVersion=${{ parameters.loggingAssemblyFileVersion }}
diff --git a/eng/pipelines/onebranch/steps/compound-build-csproj-step.yml b/eng/pipelines/onebranch/steps/build-csproj-step.yml
similarity index 95%
rename from eng/pipelines/onebranch/steps/compound-build-csproj-step.yml
rename to eng/pipelines/onebranch/steps/build-csproj-step.yml
index 1f1fee00c4..d1cea7c190 100644
--- a/eng/pipelines/onebranch/steps/compound-build-csproj-step.yml
+++ b/eng/pipelines/onebranch/steps/build-csproj-step.yml
@@ -7,7 +7,7 @@
 # Generic build step for csproj-based packages.  Each project uses a build.proj target that runs
 # Build only and produces assemblies within $(BUILD_OUTPUT).  Downstream ESRP DLL signing must
 # locate the assemblies within $(BUILD_OUTPUT) for all target frameworks that the csproj targets.
-# NuGet packaging is done separately via compound-pack-csproj-step.yml after DLL signing.
+# NuGet packaging is done separately via pack-csproj-step.yml after DLL signing.
 
 parameters:
   # The MSBuild build target in build.proj (e.g. BuildLogging, BuildAbstractions,
diff --git a/eng/pipelines/onebranch/steps/build-mds-step.yml b/eng/pipelines/onebranch/steps/build-mds-step.yml
new file mode 100644
index 0000000000..4d5058f261
--- /dev/null
+++ b/eng/pipelines/onebranch/steps/build-mds-step.yml
@@ -0,0 +1,41 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This collection of steps builds Microsoft.Data.SqlClient via build2.proj
+
+parameters:
+  - name: abstractionsPackageVersion
+    type: string
+
+  - name: loggingPackageVersion
+    type: string
+
+  - name: mdsPackageVersion
+    type: string
+
+steps:
+  - task: DownloadSecureFile@1
+    displayName: 'Download Signing Key'
+    inputs:
+      secureFile: 'netfxKeypair.snk'
+    name: keyFile
+
+  - task: MSBuild@1
+    displayName: 'Build2.proj - BuildMds'
+    inputs:
+      solution: '$(REPO_ROOT)/build2.proj'
+      configuration: 'Release'
+      msbuildArguments: >-
+        -t:BuildMds
+        -p:BuildNumber="$(Build.BuildNumber)"
+        -p:PackageVersionAbstractions="${{ parameters.abstractionsPackageVersion }}"
+        -p:PackageVersionLogging="${{ parameters.loggingPackageVersion }}"
+        -p:PackageVersionMds="${{ parameters.mdsPackageVersion }}"
+        -p:ReferenceType=Package
+        -p:SigningKeyPath="$(keyFile.secureFilePath)"
+
+  - script: tree /a /f $(BUILD_OUTPUT)
+    displayName: Output Build Output Tree
diff --git a/eng/pipelines/onebranch/steps/compound-nuget-pack-step.yml b/eng/pipelines/onebranch/steps/compound-nuget-pack-step.yml
deleted file mode 100644
index ef1f3b946a..0000000000
--- a/eng/pipelines/onebranch/steps/compound-nuget-pack-step.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-parameters:
-    # The C# build configuration to use (e.g. Debug or Release).
-    - name: buildConfiguration
-      type: string
-      values:
-        - Debug
-        - Release
-
-    - name: generateSymbolsPackage
-      type: boolean
-
-    - name: packageVersion
-      type: string
-
-    - name: nuspecPath
-      type: string
-
-    - name: outputDirectory
-      type: string
-
-    # The C# project reference type to use when building and packing the packages.
-    - name: referenceType
-      type: string
-      values:
-        # Reference sibling packages as NuGet packages.
-        - Package
-        # Reference sibling packages as C# projects.
-        - Project
-
-    # Semi-colon separated properties to pass to nuget via the -properties argument.
-    - name: properties
-      type: string
-      default: ''
-
-steps:
-    # This tool is failing on OneBranch pipelines, possibly due to new
-    # network isolation rules:
-    #
-    #   ERR:Client network socket disconnected before secure TLS connection was established
-    #
-    # Our AKV Official build uses this 1ES image:
-    #
-    #   Image: 1ES-OB-2022-D8-Netlock-V2_westus2_1_image
-    #
-    # An ICM for this issue exists:
-    #
-    #   https://portal.microsofticm.com/imp/v5/incidents/details/690355343/summary
-    #
-    # Recommendation is to remove this step since NuGet is already present on
-    # the 1ES images.
-    #
-    # - task: NuGetToolInstaller@1
-    #   displayName: 'Install Latest Nuget'
-    #   inputs:
-    #       checkLatest: true
-
-    - ${{ if parameters.generateSymbolsPackage }}:
-          - task: NuGetCommand@2
-            displayName: 'Generate NuGet Package and Symbols Package'
-            inputs:
-                command: custom
-                arguments: >-
-                    pack
-                    ${{ parameters.nuspecPath }}
-                    -Symbols
-                    -SymbolPackageFormat snupkg
-                    -Version ${{ parameters.packageVersion }}
-                    -OutputDirectory ${{ parameters.outputDirectory }}
-                    -Properties "COMMITID=$(Build.SourceVersion);Configuration=${{ parameters.buildConfiguration }};ReferenceType=${{ parameters.referenceType }};${{ parameters.properties }}"
-    - ${{ else }}:
-          - task: NuGetCommand@2
-            displayName: 'Generate NuGet Package'
-            inputs:
-                command: custom
-                arguments: >-
-                    pack
-                    ${{ parameters.nuspecPath }}
-                    -Version ${{ parameters.packageVersion }}
-                    -OutputDirectory ${{ parameters.outputDirectory }}
-                    -Properties "COMMITID=$(Build.SourceVersion);Configuration=${{ parameters.buildConfiguration }};ReferenceType=${{ parameters.referenceType }};${{ parameters.properties }}"
diff --git a/eng/pipelines/onebranch/steps/compound-publish-symbols-step.yml b/eng/pipelines/onebranch/steps/compound-publish-symbols-step.yml
deleted file mode 100644
index 1b2e3cb3b9..0000000000
--- a/eng/pipelines/onebranch/steps/compound-publish-symbols-step.yml
+++ /dev/null
@@ -1,162 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# For more details, see https://www.osgwiki.com/wiki/Symbols_Publishing_Pipeline_to_SymWeb_and_MSDL
-
-parameters:
-    # Name of the symbols artifact that will be published
-    - name: artifactName
-      type: string
-
-    # Azure subscription where the publishing task will execute
-    - name: azureSubscription
-      type: string
-
-    # Package name, typically the name of the nuget package being built
-    - name: packageName
-      type: string
-
-    # Project that symbols will belong to (decided during symbols onboarding)
-    - name: publishProjectName
-      type: string
-
-    # Where symbols publishing service is hosted, will be prepended to trafficmanager.net
-    - name: publishServer
-      type: string
-
-    # Whether to publish the uploaded symbols to the internal symbols servers
-    - name: publishToInternal
-      type: boolean
-
-    # Whether to publish the uploaded symbols to the public symbols servers
-    - name: publishToPublic
-      type: boolean
-
-    # URI to use for requesting a bearer-token for publishing the symbols
-    - name: publishTokenUri
-      type: string
-
-    # The C# project reference type to use when building and packing the packages.
-    - name: referenceType
-      type: string
-      values:
-        # Reference sibling packages as NuGet packages.
-        - Package
-        # Reference sibling packages as C# projects.
-        - Project
-
-    # Pattern to use to search for pdb symbols files to upload/publish
-    - name: searchPattern
-      type: string
-
-    # Account/org where the symbols will be uploaded
-    - name: uploadAccount
-      type: string
-
-    # Version of the symbols to publish, typically the same as the NuGet package version
-    - name: version
-      type: string
-
-steps:
-    # Set variable for downstream tasks (allegedly).
-    #
-    # Note: Because variables cannot be set in top-level of template, this has to be done during
-    # runtime.
-    #
-    - script: 'echo ##vso[task.setvariable variable=ArtifactServices.Symbol.AccountName;]${{ parameters.uploadAccount }}'
-      displayName: 'Set ArtifactServices.Symbol.AccountName to ${{ parameters.uploadAccount }}'
-
-    - task: PublishSymbols@2
-      displayName: 'Upload symbols to ${{ parameters.uploadAccount }} org'
-      inputs:
-          IndexSources: false
-          Pat: '$(System.AccessToken)'
-          SearchPattern: '${{ parameters.searchPattern }}'
-          SymbolExpirationInDays: 1825 # 5 years
-          SymbolServerType: 'TeamServices'
-          SymbolsArtifactName: '${{ parameters.artifactName }}'
-          SymbolsFolder: '$(BUILD_OUTPUT)/${{ parameters.referenceType }}/bin'
-          SymbolsMaximumWaitTime: 60
-          SymbolsProduct: '${{ parameters.packageName }}'
-          SymbolsVersion: '${{ parameters.version }}'
-
-    - task: AzureCLI@2
-      displayName: 'Publish Symbols'
-      inputs:
-        azureSubscription: '${{ parameters.azureSubscription }}'
-        scriptLocation: inlineScript
-        scriptType: ps
-        inlineScript: |
-          # Propagate parameters to PS variables ################################################
-          $artifactName = "${{ parameters.artifactName }}"
-          echo "artifactName= $artifactName"
-
-          $publishProjectName = "${{ parameters.publishProjectName }}"
-          echo "publishProjectName= $publishProjectName"
-
-          $publishToInternal = "${{ parameters.publishToInternal }}".ToLower()
-          echo "publishToInternal= $publishToInternal"
-
-          $publishToPublic = "${{ parameters.publishToPublic }}".ToLower()
-          echo "publishToPublic= $publishToPublic"
-
-          $publishServer = "${{ parameters.publishServer }}"
-          echo "publishServer= $publishServer"
-
-          $publishTokenUri = "${{ parameters.publishTokenUri }}"
-          echo "publishTokenUri= $publishTokenUri"
-
-          # Publish symbols #####################################################################
-          # 1) Get the access token for the symbol publishing service
-          echo ">  1.Acquiring symbol publishing token..."
-          $symbolPublishingToken = az account get-access-token --resource $publishTokenUri --query accessToken -o tsv
-          echo ">  1.Symbol publishing token acquired."
-
-          # 2) Register the request name
-          echo ">  2.Registering request name..."
-          $requestNameRegistrationBody = "{'requestName': '$artifactName'}"
-          Invoke-RestMethod `
-            -Method POST `
-            -Uri "https://$publishServer.trafficmanager.net/projects/$publishProjectName/requests" `
-            -Headers @{ Authorization = "Bearer $symbolPublishingToken" } `
-            -ContentType "application/json" `
-            -Body $requestNameRegistrationBody
-          echo ">  2.Request name registered successfully."
-
-          # 3) Publish the symbols
-          echo ">  3.Submitting request to publish symbols..."
-          $publishSymbolsBody = "{'publishToInternalServer': $publishToInternal, 'publishToPublicServer': $publishToPublic}"
-          Invoke-RestMethod `
-            -Method POST `
-            -Uri "https://$publishServer.trafficmanager.net/projects/$publishProjectName/requests/$artifactName" `
-            -Headers @{ Authorization = "Bearer $symbolPublishingToken" } `
-            -ContentType "application/json" `
-            -Body $publishSymbolsBody
-          echo ">  3.Request to publish symbols submitted successfully."
-
-          # The following REST calls are used to check publishing status.
-          echo ">  4.Checking the status of the request ..."
-          Invoke-RestMethod `
-            -Method GET `
-            -Uri "https://$publishServer.trafficmanager.net/projects/$publishProjectName/requests/$artifactName" `
-            -Headers @{ Authorization = "Bearer $symbolPublishingToken" } `
-            -ContentType "application/json"
-
-          echo "Use below tables to interpret the values of xxxServerStatus and xxxServerResult fields from the response."
-
-          echo "PublishingStatus"
-          echo "-----------------"
-          echo "0	NotRequested; The request has not been requested to publish."
-          echo "1	Submitted; The request is submitted to be published"
-          echo "2	Processing; The request is still being processed"
-          echo "3	Completed; The request has been completed processing. It can be failed or successful. Check PublishingResult to get more details"
-
-          echo "PublishingResult"
-          echo "-----------------"
-          echo "0	Pending; The request has not completed or has not been requested."
-          echo "1	Succeeded; The request has published successfully"
-          echo "2	Failed; The request has failed to publish"
-          echo "3	Cancelled; The request was cancelled"
diff --git a/eng/pipelines/onebranch/steps/copy-apiscan-files-mds-step.yml b/eng/pipelines/onebranch/steps/copy-apiscan-files-mds-step.yml
new file mode 100644
index 0000000000..653eb40f5d
--- /dev/null
+++ b/eng/pipelines/onebranch/steps/copy-apiscan-files-mds-step.yml
@@ -0,0 +1,39 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# @TODO: This can be made more generic
+
+parameters:
+  # Path where dll files should be copied to for APIScan
+  - name: dllPath
+    type: string
+
+  # Path where pdb files should be copied to for APIScan
+  - name: pdbPath
+    type: string
+
+  - name: referenceType
+    type: string
+    values:
+      - Package
+      - Project
+
+steps:
+  - task: CopyFiles@2
+    displayName: 'Copy DLLs for APIScan'
+    inputs:
+      contents: '**/Microsoft.Data.SqlClient.dll'
+      flattenFolders: false  # Disabled to keep different frameworks and OS builds separate in the target
+      sourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/${{ parameters.referenceType }}-Release/'
+      targetFolder: '${{ parameters.dllPath }}/'
+
+  - task: CopyFiles@2
+    displayName: 'Copy PDBs for APIScan'
+    inputs:
+      contents: '**/Microsoft.Data.SqlClient.pdb'
+      flattenFolders: false  # Disabled to keep different frameworks and OS builds separate in the target
+      sourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/${{ parameters.referenceType }}-Release/'
+      targetFolder: '${{ parameters.pdbPath }}/'
diff --git a/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml b/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml
deleted file mode 100644
index 09f7715145..0000000000
--- a/eng/pipelines/onebranch/steps/esrp-code-signing-step.yml
+++ /dev/null
@@ -1,168 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-parameters:
-  - name: artifactType
-    values:
-      - dll
-      - pkg
-
-  - name: sourceRoot
-    type: string
-    default: $(REPO_ROOT)
-
-  - name: dllPattern
-    type: string
-    default: "Microsoft.Data.SqlClient*.dll"
-
-  - name: nupkgPattern
-    type: string
-    default: "*.*nupkg"
-
-  - name: artifactDirectory
-    type: string
-    default: $(PACK_OUTPUT)
-
-  - name: ESRPConnectedServiceName
-    type: string
-    default: $(ESRPConnectedServiceName)
-
-  - name: appRegistrationClientId
-    type: string
-    default: $(appRegistrationClientId)
-
-  - name: appRegistrationTenantId
-    type: string
-    default: $(appRegistrationTenantId)
-
-  - name: AuthAKVName
-    type: string
-    default: $(AuthAKVName)
-
-  - name: AuthSignCertName
-    type: string
-    default: $(AuthSignCertName)
-
-  - name: EsrpClientId
-    type: string
-    default: $(EsrpClientId)
-
-steps:
-  # ESRP scan and sign the DLLs or NuGet packages, depending on the artifact type.
-  - ${{ if eq(parameters.artifactType, 'dll') }}:
-      # See: https://aka.ms/esrp.scantask
-      - task: EsrpMalwareScanning@6
-        displayName: "ESRP MalwareScanning"
-        inputs:
-          ConnectedServiceName: "${{parameters.ESRPConnectedServiceName }}"
-          AppRegistrationClientId: "${{parameters.appRegistrationClientId }}"
-          AppRegistrationTenantId: "${{parameters.appRegistrationTenantId }}"
-          EsrpClientId: "${{parameters.EsrpClientId }}"
-          UseMSIAuthentication: true
-          FolderPath: "${{parameters.sourceRoot }}"
-          Pattern: "${{ parameters.dllPattern }}"
-          CleanupTempStorage: 1
-          VerboseLogin: 1
-
-      # See: https://aka.ms/esrp.signtask
-      - task: EsrpCodeSigning@6
-        displayName: "ESRP CodeSigning"
-        inputs:
-          ConnectedServiceName: "${{parameters.ESRPConnectedServiceName }}"
-          AppRegistrationClientId: "${{parameters.appRegistrationClientId }}"
-          AppRegistrationTenantId: "${{parameters.appRegistrationTenantId }}"
-          EsrpClientId: "${{parameters.EsrpClientId }}"
-          UseMSIAuthentication: true
-          AuthAKVName: "${{parameters.AuthAKVName }}"
-          AuthSignCertName: "${{parameters.AuthSignCertName }}"
-          FolderPath: "${{parameters.sourceRoot }}"
-          Pattern: "${{ parameters.dllPattern }}"
-          signConfigType: inlineSignParams
-          inlineOperation: |
-            [
-                {
-                    "keyCode": "CP-230012",
-                    "operationSetCode": "SigntoolSign",
-                    "parameters": [
-                    {
-                        "parameterName": "OpusName",
-                        "parameterValue": "Microsoft Data SqlClient Data Provider for SQL Server"
-                    },
-                    {
-                        "parameterName": "OpusInfo",
-                        "parameterValue": "http://www.microsoft.com"
-                    },
-                    {
-                        "parameterName": "FileDigest",
-                        "parameterValue": "/fd \"SHA256\""
-                    },
-                    {
-                        "parameterName": "PageHash",
-                        "parameterValue": "/NPH"
-                    },
-                    {
-                        "parameterName": "TimeStamp",
-                        "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                    }
-                    ],
-                    "toolName": "sign",
-                    "toolVersion": "1.0"
-                },
-                {
-                    "keyCode": "CP-230012",
-                    "operationSetCode": "SigntoolVerify",
-                    "parameters": [ ],
-                    "toolName": "sign",
-                    "toolVersion": "1.0"
-                }
-            ]
-
-  - ${{ if eq(parameters.artifactType, 'pkg') }}:
-      # See: https://aka.ms/esrp.scantask
-      - task: EsrpMalwareScanning@6
-        displayName: "ESRP MalwareScanning Nuget Package"
-        inputs:
-          ConnectedServiceName: "${{parameters.ESRPConnectedServiceName }}"
-          AppRegistrationClientId: "${{parameters.appRegistrationClientId }}"
-          AppRegistrationTenantId: "${{parameters.appRegistrationTenantId }}"
-          EsrpClientId: "${{parameters.EsrpClientId }}"
-          UseMSIAuthentication: true
-          FolderPath: "${{parameters.artifactDirectory }}"
-          Pattern: "${{ parameters.nupkgPattern }}"
-          CleanupTempStorage: 1
-          VerboseLogin: 1
-
-      # See: https://aka.ms/esrp.signtask
-      - task: EsrpCodeSigning@6
-        displayName: "ESRP CodeSigning Nuget Package"
-        inputs:
-          ConnectedServiceName: "${{parameters.ESRPConnectedServiceName }}"
-          AppRegistrationClientId: "${{parameters.appRegistrationClientId }}"
-          AppRegistrationTenantId: "${{parameters.appRegistrationTenantId }}"
-          EsrpClientId: "${{parameters.EsrpClientId }}"
-          UseMSIAuthentication: true
-          AuthAKVName: "${{parameters.AuthAKVName }}"
-          AuthSignCertName: "${{parameters.AuthSignCertName }}"
-          FolderPath: "${{parameters.artifactDirectory }}"
-          Pattern: "${{ parameters.nupkgPattern }}"
-          signConfigType: inlineSignParams
-          inlineOperation: |
-            [
-                {
-                    "keyCode": "CP-401405",
-                    "operationSetCode": "NuGetSign",
-                    "parameters": [ ],
-                    "toolName": "sign",
-                    "toolVersion": "1.0"
-                },
-                {
-                    "keyCode": "CP-401405",
-                    "operationSetCode": "NuGetVerify",
-                    "parameters": [ ],
-                    "toolName": "sign",
-                    "toolVersion": "1.0"
-                }
-            ]
diff --git a/eng/pipelines/onebranch/steps/compound-esrp-dll-signing-step.yml b/eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml
similarity index 78%
rename from eng/pipelines/onebranch/steps/compound-esrp-dll-signing-step.yml
rename to eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml
index 44649f94aa..073911e5fe 100644
--- a/eng/pipelines/onebranch/steps/compound-esrp-dll-signing-step.yml
+++ b/eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml
@@ -30,7 +30,7 @@ parameters:
   - name: esrpClientId
     type: string
 
-  # Globbing pattern for the files to sign. All files in $(BUILD_OUTPUT)/Package/bin
+  # Globbing pattern for the files to sign. All files in $(BUILD_OUTPUT)
   # that match this pattern will be scanned and signed. This should end with ".dll".
   - name: pattern
     type: string
@@ -40,13 +40,13 @@ steps:
   - task: EsrpMalwareScanning@6
     displayName: ESRP DLL Malware Scanning
     inputs:
-      AppRegistrationClientId: ${{ parameters.appRegistrationClientId }}
-      AppRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
+      AppRegistrationClientId: '${{ parameters.appRegistrationClientId }}'
+      AppRegistrationTenantId: '${{ parameters.appRegistrationTenantId }}'
       CleanupTempStorage: 1
-      ConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
-      EsrpClientId: ${{ parameters.esrpClientId }}
-      FolderPath: $(BUILD_OUTPUT)/Package/bin
-      Pattern: ${{ parameters.pattern }}
+      ConnectedServiceName: '${{ parameters.esrpConnectedServiceName }}'
+      EsrpClientId: '${{ parameters.esrpClientId }}'
+      FolderPath: '$(BUILD_OUTPUT)'
+      Pattern: '${{ parameters.pattern }}'
       UseMSIAuthentication: true
       VerboseLogin: 1
 
@@ -54,14 +54,14 @@ steps:
   - task: EsrpCodeSigning@6
     displayName: ESRP DLL Signing
     inputs:
-      AppRegistrationClientId: ${{ parameters.appRegistrationClientId }}
-      AppRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
-      AuthAKVName: ${{ parameters.authAkvName }}
-      AuthSignCertName: ${{ parameters.authSignCertName }}
-      ConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
-      EsrpClientId: ${{ parameters.esrpClientId }}
-      FolderPath: $(BUILD_OUTPUT)/Package/bin
-      Pattern: ${{ parameters.pattern }}
+      AppRegistrationClientId: '${{ parameters.appRegistrationClientId }}'
+      AppRegistrationTenantId: '${{ parameters.appRegistrationTenantId }}'
+      AuthAKVName: '${{ parameters.authAkvName }}'
+      AuthSignCertName: '${{ parameters.authSignCertName }}'
+      ConnectedServiceName: '${{ parameters.esrpConnectedServiceName }}'
+      EsrpClientId: '${{ parameters.esrpClientId }}'
+      FolderPath: '$(BUILD_OUTPUT)'
+      Pattern: '${{ parameters.pattern }}'
       signConfigType: inlineSignParams
       UseMSIAuthentication: true
       inlineOperation: |
diff --git a/eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml b/eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml
similarity index 59%
rename from eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml
rename to eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml
index 824b3fab65..bddbac517c 100644
--- a/eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml
+++ b/eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml
@@ -30,39 +30,43 @@ parameters:
   - name: esrpClientId
     type: string
 
-  # Glob pattern to match NuGet packages for scanning and signing.
-  - name: pattern
+  # Folder path to search for NuGet packages to sign
+  - name: searchPath
     type: string
-    default: "*.*nupkg"
+
+  # Globbing pattern to use to search for NuGet packages. If not provided, defaults to '*.*nupkg'
+  - name: searchPattern
+    type: string
+    default: '*.*nupkg'
 
 steps:
   # See: https://aka.ms/esrp.scantask
   - task: EsrpMalwareScanning@6
-    displayName: "ESRP Nuget Malware Scanning"
+    displayName: 'ESRP Nuget Malware Scanning'
     inputs:
-      AppRegistrationClientId: "${{ parameters.appRegistrationClientId }}"
-      AppRegistrationTenantId: "${{ parameters.appRegistrationTenantId }}"
+      AppRegistrationClientId: '${{ parameters.appRegistrationClientId }}'
+      AppRegistrationTenantId: '${{ parameters.appRegistrationTenantId }}'
       CleanupTempStorage: 1
-      ConnectedServiceName: "${{ parameters.esrpConnectedServiceName }}"
-      EsrpClientId: "${{ parameters.esrpClientId }}"
-      FolderPath: "$(PACK_OUTPUT)"
-      Pattern: "${{ parameters.pattern }}"
+      ConnectedServiceName: '${{ parameters.esrpConnectedServiceName }}'
+      EsrpClientId: '${{ parameters.esrpClientId }}'
+      FolderPath: '${{ parameters.searchPath }}'
+      Pattern: '${{ parameters.searchPattern }}'
       UseMSIAuthentication: true
       VerboseLogin: 1
 
   # See: https://aka.ms/esrp.signtask
   - task: EsrpCodeSigning@6
-    displayName: "ESRP Signing NuGet Package"
+    displayName: 'ESRP Signing NuGet Package'
     inputs:
-      AppRegistrationClientId: "${{ parameters.appRegistrationClientId }}"
-      AppRegistrationTenantId: "${{ parameters.appRegistrationTenantId }}"
-      ConnectedServiceName: "${{ parameters.esrpConnectedServiceName }}"
-      EsrpClientId: "${{ parameters.esrpClientId }}"
-      AuthAKVName: "${{ parameters.authAkvName }}"
-      AuthSignCertName: "${{ parameters.authSignCertName }}"
-      FolderPath: "$(PACK_OUTPUT)"
-      Pattern: "${{ parameters.pattern }}"
-      signConfigType: "inlineSignParams"
+      AppRegistrationClientId: '${{ parameters.appRegistrationClientId }}'
+      AppRegistrationTenantId: '${{ parameters.appRegistrationTenantId }}'
+      ConnectedServiceName: '${{ parameters.esrpConnectedServiceName }}'
+      EsrpClientId: '${{ parameters.esrpClientId }}'
+      AuthAKVName: '${{ parameters.authAkvName }}'
+      AuthSignCertName: '${{ parameters.authSignCertName }}'
+      FolderPath: '${{ parameters.searchPath }}'
+      Pattern: '${{ parameters.searchPattern }}'
+      signConfigType: 'inlineSignParams'
       UseMSIAuthentication: true
       inlineOperation: |
         [
diff --git a/eng/pipelines/onebranch/steps/compound-pack-csproj-step.yml b/eng/pipelines/onebranch/steps/pack-csproj-step.yml
similarity index 100%
rename from eng/pipelines/onebranch/steps/compound-pack-csproj-step.yml
rename to eng/pipelines/onebranch/steps/pack-csproj-step.yml
diff --git a/eng/pipelines/onebranch/steps/pack-mds-step.yml b/eng/pipelines/onebranch/steps/pack-mds-step.yml
new file mode 100644
index 0000000000..f1277280ae
--- /dev/null
+++ b/eng/pipelines/onebranch/steps/pack-mds-step.yml
@@ -0,0 +1,42 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+parameters:
+  # Package version parameters ----
+  - name: abstractionsPackageVersion
+    type: string
+
+  - name: loggingPackageVersion
+    type: string
+
+  - name: mdsPackageVersion
+    type: string
+
+steps:
+  - task: MSBuild@1
+    displayName: 'Build2.proj - PackMds'
+    inputs:
+      solution: '$(REPO_ROOT)/build2.proj'
+      configuration: 'Release'
+      msbuildArguments: >-
+        -t:PackMds
+        -p:BuildNumber="$(Build.BuildNumber)"
+        -p:PackBuild=false
+        -p:PackageVersionAbstractions="${{ parameters.abstractionsPackageVersion }}"
+        -p:PackageVersionLogging="${{ parameters.loggingPackageVersion }}"
+        -p:PackageVersionMds="${{ parameters.mdsPackageVersion }}"
+        -p:ReferenceType=Package
+
+  - script: tree /a /f $(BUILD_OUTPUT)
+    displayName: Output Build Output Tree
+
+  - task: CopyFiles@2
+    displayName: 'Copy NuGet Packages to PACK_OUTPUT'
+    inputs:
+      contents: '**/Microsoft.Data.SqlClient*.*nupkg'
+      flattenFolders: true
+      sourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/'
+      targetFolder: '$(PACK_OUTPUT)'
diff --git a/eng/pipelines/onebranch/steps/publish-symbols-step.yml b/eng/pipelines/onebranch/steps/publish-symbols-step.yml
index a23dbf4556..48ee30b9c2 100644
--- a/eng/pipelines/onebranch/steps/publish-symbols-step.yml
+++ b/eng/pipelines/onebranch/steps/publish-symbols-step.yml
@@ -1,119 +1,153 @@
-####################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                    #
-# The .NET Foundation licenses this file to you under the MIT license.             #
-# See the LICENSE file in the project root for more information.                   #
-#                                                                                  #
-# doc: https://www.osgwiki.com/wiki/Symbols_Publishing_Pipeline_to_SymWeb_and_MSDL #
-####################################################################################
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# For more details, see https://www.osgwiki.com/wiki/Symbols_Publishing_Pipeline_to_SymWeb_and_MSDL
+
 parameters:
+    # Name of the symbols artifact that will be published
+    - name: artifactName
+      type: string
+
+    # Azure subscription where the publishing task will execute
+    - name: azureSubscription
+      type: string
+
+    # Package name, typically the name of the nuget package being built
+    - name: packageName
+      type: string
+
+    # Project that symbols will belong to (decided during symbols onboarding)
+    - name: publishProjectName
+      type: string
+
+    # Where symbols publishing service is hosted, will be prepended to trafficmanager.net
+    - name: publishServer
+      type: string
+
+    # Whether to publish the uploaded symbols to the internal symbols servers
+    - name: publishToInternal
+      type: boolean
+
+    # Whether to publish the uploaded symbols to the public symbols servers
+    - name: publishToPublic
+      type: boolean
+
+    # URI to use for requesting a bearer-token for publishing the symbols
+    - name: publishTokenUri
+      type: string
+
+    # Pattern to use to search for pdb symbols files to upload/publish
+    - name: searchPattern
+      type: string
+
+    # Account/org where the symbols will be uploaded
+    - name: uploadAccount
+      type: string
 
-  # The full name of the package whose symbols are being published.
-  - name: packageFullName
-    type: string
-
-  # The version of the package whose symbols are being published.
-  - name: packageVersion
-    type: string
-
-  # Our symbols account name.
-  - name: symbolsAccount
-    type: string
-    default: SqlClientDrivers
-
-  # The symbols server to publish to.
-  - name: symbolServer
-    type: string
-    default: $(SymbolServer)
-
-  # The token URI for the symbol publishing service.
-  - name: symbolTokenUri
-    type: string
-    default: $(SymbolTokenUri)
-
-  # A pair of flags indicating whether to publish to the internal and public symbol servers.  Both
-  # default to true.
-  - name: publishToServers
-    type: object
-    default:
-      internal: true
-      public: true
+    # Version of the symbols to publish, typically the same as the NuGet package version
+    - name: version
+      type: string
 
 steps:
-- pwsh: 'Write-Host "##vso[task.setvariable variable=ArtifactServices.Symbol.AccountName;]${{parameters.symbolsAccount}}"'
-  displayName: 'Set ArtifactServices.Symbol.AccountName to ${{parameters.symbolsAccount}}'
-
-- pwsh: 'Write-Host "##vso[task.setvariable variable=symbolsArtifactName;]${{ parameters.packageFullName }}_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.packageVersion }}_$(System.TimelineId)"'
-  displayName: 'Set symbolsArtifactName variable'
-
-- task: PublishSymbols@2
-  displayName: 'Upload symbols to ${{parameters.symbolsAccount }} org'
-  inputs:
-    SymbolsFolder: '$(Build.SourcesDirectory)\artifacts\Package\bin'
-    SearchPattern: '**/*.pdb'
-    IndexSources: false
-    SymbolServerType: TeamServices
-    SymbolsMaximumWaitTime: 60
-    SymbolExpirationInDays: 1825 # 5 years
-    SymbolsProduct: ${{ parameters.packageFullName }}
-    SymbolsVersion: ${{ parameters.packageVersion }}
-    SymbolsArtifactName: $(symbolsArtifactName)
-    Pat: $(System.AccessToken)
-
-- task: AzureCLI@2
-  displayName: 'Publish symbols'
-  inputs:
-    azureSubscription: 'Symbols publishing Workload Identity federation service-ADO.Net'
-    scriptType: ps
-    scriptLocation: inlineScript
-    inlineScript: |
-      $publishToInternalServer = "${{parameters.publishToServers.internal }}".ToLower()
-      $publishToPublicServer = "${{parameters.publishToServers.public }}".ToLower()
-
-      echo "Publishing request name: $(symbolsArtifactName)"
-      echo "Publish to internal server: $publishToInternalServer"
-      echo "Publish to public server: $publishToPublicServer"
-
-      $symbolServer = "${{parameters.symbolServer }}"
-      $tokenUri = "${{parameters.symbolTokenUri }}"
-      # Registered project name in the symbol publishing pipeline: https://portal.microsofticm.com/imp/v3/incidents/incident/520844254/summary
-      $projectName = "Microsoft.Data.SqlClient.SNI"
-
-      # Get the access token for the symbol publishing service
-      $symbolPublishingToken = az account get-access-token --resource $tokenUri --query accessToken -o tsv
-
-      echo ">  1.Symbol publishing token acquired."
-
-      echo "Registering the request name ..."
-      $requestName = "$(symbolsArtifactName)"
-      $requestNameRegistrationBody = "{'requestName': '$requestName'}"
-      Invoke-RestMethod -Method POST -Uri "https://$symbolServer.trafficmanager.net/projects/$projectName/requests" -Headers @{ Authorization = "Bearer $symbolPublishingToken" } -ContentType "application/json" -Body $requestNameRegistrationBody
-
-      echo ">  2.Registration of request name succeeded."
-
-      echo "Publishing the symbols ..."
-      $publishSymbolsBody = "{'publishToInternalServer': $publishToInternalServer, 'publishToPublicServer': $publishToPublicServer}"
-      echo "Publishing symbols request body: $publishSymbolsBody"
-      Invoke-RestMethod -Method POST -Uri "https://$symbolServer.trafficmanager.net/projects/$projectName/requests/$requestName" -Headers @{ Authorization = "Bearer $symbolPublishingToken" } -ContentType "application/json" -Body $publishSymbolsBody
-
-      echo ">  3.Request to publish symbols succeeded."
-
-      # The following REST calls are used to check publishing status.
-      echo ">  4.Checking the status of the request ..."
-
-      Invoke-RestMethod -Method GET -Uri "https://$symbolServer.trafficmanager.net/projects/$projectName/requests/$requestName" -Headers @{ Authorization = "Bearer $symbolPublishingToken" } -ContentType "application/json"
-
-      echo "Use below tables to interpret the values of xxxServerStatus and xxxServerResult fields from the response."
-
-      echo "PublishingStatus"
-      echo "-----------------"
-      echo "0	NotRequested; The request has not been requested to publish."
-      echo "1	Submitted; The request is submitted to be published"
-      echo "2	Processing; The request is still being processed"
-      echo "3	Completed; The request has been completed processing. It can be failed or successful. Check PublishingResult to get more details"
-
-      echo "PublishingResult"
-      echo "-----------------"
-      echo "0	Pending; The request has not completed or has not been requested."
-      echo "1	Succeeded; The request has published successfully"
-      echo "2	Failed; The request has failed to publish"
-      echo "3	Cancelled; The request was cancelled"
+    # Set variable for downstream tasks (allegedly).
+    #
+    # Note: Because variables cannot be set in top-level of template, this has to be done during
+    # runtime.
+    #
+    - script: 'echo ##vso[task.setvariable variable=ArtifactServices.Symbol.AccountName;]${{ parameters.uploadAccount }}'
+      displayName: 'Set ArtifactServices.Symbol.AccountName to ${{ parameters.uploadAccount }}'
+
+    - task: PublishSymbols@2
+      displayName: 'Upload symbols to ${{ parameters.uploadAccount }} org'
+      inputs:
+          IndexSources: false
+          Pat: '$(System.AccessToken)'
+          SearchPattern: '${{ parameters.searchPattern }}'
+          SymbolExpirationInDays: 1825 # 5 years
+          SymbolServerType: 'TeamServices'
+          SymbolsArtifactName: '${{ parameters.artifactName }}'
+          SymbolsFolder: '$(BUILD_OUTPUT)'
+          SymbolsMaximumWaitTime: 60
+          SymbolsProduct: '${{ parameters.packageName }}'
+          SymbolsVersion: '${{ parameters.version }}'
+
+    - task: AzureCLI@2
+      displayName: 'Publish Symbols'
+      inputs:
+        azureSubscription: '${{ parameters.azureSubscription }}'
+        scriptLocation: inlineScript
+        scriptType: ps
+        inlineScript: |
+          # Propagate parameters to PS variables ################################################
+          $artifactName = "${{ parameters.artifactName }}"
+          echo "artifactName= $artifactName"
+
+          $publishProjectName = "${{ parameters.publishProjectName }}"
+          echo "publishProjectName= $publishProjectName"
+
+          $publishToInternal = "${{ parameters.publishToInternal }}".ToLower()
+          echo "publishToInternal= $publishToInternal"
+
+          $publishToPublic = "${{ parameters.publishToPublic }}".ToLower()
+          echo "publishToPublic= $publishToPublic"
+
+          $publishServer = "${{ parameters.publishServer }}"
+          echo "publishServer= $publishServer"
+
+          $publishTokenUri = "${{ parameters.publishTokenUri }}"
+          echo "publishTokenUri= $publishTokenUri"
+
+          # Publish symbols #####################################################################
+          # 1) Get the access token for the symbol publishing service
+          echo ">  1.Acquiring symbol publishing token..."
+          $symbolPublishingToken = az account get-access-token --resource $publishTokenUri --query accessToken -o tsv
+          echo ">  1.Symbol publishing token acquired."
+
+          # 2) Register the request name
+          echo ">  2.Registering request name..."
+          $requestNameRegistrationBody = "{'requestName': '$artifactName'}"
+          Invoke-RestMethod `
+            -Method POST `
+            -Uri "https://$publishServer.trafficmanager.net/projects/$publishProjectName/requests" `
+            -Headers @{ Authorization = "Bearer $symbolPublishingToken" } `
+            -ContentType "application/json" `
+            -Body $requestNameRegistrationBody
+          echo ">  2.Request name registered successfully."
+
+          # 3) Publish the symbols
+          echo ">  3.Submitting request to publish symbols..."
+          $publishSymbolsBody = "{'publishToInternalServer': $publishToInternal, 'publishToPublicServer': $publishToPublic}"
+          Invoke-RestMethod `
+            -Method POST `
+            -Uri "https://$publishServer.trafficmanager.net/projects/$publishProjectName/requests/$artifactName" `
+            -Headers @{ Authorization = "Bearer $symbolPublishingToken" } `
+            -ContentType "application/json" `
+            -Body $publishSymbolsBody
+          echo ">  3.Request to publish symbols submitted successfully."
+
+          # The following REST calls are used to check publishing status.
+          echo ">  4.Checking the status of the request ..."
+          Invoke-RestMethod `
+            -Method GET `
+            -Uri "https://$publishServer.trafficmanager.net/projects/$publishProjectName/requests/$artifactName" `
+            -Headers @{ Authorization = "Bearer $symbolPublishingToken" } `
+            -ContentType "application/json"
+
+          echo "Use below tables to interpret the values of xxxServerStatus and xxxServerResult fields from the response."
+
+          echo "PublishingStatus"
+          echo "-----------------"
+          echo "0	NotRequested; The request has not been requested to publish."
+          echo "1	Submitted; The request is submitted to be published"
+          echo "2	Processing; The request is still being processed"
+          echo "3	Completed; The request has been completed processing. It can be failed or successful. Check PublishingResult to get more details"
+
+          echo "PublishingResult"
+          echo "-----------------"
+          echo "0	Pending; The request has not completed or has not been requested."
+          echo "1	Succeeded; The request has published successfully"
+          echo "2	Failed; The request has failed to publish"
+          echo "3	Cancelled; The request was cancelled"
diff --git a/eng/pipelines/onebranch/steps/code-analyze-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
similarity index 100%
rename from eng/pipelines/onebranch/steps/code-analyze-step.yml
rename to eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-mds-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-mds-step.yml
new file mode 100644
index 0000000000..5fe8009078
--- /dev/null
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-mds-step.yml
@@ -0,0 +1,40 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This template defines a step to run Roslyn Analyzers on the MDS build. It uses the
+# RoslynAnalyzers@3 task from the Secure Development Team's SDL extension:
+#
+# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-mohanb/security-integration/guardian-wiki/sdl-azdo-extension/roslyn-analyzers-build-task
+#
+# GOTCHA: This step will clobber any existing build output. It should be run _before_ any build
+# steps that perform versioning or signing.
+
+parameters:
+  - name: abstractionsPackageVersion
+    type: string
+
+  - name: loggingPackageVersion
+    type: string
+
+  - name: mdsPackageVersion
+    type: string
+
+steps:
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
+    displayName: 'Roslyn Analyzers: Build2.proj BuildMds'
+    inputs:
+      msBuildArchitecture: x64
+      msBuildCommandLine: >-
+        msbuild
+        $(REPO_ROOT)/build2.proj
+        -t:BuildMds
+        -p:Configuration=Release
+        -p:PackageVersionAbstractions="${{ parameters.abstractionsPackageVersion }}"
+        -p:PackageVersionLogging="${{ parameters.loggingPackageVersion }}"
+        -p:PackageVersionMds="${{ parameters.mdsPackageVersion }}"
+        -p:ReferenceType=Package
+      msBuildVersion: 17.0
+      setupCommandLinePicker: vs2022
diff --git a/eng/pipelines/onebranch/variables/common-variables.yml b/eng/pipelines/onebranch/variables/common-variables.yml
index feddd2c6ce..dbbddefc51 100644
--- a/eng/pipelines/onebranch/variables/common-variables.yml
+++ b/eng/pipelines/onebranch/variables/common-variables.yml
@@ -28,8 +28,7 @@ variables:
   - name: CommitHead
     value: '' # the value will be extracted from the repo's head
 
-  # Aliases required by compound step templates (compound-esrp-dll-signing-step,
-  # compound-esrp-nuget-signing-step, compound-nuget-pack-step, etc.).
+  # "Well-Known" Variables that are ok to use directly, anywhere in the pipeline.
 
   # The root of our repo.
   - name: REPO_ROOT
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index 9c60ff4cf0..004786e25f 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -52,4 +52,4 @@ variables:
 
   # The SqlClient package artifacts.
   - name: sqlClientArtifactsName
-    value: drop_build_dependent_build_package_SqlClient
+    value: drop_build_dependent_build_package_Mds
diff --git a/src/Microsoft.Data.SqlClient/MdsVersions.props b/src/Microsoft.Data.SqlClient/MdsVersions.props
index e50e813f66..a9f8d1cc83 100644
--- a/src/Microsoft.Data.SqlClient/MdsVersions.props
+++ b/src/Microsoft.Data.SqlClient/MdsVersions.props
@@ -1,35 +1,89 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- This file contains versioning information for the Microsoft.Data.SqlClient package. -->
+  <!--
+    This file contains versioning information for the Microsoft.Data.SqlClient package.
+    We will calculate three different version variables, used for different purposes:
+
+    * MdsPackageVersion - this will be used as the <Version> property, the version of the NuGet
+      package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
+    * MdsFileVersion - this will be used as the <FileVersion> property. It should be in the form:
+      (Major).(Minor).(Patch).(BuildNumber)
+    * MdsAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the version
+      reported to user if they open the assembly properties. It *must not* change within major
+      versions in order for minor versions to be considered backwards compatible via strong naming.
+      It must be in the form: (Major).0.0.0
+  -->
+
+
+  <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
+    <!-- This is the *next* version to release of MDS. Update this after a version is released -->
     <MdsVersionDefault>7.0.0</MdsVersionDefault>
 
-    <BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
-
     <!--
-      This is the version that is used as the AssemblyVersion and FileVersion fields in the
-      assembly's manifest. If it is not overridden, it will default to the above default version
-      with the build number appended.
-      As a convenience feature, if a package version but not an assembly version is supplied, the
-      package version will have any suffix trimmed to generate valid assembly version.
-
-      NOTE: It is possible that the build number can be in the format xxxxx.yy which *may* overflow
-      the 16-bit integer for the revision part of the assembly version. For that reason, we simply
-      discard everything after the first part of the build number for the assembly version.
+      Build number is being coalesced to 0 and adjusted for overflow in /tools/props/Versions.props.
+      It is stored as: AssemblyBuildNumber
     -->
-    <MdsAssemblyVersion Condition="'$(MdsAssemblyVersion)' == '' AND '$(MdsPackageVersion)' == ''">$(MdsVersionDefault).$(BuildNumber.Split('.')[0])</MdsAssemblyVersion>
-    <MdsAssemblyVersion Condition="'$(MdsAssemblyVersion)' == '' AND '$(MdsPackageVersion)' != ''">$(MdsPackageVersion.Split('-')[0])</MdsAssemblyVersion>
+  </PropertyGroup>
 
-    <!--
-      This is the version that is used as the version for the NuGet package. If it is not
-      overridden, the above default version will be used with the build number and a string suffix
-      appended (to indicate the version is pre-production).
+  <!-- Determine file version and package version based on what was provided. -->
+  <Choose>
+    <When Condition="'$(MdsPackageVersion)' != ''">
+      <!--
+        When a package version is provided, it supercedes all other choices. It will be used as the
+        package version and the file version will be based on it. This situation is used for
+        local developer scenarios and (@TODO:) old build pipelines that stored their version
+        information in the pipeline yaml.
+      -->
+      <PropertyGroup>
+        <MdsFileVersion>$(MdsPackageVersion.Split('-')[0]).$(AssemblyBuildNumber)</MdsFileVersion>
+      </PropertyGroup>
+    </When>
 
-      NOTE: NuGet versioning can handle arbitrary version strings, so we do not need to trim the
-      build number like we do for the assembly version.
+    <When Condition="'$(BuildNumber)' != '' AND '$(BuildNumber)' != '0'">
+      <!--
+        When a build number is provided, the default version is used as the base of the package and
+        file versions.
 
-      NOTE/@TODO: Since the PackMds target in build2.proj directly calls nuget.exe, it will not
-          pick up this property.
-    -->
-    <MdsPackageVersion Condition="'$(MdsPackageVersion)' == ''">$(MdsVersionDefault).$(BuildNumber)-dev</MdsPackageVersion>
+        If a build suffix is provided, this is appended to the package version. This is meant to be
+        used by automated pre-release systems to indicate the source of the build.
+
+        If a build suffix is not provided, no pre-release tag will be added to package version. If
+        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
+        will be retained for the package version, but will be stripped off for the file version
+        (letters are not allowed in file/assembly versions). This is meant to be used by official
+        build pipelines to generate production-ready builds.
+      -->
+      <PropertyGroup>
+        <MdsPackageVersion Condition="'$(BuildSuffix)' != ''">$(MdsVersionDefault)-$(BuildSuffix)$(AssemblyBuildNumber)</MdsPackageVersion>
+        <MdsPackageVersion Condition="'$(BuildSuffix)' == ''">$(MdsVersionDefault)</MdsPackageVersion>
+
+        <MdsFileVersion>$(MdsVersionDefault.Split('-')[0]).$(AssemblyBuildNumber)</MdsFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <Otherwise>
+      <!--
+        When a build number or package number are not provided, the build is expected to be a pre-
+        release version. In this case, a suffix is appended to the default version, and 0 is used
+        for the build number in the file version. This is meant to be used by developers that
+        want a quick build without supplying any parameters.
+      -->
+      <PropertyGroup>
+        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
+
+        <MdsPackageVersion>$(MdsVersionDefault)-$(BuildSuffix)</MdsPackageVersion>
+        <MdsFileVersion>$(MdsVersionDefault.Split('-')[0]).$(AssemblyBuildNumber)</MdsFileVersion>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <!--
+    Finally, we take the file version and break off the major version to determine the assembly
+    version.
+  -->
+  <PropertyGroup>
+    <MdsAssemblyVersion>$(MdsFileVersion.Split('.')[0]).0.0.0</MdsAssemblyVersion>
   </PropertyGroup>
+
+
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
index 6f5fc44f59..4099207511 100644
--- a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
@@ -71,7 +71,7 @@
   <Import Project="../MdsVersions.props" />
   <PropertyGroup>
     <AssemblyVersion>$(MdsAssemblyVersion)</AssemblyVersion>
-    <FileVersion>$(MdsAssemblyVersion)</FileVersion>
+    <FileVersion>$(MdsFileVersion)</FileVersion>
     <Version>$(MdsPackageVersion)</Version>
   </PropertyGroup>
 
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
index dbdf7e9338..dfad9e601c 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -9,7 +9,7 @@
   <Import Project="../MdsVersions.props" />
   <PropertyGroup>
     <AssemblyVersion>$(MdsAssemblyVersion)</AssemblyVersion>
-    <FileVersion>$(MdsAssemblyVersion)</FileVersion>
+    <FileVersion>$(MdsFileVersion)</FileVersion>
     <Version>$(MdsPackageVersion)</Version>
   </PropertyGroup>
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 0f1c3c2d40..2f7c726500 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -13,7 +13,7 @@
   <Import Project="../MdsVersions.props" />
   <PropertyGroup>
     <AssemblyVersion>$(MdsAssemblyVersion)</AssemblyVersion>
-    <FileVersion>$(MdsAssemblyVersion)</FileVersion>
+    <FileVersion>$(MdsFileVersion)</FileVersion>
     <Version>$(MdsPackageVersion)</Version>
   </PropertyGroup>
 
diff --git a/tools/targets/GenerateThisAssemblyCs.targets b/tools/targets/GenerateThisAssemblyCs.targets
index 6dfd670c5c..8632d80dc4 100644
--- a/tools/targets/GenerateThisAssemblyCs.targets
+++ b/tools/targets/GenerateThisAssemblyCs.targets
@@ -8,8 +8,8 @@
 
     <PropertyGroup>
 
-      <!-- If an AssemblyFileVersion was provided, use that. Otherwise, use the AssemblyVersion -->
-      <AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">$(AssemblyVersion)</AssemblyFileVersion>
+      <!-- If an AssemblyFileVersion was provided, use that. Otherwise, use the FileVersion -->
+      <AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">$(FileVersion)</AssemblyFileVersion>
 
       <!-- Put the ThisAssembly class in the System namespace by default. -->
       <ThisAssemblyNamespace Condition="'$(ThisAssemblyNamespace)' == ''">System</ThisAssemblyNamespace>

From 75b33ad53c18d53fe8bcfbb8287f5b3ce78ee11b Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Tue, 31 Mar 2026 23:26:42 -0700
Subject: [PATCH 018/298] Trim docs using pwsh via dotnet tool to support
 cross-platform local development. (#4121)

---
 dotnet-tools.json                                        | 7 +++++++
 .../ref/Microsoft.Data.SqlClient.csproj                  | 9 ++++++---
 tools/targets/TrimDocsForIntelliSense.targets            | 4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dotnet-tools.json b/dotnet-tools.json
index 1f59e06063..11e3494512 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -15,6 +15,13 @@
         "apicompat"
       ],
       "rollForward": false
+    },
+    "powershell": {
+      "version": "7.6.0",
+      "commands": [
+        "pwsh"
+      ],
+      "rollForward": false
     }
   }
 }
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
index dfad9e601c..252e8ba0b0 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -36,6 +36,10 @@
     <OutputPath>$(ArtifactPath)$(AssemblyName).ref/$(ReferenceType)-$(Configuration)/</OutputPath>
   </PropertyGroup>
 
+  <Target Name="RestoreTools">
+    <Exec Command="dotnet tool restore" />
+  </Target>
+
   <!-- Trim Docs for IntelliSense ====================================== -->
   <!--
     It has been determined that including the remarks section in IntelliSense docs looks bad in
@@ -46,12 +50,11 @@
   <!-- This target runs after Build, and trims XML documentation generated in the $(OutputPath) of the project where this target is included.-->
   <Target Name="TrimDocsForIntelliSense"
           AfterTargets="Build"
+          DependsOnTargets="RestoreTools"
           Condition="'$(IsCrossTargetingBuild)' != 'true' AND '$(GenerateDocumentationFile)' == 'true'">
     <PropertyGroup>
-      <PowerShellCommand Condition="'$(OS)' == 'Windows_NT'">powershell.exe</PowerShellCommand>
-      <PowerShellCommand Condition="'$(OS)' != 'Windows_NT'">pwsh</PowerShellCommand>
       <PowerShellCommand>
-        $(PowerShellCommand)
+        dotnet tool run pwsh
           -NonInteractive
           -ExecutionPolicy Unrestricted
           -Command "$(RepoRoot)tools\intellisense\TrimDocs.ps1 -inputFile '$(DocumentationFile)' -outputFile '$(DocumentationFile)'"
diff --git a/tools/targets/TrimDocsForIntelliSense.targets b/tools/targets/TrimDocsForIntelliSense.targets
index 05feb26739..fd0ca40ea8 100644
--- a/tools/targets/TrimDocsForIntelliSense.targets
+++ b/tools/targets/TrimDocsForIntelliSense.targets
@@ -3,7 +3,7 @@ The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
   <!-- This target runs after Build, and trims XML documentation generated in the $(OutputPath) of the project where this target is included.-->
   <Target Name="TrimDocsForIntelliSense" AfterTargets="Build" Condition="'$(GenerateDocumentationFile)' == 'true'">
-    <Exec Command="powershell.exe -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;$(ToolsDir)intellisense\TrimDocs.ps1 -inputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos; -outputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos;&quot;" Condition=" '$(OS)' == 'Windows_NT' " />
-    <Exec Command="pwsh -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;$(ToolsDir)intellisense\TrimDocs.ps1 -inputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos; -outputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos;&quot;" Condition=" '$(OS)' != 'Windows_NT' " />
+    <Exec Command="dotnet tool restore" />
+    <Exec Command="dotnet tool run pwsh -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;$(ToolsDir)intellisense\TrimDocs.ps1 -inputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos; -outputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos;&quot;" />
   </Target>
 </Project>

From a11341f5bcd78e28044a683c8f61877a7f132a57 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 1 Apr 2026 07:25:09 -0300
Subject: [PATCH 019/298] Address flaky DEBUG assertions (#4085)

---
 .../ManualTests/DataCommon/DataTestUtility.cs |  89 ++++---
 .../SQL/AdapterTest/AdapterTest.cs            |   6 +-
 .../SQL/DataStreamTest/DataStreamTest.cs      | 222 ++++++++++--------
 .../SQL/LocalDBTest/LocalDBTest.cs            |   2 +-
 .../ManualTests/SQL/MARSTest/MARSTest.cs      |   4 +-
 .../ParallelTransactionsTest.cs               |   6 +-
 .../SQL/ParameterTest/ParametersTest.cs       |  22 +-
 .../CopyAllFromReaderCancelAsync.cs           |   2 +-
 .../CopyAllFromReaderConnectionCloseAsync.cs  |   2 +-
 ...llFromReaderConnectionCloseOnEventAsync.cs |   3 +-
 .../SQL/SqlBulkCopyTest/CopyWithEvent1.cs     |   2 +-
 .../SqlBulkCopyTest/MissingTargetColumn.cs    |   2 +-
 .../SqlBulkCopyTest/MissingTargetColumns.cs   |   2 +-
 .../OrderHintDuplicateColumn.cs               |   2 +-
 .../OrderHintMissingTargetColumn.cs           |   4 +-
 .../SQL/SqlBulkCopyTest/Transaction.cs        |   2 +-
 .../SQL/SqlBulkCopyTest/Transaction1.cs       |   2 +-
 .../SQL/SqlBulkCopyTest/Transaction3.cs       |   4 +-
 .../SQL/SqlBulkCopyTest/Transaction4.cs       |   2 +-
 .../SqlBulkCopyTest/TransactionTestAsync.cs   |   2 +-
 .../SQL/SqlCommand/SqlCommandCancelTest.cs    |   6 +-
 .../SqlNotificationTest.cs                    |   6 +-
 .../SQL/TransactionTest/TransactionTest.cs    |  18 +-
 .../tests/ManualTests/SQL/UdtTest/UdtTest2.cs |  15 +-
 24 files changed, 245 insertions(+), 182 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index 3b4245d84f..5bceb81b58 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -302,9 +302,9 @@ private static Task<string> AcquireTokenAsync(string authorityURL, string userID
             SecureString securePassword = new SecureString();
 
             securePassword.MakeReadOnly();
-#pragma warning disable CS0618 // Type or member is obsolete
+            #pragma warning disable CS0618 // Type or member is obsolete
             result = app.AcquireTokenByUsernamePassword(scopes, userID, password).ExecuteAsync().Result;
-#pragma warning restore CS0618 // Type or member is obsolete
+            #pragma warning restore CS0618 // Type or member is obsolete
 
             return result.AccessToken;
         });
@@ -389,7 +389,7 @@ public static string GetSqlServerProperty(SqlConnection connection, ServerProper
             }
         }
 
-        #nullable disable
+        #nullable restore
 
         private static bool GetSQLServerStatusOnTDS8(string connectionString)
         {
@@ -951,35 +951,48 @@ public static void AssertEqualsWithDescription(object expectedValue, object actu
             }
         }
 
-        public static TException AssertThrowsWrapper<TException>(Action actionThatFails, string exceptionMessage = null, bool innerExceptionMustBeNull = false, Func<TException, bool> customExceptionVerifier = null) where TException : Exception
+        #nullable enable
+
+        /// <summary>
+        /// Asserts that <paramref name="actionThatFails"/> throws an exception of type
+        /// <typeparamref name="TException"/> and optionally verifies that its message contains
+        /// <paramref name="exceptionMessage"/>.
+        /// </summary>
+        public static TException AssertThrows<TException>(
+            Action actionThatFails,
+            string? exceptionMessage = null)
+        where TException : Exception
         {
             TException ex = Assert.Throws<TException>(actionThatFails);
+
             if (exceptionMessage != null)
             {
                 Assert.True(ex.Message.Contains(exceptionMessage),
                     string.Format("FAILED: Exception did not contain expected message.\nExpected: {0}\nActual: {1}", exceptionMessage, ex.Message));
             }
 
-            if (innerExceptionMustBeNull)
-            {
-                Assert.True(ex.InnerException == null, "FAILED: Expected InnerException to be null.");
-            }
-
-            if (customExceptionVerifier != null)
-            {
-                Assert.True(customExceptionVerifier(ex), "FAILED: Custom exception verifier returned false for this exception.");
-            }
-
             return ex;
         }
 
-        public static TException AssertThrowsWrapper<TException, TInnerException>(Action actionThatFails, string exceptionMessage = null, string innerExceptionMessage = null, bool innerExceptionMustBeNull = false, Func<TException, bool> customExceptionVerifier = null) where TException : Exception
+        /// <summary>
+        /// Asserts that <paramref name="actionThatFails"/> throws <typeparamref name="TException"/>
+        /// whose <see cref="Exception.InnerException"/> is of type <typeparamref name="TInnerException"/>.
+        /// Optionally verifies message text on both the outer and inner exceptions.
+        /// </summary>
+        public static TException AssertThrowsInner<TException, TInnerException>(
+            Action actionThatFails,
+            string? exceptionMessage = null,
+            string? innerExceptionMessage = null)
+        where TException : Exception
+        where TInnerException : Exception
         {
-            TException ex = AssertThrowsWrapper<TException>(actionThatFails, exceptionMessage, innerExceptionMustBeNull, customExceptionVerifier);
+            TException ex = AssertThrows<TException>(actionThatFails, exceptionMessage);
+
+            Assert.NotNull(ex.InnerException);
+            Assert.IsAssignableFrom<TInnerException>(ex.InnerException);
 
             if (innerExceptionMessage != null)
             {
-                Assert.True(ex.InnerException != null, "FAILED: Cannot check innerExceptionMessage because InnerException is null.");
                 Assert.True(ex.InnerException.Message.Contains(innerExceptionMessage),
                     string.Format("FAILED: Inner Exception did not contain expected message.\nExpected: {0}\nActual: {1}", innerExceptionMessage, ex.InnerException.Message));
             }
@@ -987,26 +1000,40 @@ public static TException AssertThrowsWrapper<TException, TInnerException>(Action
             return ex;
         }
 
-        public static TException AssertThrowsWrapper<TException, TInnerException, TInnerInnerException>(Action actionThatFails, string exceptionMessage = null, string innerExceptionMessage = null, string innerInnerExceptionMessage = null, bool innerInnerInnerExceptionMustBeNull = false) where TException : Exception where TInnerException : Exception where TInnerInnerException : Exception
+        /// <summary>
+        /// Asserts that <paramref name="actionThatFails"/> throws <typeparamref name="TException"/>
+        /// whose <see cref="Exception.InnerException"/> is either <typeparamref name="TInnerException"/>
+        /// or <typeparamref name="TAlternateInnerException"/>. Use this when a race condition
+        /// (e.g. disposal during an async read) may cause the inner exception type to vary
+        /// between runs. The <paramref name="innerExceptionMessage"/> is only verified when the
+        /// inner exception is <typeparamref name="TInnerException"/>.
+        /// </summary>
+        public static TException AssertThrowsInnerWithAlternate<TException, TInnerException, TAlternateInnerException>(
+            Action actionThatFails,
+            string? exceptionMessage = null,
+            string? innerExceptionMessage = null)
+        where TException : Exception
+        where TInnerException : Exception
+        where TAlternateInnerException : Exception
         {
-            TException ex = AssertThrowsWrapper<TException, TInnerException>(actionThatFails, exceptionMessage, innerExceptionMessage);
-            if (innerInnerInnerExceptionMustBeNull)
-            {
-                Assert.True(ex.InnerException != null, "FAILED: Cannot check innerInnerInnerExceptionMustBeNull since InnerException is null");
-                Assert.True(ex.InnerException.InnerException == null, "FAILED: Expected InnerInnerException to be null.");
-            }
+            TException ex = AssertThrows<TException>(actionThatFails, exceptionMessage);
 
-            if (innerInnerExceptionMessage != null)
+            Assert.NotNull(ex.InnerException);
+            Assert.True(
+                ex.InnerException is TInnerException or TAlternateInnerException,
+                $"Expected {typeof(TInnerException).Name} or {typeof(TAlternateInnerException).Name}, got: {ex.InnerException?.GetType()}");
+
+            if (innerExceptionMessage != null && ex.InnerException is TInnerException)
             {
-                Assert.True(ex.InnerException != null, "FAILED: Cannot check innerInnerExceptionMessage since InnerException is null");
-                Assert.True(ex.InnerException.InnerException != null, "FAILED: Cannot check innerInnerExceptionMessage since InnerInnerException is null");
-                Assert.True(ex.InnerException.InnerException.Message.Contains(innerInnerExceptionMessage),
-                    string.Format("FAILED: Inner Exception did not contain expected message.\nExpected: {0}\nActual: {1}", innerInnerExceptionMessage, ex.InnerException.InnerException.Message));
+                Assert.True(ex.InnerException.Message.Contains(innerExceptionMessage),
+                    string.Format("FAILED: Inner Exception did not contain expected message.\nExpected: {0}\nActual: {1}", innerExceptionMessage, ex.InnerException.Message));
             }
 
             return ex;
         }
 
+        #nullable restore
+
         public static TException ExpectFailure<TException>(Action actionThatFails, string[] exceptionMessages, bool innerExceptionMustBeNull = false, Func<TException, bool> customExceptionVerifier = null) where TException : Exception
         {
             try
@@ -1320,7 +1347,7 @@ public static string GetMachineFQDN(string hostname)
             }
             return fqdn.ToString();
         }
-    }
 
-    #nullable disable
+        #nullable restore
+    }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
index ed9d9ab541..9bf5351a83 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
@@ -1318,13 +1318,13 @@ public void TestDeriveParameters()
                 using (SqlCommand cmd = new SqlCommand(procName, connection))
                 {
                     string errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_DeriveParametersNotSupported, "SqlCommand", cmd.CommandType);
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(
+                    DataTestUtility.AssertThrows<InvalidOperationException>(
                         () => SqlCommandBuilder.DeriveParameters(cmd),
                         errorMessage);
 
                     errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_OpenConnectionRequired, "DeriveParameters", "");
                     cmd.CommandType = CommandType.StoredProcedure;
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(
+                    DataTestUtility.AssertThrows<InvalidOperationException>(
                         () => SqlCommandBuilder.DeriveParameters(cmd),
                         errorMessage);
 
@@ -1335,7 +1335,7 @@ public void TestDeriveParameters()
 
                     cmd.CommandText = "Test_EmployeeSalesBy";
                     errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_NoStoredProcedureExists, cmd.CommandText);
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(
+                    DataTestUtility.AssertThrows<InvalidOperationException>(
                         () => SqlCommandBuilder.DeriveParameters(cmd),
                         errorMessage);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
index 1c6d851ecc..2de13c98ac 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
@@ -276,7 +276,7 @@ static async Task LocalCopyTo(Stream source, Stream destination, int bufferSize,
                     {
                         await destination.WriteAsync(new ReadOnlyMemory<byte>(buffer, 0, bytesRead), cancellationToken).ConfigureAwait(false);
                     }
-#endif 
+#endif
                 }
                 finally
                 {
@@ -320,7 +320,7 @@ private static byte[] CreateBinaryTable(SqlConnection connection, string tableNa
             {
                 cmd.CommandText = $@"
 IF OBJECT_ID('dbo.{tableName}', 'U') IS NOT NULL
-DROP TABLE {tableName}; 
+DROP TABLE {tableName};
 CREATE TABLE {tableName} (id INT, foo VARBINARY(MAX))
 ";
                 cmd.ExecuteNonQuery();
@@ -377,7 +377,7 @@ private static void MultipleResults(string connectionString)
                         {
                             Assert.True(numBatches < expectedResults.Length, "ERROR: Received more batches than were expected.");
                             object[] values = new object[r1.FieldCount];
-                            // Current "column" in expected row is (valuesChecked MOD FieldCount), since 
+                            // Current "column" in expected row is (valuesChecked MOD FieldCount), since
                             // expected rows for current batch are appended together for easy formatting
                             int valuesChecked = 0;
                             while (r1.Read())
@@ -410,7 +410,7 @@ private static void InvalidRead(string connectionString)
                 using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     string errorMessage = SystemDataResourceManager.Instance.SQL_InvalidRead;
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetInt32(0), errorMessage);
+                    DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetInt32(0), errorMessage);
                 }
             }
         }
@@ -497,7 +497,7 @@ private static void TypeRead(string connectionString)
                     s = rdr.GetString(10); //ShipCity;
                                            // should get an exception here
                     string errorMessage = SystemDataResourceManager.Instance.SqlMisc_NullValueMessage;
-                    DataTestUtility.AssertThrowsWrapper<SqlNullValueException>(() => rdr.GetString(11), errorMessage);
+                    DataTestUtility.AssertThrows<SqlNullValueException>(() => rdr.GetString(11), errorMessage);
 
                     s = rdr.GetString(12); //ShipPostalCode;
                     s = rdr.GetString(13); //ShipCountry;
@@ -533,7 +533,7 @@ private static void GetValueOfTRead(string connectionString)
                     rdr.IsDBNull(10);
                     rdr.GetFieldValue<string>(10); //ShipCity;
                     // should get an exception here
-                    DataTestUtility.AssertThrowsWrapper<SqlNullValueException>(() => rdr.GetFieldValue<string>(11), errorMessage);
+                    DataTestUtility.AssertThrows<SqlNullValueException>(() => rdr.GetFieldValue<string>(11), errorMessage);
                     rdr.IsDBNull(11);
                     rdr.GetFieldValue<SqlString>(11);
                     rdr.IsDBNull(11);
@@ -542,7 +542,7 @@ private static void GetValueOfTRead(string connectionString)
                     rdr.IsDBNull(12);
                     rdr.GetFieldValue<INullable>(13);//ShipCountry;
                     rdr.GetFieldValue<string>(14);
-                    DataTestUtility.AssertThrowsWrapper<SqlNullValueException>(() => rdr.GetFieldValue<string>(15), errorMessage);
+                    DataTestUtility.AssertThrows<SqlNullValueException>(() => rdr.GetFieldValue<string>(15), errorMessage);
 
                     rdr.Read();
                     // read data out of buffer
@@ -559,7 +559,7 @@ private static void GetValueOfTRead(string connectionString)
                     Assert.False(rdr.IsDBNullAsync(10).Result, "FAILED: IsDBNull was true for a non-null value");
                     rdr.GetFieldValueAsync<string>(10).Wait(); //ShipCity;
                     // should get an exception here
-                    DataTestUtility.AssertThrowsWrapper<AggregateException, SqlNullValueException>(() => rdr.GetFieldValueAsync<string>(11).Wait(), innerExceptionMessage: errorMessage);
+                    DataTestUtility.AssertThrowsInner<AggregateException, SqlNullValueException>(() => rdr.GetFieldValueAsync<string>(11).Wait(), innerExceptionMessage: errorMessage);
                     Assert.True(rdr.IsDBNullAsync(11).Result, "FAILED: IsDBNull was false for a null value");
 
                     rdr.IsDBNullAsync(11).Wait();
@@ -787,7 +787,7 @@ private static void OrphanReader(string connectionString)
                         conn.Close();
 
                         errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_DataReaderClosed, "CheckDataIsReady");
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => value = reader[0], errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => value = reader[0], errorMessage);
                         Assert.True(reader.IsClosed, "FAILED: Stream was not closed by connection close (Scenario: Read)");
                         conn.Open();
                     }
@@ -798,7 +798,7 @@ private static void OrphanReader(string connectionString)
                         value = reader[0];
                         conn.Close();
 
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => value = reader[0], errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => value = reader[0], errorMessage);
                         Assert.True(reader.IsClosed, "FAILED: Stream was not closed by connection close (Scenario: Read Partial Data)");
                         conn.Open();
                     }
@@ -817,7 +817,7 @@ private static void OrphanReader(string connectionString)
                         } while (reader.NextResult());
 
                         conn.Close();
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => value = reader[0], errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => value = reader[0], errorMessage);
                         Assert.True(reader.IsClosed, "FAILED: Stream was not closed by connection close (Scenario: Read All Data)");
                     }
                 }
@@ -866,7 +866,7 @@ private static void ExecuteXmlReaderTest(string connectionString)
 
                         // make sure we get an exception if we try to get another reader
                         errorMessage = SystemDataResourceManager.Instance.ADP_OpenReaderExists("Connection");
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => xr = cmd.ExecuteXmlReader(), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => xr = cmd.ExecuteXmlReader(), errorMessage);
                     }
 
                     // use a big result to fill up the pipe and do a partial read
@@ -943,12 +943,12 @@ private static void ExecuteXmlReaderTest(string connectionString)
                     // multiple columns
                     cmd.CommandText = "select * from customers";
                     errorMessage = SystemDataResourceManager.Instance.SQL_NonXmlResult;
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => xr = cmd.ExecuteXmlReader(), errorMessage);
+                    DataTestUtility.AssertThrows<InvalidOperationException>(() => xr = cmd.ExecuteXmlReader(), errorMessage);
 
                     // non-ntext column
                     cmd.CommandText = "select employeeID from employees";
                     errorMessage = SystemDataResourceManager.Instance.SQL_NonXmlResult;
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => xr = cmd.ExecuteXmlReader(), errorMessage);
+                    DataTestUtility.AssertThrows<InvalidOperationException>(() => xr = cmd.ExecuteXmlReader(), errorMessage);
                 }
             }
         }
@@ -1114,31 +1114,31 @@ private static void SequentialAccess(string connectionString)
                         i = reader.GetOrdinal("notes");
                         reader.GetChars(i, 14, chars, 0, 14);
                         string errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_NonSequentialColumnAccess, i, i + 1);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetString(i), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetString(i), errorMessage);
 
                         // Tests GetValue before GetBytes\Chars
                         reader.Read();
                         i = reader.GetOrdinal("photo");
                         reader.GetSqlBinary(i);
                         errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_NonSequentialColumnAccess, i, i + 1);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetBytes(i, 0, data, 0, 13), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetBytes(i, 0, data, 0, 13), errorMessage);
 
                         i = reader.GetOrdinal("notes");
                         reader.GetString(i);
                         errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_NonSequentialColumnAccess, i, i + 1);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetChars(i, 0, chars, 0, 14), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetChars(i, 0, chars, 0, 14), errorMessage);
 
                         // Tests GetBytes\GetChars re-reading same characters
                         reader.Read();
                         i = reader.GetOrdinal("photo");
                         reader.GetBytes(i, 0, data, 0, 13);
                         errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_NonSeqByteAccess, 0, 13, "GetBytes");
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetBytes(i, 0, data, 0, 13), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetBytes(i, 0, data, 0, 13), errorMessage);
 
                         i = reader.GetOrdinal("notes");
                         reader.GetChars(i, 0, chars, 0, 14);
                         errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_NonSeqByteAccess, 0, 14, "GetChars");
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetChars(i, 0, chars, 0, 14), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetChars(i, 0, chars, 0, 14), errorMessage);
                     }
 
                     using (reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
@@ -1150,12 +1150,12 @@ private static void SequentialAccess(string connectionString)
 
                         int columnToTry = 0;
                         string errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_NonSequentialColumnAccess, columnToTry, sqldata.Length);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetInt32(columnToTry), errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetValue(columnToTry), errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetFieldValue<int>(columnToTry), errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetFieldValue<SqlInt32>(columnToTry), errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<AggregateException, InvalidOperationException>(() => reader.GetFieldValueAsync<int>(columnToTry).Wait(), innerExceptionMessage: errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<AggregateException, InvalidOperationException>(() => reader.GetFieldValueAsync<SqlInt32>(columnToTry).Wait(), innerExceptionMessage: errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetInt32(columnToTry), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetValue(columnToTry), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetFieldValue<int>(columnToTry), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetFieldValue<SqlInt32>(columnToTry), errorMessage);
+                        DataTestUtility.AssertThrowsInner<AggregateException, InvalidOperationException>(() => reader.GetFieldValueAsync<int>(columnToTry).Wait(), innerExceptionMessage: errorMessage);
+                        DataTestUtility.AssertThrowsInner<AggregateException, InvalidOperationException>(() => reader.GetFieldValueAsync<SqlInt32>(columnToTry).Wait(), innerExceptionMessage: errorMessage);
 
                         reader.Read();
                         columnToTry = 17;
@@ -1163,12 +1163,12 @@ private static void SequentialAccess(string connectionString)
 
                         s = reader.GetString(columnToTry);
                         DataTestUtility.AssertEqualsWithDescription("http://accweb/emmployees/fuller.bmp", s, "FAILED: Did not receive expected string.");
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetInt32(columnToTry), errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetValue(columnToTry), errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetFieldValue<int>(columnToTry), errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetFieldValue<SqlInt32>(columnToTry), errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<AggregateException, InvalidOperationException>(() => reader.GetFieldValueAsync<int>(columnToTry).Wait(), innerExceptionMessage: errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<AggregateException, InvalidOperationException>(() => reader.GetFieldValueAsync<SqlInt32>(columnToTry).Wait(), innerExceptionMessage: errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetInt32(columnToTry), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetValue(columnToTry), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetFieldValue<int>(columnToTry), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetFieldValue<SqlInt32>(columnToTry), errorMessage);
+                        DataTestUtility.AssertThrowsInner<AggregateException, InvalidOperationException>(() => reader.GetFieldValueAsync<int>(columnToTry).Wait(), innerExceptionMessage: errorMessage);
+                        DataTestUtility.AssertThrowsInner<AggregateException, InvalidOperationException>(() => reader.GetFieldValueAsync<SqlInt32>(columnToTry).Wait(), innerExceptionMessage: errorMessage);
 
                         reader.Read();
                         // skip all columns up to photo, and read from it partially
@@ -1189,14 +1189,14 @@ private static void SequentialAccess(string connectionString)
 
                         // now try to read one more byte
                         string errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_DataReaderClosed, "GetBytes");
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => cb = reader.GetBytes(i, 51, data, 0, 1), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => cb = reader.GetBytes(i, 51, data, 0, 1), errorMessage);
                         errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_DataReaderClosed, "CheckDataIsReady");
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetValue(i), errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetFieldValue<byte[]>(i), errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetFieldValue<SqlBinary>(i), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetValue(i), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetFieldValue<byte[]>(i), errorMessage);
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetFieldValue<SqlBinary>(i), errorMessage);
                         errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_DataReaderClosed, "GetFieldValueAsync");
-                        DataTestUtility.AssertThrowsWrapper<AggregateException, InvalidOperationException>(() => reader.GetFieldValueAsync<byte[]>(i).Wait(), innerExceptionMessage: errorMessage);
-                        DataTestUtility.AssertThrowsWrapper<AggregateException, InvalidOperationException>(() => reader.GetFieldValueAsync<SqlBinary>(i).Wait(), innerExceptionMessage: errorMessage);
+                        DataTestUtility.AssertThrowsInnerWithAlternate<AggregateException, InvalidOperationException, IOException>(() => reader.GetFieldValueAsync<byte[]>(i).Wait(), innerExceptionMessage: errorMessage);
+                        DataTestUtility.AssertThrowsInnerWithAlternate<AggregateException, InvalidOperationException, IOException>(() => reader.GetFieldValueAsync<SqlBinary>(i).Wait(), innerExceptionMessage: errorMessage);
                     }
                 }
             }
@@ -1236,10 +1236,10 @@ private static void NumericRead(string connectionString)
                             // Em
                             object value;
                             string errorMessage = SystemDataResourceManager.Instance.SqlMisc_ConversionOverflowMessage;
-                            DataTestUtility.AssertThrowsWrapper<OverflowException>(() => value = reader[0], errorMessage);
-                            DataTestUtility.AssertThrowsWrapper<OverflowException>(() => value = reader[1], errorMessage);
-                            DataTestUtility.AssertThrowsWrapper<OverflowException>(() => value = reader.GetDecimal(0), errorMessage);
-                            DataTestUtility.AssertThrowsWrapper<OverflowException>(() => value = reader.GetDecimal(1), errorMessage);
+                            DataTestUtility.AssertThrows<OverflowException>(() => value = reader[0], errorMessage);
+                            DataTestUtility.AssertThrows<OverflowException>(() => value = reader[1], errorMessage);
+                            DataTestUtility.AssertThrows<OverflowException>(() => value = reader.GetDecimal(0), errorMessage);
+                            DataTestUtility.AssertThrows<OverflowException>(() => value = reader.GetDecimal(1), errorMessage);
                         }
                     }
                     finally
@@ -1297,7 +1297,7 @@ private static void HasRowsTest(string connectionString)
 
                     bool result;
                     string errorMessage = string.Format(SystemDataResourceManager.Instance.ADP_DataReaderClosed, "HasRows");
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => result = reader.HasRows, errorMessage);
+                    DataTestUtility.AssertThrows<InvalidOperationException>(() => result = reader.HasRows, errorMessage);
                 }
             }
         }
@@ -1382,7 +1382,7 @@ private static void SeqAccessFailureWrapper<TException>(Action action, CommandBe
         {
             if (behavior == CommandBehavior.SequentialAccess)
             {
-                DataTestUtility.AssertThrowsWrapper<TException>(action);
+                DataTestUtility.AssertThrows<TException>(action);
             }
             else
             {
@@ -1390,6 +1390,24 @@ private static void SeqAccessFailureWrapper<TException>(Action action, CommandBe
             }
         }
 
+        /// <summary>
+        /// Waits for a task that may or may not throw due to a race condition, and if they do
+        /// throw, they may throw one of a few acceptable exceptions.
+        ///
+        /// See: https://github.com/dotnet/SqlClient/issues/4088
+        /// </summary>
+        private static void WaitIgnoringFlakyException(Task task)
+        {
+            try { task.Wait(); }
+            catch (AggregateException)
+            {
+                // A faulted Task stores its exception permanently. Calling .Wait() again is
+                // guaranteed to re-throw the same AggregateException, so we can safely pass it to
+                // the assert helper for inner-exception validation.
+                DataTestUtility.AssertThrowsInnerWithAlternate<AggregateException, IOException, InvalidOperationException>(() => task.Wait());
+            }
+        }
+
         private static void GetStream(string connectionString)
         {
             using (SqlConnection connection = new SqlConnection(connectionString))
@@ -1410,7 +1428,7 @@ private static void GetStream(string connectionString)
                             reader.GetStream(1);
 
                             // Bad values
-                            DataTestUtility.AssertThrowsWrapper<InvalidCastException>(() => reader.GetStream(2));
+                            DataTestUtility.AssertThrows<InvalidCastException>(() => reader.GetStream(2));
                             // Null stream
                             Stream stream = reader.GetStream(3);
                             Assert.False(stream.Read(buffer, 0, buffer.Length) > 0, "FAILED: Read more than 0 bytes from a null stream");
@@ -1446,12 +1464,12 @@ private static void GetStream(string connectionString)
                             {
                                 t = reader.ReadAsync();
                                 Assert.False(t.Wait(1), "FAILED: Read completed immediately");
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetStream(8));
+                                DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetStream(8));
                             }
-                            DataTestUtility.AssertThrowsWrapper<AggregateException, IOException>(() => t.Wait());
+                            WaitIgnoringFlakyException(t);
 
-                            // GetStream after Read 
-                            DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetStream(0));
+                            // GetStream after Read
+                            DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetStream(0));
 #endif
                         }
 
@@ -1486,8 +1504,7 @@ private static void GetStream(string connectionString)
                             Assert.True(t.IsCompleted, "FAILED: Failed to get stream within 1 second");
                             t = reader.ReadAsync();
                         }
-                        // TODO(GH-3604): Fix this failing assertion.
-                        // DataTestUtility.AssertThrowsWrapper<AggregateException, IOException>(() => t.Wait());
+                        WaitIgnoringFlakyException(t);
                     }
 #endif
                 }
@@ -1523,7 +1540,7 @@ private static void GetTextReader(string connectionString)
                                 reader.GetTextReader(1);
 
                                 // Bad values
-                                DataTestUtility.AssertThrowsWrapper<InvalidCastException>(() => reader.GetTextReader(2));
+                                DataTestUtility.AssertThrows<InvalidCastException>(() => reader.GetTextReader(2));
                                 // Null stream
                                 TextReader textReader = reader.GetTextReader(3);
                                 Assert.False(textReader.Read(buffer, 0, buffer.Length) > 0, "FAILED: Read more than 0 chars from a null TextReader");
@@ -1559,13 +1576,12 @@ private static void GetTextReader(string connectionString)
                                 {
                                     t = reader.ReadAsync();
                                     Assert.False(t.IsCompleted, "FAILED: Read completed immediately");
-                                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetTextReader(8));
+                                    DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetTextReader(8));
                                 }
-                                // TODO(GH-3604): Fix this failing assertion.
-                                // DataTestUtility.AssertThrowsWrapper<AggregateException, IOException>(() => t.Wait());
+                                WaitIgnoringFlakyException(t);
 
-                                // GetTextReader after Read 
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetTextReader(0));
+                                // GetTextReader after Read
+                                DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetTextReader(0));
 #endif
                             }
 
@@ -1601,8 +1617,7 @@ private static void GetTextReader(string connectionString)
                                 Assert.True(t.IsCompleted, "FAILED: Failed to get TextReader within 1 second");
                                 t = reader.ReadAsync();
                             }
-                            // TODO(GH-3604): Fix this failing assertion.
-                            // DataTestUtility.AssertThrowsWrapper<AggregateException, IOException>(() => t.Wait());
+                            WaitIgnoringFlakyException(t);
                         }
 #endif
                     }
@@ -1631,7 +1646,7 @@ private static void GetXmlReader(string connectionString)
                             reader.GetXmlReader(1);
 
                             // Bad values
-                            DataTestUtility.AssertThrowsWrapper<InvalidCastException>(() => reader.GetXmlReader(2));
+                            DataTestUtility.AssertThrows<InvalidCastException>(() => reader.GetXmlReader(2));
                             // Null stream
                             XmlReader xmlReader = reader.GetXmlReader(3);
                             Assert.False(xmlReader.Read(), "FAILED: Successfully read on a null XmlReader");
@@ -1651,13 +1666,12 @@ private static void GetXmlReader(string connectionString)
                             {
                                 t = reader.ReadAsync();
                                 Assert.False(t.IsCompleted, "FAILED: Read completed immediately");
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetXmlReader(6));
+                                DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetXmlReader(6));
                             }
-                            // TODO(GH-3604): Fix this failing assertion.
-                            // DataTestUtility.AssertThrowsWrapper<AggregateException, IOException>(() => t.Wait());
+                            WaitIgnoringFlakyException(t);
 
-                            // GetXmlReader after Read 
-                            DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.GetXmlReader(0));
+                            // GetXmlReader after Read
+                            DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.GetXmlReader(0));
 #endif
                         }
                     }
@@ -1691,16 +1705,16 @@ private static void ReadStream(string connectionString)
 
                                 // Testing stream properties
                                 stream.Flush();
-                                DataTestUtility.AssertThrowsWrapper<NotSupportedException>(() => stream.SetLength(1));
+                                DataTestUtility.AssertThrows<NotSupportedException>(() => stream.SetLength(1));
                                 Action<Stream> performOnStream = ((s) => { int i = s.WriteTimeout; });
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => performOnStream(stream));
+                                DataTestUtility.AssertThrows<InvalidOperationException>(() => performOnStream(stream));
                                 if (behavior == CommandBehavior.SequentialAccess)
                                 {
-                                    DataTestUtility.AssertThrowsWrapper<NotSupportedException>(() => stream.Seek(0, SeekOrigin.Begin));
+                                    DataTestUtility.AssertThrows<NotSupportedException>(() => stream.Seek(0, SeekOrigin.Begin));
                                     performOnStream = ((s) => { long i = s.Position; });
-                                    DataTestUtility.AssertThrowsWrapper<NotSupportedException>(() => performOnStream(stream));
+                                    DataTestUtility.AssertThrows<NotSupportedException>(() => performOnStream(stream));
                                     performOnStream = ((s) => { long i = s.Length; });
-                                    DataTestUtility.AssertThrowsWrapper<NotSupportedException>(() => performOnStream(stream));
+                                    DataTestUtility.AssertThrows<NotSupportedException>(() => performOnStream(stream));
                                 }
                                 else
                                 {
@@ -1711,7 +1725,7 @@ private static void ReadStream(string connectionString)
                             }
 
                             // Once Stream is closed
-                            DataTestUtility.AssertThrowsWrapper<ObjectDisposedException>(() => { _ = stream.Read(buffer, 0, buffer.Length); });
+                            DataTestUtility.AssertThrows<ObjectDisposedException>(() => { _ = stream.Read(buffer, 0, buffer.Length); });
                         }
 
                         using (SqlDataReader reader = cmd.ExecuteReader(behavior))
@@ -1723,9 +1737,9 @@ private static void ReadStream(string connectionString)
                             _ = stream.Read(buffer, 0, buffer.Length);
 
                             // Argument exceptions
-                            DataTestUtility.AssertThrowsWrapper<ArgumentNullException>(() => { _ = stream.Read(null, 0, 1); });
-                            DataTestUtility.AssertThrowsWrapper<ArgumentOutOfRangeException>(() => { _ = stream.Read(buffer, -1, 2); });
-                            DataTestUtility.AssertThrowsWrapper<ArgumentOutOfRangeException>(() => { _ = stream.Read(buffer, 2, -1); });
+                            DataTestUtility.AssertThrows<ArgumentNullException>(() => { _ = stream.Read(null, 0, 1); });
+                            DataTestUtility.AssertThrows<ArgumentOutOfRangeException>(() => { _ = stream.Read(buffer, -1, 2); });
+                            DataTestUtility.AssertThrows<ArgumentOutOfRangeException>(() => { _ = stream.Read(buffer, 2, -1); });
 
                             // Prior to net6 comment:ArgumentException is thrown in net5 and earlier. ArgumentOutOfRangeException in net6 and later
                             ArgumentException ex = Assert.ThrowsAny<ArgumentException>(() => { _ = stream.Read(buffer, buffer.Length, buffer.Length); });
@@ -1777,10 +1791,10 @@ private static void ReadStream(string connectionString)
                                 {
                                     // Read during async
                                     t = stream.ReadAsync(largeBuffer, 0, largeBuffer.Length);
-                                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => { _ = stream.Read(largeBuffer, 0, largeBuffer.Length); });
-                                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.Read());
+                                    DataTestUtility.AssertThrows<InvalidOperationException>(() => { _ = stream.Read(largeBuffer, 0, largeBuffer.Length); });
+                                    DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.Read());
                                 }
-                                DataTestUtility.AssertThrowsWrapper<AggregateException, IOException>(() => t.Wait());
+                                DataTestUtility.AssertThrowsInnerWithAlternate<AggregateException, IOException, InvalidOperationException>(() => t.Wait());
                             }
                             using (SqlDataReader reader = cmd.ExecuteReader(behavior))
                             {
@@ -1796,7 +1810,7 @@ private static void ReadStream(string connectionString)
                                     // Guarantee that timeout occurs:
                                     Thread.Sleep(stream.ReadTimeout * 4);
                                 }
-                                DataTestUtility.AssertThrowsWrapper<AggregateException, IOException>(() => t.Wait());
+                                DataTestUtility.AssertThrowsInnerWithAlternate<AggregateException, IOException, InvalidOperationException>(() => t.Wait());
                             }
 
                             using (SqlDataReader reader = cmd.ExecuteReader(behavior))
@@ -1811,7 +1825,10 @@ private static void ReadStream(string connectionString)
                                     t = stream.ReadAsync(largeBuffer, 0, largeBuffer.Length, tokenSource.Token);
                                     tokenSource.Cancel();
                                 }
-                                DataTestUtility.AssertThrowsWrapper<AggregateException, TaskCanceledException>(() => t.Wait());
+                                // Normally the cancellation wins (TaskCanceledException), but if the
+                                // PendAsyncReadsScope disposal completes the read first, the inner
+                                // exception may be InvalidOperationException instead (GH-4088).
+                                DataTestUtility.AssertThrowsInnerWithAlternate<AggregateException, TaskCanceledException, InvalidOperationException>(() => t.Wait());
                             }
 
                             using (SqlDataReader reader = cmd.ExecuteReader(behavior))
@@ -1824,7 +1841,18 @@ private static void ReadStream(string connectionString)
                                     // Error during read
                                     t = stream.ReadAsync(largeBuffer, 0, largeBuffer.Length);
                                 }
-                                DataTestUtility.AssertThrowsWrapper<AggregateException, IOException, SqlException>(() => t.Wait());
+                                // PendAsyncReadsScope(errorCode: 11) injects a network error, normally producing
+                                // AggregateException -> IOException -> SqlException. In rare race conditions
+                                // the inner exception may be ObjectDisposedException instead (GH-4088).
+                                AggregateException aex = Assert.Throws<AggregateException>(() => t.Wait());
+                                if (aex.InnerException is IOException ioEx)
+                                {
+                                    Assert.IsAssignableFrom<SqlException>(ioEx.InnerException);
+                                }
+                                else
+                                {
+                                    Assert.IsAssignableFrom<ObjectDisposedException>(aex.InnerException);
+                                }
                             }
 #endif
                         }
@@ -1876,7 +1904,7 @@ private static void ReadTextReader(string connectionString)
                                 }
 
                                 // Once Reader is closed
-                                DataTestUtility.AssertThrowsWrapper<ObjectDisposedException>(() => textReader.Read(buffer, 0, buffer.Length));
+                                DataTestUtility.AssertThrows<ObjectDisposedException>(() => textReader.Read(buffer, 0, buffer.Length));
                             }
 
                             using (SqlDataReader reader = cmd.ExecuteReader(behavior))
@@ -1890,11 +1918,11 @@ private static void ReadTextReader(string connectionString)
                                 textReader.Peek();
 
                                 // Argument exceptions
-                                DataTestUtility.AssertThrowsWrapper<ArgumentNullException>(() => textReader.Read(null, 0, 1));
-                                DataTestUtility.AssertThrowsWrapper<ArgumentOutOfRangeException>(() => textReader.Read(buffer, -1, 2));
-                                DataTestUtility.AssertThrowsWrapper<ArgumentOutOfRangeException>(() => textReader.Read(buffer, 2, -1));
-                                DataTestUtility.AssertThrowsWrapper<ArgumentException>(() => textReader.Read(buffer, buffer.Length, buffer.Length));
-                                DataTestUtility.AssertThrowsWrapper<ArgumentException>(() => textReader.Read(buffer, int.MaxValue, int.MaxValue));
+                                DataTestUtility.AssertThrows<ArgumentNullException>(() => textReader.Read(null, 0, 1));
+                                DataTestUtility.AssertThrows<ArgumentOutOfRangeException>(() => textReader.Read(buffer, -1, 2));
+                                DataTestUtility.AssertThrows<ArgumentOutOfRangeException>(() => textReader.Read(buffer, 2, -1));
+                                DataTestUtility.AssertThrows<ArgumentException>(() => textReader.Read(buffer, buffer.Length, buffer.Length));
+                                DataTestUtility.AssertThrows<ArgumentException>(() => textReader.Read(buffer, int.MaxValue, int.MaxValue));
                             }
 
                             // Once Reader is closed
@@ -1936,11 +1964,10 @@ private static void ReadTextReader(string connectionString)
                                     {
                                         // Read during async
                                         t = textReader.ReadAsync(largeBuffer, 0, largeBuffer.Length);
-                                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => textReader.Read(largeBuffer, 0, largeBuffer.Length));
-                                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => reader.Read());
+                                        DataTestUtility.AssertThrows<InvalidOperationException>(() => textReader.Read(largeBuffer, 0, largeBuffer.Length));
+                                        DataTestUtility.AssertThrows<InvalidOperationException>(() => reader.Read());
                                     }
-                                    // TODO(GH-3604): Fix this failing assertion.
-                                    // DataTestUtility.AssertThrowsWrapper<AggregateException, IOException>(() => t.Wait());
+                                    WaitIgnoringFlakyException(t);
                                 }
 
                                 using (SqlDataReader reader = cmd.ExecuteReader(behavior))
@@ -1953,7 +1980,18 @@ private static void ReadTextReader(string connectionString)
                                         // Error during read
                                         t = textReader.ReadAsync(largeBuffer, 0, largeBuffer.Length);
                                     }
-                                    DataTestUtility.AssertThrowsWrapper<AggregateException, IOException, SqlException>(() => t.Wait());
+                                    // PendAsyncReadsScope(errorCode: 11) injects a network error, normally producing
+                                    // AggregateException -> IOException -> SqlException. In rare race conditions
+                                    // the inner exception may be ObjectDisposedException instead (GH-4088).
+                                    AggregateException aex = Assert.Throws<AggregateException>(() => t.Wait());
+                                    if (aex.InnerException is IOException ioEx)
+                                    {
+                                        Assert.IsAssignableFrom<SqlException>(ioEx.InnerException);
+                                    }
+                                    else
+                                    {
+                                        Assert.IsAssignableFrom<ObjectDisposedException>(aex.InnerException);
+                                    }
                                 }
 #endif
                             }
@@ -2118,7 +2156,7 @@ private void TestXEventsStreaming(string connectionString)
                     byte[] bytes = new byte[cb];
                     long read = reader.GetBytes(1, 0, bytes, 0, cb);
 
-                    // Don't send data on the first read because there is already data in the buffer. 
+                    // Don't send data on the first read because there is already data in the buffer.
                     // Don't send data on the last iteration. We will not be reading that data.
                     if (i == 0 || i == streamXeventCount - 1)
                     {
@@ -2164,7 +2202,7 @@ private static void TimeoutDuringReadAsyncWithClosedReaderTest(string connection
 
                             // Wait for the task to see the timeout
                             string errorMessage = SystemDataResourceManager.Instance.SQL_Timeout_Execution;
-                            DataTestUtility.AssertThrowsWrapper<AggregateException, SqlException>(() => task.Wait(), innerExceptionMessage: errorMessage);
+                            DataTestUtility.AssertThrowsInnerWithAlternate<AggregateException, SqlException, IOException>(() => task.Wait(), innerExceptionMessage: errorMessage);
                         }
                     }
                 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs
index ad84ac7881..c3aed471c0 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs
@@ -54,7 +54,7 @@ public static void LocalDBMarsTest()
         public static void InvalidLocalDBTest()
         {
             using var connection = new SqlConnection(s_badConnectionString);
-            DataTestUtility.AssertThrowsWrapper<SqlException>(() => connection.Open());
+            DataTestUtility.AssertThrows<SqlException>(() => connection.Open());
         }
 #endregion
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs
index 69265c4e75..1213c5bfa4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs
@@ -591,7 +591,7 @@ public static void MARSMultiDataReaderErrTest()
                 {
                     using (SqlDataReader reader1 = command.ExecuteReader())
                     {
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() =>
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() =>
                         {
                             SqlDataReader reader2 = command.ExecuteReader();
                         }, openReaderExistsMessage);
@@ -611,7 +611,7 @@ public static void MARSMultiDataReaderErrTest()
                 {
                     using (SqlDataReader reader1 = command1.ExecuteReader())
                     {
-                        DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() =>
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() =>
                         {
                             SqlDataReader reader2 = command2.ExecuteReader();
                         }, openReaderExistsMessage);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs
index efc99ea757..73fbd8bdc6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs
@@ -20,7 +20,7 @@ public static void BasicParallelTest_shouldThrowsUnsupported()
             try
             {
                 tempTableName = CreateTempTable(connectionString);
-                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(
+                DataTestUtility.AssertThrows<InvalidOperationException>(
                     actionThatFails: () => { BasicParallelTest(connectionString, tempTableName); },
                     exceptionMessage: expectedErrorMessage);
             }
@@ -77,7 +77,7 @@ public static void MultipleExecutesInSameTransactionTest_shouldThrowsUnsupported
             try
             {
                 tempTableName = CreateTempTable(connectionString);
-                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(
+                DataTestUtility.AssertThrows<InvalidOperationException>(
                     actionThatFails: () => { MultipleExecutesInSameTransactionTest(connectionString, tempTableName); },
                     exceptionMessage: expectedErrorMessage);
             }
@@ -157,5 +157,3 @@ private static void DropTempTable(string connectionString, string tempTableName)
         }
     }
 }
-
-
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
index a4cd63b0c1..d53209e912 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
@@ -42,14 +42,14 @@ public static void CodeCoverageSqlClient()
 
             {
                 string failValue;
-                DataTestUtility.AssertThrowsWrapper<IndexOutOfRangeException>(() => failValue = opc[0].ParameterName, "Invalid index 0 for this SqlParameterCollection with Count=0.");
+                DataTestUtility.AssertThrows<IndexOutOfRangeException>(() => failValue = opc[0].ParameterName, "Invalid index 0 for this SqlParameterCollection with Count=0.");
 
-                DataTestUtility.AssertThrowsWrapper<IndexOutOfRangeException>(() => failValue = opc["@p1"].ParameterName, "A SqlParameter with ParameterName '@p1' is not contained by this SqlParameterCollection.");
+                DataTestUtility.AssertThrows<IndexOutOfRangeException>(() => failValue = opc["@p1"].ParameterName, "A SqlParameter with ParameterName '@p1' is not contained by this SqlParameterCollection.");
 
-                DataTestUtility.AssertThrowsWrapper<IndexOutOfRangeException>(() => opc["@p1"] = null, "A SqlParameter with ParameterName '@p1' is not contained by this SqlParameterCollection.");
+                DataTestUtility.AssertThrows<IndexOutOfRangeException>(() => opc["@p1"] = null, "A SqlParameter with ParameterName '@p1' is not contained by this SqlParameterCollection.");
             }
 
-            DataTestUtility.AssertThrowsWrapper<ArgumentNullException>(() => opc.Add(null), "The SqlParameterCollection only accepts non-null SqlParameter type objects.");
+            DataTestUtility.AssertThrows<ArgumentNullException>(() => opc.Add(null), "The SqlParameterCollection only accepts non-null SqlParameter type objects.");
 
             opc.Add((object)new SqlParameter());
             IEnumerator enm = opc.GetEnumerator();
@@ -70,11 +70,11 @@ public static void CodeCoverageSqlClient()
 
             SqlParameter p = opc[0];
 
-            DataTestUtility.AssertThrowsWrapper<ArgumentException>(() => opc.Add((object)p), "The SqlParameter is already contained by another SqlParameterCollection.");
+            DataTestUtility.AssertThrows<ArgumentException>(() => opc.Add((object)p), "The SqlParameter is already contained by another SqlParameterCollection.");
 
-            DataTestUtility.AssertThrowsWrapper<ArgumentException>(() => new SqlCommand().Parameters.Add(p), "The SqlParameter is already contained by another SqlParameterCollection.");
+            DataTestUtility.AssertThrows<ArgumentException>(() => new SqlCommand().Parameters.Add(p), "The SqlParameter is already contained by another SqlParameterCollection.");
 
-            DataTestUtility.AssertThrowsWrapper<ArgumentNullException>(() => opc.Remove(null), "The SqlParameterCollection only accepts non-null SqlParameter type objects.");
+            DataTestUtility.AssertThrows<ArgumentNullException>(() => opc.Remove(null), "The SqlParameterCollection only accepts non-null SqlParameter type objects.");
 
             string pname = p.ParameterName;
             p.ParameterName = pname;
@@ -106,13 +106,13 @@ public static void CodeCoverageSqlClient()
             new SqlCommand().Parameters.CopyTo(new object[0], 0);
             Assert.False(new SqlCommand().Parameters.GetEnumerator().MoveNext(), "FAILED: Expected MoveNext to be false");
 
-            DataTestUtility.AssertThrowsWrapper<InvalidCastException>(() => new SqlCommand().Parameters.Add(0), "The SqlParameterCollection only accepts non-null Microsoft.Data.SqlClient.SqlParameter type objects, not System.Int32 objects.");
+            DataTestUtility.AssertThrows<InvalidCastException>(() => new SqlCommand().Parameters.Add(0), "The SqlParameterCollection only accepts non-null Microsoft.Data.SqlClient.SqlParameter type objects, not System.Int32 objects.");
 
-            DataTestUtility.AssertThrowsWrapper<InvalidCastException>(() => new SqlCommand().Parameters.Insert(0, 0), "The SqlParameterCollection only accepts non-null Microsoft.Data.SqlClient.SqlParameter type objects, not System.Int32 objects.");
+            DataTestUtility.AssertThrows<InvalidCastException>(() => new SqlCommand().Parameters.Insert(0, 0), "The SqlParameterCollection only accepts non-null Microsoft.Data.SqlClient.SqlParameter type objects, not System.Int32 objects.");
 
-            DataTestUtility.AssertThrowsWrapper<InvalidCastException>(() => new SqlCommand().Parameters.Remove(0), "The SqlParameterCollection only accepts non-null Microsoft.Data.SqlClient.SqlParameter type objects, not System.Int32 objects.");
+            DataTestUtility.AssertThrows<InvalidCastException>(() => new SqlCommand().Parameters.Remove(0), "The SqlParameterCollection only accepts non-null Microsoft.Data.SqlClient.SqlParameter type objects, not System.Int32 objects.");
 
-            DataTestUtility.AssertThrowsWrapper<ArgumentException>(() => new SqlCommand().Parameters.Remove(new SqlParameter()), "Attempted to remove an SqlParameter that is not contained by this SqlParameterCollection.");
+            DataTestUtility.AssertThrows<ArgumentException>(() => new SqlCommand().Parameters.Remove(new SqlParameter()), "Attempted to remove an SqlParameter that is not contained by this SqlParameterCollection.");
         }
 
         // TODO Synapse: Parse error at line: 1, column: 12: Incorrect syntax near 'IF'.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderCancelAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderCancelAsync.cs
index 3ae79dbe31..3fb3d051a1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderCancelAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderCancelAsync.cs
@@ -19,7 +19,7 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
             cts = new CancellationTokenSource();
             cts.Cancel();
             Task t = TestAsync(srcConstr, dstConstr, dstTable, cts.Token);
-            DataTestUtility.AssertThrowsWrapper<AggregateException, TaskCanceledException>(() => t.Wait());
+            DataTestUtility.AssertThrowsInner<AggregateException, TaskCanceledException>(() => t.Wait());
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseAsync.cs
index fd6062659a..ede16437d3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseAsync.cs
@@ -14,7 +14,7 @@ public class CopyAllFromReaderConnectionClosedAsync
         public static void Test(string srcConstr, string dstConstr, string dstTable)
         {
             Task t = TestAsync(srcConstr, dstConstr, dstTable);
-            DataTestUtility.AssertThrowsWrapper<AggregateException, InvalidOperationException>(() => t.Wait());
+            DataTestUtility.AssertThrowsInner<AggregateException, InvalidOperationException>(() => t.Wait());
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseOnEventAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseOnEventAsync.cs
index 1afd2d93d0..3d832925a6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseOnEventAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseOnEventAsync.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Data.Common;
+using System.IO;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
@@ -49,7 +50,7 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
 
                                     // Check that the copying fails
                                     string message = string.Format(SystemDataResourceManager.Instance.ADP_OpenConnectionRequired, "WriteToServer", SystemDataResourceManager.Instance.ADP_ConnectionStateMsg_Closed);
-                                    DataTestUtility.AssertThrowsWrapper<AggregateException, InvalidOperationException>(() => bulkcopy.WriteToServerAsync(reader).Wait(5000), innerExceptionMessage: message);
+                                    DataTestUtility.AssertThrowsInnerWithAlternate<AggregateException, InvalidOperationException, IOException>(() => bulkcopy.WriteToServerAsync(reader).Wait(5000), innerExceptionMessage: message);
                                 }
                             }
                         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEvent1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEvent1.cs
index e89f2f83a3..8bc72435d0 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEvent1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEvent1.cs
@@ -66,7 +66,7 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
                             ColumnMappings.Add("ShipName", "shipname");
 
                             bulkcopy.NotifyAfter = 3;
-                            DataTestUtility.AssertThrowsWrapper<OperationAbortedException>(() => bulkcopy.WriteToServer(reader));
+                            DataTestUtility.AssertThrows<OperationAbortedException>(() => bulkcopy.WriteToServer(reader));
                             bulkcopy.SqlRowsCopied -= new SqlRowsCopiedEventHandler(OnRowCopied);
                             bulkcopy.Close();
                         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumn.cs
index d8fe8f66da..e4df366137 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumn.cs
@@ -38,7 +38,7 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
                             string errorMsg = SystemDataResourceManager.Instance.SQL_BulkLoadNonMatchingColumnName;
                             errorMsg = string.Format(errorMsg, "col2");
 
-                            DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: errorMsg);
+                            DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: errorMsg);
                         }
                     }
                 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumns.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumns.cs
index 2696770f69..5fb47f44c1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumns.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumns.cs
@@ -38,7 +38,7 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
                             string errorMsg = SystemDataResourceManager.Instance.SQL_BulkLoadNonMatchingColumnName;
                             errorMsg = string.Format(errorMsg, "col3,col4");
 
-                            DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: errorMsg);
+                            DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: errorMsg);
                         }
                     }
                 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintDuplicateColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintDuplicateColumn.cs
index 9e535ccae1..ebed5e9918 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintDuplicateColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintDuplicateColumn.cs
@@ -45,7 +45,7 @@ public static void Test(string connStr, string dstTable)
 
                                 string expectedErrorMsg = string.Format(
                                     SystemDataResourceManager.Instance.SQL_BulkLoadOrderHintDuplicateColumn, destColumn);
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(
+                                DataTestUtility.AssertThrows<InvalidOperationException>(
                                     () => bulkcopy.ColumnOrderHints.Add(destColumn, SortOrder.Ascending),
                                     exceptionMessage: expectedErrorMsg);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintMissingTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintMissingTargetColumn.cs
index 46a7f39eee..cc486e9e4e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintMissingTargetColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintMissingTargetColumn.cs
@@ -44,7 +44,7 @@ public static void Test(string connStr, string dstTable)
 
                                 string expectedErrorMsg = string.Format(
                                     SystemDataResourceManager.Instance.SQL_BulkLoadOrderHintInvalidColumn, nonexistentColumn);
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(
+                                DataTestUtility.AssertThrows<InvalidOperationException>(
                                     () => bulkcopy.WriteToServer(reader),
                                     exceptionMessage: expectedErrorMsg);
 
@@ -56,7 +56,7 @@ public static void Test(string connStr, string dstTable)
 
                                 expectedErrorMsg = string.Format(
                                     SystemDataResourceManager.Instance.SQL_BulkLoadOrderHintInvalidColumn, sourceColumn);
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(
+                                DataTestUtility.AssertThrows<InvalidOperationException>(
                                     () => bulkcopy.WriteToServer(reader),
                                     exceptionMessage: expectedErrorMsg);
                             }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction.cs
index e7632044b0..0738f32010 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction.cs
@@ -34,7 +34,7 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
                             SqlTransaction myTrans = dstConn.BeginTransaction();
                             try
                             {
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => bulkcopy.WriteToServer(reader));
+                                DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader));
                             }
                             finally
                             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction1.cs
index 1f6ba5e823..930e1ac6f5 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction1.cs
@@ -37,7 +37,7 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
 
                             try
                             {
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => bulkcopy.WriteToServer(reader));
+                                DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader));
                             }
                             finally
                             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction3.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction3.cs
index 8e53989ed5..4b65f2a5d2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction3.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction3.cs
@@ -37,13 +37,13 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
                                 bulkcopy.DestinationTableName = dstTable;
 
                                 string exceptionMsg = SystemDataResourceManager.Instance.ADP_TransactionConnectionMismatch;
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: exceptionMsg);
+                                DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: exceptionMsg);
 
                                 SqlCommand myCmd = dstConn.CreateCommand();
                                 myCmd.CommandText = "select * from " + dstTable;
                                 myCmd.Transaction = myTrans;
 
-                                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => myCmd.ExecuteReader(), exceptionMessage: exceptionMsg);
+                                DataTestUtility.AssertThrows<InvalidOperationException>(() => myCmd.ExecuteReader(), exceptionMessage: exceptionMsg);
                             }
                         }
                     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction4.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction4.cs
index c8028ca5c5..40b2d2c251 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction4.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction4.cs
@@ -31,7 +31,7 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
                             // Start a local transaction on the wrong connection.
                             SqlTransaction myTrans = conn3.BeginTransaction();
                             string errorMsg = SystemDataResourceManager.Instance.SQL_BulkLoadConflictingTransactionOption;
-                            DataTestUtility.AssertThrowsWrapper<ArgumentException>(() => new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, myTrans), exceptionMessage: errorMsg);
+                            DataTestUtility.AssertThrows<ArgumentException>(() => new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, myTrans), exceptionMessage: errorMsg);
                         }
                     }
                 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TransactionTestAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TransactionTestAsync.cs
index ac28a9d883..729dac74a9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TransactionTestAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TransactionTestAsync.cs
@@ -14,7 +14,7 @@ public class TransactionTestAsync
         public static void Test(string srcConstr, string dstConstr, string dstTable)
         {
             Task t = TestAsync(srcConstr, dstConstr, dstTable);
-            DataTestUtility.AssertThrowsWrapper<AggregateException, InvalidOperationException>(() => t.Wait());
+            DataTestUtility.AssertThrowsInner<AggregateException, InvalidOperationException>(() => t.Wait());
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
index 97c225c9ca..552fd4cea5 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
@@ -65,7 +65,7 @@ private static void PlainCancel(string connString)
                 using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     cmd.Cancel();
-                    DataTestUtility.AssertThrowsWrapper<SqlException>(
+                    DataTestUtility.AssertThrows<SqlException>(
                         () =>
                         {
                             do
@@ -88,7 +88,7 @@ private static void PlainCancelAsync(string connString)
             {
                 conn.Open();
                 Task<SqlDataReader> readerTask = cmd.ExecuteReaderAsync();
-                DataTestUtility.AssertThrowsWrapper<SqlException>(
+                DataTestUtility.AssertThrows<SqlException>(
                     () =>
                     {
                         readerTask.Wait(2000);
@@ -214,7 +214,7 @@ private static void CancelFollowedByTransaction(string constr)
         private static void CancelFollowedByAlert(string constr)
         {
             var alertName = "myAlert" + Guid.NewGuid().ToString();
-            // Since Alert conditions are randomly generated, 
+            // Since Alert conditions are randomly generated,
             // we will retry on unexpected error messages to avoid collision in pipelines.
             var n = new Random().Next(1, 100);
             bool retry = true;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
index 98fa8997de..e4bd1133ac 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
@@ -71,7 +71,7 @@ public void Test_DoubleStart_DifferentConnStr()
 
             try
             {
-                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => SqlDependency.Start(cb.ToString()));
+                DataTestUtility.AssertThrows<InvalidOperationException>(() => SqlDependency.Start(cb.ToString()));
             }
             finally
             {
@@ -116,7 +116,7 @@ public void Test_SingleDependency_NoStart()
                     Console.WriteLine("4 Notification callback. Type={0}, Info={1}, Source={2}", args.Type, args.Info, args.Source);
                 };
 
-                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => cmd.ExecuteReader());
+                DataTestUtility.AssertThrows<InvalidOperationException>(() => cmd.ExecuteReader());
             }
         }
 
@@ -138,7 +138,7 @@ public void Test_SingleDependency_Stopped()
                     Console.WriteLine("5 Notification callback. Type={0}, Info={1}, Source={2}", args.Type, args.Info, args.Source);
                 };
 
-                DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() => cmd.ExecuteReader());
+                DataTestUtility.AssertThrows<InvalidOperationException>(() => cmd.ExecuteReader());
             }
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs
index 1a97d6df31..0adff2c8ae 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs
@@ -339,13 +339,13 @@ private void ExceptionTest()
                     string executeCommandWithoutTransactionMessage = SystemDataResourceManager.Instance.ADP_TransactionRequired("ExecuteNonQuery");
                     string transactionConflictErrorMessage = SystemDataResourceManager.Instance.ADP_TransactionConnectionMismatch;
                     string parallelTransactionErrorMessage = SystemDataResourceManager.Instance.ADP_ParallelTransactionsNotSupported("SqlConnection");
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() =>
+                    DataTestUtility.AssertThrows<InvalidOperationException>(() =>
                     {
                         SqlCommand command = new SqlCommand("sql", connection);
                         command.ExecuteNonQuery();
                     }, executeCommandWithoutTransactionMessage);
 
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() =>
+                    DataTestUtility.AssertThrows<InvalidOperationException>(() =>
                     {
                         using (SqlConnection con1 = new SqlConnection(_connectionString))
                         {
@@ -357,32 +357,32 @@ private void ExceptionTest()
                         }
                     }, transactionConflictErrorMessage);
 
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() =>
+                    DataTestUtility.AssertThrows<InvalidOperationException>(() =>
                     {
                         connection.BeginTransaction(null);
                     }, parallelTransactionErrorMessage);
 
-                    DataTestUtility.AssertThrowsWrapper<InvalidOperationException>(() =>
+                    DataTestUtility.AssertThrows<InvalidOperationException>(() =>
                     {
                         connection.BeginTransaction("");
                     }, parallelTransactionErrorMessage);
 
-                    DataTestUtility.AssertThrowsWrapper<ArgumentException>(() =>
+                    DataTestUtility.AssertThrows<ArgumentException>(() =>
                     {
                         tx.Rollback(null);
                     }, invalidSaveStateMessage);
 
-                    DataTestUtility.AssertThrowsWrapper<ArgumentException>(() =>
+                    DataTestUtility.AssertThrows<ArgumentException>(() =>
                     {
                         tx.Rollback("");
                     }, invalidSaveStateMessage);
 
-                    DataTestUtility.AssertThrowsWrapper<ArgumentException>(() =>
+                    DataTestUtility.AssertThrows<ArgumentException>(() =>
                     {
                         tx.Save(null);
                     }, invalidSaveStateMessage);
 
-                    DataTestUtility.AssertThrowsWrapper<ArgumentException>(() =>
+                    DataTestUtility.AssertThrows<ArgumentException>(() =>
                     {
                         tx.Save("");
                     }, invalidSaveStateMessage);
@@ -456,7 +456,7 @@ private void ReadCommitedIsolationLevel_ShouldReceiveTimeoutExceptionBecauseItWa
                         SqlTransaction tx2 = connection2.BeginTransaction(IsolationLevel.ReadCommitted);
                         command2.Transaction = tx2;
 
-                        DataTestUtility.AssertThrowsWrapper<SqlException>(() => command2.ExecuteReader(), SystemDataResourceManager.Instance.SQL_Timeout_Execution as string);
+                        DataTestUtility.AssertThrows<SqlException>(() => command2.ExecuteReader(), SystemDataResourceManager.Instance.SQL_Timeout_Execution as string);
 
                         tx2.Rollback();
                         connection2.Close();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
index 79f38262cc..1dae314730 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
@@ -75,7 +75,7 @@ public void UDTParams_Binary()
                 value[7] = 0;
                 p.Value = new SqlBinary(value);
 
-                DataTestUtility.AssertThrowsWrapper<SqlException>(
+                DataTestUtility.AssertThrows<SqlException>(
                     () => cmd.ExecuteReader(),
                     "Error converting data type varbinary to Point.");
             }
@@ -110,7 +110,7 @@ public void UDTParams_Invalid2()
                     p.Value = addr;
                     pName.Value = addr;
 
-                    DataTestUtility.AssertThrowsWrapper<InvalidCastException>(
+                    DataTestUtility.AssertThrows<InvalidCastException>(
                         () => cmd.ExecuteReader(),
                         "Failed to convert parameter value from a Address to a String.");
                 }
@@ -134,7 +134,7 @@ public void UDTParams_Invalid()
                 p.UdtTypeName = "UdtTestDb.dbo.Point";
                 p.Value = 32;
 
-                DataTestUtility.AssertThrowsWrapper<ArgumentException>(
+                DataTestUtility.AssertThrows<ArgumentException>(
                     () => cmd.ExecuteReader(),
                     "Specified type is not registered on the target server. System.Int32");
             }
@@ -221,7 +221,7 @@ public void UDTParams_NullInput()
 
                     string errorMsg = "Procedure or function '" + spInsertCustomerNoBrackets + "' expects parameter '@addr', which was not supplied.";
 
-                    DataTestUtility.AssertThrowsWrapper<SqlException>(
+                    DataTestUtility.AssertThrows<SqlException>(
                         () => cmd.ExecuteNonQuery(),
                         errorMsg);
                 }
@@ -317,7 +317,7 @@ public void UDTFields_WrongType()
                     reader.Read();
 
                     // retrieve the UDT as a string
-                    DataTestUtility.AssertThrowsWrapper<InvalidCastException>(
+                    DataTestUtility.AssertThrows<InvalidCastException>(
                         () => reader.GetString(1),
                         "Unable to cast object of type 'System.Byte[]' to type 'System.String'.");
                 }
@@ -584,12 +584,12 @@ Func<int, SqlUserDefinedAggregateAttribute> create
             string udtError = SystemDataResourceManager.Instance.SQLUDT_MaxByteSizeValue;
             string errorMessage = (new ArgumentOutOfRangeException("MaxByteSize", 8001, udtError)).Message;
 
-            DataTestUtility.AssertThrowsWrapper<ArgumentOutOfRangeException>(
+            DataTestUtility.AssertThrows<ArgumentOutOfRangeException>(
                 () => create(SqlUserDefinedAggregateAttribute.MaxByteSizeValue + 1),
                 errorMessage);
 
             errorMessage = (new ArgumentOutOfRangeException("MaxByteSize", -2, udtError)).Message;
-            DataTestUtility.AssertThrowsWrapper<ArgumentOutOfRangeException>(
+            DataTestUtility.AssertThrows<ArgumentOutOfRangeException>(
                 () => create(-2),
                 errorMessage);
         }
@@ -702,4 +702,3 @@ public void UDTParams_DeriveParameters_CheckAutoFixOverride()
         }
     }
 }
-

From 4e1d0d49af40d00a151150a751db0fc626b6d5c0 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Wed, 1 Apr 2026 11:20:48 -0700
Subject: [PATCH 020/298] =?UTF-8?q?Revert=20"Trim=20docs=20using=20pwsh=20?=
 =?UTF-8?q?via=20dotnet=20tool=20to=20support=20cross-platform=20local=20?=
 =?UTF-8?q?=E2=80=A6"=20(#4127)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 75b33ad53c18d53fe8bcfbb8287f5b3ce78ee11b.
---
 dotnet-tools.json                                        | 7 -------
 .../ref/Microsoft.Data.SqlClient.csproj                  | 9 +++------
 tools/targets/TrimDocsForIntelliSense.targets            | 4 ++--
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/dotnet-tools.json b/dotnet-tools.json
index 11e3494512..1f59e06063 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -15,13 +15,6 @@
         "apicompat"
       ],
       "rollForward": false
-    },
-    "powershell": {
-      "version": "7.6.0",
-      "commands": [
-        "pwsh"
-      ],
-      "rollForward": false
     }
   }
 }
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
index 252e8ba0b0..dfad9e601c 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -36,10 +36,6 @@
     <OutputPath>$(ArtifactPath)$(AssemblyName).ref/$(ReferenceType)-$(Configuration)/</OutputPath>
   </PropertyGroup>
 
-  <Target Name="RestoreTools">
-    <Exec Command="dotnet tool restore" />
-  </Target>
-
   <!-- Trim Docs for IntelliSense ====================================== -->
   <!--
     It has been determined that including the remarks section in IntelliSense docs looks bad in
@@ -50,11 +46,12 @@
   <!-- This target runs after Build, and trims XML documentation generated in the $(OutputPath) of the project where this target is included.-->
   <Target Name="TrimDocsForIntelliSense"
           AfterTargets="Build"
-          DependsOnTargets="RestoreTools"
           Condition="'$(IsCrossTargetingBuild)' != 'true' AND '$(GenerateDocumentationFile)' == 'true'">
     <PropertyGroup>
+      <PowerShellCommand Condition="'$(OS)' == 'Windows_NT'">powershell.exe</PowerShellCommand>
+      <PowerShellCommand Condition="'$(OS)' != 'Windows_NT'">pwsh</PowerShellCommand>
       <PowerShellCommand>
-        dotnet tool run pwsh
+        $(PowerShellCommand)
           -NonInteractive
           -ExecutionPolicy Unrestricted
           -Command "$(RepoRoot)tools\intellisense\TrimDocs.ps1 -inputFile '$(DocumentationFile)' -outputFile '$(DocumentationFile)'"
diff --git a/tools/targets/TrimDocsForIntelliSense.targets b/tools/targets/TrimDocsForIntelliSense.targets
index fd0ca40ea8..05feb26739 100644
--- a/tools/targets/TrimDocsForIntelliSense.targets
+++ b/tools/targets/TrimDocsForIntelliSense.targets
@@ -3,7 +3,7 @@ The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
   <!-- This target runs after Build, and trims XML documentation generated in the $(OutputPath) of the project where this target is included.-->
   <Target Name="TrimDocsForIntelliSense" AfterTargets="Build" Condition="'$(GenerateDocumentationFile)' == 'true'">
-    <Exec Command="dotnet tool restore" />
-    <Exec Command="dotnet tool run pwsh -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;$(ToolsDir)intellisense\TrimDocs.ps1 -inputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos; -outputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos;&quot;" />
+    <Exec Command="powershell.exe -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;$(ToolsDir)intellisense\TrimDocs.ps1 -inputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos; -outputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos;&quot;" Condition=" '$(OS)' == 'Windows_NT' " />
+    <Exec Command="pwsh -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;$(ToolsDir)intellisense\TrimDocs.ps1 -inputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos; -outputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos;&quot;" Condition=" '$(OS)' != 'Windows_NT' " />
   </Target>
 </Project>

From 90463215f3d9c69993d547d02287ba0b55aa9802 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Thu, 2 Apr 2026 15:39:24 -0700
Subject: [PATCH 021/298] Test | Connection pool transaction tests (#3805)

---
 .../prompts/generate-doc-comments.prompt.md   |   2 +-
 .github/prompts/generate-prompt.prompt.md     |  63 +-
 .github/prompts/refine-test-overlap.prompt.md |  12 +-
 .../ConnectionPool/ChannelDbConnectionPool.cs |   4 +
 .../ConnectionPool/DbConnectionPoolOptions.cs |   3 +
 .../ConnectionPool/IDbConnectionPool.cs       |   7 +-
 .../TransactedConnectionPool.cs               |  31 +-
 .../WaitHandleDbConnectionPool.cs             |   8 +-
 .../SqlClientTestGroup.cs                     |   1 +
 .../TransactedConnectionPoolTest.cs           |   5 +-
 ...itHandleDbConnectionPoolTransactionTest.cs | 951 ++++++++++++++++++
 11 files changed, 1059 insertions(+), 28 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs

diff --git a/.github/prompts/generate-doc-comments.prompt.md b/.github/prompts/generate-doc-comments.prompt.md
index 33ced936de..9361d3c7ad 100644
--- a/.github/prompts/generate-doc-comments.prompt.md
+++ b/.github/prompts/generate-doc-comments.prompt.md
@@ -1,5 +1,5 @@
 ---
-name: doc-comments
+name: generate-doc-comments
 description: Generate XML documentation comments for C# code following .NET best practices.
 argument-hint: <code>
 agent: agent
diff --git a/.github/prompts/generate-prompt.prompt.md b/.github/prompts/generate-prompt.prompt.md
index a4aa8cd40f..73d083947b 100644
--- a/.github/prompts/generate-prompt.prompt.md
+++ b/.github/prompts/generate-prompt.prompt.md
@@ -34,6 +34,7 @@ Before generating the prompt, review the available skills in the `.github/skills
         *   `name`: A concise, kebab-case name for the prompt.
         *   `description`: A clear, short description of what the prompt does.
         *   `argument-hint`: (Optional) A hint for what arguments the user can provide when using the prompt.
+        *   `tools`: (Recommended) A list of tool identifiers the prompt is allowed to use. See the **Tool Scoping** section below.
     *   **Body Structure**:
         *   **Role**: Define the AI's persona (e.g., "You are an expert C# developer...").
         *   **Context**: Include specific context instructions or references.
@@ -50,12 +51,70 @@ Before generating the prompt, review the available skills in the `.github/skills
     *   Use `${input:variableName}` for user inputs (e.g., `${input:methodName}`).
     *   Use built-in variables like `${selection}`, `${file}`, or `${workspaceFolder}` where appropriate context is needed.
 
-6.  **Best Practices**:
+6.  **Scope Tools**: Restrict the tools available to each prompt using the `tools` frontmatter field. See the **Tool Scoping** section below for detailed guidance.
+
+7.  **Best Practices**:
     *   Be specific and explicit.
     *   Encourage chain-of-thought reasoning if the task is complex.
     *   Reference workspace files using Markdown links `[path/to/file.cs](path/to/file.cs)` only if they are static and necessary for *all* invocations of this prompt.
     *   Prefer referencing skills over duplicating instructions that already exist in skills.
 
+## Tool Scoping
+
+Every generated prompt **should** include a `tools` list in its YAML frontmatter. Scoping tools keeps the model focused by limiting it to approved, known-effective tools for the task. Without tool scoping, the model may invoke irrelevant tools, waste context, or produce unpredictable results.
+
+### Why scope tools?
+- **Focus**: Fewer tools means the model spends less reasoning on tool selection and more on the task.
+- **Reliability**: Restricting to tested tools avoids unexpected side effects (e.g., a read-only review prompt shouldn't have edit tools).
+- **Safety**: Prevents prompts from accidentally running terminal commands or making file changes when they shouldn't.
+
+### How to choose tools
+Apply the **principle of least privilege** — include only the tools the prompt actually needs:
+
+| Prompt type | Recommended tools |
+|---|---|
+| **Read-only analysis** (review, triage, explain) | `read/readFile`, `search/codebase`, `search/textSearch` |
+| **Code editing** (bug fix, feature, refactor) | `edit/editFiles`, `edit/createFile`, `read/readFile`, `search/codebase` |
+| **Needs terminal** (build, test, scripts) | All of the above + `execute/runInTerminal`, `execute/getTerminalOutput` |
+| **Needs GitHub data** (triage, release notes) | All of the above + `github/search_issues` or other GitHub tools |
+| **Needs web content** (docs lookup) | `web/fetch` |
+
+### Available built-in tool identifiers
+
+You can specify individual tools or tool sets (which include all tools in that group).
+
+**Tool sets** (use these to include all tools in a category):
+- `edit` — File creation and editing tools
+- `read` — File and notebook reading tools
+- `search` — Codebase, text, and file search tools
+- `execute` — Terminal, task, and notebook execution tools
+- `web` — Web content fetching tools
+
+**Commonly used individual tools:**
+
+| Tool identifier | Purpose |
+|---|---|
+| `edit/editFiles` | Apply edits to existing files |
+| `edit/createFile` | Create a new file |
+| `read/readFile` | Read file contents |
+| `read/problems` | Get workspace problems/diagnostics |
+| `search/codebase` | Semantic code search |
+| `search/textSearch` | Text/regex search in files |
+| `search/fileSearch` | Search for files by glob pattern |
+| `search/listDirectory` | List directory contents |
+| `search/usages` | Find references and implementations |
+| `execute/runInTerminal` | Run a shell command |
+| `execute/getTerminalOutput` | Get terminal output |
+| `execute/testFailure` | Get test failure details |
+| `web/fetch` | Fetch a web page |
+
+**Extension / MCP tools** can also be included using their identifier (e.g., `github/search_issues`). Use `<server-name>/*` to include all tools from an MCP server.
+
+### Frontmatter syntax
+```yaml
+tools: ['read/readFile', 'search/codebase', 'edit/editFiles']
+```
+
 ## Example Output Structure (with skill reference)
 
 ```markdown
@@ -63,6 +122,7 @@ Before generating the prompt, review the available skills in the `.github/skills
 name: my-new-prompt
 description: specialized task description
 argument-hint: input parameter hint
+tools: ['edit/editFiles', 'read/readFile', 'search/codebase', 'execute/runInTerminal']
 ---
 You are a specialized agent for...
 
@@ -89,6 +149,7 @@ Use ${input:param1} to...
 name: my-new-prompt
 description: specialized task description
 argument-hint: input parameter hint
+tools: ['read/readFile', 'search/codebase']
 ---
 You are a specialized agent for...
 
diff --git a/.github/prompts/refine-test-overlap.prompt.md b/.github/prompts/refine-test-overlap.prompt.md
index 824e18f145..f4d0339c27 100644
--- a/.github/prompts/refine-test-overlap.prompt.md
+++ b/.github/prompts/refine-test-overlap.prompt.md
@@ -1,7 +1,9 @@
 ---
-name: test-minimize-overlap
+name: refine-test-overlap
 description: Run coverage overlap analysis and suggest test suite optimizations
 argument-hint: Test filter (e.g. FullyQualifiedName~MyTests) or describe the tests you want to analyze
+agent: agent
+tools: ['edit/editFiles', 'read/readFile', 'search/codebase', 'execute/runInTerminal', 'execute/getTerminalOutput']
 ---
 You are an expert .NET Test Engineer specialized in optimizing test coverage and reducing technical debt.
 
@@ -10,19 +12,19 @@ Your task is to analyze the user's test suite using the `AnalyzeTestOverlap.ps1`
 
 ## Skills
 This prompt leverages the following skills for specific sub-tasks:
-- [generate-mstest-filter](../skills/generate-mstest-filter/SKILL.md) - For generating well-formed MSTest filter expressions
+- [generate-mstest-filter](.github/skills/generate-mstest-filter/SKILL.md) - For generating well-formed MSTest filter expressions
 
 ## Tools
-You have access to the analysis script at `[AnalyzeTestOverlap.ps1](./scripts/AnalyzeTestOverlap.ps1)`.
+You have access to the analysis script at [AnalyzeTestOverlap.ps1](.github/prompts/scripts/AnalyzeTestOverlap.ps1).
 
 ## Workflow
 1.  **Parse or Generate Test Filter**:
     *   If `${input:filter}` is a valid MSTest filter expression (e.g., `FullyQualifiedName~MyTests`), use it directly.
-    *   If `${input:filter}` is a loose description (e.g., "connection tests" or "SqlCommand class"), follow the instructions in the [generate-mstest-filter](../skills/generate-mstest-filter/SKILL.md) skill to generate a proper filter expression.
+    *   If `${input:filter}` is a loose description (e.g., "connection tests" or "SqlCommand class"), follow the instructions in the [generate-mstest-filter](.github/skills/generate-mstest-filter/SKILL.md) skill to generate a proper filter expression.
     *   If `${input:filter}` is empty, ask the user for a test filter or description to target specific tests.
 
 2.  **Run Analysis**:
-    *   Run the script using the filter: `.\scripts\AnalyzeTestOverlap.ps1 -Filter "<filter>"`.
+    *   Run the script from the workspace root: `.\.github\prompts\scripts\AnalyzeTestOverlap.ps1 -Filter "<filter>"`.
     *   *Note*: The script produces a console summary and a `test-coverage-analysis.json` file.
 
 3.  **Review Overlap**:
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 63815e8200..553e6cd395 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -96,6 +96,7 @@ internal ChannelDbConnectionPool(
             Identity = identity;
             AuthenticationContexts = new();
             MaxPoolSize = Convert.ToUInt32(PoolGroupOptions.MaxPoolSize);
+            TransactedConnectionPool = new(this);
 
             _connectionSlots = new(MaxPoolSize);
 
@@ -148,6 +149,9 @@ public ConcurrentDictionary<
         /// <inheritdoc />
         public DbConnectionPoolState State { get; private set; }
 
+        /// <inheritdoc />
+        public TransactedConnectionPool TransactedConnectionPool { get; }
+
         /// <inheritdoc />
         public bool UseLoadBalancing => PoolGroupOptions.UseLoadBalancing;
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolOptions.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolOptions.cs
index 7adf8abdc2..5ac6f4d565 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolOptions.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolOptions.cs
@@ -39,6 +39,9 @@ bool hasTransactionAffinity
             _hasTransactionAffinity = hasTransactionAffinity;
         }
 
+        /// <summary>
+        /// The time (in milliseconds) to wait for a connection to be created/returned before terminating the attempt.
+        /// </summary>
         public int CreationTimeout
         {
             get { return _creationTimeout; }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
index b684bb24bb..bfc5789d3f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
@@ -85,6 +85,11 @@ internal interface IDbConnectionPool
         /// </summary>
         DbConnectionPoolState State { get; }
 
+        /// <summary>
+        /// Holds connections that are currently enlisted in a transaction.
+        /// </summary>
+        TransactedConnectionPool TransactedConnectionPool { get; }
+
         /// <summary>
         /// Indicates whether the connection pool is using load balancing.
         /// </summary>
@@ -106,7 +111,7 @@ internal interface IDbConnectionPool
         /// <param name="userOptions">The user options to use if a new connection must be opened.</param>
         /// <param name="connection">The retrieved connection will be passed out via this parameter.</param>
         /// <returns>True if a connection was set in the out parameter, otherwise returns false.</returns>
-        bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal> taskCompletionSource, DbConnectionOptions userOptions, out DbConnectionInternal? connection);
+        bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, DbConnectionOptions userOptions, out DbConnectionInternal? connection);
 
         /// <summary>
         /// Replaces the internal connection currently associated with owningObject with a new internal connection from the pool.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/TransactedConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/TransactedConnectionPool.cs
index 7245164f2c..3ce203c071 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/TransactedConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/TransactedConnectionPool.cs
@@ -31,7 +31,7 @@ internal class TransactedConnectionPool
     /// A specialized list that holds database connections associated with a specific transaction.
     /// Maintains a reference to the transaction for proper cleanup when the transaction completes.
     /// </summary>
-    private sealed class TransactedConnectionList : List<DbConnectionInternal>
+    internal sealed class TransactedConnectionList : List<DbConnectionInternal>
     {
         private readonly Transaction _transaction;
         
@@ -60,9 +60,6 @@ internal void Dispose()
     }
 
     #region Fields
-
-    private readonly Dictionary<Transaction, TransactedConnectionList> _transactedCxns;
-
     private static int _objectTypeCount;
     internal readonly int _objectID = System.Threading.Interlocked.Increment(ref _objectTypeCount);
 
@@ -80,7 +77,7 @@ internal void Dispose()
     internal TransactedConnectionPool(IDbConnectionPool pool)
     {
         Pool = pool;
-        _transactedCxns = new Dictionary<Transaction, TransactedConnectionList>();
+        TransactedConnections = new Dictionary<Transaction, TransactedConnectionList>();
         SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.TransactedConnectionPool.TransactedConnectionPool|RES|CPOOL> {0}, Constructed for connection pool {1}", Id, Pool.Id);
     }
 
@@ -98,6 +95,8 @@ internal TransactedConnectionPool(IDbConnectionPool pool)
     /// <value>The IDbConnectionPool instance that owns this transacted pool.</value>
     internal IDbConnectionPool Pool { get; }
 
+    internal Dictionary<Transaction, TransactedConnectionList> TransactedConnections { get; }
+
     #endregion
 
     #region Methods
@@ -123,9 +122,9 @@ internal TransactedConnectionPool(IDbConnectionPool pool)
         TransactedConnectionList? connections;
         bool txnFound = false;
 
-        lock (_transactedCxns)
+        lock (TransactedConnections)
         {
-            txnFound = _transactedCxns.TryGetValue(transaction, out connections);
+            txnFound = TransactedConnections.TryGetValue(transaction, out connections);
         }
 
         // NOTE: GetTransactedObject is only used when AutoEnlist = True and the ambient transaction 
@@ -182,10 +181,10 @@ internal void PutTransactedObject(Transaction transaction, DbConnectionInternal
         // NOTE: because TransactionEnded is an asynchronous notification, there's no guarantee
         //   around the order in which PutTransactionObject and TransactionEnded are called. 
 
-        lock (_transactedCxns)
+        lock (TransactedConnections)
         {
             // Check if a transacted pool has been created for this transaction
-            if ((txnFound = _transactedCxns.TryGetValue(transaction, out connections)) 
+            if ((txnFound = TransactedConnections.TryGetValue(transaction, out connections)) 
                 && connections is not null)
             {
                 // synchronize multi-threaded access with GetTransactedObject
@@ -213,14 +212,14 @@ internal void PutTransactedObject(Transaction transaction, DbConnectionInternal
                 transactionClone = transaction.Clone();
                 newConnections = new TransactedConnectionList(2, transactionClone); // start with only two connections in the list; most times we won't need that many.
 
-                lock (_transactedCxns)
+                lock (TransactedConnections)
                 {
                     // NOTE: in the interim between the locks on the transacted pool (this) during 
                     //   execution of this method, another thread (threadB) may have attempted to 
                     //   add a different connection to the transacted pool under the same 
                     //   transaction. As a result, threadB may have completed creating the
                     //   transacted pool while threadA was processing the above instructions.
-                    if (_transactedCxns.TryGetValue(transaction, out connections)
+                    if (TransactedConnections.TryGetValue(transaction, out connections)
                         && connections is not null)
                     {
                         // synchronize multi-threaded access with GetTransactedObject
@@ -238,7 +237,7 @@ internal void PutTransactedObject(Transaction transaction, DbConnectionInternal
                         // add the connection/transacted object to the list
                         newConnections.Add(transactedObject);
 
-                        _transactedCxns.Add(transactionClone, newConnections);
+                        TransactedConnections.Add(transactionClone, newConnections);
                         transactionClone = null; // we've used it -- don't throw it or the TransactedConnectionList that references it away.                                
                     }
                 }
@@ -297,9 +296,9 @@ internal void TransactionEnded(Transaction transaction, DbConnectionInternal tra
         // TODO:   that the pending creation of a transacted pool for this transaction is aborted when
         // TODO:   PutTransactedObject finally gets some CPU time?
 
-        lock (_transactedCxns)
+        lock (TransactedConnections)
         {
-            if (_transactedCxns.TryGetValue(transaction, out connections)
+            if (TransactedConnections.TryGetValue(transaction, out connections)
                 && connections is not null)
             {
                 bool shouldDisposeConnections = false;
@@ -319,7 +318,7 @@ internal void TransactionEnded(Transaction transaction, DbConnectionInternal tra
                     if (0 >= connections.Count)
                     {
                         SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.TransactedConnectionPool.TransactionEnded|RES|CPOOL> {0}, Transaction {1}, Removing List from transacted pool.", Id, transaction.GetHashCode());
-                        _transactedCxns.Remove(transaction);
+                        TransactedConnections.Remove(transaction);
 
                         // we really need to dispose our connection list; it may have 
                         // native resources via the tx and GC may not happen soon enough.
@@ -351,4 +350,4 @@ internal void TransactionEnded(Transaction transaction, DbConnectionInternal tra
     }
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index 194054e58e..8d2311b5cd 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -305,9 +305,9 @@ public bool IsRunning
             get { return State is Running; }
         }
 
-        private int MaxPoolSize => PoolGroupOptions.MaxPoolSize;
+        internal int MaxPoolSize => PoolGroupOptions.MaxPoolSize;
 
-        private int MinPoolSize => PoolGroupOptions.MinPoolSize;
+        internal int MinPoolSize => PoolGroupOptions.MinPoolSize;
 
         public DbConnectionPoolGroup PoolGroup => _connectionPoolGroup;
 
@@ -324,6 +324,8 @@ public bool IsRunning
 
         private bool UsingIntegrateSecurity => _identity != null && DbConnectionPoolIdentity.NoIdentity != _identity;
 
+        public TransactedConnectionPool TransactedConnectionPool => _transactedConnectionPool;
+
         private void CleanupCallback(object state)
         {
             // Called when the cleanup-timer ticks over.
@@ -940,6 +942,8 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
 
             // If automatic transaction enlistment is required, then we try to
             // get the connection from the transacted connection pool first.
+            // If automatic enlistment is not enabled, then we cannot vend connections
+            // from the transacted pool.
             if (HasTransactionAffinity)
             {
                 obj = GetFromTransactedPool(out transaction);
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientTestGroup.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientTestGroup.cs
index e48c13d49b..7c7597ba8a 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientTestGroup.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientTestGroup.cs
@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using System.Diagnostics;
 using System.Data;
+using System.Transactions;
 using Microsoft.Data.SqlClient;
 using System.Xml;
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
index 3fc31338cd..18bd9c5ea3 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
@@ -668,13 +668,14 @@ internal class MockDbConnectionPool : IDbConnectionPool
         public DbConnectionPoolGroupOptions PoolGroupOptions => throw new NotImplementedException();
         public DbConnectionPoolProviderInfo ProviderInfo => throw new NotImplementedException();
         public DbConnectionPoolState State => throw new NotImplementedException();
+        public TransactedConnectionPool TransactedConnectionPool => throw new NotImplementedException();
         public bool UseLoadBalancing => throw new NotImplementedException();
 
         public ConcurrentBag<DbConnectionInternal> ReturnedConnections { get; } = new();
 
         public void Clear() => throw new NotImplementedException();
 
-        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal> taskCompletionSource, DbConnectionOptions userOptions, out DbConnectionInternal? connection)
+        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, DbConnectionOptions userOptions, out DbConnectionInternal? connection)
         {
             throw new NotImplementedException();
         }
@@ -739,4 +740,4 @@ internal override void ResetConnection()
     }
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
new file mode 100644
index 0000000000..cafea0dad4
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
@@ -0,0 +1,951 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Transactions;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool;
+
+/// <summary>
+/// Deterministic tests for WaitHandleDbConnectionPool transaction functionality.
+/// These tests exercise transacted connection pathways with controlled synchronization
+/// to verify correct behavior without relying on probabilistic concurrency.
+/// </summary>
+public class WaitHandleDbConnectionPoolTransactionTest : IDisposable
+{
+    private const int DefaultMaxPoolSize = 50;
+    private const int DefaultMinPoolSize = 0;
+    private const int DefaultCreationTimeoutInMilliseconds = 15000;
+
+    private IDbConnectionPool _pool = null!;
+
+    public WaitHandleDbConnectionPoolTransactionTest()
+    {
+        _pool = CreatePool();
+    }
+
+    public void Dispose()
+    {
+        // Verify no leaked transactions before cleanup
+        Assert.Empty(_pool.TransactedConnectionPool.TransactedConnections);
+
+        _pool?.Shutdown();
+        _pool?.Clear();
+    }
+
+    #region Helper Methods
+
+    private WaitHandleDbConnectionPool CreatePool(
+        int maxPoolSize = DefaultMaxPoolSize,
+        int minPoolSize = DefaultMinPoolSize,
+        bool hasTransactionAffinity = true)
+    {
+        var poolGroupOptions = new DbConnectionPoolGroupOptions(
+            poolByIdentity: false,
+            minPoolSize: minPoolSize,
+            maxPoolSize: maxPoolSize,
+            creationTimeout: DefaultCreationTimeoutInMilliseconds,
+            loadBalanceTimeout: 0,
+            hasTransactionAffinity: hasTransactionAffinity
+        );
+
+        var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+            new DbConnectionOptions("DataSource=localhost;", null),
+            new DbConnectionPoolKey("TestDataSource"),
+            poolGroupOptions
+        );
+
+        var connectionFactory = new MockSqlConnectionFactory();
+
+        var pool = new WaitHandleDbConnectionPool(
+            connectionFactory,
+            dbConnectionPoolGroup,
+            DbConnectionPoolIdentity.NoIdentity,
+            new DbConnectionPoolProviderInfo()
+        );
+
+        pool.Startup();
+        return pool;
+    }
+
+    private DbConnectionInternal GetConnection(SqlConnection owner)
+    {
+        _pool.TryGetConnection(
+            owner,
+            taskCompletionSource: null,
+            new DbConnectionOptions("", null),
+            out DbConnectionInternal? connection);
+        return connection!;
+    }
+
+    private async Task<DbConnectionInternal> GetConnectionAsync(
+        SqlConnection owner,
+        Transaction? transaction = null)
+    {
+        var tcs = new TaskCompletionSource<DbConnectionInternal>(transaction);
+        _pool.TryGetConnection(
+            owner,
+            taskCompletionSource: tcs,
+            new DbConnectionOptions("", null),
+            out DbConnectionInternal? connection);
+        return connection ?? await tcs.Task;
+    }
+
+    private void ReturnConnection(DbConnectionInternal connection, SqlConnection owner)
+    {
+        _pool.ReturnInternalConnection(connection, owner);
+    }
+
+    private void AssertPoolMetrics()
+    {
+        Assert.True(_pool.Count <= _pool.PoolGroupOptions.MaxPoolSize,
+            $"Pool count ({_pool.Count}) exceeded max pool size ({_pool.PoolGroupOptions.MaxPoolSize})");
+        Assert.True(_pool.Count >= 0,
+            $"Pool count ({_pool.Count}) is negative");
+        Assert.Empty(_pool.TransactedConnectionPool.TransactedConnections);
+    }
+
+    #endregion
+
+    #region Transaction Routing Tests
+
+    [Fact]
+    public void GetConnection_UnderTransaction_RoutesToTransactedPool()
+    {
+        // Arrange & Act
+        using var scope = new TransactionScope();
+        var transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        var owner = new SqlConnection();
+        var conn = GetConnection(owner);
+        Assert.NotNull(conn);
+
+        ReturnConnection(conn, owner);
+
+        // Assert - connection should be in the transacted pool
+        Assert.True(_pool.TransactedConnectionPool.TransactedConnections.ContainsKey(transaction));
+        Assert.Single(_pool.TransactedConnectionPool.TransactedConnections[transaction]);
+
+        scope.Complete();
+    }
+
+    [Fact]
+    public void GetConnection_WithoutTransaction_RoutesToGeneralPool()
+    {
+        // Arrange & Act (no TransactionScope)
+        var owner = new SqlConnection();
+        var conn = GetConnection(owner);
+        Assert.NotNull(conn);
+
+        ReturnConnection(conn, owner);
+
+        // Assert - transacted pool should be empty
+        Assert.Empty(_pool.TransactedConnectionPool.TransactedConnections);
+    }
+
+    [Fact]
+    public void GetConnection_UnderTransaction_ReturnsSameConnectionFromTransactedPool()
+    {
+        // Arrange
+        using var scope = new TransactionScope();
+
+        // Act - first call creates a new connection
+        var owner1 = new SqlConnection();
+        var conn1 = GetConnection(owner1);
+        Assert.NotNull(conn1);
+        ReturnConnection(conn1, owner1);
+
+        // Second call should retrieve the SAME connection from the transacted pool (LIFO)
+        var owner2 = new SqlConnection();
+        var conn2 = GetConnection(owner2);
+        Assert.NotNull(conn2);
+        Assert.Same(conn1, conn2);
+
+        ReturnConnection(conn2, owner2);
+        scope.Complete();
+    }
+
+    [Fact]
+    public async Task GetConnectionAsync_UnderTransaction_ReturnsSameConnectionFromTransactedPool()
+    {
+        // Arrange
+        using var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
+        var transaction = Transaction.Current;
+
+        // Act - first call creates a new connection
+        var owner1 = new SqlConnection();
+        var conn1 = await GetConnectionAsync(owner1, transaction: transaction);
+        Assert.NotNull(conn1);
+        ReturnConnection(conn1, owner1);
+
+        // Second call should retrieve the SAME connection from the transacted pool
+        var owner2 = new SqlConnection();
+        var conn2 = await GetConnectionAsync(owner2, transaction: transaction);
+        Assert.NotNull(conn2);
+        Assert.Same(conn1, conn2);
+
+        ReturnConnection(conn2, owner2);
+        scope.Complete();
+    }
+
+    [Fact]
+    public void GetConnection_WithTransactionAffinityDisabled_SkipsTransactedPool()
+    {
+        // Arrange
+        _pool.Shutdown();
+        _pool.Clear();
+        _pool = CreatePool(hasTransactionAffinity: false);
+
+        using var scope = new TransactionScope();
+
+        // Act
+        var owner = new SqlConnection();
+        var conn = GetConnection(owner);
+        Assert.NotNull(conn);
+        ReturnConnection(conn, owner);
+
+        // Assert - even though a transaction is active, transacted pool is not used
+        Assert.Empty(_pool.TransactedConnectionPool.TransactedConnections);
+
+        scope.Complete();
+    }
+
+    #endregion
+
+    #region Transaction Lifecycle Tests
+
+    [Fact]
+    public void TransactionCommit_ClearsTransactedPool()
+    {
+        // Arrange & Act
+        using (var scope = new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            var conn = GetConnection(owner);
+            Assert.NotNull(conn);
+            ReturnConnection(conn, owner);
+
+            // While transaction is active, connection should be in transacted pool
+            Assert.Single(_pool.TransactedConnectionPool.TransactedConnections);
+
+            scope.Complete();
+        }
+
+        // Assert - after transaction completes, transacted pool should be empty
+        AssertPoolMetrics();
+    }
+
+    [Fact]
+    public void TransactionRollback_ClearsTransactedPool()
+    {
+        // Arrange & Act
+        using (var scope = new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            var conn = GetConnection(owner);
+            Assert.NotNull(conn);
+            ReturnConnection(conn, owner);
+
+            Assert.Single(_pool.TransactedConnectionPool.TransactedConnections);
+
+            // Don't call scope.Complete() — triggers rollback
+        }
+
+        // Assert - transacted pool should be empty after rollback too
+        AssertPoolMetrics();
+    }
+
+    [Fact]
+    public void MultipleGetReturn_SameTransaction_ReusesConnection()
+    {
+        // Arrange
+        using var scope = new TransactionScope();
+        var transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        // Act - get and return multiple times within same transaction
+        for (int i = 0; i < 10; i++)
+        {
+            var owner = new SqlConnection();
+            var conn = GetConnection(owner);
+            Assert.NotNull(conn);
+            ReturnConnection(conn, owner);
+        }
+
+        // Assert - only one connection should be in the transacted pool
+        Assert.Single(_pool.TransactedConnectionPool.TransactedConnections[transaction]);
+
+        scope.Complete();
+    }
+
+    [Fact]
+    public async Task MultipleGetReturn_SameTransaction_Async_ReusesConnection()
+    {
+        // Arrange
+        using var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
+        var transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        // Act - get and return multiple times within same transaction
+        for (int i = 0; i < 10; i++)
+        {
+            var owner = new SqlConnection();
+            var conn = await GetConnectionAsync(owner, transaction: transaction);
+            Assert.NotNull(conn);
+            ReturnConnection(conn, owner);
+        }
+
+        // Assert - only one connection should be in the transacted pool
+        Assert.Single(_pool.TransactedConnectionPool.TransactedConnections[transaction]);
+
+        scope.Complete();
+    }
+
+    [Fact]
+    public void AlternatingCommitAndRollback_MaintainsConsistentState()
+    {
+        // Act - alternate between commit and rollback
+        for (int i = 0; i < 20; i++)
+        {
+            using var scope = new TransactionScope();
+            var owner = new SqlConnection();
+            var conn = GetConnection(owner);
+            Assert.NotNull(conn);
+            ReturnConnection(conn, owner);
+
+            if (i % 2 == 0)
+            {
+                scope.Complete();
+            }
+            // else: rollback (no Complete)
+        }
+
+        // Assert
+        AssertPoolMetrics();
+    }
+
+    #endregion
+
+    #region Nested Transaction Tests
+
+    [Fact]
+    public void NestedTransaction_Required_SharesSameTransactedEntry()
+    {
+        // Arrange
+        using var outerScope = new TransactionScope();
+        var outerTxn = Transaction.Current;
+        Assert.NotNull(outerTxn);
+
+        var owner1 = new SqlConnection();
+        var conn1 = GetConnection(owner1);
+        Assert.NotNull(conn1);
+        ReturnConnection(conn1, owner1);
+
+        // Act - nested scope with Required shares the same transaction
+        using (var innerScope = new TransactionScope(TransactionScopeOption.Required))
+        {
+            Assert.Same(outerTxn, Transaction.Current);
+
+            var owner2 = new SqlConnection();
+            var conn2 = GetConnection(owner2);
+            Assert.NotNull(conn2);
+            Assert.Same(conn1, conn2); // Same transaction -> same connection from transacted pool
+            ReturnConnection(conn2, owner2);
+
+            // Only one transaction tracked
+            Assert.Single(_pool.TransactedConnectionPool.TransactedConnections);
+
+            innerScope.Complete();
+        }
+
+        outerScope.Complete();
+    }
+
+    [Fact]
+    public void NestedTransaction_RequiresNew_CreatesSeparateTransactedEntry()
+    {
+        // Arrange
+        using var outerScope = new TransactionScope();
+        var outerTxn = Transaction.Current;
+        Assert.NotNull(outerTxn);
+
+        var owner1 = new SqlConnection();
+        var conn1 = GetConnection(owner1);
+        Assert.NotNull(conn1);
+        ReturnConnection(conn1, owner1);
+
+        // Act - nested scope with RequiresNew creates a new transaction
+        using (var innerScope = new TransactionScope(TransactionScopeOption.RequiresNew))
+        {
+            var innerTxn = Transaction.Current;
+            Assert.NotNull(innerTxn);
+            Assert.NotEqual(outerTxn, innerTxn);
+
+            var owner2 = new SqlConnection();
+            var conn2 = GetConnection(owner2);
+            Assert.NotNull(conn2);
+            Assert.NotSame(conn1, conn2); // Different transaction -> different connection
+            ReturnConnection(conn2, owner2);
+
+            // Two separate transactions tracked
+            Assert.Equal(2, _pool.TransactedConnectionPool.TransactedConnections.Count);
+
+            innerScope.Complete();
+        }
+
+        outerScope.Complete();
+    }
+
+    [Fact]
+    public void NestedTransaction_RequiresNew_CompletesIndependently()
+    {
+        // Arrange & Act
+        using (var outerScope = new TransactionScope())
+        {
+            var owner1 = new SqlConnection();
+            var conn1 = GetConnection(owner1);
+            Assert.NotNull(conn1);
+            ReturnConnection(conn1, owner1);
+
+            using (var innerScope = new TransactionScope(TransactionScopeOption.RequiresNew))
+            {
+                var owner2 = new SqlConnection();
+                var conn2 = GetConnection(owner2);
+                Assert.NotNull(conn2);
+                ReturnConnection(conn2, owner2);
+                innerScope.Complete();
+            }
+
+            // Inner transaction completed - its entry should be cleared
+            // Outer transaction entry should still exist
+            Assert.Single(_pool.TransactedConnectionPool.TransactedConnections);
+
+            outerScope.Complete();
+        }
+
+        // Both completed
+        AssertPoolMetrics();
+    }
+
+    [Fact]
+    public void DeeplyNestedTransactions_RequiresNew_AllTrackedSeparately()
+    {
+        // Arrange & Act
+        using var scope1 = new TransactionScope();
+        var owner1 = new SqlConnection();
+        var conn1 = GetConnection(owner1);
+        ReturnConnection(conn1, owner1);
+
+        using var scope2 = new TransactionScope(TransactionScopeOption.RequiresNew);
+        var owner2 = new SqlConnection();
+        var conn2 = GetConnection(owner2);
+        ReturnConnection(conn2, owner2);
+
+        using var scope3 = new TransactionScope(TransactionScopeOption.RequiresNew);
+        var owner3 = new SqlConnection();
+        var conn3 = GetConnection(owner3);
+        ReturnConnection(conn3, owner3);
+
+        // Assert - three separate transactions tracked
+        Assert.Equal(3, _pool.TransactedConnectionPool.TransactedConnections.Count);
+
+        scope3.Complete();
+        scope2.Complete();
+        scope1.Complete();
+    }
+
+    [Fact]
+    public void DeeplyNestedTransactions_Required_AllShareOneEntry()
+    {
+        // Arrange & Act
+        using var scope1 = new TransactionScope();
+        var txn = Transaction.Current;
+        var owner1 = new SqlConnection();
+        var conn1 = GetConnection(owner1);
+        ReturnConnection(conn1, owner1);
+
+        using var scope2 = new TransactionScope(TransactionScopeOption.Required);
+        Assert.Same(txn, Transaction.Current);
+        var owner2 = new SqlConnection();
+        var conn2 = GetConnection(owner2);
+        Assert.Same(conn1, conn2);
+        ReturnConnection(conn2, owner2);
+
+        using var scope3 = new TransactionScope(TransactionScopeOption.Required);
+        Assert.Same(txn, Transaction.Current);
+        var owner3 = new SqlConnection();
+        var conn3 = GetConnection(owner3);
+        Assert.Same(conn1, conn3);
+        ReturnConnection(conn3, owner3);
+
+        // Assert - single transaction entry
+        Assert.Single(_pool.TransactedConnectionPool.TransactedConnections);
+
+        scope3.Complete();
+        scope2.Complete();
+        scope1.Complete();
+    }
+
+    #endregion
+
+    #region Mixed Transacted and Non-Transacted Tests
+
+    [Fact]
+    public void MixedWorkload_AlternatingTransactedAndNonTransacted()
+    {
+        // Act - alternate between transacted and non-transacted
+        for (int i = 0; i < 10; i++)
+        {
+            if (i % 2 == 0)
+            {
+                using var scope = new TransactionScope();
+                var owner = new SqlConnection();
+                var conn = GetConnection(owner);
+                Assert.NotNull(conn);
+                ReturnConnection(conn, owner);
+                scope.Complete();
+            }
+            else
+            {
+                var owner = new SqlConnection();
+                var conn = GetConnection(owner);
+                Assert.NotNull(conn);
+                ReturnConnection(conn, owner);
+            }
+        }
+
+        // Assert
+        AssertPoolMetrics();
+    }
+
+    #endregion
+
+    #region Shared Transaction Tests
+
+    [Fact]
+    public void SharedTransaction_DependentScopes_UseTransactedPool()
+    {
+        // Arrange
+        using var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
+        var transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        // Act - first connection
+        var owner1 = new SqlConnection();
+        var conn1 = GetConnection(owner1);
+        Assert.NotNull(conn1);
+        ReturnConnection(conn1, owner1);
+
+        // Use dependent scope on same transaction
+        using (var innerScope = new TransactionScope(transaction))
+        {
+            Assert.Same(transaction, Transaction.Current);
+            var owner2 = new SqlConnection();
+            var conn2 = GetConnection(owner2);
+            Assert.NotNull(conn2);
+            Assert.Same(conn1, conn2); // Same transaction -> same connection
+            ReturnConnection(conn2, owner2);
+            innerScope.Complete();
+        }
+
+        // Assert - still one transaction entry
+        Assert.Single(_pool.TransactedConnectionPool.TransactedConnections);
+        Assert.Single(_pool.TransactedConnectionPool.TransactedConnections[transaction]);
+
+        scope.Complete();
+    }
+
+    #endregion
+
+    #region Pool Saturation with Transactions Tests
+
+    [Fact]
+    public void PoolSaturation_BlocksUntilConnectionAvailable()
+    {
+        // Arrange - small pool
+        _pool.Shutdown();
+        _pool.Clear();
+        _pool = CreatePool(maxPoolSize: 1);
+
+        using var allAcquired = new ManualResetEventSlim(false);
+        using var releaseFirst = new ManualResetEventSlim(false);
+
+        var saturatingTask = Task.Run(() =>
+            {
+                using var scope = new TransactionScope();
+                var owner = new SqlConnection();
+                var conn = GetConnection(owner);
+                Assert.NotNull(conn);
+
+                allAcquired.Set(); // Signal that this connection is held
+
+                Assert.True(releaseFirst.Wait(TimeSpan.FromSeconds(15)),
+                    "Timed out waiting for releaseFirst signal.");
+
+                ReturnConnection(conn, owner);
+                scope.Complete();
+            });
+
+        Assert.True(allAcquired.Wait(TimeSpan.FromSeconds(10)),
+            "Timed out waiting for connection to be acquired.");
+        Assert.Equal(1, _pool.Count);
+
+        using var acquired = new ManualResetEventSlim(false);
+        var waitingTask = Task.Run(() =>
+        {
+            using var scope = new TransactionScope();
+            var owner = new SqlConnection();
+            var conn = GetConnection(owner);
+            Assert.NotNull(conn);
+            acquired.Set();
+            ReturnConnection(conn, owner);
+            scope.Complete();
+        });
+
+        // Give the waiting task time to block — it should NOT complete yet
+        Assert.False(acquired.Wait(TimeSpan.FromMilliseconds(500)),
+            "Waiting task should not have acquired a connection while pool is saturated");
+
+        // Release one connection to unblock the waiting task
+        releaseFirst.Set();
+
+        // Now the waiting task should complete
+        Assert.True(waitingTask.Wait(TimeSpan.FromSeconds(15)),
+            "Waiting task should have completed after a connection was released");
+        Assert.True(acquired.IsSet);
+
+        // Cleanup remaining held connections
+        Task.WaitAll(saturatingTask);
+    }
+
+    #endregion
+
+    #region Controlled Concurrency Tests
+
+    [Fact]
+    public void TwoThreads_SharedTransaction_AccessSameTransactedEntry()
+    {
+        // Arrange
+        // Use 3-phase synchronization so task1 gets AND returns before task2 requests.
+        // This ensures the connection is back in the transacted pool for task2 to reuse.
+        using var task1Returned = new ManualResetEventSlim(false);
+        using var task2Done = new ManualResetEventSlim(false);
+        DbConnectionInternal? connFromTask1 = null;
+        DbConnectionInternal? connFromTask2 = null;
+
+        using var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
+        var transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        // Act - two threads sharing the same transaction, sequenced so the
+        // transacted pool can vend the same connection to both.
+        var task1 = Task.Run(() =>
+        {
+            using var innerScope = new TransactionScope(transaction);
+            var owner = new SqlConnection();
+            connFromTask1 = GetConnection(owner);
+            Assert.NotNull(connFromTask1);
+
+            // Return the connection so it's available in the transacted pool
+            ReturnConnection(connFromTask1, owner);
+            innerScope.Complete();
+
+            task1Returned.Set(); // Signal: connection is back in the transacted pool
+        });
+
+        var task2 = Task.Run(() =>
+        {
+            // Wait until task1 has returned the connection to the transacted pool
+            Assert.True(task1Returned.Wait(TimeSpan.FromSeconds(10)),
+                "Timed out waiting for task1 to return its connection.");
+
+            using var innerScope = new TransactionScope(transaction);
+            var owner = new SqlConnection();
+            connFromTask2 = GetConnection(owner);
+            Assert.NotNull(connFromTask2);
+            ReturnConnection(connFromTask2, owner);
+            innerScope.Complete();
+        });
+
+        Task.WaitAll(task1, task2);
+
+        // Both tasks should have received the same connection via the transacted pool
+        Assert.Same(connFromTask1, connFromTask2);
+        scope.Complete();
+    }
+
+    [Fact]
+    public async Task TwoThreads_SeparateTransactions_Async_IsolatedTransactedEntries()
+    {
+        // Arrange
+        using var barrier = new SemaphoreSlim(0, 2);
+
+        // Act
+        var task1 = Task.Run(async () =>
+        {
+            using var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
+            var transaction = Transaction.Current;
+            var owner = new SqlConnection();
+            var conn = await GetConnectionAsync(owner, transaction: transaction);
+            Assert.NotNull(conn);
+            ReturnConnection(conn, owner);
+
+            barrier.Release(); // Signal ready
+            await barrier.WaitAsync(); // Wait for other task
+
+            scope.Complete();
+        });
+
+        var task2 = Task.Run(async () =>
+        {
+            using var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
+            var transaction = Transaction.Current;
+            var owner = new SqlConnection();
+            var conn = await GetConnectionAsync(owner, transaction: transaction);
+            Assert.NotNull(conn);
+            ReturnConnection(conn, owner);
+
+            barrier.Release(); // Signal ready
+            await barrier.WaitAsync(); // Wait for other task
+
+            scope.Complete();
+        });
+
+        await Task.WhenAll(task1, task2);
+
+        // Assert
+        AssertPoolMetrics();
+    }
+
+    #endregion
+
+    #region Pool Shutdown with Transactions Tests
+
+    [Fact]
+    public void PoolShutdown_AfterTransactionComplete_NoLeaks()
+    {
+        // Arrange
+        using (var scope = new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            var conn = GetConnection(owner);
+            Assert.NotNull(conn);
+            ReturnConnection(conn, owner);
+            scope.Complete();
+        }
+
+        // Act
+        _pool.Shutdown();
+
+        // Assert
+        AssertPoolMetrics();
+    }
+
+    [Fact]
+    public void PoolShutdown_WhileConnectionHeld_NoException()
+    {
+        // Arrange
+        using var scope = new TransactionScope();
+        var owner = new SqlConnection();
+        var conn = GetConnection(owner);
+        Assert.NotNull(conn);
+
+        // Act - shutdown while connection is held (not yet returned)
+        _pool.Shutdown();
+
+        // Return after shutdown — the pool deactivates and disposes the connection
+        // rather than returning it to the pool. Verify this doesn't throw.
+        ReturnConnection(conn, owner);
+
+        // Assert
+        // The connection should have been deactivated and disposed (not returned to the pool).
+        // After Dispose(), IsConnectionDoomed is set to true and Pool is set to null.
+        Assert.True(conn.IsConnectionDoomed,
+            "Connection should be doomed after returning to a shut-down pool.");
+        Assert.Null(conn.Pool);
+    }
+
+    #endregion
+
+    #region Transaction Complete Before Return Tests
+
+    [Fact]
+    public void TransactionComplete_ThenReturn_ConnectionStillReturned()
+    {
+        // Arrange
+        var owner = new SqlConnection();
+        DbConnectionInternal conn;
+
+        using (var scope = new TransactionScope())
+        {
+            conn = GetConnection(owner);
+            Assert.NotNull(conn);
+            scope.Complete();
+        }
+        // Transaction is fully disposed here
+
+        // Act - return connection after transaction ended
+        ReturnConnection(conn, owner);
+
+        // Assert - no leak, pool metrics consistent
+        AssertPoolMetrics();
+        Assert.True(_pool.Count > 0, "Pool should still have the connection");
+    }
+
+    #endregion
+
+    #region Sequential Transaction Isolation Tests
+
+    [Fact]
+    public void SequentialTransactions_EachGetsOwnTransactedEntry()
+    {
+        // Act - create multiple sequential transactions
+        for (int i = 0; i < 5; i++)
+        {
+            using var scope = new TransactionScope();
+            var transaction = Transaction.Current;
+            Assert.NotNull(transaction);
+
+            var owner = new SqlConnection();
+            var conn = GetConnection(owner);
+            Assert.NotNull(conn);
+            ReturnConnection(conn, owner);
+
+            // Only the current transaction should be tracked
+            Assert.Single(_pool.TransactedConnectionPool.TransactedConnections);
+            Assert.True(_pool.TransactedConnectionPool.TransactedConnections.ContainsKey(transaction));
+
+            scope.Complete();
+        }
+
+        // Assert - after all are done, pool should be clean
+        AssertPoolMetrics();
+    }
+
+    [Fact]
+    public async Task SequentialTransactions_Async_EachGetsOwnTransactedEntry()
+    {
+        // Act - create multiple sequential transactions
+        for (int i = 0; i < 5; i++)
+        {
+            using var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
+            var transaction = Transaction.Current;
+            Assert.NotNull(transaction);
+
+            var owner = new SqlConnection();
+            var conn = await GetConnectionAsync(owner, transaction: transaction);
+            Assert.NotNull(conn);
+            ReturnConnection(conn, owner);
+
+            Assert.Single(_pool.TransactedConnectionPool.TransactedConnections);
+            Assert.True(_pool.TransactedConnectionPool.TransactedConnections.ContainsKey(transaction));
+
+            scope.Complete();
+        }
+
+        // Assert
+        AssertPoolMetrics();
+    }
+
+    [Fact]
+    public void SequentialTransactions_CanReuseConnections()
+    {
+        // Act
+        DbConnectionInternal conn1;
+        DbConnectionInternal conn2;
+        Transaction? txn1;
+        Transaction? txn2;
+
+        using (var scope1 = new TransactionScope())
+        {
+            txn1 = Transaction.Current;
+            var owner1 = new SqlConnection();
+            conn1 = GetConnection(owner1);
+            Assert.NotNull(conn1);
+            ReturnConnection(conn1, owner1);
+            scope1.Complete();
+        }
+
+        using (var scope2 = new TransactionScope())
+        {
+            txn2 = Transaction.Current;
+            var owner2 = new SqlConnection();
+            conn2 = GetConnection(owner2);
+            Assert.NotNull(conn2);
+            ReturnConnection(conn2, owner2);
+            scope2.Complete();
+        }
+
+        // Assert
+        // The connection was returned to the general pool and picked up by the second transaction
+        Assert.NotSame(txn1, txn2);
+        Assert.Same(conn1, conn2);
+        AssertPoolMetrics();
+    }
+
+    #endregion
+
+    #region Mock Classes
+
+    internal class MockSqlConnectionFactory : SqlConnectionFactory
+    {
+        protected override DbConnectionInternal CreateConnection(
+            DbConnectionOptions options,
+            DbConnectionPoolKey poolKey,
+            DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+            IDbConnectionPool pool,
+            DbConnection owningConnection,
+            DbConnectionOptions userOptions)
+        {
+            return new MockDbConnectionInternal();
+        }
+    }
+
+    internal class MockDbConnectionInternal : DbConnectionInternal
+    {
+        private static int s_nextId = 1;
+        public int MockId { get; } = Interlocked.Increment(ref s_nextId);
+
+        public override string ServerVersion => "Mock";
+
+        public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void EnlistTransaction(Transaction? transaction)
+        {
+            if (transaction != null)
+            {
+                EnlistedTransaction = transaction;
+            }
+        }
+
+        protected override void Activate(Transaction? transaction)
+        {
+            EnlistedTransaction = transaction;
+        }
+
+        protected override void Deactivate()
+        {
+        }
+
+        public override string ToString() => $"MockConnection_{MockId}";
+
+        internal override void ResetConnection()
+        {
+        }
+    }
+
+    #endregion
+}

From f8183c1aadad0879520dfd3d565bd26f7f58e3ad Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 6 Apr 2026 13:25:11 -0300
Subject: [PATCH 022/298] Add GitHub Actions workflow to automate cherry-pick
 hotfix PRs (#4106)

---
 .github/copilot-instructions.md               |   4 +
 .github/scripts/cherry-pick-to-release.sh     | 202 ++++++++++++
 .github/scripts/extract-hotfix-versions.sh    | 136 ++++++++
 .github/scripts/tests/README.md               | 176 +++++++++++
 .../scripts/tests/cherry-pick-to-release.bats | 294 ++++++++++++++++++
 .../tests/extract-hotfix-versions.bats        | 244 +++++++++++++++
 .github/workflows/cherry-pick-hotfix.yml      | 113 +++++++
 .github/workflows/codeql.yml                  |   1 +
 AGENTS.md                                     |   9 +
 ...qlclient-ci-package-reference-pipeline.yml |  16 +-
 ...qlclient-ci-project-reference-pipeline.yml |  16 +-
 .../sqlclient-pr-package-ref-pipeline.yml     |   6 +-
 .../sqlclient-pr-project-ref-pipeline.yml     |   6 +-
 13 files changed, 1205 insertions(+), 18 deletions(-)
 create mode 100755 .github/scripts/cherry-pick-to-release.sh
 create mode 100755 .github/scripts/extract-hotfix-versions.sh
 create mode 100644 .github/scripts/tests/README.md
 create mode 100644 .github/scripts/tests/cherry-pick-to-release.bats
 create mode 100644 .github/scripts/tests/extract-hotfix-versions.bats
 create mode 100644 .github/workflows/cherry-pick-hotfix.yml

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 272a0c2164..4c80da66ff 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -129,6 +129,10 @@ When a new issue is created, follow these steps:
 - Suggest release note entries for fixes by updating files under `release-notes/` or by using the `release-notes` prompt (instead of editing `CHANGELOG.md` directly).
 - Tag reviewers based on `CODEOWNERS` file
 
+## 🌿 Branch Naming
+- All branches created by AI agents **must** use the `dev/automation/` prefix (e.g. `dev/automation/fix-connection-timeout`).
+- Do **not** create branches directly under `main`, `dev/`, or any other top-level prefix.
+
 ## 🧠 Contextual Awareness
 - All source code is in `src/Microsoft.Data.SqlClient/src/`. Do NOT add code to legacy `netfx/src/` or `netcore/src/` directories.
 - Only `ref/` folders in `netcore/ref/` and `netfx/ref/` remain active for defining the public API surface.
diff --git a/.github/scripts/cherry-pick-to-release.sh b/.github/scripts/cherry-pick-to-release.sh
new file mode 100755
index 0000000000..8b3172cc50
--- /dev/null
+++ b/.github/scripts/cherry-pick-to-release.sh
@@ -0,0 +1,202 @@
+#!/usr/bin/env bash
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# cherry-pick-to-release.sh
+#
+# Cherry-picks a merge commit from the default branch onto a release branch
+# and opens a pull request for the result. If the cherry-pick conflicts, an
+# empty-commit placeholder PR is created with manual resolution instructions.
+#
+# OVERVIEW
+# --------
+# This script performs the following steps:
+#
+#   1. Derive the target release branch from the version's major.minor
+#      (e.g. "7.0.1" → release/7.0).
+#
+#   2. Check whether the commit's patch is already present on the target
+#      branch (via 'git cherry'). If so, exit cleanly — nothing to do.
+#
+#   3. Detect whether the merge commit is a true merge (2+ parents) or a
+#      squash-merge (1 parent).  True merges require '--mainline 1'.
+#
+#   4. Attempt the cherry-pick:
+#      - On success: push the branch, look up the milestone, create a PR.
+#      - On conflict: abort, push an empty-commit placeholder, create a
+#        "CONFLICTS" PR with manual resolution instructions.
+#
+#   5. Milestone lookup is best-effort. If the milestone doesn't exist yet
+#      the PR is created without one and a warning note is added to the body.
+#
+# REQUIRED ENVIRONMENT VARIABLES
+# ------------------------------
+#   VERSION            Full hotfix version, e.g. "7.0.1".
+#   MERGE_COMMIT_SHA   SHA of the merge commit on the default branch.
+#   PR_NUMBER          Number of the original PR that was merged.
+#   PR_TITLE           Title of the original PR (used in cherry-pick PR title).
+#   GH_TOKEN           GitHub token for 'gh' CLI authentication.
+#   GITHUB_REPOSITORY  Owner/repo (e.g. "dotnet/SqlClient"). Set by Actions.
+#
+# OUTPUTS
+# -------
+#   On success or conflict, a new PR is created on GitHub.
+#   On already-applied, the script exits 0 with a notice.
+#
+# USAGE
+#   Typically called from the cherry-pick-hotfix.yml workflow.
+#   The git working directory must have full history (fetch-depth: 0) and
+#   user.name / user.email must be configured before calling this script.
+#
+#   Local testing example (dry-run — comment out 'gh pr create' calls):
+#
+#     export VERSION="7.0.1"
+#     export MERGE_COMMIT_SHA="abc123"
+#     export PR_NUMBER=42
+#     export PR_TITLE="Fix connection timeout"
+#     export GH_TOKEN="ghp_..."
+#     export GITHUB_REPOSITORY="dotnet/SqlClient"
+#     bash .github/scripts/cherry-pick-to-release.sh
+#
+#################################################################################
+set -euo pipefail
+
+# -- Runtime help -------------------------------------------------------------
+if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
+  # Print the header comment block (between the license banner and the
+  # closing banner), stripping the leading '# ' prefix.
+  awk '/^#{2,}$/ { n++; next } n == 2 { sub(/^# ?/, ""); print }' "$0"
+  exit 0
+fi
+
+# -- Input validation ---------------------------------------------------------
+: "${VERSION:?VERSION environment variable is required}"
+: "${MERGE_COMMIT_SHA:?MERGE_COMMIT_SHA environment variable is required}"
+: "${PR_NUMBER:?PR_NUMBER environment variable is required}"
+: "${PR_TITLE:?PR_TITLE environment variable is required}"
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY environment variable is required}"
+
+# -- Step 1: Derive target branch from major.minor ---------------------------
+# "7.0.1" → "7.0", so target branch is "release/7.0".
+# Use a bash regex for portability (grep -P is not available on macOS BSD grep).
+if [[ "${VERSION}" =~ ^([0-9]+)\.([0-9]+) ]]; then
+  BRANCH_VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
+else
+  BRANCH_VERSION=""
+fi
+if [[ -z "${BRANCH_VERSION}" ]]; then
+  echo "::error::Could not parse major.minor from version '${VERSION}'."
+  exit 1
+fi
+
+TARGET_BRANCH="release/${BRANCH_VERSION}"
+CHERRY_PICK_BRANCH="dev/automation/pr-${PR_NUMBER}-to-${VERSION}"
+
+echo "Version:            ${VERSION}"
+echo "Target branch:      ${TARGET_BRANCH}"
+echo "Cherry-pick branch: ${CHERRY_PICK_BRANCH}"
+echo "Merge commit:       ${MERGE_COMMIT_SHA}"
+
+# Ensure the target branch ref is available locally.
+git fetch origin "${TARGET_BRANCH}"
+
+# -- Step 2: Check if the patch is already applied ----------------------------
+# 'git cherry <upstream> <head> <limit>' lists commits in <limit>..<head> and
+# marks each with '-' (patch already on <upstream>) or '+' (not yet applied).
+# By passing <head>=MERGE_COMMIT_SHA and <limit>=MERGE_COMMIT_SHA^ we scope
+# the check to exactly one commit — the PR being cherry-picked.
+if git cherry "origin/${TARGET_BRANCH}" "${MERGE_COMMIT_SHA}" "${MERGE_COMMIT_SHA}^" \
+    | grep -q '^-'; then
+  echo "::notice::Commit ${MERGE_COMMIT_SHA} is already applied on" \
+       "${TARGET_BRANCH}. Skipping cherry-pick."
+  exit 0
+fi
+
+# Create the cherry-pick working branch from the target release branch.
+git checkout -b "${CHERRY_PICK_BRANCH}" "origin/${TARGET_BRANCH}"
+
+# -- Step 3: Detect merge commit type -----------------------------------------
+# True merge commits have 2+ parents and require '--mainline 1' to tell git
+# which parent's tree to diff against (the first parent = the target branch).
+# Squash-merge commits have exactly 1 parent and must NOT use --mainline.
+#
+# 'git rev-list --parents -n1 <sha>' outputs: <sha> <parent1> [<parent2> ...]
+# awk counts fields and subtracts 1 (the SHA itself) to get the parent count.
+PARENT_COUNT=$(git rev-list --parents -n1 "${MERGE_COMMIT_SHA}" \
+  | awk '{print NF - 1}')
+MAINLINE_FLAG=""
+if [[ "${PARENT_COUNT}" -gt 1 ]]; then
+  MAINLINE_FLAG="--mainline 1"
+  echo "Merge commit has ${PARENT_COUNT} parents — using --mainline 1."
+else
+  echo "Squash-merge commit (single parent) — no --mainline flag needed."
+fi
+
+# -- Helper: look up milestone ------------------------------------------------
+# Milestone assignment is best-effort. If the milestone doesn't exist yet, the
+# PR is created without one and a note is appended to the PR body.
+lookup_milestone() {
+  local version="$1"
+  MILESTONE_ARG=""
+  MILESTONE_NOTE=""
+
+  if gh api "repos/${GITHUB_REPOSITORY}/milestones" --paginate \
+      --field state=open --jq '.[].title' | grep -qx "${version}"; then
+    MILESTONE_ARG="--milestone ${version}"
+    echo "Milestone '${version}' found."
+  else
+    echo "::warning::Milestone '${version}' does not exist." \
+         "PR will be created without a milestone."
+    MILESTONE_NOTE=$'\n\n> **Note:** Milestone `'"${version}"'` does not exist yet. Please create it and assign this PR manually.'
+  fi
+}
+
+# -- Step 4: Attempt the cherry-pick ------------------------------------------
+# Options (--mainline) must precede the commit operand.
+if git cherry-pick ${MAINLINE_FLAG} "${MERGE_COMMIT_SHA}"; then
+  # --- Success path ---
+  echo "Cherry-pick succeeded. Pushing branch and creating PR."
+  git push origin "${CHERRY_PICK_BRANCH}"
+
+  lookup_milestone "${VERSION}"
+
+  gh pr create \
+    --base "${TARGET_BRANCH}" \
+    --head "${CHERRY_PICK_BRANCH}" \
+    --title "[${VERSION} Cherry-pick] ${PR_TITLE}" \
+    --body "Cherry-pick of #${PR_NUMBER} (${MERGE_COMMIT_SHA}) into \`${TARGET_BRANCH}\`.${MILESTONE_NOTE}" \
+    ${MILESTONE_ARG}
+else
+  # --- Conflict path ---
+  echo "::error::Cherry-pick of ${MERGE_COMMIT_SHA} failed due to conflicts."
+  git cherry-pick --abort
+
+  # Build the cherry-pick command for inclusion in the conflict-resolution
+  # instructions. Options must precede the commit SHA.
+  CHERRY_PICK_CMD="git cherry-pick"
+  if [[ -n "${MAINLINE_FLAG}" ]]; then
+    CHERRY_PICK_CMD="${CHERRY_PICK_CMD} ${MAINLINE_FLAG}"
+  fi
+  CHERRY_PICK_CMD="${CHERRY_PICK_CMD} ${MERGE_COMMIT_SHA}"
+
+  # Create a branch with an empty commit so a PR can be opened. The PR body
+  # contains step-by-step instructions for manual conflict resolution.
+  git checkout "origin/${TARGET_BRANCH}"
+  git checkout -B "${CHERRY_PICK_BRANCH}"
+  git commit --allow-empty \
+    -m "Cherry-pick of #${PR_NUMBER} requires manual resolution" \
+    -m "To resolve, run:  ${CHERRY_PICK_CMD}"
+  git push origin "${CHERRY_PICK_BRANCH}"
+
+  lookup_milestone "${VERSION}"
+
+  gh pr create \
+    --base "${TARGET_BRANCH}" \
+    --head "${CHERRY_PICK_BRANCH}" \
+    --title "[${VERSION} Cherry-pick - CONFLICTS] ${PR_TITLE}" \
+    ${MILESTONE_ARG} \
+    --body $'Cherry-pick of #'"${PR_NUMBER}"' ('"${MERGE_COMMIT_SHA}"') into `'"${TARGET_BRANCH}"'` **failed due to merge conflicts**.'"${MILESTONE_NOTE}"$'\n\nPlease resolve manually:\n```bash\ngit fetch origin\ngit checkout '"${CHERRY_PICK_BRANCH}"'\n'"${CHERRY_PICK_CMD}"$'\n# resolve conflicts\ngit push origin '"${CHERRY_PICK_BRANCH}"' --force\n```'
+fi
diff --git a/.github/scripts/extract-hotfix-versions.sh b/.github/scripts/extract-hotfix-versions.sh
new file mode 100755
index 0000000000..b7c702a8f8
--- /dev/null
+++ b/.github/scripts/extract-hotfix-versions.sh
@@ -0,0 +1,136 @@
+#!/usr/bin/env bash
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# extract-hotfix-versions.sh
+#
+# Parses "Hotfix X.Y.Z" labels from a merged GitHub PR and emits a JSON array
+# of version strings suitable for use as a GitHub Actions matrix dimension.
+#
+# OVERVIEW
+# --------
+# This script handles two distinct trigger scenarios:
+#
+#   1. 'closed' event  — The PR was just merged. ALL "Hotfix X.Y.Z" labels on
+#      the PR are processed, emitting one version per valid label.
+#
+#   2. 'labeled' event — A label was added to an already-merged PR. Only the
+#      NEWLY ADDED label is considered, and only if a cherry-pick for that
+#      version hasn't already been created (branch or PR exists).
+#
+# Label names must match the exact pattern "Hotfix <major>.<minor>.<patch>"
+# (e.g. "Hotfix 7.0.1"). All other labels are silently ignored.
+#
+# REQUIRED ENVIRONMENT VARIABLES
+# ------------------------------
+#   LABELS             Comma-separated list of all label names on the PR.
+#   EVENT_ACTION       The GitHub event action: "closed" or "labeled".
+#   EVENT_LABEL        For 'labeled' events, the name of the label that was added.
+#                      Empty or unset for 'closed' events.
+#   PR_NUMBER          The pull request number (used to derive cherry-pick branch names).
+#   GH_TOKEN           GitHub token for API calls (gh CLI auth).
+#   GITHUB_REPOSITORY  Owner/repo (e.g. "dotnet/SqlClient"). Set automatically by Actions.
+#
+# OUTPUTS
+# -------
+#   Writes to $GITHUB_OUTPUT:
+#     versions=<JSON array>   e.g. versions=["7.0.1","8.0.0"]
+#
+#   An empty array (versions=[]) means no work is needed.
+#   The script exits with code 1 if the 'closed' event has no valid labels.
+#
+# USAGE
+#   Called from the cherry-pick-hotfix.yml workflow. Can also be run locally
+#   for testing by setting the required environment variables and providing a
+#   writable GITHUB_OUTPUT file:
+#
+#     export LABELS="Hotfix 7.0.1,bug"
+#     export EVENT_ACTION="closed"
+#     export PR_NUMBER=42
+#     export GITHUB_OUTPUT=$(mktemp)
+#     bash .github/scripts/extract-hotfix-versions.sh
+#     cat "$GITHUB_OUTPUT"
+#
+#################################################################################
+set -euo pipefail
+
+# -- Runtime help -------------------------------------------------------------
+if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
+  # Print the header comment block (between the license banner and the
+  # closing banner), stripping the leading '# ' prefix.
+  awk '/^#{2,}$/ { n++; next } n == 2 { sub(/^# ?/, ""); print }' "$0"
+  exit 0
+fi
+
+# -- Input validation ---------------------------------------------------------
+: "${LABELS:?LABELS environment variable is required}"
+: "${EVENT_ACTION:?EVENT_ACTION environment variable is required}"
+: "${PR_NUMBER:?PR_NUMBER environment variable is required}"
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY environment variable is required}"
+
+# -- 'labeled' event: process only the newly added label ----------------------
+if [[ "${EVENT_ACTION}" == "labeled" ]]; then
+  # Extract version from the new label. If it doesn't match "Hotfix X.Y.Z",
+  # this is a non-hotfix label — emit empty matrix and exit cleanly.
+  if [[ "${EVENT_LABEL:-}" =~ ^Hotfix\ ([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
+    CANDIDATE="${BASH_REMATCH[1]}"
+  else
+    CANDIDATE=""
+  fi
+
+  if [[ -z "${CANDIDATE}" ]]; then
+    echo "Label '${EVENT_LABEL:-}' is not a valid 'Hotfix X.Y.Z' label. Skipping."
+    echo "versions=[]" >> "${GITHUB_OUTPUT}"
+    exit 0
+  fi
+
+  # Guard against duplicate cherry-picks.  If the cherry-pick branch already
+  # exists on the remote, or a PR (open, closed, or merged) was already created
+  # from it, there is nothing left to do.
+  #
+  # NOTE: We use the GitHub API rather than 'git ls-remote' because the
+  # detect-versions job does not check out the repository (no .git directory).
+  CHERRY_PICK_BRANCH="dev/automation/pr-${PR_NUMBER}-to-${CANDIDATE}"
+
+  if gh api "repos/${GITHUB_REPOSITORY}/git/ref/heads/${CHERRY_PICK_BRANCH}" \
+      --silent 2>/dev/null; then
+    echo "Cherry-pick branch '${CHERRY_PICK_BRANCH}' already exists. Skipping."
+    echo "versions=[]" >> "${GITHUB_OUTPUT}"
+    exit 0
+  fi
+
+  EXISTING_PR=$(gh pr list --repo "${GITHUB_REPOSITORY}" --head "${CHERRY_PICK_BRANCH}" --state all \
+    --json number --jq 'length')
+  if [[ "${EXISTING_PR}" -gt 0 ]]; then
+    echo "A cherry-pick PR from '${CHERRY_PICK_BRANCH}' already exists. Skipping."
+    echo "versions=[]" >> "${GITHUB_OUTPUT}"
+    exit 0
+  fi
+
+  VERSIONS="${CANDIDATE}"
+else
+  # -- 'closed' event: process all hotfix labels on the PR --------------------
+  # Split by comma, keep only labels matching "Hotfix X.Y.Z", extract the version.
+  # Use sed -E for portable extended regex (works on both GNU and BSD sed).
+  VERSIONS=$(echo "${LABELS}" | tr ',' '\n' \
+    | sed -nE 's/^Hotfix ([0-9]+\.[0-9]+\.[0-9]+)$/\1/p')
+fi
+
+# -- Validate that at least one version was found ----------------------------
+if [[ -z "${VERSIONS}" ]]; then
+  echo "::error::No valid 'Hotfix X.Y.Z' label found. " \
+       "Labels must match 'Hotfix <major>.<minor>.<patch>'."
+  exit 1
+fi
+
+# -- Emit JSON array for the matrix strategy ----------------------------------
+# Convert the newline-separated version list into a compact JSON array.
+# e.g. "7.0.1\n8.0.0" → ["7.0.1","8.0.0"]
+JSON=$(echo "${VERSIONS}" \
+  | jq -R -s -c 'split("\n") | map(select(length > 0))')
+
+echo "versions=${JSON}" >> "${GITHUB_OUTPUT}"
+echo "Detected hotfix versions: ${JSON}"
diff --git a/.github/scripts/tests/README.md b/.github/scripts/tests/README.md
new file mode 100644
index 0000000000..9aac1c6c88
--- /dev/null
+++ b/.github/scripts/tests/README.md
@@ -0,0 +1,176 @@
+# Cherry-Pick Workflow Tests
+
+This directory contains tests for the shell scripts used by the
+[cherry-pick-hotfix](./../../../.github/workflows/cherry-pick-hotfix.yml) GitHub Actions workflow.
+These tests are intended to be run manually by developers when they are changing the associated
+scripts, and not as part of any CI runs.
+
+## What is Bats?
+
+**[Bats](https://github.com/bats-core/bats-core)** (Bash Automated Testing System) is a
+TAP-compliant testing framework for Bash scripts. Each `.bats` file contains one or more `@test`
+blocks that run shell commands and assert outcomes using the built-in `run` helper. A test passes
+when every command exits with code 0; it fails on the first non-zero exit.
+
+Key concepts:
+
+| Concept | Description |
+| ------- | ----------- |
+| `@test "name" { ... }` | Defines a single test case |
+| `run <command>` | Captures stdout, stderr, and exit code into `$output` and `$status` |
+| `setup()` | Runs before every `@test` — used to create temp files and set env vars |
+| `teardown()` | Runs after every `@test` — used to clean up temp files |
+| `[[ "$status" -eq 0 ]]` | Assert exit code |
+| `[[ "$output" == *"text"* ]]` | Assert output contains a string |
+
+## Installing Bats
+
+### Linux (apt)
+
+```bash
+sudo apt-get update && sudo apt-get install -y bats
+```
+
+### macOS (Homebrew)
+
+```bash
+brew install bats-core
+```
+
+### From source (any platform)
+
+```bash
+git clone https://github.com/bats-core/bats-core.git
+cd bats-core
+sudo ./install.sh /usr/local
+```
+
+## Additional Prerequisites
+
+The scripts under test also require:
+
+- **jq** — used to build JSON matrix output
+- **gh** (GitHub CLI) — used for API calls and PR creation (mocked during tests, but must be on
+  `$PATH` for the test stubs to shadow it)
+
+Most CI runners and development machines have these pre-installed. If not:
+
+```bash
+# Linux (apt)
+sudo apt-get install -y jq gh
+
+# macOS (Homebrew)
+brew install jq gh
+```
+
+### Verify installation
+
+```bash
+bats --version
+# Expected output: Bats 1.x.x
+```
+
+## Running the Tests
+
+All commands assume you are at the **repository root**.
+
+### Run all tests
+
+```bash
+bats .github/scripts/tests/
+```
+
+### Run a single test file
+
+```bash
+bats .github/scripts/tests/extract-hotfix-versions.bats
+bats .github/scripts/tests/cherry-pick-to-release.bats
+```
+
+### Run a specific test by name
+
+```bash
+bats .github/scripts/tests/extract-hotfix-versions.bats \
+  --filter "single Hotfix label"
+```
+
+### Verbose output (show each test name)
+
+```bash
+bats --tap .github/scripts/tests/
+```
+
+### Pretty output (requires bats-core 1.5+)
+
+```bash
+bats --formatter pretty .github/scripts/tests/
+```
+
+## Test Files
+
+| File | Tests | Covers |
+| ---- | ----- | ------ |
+| `extract-hotfix-versions.bats` | 18 | Label parsing, version extraction, matrix JSON output, edge cases (malformed labels, duplicates, `labeled` vs `closed` events) |
+| `cherry-pick-to-release.bats` | 15 | Branch derivation, already-applied detection, clean cherry-pick, conflict handling, milestone lookup, PR creation, duplicate skip logic |
+
+## How the Tests Work
+
+Both test files use the same general approach:
+
+1. **`setup()`** creates a temporary directory and populates it with mock `git` and `gh` executables
+   — simple shell scripts that echo predetermined responses. Environment variables (`VERSION`,
+   `MERGE_COMMIT_SHA`, etc.) are set to known values.
+
+2. **`@test` blocks** call `run bash "$SCRIPT"` to execute the script under test in a subshell. The
+   mocks intercept all `git` and `gh` invocations, so no real repository or GitHub API access is
+   needed.
+
+3. **Assertions** check `$status` (exit code) and `$output` (combined stdout/stderr) for expected
+   values, error messages, GitHub Actions output file writes via `$GITHUB_OUTPUT`, or other
+   workflow commands such as `::error::` and `::notice::`.
+
+4. **`teardown()`** removes the temporary directory and mock binaries.
+
+### Example mock
+
+```bash
+# Mock git that reports 2 parents (a merge commit)
+cat > "${STUB_DIR}/git" <<'MOCK'
+#!/usr/bin/env bash
+case "$*" in
+  "rev-list --parents -n1 "*) echo "abc123 parent1 parent2" ;;
+  "cherry "*)                 echo "+ abc123" ;;
+  *)                          echo "git mock: $*" ;;
+esac
+MOCK
+chmod +x "${STUB_DIR}/git"
+```
+
+The mock sits earlier on `$PATH` than the real `git`, so the script under test calls the mock
+transparently.
+
+## Troubleshooting
+
+### `bats: command not found`
+
+Bats is not installed. See [Installing Bats](#installing-bats) above.
+
+### Tests fail with `permission denied`
+
+The scripts under `.github/scripts/` must be executable:
+
+```bash
+chmod +x .github/scripts/*.sh
+```
+
+### A test fails unexpectedly
+
+Run with `set -x` tracing to see each command:
+
+```bash
+bats --tap .github/scripts/tests/cherry-pick-to-release.bats \
+  --filter "name of failing test" 2>&1
+```
+
+Or add `echo "DEBUG: $variable" >&3` inside a test to print to the terminal (file descriptor 3 is
+bats's "direct to terminal" channel).
diff --git a/.github/scripts/tests/cherry-pick-to-release.bats b/.github/scripts/tests/cherry-pick-to-release.bats
new file mode 100644
index 0000000000..b8d40a3b3e
--- /dev/null
+++ b/.github/scripts/tests/cherry-pick-to-release.bats
@@ -0,0 +1,294 @@
+#!/usr/bin/env bats
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# Tests for cherry-pick-to-release.sh
+#
+# Run with:  bats .github/scripts/tests/cherry-pick-to-release.bats
+#
+# NOTE: These tests mock git and gh commands to validate the script's logic
+# without requiring a real repository or GitHub API access.
+#
+# Dependencies: bats-core (https://github.com/bats-core/bats-core)
+#
+#################################################################################
+
+# Path to the script under test (relative to repo root).
+SCRIPT=".github/scripts/cherry-pick-to-release.sh"
+
+# ── Helpers ──────────────────────────────────────────────────────────────────
+
+setup() {
+  # Create a directory for mock binaries that override real git/gh.
+  STUB_DIR="$(mktemp -d)"
+  export PATH="${STUB_DIR}:${PATH}"
+
+  # Defaults — individual tests override as needed.
+  export VERSION="7.0.1"
+  export MERGE_COMMIT_SHA="abc123def456"
+  export PR_NUMBER="42"
+  export PR_TITLE="Fix connection timeout"
+  export GH_TOKEN="fake-token"
+  export GITHUB_REPOSITORY="dotnet/SqlClient"
+  export GITHUB_OUTPUT="$(mktemp)"
+}
+
+teardown() {
+  rm -rf "${STUB_DIR}"
+  rm -f "${GITHUB_OUTPUT}"
+}
+
+# Write a mock 'git' script.  Each call to the mock appends a log line so
+# tests can verify which git subcommands were executed and with what args.
+write_git_mock() {
+  local body="$1"
+  cat > "${STUB_DIR}/git" <<STUB
+#!/usr/bin/env bash
+echo "GIT: \$*" >> "${STUB_DIR}/git.log"
+${body}
+STUB
+  chmod +x "${STUB_DIR}/git"
+}
+
+# Write a mock 'gh' script.
+write_gh_mock() {
+  local body="$1"
+  cat > "${STUB_DIR}/gh" <<STUB
+#!/usr/bin/env bash
+echo "GH: \$*" >> "${STUB_DIR}/gh.log"
+${body}
+STUB
+  chmod +x "${STUB_DIR}/gh"
+}
+
+# ── --help flag ──────────────────────────────────────────────────────────────
+
+@test "prints help text with --help" {
+  run bash "${SCRIPT}" --help
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"Cherry-picks a merge commit"* ]]
+  [[ "$output" == *"REQUIRED ENVIRONMENT VARIABLES"* ]]
+}
+
+@test "prints help text with -h" {
+  run bash "${SCRIPT}" -h
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"Cherry-picks"* ]]
+}
+
+# ── Input validation ─────────────────────────────────────────────────────────
+
+@test "fails when VERSION is unset" {
+  unset VERSION
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"VERSION"* ]]
+}
+
+@test "fails when MERGE_COMMIT_SHA is unset" {
+  unset MERGE_COMMIT_SHA
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"MERGE_COMMIT_SHA"* ]]
+}
+
+@test "fails when PR_NUMBER is unset" {
+  unset PR_NUMBER
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"PR_NUMBER"* ]]
+}
+
+@test "fails when PR_TITLE is unset" {
+  unset PR_TITLE
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"PR_TITLE"* ]]
+}
+
+@test "fails when GITHUB_REPOSITORY is unset" {
+  unset GITHUB_REPOSITORY
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"GITHUB_REPOSITORY"* ]]
+}
+
+# ── Version parsing ─────────────────────────────────────────────────────────
+
+@test "derives release/7.0 from version 7.0.1" {
+  write_git_mock '
+    if [[ "$1" == "fetch" ]]; then exit 0; fi
+    if [[ "$1" == "cherry" ]]; then echo "+ abc123"; exit 0; fi
+    if [[ "$1" == "checkout" ]]; then exit 0; fi
+    if [[ "$1" == "rev-list" ]]; then echo "abc123 parent1"; exit 0; fi
+    if [[ "$1" == "cherry-pick" ]]; then exit 0; fi
+    if [[ "$1" == "push" ]]; then exit 0; fi
+    exit 0
+  '
+  write_gh_mock '
+    if [[ "$1" == "api" ]]; then echo "7.0.1"; exit 0; fi
+    if [[ "$1" == "pr" ]]; then exit 0; fi
+    exit 0
+  '
+
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  # Verify the git fetch targeted release/7.0.
+  grep -q "GIT: fetch origin release/7.0" "${STUB_DIR}/git.log"
+}
+
+@test "derives release/8.0 from version 8.0.0" {
+  export VERSION="8.0.0"
+  write_git_mock '
+    if [[ "$1" == "fetch" ]]; then exit 0; fi
+    if [[ "$1" == "cherry" ]]; then echo "+ abc123"; exit 0; fi
+    if [[ "$1" == "checkout" ]]; then exit 0; fi
+    if [[ "$1" == "rev-list" ]]; then echo "abc123 parent1"; exit 0; fi
+    if [[ "$1" == "cherry-pick" ]]; then exit 0; fi
+    if [[ "$1" == "push" ]]; then exit 0; fi
+    exit 0
+  '
+  write_gh_mock '
+    if [[ "$1" == "api" ]]; then echo "8.0.0"; exit 0; fi
+    if [[ "$1" == "pr" ]]; then exit 0; fi
+    exit 0
+  '
+
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  grep -q "GIT: fetch origin release/8.0" "${STUB_DIR}/git.log"
+}
+
+@test "fails on unparseable version" {
+  export VERSION="bad"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"Could not parse"* ]]
+}
+
+# ── Already-applied detection ───────────────────────────────────────────────
+
+@test "exits cleanly when commit is already applied" {
+  write_git_mock '
+    if [[ "$1" == "fetch" ]]; then exit 0; fi
+    # git cherry: "-" prefix means patch is already applied.
+    if [[ "$1" == "cherry" ]]; then echo "- abc123def456"; exit 0; fi
+    exit 0
+  '
+
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"already applied"* ]]
+  # Should NOT have attempted a cherry-pick.
+  ! grep -q "GIT: cherry-pick" "${STUB_DIR}/git.log"
+}
+
+# ── Squash-merge detection (single parent) ──────────────────────────────────
+
+@test "does not use --mainline for squash merges" {
+  write_git_mock '
+    if [[ "$1" == "fetch" ]]; then exit 0; fi
+    if [[ "$1" == "cherry" ]]; then echo "+ abc123"; exit 0; fi
+    if [[ "$1" == "checkout" ]]; then exit 0; fi
+    # Single parent: rev-list outputs "sha parent1" (2 fields → 1 parent).
+    if [[ "$1" == "rev-list" ]]; then echo "abc123def456 parent1"; exit 0; fi
+    if [[ "$1" == "cherry-pick" ]]; then exit 0; fi
+    if [[ "$1" == "push" ]]; then exit 0; fi
+    exit 0
+  '
+  write_gh_mock '
+    if [[ "$1" == "api" ]]; then echo "7.0.1"; exit 0; fi
+    if [[ "$1" == "pr" ]]; then exit 0; fi
+    exit 0
+  '
+
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"single parent"* ]]
+  # cherry-pick should NOT include --mainline.
+  grep "GIT: cherry-pick" "${STUB_DIR}/git.log" | grep -qv "\-\-mainline"
+}
+
+# ── True merge detection (multiple parents) ─────────────────────────────────
+
+@test "uses --mainline 1 for true merge commits" {
+  write_git_mock '
+    if [[ "$1" == "fetch" ]]; then exit 0; fi
+    if [[ "$1" == "cherry" ]]; then echo "+ abc123"; exit 0; fi
+    if [[ "$1" == "checkout" ]]; then exit 0; fi
+    # Two parents: rev-list outputs "sha parent1 parent2" (3 fields → 2 parents).
+    if [[ "$1" == "rev-list" ]]; then echo "abc123def456 parent1 parent2"; exit 0; fi
+    if [[ "$1" == "cherry-pick" ]]; then exit 0; fi
+    if [[ "$1" == "push" ]]; then exit 0; fi
+    exit 0
+  '
+  write_gh_mock '
+    if [[ "$1" == "api" ]]; then echo "7.0.1"; exit 0; fi
+    if [[ "$1" == "pr" ]]; then exit 0; fi
+    exit 0
+  '
+
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"--mainline 1"* ]]
+}
+
+# ── Milestone lookup ────────────────────────────────────────────────────────
+
+@test "warns when milestone does not exist" {
+  write_git_mock '
+    if [[ "$1" == "fetch" ]]; then exit 0; fi
+    if [[ "$1" == "cherry" ]]; then echo "+ abc123"; exit 0; fi
+    if [[ "$1" == "checkout" ]]; then exit 0; fi
+    if [[ "$1" == "rev-list" ]]; then echo "abc123def456 parent1"; exit 0; fi
+    if [[ "$1" == "cherry-pick" ]]; then exit 0; fi
+    if [[ "$1" == "push" ]]; then exit 0; fi
+    if [[ "$1" == "config" ]]; then exit 0; fi
+    exit 0
+  '
+  # gh api returns a milestone that does NOT match VERSION (7.0.1).
+  write_gh_mock '
+    if [[ "$1" == "api" ]]; then echo "6.0.0"; exit 0; fi
+    if [[ "$1" == "pr" ]]; then exit 0; fi
+    exit 0
+  '
+
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"does not exist"* ]]
+}
+
+# ── Conflict handling ───────────────────────────────────────────────────────
+
+@test "creates CONFLICTS PR when cherry-pick fails" {
+  write_git_mock '
+    if [[ "$1" == "fetch" ]]; then exit 0; fi
+    if [[ "$1" == "cherry" ]]; then echo "+ abc123"; exit 0; fi
+    if [[ "$1" == "checkout" ]]; then exit 0; fi
+    if [[ "$1" == "rev-list" ]]; then echo "abc123def456 parent1"; exit 0; fi
+    # cherry-pick fails with conflicts.
+    if [[ "$1" == "cherry-pick" ]]; then
+      if [[ "$2" == "--abort" ]]; then exit 0; fi
+      exit 1
+    fi
+    if [[ "$1" == "commit" ]]; then exit 0; fi
+    if [[ "$1" == "push" ]]; then exit 0; fi
+    exit 0
+  '
+  write_gh_mock '
+    if [[ "$1" == "api" ]]; then echo "7.0.1"; exit 0; fi
+    if [[ "$1" == "pr" ]]; then exit 0; fi
+    exit 0
+  '
+
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"failed due to conflicts"* ]]
+  # Should have called cherry-pick --abort.
+  grep -q "GIT: cherry-pick --abort" "${STUB_DIR}/git.log"
+  # Should have created an empty commit.
+  grep -q "GIT: commit --allow-empty" "${STUB_DIR}/git.log"
+}
diff --git a/.github/scripts/tests/extract-hotfix-versions.bats b/.github/scripts/tests/extract-hotfix-versions.bats
new file mode 100644
index 0000000000..e0767ffd04
--- /dev/null
+++ b/.github/scripts/tests/extract-hotfix-versions.bats
@@ -0,0 +1,244 @@
+#!/usr/bin/env bats
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# Tests for extract-hotfix-versions.sh
+#
+# Run with:  bats .github/scripts/tests/extract-hotfix-versions.bats
+#
+# Dependencies: bats-core (https://github.com/bats-core/bats-core)
+#
+#################################################################################
+
+# Path to the script under test (relative to repo root).
+SCRIPT=".github/scripts/extract-hotfix-versions.sh"
+
+# ── Helpers ──────────────────────────────────────────────────────────────────
+
+setup() {
+  # Create a temporary GITHUB_OUTPUT file for each test.
+  export GITHUB_OUTPUT
+  GITHUB_OUTPUT="$(mktemp)"
+
+  # Defaults — individual tests override as needed.
+  export EVENT_ACTION="closed"
+  export EVENT_LABEL=""
+  export PR_NUMBER="42"
+  export GH_TOKEN="fake-token"
+  export GITHUB_REPOSITORY="dotnet/SqlClient"
+}
+
+teardown() {
+  rm -f "${GITHUB_OUTPUT}"
+}
+
+# Read the 'versions' output written to GITHUB_OUTPUT.
+get_versions() {
+  grep '^versions=' "${GITHUB_OUTPUT}" | head -1 | cut -d= -f2-
+}
+
+# ── --help flag ──────────────────────────────────────────────────────────────
+
+@test "prints help text with --help" {
+  run bash "${SCRIPT}" --help
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"Parses"* ]]
+  [[ "$output" == *"REQUIRED ENVIRONMENT VARIABLES"* ]]
+}
+
+@test "prints help text with -h" {
+  run bash "${SCRIPT}" -h
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"Parses"* ]]
+}
+
+# ── Input validation ─────────────────────────────────────────────────────────
+
+@test "fails when LABELS is unset" {
+  unset LABELS
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"LABELS"* ]]
+}
+
+@test "fails when EVENT_ACTION is unset" {
+  export LABELS="Hotfix 7.0.1"
+  unset EVENT_ACTION
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"EVENT_ACTION"* ]]
+}
+
+@test "fails when PR_NUMBER is unset" {
+  export LABELS="Hotfix 7.0.1"
+  unset PR_NUMBER
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"PR_NUMBER"* ]]
+}
+
+# ── Closed event: single label ──────────────────────────────────────────────
+
+@test "closed event: extracts single Hotfix label" {
+  export LABELS="Hotfix 7.0.1"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [ "$(get_versions)" = '["7.0.1"]' ]
+}
+
+@test "closed event: ignores non-hotfix labels" {
+  export LABELS="bug,Hotfix 7.0.1,enhancement"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [ "$(get_versions)" = '["7.0.1"]' ]
+}
+
+# ── Closed event: multiple labels ───────────────────────────────────────────
+
+@test "closed event: extracts multiple Hotfix labels" {
+  export LABELS="Hotfix 7.0.1,Hotfix 8.0.0"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [ "$(get_versions)" = '["7.0.1","8.0.0"]' ]
+}
+
+@test "closed event: extracts hotfix labels mixed with other labels" {
+  export LABELS="bug,Hotfix 7.0.1,enhancement,Hotfix 8.0.0,docs"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [ "$(get_versions)" = '["7.0.1","8.0.0"]' ]
+}
+
+# ── Closed event: malformed labels ──────────────────────────────────────────
+
+@test "closed event: rejects malformed Hotfix labels (no patch)" {
+  export LABELS="Hotfix 7.0"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"No valid"* ]]
+}
+
+@test "closed event: rejects Hotfix label with text suffix" {
+  export LABELS="Hotfix 7.0.1-beta"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"No valid"* ]]
+}
+
+@test "closed event: rejects Hotfix label with non-numeric version" {
+  export LABELS="Hotfix abc"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"No valid"* ]]
+}
+
+@test "closed event: fails when no labels present" {
+  export LABELS=""
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+}
+
+# ── Labeled event: basic behavior ───────────────────────────────────────────
+
+@test "labeled event: processes valid newly added label" {
+  export EVENT_ACTION="labeled"
+  export EVENT_LABEL="Hotfix 7.0.1"
+  export LABELS="Hotfix 7.0.1,Hotfix 8.0.0"
+
+  # Mock gh to report no existing branch or PR.
+  # The script now uses 'gh api' for branch checks (no git checkout in this job).
+  local stub_dir
+  stub_dir="$(mktemp -d)"
+  cat > "${stub_dir}/gh" <<'STUB'
+#!/usr/bin/env bash
+# gh api repos/.../git/ref/heads/...: exit 1 (branch not found)
+# gh pr list: return "0" PRs
+if [[ "$1" == "api" && "$2" == repos/*/git/ref/heads/* ]]; then
+  exit 1
+fi
+echo "0"
+STUB
+  chmod +x "${stub_dir}/gh"
+
+  export PATH="${stub_dir}:${PATH}"
+  run bash "${SCRIPT}"
+  rm -rf "${stub_dir}"
+
+  [ "$status" -eq 0 ]
+  [ "$(get_versions)" = '["7.0.1"]' ]
+}
+
+@test "labeled event: skips non-hotfix label" {
+  export EVENT_ACTION="labeled"
+  export EVENT_LABEL="bug"
+  export LABELS="bug,Hotfix 7.0.1"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [ "$(get_versions)" = '[]' ]
+}
+
+@test "labeled event: skips malformed hotfix label" {
+  export EVENT_ACTION="labeled"
+  export EVENT_LABEL="Hotfix 7.0"
+  export LABELS="Hotfix 7.0"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [ "$(get_versions)" = '[]' ]
+}
+
+# ── Labeled event: duplicate detection ──────────────────────────────────────
+
+@test "labeled event: skips when cherry-pick branch already exists" {
+  export EVENT_ACTION="labeled"
+  export EVENT_LABEL="Hotfix 7.0.1"
+  export LABELS="Hotfix 7.0.1"
+
+  local stub_dir
+  stub_dir="$(mktemp -d)"
+  # gh api returns success — branch exists on the remote.
+  cat > "${stub_dir}/gh" <<'STUB'
+#!/usr/bin/env bash
+if [[ "$1" == "api" && "$2" == repos/*/git/ref/heads/* ]]; then
+  exit 0
+fi
+echo "0"
+STUB
+  chmod +x "${stub_dir}/gh"
+  export PATH="${stub_dir}:${PATH}"
+
+  run bash "${SCRIPT}"
+  rm -rf "${stub_dir}"
+
+  [ "$status" -eq 0 ]
+  [ "$(get_versions)" = '[]' ]
+  [[ "$output" == *"already exists"* ]]
+}
+
+@test "labeled event: skips when cherry-pick PR already exists" {
+  export EVENT_ACTION="labeled"
+  export EVENT_LABEL="Hotfix 7.0.1"
+  export LABELS="Hotfix 7.0.1"
+
+  local stub_dir
+  stub_dir="$(mktemp -d)"
+  # gh api for branch check returns 1 (not found), but pr list returns 1 PR.
+  cat > "${stub_dir}/gh" <<'STUB'
+#!/usr/bin/env bash
+if [[ "$1" == "api" && "$2" == repos/*/git/ref/heads/* ]]; then
+  exit 1
+fi
+echo "1"
+STUB
+  chmod +x "${stub_dir}/gh"
+  export PATH="${stub_dir}:${PATH}"
+
+  run bash "${SCRIPT}"
+  rm -rf "${stub_dir}"
+
+  [ "$status" -eq 0 ]
+  [ "$(get_versions)" = '[]' ]
+  [[ "$output" == *"already exists"* ]]
+}
diff --git a/.github/workflows/cherry-pick-hotfix.yml b/.github/workflows/cherry-pick-hotfix.yml
new file mode 100644
index 0000000000..9110a58fa2
--- /dev/null
+++ b/.github/workflows/cherry-pick-hotfix.yml
@@ -0,0 +1,113 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# Cherry-pick Hotfix to Release Branch
+#
+# Automatically cherry-picks merged PRs into release branches when a
+# "Hotfix <version>" label is present. Supports multiple hotfix labels on
+# a single PR — each one produces an independent cherry-pick PR targeting
+# the corresponding release/<version> branch.
+#
+# Usage:
+#   1. Merge a PR to the default branch.
+#   2. Add a "Hotfix <version>" label (e.g. "Hotfix 7.0.1") either before
+#      or after merging.
+#   3. The workflow derives the release branch from the label's major.minor
+#      version (e.g. "Hotfix 7.0.1" → release/7.0) and creates a cherry-pick
+#      PR prefixed with "[<version> Cherry-pick]".
+#   4. If the cherry-pick has conflicts, a placeholder PR is opened with
+#      "[<version> Cherry-pick - CONFLICTS]" and manual resolution steps.
+#
+#################################################################################
+
+name: Cherry-pick Hotfix to release branch
+
+# Triggers:
+#   - 'closed': fires at merge time — if a "Hotfix <version>" label is already present,
+#     the cherry-pick runs immediately.
+#   - 'labeled': fires when a label is added after merge — allows retroactive cherry-picks
+#     by adding the label to an already-merged PR.
+on:
+  pull_request_target:
+    types: [closed, labeled]
+
+# 'contents: write' is needed to push the cherry-pick branch.
+# 'pull-requests: write' is needed to create the new PR via the GitHub CLI.
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  # First job: extract all hotfix versions from the PR labels and emit them as
+  # a JSON array so the matrix strategy can fan out one job per version.
+  detect-versions:
+    runs-on: ubuntu-latest
+    # Only fire for merged PRs targeting the default branch that have at least
+    # one "Hotfix *" label.  The default-branch guard prevents recursive
+    # cherry-picks when a cherry-pick PR is merged into a release branch.
+    if: >-
+      github.event.pull_request.merged == true &&
+      github.event.pull_request.base.ref == github.event.repository.default_branch &&
+      join(github.event.pull_request.labels.*.name, ' ') != '' &&
+      contains(join(github.event.pull_request.labels.*.name, ','), 'Hotfix ')
+    outputs:
+      versions: ${{ steps.extract.outputs.versions }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          # Only the scripts directory is needed; skip full history.
+          sparse-checkout: .github/scripts
+          sparse-checkout-cone-mode: false
+
+      - name: Extract hotfix versions from labels
+        id: extract
+        env:
+          # Pass label names via env to avoid script injection from label text.
+          LABELS: ${{ join(github.event.pull_request.labels.*.name, ',') }}
+          # For the 'labeled' event, this is the single label that was just added.
+          # For the 'closed' event this is empty, meaning all labels are processed.
+          EVENT_LABEL: ${{ github.event.label.name || '' }}
+          EVENT_ACTION: ${{ github.event.action }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: bash "${GITHUB_WORKSPACE}/.github/scripts/extract-hotfix-versions.sh"
+
+  # Second job: runs once per detected version, cherry-picking the merge commit
+  # into each target release branch.
+  cherry-pick:
+    needs: detect-versions
+    if: needs.detect-versions.outputs.versions != '[]'
+    runs-on: ubuntu-latest
+    strategy:
+      # Don't cancel other cherry-picks if one version fails.
+      fail-fast: false
+      matrix:
+        version: ${{ fromJson(needs.detect-versions.outputs.versions) }}
+    name: Cherry-pick to release branch (${{ matrix.version }})
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          # Full history is required so the merge commit and target branch are available
+          # for the cherry-pick operation.
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Configure git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Cherry-pick and create PR
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MERGE_COMMIT_SHA: ${{ github.event.pull_request.merge_commit_sha }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_TITLE: ${{ github.event.pull_request.title }}
+          VERSION: ${{ matrix.version }}
+        run: bash "${GITHUB_WORKSPACE}/.github/scripts/cherry-pick-to-release.sh"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 464c0401f0..c1e985ea03 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -23,6 +23,7 @@ on:
       - main
       - feat/**
       - dev/**
+      - release/**
 
   # Scan weekly on Saturdays at 23:33 UTC
   schedule:
diff --git a/AGENTS.md b/AGENTS.md
index 56d7555c99..690e9c9c8d 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -54,6 +54,15 @@ This repository provides reusable prompts in `.github/prompts/` for common maint
 6. **Performance Optimization**: Use pooling, async, efficient allocations
 7. **Observability**: EventSource tracing, meaningful errors
 
+## Branch Naming
+
+All branches created by AI agents **must** live under the `dev/automation/` prefix. Use a descriptive suffix, for example:
+
+- `dev/automation/fix-connection-timeout`
+- `dev/automation/add-json-type-tests`
+
+Do **not** create branches directly under `main`, `dev/`, or any other top-level prefix.
+
 ## Common Tasks
 
 ### Bug Fix Workflow
diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
index d38fb14d57..98cac1bcdd 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
@@ -14,8 +14,8 @@
 # It runs via CI push triggers and schedules and uses the Release build
 # configuration:
 #
-#   - Commits to GitHub main
-#   - Commits to ADO internal/main
+#   - Commits to GitHub main and release/* branches
+#   - Commits to ADO internal/main and internal/release/* branches
 #   - Weekdays at 03:00 UTC on GitHub main
 #   - Thursdays at 07:00 UTC on ADO internal/main
 #
@@ -55,13 +55,15 @@ trigger:
 
   branches:
     include:
-    # GitHub main branch.
-    - main
+      # GitHub main and release branches.
+      - main
+      - release/*
 
-    # ADO internal/main branch.
-    - internal/main
+      # ADO main and release branches.
+      - internal/main
+      - internal/release/*
 
-# Trigger this pipline on a schedule.
+# Trigger this pipeline on a schedule.
 schedules:
 
   # GitHub main on weekdays
diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
index 7fef476e59..7068c9693c 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
@@ -14,8 +14,8 @@
 # It runs via CI push triggers and schedules and uses the Release build
 # configuration:
 #
-#   - Commits to GitHub main
-#   - Commits to ADO internal/main
+#   - Commits to GitHub main and release/* branches
+#   - Commits to ADO internal/main and internal/release/* branches
 #   - Weekdays at 01:00 UTC on GitHub main
 #   - Thursdays at 05:00 UTC on ADO internal/main
 #
@@ -55,13 +55,15 @@ trigger:
 
   branches:
     include:
-    # GitHub main branch.
-    - main
+      # GitHub main and release branches.
+      - main
+      - release/*
 
-    # ADO internal/main branch.
-    - internal/main
+      # ADO main and release branches.
+      - internal/main
+      - internal/release/*
 
-# Trigger this pipline on a schedule.
+# Trigger this pipeline on a schedule.
 schedules:
 
   # GitHub main on weekdays
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index c454da710a..32921a733e 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -11,8 +11,9 @@
 #   - Microsoft.Data.SqlClient
 #   - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
 #
-# It is triggered by pushes to PRs that target dev/ and feature/ branches, and
-# the main branch in GitHub.
+# It is triggered by pushes to PRs that target the main, dev/*, feat/*, and
+# release/* branches in GitHub.  The dev/* pattern includes dev/automation/*
+# branches created by AI agents.
 #
 # It maps to the "PR-SqlClient-Package" pipeline in the Public project:
 #
@@ -33,6 +34,7 @@ pr:
       - dev/*
       - feat/*
       - main
+      - release/*
 
   paths:
     include:
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index 539d03fe82..738f8c1b6a 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -11,8 +11,9 @@
 #   - Microsoft.Data.SqlClient
 #   - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
 #
-# It is triggered by pushes to PRs that target dev/ and feature/ branches, and
-# the main branch in GitHub.
+# It is triggered by pushes to PRs that target the main, dev/*, feat/*, and
+# release/* branches in GitHub.  The dev/* pattern includes dev/automation/*
+# branches created by AI agents.
 #
 # It maps to the "PR-SqlClient-Project" pipeline in the Public project:
 #
@@ -33,6 +34,7 @@ pr:
       - dev/*
       - feat/*
       - main
+      - release/*
 
   paths:
     include:

From 1ec76754d94bc2b452a4cc3a055a0c7312063efd Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 7 Apr 2026 06:54:39 -0300
Subject: [PATCH 023/298] Extract SqlBulkCopy column names using dynamic SQL
 (#4092)

Co-authored-by: Edward Neal <55035479+edwardneal@users.noreply.github.com>
---
 .../Microsoft/Data/SqlClient/SqlBulkCopy.cs   | 78 ++++++++++++-------
 .../ManualTests/DataCommon/DataTestUtility.cs | 15 +++-
 .../CertificateTest.cs                        | 24 +++++-
 .../CertificateTestWithTdsServer.cs           |  2 +-
 .../SQL/SqlBulkCopyTest/CopyAllFromReader.cs  |  4 +-
 .../SQL/SqlBulkCopyTest/SqlGraphTables.cs     |  2 +-
 .../SqlBulkCopyTest/TestBulkCopyWithUTF8.cs   | 21 ++++-
 7 files changed, 103 insertions(+), 43 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
index 710d81045f..75cde1c56f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -472,29 +472,51 @@ private string CreateInitialQuery()
             }
             else if (!string.IsNullOrEmpty(CatalogName))
             {
-                CatalogName = SqlServerEscapeHelper.EscapeIdentifier(CatalogName);
+                CatalogName = SqlServerEscapeHelper.EscapeStringAsLiteral(SqlServerEscapeHelper.EscapeIdentifier(CatalogName));
             }
 
             string objectName = ADP.BuildMultiPartName(parts);
             string escapedObjectName = SqlServerEscapeHelper.EscapeStringAsLiteral(objectName);
-            // Specify the column names explicitly. This is to ensure that we can map to hidden columns (e.g. columns in temporal tables.)
-            // If the target table doesn't exist, OBJECT_ID will return NULL and @Column_Names will remain non-null. The subsequent SELECT *
-            // query will then continue to fail with "Invalid object name" rather than with an unusual error because the query being executed
-            // is NULL.
-            // Some hidden columns (e.g. SQL Graph columns) cannot be selected, so we need to exclude them explicitly.
+            // Specify the column names explicitly. This is to ensure that we can map to hidden
+            // columns (e.g. columns in temporal tables.) If the target table doesn't exist,
+            // OBJECT_ID will return NULL and @Column_Names will remain non-null. The subsequent
+            // SELECT * query will then continue to fail with "Invalid object name" rather than with
+            // an unusual error because the query being executed is NULL.
+            //
+            // Some hidden columns (e.g. SQL Graph columns) cannot be selected, so we need to
+            // exclude them explicitly.  The graph_type values excluded below are internal graph
+            // columns that cannot be selected directly:
+            //
+            //   1 = GRAPH_ID
+            //   3 = GRAPH_FROM_ID
+            //   4 = GRAPH_FROM_OBJ_ID
+            //   6 = GRAPH_TO_ID
+            //   7 = GRAPH_TO_OBJ_ID
+            //
+            // See: https://learn.microsoft.com/sql/relational-databases/graphs/sql-graph-architecture#syscolumns
+            //
+            // The column-name query is built as dynamic SQL and executed via sp_executesql so
+            // that it is not compiled (and rejected) on SQL Server versions that lack the
+            // graph_type column (e.g. SQL 2016).  CatalogName and escapedObjectName are
+            // interpolated directly into the SQL string because SQL Server does not allow
+            // identifiers (database/schema/table names) to be passed as parameters.  Both
+            // values are escaped via SqlServerEscapeHelper before interpolation.
             return $"""
 SELECT @@TRANCOUNT;
 
+DECLARE @Object_ID INT = OBJECT_ID('{escapedObjectName}');
+DECLARE @Column_Name_Query NVARCHAR(MAX);
 DECLARE @Column_Names NVARCHAR(MAX) = NULL;
 IF EXISTS (SELECT TOP 1 * FROM sys.all_columns WHERE [object_id] = OBJECT_ID('sys.all_columns') AND [name] = 'graph_type')
 BEGIN
-    SELECT @Column_Names = COALESCE(@Column_Names + ', ', '') + QUOTENAME([name]) FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = OBJECT_ID('{escapedObjectName}') AND COALESCE([graph_type], 0) NOT IN (1, 3, 4, 6, 7) ORDER BY [column_id] ASC;
+    SET @Column_Name_Query = N'SELECT @Column_Names = COALESCE(@Column_Names + '', '', '''') + QUOTENAME([name]) FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) NOT IN (1, 3, 4, 6, 7) ORDER BY [column_id] ASC;';
 END
 ELSE
 BEGIN
-    SELECT @Column_Names = COALESCE(@Column_Names + ', ', '') + QUOTENAME([name]) FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = OBJECT_ID('{escapedObjectName}') ORDER BY [column_id] ASC;
+    SET @Column_Name_Query = N'SELECT @Column_Names = COALESCE(@Column_Names + '', '', '''') + QUOTENAME([name]) FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID ORDER BY [column_id] ASC;';
 END
 
+EXEC sp_executesql @Column_Name_Query, N'@Object_ID INT, @Column_Names NVARCHAR(MAX) OUTPUT', @Object_ID = @Object_ID, @Column_Names = @Column_Names OUTPUT;
 SELECT @Column_Names = COALESCE(@Column_Names, '*');
 
 SET FMTONLY ON;
@@ -624,7 +646,7 @@ private string AnalyzeTargetAndCreateUpdateBulkCommand(BulkCopySimpleResultSet i
 
                 bool matched = false;
                 bool rejected = false;
-                
+
                 // Look for a local match for the remote column.
                 for (int j = 0; j < _localColumnMappings.Count; ++j)
                 {
@@ -644,7 +666,7 @@ private string AnalyzeTargetAndCreateUpdateBulkCommand(BulkCopySimpleResultSet i
 
                     // Remove it from our unmatched set.
                     unmatchedColumns.Remove(localColumn.DestinationColumn);
-                    
+
                     // Check for column types that we refuse to bulk load, even
                     // though we found a match.
                     //
@@ -1437,7 +1459,7 @@ private void RunParserReliably(BulkCopySimpleResultSet bulkCopyHandler = null)
             try
             {
                 // @TODO: CER Exception Handling was removed here (see GH#3581)
-                _parser.Run(RunBehavior.UntilDone, null, null, bulkCopyHandler, _stateObj);                
+                _parser.Run(RunBehavior.UntilDone, null, null, bulkCopyHandler, _stateObj);
             }
             finally
             {
@@ -1760,7 +1782,7 @@ public void WriteToServer(DbDataReader reader)
             try
             {
                 statistics = SqlStatistics.StartTimer(Statistics);
-                
+
                 ResetWriteToServerGlobalVariables();
                 _rowSource = reader;
                 _dbDataReaderRowSource = reader;
@@ -1796,13 +1818,13 @@ public void WriteToServer(IDataReader reader)
             try
             {
                 statistics = SqlStatistics.StartTimer(Statistics);
-                
+
                 ResetWriteToServerGlobalVariables();
                 _rowSource = reader;
                 _sqlDataReaderRowSource = _rowSource as SqlDataReader;
                 _dbDataReaderRowSource = _rowSource as DbDataReader;
                 _rowSourceType = ValueSourceType.IDataReader;
-                
+
                 WriteRowSourceToServerAsync(reader.FieldCount, CancellationToken.None); //It returns null since _isAsyncBulkCopy = false;
             }
             finally
@@ -1918,7 +1940,7 @@ public Task WriteToServerAsync(DataRow[] rows, CancellationToken cancellationTok
             try
             {
                 statistics = SqlStatistics.StartTimer(Statistics);
-                
+
                 ResetWriteToServerGlobalVariables();
                 if (rows.Length == 0)
                 {
@@ -1935,9 +1957,9 @@ public Task WriteToServerAsync(DataRow[] rows, CancellationToken cancellationTok
                 _rowSourceType = ValueSourceType.RowArray;
                 _rowEnumerator = rows.GetEnumerator();
                 _isAsyncBulkCopy = true;
-                
+
                 // It returns Task since _isAsyncBulkCopy = true;
-                return WriteRowSourceToServerAsync(table.Columns.Count, cancellationToken); 
+                return WriteRowSourceToServerAsync(table.Columns.Count, cancellationToken);
             }
             finally
             {
@@ -1964,19 +1986,19 @@ public Task WriteToServerAsync(DbDataReader reader, CancellationToken cancellati
             {
                 throw SQL.BulkLoadPendingOperation();
             }
-            
+
             SqlStatistics statistics = Statistics;
             try
             {
                 statistics = SqlStatistics.StartTimer(Statistics);
-                
+
                 ResetWriteToServerGlobalVariables();
                 _rowSource = reader;
                 _sqlDataReaderRowSource = reader as SqlDataReader;
                 _dbDataReaderRowSource = reader;
                 _rowSourceType = ValueSourceType.DbDataReader;
                 _isAsyncBulkCopy = true;
-                
+
                 // It returns Task since _isAsyncBulkCopy = true;
                 return WriteRowSourceToServerAsync(reader.FieldCount, cancellationToken);
             }
@@ -2016,7 +2038,7 @@ public Task WriteToServerAsync(IDataReader reader, CancellationToken cancellatio
                 _dbDataReaderRowSource = _rowSource as DbDataReader;
                 _rowSourceType = ValueSourceType.IDataReader;
                 _isAsyncBulkCopy = true;
-                
+
                 // It returns Task since _isAsyncBulkCopy = true;
                 return WriteRowSourceToServerAsync(reader.FieldCount, cancellationToken);
             }
@@ -2056,7 +2078,7 @@ public Task WriteToServerAsync(DataTable table, DataRowState rowState, Cancellat
             try
             {
                 statistics = SqlStatistics.StartTimer(Statistics);
-                
+
                 ResetWriteToServerGlobalVariables();
                 _rowStateToSkip = ((rowState == 0) || (rowState == DataRowState.Deleted)) ? DataRowState.Deleted : ~rowState | DataRowState.Deleted;
                 _rowSource = table;
@@ -2064,7 +2086,7 @@ public Task WriteToServerAsync(DataTable table, DataRowState rowState, Cancellat
                 _rowSourceType = ValueSourceType.DataTable;
                 _rowEnumerator = table.Rows.GetEnumerator();
                 _isAsyncBulkCopy = true;
-                
+
                 // It returns Task since _isAsyncBulkCopy = true;
                 return WriteRowSourceToServerAsync(table.Columns.Count, cancellationToken);
             }
@@ -2114,7 +2136,7 @@ private Task WriteRowSourceToServerAsync(int columnCount, CancellationToken ctok
 
             bool finishedSynchronously = true;
             _isBulkCopyingInProgress = true;
-            
+
             CreateOrValidateConnection(nameof(WriteToServer));
 
             SqlConnectionInternal internalConnection = _connection.GetOpenTdsConnection();
@@ -3065,11 +3087,11 @@ private void WriteToServerInternalRestAsync(CancellationToken cts, TaskCompletio
 
                         // No need to cancel timer since SqlBulkCopy creates specific task source for reconnection.
                         AsyncHelper.SetTimeoutExceptionWithState(
-                            completion: cancellableReconnectTS, 
+                            completion: cancellableReconnectTS,
                             timeout: BulkCopyTimeout,
                             state: _destinationTableName,
-                            onFailure: static state => 
-                                SQL.BulkLoadInvalidDestinationTable((string)state, SQL.CR_ReconnectTimeout()), 
+                            onFailure: static state =>
+                                SQL.BulkLoadInvalidDestinationTable((string)state, SQL.CR_ReconnectTimeout()),
                             cancellationToken: CancellationToken.None
                         );
 
@@ -3242,7 +3264,7 @@ private Task WriteToServerInternalAsync(CancellationToken ctoken)
             }
             return resultTask;
         }
-        
+
         private void ResetWriteToServerGlobalVariables()
         {
             _dataTableSource = null;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index 5bceb81b58..2e652841c9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -86,7 +86,7 @@ public static class DataTestUtility
         internal static readonly string KerberosDomainPassword = null;
 
         // SQL server Version
-        private static string s_sQLServerVersion = string.Empty;
+        private static string s_sqlServerVersion;
 
         //SQL Server EngineEdition
         private static string s_sqlServerEngineEdition;
@@ -125,9 +125,9 @@ public static string SQLServerVersion
             {
                 if (!string.IsNullOrEmpty(TCPConnectionString))
                 {
-                    s_sQLServerVersion ??= GetSqlServerProperty(TCPConnectionString, ServerProperty.ProductMajorVersion);
+                    s_sqlServerVersion ??= GetSqlServerProperty(TCPConnectionString, ServerProperty.ProductMajorVersion);
                 }
-                return s_sQLServerVersion;
+                return s_sqlServerVersion;
             }
         }
 
@@ -491,7 +491,14 @@ public static bool AreConnStringsSetup()
 
         public static bool IsSQL2019() => string.Equals("15", SQLServerVersion.Trim());
 
-        public static bool IsSQL2016() => string.Equals("14", s_sQLServerVersion.Trim());
+        public static bool IsSQL2017() => string.Equals("14", SQLServerVersion.Trim());
+
+        public static bool IsSQL2016() => string.Equals("13", SQLServerVersion.Trim());
+
+        // "At least" version checks for use as ConditionalFact/ConditionalTheory conditions.
+        public static bool IsAtLeastSQL2017() => int.TryParse(SQLServerVersion?.Trim(), out int major) && major >= 14;
+
+        public static bool IsAtLeastSQL2019() => int.TryParse(SQLServerVersion?.Trim(), out int major) && major >= 15;
 
         public static bool IsSQLAliasSetup()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs
index fbc7cd222a..32780dcfe6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs
@@ -32,7 +32,7 @@ public class CertificateTest : IDisposable
 
         // InstanceName will get replaced with an instance name in the connection string
         private static string InstanceName = "MSSQLSERVER";
-        
+
         // s_instanceNamePrefix will get replaced with MSSQL$ is there is an instance name in connection string
         private static string InstanceNamePrefix = "";
 
@@ -51,10 +51,14 @@ private static string ForceEncryptionRegistryPath
                 {
                     return $@"SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL15.{InstanceName}\MSSQLSERVER\SuperSocketNetLib";
                 }
-                if (DataTestUtility.IsSQL2016())
+                if (DataTestUtility.IsSQL2017())
                 {
                     return $@"SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL14.{InstanceName}\MSSQLSERVER\SuperSocketNetLib";
                 }
+                if (DataTestUtility.IsSQL2016())
+                {
+                    return $@"SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL13.{InstanceName}\MSSQLSERVER\SuperSocketNetLib";
+                }
                 return string.Empty;
             }
         }
@@ -196,7 +200,9 @@ private static void CreateValidCertificate(string script)
                     RedirectStandardError = true,
                     RedirectStandardOutput = true,
                     UseShellExecute = false,
-                    Arguments = $"{script} -Prefix {InstanceNamePrefix} -Instance {InstanceName}",
+                    Arguments = string.IsNullOrEmpty(InstanceNamePrefix)
+                        ? $"{script} -Instance \"{InstanceName}\""
+                        : $"{script} -Prefix \"{InstanceNamePrefix}\" -Instance \"{InstanceName}\"",
                     CreateNoWindow = false,
                     Verb = "runas"
                 }
@@ -224,7 +230,12 @@ private static void CreateValidCertificate(string script)
                     proc.Kill();
                     // allow async output to process
                     proc.WaitForExit(2000);
-                    throw new Exception($"Could not generate certificate.Error out put: {output}");
+                    throw new Exception($"Could not generate certificate. Error output: {output}");
+                }
+
+                if (proc.ExitCode != 0)
+                {
+                    throw new Exception($"Certificate generation script failed with exit code {proc.ExitCode}. Output: {output}");
                 }
             }
             else
@@ -252,6 +263,11 @@ private static string GetLocalIpAddress()
 
         private void RemoveCertificate()
         {
+            if (string.IsNullOrEmpty(_thumbprint))
+            {
+                return;
+            }
+
             using X509Store certStore = new(StoreName.Root, StoreLocation.LocalMachine);
             certStore.Open(OpenFlags.ReadWrite);
             X509Certificate2Collection certCollection = certStore.Certificates.Find(X509FindType.FindByThumbprint, _thumbprint, false);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs
index 98ce8efafa..bb1bb8b5f2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs
@@ -89,7 +89,7 @@ private static string ForceEncryptionRegistryPath
                 {
                     return $@"SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL15.{s_instanceName}\MSSQLSERVER\SuperSocketNetLib";
                 }
-                if (DataTestUtility.IsSQL2016())
+                if (DataTestUtility.IsSQL2017())
                 {
                     return $@"SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL14.{s_instanceName}\MSSQLSERVER\SuperSocketNetLib";
                 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
index 5ba727be5d..f55e512a35 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
@@ -61,9 +61,9 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersReceived"], "Unexpected BuffersReceived value.");
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersSent"], "Unexpected BuffersSent value.");
                             DataTestUtility.AssertEqualsWithDescription((long)0, stats["IduCount"], "Unexpected IduCount value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)6, stats["SelectCount"], "Unexpected SelectCount value.");
+                            DataTestUtility.AssertEqualsWithDescription((long)8, stats["SelectCount"], "Unexpected SelectCount value.");
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["ServerRoundtrips"], "Unexpected ServerRoundtrips value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)9, stats["SelectRows"], "Unexpected SelectRows value.");
+                            DataTestUtility.AssertEqualsWithDescription((long)11, stats["SelectRows"], "Unexpected SelectRows value.");
                             DataTestUtility.AssertEqualsWithDescription((long)2, stats["SumResultSets"], "Unexpected SumResultSets value.");
                             DataTestUtility.AssertEqualsWithDescription((long)0, stats["Transactions"], "Unexpected Transactions value.");
                         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
index d83693080f..837ce96e76 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SqlBulkCopyTests
 {
     public class SqlGraphTables
     {
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAtLeastSQL2017))]
         public void WriteToServer_CopyToSqlGraphNodeTable_Succeeds()
         {
             string connectionString = DataTestUtility.TCPConnectionString;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs
index 5b7112476d..da5287e831 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs
@@ -26,6 +26,13 @@ public sealed class TestBulkCopyWithUtf8 : IDisposable
         /// </summary>
         public TestBulkCopyWithUtf8()
         {
+            // xUnit instantiates the class even when ConditionalTheory conditions cause the
+            // test to be skipped, so we must guard setup that requires UTF-8 collations.
+            if (!DataTestUtility.IsAtLeastSQL2019())
+            {
+                return;
+            }
+
             using SqlConnection sourceConnection = new SqlConnection(GetConnectionString(true));
             sourceConnection.Open();
             SetupTables(sourceConnection, s_sourceTable, s_destinationTable, s_insertQuery);
@@ -36,6 +43,12 @@ public TestBulkCopyWithUtf8()
         /// </summary>
         public void Dispose()
         {
+            // Guard matches the constructor: no tables were created on older SQL versions.
+            if (!DataTestUtility.IsAtLeastSQL2019())
+            {
+                return;
+            }
+
             using SqlConnection connection = new SqlConnection(GetConnectionString(true));
             connection.Open();
             DataTestUtility.DropTable(connection, s_sourceTable);
@@ -56,7 +69,7 @@ private string GetConnectionString(bool enableMars)
 
         /// <summary>
         /// Creates source and destination tables with a varchar(max) column with a collation setting
-        /// that stores the data in UTF8 encoding and inserts the data in the source table. 
+        /// that stores the data in UTF8 encoding and inserts the data in the source table.
         /// </summary>
         private void SetupTables(SqlConnection connection, string sourceTable, string destinationTable, string insertQuery)
         {
@@ -75,7 +88,8 @@ private void SetupTables(SqlConnection connection, string sourceTable, string de
         [ConditionalTheory(typeof(DataTestUtility),
          nameof(DataTestUtility.AreConnStringsSetup),
          nameof(DataTestUtility.IsNotAzureServer),
-         nameof(DataTestUtility.IsNotAzureSynapse))]
+         nameof(DataTestUtility.IsNotAzureSynapse),
+         nameof(DataTestUtility.IsAtLeastSQL2019))]
         [InlineData(true, true)]
         [InlineData(false, true)]
         [InlineData(true, false)]
@@ -139,7 +153,8 @@ public void BulkCopy_Utf8Data_ShouldMatchSource(bool isMarsEnabled, bool enableS
         [ConditionalTheory(typeof(DataTestUtility),
          nameof(DataTestUtility.AreConnStringsSetup),
          nameof(DataTestUtility.IsNotAzureServer),
-         nameof(DataTestUtility.IsNotAzureSynapse))]
+         nameof(DataTestUtility.IsNotAzureSynapse),
+         nameof(DataTestUtility.IsAtLeastSQL2019))]
         [InlineData(true, true)]
         [InlineData(false, true)]
         [InlineData(true, false)]

From 27999d96939dcbba95145d8ac850ccda9aa9d88c Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 7 Apr 2026 12:57:52 -0300
Subject: [PATCH 024/298] Fix milestone lookup in hotfix workflow (#4148)

---
 .github/scripts/cherry-pick-to-release.sh         | 2 +-
 .github/scripts/tests/cherry-pick-to-release.bats | 4 ++++
 .github/workflows/cherry-pick-hotfix.yml          | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/scripts/cherry-pick-to-release.sh b/.github/scripts/cherry-pick-to-release.sh
index 8b3172cc50..a8612e7453 100755
--- a/.github/scripts/cherry-pick-to-release.sh
+++ b/.github/scripts/cherry-pick-to-release.sh
@@ -143,7 +143,7 @@ lookup_milestone() {
   MILESTONE_ARG=""
   MILESTONE_NOTE=""
 
-  if gh api "repos/${GITHUB_REPOSITORY}/milestones" --paginate \
+  if gh api "repos/${GITHUB_REPOSITORY}/milestones" --method GET --paginate \
       --field state=open --jq '.[].title' | grep -qx "${version}"; then
     MILESTONE_ARG="--milestone ${version}"
     echo "Milestone '${version}' found."
diff --git a/.github/scripts/tests/cherry-pick-to-release.bats b/.github/scripts/tests/cherry-pick-to-release.bats
index b8d40a3b3e..68ef3d7f8c 100644
--- a/.github/scripts/tests/cherry-pick-to-release.bats
+++ b/.github/scripts/tests/cherry-pick-to-release.bats
@@ -138,6 +138,8 @@ STUB
   [ "$status" -eq 0 ]
   # Verify the git fetch targeted release/7.0.
   grep -q "GIT: fetch origin release/7.0" "${STUB_DIR}/git.log"
+  # Milestone lookup must use GET to avoid accidentally POSTing to the create endpoint.
+  grep "GH: api repos/dotnet/SqlClient/milestones" "${STUB_DIR}/gh.log" | grep -q "\-\-method GET"
 }
 
 @test "derives release/8.0 from version 8.0.0" {
@@ -259,6 +261,8 @@ STUB
   run bash "${SCRIPT}"
   [ "$status" -eq 0 ]
   [[ "$output" == *"does not exist"* ]]
+  # Milestone lookup must use GET to avoid accidentally POSTing to the create endpoint.
+  grep "GH: api repos/dotnet/SqlClient/milestones" "${STUB_DIR}/gh.log" | grep -q "\-\-method GET"
 }
 
 # ── Conflict handling ───────────────────────────────────────────────────────
diff --git a/.github/workflows/cherry-pick-hotfix.yml b/.github/workflows/cherry-pick-hotfix.yml
index 9110a58fa2..794d8e41d3 100644
--- a/.github/workflows/cherry-pick-hotfix.yml
+++ b/.github/workflows/cherry-pick-hotfix.yml
@@ -57,7 +57,7 @@ jobs:
       versions: ${{ steps.extract.outputs.versions }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Only the scripts directory is needed; skip full history.
           sparse-checkout: .github/scripts
@@ -91,7 +91,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Full history is required so the merge commit and target branch are available
           # for the cherry-pick operation.

From 26f5c66124eab36e33dd21c93c500acbc21b805d Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Tue, 7 Apr 2026 21:50:38 +0530
Subject: [PATCH 025/298] Return correct type when invoking GetFieldType and
 GetProviderSpecificFieldType for vector float32 column (#4105)

This commit returns correct type for GetFieldType and GetProviderSpecificFieldType
---
 .../Microsoft/Data/SqlClient/SqlDataReader.cs | 21 ++++++++++
 .../VectorTest/NativeVectorFloat32Tests.cs    | 41 +++++++++++++++++--
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index 8806df9432..bf1f38da00 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -1307,6 +1307,10 @@ private Type GetFieldTypeInternal(_SqlMetaData metaData)
                     Connection.CheckGetExtendedUDTInfo(metaData, false);
                     fieldType = metaData.udt?.Type;
                 }
+                else if (metaData.type == SqlDbTypeExtensions.Vector)
+                {
+                    fieldType = GetVectorFieldType(metaData.scale);
+                }
                 else
                 { // For all other types, including Xml - use data in MetaType.
                     if (metaData.cipherMD != null)
@@ -1329,6 +1333,19 @@ private Type GetFieldTypeInternal(_SqlMetaData metaData)
             return fieldType;
         }
 
+#if !NETFRAMEWORK
+        [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
+#endif
+        private static Type GetVectorFieldType(byte vectorElementType)
+        {
+            MetaType.SqlVectorElementType elementType = (MetaType.SqlVectorElementType)vectorElementType;
+            return elementType switch
+            {
+                MetaType.SqlVectorElementType.Float32 => typeof(SqlVector<float>),
+                _ => throw SQL.VectorTypeNotSupported(elementType.ToString()),
+            };
+        }
+
         virtual internal int GetLocaleId(int i)
         {
             _SqlMetaData sqlMetaData = MetaData[i];
@@ -1422,6 +1439,10 @@ private Type GetProviderSpecificFieldTypeInternal(_SqlMetaData metaData)
                     Connection.CheckGetExtendedUDTInfo(metaData, false);
                     providerSpecificFieldType = metaData.udt?.Type;
                 }
+                else if (metaData.type == SqlDbTypeExtensions.Vector)
+                {
+                    providerSpecificFieldType = GetVectorFieldType(metaData.scale);
+                }
                 else
                 {
                     // For all other types, including Xml - use data in MetaType.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
index 2ff72bba06..0a86534112 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
@@ -29,19 +29,19 @@ public static IEnumerable<object[]> GetVectorFloat32TestData()
             yield return new object[] { 3, new SqlVector<float>(testData), testData, vectorColumnLength };
             yield return new object[] { 4, new SqlVector<float>(testData), testData, vectorColumnLength };
 
-            // Pattern 1-4 with SqlVector<float>(n)  
+            // Pattern 1-4 with SqlVector<float>(n)
             yield return new object[] { 1, SqlVector<float>.CreateNull(vectorColumnLength), Array.Empty<float>(), vectorColumnLength };
             yield return new object[] { 2, SqlVector<float>.CreateNull(vectorColumnLength), Array.Empty<float>(), vectorColumnLength };
             yield return new object[] { 3, SqlVector<float>.CreateNull(vectorColumnLength), Array.Empty<float>(), vectorColumnLength };
             yield return new object[] { 4, SqlVector<float>.CreateNull(vectorColumnLength), Array.Empty<float>(), vectorColumnLength };
 
-            // Pattern 1-4 with DBNull  
+            // Pattern 1-4 with DBNull
             yield return new object[] { 1, DBNull.Value, Array.Empty<float>(), vectorColumnLength };
             yield return new object[] { 2, DBNull.Value, Array.Empty<float>(), vectorColumnLength };
             yield return new object[] { 3, DBNull.Value, Array.Empty<float>(), vectorColumnLength };
             yield return new object[] { 4, DBNull.Value, Array.Empty<float>(), vectorColumnLength };
 
-            // Pattern 1-4 with SqlVector<float>.Null  
+            // Pattern 1-4 with SqlVector<float>.Null
             yield return new object[] { 1, SqlVector<float>.Null, Array.Empty<float>(), vectorColumnLength };
 
             // Following scenario is not supported in SqlClient.
@@ -561,6 +561,41 @@ public async Task TestBulkCopyFromSqlTableAsync(int bulkCopySourceMode)
             Assert.Equal(VectorFloat32TestData.testData.Length, vector.Length);
         }
 
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsSqlVectorSupported))]
+        public void TestGetFieldTypeReturnsSqlVectorForVectorColumn()
+        {
+            using var connection = new SqlConnection(s_connectionString);
+            connection.Open();
+
+            // Insert a row so we can query it
+            using (var insertCmd = new SqlCommand(s_insertCmdString, connection))
+            {
+                var param = insertCmd.Parameters.Add(s_vectorParamName, SqlDbTypeExtensions.Vector);
+                param.Value = new SqlVector<float>(VectorFloat32TestData.testData);
+                insertCmd.ExecuteNonQuery();
+            }
+
+            using var selectCmd = new SqlCommand(s_selectCmdString, connection);
+            using var reader = selectCmd.ExecuteReader();
+
+            // Verify GetFieldType returns SqlVector<float> for the vector column
+            Assert.Equal(typeof(SqlVector<float>), reader.GetFieldType(0));
+
+            // Verify GetProviderSpecificFieldType also returns SqlVector<float>
+            Assert.Equal(typeof(SqlVector<float>), reader.GetProviderSpecificFieldType(0));
+
+            // Verify that GetValue returns an instance consistent with GetFieldType
+            Assert.True(reader.Read(), "No data found in the table.");
+            object value = reader.GetValue(0);
+            Assert.IsType<SqlVector<float>>(value);
+            Assert.Equal(VectorFloat32TestData.testData, ((SqlVector<float>)value).Memory.ToArray());
+
+            // Verify GetFieldValue<SqlVector<float>> returns the correct typed value
+            SqlVector<float> typedValue = reader.GetFieldValue<SqlVector<float>>(0);
+            Assert.IsType<SqlVector<float>>(typedValue);
+            Assert.Equal(VectorFloat32TestData.testData, typedValue.Memory.ToArray());
+        }
+
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsSqlVectorSupported))]
         public void TestInsertVectorsFloat32WithPrepare()
         {

From e01cd138f970bf56931b5f84e5f728411219d614 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Wed, 8 Apr 2026 05:04:58 +1000
Subject: [PATCH 026/298] Replace 'as' casts with explicit casts (#4019)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../src/Microsoft/Data/SqlClient/SqlBulkCopy.cs               | 4 ++--
 .../src/Microsoft/Data/SqlClient/SqlDataReader.cs             | 2 +-
 .../src/Microsoft/Data/SqlClient/SqlDependency.cs             | 2 +-
 .../src/Microsoft/Data/SqlClient/SqlParameter.cs              | 4 ++--
 .../tests/FunctionalTests/AADAuthenticationTests.cs           | 4 ++--
 .../ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
index 75cde1c56f..cc90802f08 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -205,10 +205,10 @@ private int RowNumber
                 switch (_rowSourceType)
                 {
                     case ValueSourceType.RowArray:
-                        rowNo = ((DataTable)_dataTableSource).Rows.IndexOf(_rowEnumerator.Current as DataRow);
+                        rowNo = ((DataTable)_dataTableSource).Rows.IndexOf((DataRow)_rowEnumerator.Current);
                         break;
                     case ValueSourceType.DataTable:
-                        rowNo = ((DataTable)_rowSource).Rows.IndexOf(_rowEnumerator.Current as DataRow);
+                        rowNo = ((DataTable)_rowSource).Rows.IndexOf((DataRow)_rowEnumerator.Current);
                         break;
                     case ValueSourceType.DbDataReader:
                     case ValueSourceType.IDataReader:
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index bf1f38da00..0809f322e2 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -3125,7 +3125,7 @@ private T GetFieldValueFromSqlBufferInternal<T>(SqlBuffer data, _SqlMetaData met
                 {
                     throw SQL.JsonDocumentNotSupportedOnColumnType(metaData.column);
                 }
-                JsonDocument document = JsonDocument.Parse(data.Value as string);
+                JsonDocument document = JsonDocument.Parse(data.String);
                 return (T)(object)document;
             }
             else
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
index 10efdd9e05..94d42a3393 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
@@ -539,7 +539,7 @@ private static void GetSerializedObject(SqlClientObjRef objRef, DataContractSeri
         private static SqlDependencyProcessDispatcher GetDeserializedObject(DataContractSerializer serializer, MemoryStream stream)
         {
             object refResult = serializer.ReadObject(stream);
-            var result = RemotingServices.Unmarshal((refResult as SqlClientObjRef).GetObjRef());
+            var result = RemotingServices.Unmarshal(((SqlClientObjRef)refResult).GetObjRef());
             return result as SqlDependencyProcessDispatcher;
         }
 #endif // NETFRAMEWORK
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
index 2defc2e950..01d1131789 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
@@ -2390,11 +2390,11 @@ internal static object CoerceValue(object value, MetaType destinationType, out b
                     {
                         try
                         {
-                            value = (new SqlVector<float>(JsonSerializer.Deserialize<float[]>(value as string)) as ISqlVector).VectorPayload;
+                            value = ((ISqlVector)new SqlVector<float>(JsonSerializer.Deserialize<float[]>((string)value))).VectorPayload;
                         }
                         catch (Exception ex) when (ex is ArgumentNullException || ex is JsonException)
                         {
-                            throw ADP.InvalidJsonStringForVector(value as string, ex);
+                            throw ADP.InvalidJsonStringForVector((string)value, ex);
                         }
                     }
                     else if (
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AADAuthenticationTests.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AADAuthenticationTests.cs
index d86b6684d1..dc6d5b3d7a 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AADAuthenticationTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AADAuthenticationTests.cs
@@ -32,11 +32,11 @@ public void InvalidCombinationOfAccessToken(string description, object[] Params)
             {
                 SecureString password = new SecureString();
                 password.MakeReadOnly();
-                _credential = new SqlCredential(Params[0] as string, password);
+                _credential = new SqlCredential((string)Params[0], password);
             }
             else
             {
-                _builder[Params[0] as string] = Params[1];
+                _builder[(string)Params[0]] = Params[1];
             }
             InvalidCombinationCheck(_credential);
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
index 5559dbff8e..6d14f6fbd8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
@@ -38,7 +38,7 @@ public class PoolBlockPeriodTest
         public void TestAzureBlockingPeriod(string description, object[] Params)
         {
             string _ = description; // Using C# Discards as workaround to the XUnit warning.
-            string serverName = Params[0] as string;
+            string serverName = (string)Params[0];
             PoolBlockingPeriod? policy = null;
             if (Params.Length > 1)
             {
@@ -60,7 +60,7 @@ public void TestAzureBlockingPeriod(string description, object[] Params)
         public void TestNonAzureBlockingPeriod(string description, object[] Params)
         {
             string _ = description; // Using C# Discards as workaround to the XUnit warning.
-            string serverName = Params[0] as string;
+            string serverName = (string)Params[0];
             PoolBlockingPeriod? policy = null;
 
             if (Params.Length > 1)

From ea6091ba85a35c2c3b024c8f3d495ee8fc371352 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 7 Apr 2026 14:45:53 -0700
Subject: [PATCH 027/298] Enable User Agent feature extension (#4124)

---
 .../Data/SqlClient/LocalAppContextSwitches.cs | 24 ---------
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |  2 +-
 .../Common/LocalAppContextSwitchesHelper.cs   | 15 ------
 .../SqlClient/LocalAppContextSwitchesTest.cs  |  1 -
 .../SimulatedServerTests/ConnectionTests.cs   | 54 -------------------
 5 files changed, 1 insertion(+), 95 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
index 7694092907..16e0abb7ec 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
@@ -36,13 +36,6 @@ internal static class LocalAppContextSwitches
     private const string EnableMultiSubnetFailoverByDefaultString =
         "Switch.Microsoft.Data.SqlClient.EnableMultiSubnetFailoverByDefault";
 
-    /// <summary>
-    /// The name of the app context switch that controls whether
-    /// the user agent feature is enabled.
-    /// </summary>
-    private const string EnableUserAgentString =
-        "Switch.Microsoft.Data.SqlClient.EnableUserAgent";
-
     #if NET
     /// <summary>
     /// The name of the app context switch that controls whether
@@ -177,11 +170,6 @@ private enum SwitchValue : byte
     /// </summary>
     private static SwitchValue s_enableMultiSubnetFailoverByDefault = SwitchValue.None;
 
-    /// <summary>
-    /// The cached value of the EnableUserAgent switch.
-    /// </summary>
-    private static SwitchValue s_enableUserAgent = SwitchValue.None;
-
     #if NET
     /// <summary>
     /// The cached value of the GlobalizationInvariantMode switch.
@@ -319,18 +307,6 @@ static LocalAppContextSwitches()
             defaultValue: false,
             ref s_enableMultiSubnetFailoverByDefault);
 
-    /// <summary>
-    /// When set to true, the user agent feature is enabled and the driver will
-    /// send the user agent string to the server.
-    ///
-    /// The default value of this switch is false.
-    /// </summary>
-    public static bool EnableUserAgent =>
-        AcquireAndReturn(
-            EnableUserAgentString,
-            defaultValue: false,
-            ref s_enableUserAgent);
-
     #if NET
     /// <summary>
     /// .NET Core 2.0 and up supports Globalization Invariant mode, which
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 94281b4998..088d41d94d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -9663,7 +9663,7 @@ private int ApplyFeatureExData(TdsEnums.FeatureExtension requestedFeatures,
                 checked
                 {
                     // NOTE: As part of TDS spec UserAgent feature extension should be the first feature extension in the list.
-                    if (LocalAppContextSwitches.EnableUserAgent && ((requestedFeatures & TdsEnums.FeatureExtension.UserAgent) != 0))
+                    if ((requestedFeatures & TdsEnums.FeatureExtension.UserAgent) != 0)
                     {
                         length += WriteUserAgentFeatureRequest(userAgent, write);
                     }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
index 4a0cdf67de..8102f47d51 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
@@ -43,7 +43,6 @@ public sealed class LocalAppContextSwitchesHelper : IDisposable
     private readonly bool? _disableTnirByDefaultOriginal;
     #endif
     private readonly bool? _enableMultiSubnetFailoverByDefaultOriginal;
-    private readonly bool? _enableUserAgentOriginal;
     #if NET
     private readonly bool? _globalizationInvariantModeOriginal;
     #endif
@@ -93,8 +92,6 @@ public LocalAppContextSwitchesHelper()
             #endif
             _enableMultiSubnetFailoverByDefaultOriginal =
                 GetSwitchValue("s_enableMultiSubnetFailoverByDefault");
-            _enableUserAgentOriginal =
-                GetSwitchValue("s_enableUserAgent");
             #if NET
             _globalizationInvariantModeOriginal =
                 GetSwitchValue("s_globalizationInvariantMode");
@@ -149,9 +146,6 @@ public void Dispose()
             SetSwitchValue(
                 "s_enableMultiSubnetFailoverByDefault",
                 _enableMultiSubnetFailoverByDefaultOriginal);
-            SetSwitchValue(
-                "s_enableUserAgent",
-                _enableUserAgentOriginal);
             #if NET
             SetSwitchValue(
                 "s_globalizationInvariantMode",
@@ -228,15 +222,6 @@ public bool? EnableMultiSubnetFailoverByDefault
         set => SetSwitchValue("s_enableMultiSubnetFailoverByDefault", value);
     }
 
-    /// <summary>
-    /// Get or set the EnableUserAgent switch value.
-    /// </summary>
-    public bool? EnableUserAgent
-    {
-        get => GetSwitchValue("s_enableUserAgent");
-        set => SetSwitchValue("s_enableUserAgent", value);
-    }
-
     #if NET
     /// <summary>
     /// Get or set the GlobalizationInvariantMode switch value.
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
index 59445a26b6..a5db02faa0 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
@@ -28,7 +28,6 @@ public void TestDefaultAppContextSwitchValues()
         Assert.False(LocalAppContextSwitches.UseConnectionPoolV2);
         Assert.False(LocalAppContextSwitches.TruncateScaledDecimal);
         Assert.False(LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner);
-        Assert.False(LocalAppContextSwitches.EnableUserAgent);
         Assert.False(LocalAppContextSwitches.EnableMultiSubnetFailoverByDefault);
         #if NET
         Assert.False(LocalAppContextSwitches.GlobalizationInvariantMode);
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index 21a6cb65de..e3a4e26957 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -841,10 +841,6 @@ public void TestConnWithVectorFeatExtVersionNegotiation(bool expectedConnectionR
         [InlineData(false)]
         public void TestConnWithUserAgentFeatureExtension(bool sendAck)
         {
-            // Enable sending the UserAgent if desired.
-            using LocalAppContextSwitchesHelper switchesHelper = new();
-            switchesHelper.EnableUserAgent = true;
-
             // Start the test server.
             using TdsServer server = new();
             server.Start();
@@ -905,55 +901,5 @@ public void TestConnWithUserAgentFeatureExtension(bool sendAck)
 
             // TODO: Confirm the server sent an Ack by reading log message from SqlInternalConnectionTds
         }
-
-        /// <summary>
-        /// Test to verify no UserAgent relevant information is sent when EnableUserAgentField switch is disabled.
-        /// </summary>
-        [Fact]
-        public void TestConnWithoutUserAgentFeatureExtension()
-        {
-            // Disable the client-side UserAgent field entirely
-            using LocalAppContextSwitchesHelper switchesHelper = new();
-            switchesHelper.EnableUserAgent = false;
-
-            using var server = new TdsServer();
-            server.Start();
-
-            // Do not advertise or force the UserAgent feature on the server
-            server.ServerSupportedUserAgentFeatureExtVersion = 0x00; // no support
-            server.EnableUserAgentFeatureExt = false;                // no forced ACK
-
-            bool loginValidated = false;
-            bool userAgentFeatureSeen = false;
-
-            // Inspect the LOGIN7 packet captured by the test server
-            server.OnLogin7Validated = loginToken =>
-            {
-                var featureExtTokens = loginToken.FeatureExt
-                    .OfType<TDSLogin7GenericOptionToken>()
-                    .ToArray();
-
-                // Ensure there is no UserAgentSupport token at all
-                var uaToken = featureExtTokens.FirstOrDefault(t => t.FeatureID == TDSFeatureID.UserAgentSupport);
-                userAgentFeatureSeen = uaToken is not null;
-
-                loginValidated = true;
-            };
-
-            // Connect to the test TDS server with a basic connection string
-            var connStr = new SqlConnectionStringBuilder
-            {
-                DataSource = $"localhost,{server.EndPoint.Port}",
-                Encrypt = SqlConnectionEncryptOption.Optional,
-            }.ConnectionString;
-
-            using var connection = new SqlConnection(connStr);
-            connection.Open();
-
-            // Verify that the connection succeeded and no UserAgent data was sent
-            Assert.Equal(ConnectionState.Open, connection.State);
-            Assert.True(loginValidated, "Expected LOGIN7 to be validated by the test server");
-            Assert.False(userAgentFeatureSeen, "Did not expect a UserAgentSupport feature token in LOGIN7");
-        }
     }
 }

From a3172b19b935eb9a25a34c116ab816cd1c60d29a Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Tue, 7 Apr 2026 17:41:38 -0700
Subject: [PATCH 028/298] Update prompt tools. (#4132)

---
 .github/prompts/code-review.prompt.md            | 10 ++++++----
 .github/prompts/generate-prompt.prompt.md        |  1 +
 .github/prompts/generate-skill.prompt.md         |  2 ++
 .github/prompts/update-build-pipelines.prompt.md |  2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/prompts/code-review.prompt.md b/.github/prompts/code-review.prompt.md
index 6196c32293..3a64abec0b 100644
--- a/.github/prompts/code-review.prompt.md
+++ b/.github/prompts/code-review.prompt.md
@@ -1,18 +1,20 @@
 ---
 name: code-review
-description: AI-assisted code review for a pull request in Microsoft.Data.SqlClient.
+description: AI-assisted code review for a pull request or branch in Microsoft.Data.SqlClient.
 argument-hint: <PR number or branch name>
 agent: agent
-tools: ['github/search_issues', 'read/readFile', 'codebase/search']
+tools: ['github/search_issues', 'github/pull_request_read', 'github/get_file_contents', 'github/run_secret_scanning', 'read/readFile', 'search']
 ---
 
-Review the pull request "${input:pr}" in `dotnet/SqlClient`.
+Review the changes in "${input:target}" for `dotnet/SqlClient`.
+
+The target may be either a **PR number** (e.g., `4106`) or a **branch name** (e.g., `dev/user/my-feature`). Determine which by checking whether the value is purely numeric.
 
 Follow this structured review process:
 
 ## 1. Understand the Change
-- Fetch the PR details: title, description, linked issue(s), and diff.
 - Read the PR description to understand the intent and scope of the change.
+- Check for linked issues referenced in the description (e.g., `Fixes #...`).
 - Check which files are modified and categorize them:
   - **Source code** (`src/Microsoft.Data.SqlClient/src/`) — the main review focus
   - **Tests** (`tests/`) — verify coverage
diff --git a/.github/prompts/generate-prompt.prompt.md b/.github/prompts/generate-prompt.prompt.md
index 73d083947b..4db6c577c9 100644
--- a/.github/prompts/generate-prompt.prompt.md
+++ b/.github/prompts/generate-prompt.prompt.md
@@ -2,6 +2,7 @@
 name: generate-prompt
 description: Generates high-quality VS Code Copilot prompt files (.prompt.md) based on user descriptions, leveraging available skills.
 argument-hint: Describe the prompt you want to create (e.g., "A prompt to generate unit tests for C#")
+tools: [read, edit, search, todo]
 ---
 You are an expert AI prompt developer specialized in creating **Visual Studio Code Copilot Prompt Files (`.prompt.md`)**.
 
diff --git a/.github/prompts/generate-skill.prompt.md b/.github/prompts/generate-skill.prompt.md
index 484fe2debc..e258adedc6 100644
--- a/.github/prompts/generate-skill.prompt.md
+++ b/.github/prompts/generate-skill.prompt.md
@@ -2,6 +2,8 @@
 name: generate-skill
 description: Generate a GitHub Copilot Agent Skill (SKILL.md) following best practices and official documentation
 argument-hint: Describe the skill you want to create (e.g., "debugging SQL connection issues")
+agent: agent
+tools: ['read/readFile', 'edit/createFile', 'search']
 ---
 You are an expert developer specialized in creating **GitHub Copilot Agent Skills**.
 
diff --git a/.github/prompts/update-build-pipelines.prompt.md b/.github/prompts/update-build-pipelines.prompt.md
index 617cf39901..a4715fa000 100644
--- a/.github/prompts/update-build-pipelines.prompt.md
+++ b/.github/prompts/update-build-pipelines.prompt.md
@@ -3,7 +3,7 @@ name: update-build-pipelines
 description: Guided workflow for updating Azure DevOps CI/CD pipelines for Microsoft.Data.SqlClient.
 argument-hint: <describe the pipeline change needed>
 agent: agent
-tools: ['edit/createFile', 'edit/editFiles', 'read/readFile', 'codebase/search']
+tools: ['edit/createFile', 'edit/editFiles', 'read/readFile', 'search']
 ---
 
 Update the Azure DevOps build pipelines for: "${input:change}".

From f217d82755ddfc74af8be4c90952c4f41af2dbd9 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Tue, 7 Apr 2026 19:42:03 -0500
Subject: [PATCH 029/298] Official Build Cleanup (#4123)

* Cleanup step parameters

* Parameter work for build-signed-csproj-package-job.yml:
* Drop buildConfiguration parameter
* Introduce symbols parameters
* Signing parameters with prefix

* Forward parameter defaults from build-signed-csproj-package-job to build-stages.yml

* Forward default values for symbols/signing parameters in build-stages.yml to parameters.

* Delete debug param from build-stages.yml
Forward default values to parameters on sqlclient-non-official.yml and sqlclient-official.yml

* Don't nest variables files.

* Do not import variables templates outside of the pipeline root

* OneBranch variable libraries moved to onebranch-variables.yml
Replace old libraries with new libraries
Replace old library references with new library references

* Project for manintaining the pipelines folder

* Parameterize package versions from the pipeline to the stages

* Store "effective" package versions in new, parameterized variables file

* Parameterize the artifact names

* Parameterize the assembly versions

* Parameterize the mds validation job

* Sweep remaining $() references that are not to well-known variables.

* Remove unused variables and cleanup remaining variables

* Cleanup SDL parameters

* AKVProvider -> AkvProvider

* MDS -> SqlClient
---
 eng/pipelines/Pipelines.csproj                |  28 ++
 .../jobs/build-signed-csproj-package-job.yml  | 143 ++++---
 ...=> build-signed-sqlclient-package-job.yml} |  26 +-
 .../jobs/publish-nuget-package-job.yml        |   2 +-
 .../jobs/validate-signed-package-job.yml      | 215 ++++++++---
 .../onebranch/sqlclient-non-official.yml      | 166 ++++----
 .../onebranch/sqlclient-official.yml          | 171 +++++----
 .../onebranch/stages/build-stages.yml         | 361 ++++++++++++------
 .../onebranch/stages/release-stages.yml       |  81 ++--
 .../onebranch/steps/build-csproj-step.yml     |  23 +-
 ...-mds-step.yml => build-sqlclient-step.yml} |   6 +-
 ... => copy-apiscan-files-sqlclient-step.yml} |   0
 .../onebranch/steps/pack-csproj-step.yml      |  21 +-
 ...k-mds-step.yml => pack-sqlclient-step.yml} |   6 +-
 .../steps/roslyn-analyzers-csproj-step.yml    |  24 +-
 ...ml => roslyn-analyzers-sqlclient-step.yml} |   8 +-
 .../onebranch/variables/common-variables.yml  | 164 +-------
 .../variables/onebranch-variables.yml         |  69 ++--
 .../onebranch/variables/package-variables.yml | 137 +++++++
 .../sqlclient-validation-variables.yml        |  38 --
 src/Microsoft.Data.SqlClient.slnx             |  92 +----
 21 files changed, 985 insertions(+), 796 deletions(-)
 create mode 100644 eng/pipelines/Pipelines.csproj
 rename eng/pipelines/onebranch/jobs/{build-signed-mds-package-job.yml => build-signed-sqlclient-package-job.yml} (89%)
 rename eng/pipelines/onebranch/steps/{build-mds-step.yml => build-sqlclient-step.yml} (89%)
 rename eng/pipelines/onebranch/steps/{copy-apiscan-files-mds-step.yml => copy-apiscan-files-sqlclient-step.yml} (100%)
 rename eng/pipelines/onebranch/steps/{pack-mds-step.yml => pack-sqlclient-step.yml} (89%)
 rename eng/pipelines/onebranch/steps/{roslyn-analyzers-mds-step.yml => roslyn-analyzers-sqlclient-step.yml} (84%)
 create mode 100644 eng/pipelines/onebranch/variables/package-variables.yml
 delete mode 100644 eng/pipelines/onebranch/variables/sqlclient-validation-variables.yml

diff --git a/eng/pipelines/Pipelines.csproj b/eng/pipelines/Pipelines.csproj
new file mode 100644
index 0000000000..f599c80053
--- /dev/null
+++ b/eng/pipelines/Pipelines.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!--
+    This is an ultra-hack. We have a lot of files in the /eng/pipelines directory, and it would be
+    nice to manage these inside an IDE. However, MSBuild doesn't have a good solution for including
+    recursive folder trees of non-compilable files, with the only solution to be manually adding
+    each file as a linked file in the solution. This is a terrible situation because it means each
+    time a file is added or removed from this folder, it must be manually updated in the solution.
+    It is also the case that most engineers forget to do this step, and it comes down to more
+    diligent engineers to keep the pipelines folder up to date. Well, the diligent engineers have
+    had enough and are tired of doing it.
+
+    So, this project was added as a way to automatically keep the pipelines directory up-to-date in
+    the solution. It is *not built* in any configuration, and exists purely to collect all files
+    under the /eng/pipelines folder.
+
+    No changes should be made to this project, perhaps updating the TargetFramework property if
+    the framework specified goes out of support.
+  -->
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <NoBuild>true</NoBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="**/*" />
+  </ItemGroup>
+</Project>
diff --git a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
index 653d9419bc..6dc72983cc 100644
--- a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
@@ -15,6 +15,49 @@
 # signed DLLs, and finally ESRP signs the NuGet packages.
 
 parameters:
+
+  # Signing Parameters -----------------------------------------------------
+
+  - name: signingAppRegistrationClientId
+    type: string
+
+  - name: signingAppRegistrationTenantId
+    type: string
+
+  - name: signingAuthAkvName
+    type: string
+
+  - name: signingAuthSignCertName
+    type: string
+
+  - name: signingEsrpClientId
+    type: string
+
+  - name: signingEsrpConnectedServiceName
+    type: string
+
+  # Symbols Publishing Parameters ------------------------------------------
+
+  - name: symbolsAzureSubscription
+    type: string
+    default: 'Symbols publishing Workload Identity federation service-ADO.Net'
+
+  - name: symbolsPublishProjectName
+    type: string
+    default: 'Microsoft.Data.SqlClient.SNI'
+
+  - name: symbolsPublishServer
+    type: string
+
+  - name: symbolsPublishTokenUri
+    type: string
+
+  - name: symbolsUploadAccount
+    type: string
+    default: 'SqlClientDrivers'
+
+  # OTHERS +=====================================
+
   # Short package name used in the job name, display strings, filesystem paths, and as a suffix for
   # the default Build and Pack targets if those aren't specified.
   - name: packageName
@@ -42,20 +85,17 @@ parameters:
     type: string
     default: ""
 
+  # True to enable ESRP malware scanning and code signing steps, which should not be
+  # run on non-official pipelines as they access production resources.
+  - name: isOfficial
+    type: boolean
+
   # The MSBuild pack target in build.proj (e.g. PackLogging).  If not specified, defaults to
   # Pack<packageName>.
   - name: packTarget
     type: string
     default: ""
 
-  # The C# build configuration to build (e.g. Debug or Release).
-  - name: buildConfiguration
-    type: string
-    values:
-      - Debug
-      - Release
-    default: Release
-
   # Additional MSBuild -p: arguments for version properties.  These may include versions of
   # packages this package depends on, or versions for this package itself.
   - name: versionProperties
@@ -70,30 +110,6 @@ parameters:
   - name: publishSymbols
     type: boolean
 
-  # True to enable ESRP malware scanning and code signing steps, which should not be
-  # run on non-official pipelines as they access production resources.
-  - name: isOfficial
-    type: boolean
-
-  # Values required by ESRP tasks.
-  - name: esrpConnectedServiceName
-    type: string
-
-  - name: esrpClientId
-    type: string
-
-  - name: appRegistrationClientId
-    type: string
-
-  - name: appRegistrationTenantId
-    type: string
-
-  - name: authAkvName
-    type: string
-
-  - name: authSignCertName
-    type: string
-
   # Optional list of pipeline artifacts to download before building.  Each entry is an object
   # with 'artifactName' (the pipeline artifact name) and 'displayName' (used in the task label).
   # This replaces hard-coded packageName conditionals so callers declare their own dependencies.
@@ -108,15 +124,20 @@ jobs:
       type: windows
 
     variables:
+      # Inform OneBranch that files put in this directory should be uploaded as artifacts.
       ob_outputDirectory: $(PACK_OUTPUT)
+
       # APIScan configuration for this Extension package
       ob_sdl_apiscan_enabled: true
-      ob_sdl_apiscan_softwareFolder: $(Build.SourcesDirectory)/apiScan/${{ parameters.packageName }}/dlls
-      ob_sdl_apiscan_symbolsFolder: $(Build.SourcesDirectory)/apiScan/${{ parameters.packageName }}/pdbs
+      ob_sdl_apiscan_softwareFolder: $(REPO_ROOT)/apiScan/${{ parameters.packageName }}/dlls
+      ob_sdl_apiscan_symbolsFolder: $(REPO_ROOT)/apiScan/${{ parameters.packageName }}/pdbs
       ob_sdl_apiscan_softwarename: ${{ parameters.packageFullName }}
       ob_sdl_apiscan_versionNumber: ${{ parameters.assemblyFileVersion }}
 
+      # If parameters.buildTarget is not provided, default to "Build{parameters.packageName}"
       buildTarget: ${{ coalesce(parameters.buildTarget, format('Build{0}', parameters.packageName)) }}
+
+      # If parameters.packTarget is not provided, default to "Pack{parameters.packageName}"
       packTarget: ${{ coalesce(parameters.packTarget, format('Pack{0}', parameters.packageName)) }}
 
     steps:
@@ -128,7 +149,7 @@ jobs:
             displayName: Download ${{ artifact.displayName }}
             inputs:
               artifactName: ${{ artifact.artifactName }}
-              targetPath: $(Build.SourcesDirectory)/packages
+              targetPath: $(REPO_ROOT)/packages
 
       # Install the .NET SDK.
       - template: /eng/pipelines/steps/install-dotnet.yml@self
@@ -136,30 +157,29 @@ jobs:
       # Perform Roslyn analysis before building, since this step will clobber build output.
       - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml@self
         parameters:
+          buildTarget: '${{ variables.buildTarget }}'
           msBuildArguments: >-
-            -t:$(buildTarget)
-            -p:Configuration=${{ parameters.buildConfiguration }}
+            -p:Configuration=Release
             -p:ReferenceType=Package
             ${{ parameters.versionProperties }}
 
       # Build the package, producing DLLs only (no NuGet package yet).
       - template: /eng/pipelines/onebranch/steps/build-csproj-step.yml@self
         parameters:
-          buildTarget: $(buildTarget)
-          buildConfiguration: ${{ parameters.buildConfiguration }}
+          buildTarget: '${{ variables.buildTarget }}'
           versionProperties: ${{ parameters.versionProperties }}
 
       - ${{ if eq(parameters.isOfficial, true) }}:
           # ESRP sign the DLLs.
           - template: /eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml@self
             parameters:
-              appRegistrationClientId: ${{ parameters.appRegistrationClientId }}
-              appRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
-              authAkvName: ${{ parameters.authAkvName }}
-              authSignCertName: ${{ parameters.authSignCertName }}
-              esrpClientId: ${{ parameters.esrpClientId }}
-              esrpConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
-              pattern: ${{ parameters.packageFullName }}.dll
+              appRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+              appRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+              authAkvName: '${{ parameters.signingAuthAkvName }}'
+              authSignCertName: '${{ parameters.signingAuthSignCertName }}'
+              esrpClientId: '${{ parameters.signingEsrpClientId }}'
+              esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+              pattern: '${{ parameters.packageFullName }}.dll'
 
       # Copy signed/unsigned DLLs and PDBs to APIScan folders.
       - task: CopyFiles@2
@@ -167,7 +187,7 @@ jobs:
         inputs:
           SourceFolder: $(BUILD_OUTPUT)/Package/bin
           Contents: "**/${{ parameters.packageFullName }}.dll"
-          TargetFolder: $(ob_sdl_apiscan_softwareFolder)
+          TargetFolder: ${{ variables.ob_sdl_apiscan_softwareFolder }}
           # We must preserve the folder structure since our C# projects may produce multiple
           # identically named DLLs for different target frameworks (e.g. netstandard2.0, net5.0,
           # etc.), and we need to keep those separate for APIScan to work correctly.
@@ -178,28 +198,27 @@ jobs:
         inputs:
           SourceFolder: $(BUILD_OUTPUT)/Package/bin
           Contents: "**/${{ parameters.packageFullName }}.pdb"
-          TargetFolder: $(ob_sdl_apiscan_symbolsFolder)
+          TargetFolder: ${{ variables.ob_sdl_apiscan_symbolsFolder }}
           flattenFolders: false
 
       # Pack the signed DLLs into NuGet package (NoBuild=true).
       - template: /eng/pipelines/onebranch/steps/pack-csproj-step.yml@self
         parameters:
-          packTarget: $(packTarget)
-          buildConfiguration: ${{ parameters.buildConfiguration }}
+          packTarget: ${{ variables.packTarget }}
           versionProperties: ${{ parameters.versionProperties }}
 
       - ${{ if eq(parameters.isOfficial, true) }}:
           # ESRP sign the NuGet package.
           - template: /eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml@self
             parameters:
-              appRegistrationClientId: ${{ parameters.appRegistrationClientId }}
-              appRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
-              authAkvName: ${{ parameters.authAkvName }}
-              authSignCertName: ${{ parameters.authSignCertName }}
-              esrpClientId: ${{ parameters.esrpClientId }}
-              esrpConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
+              appRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+              appRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+              authAkvName: '${{ parameters.signingAuthAkvName }}'
+              authSignCertName: '${{ parameters.signingAuthSignCertName }}'
+              esrpClientId: '${{ parameters.signingEsrpClientId }}'
+              esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
               searchPath: $(PACK_OUTPUT)
-              searchPattern: '${{ parameters.packageFullName }}.*nupkg'
+              searchPattern: '${{ parameters.packageFullName}}.*nupkg'
 
       # Publish symbols to servers
       # @TODO: Get these parameters from variables/libraries
@@ -207,13 +226,13 @@ jobs:
           - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
             parameters:
               artifactName: '${{ parameters.packageFullName }}_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.packageVersion }}_$(System.TimelineId)'
-              azureSubscription: 'Symbols publishing Workload Identity federation service-ADO.Net'
+              azureSubscription: '${{ parameters.symbolsAzureSubscription }}'
               packageName: '${{ parameters.packageFullName }}'
-              publishProjectName: 'Microsoft.Data.SqlClient.SNI' # This is used for all SqlClient packages. Don't know why, but it is.
-              publishServer: '$(SymbolServer)'
+              publishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              publishServer: '${{ parameters.symbolsPublishServer }}'
               publishToInternal: 'true'
               publishToPublic: 'true'
-              publishTokenUri: '$(SymbolTokenUri)'
+              publishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
               searchPattern: '**/${{ parameters.packageFullName }}*.pdb'
-              uploadAccount: 'SqlClientDrivers'
+              uploadAccount: '${{ parameters.symbolsUploadAccount }}'
               version: '${{ parameters.packageVersion }}'
diff --git a/eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
similarity index 89%
rename from eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml
rename to eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
index 4464a3a9f1..752e459b84 100644
--- a/eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
@@ -67,14 +67,14 @@ parameters:
   - name: loggingPackageVersion
     type: string
 
-  - name: mdsAssemblyFileVersion
+  - name: sqlClientAssemblyFileVersion
     type: string
 
-  - name: mdsPackageVersion
+  - name: sqlClientPackageVersion
     type: string
 
 jobs:
-  - job: build_package_Mds
+  - job: build_package_SqlClient
     displayName: 'Build Microsoft.Data.SqlClient'
     pool:
       type: windows
@@ -84,7 +84,7 @@ jobs:
       ob_sdl_apiscan_softwareFolder: ${{ parameters.apiScanDllPath }}
       ob_sdl_apiscan_symbolsFolder: ${{ parameters.apiScanPdbPath }}
       ob_sdl_apiscan_softwarename: 'Microsoft.Data.SqlClient'
-      ob_sdl_apiscan_versionNumber: ${{ parameters.mdsAssemblyFileVersion }}
+      ob_sdl_apiscan_versionNumber: ${{ parameters.sqlClientAssemblyFileVersion }}
 
     steps:
       # Dump environment and parameters
@@ -114,21 +114,21 @@ jobs:
       - template: /eng/pipelines/steps/install-dotnet.yml@self
 
       # Perform analysis before building, since this step will clobber build output
-      - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-mds-step.yml@self
+      - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml@self
         parameters:
           abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
           loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
-          mdsPackageVersion: '${{ parameters.mdsPackageVersion }}'
+          sqlClientPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
 
       # Perform the actual build
-      - template: /eng/pipelines/onebranch/steps/build-mds-step.yml@self
+      - template: /eng/pipelines/onebranch/steps/build-sqlclient-step.yml@self
         parameters:
           abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
           loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
-          mdsPackageVersion: '${{ parameters.mdsPackageVersion }}'
+          sqlClientPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
 
       # Copy the built DLLs and PDBs to the APIScan output folder for APIScanning post-build
-      - template: /eng/pipelines/onebranch/steps/copy-apiscan-files-mds-step.yml@self
+      - template: /eng/pipelines/onebranch/steps/copy-apiscan-files-sqlclient-step.yml@self
         parameters:
           dllPath: '${{ parameters.apiScanDllPath }}'
           pdbPath: '${{ parameters.apiScanPdbPath }}'
@@ -147,11 +147,11 @@ jobs:
               pattern: 'Microsoft.Data.SqlClient*.dll'
 
       # Package the build output into a NuGet package
-      - template: /eng/pipelines/onebranch/steps/pack-mds-step.yml
+      - template: /eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
         parameters:
           abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
           loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
-          mdsPackageVersion: '${{ parameters.mdsPackageVersion }}'
+          sqlClientPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
 
       # Sign the NuGet packages
       - ${{ if parameters.isOfficial }}:
@@ -169,7 +169,7 @@ jobs:
       - ${{ if parameters.publishSymbols }}:
           - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
             parameters:
-              artifactName: 'Microsoft.Data.SqlClient_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.mdsPackageVersion }}_$(System.TimelineId)'
+              artifactName: 'Microsoft.Data.SqlClient_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.sqlClientPackageVersion }}_$(System.TimelineId)'
               azureSubscription: '${{ parameters.symbolsAzureSubscription }}'
               packageName: 'Microsoft.Data.SqlClient'
               publishProjectName: '${{ parameters.symbolsPublishProjectName }}'
@@ -179,4 +179,4 @@ jobs:
               publishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
               searchPattern: '**/Microsoft.Data.SqlClient*.pdb' # @TODO: This seems very heavy
               uploadAccount: '${{ parameters.symbolsUploadAccount }}'
-              version: '${{ parameters.mdsPackageVersion }}'
+              version: '${{ parameters.sqlClientPackageVersion }}'
diff --git a/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml b/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
index c04a2eceef..b7a1d8f62e 100644
--- a/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
@@ -65,7 +65,7 @@ jobs:
 
     variables:
       - name: ob_outputDirectory
-        value: $(Build.SourcesDirectory)/output
+        value: $(PACK_OUTPUT)
 
       - name: artifactPath
         value: $(Pipeline.Workspace)/${{ parameters.artifactName }}
diff --git a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
index 2a4bf08e97..bc566398cc 100644
--- a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
@@ -4,19 +4,42 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 parameters:
-  # The name of the pipeline artifacts to download prior to building the tests.
+  # The name of the pipeline artifact to download that contains the SqlClient NuGet package.
   - name: artifactName
     type: string
 
-  # True if this build is a preview.
-  - name: isPreview
-    type: boolean
+  # List of versions of dotnet that are *allowed to exist* in the NuGet package. Separators do not
+  # matter as the folders in lib, runtime, etc are simply checked to see if they exist in this
+  # string.
+  - name: expectedDotnetVersions
+    type: string
+    default: 'net462;net8.0;net9.0;netstandard2.0'
+
+  # Expected file version of the assemblies within the package. This should be of the form:
+  # (major).(minor).(patch).(buildNumber)
+  - name: expectedFileVersion
+    type: string
+
+  # List of folders that are *allowed to exist* in the NuGet package. Separators do not matter as
+  # the folders are simply checked to see if they exist in this string.
+  - name: expectedFolderNames
+    type: string
+    default: 'lib;ref;runtimes'
+
+  # Expected NuGet package version. Used to build the installation path. This should be of the
+  # form: (major).(minor).(patch)[-preview(preview_number)]
+  - name: expectedPackageVersion
+    type: string
 
   # True if this build is an official build. This will be used to gate some checks
   # that only apply to official builds, such as signature verification.
   - name: isOfficial
     type: boolean
 
+  # True if this build is a preview.
+  - name: isPreview
+    type: boolean
+
 jobs:
   - job: validate_nuget_package
     displayName: "Validate NuGet package"
@@ -28,66 +51,96 @@ jobs:
       vmImage: "ADO-MMS22-SQL19"
 
     variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
-      - template: /eng/pipelines/onebranch/variables/sqlclient-validation-variables.yml@self
 
-      - name: pathToDownloadedNuget # path to the downloaded nuget files
-        value: $(Pipeline.Workspace)\${{parameters.artifactName }}
+      - name: artifactPath
+        value: '$(Pipeline.Workspace)\${{ parameters.artifactName }}'
 
-      - ${{ if parameters.isPreview }}:
-          - name: extractedNugetPath
-            value: $(extractedNugetRootPath).$(mdsPackagePreviewVersion)
-          - name: mdsPackageVersion
-            value: $(mdsPackagePreviewVersion)
+      # Path to the SqlClient NuGet package after installation. This path will only exist once the package
+      # been installed.
+      - name: nugetPackageInstallPath
+        value: '$(Pipeline.Workspace)\nugetPackageInstalls\Microsoft.Data.SqlClient\${{ parameters.expectedPackageVersion }}'
+
+      # Root folder where NuGet package will be installed locally
+      - name: nugetPackageInstallRoot
+        value: '$(Pipeline.Workspace)\nugetPackageInstalls'
 
     steps:
-      - script: SET
-        displayName: "Print Environment Variables"
+      - template: '/eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self'
 
       - task: NuGetToolInstaller@1
-        displayName: "Use NuGet"
+        displayName: "Install NuGet"
 
       - powershell: |
-          # Displays the paths of all the local cache directories
+          echo "> 1. List all local cache directory paths"
           nuget locals all -List
 
-          #Clears all files from all local cache directories
+          echo "> 2. Clear all files from local cache directories"
           nuget locals all -Clear
         displayName: "Clear local cache"
 
+      # Download NuGet packages from the specified build artifact.
       - download: current
-        artifact: ${{parameters.artifactName}}
+        artifact: ${{ parameters.artifactName }}
         patterns: "**/*.*nupkg"
         displayName: "Download NuGet Package"
 
-      - powershell: |
-          # Install nuget package
-          Install-Package -Name "Microsoft.Data.SqlClient" -Destination "$(TempFolderName)" -Force -Source $(pathToDownloadedNuget) -SkipDependencies
-
-          Write-Host "--------------------------------------------------"
-          Write-Host '$(TempFolderName)'
-          ls $(TempFolderName)
-          Write-Host "--------------------------------------------------"
-        displayName: "Extract Nuget in temp folder"
-
+      # Verify secure signatures on the NuGet packages.
+      # NOTE: Packages will only be signed if the build is official.
       - ${{ if eq(parameters.isOfficial, true) }}:
           - powershell: |
-              Write-Host "--------------------------------------------------"
-              Write-Host "This will verify the artifact signature" -ForegroundColor Green
-              Write-Host "--------------------------------------------------"
+              # Propagate parameters to PS variables #######################
+              $artifactPath = "${{ variables.artifactPath }}"
+              echo "artifactPath= $artifactPath"
 
-              nuget verify -All $(pathToDownloadedNuget)\*.nupkg
-              nuget verify -All $(pathToDownloadedNuget)\*.snupkg
+              # Verify package signatures ##################################
+              echo "> 1. Verify signature of source package(s)"
+              nuget verify -All $artifactPath\*.nupkg
+
+              echo "> 2. Verify signature of symbols package(s)"
+              nuget verify -All $artifactPath\*.snupkg
             displayName: "Verify nuget signature"
 
+      # Install NuGet package to the temporary directory
+      - powershell: |
+          # Propagate pipeline to PS variables #############################
+          $artifactPath = "${{ variables.artifactPath }}"
+          echo "artifactPath= $artifactPath"
+
+          $nugetPackageInstallRoot = "${{ variables.nugetPackageInstallRoot }}"
+          echo "nugetPackageInstallRoot= $nugetPackageInstallRoot"
+
+          # Install NuGet Package ##########################################
+          echo "> 1. Installing Microsoft.Data.SqlClient NuGet package..."
+          Install-Package `
+            -Name "Microsoft.Data.SqlClient" `
+            -Source $artifactPath `
+            -Destination $nugetPackageInstallRoot `
+            -Force `
+            -SkipDependencies
+
+          echo "> 2. Listing contents of installed Microsoft.Data.SqlClient NuGet package:"
+          Write-Host $artifactPath
+          Get-ChildItem $artifactPath
+        displayName: "Install NuGet Package"
+
+      # Find all DLL files in the installed NuGet package, verify each is signed with a strong name
       - powershell: |
-          # Recursively find all .dll files in TempFolder (installed nuget folder)
-          # Microsoft.Data.SqlClient.dll and Microsoft.Data.SqlClient.resources.dll (in localized folders) should have strong name
-          $dllFiles = Get-ChildItem -Path $(TempFolderName) -Recurse -Filter *.dll
+          # Propagate pipeline to PS variables #############################
+          $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
+          echo "nugetPackageInstallPath= $nugetPackageInstallPath"
+
+          # Verify strong name signing #####################################
+          echo "> 1. Verifying strong name signing of DLLs ..."
+
+          # @TODO: This path seems brittle to VS upgrades, can we make it more flexible?
+          $snPath = "C:\Program Files (x86)\Microsoft SDKs\Windows\*\bin\NETFX 4.8.1 Tools\sn.exe"
+
+          $dllFiles = Get-ChildItem -Path $nugetPackageInstallPath -Recurse -Filter *.dll
           $badDlls = @()
           foreach ($file in $dllFiles)
           {
             # Run sn.exe to verify the strong name on each dll
-            $result = & "C:\Program Files (x86)\Microsoft SDKs\Windows\*\bin\NETFX 4.8.1 Tools\sn.exe" -vf $file.FullName
+            $result = & $snPath -vf $file.FullName
             Write-OutPut $result
 
             # if the dll is not valid, it would be delay signed or test-signed which is not meant for production
@@ -108,28 +161,49 @@ jobs:
           Write-Host "Strong name has been verified for all dlls"
         displayName: "Verify assembly strong names"
 
+      # Validate that the folders in the nuget are expected
+      # @TODO: This does not verify we are not missing any folders, only that the folders that
+      #    exist are expected to exist.
       - powershell: |
-          # Checks the expected folder names such as lib, ref, runtimes
-          Get-ChildItem -Path $(extractedNugetPath) -Directory  | select Name | foreach {
-              if('$(expectedFolderNames)'.contains($_.Name)){
-                  Write-Host expected folder name verfied: $_.Name
-              }
+          # Propagate pipeline to PS variables #############################
+          $expectedFolderNames = "${{ parameters.expectedFolderNames }}"
+          echo "expectedFolderNames= $expectedFolderNames"
+
+          $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
+          echo "nugetPackageInstallPath= $nugetPackageInstallPath"
+
+          # Verify folders are expected ####################################
+          Get-ChildItem -Path $nugetPackageInstallPath -Directory  | select Name | foreach {
+            if($expectedFolderNames.contains($_.Name)){
+              Write-Host expected folder name verfied: $_.Name
+            }
           }
-        displayName: "Check expected folder names"
+        displayName: "Verify NuGet Root Folder Structure"
 
+      # Validate that the folders within the root folders of the nuget are expected
+      # @TODO: This does not verify we are not missing any folders, only that the folders that
+      #    exist are expected to exist.
       - powershell: |
+          # Propagate pipeline to PS variables #############################
+          $expectedDotnetVersions = "${{ parameters.expectedDotnetVersions }}"
+          echo "expectedDotnetVersions= $expectedDotnetVersions"
+
+          $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
+          echo "nugetPackageInstallPath= $nugetPackageInstallPath"
+
+          # Verify folders are expected ####################################
           # Checks the version of DotNetFramework and DotNet
           $countErr = 0
           $countPass = 0
           $excludNamesFromRuntimeFolder = 'lib','win','unix'
 
-          Get-ChildItem -Path $(extractedNugetPath) -Directory | foreach {
+          Get-ChildItem -Path $nugetPackageInstallPath -Directory | foreach {
             $parentname=$_.Name
             Write-Host $_.FullName -ForegroundColor yellow
 
             if($_.Name -ne 'runtimes') {
               Get-ChildItem -Path $_.FullName -Directory | select Name | foreach {
-                if('$(expectedDotnetVersions)'.Contains($_.Name)){
+                if($expectedDotnetVersions.Contains($_.Name)){
                   Write-Host "`tExpected version verified in $parentname": $_.Name -ForegroundColor green
                   $countPass += 1
                 }
@@ -142,7 +216,7 @@ jobs:
 
             elseif ($_.Name -eq 'runtimes'){
               Get-ChildItem -Depth 3 -Path $_.FullName -Exclude $excludNamesFromRuntimeFolder -Directory | foreach{
-                if('$(expectedDotnetVersions)'.Contains($_.Name)){
+                if('${{ parameters.expectedDotnetVersions }}'.Contains($_.Name)){
                   Write-Host "`tExpected version verfied in $parentname": $_.Name
                   $countPass += 1
                 }
@@ -167,18 +241,19 @@ jobs:
             Write-Host "Unexpected versions are detected!" -ForegroundColor Red
             Exit -1
           }
-        displayName: "Check Expected framework"
+        displayName: "Verify NuGet DotNet Versions "
 
       - powershell: |
-          # list all the child items of created temp folder
+          # Propagate pipeline to PS variables #############################
+          $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
+          echo "nugetPackageInstallPath= $nugetPackageInstallPath"
 
-          #Verify all DLLs unzipped match "expected" hierarchy
-
-          foreach( $folderName in (Get-ChildItem -Path $(extractedNugetPath) -Directory).Name)
+          # Verify DLL Hierarchy ###########################################
+          foreach( $folderName in (Get-ChildItem -Path $nugetPackageInstallPath -Directory).Name)
           {
             # List all Childerns of the Path
-            Get-ChildItem -Path $(extractedNugetPath)\$folderName -Recurse -File
-            $subFiles = Get-ChildItem -Path $(extractedNugetPath)\$folderName -Recurse -File
+            Get-ChildItem -Path $nugetPackageInstallPath\$folderName -Recurse -File
+            $subFiles = Get-ChildItem -Path $nugetPackageInstallPath\$folderName -Recurse -File
 
             foreach($file in $subFiles)
             {
@@ -211,11 +286,16 @@ jobs:
           }
         displayName: 'Verify all DLLs unzipped match "expected" hierarchy'
 
+      # Verify that all DLLs are authenticode signed
+      # NOTE: This signing is only performed on official builds.
       - ${{ if eq(parameters.isOfficial, true) }}:
           - powershell: |
-              # Verify all dlls status are Valid
+              # Propagate pipeline to PS variables #############################
+              $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
+              echo "nugetPackageInstallPath= $nugetPackageInstallPath"
 
-              $dlls = Get-ChildItem -Path $(extractedNugetPath) -Recurse -Include *.dll
+              # Verify authenticode signature of DLLs ##########################
+              $dlls = Get-ChildItem -Path $nugetPackageInstallPath -Recurse -Include *.dll
               foreach ($status in $dlls | Get-AuthenticodeSignature)
               {
                   if ($status.Status -eq "Valid")
@@ -232,20 +312,27 @@ jobs:
             displayName: "Verify all dlls status are Valid"
 
       - powershell: |
-          # This will check each DLL's ProductVersion and FileVersion against
-          # expected values.
-          $failed = 0
-          $expectedFileVersion = "$(mdsPackageVersion)".Split('-')[0] + ".$(assemblyBuildNumber)"
+          # Propagate pipeline to PS variables #############################
+          $expectedFileVersion = "${{ parameters.expectedFileVersion }}"
+          echo "expectedFileVersion= $expectedFileVersion"
 
-          foreach ( $pVersion in Get-ChildItem *.dll -Path $(extractedNugetPath)  -Recurse | ForEach-Object versioninfo )
+          $expectedPackageVersion = "${{ parameters.expectedPackageVersion }}"
+          echo "expectedPackageVersion= $expectedPackageVersion"
+
+          $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
+          echo "nugetPackageInstallPath= $nugetPackageInstallPath"
+
+          # Validate ProductVersion and FileVersion fields #################
+          $failed = 0
+          foreach ( $pVersion in Get-ChildItem *.dll -Path $nugetPackageInstallPath -Recurse | ForEach-Object versioninfo )
           {
-              if ($pVersion.ProductVersion -Like '$(mdsPackageVersion)*')
+              if ($pVersion.ProductVersion -Like $expectedPackageVersion + '*')
               {
                   Write-Host -ForegroundColor Green "Correct ProductVersion detected for $($pVersion.FileName): $($pVersion.ProductVersion)"
               }
               else
               {
-                    Write-Host -ForegroundColor Red "Wrong ProductVersion detected for $($pVersion.FileName); expected: $(mdsPackageVersion); found: $($pVersion.ProductVersion)"
+                    Write-Host -ForegroundColor Red "Wrong ProductVersion detected for $($pVersion.FileName); expected: $expectedPackageVersion; found: $($pVersion.ProductVersion)"
                     $failed = 1
               }
 
@@ -258,6 +345,8 @@ jobs:
                   Write-Host -ForegroundColor Red "Wrong FileVersion detected for $($pVersion.FileName); expected $expectedFileVersion; found: $($pVersion.FileVersion)"
                   $failed = 1
               }
+
+              # @TODO: We should do a check for assembly version here.
           }
 
           if ($failed -ne 0)
@@ -265,5 +354,5 @@ jobs:
               Exit -1
           }
 
-          Get-ChildItem *.dll -Path $(extractedNugetPath)  -Recurse | ForEach-Object VersionInfo | Format-List
+          Get-ChildItem *.dll -Path $nugetPackageInstallPath  -Recurse | ForEach-Object VersionInfo | Format-List
         displayName: 'Verify "File Version" matches expected values for DLLs'
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index d4b62ac5e8..1ab3c653c3 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -45,7 +45,7 @@ parameters:
     default: true
 
   # Build the Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider package.
-  - name: buildAKVProvider
+  - name: buildAkvProvider
     displayName: Build Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
     type: boolean
     default: true
@@ -84,41 +84,17 @@ parameters:
     default: false
 
   # Release the Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider package.
-  - name: releaseAKVProvider
+  - name: releaseAkvProvider
     displayName: Release Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
     type: boolean
     default: false
 
 variables:
+  - template: /eng/pipelines/onebranch/variables/common-variables.yml@self
   - template: /eng/pipelines/onebranch/variables/onebranch-variables.yml@self
-
-  # Define the effective versions for all of the packages we build and release.
-  - ${{ if parameters.isPreview }}:
-      - name: effectiveSqlServerVersion
-        value: $(sqlServerPackagePreviewVersion)
-      - name: effectiveLoggingVersion
-        value: $(loggingPackagePreviewVersion)
-      - name: effectiveAbstractionsVersion
-        value: $(abstractionsPackagePreviewVersion)
-      - name: effectiveSqlClientVersion
-        value: $(mdsPackagePreviewVersion)
-      - name: effectiveAzureVersion
-        value: $(azurePackagePreviewVersion)
-      - name: effectiveAkvProviderVersion
-        value: $(akvPackagePreviewVersion)
-  - ${{ else }}:
-      - name: effectiveSqlServerVersion
-        value: $(sqlServerPackageVersion)
-      - name: effectiveLoggingVersion
-        value: $(loggingPackageVersion)
-      - name: effectiveAbstractionsVersion
-        value: $(abstractionsPackageVersion)
-      - name: effectiveSqlClientVersion
-        value: $(mdsPackageVersion)
-      - name: effectiveAzureVersion
-        value: $(azurePackageVersion)
-      - name: effectiveAkvProviderVersion
-        value: $(akvPackageVersion)
+  - template: /eng/pipelines/onebranch/variables/package-variables.yml@self
+    parameters:
+      isPreview: ${{ parameters.isPreview }}
 
 resources:
   repositories:
@@ -130,64 +106,110 @@ resources:
 extends:
   # See: https://aka.ms/obpipelines/templates
   template: /v2/OneBranch.NonOfficial.CrossPlat.yml@templates
+
   parameters:
+    featureFlags:
+      EnableCDPxPAT: false
+      WindowsHostVersion: 1ESWindows2022
+
     release:
       # This indicates the pipeline category to deploy Box products.  See:
       # https://eng.ms/docs/products/onebranch/release/yamlreleasepipelines/deployboxproducts
       category: NonAzure
-    featureFlags:
-      EnableCDPxPAT: false
-      WindowsHostVersion: 1ESWindows2022
+
     # See: https://aka.ms/obpipelines/sdl
     globalSdl:
-      tsa:
-        # We disable TSA for non-official pipelines.  This inhibits spurious TSA alerts and ADO
-        # task creation, since non-official builds are often done against development branches.
-        enabled: false
       apiscan:
+        # APIScan "software name" and version parameters are set on a per-job basis with via
+        # ob_sdl_apiscan_* variables.
         enabled: true
         break: false
-        # Other ApiScan options are set by the jobs via ob_sdl_apiscan_* variables.
+
+      armory:
+        enabled: true
+
+      asyncSdl:
+        # Disabling this as it complicates the build process with minimal gain
+        enabled: false
+
+      binskim:
+        enabled: true
+
       codeql:
-        compiled:
         enabled: true
-      sbom:
+        compiled:
+
+      credscan:
         enabled: true
-        packageName: Microsoft.Data.SqlClient
-        packageVersion: $(Build.BuildNumber)
+        suppressionsFile: '$(REPO_ROOT)/.config/CredScanSuppressions.json'
+
+      eslint:
+        # Only useful for repos with ECMAscript - which we do not have.
+        enabled: false
+
       policheck:
         enabled: true
-        break: true
-        exclusionsFile: $(REPO_ROOT)\.config\PolicheckExclusions.xml
-      asyncSdl:
+        exclusionsFile: '$(REPO_ROOT)\.config\PolicheckExclusions.xml'
+
+      roslyn:
+        # Note, requires RoslynAnalyzers task to be added as a separate step
+        enabled: true
+
+      publishLogs:
+        enabled: true
+
+      sbom:
+        enabled: true
+        packageName: 'Microsoft.Data.SqlClient'
+        packageVersion: '$(Build.BuildNumber)'
+
+      tsa:
+        # We disable TSA for non-official pipelines. This inhibits spurious TSA alerts and ADO task
+        # creation, since non-official builds are often done against development branches. This also
+        # forces all SDL tasks into "break" build mode.
         enabled: false
-        credscan:
-          enabled: true
-          suppressionsFile: $(REPO_ROOT)/.config/CredScanSuppressions.json
-        binskim:
-          enabled: true
-        armory:
-          enabled: true
-          break: true
-        eslint:
-          enabled: false
-        roslyn:
-          enabled: true
-          break: true
-        publishLogs:
-          enabled: true
-        tsaOptionsPath: $(REPO_ROOT)\.config\tsaoptions.json
-        disableLegacyManifest: true
+        configFile: '$(REPO_ROOT)/.config/tsaoptions.json'
+
     stages:
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
         parameters:
-          debug: ${{ parameters.debug }}
           isPreview: ${{ parameters.isPreview }}
           isOfficial: false # This is a non-official pipeline.
           publishSymbols: ${{ parameters.publishSymbols }}
           buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
           buildSqlClient: ${{ parameters.buildSqlClient }}
-          buildAKVProvider: ${{ parameters.buildAKVProvider }}
+          buildAkvProvider: ${{ parameters.buildAkvProvider }}
+
+          abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
+          abstractionsFileVersion: '${{ variables.abstractionsFileVersion }}'
+          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
+          akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
+          akvProviderFileVersion: '${{ variables.akvProviderFileVersion }}'
+          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
+          azureArtifactsName: '${{ variables.azureArtifactsName }}'
+          azureFileVersion: '${{ variables.azureFileVersion }}'
+          azurePackageVersion: '${{ variables.azurePackageVersion }}'
+          loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
+          loggingFileVersion: '${{ variables.loggingFileVersion }}'
+          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
+          sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
+          sqlClientFileVersion: '${{ variables.sqlClientFileVersion }}'
+          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
+          sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
+          sqlServerFileVersion: '${{ variables.sqlServerFileVersion }}'
+          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
+
+          signingAppRegistrationClientId: '$(SigningAppRegistrationClientId)'
+          signingAppRegistrationTenantId: '$(SigningAppRegistrationTenantId)'
+          signingAuthAkvName: '$(SigningAuthAkvName)'
+          signingAuthSignCertName: '$(SigningAuthSignCertName)'
+          signingEsrpClientId: '$(SigningEsrpClientId)'
+          signingEsrpConnectedServiceName: '$(SigningEsrpConnectedServiceName)'
+          symbolsAzureSubscription: '$(SymbolsAzureSubscription)'
+          symbolsPublishProjectName: '$(SymbolsPublishProjectName)'
+          symbolsPublishServer: '$(SymbolsPublishServer)'
+          symbolsPublishTokenUri: '$(SymbolsPublishTokenUri)'
+          symbolsUploadAccount: '$(SymbolsUploadAccount)'
 
       - template: /eng/pipelines/onebranch/stages/release-stages.yml@self
         parameters:
@@ -197,9 +219,23 @@ extends:
           # This is _not_ an official pipeline.
           isOfficial: false
           stageNameSuffix: test
+
+          abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
+          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
+          akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
+          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
+          azureArtifactsName: '${{ variables.azureArtifactsName }}'
+          azurePackageVersion: '${{ variables.azurePackageVersion }}'
+          loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
+          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
+          sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
+          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
+          sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
+          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
+
           releaseSqlServerServer: ${{ parameters.releaseSqlServerServer }}
           releaseLogging: ${{ parameters.releaseLogging }}
           releaseAbstractions: ${{ parameters.releaseAbstractions }}
           releaseSqlClient: ${{ parameters.releaseSqlClient }}
           releaseAzure: ${{ parameters.releaseAzure }}
-          releaseAKVProvider: ${{ parameters.releaseAKVProvider }}
+          releaseAkvProvider: ${{ parameters.releaseAkvProvider }}
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 93287c3c51..c6c18d679a 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -66,7 +66,7 @@ parameters:
     default: true
 
   # Build the Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider package.
-  - name: buildAKVProvider
+  - name: buildAkvProvider
     displayName: Build Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
     type: boolean
     default: true
@@ -105,41 +105,17 @@ parameters:
     default: false
 
   # Release the Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider package.
-  - name: releaseAKVProvider
+  - name: releaseAkvProvider
     displayName: Release Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
     type: boolean
     default: false
 
 variables:
+  - template: /eng/pipelines/onebranch/variables/common-variables.yml@self
   - template: /eng/pipelines/onebranch/variables/onebranch-variables.yml@self
-
-  # Define the effective versions for all of the packages we build and release.
-  - ${{ if parameters.isPreview }}:
-      - name: effectiveSqlServerVersion
-        value: $(sqlServerPackagePreviewVersion)
-      - name: effectiveLoggingVersion
-        value: $(loggingPackagePreviewVersion)
-      - name: effectiveAbstractionsVersion
-        value: $(abstractionsPackagePreviewVersion)
-      - name: effectiveSqlClientVersion
-        value: $(mdsPackagePreviewVersion)
-      - name: effectiveAzureVersion
-        value: $(azurePackagePreviewVersion)
-      - name: effectiveAkvProviderVersion
-        value: $(akvPackagePreviewVersion)
-  - ${{ else }}:
-      - name: effectiveSqlServerVersion
-        value: $(sqlServerPackageVersion)
-      - name: effectiveLoggingVersion
-        value: $(loggingPackageVersion)
-      - name: effectiveAbstractionsVersion
-        value: $(abstractionsPackageVersion)
-      - name: effectiveSqlClientVersion
-        value: $(mdsPackageVersion)
-      - name: effectiveAzureVersion
-        value: $(azurePackageVersion)
-      - name: effectiveAkvProviderVersion
-        value: $(akvPackageVersion)
+  - template: /eng/pipelines/onebranch/variables/package-variables.yml@self
+    parameters:
+      isPreview: ${{ parameters.isPreview }}
 
 resources:
   repositories:
@@ -150,69 +126,118 @@ resources:
 
 extends:
   # See: https://aka.ms/obpipelines/templates
-  template: /v2/OneBranch.Official.CrossPlat.yml@templates
+  template: '/v2/OneBranch.Official.CrossPlat.yml@templates'
+
   parameters:
+    featureFlags:
+      EnableCDPxPAT: false
+      WindowsHostVersion: 1ESWindows2022
+
     release:
       # This indicates the pipeline category to deploy Box products.  See:
       # https://eng.ms/docs/products/onebranch/release/yamlreleasepipelines/deployboxproducts
       category: NonAzure
-    featureFlags:
-      EnableCDPxPAT: false
-      WindowsHostVersion: 1ESWindows2022
+
     # See: https://aka.ms/obpipelines/sdl
     globalSdl:
-      tsa:
-        # The OneBranch template will set 'break' to false for the other SDL tools when TSA is
-        # enabled.  This allows TSA to gather the results and publish them for downstream analysis.
-        enabled: true
       apiscan:
+        # APIScan "software name" and version parameters are set on a per-job basis with via
+        # ob_sdl_apiscan_* variables.
         enabled: true
         # TODO(https://sqlclientdrivers.visualstudio.com/ADO.Net/_workitems/edit/42858):
         # We have temporarily disabled breaking the build on ApiScan results until we can:
         #   - Register our new packages with API Scan, and/or
         #   - Publish MSDN/Learn/etc documentation for the new packages.
         break: false
-        # Other ApiScan options are set by the jobs via ob_sdl_apiscan_* variables.
+
+      armory:
+        enabled: true
+        break: true
+
+      asyncSdl:
+        # Disabling this as it complicates the build process with minimal gain
+        enabled: false
+
+      binskim:
+        enabled: true
+        break: true
+
       codeql:
-        compiled:
         enabled: true
-      sbom:
+        compiled:
+
+      credscan:
         enabled: true
-        packageName: Microsoft.Data.SqlClient
-        packageVersion: $(Build.BuildNumber)
+        suppressionsFile: '$(REPO_ROOT)/.config/CredScanSuppressions.json'
+
+      eslint:
+        # Only useful for repos with ECMAscript - which we do not have.
+        enabled: false
+
       policheck:
         enabled: true
         break: true
-        exclusionsFile: $(REPO_ROOT)\.config\PolicheckExclusions.xml
-      asyncSdl:
-        enabled: false
-        credscan:
-          enabled: true
-          suppressionsFile: $(REPO_ROOT)/.config/CredScanSuppressions.json
-        binskim:
-          enabled: true
-        armory:
-          enabled: true
-          break: true
-        eslint:
-          enabled: false
-        roslyn:
-          enabled: true
-          break: true
-        publishLogs:
-          enabled: true
-        tsaOptionsPath: $(REPO_ROOT)\.config\tsaoptions.json
-        disableLegacyManifest: true
+        exclusionsFile: '$(REPO_ROOT)\.config\PolicheckExclusions.xml'
+
+      roslyn:
+        # Note, requires RoslynAnalyzers task to be added as a separate step
+        enabled: true
+        break: true
+
+      publishLogs:
+        enabled: true
+
+      sbom:
+        enabled: true
+        packageName: 'Microsoft.Data.SqlClient'
+        packageVersion: '$(Build.BuildNumber)'
+
+      tsa:
+        # OneBranch publishes all sdl results to TSA. If TSA is disabled, all SDL tools will be
+        # forced into 'break' build mode.
+        enabled: true
+        configFile: '$(REPO_ROOT)/.config/tsaoptions.json'
+
     stages:
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
         parameters:
-          debug: ${{ parameters.debug }}
           isPreview: ${{ parameters.isPreview }}
           isOfficial: true # This is an official pipeline.
           publishSymbols: ${{ parameters.publishSymbols }}
           buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
           buildSqlClient: ${{ parameters.buildSqlClient }}
-          buildAKVProvider: ${{ parameters.buildAKVProvider }}
+          buildAkvProvider: ${{ parameters.buildAkvProvider }}
+
+          abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
+          abstractionsFileVersion: '${{ variables.abstractionsFileVersion }}'
+          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
+          akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
+          akvProviderFileVersion: '${{ variables.akvProviderFileVersion }}'
+          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
+          azureArtifactsName: '${{ variables.azureArtifactsName }}'
+          azureFileVersion: '${{ variables.azureFileVersion }}'
+          azurePackageVersion: '${{ variables.azurePackageVersion }}'
+          loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
+          loggingFileVersion: '${{ variables.loggingFileVersion }}'
+          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
+          sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
+          sqlClientFileVersion: '${{ variables.sqlClientFileVersion }}'
+          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
+          sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
+          sqlServerFileVersion: '${{ variables.sqlServerFileVersion }}'
+          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
+
+          signingAppRegistrationClientId: '$(SigningAppRegistrationClientId)'
+          signingAppRegistrationTenantId: '$(SigningAppRegistrationTenantId)'
+          signingAuthAkvName: '$(SigningAuthAkvName)'
+          signingAuthSignCertName: '$(SigningAuthSignCertName)'
+          signingEsrpClientId: '$(SigningEsrpClientId)'
+          signingEsrpConnectedServiceName: '$(SigningEsrpConnectedServiceName)'
+          symbolsAzureSubscription: '$(SymbolsAzureSubscription)'
+          symbolsPublishProjectName: '$(SymbolsPublishProjectName)'
+          symbolsPublishServer: '$(SymbolsPublishServer)'
+          symbolsPublishTokenUri: '$(SymbolsPublishTokenUri)'
+          symbolsUploadAccount: '$(SymbolsUploadAccount)'
 
       - template: /eng/pipelines/onebranch/stages/release-stages.yml@self
         parameters:
@@ -221,9 +246,23 @@ extends:
           # This is an official pipeline.
           isOfficial: true
           stageNameSuffix: production
+
+          abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
+          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
+          akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
+          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
+          azureArtifactsName: '${{ variables.azureArtifactsName }}'
+          azurePackageVersion: '${{ variables.azurePackageVersion }}'
+          loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
+          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
+          sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
+          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
+          sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
+          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
+
           releaseSqlServerServer: ${{ parameters.releaseSqlServerServer }}
           releaseLogging: ${{ parameters.releaseLogging }}
           releaseAbstractions: ${{ parameters.releaseAbstractions }}
           releaseSqlClient: ${{ parameters.releaseSqlClient }}
           releaseAzure: ${{ parameters.releaseAzure }}
-          releaseAKVProvider: ${{ parameters.releaseAKVProvider }}
+          releaseAkvProvider: ${{ parameters.releaseAkvProvider }}
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index 738e91d26f..14e7977c3f 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -12,22 +12,14 @@
 #   - build_independent: builds packages with no cross-package dependencies (Logging, SqlServer)
 #   - build_abstractions: builds the Abstractions package, which depends on Logging
 #   - build_dependent: builds packages with dependencies on Abstractions (SqlClient, Azure)
-#   - build_addons: builds add-on packages with dependencies on the core packages (AKV Provider)
-#
-# This template depends on the following runtime (i.e. macro expansion) variables being defined:
-#
-#  - effectiveSqlServerVersion
-#  - effectiveLoggingVersion
-#  - effectiveAbstractionsVersion
-#  - effectiveSqlClientVersion
-#  - effectiveAzureVersion
-#  - effectiveAkvProviderVersion
+#   - build_addons: builds add-on packages with dependencies on the core packages (Akv Provider)
 
 parameters:
   # ── General parameters ─────────────────────────────────────────────────
 
-  # True to enable debug information and steps.
-  - name: debug
+  # True if this is an official build, which runs additional ESRP malware scanning
+  # and codesigning steps.
+  - name: isOfficial
     type: boolean
 
   # True if this is a preview build, which uses the preview version numbers from
@@ -35,11 +27,6 @@ parameters:
   - name: isPreview
     type: boolean
 
-  # True if this is an official build, which runs additional ESRP malware scanning
-  # and codesigning steps.
-  - name: isOfficial
-    type: boolean
-
   # True to publish symbols to public and private servers.
   - name: publishSymbols
     type: boolean
@@ -52,9 +39,102 @@ parameters:
   - name: buildSqlClient
     type: boolean
 
-  - name: buildAKVProvider
+  - name: buildAkvProvider
     type: boolean
 
+  # Package Parameters -----------------------------------------------------
+
+  - name: abstractionsArtifactsName
+    type: string
+
+  - name: abstractionsFileVersion
+    type: string
+
+  - name: abstractionsPackageVersion
+    type: string
+
+  - name: akvProviderArtifactsName
+    type: string
+
+  - name: akvProviderFileVersion
+    type: string
+
+  - name: akvProviderPackageVersion
+    type: string
+
+  - name: azureArtifactsName
+    type: string
+
+  - name: azureFileVersion
+    type: string
+
+  - name: azurePackageVersion
+    type: string
+
+  - name: loggingArtifactsName
+    type: string
+
+  - name: loggingFileVersion
+    type: string
+
+  - name: loggingPackageVersion
+    type: string
+
+  - name: sqlClientArtifactsName
+    type: string
+
+  - name: sqlClientFileVersion
+    type: string
+
+  - name: sqlClientPackageVersion
+    type: string
+
+  - name: sqlServerArtifactsName
+    type: string
+
+  - name: sqlServerFileVersion
+    type: string
+
+  - name: sqlServerPackageVersion
+    type: string
+
+  # Signing Parameters -----------------------------------------------------
+
+  - name: signingAppRegistrationClientId
+    type: string
+
+  - name: signingAppRegistrationTenantId
+    type: string
+
+  - name: signingAuthAkvName
+    type: string
+
+  - name: signingAuthSignCertName
+    type: string
+
+  - name: signingEsrpClientId
+    type: string
+
+  - name: signingEsrpConnectedServiceName
+    type: string
+
+  # Symbols Publishing Parameters ------------------------------------------
+
+  - name: symbolsAzureSubscription
+    type: string
+
+  - name: symbolsPublishProjectName
+    type: string
+
+  - name: symbolsPublishServer
+    type: string
+
+  - name: symbolsPublishTokenUri
+    type: string
+
+  - name: symbolsUploadAccount
+    type: string
+
 stages:
   # ====================================================================
   # Stage 1: Independent packages (no cross-package dependencies)
@@ -64,43 +144,56 @@ stages:
     displayName: "Build Independent Packages"
 
     jobs:
-      - ${{ if or(eq(parameters.buildAKVProvider, true), eq(parameters.buildSqlClient, true)) }}:
-          - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
-            parameters:
-              packageName: Logging
-              packageFullName: Microsoft.Data.SqlClient.Internal.Logging
-              packageVersion: $(effectiveLoggingVersion)
-              versionProperties: >-
-                -p:LoggingPackageVersion=$(effectiveLoggingVersion)
-                -p:LoggingAssemblyFileVersion=$(loggingAssemblyFileVersion)
-              assemblyFileVersion: $(loggingAssemblyFileVersion)
-              publishSymbols: ${{ parameters.publishSymbols }}
-              isOfficial: ${{ parameters.isOfficial }}
-              esrpConnectedServiceName: $(ESRPConnectedServiceName)
-              esrpClientId: $(ESRPClientId)
-              appRegistrationClientId: $(AppRegistrationClientId)
-              appRegistrationTenantId: $(AppRegistrationTenantId)
-              authAkvName: $(AuthAKVName)
-              authSignCertName: $(AuthSignCertName)
+      - ${{ if or(eq(parameters.buildAkvProvider, true), eq(parameters.buildSqlClient, true)) }}:
+        - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+          parameters:
+            signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+            signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+            signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+            signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+            signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+            signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+            symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+            symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+            symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+            symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+            symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+            isOfficial: ${{ parameters.isOfficial }}
+            packageName: Logging
+            packageFullName: Microsoft.Data.SqlClient.Internal.Logging
+            packageVersion: '${{ parameters.loggingPackageVersion }}'
+            versionProperties: >-
+              -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
+              -p:LoggingAssemblyFileVersion=${{ parameters.loggingFileVersion }}
+            assemblyFileVersion: '${{ parameters.loggingFileVersion }}'
+            publishSymbols: ${{ parameters.publishSymbols }}
+
 
       - ${{ if eq(parameters.buildSqlServerServer, true) }}:
-          - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
-            parameters:
-              packageName: SqlServer
-              packageFullName: Microsoft.SqlServer.Server
-              packageVersion: $(effectiveSqlServerVersion)
-              versionProperties: >-
-                -p:SqlServerAssemblyFileVersion=$(sqlServerAssemblyFileVersion)
-                -p:SqlServerPackageVersion=$(effectiveSqlServerVersion)
-              assemblyFileVersion: $(sqlServerAssemblyFileVersion)
-              publishSymbols: ${{ parameters.publishSymbols }}
-              isOfficial: ${{ parameters.isOfficial }}
-              esrpConnectedServiceName: $(ESRPConnectedServiceName)
-              esrpClientId: $(ESRPClientId)
-              appRegistrationClientId: $(AppRegistrationClientId)
-              appRegistrationTenantId: $(AppRegistrationTenantId)
-              authAkvName: $(AuthAKVName)
-              authSignCertName: $(AuthSignCertName)
+        - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+          parameters:
+            signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+            signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+            signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+            signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+            signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+            signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+            symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+            symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+            symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+            symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+            symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+            isOfficial: ${{ parameters.isOfficial }}
+            packageName: SqlServer
+            packageFullName: Microsoft.SqlServer.Server
+            packageVersion: '${{ parameters.sqlServerPackageVersion }}'
+            versionProperties: >-
+              -p:SqlServerAssemblyFileVersion=${{ parameters.sqlServerFileVersion }}
+              -p:SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }}
+            assemblyFileVersion: '${{ parameters.sqlServerFileVersion }}'
+            publishSymbols: ${{ parameters.publishSymbols }}
 
   # ====================================================================
   # Stage 2: Abstractions package (depends on Logging from Stage 1)
@@ -115,29 +208,35 @@ stages:
         jobs:
           - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
             parameters:
+              signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+              signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+              signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+              signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+              signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+              signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+              isOfficial: ${{ parameters.isOfficial }}
               packageName: Abstractions
               packageFullName: Microsoft.Data.SqlClient.Extensions.Abstractions
-              packageVersion: $(effectiveAbstractionsVersion)
+              packageVersion: '${{ parameters.abstractionsPackageVersion }}'
               versionProperties: >-
-                -p:AbstractionsPackageVersion=$(effectiveAbstractionsVersion)
-                -p:AbstractionsAssemblyFileVersion=$(abstractionsAssemblyFileVersion)
-                -p:LoggingPackageVersion=$(effectiveLoggingVersion)
-              assemblyFileVersion: $(abstractionsAssemblyFileVersion)
+                -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
+                -p:AbstractionsAssemblyFileVersion=${{ parameters.abstractionsFileVersion }}
+                -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
+              assemblyFileVersion: '${{ parameters.abstractionsFileVersion }}'
               publishSymbols: ${{ parameters.publishSymbols }}
-              isOfficial: ${{ parameters.isOfficial }}
-              esrpConnectedServiceName: $(ESRPConnectedServiceName)
-              esrpClientId: $(ESRPClientId)
-              appRegistrationClientId: $(AppRegistrationClientId)
-              appRegistrationTenantId: $(AppRegistrationTenantId)
-              authAkvName: $(AuthAKVName)
-              authSignCertName: $(AuthSignCertName)
               downloadArtifacts:
-                - artifactName: $(loggingArtifactsName)
-                  displayName: Logging Package
+                - artifactName: '${{ parameters.loggingArtifactsName }}'
+                  displayName: 'Logging Package'
 
   # ====================================================================
   # Stage 3: Core packages (depend on Abstractions)
-  # MDS and Extensions.Azure build in parallel after Abstractions.
+  # SqlClient and Extensions.Azure build in parallel after Abstractions.
   # Stage name kept as 'build_dependent' for validate job compatibility.
   # ====================================================================
   - ${{ if eq(parameters.buildSqlClient, true) }}:
@@ -146,61 +245,67 @@ stages:
         dependsOn: build_abstractions
 
         jobs:
-          - template: /eng/pipelines/onebranch/jobs/build-signed-mds-package-job.yml@self
+          - template: /eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml@self
             parameters:
               apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/dlls'
               apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/pdbs'
               isOfficial: ${{ parameters.isOfficial }}
               publishSymbols: ${{ parameters.publishSymbols }}
-              signingAppRegistrationClientId: '$(AppRegistrationClientId)'
-              signingAppRegistrationTenantId: '$(AppRegistrationTenantId)'
-              signingAuthAkvName: '$(AuthAKVName)'
-              signingAuthSignCertName: '$(AuthSignCertName)'
-              signingEsrpClientId: '$(ESRPClientId)'
-              signingEsrpConnectedServiceName: '$(ESRPConnectedServiceName)'
-              symbolsAzureSubscription: 'Symbols publishing Workload Identity federation service-ADO.Net'
-              symbolsPublishProjectName: 'Microsoft.Data.SqlClient.SNI'
-              symbolsPublishServer: '$(SymbolServer)'
-              symbolsPublishTokenUri: '$(SymbolTokenUri)'
-              symbolsUploadAccount: 'SqlClientDrivers'
-
-              abstractionsArtifactName: '$(abstractionsArtifactsName)'
-              abstractionsPackageVersion: '$(effectiveAbstractionsVersion)'
-              loggingArtifactName: '$(loggingArtifactsName)'
-              loggingPackageVersion: '$(effectiveLoggingVersion)'
-              mdsAssemblyFileVersion: '$(mdsAssemblyFileVersion)'
-              mdsPackageVersion: '$(effectiveSqlClientVersion)'
+              signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+              signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+              signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+              signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+              signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+              signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+              abstractionsArtifactName: '${{ parameters.abstractionsArtifactsName }}'
+              abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
+              loggingArtifactName: '${{ parameters.loggingArtifactsName }}'
+              loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
+              sqlClientAssemblyFileVersion: '${{ parameters.sqlClientFileVersion }}'
+              sqlClientPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
 
           - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
             parameters:
+              signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+              signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+              signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+              signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+              signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+              signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+              isOfficial: ${{ parameters.isOfficial }}
               packageName: Azure
               packageFullName: Microsoft.Data.SqlClient.Extensions.Azure
-              packageVersion: $(effectiveAzureVersion)
+              packageVersion: '${{ parameters.azurePackageVersion }}'
               versionProperties: >-
-                -p:AzurePackageVersion=$(effectiveAzureVersion)
-                -p:AzureAssemblyFileVersion=$(azureAssemblyFileVersion)
-                -p:AbstractionsPackageVersion=$(effectiveAbstractionsVersion)
-                -p:LoggingPackageVersion=$(effectiveLoggingVersion)
-              assemblyFileVersion: $(azureAssemblyFileVersion)
+                -p:AzurePackageVersion=${{ parameters.azurePackageVersion }}
+                -p:AzureAssemblyFileVersion=${{ parameters.azureFileVersion }}
+                -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
+                -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
+              assemblyFileVersion: '${{ parameters.azureFileVersion }}'
               publishSymbols: ${{ parameters.publishSymbols }}
-              isOfficial: ${{ parameters.isOfficial }}
-              esrpConnectedServiceName: $(ESRPConnectedServiceName)
-              esrpClientId: $(ESRPClientId)
-              appRegistrationClientId: $(AppRegistrationClientId)
-              appRegistrationTenantId: $(AppRegistrationTenantId)
-              authAkvName: $(AuthAKVName)
-              authSignCertName: $(AuthSignCertName)
               downloadArtifacts:
-                - artifactName: $(abstractionsArtifactsName)
+                - artifactName: '${{ parameters.abstractionsArtifactsName }}'
                   displayName: Abstractions Package
-                - artifactName: $(loggingArtifactsName)
+                - artifactName: '${{ parameters.loggingArtifactsName }}'
                   displayName: Logging Package
 
   # ====================================================================
   # Stage 4: Add-on packages (depend on core packages)
-  # AKV Provider builds after MDS completes.
+  # Akv Provider builds after SqlClient completes.
   # ====================================================================
-  - ${{ if and(eq(parameters.buildAKVProvider, true), eq(parameters.buildSqlClient, true)) }}:
+  - ${{ if and(eq(parameters.buildAkvProvider, true), eq(parameters.buildSqlClient, true)) }}:
       - stage: build_addons
         displayName: "Build Add-on Packages"
         dependsOn: build_dependent
@@ -208,42 +313,50 @@ stages:
         jobs:
           - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
             parameters:
+              signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+              signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+              signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+              signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+              signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+              signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+              isOfficial: ${{ parameters.isOfficial }}
               packageName: AkvProvider
               packageFullName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
-              packageVersion: $(effectiveAkvProviderVersion)
+              packageVersion: '${{ parameters.akvProviderPackageVersion }}'
               versionProperties: >-
-                -p:AkvPackageVersion=$(effectiveAkvProviderVersion)
-                -p:AkvAssemblyFileVersion=$(akvAssemblyFileVersion)
-                -p:MdsPackageVersion=$(effectiveSqlClientVersion)
-                -p:LoggingPackageVersion=$(effectiveLoggingVersion)
-                -p:AbstractionsPackageVersion=$(effectiveAbstractionsVersion)
-              assemblyFileVersion: $(akvAssemblyFileVersion)
+                -p:AkvPackageVersion=${{ parameters.akvProviderPackageVersion }}
+                -p:AkvAssemblyFileVersion=${{ parameters.akvProviderFileVersion }}
+                -p:MdsPackageVersion=${{ parameters.sqlClientPackageVersion }}
+                -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
+                -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
+              assemblyFileVersion: '${{ parameters.akvProviderFileVersion }}'
               publishSymbols: ${{ parameters.publishSymbols }}
-              isOfficial: ${{ parameters.isOfficial }}
-              esrpConnectedServiceName: $(ESRPConnectedServiceName)
-              esrpClientId: $(ESRPClientId)
-              appRegistrationClientId: $(AppRegistrationClientId)
-              appRegistrationTenantId: $(AppRegistrationTenantId)
-              authAkvName: $(AuthAKVName)
-              authSignCertName: $(AuthSignCertName)
               downloadArtifacts:
-                - artifactName: $(sqlClientArtifactsName)
+                - artifactName: '${{ parameters.sqlClientArtifactsName }}'
                   displayName: SqlClient Package
-                - artifactName: $(abstractionsArtifactsName)
+                - artifactName: '${{ parameters.abstractionsArtifactsName }}'
                   displayName: Abstractions Package
-                - artifactName: $(loggingArtifactsName)
+                - artifactName: '${{ parameters.loggingArtifactsName }}'
                   displayName: Logging Package
 
   # ====================================================================
   # Validation
   # ====================================================================
   - ${{ if eq(parameters.buildSqlClient, true) }}:
-      - stage: mds_package_validation
-        displayName: "MDS Package Validation"
+      - stage: sqlclient_package_validation
+        displayName: "SqlClient Package Validation"
         dependsOn: build_dependent
         jobs:
           - template: /eng/pipelines/onebranch/jobs/validate-signed-package-job.yml@self
             parameters:
-              artifactName: $(sqlClientArtifactsName)
+              artifactName: '${{ parameters.sqlClientArtifactsName }}'
+              expectedFileVersion: '${{ parameters.sqlClientFileVersion }}'
+              expectedPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
               isPreview: ${{ parameters.isPreview }}
               isOfficial: ${{ parameters.isOfficial }}
diff --git a/eng/pipelines/onebranch/stages/release-stages.yml b/eng/pipelines/onebranch/stages/release-stages.yml
index a9810f1251..917447a077 100644
--- a/eng/pipelines/onebranch/stages/release-stages.yml
+++ b/eng/pipelines/onebranch/stages/release-stages.yml
@@ -23,15 +23,6 @@
 #   - false → NuGet Test feed (via NuGetServiceConnectionTest).
 #
 # This template depends on stages defined by the build-stages.yml template.
-#
-# This template depends on the following runtime (i.e. macro expansion) variables being defined:
-#
-#  - effectiveSqlServerVersion
-#  - effectiveLoggingVersion
-#  - effectiveAbstractionsVersion
-#  - effectiveSqlClientVersion
-#  - effectiveAzureVersion
-#  - effectiveAkvProviderVersion
 
 parameters:
   # ── General parameters ─────────────────────────────────────────────────
@@ -60,6 +51,44 @@ parameters:
       - production
       - test
 
+  # Package Parameters -----------------------------------------------------
+
+  - name: abstractionsArtifactsName
+    type: string
+
+  - name: abstractionsPackageVersion
+    type: string
+
+  - name: akvProviderArtifactsName
+    type: string
+
+  - name: akvProviderPackageVersion
+    type: string
+
+  - name: azureArtifactsName
+    type: string
+
+  - name: azurePackageVersion
+    type: string
+
+  - name: loggingArtifactsName
+    type: string
+
+  - name: loggingPackageVersion
+    type: string
+
+  - name: sqlClientArtifactsName
+    type: string
+
+  - name: sqlClientPackageVersion
+    type: string
+
+  - name: sqlServerArtifactsName
+    type: string
+
+  - name: sqlServerPackageVersion
+    type: string
+
   # ── Release parameters ─────────────────────────────────────────────────
 
   - name: releaseSqlServerServer
@@ -77,7 +106,7 @@ parameters:
   - name: releaseAzure
     type: boolean
 
-  - name: releaseAKVProvider
+  - name: releaseAkvProvider
     type: boolean
 
 stages:
@@ -94,7 +123,7 @@ stages:
   #   true  → NuGet Production feed.
   #   false → NuGet Test feed.
   # ====================================================================
-  - ${{ if or(parameters.releaseSqlServerServer, parameters.releaseLogging, parameters.releaseAbstractions, parameters.releaseSqlClient, parameters.releaseAzure, parameters.releaseAKVProvider) }}:
+  - ${{ if or(parameters.releaseSqlServerServer, parameters.releaseLogging, parameters.releaseAbstractions, parameters.releaseSqlClient, parameters.releaseAzure, parameters.releaseAkvProvider) }}:
     - stage: release_${{ parameters.stageNameSuffix }}
       ${{ if eq(parameters.releaseToProduction, true) }}:
         displayName: Release to NuGet Production
@@ -107,8 +136,8 @@ stages:
           - build_abstractions
         - ${{ if or(parameters.releaseSqlClient, parameters.releaseAzure) }}:
           - build_dependent
-          - mds_package_validation
-        - ${{ if parameters.releaseAKVProvider }}:
+          - sqlclient_package_validation
+        - ${{ if parameters.releaseAkvProvider }}:
           - build_addons
 
       variables:
@@ -153,8 +182,8 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.SqlServer.Server
-              artifactName: $(sqlServerArtifactsName)
-              packagePath: Microsoft.SqlServer.Server.$(effectiveSqlServerVersion).nupkg
+              artifactName: '${{ parameters.sqlServerArtifactsName }}'
+              packagePath: 'Microsoft.SqlServer.Server.${{ parameters.sqlServerPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -163,8 +192,8 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Internal.Logging
-              artifactName: $(loggingArtifactsName)
-              packagePath: Microsoft.Data.SqlClient.Internal.Logging.$(effectiveLoggingVersion).nupkg
+              artifactName: '${{ parameters.loggingArtifactsName }}'
+              packagePath: 'Microsoft.Data.SqlClient.Internal.Logging.${{ parameters.loggingPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -173,8 +202,8 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Abstractions
-              artifactName: $(abstractionsArtifactsName)
-              packagePath: Microsoft.Data.SqlClient.Extensions.Abstractions.$(effectiveAbstractionsVersion).nupkg
+              artifactName: '${{ parameters.abstractionsArtifactsName }}'
+              packagePath: 'Microsoft.Data.SqlClient.Extensions.Abstractions.${{ parameters.abstractionsPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -183,8 +212,8 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient
-              artifactName: $(sqlClientArtifactsName)
-              packagePath: Microsoft.Data.SqlClient.$(effectiveSqlClientVersion).nupkg
+              artifactName: '${{ parameters.sqlClientArtifactsName }}'
+              packagePath: 'Microsoft.Data.SqlClient.${{ parameters.sqlClientPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -193,18 +222,18 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Azure
-              artifactName: $(azureArtifactsName)
-              packagePath: Microsoft.Data.SqlClient.Extensions.Azure.$(effectiveAzureVersion).nupkg
+              artifactName: '${{ parameters.azureArtifactsName }}'
+              packagePath: 'Microsoft.Data.SqlClient.Extensions.Azure.${{ parameters.azurePackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
 
-        - ${{ if eq(parameters.releaseAKVProvider, true) }}:
+        - ${{ if eq(parameters.releaseAkvProvider, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
-              artifactName: $(akvArtifactsName)
-              packagePath: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.$(effectiveAkvProviderVersion).nupkg
+              artifactName: '${{ parameters.akvProviderArtifactsName }}'
+              packagePath: 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.${{ parameters.akvProviderPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
diff --git a/eng/pipelines/onebranch/steps/build-csproj-step.yml b/eng/pipelines/onebranch/steps/build-csproj-step.yml
index d1cea7c190..a4a38b9fc3 100644
--- a/eng/pipelines/onebranch/steps/build-csproj-step.yml
+++ b/eng/pipelines/onebranch/steps/build-csproj-step.yml
@@ -15,13 +15,6 @@ parameters:
   - name: buildTarget
     type: string
 
-  # Build Configuration.
-  - name: buildConfiguration
-    type: string
-    values:
-      - Debug
-      - Release
-
   # Additional MSBuild arguments for version properties, e.g.
   # -p:LoggingPackageVersion=1.0.0 -p:LoggingAssemblyFileVersion=1.0.123
   - name: versionProperties
@@ -36,15 +29,15 @@ steps:
     name: keyFile
 
   - task: MSBuild@1
-    displayName: Build.proj - ${{ parameters.buildTarget }}
+    displayName: 'Build.proj - ${{ parameters.buildTarget }}'
     inputs:
-      solution: $(REPO_ROOT)/build.proj
-      configuration: ${{ parameters.buildConfiguration }}
+      solution: '$(REPO_ROOT)/build.proj'
+      configuration: 'Release'
       msbuildArguments: >-
-          -t:${{ parameters.buildTarget }}
-          -p:ReferenceType=Package
-          -p:SigningKeyPath=$(keyFile.secureFilePath)
-          ${{ parameters.versionProperties }}
+        -t:${{ parameters.buildTarget }}
+        -p:ReferenceType=Package
+        -p:SigningKeyPath=$(keyFile.secureFilePath)
+        ${{ parameters.versionProperties }}
 
   - script: tree /a /f $(BUILD_OUTPUT)
-    displayName: List Build Output Tree
+    displayName: Output Build Output Tree
diff --git a/eng/pipelines/onebranch/steps/build-mds-step.yml b/eng/pipelines/onebranch/steps/build-sqlclient-step.yml
similarity index 89%
rename from eng/pipelines/onebranch/steps/build-mds-step.yml
rename to eng/pipelines/onebranch/steps/build-sqlclient-step.yml
index 4d5058f261..390d17fc34 100644
--- a/eng/pipelines/onebranch/steps/build-mds-step.yml
+++ b/eng/pipelines/onebranch/steps/build-sqlclient-step.yml
@@ -13,7 +13,7 @@ parameters:
   - name: loggingPackageVersion
     type: string
 
-  - name: mdsPackageVersion
+  - name: sqlClientPackageVersion
     type: string
 
 steps:
@@ -24,7 +24,7 @@ steps:
     name: keyFile
 
   - task: MSBuild@1
-    displayName: 'Build2.proj - BuildMds'
+    displayName: 'Build2.proj - Build SqlClient'
     inputs:
       solution: '$(REPO_ROOT)/build2.proj'
       configuration: 'Release'
@@ -33,7 +33,7 @@ steps:
         -p:BuildNumber="$(Build.BuildNumber)"
         -p:PackageVersionAbstractions="${{ parameters.abstractionsPackageVersion }}"
         -p:PackageVersionLogging="${{ parameters.loggingPackageVersion }}"
-        -p:PackageVersionMds="${{ parameters.mdsPackageVersion }}"
+        -p:PackageVersionMds="${{ parameters.sqlClientPackageVersion }}"
         -p:ReferenceType=Package
         -p:SigningKeyPath="$(keyFile.secureFilePath)"
 
diff --git a/eng/pipelines/onebranch/steps/copy-apiscan-files-mds-step.yml b/eng/pipelines/onebranch/steps/copy-apiscan-files-sqlclient-step.yml
similarity index 100%
rename from eng/pipelines/onebranch/steps/copy-apiscan-files-mds-step.yml
rename to eng/pipelines/onebranch/steps/copy-apiscan-files-sqlclient-step.yml
diff --git a/eng/pipelines/onebranch/steps/pack-csproj-step.yml b/eng/pipelines/onebranch/steps/pack-csproj-step.yml
index db9b9a8237..edbec72c00 100644
--- a/eng/pipelines/onebranch/steps/pack-csproj-step.yml
+++ b/eng/pipelines/onebranch/steps/pack-csproj-step.yml
@@ -14,13 +14,6 @@ parameters:
   - name: packTarget
     type: string
 
-  # Build Configuration.
-  - name: buildConfiguration
-    type: string
-    values:
-      - Debug
-      - Release
-
   # Additional MSBuild arguments for version properties.
   - name: versionProperties
     type: string
@@ -28,15 +21,15 @@ parameters:
 
 steps:
   - task: MSBuild@1
-    displayName: Build.proj - ${{ parameters.packTarget }}
+    displayName: 'Build.proj - ${{ parameters.packTarget }}'
     inputs:
-      solution: $(REPO_ROOT)/build.proj
-      configuration: ${{ parameters.buildConfiguration }}
+      solution: '$(REPO_ROOT)/build.proj'
+      configuration: 'Release'
       msbuildArguments: >-
-          -t:${{ parameters.packTarget }}
-          -p:ReferenceType=Package
-          -p:PackagesDir=$(PACK_OUTPUT)/
-          ${{ parameters.versionProperties }}
+        -t:${{ parameters.packTarget }}
+        -p:ReferenceType=Package
+        -p:PackagesDir=$(PACK_OUTPUT)/
+        ${{ parameters.versionProperties }}
 
   - script: tree /a /f $(PACK_OUTPUT)
     displayName: List Pack Output Tree After Pack
diff --git a/eng/pipelines/onebranch/steps/pack-mds-step.yml b/eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
similarity index 89%
rename from eng/pipelines/onebranch/steps/pack-mds-step.yml
rename to eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
index f1277280ae..933c37f6a6 100644
--- a/eng/pipelines/onebranch/steps/pack-mds-step.yml
+++ b/eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
@@ -12,12 +12,12 @@ parameters:
   - name: loggingPackageVersion
     type: string
 
-  - name: mdsPackageVersion
+  - name: sqlClientPackageVersion
     type: string
 
 steps:
   - task: MSBuild@1
-    displayName: 'Build2.proj - PackMds'
+    displayName: 'Build2.proj - Pack SqlClient'
     inputs:
       solution: '$(REPO_ROOT)/build2.proj'
       configuration: 'Release'
@@ -27,7 +27,7 @@ steps:
         -p:PackBuild=false
         -p:PackageVersionAbstractions="${{ parameters.abstractionsPackageVersion }}"
         -p:PackageVersionLogging="${{ parameters.loggingPackageVersion }}"
-        -p:PackageVersionMds="${{ parameters.mdsPackageVersion }}"
+        -p:PackageVersionMds="${{ parameters.sqlClientPackageVersion }}"
         -p:ReferenceType=Package
 
   - script: tree /a /f $(BUILD_OUTPUT)
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
index c112493603..8810bed838 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
@@ -5,7 +5,7 @@
 #################################################################################
 
 # This template defines a step to run Roslyn Analyzers against builds driven by
-# build.proj. It is used for both the full Microsoft.Data.SqlClient (MDS) build
+# build.proj. It is used for both the full Microsoft.Data.SqlClient (SqlClient) build
 # and for individual extension packages; callers control the analyzed targets
 # via the msBuildArguments parameter.
 # It uses the RoslynAnalyzers@3 task from the Secure Development Team's SDL
@@ -17,30 +17,24 @@
 # _before_ any build steps that perform versioning or signing.
 
 parameters:
-  # Source Root.
-  - name: sourceRoot
+  # Target to build from build.proj. This is separated from the rest of the msBuildArguments to
+  # provide a rich display name.
+  - name: buildTarget
     type: string
-    default: $(REPO_ROOT)
 
-  # MSBuild arguments appended after the project file path.  The default targets
-  # BuildAllConfigurations for the full MDS build; override this when analyzing
-  # individual extension packages.
+  # Additional build arguments to append to the end of the MSBuild command.
   - name: msBuildArguments
     type: string
-    default: >-
-      -t:BuildAllConfigurations
-      -p:configuration=Release
-      -p:GenerateNuget=false
-      -p:BuildTools=false
 
 steps:
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
-    displayName: Roslyn Analyzers
+    displayName: 'Roslyn Analyzers: build.proj ${{ parameters.buildTarget }}'
     inputs:
       msBuildVersion: 17.0
       msBuildArchitecture: x64
       setupCommandLinePicker: vs2022
       msBuildCommandLine: >-
         msbuild
-        ${{parameters.sourceRoot}}\build.proj
-        ${{parameters.msBuildArguments}}
+        $(REPO_ROOT)\build.proj
+        -t:${{ parameters.buildTarget }}
+        ${{ parameters.msBuildArguments }}
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-mds-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml
similarity index 84%
rename from eng/pipelines/onebranch/steps/roslyn-analyzers-mds-step.yml
rename to eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml
index 5fe8009078..813df97326 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-mds-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml
@@ -4,7 +4,7 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# This template defines a step to run Roslyn Analyzers on the MDS build. It uses the
+# This template defines a step to run Roslyn Analyzers on the SqlClient build. It uses the
 # RoslynAnalyzers@3 task from the Secure Development Team's SDL extension:
 #
 # https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-mohanb/security-integration/guardian-wiki/sdl-azdo-extension/roslyn-analyzers-build-task
@@ -19,12 +19,12 @@ parameters:
   - name: loggingPackageVersion
     type: string
 
-  - name: mdsPackageVersion
+  - name: sqlClientPackageVersion
     type: string
 
 steps:
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
-    displayName: 'Roslyn Analyzers: Build2.proj BuildMds'
+    displayName: 'Roslyn Analyzers: build2.proj Build SqlClient'
     inputs:
       msBuildArchitecture: x64
       msBuildCommandLine: >-
@@ -34,7 +34,7 @@ steps:
         -p:Configuration=Release
         -p:PackageVersionAbstractions="${{ parameters.abstractionsPackageVersion }}"
         -p:PackageVersionLogging="${{ parameters.loggingPackageVersion }}"
-        -p:PackageVersionMds="${{ parameters.mdsPackageVersion }}"
+        -p:PackageVersionMds="${{ parameters.sqlClientPackageVersion }}"
         -p:ReferenceType=Package
       msBuildVersion: 17.0
       setupCommandLinePicker: vs2022
diff --git a/eng/pipelines/onebranch/variables/common-variables.yml b/eng/pipelines/onebranch/variables/common-variables.yml
index dbbddefc51..a2a48ba184 100644
--- a/eng/pipelines/onebranch/variables/common-variables.yml
+++ b/eng/pipelines/onebranch/variables/common-variables.yml
@@ -7,27 +7,10 @@
 # Common variables shared across all OneBranch Official pipelines.
 
 variables:
-  - group: Release Variables
-
-  # Symbols publishing credentials
-  - group: Symbols publishing
-    # SymbolsAzureSubscription
-    # SymbolsPublishProjectName
-    # SymbolsPublishServer
-    # SymbolsPublishTokenUri
-    # SymbolsUploadAccount
-
-  - group: ESRP Federated Creds (AME)
-    # ESRPConnectedServiceName
-    # ESRPClientId
-    # AppRegistrationClientId
-    # AppRegistrationTenantId
-    # AuthAKVName
-    # AuthSignCertName
-
   - name: CommitHead
     value: '' # the value will be extracted from the repo's head
 
+  ##########################################################################
   # "Well-Known" Variables that are ok to use directly, anywhere in the pipeline.
 
   # The root of our repo.
@@ -35,147 +18,18 @@ variables:
     value: $(Build.SourcesDirectory)
 
   # This is where our C# projects place their build outputs (see Directory.Build.props
-  # <ArtifactsPath>).  We exclude the reference type here since Official pipelines always use
+  # <ArtifactsPath>). We exclude the reference type here since Official pipelines always use
   # Package mode.
   - name: BUILD_OUTPUT
     value: $(REPO_ROOT)/artifacts
 
-  # This is where our C# projects place their NuGet package outputs.  This is intentionally
-  # separate from packages/ (where downloaded pipeline artifacts go) so that ESRP signing and
+  # This is where downloaded artifacts should be placed. This will enable other build jobs to
+  # do local NuGet installations with packages built by earlier stages.
+  - name: PACK_INPUT
+    value: $(REPO_ROOT)/packages
+
+  # This is where our C# projects place their NuGet package outputs. This is intentionally
+  # separated from packages/ (where downloaded pipeline artifacts go) so that ESRP signing and
   # OneBranch artifact publishing only operate on packages built by the current job.
   - name: PACK_OUTPUT
     value: $(REPO_ROOT)/output
-
-  # C# assembly versions must be in the format: Major.Minor.Build.Revision, but
-  # $(Build.BuildNumber) has the format XXX.YY.  Additionally, each version part
-  # must be a positive 16-bit integer less than 65535.  Simply concatenating
-  # both parts of $(Build.BuildNumber) could produce values larger than 65534,
-  # so we must omit the second part entirely.  Unfortunately, this may result
-  # in multiple subsequent pipline builds using the same C# assembly versions.
-  # The package versions will not be affected and will show the complete
-  # $(Build.BuildNumber) values.
-  - name: assemblyBuildNumber
-    value: $[ split(variables['Build.BuildNumber'], '.')[0] ]
-
-  # ----------------------------------------------------------------------------
-  # Abstractions Package Versions
-  #
-  # These are version values that will be used by the official build.  They
-  # should be updated after each release to reflect the next release's versions.
-
-  # The NuGet package version for GA releases (non-preview).
-  - name: abstractionsPackageVersion
-    value: '1.0.0'
-
-  # The NuGet package version for preview releases.
-  - name: abstractionsPackagePreviewVersion
-    value: 1.0.0-preview1.$(Build.BuildNumber)
-
-  # The AssemblyFileVersion for all assemblies in the Abstractions package.
-  - name: abstractionsAssemblyFileVersion
-    value: 1.0.0.$(assemblyBuildNumber)
-
-  # ----------------------------------------------------------------------------
-  # MDS Package Versions
-  #
-  # These are version values that will be used by the official build.  They
-  # should be updated after each release to reflect the next release's versions.
-
-  # The NuGet package version for GA releases (non-preview).
-  - name: mdsPackageVersion
-    value: '7.0.0'
-
-  # The NuGet package version for preview releases.
-  - name: mdsPackagePreviewVersion
-    value: 7.0.0-preview4.$(Build.BuildNumber)
-
-  # The AssemblyFileVersion for all assemblies in the MDS package.
-  - name: mdsAssemblyFileVersion
-    value: 7.0.0.$(assemblyBuildNumber)
-
-  # The path to the NuGet packaging specification file used to generate the MDS NuGet package.
-  - name: nuspecPath
-    value: '$(REPO_ROOT)/tools/specs/Microsoft.Data.SqlClient.nuspec'
-
-  # ----------------------------------------------------------------------------
-  # Logging Package Versions
-  #
-  # These are version values that will be used by the official build.  They
-  # should be updated after each release to reflect the next release's versions.
-
-  # The NuGet package version for GA releases (non-preview).
-  - name: loggingPackageVersion
-    value: '1.0.0'
-
-  # The NuGet package version for preview releases.
-  - name: loggingPackagePreviewVersion
-    value: 1.0.0-preview1.$(Build.BuildNumber)
-
-  # The AssemblyFileVersion for all assemblies in the Logging package.
-  - name: loggingAssemblyFileVersion
-    value: 1.0.0.$(assemblyBuildNumber)
-
-  # ----------------------------------------------------------------------------
-  # Azure Package Versions
-  #
-  # These are version values that will be used by the official build.  They
-  # should be updated after each release to reflect the next release's versions.
-
-  # The NuGet package version for GA releases (non-preview).
-  - name: azurePackageVersion
-    value: '1.0.0'
-
-  # The NuGet package version for preview releases.
-  - name: azurePackagePreviewVersion
-    value: 1.0.0-preview1.$(Build.BuildNumber)
-
-  # The AssemblyFileVersion for all assemblies in the Azure package.
-  - name: azureAssemblyFileVersion
-    value: 1.0.0.$(assemblyBuildNumber)
-
-  # ----------------------------------------------------------------------------
-  # SqlServer.Server Package Versions
-  #
-  # These are version values that will be used by the official build.  They
-  # should be updated after each release to reflect the next release's versions.
-
-  # The NuGet package version for GA releases (non-preview).
-  - name: sqlServerPackageVersion
-    value: '1.0.0'
-
-  # The NuGet package version for preview releases.
-  - name: sqlServerPackagePreviewVersion
-    value: 1.0.0-preview1.$(Build.BuildNumber)
-
-  # The AssemblyFileVersion for all assemblies in the SqlServer.Server package.
-  - name: sqlServerAssemblyFileVersion
-    value: 1.0.0.$(assemblyBuildNumber)
-
-  # ----------------------------------------------------------------------------
-  # AKV Provider Package Versions
-  #
-  # These are version values that will be used by the official build.  They
-  # should be updated after each release to reflect the next release's versions.
-
-  # The NuGet package version for GA releases (non-preview).
-  - name: akvPackageVersion
-    value: '7.0.0'
-
-  # The NuGet package version for preview releases.
-  - name: akvPackagePreviewVersion
-    value: 7.0.0-preview1.$(Build.BuildNumber)
-
-  # The AssemblyFileVersion for all assemblies in the AKV Provider package.
-  - name: akvAssemblyFileVersion
-    value: 7.0.0.$(assemblyBuildNumber)
-
-  # ----------------------------------------------------------------------------
-  # MDS Symbols Publishing
-  #
-  # Alias variables for MDS publish-symbols-step.yml, which defaults to
-  # $(SymbolServer) and $(SymbolTokenUri).  These map to the values provided
-  # by the "Symbols publishing" library group.
-  - name: SymbolServer
-    value: $(SymbolsPublishServer)
-  - name: SymbolTokenUri
-    value: $(SymbolsPublishTokenUri)
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index 004786e25f..4009c60b3d 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -4,52 +4,41 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# This file is only included in MDS OneBranch Official pipelines.
+# This file is only included in SqlClient OneBranch Official pipelines.
 
 variables:
-  - template: /eng/pipelines/onebranch/variables/common-variables.yml@self
+  # Libraries ==============================================================
 
-  # onebranch template variables
-  - name: ob_sdl_binskim_break
-    value: true # https://aka.ms/obpipelines/sdl
-  - name: Packaging.EnableSBOMSigning
-    value: true
-  - name: WindowsContainerImage
-    value: "onebranch.azurecr.io/windows/ltsc2022/vse2022:latest" # Docker image which is used to build the project https://aka.ms/obpipelines/containers
-
-  # OneBranch automatically publishes pipeline artifacts from all jobs.  Use of the
-  # PublishPipelineArtifacts task is prohibited.  All content in the ob_outputDirectory is
-  # published.  The artifacts are named according to this pattern:
-  #
-  #   drop_<stageName>_<jobName>
+  # These variables are used for running ESRP signing tasks. All names start with "Signing" to make
+  # it clear that these variables are used for signing (as opposed to other msc tasks).
   #
-  # Downstream stages and jobs may download these artifacts via the DownloadPipelineArtifact task,
-  # but they must know the artifact name.
+  # SigningAppRegistrationClientId
+  # SigningAppRegistrationTenantId
+  # SigningAuthAkvName
+  # SigningAuthSignCertName
+  # SigningEsrpClientId
+  # SigningEsrpConnectedServiceName
+  - group: 'esrp-variables-v2'
+
+  # These variables are used for running symbol publishing tasks. All names start with "Symbols" to
+  # make it clear that these variables are used for symbols (as opposed to other msc tasks).
   #
-  # Here we define the artifact names that our OneBranch pipelines produce to avoid hardcoding them
-  # throughout the pipeline files.  If any of the stage or job names change, we only need to update
-  # the artifact names here.
-
-  # The Abstractions package artifacts.
-  - name: abstractionsArtifactsName
-    value: drop_build_abstractions_build_package_Abstractions
+  # SymbolsAzureSubscription
+  # SymbolsPublishProjectName
+  # SymbolsPublishServer
+  # SymbolsPublishTokenUri
+  # SymbolsUploadAccount
+  - group: 'symbols-variables-v2'
 
-  # The AKV Provider package artifacts.
-  - name: akvArtifactsName
-    value: drop_build_addons_build_package_AkvProvider
+  # OneBranch Template Variables ###########################################
 
-  # The Azure package artifacts.
-  - name: azureArtifactsName
-    value: drop_build_dependent_build_package_Azure
-
-  # The Logging package artifacts.
-  - name: loggingArtifactsName
-    value: drop_build_independent_build_package_Logging
+  # https://aka.ms/obpipelines/sdl
+  - name: ob_sdl_binskim_break
+    value: true
 
-  # The SqlServer package artifacts.
-  - name: sqlServerArtifactsName
-    value: drop_build_independent_build_package_SqlServer
+  - name: Packaging.EnableSBOMSigning
+    value: true
 
-  # The SqlClient package artifacts.
-  - name: sqlClientArtifactsName
-    value: drop_build_dependent_build_package_Mds
+  # Docker image which is used to build the project https://aka.ms/obpipelines/containers
+  - name: WindowsContainerImage
+    value: "onebranch.azurecr.io/windows/ltsc2022/vse2022:latest"
diff --git a/eng/pipelines/onebranch/variables/package-variables.yml b/eng/pipelines/onebranch/variables/package-variables.yml
new file mode 100644
index 0000000000..92f9863021
--- /dev/null
+++ b/eng/pipelines/onebranch/variables/package-variables.yml
@@ -0,0 +1,137 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This file contains variables that relate to the various packages that are produced via the
+# OneBranch official/non-official pipelines. They are grouped by the packages they represent.
+#
+# The variables are defined as the following main types:
+# - *ArtifactsName
+#   What the artifacts drop for the various stages of the pipeline will be named.
+#
+#   OneBranch automatically publishes pipeline artifacts from all jobs. Use of the
+#   PublishPipelineArtifacts task is prohibited. All content in the ob_outputDirectory is
+#   automatically published. The artifacts are named according to this pattern:
+#
+#   drop_<stageName>_<jobName>
+#
+#   Downstream stages and jobs may download these artifacts via the DownloadPipelineArtifact task,
+#   but they must know the artifact name.
+#
+# - *FileVersion
+#   Version to use for the FileVersion field in the assembly.
+#
+# - *PackageVersion
+#   NuGet package versions releases. This is switched based on the isPreview parameter.
+
+# @TODO: Although defining the versions in source is a major improvement over depending on versions
+#  coming from variable libraries, this is not the final form. Ideally, we want a single point for
+#  versions to be defined and are moving towards doing so via the [PackageName]Versions.props
+#  files. In the meantime, when doing a version bump (after a release), versions will need to be
+# updated here and in their corresponding *Versions.props file.
+
+parameters:
+  - name: isPreview
+    type: boolean
+
+variables:
+  # C# assembly versions must be in the format: Major.Minor.Build.Revision, but
+  # $(Build.BuildNumber) has the format XXX.YY. Additionally, each version part must be a positive
+  # 16-bit integer less than 65535. Simply concatenating both parts of $(Build.BuildNumber) could
+  # produce values larger than 65534, so we must omit the second part entirely. Unfortunately, this
+  # may result in multiple subsequent pipline builds using the same C# assembly versions. The
+  # package versions will not be affected and will show the complete $(Build.BuildNumber) values.
+  - name: _assemblyBuildNumber
+    value: $[ split(variables['Build.BuildNumber'], '.')[0] ]
+
+  # ------------------------------------------------------------------------
+  # Abstractions Package
+  # Microsoft.Data.SqlClient.Extensions.Abstractions
+  - name: abstractionsArtifactsName
+    value: 'drop_build_abstractions_build_package_Abstractions'
+
+  - name: abstractionsFileVersion
+    value: '1.0.0.$(_assemblyBuildNumber)'
+
+  - name: abstractionsPackageVersion
+    ${{ if parameters.isPreview }}:
+      value: '1.0.0-preview1.$(Build.BuildNumber)'
+    ${{ else }}:
+      value: '1.0.0'
+
+  # ------------------------------------------------------------------------
+  # AKV Provider Package
+  # Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVault
+  - name: akvProviderArtifactsName
+    value: 'drop_build_addons_build_package_AkvProvider'
+
+  - name: akvProviderFileVersion
+    value: '7.0.0.$(_assemblyBuildNumber)'
+
+  - name: akvProviderPackageVersion
+    ${{ if parameters.isPreview }}:
+      value: '7.0.0-preview1.$(Build.BuildNumber)'
+    ${{ else }}:
+      value: '7.0.0'
+
+  # ------------------------------------------------------------------------
+  # Azure Package
+  # Microsoft.Data.SqlClient.Extensions.Azure
+  - name: azureArtifactsName
+    value: 'drop_build_dependent_build_package_Azure'
+
+  - name: azureFileVersion
+    value: '1.0.0.$(_assemblyBuildNumber)'
+
+  - name: azurePackageVersion
+    ${{ if parameters.isPreview }}:
+      value: '1.0.0-preview1.$(Build.BuildNumber)'
+    ${{ else }}:
+      value: '1.0.0'
+
+  # ------------------------------------------------------------------------
+  # Logging Package
+  # Microsoft.Data.SqlClient.Internal.Logging
+  - name: loggingArtifactsName
+    value: 'drop_build_independent_build_package_Logging'
+
+  - name: loggingFileVersion
+    value: '1.0.0.$(_assemblyBuildNumber)'
+
+  - name: loggingPackageVersion
+    ${{ if parameters.isPreview }}:
+      value: '1.0.0-preview1.$(Build.BuildNumber)'
+    ${{ else }}:
+      value: '1.0.0'
+
+  # ------------------------------------------------------------------------
+  # SqlClient Package
+  # Microsoft.Data.SqlClient
+  - name: sqlClientArtifactsName
+    value: 'drop_build_dependent_build_package_SqlClient'
+
+  - name: sqlClientFileVersion
+    value: '7.0.0.$(_assemblyBuildNumber)'
+
+  - name: sqlClientPackageVersion
+    ${{ if parameters.isPreview }}:
+      value: '7.0.0-preview4.$(Build.BuildNumber)'
+    ${{ else }}:
+      value: '7.0.0'
+
+  # ------------------------------------------------------------------------
+  # SqlServer Package
+  # Microsoft.SqlServer.Server
+  - name: sqlServerArtifactsName
+    value: 'drop_build_independent_build_package_SqlServer'
+
+  - name: sqlServerFileVersion
+    value: '1.0.0.$(_assemblyBuildNumber)'
+
+  - name: sqlServerPackageVersion
+    ${{ if parameters.isPreview }}:
+      value: '1.0.0-preview1.$(Build.BuildNumber)'
+    ${{ else }}:
+      value: '1.0.0'
diff --git a/eng/pipelines/onebranch/variables/sqlclient-validation-variables.yml b/eng/pipelines/onebranch/variables/sqlclient-validation-variables.yml
deleted file mode 100644
index 75ad369dbc..0000000000
--- a/eng/pipelines/onebranch/variables/sqlclient-validation-variables.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# This file is only included in MDS OneBranch Official pipelines.
-
-variables:
-  - group: Release Variables
-  - template: /eng/pipelines/onebranch/variables/common-variables.yml@self
-
-  - name: TempFolderName # extract the nuget package here
-    value: temp
-  - name: extractedNugetRootPath
-    value: $(Build.SourcesDirectory)\$(TempFolderName)\Microsoft.Data.SqlClient
-  - name: extractedNugetPath
-    value: $(extractedNugetRootPath).$(mdsPackageVersion)
-  - name: expectedFolderNames
-    value: lib,ref,runtimes
-  - name: expectedDotnetVersions
-    value: netstandard2.0,net462,net8.0,net9.0
-  - name: Database
-    value: Northwind
-  - name: platform
-    value: AnyCPU
-  - name: TargetNetFxVersion
-    value: net481
-  - name: TargetNetCoreVersion
-    value: net9.0
-  - name: SQLTarget
-    value: localhost
-  - name: encrypt
-    value: false
-  - name: SQL_NP_CONN_STRING
-    value: Data Source=np:$(SQLTarget);Initial Catalog=$(Database);Integrated Security=true;Encrypt=$(ENCRYPT);TrustServerCertificate=true;
-  - name: SQL_TCP_CONN_STRING
-    value: Data Source=tcp:$(SQLTarget);Initial Catalog=$(Database);Integrated Security=true;Encrypt=$(ENCRYPT);TrustServerCertificate=true;
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
index 0452cba60c..46eb7fc748 100644
--- a/src/Microsoft.Data.SqlClient.slnx
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -126,95 +126,9 @@
   <Folder Name="/eng/">
     <File Path="../build.proj" />
     <File Path="../build2.proj" />
-  </Folder>
-  <Folder Name="/eng/pipelines/">
-    <File Path="../eng/pipelines/dotnet-sqlclient-ci-core.yml" />
-    <File Path="../eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml" />
-    <File Path="../eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml" />
-    <File Path="../eng/pipelines/sqlclient-pr-package-ref-pipeline.yml" />
-    <File Path="../eng/pipelines/sqlclient-pr-project-ref-pipeline.yml" />
-    <File Path="../eng/pipelines/stress-tests-pipeline.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/common/" />
-  <Folder Name="/eng/pipelines/common/templates/" />
-  <Folder Name="/eng/pipelines/common/templates/jobs/">
-    <File Path="../eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml" />
-    <File Path="../eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml" />
-    <File Path="../eng/pipelines/common/templates/jobs/ci-run-tests-job.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/common/templates/stages/">
-    <File Path="../eng/pipelines/common/templates/stages/ci-run-tests-stage.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/common/templates/steps/">
-    <File Path="../eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/ci-project-build-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/configure-sql-server-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/generate-nuget-package-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/override-sni-version.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/pre-build-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/prepare-test-db-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/publish-test-results-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/run-all-tests-step.yml" />
-    <File Path="../eng/pipelines/common/templates/steps/update-config-file-step.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/jobs/">
-    <File Path="../eng/pipelines/jobs/pack-abstractions-package-ci-job.yml" />
-    <File Path="../eng/pipelines/jobs/pack-azure-package-ci-job.yml" />
-    <File Path="../eng/pipelines/jobs/pack-logging-package-ci-job.yml" />
-    <File Path="../eng/pipelines/jobs/stress-tests-ci-job.yml" />
-    <File Path="../eng/pipelines/jobs/test-abstractions-package-ci-job.yml" />
-    <File Path="../eng/pipelines/jobs/test-azure-package-ci-job.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/libraries/">
-    <File Path="../eng/pipelines/libraries/ci-build-variables.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/onebranch/">
-    <File Path="../eng/pipelines/onebranch/sqlclient-non-official.yml" />
-    <File Path="../eng/pipelines/onebranch/sqlclient-official.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/onebranch/jobs/">
-    <File Path="../eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml" />
-    <File Path="../eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml" />
-    <File Path="../eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml" />
-    <File Path="../eng/pipelines/onebranch/jobs/validate-signed-package-job.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/onebranch/stages/">
-    <File Path="../eng/pipelines/onebranch/stages/build-stages.yml" />
-    <File Path="../eng/pipelines/onebranch/stages/release-stages.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/onebranch/steps/">
-    <File Path="../eng/pipelines/onebranch/steps/build-all-configurations-signed-dlls-step.yml" />
-    <File Path="../eng/pipelines/onebranch/steps/code-analyze-step.yml" />
-    <File Path="../eng/pipelines/onebranch/steps/compound-build-csproj-step.yml" />
-    <File Path="../eng/pipelines/onebranch/steps/compound-esrp-dll-signing-step.yml" />
-    <File Path="../eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml" />
-    <File Path="../eng/pipelines/onebranch/steps/compound-nuget-pack-step.yml" />
-    <File Path="../eng/pipelines/onebranch/steps/compound-pack-csproj-step.yml" />
-    <File Path="../eng/pipelines/onebranch/steps/compound-publish-symbols-step.yml" />
-    <File Path="../eng/pipelines/onebranch/steps/esrp-code-signing-step.yml" />
-    <File Path="../eng/pipelines/onebranch/steps/publish-symbols-step.yml" />
-    <File Path="../eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/onebranch/variables/">
-    <File Path="../eng/pipelines/onebranch/variables/common-variables.yml" />
-    <File Path="../eng/pipelines/onebranch/variables/onebranch-variables.yml" />
-    <File Path="../eng/pipelines/onebranch/variables/sqlclient-validation-variables.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/stages/">
-    <File Path="../eng/pipelines/stages/build-abstractions-package-ci-stage.yml" />
-    <File Path="../eng/pipelines/stages/build-azure-package-ci-stage.yml" />
-    <File Path="../eng/pipelines/stages/build-logging-package-ci-stage.yml" />
-    <File Path="../eng/pipelines/stages/build-sqlclient-package-ci-stage.yml" />
-    <File Path="../eng/pipelines/stages/generate-secrets-ci-stage.yml" />
-    <File Path="../eng/pipelines/stages/stress-tests-ci-stage.yml" />
-  </Folder>
-  <Folder Name="/eng/pipelines/steps/">
-    <File Path="../eng/pipelines/steps/install-dotnet-arm64.ps1" />
-    <File Path="../eng/pipelines/steps/install-dotnet.yml" />
+    <Project Path="../eng/pipelines/Pipelines.csproj">
+      <Build Project="false" />
+    </Project>
   </Folder>
   <Folder Name="/Microsoft.Data.SqlClient.Extensions/" />
   <Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/" />

From d7fb5cb45ad46a9a7131fdbf93c88ccea76b9a3a Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Wed, 8 Apr 2026 02:13:06 +0100
Subject: [PATCH 030/298] Tests | Add collation transcoding tests (#4051)

* Replace CollatedDataReaderTest

This previously only tested Kazakh_90_CI_AI and Georgian_Modern_Sort_CI_AS. The replacement tests every collation.
It also performs a more comprehensive check that the string/byte[] roundtrips with the varbinary/varchar from the database instance.
Finally, it no longer requires permission to drop and create databases: we can just use the COLLATE statement.

* Add collated output parameter test
---
 .../SQL/DataReaderTest/DataReaderTest.cs      | 111 ++++++++++++------
 .../SQL/ParameterTest/OutputParameterTests.cs |  47 ++++++++
 2 files changed, 122 insertions(+), 36 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
index 040119616e..5cf8b1e4b4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
@@ -125,49 +125,88 @@ public static void CheckSparseColumnBit()
             }
         }
 
-        // Synapse: Statement 'Drop Database' is not supported in this version of SQL Server.
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotAzureSynapse))]
-        [InlineData("KAZAKH_90_CI_AI")]
-        [InlineData("Georgian_Modern_Sort_CI_AS")]
-        public static void CollatedDataReaderTest(string collation)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public static void CollatedDataReaderTest()
         {
-            string dbName = DataTestUtility.GetShortName("CollationTest", false);
-
-            SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString)
+            const string SampleText = "Text with an accented é varies by encoding";
+            const string CollatedStringCommandText = $@"declare c cursor for
+	select name
+	from fn_helpcollations()
+declare @collation nvarchar(max)
+
+open c
+fetch next from c into @collation
+
+while @@FETCH_STATUS = 0
+begin
+	declare @sql nvarchar(max) = N'select @collation as [Collation],
+		convert(int, COLLATIONPROPERTY(@collation, ''LCID'')) & 0xFFFF as [LanguageId],
+		convert(int, COLLATIONPROPERTY(@collation, ''LCID'')) as [LCID],
+		convert(int, COLLATIONPROPERTY(@collation, ''CodePage'')) as [CodePage],
+		@Text collate ' + @collation + ' as [Text],
+		convert(varbinary(max), @Text collate ' + @collation + ')'
+
+	begin try
+		exec sp_executesql @sql, N'@collation nvarchar(max), @Text varchar(max)', @Text='{SampleText}', @collation=@collation
+	end try
+	begin catch
+        -- Error 459: Collation '%.*ls' is supported on Unicode data types only and cannot be applied to char, varchar or text data types.
+		if error_number() != 459
+		begin
+			throw
+		end
+	end catch
+
+	fetch next from c into @collation
+end
+
+close c
+deallocate c";
+
+            using SqlConnection conn = new(DataTestUtility.TCPConnectionString);
+            using SqlCommand collatedStringCommand = new(CollatedStringCommandText, conn);
+
+            conn.Open();
+            using SqlDataReader reader = collatedStringCommand.ExecuteReader();
+
+            // We receive one result set per collation, with identical columns:
+            // 1. Collation name
+            // 2. Language ID (the LCID without any flags)
+            // 3. LCID (with flags)
+            // 4. ID of the code page used to decode the byte array
+            // 5. The collated string itself
+            // 6. The collated string, converted to a byte array within SQL Server
+            do
             {
-                InitialCatalog = dbName,
-                Pooling = false
-            };
+                reader.Read();
 
-            using SqlConnection con = new(DataTestUtility.TCPConnectionString);
-            using SqlCommand cmd = con.CreateCommand();
-            try
-            {
-                con.Open();
+                string collationName = reader.GetString(0);
+                int languageId = reader.GetInt32(1);
+                int lcid = reader.GetInt32(2);
+                int codePageId = reader.GetInt32(3);
+                string collatedString = reader.GetString(4);
+                byte[] collatedStringBytes = reader.GetSqlBinary(5).Value;
 
-                // Create collated database
-                cmd.CommandText = $"CREATE DATABASE [{dbName}] COLLATE {collation}";
-                cmd.ExecuteNonQuery();
+                // The code page's encoding must exist. We must then be able to round-trip the string
+                // to and from a byte array.
+                Encoding codePageEncoding = Encoding.GetEncoding(codePageId);
 
-                //Create connection without pooling in order to delete database later.
-                using (SqlConnection dbCon = new(builder.ConnectionString))
-                using (SqlCommand dbCmd = dbCon.CreateCommand())
-                {
-                    string data = Guid.NewGuid().ToString();
+                Assert.True(codePageEncoding is not null,
+                    $@"Collation ""{collationName}"", LCID {lcid}, code page {codePageId} is not identifiable as a client-side encoding.");
 
-                    dbCon.Open();
-                    dbCmd.CommandText = $"SELECT '{data}'";
-                    using SqlDataReader reader = dbCmd.ExecuteReader();
-                    reader.Read();
-                    Assert.Equal(data, reader.GetString(0));
-                }
-            }
-            finally
-            {
-                // Let connection close safely before dropping database for slow servers.
-                Thread.Sleep(500);
-                DataTestUtility.DropDatabase(con, dbName);
+                string clientSideDecodedString = codePageEncoding.GetString(collatedStringBytes);
+                byte[] clientSideStringBytes = codePageEncoding.GetBytes(collatedString);
+
+                Assert.True(collatedString == clientSideDecodedString,
+                    $@"Collation ""{collationName}"", LCID {lcid}, code page {codePageId}: server-supplied string does not match client-side decoded bytes.");
+
+                Assert.True(collatedStringBytes.AsSpan().SequenceEqual(clientSideStringBytes),
+                    $@"Collation ""{collationName}"", LCID {lcid}, code page {codePageId}: server-supplied byte array does not match client-side encoded bytes.");
+
+                // The character é does not exist in the Cyrillic character set, so do not compare the
+                // collated string with the original input text.
             }
+            while (reader.NextResult());
         }
 
         private static bool IsColumnBitSet(SqlConnection con, string selectQuery, int indexOfColumnSet)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs
index 98e51b812d..537313792e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
+using System.Text;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
@@ -12,6 +13,16 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     /// </summary>
     public class OutputParameterTests
     {
+        /// <summary>
+        /// Test data indicating which collations do not encode the character é to 0xE9.
+        /// </summary>
+        public static TheoryData<string, int> OutputParameterCodePages =>
+            // Code page 936 and 65001/UTF8 do not encode "é" to 0xE9. CP936 encodes it to [0xA8, 0xA6], UTF8 encodes it to [0xC3, 0xA9]
+            // Chinese_PRC_CI_AI and Albanian_100_CI_AI_SC_UTF8 are the alphabetically first collations which use these two code pages.
+            DataTestUtility.IsUTF8Supported()
+                ? new() { { "Chinese_PRC_CI_AI", 936 }, { "Albanian_100_CI_AI_SC_UTF8", 65001 } }
+                : new() { { "Chinese_PRC_CI_AI", 936 } };
+
         /// <summary>
         /// Tests that setting an output SqlParameter to an invalid value (e.g. a string in a decimal param)
         /// doesn't throw, since the value is cleared before execution starts.
@@ -48,5 +59,41 @@ public void InvalidValueInOutputParameter_ShouldSucceed()
             // Validate - the output value should be set correctly by SQL Server
             Assert.Equal(new decimal(1.23), (decimal)decimalParam.Value);
         }
+
+        /// <summary>
+        /// Tests that text with sample collations roundtrips.
+        /// </summary>
+        /// <param name="collation">Name of a SQL Server collation which encodes text in the given code page.</param>
+        /// <param name="codePage">ID of the codepage which should be used by SQL Server and the driver to encode and decode text.</param>
+        [Theory]
+        [MemberData(nameof(OutputParameterCodePages))]
+        public void CollatedStringInOutputParameter_DecodesSuccessfully(string collation, int codePage)
+        {
+            const string SampleText = "Text with an accented é varies by encoding";
+
+            using SqlConnection sqlConnection = new(DataTestUtility.TCPConnectionString);
+            using SqlCommand roundtripCollationCommand = new($"SELECT @Output_Varchar = convert(varchar(max), '{SampleText}') COLLATE {collation}, " +
+                $"@Output_Varbinary = convert(varbinary(max), convert(varchar(max), '{SampleText}') COLLATE {collation})", sqlConnection);
+            SqlParameter outputVarcharParameter = new("@Output_Varchar", SqlDbType.VarChar, 8000)
+            { Direction = ParameterDirection.Output };
+            SqlParameter outputVarbinaryParameter = new("@Output_Varbinary", SqlDbType.VarBinary, 8000)
+            { Direction = ParameterDirection.Output };
+            Encoding codePageEncoding = Encoding.GetEncoding(codePage);
+
+            roundtripCollationCommand.Parameters.Add(outputVarcharParameter);
+            roundtripCollationCommand.Parameters.Add(outputVarbinaryParameter);
+
+            sqlConnection.Open();
+            roundtripCollationCommand.ExecuteNonQuery();
+
+            string clientSideDecodedString = codePageEncoding.GetString((byte[])outputVarbinaryParameter.Value);
+            byte[] clientSideStringBytes = codePageEncoding.GetBytes(outputVarcharParameter.Value.ToString());
+
+            // Verify that the varchar value has been decoded correctly and matches the sample text,
+            // then verify that the varbinary value roundtrips properly.
+            Assert.Equal(SampleText, outputVarcharParameter.Value.ToString());
+            Assert.Equal(outputVarcharParameter.Value.ToString(), clientSideDecodedString);
+            Assert.Equal((byte[])outputVarbinaryParameter.Value, clientSideStringBytes);
+        }
     }
 }

From 5d695b664b873b8cddef8ff8c6873c136520f438 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Wed, 8 Apr 2026 11:56:49 +1000
Subject: [PATCH 031/298] Fix typo in "Received instance info from UDP Client."
 (#4103)

---
 .../Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs
index 1582a80bd4..43b411fb5d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs
@@ -421,7 +421,7 @@ internal static string SendBroadcastUDPRequest()
                         while ((receiveTask = clientListener.ReceiveAsync()).Wait(currentTimeOut) && sw.ElapsedMilliseconds <= ReceiveMAXTimeoutsForCLNT_BCAST_EX && receiveTask != null)
                         {
                             currentTimeOut = ReceiveTimeoutsForCLNT_BCAST_EX;
-                            SqlClientEventSource.Log.TrySNITraceEvent(nameof(SsrpClient), EventType.INFO, "Received instnace info from UDP Client.");
+                            SqlClientEventSource.Log.TrySNITraceEvent(nameof(SsrpClient), EventType.INFO, "Received instance info from UDP Client.");
                             if (receiveTask.Result.Buffer.Length < ValidResponseSizeForCLNT_BCAST_EX) //discard invalid response
                             {
                                 response.Append(Encoding.ASCII.GetString(receiveTask.Result.Buffer, ServerResponseHeaderSizeForCLNT_BCAST_EX, receiveTask.Result.Buffer.Length - ServerResponseHeaderSizeForCLNT_BCAST_EX)); //RESP_DATA(VARIABLE) - 3 (RESP_SIZE + SVR_RESP)

From 52c7149d4aa8f0c6d7d021a19261c1f3d5c0a88f Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Wed, 8 Apr 2026 13:15:03 +1000
Subject: [PATCH 032/298] Avoid tostring in SqlConnectionEncryptOptionConverter
 if we know value is a string (#4012)

---
 .../Data/SqlClient/SqlConnectionEncryptOptionConverter.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionEncryptOptionConverter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionEncryptOptionConverter.cs
index 0e22e6ce2e..3a7289e136 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionEncryptOptionConverter.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionEncryptOptionConverter.cs
@@ -36,9 +36,9 @@ public override bool CanConvertTo(ITypeDescriptorContext context, Type sourceTyp
         // Overrides the ConvertFrom method of TypeConverter.
         public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
         {
-            if (value is string)
+            if (value is string s)
             {
-                return SqlConnectionEncryptOption.Parse(value.ToString());
+                return SqlConnectionEncryptOption.Parse(s);
             }
             throw ADP.ConvertFailed(value.GetType(), typeof(SqlConnectionEncryptOption), null);
         }

From 4c294c67e4699e0f292b2a086c7879612cf2ede2 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 8 Apr 2026 03:04:10 -0700
Subject: [PATCH 033/298] Fix duplicated docs, and missing snippet ref (#4086)

---
 .../Microsoft.Data.SqlClient/SqlCommand.xml   | 101 +-----------------
 1 file changed, 2 insertions(+), 99 deletions(-)

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml
index 7509f756b3..34c738b41e 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml
@@ -2682,7 +2682,7 @@ If you use <xref:Microsoft.Data.SqlClient.SqlCommand.ExecuteReader%2A> or <xref:
 ## Examples
 The following example creates a <xref:Microsoft.Data.SqlClient.SqlCommand>, and then executes it by passing a string that is a Transact-SQL SELECT statement, and a string to use to connect to the data source.
 
-[!code-csharp[SqlCommand_ExecuteReader](~/../sqlclient/doc/samples/SqlCommand_ExecuteReader.cs)]
+[!code-csharp[SqlCommand_ExecuteReader](~/../sqlclient/doc/samples/SqlCommand_ExecuteReader.cs#1)]
 ]]></format>
       </remarks>
       <exception cref="T:System.InvalidCastException">
@@ -2750,45 +2750,9 @@ If you use <xref:Microsoft.Data.SqlClient.SqlCommand.ExecuteReader%2A> or <xref:
 ## Examples
 The following example creates a <xref:Microsoft.Data.SqlClient.SqlCommand>, and then executes it by passing a string that is a Transact-SQL SELECT statement, and a string to use to connect to the data source. <xref:System.Data.CommandBehavior> is set to <xref:System.Data.CommandBehavior.CloseConnection>.
 
-[!code-csharp[SqlCommand_ExecuteReader2](~/../sqlclient/doc/samples/SqlCommand_ExecuteReader2.cs#1)]
+[!code-csharp[SqlCommand_ExecuteReader2#1](~/../sqlclient/doc/samples/SqlCommand_ExecuteReader2.cs#1)]
 ]]></format>
       </remarks>
-      <example>
-        <para>
-          The following example creates a <see cref="T:Microsoft.Data.SqlClient.SqlCommand" />, and then executes it by passing a string that is a Transact-SQL SELECT statement, and a string to use to connect to the data source. <see cref="T:System.Data.CommandBehavior" /> is set to <see cref="F:System.Data.CommandBehavior.CloseConnection" />.
-        </para>
-        <!-- SqlCommand_ExecuteReader2 -->
-        <code language="c#">
-          using System;
-          using System.Data;
-          using Microsoft.Data.SqlClient;
-
-          class Program
-          {
-              static void Main()
-              {
-                  string str = "Data Source=(local);Initial Catalog=Northwind;"
-                             + "Integrated Security=SSPI";
-                  string qs = "SELECT OrderID, CustomerID FROM dbo.Orders;";
-                  CreateCommand(qs, str);
-              }
-
-              private static void CreateCommand(string queryString, string connectionString)
-              {
-                  using (SqlConnection connection = new SqlConnection(connectionString))
-                  {
-                      SqlCommand command = new SqlCommand(queryString, connection);
-                      connection.Open();
-                      SqlDataReader reader = command.ExecuteReader(CommandBehavior.CloseConnection);
-                      while (reader.Read())
-                      {
-                          Console.WriteLine(String.Format("{0}", reader[0]));
-                      }
-                  }
-              }
-          }
-        </code>
-      </example>
       <exception cref="T:System.InvalidCastException">
         <list type-="bullet">
           <item><description>
@@ -3526,67 +3490,6 @@ The following example demonstrates how to create a <xref:Microsoft.Data.SqlClien
 [!code-csharp[SqlParameterCollection.AddWithValue#1](~/../sqlclient/doc/samples/SqlParameterCollection_AddWithValue.cs#1)]
 ]]></format>
       </remarks>
-      <example>
-        <para>
-          The following example demonstrates how to create a <see cref="T:Microsoft.Data.SqlClient.SqlCommand" /> and add parameters to the <see cref="T:Microsoft.Data.SqlClient.SqlParameterCollection" />.
-        </para>
-        <!-- SqlParameterCollection_AddWithValue -->
-        <code language="c#">
-          using System;
-          using System.Data;
-          using Microsoft.Data.SqlClient;
-
-          class Program
-          {
-              static void Main()
-              {
-                  string connectionString = GetConnectionString();
-                  string demo = @"&lt;StoreSurvey xmlns=""http://schemas.microsoft.com/sqlserver/2004/07/adventure-works/StoreSurvey""&gt;&lt;AnnualSales&gt;1500000&lt;/AnnualSales&gt;&lt;AnnualRevenue&gt;150000&lt;/AnnualRevenue&gt;&lt;BankName&gt;Primary International&lt;/BankName&gt;&lt;BusinessType&gt;OS&lt;/BusinessType&gt;&lt;YearOpened&gt;1974&lt;/YearOpened&gt;&lt;Specialty&gt;Road&lt;/Specialty&gt;&lt;SquareFeet&lt;38000&lt;/SquareFeet&gt;&lt;Brands&gt;3&lt;/Brands&gt;&lt;Internet&gt;DSL&lt;/Internet&gt;&lt;NumberEmployees&gt;40&lt;/NumberEmployees&gt;&lt;/StoreSurvey&gt;";
-                  Int32 id = 3;
-                  UpdateDemographics(id, demo, connectionString);
-                  Console.ReadLine();
-              }
-              private static void UpdateDemographics(Int32 customerID,
-                  string demoXml, string connectionString)
-              {
-                  // Update the demographics for a store, which is stored
-                  // in an xml column.
-                  string commandText = "UPDATE Sales.Store SET Demographics = @demographics "
-                      + "WHERE CustomerID = @ID;";
-
-                  using (SqlConnection connection = new SqlConnection(connectionString))
-                  {
-                      SqlCommand command = new SqlCommand(commandText, connection);
-                      command.Parameters.Add("@ID", SqlDbType.Int);
-                      command.Parameters["@ID"].Value = customerID;
-
-                      // Use AddWithValue to assign Demographics.
-                      // SQL Server will implicitly convert strings into XML.
-                      command.Parameters.AddWithValue("@demographics", demoXml);
-
-                      try
-                      {
-                          connection.Open();
-                          Int32 rowsAffected = command.ExecuteNonQuery();
-                          Console.WriteLine("RowsAffected: {0}", rowsAffected);
-                      }
-                      catch (Exception ex)
-                      {
-                          Console.WriteLine(ex.Message);
-                      }
-                  }
-              }
-
-              static private string GetConnectionString()
-              {
-                  // To avoid storing the connection string in your code,
-                  // you can retrieve it from a configuration file.
-                  return "Data Source=(local);Initial Catalog=AdventureWorks;"
-                       + "Integrated Security=SSPI";
-              }
-          }
-        </code>
-      </example>
     </Parameters>
     <Prepare>
       <summary>

From 12005ace228f8d0f31c91a29b627eeb079118ec2 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 8 Apr 2026 07:56:52 -0300
Subject: [PATCH 034/298] Gate test steps on setup success in CI pipeline
 (#4141)

---
 .../templates/jobs/ci-run-tests-job.yml       | 41 ++++++++++++-------
 .../templates/steps/run-all-tests-step.yml    | 24 +++++------
 2 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
index 76a3bf3c75..8666cd0dbb 100644
--- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
@@ -326,6 +326,33 @@ jobs:
           ${{ if parameters.configProperties.FileStreamDirectory }}:
             fileStreamDirectory: ${{ parameters.configProperties.FileStreamDirectory }}
 
+  # Set up for x86 tests by manually installing dotnet for x86 to an alternative location. This
+  # is only used to execute the test runtime (framework to test is specified in build params), so
+  # it should be acceptable to just install a specific version in all cases.
+  # @TODO: This setup is very confusing. Ideally we should just be utilizing the dotnet installation
+  #    earlier in the job. There has to be a cleaner way of doing this.
+  - ${{ if and(eq(parameters.enableX86Test, true), eq(parameters.operatingSystem, 'Windows')) }}:
+    - ${{ if ne(variables['dotnetx86RootPath'], '') }}:
+      # Install the .NET SDK and Runtimes for x86.
+      - template: /eng/pipelines/steps/install-dotnet.yml@self
+        parameters:
+          architecture: x86
+          debug: ${{ parameters.debug }}
+          installDir: $(dotnetx86RootPath)
+          runtimes: [8.x, 9.x]
+
+  # Ensure TestResults directory exists so that publish steps don't fail when
+  # tests are skipped due to a setup failure.
+  - pwsh: New-Item -ItemType Directory -Path TestResults -Force | Out-Null
+    displayName: 'Create TestResults Directory'
+
+  # Gate: record that all setup steps (SDK install, build, SQL config, x86 SDK
+  # install, etc.) completed successfully.  Test steps condition on this variable
+  # so they are skipped when setup fails, yet remain independent of each
+  # other's results.
+  - pwsh: Write-Host '##vso[task.setvariable variable=setupSucceeded]true'
+    displayName: 'Gate: Mark Setup Succeeded'
+
   - ${{ if eq(parameters.enableX64Test, true) }}: # run native tests
     - template: /eng/pipelines/common/templates/steps/run-all-tests-step.yml@self # run tests
       parameters:
@@ -340,20 +367,6 @@ jobs:
         mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
 
   - ${{ if and(eq(parameters.enableX86Test, true), eq(parameters.operatingSystem, 'Windows')) }}:
-    # Set up for x86 tests by manually installing dotnet for x86 to an alternative location. This
-    # is only used to execute the test runtime (framework to test is specified in build params), so
-    # it should be acceptable to just install a specific version in all cases.
-    # @TODO: This setup is very confusing. Ideally we should just be utilizing the dotnet installation
-    #    earlier in the job. There has to be a cleaner way of doing this.
-    - ${{ if ne(variables['dotnetx86RootPath'], '') }}:
-      # Install the .NET SDK and Runtimes for x86.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
-        parameters:
-          architecture: x86
-          debug: ${{ parameters.debug }}
-          installDir: $(dotnetx86RootPath)
-          runtimes: [8.x, 9.x]
-
     - template: /eng/pipelines/common/templates/steps/run-all-tests-step.yml@self
       parameters:
         debug: ${{ parameters.debug }}
diff --git a/eng/pipelines/common/templates/steps/run-all-tests-step.yml b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
index 2c407f7d1e..68689adf44 100644
--- a/eng/pipelines/common/templates/steps/run-all-tests-step.yml
+++ b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
@@ -79,7 +79,7 @@ steps:
   - ${{if eq(parameters.referenceType, 'Project')}}:
     - task: MSBuild@1
       displayName: 'Run Unit Tests ${{parameters.msbuildArchitecture }}'
-      condition: succeededOrFailed()
+      condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
         solution: build2.proj
         msbuildArchitecture: ${{parameters.msbuildArchitecture }}
@@ -101,7 +101,7 @@ steps:
 
     - task: MSBuild@1
       displayName: 'Run Flaky Unit Tests ${{parameters.msbuildArchitecture }}'
-      condition: succeededOrFailed()
+      condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
         solution: build2.proj
         msbuildArchitecture: ${{parameters.msbuildArchitecture }}
@@ -128,7 +128,7 @@ steps:
 
   - task: MSBuild@1
     displayName: 'Run Functional Tests ${{parameters.msbuildArchitecture }}'
-    condition: succeededOrFailed()
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
       solution: build2.proj
       msbuildArchitecture: ${{parameters.msbuildArchitecture }}
@@ -155,7 +155,7 @@ steps:
           -p:TestResultsFolderPath=TestResults
 
   - task: MSBuild@1
-    condition: succeededOrFailed()
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     displayName: 'Run Flaky Functional Tests ${{parameters.msbuildArchitecture }}'
     inputs:
       solution: build2.proj
@@ -188,7 +188,7 @@ steps:
     continueOnError: true
 
   - task: MSBuild@1
-    condition: succeededOrFailed()
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     displayName: 'Run Manual Tests ${{parameters.msbuildArchitecture }}'
     inputs:
       solution: build2.proj
@@ -219,7 +219,7 @@ steps:
     retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
 
   - task: MSBuild@1
-    condition: succeededOrFailed()
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     displayName: 'Run Flaky Manual Tests ${{parameters.msbuildArchitecture }}'
     inputs:
       solution: build2.proj
@@ -257,7 +257,7 @@ steps:
   - ${{if eq(parameters.referenceType, 'Project')}}:
     - task: DotNetCoreCLI@2
       displayName: 'Run Unit Tests'
-      condition: succeededOrFailed()
+      condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
         command: custom
         projects: build2.proj
@@ -276,7 +276,7 @@ steps:
 
     - task: DotNetCoreCLI@2
       displayName: 'Run Flaky Unit Tests'
-      condition: succeededOrFailed()
+      condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
         command: custom
         projects: build2.proj
@@ -298,7 +298,7 @@ steps:
 
   - task: DotNetCoreCLI@2
     displayName: 'Run Functional Tests'
-    condition: succeededOrFailed()
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
       command: custom
       projects: build2.proj
@@ -316,7 +316,7 @@ steps:
       verbosityPack: Detailed
 
   - task: DotNetCoreCLI@2
-    condition: succeededOrFailed()
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     displayName: 'Run Flaky Functional Tests'
     inputs:
       command: custom
@@ -339,7 +339,7 @@ steps:
 
   - task: DotNetCoreCLI@2
     displayName: 'Run Manual Tests'
-    condition: succeededOrFailed()
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
       command: custom
       projects: build2.proj
@@ -360,7 +360,7 @@ steps:
 
   - task: DotNetCoreCLI@2
     displayName: 'Run Flaky Manual Tests'
-    condition: succeededOrFailed()
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
       command: custom
       projects: build2.proj

From d197d6a3654ccde467c7ab549d8f9e2a0f022ea8 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:14:31 -0300
Subject: [PATCH 035/298] Pin .NET SDK to 10.0.105 (#4165)

---
 global.json | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/global.json b/global.json
index 303d578bc6..3d74096930 100644
--- a/global.json
+++ b/global.json
@@ -3,22 +3,14 @@
   {
     // We currently require the .NET 10 SDK to build and test the project.
     //
-    // We specify the most recent release, and let rollForward pick the latest
-    // available suitable SDK per the rollForward setting.
+    // GOTCHA: Our CI infrastructure for Windows uses VS 2022 which comes with MSBuild 17.x.  The
+    // .NET 10 SDK versions in the 10.0.2xx series require MSBuild 18.x, so we specify the most
+    // recent 10.0.1xx series release which is compatible with MSBuild 17.x.
     //
-    // We must specify a complete version here since this file is also used by
-    // the Azure Pipelines UseDotNet@2 task, which doesn't support wildcards,
-    // and won't roll-forward.  It uses the version verbatim.
-    //
-    // GOTCHA: This file is only used by the dotnet CLI and related tools.
-    // Other toolchains (IDEs like Visual Studio, the .NET Framework MSBuild
-    // system, etc.) may use their own installed SDKs unless configured
-    // otherwise.
-    //
-    "version": "10.0.104",
+    "version": "10.0.105",
 
-    // Any 10.x version is acceptable.
-    "rollForward": "latestMinor",
+    // We cannot allow any roll forward due to the above MSBuild compatibility issues.
+    "rollForward": "disable",
 
     // Do not allow pre-release versions.
     //

From 8fc7154ff027adade0e71c58b0374ce0884e82ef Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Thu, 9 Apr 2026 13:07:12 -0500
Subject: [PATCH 036/298] Official Build Cleanup 2 (#4155)

* PR comments and uh what

* Rely on AssemblyBuildNumber for non-MDS projects, too.
---
 .../onebranch/jobs/validate-signed-package-job.yml     | 10 +++-------
 eng/pipelines/onebranch/sqlclient-non-official.yml     |  1 -
 eng/pipelines/onebranch/sqlclient-official.yml         |  1 -
 eng/pipelines/onebranch/stages/build-stages.yml        |  6 ------
 .../steps/roslyn-analyzers-sqlclient-step.yml          |  6 +++---
 .../onebranch/variables/onebranch-variables.yml        |  2 +-
 .../onebranch/variables/package-variables.yml          |  2 +-
 .../Abstractions/src/AbstractionsVersions.props        |  6 +++---
 .../Azure/src/AzureVersions.props                      |  4 ++--
 .../Logging/src/LoggingVersions.props                  |  6 +++---
 src/Microsoft.Data.SqlClient/MdsVersions.props         |  1 -
 .../AzureKeyVaultProvider/AkvProviderVersions.props    |  6 +++---
 tools/props/Versions.props                             |  2 +-
 13 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
index bc566398cc..27369eb6cc 100644
--- a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
@@ -36,10 +36,6 @@ parameters:
   - name: isOfficial
     type: boolean
 
-  # True if this build is a preview.
-  - name: isPreview
-    type: boolean
-
 jobs:
   - job: validate_nuget_package
     displayName: "Validate NuGet package"
@@ -58,7 +54,7 @@ jobs:
       # Path to the SqlClient NuGet package after installation. This path will only exist once the package
       # been installed.
       - name: nugetPackageInstallPath
-        value: '$(Pipeline.Workspace)\nugetPackageInstalls\Microsoft.Data.SqlClient\${{ parameters.expectedPackageVersion }}'
+        value: '$(Pipeline.Workspace)\nugetPackageInstalls\Microsoft.Data.SqlClient.${{ parameters.expectedPackageVersion }}'
 
       # Root folder where NuGet package will be installed locally
       - name: nugetPackageInstallRoot
@@ -119,8 +115,8 @@ jobs:
             -SkipDependencies
 
           echo "> 2. Listing contents of installed Microsoft.Data.SqlClient NuGet package:"
-          Write-Host $artifactPath
-          Get-ChildItem $artifactPath
+          Write-Host $nugetPackageInstallRoot
+          Get-ChildItem $nugetPackageInstallRoot
         displayName: "Install NuGet Package"
 
       # Find all DLL files in the installed NuGet package, verify each is signed with a strong name
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index 1ab3c653c3..a908ae4e74 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -173,7 +173,6 @@ extends:
     stages:
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
         parameters:
-          isPreview: ${{ parameters.isPreview }}
           isOfficial: false # This is a non-official pipeline.
           publishSymbols: ${{ parameters.publishSymbols }}
           buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index c6c18d679a..7f02ea0226 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -201,7 +201,6 @@ extends:
     stages:
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
         parameters:
-          isPreview: ${{ parameters.isPreview }}
           isOfficial: true # This is an official pipeline.
           publishSymbols: ${{ parameters.publishSymbols }}
           buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index 14e7977c3f..ba24af6309 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -22,11 +22,6 @@ parameters:
   - name: isOfficial
     type: boolean
 
-  # True if this is a preview build, which uses the preview version numbers from
-  # common-variables.yml.
-  - name: isPreview
-    type: boolean
-
   # True to publish symbols to public and private servers.
   - name: publishSymbols
     type: boolean
@@ -358,5 +353,4 @@ stages:
               artifactName: '${{ parameters.sqlClientArtifactsName }}'
               expectedFileVersion: '${{ parameters.sqlClientFileVersion }}'
               expectedPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
-              isPreview: ${{ parameters.isPreview }}
               isOfficial: ${{ parameters.isOfficial }}
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml
index 813df97326..ac515aa021 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml
@@ -32,9 +32,9 @@ steps:
         $(REPO_ROOT)/build2.proj
         -t:BuildMds
         -p:Configuration=Release
-        -p:PackageVersionAbstractions="${{ parameters.abstractionsPackageVersion }}"
-        -p:PackageVersionLogging="${{ parameters.loggingPackageVersion }}"
-        -p:PackageVersionMds="${{ parameters.sqlClientPackageVersion }}"
+        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+        -p:PackageVersionMds=${{ parameters.sqlClientPackageVersion }}
         -p:ReferenceType=Package
       msBuildVersion: 17.0
       setupCommandLinePicker: vs2022
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index 4009c60b3d..7b7c7597cb 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -4,7 +4,7 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# This file is only included in SqlClient OneBranch Official pipelines.
+# This file is only included in SqlClient OneBranch official/non-official pipelines.
 
 variables:
   # Libraries ==============================================================
diff --git a/eng/pipelines/onebranch/variables/package-variables.yml b/eng/pipelines/onebranch/variables/package-variables.yml
index 92f9863021..b1466b06b9 100644
--- a/eng/pipelines/onebranch/variables/package-variables.yml
+++ b/eng/pipelines/onebranch/variables/package-variables.yml
@@ -41,7 +41,7 @@ variables:
   # $(Build.BuildNumber) has the format XXX.YY. Additionally, each version part must be a positive
   # 16-bit integer less than 65535. Simply concatenating both parts of $(Build.BuildNumber) could
   # produce values larger than 65534, so we must omit the second part entirely. Unfortunately, this
-  # may result in multiple subsequent pipline builds using the same C# assembly versions. The
+  # may result in multiple subsequent pipeline builds using the same C# assembly versions. The
   # package versions will not be affected and will show the complete $(Build.BuildNumber) values.
   - name: _assemblyBuildNumber
     value: $[ split(variables['Build.BuildNumber'], '.')[0] ]
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props
index 2bd328fb92..75be8d98c3 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props
@@ -24,7 +24,7 @@
           - Used as the base value of the assembly attribute
             'AssemblyInformationalVersion' generated by MSBuild.
           - If not specified, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber)-dev.
+              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
 
         AbstractionsAssemblyFileVersion:
           - Used as the value of the assembly attribute 'AssemblyFileVersion'
@@ -33,7 +33,7 @@
             - If $(AbstractionsPackageVersion) is specified, use the numeric
               parts of its value, for example 1.0.0.345.
             - Otherwise, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber).
+              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber).
 
       We use private properties to hold the computed values, and then always
       assign those to the public properties.  After importing this file, the
@@ -45,7 +45,7 @@
 
     <!-- Determine the package version. -->
     <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' != ''">$(AbstractionsPackageVersion)</_OurPackageVersion>
-    <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' == ''">$(AbstractionsDefaultMajorVersion).0.0.$(BuildNumber)-dev</_OurPackageVersion>
+    <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' == ''">$(AbstractionsDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_OurPackageVersion>
 
     <!--Determine the assembly file version. -->
     <!-- If AbstractionsAssemblyFileVersion is set, use its value as-is. -->
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props
index 3a9debd3bb..2102cd798a 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props
@@ -23,7 +23,7 @@
           - Used as the base value of the assembly attribute
             'AssemblyInformationalVersion' generated by MSBuild.
           - If not specified, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber)-dev.
+              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
 
         AzureAssemblyFileVersion:
           - Used as the value of the assembly attribute 'AssemblyFileVersion'
@@ -44,7 +44,7 @@
 
     <!-- Determine the package version. -->
     <_OurPackageVersion Condition="'$(AzurePackageVersion)' != ''">$(AzurePackageVersion)</_OurPackageVersion>
-    <_OurPackageVersion Condition="'$(AzurePackageVersion)' == ''">$(AzureDefaultMajorVersion).0.0.$(BuildNumber)-dev</_OurPackageVersion>
+    <_OurPackageVersion Condition="'$(AzurePackageVersion)' == ''">$(AzureDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_OurPackageVersion>
 
     <!--Determine the assembly file version. -->
     <!-- If AzureAssemblyFileVersion is set, use its value as-is. -->
diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props b/src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props
index 597a692457..9205b88793 100644
--- a/src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props
+++ b/src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props
@@ -24,7 +24,7 @@
           - Used as the base value of the assembly attribute
             'AssemblyInformationalVersion' generated by MSBuild.
           - If not specified, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber)-dev.
+              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
 
         LoggingAssemblyFileVersion:
           - Used as the value of the assembly attribute 'AssemblyFileVersion'
@@ -33,7 +33,7 @@
             - If $(LoggingPackageVersion) is specified, use the numeric
               parts of its value, for example 1.0.0.345.
             - Otherwise, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber).
+              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber).
 
       We use private properties to hold the computed values, and then always
       assign those to the public properties.  After importing this file, the
@@ -45,7 +45,7 @@
 
     <!-- Determine the package version. -->
     <_OurPackageVersion Condition="'$(LoggingPackageVersion)' != ''">$(LoggingPackageVersion)</_OurPackageVersion>
-    <_OurPackageVersion Condition="'$(LoggingPackageVersion)' == ''">$(LoggingDefaultMajorVersion).0.0.$(BuildNumber)-dev</_OurPackageVersion>
+    <_OurPackageVersion Condition="'$(LoggingPackageVersion)' == ''">$(LoggingDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_OurPackageVersion>
 
     <!--Determine the assembly file version. -->
     <!-- If LoggingAssemblyFileVersion is set, use its value as-is. -->
diff --git a/src/Microsoft.Data.SqlClient/MdsVersions.props b/src/Microsoft.Data.SqlClient/MdsVersions.props
index a9f8d1cc83..97063881d9 100644
--- a/src/Microsoft.Data.SqlClient/MdsVersions.props
+++ b/src/Microsoft.Data.SqlClient/MdsVersions.props
@@ -85,5 +85,4 @@
     <MdsAssemblyVersion>$(MdsFileVersion.Split('.')[0]).0.0.0</MdsAssemblyVersion>
   </PropertyGroup>
 
-
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props
index d575830c40..47982a6478 100644
--- a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props
+++ b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props
@@ -23,7 +23,7 @@
           - Used as the base value of the assembly attribute
             'AssemblyInformationalVersion' generated by MSBuild.
           - If not specified, defaults to:
-              $(AkvDefaultMajorVersion).0.0.$(BuildNumber)-dev.
+              $(AkvDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
 
         AkvAssemblyFileVersion:
           - Used as the value of the assembly attribute 'AssemblyFileVersion'
@@ -32,7 +32,7 @@
             - If $(AkvPackageVersion) is specified, use the numeric
               parts of its value, for example 7.0.0.345.
             - Otherwise, defaults to:
-              $(AkvDefaultMajorVersion).0.0.$(BuildNumber).
+              $(AkvDefaultMajorVersion).0.0.$(AssemblyBuildNumber).
 
       We use private properties to hold the computed values, and then always
       assign those to the public properties.  After importing this file, the
@@ -44,7 +44,7 @@
 
     <!-- Determine the package version. -->
     <_AkvPackageVersion Condition="'$(AkvPackageVersion)' != ''">$(AkvPackageVersion)</_AkvPackageVersion>
-    <_AkvPackageVersion Condition="'$(AkvPackageVersion)' == ''">$(AkvDefaultMajorVersion).0.0.$(BuildNumber)-dev</_AkvPackageVersion>
+    <_AkvPackageVersion Condition="'$(AkvPackageVersion)' == ''">$(AkvDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_AkvPackageVersion>
 
     <!-- Determine the assembly file version. -->
     <!-- If AkvAssemblyFileVersion is set, use its value as-is. -->
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 858b41628b..f2132677c9 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -19,7 +19,7 @@
     <!-- Future Assembly Version values shall be Major.Minor.0.0; e.g. 1.0.0.0 -->
     <SqlServerAssemblyVersion>1.0.0.0</SqlServerAssemblyVersion>
     <SqlServerAssemblyFileVersion Condition="'$(SqlServerAssemblyFileVersion)' == ''">1.0.0.0</SqlServerAssemblyFileVersion>
-    <SqlServerPackageVersion Condition="'$(SqlServerPackageVersion)' == ''">1.0.0.$(BuildNumber)-dev</SqlServerPackageVersion>
+    <SqlServerPackageVersion Condition="'$(SqlServerPackageVersion)' == ''">1.0.0.$(AssemblyBuildNumber)-dev</SqlServerPackageVersion>
     <SqlServerVersion>$(SqlServerPackageVersion)</SqlServerVersion>
   </PropertyGroup>
 

From 6db52a687d26547ce0c5641ccc6b66bedfdb7e42 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Thu, 9 Apr 2026 17:37:49 -0500
Subject: [PATCH 037/298] Merge | Cleanup (#4145)

* Delete separate projects

... this was less satisfying than I expected it'd be

* Test output should go to the same folder as the project ... no need to give it a special place.

* Drop targets that aren't necessary from build.proj

* Remove extraneous properties from build.proj

* Remove unused targets

* Test project references from RepoRoot

* Remove unnecessary stuff from Directory.Build.props

* Drop some more unnecessary files

* Remove references to BuildAllConfigurations

* :robot: Remove separate project stuff from CompareMdsRefAssemblies.targets
---
 build.proj                                    |  296 +----
 .../steps/roslyn-analyzers-csproj-step.yml    |    3 +-
 src/Directory.Build.props                     |   76 +-
 src/Microsoft.Data.SqlClient.slnx             |   77 +-
 .../ref/Microsoft.Data.SqlClient.csproj       |   72 --
 .../src/Microsoft.Data.SqlClient.csproj       | 1105 -----------------
 .../netfx/ref/Microsoft.Data.SqlClient.csproj |   69 -
 .../netfx/src/Microsoft.Data.SqlClient.csproj | 1089 ----------------
 .../targets/GenerateAssemblyInfo.targets      |   36 -
 .../tools/targets/GenerateAssemblyRef.targets |   31 -
 ...soft.Data.SqlClient.FunctionalTests.csproj |   24 +-
 ...icrosoft.Data.SqlClient.ManualTests.csproj |   20 +-
 .../SQL/UdtTest/UDTs/Address/Address.csproj   |    5 -
 .../SQL/UdtTest/UDTs/Circle/Circle.csproj     |    5 -
 .../SQL/UdtTest/UDTs/Shapes/Shapes.csproj     |    5 -
 .../UdtTest/UDTs/Utf8String/Utf8String.csproj |    5 -
 ...oft.Data.SqlClient.PerformanceTests.csproj |   37 +-
 .../Microsoft.Data.SqlClient.UnitTests.csproj |   16 +-
 ...crosoft.Data.SqlClient.ExtUtilities.csproj |    2 +-
 ...rosoft.Data.SqlClient.TestUtilities.csproj |    4 +-
 .../TDS/TDS.EndPoint/TDS.EndPoint.csproj      |   11 +-
 .../tools/TDS/TDS.Servers/TDS.Servers.csproj  |   13 +-
 .../tests/tools/TDS/TDS/TDS.csproj            |    5 +-
 tools/GenAPI/Directory.Build.props            |    7 -
 tools/props/Tools.props                       |    8 -
 tools/targets/CompareMdsRefAssemblies.targets |  104 +-
 tools/targets/GenerateMdsPackage.targets      |   14 -
 tools/targets/NotSupported.targets            |   65 -
 tools/targets/ResolveContract.targets         |   29 -
 tools/targets/TrimDocsForIntelliSense.targets |    9 -
 30 files changed, 132 insertions(+), 3110 deletions(-)
 delete mode 100644 src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
 delete mode 100644 src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
 delete mode 100644 src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
 delete mode 100644 src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
 delete mode 100644 src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyInfo.targets
 delete mode 100644 src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyRef.targets
 delete mode 100644 tools/GenAPI/Directory.Build.props
 delete mode 100644 tools/props/Tools.props
 delete mode 100644 tools/targets/GenerateMdsPackage.targets
 delete mode 100644 tools/targets/NotSupported.targets
 delete mode 100644 tools/targets/ResolveContract.targets
 delete mode 100644 tools/targets/TrimDocsForIntelliSense.targets

diff --git a/build.proj b/build.proj
index 33ff1aff31..f6954667c4 100644
--- a/build.proj
+++ b/build.proj
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="BuildAllConfigurations" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Project="src/Directory.Build.props" />
-  <Import Project="$(ToolsDir)targets\GenerateMdsPackage.targets" />
   <Import Project="$(ToolsDir)targets\CompareMdsRefAssemblies.targets" />
 
   <PropertyGroup>
@@ -10,26 +9,7 @@
     <DisableSourceLink>false</DisableSourceLink>
 
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
-    <!-- Flag to control whether or not to build Microsoft.DotNet.GenAPI project in tools -->
-    <BuildTools Condition="'$(BuildTools)' == ''">true</BuildTools>
-    <!-- Flag to control if Windows drivers should be built or not -->
-    <IsEnabledWindows Condition="'$(IsEnabledWindows)' == '' AND '$(TargetsWindows)' == 'true'">true</IsEnabledWindows>
-    <IsEnabledWindows Condition="'$(TargetsUnix)' == 'true'">false</IsEnabledWindows>
-    <TestOS Condition="'$(TestTargetOS)' == '' AND '$(TargetsWindows)' == 'true'">Windows</TestOS>
-    <TestOS Condition="'$(TestTargetOS)' == '' AND '$(TargetsUnix)' == 'true'">Unix</TestOS>
-    <TF Condition="$(TF) == ''">net9.0</TF> <!-- Default Target Framework -->
-    <TFGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TF)))' == '.NETFramework'">netfx</TFGroup>
-    <TFGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TF)))' == '.NETCoreApp'">netcore</TFGroup>
-    <TargetGroup Condition="'$(TFGroup)' == 'netfx'">netfx</TargetGroup>
-    <TargetGroup Condition="'$(TFGroup)' == 'netcore'">netcoreapp</TargetGroup>
-    <TargetNetCoreVersion Condition="$(TargetGroup) == 'netcoreapp' AND $(TargetNetCoreVersion) == ''">$(TF)</TargetNetCoreVersion>
-    <TargetNetFxVersion Condition="$(TargetGroup) == 'netfx' AND $(TargetNetFxVersion) == ''">$(TF)</TargetNetFxVersion>
-    <GenerateNuget Condition="'$(GenerateNuget)' == '' AND '$(IsEnabledWindows)' == 'true'">true</GenerateNuget>
-
-    <CommonProperties>Configuration=$(Configuration);ReferenceType=$(ReferenceType);</CommonProperties>
-    <ProjectProperties>$(CommonProperties);AssemblyFileVersion=$(AssemblyFileVersion);TargetsWindows=$(TargetsWindows);TargetsUnix=$(TargetsUnix);</ProjectProperties>
-    <TestProjectProperties>$(ProjectProperties);BuildForRelease=false;TargetNetCoreVersion=$(TargetNetCoreVersion);TargetNetFxVersion=$(TargetNetFxVersion)</TestProjectProperties>
+
     <ResultsDirectory Condition="$(ResultsDirectory) == ''">TestResults</ResultsDirectory>
     <!--
       Path to a `dotnet` version like a x86 or any especific versions in addition to a default installed version.
@@ -37,30 +17,6 @@
       The provided path should be ended to a `\` character without white spaces: Ex. C:\x86\
     -->
     <DotnetPath></DotnetPath>
-    <!-- Using these properties to compile and pack netfx dll fixes nuget package explorer error "Compiler flags: missing" -->
-    <NugetPackProperties>DebugType=portable;DebugSymbols=true;IncludeSymbols=true;SymbolPackageFormat=snupkg;PublishRepositoryUrl=true;RepositoryUrl=https://github.com/dotnet/sqlclient;RepositoryType=git;EmbedUnTrackedSources=true;Deterministic=true;</NugetPackProperties>
-    <!-- TF_BUILD is enabled only within AzureDevOps pipeline to support continuous integation build. -->
-    <NugetPackProperties Condition="'$(TF_BUILD)' == 'true'">$(NugetPackProperties);ContinuousIntegrationBuild=true;</NugetPackProperties>
-  </PropertyGroup>
-
-  <!-- Test configuration properties -->
-  <PropertyGroup>
-    <!-- Set up default filters for tests to exclude failing and flaky tests -->
-    <Filter Condition="'$(Filter)' == ''">category!=failing&amp;category!=flaky&amp;category!=interactive</Filter>
-    <FilterArgument>--filter "$(Filter)"</FilterArgument>
-
-    <!-- Collect code coverage unless explicitly disabled -->
-    <CollectCodeCoverage Condition="'$(CollectCodeCoverage)' == ''">true</CollectCodeCoverage>
-    <CodeCoverageRunSettings>$(TestsPath)/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings</CodeCoverageRunSettings>
-    <CollectArgument Condition="'$(CollectCodeCoverage)' == 'true'">--collect "Code coverage" --settings "$(CodeCoverageRunSettings)"</CollectArgument>
-
-    <!-- Set up tests to fail after hangs and report via blame -->
-    <BlameArgument>$(Blame)</BlameArgument>
-    <BlameArgument Condition="'$(BlameArgument)' == ''">
-      --blame-hang
-      --blame-hang-dump-type full
-      --blame-hang-timeout 10m
-    </BlameArgument>
   </PropertyGroup>
 
   <!-- Release Build properties must be turned on for Release purposes, and turned off for Code Coverage calculations -->
@@ -76,39 +32,19 @@
     <Abstractions Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
     <Azure Include="src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
     <Logging Include="src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
-    <NetFxDriver Include="**/netfx/**/Microsoft.Data.SqlClient*.csproj" Condition="'$(IsEnabledWindows)' == 'true'" />
-    <NetCoreDriver Include="**/netcore/**/Microsoft.Data.SqlClient*.csproj" />
-    <!-- Used to build .NET Standard DLL for lib folder from this project. -->
-    <NetStandardDriver Include="**/netcore/ref/Microsoft.Data.SqlClient*.csproj" />
-    <AKVProvider Include="**/add-ons/**/AzureKeyVaultProvider/*.csproj" />
 
-    <UnitTests Include="**/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj" />
-    <UnitTestsProj Include="**/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj" />
-
-    <FunctionalTests Include="**/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj" />
-    <FunctionalTestsProj Include="**/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj" />
-
-    <ManualTests Include="**/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" />
-    <ManualTestsProj Include="**/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" />
+    <AKVProvider Include="**/add-ons/**/AzureKeyVaultProvider/*.csproj" />
   </ItemGroup>
 
-  <!-- Top Level Build targets -->
-  <Target Name="Restore" DependsOnTargets="RestoreNetCore;RestoreNetFx" />
-  <Target Name="BuildSqlClient" DependsOnTargets="BuildSqlServer;BuildLogging;BuildAbstractions;BuildNetFx;BuildNetCore;BuildNetStandard" />
-  <!-- TODO: This doesn't really build everything; just the SqlClient driver and its NuGet package. -->
-  <Target Name="BuildAllConfigurations" DependsOnTargets="Restore;BuildTools;BuildSqlServer;BuildLogging;BuildAbstractions;BuildNetFx;BuildNetCoreAllOS;BuildNetStandard;GenerateMdsPackage" />
-
   <!-- SqlServer Targets -->
   <PropertyGroup>
     <SqlServerProperties>$(CommonProperties)</SqlServerProperties>
 
-    <SqlServerProperties
-      Condition="'$(SqlServerPackageVersion)' != ''">
+    <SqlServerProperties Condition="'$(SqlServerPackageVersion)' != ''">
       $(SqlServerProperties);SqlServerPackageVersion=$(SqlServerPackageVersion)
     </SqlServerProperties>
 
-    <SqlServerProperties
-      Condition="'$(SqlServerAssemblyFileVersion)' != ''">
+    <SqlServerProperties Condition="'$(SqlServerAssemblyFileVersion)' != ''">
       $(SqlServerProperties);SqlServerAssemblyFileVersion=$(SqlServerAssemblyFileVersion)
     </SqlServerProperties>
   </PropertyGroup>
@@ -148,14 +84,12 @@
       That results in $(AbstractionsPackageVersion) being defined as empty,
       and cannot be overridden by the project.
     -->
-    <AbstractionsProperties
-      Condition="'$(AbstractionsPackageVersion)' != ''">
+    <AbstractionsProperties Condition="'$(AbstractionsPackageVersion)' != ''">
       $(AbstractionsProperties);AbstractionsPackageVersion=$(AbstractionsPackageVersion)
     </AbstractionsProperties>
 
     <!-- Do the same for the AbstractionsAssemblyFileVersion property. -->
-    <AbstractionsProperties
-      Condition="'$(AbstractionsAssemblyFileVersion)' != ''">
+    <AbstractionsProperties Condition="'$(AbstractionsAssemblyFileVersion)' != ''">
       $(AbstractionsProperties);AbstractionsAssemblyFileVersion=$(AbstractionsAssemblyFileVersion)
     </AbstractionsProperties>
   </PropertyGroup>
@@ -191,14 +125,12 @@
       to avoid it expanding as empty here and thus overriding the default
       behaviour in the Logging project.
     -->
-    <LoggingProperties
-      Condition="'$(LoggingPackageVersion)' != ''">
+    <LoggingProperties Condition="'$(LoggingPackageVersion)' != ''">
       $(LoggingProperties);LoggingPackageVersion=$(LoggingPackageVersion)
     </LoggingProperties>
 
     <!-- Do the same for the LoggingAssemblyFileVersion property. -->
-    <LoggingProperties
-      Condition="'$(LoggingAssemblyFileVersion)' != ''">
+    <LoggingProperties Condition="'$(LoggingAssemblyFileVersion)' != ''">
       $(LoggingProperties);LoggingAssemblyFileVersion=$(LoggingAssemblyFileVersion)
     </LoggingProperties>
   </PropertyGroup>
@@ -240,14 +172,12 @@
       That results in $(AzurePackageVersion) being defined as empty, and cannot
       be overridden by the project.
     -->
-    <AzureProperties
-      Condition="'$(AzurePackageVersion)' != ''">
+    <AzureProperties Condition="'$(AzurePackageVersion)' != ''">
       $(AzureProperties);AzurePackageVersion=$(AzurePackageVersion)
     </AzureProperties>
 
     <!-- Do the same for the AzureAssemblyFileVersion property. -->
-    <AzureProperties
-      Condition="'$(AzureAssemblyFileVersion)' != ''">
+    <AzureProperties Condition="'$(AzureAssemblyFileVersion)' != ''">
       $(AzureProperties);AzureAssemblyFileVersion=$(AzureAssemblyFileVersion)
     </AzureProperties>
   </PropertyGroup>
@@ -273,210 +203,6 @@
       Properties="$(AzureProperties);NoBuild=true" />
   </Target>
 
-  <!-- Other Targets -->
-  <Target Name="RestoreNetCore" DependsOnTargets="RestoreSqlServer;RestoreAbstractions;RestoreLogging">
-    <MSBuild Projects="@(NetCoreDriver)" Targets="restore" Properties="$(ProjectProperties)" />
-  </Target>
-
-  <Target Name="RestoreNetFx" DependsOnTargets="RestoreSqlServer;RestoreAbstractions;RestoreLogging" Condition="'$(IsEnabledWindows)' == 'true'">
-    <MSBuild Projects="@(NetFxDriver)" Targets="restore" Properties="$(ProjectProperties)" />
-  </Target>
-
-  <Target Name="RestoreTools" Condition="'$(BuildTools)' == 'true'">
-    <MSBuild Projects="@(Tools)" Targets="restore" Properties="$(CommonProperties)" />
-  </Target>
-
-  <Target Name="BuildTools" DependsOnTargets="RestoreTools" Condition="'$(BuildTools)' == 'true'">
-    <MSBuild Projects="@(Tools)" Properties="$(CommonProperties)" />
-  </Target>
-
-  <Target Name="BuildNetFx" DependsOnTargets="RestoreNetFx;BuildSqlServer;BuildAbstractions;BuildLogging" Condition="'$(IsEnabledWindows)' == 'true'">
-    <MSBuild Projects="@(NetFxDriver)" Properties="$(CI);Platform=AnyCPU;$(ProjectProperties);$(NugetPackProperties);" />
-  </Target>
-
-  <Target Name="BuildNetCore" DependsOnTargets="RestoreNetCore;BuildSqlServer;BuildAbstractions;BuildLogging">
-    <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);Platform=AnyCPU;$(ProjectProperties)" />
-  </Target>
-
-  <Target Name="BuildNetCoreAllOS" DependsOnTargets="RestoreNetCore;BuildSqlServer;BuildAbstractions;BuildLogging">
-    <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;" RemoveProperties="TargetsWindows;TargetsUnix;" />
-    <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Windows_NT;" RemoveProperties="TargetsWindows;TargetsUnix;" Condition="'$(IsEnabledWindows)' == 'true'" />
-    <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;" RemoveProperties="TargetsWindows;TargetsUnix;" />
-  </Target>
-
-  <Target Name="BuildNetCoreUnix" DependsOnTargets="RestoreNetCore">
-    <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;"   RemoveProperties="TargetsWindows;TargetsUnix;" />
-   </Target>
-
-  <!-- Build .NET Standard target DLLs for Lib folder from here.
-   This target enables BuildForLib for the NetCore ref project. -->
-  <Target Name="BuildNetStandard">
-    <MSBuild Projects="@(NetStandardDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;BuildForLib=True" RemoveProperties="TargetsWindows;TargetsUnix;" />
-  </Target>
-
-  <!-- Tests -->
-
-  <!-- Run all tests applicable to the host OS. -->
-  <Target Name="RunTests" DependsOnTargets="RunUnitTests;RunFunctionalTests;RunManualTests"/>
-
-  <!-- Run all unit tests applicable to the host OS. -->
-  <Target Name="RunUnitTests" DependsOnTargets="RunUnitTestsWindows;RunUnitTestsUnix" Condition="$(ReferenceType.Contains('Project'))"/>
-
-  <!-- Run all unit tests applicable to Windows. -->
-  <Target Name="RunUnitTestsWindows" Condition="'$(IsEnabledWindows)' == 'true' AND $(ReferenceType.Contains('Project'))">
-    <PropertyGroup>
-      <!--
-        The UnitTests project exclusively uses Project references, which is the default applied by
-        src/Directory.Build.props, so no need to specify the ReferenceType property here.
-      -->
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(UnitTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Unit-Windows$(TargetGroup)-$(TestSet)"
-      </TestCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running unit tests for Windows via command: $(TestCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)"/>
-  </Target>
-
-  <!-- Run all unit tests applicable to Unix. -->
-  <Target Name="RunUnitTestsUnix" Condition="'$(IsEnabledWindows)' != 'true' AND $(ReferenceType.Contains('Project'))">
-    <PropertyGroup>
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(UnitTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Unit-Unixnetcoreapp-$(TestSet)"
-      </TestCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running unit tests for Unix via command: $(TestCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)"/>
-  </Target>
-
-  <!-- Run all Functional tests applicable to the host OS. -->
-  <Target Name="RunFunctionalTests" DependsOnTargets="RunFunctionalTestsWindows;RunFunctionalTestsUnix" />
-
-  <!-- Run all Functional tests applicable to Windows. -->
-  <Target Name="RunFunctionalTestsWindows" Condition="'$(IsEnabledWindows)' == 'true'">
-    <PropertyGroup>
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(FunctionalTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        -p:ReferenceType=$(ReferenceType)
-        -p:AbstractionsPackageVersion=$(AbstractionsPackageVersion)
-        -p:MdsPackageVersion=$(MdsPackageVersion)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Functional-Windows$(TargetGroup)-$(TestSet)"
-      </TestCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running Functional test for Windows via command: $(TestCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
-  </Target>
-
-  <!-- Run all Functional tests applicable to Unix. -->
-  <Target Name="RunFunctionalTestsUnix" Condition="'$(IsEnabledWindows)' != 'true'">
-    <PropertyGroup>
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(FunctionalTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        -p:ReferenceType=$(ReferenceType)
-        -p:AbstractionsPackageVersion=$(AbstractionsPackageVersion)
-        -p:MdsPackageVersion=$(MdsPackageVersion)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Functional-Unixnetcoreapp-$(TestSet)"
-      </TestCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running Functional test for Unix via command: $(TestCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
-  </Target>
-
-  <!-- Run all Manual tests applicable to the host OS. -->
-  <Target Name="RunManualTests" DependsOnTargets="RunManualTestsWindows;RunManualTestsUnix" />
-
-  <!-- Run all Manual tests applicable to Windows. -->
-  <Target Name="RunManualTestsWindows" Condition="'$(IsEnabledWindows)' == 'true'">
-    <PropertyGroup>
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(ManualTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        -p:ReferenceType=$(ReferenceType)
-        -p:AbstractionsPackageVersion=$(AbstractionsPackageVersion)
-        -p:MdsPackageVersion=$(MdsPackageVersion)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Manual-Windows$(TargetGroup)-$(TestSet)"
-      </TestCommand>
-      <!-- Add test set only if it was provided - otherwise it will be permanently set to '' -->
-      <TestCommand Condition="'$(TestSet)' != ''">
-        $(TestCommand)
-        -p:TestSet=$(TestSet)
-      </TestCommand>
-
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running Manual test for Windows via command: $(TestCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
-  </Target>
-
-  <!-- Run all Manual tests applicable to Unix. -->
-  <Target Name="RunManualTestsUnix" Condition="'$(IsEnabledWindows)' != 'true'">
-    <PropertyGroup>
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(ManualTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        -p:ReferenceType=$(ReferenceType)
-        -p:AbstractionsPackageVersion=$(AbstractionsPackageVersion)
-        -p:MdsPackageVersion=$(MdsPackageVersion)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Manual-Unixnetcoreapp-$(TestSet)"
-      </TestCommand>
-
-      <!-- Add test set only if it was provided - otherwise it will be permanently set to '' -->
-      <TestCommand Condition="'$(TestSet)' != ''">
-        $(TestCommand)
-        -p:TestSet=$(TestSet)
-      </TestCommand>
-
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running Manual test for Unix via command: $(TestCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
-  </Target>
-
   <!-- Clean all build outputs. -->
   <Target Name="Clean">
     <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "artifacts", SearchOption.AllDirectories))' />
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
index 8810bed838..53b17d4bb9 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
@@ -10,10 +10,9 @@
 # via the msBuildArguments parameter.
 # It uses the RoslynAnalyzers@3 task from the Secure Development Team's SDL
 # extension:
-#
 # https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-mohanb/security-integration/guardian-wiki/sdl-azdo-extension/roslyn-analyzers-build-task
 #
-# GOTCHA: This step will clobber any existing build output.  It should be run
+# GOTCHA: This step will clobber any existing build output. It should be run
 # _before_ any build steps that perform versioning or signing.
 
 parameters:
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 5152ce6065..6dcd4bbbd9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetsWindows Condition="'$(OS)' == 'Windows_NT' AND '$(OSGroup)' == ''">true</TargetsWindows>
-    <TargetsWindows Condition="'$(OS)' != 'Windows_NT' AND '$(OSGroup)' == ''">false</TargetsWindows>
-    <TargetsWindows Condition="'$(OSGroup)' == 'Windows_NT'">true</TargetsWindows>
-    <TargetsUnix Condition="'$(OS)' == 'Unix' AND '$(OSGroup)' == ''">true</TargetsUnix>
-    <TargetsUnix Condition="'$(OS)' != 'Unix' AND '$(OSGroup)' == ''">false</TargetsUnix>
-    <TargetsUnix Condition="'$(OSGroup)' == 'Unix'">true</TargetsUnix>
-    <TargetsAnyOS Condition="'$(OSGroup)' == 'AnyOS'">true</TargetsAnyOS>
-    <IsSourceProject Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))">true</IsSourceProject>
     <!--
       "ReferenceType" property supports below options:
 
@@ -19,13 +11,17 @@
     -->
     <ReferenceType Condition="'$(ReferenceType)' == ''">Project</ReferenceType>
   </PropertyGroup>
+
+  <!-- @TODO: What is this? -->
   <PropertyGroup Condition="$(BuildForRelease) == 'true'">
     <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
   </PropertyGroup>
+
   <ItemGroup Condition="$(BuildForRelease) == 'true'">
     <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
     <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
   </ItemGroup>
+
   <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
     <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
   </PropertyGroup>
@@ -33,40 +29,14 @@
     <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
     <RepoRoot>$(ProjectDir)..\</RepoRoot>
     <Artifacts>$(RepoRoot)artifacts\$(ReferenceType)\</Artifacts>
-    <ToolsArtifactsDir Condition="'$(ToolsArtifactsDir)'==''">$(Artifacts)tools\</ToolsArtifactsDir>
-    <ManagedSourceCode>$(ProjectDir)Microsoft.Data.SqlClient\</ManagedSourceCode>
-    <SqlServerSourceCode>$(ProjectDir)Microsoft.SqlServer.Server\</SqlServerSourceCode>
-    <NetCoreSource>$(ManagedSourceCode)netcore\</NetCoreSource>
-    <NetCoreResources>$(ManagedSourceCode)src\Resources\</NetCoreResources>
-    <ResxFileName>Strings</ResxFileName>
-    <ResourceFileName>SqlClient.Resources.$(ResxFileName)</ResourceFileName>
-    <GeneratedSourceFileName>$(ResxFileName).ResourceNames.cs</GeneratedSourceFileName>
-    <NetFxSource>$(ManagedSourceCode)netfx\</NetFxSource>
-    <NetFxResources>$(ManagedSourceCode)src\Resources\</NetFxResources>
-    <AddOnsPath>$(ManagedSourceCode)add-ons\</AddOnsPath>
-    <SqlServerSource>$(RepoRoot)src\Microsoft.SqlServer.Server\</SqlServerSource>
-    <CommonsourceRoot>$(RepoRoot)src\Microsoft.Data.SqlClient\src\</CommonsourceRoot>
-    <ObjFolder>$(Artifacts)obj\</ObjFolder>
-    <CommonPath>$(NetCoreSource)src\Common\src</CommonPath>
-    <CommonTestPath>$(NetCoreSource)src\Common\tests</CommonTestPath>
-    <TestsPath>$(ProjectDir)Microsoft.Data.SqlClient/tests/</TestsPath>
-    <BinFolder Condition="'$(TargetsWindows)' == 'true'">$(Artifacts)bin\Windows_NT\</BinFolder>
-    <BinFolder Condition="'$(TargetsAnyOS)' == 'true'">$(Artifacts)bin\AnyOS\</BinFolder>
-    <BinFolder Condition="'$(TargetsUnix)' == 'true'">$(Artifacts)bin\Unix\</BinFolder>
+
     <ToolsDir Condition="'$(ToolsDir)'==''">$(RepoRoot)tools\</ToolsDir>
-    <GenAPISrcDir Condition="'$(GenAPISrcDir)'==''">$(ToolsDir)GenAPI\</GenAPISrcDir>
     <PackagesDir Condition="'$(PackagesDir)'==''">$(RepoRoot)packages\</PackagesDir>
-    <NuGetRoot Condition="'$(NuGetRoot)' == ''">$(RepoRoot).nuget\</NuGetRoot>
-    <NuGetCmd>$(NuGetRoot)nuget.exe</NuGetCmd>
     <!-- Respect environment variable for the .NET install directory if set; otherwise, use the current default location -->
     <BuildSimulator Condition="'$(BuildSimulator)' != 'true'">false</BuildSimulator>
   </PropertyGroup>
 
-  <!-- Add user-supplied define constants. -->
-  <PropertyGroup Condition="'$(UserDefinedConstants)' != ''">
-    <DefineConstants>$(DefineConstants);$(UserDefinedConstants)</DefineConstants>
-  </PropertyGroup>
-
+  <!-- @TODO: This isn't being set anywhere -->
   <PropertyGroup Condition="'$(BuildSimulator)' == 'true'">
     <DefineConstants>$(DefineConstants);ENCLAVE_SIMULATOR</DefineConstants>
   </PropertyGroup>
@@ -98,18 +68,15 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 
     <!--
-      There may be a few specific warnings that should _not_ be considered an
-      error.  This list should be used sparingly to avoid important warnings
-      being ignored.
+      There may be a few specific warnings that should _not_ be considered an error. This list
+      should be used sparingly to avoid important warnings being ignored.
     -->
-    <WarningsNotAsErrors></WarningsNotAsErrors>
+    <WarningsNotAsErrors />
 
     <!--
-      If a build is failing due to vulnerable dependencies, you may temporarily
-      uncomment the following line to treat the audit warnings as non-errors.
-      This should only be done as a temporary measure while addressing the
-      vulnerable dependencies.  See:
-
+      If a build is failing due to vulnerable dependencies, you may temporarily uncomment the
+      following line to treat the audit warnings as non-errors. This should only be done as a
+      temporary measure while addressing the vulnerable dependencies. See:
       https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904
     -->
     <!-- <WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors> -->
@@ -126,7 +93,7 @@
     <DefineConstants>$(DefineConstants);STRONG_NAME_SIGNING</DefineConstants>
   </PropertyGroup>
 
-  <!-- Packaging  for source link-->
+  <!-- Packaging for source link-->
   <PropertyGroup>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
@@ -135,14 +102,10 @@
     <EmbedUnTrackedSources>true</EmbedUnTrackedSources>
     <DisableSourceLinkTranslation Condition="'$(DisableSourceLinkTranslation)' == ''">false</DisableSourceLinkTranslation>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
 
   <!-- Provides Version properties -->
   <Import Project="$(ToolsDir)props\Versions.props" />
-  <!-- Provides Tool properties -->
-  <Import Project="$(ToolsDir)props\Tools.props" />
+
   <!-- Provides Build properties -->
   <Import Project="$(ToolsDir)props\AssemblyInfo.props" />
   <Import Project="$(ToolsDir)props\AssemblyRef.props" />
@@ -154,20 +117,15 @@
   </PropertyGroup>
 
   <!--
-    We want to use the latest C# language regardless of target framework,
-    so we explicitly set LangVersion for all targets.
-
-    We will roll this version forward as new C# language versions are released
-    and associated with the newest .NET SDK we support.
+    We want to use the latest C# language regardless of target framework, so we explicitly set
+    LangVersion for all targets. We will roll this version forward as new C# language versions are
+    released and associated with the newest .NET SDK we support.
 
     Details here:
-
     https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-versioning
-
     https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version
   -->
   <PropertyGroup>
-    <!-- The newest .NET SDK we support is .NET 10.0, which uses C# 14 -->
     <LangVersion>14</LangVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
index 46eb7fc748..e08e693479 100644
--- a/src/Microsoft.Data.SqlClient.slnx
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -10,6 +10,9 @@
       <Platform Solution="*|x86" Project="x86" />
     </Project>
   </Folder>
+  <Folder Name="/doc/apps/">
+    <Project Path="../doc/apps/AzureAuthentication/AzureAuthentication.csproj" />
+  </Folder>
   <Folder Name="/doc/snippets/" />
   <Folder Name="/doc/snippets/Microsoft.Data.Sql/">
     <File Path="../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml" />
@@ -130,30 +133,27 @@
       <Build Project="false" />
     </Project>
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/" />
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/" />
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/src/">
-    <Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
+  <Folder Name="/src/">
+    <File Path="Directory.Build.props" />
+  </Folder>
+  <Folder Name="/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/">
+    <Project Path="Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/test/">
+  <Folder Name="/src/Microsoft.Data.SqlClient.Extensions.Abstractions/">
+    <Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
     <Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/" />
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/src/">
+  <Folder Name="/src/Microsoft.Data.SqlClient.Extensions.Azure/">
     <Project Path="Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
-  </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/test/">
     <Project Path="Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient.Internal/" />
-  <Folder Name="/Microsoft.Data.SqlClient.Internal/Logging/" />
-  <Folder Name="/Microsoft.Data.SqlClient.Internal/Logging/src/">
+  <Folder Name="/src/Microsoft.Data.SqlClient.Internal.Logging/">
     <Project Path="Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient/">
+  <Folder Name="/src/Microsoft.Data.SqlClient/">
     <File Path="Microsoft.Data.SqlClient/MdsVersions.props" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient/notsupported/">
+  <Folder Name="/src/Microsoft.Data.SqlClient/notsupported/">
     <Project Path="../tools/GenAPI/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj">
       <Build Project="false" />
     </Project>
@@ -164,41 +164,22 @@
       <Build Project="false" />
     </Project>
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient/ref/">
+  <Folder Name="/src/Microsoft.Data.SqlClient/ref/">
     <Project Path="Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient/src/">
+  <Folder Name="/src/Microsoft.Data.SqlClient/src/">
     <Project Path="Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient/tests/" />
-  <Folder Name="/src/">
-    <File Path="Directory.Build.props" />
-    <Project Path="Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj" />
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-      <BuildDependency Project="Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj" />
-    </Project>
+  <Folder Name="/src/Microsoft.Data.SqlClient/tests/" />
+  <Folder Name="/src/Microsoft.SqlServer.Server/">
     <Project Path="Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj" />
   </Folder>
-  <Folder Name="/src/netcore/">
-    <Project Path="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-  </Folder>
-  <Folder Name="/src/netcore/ref/">
-    <Project Path="Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj" />
-  </Folder>
-  <Folder Name="/src/netfx/">
-    <Project Path="Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj" />
-  </Folder>
-  <Folder Name="/src/netfx/ref/">
-    <Project Path="Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj" />
-  </Folder>
   <Folder Name="/test/">
     <Project Path="Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj">
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
     </Project>
     <Project Path="Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
     </Project>
@@ -206,9 +187,7 @@
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
     </Project>
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" />
     <Project Path="Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj">
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
@@ -231,19 +210,9 @@
     <Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj" />
   </Folder>
   <Folder Name="/test/TestClr/">
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-      <BuildDependency Project="Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj" />
-    </Project>
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-    </Project>
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-    </Project>
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
   </Folder>
-  <Project Path="../doc/apps/AzureAuthentication/AzureAuthentication.csproj" />
 </Solution>
diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
deleted file mode 100644
index 3215e42068..0000000000
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
-    <TargetFrameworks>net8.0;net9.0;netstandard2.0</TargetFrameworks>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration)\$(AssemblyName)\ref\</IntermediateOutputPath>
-    <TargetGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETCoreApp'">netcoreapp</TargetGroup>
-    <OutputPath>$(BinFolder)$(Configuration)\$(AssemblyName)\ref\</OutputPath>
-    <!-- When building for library distribution (BuildForLib=true), set the output path to a netstandard-specific directory.
-     This condition also ensures that netcoreapp builds are excluded from this path adjustment. -->
-    <OutputPath Condition="'$(BuildForLib)' == 'true' AND '$(TargetGroup)' != 'netcoreapp'">$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)\netstandard\</OutputPath>
-    <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-    <Product>Core $(BaseProduct)</Product>
-    <Configurations>Debug;Release;</Configurations>
-    <Platforms>AnyCPU;x64;x86</Platforms>
-  </PropertyGroup>
-
-  <!-- CLS Compliance attribute -->
-  <ItemGroup>
-    <AssemblyAttribute Include="System.CLSCompliantAttribute">
-      <_Parameter1>true</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <!-- Files -->
-  <ItemGroup>
-    <Compile Include="../../ref/Microsoft.Data.cs" />
-    <Compile Include="../../ref/Microsoft.Data.Sql.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.DataClassification.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.Diagnostics.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.Server.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlTypes.cs" />
-    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
-      <Link>TypeForwards.Abstractions.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <!-- References -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" />
-  </ItemGroup>
-
-  <!-- .NET Standard 2.0 dependencies -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Text.Json" />
-    <PackageReference Include="System.Threading.Channels" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Abstractions package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
-  </ItemGroup>
-
-  <Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetGroup)' != 'netcoreapp'" />
-  <Import Project="$(ToolsDir)targets\NotSupported.targets" Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetGroup)' != 'netcoreapp'" />
-  <!-- Trim docs for intellisense for ref folder (netcore/netstandard) but not when building for lib folder (only netstandard is built for lib from here) -->
-  <Import Project="$(ToolsDir)targets\TrimDocsForIntelliSense.targets" Condition="'$(BuildForLib)' != 'true' OR '$(TargetGroup)' == 'netcoreapp'" />
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
deleted file mode 100644
index c2fdb27f3f..0000000000
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ /dev/null
@@ -1,1105 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
-    <OSGroup Condition="'$(OSGroup)' == ''">$(OS)</OSGroup>
-    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS'">Microsoft.Data.SqlClient is not supported on this platform.</GeneratePlatformNotSupportedAssemblyMessage>
-    <!-- Allow explicit addition of the Compile files instead of all project files to be included by Default -->
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETCoreApp'">netcoreapp</TargetGroup>
-    <Configurations>Debug;Release;</Configurations>
-    <Platforms>AnyCPU;x64;x86</Platforms>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)\netcore\</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)\netcore\</OutputPath>
-    <DocumentationFile>$(OutputPath)\$(TargetFramework)\Microsoft.Data.SqlClient.xml</DocumentationFile>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Product>Core $(BaseProduct)</Product>
-    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-    <NoWarn>$(NoWarn);IL2026;IL2057;IL2072;IL2075</NoWarn>
-    <RootNamespace />
-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-  </PropertyGroup>
-
-  <!-- When we're not signing, we are permitted to expose our internals to tests. -->
-  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
-    <InternalsVisibleTo Include="UnitTests" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFramework)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <AssemblyAttribute Include="System.CLSCompliantAttribute">
-      <_Parameter1>true</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
-    <EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
-  </ItemGroup>
-
-  <!-- OS Constants ==================================================== -->
-  <PropertyGroup>
-    <DefineConstants Condition="'$(OSGroup.ToUpper())'=='UNIX'">$(DefineConstants),_UNIX</DefineConstants>
-    <DefineConstants Condition="'$(OSGroup.ToUpper())'=='WINDOWS_NT'">$(DefineConstants),_WINDOWS</DefineConstants>
-  </PropertyGroup>
-
-  <!-- Compiled Files ================================================== -->
-  <ItemGroup Condition="'$(OSGroup)' != 'AnyOS'">
-    <Compile Include="$(CommonSourceRoot)Interop\Common\Sni\SniErrors.cs">
-      <Link>Interop\Common\Sni\SniErrors.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Handles\SafeLibraryHandle.netcore.cs">
-      <Link>Interop\Windows\Handles\SafeLibraryHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\FileTypes.cs">
-      <Link>Interop\Windows\Kernel32\FileTypes.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\IoControlCodeAccess.cs">
-      <Link>Interop\Windows\Kernel32\IoControlCodeAccess.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\IoControlTransferType.cs">
-      <Link>Interop\Windows\Kernel32\IoControlTransferType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\Kernel32.cs">
-      <Link>Interop\Windows\Kernel32\Kernel32.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\CreateDisposition.cs">
-      <Link>Interop\Windows\NtDll\CreateDisposition.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\CreateOptions.cs">
-      <Link>Interop\Windows\NtDll\CreateOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\DesiredAccess.cs">
-      <Link>Interop\Windows\NtDll\DesiredAccess.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\FileFullEaInformation.cs">
-      <Link>Interop\Windows\NtDll\FileFullEaInformation.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ImpersonationLevel.cs">
-      <Link>Interop\Windows\NtDll\ImpersonationLevel.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\IoStatusBlock.cs">
-      <Link>Interop\Windows\NtDll\IoStatusBlock.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\NtDll.cs">
-      <Link>Interop\Windows\NtDll\NtDll.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ObjectAttributeFlags.cs">
-      <Link>Interop\Windows\NtDll\ObjectAttributeFlags.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ObjectAttributes.cs">
-      <Link>Interop\Windows\NtDll\ObjectAttributes.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\SecurityQualityOfService.cs">
-      <Link>Interop\Windows\NtDll\SecurityQualityOfService.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\AuthProviderInfo.cs">
-      <Link>Interop\Windows\Sni\AuthProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\ConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ConsumerNumber.cs">
-      <Link>Interop\Windows\Sni\ConsumerNumber.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Delegates.cs">
-      <Link>Interop\Windows\Sni\Delegates.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\IoType.cs">
-      <Link>Interop\Windows\Sni\IoType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ISniNativeMethods.cs">
-      <Link>Interop\Windows\Sni\ISniNativeMethods.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Prefix.cs">
-      <Link>Interop\Windows\Sni\Prefix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Provider.cs">
-      <Link>Interop\Windows\Sni\Provider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\QueryType.cs">
-      <Link>Interop\Windows\Sni\QueryType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniClientConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\SniClientConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\SniConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniDnsCacheInfo.cs">
-      <Link>Interop\Windows\Sni\SniDnsCacheInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniError.cs">
-      <Link>Interop\Windows\Sni\SniError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeMethods.netcore.cs">
-      <Link>Interop\Windows\Sni\SniNativeMethods.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeWrapper.cs">
-      <Link>Interop\Windows\Sni\SniNativeWrapper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniSslProtocols.cs">
-      <Link>Interop\Windows\Sni\SniSslProtocols.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\TransparentNetworkResolutionMode.cs">
-      <Link>Interop\Windows\Sni\TransparentNetworkResolutionMode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\SystemErrors.cs">
-      <Link>Interop\Windows\SystemErrors.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\UnicodeString.cs">
-      <Link>Interop\Windows\UnicodeString.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ActivityCorrelator.cs">
-      <Link>Microsoft\Data\Common\ActivityCorrelator.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.cs">
-      <Link>Microsoft\Data\Common\AdapterUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.netcore.cs">
-      <Link>Microsoft\Data\Common\AdapterUtil.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\BitConverterCompatible.cs">
-      <Link>Microsoft\Data\Common\BitConverterCompatible.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\MultipartIdentifier.cs">
-      <Link>Microsoft\Data\Common\MultipartIdentifier.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\NameValuePair.cs">
-      <Link>Microsoft\Data\Common\NameValuePair.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\DataException.cs">
-      <Link>Microsoft\Data\DataException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\OperationAbortedException.cs">
-      <Link>Microsoft\Data\OperationAbortedException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionClosed.cs">
-      <Link>Microsoft\Data\ProviderBase\DbConnectionClosed.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
-      <Link>Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
-      <Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\FieldNameLookup.cs">
-      <Link>Microsoft\Data\ProviderBase\FieldNameLookup.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\TimeoutTimer.cs">
-      <Link>Microsoft\Data\ProviderBase\TimeoutTimer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncrypted\ColumnMasterKeyMetadata.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncrypted\ColumnMasterKeyMetadata.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncrypted\EncryptedColumnEncryptionKeyParameters.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncrypted\EncryptedColumnEncryptionKeyParameters.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.netcore.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.windows.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlNotificationRequest.cs">
-      <Link>Microsoft\Data\Sql\SqlNotificationRequest.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AAsyncCallContext.cs">
-      <Link>Microsoft\Data\SqlClient\AAsyncCallContext.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs">
-      <Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ApplicationIntent.cs">
-      <Link>Microsoft\Data\SqlClient\ApplicationIntent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AssemblyRef.cs">
-      <Link>Microsoft\Data\SqlClient\AssemblyRef.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\CachedContexts.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\CachedContexts.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\ServerInfo.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\ServerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionData.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SessionData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\ChannelDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\ChannelDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\ConnectionPoolSlots.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\ConnectionPoolSlots.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\IDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\IDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\TransactedConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\TransactedConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
-      <Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\DiagnosticScope.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\DiagnosticScope.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\DiagnosticTransactionScope.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\DiagnosticTransactionScope.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientMetrics.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientMetrics.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs">
-      <Link>Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveDelegate.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveDelegate.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveDelegate.Crypto.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveDelegate.Crypto.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclavePackage.cs">
-      <Link>Microsoft\Data\SqlClient\EnclavePackage.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveProviderBase.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveProviderBase.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveSessionCache.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveSessionCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ISqlVector.cs">
-      <Link>Microsoft\Data\SqlClient\ISqlVector.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalAppContextSwitches.cs">
-      <Link>Microsoft\Data\SqlClient\LocalAppContextSwitches.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.unix.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.windows.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\ConcurrentQueueSemaphore.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\ConcurrentQueueSemaphore.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\LocalDB.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\LocalDB.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\LocalDB.netcore.windows.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\LocalDB.netcore.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\ResolvedServerSpn.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\ResolvedServerSpn.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniAsyncCallback.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniAsyncCallback.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniError.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniError.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniCommon.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniCommon.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniLoadHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniLoadHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniMarsConnection.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniMarsConnection.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniMarsHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniMarsHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniNetworkStream.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniNetworkStream.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniNpHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniNpHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniPacket.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniPacket.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniPhysicalHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniPhysicalHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniProviders.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniProviders.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniProxy.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniProxy.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniSmuxFlags.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniSmuxFlags.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniSmuxHeader.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniSmuxHeader.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniSslStream.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniSslStream.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniTcpHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniTcpHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SslOverTdsStream.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SslOverTdsStream.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SsrpClient.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SsrpClient.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\NoneAttestationEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\NoneAttestationEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\OnChangedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\OnChangedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Packet.cs">
-      <Link>Microsoft\Data\SqlClient\Packet.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PacketHandle.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlClient\PacketHandle.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PacketHandle.netcore.windows.cs">
-      <Link>Microsoft\Data\SqlClient\PacketHandle.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs">
-      <Link>Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PoolBlockingPeriod.cs">
-      <Link>Microsoft\Data\SqlClient\PoolBlockingPeriod.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryFactory.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicLoader.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicLoader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryIntervalBaseEnumerator.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryIntervalBaseEnumerator.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogic.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogic.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBase.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBase.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBaseProvider.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBaseProvider.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicProvider.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlRetryIntervalEnumerators.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlRetryIntervalEnumerators.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs">
-      <Link>Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiMetaData.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiMetaData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiSettersStream.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiSettersStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlDataRecord.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlDataRecord.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlMetaData.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlMetaData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlNormalizer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlNormalizer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlSer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlSer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlClient\SessionHandle.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netcore.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SessionHandle.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SignatureVerificationCache.cs">
-      <Link>Microsoft\Data\SqlClient\SignatureVerificationCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SortOrder.cs">
-      <Link>Microsoft\Data\SqlClient\SortOrder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256EncryptionKey.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256EncryptionKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Factory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Factory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAppContextSwitchManager.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAppContextSwitchManager.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAuthenticationParametersBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAuthenticationParametersBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatch.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBatch.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommand.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBatchCommand.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommand.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBatchCommand.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommandCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBatchCommandCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopy.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopy.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHint.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHint.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCachedBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCachedBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionType.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEventSource.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEventSource.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientLogger.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientLogger.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCollation.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCollation.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Batch.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Batch.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Encryption.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Encryption.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.NonQuery.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.NonQuery.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Reader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Reader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Scalar.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Scalar.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Xml.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Xml.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommandBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandSet.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionString.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionString.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCredential.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCredential.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDataAdapter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDataAdapter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDataReader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDataReader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDbColumn.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDbColumn.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependency.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependency.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyListener.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyListener.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnclaveSession.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnclaveSession.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnums.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnums.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnvChange.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnvChange.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlError.cs">
-      <Link>Microsoft\Data\SqlClient\SqlError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlErrorCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlErrorCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlException.cs">
-      <Link>Microsoft\Data\SqlClient\SqlException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SQLFallbackDNSCache.cs">
-      <Link>Microsoft\Data\SqlClient\SQLFallbackDNSCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlMetaDataFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationInfo.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationSource.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationSource.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationType.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlParameter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlParameter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlParameterCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlParameterCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs">
-      <Link>Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlReferenceCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlReferenceCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatingEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatingEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatingEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatingEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSecurityUtility.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSecurityUtility.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSequentialStream.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSequentialStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSequentialTextReader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSequentialTextReader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlStatistics.cs">
-      <Link>Microsoft\Data\SqlClient\SqlStatistics.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlStream.cs">
-      <Link>Microsoft\Data\SqlClient\SqlStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUdtInfo.cs">
-      <Link>Microsoft\Data\SqlClient\SqlUdtInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
-      <Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\ObjectPool.cs">
-      <Link>Microsoft\Data\SqlClient\Utilities\ObjectPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\ObjectPools.cs">
-      <Link>Microsoft\Data\SqlClient\Utilities\ObjectPools.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsEnums.cs">
-      <Link>Microsoft\Data\SqlClient\TdsEnums.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParameterSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParameterSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserHelperClasses.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserHelperClasses.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSafeHandles.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserSafeHandles.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObject.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectFactory.unix.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectFactory.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectFactory.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectFactory.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectManaged.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectManaged.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectNative.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectNative.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStaticMethods.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStaticMethods.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSessionPool.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserSessionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsValueSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsValueSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TransactionRequest.cs">
-      <Link>Microsoft\Data\SqlClient\TransactionRequest.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\UserAgent.cs">
-      <Link>Microsoft\Data\SqlClient\UserAgent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs">
-      <Link>Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlDbTypeExtensions.cs">
-      <Link>Microsoft\Data\SqlDbTypeExtensions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlFileStream.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.windows.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlFileStream.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlJson.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlJson.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlVector.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlVector.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\ResCategoryAttribute.cs">
-      <Link>Resources\ResCategoryAttribute.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\ResDescriptionAttribute.cs">
-      <Link>Resources\ResDescriptionAttribute.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\StringsHelper.cs">
-      <Link>Resources\StringsHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)TypeForwards.netcore.cs">
-      <Link>TypeForwards.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
-      <Link>TypeForwards.Abstractions.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <!-- Resource Files ================================================== -->
-  <ItemGroup>
-    <!-- Linker directives to replace UseManagedNetworking with a constant if consumer specifies -->
-    <!-- the app context switch in their csproj. -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\ILLink.Substitutions.xml"
-                      Condition="'$(OSGroup.ToUpper())' == 'WINDOWS_NT'">
-      <Link>Resources\ILLink.Substitutions.xml</Link>
-    </EmbeddedResource>
-
-    <!-- Used by SqlMetaDataFactory to construct its DataSet -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
-      <Link>Resources\Microsoft.Data.SqlCLient.SqlMetaData.xml</Link>
-      <LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName>
-    </EmbeddedResource>
-
-    <!-- Base strings in English -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\Strings.resx">
-      <Link>Resources\Strings.resx</Link>
-      <LogicalName>Microsoft.Data.SqlClient.Resources.Strings.resources</LogicalName>
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-      <CustomToolNamespace>System</CustomToolNamespace>
-    </EmbeddedResource>
-
-    <!-- Includes all strings that have been translated -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\Strings.*.resx">
-      <Link>Resources\%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <LogicalName>Microsoft.Data.SqlCLient.Resources.%(Filename).resources</LogicalName>
-    </EmbeddedResource>
-
-    <!-- Strings designer that depends on the resx -->
-    <Compile Include="$(CommonSourceRoot)Resources\Strings.Designer.cs">
-      <Link>Resources\Strings.Designer.cs</Link>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <!-- Package References ============================================== -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Abstractions package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Logging package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" />
-  </ItemGroup>
-
-  <!-- CodeGen Targets ================================================= -->
-  <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
-  <Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
-  <Import Project="$(ToolsDir)targets\NotSupported.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
deleted file mode 100644
index 93fc5a5375..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ /dev/null
@@ -1,69 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
-    <TargetFramework>net462</TargetFramework>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration)\$(AssemblyName)\ref\</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration)\$(AssemblyName)\ref\</OutputPath>
-    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
-    <Product>Framework $(BaseProduct)</Product>
-    <Configurations>Debug;Release</Configurations>
-  </PropertyGroup>
-
-  <!-- CLS Compliance -->
-  <ItemGroup>
-    <AssemblyAttribute Include="System.CLSCompliantAttribute">
-      <_Parameter1>true</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <!-- Files -->
-  <ItemGroup>
-    <Compile Include="../../ref/Microsoft.Data.cs" />
-    <Compile Include="../../ref/Microsoft.Data.Sql.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.DataClassification.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.Diagnostics.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.Server.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlTypes.cs" />
-    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
-      <Link>TypeForwards.Abstractions.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <!-- References -->
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Transactions" />
-
-    <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI">
-      <PrivateAssets>All</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="System.Buffers" />
-    <PackageReference Include="System.Data.Common" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" />
-    <PackageReference Include="System.Text.Json" />
-    <PackageReference Include="System.Threading.Channels" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Abstractions package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
-  </ItemGroup>
-
-  <Import Project="$(ToolsDir)targets\TrimDocsForIntelliSense.targets" />
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
deleted file mode 100644
index eb14ccc985..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ /dev/null
@@ -1,1089 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
-    <TargetFrameworks>net462</TargetFrameworks>
-    <ProjectGuid>{407890AC-9876-4FEF-A6F1-F36A876BAADE}</ProjectGuid>
-    <RootNamespace />
-    <OSGroup Condition="'$(OSGroup)' == ''">$(OS)</OSGroup>
-    <EnableLocalAppContext>true</EnableLocalAppContext>
-    <OutputPlatform>AnyCPU</OutputPlatform>
-    <BinPath>$(BinFolder)$(Configuration).$(OutputPlatform)\</BinPath>
-    <ObjPath>$(ObjFolder)$(Configuration).$(OutputPlatform)\</ObjPath>
-    <OutputPath>$(BinPath)$(AssemblyName)\netfx\</OutputPath>
-    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
-    <IntermediateOutputPath>$(ObjPath)$(AssemblyName)\netfx\</IntermediateOutputPath>
-    <Product>Framework $(BaseProduct)</Product>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-  </PropertyGroup>
-
-  <!-- When we're not signing, we are permitted to expose our internals to tests. -->
-  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-      <_Parameter1>UnitTests</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <!-- Override debugtype=portable in Directory.Build.props for netfx -->
-  <PropertyGroup>
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <AssemblyAttribute Include="System.CLSCompliantAttribute">
-      <_Parameter1>true</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
-  </ItemGroup>
-  <PropertyGroup>
-    <!-- CSC Compiler Options -->
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <NoWarn>1701,1702</NoWarn>
-    <GenerateFullPaths>True</GenerateFullPaths>
-    <NoStandardLib>True</NoStandardLib>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <HighEntropyVA>True</HighEntropyVA>
-    <DebugSymbols>True</DebugSymbols>
-    <NoLogo>True</NoLogo>
-    <SubsystemVersion>6.00</SubsystemVersion>
-    <OutputType>Library</OutputType>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <Utf8Output>True</Utf8Output>
-    <ErrorReport>None</ErrorReport>
-    <BuildProjectReferences>True</BuildProjectReferences>
-    <GenerateAssemblyRefs>True</GenerateAssemblyRefs>
-    <DefineConstants>$(DefineConstants);USEOFFSET;CODE_ANALYSIS_BASELINE;FEATURE_LEGACYSURFACEAREA;FEATURE_UTF32;FEATURE_UTF7;TRACE;</DefineConstants>
-    <!-- Preprocess properties -->
-    <AllowPartialTrustedCalls>true</AllowPartialTrustedCalls>
-    <AssemblyKeyType>ECMA</AssemblyKeyType>
-    <!-- the RawClDefines was the only way to get AssemblyAttributes.cs to not include [SecurityRules] which break the link step -->
-    <GenerateAssemblyAttribute>true</GenerateAssemblyAttribute>
-    <RawClDefines>$(RawClDefines);SUPPRESS_SECURITY_RULES=1</RawClDefines>
-    <!-- ADO.NET internal defines -->
-    <ComCompatibleSideBySide>True</ComCompatibleSideBySide>
-    <GenerateTargetFrameworkAttribute>False</GenerateTargetFrameworkAttribute>
-  </PropertyGroup>
-  <!-- ********************** Configuration and Platform specific properties ********************* -->
-  <!-- All Available Configurations-->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
-    <DefineConstants>$(DefineConstants);DEBUG;DBG;_DEBUG;_LOGGING;</DefineConstants>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.Contains('Release'))">
-    <DefineConstants>$(DefineConstants);RETAIL;</DefineConstants>
-    <DebugType>Pdbonly</DebugType>
-    <Optimize>True</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Transactions" />
-  </ItemGroup>
-
-  <!-- OS Constants ==================================================== -->
-  <PropertyGroup>
-    <!-- Netfx project only builds for Windows, so we always define _WINDOWS here -->
-    <DefineConstants>$(DefineConstants),_WINDOWS</DefineConstants>
-  </PropertyGroup>
-
-  <!-- Compiled Files ================================================== -->
-  <ItemGroup>
-    <Compile Include="$(CommonSourceRoot)Interop\Common\Sni\SniErrors.cs">
-      <Link>Interop\Common\Sni\SniErrors.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\FileTypes.cs">
-      <Link>Interop\Windows\Kernel32\FileTypes.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\IoControlCodeAccess.cs">
-      <Link>Interop\Windows\Kernel32\IoControlCodeAccess.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\IoControlTransferType.cs">
-      <Link>Interop\Windows\Kernel32\IoControlTransferType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\Kernel32.cs">
-      <Link>Interop\Windows\Kernel32\Kernel32.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\Kernel32Safe.netfx.cs">
-      <Link>Interop\Windows\Kernel32\Kernel32Safe.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\CreateDisposition.cs">
-      <Link>Interop\Windows\NtDll\CreateDisposition.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\CreateOptions.cs">
-      <Link>Interop\Windows\NtDll\CreateOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\DesiredAccess.cs">
-      <Link>Interop\Windows\NtDll\DesiredAccess.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\FileFullEaInformation.cs">
-      <Link>Interop\Windows\NtDll\FileFullEaInformation.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ImpersonationLevel.cs">
-      <Link>Interop\Windows\NtDll\ImpersonationLevel.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\IoStatusBlock.cs">
-      <Link>Interop\Windows\NtDll\IoStatusBlock.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\NtDll.cs">
-      <Link>Interop\Windows\NtDll\NtDll.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ObjectAttributeFlags.cs">
-      <Link>Interop\Windows\NtDll\ObjectAttributeFlags.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ObjectAttributes.cs">
-      <Link>Interop\Windows\NtDll\ObjectAttributes.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\SecurityQualityOfService.cs">
-      <Link>Interop\Windows\NtDll\SecurityQualityOfService.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\AuthProviderInfo.cs">
-      <Link>Interop\Windows\Sni\AuthProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\ConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ConsumerNumber.cs">
-      <Link>Interop\Windows\Sni\ConsumerNumber.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Delegates.cs">
-      <Link>Interop\Windows\Sni\Delegates.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\IoType.cs">
-      <Link>Interop\Windows\Sni\IoType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ISniNativeMethods.cs">
-      <Link>Interop\Windows\Sni\ISniNativeMethods.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Prefix.cs">
-      <Link>Interop\Windows\Sni\Prefix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Provider.cs">
-      <Link>Interop\Windows\Sni\Provider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\QueryType.cs">
-      <Link>Interop\Windows\Sni\QueryType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniClientConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\SniClientConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\SniConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniDnsCacheInfo.cs">
-      <Link>Interop\Windows\Sni\SniDnsCacheInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniError.cs">
-      <Link>Interop\Windows\Sni\SniError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeMethodsArm64.netfx.cs">
-      <Link>Interop\Windows\Sni\SniNativeMethodsArm64.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeMethodsNotSupported.netfx.cs">
-      <Link>Interop\Windows\Sni\SniNativeMethodsNotSupported.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeMethodsX64.netfx.cs">
-      <Link>Interop\Windows\Sni\SniNativeMethodsX64.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeMethodsX86.netfx.cs">
-      <Link>Interop\Windows\Sni\SniNativeMethodsX86.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeWrapper.cs">
-      <Link>Interop\Windows\Sni\SniNativeWrapper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniSslProtocols.cs">
-      <Link>Interop\Windows\Sni\SniSslProtocols.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SqlDependencyProcessDispatcherStorage.netfx.cs">
-      <Link>Interop\Windows\Sni\SqlDependencyProcessDispatcherStorage.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\TransparentNetworkResolutionMode.cs">
-      <Link>Interop\Windows\Sni\TransparentNetworkResolutionMode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\SystemErrors.cs">
-      <Link>Interop\Windows\SystemErrors.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\UnicodeString.cs">
-      <Link>Interop\Windows\UnicodeString.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ActivityCorrelator.cs">
-      <Link>Microsoft\Data\Common\ActivityCorrelator.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.cs">
-      <Link>Microsoft\Data\Common\AdapterUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.netfx.cs">
-      <Link>Microsoft\Data\Common\AdapterUtil.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\BitConverterCompatible.cs">
-      <Link>Microsoft\Data\Common\BitConverterCompatible.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionString.netfx.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionString.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ISqlVector.cs">
-      <Link>Microsoft\Data\SqlClient\ISqlVector.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\MultipartIdentifier.cs">
-      <Link>Microsoft\Data\Common\MultipartIdentifier.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\NameValuePair.cs">
-      <Link>Microsoft\Data\Common\NameValuePair.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\DataException.cs">
-      <Link>Microsoft\Data\DataException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\OperationAbortedException.cs">
-      <Link>Microsoft\Data\OperationAbortedException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionClosed.cs">
-      <Link>Microsoft\Data\ProviderBase\DbConnectionClosed.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
-      <Link>Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
-      <Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\FieldNameLookup.cs">
-      <Link>Microsoft\Data\ProviderBase\FieldNameLookup.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\TimeoutTimer.cs">
-      <Link>Microsoft\Data\ProviderBase\TimeoutTimer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.windows.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlNotificationRequest.cs">
-      <Link>Microsoft\Data\Sql\SqlNotificationRequest.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AAsyncCallContext.cs">
-      <Link>Microsoft\Data\SqlClient\AAsyncCallContext.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs">
-      <Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncrypted\ColumnMasterKeyMetadata.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncrypted\ColumnMasterKeyMetadata.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncrypted\EncryptedColumnEncryptionKeyParameters.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncrypted\EncryptedColumnEncryptionKeyParameters.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ApplicationIntent.cs">
-      <Link>Microsoft\Data\SqlClient\ApplicationIntent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AssemblyRef.cs">
-      <Link>Microsoft\Data\SqlClient\AssemblyRef.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\CachedContexts.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\CachedContexts.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\ServerInfo.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\ServerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionData.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SessionData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\ChannelDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\ChannelDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\ConnectionPoolSlots.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\ConnectionPoolSlots.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\IDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\IDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\TransactedConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\TransactedConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
-      <Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\DiagnosticScope.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\DiagnosticScope.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\DiagnosticTransactionScope.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\DiagnosticTransactionScope.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientMetrics.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientMetrics.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs">
-      <Link>Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveDelegate.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveDelegate.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveDelegate.Crypto.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveDelegate.Crypto.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclavePackage.cs">
-      <Link>Microsoft\Data\SqlClient\EnclavePackage.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveProviderBase.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveProviderBase.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveSessionCache.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveSessionCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalAppContextSwitches.cs">
-      <Link>Microsoft\Data\SqlClient\LocalAppContextSwitches.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceROot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.windows.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbConfigurationSection.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbConfigurationSection.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbInstanceElement.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbInstanceElement.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbInstancesCollection.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbInstancesCollection.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\ResolvedServerSpn.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\ResolvedServerSpn.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\NoneAttestationEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\NoneAttestationEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\OnChangedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\OnChangedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Packet.cs">
-      <Link>Microsoft\Data\SqlClient\Packet.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PacketHandle.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\PacketHandle.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs">
-      <Link>Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PoolBlockingPeriod.cs">
-      <Link>Microsoft\Data\SqlClient\PoolBlockingPeriod.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryIntervalBaseEnumerator.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryIntervalBaseEnumerator.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogic.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogic.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBase.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBase.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBaseProvider.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBaseProvider.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicProvider.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryFactory.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicLoader.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicLoader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlRetryIntervalEnumerators.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlRetryIntervalEnumerators.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs">
-      <Link>Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiMetaData.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiMetaData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiSettersStream.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiSettersStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlDataRecord.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlDataRecord.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlMetaData.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlMetaData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlNormalizer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlNormalizer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\TriggerAction.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\Server\TriggerAction.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlSer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlSer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\SessionHandle.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SignatureVerificationCache.cs">
-      <Link>Microsoft\Data\SqlClient\SignatureVerificationCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256EncryptionKey.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256EncryptionKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Factory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Factory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAuthenticationParametersBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAuthenticationParametersBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommand.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBatchCommand.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopy.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopy.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHint.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHint.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCachedBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCachedBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionType.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEventSource.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEventSource.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientLogger.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientLogger.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientPermission.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientPermission.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientPermissionAttribute.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientPermissionAttribute.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCollation.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCollation.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Batch.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Batch.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Encryption.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Encryption.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.NonQuery.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.NonQuery.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Reader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Reader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Scalar.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Scalar.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Xml.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Xml.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommandBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandSet.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionString.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionString.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCredential.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCredential.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDataAdapter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDataAdapter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDataReader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDataReader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDbColumn.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDbColumn.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependency.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependency.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyListener.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyListener.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnclaveSession.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnclaveSession.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnums.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnums.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnvChange.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnvChange.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlError.cs">
-      <Link>Microsoft\Data\SqlClient\SqlError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlErrorCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlErrorCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlException.cs">
-      <Link>Microsoft\Data\SqlClient\SqlException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SQLFallbackDNSCache.cs">
-      <Link>Microsoft\Data\SqlClient\SQLFallbackDNSCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlMetaDataFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationInfo.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationSource.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationSource.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationType.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlParameter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlParameter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlParameterCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlParameterCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs">
-      <Link>Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlReferenceCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlReferenceCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatingEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatingEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatingEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatingEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSecurityUtility.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSecurityUtility.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSequentialStream.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSequentialStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSequentialTextReader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSequentialTextReader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlStatistics.cs">
-      <Link>Microsoft\Data\SqlClient\SqlStatistics.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlStream.cs">
-      <Link>Microsoft\Data\SqlClient\SqlStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUdtInfo.cs">
-      <Link>Microsoft\Data\SqlClient\SqlUdtInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
-      <Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.windows..cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SortOrder.cs">
-      <Link>Microsoft\Data\SqlClient\SortOrder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsEnums.cs">
-      <Link>Microsoft\Data\SqlClient\TdsEnums.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParameterSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParameterSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSafeHandles.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserSafeHandles.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObject.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectFactory.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectFactory.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectNative.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectNative.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStaticMethods.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStaticMethods.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserHelperClasses.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserHelperClasses.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSessionPool.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserSessionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsValueSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsValueSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TransactionRequest.cs">
-      <Link>Microsoft\Data\SqlClient\TransactionRequest.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\UserAgent.cs">
-      <Link>Microsoft\Data\SqlClient\UserAgent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\BufferWriterExtensions.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\Utilities\BufferWriterExtensions.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\ObjectPool.cs">
-      <Link>Microsoft\Data\SqlClient\Utilities\ObjectPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\ObjectPools.cs">
-      <Link>Microsoft\Data\SqlClient\Utilities\ObjectPools.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs">
-      <Link>Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlDbTypeExtensions.cs">
-      <Link>Microsoft\Data\SqlDbTypeExtensions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.windows.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlFileStream.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlJson.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlJson.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlVector.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlVector.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\ResCategoryAttribute.cs">
-      <Link>Resources\ResCategoryAttribute.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\StringsHelper.cs">
-      <Link>Resources\StringsHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\ResDescriptionAttribute.cs">
-      <Link>Resources\ResDescriptionAttribute.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)System\Buffers\ArrayBufferWriter.netfx.cs">
-      <Link>System\Buffers\ArrayBufferWriter.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.netfx.cs">
-      <Link>System\Diagnostics\CodeAnalysis.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)System\IO\StreamExtensions.netfx.cs">
-      <Link>System\IO\StreamExtensions.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)System\Runtime\CompilerServices\IsExternalInit.netfx.cs">
-      <Link>System\Runtime\CompilerServices\IsExternalInit.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
-      <Link>TypeForwards.Abstractions.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <!-- Resource Files ================================================== -->
-  <ItemGroup>
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
-      <Link>Resources\Microsoft.Data.SqlClient.SqlMetaData.xml</Link>
-      <LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName> <!-- @TODO: How necessary is this? -->
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-
-    <!-- Base strings in English -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\Strings.resx">
-      <Link>Resources\Strings.resx</Link>
-      <LogicalName>Microsoft.Data.SqlClient.Resources.Strings.resources</LogicalName>
-      <CustomToolNamespace>System</CustomToolNamespace>
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-
-    <!-- Includes all strings that have been translated -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\$(ResxFileName).*.resx">
-      <Link>Resources\%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <LogicalName>Microsoft.Data.SqlClient.Resources.%(Filename).resources</LogicalName>
-    </EmbeddedResource>
-
-    <!-- Strings designer that depends on the resx -->
-    <Compile Include="$(CommonSourceRoot)Resources\Strings.Designer.cs">
-      <Link>Resources\Strings.Designer.cs</Link>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <!-- Package References ============================================== -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI">
-      <PrivateAssets>All</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="System.Buffers" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
-    <PackageReference Include="System.Memory" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" />
-    <PackageReference Include="System.Text.Json" />
-    <PackageReference Include="System.Threading.Channels" />
-    <PackageReference Include="System.ValueTuple" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Abstractions package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Logging package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" />
-  </ItemGroup>
-
-  <!-- CodeGen Targets ================================================= -->
-  <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
-  <Import Project="$(NetFxSource)tools\targets\GenerateAssemblyRef.targets" />
-  <Import Project="$(NetFxSource)tools\targets\GenerateAssemblyInfo.targets" />
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyInfo.targets b/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyInfo.targets
deleted file mode 100644
index 9c43ce4989..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyInfo.targets
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Target Name="BeforeBuild">
-        <ItemGroup>
-            <AssemblyInfo Include="//------------------------------------------------------------------------------" />
-            <AssemblyInfo Include="//     This code was auto-generated by msbuild target." />
-            <AssemblyInfo Include="//     Changes to this file may cause incorrect behavior and will be lost if the code is regenerated." />
-            <AssemblyInfo Include="//------------------------------------------------------------------------------" />
-            <AssemblyInfo Include="using System%3B" />
-            <AssemblyInfo Include="using System.Reflection%3B" />
-            <AssemblyInfo Include="using System.Resources%3B" />
-            <AssemblyInfo Include="using System.Security%3B" />
-            <AssemblyInfo Include="using System.Runtime.InteropServices%3B" />
-            <AssemblyInfo Include="using System.Runtime.Versioning%3B%0A" />
-
-            <AssemblyInfo Include="[assembly: ComVisible(false)]" />
-            <AssemblyInfo Include="[assembly: TargetFramework(&quot;.NETFramework,Version=$(TargetFrameworkVersion)&quot;)]" />
-            <AssemblyInfo Include="[assembly: SatelliteContractVersion(&quot;$(AssemblyVersion)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyTitle(&quot;$(AssemblyName)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyDescription(&quot;$(Description)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyCompany(&quot;$(Company)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyProduct(&quot;$(Product)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyCopyright(&quot;$(Copyright)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyVersion(&quot;$(AssemblyVersion)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyFileVersion(&quot;$(AssemblyFileVersion)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyInformationalVersion(&quot;$(Version)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyConfiguration(&quot;$(Configuration)&quot;)]" />
-            <AssemblyInfo Include="[assembly: NeutralResourcesLanguage(&quot;en-US&quot;)]" />
-        </ItemGroup>
-        <MakeDir Directories="$(IntermediateOutputPath)" />
-        <WriteLinesToFile File="$(IntermediateOutputPath)$(AssemblyName).AssemblyInfo.cs" Overwrite="True" Lines="@(AssemblyInfo)" />
-        <ItemGroup>
-            <Compile Include="$(IntermediateOutputPath)$(AssemblyName).AssemblyInfo.cs" />
-        </ItemGroup>
-    </Target>
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyRef.targets b/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyRef.targets
deleted file mode 100644
index 618d30af8b..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyRef.targets
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Target Name="BeforeBuild">
-        <PropertyGroup>
-            <OutputPath>$(NetFxSource)src\System\Data\SqlClient\</OutputPath>
-            <Tab>%20%20%20%20</Tab>
-        </PropertyGroup>
-        <ItemGroup>
-            <AssemblyRef Include="//------------------------------------------------------------------------------" />
-            <AssemblyRef Include="//     This code was auto-generated by msbuild target." />
-            <AssemblyRef Include="//     Changes to this file may cause incorrect behavior and will be lost if the code is regenerated." />
-            <AssemblyRef Include="//------------------------------------------------------------------------------" />
-            <AssemblyRef Include="// Licensed to the .NET Foundation under one or more agreements." />
-            <AssemblyRef Include="// The .NET Foundation licenses this file to you under the MIT license." />
-            <AssemblyRef Include="// See the LICENSE file in the project root for more information." />
-            <AssemblyRef Include="%0A" />
-            <AssemblyRef Include="namespace Microsoft.Data.SqlClient" />
-            <AssemblyRef Include="{" />
-            <AssemblyRef Include="$(Tab)internal static class AssemblyRef" />
-            <AssemblyRef Include="$(Tab)$(Tab){" />
-            <AssemblyRef Include="$(Tab)$(Tab)$(Tab)internal const string MicrosoftVSDesigner = $(MicrosoftVSDesigner)%3B"/>
-            <AssemblyRef Include="$(Tab)$(Tab)$(Tab)internal const string SystemDrawing = $(SystemDrawing)%3B" />
-            <AssemblyRef Include="$(Tab)$(Tab)$(Tab)internal const string EcmaPublicKey = $(EcmaPublicKey)%3B" />
-            <AssemblyRef Include="$(Tab)$(Tab)$(Tab)internal const string EcmaPublicKeyFull = $(EcmaPublicKeyFull)%3B" />
-            <AssemblyRef Include="$(Tab)$(Tab)$(Tab)internal const string SystemDesign = $(SystemDesign)%3B" />
-            <AssemblyRef Include="$(Tab)$(Tab)}" />
-            <AssemblyRef Include="$(Tab)}" />
-        </ItemGroup>
-        <WriteLinesToFile File="$(OutputPath)AssemblyRef.cs" Overwrite="True" Lines="@(AssemblyRef)" />
-    </Target>
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
index 8be139a0e6..7045eecc65 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -87,12 +87,12 @@
                       IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
                       PrivateAssets="all" />
 
-    <ProjectReference Include="$(TestsPath)Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)ManualTests\SQL\UdtTest\UDTs\Address\Address.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\Microsoft.Data.SqlClient.TestUtilities\Microsoft.Data.SqlClient.TestUtilities.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.Servers\TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
   </ItemGroup>
 
   <!-- References for netcore -->
@@ -117,11 +117,11 @@
                       IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
                       PrivateAssets="all" />
 
-    <ProjectReference Include="$(TestsPath)Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)ManualTests\SQL\UdtTest\UDTs\Address\Address.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\Microsoft.Data.SqlClient.TestUtilities\Microsoft.Data.SqlClient.TestUtilities.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.Servers\TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 25a1d53d0d..c28f1cfeb7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -382,11 +382,11 @@
     <ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
     <PackageReference Include="Microsoft.SqlServer.Server" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS/TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS.Servers/TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
   </ItemGroup>
 
   <!-- References for netcore -->
@@ -415,11 +415,11 @@
     <ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
     <PackageReference Include="Microsoft.SqlServer.Server" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS/TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS.Servers/TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
index 7ad0323852..d481e4cca6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
@@ -2,11 +2,6 @@
   <PropertyGroup>
     <RootNamespace>Address</RootNamespace>
     <AssemblyName>Address</AssemblyName>
-    <ProjectGuid>{D1392B54-998A-4F27-BC17-4CE149117BCC}</ProjectGuid>
-    <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
-    <TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
index 105dad030d..6066c1c751 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
@@ -2,11 +2,6 @@
   <PropertyGroup>
     <RootNamespace>Circle</RootNamespace>
     <AssemblyName>Circle</AssemblyName>
-    <ProjectGuid>{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}</ProjectGuid>
-    <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
-    <TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
index 6728189c55..67f26c9ae9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
@@ -2,11 +2,6 @@
   <PropertyGroup>
     <RootNamespace>Shapes</RootNamespace>
     <AssemblyName>Shapes</AssemblyName>
-    <ProjectGuid>{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}</ProjectGuid>
-    <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
-    <TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
index bcc8ad499d..aa1dd19dd2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
@@ -2,11 +2,6 @@
   <PropertyGroup>
     <RootNamespace>Utf8String</RootNamespace>
     <AssemblyName>Utf8String</AssemblyName>
-    <ProjectGuid>{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}</ProjectGuid>
-    <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
-    <TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
index 239be4d3a2..2da560b6b7 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
@@ -4,35 +4,38 @@
     <AssemblyName>PerformanceTests</AssemblyName>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <Configurations>Debug;Release;</Configurations>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform).$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform).$(AssemblyName)</OutputPath>
     <StartupObject>Microsoft.Data.SqlClient.PerformanceTests.Program</StartupObject>
   </PropertyGroup>
+
+  <!-- Items to remove -->
   <ItemGroup>
     <EmbeddedResource Remove="BenchmarkDotNet.Artifacts\**" />
-    <None Remove="BenchmarkDotNet.Artifacts\**" />
-  </ItemGroup>
-  <ItemGroup>
     <None Remove=".AssemblyAttributes" />
+    <None Remove="BenchmarkDotNet.Artifacts\**" />
   </ItemGroup>
 
-  <!-- Conditional Project References -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(NetCoreSource)src\Microsoft.Data.SqlClient.csproj" />
-  </ItemGroup>
-
-  <!-- Conditional Package References -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient" />
+  <!-- Content files to copy to output directory -->
+  <ItemGroup>
+    <None Include="datatypes.json" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="runnerconfig.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <!-- Unconditional Package References -->
+  <!-- References ====================================================== -->
+  <!-- Test target references -->
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" />
+    <!-- If the tests are compiled/running in "Package" mode, the reference to MDS will be to the -->
+    <!-- nuget package. This enables ensuring the tests run successfully against a fully-packaged -->
+    <!-- version of MDS. Package mode is specified by setting the build parameter ReferenceType   -->
+    <!-- to "Package". If this is not specified, the build will revert to default behavior of     -->
+    <!-- referencing MDS via the project.                                                         -->
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\src\Microsoft.Data.SqlClient.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'"  />
+    <PackageReference Include="Microsoft.Data.SqlClient"
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 
+  <!-- Other references -->
   <ItemGroup>
-    <None Include="datatypes.json" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="runnerconfig.json" CopyToOutputDirectory="PreserveNewest" />
+    <PackageReference Include="BenchmarkDotNet" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index 318b44a28d..3c35a1a205 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -64,10 +64,10 @@
                       IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
                       PrivateAssets="all" />
 
-    <ProjectReference Include="$(TestsPath)Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.Servers\TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS\TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS.Servers\TDS.Servers.csproj" />
   </ItemGroup>
 
   <!-- References for netcore -->
@@ -85,9 +85,9 @@
                       IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
                       PrivateAssets="all" />
 
-    <ProjectReference Include="$(TestsPath)Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.Servers\TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS\TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS.Servers\TDS.Servers.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj
index 6d84a14da8..7d95dfe7c0 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <StartupObject>Microsoft.Data.SqlClient.ExtUtilities.Runner</StartupObject>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" />
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
index 2f802adc75..083cca8a61 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <Target Name="CopyConfig" BeforeTargets="Compile">
     <Copy SourceFiles="config.default.json" DestinationFiles="config.json" Condition="!Exists('config.json')" />
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
index a90ef98be2..2e1a1b5c81 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
@@ -2,11 +2,8 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.SqlServer.TDS.EndPoint</RootNamespace>
     <AssemblyName>Microsoft.SqlServer.TDS.EndPoint</AssemblyName>
-    <ProjectGuid>{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}</ProjectGuid>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FederatedAuthentication\FederatedAuthenticationTicketService.cs" />
@@ -53,12 +50,8 @@
   </ItemGroup>
 
   <!-- References ====================================================== -->
-  <ItemGroup>
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj">
-      <Name>TDS</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Security.Principal.Windows" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS\TDS.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj
index e2df4cc760..57d3dfadd2 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj
@@ -2,17 +2,10 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.SqlServer.TDS.Servers</RootNamespace>
     <AssemblyName>Microsoft.SqlServer.TDS.Servers</AssemblyName>
-    <ProjectGuid>{978063D3-FBB5-4E10-8C45-67C90BE1B931}</ProjectGuid>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj">
-      <Name>TDS.EndPoint</Name>
-    </ProjectReference>
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj">
-      <Name>TDS</Name>
-    </ProjectReference>
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj
index 6b30cbe05c..a4da7c8b92 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj
@@ -2,9 +2,6 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.SqlServer.TDS</RootNamespace>
     <AssemblyName>Microsoft.SqlServer.TDS</AssemblyName>
-    <ProjectGuid>{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}</ProjectGuid>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>  
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/tools/GenAPI/Directory.Build.props b/tools/GenAPI/Directory.Build.props
deleted file mode 100644
index 730ca3a87b..0000000000
--- a/tools/GenAPI/Directory.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" 
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Import parent Directory.build.props -->
-  <Import Project="..\..\src\Directory.Build.props" />
-</Project>
diff --git a/tools/props/Tools.props b/tools/props/Tools.props
deleted file mode 100644
index 5190b46806..0000000000
--- a/tools/props/Tools.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <RestoreSources>
-      $(RestoreSources)
-    </RestoreSources>
-  </PropertyGroup>
-</Project>
diff --git a/tools/targets/CompareMdsRefAssemblies.targets b/tools/targets/CompareMdsRefAssemblies.targets
index 91458d72b4..1e89a26bf3 100644
--- a/tools/targets/CompareMdsRefAssemblies.targets
+++ b/tools/targets/CompareMdsRefAssemblies.targets
@@ -10,8 +10,8 @@
   Usage:
     dotnet build build.proj /t:CompareMdsRefAssemblies /p:BaselinePackageVersion=6.1.4
 
-  BaselinePackageVersion is required. Both the legacy ref projects (netcore/ref,
-  netfx/ref) and the new consolidated ref project (ref/) are built and compared.
+  BaselinePackageVersion is required. The consolidated ref project (ref/) is
+  built and compared against the published package's ref assemblies.
 
   Depends on src/Directory.Build.props for path properties and build configuration.
 -->
@@ -32,44 +32,22 @@
       <BaselinePackageUrl>https://api.nuget.org/v3-flatcontainer/microsoft.data.sqlclient/$(BaselinePackageVersion)/microsoft.data.sqlclient.$(BaselinePackageVersion).nupkg</BaselinePackageUrl>
       <BaselineExtractDir>$([MSBuild]::NormalizePath('$(BaselinePackageDir)', 'extracted', '$(BaselinePackageVersion)'))\</BaselineExtractDir>
 
-      <!-- New consolidated ref project -->
-      <NewRefProjectPath>$([MSBuild]::NormalizePath('$(ManagedSourceCode)', 'ref', 'Microsoft.Data.SqlClient.csproj'))</NewRefProjectPath>
-      <NewRefOutputDir>$([MSBuild]::NormalizePath('$(ManagedSourceCode)', 'ref', 'bin', '$(Configuration)'))\</NewRefOutputDir>
-
-      <!-- Legacy ref output directories (set by legacy csproj OutputPath) -->
-      <LegacyNetFxRefDir>$([MSBuild]::NormalizePath('$(Artifacts)', 'bin', 'Windows_NT', '$(Configuration)', 'Microsoft.Data.SqlClient', 'ref'))\</LegacyNetFxRefDir>
-      <LegacyNetCoreRefDir>$([MSBuild]::NormalizePath('$(Artifacts)', 'bin', 'AnyOS', '$(Configuration)', 'Microsoft.Data.SqlClient', 'ref'))\</LegacyNetCoreRefDir>
-
-      <!-- Legacy ref project paths -->
-      <LegacyNetFxRefProject>$([MSBuild]::NormalizePath('$(NetFxSource)', 'ref', 'Microsoft.Data.SqlClient.csproj'))</LegacyNetFxRefProject>
-      <LegacyNetCoreRefProject>$([MSBuild]::NormalizePath('$(NetCoreSource)', 'ref', 'Microsoft.Data.SqlClient.csproj'))</LegacyNetCoreRefProject>
+      <!-- Consolidated ref project -->
+      <RefProjectPath>$([MSBuild]::NormalizePath('$(RepoRoot)', 'src', 'Microsoft.Data.SqlClient', 'ref', 'Microsoft.Data.SqlClient.csproj'))</RefProjectPath>
+      <RefOutputDir>$([MSBuild]::NormalizePath('$(RepoRoot)', 'artifacts', 'Microsoft.Data.SqlClient.ref', '$(ReferenceType)-$(Configuration)'))\</RefOutputDir>
     </PropertyGroup>
 
-    <!--
-      Each _RefTfm item carries metadata indicating which legacy output dir to
-      use.  net462 comes from the netfx ref project (Windows_NT); the others
-      come from the netcore ref project (AnyOS).
-    -->
     <ItemGroup>
-      <_RefTfm Include="net462">
-        <LegacyRefDir>$(LegacyNetFxRefDir)</LegacyRefDir>
-      </_RefTfm>
-      <_RefTfm Include="net8.0">
-        <LegacyRefDir>$(LegacyNetCoreRefDir)</LegacyRefDir>
-      </_RefTfm>
-      <_RefTfm Include="net9.0">
-        <LegacyRefDir>$(LegacyNetCoreRefDir)</LegacyRefDir>
-      </_RefTfm>
-      <_RefTfm Include="netstandard2.0">
-        <LegacyRefDir>$(LegacyNetCoreRefDir)</LegacyRefDir>
-      </_RefTfm>
+      <_RefTfm Include="net462" />
+      <_RefTfm Include="net8.0" />
+      <_RefTfm Include="net9.0" />
+      <_RefTfm Include="netstandard2.0" />
     </ItemGroup>
 
     <Message Importance="high" Text="Configuration:      $(Configuration)" />
     <Message Importance="high" Text="BaselineExtractDir: $(BaselineExtractDir)" />
-    <Message Importance="high" Text="NewRefOutputDir:    $(NewRefOutputDir)" />
-    <Message Importance="high" Text="LegacyNetFxRefDir:  $(LegacyNetFxRefDir)" />
-    <Message Importance="high" Text="LegacyNetCoreRefDir:$(LegacyNetCoreRefDir)" />
+    <Message Importance="high" Text="RefProjectPath:     $(RefProjectPath)" />
+    <Message Importance="high" Text="RefOutputDir:       $(RefOutputDir)" />
   </Target>
 
   <!-- ================================================================== -->
@@ -120,49 +98,26 @@
   </Target>
 
   <!-- ================================================================== -->
-  <!-- _BuildLegacyRefNetFx                                               -->
-  <!-- ================================================================== -->
-  <Target Name="_BuildLegacyRefNetFx" DependsOnTargets="_SetApiCompatProperties" Condition="'$(IsEnabledWindows)' == 'true'">
-    <Message Importance="high" Text="Building legacy netfx ref project (net462)..." />
-    <MSBuild 
-      Targets="Restore;Build" 
-      Projects="$(LegacyNetFxRefProject)"/>
-  </Target>
-
-  <!-- ================================================================== -->
-  <!-- _BuildLegacyRefNetCore                                             -->
+  <!-- _BuildRefProject                                                   -->
   <!-- ================================================================== -->
-  <Target Name="_BuildLegacyRefNetCore" DependsOnTargets="_SetApiCompatProperties">
-    <Message Importance="high" Text="Building legacy netcore ref project (net8.0, net9.0, netstandard2.0)..." />
-    <!-- Build legacy netcore ref project using AnyOS to align with expected directory LegacyNetCoreRefDir -->
+  <Target Name="_BuildRefProject" DependsOnTargets="_SetApiCompatProperties">
+    <Message Importance="high" Text="Building consolidated ref project (all TFMs)..." />
     <MSBuild 
       Targets="Restore;Build" 
-      Projects="$(LegacyNetCoreRefProject)"
-      Properties="$(ProjectProperties);OSGroup=AnyOS"/>
-  </Target>
-
-  <!-- ================================================================== -->
-  <!-- _BuildNewRefProject                                                -->
-  <!-- ================================================================== -->
-  <Target Name="_BuildNewRefProject" DependsOnTargets="_SetApiCompatProperties">
-    <Message Importance="high" Text="Building new consolidated ref project (all TFMs)..." />
-    <MSBuild 
-      Targets="Restore;Build" 
-      Projects="$(NewRefProjectPath)"/>
+      Projects="$(RefProjectPath)"/>
   </Target>
 
   <!-- ================================================================== -->
   <!-- _RunRefApiCompat                                                   -->
   <!-- ================================================================== -->
   <Target Name="_RunRefApiCompat"
-          DependsOnTargets="_DownloadBaselinePackage;_RestoreTools;_BuildLegacyRefNetFx;_BuildLegacyRefNetCore;_BuildNewRefProject">
+          DependsOnTargets="_DownloadBaselinePackage;_RestoreTools;_BuildRefProject">
 
     <!--
-      For each TFM, compare:
-        1) Legacy ref output vs baseline (from published NuGet package)
-        2) New consolidated ref output vs baseline
-      Using strict mode to flag any difference (additions or removals).
-      ContinueOnError ensures all comparisons run even if some fail.
+      For each TFM, compare the consolidated ref output against the baseline
+      ref assembly from the published NuGet package. Using strict mode flags
+      any difference (additions or removals). ContinueOnError ensures all
+      comparisons run even if some fail.
 
       Output from each comparison is written to a file under
       $(ApiCompatResultsDir) so the user can review results after the run.
@@ -174,27 +129,12 @@
 
     <MakeDir Directories="$(ApiCompatResultsDir)" />
 
-    <!-- ============================================================== -->
-    <!-- Legacy ref vs baseline                                         -->
-    <!-- ============================================================== -->
-    <Message
-      Importance="high"
-      Text="--- Comparing LEGACY %(_RefTfm.Identity) ref vs baseline $(BaselinePackageVersion) ---" />
-
-    <Exec
-      Command="dotnet apicompat -l &quot;$(BaselineExtractDir)ref\%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; -r &quot;%(_RefTfm.LegacyRefDir)%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; --strict-mode &gt; &quot;$(ApiCompatResultsDir)legacy-%(_RefTfm.Identity).txt&quot; 2&gt;&amp;1"
-      WorkingDirectory="$(RepoRoot)"
-      ContinueOnError="ErrorAndContinue" />
-
-    <!-- ============================================================== -->
-    <!-- New consolidated ref vs baseline                               -->
-    <!-- ============================================================== -->
     <Message
       Importance="high"
-      Text="--- Comparing NEW %(_RefTfm.Identity) ref vs baseline $(BaselinePackageVersion) ---" />
+      Text="--- Comparing %(_RefTfm.Identity) ref vs baseline $(BaselinePackageVersion) ---" />
 
     <Exec
-      Command="dotnet apicompat -l &quot;$(BaselineExtractDir)ref\%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; -r &quot;$(NewRefOutputDir)%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; --strict-mode &gt; &quot;$(ApiCompatResultsDir)new-%(_RefTfm.Identity).txt&quot; 2&gt;&amp;1"
+      Command="dotnet apicompat -l &quot;$(BaselineExtractDir)ref\%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; -r &quot;$(RefOutputDir)%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; --strict-mode &gt; &quot;$(ApiCompatResultsDir)%(_RefTfm.Identity).txt&quot; 2&gt;&amp;1"
       WorkingDirectory="$(RepoRoot)"
       ContinueOnError="ErrorAndContinue" />
 
diff --git a/tools/targets/GenerateMdsPackage.targets b/tools/targets/GenerateMdsPackage.targets
deleted file mode 100644
index b4bf4a0d5c..0000000000
--- a/tools/targets/GenerateMdsPackage.targets
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Target Name="GenerateMdsPackage" Condition="'$(GenerateNuget)' == 'true'">
-    <!-- Get the current commit id and store it in CommitId property to be used in nuget pack command -->
-    <Exec Command="git rev-parse HEAD" ConsoleToMSBuild="true">
-      <Output TaskParameter="ConsoleOutput" PropertyName="CommitId" />
-    </Exec>	
-    <Message Text="Commit Id = $(CommitId)" />
-    <Exec Command="powershell.exe -NonInteractive -executionpolicy Unrestricted ^
-      -command &quot;&amp;$(ToolsDir)scripts\downloadLatestNuget.ps1 -nugetDestPath '$(NuGetRoot)'&quot;" />
-    <Exec Command="$(NuGetCmd) pack -Symbols -SymbolPackageFormat snupkg $(ToolsDir)specs\Microsoft.Data.SqlClient.nuspec -Version $(MdsPackageVersion) -OutputDirectory $(PackagesDir) -properties &quot;COMMITID=$(CommitId);Configuration=$(Configuration);ReferenceType=$(ReferenceType);AbstractionsPackageVersion=$(AbstractionsPackageVersion);LoggingPackageVersion=$(LoggingPackageVersion)&quot;" />
-  </Target>
-</Project>
diff --git a/tools/targets/NotSupported.targets b/tools/targets/NotSupported.targets
deleted file mode 100644
index 10900e76be..0000000000
--- a/tools/targets/NotSupported.targets
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
-    <!-- Tell ResolveMatchingContract to run and resolve contract to project reference -->
-    <ResolveMatchingContract>true</ResolveMatchingContract>
-    <NotSupportedSourceFile>$(IntermediateOutputPath)\$(TargetFramework)\$(AssemblyName).notsupported.cs</NotSupportedSourceFile>
-    <CoreCompileDependsOn>$(CoreCompileDependsOn);GenerateNotSupportedSource</CoreCompileDependsOn>
-    <!-- Not supported sources are created from the ref assembly, we currently don't produce finalizers in dummmy assemblies, so we disable ApiCompat to not fail. -->
-    <RunApiCompat>false</RunApiCompat>
-    <GenerateDocumentationFile Condition="'$(OSGroup)' != 'Windows_NT'">false</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);CS0618</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
-    <AssemblyMetadata Include="NotSupported">
-      <Value>True</Value>
-    </AssemblyMetadata>
-  </ItemGroup>
-
-  <!-- GenerateNotSupportedSource
-       Inputs:
-         * A contract assembly
-         * Reference assemblies
-       Generates source for the contract that throws PlatformNotSupportedException
-  -->
-  <Target Name="GenerateNotSupportedSource"
-    AfterTargets="ResolveCodeAnalysisRuleSet"
-    DependsOnTargets="ResolveMatchingContract"
-    Inputs="@(ReferencePath);@(ResolvedMatchingContract)"
-    Outputs="$(NotSupportedSourceFile)">
-    <ItemGroup>
-      <!-- build out a list of directories where dependencies are located -->
-      <_referencePathDirectoriesWithDuplicates Include="@(ReferencePath->'%(RootDir)%(Directory)'->TrimEnd('\'))" />
-      <!-- strip metadata, removing duplicates -->
-      <_referencePathDirectories Include="%(_referencePathDirectoriesWithDuplicates.Identity)" />
-    </ItemGroup>
-
-    <Error Text="No single matching contract found." Condition="'@(ResolvedMatchingContract->Count())' != '1'" />
-
-    <PropertyGroup>
-      <GenApiPath>$(RepoRoot)tools/GenAPI/Microsoft.DotNet.GenAPI/bin/$(Configuration)/net10.0/</GenApiPath>
-      <GenApiCommand>
-        "$(DotnetPath)dotnet" $(GenApiPath)Microsoft.DotNet.GenAPI.dll
-          "%(ResolvedMatchingContract.Identity)"
-          -l:"@(_referencePathDirectories)"
-          -o:"$(NotSupportedSourceFile)"
-      </GenApiCommand>
-      <GenApiCommand Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
-        $(GenApiCommand)
-        -t:"$(GeneratePlatformNotSupportedAssemblyMessage)"
-      </GenApiCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <GenApiCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GenApiCommand), "\s+", " "))</GenApiCommand>
-    </PropertyGroup>
-
-    <Message Text=">>> Building MDS 'not supported' binaries via command: $(GenApiCommand)"/>
-    <Exec Command="$(GenApiCommand)" WorkingDirectory="$(ToolRuntimePath)"/>
-
-    <ItemGroup>
-      <FileWrites Include="$(NotSupportedSourceFile)" />
-      <Compile Include="$(NotSupportedSourceFile)" />
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/tools/targets/ResolveContract.targets b/tools/targets/ResolveContract.targets
deleted file mode 100644
index 98d3582716..0000000000
--- a/tools/targets/ResolveContract.targets
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <PropertyGroup Condition="'$(IsSourceProject)' == 'true'">
-    <ContractProject Condition="'$(ContractProject)' == ''">$(NetCoreSource)ref/$(MSBuildProjectName).csproj</ContractProject>
-    <HasMatchingContract Condition="'$(HasMatchingContract)' == '' and Exists('$(ContractProject)')">true</HasMatchingContract>
-    <ContractAssemblyPath Condition="'$(ContractAssemblyPath)' == ''">$(ContractOutputPath)/$(MSBuildProjectName).dll</ContractAssemblyPath>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(HasMatchingContract)' == 'true'">
-    <ResolvedMatchingContract Condition="Exists('$(ContractAssemblyPath)')" Include="$(ContractAssemblyPath)" />
-    <!-- If the contract doesn't exist in the default contract output path add a project reference to the contract project to resolve -->
-    <ProjectReference Condition="'@(ResolvedMatchingContract)' == ''" Include="$(ContractProject)">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>ResolvedMatchingContract</OutputItemType>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- intentionally empty since we no longer need a target -->
-  <Target Name="ResolveMatchingContract" />
-
-  <Target Name="VerifyMatchingContract" AfterTargets="ResolveReferences">
-    <Message Text="IsSourceProject = $(IsSourceProject)" />
-    <Message Text="HasMatchingContract = $(HasMatchingContract)" />
-    <Message Text="ContractAssemblyPath = $(ContractAssemblyPath)" />
-    <Message Text="ResolvedMatchingContract.Identity = %(ResolvedMatchingContract.Identity)" />
-
-    <Error Condition="'$(HasMatchingContract)' == 'true' and !Exists('%(ResolvedMatchingContract.Identity)')" Text="ResolveMatchingContract could not find a matching contract '%(ResolvedMatchingContract.Identity)' not found." />
-  </Target>
-</Project>
diff --git a/tools/targets/TrimDocsForIntelliSense.targets b/tools/targets/TrimDocsForIntelliSense.targets
deleted file mode 100644
index 05feb26739..0000000000
--- a/tools/targets/TrimDocsForIntelliSense.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. 
-The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-  <!-- This target runs after Build, and trims XML documentation generated in the $(OutputPath) of the project where this target is included.-->
-  <Target Name="TrimDocsForIntelliSense" AfterTargets="Build" Condition="'$(GenerateDocumentationFile)' == 'true'">
-    <Exec Command="powershell.exe -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;$(ToolsDir)intellisense\TrimDocs.ps1 -inputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos; -outputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos;&quot;" Condition=" '$(OS)' == 'Windows_NT' " />
-    <Exec Command="pwsh -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;$(ToolsDir)intellisense\TrimDocs.ps1 -inputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos; -outputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos;&quot;" Condition=" '$(OS)' != 'Windows_NT' " />
-  </Target>
-</Project>

From 2b9665354be423d9d10997ff313bbc2c050f159e Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Mon, 13 Apr 2026 12:54:55 +0100
Subject: [PATCH 038/298] Fix | Enable SqlBulkCopy to target tables in Azure
 Synapse Analytics dedicated SQL pools (#4176)

---
 .../Microsoft/Data/SqlClient/SqlBulkCopy.cs   | 31 +++++++++++++++++--
 .../SQL/SqlBulkCopyTest/CopyAllFromReader.cs  |  4 +--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
index cc90802f08..fdda86b98e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -501,20 +501,47 @@ private string CreateInitialQuery()
             // interpolated directly into the SQL string because SQL Server does not allow
             // identifiers (database/schema/table names) to be passed as parameters.  Both
             // values are escaped via SqlServerEscapeHelper before interpolation.
+            //
+            // SqlBulkCopy must remain compatible with Azure Synapse Analytics dedicated SQL pools
+            // and with SQL Server 2016. Azure Synapse Analytics does not allow variables assigned
+            // in the SELECT statement to appear in an expression, which prevents the consistent use of
+            //   SELECT @Column_Names = COALESCE(@Column_Names + ', ', '') + QUOTENAME([name])
+            // The alternative is to use STRING_AGG, but this was only introduced in SQL Server
+            // 2017. To meet both criteria, we review the EngineEdition server property. A value
+            // of 6 indicates that the bulk copy is going to run against Azure Synapse Analytics;
+            // we use STRING_AGG in that case and the COALESCE method otherwise.
+            //
+            // See: https://learn.microsoft.com/en-us/sql/t-sql/functions/serverproperty-transact-sql
             return $"""
 SELECT @@TRANCOUNT;
 
 DECLARE @Object_ID INT = OBJECT_ID('{escapedObjectName}');
+DECLARE @Column_Name_Query_SELECT NVARCHAR(MAX);
+DECLARE @Column_Name_Query_FILTER NVARCHAR(MAX);
+DECLARE @Column_Name_Query_SORT NVARCHAR(MAX);
 DECLARE @Column_Name_Query NVARCHAR(MAX);
 DECLARE @Column_Names NVARCHAR(MAX) = NULL;
+
+IF CAST(SERVERPROPERTY('EngineEdition') AS INT) = 6
+BEGIN
+    SET @Column_Name_Query_SELECT = N'SELECT @Column_Names = STRING_AGG(CAST(QUOTENAME([name]) AS NVARCHAR(MAX)), '', '') WITHIN GROUP (ORDER BY [column_id] ASC)';
+    SET @Column_Name_Query_SORT = N'';
+END
+ELSE
+BEGIN
+    SET @Column_Name_Query_SELECT = 'SELECT @Column_Names = COALESCE(@Column_Names + '', '', '''') + QUOTENAME([name])';
+    SET @Column_Name_Query_SORT = N'ORDER BY [column_id] ASC';
+END
+
 IF EXISTS (SELECT TOP 1 * FROM sys.all_columns WHERE [object_id] = OBJECT_ID('sys.all_columns') AND [name] = 'graph_type')
 BEGIN
-    SET @Column_Name_Query = N'SELECT @Column_Names = COALESCE(@Column_Names + '', '', '''') + QUOTENAME([name]) FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) NOT IN (1, 3, 4, 6, 7) ORDER BY [column_id] ASC;';
+    SET @Column_Name_Query_FILTER = N'WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) NOT IN (1, 3, 4, 6, 7)';
 END
 ELSE
 BEGIN
-    SET @Column_Name_Query = N'SELECT @Column_Names = COALESCE(@Column_Names + '', '', '''') + QUOTENAME([name]) FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID ORDER BY [column_id] ASC;';
+    SET @Column_Name_Query_FILTER = N'WHERE [object_id] = @Object_ID';
 END
+SET @Column_Name_Query = @Column_Name_Query_SELECT + ' FROM {CatalogName}.[sys].[all_columns] ' + @Column_Name_Query_FILTER + ' ' + @Column_Name_Query_SORT + ';'
 
 EXEC sp_executesql @Column_Name_Query, N'@Object_ID INT, @Column_Names NVARCHAR(MAX) OUTPUT', @Object_ID = @Object_ID, @Column_Names = @Column_Names OUTPUT;
 SELECT @Column_Names = COALESCE(@Column_Names, '*');
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
index f55e512a35..a0ccf69301 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
@@ -61,9 +61,9 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersReceived"], "Unexpected BuffersReceived value.");
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersSent"], "Unexpected BuffersSent value.");
                             DataTestUtility.AssertEqualsWithDescription((long)0, stats["IduCount"], "Unexpected IduCount value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)8, stats["SelectCount"], "Unexpected SelectCount value.");
+                            DataTestUtility.AssertEqualsWithDescription((long)11, stats["SelectCount"], "Unexpected SelectCount value.");
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["ServerRoundtrips"], "Unexpected ServerRoundtrips value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)11, stats["SelectRows"], "Unexpected SelectRows value.");
+                            DataTestUtility.AssertEqualsWithDescription((long)14, stats["SelectRows"], "Unexpected SelectRows value.");
                             DataTestUtility.AssertEqualsWithDescription((long)2, stats["SumResultSets"], "Unexpected SumResultSets value.");
                             DataTestUtility.AssertEqualsWithDescription((long)0, stats["Transactions"], "Unexpected Transactions value.");
                         }

From 5b3587d7d459aed1a088c2019f415ec5b945d510 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 13 Apr 2026 08:56:38 -0300
Subject: [PATCH 039/298] Quarantine flaky tests (#4170)

---
 .../tests/FunctionalTests/LocalizationTest.cs                | 1 +
 .../tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs      | 1 +
 .../ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs | 1 +
 .../tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs   | 1 +
 .../tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs   | 1 +
 .../tests/ManualTests/TracingTests/MetricsTest.cs            | 1 +
 .../SimulatedServerTests/ConnectionFailoverTests.cs          | 5 +++++
 .../UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs | 1 +
 8 files changed, 12 insertions(+)

diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs
index d78d801fde..250c009b27 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs
@@ -40,6 +40,7 @@ public class LocalizationTest
         [InlineData("ru-RU")]
         [InlineData("zh-Hans")]
         [InlineData("zh-Hant")]
+        [Trait("Category", "flaky")]
         public void Localization_Tests(string culture)
         {
             string localized = GetLocalizedErrorMessage(culture);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs
index 834157aeec..bc514dce92 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs
@@ -28,6 +28,7 @@ public enum AsyncAPI
         // Synapse: WAITFOR DELAY not supported [Parse error at line: 1, column: 1: Incorrect syntax near 'WAITFOR'.]
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [ClassData(typeof(AsyncTimeoutTestVariations))]
+        [Trait("Category", "flaky")]
         public static void TestDelayedAsyncTimeout(AsyncAPI api, string commonObj, int delayPeriod, bool marsEnabled) =>
             RunTest(api, commonObj, delayPeriod, marsEnabled);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
index 478f78a5b9..10c3939774 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
@@ -36,6 +36,7 @@ public static class ConnectionPoolTest
         /// </summary>
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         [ClassData(typeof(ConnectionPoolConnectionStringProvider))]
+        [Trait("Category", "flaky")]
         public static void BasicConnectionPoolingTest(string connectionString)
         {
             SqlConnection.ClearAllPools();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
index 5cf8b1e4b4..b21626aaad 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
@@ -944,6 +944,7 @@ public _Row(int id, Guid documentIdentificationId, string name, string value)
             }
         }
 
+        [Trait("Category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         public static async Task CanReadAwkwardDataLengths()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
index 2de13c98ac..118f709d89 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
@@ -180,6 +180,7 @@ public static void GetXmlReader_ReturnsXmlReaderCorrectly(string connectionStrin
 
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         [MemberData(nameof(ConnectionStrings))]
+        [Trait("Category", "flaky")]
         public static void ReadStream_ReadsStreamDataCorrectly(string connectionString)
         {
             ReadStream(connectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
index fbcb27bb8c..af10a5824e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
@@ -278,6 +278,7 @@ public void ReclaimedConnectionsCounter_Functional()
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [Trait("Category", "flaky")]
         public void ConnectionPoolGroupsCounter_Functional()
         {
             SqlConnection.ClearAllPools();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index 7c8e67a09a..d3a0bcd07b 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -15,6 +15,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
     public class ConnectionFailoverTests
     {
         //TODO parameterize for transient errors
+        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -74,6 +75,7 @@ public void TransientFault_NoFailover_DoesNotClearPool(uint errorCode)
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
+        [Trait("Category", "flaky")]
         [Fact]
         public void NetworkError_TriggersFailover_ClearsPool()
         {
@@ -239,6 +241,7 @@ public void NetworkDelay_ShouldConnectToPrimary()
         }
 
         [Fact]
+        [Trait("Category", "flaky")]
         public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFailoverPartner()
         {
             using TdsServer failoverServer = new(
@@ -286,6 +289,7 @@ public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFa
         }
 
         [Fact]
+        [Trait("Category", "flaky")]
         public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFailoverPartner()
         {
             using TdsServer failoverServer = new(
@@ -430,6 +434,7 @@ public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
         [InlineData(40613)]
         [InlineData(42108)]
         [InlineData(42109)]
+        [Trait("Category", "flaky")]
         public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint errorCode)
         {
             // Arrange
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
index b763f2b55c..0eff08139f 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
@@ -156,6 +156,7 @@ public void NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed(bool multiS
         }
 
         [Fact]
+        [Trait("Category", "flaky")]
         public void NetworkTimeoutAtRoutedLocation_RetryDisabled_ShouldFail()
         {
             // Arrange

From 8ddc464d867ef09abf4d926efe7294229be1d50f Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 13 Apr 2026 11:42:24 -0300
Subject: [PATCH 040/298] Add SQL Server readiness checks to Windows pipeline
 setup (#4172)

---
 .../steps/configure-sql-server-win-step.yml   | 49 +++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
index 749c30a79a..50925d00d5 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
@@ -162,10 +162,28 @@ steps:
         #Change the access level for FileStream for SQLServer
         Set-ExecutionPolicy Unrestricted
         Import-Module "sqlps"
-        Invoke-Sqlcmd -ServerInstance "$machineName" @"
-            EXEC sp_configure filestream_access_level, 2;
-            RECONFIGURE;
+
+        # Retry loop: SQL Server may be temporarily unavailable after enabling FileStream via WMI.
+        # Worst-case budget: 10 attempts x (5s connection timeout + 5s sleep) = ~100s
+        $tries = 0
+        while ($true) {
+            $tries++
+            try {
+                Invoke-Sqlcmd -ServerInstance "$machineName" -ConnectionTimeout 5 @"
+                    EXEC sp_configure filestream_access_level, 2;
+                    RECONFIGURE;
         "@
+                Write-Host "FileStream access level configured successfully."
+                break
+            } catch {
+                if ($tries -ge 10) {
+                    Write-Host "##[error]Failed to configure FileStream access level after $tries tries."
+                    throw
+                }
+                Write-Host "Failed to connect to SQL Server (attempt $tries/10). Retrying in 5 seconds..."
+                Start-Sleep -Seconds 5
+            }
+        }
       displayName: 'Enable FileStream [Win]'
       env:
         SQL_USER: ${{parameters.user }}
@@ -250,6 +268,31 @@ steps:
       Restart-Service -Name "$serviceName" -Force
       Restart-Service -Name MSSQLSERVER* -Force
 
+      # Wait for SQL Server to be ready to accept connections after restart.
+      # Worst-case budget: 20 attempts x (5s connection timeout + 3s sleep) = ~160s
+      $machineName = $env:COMPUTERNAME
+      if ("${{parameters.instanceName }}" -ne "MSSQLSERVER") {
+          $machineName += "\${{parameters.instanceName }}"
+      }
+
+      Import-Module "sqlps"
+      $tries = 0
+      while ($true) {
+          $tries++
+          try {
+              Invoke-Sqlcmd -ServerInstance "$machineName" -Query "SELECT @@VERSION" -ConnectionTimeout 5
+              Write-Host "SQL Server is ready after restart (attempt $tries)."
+              break
+          } catch {
+              if ($tries -ge 20) {
+                  Write-Host "##[error]SQL Server did not become ready after $tries attempts."
+                  throw
+              }
+              Write-Host "Waiting for SQL Server to start (attempt $tries/20)..."
+              Start-Sleep -Seconds 3
+          }
+      }
+
     displayName: 'Restart SQL Server [Win]'
 
   - powershell: |

From 32610dafdfb22bc82df504e51abeb14b3f4cb3e0 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 13 Apr 2026 11:43:07 -0300
Subject: [PATCH 041/298] Use Rosetta 2 and improve robustness for macOS SQL
 Server CI setup (#4173)

---
 .../steps/configure-sql-server-macos-step.yml | 64 +++++++++++++------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
index c1b788717d..a989bf19bf 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
@@ -29,36 +29,42 @@ steps:
       export PS4='+ [$(date "+%Y-%m-%d %H:%M:%S")] '
       set -x
 
-      # Install Docker and SQLCMD tools.
+      # Install Docker CLI (not Desktop — Colima provides the daemon) and SQLCMD tools.
       brew install colima
-      brew install --cask docker
+      brew install docker
       brew tap microsoft/mssql-release https://github.com/Microsoft/homebrew-mssql-release
       brew update
       HOMEBREW_ACCEPT_EULA=Y brew install mssql-tools18
-      colima start --arch x86_64
+
+      # Start Colima with Virtualization.framework for x86_64 binary translation
+      # on Apple Silicon.  Rosetta/binfmt emulation is enabled by default in
+      # Colima >= 0.8 when using --vm-type vz, which is dramatically faster than
+      # --arch x86_64 (full QEMU VM emulation).
+      # Requires macOS >= 13 (Ventura).
+      colima start --vm-type vz --cpu 4 --memory 4
       docker --version
-      docker pull mcr.microsoft.com/mssql/server:2025-latest
+      docker pull --platform linux/amd64 mcr.microsoft.com/mssql/server:2025-latest
 
       # Password for the SA user (required)
       MSSQL_SA_PW="${{ parameters.saPassword }}"
 
-      docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$MSSQL_SA_PW" -p 1433:1433 -p 1434:1434 --name sql1 --hostname sql1 -d mcr.microsoft.com/mssql/server:2025-latest
+      docker run --platform linux/amd64 -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$MSSQL_SA_PW" -p 1433:1433 -p 1434:1434 --name sql1 --hostname sql1 -d mcr.microsoft.com/mssql/server:2025-latest
 
-      sleep 5
+      sleep 10
 
       docker ps -a
 
       # Connect to the SQL Server container and get its version.
       #
-      # It can take a while for the docker container to start listening and be
-      # ready for connections, so we will wait for up to 2 minutes, checking every
-      # 3 seconds.
+      # With Rosetta 2 emulation, SQL Server starts much faster than under full
+      # QEMU emulation, but it can still take a minute or two.  We allow up to
+      # 6 minutes (72 attempts × 5 seconds) as a generous upper bound.
 
-      # Wait 3 seconds between attempts.
-      delay=3
+      # Wait 5 seconds between attempts.
+      delay=5
 
-      # Try up to 40 times (2 minutes) to connect.
-      maxAttempts=40
+      # Try up to 72 times (~6 minutes) to connect.
+      maxAttempts=72
 
       # Attempt counter.
       attempt=1
@@ -71,7 +77,8 @@ steps:
 
         echo "Waiting for SQL Server to start (attempt #$attempt of $maxAttempts)..."
 
-        sqlcmd -S 127.0.0.1 -No -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" >> $SQLCMD_ERRORS 2>&1
+        # -C trusts the self-signed certificate inside the container.
+        sqlcmd -S 127.0.0.1 -No -C -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" >> $SQLCMD_ERRORS 2>&1
 
         # If the command was successful, then the SQL Server is ready.
         if [ $? -eq 0 ]; then
@@ -79,6 +86,16 @@ steps:
           break
         fi
 
+        # Verify the container is still running; no point retrying if it crashed.
+        if ! docker ps --filter "name=^/sql1$" --filter "status=running" --format '{{.Names}}' | grep -Fxq 'sql1'; then
+          echo "ERROR: sql1 container is no longer running."
+          docker ps -a --filter "name=^/sql1$"
+          echo "--- Container logs ---"
+          docker logs sql1 2>&1 | tail -50
+          rm -f $SQLCMD_ERRORS
+          exit 1
+        fi
+
         # Increment the attempt counter.
         ((attempt++))
 
@@ -91,8 +108,13 @@ steps:
       if [ $ready -eq 0 ]
       then
         # No, so report the error(s) and exit.
-        echo Cannot connect to SQL Server; installation aborted; errors were:
+        echo "Cannot connect to SQL Server after $maxAttempts attempts; installation aborted."
+        echo "--- sqlcmd errors ---"
         cat $SQLCMD_ERRORS
+        echo "--- Container status ---"
+        docker ps -a --filter "name=^/sql1$"
+        echo "--- Container logs (last 80 lines) ---"
+        docker logs sql1 2>&1 | tail -80
         rm -f $SQLCMD_ERRORS
         exit 1
       fi
@@ -101,18 +123,18 @@ steps:
 
       echo "Use sqlcmd to show which IP addresses are being listened on..."
       echo 0.0.0.0
-      sqlcmd -S 0.0.0.0 -No -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" -l 2
+      sqlcmd -S 0.0.0.0 -No -C -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" -l 2
       echo 127.0.0.1
-      sqlcmd -S 127.0.0.1 -No -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" -l 2
+      sqlcmd -S 127.0.0.1 -No -C -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" -l 2
       echo ::1
-      sqlcmd -S ::1 -No -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" -l 2
+      sqlcmd -S ::1 -No -C -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" -l 2
       echo localhost
-      sqlcmd -S localhost -No -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" -l 2
+      sqlcmd -S localhost -No -C -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" -l 2
       echo "(sqlcmd default / not specified)"
-      sqlcmd -No -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" -l 2
+      sqlcmd -No -C -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" -l 2
 
       echo "Configuring Dedicated Administer Connections to allow remote connections..."
-      sqlcmd -S 127.0.0.1 -No -U sa -P "$MSSQL_SA_PW" -Q "sp_configure 'remote admin connections', 1; RECONFIGURE;"
+      sqlcmd -S 127.0.0.1 -No -C -U sa -P "$MSSQL_SA_PW" -Q "sp_configure 'remote admin connections', 1; RECONFIGURE;"
       if [ $? = 1 ]
       then
         echo "Error configuring DAC for remote access."

From f5c41ee33478f60cdab1d385b10d8f7ebc58122d Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 13 Apr 2026 11:43:43 -0300
Subject: [PATCH 042/298] Add retry and verification to ARM64 dotnet-install
 script (#4178)

---
 eng/pipelines/steps/install-dotnet-arm64.ps1 | 140 +++++++++++++++++--
 1 file changed, 129 insertions(+), 11 deletions(-)

diff --git a/eng/pipelines/steps/install-dotnet-arm64.ps1 b/eng/pipelines/steps/install-dotnet-arm64.ps1
index b8057a703a..95d580543b 100644
--- a/eng/pipelines/steps/install-dotnet-arm64.ps1
+++ b/eng/pipelines/steps/install-dotnet-arm64.ps1
@@ -4,15 +4,15 @@
 
 .DESCRIPTION
   Special handling is required for ARM64 due to a bug in UseDotNet@2:
- 
+
   [BUG]: UseDotNet@2 task installs x86 build
   https://github.com/microsoft/azure-pipelines-tasks/issues/20300
- 
+
   The downloaded dotnet-install.ps1 script is kept in the $InstallDir to avoid
   downloading it multiple times during the pipeline job.
- 
+
   The following environment variables are set for subsequent steps in the pipeline:
- 
+
     DOTNET_ROOT: Set to $InstallDir.
     PATH: $DOTNET_ROOT is prepended to the PATH environment variable.
 
@@ -58,6 +58,72 @@ param
 # Stop on all errors.
 $ErrorActionPreference = 'Stop'
 
+# Maximum number of retry attempts for transient install failures (e.g.
+# corrupt downloads, network timeouts).
+$maxAttempts = 3
+$retryDelaySec = 10
+
+#------------------------------------------------------------------------------
+# Invoke dotnet-install.ps1 with retry logic.  On each attempt the script is
+# called with the supplied $Params.  If a non-zero exit code is returned, or
+# if the optional $Verify script-block throws, the attempt is considered failed
+# and will be retried after a short delay.
+
+function Invoke-DotNetInstall
+{
+  param
+  (
+    [Parameter(Mandatory)]
+    [string]$Description,
+
+    [Parameter(Mandatory)]
+    [hashtable]$Params,
+
+    [scriptblock]$Verify = $null
+  )
+
+  for ($attempt = 1; $attempt -le $maxAttempts; $attempt++)
+  {
+    try
+    {
+      Write-Host "$Description (attempt $attempt of $maxAttempts)"
+
+      $global:LASTEXITCODE = 0
+      & "$InstallDir/dotnet-install.ps1" -Verbose:$Debug -DryRun:$DryRun @Params
+      $installSucceeded = $?
+
+      if (-not $installSucceeded)
+      {
+        throw "dotnet-install.ps1 failed."
+      }
+
+      if ($global:LASTEXITCODE -ne 0)
+      {
+        throw "dotnet-install.ps1 failed with exit code $global:LASTEXITCODE"
+      }
+
+      if ($Verify)
+      {
+        & $Verify
+      }
+
+      return
+    }
+    catch
+    {
+      Write-Warning "Attempt $attempt failed: $_"
+
+      if ($attempt -ge $maxAttempts)
+      {
+        throw "$Description failed after $maxAttempts attempts. Last error: $_"
+      }
+
+      Write-Host "Retrying in $retryDelaySec seconds..."
+      Start-Sleep -Seconds $retryDelaySec
+    }
+  }
+}
+
 #------------------------------------------------------------------------------
 # Emit our command-line arguments.
 
@@ -80,7 +146,7 @@ if (-not (Test-Path -Path "$InstallDir/dotnet-install.ps1" -PathType Leaf))
   }
 
   Write-Host "Downloading dotnet-install.ps1..."
-  
+
   $params =
   @{
     Uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"
@@ -113,8 +179,6 @@ if ($Debug)
 #------------------------------------------------------------------------------
 # Install the SDK.
 
-Write-Host "Installing .NET SDK version: $sdkVersion"
-
 $installParams =
 @{
   Architecture = "arm64"
@@ -128,15 +192,40 @@ if ($Debug)
   Write-Host ($installParams | ConvertTo-Json -Depth 1)
 }
 
-& "$InstallDir/dotnet-install.ps1" -Verbose:$Debug -DryRun:$DryRun @installParams
+# Verify the SDK was actually installed.  dotnet-install.ps1 can silently fail
+# with exit code 0 when the package download is corrupt or the size cannot be
+# measured.
+$verifySdk =
+  if (-not $DryRun)
+  {
+    {
+      $dotnetExe = Join-Path $InstallDir "dotnet"
+      $installedSdks = & $dotnetExe --list-sdks 2>&1
+      $installedSdksText = [string]::Join("`n", @($installedSdks))
+
+      Write-Host "Installed SDKs:`n$installedSdksText"
+
+      $sdkPattern = "(?m)^$([regex]::Escape($sdkVersion))\s+\["
+
+      if (-not [regex]::IsMatch($installedSdksText, $sdkPattern))
+      {
+        throw "SDK $sdkVersion is not present after installation."
+      }
+
+      Write-Host "Verified SDK $sdkVersion is installed."
+    }
+  }
+
+Invoke-DotNetInstall `
+  -Description "Installing .NET SDK version: $sdkVersion" `
+  -Params $installParams `
+  -Verify $verifySdk
 
 #------------------------------------------------------------------------------
 # Install the Runtimes, if any.
 
 foreach ($channel in $Runtimes)
 {
-  Write-Host "Installing .NET Runtime GA channel: $channel"
-
   $installParams =
   @{
     Architecture = "arm64"
@@ -152,7 +241,36 @@ foreach ($channel in $Runtimes)
     Write-Host ($installParams | ConvertTo-Json -Depth 1)
   }
 
-  & "$InstallDir/dotnet-install.ps1" -Verbose:$Debug -DryRun:$DryRun @installParams
+  # Verify the runtime was actually installed.  Use the same guard against
+  # silent corruption that we use for the SDK.
+  $verifyRuntime =
+    if (-not $DryRun)
+    {
+      # Capture $channel in a local variable so the script-block closure
+      # binds to the current iteration value.
+      $ch = $channel
+      {
+        $dotnetExe = Join-Path $InstallDir "dotnet"
+        $installedRuntimes = & $dotnetExe --list-runtimes 2>&1
+        $installedRuntimesText = [string]::Join("`n", @($installedRuntimes))
+
+        Write-Host "Installed runtimes:`n$installedRuntimesText"
+
+        $runtimePattern = "Microsoft\.NETCore\.App $([regex]::Escape($ch))\."
+
+        if (-not [regex]::IsMatch($installedRuntimesText, $runtimePattern))
+        {
+          throw "Runtime $ch is not present after installation."
+        }
+
+        Write-Host "Verified runtime $ch is installed."
+      }
+    }
+
+  Invoke-DotNetInstall `
+    -Description "Installing .NET Runtime GA channel: $channel" `
+    -Params $installParams `
+    -Verify $verifyRuntime
 }
 
 #------------------------------------------------------------------------------

From b1b93a8947df8d0d9eadf79f7dcf5a22fc533492 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Thu, 16 Apr 2026 19:41:35 +0100
Subject: [PATCH 043/298] Cleanup | Preparation for OS-independent builds
 (#3844)

* Implement early infrastructure for OS-independent builds.
Also clean up the netfx-only s_isWindowsNT variable - this was originally used to distinguish between Windows 9x and Windows NT!

* SqlFileStream

We only throw a PlatformNotSupportedException in the constructor; if this throws, there's no way execution can reach a property or method.

* SqlColumnEncryptionCngProvider

* SqlColumnEncryptionCspProvider

* Manually inline ThrowOnNonWindowsPlatform

This is necessary because when an application using SqlClient is being published, the IL trimmer doesn't see that the throw helper throws an exception, and thus doesn't eliminate the code paths which call Windows-specific APIs. As a result, the Windows-specific API paths aren't removed from executables published for a Linux platform.

* Correct preprocessor directive indentation
---
 .../src/Interop/Windows/Kernel32/FileTypes.cs |  4 -
 .../Windows/Kernel32/IoControlCodeAccess.cs   |  4 -
 .../Windows/Kernel32/IoControlTransferType.cs |  4 -
 .../src/Interop/Windows/Kernel32/Kernel32.cs  | 16 +---
 .../Windows/NtDll/CreateDisposition.cs        |  4 -
 .../Interop/Windows/NtDll/CreateOptions.cs    |  4 -
 .../Interop/Windows/NtDll/DesiredAccess.cs    |  4 -
 .../Windows/NtDll/FileFullEaInformation.cs    |  4 -
 .../Windows/NtDll/ImpersonationLevel.cs       |  4 -
 .../Interop/Windows/NtDll/IoStatusBlock.cs    |  4 -
 .../src/Interop/Windows/NtDll/NtDll.cs        |  4 -
 .../Windows/NtDll/ObjectAttributeFlags.cs     |  4 -
 .../Interop/Windows/NtDll/ObjectAttributes.cs |  4 -
 .../Windows/NtDll/SecurityQualityOfService.cs |  4 -
 .../src/Interop/Windows/SystemErrors.cs       |  4 -
 .../src/Interop/Windows/UnicodeString.cs      |  4 -
 .../src/Microsoft/Data/Common/AdapterUtil.cs  | 39 +++++---
 .../Data/Common/AdapterUtil.netfx.cs          |  4 -
 .../ConnectionPool/DbConnectionPoolGroup.cs   |  7 --
 ...s.cs => SqlColumnEncryptionCngProvider.cs} | 23 +++--
 ...olumnEncryptionCngProvider.netcore.unix.cs | 56 -----------
 ...s.cs => SqlColumnEncryptionCspProvider.cs} | 23 +++--
 ...olumnEncryptionCspProvider.netcore.unix.cs | 56 -----------
 ...FileStream.windows.cs => SqlFileStream.cs} |  9 +-
 .../SqlTypes/SqlFileStream.netcore.unix.cs    | 92 -------------------
 25 files changed, 68 insertions(+), 317 deletions(-)
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/{SqlColumnEncryptionCngProvider.windows.cs => SqlColumnEncryptionCngProvider.cs} (94%)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.netcore.unix.cs
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/{SqlColumnEncryptionCspProvider.windows.cs => SqlColumnEncryptionCspProvider.cs} (95%)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.netcore.unix.cs
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/{SqlFileStream.windows.cs => SqlFileStream.cs} (99%)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.netcore.unix.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/FileTypes.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/FileTypes.cs
index 8dbbd6fbde..59b1c67dcf 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/FileTypes.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/FileTypes.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.Kernel32
 {
     internal class FileTypes
@@ -14,5 +12,3 @@ internal class FileTypes
         internal const int FILE_TYPE_PIPE = 0x0003;
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlCodeAccess.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlCodeAccess.cs
index 3a32378bba..2e20b2aa57 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlCodeAccess.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlCodeAccess.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 
 namespace Interop.Windows.Kernel32
@@ -33,5 +31,3 @@ internal enum IoControlCodeAccess
         FILE_WRITE_DATA = 0x02
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlTransferType.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlTransferType.cs
index 2573aa8bc0..9feea884ce 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlTransferType.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlTransferType.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.Kernel32
 {
     /// <summary>
@@ -37,5 +35,3 @@ internal enum IoControlTransferType
         METHOD_NEITHER
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32.cs
index a5b854f565..020726b104 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32.cs
@@ -2,15 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
 using Microsoft.Data.Common;
 using Microsoft.Win32.SafeHandles;
 
-#if !NETFRAMEWORK
+#if !NETFRAMEWORK && _WINDOWS
 using Interop.Windows.Handles;
 #endif
 
@@ -21,7 +19,7 @@ internal static class Kernel32
         internal const ushort FILE_DEVICE_FILE_SYSTEM = 0x0009;
         internal const uint SEM_FAILCRITICALERRORS = 1;
 
-        #if !NETFRAMEWORK
+        #if _WINDOWS && !NETFRAMEWORK
         internal const int LOAD_LIBRARY_AS_DATAFILE = 0x00000002;
         internal const int LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800;
         #endif
@@ -56,7 +54,7 @@ internal static extern bool DeviceIoControl(
             out uint cbBytesReturned,
             IntPtr overlapped);
 
-        #if NET
+        #if NET && _WINDOWS
         [DllImport(DllName, ExactSpelling = true, SetLastError = true)]
         public static extern bool FreeLibrary([In] IntPtr hModule);
         #endif
@@ -73,17 +71,13 @@ internal static extern int GetFullPathName(
             IntPtr lpFilePartOrNull);
         #endif
 
-        #if NET
+        #if NET && _WINDOWS
         [DllImport(DllName, CharSet = CharSet.Ansi, BestFitMapping = false)]
         public static extern IntPtr GetProcAddress(IntPtr hModule, string lpProcName);
-        #endif
 
-        #if NET
         [DllImport(DllName, CharSet = CharSet.Ansi, BestFitMapping = false)]
         public static extern IntPtr GetProcAddress(SafeLibraryHandle hModule, string lpProcName);
-        #endif
 
-        #if NET
         [DllImport(DllName, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)]
         public static extern SafeLibraryHandle LoadLibraryExW([In] string lpwLibFileName, [In] IntPtr hFile, [In] uint dwFlags);
         #endif
@@ -92,5 +86,3 @@ internal static extern int GetFullPathName(
         internal static extern bool SetThreadErrorMode(uint dwNewMode, out uint lpOldMode);
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateDisposition.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateDisposition.cs
index 7502a94e64..8f03025bee 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateDisposition.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateDisposition.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.NtDll
 {
     /// <summary>
@@ -56,5 +54,3 @@ internal enum CreateDisposition : uint
         FILE_OVERWRITE_IF = 5
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateOptions.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateOptions.cs
index 5c169ec5a0..39677ab3d5 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateOptions.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateOptions.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 
 namespace Interop.Windows.NtDll
@@ -198,5 +196,3 @@ internal enum CreateOptions : uint
         // FILE_OPEN_FOR_FREE_SPACE_QUERY = 0x00800000
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/DesiredAccess.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/DesiredAccess.cs
index acf7f9ee0f..f15fbcf0dc 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/DesiredAccess.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/DesiredAccess.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 
 namespace Interop.Windows.NtDll
@@ -190,5 +188,3 @@ internal enum DesiredAccess : uint
         FILE_GENERIC_EXECUTE = 0x20000000 // GENERIC_EXECUTE
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/FileFullEaInformation.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/FileFullEaInformation.cs
index 5e545ce131..76322ce604 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/FileFullEaInformation.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/FileFullEaInformation.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System.Runtime.InteropServices;
 
 namespace Interop.Windows.NtDll
@@ -37,5 +35,3 @@ internal struct FileFullEaInformation
 
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ImpersonationLevel.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ImpersonationLevel.cs
index 70c606e95b..5386a4094b 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ImpersonationLevel.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ImpersonationLevel.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.NtDll
 {
     /// <summary>
@@ -41,5 +39,3 @@ internal enum ImpersonationLevel
         SecurityDelegation = 3,
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/IoStatusBlock.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/IoStatusBlock.cs
index 0e173186b8..7018ef3abd 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/IoStatusBlock.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/IoStatusBlock.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Runtime.InteropServices;
 
@@ -44,5 +42,3 @@ public struct IoStatus
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/NtDll.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/NtDll.cs
index 20b5e314db..8dddda19d3 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/NtDll.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/NtDll.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -120,5 +118,3 @@ private static extern unsafe int NtCreateFile(
             uint EaLength);
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributeFlags.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributeFlags.cs
index 0f70ffa6cf..31dfd80ead 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributeFlags.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributeFlags.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 
 namespace Interop.Windows.NtDll
@@ -54,5 +52,3 @@ internal enum ObjectAttributeFlags : uint
         // OBJ_VALID_ATTRIBUTES = 0x000001F2
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributes.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributes.cs
index 3093763429..f3198f923e 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributes.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributes.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 
 namespace Interop.Windows.NtDll
@@ -60,5 +58,3 @@ public ObjectAttributes(
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/SecurityQualityOfService.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/SecurityQualityOfService.cs
index 0cfa77a2d5..7f268255d9 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/SecurityQualityOfService.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/SecurityQualityOfService.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System.Runtime.InteropServices;
 
 namespace Interop.Windows.NtDll
@@ -50,5 +48,3 @@ public SecurityQualityOfService(
         public bool IsEffectiveOnly { get; set; }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/SystemErrors.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/SystemErrors.cs
index 2265ee1427..40819ef4d9 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/SystemErrors.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/SystemErrors.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows
 {
     // https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
@@ -22,5 +20,3 @@ internal class SystemErrors
         internal const int ERROR_MR_MID_NOT_FOUND = 317;
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/UnicodeString.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/UnicodeString.cs
index 07ff56dbb4..7fc87decbf 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/UnicodeString.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/UnicodeString.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System.Runtime.InteropServices;
 
 namespace Interop.Windows
@@ -36,5 +34,3 @@ public UnicodeString(char* buffer, int length)
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index 7868c8c876..ecefa338c9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -22,6 +22,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.Data.SqlClient.Connection;
 using Microsoft.SqlServer.Server;
+using Microsoft.Win32;
 using IsolationLevel = System.Data.IsolationLevel;
 using Microsoft.Data.SqlClient.Internal;
 
@@ -30,10 +31,6 @@
 using System.Security.Permissions;
 #endif
 
-#if _WINDOWS
-using Microsoft.Win32;
-#endif
-
 namespace Microsoft.Data.Common
 {
     /// <summary>
@@ -68,6 +65,22 @@ internal static partial class ADP
         /// </summary>
         internal const int MaxBufferAccessTokenExpiry = 600;
 
+        /// <summary>
+        /// This member returns true if the current OS platform is Windows.
+        /// </summary>
+        /// <remarks>
+        /// This is a const on .NET Framework, and a property on .NET Core, because of differing API availability and JIT requirements.
+        /// .NET Framework will perform basic dead branch elimination when a const value is encountered, while .NET Core can trim Windows-specific
+        /// code when published to non-Windows platforms.
+        /// .NET Core's trimming is very limited though, so this must be used inline within methods to throw PlatformNotSupportedException,
+        /// rather than in a throw helper.
+        /// </remarks>
+        #if NETFRAMEWORK
+        public const bool IsWindows = true;
+        #else
+        public static bool IsWindows => OperatingSystem.IsWindows();
+        #endif
+
         #region UDT
 
         #if NETFRAMEWORK
@@ -435,17 +448,16 @@ internal static ArgumentOutOfRangeException InvalidCommandBehavior(CommandBehavi
             return InvalidEnumerationValue(typeof(CommandBehavior), (int)value);
         }
 
-
-        #if _UNIX
-        internal static object LocalMachineRegistryValue(string subkey, string queryvalue)
-        {
-            // No registry in non-Windows environments
-            return null;
-        }
-        #endif
-        #if _WINDOWS
         internal static object LocalMachineRegistryValue(string subkey, string queryvalue)
         {
+            #if NET
+            if (!IsWindows)
+            {
+                // No registry in non-Windows environments
+                return null;
+            }
+            #endif
+
             #if NETFRAMEWORK
             new RegistryPermission(RegistryPermissionAccess.Read, $@"HKEY_LOCAL_MACHINE\{subkey}").Assert();
             #endif
@@ -471,7 +483,6 @@ internal static object LocalMachineRegistryValue(string subkey, string queryvalu
             }
             #endif
         }
-        #endif
 
         internal static void ValidateCommandBehavior(CommandBehavior value)
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs
index 4006136de4..eb125e5b71 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs
@@ -33,10 +33,6 @@ internal static partial class ADP
         /// </summary>
         internal const int MinimumTimeoutForTnirMs = 500;
 
-        // @TODO: Use naming rules
-        // @TODO: All values but Unix and Windows32NT are used today, for netfx this should always be Win32NT. We can likely hard code this to true for netfx.
-        internal static readonly bool s_isWindowsNT = Environment.OSVersion.Platform == PlatformID.Win32NT;
-
         #endregion
 
         #region Utility Methods
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
index 786f91684b..57597ae761 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
@@ -53,9 +53,6 @@ sealed internal class DbConnectionPoolGroup
         internal DbConnectionPoolGroup(DbConnectionOptions connectionOptions, DbConnectionPoolKey key, DbConnectionPoolGroupOptions poolGroupOptions)
         {
             Debug.Assert(connectionOptions != null, "null connection options");
-#if NETFRAMEWORK
-            Debug.Assert(poolGroupOptions == null || ADP.s_isWindowsNT, "should not have pooling options on Win9x");
-#endif
 
             _connectionOptions = connectionOptions;
             _poolKey = key;
@@ -143,10 +140,6 @@ internal IDbConnectionPool GetConnectionPool(SqlConnectionFactory connectionFact
             IDbConnectionPool pool = null;
             if (_poolGroupOptions != null)
             {
-#if NETFRAMEWORK
-                Debug.Assert(ADP.s_isWindowsNT, "should not be pooling on Win9x");
-#endif
-
                 DbConnectionPoolIdentity currentIdentity = DbConnectionPoolIdentity.NoIdentity;
 
                 if (_poolGroupOptions.PoolByIdentity)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs
similarity index 94%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs
index 802472f83e..fc65808cf1 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs
@@ -2,8 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
+using Microsoft.Data.Common;
 using Microsoft.Data.SqlClient.AlwaysEncrypted;
 using System;
 using System.Diagnostics.CodeAnalysis;
@@ -150,6 +149,11 @@ private static void GetCngProviderAndKeyId(string keyPath, bool isSystemOp, out
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/DecryptColumnEncryptionKey/*' />
         public override byte[] DecryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? encryptedColumnEncryptionKey)
         {
+            if (!ADP.IsWindows)
+            {
+                throw new PlatformNotSupportedException();
+            }
+
             // Validate the input parameters
             ValidateNonEmptyKeyPath(masterKeyPath, isSystemOp: true);
 
@@ -176,6 +180,11 @@ public override byte[] DecryptColumnEncryptionKey(string? masterKeyPath, string?
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/EncryptColumnEncryptionKey/*' />
         public override byte[] EncryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? columnEncryptionKey)
         {
+            if (!ADP.IsWindows)
+            {
+                throw new PlatformNotSupportedException();
+            }
+
             // Validate the input parameters
             ValidateNonEmptyKeyPath(masterKeyPath, isSystemOp: false);
 
@@ -202,15 +211,17 @@ public override byte[] EncryptColumnEncryptionKey(string? masterKeyPath, string?
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/SignColumnMasterKeyMetadata/*' />
         public override byte[] SignColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations)
         {
-            throw new NotSupportedException();
+            throw ADP.IsWindows
+                ? new NotSupportedException()
+                : new PlatformNotSupportedException();
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/VerifyColumnMasterKeyMetadata/*' />
         public override bool VerifyColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations, byte[]? signature)
         {
-            throw new NotSupportedException();
+            throw ADP.IsWindows
+                ? new NotSupportedException()
+                : new PlatformNotSupportedException();
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.netcore.unix.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.netcore.unix.cs
deleted file mode 100644
index 6ab8567e2a..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.netcore.unix.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-// @TODO: See if we can throw this when we would create this object
-#if NET && _UNIX
-
-using System;
-
-#nullable enable
-
-namespace Microsoft.Data.SqlClient
-{
-    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/SqlColumnEncryptionCngProvider/*' />
-    public class SqlColumnEncryptionCngProvider : SqlColumnEncryptionKeyStoreProvider
-    {
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/ProviderName/*' />
-        public const string ProviderName = @"MSSQL_CNG_STORE";
-
-        /// <summary>
-        /// This encryption keystore uses an asymmetric key as the column master key.
-        /// </summary>
-        internal const string MasterKeyType = @"asymmetric key";
-
-        /// <summary>
-        /// This encryption keystore uses the master key path to reference a CNG provider.
-        /// </summary>
-        internal const string KeyPathReference = @"Microsoft Cryptography API: Next Generation (CNG) provider";
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/DecryptColumnEncryptionKey/*' />
-        public override byte[] DecryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? encryptedColumnEncryptionKey)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/EncryptColumnEncryptionKey/*' />
-        public override byte[] EncryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? columnEncryptionKey)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/SignColumnMasterKeyMetadata/*' />
-        public override byte[] SignColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/VerifyColumnMasterKeyMetadata/*' />
-        public override bool VerifyColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations, byte[]? signature)
-        {
-            throw new PlatformNotSupportedException();
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs
similarity index 95%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs
index 33fe10fe66..73ee585dfa 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs
@@ -2,8 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
+using Microsoft.Data.Common;
 using Microsoft.Data.SqlClient.AlwaysEncrypted;
 using Microsoft.Win32;
 using System;
@@ -152,6 +151,11 @@ private static int GetProviderType(string providerName, string keyPath, bool isS
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/DecryptColumnEncryptionKey/*' />
         public override byte[] DecryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? encryptedColumnEncryptionKey)
         {
+            if (!ADP.IsWindows)
+            {
+                throw new PlatformNotSupportedException();
+            }
+
             // Validate the input parameters
             ValidateNonEmptyCSPKeyPath(masterKeyPath, isSystemOp: true);
 
@@ -178,6 +182,11 @@ public override byte[] DecryptColumnEncryptionKey(string? masterKeyPath, string?
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/EncryptColumnEncryptionKey/*' />
         public override byte[] EncryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? columnEncryptionKey)
         {
+            if (!ADP.IsWindows)
+            {
+                throw new PlatformNotSupportedException();
+            }
+
             // Validate the input parameters
             ValidateNonEmptyCSPKeyPath(masterKeyPath, isSystemOp: false);
 
@@ -204,15 +213,17 @@ public override byte[] EncryptColumnEncryptionKey(string? masterKeyPath, string?
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/SignColumnMasterKeyMetadata/*' />
         public override byte[] SignColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations)
         {
-            throw new NotSupportedException();
+            throw ADP.IsWindows
+                ? new NotSupportedException()
+                : new PlatformNotSupportedException();
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/VerifyColumnMasterKeyMetadata/*' />
         public override bool VerifyColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations, byte[]? signature)
         {
-            throw new NotSupportedException();
+            throw ADP.IsWindows
+                ? new NotSupportedException()
+                : new PlatformNotSupportedException();
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.netcore.unix.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.netcore.unix.cs
deleted file mode 100644
index f96841273c..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.netcore.unix.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-// @TODO: See if we can throw this when we would create this object
-#if NET && _UNIX
-
-using System;
-
-#nullable enable
-
-namespace Microsoft.Data.SqlClient
-{
-    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/SqlColumnEncryptionCspProvider/*' />
-    public class SqlColumnEncryptionCspProvider : SqlColumnEncryptionKeyStoreProvider
-    {
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/ProviderName/*' />
-        public const string ProviderName = @"MSSQL_CSP_PROVIDER";
-
-        /// <summary>
-        /// This encryption keystore uses an asymmetric key as the column master key.
-        /// </summary>
-        internal const string MasterKeyType = @"asymmetric key";
-
-        /// <summary>
-        /// This encryption keystore uses the master key path to reference a CSP provider.
-        /// </summary>
-        internal const string KeyPathReference = @"Microsoft Cryptographic Service Provider (CSP)";
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/DecryptColumnEncryptionKey/*' />
-        public override byte[] DecryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? encryptedColumnEncryptionKey)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/EncryptColumnEncryptionKey/*' />
-        public override byte[] EncryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? columnEncryptionKey)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/SignColumnMasterKeyMetadata/*' />
-        public override byte[] SignColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/VerifyColumnMasterKeyMetadata/*' />
-        public override bool VerifyColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations, byte[]? signature)
-        {
-            throw new PlatformNotSupportedException();
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.cs
similarity index 99%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.cs
index b1a7f45abb..4c48890fc4 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -104,6 +102,11 @@ public SqlFileStream(
             FileOptions options,
             long allocationSize)
         {
+            if (!ADP.IsWindows)
+            {
+                throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
+            }
+
             // @TODO: Adopt netcore style format
             #if NETFRAMEWORK
             const string scopeFormat = "<sc.SqlFileStream.ctor|API> {0} access={1} options={2} path='{3}'";
@@ -957,5 +960,3 @@ private void ThrowIfDisposed()
         #endregion
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.netcore.unix.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.netcore.unix.cs
deleted file mode 100644
index 3ba7e55237..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.netcore.unix.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#if NET && _UNIX
-
-using System;
-using System.IO;
-
-namespace Microsoft.Data.SqlTypes
-{
-    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/SqlFileStream/*' />
-    public sealed class SqlFileStream : Stream
-    {
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/ctor1/*' />
-        public SqlFileStream(string path, byte[] transactionContext, FileAccess access)
-        {
-            throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/ctor2/*' />
-        public SqlFileStream(string path, byte[] transactionContext, FileAccess access, FileOptions options, Int64 allocationSize)
-        {
-            throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/Name/*' />
-        public string Name
-        {
-            get => throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/TransactionContext/*' />
-        public byte[] TransactionContext
-        {
-            get => throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/CanRead/*' />
-        public override bool CanRead
-        {
-            get => throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/CanSeek/*' />
-        public override bool CanSeek
-        {
-            get => throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/CanWrite/*' />
-        public override bool CanWrite
-        {
-            get => throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/Length/*' />
-        public override long Length
-        {
-            get => throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/Position/*' />
-        public override long Position
-        {
-            get => throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-            set => throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-        }
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/Flush/*' />
-        public override void Flush() => 
-            throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/Read/*' />
-        public override int Read(byte[] buffer, int offset, int count) => 
-            throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/Seek/*' />
-        public override long Seek(long offset, System.IO.SeekOrigin origin) => 
-            throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/SetLength/*' />
-        public override void SetLength(long value) => 
-            throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlFileStream.xml' path='docs/members[@name="SqlFileStream"]/Write/*' />
-        public override void Write(byte[] buffer, int offset, int count) => 
-            throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
-    }
-}
-
-#endif

From 85b22b6281513f5fa43b31147572362373861355 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Fri, 17 Apr 2026 07:12:39 +1000
Subject: [PATCH 044/298] Use using declaration for paramsCmd (#4010)

---
 .../src/Microsoft/Data/SqlClient/SqlCommand.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
index 71845ddeb9..5ddb9115d2 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -1350,7 +1350,7 @@ internal void DeriveParameters()
                 useManagedDataType = false;
             }
 
-            SqlCommand paramsCmd = new SqlCommand(cmdText.ToString(), Connection, Transaction)
+            using SqlCommand paramsCmd = new SqlCommand(cmdText.ToString(), Connection, Transaction)
             {
                 CommandType = CommandType.StoredProcedure
             };

From 4df2aaefbb94072a781ad302b3ce61075be04c12 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Fri, 17 Apr 2026 07:59:39 +1000
Subject: [PATCH 045/298] better perf by avoiding redundant casts (#4018)

* better perf by avoiding cast duplication

* Update SqlParameter.cs
---
 .../Microsoft/Data/SqlClient/SqlBulkCopy.cs   |  4 +--
 .../Microsoft/Data/SqlClient/SqlCommand.cs    |  2 +-
 .../SqlClient/SqlConnectionStringBuilder.cs   |  8 ++---
 .../Microsoft/Data/SqlClient/SqlParameter.cs  |  8 ++---
 .../src/Microsoft/Data/SqlClient/SqlUtil.cs   |  3 +-
 .../src/Microsoft/Data/SqlClient/TdsParser.cs | 32 +++++++++----------
 6 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
index fdda86b98e..3ebf10e7fc 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -1757,9 +1757,9 @@ private object ConvertValue(object value, _SqlMetaData metadata, bool isNull, re
                     case TdsEnums.SQLJSON:
                         // Could be either string, SqlCachedBuffer, XmlReader or XmlDataFeed
                         Debug.Assert((value is XmlReader) || (value is SqlCachedBuffer) || (value is string) || (value is SqlString) || (value is XmlDataFeed), "Invalid value type of Xml datatype");
-                        if (value is XmlReader)
+                        if (value is XmlReader xmlReader)
                         {
-                            value = new XmlDataFeed((XmlReader)value);
+                            value = new XmlDataFeed(xmlReader);
                             typeChanged = true;
                             coercedToDataFeed = true;
                         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
index 5ddb9115d2..1073bb137c 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -2273,7 +2273,7 @@ and not SqlDbType.Udt
                             s = val as string;
                             if (s is null)
                             {
-                                SqlString sval = val is SqlString ? (SqlString)val : SqlString.Null;
+                                SqlString sval = val is SqlString sqlVal ? sqlVal : SqlString.Null;
                                 if (!sval.IsNull)
                                 {
                                     s = sval.Value;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
index 6bc29aee36..046228d0c6 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
@@ -732,13 +732,9 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
                 {
                     throw ADP.ArgumentNull(nameof(destinationType));
                 }
-                if (typeof(InstanceDescriptor) == destinationType)
+                if (destinationType == typeof(InstanceDescriptor) && value is SqlConnectionStringBuilder obj)
                 {
-                    SqlConnectionStringBuilder obj = (value as SqlConnectionStringBuilder);
-                    if (obj is not null)
-                    {
-                        return ConvertToInstanceDescriptor(obj);
-                    }
+                    return ConvertToInstanceDescriptor(obj);
                 }
                 return base.ConvertTo(context, culture, value, destinationType);
             }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
index 01d1131789..13b71c2a29 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
@@ -95,9 +95,9 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
                 {
                     throw ADP.ArgumentNull(nameof(destinationType));
                 }
-                if ((typeof(InstanceDescriptor) == destinationType) && (value is SqlParameter))
+                if (destinationType == typeof(InstanceDescriptor) && value is SqlParameter parameter)
                 {
-                    return ConvertToInstanceDescriptor(value as SqlParameter);
+                    return ConvertToInstanceDescriptor(parameter);
                 }
                 return base.ConvertTo(context, culture, value, destinationType);
             }
@@ -1951,9 +1951,9 @@ private MetaType GetMetaTypeOnly()
                     _value = _value.ToString();
                     valueType = typeof(string);
                 }
-                else if (valueType == typeof(char[]))
+                else if (_value is char[] chars)
                 {
-                    _value = new string((char[])_value);
+                    _value = new string(chars);
                     valueType = typeof(string);
                 }
                 return MetaType.GetMetaTypeFromType(valueType);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
index ab2261f0e9..d10df22966 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
@@ -1931,9 +1931,8 @@ internal static Exception GetExceptionArray(string serverName, string errorMessa
             Exception exceptionToInclude = e.InnerException != null ? e.InnerException : e;
             sqlErs.Add(new SqlError(infoNumber: 0, errorState: (byte)0x00, errorClass: (byte)TdsEnums.MIN_ERROR_CLASS, server: serverName, errorMessage: errorMessage, procedure: null, lineNumber: 0));
 
-            if (e is SqlException)
+            if (e is SqlException exThrown)
             {
-                SqlException exThrown = (SqlException)e;
                 SqlErrorCollection errorList = exThrown.Errors;
                 for (int i = 0; i < exThrown.Errors.Count; i++)
                 {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 088d41d94d..6b5516d067 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -10665,9 +10665,9 @@ private Task TDSExecuteRPCAddParameter(TdsParserStateObject stateObj, SqlParamet
 
                     if (isSqlVal)
                     {
-                        if (value is SqlString)
+                        if (value is SqlString sqlString)
                         {
-                            s = ((SqlString)value).Value;
+                            s = sqlString.Value;
                         }
                         else
                         {
@@ -11995,9 +11995,9 @@ internal Task WriteBulkCopyValue(object value, SqlMetaDataPriv metadata, TdsPars
                             break;
                         case TdsEnums.SQLXMLTYPE:
                             // Value here could be string or XmlReader
-                            if (value is XmlReader)
+                            if (value is XmlReader xmlReader)
                             {
-                                value = MetaType.GetStringFromXml((XmlReader)value);
+                                value = MetaType.GetStringFromXml(xmlReader);
                             }
                             ccb = ((isSqlType) ? ((SqlString)value).Value.Length : ((string)value).Length) * 2;
                             break;
@@ -12469,9 +12469,9 @@ private Task WriteUnterminatedSqlValue(object value, MetaType type, int actualLe
                             WriteInt(actualLength, stateObj);               // chunk length
                         }
 
-                        if (value is SqlBinary)
+                        if (value is SqlBinary sqlBinary)
                         {
-                            return stateObj.WriteByteArray(((SqlBinary)value).Value, actualLength, offset, canAccumulate: false);
+                            return stateObj.WriteByteArray(sqlBinary.Value, actualLength, offset, canAccumulate: false);
                         }
                         else
                         {
@@ -12538,9 +12538,9 @@ private Task WriteUnterminatedSqlValue(object value, MetaType type, int actualLe
                     {
                         WriteInt(codePageByteSize, stateObj);               // chunk length
                     }
-                    if (value is SqlChars)
+                    if (value is SqlChars sqlCharsEnc)
                     {
-                        string sch = new string(((SqlChars)value).Value);
+                        string sch = new string(sqlCharsEnc.Value);
 
                         return WriteEncodingChar(sch, actualLength, offset, _defaultEncoding, stateObj, canAccumulate: false);
                     }
@@ -12584,9 +12584,9 @@ private Task WriteUnterminatedSqlValue(object value, MetaType type, int actualLe
                         actualLength >>= 1;
                     }
 
-                    if (value is SqlChars)
+                    if (value is SqlChars sqlCharsArr)
                     {
-                        return WriteCharArray(((SqlChars)value).Value, actualLength, offset, stateObj, canAccumulate: false);
+                        return WriteCharArray(sqlCharsArr.Value, actualLength, offset, stateObj, canAccumulate: false);
                     }
                     else
                     {
@@ -13634,9 +13634,9 @@ private byte[] SerializeUnencryptedSqlValue(object value, MetaType type, int act
                     {
                         byte[] b = new byte[actualLength];
 
-                        if (value is SqlBinary)
+                        if (value is SqlBinary sqlBin)
                         {
-                            Buffer.BlockCopy(((SqlBinary)value).Value, offset, b, 0, actualLength);
+                            Buffer.BlockCopy(sqlBin.Value, offset, b, 0, actualLength);
                         }
                         else
                         {
@@ -13687,9 +13687,9 @@ private byte[] SerializeUnencryptedSqlValue(object value, MetaType type, int act
                 case TdsEnums.SQLBIGCHAR:
                 case TdsEnums.SQLBIGVARCHAR:
                 case TdsEnums.SQLTEXT:
-                    if (value is SqlChars)
+                    if (value is SqlChars sqlChSer)
                     {
-                        String sch = new String(((SqlChars)value).Value);
+                        String sch = new String(sqlChSer.Value);
                         return SerializeEncodingChar(sch, actualLength, offset, _defaultEncoding);
                     }
                     else
@@ -13710,9 +13710,9 @@ private byte[] SerializeUnencryptedSqlValue(object value, MetaType type, int act
                         actualLength >>= 1;
                     }
 
-                    if (value is SqlChars)
+                    if (value is SqlChars sqlChArr)
                     {
-                        return SerializeCharArray(((SqlChars)value).Value, actualLength, offset);
+                        return SerializeCharArray(sqlChArr.Value, actualLength, offset);
                     }
                     else
                     {

From a8d349e7baebebd973cd4bc46d5f1ea03101e46d Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Thu, 16 Apr 2026 23:56:41 +0100
Subject: [PATCH 046/298] Perf | Reduce allocations when sending large strings
 (#4072)

* Introduce shims for Encoding

Shim GetByteCount and GetBytes methods, and make sure these are used more widely.
Improves performance on netfx and netcore.

* Address comments in EncodingExtensions

* Add unit tests for EncodingExtensions

This also highlighted that passing a null string should throw an exception rather than return 0/[].
---
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |  35 +---
 .../Data/SqlClient/TdsValueSetter.cs          |   5 +-
 .../System/Text/EncodingExtensions.netfx.cs   |  71 ++++++++
 .../UnitTests/System/Text/EncodingTest.cs     | 161 ++++++++++++++++++
 4 files changed, 237 insertions(+), 35 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/System/Text/EncodingExtensions.netfx.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/System/Text/EncodingTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 6b5516d067..2d1807e7b5 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -8651,36 +8651,18 @@ private Task WriteEncodingChar(string s, Encoding encoding, TdsParserStateObject
 
         private byte[] SerializeEncodingChar(string s, int numChars, int offset, Encoding encoding)
         {
-#if NETFRAMEWORK
-            char[] charData;
-            byte[] byteData = null;
-
             // if hitting 7.0 server, encoding will be null in metadata for columns or return values since
             // 7.0 has no support for multiple code pages in data - single code page support only
-            if (encoding == null)
-            {
-                encoding = _defaultEncoding;
-            }
-
-            charData = s.ToCharArray(offset, numChars);
-
-            byteData = new byte[encoding.GetByteCount(charData, 0, charData.Length)];
-            encoding.GetBytes(charData, 0, charData.Length, byteData, 0);
+            encoding ??= _defaultEncoding;
 
-            return byteData;
-#else
             return encoding.GetBytes(s, offset, numChars);
-#endif
         }
 
         private Task WriteEncodingChar(string s, int numChars, int offset, Encoding encoding, TdsParserStateObject stateObj, bool canAccumulate = true)
         {
             // if hitting 7.0 server, encoding will be null in metadata for columns or return values since
             // 7.0 has no support for multiple code pages in data - single code page support only
-            if (encoding == null)
-            {
-                encoding = _defaultEncoding;
-            }
+            encoding ??= _defaultEncoding;
 
             // Optimization: if the entire string fits in the current buffer, then copy it directly
             int bytesLeft = stateObj._outBuff.Length - stateObj._outBytesUsed;
@@ -8692,23 +8674,14 @@ private Task WriteEncodingChar(string s, int numChars, int offset, Encoding enco
             }
             else
             {
-#if NETFRAMEWORK
-                char[] charData = s.ToCharArray(offset, numChars);
-                byte[] byteData = encoding.GetBytes(charData, 0, numChars);
-                Debug.Assert(byteData != null, "no data from encoding");
-                return stateObj.WriteByteArray(byteData, byteData.Length, 0, canAccumulate);
-#else
                 byte[] byteData = encoding.GetBytes(s, offset, numChars);
                 Debug.Assert(byteData != null, "no data from encoding");
                 return stateObj.WriteByteArray(byteData, byteData.Length, 0, canAccumulate);
-#endif
             }
         }
 
         internal int GetEncodingCharLength(string value, int numChars, int charOffset, Encoding encoding)
         {
-            // UNDONE: (PERF) this is an expensive way to get the length.  Also, aren't we
-            // UNDONE: (PERF) going through these steps twice when we write out a value?
             if (string.IsNullOrEmpty(value))
             {
                 return 0;
@@ -8726,9 +8699,7 @@ internal int GetEncodingCharLength(string value, int numChars, int charOffset, E
                 encoding = _defaultEncoding;
             }
 
-            char[] charData = value.ToCharArray(charOffset, numChars);
-
-            return encoding.GetByteCount(charData, 0, numChars);
+            return encoding.GetByteCount(value, charOffset, numChars);
         }
 
         //
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsValueSetter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsValueSetter.cs
index 198460791b..fd9d64943e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsValueSetter.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsValueSetter.cs
@@ -354,8 +354,7 @@ internal void SetString(string value, int offset, int length)
                 }
                 else
                 {
-                    char[] chars = value.ToCharArray(offset, length);
-                    bytes = _stateObj.Parser._defaultEncoding.GetBytes(chars);
+                    bytes = _stateObj.Parser._defaultEncoding.GetBytes(value, offset, length);
                 }
                 SetBytes(0, bytes, 0, bytes.Length);
                 SetBytesLength(bytes.Length);
@@ -376,7 +375,7 @@ internal void SetString(string value, int offset, int length)
                     }
                     else
                     {
-                        bytes = _stateObj.Parser._defaultEncoding.GetBytes(value.ToCharArray(offset, length));
+                        bytes = _stateObj.Parser._defaultEncoding.GetBytes(value, offset, length);
                     }
                     _stateObj.Parser.WriteSqlVariantHeader(9 + bytes.Length, TdsEnums.SQLBIGVARCHAR, 7, _stateObj);
                     _stateObj.Parser.WriteUnsignedInt(collation._info, _stateObj); // propbytes: collation.Info
diff --git a/src/Microsoft.Data.SqlClient/src/System/Text/EncodingExtensions.netfx.cs b/src/Microsoft.Data.SqlClient/src/System/Text/EncodingExtensions.netfx.cs
new file mode 100644
index 0000000000..baf2a275e5
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/System/Text/EncodingExtensions.netfx.cs
@@ -0,0 +1,71 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NETFRAMEWORK
+
+using System.Diagnostics;
+
+#nullable enable
+
+namespace System.Text;
+
+internal static class EncodingExtensions
+{
+    public static int GetByteCount(this Encoding encoding, string? s, int offset, int count)
+    {
+        if (s is null)
+        {
+            throw new ArgumentNullException(nameof(s));
+        }
+
+        ReadOnlySpan<char> slicedString = s.AsSpan(offset, count);
+
+        if (slicedString.Length == 0)
+        {
+            return 0;
+        }
+
+        unsafe
+        {
+            fixed (char* str = slicedString)
+            {
+                return encoding.GetByteCount(str, slicedString.Length);
+            }
+        }
+    }
+
+    public static byte[] GetBytes(this Encoding encoding, string? s, int index, int count)
+    {
+        if (s is null)
+        {
+            throw new ArgumentNullException(nameof(s));
+        }
+
+        ReadOnlySpan<char> slicedString = s.AsSpan(index, count);
+
+        if (slicedString.Length == 0)
+        {
+            return Array.Empty<byte>();
+        }
+
+        unsafe
+        {
+            fixed (char* str = slicedString)
+            {
+                int byteCount = encoding.GetByteCount(str, slicedString.Length);
+                byte[] bytes = new byte[byteCount];
+
+                fixed (byte* destArray = &bytes[0])
+                {
+                    int bytesWritten = encoding.GetBytes(str, slicedString.Length, destArray, bytes.Length);
+
+                    Debug.Assert(bytesWritten == byteCount);
+                    return bytes;
+                }
+            }
+        }
+    }
+}
+
+#endif
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/System/Text/EncodingTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/System/Text/EncodingTest.cs
new file mode 100644
index 0000000000..9b5b7ec785
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/System/Text/EncodingTest.cs
@@ -0,0 +1,161 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+namespace System.Text.UnitTests;
+
+/// <summary>
+/// Tests that the Encoding polyfills in netfx operate correctly and handle
+/// invalid parameter values.
+/// </summary>
+/// <remarks>
+/// In the netcore cases, we're testing the built-in GetBytes and GetByteCount
+/// methods. The contract for our extension polyfills must match these implementations.
+/// </remarks>
+public class EncodingTest
+{
+    private const string ExampleStringValue = "ABCDéFG1234567abcdefg";
+
+    /// <summary>
+    /// Represents a series of invalid [offset, count] pairs into the <see cref="ExampleStringValue"/>
+    /// constant.
+    /// </summary>
+    public static TheoryData<int, int> InvalidOffsetsAndCounts =>
+        new()
+        {
+            // Group 1: offset starts before the string.
+            // * Count extends beyond it.
+            { -1, 999 },
+            // * Count is valid.
+            { -1, 5 },
+            // Group 2: offset is valid.
+            // * Count extends beyond the end of it.
+            { 0, 999 },
+            // * Count extends backwards to the start it.
+            { 5, -5 },
+            // Group 3: offset starts beyond the end of the string.
+            // * Count extends beyond the end of it.
+            { 999, 999 },
+            // * Count extends backwards into the string.
+            { 999, -1005 }
+        };
+
+    #if NET
+    static EncodingTest()
+    {
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+    }
+#endif
+
+    /// <summary>
+    /// Verifies that GetByteCount throws an ArgumentNullException when passed a null string.
+    /// </summary>
+    [Fact]
+    public void GetByteCount_ThrowsOnNullString()
+    {
+        string nullString = null!;
+        Action act = () => Encoding.Unicode.GetByteCount(nullString, 0, 0);
+
+        Assert.Throws<ArgumentNullException>(act);
+    }
+
+    /// <summary>
+    /// Verifies that GetBytes throws an ArgumentNullException when passed a null string.
+    /// </summary>
+    [Fact]
+    public void GetBytes_ThrowsOnNullString()
+    {
+        string nullString = null!;
+        Action act = () => Encoding.Unicode.GetBytes(nullString, 0, 0);
+
+        Assert.Throws<ArgumentNullException>(act);
+    }
+
+    /// <summary>
+    /// Verifies that GetByteCount throws an ArgumentOutOfRangeException when passes an offset
+    /// or count which is outside of the string.
+    /// </summary>
+    /// <param name="offset">offset parameter of GetByteCount.</param>
+    /// <param name="count">count parameter of GetByteCount.</param>
+    /// <seealso cref="InvalidOffsetsAndCounts"/>
+    [Theory]
+    [MemberData(nameof(InvalidOffsetsAndCounts))]
+    public void GetByteCount_ThrowsOnOutOfRangeOffsetOrCount(int offset, int count)
+    {
+        Action act = () => Encoding.Unicode.GetByteCount(ExampleStringValue, offset, count);
+
+        Assert.Throws<ArgumentOutOfRangeException>(act);
+    }
+
+    /// <summary>
+    /// Verifies that GetBytes throws an ArgumentOutOfRangeException when passes an offset
+    /// or count which is outside of the string.
+    /// </summary>
+    /// <param name="offset">offset parameter of GetBytes.</param>
+    /// <param name="count">count parameter of GetBytes.</param>
+    [Theory]
+    [MemberData(nameof(InvalidOffsetsAndCounts))]
+    public void GetBytes_ThrowsOnOutOfRangeOffsetOrCount(int offset, int count)
+    {
+        Action act = () => Encoding.Unicode.GetBytes(ExampleStringValue, offset, count);
+
+        Assert.Throws<ArgumentOutOfRangeException>(act);
+    }
+
+    /// <summary>
+    /// Verifies that when using the new GetByteCount and GetBytes polyfills to encode the entire string, the return
+    /// value is equal to passing the string as-is to GetByteCount(string) and GetBytes(string).
+    /// </summary>
+    [Fact]
+    public void GetBytesOfFullStringByLength_MatchesGetBytesOfFullString()
+    {
+        byte[] fullStringBytes = Encoding.Unicode.GetBytes(ExampleStringValue);
+        int fullStringByteCount = Encoding.Unicode.GetByteCount(ExampleStringValue);
+
+        byte[] partialStringBytes = Encoding.Unicode.GetBytes(ExampleStringValue, 0, ExampleStringValue.Length);
+        int partialStringByteCount = Encoding.Unicode.GetByteCount(ExampleStringValue, 0, ExampleStringValue.Length);
+
+        Assert.Equal(fullStringByteCount, partialStringByteCount);
+        Assert.Equal(fullStringByteCount, partialStringBytes.Length);
+        Assert.Equal(fullStringBytes, partialStringBytes);
+    }
+
+    /// <summary>
+    /// Verifies that encoding a specific substring returns a byte array which can be decoded into the same string, in
+    /// various code pages.
+    /// </summary>
+    /// <param name="codePage">The code page identifier to use for transcoding.</param>
+    [Theory]
+    // Unicode
+    [InlineData(1200)]
+    // UTF8
+    [InlineData(65001)]
+    public void GetBytes_Roundtrips(int codePage)
+    {
+        Encoding encoding = Encoding.GetEncoding(codePage);
+        byte[] partialStringBytes = encoding.GetBytes(ExampleStringValue, 4, 5);
+        string expectedRoundtrippedValue = ExampleStringValue.Substring(4, 5);
+        string roundtrip = encoding.GetString(partialStringBytes);
+
+        Assert.Equal(expectedRoundtrippedValue, roundtrip);
+    }
+
+    /// <summary>
+    /// Verifies that when a string contains a multibyte character, the byte array returns the correct number of
+    /// elements for the encoding.
+    /// </summary>
+    [Fact]
+    public void GetByteCount_ReturnsCorrectValueOnMultiCharacterRune()
+    {
+        // The character é is two bytes in UTF8.
+        Assert.Equal(6, Encoding.UTF8.GetByteCount(ExampleStringValue, 4, 5));
+
+        // All Unicode characters in our sample string are two bytes long.
+        Assert.Equal(10, Encoding.Unicode.GetByteCount(ExampleStringValue, 4, 5));
+
+        // Code page 1251 does not have the é character, so treats it as the single-byte character "e".
+        Assert.Equal(5, Encoding.GetEncoding(1251).GetByteCount(ExampleStringValue, 4, 5));
+    }
+}

From 19b43052d0890db151263c522e5d1c8929f7fa45 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Fri, 17 Apr 2026 01:09:32 +0100
Subject: [PATCH 047/298] Tests | Introduce RAII SQL object primitives (#4050)

* Create DatabaseObject base class for fixture

This contains GenerateLongName and GenerateShortName, which are lifted from DataTestUtility.GetLongName and GetShortName in ManualTests.

* Create derived types, use these in a few locations

This eliminates DropUserDefinedType from DataTestUtility.

* Further removal of ad-hoc utility methods in ParametersTest

* Further removal of ad-hoc CREATE/DROP scripts in ParametersTest

* Use Table type in SqlGraphTables.cs

* Use Table and StoredProcedure types in JsonTest.cs

* Use Table type in JsonStreamTest.cs

* Remove duplicate helper function from ApiShould.cs
---
 .../DatabaseObjects/DatabaseObject.cs         | 263 ++++++++
 .../DatabaseObjects/StoredProcedure.cs        |  41 ++
 .../Common/Fixtures/DatabaseObjects/Table.cs  |  61 ++
 .../DatabaseObjects/UserDefinedType.cs        |  41 ++
 .../ManualTests/AlwaysEncrypted/ApiShould.cs  |  83 +--
 .../ManualTests/DataCommon/DataTestUtility.cs | 184 +-----
 .../SQL/JsonTest/JsonStreamTest.cs            |  37 +-
 .../ManualTests/SQL/JsonTest/JsonTest.cs      | 574 +++++++----------
 .../SQL/ParameterTest/ParametersTest.cs       | 590 +++++++-----------
 .../SQL/SqlBulkCopyTest/SqlGraphTables.cs     |  22 +-
 .../SQL/UdtTest/UdtDateTimeOffsetTest.cs      | 110 ++--
 11 files changed, 937 insertions(+), 1069 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
new file mode 100644
index 0000000000..2dc539b5f5
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
@@ -0,0 +1,263 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Text;
+using System.Threading;
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// Base class for a transient database object (such as a table, type or
+/// stored procedure.)
+/// </summary>
+public abstract class DatabaseObject : IDisposable
+{
+    private readonly bool _shouldDrop;
+
+    protected SqlConnection Connection { get; }
+
+    public string Name { get; }
+
+    protected DatabaseObject(SqlConnection connection, string name, string definition, bool shouldCreate, bool shouldDrop)
+    {
+        _shouldDrop = shouldDrop;
+
+        Connection = connection;
+        Name = name;
+
+        if (shouldCreate)
+        {
+            EnsureConnectionOpen();
+            DropObject();
+            CreateObject(definition);
+        }
+    }
+
+    private void EnsureConnectionOpen()
+    {
+        const int MaxWaits = 2;
+        int counter = MaxWaits;
+
+        if (Connection.State is System.Data.ConnectionState.Closed)
+        {
+            Connection.Open();
+        }
+        while (counter-- > 0 && Connection.State is System.Data.ConnectionState.Connecting)
+        {
+            Thread.Sleep(80);
+        }
+    }
+
+    /// <summary>
+    /// Generate a new GUID and return the characters from its 1st and 4th
+    /// parts, as shown here:
+    ///
+    /// <code>
+    ///   7ff01cb8-88c7-11f0-b433-00155d7e531e
+    ///   ^^^^^^^^           ^^^^
+    /// </code>
+    ///
+    /// These 12 characters are concatenated together without any
+    /// separators.  These 2 parts typically comprise a timestamp and clock
+    /// sequence, most likely to be unique for tests that generate names in
+    /// quick succession.
+    /// </summary>
+    private static string GetGuidParts()
+    {
+        var guid = Guid.NewGuid().ToString();
+        // GOTCHA: The slice operator is inclusive of the start index and
+        // exclusive of the end index!
+        return guid.Substring(0, 8) + guid.Substring(19, 4);
+    }
+
+    /// <summary>
+    /// Generate a long unique database object name, whose maximum length is
+    /// 96 characters, with the format:
+    ///
+    ///   <c>{Prefix}_{GuidParts}_{UserName}_{MachineName}</c>
+    ///
+    /// The Prefix will be truncated to satisfy the overall maximum length.
+    ///
+    /// The GUID Parts will be the characters from the 1st and 4th blocks
+    /// from a traditional string representation, as shown here:
+    ///
+    /// <code>
+    ///   7ff01cb8-88c7-11f0-b433-00155d7e531e
+    ///   ^^^^^^^^           ^^^^
+    /// </code>
+    ///
+    /// These 2 parts typically comprise a timestamp and clock sequence,
+    /// most likely to be unique for tests that generate names in quick
+    /// succession.  The 12 characters are concatenated together without any
+    /// separators.
+    ///
+    /// The UserName and MachineName are obtained from the Environment,
+    /// and will be truncated to satisfy the maximum overall length.
+    /// </summary>
+    ///
+    /// <param name="prefix">
+    /// The prefix to use when generating the unique name, truncated to at
+    /// most 32 characters.
+    ///
+    /// This should not contain any characters that cannot be used in
+    /// database object names.  See:
+    ///
+    /// https://learn.microsoft.com/en-us/sql/relational-databases/databases/database-identifiers?view=sql-server-ver17#rules-for-regular-identifiers
+    /// </param>
+    ///
+    /// <param name="escape">
+    /// When true, the entire generated name will be enclosed in square
+    /// brackets, for example:
+    ///
+    ///   <c>[MyPrefix_7ff01cb811f0_test_user_ci_agent_machine_name]</c>
+    /// </param>
+    ///
+    /// <returns>
+    /// A unique database object name, no more than 96 characters long.
+    /// </returns>
+    public static string GenerateLongName(string prefix, bool escape = true)
+    {
+        StringBuilder name = new(96);
+
+        if (escape)
+        {
+            name.Append('[');
+        }
+
+        if (prefix.Length > 32)
+        {
+            prefix = prefix.Substring(0, 32);
+        }
+
+        name.Append(prefix);
+        name.Append('_');
+        name.Append(GetGuidParts());
+        name.Append('_');
+
+        var suffix =
+          Environment.UserName + '_' +
+          Environment.MachineName;
+
+        int maxSuffixLength = 96 - name.Length;
+        if (escape)
+        {
+            --maxSuffixLength;
+        }
+        if (suffix.Length > maxSuffixLength)
+        {
+            suffix = suffix.Substring(0, maxSuffixLength);
+        }
+
+        name.Append(suffix);
+
+        if (escape)
+        {
+            name.Append(']');
+        }
+
+        return name.ToString();
+    }
+
+    /// <summary>
+    /// Generate a short unique database object name, whose maximum length
+    /// is 30 characters, with the format:
+    ///
+    ///   <c>{Prefix}_{GuidParts}</c>
+    ///
+    /// The Prefix will be truncated to satisfy the overall maximum length.
+    ///
+    /// The GUID parts will be the characters from the 1st and 4th blocks
+    /// from a traditional string representation, as shown here:
+    /// 
+    /// <code>
+    ///   7ff01cb8-88c7-11f0-b433-00155d7e531e
+    ///   ^^^^^^^^           ^^^^
+    /// </code>
+    ///
+    /// These 2 parts typically comprise a timestamp and clock sequence,
+    /// most likely to be unique for tests that generate names in quick
+    /// succession.  The 12 characters are concatenated together without any
+    /// separators.
+    /// </summary>
+    ///
+    /// <param name="prefix">
+    /// The prefix to use when generating the unique name, truncated to at
+    /// most 18 characters when withBracket is false, and 16 characters when
+    /// withBracket is true.
+    ///
+    /// This should not contain any characters that cannot be used in
+    /// database object names.  See:
+    ///
+    /// https://learn.microsoft.com/en-us/sql/relational-databases/databases/database-identifiers?view=sql-server-ver17#rules-for-regular-identifiers
+    /// </param>
+    ///
+    /// <param name="escape">
+    /// When true, the entire generated name will be enclosed in square
+    /// brackets, for example:
+    ///
+    ///   <c>[MyPrefix_7ff01cb811f0]</c>
+    /// </param>
+    ///
+    /// <returns>
+    /// A unique database object name, no more than 30 characters long.
+    /// </returns>
+    public static string GenerateShortName(string prefix, bool escape = true)
+    {
+        StringBuilder name = new(30);
+
+        if (escape)
+        {
+            name.Append('[');
+        }
+
+        int maxPrefixLength = escape ? 16 : 18;
+        if (prefix.Length > maxPrefixLength)
+        {
+            prefix = prefix.Substring(0, maxPrefixLength);
+        }
+
+        name.Append(prefix);
+        name.Append('_');
+        name.Append(GetGuidParts());
+
+        if (escape)
+        {
+            name.Append(']');
+        }
+
+        return name.ToString();
+    }
+
+    /// <summary>
+    /// Creates the object with a given definition.
+    /// </summary>
+    /// <param name="definition">Definition of the object to create.</param>
+    /// <remarks>
+    /// By the time this is called, <see cref="Connection"/> will be open.
+    /// </remarks>
+    protected abstract void CreateObject(string definition);
+
+    /// <summary>
+    /// Drops the object created by <see cref="CreateObject"/>.
+    /// </summary>
+    /// <remarks>
+    /// By the time this is called, <see cref="Connection"/> will be open.
+    /// Must not throw an exception if the object does not exist.
+    /// </remarks>
+    protected abstract void DropObject();
+
+    public void Dispose()
+    {
+        if (_shouldDrop)
+        {
+            EnsureConnectionOpen();
+            DropObject();
+        }
+        // This explicitly does not drop the wrapped SqlConnection; this is sometimes
+        // used in a loop to create multiple UDTs.
+
+        GC.SuppressFinalize(this);
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs
new file mode 100644
index 0000000000..d1b60612d1
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// A transient stored procedure, created at the start of its scope and dropped when disposed.
+/// </summary>
+public sealed class StoredProcedure : DatabaseObject
+{
+    /// <summary>
+    /// Initializes a new instance of the StoredProcedure class using the specified SQL connection,
+    /// name and definition.
+    /// </summary>
+    /// <remarks>
+    /// If a stored procedure with the specified name already exists, it will be dropped automatically
+    /// before creation.
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="prefix">The stored procedure name. Can begin with '#' or '##' to indicate a temporary procedure.</param>
+    /// <param name="definition">The SQL definition of the stored procedure.</param>
+    public StoredProcedure(SqlConnection connection, string prefix, string definition)
+        : base(connection, GenerateLongName(prefix), definition, shouldCreate: true, shouldDrop: true)
+    {
+    }
+
+    protected override void CreateObject(string definition)
+    {
+        using SqlCommand createCommand = new($"CREATE PROCEDURE {Name} {definition}", Connection);
+
+        createCommand.ExecuteNonQuery();
+    }
+
+    protected override void DropObject()
+    {
+        using SqlCommand dropCommand = new($"IF (OBJECT_ID('{Name}') IS NOT NULL) DROP PROCEDURE {Name}", Connection);
+
+        dropCommand.ExecuteNonQuery();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs
new file mode 100644
index 0000000000..2838ae2272
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs
@@ -0,0 +1,61 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// A transient table, created at the start of its scope and dropped when disposed.
+/// </summary>
+public sealed class Table : DatabaseObject
+{
+    /// <summary>
+    /// Initializes a new instance of the Table class using the specified SQL connection, table name prefix, and table
+    /// definition.
+    /// </summary>
+    /// <remarks>
+    /// If a table with the specified name already exists, it will be dropped automatically before
+    /// creation.
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="prefix">The prefix for the table name. Can begin with '#' or '##' to indicate a temporary table.</param>
+    /// <param name="definition">The SQL definition describing the structure of the table, including columns and data types.</param>
+    public Table(SqlConnection connection, string prefix, string definition)
+        : base(connection, GenerateLongName(prefix), definition, shouldCreate: true, shouldDrop: true)
+    {
+    }
+
+    protected override void CreateObject(string definition)
+    {
+        using SqlCommand createCommand = new($"CREATE TABLE {Name} {definition}", Connection);
+
+        createCommand.ExecuteNonQuery();
+    }
+
+    protected override void DropObject()
+    {
+        using SqlCommand dropCommand = new($"IF (OBJECT_ID('{Name}') IS NOT NULL) DROP TABLE {Name}", Connection);
+
+        dropCommand.ExecuteNonQuery();
+    }
+
+    /// <summary>
+    /// Deletes all data from the table.
+    /// </summary>
+    public void DeleteData()
+    {
+        using SqlCommand deleteCommand = new($"DELETE FROM {Name}", Connection);
+
+        deleteCommand.ExecuteNonQuery();
+    }
+
+    /// <summary>
+    /// Truncates the table.
+    /// </summary>
+    public void Truncate()
+    {
+        using SqlCommand truncateCommand = new($"TRUNCATE TABLE {Name}", Connection);
+
+        truncateCommand.ExecuteNonQuery();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs
new file mode 100644
index 0000000000..6d536d7550
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// A transient user-defined type, created at the start of its scope and dropped when disposed.
+/// </summary>
+public sealed class UserDefinedType : DatabaseObject
+{
+    /// <summary>
+    /// Initializes a new instance of the UserDefinedType class using the specified SQL connection,
+    /// name and definition.
+    /// </summary>
+    /// <remarks>
+    /// If a user-defined type with the specified name already exists, it will be dropped automatically
+    /// before creation.
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="prefix">The type name.</param>
+    /// <param name="definition">The SQL definition of the type.</param>
+    public UserDefinedType(SqlConnection connection, string prefix, string definition)
+        : base(connection, "[dbo]." + GenerateLongName(prefix), definition, shouldCreate: true, shouldDrop: true)
+    {
+    }
+
+    protected override void CreateObject(string definition)
+    {
+        using SqlCommand createCommand = new($"CREATE TYPE {Name} AS {definition}", Connection);
+
+        createCommand.ExecuteNonQuery();
+    }
+
+    protected override void DropObject()
+    {
+        using SqlCommand dropCommand = new($"IF (OBJECT_ID('{Name}') IS NOT NULL) DROP TYPE {Name}", Connection);
+
+        dropCommand.ExecuteNonQuery();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
index 7d63e9b98f..1c16e90ac4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
@@ -735,44 +735,28 @@ public async Task TestExecuteReaderAsyncWithLargeQuery(string connectionString)
             int columnsCount = 50;
 
             // Arrange - drops the table with long name and re-creates it with 52 columns (ID, name, ColumnName0..49)
-            try
-            {
-                CreateTable(connectionString, tableName, columnsCount);
-                string name = "nobody";
+            using SqlConnection connection = new SqlConnection(connectionString);
+            await connection.OpenAsync();
 
-                using (SqlConnection connection = new SqlConnection(connectionString))
-                {
-                    await connection.OpenAsync();
-                    // This creates a "select top 100" query that has over 40k characters
-                    using (SqlCommand sqlCommand = new SqlCommand(GenerateSelectQuery(tableName, columnsCount, 10, "WHERE Name = @FirstName AND ID = @CustomerId"),
-                        connection,
-                        transaction: null,
-                        columnEncryptionSetting: SqlCommandColumnEncryptionSetting.Enabled))
-                    {
-                        sqlCommand.Parameters.Add(@"CustomerId", SqlDbType.Int);
-                        sqlCommand.Parameters.Add(@"FirstName", SqlDbType.VarChar, name.Length);
+            using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects.Table wideTable = new(connection, tableName, GenerateBitTableDefinition(columnsCount));
+            string name = "nobody";
 
-                        sqlCommand.Parameters[0].Value = 0;
-                        sqlCommand.Parameters[1].Value = name;
+            // This creates a "select top 100" query that has over 40k characters
+            using SqlCommand sqlCommand = new(GenerateSelectQuery(wideTable.Name, columnsCount, 10, "WHERE Name = @FirstName AND ID = @CustomerId"),
+                connection,
+                transaction: null,
+                columnEncryptionSetting: SqlCommandColumnEncryptionSetting.Enabled);
+            sqlCommand.Parameters.Add(@"CustomerId", SqlDbType.Int);
+            sqlCommand.Parameters.Add(@"FirstName", SqlDbType.VarChar, name.Length);
 
-                        // Act and Assert
-                        // Test that execute reader async does not throw an exception.
-                        // The table is empty so there should be no results; however, the bug previously found is that it causes a TDS RPC exception on enclave.
-                        using (SqlDataReader sqlDataReader = await sqlCommand.ExecuteReaderAsync())
-                        {
-                            Assert.False(sqlDataReader.HasRows, "The table should be empty");
-                        }
-                    }
-                }
-            }
-            catch
-            {
-                throw;
-            }
-            finally
-            {
-                DropTableIfExists(connectionString, tableName);
-            }
+            sqlCommand.Parameters[0].Value = 0;
+            sqlCommand.Parameters[1].Value = name;
+
+            // Act and Assert
+            // Test that execute reader async does not throw an exception.
+            // The table is empty so there should be no results; however, the bug previously found is that it causes a TDS RPC exception on enclave.
+            using SqlDataReader sqlDataReader = await sqlCommand.ExecuteReaderAsync();
+            Assert.False(sqlDataReader.HasRows, "The table should be empty");
         }
 
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsTargetReadyForAeWithKeyStore))]
@@ -3055,30 +3039,15 @@ private void CleanUpTable(string connString, string tableName)
             }
         }
 
-        private static void CreateTable(string connString, string tableName, int columnsCount)
-            => DataTestUtility.RunNonQuery(connString, GenerateCreateQuery(tableName, columnsCount));
-        /// <summary>
-        /// Drops the table if the specified table exists
-        /// </summary>
-        /// <param name="connString">The connection string to the database</param>
-        /// <param name="tableName">The name of the table to be dropped</param>
-        private static void DropTableIfExists(string connString, string tableName)
-        {
-            using var sqlConnection = new SqlConnection(connString);
-            sqlConnection.Open();
-            DataTestUtility.DropTable(sqlConnection, tableName);
-        }
-
         /// <summary>
-        /// Generates the query for creating a table with the number of bit columns specified.
+        /// Generates the definition of a table with the number of bit columns specified.
         /// </summary>
         /// <param name="tableName">The name of the table</param>
         /// <param name="columnsCount">The number of columns for the table</param>
         /// <returns></returns>
-        private static string GenerateCreateQuery(string tableName, int columnsCount)
+        private static string GenerateBitTableDefinition(int columnsCount)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append(string.Format("CREATE TABLE [dbo].[{0}]", tableName));
             builder.Append('(');
             builder.AppendLine("[ID][bigint] NOT NULL,");
             builder.AppendLine("[Name] [varchar] (200) NOT NULL");
@@ -3104,16 +3073,16 @@ private static string GenerateSelectQuery(string tableName, int columnsCount, in
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendLine($"SELECT TOP 100");
-            builder.AppendLine($"[{tableName}].[ID],");
-            builder.AppendLine($"[{tableName}].[Name]");
+            builder.AppendLine($"{tableName}.[ID],");
+            builder.AppendLine($"{tableName}.[Name]");
             for (int i = 0; i < columnsCount; i++)
             {
                 builder.Append(",");
-                builder.AppendLine($"[{tableName}].[ColumnName{i}]");
+                builder.AppendLine($"{tableName}.[ColumnName{i}]");
             }
 
-            string extra = string.IsNullOrEmpty(where) ? $"(NOLOCK) [{tableName}]" : where;
-            builder.AppendLine($"FROM [{tableName}] {extra};");
+            string extra = string.IsNullOrEmpty(where) ? $"(NOLOCK) {tableName}" : where;
+            builder.AppendLine($"FROM {tableName} {extra};");
 
             StringBuilder builder2 = new StringBuilder();
             for (int i = 0; i < repeat; i++)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index 2e652841c9..0145978d72 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -22,6 +22,7 @@
 using System.Threading.Tasks;
 using Azure.Core;
 using Azure.Identity;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Microsoft.Data.SqlClient.TestUtilities;
 using Microsoft.Identity.Client;
 using Xunit;
@@ -645,177 +646,11 @@ public static bool DoesHostAddressContainBothIPv4AndIPv6()
             }
         }
 
-        // Generate a new GUID and return the characters from its 1st and 4th
-        // parts, as shown here:
-        //
-        //   7ff01cb8-88c7-11f0-b433-00155d7e531e
-        //   ^^^^^^^^           ^^^^
-        //
-        // These 12 characters are concatenated together without any
-        // separators.  These 2 parts typically comprise a timestamp and clock
-        // sequence, most likely to be unique for tests that generate names in
-        // quick succession.
-        private static string GetGuidParts()
-        {
-            var guid = Guid.NewGuid().ToString();
-            // GOTCHA: The slice operator is inclusive of the start index and
-            // exclusive of the end index!
-            return guid.Substring(0, 8) + guid.Substring(19, 4);
-        }
-
-        /// <summary>
-        /// Generate a short unique database object name, whose maximum length
-        /// is 30 characters, with the format:
-        ///
-        ///   <Prefix>_<GuidParts>
-        ///
-        /// The Prefix will be truncated to satisfy the overall maximum length.
-        ///
-        /// The GUID parts will be the characters from the 1st and 4th blocks
-        /// from a traditional string representation, as shown here:
-        ///
-        ///   7ff01cb8-88c7-11f0-b433-00155d7e531e
-        ///   ^^^^^^^^           ^^^^
-        ///
-        /// These 2 parts typically comprise a timestamp and clock sequence,
-        /// most likely to be unique for tests that generate names in quick
-        /// succession.  The 12 characters are concatenated together without any
-        /// separators.
-        /// </summary>
-        ///
-        /// <param name="prefix">
-        /// The prefix to use when generating the unique name, truncated to at
-        /// most 18 characters when withBracket is false, and 16 characters when
-        /// withBracket is true.
-        ///
-        /// This should not contain any characters that cannot be used in
-        /// database object names.  See:
-        ///
-        /// https://learn.microsoft.com/en-us/sql/relational-databases/databases/database-identifiers?view=sql-server-ver17#rules-for-regular-identifiers
-        /// </param>
-        ///
-        /// <param name="withBracket">
-        /// When true, the entire generated name will be enclosed in square
-        /// brackets, for example:
-        ///
-        ///   [MyPrefix_7ff01cb811f0]
-        /// </param>
-        ///
-        /// <returns>
-        /// A unique database object name, no more than 30 characters long.
-        /// </returns>
-        public static string GetShortName(string prefix, bool withBracket = true)
-        {
-            StringBuilder name = new(30);
-
-            if (withBracket)
-            {
-                name.Append('[');
-            }
-
-            int maxPrefixLength = withBracket ? 16 : 18;
-            if (prefix.Length > maxPrefixLength)
-            {
-                prefix = prefix.Substring(0, maxPrefixLength);
-            }
-
-            name.Append(prefix);
-            name.Append('_');
-            name.Append(GetGuidParts());
-
-            if (withBracket)
-            {
-                name.Append(']');
-            }
-
-            return name.ToString();
-        }
-
-        /// <summary>
-        /// Generate a long unique database object name, whose maximum length is
-        /// 96 characters, with the format:
-        ///
-        ///   <Prefix>_<GuidParts>_<UserName>_<MachineName>
-        ///
-        /// The Prefix will be truncated to satisfy the overall maximum length.
-        ///
-        /// The GUID Parts will be the characters from the 1st and 4th blocks
-        /// from a traditional string representation, as shown here:
-        ///
-        ///   7ff01cb8-88c7-11f0-b433-00155d7e531e
-        ///   ^^^^^^^^           ^^^^
-        ///
-        /// These 2 parts typically comprise a timestamp and clock sequence,
-        /// most likely to be unique for tests that generate names in quick
-        /// succession.  The 12 characters are concatenated together without any
-        /// separators.
-        ///
-        /// The UserName and MachineName are obtained from the Environment,
-        /// and will be truncated to satisfy the maximum overall length.
-        /// </summary>
-        ///
-        /// <param name="prefix">
-        /// The prefix to use when generating the unique name, truncated to at
-        /// most 32 characters.
-        ///
-        /// This should not contain any characters that cannot be used in
-        /// database object names.  See:
-        ///
-        /// https://learn.microsoft.com/en-us/sql/relational-databases/databases/database-identifiers?view=sql-server-ver17#rules-for-regular-identifiers
-        /// </param>
-        ///
-        /// <param name="withBracket">
-        /// When true, the entire generated name will be enclosed in square
-        /// brackets, for example:
-        ///
-        ///   [MyPrefix_7ff01cb811f0_test_user_ci_agent_machine_name]
-        /// </param>
-        ///
-        /// <returns>
-        /// A unique database object name, no more than 96 characters long.
-        /// </returns>
-        public static string GetLongName(string prefix, bool withBracket = true)
-        {
-            StringBuilder name = new(96);
+        public static string GetShortName(string prefix, bool withBracket = true) =>
+            DatabaseObject.GenerateShortName(prefix, withBracket);
 
-            if (withBracket)
-            {
-                name.Append('[');
-            }
-
-            if (prefix.Length > 32)
-            {
-                prefix = prefix.Substring(0, 32);
-            }
-
-            name.Append(prefix);
-            name.Append('_');
-            name.Append(GetGuidParts());
-            name.Append('_');
-
-            var suffix =
-              Environment.UserName + '_' +
-              Environment.MachineName;
-
-            int maxSuffixLength = 96 - name.Length;
-            if (withBracket)
-            {
-                --maxSuffixLength;
-            }
-            if (suffix.Length > maxSuffixLength)
-            {
-                suffix = suffix.Substring(0, maxSuffixLength);
-            }
-
-            name.Append(suffix);
-
-            if (withBracket)
-            {
-                name.Append(']');
-            }
-
-            return name.ToString();
-        }
+        public static string GetLongName(string prefix, bool withBracket = true) =>
+            DatabaseObject.GenerateLongName(prefix, withBracket);
 
         public static void CreateTable(SqlConnection sqlConnection, string tableName, string createBody)
         {
@@ -848,15 +683,6 @@ public static void DropTable(SqlConnection sqlConnection, string tableName)
             }
         }
 
-        public static void DropUserDefinedType(SqlConnection sqlConnection, string typeName)
-        {
-            ResurrectConnection(sqlConnection);
-            using (SqlCommand cmd = new SqlCommand(string.Format("IF (TYPE_ID('{0}') IS NOT NULL) \n DROP TYPE {0}", typeName), sqlConnection))
-            {
-                cmd.ExecuteNonQuery();
-            }
-        }
-
         public static void DropStoredProcedure(SqlConnection sqlConnection, string spName)
         {
             ResurrectConnection(sqlConnection);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
index eee3b2d515..cbba92153a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -13,6 +13,7 @@
 using Xunit;
 using Xunit.Abstractions;
 using Newtonsoft.Json.Linq;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
@@ -164,15 +165,20 @@ private void DeleteFile(string filename)
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
         public void TestJsonStreaming()
         {
-            GenerateJsonFile(1000, _jsonFile);
-            using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
+            try
             {
+                GenerateJsonFile(1000, _jsonFile);
+                using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
                 connection.Open();
-                var tableName = DataTestUtility.GetLongName("jsonTab");
-                DataTestUtility.CreateTable(connection, tableName, "(data json)");
-                StreamJsonFileToServer(connection, tableName);
-                PrintJsonDataToFile(connection, tableName);
+
+                using Table jsonTable = new(connection, "jsonTab", "(data json)");
+
+                StreamJsonFileToServer(connection, jsonTable.Name);
+                PrintJsonDataToFile(connection, jsonTable.Name);
                 CompareJsonFiles();
+            }
+            finally
+            {
                 DeleteFile(_jsonFile);
                 DeleteFile(_outputFile);
             }
@@ -181,15 +187,20 @@ public void TestJsonStreaming()
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
         public async Task TestJsonStreamingAsync()
         {
-            GenerateJsonFile(1000, _jsonFile);
-            using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
+            try
             {
+                GenerateJsonFile(1000, _jsonFile);
+                using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
                 await connection.OpenAsync();
-                var tableName = DataTestUtility.GetLongName("jsonTab");
-                DataTestUtility.CreateTable(connection, tableName, "(data json)");
-                await StreamJsonFileToServerAsync(connection, tableName);
-                await PrintJsonDataToFileAsync(connection, tableName);
+
+                using Table jsonTable = new(connection, "jsonTab", "(data json)");
+
+                await StreamJsonFileToServerAsync(connection, jsonTable.Name);
+                await PrintJsonDataToFileAsync(connection, jsonTable.Name);
                 CompareJsonFiles();
+            }
+            finally
+            {
                 DeleteFile(_jsonFile);
                 DeleteFile(_outputFile);
             }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
index 516f9d1750..0652251447 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,19 +11,20 @@
 using Xunit.Abstractions;
 using System.Text.Json;
 using Microsoft.Data.SqlTypes;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
     public class JsonTest
     {
+        private const string JsonDataString = "[{\"name\":\"Dave\",\"skills\":[\"Python\"]},{\"name\":\"Ron\",\"surname\":\"Peter\"}]";
+
         private readonly ITestOutputHelper _output;
 
         public JsonTest(ITestOutputHelper output)
         {
             _output = output;
         }
-            
-        private static readonly string JsonDataString = "[{\"name\":\"Dave\",\"skills\":[\"Python\"]},{\"name\":\"Ron\",\"surname\":\"Peter\"}]";
 
         private void ValidateRowsAffected(int rowsAffected)
         {
@@ -76,380 +77,264 @@ private void ValidateNullJson(SqlDataReader reader)
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
         public void TestJsonWrite()
         {
-            string tableName = DataTestUtility.GenerateObjectName();
-            string spName = DataTestUtility.GenerateObjectName();
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
 
-            string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
-            string spCreate = "CREATE PROCEDURE " + spName + " (@jsonData json) AS " + tableInsert;
+            using Table jsonTable = new(connection, nameof(TestJsonWrite), "(data json)");
+            string tableInsert = $"INSERT INTO {jsonTable.Name} VALUES (@jsonData)";
+            using StoredProcedure insertJsonProcedure = new(connection, nameof(TestJsonWrite), $"(@jsonData json) AS {tableInsert}");
 
-            using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
-            {
-                connection.Open();
+            using SqlCommand command = connection.CreateCommand();
 
-                using (SqlCommand command = connection.CreateCommand())
-                {
-                    //Create Table
-                    DataTestUtility.CreateTable(connection, tableName, "(data json)");
-
-                    //Create SP for writing json values
-                    DataTestUtility.DropStoredProcedure(connection, spName);
-                    command.CommandText = spCreate;
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = tableInsert;
-                    var parameter = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json);
-                    command.Parameters.Add(parameter);
-
-                    //Test 1
-                    //Write json value using a parameterized query
-                    parameter.Value = JsonDataString;
-                    int rowsAffected = command.ExecuteNonQuery();
-                    ValidateRowsAffected(rowsAffected);
-
-                    //Test 2 
-                    //Write a SqlString type as json
-                    parameter.Value = new SqlString(JsonDataString);
-                    int rowsAffected2 = command.ExecuteNonQuery();
-                    ValidateRowsAffected(rowsAffected2);
-
-                    //Test 3
-                    //Write json value using SP
-                    using (SqlCommand command2 = connection.CreateCommand())
-                    {
-                        command2.CommandText = spName;
-                        command2.CommandType = CommandType.StoredProcedure;
-                        var parameter2 = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json);
-                        parameter2.Value = JsonDataString;
-                        command2.Parameters.Add(parameter2);
-                        int rowsAffected3 = command2.ExecuteNonQuery();
-                        ValidateRowsAffected(rowsAffected3);
-                    }
-
-                    //Test 4
-                    // Write json value using a parameterized query with SqlJson type
-                    parameter.Value = new SqlJson(JsonDataString);
-                    int rowsAffected4 = command.ExecuteNonQuery();
-                    ValidateRowsAffected(rowsAffected4);
-
-                    DataTestUtility.DropTable(connection, tableName);
-                    DataTestUtility.DropStoredProcedure(connection, spName);
-                }
+            command.CommandText = tableInsert;
+            var parameter = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json);
+            command.Parameters.Add(parameter);
+
+            //Test 1
+            //Write json value using a parameterized query
+            parameter.Value = JsonDataString;
+            int rowsAffected = command.ExecuteNonQuery();
+            ValidateRowsAffected(rowsAffected);
+
+            //Test 2 
+            //Write a SqlString type as json
+            parameter.Value = new SqlString(JsonDataString);
+            int rowsAffected2 = command.ExecuteNonQuery();
+            ValidateRowsAffected(rowsAffected2);
+
+            //Test 3
+            //Write json value using SP
+            using (SqlCommand command2 = connection.CreateCommand())
+            {
+                command2.CommandText = insertJsonProcedure.Name;
+                command2.CommandType = CommandType.StoredProcedure;
+                command2.Parameters.Add(new SqlParameter("@jsonData", SqlDbTypeExtensions.Json) { Value = JsonDataString });
+                int rowsAffected3 = command2.ExecuteNonQuery();
+                ValidateRowsAffected(rowsAffected3);
             }
+
+            //Test 4
+            // Write json value using a parameterized query with SqlJson type
+            parameter.Value = new SqlJson(JsonDataString);
+            int rowsAffected4 = command.ExecuteNonQuery();
+            ValidateRowsAffected(rowsAffected4);
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
         public async Task TestJsonWriteAsync()
         {
-            string tableName = DataTestUtility.GenerateObjectName();
-            string spName = DataTestUtility.GenerateObjectName();
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
 
-            string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
-            string spCreate = "CREATE PROCEDURE " + spName + " (@jsonData json) AS " + tableInsert;
+            using Table jsonTable = new(connection, nameof(TestJsonWriteAsync), "(data json)");
+            string tableInsert = $"INSERT INTO {jsonTable.Name} VALUES (@jsonData)";
+            using StoredProcedure insertJsonProcedure = new(connection, nameof(TestJsonWriteAsync), $"(@jsonData json) AS {tableInsert}");
 
-            using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
-            {
-                await connection.OpenAsync();
+            using SqlCommand command = connection.CreateCommand();
+            command.CommandText = tableInsert;
+            SqlParameter parameter = new("@jsonData", SqlDbTypeExtensions.Json);
+            command.Parameters.Add(parameter);
 
-                using (SqlCommand command = connection.CreateCommand())
-                {
-                    //Create Table
-                    DataTestUtility.CreateTable(connection, tableName, "(data json)");
-
-                    //Create SP for writing json values
-                    DataTestUtility.DropStoredProcedure(connection, spName);
-                    command.CommandText = spCreate;
-                    await command.ExecuteNonQueryAsync();
-
-                    command.CommandText = tableInsert;
-                    var parameter = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json);
-                    command.Parameters.Add(parameter);
-
-                    //Test 1
-                    //Write json value using a parameterized query
-                    parameter.Value = JsonDataString;
-                    int rowsAffected = await command.ExecuteNonQueryAsync();
-                    ValidateRowsAffected(rowsAffected);
-
-                    //Test 2 
-                    //Write a SqlString type as json
-                    parameter.Value = new SqlString(JsonDataString);
-                    int rowsAffected2 = await command.ExecuteNonQueryAsync();
-                    ValidateRowsAffected(rowsAffected2);
-
-                    //Test 3
-                    //Write json value using SP
-                    using (SqlCommand command2 = connection.CreateCommand())
-                    {
-                        command2.CommandText = spName;
-                        command2.CommandType = CommandType.StoredProcedure;
-                        var parameter2 = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json);
-                        parameter2.Value = JsonDataString;
-                        command2.Parameters.Add(parameter2);
-                        int rowsAffected3 = await command.ExecuteNonQueryAsync();
-                        ValidateRowsAffected(rowsAffected3);
-                    }
-
-                    //Test 4
-                    // Write json value using a parameterized query with SqlJson type
-                    parameter.Value = new SqlJson(JsonDataString);
-                    int rowsAffected4 = await command.ExecuteNonQueryAsync();
-                    ValidateRowsAffected(rowsAffected4);
-
-                    DataTestUtility.DropTable(connection, tableName);
-                    DataTestUtility.DropStoredProcedure(connection, spName);
-                }
+            //Test 1
+            //Write json value using a parameterized query
+            parameter.Value = JsonDataString;
+            int rowsAffected = await command.ExecuteNonQueryAsync();
+            ValidateRowsAffected(rowsAffected);
+
+            //Test 2 
+            //Write a SqlString type as json
+            parameter.Value = new SqlString(JsonDataString);
+            int rowsAffected2 = await command.ExecuteNonQueryAsync();
+            ValidateRowsAffected(rowsAffected2);
+
+            //Test 3
+            //Write json value using SP
+            using (SqlCommand command2 = connection.CreateCommand())
+            {
+                command2.CommandText = insertJsonProcedure.Name;
+                command2.CommandType = CommandType.StoredProcedure;
+                command2.Parameters.Add(new SqlParameter("@jsonData", SqlDbTypeExtensions.Json) { Value = JsonDataString });
+                int rowsAffected3 = await command.ExecuteNonQueryAsync();
+                ValidateRowsAffected(rowsAffected3);
             }
+
+            //Test 4
+            // Write json value using a parameterized query with SqlJson type
+            parameter.Value = new SqlJson(JsonDataString);
+            int rowsAffected4 = await command.ExecuteNonQueryAsync();
+            ValidateRowsAffected(rowsAffected4);
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
         public void TestJsonRead()
         {
-            string tableName = DataTestUtility.GenerateObjectName();
-            string spName = DataTestUtility.GenerateObjectName();
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
 
-            string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
-            string tableRead = "SELECT * FROM " + tableName;
-            string spCreate = "CREATE PROCEDURE " + spName + " AS " + tableRead;
+            using Table jsonTable = new(connection, nameof(TestJsonRead), "(data json)");
+            string tableInsert = $"INSERT INTO {jsonTable.Name} VALUES (@jsonData)";
+            string tableRead = $"SELECT * FROM {jsonTable.Name}";
+            using StoredProcedure readJsonProcedure = new(connection, nameof(TestJsonRead), $"AS {tableRead}");
 
-            using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
+            using SqlCommand command = connection.CreateCommand();
+
+            //Insert sample json data
+            //This will be used for reading
+            command.CommandText = tableInsert;
+            command.Parameters.Add(new SqlParameter("@jsonData", SqlDbTypeExtensions.Json) { Value = JsonDataString });
+            command.ExecuteNonQuery();
+
+            //Test 1
+            //Read json value using query
+            command.CommandText = tableRead;
+            using (SqlDataReader reader = command.ExecuteReader())
             {
-                connection.Open();
-                using (SqlCommand command = connection.CreateCommand())
-                {
-                    //Create Table
-                    DataTestUtility.CreateTable(connection, tableName, "(data json)");
-
-                    //Create SP for reading from json column
-                    DataTestUtility.DropStoredProcedure(connection, spName);
-                    command.CommandText = spCreate;
-                    command.ExecuteNonQuery();
-
-                    //Insert sample json data
-                    //This will be used for reading
-                    command.CommandText = tableInsert;
-                    var parameter = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json);
-                    parameter.Value = JsonDataString;
-                    command.Parameters.Add(parameter);
-                    command.ExecuteNonQuery();
-
-                    //Test 1
-                    //Read json value using query
-                    command.CommandText = tableRead;
-                    var reader = command.ExecuteReader();
-                    ValidateRows(reader);
-
-                    //Test 2
-                    //Read the column metadata
-                    ValidateSchema(reader);
-                    reader.Close();
-
-                    //Test 3
-                    //Read json value using SP
-                    using (SqlCommand command2 = connection.CreateCommand())
-                    {
-                        command2.CommandText = spName;
-                        command2.CommandType = CommandType.StoredProcedure;
-                        var reader2 = command2.ExecuteReader();
-                        ValidateRows(reader2);
-                        reader2.Close();
-                    }
-
-                    DataTestUtility.DropTable(connection, tableName);
-                    DataTestUtility.DropStoredProcedure(connection, spName);
-                }
+                ValidateRows(reader);
+
+                //Test 2
+                //Read the column metadata
+                ValidateSchema(reader);
             }
+
+            //Test 3
+            //Read json value using SP
+            using SqlCommand command2 = connection.CreateCommand();
+            command2.CommandText = readJsonProcedure.Name;
+            command2.CommandType = CommandType.StoredProcedure;
+            using SqlDataReader reader2 = command2.ExecuteReader();
+            ValidateRows(reader2);
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
         public async Task TestJsonReadAsync()
         {
-            string tableName = DataTestUtility.GenerateObjectName();
-            string spName = DataTestUtility.GenerateObjectName();
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
 
-            string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
-            string tableRead = "SELECT * FROM " + tableName;
-            string spCreate = "CREATE PROCEDURE " + spName + " AS " + tableRead;
+            using Table jsonTable = new(connection, nameof(TestJsonReadAsync), "(data json)");
+            string tableInsert = $"INSERT INTO {jsonTable.Name} VALUES (@jsonData)";
+            string tableRead = $"SELECT * FROM {jsonTable.Name}";
+            using StoredProcedure readJsonProcedure = new(connection, nameof(TestJsonRead), $"AS {tableRead}");
+
+            using SqlCommand command = connection.CreateCommand();
 
-            using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
+            //Insert sample json data
+            //This will be used for reading
+            command.CommandText = tableInsert;
+            command.Parameters.Add(new SqlParameter("@jsonData", SqlDbTypeExtensions.Json) { Value = JsonDataString });
+            await command.ExecuteNonQueryAsync();
+
+            //Test 1
+            //Read json value using query
+            command.CommandText = tableRead;
+            using (SqlDataReader reader = await command.ExecuteReaderAsync())
             {
-                await connection.OpenAsync();
-                using (SqlCommand command = connection.CreateCommand())
-                {
-                    //Create Table
-                    DataTestUtility.CreateTable(connection, tableName, "(data json)");
-
-                    //Create SP for reading from json column
-                    DataTestUtility.DropStoredProcedure(connection, spName);
-                    command.CommandText = spCreate;
-                    await command.ExecuteNonQueryAsync();
-
-                    //Insert sample json data
-                    //This will be used for reading
-                    command.CommandText = tableInsert;
-                    var parameter = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json);
-                    parameter.Value = JsonDataString;
-                    command.Parameters.Add(parameter);
-                    await command.ExecuteNonQueryAsync();
-
-                    //Test 1
-                    //Read json value using query
-                    command.CommandText = tableRead;
-                    var reader = await command.ExecuteReaderAsync();
-                    await ValidateRowsAsync(reader);
-
-                    //Test 2
-                    //Read the column metadata
-                    ValidateSchema(reader);
-                    reader.Close();
-
-                    //Test 3
-                    //Read json value using SP
-                    using (SqlCommand command2 = connection.CreateCommand())
-                    {
-                        command2.CommandText = spName;
-                        command2.CommandType = CommandType.StoredProcedure;
-                        var reader2 = await command2.ExecuteReaderAsync();
-                        await ValidateRowsAsync(reader2);
-                        reader2.Close();
-                    }
-
-                    DataTestUtility.DropTable(connection, tableName);
-                    DataTestUtility.DropStoredProcedure(connection, spName);
-                }
+                await ValidateRowsAsync(reader);
+
+                //Test 2
+                //Read the column metadata
+                ValidateSchema(reader);
             }
+
+            //Test 3
+            //Read json value using SP
+            using SqlCommand command2 = connection.CreateCommand();
+            command2.CommandText = readJsonProcedure.Name;
+            command2.CommandType = CommandType.StoredProcedure;
+            using SqlDataReader reader2 = await command2.ExecuteReaderAsync();
+            await ValidateRowsAsync(reader2);
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
         public void TestNullJson()
         {
-            string tableName = DataTestUtility.GenerateObjectName();
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
 
-            string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
-            string tableRead = "SELECT * FROM " + tableName;
+            using Table jsonTable = new(connection, nameof(TestNullJson), "(data json)");
+            string tableInsert = $"INSERT INTO {jsonTable.Name} VALUES (@jsonData)";
+            string tableRead = $"SELECT * FROM {jsonTable.Name}";
 
-            using SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString);
-            connection.Open();
             using SqlCommand command = connection.CreateCommand();
 
-            //Create Table
-            DataTestUtility.CreateTable(connection, tableName, "(Data json)");
-
             //Insert Null value
             command.CommandText = tableInsert;
-            var parameter = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json);
-            parameter.Value = DBNull.Value;
-            command.Parameters.Add(parameter);
+            command.Parameters.Add(new SqlParameter("@jsonData", SqlDbTypeExtensions.Json) { Value = DBNull.Value });
             command.ExecuteNonQuery();
 
             //Query the table
             command.CommandText = tableRead;
-            var reader = command.ExecuteReader();
+            using SqlDataReader reader = command.ExecuteReader();
             ValidateNullJson(reader);
-
-            reader.Close();
-            DataTestUtility.DropTable(connection, tableName);
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
         public void TestJsonAPIs()
         {
-            string tableName = DataTestUtility.GenerateObjectName();
-            string tableInsert = "INSERT INTO " + tableName + " VALUES (@jsonData)";
-            string tableRead = "SELECT * FROM " + tableName;
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
 
-            using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
+            using Table jsonTable = new(connection, nameof(TestJsonAPIs), "(data json)");
+            string tableInsert = $"INSERT INTO {jsonTable.Name} VALUES (@jsonData)";
+            string tableRead = $"SELECT * FROM {jsonTable.Name}";
+
+            using SqlCommand command = connection.CreateCommand();
+            //Insert
+            command.CommandText = tableInsert;
+            command.Parameters.Add(new SqlParameter("@jsonData", SqlDbTypeExtensions.Json) { Value = JsonDataString });
+            command.ExecuteNonQuery();
+
+            // Query the table
+            command.CommandText = tableRead;
+            using SqlDataReader reader = command.ExecuteReader();
+            while (reader.Read())
             {
-                connection.Open();
-                using (SqlCommand command = connection.CreateCommand())
-                {
-                    try
-                    {
-                        // Create Table
-                        DataTestUtility.CreateTable(connection, tableName, "(Data json)");
-
-                        //Insert
-                        command.CommandText = tableInsert;
-                        var parameter = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json);
-                        parameter.Value = JsonDataString;
-                        command.Parameters.Add(parameter);
-                        command.ExecuteNonQuery();
-
-                        // Query the table
-                        command.CommandText = tableRead;
-                        using (var reader = command.ExecuteReader())
-                        {
-                            while (reader.Read())
-                            {
-                                string data = reader.GetFieldValue<string>(0);
-                                Assert.Equal(JsonDataString, data);
-                                JsonDocument jsonDocument = reader.GetFieldValue<JsonDocument>(0);
-                                Assert.Equal(JsonDataString, jsonDocument.RootElement.ToString());
-                                Assert.Equal("json", reader.GetDataTypeName(0));
-                                Assert.Equal("System.String", reader.GetFieldType(0).ToString());
-                                Assert.Equal(JsonDataString, reader.GetSqlJson(0).Value);
-                            }
-                        }
-                    }
-                    finally
-                    {
-                        DataTestUtility.DropTable(connection, tableName);
-                    }
-                }
+                string data = reader.GetFieldValue<string>(0);
+                Assert.Equal(JsonDataString, data);
+                JsonDocument jsonDocument = reader.GetFieldValue<JsonDocument>(0);
+                Assert.Equal(JsonDataString, jsonDocument.RootElement.ToString());
+                Assert.Equal("json", reader.GetDataTypeName(0));
+                Assert.Equal("System.String", reader.GetFieldType(0).ToString());
+                Assert.Equal(JsonDataString, reader.GetSqlJson(0).Value);
             }
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
         public void TestJsonWithMARS()
         {
-            string table1Name = DataTestUtility.GenerateObjectName();
-            string table2Name = DataTestUtility.GenerateObjectName();
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString + "MultipleActiveResultSets=True;");
+            connection.Open();
+
+            using Table jsonTable1 = new(connection, nameof(TestJsonWithMARS), "(Data json)");
+            using Table jsonTable2 = new(connection, nameof(TestJsonWithMARS), "(Id int, Data json)");
 
-            using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString + "MultipleActiveResultSets=True;"))
+            // Insert Data
+            string table1Insert = $"INSERT INTO {jsonTable1.Name} VALUES ('{JsonDataString}')";
+            string table2Insert = $"INSERT INTO {jsonTable2.Name} VALUES (1,'{JsonDataString}')";
+            using (SqlCommand command = connection.CreateCommand())
             {
-                connection.Open();
-                try
+                command.CommandText = table1Insert;
+                command.ExecuteNonQuery();
+                command.CommandText = table2Insert;
+                command.ExecuteNonQuery();
+            }
+
+            // Read Data
+            using SqlCommand command1 = new($"select * from {jsonTable1.Name}", connection);
+            using SqlCommand command2 = new($"select * from {jsonTable2.Name}", connection);
+
+            using (SqlDataReader reader1 = command1.ExecuteReader())
+            {
+                while (reader1.Read())
                 {
-                    // Create Table
-                    DataTestUtility.CreateTable(connection, table1Name, "(Data json)");
-                    DataTestUtility.CreateTable(connection, table2Name, "(Id int, Data json)");
-
-                    // Insert Data
-                    string table1Insert = "INSERT INTO " + table1Name + " VALUES ('" + JsonDataString + "')";
-                    string table2Insert = "INSERT INTO " + table2Name + " VALUES (1,'" + JsonDataString + "')";
-                    using (SqlCommand command = connection.CreateCommand())
-                    {
-                        command.CommandText = table1Insert;
-                        command.ExecuteNonQuery();
-                        command.CommandText = table2Insert;
-                        command.ExecuteNonQuery();
-                    }
-
-                    // Read Data
-                    using (SqlCommand command1 = new SqlCommand("select * from " + table1Name, connection))
-                    using (SqlCommand command2 = new SqlCommand("select * from " + table2Name, connection))
-                    {
-                        using (SqlDataReader reader1 = command1.ExecuteReader())
-                        {
-                            while (reader1.Read())
-                            {
-                                Assert.Equal(JsonDataString, reader1["data"]);
-                            }
-
-                            using (SqlDataReader reader2 = command2.ExecuteReader())
-                            {
-                                while (reader2.Read())
-                                {
-                                    Assert.Equal(1, reader2["Id"]);
-                                    Assert.Equal(JsonDataString, reader2["data"]);
-                                }
-                            }
-                        }
-                    }
+                    Assert.Equal(JsonDataString, reader1["data"]);
                 }
-                finally
+
+                using SqlDataReader reader2 = command2.ExecuteReader();
+                while (reader2.Read())
                 {
-                    DataTestUtility.DropTable(connection, table1Name);
-                    DataTestUtility.DropTable(connection, table2Name);
+                    Assert.Equal(1, reader2["Id"]);
+                    Assert.Equal(JsonDataString, reader2["data"]);
                 }
             }
         }
@@ -457,53 +342,34 @@ public void TestJsonWithMARS()
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
         public void TestJsonSPParams()
         {
-            string tableName = DataTestUtility.GenerateObjectName();
-            string procName = DataTestUtility.GenerateObjectName();
-            string tableInsert = $"INSERT INTO {tableName} VALUES (@id, @jsonData)";
-            string tableRead = $"SELECT * FROM {tableName}";
-
-            using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
-            {
-                connection.Open();
-                try
-                {
-                    // Create Table
-                    DataTestUtility.CreateTable(connection, tableName, "(Id int, Data json)");
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
 
-                    // Create Stored Procedure
-                    string createSP = $@"
+            using Table jsonTable = new(connection, nameof(TestJsonSPParams), "(Id int, Data json)");
+            using StoredProcedure readJsonProcedure = new(connection, nameof(TestJsonRead), $@"
                 @id int,
                 @jsonData json OUTPUT
                 AS
                 BEGIN
-                    SELECT @jsonData = (SELECT Data FROM {tableName} WHERE Id = @id)
-                END;";
-                    DataTestUtility.CreateSP(connection, procName, createSP);
-
-                    // Insert Data
-                    using (SqlCommand command = new SqlCommand(tableInsert, connection))
-                    {
-                        command.Parameters.Add(new SqlParameter("@id", SqlDbType.Int) { Value = 1 });
-                        command.Parameters.Add(new SqlParameter("@jsonData", SqlDbTypeExtensions.Json) { Value = JsonDataString });
-                        command.ExecuteNonQuery();
-                    }
-
-                    // Execute Stored Procedure
-                    using (SqlCommand spCommand = new SqlCommand(procName, connection))
-                    {
-                        spCommand.CommandType = CommandType.StoredProcedure;
-                        spCommand.Parameters.Add(new SqlParameter("@id", SqlDbType.Int) { Direction = ParameterDirection.Input, Value = 1 });
-                        SqlParameter outputParam = new SqlParameter("@jsonData", SqlDbTypeExtensions.Json) { Direction = ParameterDirection.Output };
-                        spCommand.Parameters.Add(outputParam);
-                        spCommand.ExecuteNonQuery();
-                        Assert.Equal(JsonDataString, (string)outputParam.Value);
-                    }
-                }
-                finally
-                {
-                    DataTestUtility.DropTable(connection, tableName);
-                }
-            }
+                    SELECT @jsonData = (SELECT Data FROM {jsonTable.Name} WHERE Id = @id)
+                END;");
+            string tableInsert = $"INSERT INTO {jsonTable.Name} VALUES (@id, @jsonData)";
+
+            // Insert Data
+            using SqlCommand command = new(tableInsert, connection);
+            command.Parameters.Add(new SqlParameter("@id", SqlDbType.Int) { Value = 1 });
+            command.Parameters.Add(new SqlParameter("@jsonData", SqlDbTypeExtensions.Json) { Value = JsonDataString });
+            command.ExecuteNonQuery();
+
+            // Execute Stored Procedure
+            using SqlCommand spCommand = new(readJsonProcedure.Name, connection);
+
+            spCommand.CommandType = CommandType.StoredProcedure;
+            spCommand.Parameters.Add(new SqlParameter("@id", SqlDbType.Int) { Direction = ParameterDirection.Input, Value = 1 });
+            SqlParameter outputParam = new("@jsonData", SqlDbTypeExtensions.Json) { Direction = ParameterDirection.Output };
+            spCommand.Parameters.Add(outputParam);
+            spCommand.ExecuteNonQuery();
+            Assert.Equal(JsonDataString, (string)outputParam.Value);
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
index d53209e912..782ef68ca8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
@@ -12,6 +12,8 @@
 using Xunit;
 using System.Globalization;
 using Microsoft.Data.SqlClient.Tests.Common;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
 
 
 #if !NETFRAMEWORK
@@ -120,49 +122,32 @@ public static void CodeCoverageSqlClient()
         public static void Test_Copy_SqlParameter()
         {
             using var conn = new SqlConnection(s_connString);
-            string cTableName = DataTestUtility.GetLongName("#tmp");
-            try
-            {
-                // Create tmp table
-                var sCreateTable = "IF NOT EXISTS(";
-                sCreateTable += $"SELECT * FROM sysobjects WHERE name= '{ cTableName }' and xtype = 'U')";
-                sCreateTable += $"CREATE TABLE { cTableName }( BinValue binary(16)  null)";
+            conn.Open();
 
-                conn.Open();
-                var cmd = new SqlCommand(sCreateTable, conn);
-                cmd.ExecuteNonQuery();
+            using Table binTable = new(conn, "#tmp", "(BinValue binary(16) null)");
 
-                var dt = new DataTable("SourceDataTable");
-                dt.Columns.Add("SourceBinValue", typeof(byte[]));
+            using var dt = new DataTable("SourceDataTable");
+            dt.Columns.Add("SourceBinValue", typeof(byte[]));
 
-                dt.Rows.Add(Guid.NewGuid().ToByteArray());
-                dt.Rows.Add(DBNull.Value);
+            dt.Rows.Add(Guid.NewGuid().ToByteArray());
+            dt.Rows.Add(DBNull.Value);
 
-                var cmdInsert = new SqlCommand
-                {
-                    UpdatedRowSource = UpdateRowSource.None,
-                    Connection = conn,
+            using var cmdInsert = new SqlCommand
+            {
+                UpdatedRowSource = UpdateRowSource.None,
+                Connection = conn,
 
-                    CommandText = $"INSERT { cTableName } (BinValue) "
-                };
-                cmdInsert.CommandText += "Values(@BinValue)";
-                cmdInsert.Parameters.Add("@BinValue", SqlDbType.Binary, 16, "SourceBinValue");
+                CommandText = $"INSERT {binTable.Name} (BinValue) VALUES (@BinValue)"
+            };
+            cmdInsert.Parameters.Add("@BinValue", SqlDbType.Binary, 16, "SourceBinValue");
 
-                var da = new SqlDataAdapter
-                {
-                    InsertCommand = cmdInsert,
-                    UpdateBatchSize = 2,
-                    AcceptChangesDuringUpdate = false
-                };
-                da.Update(dt);
-            }
-            finally
+            using var da = new SqlDataAdapter
             {
-                // End of test, cleanup tmp table;
-                var sDropTable = $"DROP TABLE IF EXISTS {cTableName}";
-                using SqlCommand cmd = new(sDropTable, conn);
-                cmd.ExecuteNonQuery();
-            }
+                InsertCommand = cmdInsert,
+                UpdateBatchSize = 2,
+                AcceptChangesDuringUpdate = false
+            };
+            da.Update(dt);
         }
 
         // TODO Synapse: Remove dependency on Northwind database
@@ -170,8 +155,8 @@ public static void Test_Copy_SqlParameter()
         public static void Test_SqlParameter_Constructor()
         {
             using var conn = new SqlConnection(s_connString);
-            var dataTable = new DataTable();
-            var adapter = new SqlDataAdapter
+            using var dataTable = new DataTable();
+            using var adapter = new SqlDataAdapter
             {
                 SelectCommand = new SqlCommand("SELECT CustomerID, ContactTitle FROM dbo.Customers WHERE ContactTitle = @ContactTitle", conn)
             };
@@ -202,7 +187,7 @@ public static void Test_WithEnumValue_ShouldInferToUnderlyingType()
         {
             using var conn = new SqlConnection(s_connString);
             conn.Open();
-            var cmd = new SqlCommand("select @input", conn);
+            using var cmd = new SqlCommand("select @input", conn);
             cmd.Parameters.AddWithValue("@input", MyEnum.B);
             object value = cmd.ExecuteScalar();
             Assert.Equal(MyEnum.B, (MyEnum)value);
@@ -213,7 +198,7 @@ public static void Test_WithOutputEnumParameter_ShouldReturnEnum()
         {
             using var conn = new SqlConnection(s_connString);
             conn.Open();
-            var cmd = new SqlCommand("set @output = @input", conn);
+            using var cmd = new SqlCommand("set @output = @input", conn);
             cmd.Parameters.AddWithValue("@input", MyEnum.B);
             SqlParameter outputParam = cmd.CreateParameter();
             outputParam.ParameterName = "@output";
@@ -229,7 +214,7 @@ public static void Test_WithDecimalValue_ShouldReturnDecimal()
         {
             using var conn = new SqlConnection(s_connString);
             conn.Open();
-            var cmd = new SqlCommand("select @foo", conn);
+            using var cmd = new SqlCommand("select @foo", conn);
             cmd.Parameters.AddWithValue("@foo", new SqlDecimal(0.5));
             var result = (decimal)cmd.ExecuteScalar();
             Assert.Equal((decimal)0.5, result);
@@ -242,7 +227,7 @@ public static void Test_WithGuidValue_ShouldReturnGuid()
             using var conn = new SqlConnection(s_connString);
             conn.Open();
             var expectedGuid = Guid.NewGuid();
-            var cmd = new SqlCommand("select @input", conn);
+            using var cmd = new SqlCommand("select @input", conn);
             cmd.Parameters.AddWithValue("@input", expectedGuid);
 
             var result = cmd.ExecuteScalar();
@@ -262,67 +247,41 @@ public static void Test_WithGuidValue_ShouldReturnGuid()
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void TestParametersWithDatatablesTVPInsert()
         {
-            SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString);
             int x = 4, y = 5;
 
-            DataTable table = new()
+            using DataTable table = new()
             {
                 Columns = { { "x", typeof(int) }, { "y", typeof(int) } },
                 Rows = { { x, y } }
             };
 
-            using SqlConnection connection = new(builder.ConnectionString);
-            string tableName = DataTestUtility.GetLongName("Table");
-            string procName = DataTestUtility.GetLongName("Proc");
-            string typeName = DataTestUtility.GetShortName("Type");
-            try
-            {
-                connection.Open();
-                using (SqlCommand cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = $"CREATE TYPE {typeName} AS TABLE (x INT, y INT)";
-                    cmd.ExecuteNonQuery();
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
 
-                    cmd.CommandText = $"CREATE TABLE {tableName} (x INT, y INT)";
-                    cmd.ExecuteNonQuery();
+            using UserDefinedType udtCoordPair = new(connection, "Type", "TABLE (x INT, y INT)");
+            using Table tableCoordPair = new(connection, "Table", "(x INT, y INT)");
+            using StoredProcedure spInsertCoordPair = new(connection, "Proc", $"@TVP {udtCoordPair.Name} READONLY AS " +
+                $"SET NOCOUNT ON INSERT INTO {tableCoordPair.Name}(x, y) SELECT * FROM @TVP");
 
-                    cmd.CommandText = $"CREATE PROCEDURE {procName} @TVP {typeName} READONLY AS " +
-                        $"SET NOCOUNT ON INSERT INTO {tableName}(x, y) SELECT * FROM  @TVP";
-                    cmd.ExecuteNonQuery();
+            using SqlCommand cmd = connection.CreateCommand();
+            // Update Data Using TVPs
+            cmd.CommandText = spInsertCoordPair.Name;
+            cmd.CommandType = CommandType.StoredProcedure;
 
-                }
-                using (SqlCommand cmd = connection.CreateCommand())
-                {
-                    // Update Data Using TVPs
-                    cmd.CommandText = procName;
-                    cmd.CommandType = CommandType.StoredProcedure;
-
-                    SqlParameter parameter = cmd.Parameters.AddWithValue("@TVP", table);
-                    parameter.TypeName = typeName;
+            SqlParameter parameter = cmd.Parameters.AddWithValue("@TVP", table);
+            parameter.TypeName = udtCoordPair.Name;
 
-                    cmd.ExecuteNonQuery();
+            cmd.ExecuteNonQuery();
 
-                    // Verify if the data was updated
-                    cmd.CommandText = "select * from " + tableName;
-                    cmd.CommandType = CommandType.Text;
-                    using SqlDataReader reader = cmd.ExecuteReader();
-                    DataTable dbData = new();
-                    dbData.Load(reader);
-                    Assert.Equal(1, dbData.Rows.Count);
-                    Assert.Equal(x, dbData.Rows[0][0]);
-                    Assert.Equal(y, dbData.Rows[0][1]);
-                }
-            }
-            finally
-            {
-                using SqlCommand cmd = connection.CreateCommand();
-                cmd.CommandText = "DROP PROCEDURE " + procName;
-                cmd.ExecuteNonQuery();
-                cmd.CommandText = "DROP TABLE " + tableName;
-                cmd.ExecuteNonQuery();
-                cmd.CommandText = "DROP TYPE " + typeName;
-                cmd.ExecuteNonQuery();
-            }
+            // Verify if the data was updated
+            cmd.CommandText = $"select * from {tableCoordPair.Name}";
+            cmd.CommandType = CommandType.Text;
+            using SqlDataReader reader = cmd.ExecuteReader();
+            using DataTable dbData = new();
+            dbData.Load(reader);
+            Assert.Equal(1, dbData.Rows.Count);
+            Assert.Equal(x, dbData.Rows[0][0]);
+            Assert.Equal(y, dbData.Rows[0][1]);
         }
 
 #if !NETFRAMEWORK
@@ -331,8 +290,6 @@ public static void TestParametersWithDatatablesTVPInsert()
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void TestParametersWithSqlRecordsTVPInsert()
         {
-            SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString);
-
             SqlGeography geog = SqlGeography.Point(43, -81, 4326);
 
             SqlMetaData[] metadata = new SqlMetaData[]
@@ -353,181 +310,127 @@ public static void TestParametersWithSqlRecordsTVPInsert()
                 record2,
             };
 
-            using SqlConnection connection = new(builder.ConnectionString);
-            string procName = DataTestUtility.GetLongName("Proc");
-            string typeName = DataTestUtility.GetShortName("Type");
-            try
-            {
-                connection.Open();
-
-                using (SqlCommand cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = $"CREATE TYPE {typeName} AS TABLE([Id] [uniqueidentifier] NULL, [geom] [geography] NULL)";
-                    cmd.ExecuteNonQuery();
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
 
-                    cmd.CommandText = @$"CREATE PROCEDURE {procName}
-                        @newRoads as {typeName} READONLY
-                        AS
-                        BEGIN
-                         SELECT* FROM @newRoads
-                        END";
-                    cmd.ExecuteNonQuery();
+            using UserDefinedType udtGeographyTable = new(connection, "Type", "TABLE ([Id] [uniqueidentifier] NULL, [geom] [geography] NULL)");
+            using StoredProcedure spSelectFromTvp = new(connection, "Proc", $"@newRoads as {udtGeographyTable.Name} READONLY AS SELECT * FROM @newRoads");
 
-                }
-                using (SqlCommand cmd = connection.CreateCommand())
-                {
-                    // Update Data Using TVPs
-                    cmd.CommandText = procName;
-                    cmd.CommandType = CommandType.StoredProcedure;
+            using SqlCommand cmd = connection.CreateCommand();
 
-                    SqlParameter param = new SqlParameter("@newRoads", SqlDbType.Structured);
-                    param.Value = featureInserts;
-                    param.TypeName = typeName;
+            // Update Data Using TVPs
+            cmd.CommandText = spSelectFromTvp.Name;
+            cmd.CommandType = CommandType.StoredProcedure;
 
-                    cmd.Parameters.Add(param);
+            SqlParameter param = new SqlParameter("@newRoads", SqlDbType.Structured);
+            param.Value = featureInserts;
+            param.TypeName = udtGeographyTable.Name;
 
-                    using var reader = cmd.ExecuteReader();
+            cmd.Parameters.Add(param);
 
-                    Assert.True(reader.HasRows);
+            using var reader = cmd.ExecuteReader();
 
-                    int count = 0;
-                    while (reader.Read())
-                    {
-                        Assert.NotNull(reader[0]);
-                        Assert.NotNull(reader[1]);
-                        count++;
-                    }
+            Assert.True(reader.HasRows);
 
-                    Assert.Equal(2, count);
-                }
-            }
-            finally
+            int count = 0;
+            while (reader.Read())
             {
-                using SqlCommand cmd = connection.CreateCommand();
-                cmd.CommandText = "DROP PROCEDURE " + procName;
-                cmd.ExecuteNonQuery();
-                cmd.CommandText = "DROP TYPE " + typeName;
-                cmd.ExecuteNonQuery();
+                Assert.NotNull(reader[0]);
+                Assert.NotNull(reader[1]);
+                count++;
             }
+
+            Assert.Equal(2, count);
         }
 
         [Trait("Category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void TestDateOnlyTVPDataTable_CommandSP()
         {
-            string tableTypeName = "[dbo]." + DataTestUtility.GetLongName("UDTTTestDateOnlyTVP");
-            string spName = DataTestUtility.GetLongName("spTestDateOnlyTVP");
-            SqlConnection connection = new(s_connString);
-            try
-            {
-                connection.Open();
-                using (SqlCommand cmd = connection.CreateCommand())
-                {
-                    cmd.CommandType = CommandType.Text;
-                    cmd.CommandText = $"CREATE TYPE {tableTypeName} AS TABLE ([DateColumn] date NULL, [TimeColumn] time NULL)";
-                    cmd.ExecuteNonQuery();
-                    cmd.CommandText = $"CREATE PROCEDURE {spName} (@dates {tableTypeName} READONLY) AS SELECT COUNT(*) FROM @dates";
-                    cmd.ExecuteNonQuery();
-                }
-                using (SqlCommand cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = spName;
-                    cmd.CommandType = CommandType.StoredProcedure;
-
-                    DataTable dtTest = new();
-                    dtTest.Columns.Add(new DataColumn("DateColumn", typeof(DateOnly)));
-                    dtTest.Columns.Add(new DataColumn("TimeColumn", typeof(TimeOnly)));
-                    var dataRow = dtTest.NewRow();
-                    dataRow["DateColumn"] = new DateOnly(2023, 11, 15);
-                    dataRow["TimeColumn"] = new TimeOnly(12, 30, 45);
-                    dtTest.Rows.Add(dataRow);
-
-                    cmd.Parameters.Add(new SqlParameter
-                    {
-                        ParameterName = "@dates",
-                        SqlDbType = SqlDbType.Structured,
-                        TypeName = tableTypeName,
-                        Value = dtTest,
-                    });
+            using SqlConnection connection = new(s_connString);
 
-                    cmd.ExecuteNonQuery();
-                }
-            }
-            finally
+            connection.Open();
+
+            using UserDefinedType udtTableType = new(connection, "UDTTTestDateOnlyTVP", "TABLE ([DateColumn] date NULL, [TimeColumn] time NULL)");
+            using StoredProcedure storedProcedure = new(connection, "spTestDateOnlyTVP", $"(@dates {udtTableType.Name} READONLY) AS SELECT COUNT(*) FROM @dates");
+            using SqlCommand cmd = connection.CreateCommand();
+
+            cmd.CommandText = storedProcedure.Name;
+            cmd.CommandType = CommandType.StoredProcedure;
+
+            DataTable dtTest = new();
+            dtTest.Columns.Add(new DataColumn("DateColumn", typeof(DateOnly)));
+            dtTest.Columns.Add(new DataColumn("TimeColumn", typeof(TimeOnly)));
+
+            DataRow dataRow = dtTest.NewRow();
+            dataRow["DateColumn"] = new DateOnly(2023, 11, 15);
+            dataRow["TimeColumn"] = new TimeOnly(12, 30, 45);
+            dtTest.Rows.Add(dataRow);
+
+            cmd.Parameters.Add(new SqlParameter
             {
-                DataTestUtility.DropStoredProcedure(connection, spName);
-                DataTestUtility.DropUserDefinedType(connection, tableTypeName);
-            }
+                ParameterName = "@dates",
+                SqlDbType = SqlDbType.Structured,
+                TypeName = udtTableType.Name,
+                Value = dtTest,
+            });
+
+            cmd.ExecuteNonQuery();
         }
 
         [Trait("Category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void TestDateOnlyTVPSqlDataRecord_CommandSP()
         {
-            string tableTypeName = "[dbo]." + DataTestUtility.GetLongName("UDTTTestDateOnlySqlDataRecordTVP");
-            string spName = DataTestUtility.GetLongName("spTestDateOnlySqlDataRecordTVP");
-            SqlConnection connection = new(s_connString);
-            try
-            {
-                connection.Open();
-                using (SqlCommand cmd = connection.CreateCommand())
-                {
-                    cmd.CommandType = CommandType.Text;
-                    cmd.CommandText = $"CREATE TYPE {tableTypeName} AS TABLE ([DateColumn] date NULL, [TimeColumn] time NULL)";
-                    cmd.ExecuteNonQuery();
-                    cmd.CommandText = $"CREATE PROCEDURE {spName} (@dates {tableTypeName} READONLY) AS SELECT COUNT(*) FROM @dates";
-                    cmd.ExecuteNonQuery();
-                }
-                using (SqlCommand cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = spName;
-                    cmd.CommandType = CommandType.StoredProcedure;
+            using SqlConnection connection = new(s_connString);
 
-                    SqlMetaData[] metadata = new SqlMetaData[]
-                    {
-                        new SqlMetaData("DateColumn", SqlDbType.Date),
-                        new SqlMetaData("TimeColumn", SqlDbType.Time)
-                    };
+            connection.Open();
 
-                    SqlDataRecord record1 = new SqlDataRecord(metadata);
-                    record1.SetValues(new DateOnly(2023, 11, 15), new TimeOnly(12, 30, 45));
+            using UserDefinedType udtTableType = new(connection, "UDTTTestDateOnlySqlDataRecordTVP", "TABLE ([DateColumn] date NULL, [TimeColumn] time NULL)");
+            using StoredProcedure storedProcedure = new(connection, "spTestDateOnlySqlDataRecordTVP", $"(@dates {udtTableType.Name} READONLY) AS SELECT COUNT(*) FROM @dates");
+            using SqlCommand cmd = connection.CreateCommand();
 
-                    SqlDataRecord record2 = new SqlDataRecord(metadata);
-                    record2.SetValues(new DateOnly(2025, 11, 15), new TimeOnly(13, 31, 46));
+            cmd.CommandText = storedProcedure.Name;
+            cmd.CommandType = CommandType.StoredProcedure;
 
-                    IList<SqlDataRecord> featureInserts = new List<SqlDataRecord>
+            SqlMetaData[] metadata = new SqlMetaData[]
+            {
+                    new SqlMetaData("DateColumn", SqlDbType.Date),
+                    new SqlMetaData("TimeColumn", SqlDbType.Time)
+            };
+
+            SqlDataRecord record1 = new SqlDataRecord(metadata);
+            record1.SetValues(new DateOnly(2023, 11, 15), new TimeOnly(12, 30, 45));
+
+            SqlDataRecord record2 = new SqlDataRecord(metadata);
+            record2.SetValues(new DateOnly(2025, 11, 15), new TimeOnly(13, 31, 46));
+
+            IList<SqlDataRecord> featureInserts = new List<SqlDataRecord>
                     {
                         record1,
                         record2,
                     };
 
-                    cmd.Parameters.Add(new SqlParameter
-                    {
-                        ParameterName = "@dates",
-                        SqlDbType = SqlDbType.Structured,
-                        TypeName = tableTypeName,
-                        Value = featureInserts,
-                    });
+            cmd.Parameters.Add(new SqlParameter
+            {
+                ParameterName = "@dates",
+                SqlDbType = SqlDbType.Structured,
+                TypeName = udtTableType.Name,
+                Value = featureInserts,
+            });
 
-                    using var reader = cmd.ExecuteReader();
+            using var reader = cmd.ExecuteReader();
 
-                    Assert.True(reader.HasRows);
+            Assert.True(reader.HasRows);
 
-                    int count = 0;
-                    while (reader.Read())
-                    {
-                        Assert.NotNull(reader[0]);
-                        count++;
-                    }
-
-                    Assert.Equal(1, count);
-                }
-            }
-            finally
+            int count = 0;
+            while (reader.Read())
             {
-                DataTestUtility.DropStoredProcedure(connection, spName);
-                DataTestUtility.DropUserDefinedType(connection, tableTypeName);
+                Assert.NotNull(reader[0]);
+                count++;
             }
+
+            Assert.Equal(1, count);
         }
 #endif
 
@@ -587,33 +490,29 @@ public static void TestScaledDecimalParameter_CommandInsert(string connectionStr
         {
             using LocalAppContextSwitchesHelper appContextSwitchesHelper = new();
 
-            string tableName = DataTestUtility.GetLongName("TestDecimalParameterCMD");
-            using SqlConnection connection = InitialDatabaseTable(connectionString, tableName);
-            try
+            using SqlConnection connection = new(connectionString);
+            connection.Open();
+
+            using Table decimalTable = new(connection, "TestDecimalParameterCMD", "(Id INT, Value Decimal(38, 2))");
+
+            using (SqlCommand cmd = connection.CreateCommand())
             {
-                using (SqlCommand cmd = connection.CreateCommand())
-                {
-                    appContextSwitchesHelper.TruncateScaledDecimal = truncateScaledDecimal;
+                appContextSwitchesHelper.TruncateScaledDecimal = truncateScaledDecimal;
 
-                    var p = new SqlParameter("@Value", null)
-                    {
-                        Precision = 18,
-                        Scale = 2
-                    };
-                    cmd.Parameters.Add(p);
-                    for (int i = 0; i < s_testValues.Length; i++)
-                    {
-                        p.Value = s_testValues[i];
-                        cmd.CommandText = $"INSERT INTO {tableName} (Id, [Value]) VALUES({i}, @Value)";
-                        cmd.ExecuteNonQuery();
-                    }
+                var p = new SqlParameter("@Value", null)
+                {
+                    Precision = 18,
+                    Scale = 2
+                };
+                cmd.Parameters.Add(p);
+                for (int i = 0; i < s_testValues.Length; i++)
+                {
+                    p.Value = s_testValues[i];
+                    cmd.CommandText = $"INSERT INTO {decimalTable.Name} (Id, [Value]) VALUES({i}, @Value)";
+                    cmd.ExecuteNonQuery();
                 }
-                Assert.True(ValidateInsertedValues(connection, tableName, truncateScaledDecimal), $"Invalid test happened with connection string [{connection.ConnectionString}]");
-            }
-            finally
-            {
-                DataTestUtility.DropTable(connection, tableName);
             }
+            Assert.True(ValidateInsertedValues(connection, decimalTable.Name, truncateScaledDecimal), $"Invalid test happened with connection string [{connection.ConnectionString}]");
         }
 
         [Theory]
@@ -622,33 +521,29 @@ public static void TestScaledDecimalParameter_BulkCopy(string connectionString,
         {
             using LocalAppContextSwitchesHelper appContextSwitchesHelper = new();
 
-            string tableName = DataTestUtility.GetLongName("TestDecimalParameterBC");
-            using SqlConnection connection = InitialDatabaseTable(connectionString, tableName);
-            try
+            using SqlConnection connection = new(connectionString);
+            connection.Open();
+
+            using Table decimalTable = new(connection, "TestDecimalParameterCMD", "(Id INT, Value Decimal(38, 2))");
+
+            using (SqlBulkCopy bulkCopy = new(connection))
             {
-                using (SqlBulkCopy bulkCopy = new(connection))
+                using DataTable table = new(decimalTable.Name);
+                table.Columns.Add("Id", typeof(int));
+                table.Columns.Add("Value", typeof(decimal));
+                for (int i = 0; i < s_testValues.Length; i++)
                 {
-                    DataTable table = new(tableName);
-                    table.Columns.Add("Id", typeof(int));
-                    table.Columns.Add("Value", typeof(decimal));
-                    for (int i = 0; i < s_testValues.Length; i++)
-                    {
-                        DataRow newRow = table.NewRow();
-                        newRow["Id"] = i;
-                        newRow["Value"] = s_testValues[i];
-                        table.Rows.Add(newRow);
-                    }
-
-                    bulkCopy.DestinationTableName = tableName;
-                    appContextSwitchesHelper.TruncateScaledDecimal = truncateScaledDecimal;
-                    bulkCopy.WriteToServer(table);
+                    DataRow newRow = table.NewRow();
+                    newRow["Id"] = i;
+                    newRow["Value"] = s_testValues[i];
+                    table.Rows.Add(newRow);
                 }
-                Assert.True(ValidateInsertedValues(connection, tableName, truncateScaledDecimal), $"Invalid test happened with connection string [{connection.ConnectionString}]");
-            }
-            finally
-            {
-                DataTestUtility.DropTable(connection, tableName);
+
+                bulkCopy.DestinationTableName = decimalTable.Name;
+                appContextSwitchesHelper.TruncateScaledDecimal = truncateScaledDecimal;
+                bulkCopy.WriteToServer(table);
             }
+            Assert.True(ValidateInsertedValues(connection, decimalTable.Name, truncateScaledDecimal), $"Invalid test happened with connection string [{connection.ConnectionString}]");
         }
 
         // Synapse: Parse error at line: 2, column: 8: Incorrect syntax near 'TYPE'.
@@ -659,45 +554,40 @@ public static void TestScaledDecimalTVP_CommandSP(string connectionString, bool
         {
             using LocalAppContextSwitchesHelper appContextSwitchesHelper = new();
 
-            string tableName = DataTestUtility.GetLongName("TestDecimalParameterBC");
-            string tableTypeName = DataTestUtility.GetLongName("UDTTTestDecimalParameterBC");
-            string spName = DataTestUtility.GetLongName("spTestDecimalParameterBC");
-            using SqlConnection connection = InitialDatabaseUDTT(connectionString, tableName, tableTypeName, spName);
-            try
+            using SqlConnection connection = new(connectionString);
+            connection.Open();
+
+            using Table decimalTable = new(connection, "TestDecimalParameterBC", "(Id INT, Value Decimal(38, 2))");
+            using UserDefinedType udtDecimal = new(connection, "UDTTTestDecimalParameterBC", "TABLE (Id INT, Value Decimal(38, 2))");
+            using StoredProcedure insertDecimalSp = new(connection, "spTestDecimalParameterBC",
+                $"(@tvp {udtDecimal.Name} READONLY) AS \n INSERT INTO {decimalTable.Name} (Id, Value) SELECT * FROM @tvp ORDER BY Id");
+
+            using (SqlCommand cmd = connection.CreateCommand())
             {
-                using (SqlCommand cmd = connection.CreateCommand())
+                var p = new SqlParameter("@tvp", SqlDbType.Structured)
                 {
-                    var p = new SqlParameter("@tvp", SqlDbType.Structured)
-                    {
-                        TypeName = $"dbo.{tableTypeName}"
-                    };
-                    cmd.CommandText = spName;
-                    cmd.CommandType = CommandType.StoredProcedure;
-                    cmd.Parameters.Add(p);
-
-                    DataTable table = new(tableName);
-                    table.Columns.Add("Id", typeof(int));
-                    table.Columns.Add("Value", typeof(decimal));
-                    for (int i = 0; i < s_testValues.Length; i++)
-                    {
-                        DataRow newRow = table.NewRow();
-                        newRow["Id"] = i;
-                        newRow["Value"] = s_testValues[i];
-                        table.Rows.Add(newRow);
-                    }
-                    p.Value = table;
-                    appContextSwitchesHelper.TruncateScaledDecimal = truncateScaledDecimal;
-                    cmd.ExecuteNonQuery();
+                    TypeName = udtDecimal.Name
+                };
+                cmd.CommandText = insertDecimalSp.Name;
+                cmd.CommandType = CommandType.StoredProcedure;
+                cmd.Parameters.Add(p);
+
+                DataTable table = new(decimalTable.Name);
+                table.Columns.Add("Id", typeof(int));
+                table.Columns.Add("Value", typeof(decimal));
+                for (int i = 0; i < s_testValues.Length; i++)
+                {
+                    DataRow newRow = table.NewRow();
+                    newRow["Id"] = i;
+                    newRow["Value"] = s_testValues[i];
+                    table.Rows.Add(newRow);
                 }
-                // TVP always rounds data without attention to the configuration.
-                Assert.True(ValidateInsertedValues(connection, tableName, false && truncateScaledDecimal), $"Invalid test happened with connection string [{connection.ConnectionString}]");
-            }
-            finally
-            {
-                DataTestUtility.DropTable(connection, tableName);
-                DataTestUtility.DropStoredProcedure(connection, spName);
-                DataTestUtility.DropUserDefinedType(connection, tableTypeName);
+                p.Value = table;
+                appContextSwitchesHelper.TruncateScaledDecimal = truncateScaledDecimal;
+                cmd.ExecuteNonQuery();
             }
+            // TVP always rounds data without attention to the configuration.
+            Assert.True(ValidateInsertedValues(connection, decimalTable.Name, false && truncateScaledDecimal), $"Invalid test happened with connection string [{connection.ConnectionString}]");
         }
 
         #region Decimal parameter test setup
@@ -706,35 +596,6 @@ public static void TestScaledDecimalTVP_CommandSP(string connectionString, bool
         private static readonly decimal[] s_expectedTruncatedValues = new[] { 4210862852.86m, 19.15m, 19.15m, 19.15m };
         private const string TruncateDecimalSwitch = "Switch.Microsoft.Data.SqlClient.TruncateScaledDecimal";
 
-        private static SqlConnection InitialDatabaseUDTT(string cnnString, string tableName, string tableTypeName, string spName)
-        {
-            SqlConnection connection = new(cnnString);
-            connection.Open();
-            using (SqlCommand cmd = connection.CreateCommand())
-            {
-                cmd.CommandType = CommandType.Text;
-                cmd.CommandText = $"CREATE TABLE {tableName} (Id INT, Value Decimal(38, 2)) \n";
-                cmd.CommandText += $"CREATE TYPE {tableTypeName} AS TABLE (Id INT, Value Decimal(38, 2)) ";
-                cmd.ExecuteNonQuery();
-                cmd.CommandText = $"CREATE PROCEDURE {spName} (@tvp {tableTypeName} READONLY) AS \n INSERT INTO {tableName} (Id, Value) SELECT * FROM @tvp ORDER BY Id";
-                cmd.ExecuteNonQuery();
-            }
-            return connection;
-        }
-
-        private static SqlConnection InitialDatabaseTable(string cnnString, string tableName)
-        {
-            SqlConnection connection = new(cnnString);
-            connection.Open();
-            using (SqlCommand cmd = connection.CreateCommand())
-            {
-                cmd.CommandType = CommandType.Text;
-                cmd.CommandText = $"CREATE TABLE {tableName} (Id INT, Value Decimal(38, 2))";
-                cmd.ExecuteNonQuery();
-            }
-            return connection;
-        }
-
         private static bool ValidateInsertedValues(SqlConnection connection, string tableName, bool truncateScaledDecimal)
         {
             bool exceptionHit;
@@ -748,7 +609,7 @@ private static bool ValidateInsertedValues(SqlConnection connection, string tabl
                     cmd.CommandText = $"SELECT [Value] FROM {tableName} ORDER BY Id ASC";
                     cmd.CommandType = CommandType.Text;
                     using SqlDataReader reader = cmd.ExecuteReader();
-                    DataTable dbData = new();
+                    using DataTable dbData = new();
                     dbData.Load(reader);
                     Assert.Equal(expectedValues.Length, dbData.Rows.Count);
                     for (int i = 0; i < expectedValues.Length; i++)
@@ -787,15 +648,6 @@ private enum MyEnum
             B = 2
         }
 
-        private static void ExecuteNonQueryCommand(string connectionString, string cmdText)
-        {
-            using SqlConnection conn = new(connectionString);
-            using SqlCommand cmd = conn.CreateCommand();
-            conn.Open();
-            cmd.CommandText = cmdText;
-            cmd.ExecuteNonQuery();
-        }
-
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         private static void EnableOptimizedParameterBinding_ParametersAreUsedByName()
         {
@@ -946,36 +798,20 @@ private static void EnableOptimizedParameterBinding_ReturnSucceeds()
         {
             int firstInput = 12;
 
-            string sprocName = DataTestUtility.GetShortName("P");
-            // input, output
-            string createSprocQuery =
-                "CREATE PROCEDURE " + sprocName + " @in int " +
-                "AS " +
-                "RETURN(@in)";
-
-            string dropSprocQuery = "DROP PROCEDURE " + sprocName;
-
-            try
-            {
-                ExecuteNonQueryCommand(DataTestUtility.TCPConnectionString, createSprocQuery);
+            using var connection = new SqlConnection(DataTestUtility.TCPConnectionString);
+            connection.Open();
 
-                using var connection = new SqlConnection(DataTestUtility.TCPConnectionString);
-                connection.Open();
+            using StoredProcedure sproc = new(connection, "P", "@in int AS RETURN(@in)");
 
-                using var command = new SqlCommand(sprocName, connection) { CommandType = CommandType.StoredProcedure };
-                command.EnableOptimizedParameterBinding = true;
-                command.Parameters.AddWithValue("@in", firstInput);
-                SqlParameter returnParameter = command.Parameters.AddWithValue("@retval", 0);
-                returnParameter.Direction = ParameterDirection.ReturnValue;
+            using var command = new SqlCommand(sproc.Name, connection) { CommandType = CommandType.StoredProcedure };
+            command.EnableOptimizedParameterBinding = true;
+            command.Parameters.AddWithValue("@in", firstInput);
+            SqlParameter returnParameter = command.Parameters.AddWithValue("@retval", 0);
+            returnParameter.Direction = ParameterDirection.ReturnValue;
 
-                command.ExecuteNonQuery();
+            command.ExecuteNonQuery();
 
-                Assert.Equal(firstInput, Convert.ToInt32(returnParameter.Value));
-            }
-            finally
-            {
-                ExecuteNonQueryCommand(DataTestUtility.TCPConnectionString, dropSprocQuery);
-            }
+            Assert.Equal(firstInput, Convert.ToInt32(returnParameter.Value));
         }
 
         [SkipOnPlatform(TestPlatforms.OSX, "Flaky on macOS: https://sqlclientdrivers.visualstudio.com/ADO.Net/_workitems/edit/42351")]
@@ -999,7 +835,7 @@ public static void ClosedConnection_SqlParameterValueTest()
 
         private static void RunParameterTest()
         {
-            var cancellationToken = new CancellationTokenSource(50);
+            using var cancellationToken = new CancellationTokenSource(50);
             var expectedGuid = Guid.NewGuid();
 
             using var connection = new SqlConnection(DataTestUtility.TCPConnectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
index 837ce96e76..621784bafa 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Data;
-using System.Data.Common;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SqlBulkCopyTests
@@ -15,7 +14,6 @@ public class SqlGraphTables
         public void WriteToServer_CopyToSqlGraphNodeTable_Succeeds()
         {
             string connectionString = DataTestUtility.TCPConnectionString;
-            string destinationTable = DataTestUtility.GetShortName("SqlGraphNodeTable");
 
             using SqlConnection dstConn = new SqlConnection(connectionString);
             using DataTable nodes = new DataTable()
@@ -30,20 +28,12 @@ public void WriteToServer_CopyToSqlGraphNodeTable_Succeeds()
                 nodes.Rows.Add($"Name {i}");
             }
 
-            try
-            {
-                DataTestUtility.CreateTable(dstConn, destinationTable, "(Id INT PRIMARY KEY IDENTITY(1,1), [Name] VARCHAR(100)) AS NODE");
-
-                using SqlBulkCopy nodeCopy = new SqlBulkCopy(dstConn);
+            using Table dstNodeTable = new(dstConn, "SqlGraphNodeTable", "(Id INT PRIMARY KEY IDENTITY(1,1), [Name] VARCHAR(100)) AS NODE");
+            using SqlBulkCopy nodeCopy = new SqlBulkCopy(dstConn);
 
-                nodeCopy.DestinationTableName = destinationTable;
-                nodeCopy.ColumnMappings.Add("Name", "Name");
-                nodeCopy.WriteToServer(nodes);
-            }
-            finally
-            {
-                DataTestUtility.DropTable(dstConn, destinationTable);
-            }
+            nodeCopy.DestinationTableName = dstNodeTable.Name;
+            nodeCopy.ColumnMappings.Add("Name", "Name");
+            nodeCopy.WriteToServer(nodes);
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs
index 74e6aaa277..490bfe74b4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data;
 using Microsoft.Data.SqlClient.Server;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
@@ -32,7 +33,6 @@ public DateTimeOffsetVariableScale(DateTimeOffset dateTimeOffset, int scale)
     public class UdtDateTimeOffsetTest
     {
         private readonly string _connectionString = null;
-        private readonly string _udtTableType = DataTestUtility.GetLongName("DataTimeOffsetTableType");
         private readonly ITestOutputHelper _testOutputHelper;
 
         public UdtDateTimeOffsetTest(ITestOutputHelper testOutputHelper)
@@ -47,30 +47,24 @@ public void SelectFromSqlParameterShouldSucceed()
         {
             using SqlConnection connection = new(_connectionString);
             connection.Open();
-            SetupUserDefinedTableType(connection, _udtTableType);
 
-            try
+            using UserDefinedType udtTableType = new(connection, nameof(SelectFromSqlParameterShouldSucceed), "TABLE ([Value] DATETIMEOFFSET(1) NOT NULL)");
+
+            DateTimeOffset dateTimeOffset = new DateTimeOffset(2024, 1, 1, 23, 59, 59, 500, TimeSpan.Zero);
+            var param = new SqlParameter
             {
-                DateTimeOffset dateTimeOffset = new DateTimeOffset(2024, 1, 1, 23, 59, 59, 500, TimeSpan.Zero);
-                var param = new SqlParameter
-                {
-                    ParameterName = "@params",
-                    SqlDbType = SqlDbType.Structured,
-                    TypeName = $"dbo.{_udtTableType}",
-                    Value = new DateTimeOffsetList[] { new DateTimeOffsetList(dateTimeOffset) }
-                };
+                ParameterName = "@params",
+                SqlDbType = SqlDbType.Structured,
+                TypeName = udtTableType.Name,
+                Value = new DateTimeOffsetList[] { new DateTimeOffsetList(dateTimeOffset) }
+            };
 
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = "SELECT * FROM @params";
-                    cmd.Parameters.Add(param);
-                    var result = cmd.ExecuteScalar();
-                    Assert.Equal(dateTimeOffset, result);
-                }
-            }
-            finally
+            using (var cmd = connection.CreateCommand())
             {
-                DataTestUtility.DropUserDefinedType(connection, _udtTableType);
+                cmd.CommandText = "SELECT * FROM @params";
+                cmd.Parameters.Add(param);
+                var result = cmd.ExecuteScalar();
+                Assert.Equal(dateTimeOffset, result);
             }
         }
 
@@ -87,7 +81,8 @@ public void DateTimeOffsetAllScalesTestShouldSucceed()
 
             for (int scale = fromScale; scale <= toScale; scale++)
             {
-                string tvpTypeName = DataTestUtility.GetLongName("tvpType"); // Need a unique name per scale, else we get errors. See https://github.com/dotnet/SqlClient/issues/3011
+                // Need a unique name per scale, else we get errors. See https://github.com/dotnet/SqlClient/issues/3011
+                using UserDefinedType udtTableType = new(connection, "tvpType", $"TABLE ([Value] DATETIMEOFFSET({scale}) NOT NULL)");
 
                 DateTimeOffset dateTimeOffset = new DateTimeOffset(2024, 1, 1, 23, 59, 59, TimeSpan.Zero);
 
@@ -95,63 +90,32 @@ public void DateTimeOffsetAllScalesTestShouldSucceed()
                 TimeSpan subSeconds = TimeSpan.FromTicks((long)(TimeSpan.TicksPerSecond / Math.Pow(10, scale)));
                 dateTimeOffset = dateTimeOffset.Add(subSeconds);
 
-                DataTestUtility.DropUserDefinedType(connection, tvpTypeName);
+                var param = new SqlParameter
+                {
+                    ParameterName = "@params",
+                    SqlDbType = SqlDbType.Structured,
+                    Scale = (byte)scale,
+                    TypeName = udtTableType.Name,
+                    Value = new DateTimeOffsetVariableScale[] { new DateTimeOffsetVariableScale(dateTimeOffset, scale) }
+                };
 
-                try
+                using (var cmd = connection.CreateCommand())
                 {
-                    SetupDateTimeOffsetTableType(connection, tvpTypeName, scale);
+                    cmd.CommandText = "SELECT * FROM @params";
+                    cmd.Parameters.Add(param);
 
-                    var param = new SqlParameter
+                    object result = null;
+                    try
                     {
-                        ParameterName = "@params",
-                        SqlDbType = SqlDbType.Structured,
-                        Scale = (byte)scale,
-                        TypeName = $"dbo.{tvpTypeName}",
-                        Value = new DateTimeOffsetVariableScale[] { new DateTimeOffsetVariableScale(dateTimeOffset, scale) }
-                    };
-
-                    using (var cmd = connection.CreateCommand())
+                        result = cmd.ExecuteScalar();
+                        Assert.Equal(dateTimeOffset, result);
+                    }
+                    catch (Exception)
                     {
-                        cmd.CommandText = "SELECT * FROM @params";
-                        cmd.Parameters.Add(param);
-
-                        object result = null;
-                        try
-                        {
-                            result = cmd.ExecuteScalar();
-                            Assert.Equal(dateTimeOffset, result);
-                        }
-                        catch (Exception)
-                        {
-                            _testOutputHelper.WriteLine($"{DateTime.UtcNow:O}: Failed for scale {scale} DateTimeOffset: {dateTimeOffset} Result: {result ?? "No result"}");
-                            throw;
-                        }
+                        _testOutputHelper.WriteLine($"{DateTime.UtcNow:O}: Failed for scale {scale} DateTimeOffset: {dateTimeOffset} Result: {result ?? "No result"}");
+                        throw;
                     }
                 }
-                finally
-                {
-                    DataTestUtility.DropUserDefinedType(connection, tvpTypeName);
-                }
-            }
-        }
-
-        private static void SetupUserDefinedTableType(SqlConnection connection, string tableTypeName)
-        {
-            using (SqlCommand cmd = connection.CreateCommand())
-            {
-                cmd.CommandType = CommandType.Text;
-                cmd.CommandText = $"CREATE TYPE {tableTypeName} AS TABLE ([Value] DATETIMEOFFSET(1) NOT NULL) ";
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        private static void SetupDateTimeOffsetTableType(SqlConnection connection, string tableTypeName, int scale)
-        {
-            using (SqlCommand cmd = connection.CreateCommand())
-            {
-                cmd.CommandType = CommandType.Text;
-                cmd.CommandText = $"CREATE TYPE {tableTypeName} AS TABLE ([Value] DATETIMEOFFSET({scale}) NOT NULL) ";
-                cmd.ExecuteNonQuery();
             }
         }
     }

From ea0b777047203d541dd1e310a4872c4c9cc44176 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Fri, 17 Apr 2026 16:19:04 +1000
Subject: [PATCH 048/298] remove more duplicate lookups (#4089)

* remove duplicate lookups in EnclaveDelegate.Crypto.cs

* Use TryGet methods to avoid double lookups

Replace ContainsKey + indexer patterns with TryGetParsetableValue (for connection options) and TryGetValue (for _appDomainKeyHash) to avoid double dictionary lookups, remove variable shadowing, and make intent clearer. Existing logic and assertions are preserved.
---
 .../SqlConnectionPoolGroupProviderInfo.cs         |  4 ++--
 .../Data/SqlClient/EnclaveDelegate.Crypto.cs      | 15 ++++++---------
 .../Data/SqlClient/SqlDependencyListener.cs       |  3 +--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolGroupProviderInfo.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolGroupProviderInfo.cs
index b946d839a8..db2a17bd56 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolGroupProviderInfo.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolGroupProviderInfo.cs
@@ -105,8 +105,8 @@ private PermissionSet CreateFailoverPermission(SqlConnectionString userConnectio
             //       the server, we will use that name over what was specified  
             //       in the original connection string.
 
-            if (userConnectionOptions.ContainsKey(DbConnectionStringKeywords.FailoverPartner) &&
-                userConnectionOptions[DbConnectionStringKeywords.FailoverPartner] == null)
+            if (userConnectionOptions.TryGetParsetableValue(DbConnectionStringKeywords.FailoverPartner, out string failoverPartnerValue) &&
+                failoverPartnerValue == null)
             {
                 keywordToReplace = DbConnectionStringKeywords.DataSource;
             }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveDelegate.Crypto.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveDelegate.Crypto.cs
index db1bdea90f..8b461087bd 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveDelegate.Crypto.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveDelegate.Crypto.cs
@@ -92,21 +92,18 @@ private SqlColumnEncryptionEnclaveProvider GetEnclaveProvider(SqlConnectionAttes
                 switch (attestationProtocol)
                 {
                     case SqlConnectionAttestationProtocol.AAS:
-                        AzureAttestationEnclaveProvider azureAttestationEnclaveProvider = new AzureAttestationEnclaveProvider();
-                        s_enclaveProviders[attestationProtocol] = azureAttestationEnclaveProvider;
-                        sqlColumnEncryptionEnclaveProvider = s_enclaveProviders[attestationProtocol];
+                        sqlColumnEncryptionEnclaveProvider = new AzureAttestationEnclaveProvider();
+                        s_enclaveProviders[attestationProtocol] = sqlColumnEncryptionEnclaveProvider;
                         break;
 
                     case SqlConnectionAttestationProtocol.HGS:
-                        HostGuardianServiceEnclaveProvider hostGuardianServiceEnclaveProvider = new HostGuardianServiceEnclaveProvider();
-                        s_enclaveProviders[attestationProtocol] = hostGuardianServiceEnclaveProvider;
-                        sqlColumnEncryptionEnclaveProvider = s_enclaveProviders[attestationProtocol];
+                        sqlColumnEncryptionEnclaveProvider = new HostGuardianServiceEnclaveProvider();
+                        s_enclaveProviders[attestationProtocol] = sqlColumnEncryptionEnclaveProvider;
                         break;
 
                     case SqlConnectionAttestationProtocol.None:
-                        NoneAttestationEnclaveProvider noneAttestationEnclaveProvider = new NoneAttestationEnclaveProvider();
-                        s_enclaveProviders[attestationProtocol] = noneAttestationEnclaveProvider;
-                        sqlColumnEncryptionEnclaveProvider = s_enclaveProviders[attestationProtocol];
+                        sqlColumnEncryptionEnclaveProvider = new NoneAttestationEnclaveProvider();
+                        s_enclaveProviders[attestationProtocol] = sqlColumnEncryptionEnclaveProvider;
                         break;
 
                     default:
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
index e97d8589a3..b3d5191e1a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
@@ -837,9 +837,8 @@ internal bool Stop(string appDomainKey, out bool appDomainStop)
                     // If null, then this was called from SqlDependencyProcessDispatcher, we ignore appDomainKeyHash.
                     lock (_appDomainKeyHash)
                     {
-                        if (_appDomainKeyHash.ContainsKey(appDomainKey))
+                        if (_appDomainKeyHash.TryGetValue(appDomainKey, out int value))
                         { // Do nothing if AppDomain did not call Start!
-                            int value = _appDomainKeyHash[appDomainKey];
 
                             Debug.Assert(value > 0, "Unexpected count for appDomainKey");
                             SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlConnectionContainer.Stop|DEP> _appDomainKeyHash contained AppDomainKey: '{0}', pre-decrement Count: '{1}'.", appDomainKey, value);

From b0b17f7a2dd15d918d40c99dfef894bfabc07f0c Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sat, 18 Apr 2026 05:35:15 +1000
Subject: [PATCH 049/298] remove some redundant null checks (#4091)

---
 .../SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs    | 2 +-
 .../src/Microsoft/Data/SqlClient/SqlParameter.cs                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs
index dfc7861dc3..96eadb9d56 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs
@@ -317,7 +317,7 @@ private static ICollection<int> SplitErrorNumberList(string list)
             if (!string.IsNullOrEmpty(list))
             {
                 string[] parts = list.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                if (parts != null && parts.Length > 0)
+                if (parts.Length > 0)
                 {
                     HashSet<int> set = new HashSet<int>();
                     for (int index = 0; index < parts.Length; index++)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
index 13b71c2a29..621413f9c1 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
@@ -1261,7 +1261,7 @@ private void GetActualFieldsAndProperties(out List<SmiExtendedMetaData> fields,
 
                 // set up primary key as unique key list
                 //  do this prior to general metadata loop to favor the primary key
-                if (dt.PrimaryKey != null && 0 < dt.PrimaryKey.Length)
+                if (dt.PrimaryKey.Length > 0)
                 {
                     foreach (DataColumn col in dt.PrimaryKey)
                     {

From ed1661feb1999ea4562a28efbcbe9af7b74345fb Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Fri, 17 Apr 2026 22:37:35 +0100
Subject: [PATCH 050/298] Add conditional ProjectReference to
 Microsoft.SqlServer.Server (#4003)

This enables builds via Visual Studio
---
 .../src/Microsoft.Data.SqlClient.csproj              | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 2f7c726500..31a13c5801 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -144,7 +144,6 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
   </ItemGroup>
@@ -171,6 +170,17 @@
     <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" />
   </ItemGroup>
 
+  <!--
+    Refer to the SqlServer package via project or package reference
+    depending on our build parameters.
+  -->
+  <ItemGroup Condition="'$(ReferenceType)' == 'Project' and '$(TargetFramework)' != 'net462'">
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(ReferenceType)' == 'Package' and '$(TargetFramework)' != 'net462'">
+    <PackageReference Include="Microsoft.SqlServer.Server" />
+  </ItemGroup>
+
   <!-- CodeGen Targets ================================================= -->
   <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
 </Project>

From e0176e1ff1b7613ed0edebd73ca92496ceab023d Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sat, 18 Apr 2026 07:56:34 +1000
Subject: [PATCH 051/298] fix null ref in SqlDataReader (#4159)

---
 .../Microsoft/Data/SqlClient/SqlDataReader.cs    |  2 +-
 .../SQL/DataReaderTest/DataReaderTest.cs         | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index 0809f322e2..d0bd8dc247 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -2137,7 +2137,7 @@ override public long GetChars(int i, long dataIndex, char[] buffer, int bufferIn
                     // if bad buffer index, throw
                     if ((bufferIndex < 0) || (buffer != null && bufferIndex >= buffer.Length))
                     {
-                        throw ADP.InvalidDestinationBufferIndex(buffer.Length, bufferIndex, nameof(bufferIndex));
+                        throw ADP.InvalidDestinationBufferIndex(buffer?.Length ?? 0, bufferIndex, nameof(bufferIndex));
                     }
 
                     // if there is not enough room in the buffer for data
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
index b21626aaad..2fbf2714f9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
@@ -741,6 +741,22 @@ DROP TABLE IF EXISTS [{tableName}]
             }
         }
 
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public static async Task GetCharsSequentialAccess_NullBufferNegativeBufferIndex_ThrowsArgumentOutOfRange()
+        {
+            using var connection = new SqlConnection(DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
+
+            using var command = connection.CreateCommand();
+            command.CommandText = "SELECT CONVERT(NVARCHAR(MAX), 'test')";
+
+            using var reader = await command.ExecuteReaderAsync(CommandBehavior.SequentialAccess);
+            Assert.True(await reader.ReadAsync());
+
+            var ex = Assert.Throws<ArgumentOutOfRangeException>(() => reader.GetChars(0, 0, null, -1, 0));
+            Assert.Equal("bufferIndex", ex.ParamName);
+        }
+
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         public static async Task CanGetCharsSequentially()
         {

From eacf112fa410e9c87827e6a88b87bb5c0e87d700 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 20 Apr 2026 02:36:45 -0300
Subject: [PATCH 052/298] Move symbol publishing into a dedicated stage and
 refactor build artifacts (#4175)

---
 .../onebranch-pipeline-design.instructions.md |  30 +-
 .../jobs/build-signed-csproj-package-job.yml  |  98 ++---
 .../build-signed-sqlclient-package-job.yml    | 106 +++---
 .../jobs/publish-nuget-package-job.yml        |  21 +-
 .../onebranch/jobs/publish-symbols-job.yml    |  95 +++++
 .../jobs/validate-signed-package-job.yml      |  21 +-
 .../onebranch/scripts/publish-symbols.ps1     | 236 ++++++++++++
 .../onebranch/scripts/tests/README.md         |  43 +++
 .../scripts/tests/publish-symbols.Tests.ps1   | 356 ++++++++++++++++++
 .../onebranch/sqlclient-non-official.yml      |  31 +-
 .../onebranch/sqlclient-official.yml          |  31 +-
 .../onebranch/stages/build-stages.yml         |  64 ----
 .../stages/publish-symbols-stage.yml          | 222 +++++++++++
 .../onebranch/stages/release-stages.yml       |  22 +-
 .../copy-apiscan-files-sqlclient-step.yml     |  39 --
 .../onebranch/steps/esrp-dll-signing-step.yml |   7 +-
 .../steps/esrp-nuget-signing-step.yml         |   5 +-
 .../onebranch/steps/pack-csproj-step.yml      |   4 +-
 .../onebranch/steps/pack-sqlclient-step.yml   |   4 +-
 .../onebranch/steps/publish-symbols-step.yml  | 155 ++++----
 .../onebranch/variables/common-variables.yml  |  22 +-
 .../variables/onebranch-variables.yml         |   8 +-
 22 files changed, 1270 insertions(+), 350 deletions(-)
 create mode 100644 eng/pipelines/onebranch/jobs/publish-symbols-job.yml
 create mode 100644 eng/pipelines/onebranch/scripts/publish-symbols.ps1
 create mode 100644 eng/pipelines/onebranch/scripts/tests/README.md
 create mode 100644 eng/pipelines/onebranch/scripts/tests/publish-symbols.Tests.ps1
 create mode 100644 eng/pipelines/onebranch/stages/publish-symbols-stage.yml
 delete mode 100644 eng/pipelines/onebranch/steps/copy-apiscan-files-sqlclient-step.yml

diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index f2319ee5b2..0860d5db52 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -36,6 +36,8 @@ Defined in `stages/build-stages.yml`. Four build stages plus validation, ordered
 - **`build_addons`** (Stage 4) — AKV Provider; `dependsOn: build_dependent`; downloads SqlClient + Abstractions + Logging artifacts
 - **`mds_package_validation`** — Validates signed SqlClient package; `dependsOn: build_dependent`; runs in parallel with Stage 4
 
+Each build job copies PDB files into `$(JOB_OUTPUT)/symbols/` so they are included in the auto-published pipeline artifact alongside the NuGet packages in `$(JOB_OUTPUT)/packages/`.
+
 Stage conditional rules:
 - Wrap stages/jobs in `${{ if }}` compile-time conditionals based on build parameters
 - `buildSqlClient` controls Stages 2, 3, validation, and Logging (when AKV is disabled)
@@ -45,10 +47,11 @@ Stage conditional rules:
 
 ## Job Templates
 
-- **`build-signed-csproj-package-job.yml`** — Generic job for csproj-based packages (Logging, SqlServer.Server, Abstractions, Azure, AKV Provider). Flow: Build DLLs → ESRP DLL signing → NuGet pack (`NoBuild=true`) → ESRP NuGet signing
-- **`build-signed-sqlclient-package-job.yml`** — SqlClient-specific job (nuspec-based). Flow: Build all configurations → ESRP DLL signing (main + resource DLLs) → NuGet pack via nuspec → ESRP NuGet signing
+- **`build-signed-csproj-package-job.yml`** — Generic job for csproj-based packages (Logging, SqlServer.Server, Abstractions, Azure, AKV Provider). Flow: Build DLLs → ESRP DLL signing → NuGet pack (`NoBuild=true`) → ESRP NuGet signing → Copy PDBs to artifact
+- **`build-signed-sqlclient-package-job.yml`** — SqlClient-specific job (nuspec-based). Flow: Build all configurations → ESRP DLL signing (main + resource DLLs) → NuGet pack via nuspec → ESRP NuGet signing → Copy PDBs to artifact
 - **`validate-signed-package-job.yml`** — Validates signed MDS package (signature, strong names, folder structure, target frameworks)
 - **`publish-nuget-package-job.yml`** — Reusable release job using OneBranch `templateContext.type: releaseJob` with `inputs` for artifact download; pushes via `NuGetCommand@2`
+- **`publish-symbols-job.yml`** — Reusable symbols job: downloads a build artifact, locates PDBs under `symbols/`, and invokes `publish-symbols-step.yml`
 
 When adding a new csproj-based package:
 - Use `build-signed-csproj-package-job.yml` with appropriate `packageName`, `packageFullName`, `versionProperties`, and `downloadArtifacts`
@@ -56,6 +59,18 @@ When adding a new csproj-based package:
 - Add version variables to `variables/common-variables.yml`
 - Add artifact name variable to `variables/onebranch-variables.yml`
 
+## Symbols Publishing Stage
+
+- Defined in `stages/publish-symbols-stage.yml`; produces stage `publish_symbols`
+- Entire stage excluded at compile time when `publishSymbols` is false
+- `dependsOn` is conditional based on which `build*` parameters are set, mirroring the build stage dependency graph
+- One job per package (`publish-symbols-job.yml`), each downloading its build artifact and publishing PDBs from `symbols/`
+- Each package's PDBs are published separately with unique artifact names and version information
+- Build jobs copy PDBs into `$(JOB_OUTPUT)/symbols/` so they are included in the auto-published artifact
+- The `publish-symbols-step.yml` accepts a `symbolsFolder` parameter to point at the downloaded PDB location
+- The publish step calls an extracted `publish-symbols.ps1` script with structured error handling and diagnostic logging
+- Symbols publishing credentials come from the `Symbols Publishing` variable group
+
 ## Release Stage
 
 - Defined in `stages/release-stages.yml`; produces stage `release_production` (official) or `release_test` (non-official) via `stageNameSuffix` parameter
@@ -98,8 +113,7 @@ When `isPreview` is true, pipeline resolves `effective*Version` variables to pre
 - When adding a new package, add GA version, preview version, and assembly file version entries
 
 Variable groups:
-- `Release Variables` — release configuration (in `common-variables.yml`)
-- `Symbols publishing` — symbol publishing credentials (in `common-variables.yml`)
+- `Symbols Publishing` — symbol publishing credentials (in `onebranch-variables.yml`)
 - `ESRP Federated Creds (AME)` — ESRP signing credentials (in `common-variables.yml`)
 
 ## Code Signing (ESRP)
@@ -115,7 +129,7 @@ Variable groups:
 
 - TSA: enabled only in official pipeline; disabled in non-official to avoid spurious alerts
 - ApiScan: enabled in both; currently `break: false` pending package registration
-- Each build job sets `ob_sdl_apiscan_*` variables pointing to `$(Build.SourcesDirectory)/apiScan/<PackageName>/`
+- Each build job sets `ob_sdl_apiscan_softwareFolder` to `$(JOB_OUTPUT)/assemblies` and `ob_sdl_apiscan_symbolsFolder` to `$(JOB_OUTPUT)/symbols`
 - CodeQL, SBOM, Policheck (`break: true`): enabled in both pipelines
 - asyncSdl `enabled: false` in both; individual sub-tools (CredScan, BinSkim, Armory, Roslyn) configured underneath
 - Policheck exclusions: `$(REPO_ROOT)\.config\PolicheckExclusions.xml`
@@ -123,7 +137,11 @@ Variable groups:
 
 ## Artifact Conventions
 
-- `ob_outputDirectory` set to `$(PACK_OUTPUT)` (= `$(REPO_ROOT)/output`) — OneBranch auto-publishes this directory
+- `ob_outputDirectory` set to `$(JOB_OUTPUT)` (= `$(REPO_ROOT)/output`) — OneBranch auto-publishes this directory
+- Each published artifact uses subdirectories to separate file types:
+  - `assemblies/` — DLL assemblies for APIScan (preserving TFM folder structure)
+  - `packages/` — NuGet packages (`.nupkg`, `.snupkg`)
+  - `symbols/` — PDB symbol files (preserving TFM folder structure, shared by APIScan and symbol publishing)
 - Artifact names follow `drop_<stageName>_<jobName>` — defined in `variables/onebranch-variables.yml`
 - Downstream jobs download artifacts via `DownloadPipelineArtifact@2` into `$(Build.SourcesDirectory)/packages`
 - Downloaded packages serve as a local NuGet source for `dotnet restore`
diff --git a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
index 6dc72983cc..94e6438ef5 100644
--- a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
@@ -36,26 +36,6 @@ parameters:
   - name: signingEsrpConnectedServiceName
     type: string
 
-  # Symbols Publishing Parameters ------------------------------------------
-
-  - name: symbolsAzureSubscription
-    type: string
-    default: 'Symbols publishing Workload Identity federation service-ADO.Net'
-
-  - name: symbolsPublishProjectName
-    type: string
-    default: 'Microsoft.Data.SqlClient.SNI'
-
-  - name: symbolsPublishServer
-    type: string
-
-  - name: symbolsPublishTokenUri
-    type: string
-
-  - name: symbolsUploadAccount
-    type: string
-    default: 'SqlClientDrivers'
-
   # OTHERS +=====================================
 
   # Short package name used in the job name, display strings, filesystem paths, and as a suffix for
@@ -74,11 +54,6 @@ parameters:
   - name: packageFullName
     type: string
 
-  # The version of the package.  This is used for symbol publishing.  It is not used for the DLL or
-  # NuGet package versions since those are supplied via the versionProperties parameter.
-  - name: packageVersion
-    type: string
-
   # The MSBuild build target in build.proj (e.g. BuildLogging).  If not specified, defaults to
   # Build<packageName>.
   - name: buildTarget
@@ -106,10 +81,6 @@ parameters:
   - name: assemblyFileVersion
     type: string
 
-  # True to publish symbols to private and public servers.
-  - name: publishSymbols
-    type: boolean
-
   # Optional list of pipeline artifacts to download before building.  Each entry is an object
   # with 'artifactName' (the pipeline artifact name) and 'displayName' (used in the task label).
   # This replaces hard-coded packageName conditionals so callers declare their own dependencies.
@@ -125,12 +96,12 @@ jobs:
 
     variables:
       # Inform OneBranch that files put in this directory should be uploaded as artifacts.
-      ob_outputDirectory: $(PACK_OUTPUT)
+      ob_outputDirectory: $(JOB_OUTPUT)
 
       # APIScan configuration for this Extension package
       ob_sdl_apiscan_enabled: true
-      ob_sdl_apiscan_softwareFolder: $(REPO_ROOT)/apiScan/${{ parameters.packageName }}/dlls
-      ob_sdl_apiscan_symbolsFolder: $(REPO_ROOT)/apiScan/${{ parameters.packageName }}/pdbs
+      ob_sdl_apiscan_softwareFolder: $(JOB_OUTPUT)/assemblies
+      ob_sdl_apiscan_symbolsFolder: $(JOB_OUTPUT)/symbols
       ob_sdl_apiscan_softwarename: ${{ parameters.packageFullName }}
       ob_sdl_apiscan_versionNumber: ${{ parameters.assemblyFileVersion }}
 
@@ -149,7 +120,7 @@ jobs:
             displayName: Download ${{ artifact.displayName }}
             inputs:
               artifactName: ${{ artifact.artifactName }}
-              targetPath: $(REPO_ROOT)/packages
+              targetPath: $(JOB_INPUT)
 
       # Install the .NET SDK.
       - template: /eng/pipelines/steps/install-dotnet.yml@self
@@ -179,26 +150,42 @@ jobs:
               authSignCertName: '${{ parameters.signingAuthSignCertName }}'
               esrpClientId: '${{ parameters.signingEsrpClientId }}'
               esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              pattern: '${{ parameters.packageFullName }}.dll'
-
-      # Copy signed/unsigned DLLs and PDBs to APIScan folders.
+              # Minimatch pattern (multi-line, one pattern per line).
+              # **/ matches any nested directory (e.g. net8.0/, netstandard2.0/fr/).
+              #
+              # Matches:  net8.0/<packageFullName>.dll
+              #           netstandard2.0/fr/<packageFullName>.resources.dll
+              pattern: |
+                **/${{ parameters.packageFullName }}.dll
+                **/${{ parameters.packageFullName }}.resources.dll
+
+      # Copy DLLs to the assemblies/ subdirectory for APIScan.
       - task: CopyFiles@2
         displayName: Copy DLLs for APIScan
         inputs:
           SourceFolder: $(BUILD_OUTPUT)/Package/bin
-          Contents: "**/${{ parameters.packageFullName }}.dll"
-          TargetFolder: ${{ variables.ob_sdl_apiscan_softwareFolder }}
+          # Matches: <packageFullName>.dll (main assembly) across all TFM subdirs
+          #          <packageFullName>.resources.dll (localized satellite assemblies in locale subdirs, if any)
+          Contents: |
+            **/${{ parameters.packageFullName }}.dll
+            **/${{ parameters.packageFullName }}.resources.dll
+          TargetFolder: $(JOB_OUTPUT)/assemblies
           # We must preserve the folder structure since our C# projects may produce multiple
           # identically named DLLs for different target frameworks (e.g. netstandard2.0, net5.0,
           # etc.), and we need to keep those separate for APIScan to work correctly.
           flattenFolders: false
 
+      # Copy PDBs into the output directory so they are included in the published pipeline
+      # artifact. The symbols publishing stage will download this artifact and publish PDBs
+      # for this package using the files under symbols/.
       - task: CopyFiles@2
-        displayName: Copy PDBs for APIScan
+        displayName: Copy PDBs for APIScan and Symbols Publishing
         inputs:
           SourceFolder: $(BUILD_OUTPUT)/Package/bin
-          Contents: "**/${{ parameters.packageFullName }}.pdb"
-          TargetFolder: ${{ variables.ob_sdl_apiscan_symbolsFolder }}
+          # Matches: <packageFullName>.pdb across all TFM subdirs.
+          # Note: Resource DLLs are resource-only satellite assemblies and do not produce PDBs.
+          Contents: '**/${{ parameters.packageFullName }}.pdb'
+          TargetFolder: $(JOB_OUTPUT)/symbols
           flattenFolders: false
 
       # Pack the signed DLLs into NuGet package (NoBuild=true).
@@ -217,22 +204,13 @@ jobs:
               authSignCertName: '${{ parameters.signingAuthSignCertName }}'
               esrpClientId: '${{ parameters.signingEsrpClientId }}'
               esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              searchPath: $(PACK_OUTPUT)
-              searchPattern: '${{ parameters.packageFullName}}.*nupkg'
-
-      # Publish symbols to servers
-      # @TODO: Get these parameters from variables/libraries
-      - ${{ if eq(parameters.publishSymbols, true) }}:
-          - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
-            parameters:
-              artifactName: '${{ parameters.packageFullName }}_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.packageVersion }}_$(System.TimelineId)'
-              azureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              packageName: '${{ parameters.packageFullName }}'
-              publishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              publishServer: '${{ parameters.symbolsPublishServer }}'
-              publishToInternal: 'true'
-              publishToPublic: 'true'
-              publishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              searchPattern: '**/${{ parameters.packageFullName }}*.pdb'
-              uploadAccount: '${{ parameters.symbolsUploadAccount }}'
-              version: '${{ parameters.packageVersion }}'
+              searchPath: $(JOB_OUTPUT)/packages
+              # Minimatch pattern with extglob.
+              # [0-9] matches a single digit, anchoring to the version segment so
+              # similarly-prefixed package names are not matched.
+              # ?(s) is an extglob that optionally matches 's'.
+              #
+              # Matches:  <packageFullName>.1.0.0.nupkg
+              #           <packageFullName>.1.0.0-preview.1.snupkg
+              # Excludes: <packageFullName>.SomeOther.1.0.0.nupkg
+              searchPattern: '${{ parameters.packageFullName }}.[0-9]*.?(s)nupkg'
diff --git a/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
index 752e459b84..5bf33f9c09 100644
--- a/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
@@ -7,20 +7,11 @@
 # Job that performs a build of Microsoft.Data.SqlClient using the build2.proj file.
 
 parameters:
-  - name: apiScanDllPath
-    type: string
-
-  - name: apiScanPdbPath
-    type: string
-
   # Whether this build is for an "official" OneBranch pipeline. This is used to enable ESRP signing
   # on the artifacts of this job.
   - name: isOfficial
     type: boolean
 
-  - name: publishSymbols
-    type: boolean
-
   - name: signingAppRegistrationClientId
     type: string
 
@@ -39,21 +30,6 @@ parameters:
   - name: signingEsrpConnectedServiceName
     type: string
 
-  - name: symbolsAzureSubscription
-    type: string
-
-  - name: symbolsPublishProjectName
-    type: string
-
-  - name: symbolsPublishServer
-    type: string
-
-  - name: symbolsPublishTokenUri
-    type: string
-
-  - name: symbolsUploadAccount
-    type: string
-
   # Package Parameters
   - name: abstractionsArtifactName
     type: string
@@ -80,9 +56,9 @@ jobs:
       type: windows
 
     variables:
-      ob_outputDirectory: '$(PACK_OUTPUT)'
-      ob_sdl_apiscan_softwareFolder: ${{ parameters.apiScanDllPath }}
-      ob_sdl_apiscan_symbolsFolder: ${{ parameters.apiScanPdbPath }}
+      ob_outputDirectory: '$(JOB_OUTPUT)'
+      ob_sdl_apiscan_softwareFolder: $(JOB_OUTPUT)/assemblies
+      ob_sdl_apiscan_symbolsFolder: $(JOB_OUTPUT)/symbols
       ob_sdl_apiscan_softwarename: 'Microsoft.Data.SqlClient'
       ob_sdl_apiscan_versionNumber: ${{ parameters.sqlClientAssemblyFileVersion }}
 
@@ -102,13 +78,13 @@ jobs:
         displayName: Download Microsoft.Data.SqlClient.Extensions.Abstractions Artifact
         inputs:
           artifactName: '${{ parameters.abstractionsArtifactName }}'
-          targetPath: '$(REPO_ROOT)/packages'
+          targetPath: '$(JOB_INPUT)'
 
       - task: DownloadPipelineArtifact@2
         displayName: Download Microsoft.Data.SqlClient.Extensions.Logging Artifact
         inputs:
           artifactName: '${{ parameters.loggingArtifactName }}'
-          targetPath: '$(REPO_ROOT)/packages'
+          targetPath: '$(JOB_INPUT)'
 
       # Install the .NET SDK
       - template: /eng/pipelines/steps/install-dotnet.yml@self
@@ -127,13 +103,6 @@ jobs:
           loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
           sqlClientPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
 
-      # Copy the built DLLs and PDBs to the APIScan output folder for APIScanning post-build
-      - template: /eng/pipelines/onebranch/steps/copy-apiscan-files-sqlclient-step.yml@self
-        parameters:
-          dllPath: '${{ parameters.apiScanDllPath }}'
-          pdbPath: '${{ parameters.apiScanPdbPath }}'
-          referenceType: 'Package'
-
       # Sign the DLLs
       - ${{ if parameters.isOfficial }}:
           - template: /eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml@self
@@ -144,7 +113,43 @@ jobs:
               authSignCertName: '${{ parameters.signingAuthSignCertName }}'
               esrpClientId: '${{ parameters.signingEsrpClientId }}'
               esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              pattern: 'Microsoft.Data.SqlClient*.dll'
+              # Minimatch pattern (multi-line, one pattern per line).
+              # **/ matches any nested directory (e.g. net8.0/, net462/fr/).
+              #
+              # Matches:  net8.0/Microsoft.Data.SqlClient.dll
+              #           net462/fr/Microsoft.Data.SqlClient.resources.dll
+              # Excludes: net8.0/Microsoft.Data.SqlClient.SNI.dll (no ** path matches)
+              pattern: |
+                **/Microsoft.Data.SqlClient.dll
+                **/Microsoft.Data.SqlClient.resources.dll
+
+      # Copy DLLs to the assemblies/ subdirectory for APIScan.
+      - task: CopyFiles@2
+        displayName: Copy DLLs for APIScan
+        inputs:
+          SourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/Package-Release'
+          # Matches: Microsoft.Data.SqlClient.dll (main assembly)
+          #          Microsoft.Data.SqlClient.resources.dll (localized satellite assemblies in locale subdirs)
+          # Excludes: Microsoft.Data.SqlClient.SNI*.dll (native SNI — not part of this package)
+          Contents: |
+            **/Microsoft.Data.SqlClient.dll
+            **/Microsoft.Data.SqlClient.resources.dll
+          TargetFolder: '$(JOB_OUTPUT)/assemblies'
+          flattenFolders: false
+
+      # Copy PDBs into the output directory so they are included in the published pipeline
+      # artifact. The symbols publishing stage will download this artifact and publish PDBs
+      # for this package using the files under symbols/.
+      - task: CopyFiles@2
+        displayName: Copy PDBs for APIScan and Symbols Publishing
+        inputs:
+          SourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/Package-Release'
+          # Matches: Microsoft.Data.SqlClient.pdb (main assembly symbols)
+          # Excludes: Microsoft.Data.SqlClient.SNI*.pdb (native SNI — symbols published separately)
+          # Note: Resource DLLs are resource-only satellite assemblies and do not produce PDBs.
+          Contents: '**/Microsoft.Data.SqlClient.pdb'
+          TargetFolder: '$(JOB_OUTPUT)/symbols'
+          flattenFolders: false
 
       # Package the build output into a NuGet package
       - template: /eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
@@ -163,20 +168,13 @@ jobs:
               authSignCertName: '${{ parameters.signingAuthSignCertName }}'
               esrpClientId: '${{ parameters.signingEsrpClientId }}'
               esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              searchPath: '$(PACK_OUTPUT)'
-              searchPattern: 'Microsoft.Data.SqlClient.*nupkg'
-
-      - ${{ if parameters.publishSymbols }}:
-          - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
-            parameters:
-              artifactName: 'Microsoft.Data.SqlClient_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.sqlClientPackageVersion }}_$(System.TimelineId)'
-              azureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              packageName: 'Microsoft.Data.SqlClient'
-              publishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              publishServer: '${{ parameters.symbolsPublishServer }}'
-              publishToInternal: true
-              publishToPublic: true
-              publishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              searchPattern: '**/Microsoft.Data.SqlClient*.pdb' # @TODO: This seems very heavy
-              uploadAccount: '${{ parameters.symbolsUploadAccount }}'
-              version: '${{ parameters.sqlClientPackageVersion }}'
+              searchPath: '$(JOB_OUTPUT)/packages'
+              # Minimatch pattern with extglob.
+              # [0-9] matches a single digit, anchoring to the version segment so
+              # names like Microsoft.Data.SqlClient.SNI are not matched.
+              # ?(s) is an extglob that optionally matches 's'.
+              #
+              # Matches:  Microsoft.Data.SqlClient.6.1.0.nupkg
+              #           Microsoft.Data.SqlClient.6.1.0.snupkg
+              # Excludes: Microsoft.Data.SqlClient.SNI.6.0.0.nupkg
+              searchPattern: 'Microsoft.Data.SqlClient.[0-9]*.?(s)nupkg'
diff --git a/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml b/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
index b7a1d8f62e..21d36b9640 100644
--- a/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
@@ -38,15 +38,18 @@ parameters:
   # artifact.  For example, if we're publishing the SqlClient package, and the build job publishes a
   # pipeline artifact with the following structure:
   #
-  #   drop_BuildAndTest_PackageReference/
-  #   ├── Microsoft.Data.SqlClient.5.0.0.nupkg
-  #   ├── Microsoft.Data.SqlClient.5.0.0.snupkg
-  #   ├── Microsoft.Data.SqlClient.Extensions.Abstractions.1.0.0.nupkg
-  #   └── other-file.txt
+  #   drop_build_independent_build_logging/
+  #   ├── packages/
+  #   │   ├── Microsoft.Data.SqlClient.5.0.0.nupkg
+  #   │   └── Microsoft.Data.SqlClient.5.0.0.snupkg
+  #   └── symbols/
+  #       └── ...
   #
-  # Then the packagePath should be 'Microsoft.Data.SqlClient.5.0.0.nupkg'.
+  # Then the packagePath should be 'packages/Microsoft.Data.SqlClient.5.0.0.nupkg'.
   #
-  # Defaults to '${{ parameters.packageName }}.*.nupkg' to match any version of the package.
+  # Defaults to 'packages/${{ parameters.packageName }}.*.nupkg' to match any version of the
+  # package. Only .nupkg files are pushed; .snupkg files are included automatically by NuGet
+  # when they exist alongside the .nupkg in the same directory.
   #
   - name: packagePath
     type: string
@@ -65,13 +68,13 @@ jobs:
 
     variables:
       - name: ob_outputDirectory
-        value: $(PACK_OUTPUT)
+        value: $(JOB_OUTPUT)
 
       - name: artifactPath
         value: $(Pipeline.Workspace)/${{ parameters.artifactName }}
 
       - name: packageToPush
-        value: $(artifactPath)/${{ coalesce(parameters.packagePath, format('{0}.*.nupkg', parameters.packageName)) }}
+        value: $(artifactPath)/${{ coalesce(parameters.packagePath, format('packages/{0}.*.nupkg', parameters.packageName)) }}
 
     # Template context inputs are used to pass parameters to the deployment job since it doesn't
     # automatically download pipeline artifacts.
diff --git a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
new file mode 100644
index 0000000000..21b20476cd
--- /dev/null
+++ b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
@@ -0,0 +1,95 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Reusable job template for publishing symbols for a single package. Downloads the pipeline
+# artifact produced by a build job, then invokes publish-symbols-step.yml to upload and publish
+# the PDB files to the internal and public symbol servers.
+#
+# Each package's PDBs are published separately to maintain unique naming and versioning.
+# PDBs are expected to be located under the 'symbols/' directory within the downloaded
+# artifact.
+
+parameters:
+  # The pipeline artifact name to download (OneBranch naming: drop_<stage>_<job>).
+  - name: artifactName
+    type: string
+
+  # Short package name used in the job name (e.g. Logging, SqlServer, SqlClient).
+  - name: packageName
+    type: string
+
+  # The full NuGet package name (e.g. Microsoft.Data.SqlClient.Internal.Logging).
+  - name: packageFullName
+    type: string
+
+  # The package version, used for symbol versioning.
+  - name: packageVersion
+    type: string
+
+  # Pattern to use to search for PDB files to upload/publish, relative to the symbols folder.
+  - name: searchPattern
+    type: string
+
+  # Symbols Publishing Parameters ------------------------------------------
+
+  - name: symbolsAzureSubscription
+    type: string
+
+  - name: symbolsPublishProjectName
+    type: string
+
+  - name: symbolsPublishServer
+    type: string
+
+  - name: symbolsPublishTokenUri
+    type: string
+
+  - name: symbolsUploadAccount
+    type: string
+
+jobs:
+  - job: publish_symbols_${{ parameters.packageName }}
+    displayName: 'Publish Symbols: ${{ parameters.packageFullName }}'
+    pool:
+      type: windows
+
+    variables:
+      # OneBranch requires ob_outputDirectory to be set, even if this job produces no artifacts.
+      ob_outputDirectory: $(JOB_OUTPUT)
+
+      # Disable SDL scanning — this job only uploads/publishes PDBs and produces no
+      # assemblies to scan. APIScan and BinSkim are handled by the build jobs.
+      ob_sdl_apiscan_enabled: false
+      ob_sdl_binskim_break: false
+      ob_sdl_binskim_enabled: false
+
+      # Path where the downloaded artifact will be placed.
+      artifactPath: $(Pipeline.Workspace)/${{ parameters.artifactName }}
+
+      # Path to the PDB files within the downloaded artifact.
+      symbolsPath: $(Pipeline.Workspace)/${{ parameters.artifactName }}/symbols
+
+    steps:
+      - task: DownloadPipelineArtifact@2
+        displayName: 'Download ${{ parameters.packageFullName }} Artifact'
+        inputs:
+          artifactName: '${{ parameters.artifactName }}'
+          targetPath: '$(artifactPath)'
+
+      - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
+        parameters:
+          artifactName: '${{ parameters.packageFullName }}_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.packageVersion }}_$(System.TimelineId)_$(System.JobAttempt)'
+          azureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+          packageName: '${{ parameters.packageFullName }}'
+          publishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+          publishServer: '${{ parameters.symbolsPublishServer }}'
+          publishToInternal: true
+          publishToPublic: true
+          publishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+          searchPattern: '${{ parameters.searchPattern }}'
+          symbolsFolder: '$(symbolsPath)'
+          uploadAccount: '${{ parameters.symbolsUploadAccount }}'
+          version: '${{ parameters.packageVersion }}'
diff --git a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
index 27369eb6cc..a99b46d45f 100644
--- a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
@@ -48,8 +48,9 @@ jobs:
 
     variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
 
-      - name: artifactPath
-        value: '$(Pipeline.Workspace)\${{ parameters.artifactName }}'
+      # Path within the downloaded artifact where NuGet packages are located.
+      - name: packagesPath
+        value: '$(Pipeline.Workspace)\${{ parameters.artifactName }}\packages'
 
       # Path to the SqlClient NuGet package after installation. This path will only exist once the package
       # been installed.
@@ -85,22 +86,22 @@ jobs:
       - ${{ if eq(parameters.isOfficial, true) }}:
           - powershell: |
               # Propagate parameters to PS variables #######################
-              $artifactPath = "${{ variables.artifactPath }}"
-              echo "artifactPath= $artifactPath"
+              $packagesPath = "${{ variables.packagesPath }}"
+              echo "packagesPath= $packagesPath"
 
               # Verify package signatures ##################################
               echo "> 1. Verify signature of source package(s)"
-              nuget verify -All $artifactPath\*.nupkg
+              nuget verify -All $packagesPath\*.nupkg
 
               echo "> 2. Verify signature of symbols package(s)"
-              nuget verify -All $artifactPath\*.snupkg
+              nuget verify -All $packagesPath\*.snupkg
             displayName: "Verify nuget signature"
 
       # Install NuGet package to the temporary directory
       - powershell: |
           # Propagate pipeline to PS variables #############################
-          $artifactPath = "${{ variables.artifactPath }}"
-          echo "artifactPath= $artifactPath"
+          $packagesPath = "${{ variables.packagesPath }}"
+          echo "packagesPath= $packagesPath"
 
           $nugetPackageInstallRoot = "${{ variables.nugetPackageInstallRoot }}"
           echo "nugetPackageInstallRoot= $nugetPackageInstallRoot"
@@ -109,7 +110,7 @@ jobs:
           echo "> 1. Installing Microsoft.Data.SqlClient NuGet package..."
           Install-Package `
             -Name "Microsoft.Data.SqlClient" `
-            -Source $artifactPath `
+            -Source "$packagesPath" `
             -Destination $nugetPackageInstallRoot `
             -Force `
             -SkipDependencies
@@ -117,6 +118,8 @@ jobs:
           echo "> 2. Listing contents of installed Microsoft.Data.SqlClient NuGet package:"
           Write-Host $nugetPackageInstallRoot
           Get-ChildItem $nugetPackageInstallRoot
+          Write-Host "$packagesPath"
+          Get-ChildItem "$packagesPath"
         displayName: "Install NuGet Package"
 
       # Find all DLL files in the installed NuGet package, verify each is signed with a strong name
diff --git a/eng/pipelines/onebranch/scripts/publish-symbols.ps1 b/eng/pipelines/onebranch/scripts/publish-symbols.ps1
new file mode 100644
index 0000000000..aeaa665a92
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/publish-symbols.ps1
@@ -0,0 +1,236 @@
+<#
+.SYNOPSIS
+    Publishes symbols to the Microsoft symbol publishing service (SymWeb/MSDL).
+
+.DESCRIPTION
+    This script is Step 2 of the two-step symbols publishing process. It requests
+    the Symbols Publishing Pipeline to publish previously uploaded PDB files to
+    internal (SymWeb) and/or public (MSDL) Microsoft symbol servers.
+
+    The two-step process:
+      Step 1 (PublishSymbols@2 task in publish-symbols-step.yml):
+        Uploads PDB files to the Azure DevOps symbol store under a unique
+        artifact name (SymbolsArtifactName). This stores the symbols but does
+        NOT make them available on SymWeb or MSDL.
+
+      Step 2 (this script):
+        Calls the Symbols Publishing Pipeline REST API to request that the
+        uploaded symbols be published to the symbol servers.
+
+    Step 2 depends on Step 1: the -ArtifactName parameter MUST match the
+    SymbolsArtifactName used by the PublishSymbols@2 upload task so that
+    both steps reference the same uploaded artifact.
+
+    This script performs four sub-steps:
+      1. Acquires a bearer token from Azure CLI for the symbol publishing service.
+      2. Registers a unique request name with the publishing service.
+      3. Submits the request to publish symbols to the specified servers.
+      4. Queries the publishing status for confirmation.
+
+    For more details on the Symbols Publishing Pipeline, see:
+    https://www.osgwiki.com/wiki/Symbols_Publishing_Pipeline_to_SymWeb_and_MSDL
+
+.PARAMETER PublishServer
+    The hostname prefix of the symbol publishing service. This value is prepended to
+    '.trafficmanager.net' to construct the service base URL.
+
+.PARAMETER PublishTokenUri
+    The resource URI used to acquire a bearer token from Azure CLI
+    (via 'az account get-access-token --resource <uri>').
+
+.PARAMETER PublishProjectName
+    The project name registered with the symbol publishing service (decided during onboarding).
+
+.PARAMETER ArtifactName
+    The name of the publishing request. This must match the SymbolsArtifactName used by
+    the PublishSymbols@2 upload task so that upload and publish reference the same artifact.
+
+.PARAMETER PublishToInternal
+    Whether to publish symbols to the internal symbol server. Defaults to $true.
+
+.PARAMETER PublishToPublic
+    Whether to publish symbols to the public symbol server. Defaults to $true.
+
+.EXAMPLE
+    .\publish-symbols.ps1 `
+        -PublishServer "mysymbolserver" `
+        -PublishTokenUri "https://login.microsoftonline.com/..." `
+        -PublishProjectName "Microsoft.Data.SqlClient.SNI" `
+        -ArtifactName "mds_symbols_MyProject_dotnet-sqlclient_main_7.0.0_abc123_1"
+
+    Publishes symbols to both internal and public servers using the specified parameters.
+
+.EXAMPLE
+    .\publish-symbols.ps1 `
+        -PublishServer "mysymbolserver" `
+        -PublishTokenUri "https://login.microsoftonline.com/..." `
+        -PublishProjectName "Microsoft.Data.SqlClient.SNI" `
+        -ArtifactName "mds_symbols_MyProject_dotnet-sqlclient_main_7.0.0_abc123_2" `
+        -PublishToPublic $false
+
+    Publishes symbols to the internal server only (retry attempt 2).
+
+.NOTES
+    File Name : publish-symbols.ps1
+    Requires  : Azure CLI (az) must be installed and authenticated.
+    Called by : publish-symbols-step.yml (Azure Pipelines template)
+
+    Publishing status codes returned by the service:
+
+    PublishingStatus:
+      0 - NotRequested: The request has not been requested to publish.
+      1 - Submitted: The request is submitted to be published.
+      2 - Processing: The request is still being processed.
+      3 - Completed: Processing finished. Check PublishingResult for details.
+
+    PublishingResult:
+      0 - Pending: The request has not completed or has not been requested.
+      1 - Succeeded: The request published successfully.
+      2 - Failed: The request failed to publish.
+      3 - Cancelled: The request was cancelled.
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true, HelpMessage = "Hostname prefix of the symbol publishing service (prepended to .trafficmanager.net).")]
+    [ValidateNotNullOrEmpty()]
+    [string]$PublishServer,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Resource URI for acquiring a bearer token via Azure CLI.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$PublishTokenUri,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Project name registered with the symbol publishing service.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$PublishProjectName,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Artifact name for the publishing request (must match PublishSymbols@2 SymbolsArtifactName).")]
+    [ValidateNotNullOrEmpty()]
+    [string]$ArtifactName,
+
+    [Parameter(Mandatory = $false, HelpMessage = "Publish symbols to the internal symbol server.")]
+    [bool]$PublishToInternal = $true,
+
+    [Parameter(Mandatory = $false, HelpMessage = "Publish symbols to the public symbol server.")]
+    [bool]$PublishToPublic = $true
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = "Stop"
+
+# --- Log input parameters ---
+Write-Host "=== Publish Symbols Parameters ==="
+Write-Host "PublishServer:      ${PublishServer}"
+Write-Host "PublishTokenUri:    ${PublishTokenUri}"
+Write-Host "PublishProjectName: ${PublishProjectName}"
+Write-Host "ArtifactName:       ${ArtifactName}"
+Write-Host "PublishToInternal:  ${PublishToInternal}"
+Write-Host "PublishToPublic:    ${PublishToPublic}"
+Write-Host "=================================="
+
+# --- Build request name and URLs ---
+$requestName = ${ArtifactName}
+$baseUrl     = "https://${PublishServer}.trafficmanager.net/projects/${PublishProjectName}"
+$registerUrl = "${baseUrl}/requests"
+$requestUrl  = "${baseUrl}/requests/${requestName}"
+
+Write-Host "=== Constructed URLs ==="
+Write-Host "Request Name: ${requestName}"
+Write-Host "Base URL:     ${baseUrl}"
+Write-Host "Register URL: ${registerUrl}"
+Write-Host "Request URL:  ${requestUrl}"
+Write-Host "========================"
+
+# --- Step 1: Acquire token ---
+Write-Host ">  1. Acquiring symbol publishing token..."
+$symbolPublishingToken = az account get-access-token --resource ${PublishTokenUri} --query accessToken -o tsv
+if ($LASTEXITCODE -ne 0) {
+    throw "Failed to acquire symbol publishing token via Azure CLI (exit code: ${LASTEXITCODE})."
+}
+if ($null -ne $symbolPublishingToken) {
+    $symbolPublishingToken = $symbolPublishingToken.Trim()
+}
+if ([string]::IsNullOrWhiteSpace($symbolPublishingToken)) {
+    throw "Failed to acquire symbol publishing token via Azure CLI: received an empty or whitespace-only access token."
+}
+Write-Host ">  1. Symbol publishing token acquired."
+
+$authHeaders = @{ Authorization = "Bearer ${symbolPublishingToken}" }
+
+# --- Step 2: Register request name ---
+Write-Host ">  2. Registering request name..."
+$requestNameRegistrationBody = @{ requestName = $requestName } | ConvertTo-Json -Compress
+try {
+    Invoke-RestMethod -Method POST -Uri ${registerUrl} -Headers ${authHeaders} -ContentType "application/json" -Body ${requestNameRegistrationBody}
+} catch {
+    throw "Failed to register request name. URI: ${registerUrl} | Body: ${requestNameRegistrationBody} | Error: $_"
+}
+Write-Host ">  2. Request name registered successfully."
+
+# --- Step 3: Publish symbols ---
+Write-Host ">  3. Submitting request to publish symbols..."
+$publishSymbolsBody = @{
+    publishToInternalServer = $PublishToInternal
+    publishToPublicServer   = $PublishToPublic
+} | ConvertTo-Json -Compress
+Write-Host "Publishing symbols request body: ${publishSymbolsBody}"
+try {
+    Invoke-RestMethod -Method POST -Uri ${requestUrl} -Headers ${authHeaders} -ContentType "application/json" -Body ${publishSymbolsBody}
+} catch {
+    throw "Failed to publish symbols. URI: ${requestUrl} | Body: ${publishSymbolsBody} | Error: $_"
+}
+Write-Host ">  3. Request to publish symbols submitted successfully."
+
+# --- Step 4: Check status ---
+Write-Host ">  4. Checking the status of the request..."
+try {
+    $status = Invoke-RestMethod -Method GET -Uri ${requestUrl} -Headers ${authHeaders} -ContentType "application/json"
+    $status
+} catch {
+    throw "Failed to check request status. URI: ${requestUrl} | Error: $_"
+}
+
+# Validate publishing results — fail the task when the service reports a terminal failure.
+# PublishingResult: 0=Pending, 1=Succeeded, 2=Failed, 3=Cancelled
+$resultLabels = @{ 0 = 'Pending'; 1 = 'Succeeded'; 2 = 'Failed'; 3 = 'Cancelled' }
+$failures = @()
+
+if ($PublishToInternal) {
+    $internalResult = $status.publishToInternalServerResult
+    if ($null -ne $internalResult -and $internalResult -ge 2) {
+        $label = if ($resultLabels.ContainsKey([int]$internalResult)) { $resultLabels[[int]$internalResult] } else { "Unknown($internalResult)" }
+        $failures += "Internal server publishing result: ${label} (${internalResult})"
+    }
+}
+
+if ($PublishToPublic) {
+    $publicResult = $status.publishToPublicServerResult
+    if ($null -ne $publicResult -and $publicResult -ge 2) {
+        $label = if ($resultLabels.ContainsKey([int]$publicResult)) { $resultLabels[[int]$publicResult] } else { "Unknown($publicResult)" }
+        $failures += "Public server publishing result: ${label} (${publicResult})"
+    }
+}
+
+if ($failures.Count -gt 0) {
+    $failureMessage = $failures -join '; '
+    throw "Symbol publishing reported a terminal failure. ${failureMessage}. URI: ${requestUrl}"
+}
+
+Write-Host ">  4. Status check completed - no terminal failures detected."
+
+Write-Host ""
+Write-Host "Use below tables to interpret the xxxServerStatus and xxxServerResult fields from the response."
+Write-Host ""
+Write-Host "PublishingStatus"
+Write-Host "-----------------"
+Write-Host "0  NotRequested - The request has not been requested to publish."
+Write-Host "1  Submitted    - The request is submitted to be published."
+Write-Host "2  Processing   - The request is still being processed."
+Write-Host "3  Completed    - Processing finished. Check PublishingResult for details."
+Write-Host ""
+Write-Host "PublishingResult"
+Write-Host "-----------------"
+Write-Host "0  Pending   - The request has not completed or has not been requested."
+Write-Host "1  Succeeded - The request published successfully."
+Write-Host "2  Failed    - The request failed to publish."
+Write-Host "3  Cancelled - The request was cancelled."
diff --git a/eng/pipelines/onebranch/scripts/tests/README.md b/eng/pipelines/onebranch/scripts/tests/README.md
new file mode 100644
index 0000000000..447dda5d32
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/tests/README.md
@@ -0,0 +1,43 @@
+# Publish-Symbols Tests
+
+Pester tests for the `publish-symbols.ps1` script used by the symbol publishing pipeline step.
+
+## Prerequisites
+
+- PowerShell 5.1+ or PowerShell 7+
+- [Pester v5](https://pester.dev/) (`Install-Module Pester -MinimumVersion 5.0 -Scope CurrentUser`)
+
+## Running the Tests
+
+From this directory:
+
+```powershell
+Invoke-Pester ./publish-symbols.Tests.ps1
+```
+
+Or from the repository root:
+
+```powershell
+Invoke-Pester ./eng/pipelines/onebranch/scripts/tests/
+```
+
+For detailed output:
+
+```powershell
+Invoke-Pester ./publish-symbols.Tests.ps1 -Output Detailed
+```
+
+## Test Coverage
+
+| Area                  | What's tested                                                    |
+| --------------------- | ---------------------------------------------------------------- |
+| Parameter validation  | Empty strings rejected for all mandatory parameters              |
+| URL construction      | Base URL, register URL, request URL built from parameters        |
+| Request bodies        | Registration body, default publish flags, flag overrides         |
+| Error handling        | Token failure, registration failure, publish failure, status failure — all verify expanded URI in error message |
+| Status validation     | Detects Failed/Cancelled results, respects PublishToInternal/PublishToPublic flags, passes on Succeeded/Pending |
+
+## Notes
+
+- All external calls (`az`, `Invoke-RestMethod`) are mocked — no network access or Azure credentials are required.
+- Tests validate the script at `../publish-symbols.ps1` relative to this directory.
diff --git a/eng/pipelines/onebranch/scripts/tests/publish-symbols.Tests.ps1 b/eng/pipelines/onebranch/scripts/tests/publish-symbols.Tests.ps1
new file mode 100644
index 0000000000..4d16d54e96
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/tests/publish-symbols.Tests.ps1
@@ -0,0 +1,356 @@
+<#
+.SYNOPSIS
+    Pester tests for publish-symbols.ps1
+#>
+
+BeforeAll {
+    $scriptPath = Join-Path $PSScriptRoot '..' 'publish-symbols.ps1'
+}
+
+AfterAll {
+    # Clean up global variables used by mocks
+    Remove-Variable -Name 'restCalls' -Scope Global -ErrorAction SilentlyContinue
+    Remove-Variable -Name 'mockCallCount' -Scope Global -ErrorAction SilentlyContinue
+}
+
+Describe 'publish-symbols.ps1 Parameter Validation' {
+
+    It 'Should reject an empty PublishServer' {
+        { & $scriptPath -PublishServer '' -PublishTokenUri 'https://token' -PublishProjectName 'proj' -ArtifactName 'art' } |
+            Should -Throw
+    }
+
+    It 'Should reject an empty PublishTokenUri' {
+        { & $scriptPath -PublishServer 'server' -PublishTokenUri '' -PublishProjectName 'proj' -ArtifactName 'art' } |
+            Should -Throw
+    }
+
+    It 'Should reject an empty PublishProjectName' {
+        { & $scriptPath -PublishServer 'server' -PublishTokenUri 'https://token' -PublishProjectName '' -ArtifactName 'art' } |
+            Should -Throw
+    }
+
+    It 'Should reject an empty ArtifactName' {
+        { & $scriptPath -PublishServer 'server' -PublishTokenUri 'https://token' -PublishProjectName 'proj' -ArtifactName '' } |
+            Should -Throw
+    }
+}
+
+Describe 'publish-symbols.ps1 URL Construction' {
+
+    BeforeAll {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token-12345' }
+
+        $global:restCalls = @()
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:restCalls += @{
+                Method = $Method
+                Uri    = $Uri
+                Body   = $Body
+            }
+            return @{ publishToInternalServerStatus = 0; publishToPublicServerStatus = 0; publishToInternalServerResult = 0; publishToPublicServerResult = 0 }
+        }
+    }
+
+    BeforeEach {
+        $global:restCalls = @()
+    }
+
+    It 'Should construct the correct base URL from PublishServer and PublishProjectName' {
+        & $scriptPath `
+            -PublishServer 'myserver' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'My.Project' `
+            -ArtifactName 'test_artifact'
+
+        $global:restCalls.Count | Should -Be 3
+
+        # Registration call
+        $global:restCalls[0].Uri | Should -Be 'https://myserver.trafficmanager.net/projects/My.Project/requests'
+        $global:restCalls[0].Method | Should -Be 'POST'
+
+        # Publish call
+        $global:restCalls[1].Uri | Should -Be 'https://myserver.trafficmanager.net/projects/My.Project/requests/test_artifact'
+        $global:restCalls[1].Method | Should -Be 'POST'
+
+        # Status call
+        $global:restCalls[2].Uri | Should -Be 'https://myserver.trafficmanager.net/projects/My.Project/requests/test_artifact'
+        $global:restCalls[2].Method | Should -Be 'GET'
+    }
+
+    It 'Should use ArtifactName directly as the request name' {
+        & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'myartifact_3'
+
+        $global:restCalls[1].Uri | Should -BeLike '*myartifact_3'
+        $global:restCalls[2].Uri | Should -BeLike '*myartifact_3'
+    }
+}
+
+Describe 'publish-symbols.ps1 Request Bodies' {
+
+    BeforeAll {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token-12345' }
+
+        $global:restCalls = @()
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:restCalls += @{
+                Method = $Method
+                Uri    = $Uri
+                Body   = $Body
+            }
+            return @{ publishToInternalServerStatus = 0; publishToPublicServerStatus = 0; publishToInternalServerResult = 0; publishToPublicServerResult = 0 }
+        }
+    }
+
+    BeforeEach {
+        $global:restCalls = @()
+    }
+
+    It 'Should send the correct request name in the registration body' {
+        & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'my_artifact_1'
+
+        $body = $global:restCalls[0].Body | ConvertFrom-Json
+        $body.requestName | Should -Be 'my_artifact_1'
+    }
+
+    It 'Should default to publishing to both internal and public servers' {
+        & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art'
+
+        $body = $global:restCalls[1].Body | ConvertFrom-Json
+        $body.publishToInternalServer | Should -Be $true
+        $body.publishToPublicServer | Should -Be $true
+    }
+
+    It 'Should respect PublishToInternal=false' {
+        & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' `
+            -PublishToInternal $false
+
+        $body = $global:restCalls[1].Body | ConvertFrom-Json
+        $body.publishToInternalServer | Should -Be $false
+        $body.publishToPublicServer | Should -Be $true
+    }
+
+    It 'Should respect PublishToPublic=false' {
+        & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' `
+            -PublishToPublic $false
+
+        $body = $global:restCalls[1].Body | ConvertFrom-Json
+        $body.publishToInternalServer | Should -Be $true
+        $body.publishToPublicServer | Should -Be $false
+    }
+}
+
+Describe 'publish-symbols.ps1 Error Handling' {
+
+    It 'Should throw when token acquisition fails' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 1; return '' }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' } |
+            Should -Throw '*token*'
+    }
+
+    It 'Should throw when token is empty' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return '  ' }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' } |
+            Should -Throw '*empty*'
+    }
+
+    It 'Should throw with URI details when registration fails' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token' }
+        Mock -CommandName 'Invoke-RestMethod' -MockWith { throw "Connection refused" }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' } |
+            Should -Throw '*Failed to register*'
+    }
+
+    It 'Should throw with URI details when publish fails' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token' }
+        $global:mockCallCount = 0
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:mockCallCount++
+            if ($global:mockCallCount -eq 1) { return @{} }
+            throw "Service unavailable"
+        }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' } |
+            Should -Throw '*Failed to publish*'
+    }
+
+    It 'Should throw with URI details when status check fails' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token' }
+        $global:mockCallCount = 0
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:mockCallCount++
+            if ($global:mockCallCount -le 2) { return @{} }
+            throw "Timeout"
+        }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' } |
+            Should -Throw '*Failed to check*'
+    }
+}
+
+Describe 'publish-symbols.ps1 Status Failure Detection' {
+
+    It 'Should throw when internal server result is Failed (2)' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token' }
+        $global:mockCallCount = 0
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:mockCallCount++
+            if ($global:mockCallCount -le 2) { return @{} }
+            return @{ publishToInternalServerResult = 2; publishToPublicServerResult = 0 }
+        }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' } |
+            Should -Throw '*terminal failure*Internal server*Failed*'
+    }
+
+    It 'Should throw when public server result is Cancelled (3)' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token' }
+        $global:mockCallCount = 0
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:mockCallCount++
+            if ($global:mockCallCount -le 2) { return @{} }
+            return @{ publishToInternalServerResult = 1; publishToPublicServerResult = 3 }
+        }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' } |
+            Should -Throw '*terminal failure*Public server*Cancelled*'
+    }
+
+    It 'Should throw when both servers report failure' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token' }
+        $global:mockCallCount = 0
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:mockCallCount++
+            if ($global:mockCallCount -le 2) { return @{} }
+            return @{ publishToInternalServerResult = 2; publishToPublicServerResult = 3 }
+        }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' } |
+            Should -Throw '*terminal failure*Internal server*Public server*'
+    }
+
+    It 'Should not throw when both servers report Succeeded (1)' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token' }
+        $global:mockCallCount = 0
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:mockCallCount++
+            if ($global:mockCallCount -le 2) { return @{} }
+            return @{ publishToInternalServerResult = 1; publishToPublicServerResult = 1 }
+        }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' } |
+            Should -Not -Throw
+    }
+
+    It 'Should not throw when results are Pending (0)' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token' }
+        $global:mockCallCount = 0
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:mockCallCount++
+            if ($global:mockCallCount -le 2) { return @{} }
+            return @{ publishToInternalServerResult = 0; publishToPublicServerResult = 0 }
+        }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' } |
+            Should -Not -Throw
+    }
+
+    It 'Should not check internal result when PublishToInternal is false' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token' }
+        $global:mockCallCount = 0
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:mockCallCount++
+            if ($global:mockCallCount -le 2) { return @{} }
+            return @{ publishToInternalServerResult = 2; publishToPublicServerResult = 1 }
+        }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' `
+            -PublishToInternal $false } |
+            Should -Not -Throw
+    }
+
+    It 'Should not check public result when PublishToPublic is false' {
+        Mock -CommandName 'az' -MockWith { $global:LASTEXITCODE = 0; return 'fake-token' }
+        $global:mockCallCount = 0
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:mockCallCount++
+            if ($global:mockCallCount -le 2) { return @{} }
+            return @{ publishToInternalServerResult = 1; publishToPublicServerResult = 2 }
+        }
+
+        { & $scriptPath `
+            -PublishServer 'srv' `
+            -PublishTokenUri 'https://token-uri' `
+            -PublishProjectName 'proj' `
+            -ArtifactName 'art' `
+            -PublishToPublic $false } |
+            Should -Not -Throw
+    }
+}
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index a908ae4e74..4ae301020f 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -174,7 +174,6 @@ extends:
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
         parameters:
           isOfficial: false # This is a non-official pipeline.
-          publishSymbols: ${{ parameters.publishSymbols }}
           buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
           buildSqlClient: ${{ parameters.buildSqlClient }}
           buildAkvProvider: ${{ parameters.buildAkvProvider }}
@@ -204,10 +203,32 @@ extends:
           signingAuthSignCertName: '$(SigningAuthSignCertName)'
           signingEsrpClientId: '$(SigningEsrpClientId)'
           signingEsrpConnectedServiceName: '$(SigningEsrpConnectedServiceName)'
+
+      - template: /eng/pipelines/onebranch/stages/publish-symbols-stage.yml@self
+        parameters:
+          publishSymbols: ${{ parameters.publishSymbols }}
+          buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
+          buildSqlClient: ${{ parameters.buildSqlClient }}
+          buildAkvProvider: ${{ parameters.buildAkvProvider }}
+
+          abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
+          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
+          akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
+          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
+          azureArtifactsName: '${{ variables.azureArtifactsName }}'
+          azurePackageVersion: '${{ variables.azurePackageVersion }}'
+          loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
+          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
+          sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
+          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
+          sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
+          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
+
           symbolsAzureSubscription: '$(SymbolsAzureSubscription)'
-          symbolsPublishProjectName: '$(SymbolsPublishProjectName)'
-          symbolsPublishServer: '$(SymbolsPublishServer)'
-          symbolsPublishTokenUri: '$(SymbolsPublishTokenUri)'
+          symbolsPublishProjectName: '$(SymbolsPublishProjectNameSqlClient)'
+          # Non-Official pipelines must publish to the PPE symbol server.
+          symbolsPublishServer: '$(SymbolsPublishServerPPE)'
+          symbolsPublishTokenUri: '$(SymbolsPublishTokenUriPPE)'
           symbolsUploadAccount: '$(SymbolsUploadAccount)'
 
       - template: /eng/pipelines/onebranch/stages/release-stages.yml@self
@@ -219,6 +240,8 @@ extends:
           isOfficial: false
           stageNameSuffix: test
 
+          publishSymbols: ${{ parameters.publishSymbols }}
+
           abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
           abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
           akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 7f02ea0226..a2902f1e21 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -202,7 +202,6 @@ extends:
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
         parameters:
           isOfficial: true # This is an official pipeline.
-          publishSymbols: ${{ parameters.publishSymbols }}
           buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
           buildSqlClient: ${{ parameters.buildSqlClient }}
           buildAkvProvider: ${{ parameters.buildAkvProvider }}
@@ -232,10 +231,32 @@ extends:
           signingAuthSignCertName: '$(SigningAuthSignCertName)'
           signingEsrpClientId: '$(SigningEsrpClientId)'
           signingEsrpConnectedServiceName: '$(SigningEsrpConnectedServiceName)'
+
+      - template: /eng/pipelines/onebranch/stages/publish-symbols-stage.yml@self
+        parameters:
+          publishSymbols: ${{ parameters.publishSymbols }}
+          buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
+          buildSqlClient: ${{ parameters.buildSqlClient }}
+          buildAkvProvider: ${{ parameters.buildAkvProvider }}
+
+          abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
+          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
+          akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
+          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
+          azureArtifactsName: '${{ variables.azureArtifactsName }}'
+          azurePackageVersion: '${{ variables.azurePackageVersion }}'
+          loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
+          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
+          sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
+          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
+          sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
+          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
+
           symbolsAzureSubscription: '$(SymbolsAzureSubscription)'
-          symbolsPublishProjectName: '$(SymbolsPublishProjectName)'
-          symbolsPublishServer: '$(SymbolsPublishServer)'
-          symbolsPublishTokenUri: '$(SymbolsPublishTokenUri)'
+          symbolsPublishProjectName: '$(SymbolsPublishProjectNameSqlClient)'
+          # Official pipelines must publish to the Production symbol server.
+          symbolsPublishServer: '$(SymbolsPublishServerProd)'
+          symbolsPublishTokenUri: '$(SymbolsPublishTokenUriProd)'
           symbolsUploadAccount: '$(SymbolsUploadAccount)'
 
       - template: /eng/pipelines/onebranch/stages/release-stages.yml@self
@@ -246,6 +267,8 @@ extends:
           isOfficial: true
           stageNameSuffix: production
 
+          publishSymbols: ${{ parameters.publishSymbols }}
+
           abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
           abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
           akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index ba24af6309..252f63fb0a 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -22,10 +22,6 @@ parameters:
   - name: isOfficial
     type: boolean
 
-  # True to publish symbols to public and private servers.
-  - name: publishSymbols
-    type: boolean
-
   # ── Build parameters ───────────────────────────────────────────────────
 
   - name: buildSqlServerServer
@@ -113,23 +109,6 @@ parameters:
   - name: signingEsrpConnectedServiceName
     type: string
 
-  # Symbols Publishing Parameters ------------------------------------------
-
-  - name: symbolsAzureSubscription
-    type: string
-
-  - name: symbolsPublishProjectName
-    type: string
-
-  - name: symbolsPublishServer
-    type: string
-
-  - name: symbolsPublishTokenUri
-    type: string
-
-  - name: symbolsUploadAccount
-    type: string
-
 stages:
   # ====================================================================
   # Stage 1: Independent packages (no cross-package dependencies)
@@ -148,21 +127,14 @@ stages:
             signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
             signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
             signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-            symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-            symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-            symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-            symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-            symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
             isOfficial: ${{ parameters.isOfficial }}
             packageName: Logging
             packageFullName: Microsoft.Data.SqlClient.Internal.Logging
-            packageVersion: '${{ parameters.loggingPackageVersion }}'
             versionProperties: >-
               -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
               -p:LoggingAssemblyFileVersion=${{ parameters.loggingFileVersion }}
             assemblyFileVersion: '${{ parameters.loggingFileVersion }}'
-            publishSymbols: ${{ parameters.publishSymbols }}
 
 
       - ${{ if eq(parameters.buildSqlServerServer, true) }}:
@@ -174,21 +146,14 @@ stages:
             signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
             signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
             signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-            symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-            symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-            symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-            symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-            symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
             isOfficial: ${{ parameters.isOfficial }}
             packageName: SqlServer
             packageFullName: Microsoft.SqlServer.Server
-            packageVersion: '${{ parameters.sqlServerPackageVersion }}'
             versionProperties: >-
               -p:SqlServerAssemblyFileVersion=${{ parameters.sqlServerFileVersion }}
               -p:SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }}
             assemblyFileVersion: '${{ parameters.sqlServerFileVersion }}'
-            publishSymbols: ${{ parameters.publishSymbols }}
 
   # ====================================================================
   # Stage 2: Abstractions package (depends on Logging from Stage 1)
@@ -209,22 +174,15 @@ stages:
               signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
               signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
               signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
               isOfficial: ${{ parameters.isOfficial }}
               packageName: Abstractions
               packageFullName: Microsoft.Data.SqlClient.Extensions.Abstractions
-              packageVersion: '${{ parameters.abstractionsPackageVersion }}'
               versionProperties: >-
                 -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
                 -p:AbstractionsAssemblyFileVersion=${{ parameters.abstractionsFileVersion }}
                 -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
               assemblyFileVersion: '${{ parameters.abstractionsFileVersion }}'
-              publishSymbols: ${{ parameters.publishSymbols }}
               downloadArtifacts:
                 - artifactName: '${{ parameters.loggingArtifactsName }}'
                   displayName: 'Logging Package'
@@ -242,21 +200,13 @@ stages:
         jobs:
           - template: /eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml@self
             parameters:
-              apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/dlls'
-              apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/pdbs'
               isOfficial: ${{ parameters.isOfficial }}
-              publishSymbols: ${{ parameters.publishSymbols }}
               signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
               signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
               signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
               signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
               signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
               signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
               abstractionsArtifactName: '${{ parameters.abstractionsArtifactsName }}'
               abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
@@ -273,23 +223,16 @@ stages:
               signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
               signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
               signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
               isOfficial: ${{ parameters.isOfficial }}
               packageName: Azure
               packageFullName: Microsoft.Data.SqlClient.Extensions.Azure
-              packageVersion: '${{ parameters.azurePackageVersion }}'
               versionProperties: >-
                 -p:AzurePackageVersion=${{ parameters.azurePackageVersion }}
                 -p:AzureAssemblyFileVersion=${{ parameters.azureFileVersion }}
                 -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
                 -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
               assemblyFileVersion: '${{ parameters.azureFileVersion }}'
-              publishSymbols: ${{ parameters.publishSymbols }}
               downloadArtifacts:
                 - artifactName: '${{ parameters.abstractionsArtifactsName }}'
                   displayName: Abstractions Package
@@ -314,16 +257,10 @@ stages:
               signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
               signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
               signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
               isOfficial: ${{ parameters.isOfficial }}
               packageName: AkvProvider
               packageFullName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
-              packageVersion: '${{ parameters.akvProviderPackageVersion }}'
               versionProperties: >-
                 -p:AkvPackageVersion=${{ parameters.akvProviderPackageVersion }}
                 -p:AkvAssemblyFileVersion=${{ parameters.akvProviderFileVersion }}
@@ -331,7 +268,6 @@ stages:
                 -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
                 -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
               assemblyFileVersion: '${{ parameters.akvProviderFileVersion }}'
-              publishSymbols: ${{ parameters.publishSymbols }}
               downloadArtifacts:
                 - artifactName: '${{ parameters.sqlClientArtifactsName }}'
                   displayName: SqlClient Package
diff --git a/eng/pipelines/onebranch/stages/publish-symbols-stage.yml b/eng/pipelines/onebranch/stages/publish-symbols-stage.yml
new file mode 100644
index 0000000000..e716d2255d
--- /dev/null
+++ b/eng/pipelines/onebranch/stages/publish-symbols-stage.yml
@@ -0,0 +1,222 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Unified symbols publishing stage template for sqlclient OneBranch pipelines.
+# Consumed by both the official and non-official pipeline definitions.
+#
+# This stage publishes PDB symbol files to the internal and public symbol servers.
+# Each package's PDBs are published in a separate job to maintain unique naming and
+# versioning information per package.
+#
+# PDBs are expected to be located under the 'symbols/' directory at the root of
+# each build artifact, with target framework subdirectories preserved by the build
+# job's CopyFiles step. The publish-symbols job consumes that 'symbols' folder directly.
+#
+# Note that none of the resource DLLs we build produce PDBs, so there are no patterns below that
+# match them.
+#
+# The stage is excluded at compile time when publishSymbols is false.
+
+parameters:
+  # ── General parameters ─────────────────────────────────────────────────
+
+  # True to publish symbols (controls whether this stage is emitted at all).
+  - name: publishSymbols
+    type: boolean
+
+  # ── Build parameters (used to conditionally include per-package jobs) ───
+
+  - name: buildSqlServerServer
+    type: boolean
+
+  - name: buildSqlClient
+    type: boolean
+
+  - name: buildAkvProvider
+    type: boolean
+
+  # ── Package Parameters ─────────────────────────────────────────────────
+
+  - name: abstractionsArtifactsName
+    type: string
+
+  - name: abstractionsPackageVersion
+    type: string
+
+  - name: akvProviderArtifactsName
+    type: string
+
+  - name: akvProviderPackageVersion
+    type: string
+
+  - name: azureArtifactsName
+    type: string
+
+  - name: azurePackageVersion
+    type: string
+
+  - name: loggingArtifactsName
+    type: string
+
+  - name: loggingPackageVersion
+    type: string
+
+  - name: sqlClientArtifactsName
+    type: string
+
+  - name: sqlClientPackageVersion
+    type: string
+
+  - name: sqlServerArtifactsName
+    type: string
+
+  - name: sqlServerPackageVersion
+    type: string
+
+  # ── Symbols Publishing Parameters ──────────────────────────────────────
+
+  - name: symbolsAzureSubscription
+    type: string
+
+  - name: symbolsPublishProjectName
+    type: string
+
+  - name: symbolsPublishServer
+    type: string
+
+  - name: symbolsPublishTokenUri
+    type: string
+
+  - name: symbolsUploadAccount
+    type: string
+
+stages:
+  # Stage is emitted whenever publishSymbols is true.  If no packages were
+  # built, only the no-op placeholder job runs and the stage succeeds
+  # immediately — keeping the dependency graph simple for downstream stages.
+  - ${{ if eq(parameters.publishSymbols, true) }}:
+    - stage: publish_symbols
+      displayName: "Publish Symbols"
+
+      # Depend on whichever build stages produced artifacts we need to publish.
+      dependsOn:
+        - ${{ if or(parameters.buildSqlServerServer, parameters.buildSqlClient, parameters.buildAkvProvider) }}:
+          - build_independent
+        - ${{ if parameters.buildSqlClient }}:
+          - build_abstractions
+          - build_dependent
+        - ${{ if and(parameters.buildAkvProvider, parameters.buildSqlClient) }}:
+          - build_addons
+
+      jobs:
+        # ── No-op placeholder ──────────────────────────────────────────
+        # When no packages were built, this job keeps the stage valid
+        # (ADO requires at least one job per stage) and succeeds instantly.
+        - ${{ if not(or(parameters.buildSqlServerServer, parameters.buildSqlClient, parameters.buildAkvProvider)) }}:
+          - job: publish_symbols_noop
+            displayName: "No symbols to publish"
+            pool:
+              type: linux
+            steps:
+              - script: echo "No packages were built — nothing to publish."
+                displayName: Skip
+
+        # ── Logging ────────────────────────────────────────────────────
+        - ${{ if or(parameters.buildAkvProvider, parameters.buildSqlClient) }}:
+          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+            parameters:
+              artifactName: '${{ parameters.loggingArtifactsName }}'
+              packageName: Logging
+              packageFullName: Microsoft.Data.SqlClient.Internal.Logging
+              packageVersion: '${{ parameters.loggingPackageVersion }}'
+              # Matches: Microsoft.Data.SqlClient.Internal.Logging.pdb across all TFM subdirs.
+              searchPattern: '**/Microsoft.Data.SqlClient.Internal.Logging.pdb'
+              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+        # ── SqlServer.Server ───────────────────────────────────────────
+        - ${{ if eq(parameters.buildSqlServerServer, true) }}:
+          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+            parameters:
+              artifactName: '${{ parameters.sqlServerArtifactsName }}'
+              packageName: SqlServer
+              packageFullName: Microsoft.SqlServer.Server
+              packageVersion: '${{ parameters.sqlServerPackageVersion }}'
+              # Matches: Microsoft.SqlServer.Server.pdb across all TFM subdirs.
+              searchPattern: '**/Microsoft.SqlServer.Server.pdb'
+              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+        # ── Abstractions ───────────────────────────────────────────────
+        - ${{ if eq(parameters.buildSqlClient, true) }}:
+          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+            parameters:
+              artifactName: '${{ parameters.abstractionsArtifactsName }}'
+              packageName: Abstractions
+              packageFullName: Microsoft.Data.SqlClient.Extensions.Abstractions
+              packageVersion: '${{ parameters.abstractionsPackageVersion }}'
+              # Matches: Microsoft.Data.SqlClient.Extensions.Abstractions.pdb across all TFM subdirs.
+              searchPattern: '**/Microsoft.Data.SqlClient.Extensions.Abstractions.pdb'
+              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+        # ── SqlClient ──────────────────────────────────────────────────
+        - ${{ if eq(parameters.buildSqlClient, true) }}:
+          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+            parameters:
+              artifactName: '${{ parameters.sqlClientArtifactsName }}'
+              packageName: SqlClient
+              packageFullName: Microsoft.Data.SqlClient
+              packageVersion: '${{ parameters.sqlClientPackageVersion }}'
+              # Matches: Microsoft.Data.SqlClient.pdb across all OS/TFM subdirs.
+              # Excludes: Microsoft.Data.SqlClient.SNI*.pdb (native SNI — symbols published separately).
+              searchPattern: '**/Microsoft.Data.SqlClient.pdb'
+              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+        # ── Azure ──────────────────────────────────────────────────────
+        - ${{ if eq(parameters.buildSqlClient, true) }}:
+          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+            parameters:
+              artifactName: '${{ parameters.azureArtifactsName }}'
+              packageName: Azure
+              packageFullName: Microsoft.Data.SqlClient.Extensions.Azure
+              packageVersion: '${{ parameters.azurePackageVersion }}'
+              # Matches: Microsoft.Data.SqlClient.Extensions.Azure.pdb across all TFM subdirs.
+              searchPattern: '**/Microsoft.Data.SqlClient.Extensions.Azure.pdb'
+              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+
+        # ── AKV Provider ───────────────────────────────────────────────
+        - ${{ if and(eq(parameters.buildAkvProvider, true), eq(parameters.buildSqlClient, true)) }}:
+          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+            parameters:
+              artifactName: '${{ parameters.akvProviderArtifactsName }}'
+              packageName: AkvProvider
+              packageFullName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
+              packageVersion: '${{ parameters.akvProviderPackageVersion }}'
+              # Matches: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb across all TFM subdirs.
+              searchPattern: '**/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb'
+              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
diff --git a/eng/pipelines/onebranch/stages/release-stages.yml b/eng/pipelines/onebranch/stages/release-stages.yml
index 917447a077..6ee3fbc88e 100644
--- a/eng/pipelines/onebranch/stages/release-stages.yml
+++ b/eng/pipelines/onebranch/stages/release-stages.yml
@@ -89,6 +89,14 @@ parameters:
   - name: sqlServerPackageVersion
     type: string
 
+  # ── Symbols publishing parameter ───────────────────────────────────────
+  # When true, the release stage will depend on publish_symbols so that
+  # symbol publishing completes before packages are released.
+
+  - name: publishSymbols
+    type: boolean
+    default: false
+
   # ── Release parameters ─────────────────────────────────────────────────
 
   - name: releaseSqlServerServer
@@ -139,6 +147,8 @@ stages:
           - sqlclient_package_validation
         - ${{ if parameters.releaseAkvProvider }}:
           - build_addons
+        - ${{ if parameters.publishSymbols }}:
+          - publish_symbols
 
       variables:
         - name: onebranchReleaseEnvironment
@@ -183,7 +193,7 @@ stages:
             parameters:
               packageName: Microsoft.SqlServer.Server
               artifactName: '${{ parameters.sqlServerArtifactsName }}'
-              packagePath: 'Microsoft.SqlServer.Server.${{ parameters.sqlServerPackageVersion }}.nupkg'
+              packagePath: 'packages/Microsoft.SqlServer.Server.${{ parameters.sqlServerPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -193,7 +203,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.Internal.Logging
               artifactName: '${{ parameters.loggingArtifactsName }}'
-              packagePath: 'Microsoft.Data.SqlClient.Internal.Logging.${{ parameters.loggingPackageVersion }}.nupkg'
+              packagePath: 'packages/Microsoft.Data.SqlClient.Internal.Logging.${{ parameters.loggingPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -203,7 +213,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Abstractions
               artifactName: '${{ parameters.abstractionsArtifactsName }}'
-              packagePath: 'Microsoft.Data.SqlClient.Extensions.Abstractions.${{ parameters.abstractionsPackageVersion }}.nupkg'
+              packagePath: 'packages/Microsoft.Data.SqlClient.Extensions.Abstractions.${{ parameters.abstractionsPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -213,7 +223,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient
               artifactName: '${{ parameters.sqlClientArtifactsName }}'
-              packagePath: 'Microsoft.Data.SqlClient.${{ parameters.sqlClientPackageVersion }}.nupkg'
+              packagePath: 'packages/Microsoft.Data.SqlClient.${{ parameters.sqlClientPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -223,7 +233,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Azure
               artifactName: '${{ parameters.azureArtifactsName }}'
-              packagePath: 'Microsoft.Data.SqlClient.Extensions.Azure.${{ parameters.azurePackageVersion }}.nupkg'
+              packagePath: 'packages/Microsoft.Data.SqlClient.Extensions.Azure.${{ parameters.azurePackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -233,7 +243,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
               artifactName: '${{ parameters.akvProviderArtifactsName }}'
-              packagePath: 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.${{ parameters.akvProviderPackageVersion }}.nupkg'
+              packagePath: 'packages/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.${{ parameters.akvProviderPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
diff --git a/eng/pipelines/onebranch/steps/copy-apiscan-files-sqlclient-step.yml b/eng/pipelines/onebranch/steps/copy-apiscan-files-sqlclient-step.yml
deleted file mode 100644
index 653eb40f5d..0000000000
--- a/eng/pipelines/onebranch/steps/copy-apiscan-files-sqlclient-step.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# @TODO: This can be made more generic
-
-parameters:
-  # Path where dll files should be copied to for APIScan
-  - name: dllPath
-    type: string
-
-  # Path where pdb files should be copied to for APIScan
-  - name: pdbPath
-    type: string
-
-  - name: referenceType
-    type: string
-    values:
-      - Package
-      - Project
-
-steps:
-  - task: CopyFiles@2
-    displayName: 'Copy DLLs for APIScan'
-    inputs:
-      contents: '**/Microsoft.Data.SqlClient.dll'
-      flattenFolders: false  # Disabled to keep different frameworks and OS builds separate in the target
-      sourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/${{ parameters.referenceType }}-Release/'
-      targetFolder: '${{ parameters.dllPath }}/'
-
-  - task: CopyFiles@2
-    displayName: 'Copy PDBs for APIScan'
-    inputs:
-      contents: '**/Microsoft.Data.SqlClient.pdb'
-      flattenFolders: false  # Disabled to keep different frameworks and OS builds separate in the target
-      sourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/${{ parameters.referenceType }}-Release/'
-      targetFolder: '${{ parameters.pdbPath }}/'
diff --git a/eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml b/eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml
index 073911e5fe..db95ef4f24 100644
--- a/eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml
+++ b/eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml
@@ -30,8 +30,9 @@ parameters:
   - name: esrpClientId
     type: string
 
-  # Globbing pattern for the files to sign. All files in $(BUILD_OUTPUT)
-  # that match this pattern will be scanned and signed. This should end with ".dll".
+  # Minimatch pattern(s) for the files to sign. All files in $(BUILD_OUTPUT)
+  # that match will be scanned and signed. Supports multi-line patterns and
+  # negation (!pattern). See https://aka.ms/esrp.signtask for details.
   - name: pattern
     type: string
 
@@ -47,6 +48,7 @@ steps:
       EsrpClientId: '${{ parameters.esrpClientId }}'
       FolderPath: '$(BUILD_OUTPUT)'
       Pattern: '${{ parameters.pattern }}'
+      UseMinimatch: true
       UseMSIAuthentication: true
       VerboseLogin: 1
 
@@ -62,6 +64,7 @@ steps:
       EsrpClientId: '${{ parameters.esrpClientId }}'
       FolderPath: '$(BUILD_OUTPUT)'
       Pattern: '${{ parameters.pattern }}'
+      UseMinimatch: true
       signConfigType: inlineSignParams
       UseMSIAuthentication: true
       inlineOperation: |
diff --git a/eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml b/eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml
index bddbac517c..6a6682d40f 100644
--- a/eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml
+++ b/eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml
@@ -34,7 +34,8 @@ parameters:
   - name: searchPath
     type: string
 
-  # Globbing pattern to use to search for NuGet packages. If not provided, defaults to '*.*nupkg'
+  # Minimatch pattern(s) to search for NuGet packages. Supports multi-line
+  # patterns and negation (!pattern). Defaults to '*.*nupkg'.
   - name: searchPattern
     type: string
     default: '*.*nupkg'
@@ -51,6 +52,7 @@ steps:
       EsrpClientId: '${{ parameters.esrpClientId }}'
       FolderPath: '${{ parameters.searchPath }}'
       Pattern: '${{ parameters.searchPattern }}'
+      UseMinimatch: true
       UseMSIAuthentication: true
       VerboseLogin: 1
 
@@ -66,6 +68,7 @@ steps:
       AuthSignCertName: '${{ parameters.authSignCertName }}'
       FolderPath: '${{ parameters.searchPath }}'
       Pattern: '${{ parameters.searchPattern }}'
+      UseMinimatch: true
       signConfigType: 'inlineSignParams'
       UseMSIAuthentication: true
       inlineOperation: |
diff --git a/eng/pipelines/onebranch/steps/pack-csproj-step.yml b/eng/pipelines/onebranch/steps/pack-csproj-step.yml
index edbec72c00..535106a9d1 100644
--- a/eng/pipelines/onebranch/steps/pack-csproj-step.yml
+++ b/eng/pipelines/onebranch/steps/pack-csproj-step.yml
@@ -28,8 +28,8 @@ steps:
       msbuildArguments: >-
         -t:${{ parameters.packTarget }}
         -p:ReferenceType=Package
-        -p:PackagesDir=$(PACK_OUTPUT)/
+        -p:PackagesDir=$(JOB_OUTPUT)/packages/
         ${{ parameters.versionProperties }}
 
-  - script: tree /a /f $(PACK_OUTPUT)
+  - script: tree /a /f $(JOB_OUTPUT)/packages
     displayName: List Pack Output Tree After Pack
diff --git a/eng/pipelines/onebranch/steps/pack-sqlclient-step.yml b/eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
index 933c37f6a6..73229fe834 100644
--- a/eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
+++ b/eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
@@ -34,9 +34,9 @@ steps:
     displayName: Output Build Output Tree
 
   - task: CopyFiles@2
-    displayName: 'Copy NuGet Packages to PACK_OUTPUT'
+    displayName: 'Copy NuGet Packages to JOB_OUTPUT'
     inputs:
       contents: '**/Microsoft.Data.SqlClient*.*nupkg'
       flattenFolders: true
       sourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/'
-      targetFolder: '$(PACK_OUTPUT)'
+      targetFolder: '$(JOB_OUTPUT)/packages'
diff --git a/eng/pipelines/onebranch/steps/publish-symbols-step.yml b/eng/pipelines/onebranch/steps/publish-symbols-step.yml
index 48ee30b9c2..d06b3c73e5 100644
--- a/eng/pipelines/onebranch/steps/publish-symbols-step.yml
+++ b/eng/pipelines/onebranch/steps/publish-symbols-step.yml
@@ -4,7 +4,23 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# For more details, see https://www.osgwiki.com/wiki/Symbols_Publishing_Pipeline_to_SymWeb_and_MSDL
+# Symbols Publishing Pipeline
+# ===========================
+# Canonical docs: https://www.osgwiki.com/wiki/Symbols_Publishing_Pipeline_to_SymWeb_and_MSDL
+#
+# Publishing symbols to SymWeb (internal) and MSDL (public) is a two-step process:
+#
+#   Step 1 - Upload:  The PublishSymbols@2 task uploads PDB files to the Azure DevOps
+#            symbol store under an artifact name (SymbolsArtifactName). This stores the
+#            symbols but does NOT make them available on SymWeb or MSDL.
+#
+#   Step 2 - Publish: The publish-symbols.ps1 script calls the Symbols Publishing Pipeline
+#            REST API to request that the previously uploaded symbols be published to the
+#            internal (SymWeb) and/or public (MSDL) symbol servers.
+#
+# IMPORTANT: Step 2 depends on Step 1. The ArtifactName parameter passed to the publish
+# script MUST match the SymbolsArtifactName used by PublishSymbols@2 so that both steps
+# reference the same uploaded artifact.
 
 parameters:
     # Name of the symbols artifact that will be published
@@ -43,6 +59,13 @@ parameters:
     - name: searchPattern
       type: string
 
+    # Root folder to search for PDB files. When called from a build job this is typically
+    # $(BUILD_OUTPUT); when called from the dedicated symbols stage it points at the
+    # downloaded artifact path containing the PDBs.
+    - name: symbolsFolder
+      type: string
+      default: '$(BUILD_OUTPUT)'
+
     # Account/org where the symbols will be uploaded
     - name: uploadAccount
       type: string
@@ -60,8 +83,46 @@ steps:
     - script: 'echo ##vso[task.setvariable variable=ArtifactServices.Symbol.AccountName;]${{ parameters.uploadAccount }}'
       displayName: 'Set ArtifactServices.Symbol.AccountName to ${{ parameters.uploadAccount }}'
 
+    # Log the PDB files that match the search pattern so we can verify no
+    # unexpected files are included in the upload.
+    - pwsh: |
+        $folder = '${{ parameters.symbolsFolder }}'
+        $glob   = '${{ parameters.searchPattern }}'
+        Write-Host "Symbols folder : $folder"
+        Write-Host "Search pattern : $glob"
+
+        # Convert the glob to a regex that can match against relative paths.
+        #   **  → match any number of path segments (.*?)
+        #   *   → match within a single segment ([^/\\]*)
+        #   ?   → match a single non-separator char ([^/\\])
+        #   .   → literal dot
+        $regex = [regex]::Escape($glob)
+        $regex = $regex -replace '\\\*\\\*[/\\]?', '.*?'   # ** or **/
+        $regex = $regex -replace '\\\*', '[^/\\]*'          # single *
+        $regex = $regex -replace '\\\?', '[^/\\]'           # single ?
+        $regex = '^' + $regex + '$'
+        Write-Host "Regex          : $regex"
+        Write-Host ""
+
+        $allFiles = Get-ChildItem -Path $folder -Recurse -File
+        $matched = $allFiles | Where-Object {
+            $rel = $_.FullName.Substring($folder.Length).TrimStart('/\')
+            $rel -match $regex
+        }
+
+        if (-not $matched) {
+            Write-Host "##vso[task.logissue type=warning]No PDB files matched pattern '$glob' under '$folder'"
+        } else {
+            $count = @($matched).Count
+            Write-Host "Matched $count PDB file(s):"
+            $matched | ForEach-Object { Write-Host "  $($_.FullName)" }
+        }
+      displayName: 'Log PDBs matching ${{ parameters.searchPattern }}'
+
+    # Step 1 - Upload: Push PDB files to the Azure DevOps symbol store.
+    # The SymbolsArtifactName set here is the key that links this upload to Step 2.
     - task: PublishSymbols@2
-      displayName: 'Upload symbols to ${{ parameters.uploadAccount }} org'
+      displayName: 'Step 1: Upload symbols to ${{ parameters.uploadAccount }} org'
       inputs:
           IndexSources: false
           Pat: '$(System.AccessToken)'
@@ -69,85 +130,25 @@ steps:
           SymbolExpirationInDays: 1825 # 5 years
           SymbolServerType: 'TeamServices'
           SymbolsArtifactName: '${{ parameters.artifactName }}'
-          SymbolsFolder: '$(BUILD_OUTPUT)'
+          SymbolsFolder: '${{ parameters.symbolsFolder }}'
           SymbolsMaximumWaitTime: 60
           SymbolsProduct: '${{ parameters.packageName }}'
           SymbolsVersion: '${{ parameters.version }}'
 
+    # Step 2 - Publish: Request the Symbols Publishing Pipeline to publish the uploaded
+    # symbols to SymWeb and/or MSDL. The -ArtifactName argument must match the
+    # SymbolsArtifactName from Step 1.
     - task: AzureCLI@2
-      displayName: 'Publish Symbols'
+      displayName: 'Step 2: Publish symbols to SymWeb/MSDL'
       inputs:
         azureSubscription: '${{ parameters.azureSubscription }}'
-        scriptLocation: inlineScript
-        scriptType: ps
-        inlineScript: |
-          # Propagate parameters to PS variables ################################################
-          $artifactName = "${{ parameters.artifactName }}"
-          echo "artifactName= $artifactName"
-
-          $publishProjectName = "${{ parameters.publishProjectName }}"
-          echo "publishProjectName= $publishProjectName"
-
-          $publishToInternal = "${{ parameters.publishToInternal }}".ToLower()
-          echo "publishToInternal= $publishToInternal"
-
-          $publishToPublic = "${{ parameters.publishToPublic }}".ToLower()
-          echo "publishToPublic= $publishToPublic"
-
-          $publishServer = "${{ parameters.publishServer }}"
-          echo "publishServer= $publishServer"
-
-          $publishTokenUri = "${{ parameters.publishTokenUri }}"
-          echo "publishTokenUri= $publishTokenUri"
-
-          # Publish symbols #####################################################################
-          # 1) Get the access token for the symbol publishing service
-          echo ">  1.Acquiring symbol publishing token..."
-          $symbolPublishingToken = az account get-access-token --resource $publishTokenUri --query accessToken -o tsv
-          echo ">  1.Symbol publishing token acquired."
-
-          # 2) Register the request name
-          echo ">  2.Registering request name..."
-          $requestNameRegistrationBody = "{'requestName': '$artifactName'}"
-          Invoke-RestMethod `
-            -Method POST `
-            -Uri "https://$publishServer.trafficmanager.net/projects/$publishProjectName/requests" `
-            -Headers @{ Authorization = "Bearer $symbolPublishingToken" } `
-            -ContentType "application/json" `
-            -Body $requestNameRegistrationBody
-          echo ">  2.Request name registered successfully."
-
-          # 3) Publish the symbols
-          echo ">  3.Submitting request to publish symbols..."
-          $publishSymbolsBody = "{'publishToInternalServer': $publishToInternal, 'publishToPublicServer': $publishToPublic}"
-          Invoke-RestMethod `
-            -Method POST `
-            -Uri "https://$publishServer.trafficmanager.net/projects/$publishProjectName/requests/$artifactName" `
-            -Headers @{ Authorization = "Bearer $symbolPublishingToken" } `
-            -ContentType "application/json" `
-            -Body $publishSymbolsBody
-          echo ">  3.Request to publish symbols submitted successfully."
-
-          # The following REST calls are used to check publishing status.
-          echo ">  4.Checking the status of the request ..."
-          Invoke-RestMethod `
-            -Method GET `
-            -Uri "https://$publishServer.trafficmanager.net/projects/$publishProjectName/requests/$artifactName" `
-            -Headers @{ Authorization = "Bearer $symbolPublishingToken" } `
-            -ContentType "application/json"
-
-          echo "Use below tables to interpret the values of xxxServerStatus and xxxServerResult fields from the response."
-
-          echo "PublishingStatus"
-          echo "-----------------"
-          echo "0	NotRequested; The request has not been requested to publish."
-          echo "1	Submitted; The request is submitted to be published"
-          echo "2	Processing; The request is still being processed"
-          echo "3	Completed; The request has been completed processing. It can be failed or successful. Check PublishingResult to get more details"
-
-          echo "PublishingResult"
-          echo "-----------------"
-          echo "0	Pending; The request has not completed or has not been requested."
-          echo "1	Succeeded; The request has published successfully"
-          echo "2	Failed; The request has failed to publish"
-          echo "3	Cancelled; The request was cancelled"
+        scriptType: pscore
+        scriptLocation: scriptPath
+        scriptPath: '$(Build.SourcesDirectory)/eng/pipelines/onebranch/scripts/publish-symbols.ps1'
+        arguments: >-
+          -PublishServer "${{ parameters.publishServer }}"
+          -PublishTokenUri "${{ parameters.publishTokenUri }}"
+          -PublishProjectName "${{ parameters.publishProjectName }}"
+          -ArtifactName "${{ parameters.artifactName }}"
+          -PublishToInternal $${{ parameters.publishToInternal }}
+          -PublishToPublic $${{ parameters.publishToPublic }}
diff --git a/eng/pipelines/onebranch/variables/common-variables.yml b/eng/pipelines/onebranch/variables/common-variables.yml
index a2a48ba184..3df1a6264f 100644
--- a/eng/pipelines/onebranch/variables/common-variables.yml
+++ b/eng/pipelines/onebranch/variables/common-variables.yml
@@ -23,13 +23,21 @@ variables:
   - name: BUILD_OUTPUT
     value: $(REPO_ROOT)/artifacts
 
-  # This is where downloaded artifacts should be placed. This will enable other build jobs to
-  # do local NuGet installations with packages built by earlier stages.
-  - name: PACK_INPUT
+  # Directory where downloaded pipeline artifacts (NuGet packages from earlier
+  # stages) are placed. Build jobs use this as a local NuGet package source so
+  # that downstream packages can resolve dependencies on packages built by
+  # upstream stages.
+  - name: JOB_INPUT
     value: $(REPO_ROOT)/packages
 
-  # This is where our C# projects place their NuGet package outputs. This is intentionally
-  # separated from packages/ (where downloaded pipeline artifacts go) so that ESRP signing and
-  # OneBranch artifact publishing only operate on packages built by the current job.
-  - name: PACK_OUTPUT
+  # Root directory for all job output artifacts (NuGet packages, symbols, etc.).
+  # OneBranch auto-publishes everything under this directory. It is intentionally
+  # separated from packages/ (where downloaded pipeline artifacts go) so that ESRP
+  # signing and OneBranch artifact publishing only operate on the current job's output.
+  #
+  # Sub-directory layout:
+  #   assemblies/ - DLL assemblies for APIScan (preserving TFM folder structure)
+  #   packages/   - NuGet packages (.nupkg, .snupkg)
+  #   symbols/    - PDB symbol files (preserving TFM folder structure)
+  - name: JOB_OUTPUT
     value: $(REPO_ROOT)/output
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index 7b7c7597cb..b3bebb0a64 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -24,11 +24,11 @@ variables:
   # make it clear that these variables are used for symbols (as opposed to other msc tasks).
   #
   # SymbolsAzureSubscription
-  # SymbolsPublishProjectName
-  # SymbolsPublishServer
-  # SymbolsPublishTokenUri
+  # SymbolsPublishProjectNameSqlClient
+  # SymbolsPublishServerProd / SymbolsPublishServerPPE
+  # SymbolsPublishTokenUriProd / SymbolsPublishTokenUriPPE
   # SymbolsUploadAccount
-  - group: 'symbols-variables-v2'
+  - group: 'Symbols Publishing'
 
   # OneBranch Template Variables ###########################################
 

From 8d2483b9c9431c38f8fa71ebdad1bc85037ec5cc Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 21 Apr 2026 07:36:29 -0300
Subject: [PATCH 053/298] Symbols Publishing Follow-up (#4214)

---
 .../onebranch-pipeline-design.instructions.md |  6 ++++-
 .../onebranch/jobs/publish-symbols-job.yml    | 25 ++++++++++++++++---
 .../onebranch/sqlclient-official.yml          | 16 ++++++++----
 .../onebranch/steps/publish-symbols-step.yml  | 16 ++++++------
 .../variables/onebranch-variables.yml         | 10 ++++++--
 5 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index 0860d5db52..f1520fa0e0 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -70,6 +70,8 @@ When adding a new csproj-based package:
 - The `publish-symbols-step.yml` accepts a `symbolsFolder` parameter to point at the downloaded PDB location
 - The publish step calls an extracted `publish-symbols.ps1` script with structured error handling and diagnostic logging
 - Symbols publishing credentials come from the `Symbols Publishing` variable group
+- In the official pipeline, symbol server destination follows `releaseToProduction`: Production when true, PPE when false
+- Non-official pipeline always targets the PPE symbol server
 
 ## Release Stage
 
@@ -99,7 +101,9 @@ Release parameters (all boolean, default `false`):
 - `releaseSqlServerServer`, `releaseLogging`, `releaseAbstractions`, `releaseSqlClient`, `releaseAzure`, `releaseAKVProvider`
 
 Official-only parameter:
-- `releaseToProduction` — push to NuGet Production feed (default `false`)
+- `releaseToProduction` — controls both NuGet target feed and symbol server destination (default `false`):
+  - `true` → NuGet Production feed + Production symbol server
+  - `false` → NuGet Test feed + PPE symbol server
 
 When `isPreview` is true, pipeline resolves `effective*Version` variables to preview versions; otherwise GA versions. All versions defined in `variables/common-variables.yml`.
 
diff --git a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
index 21b20476cd..de2d7e4634 100644
--- a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
+++ b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
@@ -54,11 +54,13 @@ jobs:
   - job: publish_symbols_${{ parameters.packageName }}
     displayName: 'Publish Symbols: ${{ parameters.packageFullName }}'
     pool:
-      type: windows
+      type: linux
 
     variables:
-      # OneBranch requires ob_outputDirectory to be set, even if this job produces no artifacts.
-      ob_outputDirectory: $(JOB_OUTPUT)
+      # OneBranch requires ob_outputDirectory to be set. Pipeline Artifacts are always on and
+      # cannot be disabled. To prevent this job from publishing artifacts, a .artifactignore
+      # that excludes all files is written into ob_outputDirectory before the auto-publish step.
+      ob_outputDirectory: $(Build.SourcesDirectory)/no_publish
 
       # Disable SDL scanning — this job only uploads/publishes PDBs and produces no
       # assemblies to scan. APIScan and BinSkim are handled by the build jobs.
@@ -72,7 +74,24 @@ jobs:
       # Path to the PDB files within the downloaded artifact.
       symbolsPath: $(Pipeline.Workspace)/${{ parameters.artifactName }}/symbols
 
+      # PublishSymbols@2 runs on the OneBranch host agent (outside the build container) due to 1ES
+      # Pipeline Template credential isolation. On Linux, the host resolves to the Microsoft org by
+      # default. Setting this variable at job level ensures the task sees it and connects to the
+      # correct org's symbol store.
+      #
+      # Reference:
+      # https://www.osgwiki.com/wiki/Symbols_Publishing_Pipeline_to_SymWeb_and_MSDL#Option_B:_OneBranch
+      #
+      ArtifactServices.Symbol.AccountName: ${{ parameters.symbolsUploadAccount }}
+
     steps:
+      # Create ob_outputDirectory with a .artifactignore that excludes everything,
+      # so OneBranch's auto-publish uploads an empty artifact.
+      - pwsh: |
+          New-Item -Path "$(ob_outputDirectory)" -ItemType Directory -Force
+          "**" | Out-File -FilePath "$(ob_outputDirectory)/.artifactignore" -Encoding ascii
+        displayName: 'Suppress artifact publishing'
+
       - task: DownloadPipelineArtifact@2
         displayName: 'Download ${{ parameters.packageFullName }} Artifact'
         inputs:
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index a2902f1e21..96fb0dc5f5 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -33,9 +33,10 @@ parameters:
     type: boolean
     default: false
 
-  # Push packages to NuGet Production (otherwise pushes to NuGet Test).
+  # When true, publish symbols and push NuGet packages to Production environments.  When false,
+  # symbols use PPE and NuGet packages use QA/Test.
   - name: releaseToProduction
-    displayName: Release to NuGet Production
+    displayName: Publish Symbols and NuGet Packages to Production
     type: boolean
     default: false
 
@@ -254,9 +255,14 @@ extends:
 
           symbolsAzureSubscription: '$(SymbolsAzureSubscription)'
           symbolsPublishProjectName: '$(SymbolsPublishProjectNameSqlClient)'
-          # Official pipelines must publish to the Production symbol server.
-          symbolsPublishServer: '$(SymbolsPublishServerProd)'
-          symbolsPublishTokenUri: '$(SymbolsPublishTokenUriProd)'
+          # Symbol server target follows releaseToProduction: Production for
+          # real releases, PPE for test/QA releases.
+          ${{ if eq(parameters.releaseToProduction, true) }}:
+            symbolsPublishServer: '$(SymbolsPublishServerProd)'
+            symbolsPublishTokenUri: '$(SymbolsPublishTokenUriProd)'
+          ${{ else }}:
+            symbolsPublishServer: '$(SymbolsPublishServerPPE)'
+            symbolsPublishTokenUri: '$(SymbolsPublishTokenUriPPE)'
           symbolsUploadAccount: '$(SymbolsUploadAccount)'
 
       - template: /eng/pipelines/onebranch/stages/release-stages.yml@self
diff --git a/eng/pipelines/onebranch/steps/publish-symbols-step.yml b/eng/pipelines/onebranch/steps/publish-symbols-step.yml
index d06b3c73e5..dc794f480d 100644
--- a/eng/pipelines/onebranch/steps/publish-symbols-step.yml
+++ b/eng/pipelines/onebranch/steps/publish-symbols-step.yml
@@ -75,16 +75,16 @@ parameters:
       type: string
 
 steps:
-    # Set variable for downstream tasks (allegedly).
+    # NOTE: ArtifactServices.Symbol.AccountName is set as a job-level variable in
+    # publish-symbols-job.yml. On OneBranch Linux agents, PublishSymbols@2 runs on the host (outside
+    # the build container) due to 1ES PT credential isolation. A ##vso[task.setvariable] inside the
+    # container is not visible to host-level tasks, so the variable must be declared at job scope.
     #
-    # Note: Because variables cannot be set in top-level of template, this has to be done during
-    # runtime.
-    #
-    - script: 'echo ##vso[task.setvariable variable=ArtifactServices.Symbol.AccountName;]${{ parameters.uploadAccount }}'
-      displayName: 'Set ArtifactServices.Symbol.AccountName to ${{ parameters.uploadAccount }}'
+    # Reference:
+    # https://www.osgwiki.com/wiki/Symbols_Publishing_Pipeline_to_SymWeb_and_MSDL#Option_B:_OneBranch
 
-    # Log the PDB files that match the search pattern so we can verify no
-    # unexpected files are included in the upload.
+    # Log the PDB files that match the search pattern so we can verify no unexpected files are
+    # included in the upload.
     - pwsh: |
         $folder = '${{ parameters.symbolsFolder }}'
         $glob   = '${{ parameters.searchPattern }}'
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index b3bebb0a64..d5fa784885 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -39,6 +39,12 @@ variables:
   - name: Packaging.EnableSBOMSigning
     value: true
 
-  # Docker image which is used to build the project https://aka.ms/obpipelines/containers
+  # OneBranch supplies a variety of container images we must use for our jobs.
+  #
+  # Windows jobs use this image.
   - name: WindowsContainerImage
-    value: "onebranch.azurecr.io/windows/ltsc2022/vse2022:latest"
+    value: onebranch.azurecr.io/windows/ltsc2022/vse2022:latest
+
+  # Linux jobs use this image.
+  - name: LinuxContainerImage
+    value: mcr.microsoft.com/onebranch/azurelinux/build:3.0

From 3ae3274aa122c16e9057612400a1eee1f3ec4388 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Tue, 21 Apr 2026 17:11:16 +0100
Subject: [PATCH 054/298] Merge | Port SqlBatch support to netfx (#3926)

* Publicly expose SqlBatch* types on netfx and enable tests

APIs not exposed:
* SqlClientFactory.CanCreateBatch
* SqlClientFactory.CreateBatch
* SqlClientFactory.CreateBatchCommand
* SqlConnection.CanCreateBatch
* SqlConnection.CreateBatch

* Post-merge reconciliation

* Add missing members to ref assembly

* Split conditional compilation blocks
---
 .../ref/Microsoft.Data.SqlClient.cs           | 173 +++++++++++++++++-
 .../src/Microsoft/Data/SqlClient/SqlBatch.cs  | 170 ++++++++++++++---
 .../Data/SqlClient/SqlBatchCommand.cs         |  44 +++--
 .../Data/SqlClient/SqlBatchCommand.netcore.cs |  21 ---
 .../SqlClient/SqlBatchCommandCollection.cs    | 116 ++++++++----
 .../Data/SqlClient/SqlCommand.Scalar.cs       |   2 -
 .../Microsoft/Data/SqlClient/SqlException.cs  |  13 +-
 ...icrosoft.Data.SqlClient.ManualTests.csproj |   2 +-
 .../{BatchTests.netcore.cs => BatchTests.cs}  |  26 ++-
 9 files changed, 444 insertions(+), 123 deletions(-)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommand.netcore.cs
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/{BatchTests.netcore.cs => BatchTests.cs} (97%)

diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
index ce6e481434..de581dbb0e 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
@@ -47,137 +47,287 @@ protected SqlAuthenticationInitializer() { }
     public abstract void Initialize();
 }
 
-#if NET
 /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/SqlBatch/*'/>
+#if NET
 public class SqlBatch : System.Data.Common.DbBatch
+#else
+public class SqlBatch : System.IDisposable, System.IAsyncDisposable
+#endif
 {
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ctor1/*'/>
     public SqlBatch() { throw null; }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ctor2/*'/>
     public SqlBatch(Microsoft.Data.SqlClient.SqlConnection connection, Microsoft.Data.SqlClient.SqlTransaction transaction = null) { throw null; }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Timeout/*'/>
+    #if NET
     public override int Timeout { get => throw null; set { } }
+    #else
+    public int Timeout { get => throw null; set { } }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Commands/*'/>
     public System.Collections.Generic.List<Microsoft.Data.SqlClient.SqlBatchCommand> Commands { get { throw null; } }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Connection/*'/>
+    #if NET
     public new Microsoft.Data.SqlClient.SqlConnection Connection { get => throw null; set { } }
+    #else
+    public Microsoft.Data.SqlClient.SqlConnection Connection { get => throw null; set { } }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Transaction/*'/>
+    #if NET
     public new Microsoft.Data.SqlClient.SqlTransaction Transaction { get => throw null; set { } }
+    #else
+    public Microsoft.Data.SqlClient.SqlTransaction Transaction { get => throw null; set { } }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/BatchCommands/*'/>
+    #if NET
     public new SqlBatchCommandCollection BatchCommands { get => throw null; }
+    #else
+    public SqlBatchCommandCollection BatchCommands { get => throw null; }
+    #endif
+    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/DbBatchCommands/*'/>
     protected override System.Data.Common.DbBatchCommandCollection DbBatchCommands { get => throw null; }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/DbConnection/*'/>
+    #if NET
     protected override System.Data.Common.DbConnection DbConnection { get => throw null; set { } }
+    #else
+    protected virtual System.Data.Common.DbConnection DbConnection { get => throw null; set { } }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/DbTransaction/*'/>
+    #if NET
     protected override System.Data.Common.DbTransaction DbTransaction { get => throw null; set { } }
+    #else
+    protected virtual System.Data.Common.DbTransaction DbTransaction { get => throw null; set { } }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Cancel/*'/>
+    #if NET
     public override void Cancel() => throw null;
-     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/CreateDbBatchCommand/*'/>
+    #else
+    public void Cancel() => throw null;
+    #endif
+    #if NET
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/CreateDbBatchCommand/*'/>
     protected override System.Data.Common.DbBatchCommand CreateDbBatchCommand() => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Dispose/*'/>
+    #if NET
     public override void Dispose() => throw null;
+    #else
+    public void Dispose() => throw null;
+    #endif
+    #if !NET
+    /// <inheritdoc cref="System.IAsyncDisposable.DisposeAsync"/>
+    public virtual System.Threading.Tasks.ValueTask DisposeAsync() => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteDbDataReader/*'/>
+    #if NET
     protected override System.Data.Common.DbDataReader ExecuteDbDataReader(System.Data.CommandBehavior behavior) => throw null;
+    #else
+    protected virtual System.Data.Common.DbDataReader ExecuteDbDataReader(System.Data.CommandBehavior behavior) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteDbDataReaderAsync/*'/>
+    #if NET
     protected override System.Threading.Tasks.Task<System.Data.Common.DbDataReader> ExecuteDbDataReaderAsync(System.Data.CommandBehavior behavior, System.Threading.CancellationToken cancellationToken) => throw null;
+    #else
+    protected virtual System.Threading.Tasks.Task<System.Data.Common.DbDataReader> ExecuteDbDataReaderAsync(System.Data.CommandBehavior behavior, System.Threading.CancellationToken cancellationToken) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteNonQuery/*'/>
+    #if NET
     public override int ExecuteNonQuery() => throw null;
+    #else
+    public int ExecuteNonQuery() => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteNonQueryAsync/*'/>
+    #if NET
     public override System.Threading.Tasks.Task<int> ExecuteNonQueryAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
+    #else
+    public System.Threading.Tasks.Task<int> ExecuteNonQueryAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReader/*'/>
     public Microsoft.Data.SqlClient.SqlDataReader ExecuteReader() => throw null;
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReaderAsync/*'/>
+    #if NET
     public new System.Threading.Tasks.Task<Microsoft.Data.SqlClient.SqlDataReader> ExecuteReaderAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
+    #else
+    public System.Threading.Tasks.Task<Microsoft.Data.SqlClient.SqlDataReader> ExecuteReaderAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteScalar/*'/>
+    #if NET
     public override object ExecuteScalar() => throw null;
+    #else
+    public object ExecuteScalar() => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteScalarAsync/*'/>
+    #if NET
     public override System.Threading.Tasks.Task<object> ExecuteScalarAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
+    #else
+    public System.Threading.Tasks.Task<object> ExecuteScalarAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Prepare/*'/>
+    #if NET
     public override void Prepare() => throw null;
+    #else
+    public void Prepare() => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/PrepareAsync/*'/>
+    #if NET
     public override System.Threading.Tasks.Task PrepareAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
+    #else
+    public System.Threading.Tasks.Task PrepareAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
+    #endif
 }
-#endif
 
-#if NET
 /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/SqlBatchCommand/*'/>
-public partial class SqlBatchCommand : System.Data.Common.DbBatchCommand
+#if NET
+public class SqlBatchCommand : System.Data.Common.DbBatchCommand
+#else
+public class SqlBatchCommand
+#endif
 {
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/ctor1/*'/>
     public SqlBatchCommand() => throw null;
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/ctor2/*'/>
     public SqlBatchCommand(string commandText, System.Data.CommandType commandType = System.Data.CommandType.Text, System.Collections.Generic.IEnumerable<Microsoft.Data.SqlClient.SqlParameter> parameters = null, Microsoft.Data.SqlClient.SqlCommandColumnEncryptionSetting columnEncryptionSetting = Microsoft.Data.SqlClient.SqlCommandColumnEncryptionSetting.UseConnectionSetting) { throw null; }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/Parameters/*'/>
+    #if NET
     public new Microsoft.Data.SqlClient.SqlParameterCollection Parameters { get { throw null; } }
+    #else
+    public Microsoft.Data.SqlClient.SqlParameterCollection Parameters { get { throw null; } }
+    #endif
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CanCreateParameter/*'/>
+    #if NET
+    public override bool CanCreateParameter { get { throw null; } }
+    #else
+    public bool CanCreateParameter { get { throw null; } set { } }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CommandText/*'/>
+    #if NET
     public override string CommandText { get { throw null; } set { } }
+    #else
+    public string CommandText { get { throw null; } set { } }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CommandType/*'/>
+    #if NET
     public override System.Data.CommandType CommandType { get { throw null; } set { } }
+    #else
+    public System.Data.CommandType CommandType { get { throw null; } set { } }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CommandBehavior/*'/>
     public System.Data.CommandBehavior CommandBehavior { get { throw null; } set { } }
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CreateParameter/*'/>
+    #if NET
+    public override System.Data.Common.DbParameter CreateParameter() => throw null;
+    #else
+    public System.Data.Common.DbParameter CreateParameter() => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/RecordsAffected/*'/>
+    #if NET
     public override int RecordsAffected { get { throw null; } }
+    #else
+    public int RecordsAffected { get { throw null; } }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/DbParameterCollection/*'/>
+    #if NET
     protected override System.Data.Common.DbParameterCollection DbParameterCollection => throw null;
+    #else
+    protected virtual System.Data.Common.DbParameterCollection DbParameterCollection => throw null;
+    #endif
 
-    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/ColumnEncryptionSetting/*'/>
     public Microsoft.Data.SqlClient.SqlCommandColumnEncryptionSetting ColumnEncryptionSetting { get { throw null; } set { } }
-    #endif
 }
-#endif
 
-#if NET
 /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/SqlBatchCommandCollection/*'/>
+#if NET
 public class SqlBatchCommandCollection : System.Data.Common.DbBatchCommandCollection, System.Collections.Generic.IList<SqlBatchCommand>
+#else
+public class SqlBatchCommandCollection : System.Collections.Generic.IList<Microsoft.Data.SqlClient.SqlBatchCommand>
+#endif
 {
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Count/*'/>
+    #if NET
     public override int Count => throw null;
+    #else
+    public int Count => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/IsReadOnly/*'/>
+    #if NET
     public override bool IsReadOnly => throw null;
+    #else
+    public bool IsReadOnly => throw null;
+    #endif
     System.Collections.Generic.IEnumerator<Microsoft.Data.SqlClient.SqlBatchCommand> System.Collections.Generic.IEnumerable<Microsoft.Data.SqlClient.SqlBatchCommand>.GetEnumerator() => throw null;
+    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/GetEnumerator/*'/>
     public override System.Collections.Generic.IEnumerator<System.Data.Common.DbBatchCommand> GetEnumerator() => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Add1/*'/>
     public void Add(Microsoft.Data.SqlClient.SqlBatchCommand item) => throw null;
+    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Add2/*'/>
     public override void Add(System.Data.Common.DbBatchCommand item) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Clear/*'/>
+    #if NET
     public override void Clear() => throw null;
+    #else
+    public void Clear() => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Contains1/*'/>
     public bool Contains(Microsoft.Data.SqlClient.SqlBatchCommand item) => throw null;
+    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Contains2/*'/>
     public override bool Contains(System.Data.Common.DbBatchCommand item) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/CopyTo1/*'/>
     public void CopyTo(Microsoft.Data.SqlClient.SqlBatchCommand[] array, int arrayIndex) => throw null;
+    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/CopyTo2/*'/>
     public override void CopyTo(System.Data.Common.DbBatchCommand[] array, int arrayIndex) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/IndexOf1/*'/>
     public int IndexOf(Microsoft.Data.SqlClient.SqlBatchCommand item) => throw null;
+    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/IndexOf2/*'/>
     public override int IndexOf(System.Data.Common.DbBatchCommand item) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Insert1/*'/>
     public void Insert(int index, Microsoft.Data.SqlClient.SqlBatchCommand item) => throw null;
+    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Insert2/*'/>
     public override void Insert(int index, System.Data.Common.DbBatchCommand item) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Remove1/*'/>
     public bool Remove(Microsoft.Data.SqlClient.SqlBatchCommand item) => throw null;
+    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Remove2/*'/>
     public override bool Remove(System.Data.Common.DbBatchCommand item) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/RemoveAt/*'/>
+    #if NET
     public override void RemoveAt(int index) => throw null;
+    #else
+    public void RemoveAt(int index) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/this1/*'/>
     Microsoft.Data.SqlClient.SqlBatchCommand System.Collections.Generic.IList<SqlBatchCommand>.this[int index] { get => throw null; set { } }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/this2/*'/>
+    #if NET
     public new Microsoft.Data.SqlClient.SqlBatchCommand this[int index] { get => throw null; set { } }
+    #else
+    public Microsoft.Data.SqlClient.SqlBatchCommand this[int index] { get => throw null; set { } }
+    #endif
     System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => throw null;
+    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/GetBatchCommand/*'/>
     protected override System.Data.Common.DbBatchCommand GetBatchCommand(int index) => throw null;
+    #endif
+    #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/SetBatchCommand/*'/>
     protected override void SetBatchCommand(int index, System.Data.Common.DbBatchCommand batchCommand) => throw null;
+    #endif
 }
-#endif
 
 /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopy.xml' path='docs/members[@name="SqlBulkCopy"]/SqlBulkCopy/*'/>
 public sealed class SqlBulkCopy : System.IDisposable
@@ -1653,6 +1803,9 @@ private SqlException(System.Runtime.Serialization.SerializationInfo info, System
     #if NET
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlException.xml' path='docs/members[@name="SqlException"]/BatchCommand/*' />
     public new Microsoft.Data.SqlClient.SqlBatchCommand BatchCommand { get { throw null; } }
+    #else
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlException.xml' path='docs/members[@name="SqlException"]/BatchCommand/*' />
+    public Microsoft.Data.SqlClient.SqlBatchCommand BatchCommand { get { throw null; } }
     #endif
 
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlException.xml' path='docs/members[@name="SqlException"]/Class/*'/>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatch.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatch.cs
index 7171bdbfe3..a1f79f6f15 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatch.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatch.cs
@@ -1,9 +1,7 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NET
-
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -15,7 +13,12 @@
 namespace Microsoft.Data.SqlClient
 {
     /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/SqlBatch/*'/>
-    public class SqlBatch : DbBatch
+    public class SqlBatch :
+        #if NET
+        DbBatch
+        #else
+        IDisposable, IAsyncDisposable
+        #endif
     {
         private SqlCommand _batchCommand;
         private List<SqlBatchCommand> _commands;
@@ -33,8 +36,30 @@ public SqlBatch(SqlConnection connection = null, SqlTransaction transaction = nu
             Connection = connection;
             Transaction = transaction;
         }
+
+        #if NET
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/DbBatchCommands/*'/>
+        protected override DbBatchCommandCollection DbBatchCommands => BatchCommands;
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/CreateDbBatchCommand/*'/>
+        protected override DbBatchCommand CreateDbBatchCommand() => new SqlBatchCommand();
+        #endif
+
+        #if NETFRAMEWORK
+        /// <inheritdoc cref="System.IAsyncDisposable.DisposeAsync"/>
+        public virtual ValueTask DisposeAsync()
+        {
+            Dispose();
+            return default;
+        }
+        #endif
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Timeout/*'/>
-        public override int Timeout
+        public
+        #if NET
+        override
+        #endif
+        int Timeout
         {
             get
             {
@@ -47,12 +72,22 @@ public override int Timeout
                 _batchCommand.CommandTimeout = value;
             }
         }
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/DbBatchCommands/*'/>
-        protected override DbBatchCommandCollection DbBatchCommands => BatchCommands;
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/BatchCommands/*'/>
-        public new SqlBatchCommandCollection BatchCommands => _providerCommands != null ? _providerCommands : _providerCommands = new SqlBatchCommandCollection(Commands); // Commands call will check disposed
+        public
+        #if NET
+        new
+        #endif
+        SqlBatchCommandCollection BatchCommands => _providerCommands != null ? _providerCommands : _providerCommands = new SqlBatchCommandCollection(Commands); // Commands call will check disposed
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/DbConnection/*'/>
-        protected override DbConnection DbConnection
+        protected
+        #if NET
+        override
+        #else
+        virtual
+        #endif
+        DbConnection DbConnection
         {
             get
             {
@@ -65,8 +100,15 @@ protected override DbConnection DbConnection
                 Connection = (SqlConnection)value;
             }
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/DbTransaction/*'/>
-        protected override DbTransaction DbTransaction
+        protected
+        #if NET
+        override
+        #else
+        virtual
+        #endif
+        DbTransaction DbTransaction
         {
             get
             {
@@ -79,60 +121,103 @@ protected override DbTransaction DbTransaction
                 Transaction = (SqlTransaction)value;
             }
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Cancel/*'/>
-        public override void Cancel()
+        public
+        #if NET
+        override
+        #endif
+        void Cancel()
         {
             CheckDisposed();
             _batchCommand.Cancel();
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteNonQuery/*'/>
-        public override int ExecuteNonQuery()
+        public
+        #if NET
+        override
+        #endif
+        int ExecuteNonQuery()
         {
             CheckDisposed();
             SetupBatchCommandExecute();
             return _batchCommand.ExecuteNonQuery();
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteNonQueryAsync/*'/>
-        public override Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken = default)
+        public
+        #if NET
+        override
+        #endif
+        Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken = default)
         {
             CheckDisposed();
             SetupBatchCommandExecute();
             return _batchCommand.ExecuteNonQueryAsync(cancellationToken);
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteScalar/*'/>
-        public override object ExecuteScalar()
+        public
+        #if NET
+        override
+        #endif
+        object ExecuteScalar()
         {
             CheckDisposed();
             SetupBatchCommandExecute();
             return _batchCommand.ExecuteScalar();
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteScalarAsync/*'/>
-        public override Task<object> ExecuteScalarAsync(CancellationToken cancellationToken = default)
+        public
+        #if NET
+        override
+        #endif
+        Task<object> ExecuteScalarAsync(CancellationToken cancellationToken = default)
         {
             CheckDisposed();
             SetupBatchCommandExecute();
             return _batchCommand.ExecuteScalarBatchAsync(cancellationToken);
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Prepare/*'/>
-        public override void Prepare()
+        public
+        #if NET
+        override
+        #endif
+        void Prepare()
         {
             CheckDisposed();
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/PrepareAsync/*'/>
-        public override Task PrepareAsync(CancellationToken cancellationToken = default)
+        public
+        #if NET
+        override
+        #endif
+        Task PrepareAsync(CancellationToken cancellationToken = default)
         {
             CheckDisposed();
             return Task.CompletedTask;
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Dispose/*'/>
-        public override void Dispose()
+        public
+        #if NET
+        override
+        #endif
+        void Dispose()
         {
             _batchCommand?.Dispose();
             _batchCommand = null;
             _commands?.Clear();
             _commands = null;
+            #if NET
             base.Dispose();
+            #endif
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Commands/*'/>
         public List<SqlBatchCommand> Commands
         {
@@ -142,8 +227,13 @@ public List<SqlBatchCommand> Commands
                 return _commands != null ? _commands : _commands = new List<SqlBatchCommand>();
             }
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Connection/*'/>
-        public new SqlConnection Connection
+        public
+        #if NET
+        new
+        #endif
+        SqlConnection Connection
         {
             get
             {
@@ -156,8 +246,13 @@ public List<SqlBatchCommand> Commands
                 _batchCommand.Connection = value;
             }
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/Transaction/*'/>
-        public new SqlTransaction Transaction
+        public
+        #if NET
+        new
+        #endif
+        SqlTransaction Transaction
         {
             get
             {
@@ -170,6 +265,7 @@ public List<SqlBatchCommand> Commands
                 _batchCommand.Transaction = value;
             }
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReader/*'/>
         public SqlDataReader ExecuteReader()
         {
@@ -177,17 +273,36 @@ public SqlDataReader ExecuteReader()
             SetupBatchCommandExecute();
             return _batchCommand.ExecuteReader();
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReaderAsync/*'/>
-        public new Task<SqlDataReader> ExecuteReaderAsync(CancellationToken cancellationToken = default)
+        public
+        #if NET
+        new
+        #endif
+        Task<SqlDataReader> ExecuteReaderAsync(CancellationToken cancellationToken = default)
         {
             CheckDisposed();
             SetupBatchCommandExecute();
             return _batchCommand.ExecuteReaderAsync(cancellationToken);
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteDbDataReader/*'/>
-        protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior) => ExecuteReader();
+        protected
+        #if NET
+        override
+        #else
+        virtual
+        #endif
+        DbDataReader ExecuteDbDataReader(CommandBehavior behavior) => ExecuteReader();
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteDbDataReaderAsync/*'/>
-        protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
+        protected
+        #if NET
+        override
+        #else
+        virtual
+        #endif
+        Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
         {
             CheckDisposed();
             SetupBatchCommandExecute();
@@ -204,12 +319,8 @@ protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior b
                 TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.NotOnCanceled, 
                 TaskScheduler.Default
             );
-        }               
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/CreateDbBatchCommand/*'/>
-        protected override DbBatchCommand CreateDbBatchCommand()
-        {
-            return new SqlBatchCommand();
         }
+
         private void CheckDisposed()
         {
             if (_batchCommand is null)
@@ -217,6 +328,7 @@ private void CheckDisposed()
                 throw ADP.ObjectDisposed(this);
             }
         }
+
         private void SetupBatchCommandExecute()
         {
             SqlConnection connection = Connection;
@@ -240,5 +352,3 @@ private void SetupBatchCommandExecute()
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommand.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommand.cs
index 3ac8af5a0e..460197a1bc 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommand.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommand.cs
@@ -10,10 +10,10 @@
 namespace Microsoft.Data.SqlClient
 {
     /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/SqlBatchCommand/*'/>
-    public partial class SqlBatchCommand
-#if NET
+    public class SqlBatchCommand
+    #if NET
      : DbBatchCommand
-#endif
+    #endif
     {
         private string _text;
         private CommandType _type;
@@ -68,18 +68,25 @@ internal SqlBatchCommand(string commandText, SqlParameterCollection parameterCol
             _parameters = parameterCollection;
         }
 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CanCreateParameter/*'/>
+        public
+        #if NET
+        override
+        #endif
+        bool CanCreateParameter => true;
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CommandText/*'/>   
         public
-#if NET
+        #if NET
         override 
-#endif
+        #endif
         string CommandText { get => _text; set => _text = value; }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CommandType/*'/>  
         public
-#if NET
+        #if NET
         override 
-#endif
+        #endif
         CommandType CommandType { get => _type; set => SetCommandType(value); }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CommandBehavior/*'/>
@@ -87,23 +94,25 @@ internal SqlBatchCommand(string commandText, SqlParameterCollection parameterCol
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/RecordsAffected/*'/>
         public
-#if NET
+        #if NET
         override 
-#endif
+        #endif
         int RecordsAffected { get => _recordsAffected; }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/DbParameterCollection/*'/>
         protected
-#if NET
-        override 
-#endif
+        #if NET
+        override
+        #else
+        virtual
+        #endif
         DbParameterCollection DbParameterCollection => Parameters;
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/Parameters/*'/>
         public
-#if NET
+        #if NET
         new 
-#endif
+        #endif
         SqlParameterCollection Parameters
         {
             get
@@ -123,6 +132,13 @@ internal set
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/ColumnEncryptionSetting/*'/>
         public SqlCommandColumnEncryptionSetting ColumnEncryptionSetting { get => _encryptionSetting; set => _encryptionSetting = value; }
 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CreateParameter/*'/>
+        public
+        #if NET
+        override
+        #endif
+        DbParameter CreateParameter() => new SqlParameter();
+
         private void SetCommandType(CommandType value)
         {
             if (value != _type)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommand.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommand.netcore.cs
deleted file mode 100644
index e55677b96b..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommand.netcore.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#if NET
-
-using System.Data.Common;
-
-namespace Microsoft.Data.SqlClient
-{
-    public partial class SqlBatchCommand
-    {
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CreateParameter/*'/>
-        public override DbParameter CreateParameter() => new SqlParameter();
-
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/CanCreateParameter/*'/>
-        public override bool CanCreateParameter => true;
-    }
-}
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommandCollection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommandCollection.cs
index e4f68aea5d..0546fdfd80 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommandCollection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommandCollection.cs
@@ -1,15 +1,19 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
-#if NET
 
+using System.Collections;
 using System.Collections.Generic;
 using System.Data.Common;
 
 namespace Microsoft.Data.SqlClient
 {
     /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/SqlBatchCommandCollection/*'/>
-    public class SqlBatchCommandCollection : DbBatchCommandCollection, IList<SqlBatchCommand>
+    public class SqlBatchCommandCollection :
+        #if NET
+        DbBatchCommandCollection,
+        #endif
+        IList<SqlBatchCommand>
     {
         readonly List<SqlBatchCommand> _list;
 
@@ -17,63 +21,107 @@ internal SqlBatchCommandCollection(List<SqlBatchCommand> batchCommands)
         {
             _list = batchCommands;
         }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Count/*'/>
-        public override int Count => _list.Count;
+        public
+        #if NET
+        override
+        #endif
+        int Count => _list.Count;
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/IsReadOnly/*'/>
-        public override bool IsReadOnly => false;
-        IEnumerator<SqlBatchCommand> IEnumerable<SqlBatchCommand>.GetEnumerator() => _list.GetEnumerator();
+        public
+        #if NET
+        override
+        #endif
+        bool IsReadOnly => false;
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Clear/*'/>
+        public
+        #if NET
+        override
+        #endif
+        void Clear() => _list.Clear();
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/RemoveAt/*'/>
+        public
+        #if NET
+        override
+        #endif
+        void RemoveAt(int index) => _list.RemoveAt(index);
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/this2/*'/>
+        public
+        #if NET
+        new
+        #endif
+        SqlBatchCommand this[int index]
+        {
+            get => _list[index];
+            set => _list[index] = value;
+        }
+
+        #if NET
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/GetEnumerator/*'/>
         public override IEnumerator<DbBatchCommand> GetEnumerator() => _list.GetEnumerator();
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Add1/*'/>
-        public void Add(SqlBatchCommand item) => _list.Add(item);
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Add2/*'/>
         public override void Add(DbBatchCommand item) => Add((SqlBatchCommand)item);
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Clear/*'/>
-        public override void Clear() => _list.Clear();
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Contains1/*'/>
-        public bool Contains(SqlBatchCommand item) => _list.Contains(item);
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Contains2/*'/>
         public override bool Contains(DbBatchCommand item) => Contains((SqlBatchCommand)item);
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/CopyTo1/*'/>
-        public void CopyTo(SqlBatchCommand[] array, int arrayIndex) => _list.CopyTo(array, arrayIndex);
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/CopyTo2/*'/>
         public override void CopyTo(DbBatchCommand[] array, int arrayIndex)
         {
             SqlBatchCommand[] target = (SqlBatchCommand[])array;
             CopyTo(target, arrayIndex);
         }
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/IndexOf1/*'/>
-        public int IndexOf(SqlBatchCommand item) => _list.IndexOf(item);
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/IndexOf2/*'/>
         public override int IndexOf(DbBatchCommand item) => IndexOf((SqlBatchCommand)item);
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Insert1/*'/>
-        public void Insert(int index, SqlBatchCommand item) => _list.Insert(index, item);
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Insert2/*'/>
         public override void Insert(int index, DbBatchCommand item) => Insert(index, (SqlBatchCommand)item);
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Remove1/*'/>
-        public bool Remove(SqlBatchCommand item) => _list.Remove(item);
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Remove2/*'/>
         public override bool Remove(DbBatchCommand item) => Remove((SqlBatchCommand)item);
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/RemoveAt/*'/>
-        public override void RemoveAt(int index) => _list.RemoveAt(index);
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/GetBatchCommand/*'/>
+        protected override DbBatchCommand GetBatchCommand(int index) => _list[index];
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/SetBatchCommand/*'/>
+        protected override void SetBatchCommand(int index, DbBatchCommand batchCommand)
+            => _list[index] = (SqlBatchCommand)batchCommand;
+        #else
+        IEnumerator IEnumerable.GetEnumerator() => _list.GetEnumerator();
+        #endif
+
+        IEnumerator<SqlBatchCommand> IEnumerable<SqlBatchCommand>.GetEnumerator() => _list.GetEnumerator();
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Add1/*'/>
+        public void Add(SqlBatchCommand item) => _list.Add(item);
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Contains1/*'/>
+        public bool Contains(SqlBatchCommand item) => _list.Contains(item);
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/CopyTo1/*'/>
+        public void CopyTo(SqlBatchCommand[] array, int arrayIndex) => _list.CopyTo(array, arrayIndex);
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/IndexOf1/*'/>
+        public int IndexOf(SqlBatchCommand item) => _list.IndexOf(item);
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Insert1/*'/>
+        public void Insert(int index, SqlBatchCommand item) => _list.Insert(index, item);
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/Remove1/*'/>
+        public bool Remove(SqlBatchCommand item) => _list.Remove(item);
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/this1/*'/>
         SqlBatchCommand IList<SqlBatchCommand>.this[int index]
         {
             get => _list[index];
             set => _list[index] = value;
         }
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/this2/*'/>
-        public new SqlBatchCommand this[int index]
-        {
-            get => _list[index];
-            set => _list[index] = value;
-        }
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/GetBatchCommand/*'/>
-        protected override DbBatchCommand GetBatchCommand(int index) => _list[index];
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml' path='docs/members[@name="SqlBatchCommandCollection"]/SetBatchCommand/*'/>
-        protected override void SetBatchCommand(int index, DbBatchCommand batchCommand)
-            => _list[index] = (SqlBatchCommand)batchCommand;
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Scalar.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Scalar.cs
index 2a47e1466f..0582d23d98 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Scalar.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Scalar.cs
@@ -82,7 +82,6 @@ public override Task<object> ExecuteScalarAsync(CancellationToken cancellationTo
             return ExecuteScalarAsyncInternal(cancellationToken);
         }
         
-        #if NET
         internal Task<object> ExecuteScalarBatchAsync(CancellationToken cancellationToken)
         {
             Guid operationId = s_diagnosticListener.WriteCommandBefore(this, _transaction);
@@ -167,7 +166,6 @@ internal Task<object> ExecuteScalarBatchAsync(CancellationToken cancellationToke
             },
             TaskScheduler.Default).Unwrap();
         }
-        #endif
         
         #endregion
         
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs
index 1a606242c2..a1735fabe7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs
@@ -117,7 +117,7 @@ public override void GetObjectData(SerializationInfo si, StreamingContext contex
         override public string Source => DbConnectionStringDefaults.ApplicationName;
 
 
-#if NET
+        #if NET
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlException.xml' path='docs/members[@name="SqlException"]/DbBatchCommand/*' />
         protected override DbBatchCommand DbBatchCommand => BatchCommand;
 
@@ -127,14 +127,15 @@ public override void GetObjectData(SerializationInfo si, StreamingContext contex
             get => _batchCommand;
             internal set => _batchCommand = value;
         }
-#else
-        internal SqlBatchCommand BatchCommand
+        #else
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlException.xml' path='docs/members[@name="SqlException"]/BatchCommand/*' />
+        public SqlBatchCommand BatchCommand
         {
             get => _batchCommand;
-            set => _batchCommand = value;
+            internal set => _batchCommand = value;
         }
-#endif 
-        
+        #endif
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlException.xml' path='docs/members[@name="SqlException"]/ToString/*' />
         public override string ToString()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index c28f1cfeb7..110547a5de 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -191,7 +191,7 @@
     <Compile Include="ProviderAgnostic\MultipleResultsTest\MultipleResultsTest.cs" />
     <Compile Include="ProviderAgnostic\ReaderTest\ReaderTest.cs" />
     <Compile Include="SQL\AADFedAuthTokenRefreshTest\AADFedAuthTokenRefreshTest.cs" />
-    <Compile Include="SQL\Batch\BatchTests.netcore.cs" />
+    <Compile Include="SQL\Batch\BatchTests.cs" />
     <Compile Include="SQL\ConnectionPoolTest\ConnectionPoolStressTest.cs" />
     <Compile Include="SQL\ConnectionPoolTest\ConnectionPoolTest.cs" />
     <Compile Include="SQL\ConnectionPoolTest\ConnectionPoolTest.Debug.cs" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.netcore.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
similarity index 97%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.netcore.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
index 175e81521b..991d55cdeb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
@@ -1,9 +1,7 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NET
-
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -52,8 +50,12 @@ public static void ConnectionCanCreateBatch()
         {
             using (var connection = new SqlConnection(DataTestUtility.TCPConnectionString))
             {
+                #if NET
                 Assert.True(connection.CanCreateBatch);
                 using (var batch = connection.CreateBatch())
+                #else
+                using (var batch = new SqlBatch(connection))
+                #endif
                 {
                     Assert.NotNull(batch);
                     Assert.Equal(connection, batch.Connection);
@@ -70,7 +72,11 @@ public static void SqlBatchCanCreateParameter()
         {
             using var connection = new SqlConnection(DataTestUtility.TCPConnectionString);
             connection.Open();
+#if NET
             using DbBatch batch = connection.CreateBatch();
+#else
+            using SqlBatch batch = new SqlBatch(connection);
+#endif
             SqlBatchCommand batchCommand = new SqlBatchCommand("SELECT @p");
 
             Assert.True(batchCommand.CanCreateParameter);
@@ -154,7 +160,11 @@ public static void ProviderApi()
             int resultCount = 0;
             int rowCount = 0;
             var dbProviderFactory = SqlClientFactory.Instance;
+            #if NET
             DbBatch batch = dbProviderFactory.CreateBatch();
+            #else
+            SqlBatch batch = new SqlBatch();
+            #endif
             using (var connection = new SqlConnection(DataTestUtility.TCPConnectionString))
             {
                 connection.Open();
@@ -167,7 +177,11 @@ public static void ProviderApi()
                         p2.ParameterName = "@p2";
                         p1.Value = 50.0f;
                         p2.Value = 10248;
+                        #if NET
                         DbBatchCommand command = dbProviderFactory.CreateBatchCommand();
+                        #else
+                        SqlBatchCommand command = new SqlBatchCommand();
+                        #endif
                         command.CommandText = "UPDATE Orders SET Freight=@p1 WHERE OrderID=@p2";
                         command.Parameters.Add(p1);
                         command.Parameters.Add(p2);
@@ -178,7 +192,11 @@ public static void ProviderApi()
                         DbParameter parameter = dbProviderFactory.CreateParameter();
                         parameter.ParameterName = "@p4";
                         parameter.Value = 10248;
+                        #if NET
                         DbBatchCommand command = dbProviderFactory.CreateBatchCommand();
+                        #else
+                        SqlBatchCommand command = new SqlBatchCommand();
+                        #endif
                         command.CommandText = $"SELECT Freight FROM Orders WHERE OrderID={parameter.ParameterName}";
                         command.Parameters.Add(parameter);
                         batch.BatchCommands.Add(command);
@@ -663,5 +681,3 @@ private static bool TryExecuteNonQueryCommand(string command)
         }
     }
 }
-
-#endif

From 3e2f7ea184de5e14d8cb1aa5b174ec6fac3dae07 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Wed, 22 Apr 2026 03:36:00 +1000
Subject: [PATCH 055/298] avoid redundant exception type checks (#4100)

---
 .../ManagedSni/SniTcpHandle.netcore.cs        |  6 +++--
 .../SqlAuthenticationProviderManager.cs       | 22 +++++++++----------
 .../Data/SqlClient/SqlQueryMetadataCache.cs   |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs
index 9ce9684235..c7d562750a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs
@@ -221,8 +221,10 @@ public SniTcpHandle(
                                     {
                                         throw;
                                     }
-                                    if (exRetry is SocketException || exRetry is ArgumentNullException
-                                        || exRetry is ArgumentException || exRetry is ArgumentOutOfRangeException || exRetry is AggregateException)
+                                    if (exRetry is
+                                        SocketException or
+                                        ArgumentException or
+                                        AggregateException)
                                     {
                                         SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniTcpHandle), EventType.INFO, "Connection Id {0}, Retrying exception {1}", args0: _connectionId, args1: exRetry?.Message);
                                         if (parallel)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
index 54468782bd..653063b68e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
@@ -188,17 +188,17 @@ static SqlAuthenticationProviderManager()
             // simply have no default and the app must provide one if they
             // attempt to use Active Directory authentication.
             catch (Exception ex)
-            when (ex is ArgumentNullException ||
-                  ex is ArgumentException ||
-                  ex is BadImageFormatException ||
-                  ex is FileLoadException ||
-                  ex is FileNotFoundException ||
-                  ex is MemberAccessException ||
-                  ex is MethodAccessException ||
-                  ex is MissingMethodException ||
-                  ex is NotSupportedException ||
-                  ex is TargetInvocationException ||
-                  ex is TypeLoadException)
+            when (ex is
+                      ArgumentException or
+                      BadImageFormatException or
+                      FileLoadException or
+                      FileNotFoundException or
+                      MemberAccessException or
+                      MethodAccessException or
+                      MissingMethodException or
+                      NotSupportedException or
+                      TargetInvocationException or
+                      TypeLoadException)
             {
                 SqlClientEventSource.Log.TryTraceEvent(
                     nameof(SqlAuthenticationProviderManager) +
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs
index a4a35840ac..51f0abc7cf 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs
@@ -129,7 +129,7 @@ internal bool GetQueryMetadataIfExists(SqlCommand sqlCommand)
                         InvalidateCacheEntry(sqlCommand);
 
                         // If we get one of the expected exceptions, just fail the cache lookup, otherwise throw.
-                        if (ex is SqlException || ex is ArgumentException || ex is ArgumentNullException)
+                        if (ex is SqlException or ArgumentException)
                         {
                             foreach (SqlParameter paramToCleanup in sqlCommand.Parameters)
                             {

From 8cd5dda272bef5e7a7198cb8f1285d7becf64b0b Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 21 Apr 2026 18:57:54 -0700
Subject: [PATCH 056/298] Update .NET SDK to v10.0.106 (#4218)

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 3d74096930..b7b9908783 100644
--- a/global.json
+++ b/global.json
@@ -7,7 +7,7 @@
     // .NET 10 SDK versions in the 10.0.2xx series require MSBuild 18.x, so we specify the most
     // recent 10.0.1xx series release which is compatible with MSBuild 17.x.
     //
-    "version": "10.0.105",
+    "version": "10.0.106",
 
     // We cannot allow any roll forward due to the above MSBuild compatibility issues.
     "rollForward": "disable",

From 8964a1786ce53c9e6228511bdadd8403e90aad17 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 22 Apr 2026 21:26:48 -0700
Subject: [PATCH 057/298] Update .NET 10 sdk to v10.0.107 (#4226)

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index b7b9908783..48cbbf1a80 100644
--- a/global.json
+++ b/global.json
@@ -7,7 +7,7 @@
     // .NET 10 SDK versions in the 10.0.2xx series require MSBuild 18.x, so we specify the most
     // recent 10.0.1xx series release which is compatible with MSBuild 17.x.
     //
-    "version": "10.0.106",
+    "version": "10.0.107",
 
     // We cannot allow any roll forward due to the above MSBuild compatibility issues.
     "rollForward": "disable",

From 876d2192000259318b054022c14e79c57f702b3b Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Thu, 23 Apr 2026 12:40:23 +0530
Subject: [PATCH 058/298] Add new conn-string synonyms for cross-driver
 alignment (#4192)

* Add new conn-string synonyms for cross-driver alignment
* Fix FailoverPartner testcases
---
 .../DbConnectionStringSynonyms.cs             |  5 ++
 .../Data/SqlClient/SqlConnectionString.cs     | 33 +++++-----
 .../SqlClient/SqlConnectionStringBuilder.cs   |  9 ++-
 .../SqlConnectionStringBuilderTest.cs         | 63 +++++++++++++++++++
 4 files changed, 94 insertions(+), 16 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringSynonyms.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringSynonyms.cs
index 8d4060e1b4..15c32abe75 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringSynonyms.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringSynonyms.cs
@@ -10,12 +10,15 @@ internal static class DbConnectionStringSynonyms
         internal const string Address = "address";
         internal const string App = "app";
         internal const string ApplicationIntent = "applicationintent";
+        internal const string ColumnEncryption = "columnEncryption";
         internal const string ConnectionLifetime = "connection lifetime";
         internal const string ConnectionTimeout = "connection timeout";
         internal const string ConnectRetryCount = "connectretrycount";
         internal const string ConnectRetryInterval = "connectretryinterval";
+        internal const string ConnectTimeout = "connecttimeout";
         internal const string Database = "database";
         internal const string ExtendedProperties = "extended properties";
+        internal const string FailoverPartner = "failoverpartner";
         internal const string FailoverPartnerSpn = "FailoverPartnerSPN";
         internal const string HostNameInCertificate = "hostnameincertificate";
         internal const string InitialFileName = "initial file name";
@@ -26,6 +29,7 @@ internal static class DbConnectionStringSynonyms
         internal const string Net = "net";
         internal const string Network = "network";
         internal const string NetworkAddress = "network address";
+        internal const string PacketSize = "packetsize";
         internal const string PersistSecurityInfo = "persistsecurityinfo";
         internal const string PoolBlockingPeriod = "poolblockingperiod";
         internal const string Pwd = "pwd";
@@ -38,6 +42,7 @@ internal static class DbConnectionStringSynonyms
         internal const string TrustServerCertificate = "trustservercertificate";
         internal const string Uid = "uid";
         internal const string User = "user";
+        internal const string WorkstationId = "workstationid";
         internal const string WsId = "wsid";
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs
index d36863da95..ad05f67830 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs
@@ -52,7 +52,7 @@ internal static class TRANSACTIONBINDING
             internal const string ImplicitUnbind = "Implicit Unbind";
             internal const string ExplicitUnbind = "Explicit Unbind";
         }
-        
+
         private static readonly Dictionary<string, string> s_keywordMap =
             new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
 
@@ -109,9 +109,9 @@ internal static class TRANSACTIONBINDING
         private static readonly Version s_constTypeSystemAsmVersion11 = new("11.0.0.0");
 
         private readonly string _expandedAttachDBFilename; // expanded during construction so that CreatePermissionSet & Expand are consistent
-        
+
         #region Constructors
-        
+
         /// <summary>
         /// Static constructor to do things that we can't do in a single line initialization.
         /// </summary>
@@ -125,13 +125,14 @@ static SqlConnectionString()
             AddKeywordToMap(DbConnectionStringKeywords.ApplicationIntent,
                             DbConnectionStringSynonyms.ApplicationIntent);
             AddKeywordToMap(DbConnectionStringKeywords.ApplicationName,
-                            DbConnectionStringSynonyms.App); 
+                            DbConnectionStringSynonyms.App);
             AddKeywordToMap(DbConnectionStringKeywords.AttachDbFilename,
                             DbConnectionStringSynonyms.ExtendedProperties,
                             DbConnectionStringSynonyms.InitialFileName);
             AddKeywordToMap(DbConnectionStringKeywords.AttestationProtocol);
             AddKeywordToMap(DbConnectionStringKeywords.Authentication);
-            AddKeywordToMap(DbConnectionStringKeywords.ColumnEncryptionSetting);
+            AddKeywordToMap(DbConnectionStringKeywords.ColumnEncryptionSetting,
+                            DbConnectionStringSynonyms.ColumnEncryption);
             AddKeywordToMap(DbConnectionStringKeywords.CommandTimeout);
             AddKeywordToMap(DbConnectionStringKeywords.ConnectRetryCount,
                             DbConnectionStringSynonyms.ConnectRetryCount);
@@ -139,6 +140,7 @@ static SqlConnectionString()
                             DbConnectionStringSynonyms.ConnectRetryInterval);
             AddKeywordToMap(DbConnectionStringKeywords.ConnectTimeout,
                             DbConnectionStringSynonyms.ConnectionTimeout,
+                            DbConnectionStringSynonyms.ConnectTimeout,
                             DbConnectionStringSynonyms.Timeout);
             AddKeywordToMap(DbConnectionStringKeywords.ContextConnection);
             AddKeywordToMap(DbConnectionStringKeywords.CurrentLanguage,
@@ -151,7 +153,8 @@ static SqlConnectionString()
             AddKeywordToMap(DbConnectionStringKeywords.EnclaveAttestationUrl);
             AddKeywordToMap(DbConnectionStringKeywords.Encrypt);
             AddKeywordToMap(DbConnectionStringKeywords.Enlist);
-            AddKeywordToMap(DbConnectionStringKeywords.FailoverPartner);
+            AddKeywordToMap(DbConnectionStringKeywords.FailoverPartner,
+                            DbConnectionStringSynonyms.FailoverPartner);
             AddKeywordToMap(DbConnectionStringKeywords.FailoverPartnerSpn,
                             DbConnectionStringSynonyms.FailoverPartnerSpn);
             AddKeywordToMap(DbConnectionStringKeywords.HostNameInCertificate,
@@ -170,7 +173,8 @@ static SqlConnectionString()
             AddKeywordToMap(DbConnectionStringKeywords.MinPoolSize);
             AddKeywordToMap(DbConnectionStringKeywords.MultiSubnetFailover,
                             DbConnectionStringSynonyms.MultiSubnetFailover);
-            AddKeywordToMap(DbConnectionStringKeywords.PacketSize);
+            AddKeywordToMap(DbConnectionStringKeywords.PacketSize,
+                            DbConnectionStringSynonyms.PacketSize);
             AddKeywordToMap(DbConnectionStringKeywords.Password,
                             DbConnectionStringSynonyms.Pwd);
             AddKeywordToMap(DbConnectionStringKeywords.PersistSecurityInfo,
@@ -192,6 +196,7 @@ static SqlConnectionString()
                             DbConnectionStringSynonyms.User);
             AddKeywordToMap(DbConnectionStringKeywords.UserInstance);
             AddKeywordToMap(DbConnectionStringKeywords.WorkstationId,
+                            DbConnectionStringSynonyms.WorkstationId,
                             DbConnectionStringSynonyms.WsId);
 
             #if NETFRAMEWORK
@@ -203,7 +208,7 @@ static SqlConnectionString()
                             DbConnectionStringSynonyms.TransparentNetworkIpResolution);
             #endif
         }
-        
+
         internal SqlConnectionString(string connectionString): base(connectionString, s_keywordMap)
         {
 #if !NETFRAMEWORK
@@ -568,12 +573,12 @@ internal SqlConnectionString(SqlConnectionString connectionOptions, string dataS
         }
 
         #endregion
-        
+
         internal bool IntegratedSecurity => _integratedSecurity;
 
         // @TODO: This is temporary until we can remove DbConnectionString (see SqlClientPermission)
         internal static IReadOnlyDictionary<string, string> KeywordMap => s_keywordMap;
-        
+
         // We always initialize in Async mode so that both synchronous and asynchronous methods
         // will work.  In the future we can deprecate the keyword entirely.
         internal bool Asynchronous => true;
@@ -983,21 +988,21 @@ protected internal override PermissionSet CreatePermissionSet()
         internal string NetworkLibrary => _networkLibrary;
 
 #endif // NETFRAMEWORK
-        
+
         #region Private Methods
-        
+
         private static void AddKeywordToMap(string keyword, params string[] synonyms)
         {
             // Add mapping of keyword to keyword
             s_keywordMap.Add(keyword, keyword);
-            
+
             // Add mapping of synonyms to keyword
             foreach (string synonym in synonyms)
             {
                 s_keywordMap.Add(synonym, keyword);
             }
         }
-        
+
         #endregion
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
index 046228d0c6..33d78c57c7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
@@ -273,12 +273,17 @@ private static Dictionary<string, Keywords> CreateKeywordsDictionary()
                 { DbConnectionStringSynonyms.Uid, Keywords.UserID },
                 { DbConnectionStringSynonyms.User, Keywords.UserID },
                 { DbConnectionStringSynonyms.WsId, Keywords.WorkstationID },
+                { DbConnectionStringSynonyms.WorkstationId, Keywords.WorkstationID },
                 { DbConnectionStringSynonyms.ServerSpn, Keywords.ServerSPN },
                 { DbConnectionStringSynonyms.FailoverPartnerSpn, Keywords.FailoverPartnerSPN },
+                { DbConnectionStringSynonyms.ColumnEncryption, Keywords.ColumnEncryptionSetting },
+                { DbConnectionStringSynonyms.ConnectTimeout, Keywords.ConnectTimeout },
+                { DbConnectionStringSynonyms.FailoverPartner, Keywords.FailoverPartner },
+                { DbConnectionStringSynonyms.PacketSize, Keywords.PacketSize },
             };
             return pairs;
         }
-        
+
         // @TODO These methods are completely unnecessary.
 
         private static bool ConvertToBoolean(object value) => DbConnectionStringUtilities.ConvertToBoolean(value);
@@ -565,7 +570,7 @@ private void Reset(Keywords index)
         }
 
         // @TODO: These methods can be inlined with the property setters.
-        
+
         private void SetValue(string keyword, bool value) => base[keyword] = value.ToString();
 
         private void SetValue(string keyword, int value) => base[keyword] = value.ToString((System.IFormatProvider)null);
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs
index 30e232e88c..a24c330181 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs
@@ -93,7 +93,12 @@ public partial class SqlConnectionStringBuilderTest
         [InlineData("Type System Version = Latest")]
         [InlineData("User Instance = true")]
         [InlineData("Workstation ID = myworkstation")]
+        [InlineData("WorkstationID = myworkstation")]
         [InlineData("WSID = myworkstation")]
+        [InlineData("ConnectTimeout = 30")]
+        [InlineData("Initial Catalog = Northwind; FailoverPartner = randomserver.sys.local")]
+        [InlineData("PacketSize = 8192")]
+        [InlineData("columnEncryption = Enabled")]
         [InlineData("Host Name In Certificate = tds.test.com")]
         [InlineData("HostNameInCertificate = tds.test.com")]
         [InlineData("Server Certificate = c:\\test.cer")]
@@ -937,5 +942,63 @@ internal static void CheckEncryptType(SqlConnectionStringBuilder builder, SqlCon
             Assert.Equal(expectedValue, builder.Encrypt);
         }
 
+        [Theory]
+        [InlineData("ConnectTimeout = 45", 45)]
+        [InlineData("connecttimeout = 45", 45)]
+        [InlineData("CONNECTTIMEOUT = 45", 45)]
+        [InlineData("Connect Timeout = 45", 45)]
+        [InlineData("Connection Timeout = 45", 45)]
+        [InlineData("Timeout = 45", 45)]
+        public void ConnectTimeoutSynonymsResolveCorrectly(string connectionString, int expected)
+        {
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(connectionString);
+            Assert.Equal(expected, builder.ConnectTimeout);
+        }
+
+        [Theory]
+        [InlineData("Initial Catalog = Northwind; FailoverPartner = partner.sys.local")]
+        [InlineData("Initial Catalog = Northwind; failoverpartner = partner.sys.local")]
+        [InlineData("Initial Catalog = Northwind; FAILOVERPARTNER = partner.sys.local")]
+        [InlineData("Initial Catalog = Northwind; Failover Partner = partner.sys.local")]
+        public void FailoverPartnerSynonymsResolveCorrectly(string connectionString)
+        {
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(connectionString);
+            Assert.Equal("partner.sys.local", builder.FailoverPartner);
+        }
+
+        [Theory]
+        [InlineData("PacketSize = 16000", 16000)]
+        [InlineData("packetsize = 16000", 16000)]
+        [InlineData("PACKETSIZE = 16000", 16000)]
+        [InlineData("Packet Size = 16000", 16000)]
+        public void PacketSizeSynonymsResolveCorrectly(string connectionString, int expected)
+        {
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(connectionString);
+            Assert.Equal(expected, builder.PacketSize);
+        }
+
+        [Theory]
+        [InlineData("WorkstationID = myws")]
+        [InlineData("workstationid = myws")]
+        [InlineData("WORKSTATIONID = myws")]
+        [InlineData("Workstation ID = myws")]
+        [InlineData("WSID = myws")]
+        public void WorkstationIdSynonymsResolveCorrectly(string connectionString)
+        {
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(connectionString);
+            Assert.Equal("myws", builder.WorkstationID);
+        }
+
+        [Theory]
+        [InlineData("columnEncryption = Enabled")]
+        [InlineData("columnencryption = Enabled")]
+        [InlineData("COLUMNENCRYPTION = Enabled")]
+        [InlineData("Column Encryption Setting = Enabled")]
+        public void ColumnEncryptionSynonymsResolveCorrectly(string connectionString)
+        {
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(connectionString);
+            Assert.Equal(SqlConnectionColumnEncryptionSetting.Enabled, builder.ColumnEncryptionSetting);
+        }
+
     }
 }

From 2a6280ad44fc7422774e0cf44f4e71e0c326453b Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 23 Apr 2026 07:24:17 -0300
Subject: [PATCH 059/298] Fix IsDBNull + stream read bug that skips column data
 (#4082)

---
 BUILDGUIDE.md                                 |  47 ++
 .../Microsoft/Data/SqlClient/SqlDataReader.cs |  12 +-
 ...Microsoft.Data.SqlClient.TestCommon.csproj |  10 +-
 .../AlwaysEncrypted/CspProviderExt.cs         |  18 +-
 .../DataReaderTest/DataReaderStreamsTest.cs   | 584 ++++++++++++++++--
 .../SQL/DataReaderTest/DataReaderTest.cs      |  47 +-
 .../Config.cs                                 |  22 +-
 7 files changed, 659 insertions(+), 81 deletions(-)

diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 8f13730f68..5da2e2ffd6 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -57,6 +57,53 @@ Manual Tests require the below setup to run:
   |IsManagedInstance | (Optional) When set to `true` **TVP** related tests will use non-Azure bsl files to compare test results. This is needed when testing against Azure Managed Instances; otherwise TVP Tests will fail on TestSet 3. The default value is `false`. |
   |PowerShellPath | The full path to PowerShell.exe. This is not required if the path is present in the PATH environment variable. | `D:\\escaped\\absolute\\path\\to\\PowerShell.exe` |
 
+## Test Configuration Environment Variables
+
+Environment variables can be used to override test configuration without modifying `config.json`
+files directly. This is useful when running tests via the command line, in CI/CD pipelines,
+containerized environments, or when switching between configurations frequently.
+
+### Main Test Suite (`Microsoft.Data.SqlClient.TestUtilities`)
+
+These variables apply to unit, functional, and manual tests. The configuration is defined in
+[`Config.cs`](src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs).
+
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `TEST_MDS_CONFIG` | Override the path to the `config.json` file used by the test runner. | `config.json` (in the working directory) |
+| `MDS_TCPConnectionString` | Override the TCP connection string. Takes precedence over the value in `config.json`. | Value from `config.json` |
+
+Example:
+
+```bash
+export TEST_MDS_CONFIG=~/my-test-config.json
+export MDS_TCPConnectionString="Server=myserver;Database=mydb;Trusted_Connection=True;"
+dotnet test src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+```
+
+### Performance Tests
+
+These variables apply to performance benchmarks. The configuration is defined in
+[`Config.cs`](src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs).
+
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `RUNNER_CONFIG` | Override the path to the `runnerconfig.json` file used by performance benchmarks. | `runnerconfig.json` (in the DLL output directory) |
+
+See [Run Performance Tests](#run-performance-tests) for more details.
+
+### Azure Extension Tests
+
+These variables apply to the Azure extension test suite. The configuration is defined in
+[`Config.cs`](src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs).
+
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `TEST_MDS_CONFIG` | Override the path to the `config.json` file used by Azure extension tests. | `config.json` |
+| `ADO_POOL` | Set to any value to indicate tests are running in an Azure DevOps CI pool. | _(unset)_ |
+| `SYSTEM_ACCESSTOKEN` | Azure Pipelines system access token, used for workload identity federation tests. | _(unset)_ |
+| `TEST_DEBUG_EMIT` | Set to any value to enable debug output of configuration values during test startup. Sensitive values are Base64-encoded. | _(unset)_ |
+
 ## MSBuild Reference
 
 ### Targets
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index d0bd8dc247..f01fe4506d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -3942,8 +3942,16 @@ internal TdsOperationStatus TryReadColumnInternal(int i, bool readHeaderOnly = f
             // Check if we've already read the header already
             if (i < _sharedState._nextColumnHeaderToRead)
             {
-                // Read the header, but we need to read the data
-                if ((i == _sharedState._nextColumnDataToRead) && (!readHeaderOnly))
+                // The column header has been read (e.g. by IsDBNull) but data hasn't
+                // been consumed yet.  Consume it now unless:
+                //  - readHeaderOnly: caller only wants the header (e.g. IsDBNull itself).
+                //  - forStreaming + SequentialAccess: a streaming type (Stream, TextReader,
+                //    XmlReader) was requested in sequential mode.  The data must stay on the
+                //    wire so that SqlSequentialStream / SqlSequentialTextReader can read it
+                //    incrementally.  In non-sequential mode we still need to materialize the
+                //    data into _data[i] for the MemoryStream / StringReader path.
+                if ((i == _sharedState._nextColumnDataToRead) && (!readHeaderOnly) &&
+                    !(forStreaming && IsCommandBehavior(CommandBehavior.SequentialAccess)))
                 {
                     return TryReadColumnData();
                 }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index 562c60b3af..3f014f9fbe 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -3,6 +3,12 @@
     <AssemblyName>Microsoft.Data.SqlClient.TestCommon</AssemblyName>
     <RootNamespace>Microsoft.Data.SqlClient.TestCommon</RootNamespace>
     <Nullable>enable</Nullable>
+
+    <!--
+      This is a shared helper library, not a test project. IsTestProject prevents test adapters
+      (e.g. dotnet test) from discovering this assembly.
+    -->
+    <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
@@ -26,16 +32,12 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Azure.Security.KeyVault.Keys" />
-    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
-    <PackageReference Include="xunit" />
   </ItemGroup>
 
   <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Azure.Security.KeyVault.Keys" />
-    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
-    <PackageReference Include="xunit" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
index e57a734e0e..acb2e9278c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using Microsoft.Data.SqlClient.Tests.Common.Fixtures;
@@ -59,7 +60,7 @@ public void TestEncryptDecryptWithCsp(string connectionString, string providerNa
                                  @$"FROM [{sqlSetupStrategyCsp.ApiTestTable.Name}] " +
                                  @$"WHERE FirstName = @firstName";
             using SqlCommand sqlCommand = new(commandText, sqlConn, null, SqlCommandColumnEncryptionSetting.Enabled);
-            
+
             SqlParameter customerFirstParam = sqlCommand.Parameters.AddWithValue(@"firstName", @"Microsoft");
             customerFirstParam.Direction = System.Data.ParameterDirection.Input;
 
@@ -71,6 +72,13 @@ public static IEnumerable<object[]> TestEncryptDecryptWithCsp_Data
         {
             get
             {
+                // xUnit evaluates MemberData during discovery, before [PlatformSpecific]
+                // can skip execution. Guard here to prevent Registry access on non-Windows.
+                if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    yield break;
+                }
+
                 const string providerRegistryKeyPath = @"SOFTWARE\Microsoft\Cryptography\Defaults\Provider";
                 using RegistryKey defaultProviderRegistryKey = Registry.LocalMachine.OpenSubKey(providerRegistryKeyPath);
                 if (defaultProviderRegistryKey is null)
@@ -78,7 +86,7 @@ public static IEnumerable<object[]> TestEncryptDecryptWithCsp_Data
                     // No test cases can be generated if the registry key doesn't exist.
                     yield break;
                 }
-                
+
                 foreach (string subKeyName in defaultProviderRegistryKey.GetSubKeyNames())
                 {
                     // Skip inappropriate providers
@@ -93,17 +101,17 @@ public static IEnumerable<object[]> TestEncryptDecryptWithCsp_Data
                     {
                         continue;
                     }
-                    
+
                     // Read provider name
                     string providerName = Path.GetFileName(providerKey.Name);
-                    
+
                     // Read provider type
                     object providerTypeValue = providerKey.GetValue(@"Type");
                     if (providerTypeValue is not int providerType)
                     {
                         continue;
                     }
-                    
+
                     // Combine with AE connection strings
                     foreach (string aeConnectionString in DataTestUtility.AEConnStrings)
                     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs
index e5ff3c7559..380978f049 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs
@@ -434,71 +434,63 @@ public static void NullStreamProperties(CommandBehavior behavior, AccessorType a
 
                 using (SqlDataReader reader = command.ExecuteReader(behavior))
                 {
-                    if (reader.Read())
-                    {
-                        Assert.True(reader.IsDBNull(0));
-                        Assert.True(reader.IsDBNull(1));
-                        Assert.True(reader.IsDBNull(2));
-                    }
+                    Assert.True(reader.Read());
+                    Assert.True(reader.IsDBNull(0));
+                    Assert.True(reader.IsDBNull(1));
+                    Assert.True(reader.IsDBNull(2));
                 }
 
                 using (SqlDataReader reader = command.ExecuteReader(behavior))
                 {
-                    if (reader.Read())
-                    {
-                        Assert.True(reader.IsDBNullAsync(0).GetAwaiter().GetResult());
-                        Assert.True(reader.IsDBNullAsync(1).GetAwaiter().GetResult());
-                        Assert.True(reader.IsDBNullAsync(2).GetAwaiter().GetResult());
-                    }
+                    Assert.True(reader.Read());
+                    Assert.True(reader.IsDBNullAsync(0).GetAwaiter().GetResult());
+                    Assert.True(reader.IsDBNullAsync(1).GetAwaiter().GetResult());
+                    Assert.True(reader.IsDBNullAsync(2).GetAwaiter().GetResult());
                 }
 
                 using (SqlDataReader reader = command.ExecuteReader(behavior))
                 {
-                    if (reader.Read())
+                    Assert.True(reader.Read());
+                    using (XmlReader xmlReader = GetValue<XmlReader>(reader, 0, accessorType))
                     {
-                        using (XmlReader xmlReader = GetValue<XmlReader>(reader, 0, accessorType))
-                        {
-                            Assert.NotNull(xmlReader);
-                            Assert.Equal(accessorType == AccessorType.GetFieldValueAsync, xmlReader.Settings.Async);
-                            Assert.Equal(xmlReader.Value, string.Empty);
-                            Assert.False(xmlReader.Read());
-                            Assert.True(xmlReader.EOF);
-                        }
+                        Assert.NotNull(xmlReader);
+                        Assert.Equal(accessorType == AccessorType.GetFieldValueAsync, xmlReader.Settings.Async);
+                        Assert.Equal(xmlReader.Value, string.Empty);
+                        Assert.False(xmlReader.Read());
+                        Assert.True(xmlReader.EOF);
+                    }
 
-                        using (TextReader textReader = GetValue<TextReader>(reader, 1, accessorType))
-                        {
-                            Assert.NotNull(textReader);
-                            Assert.True(behavior != CommandBehavior.SequentialAccess || textReader.GetType().Name.Contains("Sequential"));
-                            Assert.Equal(textReader.ReadToEnd(), string.Empty);
-                        }
+                    using (TextReader textReader = GetValue<TextReader>(reader, 1, accessorType))
+                    {
+                        Assert.NotNull(textReader);
+                        Assert.True(behavior != CommandBehavior.SequentialAccess || textReader.GetType().Name.Contains("Sequential"));
+                        Assert.Equal(textReader.ReadToEnd(), string.Empty);
+                    }
 
-                        using (Stream stream = GetValue<Stream>(reader, 2, accessorType))
-                        {
-                            Assert.NotNull(stream);
-                            Assert.True(behavior != CommandBehavior.SequentialAccess || stream.GetType().Name.Contains("Sequential"));
-                        }
+                    using (Stream stream = GetValue<Stream>(reader, 2, accessorType))
+                    {
+                        Assert.NotNull(stream);
+                        Assert.True(behavior != CommandBehavior.SequentialAccess || stream.GetType().Name.Contains("Sequential"));
                     }
                 }
 
                 using (SqlDataReader reader = command.ExecuteReader(behavior))
                 {
-                    if (reader.Read())
+                    Assert.True(reader.Read());
+                    // get a clean reader over the same field and check that the value is empty
+                    using (XmlReader xmlReader = GetValue<XmlReader>(reader, 0, accessorType))
                     {
-                        // get a clean reader over the same field and check that the value is empty
-                        using (XmlReader xmlReader = GetValue<XmlReader>(reader, 0, accessorType))
-                        {
-                            Assert.Equal(GetXmlDocumentContents(xmlReader), string.Empty);
-                        }
+                        Assert.Equal(GetXmlDocumentContents(xmlReader), string.Empty);
+                    }
 
-                        using (TextReader textReader = GetValue<TextReader>(reader, 1, accessorType))
-                        {
-                            Assert.Equal(textReader.ReadToEnd(), string.Empty);
-                        }
+                    using (TextReader textReader = GetValue<TextReader>(reader, 1, accessorType))
+                    {
+                        Assert.Equal(textReader.ReadToEnd(), string.Empty);
+                    }
 
-                        using (Stream stream = GetValue<Stream>(reader, 2, accessorType))
-                        {
-                            Assert.Equal(GetStreamContents(stream), Array.Empty<byte>());
-                        }
+                    using (Stream stream = GetValue<Stream>(reader, 2, accessorType))
+                    {
+                        Assert.Equal(GetStreamContents(stream), Array.Empty<byte>());
                     }
                 }
             }
@@ -567,6 +559,506 @@ public static async Task ReadAsyncContentsCompletes()
         }
 #endif
 
+#nullable enable
+        // Test that calling IsDBNullAsync() doesn't prevent
+        // GetFieldValueAsync() from successfully reading the column value.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("FOO", false, false)]
+        [InlineData("FOO", false, true)]
+        [InlineData(null, true, false)]
+        [InlineData(null, true, true)]
+        public static async Task IsDBNullAsync_GetFieldValueAsync_Compatibility(
+            string? value,
+            bool expectNull,
+            bool checkNull)
+        {
+            using SqlConnection connection = new (DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(varbinary, " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                await command.ExecuteReaderAsync(CommandBehavior.SequentialAccess);
+
+            while (await reader.ReadAsync())
+            {
+                Assert.Equal("foo", reader.GetString(0));
+                Assert.Equal(7, reader.GetInt32(1));
+
+                // Check if the 3rd column (index 2) is null, if desired.
+                if (checkNull)
+                {
+                    Assert.Equal(expectNull, await reader.IsDBNullAsync(2));
+                }
+
+                // Read the value of the 3rd column (index 2).
+                using MemoryStream buffer = new();
+                using (Stream stream = await reader.GetFieldValueAsync<Stream>(2))
+                {
+                    await stream.CopyToAsync(buffer);
+                    Assert.Equal(
+                        // Trying to read a null column via Stream yields an empty stream, thus an
+                        // empty string.
+                        expectNull ? "" : value,
+                        Encoding.UTF8.GetString(buffer.ToArray()));
+                }
+            }
+        }
+
+        // Test that calling IsDBNullAsync() doesn't prevent
+        // GetFieldValueAsync<TextReader>() from successfully reading the column value.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("FOO", false, false)]
+        [InlineData("FOO", false, true)]
+        [InlineData(null, true, false)]
+        [InlineData(null, true, true)]
+        public static async Task IsDBNullAsync_GetFieldValueAsyncTextReader_Compatibility(
+            string? value,
+            bool expectNull,
+            bool checkNull)
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(nvarchar(100), " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                await command.ExecuteReaderAsync(CommandBehavior.SequentialAccess);
+
+            while (await reader.ReadAsync())
+            {
+                Assert.Equal("foo", reader.GetString(0));
+                Assert.Equal(7, reader.GetInt32(1));
+
+                if (checkNull)
+                {
+                    Assert.Equal(expectNull, await reader.IsDBNullAsync(2));
+                }
+
+                using TextReader textReader = await reader.GetFieldValueAsync<TextReader>(2);
+                string result = await textReader.ReadToEndAsync();
+                Assert.Equal(expectNull ? "" : value, result);
+            }
+        }
+
+        // Test that calling IsDBNullAsync() doesn't prevent
+        // GetFieldValueAsync<XmlReader>() from successfully reading the column value.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("<root />", false, false)]
+        [InlineData("<root />", false, true)]
+        [InlineData(null, true, false)]
+        [InlineData(null, true, true)]
+        public static async Task IsDBNullAsync_GetFieldValueAsyncXmlReader_Compatibility(
+            string? value,
+            bool expectNull,
+            bool checkNull)
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(xml, " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                await command.ExecuteReaderAsync(CommandBehavior.SequentialAccess);
+
+            while (await reader.ReadAsync())
+            {
+                Assert.Equal("foo", reader.GetString(0));
+                Assert.Equal(7, reader.GetInt32(1));
+
+                if (checkNull)
+                {
+                    Assert.Equal(expectNull, await reader.IsDBNullAsync(2));
+                }
+
+                if (expectNull)
+                {
+                    using XmlReader xmlReader = await reader.GetFieldValueAsync<XmlReader>(2);
+                    Assert.False(xmlReader.Read());
+                }
+                else
+                {
+                    using XmlReader xmlReader = await reader.GetFieldValueAsync<XmlReader>(2);
+                    xmlReader.Read();
+                    string result = xmlReader.ReadOuterXml();
+                    Assert.Equal(value, result);
+                }
+            }
+        }
+
+        // Test that calling IsDBNull (sync) doesn't prevent
+        // GetFieldValue<Stream> (sync) from successfully reading the column value.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("FOO", false, false)]
+        [InlineData("FOO", false, true)]
+        [InlineData(null, true, false)]
+        [InlineData(null, true, true)]
+        public static async Task IsDBNull_GetFieldValueStream_Compatibility(
+            string? value,
+            bool expectNull,
+            bool checkNull)
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(varbinary, " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                command.ExecuteReader(CommandBehavior.SequentialAccess);
+
+            while (reader.Read())
+            {
+                Assert.Equal("foo", reader.GetString(0));
+                Assert.Equal(7, reader.GetInt32(1));
+
+                if (checkNull)
+                {
+                    Assert.Equal(expectNull, reader.IsDBNull(2));
+                }
+
+                using MemoryStream buffer = new();
+                using (Stream stream = reader.GetFieldValue<Stream>(2))
+                {
+                    stream.CopyTo(buffer);
+                    Assert.Equal(
+                        expectNull ? "" : value,
+                        Encoding.UTF8.GetString(buffer.ToArray()));
+                }
+            }
+        }
+
+        // Test that calling IsDBNull (sync) doesn't prevent
+        // GetFieldValue<TextReader> (sync) from successfully reading the column value.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("FOO", false, false)]
+        [InlineData("FOO", false, true)]
+        [InlineData(null, true, false)]
+        [InlineData(null, true, true)]
+        public static async Task IsDBNull_GetFieldValueTextReader_Compatibility(
+            string? value,
+            bool expectNull,
+            bool checkNull)
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(nvarchar(100), " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                command.ExecuteReader(CommandBehavior.SequentialAccess);
+
+            while (reader.Read())
+            {
+                Assert.Equal("foo", reader.GetString(0));
+                Assert.Equal(7, reader.GetInt32(1));
+
+                if (checkNull)
+                {
+                    Assert.Equal(expectNull, reader.IsDBNull(2));
+                }
+
+                using TextReader textReader = reader.GetFieldValue<TextReader>(2);
+                string result = textReader.ReadToEnd();
+                Assert.Equal(expectNull ? "" : value, result);
+            }
+        }
+
+        // Test that calling IsDBNull (sync) doesn't prevent
+        // GetFieldValue<XmlReader> (sync) from successfully reading the column value.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("<root />", false, false)]
+        [InlineData("<root />", false, true)]
+        [InlineData(null, true, false)]
+        [InlineData(null, true, true)]
+        public static async Task IsDBNull_GetFieldValueXmlReader_Compatibility(
+            string? value,
+            bool expectNull,
+            bool checkNull)
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(xml, " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                command.ExecuteReader(CommandBehavior.SequentialAccess);
+
+            while (reader.Read())
+            {
+                Assert.Equal("foo", reader.GetString(0));
+                Assert.Equal(7, reader.GetInt32(1));
+
+                if (checkNull)
+                {
+                    Assert.Equal(expectNull, reader.IsDBNull(2));
+                }
+
+                if (expectNull)
+                {
+                    using XmlReader xmlReader = reader.GetFieldValue<XmlReader>(2);
+                    Assert.False(xmlReader.Read());
+                }
+                else
+                {
+                    using XmlReader xmlReader = reader.GetFieldValue<XmlReader>(2);
+                    xmlReader.Read();
+                    string result = xmlReader.ReadOuterXml();
+                    Assert.Equal(value, result);
+                }
+            }
+        }
+
+        // Test that calling IsDBNull (sync) doesn't prevent
+        // GetFieldValueAsync<Stream> (async) from successfully reading the column value.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("FOO", false, false)]
+        [InlineData("FOO", false, true)]
+        [InlineData(null, true, false)]
+        [InlineData(null, true, true)]
+        public static async Task IsDBNull_GetFieldValueAsyncStream_Compatibility(
+            string? value,
+            bool expectNull,
+            bool checkNull)
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(varbinary, " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                command.ExecuteReader(CommandBehavior.SequentialAccess);
+
+            while (reader.Read())
+            {
+                Assert.Equal("foo", reader.GetString(0));
+                Assert.Equal(7, reader.GetInt32(1));
+
+                if (checkNull)
+                {
+                    Assert.Equal(expectNull, reader.IsDBNull(2));
+                }
+
+                using MemoryStream buffer = new();
+                using (Stream stream = await reader.GetFieldValueAsync<Stream>(2))
+                {
+                    await stream.CopyToAsync(buffer);
+                    Assert.Equal(
+                        expectNull ? "" : value,
+                        Encoding.UTF8.GetString(buffer.ToArray()));
+                }
+            }
+        }
+
+        // Test that calling IsDBNullAsync doesn't prevent
+        // GetFieldValue<Stream> (sync) from successfully reading the column value.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("FOO", false, false)]
+        [InlineData("FOO", false, true)]
+        [InlineData(null, true, false)]
+        [InlineData(null, true, true)]
+        public static async Task IsDBNullAsync_GetFieldValueStream_Compatibility(
+            string? value,
+            bool expectNull,
+            bool checkNull)
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            await connection.OpenAsync();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(varbinary, " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                await command.ExecuteReaderAsync(CommandBehavior.SequentialAccess);
+
+            while (await reader.ReadAsync())
+            {
+                Assert.Equal("foo", reader.GetString(0));
+                Assert.Equal(7, reader.GetInt32(1));
+
+                if (checkNull)
+                {
+                    Assert.Equal(expectNull, await reader.IsDBNullAsync(2));
+                }
+
+                using MemoryStream buffer = new();
+                using (Stream stream = reader.GetFieldValue<Stream>(2))
+                {
+                    stream.CopyTo(buffer);
+                    Assert.Equal(
+                        expectNull ? "" : value,
+                        Encoding.UTF8.GetString(buffer.ToArray()));
+                }
+            }
+        }
+
+        // Test that calling IsDBNull doesn't prevent
+        // GetFieldValue<Stream> from reading the column in non-sequential mode.
+        // Regression test for Copilot review comment on PR #4082: the forStreaming
+        // guard must not suppress TryReadColumnData in non-sequential access.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("FOO", false)]
+        [InlineData(null, true)]
+        public static void IsDBNull_GetFieldValueStream_NonSequential(
+            string? value,
+            bool expectNull)
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(varbinary, " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                command.ExecuteReader(CommandBehavior.Default);
+
+            Assert.True(reader.Read());
+            Assert.Equal("foo", reader.GetString(0));
+            Assert.Equal(7, reader.GetInt32(1));
+
+            // Pre-read the column header via IsDBNull
+            Assert.Equal(expectNull, reader.IsDBNull(2));
+
+            // Now read via streaming type — should still work
+            using MemoryStream buffer = new();
+            using (Stream stream = reader.GetFieldValue<Stream>(2))
+            {
+                stream.CopyTo(buffer);
+                Assert.Equal(
+                    expectNull ? "" : value,
+                    Encoding.UTF8.GetString(buffer.ToArray()));
+            }
+        }
+
+        // Test that calling IsDBNull doesn't prevent
+        // GetFieldValue<TextReader> from reading the column in non-sequential mode.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("FOO", false)]
+        [InlineData(null, true)]
+        public static void IsDBNull_GetFieldValueTextReader_NonSequential(
+            string? value,
+            bool expectNull)
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(nvarchar(100), " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                command.ExecuteReader(CommandBehavior.Default);
+
+            Assert.True(reader.Read());
+            Assert.Equal("foo", reader.GetString(0));
+            Assert.Equal(7, reader.GetInt32(1));
+
+            Assert.Equal(expectNull, reader.IsDBNull(2));
+
+            using TextReader textReader = reader.GetFieldValue<TextReader>(2);
+            string result = textReader.ReadToEnd();
+            Assert.Equal(expectNull ? "" : value, result);
+        }
+
+        // Test that calling IsDBNull doesn't prevent
+        // GetFieldValue<XmlReader> from reading the column in non-sequential mode.
+        [ConditionalTheory(
+            typeof(DataTestUtility),
+            nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData("<root />", false)]
+        [InlineData(null, true)]
+        public static void IsDBNull_GetFieldValueXmlReader_NonSequential(
+            string? value,
+            bool expectNull)
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
+
+            using SqlCommand command = new(
+                "select 'foo', 7, convert(xml, " +
+                (value is null ? "null" : $"'{value}'") + ")",
+                connection);
+
+            using SqlDataReader reader =
+                command.ExecuteReader(CommandBehavior.Default);
+
+            Assert.True(reader.Read());
+            Assert.Equal("foo", reader.GetString(0));
+            Assert.Equal(7, reader.GetInt32(1));
+
+            Assert.Equal(expectNull, reader.IsDBNull(2));
+
+            if (expectNull)
+            {
+                using XmlReader xmlReader = reader.GetFieldValue<XmlReader>(2);
+                Assert.False(xmlReader.Read());
+            }
+            else
+            {
+                using XmlReader xmlReader = reader.GetFieldValue<XmlReader>(2);
+                xmlReader.Read();
+                string result = xmlReader.ReadOuterXml();
+                Assert.Equal(value, result);
+            }
+        }
+#nullable disable
+
         private static async Task<SqlDataReader> ExecuteReader(SqlCommand command, CommandBehavior behavior, bool isExecuteAsync)
             => isExecuteAsync ? await command.ExecuteReaderAsync(behavior) : command.ExecuteReader(behavior);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
index 2fbf2714f9..aad117b336 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
@@ -440,7 +440,7 @@ public static async Task<int> CanReadXmlData()
       <genre>Computer</genre>
       <price>44.95</price>
       <publish_date>2000-10-01</publish_date>
-      <description>An in-depth look at creating applications 
+      <description>An in-depth look at creating applications
       with XML.</description>
    </book>
    <book id=""bk102"">
@@ -449,8 +449,8 @@ with XML.</description>
       <genre>Fantasy</genre>
       <price>5.95</price>
       <publish_date>2000-12-16</publish_date>
-      <description>A former architect battles corporate zombies, 
-      an evil sorceress, and her own childhood to become queen 
+      <description>A former architect battles corporate zombies,
+      an evil sorceress, and her own childhood to become queen
       of the world.</description>
    </book>
    <book id=""bk103"">
@@ -459,8 +459,8 @@ of the world.</description>
       <genre>Fantasy</genre>
       <price>5.95</price>
       <publish_date>2000-11-17</publish_date>
-      <description>After the collapse of a nanotechnology 
-      society in England, the young survivors lay the 
+      <description>After the collapse of a nanotechnology
+      society in England, the young survivors lay the
       foundation for a new society.</description>
    </book>
    <book id=""bk104"">
@@ -469,9 +469,9 @@ of the world.</description>
       <genre>Fantasy</genre>
       <price>5.95</price>
       <publish_date>2001-03-10</publish_date>
-      <description>In post-apocalypse England, the mysterious 
-      agent known only as Oberon helps to create a new life 
-      for the inhabitants of London. Sequel to Maeve 
+      <description>In post-apocalypse England, the mysterious
+      agent known only as Oberon helps to create a new life
+      for the inhabitants of London. Sequel to Maeve
       Ascendant.</description>
    </book>
    <book id=""bk105"">
@@ -480,8 +480,8 @@ of the world.</description>
       <genre>Fantasy</genre>
       <price>5.95</price>
       <publish_date>2001-09-10</publish_date>
-      <description>The two daughters of Maeve, half-sisters, 
-      battle one another for control of England. Sequel to 
+      <description>The two daughters of Maeve, half-sisters,
+      battle one another for control of England. Sequel to
       Oberon's Legacy.</description>
    </book>
    <book id=""bk106"">
@@ -490,7 +490,7 @@ of the world.</description>
       <genre>Romance</genre>
       <price>4.95</price>
       <publish_date>2000-09-02</publish_date>
-      <description>When Carla meets Paul at an ornithology 
+      <description>When Carla meets Paul at an ornithology
       conference, tempers fly as feathers get ruffled.</description>
    </book>
    <book id=""bk107"">
@@ -499,7 +499,7 @@ of the world.</description>
       <genre>Romance</genre>
       <price>4.95</price>
       <publish_date>2000-11-02</publish_date>
-      <description>A deep sea diver finds true love twenty 
+      <description>A deep sea diver finds true love twenty
       thousand leagues beneath the sea.</description>
    </book>
    <book id=""bk108"">
@@ -518,7 +518,7 @@ thousand leagues beneath the sea.</description>
       <price>6.95</price>
       <publish_date>2000-11-02</publish_date>
       <description>After an inadvertant trip through a Heisenberg
-      Uncertainty Device, James Salway discovers the problems 
+      Uncertainty Device, James Salway discovers the problems
       of being quantum.</description>
    </book>
    <book id=""bk110"">
@@ -527,7 +527,7 @@ of being quantum.</description>
       <genre>Computer</genre>
       <price>36.95</price>
       <publish_date>2000-12-09</publish_date>
-      <description>Microsoft's .NET initiative is explored in 
+      <description>Microsoft's .NET initiative is explored in
       detail in this deep programmer's reference.</description>
    </book>
    <book id=""bk111"">
@@ -536,8 +536,8 @@ detail in this deep programmer's reference.</description>
       <genre>Computer</genre>
       <price>36.95</price>
       <publish_date>2000-12-01</publish_date>
-      <description>The Microsoft MSXML3 parser is covered in 
-      detail, with attention to XML DOM interfaces, XSLT processing, 
+      <description>The Microsoft MSXML3 parser is covered in
+      detail, with attention to XML DOM interfaces, XSLT processing,
       SAX and more.</description>
    </book>
    <book id=""bk112"">
@@ -547,8 +547,8 @@ SAX and more.</description>
       <price>49.95</price>
       <publish_date>2001-04-16</publish_date>
       <description>Microsoft Visual Studio 7 is explored in depth,
-      looking at how Visual Basic, Visual C++, C#, and ASP+ are 
-      integrated into a comprehensive development 
+      looking at how Visual Basic, Visual C++, C#, and ASP+ are
+      integrated into a comprehensive development
       environment.</description>
    </book>
 </catalog>";
@@ -886,13 +886,13 @@ StringName         varchar(255)     not null,
                         cmd.CommandText = $""""
                   SELECT
                   	[gs].[List],
-                  	[gs].[UseProtoSerializer] 
+                  	[gs].[UseProtoSerializer]
                   FROM
                   	[{tableName}] [gs]
                   WHERE
                   	([gs].[IsGlobal] = 1 OR [gs].[User_ID] = '{"80004Q4WZ1350KO8NT59RM"}') AND
                   	([gs].[ModuleNameForUse] IS NULL OR [gs].[ModuleNameForUse] = {2})
-                  
+
                   """";
 
                         var l = (string)await cmd.ExecuteScalarAsync();
@@ -960,6 +960,11 @@ public _Row(int id, Guid documentIdentificationId, string name, string value)
             }
         }
 
+        // NOTE: This test is very slow (can exceed 10 minutes on macOS).  It runs 512 iterations
+        // (packet sizes 512..2045 stepping by 3), each opening a new non-pooled TCP connection and
+        // reading 21 rows that include several nvarchar(max) values tens-of-thousands of characters
+        // long.  With small packet sizes the large strings require many network round-trips, and on
+        // non-Windows platforms the managed SNI layer is used which adds further overhead.
         [Trait("Category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         public static async Task CanReadAwkwardDataLengths()
@@ -1094,7 +1099,7 @@ [Value] [nvarchar](max) NULL
                     SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString);
                     builder.PersistSecurityInfo = true;
                     builder.Pooling = false;
-                    
+
                     for (int packetSize = 512; packetSize<2048; packetSize+=3)
                     {
                         builder.PacketSize = packetSize;
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
index 72ed2e63a0..6e82dc5076 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
@@ -42,23 +42,39 @@ public class Config
         public string KerberosDomainUser = null;
         public bool IsManagedInstance = false;
         public string AliasName = null;
-        
+
         public static Config Load(string configPath = @"config.json")
         {
             // Allow an override of the config path via an environment variable.
-            configPath = Environment.GetEnvironmentVariable("MDS_TEST_CONFIG") ?? configPath;
+            configPath = Environment.GetEnvironmentVariable("TEST_MDS_CONFIG") ?? configPath;
 
+            Config config;
             try
             {
                 using (StreamReader r = new StreamReader(configPath))
                 {
-                    return JsonConvert.DeserializeObject<Config>(r.ReadToEnd());
+                    config = JsonConvert.DeserializeObject<Config>(r.ReadToEnd())
+                        ?? throw new InvalidOperationException($"Failed to deserialize config from '{configPath}'.");
                 }
             }
             catch
             {
                 throw;
             }
+
+            static void SetFromEnv(string envVar, ref string configValue)
+            {
+                string envValue = Environment.GetEnvironmentVariable(envVar);
+                if (!string.IsNullOrEmpty(envValue))
+                {
+                    configValue = envValue;
+                }
+            }
+
+            // Allow environment variables to override individual config values.
+            SetFromEnv("MDS_TCPConnectionString", ref config.TCPConnectionString);
+
+            return config;
         }
 
         public static void UpdateConfig(Config updatedConfig, string configPath = @"config.json")

From 74a8b0fd8dc22b7729e532bc67ad0d9752cca9dc Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Thu, 23 Apr 2026 13:49:23 -0700
Subject: [PATCH 060/298] Implement ChannelDbConnectionPool.Clear (#4194)

* Implement clear

* Hook up clearallpools testing

* Rename generation property.

* Expose IdleCount. Wrap idle channel in helper class to safely control IdleCount calculation.

* Make basic lifecycle methods no-ops to enable manual tests.

* Address copilot comments.

* Review changes

* Review changes 1

Co-authored-by: Copilot <copilot@github.com>

* Rename test class. Add concurrency test.

Co-authored-by: Copilot <copilot@github.com>

* Fix using statement.

---------

Co-authored-by: Copilot <copilot@github.com>
---
 .../SqlConnection.xml                         |  20 +-
 specs/001-pool-clear/spec.md                  | 100 +++++++
 .../Data/ProviderBase/DbConnectionInternal.cs |  11 +
 .../ConnectionPool/ChannelDbConnectionPool.cs | 112 ++++++--
 .../ConnectionPool/DbConnectionPoolGroup.cs   |   2 +-
 .../ConnectionPool/IDbConnectionPool.cs       |  12 +
 .../ConnectionPool/IdleConnectionChannel.cs   |  92 +++++++
 .../WaitHandleDbConnectionPool.cs             |   8 +-
 .../Data/SqlClient/SqlConnectionFactory.cs    |   6 +-
 .../ConnectionPoolHelper.cs                   |  22 +-
 .../ConnectionPoolTest/ConnectionPoolTest.cs  |  39 ++-
 .../ChannelDbConnectionPoolTest.cs            | 233 ++++++++++++++++-
 .../IdleConnectionChannelTest.cs              | 244 ++++++++++++++++++
 .../TransactedConnectionPoolTest.cs           |   1 +
 14 files changed, 841 insertions(+), 61 deletions(-)
 create mode 100644 specs/001-pool-clear/spec.md
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
index f0eddd56fa..f2e03ebf26 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@@ -827,10 +827,17 @@ The following example creates a <xref:Microsoft.Data.SqlClient.SqlConnection> an
     </ChangePasswordConnectionStringCredentialNewSecurePassword>
     <ClearAllPools>
       <summary>
-        Empties the connection pool.
+        Empties all connection pools.
       </summary>
       <remarks>
-        <see cref="M:Microsoft.Data.SqlClient.SqlConnection.ClearAllPools" /> resets (or empties) the connection pool. If there are connections in use at the time of the call, they are marked appropriately and will be discarded (instead of being returned to the pool) when <see cref="M:Microsoft.Data.SqlClient.SqlConnection.Close" /> is called on them.
+        <format type="text/markdown"><![CDATA[
+
+<xref:Microsoft.Data.SqlClient.SqlConnection.ClearAllPools> resets (or empties) all connection pools. If there are connections in use at the time of the call, they are marked appropriately and will be discarded (instead of being returned to a pool) when <xref:Microsoft.Data.SqlClient.SqlConnection.Close> is called on them.
+
+> [!CAUTION]
+> Clearing the pool is an expensive operation and should only be used if required. This operation may negatively interfere with pool warmup and generate high connection churn as the warmup operation continually opens new connections to attempt to reach min pool size. This situation is especially likely if clear is called in a tight loop.
+
+]]></format>
       </remarks>
     </ClearAllPools>
     <ClearPool>
@@ -841,7 +848,14 @@ The following example creates a <xref:Microsoft.Data.SqlClient.SqlConnection> an
         Empties the connection pool associated with the specified connection.
       </summary>
       <remarks>
-        <see cref="M:Microsoft.Data.SqlClient.SqlConnection.ClearPool(Microsoft.Data.SqlClient.SqlConnection)" /> clears the connection pool that is associated with the <paramref name="connection" />. If additional connections associated with <paramref name="connection" /> are in use at the time of the call, they are marked appropriately and are discarded (instead of being returned to the pool) when <see cref="M:Microsoft.Data.SqlClient.SqlConnection.Close" /> is called on them.
+        <format type="text/markdown"><![CDATA[
+
+<xref:Microsoft.Data.SqlClient.SqlConnection.ClearPool(Microsoft.Data.SqlClient.SqlConnection)> clears the connection pool that is associated with the `connection`. If additional connections associated with `connection` are in use at the time of the call, they are marked appropriately and are discarded (instead of being returned to the pool) when <xref:Microsoft.Data.SqlClient.SqlConnection.Close> is called on them.
+
+> [!CAUTION]
+> Clearing the pool is an expensive operation and should only be used if required. This operation may negatively interfere with pool warmup and generate high connection churn as the warmup operation continually opens new connections to attempt to reach min pool size. This situation is especially likely if clear is called in a tight loop.
+
+]]></format>
       </remarks>
     </ClearPool>
     <ClientConnectionId>
diff --git a/specs/001-pool-clear/spec.md b/specs/001-pool-clear/spec.md
new file mode 100644
index 0000000000..3ff9488410
--- /dev/null
+++ b/specs/001-pool-clear/spec.md
@@ -0,0 +1,100 @@
+# Feature Specification: Pool Clear
+
+**Feature Branch**: `dev/mdaigle/connection-pool-designs`  
+**Created**: 2026-04-10  
+**Status**: Draft  
+**Input**: User description: "Implement Clear() in ChannelDbConnectionPool so that SqlConnection.ClearPool() and SqlConnection.ClearAllPools() work with pool v2, using a generation counter approach to lazily invalidate connections."
+
+## User Scenarios & Testing
+
+### User Story 1 - Clear a Specific Connection Pool
+
+As an application developer, I want to call `SqlConnection.ClearPool(connection)` to invalidate all connections in a specific pool, so that the next connection request creates a fresh physical connection (e.g., after a failover, credential rotation, or configuration change on the server).
+
+**Independent Test**: Can be tested by opening connections, calling `ClearPool`, then verifying that subsequent connection requests do not reuse pre-clear connections.
+
+**Acceptance Scenarios**:
+
+1. **Given** a pool with 10 idle connections, **When** `ClearPool` is called, **Then** all idle connections are closed and new connection requests create fresh physical connections.
+2. **Given** a pool with 5 busy (in-use) connections and 5 idle connections, **When** `ClearPool` is called, **Then** idle connections are closed immediately.
+
+---
+
+### User Story 2 - Clear All Connection Pools
+
+As an application developer, I want to call `SqlConnection.ClearAllPools()` to invalidate connections across all pools in the application, so that I can recover from broad infrastructure changes (e.g., DNS migration, certificate rollover).
+
+**Independent Test**: Can be tested by creating connections to multiple connection strings, calling `ClearAllPools`, and verifying all pools produce fresh connections.
+
+**Acceptance Scenarios**:
+
+1. **Given** multiple pools each with idle connections, **When** `ClearAllPools` is called, **Then** all idle connections across all pools are closed.
+
+---
+
+### User Story 3 - Lazy Invalidation of Busy Connections
+
+As the pool infrastructure, I need busy connections that were opened before a clear to be destroyed when they are returned to the pool, so that clearing does not interrupt active operations but still ensures all pre-clear connections are eventually removed.
+
+**Independent Test**: Can be tested by opening a connection, calling `ClearPool`, executing a query on the open connection (should succeed), closing the connection, then verifying the pool destroyed it rather than reusing it.
+
+**Acceptance Scenarios**:
+
+1. **Given** a connection opened and in use before a clear, **When** `ClearPool` is called, **Then** the connection continues to work normally.
+2. **Given** a connection opened and in use before a pool clear, **When** the connection is returned to the pool, **Then** the pool detects that it predates the clear and destroys it.
+3. **Given** a connection opened after a pool clear, **When** the connection is returned to the pool, **Then** it is returned to the idle channel normally.
+
+---
+
+### User Story 4 - Multiple Consecutive Clears
+
+As an application developer, I want multiple/concurrent calls to `ClearPool` to behave correctly, so that pool state is not corrupted.
+
+**Independent Test**: Can be tested by calling `ClearPool` multiple times in rapid succession and verifying no exceptions, no connection leaks, and correct pool behavior afterward.
+
+**Acceptance Scenarios**:
+
+1. **Given** a pool with connections, **When** `ClearPool` is called twice rapidly, **Then** both calls complete without error, and connections predating either clear are invalidated.
+
+---
+
+### Edge Cases
+
+- What happens if `ClearPool` is called on an empty pool? The generation counter increments but no connections are closed. Subsequent connections are fresh.
+- What happens if `ClearPool` is called during pool shutdown? The clear should be a no-op or complete harmlessly — shutdown already destroys all connections.
+- What happens with many clears causing generation counter overflow? With `int` counter, overflow at 2^31. Even at 1 clear/second, this is 68 years. Overflow is not a practical concern. If it wraps, the worst case is one stale connection survives a single retrieval cycle.
+- What happens if `ClearPool` is called during pool startup? `ClearPool` can be called at any time after the pool is instantiated. If connections are being added to the pool while clearing, they are closed subject to the conditions of the clear operation.
+- What happens if ClearPool is called while a SqlConnection is waiting to receive a connection from the pool? If a SqlConnection is waiting for a connection, then there are no idle connections in the pool, so `ClearPool` will not have any effect.
+
+## Requirements
+
+### Functional Requirements
+
+- **FR-002**: System MUST stamp each new connection with the current pool generation at creation time.
+- **FR-003**: System MUST reject connections whose generation does not match the current pool generation when they are retrieved from the idle channel or returned to the pool.
+- **FR-004**: System MUST drain all idle connections from the channel on `Clear()`, closing each one.
+- **FR-005**: System MUST NOT interrupt busy (in-use) connections during a clear — busy connections are destroyed lazily when returned.
+- **FR-006**: System MUST allow connections opened after a clear to be pooled normally.
+- **FR-007**: System MUST support concurrent calls to `Clear()` without corrupting pool state.
+- **FR-008**: System MUST integrate with the existing `SqlConnection.ClearPool()` and `SqlConnection.ClearAllPools()` call paths.
+
+### Key Entities
+
+- **Pool Generation Counter (`_clearGeneration`)**: A pool-level `volatile int` incremented atomically via `Interlocked.Increment` on each `Clear()` call. Represents the current "epoch" of the pool.
+- **Connection Generation (`ClearGeneration`)**: A property on `DbConnectionInternal` stamped when the connection is created or added to the pool. Used to compare against the pool's current generation.
+- **Stale Connection**: A connection whose `ClearGeneration` does not match the pool's `_clearGeneration`. Stale connections are destroyed rather than returned to the idle channel.
+
+## Success Criteria
+
+### Measurable Outcomes
+
+- **SC-001**: After `ClearPool` is called, 100% of subsequent connection acquisitions produce fresh physical connections (no pre-clear connections reused).
+- **SC-002**: Busy connections continue to operate normally during and after a pool clear — no active queries are interrupted.
+- **SC-003**: `ClearPool` and `ClearAllPools` work identically whether using pool v1 (WaitHandle) or pool v2 (Channel), from the caller's perspective.
+
+## Assumptions
+
+- The generation counter approach is preferred over the WaitHandle pool's `DoNotPoolThisConnection()` mark-all pattern because `ConnectionPoolSlots` is not iterable by design (CAS-based slot array).
+- `DbConnectionInternal` can accommodate a new `ClearGeneration` property without breaking existing functionality or requiring changes to the WaitHandle pool.
+- The existing `SqlConnection.ClearPool()` → `SqlConnectionFactory.ClearPool()` → `IDbConnectionPool.Clear()` call chain is already wired up and only requires the `ChannelDbConnectionPool.Clear()` implementation.
+- Transacted connections with stale generations are handled separately as part of the transactions feature and are out of scope for Phase 1 of pool clear.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
index b4426bc4d6..5d3143783f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -92,6 +92,17 @@ internal DbConnectionInternal(ConnectionState state, bool hidePassword, bool all
         /// </summary>
         internal DateTime CreateTime { get; }
 
+        /// <summary>
+        /// The pool generation at the time this connection was created or added to the pool.
+        /// Used by <see cref="ChannelDbConnectionPool"/> to detect stale connections after a pool clear.
+        /// </summary>
+        /// <remarks>
+        /// Not safe, should only be set by the connection pool.
+        /// </remarks>
+        // TODO: Ideally this would be readonly and set in the constructor. Piping the value all the way through the connection factory is too complicated to be worth it.
+        // If we can expose the constructor to the connection pool in the future, it can be set in the constructor.
+        internal int ClearGeneration { get; set; }
+
         internal bool AllowSetConnectionString { get; }
 
         internal bool CanBePooled => !IsConnectionDoomed && !_cannotBePooled && !_owningObject.TryGetTarget(out _);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 553e6cd395..d6db51e5bb 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -73,11 +73,26 @@ internal sealed class ChannelDbConnectionPool : IDbConnectionPool
         private readonly ConnectionPoolSlots _connectionSlots;
 
         /// <summary>
-        /// Reader side for the idle connection channel. Contains nulls in order to release waiting attempts after
-        /// a connection has been physically closed/broken.
+        /// The idle connection channel. Contains nulls in order to release waiting attempts after
+        /// a connection has been physically closed/broken. Also tracks the count of non-null idle connections.
         /// </summary>
-        private readonly ChannelReader<DbConnectionInternal?> _idleConnectionReader;
-        private readonly ChannelWriter<DbConnectionInternal?> _idleConnectionWriter;
+        private readonly IdleConnectionChannel _idleChannel;
+
+        /// <summary>
+        /// The current generation of the pool. Incremented atomically on each <see cref="Clear"/> call.
+        /// Connections stamped with a generation that does not match are considered stale and are destroyed
+        /// rather than returned to the idle channel.
+        /// Must be updated using <see cref="Interlocked"/> operations to ensure thread safety.
+        /// </summary>
+        private volatile int _clearGeneration;
+
+        /// <summary>
+        /// Guard to prevent concurrent <see cref="Clear"/> operations from draining the idle channel
+        /// simultaneously. The generation counter is still incremented by every caller so stale connections
+        /// are always caught lazily, but only one thread performs the actual drain.
+        /// Must be updated using <see cref="Interlocked"/> operations to ensure thread safety.
+        /// </summary>
+        private volatile int _isClearing;
         #endregion
 
         /// <summary>
@@ -99,13 +114,7 @@ internal ChannelDbConnectionPool(
             TransactedConnectionPool = new(this);
 
             _connectionSlots = new(MaxPoolSize);
-
-            // We enforce Max Pool Size, so no need to create a bounded channel (which is less efficient)
-            // On the consuming side, we have the multiplexing write loop but also non-multiplexing Rents
-            // On the producing side, we have connections being released back into the pool (both multiplexing and not)
-            var idleChannel = Channel.CreateUnbounded<DbConnectionInternal?>();
-            _idleConnectionReader = idleChannel.Reader;
-            _idleConnectionWriter = idleChannel.Writer;
+            _idleChannel = new();
 
             State = Running;
         }
@@ -123,7 +132,11 @@ public ConcurrentDictionary<
         public int Count => _connectionSlots.ReservationCount;
 
         /// <inheritdoc />
-        public bool ErrorOccurred => throw new NotImplementedException();
+        public int IdleCount => _idleChannel.Count;
+
+        /// <inheritdoc />
+        /// This will be implemented later when we add support for the pool blocking period after errors. For now, it always returns false.
+        public bool ErrorOccurred => false;
 
         /// <inheritdoc />
         public int Id => _instanceId;
@@ -162,7 +175,45 @@ public ConcurrentDictionary<
         /// <inheritdoc />
         public void Clear()
         {
-            throw new NotImplementedException();
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.Clear|RES|CPOOL> {0}, Clearing.", Id);
+
+            Interlocked.Increment(ref _clearGeneration);
+
+            // If another thread is already draining, skip the drain. The generation counter has
+            // already been incremented, so stale connections will still be caught lazily by
+            // IsLiveConnection on their next retrieval or return.
+            if (Interlocked.CompareExchange(ref _isClearing, 1, 0) == 1)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.Clear|RES|CPOOL> {0}, Skip drain, already clearing.", Id);
+                return;
+            }
+
+            try
+            {
+                // Drain idle connections from the channel and destroy them. Limit iterations to
+                // the current idle count to prevent an unbounded loop if connections are
+                // concurrently returned to the channel during the drain.
+                // Any connections from a previous generation that are returned to the pool
+                // after we start draining will fail the _clearCounter comparison and will be closed.
+                int numToDrain = IdleCount;
+                while (numToDrain > 0 && _idleChannel.TryRead(out DbConnectionInternal? connection))
+                {
+                    if (connection is not null)
+                    {
+                        RemoveConnection(connection);
+                        numToDrain--;
+                    }
+                }
+            }
+            finally
+            {
+                Interlocked.Exchange(ref _isClearing, 0);
+            }
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.Clear|RES|CPOOL> {0}, Cleared.", Id);
         }
 
         /// <inheritdoc />
@@ -205,7 +256,7 @@ public void ReturnInternalConnection(DbConnectionInternal connection, DbConnecti
             }
             else
             {
-                var written = _idleConnectionWriter.TryWrite(connection);
+                var written = _idleChannel.TryWrite(connection);
                 Debug.Assert(written, "Failed to write returning connection to the idle channel.");
             }
         }
@@ -213,13 +264,13 @@ public void ReturnInternalConnection(DbConnectionInternal connection, DbConnecti
         /// <inheritdoc />
         public void Shutdown()
         {
-            throw new NotImplementedException();
+            // No-op for now, warmup will be implemented later.
         }
 
         /// <inheritdoc />
         public void Startup()
         {
-            throw new NotImplementedException();
+            // No-op for now, warmup will be implemented later.
         }
 
         /// <inheritdoc />
@@ -353,18 +404,23 @@ public bool TryGetConnection(
                     // DbConnectionInternal doesn't support an async open. It's better to block this thread and keep
                     // throughput high than to queue all of our opens onto a single worker thread. Add an async path 
                     // when this support is added to DbConnectionInternal.
-                    return ConnectionFactory.CreatePooledConnection(
+                    var connection = ConnectionFactory.CreatePooledConnection(
                         owningConnection,
                         this,
-                        PoolGroup.PoolKey,
-                        PoolGroup.ConnectionOptions,
                         userOptions);
+
+                    if (connection is not null)
+                    {
+                        connection.ClearGeneration = _clearGeneration;
+                    }
+
+                    return connection;
                 },
                 cleanupCallback: (newConnection) =>
                 {
                     // If we fail to open a connection, we need to write a null to the idle channel to
                     // wake up any waiters
-                    _idleConnectionWriter?.TryWrite(null);
+                    _idleChannel?.TryWrite(null);
                     newConnection?.Dispose();
                 });
         }
@@ -376,16 +432,24 @@ public bool TryGetConnection(
         /// <returns>Returns true if the connection is live and unexpired, otherwise returns false.</returns>
         private bool IsLiveConnection(DbConnectionInternal connection)
         {
+            // Broken physical connection
             if (!connection.IsConnectionAlive())
             {
                 return false;
             }
 
+            // Connection has been alive longer than the load balance timeout
             if (LoadBalanceTimeout != TimeSpan.Zero && DateTime.UtcNow > connection.CreateTime + LoadBalanceTimeout)
             {
                 return false;
             }
 
+            // Connection was created before the last Clear, so it's stale.
+            if (connection.ClearGeneration != _clearGeneration)
+            {
+                return false;
+            }
+
             return true;
         }
 
@@ -400,7 +464,7 @@ private void RemoveConnection(DbConnectionInternal connection)
             // Removing a connection from the pool opens a free slot.
             // Write a null to the idle connection channel to wake up a waiter, who can now open a new
             // connection. Statement order is important since we have synchronous completions on the channel.
-            _idleConnectionWriter.TryWrite(null);
+            _idleChannel.TryWrite(null);
 
             connection.Dispose();
         }
@@ -412,7 +476,7 @@ private void RemoveConnection(DbConnectionInternal connection)
         private DbConnectionInternal? GetIdleConnection()
         {
             // The channel may contain nulls. Read until we find a non-null connection or exhaust the channel.
-            while (_idleConnectionReader.TryRead(out DbConnectionInternal? connection))
+            while (_idleChannel.TryRead(out DbConnectionInternal? connection))
             {
                 if (connection is null) 
                 {
@@ -478,7 +542,7 @@ private async Task<DbConnectionInternal> GetInternalConnection(
                     // (first-come, first-served), which is crucial to us.
                     if (async)
                     {
-                        connection ??= await _idleConnectionReader.ReadAsync(cancellationToken).ConfigureAwait(false);
+                        connection ??= await _idleChannel.ReadAsync(cancellationToken).ConfigureAwait(false);
                     }
                     else
                     {
@@ -525,7 +589,7 @@ private async Task<DbConnectionInternal> GetInternalConnection(
             try
             {
                 ConfiguredValueTaskAwaitable<DbConnectionInternal?>.ConfiguredValueTaskAwaiter awaiter =
-                    _idleConnectionReader.ReadAsync(cancellationToken).ConfigureAwait(false).GetAwaiter();
+                    _idleChannel.ReadAsync(cancellationToken).ConfigureAwait(false).GetAwaiter();
                 using ManualResetEventSlim mres = new ManualResetEventSlim(false, 0);
 
                 // Cancellation happens through the ReadAsync call, which will complete the task.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
index 57597ae761..fc14e62d58 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
@@ -172,7 +172,7 @@ internal IDbConnectionPool GetConnectionPool(SqlConnectionFactory connectionFact
                                 IDbConnectionPool newPool;
                                 if (LocalAppContextSwitches.UseConnectionPoolV2)
                                 {
-                                    throw new NotImplementedException();
+                                    newPool = new ChannelDbConnectionPool(connectionFactory, this, currentIdentity, connectionPoolProviderInfo);
                                 }
                                 else
                                 {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
index bfc5789d3f..8a6ae397ed 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
@@ -38,6 +38,11 @@ internal interface IDbConnectionPool
         /// </summary>
         int Count { get; }
 
+        /// <summary>
+        /// The number of connections currently sitting idle in the pool.
+        /// </summary>
+        int IdleCount { get; }
+
         /// <summary>
         /// Indicates whether an error has occurred in the pool.
         /// Primarily used to support the pool blocking period feature.
@@ -100,6 +105,13 @@ internal interface IDbConnectionPool
         /// <summary>
         /// Clears the connection pool, releasing all connections and resetting the state.
         /// </summary>
+        /// <remarks>
+        /// Clearing the pool is an expensive operation and should only be used if required.
+        /// This operation may negatively interfere with pool warmup and generate high connection
+        /// churn as the warmup operation continually opens new connections to attempt 
+        /// to reach min pool size. This situation is especially likely if clear is called in a 
+        /// tight loop.
+        /// </remarks>
         void Clear();
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs
new file mode 100644
index 0000000000..00748ab184
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs
@@ -0,0 +1,92 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System.Threading;
+using System.Threading.Tasks;
+using System.Threading.Channels;
+using Microsoft.Data.ProviderBase;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.ConnectionPool
+{
+    /// <summary>
+    /// Wraps an unbounded <see cref="Channel{T}"/> of idle connections and tracks the number of
+    /// non-null connections it contains. Unbounded channels do not support
+    /// <see cref="ChannelReader{T}.Count"/>, so this class maintains the count via
+    /// <see cref="Interlocked"/> operations on every read and write of a non-null value.
+    /// </summary>
+    internal sealed class IdleConnectionChannel
+    {
+        private readonly ChannelReader<DbConnectionInternal?> _reader;
+        private readonly ChannelWriter<DbConnectionInternal?> _writer;
+        private volatile int _count;
+
+        internal IdleConnectionChannel()
+        {
+            var channel = Channel.CreateUnbounded<DbConnectionInternal?>();
+            _reader = channel.Reader;
+            //TODO: the channel should be completed on pool shutdown
+            _writer = channel.Writer;
+        }
+
+        /// <summary>
+        /// The number of non-null connections currently in the channel.
+        /// </summary>
+        internal int Count => _count;
+
+        /// <summary>
+        /// Writes a connection (or null wake-up signal) to the channel.
+        /// Increments the idle count when <paramref name="connection"/> is not null.
+        /// </summary>
+        /// <returns><see langword="true"/> if the value was written; otherwise <see langword="false"/>.</returns>
+        internal bool TryWrite(DbConnectionInternal? connection)
+        {
+            if (_writer.TryWrite(connection))
+            {
+                if (connection is not null)
+                {
+                    Interlocked.Increment(ref _count);
+                }
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Tries to read a value from the channel without blocking.
+        /// Decrements the idle count when a non-null connection is read.
+        /// </summary>
+        internal bool TryRead(out DbConnectionInternal? connection)
+        {
+            if (_reader.TryRead(out connection))
+            {
+                if (connection is not null)
+                {
+                    Interlocked.Decrement(ref _count);
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Asynchronously reads a value from the channel.
+        /// Decrements the idle count when a non-null connection is read.
+        /// </summary>
+        internal async ValueTask<DbConnectionInternal?> ReadAsync(CancellationToken cancellationToken)
+        {
+            var connection = await _reader.ReadAsync(cancellationToken).ConfigureAwait(false);
+
+            if (connection is not null)
+            {
+                Interlocked.Decrement(ref _count);
+            }
+
+            return connection;
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index 8d2311b5cd..b7fa972e85 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -259,8 +259,12 @@ private int CreationTimeout
             get { return PoolGroupOptions.CreationTimeout; }
         }
 
+        /// <inheritdoc/>
         public int Count => _totalObjects;
 
+        /// <inheritdoc/>
+        public int IdleCount => _stackNew.Count + _stackOld.Count;
+
         public SqlConnectionFactory ConnectionFactory => _connectionFactory;
 
         public bool ErrorOccurred => _errorOccurred;
@@ -290,7 +294,7 @@ private bool NeedToReplenish
                     return true;
                 }
 
-                int freeObjects = _stackNew.Count + _stackOld.Count;
+                int freeObjects = IdleCount;
                 int waitingRequests = _waitCount;
                 bool needToReplenish = (freeObjects < waitingRequests) || ((freeObjects == waitingRequests) && (totalObjects > 1));
 
@@ -528,8 +532,6 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
                 newObj = _connectionFactory.CreatePooledConnection(
                     owningObject,
                     this,
-                    _connectionPoolGroup.PoolKey,
-                    _connectionPoolGroup.ConnectionOptions, 
                     userOptions);
 
                 lock (_objectList)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index 89be9767d8..8d49f4dc30 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -141,15 +141,13 @@ internal DbConnectionInternal CreateNonPooledConnection(
         internal DbConnectionInternal CreatePooledConnection(
             DbConnection owningConnection,
             IDbConnectionPool pool,
-            DbConnectionPoolKey poolKey,
-            DbConnectionOptions options,
             DbConnectionOptions userOptions)
         {
             Debug.Assert(pool != null, "null pool?");
 
             DbConnectionInternal newConnection = CreateConnection(
-                options,
-                poolKey, // @TODO: is pool.PoolGroup.Key the same thing?
+                pool.PoolGroup.ConnectionOptions,
+                pool.PoolGroup.PoolKey,
                 pool.PoolGroup.ProviderInfo,
                 pool,
                 owningConnection,
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Common/SystemDataInternals/ConnectionPoolHelper.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Common/SystemDataInternals/ConnectionPoolHelper.cs
index d447720a1a..acaf348a52 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Common/SystemDataInternals/ConnectionPoolHelper.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Common/SystemDataInternals/ConnectionPoolHelper.cs
@@ -16,31 +16,28 @@ internal static class ConnectionPoolHelper
         private static Assembly s_MicrosoftDotData = Assembly.Load(new AssemblyName(typeof(SqlConnection).GetTypeInfo().Assembly.FullName));
         private static Type s_dbConnectionPool = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.ConnectionPool.IDbConnectionPool");
         private static Type s_waitHandleDbConnectionPool = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool");
+        private static Type s_channelDbConnectionPool = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.ConnectionPool.ChannelDbConnectionPool");
         private static Type s_dbConnectionPoolGroup = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolGroup");
         private static Type s_dbConnectionPoolIdentity = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolIdentity");
         private static Type s_sqlConnectionFactory = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.SqlConnectionFactory");
         private static Type s_dbConnectionPoolKey = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolKey");
         private static Type s_dictStringPoolGroup = typeof(Dictionary<,>).MakeGenericType(s_dbConnectionPoolKey, s_dbConnectionPoolGroup);
         private static Type s_dictPoolIdentityPool = typeof(ConcurrentDictionary<,>).MakeGenericType(s_dbConnectionPoolIdentity, s_dbConnectionPool);
-        private static PropertyInfo s_dbConnectionPoolCount = s_waitHandleDbConnectionPool.GetProperty("Count", BindingFlags.Instance | BindingFlags.Public);
+        // Resolve Count from the interface so it works with both pool implementations
+        private static PropertyInfo s_dbConnectionPoolCount = s_dbConnectionPool.GetProperty("Count", BindingFlags.Instance | BindingFlags.Public);
+        private static PropertyInfo s_dbConnectionPoolIdleCount = s_dbConnectionPool.GetProperty("IdleCount", BindingFlags.Instance | BindingFlags.Public);
         private static PropertyInfo s_dictStringPoolGroupGetKeys = s_dictStringPoolGroup.GetProperty("Keys");
         private static PropertyInfo s_dictPoolIdentityPoolValues = s_dictPoolIdentityPool.GetProperty("Values");
         private static PropertyInfo s_sqlConnectionFactorySingleton = s_sqlConnectionFactory.GetProperty("Instance", BindingFlags.Static | BindingFlags.NonPublic);
         private static FieldInfo s_dbConnectionFactoryPoolGroupList = s_sqlConnectionFactory.GetField("_connectionPoolGroups", BindingFlags.Instance | BindingFlags.NonPublic);
         private static FieldInfo s_dbConnectionPoolGroupPoolCollection = s_dbConnectionPoolGroup.GetField("_poolCollection", BindingFlags.Instance | BindingFlags.NonPublic);
-        private static FieldInfo s_dbConnectionPoolStackOld = s_waitHandleDbConnectionPool.GetField("_stackOld", BindingFlags.Instance | BindingFlags.NonPublic);
-        private static FieldInfo s_dbConnectionPoolStackNew = s_waitHandleDbConnectionPool.GetField("_stackNew", BindingFlags.Instance | BindingFlags.NonPublic);
         private static MethodInfo s_dbConnectionPoolCleanup = s_waitHandleDbConnectionPool.GetMethod("CleanupCallback", BindingFlags.Instance | BindingFlags.NonPublic);
         private static MethodInfo s_dictStringPoolGroupTryGetValue = s_dictStringPoolGroup.GetMethod("TryGetValue");
 
         public static int CountFreeConnections(object pool)
         {
             VerifyObjectIsPool(pool);
-
-            ICollection oldStack = (ICollection)s_dbConnectionPoolStackOld.GetValue(pool);
-            ICollection newStack = (ICollection)s_dbConnectionPoolStackNew.GetValue(pool);
-
-            return (oldStack.Count + newStack.Count);
+            return (int)s_dbConnectionPoolIdleCount.GetValue(pool, null);
         }
 
         /// <summary>
@@ -107,10 +104,17 @@ public static object ConnectionPoolFromString(string connectionString)
         /// <summary>
         /// Causes the cleanup timer code in the connection pool to be invoked
         /// </summary>
-        /// <param name="obj">A connection pool object</param>
+        /// <param name="pool">A connection pool object</param>
         internal static void CleanConnectionPool(object pool)
         {
             VerifyObjectIsPool(pool);
+
+            if (s_channelDbConnectionPool.IsInstanceOfType(pool))
+            {
+                // ChannelDbConnectionPool does not have a cleanup timer callback.
+                return;
+            }
+
             s_dbConnectionPoolCleanup.Invoke(pool, new object[] { null });
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
index 10c3939774..0d9b076dd2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
@@ -7,14 +7,19 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.Tests.Common;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
     public class ConnectionPoolConnectionStringProvider : IEnumerable<object[]>
     {
-        private static readonly string _TCPConnectionString = (new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { MultipleActiveResultSets = false, Pooling = true }).ConnectionString;
-        private static readonly string _tcpMarsConnStr = (new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { MultipleActiveResultSets = true, Pooling = true }).ConnectionString;
+        private static readonly string _TCPConnectionString = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) {
+            MultipleActiveResultSets = false, 
+            Pooling = true}.ConnectionString;
+        private static readonly string _tcpMarsConnStr = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) {
+            MultipleActiveResultSets = true,
+            Pooling = true }.ConnectionString;
 
         public IEnumerator<object[]> GetEnumerator()
         {
@@ -28,6 +33,29 @@ public IEnumerator<object[]> GetEnumerator()
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 
+    public class ConnectionPoolConnectionStringAndPoolVersionProvider : IEnumerable<object[]>
+    {
+        private static readonly string _TCPConnectionString = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) {
+            MultipleActiveResultSets = false,
+            Pooling = true }.ConnectionString;
+        private static readonly string _tcpMarsConnStr = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) {
+            MultipleActiveResultSets = true,
+            Pooling = true }.ConnectionString;
+
+        public IEnumerator<object[]> GetEnumerator()
+        {
+            yield return new object[] { _TCPConnectionString, false };
+            yield return new object[] { _TCPConnectionString, true };
+            if (DataTestUtility.IsNotAzureSynapse())
+            {
+                yield return new object[] { _tcpMarsConnStr, false };
+                yield return new object[] { _tcpMarsConnStr, true };
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+
     // TODO Synapse: Fix these tests for Azure Synapse.
     public static class ConnectionPoolTest
     {
@@ -118,9 +146,12 @@ public static void AccessTokenConnectionPoolingTest()
         /// Tests if clearing all of the pools does actually remove the pools
         /// </summary>
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [ClassData(typeof(ConnectionPoolConnectionStringProvider))]
-        public static void ClearAllPoolsTest(string connectionString)
+        [ClassData(typeof(ConnectionPoolConnectionStringAndPoolVersionProvider))]
+        public static void ClearAllPoolsTest(string connectionString, bool usePoolV2)
         {
+            using LocalAppContextSwitchesHelper switchesHelper = new();
+            switchesHelper.UseConnectionPoolV2 = usePoolV2;
+
             SqlConnection.ClearAllPools();
             Assert.True(0 == ConnectionPoolWrapper.AllConnectionPools().Length, "Pools exist after clearing all pools");
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 219bb1fdf6..c7df9dc2c6 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -570,7 +570,7 @@ public void TestCount()
         public void TestErrorOccurred()
         {
             var pool = ConstructPool(SuccessfulConnectionFactory);
-            Assert.Throws<NotImplementedException>(() => _ = pool.ErrorOccurred);
+            Assert.False(pool.ErrorOccurred);
         }
 
         [Fact]
@@ -682,46 +682,253 @@ public void TestUseLoadBalancing()
         #region Not Implemented Method Tests
 
         [Fact]
-        public void TestClear()
+        public void TestPutObjectFromTransactedPool()
         {
             var pool = ConstructPool(SuccessfulConnectionFactory);
-            Assert.Throws<NotImplementedException>(() => pool.Clear());
+            Assert.Throws<NotImplementedException>(() => pool.PutObjectFromTransactedPool(null!));
         }
 
         [Fact]
-        public void TestPutObjectFromTransactedPool()
+        public void TestReplaceConnection()
         {
             var pool = ConstructPool(SuccessfulConnectionFactory);
-            Assert.Throws<NotImplementedException>(() => pool.PutObjectFromTransactedPool(null!));
+            Assert.Throws<NotImplementedException>(() => pool.ReplaceConnection(null!, null!, null!));
         }
 
         [Fact]
-        public void TestReplaceConnection()
+        public void TestTransactionEnded()
         {
             var pool = ConstructPool(SuccessfulConnectionFactory);
-            Assert.Throws<NotImplementedException>(() => pool.ReplaceConnection(null!, null!, null!));
+            Assert.Throws<NotImplementedException>(() => pool.TransactionEnded(null!, null!));
         }
+        #endregion
+
+        #region Pool Clear Tests
 
         [Fact]
-        public void TestShutdown()
+        public void Clear_EmptyPool_DoesNotThrow()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
-            Assert.Throws<NotImplementedException>(() => pool.Shutdown());
+
+            // Act & Assert - Should complete without error
+            pool.Clear();
+            Assert.Equal(0, pool.Count);
         }
 
         [Fact]
-        public void TestStartup()
+        public void Clear_MultipleIdleConnections_AllAreDestroyed()
         {
+            // Arrange
+            int numConnections = 5;
             var pool = ConstructPool(SuccessfulConnectionFactory);
-            Assert.Throws<NotImplementedException>(() => pool.Startup());
+            var owningConnections = new SqlConnection[numConnections];
+            var internalConnections = new DbConnectionInternal?[numConnections];
+
+            for (int i = 0; i < numConnections; i++)
+            {
+                owningConnections[i] = new SqlConnection();
+                pool.TryGetConnection(
+                    owningConnections[i],
+                    taskCompletionSource: null,
+                    new DbConnectionOptions("", null),
+                    out internalConnections[i]
+                );
+                Assert.Equal(0, internalConnections[i]!.ClearGeneration);
+            }
+
+            // Return all connections to the pool
+            for (int i = 0; i < numConnections; i++)
+            {
+                pool.ReturnInternalConnection(internalConnections[i]!, owningConnections[i]);
+            }
+
+            // Act
+            pool.Clear();
+
+            // Assert
+            Assert.Equal(0, pool.Count);
         }
 
         [Fact]
-        public void TestTransactionEnded()
+        public void Clear_BusyConnection_NotDestroyedImmediately()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
-            Assert.Throws<NotImplementedException>(() => pool.TransactionEnded(null!, null!));
+            SqlConnection owningConnection = new();
+
+            pool.TryGetConnection(
+                owningConnection,
+                taskCompletionSource: null,
+                new DbConnectionOptions("", null),
+                out DbConnectionInternal? busyConnection
+            );
+            Assert.NotNull(busyConnection);
+            Assert.Equal(0, busyConnection.ClearGeneration);
+
+            // Act - Clear while connection is still busy
+            pool.Clear();
+
+            // Assert - Busy connection is still tracked in the pool and retains its old generation
+            Assert.Equal(1, pool.Count);
+            Assert.Equal(0, busyConnection.ClearGeneration);
         }
+
+        [Fact]
+        public void Clear_BusyConnectionReturned_IsDestroyed()
+        {
+            // Arrange
+            var pool = ConstructPool(SuccessfulConnectionFactory);
+            SqlConnection owningConnection = new();
+
+            pool.TryGetConnection(
+                owningConnection,
+                taskCompletionSource: null,
+                new DbConnectionOptions("", null),
+                out DbConnectionInternal? busyConnection
+            );
+            Assert.NotNull(busyConnection);
+            Assert.Equal(0, busyConnection.ClearGeneration);
+
+            // Act - Clear, then return the busy connection
+            pool.Clear();
+
+            // Assert - Busy connection is still tracked but has stale generation
+            Assert.Equal(1, pool.Count);
+
+            // Act - Return the busy connection
+            pool.ReturnInternalConnection(busyConnection, owningConnection);
+
+            // Assert - The connection should have been destroyed on return (generation mismatch)
+            Assert.Equal(0, pool.Count);
+        }
+
+        [Fact]
+        public void Clear_MixedBusyAndIdle_OnlyIdleDestroyedImmediately()
+        {
+            // Arrange
+            var pool = ConstructPool(SuccessfulConnectionFactory);
+            SqlConnection busyOwner = new();
+            SqlConnection idleOwner = new();
+
+            pool.TryGetConnection(
+                busyOwner,
+                taskCompletionSource: null,
+                new DbConnectionOptions("", null),
+                out DbConnectionInternal? busyConnection
+            );
+            pool.TryGetConnection(
+                idleOwner,
+                taskCompletionSource: null,
+                new DbConnectionOptions("", null),
+                out DbConnectionInternal? idleConnection
+            );
+            Assert.NotNull(busyConnection);
+            Assert.NotNull(idleConnection);
+            Assert.Equal(0, busyConnection.ClearGeneration);
+            Assert.Equal(0, idleConnection.ClearGeneration);
+
+            // Return only the idle connection
+            pool.ReturnInternalConnection(idleConnection, idleOwner);
+
+            // Act
+            pool.Clear();
+
+            // Assert - Only the busy connection remains with stale generation
+            Assert.Equal(1, pool.Count);
+            Assert.Equal(0, busyConnection.ClearGeneration);
+
+            // Now return the busy connection - it should be destroyed (generation 0 != pool generation 1)
+            pool.ReturnInternalConnection(busyConnection, busyOwner);
+            Assert.Equal(0, pool.Count);
+        }
+
+        [Fact]
+        public void Clear_NewConnectionsAfterClear_ArePooledNormally()
+        {
+            // Arrange
+            var pool = ConstructPool(SuccessfulConnectionFactory);
+            SqlConnection owningConnection = new();
+
+            pool.TryGetConnection(
+                owningConnection,
+                taskCompletionSource: null,
+                new DbConnectionOptions("", null),
+                out DbConnectionInternal? oldConnection
+            );
+            Assert.Equal(0, oldConnection!.ClearGeneration);
+            pool.ReturnInternalConnection(oldConnection, owningConnection);
+
+            // Act
+            pool.Clear();
+
+            // Get a new connection after clear
+            SqlConnection newOwner = new();
+            pool.TryGetConnection(
+                newOwner,
+                taskCompletionSource: null,
+                new DbConnectionOptions("", null),
+                out DbConnectionInternal? newConnection
+            );
+            Assert.NotNull(newConnection);
+
+            // The new connection should be different from the old one and have generation 1
+            Assert.NotSame(oldConnection, newConnection);
+            Assert.Equal(1, newConnection.ClearGeneration);
+
+            // Return the new connection - it should be pooled normally
+            pool.ReturnInternalConnection(newConnection, newOwner);
+            Assert.Equal(1, pool.Count);
+
+            // Get another connection - it should reuse the post-clear connection (same generation)
+            SqlConnection reuseOwner = new();
+            pool.TryGetConnection(
+                reuseOwner,
+                taskCompletionSource: null,
+                new DbConnectionOptions("", null),
+                out DbConnectionInternal? reusedConnection
+            );
+            Assert.Same(newConnection, reusedConnection);
+            Assert.Equal(1, reusedConnection!.ClearGeneration);
+        }
+
+        [Fact]
+        public void Clear_MultipleClearCalls_DoNotCorruptState()
+        {
+            // Arrange
+            var pool = ConstructPool(SuccessfulConnectionFactory);
+            SqlConnection owningConnection = new();
+
+            pool.TryGetConnection(
+                owningConnection,
+                taskCompletionSource: null,
+                new DbConnectionOptions("", null),
+                out DbConnectionInternal? connection
+            );
+            Assert.Equal(0, connection!.ClearGeneration);
+            pool.ReturnInternalConnection(connection, owningConnection);
+
+            // Act - Call clear multiple times rapidly
+            pool.Clear();
+            pool.Clear();
+            pool.Clear();
+
+            // Assert - Pool state is still valid
+            Assert.Equal(0, pool.Count);
+
+            // New connections should have generation 3 (incremented three times)
+            SqlConnection newOwner = new();
+            pool.TryGetConnection(
+                newOwner,
+                taskCompletionSource: null,
+                new DbConnectionOptions("", null),
+                out DbConnectionInternal? newConnection
+            );
+            Assert.NotNull(newConnection);
+            Assert.Equal(1, pool.Count);
+            Assert.Equal(3, newConnection.ClearGeneration);
+        }
+
         #endregion
 
         #region Test classes
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs
new file mode 100644
index 0000000000..56aa9c234a
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs
@@ -0,0 +1,244 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data.Common;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Transactions;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Xunit;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    public class IdleConnectionChannelTest
+    {
+        #region TryWrite
+
+        [Fact]
+        public void TryWrite_NonNullConnection_IncrementsCount()
+        {
+            var channel = new IdleConnectionChannel();
+
+            Assert.True(channel.TryWrite(new StubDbConnectionInternal()));
+            Assert.Equal(1, channel.Count);
+        }
+
+        [Fact]
+        public void TryWrite_NullConnection_DoesNotIncrementCount()
+        {
+            var channel = new IdleConnectionChannel();
+
+            Assert.True(channel.TryWrite(null));
+            Assert.Equal(0, channel.Count);
+        }
+
+        [Fact]
+        public void TryWrite_MultipleConnections_TracksCountCorrectly()
+        {
+            var channel = new IdleConnectionChannel();
+
+            channel.TryWrite(new StubDbConnectionInternal());
+            channel.TryWrite(new StubDbConnectionInternal());
+            channel.TryWrite(null);
+            channel.TryWrite(new StubDbConnectionInternal());
+
+            Assert.Equal(3, channel.Count);
+        }
+
+        #endregion
+
+        #region TryRead
+
+        [Fact]
+        public void TryRead_NonNullConnection_DecrementsCount()
+        {
+            var channel = new IdleConnectionChannel();
+            channel.TryWrite(new StubDbConnectionInternal());
+            Assert.Equal(1, channel.Count);
+
+            Assert.True(channel.TryRead(out var connection));
+            Assert.NotNull(connection);
+            Assert.Equal(0, channel.Count);
+        }
+
+        [Fact]
+        public void TryRead_NullConnection_DoesNotDecrementCount()
+        {
+            var channel = new IdleConnectionChannel();
+            channel.TryWrite(new StubDbConnectionInternal());
+            channel.TryWrite(null);
+            Assert.Equal(1, channel.Count);
+
+            // Read the non-null connection first (FIFO)
+            Assert.True(channel.TryRead(out var first));
+            Assert.NotNull(first);
+            Assert.Equal(0, channel.Count);
+
+            // Read the null
+            Assert.True(channel.TryRead(out var second));
+            Assert.Null(second);
+            Assert.Equal(0, channel.Count);
+        }
+
+        [Fact]
+        public void TryRead_EmptyChannel_ReturnsFalse()
+        {
+            var channel = new IdleConnectionChannel();
+
+            Assert.False(channel.TryRead(out var connection));
+            Assert.Null(connection);
+            Assert.Equal(0, channel.Count);
+        }
+
+        #endregion
+
+        #region ReadAsync
+
+        [Fact]
+        public async Task ReadAsync_NonNullConnection_DecrementsCount()
+        {
+            var channel = new IdleConnectionChannel();
+            channel.TryWrite(new StubDbConnectionInternal());
+            Assert.Equal(1, channel.Count);
+
+            var connection = await channel.ReadAsync(CancellationToken.None);
+
+            Assert.NotNull(connection);
+            Assert.Equal(0, channel.Count);
+        }
+
+        [Fact]
+        public async Task ReadAsync_NullConnection_DoesNotDecrementCount()
+        {
+            var channel = new IdleConnectionChannel();
+            channel.TryWrite(new StubDbConnectionInternal());
+            channel.TryWrite(null);
+            Assert.Equal(1, channel.Count);
+
+            // First read returns the non-null connection (FIFO)
+            var first = await channel.ReadAsync(CancellationToken.None);
+            Assert.NotNull(first);
+            Assert.Equal(0, channel.Count);
+
+            // Second read returns null
+            var second = await channel.ReadAsync(CancellationToken.None);
+            Assert.Null(second);
+            Assert.Equal(0, channel.Count);
+        }
+
+        [Fact]
+        public async Task ReadAsync_WaitsForWrite()
+        {
+            var channel = new IdleConnectionChannel();
+            var expected = new StubDbConnectionInternal();
+
+            var readTask = channel.ReadAsync(CancellationToken.None);
+            Assert.False(readTask.IsCompleted);
+
+            channel.TryWrite(expected);
+
+            var connection = await readTask;
+            Assert.Same(expected, connection);
+            Assert.Equal(0, channel.Count);
+        }
+
+        [Fact]
+        public async Task ReadAsync_Cancelled_ThrowsOperationCanceledException()
+        {
+            var channel = new IdleConnectionChannel();
+            using var cts = new CancellationTokenSource();
+            cts.Cancel();
+
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(
+                () => channel.ReadAsync(cts.Token).AsTask());
+        }
+
+        #endregion
+
+        #region Mixed operations
+
+        [Fact]
+        public void WriteAndReadSequence_CountStaysConsistent()
+        {
+            var channel = new IdleConnectionChannel();
+
+            // Write 3
+            channel.TryWrite(new StubDbConnectionInternal());
+            channel.TryWrite(new StubDbConnectionInternal());
+            channel.TryWrite(new StubDbConnectionInternal());
+            Assert.Equal(3, channel.Count);
+
+            // Read 2
+            channel.TryRead(out _);
+            channel.TryRead(out _);
+            Assert.Equal(1, channel.Count);
+
+            // Write 1 more
+            channel.TryWrite(new StubDbConnectionInternal());
+            Assert.Equal(2, channel.Count);
+
+            // Read remaining 2
+            channel.TryRead(out _);
+            channel.TryRead(out _);
+            Assert.Equal(0, channel.Count);
+
+            // Channel is empty
+            Assert.False(channel.TryRead(out _));
+            Assert.Equal(0, channel.Count);
+        }
+
+        #endregion
+
+        #region Multi-threaded Tests
+
+        [Fact]
+        public async Task ConcurrentWriteAndRead_CountReturnsToZero()
+        {
+            var channel = new IdleConnectionChannel();
+            var barrier = new Barrier(3);
+            const int iterations = 1000;
+
+            async Task WriteAndRead()
+            {
+                barrier.SignalAndWait();
+
+                for (int i = 0; i < iterations; i++)
+                {
+                    channel.TryWrite(new StubDbConnectionInternal());
+                    await channel.ReadAsync(CancellationToken.None);
+                }
+            }
+
+            await Task.WhenAll(
+                Task.Run(WriteAndRead),
+                Task.Run(WriteAndRead),
+                Task.Run(WriteAndRead));
+
+            Assert.Equal(0, channel.Count);
+        }
+
+        #endregion
+
+        #region Helpers
+
+        private class StubDbConnectionInternal : DbConnectionInternal
+        {
+            public override string ServerVersion => throw new NotImplementedException();
+
+            public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
+                => throw new NotImplementedException();
+
+            public override void EnlistTransaction(Transaction transaction) { }
+            protected override void Activate(Transaction transaction) { }
+            protected override void Deactivate() { }
+            internal override void ResetConnection() { }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
index 18bd9c5ea3..9f284be22a 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
@@ -661,6 +661,7 @@ internal class MockDbConnectionPool : IDbConnectionPool
         public int Count => throw new NotImplementedException();
         public bool ErrorOccurred => throw new NotImplementedException();
         public int Id { get; } = 1;
+        public int IdleCount => throw new NotImplementedException();
         public DbConnectionPoolIdentity Identity => throw new NotImplementedException();
         public bool IsRunning => throw new NotImplementedException();
         public TimeSpan LoadBalanceTimeout => throw new NotImplementedException();

From c5da95dbebf897c895485bc67012f2b3e9c6db6b Mon Sep 17 00:00:00 2001
From: Erik Ejlskov Jensen <ErikEJ@users.noreply.github.com>
Date: Fri, 24 Apr 2026 09:35:25 +0200
Subject: [PATCH 061/298] Update to latest Azure.Core package with
 Azure.Identity types (#4200)

---
 Directory.Packages.props                      |  8 +++----
 doc/Directory.Packages.props                  |  8 ++++---
 .../Directory.Packages.props                  | 12 +++++-----
 doc/apps/AzureAuthentication/README.md        | 22 +++++++++----------
 .../Microsoft.Data.SqlClient.Samples.csproj   |  1 -
 .../Azure/src/Azure.csproj                    |  1 -
 ...Microsoft.Data.SqlClient.TestCommon.csproj |  4 ++--
 ...soft.Data.SqlClient.FunctionalTests.csproj |  4 ++--
 ...icrosoft.Data.SqlClient.ManualTests.csproj |  4 ++--
 9 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index b1a858bf72..d18da0127a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -50,8 +50,8 @@
   <!-- Dependencies shared by multiple projects -->
 
   <ItemGroup>
-    <PackageVersion Include="Azure.Core" Version="1.51.1" />
-    <PackageVersion Include="Microsoft.Identity.Client" Version="4.83.0" />
+    <PackageVersion Include="Azure.Core" Version="1.53.0" />
+    <PackageVersion Include="Microsoft.Identity.Client" Version="4.83.3" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 
@@ -81,9 +81,7 @@
   <!-- ===================================================================== -->
   <!-- Azure Dependencies -->
 
-  <ItemGroup>
-    <PackageVersion Include="Azure.Identity" Version="1.18.0" />
-  </ItemGroup>
+  <!-- None -->
 
   <!-- ===================================================================== -->
   <!-- SqlClient Dependencies -->
diff --git a/doc/Directory.Packages.props b/doc/Directory.Packages.props
index 2ead6c1757..3f34943e76 100644
--- a/doc/Directory.Packages.props
+++ b/doc/Directory.Packages.props
@@ -2,9 +2,11 @@
   <!-- Import parent Directory.Packages.props -->
   <Import Project="..\Directory.Packages.props" />
   <ItemGroup>
+    <!-- Explicitly include Azure.Identity. -->
+    <PackageVersion Include="Azure.Identity" Version="1.21.0" />
     <!-- Reference SqlClient package versions that support our needs. -->
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.0-preview4.26064.3" />
-    <PackageVersion Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="7.0.0-preview1.26064.3" />
-    <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="1.0.0-preview1.26064.3" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="1.0.0" />
   </ItemGroup>
 </Project>
diff --git a/doc/apps/AzureAuthentication/Directory.Packages.props b/doc/apps/AzureAuthentication/Directory.Packages.props
index b512683765..1456264d7a 100644
--- a/doc/apps/AzureAuthentication/Directory.Packages.props
+++ b/doc/apps/AzureAuthentication/Directory.Packages.props
@@ -4,11 +4,11 @@
   <!-- We purposely do not include any parent Directory.Packages.props files. -->
 
   <PropertyGroup>
-    <!-- Use SqlClient 7.0.0 Preview 4 if no version was specified. -->
-    <SqlClientVersion>7.0.0-preview4.26064.3</SqlClientVersion>
+    <!-- Use SqlClient 7.0.0 if no version was specified. -->
+    <SqlClientVersion>7.0.0</SqlClientVersion>
 
-    <!-- Use AKV Provider 7.0.0 Preview 1 if no version was specified. -->
-    <AkvProviderVersion>7.0.0-preview1.26064.3</AkvProviderVersion>
+    <!-- Use AKV Provider 7.0.0 if no version was specified. -->
+    <AkvProviderVersion>7.0.0</AkvProviderVersion>
   </PropertyGroup>
 
   <!-- SqlClient Packages -->
@@ -25,8 +25,8 @@
 
   <!-- Other Packages -->
   <ItemGroup>
-    <PackageVersion Include="Azure.Identity" Version="1.17.1" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.3" />
+    <PackageVersion Include="Azure.Core" Version="1.53.0" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.6" />
   </ItemGroup>
 
 </Project>
diff --git a/doc/apps/AzureAuthentication/README.md b/doc/apps/AzureAuthentication/README.md
index a0d9d8b7ba..2a3bf16b86 100644
--- a/doc/apps/AzureAuthentication/README.md
+++ b/doc/apps/AzureAuthentication/README.md
@@ -33,8 +33,8 @@ Package versions are controlled through MSBuild properties. Pass them on the com
 
 | Property | Default | Description |
 | --- | --- | --- |
-| `SqlClientVersion` | `7.0.0-preview4.26064.3` | Version of `Microsoft.Data.SqlClient` to reference. |
-| `AkvProviderVersion` | `7.0.0-preview1.26064.3` | Version of `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` to reference. |
+| `SqlClientVersion` | `7.0.0` | Version of `Microsoft.Data.SqlClient` to reference. |
+| `AkvProviderVersion` | `7.0.0` | Version of `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` to reference. |
 | `AzureVersion` | None | Version of `Microsoft.Data.SqlClient.Extensions.Azure` to reference.  When omitted, the `Azure` package will not be referenced. |
 
 ## Local Package Source
@@ -68,9 +68,9 @@ Description:
 
   Supply specific package versions when building to test different versions of the SqlClient suite, for example:
 
-    -p:SqlClientVersion=7.0.0.preview4
-    -p:AkvProviderVersion=7.0.1-preview2
-    -p:AzureVersion=1.0.0-preview1
+    -p:SqlClientVersion=7.1.0.preview1
+    -p:AkvProviderVersion=7.0.0
+    -p:AzureVersion=1.1.0-preview1
 
 Usage:
   AzureAuthentication [options]
@@ -104,9 +104,9 @@ Azure Authentication Tester
 ---------------------------
 
 Packages used:
-  SqlClient:     7.0.0-preview4.26055.1
-  AKV Provider:  6.1.2
-  Azure:         1.0.0-preview1.26055.1
+  SqlClient:     7.0.0
+  AKV Provider:  7.0.0
+  Azure:         1.0.0
 
 Connection details:
   Data Source:      adotest.database.windows.net
@@ -142,19 +142,19 @@ authentication provider.
 Run against locally-built packages (drop `.nupkg` files into the `packages/` folder first):
 
 ```bash
-dotnet run -p:SqlClientVersion=7.0.0-preview4 -- -c "<connection string>"
+dotnet run -p:SqlClientVersion=7.1.0-preview1 -- -c "<connection string>"
 ```
 
 Run including the `Azure` extensions package:
 
 ```bash
-dotnet run -p:AzureVersion=1.0.0-preview1 -- -c "<connection string>"
+dotnet run -p:AzureVersion=1.0.0 -- -c "<connection string>"
 ```
 
 Override all three versions at once:
 
 ```bash
-dotnet run -p:SqlClientVersion=7.0.0-preview1 -p:AkvProviderVersion=7.0.0-preview1 -p:AzureVersion=1.0.0-preview1 -- -c "<connection string>"
+dotnet run -p:SqlClientVersion=7.1.0-preview1 -p:AkvProviderVersion=7.1.0-preview1 -p:AzureVersion=1.0.0 -- -c "<connection string>"
 ```
 
 ## Prerequisites
diff --git a/doc/samples/Microsoft.Data.SqlClient.Samples.csproj b/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
index c194fac4d0..db1d5bd997 100644
--- a/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
+++ b/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Microsoft.Identity.Client" />
     <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="Microsoft.Data.SqlClient" />
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
index b244dd467e..07caed5129 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
@@ -129,7 +129,6 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Core" />
-    <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <!-- Explicitly depend on the same version of Microsoft.Identity.Client as SqlClient. -->
     <PackageReference Include="Microsoft.Identity.Client" />
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index 3f014f9fbe..82d5b2513d 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -30,14 +30,14 @@
 
   <!-- References for netfx -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Security.KeyVault.Keys" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
   </ItemGroup>
 
   <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Security.KeyVault.Keys" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
index 7045eecc65..0e9cb7b785 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -66,7 +66,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Transactions" />
 
-    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="Microsoft.Data.SqlClient.SNI"
                       Condition="'$(ReferenceType)' != 'Package'" />
@@ -97,7 +97,7 @@
 
   <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime"
                       Condition="'$(ReferenceType)' != 'Package'" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 110547a5de..c4f0f2bf5b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -355,7 +355,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Transactions" />
 
-    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="System.Memory" />
     <PackageReference Include="System.ValueTuple" />
@@ -391,7 +391,7 @@
 
   <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime"
                       Condition="'$(ReferenceType)' != 'Package'" />

From f9d1b4fd083490afa782456a2eb5ee0cd239cc9a Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Fri, 24 Apr 2026 17:50:14 +1000
Subject: [PATCH 062/298] Use _value instead of ToString in
 SqlConnectionEncryptOption (#4013)

---
 .../Microsoft/Data/SqlClient/SqlConnectionEncryptOption.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionEncryptOption.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionEncryptOption.cs
index 833132c944..8ad98507bf 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionEncryptOption.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionEncryptOption.cs
@@ -105,7 +105,7 @@ public override bool Equals(object obj)
             if (obj != null &&
                 obj is SqlConnectionEncryptOption option)
             {
-                return ToString().Equals(option.ToString());
+                return _value.Equals(option._value);
             }
 
             return false;
@@ -114,7 +114,7 @@ public override bool Equals(object obj)
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionEncryptOption.xml' path='docs/members[@name="SqlConnectionEncryptOption"]/GetHashCode/*' />
         public override int GetHashCode()
         {
-            return ToString().GetHashCode();
+            return _value.GetHashCode();
         }
     }
 

From 91f486dc48cd112e469c9326816735b7a1a3b295 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Fri, 24 Apr 2026 08:51:14 +0100
Subject: [PATCH 063/298] Cleanup | Remove unused resource strings (#4101)

* Rebuilt Strings.Designer.cs from Strings.resx

No functional changes - just saved Strings.resx to avoid polluting the next few diffs.

* Remove unused resource strings, pt1

* Remove unused resource strings, pt2

* Remove unused resource strings, pt3

* Remove unused resource strings, pt4

* Remove unused resource strings, pt5

* Remove unused resource strings, pt6

* Remove unused resource strings, pt7

* Remove unused resource strings, pt8

* Remove unused resource strings, pt9

* Remove unused resource strings, pt10 / mopup

* Remove references to SqlMisc_NullValueMessage

This assertion was testing the third-party SqlNullValueException class, and relied upon a resource which was never used in library code.
---
 .../Data/Common/AdapterUtil.netfx.cs          |     4 -
 .../SqlClient/LocalDb/LocalDbApi.windows.cs   |     6 +-
 .../src/Microsoft/Data/SqlClient/SqlUtil.cs   |    20 -
 .../src/Resources/Strings.Designer.cs         | 11774 +++-------------
 .../src/Resources/Strings.resx                |  2785 +---
 .../SQL/DataStreamTest/DataStreamTest.cs      |    11 +-
 6 files changed, 2195 insertions(+), 12405 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs
index eb125e5b71..99f627d603 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs
@@ -63,10 +63,6 @@ internal static ArgumentException InvalidValue(string parameterName) =>
 
         #endregion
 
-        // DbDataAdapter
-        internal static InvalidOperationException ComputerNameEx(int lastError) =>
-            InvalidOperation(StringsHelper.GetString(Strings.ADP_ComputerNameEx, lastError));
-
         // DBDataPermissionAttribute.KeyRestrictionBehavior
         internal static ArgumentOutOfRangeException InvalidKeyRestrictionBehavior(KeyRestrictionBehavior value)
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.windows.cs
index 787b3b72e4..c0674ca6db 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.windows.cs
@@ -90,7 +90,7 @@ private static LocalDbCreateInstanceDelegate LocalDbCreateInstance
                             {
                                 int hResult = Marshal.GetLastWin32Error();
                                 SqlClientEventSource.Log.TryTraceEvent("<sc.LocalDBAPI.LocalDBCreateInstance> GetProcAddress for LocalDBCreateInstance error 0x{0}", hResult);
-                                throw CreateLocalDbException(errorMessage: StringsHelper.GetString("LocalDB_MethodNotFound"));
+                                throw CreateLocalDbException(errorMessage: StringsHelper.GetString(Strings.LocalDB_MethodNotFound));
                             }
 
                             s_localDbCreateInstance = (LocalDbCreateInstanceDelegate)Marshal.GetDelegateForFunctionPointer(functionAddr, typeof(LocalDbCreateInstanceDelegate));
@@ -154,7 +154,7 @@ private static IntPtr UserInstanceDllHandle
                             {
                                 SniNativeWrapper.SniGetLastError(out SniError sniError);
                                 throw CreateLocalDbException(
-                                    errorMessage: StringsHelper.GetString("LocalDB_FailedGetDLLHandle"),
+                                    errorMessage: StringsHelper.GetString(Strings.LocalDB_FailedGetDLLHandle),
                                     sniError: sniError.sniError);
                             }
                         }
@@ -237,7 +237,7 @@ internal static void CreateLocalDbInstance(string instance)
 
             if (hr < 0)
             {
-                throw CreateLocalDbException(errorMessage: StringsHelper.GetString("LocalDB_CreateFailed"), instance: instance, localDbError: hr);
+                throw CreateLocalDbException(errorMessage: StringsHelper.GetString(Strings.LocalDB_CreateFailed), instance: instance, localDbError: hr);
             }
 
             // Mark instance as created
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
index d10df22966..96312a491d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
@@ -533,26 +533,11 @@ SqlAuthenticationMethod.ActiveDirectoryDefault or
             };
         }
 
-        internal static Exception ParameterCannotBeEmpty(string paramName)
-        {
-            return ADP.ArgumentNull(StringsHelper.GetString(Strings.SQL_ParameterCannotBeEmpty, paramName));
-        }
-
         internal static Exception ParameterDirectionInvalidForOptimizedBinding(string paramName)
         {
             return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParameterDirectionInvalidForOptimizedBinding, paramName));
         }
 
-        internal static Exception ActiveDirectoryInteractiveTimeout()
-        {
-            return ADP.TimeoutException(Strings.SQL_Timeout_Active_Directory_Interactive_Authentication);
-        }
-
-        internal static Exception ActiveDirectoryDeviceFlowTimeout()
-        {
-            return ADP.TimeoutException(Strings.SQL_Timeout_Active_Directory_DeviceFlow_Authentication);
-        }
-
         internal static Exception ActiveDirectoryTokenRetrievingTimeout(string authenticaton, string errorCode, Exception exception)
         {
             return ADP.TimeoutException(StringsHelper.GetString(Strings.AAD_Token_Retrieving_Timeout, authenticaton, errorCode, exception?.Message), exception);
@@ -2155,11 +2140,6 @@ internal static Exception SocketDidNotThrow()
         {
             return new Exception(StringsHelper.GetString(Strings.SQL_SocketDidNotThrow, nameof(SocketException), nameof(SocketError.WouldBlock)));
         }
-#else
-        static internal Exception SnapshotNotSupported(System.Data.IsolationLevel level)
-        {
-            return ADP.Argument(StringsHelper.GetString(Strings.SQL_SnapshotNotSupported, typeof(System.Data.IsolationLevel), level.ToString()));
-        }
 #endif
 
     }
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index 2cae12cb6c..041b9aa8aa 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -19,7 +19,7 @@ namespace System {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Strings {
@@ -69,24 +69,6 @@ internal static string AAD_Token_Retrieving_Timeout {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Data adapter mapping error..
-        /// </summary>
-        internal static string ADP_AdapterMappingExceptionMessage {
-            get {
-                return ResourceManager.GetString("ADP_AdapterMappingExceptionMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ascending.
-        /// </summary>
-        internal static string ADP_Ascending {
-            get {
-                return ResourceManager.GetString("ADP_Ascending", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Specified parameter name &apos;{0}&apos; is not valid..
         /// </summary>
@@ -150,15 +132,6 @@ internal static string ADP_CollectionIsNotParent {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to The {0} with is already contained by this {1}..
-        /// </summary>
-        internal static string ADP_CollectionIsParent {
-            get {
-                return ResourceManager.GetString("ADP_CollectionIsParent", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to The {0} only accepts non-null {1} type objects..
         /// </summary>
@@ -178,13800 +151,6185 @@ internal static string ADP_CollectionRemoveInvalidObject {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The {0}.{1} is required to be unique, &apos;{2}&apos; already exists in the collection..
+        ///   Looks up a localized string similar to {0}: CommandText property has not been initialized.
         /// </summary>
-        internal static string ADP_CollectionUniqueValue {
+        internal static string ADP_CommandTextRequired {
             get {
-                return ResourceManager.GetString("ADP_CollectionUniqueValue", resourceCulture);
+                return ResourceManager.GetString("ADP_CommandTextRequired", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The column mapping from SourceColumn &apos;{0}&apos; failed because the DataColumn &apos;{1}&apos; is a computed column..
+        ///   Looks up a localized string similar to The connection was not closed. {0}.
         /// </summary>
-        internal static string ADP_ColumnSchemaExpression {
+        internal static string ADP_ConnectionAlreadyOpen {
             get {
-                return ResourceManager.GetString("ADP_ColumnSchemaExpression", resourceCulture);
+                return ResourceManager.GetString("ADP_ConnectionAlreadyOpen", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Inconvertible type mismatch between SourceColumn &apos;{0}&apos; of {1} and the DataColumn &apos;{2}&apos; of {3}..
+        ///   Looks up a localized string similar to {0}: Connection property has not been initialized..
         /// </summary>
-        internal static string ADP_ColumnSchemaMismatch {
+        internal static string ADP_ConnectionRequired {
             get {
-                return ResourceManager.GetString("ADP_ColumnSchemaMismatch", resourceCulture);
+                return ResourceManager.GetString("ADP_ConnectionRequired", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Missing the DataColumn &apos;{0}&apos; for the SourceColumn &apos;{2}&apos;..
+        ///   Looks up a localized string similar to The connection&apos;s current state: {0}..
         /// </summary>
-        internal static string ADP_ColumnSchemaMissing1 {
+        internal static string ADP_ConnectionStateMsg {
             get {
-                return ResourceManager.GetString("ADP_ColumnSchemaMissing1", resourceCulture);
+                return ResourceManager.GetString("ADP_ConnectionStateMsg", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Missing the DataColumn &apos;{0}&apos; in the DataTable &apos;{1}&apos; for the SourceColumn &apos;{2}&apos;..
+        ///   Looks up a localized string similar to The connection&apos;s current state is closed..
         /// </summary>
-        internal static string ADP_ColumnSchemaMissing2 {
+        internal static string ADP_ConnectionStateMsg_Closed {
             get {
-                return ResourceManager.GetString("ADP_ColumnSchemaMissing2", resourceCulture);
+                return ResourceManager.GetString("ADP_ConnectionStateMsg_Closed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0}: CommandText property has not been initialized.
+        ///   Looks up a localized string similar to The connection&apos;s current state is connecting..
         /// </summary>
-        internal static string ADP_CommandTextRequired {
+        internal static string ADP_ConnectionStateMsg_Connecting {
             get {
-                return ResourceManager.GetString("ADP_CommandTextRequired", resourceCulture);
+                return ResourceManager.GetString("ADP_ConnectionStateMsg_Connecting", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to retrieve the ComputerNameDnsFullyQualified, {0}..
+        ///   Looks up a localized string similar to The connection&apos;s current state is open..
         /// </summary>
-        internal static string ADP_ComputerNameEx {
+        internal static string ADP_ConnectionStateMsg_Open {
             get {
-                return ResourceManager.GetString("ADP_ComputerNameEx", resourceCulture);
+                return ResourceManager.GetString("ADP_ConnectionStateMsg_Open", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection was not closed. {0}.
+        ///   Looks up a localized string similar to The connection&apos;s current state is executing..
         /// </summary>
-        internal static string ADP_ConnectionAlreadyOpen {
+        internal static string ADP_ConnectionStateMsg_OpenExecuting {
             get {
-                return ResourceManager.GetString("ADP_ConnectionAlreadyOpen", resourceCulture);
+                return ResourceManager.GetString("ADP_ConnectionStateMsg_OpenExecuting", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection has been disabled..
+        ///   Looks up a localized string similar to The connection&apos;s current state is fetching..
         /// </summary>
-        internal static string ADP_ConnectionIsDisabled {
+        internal static string ADP_ConnectionStateMsg_OpenFetching {
             get {
-                return ResourceManager.GetString("ADP_ConnectionIsDisabled", resourceCulture);
+                return ResourceManager.GetString("ADP_ConnectionStateMsg_OpenFetching", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0}: Connection property has not been initialized..
+        ///   Looks up a localized string similar to Format of the initialization string does not conform to specification starting at index {0}..
         /// </summary>
-        internal static string ADP_ConnectionRequired {
+        internal static string ADP_ConnectionStringSyntax {
             get {
-                return ResourceManager.GetString("ADP_ConnectionRequired", resourceCulture);
+                return ResourceManager.GetString("ADP_ConnectionStringSyntax", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires a connection object.  The Connection property has not been initialized..
+        ///   Looks up a localized string similar to Invalid attempt to call {0} when reader is closed..
         /// </summary>
-        internal static string ADP_ConnectionRequired_Batch {
+        internal static string ADP_DataReaderClosed {
             get {
-                return ResourceManager.GetString("ADP_ConnectionRequired_Batch", resourceCulture);
+                return ResourceManager.GetString("ADP_DataReaderClosed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires the command clone to have a connection object. The Connection property of the command clone has not been initialized..
+        ///   Looks up a localized string similar to No mapping exists from DbType {0} to a known {1}..
         /// </summary>
-        internal static string ADP_ConnectionRequired_Clone {
+        internal static string ADP_DbTypeNotSupported {
             get {
-                return ResourceManager.GetString("ADP_ConnectionRequired_Clone", resourceCulture);
+                return ResourceManager.GetString("ADP_DbTypeNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires the DeleteCommand to have a connection object. The Connection property of the DeleteCommand has not been initialized..
+        ///   Looks up a localized string similar to {0} DeriveParameters only supports CommandType.StoredProcedure, not CommandType.{1}..
         /// </summary>
-        internal static string ADP_ConnectionRequired_Delete {
+        internal static string ADP_DeriveParametersNotSupported {
             get {
-                return ResourceManager.GetString("ADP_ConnectionRequired_Delete", resourceCulture);
+                return ResourceManager.GetString("ADP_DeriveParametersNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Fill: SelectCommand.Connection property has not been initialized..
+        ///   Looks up a localized string similar to The acceptable values for the property &apos;{0}&apos; are &apos;{1}&apos; or &apos;{2}&apos;..
         /// </summary>
-        internal static string ADP_ConnectionRequired_Fill {
+        internal static string ADP_DoubleValuedProperty {
             get {
-                return ResourceManager.GetString("ADP_ConnectionRequired_Fill", resourceCulture);
+                return ResourceManager.GetString("ADP_DoubleValuedProperty", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to FillPage: SelectCommand.Connection property has not been initialized..
+        ///   Looks up a localized string similar to Database cannot be null, the empty string, or string of only whitespace..
         /// </summary>
-        internal static string ADP_ConnectionRequired_FillPage {
+        internal static string ADP_EmptyDatabaseName {
             get {
-                return ResourceManager.GetString("ADP_ConnectionRequired_FillPage", resourceCulture);
+                return ResourceManager.GetString("ADP_EmptyDatabaseName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to FillSchema: SelectCommand.Connection property has not been initialized..
+        ///   Looks up a localized string similar to Expecting non-empty string for &apos;{0}&apos; parameter..
         /// </summary>
-        internal static string ADP_ConnectionRequired_FillSchema {
+        internal static string ADP_EmptyString {
             get {
-                return ResourceManager.GetString("ADP_ConnectionRequired_FillSchema", resourceCulture);
+                return ResourceManager.GetString("ADP_EmptyString", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires the InsertCommand to have a connection object. The Connection property of the InsertCommand has not been initialized..
+        ///   Looks up a localized string similar to Internal DbConnection Error: {0}.
         /// </summary>
-        internal static string ADP_ConnectionRequired_Insert {
+        internal static string ADP_InternalConnectionError {
             get {
-                return ResourceManager.GetString("ADP_ConnectionRequired_Insert", resourceCulture);
+                return ResourceManager.GetString("ADP_InternalConnectionError", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires the UpdateCommand to have a connection object. The Connection property of the UpdateCommand has not been initialized..
+        ///   Looks up a localized string similar to Internal .NET Framework Data Provider error {0}..
         /// </summary>
-        internal static string ADP_ConnectionRequired_Update {
+        internal static string ADP_InternalProviderError {
             get {
-                return ResourceManager.GetString("ADP_ConnectionRequired_Update", resourceCulture);
+                return ResourceManager.GetString("ADP_InternalProviderError", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires a connection..
+        ///   Looks up a localized string similar to The length of argument &apos;{0}&apos; exceeds its limit of &apos;{1}&apos;..
         /// </summary>
-        internal static string ADP_ConnectionRequired_UpdateRows {
+        internal static string ADP_InvalidArgumentLength {
             get {
-                return ResourceManager.GetString("ADP_ConnectionRequired_UpdateRows", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidArgumentLength", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection&apos;s current state: {0}..
+        ///   Looks up a localized string similar to Invalid CommandTimeout value {0}; the value must be &gt;= 0..
         /// </summary>
-        internal static string ADP_ConnectionStateMsg {
+        internal static string ADP_InvalidCommandTimeout {
             get {
-                return ResourceManager.GetString("ADP_ConnectionStateMsg", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidCommandTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection&apos;s current state is closed..
+        ///   Looks up a localized string similar to Invalid value for key &apos;{0}&apos;..
         /// </summary>
-        internal static string ADP_ConnectionStateMsg_Closed {
+        internal static string ADP_InvalidConnectionOptionValue {
             get {
-                return ResourceManager.GetString("ADP_ConnectionStateMsg_Closed", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidConnectionOptionValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection&apos;s current state is connecting..
+        ///   Looks up a localized string similar to The value&apos;s length for key &apos;{0}&apos; exceeds its limit of &apos;{1}&apos;..
         /// </summary>
-        internal static string ADP_ConnectionStateMsg_Connecting {
+        internal static string ADP_InvalidConnectionOptionValueLength {
             get {
-                return ResourceManager.GetString("ADP_ConnectionStateMsg_Connecting", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidConnectionOptionValueLength", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection&apos;s current state is open..
+        ///   Looks up a localized string similar to The DataDirectory substitute is not a string..
         /// </summary>
-        internal static string ADP_ConnectionStateMsg_Open {
+        internal static string ADP_InvalidDataDirectory {
             get {
-                return ResourceManager.GetString("ADP_ConnectionStateMsg_Open", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidDataDirectory", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection&apos;s current state is executing..
+        ///   Looks up a localized string similar to Specified length &apos;{0}&apos; is out of range..
         /// </summary>
-        internal static string ADP_ConnectionStateMsg_OpenExecuting {
+        internal static string ADP_InvalidDataLength2 {
             get {
-                return ResourceManager.GetString("ADP_ConnectionStateMsg_OpenExecuting", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidDataLength2", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection&apos;s current state is fetching..
+        ///   Looks up a localized string similar to The parameter data type of {0} is invalid..
         /// </summary>
-        internal static string ADP_ConnectionStateMsg_OpenFetching {
+        internal static string ADP_InvalidDataType {
             get {
-                return ResourceManager.GetString("ADP_ConnectionStateMsg_OpenFetching", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidDataType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Format of the initialization string does not conform to specification starting at index {0}..
+        ///   Looks up a localized string similar to Invalid destination buffer (size of {0}) offset: {1}.
         /// </summary>
-        internal static string ADP_ConnectionStringSyntax {
+        internal static string ADP_InvalidDestinationBufferIndex {
             get {
-                return ResourceManager.GetString("ADP_ConnectionStringSyntax", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidDestinationBufferIndex", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Data adapter error..
+        ///   Looks up a localized string similar to The {0} enumeration value, {1}, is invalid..
         /// </summary>
-        internal static string ADP_DataAdapterExceptionMessage {
+        internal static string ADP_InvalidEnumerationValue {
             get {
-                return ResourceManager.GetString("ADP_DataAdapterExceptionMessage", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidEnumerationValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The argument is too long..
+        ///   Looks up a localized string similar to {0} Invalid JSON string for vector..
         /// </summary>
-        internal static string ADP_DatabaseNameTooLong {
+        internal static string ADP_InvalidJsonStringForVector {
             get {
-                return ResourceManager.GetString("ADP_DatabaseNameTooLong", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidJsonStringForVector", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to call {0} when reader is closed..
+        ///   Looks up a localized string similar to Invalid keyword, contain one or more of &apos;no characters&apos;, &apos;control characters&apos;, &apos;leading or trailing whitespace&apos; or &apos;leading semicolons&apos;..
         /// </summary>
-        internal static string ADP_DataReaderClosed {
+        internal static string ADP_InvalidKey {
             get {
-                return ResourceManager.GetString("ADP_DataReaderClosed", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidKey", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DB concurrency violation..
+        ///   Looks up a localized string similar to Invalid value for this metadata..
         /// </summary>
-        internal static string ADP_DBConcurrencyExceptionMessage {
+        internal static string ADP_InvalidMetaDataValue {
             get {
-                return ResourceManager.GetString("ADP_DBConcurrencyExceptionMessage", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMetaDataValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; cannot be called when the DbDataRecord is read only..
+        ///   Looks up a localized string similar to Invalid min or max pool size values, min pool size cannot be greater than the max pool size..
         /// </summary>
-        internal static string ADP_DbDataUpdatableRecordReadOnly {
+        internal static string ADP_InvalidMinMaxPoolSizeValues {
             get {
-                return ResourceManager.GetString("ADP_DbDataUpdatableRecordReadOnly", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMinMaxPoolSizeValues", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; cannot be called when the record is read only..
+        ///   Looks up a localized string similar to Cannot set the AccessToken property if &apos;Authentication&apos; has been specified in the connection string..
         /// </summary>
-        internal static string ADP_DbRecordReadOnly {
+        internal static string ADP_InvalidMixedUsageOfAccessTokenAndAuthentication {
             get {
-                return ResourceManager.GetString("ADP_DbRecordReadOnly", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndAuthentication", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No mapping exists from DbType {0} to a known {1}..
+        ///   Looks up a localized string similar to Cannot set the AccessToken property if the Credential property is already set..
         /// </summary>
-        internal static string ADP_DbTypeNotSupported {
+        internal static string ADP_InvalidMixedUsageOfAccessTokenAndCredential {
             get {
-                return ResourceManager.GetString("ADP_DbTypeNotSupported", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndCredential", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot enlist in the transaction because the connection is the primary connection for a delegated or promoted transaction..
+        ///   Looks up a localized string similar to Cannot set the AccessToken property if the &apos;Integrated Security&apos; connection string keyword has been set to &apos;true&apos; or &apos;SSPI&apos;..
         /// </summary>
-        internal static string ADP_DelegatedTransactionPresent {
+        internal static string ADP_InvalidMixedUsageOfAccessTokenAndIntegratedSecurity {
             get {
-                return ResourceManager.GetString("ADP_DelegatedTransactionPresent", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndIntegratedSecurity", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} DeriveParameters only supports CommandType.StoredProcedure, not CommandType.{1}..
+        ///   Looks up a localized string similar to Cannot set the AccessToken property if the AccessTokenCallback has been set..
         /// </summary>
-        internal static string ADP_DeriveParametersNotSupported {
+        internal static string ADP_InvalidMixedUsageOfAccessTokenAndTokenCallback {
             get {
-                return ResourceManager.GetString("ADP_DeriveParametersNotSupported", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndTokenCallback", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Descending.
+        ///   Looks up a localized string similar to Cannot set the AccessToken property if &apos;UserID&apos;, &apos;UID&apos;, &apos;Password&apos;, or &apos;PWD&apos; has been specified in connection string..
         /// </summary>
-        internal static string ADP_Descending {
+        internal static string ADP_InvalidMixedUsageOfAccessTokenAndUserIDPassword {
             get {
-                return ResourceManager.GetString("ADP_Descending", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndUserIDPassword", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The acceptable values for the property &apos;{0}&apos; are &apos;{1}&apos; or &apos;{2}&apos;..
+        ///   Looks up a localized string similar to Cannot set the AccessTokenCallback property if the &apos;Integrated Security&apos; connection string keyword has been set to &apos;true&apos; or &apos;SSPI&apos;..
         /// </summary>
-        internal static string ADP_DoubleValuedProperty {
+        internal static string ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity {
             get {
-                return ResourceManager.GetString("ADP_DoubleValuedProperty", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dynamic SQL generation is not supported against multiple base tables..
+        ///   Looks up a localized string similar to Cannot set the AccessTokenCallback property if &apos;Authentication=Active Directory Default&apos; has been specified in the connection string..
         /// </summary>
-        internal static string ADP_DynamicSQLJoinUnsupported {
+        internal static string ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback {
             get {
-                return ResourceManager.GetString("ADP_DynamicSQLJoinUnsupported", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dynamic SQL generation not supported against table names &apos;{0}&apos; that contain the QuotePrefix or QuoteSuffix character &apos;{1}&apos;..
+        ///   Looks up a localized string similar to Cannot set the Credential property if the AccessToken property is already set..
         /// </summary>
-        internal static string ADP_DynamicSQLNestedQuote {
+        internal static string ADP_InvalidMixedUsageOfCredentialAndAccessToken {
             get {
-                return ResourceManager.GetString("ADP_DynamicSQLNestedQuote", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfCredentialAndAccessToken", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dynamic SQL generation for the DeleteCommand is not supported against a SelectCommand that does not return any key column information..
+        ///   Looks up a localized string similar to Cannot use Credential with UserID, UID, Password, or PWD connection string keywords..
         /// </summary>
-        internal static string ADP_DynamicSQLNoKeyInfoDelete {
+        internal static string ADP_InvalidMixedUsageOfSecureAndClearCredential {
             get {
-                return ResourceManager.GetString("ADP_DynamicSQLNoKeyInfoDelete", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfSecureAndClearCredential", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dynamic SQL generation for the DeleteCommand is not supported against a SelectCommand that does not contain a row version column..
+        ///   Looks up a localized string similar to Cannot use Credential with Integrated Security connection string keyword..
         /// </summary>
-        internal static string ADP_DynamicSQLNoKeyInfoRowVersionDelete {
+        internal static string ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity {
             get {
-                return ResourceManager.GetString("ADP_DynamicSQLNoKeyInfoRowVersionDelete", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dynamic SQL generation for the UpdateCommand is not supported against a SelectCommand that does not contain a row version column..
+        ///   Looks up a localized string similar to {0} &quot;{1}&quot;..
         /// </summary>
-        internal static string ADP_DynamicSQLNoKeyInfoRowVersionUpdate {
+        internal static string ADP_InvalidMultipartName {
             get {
-                return ResourceManager.GetString("ADP_DynamicSQLNoKeyInfoRowVersionUpdate", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMultipartName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dynamic SQL generation for the UpdateCommand is not supported against a SelectCommand that does not return any key column information..
+        ///   Looks up a localized string similar to {0} &quot;{1}&quot;, incorrect usage of quotes..
         /// </summary>
-        internal static string ADP_DynamicSQLNoKeyInfoUpdate {
+        internal static string ADP_InvalidMultipartNameQuoteUsage {
             get {
-                return ResourceManager.GetString("ADP_DynamicSQLNoKeyInfoUpdate", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMultipartNameQuoteUsage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dynamic SQL generation is not supported against a SelectCommand that does not return any base table information..
+        ///   Looks up a localized string similar to {0} &quot;{1}&quot;, the current limit of &quot;{2}&quot; is insufficient..
         /// </summary>
-        internal static string ADP_DynamicSQLNoTableInfo {
+        internal static string ADP_InvalidMultipartNameToManyParts {
             get {
-                return ResourceManager.GetString("ADP_DynamicSQLNoTableInfo", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMultipartNameToManyParts", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Expecting non-empty array for &apos;{0}&apos; parameter..
+        ///   Looks up a localized string similar to Invalid parameter Offset value &apos;{0}&apos;. The value must be greater than or equal to 0..
         /// </summary>
-        internal static string ADP_EmptyArray {
+        internal static string ADP_InvalidOffsetValue {
             get {
-                return ResourceManager.GetString("ADP_EmptyArray", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidOffsetValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Database cannot be null, the empty string, or string of only whitespace..
+        ///   Looks up a localized string similar to Specified QuotePrefix and QuoteSuffix values do not match..
         /// </summary>
-        internal static string ADP_EmptyDatabaseName {
+        internal static string ADP_InvalidPrefixSuffix {
             get {
-                return ResourceManager.GetString("ADP_EmptyDatabaseName", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidPrefixSuffix", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Expecting non-empty string for &apos;{0}&apos; parameter..
+        ///   Looks up a localized string similar to Specified SeekOrigin value is invalid..
         /// </summary>
-        internal static string ADP_EmptyString {
+        internal static string ADP_InvalidSeekOrigin {
             get {
-                return ResourceManager.GetString("ADP_EmptyString", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidSeekOrigin", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos;:The length of the literal value must be even..
+        ///   Looks up a localized string similar to Invalid parameter Size value &apos;{0}&apos;. The value must be greater than or equal to 0..
         /// </summary>
-        internal static string ADP_EvenLengthLiteralValue {
+        internal static string ADP_InvalidSizeValue {
             get {
-                return ResourceManager.GetString("ADP_EvenLengthLiteralValue", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidSizeValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hierarchical chapter columns must map to an AutoIncrement DataColumn..
+        ///   Looks up a localized string similar to Invalid source buffer (size of {0}) offset: {1}.
         /// </summary>
-        internal static string ADP_FillChapterAutoIncrement {
+        internal static string ADP_InvalidSourceBufferIndex {
             get {
-                return ResourceManager.GetString("ADP_FillChapterAutoIncrement", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidSourceBufferIndex", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Fill: expected a non-empty string for the SourceTable name..
+        ///   Looks up a localized string similar to The value contains embedded nulls (\u0000)..
         /// </summary>
-        internal static string ADP_FillRequiresSourceTableName {
+        internal static string ADP_InvalidValue {
             get {
-                return ResourceManager.GetString("ADP_FillRequiresSourceTableName", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to FillSchema: expected a non-empty string for the SourceTable name..
+        ///   Looks up a localized string similar to Invalid vector header received..
         /// </summary>
-        internal static string ADP_FillSchemaRequiresSourceTableName {
+        internal static string ADP_InvalidVectorHeader {
             get {
-                return ResourceManager.GetString("ADP_FillSchemaRequiresSourceTableName", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidVectorHeader", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos;:The literal value must be a string with hexadecimal digits.
+        ///   Looks up a localized string similar to Invalid Xml; can only parse elements of version one..
         /// </summary>
-        internal static string ADP_HexDigitLiteralValue {
+        internal static string ADP_InvalidXMLBadVersion {
             get {
-                return ResourceManager.GetString("ADP_HexDigitLiteralValue", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidXMLBadVersion", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Incorrect async result..
+        ///   Looks up a localized string similar to Keyword not supported: &apos;{0}&apos;..
         /// </summary>
-        internal static string ADP_IncorrectAsyncResult {
+        internal static string ADP_KeywordNotSupported {
             get {
-                return ResourceManager.GetString("ADP_IncorrectAsyncResult", resourceCulture);
+                return ResourceManager.GetString("ADP_KeywordNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Internal DbConnection Error: {0}.
+        ///   Looks up a localized string similar to Cannot enlist in the transaction because a local transaction is in progress on the connection.  Finish local transaction and retry..
         /// </summary>
-        internal static string ADP_InternalConnectionError {
+        internal static string ADP_LocalTransactionPresent {
             get {
-                return ResourceManager.GetString("ADP_InternalConnectionError", resourceCulture);
+                return ResourceManager.GetString("ADP_LocalTransactionPresent", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Internal .NET Framework Data Provider error {0}..
+        ///   Looks up a localized string similar to Mismatched end method call for asyncResult.  Expected call to {0} but {1} was called instead..
         /// </summary>
-        internal static string ADP_InternalProviderError {
+        internal static string ADP_MismatchedAsyncResult {
             get {
-                return ResourceManager.GetString("ADP_InternalProviderError", resourceCulture);
+                return ResourceManager.GetString("ADP_MismatchedAsyncResult", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The length of argument &apos;{0}&apos; exceeds its limit of &apos;{1}&apos;..
+        ///   Looks up a localized string similar to Use of key &apos;{0}&apos; requires the key &apos;{1}&apos; to be present..
         /// </summary>
-        internal static string ADP_InvalidArgumentLength {
+        internal static string ADP_MissingConnectionOptionValue {
             get {
-                return ResourceManager.GetString("ADP_InvalidArgumentLength", resourceCulture);
+                return ResourceManager.GetString("ADP_MissingConnectionOptionValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid argument value for method &apos;{0}&apos;..
+        ///   Looks up a localized string similar to {0} must be marked as read only..
         /// </summary>
-        internal static string ADP_InvalidArgumentValue {
+        internal static string ADP_MustBeReadOnly {
             get {
-                return ResourceManager.GetString("ADP_InvalidArgumentValue", resourceCulture);
+                return ResourceManager.GetString("ADP_MustBeReadOnly", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Buffer offset &apos;{1}&apos; plus the bytes available &apos;{0}&apos; is greater than the length of the passed in buffer..
+        ///   Looks up a localized string similar to Invalid value for argument &apos;{0}&apos;. The value must be greater than or equal to 0..
         /// </summary>
-        internal static string ADP_InvalidBufferSizeOrIndex {
+        internal static string ADP_NegativeParameter {
             get {
-                return ResourceManager.GetString("ADP_InvalidBufferSizeOrIndex", resourceCulture);
+                return ResourceManager.GetString("ADP_NegativeParameter", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid CommandTimeout value {0}; the value must be &gt;= 0..
+        ///   Looks up a localized string similar to The ConnectionString property has not been initialized..
         /// </summary>
-        internal static string ADP_InvalidCommandTimeout {
+        internal static string ADP_NoConnectionString {
             get {
-                return ResourceManager.GetString("ADP_InvalidCommandTimeout", resourceCulture);
+                return ResourceManager.GetString("ADP_NoConnectionString", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid value for key &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Timeout attempting to open the connection.  The time period elapsed prior to attempting to open the connection has been exceeded.  This may have occurred because of too many simultaneous non-pooled connection attempts..
         /// </summary>
-        internal static string ADP_InvalidConnectionOptionValue {
+        internal static string ADP_NonPooledOpenTimeout {
             get {
-                return ResourceManager.GetString("ADP_InvalidConnectionOptionValue", resourceCulture);
+                return ResourceManager.GetString("ADP_NonPooledOpenTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The value&apos;s length for key &apos;{0}&apos; exceeds its limit of &apos;{1}&apos;..
+        ///   Looks up a localized string similar to Invalid {2} attempt at dataIndex &apos;{0}&apos;.  With CommandBehavior.SequentialAccess, you may only read from dataIndex &apos;{1}&apos; or greater..
         /// </summary>
-        internal static string ADP_InvalidConnectionOptionValueLength {
+        internal static string ADP_NonSeqByteAccess {
             get {
-                return ResourceManager.GetString("ADP_InvalidConnectionOptionValueLength", resourceCulture);
+                return ResourceManager.GetString("ADP_NonSeqByteAccess", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid &apos;Connect Timeout&apos; value which must be an integer &gt;= 0..
+        ///   Looks up a localized string similar to Invalid attempt to read from column ordinal &apos;{0}&apos;.  With CommandBehavior.SequentialAccess, you may only read from column ordinal &apos;{1}&apos; or greater..
         /// </summary>
-        internal static string ADP_InvalidConnectTimeoutValue {
+        internal static string ADP_NonSequentialColumnAccess {
             get {
-                return ResourceManager.GetString("ADP_InvalidConnectTimeoutValue", resourceCulture);
+                return ResourceManager.GetString("ADP_NonSequentialColumnAccess", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DataDirectory substitute is not a string..
+        ///   Looks up a localized string similar to SqlBatchCommand list has not been initialized..
         /// </summary>
-        internal static string ADP_InvalidDataDirectory {
+        internal static string ADP_NoSqlBatchCommandList {
             get {
-                return ResourceManager.GetString("ADP_InvalidDataDirectory", resourceCulture);
+                return ResourceManager.GetString("ADP_NoSqlBatchCommandList", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Data length &apos;{0}&apos; is less than 0..
+        ///   Looks up a localized string similar to The stored procedure &apos;{0}&apos; doesn&apos;t exist..
         /// </summary>
-        internal static string ADP_InvalidDataLength {
+        internal static string ADP_NoStoredProcedureExists {
             get {
-                return ResourceManager.GetString("ADP_InvalidDataLength", resourceCulture);
+                return ResourceManager.GetString("ADP_NoStoredProcedureExists", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Specified length &apos;{0}&apos; is out of range..
+        ///   Looks up a localized string similar to Given security element is not a permission element..
         /// </summary>
-        internal static string ADP_InvalidDataLength2 {
+        internal static string ADP_NotAPermissionElement {
             get {
-                return ResourceManager.GetString("ADP_InvalidDataLength2", resourceCulture);
+                return ResourceManager.GetString("ADP_NotAPermissionElement", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The parameter data type of {0} is invalid..
+        ///   Looks up a localized string similar to The {0} enumeration value, {1}, is not supported by the {2} method..
         /// </summary>
-        internal static string ADP_InvalidDataType {
+        internal static string ADP_NotSupportedEnumerationValue {
             get {
-                return ResourceManager.GetString("ADP_InvalidDataType", resourceCulture);
+                return ResourceManager.GetString("ADP_NotSupportedEnumerationValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Data type &apos;{0}&apos; can not be formatted as a literal because it has an invalid date time digits..
+        ///   Looks up a localized string similar to &apos;null&apos; value not supported for output parameter &apos;{0}&apos; of SqlDbtype Vector..
         /// </summary>
-        internal static string ADP_InvalidDateTimeDigits {
+        internal static string ADP_NullOutputParameterValueForVector {
             get {
-                return ResourceManager.GetString("ADP_InvalidDateTimeDigits", resourceCulture);
+                return ResourceManager.GetString("ADP_NullOutputParameterValueForVector", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid destination buffer (size of {0}) offset: {1}.
+        ///   Looks up a localized string similar to Not allowed to change the &apos;{0}&apos; property. {1}.
         /// </summary>
-        internal static string ADP_InvalidDestinationBufferIndex {
+        internal static string ADP_OpenConnectionPropertySet {
             get {
-                return ResourceManager.GetString("ADP_InvalidDestinationBufferIndex", resourceCulture);
+                return ResourceManager.GetString("ADP_OpenConnectionPropertySet", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The {0} enumeration value, {1}, is invalid..
+        ///   Looks up a localized string similar to {0} requires an open and available Connection. {1}.
         /// </summary>
-        internal static string ADP_InvalidEnumerationValue {
+        internal static string ADP_OpenConnectionRequired {
             get {
-                return ResourceManager.GetString("ADP_InvalidEnumerationValue", resourceCulture);
+                return ResourceManager.GetString("ADP_OpenConnectionRequired", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The value can not be formatted as a literal of the requested type..
+        ///   Looks up a localized string similar to There is already an open DataReader associated with this {0} which must be closed first..
         /// </summary>
-        internal static string ADP_InvalidFormatValue {
+        internal static string ADP_OpenReaderExists {
             get {
-                return ResourceManager.GetString("ADP_InvalidFormatValue", resourceCulture);
+                return ResourceManager.GetString("ADP_OpenReaderExists", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Implicit conversion of object type &apos;{0}&apos; to data type &apos;{1}&apos; is not supported..
+        ///   Looks up a localized string similar to Operation aborted..
         /// </summary>
-        internal static string ADP_InvalidImplicitConversion {
+        internal static string ADP_OperationAborted {
             get {
-                return ResourceManager.GetString("ADP_InvalidImplicitConversion", resourceCulture);
+                return ResourceManager.GetString("ADP_OperationAborted", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid keyword, contain one or more of &apos;no characters&apos;, &apos;control characters&apos;, &apos;leading or trailing whitespace&apos; or &apos;leading semicolons&apos;..
+        ///   Looks up a localized string similar to Operation aborted due to an exception (see InnerException for details)..
         /// </summary>
-        internal static string ADP_InvalidKey {
+        internal static string ADP_OperationAbortedExceptionMessage {
             get {
-                return ResourceManager.GetString("ADP_InvalidKey", resourceCulture);
+                return ResourceManager.GetString("ADP_OperationAbortedExceptionMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Data type &apos;{0}&apos; can not be formatted as a literal because it has an invalid maximum scale..
+        ///   Looks up a localized string similar to {0} does not support parallel transactions..
         /// </summary>
-        internal static string ADP_InvalidMaximumScale {
+        internal static string ADP_ParallelTransactionsNotSupported {
             get {
-                return ResourceManager.GetString("ADP_InvalidMaximumScale", resourceCulture);
+                return ResourceManager.GetString("ADP_ParallelTransactionsNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The MaxRecords value of {0} is invalid; the value must be &gt;= 0..
+        ///   Looks up a localized string similar to Failed to convert parameter value from a {0} to a {1}..
         /// </summary>
-        internal static string ADP_InvalidMaxRecords {
+        internal static string ADP_ParameterConversionFailed {
             get {
-                return ResourceManager.GetString("ADP_InvalidMaxRecords", resourceCulture);
+                return ResourceManager.GetString("ADP_ParameterConversionFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid value for this metadata..
+        ///   Looks up a localized string similar to Parameter value &apos;{0}&apos; is out of range..
         /// </summary>
-        internal static string ADP_InvalidMetaDataValue {
+        internal static string ADP_ParameterValueOutOfRange {
             get {
-                return ResourceManager.GetString("ADP_InvalidMetaDataValue", resourceCulture);
+                return ResourceManager.GetString("ADP_ParameterValueOutOfRange", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid min or max pool size values, min pool size cannot be greater than the max pool size..
+        ///   Looks up a localized string similar to Can not start another operation while there is an asynchronous operation pending..
         /// </summary>
-        internal static string ADP_InvalidMinMaxPoolSizeValues {
+        internal static string ADP_PendingAsyncOperation {
             get {
-                return ResourceManager.GetString("ADP_InvalidMinMaxPoolSizeValues", resourceCulture);
+                return ResourceManager.GetString("ADP_PendingAsyncOperation", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set the AccessToken property if &apos;Authentication&apos; has been specified in the connection string..
+        ///   Looks up a localized string similar to Type mismatch..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfAccessTokenAndAuthentication {
+        internal static string ADP_PermissionTypeMismatch {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndAuthentication", resourceCulture);
+                return ResourceManager.GetString("ADP_PermissionTypeMismatch", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set the AccessToken property if the Credential property is already set..
+        ///   Looks up a localized string similar to Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfAccessTokenAndCredential {
+        internal static string ADP_PooledOpenTimeout {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndCredential", resourceCulture);
+                return ResourceManager.GetString("ADP_PooledOpenTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set the AccessToken property if the &apos;Integrated Security&apos; connection string keyword has been set to &apos;true&apos; or &apos;SSPI&apos;..
+        ///   Looks up a localized string similar to {0}.Prepare method requires parameters of type &apos;{1}&apos; have an explicitly set Precision and Scale..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfAccessTokenAndIntegratedSecurity {
+        internal static string ADP_PrepareParameterScale {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndIntegratedSecurity", resourceCulture);
+                return ResourceManager.GetString("ADP_PrepareParameterScale", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set the AccessToken property if the AccessTokenCallback has been set..
+        ///   Looks up a localized string similar to {0}.Prepare method requires all variable length parameters to have an explicitly set non-zero Size..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfAccessTokenAndTokenCallback {
+        internal static string ADP_PrepareParameterSize {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndTokenCallback", resourceCulture);
+                return ResourceManager.GetString("ADP_PrepareParameterSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set the AccessToken property if &apos;UserID&apos;, &apos;UID&apos;, &apos;Password&apos;, or &apos;PWD&apos; has been specified in connection string..
+        ///   Looks up a localized string similar to {0}.Prepare method requires all parameters to have an explicitly set type..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfAccessTokenAndUserIDPassword {
+        internal static string ADP_PrepareParameterType {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndUserIDPassword", resourceCulture);
+                return ResourceManager.GetString("ADP_PrepareParameterType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set the AccessTokenCallback property if the &apos;Integrated Security&apos; connection string keyword has been set to &apos;true&apos; or &apos;SSPI&apos;..
+        ///   Looks up a localized string similar to The only acceptable value for the property &apos;{0}&apos; is &apos;{1}&apos;..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity {
+        internal static string ADP_SingleValuedProperty {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity", resourceCulture);
+                return ResourceManager.GetString("ADP_SingleValuedProperty", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set the AccessTokenCallback property if &apos;Authentication=Active Directory Default&apos; has been specified in the connection string..
+        ///   Looks up a localized string similar to Invalid attempt to {0} when stream is closed..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback {
+        internal static string ADP_StreamClosed {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback", resourceCulture);
+                return ResourceManager.GetString("ADP_StreamClosed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set the Credential property if the AccessToken property is already set..
+        ///   Looks up a localized string similar to The transaction associated with the current connection has completed but has not been disposed.  The transaction must be disposed before the connection can be used to execute SQL statements..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfCredentialAndAccessToken {
+        internal static string ADP_TransactionCompletedButNotDisposed {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfCredentialAndAccessToken", resourceCulture);
+                return ResourceManager.GetString("ADP_TransactionCompletedButNotDisposed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot use Credential with UserID, UID, Password, or PWD connection string keywords..
+        ///   Looks up a localized string similar to The transaction is either not associated with the current connection or has been completed..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfSecureAndClearCredential {
+        internal static string ADP_TransactionConnectionMismatch {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfSecureAndClearCredential", resourceCulture);
+                return ResourceManager.GetString("ADP_TransactionConnectionMismatch", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot use Credential with Integrated Security connection string keyword..
+        ///   Looks up a localized string similar to Connection currently has transaction enlisted.  Finish current transaction and retry..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity {
+        internal static string ADP_TransactionPresent {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfSecureCredentialAndIntegratedSecurity", resourceCulture);
+                return ResourceManager.GetString("ADP_TransactionPresent", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} &quot;{1}&quot;..
+        ///   Looks up a localized string similar to {0} requires the command to have a transaction when the connection assigned to the command is in a pending local transaction.  The Transaction property of the command has not been initialized..
         /// </summary>
-        internal static string ADP_InvalidMultipartName {
+        internal static string ADP_TransactionRequired {
             get {
-                return ResourceManager.GetString("ADP_InvalidMultipartName", resourceCulture);
+                return ResourceManager.GetString("ADP_TransactionRequired", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} &quot;{1}&quot;, incorrect usage of quotes..
+        ///   Looks up a localized string similar to This {0} has completed; it is no longer usable..
         /// </summary>
-        internal static string ADP_InvalidMultipartNameQuoteUsage {
+        internal static string ADP_TransactionZombied {
             get {
-                return ResourceManager.GetString("ADP_InvalidMultipartNameQuoteUsage", resourceCulture);
+                return ResourceManager.GetString("ADP_TransactionZombied", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} &quot;{1}&quot;, the current limit of &quot;{2}&quot; is insufficient..
+        ///   Looks up a localized string similar to {1}[{0}]: the Size property has an invalid size of 0..
         /// </summary>
-        internal static string ADP_InvalidMultipartNameToManyParts {
+        internal static string ADP_UninitializedParameterSize {
             get {
-                return ResourceManager.GetString("ADP_InvalidMultipartNameToManyParts", resourceCulture);
+                return ResourceManager.GetString("ADP_UninitializedParameterSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid parameter Offset value &apos;{0}&apos;. The value must be greater than or equal to 0..
+        ///   Looks up a localized string similar to No mapping exists from object type {0} to a known managed provider native type..
         /// </summary>
-        internal static string ADP_InvalidOffsetValue {
+        internal static string ADP_UnknownDataType {
             get {
-                return ResourceManager.GetString("ADP_InvalidOffsetValue", resourceCulture);
+                return ResourceManager.GetString("ADP_UnknownDataType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Specified QuotePrefix and QuoteSuffix values do not match..
+        ///   Looks up a localized string similar to Unable to handle an unknown TypeCode {0} returned by Type {1}..
         /// </summary>
-        internal static string ADP_InvalidPrefixSuffix {
+        internal static string ADP_UnknownDataTypeCode {
             get {
-                return ResourceManager.GetString("ADP_InvalidPrefixSuffix", resourceCulture);
+                return ResourceManager.GetString("ADP_UnknownDataTypeCode", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Specified SeekOrigin value is invalid..
+        ///   Looks up a localized string similar to The version of SQL Server in use does not support datatype &apos;{0}&apos;..
         /// </summary>
-        internal static string ADP_InvalidSeekOrigin {
+        internal static string ADP_VersionDoesNotSupportDataType {
             get {
-                return ResourceManager.GetString("ADP_InvalidSeekOrigin", resourceCulture);
+                return ResourceManager.GetString("ADP_VersionDoesNotSupportDataType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid parameter Size value &apos;{0}&apos;. The value must be greater than or equal to 0..
+        ///   Looks up a localized string similar to Destination array is not long enough to copy all the items in the collection. Check array index and length..
         /// </summary>
-        internal static string ADP_InvalidSizeValue {
+        internal static string Arg_ArrayPlusOffTooSmall {
             get {
-                return ResourceManager.GetString("ADP_InvalidSizeValue", resourceCulture);
+                return ResourceManager.GetString("Arg_ArrayPlusOffTooSmall", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid source buffer (size of {0}) offset: {1}.
+        ///   Looks up a localized string similar to Only single dimensional arrays are supported for the requested action..
         /// </summary>
-        internal static string ADP_InvalidSourceBufferIndex {
+        internal static string Arg_RankMultiDimNotSupported {
             get {
-                return ResourceManager.GetString("ADP_InvalidSourceBufferIndex", resourceCulture);
+                return ResourceManager.GetString("Arg_RankMultiDimNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to SourceColumn is required to be a non-empty string..
+        ///   Looks up a localized string similar to Non-negative number required..
         /// </summary>
-        internal static string ADP_InvalidSourceColumn {
+        internal static string ArgumentOutOfRange_NeedNonNegNum {
             get {
-                return ResourceManager.GetString("ADP_InvalidSourceColumn", resourceCulture);
+                return ResourceManager.GetString("ArgumentOutOfRange_NeedNonNegNum", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to SourceTable is required to be a non-empty string.
+        ///   Looks up a localized string similar to Buffer advanced too far {0}.
         /// </summary>
-        internal static string ADP_InvalidSourceTable {
+        internal static string ArrayBufferWriterAdvancedTooFar {
             get {
-                return ResourceManager.GetString("ADP_InvalidSourceTable", resourceCulture);
+                return ResourceManager.GetString("ArrayBufferWriterAdvancedTooFar", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The StartRecord value of {0} is invalid; the value must be &gt;= 0..
+        ///   Looks up a localized string similar to Buffer maximum size exceeded: {0}.
         /// </summary>
-        internal static string ADP_InvalidStartRecord {
+        internal static string ArrayBufferWriterMaximumSizeExceeded {
             get {
-                return ResourceManager.GetString("ADP_InvalidStartRecord", resourceCulture);
+                return ResourceManager.GetString("ArrayBufferWriterMaximumSizeExceeded", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid UDL file..
+        ///   Looks up a localized string similar to The validation of an attestation token failed. The token signature does not match the computed signature using a public key retrieved from the attestation public key endpoint at &apos;{0}&apos;. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If correct, contact Customer Support Services..
         /// </summary>
-        internal static string ADP_InvalidUDL {
+        internal static string AttestationTokenSignatureValidationFailed {
             get {
-                return ResourceManager.GetString("ADP_InvalidUDL", resourceCulture);
+                return ResourceManager.GetString("AttestationTokenSignatureValidationFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The value contains embedded nulls (\u0000)..
+        ///   Looks up a localized string similar to Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection..
         /// </summary>
-        internal static string ADP_InvalidValue {
+        internal static string Data_InvalidOffsetLength {
             get {
-                return ResourceManager.GetString("ADP_InvalidValue", resourceCulture);
+                return ResourceManager.GetString("Data_InvalidOffsetLength", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid Xml; can only parse elements of version one..
+        ///   Looks up a localized string similar to Advanced.
         /// </summary>
-        internal static string ADP_InvalidXMLBadVersion {
+        internal static string DataCategory_Advanced {
             get {
-                return ResourceManager.GetString("ADP_InvalidXMLBadVersion", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Advanced", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Keyword not supported: &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Connection Resiliency.
         /// </summary>
-        internal static string ADP_KeywordNotSupported {
+        internal static string DataCategory_ConnectionResiliency {
             get {
-                return ResourceManager.GetString("ADP_KeywordNotSupported", resourceCulture);
+                return ResourceManager.GetString("DataCategory_ConnectionResiliency", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The literal value provided is not a valid literal for the data type &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Context.
         /// </summary>
-        internal static string ADP_LiteralValueIsInvalid {
+        internal static string DataCategory_Context {
             get {
-                return ResourceManager.GetString("ADP_LiteralValueIsInvalid", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Context", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot enlist in the transaction because a local transaction is in progress on the connection.  Finish local transaction and retry..
+        ///   Looks up a localized string similar to Data.
         /// </summary>
-        internal static string ADP_LocalTransactionPresent {
+        internal static string DataCategory_Data {
             get {
-                return ResourceManager.GetString("ADP_LocalTransactionPresent", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Data", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Mismatched end method call for asyncResult.  Expected call to {0} but {1} was called instead..
+        ///   Looks up a localized string similar to Fill.
         /// </summary>
-        internal static string ADP_MismatchedAsyncResult {
+        internal static string DataCategory_Fill {
             get {
-                return ResourceManager.GetString("ADP_MismatchedAsyncResult", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Fill", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Missing SourceColumn mapping for &apos;{0}&apos;..
+        ///   Looks up a localized string similar to InfoMessage.
         /// </summary>
-        internal static string ADP_MissingColumnMapping {
+        internal static string DataCategory_InfoMessage {
             get {
-                return ResourceManager.GetString("ADP_MissingColumnMapping", resourceCulture);
+                return ResourceManager.GetString("DataCategory_InfoMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Use of key &apos;{0}&apos; requires the key &apos;{1}&apos; to be present..
+        ///   Looks up a localized string similar to Initialization.
         /// </summary>
-        internal static string ADP_MissingConnectionOptionValue {
+        internal static string DataCategory_Initialization {
             get {
-                return ResourceManager.GetString("ADP_MissingConnectionOptionValue", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Initialization", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataReader.GetFieldType({0}) returned null..
+        ///   Looks up a localized string similar to Notification.
         /// </summary>
-        internal static string ADP_MissingDataReaderFieldType {
+        internal static string DataCategory_Notification {
             get {
-                return ResourceManager.GetString("ADP_MissingDataReaderFieldType", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Notification", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The SelectCommand property has not been initialized before calling &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Pooling.
         /// </summary>
-        internal static string ADP_MissingSelectCommand {
+        internal static string DataCategory_Pooling {
             get {
-                return ResourceManager.GetString("ADP_MissingSelectCommand", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Pooling", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DataAdapter.SelectCommand property needs to be initialized..
+        ///   Looks up a localized string similar to Replication.
         /// </summary>
-        internal static string ADP_MissingSourceCommand {
+        internal static string DataCategory_Replication {
             get {
-                return ResourceManager.GetString("ADP_MissingSourceCommand", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Replication", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DataAdapter.SelectCommand.Connection property needs to be initialized;.
+        ///   Looks up a localized string similar to Security.
         /// </summary>
-        internal static string ADP_MissingSourceCommandConnection {
+        internal static string DataCategory_Security {
             get {
-                return ResourceManager.GetString("ADP_MissingSourceCommandConnection", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Security", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Missing SourceTable mapping: &apos;{0}&apos;.
+        ///   Looks up a localized string similar to Source.
         /// </summary>
-        internal static string ADP_MissingTableMapping {
+        internal static string DataCategory_Source {
             get {
-                return ResourceManager.GetString("ADP_MissingTableMapping", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Source", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Missing TableMapping when TableMapping.DataSetTable=&apos;{0}&apos;..
+        ///   Looks up a localized string similar to StatementCompleted.
         /// </summary>
-        internal static string ADP_MissingTableMappingDestination {
+        internal static string DataCategory_StatementCompleted {
             get {
-                return ResourceManager.GetString("ADP_MissingTableMappingDestination", resourceCulture);
+                return ResourceManager.GetString("DataCategory_StatementCompleted", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Missing the &apos;{0}&apos; DataTable for the &apos;{1}&apos; SourceTable..
+        ///   Looks up a localized string similar to Update.
         /// </summary>
-        internal static string ADP_MissingTableSchema {
+        internal static string DataCategory_Update {
             get {
-                return ResourceManager.GetString("ADP_MissingTableSchema", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Update", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Multiple return value parameters are not supported..
+        ///   Looks up a localized string similar to XML.
         /// </summary>
-        internal static string ADP_MultipleReturnValue {
+        internal static string DataCategory_Xml {
             get {
-                return ResourceManager.GetString("ADP_MultipleReturnValue", resourceCulture);
+                return ResourceManager.GetString("DataCategory_Xml", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} must be marked as read only..
+        ///   Looks up a localized string similar to Command text to execute..
         /// </summary>
-        internal static string ADP_MustBeReadOnly {
+        internal static string DbCommand_CommandText {
             get {
-                return ResourceManager.GetString("ADP_MustBeReadOnly", resourceCulture);
+                return ResourceManager.GetString("DbCommand_CommandText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid value for argument &apos;{0}&apos;. The value must be greater than or equal to 0..
+        ///   Looks up a localized string similar to Time to wait for command to execute..
         /// </summary>
-        internal static string ADP_NegativeParameter {
+        internal static string DbCommand_CommandTimeout {
             get {
-                return ResourceManager.GetString("ADP_NegativeParameter", resourceCulture);
+                return ResourceManager.GetString("DbCommand_CommandTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The ConnectionString property has not been initialized..
+        ///   Looks up a localized string similar to How to interpret the CommandText..
         /// </summary>
-        internal static string ADP_NoConnectionString {
+        internal static string DbCommand_CommandType {
             get {
-                return ResourceManager.GetString("ADP_NoConnectionString", resourceCulture);
+                return ResourceManager.GetString("DbCommand_CommandType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A Non CLS Exception was caught..
+        ///   Looks up a localized string similar to Connection used by the command..
         /// </summary>
-        internal static string ADP_NonCLSException {
+        internal static string DbCommand_Connection {
             get {
-                return ResourceManager.GetString("ADP_NonCLSException", resourceCulture);
+                return ResourceManager.GetString("DbCommand_Connection", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Timeout attempting to open the connection.  The time period elapsed prior to attempting to open the connection has been exceeded.  This may have occurred because of too many simultaneous non-pooled connection attempts..
+        ///   Looks up a localized string similar to The parameters collection..
         /// </summary>
-        internal static string ADP_NonPooledOpenTimeout {
+        internal static string DbCommand_Parameters {
             get {
-                return ResourceManager.GetString("ADP_NonPooledOpenTimeout", resourceCulture);
+                return ResourceManager.GetString("DbCommand_Parameters", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid {2} attempt at dataIndex &apos;{0}&apos;.  With CommandBehavior.SequentialAccess, you may only read from dataIndex &apos;{1}&apos; or greater..
+        ///   Looks up a localized string similar to When records are affected by a given statement by the execution of the command..
         /// </summary>
-        internal static string ADP_NonSeqByteAccess {
+        internal static string DbCommand_StatementCompleted {
             get {
-                return ResourceManager.GetString("ADP_NonSeqByteAccess", resourceCulture);
+                return ResourceManager.GetString("DbCommand_StatementCompleted", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to read from column ordinal &apos;{0}&apos;.  With CommandBehavior.SequentialAccess, you may only read from column ordinal &apos;{1}&apos; or greater..
+        ///   Looks up a localized string similar to The transaction used by the command..
         /// </summary>
-        internal static string ADP_NonSequentialColumnAccess {
+        internal static string DbCommand_Transaction {
             get {
-                return ResourceManager.GetString("ADP_NonSequentialColumnAccess", resourceCulture);
+                return ResourceManager.GetString("DbCommand_Transaction", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The QuotePrefix and QuoteSuffix properties cannot be changed once an Insert, Update, or Delete command has been generated..
+        ///   Looks up a localized string similar to When used by a DataAdapter.Update, how command results are applied to the current DataRow..
         /// </summary>
-        internal static string ADP_NoQuoteChange {
+        internal static string DbCommand_UpdatedRowSource {
             get {
-                return ResourceManager.GetString("ADP_NoQuoteChange", resourceCulture);
+                return ResourceManager.GetString("DbCommand_UpdatedRowSource", resourceCulture);
             }
         }
-
+        
         /// <summary>
-        ///   Looks up a localized string similar to SqlBatchCommand list has not been initialized..
+        ///   Looks up a localized string similar to Event triggered when messages arrive from the DataSource..
         /// </summary>
-        internal static string ADP_NoSqlBatchCommandList
-        {
-            get
-            {
-                return ResourceManager.GetString("ADP_NoSqlBatchCommandList", resourceCulture);
+        internal static string DbConnection_InfoMessage {
+            get {
+                return ResourceManager.GetString("DbConnection_InfoMessage", resourceCulture);
             }
         }
-
+        
         /// <summary>
-        ///   Looks up a localized string similar to The stored procedure &apos;{0}&apos; doesn&apos;t exist..
+        ///   Looks up a localized string similar to The ConnectionState indicating whether the connection is open or closed..
         /// </summary>
-        internal static string ADP_NoStoredProcedureExists {
+        internal static string DbConnection_State {
             get {
-                return ResourceManager.GetString("ADP_NoStoredProcedureExists", resourceCulture);
+                return ResourceManager.GetString("DbConnection_State", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Given security element is not a permission element..
+        ///   Looks up a localized string similar to Declares the application workload type when connecting to a server..
         /// </summary>
-        internal static string ADP_NotAPermissionElement {
+        internal static string DbConnectionString_ApplicationIntent {
             get {
-                return ResourceManager.GetString("ADP_NotAPermissionElement", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_ApplicationIntent", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Metadata must be SqlDbType.Row.
+        ///   Looks up a localized string similar to The name of the application..
         /// </summary>
-        internal static string ADP_NotRowType {
+        internal static string DbConnectionString_ApplicationName {
             get {
-                return ResourceManager.GetString("ADP_NotRowType", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_ApplicationName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The {0} enumeration value, {1}, is not supported by the {2} method..
+        ///   Looks up a localized string similar to The name of the primary file, including the full path name, of an attachable database..
         /// </summary>
-        internal static string ADP_NotSupportedEnumerationValue {
+        internal static string DbConnectionString_AttachDBFilename {
             get {
-                return ResourceManager.GetString("ADP_NotSupportedEnumerationValue", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_AttachDBFilename", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unexpected null DataSet argument..
+        ///   Looks up a localized string similar to Specifies the method of authenticating with SQL Server..
         /// </summary>
-        internal static string ADP_NullDataSet {
+        internal static string DbConnectionString_Authentication {
             get {
-                return ResourceManager.GetString("ADP_NullDataSet", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_Authentication", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unexpected null DataTable argument.
+        ///   Looks up a localized string similar to When true, indicates the connection state is reset when removed from the pool..
         /// </summary>
-        internal static string ADP_NullDataTable {
+        internal static string DbConnectionString_ConnectionReset {
             get {
-                return ResourceManager.GetString("ADP_NullDataTable", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_ConnectionReset", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The numerical value is too large to fit into a 96 bit decimal..
+        ///   Looks up a localized string similar to Number of attempts to restore connection..
         /// </summary>
-        internal static string ADP_NumericToDecimalOverflow {
+        internal static string DbConnectionString_ConnectRetryCount {
             get {
-                return ResourceManager.GetString("ADP_NumericToDecimalOverflow", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_ConnectRetryCount", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The &apos;{0}&apos; keyword is obsolete. Use &apos;{1}&apos; instead..
+        ///   Looks up a localized string similar to Delay between attempts to restore connection..
         /// </summary>
-        internal static string ADP_ObsoleteKeyword {
+        internal static string DbConnectionString_ConnectRetryInterval {
             get {
-                return ResourceManager.GetString("ADP_ObsoleteKeyword", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_ConnectRetryInterval", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The ODBC provider did not return results from SQLGETTYPEINFO..
+        ///   Looks up a localized string similar to The length of time (in seconds) to wait for a connection to the server before terminating the attempt and generating an error..
         /// </summary>
-        internal static string ADP_OdbcNoTypesFromProvider {
+        internal static string DbConnectionString_ConnectTimeout {
             get {
-                return ResourceManager.GetString("ADP_OdbcNoTypesFromProvider", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_ConnectTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Offset must refer to a location within the value..
+        ///   Looks up a localized string similar to The SQL Server Language record name..
         /// </summary>
-        internal static string ADP_OffsetOutOfRangeException {
+        internal static string DbConnectionString_CurrentLanguage {
             get {
-                return ResourceManager.GetString("ADP_OffsetOutOfRangeException", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_CurrentLanguage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Only specify one item in the dataTables array when using non-zero values for startRecords or maxRecords..
+        ///   Looks up a localized string similar to Indicates the name of the data source to connect to..
         /// </summary>
-        internal static string ADP_OnlyOneTableForStartRecordOrMaxRecords {
+        internal static string DbConnectionString_DataSource {
             get {
-                return ResourceManager.GetString("ADP_OnlyOneTableForStartRecordOrMaxRecords", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_DataSource", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Not allowed to change the &apos;{0}&apos; property. {1}.
+        ///   Looks up a localized string similar to When true, SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed..
         /// </summary>
-        internal static string ADP_OpenConnectionPropertySet {
+        internal static string DbConnectionString_Encrypt {
             get {
-                return ResourceManager.GetString("ADP_OpenConnectionPropertySet", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_Encrypt", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} requires an open and available Connection. {1}.
+        ///   Looks up a localized string similar to Sessions in a Component Services (or MTS, if you are using Microsoft Windows NT) environment should automatically be enlisted in a global transaction where required..
         /// </summary>
-        internal static string ADP_OpenConnectionRequired {
+        internal static string DbConnectionString_Enlist {
             get {
-                return ResourceManager.GetString("ADP_OpenConnectionRequired", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_Enlist", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires the updating command to have an open connection object. {1}.
+        ///   Looks up a localized string similar to The name or network address of the instance of SQL Server that acts as a failover partner..
         /// </summary>
-        internal static string ADP_OpenConnectionRequired_Clone {
+        internal static string DbConnectionString_FailoverPartner {
             get {
-                return ResourceManager.GetString("ADP_OpenConnectionRequired_Clone", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_FailoverPartner", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires the {0}Command to have an open connection object. {1}.
+        ///   Looks up a localized string similar to The service principal name (SPN) of the failover partner..
         /// </summary>
-        internal static string ADP_OpenConnectionRequired_Delete {
+        internal static string DbConnectionString_FailoverPartnerSPN {
             get {
-                return ResourceManager.GetString("ADP_OpenConnectionRequired_Delete", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_FailoverPartnerSPN", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires the {0}Command to have an open connection object. {1}.
+        ///   Looks up a localized string similar to The hostname to be expected in the server&apos;s certificate when encryption is negotiated, if it&apos;s different from the default value derived from Addr/Address/Server..
         /// </summary>
-        internal static string ADP_OpenConnectionRequired_Insert {
+        internal static string DbConnectionString_HostNameInCertificate {
             get {
-                return ResourceManager.GetString("ADP_OpenConnectionRequired_Insert", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_HostNameInCertificate", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires the {0}Command to have an open connection object. {1}.
+        ///   Looks up a localized string similar to The name of the initial catalog or database in the data source..
         /// </summary>
-        internal static string ADP_OpenConnectionRequired_Update {
+        internal static string DbConnectionString_InitialCatalog {
             get {
-                return ResourceManager.GetString("ADP_OpenConnectionRequired_Update", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_InitialCatalog", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There is already an open DataReader associated with this {0} which must be closed first..
+        ///   Looks up a localized string similar to Whether the connection is to be a secure connection or not..
         /// </summary>
-        internal static string ADP_OpenReaderExists {
+        internal static string DbConnectionString_IntegratedSecurity {
             get {
-                return ResourceManager.GetString("ADP_OpenReaderExists", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_IntegratedSecurity", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There is already an open SqlResultSet associated with this command which must be closed first..
+        ///   Looks up a localized string similar to The minimum amount of time (in seconds) for this connection to live in the pool before being destroyed..
         /// </summary>
-        internal static string ADP_OpenResultSetExists {
+        internal static string DbConnectionString_LoadBalanceTimeout {
             get {
-                return ResourceManager.GetString("ADP_OpenResultSetExists", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_LoadBalanceTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Operation aborted..
+        ///   Looks up a localized string similar to The maximum number of connections allowed in the pool..
         /// </summary>
-        internal static string ADP_OperationAborted {
+        internal static string DbConnectionString_MaxPoolSize {
             get {
-                return ResourceManager.GetString("ADP_OperationAborted", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_MaxPoolSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Operation aborted due to an exception (see InnerException for details)..
+        ///   Looks up a localized string similar to The minimum number of connections allowed in the pool..
         /// </summary>
-        internal static string ADP_OperationAbortedExceptionMessage {
+        internal static string DbConnectionString_MinPoolSize {
             get {
-                return ResourceManager.GetString("ADP_OperationAbortedExceptionMessage", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_MinPoolSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} does not support parallel transactions..
+        ///   Looks up a localized string similar to When true, multiple result sets can be returned and read from one connection..
         /// </summary>
-        internal static string ADP_ParallelTransactionsNotSupported {
+        internal static string DbConnectionString_MultipleActiveResultSets {
             get {
-                return ResourceManager.GetString("ADP_ParallelTransactionsNotSupported", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_MultipleActiveResultSets", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to convert parameter value from a {0} to a {1}..
+        ///   Looks up a localized string similar to If your application is connecting to a high-availability, disaster recovery (AlwaysOn) availability group (AG) on different subnets, MultiSubnetFailover=Yes configures SqlConnection to provide faster detection of and connection to the (currently) active server..
         /// </summary>
-        internal static string ADP_ParameterConversionFailed {
+        internal static string DbConnectionString_MultiSubnetFailover {
             get {
-                return ResourceManager.GetString("ADP_ParameterConversionFailed", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_MultiSubnetFailover", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parameter value &apos;{0}&apos; is out of range..
+        ///   Looks up a localized string similar to The network library used to establish a connection to an instance of SQL Server..
         /// </summary>
-        internal static string ADP_ParameterValueOutOfRange {
+        internal static string DbConnectionString_NetworkLibrary {
             get {
-                return ResourceManager.GetString("ADP_ParameterValueOutOfRange", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_NetworkLibrary", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Can not start another operation while there is an asynchronous operation pending..
+        ///   Looks up a localized string similar to Size in bytes of the network packets used to communicate with an instance of SQL Server..
         /// </summary>
-        internal static string ADP_PendingAsyncOperation {
+        internal static string DbConnectionString_PacketSize {
             get {
-                return ResourceManager.GetString("ADP_PendingAsyncOperation", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_PacketSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Type mismatch..
+        ///   Looks up a localized string similar to Indicates the password to be used when connecting to the data source..
         /// </summary>
-        internal static string ADP_PermissionTypeMismatch {
+        internal static string DbConnectionString_Password {
             get {
-                return ResourceManager.GetString("ADP_PermissionTypeMismatch", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_Password", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached..
+        ///   Looks up a localized string similar to When false, security-sensitive information, such as the password, is not returned as part of the connection if the connection is open or has ever been in an open state..
         /// </summary>
-        internal static string ADP_PooledOpenTimeout {
+        internal static string DbConnectionString_PersistSecurityInfo {
             get {
-                return ResourceManager.GetString("ADP_PooledOpenTimeout", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_PersistSecurityInfo", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0}.Prepare method requires parameters of type &apos;{1}&apos; have an explicitly set Precision and Scale..
+        ///   Looks up a localized string similar to Defines the blocking period behavior for a connection pool..
         /// </summary>
-        internal static string ADP_PrepareParameterScale {
+        internal static string DbConnectionString_PoolBlockingPeriod {
             get {
-                return ResourceManager.GetString("ADP_PrepareParameterScale", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_PoolBlockingPeriod", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0}.Prepare method requires all variable length parameters to have an explicitly set non-zero Size..
+        ///   Looks up a localized string similar to When true, the connection object is drawn from the appropriate pool, or if necessary, is created and added to the appropriate pool..
         /// </summary>
-        internal static string ADP_PrepareParameterSize {
+        internal static string DbConnectionString_Pooling {
             get {
-                return ResourceManager.GetString("ADP_PrepareParameterSize", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_Pooling", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0}.Prepare method requires all parameters to have an explicitly set type..
+        ///   Looks up a localized string similar to Used by SQL Server in Replication..
         /// </summary>
-        internal static string ADP_PrepareParameterType {
+        internal static string DbConnectionString_Replication {
             get {
-                return ResourceManager.GetString("ADP_PrepareParameterType", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_Replication", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The &apos;{0}&apos; property requires Microsoft WindowsNT or a WindowsNT based operating system..
+        ///   Looks up a localized string similar to The path to a certificate file to match against the SQL Server TLS/SSL certificate..
         /// </summary>
-        internal static string ADP_PropertyNotSupported {
+        internal static string DbConnectionString_ServerCertificate {
             get {
-                return ResourceManager.GetString("ADP_PropertyNotSupported", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_ServerCertificate", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} requires open connection when the quote prefix has not been set..
+        ///   Looks up a localized string similar to The service principal name (SPN) of the server..
         /// </summary>
-        internal static string ADP_QuotePrefixNotSet {
+        internal static string DbConnectionString_ServerSPN {
             get {
-                return ResourceManager.GetString("ADP_QuotePrefixNotSet", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_ServerSPN", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to When batching, the command&apos;s UpdatedRowSource property value of UpdateRowSource.FirstReturnedRecord or UpdateRowSource.Both is invalid..
+        ///   Looks up a localized string similar to Indicates binding behavior of connection to a System.Transactions Transaction when enlisted..
         /// </summary>
-        internal static string ADP_ResultsNotAllowedDuringBatch {
+        internal static string DbConnectionString_TransactionBinding {
             get {
-                return ResourceManager.GetString("ADP_ResultsNotAllowedDuringBatch", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_TransactionBinding", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to RowUpdatedEvent: Errors occurred; no additional is information available..
+        ///   Looks up a localized string similar to If your application connects to different networks, TransparentNetworkIPResolution=Yes configures SqlConnection to provide transparent connection resolution to the currently active server, independently of the network IP topology..
         /// </summary>
-        internal static string ADP_RowUpdatedErrors {
+        internal static string DbConnectionString_TransparentNetworkIPResolution {
             get {
-                return ResourceManager.GetString("ADP_RowUpdatedErrors", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_TransparentNetworkIPResolution", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to RowUpdatingEvent: Errors occurred; no additional is information available..
+        ///   Looks up a localized string similar to When true (and encrypt=true), SQL Server uses SSL encryption for all data sent between the client and server without validating the server certificate..
         /// </summary>
-        internal static string ADP_RowUpdatingErrors {
+        internal static string DbConnectionString_TrustServerCertificate {
             get {
-                return ResourceManager.GetString("ADP_RowUpdatingErrors", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_TrustServerCertificate", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The only acceptable value for the property &apos;{0}&apos; is &apos;{1}&apos;..
+        ///   Looks up a localized string similar to Indicates which server type system the provider will expose through the DataReader..
         /// </summary>
-        internal static string ADP_SingleValuedProperty {
+        internal static string DbConnectionString_TypeSystemVersion {
             get {
-                return ResourceManager.GetString("ADP_SingleValuedProperty", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_TypeSystemVersion", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to {0} when stream is closed..
+        ///   Looks up a localized string similar to Indicates the user ID to be used when connecting to the data source..
         /// </summary>
-        internal static string ADP_StreamClosed {
+        internal static string DbConnectionString_UserID {
             get {
-                return ResourceManager.GetString("ADP_StreamClosed", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_UserID", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The transaction assigned to this command must be the most nested pending local transaction..
+        ///   Looks up a localized string similar to Indicates whether the connection will be re-directed to connect to an instance of SQL Server running under the user&apos;s account..
         /// </summary>
-        internal static string ADP_TransactionCompleted {
+        internal static string DbConnectionString_UserInstance {
             get {
-                return ResourceManager.GetString("ADP_TransactionCompleted", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_UserInstance", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The transaction associated with the current connection has completed but has not been disposed.  The transaction must be disposed before the connection can be used to execute SQL statements..
+        ///   Looks up a localized string similar to The name of the workstation connecting to SQL Server..
         /// </summary>
-        internal static string ADP_TransactionCompletedButNotDisposed {
+        internal static string DbConnectionString_WorkstationID {
             get {
-                return ResourceManager.GetString("ADP_TransactionCompletedButNotDisposed", resourceCulture);
+                return ResourceManager.GetString("DbConnectionString_WorkstationID", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The transaction is either not associated with the current connection or has been completed..
+        ///   Looks up a localized string similar to Used during Update for deleted rows in DataSet..
         /// </summary>
-        internal static string ADP_TransactionConnectionMismatch {
+        internal static string DbDataAdapter_DeleteCommand {
             get {
-                return ResourceManager.GetString("ADP_TransactionConnectionMismatch", resourceCulture);
+                return ResourceManager.GetString("DbDataAdapter_DeleteCommand", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection currently has transaction enlisted.  Finish current transaction and retry..
+        ///   Looks up a localized string similar to Used during Update for new rows in DataSet..
         /// </summary>
-        internal static string ADP_TransactionPresent {
+        internal static string DbDataAdapter_InsertCommand {
             get {
-                return ResourceManager.GetString("ADP_TransactionPresent", resourceCulture);
+                return ResourceManager.GetString("DbDataAdapter_InsertCommand", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} requires the command to have a transaction when the connection assigned to the command is in a pending local transaction.  The Transaction property of the command has not been initialized..
+        ///   Looks up a localized string similar to Event triggered before every DataRow during Update..
         /// </summary>
-        internal static string ADP_TransactionRequired {
+        internal static string DbDataAdapter_RowUpdated {
             get {
-                return ResourceManager.GetString("ADP_TransactionRequired", resourceCulture);
+                return ResourceManager.GetString("DbDataAdapter_RowUpdated", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This {0} has completed; it is no longer usable..
+        ///   Looks up a localized string similar to Event triggered after every DataRow during Update..
         /// </summary>
-        internal static string ADP_TransactionZombied {
+        internal static string DbDataAdapter_RowUpdating {
             get {
-                return ResourceManager.GetString("ADP_TransactionZombied", resourceCulture);
+                return ResourceManager.GetString("DbDataAdapter_RowUpdating", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to load the UDL file..
+        ///   Looks up a localized string similar to Used during Fill/FillSchema..
         /// </summary>
-        internal static string ADP_UdlFileError {
+        internal static string DbDataAdapter_SelectCommand {
             get {
-                return ResourceManager.GetString("ADP_UdlFileError", resourceCulture);
+                return ResourceManager.GetString("DbDataAdapter_SelectCommand", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Can not determine the correct boolean literal values. Boolean literals can not be created..
+        ///   Looks up a localized string similar to Used during Update for modified rows in DataSet..
         /// </summary>
-        internal static string ADP_UnableToCreateBooleanLiteral {
+        internal static string DbDataAdapter_UpdateCommand {
             get {
-                return ResourceManager.GetString("ADP_UnableToCreateBooleanLiteral", resourceCulture);
+                return ResourceManager.GetString("DbDataAdapter_UpdateCommand", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {1}[{0}]: the Size property has an invalid size of 0..
+        ///   Looks up a localized string similar to Internal error occurred when retrying the download of the HGS root certificate after the initial request failed. Contact Customer Support Services..
         /// </summary>
-        internal static string ADP_UninitializedParameterSize {
+        internal static string EnclaveRetrySleepInSecondsValueException {
             get {
-                return ResourceManager.GetString("ADP_UninitializedParameterSize", resourceCulture);
+                return ResourceManager.GetString("EnclaveRetrySleepInSecondsValueException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No mapping exists from object type {0} to a known managed provider native type..
+        ///   Looks up a localized string similar to Internal error. Unable to invalidate the requested enclave session, because it does not exist in the cache. Contact Customer Support Services..
         /// </summary>
-        internal static string ADP_UnknownDataType {
+        internal static string EnclaveSessionInvalidationFailed {
             get {
-                return ResourceManager.GetString("ADP_UnknownDataType", resourceCulture);
+                return ResourceManager.GetString("EnclaveSessionInvalidationFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to handle an unknown TypeCode {0} returned by Type {1}..
+        ///   Looks up a localized string similar to The validation of an attestation token failed. The token received from SQL Server is expired. Contact Customer Support Services..
         /// </summary>
-        internal static string ADP_UnknownDataTypeCode {
+        internal static string ExpiredAttestationToken {
             get {
-                return ResourceManager.GetString("ADP_UnknownDataTypeCode", resourceCulture);
+                return ResourceManager.GetString("ExpiredAttestationToken", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Literals of the native data type associated with data type &apos;{0}&apos; are not supported..
+        ///   Looks up a localized string similar to Failed to create enclave session as attestation server is busy..
         /// </summary>
-        internal static string ADP_UnsupportedNativeDataTypeOleDb {
+        internal static string FailToCreateEnclaveSession {
             get {
-                return ResourceManager.GetString("ADP_UnsupportedNativeDataTypeOleDb", resourceCulture);
+                return ResourceManager.GetString("FailToCreateEnclaveSession", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The StatementType {0} is not expected here..
+        ///   Looks up a localized string similar to The validation of an attestation information failed. The attestation information has an invalid format. Contact Customer Support Services. Error details: &apos;{0}&apos;..
         /// </summary>
-        internal static string ADP_UnwantedStatementType {
+        internal static string FailToParseAttestationInfo {
             get {
-                return ResourceManager.GetString("ADP_UnwantedStatementType", resourceCulture);
+                return ResourceManager.GetString("FailToParseAttestationInfo", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Concurrency violation: the batched command affected {0} of the expected {1} records..
+        ///   Looks up a localized string similar to The validation of an attestation token failed. The token has an invalid format. Contact Customer Support Services. Error details: &apos;{0}&apos;..
         /// </summary>
-        internal static string ADP_UpdateConcurrencyViolation_Batch {
+        internal static string FailToParseAttestationToken {
             get {
-                return ResourceManager.GetString("ADP_UpdateConcurrencyViolation_Batch", resourceCulture);
+                return ResourceManager.GetString("FailToParseAttestationToken", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Concurrency violation: the DeleteCommand affected {0} of the expected {1} records..
+        ///   Looks up a localized string similar to The attestation service returned an expired HGS root certificate for attestation URL &apos;{0}&apos;. Check the HGS root certificate configured for your HGS instance - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details..
         /// </summary>
-        internal static string ADP_UpdateConcurrencyViolation_Delete {
+        internal static string GetAttestationSigningCertificateFailedInvalidCertificate {
             get {
-                return ResourceManager.GetString("ADP_UpdateConcurrencyViolation_Delete", resourceCulture);
+                return ResourceManager.GetString("GetAttestationSigningCertificateFailedInvalidCertificate", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Concurrency violation: the UpdateCommand affected {0} of the expected {1} records..
+        ///   Looks up a localized string similar to The obtained HGS root certificate for attestation URL &apos;{0}&apos; has an invalid format. Verify the attestation URL is correct and the HGS server is online and fully initialized - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. For additional support contact Customer Support Services. Error details: &apos;{1}&apos;..
         /// </summary>
-        internal static string ADP_UpdateConcurrencyViolation_Update {
+        internal static string GetAttestationSigningCertificateRequestFailedFormat {
             get {
-                return ResourceManager.GetString("ADP_UpdateConcurrencyViolation_Update", resourceCulture);
+                return ResourceManager.GetString("GetAttestationSigningCertificateRequestFailedFormat", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataRow[{0}] is from a different DataTable than DataRow[0]..
+        ///   Looks up a localized string similar to The validation of an attestation token failed. Cannot retrieve a public key from the attestation public key endpoint, or the retrieved key has an invalid format. Error details: &apos;{0}&apos;..
         /// </summary>
-        internal static string ADP_UpdateMismatchRowTable {
+        internal static string GetAttestationTokenSigningKeysFailed {
             get {
-                return ResourceManager.GetString("ADP_UpdateMismatchRowTable", resourceCulture);
+                return ResourceManager.GetString("GetAttestationTokenSigningKeysFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires the command clone to be valid..
+        ///   Looks up a localized string similar to Signature verification of the enclave&apos;s Diffie-Hellman key failed. Contact Customer Support Services..
         /// </summary>
-        internal static string ADP_UpdateRequiresCommandClone {
+        internal static string GetSharedSecretFailed {
             get {
-                return ResourceManager.GetString("ADP_UpdateRequiresCommandClone", resourceCulture);
+                return ResourceManager.GetString("GetSharedSecretFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires a valid DeleteCommand when passed DataRow collection with deleted rows..
+        ///   Looks up a localized string similar to Global Transactions are not enabled for this Azure SQL Database. Please contact Azure SQL Database support for assistance..
         /// </summary>
-        internal static string ADP_UpdateRequiresCommandDelete {
+        internal static string GT_Disabled {
             get {
-                return ResourceManager.GetString("ADP_UpdateRequiresCommandDelete", resourceCulture);
+                return ResourceManager.GetString("GT_Disabled", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires a valid InsertCommand when passed DataRow collection with new rows..
+        ///   Looks up a localized string similar to The currently loaded System.Transactions.dll does not support Global Transactions. Please upgrade to .NET Framework 4.6.2 or later..
         /// </summary>
-        internal static string ADP_UpdateRequiresCommandInsert {
+        internal static string GT_UnsupportedSysTxVersion {
             get {
-                return ResourceManager.GetString("ADP_UpdateRequiresCommandInsert", resourceCulture);
+                return ResourceManager.GetString("GT_UnsupportedSysTxVersion", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Auto SQL generation during Update requires a valid SelectCommand..
+        ///   Looks up a localized string similar to There are no records in the SqlDataRecord enumeration. To send a table-valued parameter with no rows, use a null reference for the value instead..
         /// </summary>
-        internal static string ADP_UpdateRequiresCommandSelect {
+        internal static string IEnumerableOfSqlDataRecordHasNoRows {
             get {
-                return ResourceManager.GetString("ADP_UpdateRequiresCommandSelect", resourceCulture);
+                return ResourceManager.GetString("IEnumerableOfSqlDataRecordHasNoRows", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update requires a valid UpdateCommand when passed DataRow collection with modified rows..
+        ///   Looks up a localized string similar to The validation of an attestation token failed due to an error while decoding the enclave public key obtained from SQL Server. Contact Customer Support Services..
         /// </summary>
-        internal static string ADP_UpdateRequiresCommandUpdate {
+        internal static string InvalidArgumentToBase64UrlDecoder {
             get {
-                return ResourceManager.GetString("ADP_UpdateRequiresCommandUpdate", resourceCulture);
+                return ResourceManager.GetString("InvalidArgumentToBase64UrlDecoder", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update unable to find TableMapping[&apos;{0}&apos;] or DataTable &apos;{0}&apos;..
+        ///   Looks up a localized string similar to The validation of an attestation token failed due to an error while computing a hash of the enclave public key obtained from SQL Server. Contact Customer Support Services..
         /// </summary>
-        internal static string ADP_UpdateRequiresSourceTable {
+        internal static string InvalidArgumentToSHA256 {
             get {
-                return ResourceManager.GetString("ADP_UpdateRequiresSourceTable", resourceCulture);
+                return ResourceManager.GetString("InvalidArgumentToSHA256", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update: expected a non-empty SourceTable name..
+        ///   Looks up a localized string similar to The validation of the attestation token has failed during signature validation. Exception: &apos;{0}&apos;..
         /// </summary>
-        internal static string ADP_UpdateRequiresSourceTableName {
+        internal static string InvalidAttestationToken {
             get {
-                return ResourceManager.GetString("ADP_UpdateRequiresSourceTableName", resourceCulture);
+                return ResourceManager.GetString("InvalidAttestationToken", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The version of SQL Server in use does not support datatype &apos;{0}&apos;..
+        ///   Looks up a localized string similar to The validation of an attestation token failed. Claim &apos;{0}&apos; in the token has an invalid value of &apos;{1}&apos;. Verify the attestation policy - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If the policy is correct, contact Customer Support Services..
         /// </summary>
-        internal static string ADP_VersionDoesNotSupportDataType {
+        internal static string InvalidClaimInAttestationToken {
             get {
-                return ResourceManager.GetString("ADP_VersionDoesNotSupportDataType", resourceCulture);
+                return ResourceManager.GetString("InvalidClaimInAttestationToken", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Destination array is not long enough to copy all the items in the collection. Check array index and length..
+        ///   Looks up a localized string similar to Invalid column ordinals in schema table.  ColumnOrdinals, if present, must not have duplicates or gaps..
         /// </summary>
-        internal static string Arg_ArrayPlusOffTooSmall {
+        internal static string InvalidSchemaTableOrdinals {
             get {
-                return ResourceManager.GetString("Arg_ArrayPlusOffTooSmall", resourceCulture);
+                return ResourceManager.GetString("InvalidSchemaTableOrdinals", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Only single dimensional arrays are supported for the requested action..
+        ///   Looks up a localized string similar to Local Database Runtime: system.data.localdb configuration file section is of unknown type..
         /// </summary>
-        internal static string Arg_RankMultiDimNotSupported {
+        internal static string LocalDB_BadConfigSectionType {
             get {
-                return ResourceManager.GetString("Arg_RankMultiDimNotSupported", resourceCulture);
+                return ResourceManager.GetString("LocalDB_BadConfigSectionType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove the specified item because it was not found in the specified Collection..
+        ///   Looks up a localized string similar to Local Database Runtime: Cannot create named instance..
         /// </summary>
-        internal static string Arg_RemoveArgNotFound {
+        internal static string LocalDB_CreateFailed {
             get {
-                return ResourceManager.GetString("Arg_RemoveArgNotFound", resourceCulture);
+                return ResourceManager.GetString("LocalDB_CreateFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Non-negative number required..
+        ///   Looks up a localized string similar to Local Database Runtime: Cannot load SQLUserInstance.dll..
         /// </summary>
-        internal static string ArgumentOutOfRange_NeedNonNegNum {
+        internal static string LocalDB_FailedGetDLLHandle {
             get {
-                return ResourceManager.GetString("ArgumentOutOfRange_NeedNonNegNum", resourceCulture);
+                return ResourceManager.GetString("LocalDB_FailedGetDLLHandle", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Buffer advanced too far {0}.
+        ///   Looks up a localized string similar to Local Database Runtime: Invalid instance version specification found in the configuration file..
         /// </summary>
-        internal static string ArrayBufferWriterAdvancedTooFar {
+        internal static string LocalDB_InvalidVersion {
             get {
-                return ResourceManager.GetString("ArrayBufferWriterAdvancedTooFar", resourceCulture);
+                return ResourceManager.GetString("LocalDB_InvalidVersion", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Buffer maximum size exceeded: {0}.
+        ///   Looks up a localized string similar to Invalid SQLUserInstance.dll found at the location specified in the registry. Verify that the Local Database Runtime feature of SQL Server Express is properly installed..
         /// </summary>
-        internal static string ArrayBufferWriterMaximumSizeExceeded {
+        internal static string LocalDB_MethodNotFound {
             get {
-                return ResourceManager.GetString("ArrayBufferWriterMaximumSizeExceeded", resourceCulture);
+                return ResourceManager.GetString("LocalDB_MethodNotFound", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The validation of an attestation token failed. The token signature does not match the computed signature using a public key retrieved from the attestation public key endpoint at &apos;{0}&apos;. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If correct, contact Customer Support Services..
+        ///   Looks up a localized string similar to Cannot obtain Local Database Runtime error message.
         /// </summary>
-        internal static string AttestationTokenSignatureValidationFailed {
+        internal static string LocalDB_UnobtainableMessage {
             get {
-                return ResourceManager.GetString("AttestationTokenSignatureValidationFailed", resourceCulture);
+                return ResourceManager.GetString("LocalDB_UnobtainableMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There is more than one table with the same name &apos;{0}&apos; (even if namespace is different)..
+        ///   Looks up a localized string similar to LocalDB is not supported on this platform..
         /// </summary>
-        internal static string CodeGen_DuplicateTableName {
+        internal static string LocalDBNotSupported {
             get {
-                return ResourceManager.GetString("CodeGen_DuplicateTableName", resourceCulture);
+                return ResourceManager.GetString("LocalDBNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot generate identifier for name &apos;{0}&apos;..
+        ///   Looks up a localized string similar to The collection name &apos;{0}&apos; matches at least two collections with the same name but with different case, but does not match any of them exactly..
         /// </summary>
-        internal static string CodeGen_InvalidIdentifier {
+        internal static string MDF_AmbiguousCollectionName {
             get {
-                return ResourceManager.GetString("CodeGen_InvalidIdentifier", resourceCulture);
+                return ResourceManager.GetString("MDF_AmbiguousCollectionName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos;: Type &apos;{1}&apos; does not have parameterless constructor..
+        ///   Looks up a localized string similar to There are multiple collections named &apos;{0}&apos;..
         /// </summary>
-        internal static string CodeGen_NoCtor0 {
+        internal static string MDF_CollectionNameISNotUnique {
             get {
-                return ResourceManager.GetString("CodeGen_NoCtor0", resourceCulture);
+                return ResourceManager.GetString("MDF_CollectionNameISNotUnique", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos;: Type &apos;{1}&apos; does not have constructor with string argument..
+        ///   Looks up a localized string similar to The collection &apos;{0}&apos; is missing from the metadata XML..
         /// </summary>
-        internal static string CodeGen_NoCtor1 {
+        internal static string MDF_DataTableDoesNotExist {
             get {
-                return ResourceManager.GetString("CodeGen_NoCtor1", resourceCulture);
+                return ResourceManager.GetString("MDF_DataTableDoesNotExist", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos;: Type &apos;{1}&apos; cannot be null..
+        ///   Looks up a localized string similar to The metadata XML is invalid. The {1} column of the {0} collection must contain a non-empty string..
         /// </summary>
-        internal static string CodeGen_TypeCantBeNull {
+        internal static string MDF_InvalidXmlInvalidValue {
             get {
-                return ResourceManager.GetString("CodeGen_TypeCantBeNull", resourceCulture);
+                return ResourceManager.GetString("MDF_InvalidXmlInvalidValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs whenever this collection&apos;s membership changes..
+        ///   Looks up a localized string similar to A restriction exists for which there is no matching row in the restrictions collection..
         /// </summary>
-        internal static string collectionChangedEventDescr {
+        internal static string MDF_MissingRestrictionRow {
             get {
-                return ResourceManager.GetString("collectionChangedEventDescr", resourceCulture);
+                return ResourceManager.GetString("MDF_MissingRestrictionRow", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Only elements allowed..
+        ///   Looks up a localized string similar to The schema table contains no columns..
         /// </summary>
-        internal static string ConfigBaseElementsOnly {
+        internal static string MDF_NoColumns {
             get {
-                return ResourceManager.GetString("ConfigBaseElementsOnly", resourceCulture);
+                return ResourceManager.GetString("MDF_NoColumns", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Child nodes not allowed..
+        ///   Looks up a localized string similar to Unable to build the &apos;{0}&apos; collection because execution of the SQL query failed. See the inner exception for details..
         /// </summary>
-        internal static string ConfigBaseNoChildNodes {
+        internal static string MDF_QueryFailed {
             get {
-                return ResourceManager.GetString("ConfigBaseNoChildNodes", resourceCulture);
+                return ResourceManager.GetString("MDF_QueryFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The requested .NET Framework Data Provider&apos;s implementation does not have an Instance field of a System.Data.Common.DbProviderFactory derived type..
+        ///   Looks up a localized string similar to More restrictions were provided than the requested schema (&apos;{0}&apos;) supports..
         /// </summary>
-        internal static string ConfigProviderInvalid {
+        internal static string MDF_TooManyRestrictions {
             get {
-                return ResourceManager.GetString("ConfigProviderInvalid", resourceCulture);
+                return ResourceManager.GetString("MDF_TooManyRestrictions", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The missing .NET Framework Data Provider&apos;s assembly qualified name is required..
+        ///   Looks up a localized string similar to Unable to build schema collection &apos;{0}&apos;;.
         /// </summary>
-        internal static string ConfigProviderMissing {
+        internal static string MDF_UnableToBuildCollection {
             get {
-                return ResourceManager.GetString("ConfigProviderMissing", resourceCulture);
+                return ResourceManager.GetString("MDF_UnableToBuildCollection", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to find the requested .NET Framework Data Provider.  It may not be installed..
+        ///   Looks up a localized string similar to The requested collection ({0}) is not defined..
         /// </summary>
-        internal static string ConfigProviderNotFound {
+        internal static string MDF_UndefinedCollection {
             get {
-                return ResourceManager.GetString("ConfigProviderNotFound", resourceCulture);
+                return ResourceManager.GetString("MDF_UndefinedCollection", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to find or load the registered .NET Framework Data Provider..
+        ///   Looks up a localized string similar to The population mechanism &apos;{0}&apos; is not defined..
         /// </summary>
-        internal static string ConfigProviderNotInstalled {
+        internal static string MDF_UndefinedPopulationMechanism {
             get {
-                return ResourceManager.GetString("ConfigProviderNotInstalled", resourceCulture);
+                return ResourceManager.GetString("MDF_UndefinedPopulationMechanism", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Required attribute &apos;{0}&apos; cannot be empty..
+        ///   Looks up a localized string similar to The requested collection ({0}) is not supported by this version of the provider..
         /// </summary>
-        internal static string ConfigRequiredAttributeEmpty {
+        internal static string MDF_UnsupportedVersion {
             get {
-                return ResourceManager.GetString("ConfigRequiredAttributeEmpty", resourceCulture);
+                return ResourceManager.GetString("MDF_UnsupportedVersion", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Required attribute &apos;{0}&apos; not found..
+        ///   Looks up a localized string similar to The validation of the attestation token failed. Claim &apos;{0}&apos; is missing in the token. Verify the attestation policy - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If the policy is correct, contact Customer Support Services..
         /// </summary>
-        internal static string ConfigRequiredAttributeMissing {
+        internal static string MissingClaimInAttestationToken {
             get {
-                return ResourceManager.GetString("ConfigRequiredAttributeMissing", resourceCulture);
+                return ResourceManager.GetString("MissingClaimInAttestationToken", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The &apos;{0}&apos; section can only appear once per config file..
+        ///   Looks up a localized string similar to The specified value is not valid in the &apos;{0}&apos; enumeration..
         /// </summary>
-        internal static string ConfigSectionsUnique {
+        internal static string net_invalid_enum {
             get {
-                return ResourceManager.GetString("ConfigSectionsUnique", resourceCulture);
+                return ResourceManager.GetString("net_invalid_enum", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unrecognized attribute &apos;{0}&apos;..
+        ///   Looks up a localized string similar to This method is not implemented by this class..
         /// </summary>
-        internal static string ConfigUnrecognizedAttributes {
+        internal static string net_MethodNotImplementedException {
             get {
-                return ResourceManager.GetString("ConfigUnrecognizedAttributes", resourceCulture);
+                return ResourceManager.GetString("net_MethodNotImplementedException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unrecognized element..
+        ///   Looks up a localized string similar to DateType column for field &apos;{0}&apos; in schema table is null.  DataType must be non-null..
         /// </summary>
-        internal static string ConfigUnrecognizedElement {
+        internal static string NullSchemaTableDataTypeNotSupported {
             get {
-                return ResourceManager.GetString("ConfigUnrecognizedElement", resourceCulture);
+                return ResourceManager.GetString("NullSchemaTableDataTypeNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the name of this constraint..
+        ///   Looks up a localized string similar to Security Warning: The negotiated {0} is an insecure protocol and is supported for backward compatibility only. The recommended protocol version is TLS 1.2 and later..
         /// </summary>
-        internal static string ConstraintNameDescr {
+        internal static string SEC_ProtocolWarning {
             get {
-                return ResourceManager.GetString("ConstraintNameDescr", resourceCulture);
+                return ResourceManager.GetString("SEC_ProtocolWarning", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the table of this constraint..
+        ///   Looks up a localized string similar to I/O Error detected in read/write operation.
         /// </summary>
-        internal static string ConstraintTableDescr {
+        internal static string SNI_ERROR_1 {
             get {
-                return ResourceManager.GetString("ConstraintTableDescr", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_1", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; argument contains null value..
+        ///   Looks up a localized string similar to Socket is null.
         /// </summary>
-        internal static string Data_ArgumentContainsNull {
+        internal static string SNI_ERROR_10 {
             get {
-                return ResourceManager.GetString("Data_ArgumentContainsNull", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_10", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; argument cannot be null..
+        ///   Looks up a localized string similar to Timeout error.
         /// </summary>
-        internal static string Data_ArgumentNull {
+        internal static string SNI_ERROR_11 {
             get {
-                return ResourceManager.GetString("Data_ArgumentNull", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_11", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; argument is out of range..
+        ///   Looks up a localized string similar to No server name supplied.
         /// </summary>
-        internal static string Data_ArgumentOutOfRange {
+        internal static string SNI_ERROR_12 {
             get {
-                return ResourceManager.GetString("Data_ArgumentOutOfRange", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_12", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Collection itself is not modifiable..
+        ///   Looks up a localized string similar to TerminateListener() has been called.
         /// </summary>
-        internal static string Data_CannotModifyCollection {
+        internal static string SNI_ERROR_13 {
             get {
-                return ResourceManager.GetString("Data_CannotModifyCollection", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_13", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The given name &apos;{0}&apos; matches at least two names in the collection object with different cases, but does not match either of them with the same case..
+        ///   Looks up a localized string similar to Win9x not supported.
         /// </summary>
-        internal static string Data_CaseInsensitiveNameConflict {
+        internal static string SNI_ERROR_14 {
             get {
-                return ResourceManager.GetString("Data_CaseInsensitiveNameConflict", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_14", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to enable constraints. One or more rows contain values violating non-null, unique, or foreign-key constraints..
+        ///   Looks up a localized string similar to Function not supported.
         /// </summary>
-        internal static string Data_EnforceConstraints {
+        internal static string SNI_ERROR_15 {
             get {
-                return ResourceManager.GetString("Data_EnforceConstraints", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_15", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection..
+        ///   Looks up a localized string similar to Shared-Memory heap error.
         /// </summary>
-        internal static string Data_InvalidOffsetLength {
+        internal static string SNI_ERROR_16 {
             get {
-                return ResourceManager.GetString("Data_InvalidOffsetLength", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_16", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The given name &apos;{0}&apos; matches at least two names in the collection object with different namespaces..
+        ///   Looks up a localized string similar to Cannot find an ip/ipv6 type address to connect.
         /// </summary>
-        internal static string Data_NamespaceNameConflict {
+        internal static string SNI_ERROR_17 {
             get {
-                return ResourceManager.GetString("Data_NamespaceNameConflict", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_17", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Whether or not Fill will call DataRow.AcceptChanges..
+        ///   Looks up a localized string similar to Connection has been closed by peer.
         /// </summary>
-        internal static string DataAdapter_AcceptChangesDuringFill {
+        internal static string SNI_ERROR_18 {
             get {
-                return ResourceManager.GetString("DataAdapter_AcceptChangesDuringFill", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_18", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Whether or not Update will call DataRow.AcceptChanges..
+        ///   Looks up a localized string similar to Physical connection is not usable.
         /// </summary>
-        internal static string DataAdapter_AcceptChangesDuringUpdate {
+        internal static string SNI_ERROR_19 {
             get {
-                return ResourceManager.GetString("DataAdapter_AcceptChangesDuringUpdate", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_19", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Whether or not to continue to the next DataRow when the Update events, RowUpdating and RowUpdated, Status is UpdateStatus.ErrorsOccurred..
+        ///   Looks up a localized string similar to Connection was terminated.
         /// </summary>
-        internal static string DataAdapter_ContinueUpdateOnError {
+        internal static string SNI_ERROR_2 {
             get {
-                return ResourceManager.GetString("DataAdapter_ContinueUpdateOnError", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_2", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Event triggered when a recoverable error occurs during Fill..
+        ///   Looks up a localized string similar to Connection has been closed.
         /// </summary>
-        internal static string DataAdapter_FillError {
+        internal static string SNI_ERROR_20 {
             get {
-                return ResourceManager.GetString("DataAdapter_FillError", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_20", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to How the adapter fills the DataTable from the DataReader..
+        ///   Looks up a localized string similar to Encryption is enforced but there is no valid certificate.
         /// </summary>
-        internal static string DataAdapter_FillLoadOption {
+        internal static string SNI_ERROR_21 {
             get {
-                return ResourceManager.GetString("DataAdapter_FillLoadOption", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_21", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The action taken when a table or column in the TableMappings is missing..
+        ///   Looks up a localized string similar to Couldn&apos;t load library.
         /// </summary>
-        internal static string DataAdapter_MissingMappingAction {
+        internal static string SNI_ERROR_22 {
             get {
-                return ResourceManager.GetString("DataAdapter_MissingMappingAction", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_22", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The action taken when a table or column in the DataSet is missing..
+        ///   Looks up a localized string similar to Cannot open a new thread in server process.
         /// </summary>
-        internal static string DataAdapter_MissingSchemaAction {
+        internal static string SNI_ERROR_23 {
             get {
-                return ResourceManager.GetString("DataAdapter_MissingSchemaAction", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_23", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Should Fill return provider specific values or common CLSCompliant values..
+        ///   Looks up a localized string similar to Cannot post event to completion port.
         /// </summary>
-        internal static string DataAdapter_ReturnProviderSpecificTypes {
+        internal static string SNI_ERROR_24 {
             get {
-                return ResourceManager.GetString("DataAdapter_ReturnProviderSpecificTypes", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_24", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to How to map source table to DataSet table..
+        ///   Looks up a localized string similar to Connection string is not valid.
         /// </summary>
-        internal static string DataAdapter_TableMappings {
+        internal static string SNI_ERROR_25 {
             get {
-                return ResourceManager.GetString("DataAdapter_TableMappings", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_25", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Action.
+        ///   Looks up a localized string similar to Error Locating Server/Instance Specified.
         /// </summary>
-        internal static string DataCategory_Action {
+        internal static string SNI_ERROR_26 {
             get {
-                return ResourceManager.GetString("DataCategory_Action", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_26", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Advanced.
+        ///   Looks up a localized string similar to Error getting enabled protocols list from registry.
         /// </summary>
-        internal static string DataCategory_Advanced {
+        internal static string SNI_ERROR_27 {
             get {
-                return ResourceManager.GetString("DataCategory_Advanced", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_27", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Behavior.
+        ///   Looks up a localized string similar to Server doesn&apos;t support requested protocol.
         /// </summary>
-        internal static string DataCategory_Behavior {
+        internal static string SNI_ERROR_28 {
             get {
-                return ResourceManager.GetString("DataCategory_Behavior", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_28", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection Resiliency.
+        ///   Looks up a localized string similar to Shared Memory is not supported for clustered server connectivity.
         /// </summary>
-        internal static string DataCategory_ConnectionResiliency {
+        internal static string SNI_ERROR_29 {
             get {
-                return ResourceManager.GetString("DataCategory_ConnectionResiliency", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_29", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Context.
+        ///   Looks up a localized string similar to Asynchronous operations not supported.
         /// </summary>
-        internal static string DataCategory_Context {
+        internal static string SNI_ERROR_3 {
             get {
-                return ResourceManager.GetString("DataCategory_Context", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_3", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Data.
+        ///   Looks up a localized string similar to Invalid attempt bind to shared memory segment.
         /// </summary>
-        internal static string DataCategory_Data {
+        internal static string SNI_ERROR_30 {
             get {
-                return ResourceManager.GetString("DataCategory_Data", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_30", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Fill.
+        ///   Looks up a localized string similar to Encryption(ssl/tls) handshake failed.
         /// </summary>
-        internal static string DataCategory_Fill {
+        internal static string SNI_ERROR_31 {
             get {
-                return ResourceManager.GetString("DataCategory_Fill", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_31", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to InfoMessage.
+        ///   Looks up a localized string similar to Packet size too large for SSL Encrypt/Decrypt operations.
         /// </summary>
-        internal static string DataCategory_InfoMessage {
+        internal static string SNI_ERROR_32 {
             get {
-                return ResourceManager.GetString("DataCategory_InfoMessage", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_32", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Initialization.
+        ///   Looks up a localized string similar to SSRP error.
         /// </summary>
-        internal static string DataCategory_Initialization {
+        internal static string SNI_ERROR_33 {
             get {
-                return ResourceManager.GetString("DataCategory_Initialization", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_33", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Mapping.
+        ///   Looks up a localized string similar to Could not connect to the Shared Memory pipe.
         /// </summary>
-        internal static string DataCategory_Mapping {
+        internal static string SNI_ERROR_34 {
             get {
-                return ResourceManager.GetString("DataCategory_Mapping", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_34", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Named ConnectionString.
+        ///   Looks up a localized string similar to An internal exception was caught.
         /// </summary>
-        internal static string DataCategory_NamedConnectionString {
+        internal static string SNI_ERROR_35 {
             get {
-                return ResourceManager.GetString("DataCategory_NamedConnectionString", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_35", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Notification.
+        ///   Looks up a localized string similar to The Shared Memory dll used to connect to SQL Server 2000 was not found.
         /// </summary>
-        internal static string DataCategory_Notification {
+        internal static string SNI_ERROR_36 {
             get {
-                return ResourceManager.GetString("DataCategory_Notification", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_36", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Pooling.
+        ///   Looks up a localized string similar to The SQL Server 2000 Shared Memory client dll appears to be invalid/corrupted.
         /// </summary>
-        internal static string DataCategory_Pooling {
+        internal static string SNI_ERROR_37 {
             get {
-                return ResourceManager.GetString("DataCategory_Pooling", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_37", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Replication.
+        ///   Looks up a localized string similar to Cannot open a Shared Memory connection to SQL Server 2000.
         /// </summary>
-        internal static string DataCategory_Replication {
+        internal static string SNI_ERROR_38 {
             get {
-                return ResourceManager.GetString("DataCategory_Replication", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_38", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Schema.
+        ///   Looks up a localized string similar to Shared memory connectivity to SQL Server 2000 is either disabled or not available on this machine.
         /// </summary>
-        internal static string DataCategory_Schema {
+        internal static string SNI_ERROR_39 {
             get {
-                return ResourceManager.GetString("DataCategory_Schema", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_39", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Security.
+        ///   Looks up a localized string similar to .
         /// </summary>
-        internal static string DataCategory_Security {
+        internal static string SNI_ERROR_4 {
             get {
-                return ResourceManager.GetString("DataCategory_Security", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_4", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Source.
+        ///   Looks up a localized string similar to Could not open a connection to SQL Server.
         /// </summary>
-        internal static string DataCategory_Source {
+        internal static string SNI_ERROR_40 {
             get {
-                return ResourceManager.GetString("DataCategory_Source", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_40", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to StateChange.
+        ///   Looks up a localized string similar to Cannot open a Shared Memory connection to a remote SQL server.
         /// </summary>
-        internal static string DataCategory_StateChange {
+        internal static string SNI_ERROR_41 {
             get {
-                return ResourceManager.GetString("DataCategory_StateChange", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_41", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to StatementCompleted.
+        ///   Looks up a localized string similar to Could not establish dedicated administrator connection (DAC) on default port. Make sure that DAC is enabled.
         /// </summary>
-        internal static string DataCategory_StatementCompleted {
+        internal static string SNI_ERROR_42 {
             get {
-                return ResourceManager.GetString("DataCategory_StatementCompleted", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_42", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to UDT.
+        ///   Looks up a localized string similar to An error occurred while obtaining the dedicated administrator connection (DAC) port. Make sure that SQL Browser is running, or check the error log for the port number.
         /// </summary>
-        internal static string DataCategory_Udt {
+        internal static string SNI_ERROR_43 {
             get {
-                return ResourceManager.GetString("DataCategory_Udt", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_43", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update.
+        ///   Looks up a localized string similar to Could not compose Service Principal Name (SPN) for Windows Integrated Authentication. Possible causes are server(s) incorrectly specified to connection API calls, Domain Name System (DNS) lookup failure or memory shortage.
         /// </summary>
-        internal static string DataCategory_Update {
+        internal static string SNI_ERROR_44 {
             get {
-                return ResourceManager.GetString("DataCategory_Update", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_44", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to XML.
+        ///   Looks up a localized string similar to Connecting with the MultiSubnetFailover connection option to a SQL Server instance configured with more than 64 IP addresses is not supported..
         /// </summary>
-        internal static string DataCategory_Xml {
+        internal static string SNI_ERROR_47 {
             get {
-                return ResourceManager.GetString("DataCategory_Xml", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_47", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set AutoIncrement property for a column with DefaultValue set..
+        ///   Looks up a localized string similar to Connecting to a named SQL Server instance using the MultiSubnetFailover connection option is not supported..
         /// </summary>
-        internal static string DataColumn_AutoIncrementAndDefaultValue {
+        internal static string SNI_ERROR_48 {
             get {
-                return ResourceManager.GetString("DataColumn_AutoIncrementAndDefaultValue", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_48", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set AutoIncrement property for a computed column..
+        ///   Looks up a localized string similar to Connecting to a SQL Server instance using the MultiSubnetFailover connection option is only supported when using the TCP protocol..
         /// </summary>
-        internal static string DataColumn_AutoIncrementAndExpression {
+        internal static string SNI_ERROR_49 {
             get {
-                return ResourceManager.GetString("DataColumn_AutoIncrementAndExpression", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_49", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change AutoIncrement of a DataColumn with type &apos;{0}&apos; once it has data..
+        ///   Looks up a localized string similar to Invalid parameter(s) found.
         /// </summary>
-        internal static string DataColumn_AutoIncrementCannotSetIfHasData {
+        internal static string SNI_ERROR_5 {
             get {
-                return ResourceManager.GetString("DataColumn_AutoIncrementCannotSetIfHasData", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_5", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to AutoIncrementStep must be a non-zero value..
+        ///   Looks up a localized string similar to Local Database Runtime error occurred. .
         /// </summary>
-        internal static string DataColumn_AutoIncrementSeed {
+        internal static string SNI_ERROR_50 {
             get {
-                return ResourceManager.GetString("DataColumn_AutoIncrementSeed", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_50", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change the Column &apos;{0}&apos; property Namespace. The Column is SimpleContent..
+        ///   Looks up a localized string similar to An instance name was not specified while connecting to a Local Database Runtime. Specify an instance name in the format (localdb)\instance_name..
         /// </summary>
-        internal static string DataColumn_CannotChangeNamespace {
+        internal static string SNI_ERROR_51 {
             get {
-                return ResourceManager.GetString("DataColumn_CannotChangeNamespace", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_51", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DateTimeMode can be set only on DataColumns of type DateTime..
+        ///   Looks up a localized string similar to Unable to locate a Local Database Runtime installation. Verify that SQL Server Express is properly installed and that the Local Database Runtime feature is enabled..
         /// </summary>
-        internal static string DataColumn_CannotSetDateTimeModeForNonDateTimeColumns {
+        internal static string SNI_ERROR_52 {
             get {
-                return ResourceManager.GetString("DataColumn_CannotSetDateTimeModeForNonDateTimeColumns", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_52", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set Column &apos;{0}&apos; property MaxLength to &apos;{1}&apos;. There is at least one string in the table longer than the new limit..
+        ///   Looks up a localized string similar to Invalid Local Database Runtime registry configuration found. Verify that SQL Server Express is properly installed..
         /// </summary>
-        internal static string DataColumn_CannotSetMaxLength {
+        internal static string SNI_ERROR_53 {
             get {
-                return ResourceManager.GetString("DataColumn_CannotSetMaxLength", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_53", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set Column &apos;{0}&apos; property MaxLength. The Column is SimpleContent..
+        ///   Looks up a localized string similar to Unable to locate the registry entry for SQLUserInstance.dll file path. Verify that the Local Database Runtime feature of SQL Server Express is properly installed..
         /// </summary>
-        internal static string DataColumn_CannotSetMaxLength2 {
+        internal static string SNI_ERROR_54 {
             get {
-                return ResourceManager.GetString("DataColumn_CannotSetMaxLength2", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_54", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set Column &apos;{0}&apos; to be null. Please use DBNull instead..
+        ///   Looks up a localized string similar to Registry value contains an invalid SQLUserInstance.dll file path. Verify that the Local Database Runtime feature of SQL Server Express is properly installed..
         /// </summary>
-        internal static string DataColumn_CannotSetToNull {
+        internal static string SNI_ERROR_55 {
             get {
-                return ResourceManager.GetString("DataColumn_CannotSetToNull", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_55", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set Column &apos;{0}&apos; property MappingType to SimpleContent. The Column DataType is {1}..
+        ///   Looks up a localized string similar to Unable to load the SQLUserInstance.dll from the location specified in the registry. Verify that the Local Database Runtime feature of SQL Server Express is properly installed..
         /// </summary>
-        internal static string DataColumn_CannotSimpleContent {
+        internal static string SNI_ERROR_56 {
             get {
-                return ResourceManager.GetString("DataColumn_CannotSimpleContent", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_56", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set Column &apos;{0}&apos; property DataType to {1}. The Column is SimpleContent..
+        ///   Looks up a localized string similar to Invalid SQLUserInstance.dll found at the location specified in the registry. Verify that the Local Database Runtime feature of SQL Server Express is properly installed..
         /// </summary>
-        internal static string DataColumn_CannotSimpleContentType {
+        internal static string SNI_ERROR_57 {
             get {
-                return ResourceManager.GetString("DataColumn_CannotSimpleContentType", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_57", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change DataType of a column once it has data..
+        ///   Looks up a localized string similar to Unsupported protocol specified.
         /// </summary>
-        internal static string DataColumn_ChangeDataType {
+        internal static string SNI_ERROR_6 {
             get {
-                return ResourceManager.GetString("DataColumn_ChangeDataType", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_6", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change DateTimeMode from &apos;{0}&apos; to &apos;{1}&apos; once the table has data..
+        ///   Looks up a localized string similar to Invalid connection found when setting up new session protocol.
         /// </summary>
-        internal static string DataColumn_DateTimeMode {
+        internal static string SNI_ERROR_7 {
             get {
-                return ResourceManager.GetString("DataColumn_DateTimeMode", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_7", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set a DefaultValue on an AutoIncrement column..
+        ///   Looks up a localized string similar to Protocol not supported.
         /// </summary>
-        internal static string DataColumn_DefaultValueAndAutoIncrement {
+        internal static string SNI_ERROR_8 {
             get {
-                return ResourceManager.GetString("DataColumn_DefaultValueAndAutoIncrement", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_8", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DefaultValue for column {0} is of type {1}, but the column is of type {2}..
+        ///   Looks up a localized string similar to Associating port with I/O completion mechanism failed.
         /// </summary>
-        internal static string DataColumn_DefaultValueColumnDataType {
+        internal static string SNI_ERROR_9 {
             get {
-                return ResourceManager.GetString("DataColumn_DefaultValueColumnDataType", resourceCulture);
+                return ResourceManager.GetString("SNI_ERROR_9", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DefaultValue for column {0} is of type {1} and cannot be converted to {2}..
+        ///   Looks up a localized string similar to Incorrect physicalConnection type..
         /// </summary>
-        internal static string DataColumn_DefaultValueDataType {
+        internal static string SNI_IncorrectPhysicalConnectionType {
             get {
-                return ResourceManager.GetString("DataColumn_DefaultValueDataType", resourceCulture);
+                return ResourceManager.GetString("SNI_IncorrectPhysicalConnectionType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DefaultValue for the column is of type {0} and cannot be converted to {1}..
+        ///   Looks up a localized string similar to The &apos;{0}&apos; platform is not supported when targeting .NET Framework..
         /// </summary>
-        internal static string DataColumn_DefaultValueDataType1 {
+        internal static string SNI_PlatformNotSupportedNetFx {
             get {
-                return ResourceManager.GetString("DataColumn_DefaultValueDataType1", resourceCulture);
+                return ResourceManager.GetString("SNI_PlatformNotSupportedNetFx", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; exceeds the MaxLength limit..
+        ///   Looks up a localized string similar to HTTP Provider.
         /// </summary>
-        internal static string DataColumn_ExceedMaxLength {
+        internal static string SNI_PN0 {
             get {
-                return ResourceManager.GetString("DataColumn_ExceedMaxLength", resourceCulture);
+                return ResourceManager.GetString("SNI_PN0", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set Expression property on column {0}, because it is a part of a constraint..
+        ///   Looks up a localized string similar to Named Pipes Provider.
         /// </summary>
-        internal static string DataColumn_ExpressionAndConstraint {
+        internal static string SNI_PN1 {
             get {
-                return ResourceManager.GetString("DataColumn_ExpressionAndConstraint", resourceCulture);
+                return ResourceManager.GetString("SNI_PN1", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set expression because column cannot be made ReadOnly..
+        ///   Looks up a localized string similar to .
         /// </summary>
-        internal static string DataColumn_ExpressionAndReadOnly {
+        internal static string SNI_PN10 {
             get {
-                return ResourceManager.GetString("DataColumn_ExpressionAndReadOnly", resourceCulture);
+                return ResourceManager.GetString("SNI_PN10", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create an expression on a column that has AutoIncrement or Unique..
+        ///   Looks up a localized string similar to SQL Network Interfaces.
         /// </summary>
-        internal static string DataColumn_ExpressionAndUnique {
+        internal static string SNI_PN11 {
             get {
-                return ResourceManager.GetString("DataColumn_ExpressionAndUnique", resourceCulture);
+                return ResourceManager.GetString("SNI_PN11", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set Expression property due to circular reference in the expression..
+        ///   Looks up a localized string similar to Session Provider.
         /// </summary>
-        internal static string DataColumn_ExpressionCircular {
+        internal static string SNI_PN2 {
             get {
-                return ResourceManager.GetString("DataColumn_ExpressionCircular", resourceCulture);
+                return ResourceManager.GetString("SNI_PN2", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create a constraint based on Expression column {0}..
+        ///   Looks up a localized string similar to Sign Provider.
         /// </summary>
-        internal static string DataColumn_ExpressionInConstraint {
+        internal static string SNI_PN3 {
             get {
-                return ResourceManager.GetString("DataColumn_ExpressionInConstraint", resourceCulture);
+                return ResourceManager.GetString("SNI_PN3", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to MaxLength applies to string data type only. You cannot set Column &apos;{0}&apos; property MaxLength to be non-negative number..
+        ///   Looks up a localized string similar to Shared Memory Provider.
         /// </summary>
-        internal static string DataColumn_HasToBeStringType {
+        internal static string SNI_PN4 {
             get {
-                return ResourceManager.GetString("DataColumn_HasToBeStringType", resourceCulture);
+                return ResourceManager.GetString("SNI_PN4", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Type &apos;{0}&apos; does not contain static Null property or field..
+        ///   Looks up a localized string similar to SMux Provider.
         /// </summary>
-        internal static string DataColumn_INullableUDTwithoutStaticNull {
+        internal static string SNI_PN5 {
             get {
-                return ResourceManager.GetString("DataColumn_INullableUDTwithoutStaticNull", resourceCulture);
+                return ResourceManager.GetString("SNI_PN5", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataColumn with type &apos;{0}&apos; is a complexType. Can not serialize value of a complex type as Attribute.
+        ///   Looks up a localized string similar to SSL Provider.
         /// </summary>
-        internal static string DataColumn_InvalidDataColumnMapping {
+        internal static string SNI_PN6 {
             get {
-                return ResourceManager.GetString("DataColumn_InvalidDataColumnMapping", resourceCulture);
+                return ResourceManager.GetString("SNI_PN6", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is Invalid DataSetDateTime value..
+        ///   Looks up a localized string similar to TCP Provider.
         /// </summary>
-        internal static string DataColumn_InvalidDateTimeMode {
+        internal static string SNI_PN7 {
             get {
-                return ResourceManager.GetString("DataColumn_InvalidDateTimeMode", resourceCulture);
+                return ResourceManager.GetString("SNI_PN7", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set column &apos;{0}&apos;. The value violates the MaxLength limit of this column..
+        ///   Looks up a localized string similar to VIA Provider.
         /// </summary>
-        internal static string DataColumn_LongerThanMaxLength {
+        internal static string SNI_PN8 {
             get {
-                return ResourceManager.GetString("DataColumn_LongerThanMaxLength", resourceCulture);
+                return ResourceManager.GetString("SNI_PN8", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ColumnName is required when it is part of a DataTable..
+        ///   Looks up a localized string similar to CTAIP Provider.
         /// </summary>
-        internal static string DataColumn_NameRequired {
+        internal static string SNI_PN9 {
             get {
-                return ResourceManager.GetString("DataColumn_NameRequired", resourceCulture);
+                return ResourceManager.GetString("SNI_PN9", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; contains non-unique values..
+        ///   Looks up a localized string similar to Connection open and login was successful, but then an error occurred while enlisting the connection into the current distributed transaction..
         /// </summary>
-        internal static string DataColumn_NonUniqueValues {
+        internal static string Snix_AutoEnlist {
             get {
-                return ResourceManager.GetString("DataColumn_NonUniqueValues", resourceCulture);
+                return ResourceManager.GetString("Snix_AutoEnlist", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; does not allow DBNull.Value..
+        ///   Looks up a localized string similar to A transport-level error has occurred during connection clean-up..
         /// </summary>
-        internal static string DataColumn_NotAllowDBNull {
+        internal static string Snix_Close {
             get {
-                return ResourceManager.GetString("DataColumn_NotAllowDBNull", resourceCulture);
+                return ResourceManager.GetString("Snix_Close", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column must belong to a table..
+        ///   Looks up a localized string similar to A network-related or instance-specific error occurred while establishing a connection to SQL Server. The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections..
         /// </summary>
-        internal static string DataColumn_NotInAnyTable {
+        internal static string Snix_Connect {
             get {
-                return ResourceManager.GetString("DataColumn_NotInAnyTable", resourceCulture);
+                return ResourceManager.GetString("Snix_Connect", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; does not belong to table {1}..
+        ///   Looks up a localized string similar to Connection open and login was successful, but then an error occurred while enabling MARS for this connection..
         /// </summary>
-        internal static string DataColumn_NotInTheTable {
+        internal static string Snix_EnableMars {
             get {
-                return ResourceManager.GetString("DataColumn_NotInTheTable", resourceCulture);
+                return ResourceManager.GetString("Snix_EnableMars", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; does not belong to underlying table &apos;{1}&apos;..
+        ///   Looks up a localized string similar to A transport-level error has occurred when sending the request to the server..
         /// </summary>
-        internal static string DataColumn_NotInTheUnderlyingTable {
+        internal static string Snix_Execute {
             get {
-                return ResourceManager.GetString("DataColumn_NotInTheUnderlyingTable", resourceCulture);
+                return ResourceManager.GetString("Snix_Execute", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataSet does not support System.Nullable&lt;&gt;..
+        ///   Looks up a localized string similar to Failed to establish a MARS session in preparation to send the request to the server..
         /// </summary>
-        internal static string DataColumn_NullableTypesNotSupported {
+        internal static string Snix_GetMarsSession {
             get {
-                return ResourceManager.GetString("DataColumn_NullableTypesNotSupported", resourceCulture);
+                return ResourceManager.GetString("Snix_GetMarsSession", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column requires a valid DataType..
+        ///   Looks up a localized string similar to A connection was successfully established with the server, but then an error occurred during the login process..
         /// </summary>
-        internal static string DataColumn_NullDataType {
+        internal static string Snix_Login {
             get {
-                return ResourceManager.GetString("DataColumn_NullDataType", resourceCulture);
+                return ResourceManager.GetString("Snix_Login", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; has null values in it..
+        ///   Looks up a localized string similar to A connection was successfully established with the server, but then an error occurred when obtaining the security/SSPI context information for integrated security login..
         /// </summary>
-        internal static string DataColumn_NullKeyValues {
+        internal static string Snix_LoginSspi {
             get {
-                return ResourceManager.GetString("DataColumn_NullKeyValues", resourceCulture);
+                return ResourceManager.GetString("Snix_LoginSspi", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; does not allow nulls..
+        ///   Looks up a localized string similar to A connection was successfully established with the server, but then an error occurred during the pre-login handshake..
         /// </summary>
-        internal static string DataColumn_NullValues {
+        internal static string Snix_PreLogin {
             get {
-                return ResourceManager.GetString("DataColumn_NullValues", resourceCulture);
+                return ResourceManager.GetString("Snix_PreLogin", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Ordinal &apos;{0}&apos; exceeds the maximum number..
+        ///   Looks up a localized string similar to The client was unable to establish a connection because of an error during connection initialization process before login. Possible causes include the following:  the client tried to connect to an unsupported version of SQL Server; the server was too busy to accept new connections; or there was a resource limitation (insufficient memory or maximum allowed connections) on the server..
         /// </summary>
-        internal static string DataColumn_OrdinalExceedMaximum {
+        internal static string Snix_PreLoginBeforeSuccessfulWrite {
             get {
-                return ResourceManager.GetString("DataColumn_OrdinalExceedMaximum", resourceCulture);
+                return ResourceManager.GetString("Snix_PreLoginBeforeSuccessfulWrite", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; is read only..
+        ///   Looks up a localized string similar to A transport-level error has occurred during SSPI handshake..
         /// </summary>
-        internal static string DataColumn_ReadOnly {
+        internal static string Snix_ProcessSspi {
             get {
-                return ResourceManager.GetString("DataColumn_ReadOnly", resourceCulture);
+                return ResourceManager.GetString("Snix_ProcessSspi", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change ReadOnly property for the expression column..
+        ///   Looks up a localized string similar to A transport-level error has occurred when receiving results from the server..
         /// </summary>
-        internal static string DataColumn_ReadOnlyAndExpression {
+        internal static string Snix_Read {
             get {
-                return ResourceManager.GetString("DataColumn_ReadOnlyAndExpression", resourceCulture);
+                return ResourceManager.GetString("Snix_Read", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to SetAdded and SetModified can only be called on DataRows with Unchanged DataRowState..
+        ///   Looks up a localized string similar to A transport-level error has occurred while sending information to the server..
         /// </summary>
-        internal static string DataColumn_SetAddedAndModifiedCalledOnNonUnchanged {
+        internal static string Snix_SendRows {
             get {
-                return ResourceManager.GetString("DataColumn_SetAddedAndModifiedCalledOnNonUnchanged", resourceCulture);
+                return ResourceManager.GetString("Snix_SendRows", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Couldn&apos;t store &lt;{0}&gt; in {1} Column.  Expected type is {2}..
+        ///   Looks up a localized string similar to Cannot transition from state &apos;{0}&apos; to &apos;{1}&apos;..
         /// </summary>
-        internal static string DataColumn_SetFailed {
+        internal static string SQL_ActiveDirectoryInvalidStateTransition {
             get {
-                return ResourceManager.GetString("DataColumn_SetFailed", resourceCulture);
+                return ResourceManager.GetString("SQL_ActiveDirectoryInvalidStateTransition", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Type &apos;{0}&apos; does not implement IRevertibleChangeTracking; therefore can not proceed with RejectChanges()..
+        ///   Looks up a localized string similar to Unsupported state: &apos;{0}&apos;..
         /// </summary>
-        internal static string DataColumn_UDTImplementsIChangeTrackingButnotIRevertible {
+        internal static string SQL_ActiveDirectoryUnsupportedState {
             get {
-                return ResourceManager.GetString("DataColumn_UDTImplementsIChangeTrackingButnotIRevertible", resourceCulture);
+                return ResourceManager.GetString("SQL_ActiveDirectoryUnsupportedState", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change Unique property for the expression column..
+        ///   Looks up a localized string similar to Cannot use &apos;Authentication&apos; with &apos;Integrated Security&apos;..
         /// </summary>
-        internal static string DataColumn_UniqueAndExpression {
+        internal static string SQL_AuthenticationAndIntegratedSecurity {
             get {
-                return ResourceManager.GetString("DataColumn_UniqueAndExpression", resourceCulture);
+                return ResourceManager.GetString("SQL_AuthenticationAndIntegratedSecurity", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether null values are allowed in this column..
+        ///   Looks up a localized string similar to SqlBulkCopy.WriteToServer failed because the SqlBulkCopy.DestinationTableName is an invalid multipart name.
         /// </summary>
-        internal static string DataColumnAllowNullDescr {
+        internal static string SQL_BulkCopyDestinationTableName {
             get {
-                return ResourceManager.GetString("DataColumnAllowNullDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkCopyDestinationTableName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether the column automatically increments itself for new rows added to the table.  The type of this column must be Int16, Int32, or Int64..
+        ///   Looks up a localized string similar to The given value{0} of type {1} from the data source cannot be converted to type {2} for Column {3} [{4}] Row {5}..
         /// </summary>
-        internal static string DataColumnAutoIncrementDescr {
+        internal static string SQL_BulkLoadCannotConvertValue {
             get {
-                return ResourceManager.GetString("DataColumnAutoIncrementDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadCannotConvertValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the starting value for an AutoIncrement column..
+        ///   Looks up a localized string similar to The given value{0} of type {1} from the data source cannot be converted to type {2} for Column {3} [{4}]..
         /// </summary>
-        internal static string DataColumnAutoIncrementSeedDescr {
+        internal static string SQL_BulkLoadCannotConvertValueWithoutRowNo {
             get {
-                return ResourceManager.GetString("DataColumnAutoIncrementSeedDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadCannotConvertValueWithoutRowNo", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the increment used by an AutoIncrement column..
+        ///   Looks up a localized string similar to Must not specify SqlBulkCopyOption.UseInternalTransaction and pass an external Transaction at the same time..
         /// </summary>
-        internal static string DataColumnAutoIncrementStepDescr {
+        internal static string SQL_BulkLoadConflictingTransactionOption {
             get {
-                return ResourceManager.GetString("DataColumnAutoIncrementStepDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadConflictingTransactionOption", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the default user-interface caption for this column..
+        ///   Looks up a localized string similar to Unexpected existing transaction..
         /// </summary>
-        internal static string DataColumnCaptionDescr {
+        internal static string SQL_BulkLoadExistingTransaction {
             get {
-                return ResourceManager.GetString("DataColumnCaptionDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadExistingTransaction", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the name used to look up this column in the Columns collection of a DataTable..
+        ///   Looks up a localized string similar to Cannot access destination table &apos;{0}&apos;..
         /// </summary>
-        internal static string DataColumnColumnNameDescr {
+        internal static string SQL_BulkLoadInvalidDestinationTable {
             get {
-                return ResourceManager.GetString("DataColumnColumnNameDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadInvalidDestinationTable", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Returns the DataTable to which this column belongs..
+        ///   Looks up a localized string similar to Function must not be called during event..
         /// </summary>
-        internal static string DataColumnDataTableDescr {
+        internal static string SQL_BulkLoadInvalidOperationInsideEvent {
             get {
-                return ResourceManager.GetString("DataColumnDataTableDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadInvalidOperationInsideEvent", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the type of data stored in this column..
+        ///   Looks up a localized string similar to The given column order hint is not valid..
         /// </summary>
-        internal static string DataColumnDataTypeDescr {
+        internal static string SQL_BulkLoadInvalidOrderHint {
             get {
-                return ResourceManager.GetString("DataColumnDataTypeDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadInvalidOrderHint", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates DateTimeMode of this DataColumn..
+        ///   Looks up a localized string similar to Timeout Value &apos;{0}&apos; is less than 0..
         /// </summary>
-        internal static string DataColumnDateTimeModeDescr {
+        internal static string SQL_BulkLoadInvalidTimeout {
             get {
-                return ResourceManager.GetString("DataColumnDateTimeModeDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadInvalidTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the default column value used when adding new rows to the table..
+        ///   Looks up a localized string similar to Value cannot be converted to SqlVariant..
         /// </summary>
-        internal static string DataColumnDefaultValueDescr {
+        internal static string SQL_BulkLoadInvalidVariantValue {
             get {
-                return ResourceManager.GetString("DataColumnDefaultValueDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadInvalidVariantValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the value that this column computes for each row based on other columns instead of taking user input..
+        ///   Looks up a localized string similar to The locale id &apos;{0}&apos; of the source column &apos;{1}&apos; and the locale id &apos;{2}&apos; of the destination column &apos;{3}&apos; do not match..
         /// </summary>
-        internal static string DataColumnExpressionDescr {
+        internal static string Sql_BulkLoadLcidMismatch {
             get {
-                return ResourceManager.GetString("DataColumnExpressionDescr", resourceCulture);
+                return ResourceManager.GetString("Sql_BulkLoadLcidMismatch", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataColumn.ColumnName.
+        ///   Looks up a localized string similar to The mapped collection is in use and cannot be accessed at this time;.
         /// </summary>
-        internal static string DataColumnMapping_DataSetColumn {
+        internal static string SQL_BulkLoadMappingInaccessible {
             get {
-                return ResourceManager.GetString("DataColumnMapping_DataSetColumn", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadMappingInaccessible", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Source column name - case sensitive..
+        ///   Looks up a localized string similar to Mappings must be either all name or all ordinal based..
         /// </summary>
-        internal static string DataColumnMapping_SourceColumn {
+        internal static string SQL_BulkLoadMappingsNamesOrOrdinalsOnly {
             get {
-                return ResourceManager.GetString("DataColumnMapping_SourceColumn", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadMappingsNamesOrOrdinalsOnly", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates how this column persists in XML: as an attribute, element, simple content node, or nothing..
+        ///   Looks up a localized string similar to The DestinationTableName property must be set before calling this method..
         /// </summary>
-        internal static string DataColumnMappingDescr {
+        internal static string SQL_BulkLoadMissingDestinationTable {
             get {
-                return ResourceManager.GetString("DataColumnMappingDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadMissingDestinationTable", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The number of items in the collection.
+        ///   Looks up a localized string similar to Failed to obtain column collation information for the destination table. If the table is not in the current database the name must be qualified using the database name (e.g. [mydb]..[mytable](e.g. [mydb]..[mytable]); this also applies to temporary-tables (e.g. #mytable would be specified as tempdb..#mytable)..
         /// </summary>
-        internal static string DataColumnMappings_Count {
+        internal static string SQL_BulkLoadNoCollation {
             get {
-                return ResourceManager.GetString("DataColumnMappings_Count", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadNoCollation", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The specified DataColumnMapping object..
+        ///   Looks up a localized string similar to The given ColumnMapping does not match up with any column in the source or destination..
         /// </summary>
-        internal static string DataColumnMappings_Item {
+        internal static string SQL_BulkLoadNonMatchingColumnMapping {
             get {
-                return ResourceManager.GetString("DataColumnMappings_Item", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadNonMatchingColumnMapping", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the maximum length of the value this column allows..
+        ///   Looks up a localized string similar to The given ColumnName &apos;{0}&apos; does not match up with any column in data source..
         /// </summary>
-        internal static string DataColumnMaxLengthDescr {
+        internal static string SQL_BulkLoadNonMatchingColumnName {
             get {
-                return ResourceManager.GetString("DataColumnMaxLengthDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadNonMatchingColumnName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the XML uri for elements or attributes stored in this column..
+        ///   Looks up a localized string similar to Column &apos;{0}&apos; does not allow DBNull.Value..
         /// </summary>
-        internal static string DataColumnNamespaceDescr {
+        internal static string SQL_BulkLoadNotAllowDBNull {
             get {
-                return ResourceManager.GetString("DataColumnNamespaceDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadNotAllowDBNull", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the index of this column in the Columns collection..
+        ///   Looks up a localized string similar to The column &apos;{0}&apos; was specified more than once..
         /// </summary>
-        internal static string DataColumnOrdinalDescr {
+        internal static string SQL_BulkLoadOrderHintDuplicateColumn {
             get {
-                return ResourceManager.GetString("DataColumnOrdinalDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadOrderHintDuplicateColumn", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the Prefix used for this DataColumn in xml representation..
+        ///   Looks up a localized string similar to The sorted column &apos;{0}&apos; is not valid in the destination table..
         /// </summary>
-        internal static string DataColumnPrefixDescr {
+        internal static string SQL_BulkLoadOrderHintInvalidColumn {
             get {
-                return ResourceManager.GetString("DataColumnPrefixDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadOrderHintInvalidColumn", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether this column allows changes once a row has been added to the table..
+        ///   Looks up a localized string similar to Attempt to invoke bulk copy on an object that has a pending operation..
         /// </summary>
-        internal static string DataColumnReadOnlyDescr {
+        internal static string SQL_BulkLoadPendingOperation {
             get {
-                return ResourceManager.GetString("DataColumnReadOnlyDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadPendingOperation", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; already belongs to this DataTable..
+        ///   Looks up a localized string similar to String or binary data would be truncated in table &apos;{0}&apos;, column &apos;{1}&apos;. Truncated value: &apos;{2}&apos;..
         /// </summary>
-        internal static string DataColumns_Add1 {
+        internal static string SQL_BulkLoadStringTooLong {
             get {
-                return ResourceManager.GetString("DataColumns_Add1", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadStringTooLong", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; already belongs to another DataTable..
+        ///   Looks up a localized string similar to A column order hint cannot have an unspecified sort order..
         /// </summary>
-        internal static string DataColumns_Add2 {
+        internal static string SQL_BulkLoadUnspecifiedSortOrder {
             get {
-                return ResourceManager.GetString("DataColumns_Add2", resourceCulture);
+                return ResourceManager.GetString("SQL_BulkLoadUnspecifiedSortOrder", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot have more than one SimpleContent columns in a DataTable..
+        ///   Looks up a localized string similar to Failed to instantiate a SqlAuthenticationInitializer with type &apos;{0}&apos;..
         /// </summary>
-        internal static string DataColumns_Add3 {
+        internal static string SQL_CannotCreateAuthInitializer {
             get {
-                return ResourceManager.GetString("DataColumns_Add3", resourceCulture);
+                return ResourceManager.GetString("SQL_CannotCreateAuthInitializer", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add a SimpleContent column to a table containing element columns or nested relations..
+        ///   Looks up a localized string similar to Failed to instantiate an authentication provider with type &apos;{1}&apos; for &apos;{0}&apos;..
         /// </summary>
-        internal static string DataColumns_Add4 {
+        internal static string SQL_CannotCreateAuthProvider {
             get {
-                return ResourceManager.GetString("DataColumns_Add4", resourceCulture);
+                return ResourceManager.GetString("SQL_CannotCreateAuthProvider", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A column named &apos;{0}&apos; already belongs to this DataTable..
+        ///   Looks up a localized string similar to Cannot create normalizer for &apos;{0}&apos;..
         /// </summary>
-        internal static string DataColumns_AddDuplicate {
+        internal static string SQL_CannotCreateNormalizer {
             get {
-                return ResourceManager.GetString("DataColumns_AddDuplicate", resourceCulture);
+                return ResourceManager.GetString("SQL_CannotCreateNormalizer", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add a column named &apos;{0}&apos;: a nested table with the same name already belongs to this DataTable..
+        ///   Looks up a localized string similar to Cannot find an authentication provider for &apos;{0}&apos;. Install the &apos;Microsoft.Data.SqlClient.Extensions.Azure&apos; NuGet package (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) to use Active Directory (Entra ID) authentication methods..
         /// </summary>
-        internal static string DataColumns_AddDuplicate2 {
+        internal static string SQL_CannotFindActiveDirectoryAuthProvider {
             get {
-                return ResourceManager.GetString("DataColumns_AddDuplicate2", resourceCulture);
+                return ResourceManager.GetString("SQL_CannotFindActiveDirectoryAuthProvider", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A column named &apos;{0}&apos; already belongs to this DataTable: cannot set a nested table name to the same name..
+        ///   Looks up a localized string similar to Cannot find an authentication provider for &apos;{0}&apos;..
         /// </summary>
-        internal static string DataColumns_AddDuplicate3 {
+        internal static string SQL_CannotFindAuthProvider {
             get {
-                return ResourceManager.GetString("DataColumns_AddDuplicate3", resourceCulture);
+                return ResourceManager.GetString("SQL_CannotFindAuthProvider", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot find column {0}..
+        ///   Looks up a localized string similar to Unable to get the address of the distributed transaction coordinator for the server, from the server.  Is DTC enabled on the server?.
         /// </summary>
-        internal static string DataColumns_OutOfRange {
+        internal static string SQL_CannotGetDTCAddress {
             get {
-                return ResourceManager.GetString("DataColumns_OutOfRange", resourceCulture);
+                return ResourceManager.GetString("SQL_CannotGetDTCAddress", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove a column that doesn&apos;t belong to this table..
+        ///   Looks up a localized string similar to {0} cannot be changed while async operation is in progress..
         /// </summary>
-        internal static string DataColumns_Remove {
+        internal static string SQL_CannotModifyPropertyAsyncOperationInProgress {
             get {
-                return ResourceManager.GetString("DataColumns_Remove", resourceCulture);
+                return ResourceManager.GetString("SQL_CannotModifyPropertyAsyncOperationInProgress", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove this column, because it is part of the parent key for relationship {0}..
+        ///   Looks up a localized string similar to The &apos;{0}&apos; argument must not be null or empty..
         /// </summary>
-        internal static string DataColumns_RemoveChildKey {
+        internal static string SQL_ChangePasswordArgumentMissing {
             get {
-                return ResourceManager.GetString("DataColumns_RemoveChildKey", resourceCulture);
+                return ResourceManager.GetString("SQL_ChangePasswordArgumentMissing", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove this column, because it is a part of the constraint {0} on the table {1}..
+        ///   Looks up a localized string similar to ChangePassword can only be used with SQL authentication, not with integrated security..
         /// </summary>
-        internal static string DataColumns_RemoveConstraint {
+        internal static string SQL_ChangePasswordConflictsWithSSPI {
             get {
-                return ResourceManager.GetString("DataColumns_RemoveConstraint", resourceCulture);
+                return ResourceManager.GetString("SQL_ChangePasswordConflictsWithSSPI", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove this column, because it is part of an expression: {0} = {1}..
+        ///   Looks up a localized string similar to The keyword &apos;{0}&apos; must not be specified in the connectionString argument to ChangePassword..
         /// </summary>
-        internal static string DataColumns_RemoveExpression {
+        internal static string SQL_ChangePasswordUseOfUnallowedKey {
             get {
-                return ResourceManager.GetString("DataColumns_RemoveExpression", resourceCulture);
+                return ResourceManager.GetString("SQL_ChangePasswordUseOfUnallowedKey", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove this column, because it&apos;s part of the primary key..
+        ///   Looks up a localized string similar to The requested operation cannot be completed because the connection has been broken..
         /// </summary>
-        internal static string DataColumns_RemovePrimaryKey {
+        internal static string SQL_ConnectionDoomed {
             get {
-                return ResourceManager.GetString("DataColumns_RemovePrimaryKey", resourceCulture);
+                return ResourceManager.GetString("SQL_ConnectionDoomed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether this column should restrict its values in the rows of the table to be unique..
+        ///   Looks up a localized string similar to The connection cannot be used because there is an ongoing operation that must be finished..
         /// </summary>
-        internal static string DataColumnUniqueDescr {
+        internal static string SQL_ConnectionLockedForBcpEvent {
             get {
-                return ResourceManager.GetString("DataColumnUniqueDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_ConnectionLockedForBcpEvent", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This constraint cannot be added since ForeignKey doesn&apos;t belong to table {0}..
+        ///   Looks up a localized string similar to Could not find an empty slot in the connection pool..
         /// </summary>
-        internal static string DataConstraint_AddFailed {
+        internal static string SQL_ConnectionPoolNoEmptySlot {
             get {
-                return ResourceManager.GetString("DataConstraint_AddFailed", resourceCulture);
+                return ResourceManager.GetString("SQL_ConnectionPoolNoEmptySlot", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add primary key constraint since primary key is already set for the table..
+        ///   Looks up a localized string similar to The connection pool has been shut down..
         /// </summary>
-        internal static string DataConstraint_AddPrimaryKeyConstraint {
+        internal static string SQL_ConnectionPoolShutDown {
             get {
-                return ResourceManager.GetString("DataConstraint_AddPrimaryKeyConstraint", resourceCulture);
+                return ResourceManager.GetString("SQL_ConnectionPoolShutDown", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Property not accessible because &apos;{0}&apos;..
+        ///   Looks up a localized string similar to The connection attempt timed out..
         /// </summary>
-        internal static string DataConstraint_BadObjectPropertyAccess {
+        internal static string SQL_ConnectTimeout {
             get {
-                return ResourceManager.GetString("DataConstraint_BadObjectPropertyAccess", resourceCulture);
+                return ResourceManager.GetString("SQL_ConnectTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add constraint to DataTable &apos;{0}&apos; which is a child table in two nested relations..
+        ///   Looks up a localized string similar to Connecting to the context connection using Microsoft.Data.SqlClient is not supported..
         /// </summary>
-        internal static string DataConstraint_CantAddConstraintToMultipleNestedTable {
+        internal static string SQL_ContextConnectionIsUnsupported {
             get {
-                return ResourceManager.GetString("DataConstraint_CantAddConstraintToMultipleNestedTable", resourceCulture);
+                return ResourceManager.GetString("SQL_ContextConnectionIsUnsupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot delete this row because constraints are enforced on relation {0}, and deleting this row will strand child rows..
+        ///   Looks up a localized string similar to Either Credential or both &apos;User ID&apos; and &apos;Password&apos; (or &apos;UID&apos; and &apos;PWD&apos;) connection string keywords must be specified, if &apos;Authentication={0}&apos;..
         /// </summary>
-        internal static string DataConstraint_CascadeDelete {
+        internal static string SQL_CredentialsNotProvided {
             get {
-                return ResourceManager.GetString("DataConstraint_CascadeDelete", resourceCulture);
+                return ResourceManager.GetString("SQL_CredentialsNotProvided", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot make this change because constraints are enforced on relation {0}, and changing this value will strand child rows..
+        ///   Looks up a localized string similar to The Collation specified by SQL Server is not supported..
         /// </summary>
-        internal static string DataConstraint_CascadeUpdate {
+        internal static string SQL_CultureIdError {
             get {
-                return ResourceManager.GetString("DataConstraint_CascadeUpdate", resourceCulture);
+                return ResourceManager.GetString("SQL_CultureIdError", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot clear table {0} because ForeignKeyConstraint {1} enforces constraints and there are child rows in {2}..
+        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Device Code Flow&apos; with &apos;User ID&apos;, &apos;UID&apos;, &apos;Password&apos; or &apos;PWD&apos; connection string keywords..
         /// </summary>
-        internal static string DataConstraint_ClearParentTable {
+        internal static string SQL_DeviceFlowWithUsernamePassword {
             get {
-                return ResourceManager.GetString("DataConstraint_ClearParentTable", resourceCulture);
+                return ResourceManager.GetString("SQL_DeviceFlowWithUsernamePassword", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Constraint matches constraint named {0} already in collection..
+        ///   Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; .
         /// </summary>
-        internal static string DataConstraint_Duplicate {
+        internal static string SQL_Duration_Login_Begin {
             get {
-                return ResourceManager.GetString("DataConstraint_Duplicate", resourceCulture);
+                return ResourceManager.GetString("SQL_Duration_Login_Begin", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A Constraint named &apos;{0}&apos; already belongs to this DataTable..
+        ///   Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; authentication={3}; .
         /// </summary>
-        internal static string DataConstraint_DuplicateName {
+        internal static string SQL_Duration_Login_ProcessConnectionAuth {
             get {
-                return ResourceManager.GetString("DataConstraint_DuplicateName", resourceCulture);
+                return ResourceManager.GetString("SQL_Duration_Login_ProcessConnectionAuth", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ForeignKeyConstraint {0} requires the child key values ({1}) to exist in the parent table..
+        ///   Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; authentication={3}; [Post-Login] complete={4}; .
         /// </summary>
-        internal static string DataConstraint_ForeignKeyViolation {
+        internal static string SQL_Duration_PostLogin {
             get {
-                return ResourceManager.GetString("DataConstraint_ForeignKeyViolation", resourceCulture);
+                return ResourceManager.GetString("SQL_Duration_PostLogin", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to These columns don&apos;t point to this table..
+        ///   Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0};.
         /// </summary>
-        internal static string DataConstraint_ForeignTable {
+        internal static string SQL_Duration_PreLogin_Begin {
             get {
-                return ResourceManager.GetString("DataConstraint_ForeignTable", resourceCulture);
+                return ResourceManager.GetString("SQL_Duration_PreLogin_Begin", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove unique constraint &apos;{0}&apos;. Remove foreign key constraint &apos;{1}&apos; first..
+        ///   Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0}; handshake={1}; .
         /// </summary>
-        internal static string DataConstraint_NeededForForeignKeyConstraint {
+        internal static string SQL_Duration_PreLoginHandshake {
             get {
-                return ResourceManager.GetString("DataConstraint_NeededForForeignKeyConstraint", resourceCulture);
+                return ResourceManager.GetString("SQL_Duration_PreLoginHandshake", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change the name of a constraint to empty string when it is in the ConstraintCollection..
+        ///   Looks up a localized string similar to The instance of SQL Server you attempted to connect to requires encryption but this machine does not support it..
         /// </summary>
-        internal static string DataConstraint_NoName {
+        internal static string SQL_EncryptionNotSupportedByClient {
             get {
-                return ResourceManager.GetString("DataConstraint_NoName", resourceCulture);
+                return ResourceManager.GetString("SQL_EncryptionNotSupportedByClient", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Constraint &apos;{0}&apos; does not belong to this DataTable..
+        ///   Looks up a localized string similar to The instance of SQL Server you attempted to connect to does not support encryption..
         /// </summary>
-        internal static string DataConstraint_NotInTheTable {
+        internal static string SQL_EncryptionNotSupportedByServer {
             get {
-                return ResourceManager.GetString("DataConstraint_NotInTheTable", resourceCulture);
+                return ResourceManager.GetString("SQL_EncryptionNotSupportedByServer", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot find constraint {0}..
+        ///   Looks up a localized string similar to Number of fields in record &apos;{0}&apos; does not match the number in the original record..
         /// </summary>
-        internal static string DataConstraint_OutOfRange {
+        internal static string SQL_EnumeratedRecordFieldCountChanged {
             get {
-                return ResourceManager.GetString("DataConstraint_OutOfRange", resourceCulture);
+                return ResourceManager.GetString("SQL_EnumeratedRecordFieldCountChanged", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This constraint cannot be enabled as not all values have corresponding parent values..
+        ///   Looks up a localized string similar to Metadata for field &apos;{0}&apos; of record &apos;{1}&apos; did not match the original record&apos;s metadata..
         /// </summary>
-        internal static string DataConstraint_ParentValues {
+        internal static string SQL_EnumeratedRecordMetaDataChanged {
             get {
-                return ResourceManager.GetString("DataConstraint_ParentValues", resourceCulture);
+                return ResourceManager.GetString("SQL_EnumeratedRecordMetaDataChanged", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove a constraint that doesn&apos;t belong to this table..
+        ///   Looks up a localized string similar to ClientConnectionId:{0}.
         /// </summary>
-        internal static string DataConstraint_RemoveFailed {
+        internal static string SQL_ExClientConnectionId {
             get {
-                return ResourceManager.GetString("DataConstraint_RemoveFailed", resourceCulture);
+                return ResourceManager.GetString("SQL_ExClientConnectionId", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove this row because it has child rows, and constraints on relation {0} are enforced..
+        ///   Looks up a localized string similar to Error Number:{0},State:{1},Class:{2}.
         /// </summary>
-        internal static string DataConstraint_RemoveParentRow {
+        internal static string SQL_ExErrorNumberStateClass {
             get {
-                return ResourceManager.GetString("DataConstraint_RemoveParentRow", resourceCulture);
+                return ResourceManager.GetString("SQL_ExErrorNumberStateClass", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to These columns don&apos;t currently have unique values..
+        ///   Looks up a localized string similar to ClientConnectionId before routing:{0}.
         /// </summary>
-        internal static string DataConstraint_UniqueViolation {
+        internal static string SQL_ExOriginalClientConnectionId {
             get {
-                return ResourceManager.GetString("DataConstraint_UniqueViolation", resourceCulture);
+                return ResourceManager.GetString("SQL_ExOriginalClientConnectionId", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot enforce constraints on constraint {0}..
+        ///   Looks up a localized string similar to Routing Destination:{0}.
         /// </summary>
-        internal static string DataConstraint_Violation {
+        internal static string SQL_ExRoutingDestination {
             get {
-                return ResourceManager.GetString("DataConstraint_Violation", resourceCulture);
+                return ResourceManager.GetString("SQL_ExRoutingDestination", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; is constrained to be unique.  Value &apos;{1}&apos; is already present..
+        ///   Looks up a localized string similar to Attempted to pend a read when the fail async pends test hook was enabled..
         /// </summary>
-        internal static string DataConstraint_ViolationValue {
+        internal static string SQL_FailAsyncPendsEnabled {
             get {
-                return ResourceManager.GetString("DataConstraint_ViolationValue", resourceCulture);
+                return ResourceManager.GetString("SQL_FailAsyncPendsEnabled", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This type of node cannot be cloned: {0}..
+        ///   Looks up a localized string similar to Globalization Invariant Mode is not supported..
         /// </summary>
-        internal static string DataDom_CloneNode {
+        internal static string SQL_GlobalizationInvariantModeNotSupported {
             get {
-                return ResourceManager.GetString("DataDom_CloneNode", resourceCulture);
+                return ResourceManager.GetString("SQL_GlobalizationInvariantModeNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change the ColumnMapping property once the associated DataSet is mapped to a loaded XML document..
+        ///   Looks up a localized string similar to Instance failure..
         /// </summary>
-        internal static string DataDom_ColumnMappingChange {
+        internal static string SQL_InstanceFailure {
             get {
-                return ResourceManager.GetString("DataDom_ColumnMappingChange", resourceCulture);
+                return ResourceManager.GetString("SQL_InstanceFailure", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change the column name once the associated DataSet is mapped to a loaded XML document..
+        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Integrated&apos; with &apos;Password&apos; or &apos;PWD&apos; connection string keywords..
         /// </summary>
-        internal static string DataDom_ColumnNameChange {
+        internal static string SQL_IntegratedWithPassword {
             get {
-                return ResourceManager.GetString("DataDom_ColumnNameChange", resourceCulture);
+                return ResourceManager.GetString("SQL_IntegratedWithPassword", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change the column namespace once the associated DataSet is mapped to a loaded XML document..
+        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Interactive&apos; with &apos;Password&apos; or &apos;PWD&apos; connection string keywords..
         /// </summary>
-        internal static string DataDom_ColumnNamespaceChange {
+        internal static string SQL_InteractiveWithPassword {
             get {
-                return ResourceManager.GetString("DataDom_ColumnNamespaceChange", resourceCulture);
+                return ResourceManager.GetString("SQL_InteractiveWithPassword", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change the DataSet name once the DataSet is mapped to a loaded XML document..
+        ///   Looks up a localized string similar to Internal Error.
         /// </summary>
-        internal static string DataDom_DataSetNameChange {
+        internal static string Sql_InternalError {
             get {
-                return ResourceManager.GetString("DataDom_DataSetNameChange", resourceCulture);
+                return ResourceManager.GetString("Sql_InternalError", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add, remove, or change Nested relations from the DataSet once the DataSet is mapped to a loaded XML document..
+        ///   Looks up a localized string similar to Buffer offset &apos;{1}&apos; plus the bytes available &apos;{0}&apos; is greater than the length of the passed in buffer..
         /// </summary>
-        internal static string DataDom_DataSetNestedRelationsChange {
+        internal static string SQL_InvalidBufferSizeOrIndex {
             get {
-                return ResourceManager.GetString("DataDom_DataSetNestedRelationsChange", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidBufferSizeOrIndex", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DataSet parameter is invalid. It cannot be null..
+        ///   Looks up a localized string similar to Data length &apos;{0}&apos; is less than 0..
         /// </summary>
-        internal static string DataDom_DataSetNull {
+        internal static string SQL_InvalidDataLength {
             get {
-                return ResourceManager.GetString("DataDom_DataSetNull", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidDataLength", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add or remove tables from the DataSet once the DataSet is mapped to a loaded XML document..
+        ///   Looks up a localized string similar to Invalid internal packet size:.
         /// </summary>
-        internal static string DataDom_DataSetTablesChange {
+        internal static string SQL_InvalidInternalPacketSize {
             get {
-                return ResourceManager.GetString("DataDom_DataSetTablesChange", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidInternalPacketSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Please set DataSet.EnforceConstraints == false before trying to edit XmlDataDocument using XML operations..
+        ///   Looks up a localized string similar to Invalid &apos;Packet Size&apos;.  The value must be an integer &gt;= 512 and &lt;= 32768..
         /// </summary>
-        internal static string DataDom_EnforceConstraintsShouldBeOff {
+        internal static string SQL_InvalidPacketSizeValue {
             get {
-                return ResourceManager.GetString("DataDom_EnforceConstraintsShouldBeOff", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidPacketSizeValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid foliation..
+        ///   Looks up a localized string similar to The length of the parameter &apos;{0}&apos; exceeds the limit of 128 characters..
         /// </summary>
-        internal static string DataDom_Foliation {
+        internal static string SQL_InvalidParameterNameLength {
             get {
-                return ResourceManager.GetString("DataDom_Foliation", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidParameterNameLength", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataSet can be associated with at most one XmlDataDocument. Cannot associate the DataSet with the current XmlDataDocument because the DataSet is already associated with another XmlDataDocument..
+        ///   Looks up a localized string similar to Invalid 3 part name format for TypeName..
         /// </summary>
-        internal static string DataDom_MultipleDataSet {
+        internal static string SQL_InvalidParameterTypeNameFormat {
             get {
-                return ResourceManager.GetString("DataDom_MultipleDataSet", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidParameterTypeNameFormat", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot load XmlDataDocument if it already contains data. Please use a new XmlDataDocument..
+        ///   Looks up a localized string similar to Server {0}, database {1} is not configured for database mirroring..
         /// </summary>
-        internal static string DataDom_MultipleLoad {
+        internal static string SQL_InvalidPartnerConfiguration {
             get {
-                return ResourceManager.GetString("DataDom_MultipleLoad", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidPartnerConfiguration", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Clear function on DateSet and DataTable is not supported on XmlDataDocument..
+        ///   Looks up a localized string similar to Invalid attempt to read when no data is present..
         /// </summary>
-        internal static string DataDom_NotSupport_Clear {
+        internal static string SQL_InvalidRead {
             get {
-                return ResourceManager.GetString("DataDom_NotSupport_Clear", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidRead", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create entity references on DataDocument..
+        ///   Looks up a localized string similar to Unsupported SQL Server version.  The .NET Framework SqlClient Data Provider can only be used with SQL Server versions 7.0 and later..
         /// </summary>
-        internal static string DataDom_NotSupport_EntRef {
+        internal static string SQL_InvalidSQLServerVersionUnknown {
             get {
-                return ResourceManager.GetString("DataDom_NotSupport_EntRef", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidSQLServerVersionUnknown", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to GetElementById() is not supported on DataDocument..
+        ///   Looks up a localized string similar to Invalid SSPI packet size..
         /// </summary>
-        internal static string DataDom_NotSupport_GetElementById {
+        internal static string SQL_InvalidSSPIPacketSize {
             get {
-                return ResourceManager.GetString("DataDom_NotSupport_GetElementById", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidSSPIPacketSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add or remove columns from the table once the DataSet is mapped to a loaded XML document..
+        ///   Looks up a localized string similar to Invalid Packet Size..
         /// </summary>
-        internal static string DataDom_TableColumnsChange {
+        internal static string SQL_InvalidTDSPacketSize {
             get {
-                return ResourceManager.GetString("DataDom_TableColumnsChange", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidTDSPacketSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change the table name once the associated DataSet is mapped to a loaded XML document..
+        ///   Looks up a localized string similar to The SQL Server instance returned an invalid or unsupported protocol version during login negotiation..
         /// </summary>
-        internal static string DataDom_TableNameChange {
+        internal static string SQL_InvalidTDSVersion {
             get {
-                return ResourceManager.GetString("DataDom_TableNameChange", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidTDSVersion", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change the table namespace once the associated DataSet is mapped to a loaded XML document..
+        ///   Looks up a localized string similar to Invalid 3 part name format for UdtTypeName..
         /// </summary>
-        internal static string DataDom_TableNamespaceChange {
+        internal static string SQL_InvalidUdt3PartNameFormat {
             get {
-                return ResourceManager.GetString("DataDom_TableNamespaceChange", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidUdt3PartNameFormat", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Find finds a row based on a Sort order, and no Sort order is specified..
+        ///   Looks up a localized string similar to The type &apos;{0}&apos; has an invalid size..
         /// </summary>
-        internal static string DataIndex_FindWithoutSortOrder {
+        internal static string SQL_InvalidUdtSize {
             get {
-                return ResourceManager.GetString("DataIndex_FindWithoutSortOrder", resourceCulture);
+                return ResourceManager.GetString("SQL_InvalidUdtSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Expecting {0} value(s) for the key being indexed, but received {1} value(s)..
+        ///   Looks up a localized string similar to Invalid attempt to get JsonDocument on column &apos;{0}&apos;. JsonDocument is only supported for columns of type json..
         /// </summary>
-        internal static string DataIndex_KeyLength {
+        internal static string SQL_JsonDocumentNotSupportedOnColumnType {
             get {
-                return ResourceManager.GetString("DataIndex_KeyLength", resourceCulture);
+                return ResourceManager.GetString("SQL_JsonDocumentNotSupportedOnColumnType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The RowStates parameter must be set to a valid combination of values from the DataViewRowState enumeration..
+        ///   Looks up a localized string similar to The connection does not support MultipleActiveResultSets..
         /// </summary>
-        internal static string DataIndex_RecordStateRange {
+        internal static string SQL_MarsUnsupportedOnConnection {
             get {
-                return ResourceManager.GetString("DataIndex_RecordStateRange", resourceCulture);
+                return ResourceManager.GetString("SQL_MarsUnsupportedOnConnection", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create a Key when the same column is listed more than once: &apos;{0}&apos;.
+        ///   Looks up a localized string similar to SqlDbType.SmallMoney overflow.  Value &apos;{0}&apos; is out of range.  Must be between -214,748.3648 and 214,748.3647..
         /// </summary>
-        internal static string DataKey_DuplicateColumns {
+        internal static string SQL_MoneyOverflow {
             get {
-                return ResourceManager.GetString("DataKey_DuplicateColumns", resourceCulture);
+                return ResourceManager.GetString("SQL_MoneyOverflow", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot have 0 columns..
+        ///   Looks up a localized string similar to Failed to authenticate the user {0} in Active Directory (Authentication={1})..
         /// </summary>
-        internal static string DataKey_NoColumns {
+        internal static string SQL_MSALFailure {
             get {
-                return ResourceManager.GetString("DataKey_NoColumns", resourceCulture);
+                return ResourceManager.GetString("SQL_MSALFailure", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove unique constraint since it&apos;s the primary key of a table..
+        ///   Looks up a localized string similar to Error code 0x{0}.
         /// </summary>
-        internal static string DataKey_RemovePrimaryKey {
+        internal static string SQL_MSALInnerException {
             get {
-                return ResourceManager.GetString("DataKey_RemovePrimaryKey", resourceCulture);
+                return ResourceManager.GetString("SQL_MSALInnerException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove unique constraint since it&apos;s the primary key of table {0}..
+        ///   Looks up a localized string similar to MultiplexPackets cannot return both consumePartialPacket and consumeInputDirectly..
         /// </summary>
-        internal static string DataKey_RemovePrimaryKey1 {
+        internal static string SQL_Multiplexer_ConflictingConsumeModes {
             get {
-                return ResourceManager.GetString("DataKey_RemovePrimaryKey1", resourceCulture);
+                return ResourceManager.GetString("SQL_Multiplexer_ConflictingConsumeModes", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create a Key from Columns that belong to different tables..
+        ///   Looks up a localized string similar to Partial packet cannot be non-null when setting to non-null..
         /// </summary>
-        internal static string DataKey_TableMismatch {
+        internal static string SQL_Multiplexer_PartialPacketNotNull {
             get {
-                return ResourceManager.GetString("DataKey_TableMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_Multiplexer_PartialPacketNotNull", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot have more than {0} columns..
+        ///   Looks up a localized string similar to The keyword &apos;Network Library&apos; is not supported on this platform, prefix the &apos;Data Source&apos; with the protocol desired instead (&apos;tcp:&apos; for a TCP connection, or &apos;np:&apos; for a Named Pipe connection)..
         /// </summary>
-        internal static string DataKey_TooManyColumns {
+        internal static string SQL_NetworkLibraryNotSupported {
             get {
-                return ResourceManager.GetString("DataKey_TooManyColumns", resourceCulture);
+                return ResourceManager.GetString("SQL_NetworkLibraryNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;target&gt;.{0} and &lt;source&gt;.{0} have conflicting properties: DataType property mismatch..
+        ///   Looks up a localized string similar to Invalid attempt to GetBytes on column &apos;{0}&apos;.  The GetBytes function can only be used on columns of type Text, NText, or Image..
         /// </summary>
-        internal static string DataMerge_DataTypeMismatch {
+        internal static string SQL_NonBlobColumn {
             get {
-                return ResourceManager.GetString("DataMerge_DataTypeMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_NonBlobColumn", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Target table {0} missing definition for column {1}..
+        ///   Looks up a localized string similar to Invalid attempt to GetChars on column &apos;{0}&apos;.  The GetChars function can only be used on columns of type Text, NText, Xml, VarChar or NVarChar..
         /// </summary>
-        internal static string DataMerge_MissingColumnDefinition {
+        internal static string SQL_NonCharColumn {
             get {
-                return ResourceManager.GetString("DataMerge_MissingColumnDefinition", resourceCulture);
+                return ResourceManager.GetString("SQL_NonCharColumn", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Target DataSet missing {0} {1}..
+        ///   Looks up a localized string similar to Cannot use &apos;Authentication={0}&apos; with &apos;Password&apos; or &apos;PWD&apos; connection string keywords..
         /// </summary>
-        internal static string DataMerge_MissingConstraint {
+        internal static string SQL_NonInteractiveWithPassword {
             get {
-                return ResourceManager.GetString("DataMerge_MissingConstraint", resourceCulture);
+                return ResourceManager.GetString("SQL_NonInteractiveWithPassword", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Target DataSet missing definition for {0}..
+        ///   Looks up a localized string similar to SSE Instance re-direction is not supported for non-local user instances..
         /// </summary>
-        internal static string DataMerge_MissingDefinition {
+        internal static string SQL_NonLocalSSEInstance {
             get {
-                return ResourceManager.GetString("DataMerge_MissingDefinition", resourceCulture);
+                return ResourceManager.GetString("SQL_NonLocalSSEInstance", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to PrimaryKey column {0} does not exist in source Table..
+        ///   Looks up a localized string similar to Invalid command sent to ExecuteXmlReader.  The command must return an Xml result..
         /// </summary>
-        internal static string DataMerge_MissingPrimaryKeyColumnInSource {
+        internal static string SQL_NonXmlResult {
             get {
-                return ResourceManager.GetString("DataMerge_MissingPrimaryKeyColumnInSource", resourceCulture);
+                return ResourceManager.GetString("SQL_NonXmlResult", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Mismatch columns in the PrimaryKey : &lt;target&gt;.{0} versus &lt;source&gt;.{1}..
+        ///   Looks up a localized string similar to The {0} enumeration value, {1}, is not supported by the .NET Framework SqlClient Data Provider..
         /// </summary>
-        internal static string DataMerge_PrimaryKeyColumnsMismatch {
+        internal static string SQL_NotSupportedEnumerationValue {
             get {
-                return ResourceManager.GetString("DataMerge_PrimaryKeyColumnsMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_NotSupportedEnumerationValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;target&gt;.PrimaryKey and &lt;source&gt;.PrimaryKey have different Length..
+        ///   Looks up a localized string similar to Invalid transaction or invalid name for a point at which to save within the transaction..
         /// </summary>
-        internal static string DataMerge_PrimaryKeyMismatch {
+        internal static string SQL_NullEmptyTransactionName {
             get {
-                return ResourceManager.GetString("DataMerge_PrimaryKeyMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_NullEmptyTransactionName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Relation {0} cannot be merged, because keys have mismatch columns..
+        ///   Looks up a localized string similar to Can only rent from a pool if an onCreate delegate is available..
         /// </summary>
-        internal static string DataMerge_RelationKeyColumnsMismatch {
+        internal static string SQL_ObjectPoolNoCreateDelegate {
             get {
-                return ResourceManager.GetString("DataMerge_RelationKeyColumnsMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_ObjectPoolNoCreateDelegate", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A relation already exists for these child columns..
+        ///   Looks up a localized string similar to Open result count exceeded..
         /// </summary>
-        internal static string DataRelation_AlreadyExists {
+        internal static string SQL_OpenResultCountExceeded {
             get {
-                return ResourceManager.GetString("DataRelation_AlreadyExists", resourceCulture);
+                return ResourceManager.GetString("SQL_OpenResultCountExceeded", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This relation already belongs to another DataSet..
+        ///   Looks up a localized string similar to Operation cancelled by user..
         /// </summary>
-        internal static string DataRelation_AlreadyInOtherDataSet {
+        internal static string SQL_OperationCancelled {
             get {
-                return ResourceManager.GetString("DataRelation_AlreadyInOtherDataSet", resourceCulture);
+                return ResourceManager.GetString("SQL_OperationCancelled", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This relation already belongs to this DataSet..
+        ///   Looks up a localized string similar to Cannot get RequiredLength when HasDataLength is false..
         /// </summary>
-        internal static string DataRelation_AlreadyInTheDataSet {
+        internal static string SQL_Packet_RequiredLengthUnavailable {
             get {
-                return ResourceManager.GetString("DataRelation_AlreadyInTheDataSet", resourceCulture);
+                return ResourceManager.GetString("SQL_Packet_RequiredLengthUnavailable", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add a DataRelation or Constraint that has different Locale or CaseSensitive settings between its parent and child tables..
+        ///   Looks up a localized string similar to Packet modification detected. Hash from packet creation does not match hash from packet check..
         /// </summary>
-        internal static string DataRelation_CaseLocaleMismatch {
+        internal static string SQL_PacketHashMismatch {
             get {
-                return ResourceManager.GetString("DataRelation_CaseLocaleMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_PacketHashMismatch", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add a relation to this table&apos;s ParentRelation collection where this table isn&apos;t the child table..
+        ///   Looks up a localized string similar to Packet modification detected. Hash is null but packet contains non-null buffer..
         /// </summary>
-        internal static string DataRelation_ChildTableMismatch {
+        internal static string SQL_PacketHashNullWithNonNullBuffer {
             get {
-                return ResourceManager.GetString("DataRelation_ChildTableMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_PacketHashNullWithNonNullBuffer", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parent Columns and Child Columns don&apos;t have type-matching columns..
+        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; cannot be null or empty..
         /// </summary>
-        internal static string DataRelation_ColumnsTypeMismatch {
+        internal static string SQL_ParameterCannotBeEmpty {
             get {
-                return ResourceManager.GetString("DataRelation_ColumnsTypeMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_ParameterCannotBeEmpty", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot have a relationship between tables in different DataSets..
+        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; cannot have Direction Output or InputOutput when EnableOptimizedParameterBinding is enabled on the parent command..
         /// </summary>
-        internal static string DataRelation_DataSetMismatch {
+        internal static string SQL_ParameterDirectionInvalidForOptimizedBinding {
             get {
-                return ResourceManager.GetString("DataRelation_DataSetMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_ParameterDirectionInvalidForOptimizedBinding", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This relation doesn&apos;t belong to this relation collection..
+        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; exceeds the size limit for the sql_variant datatype..
         /// </summary>
-        internal static string DataRelation_DoesNotExist {
+        internal static string SQL_ParameterInvalidVariant {
             get {
-                return ResourceManager.GetString("DataRelation_DoesNotExist", resourceCulture);
+                return ResourceManager.GetString("SQL_ParameterInvalidVariant", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A Relation named &apos;{0}&apos; already belongs to this DataSet..
+        ///   Looks up a localized string similar to The {0} type parameter &apos;{1}&apos; must have a valid type name..
         /// </summary>
-        internal static string DataRelation_DuplicateName {
+        internal static string SQL_ParameterTypeNameRequired {
             get {
-                return ResourceManager.GetString("DataRelation_DuplicateName", resourceCulture);
+                return ResourceManager.GetString("SQL_ParameterTypeNameRequired", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This relation should connect two tables in this DataSet to be added to this DataSet..
+        ///   Looks up a localized string similar to Internal connection fatal error..
         /// </summary>
-        internal static string DataRelation_ForeignDataSet {
+        internal static string SQL_ParsingError {
             get {
-                return ResourceManager.GetString("DataRelation_ForeignDataSet", resourceCulture);
+                return ResourceManager.GetString("SQL_ParsingError", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The row doesn&apos;t belong to the same DataSet as this relation..
+        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Authentication Library Type: {1}.
         /// </summary>
-        internal static string DataRelation_ForeignRow {
+        internal static string SQL_ParsingErrorAuthLibraryType {
             get {
-                return ResourceManager.GetString("DataRelation_ForeignRow", resourceCulture);
+                return ResourceManager.GetString("SQL_ParsingErrorAuthLibraryType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to GetChildRows requires a row whose Table is {0}, but the specified row&apos;s Table is {1}..
+        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Feature Id: {1}.
         /// </summary>
-        internal static string DataRelation_ForeignTable {
+        internal static string SQL_ParsingErrorFeatureId {
             get {
-                return ResourceManager.GetString("DataRelation_ForeignTable", resourceCulture);
+                return ResourceManager.GetString("SQL_ParsingErrorFeatureId", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to GetParentRow requires a row whose Table is {0}, but the specified row&apos;s Table is {1}..
+        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Length: {1}.
         /// </summary>
-        internal static string DataRelation_GetParentRowTableMismatch {
+        internal static string SQL_ParsingErrorLength {
             get {
-                return ResourceManager.GetString("DataRelation_GetParentRowTableMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_ParsingErrorLength", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Nested table &apos;{0}&apos; with empty namespace cannot have multiple parent tables in different namespaces..
+        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Offset: {1}.
         /// </summary>
-        internal static string DataRelation_InValidNamespaceInNestedRelation {
+        internal static string SQL_ParsingErrorOffset {
             get {
-                return ResourceManager.GetString("DataRelation_InValidNamespaceInNestedRelation", resourceCulture);
+                return ResourceManager.GetString("SQL_ParsingErrorOffset", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Nested table &apos;{0}&apos; which inherits its namespace cannot have multiple parent tables in different namespaces..
+        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Status: {1}.
         /// </summary>
-        internal static string DataRelation_InValidNestedRelation {
+        internal static string SQL_ParsingErrorStatus {
             get {
-                return ResourceManager.GetString("DataRelation_InValidNestedRelation", resourceCulture);
+                return ResourceManager.GetString("SQL_ParsingErrorStatus", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ParentKey and ChildKey are identical..
+        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Token : {1}.
         /// </summary>
-        internal static string DataRelation_KeyColumnsIdentical {
+        internal static string SQL_ParsingErrorToken {
             get {
-                return ResourceManager.GetString("DataRelation_KeyColumnsIdentical", resourceCulture);
+                return ResourceManager.GetString("SQL_ParsingErrorToken", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ParentColumns and ChildColumns should be the same length..
+        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Value: {1}.
         /// </summary>
-        internal static string DataRelation_KeyLengthMismatch {
+        internal static string SQL_ParsingErrorValue {
             get {
-                return ResourceManager.GetString("DataRelation_KeyLengthMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_ParsingErrorValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ParentColumns and ChildColumns must not be zero length..
+        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}.
         /// </summary>
-        internal static string DataRelation_KeyZeroLength {
+        internal static string SQL_ParsingErrorWithState {
             get {
-                return ResourceManager.GetString("DataRelation_KeyZeroLength", resourceCulture);
+                return ResourceManager.GetString("SQL_ParsingErrorWithState", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The table ({0}) cannot be the child table to itself in nested relations..
+        ///   Looks up a localized string similar to The command execution cannot proceed due to a pending asynchronous operation already in progress..
         /// </summary>
-        internal static string DataRelation_LoopInNestedRelations {
+        internal static string SQL_PendingBeginXXXExists {
             get {
-                return ResourceManager.GetString("DataRelation_LoopInNestedRelations", resourceCulture);
+                return ResourceManager.GetString("SQL_PendingBeginXXXExists", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to RelationName is required when it is part of a DataSet..
+        ///   Looks up a localized string similar to Precision value &apos;{0}&apos; is either less than 0 or greater than the maximum allowed precision of 38..
         /// </summary>
-        internal static string DataRelation_NoName {
+        internal static string SQL_PrecisionValueOutOfRange {
             get {
-                return ResourceManager.GetString("DataRelation_NoName", resourceCulture);
+                return ResourceManager.GetString("SQL_PrecisionValueOutOfRange", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Relation {0} does not belong to this DataSet..
+        ///   Looks up a localized string similar to Certificate failed chain validation. Error(s): &apos;{0}&apos;..
         /// </summary>
-        internal static string DataRelation_NotInTheDataSet {
+        internal static string SQL_RemoteCertificateChainErrors {
             get {
-                return ResourceManager.GetString("DataRelation_NotInTheDataSet", resourceCulture);
+                return ResourceManager.GetString("SQL_RemoteCertificateChainErrors", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot find relation {0}..
+        ///   Looks up a localized string similar to The certificate provided by the server does not match the certificate provided by the ServerCertificate option..
         /// </summary>
-        internal static string DataRelation_OutOfRange {
+        internal static string SQL_RemoteCertificateDoesNotMatchServerCertificate {
             get {
-                return ResourceManager.GetString("DataRelation_OutOfRange", resourceCulture);
+                return ResourceManager.GetString("SQL_RemoteCertificateDoesNotMatchServerCertificate", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create a DataRelation if Parent or Child Columns are not in a DataSet..
+        ///   Looks up a localized string similar to Certificate name mismatch. The provided &apos;DataSource&apos; or &apos;HostNameInCertificate&apos; does not match the name in the certificate..
         /// </summary>
-        internal static string DataRelation_ParentOrChildColumnsDoNotHaveDataSet {
+        internal static string SQL_RemoteCertificateNameMismatch {
             get {
-                return ResourceManager.GetString("DataRelation_ParentOrChildColumnsDoNotHaveDataSet", resourceCulture);
+                return ResourceManager.GetString("SQL_RemoteCertificateNameMismatch", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add a relation to this table&apos;s ChildRelation collection where this table isn&apos;t the parent table..
+        ///   Looks up a localized string similar to Certificate not available while validating the certificate..
         /// </summary>
-        internal static string DataRelation_ParentTableMismatch {
+        internal static string SQL_RemoteCertificateNotAvailable {
             get {
-                return ResourceManager.GetString("DataRelation_ParentTableMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_RemoteCertificateNotAvailable", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set the &apos;Nested&apos; property to false for this relation..
+        ///   Looks up a localized string similar to Scale value &apos;{0}&apos; is either less than 0 or greater than the maximum allowed scale of 38..
         /// </summary>
-        internal static string DataRelation_RelationNestedReadOnly {
+        internal static string SQL_ScaleValueOutOfRange {
             get {
-                return ResourceManager.GetString("DataRelation_RelationNestedReadOnly", resourceCulture);
+                return ResourceManager.GetString("SQL_ScaleValueOutOfRange", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to SetParentRow requires a child row whose Table is {0}, but the specified row&apos;s Table is {1}..
+        ///   Looks up a localized string similar to Cannot set the Credential property if &apos;Authentication=Active Directory Device Code Flow&apos; has been specified in the connection string..
         /// </summary>
-        internal static string DataRelation_SetParentRowTableMismatch {
+        internal static string SQL_SettingCredentialWithDeviceFlow {
             get {
-                return ResourceManager.GetString("DataRelation_SetParentRowTableMismatch", resourceCulture);
+                return ResourceManager.GetString("SQL_SettingCredentialWithDeviceFlow", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The same table &apos;{0}&apos; cannot be the child table in two nested relations..
+        ///   Looks up a localized string similar to Cannot set the Credential property if &apos;Authentication=Active Directory Integrated&apos; has been specified in the connection string..
         /// </summary>
-        internal static string DataRelation_TableCantBeNestedInTwoTables {
+        internal static string SQL_SettingCredentialWithIntegrated {
             get {
-                return ResourceManager.GetString("DataRelation_TableCantBeNestedInTwoTables", resourceCulture);
+                return ResourceManager.GetString("SQL_SettingCredentialWithIntegrated", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create a collection on a null table..
+        ///   Looks up a localized string similar to Cannot set the Credential property if &apos;Authentication=Active Directory Interactive&apos; has been specified in the connection string..
         /// </summary>
-        internal static string DataRelation_TableNull {
+        internal static string SQL_SettingCredentialWithInteractive {
             get {
-                return ResourceManager.GetString("DataRelation_TableNull", resourceCulture);
+                return ResourceManager.GetString("SQL_SettingCredentialWithInteractive", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create a relation between tables in different DataSets..
+        ///   Looks up a localized string similar to Cannot set the Credential property if &apos;Authentication={0}&apos; has been specified in the connection string..
         /// </summary>
-        internal static string DataRelation_TablesInDifferentSets {
+        internal static string SQL_SettingCredentialWithNonInteractive {
             get {
-                return ResourceManager.GetString("DataRelation_TablesInDifferentSets", resourceCulture);
+                return ResourceManager.GetString("SQL_SettingCredentialWithNonInteractive", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The table this collection displays relations for has been removed from its DataSet..
+        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Device Code Flow&apos;, if the Credential property has been set..
         /// </summary>
-        internal static string DataRelation_TableWasRemoved {
+        internal static string SQL_SettingDeviceFlowWithCredential {
             get {
-                return ResourceManager.GetString("DataRelation_TableWasRemoved", resourceCulture);
+                return ResourceManager.GetString("SQL_SettingDeviceFlowWithCredential", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the child columns of this relation..
+        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Integrated&apos;, if the Credential property has been set..
         /// </summary>
-        internal static string DataRelationChildColumnsDescr {
+        internal static string SQL_SettingIntegratedWithCredential {
             get {
-                return ResourceManager.GetString("DataRelationChildColumnsDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_SettingIntegratedWithCredential", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether relations are nested..
+        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Interactive&apos;, if the Credential property has been set..
         /// </summary>
-        internal static string DataRelationNested {
+        internal static string SQL_SettingInteractiveWithCredential {
             get {
-                return ResourceManager.GetString("DataRelationNested", resourceCulture);
+                return ResourceManager.GetString("SQL_SettingInteractiveWithCredential", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the parent columns of this relation..
+        ///   Looks up a localized string similar to Cannot use &apos;Authentication={0}&apos;, if the Credential property has been set..
         /// </summary>
-        internal static string DataRelationParentColumnsDescr {
+        internal static string SQL_SettingNonInteractiveWithCredential {
             get {
-                return ResourceManager.GetString("DataRelationParentColumnsDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_SettingNonInteractiveWithCredential", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The name used to look up this relation in the Relations collection of a DataSet..
+        ///   Looks up a localized string similar to A severe error occurred on the current command.  The results, if any, should be discarded..
         /// </summary>
-        internal static string DataRelationRelationNameDescr {
+        internal static string SQL_SevereError {
             get {
-                return ResourceManager.GetString("DataRelationRelationNameDescr", resourceCulture);
+                return ResourceManager.GetString("SQL_SevereError", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot delete this row since it&apos;s already deleted..
+        ///   Looks up a localized string similar to SqlDbType.SmallDateTime overflow.  Value &apos;{0}&apos; is out of range.  Must be between 1/1/1900 12:00:00 AM and 6/6/2079 11:59:59 PM..
         /// </summary>
-        internal static string DataRow_AlreadyDeleted {
+        internal static string SQL_SmallDateTimeOverflow {
             get {
-                return ResourceManager.GetString("DataRow_AlreadyDeleted", resourceCulture);
+                return ResourceManager.GetString("SQL_SmallDateTimeOverflow", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This row already belongs to another table..
+        ///   Looks up a localized string similar to Memory allocation for internal connection failed..
         /// </summary>
-        internal static string DataRow_AlreadyInOtherCollection {
+        internal static string SQL_SNIPacketAllocationFailure {
             get {
-                return ResourceManager.GetString("DataRow_AlreadyInOtherCollection", resourceCulture);
+                return ResourceManager.GetString("SQL_SNIPacketAllocationFailure", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This row already belongs to this table..
+        ///   Looks up a localized string similar to Socket did not throw expected &apos;{0}&apos; with error code &apos;{1}&apos;..
         /// </summary>
-        internal static string DataRow_AlreadyInTheCollection {
+        internal static string SQL_SocketDidNotThrow {
             get {
-                return ResourceManager.GetString("DataRow_AlreadyInTheCollection", resourceCulture);
+                return ResourceManager.GetString("SQL_SocketDidNotThrow", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove a row that&apos;s already been removed..
+        ///   Looks up a localized string similar to SqlCommand.DeriveParameters failed because the SqlCommand.CommandText property value is an invalid multipart name.
         /// </summary>
-        internal static string DataRow_AlreadyRemoved {
+        internal static string SQL_SqlCommandCommandText {
             get {
-                return ResourceManager.GetString("DataRow_AlreadyRemoved", resourceCulture);
+                return ResourceManager.GetString("SQL_SqlCommandCommandText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot call BeginEdit() inside the RowChanging event..
+        ///   Looks up a localized string similar to The target principal name is incorrect.  Cannot generate SSPI context..
         /// </summary>
-        internal static string DataRow_BeginEditInRowChanging {
+        internal static string SQL_SSPIGenerateError {
             get {
-                return ResourceManager.GetString("DataRow_BeginEditInRowChanging", resourceCulture);
+                return ResourceManager.GetString("SQL_SSPIGenerateError", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot call CancelEdit() inside an OnRowChanging event.  Throw an exception to cancel this update..
+        ///   Looks up a localized string similar to Cannot initialize SSPI package..
         /// </summary>
-        internal static string DataRow_CancelEditInRowChanging {
+        internal static string SQL_SSPIInitializeError {
             get {
-                return ResourceManager.GetString("DataRow_CancelEditInRowChanging", resourceCulture);
+                return ResourceManager.GetString("SQL_SSPIInitializeError", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Deleted row information cannot be accessed through the row..
+        ///   Looks up a localized string similar to Invalid attempt to GetStream on column &apos;{0}&apos;. The GetStream function can only be used on columns of type Binary, Image, Udt or VarBinary..
         /// </summary>
-        internal static string DataRow_DeletedRowInaccessible {
+        internal static string SQL_StreamNotSupportOnColumnType {
             get {
-                return ResourceManager.GetString("DataRow_DeletedRowInaccessible", resourceCulture);
+                return ResourceManager.GetString("SQL_StreamNotSupportOnColumnType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot call Delete inside an OnRowDeleting event.  Throw an exception to cancel this delete..
+        ///   Looks up a localized string similar to The Stream does not support reading..
         /// </summary>
-        internal static string DataRow_DeleteInRowDeleting {
+        internal static string SQL_StreamReadNotSupported {
             get {
-                return ResourceManager.GetString("DataRow_DeleteInRowDeleting", resourceCulture);
+                return ResourceManager.GetString("SQL_StreamReadNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change a proposed value in the RowChanging event..
+        ///   Looks up a localized string similar to The Stream does not support seeking..
         /// </summary>
-        internal static string DataRow_EditInRowChanging {
+        internal static string SQL_StreamSeekNotSupported {
             get {
-                return ResourceManager.GetString("DataRow_EditInRowChanging", resourceCulture);
+                return ResourceManager.GetString("SQL_StreamSeekNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This row is empty..
+        ///   Looks up a localized string similar to The Stream does not support writing..
         /// </summary>
-        internal static string DataRow_Empty {
+        internal static string SQL_StreamWriteNotSupported {
             get {
-                return ResourceManager.GetString("DataRow_Empty", resourceCulture);
+                return ResourceManager.GetString("SQL_StreamWriteNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot call EndEdit() inside an OnRowChanging event..
+        ///   Looks up a localized string similar to Processing of results from SQL Server failed because of an invalid multipart name.
         /// </summary>
-        internal static string DataRow_EndEditInRowChanging {
+        internal static string SQL_TDSParserTableName {
             get {
-                return ResourceManager.GetString("DataRow_EndEditInRowChanging", resourceCulture);
+                return ResourceManager.GetString("SQL_TDSParserTableName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unrecognized row state bit pattern..
+        ///   Looks up a localized string similar to Invalid attempt to GetTextReader on column &apos;{0}&apos;. The GetTextReader function can only be used on columns of type Char, NChar, NText, NVarChar, Text or VarChar..
         /// </summary>
-        internal static string DataRow_InvalidRowBitPattern {
+        internal static string SQL_TextReaderNotSupportOnColumnType {
             get {
-                return ResourceManager.GetString("DataRow_InvalidRowBitPattern", resourceCulture);
+                return ResourceManager.GetString("SQL_TextReaderNotSupportOnColumnType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Version must be Original, Current, or Proposed..
+        ///   Looks up a localized string similar to Execution Timeout Expired.  The timeout period elapsed prior to completion of the operation or the server is not responding..
         /// </summary>
-        internal static string DataRow_InvalidVersion {
+        internal static string SQL_Timeout_Execution {
             get {
-                return ResourceManager.GetString("DataRow_InvalidVersion", resourceCulture);
+                return ResourceManager.GetString("SQL_Timeout_Execution", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A child row has multiple parents..
+        ///   Looks up a localized string similar to This failure occurred while attempting to connect to the {0} server..
         /// </summary>
-        internal static string DataRow_MultipleParents {
+        internal static string SQL_Timeout_FailoverInfo {
             get {
-                return ResourceManager.GetString("DataRow_MultipleParents", resourceCulture);
+                return ResourceManager.GetString("SQL_Timeout_FailoverInfo", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There is no Current data to access..
+        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed at the start of the login phase.  This could be because of insufficient time provided for connection timeout..
         /// </summary>
-        internal static string DataRow_NoCurrentData {
+        internal static string SQL_Timeout_Login_Begin {
             get {
-                return ResourceManager.GetString("DataRow_NoCurrentData", resourceCulture);
+                return ResourceManager.GetString("SQL_Timeout_Login_Begin", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There is no Original data to access..
+        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed while attempting to authenticate the login.  This could be because the server failed to authenticate the user or the server was unable to respond back in time..
         /// </summary>
-        internal static string DataRow_NoOriginalData {
+        internal static string SQL_Timeout_Login_ProcessConnectionAuth {
             get {
-                return ResourceManager.GetString("DataRow_NoOriginalData", resourceCulture);
+                return ResourceManager.GetString("SQL_Timeout_Login_ProcessConnectionAuth", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There is no Proposed data to access..
+        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections..
         /// </summary>
-        internal static string DataRow_NoProposedData {
+        internal static string SQL_Timeout_PostLogin {
             get {
-                return ResourceManager.GetString("DataRow_NoProposedData", resourceCulture);
+                return ResourceManager.GetString("SQL_Timeout_PostLogin", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The row doesn&apos;t belong to the same DataSet as this relation..
+        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed at the start of the pre-login phase.  This could be because of insufficient time provided for connection timeout..
         /// </summary>
-        internal static string DataRow_NotInTheDataSet {
+        internal static string SQL_Timeout_PreLogin_Begin {
             get {
-                return ResourceManager.GetString("DataRow_NotInTheDataSet", resourceCulture);
+                return ResourceManager.GetString("SQL_Timeout_PreLogin_Begin", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot perform this operation on a row not in the table..
+        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed while attempting to consume the pre-login handshake acknowledgement.  This could be because the pre-login handshake failed or the server was unable to respond back in time..
         /// </summary>
-        internal static string DataRow_NotInTheTable {
+        internal static string SQL_Timeout_PreLogin_ConsumeHandshake {
             get {
-                return ResourceManager.GetString("DataRow_NotInTheTable", resourceCulture);
+                return ResourceManager.GetString("SQL_Timeout_PreLogin_ConsumeHandshake", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There is no row at position {0}..
+        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed while attempting to create and initialize a socket to the server.  This could be either because the server was unreachable or unable to respond back in time..
         /// </summary>
-        internal static string DataRow_OutOfRange {
+        internal static string SQL_Timeout_PreLogin_InitializeConnection {
             get {
-                return ResourceManager.GetString("DataRow_OutOfRange", resourceCulture);
+                return ResourceManager.GetString("SQL_Timeout_PreLogin_InitializeConnection", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This relation and child row don&apos;t belong to same DataSet..
+        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed while making a pre-login handshake request.  This could be because the server was unable to respond back in time..
         /// </summary>
-        internal static string DataRow_ParentRowNotInTheDataSet {
+        internal static string SQL_Timeout_PreLogin_SendHandshake {
             get {
-                return ResourceManager.GetString("DataRow_ParentRowNotInTheDataSet", resourceCulture);
+                return ResourceManager.GetString("SQL_Timeout_PreLogin_SendHandshake", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This row has been removed from a table and does not have any data.  BeginEdit() will allow creation of new data in this row..
+        ///   Looks up a localized string similar to This failure occurred while attempting to connect to the routing destination. The duration spent while attempting to connect to the original server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; authentication={3}; [Post-Login] complete={4};  .
         /// </summary>
-        internal static string DataRow_RemovedFromTheTable {
+        internal static string SQL_Timeout_RoutingDestinationInfo {
             get {
-                return ResourceManager.GetString("DataRow_RemovedFromTheTable", resourceCulture);
+                return ResourceManager.GetString("SQL_Timeout_RoutingDestinationInfo", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Values are missing in the rowOrder sequence for table &apos;{0}&apos;..
+        ///   Looks up a localized string similar to SqlDbType.Time overflow.  Value &apos;{0}&apos; is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999..
         /// </summary>
-        internal static string DataRow_RowInsertMissing {
+        internal static string SQL_TimeOverflow {
             get {
-                return ResourceManager.GetString("DataRow_RowInsertMissing", resourceCulture);
+                return ResourceManager.GetString("SQL_TimeOverflow", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The row insert position {0} is invalid..
+        ///   Looks up a localized string similar to Scale value &apos;{0}&apos; is either less than 0 or greater than the maximum allowed scale of 7..
         /// </summary>
-        internal static string DataRow_RowInsertOutOfRange {
+        internal static string SQL_TimeScaleValueOutOfRange {
             get {
-                return ResourceManager.GetString("DataRow_RowInsertOutOfRange", resourceCulture);
+                return ResourceManager.GetString("SQL_TimeScaleValueOutOfRange", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The rowOrder value={0} has been found twice for table named &apos;{1}&apos;..
+        ///   Looks up a localized string similar to SqlParameter.TypeName is an invalid multipart name.
         /// </summary>
-        internal static string DataRow_RowInsertTwice {
+        internal static string SQL_TypeName {
             get {
-                return ResourceManager.GetString("DataRow_RowInsertTwice", resourceCulture);
+                return ResourceManager.GetString("SQL_TypeName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The given DataRow is not in the current DataRowCollection..
+        ///   Looks up a localized string similar to SqlParameter.UdtTypeName is an invalid multipart name.
         /// </summary>
-        internal static string DataRow_RowOutOfRange {
+        internal static string SQL_UDTTypeName {
             get {
-                return ResourceManager.GetString("DataRow_RowOutOfRange", resourceCulture);
+                return ResourceManager.GetString("SQL_UDTTypeName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Input array is longer than the number of columns in this table..
+        ///   Looks up a localized string similar to Unrecognized System.Transactions.IsolationLevel enumeration value: {0}..
         /// </summary>
-        internal static string DataRow_ValuesArrayLength {
+        internal static string SQL_UnknownSysTxIsolationLevel {
             get {
-                return ResourceManager.GetString("DataRow_ValuesArrayLength", resourceCulture);
+                return ResourceManager.GetString("SQL_UnknownSysTxIsolationLevel", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} is neither a DataColumn nor a DataRelation for table {1}..
+        ///   Looks up a localized string similar to The authentication &apos;{0}&apos; is not supported..
         /// </summary>
-        internal static string DataROWView_PropertyNotFound {
+        internal static string SQL_UnsupportedAuthentication {
             get {
-                return ResourceManager.GetString("DataROWView_PropertyNotFound", resourceCulture);
+                return ResourceManager.GetString("SQL_UnsupportedAuthentication", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change CaseSensitive or Locale property. This change would lead to at least one DataRelation or Constraint to have different Locale or CaseSensitive settings between its related tables..
+        ///   Looks up a localized string similar to The provider &apos;{0}&apos; does not support authentication &apos;{1}&apos;..
         /// </summary>
-        internal static string DataSet_CannotChangeCaseLocale {
+        internal static string SQL_UnsupportedAuthenticationByProvider {
             get {
-                return ResourceManager.GetString("DataSet_CannotChangeCaseLocale", resourceCulture);
+                return ResourceManager.GetString("SQL_UnsupportedAuthenticationByProvider", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to SchemaSerializationMode property can be set only if it is overridden by derived DataSet..
+        ///   Looks up a localized string similar to Unsupported authentication specified in this context: {0}.
         /// </summary>
-        internal static string DataSet_CannotChangeSchemaSerializationMode {
+        internal static string SQL_UnsupportedAuthenticationSpecified {
             get {
-                return ResourceManager.GetString("DataSet_CannotChangeSchemaSerializationMode", resourceCulture);
+                return ResourceManager.GetString("SQL_UnsupportedAuthenticationSpecified", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Constraint Exception..
+        ///   Looks up a localized string similar to The keyword &apos;{0}&apos; is not supported on this platform..
         /// </summary>
-        internal static string DataSet_DefaultConstraintException {
+        internal static string SQL_UnsupportedKeyword {
             get {
-                return ResourceManager.GetString("DataSet_DefaultConstraintException", resourceCulture);
+                return ResourceManager.GetString("SQL_UnsupportedKeyword", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Data Exception..
+        ///   Looks up a localized string similar to The currently loaded System.Transactions.dll does not support Global Transactions..
         /// </summary>
-        internal static string DataSet_DefaultDataException {
+        internal static string SQL_UnsupportedSysTxVersion {
             get {
-                return ResourceManager.GetString("DataSet_DefaultDataException", resourceCulture);
+                return ResourceManager.GetString("SQL_UnsupportedSysTxVersion", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Deleted rows inaccessible..
+        ///   Looks up a localized string similar to User Instance and Failover are not compatible options.  Please choose only one of the two in the connection string..
         /// </summary>
-        internal static string DataSet_DefaultDeletedRowInaccessibleException {
+        internal static string SQL_UserInstanceFailoverNotCompatible {
             get {
-                return ResourceManager.GetString("DataSet_DefaultDeletedRowInaccessibleException", resourceCulture);
+                return ResourceManager.GetString("SQL_UserInstanceFailoverNotCompatible", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Duplicate name not allowed..
+        ///   Looks up a localized string similar to A user instance was requested in the connection string but the server specified does not support this option..
         /// </summary>
-        internal static string DataSet_DefaultDuplicateNameException {
+        internal static string SQL_UserInstanceFailure {
             get {
-                return ResourceManager.GetString("DataSet_DefaultDuplicateNameException", resourceCulture);
+                return ResourceManager.GetString("SQL_UserInstanceFailure", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Operation not supported in the RowChanging event..
+        ///   Looks up a localized string similar to Invalid attempt to get vector data from column &apos;{0}&apos;. Vectors are only supported for columns of type vector..
         /// </summary>
-        internal static string DataSet_DefaultInRowChangingEventException {
+        internal static string SQL_VectorNotSupportedOnColumnType {
             get {
-                return ResourceManager.GetString("DataSet_DefaultInRowChangingEventException", resourceCulture);
+                return ResourceManager.GetString("SQL_VectorNotSupportedOnColumnType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid constraint..
+        ///   Looks up a localized string similar to Unsupported Vector type &apos;{0}&apos;..
         /// </summary>
-        internal static string DataSet_DefaultInvalidConstraintException {
+        internal static string SQL_VectorTypeNotSupported {
             get {
-                return ResourceManager.GetString("DataSet_DefaultInvalidConstraintException", resourceCulture);
+                return ResourceManager.GetString("SQL_VectorTypeNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Missing primary key..
+        ///   Looks up a localized string similar to Invalid attempt to GetXmlReader on column &apos;{0}&apos;. The GetXmlReader function can only be used on columns of type Xml..
         /// </summary>
-        internal static string DataSet_DefaultMissingPrimaryKeyException {
+        internal static string SQL_XmlReaderNotSupportOnColumnType {
             get {
-                return ResourceManager.GetString("DataSet_DefaultMissingPrimaryKeyException", resourceCulture);
+                return ResourceManager.GetString("SQL_XmlReaderNotSupportOnColumnType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Null not allowed..
+        ///   Looks up a localized string similar to Exception occurred while trying to set the AppContext Switch &apos;{0}&apos;={1}..
         /// </summary>
-        internal static string DataSet_DefaultNoNullAllowedException {
+        internal static string SqlAppContextSwitchManager_InvalidValue {
             get {
-                return ResourceManager.GetString("DataSet_DefaultNoNullAllowedException", resourceCulture);
+                return ResourceManager.GetString("SqlAppContextSwitchManager_InvalidValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column is marked read only..
+        ///   Looks up a localized string similar to Notification values used by Microsoft SQL Server..
         /// </summary>
-        internal static string DataSet_DefaultReadOnlyException {
+        internal static string SqlCommand_Notification {
             get {
-                return ResourceManager.GetString("DataSet_DefaultReadOnlyException", resourceCulture);
+                return ResourceManager.GetString("SqlCommand_Notification", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Row not found in table..
+        ///   Looks up a localized string similar to Automatic enlistment in notifications used by Microsoft SQL Server..
         /// </summary>
-        internal static string DataSet_DefaultRowNotInTableException {
+        internal static string SqlCommand_NotificationAutoEnlist {
             get {
-                return ResourceManager.GetString("DataSet_DefaultRowNotInTableException", resourceCulture);
+                return ResourceManager.GetString("SqlCommand_NotificationAutoEnlist", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Version not found..
+        ///   Looks up a localized string similar to The DataAdapter for which to automatically generate SqlCommands.
         /// </summary>
-        internal static string DataSet_DefaultVersionNotFoundException {
+        internal static string SqlCommandBuilder_DataAdapter {
             get {
-                return ResourceManager.GetString("DataSet_DefaultVersionNotFoundException", resourceCulture);
+                return ResourceManager.GetString("SqlCommandBuilder_DataAdapter", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The name &apos;{0}&apos; is invalid. A DataSet cannot have the same name of the DataTable..
+        ///   Looks up a localized string similar to Access token to use for authentication..
         /// </summary>
-        internal static string DataSet_SetDataSetNameConflicting {
+        internal static string SqlConnection_AccessToken {
             get {
-                return ResourceManager.GetString("DataSet_SetDataSetNameConflicting", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_AccessToken", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change the name of the DataSet to an empty string..
+        ///   Looks up a localized string similar to A guid to represent the physical connection..
         /// </summary>
-        internal static string DataSet_SetNameToEmpty {
+        internal static string SqlConnection_ClientConnectionId {
             get {
-                return ResourceManager.GetString("DataSet_SetNameToEmpty", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_ClientConnectionId", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The schema namespace is invalid. Please use this one instead: {0}..
+        ///   Looks up a localized string similar to Information used to connect to a DataSource, such as &apos;Data Source=x;Initial Catalog=x;Integrated Security=SSPI&apos;..
         /// </summary>
-        internal static string DataSet_UnsupportedSchema {
+        internal static string SqlConnection_ConnectionString {
             get {
-                return ResourceManager.GetString("DataSet_UnsupportedSchema", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_ConnectionString", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether comparing strings within the DataSet is case sensitive..
+        ///   Looks up a localized string similar to Current connection timeout value, &apos;Connect Timeout=X&apos; in the ConnectionString..
         /// </summary>
-        internal static string DataSetCaseSensitiveDescr {
+        internal static string SqlConnection_ConnectionTimeout {
             get {
-                return ResourceManager.GetString("DataSetCaseSensitiveDescr", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_ConnectionTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The name of this DataSet..
+        ///   Looks up a localized string similar to User Id and secure password to use for authentication..
         /// </summary>
-        internal static string DataSetDataSetNameDescr {
+        internal static string SqlConnection_Credential {
             get {
-                return ResourceManager.GetString("DataSetDataSetNameDescr", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_Credential", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates a custom &quot;view&quot; of the data contained by the DataSet. This view allows filtering, searching, and navigating through the custom data view..
+        ///   Looks up a localized string similar to Current SQL Server database, &apos;Initial Catalog=X&apos; in the connection string..
         /// </summary>
-        internal static string DataSetDefaultViewDescr {
+        internal static string SqlConnection_Database {
             get {
-                return ResourceManager.GetString("DataSetDefaultViewDescr", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_Database", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Represents an in-memory cache of data..
+        ///   Looks up a localized string similar to Current SqlServer that the connection is opened to, &apos;Data Source=X&apos; in the connection string..
         /// </summary>
-        internal static string DataSetDescr {
+        internal static string SqlConnection_DataSource {
             get {
-                return ResourceManager.GetString("DataSetDescr", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_DataSource", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether constraint rules are to be followed..
+        ///   Looks up a localized string similar to Network packet size, &apos;Packet Size=x&apos; in the connection string..
         /// </summary>
-        internal static string DataSetEnforceConstraintsDescr {
+        internal static string SqlConnection_PacketSize {
             get {
-                return ResourceManager.GetString("DataSetEnforceConstraintsDescr", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_PacketSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates that the DataSet has errors..
+        ///   Looks up a localized string similar to Server Process Id (SPID) of the active connection..
         /// </summary>
-        internal static string DataSetHasErrorsDescr {
+        internal static string SqlConnection_ServerProcessId {
             get {
-                return ResourceManager.GetString("DataSetHasErrorsDescr", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_ServerProcessId", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs after Initialization is finished..
+        ///   Looks up a localized string similar to Version of the SQL Server accessed by the SqlConnection..
         /// </summary>
-        internal static string DataSetInitializedDescr {
+        internal static string SqlConnection_ServerVersion {
             get {
-                return ResourceManager.GetString("DataSetInitializedDescr", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_ServerVersion", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates a locale under which to compare strings within the DataSet..
+        ///   Looks up a localized string similar to Collect statistics for this connection..
         /// </summary>
-        internal static string DataSetLocaleDescr {
+        internal static string SqlConnection_StatisticsEnabled {
             get {
-                return ResourceManager.GetString("DataSetLocaleDescr", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_StatisticsEnabled", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs when it is not possible to merge schemas for two tables with the same name..
+        ///   Looks up a localized string similar to Workstation Id, &apos;Workstation ID=x&apos; in the connection string..
         /// </summary>
-        internal static string DataSetMergeFailedDescr {
+        internal static string SqlConnection_WorkstationId {
             get {
-                return ResourceManager.GetString("DataSetMergeFailedDescr", resourceCulture);
+                return ResourceManager.GetString("SqlConnection_WorkstationId", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the XML uri namespace for the root element pointed at by this DataSet..
+        ///   Looks up a localized string similar to Cannot convert object of type &apos;{0}&apos; to object of type &apos;{1}&apos;..
         /// </summary>
-        internal static string DataSetNamespaceDescr {
+        internal static string SqlConvert_ConvertFailed {
             get {
-                return ResourceManager.GetString("DataSetNamespaceDescr", resourceCulture);
+                return ResourceManager.GetString("SqlConvert_ConvertFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the prefix of the namespace used for this DataSet..
+        ///   Looks up a localized string similar to The connection is broken and recovery is not possible.  The client driver attempted to recover the connection one or more times and all attempts failed.  Increase the value of ConnectRetryCount to increase the number of recovery attempts..
         /// </summary>
-        internal static string DataSetPrefixDescr {
+        internal static string SQLCR_AllAttemptsFailed {
             get {
-                return ResourceManager.GetString("DataSetPrefixDescr", resourceCulture);
+                return ResourceManager.GetString("SQLCR_AllAttemptsFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The collection that holds the relations for this DataSet..
+        ///   Looks up a localized string similar to The server did not preserve SSL encryption during a recovery attempt, connection recovery is not possible..
         /// </summary>
-        internal static string DataSetRelationsDescr {
+        internal static string SQLCR_EncryptionChanged {
             get {
-                return ResourceManager.GetString("DataSetRelationsDescr", resourceCulture);
+                return ResourceManager.GetString("SQLCR_EncryptionChanged", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The collection that holds the tables for this DataSet..
+        ///   Looks up a localized string similar to Invalid ConnectRetryCount value (should be 0-255)..
         /// </summary>
-        internal static string DataSetTablesDescr {
+        internal static string SQLCR_InvalidConnectRetryCountValue {
             get {
-                return ResourceManager.GetString("DataSetTablesDescr", resourceCulture);
+                return ResourceManager.GetString("SQLCR_InvalidConnectRetryCountValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid usage of aggregate function {0}() and Type: {1}..
+        ///   Looks up a localized string similar to Invalid ConnectRetryInterval value (should be 1-60)..
         /// </summary>
-        internal static string DataStorage_AggregateException {
+        internal static string SQLCR_InvalidConnectRetryIntervalValue {
             get {
-                return ResourceManager.GetString("DataStorage_AggregateException", resourceCulture);
+                return ResourceManager.GetString("SQLCR_InvalidConnectRetryIntervalValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Type &apos;{0}&apos; does not implement IComparable interface. Comparison cannot be done..
+        ///   Looks up a localized string similar to Failed to create SqlRetryLogicBaseProvider object because of invalid retryMethod parameters.{0}Parameter &apos;{1} {2}&apos; doesn&apos;t have a default value..
         /// </summary>
-        internal static string DataStorage_IComparableNotDefined {
+        internal static string SQLCR_InvalidParameterNoDefault {
             get {
-                return ResourceManager.GetString("DataStorage_IComparableNotDefined", resourceCulture);
+                return ResourceManager.GetString("SQLCR_InvalidParameterNoDefault", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid storage type: {0}..
+        ///   Looks up a localized string similar to Failed to create SqlRetryLogicBaseProvider object because of invalid &apos;{0}&apos; parameters.{1}The function must have a parameter of type &apos;SqlRetryLogicOption&apos;..
         /// </summary>
-        internal static string DataStorage_InvalidStorageType {
+        internal static string SQLCR_InvalidRetryParameters {
             get {
-                return ResourceManager.GetString("DataStorage_InvalidStorageType", resourceCulture);
+                return ResourceManager.GetString("SQLCR_InvalidRetryParameters", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DataSet Xml persistency does not support the value &apos;{0}&apos; as Char value, please use Byte storage instead..
+        ///   Looks up a localized string similar to Invalid return type; return type must be of &apos;{0}&apos; type..
         /// </summary>
-        internal static string DataStorage_ProblematicChars {
+        internal static string SQLCR_InvalidReturnType {
             get {
-                return ResourceManager.GetString("DataStorage_ProblematicChars", resourceCulture);
+                return ResourceManager.GetString("SQLCR_InvalidReturnType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Type of value has a mismatch with column type.
+        ///   Looks up a localized string similar to Next reconnection attempt will exceed query timeout. Reconnection was terminated..
         /// </summary>
-        internal static string DataStorage_SetInvalidDataType {
+        internal static string SQLCR_NextAttemptWillExceedQueryTimeout {
             get {
-                return ResourceManager.GetString("DataStorage_SetInvalidDataType", resourceCulture);
+                return ResourceManager.GetString("SQLCR_NextAttemptWillExceedQueryTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataTable already belongs to another DataSet..
+        ///   Looks up a localized string similar to The server did not acknowledge a recovery attempt, connection recovery is not possible..
         /// </summary>
-        internal static string DataTable_AlreadyInOtherDataSet {
+        internal static string SQLCR_NoCRAckAtReconnection {
             get {
-                return ResourceManager.GetString("DataTable_AlreadyInOtherDataSet", resourceCulture);
+                return ResourceManager.GetString("SQLCR_NoCRAckAtReconnection", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataTable already belongs to this DataSet..
+        ///   Looks up a localized string similar to Failed to resolve the &apos;{0}&apos; method from &apos;{1}&apos; type..
         /// </summary>
-        internal static string DataTable_AlreadyInTheDataSet {
+        internal static string SQLCR_ResolveMethodFailed {
             get {
-                return ResourceManager.GetString("DataTable_AlreadyInTheDataSet", resourceCulture);
+                return ResourceManager.GetString("SQLCR_ResolveMethodFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add a nested relation or an element column to a table containing a SimpleContent column..
+        ///   Looks up a localized string similar to Exception occurred when running the &apos;{0}.{1}()&apos; method..
         /// </summary>
-        internal static string DataTable_CannotAddToSimpleContent {
+        internal static string SQLCR_RetryMethodException {
             get {
-                return ResourceManager.GetString("DataTable_CannotAddToSimpleContent", resourceCulture);
+                return ResourceManager.GetString("SQLCR_RetryMethodException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This DataTable can only be remoted as part of DataSet. One or more Expression Columns has reference to other DataTable(s)..
+        ///   Looks up a localized string similar to Failed to create SqlRetryLogicBaseProvider object because the retryMethod value is null or empty..
         /// </summary>
-        internal static string DataTable_CanNotRemoteDataTable {
+        internal static string SQLCR_RetryMethodNullOrEmpty {
             get {
-                return ResourceManager.GetString("DataTable_CanNotRemoteDataTable", resourceCulture);
+                return ResourceManager.GetString("SQLCR_RetryMethodNullOrEmpty", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot serialize the DataTable. A DataTable being used in one or more DataColumn expressions is not a descendant of current DataTable..
+        ///   Looks up a localized string similar to Sequence contains more than one matching element..
         /// </summary>
-        internal static string DataTable_CanNotSerializeDataTableHierarchy {
+        internal static string SQLCR_SequenceMoreThanOneMatch {
             get {
-                return ResourceManager.GetString("DataTable_CanNotSerializeDataTableHierarchy", resourceCulture);
+                return ResourceManager.GetString("SQLCR_SequenceMoreThanOneMatch", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot serialize the DataTable. DataTable name is not set..
+        ///   Looks up a localized string similar to Sequence contains no matching element..
         /// </summary>
-        internal static string DataTable_CanNotSerializeDataTableWithEmptyName {
+        internal static string SQLCR_SequenceNoMatch {
             get {
-                return ResourceManager.GetString("DataTable_CanNotSerializeDataTableWithEmptyName", resourceCulture);
+                return ResourceManager.GetString("SQLCR_SequenceNoMatch", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot have different remoting format property value for DataSet and DataTable..
+        ///   Looks up a localized string similar to The server did not preserve the exact client TDS version requested during a recovery attempt, connection recovery is not possible..
         /// </summary>
-        internal static string DataTable_CanNotSetRemotingFormat {
+        internal static string SQLCR_TDSVersionNotPreserved {
             get {
-                return ResourceManager.GetString("DataTable_CanNotSetRemotingFormat", resourceCulture);
+                return ResourceManager.GetString("SQLCR_TDSVersionNotPreserved", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The name &apos;{0}&apos; is invalid. A DataTable cannot have the same name of the DataSet..
+        ///   Looks up a localized string similar to The connection is broken and recovery is not possible.  The connection is marked by the client driver as unrecoverable.  No attempt was made to restore the connection..
         /// </summary>
-        internal static string DataTable_DatasetConflictingName {
+        internal static string SQLCR_UnrecoverableClient {
             get {
-                return ResourceManager.GetString("DataTable_DatasetConflictingName", resourceCulture);
+                return ResourceManager.GetString("SQLCR_UnrecoverableClient", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A DataTable named &apos;{0}&apos; already belongs to this DataSet..
+        ///   Looks up a localized string similar to The connection is broken and recovery is not possible.  The connection is marked by the server as unrecoverable.  No attempt was made to restore the connection..
         /// </summary>
-        internal static string DataTable_DuplicateName {
+        internal static string SQLCR_UnrecoverableServer {
             get {
-                return ResourceManager.GetString("DataTable_DuplicateName", resourceCulture);
+                return ResourceManager.GetString("SQLCR_UnrecoverableServer", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A DataTable named &apos;{0}&apos; with the same Namespace &apos;{1}&apos; already belongs to this DataSet..
+        ///   Looks up a localized string similar to Failure while attempting to promote transaction..
         /// </summary>
-        internal static string DataTable_DuplicateName2 {
+        internal static string SqlDelegatedTransaction_PromotionFailed {
             get {
-                return ResourceManager.GetString("DataTable_DuplicateName2", resourceCulture);
+                return ResourceManager.GetString("SqlDelegatedTransaction_PromotionFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to PrimaryKey columns do not belong to this table..
+        ///   Looks up a localized string similar to To add a command to existing dependency object..
         /// </summary>
-        internal static string DataTable_ForeignPrimaryKey {
+        internal static string SqlDependency_AddCommandDependency {
             get {
-                return ResourceManager.GetString("DataTable_ForeignPrimaryKey", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_AddCommandDependency", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove table {0}, because it referenced in ForeignKeyConstraint {1}.  Remove the constraint first..
+        ///   Looks up a localized string similar to The SQL Server Service Broker for the current database is not enabled, and as a result query notifications are not supported.  Please enable the Service Broker for this database if you wish to use notifications..
         /// </summary>
-        internal static string DataTable_InConstraint {
+        internal static string SqlDependency_DatabaseBrokerDisabled {
             get {
-                return ResourceManager.GetString("DataTable_InConstraint", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_DatabaseBrokerDisabled", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove a table that has existing relations.  Remove relations first..
+        ///   Looks up a localized string similar to When using SqlDependency without providing an options value, SqlDependency.Start() must be called prior to execution of a command added to the SqlDependency instance..
         /// </summary>
-        internal static string DataTable_InRelation {
+        internal static string SqlDependency_DefaultOptionsButNoStart {
             get {
-                return ResourceManager.GetString("DataTable_InRelation", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_DefaultOptionsButNoStart", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} isn&apos;t a valid Sort string entry..
+        ///   Looks up a localized string similar to SqlDependency does not support calling Start() with different connection strings having the same server, user, and database in the same app domain..
         /// </summary>
-        internal static string DataTable_InvalidSortString {
+        internal static string SqlDependency_DuplicateStart {
             get {
-                return ResourceManager.GetString("DataTable_InvalidSortString", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_DuplicateStart", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Table doesn&apos;t have a primary key..
+        ///   Looks up a localized string similar to SqlDependency.OnChange does not support multiple event registrations for the same delegate..
         /// </summary>
-        internal static string DataTable_MissingPrimaryKey {
+        internal static string SqlDependency_EventNoDuplicate {
             get {
-                return ResourceManager.GetString("DataTable_MissingPrimaryKey", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_EventNoDuplicate", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataTable already has a simple content column..
+        ///   Looks up a localized string similar to Property to indicate if this dependency is invalid..
         /// </summary>
-        internal static string DataTable_MultipleSimpleContentColumns {
+        internal static string SqlDependency_HasChanges {
             get {
-                return ResourceManager.GetString("DataTable_MultipleSimpleContentColumns", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_HasChanges", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to TableName is required when it is part of a DataSet..
+        ///   Looks up a localized string similar to A string that uniquely identifies this dependency object..
         /// </summary>
-        internal static string DataTable_NoName {
+        internal static string SqlDependency_Id {
             get {
-                return ResourceManager.GetString("DataTable_NoName", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_Id", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Table {0} does not belong to this DataSet..
+        ///   Looks up a localized string similar to No SqlDependency exists for the key..
         /// </summary>
-        internal static string DataTable_NotInTheDataSet {
+        internal static string SqlDependency_IdMismatch {
             get {
-                return ResourceManager.GetString("DataTable_NotInTheDataSet", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_IdMismatch", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot find table {0}..
+        ///   Looks up a localized string similar to Timeout specified is invalid. Timeout cannot be &lt; 0..
         /// </summary>
-        internal static string DataTable_OutOfRange {
+        internal static string SqlDependency_InvalidTimeout {
             get {
-                return ResourceManager.GetString("DataTable_OutOfRange", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_InvalidTimeout", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The table ({0}) cannot be the child table to itself in a nested relation: the DataSet name conflicts with the table name..
+        ///   Looks up a localized string similar to SqlDependency.Start has been called for the server the command is executing against more than once, but there is no matching server/user/database Start() call for current command..
         /// </summary>
-        internal static string DataTable_SelfnestedDatasetConflictingName {
+        internal static string SqlDependency_NoMatchingServerDatabaseStart {
             get {
-                return ResourceManager.GetString("DataTable_SelfnestedDatasetConflictingName", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_NoMatchingServerDatabaseStart", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataTable &apos;{0}&apos; does not match to any DataTable in source..
+        ///   Looks up a localized string similar to When using SqlDependency without providing an options value, SqlDependency.Start() must be called for each server that is being executed against..
         /// </summary>
-        internal static string DataTable_TableNotFound {
+        internal static string SqlDependency_NoMatchingServerStart {
             get {
-                return ResourceManager.GetString("DataTable_TableNotFound", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_NoMatchingServerStart", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether comparing strings within the table is case sensitive..
+        ///   Looks up a localized string similar to Event that can be used to subscribe for change notifications..
         /// </summary>
-        internal static string DataTableCaseSensitiveDescr {
+        internal static string SqlDependency_OnChange {
             get {
-                return ResourceManager.GetString("DataTableCaseSensitiveDescr", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_OnChange", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Returns the child relations for this table..
+        ///   Looks up a localized string similar to Unexpected type detected on deserialize..
         /// </summary>
-        internal static string DataTableChildRelationsDescr {
+        internal static string SqlDependency_UnexpectedValueOnDeserialize {
             get {
-                return ResourceManager.GetString("DataTableChildRelationsDescr", resourceCulture);
+                return ResourceManager.GetString("SqlDependency_UnexpectedValueOnDeserialize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs when a value has been changed for this column..
+        ///   Looks up a localized string similar to The process cannot access the file specified because it has been opened in another transaction..
         /// </summary>
-        internal static string DataTableColumnChangedDescr {
+        internal static string SqlFileStream_FileAlreadyInTransaction {
             get {
-                return ResourceManager.GetString("DataTableColumnChangedDescr", resourceCulture);
+                return ResourceManager.GetString("SqlFileStream_FileAlreadyInTransaction", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs when a value has been submitted for this column.  The user can modify the proposed value and should throw an exception to cancel the edit..
+        ///   Looks up a localized string similar to An invalid parameter was passed to the function..
         /// </summary>
-        internal static string DataTableColumnChangingDescr {
+        internal static string SqlFileStream_InvalidParameter {
             get {
-                return ResourceManager.GetString("DataTableColumnChangingDescr", resourceCulture);
+                return ResourceManager.GetString("SqlFileStream_InvalidParameter", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The collection that holds the columns for this table..
+        ///   Looks up a localized string similar to The path name is not valid..
         /// </summary>
-        internal static string DataTableColumnsDescr {
+        internal static string SqlFileStream_InvalidPath {
             get {
-                return ResourceManager.GetString("DataTableColumnsDescr", resourceCulture);
+                return ResourceManager.GetString("SqlFileStream_InvalidPath", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The collection that holds the constraints for this table..
+        ///   Looks up a localized string similar to SqlFileStream is not supported on this platform..
         /// </summary>
-        internal static string DataTableConstraintsDescr {
+        internal static string SqlFileStream_NotSupported {
             get {
-                return ResourceManager.GetString("DataTableConstraintsDescr", resourceCulture);
+                return ResourceManager.GetString("SqlFileStream_NotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the DataSet to which this table belongs..
+        ///   Looks up a localized string similar to The path name is invalid or does not point to a disk file..
         /// </summary>
-        internal static string DataTableDataSetDescr {
+        internal static string SqlFileStream_PathNotValidDiskResource {
             get {
-                return ResourceManager.GetString("DataTableDataSetDescr", resourceCulture);
+                return ResourceManager.GetString("SqlFileStream_PathNotValidDiskResource", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This is the default DataView for the table..
+        ///   Looks up a localized string similar to The dbType {0} is invalid for this constructor..
         /// </summary>
-        internal static string DataTableDefaultViewDescr {
+        internal static string SqlMetaData_InvalidSqlDbTypeForConstructorFormat {
             get {
-                return ResourceManager.GetString("DataTableDefaultViewDescr", resourceCulture);
+                return ResourceManager.GetString("SqlMetaData_InvalidSqlDbTypeForConstructorFormat", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The expression used to compute the data-bound value of this row..
+        ///   Looks up a localized string similar to The name is too long..
         /// </summary>
-        internal static string DataTableDisplayExpressionDescr {
+        internal static string SqlMetaData_NameTooLong {
             get {
-                return ResourceManager.GetString("DataTableDisplayExpressionDescr", resourceCulture);
+                return ResourceManager.GetString("SqlMetaData_NameTooLong", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Returns whether the table has errors..
+        ///   Looks up a localized string similar to The sort order and ordinal must either both be specified, or neither should be specified (SortOrder.Unspecified and -1).  The values given were: order = {0}, ordinal = {1}..
         /// </summary>
-        internal static string DataTableHasErrorsDescr {
+        internal static string SqlMetaData_SpecifyBothSortOrderAndOrdinal {
             get {
-                return ResourceManager.GetString("DataTableHasErrorsDescr", resourceCulture);
+                return ResourceManager.GetString("SqlMetaData_SpecifyBothSortOrderAndOrdinal", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates a locale under which to compare strings within the table..
+        ///   Looks up a localized string similar to Conversion overflows..
         /// </summary>
-        internal static string DataTableLocaleDescr {
+        internal static string SqlMisc_ConversionOverflowMessage {
             get {
-                return ResourceManager.GetString("DataTableLocaleDescr", resourceCulture);
+                return ResourceManager.GetString("SqlMisc_ConversionOverflowMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Individual columns mappings when this table mapping is matched..
+        ///   Looks up a localized string similar to SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM..
         /// </summary>
-        internal static string DataTableMapping_ColumnMappings {
+        internal static string SqlMisc_DateTimeOverflowMessage {
             get {
-                return ResourceManager.GetString("DataTableMapping_ColumnMappings", resourceCulture);
+                return ResourceManager.GetString("SqlMisc_DateTimeOverflowMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataTable.TableName.
+        ///   Looks up a localized string similar to Invalid array size..
         /// </summary>
-        internal static string DataTableMapping_DataSetTable {
+        internal static string SqlMisc_InvalidArraySizeMessage {
             get {
-                return ResourceManager.GetString("DataTableMapping_DataSetTable", resourceCulture);
+                return ResourceManager.GetString("SqlMisc_InvalidArraySizeMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DataTableMapping source table name. This name is case sensitive..
+        ///   Looks up a localized string similar to Invalid numeric precision/scale..
         /// </summary>
-        internal static string DataTableMapping_SourceTable {
+        internal static string SqlMisc_InvalidPrecScaleMessage {
             get {
-                return ResourceManager.GetString("DataTableMapping_SourceTable", resourceCulture);
+                return ResourceManager.GetString("SqlMisc_InvalidPrecScaleMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The number of items in the collection.
+        ///   Looks up a localized string similar to Null.
         /// </summary>
-        internal static string DataTableMappings_Count {
+        internal static string SqlMisc_NullString {
             get {
-                return ResourceManager.GetString("DataTableMappings_Count", resourceCulture);
+                return ResourceManager.GetString("SqlMisc_NullString", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The specified DataTableMapping object.
+        ///   Looks up a localized string similar to An error occurred while reading..
         /// </summary>
-        internal static string DataTableMappings_Item {
+        internal static string SqlMisc_StreamErrorMessage {
             get {
-                return ResourceManager.GetString("DataTableMappings_Item", resourceCulture);
+                return ResourceManager.GetString("SqlMisc_StreamErrorMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates an initial starting size for this table..
+        ///   Looks up a localized string similar to Data returned is larger than 2Gb in size. Use SequentialAccess command behavior in order to get all of the data..
         /// </summary>
-        internal static string DataTableMinimumCapacityDescr {
+        internal static string SqlMisc_TruncationMaxDataMessage {
             get {
-                return ResourceManager.GetString("DataTableMinimumCapacityDescr", resourceCulture);
+                return ResourceManager.GetString("SqlMisc_TruncationMaxDataMessage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the XML uri namespace for the elements contained in this table..
+        ///   Looks up a localized string similar to Connecting to a mirrored SQL Server instance using the MultiSubnetFailover connection option is not supported..
         /// </summary>
-        internal static string DataTableNamespaceDescr {
+        internal static string SQLMSF_FailoverPartnerNotSupported {
             get {
-                return ResourceManager.GetString("DataTableNamespaceDescr", resourceCulture);
+                return ResourceManager.GetString("SQLMSF_FailoverPartnerNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Returns the parent relations for this table..
+        ///   Looks up a localized string similar to This SqlCommand object is already associated with another SqlDependency object..
         /// </summary>
-        internal static string DataTableParentRelationsDescr {
+        internal static string SQLNotify_AlreadyHasCommand {
             get {
-                return ResourceManager.GetString("DataTableParentRelationsDescr", resourceCulture);
+                return ResourceManager.GetString("SQLNotify_AlreadyHasCommand", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the Prefix of the namespace used for this table in XML representation..
+        ///   Looks up a localized string similar to DBNull value for parameter &apos;{0}&apos; is not supported. Table-valued parameters cannot be DBNull..
         /// </summary>
-        internal static string DataTablePrefixDescr {
+        internal static string SqlParameter_DBNullNotSupportedForTVP {
             get {
-                return ResourceManager.GetString("DataTablePrefixDescr", resourceCulture);
+                return ResourceManager.GetString("SqlParameter_DBNullNotSupportedForTVP", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the column(s) that represent the primary key for this table..
+        ///   Looks up a localized string similar to Precision &apos;{0}&apos; required to send all values in column &apos;{1}&apos; exceeds the maximum supported precision &apos;{2}&apos;. The values must all fit in a single precision..
         /// </summary>
-        internal static string DataTablePrimaryKeyDescr {
+        internal static string SqlParameter_InvalidTableDerivedPrecisionForTvp {
             get {
-                return ResourceManager.GetString("DataTablePrimaryKeyDescr", resourceCulture);
+                return ResourceManager.GetString("SqlParameter_InvalidTableDerivedPrecisionForTvp", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create DataTableReader. Arguments contain null value..
+        ///   Looks up a localized string similar to When used by DataAdapter.Update, the parameter value is changed from DBNull.Value into (Int32)1 or (Int32)0 if non-null..
         /// </summary>
-        internal static string DataTableReader_ArgumentContainsNullValue {
+        internal static string SqlParameter_SourceColumnNullMapping {
             get {
-                return ResourceManager.GetString("DataTableReader_ArgumentContainsNullValue", resourceCulture);
+                return ResourceManager.GetString("SqlParameter_SourceColumnNullMapping", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataTableReader Cannot be created. There is no DataTable in DataSet..
+        ///   Looks up a localized string similar to TypeName specified for parameter &apos;{0}&apos;.  TypeName must only be set for Structured parameters..
         /// </summary>
-        internal static string DataTableReader_CannotCreateDataReaderOnEmptyDataSet {
+        internal static string SqlParameter_UnexpectedTypeNameForNonStruct {
             get {
-                return ResourceManager.GetString("DataTableReader_CannotCreateDataReaderOnEmptyDataSet", resourceCulture);
+                return ResourceManager.GetString("SqlParameter_UnexpectedTypeNameForNonStruct", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Current DataTable &apos;{0}&apos; is empty. There is no DataRow in DataTable..
+        ///   Looks up a localized string similar to ParameterDirection &apos;{0}&apos; specified for parameter &apos;{1}&apos; is not supported. Table-valued parameters only support ParameterDirection.Input..
         /// </summary>
-        internal static string DataTableReader_DataTableCleared {
+        internal static string SqlParameter_UnsupportedTVPOutputParameter {
             get {
-                return ResourceManager.GetString("DataTableReader_DataTableCleared", resourceCulture);
+                return ResourceManager.GetString("SqlParameter_UnsupportedTVPOutputParameter", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot create DataTableReader. Argument is Empty..
+        ///   Looks up a localized string similar to The sort ordinal {0} was specified twice..
         /// </summary>
-        internal static string DataTableReader_DataTableReaderArgumentIsEmpty {
+        internal static string SqlProvider_DuplicateSortOrdinal {
             get {
-                return ResourceManager.GetString("DataTableReader_DataTableReaderArgumentIsEmpty", resourceCulture);
+                return ResourceManager.GetString("SqlProvider_DuplicateSortOrdinal", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataTableReader is invalid for current DataTable &apos;{0}&apos;..
+        ///   Looks up a localized string similar to The size of column &apos;{0}&apos; is not supported. The size is {1}..
         /// </summary>
-        internal static string DataTableReader_InvalidDataTableReader {
+        internal static string SqlProvider_InvalidDataColumnMaxLength {
             get {
-                return ResourceManager.GetString("DataTableReader_InvalidDataTableReader", resourceCulture);
+                return ResourceManager.GetString("SqlProvider_InvalidDataColumnMaxLength", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Current DataRow is either in Deleted or Detached state..
+        ///   Looks up a localized string similar to The type of column &apos;{0}&apos; is not supported.  The type is &apos;{1}&apos;.
         /// </summary>
-        internal static string DataTableReader_InvalidRowInDataTableReader {
+        internal static string SqlProvider_InvalidDataColumnType {
             get {
-                return ResourceManager.GetString("DataTableReader_InvalidRowInDataTableReader", resourceCulture);
+                return ResourceManager.GetString("SqlProvider_InvalidDataColumnType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Schema of current DataTable &apos;{0}&apos; in DataTableReader has changed, DataTableReader is invalid..
+        ///   Looks up a localized string similar to The sort ordinal {0} was not specified..
         /// </summary>
-        internal static string DataTableReader_SchemaInvalidDataTableReader {
+        internal static string SqlProvider_MissingSortOrdinal {
             get {
-                return ResourceManager.GetString("DataTableReader_SchemaInvalidDataTableReader", resourceCulture);
+                return ResourceManager.GetString("SqlProvider_MissingSortOrdinal", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs after a row in the table has been successfully edited..
+        ///   Looks up a localized string similar to There are not enough fields in the Structured type.  Structured types must have at least one field..
         /// </summary>
-        internal static string DataTableRowChangedDescr {
+        internal static string SqlProvider_NotEnoughColumnsInStructuredType {
             get {
-                return ResourceManager.GetString("DataTableRowChangedDescr", resourceCulture);
+                return ResourceManager.GetString("SqlProvider_NotEnoughColumnsInStructuredType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs when the row is being changed so that the event handler can modify or cancel the change. The user can modify values in the row and should throw an  exception to cancel the edit..
+        ///   Looks up a localized string similar to The sort ordinal {0} on field {1} exceeds the total number of fields..
         /// </summary>
-        internal static string DataTableRowChangingDescr {
+        internal static string SqlProvider_SortOrdinalGreaterThanFieldCount {
             get {
-                return ResourceManager.GetString("DataTableRowChangingDescr", resourceCulture);
+                return ResourceManager.GetString("SqlProvider_SortOrdinalGreaterThanFieldCount", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs after a row in the table has been successfully deleted..
+        ///   Looks up a localized string similar to &apos;{0}&apos; is not less than &apos;{1}&apos;; &apos;{2}&apos; cannot be greater than &apos;{3}&apos;..
         /// </summary>
-        internal static string DataTableRowDeletedDescr {
+        internal static string SqlRetryLogic_InvalidMinMaxPair {
             get {
-                return ResourceManager.GetString("DataTableRowDeletedDescr", resourceCulture);
+                return ResourceManager.GetString("SqlRetryLogic_InvalidMinMaxPair", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs when a row in the table marked for deletion.  Throw an exception to cancel the deletion..
+        ///   Looks up a localized string similar to Value &apos;{0}&apos; is out of range. Must be between {1} and {2}..
         /// </summary>
-        internal static string DataTableRowDeletingDescr {
+        internal static string SqlRetryLogic_InvalidRange {
             get {
-                return ResourceManager.GetString("DataTableRowDeletingDescr", resourceCulture);
+                return ResourceManager.GetString("SqlRetryLogic_InvalidRange", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs after all rows in the table has been successfully cleared..
+        ///   Looks up a localized string similar to The retry has been canceled at attempt {0}..
         /// </summary>
-        internal static string DataTableRowsClearedDescr {
+        internal static string SqlRetryLogic_RetryCanceled {
             get {
-                return ResourceManager.GetString("DataTableRowsClearedDescr", resourceCulture);
+                return ResourceManager.GetString("SqlRetryLogic_RetryCanceled", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs prior to clearing all rows from the table..
+        ///   Looks up a localized string similar to The number of retries has exceeded the maximum of {0} attempt(s)..
         /// </summary>
-        internal static string DataTableRowsClearingDescr {
+        internal static string SqlRetryLogic_RetryExceeded {
             get {
-                return ResourceManager.GetString("DataTableRowsClearingDescr", resourceCulture);
+                return ResourceManager.GetString("SqlRetryLogic_RetryExceeded", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the collection that holds the rows of data for this table..
+        ///   Looks up a localized string similar to Connecting to a mirrored SQL Server instance using the ApplicationIntent ReadOnly connection option is not supported..
         /// </summary>
-        internal static string DataTableRowsDescr {
+        internal static string SQLROR_FailoverNotSupported {
             get {
-                return ResourceManager.GetString("DataTableRowsDescr", resourceCulture);
+                return ResourceManager.GetString("SQLROR_FailoverNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Occurs after a new DataRow has been instantiated..
+        ///   Looks up a localized string similar to Invalid enhanced routing information received..
         /// </summary>
-        internal static string DataTableRowsNewRowDescr {
+        internal static string SQLROR_InvalidEnhancedRoutingInfo {
             get {
-                return ResourceManager.GetString("DataTableRowsNewRowDescr", resourceCulture);
+                return ResourceManager.GetString("SQLROR_InvalidEnhancedRoutingInfo", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the name used to look up this table in the Tables collection of a DataSet..
+        ///   Looks up a localized string similar to Invalid routing information received..
         /// </summary>
-        internal static string DataTableTableNameDescr {
+        internal static string SQLROR_InvalidRoutingInfo {
             get {
-                return ResourceManager.GetString("DataTableTableNameDescr", resourceCulture);
+                return ResourceManager.GetString("SQLROR_InvalidRoutingInfo", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot add external objects to this list..
+        ///   Looks up a localized string similar to Too many redirections have occurred. Only {0} redirections per login is allowed..
         /// </summary>
-        internal static string DataView_AddExternalObject {
+        internal static string SQLROR_RecursiveRoutingNotSupported {
             get {
-                return ResourceManager.GetString("DataView_AddExternalObject", resourceCulture);
+                return ResourceManager.GetString("SQLROR_RecursiveRoutingNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot call AddNew on a DataView where AllowNew is false..
+        ///   Looks up a localized string similar to Server provided routing information, but timeout already expired..
         /// </summary>
-        internal static string DataView_AddNewNotAllowNull {
+        internal static string SQLROR_TimeoutAfterRoutingInfo {
             get {
-                return ResourceManager.GetString("DataView_AddNewNotAllowNull", resourceCulture);
+                return ResourceManager.GetString("SQLROR_TimeoutAfterRoutingInfo", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot bind to DataTable with no name..
+        ///   Looks up a localized string similar to UDT size must be less than {1}, size: {0}.
         /// </summary>
-        internal static string DataView_CanNotBindTable {
+        internal static string SQLUDT_InvalidSize {
             get {
-                return ResourceManager.GetString("DataView_CanNotBindTable", resourceCulture);
+                return ResourceManager.GetString("SQLUDT_InvalidSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot clear this list..
+        ///   Looks up a localized string similar to Specified type is not registered on the target server.{0}..
         /// </summary>
-        internal static string DataView_CanNotClear {
+        internal static string SQLUDT_InvalidSqlType {
             get {
-                return ResourceManager.GetString("DataView_CanNotClear", resourceCulture);
+                return ResourceManager.GetString("SQLUDT_InvalidSqlType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot delete on a DataSource where AllowDelete is false..
+        ///   Looks up a localized string similar to UdtTypeName property must be set for UDT parameters..
         /// </summary>
-        internal static string DataView_CanNotDelete {
+        internal static string SQLUDT_InvalidUdtTypeName {
             get {
-                return ResourceManager.GetString("DataView_CanNotDelete", resourceCulture);
+                return ResourceManager.GetString("SQLUDT_InvalidUdtTypeName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot edit on a DataSource where AllowEdit is false..
+        ///   Looks up a localized string similar to unexpected error encountered in SqlClient data provider. {0}.
         /// </summary>
-        internal static string DataView_CanNotEdit {
+        internal static string SQLUDT_Unexpected {
             get {
-                return ResourceManager.GetString("DataView_CanNotEdit", resourceCulture);
+                return ResourceManager.GetString("SQLUDT_Unexpected", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change DataSet property once it is set..
+        ///   Looks up a localized string similar to UdtTypeName property must be set only for UDT parameters..
         /// </summary>
-        internal static string DataView_CanNotSetDataSet {
+        internal static string SQLUDT_UnexpectedUdtTypeName {
             get {
-                return ResourceManager.GetString("DataView_CanNotSetDataSet", resourceCulture);
+                return ResourceManager.GetString("SQLUDT_UnexpectedUdtTypeName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change Table property once it is set..
+        ///   Looks up a localized string similar to no UDT attribute.
         /// </summary>
-        internal static string DataView_CanNotSetTable {
+        internal static string SqlUdtReason_NoUdtAttribute {
             get {
-                return ResourceManager.GetString("DataView_CanNotSetTable", resourceCulture);
+                return ResourceManager.GetString("SqlUdtReason_NoUdtAttribute", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataTable must be set prior to using DataView..
+        ///   Looks up a localized string similar to Attestation information was not returned by SQL Server. Enclave type is &apos;{0}&apos; and enclave attestation URL is &apos;{1}&apos;..
         /// </summary>
-        internal static string DataView_CanNotUse {
+        internal static string TCE_AttestationInfoNotReturnedFromSQLServer {
             get {
-                return ResourceManager.GetString("DataView_CanNotUse", resourceCulture);
+                return ResourceManager.GetString("TCE_AttestationInfoNotReturnedFromSQLServer", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataSet must be set prior to using DataViewManager..
+        ///   Looks up a localized string similar to Error occurred when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations..
         /// </summary>
-        internal static string DataView_CanNotUseDataViewManager {
+        internal static string TCE_AttestationProtocolNotSpecifiedForGeneratingEnclavePackage {
             get {
-                return ResourceManager.GetString("DataView_CanNotUseDataViewManager", resourceCulture);
+                return ResourceManager.GetString("TCE_AttestationProtocolNotSpecifiedForGeneratingEnclavePackage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The relation is not parented to the table to which this DataView points..
+        ///   Looks up a localized string similar to You have specified the attestation protocol in the connection string, but the SQL Server in use does not support enclave based computations - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details..
         /// </summary>
-        internal static string DataView_CreateChildView {
+        internal static string TCE_AttestationProtocolNotSupported {
             get {
-                return ResourceManager.GetString("DataView_CreateChildView", resourceCulture);
+                return ResourceManager.GetString("TCE_AttestationProtocolNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Index {0} is either negative or above rows count..
+        ///   Looks up a localized string similar to Failed to initialize connection. The attestation protocol &apos;{0}&apos; does not support the enclave type &apos;{1}&apos;..
         /// </summary>
-        internal static string DataView_GetElementIndex {
+        internal static string TCE_AttestationProtocolNotSupportEnclaveType {
             get {
-                return ResourceManager.GetString("DataView_GetElementIndex", resourceCulture);
+                return ResourceManager.GetString("TCE_AttestationProtocolNotSupportEnclaveType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot insert external objects to this list..
+        ///   Looks up a localized string similar to You have specified the enclave attestation URL in the connection string, but the SQL Server in use does not support enclave based computations - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details..
         /// </summary>
-        internal static string DataView_InsertExternalObject {
+        internal static string TCE_AttestationURLNotSupported {
             get {
-                return ResourceManager.GetString("DataView_InsertExternalObject", resourceCulture);
+                return ResourceManager.GetString("TCE_AttestationURLNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataView is not open..
+        ///   Looks up a localized string similar to {0} should be identical on all commands ({1}, {2}, {3}, {4}) when doing batch updates..
         /// </summary>
-        internal static string DataView_NotOpen {
+        internal static string TCE_BatchedUpdateColumnEncryptionSettingMismatch {
             get {
-                return ResourceManager.GetString("DataView_NotOpen", resourceCulture);
+                return ResourceManager.GetString("TCE_BatchedUpdateColumnEncryptionSettingMismatch", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot remove objects not in the list..
+        ///   Looks up a localized string similar to Key store providers cannot be set more than once..
         /// </summary>
-        internal static string DataView_RemoveExternalObject {
+        internal static string TCE_CanOnlyCallOnce {
             get {
-                return ResourceManager.GetString("DataView_RemoveExternalObject", resourceCulture);
+                return ResourceManager.GetString("TCE_CanOnlyCallOnce", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change DataSet on a DataViewManager that&apos;s already the default view for a DataSet..
+        ///   Looks up a localized string similar to Certificate with thumbprint &apos;{0}&apos; not found in certificate store &apos;{1}&apos; in certificate location &apos;{2}&apos;..
         /// </summary>
-        internal static string DataView_SetDataSetFailed {
+        internal static string TCE_CertificateNotFound {
             get {
-                return ResourceManager.GetString("DataView_SetDataSetFailed", resourceCulture);
+                return ResourceManager.GetString("TCE_CertificateNotFound", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set {0}..
+        ///   Looks up a localized string similar to Certificate with thumbprint &apos;{0}&apos; not found in certificate store &apos;{1}&apos; in certificate location &apos;{2}&apos;. Verify the certificate path in the column master key definition in the database is correct, and the certificate has been imported correctly into the certificate location/store..
         /// </summary>
-        internal static string DataView_SetFailed {
+        internal static string TCE_CertificateNotFoundSysErr {
             get {
-                return ResourceManager.GetString("DataView_SetFailed", resourceCulture);
+                return ResourceManager.GetString("TCE_CertificateNotFoundSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set an object into this list..
+        ///   Looks up a localized string similar to Certificate specified in key path &apos;{0}&apos; does not have a private key to encrypt a column encryption key. Verify the certificate is imported correctly..
         /// </summary>
-        internal static string DataView_SetIListObject {
+        internal static string TCE_CertificateWithNoPrivateKey {
             get {
-                return ResourceManager.GetString("DataView_SetIListObject", resourceCulture);
+                return ResourceManager.GetString("TCE_CertificateWithNoPrivateKey", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to RowStateFilter cannot show ModifiedOriginals and ModifiedCurrents at the same time..
+        ///   Looks up a localized string similar to Certificate specified in key path &apos;{0}&apos; does not have a private key to decrypt a column encryption key. Verify the certificate is imported correctly..
         /// </summary>
-        internal static string DataView_SetRowStateFilter {
+        internal static string TCE_CertificateWithNoPrivateKeySysErr {
             get {
-                return ResourceManager.GetString("DataView_SetRowStateFilter", resourceCulture);
+                return ResourceManager.GetString("TCE_CertificateWithNoPrivateKeySysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot change Table property on a DefaultView or a DataView coming from a DataViewManager..
+        ///   Looks up a localized string similar to Failed to decrypt column &apos;{0}&apos;..
         /// </summary>
-        internal static string DataView_SetTable {
+        internal static string TCE_ColumnDecryptionFailed {
             get {
-                return ResourceManager.GetString("DataView_SetTable", resourceCulture);
+                return ResourceManager.GetString("TCE_ColumnDecryptionFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether this DataView and the user interface associated with it allows deletes..
+        ///   Looks up a localized string similar to Internal Error. Encrypted column encryption keys not found when trying to send the keys to the enclave..
         /// </summary>
-        internal static string DataViewAllowDeleteDescr {
+        internal static string TCE_ColumnEncryptionKeysNotFound {
             get {
-                return ResourceManager.GetString("DataViewAllowDeleteDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_ColumnEncryptionKeysNotFound", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether this DataView and the user interface associated with it allows edits..
+        ///   Looks up a localized string similar to Internal error. The signature returned by SQL Server for enclave-enabled column master key, specified at key path &apos;{0}&apos;, cannot be null or empty..
         /// </summary>
-        internal static string DataViewAllowEditDescr {
+        internal static string TCE_ColumnMasterKeySignatureNotFound {
             get {
-                return ResourceManager.GetString("DataViewAllowEditDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_ColumnMasterKeySignatureNotFound", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether this DataView and the user interface associated with it allows new rows to be added..
+        ///   Looks up a localized string similar to The signature returned by SQL Server for the column master key, specified in key path &apos;{0}&apos;, is invalid (does not match the computed signature). Recreate column master key metadata, making sure the signature inside the metadata is computed using the column master key being referenced in the metadata. If the error persists, please contact Microsoft for assistance..
         /// </summary>
-        internal static string DataViewAllowNewDescr {
+        internal static string TCE_ColumnMasterKeySignatureVerificationFailed {
             get {
-                return ResourceManager.GetString("DataViewAllowNewDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_ColumnMasterKeySignatureVerificationFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether to use the default sort if the Sort property is not set..
+        ///   Looks up a localized string similar to Specifies an attestation protocol for its corresponding enclave attestation service..
         /// </summary>
-        internal static string DataViewApplyDefaultSortDescr {
+        internal static string TCE_DbConnectionString_AttestationProtocol {
             get {
-                return ResourceManager.GetString("DataViewApplyDefaultSortDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_DbConnectionString_AttestationProtocol", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Returns the number of items currently in this view..
+        ///   Looks up a localized string similar to Default column encryption setting for all the commands on the connection..
         /// </summary>
-        internal static string DataViewCountDescr {
+        internal static string TCE_DbConnectionString_ColumnEncryptionSetting {
             get {
-                return ResourceManager.GetString("DataViewCountDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_DbConnectionString_ColumnEncryptionSetting", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This returns a pointer to back to the DataViewManager that owns this DataSet (if any)..
+        ///   Looks up a localized string similar to Specifies an endpoint of an enclave attestation service, which will be used to verify whether the enclave, configured in the SQL Server instance for computations on database columns encrypted using Always Encrypted, is valid and secure..
         /// </summary>
-        internal static string DataViewDataViewManagerDescr {
+        internal static string TCE_DbConnectionString_EnclaveAttestationUrl {
             get {
-                return ResourceManager.GetString("DataViewDataViewManagerDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_DbConnectionString_EnclaveAttestationUrl", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates whether the view is open..
+        ///   Looks up a localized string similar to Specifies an IP address preference when connecting to SQL instances..
         /// </summary>
-        internal static string DataViewIsOpenDescr {
+        internal static string TCE_DbConnectionString_IPAddressPreference {
             get {
-                return ResourceManager.GetString("DataViewIsOpenDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_DbConnectionString_IPAddressPreference", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates that the data returned by this DataView has somehow changed..
+        ///   Looks up a localized string similar to Decryption failed. The last 10 bytes of the encrypted column encryption key are: &apos;{0}&apos;. The first 10 bytes of ciphertext are: &apos;{1}&apos;..
         /// </summary>
-        internal static string DataViewListChangedDescr {
+        internal static string TCE_DecryptionFailed {
             get {
-                return ResourceManager.GetString("DataViewListChangedDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_DecryptionFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the source of data for this DataViewManager..
+        ///   Looks up a localized string similar to Internal Error. Empty argument &apos;{0}&apos; specified when constructing an object of type &apos;{1}&apos;. &apos;{0}&apos; cannot be empty..
         /// </summary>
-        internal static string DataViewManagerDataSetDescr {
+        internal static string TCE_EmptyArgumentInConstructorInternal {
             get {
-                return ResourceManager.GetString("DataViewManagerDataSetDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyArgumentInConstructorInternal", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the sorting/filtering/state settings for any table in the corresponding DataSet..
+        ///   Looks up a localized string similar to Internal Error. Argument &apos;{0}&apos; cannot be empty when executing method &apos;{1}.{2}&apos;..
         /// </summary>
-        internal static string DataViewManagerTableSettingsDescr {
+        internal static string TCE_EmptyArgumentInternal {
             get {
-                return ResourceManager.GetString("DataViewManagerTableSettingsDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyArgumentInternal", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates an expression used to filter the data returned by this DataView..
+        ///   Looks up a localized string similar to Empty certificate thumbprint specified in certificate path &apos;{0}&apos;..
         /// </summary>
-        internal static string DataViewRowFilterDescr {
+        internal static string TCE_EmptyCertificateThumbprint {
             get {
-                return ResourceManager.GetString("DataViewRowFilterDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyCertificateThumbprint", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the versions of data returned by this DataView..
+        ///   Looks up a localized string similar to Internal error. Empty certificate thumbprint specified in certificate path &apos;{0}&apos;..
         /// </summary>
-        internal static string DataViewRowStateFilterDescr {
+        internal static string TCE_EmptyCertificateThumbprintSysErr {
             get {
-                return ResourceManager.GetString("DataViewRowStateFilterDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyCertificateThumbprintSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the names of the column and the order in which data is returned by this DataView..
+        ///   Looks up a localized string similar to Empty key identifier specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DataViewSortDescr {
+        internal static string TCE_EmptyCngKeyId {
             get {
-                return ResourceManager.GetString("DataViewSortDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyCngKeyId", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the table this DataView uses to get data..
+        ///   Looks up a localized string similar to Internal error. Empty key identifier specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DataViewTableDescr {
+        internal static string TCE_EmptyCngKeyIdSysErr {
             get {
-                return ResourceManager.GetString("DataViewTableDescr", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyCngKeyIdSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Command text to execute..
+        ///   Looks up a localized string similar to Empty Microsoft Cryptography API: Next Generation (CNG) provider name specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DbCommand_CommandText {
+        internal static string TCE_EmptyCngName {
             get {
-                return ResourceManager.GetString("DbCommand_CommandText", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyCngName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Time to wait for command to execute..
+        ///   Looks up a localized string similar to Internal error. Empty Microsoft Cryptography API: Next Generation (CNG) provider name specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DbCommand_CommandTimeout {
+        internal static string TCE_EmptyCngNameSysErr {
             get {
-                return ResourceManager.GetString("DbCommand_CommandTimeout", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyCngNameSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to How to interpret the CommandText..
+        ///   Looks up a localized string similar to Empty column encryption key specified..
         /// </summary>
-        internal static string DbCommand_CommandType {
+        internal static string TCE_EmptyColumnEncryptionKey {
             get {
-                return ResourceManager.GetString("DbCommand_CommandType", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyColumnEncryptionKey", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection used by the command..
+        ///   Looks up a localized string similar to Empty key identifier specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DbCommand_Connection {
+        internal static string TCE_EmptyCspKeyId {
             get {
-                return ResourceManager.GetString("DbCommand_Connection", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyCspKeyId", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The parameters collection..
+        ///   Looks up a localized string similar to Internal error. Empty key identifier specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DbCommand_Parameters {
+        internal static string TCE_EmptyCspKeyIdSysErr {
             get {
-                return ResourceManager.GetString("DbCommand_Parameters", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyCspKeyIdSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to When records are affected by a given statement by the execution of the command..
+        ///   Looks up a localized string similar to Empty Microsoft cryptographic service provider (CSP) name specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DbCommand_StatementCompleted {
+        internal static string TCE_EmptyCspName {
             get {
-                return ResourceManager.GetString("DbCommand_StatementCompleted", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyCspName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The transaction used by the command..
+        ///   Looks up a localized string similar to Internal error. Empty Microsoft cryptographic service provider (CSP) name specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DbCommand_Transaction {
+        internal static string TCE_EmptyCspNameSysErr {
             get {
-                return ResourceManager.GetString("DbCommand_Transaction", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyCspNameSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to When used by a DataAdapter.Update, how command results are applied to the current DataRow..
+        ///   Looks up a localized string similar to Internal error. Empty encrypted column encryption key specified..
         /// </summary>
-        internal static string DbCommand_UpdatedRowSource {
+        internal static string TCE_EmptyEncryptedColumnEncryptionKey {
             get {
-                return ResourceManager.GetString("DbCommand_UpdatedRowSource", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyEncryptedColumnEncryptionKey", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the position of the catalog name in a qualified table name in a text command..
+        ///   Looks up a localized string similar to Invalid key store provider name specified. Key store provider names cannot be null or empty..
         /// </summary>
-        internal static string DbCommandBuilder_CatalogLocation {
+        internal static string TCE_EmptyProviderName {
             get {
-                return ResourceManager.GetString("DbCommandBuilder_CatalogLocation", resourceCulture);
+                return ResourceManager.GetString("TCE_EmptyProviderName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The character that separates the catalog name from the rest of the identifier in a text command..
+        ///   Looks up a localized string similar to You have specified the enclave attestation URL and attestation protocol in the connection string, but the SQL Server in use does not support enclave based computations - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details..
         /// </summary>
-        internal static string DbCommandBuilder_CatalogSeparator {
+        internal static string TCE_EnclaveComputationsNotSupported {
             get {
-                return ResourceManager.GetString("DbCommandBuilder_CatalogSeparator", resourceCulture);
+                return ResourceManager.GetString("TCE_EnclaveComputationsNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to How the where clause is auto-generated for the Update and Delete commands when not specified by the user..
+        ///   Looks up a localized string similar to No enclave provider found for enclave type &apos;{0}&apos; and attestation protocol &apos;{1}&apos;. Please specify the correct attestation protocol in the connection string. .
         /// </summary>
-        internal static string DbCommandBuilder_ConflictOption {
+        internal static string TCE_EnclaveProviderNotFound {
             get {
-                return ResourceManager.GetString("DbCommandBuilder_ConflictOption", resourceCulture);
+                return ResourceManager.GetString("TCE_EnclaveProviderNotFound", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DataAdapter for which to automatically generate Commands..
+        ///   Looks up a localized string similar to You have specified the enclave attestation URL in the connection string, but the SQL Server did not return an enclave type. Please make sure the enclave type is correctly configured in your instance - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details..
         /// </summary>
-        internal static string DbCommandBuilder_DataAdapter {
+        internal static string TCE_EnclaveTypeNotReturned {
             get {
-                return ResourceManager.GetString("DbCommandBuilder_DataAdapter", resourceCulture);
+                return ResourceManager.GetString("TCE_EnclaveTypeNotReturned", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The prefix string wrapped around sql objects..
+        ///   Looks up a localized string similar to The enclave type &apos;{0}&apos; returned from the server is not supported..
         /// </summary>
-        internal static string DbCommandBuilder_QuotePrefix {
+        internal static string TCE_EnclaveTypeNotSupported {
             get {
-                return ResourceManager.GetString("DbCommandBuilder_QuotePrefix", resourceCulture);
+                return ResourceManager.GetString("TCE_EnclaveTypeNotSupported", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The suffix string wrapped around sql objects..
+        ///   Looks up a localized string similar to Internal Error. Enclave type received from SQL Server is null or empty when executing a query requiring enclave computations..
         /// </summary>
-        internal static string DbCommandBuilder_QuoteSuffix {
+        internal static string TCE_EnclaveTypeNullForEnclaveBasedQuery {
             get {
-                return ResourceManager.GetString("DbCommandBuilder_QuoteSuffix", resourceCulture);
+                return ResourceManager.GetString("TCE_EnclaveTypeNullForEnclaveBasedQuery", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Use schema from DataTable or the SelectCommand..
+        ///   Looks up a localized string similar to Error encountered while generating package to be sent to enclave. Error message: {0}.
         /// </summary>
-        internal static string DbCommandBuilder_SchemaLocation {
+        internal static string TCE_ExceptionWhenGeneratingEnclavePackage {
             get {
-                return ResourceManager.GetString("DbCommandBuilder_SchemaLocation", resourceCulture);
+                return ResourceManager.GetString("TCE_ExceptionWhenGeneratingEnclavePackage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The character that separates the schema name from the rest of the identifier in a text command..
+        ///   Looks up a localized string similar to Internal Error.  Failed to encrypt byte package to be sent to the enclave. Error Message: {0} .
         /// </summary>
-        internal static string DbCommandBuilder_SchemaSeparator {
+        internal static string TCE_FailedToEncryptRegisterRulesBytePackage {
             get {
-                return ResourceManager.GetString("DbCommandBuilder_SchemaSeparator", resourceCulture);
+                return ResourceManager.GetString("TCE_FailedToEncryptRegisterRulesBytePackage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to How the set clause is auto-generated for the Update command when not specified by the user..
+        ///   Looks up a localized string similar to Internal Error. The buffer specified by argument &apos;{0}&apos; for method &apos;{1}.{2}&apos; has insufficient space..
         /// </summary>
-        internal static string DbCommandBuilder_SetAllValues {
+        internal static string TCE_InsufficientBuffer {
             get {
-                return ResourceManager.GetString("DbCommandBuilder_SetAllValues", resourceCulture);
+                return ResourceManager.GetString("TCE_InsufficientBuffer", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Event triggered when messages arrive from the DataSource..
+        ///   Looks up a localized string similar to The specified ciphertext&apos;s encryption algorithm version &apos;{0}&apos; does not match the expected encryption algorithm version &apos;{1}&apos;..
         /// </summary>
-        internal static string DbConnection_InfoMessage {
+        internal static string TCE_InvalidAlgorithmVersion {
             get {
-                return ResourceManager.GetString("DbConnection_InfoMessage", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidAlgorithmVersion", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The ConnectionState indicating whether the connection is open or closed..
+        ///   Looks up a localized string similar to Specified encrypted column encryption key contains an invalid encryption algorithm version &apos;{0}&apos;. Expected version is &apos;{1}&apos;..
         /// </summary>
-        internal static string DbConnection_State {
+        internal static string TCE_InvalidAlgorithmVersionInEncryptedCEK {
             get {
-                return ResourceManager.GetString("DbConnection_State", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidAlgorithmVersionInEncryptedCEK", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Event triggered when the connection changes state..
+        ///   Looks up a localized string similar to Invalid attestation parameters specified by the enclave provider for enclave type &apos;{0}&apos;. Error occurred when converting the value &apos;{1}&apos; of parameter &apos;{2}&apos; to unsigned int. Error Message: {3}.
         /// </summary>
-        internal static string DbConnection_StateChange {
+        internal static string TCE_InvalidAttestationParameterUnableToConvertToUnsignedInt {
             get {
-                return ResourceManager.GetString("DbConnection_StateChange", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidAttestationParameterUnableToConvertToUnsignedInt", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to When true, indicates that managed connection pooling should be used..
+        ///   Looks up a localized string similar to Specified ciphertext has an invalid authentication tag..
         /// </summary>
-        internal static string DbConnectionString_AdoNetPooler {
+        internal static string TCE_InvalidAuthenticationTag {
             get {
-                return ResourceManager.GetString("DbConnectionString_AdoNetPooler", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidAuthenticationTag", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Declares the application workload type when connecting to a server..
+        ///   Looks up a localized string similar to Invalid certificate location &apos;{0}&apos; in certificate path &apos;{1}&apos;. Use the following format: &lt;certificate location&gt;{4}&lt;certificate store&gt;{4}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{2}&apos; or &apos;{3}&apos;..
         /// </summary>
-        internal static string DbConnectionString_ApplicationIntent {
+        internal static string TCE_InvalidCertificateLocation {
             get {
-                return ResourceManager.GetString("DbConnectionString_ApplicationIntent", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCertificateLocation", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The name of the application..
+        ///   Looks up a localized string similar to Invalid certificate location &apos;{0}&apos; in certificate path &apos;{1}&apos;. Use the following format: &lt;certificate location&gt;{3}&lt;certificate store&gt;{3}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{2}&apos;..
         /// </summary>
-        internal static string DbConnectionString_ApplicationName {
+        internal static string TCE_InvalidCertificateLocation_Unix {
             get {
-                return ResourceManager.GetString("DbConnectionString_ApplicationName", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCertificateLocation_Unix", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to When true, enables usage of the Asynchronous functionality in the .NET Framework Data Provider..
+        ///   Looks up a localized string similar to Internal error. Invalid certificate location &apos;{0}&apos; in certificate path &apos;{1}&apos;. Use the following format: &lt;certificate location&gt;{4}&lt;certificate store&gt;{4}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{2}&apos; or &apos;{3}&apos;..
         /// </summary>
-        internal static string DbConnectionString_AsynchronousProcessing {
+        internal static string TCE_InvalidCertificateLocationSysErr {
             get {
-                return ResourceManager.GetString("DbConnectionString_AsynchronousProcessing", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCertificateLocationSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The name of the primary file, including the full path name, of an attachable database..
+        ///   Looks up a localized string similar to Internal error. Invalid certificate location &apos;{0}&apos; in certificate path &apos;{1}&apos;. Use the following format: &lt;certificate location&gt;{3}&lt;certificate store&gt;{3}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{2}&apos;..
         /// </summary>
-        internal static string DbConnectionString_AttachDBFilename {
+        internal static string TCE_InvalidCertificateLocationSysErr_Unix {
             get {
-                return ResourceManager.GetString("DbConnectionString_AttachDBFilename", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCertificateLocationSysErr_Unix", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Specifies the method of authenticating with SQL Server..
+        ///   Looks up a localized string similar to Invalid certificate path: &apos;{0}&apos;. Use the following format: &lt;certificate location&gt;{3}&lt;certificate store&gt;{3}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{1}&apos; or &apos;{2}&apos;..
         /// </summary>
-        internal static string DbConnectionString_Authentication {
+        internal static string TCE_InvalidCertificatePath {
             get {
-                return ResourceManager.GetString("DbConnectionString_Authentication", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCertificatePath", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Specified client certificate for authenticating with SQL Server.  .
+        ///   Looks up a localized string similar to Invalid certificate path: &apos;{0}&apos;. Use the following format: &lt;certificate location&gt;{2}&lt;certificate store&gt;{2}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{1}&apos;..
         /// </summary>
-        internal static string DbConnectionString_Certificate {
+        internal static string TCE_InvalidCertificatePath_Unix {
             get {
-                return ResourceManager.GetString("DbConnectionString_Certificate", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCertificatePath_Unix", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to When true, indicates the connection state is reset when removed from the pool..
+        ///   Looks up a localized string similar to Internal error. Invalid certificate path: &apos;{0}&apos;. Use the following format: &lt;certificate location&gt;{3}&lt;certificate store&gt;{3}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{1}&apos; or &apos;{2}&apos;..
         /// </summary>
-        internal static string DbConnectionString_ConnectionReset {
+        internal static string TCE_InvalidCertificatePathSysErr {
             get {
-                return ResourceManager.GetString("DbConnectionString_ConnectionReset", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCertificatePathSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection string used to connect to the Data Source..
+        ///   Looks up a localized string similar to Internal error. Invalid certificate path: &apos;{0}&apos;. Use the following format: &lt;certificate location&gt;{2}&lt;certificate store&gt;{2}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{1}&apos;..
         /// </summary>
-        internal static string DbConnectionString_ConnectionString {
+        internal static string TCE_InvalidCertificatePathSysErr_Unix {
             get {
-                return ResourceManager.GetString("DbConnectionString_ConnectionString", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCertificatePathSysErr_Unix", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Number of attempts to restore connection..
+        ///   Looks up a localized string similar to Invalid certificate store &apos;{0}&apos; specified in certificate path &apos;{1}&apos;. Expected value: &apos;{2}&apos;..
         /// </summary>
-        internal static string DbConnectionString_ConnectRetryCount {
+        internal static string TCE_InvalidCertificateStore {
             get {
-                return ResourceManager.GetString("DbConnectionString_ConnectRetryCount", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCertificateStore", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Delay between attempts to restore connection..
+        ///   Looks up a localized string similar to Internal error. Invalid certificate store &apos;{0}&apos; specified in certificate path &apos;{1}&apos;. Expected value: &apos;{2}&apos;..
         /// </summary>
-        internal static string DbConnectionString_ConnectRetryInterval {
+        internal static string TCE_InvalidCertificateStoreSysErr {
             get {
-                return ResourceManager.GetString("DbConnectionString_ConnectRetryInterval", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCertificateStoreSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The length of time (in seconds) to wait for a connection to the server before terminating the attempt and generating an error..
+        ///   Looks up a localized string similar to The specified encrypted column encryption key&apos;s ciphertext length: {0} does not match the ciphertext length: {1} when using column master key ({2}) in &apos;{3}&apos;. The encrypted column encryption key may be corrupt, or the specified {4} path may be incorrect..
         /// </summary>
-        internal static string DbConnectionString_ConnectTimeout {
+        internal static string TCE_InvalidCiphertextLengthInEncryptedCEK {
             get {
-                return ResourceManager.GetString("DbConnectionString_ConnectTimeout", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCiphertextLengthInEncryptedCEK", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to When true, indicates the connection should be from the Sql Server context.  Available only when running in the Sql Server process..
+        ///   Looks up a localized string similar to Specified ciphertext has an invalid size of {0} bytes, which is below the minimum {1} bytes required for decryption..
         /// </summary>
-        internal static string DbConnectionString_ContextConnection {
+        internal static string TCE_InvalidCipherTextSize {
             get {
-                return ResourceManager.GetString("DbConnectionString_ContextConnection", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCipherTextSize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The SQL Server Language record name..
+        ///   Looks up a localized string similar to An error occurred while opening the Microsoft Cryptography API: Next Generation (CNG) key: &apos;{0}&apos;. Verify that the CNG provider name &apos;{1}&apos; is valid, installed on the machine, and the key &apos;{2}&apos; exists..
         /// </summary>
-        internal static string DbConnectionString_CurrentLanguage {
+        internal static string TCE_InvalidCngKey {
             get {
-                return ResourceManager.GetString("DbConnectionString_CurrentLanguage", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCngKey", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Indicates the name of the data source to connect to..
+        ///   Looks up a localized string similar to Internal error. An error occurred while opening the Microsoft Cryptography API: Next Generation (CNG) key: &apos;{0}&apos;. Verify that the CNG provider name &apos;{1}&apos; is valid, installed on the machine, and the key &apos;{2}&apos; exists..
         /// </summary>
-        internal static string DbConnectionString_DataSource {
+        internal static string TCE_InvalidCngKeySysErr {
             get {
-                return ResourceManager.GetString("DbConnectionString_DataSource", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCngKeySysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The name of the ODBC Driver to use when connecting to the Data Source..
+        ///   Looks up a localized string similar to Invalid column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DbConnectionString_Driver {
+        internal static string TCE_InvalidCngPath {
             get {
-                return ResourceManager.GetString("DbConnectionString_Driver", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCngPath", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The DSN to use when connecting to the Data Source..
+        ///   Looks up a localized string similar to Internal error. Invalid column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DbConnectionString_DSN {
+        internal static string TCE_InvalidCngPathSysErr {
             get {
-                return ResourceManager.GetString("DbConnectionString_DSN", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCngPathSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to When true, SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed..
+        ///   Looks up a localized string similar to Invalid key identifier: &apos;{0}&apos;. Verify that the key identifier in column master key path: &apos;{1}&apos; is valid and exists in the CSP..
         /// </summary>
-        internal static string DbConnectionString_Encrypt {
+        internal static string TCE_InvalidCspKeyId {
             get {
-                return ResourceManager.GetString("DbConnectionString_Encrypt", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCspKeyId", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sessions in a Component Services (or MTS, if you are using Microsoft Windows NT) environment should automatically be enlisted in a global transaction where required..
+        ///   Looks up a localized string similar to Internal error. Invalid key identifier: &apos;{0}&apos;. Verify that the key identifier in column master key path: &apos;{1}&apos; is valid and exists in the CSP..
         /// </summary>
-        internal static string DbConnectionString_Enlist {
+        internal static string TCE_InvalidCspKeyIdSysErr {
             get {
-                return ResourceManager.GetString("DbConnectionString_Enlist", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCspKeyIdSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The name or network address of the instance of SQL Server that acts as a failover partner..
+        ///   Looks up a localized string similar to Invalid Microsoft cryptographic service provider (CSP) name: &apos;{0}&apos;. Verify that the CSP provider name in column master key path: &apos;{1}&apos; is valid and installed on the machine..
         /// </summary>
-        internal static string DbConnectionString_FailoverPartner {
+        internal static string TCE_InvalidCspName {
             get {
-                return ResourceManager.GetString("DbConnectionString_FailoverPartner", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCspName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The service principal name (SPN) of the failover partner..
+        ///   Looks up a localized string similar to Internal error. Invalid Microsoft cryptographic service provider (CSP) name: &apos;{0}&apos;. Verify that the CSP provider name in column master key path: &apos;{1}&apos; is valid and installed on the machine..
         /// </summary>
-        internal static string DbConnectionString_FailoverPartnerSPN {
+        internal static string TCE_InvalidCspNameSysErr {
             get {
-                return ResourceManager.GetString("DbConnectionString_FailoverPartnerSPN", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCspNameSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The UDL file to use when connecting to the Data Source..
+        ///   Looks up a localized string similar to Invalid column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DbConnectionString_FileName {
+        internal static string TCE_InvalidCspPath {
             get {
-                return ResourceManager.GetString("DbConnectionString_FileName", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCspPath", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The hostname to be expected in the server&apos;s certificate when encryption is negotiated, if it&apos;s different from the default value derived from Addr/Address/Server..
+        ///   Looks up a localized string similar to Internal error. Invalid column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string DbConnectionString_HostNameInCertificate {
+        internal static string TCE_InvalidCspPathSysErr {
             get {
-                return ResourceManager.GetString("DbConnectionString_HostNameInCertificate", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCspPathSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The name of the initial catalog or database in the data source..
+        ///   Looks up a localized string similar to Invalid key store provider name &apos;{0}&apos;. &apos;{1}&apos; prefix is reserved for system key store providers..
         /// </summary>
-        internal static string DbConnectionString_InitialCatalog {
+        internal static string TCE_InvalidCustomKeyStoreProviderName {
             get {
-                return ResourceManager.GetString("DbConnectionString_InitialCatalog", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidCustomKeyStoreProviderName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Whether the connection is to be a secure connection or not..
+        ///   Looks up a localized string similar to Internal Error. The given database id &apos;{0}&apos; is not valid. Error occurred when converting the database id to unsigned int. Error Message: {1}.
         /// </summary>
-        internal static string DbConnectionString_IntegratedSecurity {
+        internal static string TCE_InvalidDatabaseIdUnableToCastToUnsignedInt {
             get {
-                return ResourceManager.GetString("DbConnectionString_IntegratedSecurity", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidDatabaseIdUnableToCastToUnsignedInt", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The minimum amount of time (in seconds) for this connection to live in the pool before being destroyed..
+        ///   Looks up a localized string similar to Internal error. Error occurred when populating enclave metadata. The referenced column encryption key ordinal &apos;{0}&apos; is missing in the encryption metadata returned by SQL Server. Max ordinal is &apos;{1}&apos;. .
         /// </summary>
-        internal static string DbConnectionString_LoadBalanceTimeout {
+        internal static string TCE_InvalidEncryptionKeyOrdinalEnclaveMetadata {
             get {
-                return ResourceManager.GetString("DbConnectionString_LoadBalanceTimeout", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidEncryptionKeyOrdinalEnclaveMetadata", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The maximum number of connections allowed in the pool..
+        ///   Looks up a localized string similar to Internal error. Error occurred when populating parameter metadata. The referenced column encryption key ordinal &apos;{0}&apos; is missing in the encryption metadata returned by SQL Server. Max ordinal is &apos;{1}&apos;. .
         /// </summary>
-        internal static string DbConnectionString_MaxPoolSize {
+        internal static string TCE_InvalidEncryptionKeyOrdinalParameterMetadata {
             get {
-                return ResourceManager.GetString("DbConnectionString_MaxPoolSize", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidEncryptionKeyOrdinalParameterMetadata", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The minimum number of connections allowed in the pool..
+        ///   Looks up a localized string similar to Encryption type &apos;{1}&apos; specified for the column in the database is either invalid or corrupted. Valid encryption types for algorithm &apos;{0}&apos; are: {2}..
         /// </summary>
-        internal static string DbConnectionString_MinPoolSize {
+        internal static string TCE_InvalidEncryptionType {
             get {
-                return ResourceManager.GetString("DbConnectionString_MinPoolSize", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidEncryptionType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to When true, multiple result sets can be returned and read from one connection..
+        ///   Looks up a localized string similar to Invalid key encryption algorithm specified: &apos;{0}&apos;. Expected value: &apos;{1}&apos;..
         /// </summary>
-        internal static string DbConnectionString_MultipleActiveResultSets {
+        internal static string TCE_InvalidKeyEncryptionAlgorithm {
             get {
-                return ResourceManager.GetString("DbConnectionString_MultipleActiveResultSets", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to If your application is connecting to a high-availability, disaster recovery (AlwaysOn) availability group (AG) on different subnets, MultiSubnetFailover=Yes configures SqlConnection to provide faster detection of and connection to the (currently) active server..
-        /// </summary>
-        internal static string DbConnectionString_MultiSubnetFailover {
-            get {
-                return ResourceManager.GetString("DbConnectionString_MultiSubnetFailover", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The network library used to establish a connection to an instance of SQL Server..
-        /// </summary>
-        internal static string DbConnectionString_NetworkLibrary {
-            get {
-                return ResourceManager.GetString("DbConnectionString_NetworkLibrary", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specifies which OLE DB Services to enable or disable with the OleDb Provider..
-        /// </summary>
-        internal static string DbConnectionString_OleDbServices {
-            get {
-                return ResourceManager.GetString("DbConnectionString_OleDbServices", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Size in bytes of the network packets used to communicate with an instance of SQL Server..
-        /// </summary>
-        internal static string DbConnectionString_PacketSize {
-            get {
-                return ResourceManager.GetString("DbConnectionString_PacketSize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indicates the password to be used when connecting to the data source..
-        /// </summary>
-        internal static string DbConnectionString_Password {
-            get {
-                return ResourceManager.GetString("DbConnectionString_Password", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to When false, security-sensitive information, such as the password, is not returned as part of the connection if the connection is open or has ever been in an open state..
-        /// </summary>
-        internal static string DbConnectionString_PersistSecurityInfo {
-            get {
-                return ResourceManager.GetString("DbConnectionString_PersistSecurityInfo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Defines the blocking period behavior for a connection pool..
-        /// </summary>
-        internal static string DbConnectionString_PoolBlockingPeriod {
-            get {
-                return ResourceManager.GetString("DbConnectionString_PoolBlockingPeriod", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to When true, the connection object is drawn from the appropriate pool, or if necessary, is created and added to the appropriate pool..
-        /// </summary>
-        internal static string DbConnectionString_Pooling {
-            get {
-                return ResourceManager.GetString("DbConnectionString_Pooling", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The name of the OLE DB Provider to use when connecting to the Data Source..
-        /// </summary>
-        internal static string DbConnectionString_Provider {
-            get {
-                return ResourceManager.GetString("DbConnectionString_Provider", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Used by SQL Server in Replication..
-        /// </summary>
-        internal static string DbConnectionString_Replication {
-            get {
-                return ResourceManager.GetString("DbConnectionString_Replication", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The path to a certificate file to match against the SQL Server TLS/SSL certificate..
-        /// </summary>
-        internal static string DbConnectionString_ServerCertificate {
-            get {
-                return ResourceManager.GetString("DbConnectionString_ServerCertificate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The service principal name (SPN) of the server..
-        /// </summary>
-        internal static string DbConnectionString_ServerSPN {
-            get {
-                return ResourceManager.GetString("DbConnectionString_ServerSPN", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indicates binding behavior of connection to a System.Transactions Transaction when enlisted..
-        /// </summary>
-        internal static string DbConnectionString_TransactionBinding {
-            get {
-                return ResourceManager.GetString("DbConnectionString_TransactionBinding", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to If your application connects to different networks, TransparentNetworkIPResolution=Yes configures SqlConnection to provide transparent connection resolution to the currently active server, independently of the network IP topology..
-        /// </summary>
-        internal static string DbConnectionString_TransparentNetworkIPResolution {
-            get {
-                return ResourceManager.GetString("DbConnectionString_TransparentNetworkIPResolution", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to When true (and encrypt=true), SQL Server uses SSL encryption for all data sent between the client and server without validating the server certificate..
-        /// </summary>
-        internal static string DbConnectionString_TrustServerCertificate {
-            get {
-                return ResourceManager.GetString("DbConnectionString_TrustServerCertificate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indicates which server type system the provider will expose through the DataReader..
-        /// </summary>
-        internal static string DbConnectionString_TypeSystemVersion {
-            get {
-                return ResourceManager.GetString("DbConnectionString_TypeSystemVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indicates the user ID to be used when connecting to the data source..
-        /// </summary>
-        internal static string DbConnectionString_UserID {
-            get {
-                return ResourceManager.GetString("DbConnectionString_UserID", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indicates whether the connection will be re-directed to connect to an instance of SQL Server running under the user&apos;s account..
-        /// </summary>
-        internal static string DbConnectionString_UserInstance {
-            get {
-                return ResourceManager.GetString("DbConnectionString_UserInstance", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The name of the workstation connecting to SQL Server..
-        /// </summary>
-        internal static string DbConnectionString_WorkstationID {
-            get {
-                return ResourceManager.GetString("DbConnectionString_WorkstationID", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Used during Update for deleted rows in DataSet..
-        /// </summary>
-        internal static string DbDataAdapter_DeleteCommand {
-            get {
-                return ResourceManager.GetString("DbDataAdapter_DeleteCommand", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Used during Update for new rows in DataSet..
-        /// </summary>
-        internal static string DbDataAdapter_InsertCommand {
-            get {
-                return ResourceManager.GetString("DbDataAdapter_InsertCommand", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Event triggered before every DataRow during Update..
-        /// </summary>
-        internal static string DbDataAdapter_RowUpdated {
-            get {
-                return ResourceManager.GetString("DbDataAdapter_RowUpdated", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Event triggered after every DataRow during Update..
-        /// </summary>
-        internal static string DbDataAdapter_RowUpdating {
-            get {
-                return ResourceManager.GetString("DbDataAdapter_RowUpdating", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Used during Fill/FillSchema..
-        /// </summary>
-        internal static string DbDataAdapter_SelectCommand {
-            get {
-                return ResourceManager.GetString("DbDataAdapter_SelectCommand", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Number of rows to batch together before executing against the data source..
-        /// </summary>
-        internal static string DbDataAdapter_UpdateBatchSize {
-            get {
-                return ResourceManager.GetString("DbDataAdapter_UpdateBatchSize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Used during Update for modified rows in DataSet..
-        /// </summary>
-        internal static string DbDataAdapter_UpdateCommand {
-            get {
-                return ResourceManager.GetString("DbDataAdapter_UpdateCommand", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Only necessary to set for decimal and numeric parameters when using with Prepare, FillSchema and CommandBuilder scenarios..
-        /// </summary>
-        internal static string DbDataParameter_Precision {
-            get {
-                return ResourceManager.GetString("DbDataParameter_Precision", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Only necessary to set for decimal and numeric parameters when using with Prepare, FillSchema and CommandBuilder scenarios..
-        /// </summary>
-        internal static string DbDataParameter_Scale {
-            get {
-                return ResourceManager.GetString("DbDataParameter_Scale", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The parameter generic type..
-        /// </summary>
-        internal static string DbParameter_DbType {
-            get {
-                return ResourceManager.GetString("DbParameter_DbType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Input, output, or bidirectional parameter..
-        /// </summary>
-        internal static string DbParameter_Direction {
-            get {
-                return ResourceManager.GetString("DbParameter_Direction", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to a design-time property used for strongly typed code-generation..
-        /// </summary>
-        internal static string DbParameter_IsNullable {
-            get {
-                return ResourceManager.GetString("DbParameter_IsNullable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Offset in variable length data types..
-        /// </summary>
-        internal static string DbParameter_Offset {
-            get {
-                return ResourceManager.GetString("DbParameter_Offset", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Name of the parameter..
-        /// </summary>
-        internal static string DbParameter_ParameterName {
-            get {
-                return ResourceManager.GetString("DbParameter_ParameterName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Size of variable length data types (string &amp; arrays)..
-        /// </summary>
-        internal static string DbParameter_Size {
-            get {
-                return ResourceManager.GetString("DbParameter_Size", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to When used by a DataAdapter.Update, the source column name that is used to find the DataSetColumn name in the ColumnMappings. This is to copy a value between the parameter and a data row..
-        /// </summary>
-        internal static string DbParameter_SourceColumn {
-            get {
-                return ResourceManager.GetString("DbParameter_SourceColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to When used by DataAdapter.Update, the parameter value is changed from DBNull.Value into (Int32)1 or (Int32)0 if non-null..
-        /// </summary>
-        internal static string DbParameter_SourceColumnNullMapping {
-            get {
-                return ResourceManager.GetString("DbParameter_SourceColumnNullMapping", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to When used by a DataAdapter.Update (UpdateCommand only), the version of the DataRow value that is used to update the data source..
-        /// </summary>
-        internal static string DbParameter_SourceVersion {
-            get {
-                return ResourceManager.GetString("DbParameter_SourceVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Value of the parameter..
-        /// </summary>
-        internal static string DbParameter_Value {
-            get {
-                return ResourceManager.GetString("DbParameter_Value", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to How are the Insert/Update/DeleteCommands generated when not set by the user..
-        /// </summary>
-        internal static string DbTable_ConflictDetection {
-            get {
-                return ResourceManager.GetString("DbTable_ConflictDetection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection used if the the Select/Insert/Update/DeleteCommands do not already have a connection..
-        /// </summary>
-        internal static string DbTable_Connection {
-            get {
-                return ResourceManager.GetString("DbTable_Connection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Used during Update for deleted rows in the DataTable..
-        /// </summary>
-        internal static string DbTable_DeleteCommand {
-            get {
-                return ResourceManager.GetString("DbTable_DeleteCommand", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Used during Update for new rows in the DataTable..
-        /// </summary>
-        internal static string DbTable_InsertCommand {
-            get {
-                return ResourceManager.GetString("DbTable_InsertCommand", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Should Fill return provider specific values or common CLSCompliant values..
-        /// </summary>
-        internal static string DbTable_ReturnProviderSpecificTypes {
-            get {
-                return ResourceManager.GetString("DbTable_ReturnProviderSpecificTypes", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Used during Fill..
-        /// </summary>
-        internal static string DbTable_SelectCommand {
-            get {
-                return ResourceManager.GetString("DbTable_SelectCommand", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to How to map source table to DataTable..
-        /// </summary>
-        internal static string DbTable_TableMapping {
-            get {
-                return ResourceManager.GetString("DbTable_TableMapping", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Number of rows to batch together before executing against the data source..
-        /// </summary>
-        internal static string DbTable_UpdateBatchSize {
-            get {
-                return ResourceManager.GetString("DbTable_UpdateBatchSize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Used during Update for modified rows in the DataTable..
-        /// </summary>
-        internal static string DbTable_UpdateCommand {
-            get {
-                return ResourceManager.GetString("DbTable_UpdateCommand", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error occurred when retrying the download of the HGS root certificate after the initial request failed. Contact Customer Support Services..
-        /// </summary>
-        internal static string EnclaveRetrySleepInSecondsValueException {
-            get {
-                return ResourceManager.GetString("EnclaveRetrySleepInSecondsValueException", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Unable to invalidate the requested enclave session, because it does not exist in the cache. Contact Customer Support Services..
-        /// </summary>
-        internal static string EnclaveSessionInvalidationFailed {
-            get {
-                return ResourceManager.GetString("EnclaveSessionInvalidationFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} returned {1}..
-        /// </summary>
-        internal static string event_OperationReturnedSomething {
-            get {
-                return ResourceManager.GetString("event_OperationReturnedSomething", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The validation of an attestation token failed. The token received from SQL Server is expired. Contact Customer Support Services..
-        /// </summary>
-        internal static string ExpiredAttestationToken {
-            get {
-                return ResourceManager.GetString("ExpiredAttestationToken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Syntax error in aggregate argument: Expecting a single column argument with possible &apos;Child&apos; qualifier..
-        /// </summary>
-        internal static string Expr_AggregateArgument {
-            get {
-                return ResourceManager.GetString("Expr_AggregateArgument", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unbound reference in the aggregate expression &apos;{0}&apos;..
-        /// </summary>
-        internal static string Expr_AggregateUnbound {
-            get {
-                return ResourceManager.GetString("Expr_AggregateUnbound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Operator &apos;{0}&apos; is ambiguous on operands of type &apos;{1}&apos; and &apos;{2}&apos;. Cannot mix signed and unsigned types. Please use explicit Convert() function..
-        /// </summary>
-        internal static string Expr_AmbiguousBinop {
-            get {
-                return ResourceManager.GetString("Expr_AmbiguousBinop", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0}() argument is out of range..
-        /// </summary>
-        internal static string Expr_ArgumentOutofRange {
-            get {
-                return ResourceManager.GetString("Expr_ArgumentOutofRange", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type mismatch in function argument: {0}(), argument {1}, expected {2}..
-        /// </summary>
-        internal static string Expr_ArgumentType {
-            get {
-                return ResourceManager.GetString("Expr_ArgumentType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type mismatch in function argument: {0}(), argument {1}, expected one of the Integer types..
-        /// </summary>
-        internal static string Expr_ArgumentTypeInteger {
-            get {
-                return ResourceManager.GetString("Expr_ArgumentTypeInteger", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot find the parent relation &apos;{0}&apos;..
-        /// </summary>
-        internal static string Expr_BindFailure {
-            get {
-                return ResourceManager.GetString("Expr_BindFailure", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot evaluate. Expression &apos;{0}&apos; is not an aggregate..
-        /// </summary>
-        internal static string Expr_ComputeNotAggregate {
-            get {
-                return ResourceManager.GetString("Expr_ComputeNotAggregate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot convert from {0} to {1}..
-        /// </summary>
-        internal static string Expr_DatatypeConversion {
-            get {
-                return ResourceManager.GetString("Expr_DatatypeConversion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot convert value &apos;{0}&apos; to Type: {1}..
-        /// </summary>
-        internal static string Expr_DatavalueConversion {
-            get {
-                return ResourceManager.GetString("Expr_DatavalueConversion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Divide by zero error encountered..
-        /// </summary>
-        internal static string Expr_DivideByZero {
-            get {
-                return ResourceManager.GetString("Expr_DivideByZero", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot evaluate non-constant expression without current row..
-        /// </summary>
-        internal static string Expr_EvalNoContext {
-            get {
-                return ResourceManager.GetString("Expr_EvalNoContext", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Expression is too complex..
-        /// </summary>
-        internal static string Expr_ExpressionTooComplex {
-            get {
-                return ResourceManager.GetString("Expr_ExpressionTooComplex", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unbound reference in the expression &apos;{0}&apos;..
-        /// </summary>
-        internal static string Expr_ExpressionUnbound {
-            get {
-                return ResourceManager.GetString("Expr_ExpressionUnbound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Filter expression &apos;{0}&apos; does not evaluate to a Boolean term..
-        /// </summary>
-        internal static string Expr_FilterConversion {
-            get {
-                return ResourceManager.GetString("Expr_FilterConversion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid number of arguments: function {0}()..
-        /// </summary>
-        internal static string Expr_FunctionArgumentCount {
-            get {
-                return ResourceManager.GetString("Expr_FunctionArgumentCount", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The expression contains invalid date constant &apos;{0}&apos;..
-        /// </summary>
-        internal static string Expr_InvalidDate {
-            get {
-                return ResourceManager.GetString("Expr_InvalidDate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;hours&apos; argument is out of range. Value must be between -14 and +14..
-        /// </summary>
-        internal static string Expr_InvalidHoursArgument {
-            get {
-                return ResourceManager.GetString("Expr_InvalidHoursArgument", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;minutes&apos; argument is out of range. Value must be between -59 and +59..
-        /// </summary>
-        internal static string Expr_InvalidMinutesArgument {
-            get {
-                return ResourceManager.GetString("Expr_InvalidMinutesArgument", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid column name [{0}]..
-        /// </summary>
-        internal static string Expr_InvalidName {
-            get {
-                return ResourceManager.GetString("Expr_InvalidName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The expression contains invalid name: &apos;{0}&apos;..
-        /// </summary>
-        internal static string Expr_InvalidNameBracketing {
-            get {
-                return ResourceManager.GetString("Expr_InvalidNameBracketing", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error in Like operator: the string pattern &apos;{0}&apos; is invalid..
-        /// </summary>
-        internal static string Expr_InvalidPattern {
-            get {
-                return ResourceManager.GetString("Expr_InvalidPattern", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The expression contains an invalid string constant: {0}..
-        /// </summary>
-        internal static string Expr_InvalidString {
-            get {
-                return ResourceManager.GetString("Expr_InvalidString", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Provided range for time one exceeds total of 14 hours..
-        /// </summary>
-        internal static string Expr_InvalidTimeZoneRange {
-            get {
-                return ResourceManager.GetString("Expr_InvalidTimeZoneRange", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid type name &apos;{0}&apos;..
-        /// </summary>
-        internal static string Expr_InvalidType {
-            get {
-                return ResourceManager.GetString("Expr_InvalidType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Need a row or a table to Invoke DataFilter..
-        /// </summary>
-        internal static string Expr_InvokeArgument {
-            get {
-                return ResourceManager.GetString("Expr_InvokeArgument", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Syntax error: The IN keyword must be followed by a non-empty list of expressions separated by commas, and also must be enclosed in parentheses..
-        /// </summary>
-        internal static string Expr_InWithoutList {
-            get {
-                return ResourceManager.GetString("Expr_InWithoutList", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Syntax error: The items following the IN keyword must be separated by commas and be enclosed in parentheses..
-        /// </summary>
-        internal static string Expr_InWithoutParentheses {
-            get {
-                return ResourceManager.GetString("Expr_InWithoutParentheses", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Syntax error: Invalid usage of &apos;Is&apos; operator. Correct syntax: &lt;expression&gt; Is [Not] Null..
-        /// </summary>
-        internal static string Expr_IsSyntax {
-            get {
-                return ResourceManager.GetString("Expr_IsSyntax", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Syntax error in Lookup expression: Expecting keyword &apos;Parent&apos; followed by a single column argument with possible relation qualifier: Parent[(&lt;relation_name&gt;)].&lt;column_name&gt;..
-        /// </summary>
-        internal static string Expr_LookupArgument {
-            get {
-                return ResourceManager.GetString("Expr_LookupArgument", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Kind property of provided DateTime argument, does not match &apos;hours&apos; and &apos;minutes&apos; arguments..
-        /// </summary>
-        internal static string Expr_MismatchKindandTimeSpan {
-            get {
-                return ResourceManager.GetString("Expr_MismatchKindandTimeSpan", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Syntax error: Missing operand after &apos;{0}&apos; operator..
-        /// </summary>
-        internal static string Expr_MissingOperand {
-            get {
-                return ResourceManager.GetString("Expr_MissingOperand", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Syntax error: Missing operand before &apos;{0}&apos; operator..
-        /// </summary>
-        internal static string Expr_MissingOperandBefore {
-            get {
-                return ResourceManager.GetString("Expr_MissingOperandBefore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The expression is missing the closing parenthesis..
-        /// </summary>
-        internal static string Expr_MissingRightParen {
-            get {
-                return ResourceManager.GetString("Expr_MissingRightParen", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Only constant expressions are allowed in the expression list for the IN operator..
-        /// </summary>
-        internal static string Expr_NonConstantArgument {
-            get {
-                return ResourceManager.GetString("Expr_NonConstantArgument", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The feature not implemented. {0}..
-        /// </summary>
-        internal static string Expr_NYI {
-            get {
-                return ResourceManager.GetString("Expr_NYI", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Value is either too large or too small for Type &apos;{0}&apos;..
-        /// </summary>
-        internal static string Expr_Overflow {
-            get {
-                return ResourceManager.GetString("Expr_Overflow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Syntax error in the expression..
-        /// </summary>
-        internal static string Expr_Syntax {
-            get {
-                return ResourceManager.GetString("Expr_Syntax", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The expression has too many closing parentheses..
-        /// </summary>
-        internal static string Expr_TooManyRightParentheses {
-            get {
-                return ResourceManager.GetString("Expr_TooManyRightParentheses", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type mismatch in expression &apos;{0}&apos;..
-        /// </summary>
-        internal static string Expr_TypeMismatch {
-            get {
-                return ResourceManager.GetString("Expr_TypeMismatch", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot perform &apos;{0}&apos; operation on {1} and {2}..
-        /// </summary>
-        internal static string Expr_TypeMismatchInBinop {
-            get {
-                return ResourceManager.GetString("Expr_TypeMismatchInBinop", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot find column [{0}]..
-        /// </summary>
-        internal static string Expr_UnboundName {
-            get {
-                return ResourceManager.GetString("Expr_UnboundName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The expression contains undefined function call {0}()..
-        /// </summary>
-        internal static string Expr_UndefinedFunction {
-            get {
-                return ResourceManager.GetString("Expr_UndefinedFunction", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot interpret token &apos;{0}&apos; at position {1}..
-        /// </summary>
-        internal static string Expr_UnknownToken {
-            get {
-                return ResourceManager.GetString("Expr_UnknownToken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Expected {0}, but actual token at the position {2} is {1}..
-        /// </summary>
-        internal static string Expr_UnknownToken1 {
-            get {
-                return ResourceManager.GetString("Expr_UnknownToken1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The table [{0}] involved in more than one relation. You must explicitly mention a relation name in the expression &apos;{1}&apos;..
-        /// </summary>
-        internal static string Expr_UnresolvedRelation {
-            get {
-                return ResourceManager.GetString("Expr_UnresolvedRelation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The expression contains unsupported operator &apos;{0}&apos;..
-        /// </summary>
-        internal static string Expr_UnsupportedOperator {
-            get {
-                return ResourceManager.GetString("Expr_UnsupportedOperator", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A DataColumn of type &apos;{0}&apos; does not support expression..
-        /// </summary>
-        internal static string Expr_UnsupportedType {
-            get {
-                return ResourceManager.GetString("Expr_UnsupportedType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The collection that holds custom user information..
-        /// </summary>
-        internal static string ExtendedPropertiesDescr {
-            get {
-                return ResourceManager.GetString("ExtendedPropertiesDescr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to create enclave session as attestation server is busy..
-        /// </summary>
-        internal static string FailToCreateEnclaveSession {
-            get {
-                return ResourceManager.GetString("FailToCreateEnclaveSession", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The validation of an attestation information failed. The attestation information has an invalid format. Contact Customer Support Services. Error details: &apos;{0}&apos;..
-        /// </summary>
-        internal static string FailToParseAttestationInfo {
-            get {
-                return ResourceManager.GetString("FailToParseAttestationInfo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The validation of an attestation token failed. The token has an invalid format. Contact Customer Support Services. Error details: &apos;{0}&apos;..
-        /// </summary>
-        internal static string FailToParseAttestationToken {
-            get {
-                return ResourceManager.GetString("FailToParseAttestationToken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to For accept and reject changes, indicates what kind of cascading should take place across this relation..
-        /// </summary>
-        internal static string ForeignKeyConstraintAcceptRejectRuleDescr {
-            get {
-                return ResourceManager.GetString("ForeignKeyConstraintAcceptRejectRuleDescr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indicates the child columns of this constraint..
-        /// </summary>
-        internal static string ForeignKeyConstraintChildColumnsDescr {
-            get {
-                return ResourceManager.GetString("ForeignKeyConstraintChildColumnsDescr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to For deletions, indicates what kind of cascading should take place across this relation..
-        /// </summary>
-        internal static string ForeignKeyConstraintDeleteRuleDescr {
-            get {
-                return ResourceManager.GetString("ForeignKeyConstraintDeleteRuleDescr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indicates the parent columns of this constraint..
-        /// </summary>
-        internal static string ForeignKeyConstraintParentColumnsDescr {
-            get {
-                return ResourceManager.GetString("ForeignKeyConstraintParentColumnsDescr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to For updates, indicates what kind of cascading should take place across this relation..
-        /// </summary>
-        internal static string ForeignKeyConstraintUpdateRuleDescr {
-            get {
-                return ResourceManager.GetString("ForeignKeyConstraintUpdateRuleDescr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indicates the child table of this constraint..
-        /// </summary>
-        internal static string ForeignKeyRelatedTableDescr {
-            get {
-                return ResourceManager.GetString("ForeignKeyRelatedTableDescr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The attestation service returned an expired HGS root certificate for attestation URL &apos;{0}&apos;. Check the HGS root certificate configured for your HGS instance - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details..
-        /// </summary>
-        internal static string GetAttestationSigningCertificateFailedInvalidCertificate {
-            get {
-                return ResourceManager.GetString("GetAttestationSigningCertificateFailedInvalidCertificate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The obtained HGS root certificate for attestation URL &apos;{0}&apos; has an invalid format. Verify the attestation URL is correct and the HGS server is online and fully initialized - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. For additional support contact Customer Support Services. Error details: &apos;{1}&apos;..
-        /// </summary>
-        internal static string GetAttestationSigningCertificateRequestFailedFormat {
-            get {
-                return ResourceManager.GetString("GetAttestationSigningCertificateRequestFailedFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The validation of an attestation token failed. Cannot retrieve a public key from the attestation public key endpoint, or the retrieved key has an invalid format. Error details: &apos;{0}&apos;..
-        /// </summary>
-        internal static string GetAttestationTokenSigningKeysFailed {
-            get {
-                return ResourceManager.GetString("GetAttestationTokenSigningKeysFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Signature verification of the enclave&apos;s Diffie-Hellman key failed. Contact Customer Support Services..
-        /// </summary>
-        internal static string GetSharedSecretFailed {
-            get {
-                return ResourceManager.GetString("GetSharedSecretFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Global Transactions are not enabled for this Azure SQL Database. Please contact Azure SQL Database support for assistance..
-        /// </summary>
-        internal static string GT_Disabled {
-            get {
-                return ResourceManager.GetString("GT_Disabled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The currently loaded System.Transactions.dll does not support Global Transactions. Please upgrade to .NET Framework 4.6.2 or later..
-        /// </summary>
-        internal static string GT_UnsupportedSysTxVersion {
-            get {
-                return ResourceManager.GetString("GT_UnsupportedSysTxVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to There are no records in the SqlDataRecord enumeration. To send a table-valued parameter with no rows, use a null reference for the value instead..
-        /// </summary>
-        internal static string IEnumerableOfSqlDataRecordHasNoRows {
-            get {
-                return ResourceManager.GetString("IEnumerableOfSqlDataRecordHasNoRows", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The validation of an attestation token failed due to an error while decoding the enclave public key obtained from SQL Server. Contact Customer Support Services..
-        /// </summary>
-        internal static string InvalidArgumentToBase64UrlDecoder {
-            get {
-                return ResourceManager.GetString("InvalidArgumentToBase64UrlDecoder", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The validation of an attestation token failed due to an error while computing a hash of the enclave public key obtained from SQL Server. Contact Customer Support Services..
-        /// </summary>
-        internal static string InvalidArgumentToSHA256 {
-            get {
-                return ResourceManager.GetString("InvalidArgumentToSHA256", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The validation of the attestation token has failed during signature validation. Exception: &apos;{0}&apos;..
-        /// </summary>
-        internal static string InvalidAttestationToken {
-            get {
-                return ResourceManager.GetString("InvalidAttestationToken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The validation of an attestation token failed. Claim &apos;{0}&apos; in the token has an invalid value of &apos;{1}&apos;. Verify the attestation policy - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If the policy is correct, contact Customer Support Services..
-        /// </summary>
-        internal static string InvalidClaimInAttestationToken {
-            get {
-                return ResourceManager.GetString("InvalidClaimInAttestationToken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid column ordinals in schema table.  ColumnOrdinals, if present, must not have duplicates or gaps..
-        /// </summary>
-        internal static string InvalidSchemaTableOrdinals {
-            get {
-                return ResourceManager.GetString("InvalidSchemaTableOrdinals", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indicates the columns of this constraint..
-        /// </summary>
-        internal static string KeyConstraintColumnsDescr {
-            get {
-                return ResourceManager.GetString("KeyConstraintColumnsDescr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Indicates if this constraint is a primary key..
-        /// </summary>
-        internal static string KeyConstraintIsPrimaryKeyDescr {
-            get {
-                return ResourceManager.GetString("KeyConstraintIsPrimaryKeyDescr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ReadOnly Data is Modified..
-        /// </summary>
-        internal static string Load_ReadOnlyDataModified {
-            get {
-                return ResourceManager.GetString("Load_ReadOnlyDataModified", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Local Database Runtime: system.data.localdb configuration file section is of unknown type..
-        /// </summary>
-        internal static string LocalDB_BadConfigSectionType {
-            get {
-                return ResourceManager.GetString("LocalDB_BadConfigSectionType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Local Database Runtime: Cannot create named instance..
-        /// </summary>
-        internal static string LocalDB_CreateFailed {
-            get {
-                return ResourceManager.GetString("LocalDB_CreateFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Local Database Runtime: Cannot load SQLUserInstance.dll..
-        /// </summary>
-        internal static string LocalDB_FailedGetDLLHandle {
-            get {
-                return ResourceManager.GetString("LocalDB_FailedGetDLLHandle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Local Database Runtime: Invalid instance version specification found in the configuration file..
-        /// </summary>
-        internal static string LocalDB_InvalidVersion {
-            get {
-                return ResourceManager.GetString("LocalDB_InvalidVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid SQLUserInstance.dll found at the location specified in the registry. Verify that the Local Database Runtime feature of SQL Server Express is properly installed..
-        /// </summary>
-        internal static string LocalDB_MethodNotFound {
-            get {
-                return ResourceManager.GetString("LocalDB_MethodNotFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot obtain Local Database Runtime error message.
-        /// </summary>
-        internal static string LocalDB_UnobtainableMessage {
-            get {
-                return ResourceManager.GetString("LocalDB_UnobtainableMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to LocalDB is not supported on this platform..
-        /// </summary>
-        internal static string LocalDBNotSupported {
-            get {
-                return ResourceManager.GetString("LocalDBNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The collection name &apos;{0}&apos; matches at least two collections with the same name but with different case, but does not match any of them exactly..
-        /// </summary>
-        internal static string MDF_AmbiguousCollectionName {
-            get {
-                return ResourceManager.GetString("MDF_AmbiguousCollectionName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to There are multiple collections named &apos;{0}&apos;..
-        /// </summary>
-        internal static string MDF_CollectionNameISNotUnique {
-            get {
-                return ResourceManager.GetString("MDF_CollectionNameISNotUnique", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The collection &apos;{0}&apos; is missing from the metadata XML..
-        /// </summary>
-        internal static string MDF_DataTableDoesNotExist {
-            get {
-                return ResourceManager.GetString("MDF_DataTableDoesNotExist", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The DataSourceInformation table must contain exactly one row..
-        /// </summary>
-        internal static string MDF_IncorrectNumberOfDataSourceInformationRows {
-            get {
-                return ResourceManager.GetString("MDF_IncorrectNumberOfDataSourceInformationRows", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{2}&apos; is not a valid value for the &apos;{1}&apos; restriction of the &apos;{0}&apos; schema collection..
-        /// </summary>
-        internal static string MDF_InvalidRestrictionValue {
-            get {
-                return ResourceManager.GetString("MDF_InvalidRestrictionValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The metadata XML is invalid..
-        /// </summary>
-        internal static string MDF_InvalidXml {
-            get {
-                return ResourceManager.GetString("MDF_InvalidXml", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The metadata XML is invalid. The {1} column of the {0} collection must contain a non-empty string..
-        /// </summary>
-        internal static string MDF_InvalidXmlInvalidValue {
-            get {
-                return ResourceManager.GetString("MDF_InvalidXmlInvalidValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The metadata XML is invalid. The {0} collection must contain a {1} column and it must be a string column..
-        /// </summary>
-        internal static string MDF_InvalidXmlMissingColumn {
-            get {
-                return ResourceManager.GetString("MDF_InvalidXmlMissingColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to One of the required DataSourceInformation tables columns is missing..
-        /// </summary>
-        internal static string MDF_MissingDataSourceInformationColumn {
-            get {
-                return ResourceManager.GetString("MDF_MissingDataSourceInformationColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to One or more of the required columns of the restrictions collection is missing..
-        /// </summary>
-        internal static string MDF_MissingRestrictionColumn {
-            get {
-                return ResourceManager.GetString("MDF_MissingRestrictionColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A restriction exists for which there is no matching row in the restrictions collection..
-        /// </summary>
-        internal static string MDF_MissingRestrictionRow {
-            get {
-                return ResourceManager.GetString("MDF_MissingRestrictionRow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The schema table contains no columns..
-        /// </summary>
-        internal static string MDF_NoColumns {
-            get {
-                return ResourceManager.GetString("MDF_NoColumns", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to build the &apos;{0}&apos; collection because execution of the SQL query failed. See the inner exception for details..
-        /// </summary>
-        internal static string MDF_QueryFailed {
-            get {
-                return ResourceManager.GetString("MDF_QueryFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to More restrictions were provided than the requested schema (&apos;{0}&apos;) supports..
-        /// </summary>
-        internal static string MDF_TooManyRestrictions {
-            get {
-                return ResourceManager.GetString("MDF_TooManyRestrictions", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to build schema collection &apos;{0}&apos;;.
-        /// </summary>
-        internal static string MDF_UnableToBuildCollection {
-            get {
-                return ResourceManager.GetString("MDF_UnableToBuildCollection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The requested collection ({0}) is not defined..
-        /// </summary>
-        internal static string MDF_UndefinedCollection {
-            get {
-                return ResourceManager.GetString("MDF_UndefinedCollection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The population mechanism &apos;{0}&apos; is not defined..
-        /// </summary>
-        internal static string MDF_UndefinedPopulationMechanism {
-            get {
-                return ResourceManager.GetString("MDF_UndefinedPopulationMechanism", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The requested collection ({0}) is not supported by this version of the provider..
-        /// </summary>
-        internal static string MDF_UnsupportedVersion {
-            get {
-                return ResourceManager.GetString("MDF_UnsupportedVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlDbType.Structured type is only supported for multiple valued types..
-        /// </summary>
-        internal static string MetaType_SingleValuedStructNotSupported {
-            get {
-                return ResourceManager.GetString("MetaType_SingleValuedStructNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The validation of the attestation token failed. Claim &apos;{0}&apos; is missing in the token. Verify the attestation policy - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If the policy is correct, contact Customer Support Services..
-        /// </summary>
-        internal static string MissingClaimInAttestationToken {
-            get {
-                return ResourceManager.GetString("MissingClaimInAttestationToken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Simple type &apos;{0}&apos; has already be declared with different &apos;{1}&apos;..
-        /// </summary>
-        internal static string NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration {
-            get {
-                return ResourceManager.GetString("NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Protocol error: A received message contains a valid signature but it was not encrypted as required by the effective Protection Level..
-        /// </summary>
-        internal static string net_auth_message_not_encrypted {
-            get {
-                return ResourceManager.GetString("net_auth_message_not_encrypted", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Insufficient buffer space. Required: {0} Actual: {1}..
-        /// </summary>
-        internal static string net_context_buffer_too_small {
-            get {
-                return ResourceManager.GetString("net_context_buffer_too_small", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to GSSAPI operation failed with status: {0} (Minor status: {1})..
-        /// </summary>
-        internal static string net_gssapi_operation_failed {
-            get {
-                return ResourceManager.GetString("net_gssapi_operation_failed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to GSSAPI operation failed with error - {0} ({1})..
-        /// </summary>
-        internal static string net_gssapi_operation_failed_detailed {
-            get {
-                return ResourceManager.GetString("net_gssapi_operation_failed_detailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The specified value is not valid in the &apos;{0}&apos; enumeration..
-        /// </summary>
-        internal static string net_invalid_enum {
-            get {
-                return ResourceManager.GetString("net_invalid_enum", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} failed with error {1}..
-        /// </summary>
-        internal static string net_log_operation_failed_with_error {
-            get {
-                return ResourceManager.GetString("net_log_operation_failed_with_error", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This method is not implemented by this class..
-        /// </summary>
-        internal static string net_MethodNotImplementedException {
-            get {
-                return ResourceManager.GetString("net_MethodNotImplementedException", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No support for channel binding on operating systems other than Windows..
-        /// </summary>
-        internal static string net_nego_channel_binding_not_supported {
-            get {
-                return ResourceManager.GetString("net_nego_channel_binding_not_supported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Target name should be non empty if default credentials are passed..
-        /// </summary>
-        internal static string net_nego_not_supported_empty_target_with_defaultcreds {
-            get {
-                return ResourceManager.GetString("net_nego_not_supported_empty_target_with_defaultcreds", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Requested protection level is not supported with the GSSAPI implementation currently installed..
-        /// </summary>
-        internal static string net_nego_protection_level_not_supported {
-            get {
-                return ResourceManager.GetString("net_nego_protection_level_not_supported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Server implementation is not supported..
-        /// </summary>
-        internal static string net_nego_server_not_supported {
-            get {
-                return ResourceManager.GetString("net_nego_server_not_supported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to NTLM authentication is not possible with default credentials on this platform..
-        /// </summary>
-        internal static string net_ntlm_not_possible_default_cred {
-            get {
-                return ResourceManager.GetString("net_ntlm_not_possible_default_cred", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The requested security package is not supported..
-        /// </summary>
-        internal static string net_securitypackagesupport {
-            get {
-                return ResourceManager.GetString("net_securitypackagesupport", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to DateType column for field &apos;{0}&apos; in schema table is null.  DataType must be non-null..
-        /// </summary>
-        internal static string NullSchemaTableDataTypeNotSupported {
-            get {
-                return ResourceManager.GetString("NullSchemaTableDataTypeNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} - unable to allocate an environment handle..
-        /// </summary>
-        internal static string Odbc_CantAllocateEnvironmentHandle {
-            get {
-                return ResourceManager.GetString("Odbc_CantAllocateEnvironmentHandle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} - unable to enable connection pooling....
-        /// </summary>
-        internal static string Odbc_CantEnableConnectionpooling {
-            get {
-                return ResourceManager.GetString("Odbc_CantEnableConnectionpooling", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can&apos;t set property on an open connection..
-        /// </summary>
-        internal static string Odbc_CantSetPropertyOnOpenConnection {
-            get {
-                return ResourceManager.GetString("Odbc_CantSetPropertyOnOpenConnection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The connection is closed..
-        /// </summary>
-        internal static string Odbc_ConnectionClosed {
-            get {
-                return ResourceManager.GetString("Odbc_ConnectionClosed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} [{1}] {2}.
-        /// </summary>
-        internal static string Odbc_ExceptionMessage {
-            get {
-                return ResourceManager.GetString("Odbc_ExceptionMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} - no error information available.
-        /// </summary>
-        internal static string Odbc_ExceptionNoInfoMsg {
-            get {
-                return ResourceManager.GetString("Odbc_ExceptionNoInfoMsg", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} - unable to get descriptor handle..
-        /// </summary>
-        internal static string Odbc_FailedToGetDescriptorHandle {
-            get {
-                return ResourceManager.GetString("Odbc_FailedToGetDescriptorHandle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &quot;The ODBC managed provider requires that the TABLE_NAME restriction be specified and non-null for the GetSchema indexes collection..
-        /// </summary>
-        internal static string ODBC_GetSchemaRestrictionRequired {
-            get {
-                return ResourceManager.GetString("ODBC_GetSchemaRestrictionRequired", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} - unable to map type..
-        /// </summary>
-        internal static string Odbc_GetTypeMapping_UnknownType {
-            get {
-                return ResourceManager.GetString("Odbc_GetTypeMapping_UnknownType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The .NET Framework Odbc Data Provider requires Microsoft Data Access Components(MDAC) version 2.6 or later.  Version {0} was found currently installed..
-        /// </summary>
-        internal static string Odbc_MDACWrongVersion {
-            get {
-                return ResourceManager.GetString("Odbc_MDACWrongVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid negative argument!.
-        /// </summary>
-        internal static string Odbc_NegativeArgument {
-            get {
-                return ResourceManager.GetString("Odbc_NegativeArgument", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No valid mapping for a SQL_TRANSACTION &apos;{0}&apos; to a System.Data.IsolationLevel enumeration value..
-        /// </summary>
-        internal static string Odbc_NoMappingForSqlTransactionLevel {
-            get {
-                return ResourceManager.GetString("Odbc_NoMappingForSqlTransactionLevel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Not in a transaction.
-        /// </summary>
-        internal static string Odbc_NotInTransaction {
-            get {
-                return ResourceManager.GetString("Odbc_NotInTransaction", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The {0} enumeration value, {1}, is not supported by the .NET Framework Odbc Data Provider..
-        /// </summary>
-        internal static string ODBC_NotSupportedEnumerationValue {
-            get {
-                return ResourceManager.GetString("ODBC_NotSupportedEnumerationValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Use IsDBNull when DBNull.Value data is expected..
-        /// </summary>
-        internal static string Odbc_NullData {
-            get {
-                return ResourceManager.GetString("Odbc_NullData", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to OdbcCommandBuilder.DeriveParameters failed because the OdbcCommand.CommandText property value is an invalid multipart name.
-        /// </summary>
-        internal static string ODBC_ODBCCommandText {
-            get {
-                return ResourceManager.GetString("ODBC_ODBCCommandText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An internal connection does not have an owner..
-        /// </summary>
-        internal static string Odbc_OpenConnectionNoOwner {
-            get {
-                return ResourceManager.GetString("Odbc_OpenConnectionNoOwner", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid OdbcType enumeration value={0}..
-        /// </summary>
-        internal static string Odbc_UnknownOdbcType {
-            get {
-                return ResourceManager.GetString("Odbc_UnknownOdbcType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unknown SQL type - {0}..
-        /// </summary>
-        internal static string Odbc_UnknownSQLType {
-            get {
-                return ResourceManager.GetString("Odbc_UnknownSQLType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unknown URT type - {0}..
-        /// </summary>
-        internal static string Odbc_UnknownURTType {
-            get {
-                return ResourceManager.GetString("Odbc_UnknownURTType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The DataAdapter for which to automatically generate OdbcCommands.
-        /// </summary>
-        internal static string OdbcCommandBuilder_DataAdapter {
-            get {
-                return ResourceManager.GetString("OdbcCommandBuilder_DataAdapter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The character used in a text command as the opening quote for quoting identifiers that contain special characters..
-        /// </summary>
-        internal static string OdbcCommandBuilder_QuotePrefix {
-            get {
-                return ResourceManager.GetString("OdbcCommandBuilder_QuotePrefix", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The character used in a text command as the closing quote for quoting identifiers that contain special characters..
-        /// </summary>
-        internal static string OdbcCommandBuilder_QuoteSuffix {
-            get {
-                return ResourceManager.GetString("OdbcCommandBuilder_QuoteSuffix", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Information used to connect to a Data Source..
-        /// </summary>
-        internal static string OdbcConnection_ConnectionString {
-            get {
-                return ResourceManager.GetString("OdbcConnection_ConnectionString", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection string exceeds maximum allowed length of {0}..
-        /// </summary>
-        internal static string OdbcConnection_ConnectionStringTooLong {
-            get {
-                return ResourceManager.GetString("OdbcConnection_ConnectionStringTooLong", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current connection timeout value, not settable in the ConnectionString..
-        /// </summary>
-        internal static string OdbcConnection_ConnectionTimeout {
-            get {
-                return ResourceManager.GetString("OdbcConnection_ConnectionTimeout", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current data source catalog value, &apos;Database=X&apos; in the connection string..
-        /// </summary>
-        internal static string OdbcConnection_Database {
-            get {
-                return ResourceManager.GetString("OdbcConnection_Database", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current data source, &apos;Server=X&apos; in the connection string..
-        /// </summary>
-        internal static string OdbcConnection_DataSource {
-            get {
-                return ResourceManager.GetString("OdbcConnection_DataSource", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current ODBC driver..
-        /// </summary>
-        internal static string OdbcConnection_Driver {
-            get {
-                return ResourceManager.GetString("OdbcConnection_Driver", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Version of the product accessed by the ODBC Driver..
-        /// </summary>
-        internal static string OdbcConnection_ServerVersion {
-            get {
-                return ResourceManager.GetString("OdbcConnection_ServerVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The parameter native type..
-        /// </summary>
-        internal static string OdbcParameter_OdbcType {
-            get {
-                return ResourceManager.GetString("OdbcParameter_OdbcType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;Asynchronous Processing&apos; is not a supported feature of the .NET Framework Data OLE DB Provider(Microsoft.Data.OleDb)..
-        /// </summary>
-        internal static string OleDb_AsynchronousNotSupported {
-            get {
-                return ResourceManager.GetString("OleDb_AsynchronousNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Accessor validation was deferred and was performed while the method returned data. The binding was invalid for this column or parameter..
-        /// </summary>
-        internal static string OleDb_BadAccessor {
-            get {
-                return ResourceManager.GetString("OleDb_BadAccessor", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Microsoft.Data.OleDb.OleDbDataAdapter internal error: invalid parameter accessor: {0} {1}..
-        /// </summary>
-        internal static string OleDb_BadStatus_ParamAcc {
-            get {
-                return ResourceManager.GetString("OleDb_BadStatus_ParamAcc", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to OleDbDataAdapter internal error: invalid row set accessor: Ordinal={0} Status={1}..
-        /// </summary>
-        internal static string OleDb_BadStatusRowAccessor {
-            get {
-                return ResourceManager.GetString("OleDb_BadStatusRowAccessor", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can not determine the server&apos;s decimal separator. Non-integer numeric literals can not be created..
-        /// </summary>
-        internal static string OleDb_CanNotDetermineDecimalSeparator {
-            get {
-                return ResourceManager.GetString("OleDb_CanNotDetermineDecimalSeparator", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The data value could not be converted for reasons other than sign mismatch or data overflow. For example, the data was corrupted in the data store but the row was still retrievable..
-        /// </summary>
-        internal static string OleDb_CantConvertValue {
-            get {
-                return ResourceManager.GetString("OleDb_CantConvertValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The provider could not allocate memory in which to return {0} data..
-        /// </summary>
-        internal static string OleDb_CantCreate {
-            get {
-                return ResourceManager.GetString("OleDb_CantCreate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Command parameter[{0}] &apos;{1}&apos; is invalid..
-        /// </summary>
-        internal static string OleDb_CommandParameterBadAccessor {
-            get {
-                return ResourceManager.GetString("OleDb_CommandParameterBadAccessor", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Command parameter[{0}] &apos;{1}&apos; data value could not be converted for reasons other than sign mismatch or data overflow..
-        /// </summary>
-        internal static string OleDb_CommandParameterCantConvertValue {
-            get {
-                return ResourceManager.GetString("OleDb_CommandParameterCantConvertValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Conversion failed for command parameter[{0}] &apos;{1}&apos; because the data value overflowed the type used by the provider..
-        /// </summary>
-        internal static string OleDb_CommandParameterDataOverflow {
-            get {
-                return ResourceManager.GetString("OleDb_CommandParameterDataOverflow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Parameter[{0}] &apos;{1}&apos; has no default value..
-        /// </summary>
-        internal static string OleDb_CommandParameterDefault {
-            get {
-                return ResourceManager.GetString("OleDb_CommandParameterDefault", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error occurred with parameter[{0}]: {1}..
-        /// </summary>
-        internal static string OleDb_CommandParameterError {
-            get {
-                return ResourceManager.GetString("OleDb_CommandParameterError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Conversion failed for command parameter[{0}] &apos;{1}&apos; because the data value was signed and the type used by the provider was unsigned..
-        /// </summary>
-        internal static string OleDb_CommandParameterSignMismatch {
-            get {
-                return ResourceManager.GetString("OleDb_CommandParameterSignMismatch", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Provider encountered an error while sending command parameter[{0}] &apos;{1}&apos; value and stopped processing..
-        /// </summary>
-        internal static string OleDb_CommandParameterUnavailable {
-            get {
-                return ResourceManager.GetString("OleDb_CommandParameterUnavailable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The ICommandText interface is not supported by the &apos;{0}&apos; provider. Use CommandType.TableDirect instead..
-        /// </summary>
-        internal static string OleDb_CommandTextNotSupported {
-            get {
-                return ResourceManager.GetString("OleDb_CommandTextNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to load the XML file specified in configuration setting &apos;{0}&apos;..
-        /// </summary>
-        internal static string OleDb_ConfigUnableToLoadXmlMetaDataFile {
-            get {
-                return ResourceManager.GetString("OleDb_ConfigUnableToLoadXmlMetaDataFile", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The &apos;{0}&apos; configuration setting has the wrong number of values..
-        /// </summary>
-        internal static string OleDb_ConfigWrongNumberOfValues {
-            get {
-                return ResourceManager.GetString("OleDb_ConfigWrongNumberOfValues", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Format of the initialization string does not conform to the OLE DB specification.  Starting around char[{0}] in the connection string..
-        /// </summary>
-        internal static string OleDb_ConnectionStringSyntax {
-            get {
-                return ResourceManager.GetString("OleDb_ConnectionStringSyntax", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Conversion failed because the {0} data value overflowed the type specified for the {0} value part in the consumer&apos;s buffer..
-        /// </summary>
-        internal static string OleDb_DataOverflow {
-            get {
-                return ResourceManager.GetString("OleDb_DataOverflow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to DBTYPE_VECTOR data is not supported by the .NET Framework Data OLE DB Provider(Microsoft.Data.OleDb)..
-        /// </summary>
-        internal static string OleDb_DBBindingGetVector {
-            get {
-                return ResourceManager.GetString("OleDb_DBBindingGetVector", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to IErrorInfo.GetDescription failed with {0}..
-        /// </summary>
-        internal static string OleDb_FailedGetDescription {
-            get {
-                return ResourceManager.GetString("OleDb_FailedGetDescription", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to IErrorInfo.GetSource failed with {0}..
-        /// </summary>
-        internal static string OleDb_FailedGetSource {
-            get {
-                return ResourceManager.GetString("OleDb_FailedGetSource", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to retrieve the IRow interface from the ADODB.Record object..
-        /// </summary>
-        internal static string OleDb_Fill_EmptyRecord {
-            get {
-                return ResourceManager.GetString("OleDb_Fill_EmptyRecord", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to retrieve the &apos;{0}&apos; interface from the ADODB.RecordSet object..
-        /// </summary>
-        internal static string OleDb_Fill_EmptyRecordSet {
-            get {
-                return ResourceManager.GetString("OleDb_Fill_EmptyRecordSet", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Object is not an ADODB.RecordSet or an ADODB.Record..
-        /// </summary>
-        internal static string OleDb_Fill_NotADODB {
-            get {
-                return ResourceManager.GetString("OleDb_Fill_NotADODB", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to OleDbDataAdapter internal error: [get] Unknown OLE DB data type: 0x{0} ({1})..
-        /// </summary>
-        internal static string OleDb_GVtUnknown {
-            get {
-                return ResourceManager.GetString("OleDb_GVtUnknown", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot construct the ReservedWords schema collection because the provider does not support IDBInfo..
-        /// </summary>
-        internal static string OleDb_IDBInfoNotSupported {
-            get {
-                return ResourceManager.GetString("OleDb_IDBInfoNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The OLE DB Provider specified in the ConnectionString is too long..
-        /// </summary>
-        internal static string OleDb_InvalidProviderSpecified {
-            get {
-                return ResourceManager.GetString("OleDb_InvalidProviderSpecified", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No restrictions are expected for the DbInfoKeywords OleDbSchemaGuid..
-        /// </summary>
-        internal static string OleDb_InvalidRestrictionsDbInfoKeywords {
-            get {
-                return ResourceManager.GetString("OleDb_InvalidRestrictionsDbInfoKeywords", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No restrictions are expected for the DbInfoLiterals OleDbSchemaGuid..
-        /// </summary>
-        internal static string OleDb_InvalidRestrictionsDbInfoLiteral {
-            get {
-                return ResourceManager.GetString("OleDb_InvalidRestrictionsDbInfoLiteral", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No restrictions are expected for the schema guid OleDbSchemaGuid..
-        /// </summary>
-        internal static string OleDb_InvalidRestrictionsSchemaGuids {
-            get {
-                return ResourceManager.GetString("OleDb_InvalidRestrictionsSchemaGuids", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type does not support the OLE DB interface ISourcesRowset.
-        /// </summary>
-        internal static string OleDb_ISourcesRowsetNotSupported {
-            get {
-                return ResourceManager.GetString("OleDb_ISourcesRowsetNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The .NET Framework Data Providers require Microsoft Data Access Components(MDAC).  Please install Microsoft Data Access Components(MDAC) version 2.6 or later..
-        /// </summary>
-        internal static string OleDb_MDACNotAvailable {
-            get {
-                return ResourceManager.GetString("OleDb_MDACNotAvailable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The .NET Framework OleDb Data Provider requires Microsoft Data Access Components(MDAC) version 2.6 or later.  Version {0} was found currently installed..
-        /// </summary>
-        internal static string OleDb_MDACWrongVersion {
-            get {
-                return ResourceManager.GetString("OleDb_MDACWrongVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The .NET Framework Data Provider for OLEDB (Microsoft.Data.OleDb) does not support the Microsoft OLE DB Provider for ODBC Drivers (MSDASQL). Use the .NET Framework Data Provider for ODBC (System.Data.Odbc)..
-        /// </summary>
-        internal static string OleDb_MSDASQLNotSupported {
-            get {
-                return ResourceManager.GetString("OleDb_MSDASQLNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No error message available, result code: {0}..
-        /// </summary>
-        internal static string OleDb_NoErrorInformation {
-            get {
-                return ResourceManager.GetString("OleDb_NoErrorInformation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; failed with no error message available, result code: {1}..
-        /// </summary>
-        internal static string OleDb_NoErrorInformation2 {
-            get {
-                return ResourceManager.GetString("OleDb_NoErrorInformation2", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unspecified error: {0}.
-        /// </summary>
-        internal static string OleDb_NoErrorMessage {
-            get {
-                return ResourceManager.GetString("OleDb_NoErrorMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An OLE DB Provider was not specified in the ConnectionString.  An example would be, &apos;Provider=SQLOLEDB;&apos;..
-        /// </summary>
-        internal static string OleDb_NoProviderSpecified {
-            get {
-                return ResourceManager.GetString("OleDb_NoProviderSpecified", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The ICommandWithParameters interface is not supported by the &apos;{0}&apos; provider.  Command parameters are unsupported with the current provider..
-        /// </summary>
-        internal static string OleDb_NoProviderSupportForParameters {
-            get {
-                return ResourceManager.GetString("OleDb_NoProviderSupportForParameters", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Retrieving procedure parameter information is not supported by the &apos;{0}&apos; provider..
-        /// </summary>
-        internal static string OleDb_NoProviderSupportForSProcResetParameters {
-            get {
-                return ResourceManager.GetString("OleDb_NoProviderSupportForSProcResetParameters", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The {0} enumeration value, {1}, is not supported by the .NET Framework OleDb Data Provider..
-        /// </summary>
-        internal static string OLEDB_NotSupportedEnumerationValue {
-            get {
-                return ResourceManager.GetString("OLEDB_NotSupportedEnumerationValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The {0} OleDbSchemaGuid is not a supported schema by the &apos;{1}&apos; provider..
-        /// </summary>
-        internal static string OleDb_NotSupportedSchemaTable {
-            get {
-                return ResourceManager.GetString("OleDb_NotSupportedSchemaTable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to OleDbCommandBuilder.DeriveParameters failed because the OleDbCommandBuilder.CommandText property value is an invalid multipart name.
-        /// </summary>
-        internal static string OLEDB_OLEDBCommandText {
-            get {
-                return ResourceManager.GetString("OLEDB_OLEDBCommandText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The .NET Framework Data Provider for OLEDB will not allow the OLE DB Provider to prompt the user in a non-interactive environment..
-        /// </summary>
-        internal static string OleDb_PossiblePromptNotUserInteractive {
-            get {
-                return ResourceManager.GetString("OleDb_PossiblePromptNotUserInteractive", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The ColumnID element was invalid..
-        /// </summary>
-        internal static string OleDb_PropertyBadColumn {
-            get {
-                return ResourceManager.GetString("OleDb_PropertyBadColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The value of Options was invalid..
-        /// </summary>
-        internal static string OleDb_PropertyBadOption {
-            get {
-                return ResourceManager.GetString("OleDb_PropertyBadOption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to initialize the &apos;{0}&apos; property for one of the following reasons:
-        ///	The value data type was not the data type of the property or was not null. For example, the property was DBPROP_MEMORYUSAGE, which has a data type of Int32, and the data type was Int64.
-        ///	The value was not a valid value. For example, the property was DBPROP_MEMORYUSAGE and the value was negative.
-        ///	The value was a valid value for the property and the provider supports the property as a settable property, but the provider does not su [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string OleDb_PropertyBadValue {
-            get {
-                return ResourceManager.GetString("OleDb_PropertyBadValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The &apos;{0}&apos;property&apos;s value was not set because doing so would have conflicted with an existing property..
-        /// </summary>
-        internal static string OleDb_PropertyConflicting {
-            get {
-                return ResourceManager.GetString("OleDb_PropertyConflicting", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A &apos;{0}&apos; property was specified to be applied to all columns but could not be applied to one or more of them..
-        /// </summary>
-        internal static string OleDb_PropertyNotAllSettable {
-            get {
-                return ResourceManager.GetString("OleDb_PropertyNotAllSettable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to (Reserved)..
-        /// </summary>
-        internal static string OleDb_PropertyNotAvailable {
-            get {
-                return ResourceManager.GetString("OleDb_PropertyNotAvailable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The optional &apos;{0}&apos; property&apos;s value was not set to the specified value and setting the property to the specified value was not possible..
-        /// </summary>
-        internal static string OleDb_PropertyNotSet {
-            get {
-                return ResourceManager.GetString("OleDb_PropertyNotSet", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The &apos;{0}&apos; property was read-only, or the consumer attempted to set values of properties in the Initialization property group after the data source object was initialized. Consumers can set the value of a read-only property to its current value. This status is also returned if a settable column property could not be set for the particular column..
-        /// </summary>
-        internal static string OleDb_PropertyNotSettable {
-            get {
-                return ResourceManager.GetString("OleDb_PropertyNotSettable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The property&apos;s value was not set because the provider did not support the &apos;{0}&apos; property, or the consumer attempted to get or set values of properties not in the Initialization property group and the data source object is uninitialized..
-        /// </summary>
-        internal static string OleDb_PropertyNotSupported {
-            get {
-                return ResourceManager.GetString("OleDb_PropertyNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The provider returned an unknown DBPROPSTATUS_ value &apos;{0}&apos;..
-        /// </summary>
-        internal static string OleDb_PropertyStatusUnknown {
-            get {
-                return ResourceManager.GetString("OleDb_PropertyStatusUnknown", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The &apos;{0}&apos; provider is not registered on the local machine..
-        /// </summary>
-        internal static string OleDb_ProviderUnavailable {
-            get {
-                return ResourceManager.GetString("OleDb_ProviderUnavailable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; interface is not supported by the &apos;{1}&apos; provider.  GetOleDbSchemaTable is unavailable with the current provider..
-        /// </summary>
-        internal static string OleDb_SchemaRowsetsNotSupported {
-            get {
-                return ResourceManager.GetString("OleDb_SchemaRowsetsNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Conversion failed because the {0} data value was signed and the type specified for the {0} value part in the consumer&apos;s buffer was unsigned..
-        /// </summary>
-        internal static string OleDb_SignMismatch {
-            get {
-                return ResourceManager.GetString("OleDb_SignMismatch", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to OleDbDataAdapter internal error: [set] Unknown OLE DB data type: 0x{0} ({1})..
-        /// </summary>
-        internal static string OleDb_SVtUnknown {
-            get {
-                return ResourceManager.GetString("OleDb_SVtUnknown", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The OleDbDataReader.Read must be used from the same thread on which is was created if that thread&apos;s ApartmentState was not ApartmentState.MTA..
-        /// </summary>
-        internal static string OleDb_ThreadApartmentState {
-            get {
-                return ResourceManager.GetString("OleDb_ThreadApartmentState", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The ITransactionLocal interface is not supported by the &apos;{0}&apos; provider.  Local transactions are unavailable with the current provider..
-        /// </summary>
-        internal static string OleDb_TransactionsNotSupported {
-            get {
-                return ResourceManager.GetString("OleDb_TransactionsNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The provider could not determine the {0} value. For example, the row was just created, the default for the {0} column was not available, and the consumer had not yet set a new {0} value..
-        /// </summary>
-        internal static string OleDb_Unavailable {
-            get {
-                return ResourceManager.GetString("OleDb_Unavailable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to OLE DB Provider returned an unexpected status value of {0}..
-        /// </summary>
-        internal static string OleDb_UnexpectedStatusValue {
-            get {
-                return ResourceManager.GetString("OleDb_UnexpectedStatusValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Parameter[{0}]: the OleDbType property is uninitialized: OleDbType.{1}..
-        /// </summary>
-        internal static string OleDb_UninitializedParameters {
-            get {
-                return ResourceManager.GetString("OleDb_UninitializedParameters", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The DataAdapter for which to automatically generate OleDbCommands.
-        /// </summary>
-        internal static string OleDbCommandBuilder_DataAdapter {
-            get {
-                return ResourceManager.GetString("OleDbCommandBuilder_DataAdapter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The decimal separator used in numeric literals..
-        /// </summary>
-        internal static string OleDbCommandBuilder_DecimalSeparator {
-            get {
-                return ResourceManager.GetString("OleDbCommandBuilder_DecimalSeparator", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The prefix string wrapped around sql objects.
-        /// </summary>
-        internal static string OleDbCommandBuilder_QuotePrefix {
-            get {
-                return ResourceManager.GetString("OleDbCommandBuilder_QuotePrefix", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The suffix string wrapped around sql objects.
-        /// </summary>
-        internal static string OleDbCommandBuilder_QuoteSuffix {
-            get {
-                return ResourceManager.GetString("OleDbCommandBuilder_QuoteSuffix", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Information used to connect to a Data Source..
-        /// </summary>
-        internal static string OleDbConnection_ConnectionString {
-            get {
-                return ResourceManager.GetString("OleDbConnection_ConnectionString", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current connection timeout value, &apos;Connect Timeout=X&apos; in the ConnectionString..
-        /// </summary>
-        internal static string OleDbConnection_ConnectionTimeout {
-            get {
-                return ResourceManager.GetString("OleDbConnection_ConnectionTimeout", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current data source catalog value, &apos;Initial Catalog=X&apos; in the connection string..
-        /// </summary>
-        internal static string OleDbConnection_Database {
-            get {
-                return ResourceManager.GetString("OleDbConnection_Database", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current data source, &apos;Data Source=X&apos; in the connection string..
-        /// </summary>
-        internal static string OleDbConnection_DataSource {
-            get {
-                return ResourceManager.GetString("OleDbConnection_DataSource", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current OLE DB provider ProgID, &apos;Provider=X&apos; in the connection string..
-        /// </summary>
-        internal static string OleDbConnection_Provider {
-            get {
-                return ResourceManager.GetString("OleDbConnection_Provider", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Version of the product accessed by the OLE DB Provider..
-        /// </summary>
-        internal static string OleDbConnection_ServerVersion {
-            get {
-                return ResourceManager.GetString("OleDbConnection_ServerVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The parameter native type..
-        /// </summary>
-        internal static string OleDbParameter_OleDbType {
-            get {
-                return ResourceManager.GetString("OleDbParameter_OleDbType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Occurs whenever a property for this control changes..
-        /// </summary>
-        internal static string propertyChangedEventDescr {
-            get {
-                return ResourceManager.GetString("propertyChangedEventDescr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Min ({0}) must be less than or equal to max ({1}) in a Range object..
-        /// </summary>
-        internal static string Range_Argument {
-            get {
-                return ResourceManager.GetString("Range_Argument", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This is a null range..
-        /// </summary>
-        internal static string Range_NullRange {
-            get {
-                return ResourceManager.GetString("Range_NullRange", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Collection was modified; enumeration operation might not execute..
-        /// </summary>
-        internal static string RbTree_EnumerationBroken {
-            get {
-                return ResourceManager.GetString("RbTree_EnumerationBroken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to DataTable internal index is corrupted: &apos;{0}&apos;..
-        /// </summary>
-        internal static string RbTree_InvalidState {
-            get {
-                return ResourceManager.GetString("RbTree_InvalidState", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to MinimumCapacity must be non-negative..
-        /// </summary>
-        internal static string RecordManager_MinimumCapacity {
-            get {
-                return ResourceManager.GetString("RecordManager_MinimumCapacity", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Security Warning: The negotiated {0} is an insecure protocol and is supported for backward compatibility only. The recommended protocol version is TLS 1.2 and later..
-        /// </summary>
-        internal static string SEC_ProtocolWarning {
-            get {
-                return ResourceManager.GetString("SEC_ProtocolWarning", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to I/O Error detected in read/write operation.
-        /// </summary>
-        internal static string SNI_ERROR_1 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Socket is null.
-        /// </summary>
-        internal static string SNI_ERROR_10 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_10", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Timeout error.
-        /// </summary>
-        internal static string SNI_ERROR_11 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_11", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No server name supplied.
-        /// </summary>
-        internal static string SNI_ERROR_12 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_12", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to TerminateListener() has been called.
-        /// </summary>
-        internal static string SNI_ERROR_13 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_13", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Win9x not supported.
-        /// </summary>
-        internal static string SNI_ERROR_14 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_14", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Function not supported.
-        /// </summary>
-        internal static string SNI_ERROR_15 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_15", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Shared-Memory heap error.
-        /// </summary>
-        internal static string SNI_ERROR_16 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_16", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot find an ip/ipv6 type address to connect.
-        /// </summary>
-        internal static string SNI_ERROR_17 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_17", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection has been closed by peer.
-        /// </summary>
-        internal static string SNI_ERROR_18 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_18", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Physical connection is not usable.
-        /// </summary>
-        internal static string SNI_ERROR_19 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_19", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection was terminated.
-        /// </summary>
-        internal static string SNI_ERROR_2 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_2", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection has been closed.
-        /// </summary>
-        internal static string SNI_ERROR_20 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_20", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Encryption is enforced but there is no valid certificate.
-        /// </summary>
-        internal static string SNI_ERROR_21 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_21", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Couldn&apos;t load library.
-        /// </summary>
-        internal static string SNI_ERROR_22 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_22", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot open a new thread in server process.
-        /// </summary>
-        internal static string SNI_ERROR_23 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_23", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot post event to completion port.
-        /// </summary>
-        internal static string SNI_ERROR_24 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_24", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection string is not valid.
-        /// </summary>
-        internal static string SNI_ERROR_25 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_25", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error Locating Server/Instance Specified.
-        /// </summary>
-        internal static string SNI_ERROR_26 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_26", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error getting enabled protocols list from registry.
-        /// </summary>
-        internal static string SNI_ERROR_27 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_27", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Server doesn&apos;t support requested protocol.
-        /// </summary>
-        internal static string SNI_ERROR_28 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_28", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Shared Memory is not supported for clustered server connectivity.
-        /// </summary>
-        internal static string SNI_ERROR_29 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_29", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Asynchronous operations not supported.
-        /// </summary>
-        internal static string SNI_ERROR_3 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_3", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt bind to shared memory segment.
-        /// </summary>
-        internal static string SNI_ERROR_30 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_30", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Encryption(ssl/tls) handshake failed.
-        /// </summary>
-        internal static string SNI_ERROR_31 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_31", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Packet size too large for SSL Encrypt/Decrypt operations.
-        /// </summary>
-        internal static string SNI_ERROR_32 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_32", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SSRP error.
-        /// </summary>
-        internal static string SNI_ERROR_33 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_33", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Could not connect to the Shared Memory pipe.
-        /// </summary>
-        internal static string SNI_ERROR_34 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_34", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An internal exception was caught.
-        /// </summary>
-        internal static string SNI_ERROR_35 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_35", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The Shared Memory dll used to connect to SQL Server 2000 was not found.
-        /// </summary>
-        internal static string SNI_ERROR_36 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_36", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The SQL Server 2000 Shared Memory client dll appears to be invalid/corrupted.
-        /// </summary>
-        internal static string SNI_ERROR_37 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_37", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot open a Shared Memory connection to SQL Server 2000.
-        /// </summary>
-        internal static string SNI_ERROR_38 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_38", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Shared memory connectivity to SQL Server 2000 is either disabled or not available on this machine.
-        /// </summary>
-        internal static string SNI_ERROR_39 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_39", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to .
-        /// </summary>
-        internal static string SNI_ERROR_4 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_4", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Could not open a connection to SQL Server.
-        /// </summary>
-        internal static string SNI_ERROR_40 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_40", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot open a Shared Memory connection to a remote SQL server.
-        /// </summary>
-        internal static string SNI_ERROR_41 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_41", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Could not establish dedicated administrator connection (DAC) on default port. Make sure that DAC is enabled.
-        /// </summary>
-        internal static string SNI_ERROR_42 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_42", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An error occurred while obtaining the dedicated administrator connection (DAC) port. Make sure that SQL Browser is running, or check the error log for the port number.
-        /// </summary>
-        internal static string SNI_ERROR_43 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_43", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Could not compose Service Principal Name (SPN) for Windows Integrated Authentication. Possible causes are server(s) incorrectly specified to connection API calls, Domain Name System (DNS) lookup failure or memory shortage.
-        /// </summary>
-        internal static string SNI_ERROR_44 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_44", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connecting with the MultiSubnetFailover connection option to a SQL Server instance configured with more than 64 IP addresses is not supported..
-        /// </summary>
-        internal static string SNI_ERROR_47 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_47", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connecting to a named SQL Server instance using the MultiSubnetFailover connection option is not supported..
-        /// </summary>
-        internal static string SNI_ERROR_48 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_48", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connecting to a SQL Server instance using the MultiSubnetFailover connection option is only supported when using the TCP protocol..
-        /// </summary>
-        internal static string SNI_ERROR_49 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_49", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid parameter(s) found.
-        /// </summary>
-        internal static string SNI_ERROR_5 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_5", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Local Database Runtime error occurred. .
-        /// </summary>
-        internal static string SNI_ERROR_50 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_50", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An instance name was not specified while connecting to a Local Database Runtime. Specify an instance name in the format (localdb)\instance_name..
-        /// </summary>
-        internal static string SNI_ERROR_51 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_51", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to locate a Local Database Runtime installation. Verify that SQL Server Express is properly installed and that the Local Database Runtime feature is enabled..
-        /// </summary>
-        internal static string SNI_ERROR_52 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_52", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid Local Database Runtime registry configuration found. Verify that SQL Server Express is properly installed..
-        /// </summary>
-        internal static string SNI_ERROR_53 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_53", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to locate the registry entry for SQLUserInstance.dll file path. Verify that the Local Database Runtime feature of SQL Server Express is properly installed..
-        /// </summary>
-        internal static string SNI_ERROR_54 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_54", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Registry value contains an invalid SQLUserInstance.dll file path. Verify that the Local Database Runtime feature of SQL Server Express is properly installed..
-        /// </summary>
-        internal static string SNI_ERROR_55 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_55", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to load the SQLUserInstance.dll from the location specified in the registry. Verify that the Local Database Runtime feature of SQL Server Express is properly installed..
-        /// </summary>
-        internal static string SNI_ERROR_56 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_56", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid SQLUserInstance.dll found at the location specified in the registry. Verify that the Local Database Runtime feature of SQL Server Express is properly installed..
-        /// </summary>
-        internal static string SNI_ERROR_57 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_57", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unsupported protocol specified.
-        /// </summary>
-        internal static string SNI_ERROR_6 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_6", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid connection found when setting up new session protocol.
-        /// </summary>
-        internal static string SNI_ERROR_7 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_7", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Protocol not supported.
-        /// </summary>
-        internal static string SNI_ERROR_8 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_8", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Associating port with I/O completion mechanism failed.
-        /// </summary>
-        internal static string SNI_ERROR_9 {
-            get {
-                return ResourceManager.GetString("SNI_ERROR_9", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Incorrect physicalConnection type..
-        /// </summary>
-        internal static string SNI_IncorrectPhysicalConnectionType {
-            get {
-                return ResourceManager.GetString("SNI_IncorrectPhysicalConnectionType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The &apos;{0}&apos; platform is not supported when targeting .NET Framework..
-        /// </summary>
-        internal static string SNI_PlatformNotSupportedNetFx {
-            get {
-                return ResourceManager.GetString("SNI_PlatformNotSupportedNetFx", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to HTTP Provider.
-        /// </summary>
-        internal static string SNI_PN0 {
-            get {
-                return ResourceManager.GetString("SNI_PN0", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Named Pipes Provider.
-        /// </summary>
-        internal static string SNI_PN1 {
-            get {
-                return ResourceManager.GetString("SNI_PN1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to .
-        /// </summary>
-        internal static string SNI_PN10 {
-            get {
-                return ResourceManager.GetString("SNI_PN10", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SQL Network Interfaces.
-        /// </summary>
-        internal static string SNI_PN11 {
-            get {
-                return ResourceManager.GetString("SNI_PN11", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Session Provider.
-        /// </summary>
-        internal static string SNI_PN2 {
-            get {
-                return ResourceManager.GetString("SNI_PN2", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Sign Provider.
-        /// </summary>
-        internal static string SNI_PN3 {
-            get {
-                return ResourceManager.GetString("SNI_PN3", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Shared Memory Provider.
-        /// </summary>
-        internal static string SNI_PN4 {
-            get {
-                return ResourceManager.GetString("SNI_PN4", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SMux Provider.
-        /// </summary>
-        internal static string SNI_PN5 {
-            get {
-                return ResourceManager.GetString("SNI_PN5", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SSL Provider.
-        /// </summary>
-        internal static string SNI_PN6 {
-            get {
-                return ResourceManager.GetString("SNI_PN6", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to TCP Provider.
-        /// </summary>
-        internal static string SNI_PN7 {
-            get {
-                return ResourceManager.GetString("SNI_PN7", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to VIA Provider.
-        /// </summary>
-        internal static string SNI_PN8 {
-            get {
-                return ResourceManager.GetString("SNI_PN8", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to CTAIP Provider.
-        /// </summary>
-        internal static string SNI_PN9 {
-            get {
-                return ResourceManager.GetString("SNI_PN9", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection open and login was successful, but then an error occurred while enlisting the connection into the current distributed transaction..
-        /// </summary>
-        internal static string Snix_AutoEnlist {
-            get {
-                return ResourceManager.GetString("Snix_AutoEnlist", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A transport-level error has occurred during connection clean-up..
-        /// </summary>
-        internal static string Snix_Close {
-            get {
-                return ResourceManager.GetString("Snix_Close", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A network-related or instance-specific error occurred while establishing a connection to SQL Server. The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections..
-        /// </summary>
-        internal static string Snix_Connect {
-            get {
-                return ResourceManager.GetString("Snix_Connect", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection open and login was successful, but then an error occurred while enabling MARS for this connection..
-        /// </summary>
-        internal static string Snix_EnableMars {
-            get {
-                return ResourceManager.GetString("Snix_EnableMars", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A transport-level error has occurred when sending the request to the server..
-        /// </summary>
-        internal static string Snix_Execute {
-            get {
-                return ResourceManager.GetString("Snix_Execute", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to establish a MARS session in preparation to send the request to the server..
-        /// </summary>
-        internal static string Snix_GetMarsSession {
-            get {
-                return ResourceManager.GetString("Snix_GetMarsSession", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A connection was successfully established with the server, but then an error occurred during the login process..
-        /// </summary>
-        internal static string Snix_Login {
-            get {
-                return ResourceManager.GetString("Snix_Login", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A connection was successfully established with the server, but then an error occurred when obtaining the security/SSPI context information for integrated security login..
-        /// </summary>
-        internal static string Snix_LoginSspi {
-            get {
-                return ResourceManager.GetString("Snix_LoginSspi", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A connection was successfully established with the server, but then an error occurred during the pre-login handshake..
-        /// </summary>
-        internal static string Snix_PreLogin {
-            get {
-                return ResourceManager.GetString("Snix_PreLogin", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The client was unable to establish a connection because of an error during connection initialization process before login. Possible causes include the following:  the client tried to connect to an unsupported version of SQL Server; the server was too busy to accept new connections; or there was a resource limitation (insufficient memory or maximum allowed connections) on the server..
-        /// </summary>
-        internal static string Snix_PreLoginBeforeSuccessfulWrite {
-            get {
-                return ResourceManager.GetString("Snix_PreLoginBeforeSuccessfulWrite", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A transport-level error has occurred during SSPI handshake..
-        /// </summary>
-        internal static string Snix_ProcessSspi {
-            get {
-                return ResourceManager.GetString("Snix_ProcessSspi", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A transport-level error has occurred when receiving results from the server..
-        /// </summary>
-        internal static string Snix_Read {
-            get {
-                return ResourceManager.GetString("Snix_Read", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A transport-level error has occurred while sending information to the server..
-        /// </summary>
-        internal static string Snix_SendRows {
-            get {
-                return ResourceManager.GetString("Snix_SendRows", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The length of &apos;{0}&apos; must match the length of &apos;{1}&apos;..
-        /// </summary>
-        internal static string SQL_ArgumentLengthMismatch {
-            get {
-                return ResourceManager.GetString("SQL_ArgumentLengthMismatch", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This command requires an asynchronous connection. Set &quot;Asynchronous Processing=true&quot; in the connection string..
-        /// </summary>
-        internal static string SQL_AsyncConnectionRequired {
-            get {
-                return ResourceManager.GetString("SQL_AsyncConnectionRequired", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The asynchronous operation has already completed..
-        /// </summary>
-        internal static string SQL_AsyncOperationCompleted {
-            get {
-                return ResourceManager.GetString("SQL_AsyncOperationCompleted", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot use &apos;Authentication&apos; with &apos;Integrated Security&apos;..
-        /// </summary>
-        internal static string SQL_AuthenticationAndIntegratedSecurity {
-            get {
-                return ResourceManager.GetString("SQL_AuthenticationAndIntegratedSecurity", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlBulkCopy.WriteToServer failed because the SqlBulkCopy.DestinationTableName is an invalid multipart name.
-        /// </summary>
-        internal static string SQL_BulkCopyDestinationTableName {
-            get {
-                return ResourceManager.GetString("SQL_BulkCopyDestinationTableName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The given value{0} of type {1} from the data source cannot be converted to type {2} for Column {3} [{4}] Row {5}..
-        /// </summary>
-        internal static string SQL_BulkLoadCannotConvertValue {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadCannotConvertValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The given value{0} of type {1} from the data source cannot be converted to type {2} for Column {3} [{4}]..
-        /// </summary>
-        internal static string SQL_BulkLoadCannotConvertValueWithoutRowNo {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadCannotConvertValueWithoutRowNo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Must not specify SqlBulkCopyOption.UseInternalTransaction and pass an external Transaction at the same time..
-        /// </summary>
-        internal static string SQL_BulkLoadConflictingTransactionOption {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadConflictingTransactionOption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unexpected existing transaction..
-        /// </summary>
-        internal static string SQL_BulkLoadExistingTransaction {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadExistingTransaction", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot access destination table &apos;{0}&apos;..
-        /// </summary>
-        internal static string SQL_BulkLoadInvalidDestinationTable {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadInvalidDestinationTable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Function must not be called during event..
-        /// </summary>
-        internal static string SQL_BulkLoadInvalidOperationInsideEvent {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadInvalidOperationInsideEvent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The given column order hint is not valid..
-        /// </summary>
-        internal static string SQL_BulkLoadInvalidOrderHint {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadInvalidOrderHint", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Timeout Value &apos;{0}&apos; is less than 0..
-        /// </summary>
-        internal static string SQL_BulkLoadInvalidTimeout {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadInvalidTimeout", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Value cannot be converted to SqlVariant..
-        /// </summary>
-        internal static string SQL_BulkLoadInvalidVariantValue {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadInvalidVariantValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The locale id &apos;{0}&apos; of the source column &apos;{1}&apos; and the locale id &apos;{2}&apos; of the destination column &apos;{3}&apos; do not match..
-        /// </summary>
-        internal static string Sql_BulkLoadLcidMismatch {
-            get {
-                return ResourceManager.GetString("Sql_BulkLoadLcidMismatch", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The mapped collection is in use and cannot be accessed at this time;.
-        /// </summary>
-        internal static string SQL_BulkLoadMappingInaccessible {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadMappingInaccessible", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Mappings must be either all name or all ordinal based..
-        /// </summary>
-        internal static string SQL_BulkLoadMappingsNamesOrOrdinalsOnly {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadMappingsNamesOrOrdinalsOnly", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The DestinationTableName property must be set before calling this method..
-        /// </summary>
-        internal static string SQL_BulkLoadMissingDestinationTable {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadMissingDestinationTable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to obtain column collation information for the destination table. If the table is not in the current database the name must be qualified using the database name (e.g. [mydb]..[mytable](e.g. [mydb]..[mytable]); this also applies to temporary-tables (e.g. #mytable would be specified as tempdb..#mytable)..
-        /// </summary>
-        internal static string SQL_BulkLoadNoCollation {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadNoCollation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The given ColumnMapping does not match up with any column in the source or destination..
-        /// </summary>
-        internal static string SQL_BulkLoadNonMatchingColumnMapping {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadNonMatchingColumnMapping", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The given ColumnName &apos;{0}&apos; does not match up with any column in data source..
-        /// </summary>
-        internal static string SQL_BulkLoadNonMatchingColumnName {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadNonMatchingColumnName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Column &apos;{0}&apos; does not allow DBNull.Value..
-        /// </summary>
-        internal static string SQL_BulkLoadNotAllowDBNull {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadNotAllowDBNull", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The column &apos;{0}&apos; was specified more than once..
-        /// </summary>
-        internal static string SQL_BulkLoadOrderHintDuplicateColumn {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadOrderHintDuplicateColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The sorted column &apos;{0}&apos; is not valid in the destination table..
-        /// </summary>
-        internal static string SQL_BulkLoadOrderHintInvalidColumn {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadOrderHintInvalidColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Attempt to invoke bulk copy on an object that has a pending operation..
-        /// </summary>
-        internal static string SQL_BulkLoadPendingOperation {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadPendingOperation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to String or binary data would be truncated in table &apos;{0}&apos;, column &apos;{1}&apos;. Truncated value: &apos;{2}&apos;..
-        /// </summary>
-        internal static string SQL_BulkLoadStringTooLong {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadStringTooLong", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A column order hint cannot have an unspecified sort order..
-        /// </summary>
-        internal static string SQL_BulkLoadUnspecifiedSortOrder {
-            get {
-                return ResourceManager.GetString("SQL_BulkLoadUnspecifiedSortOrder", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to instantiate a SqlAuthenticationInitializer with type &apos;{0}&apos;..
-        /// </summary>
-        internal static string SQL_CannotCreateAuthInitializer {
-            get {
-                return ResourceManager.GetString("SQL_CannotCreateAuthInitializer", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to instantiate an authentication provider with type &apos;{1}&apos; for &apos;{0}&apos;..
-        /// </summary>
-        internal static string SQL_CannotCreateAuthProvider {
-            get {
-                return ResourceManager.GetString("SQL_CannotCreateAuthProvider", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot create normalizer for &apos;{0}&apos;..
-        /// </summary>
-        internal static string SQL_CannotCreateNormalizer {
-            get {
-                return ResourceManager.GetString("SQL_CannotCreateNormalizer", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot find an authentication provider for &apos;{0}&apos;..
-        /// </summary>
-        internal static string SQL_CannotFindAuthProvider {
-            get {
-                return ResourceManager.GetString("SQL_CannotFindAuthProvider", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot find an authentication provider for &apos;{0}&apos;. Install the &apos;Microsoft.Data.SqlClient.Extensions.Azure&apos; NuGet package (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) to use Active Directory (Entra ID) authentication methods..
-        /// </summary>
-        internal static string SQL_CannotFindActiveDirectoryAuthProvider {
-            get {
-                return ResourceManager.GetString("SQL_CannotFindActiveDirectoryAuthProvider", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to read the config section for authentication providers..
-        /// </summary>
-        internal static string SQL_CannotGetAuthProviderConfig {
-            get {
-                return ResourceManager.GetString("SQL_CannotGetAuthProviderConfig", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to get the address of the distributed transaction coordinator for the server, from the server.  Is DTC enabled on the server?.
-        /// </summary>
-        internal static string SQL_CannotGetDTCAddress {
-            get {
-                return ResourceManager.GetString("SQL_CannotGetDTCAddress", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The provider &apos;{0}&apos; threw an exception while initializing..
-        /// </summary>
-        internal static string SQL_CannotInitializeAuthProvider {
-            get {
-                return ResourceManager.GetString("SQL_CannotInitializeAuthProvider", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} cannot be changed while async operation is in progress..
-        /// </summary>
-        internal static string SQL_CannotModifyPropertyAsyncOperationInProgress {
-            get {
-                return ResourceManager.GetString("SQL_CannotModifyPropertyAsyncOperationInProgress", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Incorrect authentication parameters specified with certificate authentication..
-        /// </summary>
-        internal static string SQL_Certificate {
-            get {
-                return ResourceManager.GetString("SQL_Certificate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The &apos;{0}&apos; argument must not be null or empty..
-        /// </summary>
-        internal static string SQL_ChangePasswordArgumentMissing {
-            get {
-                return ResourceManager.GetString("SQL_ChangePasswordArgumentMissing", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ChangePassword can only be used with SQL authentication, not with integrated security..
-        /// </summary>
-        internal static string SQL_ChangePasswordConflictsWithSSPI {
-            get {
-                return ResourceManager.GetString("SQL_ChangePasswordConflictsWithSSPI", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ChangePassword requires SQL Server 9.0 or later..
-        /// </summary>
-        internal static string SQL_ChangePasswordRequiresYukon {
-            get {
-                return ResourceManager.GetString("SQL_ChangePasswordRequiresYukon", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The keyword &apos;{0}&apos; must not be specified in the connectionString argument to ChangePassword..
-        /// </summary>
-        internal static string SQL_ChangePasswordUseOfUnallowedKey {
-            get {
-                return ResourceManager.GetString("SQL_ChangePasswordUseOfUnallowedKey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The requested operation cannot be completed because the connection has been broken..
-        /// </summary>
-        internal static string SQL_ConnectionDoomed {
-            get {
-                return ResourceManager.GetString("SQL_ConnectionDoomed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The connection cannot be used because there is an ongoing operation that must be finished..
-        /// </summary>
-        internal static string SQL_ConnectionLockedForBcpEvent {
-            get {
-                return ResourceManager.GetString("SQL_ConnectionLockedForBcpEvent", resourceCulture);
-            }
-        }
-		
-        /// <summary>
-        ///   Looks up a localized string similar to Connecting to the context connection using Microsoft.Data.SqlClient is not supported..
-        /// </summary>
-        internal static string SQL_ContextConnectionIsUnsupported {
-            get {
-                return ResourceManager.GetString("SQL_ContextConnectionIsUnsupported", resourceCulture);
-            }
-        }
-
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Either Credential or both &apos;User ID&apos; and &apos;Password&apos; (or &apos;UID&apos; and &apos;PWD&apos;) connection string keywords must be specified, if &apos;Authentication={0}&apos;..
-        /// </summary>
-        internal static string SQL_CredentialsNotProvided {
-            get {
-                return ResourceManager.GetString("SQL_CredentialsNotProvided", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The instance of SQL Server you attempted to connect to does not support CTAIP..
-        /// </summary>
-        internal static string SQL_CTAIPNotSupportedByServer {
-            get {
-                return ResourceManager.GetString("SQL_CTAIPNotSupportedByServer", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The Collation specified by SQL Server is not supported..
-        /// </summary>
-        internal static string SQL_CultureIdError {
-            get {
-                return ResourceManager.GetString("SQL_CultureIdError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type {0} is not supported on this platform..
-        /// </summary>
-        internal static string SQL_DbTypeNotSupportedOnThisPlatform {
-            get {
-                return ResourceManager.GetString("SQL_DbTypeNotSupportedOnThisPlatform", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Device Code Flow&apos; with &apos;User ID&apos;, &apos;UID&apos;, &apos;Password&apos; or &apos;PWD&apos; connection string keywords..
-        /// </summary>
-        internal static string SQL_DeviceFlowWithUsernamePassword {
-            get {
-                return ResourceManager.GetString("SQL_DeviceFlowWithUsernamePassword", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; .
-        /// </summary>
-        internal static string SQL_Duration_Login_Begin {
-            get {
-                return ResourceManager.GetString("SQL_Duration_Login_Begin", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; authentication={3}; .
-        /// </summary>
-        internal static string SQL_Duration_Login_ProcessConnectionAuth {
-            get {
-                return ResourceManager.GetString("SQL_Duration_Login_ProcessConnectionAuth", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; authentication={3}; [Post-Login] complete={4}; .
-        /// </summary>
-        internal static string SQL_Duration_PostLogin {
-            get {
-                return ResourceManager.GetString("SQL_Duration_PostLogin", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0};.
-        /// </summary>
-        internal static string SQL_Duration_PreLogin_Begin {
-            get {
-                return ResourceManager.GetString("SQL_Duration_PreLogin_Begin", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0}; handshake={1}; .
-        /// </summary>
-        internal static string SQL_Duration_PreLoginHandshake {
-            get {
-                return ResourceManager.GetString("SQL_Duration_PreLoginHandshake", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The instance of SQL Server you attempted to connect to requires encryption but this machine does not support it..
-        /// </summary>
-        internal static string SQL_EncryptionNotSupportedByClient {
-            get {
-                return ResourceManager.GetString("SQL_EncryptionNotSupportedByClient", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The instance of SQL Server you attempted to connect to does not support encryption..
-        /// </summary>
-        internal static string SQL_EncryptionNotSupportedByServer {
-            get {
-                return ResourceManager.GetString("SQL_EncryptionNotSupportedByServer", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Number of fields in record &apos;{0}&apos; does not match the number in the original record..
-        /// </summary>
-        internal static string SQL_EnumeratedRecordFieldCountChanged {
-            get {
-                return ResourceManager.GetString("SQL_EnumeratedRecordFieldCountChanged", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Metadata for field &apos;{0}&apos; of record &apos;{1}&apos; did not match the original record&apos;s metadata..
-        /// </summary>
-        internal static string SQL_EnumeratedRecordMetaDataChanged {
-            get {
-                return ResourceManager.GetString("SQL_EnumeratedRecordMetaDataChanged", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specified data length {0} exceeds the allowed maximum length of {1}..
-        /// </summary>
-        internal static string SQL_ExceedsMaxDataLength {
-            get {
-                return ResourceManager.GetString("SQL_ExceedsMaxDataLength", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ClientConnectionId:{0}.
-        /// </summary>
-        internal static string SQL_ExClientConnectionId {
-            get {
-                return ResourceManager.GetString("SQL_ExClientConnectionId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error Number:{0},State:{1},Class:{2}.
-        /// </summary>
-        internal static string SQL_ExErrorNumberStateClass {
-            get {
-                return ResourceManager.GetString("SQL_ExErrorNumberStateClass", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ClientConnectionId before routing:{0}.
-        /// </summary>
-        internal static string SQL_ExOriginalClientConnectionId {
-            get {
-                return ResourceManager.GetString("SQL_ExOriginalClientConnectionId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Routing Destination:{0}.
-        /// </summary>
-        internal static string SQL_ExRoutingDestination {
-            get {
-                return ResourceManager.GetString("SQL_ExRoutingDestination", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to: The connection attempt timed out.
-        /// </summary>
-        internal static string SQL_ConnectTimeout {
-            get {
-                return ResourceManager.GetString("SQL_ConnectTimeout", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Timeout expired.  The connection has been broken as a result..
-        /// </summary>
-        internal static string SQL_FatalTimeout {
-            get {
-                return ResourceManager.GetString("SQL_FatalTimeout", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Globalization Invariant Mode is not supported..
-        /// </summary>
-        internal static string SQL_GlobalizationInvariantModeNotSupported {
-            get {
-                return ResourceManager.GetString("SQL_GlobalizationInvariantModeNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Instance failure..
-        /// </summary>
-        internal static string SQL_InstanceFailure {
-            get {
-                return ResourceManager.GetString("SQL_InstanceFailure", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Integrated&apos; with &apos;Password&apos; or &apos;PWD&apos; connection string keywords..
-        /// </summary>
-        internal static string SQL_IntegratedWithPassword {
-            get {
-                return ResourceManager.GetString("SQL_IntegratedWithPassword", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Interactive&apos; with &apos;Password&apos; or &apos;PWD&apos; connection string keywords..
-        /// </summary>
-        internal static string SQL_InteractiveWithPassword {
-            get {
-                return ResourceManager.GetString("SQL_InteractiveWithPassword", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error.
-        /// </summary>
-        internal static string Sql_InternalError {
-            get {
-                return ResourceManager.GetString("Sql_InternalError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Buffer offset &apos;{1}&apos; plus the bytes available &apos;{0}&apos; is greater than the length of the passed in buffer..
-        /// </summary>
-        internal static string SQL_InvalidBufferSizeOrIndex {
-            get {
-                return ResourceManager.GetString("SQL_InvalidBufferSizeOrIndex", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Data length &apos;{0}&apos; is less than 0..
-        /// </summary>
-        internal static string SQL_InvalidDataLength {
-            get {
-                return ResourceManager.GetString("SQL_InvalidDataLength", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid internal packet size:.
-        /// </summary>
-        internal static string SQL_InvalidInternalPacketSize {
-            get {
-                return ResourceManager.GetString("SQL_InvalidInternalPacketSize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The length of the value for the connection parameter &lt;{0}&gt; exceeds the maximum allowed 65535 characters..
-        /// </summary>
-        internal static string SQL_InvalidOptionLength {
-            get {
-                return ResourceManager.GetString("SQL_InvalidOptionLength", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid &apos;Packet Size&apos;.  The value must be an integer &gt;= 512 and &lt;= 32768..
-        /// </summary>
-        internal static string SQL_InvalidPacketSizeValue {
-            get {
-                return ResourceManager.GetString("SQL_InvalidPacketSizeValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The length of the parameter &apos;{0}&apos; exceeds the limit of 128 characters..
-        /// </summary>
-        internal static string SQL_InvalidParameterNameLength {
-            get {
-                return ResourceManager.GetString("SQL_InvalidParameterNameLength", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid 3 part name format for TypeName..
-        /// </summary>
-        internal static string SQL_InvalidParameterTypeNameFormat {
-            get {
-                return ResourceManager.GetString("SQL_InvalidParameterTypeNameFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Server {0}, database {1} is not configured for database mirroring..
-        /// </summary>
-        internal static string SQL_InvalidPartnerConfiguration {
-            get {
-                return ResourceManager.GetString("SQL_InvalidPartnerConfiguration", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to read when no data is present..
-        /// </summary>
-        internal static string SQL_InvalidRead {
-            get {
-                return ResourceManager.GetString("SQL_InvalidRead", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The server certificate failed application validation..
-        /// </summary>
-        internal static string SQL_InvalidServerCertificate {
-            get {
-                return ResourceManager.GetString("SQL_InvalidServerCertificate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The SqlDbType &apos;{0}&apos; is invalid for {1}.  Only {2} is supported..
-        /// </summary>
-        internal static string SQL_InvalidSqlDbTypeWithOneAllowedType {
-            get {
-                return ResourceManager.GetString("SQL_InvalidSqlDbTypeWithOneAllowedType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unsupported SQL Server version.  The .NET Framework SqlClient Data Provider can only be used with SQL Server versions 7.0 and later..
-        /// </summary>
-        internal static string SQL_InvalidSQLServerVersionUnknown {
-            get {
-                return ResourceManager.GetString("SQL_InvalidSQLServerVersionUnknown", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid SSPI packet size..
-        /// </summary>
-        internal static string SQL_InvalidSSPIPacketSize {
-            get {
-                return ResourceManager.GetString("SQL_InvalidSSPIPacketSize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid Packet Size..
-        /// </summary>
-        internal static string SQL_InvalidTDSPacketSize {
-            get {
-                return ResourceManager.GetString("SQL_InvalidTDSPacketSize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The SQL Server instance returned an invalid or unsupported protocol version during login negotiation..
-        /// </summary>
-        internal static string SQL_InvalidTDSVersion {
-            get {
-                return ResourceManager.GetString("SQL_InvalidTDSVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid 3 part name format for UdtTypeName..
-        /// </summary>
-        internal static string SQL_InvalidUdt3PartNameFormat {
-            get {
-                return ResourceManager.GetString("SQL_InvalidUdt3PartNameFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to get JsonDocument on column &apos;{0}&apos;. JsonDocument is only supported for columns of type json..
-        /// </summary>
-        internal static string SQL_JsonDocumentNotSupportedOnColumnType {
-            get {
-                return ResourceManager.GetString("SQL_JsonDocumentNotSupportedOnColumnType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot authenticate using Kerberos. Ensure Kerberos has been initialized on the client with &apos;kinit&apos; and a Service Principal Name has been registered for the SQL Server to allow Kerberos authentication..
-        /// </summary>
-        internal static string SQL_KerberosTicketMissingError {
-            get {
-                return ResourceManager.GetString("SQL_KerberosTicketMissingError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The connection does not support MultipleActiveResultSets..
-        /// </summary>
-        internal static string SQL_MarsUnsupportedOnConnection {
-            get {
-                return ResourceManager.GetString("SQL_MarsUnsupportedOnConnection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to MetaData parameter array must have length equivalent to ParameterDirection array argument..
-        /// </summary>
-        internal static string Sql_MismatchedMetaDataDirectionArrayLengths {
-            get {
-                return ResourceManager.GetString("Sql_MismatchedMetaDataDirectionArrayLengths", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlDbType.SmallMoney overflow.  Value &apos;{0}&apos; is out of range.  Must be between -214,748.3648 and 214,748.3647..
-        /// </summary>
-        internal static string SQL_MoneyOverflow {
-            get {
-                return ResourceManager.GetString("SQL_MoneyOverflow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to authenticate the user {0} in Active Directory (Authentication={1})..
-        /// </summary>
-        internal static string SQL_MSALFailure {
-            get {
-                return ResourceManager.GetString("SQL_MSALFailure", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error code 0x{0}.
-        /// </summary>
-        internal static string SQL_MSALInnerException {
-            get {
-                return ResourceManager.GetString("SQL_MSALInnerException", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Nested TransactionScopes are not supported..
-        /// </summary>
-        internal static string SQL_NestedTransactionScopesNotSupported {
-            get {
-                return ResourceManager.GetString("SQL_NestedTransactionScopesNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The keyword &apos;Network Library&apos; is not supported on this platform, prefix the &apos;Data Source&apos; with the protocol desired instead (&apos;tcp:&apos; for a TCP connection, or &apos;np:&apos; for a Named Pipe connection)..
-        /// </summary>
-        internal static string SQL_NetworkLibraryNotSupported {
-            get {
-                return ResourceManager.GetString("SQL_NetworkLibraryNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to GetBytes on column &apos;{0}&apos;.  The GetBytes function can only be used on columns of type Text, NText, or Image..
-        /// </summary>
-        internal static string SQL_NonBlobColumn {
-            get {
-                return ResourceManager.GetString("SQL_NonBlobColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to GetChars on column &apos;{0}&apos;.  The GetChars function can only be used on columns of type Text, NText, Xml, VarChar or NVarChar..
-        /// </summary>
-        internal static string SQL_NonCharColumn {
-            get {
-                return ResourceManager.GetString("SQL_NonCharColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot use &apos;Authentication={0}&apos; with &apos;Password&apos; or &apos;PWD&apos; connection string keywords..
-        /// </summary>
-        internal static string SQL_NonInteractiveWithPassword {
-            get {
-                return ResourceManager.GetString("SQL_NonInteractiveWithPassword", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SSE Instance re-direction is not supported for non-local user instances..
-        /// </summary>
-        internal static string SQL_NonLocalSSEInstance {
-            get {
-                return ResourceManager.GetString("SQL_NonLocalSSEInstance", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid command sent to ExecuteXmlReader.  The command must return an Xml result..
-        /// </summary>
-        internal static string SQL_NonXmlResult {
-            get {
-                return ResourceManager.GetString("SQL_NonXmlResult", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Notifications require SQL Server 9.0 or later..
-        /// </summary>
-        internal static string SQL_NotificationsRequireYukon {
-            get {
-                return ResourceManager.GetString("SQL_NotificationsRequireYukon", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The {0} enumeration value, {1}, is not supported by the .NET Framework SqlClient Data Provider..
-        /// </summary>
-        internal static string SQL_NotSupportedEnumerationValue {
-            get {
-                return ResourceManager.GetString("SQL_NotSupportedEnumerationValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Command parameter must have a non null and non empty command text..
-        /// </summary>
-        internal static string Sql_NullCommandText {
-            get {
-                return ResourceManager.GetString("Sql_NullCommandText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid transaction or invalid name for a point at which to save within the transaction..
-        /// </summary>
-        internal static string SQL_NullEmptyTransactionName {
-            get {
-                return ResourceManager.GetString("SQL_NullEmptyTransactionName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Open result count exceeded..
-        /// </summary>
-        internal static string SQL_OpenResultCountExceeded {
-            get {
-                return ResourceManager.GetString("SQL_OpenResultCountExceeded", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Operation cancelled by user..
-        /// </summary>
-        internal static string SQL_OperationCancelled {
-            get {
-                return ResourceManager.GetString("SQL_OperationCancelled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; cannot be null or empty..
-        /// </summary>
-        internal static string SQL_ParameterCannotBeEmpty {
-            get {
-                return ResourceManager.GetString("SQL_ParameterCannotBeEmpty", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; cannot have Direction Output or InputOutput when EnableOptimizedParameterBinding is enabled on the parent command..
-        /// </summary>
-        internal static string SQL_ParameterDirectionInvalidForOptimizedBinding {
-            get {
-                return ResourceManager.GetString("SQL_ParameterDirectionInvalidForOptimizedBinding", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Parameter &apos;{0}&apos; exceeds the size limit for the sql_variant datatype..
-        /// </summary>
-        internal static string SQL_ParameterInvalidVariant {
-            get {
-                return ResourceManager.GetString("SQL_ParameterInvalidVariant", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The {0} type parameter &apos;{1}&apos; must have a valid type name..
-        /// </summary>
-        internal static string SQL_ParameterTypeNameRequired {
-            get {
-                return ResourceManager.GetString("SQL_ParameterTypeNameRequired", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal connection fatal error..
-        /// </summary>
-        internal static string SQL_ParsingError {
-            get {
-                return ResourceManager.GetString("SQL_ParsingError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Authentication Library Type: {1}.
-        /// </summary>
-        internal static string SQL_ParsingErrorAuthLibraryType {
-            get {
-                return ResourceManager.GetString("SQL_ParsingErrorAuthLibraryType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Feature Id: {1}.
-        /// </summary>
-        internal static string SQL_ParsingErrorFeatureId {
-            get {
-                return ResourceManager.GetString("SQL_ParsingErrorFeatureId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Length: {1}.
-        /// </summary>
-        internal static string SQL_ParsingErrorLength {
-            get {
-                return ResourceManager.GetString("SQL_ParsingErrorLength", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Offset: {1}.
-        /// </summary>
-        internal static string SQL_ParsingErrorOffset {
-            get {
-                return ResourceManager.GetString("SQL_ParsingErrorOffset", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Status: {1}.
-        /// </summary>
-        internal static string SQL_ParsingErrorStatus {
-            get {
-                return ResourceManager.GetString("SQL_ParsingErrorStatus", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Token : {1}.
-        /// </summary>
-        internal static string SQL_ParsingErrorToken {
-            get {
-                return ResourceManager.GetString("SQL_ParsingErrorToken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}, Value: {1}.
-        /// </summary>
-        internal static string SQL_ParsingErrorValue {
-            get {
-                return ResourceManager.GetString("SQL_ParsingErrorValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal connection fatal error. Error state: {0}.
-        /// </summary>
-        internal static string SQL_ParsingErrorWithState {
-            get {
-                return ResourceManager.GetString("SQL_ParsingErrorWithState", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The command execution cannot proceed due to a pending asynchronous operation already in progress..
-        /// </summary>
-        internal static string SQL_PendingBeginXXXExists {
-            get {
-                return ResourceManager.GetString("SQL_PendingBeginXXXExists", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Precision value &apos;{0}&apos; is either less than 0 or greater than the maximum allowed precision of 38..
-        /// </summary>
-        internal static string SQL_PrecisionValueOutOfRange {
-            get {
-                return ResourceManager.GetString("SQL_PrecisionValueOutOfRange", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Certificate failed chain validation. Error(s): &apos;{0}&apos;..
-        /// </summary>
-        internal static string SQL_RemoteCertificateChainErrors {
-            get {
-                return ResourceManager.GetString("SQL_RemoteCertificateChainErrors", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The certificate provided by the server does not match the certificate provided by the ServerCertificate option..
-        /// </summary>
-        internal static string SQL_RemoteCertificateDoesNotMatchServerCertificate {
-            get {
-                return ResourceManager.GetString("SQL_RemoteCertificateDoesNotMatchServerCertificate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Certificate name mismatch. The provided &apos;DataSource&apos; or &apos;HostNameInCertificate&apos; does not match the name in the certificate..
-        /// </summary>
-        internal static string SQL_RemoteCertificateNameMismatch {
-            get {
-                return ResourceManager.GetString("SQL_RemoteCertificateNameMismatch", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Certificate not available while validating the certificate..
-        /// </summary>
-        internal static string SQL_RemoteCertificateNotAvailable {
-            get {
-                return ResourceManager.GetString("SQL_RemoteCertificateNotAvailable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Scale value &apos;{0}&apos; is either less than 0 or greater than the maximum allowed scale of 38..
-        /// </summary>
-        internal static string SQL_ScaleValueOutOfRange {
-            get {
-                return ResourceManager.GetString("SQL_ScaleValueOutOfRange", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot set the Credential property if &apos;Authentication=Active Directory Device Code Flow&apos; has been specified in the connection string..
-        /// </summary>
-        internal static string SQL_SettingCredentialWithDeviceFlow {
-            get {
-                return ResourceManager.GetString("SQL_SettingCredentialWithDeviceFlow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot set the Credential property if &apos;Authentication=Active Directory Integrated&apos; has been specified in the connection string..
-        /// </summary>
-        internal static string SQL_SettingCredentialWithIntegrated {
-            get {
-                return ResourceManager.GetString("SQL_SettingCredentialWithIntegrated", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot set the Credential property if &apos;Authentication=Active Directory Interactive&apos; has been specified in the connection string..
-        /// </summary>
-        internal static string SQL_SettingCredentialWithInteractive {
-            get {
-                return ResourceManager.GetString("SQL_SettingCredentialWithInteractive", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot set the Credential property if &apos;Authentication={0}&apos; has been specified in the connection string..
-        /// </summary>
-        internal static string SQL_SettingCredentialWithNonInteractive {
-            get {
-                return ResourceManager.GetString("SQL_SettingCredentialWithNonInteractive", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Device Code Flow&apos;, if the Credential property has been set..
-        /// </summary>
-        internal static string SQL_SettingDeviceFlowWithCredential {
-            get {
-                return ResourceManager.GetString("SQL_SettingDeviceFlowWithCredential", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Integrated&apos;, if the Credential property has been set..
-        /// </summary>
-        internal static string SQL_SettingIntegratedWithCredential {
-            get {
-                return ResourceManager.GetString("SQL_SettingIntegratedWithCredential", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot use &apos;Authentication=Active Directory Interactive&apos;, if the Credential property has been set..
-        /// </summary>
-        internal static string SQL_SettingInteractiveWithCredential {
-            get {
-                return ResourceManager.GetString("SQL_SettingInteractiveWithCredential", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot use &apos;Authentication={0}&apos;, if the Credential property has been set..
-        /// </summary>
-        internal static string SQL_SettingNonInteractiveWithCredential {
-            get {
-                return ResourceManager.GetString("SQL_SettingNonInteractiveWithCredential", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A severe error occurred on the current command.  The results, if any, should be discarded..
-        /// </summary>
-        internal static string SQL_SevereError {
-            get {
-                return ResourceManager.GetString("SQL_SevereError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlDbType.SmallDateTime overflow.  Value &apos;{0}&apos; is out of range.  Must be between 1/1/1900 12:00:00 AM and 6/6/2079 11:59:59 PM..
-        /// </summary>
-        internal static string SQL_SmallDateTimeOverflow {
-            get {
-                return ResourceManager.GetString("SQL_SmallDateTimeOverflow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The {0} enumeration value, {1}, is not supported by SQL Server 7.0 or SQL Server 2000..
-        /// </summary>
-        internal static string SQL_SnapshotNotSupported {
-            get {
-                return ResourceManager.GetString("SQL_SnapshotNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Memory allocation for internal connection failed..
-        /// </summary>
-        internal static string SQL_SNIPacketAllocationFailure {
-            get {
-                return ResourceManager.GetString("SQL_SNIPacketAllocationFailure", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Socket did not throw expected &apos;{0}&apos; with error code &apos;{1}&apos;..
-        /// </summary>
-        internal static string SQL_SocketDidNotThrow {
-            get {
-                return ResourceManager.GetString("SQL_SocketDidNotThrow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlCommand.DeriveParameters failed because the SqlCommand.CommandText property value is an invalid multipart name.
-        /// </summary>
-        internal static string SQL_SqlCommandCommandText {
-            get {
-                return ResourceManager.GetString("SQL_SqlCommandCommandText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; cannot be called when the SqlDataRecord is read only..
-        /// </summary>
-        internal static string SQL_SqlUpdatableRecordReadOnly {
-            get {
-                return ResourceManager.GetString("SQL_SqlUpdatableRecordReadOnly", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The target principal name is incorrect.  Cannot generate SSPI context..
-        /// </summary>
-        internal static string SQL_SSPIGenerateError {
-            get {
-                return ResourceManager.GetString("SQL_SSPIGenerateError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot initialize SSPI package..
-        /// </summary>
-        internal static string SQL_SSPIInitializeError {
-            get {
-                return ResourceManager.GetString("SQL_SSPIInitializeError", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to GetStream on column &apos;{0}&apos;. The GetStream function can only be used on columns of type Binary, Image, Udt or VarBinary..
-        /// </summary>
-        internal static string SQL_StreamNotSupportOnColumnType {
-            get {
-                return ResourceManager.GetString("SQL_StreamNotSupportOnColumnType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The Stream does not support reading..
-        /// </summary>
-        internal static string SQL_StreamReadNotSupported {
-            get {
-                return ResourceManager.GetString("SQL_StreamReadNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The Stream does not support seeking..
-        /// </summary>
-        internal static string SQL_StreamSeekNotSupported {
-            get {
-                return ResourceManager.GetString("SQL_StreamSeekNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The Stream does not support writing..
-        /// </summary>
-        internal static string SQL_StreamWriteNotSupported {
-            get {
-                return ResourceManager.GetString("SQL_StreamWriteNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Processing of results from SQL Server failed because of an invalid multipart name.
-        /// </summary>
-        internal static string SQL_TDSParserTableName {
-            get {
-                return ResourceManager.GetString("SQL_TDSParserTableName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to GetTextReader on column &apos;{0}&apos;. The GetTextReader function can only be used on columns of type Char, NChar, NText, NVarChar, Text or VarChar..
-        /// </summary>
-        internal static string SQL_TextReaderNotSupportOnColumnType {
-            get {
-                return ResourceManager.GetString("SQL_TextReaderNotSupportOnColumnType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Timeout expired.  The timeout period elapsed prior to completion of the operation or the server is not responding..
-        /// </summary>
-        internal static string SQL_Timeout {
-            get {
-                return ResourceManager.GetString("SQL_Timeout", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Active Directory Device Code Flow authentication timed out. The user took too long to respond to the authentication request..
-        /// </summary>
-        internal static string SQL_Timeout_Active_Directory_DeviceFlow_Authentication {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_Active_Directory_DeviceFlow_Authentication", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Active Directory Interactive authentication timed out. The user took too long to respond to the authentication request..
-        /// </summary>
-        internal static string SQL_Timeout_Active_Directory_Interactive_Authentication {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_Active_Directory_Interactive_Authentication", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Execution Timeout Expired.  The timeout period elapsed prior to completion of the operation or the server is not responding..
-        /// </summary>
-        internal static string SQL_Timeout_Execution {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_Execution", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This failure occurred while attempting to connect to the {0} server..
-        /// </summary>
-        internal static string SQL_Timeout_FailoverInfo {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_FailoverInfo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed at the start of the login phase.  This could be because of insufficient time provided for connection timeout..
-        /// </summary>
-        internal static string SQL_Timeout_Login_Begin {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_Login_Begin", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed while attempting to authenticate the login.  This could be because the server failed to authenticate the user or the server was unable to respond back in time..
-        /// </summary>
-        internal static string SQL_Timeout_Login_ProcessConnectionAuth {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_Login_ProcessConnectionAuth", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections..
-        /// </summary>
-        internal static string SQL_Timeout_PostLogin {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_PostLogin", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed at the start of the pre-login phase.  This could be because of insufficient time provided for connection timeout..
-        /// </summary>
-        internal static string SQL_Timeout_PreLogin_Begin {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_PreLogin_Begin", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed while attempting to consume the pre-login handshake acknowledgement.  This could be because the pre-login handshake failed or the server was unable to respond back in time..
-        /// </summary>
-        internal static string SQL_Timeout_PreLogin_ConsumeHandshake {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_PreLogin_ConsumeHandshake", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed while attempting to create and initialize a socket to the server.  This could be either because the server was unreachable or unable to respond back in time..
-        /// </summary>
-        internal static string SQL_Timeout_PreLogin_InitializeConnection {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_PreLogin_InitializeConnection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection Timeout Expired.  The timeout period elapsed while making a pre-login handshake request.  This could be because the server was unable to respond back in time..
-        /// </summary>
-        internal static string SQL_Timeout_PreLogin_SendHandshake {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_PreLogin_SendHandshake", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This failure occurred while attempting to connect to the routing destination. The duration spent while attempting to connect to the original server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; authentication={3}; [Post-Login] complete={4}; .
-        /// </summary>
-        internal static string SQL_Timeout_RoutingDestinationInfo {
-            get {
-                return ResourceManager.GetString("SQL_Timeout_RoutingDestinationInfo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlDbType.Time overflow.  Value &apos;{0}&apos; is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999..
-        /// </summary>
-        internal static string SQL_TimeOverflow {
-            get {
-                return ResourceManager.GetString("SQL_TimeOverflow", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Scale value &apos;{0}&apos; is either less than 0 or greater than the maximum allowed scale of 7..
-        /// </summary>
-        internal static string SQL_TimeScaleValueOutOfRange {
-            get {
-                return ResourceManager.GetString("SQL_TimeScaleValueOutOfRange", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Too many values..
-        /// </summary>
-        internal static string SQL_TooManyValues {
-            get {
-                return ResourceManager.GetString("SQL_TooManyValues", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlParameter.TypeName is an invalid multipart name.
-        /// </summary>
-        internal static string SQL_TypeName {
-            get {
-                return ResourceManager.GetString("SQL_TypeName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlParameter.UdtTypeName is an invalid multipart name.
-        /// </summary>
-        internal static string SQL_UDTTypeName {
-            get {
-                return ResourceManager.GetString("SQL_UDTTypeName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unexpected server event: {0}..
-        /// </summary>
-        internal static string SQL_UnexpectedSmiEvent {
-            get {
-                return ResourceManager.GetString("SQL_UnexpectedSmiEvent", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unrecognized System.Transactions.IsolationLevel enumeration value: {0}..
-        /// </summary>
-        internal static string SQL_UnknownSysTxIsolationLevel {
-            get {
-                return ResourceManager.GetString("SQL_UnknownSysTxIsolationLevel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The authentication &apos;{0}&apos; is not supported..
-        /// </summary>
-        internal static string SQL_UnsupportedAuthentication {
-            get {
-                return ResourceManager.GetString("SQL_UnsupportedAuthentication", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The provider &apos;{0}&apos; does not support authentication &apos;{1}&apos;..
-        /// </summary>
-        internal static string SQL_UnsupportedAuthenticationByProvider {
-            get {
-                return ResourceManager.GetString("SQL_UnsupportedAuthenticationByProvider", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unsupported authentication specified in this context: {0}.
-        /// </summary>
-        internal static string SQL_UnsupportedAuthenticationSpecified {
-            get {
-                return ResourceManager.GetString("SQL_UnsupportedAuthenticationSpecified", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The server is attempting to use a feature that is not supported on this platform..
-        /// </summary>
-        internal static string SQL_UnsupportedFeature {
-            get {
-                return ResourceManager.GetString("SQL_UnsupportedFeature", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The keyword &apos;{0}&apos; is not supported on this platform..
-        /// </summary>
-        internal static string SQL_UnsupportedKeyword {
-            get {
-                return ResourceManager.GetString("SQL_UnsupportedKeyword", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SQL authentication method &apos;{0}&apos; is not supported..
-        /// </summary>
-        internal static string SQL_UnsupportedSqlAuthenticationMethod {
-            get {
-                return ResourceManager.GetString("SQL_UnsupportedSqlAuthenticationMethod", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The currently loaded System.Transactions.dll does not support Global Transactions..
-        /// </summary>
-        internal static string SQL_UnsupportedSysTxVersion {
-            get {
-                return ResourceManager.GetString("SQL_UnsupportedSysTxVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Received an unsupported token &apos;{0}&apos; while reading data from the server..
-        /// </summary>
-        internal static string SQL_UnsupportedToken {
-            get {
-                return ResourceManager.GetString("SQL_UnsupportedToken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to User Instance and Failover are not compatible options.  Please choose only one of the two in the connection string..
-        /// </summary>
-        internal static string SQL_UserInstanceFailoverNotCompatible {
-            get {
-                return ResourceManager.GetString("SQL_UserInstanceFailoverNotCompatible", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A user instance was requested in the connection string but the server specified does not support this option..
-        /// </summary>
-        internal static string SQL_UserInstanceFailure {
-            get {
-                return ResourceManager.GetString("SQL_UserInstanceFailure", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to get vector data from column '{0}'. Vectors are only supported for columns of type vector..
-        /// </summary>
-        internal static string SQL_VectorNotSupportedOnColumnType {
-            get {
-                return ResourceManager.GetString("SQL_VectorNotSupportedOnColumnType", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Unsupported Vector type '{0}'..
-        /// </summary>
-        internal static string SQL_VectorTypeNotSupported
-        {
-            get
-            {
-                return ResourceManager.GetString("SQL_VectorTypeNotSupported", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to 'null' value not supported for output paramter {0} of SqlDbtype Vector..
-        /// </summary>
-        internal static string ADP_NullOutputParameterValueForVector
-        {
-            get
-            {
-                return ResourceManager.GetString("ADP_NullOutputParameterValueForVector", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid vector header received..
-        /// </summary>
-        internal static string ADP_InvalidVectorHeader
-        {
-            get
-            {
-                return ResourceManager.GetString("ADP_InvalidVectorHeader", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to {0} Invalid JSON string for vector...
-        /// </summary>
-        internal static string ADP_InvalidJsonStringForVector
-        {
-            get
-            {
-                return ResourceManager.GetString("ADP_InvalidJsonStringForVector", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Expecting argument of type {1}, but received type {0}..
-        /// </summary>
-        internal static string SQL_WrongType
-        {
-            get
-            {
-                return ResourceManager.GetString("SQL_WrongType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to GetXmlReader on column &apos;{0}&apos;. The GetXmlReader function can only be used on columns of type Xml..
-        /// </summary>
-        internal static string SQL_XmlReaderNotSupportOnColumnType {
-            get {
-                return ResourceManager.GetString("SQL_XmlReaderNotSupportOnColumnType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Exception occurred while trying to set the AppContext Switch &apos;{0}&apos;={1}..
-        /// </summary>
-        internal static string SqlAppContextSwitchManager_InvalidValue {
-            get {
-                return ResourceManager.GetString("SqlAppContextSwitchManager_InvalidValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Notification values used by Microsoft SQL Server..
-        /// </summary>
-        internal static string SqlCommand_Notification {
-            get {
-                return ResourceManager.GetString("SqlCommand_Notification", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Automatic enlistment in notifications used by Microsoft SQL Server..
-        /// </summary>
-        internal static string SqlCommand_NotificationAutoEnlist {
-            get {
-                return ResourceManager.GetString("SqlCommand_NotificationAutoEnlist", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The DataAdapter for which to automatically generate SqlCommands.
-        /// </summary>
-        internal static string SqlCommandBuilder_DataAdapter {
-            get {
-                return ResourceManager.GetString("SqlCommandBuilder_DataAdapter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The decimal separator used in numeric literals..
-        /// </summary>
-        internal static string SqlCommandBuilder_DecimalSeparator {
-            get {
-                return ResourceManager.GetString("SqlCommandBuilder_DecimalSeparator", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The character used in a text command as the opening quote for quoting identifiers that contain special characters..
-        /// </summary>
-        internal static string SqlCommandBuilder_QuotePrefix {
-            get {
-                return ResourceManager.GetString("SqlCommandBuilder_QuotePrefix", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The character used in a text command as the closing quote for quoting identifiers that contain special characters..
-        /// </summary>
-        internal static string SqlCommandBuilder_QuoteSuffix {
-            get {
-                return ResourceManager.GetString("SqlCommandBuilder_QuoteSuffix", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Access token to use for authentication..
-        /// </summary>
-        internal static string SqlConnection_AccessToken {
-            get {
-                return ResourceManager.GetString("SqlConnection_AccessToken", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to State of connection, synchronous or asynchronous.  &apos;Asynchronous Processing=x&apos; in the connection string..
-        /// </summary>
-        internal static string SqlConnection_Asynchronous {
-            get {
-                return ResourceManager.GetString("SqlConnection_Asynchronous", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A guid to represent the physical connection..
-        /// </summary>
-        internal static string SqlConnection_ClientConnectionId {
-            get {
-                return ResourceManager.GetString("SqlConnection_ClientConnectionId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Information used to connect to a DataSource, such as &apos;Data Source=x;Initial Catalog=x;Integrated Security=SSPI&apos;..
-        /// </summary>
-        internal static string SqlConnection_ConnectionString {
-            get {
-                return ResourceManager.GetString("SqlConnection_ConnectionString", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current connection timeout value, &apos;Connect Timeout=X&apos; in the ConnectionString..
-        /// </summary>
-        internal static string SqlConnection_ConnectionTimeout {
-            get {
-                return ResourceManager.GetString("SqlConnection_ConnectionTimeout", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to User Id and secure password to use for authentication..
-        /// </summary>
-        internal static string SqlConnection_Credential {
-            get {
-                return ResourceManager.GetString("SqlConnection_Credential", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Custom column encryption key store providers..
-        /// </summary>
-        internal static string SqlConnection_CustomColumnEncryptionKeyStoreProviders {
-            get {
-                return ResourceManager.GetString("SqlConnection_CustomColumnEncryptionKeyStoreProviders", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current SQL Server database, &apos;Initial Catalog=X&apos; in the connection string..
-        /// </summary>
-        internal static string SqlConnection_Database {
-            get {
-                return ResourceManager.GetString("SqlConnection_Database", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Current SqlServer that the connection is opened to, &apos;Data Source=X&apos; in the connection string..
-        /// </summary>
-        internal static string SqlConnection_DataSource {
-            get {
-                return ResourceManager.GetString("SqlConnection_DataSource", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Network packet size, &apos;Packet Size=x&apos; in the connection string..
-        /// </summary>
-        internal static string SqlConnection_PacketSize {
-            get {
-                return ResourceManager.GetString("SqlConnection_PacketSize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Information used to connect for replication..
-        /// </summary>
-        internal static string SqlConnection_Replication {
-            get {
-                return ResourceManager.GetString("SqlConnection_Replication", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Server Process Id (SPID) of the active connection..
-        /// </summary>
-        internal static string SqlConnection_ServerProcessId {
-            get {
-                return ResourceManager.GetString("SqlConnection_ServerProcessId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Version of the SQL Server accessed by the SqlConnection..
-        /// </summary>
-        internal static string SqlConnection_ServerVersion {
-            get {
-                return ResourceManager.GetString("SqlConnection_ServerVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Collect statistics for this connection..
-        /// </summary>
-        internal static string SqlConnection_StatisticsEnabled {
-            get {
-                return ResourceManager.GetString("SqlConnection_StatisticsEnabled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Workstation Id, &apos;Workstation ID=x&apos; in the connection string..
-        /// </summary>
-        internal static string SqlConnection_WorkstationId {
-            get {
-                return ResourceManager.GetString("SqlConnection_WorkstationId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot convert object of type &apos;{0}&apos; to object of type &apos;{1}&apos;..
-        /// </summary>
-        internal static string SqlConvert_ConvertFailed {
-            get {
-                return ResourceManager.GetString("SqlConvert_ConvertFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The connection is broken and recovery is not possible.  The client driver attempted to recover the connection one or more times and all attempts failed.  Increase the value of ConnectRetryCount to increase the number of recovery attempts..
-        /// </summary>
-        internal static string SQLCR_AllAttemptsFailed {
-            get {
-                return ResourceManager.GetString("SQLCR_AllAttemptsFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The server did not preserve SSL encryption during a recovery attempt, connection recovery is not possible..
-        /// </summary>
-        internal static string SQLCR_EncryptionChanged {
-            get {
-                return ResourceManager.GetString("SQLCR_EncryptionChanged", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid ConnectRetryCount value (should be 0-255)..
-        /// </summary>
-        internal static string SQLCR_InvalidConnectRetryCountValue {
-            get {
-                return ResourceManager.GetString("SQLCR_InvalidConnectRetryCountValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid ConnectRetryInterval value (should be 1-60)..
-        /// </summary>
-        internal static string SQLCR_InvalidConnectRetryIntervalValue {
-            get {
-                return ResourceManager.GetString("SQLCR_InvalidConnectRetryIntervalValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Next reconnection attempt will exceed query timeout. Reconnection was terminated..
-        /// </summary>
-        internal static string SQLCR_NextAttemptWillExceedQueryTimeout {
-            get {
-                return ResourceManager.GetString("SQLCR_NextAttemptWillExceedQueryTimeout", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The server did not acknowledge a recovery attempt, connection recovery is not possible..
-        /// </summary>
-        internal static string SQLCR_NoCRAckAtReconnection {
-            get {
-                return ResourceManager.GetString("SQLCR_NoCRAckAtReconnection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The server did not preserve the exact client TDS version requested during a recovery attempt, connection recovery is not possible..
-        /// </summary>
-        internal static string SQLCR_TDSVersionNotPreserved {
-            get {
-                return ResourceManager.GetString("SQLCR_TDSVersionNotPreserved", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The connection is broken and recovery is not possible.  The connection is marked by the client driver as unrecoverable.  No attempt was made to restore the connection..
-        /// </summary>
-        internal static string SQLCR_UnrecoverableClient {
-            get {
-                return ResourceManager.GetString("SQLCR_UnrecoverableClient", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The connection is broken and recovery is not possible.  The connection is marked by the server as unrecoverable.  No attempt was made to restore the connection..
-        /// </summary>
-        internal static string SQLCR_UnrecoverableServer {
-            get {
-                return ResourceManager.GetString("SQLCR_UnrecoverableServer", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failure while attempting to promote transaction..
-        /// </summary>
-        internal static string SqlDelegatedTransaction_PromotionFailed {
-            get {
-                return ResourceManager.GetString("SqlDelegatedTransaction_PromotionFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to To add a command to existing dependency object..
-        /// </summary>
-        internal static string SqlDependency_AddCommandDependency {
-            get {
-                return ResourceManager.GetString("SqlDependency_AddCommandDependency", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The SQL Server Service Broker for the current database is not enabled, and as a result query notifications are not supported.  Please enable the Service Broker for this database if you wish to use notifications..
-        /// </summary>
-        internal static string SqlDependency_DatabaseBrokerDisabled {
-            get {
-                return ResourceManager.GetString("SqlDependency_DatabaseBrokerDisabled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to When using SqlDependency without providing an options value, SqlDependency.Start() must be called prior to execution of a command added to the SqlDependency instance..
-        /// </summary>
-        internal static string SqlDependency_DefaultOptionsButNoStart {
-            get {
-                return ResourceManager.GetString("SqlDependency_DefaultOptionsButNoStart", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Command is already associated with another dependency object. Can not overwrite..
-        /// </summary>
-        internal static string SqlDependency_Duplicate {
-            get {
-                return ResourceManager.GetString("SqlDependency_Duplicate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlDependency does not support calling Start() with different connection strings having the same server, user, and database in the same app domain..
-        /// </summary>
-        internal static string SqlDependency_DuplicateStart {
-            get {
-                return ResourceManager.GetString("SqlDependency_DuplicateStart", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlDependency.OnChange does not support multiple event registrations for the same delegate..
-        /// </summary>
-        internal static string SqlDependency_EventNoDuplicate {
-            get {
-                return ResourceManager.GetString("SqlDependency_EventNoDuplicate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Property to indicate if this dependency is invalid..
-        /// </summary>
-        internal static string SqlDependency_HasChanges {
-            get {
-                return ResourceManager.GetString("SqlDependency_HasChanges", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A string that uniquely identifies this dependency object..
-        /// </summary>
-        internal static string SqlDependency_Id {
-            get {
-                return ResourceManager.GetString("SqlDependency_Id", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No SqlDependency exists for the key..
-        /// </summary>
-        internal static string SqlDependency_IdMismatch {
-            get {
-                return ResourceManager.GetString("SqlDependency_IdMismatch", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Timeout specified is invalid. Timeout cannot be &lt; 0..
-        /// </summary>
-        internal static string SqlDependency_InvalidTimeout {
-            get {
-                return ResourceManager.GetString("SqlDependency_InvalidTimeout", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlDependency.Start has been called for the server the command is executing against more than once, but there is no matching server/user/database Start() call for current command..
-        /// </summary>
-        internal static string SqlDependency_NoMatchingServerDatabaseStart {
-            get {
-                return ResourceManager.GetString("SqlDependency_NoMatchingServerDatabaseStart", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to When using SqlDependency without providing an options value, SqlDependency.Start() must be called for each server that is being executed against..
-        /// </summary>
-        internal static string SqlDependency_NoMatchingServerStart {
-            get {
-                return ResourceManager.GetString("SqlDependency_NoMatchingServerStart", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Event that can be used to subscribe for change notifications..
-        /// </summary>
-        internal static string SqlDependency_OnChange {
-            get {
-                return ResourceManager.GetString("SqlDependency_OnChange", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Dependency object used to receive query notifications..
-        /// </summary>
-        internal static string SqlDependency_SqlDependency {
-            get {
-                return ResourceManager.GetString("SqlDependency_SqlDependency", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unexpected type detected on deserialize..
-        /// </summary>
-        internal static string SqlDependency_UnexpectedValueOnDeserialize {
-            get {
-                return ResourceManager.GetString("SqlDependency_UnexpectedValueOnDeserialize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The process cannot access the file specified because it has been opened in another transaction..
-        /// </summary>
-        internal static string SqlFileStream_FileAlreadyInTransaction {
-            get {
-                return ResourceManager.GetString("SqlFileStream_FileAlreadyInTransaction", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An invalid parameter was passed to the function..
-        /// </summary>
-        internal static string SqlFileStream_InvalidParameter {
-            get {
-                return ResourceManager.GetString("SqlFileStream_InvalidParameter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The path name is not valid..
-        /// </summary>
-        internal static string SqlFileStream_InvalidPath {
-            get {
-                return ResourceManager.GetString("SqlFileStream_InvalidPath", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlFileStream is not supported on this platform..
-        /// </summary>
-        internal static string SqlFileStream_NotSupported {
-            get {
-                return ResourceManager.GetString("SqlFileStream_NotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The path name is invalid or does not point to a disk file..
-        /// </summary>
-        internal static string SqlFileStream_PathNotValidDiskResource {
-            get {
-                return ResourceManager.GetString("SqlFileStream_PathNotValidDiskResource", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The dbType {0} is invalid for this constructor..
-        /// </summary>
-        internal static string SqlMetaData_InvalidSqlDbTypeForConstructorFormat {
-            get {
-                return ResourceManager.GetString("SqlMetaData_InvalidSqlDbTypeForConstructorFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The name is too long..
-        /// </summary>
-        internal static string SqlMetaData_NameTooLong {
-            get {
-                return ResourceManager.GetString("SqlMetaData_NameTooLong", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to GetMetaData is not valid for this SqlDbType..
-        /// </summary>
-        internal static string SqlMetaData_NoMetadata {
-            get {
-                return ResourceManager.GetString("SqlMetaData_NoMetadata", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The sort order and ordinal must either both be specified, or neither should be specified (SortOrder.Unspecified and -1).  The values given were: order = {0}, ordinal = {1}..
-        /// </summary>
-        internal static string SqlMetaData_SpecifyBothSortOrderAndOrdinal {
-            get {
-                return ResourceManager.GetString("SqlMetaData_SpecifyBothSortOrderAndOrdinal", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SQL Type has already been loaded with data..
-        /// </summary>
-        internal static string SqlMisc_AlreadyFilledMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_AlreadyFilledMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Arithmetic Overflow..
-        /// </summary>
-        internal static string SqlMisc_ArithOverflowMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_ArithOverflowMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The buffer is insufficient. Read or write operation failed..
-        /// </summary>
-        internal static string SqlMisc_BufferInsufficientMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_BufferInsufficientMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to access a closed XmlReader..
-        /// </summary>
-        internal static string SqlMisc_ClosedXmlReaderMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_ClosedXmlReaderMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Two strings to be compared have different collation..
-        /// </summary>
-        internal static string SqlMisc_CompareDiffCollationMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_CompareDiffCollationMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Two strings to be concatenated have different collation..
-        /// </summary>
-        internal static string SqlMisc_ConcatDiffCollationMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_ConcatDiffCollationMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Conversion overflows..
-        /// </summary>
-        internal static string SqlMisc_ConversionOverflowMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_ConversionOverflowMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM..
-        /// </summary>
-        internal static string SqlMisc_DateTimeOverflowMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_DateTimeOverflowMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Divide by zero error encountered..
-        /// </summary>
-        internal static string SqlMisc_DivideByZeroMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_DivideByZeroMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The input wasn&apos;t in a correct format..
-        /// </summary>
-        internal static string SqlMisc_FormatMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_FormatMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid array size..
-        /// </summary>
-        internal static string SqlMisc_InvalidArraySizeMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_InvalidArraySizeMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid SqlDateTime..
-        /// </summary>
-        internal static string SqlMisc_InvalidDateTimeMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_InvalidDateTimeMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Argument to GetDayOfWeek must be integer between 1 and 7..
-        /// </summary>
-        internal static string SqlMisc_InvalidFirstDayMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_InvalidFirstDayMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid flag value..
-        /// </summary>
-        internal static string SqlMisc_InvalidFlagMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_InvalidFlagMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to call {0} when the stream is closed..
-        /// </summary>
-        internal static string SqlMisc_InvalidOpStreamClosed {
-            get {
-                return ResourceManager.GetString("SqlMisc_InvalidOpStreamClosed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to call {0} when the stream non-readable..
-        /// </summary>
-        internal static string SqlMisc_InvalidOpStreamNonReadable {
-            get {
-                return ResourceManager.GetString("SqlMisc_InvalidOpStreamNonReadable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to call {0} when the stream is non-seekable..
-        /// </summary>
-        internal static string SqlMisc_InvalidOpStreamNonSeekable {
-            get {
-                return ResourceManager.GetString("SqlMisc_InvalidOpStreamNonSeekable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attempt to call {0} when the stream non-writable..
-        /// </summary>
-        internal static string SqlMisc_InvalidOpStreamNonWritable {
-            get {
-                return ResourceManager.GetString("SqlMisc_InvalidOpStreamNonWritable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid numeric precision/scale..
-        /// </summary>
-        internal static string SqlMisc_InvalidPrecScaleMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_InvalidPrecScaleMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The SqlBytes and SqlChars don&apos;t support length of more than 2GB in this version..
-        /// </summary>
-        internal static string SqlMisc_LenTooLargeMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_LenTooLargeMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Message.
-        /// </summary>
-        internal static string SqlMisc_MessageString {
-            get {
-                return ResourceManager.GetString("SqlMisc_MessageString", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to There is no buffer. Read or write operation failed..
-        /// </summary>
-        internal static string SqlMisc_NoBufferMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_NoBufferMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SQL Type has not been loaded with data..
-        /// </summary>
-        internal static string SqlMisc_NotFilledMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_NotFilledMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Null.
-        /// </summary>
-        internal static string SqlMisc_NullString {
-            get {
-                return ResourceManager.GetString("SqlMisc_NullString", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Data is Null. This method or property cannot be called on Null values..
-        /// </summary>
-        internal static string SqlMisc_NullValueMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_NullValueMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Conversion from SqlDecimal to Decimal overflows..
-        /// </summary>
-        internal static string SqlMisc_NumeToDecOverflowMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_NumeToDecOverflowMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot set to non-zero length, because current value is Null..
-        /// </summary>
-        internal static string SqlMisc_SetNonZeroLenOnNullMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_SetNonZeroLenOnNullMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SqlType error..
-        /// </summary>
-        internal static string SqlMisc_SqlTypeMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_SqlTypeMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Stream has been closed or disposed..
-        /// </summary>
-        internal static string SqlMisc_StreamClosedMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_StreamClosedMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An error occurred while reading..
-        /// </summary>
-        internal static string SqlMisc_StreamErrorMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_StreamErrorMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Subclass did not override a required method..
-        /// </summary>
-        internal static string SqlMisc_SubclassMustOverride {
-            get {
-                return ResourceManager.GetString("SqlMisc_SubclassMustOverride", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A time zone was specified. SqlDateTime does not support time zones..
-        /// </summary>
-        internal static string SqlMisc_TimeZoneSpecifiedMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_TimeZoneSpecifiedMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Data returned is larger than 2Gb in size. Use SequentialAccess command behavior in order to get all of the data..
-        /// </summary>
-        internal static string SqlMisc_TruncationMaxDataMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_TruncationMaxDataMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Numeric arithmetic causes truncation..
-        /// </summary>
-        internal static string SqlMisc_TruncationMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_TruncationMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot write to non-zero offset, because current value is Null..
-        /// </summary>
-        internal static string SqlMisc_WriteNonZeroOffsetOnNullMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_WriteNonZeroOffsetOnNullMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot write from an offset that is larger than current length. It would leave uninitialized data in the buffer..
-        /// </summary>
-        internal static string SqlMisc_WriteOffsetLargerThanLenMessage {
-            get {
-                return ResourceManager.GetString("SqlMisc_WriteOffsetLargerThanLenMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connecting to a mirrored SQL Server instance using the MultiSubnetFailover connection option is not supported..
-        /// </summary>
-        internal static string SQLMSF_FailoverPartnerNotSupported {
-            get {
-                return ResourceManager.GetString("SQLMSF_FailoverPartnerNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This SqlCommand object is already associated with another SqlDependency object..
-        /// </summary>
-        internal static string SQLNotify_AlreadyHasCommand {
-            get {
-                return ResourceManager.GetString("SQLNotify_AlreadyHasCommand", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Notification Error. Type={0}, Info={1}, Source={2}..
-        /// </summary>
-        internal static string SQLNotify_ErrorFormat {
-            get {
-                return ResourceManager.GetString("SQLNotify_ErrorFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to DBNull value for parameter &apos;{0}&apos; is not supported. Table-valued parameters cannot be DBNull..
-        /// </summary>
-        internal static string SqlParameter_DBNullNotSupportedForTVP {
-            get {
-                return ResourceManager.GetString("SqlParameter_DBNullNotSupportedForTVP", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Precision &apos;{0}&apos; required to send all values in column &apos;{1}&apos; exceeds the maximum supported precision &apos;{2}&apos;. The values must all fit in a single precision..
-        /// </summary>
-        internal static string SqlParameter_InvalidTableDerivedPrecisionForTvp {
-            get {
-                return ResourceManager.GetString("SqlParameter_InvalidTableDerivedPrecisionForTvp", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Offset in variable length data types..
-        /// </summary>
-        internal static string SqlParameter_Offset {
-            get {
-                return ResourceManager.GetString("SqlParameter_Offset", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Name of the parameter, like &apos;@p1&apos;.
-        /// </summary>
-        internal static string SqlParameter_ParameterName {
-            get {
-                return ResourceManager.GetString("SqlParameter_ParameterName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to When used by DataAdapter.Update, the parameter value is changed from DBNull.Value into (Int32)1 or (Int32)0 if non-null..
-        /// </summary>
-        internal static string SqlParameter_SourceColumnNullMapping {
-            get {
-                return ResourceManager.GetString("SqlParameter_SourceColumnNullMapping", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The parameter native type..
-        /// </summary>
-        internal static string SqlParameter_SqlDbType {
-            get {
-                return ResourceManager.GetString("SqlParameter_SqlDbType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The server&apos;s name for the type..
-        /// </summary>
-        internal static string SqlParameter_TypeName {
-            get {
-                return ResourceManager.GetString("SqlParameter_TypeName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to TypeName specified for parameter &apos;{0}&apos;.  TypeName must only be set for Structured parameters..
-        /// </summary>
-        internal static string SqlParameter_UnexpectedTypeNameForNonStruct {
-            get {
-                return ResourceManager.GetString("SqlParameter_UnexpectedTypeNameForNonStruct", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ParameterDirection &apos;{0}&apos; specified for parameter &apos;{1}&apos; is not supported. Table-valued parameters only support ParameterDirection.Input..
-        /// </summary>
-        internal static string SqlParameter_UnsupportedTVPOutputParameter {
-            get {
-                return ResourceManager.GetString("SqlParameter_UnsupportedTVPOutputParameter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to XmlSchemaCollectionDatabase.
-        /// </summary>
-        internal static string SqlParameter_XmlSchemaCollectionDatabase {
-            get {
-                return ResourceManager.GetString("SqlParameter_XmlSchemaCollectionDatabase", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to XmlSchemaCollectionName.
-        /// </summary>
-        internal static string SqlParameter_XmlSchemaCollectionName {
-            get {
-                return ResourceManager.GetString("SqlParameter_XmlSchemaCollectionName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to XmlSchemaCollectionOwningSchema.
-        /// </summary>
-        internal static string SqlParameter_XmlSchemaCollectionOwningSchema {
-            get {
-                return ResourceManager.GetString("SqlParameter_XmlSchemaCollectionOwningSchema", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The sort ordinal {0} was specified twice..
-        /// </summary>
-        internal static string SqlProvider_DuplicateSortOrdinal {
-            get {
-                return ResourceManager.GetString("SqlProvider_DuplicateSortOrdinal", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The size of column &apos;{0}&apos; is not supported. The size is {1}..
-        /// </summary>
-        internal static string SqlProvider_InvalidDataColumnMaxLength {
-            get {
-                return ResourceManager.GetString("SqlProvider_InvalidDataColumnMaxLength", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The type of column &apos;{0}&apos; is not supported.  The type is &apos;{1}&apos;.
-        /// </summary>
-        internal static string SqlProvider_InvalidDataColumnType {
-            get {
-                return ResourceManager.GetString("SqlProvider_InvalidDataColumnType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The sort ordinal {0} was not specified..
-        /// </summary>
-        internal static string SqlProvider_MissingSortOrdinal {
-            get {
-                return ResourceManager.GetString("SqlProvider_MissingSortOrdinal", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to There are not enough fields in the Structured type.  Structured types must have at least one field..
-        /// </summary>
-        internal static string SqlProvider_NotEnoughColumnsInStructuredType {
-            get {
-                return ResourceManager.GetString("SqlProvider_NotEnoughColumnsInStructuredType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The sort ordinal {0} on field {1} exceeds the total number of fields..
-        /// </summary>
-        internal static string SqlProvider_SortOrdinalGreaterThanFieldCount {
-            get {
-                return ResourceManager.GetString("SqlProvider_SortOrdinalGreaterThanFieldCount", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is not less than &apos;{1}&apos;; &apos;{2}&apos; cannot be greater than &apos;{3}&apos;..
-        /// </summary>
-        internal static string SqlRetryLogic_InvalidMinMaxPair {
-            get {
-                return ResourceManager.GetString("SqlRetryLogic_InvalidMinMaxPair", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Value &apos;{0}&apos; is out of range. Must be between {1} and {2}..
-        /// </summary>
-        internal static string SqlRetryLogic_InvalidRange {
-            get {
-                return ResourceManager.GetString("SqlRetryLogic_InvalidRange", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The retry has been canceled at attempt {0}..
-        /// </summary>
-        internal static string SqlRetryLogic_RetryCanceled {
-            get {
-                return ResourceManager.GetString("SqlRetryLogic_RetryCanceled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The number of retries has exceeded the maximum of {0} attempt(s)..
-        /// </summary>
-        internal static string SqlRetryLogic_RetryExceeded {
-            get {
-                return ResourceManager.GetString("SqlRetryLogic_RetryExceeded", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connecting to a mirrored SQL Server instance using the ApplicationIntent ReadOnly connection option is not supported..
-        /// </summary>
-        internal static string SQLROR_FailoverNotSupported {
-            get {
-                return ResourceManager.GetString("SQLROR_FailoverNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid routing information received..
-        /// </summary>
-        internal static string SQLROR_InvalidRoutingInfo {
-            get {
-                return ResourceManager.GetString("SQLROR_InvalidRoutingInfo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid enhanced routing information received..
-        /// </summary>
-        internal static string SQLROR_InvalidEnhancedRoutingInfo {
-            get {
-                return ResourceManager.GetString("SQLROR_InvalidEnhancedRoutingInfo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Too many redirections have occurred. Only {0} redirections per login is allowed..
-        /// </summary>
-        internal static string SQLROR_RecursiveRoutingNotSupported {
-            get {
-                return ResourceManager.GetString("SQLROR_RecursiveRoutingNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Server provided routing information, but timeout already expired..
-        /// </summary>
-        internal static string SQLROR_TimeoutAfterRoutingInfo {
-            get {
-                return ResourceManager.GetString("SQLROR_TimeoutAfterRoutingInfo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unexpected routing information received..
-        /// </summary>
-        internal static string SQLROR_UnexpectedRoutingInfo {
-            get {
-                return ResourceManager.GetString("SQLROR_UnexpectedRoutingInfo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Structured, multiple-valued types can only be used for parameters, and cannot be nested within another type..
-        /// </summary>
-        internal static string SQLTVP_TableTypeCanOnlyBeParameter {
-            get {
-                return ResourceManager.GetString("SQLTVP_TableTypeCanOnlyBeParameter", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The provider has failed to load the following assembly: {0}.
-        /// </summary>
-        internal static string SQLUDT_CantLoadAssembly {
-            get {
-                return ResourceManager.GetString("SQLUDT_CantLoadAssembly", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to get Type Info for {0},{1}.
-        /// </summary>
-        internal static string SQLUDT_InvalidDbId {
-            get {
-                return ResourceManager.GetString("SQLUDT_InvalidDbId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to UDT size must be less than {1}, size: {0}.
-        /// </summary>
-        internal static string SQLUDT_InvalidSize {
-            get {
-                return ResourceManager.GetString("SQLUDT_InvalidSize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specified type is not registered on the target server.{0}..
-        /// </summary>
-        internal static string SQLUDT_InvalidSqlType {
-            get {
-                return ResourceManager.GetString("SQLUDT_InvalidSqlType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is an invalid user defined type, reason: {1}..
-        /// </summary>
-        internal static string SqlUdt_InvalidUdtMessage {
-            get {
-                return ResourceManager.GetString("SqlUdt_InvalidUdtMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to UdtTypeName property must be set for UDT parameters..
-        /// </summary>
-        internal static string SQLUDT_InvalidUdtTypeName {
-            get {
-                return ResourceManager.GetString("SQLUDT_InvalidUdtTypeName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to UDT parameters not permitted in the where clause unless part of the primary key..
-        /// </summary>
-        internal static string SQLUDT_InWhereClause {
-            get {
-                return ResourceManager.GetString("SQLUDT_InWhereClause", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to range: 0-8000.
-        /// </summary>
-        internal static string SQLUDT_MaxByteSizeValue {
-            get {
-                return ResourceManager.GetString("SQLUDT_MaxByteSizeValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to unexpected error encountered in SqlClient data provider. {0}.
-        /// </summary>
-        internal static string SQLUDT_Unexpected {
-            get {
-                return ResourceManager.GetString("SQLUDT_Unexpected", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to UdtTypeName property must be set only for UDT parameters..
-        /// </summary>
-        internal static string SQLUDT_UnexpectedUdtTypeName {
-            get {
-                return ResourceManager.GetString("SQLUDT_UnexpectedUdtTypeName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Native format can&apos;t be supported..
-        /// </summary>
-        internal static string SqlUdtReason_CannotSupportNative {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_CannotSupportNative", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to does not implement IBinarySerialize.
-        /// </summary>
-        internal static string SqlUdtReason_CannotSupportUserDefined {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_CannotSupportUserDefined", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Serialization without mapping is not yet supported..
-        /// </summary>
-        internal static string SqlUdtReason_MaplessNotYetSupported {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_MaplessNotYetSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to supports both in-memory and user-defined formats.
-        /// </summary>
-        internal static string SqlUdtReason_MultipleSerFormats {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_MultipleSerFormats", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Multiple valued assembly references must have a nonzero Assembly Id..
-        /// </summary>
-        internal static string SqlUdtReason_MultivaluedAssemblyId {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_MultivaluedAssemblyId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The type of field &apos;{0}&apos; is marked as explicit layout which is not allowed in Native format.
-        /// </summary>
-        internal static string SqlUdtReason_NativeFormatExplicitLayoutNotAllowed {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NativeFormatExplicitLayoutNotAllowed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Native format does not support fields (directly or through another field) of type &apos;{0}&apos;.
-        /// </summary>
-        internal static string SqlUdtReason_NativeFormatNoFieldSupport {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NativeFormatNoFieldSupport", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Native UDT specifies a max byte size.
-        /// </summary>
-        internal static string SqlUdtReason_NativeUdtMaxByteSize {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NativeUdtMaxByteSize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Native UDT not sequential layout due to type &apos;{0}&apos;.
-        /// </summary>
-        internal static string SqlUdtReason_NativeUdtNotSequentialLayout {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NativeUdtNotSequentialLayout", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to field &apos;{0}&apos; is marked non-serialized.
-        /// </summary>
-        internal static string SqlUdtReason_NonSerializableField {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NonSerializableField", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to does not have a public constructor.
-        /// </summary>
-        internal static string SqlUdtReason_NoPublicConstructor {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NoPublicConstructor", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to no public constructors.
-        /// </summary>
-        internal static string SqlUdtReason_NoPublicConstructors {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NoPublicConstructors", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to does not implement INullable.
-        /// </summary>
-        internal static string SqlUdtReason_NotNullable {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NotNullable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to not serializable.
-        /// </summary>
-        internal static string SqlUdtReason_NotSerializable {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NotSerializable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to no UDT attribute.
-        /// </summary>
-        internal static string SqlUdtReason_NoUdtAttribute {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NoUdtAttribute", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;public static x Null { get; }&apos; method is missing.
-        /// </summary>
-        internal static string SqlUdtReason_NullPropertyMissing {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_NullPropertyMissing", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;public static x Parse(System.Data.SqlTypes.SqlString)&apos; method is missing.
-        /// </summary>
-        internal static string SqlUdtReason_ParseMethodMissing {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_ParseMethodMissing", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;public override string ToString()&apos; method is missing.
-        /// </summary>
-        internal static string SqlUdtReason_ToStringMethodMissing {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_ToStringMethodMissing", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type is not public.
-        /// </summary>
-        internal static string SqlUdtReason_TypeNotPublic {
-            get {
-                return ResourceManager.GetString("SqlUdtReason_TypeNotPublic", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; is not a supported handle type..
-        /// </summary>
-        internal static string SSPIInvalidHandleType {
-            get {
-                return ResourceManager.GetString("SSPIInvalidHandleType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot get value because it is DBNull..
-        /// </summary>
-        internal static string StrongTyping_CannotAccessDBNull {
-            get {
-                return ResourceManager.GetString("StrongTyping_CannotAccessDBNull", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot remove column since it is built in to this dataSet..
-        /// </summary>
-        internal static string StrongTyping_CannotRemoveColumn {
-            get {
-                return ResourceManager.GetString("StrongTyping_CannotRemoveColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot remove relation since it is built in to this dataSet..
-        /// </summary>
-        internal static string StrongTyping_CannotRemoveRelation {
-            get {
-                return ResourceManager.GetString("StrongTyping_CannotRemoveRelation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Attestation information was not returned by SQL Server. Enclave type is &apos;{0}&apos; and enclave attestation URL is &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_AttestationInfoNotReturnedFromSQLServer {
-            get {
-                return ResourceManager.GetString("TCE_AttestationInfoNotReturnedFromSQLServer", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error occurred when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations..
-        /// </summary>
-        internal static string TCE_AttestationProtocolNotSpecifiedForGeneratingEnclavePackage {
-            get {
-                return ResourceManager.GetString("TCE_AttestationProtocolNotSpecifiedForGeneratingEnclavePackage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You have specified the attestation protocol in the connection string, but the SQL Server in use does not support enclave based computations - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details..
-        /// </summary>
-        internal static string TCE_AttestationProtocolNotSupported {
-            get {
-                return ResourceManager.GetString("TCE_AttestationProtocolNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to initialize connection. The attestation protocol &apos;{0}&apos; does not support the enclave type &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_AttestationProtocolNotSupportEnclaveType {
-            get {
-                return ResourceManager.GetString("TCE_AttestationProtocolNotSupportEnclaveType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You have specified the enclave attestation URL in the connection string, but the SQL Server in use does not support enclave based computations - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details..
-        /// </summary>
-        internal static string TCE_AttestationURLNotSupported {
-            get {
-                return ResourceManager.GetString("TCE_AttestationURLNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} should be identical on all commands ({1}, {2}, {3}, {4}) when doing batch updates..
-        /// </summary>
-        internal static string TCE_BatchedUpdateColumnEncryptionSettingMismatch {
-            get {
-                return ResourceManager.GetString("TCE_BatchedUpdateColumnEncryptionSettingMismatch", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to instantiate an enclave provider with type &apos;{1}&apos; for name &apos;{0}&apos;. Error message: {2} .
-        /// </summary>
-        internal static string TCE_CannotCreateSqlColumnEncryptionEnclaveProvider {
-            get {
-                return ResourceManager.GetString("TCE_CannotCreateSqlColumnEncryptionEnclaveProvider", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to read the configuration section for enclave providers. Make sure the section is correctly formatted in your application configuration file. Error Message: {0}.
-        /// </summary>
-        internal static string TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig {
-            get {
-                return ResourceManager.GetString("TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Key store providers cannot be set more than once..
-        /// </summary>
-        internal static string TCE_CanOnlyCallOnce {
-            get {
-                return ResourceManager.GetString("TCE_CanOnlyCallOnce", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Certificate with thumbprint &apos;{0}&apos; not found in certificate store &apos;{1}&apos; in certificate location &apos;{2}&apos;..
-        /// </summary>
-        internal static string TCE_CertificateNotFound {
-            get {
-                return ResourceManager.GetString("TCE_CertificateNotFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Certificate with thumbprint &apos;{0}&apos; not found in certificate store &apos;{1}&apos; in certificate location &apos;{2}&apos;. Verify the certificate path in the column master key definition in the database is correct, and the certificate has been imported correctly into the certificate location/store..
-        /// </summary>
-        internal static string TCE_CertificateNotFoundSysErr {
-            get {
-                return ResourceManager.GetString("TCE_CertificateNotFoundSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Certificate specified in key path &apos;{0}&apos; does not have a private key to encrypt a column encryption key. Verify the certificate is imported correctly..
-        /// </summary>
-        internal static string TCE_CertificateWithNoPrivateKey {
-            get {
-                return ResourceManager.GetString("TCE_CertificateWithNoPrivateKey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Certificate specified in key path &apos;{0}&apos; does not have a private key to decrypt a column encryption key. Verify the certificate is imported correctly..
-        /// </summary>
-        internal static string TCE_CertificateWithNoPrivateKeySysErr {
-            get {
-                return ResourceManager.GetString("TCE_CertificateWithNoPrivateKeySysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to decrypt column &apos;{0}&apos;..
-        /// </summary>
-        internal static string TCE_ColumnDecryptionFailed {
-            get {
-                return ResourceManager.GetString("TCE_ColumnDecryptionFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. Encrypted column encryption keys not found when trying to send the keys to the enclave..
-        /// </summary>
-        internal static string TCE_ColumnEncryptionKeysNotFound {
-            get {
-                return ResourceManager.GetString("TCE_ColumnEncryptionKeysNotFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. The signature returned by SQL Server for enclave-enabled column master key, specified at key path &apos;{0}&apos;, cannot be null or empty..
-        /// </summary>
-        internal static string TCE_ColumnMasterKeySignatureNotFound {
-            get {
-                return ResourceManager.GetString("TCE_ColumnMasterKeySignatureNotFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The signature returned by SQL Server for the column master key, specified in key path &apos;{0}&apos;, is invalid (does not match the computed signature). Recreate column master key metadata, making sure the signature inside the metadata is computed using the column master key being referenced in the metadata. If the error persists, please contact Microsoft for assistance..
-        /// </summary>
-        internal static string TCE_ColumnMasterKeySignatureVerificationFailed {
-            get {
-                return ResourceManager.GetString("TCE_ColumnMasterKeySignatureVerificationFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specifies an attestation protocol for its corresponding enclave attestation service..
-        /// </summary>
-        internal static string TCE_DbConnectionString_AttestationProtocol {
-            get {
-                return ResourceManager.GetString("TCE_DbConnectionString_AttestationProtocol", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Default column encryption setting for all the commands on the connection..
-        /// </summary>
-        internal static string TCE_DbConnectionString_ColumnEncryptionSetting {
-            get {
-                return ResourceManager.GetString("TCE_DbConnectionString_ColumnEncryptionSetting", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specifies an endpoint of an enclave attestation service, which will be used to verify whether the enclave, configured in the SQL Server instance for computations on database columns encrypted using Always Encrypted, is valid and secure..
-        /// </summary>
-        internal static string TCE_DbConnectionString_EnclaveAttestationUrl {
-            get {
-                return ResourceManager.GetString("TCE_DbConnectionString_EnclaveAttestationUrl", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specifies an IP address preference when connecting to SQL instances..
-        /// </summary>
-        internal static string TCE_DbConnectionString_IPAddressPreference {
-            get {
-                return ResourceManager.GetString("TCE_DbConnectionString_IPAddressPreference", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Decryption failed. The last 10 bytes of the encrypted column encryption key are: &apos;{0}&apos;. The first 10 bytes of ciphertext are: &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_DecryptionFailed {
-            get {
-                return ResourceManager.GetString("TCE_DecryptionFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. Empty argument &apos;{0}&apos; specified when constructing an object of type &apos;{1}&apos;. &apos;{0}&apos; cannot be empty..
-        /// </summary>
-        internal static string TCE_EmptyArgumentInConstructorInternal {
-            get {
-                return ResourceManager.GetString("TCE_EmptyArgumentInConstructorInternal", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. Argument &apos;{0}&apos; cannot be empty when executing method &apos;{1}.{2}&apos;..
-        /// </summary>
-        internal static string TCE_EmptyArgumentInternal {
-            get {
-                return ResourceManager.GetString("TCE_EmptyArgumentInternal", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Empty certificate thumbprint specified in certificate path &apos;{0}&apos;..
-        /// </summary>
-        internal static string TCE_EmptyCertificateThumbprint {
-            get {
-                return ResourceManager.GetString("TCE_EmptyCertificateThumbprint", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Empty certificate thumbprint specified in certificate path &apos;{0}&apos;..
-        /// </summary>
-        internal static string TCE_EmptyCertificateThumbprintSysErr {
-            get {
-                return ResourceManager.GetString("TCE_EmptyCertificateThumbprintSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Empty key identifier specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_EmptyCngKeyId {
-            get {
-                return ResourceManager.GetString("TCE_EmptyCngKeyId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Empty key identifier specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_EmptyCngKeyIdSysErr {
-            get {
-                return ResourceManager.GetString("TCE_EmptyCngKeyIdSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Empty Microsoft Cryptography API: Next Generation (CNG) provider name specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_EmptyCngName {
-            get {
-                return ResourceManager.GetString("TCE_EmptyCngName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Empty Microsoft Cryptography API: Next Generation (CNG) provider name specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_EmptyCngNameSysErr {
-            get {
-                return ResourceManager.GetString("TCE_EmptyCngNameSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Empty column encryption key specified..
-        /// </summary>
-        internal static string TCE_EmptyColumnEncryptionKey {
-            get {
-                return ResourceManager.GetString("TCE_EmptyColumnEncryptionKey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Empty key identifier specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_EmptyCspKeyId {
-            get {
-                return ResourceManager.GetString("TCE_EmptyCspKeyId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Empty key identifier specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_EmptyCspKeyIdSysErr {
-            get {
-                return ResourceManager.GetString("TCE_EmptyCspKeyIdSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Empty Microsoft cryptographic service provider (CSP) name specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_EmptyCspName {
-            get {
-                return ResourceManager.GetString("TCE_EmptyCspName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Empty Microsoft cryptographic service provider (CSP) name specified in column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_EmptyCspNameSysErr {
-            get {
-                return ResourceManager.GetString("TCE_EmptyCspNameSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Empty encrypted column encryption key specified..
-        /// </summary>
-        internal static string TCE_EmptyEncryptedColumnEncryptionKey {
-            get {
-                return ResourceManager.GetString("TCE_EmptyEncryptedColumnEncryptionKey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid key store provider name specified. Key store provider names cannot be null or empty..
-        /// </summary>
-        internal static string TCE_EmptyProviderName {
-            get {
-                return ResourceManager.GetString("TCE_EmptyProviderName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You have specified the enclave attestation URL and attestation protocol in the connection string, but the SQL Server in use does not support enclave based computations - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details..
-        /// </summary>
-        internal static string TCE_EnclaveComputationsNotSupported {
-            get {
-                return ResourceManager.GetString("TCE_EnclaveComputationsNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No enclave provider found for enclave type &apos;{0}&apos; and attestation protocol &apos;{1}&apos;. Please specify the correct attestation protocol in the connection string. .
-        /// </summary>
-        internal static string TCE_EnclaveProviderNotFound {
-            get {
-                return ResourceManager.GetString("TCE_EnclaveProviderNotFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Executing a query requires enclave computations, but the application configuration is missing the enclave provider  section..
-        /// </summary>
-        internal static string TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery {
-            get {
-                return ResourceManager.GetString("TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You have specified the enclave attestation URL in the connection string, but the SQL Server did not return an enclave type. Please make sure the enclave type is correctly configured in your instance - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details..
-        /// </summary>
-        internal static string TCE_EnclaveTypeNotReturned {
-            get {
-                return ResourceManager.GetString("TCE_EnclaveTypeNotReturned", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The enclave type &apos;{0}&apos; returned from the server is not supported..
-        /// </summary>
-        internal static string TCE_EnclaveTypeNotSupported {
-            get {
-                return ResourceManager.GetString("TCE_EnclaveTypeNotSupported", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. Enclave type received from SQL Server is null or empty when executing a query requiring enclave computations..
-        /// </summary>
-        internal static string TCE_EnclaveTypeNullForEnclaveBasedQuery {
-            get {
-                return ResourceManager.GetString("TCE_EnclaveTypeNullForEnclaveBasedQuery", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error encountered while generating package to be sent to enclave. Error message: {0}.
-        /// </summary>
-        internal static string TCE_ExceptionWhenGeneratingEnclavePackage {
-            get {
-                return ResourceManager.GetString("TCE_ExceptionWhenGeneratingEnclavePackage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error.  Failed to encrypt byte package to be sent to the enclave. Error Message: {0} .
-        /// </summary>
-        internal static string TCE_FailedToEncryptRegisterRulesBytePackage {
-            get {
-                return ResourceManager.GetString("TCE_FailedToEncryptRegisterRulesBytePackage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. The buffer specified by argument &apos;{0}&apos; for method &apos;{1}.{2}&apos; has insufficient space..
-        /// </summary>
-        internal static string TCE_InsufficientBuffer {
-            get {
-                return ResourceManager.GetString("TCE_InsufficientBuffer", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The specified ciphertext&apos;s encryption algorithm version &apos;{0}&apos; does not match the expected encryption algorithm version &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidAlgorithmVersion {
-            get {
-                return ResourceManager.GetString("TCE_InvalidAlgorithmVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specified encrypted column encryption key contains an invalid encryption algorithm version &apos;{0}&apos;. Expected version is &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidAlgorithmVersionInEncryptedCEK {
-            get {
-                return ResourceManager.GetString("TCE_InvalidAlgorithmVersionInEncryptedCEK", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid attestation parameters specified by the enclave provider for enclave type &apos;{0}&apos;. Error occurred when converting the value &apos;{1}&apos; of parameter &apos;{2}&apos; to unsigned int. Error Message: {3}.
-        /// </summary>
-        internal static string TCE_InvalidAttestationParameterUnableToConvertToUnsignedInt {
-            get {
-                return ResourceManager.GetString("TCE_InvalidAttestationParameterUnableToConvertToUnsignedInt", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specified ciphertext has an invalid authentication tag..
-        /// </summary>
-        internal static string TCE_InvalidAuthenticationTag {
-            get {
-                return ResourceManager.GetString("TCE_InvalidAuthenticationTag", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid certificate location &apos;{0}&apos; in certificate path &apos;{1}&apos;. Use the following format: &lt;certificate location&gt;{4}&lt;certificate store&gt;{4}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{2}&apos; or &apos;{3}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidCertificateLocation {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCertificateLocation", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid certificate location &apos;{0}&apos; in certificate path &apos;{1}&apos;. Use the following format: &lt;certificate location&gt;{3}&lt;certificate store&gt;{3}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{2}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidCertificateLocation_Unix
-        {
-            get
-            {
-                return ResourceManager.GetString("TCE_InvalidCertificateLocation_Unix", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Invalid certificate location &apos;{0}&apos; in certificate path &apos;{1}&apos;. Use the following format: &lt;certificate location&gt;{4}&lt;certificate store&gt;{4}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{2}&apos; or &apos;{3}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidCertificateLocationSysErr {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCertificateLocationSysErr", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Invalid certificate location &apos;{0}&apos; in certificate path &apos;{1}&apos;. Use the following format: &lt;certificate location&gt;{3}&lt;certificate store&gt;{3}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{2}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidCertificateLocationSysErr_Unix
-        {
-            get
-            {
-                return ResourceManager.GetString("TCE_InvalidCertificateLocationSysErr_Unix", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid certificate path: &apos;{0}&apos;. Use the following format: &lt;certificate location&gt;{3}&lt;certificate store&gt;{3}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{1}&apos; or &apos;{2}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidCertificatePath {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCertificatePath", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid certificate path: &apos;{0}&apos;. Use the following format: &lt;certificate location&gt;{2}&lt;certificate store&gt;{2}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidCertificatePath_Unix
-        {
-            get
-            {
-                return ResourceManager.GetString("TCE_InvalidCertificatePath_Unix", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Invalid certificate path: &apos;{0}&apos;. Use the following format: &lt;certificate location&gt;{3}&lt;certificate store&gt;{3}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{1}&apos; or &apos;{2}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidCertificatePathSysErr {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCertificatePathSysErr", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Invalid certificate path: &apos;{0}&apos;. Use the following format: &lt;certificate location&gt;{2}&lt;certificate store&gt;{2}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidCertificatePathSysErr_Unix
-        {
-            get
-            {
-                return ResourceManager.GetString("TCE_InvalidCertificatePathSysErr_Unix", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid certificate store &apos;{0}&apos; specified in certificate path &apos;{1}&apos;. Expected value: &apos;{2}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidCertificateStore {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCertificateStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Invalid certificate store &apos;{0}&apos; specified in certificate path &apos;{1}&apos;. Expected value: &apos;{2}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidCertificateStoreSysErr {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCertificateStoreSysErr", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to The specified encrypted column encryption key&apos;s ciphertext length: {0} does not match the ciphertext length: {1} when using column master key ({2}) in &apos;{3}&apos;. The encrypted column encryption key may be corrupt, or the specified {4} path may be incorrect..
-        /// </summary>
-        internal static string TCE_InvalidCiphertextLengthInEncryptedCEK {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCiphertextLengthInEncryptedCEK", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specified ciphertext has an invalid size of {0} bytes, which is below the minimum {1} bytes required for decryption..
-        /// </summary>
-        internal static string TCE_InvalidCipherTextSize {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCipherTextSize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An error occurred while opening the Microsoft Cryptography API: Next Generation (CNG) key: &apos;{0}&apos;. Verify that the CNG provider name &apos;{1}&apos; is valid, installed on the machine, and the key &apos;{2}&apos; exists..
-        /// </summary>
-        internal static string TCE_InvalidCngKey {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCngKey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. An error occurred while opening the Microsoft Cryptography API: Next Generation (CNG) key: &apos;{0}&apos;. Verify that the CNG provider name &apos;{1}&apos; is valid, installed on the machine, and the key &apos;{2}&apos; exists..
-        /// </summary>
-        internal static string TCE_InvalidCngKeySysErr {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCngKeySysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_InvalidCngPath {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCngPath", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Invalid column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_InvalidCngPathSysErr {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCngPathSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid key identifier: &apos;{0}&apos;. Verify that the key identifier in column master key path: &apos;{1}&apos; is valid and exists in the CSP..
-        /// </summary>
-        internal static string TCE_InvalidCspKeyId {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCspKeyId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Invalid key identifier: &apos;{0}&apos;. Verify that the key identifier in column master key path: &apos;{1}&apos; is valid and exists in the CSP..
-        /// </summary>
-        internal static string TCE_InvalidCspKeyIdSysErr {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCspKeyIdSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid Microsoft cryptographic service provider (CSP) name: &apos;{0}&apos;. Verify that the CSP provider name in column master key path: &apos;{1}&apos; is valid and installed on the machine..
-        /// </summary>
-        internal static string TCE_InvalidCspName {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCspName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Invalid Microsoft cryptographic service provider (CSP) name: &apos;{0}&apos;. Verify that the CSP provider name in column master key path: &apos;{1}&apos; is valid and installed on the machine..
-        /// </summary>
-        internal static string TCE_InvalidCspNameSysErr {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCspNameSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_InvalidCspPath {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCspPath", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Invalid column master key path: &apos;{0}&apos;. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{1}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_InvalidCspPathSysErr {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCspPathSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid key store provider name &apos;{0}&apos;. &apos;{1}&apos; prefix is reserved for system key store providers..
-        /// </summary>
-        internal static string TCE_InvalidCustomKeyStoreProviderName {
-            get {
-                return ResourceManager.GetString("TCE_InvalidCustomKeyStoreProviderName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. The given database id &apos;{0}&apos; is not valid. Error occurred when converting the database id to unsigned int. Error Message: {1}.
-        /// </summary>
-        internal static string TCE_InvalidDatabaseIdUnableToCastToUnsignedInt {
-            get {
-                return ResourceManager.GetString("TCE_InvalidDatabaseIdUnableToCastToUnsignedInt", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Error occurred when populating enclave metadata. The referenced column encryption key ordinal &apos;{0}&apos; is missing in the encryption metadata returned by SQL Server. Max ordinal is &apos;{1}&apos;. .
-        /// </summary>
-        internal static string TCE_InvalidEncryptionKeyOrdinalEnclaveMetadata {
-            get {
-                return ResourceManager.GetString("TCE_InvalidEncryptionKeyOrdinalEnclaveMetadata", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Error occurred when populating parameter metadata. The referenced column encryption key ordinal &apos;{0}&apos; is missing in the encryption metadata returned by SQL Server. Max ordinal is &apos;{1}&apos;. .
-        /// </summary>
-        internal static string TCE_InvalidEncryptionKeyOrdinalParameterMetadata {
-            get {
-                return ResourceManager.GetString("TCE_InvalidEncryptionKeyOrdinalParameterMetadata", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Encryption type &apos;{1}&apos; specified for the column in the database is either invalid or corrupted. Valid encryption types for algorithm &apos;{0}&apos; are: {2}..
-        /// </summary>
-        internal static string TCE_InvalidEncryptionType {
-            get {
-                return ResourceManager.GetString("TCE_InvalidEncryptionType", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid key encryption algorithm specified: &apos;{0}&apos;. Expected value: &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidKeyEncryptionAlgorithm {
-            get {
-                return ResourceManager.GetString("TCE_InvalidKeyEncryptionAlgorithm", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Invalid key encryption algorithm specified: &apos;{0}&apos;. Expected value: &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_InvalidKeyEncryptionAlgorithmSysErr {
-            get {
-                return ResourceManager.GetString("TCE_InvalidKeyEncryptionAlgorithmSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. The given key id &apos;{0}&apos; is not valid. Error occurred when converting the key id to unsigned short. Error Message: {1}.
-        /// </summary>
-        internal static string TCE_InvalidKeyIdUnableToCastToUnsignedShort {
-            get {
-                return ResourceManager.GetString("TCE_InvalidKeyIdUnableToCastToUnsignedShort", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The column encryption key has been successfully decrypted but its length: {1} does not match the length: {2} for algorithm &apos;{0}&apos;. Verify the encrypted value of the column encryption key in the database..
-        /// </summary>
-        internal static string TCE_InvalidKeySize {
-            get {
-                return ResourceManager.GetString("TCE_InvalidKeySize", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid key store provider name: &apos;{0}&apos;. A key store provider name must denote either a system key store provider or a registered custom key store provider. Valid system key store provider names are: {1}. Valid (currently registered) custom key store provider names are: {2}. Please verify key store provider information in column master key definitions in the database, and verify all custom key store providers used in your application are registered properly..
-        /// </summary>
-        internal static string TCE_InvalidKeyStoreProviderName {
-            get {
-                return ResourceManager.GetString("TCE_InvalidKeyStoreProviderName", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to The specified encrypted column encryption key signature does not match the signature computed with the column master key ({0}) in &apos;{1}&apos;. The encrypted column encryption key may be corrupt, or the specified path may be incorrect..
-        /// </summary>
-        internal static string TCE_InvalidSignature {
-            get {
-                return ResourceManager.GetString("TCE_InvalidSignature", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to The specified encrypted column encryption key&apos;s signature length: {0} does not match the signature length: {1} when using column master key ({2}) in &apos;{3}&apos;. The encrypted column encryption key may be corrupt, or the specified {4} path may be incorrect..
-        /// </summary>
-        internal static string TCE_InvalidSignatureInEncryptedCEK {
-            get {
-                return ResourceManager.GetString("TCE_InvalidSignatureInEncryptedCEK", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to decrypt a column encryption key using key store provider: &apos;{0}&apos;. Verify the properties of the column encryption key and its column master key in your database. The last 10 bytes of the encrypted column encryption key are: &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_KeyDecryptionFailed {
-            get {
-                return ResourceManager.GetString("TCE_KeyDecryptionFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to decrypt a column encryption key using key store provider: &apos;{0}&apos;. The last 10 bytes of the encrypted column encryption key are: &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_KeyDecryptionFailedCertStore {
-            get {
-                return ResourceManager.GetString("TCE_KeyDecryptionFailedCertStore", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Specified certificate path has {0} bytes, which exceeds maximum length of {1} bytes..
-        /// </summary>
-        internal static string TCE_LargeCertificatePathLength {
-            get {
-                return ResourceManager.GetString("TCE_LargeCertificatePathLength", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Specified certificate path has {0} bytes, which exceeds maximum length of {1} bytes..
-        /// </summary>
-        internal static string TCE_LargeCertificatePathLengthSysErr {
-            get {
-                return ResourceManager.GetString("TCE_LargeCertificatePathLengthSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Error occurred when parsing the results of &apos;{0}&apos;. The attestation information resultset is expected to contain only one row, but it contains multiple rows..
-        /// </summary>
-        internal static string TCE_MultipleRowsReturnedForAttestationInfo {
-            get {
-                return ResourceManager.GetString("TCE_MultipleRowsReturnedForAttestationInfo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error occurred when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations.  Enclave type is &apos;{0}&apos;. .
-        /// </summary>
-        internal static string TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage {
-            get {
-                return ResourceManager.GetString("TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error occurred when reading &apos;{0}&apos; resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations.  Enclave type is &apos;{1}&apos;. .
-        /// </summary>
-        internal static string TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe {
-            get {
-                return ResourceManager.GetString("TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} instance in use does not support column encryption..
-        /// </summary>
-        internal static string TCE_NotSupportedByServer {
-            get {
-                return ResourceManager.GetString("TCE_NotSupportedByServer", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. Null argument &apos;{0}&apos; specified when constructing an object of type &apos;{1}&apos;. &apos;{0}&apos; cannot be null..
-        /// </summary>
-        internal static string TCE_NullArgumentInConstructorInternal {
-            get {
-                return ResourceManager.GetString("TCE_NullArgumentInConstructorInternal", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. Argument &apos;{0}&apos; cannot be null when executing method &apos;{1}.{2}&apos;..
-        /// </summary>
-        internal static string TCE_NullArgumentInternal {
-            get {
-                return ResourceManager.GetString("TCE_NullArgumentInternal", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Certificate path cannot be null. Use the following format: &lt;certificate location&gt;{2}&lt;certificate store&gt;{2}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{0}&apos; or &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_NullCertificatePath {
-            get {
-                return ResourceManager.GetString("TCE_NullCertificatePath", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Certificate path cannot be null. Use the following format: &lt;certificate location&gt;{1}&lt;certificate store&gt;{1}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{0}&apos;..
-        /// </summary>
-        internal static string TCE_NullCertificatePath_Unix
-        {
-            get
-            {
-                return ResourceManager.GetString("TCE_NullCertificatePath_Unix", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Certificate path cannot be null. Use the following format: &lt;certificate location&gt;{2}&lt;certificate store&gt;{2}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{0}&apos; or &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_NullCertificatePathSysErr {
-            get {
-                return ResourceManager.GetString("TCE_NullCertificatePathSysErr", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Certificate path cannot be null. Use the following format: &lt;certificate location&gt;{1}&lt;certificate store&gt;{1}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{0}&apos;..
-        /// </summary>
-        internal static string TCE_NullCertificatePathSysErr_Unix
-        {
-            get
-            {
-                return ResourceManager.GetString("TCE_NullCertificatePathSysErr_Unix", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Ciphertext value cannot be null..
-        /// </summary>
-        internal static string TCE_NullCipherText {
-            get {
-                return ResourceManager.GetString("TCE_NullCipherText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Column master key path cannot be null. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{0}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_NullCngPath {
-            get {
-                return ResourceManager.GetString("TCE_NullCngPath", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Column master key path cannot be null. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{0}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_NullCngPathSysErr {
-            get {
-                return ResourceManager.GetString("TCE_NullCngPathSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Encryption algorithm cannot be null. Valid algorithms are: {0}..
-        /// </summary>
-        internal static string TCE_NullColumnEncryptionAlgorithm {
-            get {
-                return ResourceManager.GetString("TCE_NullColumnEncryptionAlgorithm", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Column encryption key cannot be null..
-        /// </summary>
-        internal static string TCE_NullColumnEncryptionKey {
-            get {
-                return ResourceManager.GetString("TCE_NullColumnEncryptionKey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Column encryption key cannot be null..
-        /// </summary>
-        internal static string TCE_NullColumnEncryptionKeySysErr {
-            get {
-                return ResourceManager.GetString("TCE_NullColumnEncryptionKeySysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Column master key path cannot be null. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{0}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_NullCspPath {
-            get {
-                return ResourceManager.GetString("TCE_NullCspPath", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Column master key path cannot be null. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{0}&lt;Key Identifier&gt;..
-        /// </summary>
-        internal static string TCE_NullCspPathSysErr {
-            get {
-                return ResourceManager.GetString("TCE_NullCspPathSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Column encryption key store provider dictionary cannot be null. Expecting a non-null value..
-        /// </summary>
-        internal static string TCE_NullCustomKeyStoreProviderDictionary {
-            get {
-                return ResourceManager.GetString("TCE_NullCustomKeyStoreProviderDictionary", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. Enclave package is null during execution of an enclave based query. Enclave type is &apos;{0}&apos; and enclaveAttestationUrl is &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_NullEnclavePackageForEnclaveBasedQuery {
-            get {
-                return ResourceManager.GetString("TCE_NullEnclavePackageForEnclaveBasedQuery", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. Enclave session is null during query execution. Enclave type is &apos;{0}&apos; and enclaveAttestationUrl is &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_NullEnclaveSessionDuringQueryExecution {
-            get {
-                return ResourceManager.GetString("TCE_NullEnclaveSessionDuringQueryExecution", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to communicate with the enclave. Null enclave session information received from the enclave provider. Enclave type is &apos;{0}&apos; and enclave attestation URL is &apos;{1}&apos;..
-        /// </summary>
-        internal static string TCE_NullEnclaveSessionReturnedFromProvider {
-            get {
-                return ResourceManager.GetString("TCE_NullEnclaveSessionReturnedFromProvider", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Encrypted column encryption key cannot be null..
-        /// </summary>
-        internal static string TCE_NullEncryptedColumnEncryptionKey {
-            get {
-                return ResourceManager.GetString("TCE_NullEncryptedColumnEncryptionKey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Key encryption algorithm cannot be null..
-        /// </summary>
-        internal static string TCE_NullKeyEncryptionAlgorithm {
-            get {
-                return ResourceManager.GetString("TCE_NullKeyEncryptionAlgorithm", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Key encryption algorithm cannot be null..
-        /// </summary>
-        internal static string TCE_NullKeyEncryptionAlgorithmSysErr {
-            get {
-                return ResourceManager.GetString("TCE_NullKeyEncryptionAlgorithmSysErr", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Plaintext value cannot be null..
-        /// </summary>
-        internal static string TCE_NullPlainText {
-            get {
-                return ResourceManager.GetString("TCE_NullPlainText", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Null reference specified for key store provider &apos;{0}&apos;. Expecting a non-null value..
-        /// </summary>
-        internal static string TCE_NullProviderValue {
-            get {
-                return ResourceManager.GetString("TCE_NullProviderValue", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. Failed to serialize keys to be sent to the enclave. The start offset specified by argument &apos;{0}&apos; for method {1}.{2} is out of bounds..
-        /// </summary>
-        internal static string TCE_OffsetOutOfBounds {
-            get {
-                return ResourceManager.GetString("TCE_OffsetOutOfBounds", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to decrypt parameter &apos;{0}&apos;..
-        /// </summary>
-        internal static string TCE_ParamDecryptionFailed {
-            get {
-                return ResourceManager.GetString("TCE_ParamDecryptionFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to encrypt parameter &apos;{0}&apos;..
-        /// </summary>
-        internal static string TCE_ParamEncryptionFailed {
-            get {
-                return ResourceManager.GetString("TCE_ParamEncryptionFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Metadata for parameter &apos;{1}&apos; in statement or procedure &apos;{2}&apos; is missing in resultset returned by {0}..
-        /// </summary>
-        internal static string TCE_ParamEncryptionMetaDataMissing {
-            get {
-                return ResourceManager.GetString("TCE_ParamEncryptionMetaDataMissing", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot set {0} for {3} &apos;{1}&apos; because encryption is not enabled for the statement or procedure &apos;{2}&apos;..
-        /// </summary>
-        internal static string TCE_ParamInvalidForceColumnEncryptionSetting {
-            get {
-                return ResourceManager.GetString("TCE_ParamInvalidForceColumnEncryptionSetting", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot execute statement or procedure &apos;{1}&apos; because {2} was set for {3} &apos;{0}&apos; and the database expects this parameter to be sent as plaintext. This may be due to a configuration error..
-        /// </summary>
-        internal static string TCE_ParamUnExpectedEncryptionMetadata {
-            get {
-                return ResourceManager.GetString("TCE_ParamUnExpectedEncryptionMetadata", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. Metadata for parameters for command &apos;{1}&apos; in a batch is missing in the resultset returned by {0}..
-        /// </summary>
-        internal static string TCE_ProcEncryptionMetaDataMissing {
-            get {
-                return ResourceManager.GetString("TCE_ProcEncryptionMetaDataMissing", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Retrieving encrypted column &apos;{0}&apos; with {1} is not supported..
-        /// </summary>
-        internal static string TCE_SequentialAccessNotSupportedOnEncryptedColumn {
-            get {
-                return ResourceManager.GetString("TCE_SequentialAccessNotSupportedOnEncryptedColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal Error. SqlColumnEncryptionEnclaveProviderName cannot be null or empty..
-        /// </summary>
-        internal static string TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty {
-            get {
-                return ResourceManager.GetString("TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Column encryption setting for the command. Overrides the connection level default..
-        /// </summary>
-        internal static string TCE_SqlCommand_ColumnEncryptionSetting {
-            get {
-                return ResourceManager.GetString("TCE_SqlCommand_ColumnEncryptionSetting", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Defines the time-to-live of entries in the column encryption key cache..
-        /// </summary>
-        internal static string TCE_SqlConnection_ColumnEncryptionKeyCacheTtl {
-            get {
-                return ResourceManager.GetString("TCE_SqlConnection_ColumnEncryptionKeyCacheTtl", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Defines whether query metadata caching is enabled..
-        /// </summary>
-        internal static string TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled {
-            get {
-                return ResourceManager.GetString("TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Dictionary object containing SQL Server names and their trusted column master key paths..
-        /// </summary>
-        internal static string TCE_SqlConnection_TrustedColumnMasterKeyPaths {
-            get {
-                return ResourceManager.GetString("TCE_SqlConnection_TrustedColumnMasterKeyPaths", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Forces parameter to be encrypted before sending sensitive data to server. .
-        /// </summary>
-        internal static string TCE_SqlParameter_ForceColumnEncryption {
-            get {
-                return ResourceManager.GetString("TCE_SqlParameter_ForceColumnEncryption", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Retrieving encrypted column &apos;{0}&apos; as a {1} is not supported..
-        /// </summary>
-        internal static string TCE_StreamNotSupportOnEncryptedColumn {
-            get {
-                return ResourceManager.GetString("TCE_StreamNotSupportOnEncryptedColumn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to establish secure channel. Error Message: {0}.
-        /// </summary>
-        internal static string TCE_UnableToEstablishSecureChannel {
-            get {
-                return ResourceManager.GetString("TCE_UnableToEstablishSecureChannel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unable to verify a column master key signature. Error message: {0} .
-        /// </summary>
-        internal static string TCE_UnableToVerifyColumnMasterKeySignature {
-            get {
-                return ResourceManager.GetString("TCE_UnableToVerifyColumnMasterKeySignature", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. The result returned by &apos;{0}&apos; is invalid. The attestation information resultset is missing for enclave type &apos;{1}&apos;. .
-        /// </summary>
-        internal static string TCE_UnexpectedDescribeParamFormatAttestationInfo {
-            get {
-                return ResourceManager.GetString("TCE_UnexpectedDescribeParamFormatAttestationInfo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internal error. The result returned by &apos;{0}&apos; is invalid. The parameter metadata resultset is missing..
-        /// </summary>
-        internal static string TCE_UnexpectedDescribeParamFormatParameterMetadata {
-            get {
-                return ResourceManager.GetString("TCE_UnexpectedDescribeParamFormatParameterMetadata", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Encryption algorithm &apos;{0}&apos; for the column in the database is either invalid or corrupted. Valid algorithms are: {1}..
-        /// </summary>
-        internal static string TCE_UnknownColumnEncryptionAlgorithm {
-            get {
-                return ResourceManager.GetString("TCE_UnknownColumnEncryptionAlgorithm", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Encryption algorithm id &apos;{0}&apos; for the column in the database is either invalid or corrupted. Valid encryption algorithm ids are: {1}..
-        /// </summary>
-        internal static string TCE_UnknownColumnEncryptionAlgorithmId {
-            get {
-                return ResourceManager.GetString("TCE_UnknownColumnEncryptionAlgorithmId", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Failed to decrypt a column encryption key. Invalid key store provider name: &apos;{0}&apos;. A key store provider name must denote either a system key store provider or a registered custom key store provider. Valid system key store provider names are: {1}. Valid (currently registered) custom key store provider names are: {2}. Please verify key store provider information in column master key definitions in the database, and verify all custom key store providers used in your application are registered properly..
-        /// </summary>
-        internal static string TCE_UnrecognizedKeyStoreProviderName {
-            get {
-                return ResourceManager.GetString("TCE_UnrecognizedKeyStoreProviderName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Encryption and decryption of data type &apos;{0}&apos; is not supported..
-        /// </summary>
-        internal static string TCE_UnsupportedDatatype {
-            get {
-                return ResourceManager.GetString("TCE_UnsupportedDatatype", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidKeyEncryptionAlgorithm", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Normalization version &apos;{0}&apos; received from {2} is not supported. Valid normalization versions are: {1}..
+        ///   Looks up a localized string similar to Internal error. Invalid key encryption algorithm specified: &apos;{0}&apos;. Expected value: &apos;{1}&apos;..
         /// </summary>
-        internal static string TCE_UnsupportedNormalizationVersion {
+        internal static string TCE_InvalidKeyEncryptionAlgorithmSysErr {
             get {
-                return ResourceManager.GetString("TCE_UnsupportedNormalizationVersion", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidKeyEncryptionAlgorithmSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column master key path &apos;{0}&apos; received from server &apos;{1}&apos; is not a trusted key path..
+        ///   Looks up a localized string similar to Internal Error. The given key id &apos;{0}&apos; is not valid. Error occurred when converting the key id to unsigned short. Error Message: {1}.
         /// </summary>
-        internal static string TCE_UntrustedKeyPath {
+        internal static string TCE_InvalidKeyIdUnableToCastToUnsignedShort {
             get {
-                return ResourceManager.GetString("TCE_UntrustedKeyPath", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidKeyIdUnableToCastToUnsignedShort", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot encrypt. Encrypting resulted in {0} bytes of ciphertext which exceeds the maximum allowed limit of {1} bytes. The specified plaintext value is likely too large (plaintext size is: {2} bytes)..
+        ///   Looks up a localized string similar to The column encryption key has been successfully decrypted but its length: {1} does not match the length: {2} for algorithm &apos;{0}&apos;. Verify the encrypted value of the column encryption key in the database..
         /// </summary>
-        internal static string TCE_VeryLargeCiphertext {
+        internal static string TCE_InvalidKeySize {
             get {
-                return ResourceManager.GetString("TCE_VeryLargeCiphertext", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidKeySize", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to check if the enclave is running in the production mode. Contact Customer Support Services..
+        ///   Looks up a localized string similar to Invalid key store provider name: &apos;{0}&apos;. A key store provider name must denote either a system key store provider or a registered custom key store provider. Valid system key store provider names are: {1}. Valid (currently registered) custom key store provider names are: {2}. Please verify key store provider information in column master key definitions in the database, and verify all custom key store providers used in your application are registered properly..
         /// </summary>
-        internal static string VerifyEnclaveDebuggable {
+        internal static string TCE_InvalidKeyStoreProviderName {
             get {
-                return ResourceManager.GetString("VerifyEnclaveDebuggable", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidKeyStoreProviderName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Could not verify enclave policy due to a difference between the expected and actual values of the policy on property &apos;{0}&apos;. Actual: &apos;{1}&apos;, Expected: &apos;{2}&apos; - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details..
+        ///   Looks up a localized string similar to The specified encrypted column encryption key signature does not match the signature computed with the column master key ({0}) in &apos;{1}&apos;. The encrypted column encryption key may be corrupt, or the specified path may be incorrect..
         /// </summary>
-        internal static string VerifyEnclavePolicyFailedFormat {
+        internal static string TCE_InvalidSignature {
             get {
-                return ResourceManager.GetString("VerifyEnclavePolicyFailedFormat", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidSignature", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Signature verification of the enclave report failed. The report signature does not match the signature computed using the HGS root certificate. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services..
+        ///   Looks up a localized string similar to The specified encrypted column encryption key&apos;s signature length: {0} does not match the signature length: {1} when using column master key ({2}) in &apos;{3}&apos;. The encrypted column encryption key may be corrupt, or the specified {4} path may be incorrect..
         /// </summary>
-        internal static string VerifyEnclaveReportFailed {
+        internal static string TCE_InvalidSignatureInEncryptedCEK {
             get {
-                return ResourceManager.GetString("VerifyEnclaveReportFailed", resourceCulture);
+                return ResourceManager.GetString("TCE_InvalidSignatureInEncryptedCEK", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The enclave report received from SQL Server is not in the correct format. Contact Customer Support Services..
+        ///   Looks up a localized string similar to Failed to decrypt a column encryption key using key store provider: &apos;{0}&apos;. Verify the properties of the column encryption key and its column master key in your database. The last 10 bytes of the encrypted column encryption key are: &apos;{1}&apos;..
         /// </summary>
-        internal static string VerifyEnclaveReportFormatFailed {
+        internal static string TCE_KeyDecryptionFailed {
             get {
-                return ResourceManager.GetString("VerifyEnclaveReportFormatFailed", resourceCulture);
+                return ResourceManager.GetString("TCE_KeyDecryptionFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to build a chain of trust between the enclave host&apos;s health report and the HGS root certificate for attestation URL &apos;{0}&apos; with status: &apos;{1}&apos;. Verify the attestation URL matches the URL configured on the SQL Server - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If both the client and SQL Server use the same attestation service, contact Customer Support Services..
+        ///   Looks up a localized string similar to Failed to decrypt a column encryption key using key store provider: &apos;{0}&apos;. The last 10 bytes of the encrypted column encryption key are: &apos;{1}&apos;..
         /// </summary>
-        internal static string VerifyHealthCertificateChainFormat {
+        internal static string TCE_KeyDecryptionFailedCertStore {
             get {
-                return ResourceManager.GetString("VerifyHealthCertificateChainFormat", resourceCulture);
+                return ResourceManager.GetString("TCE_KeyDecryptionFailedCertStore", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The value of attribute &apos;{0}&apos; should be &apos;{1}&apos; or &apos;{2}&apos;..
+        ///   Looks up a localized string similar to Specified certificate path has {0} bytes, which exceeds maximum length of {1} bytes..
         /// </summary>
-        internal static string Xml_AttributeValues {
+        internal static string TCE_LargeCertificatePathLength {
             get {
-                return ResourceManager.GetString("Xml_AttributeValues", resourceCulture);
+                return ResourceManager.GetString("TCE_LargeCertificatePathLength", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot convert &apos;{0}&apos; to type &apos;{1}&apos;..
+        ///   Looks up a localized string similar to Internal error. Specified certificate path has {0} bytes, which exceeds maximum length of {1} bytes..
         /// </summary>
-        internal static string Xml_CannotConvert {
+        internal static string TCE_LargeCertificatePathLengthSysErr {
             get {
-                return ResourceManager.GetString("Xml_CannotConvert", resourceCulture);
+                return ResourceManager.GetString("TCE_LargeCertificatePathLengthSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to proceed with deserialization. Data does not implement IXMLSerializable, therefore polymorphism is not supported..
+        ///   Looks up a localized string similar to Internal error. Error occurred when parsing the results of &apos;{0}&apos;. The attestation information resultset is expected to contain only one row, but it contains multiple rows..
         /// </summary>
-        internal static string Xml_CanNotDeserializeObjectType {
+        internal static string TCE_MultipleRowsReturnedForAttestationInfo {
             get {
-                return ResourceManager.GetString("Xml_CanNotDeserializeObjectType", resourceCulture);
+                return ResourceManager.GetString("TCE_MultipleRowsReturnedForAttestationInfo", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataSet cannot instantiate an abstract ComplexType for the node {0}..
+        ///   Looks up a localized string similar to Error occurred when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations.  Enclave type is &apos;{0}&apos;. .
         /// </summary>
-        internal static string Xml_CannotInstantiateAbstract {
+        internal static string TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage {
             get {
-                return ResourceManager.GetString("Xml_CannotInstantiateAbstract", resourceCulture);
+                return ResourceManager.GetString("TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataSet doesn&apos;t allow the circular reference in the ComplexType named &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Error occurred when reading &apos;{0}&apos; resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations.  Enclave type is &apos;{1}&apos;. .
         /// </summary>
-        internal static string Xml_CircularComplexType {
+        internal static string TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe {
             get {
-                return ResourceManager.GetString("Xml_CircularComplexType", resourceCulture);
+                return ResourceManager.GetString("TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Column name &apos;{0}&apos; is defined for different mapping types..
+        ///   Looks up a localized string similar to {0} instance in use does not support column encryption..
         /// </summary>
-        internal static string Xml_ColumnConflict {
+        internal static string TCE_NotSupportedByServer {
             get {
-                return ResourceManager.GetString("Xml_ColumnConflict", resourceCulture);
+                return ResourceManager.GetString("TCE_NotSupportedByServer", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataTable does not support schema inference from Xml..
+        ///   Looks up a localized string similar to Internal Error. Null argument &apos;{0}&apos; specified when constructing an object of type &apos;{1}&apos;. &apos;{0}&apos; cannot be null..
         /// </summary>
-        internal static string Xml_DataTableInferenceNotSupported {
+        internal static string TCE_NullArgumentInConstructorInternal {
             get {
-                return ResourceManager.GetString("Xml_DataTableInferenceNotSupported", resourceCulture);
+                return ResourceManager.GetString("TCE_NullArgumentInConstructorInternal", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Data type not defined..
+        ///   Looks up a localized string similar to Internal Error. Argument &apos;{0}&apos; cannot be null when executing method &apos;{1}.{2}&apos;..
         /// </summary>
-        internal static string Xml_DatatypeNotDefined {
+        internal static string TCE_NullArgumentInternal {
             get {
-                return ResourceManager.GetString("Xml_DatatypeNotDefined", resourceCulture);
+                return ResourceManager.GetString("TCE_NullArgumentInternal", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The constraint name {0} is already used in the schema..
+        ///   Looks up a localized string similar to Certificate path cannot be null. Use the following format: &lt;certificate location&gt;{2}&lt;certificate store&gt;{2}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{0}&apos; or &apos;{1}&apos;..
         /// </summary>
-        internal static string Xml_DuplicateConstraint {
+        internal static string TCE_NullCertificatePath {
             get {
-                return ResourceManager.GetString("Xml_DuplicateConstraint", resourceCulture);
+                return ResourceManager.GetString("TCE_NullCertificatePath", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataSet will not serialize types that implement IDynamicMetaObjectProvider but do not also implement IXmlSerializable..
+        ///   Looks up a localized string similar to Certificate path cannot be null. Use the following format: &lt;certificate location&gt;{1}&lt;certificate store&gt;{1}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{0}&apos;..
         /// </summary>
-        internal static string Xml_DynamicWithoutXmlSerializable {
+        internal static string TCE_NullCertificatePath_Unix {
             get {
-                return ResourceManager.GetString("Xml_DynamicWithoutXmlSerializable", resourceCulture);
+                return ResourceManager.GetString("TCE_NullCertificatePath_Unix", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot find ElementType name=&apos;{0}&apos;..
+        ///   Looks up a localized string similar to Internal error. Certificate path cannot be null. Use the following format: &lt;certificate location&gt;{2}&lt;certificate store&gt;{2}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is either &apos;{0}&apos; or &apos;{1}&apos;..
         /// </summary>
-        internal static string Xml_ElementTypeNotFound {
+        internal static string TCE_NullCertificatePathSysErr {
             get {
-                return ResourceManager.GetString("Xml_ElementTypeNotFound", resourceCulture);
+                return ResourceManager.GetString("TCE_NullCertificatePathSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataSet cannot expand entities. Use XmlValidatingReader and set the EntityHandling property accordingly..
+        ///   Looks up a localized string similar to Internal error. Certificate path cannot be null. Use the following format: &lt;certificate location&gt;{1}&lt;certificate store&gt;{1}&lt;certificate thumbprint&gt;, where &lt;certificate location&gt; is &apos;{0}&apos;..
         /// </summary>
-        internal static string Xml_FoundEntity {
+        internal static string TCE_NullCertificatePathSysErr_Unix {
             get {
-                return ResourceManager.GetString("Xml_FoundEntity", resourceCulture);
+                return ResourceManager.GetString("TCE_NullCertificatePathSysErr_Unix", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid XPath selection inside field node. Cannot find: {0}..
+        ///   Looks up a localized string similar to Internal error. Ciphertext value cannot be null..
         /// </summary>
-        internal static string Xml_InvalidField {
+        internal static string TCE_NullCipherText {
             get {
-                return ResourceManager.GetString("Xml_InvalidField", resourceCulture);
+                return ResourceManager.GetString("TCE_NullCipherText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid &apos;Key&apos; node inside constraint named: {0}..
+        ///   Looks up a localized string similar to Column master key path cannot be null. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{0}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string Xml_InvalidKey {
+        internal static string TCE_NullCngPath {
             get {
-                return ResourceManager.GetString("Xml_InvalidKey", resourceCulture);
+                return ResourceManager.GetString("TCE_NullCngPath", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Prefix &apos;{0}&apos; is not valid, because it contains special characters..
+        ///   Looks up a localized string similar to Internal error. Column master key path cannot be null. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation (CNG) provider: &lt;CNG Provider Name&gt;{0}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string Xml_InvalidPrefix {
+        internal static string TCE_NullCngPathSysErr {
             get {
-                return ResourceManager.GetString("Xml_InvalidPrefix", resourceCulture);
+                return ResourceManager.GetString("TCE_NullCngPathSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid XPath selection inside selector node: {0}..
+        ///   Looks up a localized string similar to Internal error. Encryption algorithm cannot be null. Valid algorithms are: {0}..
         /// </summary>
-        internal static string Xml_InvalidSelector {
+        internal static string TCE_NullColumnEncryptionAlgorithm {
             get {
-                return ResourceManager.GetString("Xml_InvalidSelector", resourceCulture);
+                return ResourceManager.GetString("TCE_NullColumnEncryptionAlgorithm", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to IsDataSet attribute is missing in input Schema..
+        ///   Looks up a localized string similar to Column encryption key cannot be null..
         /// </summary>
-        internal static string Xml_IsDataSetAttributeMissingInSchema {
+        internal static string TCE_NullColumnEncryptionKey {
             get {
-                return ResourceManager.GetString("Xml_IsDataSetAttributeMissingInSchema", resourceCulture);
+                return ResourceManager.GetString("TCE_NullColumnEncryptionKey", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Duplicated declaration &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Internal error. Column encryption key cannot be null..
         /// </summary>
-        internal static string Xml_MergeDuplicateDeclaration {
+        internal static string TCE_NullColumnEncryptionKeySysErr {
             get {
-                return ResourceManager.GetString("Xml_MergeDuplicateDeclaration", resourceCulture);
+                return ResourceManager.GetString("TCE_NullColumnEncryptionKeySysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid Relation definition: different length keys..
+        ///   Looks up a localized string similar to Column master key path cannot be null. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{0}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string Xml_MismatchKeyLength {
+        internal static string TCE_NullCspPath {
             get {
-                return ResourceManager.GetString("Xml_MismatchKeyLength", resourceCulture);
+                return ResourceManager.GetString("TCE_NullCspPath", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid {0} syntax: missing required &apos;{1}&apos; attribute..
+        ///   Looks up a localized string similar to Internal error. Column master key path cannot be null. Use the following format for a key stored in a Microsoft cryptographic service provider (CSP): &lt;CSP Provider Name&gt;{0}&lt;Key Identifier&gt;..
         /// </summary>
-        internal static string Xml_MissingAttribute {
+        internal static string TCE_NullCspPathSysErr {
             get {
-                return ResourceManager.GetString("Xml_MissingAttribute", resourceCulture);
+                return ResourceManager.GetString("TCE_NullCspPathSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Missing &apos;{0}&apos; part in &apos;{1}&apos; constraint named &apos;{2}&apos;..
+        ///   Looks up a localized string similar to Column encryption key store provider dictionary cannot be null. Expecting a non-null value..
         /// </summary>
-        internal static string Xml_MissingRefer {
+        internal static string TCE_NullCustomKeyStoreProviderDictionary {
             get {
-                return ResourceManager.GetString("Xml_MissingRefer", resourceCulture);
+                return ResourceManager.GetString("TCE_NullCustomKeyStoreProviderDictionary", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot load diffGram. The &apos;sql&apos; node is missing..
+        ///   Looks up a localized string similar to Internal Error. Enclave package is null during execution of an enclave based query. Enclave type is &apos;{0}&apos; and enclaveAttestationUrl is &apos;{1}&apos;..
         /// </summary>
-        internal static string Xml_MissingSQL {
+        internal static string TCE_NullEnclavePackageForEnclaveBasedQuery {
             get {
-                return ResourceManager.GetString("Xml_MissingSQL", resourceCulture);
+                return ResourceManager.GetString("TCE_NullEnclavePackageForEnclaveBasedQuery", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot load diffGram. Table &apos;{0}&apos; is missing in the destination dataset..
+        ///   Looks up a localized string similar to Internal Error. Enclave session is null during query execution. Enclave type is &apos;{0}&apos; and enclaveAttestationUrl is &apos;{1}&apos;..
         /// </summary>
-        internal static string Xml_MissingTable {
+        internal static string TCE_NullEnclaveSessionDuringQueryExecution {
             get {
-                return ResourceManager.GetString("Xml_MissingTable", resourceCulture);
+                return ResourceManager.GetString("TCE_NullEnclaveSessionDuringQueryExecution", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot proceed with serializing DataTable &apos;{0}&apos;. It contains a DataRow which has multiple parent rows on the same Foreign Key..
+        ///   Looks up a localized string similar to Unable to communicate with the enclave. Null enclave session information received from the enclave provider. Enclave type is &apos;{0}&apos; and enclave attestation URL is &apos;{1}&apos;..
         /// </summary>
-        internal static string Xml_MultipleParentRows {
+        internal static string TCE_NullEnclaveSessionReturnedFromProvider {
             get {
-                return ResourceManager.GetString("Xml_MultipleParentRows", resourceCulture);
+                return ResourceManager.GetString("TCE_NullEnclaveSessionReturnedFromProvider", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to An error occurred with the multiple target converter while writing an Xml Schema.  A null or empty string was returned..
+        ///   Looks up a localized string similar to Internal error. Encrypted column encryption key cannot be null..
         /// </summary>
-        internal static string Xml_MultipleTargetConverterEmpty {
+        internal static string TCE_NullEncryptedColumnEncryptionKey {
             get {
-                return ResourceManager.GetString("Xml_MultipleTargetConverterEmpty", resourceCulture);
+                return ResourceManager.GetString("TCE_NullEncryptedColumnEncryptionKey", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to An error occurred with the multiple target converter while writing an Xml Schema.  See the inner exception for details..
+        ///   Looks up a localized string similar to Key encryption algorithm cannot be null..
         /// </summary>
-        internal static string Xml_MultipleTargetConverterError {
+        internal static string TCE_NullKeyEncryptionAlgorithm {
             get {
-                return ResourceManager.GetString("Xml_MultipleTargetConverterError", resourceCulture);
+                return ResourceManager.GetString("TCE_NullKeyEncryptionAlgorithm", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Circular reference in self-nested table &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Internal error. Key encryption algorithm cannot be null..
         /// </summary>
-        internal static string Xml_NestedCircular {
+        internal static string TCE_NullKeyEncryptionAlgorithmSysErr {
             get {
-                return ResourceManager.GetString("Xml_NestedCircular", resourceCulture);
+                return ResourceManager.GetString("TCE_NullKeyEncryptionAlgorithmSysErr", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Type &apos;{0}&apos; does not implement IXmlSerializable interface therefore can not proceed with serialization..
+        ///   Looks up a localized string similar to Internal error. Plaintext value cannot be null..
         /// </summary>
-        internal static string Xml_PolymorphismNotSupported {
+        internal static string TCE_NullPlainText {
             get {
-                return ResourceManager.GetString("Xml_PolymorphismNotSupported", resourceCulture);
+                return ResourceManager.GetString("TCE_NullPlainText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Child table key is missing in relation &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Null reference specified for key store provider &apos;{0}&apos;. Expecting a non-null value..
         /// </summary>
-        internal static string Xml_RelationChildKeyMissing {
+        internal static string TCE_NullProviderValue {
             get {
-                return ResourceManager.GetString("Xml_RelationChildKeyMissing", resourceCulture);
+                return ResourceManager.GetString("TCE_NullProviderValue", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Child table name is missing in relation &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Internal Error. Failed to serialize keys to be sent to the enclave. The start offset specified by argument &apos;{0}&apos; for method {1}.{2} is out of bounds..
         /// </summary>
-        internal static string Xml_RelationChildNameMissing {
+        internal static string TCE_OffsetOutOfBounds {
             get {
-                return ResourceManager.GetString("Xml_RelationChildNameMissing", resourceCulture);
+                return ResourceManager.GetString("TCE_OffsetOutOfBounds", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parent table name is missing in relation &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Failed to decrypt parameter &apos;{0}&apos;..
         /// </summary>
-        internal static string Xml_RelationParentNameMissing {
+        internal static string TCE_ParamDecryptionFailed {
             get {
-                return ResourceManager.GetString("Xml_RelationParentNameMissing", resourceCulture);
+                return ResourceManager.GetString("TCE_ParamDecryptionFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Parent table key is missing in relation &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Failed to encrypt parameter &apos;{0}&apos;..
         /// </summary>
-        internal static string Xml_RelationTableKeyMissing {
+        internal static string TCE_ParamEncryptionFailed {
             get {
-                return ResourceManager.GetString("Xml_RelationTableKeyMissing", resourceCulture);
+                return ResourceManager.GetString("TCE_ParamEncryptionFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DataSet doesn&apos;t support &apos;union&apos; or &apos;list&apos; as simpleType..
+        ///   Looks up a localized string similar to Internal error. Metadata for parameter &apos;{1}&apos; in statement or procedure &apos;{2}&apos; is missing in resultset returned by {0}..
         /// </summary>
-        internal static string Xml_SimpleTypeNotSupported {
+        internal static string TCE_ParamEncryptionMetaDataMissing {
             get {
-                return ResourceManager.GetString("Xml_SimpleTypeNotSupported", resourceCulture);
+                return ResourceManager.GetString("TCE_ParamEncryptionMetaDataMissing", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot determine the DataSet Element. IsDataSet attribute exist more than once..
+        ///   Looks up a localized string similar to Cannot set {0} for {3} &apos;{1}&apos; because encryption is not enabled for the statement or procedure &apos;{2}&apos;..
         /// </summary>
-        internal static string Xml_TooManyIsDataSetAttributeInSchema {
+        internal static string TCE_ParamInvalidForceColumnEncryptionSetting {
             get {
-                return ResourceManager.GetString("Xml_TooManyIsDataSetAttributeInSchema", resourceCulture);
+                return ResourceManager.GetString("TCE_ParamInvalidForceColumnEncryptionSetting", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Undefined data type: &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Cannot execute statement or procedure &apos;{1}&apos; because {2} was set for {3} &apos;{0}&apos; and the database expects this parameter to be sent as plaintext. This may be due to a configuration error..
         /// </summary>
-        internal static string Xml_UndefinedDatatype {
+        internal static string TCE_ParamUnExpectedEncryptionMetadata {
             get {
-                return ResourceManager.GetString("Xml_UndefinedDatatype", resourceCulture);
+                return ResourceManager.GetString("TCE_ParamUnExpectedEncryptionMetadata", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Value &apos;{1}&apos; is invalid for attribute &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Internal error. Metadata for parameters for command &apos;{1}&apos; in a batch is missing in the resultset returned by {0}..
         /// </summary>
-        internal static string Xml_ValueOutOfRange {
+        internal static string TCE_ProcEncryptionMetaDataMissing {
             get {
-                return ResourceManager.GetString("Xml_ValueOutOfRange", resourceCulture);
+                return ResourceManager.GetString("TCE_ProcEncryptionMetaDataMissing", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Could not find an empty slot in the connection pool..
+        ///   Looks up a localized string similar to Retrieving encrypted column &apos;{0}&apos; with {1} is not supported..
         /// </summary>
-        internal static string SQL_ConnectionPoolNoEmptySlot {
+        internal static string TCE_SequentialAccessNotSupportedOnEncryptedColumn {
             get {
-                return ResourceManager.GetString("SQL_ConnectionPoolNoEmptySlot", resourceCulture);
+                return ResourceManager.GetString("TCE_SequentialAccessNotSupportedOnEncryptedColumn", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The connection pool has been shut down..
+        ///   Looks up a localized string similar to Column encryption setting for the command. Overrides the connection level default..
         /// </summary>
-        internal static string SQL_ConnectionPoolShutDown {
+        internal static string TCE_SqlCommand_ColumnEncryptionSetting {
             get {
-                return ResourceManager.GetString("SQL_ConnectionPoolShutDown", resourceCulture);
+                return ResourceManager.GetString("TCE_SqlCommand_ColumnEncryptionSetting", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot get RequiredLength when HasDataLength is false..
+        ///   Looks up a localized string similar to Defines the time-to-live of entries in the column encryption key cache..
         /// </summary>
-        internal static string SQL_Packet_RequiredLengthUnavailable {
+        internal static string TCE_SqlConnection_ColumnEncryptionKeyCacheTtl {
             get {
-                return ResourceManager.GetString("SQL_Packet_RequiredLengthUnavailable", resourceCulture);
+                return ResourceManager.GetString("TCE_SqlConnection_ColumnEncryptionKeyCacheTtl", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Partial packet cannot be non-null when setting to non-null..
+        ///   Looks up a localized string similar to Defines whether query metadata caching is enabled..
         /// </summary>
-        internal static string SQL_Multiplexer_PartialPacketNotNull {
+        internal static string TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled {
             get {
-                return ResourceManager.GetString("SQL_Multiplexer_PartialPacketNotNull", resourceCulture);
+                return ResourceManager.GetString("TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to MultiplexPackets cannot return both consumePartialPacket and consumeInputDirectly..
+        ///   Looks up a localized string similar to Dictionary object containing SQL Server names and their trusted column master key paths..
         /// </summary>
-        internal static string SQL_Multiplexer_ConflictingConsumeModes {
+        internal static string TCE_SqlConnection_TrustedColumnMasterKeyPaths {
             get {
-                return ResourceManager.GetString("SQL_Multiplexer_ConflictingConsumeModes", resourceCulture);
+                return ResourceManager.GetString("TCE_SqlConnection_TrustedColumnMasterKeyPaths", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Attempted to pend a read when the fail async pends test hook was enabled..
+        ///   Looks up a localized string similar to Retrieving encrypted column &apos;{0}&apos; as a {1} is not supported..
         /// </summary>
-        internal static string SQL_FailAsyncPendsEnabled {
+        internal static string TCE_StreamNotSupportOnEncryptedColumn {
             get {
-                return ResourceManager.GetString("SQL_FailAsyncPendsEnabled", resourceCulture);
+                return ResourceManager.GetString("TCE_StreamNotSupportOnEncryptedColumn", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Packet modification detected. Hash is null but packet contains non-null buffer..
+        ///   Looks up a localized string similar to Unable to verify a column master key signature. Error message: {0} .
         /// </summary>
-        internal static string SQL_PacketHashNullWithNonNullBuffer {
+        internal static string TCE_UnableToVerifyColumnMasterKeySignature {
             get {
-                return ResourceManager.GetString("SQL_PacketHashNullWithNonNullBuffer", resourceCulture);
+                return ResourceManager.GetString("TCE_UnableToVerifyColumnMasterKeySignature", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Packet modification detected. Hash from packet creation does not match hash from packet check..
+        ///   Looks up a localized string similar to Internal error. The result returned by &apos;{0}&apos; is invalid. The attestation information resultset is missing for enclave type &apos;{1}&apos;. .
         /// </summary>
-        internal static string SQL_PacketHashMismatch {
+        internal static string TCE_UnexpectedDescribeParamFormatAttestationInfo {
             get {
-                return ResourceManager.GetString("SQL_PacketHashMismatch", resourceCulture);
+                return ResourceManager.GetString("TCE_UnexpectedDescribeParamFormatAttestationInfo", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot transition from state &apos;{0}&apos; to &apos;{1}&apos;..
+        ///   Looks up a localized string similar to Internal error. The result returned by &apos;{0}&apos; is invalid. The parameter metadata resultset is missing..
         /// </summary>
-        internal static string SQL_ActiveDirectoryInvalidStateTransition {
+        internal static string TCE_UnexpectedDescribeParamFormatParameterMetadata {
             get {
-                return ResourceManager.GetString("SQL_ActiveDirectoryInvalidStateTransition", resourceCulture);
+                return ResourceManager.GetString("TCE_UnexpectedDescribeParamFormatParameterMetadata", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unsupported state: &apos;{0}&apos;..
+        ///   Looks up a localized string similar to Encryption algorithm &apos;{0}&apos; for the column in the database is either invalid or corrupted. Valid algorithms are: {1}..
         /// </summary>
-        internal static string SQL_ActiveDirectoryUnsupportedState {
+        internal static string TCE_UnknownColumnEncryptionAlgorithm {
             get {
-                return ResourceManager.GetString("SQL_ActiveDirectoryUnsupportedState", resourceCulture);
+                return ResourceManager.GetString("TCE_UnknownColumnEncryptionAlgorithm", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to create SqlRetryLogicBaseProvider object because the retryMethod value is null or empty..
+        ///   Looks up a localized string similar to Encryption algorithm id &apos;{0}&apos; for the column in the database is either invalid or corrupted. Valid encryption algorithm ids are: {1}..
         /// </summary>
-        internal static string SQLCR_RetryMethodNullOrEmpty {
+        internal static string TCE_UnknownColumnEncryptionAlgorithmId {
             get {
-                return ResourceManager.GetString("SQLCR_RetryMethodNullOrEmpty", resourceCulture);
+                return ResourceManager.GetString("TCE_UnknownColumnEncryptionAlgorithmId", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Exception occurred when running the &apos;{0}.{1}()&apos; method..
+        ///   Looks up a localized string similar to Failed to decrypt a column encryption key. Invalid key store provider name: &apos;{0}&apos;. A key store provider name must denote either a system key store provider or a registered custom key store provider. Valid system key store provider names are: {1}. Valid (currently registered) custom key store provider names are: {2}. Please verify key store provider information in column master key definitions in the database, and verify all custom key store providers used in your application are registered properly..
         /// </summary>
-        internal static string SQLCR_RetryMethodException {
+        internal static string TCE_UnrecognizedKeyStoreProviderName {
             get {
-                return ResourceManager.GetString("SQLCR_RetryMethodException", resourceCulture);
+                return ResourceManager.GetString("TCE_UnrecognizedKeyStoreProviderName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to resolve the &apos;{0}&apos; method from &apos;{1}&apos; type..
+        ///   Looks up a localized string similar to Encryption and decryption of data type &apos;{0}&apos; is not supported..
         /// </summary>
-        internal static string SQLCR_ResolveMethodFailed {
+        internal static string TCE_UnsupportedDatatype {
             get {
-                return ResourceManager.GetString("SQLCR_ResolveMethodFailed", resourceCulture);
+                return ResourceManager.GetString("TCE_UnsupportedDatatype", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid return type; return type must be of &apos;{0}&apos; type..
+        ///   Looks up a localized string similar to Normalization version &apos;{0}&apos; received from {2} is not supported. Valid normalization versions are: {1}..
         /// </summary>
-        internal static string SQLCR_InvalidReturnType {
+        internal static string TCE_UnsupportedNormalizationVersion {
             get {
-                return ResourceManager.GetString("SQLCR_InvalidReturnType", resourceCulture);
+                return ResourceManager.GetString("TCE_UnsupportedNormalizationVersion", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to create SqlRetryLogicBaseProvider object because of invalid &apos;{0}&apos; parameters.{1}The function must have a parameter of type &apos;SqlRetryLogicOption&apos;..
+        ///   Looks up a localized string similar to Column master key path &apos;{0}&apos; received from server &apos;{1}&apos; is not a trusted key path..
         /// </summary>
-        internal static string SQLCR_InvalidRetryParameters {
+        internal static string TCE_UntrustedKeyPath {
             get {
-                return ResourceManager.GetString("SQLCR_InvalidRetryParameters", resourceCulture);
+                return ResourceManager.GetString("TCE_UntrustedKeyPath", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Failed to create SqlRetryLogicBaseProvider object because of invalid retryMethod parameters.{0}Parameter &apos;{1} {2}&apos; doesn&apos;t have a default value..
+        ///   Looks up a localized string similar to Failed to check if the enclave is running in the production mode. Contact Customer Support Services..
         /// </summary>
-        internal static string SQLCR_InvalidParameterNoDefault {
+        internal static string VerifyEnclaveDebuggable {
             get {
-                return ResourceManager.GetString("SQLCR_InvalidParameterNoDefault", resourceCulture);
+                return ResourceManager.GetString("VerifyEnclaveDebuggable", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sequence contains more than one matching element..
+        ///   Looks up a localized string similar to Could not verify enclave policy due to a difference between the expected and actual values of the policy on property &apos;{0}&apos;. Actual: &apos;{1}&apos;, Expected: &apos;{2}&apos; - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details..
         /// </summary>
-        internal static string SQLCR_SequenceMoreThanOneMatch {
+        internal static string VerifyEnclavePolicyFailedFormat {
             get {
-                return ResourceManager.GetString("SQLCR_SequenceMoreThanOneMatch", resourceCulture);
+                return ResourceManager.GetString("VerifyEnclavePolicyFailedFormat", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sequence contains no matching element..
+        ///   Looks up a localized string similar to Signature verification of the enclave report failed. The report signature does not match the signature computed using the HGS root certificate. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services..
         /// </summary>
-        internal static string SQLCR_SequenceNoMatch {
+        internal static string VerifyEnclaveReportFailed {
             get {
-                return ResourceManager.GetString("SQLCR_SequenceNoMatch", resourceCulture);
+                return ResourceManager.GetString("VerifyEnclaveReportFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Can only rent from a pool if an onCreate delegate is available..
+        ///   Looks up a localized string similar to The enclave report received from SQL Server is not in the correct format. Contact Customer Support Services..
         /// </summary>
-        internal static string SQL_ObjectPoolNoCreateDelegate {
+        internal static string VerifyEnclaveReportFormatFailed {
             get {
-                return ResourceManager.GetString("SQL_ObjectPoolNoCreateDelegate", resourceCulture);
+                return ResourceManager.GetString("VerifyEnclaveReportFormatFailed", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The type &apos;{0}&apos; has an invalid size..
+        ///   Looks up a localized string similar to Failed to build a chain of trust between the enclave host&apos;s health report and the HGS root certificate for attestation URL &apos;{0}&apos; with status: &apos;{1}&apos;. Verify the attestation URL matches the URL configured on the SQL Server - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If both the client and SQL Server use the same attestation service, contact Customer Support Services..
         /// </summary>
-        internal static string SQL_InvalidUdtSize {
+        internal static string VerifyHealthCertificateChainFormat {
             get {
-                return ResourceManager.GetString("SQL_InvalidUdtSize", resourceCulture);
+                return ResourceManager.GetString("VerifyHealthCertificateChainFormat", resourceCulture);
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
index 0006d91c9d..ca9dcf0a93 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>Ascending</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Invalid index {0} for this {1} with Count={2}.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>The {0} is already contained by another {1}.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>The {0} with is already contained by this {1}.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>The {0} only accepts non-null {1} type objects.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>Attempted to remove an {0} that is not contained by this {1}.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>The {0}.{1} is required to be unique, '{2}' already exists in the collection.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>The connection was not closed. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>Invalid attempt to call {0} when reader is closed.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>Cannot enlist in the transaction because the connection is the primary connection for a delegated or promoted transaction.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>Descending</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>Expecting non-empty string for '{0}' parameter.</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>The ConnectionString property has not been initialized.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>A Non CLS Exception was caught.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>Given security element is not a permission element.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>Data</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>Update</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>The ConnectionState indicating whether the connection is open or closed.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>Event triggered when the connection changes state.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>The parameter generic type.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>Input, output, or bidirectional parameter.</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>a design-time property used for strongly typed code-generation.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>Offset in variable length data types.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>Name of the parameter.</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>Size of variable length data types (string &amp; arrays).</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>When used by a DataAdapter.Update, the source column name that is used to find the DataSetColumn name in the ColumnMappings. This is to copy a value between the parameter and a data row.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>When used by a DataAdapter.Update (UpdateCommand only), the version of the DataRow value that is used to update the data source.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>When used by DataAdapter.Update, the parameter value is changed from DBNull.Value into (Int32)1 or (Int32)0 if non-null.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>Value of the parameter.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>Unable to build the '{0}' collection because execution of the SQL query failed. See the inner exception for details.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>More restrictions were provided than the requested schema ('{0}') supports.</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>'{2}' is not a valid value for the '{1}' restriction of the '{0}' schema collection.</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>The requested collection ({0}) is not defined.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>The requested collection ({0}) is not supported by this version of the provider.</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>One of the required DataSourceInformation tables columns is missing.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>The DataSourceInformation table must contain exactly one row.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>One or more of the required columns of the restrictions collection is missing.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>A restriction exists for which there is no matching row in the restrictions collection.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>The collection '{0}' is missing from the metadata XML.</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>The metadata XML is invalid.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>The metadata XML is invalid. The {0} collection must contain a {1} column and it must be a string column.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>The metadata XML is invalid. The {1} column of the {0} collection must contain a non-empty string.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>Action</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>Behavior</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>Fill</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>InfoMessage</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>Mapping</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>Notification</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>Schema</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>Pooling</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>Named ConnectionString</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>Security</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>Connection Resiliency</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>The collection that holds custom user information.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>Indicates whether comparing strings within the DataSet is case sensitive.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>The name of this DataSet.</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>Indicates a custom "view" of the data contained by the DataSet. This view allows filtering, searching, and navigating through the custom data view.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>Indicates whether constraint rules are to be followed.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>Indicates that the DataSet has errors.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>Indicates a locale under which to compare strings within the DataSet.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>Indicates the XML uri namespace for the root element pointed at by this DataSet.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>Indicates the prefix of the namespace used for this DataSet.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>The collection that holds the relations for this DataSet.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>The collection that holds the tables for this DataSet.</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>Occurs when it is not possible to merge schemas for two tables with the same name.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Occurs after Initialization is finished.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>Represents an in-memory cache of data.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>Indicates whether comparing strings within the table is case sensitive.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>Returns the child relations for this table.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>The collection that holds the columns for this table.</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>The collection that holds the constraints for this table.</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>Indicates the DataSet to which this table belongs.</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>This is the default DataView for the table.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>The expression used to compute the data-bound value of this row.</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>Returns whether the table has errors.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>Indicates a locale under which to compare strings within the table.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>Indicates an initial starting size for this table.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>Indicates the XML uri namespace for the elements contained in this table.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>Indicates the Prefix of the namespace used for this table in XML representation.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>Returns the parent relations for this table.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>Indicates the column(s) that represent the primary key for this table.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>Indicates the collection that holds the rows of data for this table.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>Indicates the name used to look up this table in the Tables collection of a DataSet.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>Occurs after a row in the table has been successfully edited.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>Occurs when the row is being changed so that the event handler can modify or cancel the change. The user can modify values in the row and should throw an  exception to cancel the edit.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>Occurs after a row in the table has been successfully deleted.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>Occurs when a row in the table marked for deletion.  Throw an exception to cancel the deletion.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>Occurs when a value has been submitted for this column.  The user can modify the proposed value and should throw an exception to cancel the edit.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>Occurs when a value has been changed for this column.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>Occurs prior to clearing all rows from the table.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>Occurs after all rows in the table has been successfully cleared.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>Occurs after a new DataRow has been instantiated.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>The name used to look up this relation in the Relations collection of a DataSet.</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>Indicates the child columns of this relation.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>Indicates the parent columns of this relation.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>Indicates whether relations are nested.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>For deletions, indicates what kind of cascading should take place across this relation.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>For updates, indicates what kind of cascading should take place across this relation.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>For accept and reject changes, indicates what kind of cascading should take place across this relation.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>Indicates the child columns of this constraint.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>Indicates the parent columns of this constraint.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>Indicates the child table of this constraint.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>Indicates the columns of this constraint.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>Indicates if this constraint is a primary key.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>Indicates the name of this constraint.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>Indicates the table of this constraint.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>Indicates whether null values are allowed in this column.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>Indicates whether the column automatically increments itself for new rows added to the table.  The type of this column must be Int16, Int32, or Int64.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>Indicates the starting value for an AutoIncrement column.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>Indicates the increment used by an AutoIncrement column.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>Indicates the default user-interface caption for this column.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>Indicates the name used to look up this column in the Columns collection of a DataTable.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>Returns the DataTable to which this column belongs.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>Indicates the type of data stored in this column.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>Indicates the default column value used when adding new rows to the table.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>Indicates the value that this column computes for each row based on other columns instead of taking user input.</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>Indicates how this column persists in XML: as an attribute, element, simple content node, or nothing.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>Indicates the XML uri for elements or attributes stored in this column.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>Indicates the Prefix used for this DataColumn in xml representation.</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Indicates the index of this column in the Columns collection.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>Indicates whether this column allows changes once a row has been added to the table.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>Indicates whether this column should restrict its values in the rows of the table to be unique.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>Indicates the maximum length of the value this column allows.</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>Indicates DateTimeMode of this DataColumn.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>Indicates whether this DataView and the user interface associated with it allows deletes.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>Indicates whether this DataView and the user interface associated with it allows edits.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>Indicates whether this DataView and the user interface associated with it allows new rows to be added.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>Returns the number of items currently in this view.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>This returns a pointer to back to the DataViewManager that owns this DataSet (if any).</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>Indicates whether the view is open.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>Indicates an expression used to filter the data returned by this DataView.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>Indicates the versions of data returned by this DataView.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>Indicates the names of the column and the order in which data is returned by this DataView.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Indicates whether to use the default sort if the Sort property is not set.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>Indicates the table this DataView uses to get data.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>Indicates that the data returned by this DataView has somehow changed.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>Indicates the source of data for this DataViewManager.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>Indicates the sorting/filtering/state settings for any table in the corresponding DataSet.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet doesn't support 'union' or 'list' as simpleType.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>Invalid {0} syntax: missing required '{1}' attribute.</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>Value '{1}' is invalid for attribute '{0}'.</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>The value of attribute '{0}' should be '{1}' or '{2}'.</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>Cannot find ElementType name='{0}'.</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>Parent table name is missing in relation '{0}'.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>Child table name is missing in relation '{0}'.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>Parent table key is missing in relation '{0}'.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>Child table key is missing in relation '{0}'.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>Undefined data type: '{0}'.</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>Data type not defined.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>Invalid XPath selection inside field node. Cannot find: {0}.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>Invalid XPath selection inside selector node: {0}.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>Invalid 'Key' node inside constraint named: {0}.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>The constraint name {0} is already used in the schema.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>Cannot convert '{0}' to type '{1}'.</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>Missing '{0}' part in '{1}' constraint named '{2}'.</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>Invalid Relation definition: different length keys.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet doesn't allow the circular reference in the ComplexType named '{0}'.</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet cannot instantiate an abstract ComplexType for the node {0}.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>An error occurred with the multiple target converter while writing an Xml Schema.  See the inner exception for details.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>An error occurred with the multiple target converter while writing an Xml Schema.  A null or empty string was returned.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>Duplicated declaration '{0}'.</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>Cannot load diffGram. Table '{0}' is missing in the destination dataset.</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>Cannot load diffGram. The 'sql' node is missing.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>Column name '{0}' is defined for different mapping types.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>Prefix '{0}' is not valid, because it contains special characters.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>Circular reference in self-nested table '{0}'.</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet cannot expand entities. Use XmlValidatingReader and set the EntityHandling property accordingly.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>Type '{0}' does not implement IXmlSerializable interface therefore can not proceed with serialization.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>Unable to proceed with deserialization. Data does not implement IXMLSerializable, therefore polymorphism is not supported.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable does not support schema inference from Xml.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>Cannot proceed with serializing DataTable '{0}'. It contains a DataRow which has multiple parent rows on the same Foreign Key.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>IsDataSet attribute is missing in input Schema.</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>Cannot determine the DataSet Element. IsDataSet attribute exist more than once.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet will not serialize types that implement IDynamicMetaObjectProvider but do not also implement IXmlSerializable.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>The feature not implemented. {0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>Syntax error: Missing operand after '{0}' operator.</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>Type mismatch in expression '{0}'.</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>Expression is too complex.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>Cannot find column [{0}].</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>The expression contains an invalid string constant: {0}.</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>The expression contains undefined function call {0}().</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>Syntax error in the expression.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>Invalid number of arguments: function {0}().</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>The expression is missing the closing parenthesis.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>Cannot interpret token '{0}' at position {1}.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>Expected {0}, but actual token at the position {2} is {1}.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>Cannot convert from {0} to {1}.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>Cannot convert value '{0}' to Type: {1}.</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>Invalid column name [{0}].</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>The expression contains invalid date constant '{0}'.</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>Only constant expressions are allowed in the expression list for the IN operator.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Error in Like operator: the string pattern '{0}' is invalid.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>Syntax error: The items following the IN keyword must be separated by commas and be enclosed in parentheses.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>Type mismatch in function argument: {0}(), argument {1}, expected {2}.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>Type mismatch in function argument: {0}(), argument {1}, expected one of the Integer types.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>Cannot perform '{0}' operation on {1} and {2}.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>Operator '{0}' is ambiguous on operands of type '{1}' and '{2}'. Cannot mix signed and unsigned types. Please use explicit Convert() function.</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>Syntax error: The IN keyword must be followed by a non-empty list of expressions separated by commas, and also must be enclosed in parentheses.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>The expression contains unsupported operator '{0}'.</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>The expression contains invalid name: '{0}'.</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>Syntax error: Missing operand before '{0}' operator.</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>The expression has too many closing parentheses.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>The table [{0}] involved in more than one relation. You must explicitly mention a relation name in the expression '{1}'.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>Syntax error in aggregate argument: Expecting a single column argument with possible 'Child' qualifier.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>Unbound reference in the aggregate expression '{0}'.</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>Cannot evaluate non-constant expression without current row.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>Unbound reference in the expression '{0}'.</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>Cannot evaluate. Expression '{0}' is not an aggregate.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>Filter expression '{0}' does not evaluate to a Boolean term.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>Invalid type name '{0}'.</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>Syntax error in Lookup expression: Expecting keyword 'Parent' followed by a single column argument with possible relation qualifier: Parent[(&lt;relation_name&gt;)].&lt;column_name&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>Need a row or a table to Invoke DataFilter.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>{0}() argument is out of range.</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.</value>
   </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>Syntax error: Invalid usage of 'Is' operator. Correct syntax: &lt;expression&gt; Is [Not] Null.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>Cannot convert object of type '{0}' to object of type '{1}'.</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>Value is either too large or too small for Type '{0}'.</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>The only acceptable value for the property '{0}' is '{1}'.</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>Divide by zero error encountered.</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>The acceptable values for the property '{0}' are '{1}' or '{2}'.</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>Cannot find the parent relation '{0}'.</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>Specified QuotePrefix and QuoteSuffix values do not match.</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>'hours' argument is out of range. Value must be between -14 and +14.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>The length of argument '{0}' exceeds its limit of '{1}'.</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>'minutes' argument is out of range. Value must be between -59 and +59.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>Invalid value for key '{0}'.</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>Provided range for time one exceeds total of 14 hours.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>Use of key '{0}' requires the key '{1}' to be present.</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>Kind property of provided DateTime argument, does not match 'hours' and 'minutes' arguments.</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>The value's length for key '{0}' exceeds its limit of '{1}'.</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>A DataColumn of type '{0}' does not support expression.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>Keyword not supported: '{0}'.</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>Failed to enable constraints. One or more rows contain values violating non-null, unique, or foreign-key constraints.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>Internal .NET Framework Data Provider error {0}.</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>Collection itself is not modifiable.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}".</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>The given name '{0}' matches at least two names in the collection object with different cases, but does not match either of them with the same case.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}", incorrect usage of quotes.</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>The given name '{0}' matches at least two names in the collection object with different namespaces.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}", the current limit of "{2}" is insufficient.</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>SqlBulkCopy.WriteToServer failed because the SqlBulkCopy.DestinationTableName is an invalid multipart name</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>'{0}' argument is out of range.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>Processing of results from SQL Server failed because of an invalid multipart name</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>'{0}' argument cannot be null.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName is an invalid multipart name</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>'{0}' argument contains null value.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName is an invalid multipart name</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>Cannot find column {0}.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>SqlCommand.DeriveParameters failed because the SqlCommand.CommandText property value is an invalid multipart name</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>Column '{0}' already belongs to this DataTable.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>Connecting to a mirrored SQL Server instance using the MultiSubnetFailover connection option is not supported.</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>Column '{0}' already belongs to another DataTable.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>The {0} enumeration value, {1}, is not supported by the {2} method.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>Cannot have more than one SimpleContent columns in a DataTable.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>The {0} enumeration value, {1}, is not supported by the .NET Framework SqlClient Data Provider.</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>Cannot add a SimpleContent column to a table containing element columns or nested relations.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: CommandText property has not been initialized</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>A column named '{0}' already belongs to this DataTable.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: Connection property has not been initialized.</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>Cannot add a column named '{0}': a nested table with the same name already belongs to this DataTable.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} requires an open and available Connection. {1}</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>A column named '{0}' already belongs to this DataTable: cannot set a nested table name to the same name.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>The stored procedure '{0}' doesn't exist.</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>Cannot remove a column that doesn't belong to this table.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>The transaction is either not associated with the current connection or has been completed.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>Cannot remove this column, because it's part of the primary key.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>The transaction associated with the current connection has completed but has not been disposed.  The transaction must be disposed before the connection can be used to execute SQL statements.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>Cannot remove this column, because it is part of the parent key for relationship {0}.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>{0} requires the command to have a transaction when the connection assigned to the command is in a pending local transaction.  The Transaction property of the command has not been initialized.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>Cannot remove this column, because it is a part of the constraint {0} on the table {1}.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>There is already an open DataReader associated with this {0} which must be closed first.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>Cannot remove this column, because it is part of an expression: {0} = {1}.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>{0} DeriveParameters only supports CommandType.StoredProcedure, not CommandType.{1}.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>Cannot set AutoIncrement property for a computed column.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>Cannot set AutoIncrement property for a column with DefaultValue set.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>Cannot set a DefaultValue on an AutoIncrement column.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep must be a non-zero value.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>ColumnName is required when it is part of a DataTable.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>Cannot change DataType of a column once it has data.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>Column requires a valid DataType.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>The DefaultValue for column {0} is of type {1} and cannot be converted to {2}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>The DefaultValue for the column is of type {0} and cannot be converted to {1}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>The DefaultValue for column {0} is of type {1}, but the column is of type {2}.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>Cannot change ReadOnly property for the expression column.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>Cannot change Unique property for the expression column.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>Cannot create an expression on a column that has AutoIncrement or Unique.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>Cannot set expression because column cannot be made ReadOnly.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>Cannot set Expression property on column {0}, because it is a part of a constraint.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>Cannot create a constraint based on Expression column {0}.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>Cannot set Expression property due to circular reference in the expression.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>Column '{0}' has null values in it.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>Column '{0}' does not allow nulls.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>Column '{0}' is read only.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>Column '{0}' contains non-unique values.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>Column '{0}' does not belong to table {1}.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>Column must belong to a table.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>Couldn't store &lt;{0}&gt; in {1} Column.  Expected type is {2}.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>Cannot set Column '{0}' to be null. Please use DBNull instead.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>Cannot set column '{0}'. The value violates the MaxLength limit of this column.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength applies to string data type only. You cannot set Column '{0}' property MaxLength to be non-negative number.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>Cannot set Column '{0}' property MaxLength to '{1}'. There is at least one string in the table longer than the new limit.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Cannot set Column '{0}' property MaxLength. The Column is SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>Cannot set Column '{0}' property DataType to {1}. The Column is SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>Cannot set Column '{0}' property MappingType to SimpleContent. The Column DataType is {1}.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>Column '{0}' exceeds the MaxLength limit.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>Column '{0}' does not allow DBNull.Value.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>Cannot change the Column '{0}' property Namespace. The Column is SimpleContent.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>Cannot change AutoIncrement of a DataColumn with type '{0}' once it has data.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>Column '{0}' does not belong to underlying table '{1}'.</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>DataColumn with type '{0}' is a complexType. Can not serialize value of a complex type as Attribute</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>The DateTimeMode can be set only on DataColumns of type DateTime.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>'{0}' is Invalid DataSetDateTime value.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>Cannot change DateTimeMode from '{0}' to '{1}' once the table has data.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Type '{0}' does not contain static Null property or field.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>Type '{0}' does not implement IRevertibleChangeTracking; therefore can not proceed with RejectChanges().</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>SetAdded and SetModified can only be called on DataRows with Unchanged DataRowState.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>Ordinal '{0}' exceeds the maximum number.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet does not support System.Nullable&lt;&gt;.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>Cannot change the name of a constraint to empty string when it is in the ConstraintCollection.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>Cannot enforce constraints on constraint {0}.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>Column '{0}' is constrained to be unique.  Value '{1}' is already present.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>Constraint '{0}' does not belong to this DataTable.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>Cannot find constraint {0}.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>Constraint matches constraint named {0} already in collection.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>A Constraint named '{0}' already belongs to this DataTable.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>These columns don't currently have unique values.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>These columns don't point to this table.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>This constraint cannot be enabled as not all values have corresponding parent values.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>This constraint cannot be added since ForeignKey doesn't belong to table {0}.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>Cannot remove a constraint that doesn't belong to this table.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>Cannot remove unique constraint '{0}'. Remove foreign key constraint '{1}' first.</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>Cannot delete this row because constraints are enforced on relation {0}, and deleting this row will strand child rows.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>Cannot make this change because constraints are enforced on relation {0}, and changing this value will strand child rows.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>Cannot clear table {0} because ForeignKeyConstraint {1} enforces constraints and there are child rows in {2}.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>ForeignKeyConstraint {0} requires the child key values ({1}) to exist in the parent table.</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>Property not accessible because '{0}'.</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>Cannot remove this row because it has child rows, and constraints on relation {0} are enforced.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>Cannot add primary key constraint since primary key is already set for the table.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>Cannot add constraint to DataTable '{0}' which is a child table in two nested relations.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>Cannot create a Key from Columns that belong to different tables.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>Cannot have 0 columns.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>Cannot have more than {0} columns.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>Cannot create a Key when the same column is listed more than once: '{0}'</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>Cannot remove unique constraint since it's the primary key of a table.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>Cannot remove unique constraint since it's the primary key of table {0}.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>Parent Columns and Child Columns don't have type-matching columns.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey and ChildKey are identical.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns and ChildColumns should be the same length.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns and ChildColumns must not be zero length.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>The row doesn't belong to the same DataSet as this relation.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>RelationName is required when it is part of a DataSet.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows requires a row whose Table is {0}, but the specified row's Table is {1}.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>This relation should connect two tables in this DataSet to be added to this DataSet.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRow requires a row whose Table is {0}, but the specified row's Table is {1}.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow requires a child row whose Table is {0}, but the specified row's Table is {1}.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>Cannot have a relationship between tables in different DataSets.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>Cannot create a relation between tables in different DataSets.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>A relation already exists for these child columns.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>This relation doesn't belong to this relation collection.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>This relation already belongs to another DataSet.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>This relation already belongs to this DataSet.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>A Relation named '{0}' already belongs to this DataSet.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>Relation {0} does not belong to this DataSet.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>Cannot find relation {0}.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>Cannot create a collection on a null table.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>The table this collection displays relations for has been removed from its DataSet.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>Cannot add a relation to this table's ParentRelation collection where this table isn't the child table.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>Cannot add a relation to this table's ChildRelation collection where this table isn't the parent table.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>Cannot set the 'Nested' property to false for this relation.</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>The same table '{0}' cannot be the child table in two nested relations.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>The table ({0}) cannot be the child table to itself in nested relations.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>Cannot add a DataRelation or Constraint that has different Locale or CaseSensitive settings between its parent and child tables.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>Cannot create a DataRelation if Parent or Child Columns are not in a DataSet.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>Nested table '{0}' which inherits its namespace cannot have multiple parent tables in different namespaces.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>Nested table '{0}' with empty namespace cannot have multiple parent tables in different namespaces.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>The row doesn't belong to the same DataSet as this relation.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>Cannot perform this operation on a row not in the table.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>This relation and child row don't belong to same DataSet.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>Cannot change a proposed value in the RowChanging event.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>Cannot call EndEdit() inside an OnRowChanging event.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>Cannot call BeginEdit() inside the RowChanging event.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>Cannot call CancelEdit() inside an OnRowChanging event.  Throw an exception to cancel this update.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>Cannot call Delete inside an OnRowDeleting event.  Throw an exception to cancel this delete.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>Input array is longer than the number of columns in this table.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>There is no Current data to access.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>There is no Original data to access.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>There is no Proposed data to access.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>This row has been removed from a table and does not have any data.  BeginEdit() will allow creation of new data in this row.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>Deleted row information cannot be accessed through the row.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>Version must be Original, Current, or Proposed.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>There is no row at position {0}.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>The row insert position {0} is invalid.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>The rowOrder value={0} has been found twice for table named '{1}'.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>Values are missing in the rowOrder sequence for table '{0}'.</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>The given DataRow is not in the current DataRowCollection.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>This row already belongs to another table.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>This row already belongs to this table.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>Cannot delete this row since it's already deleted.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>This row is empty.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>Cannot remove a row that's already been removed.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>A child row has multiple parents.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>Unrecognized row state bit pattern.</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>Cannot change the name of the DataSet to an empty string.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>The name '{0}' is invalid. A DataSet cannot have the same name of the DataTable.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>The schema namespace is invalid. Please use this one instead: {0}.</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>Cannot change CaseSensitive or Locale property. This change would lead to at least one DataRelation or Constraint to have different Locale or CaseSensitive settings between its related tables.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>SchemaSerializationMode property can be set only if it is overridden by derived DataSet.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>PrimaryKey columns do not belong to this table.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>Cannot add a nested relation or an element column to a table containing a SimpleContent column.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>TableName is required when it is part of a DataSet.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable already has a simple content column.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>Table doesn't have a primary key.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} isn't a valid Sort string entry.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>Cannot serialize the DataTable. A DataTable being used in one or more DataColumn expressions is not a descendant of current DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>This DataTable can only be remoted as part of DataSet. One or more Expression Columns has reference to other DataTable(s).</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>Cannot have different remoting format property value for DataSet and DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>Cannot serialize the DataTable. DataTable name is not set.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>A DataTable named '{0}' already belongs to this DataSet.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>A DataTable named '{0}' with the same Namespace '{1}' already belongs to this DataSet.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>The table ({0}) cannot be the child table to itself in a nested relation: the DataSet name conflicts with the table name.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>The name '{0}' is invalid. A DataTable cannot have the same name of the DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable already belongs to another DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable already belongs to this DataSet.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>Table {0} does not belong to this DataSet.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>Cannot find table {0}.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>Cannot remove a table that has existing relations.  Remove relations first.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>Cannot remove table {0}, because it referenced in ForeignKeyConstraint {1}.  Remove the constraint first.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>DataTable '{0}' does not match to any DataTable in source.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>Target DataSet missing definition for {0}.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>Target DataSet missing {0} {1}.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} and &lt;source&gt;.{0} have conflicting properties: DataType property mismatch.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey and &lt;source&gt;.PrimaryKey have different Length.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>Mismatch columns in the PrimaryKey : &lt;target&gt;.{0} versus &lt;source&gt;.{1}.</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>Relation {0} cannot be merged, because keys have mismatch columns.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>Target table {0} missing definition for column {1}.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>PrimaryKey column {0} does not exist in source Table.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>The RowStates parameter must be set to a valid combination of values from the DataViewRowState enumeration.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Find finds a row based on a Sort order, and no Sort order is specified.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>Expecting {0} value(s) for the key being indexed, but received {1} value(s).</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>Invalid usage of aggregate function {0}() and Type: {1}.</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>Invalid storage type: {0}.</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>The DataSet Xml persistency does not support the value '{0}' as Char value, please use Byte storage instead.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>Type of value has a mismatch with column type</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>Type '{0}' does not implement IComparable interface. Comparison cannot be done.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>Cannot set {0}.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>Cannot change DataSet on a DataViewManager that's already the default view for a DataSet.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter cannot show ModifiedOriginals and ModifiedCurrents at the same time.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>Cannot change Table property on a DefaultView or a DataView coming from a DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>Cannot change DataSet property once it is set.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>DataSet must be set prior to using DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>Cannot change Table property once it is set.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>DataTable must be set prior to using DataView.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>Cannot bind to DataTable with no name.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>Cannot set an object into this list.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>Cannot call AddNew on a DataView where AllowNew is false.</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView is not open.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>The relation is not parented to the table to which this DataView points.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>Cannot delete on a DataSource where AllowDelete is false.</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>Cannot edit on a DataSource where AllowEdit is false.</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>Index {0} is either negative or above rows count.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>Cannot add external objects to this list.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>Cannot clear this list.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>Cannot insert external objects to this list.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>Cannot remove objects not in the list.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} is neither a DataColumn nor a DataRelation for table {1}.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>Min ({0}) must be less than or equal to max ({1}) in a Range object.</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>This is a null range.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>MinimumCapacity must be non-negative.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>Cannot generate identifier for name '{0}'.</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>There is more than one table with the same name '{0}' (even if namespace is different).</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>Column '{0}': Type '{1}' cannot be null.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>Column '{0}': Type '{1}' does not have parameterless constructor.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>Column '{0}': Type '{1}' does not have constructor with string argument.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>Cannot convert object of type '{0}' to object of type '{1}'.</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>Deleted rows inaccessible.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>Duplicate name not allowed.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>Operation not supported in the RowChanging event.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>Invalid constraint.</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>Missing primary key.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Null not allowed.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>Column is marked read only.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>Row not found in table.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>Version not found.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>ReadOnly Data is Modified.</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader is invalid for current DataTable '{0}'.</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>Schema of current DataTable '{0}' in DataTableReader has changed, DataTableReader is invalid.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>DataTableReader Cannot be created. There is no DataTable in DataSet.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>Cannot create DataTableReader. Argument is Empty.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>Cannot create DataTableReader. Arguments contain null value.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>Current DataRow is either in Deleted or Detached state.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>Current DataTable '{0}' is empty. There is no DataRow in DataTable.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>DataTable internal index is corrupted: '{0}'.</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>Collection was modified; enumeration operation might not execute.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>Simple type '{0}' has already be declared with different '{1}'.</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>Invalid foliation.</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>Cannot change the table name once the associated DataSet is mapped to a loaded XML document.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>Cannot change the table namespace once the associated DataSet is mapped to a loaded XML document.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>Cannot change the column name once the associated DataSet is mapped to a loaded XML document.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>Cannot change the column namespace once the associated DataSet is mapped to a loaded XML document.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>Cannot change the ColumnMapping property once the associated DataSet is mapped to a loaded XML document.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>Cannot add or remove columns from the table once the DataSet is mapped to a loaded XML document.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>Cannot add or remove tables from the DataSet once the DataSet is mapped to a loaded XML document.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>Cannot add, remove, or change Nested relations from the DataSet once the DataSet is mapped to a loaded XML document.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>The DataSet parameter is invalid. It cannot be null.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>Cannot change the DataSet name once the DataSet is mapped to a loaded XML document.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>This type of node cannot be cloned: {0}.</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>Cannot load XmlDataDocument if it already contains data. Please use a new XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>DataSet can be associated with at most one XmlDataDocument. Cannot associate the DataSet with the current XmlDataDocument because the DataSet is already associated with another XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>Please set DataSet.EnforceConstraints == false before trying to edit XmlDataDocument using XML operations.</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>GetElementById() is not supported on DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>Cannot create entity references on DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>Clear function on DateSet and DataTable is not supported on XmlDataDocument.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>Cannot remove column since it is built in to this dataSet.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>Cannot remove relation since it is built in to this dataSet.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>Occurs whenever a property for this control changes.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Occurs whenever this collection's membership changes.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>Cannot get value because it is DBNull.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>The '{0}' property requires Microsoft WindowsNT or a WindowsNT based operating system.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>Unable to find the requested .NET Framework Data Provider.  It may not be installed.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>The requested .NET Framework Data Provider's implementation does not have an Instance field of a System.Data.Common.DbProviderFactory derived type.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>Failed to find or load the registered .NET Framework Data Provider.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>The missing .NET Framework Data Provider's assembly qualified name is required.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>Only elements allowed.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>Child nodes not allowed.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>Unrecognized attribute '{0}'.</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>Unrecognized element.</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>The '{0}' section can only appear once per config file.</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>Required attribute '{0}' not found.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>Required attribute '{0}' cannot be empty.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>Expecting non-empty array for '{0}' parameter.</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>The only acceptable value for the property '{0}' is '{1}'.</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>The acceptable values for the property '{0}' are '{1}' or '{2}'.</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>Specified QuotePrefix and QuoteSuffix values do not match.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>The length of argument '{0}' exceeds its limit of '{1}'.</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>Expecting argument of type {1}, but received type {0}.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>Invalid value for key '{0}'.</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>Use of key '{0}' requires the key '{1}' to be present.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>The value's length for key '{0}' exceeds its limit of '{1}'.</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>Keyword not supported: '{0}'.</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>Unable to load the UDL file.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>Invalid UDL file.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>Internal .NET Framework Data Provider error {0}.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>The QuotePrefix and QuoteSuffix properties cannot be changed once an Insert, Update, or Delete command has been generated.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>The DataAdapter.SelectCommand property needs to be initialized.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>The DataAdapter.SelectCommand.Connection property needs to be initialized;</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}".</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}", incorrect usage of quotes.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}", the current limit of "{2}" is insufficient.</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>SqlBulkCopy.WriteToServer failed because the SqlBulkCopy.DestinationTableName is an invalid multipart name</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>Processing of results from SQL Server failed because of an invalid multipart name</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName is an invalid multipart name</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName is an invalid multipart name</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>SqlCommand.DeriveParameters failed because the SqlCommand.CommandText property value is an invalid multipart name</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>OdbcCommandBuilder.DeriveParameters failed because the OdbcCommand.CommandText property value is an invalid multipart name</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>OleDbCommandBuilder.DeriveParameters failed because the OleDbCommandBuilder.CommandText property value is an invalid multipart name</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>Connecting to a mirrored SQL Server instance using the MultiSubnetFailover connection option is not supported.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>The column mapping from SourceColumn '{0}' failed because the DataColumn '{1}' is a computed column.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>Inconvertible type mismatch between SourceColumn '{0}' of {1} and the DataColumn '{2}' of {3}.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>Missing the DataColumn '{0}' in the DataTable '{1}' for the SourceColumn '{2}'.</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>SourceColumn is required to be a non-empty string.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>Missing SourceColumn mapping for '{0}'.</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>The {0} enumeration value, {1}, is not supported by the {2} method.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>The {0} enumeration value, {1}, is not supported by the .NET Framework Odbc Data Provider.</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>The {0} enumeration value, {1}, is not supported by the .NET Framework OleDb Data Provider.</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>The {0} enumeration value, {1}, is not supported by the .NET Framework SqlClient Data Provider.</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>Unable to retrieve the ComputerNameDnsFullyQualified, {0}.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>Missing the '{0}' DataTable for the '{1}' SourceTable.</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>SourceTable is required to be a non-empty string</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>Missing SourceTable mapping: '{0}'</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: CommandText property has not been initialized</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: Connection property has not been initialized.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} requires an open and available Connection. {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: SelectCommand.Connection property has not been initialized.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: SelectCommand.Connection property has not been initialized.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: SelectCommand.Connection property has not been initialized.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>Update requires the InsertCommand to have a connection object. The Connection property of the InsertCommand has not been initialized.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>Update requires the UpdateCommand to have a connection object. The Connection property of the UpdateCommand has not been initialized.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>Update requires the DeleteCommand to have a connection object. The Connection property of the DeleteCommand has not been initialized.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>Update requires a connection object.  The Connection property has not been initialized.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>Update requires the command clone to have a connection object. The Connection property of the command clone has not been initialized.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>Update requires a connection.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Update requires the {0}Command to have an open connection object. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Update requires the {0}Command to have an open connection object. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Update requires the {0}Command to have an open connection object. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Update requires the updating command to have an open connection object. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>The stored procedure '{0}' doesn't exist.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>The transaction assigned to this command must be the most nested pending local transaction.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>The transaction is either not associated with the current connection or has been completed.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>The transaction associated with the current connection has completed but has not been disposed.  The transaction must be disposed before the connection can be used to execute SQL statements.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>{0} requires the command to have a transaction when the connection assigned to the command is in a pending local transaction.  The Transaction property of the command has not been initialized.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>There is already an open SqlResultSet associated with this command which must be closed first.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>There is already an open DataReader associated with this {0} which must be closed first.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>{0} DeriveParameters only supports CommandType.StoredProcedure, not CommandType.{1}.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>The method '{0}' cannot be called more than once for the same execution.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>Incorrect async result.</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>The SelectCommand property has not been initialized before calling '{0}'.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>The StatementType {0} is not expected here.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: expected a non-empty string for the SourceTable name.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>The MaxRecords value of {0} is invalid; the value must be &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>The StartRecord value of {0} is invalid; the value must be &gt;= 0.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: expected a non-empty string for the SourceTable name.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>Hierarchical chapter columns must map to an AutoIncrement DataColumn.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) returned null.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>Only specify one item in the dataTables array when using non-zero values for startRecords or maxRecords.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Update unable to find TableMapping['{0}'] or DataTable '{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update: expected a non-empty SourceTable name.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>Missing TableMapping when TableMapping.DataSetTable='{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Update requires the command clone to be valid.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>Auto SQL generation during Update requires a valid SelectCommand.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Update requires a valid InsertCommand when passed DataRow collection with new rows.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>Update requires a valid UpdateCommand when passed DataRow collection with modified rows.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Update requires a valid DeleteCommand when passed DataRow collection with deleted rows.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}] is from a different DataTable than DataRow[0].</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: Errors occurred; no additional is information available.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: Errors occurred; no additional is information available.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>When batching, the command's UpdatedRowSource property value of UpdateRowSource.FirstReturnedRecord or UpdateRowSource.Both is invalid.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>Concurrency violation: the UpdateCommand affected {0} of the expected {1} records.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>Concurrency violation: the DeleteCommand affected {0} of the expected {1} records.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>Concurrency violation: the batched command affected {0} of the expected {1} records.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>The method '{0}' cannot be called more than once for the same execution.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>Invalid CommandTimeout value {0}; the value must be &gt;= 0.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: the Size property has an invalid size of 0.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>{0}.Prepare method requires all parameters to have an explicitly set type.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>{0}.Prepare method requires all variable length parameters to have an explicitly set non-zero Size.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>{0}.Prepare method requires parameters of type '{1}' have an explicitly set Precision and Scale.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>Mismatched end method call for asyncResult.  Expected call to {0} but {1} was called instead.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>Invalid operation. The connection is closed.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>The connection has been disabled.</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>Cannot enlist in the transaction because a local transaction is in progress on the connection.  Finish local transaction and retry.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>Connection currently has transaction enlisted.  Finish current transaction and retry.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>Database cannot be null, the empty string, or string of only whitespace.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>The argument is too long.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Invalid 'Connect Timeout' value which must be an integer &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>Invalid source buffer (size of {0}) offset: {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>Invalid destination buffer (size of {0}) offset: {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>The numerical value is too large to fit into a 96 bit decimal.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>Invalid attempt to {0} when stream is closed.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>Specified SeekOrigin value is invalid.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>Dynamic SQL generation is not supported against multiple base tables.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>Dynamic SQL generation is not supported against a SelectCommand that does not return any base table information.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>Dynamic SQL generation for the DeleteCommand is not supported against a SelectCommand that does not return any key column information.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>Dynamic SQL generation for the UpdateCommand is not supported against a SelectCommand that does not return any key column information.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>Dynamic SQL generation for the DeleteCommand is not supported against a SelectCommand that does not contain a row version column.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>Dynamic SQL generation for the UpdateCommand is not supported against a SelectCommand that does not contain a row version column.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>Dynamic SQL generation not supported against table names '{0}' that contain the QuotePrefix or QuoteSuffix character '{1}'.</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>Invalid attempt to read from column ordinal '{0}'.  With CommandBehavior.SequentialAccess, you may only read from column ordinal '{1}' or greater.</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>Data type '{0}' can not be formatted as a literal because it has an invalid date time digits.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>The value can not be formatted as a literal of the requested type.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>Data type '{0}' can not be formatted as a literal because it has an invalid maximum scale.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>The literal value provided is not a valid literal for the data type '{0}'.</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>'{0}':The length of the literal value must be even.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>'{0}':The literal value must be a string with hexadecimal digits</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>{0} requires open connection when the quote prefix has not been set.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>Can not determine the correct boolean literal values. Boolean literals can not be created.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>Literals of the native data type associated with data type '{0}' are not supported.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>The parameter data type of {0} is invalid.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>No mapping exists from object type {0} to a known managed provider native type.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>Unable to handle an unknown TypeCode {0} returned by Type {1}.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>No mapping exists from DbType {0} to a known {1}.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>The version of SQL Server in use does not support datatype '{0}'.</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>Parameter value '{0}' is out of range.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>Specified parameter name '{0}' is not valid.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>Multiple return value parameters are not supported.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>Invalid parameter Size value '{0}'. The value must be greater than or equal to 0.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>Invalid value for argument '{0}'. The value must be greater than or equal to 0.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>Invalid value for this metadata.</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>Metadata must be SqlDbType.Row</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>Failed to convert parameter value from a {0} to a {1}.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} does not support parallel transactions.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>This {0} has completed; it is no longer usable.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>'{0}' cannot be called when the record is read only.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>'{0}' cannot be called when the DbDataRecord is read only.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>Implicit conversion of object type '{0}' to data type '{1}' is not supported.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>Buffer offset '{1}' plus the bytes available '{0}' is greater than the length of the passed in buffer.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>Data length '{0}' is less than 0.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>Specified length '{0}' is out of range.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>Invalid {2} attempt at dataIndex '{0}'.  With CommandBehavior.SequentialAccess, you may only read from dataIndex '{1}' or greater.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>Offset must refer to a location within the value.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"The ODBC managed provider requires that the TABLE_NAME restriction be specified and non-null for the GetSchema indexes collection.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>Invalid argument value for method '{0}'.</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>The ODBC provider did not return results from SQLGETTYPEINFO.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>Unexpected null DataTable argument</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>Unexpected null DataSet argument.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>Connection string exceeds maximum allowed length of {0}.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} - unable to map type.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>Unknown SQL type - {0}.</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>Unknown URT type - {0}.</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>Invalid negative argument!</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>Can't set property on an open connection.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>No valid mapping for a SQL_TRANSACTION '{0}' to a System.Data.IsolationLevel enumeration value.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} - unable to enable connection pooling...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} - unable to allocate an environment handle.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} - unable to get descriptor handle.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>Not in a transaction</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>Invalid OdbcType enumeration value={0}.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>Use IsDBNull when DBNull.Value data is expected.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} - no error information available</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>The connection is closed.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>An internal connection does not have an owner.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>The .NET Framework Odbc Data Provider requires Microsoft Data Access Components(MDAC) version 2.6 or later.  Version {0} was found currently installed.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>The .NET Framework OleDb Data Provider requires Microsoft Data Access Components(MDAC) version 2.6 or later.  Version {0} was found currently installed.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>'{0}' interface is not supported by the '{1}' provider.  GetOleDbSchemaTable is unavailable with the current provider.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>'{0}' failed with no error message available, result code: {1}.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>No error message available, result code: {0}.</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>The .NET Framework Data Providers require Microsoft Data Access Components(MDAC).  Please install Microsoft Data Access Components(MDAC) version 2.6 or later.</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>The .NET Framework Data Provider for OLEDB (Microsoft.Data.OleDb) does not support the Microsoft OLE DB Provider for ODBC Drivers (MSDASQL). Use the .NET Framework Data Provider for ODBC (System.Data.Odbc).</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>The .NET Framework Data Provider for OLEDB will not allow the OLE DB Provider to prompt the user in a non-interactive environment.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>The '{0}' provider is not registered on the local machine.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>The ICommandText interface is not supported by the '{0}' provider. Use CommandType.TableDirect instead.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>The ITransactionLocal interface is not supported by the '{0}' provider.  Local transactions are unavailable with the current provider.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>Format of the initialization string does not conform to the OLE DB specification.  Starting around char[{0}] in the connection string.</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>'Asynchronous Processing' is not a supported feature of the .NET Framework Data OLE DB Provider(Microsoft.Data.OleDb).</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>An OLE DB Provider was not specified in the ConnectionString.  An example would be, 'Provider=SQLOLEDB;'.</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>The OLE DB Provider specified in the ConnectionString is too long.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>No restrictions are expected for the DbInfoKeywords OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>No restrictions are expected for the DbInfoLiterals OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>No restrictions are expected for the schema guid OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>The {0} OleDbSchemaGuid is not a supported schema by the '{1}' provider.</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>The '{0}' configuration setting has the wrong number of values.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>Unable to load the XML file specified in configuration setting '{0}'.</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>Command parameter[{0}] '{1}' is invalid.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>Command parameter[{0}] '{1}' data value could not be converted for reasons other than sign mismatch or data overflow.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>Conversion failed for command parameter[{0}] '{1}' because the data value was signed and the type used by the provider was unsigned.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>Conversion failed for command parameter[{0}] '{1}' because the data value overflowed the type used by the provider.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>Provider encountered an error while sending command parameter[{0}] '{1}' value and stopped processing.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>Parameter[{0}] '{1}' has no default value.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>Error occurred with parameter[{0}]: {1}.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Microsoft.Data.OleDb.OleDbDataAdapter internal error: invalid parameter accessor: {0} {1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter[{0}]: the OleDbType property is uninitialized: OleDbType.{1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>The ICommandWithParameters interface is not supported by the '{0}' provider.  Command parameters are unsupported with the current provider.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>Retrieving procedure parameter information is not supported by the '{0}' provider.</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>Can not determine the server's decimal separator. Non-integer numeric literals can not be created.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>Object is not an ADODB.RecordSet or an ADODB.Record.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>Unable to retrieve the '{0}' interface from the ADODB.RecordSet object.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: the Size property has an invalid size of 0.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>Unable to retrieve the IRow interface from the ADODB.Record object.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>{0}.Prepare method requires all parameters to have an explicitly set type.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>Type does not support the OLE DB interface ISourcesRowset</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>{0}.Prepare method requires all variable length parameters to have an explicitly set non-zero Size.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>Cannot construct the ReservedWords schema collection because the provider does not support IDBInfo.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>{0}.Prepare method requires parameters of type '{1}' have an explicitly set Precision and Scale.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>The property's value was not set because the provider did not support the '{0}' property, or the consumer attempted to get or set values of properties not in the Initialization property group and the data source object is uninitialized.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>Mismatched end method call for asyncResult.  Expected call to {0} but {1} was called instead.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>Failed to initialize the '{0}' property for one of the following reasons:
-	The value data type was not the data type of the property or was not null. For example, the property was DBPROP_MEMORYUSAGE, which has a data type of Int32, and the data type was Int64.
-	The value was not a valid value. For example, the property was DBPROP_MEMORYUSAGE and the value was negative.
-	The value was a valid value for the property and the provider supports the property as a settable property, but the provider does not support the value specified. This includes the case where the value was added to the property in OLE DB after the provider was written.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>Invalid operation. The connection is closed.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>The value of Options was invalid.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>Cannot enlist in the transaction because a local transaction is in progress on the connection.  Finish local transaction and retry.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>The ColumnID element was invalid.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>Connection currently has transaction enlisted.  Finish current transaction and retry.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>A '{0}' property was specified to be applied to all columns but could not be applied to one or more of them.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>Database cannot be null, the empty string, or string of only whitespace.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>The '{0}' property was read-only, or the consumer attempted to set values of properties in the Initialization property group after the data source object was initialized. Consumers can set the value of a read-only property to its current value. This status is also returned if a settable column property could not be set for the particular column.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>Invalid source buffer (size of {0}) offset: {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>The optional '{0}' property's value was not set to the specified value and setting the property to the specified value was not possible.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>Invalid destination buffer (size of {0}) offset: {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>The '{0}'property's value was not set because doing so would have conflicted with an existing property.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>Invalid attempt to {0} when stream is closed.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(Reserved).</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>Specified SeekOrigin value is invalid.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>The provider returned an unknown DBPROPSTATUS_ value '{0}'.</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>Invalid attempt to read from column ordinal '{0}'.  With CommandBehavior.SequentialAccess, you may only read from column ordinal '{1}' or greater.</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>Accessor validation was deferred and was performed while the method returned data. The binding was invalid for this column or parameter.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>The parameter data type of {0} is invalid.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>OleDbDataAdapter internal error: invalid row set accessor: Ordinal={0} Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>No mapping exists from object type {0} to a known managed provider native type.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>The data value could not be converted for reasons other than sign mismatch or data overflow. For example, the data was corrupted in the data store but the row was still retrievable.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>Unable to handle an unknown TypeCode {0} returned by Type {1}.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>The provider could not allocate memory in which to return {0} data.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>No mapping exists from DbType {0} to a known {1}.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>Conversion failed because the {0} data value overflowed the type specified for the {0} value part in the consumer's buffer.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>The version of SQL Server in use does not support datatype '{0}'.</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter internal error: [get] Unknown OLE DB data type: 0x{0} ({1}).</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>Parameter value '{0}' is out of range.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>Conversion failed because the {0} data value was signed and the type specified for the {0} value part in the consumer's buffer was unsigned.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>Specified parameter name '{0}' is not valid.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter internal error: [set] Unknown OLE DB data type: 0x{0} ({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>Invalid parameter Size value '{0}'. The value must be greater than or equal to 0.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>The provider could not determine the {0} value. For example, the row was just created, the default for the {0} column was not available, and the consumer had not yet set a new {0} value.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>Invalid value for argument '{0}'. The value must be greater than or equal to 0.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>OLE DB Provider returned an unexpected status value of {0}.</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>Invalid value for this metadata.</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>The OleDbDataReader.Read must be used from the same thread on which is was created if that thread's ApartmentState was not ApartmentState.MTA.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>Failed to convert parameter value from a {0} to a {1}.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>Unspecified error: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} does not support parallel transactions.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>IErrorInfo.GetDescription failed with {0}.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>This {0} has completed; it is no longer usable.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>IErrorInfo.GetSource failed with {0}.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>Specified length '{0}' is out of range.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>DBTYPE_VECTOR data is not supported by the .NET Framework Data OLE DB Provider(Microsoft.Data.OleDb).</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>Invalid {2} attempt at dataIndex '{0}'.  With CommandBehavior.SequentialAccess, you may only read from dataIndex '{1}' or greater.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>Invalid min or max pool size values, min pool size cannot be greater than the max pool size.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>The '{0}' keyword is obsolete. Use '{1}' instead.</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>Unable to get the address of the distributed transaction coordinator for the server, from the server.  Is DTC enabled on the server?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>The length of the value for the connection parameter &lt;{0}&gt; exceeds the maximum allowed 65535 characters.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>Invalid 'Packet Size'.  The value must be an integer &gt;= 512 and &lt;= 32768.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>Invalid transaction or invalid name for a point at which to save within the transaction.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>The {0} enumeration value, {1}, is not supported by SQL Server 7.0 or SQL Server 2000.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>User Instance and Failover are not compatible options.  Please choose only one of the two in the connection string.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>Cannot set the Credential property if 'Authentication=Active Directory Integrated' has been specified in the connection string.</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>Incorrect authentication parameters specified with certificate authentication.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>The instance of SQL Server you attempted to connect to requires encryption but this machine does not support it.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>The instance of SQL Server you attempted to connect to does not support encryption.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>The instance of SQL Server you attempted to connect to does not support CTAIP.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>Unsupported SQL Server version.  The .NET Framework SqlClient Data Provider can only be used with SQL Server versions 7.0 and later.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>{0} cannot be changed while async operation is in progress.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>This command requires an asynchronous connection. Set "Asynchronous Processing=true" in the connection string.</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>The connection attempt timed out.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>Timeout expired.  The connection has been broken as a result.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>Instance failure.</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>Error code 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword requires SQL Server 9.0 or later.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>SSE Instance re-direction is not supported for non-local user instances.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>The authentication '{0}' is not supported.</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>SQL authentication method '{0}' is not supported.</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>Failed to instantiate an authentication provider with type '{1}' for '{0}'.</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>Failed to instantiate a SqlAuthenticationInitializer with type '{0}'.</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>The provider '{0}' threw an exception while initializing.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>The provider '{0}' does not support authentication '{1}'.</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Cannot find an authentication provider for '{0}'. Install the 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet package (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) to use Active Directory (Entra ID) authentication methods.</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>Failed to read the config section for authentication providers.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Parameter '{0}' cannot be null or empty.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>The asynchronous operation has already completed.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>The command execution cannot proceed due to a pending asynchronous operation already in progress.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>Invalid command sent to ExecuteXmlReader.  The command must return an Xml result.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>Notifications require SQL Server 9.0 or later.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>Invalid 3 part name format for UdtTypeName.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>Cannot initialize SSPI package.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Timeout expired.  The timeout period elapsed prior to completion of the operation or the server is not responding.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>Connection Timeout Expired.  The timeout period elapsed at the start of the pre-login phase.  This could be because of insufficient time provided for connection timeout.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>A user instance was requested in the connection string but the server specified does not support this option.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>The server certificate failed application validation.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>Specified data length {0} exceeds the allowed maximum length of {1}.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>Invalid attempt to read when no data is present.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>Data length '{0}' is less than 0.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>'{0}' cannot be called when the SqlDataRecord is read only.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>The mapped collection is in use and cannot be accessed at this time;</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>Connecting to the context connection using Microsoft.Data.SqlClient is not supported.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>Nested TransactionScopes are not supported.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>Unexpected server event: {0}.</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>The length of '{0}' must match the length of '{1}'.</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>The SqlDbType '{0}' is invalid for {1}.  Only {2} is supported.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>Too many values.</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>The Stream does not support writing.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>Null</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>Message</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>Arithmetic Overflow.</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>Divide by zero error encountered.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>Data is Null. This method or property cannot be called on Null values.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>Numeric arithmetic causes truncation.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>Two strings to be concatenated have different collation.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>Two strings to be compared have different collation.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>Invalid flag value.</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>Conversion from SqlDecimal to Decimal overflows.</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>Conversion overflows.</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>Invalid SqlDateTime.</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>A time zone was specified. SqlDateTime does not support time zones.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>Invalid array size.</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>Invalid numeric precision/scale.</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>The input wasn't in a correct format.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>SqlType error.</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>The SqlBytes and SqlChars don't support length of more than 2GB in this version.</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>An error occurred while reading.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Stream has been closed or disposed.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>There is no buffer. Read or write operation failed.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>Cannot set to non-zero length, because current value is Null.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>The buffer is insufficient. Read or write operation failed.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>Cannot write to non-zero offset, because current value is Null.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>Cannot write from an offset that is larger than current length. It would leave uninitialized data in the buffer.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>Data returned is larger than 2Gb in size. Use SequentialAccess command behavior in order to get all of the data.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>Argument to GetDayOfWeek must be integer between 1 and 7.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>SQL Type has not been loaded with data.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>SQL Type has already been loaded with data.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>Invalid attempt to access a closed XmlReader.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>Invalid attempt to call {0} when the stream is closed.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>Invalid attempt to call {0} when the stream non-writable.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>Invalid attempt to call {0} when the stream non-readable.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>Invalid attempt to call {0} when the stream is non-seekable.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>Subclass did not override a required method.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>Cannot create normalizer for '{0}'.</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>Internal Error</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>Command parameter must have a non null and non empty command text.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>MetaData parameter array must have length equivalent to ParameterDirection array argument.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>Data adapter mapping error.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>Data adapter error.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>DB concurrency violation.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>Operation aborted.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>Operation aborted due to an exception (see InnerException for details).</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Whether or not Fill will call DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Whether or not Update will call DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Whether or not to continue to the next DataRow when the Update events, RowUpdating and RowUpdated, Status is UpdateStatus.ErrorsOccurred.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>How the adapter fills the DataTable from the DataReader.</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>The action taken when a table or column in the TableMappings is missing.</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>The action taken when a table or column in the DataSet is missing.</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>How to map source table to DataSet table.</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Event triggered when a recoverable error occurs during Fill.</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Should Fill return provider specific values or common CLSCompliant values.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>Source column name - case sensitive.</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>The number of items in the collection</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>The specified DataColumnMapping object.</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>Individual columns mappings when this table mapping is matched.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>The DataTableMapping source table name. This name is case sensitive.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>The number of items in the collection</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>The specified DataTableMapping object</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>Used during Update for deleted rows in DataSet.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Event triggered after every DataRow during Update.</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>Number of rows to batch together before executing against the data source.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Connection used if the the Select/Insert/Update/DeleteCommands do not already have a connection.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>Used during Update for deleted rows in the DataTable.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>Used during Update for new rows in the DataTable.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Used during Fill.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>Used during Update for modified rows in the DataTable.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Should Fill return provider specific values or common CLSCompliant values.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>How to map source table to DataTable.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>How are the Insert/Update/DeleteCommands generated when not set by the user.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>Number of rows to batch together before executing against the data source.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>The connection string used to connect to the Data Source.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>The name of the ODBC Driver to use when connecting to the Data Source.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>The DSN to use when connecting to the Data Source.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>When true, indicates that managed connection pooling should be used.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>The UDL file to use when connecting to the Data Source.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>Specifies which OLE DB Services to enable or disable with the OleDb Provider.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>The name of the OLE DB Provider to use when connecting to the Data Source.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>The name of the application.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>When true, enables usage of the Asynchronous functionality in the .NET Framework Data Provider.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>The name of the primary file, including the full path name, of an attachable database.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>When true, indicates the connection state is reset when removed from the pool.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>When true, indicates the connection should be from the Sql Server context.  Available only when running in the Sql Server process.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>The SQL Server Language record name.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>Specifies the method of authenticating with SQL Server.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>Specified client certificate for authenticating with SQL Server.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>Information used to connect to a Data Source.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Current connection timeout value, not settable in the ConnectionString.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>Current data source catalog value, 'Database=X' in the connection string.</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>Current data source, 'Server=X' in the connection string.</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>Current ODBC driver.</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>Version of the product accessed by the ODBC Driver.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>Information used to connect to a Data Source.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Current connection timeout value, 'Connect Timeout=X' in the ConnectionString.</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>Current data source catalog value, 'Initial Catalog=X' in the connection string.</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>Current data source, 'Data Source=X' in the connection string.</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>Current OLE DB provider ProgID, 'Provider=X' in the connection string.</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>Version of the product accessed by the OLE DB Provider.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>Access token to use for authentication.</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>State of connection, synchronous or asynchronous.  'Asynchronous Processing=x' in the connection string.</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>Information used to connect for replication.</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>Information used to connect to a DataSource, such as 'Data Source=x;Initial Catalog=x;Integrated Security=SSPI'.</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>Collect statistics for this connection.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>Custom column encryption key store providers.</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>A guid to represent the physical connection.</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Automatic enlistment in notifications used by Microsoft SQL Server.</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>How the where clause is auto-generated for the Update and Delete commands when not specified by the user.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>Indicates the position of the catalog name in a qualified table name in a text command.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>The character that separates the catalog name from the rest of the identifier in a text command.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>The character that separates the schema name from the rest of the identifier in a text command.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>The prefix string wrapped around sql objects.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>The suffix string wrapped around sql objects.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>The DataAdapter for which to automatically generate Commands.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>Use schema from DataTable or the SelectCommand.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>How the set clause is auto-generated for the Update command when not specified by the user.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>The DataAdapter for which to automatically generate OdbcCommands</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>The character used in a text command as the opening quote for quoting identifiers that contain special characters.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>The character used in a text command as the closing quote for quoting identifiers that contain special characters.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>The DataAdapter for which to automatically generate OleDbCommands</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>The decimal separator used in numeric literals.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>The prefix string wrapped around sql objects</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>The suffix string wrapped around sql objects</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>The DataAdapter for which to automatically generate SqlCommands</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>The decimal separator used in numeric literals.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>The character used in a text command as the opening quote for quoting identifiers that contain special characters.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>The character used in a text command as the closing quote for quoting identifiers that contain special characters.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>Only necessary to set for decimal and numeric parameters when using with Prepare, FillSchema and CommandBuilder scenarios.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>Only necessary to set for decimal and numeric parameters when using with Prepare, FillSchema and CommandBuilder scenarios.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>The parameter native type.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>The parameter native type.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>Name of the parameter, like '@p1'</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>The parameter native type.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>The server's name for the type.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>Offset in variable length data types.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>ParameterDirection '{0}' specified for parameter '{1}' is not supported. Table-valued parameters only support ParameterDirection.Input.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>TypeName specified for parameter '{0}'.  TypeName must only be set for Structured parameters.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>SqlDbType.Structured type is only supported for multiple valued types.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>DateType column for field '{0}' in schema table is null.  DataType must be non-null.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>Number of fields in record '{0}' does not match the number in the original record.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>range: 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>unexpected error encountered in SqlClient data provider. {0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>Unable to get Type Info for {0},{1}</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>The provider has failed to load the following assembly: {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>UdtTypeName property must be set for UDT parameters.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>Specified type is not registered on the target server.{0}.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>UDT parameters not permitted in the where clause unless part of the primary key.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>'{0}' is an invalid user defined type, reason: {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>supports both in-memory and user-defined formats</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>Native format can't be supported.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>does not implement IBinarySerialize</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>not serializable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>no public constructors</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>does not implement INullable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>does not have a public constructor</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>no UDT attribute</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>Serialization without mapping is not yet supported.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>'public static x Parse(System.Data.SqlTypes.SqlString)' method is missing</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>'public override string ToString()' method is missing</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>'public static x Null { get; }' method is missing</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>Native format does not support fields (directly or through another field) of type '{0}'</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>Type is not public</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Native UDT not sequential layout due to type '{0}'</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Native UDT specifies a max byte size</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>field '{0}' is marked non-serialized</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>The type of field '{0}' is marked as explicit layout which is not allowed in Native format</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>Multiple valued assembly references must have a nonzero Assembly Id.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>Structured, multiple-valued types can only be used for parameters, and cannot be nested within another type.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>The path name is not valid.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>Failure while attempting to promote transaction.</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>Dependency object used to receive query notifications.</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>Property to indicate if this dependency is invalid.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>To add a command to existing dependency object.</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Command is already associated with another dependency object. Can not overwrite.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>This SqlCommand object is already associated with another SqlDependency object.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>Timeout specified is invalid. Timeout cannot be &lt; 0.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>Notification Error. Type={0}, Info={1}, Source={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData is not valid for this SqlDbType.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>The dbType {0} is invalid for this constructor.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>Internal error. Plaintext value cannot be null.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>Cannot encrypt. Encrypting resulted in {0} bytes of ciphertext which exceeds the maximum allowed limit of {1} bytes. The specified plaintext value is likely too large (plaintext size is: {2} bytes).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>Internal error. Ciphertext value cannot be null.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>Attestation information was not returned by SQL Server. Enclave type is '{0}' and enclave attestation URL is '{1}'.</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>Unable to establish secure channel. Error Message: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>Internal Error. Null argument '{0}' specified when constructing an object of type '{1}'. '{0}' cannot be null.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Specifies an endpoint of an enclave attestation service, which will be used to verify whether the enclave, configured in the SQL Server instance for computations on database columns encrypted using Always Encrypted, is valid and secure.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>Failed to read the configuration section for enclave providers. Make sure the section is correctly formatted in your application configuration file. Error Message: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>Failed to instantiate an enclave provider with type '{1}' for name '{0}'. Error message: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>Internal Error. SqlColumnEncryptionEnclaveProviderName cannot be null or empty.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>Error occurred when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations.  Enclave type is '{1}'. </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>Internal Error. Enclave type received from SQL Server is null or empty when executing a query requiring enclave computations.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>Executing a query requires enclave computations, but the application configuration is missing the enclave provider  section.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>No enclave provider found for enclave type '{0}' and attestation protocol '{1}'. Please specify the correct attestation protocol in the connection string. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>Default column encryption setting for all the commands on the connection.</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>Forces parameter to be encrypted before sending sensitive data to server. </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>Dictionary object containing SQL Server names and their trusted column master key paths.</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>Connecting to a mirrored SQL Server instance using the ApplicationIntent ReadOnly connection option is not supported.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>Unexpected routing information received.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>Invalid routing information received.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>Unsupported authentication specified in this context: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Active Directory Interactive authentication timed out. The user took too long to respond to the authentication request.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>Cannot use 'Authentication=Active Directory Interactive', if the Credential property has been set.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>Server Process Id (SPID) of the active connection.</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Active Directory Device Code Flow authentication timed out. The user took too long to respond to the authentication request.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>Cannot set the Credential property if 'Authentication=Active Directory Device Code Flow' has been specified in the connection string.</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>Only single dimensional arrays are supported for the requested action.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>Cannot remove the specified item because it was not found in the specified Collection.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>Non-negative number required.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Cannot set the AccessTokenCallback property if 'Authentication=Active Directory Default' has been specified in the connection string.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} returned {1}.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>Protocol error: A received message contains a valid signature but it was not encrypted as required by the effective Protection Level.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>{0} failed with error {1}.</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>This method is not implemented by this class.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>The requested security package is not supported.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>Incorrect physicalConnection type.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>Exception occurred while trying to set the AppContext Switch '{0}'={1}.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>Type {0} is not supported on this platform.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>Globalization Invariant Mode is not supported.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Cannot authenticate using Kerberos. Ensure Kerberos has been initialized on the client with 'kinit' and a Service Principal Name has been registered for the SQL Server to allow Kerberos authentication.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>The keyword 'Network Library' is not supported on this platform, prefix the 'Data Source' with the protocol desired instead ('tcp:' for a TCP connection, or 'np:' for a Named Pipe connection).</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>Socket did not throw expected '{0}' with error code '{1}'.</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>The server is attempting to use a feature that is not supported on this platform.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>The keyword '{0}' is not supported on this platform.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>The currently loaded System.Transactions.dll does not support Global Transactions.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>Received an unsupported token '{0}' while reading data from the server.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>'{0}' is not a supported handle type.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream is not supported on this platform.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>LocalDB is not supported on this platform.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>Insufficient buffer space. Required: {0} Actual: {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>GSSAPI operation failed with status: {0} (Minor status: {1}).</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>GSSAPI operation failed with error - {0} ({1}).</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>No support for channel binding on operating systems other than Windows.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>Target name should be non empty if default credentials are passed.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>Requested protection level is not supported with the GSSAPI implementation currently installed.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>Server implementation is not supported.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>NTLM authentication is not possible with default credentials on this platform.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>When used by DataAdapter.Update, the parameter value is changed from DBNull.Value into (Int32)1 or (Int32)0 if non-null.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Buffer maximum size exceeded: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>Missing the DataColumn '{0}' for the SourceColumn '{2}'.</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>SqlBatchCommand list has not been initialized.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
index 118f709d89..01c539043c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
@@ -497,8 +497,7 @@ private static void TypeRead(string connectionString)
                     s = rdr.GetString(9); //ShipAddres;
                     s = rdr.GetString(10); //ShipCity;
                                            // should get an exception here
-                    string errorMessage = SystemDataResourceManager.Instance.SqlMisc_NullValueMessage;
-                    DataTestUtility.AssertThrows<SqlNullValueException>(() => rdr.GetString(11), errorMessage);
+                    DataTestUtility.AssertThrows<SqlNullValueException>(() => rdr.GetString(11));
 
                     s = rdr.GetString(12); //ShipPostalCode;
                     s = rdr.GetString(13); //ShipCountry;
@@ -516,8 +515,6 @@ private static void GetValueOfTRead(string connectionString)
                 using (SqlCommand cmd = new SqlCommand(sqlBatch, conn))
                 using (SqlDataReader rdr = cmd.ExecuteReader())
                 {
-                    string errorMessage = SystemDataResourceManager.Instance.SqlMisc_NullValueMessage;
-
                     rdr.Read();
                     // read data out of buffer
                     rdr.GetFieldValue<int>(0); //order id
@@ -534,7 +531,7 @@ private static void GetValueOfTRead(string connectionString)
                     rdr.IsDBNull(10);
                     rdr.GetFieldValue<string>(10); //ShipCity;
                     // should get an exception here
-                    DataTestUtility.AssertThrows<SqlNullValueException>(() => rdr.GetFieldValue<string>(11), errorMessage);
+                    DataTestUtility.AssertThrows<SqlNullValueException>(() => rdr.GetFieldValue<string>(11));
                     rdr.IsDBNull(11);
                     rdr.GetFieldValue<SqlString>(11);
                     rdr.IsDBNull(11);
@@ -543,7 +540,7 @@ private static void GetValueOfTRead(string connectionString)
                     rdr.IsDBNull(12);
                     rdr.GetFieldValue<INullable>(13);//ShipCountry;
                     rdr.GetFieldValue<string>(14);
-                    DataTestUtility.AssertThrows<SqlNullValueException>(() => rdr.GetFieldValue<string>(15), errorMessage);
+                    DataTestUtility.AssertThrows<SqlNullValueException>(() => rdr.GetFieldValue<string>(15));
 
                     rdr.Read();
                     // read data out of buffer
@@ -560,7 +557,7 @@ private static void GetValueOfTRead(string connectionString)
                     Assert.False(rdr.IsDBNullAsync(10).Result, "FAILED: IsDBNull was true for a non-null value");
                     rdr.GetFieldValueAsync<string>(10).Wait(); //ShipCity;
                     // should get an exception here
-                    DataTestUtility.AssertThrowsInner<AggregateException, SqlNullValueException>(() => rdr.GetFieldValueAsync<string>(11).Wait(), innerExceptionMessage: errorMessage);
+                    DataTestUtility.AssertThrowsInner<AggregateException, SqlNullValueException>(() => rdr.GetFieldValueAsync<string>(11).Wait());
                     Assert.True(rdr.IsDBNullAsync(11).Result, "FAILED: IsDBNull was false for a null value");
 
                     rdr.IsDBNullAsync(11).Wait();

From baacd3ba50460f20958073af51e45455094bface Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Fri, 24 Apr 2026 14:36:31 +0100
Subject: [PATCH 064/298] Cleanup | Always Encrypted cryptographic algorithm
 factories (#4138)

---
 .../AeadAes256CbcHmac256Factory.cs            | 84 +++++++++++++++++++
 .../EncryptionAlgorithmFactory.cs             | 24 ++++++
 .../EncryptionAlgorithmFactoryList.cs         | 37 ++++++++
 .../Data/SqlClient/EnclaveDelegate.cs         |  6 +-
 .../SqlAeadAes256CbcHmac256Algorithm.cs       | 12 ++-
 .../SqlAeadAes256CbcHmac256Factory.cs         | 81 ------------------
 .../SqlClientEncryptionAlgorithmFactory.cs    | 23 -----
 ...SqlClientEncryptionAlgorithmFactoryList.cs | 84 -------------------
 .../Data/SqlClient/SqlSecurityUtility.cs      |  5 +-
 .../AlwaysEncryptedTests/Utility.cs           | 13 +--
 .../AlwaysEncrypted/NativeAeadBaseline.cs     |  7 +-
 11 files changed, 172 insertions(+), 204 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/AeadAes256CbcHmac256Factory.cs
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptionAlgorithmFactory.cs
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptionAlgorithmFactoryList.cs
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Factory.cs
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEncryptionAlgorithmFactory.cs
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEncryptionAlgorithmFactoryList.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/AeadAes256CbcHmac256Factory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/AeadAes256CbcHmac256Factory.cs
new file mode 100644
index 0000000000..2a8ebcd6b0
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/AeadAes256CbcHmac256Factory.cs
@@ -0,0 +1,84 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Text;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.AlwaysEncrypted
+{
+    /// <summary>
+    /// This is a factory class for the AEAD_AES_256_CBC_HMAC_SHA256 encryption algorithm.
+    /// </summary>
+    /// <remarks>
+    /// Access this factory directly via its <see cref="Instance" /> property or by passing
+    /// the algorithm name defined in <see cref="SqlAeadAes256CbcHmac256Algorithm.AlgorithmName" />
+    /// to the <see cref="EncryptionAlgorithmFactoryList.GetAlgorithm" /> method.
+    /// </remarks>
+    internal sealed class AeadAes256CbcHmac256Factory : EncryptionAlgorithmFactory
+    {
+        /// <summary>
+        /// Factory classes cache the <see cref="SqlAeadAes256CbcHmac256EncryptionKey" /> objects to avoid recomputation of the derived keys.
+        /// </summary>
+        private readonly ConcurrentDictionary<string, SqlAeadAes256CbcHmac256Algorithm> _encryptionAlgorithms =
+            new(concurrencyLevel: 4 * Environment.ProcessorCount /* default value in ConcurrentDictionary */, capacity: 2);
+
+        private AeadAes256CbcHmac256Factory() { }
+
+        /// <summary>
+        /// Access the instance of the factory class for the AEAD_AES_256_CBC_HMAC_SHA256 encryption algorithm.
+        /// </summary>
+        public static AeadAes256CbcHmac256Factory Instance => field ??= new();
+
+        /// <summary>
+        /// Creates an instance of the <see cref="SqlAeadAes256CbcHmac256Algorithm" /> class with a given root key.
+        /// </summary>
+        /// <param name="encryptionKey">Root key.</param>
+        /// <param name="encryptionType">Encryption type. Expected values are either Deterministic or Randomized.</param>
+        /// <param name="encryptionAlgorithm">Cryptographic algorithm.</param>
+        /// <returns>An implementation of the AEAD_AES_256_CBC_HMAC_SHA256 cryptographic algorithm.</returns>
+        internal override SqlClientEncryptionAlgorithm Create(SqlClientSymmetricKey encryptionKey, SqlClientEncryptionType encryptionType, string encryptionAlgorithm)
+        {
+            // Callers should have validated the encryption algorithm and the encryption key
+            Debug.Assert(string.Equals(encryptionAlgorithm, SqlAeadAes256CbcHmac256Algorithm.AlgorithmName, StringComparison.OrdinalIgnoreCase));
+
+            // Validate encryption type
+            if (encryptionType is not SqlClientEncryptionType.Deterministic and not SqlClientEncryptionType.Randomized)
+            {
+                throw SQL.InvalidEncryptionType(SqlAeadAes256CbcHmac256Algorithm.AlgorithmName,
+                                                encryptionType,
+                                                SqlClientEncryptionType.Deterministic,
+                                                SqlClientEncryptionType.Randomized);
+            }
+
+            // Get the cached cryptographic algorithm if one exists or create a new one, add it to cache and use it
+            int capacity = SqlSecurityUtility.GetBase64LengthFromByteLength(encryptionKey.RootKey.Length) + 4 /* Separators, type and version */;
+            StringBuilder algorithmKeyBuilder = new(Convert.ToBase64String(encryptionKey.RootKey), capacity);
+
+            algorithmKeyBuilder.Append(':');
+            algorithmKeyBuilder.Append((int)encryptionType);
+            algorithmKeyBuilder.Append(':');
+            algorithmKeyBuilder.Append(SqlAeadAes256CbcHmac256Algorithm.CurrentVersion);
+
+            string algorithmKey = algorithmKeyBuilder.ToString();
+
+            Debug.Assert(algorithmKey.Length <= capacity, "We needed to allocate a larger array");
+
+            if (!_encryptionAlgorithms.TryGetValue(algorithmKey, out SqlAeadAes256CbcHmac256Algorithm? aesAlgorithm))
+            {
+                SqlAeadAes256CbcHmac256EncryptionKey encryptedKey = new(encryptionKey.RootKey, SqlAeadAes256CbcHmac256Algorithm.AlgorithmName);
+                aesAlgorithm = new SqlAeadAes256CbcHmac256Algorithm(encryptedKey, encryptionType, SqlAeadAes256CbcHmac256Algorithm.CurrentVersion);
+
+                // In case multiple threads reach here at the same time, the first one adds the value
+                // the second one will be a no-op, the allocated memory will be claimed by Garbage Collector.
+                _encryptionAlgorithms.TryAdd(algorithmKey, aesAlgorithm);
+            }
+
+            return aesAlgorithm;
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptionAlgorithmFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptionAlgorithmFactory.cs
new file mode 100644
index 0000000000..545a581883
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptionAlgorithmFactory.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.AlwaysEncrypted;
+
+/// <summary>
+/// Abstract base class for all TCE cryptographic algorithm factory classes. Factory classes create instances of a cryptographic algorithm
+/// with a given key. At runtime when we determine a particular column is marked for TCE, based on the cryptographic algorithm we invoke 
+/// the corresponding factory class and retrieve an implementation of an cryptographic algorithm.
+/// </summary>
+internal abstract class EncryptionAlgorithmFactory
+{
+    /// <summary>
+    /// Creates a cryptographic algorithm with a given key.
+    /// </summary>
+    /// <param name="encryptionKey">Root key that should be passed to the cryptographic algorithm to be created</param>
+    /// <param name="encryptionType">Encryption Type, some algorithms will need this</param>
+    /// <param name="encryptionAlgorithm">Cryptographic algorithm name. Needed for extracting version bits</param>
+    /// <returns>Return a newly created SqlClientEncryptionAlgorithm instance</returns>
+    internal abstract SqlClientEncryptionAlgorithm Create(SqlClientSymmetricKey encryptionKey, SqlClientEncryptionType encryptionType, string encryptionAlgorithm);
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptionAlgorithmFactoryList.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptionAlgorithmFactoryList.cs
new file mode 100644
index 0000000000..0b28dd9ef1
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptionAlgorithmFactoryList.cs
@@ -0,0 +1,37 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.AlwaysEncrypted;
+
+/// <summary>
+/// Implements a global mapping from a SQL Server cryptographic algorithm's name to its implementation.
+/// </summary>
+internal static class EncryptionAlgorithmFactoryList
+{
+    /// <summary>
+    /// Get the available list of algorithms as a comma separated list with algorithm names
+    /// wrapped in single quotes.
+    /// </summary>
+    public const string RegisteredCipherAlgorithmNames = $"'{SqlAeadAes256CbcHmac256Algorithm.AlgorithmName}'";
+
+    /// <summary>
+    /// Gets the implementation for a given algorithm and instantiates it using the provided root key and the encryption type.
+    /// </summary>
+    /// <param name="key">The root key to use.</param>
+    /// <param name="type">Encryption type (read from SQL Server.)</param>
+    /// <param name="algorithmName">Name of the cryptographic algorithm.</param>
+    /// <param name="encryptionAlgorithm">Specified cryptographic algorithm's implementation.</param>
+    public static void GetAlgorithm(SqlClientSymmetricKey key, byte type, string algorithmName, out SqlClientEncryptionAlgorithm encryptionAlgorithm)
+    {
+        EncryptionAlgorithmFactory factory = algorithmName switch
+        {
+            SqlAeadAes256CbcHmac256Algorithm.AlgorithmName => AeadAes256CbcHmac256Factory.Instance,
+            _ => throw SQL.UnknownColumnEncryptionAlgorithm(algorithmName, RegisteredCipherAlgorithmNames)
+        };
+
+        encryptionAlgorithm = factory.Create(key, (SqlClientEncryptionType)type, algorithmName);
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveDelegate.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveDelegate.cs
index 79b88d6788..dcd5fd200a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveDelegate.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveDelegate.cs
@@ -1,7 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.Data.SqlClient.AlwaysEncrypted;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -16,7 +17,6 @@ namespace Microsoft.Data.SqlClient
     // @TODO: This isn't a delegate... it's a utility class
     internal sealed partial class EnclaveDelegate
     {
-        private static readonly SqlAeadAes256CbcHmac256Factory s_sqlAeadAes256CbcHmac256Factory = new SqlAeadAes256CbcHmac256Factory();
         private static readonly EnclaveDelegate s_enclaveDelegate = new EnclaveDelegate();
 
         private readonly object _lock;
@@ -152,7 +152,7 @@ private byte[] EncryptBytePackage(byte[] bytePackage, byte[] sessionKey, string
             try
             {
                 SqlClientSymmetricKey symmetricKey = new SqlClientSymmetricKey(sessionKey);
-                SqlClientEncryptionAlgorithm sqlClientEncryptionAlgorithm = s_sqlAeadAes256CbcHmac256Factory.Create(
+                SqlClientEncryptionAlgorithm sqlClientEncryptionAlgorithm = AeadAes256CbcHmac256Factory.Instance.Create(
                     symmetricKey,
                     SqlClientEncryptionType.Randomized,
                     SqlAeadAes256CbcHmac256Algorithm.AlgorithmName
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Algorithm.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Algorithm.cs
index 1035d87062..307330af0a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Algorithm.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Algorithm.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -22,6 +22,14 @@ internal class SqlAeadAes256CbcHmac256Algorithm : SqlClientEncryptionAlgorithm
         /// </summary>
         internal const string AlgorithmName = @"AEAD_AES_256_CBC_HMAC_SHA256";
 
+        /// <summary>
+        /// Algorithm version
+        /// </summary>
+        /// <remarks>
+        /// For now, only one version exists. In future, this may be derived from the algorithm name.
+        /// </remarks>
+        public const byte CurrentVersion = 0x01;
+
         /// <summary>
         /// Key size in bytes
         /// </summary>
@@ -77,7 +85,7 @@ internal class SqlAeadAes256CbcHmac256Algorithm : SqlClientEncryptionAlgorithm
         /// <summary>
         /// Byte array with algorithm version used for authentication tag computation.
         /// </summary>
-        private static readonly byte[] _version = new byte[] { 0x01 };
+        private static readonly byte[] _version = [ CurrentVersion ];
 
         /// <summary>
         /// Byte array with algorithm version size used for authentication tag computation.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Factory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Factory.cs
deleted file mode 100644
index 7501e7ba08..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Factory.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.Text;
-
-namespace Microsoft.Data.SqlClient
-{
-    /// <summary>
-    /// This is a factory class for AEAD_AES_256_CBC_HMAC_SHA256
-    /// </summary>
-    internal class SqlAeadAes256CbcHmac256Factory : SqlClientEncryptionAlgorithmFactory
-    {
-        /// <summary>
-        /// Factory classes caches the SqlAeadAes256CbcHmac256EncryptionKey objects to avoid computation of the derived keys
-        /// </summary>
-        private readonly ConcurrentDictionary<string, SqlAeadAes256CbcHmac256Algorithm> _encryptionAlgorithms =
-            new ConcurrentDictionary<string, SqlAeadAes256CbcHmac256Algorithm>(concurrencyLevel: 4 * Environment.ProcessorCount /* default value in ConcurrentDictionary*/, capacity: 2);
-
-        /// <summary>
-        /// Creates an instance of AeadAes256CbcHmac256Algorithm class with a given key
-        /// </summary>
-        /// <param name="encryptionKey">Root key</param>
-        /// <param name="encryptionType">Encryption Type. Expected values are either Deterministic or Randomized.</param>
-        /// <param name="encryptionAlgorithm">Encryption Algorithm.</param>
-        /// <returns></returns>
-        internal override SqlClientEncryptionAlgorithm Create(SqlClientSymmetricKey encryptionKey, SqlClientEncryptionType encryptionType, string encryptionAlgorithm)
-        {
-            // Callers should have validated the encryption algorithm and the encryption key
-            Debug.Assert(encryptionKey != null);
-            Debug.Assert(string.Equals(encryptionAlgorithm, SqlAeadAes256CbcHmac256Algorithm.AlgorithmName, StringComparison.OrdinalIgnoreCase) == true);
-
-            // Validate encryption type
-            if (!((encryptionType == SqlClientEncryptionType.Deterministic) || (encryptionType == SqlClientEncryptionType.Randomized)))
-            {
-                throw SQL.InvalidEncryptionType(SqlAeadAes256CbcHmac256Algorithm.AlgorithmName,
-                                                encryptionType,
-                                                SqlClientEncryptionType.Deterministic,
-                                                SqlClientEncryptionType.Randomized);
-            }
-
-            // Get the cached encryption algorithm if one exists or create a new one, add it to cache and use it
-            //
-            // For now, we only have one version. In future, we may need to parse the algorithm names to derive the version byte.
-            const byte algorithmVersion = 0x1;
-
-            StringBuilder algorithmKeyBuilder = new StringBuilder(Convert.ToBase64String(encryptionKey.RootKey), SqlSecurityUtility.GetBase64LengthFromByteLength(encryptionKey.RootKey.Length) + 4/*separators, type and version*/);
-
-#if DEBUG
-            int capacity = algorithmKeyBuilder.Capacity;
-#endif //DEBUG
-
-            algorithmKeyBuilder.Append(":");
-            algorithmKeyBuilder.Append((int)encryptionType);
-            algorithmKeyBuilder.Append(":");
-            algorithmKeyBuilder.Append(algorithmVersion);
-
-            string algorithmKey = algorithmKeyBuilder.ToString();
-
-#if DEBUG
-            Debug.Assert(algorithmKey.Length <= capacity, "We needed to allocate a larger array");
-#endif //DEBUG
-
-            SqlAeadAes256CbcHmac256Algorithm aesAlgorithm;
-            if (!_encryptionAlgorithms.TryGetValue(algorithmKey, out aesAlgorithm))
-            {
-                SqlAeadAes256CbcHmac256EncryptionKey encryptedKey = new SqlAeadAes256CbcHmac256EncryptionKey(encryptionKey.RootKey, SqlAeadAes256CbcHmac256Algorithm.AlgorithmName);
-                aesAlgorithm = new SqlAeadAes256CbcHmac256Algorithm(encryptedKey, encryptionType, algorithmVersion);
-
-                // In case multiple threads reach here at the same time, the first one adds the value
-                // the second one will be a no-op, the allocated memory will be claimed by Garbage Collector.
-                _encryptionAlgorithms.TryAdd(algorithmKey, aesAlgorithm);
-            }
-
-            return aesAlgorithm;
-        }
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEncryptionAlgorithmFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEncryptionAlgorithmFactory.cs
deleted file mode 100644
index 14f0f9816b..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEncryptionAlgorithmFactory.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Data.SqlClient
-{
-    /// <summary>
-    /// Abstract base class for all TCE encryption algorithm factory classes. Factory classes create instances of an encryption algorithm
-    /// with a given key. At runtime when we determine a particular column is marked for TCE, based on the encryption algorithm we invoke 
-    /// the corresponding factory class and retrieve an object to an encryption algorithm.
-    /// </summary>
-    internal abstract class SqlClientEncryptionAlgorithmFactory
-    {
-        /// <summary>
-        /// Creates an encryption algorithm with a given key.
-        /// </summary>
-        /// <param name="encryptionKey">encryption key that should be passed to the encryption algorithm to be created</param>
-        /// <param name="encryptionType">Encryption Type, some algorithms will need this</param>
-        /// <param name="encryptionAlgorithm">Encryption algorithm name. Needed for extracting version bits</param>
-        /// <returns>Return a newly created SqlClientEncryptionAlgorithm instance</returns>
-        internal abstract SqlClientEncryptionAlgorithm Create(SqlClientSymmetricKey encryptionKey, SqlClientEncryptionType encryptionType, string encryptionAlgorithm);
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEncryptionAlgorithmFactoryList.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEncryptionAlgorithmFactoryList.cs
deleted file mode 100644
index 8266b5ce15..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientEncryptionAlgorithmFactoryList.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.Text;
-
-namespace Microsoft.Data.SqlClient
-{
-    /// <summary>
-    /// <para> Implements a global directory of all the encryption algorithms registered with client.</para>
-    /// </summary>
-    sealed internal class SqlClientEncryptionAlgorithmFactoryList
-    {
-        private readonly ConcurrentDictionary<string, SqlClientEncryptionAlgorithmFactory> _encryptionAlgoFactoryList;
-        private static readonly SqlClientEncryptionAlgorithmFactoryList _singletonInstance = new SqlClientEncryptionAlgorithmFactoryList();
-
-        private SqlClientEncryptionAlgorithmFactoryList()
-        {
-            _encryptionAlgoFactoryList = new ConcurrentDictionary<string, SqlClientEncryptionAlgorithmFactory>(concurrencyLevel: 4 * Environment.ProcessorCount /* default value in ConcurrentDictionary*/, capacity: 2);
-
-            // Add wellknown algorithm
-            _encryptionAlgoFactoryList.TryAdd(SqlAeadAes256CbcHmac256Algorithm.AlgorithmName, new SqlAeadAes256CbcHmac256Factory());
-        }
-
-        internal static SqlClientEncryptionAlgorithmFactoryList GetInstance()
-        {
-            return _singletonInstance;
-        }
-
-        /// <summary>
-        /// Get the registered list of algorithms as a comma separated list with algorithm names
-        /// wrapped in single quotes.
-        /// </summary>
-        internal string GetRegisteredCipherAlgorithmNames()
-        {
-            StringBuilder builder = new StringBuilder();
-            bool firstElem = true;
-            foreach (string key in _encryptionAlgoFactoryList.Keys)
-            {
-                if (firstElem)
-                {
-                    builder.Append("'");
-                    firstElem = false;
-                }
-                else
-                {
-                    builder.Append(", '");
-                }
-                builder.Append(key);
-                builder.Append("'");
-            }
-
-            return builder.ToString();
-        }
-
-        /// <summary>
-        /// Gets the algorithm handle instance for a given algorithm and instantiates it using the provided key and the encryption type.
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="type"></param>
-        /// <param name="algorithmName"></param>
-        /// <param name="encryptionAlgorithm"></param>
-        internal void GetAlgorithm(SqlClientSymmetricKey key, byte type, string algorithmName, out SqlClientEncryptionAlgorithm encryptionAlgorithm)
-        {
-            encryptionAlgorithm = null;
-
-            SqlClientEncryptionAlgorithmFactory factory = null;
-            if (!_encryptionAlgoFactoryList.TryGetValue(algorithmName, out factory))
-            {
-                throw SQL.UnknownColumnEncryptionAlgorithm(algorithmName,
-                        SqlClientEncryptionAlgorithmFactoryList.GetInstance().GetRegisteredCipherAlgorithmNames());
-            }
-
-            Debug.Assert(factory != null, "Null Algorithm Factory class detected");
-
-            // If the factory exists, following method will Create an algorithm object. If this fails,
-            // it will raise an exception.
-            encryptionAlgorithm = factory.Create(key, (SqlClientEncryptionType)type, algorithmName);
-        }
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs
index ae20c27254..253ab92db8 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs
@@ -9,6 +9,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using Microsoft.Data.Common;
+using Microsoft.Data.SqlClient.AlwaysEncrypted;
 
 namespace Microsoft.Data.SqlClient
 {
@@ -98,7 +99,7 @@ private static string ValidateAndGetEncryptionAlgorithmName(byte cipherAlgorithm
             {
                 if (cipherAlgorithmName == null)
                 {
-                    throw SQL.NullColumnEncryptionAlgorithm(SqlClientEncryptionAlgorithmFactoryList.GetInstance().GetRegisteredCipherAlgorithmNames());
+                    throw SQL.NullColumnEncryptionAlgorithm(EncryptionAlgorithmFactoryList.RegisteredCipherAlgorithmNames);
                 }
 
                 return cipherAlgorithmName;
@@ -206,7 +207,7 @@ internal static void DecryptSymmetricKey(SqlCipherMetadata md, SqlConnection con
             md.CipherAlgorithm = null;
             SqlClientEncryptionAlgorithm cipherAlgorithm = null;
             string algorithmName = ValidateAndGetEncryptionAlgorithmName(md.CipherAlgorithmId, md.CipherAlgorithmName); // may throw
-            SqlClientEncryptionAlgorithmFactoryList.GetInstance().GetAlgorithm(symKey, md.EncryptionType, algorithmName, out cipherAlgorithm); // will validate algorithm name and type
+            EncryptionAlgorithmFactoryList.GetAlgorithm(symKey, md.EncryptionType, algorithmName, out cipherAlgorithm); // will validate algorithm name and type
             Debug.Assert(cipherAlgorithm is not null);
             md.CipherAlgorithm = cipherAlgorithm;
             md.EncryptionKeyInfo = encryptionkeyInfoChosen;
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs
index a8a76b9e7f..e53fa6491e 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs
@@ -21,9 +21,10 @@ public static class Utility
         // reflections
         public static Assembly systemData = Assembly.GetAssembly(typeof(SqlConnection));
         public static Type sqlClientSymmetricKey = systemData.GetType("Microsoft.Data.SqlClient.SqlClientSymmetricKey");
-        public static Type sqlAeadAes256CbcHmac256Factory = systemData.GetType("Microsoft.Data.SqlClient.SqlAeadAes256CbcHmac256Factory");
+        public static Type aeadAes256CbcHmac256Factory = systemData.GetType("Microsoft.Data.SqlClient.AlwaysEncrypted.AeadAes256CbcHmac256Factory");
+        public static PropertyInfo aeadAes256CbcHmac256FactoryInstance = aeadAes256CbcHmac256Factory.GetProperty("Instance", BindingFlags.Static | BindingFlags.Public);
         public static ConstructorInfo sqlColumnEncryptionKeyConstructor = sqlClientSymmetricKey.GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(byte[]) }, null);
-        public static MethodInfo sqlAeadAes256CbcHmac256FactoryCreate = sqlAeadAes256CbcHmac256Factory.GetMethod("Create", BindingFlags.Instance | BindingFlags.NonPublic);
+        public static MethodInfo aeadAes256CbcHmac256FactoryCreate = aeadAes256CbcHmac256Factory.GetMethod("Create", BindingFlags.Instance | BindingFlags.NonPublic);
         public static Type sqlClientEncryptionAlgorithm = systemData.GetType("Microsoft.Data.SqlClient.SqlClientEncryptionAlgorithm");
         public static MethodInfo sqlClientEncryptionAlgorithmEncryptData = sqlClientEncryptionAlgorithm.GetMethod("EncryptData", BindingFlags.Instance | BindingFlags.NonPublic);
         public static Type SqlCipherMetadata = systemData.GetType("Microsoft.Data.SqlClient.SqlCipherMetadata");
@@ -191,11 +192,11 @@ internal static byte[] EncryptDataUsingAED(byte[] plainTextData, byte[] key, CCo
             Object columnEncryptionKey = sqlColumnEncryptionKeyConstructor.Invoke(new object[] { key });
             Assert.True(columnEncryptionKey != null);
 
-            Object aesFactory = Activator.CreateInstance(sqlAeadAes256CbcHmac256Factory);
+            Object aesFactory = aeadAes256CbcHmac256FactoryInstance.GetValue(null);
             Assert.True(aesFactory != null);
 
             object[] parameters = new object[] { columnEncryptionKey, encryptionType, ColumnEncryptionAlgorithmName };
-            Object authenticatedAES = sqlAeadAes256CbcHmac256FactoryCreate.Invoke(aesFactory, parameters);
+            Object authenticatedAES = aeadAes256CbcHmac256FactoryCreate.Invoke(aesFactory, parameters);
             Assert.True(authenticatedAES != null);
 
             parameters = new object[] { plainTextData };
@@ -259,11 +260,11 @@ internal static byte[] DecryptDataUsingAED(byte[] encryptedCellBlob, byte[] key,
             Object columnEncryptionKey = sqlColumnEncryptionKeyConstructor.Invoke(new object[] { key });
             Assert.True(columnEncryptionKey != null);
 
-            Object aesFactory = Activator.CreateInstance(sqlAeadAes256CbcHmac256Factory);
+            Object aesFactory = aeadAes256CbcHmac256FactoryInstance.GetValue(null);
             Assert.True(aesFactory != null);
 
             object[] parameters = new object[] { columnEncryptionKey, encryptionType, ColumnEncryptionAlgorithmName };
-            Object authenticatedAES = sqlAeadAes256CbcHmac256FactoryCreate.Invoke(aesFactory, parameters);
+            Object authenticatedAES = aeadAes256CbcHmac256FactoryCreate.Invoke(aesFactory, parameters);
             Assert.True(authenticatedAES != null);
 
             parameters = new object[] { encryptedCellBlob };
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/AlwaysEncrypted/NativeAeadBaseline.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/AlwaysEncrypted/NativeAeadBaseline.cs
index 945351056f..f869bd768a 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/AlwaysEncrypted/NativeAeadBaseline.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/AlwaysEncrypted/NativeAeadBaseline.cs
@@ -1,7 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.Data.SqlClient.AlwaysEncrypted;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -111,7 +112,7 @@ public class NativeAeadBaseline
     public void Known_Plaintext_Encrypts_To_Known_FinalCell(byte[] plainText, byte[] rootKey, byte[] expectedFinalCell)
     {
         SqlClientSymmetricKey cek = new(rootKey);
-        SqlAeadAes256CbcHmac256Factory aeadFactory = new();
+        AeadAes256CbcHmac256Factory aeadFactory = AeadAes256CbcHmac256Factory.Instance;
         SqlClientEncryptionAlgorithm aeadAlgorithm = aeadFactory.Create(cek, SqlClientEncryptionType.Deterministic, SqlAeadAes256CbcHmac256Algorithm.AlgorithmName);
 
         byte[] encryptedData = aeadAlgorithm.EncryptData(plainText);
@@ -130,7 +131,7 @@ public void Known_Plaintext_Encrypts_To_Known_FinalCell(byte[] plainText, byte[]
     public void Known_FinalCell_Decrypts_To_Known_Plaintext(byte[] expectedPlaintext, byte[] rootKey, byte[] finalCell)
     {
         SqlClientSymmetricKey cek = new(rootKey);
-        SqlAeadAes256CbcHmac256Factory aeadFactory = new();
+        AeadAes256CbcHmac256Factory aeadFactory = AeadAes256CbcHmac256Factory.Instance;
         SqlClientEncryptionAlgorithm aeadAlgorithm = aeadFactory.Create(cek, SqlClientEncryptionType.Deterministic, SqlAeadAes256CbcHmac256Algorithm.AlgorithmName);
 
         byte[] decryptedData = aeadAlgorithm.DecryptData(finalCell);

From ad22647943e8369cfaa0c19575f6b116d5674a71 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 24 Apr 2026 11:32:17 -0700
Subject: [PATCH 065/298] Revert "Update to latest Azure.Core package with
 Azure.Identity types (#4200)" (#4236)

This reverts commit c5da95dbebf897c895485bc67012f2b3e9c6db6b.
---
 Directory.Packages.props                      |  8 ++++---
 doc/Directory.Packages.props                  |  8 +++----
 .../Directory.Packages.props                  | 12 +++++-----
 doc/apps/AzureAuthentication/README.md        | 22 +++++++++----------
 .../Microsoft.Data.SqlClient.Samples.csproj   |  1 +
 .../Azure/src/Azure.csproj                    |  1 +
 ...Microsoft.Data.SqlClient.TestCommon.csproj |  4 ++--
 ...soft.Data.SqlClient.FunctionalTests.csproj |  4 ++--
 ...icrosoft.Data.SqlClient.ManualTests.csproj |  4 ++--
 9 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index d18da0127a..b1a858bf72 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -50,8 +50,8 @@
   <!-- Dependencies shared by multiple projects -->
 
   <ItemGroup>
-    <PackageVersion Include="Azure.Core" Version="1.53.0" />
-    <PackageVersion Include="Microsoft.Identity.Client" Version="4.83.3" />
+    <PackageVersion Include="Azure.Core" Version="1.51.1" />
+    <PackageVersion Include="Microsoft.Identity.Client" Version="4.83.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 
@@ -81,7 +81,9 @@
   <!-- ===================================================================== -->
   <!-- Azure Dependencies -->
 
-  <!-- None -->
+  <ItemGroup>
+    <PackageVersion Include="Azure.Identity" Version="1.18.0" />
+  </ItemGroup>
 
   <!-- ===================================================================== -->
   <!-- SqlClient Dependencies -->
diff --git a/doc/Directory.Packages.props b/doc/Directory.Packages.props
index 3f34943e76..2ead6c1757 100644
--- a/doc/Directory.Packages.props
+++ b/doc/Directory.Packages.props
@@ -2,11 +2,9 @@
   <!-- Import parent Directory.Packages.props -->
   <Import Project="..\Directory.Packages.props" />
   <ItemGroup>
-    <!-- Explicitly include Azure.Identity. -->
-    <PackageVersion Include="Azure.Identity" Version="1.21.0" />
     <!-- Reference SqlClient package versions that support our needs. -->
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.0-preview4.26064.3" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="7.0.0-preview1.26064.3" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="1.0.0-preview1.26064.3" />
   </ItemGroup>
 </Project>
diff --git a/doc/apps/AzureAuthentication/Directory.Packages.props b/doc/apps/AzureAuthentication/Directory.Packages.props
index 1456264d7a..b512683765 100644
--- a/doc/apps/AzureAuthentication/Directory.Packages.props
+++ b/doc/apps/AzureAuthentication/Directory.Packages.props
@@ -4,11 +4,11 @@
   <!-- We purposely do not include any parent Directory.Packages.props files. -->
 
   <PropertyGroup>
-    <!-- Use SqlClient 7.0.0 if no version was specified. -->
-    <SqlClientVersion>7.0.0</SqlClientVersion>
+    <!-- Use SqlClient 7.0.0 Preview 4 if no version was specified. -->
+    <SqlClientVersion>7.0.0-preview4.26064.3</SqlClientVersion>
 
-    <!-- Use AKV Provider 7.0.0 if no version was specified. -->
-    <AkvProviderVersion>7.0.0</AkvProviderVersion>
+    <!-- Use AKV Provider 7.0.0 Preview 1 if no version was specified. -->
+    <AkvProviderVersion>7.0.0-preview1.26064.3</AkvProviderVersion>
   </PropertyGroup>
 
   <!-- SqlClient Packages -->
@@ -25,8 +25,8 @@
 
   <!-- Other Packages -->
   <ItemGroup>
-    <PackageVersion Include="Azure.Core" Version="1.53.0" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.6" />
+    <PackageVersion Include="Azure.Identity" Version="1.17.1" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/doc/apps/AzureAuthentication/README.md b/doc/apps/AzureAuthentication/README.md
index 2a3bf16b86..a0d9d8b7ba 100644
--- a/doc/apps/AzureAuthentication/README.md
+++ b/doc/apps/AzureAuthentication/README.md
@@ -33,8 +33,8 @@ Package versions are controlled through MSBuild properties. Pass them on the com
 
 | Property | Default | Description |
 | --- | --- | --- |
-| `SqlClientVersion` | `7.0.0` | Version of `Microsoft.Data.SqlClient` to reference. |
-| `AkvProviderVersion` | `7.0.0` | Version of `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` to reference. |
+| `SqlClientVersion` | `7.0.0-preview4.26064.3` | Version of `Microsoft.Data.SqlClient` to reference. |
+| `AkvProviderVersion` | `7.0.0-preview1.26064.3` | Version of `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` to reference. |
 | `AzureVersion` | None | Version of `Microsoft.Data.SqlClient.Extensions.Azure` to reference.  When omitted, the `Azure` package will not be referenced. |
 
 ## Local Package Source
@@ -68,9 +68,9 @@ Description:
 
   Supply specific package versions when building to test different versions of the SqlClient suite, for example:
 
-    -p:SqlClientVersion=7.1.0.preview1
-    -p:AkvProviderVersion=7.0.0
-    -p:AzureVersion=1.1.0-preview1
+    -p:SqlClientVersion=7.0.0.preview4
+    -p:AkvProviderVersion=7.0.1-preview2
+    -p:AzureVersion=1.0.0-preview1
 
 Usage:
   AzureAuthentication [options]
@@ -104,9 +104,9 @@ Azure Authentication Tester
 ---------------------------
 
 Packages used:
-  SqlClient:     7.0.0
-  AKV Provider:  7.0.0
-  Azure:         1.0.0
+  SqlClient:     7.0.0-preview4.26055.1
+  AKV Provider:  6.1.2
+  Azure:         1.0.0-preview1.26055.1
 
 Connection details:
   Data Source:      adotest.database.windows.net
@@ -142,19 +142,19 @@ authentication provider.
 Run against locally-built packages (drop `.nupkg` files into the `packages/` folder first):
 
 ```bash
-dotnet run -p:SqlClientVersion=7.1.0-preview1 -- -c "<connection string>"
+dotnet run -p:SqlClientVersion=7.0.0-preview4 -- -c "<connection string>"
 ```
 
 Run including the `Azure` extensions package:
 
 ```bash
-dotnet run -p:AzureVersion=1.0.0 -- -c "<connection string>"
+dotnet run -p:AzureVersion=1.0.0-preview1 -- -c "<connection string>"
 ```
 
 Override all three versions at once:
 
 ```bash
-dotnet run -p:SqlClientVersion=7.1.0-preview1 -p:AkvProviderVersion=7.1.0-preview1 -p:AzureVersion=1.0.0 -- -c "<connection string>"
+dotnet run -p:SqlClientVersion=7.0.0-preview1 -p:AkvProviderVersion=7.0.0-preview1 -p:AzureVersion=1.0.0-preview1 -- -c "<connection string>"
 ```
 
 ## Prerequisites
diff --git a/doc/samples/Microsoft.Data.SqlClient.Samples.csproj b/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
index db1d5bd997..c194fac4d0 100644
--- a/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
+++ b/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Microsoft.Identity.Client" />
     <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="Microsoft.Data.SqlClient" />
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
index 07caed5129..b244dd467e 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
@@ -129,6 +129,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <!-- Explicitly depend on the same version of Microsoft.Identity.Client as SqlClient. -->
     <PackageReference Include="Microsoft.Identity.Client" />
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index 82d5b2513d..3f014f9fbe 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -30,14 +30,14 @@
 
   <!-- References for netfx -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Azure.Security.KeyVault.Keys" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
   </ItemGroup>
 
   <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Azure.Security.KeyVault.Keys" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
index 0e9cb7b785..7045eecc65 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -66,7 +66,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Transactions" />
 
-    <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="Microsoft.Data.SqlClient.SNI"
                       Condition="'$(ReferenceType)' != 'Package'" />
@@ -97,7 +97,7 @@
 
   <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime"
                       Condition="'$(ReferenceType)' != 'Package'" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index c4f0f2bf5b..110547a5de 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -355,7 +355,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Transactions" />
 
-    <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="System.Memory" />
     <PackageReference Include="System.ValueTuple" />
@@ -391,7 +391,7 @@
 
   <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime"
                       Condition="'$(ReferenceType)' != 'Package'" />

From 6e81f5924d1705e976c4bc35078e54e1fe0ba17f Mon Sep 17 00:00:00 2001
From: SqlClient DevOps <sqlclient@microsoft.com>
Date: Fri, 24 Apr 2026 19:21:44 +0000
Subject: [PATCH 066/298] [Scheduled Run] Localized resource files from
 OneLocBuild

---
 .../src/Resources/Strings.cs.resx             | 2785 +----------------
 .../src/Resources/Strings.de.resx             | 2785 +----------------
 .../src/Resources/Strings.es.resx             | 2785 +----------------
 .../src/Resources/Strings.fr.resx             | 2785 +----------------
 .../src/Resources/Strings.it.resx             | 2785 +----------------
 .../src/Resources/Strings.ja.resx             | 2785 +----------------
 .../src/Resources/Strings.ko.resx             | 2785 +----------------
 .../src/Resources/Strings.pl.resx             | 2785 +----------------
 .../src/Resources/Strings.pt-BR.resx          | 2785 +----------------
 .../src/Resources/Strings.ru.resx             | 2785 +----------------
 .../src/Resources/Strings.tr.resx             | 2785 +----------------
 .../src/Resources/Strings.zh-Hans.resx        | 2785 +----------------
 .../src/Resources/Strings.zh-Hant.resx        | 2785 +----------------
 13 files changed, 1586 insertions(+), 34619 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index 82d586d022..65914fdf4c 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>Vzestupně</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Index {0} pro {1} je neplatný (Count={2}).</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>{0} už obsahuje jiná kolekce {1}.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>Index {0} je již v této kolekci {1} obsažen.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0} přijímá pouze objekty typu {1}, které nejsou null.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>Došlo k pokusu o odebrání objektu {0}, který není obsažen v této kolekci {1}.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>Hodnota {0}.{1} musí být jedinečná. Hodnota {2} již v kolekci existuje.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>Připojení nebylo zavřeno. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>Pokus o volání {0} je neplatný, je-li zavřeno čtecí zařízení.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>Nelze zařadit do transakce, protože připojení je primárním připojením pro delegovanou nebo povýšenou transakci.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>Sestupně</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>Byl očekáván neprázdný řetězec pro parametr {0}.</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>Vlastnost ConnectionString nebyla inicializována.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>Byla zachycena výjimka Exception neodpovídající specifikaci CLS.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>Daný element zabezpečení není elementem oprávnění.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>Data</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>Aktualizovat</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>Vlastnost ConnectionState udávající, zda je připojení otevřeno nebo zavřeno.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>Událost aktivovaná při změně stavu připojení.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>Obecný typ parametru.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>Vstupní, výstupní nebo obousměrný parametr</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>vlastnost existující v době návrhu použitá pro generování kódu silného typu.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>Posun v datových typech proměnné délky.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>Název parametru</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>Velikost datových typů proměnné délky (řetězce a pole)</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>Při použití v metodě DataAdapter.Update se jedná o název zdrojového sloupce, který slouží k vyhledání názvu DataSetColumn ve vlastnosti ColumnMappings. Používá se ke kopírování hodnoty mezi parametrem a řádkem dat.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>Při použití v metodě DataAdapter.Update (pouze vlastnost UpdateCommand) se jedná o verzi hodnoty objektu DataRow, která slouží k aktualizaci zdroje dat.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>Při použití v metodě DataAdapter.Update je hodnota parametru změněna z DBNull.Value na (Int32)1 nebo (Int32)0, pokud je hodnota jiná než null.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>Hodnota parametru.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>Kolekci {0} se nepovedlo sestavit, protože se nepovedlo spustit příkaz jazyka SQL. Podrobnosti naleznete v popisu vnitřní výjimky.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>Bylo zadáno více omezení, než podporuje požadované schéma ({0}).</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>{2} není platná hodnota pro omezení {1} kolekce schématu {0}.</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>Požadovaná kolekce ({0}) není definována.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>Požadovaná kolekce ({0}) není podporována touto verzí zprostředkovatele.</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>Chybí jeden z požadovaných sloupců tabulek DataSourceInformation.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>Tabulka DataSourceInformation musí obsahovat přesně jeden řádek.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>Chybí minimálně jeden z požadovaných sloupců kolekce omezení.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>Existuje omezení, pro které v kolekci omezení neexistuje odpovídající řádek.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>V kódu XML metadat chybí kolekce {0}.</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>Jazyk XML metadat je neplatný.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>Jazyk XML metadat je neplatný. Kolekce {0} musí obsahovat sloupec {1} a musí se jednat o sloupec řetězce.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>Jazyk XML metadat je neplatný. Sloupec {1} kolekce {0} musí obsahovat neprázdný řetězec.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>Akce</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>Chování</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>Výplň</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>InfoMessage</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>Mapování</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>Oznámení</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>Schéma</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>Sdružování</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>Pojmenovaný připojovací řetězec ConnectionString</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>Zabezpečení</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>Odolnost připojení</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>Kolekce obsahující vlastní uživatelské informace.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>Určuje, zda se při porovnání řetězců v rámci objektu DataSet rozlišují malá a velká písmena.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>Název tohoto objektu DataSet</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>Určuje vlastní zobrazení dat obsažených v objektu DataSet. Toto zobrazení umožňuje filtrování, hledání a navigaci ve vlastním zobrazení dat.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>Určuje, zda musí být dodržována pravidla omezení.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>Určuje, zda objekt DataSet obsahuje chyby.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>Určuje národní prostředí, ve kterém bude probíhat porovnávání řetězců v rámci objektu DataSet.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>Určuje obor názvů jazyka XML určený identifikátorem URI pro kořenový element, na který odkazuje tento objekt DataSet.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>Určuje předponu oboru názvů použitého pro tento objekt DataSet.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>Kolekce obsahující relace pro tento objekt DataSet.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>Kolekce obsahující tabulky pro tento objekt DataSet</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>Vyvolá se, když není možné sloučit schémata pro dvě tabulky se stejným názvem.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Proběhne po dokončení Initialization.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>Představuje mezipaměť dat v paměti.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>Určuje, zda se při porovnávání řetězců v rámci tabulky rozlišují malá a velká písmena.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>Vrací podřízené relace pro tuto tabulku.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>Kolekce obsahující sloupce této tabulky</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>Kolekce obsahující omezení této tabulky</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>Určuje objekt DataSet, do kterého patří tato tabulka</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>Toto je výchozí objekt DataView pro tabulku.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>Výraz určený k výpočtu datově závislé hodnoty pro tento řádek</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>Určuje, zda tato tabulka obsahuje chyby.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>Určuje národní prostředí, v němž probíhá porovnání řetězců v rámci tabulky.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>Určuje počáteční velikost této tabulky.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>Určuje obor názvů jazyka XML určený identifikátorem URI pro elementy obsažené v této tabulce.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>Určuje vlastnost Prefix oboru názvů použitého pro tuto tabulku v reprezentaci XML.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>Vrací nadřazené relace pro tuto tabulku.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>Určuje sloupce představující primární klíč pro tuto tabulku.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>Určuje kolekci obsahující řádky dat pro tuto tabulku.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>Určuje název, který se bude používat při hledání této tabulky v kolekci Tables objektu DataSet.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>Vyvolá se po úspěšné úpravě řádku v tabulce.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>Vyvolá se při změně řádku, aby mohla obslužná rutina události změnu změnit nebo zrušit. Uživatel může upravit hodnoty v řádku a pro zrušení úpravy by měl vyvolat výjimku.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>Vyvolá se po úspěšném odstranění řádku v tabulce.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>Vyvolá se v případě, že je řádek v tabulce označen k odstranění.  Vyvoláním výjimky zrušíte odstranění.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>Vyvolá se při odeslání hodnoty pro tento sloupec.  Uživatel může změnit navrhovanou hodnotu a zrušit úpravy vyvoláním výjimky.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>Vyvolá se při změně hodnoty tohoto sloupce.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>Proběhne před vymazáním všech řádků z tabulky.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>Proběhne po úspěšném vymazání všech řádků v tabulce.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>Proběhne po vytvoření nové instance objektu DataRow.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>Název použitý při vyhledávání této relace v kolekci Relations tohoto objektu DataSet</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>Určuje podřízené sloupce této relace.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>Určuje nadřazené sloupce této relace.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>Určuje, zda jsou relace vnořené.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>Určuje, jaká kaskádová akce má být provedena nad touto relací při odstranění.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>Určuje, jaká kaskádová akce má být provedena nad touto relací při aktualizaci.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>Určuje, jaká kaskádová akce má být provedena nad touto relací při potvrzení nebo zamítnutí změn.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>Určuje podřízené sloupce tohoto omezení.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>Určuje nadřazené sloupce tohoto omezení.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>Určuje podřízenou tabulku tohoto omezení.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>Určuje sloupce tohoto omezení.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>Určuje, zda je toto omezení primárním klíčem.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>Určuje název tohoto omezení.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>Určuje tabulku tohoto omezení.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>Určuje, zda jsou v tomto sloupci povoleny hodnoty null.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>Označuje, zda se sloupec pro nové řádky přidané do tabulky automaticky sám inkrementuje.  Typ tohoto sloupce musí být Int16, Int32 nebo Int64.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>Určuje počáteční hodnotu pro sloupec AutoIncrement.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>Určuje přírůstek pro sloupec AutoIncrement.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>Určuje výchozí titulek pro tento sloupec zobrazovaný v uživatelském rozhraní.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>Určuje název, který se použije při hledání tohoto sloupce v kolekci Columns objektu DataTable.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>Vrací objekt DataTable, do kterého patří tento sloupec.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>Určuje typ dat uložených v tomto sloupci.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>Určuje výchozí hodnotu sloupce, která se použije při přidání nových řádků do tabulky.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>Určuje hodnotu, která je pro každý řádek tohoto sloupce vypočtena na základě hodnot ostatních sloupců a která nahradí zadání uživatele.</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>Určuje způsob, jakým je tento sloupec uložen v kódu XML: jako atribut, element, uzel s jednoduchým obsahem nebo bez uložení.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>Určuje identifikátor URI v kódu XML pro elementy nebo atributy uložené v tomto sloupci.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>Určuje vlastnost Prefix, která se použije pro tento objekt DataColumn v reprezentaci xml.</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Určuje index tohoto sloupce v kolekci Columns.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>Určuje, zda tento sloupec povoluje změny po přidání řádku do tabulky.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>Určuje, zda tento sloupec vynutí jedinečnost svých hodnot v jednotlivých řádcích tabulky.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>Určuje maximální délku hodnoty povolenou tímto sloupcem.</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>Označuje vlastnost DateTimeMode tohoto objektu DataColumn.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>Určuje, zda tento objekt DataView a jemu přidružené uživatelské rozhraní povolují odstranění.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>Určuje, zda tento objekt DataView a jemu přidružené uživatelské rozhraní povolují úpravy.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>Určuje, zda tento objekt DataView a jemu přidružené uživatelské rozhraní povolují přidání nových řádků.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>Vrací počet položek aktuálně obsažených v tomto zobrazení.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>Vrací ukazatel na objekt DataViewManager, který je vlastníkem tohoto objektu DataSet (pokud existuje).</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>Určuje, zda je toto zobrazení otevřeno.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>Určuje výraz, který se použije k filtrování dat vrácených tímto objektem DataView.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>Určuje verzi dat vrácených tímto objektem DataView.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>Určuje názvy sloupců a řazení, v němž jsou tímto objektem DataView vracena data.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Určuje, zda se v případě, že není nastavena vlastnost Sort, použije výchozí řazení.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>Určuje tabulku, kterou tento objekt DataView použije k získání dat.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>Určuje, zda data vrácená tímto objektem DataView byla nějakým způsobem změněna.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>Určuje zdroj dat pro tento objekt DataViewManager.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>Určuje nastavení řazení, filtrování a stavu pro jakoukoli tabulku v odpovídajícím objektu DataSet.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet nepodporuje pro simpleType atributy union a list.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>Neplatná syntaxe {0}: Chybí povinný atribut {1}.</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>Hodnota {1} je pro atribut {0} neplatná.</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>Hodnota atributu {0} musí být {1} nebo {2}.</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>Název vlastnosti ElementType name={0} nebyl nalezen.</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>V relaci {0} chybí název nadřazené tabulky.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>V relaci {0} chybí název podřízené tabulky.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>V relaci {0} chybí klíč nadřazené tabulky.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>V relaci {0} chybí klíč podřízené tabulky.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>Nedefinovaný datový typ: {0}</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>Není definován datový typ.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>Neplatný výběr XPath uvnitř uzlu pole. Nelze najít: {0}.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>Neplatný výběr XPath uvnitř uzlu selektoru: {0}</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>Neplatný uzel Key uvnitř omezení s názvem {0}.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>Název omezení {0} je již ve schématu použit.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>Typ {0} nejde převést na typ {1}.</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>Chybí část {0} v omezení {1} s názvem {2}.</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>Neplatná definice relace: Délky klíčů jsou různé.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet nepovoluje cyklický odkaz v elementu ComplexType s názvem {0}.</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet nemůže vytvářet instance abstraktního elementu ComplexType pro uzel {0}.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Při zápisu schématu XML došlo k chybě s převaděčem více cílů.  Podrobnosti nejdete v popisu vnitřní výjimky.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Při zápisu schématu XML došlo k chybě s převaděčem více cílů.  Byl vrácen řetězec s hodnotou null nebo prázdný řetězec.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>Duplicitní deklarace {0}</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>Nelze načíst diffGram. V cílové datové sadě chybí tabulka {0}.</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>Nelze načíst diffGram. Chybí uzel sql.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>Název sloupce {0} je definován pro jiné typy mapování.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>Předpona {0} je neplatná, protože obsahuje speciální znaky.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>V tabulce {0} vnořené sama do sebe byl zjištěn cyklický odkaz.</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet nemůže rozšířit entity. Použijte objekt XmlValidatingReader a nastavte vlastnost EntityHandling příslušným způsobem.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>Typ {0} neimplementuje rozhraní IXmlSerializable. Nelze proto pokračovat v serializaci.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>Nejde pokračovat v deserializaci. Data neimplementují rozhraní IXMLSerializable, není proto podporován polymorfismus.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable nepodporuje odvozování schématu z kódu Xml.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>Nelze pokračovat v serializaci objektu DataTable {0}. Obsahuje objekt DataRow, který má několik nadřazených řádků na stejném cizím klíči.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>Ve vstupním schématu chybí atribut IsDataSet.</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>Nelze určit element DataSet. Atribut IsDataSet existuje více než jednou.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet nebude serializovat typy, které implementují rozhraní IDynamicMetaObjectProvider, ale neimplementují také rozhraní IXmlSerializable.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>Funkce není implementována. {0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>Chyba syntaxe: Za operátorem {0} chybí operand.</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>Ve výrazu {0} byla zjištěna neshoda typů.</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>Výraz je příliš složitý.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>Sloupec [{0}] nelze najít.</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>Výraz obsahuje neplatnou řetězcovou konstantu: {0}.</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>Výraz obsahuje nedefinované volání funkce {0}().</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>Ve výrazu byla zjištěna chyba syntaxe.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>Neplatný počet argumentů: funkce {0}().</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>Ve výrazu chybí pravá závorka.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>Token {0} na pozici {1} nelze interpretovat.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>Token na pozici {2} je {1} místo očekávaného {0}.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>Nelze převést z {0} na {1}.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>Hodnotu {0} nejde převést na typ {1}.</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>Neplatný název sloupce: [{0}].</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>Výraz obsahuje neplatnou konstantu typu Date {0}.</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>V seznamu výrazů pro operátor IN jsou povoleny pouze konstantní výrazy.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Chyba v operátoru Like: Řetězcový vzorek {0} je neplatný.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>Chyba syntaxe: Položky následující po klíčovém slovu IN musí být odděleny čárkami a uzavřeny v závorkách.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>Neshoda typů v argumentu funkce: {0}(), argument: {1}, očekáváno: {2}.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>Neshoda typů v argumentu funkce: {0}(), argument {1}. Byl očekáván některý z typů integer.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>Operaci {0} nelze provést na typech {1} a {2}.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>Operátor {0} je nejednoznačný na operandech typu {1} a {2}. Nelze kombinovat typy se znaménkem a bez něj. Použijte prosím explicitní funkci Convert().</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>Chyba syntaxe: Po klíčovém slovu IN musí následovat neprázdný seznam výrazů, které jsou oddělené čárkami a uzavřené v závorkách.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>Výraz obsahuje nepodporovaný operátor {0}.</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>Výraz obsahuje neplatný název: {0}.</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>Chyba syntaxe: Před operátorem {0} chybí operand.</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>Výraz obsahuje příliš mnoho pravých závorek.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>Tabulka [{0}] je zapojená do více než jedné relace. Ve výrazu {1} je nutné explicitně zmínit název relace.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>Chyba syntaxe v agregačním argumentu: Jako argument je očekáván jediný sloupec s případným kvalifikátorem Child.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>Nevázaný odkaz v agregačním výrazu {0}.</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>Nelze vyhodnotit nekonstantní výraz bez aktuálního řádku.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>Ve výrazu {0} byl zjištěn nevázaný odkaz.</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>Nejde vyhodnotit. Výraz {0} není agregace.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>Výraz filtru {0} není vyhodnocen jako výraz typu Boolean.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>Neplatný název typu {0}.</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>Chyba syntaxe ve výrazu Lookup: Očekává se klíčové slovo Parent následované argumentem s jediným sloupcem a případným kvalifikátorem relace: Parent[(&lt;název_relace&gt;)].&lt;název_sloupce&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>Metoda Invoke objektu DataFilter vyžaduje řádek nebo tabulku.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>Argument {0}() je mimo rozsah.</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>Posun a délka byly mimo rozsah pro dané pole nebo je počet vyšší než počet elementů z indexu do konce zdrojové kolekce.</value>
   </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>Chyba syntaxe: Neplatné použití operátoru Is. Správná syntaxe: &lt;expression&gt; [není] Null.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>Objekt typu {0} není možné převést na objekt typu {1}.</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>Hodnota je pro typ {0} buď příliš velká, nebo příliš malá.</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>Jedinou platnou hodnotu pro vlastnost {0} je {1}.</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>Došlo k chybě dělení nulou.</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>Povolené hodnoty pro vlastnost {0} jsou {1} nebo {2}.</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>Nadřazená relace {0} nebyla nalezena.</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>Zadané hodnoty QuotePrefix a QuoteSuffix nejsou stejné.</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>Argument hours je mimo rozsah. Hodnota musí být v rozsahu od -14 do +14.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>Délka argumentu {0} překračuje limit {1}.</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>Argument minutes je mimo rozsah. Hodnota musí být v rozsahu od -59 do +59.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>Hodnota klíče {0} není platná.</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>Zadaný rozsah času jedna překračuje 14 hodin.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>Aby bylo možné použít klíč {0}, musí existovat klíč {1}.</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>Vlastnost druh zadaného argumentu DateTime nesouhlasí s argumenty 'hodiny' a 'minuty'.</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>Délka hodnoty pro klíč {0} překračuje limit délky {1}.</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>DataColumn typu {0} nepodporuje výraz.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>Klíčové slovo není podporované: {0}.</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>Nepovedlo se povolit omezení. Jeden nebo více řádků obsahuje hodnoty porušující tato omezení: hodnota jiná než null, jedinečná hodnota nebo cizí klíč.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>Došlo k vnitřní chybě zprostředkovatele dat .NET Framework {0}.</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>Samotnou kolekci nelze upravovat.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}".</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>Zadaný název {0} odpovídá nejméně dvěma názvům v objektu kolekce, pokud nejsou rozlišována malá a velká písmena, ale neodpovídá ani jednomu z nich, pokud malá a velká písmena rozlišována jsou.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}", nesprávné použití uvozovek</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>Daný název {0} se shoduje s nejméně dvěma názvy v objektu kolekce s různými obory názvů.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}", aktuální limit {2} je nedostatečný.</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>Posun a délka byly mimo rozsah pro dané pole nebo je počet vyšší než počet elementů z indexu do konce zdrojové kolekce.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>Metoda SqlBulkCopy.WriteToServer se nezdařila, protože SqlBulkCopy.DestinationTableName je neplatný název s více částmi.</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>Argument {0} je mimo rozsah.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>Zpracování výsledků ze systému SQL Server se nezdařilo kvůli neplatnému názvu s více částmi.</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>Argument {0} nemůže být null.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName je neplatný název s více částmi.</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>Argument {0} obsahuje hodnotu null.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName je neplatný název více součástí.</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>Sloupec {0} nebyl nalezen.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>Metoda SqlCommand.DeriveParameters se nezdařila, protože hodnota vlastnosti SqlCommand.CommandText představuje neplatný název s více částmi.</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>Sloupec {0} již patří do této tabulky DataTable.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>Připojení k zrcadlené instanci systému SQL Server s použitím možnosti připojení MultiSubnetFailover není podporováno.</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>Sloupec {0} již patří do jiné tabulky DataTable.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>Hodnota výčtu {0}, {1}, není podporována metodou {2}.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>Objekt DataTable nemůže obsahovat více než jeden sloupec SimpleContent.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>Hodnota výčtu {0}, {1}, není podporována zprostředkovatelem dat .NET Framework SqlClient.</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>Do tabulky obsahující sloupce elementů nebo vnořené relace nelze přidat sloupec SimpleContent.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: Vlastnost CommandText nebyla inicializována.</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>Sloupec s názvem {0} již patří do této tabulky DataTable.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: Vlastnost Connection nebyla inicializována.</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>Sloupec s názvem {0} nelze přidat. Do tohoto objektu DataTable již patří vnořená tabulka se stejným názvem.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} vyžaduje otevřený a dostupný element Connection. {1}</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>Sloupec s názvem {0} již patří do tohoto objektu DataTable. Název vnořené tabulky nelze nastavit na stejný název.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>Uložená procedura {0} neexistuje.</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>Nelze odebrat sloupec, který nepatří do této tabulky.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>Transakce není přidružena k aktuálnímu připojení nebo byla dokončena.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>Tento sloupec nelze odebrat, protože je částí primárního klíče.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>Transakce přidružená k aktuálnímu připojení byla dokončena, ale nebyla vyřazena.  Aby mohlo být připojení použito k provedení příkazů SQL, musí být transakce nejprve vyřazena.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>Tento sloupec nelze odebrat, protože je součástí nadřazeného klíče pro relaci {0}.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>{0} vyžaduje, aby měl příkaz transakci, pokud je připojení přiřazeno k příkazu v místní transakci čekající na dokončení.  Vlastnost Transaction příkazu nebyla inicializována.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>Tento sloupec nelze odebrat, protože je součástí omezení {0} v tabulce {1}.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>K tomuto objektu {0} je již přidružen otevřený objekt DataReader, který musí být nejprve zavřen.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>Tento sloupec nelze odebrat, protože je součástí výrazu: {0} = {1}.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>Metoda {0} DeriveParameters podporuje pouze objekt CommandType.StoredProcedure, nikoli objekt CommandType.{1}.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>Vlastnost AutoIncrement nelze nastavit pro vypočítaný sloupec.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>Vlastnost AutoIncrement nelze nastavit pro sloupec s nastavenou vlastností DefaultValue.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>Nelze nastavit hodnotu DefaultValue pro sloupec AutoIncrement.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>Hodnota AutoIncrementStep musí být nenulová.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>Vlastnost ColumnName je požadována v případě, že je součástí objektu DataTable.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>Jakmile sloupec obsahuje data, nelze vlastnost DataType sloupce již změnit.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>Sloupec vyžaduje platnou vlastnost DataType.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>Vlastnost DefaultValue sloupce {0} je typu {1} a nelze ji převést na typ {2}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>Vlastnost DefaultValue sloupce je typu {0} a nelze ji převést na typ {1}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>Vlastnost DefaultValue sloupce {0} je typu {1}, ale sloupec je typu {2}.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>Vlastnost ReadOnly sloupce výrazu nelze změnit.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>Nelze změnit vlastnost Unique pro sloupec výrazu.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>Nelze vytvořit výraz v sloupci typu AutoIncrement nebo Unique.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>Výraz nelze nastavit, protože sloupec nemůže být typu ReadOnly.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>Vlastnost Expression pro sloupec {0} nelze nastavit, protože sloupec je součástí omezení.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>Omezení založené na sloupci Expression {0} nelze vytvořit.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>Vlastnost Expression nelze nastavit, protože výraz obsahuje cyklický odkaz.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>Sloupec {0} obsahuje hodnoty null.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>Sloupec {0} nesmí obsahovat hodnoty null.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>Sloupec {0} je jen pro čtení.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>Sloupec {0} obsahuje hodnoty, které nejsou jedinečné.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>Sloupec {0} nepatří do tabulky {1}.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>Sloupec musí patřit do tabulky.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>Nepovedlo se uložit &lt;{0}&gt; do sloupce {1}.  Očekávaný typ je {2}.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>Sloupec {0} nelze nastavit na hodnotu null. Místo toho prosím použijte DBNull.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>Sloupec {0} nelze nastavit. Hodnota překračuje omezení MaxLength tohoto sloupce.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>Vlastnost MaxLength platí pouze pro datový typ řetězce. Nelze nastavit vlastnost MaxLength sloupce {0} na nezáporné celé číslo.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>Vlastnost MaxLength sloupce {0} nelze nastavit na {1}. V tabulce se nachází alespoň jeden řetězec delší než nové omezení.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Vlastnost MaxLength sloupce {0} nelze nastavit. Jde o sloupec SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>Vlastnost DataType sloupce {0} nelze nastavit na hodnotu {1}. Jde o sloupec SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>Vlastnost MappingType sloupce {0} nelze nastavit na hodnotu SimpleContent. Datový typ sloupce je {1}.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>Sloupec {0} překračuje omezení MaxLength.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>Sloupec {0} nepovoluje hodnotu DBNull.Value.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>Vlastnost Namespace sloupce {0} nelze změnit. Jde o sloupec SimpleContent.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>Vlastnost AutoIncrement objektu DataColumn s typem {0} nelze změnit, jakmile obsahuje data.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>Sloupec {0} nepatří do příslušné tabulky {1}.</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>Objekt DataColumn s typem {0} je typu complexType. Hodnotu složitého typu nelze serializovat jako Attribute.</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>Vlastnost DateTimeMode lze nastavit pouze u objektů DataColumns typu DateTime.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>{0} je neplatná hodnota DataSetDateTime.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>Vlastnost DateTimeMode nelze změnit z {0} na {1}, jakmile tabulka obsahuje data.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Typ {0} neobsahuje statické vlastnosti nebo pole Null.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>Typ {0} neimplementuje rozhraní IRevertibleChangeTracking. Nelze proto pokračovat s metodou RejectChanges().</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>Metody SetAdded a SetModified lze volat pouze u objektů DataRows s nezměněnou hodnotou DataRowState.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>Řadová číslovka {0} je větší než maximální číslo.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>Objekt DataSet nepodporuje strukturu System.Nullable&lt;&gt;.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>Název omezení nelze změnit na prázdný řetězec, pokud je omezení obsaženo v objektu ConstraintCollection.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>Nelze vynutit omezení pro omezení {0}.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>Sloupec {0} je omezen na jedinečné hodnoty.  Hodnota {1} již existuje.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>Omezení {0} nepatří do této tabulky DataTable.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>Nelze najít omezení {0}.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>Omezení se shoduje s jiným omezením (název: {0}), které se již nachází v kolekci.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>Omezení s názvem {0} již patří do této tabulky DataTable.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>Tyto sloupce nyní nemají jedinečné hodnoty.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>Tyto sloupce neodkazují na tuto tabulku.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>Toto omezení nelze povolit, protože některé z hodnot nemají odpovídající nadřazené hodnoty.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>Toto omezení nelze přidat, protože klíč ForeignKey nepatří do tabulky {0}.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>Nelze odebrat omezení, které nepatří do této tabulky.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>Nelze odebrat unikátní omezení '{0}' nelze odebrat. Odeberte nejprve omezení cizího klíče '{1}'.</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>Tento řádek nelze odstranit, protože pro relaci {0} jsou vynucena omezení a odstranění tohoto řádku by způsobilo osiření podřízených řádků.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>Tuto změnu nelze provést, protože pro relaci {0} jsou vynucena omezení a změna této hodnoty by způsobila osiření podřízených řádků.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>Tabulku {0} nelze vymazat, protože objekt ForeignKeyConstraint {1} vynucuje omezení a {2} obsahuje podřízené řádky.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>Objekt ForeignKeyConstraint {0} vyžaduje, aby v nadřazené tabulce existovaly hodnoty podřízeného klíče ({1}).</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>Vlastnost není k dispozici. Důvod: {0}</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>Tento řádek nelze odebrat, protože má podřízené řádky a pro relaci {0} jsou vynucena omezení.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>Omezení primárního klíče nelze přidat, protože v tabulce je již nastaven primární klíč.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>Nelze přidat omezení do objektu DataTable {0}, který představuje podřízenou tabulku ve dvou vnořených relacích.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>Klíč nelze vytvořit ze sloupců, které patří jiným tabulkám.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>Počet sloupců nemůže být 0.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>Počet sloupců nemůže být větší než {0}.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>Klíč nelze vytvořit, pokud je tentýž sloupec uveden více než jednou: {0}.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>Jedinečné omezení nelze odebrat, protože představuje primární klíč tabulky.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>Jedinečné omezení nelze odebrat, protože představuje primární klíč tabulky {0}.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>Nadřazené a podřízené sloupce nemají shodné typy.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>Vlastnosti ParentKey a ChildKey jsou identické.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>Vlastnosti ParentColumns a ChildColumns musí mít stejnou délku.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>Vlastnosti ParentColumns a ChildColumns nesmí mít nulovou délku.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>Řádek nepatří do stejného objektu DataSet jako tato relace.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>Vlastnost RelationName je vyžadována, pokud je součástí objektu DataSet.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>Metoda GetChildRows vyžaduje řádek z tabulky {0}, ale byla zadána tabulka Table {1}.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>Relace by měla propojit dvě tabulky v tomto objektu DataSet a přidat je do objektu DataSet.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>Metoda GetParentRow vyžaduje řádek z tabulky {0}, ale byla zadána tabulka {1}.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>Metoda SetParentRow vyžaduje podřízený řádek z tabulky {0}, ale pro řádek byla zadána tabulka {1}.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>Nelze vytvořit relaci mezi tabulkami v různých objektech DataSets.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>Mezi tabulkami v různých objektech DataSets nelze vytvořit relaci.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>Relace pro tyto podřízené sloupce již existuje.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>Relace nepatří do této kolekce relací.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Tato relace již patří jinému objektu DataSet.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Tato relace již patří tomuto objektu DataSet.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>Relace s názvem {0} již patří do této datové sady DataSet.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>Relace {0} nepatří do tohoto objektu DataSet.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>Relace {0} nebyla nalezena.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>Na prázdné tabulce s hodnotou null nelze vytvořit kolekci.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>Tabulka, pro kterou tato kolekce zobrazuje relace, byla ze svého objektu DataSet odebrána.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>Do kolekce ParentRelation této tabulky lze přidat pouze takovou relaci, kde tato tabulka vystupuje jako podřízená tabulka.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>Do kolekce ChildRelation této tabulky lze přidat pouze relaci, ve které tato tabulka vystupuje jako nadřazená tabulka.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>Vlastnost Nested této relace nelze nastavit na hodnotu false.</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>Stejná tabulka {0} nemůže být podřízenou tabulkou ve dvou podřízených relacích.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>Tabulka ({0}) nemůže být ve vnořených relací podřízenou tabulkou sama sobě.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>Nelze přidat objekt DataRelation nebo Constraint, který obsahuje jiné nastavení Locale nebo CaseSensitive mezi svými nadřazenými a podřízenými tabulkami.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>Nelze vytvořit objekt DataRelation, pokud objekt DataSet neobsahuje nadřazený a podřízený sloupec.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>Vnořená tabulka {0}, která dědí svůj obor názvů, nemůže mít více nadřazených tabulek v různých oborech názvů.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>Vnořená tabulka {0} s prázdným oborem názvů nemůže mít více nadřazených tabulek v různých oborech názvů.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>Řádek nepatří do stejného objektu DataSet jako tato relace.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>Tuto operaci nelze provést na řádku, který není v tabulce.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>Tato relace a podřízený řádek nepatří do stejného objektu DataSet.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>Navrhovanou hodnotu v události RowChanging nelze změnit.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>Metodu EndEdit() nelze volat v rámci události OnRowChanging.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>Metodu BeginEdit() nelze volat v rámci události RowChanging.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>Metodu CancelEdit() nelze volat v rámci události OnRowChanging.  Aktualizaci lze zrušit vyvoláním výjimky.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>Metodu Delete nelze volat v rámci události OnRowDeleting.  Odstranění lze zrušit vyvoláním výjimky.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>Vstupní pole je delší než počet sloupců této tabulky.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>Nelze získat přístup k žádným aktuálním datům.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>Nelze získat přístup k žádným původním datům.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>Nelze získat přístup k žádným navrhovaným datům.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>Tento řádek byl z tabulky odebrán a neobsahuje žádná data.  Metoda BeginEdit() umožní v tomto řádku vytvořit nová data.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>K informacím o odstraněném řádku nelze přistupovat prostřednictvím řádku.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>Pole Version musí mít hodnotu Original, Current nebo Proposed.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>Na pozici {0} se nenachází žádný řádek.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>Pozice {0} vložení řádku je neplatná.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>Hodnota atributu rowOrder ({0}) byla v tabulce s názvem {1} nalezena dvakrát.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>Hodnoty v pořadí rowOrder pro tabulku {0} nebyly nalezeny.</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>Objekt DataRow není obsažen v aktuální kolekci DataRowCollection.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>Tento řádek již patří do jiné tabulky.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>Tento řádek již patří do této tabulky.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>Tento řádek nelze odstranit, protože již byl odstraněn.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>Tento řádek je prázdný.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>Nelze odebrat řádek, který již byl odebrán.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>Podřízený řádek má více nadřazených objektů.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>Nerozpoznaný bitový vzorek stavu řádků</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>Nelze změnit název objektu DataSet na prázdný řetězec.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>Název {0} je neplatný. Objekt DataSet nemůže mít stejný název jako objekt DataTable.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>Obor názvů schématu je neplatný. Doporučený obor: {0}</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>Vlastnost CaseSensitive ani Locale nelze změnit. Tato změna by způsobila, že by minimálně jeden objekt DataRelation nebo Constraint měl různá nastavení vlastností Locale nebo CaseSensitive pro odpovídající tabulky.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>Vlastnost SchemaSerializationMode lze nastavit pouze v případě, že je přepsána odvozeným objektem DataSet.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>Sloupce PrimaryKey nepatří do této tabulky.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>Do tabulky obsahující sloupec SimpleContent nelze přidat vnořenou relaci ani sloupec elementů.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>Vlastnost TableName je vyžadována, pokud je částí objektu DataSet.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>Objekt DataTable již obsahuje sloupec s jednoduchým obsahem.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>Tabulka neobsahuje primární klíč.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} není platnou položkou řetězce Sort.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>DataTable není možné serializovat. Objekt DataTable používaný minimálně v jednom výrazu DataColumn není potomkem aktuálního objektu DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>Tento objekt DataTable lze vzdáleně použít pouze jako součást objektu DataSet. Nejméně jeden sloupec výrazu odkazuje na jiné objekty DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>Pro objekt DataSet a DataTable nemohou existovat různé hodnoty vlastnosti vzdáleného formátu.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>DataTable není možné serializovat. Název objektu DataTable není nastaven.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>Objekt DataTable s názvem {0} již patří do tohoto objektu DataSet.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>Objekt DataTable s názvem {0} se stejným oborem názvů Namespace {1} již do tohoto objektu DataSet náleží.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>Tabulka ({0}) nemůže ve vnořené relaci vystupovat jako tabulka podřízená sobě samé – název objektu DataSet je v konfliktu s názvem tabulky.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>Název {0} je neplatný. Objekt DataTable nemůže mít stejný název objektu DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Objekt DataTable již patří jinému objektu DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Objekt DataTable již patří tomuto objektu DataSet.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>Tabulka {0} nepatří do tohoto objektu DataSet.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>Tabulka {0} nebyla nalezena.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>Tabulku, která má existující relace, nelze odebrat.  Nejprve odeberte relace.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>Tabulku {0} nelze odebrat, protože na ni odkazuje omezení ForeignKeyConstraint {1}.  Nejprve odeberte omezení.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>Objekt DataTable {0} neodpovídá žádnému objektu DataTable ve zdroji.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>V cílovém objektu DataSet nebyla nalezena definice pro {0}.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>V cílovém objektu DataSet nebylo nalezeno omezení {0} {1}.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} a &lt;source&gt;.{0} mají konfliktní vlastnosti: Vlastnost DataType se neshoduje.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>Vlastnosti &lt;target&gt;.PrimaryKey a &lt;source&gt;.PrimaryKey mají různou hodnotu Length.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>Neshoda sloupců ve vlastnosti PrimaryKey: &lt;target&gt;.{0} oproti &lt;source&gt;.{1}</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>Vztah {0} nelze sloučit, protože klíče obsahují neshodné sloupce.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>V cílové tabulce {0} nebyla nalezena definice sloupce {1}.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>Sloupec PrimaryKey {0} neexistuje ve zdrojové tabulce.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>Parametr RowStates musí být nastaven na platnou kombinaci hodnot z výčtu DataViewRowState.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Funkce Find vyhledává řádek na základě pořadí řazení. Pořadí řazení však nebylo určeno.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>Pro indexovaný klíč se očekával tento počet hodnot: {0}, ale byl přijat tento počet hodnot: {1}.</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>Neplatné použití agregační funkce {0}() a typu: {1}</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>Neplatný typ úložiště: {0}</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>Při trvalém uložení objektu DataSet Xml není hodnota {0} podporována jako typ Char. Uložte ji jako typ Byte.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>Typ hodnoty neodpovídá typu sloupce.</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>Typ {0} neimplementuje rozhraní IComparable. Porovnání nelze provést.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>Nelze nastavit {0}.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>Nelze změnit nastavení DataSet objektu DataViewManager aktuálně představující výchozí zobrazení objektu DataSet.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>Vlastnost RowStateFilter nemůže najednou zobrazit položky ModifiedOriginals a ModifiedCurrents.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>Nelze změnit vlastnost Table objektu DefaultView nebo DataView pocházející z objektu DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>Jakmile je vlastnost DataSet nastavena, nelze ji změnit.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>Před použitím objektu DataViewManager je nutné nastavit objekt DataSet.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>Jakmile je vlastnost Table nastavena, nelze ji změnit.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>Před použitím objektu DataView je nutné nastavit vlastnost DataTable.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>Nelze vytvořit vazbu s objektem DataTable, který nemá název.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>Do tohoto seznamu nelze nastavit objekt.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>Pro objekt DataView nelze volat metodu AddNew, pokud vlastnost AllowNew má hodnotu false.</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>Objekt DataView není otevřen.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>Relace není nadřazena tabulce, na kterou ukazuje tento objekt DataView.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>Vlastnost DataSource nelze odstranit, pokud vlastnost AllowDelete má hodnotu false.</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>Vlastnost DataSource nelze upravit, pokud vlastnost AllowEdit má hodnotu false.</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>Index {0} je záporný nebo je počet jeho položek vyšší než počet řádků.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>Do tohoto seznamu nelze přidávat externí objekty.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>Tento seznam nelze vymazat.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>Do tohoto seznamu nelze vkládat externí objekty.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>Odebírat lze pouze objekty, které jsou uvedeny v seznamu.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>Vlastnost {0} není pro tabulku {1} objektem DataColumn ani DataRelation.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>V objektu Range musí být hodnota Min ({0}) menší nebo rovna hodnotě max ({1}).</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>Tento rozsah má hodnotu null.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>Vlastnost MinimumCapacity musí mít nezápornou hodnotu.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>Identifikátor pro název '{0}' nelze generovat.</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>Existuje více tabulek se stejným názvem {0} (přestože obor názvů se může lišit).</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>Sloupec {0}: Typ {1} nemůže nabývat hodnoty NULL.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>Sloupec {0}: Typ {1} neobsahuje konstruktor bez parametrů.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>Sloupec {0}: Typ {1} neobsahuje konstruktor s řetězcovým argumentem.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>Objekt typu {0} není možné převést na objekt typu {1}.</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>Odstraněné řádky jsou nedostupné.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>Duplicitní název není povolen.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>Operace není podporována v události RowChanging.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>Neplatné omezení</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>Chybí primární klíč.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Hodnota Null není povolena.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>Sloupec je označen jen pro čtení.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>Řádek nebyl v tabulce nalezen.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>Verze nebyla nalezena.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>Byla změněna data ReadOnly.</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>Třída DataTableReader je neplatná pro aktuální objekt DataTable {0}.</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>Schéma aktuálního objektu DataTable {0} ve třídě DataTableReader se změnilo, třída DataTableReader je neplatná.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>DataTableReader nelze vytvořit. V objektu DataSet není žádný objekt DataTable.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>DataTableReader není možné vytvořit. Argument je prázdný.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>DataTableReader není možné vytvořit. Argumenty obsahují hodnotu null.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>Aktuální objekt DataRow je ve stavu Deleted nebo Detached.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>Aktuální objekt DataTable {0} je prázdný. V objektu DataTable není žádný objekt DataRow.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>Vnitřní index DataTable je poškozen: {0}.</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>Kolekce byla změněna, operace výčtu pravděpodobně nebude spuštěna.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>Jednoduchý typ {0} již byl deklarován s jinou hodnotou {1}.</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>Neplatné číslování listů</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>Jakmile je přidružený objekt DataSet mapován na načtený dokument XML, název tabulky nelze změnit.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>Jakmile je přidružený objekt DataSet mapován na načtený dokument XML, obor názvů tabulky nelze změnit.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>Jakmile je přidružený objekt DataSet mapován na načtený dokument XML, název sloupce nelze změnit.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>Jakmile je přidružený objekt DataSet mapován na načtený dokument XML, obor názvů sloupce nelze změnit.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>Jakmile je přidružený objekt DataSet mapován na načtený dokument XML, vlastnost ColumnMapping nelze změnit.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>Jakmile je objekt DataSet mapován na načtený dokument XML, nelze v tabulce přidat ani odebrat sloupec.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>Jakmile je objekt DataSet mapován na načtený dokument XML, v objektu DataSet nelze přidat ani odebrat tabulku.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>Jakmile je objekt DataSet mapován na načtený dokument XML, nelze v objektu DataSet přidat, odebrat ani měnit vnořené relace.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>Parametr DataSet je neplatný. Nemůže být null.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>Jakmile je objekt DataSet mapován na načtený dokument XML, název objektu DataSet nelze změnit.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>Tento typ uzlu nelze klonovat: {0}.</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>Objekt XmlDataDocument nelze načíst, pokud již obsahuje data. Použijte prosím nový objekt XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>Objekt DataSet lze přidružit nejvýše k jednomu objektu XmlDataDocument. Objekt DataSet nelze přidružit k aktuálnímu objektu XmlDataDocument, protože objekt DataSet je již přidružen k jinému objektu XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>Před úpravou objektu XmlDataDocument pomocí operací XML je nutné nastavit vlastnost DataSet.EnforceConstraints == false.</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>Metoda GetElementById() není podporována v objektu DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>Nelze vytvořit odkazy na entity v objektu DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>Třída XmlDataDocument nepodporuje funkci Clear u objektu DateSet a DataTable.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>Sloupec nelze odebrat, protože je do této sady dataSet integrován.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>Relaci nelze odebrat, protože je do tohoto elementu dataSet integrována.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>Vyvolá se, když dojde ke změně vlastnosti tohoto ovládacího prvku.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Vyvolá se vždy, když je změněno členství této kolekce.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>Nelze získat hodnotu, protože je DBNull.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>Vlastnost {0} vyžaduje operační systém Microsoft Windows NT nebo operační systém typu WindowsNT.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>Nelze najít požadovaného zprostředkovatele dat .NET Framework.  Je možné, že není nainstalovaný.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>Požadovaná implementace zprostředkovatele dat .NET Framework nemá pole Instance odvozeného typu System.Data.Common.DbProviderFactory.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>Nelze najít nebo načíst registrovaného zprostředkovatele dat .NET Framework.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>Chybí požadovaný kvalifikovaný název sestavení zprostředkovatele dat .NET Framework.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>Povoleny jsou pouze elementy.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>Podřízené uzly nejsou povoleny.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>Nerozpoznaný atribut{0}</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>Nerozpoznaný element</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>Oddíl {0} může být v konfiguračním souboru pouze jednou.</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>Nenašel se povinný atribut {0}.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>Požadovaný atribut {0} nesmí být prázdný.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>Bylo očekáváno neprázdné pole pro parametr {0}.</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>Jedinou platnou hodnotu pro vlastnost {0} je {1}.</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>Povolené hodnoty pro vlastnost {0} jsou {1} nebo {2}.</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>Zadané hodnoty QuotePrefix a QuoteSuffix nejsou stejné.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>Délka argumentu {0} překračuje limit {1}.</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>Byl očekáván argument typu {1}, byl však přijat typ {0}.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>Hodnota klíče {0} není platná.</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>Aby bylo možné použít klíč {0}, musí existovat klíč {1}.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>Délka hodnoty pro klíč {0} překračuje limit délky {1}.</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>Klíčové slovo není podporované: {0}.</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>Soubor UDL nelze načíst.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>Soubor UDL je neplatný.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>Došlo k vnitřní chybě zprostředkovatele dat .NET Framework {0}.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>Po vygenerování příkazu Insert, Update nebo Delete již nelze vlastnosti QuotePrefix a QuoteSuffix změnit.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>Vlastnost DataAdapter.SelectCommand musí být inicializována.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>Vlastnost DataAdapter.SelectCommand.Connection musí být inicializována;</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}".</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}", nesprávné použití uvozovek</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}", aktuální limit {2} je nedostatečný.</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>Metoda SqlBulkCopy.WriteToServer se nezdařila, protože SqlBulkCopy.DestinationTableName je neplatný název s více částmi.</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>Zpracování výsledků ze systému SQL Server se nezdařilo kvůli neplatnému názvu s více částmi.</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName je neplatný název s více částmi.</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName je neplatný název více součástí.</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>Metoda SqlCommand.DeriveParameters se nezdařila, protože hodnota vlastnosti SqlCommand.CommandText představuje neplatný název s více částmi.</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>Metoda OdbcCommandBuilder.DeriveParameters se nezdařila, protože hodnota vlastnosti OdbcCommand.CommandText představuje neplatný název s více částmi.</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>Metoda OleDbCommandBuilder.DeriveParameters se nezdařila, protože hodnota vlastnosti OleDbCommandBuilder.CommandText představuje neplatný název s více částmi.</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>Připojení k zrcadlené instanci systému SQL Server s použitím možnosti připojení MultiSubnetFailover není podporováno.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>Mapování sloupce ze SourceColumn {0} se nezdařilo, protože DataColumn {1} je vypočítaný sloupec.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>Neshodné typy SourceColumn {0} z(e) {1} a DataColumn {2} z(e) {3} nelze převést.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>V objektu DataTable {1} pro vlastnost SourceColumn {2} chybí objekt DataColumn {0}.</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>Hodnota SourceColumn musí být neprázdný řetězec.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>Mapování vlastnosti SourceColumn pro {0} nebylo nalezeno.</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Hodnota výčtu {0}, {1}, není podporována metodou {2}.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Hodnota výčtu {0}, {1}, není podporována zprostředkovatelem dat .Net Framework Odbc.</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Hodnota výčtu {0}, {1}, není podporována zprostředkovatelem dat .Net Framework OleDb.</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Hodnota výčtu {0}, {1}, není podporována zprostředkovatelem dat .NET Framework SqlClient.</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>Nelze načíst ComputerNameDnsFullyQualified, {0}.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>Chybí objekt DataTable {0} pro SourceTable {1}.</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>Hodnota SourceTable musí být neprázdný řetězec.</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>Mapování vlastnosti SourceTable {0} nebylo nalezeno.</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: Vlastnost CommandText nebyla inicializována.</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: Vlastnost Connection nebyla inicializována.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} vyžaduje otevřený a dostupný element Connection. {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: Vlastnost SelectCommand.Connection nebyla inicializována.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: Vlastnost SelectCommand.Connection nebyla inicializována.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: Vlastnost SelectCommand.Connection nebyla inicializována.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>Metoda Update vyžaduje, aby událost InsertCommand měla objekt připojení. Vlastnost Connection události InsertCommand nebyla inicializována.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>Metoda Update vyžaduje, aby událost UpdateCommand měla objekt připojení. Vlastnost Connection události UpdateCommand nebyla inicializována.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>Metoda Update vyžaduje, aby událost DeleteCommand měla objekt připojení. Vlastnost Connection události DeleteCommand nebyla inicializována.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>Metoda Update vyžaduje objekt připojení.  Vlastnost Connection nebyla inicializována.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>Metoda Update vyžaduje, aby klon příkazu obsahoval objekt připojení. Vlastnost Connection klonu příkazu nebyla inicializována.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>Aktualizace vyžaduje připojení.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Metoda Update vyžaduje, aby událost {0}Command měla otevřený objekt připojení. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Metoda Update vyžaduje, aby událost {0}Command měla otevřený objekt připojení. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Metoda Update vyžaduje, aby událost {0}Command měla otevřený objekt připojení. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Metoda Update vyžaduje, aby aktualizační příkaz disponoval objektem otevřeného připojení. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>Uložená procedura {0} neexistuje.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>Transakce přiřazená tomuto příkazu musí být nejvíce vnořená čekající místní transakce.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>Transakce není přidružena k aktuálnímu připojení nebo byla dokončena.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>Transakce přidružená k aktuálnímu připojení byla dokončena, ale nebyla vyřazena.  Aby mohlo být připojení použito k provedení příkazů SQL, musí být transakce nejprve vyřazena.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>{0} vyžaduje, aby měl příkaz transakci, pokud je připojení přiřazeno k příkazu v místní transakci čekající na dokončení.  Vlastnost Transaction příkazu nebyla inicializována.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>Již existuje otevřená třída SqlResultSet asociovaná s tímto příkazem, kterou je nutné nejdříve zavřít.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>K tomuto objektu {0} je již přidružen otevřený objekt DataReader, který musí být nejprve zavřen.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>Metoda {0} DeriveParameters podporuje pouze objekt CommandType.StoredProcedure, nikoli objekt CommandType.{1}.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>Metodu {0} lze pro stejné provádění volat pouze jednou.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>Nesprávný asynchronní výsledek</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>Vlastnost SelectCommand nebyla před voláním {0} inicializována.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>Třída StatementType {0} zde není očekávána.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: V názvu SourceTable byl očekáván neprázdný řetězec.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>Hodnota MaxRecords {0} je neplatná. Hodnota musí být větší nebo rovna 0.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>Hodnota StartRecord {0} je neplatná. Hodnota musí být větší nebo rovna 0.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: V názvu SourceTable byl očekáván neprázdný řetězec.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>Hierarchické sloupce kapitol musí být mapovány na vlastnost AutoIncrement objektu DataColumn.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>Metoda DataReader.GetFieldType({0}) vrátila hodnotu null.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>Do pole dataTables zadejte při použití nenulových hodnot pro vlastnost startRecords nebo maxRecords pouze jednu položku.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Metoda Update nenalezla element TableMapping[{0}] ani objekt DataTable {0}.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update: Byl očekáván neprázdný název SourceTable.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>Vlastnost TableMapping při hodnotě TableMapping.DataSetTable={0} nebyla nalezena.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Metoda Update vyžaduje, aby klon příkazu byl platný.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>Automatické generování SQL v průběhu metody Update vyžaduje platnou událost SelectCommand.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Metoda Update vyžaduje při předání kolekce DataRow s novými řádky platnou událost InsertCommand.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>Metoda Update vyžaduje při předání kolekce DataRow se změněnými řádky platnou událost UpdateCommand.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Metoda Update vyžaduje při předání kolekce DataRow s odstraněnými řádky platnou událost DeleteCommand.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>Element DataRow[{0}] pochází z jiného objektu DataTable než element DataRow[0].</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: Došlo k chybám. Další informace nejsou k dispozici.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: Došlo k chybám. Další informace nejsou k dispozici.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>Při dávkovém zpracování není hodnota vlastnosti UpdatedRowSource UpdateRowSource.FirstReturnedRecord nebo UpdateRowSource.Both příkazu platná.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>Narušení souběžného zpracování: Událost UpdateCommand ovlivnila {0} z(e) {1} očekávaných záznamů.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>Narušení souběžného zpracování: Událost DeleteCommand ovlivnila {0} z(e) {1} očekávaných záznamů.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>Narušení souběžného zpracování: Dávkový příkaz ovlivnil {0} z(e) {1} očekávaných záznamů.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>Metodu {0} lze pro stejné provádění volat pouze jednou.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>Neplatná hodnota CommandTimeout {0}. Hodnota musí být větší nebo rovna 0.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: Vlastnost Size má neplatnou velikost 0.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>Metoda {0}.Prepare vyžaduje, aby měly všechny parametry explicitně nastaven typ.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>Metoda {0}.Prepare vyžaduje, aby všechny parametry s proměnnou délkou měly explicitně nastavenu nenulovou hodnotu Size.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>Metoda {0}.Prepare vyžaduje, aby parametry typu {1} měly explicitně nastaveny hodnoty Precision a Scale.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>Neodpovídající volání koncové metody pro třídu asyncResult.  Bylo očekáváno volání metody {0}, místo toho však byla volána metoda {1}.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>Neplatná operace Připojení je zavřené.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>Připojení bylo zakázáno.</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>Nelze zařadit do transakce, protože v rámci připojení probíhá místní transakce.  Dokončete místní transakci a zkuste to znovu.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>Pro připojení je momentálně zařazena transakce.  Dokončete aktuální transakci a potom akci opakujte.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>Databáze nemůže nabývat hodnoty NULL, prázdného řetězce ani řetězce, který obsahuje pouze prázdné znaky.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>Argument je příliš dlouhý.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Neplatná hodnota Connect Timeout. Hodnota musí být celočíselná a větší nebo rovna 0.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>Neplatný posun zdrojové vyrovnávací paměti (velikost: {0}, posun: {1})</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>Neplatný posun cílové vyrovnávací paměti (velikost: {0}, posun: {1})</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>Číselná hodnota je příliš velká. Nemůže ji obsahovat desítková 96bitová hodnota.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>Pokus o {0} při zavřeném datovém proudu je neplatný.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>Zadaná hodnota SeekOrigin je neplatná.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>Dynamické generování SQL není podporováno pro více základních tabulek.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>Dynamické generování SQL není podporováno pro vlastnost SelectCommand, která nevrací žádné informace o základní tabulce.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>Dynamické generování SQL pro vlastnost DeleteCommand není podporováno pro vlastnost SelectCommand, která nevrací žádné informace o sloupci klíče.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>Dynamické generování SQL pro vlastnost UpdateCommand není podporováno pro vlastnost SelectCommand, která nevrací žádné informace o sloupci klíče.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>Dynamické generování SQL pro vlastnost DeleteCommand není podporováno pro vlastnost SelectCommand, která neobsahuje sloupec verze řádku.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>Dynamické generování SQL pro vlastnost UpdateCommand není podporováno pro vlastnost SelectCommand, která neobsahuje sloupec verze řádku.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>Dynamické generování SQL není podporováno pro názvy tabulek {0} obsahující znak {1} QuotePrefix nebo QuoteSuffix.</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>Pokus o čtení ze sloupce s ordinálním číslem {0} se nezdařil.  S vlastností CommandBehavior.SequentialAccess lze číst pouze ze sloupce s pořadovým číslem{1} a vyšším.</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>Datový typ {0} nelze formátovat jako literál, protože má neplatné číslice data a času.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>Hodnotu nelze formátovat jako literál požadovaného typu.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>Datový typ {0} nelze formátovat jako literál, protože obsahuje neplatný maximální rozsah.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>Zadaná hodnota literálu není platná hodnota literálu pro datový typ {0}.</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>{0}:Délka hodnoty literálu musí být sudá.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>{0}:Hodnota literálu musí být řetězec s šestnáctkovými číslicemi.</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>{0} vyžaduje otevřené připojení, pokud nebyla nastavena předpona řetězce v uvozovkách.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>Nelze určit správné logické hodnoty literálu. Nelze vytvářet logické literály.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>Literály nativního datového typu přidružené k datovému typu {0} nejsou podporovány.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>Datový typ parametru {0} je neplatný.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>Neexistuje žádné mapování z objektu typu {0} na známý nativní typ spravovaného zprostředkovatele.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>Nelze ošetřit neznámý typ objektu TypeCode {0} vrácený objektem Type {1}.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>Neexistuje žádné mapování vlastnosti DbType {0} na známý typ {1}.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>Používaná verze SQL Serveru nepodporuje datový typ {0}.</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>Hodnota parametru {0} je mimo rozsah.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>Zadaný název parametru {0} není platný.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>Více parametrů vrácené hodnoty není podporováno.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>Neplatná hodnota {0} parametru Size. Hodnota musí být větší nebo rovna 0.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>Hodnota argumentu {0} je neplatná. Hodnota musí být větší nebo rovna 0.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>Neplatná hodnota pro tato metadata</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>Metadata musí být SqlDbType.Row</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>Hodnotu parametru nelze převést z {0} na {1}.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} nepodporuje paralelní transakce.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>Tato transakce {0} byla dokončena a nelze ji již použít.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>{0} nelze volat, pokud je záznam určen jen pro čtení.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>{0} nelze volat, pokud je třída DbDataRecord určena jen pro čtení.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>Implicitní převod objektu typu {0} na datový typ {1} není podporován.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>Posun vyrovnávací paměti {1} zvýšený o počet dostupných bajtů {0} je vyšší než délka předané vyrovnávací paměti.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>Délka dat {0} je menší než 0.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>Zadaná délka {0} je mimo rozsah.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>Pokus {2} (dataIndex:{0}) je neplatný.  Pomocí pole CommandBehavior.SequentialAccess lze číst pouze od hodnoty dataIndex {1} nebo vyšší.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>Hodnota posunu musí odkazovat na umístění ve stejné hodnotě.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>Zprostředkovatel spravovaný rozhraním ODBC vyžaduje, aby bylo zadáno omezení TABLE_NAME a nebylo null pro kolekci indexů GetSchema.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>Neplatná hodnota argumentu pro metodu {0}</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>Zprostředkovatel dat ODBC nevrátil výsledky z rozhraní SQLGETTYPEINFO.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>Neočekávaný argument DataTable s hodnotou null</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>Neočekávaný argument DataSet s hodnotou null</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>Připojovací řetězec překročil maximální povolenou délku {0}.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} – nelze mapovat typ.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>Neznámý typ SQL: {0}.</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>Neznámý typ URT: {0}.</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>Neplatný záporný argument</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>Nelze nastavit vlastnost otevřeného připojení.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>Neexistuje platné mapování pro SQL_TRANSACTION {0} na hodnotu výčtu System.Data.IsolationLevel.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} – nelze povolit sdružování připojení…</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} – nelze přidělit popisovač prostředí.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} – nelze získat popisovač popisovače.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>Bez účasti v transakci</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>Neplatná hodnota výčtu OdbcType: {0}.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>Použijte metodu IsDBNull, pokud jsou očekávána data DBNull.Value.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} – informace o chybě není k dispozici.</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>Připojení je zavřené.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>Interní připojení nemá vlastníka.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>Zprostředkovatel dat .NET Framework rozhraní ODBC vyžaduje součásti rozhraní MDAC (Microsoft Data Access Components) verze 2.6 nebo novější.  Našla se aktuálně nainstalovaná verze {0}.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>Zprostředkovatel dat .NET Framework rozhraní OLEDB vyžaduje součásti rozhraní MDAC (Microsoft Data Access Components) verze 2.6 nebo novější.  Našla se aktuálně nainstalovaná verze {0}.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>Rozhraní {0} není zprostředkovatelem {1} podporováno.  GetOleDbSchemaTable není u aktuálního zprostředkovatele k dispozici.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>Došlo k chybě {0}. K dispozici není žádná chybová zpráva, kód výsledku: {1}.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>K dispozici není žádná chybová zpráva, kód výsledku: {0}.</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>Zprostředkovatelé dat .NET Framework vyžadují rozhraní MDAC (Microsoft Data Access Components).  Nainstalujte rozhraní MDAC (Microsoft Data Access Components) verze 2.6 nebo novější.</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>Zprostředkovatel dat .NET Framework pro OLEDB (Microsoft.Data.OleDb) nepodporuje zprostředkovatele Microsoft OLE DB pro ovladače ODBC (MSDASQL). Použijte zprostředkovatele dat .NET Framework pro ODBC (System.Data.Odbc).</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>Zprostředkovatel dat .NET Framework pro OLEDB nepovolí zprostředkovateli OLE DB Provider zobrazovat uživateli výzvy v neinteraktivním prostředí.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>Zprostředkovatel {0} není registrován v místním počítači.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>Rozhraní ICommandText není podporováno zprostředkovatelem {0}. Místo toho použijte CommandType.TableDirect.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>Rozhraní ITransactionLocal není podporováno zprostředkovatelem {0}.  Místní transakce nejsou u aktuálního zprostředkovatele k dispozici.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>Formát inicializačního řetězce neodpovídá specifikaci OLE DB.  Začíná kolem char[{0}] v připojovacím řetězci.</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>Asynchronní zpracování není podporovanou funkcí zprostředkovatele dat .NET Framework OLE DB (Microsoft.Data.OleDb).</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>V ConnectionString nebyl zadán zprostředkovatel OLE DB.  Příkladem může být Provider=SQLOLEDB;.</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>Zprostředkovatel dat OLE DB zadaný ve vlastnosti ConnectionString je příliš dlouhý.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>Pro pole DbInfoKeywords objektu OleDbSchemaGuid se neočekávají žádná omezení.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>Pro pole DbInfoLiterals objektu OleDbSchemaGuid se neočekávají žádná omezení.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>Pro objekt OleDbSchemaGuid identifikátoru guid schématu se neočekávají žádná omezení.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>Zprostředkovatel {1} nepodporuje schéma OleDbSchemaGuid {0}.</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>Nastavení konfigurace {0} má nesprávný počet hodnot.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>Nelze načíst soubor XML zadaný v nastavení konfigurace {0}.</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>Parametr příkazu [{0}] {1} je neplatný.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>Hodnotu dat parametru příkazu [{0}] {1} nebylo možné převést z jiných důvodů, než je neshoda ve znaménku nebo přetečení dat.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>Převod parametru příkazu [{0}] {1} se nezdařil, protože hodnota dat je typu se znaménkem a typ použitý zprostředkovatelem je bez znaménka.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>Převod parametru příkazu [{0}] {1} se nezdařil, protože hodnota dat přesáhla typ použitý zprostředkovatelem.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>Zprostředkovatel zjistil chybu při odesílání hodnoty parametru příkazu [{0}] {1} a zastavil zpracování.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>Parametr [{0}] {1} nemá výchozí hodnotu.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>Došlo k chybě v parametru [{0}]: {1}.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Vnitřní chyba objektu Microsoft.Data.OleDb.OleDbDataAdapter: neplatný přistupující objekt parametru: {0} {1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter[{0}]: Vlastnost OleDbType není inicializována: OleDbType.{1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>Rozhraní ICommandWithParameters není podporováno zprostředkovatelem {0}.  Parametry příkazu nejsou u aktuálního zprostředkovatele podporovány.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>Zprostředkovatel {0} nepodporuje načítání informací o parametrech procedury.</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>Nelze určit oddělovač desetinných míst serveru. Číselné literály, které nejsou typu integer, nelze vytvořit.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>Objekt není typu ADODB.RecordSet ani ADODB.Record.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>Z objektu ADODB.RecordSet nelze získat rozhraní {0}.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: Vlastnost Size má neplatnou velikost 0.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>Z objektu ADODB.Record nelze získat rozhraní IRow.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>Metoda {0}.Prepare vyžaduje, aby měly všechny parametry explicitně nastaven typ.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>Typ nepodporuje rozhraní OLE DB ISourcesRowset.</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>Metoda {0}.Prepare vyžaduje, aby všechny parametry s proměnnou délkou měly explicitně nastavenu nenulovou hodnotu Size.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>Nelze vytvořit kolekci schématu ReservedWords, protože zprostředkovatel nepodporuje rozhraní IDBInfo.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>Metoda {0}.Prepare vyžaduje, aby parametry typu {1} měly explicitně nastaveny hodnoty Precision a Scale.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>Hodnota vlastnosti nebyla nastavena, protože zprostředkovatel nepodporoval vlastnost {0} nebo se uživatel pokusil získat nebo nastavit hodnoty vlastností neexistující ve skupině vlastností Initialization a objekt zdroje dat není inicializován.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>Neodpovídající volání koncové metody pro třídu asyncResult.  Bylo očekáváno volání metody {0}, místo toho však byla volána metoda {1}.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>Inicializace vlastnosti {0} se nezdařila z jednoho z následujících důvodů:
-	Datový typ hodnoty nebyl datovým typem vlastnosti nebo nebyl null. Vlastnost byla například DBPROP_MEMORYUSAGE, která má datový typ Int32 a datový typ byl Int64.
-	Hodnota nebyla platná. Vlastnost byla například DBPROP_MEMORYUSAGE a hodnota byla záporná.
-	Hodnota byla platnou hodnotou vlastnosti a zprostředkovatel podporuje vlastnost jako nastavitelnou vlastnost, ale zprostředkovatel zadanou hodnotu nepodporuje. To zahrnuje případ, kdy byla hodnota přidána do vlastnosti v OLE DB po zápisu zprostředkovatele.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>Neplatná operace Připojení je zavřené.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>Hodnota Options byla neplatná.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>Nelze zařadit do transakce, protože v rámci připojení probíhá místní transakce.  Dokončete místní transakci a zkuste to znovu.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>Element ColumnID byl neplatný.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>Pro připojení je momentálně zařazena transakce.  Dokončete aktuální transakci a potom akci opakujte.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>Byla zadána vlastnost {0}, která by měla být použita pro všechny sloupce, minimálně u jednoho z nich však být použita nemohla.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>Databáze nemůže nabývat hodnoty NULL, prázdného řetězce ani řetězce, který obsahuje pouze prázdné znaky.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>Vlastnost {0} byla jen pro čtení nebo se uživatel pokusil nastavit hodnoty vlastností ve skupině vlastností Initialization po inicializaci objektu zdroje dat. Uživatelé mohou nastavit hodnotu vlastnosti jen pro čtení na aktuální hodnotu. Tento stav se vrátí také v případě, že nebylo možné pro daný sloupec nastavit nastavitelnou hodnotu sloupce.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>Neplatný posun zdrojové vyrovnávací paměti (velikost: {0}, posun: {1})</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>Volitelná hodnota vlastnosti {0} nebyla nastavena na zadanou hodnotu. Vlastnost tedy nebylo možné nastavit na zadanou hodnotu.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>Neplatný posun cílové vyrovnávací paměti (velikost: {0}, posun: {1})</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>Hodnota vlastnosti {0} nebyla nastavena, protože tím by došlo ke konfliktu s existující vlastností.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>Pokus o {0} při zavřeném datovém proudu je neplatný.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(Rezervováno).</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>Zadaná hodnota SeekOrigin je neplatná.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>Zprostředkovatel vrátil neznámou hodnotu DBPROPSTATUS_ {0}.</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>Pokus o čtení ze sloupce s ordinálním číslem {0} se nezdařil.  S vlastností CommandBehavior.SequentialAccess lze číst pouze ze sloupce s pořadovým číslem{1} a vyšším.</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>Ověření přistupujícího objektu bylo odloženo a bylo provedeno v době, kdy metoda vrátila data. Vazba byla pro tento sloupec nebo parametr neplatná.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>Datový typ parametru {0} je neplatný.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>Vnitřní chyba objektu OleDbDataAdapter: Neplatný přístupový objekt k sadě řádků: Ordinal={0} Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>Neexistuje žádné mapování z objektu typu {0} na známý nativní typ spravovaného zprostředkovatele.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>Hodnotu dat nebylo možné převést z jiných důvodů, než je neshoda ve znaménku nebo přetečení dat. Data byla například poškozena v úložišti dat, ale řádek bylo stále možné načíst.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>Nelze ošetřit neznámý typ objektu TypeCode {0} vrácený objektem Type {1}.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>Zprostředkovatel nemohl přidělit paměť ke vrácení dat {0}.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>Neexistuje žádné mapování vlastnosti DbType {0} na známý typ {1}.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>Převod se nezdařil, protože hodnota dat {0} přesáhla typ určený pro část hodnoty {0} ve vyrovnávací paměti uživatele.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>Používaná verze SQL Serveru nepodporuje datový typ {0}.</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>Vnitřní chyba objektu OleDbDataAdapter: [get] Neznámý datový typ OLE DB: 0x{0} ({1}).</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>Hodnota parametru {0} je mimo rozsah.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>Převod se nezdařil, protože hodnota dat {0} je typu se znaménkem a typ zadaný pro část hodnoty {0} ve vyrovnávací paměti uživatele je bez znaménka.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>Zadaný název parametru {0} není platný.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>Vnitřní chyba objektu OleDbDataAdapter: [set] Neznámý datový typ OLE DB: 0x{0} ({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>Neplatná hodnota {0} parametru Size. Hodnota musí být větší nebo rovna 0.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>Zprostředkovatel nedokázal určit hodnotu {0}. Řádek byl například právě vytvořen, výchozí hodnota pro sloupec {0} nebyla k dispozici a uživatel ještě nenastavil novou hodnotu {0}.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>Hodnota argumentu {0} je neplatná. Hodnota musí být větší nebo rovna 0.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>Zprostředkovatel dat OLE DB vrátil neočekávanou stavovou hodnotu {0}.</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>Neplatná hodnota pro tato metadata</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>Metoda OleDbDataReader.Read musí být volána ze stejného vlákna, ve kterém byla vytvořena. To platí v případě, že vlastnost ApartmentState tohoto vlákna nemá hodnotu ApartmentState.MTA.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>Hodnotu parametru nelze převést z {0} na {1}.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>Nespecifikovaná chyba: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} nepodporuje paralelní transakce.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>Funkce IErrorInfo.GetDescription selhala – {0}.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>Tato transakce {0} byla dokončena a nelze ji již použít.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>Funkce IErrorInfo.GetSource selhala – {0}.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>Zadaná délka {0} je mimo rozsah.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>Zprostředkovatel dat OLE DB .NET Framework (Microsoft.Data.OleDb) nepodporuje data typu DBTYPE_VECTOR.</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>Pokus {2} (dataIndex:{0}) je neplatný.  Pomocí pole CommandBehavior.SequentialAccess lze číst pouze od hodnoty dataIndex {1} nebo vyšší.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>Neplatné hodnoty maximální a minimální velikosti fondu. Minimální velikost fondu nemůže být větší než maximální.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>Klíčové slovo {0} je zastaralé. Místo toho použijte možnost {1}.</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>Ze serveru nelze získat adresu DTC (Distributed Transaction Coordinator) pro server.  Je na serveru povolená služba DTC?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>Délka hodnoty parametru připojení &lt;{0}&gt; překročila povolený počet 65535 znaků.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>Neplatná hodnota velikosti paketu.  Hodnota musí být celé číslo &gt;= 512 a &lt;= 32768.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>Neplatná transakce nebo neplatný název bodu pro uložení v rámci transakce.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>Hodnota výčtu {0}, {1}, není podporována systémem SQL Server 7.0 ani systémem SQL Server 2000.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>User Instance a Failover nejsou kompatibilní možnosti.  V připojovacím řetězci zvolte pouze jednu z obou možností.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>Pokud je v připojovacím řetězci nastavená možnost Authentication=Active Directory Integrated, nejde nastavit vlastnost Credential.</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>Byly zadány nesprávné parametry ověřování pro ověřování certifikátem.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>Instance systému SQL Server, ke které jste se pokusili připojit, vyžaduje šifrování, ale tento počítač ho nepodporuje.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>Instance systému SQL Server, ke které jste se pokusili připojit, nepodporuje šifrování.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>Instance serveru SQL Server, ke které jste se pokusili připojit, nepodporuje CTAIP.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>Verze systému SQL Server není podporovaná.  Zprostředkovatele dat .NET Framework SqlClient lze použít pouze se systémem SQL Server verze 7.0 nebo novější.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>{0} nelze změnit, pokud probíhá asynchronní operace.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>Tento příkaz vyžaduje asynchronní připojení. Nastavte v připojovacím řetězci hodnotu Asynchronous Processing=true.</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>Časový limit pokusu o připojení vypršel.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>Časový limit vypršel.  V důsledku toho bylo připojení přerušeno.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>Chyba instance</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>Kód chyby: 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword vyžaduje SQL Server 9.0 nebo vyšší verzi.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>Přesměrování instance SSE není podporováno u uživatelských instancí, které nejsou místní.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>Ověřování {0} není podporované.</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>Metoda ověřování SQL {0} není podporována.</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>Pro {0} se nepodařilo vytvořit instanci zprostředkovatele ověřování s typem {1}.</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>Nepodařilo se vytvořit instanci SqlAuthenticationInitializer s typem {0}.</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>Při inicializaci zprostředkovatele {0} došlo k výjimce.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>Zprostředkovatel {0} nepodporuje ověřování {1}.</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Pro {0} nelze najít zprostředkovatele ověřování. Nainstalujte balíček NuGet Microsoft.Data.SqlClient.Extensions.Azure (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure), abyste mohli používat metody ověřování Active Directory (Entra ID).</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>Nepodařilo se přečíst konfigurační oddíl zprostředkovatelů ověřování.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Parametr {0} nesmí obsahovat hodnotu Null ani nesmí být prázdný.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>Asynchronní operace již byla dokončena.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>V provádění příkazu nelze pokračovat, protože probíhá asynchronní operace čekající na dokončení.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>Metodě ExecuteXmlReader byl odeslán neplatný příkaz.  Příkaz musí vracet výsledek Xml.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>Upozornění vyžadují SQL Server 9.0 nebo vyšší verze.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>Neplatný formát názvu sestávajícího ze 3 částí pro vlastnost UdtTypeName.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>Balíček SSPI nelze inicializovat.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Časový limit vypršel.  Před dokončením operace vypršel časový limit nebo server neodpovídá.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>Vypršel časový limit připojení.  Časový limit vypršel na začátku fáze před přihlášením.  Důvodem může být to, že pro časový limit připojení byl určen nedostatečný časový interval.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>V připojovacím řetězci byla vyžadována uživatelská instance, ale zadaný server tuto možnost nepodporuje.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>Certifikát serveru neprošel ověřením aplikace.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>Zadaná délka dat {0} překračuje maximální povolenou délku {1}.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>Došlo k neplatnému pokusu o čtení, protože data nebyla k dispozici.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>Délka dat {0} je menší než 0.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>{0} nelze volat, pokud je třída SqlDataRecord určena jen pro čtení.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>Namapovaná kolekce se používá a nelze k ní momentálně získat přístup;</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>Připojení ke kontextu pomocí Microsoft.Data.SqlClient není podporováno.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>Vnořené objekty TransactionScopes nejsou podporovány.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>Neočekávaná událost serveru: {0}</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>Délka argumentu {0} se musí shodovat s délkou argumentu {1}.</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>Hodnota SqlDbType {0} je pro {1} neplatná.  Podporuje se pouze {2}.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>Příliš mnoho hodnot</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>Stream nepodporuje zápis.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>Null</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>Zpráva</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>Aritmetické přetečení</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>Došlo k chybě dělení nulou.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>Data mají hodnotu Null. Tuto metodu nebo vlastnost nelze volat s hodnotami Null.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>Číselná aritmetika způsobila zkrácení.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>Přetečení SqlDateTime. Hodnota musí být v rozsahu od 1.1.1753 12:00:00 do 31.12.9999 23:59:59.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>Dva řetězce určené ke zřetězení mají různé kolace.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>Dva řetězce určené k porovnání mají různé kolace.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>Neplatná hodnota příznaku</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>Přetečení převodu z typu SqlDecimal na typ Decimal</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>Přetečení převodu</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>Neplatná hodnota SqlDateTime</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>Bylo zadáno časové pásmo. SqlDateTime nepodporuje časová pásma.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>Neplatná velikost pole</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>Neplatná číselná přesnost nebo exponent</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>Vstup nebyl ve správném formátu.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>Chyba SqlType</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>Třída SqlBytes ani třída SqlChars v této verzi nepodporuje délku větší než 2 GB.</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>Při čtení došlo k chybě.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Stream byl zavřen nebo zrušen.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>Není k dispozici žádná vyrovnávací paměť. Operace čtení nebo zápisu se nezdařila.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>Nelze nastavit na nenulovou délku, protože aktuální hodnota je Null.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>Velikost vyrovnávací paměti není dostatečná. Operace čtení nebo zápisu se nezdařila.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>Nelze zapisovat do nenulového posunu, protože aktuální hodnota je Null.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>Nelze zapisovat z posunu, který je větší než aktuální délka. Neinicializovaná data by zůstala ve vyrovnávací paměti.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>Vrácená data mají velikost větší než 2 GB. Pokud chcete získat všechna data, použijte chování příkazu SequentialAccess.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>Argument pro metodu GetDayOfWeek musí být celé číslo v rozmezí od 1 do 7.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>Pro datový typ SQL ještě nebyla načtena data.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>Pro datový typ SQL již byla načtena data.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>Neplatný pokus o přístup k zavřenému objektu XmlReader</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>Pokus o volání metody {0} při zavřeném streamu je neplatný.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>Pokus o volání metody {0} při nezapisovatelném streamu je neplatný.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>Pokus o volání metody {0} při nečitelném streamu je neplatný.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>Pokus o volání metody {0} při neprohledávatelném streamu je neplatný.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>Podtřída nepřepsala požadovanou metodu.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>Nelze vytvořit normalizátor pro {0}.</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>Vnitřní chyba</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>Parametr příkazu musí mít text příkazu, který není null a není prázdný.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>Pole parametru MetaData musí mít délku odpovídající argumentu pole ParameterDirection.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>Chyba mapování datového adaptéru.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>Chyba datového adaptéru.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>Porušení souběžnosti databáze.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>Operace byla přerušena.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>Operace byla přerušena z důvodu výjimky. (Podrobnosti naleznete u vlastnosti InnerException.)</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Určuje, zda bude vlastnost Fill volat metodu DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Zda bude metoda Update volat metodu DataRow.AcceptChanges</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Určuje, zda bude aktualizace pokračovat na dalším řádku DataRow v případě, že vlastnost Status událostí RowUpdating a RowUpdated metody Update je UpdateStatus.ErrorsOccurred.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>Jakým způsobem adaptér naplňuje objekt DataTable z objektu DataReader</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>Akce provedená v případě, že ve vlastnosti TableMappings chybí tabulka nebo sloupec</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>Akce provedená v případě, že v objektu DataSet chybí tabulka nebo sloupec</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>Způsob mapování zdrojové tabulky na tabulku DataSet</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Událost aktivovaná při výskytu opravitelné chyby během příkazu Fill</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Zda by měl příkaz Fill vrátit hodnoty pro konkrétního zprostředkovatele nebo běžné hodnoty CLSCompliant.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>Název zdrojového sloupce (s rozlišením malých a velkých písmen)</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>Počet položek v kolekci</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>Zadaný objekt DataColumnMapping</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>Jednotlivá mapování sloupců v případě, že dojde ke shodě mapování této tabulky.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>Název zdrojové tabulky objektu DataTableMapping. V tomto názvu se rozlišují velká a malá písmena.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>Počet položek v kolekci</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>Zadaný objekt DataTableMapping</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>Používá se při provádění metody Update pro odstraněné řádky v objektu DataSet.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Událost aktivovaná při provádění metody Update po každém objektu DataRow.</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>Počet řádků, které mají být společně zpracovány v dávce před spuštěním s použitím zdroje dat.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Připojení použité v případě, že události Select/Insert/Update/DeleteCommands ještě nemají připojení.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>Používá se během události Update pro odstraněné řádky v objektu DataTable.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>Používá se během události Update pro nové řádky v objektu DataTable.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Používá se během příkazu Fill.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>Používá se během události Update pro upravené řádky v objektu DataTable.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Zda by měl příkaz Fill vrátit hodnoty pro konkrétního zprostředkovatele nebo běžné hodnoty CLSCompliant.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>Jakým způsobem má být mapována zdrojová tabulka na objekt DataTable.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>Jakým způsobem jsou generovány události Insert/Update/DeleteCommands, pokud uživatel nezadá nastavení.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>Počet řádků, které mají být společně zpracovány v dávce před spuštěním s použitím zdroje dat.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>Řetězec připojení používaný k připojení k objektu Data Source.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>Název ovladače ODBC, který má být použit při připojování k objektu Data Source.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>Název DSN, který má být použit při připojování k objektu Data Source.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>V případě hodnoty true označuje, že je potřeba používat fond spravovaného připojení.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>Soubor UDL, který se má používat při připojování k objektu Data Source.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>Určuje, které služby OLE DB Services má zprostředkovatel OleDb Provider povolit nebo zakázat.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>Název zprostředkovatele OLE DB, který má být použit při připojování k objektu Data Source.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>Název aplikace.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>V případě hodnoty true umožňuje použití asynchronní funkce ve zprostředkovateli dat .NET Framework.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>Název primárního souboru, včetně úplné cesty, připojitelné databáze.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>V případě hodnoty true označuje, že stav připojení je při odebrání z fondu obnoven.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>Při hodnotě true označuje, že připojení by mělo pocházet z kontextu serveru SQL Server.  K dispozici pouze při spuštění v procesu serveru SQL Server.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>Název záznamu jazyka serveru SQL Server.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>Určuje metodu ověřování pomocí serveru SQL Server.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>Zadaný klientský certifikát pro ověřování pomocí serveru SQL Server.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>Informace použitá pro připojení ke zdroji dat.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Aktuální hodnota časového limitu připojení. Tuto hodnotu nelze nastavit ve vlastnosti ConnectionString.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>Katalogová hodnota aktuálního zdroje dat, část Database=X připojovacího řetězce.</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>Aktuální zdroj dat, část Server=X připojovacího řetězce.</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>Aktuální ovladač ODBC.</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>Verze produktu, ke kterému přistupuje ovladač ODBC.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>Informace použitá pro připojení ke zdroji dat.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Hodnota časového limitu aktuálního připojení, část Connect Timeout=X v řetězci ConnectionString.</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>Katalogová hodnota aktuálního zdroje dat, část Initial Catalog=X připojovacího řetězce.</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>Aktuální zdroj dat, část Data Source=X připojovacího řetězce.</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>Identifikátor ProgID aktuálního zprostředkovatele dat OLE DB, část Provider=X připojovacího řetězce.</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>Verze produktu, k němuž přistupuje zprostředkovatel dat OLE DB.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>Přístupový token pro ověření</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>Stav připojení, synchronní nebo asynchronní.  Asynchronous Processing=x v připojovacím řetězci</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>Informace použité k připojení pro replikaci</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>Informace použité pro připojení k objektu DataSource, například Data Source=x;Initial Catalog=x;Integrated Security=SSPI</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>Shromáždit statistiku pro toto připojení.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>Vlastní zprostředkovatelé úložišť šifrovacích klíčů sloupců</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>Identifikátor GUID představující fyzické připojení</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Automatické zařazení do upozornění použitých systémem Microsoft SQL Server</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>Jakým způsobem je automaticky generována klauzule where pro příkazy Update a Delete v případě, že uživatel nezadá nastavení.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>Označuje pozici názvu katalogu v úplném názvu tabulky v textovém příkazu.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>Znak oddělující název katalogu od zbývající části identifikátoru v textovém příkazu.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>Znak oddělující název schématu od zbývající části identifikátoru v textovém příkazu.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Řetězec předpony připojený před objekty sql.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Řetězec přípony připojený za objekty sql.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Objekt DataAdapter, pro který mají být automaticky generovány příkazy.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>Použijte schéma z objektu DataTable nebo vlastnosti SelectCommand.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>Jakým způsobem je automaticky generována klauzule set pro příkaz Update v případě, že uživatel nezadá nastavení.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Vlastnost DataAdapter, pro kterou budou automaticky generovány příkazy OdbcCommands</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Znak použitý v textovém příkazu jako úvodní uvozovka pro uvedení identifikátorů obsahujících speciální znaky.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Znak použitý v textovém příkazu jako koncová uvozovka pro uvádění identifikátorů obsahujících speciální znaky.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Vlastnost DataAdapter, pro kterou budou automaticky generovány příkazy OleDbCommands</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Oddělovač desetinných míst použitý v číselných literálech.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Řetězec předpony připojený před objekty sql</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Řetězec přípony připojený za objekty sql</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>Vlastnost DataAdapter, pro kterou budou automaticky generovány příkazy SqlCommands</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Oddělovač desetinných míst použitý v číselných literálech.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Znak použitý v textovém příkazu jako úvodní uvozovka pro uvedení identifikátorů obsahujících speciální znaky.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Znak použitý v textovém příkazu jako koncová uvozovka pro uvádění identifikátorů obsahujících speciální znaky.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>Nutné nastavovat pouze pro parametry desetinných míst a číselné parametry při použití se scénáři Prepare, FillSchema a CommandBuilder.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>Nutné nastavovat pouze pro parametry desetinných míst a číselné parametry při použití se scénáři Prepare, FillSchema a CommandBuilder.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>Nativní typ parametru.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>Nativní typ parametru.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>Název parametru, například @p1</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>Nativní typ parametru.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>Název serveru typu.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>Posun v datových typech proměnné délky.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>ParameterDirection {0} zadaný pro parametr {1} není podporován. Parametry s hodnotou tabulky (table-valued parameter) podporují pouze ParameterDirection.Input.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>TypeName zadaný pro parametr {0}.  TypeName musí být nastaven pouze pro parametry Structured.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>Typ SqlDbType.Structured je podporován pouze u typů s více hodnotami.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>Sloupec DateType pro pole {0} v tabulce schématu má hodnotu null.  DataType nesmí mít hodnotu null.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>Počet polí v záznamu {0} neodpovídá počtu v původním záznamu.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>rozsah: 0 až 8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>Ve zprostředkovateli dat SqlClient došlo k neočekávané chybě. {0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>Nelze získat Type Info pro {0},{1}</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>Zprostředkovateli se nepodařilo načíst následující sestavení: {0}.</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>Vlastnost UdtTypeName musí být nastavena pro parametry UDT.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>Zadaný typ není registrován na cílovém serveru.{0}.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>Parametry UDT jsou povoleny v klauzulích where pouze v případě, že jsou součástí primárního klíče.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>{0} je neplatný uživatelsky definovaný typ, důvod: {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>podporuje formáty v paměti i uživatelsky definované formáty.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>Nativní formát nelze podporovat.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>neimplementuje rozhraní IBinarySerialize.</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>neserializovatelné</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>žádné veřejné konstruktory</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>neimplementuje rozhraní INullable.</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>nemá veřejný konstruktor</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>žádný atribut UDT</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>Serializace bez mapování ještě není podporována.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>chybí metoda public static x Parse(System.Data.SqlTypes.SqlString).</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>chybí metoda public override string ToString().</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>chybí metoda public static x Null { get; }.</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>Nativní formát nepodporuje pole (přímo nebo prostřednictvím jiného pole) typu {0}.</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>Typ není veřejný.</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Parametr Native UDT nepředstavuje sekvenční rozložení vzhledem k typu {0}.</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Parametr Native UDT určuje maximální velikost v bajtech (byte).</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>pole {0} je označeno jako neserializované.</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>Typ pole {0} je označen jako explicitní rozložení, což není ve formátu Native povoleno.</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>Odkazy na sestavení s více hodnotami musí mít nenulové ID sestavení.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>Strukturované typy s více hodnotami lze použít pouze u parametrů a nemohou být vnořeny v jiném typu.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>Název cesty není platný.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>Chyba při pokusu o zvýšení úrovně transakce</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>Objekt závislosti používaný pro příjem upozornění na dotazy</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>Vlastnost umožňující označit, zda je tato závislost neplatná.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>K přidání příkazu k existujícímu objektu závislosti</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Objekt Command je již spojen s jiným objektem závislosti. Nastavení nelze přepsat.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>Tento objekt SqlCommand je již spojen s jiným objektem SqlDependency.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>Zadaný časový limit je neplatný. Časový limit nesmí být menší než nula.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>Chyba oznámení. Typ ={0}, Informace ={1}, Zdroj ={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>Metoda GetMetaData není pro tuto hodnotu SqlDbType platná.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>Hodnota dbType {0} je pro tento konstruktor neplatná.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>Vnitřní chyba. Hodnota prostého textu nemůže být null.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>Nelze zašifrovat. Výsledkem šifrování je {0} bajtů šifrovaného textu, což je více než maximální povolený limit {1} bajtů. Zadaná hodnota prostého textu je pravděpodobně příliš velká (velikost prostého textu je: {2} bajtů).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>Vnitřní chyba. Hodnota šifrovaného textu nemůže být null.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>SQL Server nevrátil informace o ověření identity. Typ enklávy je {0} a adresa URL pro ověření identity enklávy je {1}.</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>Nelze vytvořit zabezpečený kanál (zprostředkovatel Schannel). Chybová zpráva: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>Vnitřní chyba. Při vytváření objektu typu {1} se zadal argument {0} s hodnotou null. Argument {0} nemůže mít hodnotu null.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Určuje koncový bod služby ověření identity enklávy, pomocí kterého se ověří, jestli enkláva nakonfigurovaná v instanci systému SQL Server pro výpočty se sloupci databáze šifrovanými funkcí Always Encrypted je platná a zabezpečená.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>Nepovedlo se přečíst oddíl konfigurace pro zprostředkovatele enkláv. Ujistěte se, že oddíl má v konfiguračním souboru vaší aplikace správný formát. Chybová zpráva: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>Nepovedlo se vytvořit instanci zprostředkovatele enklávy s typem {1} pro název {0}. Chybová zpráva: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>Vnitřní chyba. Parametr SqlColumnEncryptionEnclaveProviderName nemůže mít hodnotu null nebo být prázdný.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>Při čtení sady výsledků dotazu {0} došlo k chybě. V připojovacím řetězci se nezadala adresa URL pro ověření identity, ale dotaz vyžaduje výpočty v enklávě.  Typ enklávy je {1}. </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>Vnitřní chyba. Při spouštění dotazu, který vyžaduje výpočty v enklávě, je typ enklávy přijatý ze systému SQL Server null nebo prázdný.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>Aby se dotaz mohl spustit, vyžadují se výpočty v enklávě, ale v konfiguraci aplikace chybí oddíl zprostředkovatele enklávy.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>Pro typu enklávy {0} a protokol ověření identity {1} se nenašel žádný zprostředkovatel enklávy. Zadejte prosím v připojovacím řetězci správný protokol ověření identity. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>Výchozí nastavení šifrování sloupce pro všechny příkazy v rámci připojení</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>Vynutí, aby se parametry před posláním citlivých dat na server zašifrovaly. </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>Objekt slovníku obsahující názvy systémů SQL Server a jejich důvěryhodné cesty k hlavnímu klíči sloupce</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>Připojení k zrcadlené instanci systému SQL Server s použitím možnosti připojení ApplicationIntent ReadOnly není podporováno.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>Byly přijaty neočekávané informace o směrování.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>Byly přijaty neplatné informace o směrování.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>V tomto kontextu je zadáno nepodporované ověřování: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Vypršel časový limit interaktivního ověřování služby Active Directory. Odpověď uživatele na žádost o ověření trvala příliš dlouho.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>Pokud je nastavená vlastnost Credential, nejde použít možnost Authentication=Active Directory Interactive.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>ID procesu serveru (SPID) aktivního připojení</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Vypršel časový limit ověřování typu Active Directory Device Code Flow. Odpověď uživatele na žádost o ověření trvala příliš dlouho.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>Pokud je v připojovacím řetězci nastavená možnost Authentication=Active Directory Device Code Flow, nejde nastavit vlastnost Credential.</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>Pro požadovanou akci jsou podporována jen jednorozměrná pole.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>Zadanou položku nelze odebrat, protože nebyla nalezena v zadané kolekci.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>Vyžaduje se nezáporné číslo.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Pokud je v připojovacím řetězci nastavená možnost Authentication=Active Directory Default, nejde nastavit vlastnost AccessTokenCallback.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>Operace {0} vrátila {1}.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>Chyba protokolu: Přijatá zpráva obsahuje platný podpis, ale nebyla zašifrována podle požadavků platné úrovně ochrany.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>{0} – došlo k selhání s chybou {1}.</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>Tato metoda není touto třídou implementována.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>Požadovaný balíček zabezpečení není podporován.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>Nesprávný typ physicalConnection.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>Při pokusu o nastavení přepínače AppContext {0}={1} došlo k výjimce.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>Typ {0} se na této platformě nepodporuje.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>Invariantní režim globalizace není podporován.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Nelze provést ověření pomocí protokolu Kerberos. Ujistěte se, že se v klientovi inicializoval protokol Kerberos pomocí příkazu kinit a že pro SQL Server byl zaregistrovaný hlavní název služby, aby bylo možné ověřování protokolem Kerberos.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>Klíčové slovo „Network Library“ se na této platformě nepodporuje. Místo toho zadejte k „Data Source“ jako předponu požadovaný protokol (tcp: pro připojení TCP nebo np: pro připojení typu pojmenovaný kanál).</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>Soket nevyvolal očekávanou výjimku {0} s kódem chyby {1}.</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>Server se pokouší použít funkci, která není na této platformě podporována.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>Klíčové slovo {0} není na této platformě podporováno.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>Aktuálně načtená knihovna System.Transactions.dll nepodporuje globální transakce.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>Při čtení dat ze serveru byl přijat nepodporovaný token {0}.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>{0} není podporovaný typ popisovače.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream se na této platformě nepodporuje.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>LocalDB se na této platformě nepodporuje.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>Nedostatek místa ve vyrovnávací paměti. Vyžadováno: {0}; Skutečnost: {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>Operace GSSAPI se nezdařila se stavem: {0} (Dílčí stav: {1}).</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>Operace GSSAPI se nezdařila s chybou – {0} ({1}).</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>Podpora vazeb kanálů v jiných operačních systémech než Windows není podporována.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>Název cíle by neměl být prázdný, pokud jsou předány výchozí přihlašovací údaje.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>Požadovaná úroveň ochrany není podporovaná s aktuálně nainstalovanou implementací rozhraní GSSAPI.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>Implementace serveru není podporována.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>Ověřování NTLM není možné s výchozími přihlašovacími údaji na této platformě.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>Při použití v metodě DataAdapter.Update je hodnota parametru změněna z DBNull.Value na (Int32)1 nebo (Int32)0, pokud je hodnota jiná než null.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Byla překročena maximální velikost vyrovnávací paměti: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>Nebyl nalezen objekt DataColumn {0} pro SourceColumn {2}.</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>Seznam SqlBatchCommand nebyl inicializován.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index 28b564595e..fcbac77cb7 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>Aufsteigend</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Ungültiger Index {0} für {1} mit Count={2}.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>{0} ist bereits in einem/einer anderen {1} enthalten.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>{0} ist bereits in diesem/dieser {1} enthalten.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0} akzeptiert nur nicht-Null {1}-Typenobjekte.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>Es wurde versucht, ein {0} zu entfernen, das nicht in {1} enthalten ist.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1} muss eindeutig sein. '{2}' ist in der Sammlung bereits vorhanden.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>Die Verbindung wurde nicht geschlossen. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>Ungültiger Versuch, {0} aufzurufen, da der Datenleser bereits geschlossen wurde.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>Eine Eintragung in die Transaktion ist nicht möglich, da die Verbindung die primäre Verbindung für eine delegierte oder heraufgestufte Transaktion ist.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>Absteigend</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>Für den Parameter '{0}' wird eine nicht leere Zeichenfolge erwartet.</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>Die ConnectionString-Eigenschaft wurde nicht initialisiert.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>Eine Nicht-CLS-Exception ist aufgetreten.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>Das angegebene Sicherheitselement ist kein Berechtigungselement.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>Daten</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>Aktualisieren</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>Der ConnectionState, der angibt, ob die Verbindung offen oder geschlossen ist.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>Das Ereignis, das ausgelöst wird, wenn der Verbindungsstatus geändert wird.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>Der generische Parametertyp.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>Eingabe-, Ausgabe- oder bidirektionaler Parameter.</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>Eine DesignTime-Eigenschaft wird zur Codegenerierung mit starker Typisierung verwendet.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>Offset in Datentypen variabler Länge.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>Name des Parameters.</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>Größe von Datentypen mit variabler Länge (Zeichenfolge &amp; Arrays).</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>Bei Verwendung durch DataAdapter.Update der Quellspaltenname, der zum Suchen nach dem DataSetColumn-Namen in den ColumnMappings verwendet wird. Dient zum Kopieren eines Werts zwischen dem Parameter und einer Datenzeile.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>Bei Verwendung durch ein DataAdapter.Update (nur UpdateCommand) ist dies die Version des DataRow-Werts, der zum Update der Datenquelle verwendet wird.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>Bei Verwendung durch DataAdapter.Update wird der Parameterwert von DBNull.Value in (Int32)1 oder (Int32)0, falls nicht Null, geändert.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>Wert des Parameters.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>Die Sammlung '{0}' kann nicht erstellt werden, da die SQL-Abfrage fehlgeschlagen ist. Weitere Informationen finden Sie in der inneren Ausnahme.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>Es wurden mehr Einschränkungen bereitgestellt, als das angeforderte Schema ('{0}') unterstützt.</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>'{2}' ist kein gültiger Wert für die Einschränkung '{1}' der Schema-Sammlung '{0}'.</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>Die angeforderte Sammlung ({0}) ist nicht definiert.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>Die angeforderte Sammlung ({0}) wird von dieser Version des Providers nicht unterstützt.</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>Es fehlt eine der erforderlichen DataSourceInformation-Tabellenspalten.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>Die DataSourceInformation-Tabelle muss exakt eine Zeile enthalten.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>Es fehlt mindestens eine der erforderlichen Spalten für die Sammlung der Einschränkungen.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>Es liegt eine Einschränkung vor, für die es keine übereinstimmende Zeile in der Sammlung der Einschränkungen gibt.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>Die Sammlung '{0}' fehlt im Metadaten-XML-Code.</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>Der Metadaten-XML-Code ist ungültig.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>Der Metadaten-XML-Code ist ungültig. Die Sammlung {0} muss die Spalte {1} enthalten, die eine Zeichenfolgenspalte sein muss.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>Der Metadaten-XML-Code ist ungültig. Die Spalte {1} der Sammlung {0} muss eine nicht leere Zeichenfolge enthalten.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>Aktion</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>Verhalten</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>Füllen</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>Informationsmeldung</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>Zuordnung</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>Benachrichtigung</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>Schema</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>Pooling</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>Benannter ConnectionString</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>Sicherheit</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>Verbindungsresilienz</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>Die Sammlung die Benutzerinformationen enthält.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>Gibt an, ob beim Vergleichen von Zeichenfolgen innerhalb des DataSets die Groß-/Kleinschreibung beachtet wird.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>Der Name des DataSet.</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>Gibt die benutzerdefinierte Sicht der Daten an, die im DataSet enthalten sind. Diese Sicht ermöglicht das Filtern, Suchen und Navigieren in der benutzerdefinierten Sicht.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>Gibt an, ob Einschränkungsregeln befolgt werden.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>Gibt an, dass das DataSet Fehler enthält.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>Gibt einen Ort an, an dem Zeichenfolgen innerhalb des DataSet verglichen werden.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>Gibt den XML-URI-Namensbereich des Stammelements an, auf das dieses DataSet zeigt.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>Gibt das Präfix des Namensbereichs an, der für dieses DataSet verwendet wird.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>Die Sammlung, welche die Beziehungen für diesen DataSet enthält.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>Die Sammlung, welche die Tabellen für dieses DataSet enthält.</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>Tritt auf, wenn Schemen für zwei Tabellen mit dem gleichen Namen nicht zusammengeführt werden können.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Erfolgt nach Beendigung der Initialization.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>Stellt einen speicherresidenten Datencache dar.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>Gibt an, ob beim Vergleichen von Zeichenfolgen innerhalb der Tabelle Groß-/Kleinschreibung beachtet wird.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>Gibt die untergeordneten Beziehungen für diese Tabelle zurück.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>Die Sammlung, die die Spalten für diese Tabelle enthält.</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>Die Sammlung, die die Einschränkungen für diese Tabelle enthält.</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>Gibt das DataSet an, zu dem diese Tabelle gehört.</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>Dies ist die standardmäßige DataView für diese Tabelle.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>Der Ausdruck, der verwendet wird, um den datengebundenen Wert dieser Zeile zu berechnen.</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>Gibt zurück, ob die Tabelle Fehler enthält.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>Gibt einen Ort an, an dem Zeichenfolgen innerhalb der Tabelle verglichen werden.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>Gibt eine Startgröße für diese Tabelle an.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>Gibt den XML-URI-Namensbereich für die Elemente an, die sich in dieser Tabelle befinden.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>Gibt das Präfix des Namensbereichs an, der für diese Tabelle in der XML-Darstellung verwendet wird.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>Gibt die übergeordneten Beziehungen für diese Tabelle zurück.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>Gibt die Spalte(n) an, die den Primärschlüssel für diese Tabelle darstellen.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>Gibt die Sammlung an, die die Datenzeilen für diese Tabelle enthält.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>Gibt den Namen an, der verwendet wird, um diese Tabelle in der Tables-Sammlung eines DataSets zu suchen.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>Tritt auf, wenn eine Zeile in der Tabelle erfolgreich bearbeitet wurde.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>Tritt auf, wenn die Zeile geändert wird, damit der Ereignishandler die Änderung bearbeiten oder abbrechen kann. Der Benutzer kann Werte in der Zeile ändern und sollte eine Ausnahme verwenden, um den Bearbeitungsvorgang abzubrechen.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>Tritt auf, wenn eine Zeile in der Tabelle erfolgreich gelöscht wurde.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>Tritt auf, wenn eine Zeile in der Tabelle zum Löschen markiert ist. Löst eine Ausnahme aus, um den Löschvorgang abzubrechen.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>Tritt auf, wenn für diese Spalte ein Wert übermittelt wurde. Der Benutzer kann den vorgeschlagenen Wert ändern und sollte eine Ausnahme verwenden, um die Bearbeitung abzubrechen.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>Tritt auf, wenn ein Wert für diese Spalte geändert wurde.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>Tritt vor dem Löschen aller Zeilen aus der Tabelle auf.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>Tritt auf, nachdem alle Zeilen in der Tabelle erfolgreich gelöscht wurden.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>Tritt auf, nachdem eine neue DataRow instanziiert wurde.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>Der Name, der verwendet wird, um diese Beziehung in der Relations-Sammlung eines DataSets zu suchen.</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>Gibt die untergeordneten Spalten in dieser Beziehung an.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>Gibt die übergeordneten Spalten dieser Beziehung an.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>Gibt an, ob die Beziehungen geschachtelt sind.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>Für Löschvorgänge. Gibt an, welche Art von Überlappung in dieser Beziehung verwendet werden soll.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>Für Updates. Gibt an, welche Art von Überlappung in dieser Beziehung verwendet werden soll.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>Zum Akzeptieren und Ablehnen von Änderungen. Gibt an, welche Art von Überlappung in dieser Beziehung verwendet werden soll.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>Gibt die untergeordneten Spalten dieser Einschränkung an.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>Gibt die übergeordneten Spalten dieser Einschränkung an.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>Gibt die untergeordnete Tabelle dieser Einschränkung an.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>Gibt die Spalten dieser Einschränkung an.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>Gibt an, ob die Einschränkung ein Primärschlüssel ist.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>Gibt den Namen dieser Einschränkung an.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>Gibt die Tabelle dieser Einschränkung an.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>Gibt an, ob in dieser Spalte null-Werte erlaubt sind.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>Gibt an, ob die Spalte automatisch neue Zeilen, die zur Spalte hinzugefügt wurden, inkrementiert. Der Typ der Spalte muss Int16, Int32 oder Int64 sein.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>Gibt den Startwert einer AutoIncrement-Spalte an.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>Gibt die Schrittweite an, die von der AutoIncrement-Spalte verwendet wird.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>Gibt die standardmäßige Schnittstellenbeschriftung für diese Spalte an.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>Gibt den Namen an, der zum Suchen dieser Spalte in der Columns-Sammlung einer DataTable verwendet wurde.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>Gibt die DataTable zurück, zu der diese Spalte gehört.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>Gibt den Datentyp an, der in dieser Spalte gespeichert wird.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>Gibt den Standardspaltenwert an, der beim Hinzufügen von neuen Spalten zur Tabelle verwendet wird.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>Gibt den Wert an, den diese Spalte für alle Zeilen basierend auf anderen Spalten anstatt der Benutzereingabe berechnet.</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>Gibt an, wie diese Spalte in XML beibehalten wird: als Attribut, Element, einfacher Textknoten oder überhaupt nicht.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>Gibt die XML-URI für Elemente oder Attribute an, die in dieser Spalte gespeichert sind.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>Gibt das Prefix an, das für diese DataColumn in der xml-Darstellung verwendet wird.</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Gibt den Index dieser Spalte in der Columns-Sammlung an.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>Gibt an, ob diese Spalte Änderungen zulässt, nachdem eine Zeile zu der Tabelle hinzugefügt wurde.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>Gibt an, ob diese Spalte die Werte in den Zeilen der Tabelle auf eindeutige Werte einschränken sollte.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>Gibt die maximale Länge des in dieser Spalte zulässigen Werts an.</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>Gibt den DateTimeMode dieser DataColumn an.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>Gibt an, ob diese DataView und die damit verbundene Schnittstelle Löschvorgänge zulassen.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>Gibt an, ob diese DataView und die damit verbundene Schnittstelle Bearbeitungsvorgänge zulassen.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>Gibt an, ob diese DataView und die damit verbundene Schnittstelle das Hinzufügen von neuen Zeilen zulassen.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>Gibt die Anzahl der Elemente zurück, die sich momentan in dieser Sicht befinden.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>Gibt einen Zeiger an den DataViewManager zurück, der den DataSet besitzt (falls vorhanden).</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>Gibt an, ob die Sicht geöffnet ist.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>Gibt einen Ausdruck an, der verwendet wird, um die Daten zu filtern, die von dieser DataView zurückgegeben werden.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>Gibt die Versionen der Daten an, die von dieser DataView zurückgegeben werden.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>Gibt die Namen der Spalten und die Reihenfolge an, in der Daten von dieser DataView zurückgegeben werden.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Gibt an, ob die Standardsortierung verwendet wird, wenn die Sort-Eigenschaft nicht festgelegt wurde.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>Gibt die Tabelle an, die diese DataView verwendet, um Daten abzurufen.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>Gibt an, dass die Daten, die von dieser DataView zurückgegeben wurden, geändert wurden.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>Zeigt die Datenquelle für den DataViewManager an.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>Gibt die Sortier-/Filter-/Statuseinstellungen für jede Tabelle im entsprechenden DataSet an.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet unterstützt 'union' oder 'list' nicht als simpleType.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>Ungültige {0} Syntax: Fehlendes erforderliches '{1}'-Attribut.</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>Der Wert '{1}' ist für das Attribut '{0}' ungültig.</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>Der Wert des Attributs '{0}' sollte '{1}' oder '{2}' sein.</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>ElementType-name='{0}' wurde nicht gefunden.</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>Der übergeordnete Tabellenname ist nicht in der Beziehung '{0}' vorhanden.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>Der untergeordnete Tabellenname ist nicht in der Beziehung '{0}' vorhanden.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>Der übergeordnete Tabellenschlüssel ist nicht in der Beziehung '{0}' vorhanden.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>Der untergeordnete Tabellenschlüssel ist nicht in der Beziehung '{0}' vorhanden.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>Undefinierter Datentyp: '{0}'.</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>Datentyp wurde nicht definiert.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>Ungültige XPath-Auswahl im Feldknoten. {0} kann nicht gefunden werden.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>Ungültige XPath-Auswahl in einem Auswahlknoten: {0}.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>Ungültiger 'Key'-Knoten innerhalb der Einschränkung: {0}.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>Der Einschränkungsname {0} wird bereits im Schema verwendet.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>'{0}' kann nicht in Typ {1} umgewandelt werden.</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>Fehlender '{0}'-Teil in '{1}'der Einschränkung '{2}'.</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>Ungültige Relationsdefinition: Unterschiedliche Schlüssellängen.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet läßt den Zirkelverweis im ComplexType '{0}' nicht zu.</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet kann keinen abstrakten ComplexType für den Knoten {0} instanziieren.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Beim Schreiben eines Xml-Schemas hat der Konverter für mehrere Ziele einen Fehler ausgelöst. Weitere Informationen finden Sie in der inneren Ausnahme.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Beim Schreiben eines Xml-Schemas hat der Konverter für mehrere Ziele einen Fehler ausgelöst. Es wurde eine null- oder eine leere Zeichenfolge zurückgegeben.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>Doppelte Deklaration '{0}'.</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>diffGram kann nicht geladen werden. In der Tabelle '{0}' fehlt das Ziel-Dataset.</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>diffGram kann nicht geladen werden. Der 'sql'-Knoten fehlt.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>Der Spaltenname '{0}' ist für verschiedene Zuordnungstypen definiert.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>Das Präfix '{0}' ist ungültig, da es Sonderzeichen enthält.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>Zirkulärer Verweis in der selbstgeschachtelten Tabelle '{0}'.</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>Der DataSet kann die Einheiten nicht erweitern. Verwenden Sie XmlValidatingReader und legen Sie die EntityHandling-Eigenschaft entsprechend fest.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>Der Typ '{0}' implementiert nicht die IXmlSerializable-Schnittstelle, weshalb die Serialisierung nicht fortgesetzt werden kann.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>Deserialisierung kann nicht fortgesetzt werden. Die Daten implementieren nicht IXMLSerializable, weshalb keine Polymorphie unterstützt wird.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable unterstützt keine Schemadeduktion von Xml.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>Serialisierung von DataTable '{0}' kann nicht fortgesetzt werden. Sie enthält eine DataRow, die mehrere übergeordnete Zeilen für denselben Fremdschlüssel enthält.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>Das 'IsDataSet'-Attribut fehlt im Eingabe-Schema.</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>Das DataSet-Element kann nicht bestimmt werden. Das IsDataSet-Attribut ist mehrmals vorhanden.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>Typen, die IDynamicMetaObjectProvider implementieren, aber nicht gleichzeitig IXmlSerializable implementieren, werden von DataSet nicht serialisiert.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>Diese Funktion ist nicht implementiert. {0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>Syntaxfehler: Fehlender Operand nach dem Operator '{0}'.</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>Typenkonflikt im Ausdruck '{0}'.</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>Der Ausdruck ist zu komplex.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>Die Spalte [{0}] wurde nicht gefunden.</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>Der Ausdruck enthält eine ungültige Zeichenfolgenkonstante: {0}.</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>Der Ausdruck enthält den undefinierten Funktionsaufruf {0}().</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>Syntaxfehler im Ausdruck.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>Ungültige Anzahl von Argumenten: Funktion {0}().</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>Im Ausdruck fehlt die schließende Klammer.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>Das Token '{0}' kann an Position {1} nicht interpretiert werden.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>{0} wird erwartet. Das Token an Position {2} ist jedoch {1}.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>Von {0} kann nicht in {1} konvertiert werden.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>Der Wert „{0}“ kann nicht in den Typ „{1}“ konvertiert werden.</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>Ungültiger Spaltenname [{0}].</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>Der Ausdruck enthält eine ungültige Datumskonstante '{0}'.</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>In der Ausdrucksliste für den IN-Operator sind nur konstante Ausdrücke zugelassen.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Fehler im Like-Operator: Das Zeichenfolgenmuster '{0}' ist ungültig.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>Syntaxfehler: Die Elemente, die dem IN-Schlüsselwort folgen, müssen durch Kommata getrennt sein und in Klammern stehen.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>Typenkonflikt in Funktionsargument: {0}(), Argument {1}, {2} wird erwartet.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>Typenkonflikt in Funktionsargument: {0}(), Argument {1}, ein Ganzzahltyp wird erwartet.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>Die Operation '{0}' kann nicht an {1} und {2} durchgeführt werden.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>Der Operator '{0}' ist für Operanden vom Typ '{1}' und '{2}' nicht eindeutig. Signierte und unsignierte Typen können nicht gemeinsam verwendet werden. Verenden Sie eine explizite Convert()-Funktion.</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>Syntaxfehler: Das IN-Schlüsselwort muss von einer nicht leeren Liste von Ausdrücken gefolgt sein, die durch Kommata getrennt sind, und muss in Klammern stehen.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>Der Ausdruck enthält den nicht unterstützten Operator '{0}'.</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>Der Ausdruck enthält den ungültigen Namen: '{0}'.</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>Syntaxfehler: Fehlender Operand vor dem Operator '{0}'.</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>Der Ausdruck hat zu viele schließende Klammern.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>Die Tabelle [{0}] hat mehrere Beziehungen. Geben Sie einen eindeutigen Beziehungsnamen im Ausdruck '{1}' an.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>Syntaxfehler im Aggregatargument: Es wird ein Einzelspaltenargument erwartet, das möglicherweise einen 'Child'-Qualifizierer hat.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>Ungebundener Verweis im Aggregatausdruck '{0}'.</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>Ein nicht konstanter Ausdruck kann nicht ohne die aktuelle Zeile ausgewertet werden.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>Ungebundene Verweise im Ausdruck '{0}'.</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>Auswerten nicht möglich. Der Ausdruck '{0}' ist kein Aggregat.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>Der Filterausdruck „{0}“ wird nicht als boolescher Ausdruck ausgewertet.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>Ungültiger Typname '{0}'.</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>Syntaxfehler in Lookup-Ausdruck: Es wird erwartet, dass das Schlüsselwort 'Parent' von nur einem Spaltenargument gefolgt ist, mit möglichem Beziehungsqualifizierer: Parent[(&lt;Beziehung_Name&gt;)].&lt;Spalte_Name&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>Zum Aufrufen von DataFilter ist eine Zeile oder eine Tabelle erforderlich.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>Das Argument {0}() befindet sich außerhalb des gültigen Bereichs.</value>
-  </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>Syntaxfehler: Ungültige Verwendung des 'Is'-Operators. Richtige Syntax: &lt;Ausdruck&gt; Is [Not] Null.</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>Offset und Länge lagen für das Array außerhalb des gültigen Bereichs, oder die Anzahl war größer als die Anzahl der Elemente ab dem Index bis zum Ende der Quellsammlung.</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>Der Wert ist zu groß oder zu klein für den Typ '{0}'.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>Ein Objekt vom Typ "{0}" kann nicht in ein Objekt vom Typ "{1}" konvertiert werden.</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>Fehler aufgrund einer Division durch 0.</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>Der einzige zulässige Wert für die Eigenschaft '{0}' ist '{1}'.</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>Die übergeordnete Beziehung '{0}' kann nicht gefunden werden.</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>Die zulässigen Werte für die Eigenschaft '{0}' sind '{1}' oder '{2}'.</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>Das 'hours'-Argument liegt außerhalb des gültigen Bereichs. Der Wert muss zwischen -14 und +14 liegen.</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>Die für QuotePrefix und QuoteSuffix angegebenen Werte stimmen nicht überein.</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>Das 'minutes'-Argument liegt außerhalb des gültigen Bereichs. Der Wert muss zwischen -59 und +59 liegen.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>Die Länge des Arguments '{0}' überschreitet dessen Grenzwert von '{1}'.</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>Der angegebene erste Zeitraum liegt über dem Gesamtwert von 14 Stunden.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>Ungültiger Wert für den {0}-Schlüssel.</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>Die 'Kind'-Eigenschaft des angegebenen 'DateTime'-Arguments stimmt nicht mit den Argumenten 'hours' und 'minutes' überein.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>Für die Verwendung des Schlüssels '{0}' muss der Schlüssel '{1}' vorhanden sein.</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>Eine DataColumn vom Typ '{0}' wird vom Ausdruck nicht unterstützt.</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>Die Länge des Werts für Taste '{0}' überschreitet dessen Grenzwert von '{1}'.</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>Einschränkungen konnten nicht aktiviert werden. Mindestens eine Zeile enthält Werte die die Einschränkungen non-null, unique or foreign-key verletzen.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>Schlüsselwort wird nicht unterstützt: '{0}'.</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>Sammlung kann nicht geändert werden.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>Interner .NET Framework-Datenanbieterfehler {0}.</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>Der angegebene Name '{0}' stimmt mit mindestens zwei Namen im Sammlungsobjekt mit unterschiedlicher Groß-/Kleinschreibung überein.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}".</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>Der angegebene Name '{0}' entspricht mindestens zwei Namen im Sammlungsobjekt mit unterschiedlichen Namespaces.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}", falsche Verwendung von Anführungszeichen.</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>Offset und Länge lagen für das Array außerhalb des gültigen Bereichs, oder die Anzahl war größer als die Anzahl der Elemente ab dem Index bis zum Ende der Quellsammlung.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}", der aktuelle Grenzwert von "{2}" ist unzureichend.</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>'{0}'-Argument liegt außerhalb des gültigen Bereichs.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>Fehler bei 'SqlBulkCopy.WriteToServer'. 'SqlBulkCopy.DestinationTableName' ist ein ungültiger mehrteiliger Name.</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>'{0}'-Argument darf nicht null sein.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>Fehler bei der Verarbeitung von SQL Server-Ergebnissen aufgrund eines ungültigen mehrteiligen Namens.</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>'{0}'-Argument enthält Nullwerte.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>'SqlParameter.UdtTypeName' ist ein ungültiger mehrteiliger Name.</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>Spalte {0} wurde nicht gefunden.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName ist ein ungültiger mehrteiliger Name.</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>Spalte '{0}' gehört bereits zu dieser DataTable.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>Fehler bei 'SqlCommand.DeriveParameters'. Der Wert der 'SqlCommand.CommandText'-Eigenschaft ist ein ungültiger mehrteiliger Name.</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>Spalte '{0}' gehört bereits zu einer anderen DataTable.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>Die Verbindung mit einer gespiegelten SQL Server-Instanz unter Verwendung der MultiSubnetFailover-Verbindungsoption wird nicht unterstützt.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>Eine DataTable kann nur eine SimpleContent-Spalte enthalten.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>Der Enumerationswert von {0}, {1}, wird von der Methode {2} nicht unterstützt.</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>Eine SimpleContent-Spalte kann nicht zu einer Tabelle mit Elementspalten oder geschachtelten Beziehungen hinzugefügt werden.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>Der Enumerationswert für {0} ({1}) wird vom .NET Framework-SqlClient-Datenanbieter nicht unterstützt.</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>Eine Spalte names '{0}' gehört bereits zu dieser DataTable.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: CommandText-Eigenschaft wurde nicht initialisiert.</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>Spalte '{0}' konnte nicht hinzugefügt werden: eine verschachtelte Tabelle mit demselben Namen gehört bereits zu dieser Tabelle 'DataTable'.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: Connection-Eigenschaft wurde nicht initialisiert.</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>Spalte '{0}' gehört bereits zu dieser Tabelle 'DataTable'. Ein verschachtelter Tabellenname kann für denselben Namen nicht festgelegt werden.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} erfordert eine geöffnete und verfügbare Connection. {1}</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>Eine Spalte, die nicht zu dieser Tabelle gehört, kann nicht entfernt werden.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>Die gespeicherte Prozedur '{0}' ist nicht vorhanden.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>Diese Spalte kann nicht entfernt werden, da sie Teil des Primärschlüssels ist.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>Die Transaktion ist entweder nicht der aktuellen Verbindung zugeordnet oder wurde abgeschlossen.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>Diese Spalte kann nicht entfernt werden, da sie Teil des übergeordneten Schlüssels für den Bezug {0} ist.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>Die der aktuellen Verbindung zugeordnete Transaktion wurde abgeschlossen, jedoch nicht verworfen. Die Transaktion muss verworfen werden, bevor die Verbindung zum Ausführen von SQL-Anweisungen verwendet werden kann.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>Diese Spalte kann nicht entfernt werden, da sie Teil der Einschränkung {0} für die Tabelle {1} ist.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>{0} erfordert, dass der Befehl über eine Transaktion verfügt, wenn die dem Befehl zugewiesene Verbindung eine ausstehende lokale Verbindung ist. Die Transaction-Eigenschaft des Befehls wurde nicht initialisiert.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>Diese Spalte kann nicht entfernt werden, da sie Teil eines Ausdrucks ist: {0} = {1}.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>Diesem {0}selement ist bereits ein geöffneter DataReader zugeordnet, der zuerst geschlossen werden muss.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>Die AutoIncrement-Eigenschaft kann nicht für eine berechnete Spalte festgelegt werden.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>{0} DeriveParameters unterstützen nur CommandType.StoredProcedure, nicht CommandType.{1}.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>Die AutoIncrement-Eigenschaft kann nicht für eine Spalte festgelegt werden, deren DefaultValue festgelegt ist.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>Ein DefaultValue kann für eine AutoIncrement-Spalte nicht festgelegt werden.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep muss ein Wert sein, der nicht Null ist.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>Der ColumnName ist erforderlich wenn er Teil einer DataTable ist.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>Der DataType einer Spalte kann nicht geändert werden, wenn diese Daten enthält.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>Spalte erfordert gültigen DataType.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>Der DefaultValue für Spalte {0} ist vom Typ {1} und kann nicht in {2} konvertiert werden.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>Der DefaultValue der Spalte ist vom Typ {0} und kann nicht in {1} konvertiert werden.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>Der DefaultValue für Spalte {0} ist vom Typ {1}, aber die Spalte ist vom Typ {2}.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>ReadOnly-Eigenschaft für die Ausdruckspalte kann nicht geändert werden.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>Die Unique-Eigenschaft der Ausdrucksspalte kann nicht geändert werden.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>Ein Ausdruck kann nicht für eine Spalte erstellt werden, die AutoIncrement oder Unique hat.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>Der Ausdruck kann nicht festgelegt werden, da die Spalte nicht über ReadOnly mit einem Schreibschutz versehen werden kann.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>Die Expression-Eigenschaft kann für Spalte {0} nicht festgelegt werden, da sie Teil einer Einschränkung ist.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>Eine Einschränkung basierend auf Expression-Spalte {0} kann nicht erstellt werden.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>Die Expression-Eigenschaft kann nicht festgelegt werden, da der Ausdruck einen zirkulären Verweis enthält.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>Spalte '{0}' hat null Werte.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>Spalte '{0}' läßt nicht 'nulls' zu.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>Spalte '{0}' ist schreibgeschützt.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>Spalte '{0}' enthält nicht eindeutige Werte.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>Spalte '{0}' gehört nicht zu Tabelle {1}.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>Spalte gehört in eine Tabelle.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>&lt;{0}&gt; konnte nicht in der {1}-Spalte gespeichert werden. Erwarteter Typ: {2}.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>Column '{0}' kann nicht auf 'null' gesetzt werden. Verwenden Sie statt dessen DBNull.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>Die Spalte kann nicht auf '{0}' festgelegt werden. Der Wert überschreitet den MaxLength-Grenzwert dieser Spalte.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength trifft nur auf den Datentyp der Zeichenfolge zu. Die MaxLength-Eigenschaft von Column '{0}' kann nicht auf eine positive Zahl festgelegt werden.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>Die MaxLength-Eigenschaft von Column '{0}' kann nicht auf '{1}' festgelegt werden. Mindestens eine Zeichenfolge in der Tabelle überschreitet die neue Grenze.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Die MaxLength-Eigenschaft für die Spalte '{0}' kann nicht festgelegt werden. Column ist SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>Die DataType-Eigenschaft für die Spalte '{0}' kann nicht auf {1} festgelegt werden. Column ist SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>Die MappingType-Eigenschaft für die Spalte '{0}' kann nicht auf SimpleContent festgelegt werden. Der DataType von Column ist {1}.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>Column '{0}' überschreitet das MaxLength-Limit.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>Die Spalte '{0}' lässt DBNull.Value nicht zu.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>Die Namespace-Eigenschaft für die Spalte '{0}' kann nicht geändert werden. Column ist SimpleContent.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>AutoIncrement einer DataColumn mit dem Typ '{0}' kann nicht geändert werden, sobald diese Daten enthält.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>Die Spalte '{0}' gehört nicht zur zugrunde liegenden Tabelle '{1}'.</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>'DataColumn' mit Typ '{0}' ist ein 'complexType'. Der Wert eines 'complexType' kann nicht als 'Attribute' serialisiert werden.</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>Der DateTimeMode kann nur für DataColumns vom Typ DateTime festgelegt werden.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>'{0}' ist ein ungültiger DataSetDateTime-Wert.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>Der 'DateTimeMode' kann nicht von '{0}' in '{1}' geändert werden, sobald die Tabelle Daten enthält.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Type '{0}' enthält nicht die static Null-Eigenschaft bzw. das Null-Feld.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>Der Typ '{0}' implementiert nicht IRevertibleChangeTracking. Deswegen ist eine Fortsetzung mit RejectChanges() nicht möglich.</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>SetAdded und SetModified können nur für DataRows mit Unchanged DataRowState aufgerufen werden.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>Die Ordnungszahl „{0}“ überschreitet den maximalen Wert.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>'DataSet' unterstützt nicht System.Nullable&lt;&gt;.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>Der Name einer Einschränkung kann nicht in eine leere Zeichenfolge geändert werden, wenn sie sich in der ConstraintCollection befindet.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>Für die Einschränkung {0} können keine Einschränkungen erzwungen werden.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>Die Spalte '{0}' hat die Einschränkung, dass sie eindeutig sein muss. Der Wert '{1}' ist bereits vorhanden.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>Die Einschränkung '{0}' gehört nicht zu dieser DataTable.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>Die Einschränkung {0} wurde nicht gefunden.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>Die Einschränkung stimmt mit der Einschränkung {0} überein, die sich bereits in der Sammlung befindet.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>Eine Constraint mit dem Namen '{0}' gehört bereits zu dieser DataTable.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>Diese Spalten haben momentan keine eindeutigen Werte.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>Diese Spalten zeigen nicht auf diese Tabelle.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>Diese Einschränkung kann nicht aktiviert werden, da nicht alle Werte entsprechende übergeordnete Werte besitzen.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>Diese Einschränkung kann nicht hinzugefügt werden, da ForeignKey nicht zu Tabelle {0} gehört.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>Eine Einschränkung, die nicht zu dieser Tabelle gehört, kann nicht entfernt werden.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>Die eindeutige Einschränkung '{0}' kann nicht entfernt werden. Entfernen Sie zuerst die Fremdschlüsseleinschränkung '{1}'.</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>Diese Zeile kann nicht gelöscht werden, da für die Beziehung {0} Einschränkungen erzwungen werden, und das Löschen dieser Zeile untergeordnete Zeilen freilegen würde.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>Diese Änderung kann nicht durchgeführt werden, da für die Beziehung {0} Einschränkungen erzwungen werden und durch Ändern dieses Wertes untergeordnete Zeilen freigelegt werden.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>Die Tabelle {0} kann nicht gelöscht werden, da ForeignKeyConstraint {1} Einschränkungen erzwingt und sich untergeordnete Zeilen in {2} befinden.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>Für ForeignKeyConstraint {0} müssen die untergeordneten Schlüsselwerte ({1}) in der übergeordneten Tabelle vorhanden sein.</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>Auf die Eigenschaft kann nicht zugegriffen werden, da: '{0}'.</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>Diese Zeile kann nicht entfernt werden, da sie untergeordnete Zeilen enthält, und Einschränkungen für die Beziehung {0} erzwungen werden.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>Die Primärschlüsseleinschränkung kann nicht hinzugefügt werden, da der Primärschlüssel für die Tabelle bereits festgelegt wurde.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>Die Einschränkung kann nicht zu DataTable '{0}' hinzugefügt werden, bei der es sich um eine untergeordnete Tabelle in zwei geschachtelten Beziehungen handelt.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>Für Spalten, die zu unterschiedlichen Tabellen gehören, kann kein Schlüssel erstellt werden.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>Die Anzahl der Spalten kann nicht 0 sein.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>Mehr als {0} Spalten sind unzulässig.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>Ein Schlüssel kann nicht erstellt werden, wenn dieselbe Spalte mehrmals aufgeführt wird: '{0}'</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>Die eindeutige Einschränkung kann nicht entfernt werden, da sie der Primärschlüssel einer Tabelle ist.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>Die eindeutige Einschränkung kann nicht entfernt werden, da sie der Primärschlüssel der Tabelle {0} ist.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>Übergeordnete Spalten und untergeordnete Spalten haben keine Spalten mit Typübereinstimmung.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey und ChildKey sind identisch.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns und ChildColumns sollten dieselbe Länge haben.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns und ChildColumns dürfen nicht die Länge null haben.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>Die Zeile gehört nicht zum selben DataSet wie diese Beziehung.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>RelationName ist erforderlich, wenn er Teil eines DataSet ist.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows erfordert eine Zeile, deren Table {0} ist. Die Table der angegebenen Zeile ist jedoch {1}.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>Diese Beziehung sollte zwei Tabellen in diesem DataSet verbinden, die dem DataSet hinzugefügt werden sollen.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRow erfordert eine Zeile, deren Tabelle {0} ist. Die Tabelle der angegebenen Zeile ist jedoch {1}.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow erfordert eine untergeordnete Zeile, deren Tabelle {0} ist. Die Tabelle der angegebenen Zeile ist jedoch {1}.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>Eine Beziehung zwischen Tabellen in unterschiedlichen DataSets ist nicht möglich.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>Es kann keine Beziehung zwischen Tabellen in unterschiedlichen DataSets hergestellt werden.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>Bezug für diese untergeordneten Spalten ist bereits vorhanden.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>Diese Beziehung gehört nicht zu dieser Beziehungssammlung.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Dieser Bezug gehört bereits zu einen anderen DataSet.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Dieser Bezug gehört bereits zu diesen DataSet.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>Eine Relation mit dem Namen '{0}' ist bereits in diesem DataSet vorhanden.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>Die Relation {0} gehört nicht in diesen DataSet.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>Bezug {0} wurde nicht gefunden.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>Eine Sammlung kann nicht für eine null-Tabelle erstellt werden.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>Die Tabelle, für die diese Sammlung Beziehungen anzeigt, wurde aus dem DataSet entfernt.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>Es kann keine Beziehung zur ParentRelation-Sammlung dieser Tabelle hinzugefügt werden, bei der dieser Tabelle nicht die untergeordnete Tabelle ist.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>Es kann keine Beziehung zur ChildRelation-Sammlung dieser Tabelle hinzugefügt werden, in der diese Tabelle nicht die übergeordnete Tabelle ist.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>Die 'Nested'-Eigenschaft kann für diese Beziehung nicht auf 'false' gesetzt werden.</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>Dieselbe Tabelle '{0}' kann in zwei geschachtelten Beziehungen nicht die untergeordnete Tabelle sein.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>Die Tabelle ({0}) kann in geschachtelten Beziehungen nicht sich selbst untergeordnet sein.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>DataRelation oder Constraint mit unterschiedlichen Locale- oder CaseSensitive-Einstellungen in den übergeordneten und untergeordneten Tabellen kann nicht hinzugefügt werden.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>DataRelation kann nicht erstellt werden, wenn über- und untergeordneten Spalten nicht in einem DataSet enthalten sind.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>Die geschachtelte Tabelle '{0}', die ihren Namespace erbt, darf nicht über mehrere übergeordnete Tabellen in verschiedenen Namespaces verfügen.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>Die geschachtelte Tabelle '{0}' mit leerem Namespace darf nicht über mehrere übergeordnete Tabellen in verschiedenen Namespaces verfügen.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>Die Zeile gehört nicht zum selben DataSet wie diese Beziehung.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>Diese Operation kann nicht an einer Zeile durchgeführt werden, die sich nicht in der Tabelle befindet.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>Diese Beziehung und diese untergeordnete Zeile gehören nicht zu demselben DataSet.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>Ein vorgeschlagener Wert kann nicht im RowChanging-Ereignis geändert werden.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>EndEdit() kann nicht innerhalb eines OnRowChanging-Ereignisses aufgerufen werden.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>BeginEdit() kann nicht innerhalb des RowChanging-Ereignisses aufgerufen werden.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>CancelEdit() kann nicht innerhalb eines OnRowChanging-Ereignisses aufgerufen werden. Verwenden Sie eine exception, um das Update abzubrechen.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>Delete kann nicht innerhalb eines OnRowDeleting-Ereignisses aufgerufen werden. Verwenden Sie eine exception, um diesen Löschvorgang abzubrechen.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>Der Eingabearray ist länger als die Anzahl der Spalten in dieser Tabelle.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>Es sind keine aktuellen Daten vorhanden, auf die zugegriffen werden kann.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>Es sind keine Originaldaten vorhanden, auf die zugegriffen werden kann.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>Es sind keine vorgeschlagenen Daten vorhanden, auf die zugegriffen werden kann.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>Diese Zeile wurde aus einer Tabelle entfernt und enthält keine Daten. BeginEdit() ermöglicht das Erstellen von neuen Daten in dieser Zeile.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>Auf gelöschte Zeileninformationen kann nicht über die Zeile zugegriffen werden.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>Die Version muss Original, Aktuell oder Vorgeschlagen sein.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>An der Position {0} befindet sich keine Zeile.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>Der Zeileneinfügepunkt {0} ist ungültig.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>rowOrder value={0} wurde zweimal für die Tabelle '{1}' gefunden.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>In der rowOrder-Sequenz für die Tabelle '{0}' fehlen Werte.</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>Die angegebene DataRow befindet sich nicht in der aktuellen DataRowCollection.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>Diese Zeile gehört bereits zu einer anderen Tabelle.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>Diese Zeile gehört bereits zu dieser Tabelle.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>Diese Zeile kann nicht gelöscht werden, da sie bereits gelöscht ist.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>Diese Zeile ist leer.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>Eine Zeile, die bereits entfernt ist, kann nicht entfernt werden.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>Eine untergeordnete Zeile hat mehrere übergeordnete Zeilen.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>Nicht erkanntes Bitmuster für Zeilenstatus.</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>Der Name des DataSet kann nicht in eine leere Zeichenfolge geändert werden.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>Der Name '{0}' ist ungültig. Ein DataSet kann nicht den gleichen Namen wie die DataTable haben.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>Der Schemanamespace ist ungültig. Verwenden Sie statt dessen {0}.</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>Die CaseSensitive- oder Locale-Eigenschaft kann nicht geändert werden. Die Änderung würde dazu führen, dass mindestens eine DataRelation oder Constraint unterschiedliche Locale- oder CaseSensitive-Einstellungen in den verknüpften Tabellen hat.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>Die 'SchemaSerializationMode'-Eigenschaft kann nur festgelegt werden, wenn sie vom abgeleiteten DataSet überschrieben wurde.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>PrimaryKey-Spalten gehören nicht zu dieser Tabelle.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>Eine geschachtelte Beziehung oder eine Elementespalte kann nicht zu einer Tabelle mit einer SimpleContent-Spalte hinzugefügt werden.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>Der TableName ist erforderlich wenn er Teil eines DataSets ist.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable enthält bereits eine einfache Inhaltsspalte.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>Die Tabelle hat keine Primärschlüssel.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} ist kein gültiger Sortierzeichenfolgen-Eintrag.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>Die DataTable kann nicht serialisiert werden. Eine DataTable, die in einem oder mehreren DataColumn-Ausdrücken verwendet wird, ist kein nachfolgender Wert der aktuellen DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>Diese DataTable kann nur als Teil eines DataSet als remote festgelegt werden. Eine oder mehrere Expression Columns weisen einen Verweis auf andere DataTable(s) auf.</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>Für DataSet und DataTable ist kein unterschiedlicher Remote-Formateigenschaftenwert möglich.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>Die DataTable kann nicht serialisiert werden. Der DataTable-Name ist nicht festgelegt.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>Eine DataTable mit dem Namen '{0}' gehört bereits zu diesem DataSet.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>Eine DataTable mit dem Namen '{0}' mit demselben Namespace '{1}' gehört bereits zu diesem DataSet.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>Die Tabelle ({0}) kann in einer geschachtelten Beziehung keine untergeordnete Tabelle von sich selbst sein. Der DataSet-Name steht mit dem Tabellennamen in Konflikt.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>Der Name '{0}' ist ungültig. Eine DataTable darf nicht den gleichen Namen wie der DataSet haben.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Die DataTable gehört bereits zu einem anderen DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Die DataTable gehört bereits zu diesem DataSet.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>Die Tabelle {0} gehört nicht zu diesem DataSet.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>Die Tabelle {0} kann nicht gefunden werden.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>Eine Tabelle, für die Beziehungen vorhanden sind, kann nicht entfernt werden. Entfernen Sie zuerst die Beziehungen.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>Die Tabelle {0} kann nicht entfernt werden, da auf sie in der ForeignKeyConstraint {1} verwiesen wird. Entfernen Sie zuerst diese Fremdschlüsseleinschränkung.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>Die DataTable '{0}' stimmt mit keiner DataTable in der Quelle überein.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>Ziel-DataSet hat keine Definition für {0}.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>Ziel-DataSet hat kein {0} {1}.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} und &lt;source&gt;.{0} haben Eigenschaften, die miteinander im Konflikt stehen: keine DataType-Eigenschaftenübereinstimmung.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey und &lt;source&gt;.PrimaryKey haben unterschiedliche Length-Werte.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>Spaltenkonflikt im PrimaryKey: &lt;target&gt;.{0} im Vergleich zu &lt;source&gt;.{1}.</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>Die Beziehung {0} kann nicht zusammengeführt werden, da die Schlüssel nicht übereinstimmende Spalten aufweisen.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>Zieltabelle {0} hat keine Definition für Spalte {1}.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>PrimaryKey-Spalte {0} ist in der Quelltabelle nicht vorhanden.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>Der RowStates-Parameter muss auf eine gültige Wertkkombination aus der DataViewRowState-Enumeration gesetzt sein.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Sucht eine Zeile, basierend auf Sortierreihenfolge. Es wurde jedoch keine Sortierreihenfolge bestimmt.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>Es werden {0}-Wert(e) für den Schlüssel, der indiziert wird, erwartet. Es wurden jedoch {1}-Wert(e) empfangen.</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>Ungültige Verwendung von Aggregatfunktion {0}() und Typ: {1}.</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>Ungültiger Speichertyp: {0}.</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>Die DataSet Xml-Persistenz unterstützt den Wert '{0}' nicht als Char-Wert. Verwenden Sie stattdessen den Byte-Speicher.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>Der Typ des Werts stimmt nicht mit dem Spaltentyp überein</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>Der Typ '{0}' implementiert nicht die IComparable-Schnittstelle. Es erfolgt kein Vergleich.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>{0} kann nicht festgelegt werden.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>Ein DataSet kann in DataViewManager nicht geändert werden, wenn diese bereits die Standardsicht eines DataSets ist.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter kann nicht gleichzeitig ModifiedOriginals und ModifiedCurrents anzeigen.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>Die Table-Eigenschaft kann in einer DefaultView oder einer DataView, die aus einem DataViewManager stammt, nicht geändert werden.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>Die Eigenschaft 'DataSet' kann nicht geändert werden, nachdem sie festgelegt wurde.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>DataSet muss vor der Verwendung von DataViewManager festgelegt werden.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>Die Eigenschaft 'Table' kann nicht geändert werden, nachdem sie festgelegt wurde.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>DataTable muss vor der Verwendung von DataView festgelegt werden.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>Bindung an unbenannte DataTable nicht möglich.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>Ein Objekt kann dieser List nicht hinzugefügt werden.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>AddNew kann nicht für eine DataView aufgerufen werden, für die AllowNew auf False gesetzt ist.</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView ist nicht geöffnet.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>Die Beziehung ist der Tabelle, auf diese DataView zeigt, nicht übergeordnet.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>Löschvorgang für DataSource ist nicht möglich, wenn AllowDelete auf 'false' gesetzt ist.</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>Eine DataSource kann nicht bearbeitet werden, wenn AllowEdit auf 'false' gesetzt ist.</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>Der Index {0} ist entweder negativ oder über der Gesamtanzahl der Zeilen.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>Externe Objekte können nicht zur Liste hinzugefügt werden.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>Diese Liste kann nicht gelöscht werden.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>Externe Objekte können nicht in diese List eingefügt werden.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>Objekt, die sich nicht in der Liste befinden, können nicht entfernt werden.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} ist keine DataColumn oder DataRelation für die Tabelle {1}.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>In einem Range-Objekt muss Min ({0}) kleiner oder gleich max ({1}) sein.</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>Dies ist ein null-Bereich.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>MinimumCapacity darf nicht negativ sein.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>Der Bezeichner für den Namen "{0}" kann nicht generiert werden.</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>Es sind mehrere Tabellen mit demselben Namen '{0}' (wenngleich in verschiedenen Namespaces) vorhanden.</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>Spalte {0}: Typ {1} darf nicht NULL sein.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>Spalte '{0}': Typ '{1}' hat keinen parameterlosen Konstruktor.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>Spalte '{0}': Typ '{1}' hat keinen Konstruktor mit einem Zeichenfolgenargument.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>Ein Objekt vom Typ "{0}" kann nicht in ein Objekt vom Typ "{1}" konvertiert werden.</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>Zugriff auf gelöschte Zeilen nicht möglich.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>Doppelte Namen nicht zulässig.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>Operation wird innerhalb des RowChanging-Ereignisses nicht unterstützt.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>Ungültige Einschränkung.</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>Fehlender Primärschlüssel.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Null nicht zulässig.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>Spalte ist als schreibgeschützt markiert.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>Zeile in Tabelle nicht gefunden.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>Version nicht gefunden.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>ReadOnly-Daten wurden geändert.</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader ist für die aktuelle DataTable '{0}' ungültig.</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>Das Schema der aktuellen DataTable '{0}' in DataTableReader hat sich geändert. DataTableReader ist ungültig.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>DataTableReader kann nicht erstellt werden. Es gibt keine DataTable im DataSet.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>DataTableReader kann nicht erstellt werden. Argument ist leer.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>DataTableReader kann nicht erstellt werden. Argumente enthalten null-Wert.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>Die aktuelle DataRow hat entweder den Status Deleted' oder 'Detached'.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>Aktuelle DataTable '{0}' ist leer. Es gibt keine DataRow in der DataTable.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>Der interne DataTable-Index ist beschädigt: '{0}'.</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>Die Sammlung wurde geändert; möglicherweise wurde die Enumeration nicht ausgeführt.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>Der einfache Typ „{0}“ wurde bereits mit einem anderen „{1}“ deklariert.</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>Ungültige Paginierung.</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>Der Tabellenname kann nicht geändert werden, wenn der verknüpfte DataSet einem geladenen XML-Dokument zugeordnet ist.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>Der Tabellennamespace kann nicht geändert werden, wenn der verknüpfte DataSet einem geladenen XML-Dokument zugeordnet ist.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>Der Spaltenname kann nicht geändert werden, wenn der verknüpfte DataSet einem geladenen XML-Dokument zugeordnet ist.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>Der Spaltennamespace kann nicht geändert werden, wenn der verknüpfte DataSet einem geladenen XML-Dokument zugeordnet ist.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>Die ColumnMapping-Eigenschaft kann nicht mehr geändert werden, nachdem das verknüpfte DataSet dem geladenen XML-Dokument zugeordnet wurde.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>Spalten der Tabelle können nicht mehr hinzugefügt oder entfernt werden, sobald das DataSet einem geladenen XML-Dokument zugeordnet ist.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>Tabellen des DataSets können nicht mehr hinzugefügt oder entfernt werden, sobald das DataSet einem geladenen XML-Dokument zugeordnet ist.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>Geschachtelte Beziehungen des DataSets können nicht mehr hinzugefügt, entfernt, oder geändert werden, sobald das DataSet einem geladenen XML-Dokument zugeordnet ist.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>Der DataSet-Parameter ist ungültig. Er darf nicht 'null' sein.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>Der DataSet-Name kann nicht geändert werden, wenn der DataSet einem geladenen XML-Dokument zugeordnet ist.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>Dieser Knotentyp kann nicht geklont werden: {0}.</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>XmlDataDocument kann nicht geladen werden, wenn es bereits Daten enthält. Verwenden Sie ein neues XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>DataSet kann höchstens mit einem XmlDataDocument verknüpft werden. DataSet kann nicht mit dem aktuellen XmlDataDocument verknüpft werden, da der DataSet bereits mit einem anderen XmlDataDocument verknüpft ist.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>Legen Sie DataSet.EnforceConstraints == false fest, bevor Sie das XmlDataDocument mit XML-Vorgängen bearbeiten.</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>GetElementById() wird auf DataDocument nicht unterstützt.</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>Es können keine Entitätsverweise auf ein DataDocument erstellt werden.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>Clear-Funktion für DateSet und DataTable wird für XmlDataDocument nicht unterstützt.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>Die Spalte kann nicht entfernt werden, da sie in das 'dataSet' eingebaut ist.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>Die Beziehung kann nicht entfernt werden, da sie in dieses DataSet integriert ist.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>Tritt auf, wenn eine Eigenschaft für das Steuerelement geändert wird.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Tritt auf, wenn sich die Mitgliedschaft dieser Sammlung ändert.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>Der Wert kann nicht abgerufen werden, da er DBNull ist.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>Für die '{0}'-Eigenschaft ist Microsoft WindowsNT oder ein WindowsNT-basiertes Betriebssystem erforderlich.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>Der angeforderte .NET Framework-Datenanbieter wurde nicht gefunden. Möglicherweise ist er nicht installiert.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>Die angeforderte Implementierung des .NET Framework-Datenanbieters umfasst kein Instanzenfeld eines abgeleiteten System.Data.Common.DbProviderFactory-Typs.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>Der registrierte .NET Framework-Datenanbieter wurde nicht gefunden oder kann nicht geladen werden.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>Der fehlende Name mit Assemblyqualifikation des .NET Framework-Datenanbieters ist erforderlich.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>Nur Elemente sind zulässig.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>Untergeordnete Knoten sind nicht zulässig.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>Nicht erkanntes Attribut '{0}'.</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>Unbekanntes Element.</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>Der Abschnitt {0} darf pro Konfigurationsdatei nur einmal angegeben werden.</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>Das erforderliche Attribut "{0}" wurde nicht gefunden.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>Das erforderliche Attribut '{0}' darf nicht leer sein.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>Für den Parameter '{0}' wird kein leeres Array erwartet.</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>Der einzige zulässige Wert für die Eigenschaft '{0}' ist '{1}'.</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>Die zulässigen Werte für die Eigenschaft '{0}' sind '{1}' oder '{2}'.</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>Die für QuotePrefix und QuoteSuffix angegebenen Werte stimmen nicht überein.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>Die Länge des Arguments '{0}' überschreitet dessen Grenzwert von '{1}'.</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>Erwartet wird ein Argument vom Typ {1}, empfangen wurde jedoch Typ {0}.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>Ungültiger Wert für den {0}-Schlüssel.</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>Für die Verwendung des Schlüssels '{0}' muss der Schlüssel '{1}' vorhanden sein.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>Die Länge des Werts für Taste '{0}' überschreitet dessen Grenzwert von '{1}'.</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>Schlüsselwort wird nicht unterstützt: '{0}'.</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>UDL-Datei konnte nicht geladen werden.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>Ungültige UDL-Datei.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>Interner .NET Framework-Datenanbieterfehler {0}.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>Die Eigenschaften 'QuotePrefix' und 'QuoteSuffix' können nicht geändert werden, wenn Insert, Update oder Delete generiert wurde.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>Die Eigenschaft 'DataAdapter.SelectCommand' muss initialisiert werden.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>Die Eigenschaft DataAdapter.SelectCommand.Connection muss initialisiert werden.</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}".</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}", falsche Verwendung von Anführungszeichen.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}", der aktuelle Grenzwert von "{2}" ist unzureichend.</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>Fehler bei 'SqlBulkCopy.WriteToServer'. 'SqlBulkCopy.DestinationTableName' ist ein ungültiger mehrteiliger Name.</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>Fehler bei der Verarbeitung von SQL Server-Ergebnissen aufgrund eines ungültigen mehrteiligen Namens.</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>'SqlParameter.UdtTypeName' ist ein ungültiger mehrteiliger Name.</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName ist ein ungültiger mehrteiliger Name.</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>Fehler bei 'SqlCommand.DeriveParameters'. Der Wert der 'SqlCommand.CommandText'-Eigenschaft ist ein ungültiger mehrteiliger Name.</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>Fehler bei 'OdbcCommandBuilder.DeriveParameters'. Der Wert der 'OdbcCommand.CommandText'-Eigenschaft ist ein ungültiger mehrteiliger Name.</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>Fehler bei 'OleDbCommandBuilder.DeriveParameters'. Der Wert der 'OleDbCommandBuilder.CommandText'-Eigenschaft ist ein ungültiger mehrteiliger Name.</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>Die Verbindung mit einer gespiegelten SQL Server-Instanz unter Verwendung der MultiSubnetFailover-Verbindungsoption wird nicht unterstützt.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>Die Spaltenzuordnung von SourceColumn '{0}' ist fehlgeschlagen, da die DataColumn '{1}' ist berechnete Spalte ist.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>Nicht konvertierbarer Typenkonflikt zwischen SourceColumn '{0}' von {1} und DataColumn '{2}' von {3}.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>DataColumn '{0}' in der DataTable '{1}' für SourceColumn '{2}' ist nicht vorhanden.</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>SourceColumn muss eine nicht leere Zeichenfolge sein.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>Fehlende SourceColumn-Zuordnung für '{0}'.</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Der Enumerationswert von {0}, {1}, wird von der Methode {2} nicht unterstützt.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Der Enumerationswert für {0} ({1}) wird vom .NET Framework-ODBC-Datenanbieter nicht unterstützt.</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Der Enumerationswert für {0} ({1}) wird vom .NET Framework-OLEDB-Datenanbieter nicht unterstützt.</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Der Enumerationswert für {0} ({1}) wird vom .NET Framework-SqlClient-Datenanbieter nicht unterstützt.</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>'ComputerNameDnsFullyQualified', {0}, kann nicht abgerufen werden.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>Fehlende '{0}' DataTable für die '{1}' SourceTable.</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>SourceTable muss eine nicht leere Zeichenfolge sein.</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>Fehlende SourceTable-Zuordnung: '{0}'</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: CommandText-Eigenschaft wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: Connection-Eigenschaft wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} erfordert eine geöffnete und verfügbare Connection. {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: SelectCommand.Connection-Eigenschaft wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: SelectCommand.Connection-Eigenschaft wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: SelectCommand.Connection-Eigenschaft wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>Für ein Update benötigt der InsertCommand ein Verbindungsobjekt. Die Connection-Eigenschaft des InsertCommand wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>Für ein Update benötigt der UpdateCommand ein Verbindungsobjekt. Die Connection-Eigenschaft von UpdateCommand wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>Für ein Update benötigt der DeleteCommand ein Verbindungsobjekt. Die Connection-Eigenschaft von DeleteCommand wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>Für ein Update ist ein Verbindungsobjekt erforderlich. Die Connection-Eigenschaft wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>Für ein Update benötigt der Befehlsklon ein Verbindungsobjekt. Die Connection-Eigenschaft des Befehlsklons wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>Für ein Update ist eine Verbindung erforderlich.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Für ein Update muss der {0}Command über ein geöffnetes Verbindungsobjekt verfügen. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Für ein Update muss der {0}Command über ein geöffnetes Verbindungsobjekt verfügen. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Für ein Update muss der {0}Command über ein geöffnetes Verbindungsobjekt verfügen. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Für ein Update muss der Updatebefehl über ein geöffnetes Verbindungsobjekt verfügen. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>Die gespeicherte Prozedur '{0}' ist nicht vorhanden.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>Die dem Befehl zugewiesene Transaktion muss die geschachtelste lokale Transaktion sein, die ansteht.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>Die Transaktion ist entweder nicht der aktuellen Verbindung zugeordnet oder wurde abgeschlossen.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>Die der aktuellen Verbindung zugeordnete Transaktion wurde abgeschlossen, jedoch nicht verworfen. Die Transaktion muss verworfen werden, bevor die Verbindung zum Ausführen von SQL-Anweisungen verwendet werden kann.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>{0} erfordert, dass der Befehl über eine Transaktion verfügt, wenn die dem Befehl zugewiesene Verbindung eine ausstehende lokale Verbindung ist. Die Transaction-Eigenschaft des Befehls wurde nicht initialisiert.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>Diesem Befehl ist bereits ein geöffnetes SqlResultSet zugeordnet, das zuerst geschlossen werden muss.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>Diesem {0}selement ist bereits ein geöffneter DataReader zugeordnet, der zuerst geschlossen werden muss.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>{0} DeriveParameters unterstützen nur CommandType.StoredProcedure, nicht CommandType.{1}.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>Die Methode '{0}' kann für dieselbe Ausführung nicht mehr als einmal aufgerufen werden.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>Falsches asynchrones Ergebnis.</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>Die SelectCommand-Eigenschaft wurde nicht initialisiert vor dem Aufruf von: '{0}'.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>Der StatementType {0} wird hier nicht erwartet.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: Es wird eine nicht leere Zeichenfolge als SourceTable-Name erwartet.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>Der MaxRecords Wert von {0} ist ungültig; der Wert muss &gt;= 0 sein.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>Der StartRecord-Wert von {0} ist ungültig; der Wert muss &gt;= 0 sein.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: Es wird eine nicht leere Zeichenfolge als SourceTable-Name erwartet.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>Hierarchische Kapitelspalten müssen zu einer AutoIncrement DataColumn zugeordnet werden.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) gab 'null' zurück.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>Geben Sie bei der Verwendung von Werten ungleich Null für 'startRecords' oder 'maxRecords' nur ein Element im 'dataTables'-Array an.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Update: TableMapping['{0}'] oder DataTable '{0}' kann nicht gefunden werden.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update: Nicht leerer SourceTable-Name erwartet.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>Fehlende TableMapping wenn TableMapping.DataSetTable='{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Für ein Update ist ein gültiger Befehlsklon erforderlich.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>Die automatische SQL-Generierung erfordert während des Updates einen gültigen SelectCommand.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Für ein Update ist ein gültiger InsertCommand erforderlich, wenn eine DataRow-Sammlung mit neuen Zeilen weitergegeben wird.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>Für ein Update ist ein gültiger UpdateCommand erforderlich, wenn eine DataRow-Sammlung mit modifizierten Zeilen weitergegeben wird.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Für ein Update ist ein gültiger DeleteCommand erforderlich, wenn eine DataRow-Sammlung mit gelöschten Zeilen weitergegeben wird.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}] stammt aus einer anderen DataTable als DataRow[0].</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: Fehler sind aufgetreten, es sind keine zusätzlichen Informationen vorhanden.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: Fehler sind aufgetreten, es sind keine zusätzlichen Informationen vorhanden.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>Bei der Batchverarbeitung ist der Wert der UpdatedRowSource-Eigenschaft von UpdateRowSource.FirstReturnedRecord oder UpdateRowSource.Both ungültig.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>Parallelitätsverletzung: Der UpdateCommand hat sich auf {0} der erwarteten {1} Datensätze ausgewirkt.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>Parallelitätsverletzung: Der DeleteCommand hat sich auf {0} der erwarteten {1} Datensätze ausgewirkt.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>Parallelitätsverletzung: der Batchbefehl hat sich auf {0} der erwarteten {1} Datensätze ausgewirkt.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>Die Methode '{0}' kann für dieselbe Ausführung nicht mehr als einmal aufgerufen werden.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>Ungültiger CommandTimeout-Wert {0}; der Wert muss &gt;= 0 sein.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: die Size-Eigenschaft hat den ungültigen Wert 0.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>Die {0}.Prepare-Methode erfordert, dass für alle Parameter explizit ein Typ festgelegt wird.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>Die {0}.Prepare-Methode erfordert, dass für alle variablen Längenparameter explizit eine nicht-Null-Size festgelegt wird.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>Die {0}.Prepare-Methode erfordert, dass für Parameter des Typs '{1}' Precision und Scale explizit festgelegt ist.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>Nicht übereinstimmender Aufruf zum Beenden der Methode für asyncResult. Erwartet wurde der Aufruf von {0}, stattdessen wurde {1} aufgerufen.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>Ungültige Operation. Die Verbindung ist geschlossen.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>Die Verbindung wurde deaktiviert.</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>Eintrag in der Transaktion fehlgeschlagen, da für die Verbindung gerade eine lokale Transaktion durchgeführt wird. Beenden Sie die lokale Transaktion, und wiederholen Sie den Vorgang.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>Für die Verbindung ist gegenwärtig eine Transaktion eingetragen. Beenden Sie die aktuelle Transaktion, und versuchen Sie es erneut.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>Datenbank kann nicht Null, eine leere Zeichenfolge oder eine Zeichenfolge aus Leerzeichen sein.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>Das Argument ist zu lang.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Ungültiger 'Connect Timeout'-Wert. Der Wert muss eine ganze Zahl &gt;= 0 sein.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>Ungültiger Quellpufferoffset (Größe von {0}): {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>Ungültiger Zielpufferoffset (Größe von {0}): {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>Der numerische Wert ist zu groß, um in eine Dezimalzahl mit 96 Bits zu passen.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>Ungültiger Versuch, zu {0}, da der Stream bereits geschlossen wurde.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>Der angegebene SeekOrigin-Wert ist ungültig.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>Dynamische SQL-Generierung wird gegen mehrere Basistabellen nicht unterstützt.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>Dynamische SQL-Generierung wird für einen SelectCommand, der keine Basistabelleninformationen zurückgibt, nicht unterstützt.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>Dynamische SQL-Generierung für den DeleteCommand wird nicht für einen SelectCommand unterstützt, der keine Schlüsselspalteninformationen zurückgibt.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>Dynamische SQL-Generierung für den UpdateCommand wird nicht für einen SelectCommand unterstützt, der keine Schlüsselspalteninformationen zurückgibt.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>Die dynamische SQL-Generierung für den 'DeleteCommand' wird für einen 'SelectCommand', der keine Zeilenversionsspalte enthält, nicht unterstützt.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>Die dynamische SQL-Generierung für den 'UpdateCommand' wird für einen 'SelectCommand', der keine Zeilenversionsspalte enthält, nicht unterstützt.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>Die dynamische SQL-Generierung wird für Tabellennamen '{0}', die das QuotePrefix- oder QuoteSuffix-Zeichen '{1}' enthalten, nicht unterstützt.</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>Ungültiger Versuch, aus der Spaltenordinalzahl '{0}' zu lesen. Mit CommandBehavior.SequentialAccess kann nur aus der Spaltenordinalzahl '{1}' oder größer gelesen werden.</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>Der Datentyp '{0}' kann nicht als Literal formatiert werden, da er ungültige Stellen für Datum/Uhrzeit aufweist.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>Der Wert kann nicht als Literal des angeforderten Typs formatiert werden.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>Der Datentyp '{0}' kann nicht als Literal formatiert werden, da er eine ungültige maximale Dezimalstellenanzahl aufweist.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>Der angegebene Literalwert ist kein gültiges Literal für den Datentyp '{0}'.</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>'{0}':Die Länge des Literalwerts muss gerade sein.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>'{0}':Der Literalwert muss eine Zeichenfolge mit hexadezimalen Stellen sein</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>{0} erfordert eine geöffnete Verbindung, wenn das Anführungspräfix nicht festgelegt wurde.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>Die korrekten booleschen Literalwerte können nicht bestimmt werden. Boolean-Literale können nicht erstellt werden.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>Literale des nativen Datentyps, die mit dem Datentyp '{0}' verknüpft sind, werden nicht unterstützt.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>Der Parameterdatentyp von {0} ist ungültig.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>Es ist keine Zuordnung zwischen dem Objekttyp {0} und einem bekannten verwalteten nativen Providertyp vorhanden.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>Der unbekannte TypeCode {0}, der vom Type {1} zurückgegeben wurde, kann nicht behandelt werden.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>Es ist keine Zuordnung von DbType {0} zu einem bekannten {1} vorhanden.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>Die verwendete SQL Server-Version unterstützt nicht den Datentyp '{0}'.</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>Der Parameterwert '{0}' befindet sich außerhalb des gültigen Bereichs.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>Der angegebene Parametername '{0}' ist ungültig.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>Mehrere Rückgabewertparameter werden nicht unterstützt.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>Ungültiger Wert für die Parametergröße '{0}'. Der Wert muss größer oder gleich 0 sein.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>Ungültiger Wert für das Argument '{0}'. Der Wert muss größer oder gleich 0 sein.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>Ungültiger Wert für diese Metadaten.</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>Metadaten müssen vom Typ SqlDbType.Row sein</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>Parameterwert konnte nicht von {0} in {1} umgewandelt werden.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} unterstützt keine parallelen Transaktionen.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>{0} wurde beendet und kann nicht mehr verwendet werden.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>'{0}' kann nicht aufgerufen werden, wenn der Datensatz schreibgeschützt ist.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>'{0}' kann nicht aufgerufen werden, wenn DbDataRecord schreibgeschützt ist.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>Die implizite Umwandlung des Objekttyps '{0}' in den Datentyp '{1}' wird nicht unterstützt.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>Pufferoffset '{1}' plus verfügbare Bytes '{0}' ist größer als die Länge des übergebenen Puffers.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>Datenlänge '{0}' ist kleiner als 0.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>Die angegebene Länge '{0}' ist außerhalb des Gültigkeitsbereichs.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>Ungültiger Versuch dataIndex '{0}' zu {2}. Mit CommandBehavior.SequentialAccess kann nur dataIndex '{1}' oder größer gelesen werden.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>Offset muss sich auf eine Stelle im Wert beziehen.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"Der von ODBC verwaltete Provider erfordert es, dass die TABLE_NAME-Einschränkung angegeben wird und für die 'GetSchema'-Indexsammlung ungleich Null ist.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>Ungültiger Argumentwert für Methode '{0}'.</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>Der ODBC-Provider hat keine Ergebnisse für SQLGETTYPEINFO zurückgegeben.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>Unerwartetes null DataTable-Argument</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>Unerwartetes null DataSet-Argument.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>Die Verbindungszeichenfolge überschreitet die zulässige Länge von {0}.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} - Typzuordnung nicht möglich.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>Unbekannter SQL-Typ - {0}.</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>Unbekannter URT-Typ - {0}.</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>Ungültiges negatives Argument.</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>Eigenschaft kann für eine offene Verbindung nicht festgelegt werden.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>Keine gültige Zuordnung einer SQL_TRANSACTION '{0}' zu einem System.Data.IsolationLevel-Enumerationswert.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} - Verbindungspooling kann nicht aktiviert werden...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} - Umgebungshandle konnte nicht zugewiesen werden.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} - das Deskriptorhandle kann nicht abgerufen werden.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>Nicht in einer Transaktion</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>Ungültiger OdbcType-Enumerationswert, value={0}.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>IsDBNull verwenden, wenn DBNull.Value-Daten erwartet werden.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} - Keine Fehlerinformationen verfügbar</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>Die Verbindung wurde geschlossen.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>Eine interne Verbindung hat keinen Besitzer.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>Der .NET Framework-ODBC-Datenanbieter benötigt Microsoft Data Access Components (MDAC) 2.6 oder höher. Aktuell ist Version {0} installiert.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>Der .NET Framework-OLEDB-Datenanbieter benötigt Microsoft Data Access Components (MDAC) 2.6 oder höher. Aktuell ist Version {0} installiert.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>Die Schnittstelle '{0}' wird nicht vom '{1}'-Provider unterstützt. GetOleDbSchemaTable ist mit dem aktuellen Provider nicht verfügbar.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>'{0}' ist ohne Fehlermeldung fehlgeschlagen, Ergebniscode: {1}.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>Keine Fehlermeldung verfügbar, Fehlercode: {0}.</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>Der .NET Framework-Datenanbieter benötigt Microsoft Data Access Components (MDAC). Installieren Sie MDAC 2.6 oder höher.</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>Der .NET Framework-Datenanbieter für OLEDB (Microsoft.Data.OleDb) bietet keine Unterstützung für den Microsoft OLE DB-Anbieter für ODBC-Treiber (MSDASQL). Verwenden Sie den .NET Framework-Datenanbieter für ODBC (System.Data.Odbc).</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>Der .NET Framework-Datenanbieter für OLEDB lässt eine Benutzeraufforderung durch den OLE DB-Anbieter in einer nicht interaktiven Umgebung nicht zu.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>Der '{0}'-Provider ist nicht auf dem lokalen Computer registriert.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>Die ICommandText-Schnittstellen wird vom '{0}'-Provider nicht unterstützt. Verwenden Sie stattdessen CommandType.TableDirect.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>Die ITransactionLocal-Schnittstelle wird nicht vom '{0}'-Provider unterstützt. Lokale Transaktionen sind mit dem aktuellen Provider nicht verfügbar.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>Das Format der Initialisierungszeichenfolge entspricht nicht der OLE DB-Spezifikation. Beginn bei char[{0}] in der Verbindungszeichenfolge.</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>Die asynchrone Verarbeitung ist kein unterstütztes Feature des .NET Framework-OLE DB-Datenanbieters (Microsoft.Data.OleDb).</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>In ConnectionString wurde kein OLE DB Provider angegeben. Anwendungsbeispiel: 'Provider=SQLOLEDB;'.</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>Der OLE DB-Provider, der in ConnectionString angegeben wurde, ist zu lang.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>Für DbInfoKeywords OleDbSchemaGuid werden keine Einschränkungen erwartet.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>Für DbInfoLiterals OleDbSchemaGuid werden keine Einschränkungen erwartet.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>Für die Schema-guid OleDbSchemaGuid werden keine Einschränkungen erwartet.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>Das Schema {0} OleDbSchemaGuid wird vom '{1}'-Provider nicht unterstützt.</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>Die Konfigurationseinstellung '{0}' weist eine falsche Anzahl von Werten auf.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>Die in der Konfigurationseinstellung '{0}' angegebene XML-Datei konnte nicht geladen werden.</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>Befehlsparameter [{0}] '{1}' ist ungültig.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>Der Datenwert des Befehlsparameters [{0}] '{1}' konnte aus anderen Gründen als einem Signaturübereinstimmungsfehler oder Datenüberlauf nicht konvertiert werden.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>Die Konvertierung des Befehlsparameters [{0}] '{1}' ist fehlgeschlagen, da der Datenwert signiert war, aber der vom Anbieter verwendete Typ nicht.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>Die Konvertierung des Befehlsparameters [{0}] '{1}' ist fehlgeschlagen, da der Datenwert den vom Provider verwendeten Typ überlaufen hat.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>Der Anbieter ist beim Senden des Werts des Befehlsparameters [{0}] '{1}' auf einen Fehler gestoßen und hat die Verarbeitung angehalten.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>Der Parameter [{0}] '{1}' hat keinen Standardwert.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>Fehler beim Befehlsparameter [{0}]: {1}.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Interner Microsoft.Data.OleDb.OleDbDataAdapter-Fehler: ungültiger Parameteraccessor: {0} {1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter[{0}]: die Eigenschaft OleDbType ist nicht initialisiert: OleDbType.{1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>Die ICommandWithParameters-Schnittstelle wird vom '{0}'-Provider nicht unterstützt. Befehlsparameter werden vom aktuellen Provider nicht unterstützt.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>Das Abfragen der Prozedurparameterinformationen wird vom '{0}'-Provider nicht unterstützt.</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>Das Dezimaltrennzeichen des Servers kann nicht bestimmt werden. Nicht ganzzahlige numerische Literale können nicht erstellt werden.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>Das Objekt ist kein ADODB.RecordSet oder ADODB.Record.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>Die Schnittstelle '{0}' kann vom ADODB.RecordSet-Objekt nicht abgerufen werden.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: die Size-Eigenschaft hat den ungültigen Wert 0.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>Die IRow-Schnittstelle kann nicht vom ADODB.Record-Objekt abgefragt werden.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>Die {0}.Prepare-Methode erfordert, dass für alle Parameter explizit ein Typ festgelegt wird.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>Der Typ unterstützt nicht die OLE DB-Schnittstelle ISourcesRowset</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>Die {0}.Prepare-Methode erfordert, dass für alle variablen Längenparameter explizit eine nicht-Null-Size festgelegt wird.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>Die ReservedWords-Schema-Sammlung kann nicht erstellt werden, da der Provider IDBInfo nicht unterstützt.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>Die {0}.Prepare-Methode erfordert, dass für Parameter des Typs '{1}' Precision und Scale explizit festgelegt ist.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>Der Eigenschaftenwert wurde aus folgenden Gründen nicht festgelegt: der Anbieter unterstützt die Eigenschaft '{0}' nicht, oder der Consumer hat versucht, Werte von Eigenschaften, die nicht in der Eigenschaftengruppe 'Initialization' vorhanden sind, abzurufen oder festzulegen, ohne dass das Datenquellenobjekt initialisiert war.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>Nicht übereinstimmender Aufruf zum Beenden der Methode für asyncResult. Erwartet wurde der Aufruf von {0}, stattdessen wurde {1} aufgerufen.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>Die Eigenschaft '{0}' konnte aus einem der folgenden Gründe nicht initialisiert werden:
-	Der Wertdatentyp entsprach nicht dem Datentyp der Eigenschaft oder war ungleich Null. Beispiel: Die Eigenschaft war DBPROP_MEMORYUSAGE mit dem Datentyp Int32, der Datentyp dagegen war Int64.
-	Der Wert war nicht gültig. Die Eigenschaft war DBPROP_MEMORYUSAGE, der Wert negativ.
-	Der Wert war gültig für die Eigenschaft, und der Provider unterstützt die Eigenschaft als festlegbare Eigenschaft, ohne jedoch den angegebenen Wert zu unterstützen. Dies gilt auch dann, wenn der Wert der Eigenschaft in OLE DB hinzugefügt wurde, nachdem der Provider geschrieben wurde.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>Ungültige Operation. Die Verbindung ist geschlossen.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>Der Wert 'Options' war ungültig.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>Eintrag in der Transaktion fehlgeschlagen, da für die Verbindung gerade eine lokale Transaktion durchgeführt wird. Beenden Sie die lokale Transaktion, und wiederholen Sie den Vorgang.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>Das ColumnID-Element war ungültig.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>Für die Verbindung ist gegenwärtig eine Transaktion eingetragen. Beenden Sie die aktuelle Transaktion, und versuchen Sie es erneut.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>Die angegebene Eigenschaft '{0}' sollte auf alle Spalten angewendet werden, konnte jedoch auf eine oder mehrere Spalten nicht angewendet werden.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>Datenbank kann nicht Null, eine leere Zeichenfolge oder eine Zeichenfolge aus Leerzeichen sein.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>Die Eigenschaft '{0}' war schreibgeschützt, oder der Consumer hat versucht, Werte von Eigenschaften in der Eigenschaftengruppe 'Initialization' festzulegen, nachdem das Datenquellenobjekt initialisiert wurde. Consumer können den Wert einer schreibgeschützten Eigenschaft auf deren aktuellen Wert festlegen. Dieser Status wird auch zurückgegeben, wenn eine festlegbare Spalteneigenschaft für die bestimmte Spalte nicht festgelegt werden konnte.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>Ungültiger Quellpufferoffset (Größe von {0}): {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>Der Wert der optionalen Eigenschaft '{0}' wurde nicht auf den angegebenen Wert festgelegt. Das Festlegen der Eigenschaft auf den angegebenen Wert war nicht möglich.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>Ungültiger Zielpufferoffset (Größe von {0}): {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>Der Wert der Eigenschaft '{0}' wurde nicht festgelegt, da dies zu einem Konflikt mit einer vorhandenen Eigenschaft geführt hätte.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>Ungültiger Versuch, zu {0}, da der Stream bereits geschlossen wurde.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(Reserviert)</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>Der angegebene SeekOrigin-Wert ist ungültig.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>Der Provider hat den unbekannten DBPROPSTATUS_-Wert '{0}' zurückgegeben.</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>Ungültiger Versuch, aus der Spaltenordinalzahl '{0}' zu lesen. Mit CommandBehavior.SequentialAccess kann nur aus der Spaltenordinalzahl '{1}' oder größer gelesen werden.</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>Accessor-Validierung wurde verzögert und ausgeführt, während die Methode Daten zurückgegeben hat. Ungültige Bindung für diese Spalte oder diesen Parameter.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>Der Parameterdatentyp von {0} ist ungültig.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>Interner OleDbDataAdapter-Fehler: ungültiger RowSet-Accessor: Ordinal={0} Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>Es ist keine Zuordnung zwischen dem Objekttyp {0} und einem bekannten verwalteten nativen Providertyp vorhanden.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>Der Datenwert konnte aus anderen Gründen als Signaturübereinstimmungsfehler oder Datenüberlauf nicht konvertiert werden. Möglicherweise wurden die Daten im Datenspeicher beschädigt, aber die Zeile war weiterhin abrufbar.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>Der unbekannte TypeCode {0}, der vom Type {1} zurückgegeben wurde, kann nicht behandelt werden.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>Anbieter konnte keinen Arbeitsspeicher für die Rückgabe von {0}-Daten belegen.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>Es ist keine Zuordnung von DbType {0} zu einem bekannten {1} vorhanden.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>Die Konvertierung ist fehlgeschlagen, da der Datenwert {0} den für den Wertteil {0} im Puffer des Benutzers festgelegten Typ überlaufen hat.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>Die verwendete SQL Server-Version unterstützt nicht den Datentyp '{0}'.</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>Interner OleDbDataAdapter-Fehler: [get] unbekannter OLE DB-Datentyp: 0x{0} ({1}).</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>Der Parameterwert '{0}' befindet sich außerhalb des gültigen Bereichs.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>Konvertierung ist fehlgeschlagen, da der {0}-Datenwert signiert wurde und der für den {0}-Wert angegebene Typ nicht signiert wurde.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>Der angegebene Parametername '{0}' ist ungültig.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>Interner OleDbDataAdapter-Fehler: [set] unbekannter OLE DB-Datentyp: 0x{0} ({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>Ungültiger Wert für die Parametergröße '{0}'. Der Wert muss größer oder gleich 0 sein.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>Anbieter konnte den {0}-Wert nicht ermitteln. Zum Beispiel: die Zeile wurde gerade erstellt, der Standard für die {0}-Spalte nicht verfügbar und der Consumer hat noch keinen neuen {0}-Wert gesetzt.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>Ungültiger Wert für das Argument '{0}'. Der Wert muss größer oder gleich 0 sein.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>OLE DB-Anbieter hat unerwarteten Statuswert von {0} zurückgegeben.</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>Ungültiger Wert für diese Metadaten.</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>OleDbDataReader.Read muss im gleichen Thread verwendet werden, in dem sie erstellt wurde, wenn der ApartmentState des Threads nicht ApartmentState.MTA war.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>Parameterwert konnte nicht von {0} in {1} umgewandelt werden.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>Nicht angegebener Fehler: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} unterstützt keine parallelen Transaktionen.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>Fehler {0} in IErrorInfo.GetDescription.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>{0} wurde beendet und kann nicht mehr verwendet werden.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>Fehler {0} in IErrorInfo.GetSource.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>Die angegebene Länge '{0}' ist außerhalb des Gültigkeitsbereichs.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>DBTYPE_VECTOR-Daten werden vom .NET Framework-OLE DB-Datenanbieter (Microsoft.Data.OleDb) nicht unterstützt.</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>Ungültiger Versuch dataIndex '{0}' zu {2}. Mit CommandBehavior.SequentialAccess kann nur dataIndex '{1}' oder größer gelesen werden.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>Ungültiger Wert für die minimale oder maximale Poolgröße. Die minimale Poolgröße kann nicht größer als die maximale Poolgröße sein.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>Das Schlüsselwort '{0}' ist veraltet. Verwenden Sie stattdessen '{1}'.</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>Die Adresse des verteilten Transaktionskoordinators für den Server konnte nicht vom Server abgerufen werden. Wurde DTC auf dem Server aktiviert?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>Die Länge des Werts für den Verbindungsparameter &lt;{0}&gt; überschreitet die maximale Länge von 65535 Zeichen.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>Ungültiger Packet Size-Wert. Der Wert muss eine ganze Zahl &gt;= 512 und &lt;= 32768 sein.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>Ungültige Transaktion oder ungültiger Name eines Speicherungspunkts der Transaktion.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>Der Enumerationswert von {0}, {1}, wird nicht von SQL Server 7.0 oder SQL Server 2000 unterstützt.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>Die Optionen 'User Instance' und 'Failover' sind nicht kompatibel. Wählen Sie nur eine der beiden Optionen in der Verbindungszeichenfolge.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>Die Eigenschaft "Credential " kann nicht festgelegt werden, wenn "Authentication=Active Directory Integrated" in der Verbindungszeichenfolge angegeben wurde.</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>Bei der Zertifikatauthentifizierung wurden falsche Authentifizierungsparameter angegeben.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>Die Instanz von SQL Server, mit der Sie sich verbinden möchten, erfordert eine Verschlüsselung, die von diesem Computer jedoch nicht unterstützt wird.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>Die Instanz von SQL Server, mit der Sie sich verbinden möchten, unterstützt keine Verschlüsselung.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>Die Instanz von SQL Server, mit der Sie eine Verbindung herstellen möchten, unterstützt CTAIP nicht.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>Nicht unterstützte SQL Server-Version. Der .NET Framework-SqlClient-Datenanbieter kann nur mit SQL Server-Version 7.0 und höher verwendet werden.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>{0} kann nicht geändert werden, während eine asynchrone Operation ausgeführt wird.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>Dieser Befehl erfordert eine asynchrone Verbindung. Legen Sie in der Verbindungszeichenfolge "Asynchronous Processing=true" fest.</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>Timeout beim Versuch, eine Verbindung herzustellen.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>Timeout abgelaufen. Die Verbindung wurde aus diesem Grund unterbrochen.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>Instanzausfall.</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>Fehlercodecode 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword erfordert SQL Server 9.0 oder höher.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>Die Umleitung der SSE-Instanz wird bei nicht lokalen Benutzerinstanzen nicht unterstützt.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>Die Authentifizierung "{0}" wird nicht unterstützt.</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>Die SQL-Authentifizierungsmethode "{0}" wird nicht unterstützt.</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>Fehler beim Instanziieren eines Authentifizierungsanbieters des Typs "{1}" für "{0}".</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>Fehler beim Instanziieren eines SqlAuthenticationInitializer des Typs "{0}".</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>Der Anbieter "{0}" hat bei der Initialisierung eine Ausnahme ausgelöst.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>Die Authentifizierung "{1}" wird vom Anbieter "{0}" nicht unterstützt.</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Für „{0}“ wurde kein Authentifizierungsanbieter gefunden. Installieren Sie das NuGet-Paket „Microsoft.Data.SqlClient.Extensions.Azure“ (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure), um Active Directory (Entra ID)-Authentifizierungsmethoden zu verwenden.</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>Fehler beim Lesen des Konfigurationsabschnitts für Authentifizierungsanbieter.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Der Parameter "{0}" darf nicht NULL oder leer sein.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>Die asynchrone Operation wurde bereits abgeschlossen.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>Die Befehlsausführung kann aufgrund einer ausstehenden bereits laufenden asynchronen Operation nicht fortgesetzt werden.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>Der an ExecuteXmlReader gesendete Befehl ist ungültig. Der Befehl muss ein Xml-Ergebnis zurückgeben.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>Für Benachrichtigungen ist SQL Server 9.0 oder höher erforderlich.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>Ungültiges dreiteiliges Namensformat für UdtTypeName.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>Das SSPI-Paket kann nicht initialisiert werden.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Timeout abgelaufen. Das Zeitlimit wurde vor dem Beenden des Vorgangs überschritten oder der Server reagiert nicht.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>Verbindungstimeout abgelaufen. Das Timeout ist zu Beginn der Phase vor der Anmeldung aufgetreten. Möglicherweise wurde ein zu kurzes Verbindungstimeout konfiguriert.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>In der Verbindungszeichenfolge wurde eine Benutzerinstanz angefordert, doch der angegebene Server unterstützt diese Option nicht.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>Fehler bei der Anwendungsüberprüfung für das Serverzertifikat.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>Die angegebene Datenlänge {0} überschreitet die zulässige Höchstlänge {1}.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>Ungültiger Leseversuch, wenn keine Daten vorhanden sind.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>Datenlänge '{0}' ist kleiner als 0.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>'{0}' kann nicht aufgerufen werden, wenn SqlDataRecord schreibgeschützt ist.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>Die zugeordnete Sammlung wird verwendet, weshalb zur Zeit kein Zugriff auf diese möglich ist.</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>Das Herstellen einer Verbindung mit der Kontextverbindung über Microsoft.Data.SqlClient wird nicht unterstützt.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>Geschachtelte 'TransactionScopes' werden nicht unterstützt.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>Unerwartetes Serverereignis: {0}.</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>Die Länge von '{0}' muss mit der Länge von '{1}' übereinstimmen.</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>Der SqlDbType '{0}' ist für {1} unzulässig. Unterstützt wird nur {2}.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>Zu viele Werte.</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>Vom Stream wird Schreiben nicht unterstützt.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>NULL</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>Nachricht</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>Arithmetischer Überlauf.</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>Fehler aufgrund einer Division durch 0.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>Der Wert eines Null-SQL-Datensatzes kann nicht zurückgegeben werden.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>Die numerische Arithmetik bewirkt ein Abschneiden.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>SqlDateTime-Überlauf; muss zwischen 1/1/1753 12:00:00 AM und 12/31/9999 11:59:59 PM liegen.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>Zwei zu verkettende Zeichenfolgen haben unterschiedliche Sortierungen.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>Zwei zu vergleichende Zeichenfolgen haben unterschiedliche Sortierungen.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>Ungültiger Flagwert.</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>Überläufe bei Konvertierung von SqlDecimal in Decimal.</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>Konversionsüberläufe.</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>Ungültige 'SqlDateTime'.</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>Es wurde eine Zeitzone angegeben. 'SqlDateTime' unterstützt keine Zeitzonen.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>Ungültige Arraygröße.</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>Ungültige numerische Genauigkeit/Skala.</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>Die Eingabe hatte nicht das richtige Format.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>SqlType-Fehler.</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>SqlBytes und SqlChars unterstützten in dieser Version nur eine maximale Länge von 2GB.</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>Fehler beim Lesen.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Stream wurde geschlossen oder entfernt.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>Kein Puffer vorhanden. Lese- bzw. Schreiboperation fehlgeschlagen.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>Eine Länge ungleich Null kann nicht festgelegt werden, da der aktuelle Wert Null ist.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>Der Puffer ist unzureichend. Lese- bzw. Schreiboperation fehlgeschlagen.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>Schreiben in einen Offset ungleich Null nicht möglich, da der aktuelle Wert Null ist.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>Schreiben aus einem Offset, der größer als die aktuelle Länge ist, nicht möglich. Es würden nicht initialisierte Daten im Puffer verbleiben.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>Die Größe der zurückgegebenen Daten beträgt mehr als 2Gb. Verwenden Sie das SequentialAccess-command behavior, um alle Daten abzurufen.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>Argument für GetDayOfWeek muss eine Ganzzahl von 1 bis 7 sein.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>SQL Type wurde nicht mit Daten geladen.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>SQL Type wurde bereits mit Daten geladen.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>Ungültiger Versuch des Zugriffs auf einen geschlossenen XmlReader.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>Ungültiger Versuch des Aufrufs von {0}, wenn der Datenstrom geschlossen ist.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>Ungültiger Versuch des Aufrufs von {0}, wenn nicht in den Datenstrom geschrieben werden kann.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>Ungültiger Versuch des Aufrufs von {0}, wenn der Datenstrom nicht lesbar ist.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>Ungültiger Versuch des Aufrufs von {0}, wenn der Datenstrom nicht durchsuchbar ist.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>Die Unterklasse hat keine erforderliche Methode überschrieben.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>Die Normalisierungsfunktion für '{0}' kann nicht erstellt werden.</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>Interner Fehler</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>Der Befehlstext von Befehlsparametern darf weder Null noch leer sein.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>Die Länge des MetaData-Parameterarrays muss dem ParameterDirection-Arrayargument entsprechen.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>Datenadapter-Zuordnungsfehler.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>Datenadapterfehler.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>DB-Parallelitätsverletzung.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>Operation abgebrochen.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>Operation aufgrund einer Ausnahme abgebrochen (Details finden Sie in der InnerException).</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Gibt an, ob Fill DataRow.AcceptChanges aufruft.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Gibt an, ob DataRow.AcceptChanges von Update aufgerufen wird.</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Gibt an, ob mit der nächsten DataRow fortgesetzt wird, wenn der Status der Updateereignisse RowUpdating and RowUpdated 'UpdateStatus.ErrorsOccurred' ist.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>Bestimmt, wie der Adapter die DataTable aus dem DataReader auffüllt.</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>Die Aktion, die unternommen wird, wenn eine Tabelle oder Spalte in TableMappings fehlt.</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>Die Aktion, die unternommen wird, wenn eine Tabelle oder Spalte im DataSet fehlt.</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>Zeigt, wie eine Quelltabelle einer DataSet-Tabelle zugeordnet wird.</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Ereignis, das ausgelöst wird, wenn während Fill ein wiederherstellbarer Fehler auftritt.</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Gibt an, ob Fill providerspezifische Werte oder allgemeine CLSCompliant-Werte zurückgeben soll.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>Quellspaltenname - Groß-/Kleinschreibung wird beachtet.</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>Anzahl der Elemente in der Sammlung</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>Angegebenes DataColumnMapping-Objekt.</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>Individuelle Spaltenzuordnungen, wenn diese Tabellenzuordnung übereinstimmt.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>Der DataTableMapping-Quelltabellenname. Für diesen Namen muss die Groß-/Kleinschreibung beachtet werden.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>Anzahl der Elemente in der Sammlung</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>Das angegebene DataTableMapping-Objekt.</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>Wird verwendet bei Update für gelöschte Zeilen im DataSet.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Das Ereignis, das während des Updates nach jeder DataRow ausgelöst wird.</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>Die Anzahl der Zeilen, die in einem Batch zusammengefasst werden, vor der Anwendung des Befehls auf die Datenquelle.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Verwendete Verbindung, wenn die 'Select/Insert/Update/DeleteCommands' nicht bereits über eine Verbindung verfügen.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>Wird während Update für gelöschte Zeilen in der DataTable verwendet.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>Wird während Update für neue Zeilen in der DataTable verwendet.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Wird während Fill verwendet.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>Wird während Update für geänderte Zeilen in der DataTable verwendet.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Gibt an, ob Fill providerspezifische Werte oder allgemeine CLSCompliant-Werte zurückgeben soll.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>Zuordnen der Quelltabelle zur DataTable.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>Legt fest, wie die Befehle Insert/Update/DeleteCommands generiert werden, wenn diese nicht vom Benutzer festgelegt werden.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>Die Anzahl der Zeilen, die in einem Batch zusammengefasst werden, vor der Anwendung des Befehls auf die Datenquelle.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>Die Verbindungszeichenfolge zum Herstellen einer Verbindung mit der Datenquelle.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>Der Name des zum Herstellen einer Verbindung mit der Data Source zu verwendenden ODBC-Treibers.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>Der zum Herstellen einer Verbindung mit der Data Source zu verwendende DSN-Name.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>Gibt, falls wahr, an, dass das verwaltete Verbindungspooling verwendet werden soll.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>Die bei Herstellung einer Verbindung mit der Data Source zu verwendende UDL-Datei.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>Gibt an, welche OLE DB Services mit dem OleDb Provider aktiviert oder deaktiviert werden sollen.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>Der Name des zum Herstellen einer Verbindung mit der Data Source zu verwendenden OLE DB-Providers.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>Der Name der Anwendung.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>Bei Festlegung auf TRUE wird die Verwendung der asynchronen Funktionalität im .NET Framework-Datenanbieter aktiviert.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>Der Name der primären Datei, einschließlich dem vollständigen Pfadnamen, einer anfügbaren Datenbank.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>Gibt, falls wahr, an, dass der Status der Verbindung bei Entfernen aus dem Pool zurückgesetzt wird.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>Falls wahr, muss die Verbindung aus dem Sql Server-Kontext hergestellt werden. Ist nur bei Ausführung im Sql Server-Prozess verfügbar.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>Der Datensatzname der SQL Server-Sprache.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>Legt die Methode der Authentifzierung mit SQL Server fest.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>Das angegebene Clientzertifikat für die Authentifizierung bei SQL Server.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>Informationen, die zum verbinden mit einer Datenquelle verwendet werden.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Der aktuelle Zeitüberschreitungswert der Verbindung kann nicht in ConnectionString festgelegt werden.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>Aktueller Datenquellenkatalog-Wert, 'Database=X' in der Verbindungszeichenfolge.</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>Aktuelle Datenquelle 'Server=X' in der Verbindungszeichenfolge.</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>Aktueller ODBC-Treiber.</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>Produktversion, auf die vom ODBC-Treiber zugegriffen wird.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>Informationen, die zum verbinden mit einer Datenquelle verwendet werden.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Aktueller Verbindungstimeout-Wert, 'Connect Timeout=X' in ConnectionString.</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>Aktueller Datenquellenkatalog-Wert, 'Initial Catalog=X' in der Verbindungszeichenfolge.</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>Aktuelle Datenquelle, 'Data Source=X' in der Verbindungszeichenfolge.</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>Aktuelle OLE DB-Provider-ProgID, 'Provider=X' in der Verbindungszeichenfolge.</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>Produktversion, auf die vom OLE DB-Provider zugegriffen wird.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>Zugriffs-Token zur Verwendung bei der Authentifizierung.</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>Status der Verbindung: synchron oder asynchron. 'Asynchronous Processing=x' in der Verbindungszeichenfolge.</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>Informationen, die verwendet werden, um eine Verbindung für die Replikation herzustellen.</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>Informationen zum Verbinden mit einer DataSource; z.B. 'Data Source=x;Initial Catalog=x;Integrated Security=SSPI'.</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>Erfassen von Statistiken für diese Verbindung.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>Verschlüsselungs-Schlüsselspeicheranbieter für benutzerdefinierte Spalte.</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>Eine GUID, die die physische Verbindung darstellt.</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Automatische Eintragung in von Microsoft SQL Server verwendete Benachrichtigungen.</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>Automatisches Generieren der WHERE-Klausel für die Befehle 'Update' und 'Delete', wenn diese vom Benutzer nicht angegeben wurde.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>Gibt die Position des Katalognamens in einem qualifizierten Tabellennamen in einem Textbefehl an.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>Das Zeichen, das den Katalognamen vom Rest des Bezeichners in einem Textbefehl trennt.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>Das Zeichen, das den Schemanamen vom Rest des Bezeichners in einem Textbefehl trennt.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Die Präfixzeichenfolge um sql-Objekte.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Die Suffixzeichenfolge um sql-Objekte.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Der DataAdapter, für den Befehle automatisch generiert werden.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>Verwenden Sie das Schema der DataTable oder den SelectCommand.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>Automatisches Generieren der SET-Klausel für den Update-Befehl, falls diese nicht vom Benutzer angegeben wurde.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Der DataAdapter für den OdbcCommands automatisch generiert werden</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Das Zeichen, das in einem Textbefehl als öffnendes Anführungszeichen für Bezeichner verwendet wird, die spezielle Zeichen verwenden.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Das Zeichen, das in einem Textbefehl als schließendes Anführungszeichen für Bezeichner verwendet wird, die spezielle Zeichen enthalten.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter für den automatisch OleDbCommands generiert werden.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Das in numerischen Literalen verwendete Dezimaltrennzeichen.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Die Präfixzeichenfolge um sql-Objekte</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Die Suffixzeichenfolge um sql-Objekte</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>Der DataAdapter, für den automatisch SqlCommands generiert werden</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Das in numerischen Literalen verwendete Dezimaltrennzeichen.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Das Zeichen, das in einem Textbefehl als öffnendes Anführungszeichen für Bezeichner verwendet wird, die spezielle Zeichen verwenden.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Das Zeichen, das in einem Textbefehl als schließendes Anführungszeichen für Bezeichner verwendet wird, die spezielle Zeichen enthalten.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>Nur erforderlich zum Festlegen für dezimale und numerische Parameter im Rahmen einer Verwendung bei den Szenarien 'Prepare', 'FillSchema' und 'CommandBuilder'.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>Nur erforderlich zum Festlegen für dezimale und numerische Parameter im Rahmen einer Verwendung bei den Szenarien 'Prepare', 'FillSchema' und 'CommandBuilder'.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>Der native Parametertyp.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>Der native Parametertyp.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>Name des Parameters, z.B. '@p1'</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>Der native Parametertyp.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>Der Servername für den Typ.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>Offset in Datentypen variabler Länge.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>Die angegebene ParameterDirection '{0}' für Parameter '{1}' wird nicht unterstützt. Table-valued parameters unterstützen nur ParameterDirection.Input.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>Der angegebene TypeName für Parameter '{0}'. TypeName darf nur für Structured-Parameter festgelegt werden.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>Der Typ SqlDbType.Structured wird nur für Typen mit mehreren Werten unterstützt.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>Die 'DateType'-Spalte für das Feld '{0}' in der Schematabelle ist NULL. 'DataType' darf nicht 'null' sein.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>Die Anzahl der Felder im Datensatz '{0}' stimmt nicht mit der Anzahl in dem ursprünglichen Datensatz überein.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>Bereich: 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>Im SqlClient-Datenprovider ist ein unerwarteter Fehler aufgetreten. {0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>Type Info für {0},{1} kann nicht abgerufen werden</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>Der Provider hat folgende Assembly nicht geladen: {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>Die UdtTypeName-Eigenschaft muss für UDT-Parameter festgelegt werden.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>Der angegebene Typ ist nicht auf dem Zielserver {0} registriert.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>UDT-Parameter sind in der WHERE-Klausel nur dann zulässig, wenn sie Teil des Primärschlüssels sind.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>'{0}' ist ein ungültiger benutzerdefinierter Typ. Grund: {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>unterstützt sowohl speicherresidente als auch benutzerdefinierte Formate</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>Das native Format kann nicht unterstützt werden.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>implementiert nicht IBinarySerialize</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>nicht serialisierbar</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>keine öffentlichen Constructors</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>implementiert nicht INullable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>hat keinen öffentlichen Constructor</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>kein UDT-Attribut</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>Serialisierung ohne Zuordnung wird noch nicht unterstützt.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>'public static x Parse(System.Data.SqlTypes.SqlString)'-Methode fehlt</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>'public override string ToString()'-Methode fehlt</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>'public static x Null { get; }'-Methode fehlt</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>Das Format 'Native' unterstützt keine Felder (direkt oder über ein anderes Feld) vom Typ '{0}'</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>Typ ist nicht öffentlich</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Native UDT nicht sequenzielles Layout aufgrund von Typ '{0}'</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Native UDT gibt eine maximale byte-Größe an</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>Feld '{0}' ist als nicht serialisiert markiert</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>Der Typ des Felds „{0}“ ist als explizites Layout markiert, was im nativen Format nicht zulässig ist.</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>Mehrere mit Werten versehene Assembly-Verweise müssen über eine Assembly-ID ungleich Null verfügen.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>Structured-Typen mit mehreren Werten können nur für Parameter verwendet und nicht in einem anderen Typ verschachtelt werden.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>Der Pfadname ist ungültig.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>Fehler beim Versuch, die Transaktion heraufzustufen.</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>Abhängigkeitsobjekt, das zum Empfangen von Abfragebenachrichtigungen verwendet wird.</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>Eigenschaft, die angibt, ob diese Abhängigkeit ungültig ist.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>Zum Hinzufügen eines Befehls zu einem vorhandenen Abhängigkeitsobjekt.</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Command ist bereits mit einem anderen Abhängigkeitsobjekt verknüpft. Überschreiben nicht möglich.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>Dieses SqlCommand-Objekt ist bereits mit einem anderen SqlDependency-Objekt verknüpft.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>Der angegebene Timeoutwert ist ungültig. Der Timeoutwert darf nicht &lt; 0 sein.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>Benachrichtigungsfehler. Typ={0}, Info={1}, Quelle={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData ist für diesen SqlDbType nicht gültig.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>Der dbType {0} ist für diesen Konstruktor ungültig.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>Interner Fehler. Wert für Klartext darf nicht NULL sein.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>Verschlüsselung nicht möglich. Die Verschlüsselung ergab {0} Bytes an Chiffretext, womit der maximal mögliche Wert von {1} Bytes überschritten ist. Der angegebene Klartextwert ist wahrscheinlich zu groß (Klartextgröße ist: {2} Bytes).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>Interner Fehler. Wert des Chiffretexts darf nicht NULL sein.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>Von SQL Server wurden keine Nachweisinformationen zurückgegeben. Der Enclave-Typ ist "{0}", die Enclave-Nachweis-URL lautet {1}.</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>Es kann kein sicherer Kanal eingerichtet werden. Fehlermeldung: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>Interner Fehler. NULL-Argument "{0}" beim Erstellen eines Objekts vom Typ "{1}" angegeben. "{0}" darf nicht NULL sein.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Hiermit wird ein Endpunkt für einen Enclave-Nachweisdienst angegeben. Mit diesem wird die Gültigkeit und Sicherheit des in der SQL Server-Instanz konfigurierten Enclave-Anbieters überprüft, der für Berechnungen in Always Encrypted-verschlüsselten Datenbankspalten verwendet wird.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>Fehler beim Lesen des Konfigurationsabschnitts für Enclave-Anbieter. Stellen Sie sicher, dass der Abschnitt in Ihrer Anwendungskonfigurationsdatei ordnungsgemäß formatiert ist. Fehlermeldung: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>Fehler beim Instanziieren eines Enclave-Anbieters mit dem Typ "{1}" für den Namen "{0}". Fehlermeldung: {2}</value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>Interner Fehler. SqlColumnEncryptionEnclaveProviderName darf nicht NULL oder leer sein.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>Fehler beim Lesen des Resultsets "{0}". In der Verbindungszeichenfolge wurde keine Nachweis-URL angegeben, aber für die Abfrage sind Enclave-Berechnungen erforderlich. Der Enclave-Typ lautet "{1}". </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>Interner Fehler. Beim Ausführen einer Abfrage, die Enclave-Berechnungen erfordert, war der von SQL Server empfangene Enclave-Typ leer oder NULL.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>Das Ausführen einer Abfrage erfordert Enclave-Berechnungen, aber die Anwendungskonfiguration enthält keinen Abschnitt zum Enclave-Anbieter.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>Für den Enclave-Typ "{0}" und das Nachweisprotokoll "{1}" wurde kein Enclave-Anbieter gefunden. Geben Sie das richtige Nachweisprotokoll in der Verbindungszeichenfolge an. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>Standardverschlüsselungseinstellung für alle Befehle in der Verbindung.</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>Erzwingt, dass Parameter verschlüsselt werden, bevor vertrauliche Daten an den Server gesendet werden. </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>Wörterbuchobjekt, das SQL Server-Namen und deren vertrauenswürdige Spaltenhauptschlüsselpfade enthalten.</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>Die Verbindungsoption "ApplicationIntent ReadOnly" wird nicht unterstützt, wenn eine Verbindung mit einer gespiegelten SQL Server-Instanz hergestellt wird.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>Unerwartete Routinginformationen empfangen.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>Ungültige Routinginformationen empfangen.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>In diesem Kontext wurde eine nicht unterstützte Authentifizierung angegeben: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Timeout bei der interaktiven Active Directory-Authentifizierung. Der Benutzer hat zu lange nicht auf die Authentifizierungsanforderung reagiert.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>"Authentication=Active Directory Interactive" kann nicht verwendet werden, wenn die Eigenschaft "Credential" festgelegt wurde.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>Die Serverprozess-ID (SPID) der aktiven Verbindung.</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Timeout bei der Authentifizierung per Active Directory-Gerätecodeflow. Der Benutzer hat zu lange nicht auf die Authentifizierungsanforderung reagiert.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>Die Eigenschaft "Credential" kann nicht festgelegt werden, wenn in der Verbindungszeichenfolge "Authentication=Active Directory Device Code Flow" angegeben wurde.</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>Nur eindimensionale Arrays werden für die angeforderte Aktion unterstützt.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>Das angegebene Element kann nicht entfernt werden, da es nicht in der Sammlung gefunden wurde.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>Nicht negative Zahl erforderlich.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Die Eigenschaft AccessTokenCallback kann nicht festgelegt werden, wenn in der Verbindungszeichenfolge "Authentication=Active Directory Default" angegeben wurde.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} hat {1} zurückgegeben.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>Protokollfehler: Eine empfangene Nachricht enthält eine gültige Signatur, wurde aber nicht so verschlüsselt, wie es nach dem gültigen Schutzgrad erforderlich ist.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>Fehler bei "{0}": {1}</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>Die Methode wird von der Klasse nicht implementiert.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>Das angeforderte Sicherheitspaket wird nicht unterstützt.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>Falscher physicalConnection-Typ.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>Ausnahme beim Festlegen des AppContext-Schalters "{0}"={1}.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>Der Typ "{0}" wird auf dieser Plattform nicht unterstützt.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>Der invariante Globalisierungsmodus wird nicht unterstützt.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Die Authentifizierung mit Kerberos ist nicht möglich. Stellen Sie sicher, dass Kerberos auf dem Client mit "kinit" initialisiert wurde und ein Dienstprinzipalname für die SQL Server registriert wurde, um die Kerberos-Authentifizierung zuzulassen.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>Das Schlüsselwort "Netzwerkbibliothek" wird auf dieser Plattform nicht unterstützt. Stellen Sie der Datenquelle stattdessen das gewünschte Protokoll voran ("tcp:" für eine TCP-Verbindung oder "np:" für eine Named Pipe-Verbindung).</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>Socket hat den erwarteten "{0}" nicht ausgelöst. Fehlercode: "{1}".</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>Der Server versucht, ein Feature zu verwenden, das auf dieser Plattform nicht unterstützt wird.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>Das Schlüsselwort "{0}" wird auf dieser Plattform nicht unterstützt.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>Die aktuell geladene System.Transactions.dll unterstützt keine globalen Transaktionen.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>Beim Lesen von Daten vom Server wurde ein nicht unterstütztes Token "{0}" empfangen.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>"{0}" ist kein unterstützter Handletyp.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream wird auf dieser Plattform nicht unterstützt.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>LocalDB wird auf dieser Plattform nicht unterstützt.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>Nicht genügend Pufferspeicherplatz. Erforderlich: {0} Tatsächlich: {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>Fehler beim GSSAPI-Vorgang. Status: {0} (Nebenstatus: {1}).</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>Fehler beim GSSAPI-Vorgang (Fehler: {0} ({1})).</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>Keine Unterstützung für Kanalbindung auf anderen Betriebssystemen als Windows.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>Der Zielname sollte nicht leer sein, wenn Standardanmeldeinformationen übergeben werden.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>Die angeforderte Schutzebene wird bei der derzeit installierten GSSAPI-Implementierung nicht unterstützt.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>Die Serverimplementierung wird nicht unterstützt.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>Die NTLM-Authentifizierung ist mit Standardanmeldeinformationen auf dieser Plattform nicht möglich.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>Bei Verwendung durch 'DataAdapter.Update' wird der Parameterwert von DBNull.Value in (Int32)1 oder (Int32)0, falls nicht Null, geändert.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Maximale Puffergröße überschritten: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>DataColumn '{0}' für SourceColumn '{2}' ist nicht vorhanden.</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>Die SqlBatchCommand-Liste wurde nicht initialisiert.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index 19ac0fe966..e62177e353 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>Ascendente</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Índice {0} no válido para {1} con Count={2}.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>Otro {1} ya contiene {0}.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>{0} con ya contenido por {1}.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0} sólo acepta objetos de tipo no null {1}.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>Intentó quitar {0} que no está contenido por {1}.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1} debe ser único, '{2}' ya existe en la colección.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>La conexión no se cerró. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>Intento no válido de llamar a {0} cuando el lector está cerrado.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>No se puede dar de alta en la transacción porque la conexión es la conexión principal de una transacción delegada o promovida.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>Descendente</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>Se esperaba una cadena no vacía para el parámetro '{0}'.</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>No se ha inicializado la propiedad ConnectionString.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>Se detectó una Exception no conforme a CLS.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>El elemento de seguridad proporcionado no es un elemento de permiso.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>Datos</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>Actualizar</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>ConnectionState que indica si la conexión está abierta o cerrada.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>Evento que se desencadena cuando la conexión cambia el estado.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>Tipo de parámetro genérico.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>Entrada, salida o parámetro bidireccional.</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>propiedad de tiempo de diseño que se usa para generar código fuertemente tipado.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>Desplazamiento en tipos de datos de longitud variable.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>Nombre del parámetro.</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>Tamaño de tipos de datos de longitud variable (cadena y matrices).</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>Cuando lo utiliza DataAdapter.Update, el nombre de la columna de origen utilizado para encontrar el nombre de DataSetColumn en ColumnMappings. Copia un valor entre el parámetro y una fila de datos.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>Cuando lo usa DataAdapter.Update (sólo UpdateCommand), versión del valor DataRow que se usa para actualizar el origen de los datos.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>Cuando lo utiliza DataAdapter.Update, el valor del parámetro cambia de DBNull.Value a (Int32)1 o (Int32)0 si no es nulo.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>Valor del parámetro.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>No se puede compilar la colección '{0}' debido a un error en la ejecución de la consulta SQL. Vea la excepción interna para obtener detalles.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>Se han proporcionado más restricciones de las admitidas por el esquema solicitado ('{0}').</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>'{2}' no es un valor válido para la restricción '{1}' de la colección de esquemas '{0}'.</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>La colección solicitada ({0}) no está definida.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>La colección solicitada ({0}) no es compatible con esta versión del proveedor.</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>Falta una de las columnas necesarias de las tablas DataSourceInformation.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>La tabla DataSourceInformation debe contener exactamente una fila.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>Faltan una o más columnas necesarias de colección de restricciones.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>Existe una restricción para la que no hay fila coincidente en la colección de restricciones.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>Falta la colección '{0}' del XML de metadatos.</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>XML de metadatos no válido.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>XML de metadatos no válido. La colección {0} debe contener una columna {1} y debe ser una columna de cadena.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>XML de metadatos no válido. La columna {1} de la colección {0} debe contener una cadena que no esté vacía.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>Acción</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>Comportamiento</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>Relleno</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>Mensaje informativo</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>Asignación</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>Notificación</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>Esquema</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>Agrupación</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>ConnectionString con nombre</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>Seguridad</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>Resistencia de la conexión</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>Colección con la información de usuario personalizada.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>Indica si se distinguen mayúsculas y minúsculas en DataSet al comparar cadenas.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>Nombre de DataSet.</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>Indica una "vista" personalizada de los datos que contiene el DataSet. Esta vista permite filtrar, buscar y explorar la vista personalizada de datos.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>Indica si se siguen las reglas de restricción.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>Indica que el DataSet tiene errores.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>Indica una configuración regional con la que se pueden comparar las cadenas de DataSet.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>Indica el espacio de nombres del uri de XML para el elemento raíz que señala a este DataSet.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>Indica el prefijo del espacio de nombres utilizado en esta DataSet.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>La colección que contiene las relaciones de DataSet.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>La colección que contiene las tablas de DataSet.</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>Tiene lugar cuando no es posible combinar esquemas para dos tablas con el mismo nombre.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Ocurre al finalizar la Initialization.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>Representa una caché de datos en memoria.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>Indica si se distinguen mayúsculas y minúsculas en la tabla al comparar cadenas.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>Devuelve las relaciones secundarias de esta tabla.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>La colección que contiene las columnas para esta tabla.</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>La colección que contiene las restricciones para esta tabla.</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>Indica la DataSet a la que pertenece esta tabla.</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>DataView predeterminado de la tabla.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>La expresión utilizada para calcular el valor enlazado a datos de esta fila.</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>Indica si la tabla tiene errores.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>Indica una configuración regional con la que se pueden comparar las cadenas de la tabla.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>Indica el tamaño inicial para esta tabla.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>Indica el espacio de nombres del uri de XML para los elementos contenidos en esta tabla.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>Indica el prefijo del espacio de nombres utilizado para esta tabla en representación XML.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>Devuelve las relaciones primarias para esta tabla.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>Indica las columnas que representan la clave principal para esta tabla.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>Indica la colección que contiene las filas de datos de esta tabla.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>Indica el nombre utilizado para buscar esta tabla en la colección Tables de un DataSet.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>Tiene lugar después de que se edite correctamente una fila en la tabla.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>Tiene lugar cuando se cambia la fila, el controlador de eventos puede modificar o cancelar el cambio. El usuario puede modificar valores y puede iniciar una excepción para cancelar la edición.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>Tiene lugar después de que se elimine correctamente una fila de la tabla.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>Tiene lugar cuando una fila de la tabla está marcada para eliminarla. Inicie una excepción para cancelar la eliminación.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>Tiene lugar cuando se envía un valor para esta columna. El usuario puede modificar el valor propuesto y puede iniciar una excepción para cancelar la edición.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>Tiene lugar cuando ha cambiado el valor para esta columna.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>Tiene lugar antes de borrar todas las filas de la tabla.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>Tiene lugar después de borrar correctamente todas las filas de la tabla.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>Tiene lugar después de crear una nueva instancia de DataRow.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>El nombre utilizado para buscar esta relación en la colección Relations del DataSet.</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>Indica las columnas secundarias de esta relación.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>Indica las columnas primarias de esta relación.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>Indica si las relaciones están anidadas.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>Para eliminaciones, indica el tipo de cascada que tiene lugar en la relación.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>Para actualizaciones, indica el tipo de cascada que tiene lugar en la relación.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>Para aceptar o rechazar los cambios, indica que tipo de cascada tiene lugar en esta relación.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>Indica las columnas secundarias de esta restricción.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>Indica las columnas primarias de esta restricción.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>Indica la columnas secundaria de esta restricción.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>Indica las columnas de esta restricción.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>Indica si esta restricción es de tipo PRIMARY KEY.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>Indica el nombre de esta restricción.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>Indica la tabla de esta restricción.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>Indica si esta columna puede tener valores null.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>Indica si la columna se incrementa automáticamente con nuevas filas agregadas a la tabla. La columna debe ser de tipo Int16, Int32, o Int64.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>Indica el valor inicial de la columna AutoIncrement.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>Indica el incremento utilizado por la columna AutoIncrement.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>Indica la leyenda predeterminada de la interfaz de usuario de esta columna.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>Indica el nombre utilizado para buscar esta columna en la colección Columns de DataTable.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>Devuelve la tabla DataTable a la que pertenece esta columna.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>Indica el tipo de datos almacenados en esta columna.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>Indica el valor predeterminado de la columna utilizado al agregar nuevas filas a la tabla.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>Indica el valor que esta columna calcula para cada fila basándose en otras columnas en vez de tener en cuenta la acción del usuario.</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>Indica cómo persiste esta columna en XML: como atributo, elemento, nodo de contenido simple o nada.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>Indica el identificador uri de XML para elementos o atributos almacenados en esta columna.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>Indica el Prefix utilizado para esta DataColumn en la representación xml.</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Indica el índice de esta columna en la colección de Columns.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>Indica si esta columna permite realizar cambios una vez agregada la fila a la tabla.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>Indica si esta columna debe restringir los valores en las filas de la tabla para ser únicos.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>Indica la longitud máxima del valor que permite esta columna.</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>Indica el DateTimeMode de esta DataColumn.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>Indica si DataView y la interfaz de usuario asociada permiten realizar eliminaciones.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>Indica si DataView y la interfaz de usuario asociada permiten editar.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>Indica si DataView y la interfaz de usuario asociada permiten agregar nuevas filas.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>Devuelve el número de elementos actuales en esta vista.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>Devuelve un puntero para volver a DataViewManager al que pertenece este DataSet (si hay alguno).</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>Indica si una vista está abierta.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>Indica una expresión utilizada para filtrar los datos devueltos por DataView.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>Indica las versiones de datos devueltos por DataView.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>Indica los nombres de la columna y el orden en el que DataView devuelve los datos.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Indica si se debe utilizar el orden predeterminado si no está establecida la propiedad Sort.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>Indica la tabla que DataView utiliza para obtener datos.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>Indica que los datos devueltos por DataView han cambiado de alguna manera.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>Indica el origen de datos para este DataViewManager.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>Indica la configuración de orden, filtro y estado para cualquier tabla en el DataSet correspondiente.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet no admite valores 'union' o 'list' como simpleType.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>Sintaxis {0} no válida: falta el atributo '{1}' necesario.</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>El valor '{1}' no es válido para el atributo '{0}'.</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>El valor del atributo '{0}' debería ser '{1}' o '{2}'.</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>No se puede encontrar el ElementType name='{0}'.</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>Falta el nombre de la tabla primaria en la relación '{0}'.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>Falta el nombre de la tabla secundaria en la relación '{0}'.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>Falta la clave de la tabla primaria en la relación '{0}'.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>Falta la clave de la tabla secundaria en la relación '{0}'.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>Tipo de datos sin definir: '{0}'.</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>Tipo de datos sin definir.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>Selección XPath no válida dentro del nodo de campo. No se puede encontrar: {0}.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>La selección de XPath en un nodo de selector {0} no es válida.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>Nodo 'Key' no válido dentro de la restricción denominada: {0}.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>Ya está en uso el nombre de la restricción {0} en el esquema.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>No se puede convertir '{0}' en el tipo '{1}'.</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>Falta la parte '{0}' en la restricción '{1}' denominada '{2}'.</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>Definición de Relation no válida: claves con longitudes diferentes.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet no permite una referencia circular en el elemento ComplexType denominado '{0}'.</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet no puede crear una instancia de un ComplexType abstracto para el nodo {0}.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Error del convertidor de varios destinos al escribir un Schema Xml. Vea la excepción interna para obtener detalles.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Error del convertidor de varios destinos al escribir un Schema Xml. Se devolvió null o una cadena vacía.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>Declaración duplicada '{0}'.</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>No se puede cargar diffGram. Falta la tabla '{0}' en el DataSet de destino.</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>No se puede cargar diffGram. Falta el nodo 'sql'.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>El nombre de la columna '{0}' está definido para diferentes tipos de asignación.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>El prefijo '{0}' no es válido porque contiene caracteres especiales.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>Referencia circular en la tabla '{0}' anidada en sí misma.</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet no puede expandir entidades. Utilice XmlValidatingReader y establezca la propiedad EntityHandling en consecuencia.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>El tipo '{0}' no implementa la interfaz IXmlSerializable, por lo que no puede continuar la serialización.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>No se puede continuar con la deserialización. El dato no implementa IXMLSerializable, por lo que no se admite el polimorfismo.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable no es compatible con la inferencia de esquemas de Xml.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>No se puede continuar con la serialización de DataTable '{0}'. Contiene una DataRow que tiene varias filas primarias en la misma clave externa.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>Falta el atributo IsDataSet del Schema de entrada.</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>No se puede determinar el elemento DataSet. El atributo IsDataSet existe más de una vez.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet no serializará tipos que implementen IDynamicMetaObjectProvider pero que no implemente IXmlSerializable.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>Característica sin implementar. {0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>Error de sintaxis: falta el operando después del operador '{0}'.</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>El tipo no coincide en la expresión '{0}'.</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>Expresión demasiado compleja.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>No se puede encontrar la columna [{0}].</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>La expresión contiene una constante en la cadena no válida: {0}.</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>La expresión contiene una llamada a la función sin definir {0}().</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>Error de sintaxis en la expresión.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>Número no válido de argumentos: función {0}().</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>Falta el paréntesis de cierre en la expresión.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>No se puede interpretar el token '{0}' en la posición {1}.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>Se esperaba {0}, pero el token en la posición {2} es {1}.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>No se puede convertir de {0} a {1}.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>No se puede convertir el valor '{0}' al tipo: {1}.</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>Nombre de columna no válido [{0}].</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>La expresión contiene una constante de fecha '{0}' no válida.</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>En la lista de expresiones del operador IN sólo están permitidas las expresiones constantes.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Error en el operador Like: el patrón de cadena '{0}' no es válido.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>Error de sintaxis: los elementos detrás de la palabra clave IN deben estar separados por comas y entre paréntesis.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>El tipo en el argumento de función no coincide: {0}(), argumento {1}, se esperaba {2}.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>El tipo no coincide en el argumento de la función: {0}(), argumento {1}, se esperaba un tipo entero.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>No se puede realizar la operación '{0}' en {1} y {2}.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>El operador '{0}' es ambiguo en operandos de tipo '{1}' y '{2}'. No se pueden mezclar tipos signed y unsigned. Utilice la función explícita Convert().</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>Error de sintaxis: la palabra clave IN debe estar seguida de una lista con expresiones separadas por comas y entre paréntesis.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>La expresión contiene un operador '{0}' no compatible.</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>La expresión contiene un nombre no válido: '{0}'.</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>Error de sintaxis: falta el operando antes del operador '{0}'.</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>La expresión tiene demasiados paréntesis de cierre.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>La tabla [{0}] se encuentra en más de una relación. Debe mencionar el nombre de la relación en la expresión '{1}'.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>Error de sintaxis en el argumento aggregate: Se esperaba una columna simple con un calificador 'Child'.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>Referencia sin enlazar en la expresión aggregate '{0}'.</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>No se puede evaluar una expresión no constante en la fila actual.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>Referencia sin enlazar en la expresión '{0}'.</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>No se puede evaluar. La expresión '{0}' no es un agregado.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>La expresión de filtro '{0}' no se evalúa como un término booleano.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>El nombre de tipo '{0}' no es válido.</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>Error de sintaxis en la expresión de búsqueda: se esperaba la palabra clave 'Parent' seguida de un argumento en una columna con un calificador de relación: Parent[(&lt;relation_name&gt;)].&lt;column_name&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>Es necesaria una fila o una tabla para invocar DataFilter.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>El argumento {0}() está fuera del intervalo.</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>El desplazamiento y la longitud estaban fuera de los límites para esta matriz o el recuento es superior al número de elementos desde el índice al final de la colección de origen.</value>
   </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>Error de sintaxis: uso no válido del operador 'Is'. Sintaxis correcta: &lt;expression&gt; Is [Not] Null.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>No se puede convertir el objeto de tipo '{0}' al objeto de tipo '{1}'.</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>Valor demasiado grande o demasiado pequeño para un tipo '{0}'.</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>El único valor permitido para la propiedad '{0}' es '{1}'.</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>Error al dividir por cero.</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>Los valores permitidos para la propiedad '{0}' son '{1}' o '{2}'.</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>No se encuentra la relación primaria '{0}'.</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>Los valores QuotePrefix y QuoteSuffix especificados no coinciden.</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>El argumento 'hours' está fuera del intervalo. El valor debe estar comprendido entre -14 y +14.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>La longitud del argumento '{0}' supera su límite de '{1}'.</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>El argumento 'minutes' está fuera del intervalo. El valor debe estar comprendido entre -59 y +59.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>Valor no válido para la clave '{0}'.</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>El primer intervalo de tiempo proporcionado supera un total de 14 horas.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>Para poder utilizar la clave '{0}', debe estar presente la clave '{1}'.</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>La propiedad Kind del argumento DateTime proporcionado no coincide con los argumentos 'hours' y 'minutes'.</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>La longitud del valor para la clave '{0}' supera el límite '{1}'.</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>Una DataColumn de tipo '{0}' no admite la expresión.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>Palabra clave no admitida: '{0}'.</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>No se pudieron habilitar las restricciones. Una o varias filas contienen valores que infringen las restricciones NON-NULL, UNIQUE o FOREIGN-KEY.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>Error interno de .NET Framework Data Provider {0}.</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>No se puede modificar la misma colección.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}".</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>El nombre dado '{0}' coincide con al menos dos nombres del objeto de la colección con uso distinto de mayúsculas o minúsculas, pero no coincide con ninguno en el que el uso de mayúsculas y minúsculas sea igual.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}", uso incorrecto de comillas.</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>El nombre especificado '{0}' coincide con al menos dos nombres del objeto de la colección con espacios de nombres diferentes.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}", el límite actual de "{2}" es insuficiente.</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>El desplazamiento y la longitud estaban fuera de los límites para esta matriz o el recuento es superior al número de elementos desde el índice al final de la colección de origen.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>Fallo de SqlBulkCopy.WriteToServer porque SqlBulkCopy.DestinationTableName es un nombre de varias partes no válido.</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>El argumento '{0}' está fuera del intervalo.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>Fallo al procesar los resultados de SQL Server por un nombre de varias partes no válido.</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>El argumento '{0}' no puede ser nulo.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName no es un nombre de varias partes válido</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>El argumento '{0}' contiene un valor null.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName no es un nombre de varias partes válido</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>No se puede encontrar la columna {0}.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>Fallo en SqlCommand.DeriveParameters, el valor de la propiedad SqlCommand.CommandText es un nombre de varias partes no válido.</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>La columna '{0}' ya pertenece a esta DataTable.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>No se admite la conexión a una instancia de SQL Server reflejada mediante la opción de conexión MultiSubnetFailover.</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>La columna '{0}' ya pertenece a otra DataTable.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>El valor de enumeración de {0}, {1}, no es compatible con el método {2}.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>No puede haber más de una columna SimpleContent en DataTable.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>El proveedor de datos SqlClient de .Net Framework no admite el valor de enumeración de {0}, {1}.</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>No se puede agregar una columna SimpleContent a una tabla que contenga columnas de elementos o relaciones anidadas.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: no se ha inicializado la propiedad CommandText</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>La columna '{0}' ya pertenece a DataTable.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: la propiedad Connection no se ha inicializado.</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>No se puede agregar la columna llamada '{0}': esta tabla DataTable ya contiene una tabla anidada con el mismo nombre.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} requiere una Connection abierta y disponible. {1}</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>Esta tabla DataTable ya contiene una columna llamada '{0}' : no se puede utilizar el mismo nombre en una tabla anidada.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>No existe el procedimiento almacenado '{0}'.</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>No se puede eliminar una columna que no pertenece a esta tabla.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>La transacción no está asociada a la conexión actual o se ha completado.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>No se puede eliminar esta columna, porque es parte de la clave principal.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>La transacción asociada con la conexión actual se ha completado, pero no se ha desechado. Debe desecharse antes de utilizar la conexión para ejecutar instrucciones SQL.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>No se puede eliminar la columna, porque es parte de una clave primaria de la relación {0}.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>{0} requiere que el comando tenga una transacción cuando la conexión asignada al mismo está en una transacción local pendiente. No se ha inicializado la propiedad Transaction del comando.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>No se puede eliminar esta columna, porque es parte de una restricción {0} en la tabla {1}.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>Ya hay un DataReader abierto asociado a {0}; debe cerrarlo primero.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>No se puede eliminar esta columna, porque es parte de una expresión: {0} = {1}.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>{0} DeriveParameters sólo admite CommandType.StoredProcedure, no CommandType.{1}.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>No se puede establecer la propiedad AutoIncrement en una columna calculada.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>No se puede establecer la propiedad AutoIncrement en una columna con DefaultValue.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>No se puede establecer DefaultValue en una columna AutoIncrement.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep debe ser un valor que no sea cero.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>ColumnName es necesario cuando es parte de DataTable.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>No se puede cambiar DataType de una columna que contiene datos.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>La columna requiere que DataType sea válida.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>DefaultValue de la columna {0} es de tipo {1} y no se puede convertir a {2}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>DefaultValue de la columna es de tipo {0} y no se puede convertir a {1}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>DefaultValue de la columna {0} es de tipo {1}, pero la columna es de tipo {2}.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>No se puede cambiar la propiedad ReadOnly para la columna de expresión.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>No se puede cambiar la propiedad Unique en la columna de expresión.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>No se puede crear una expresión en una columna que tiene AutoIncrement o Unique.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>No se puede establecer la expresión porque la columna no puede ser ReadOnly.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>No se puede establecer la propiedad Expression en la columna {0}, porque es parte de una restricción.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>No se puede crear una restricción basada en la columna Expression {0}.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>No se puede establecer la propiedad Expression debido a una referencia circular en la expresión.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>La columna '{0}' tiene valores null.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>La columna '{0}' no permite tener valores nulls.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>La columna '{0}' es de solo lectura.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>La Column '{0}' contiene valores que no son únicos.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>La columna '{0}' no pertenece a la tabla {1}.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>La columna debe pertenecer a una tabla.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>No se puede almacenar &lt;{0}&gt; en la columna {1}. El tipo esperado es {2}.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>No puede establecer el valor de Column '{0}' en null. Utilice DBNull en su lugar.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>No se puede establecer la columna '{0}'. El valor infringe el límite de MaxLength de esta columna.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength se aplica únicamente al tipo de datos String. La propiedad MaxLength de Column '{0}' no se puede establecer en un número negativo.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>No se puede establecer la propiedad MaxLength de Column '{0}' en '{1}'. Hay al menos una cadena en la tabla más larga que el nuevo límite.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>No se puede establecer la propiedad MaxLength de Column '{0}'. La columna es SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>No se puede establecer la propiedad DataType de Column '{0}' en {1}. La columna es SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>No se puede establecer la propiedad MappingType de Column '{0}' en SimpleContent. DataType de la columna es {1}.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>La Column '{0}' superó el límite de MaxLength.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>La columna '{0}' no admite DBNull.Value.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>No se puede cambiar la propiedad Namespace de Column '{0}'. La columna es SimpleContent.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>Una vez que tiene datos, no se puede cambiar AutoIncrement en DataColumn con tipo '{0}'.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>La columna '{0}' no pertenece a la tabla subyacente '{1}'.</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>DataColumn con tipo '{0}' es un complexType. No se puede serializar el valor de un tipo complejo como Attribute</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>DateTimeMode solo se puede establecer en DataColumns de tipo DateTime.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>'{0}' es un valor DataSetDateTime no válido.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>No se puede cambiar DateTimeMode de '{0}' a '{1}' una vez que la tabla contiene datos.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>El Type '{0}' no contiene el campo o la propiedad Null static.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>El tipo '{0}' no implementa IRevertibleChangeTracking; por tanto, no se puede continuar con RejectChanges().</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>Solo se puede llamar a SetAdded y SetModified en DataRows con DataRowState no modificado.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>Ordinal '{0}' supera el número máximo.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet no admite System.Nullable&lt;&gt;.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>No se puede cambiar el nombre de una restricción por una cadena vacía cuando está en ConstraintCollection.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>No se pueden forzar las restricciones en la restricción {0}.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>La columna '{0}' está restringida para ser única. Ya está presente el valor '{1}'.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>La restricción '{0}' no pertenece a esta DataTable.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>No se puede encontrar la restricción {0}.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>Esta restricción coincide con la restricción denominada {0}, que ya está en la colección.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>La Constraint denominada '{0}' ya pertenece a esta DataTable.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>Estas columnas no tienen valores únicos actualmente.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>Estas columnas no señalan a esta tabla.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>No se puede habilitar esta restricción ya que todos los valores no tienen los valores primarios correspondientes.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>No se puede agregar esta restricción porque ForeignKey no pertenece a la tabla {0}.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>No se puede eliminar una restricción que no pertenece a esta tabla.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>No se puede eliminar la restricción UNIQUE '{0}'. Elimine primero la restricción FOREIGN KEY '{1}'.</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>No se puede eliminar esta fila porque las restricciones están forzando la relación {0}, y si se elimina esta fila, las filas secundarias se deshabilitarán.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>No se puede realizar este cambio porque las restricciones están forzando la relación {0}, y si se cambia este valor, las filas secundarias se deshabilitarán.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>No se puede borrar la tabla {0} porque ForeignKeyConstraint {1} fuerza las restricciones y hay filas secundarias en {2}.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>ForeignKeyConstraint {0} requiere que los valores clave secundarios ({1}) existan en la tabla primaria.</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>No se puede obtener acceso a la propiedad por la siguiente razón '{0}'.</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>No se puede eliminar esta fila porque tiene filas secundarias, y las restricciones en la relación {0} están forzadas.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>No se puede agregar una restricción PRIMARY KEY porque ya se estableció una clave principal para la tabla.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>No se puede añadir restricción a DataTable '{0}' que es una tabla secundaria en dos relaciones anidadas.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>No se puede crear una clave a partir de columnas que pertenecen a diferentes tablas.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>No puede tener 0 columnas.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>No puede haber más de {0} columnas.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>No se puede crear una clave cuando la misma columna aparece más de una vez: '{0}'</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>No se puede eliminar una restricción UNIQUE porque es la clave principal de la tabla.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>No se puede eliminar una restricción UNIQUE porque es la clave principal de la tabla {0}.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>Las columnas primarias y las columnas secundarias no tienen columnas que coincidan.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey y ChildKey son idénticos.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns y ChildColumns deben tener la misma longitud.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns y ChildColumns no pueden tener una longitud que sea cero.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>La fila no pertenece al mismo DataSet que la relación.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>RelationName es necesario como parte de DataSet.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows requiere una fila cuya Table es {0}, pero la Table de la fila especificada es {1}.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>Esta relación debe conectar dos tablas en este DataSet para agregarse a este DataSet.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRow requiere una fila cuya tabla es {0}, pero la fila especificada de la tabla es {1}.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow requiere una fila secundaria cuya tabla es {0}, pero la fila especificada de la tabla es {1}.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>No puede haber una relación entre tablas de diferentes DataSet.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>No se puede crear una relación entre tablas de diferentes DataSets.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>Ya existe una relación para estas columnas secundarias.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>Esta relación no pertenece a esta colección de relaciones.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Esta relación ya pertenece a otro DataSet.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Esta relación ya pertenece a este DataSet.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>La Relation denominada '{0}' ya pertenece a este DataSet.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>La Relation {0} no pertenece a este DataSet.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>No se puede encontrar la relación {0}.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>No se puede crear una colección en una tabla null.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>Se ha eliminado del DataSet la tabla para la que esta colección muestra relaciones.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>No se puede agregar una relación a la colección de tablas ParentRelation donde esta tabla no es la tabla secundaria.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>No se puede agregar una relación a la colección de tablas ChildRelation donde esta tabla no es la tabla primaria.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>No se puede establecer en false la propiedad 'Nested' para esta relación.</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>La misma tabla '{0}' no puede ser una tabla secundaria en dos relaciones anidadas.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>La tabla ({0}) no puede ser la tabla secundaria de sí misma en relaciones anidadas.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>No se puede agregar una clase DataRelation o Constraint con configuración Locale o CaseSensitive distinta entre las tablas primaria y secundarias.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>No se puede crear DataRelation si las columnas primarias o secundarias no están en DataSet.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>Una tabla anidada '{0}' que hereda su espacio de nombres no puede tener varias tablas primarias en espacios de nombres diferentes.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>Una tabla anidada '{0}' con espacios de nombres vacíos no puede tener varias tablas primarias es espacios de nombres diferentes.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>La fila no pertenece al mismo DataSet que la relación.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>No se puede realizar esta operación en una fila que no está en la tabla.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>La relación y la fila secundaria no pertenecen al mismo DataSet.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>No se puede cambiar un valor propuesto en el evento RowChanging.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>No se puede llamar a EndEdit() dentro de un evento OnRowChanging.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>No se puede llamar a BeginEdit() dentro del evento RowChanging.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>No se puede llamar a CancelEdit() dentro de un evento OnRowChanging. Inicie una exception para cancelar la actualización.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>No se puede llamar a Delete dentro de un evento OnRowDeleting. Inicie una exception para cancelar la función de eliminar.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>La matriz de entrada es más larga que el número de columnas en esta tabla.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>No hay datos actuales a los que se pueda obtener acceso.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>No hay datos originales a los que se pueda obtener acceso.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>No hay datos propuestos a los que se pueda obtener acceso.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>Esta fila ha sido eliminada de la tabla y no contiene ningún dato. BeginEdit() permite la creación de nuevos datos en esta fila.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>No se puede obtener acceso a la información eliminada de una fila.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>La versión debe ser original, actual o propuesta.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>No hay ninguna fila en la posición {0}.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>La posición de inserción de la fila {0} no es válida.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>El valor rowOrder value={0} está duplicado en la tabla denominada '{1}'.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>Faltan valores en la secuencia rowOrder para la tabla '{0}'.</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>El elemento DataRow especificado no está en la colección DataRowCollection actual.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>Esta fila ya pertenece a otra tabla.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>Esta fila ya pertenece a esta tabla.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>No se puede eliminar esta fila porque ya está eliminada.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>Esta fila está vacía.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>No se puede eliminar una fila que ya está eliminada.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>Una fila secundaria tiene varios elementos primarios.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>patrón de bits de estado de fila no reconocido.</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>No se puede cambiar el nombre del DataSet a una cadena vacía.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>El nombre '{0}' no es válido. DataSet no puede tener el mismo nombre que DataTable.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>El espacio de nombres del esquema no es válido. Utilice éste en su lugar: {0}.</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>No se puede cambiar la propiedad CaseSensitive ni Locale. Este cambio provocaría que al menos una clase DataRelation o Constraint tengan una configuración Locale o CaseSensitive distinta entre sus tablas relacionadas.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>La propiedad SchemaSerializationMode solo se puede establecer si la reemplaza un DataSet derivado.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>Las columnas PrimaryKey no pertenecen a esta tabla.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>No se puede agregar una relación anidada ni una columna de elementos a una tabla que contenga una columna SimpleContent.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>TableName es necesario cuando forma parte de DataSet.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable ya tiene una columna de contenido simple.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>La tabla no tiene una clave principal.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} no es una entrada de cadena de Sort válida.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>No se puede serializar DataTable. Una de las tablas DataTable utilizadas en una o varias expresiones DataColumn no es descendiente de la DataTable actual.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>Esta DataTable sólo puede ser remota dentro de DataSet. Una o varias columnas Expression hacen referencia a otras tablas DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>DataSet y DataTable no pueden tener valores de propiedad de formato remoto diferentes.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>No se puede serializar DataTable. No se ha establecido el nombre DataTable.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>DataTable denominada '{0}' ya pertenece a este DataSet.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>Una tabla DataTable denominada '{0}' con el mismo Namespace '{1}' ya pertenece a este DataSet.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>La tabla ({0}) no puede ser la tabla secundaria de sí misma en una relación anidada: el nombre de DataSet está en conflicto con el nombre de la tabla.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>El nombre '{0}' no es válido. DataTable no puede tener el mismo nombre que DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable ya pertenece a otro DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable ya pertenece a este DataSet.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>La tabla {0} no pertenece a esta DataSet.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>No se puede encontrar la tabla {0}.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>No se puede eliminar una tabla que contenga relaciones. Elimine primero las relaciones.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>No se puede eliminar la tabla {0}, porque hace referencia a ForeignKeyConstraint {1}. Elimine primero la restricción.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>DataTable '{0}' no coincide con ninguna tabla DataTable del origen.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>Falta la definición del DataSet de destino {0}.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>Falta el DataSet de destino {0} {1}.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>Las propiedades de &lt;target&gt;.{0} y &lt;source&gt;.{0} están en conflicto: la propiedad DataType no coincide.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey y &lt;source&gt;.PrimaryKey tienen un valor de Length diferente.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>Las columnas en PrimaryKey no coinciden: &lt;target&gt;.{0} frente a &lt;source&gt;.{1}.</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>No se puede combinar la relación {0} porque las claves tienen columnas que no coinciden.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>En la tabla de destino {0} falta la definición para la columna {1}.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>La columna PrimaryKey {0} no existe en la tabla de origen.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>Debe establecer el parámetro RowStates con una combinación válida de valores de la enumeración DataViewRowState.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Encuentra una fila basándose en el criterio de ordenación, pero no ha especificado ningún criterio de ordenación.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>Se esperaban los valores {0} para la clave indizada, pero se han recibido valores {1}.</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>Uso no válido de la función de agregado {0}() y el tipo: {1}.</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>Tipo de almacenamiento no válido: {0}.</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>La persistencia DataSet Xml no admite el valor '{0}' como valor Char; utilice el almacenamiento de Byte en su lugar.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>El tipo de valor no coincide con el tipo de columna</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>El tipo '{0}' no implementa la interfaz IComparable. No se puede realizar la comparación.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>No se puede establecer {0}.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>No se puede cambiar DataSet en DataViewManager, ya que es la vista predeterminada de DataSet.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>No se pueden mostrar RowStateFilter, ModifiedOriginals y ModifiedCurrents a la vez.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>No se puede cambiar la propiedad Table en DefaultView o DataView que proviene de DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>No se puede cambiar la propiedad DataSet una vez establecida.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>Es necesario establecer DataSet antes de utilizar DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>No se puede cambiar la propiedad Table una vez establecida.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>Es necesario establecer DataTable antes de utilizar DataView.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>No se puede enlazar a DataTable sin un nombre.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>No se puede establecer un objeto en esta lista.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>No se puede llamar a AddNew en DataView cuando AllowNew es igual a false.</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView no está abierto.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>Esta relación no es primaria de la tabla a la que señala DataView.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>No se puede eliminar en DataSource cuando AllowDelete es igual a false.</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>No se puede editar en DataSource cuando AllowEdit es igual a false.</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>El índice {0} es negativo o superior al recuento de filas.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>No se pueden agregar objetos externos a esta lista.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>No se puede borrar esta lista.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>No se pueden insertar objetos externos en esta lista.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>No se pueden eliminar objetos que no estén en la lista.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} no es DataColumn ni DataRelation para la tabla {1}.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>El valor de Min ({0}) debe ser inferior o igual al valor de max ({1}) en un objeto Range.</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>Hay un intervalo null.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>El campo de MinimumCapacity no puede ser negativo.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>No se puede generar el identificador para el nombre '{0}'.</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>Hay más de una tabla con el mismo nombre '{0}' (aunque el espacio de nombres sea diferente).</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>La columna '{0}': Type '{1}' no puede ser null.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>La columna '{0}': tipo '{1}' no tiene un constructor sin parámetros.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>La columna '{0}': tipo '{1}' no tiene un constructor con un argumento de cadena.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>No se puede convertir el objeto de tipo '{0}' al objeto de tipo '{1}'.</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Exception de Data.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Exception de Constraint.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>No se tiene acceso a filas eliminadas.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>No se permiten nombres duplicados.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>Operación no compatible en el evento RowChanging.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>Restricción no válida.</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>Falta la clave principal.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>No se permite el valor Null.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>La columna está marcada como de solo lectura.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>No se encuentra la fila en la tabla.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>No se puede encontrar la versión.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>Los datos ReadOnly se han modificado.</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader no es válido para la tabla DataTable '{0}' actual.</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>Se ha cambiado el esquema de la DataTable actual '{0}' en DataTableReader; DataTableReader no es válido.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>No se puede crear DataTableReader. No hay DataTable en DataSet.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>No se puede crear DataTableReader. El argumento está vacío.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>No se puede crear DataTableReader. Los argumentos contienen el valor null.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>El estado de la DataRow actual es Deleted o Detached.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>La tabla DataTable '{0}' actual está vacía. No hay DataRow en DataTable.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>El índice interno de DataTable está dañado: '{0}'.</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>Se modificó la colección; puede que no se ejecute la operación de enumeración.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>El tipo simple '{0}' ya se ha declarado con diferente '{1}'.</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>Intercalación no válida.</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>No se puede cambiar el nombre de la tabla una vez que DataSet asociado está asignado a un documento XML cargado.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>No se puede cambiar el espacio de nombres de la tabla una vez que el DataSet asociado está asignado a un documento XML cargado.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>No se puede cambiar el nombre de la columna una vez que el DataSet asociado está asignado a un documento XML cargado.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>No se puede cambiar el espacio de nombres de la columna una vez que la DataSet asociada está asignada a un documento XML cargado.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>No se puede cambiar la propiedad ColumnMapping una vez que el DataSet asociado se asigne a un documento XML cargado.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>No se puede agregar o eliminar columnas de la tabla una vez que el DataSet está asignado a un documento XML cargado.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>No se pueden agregar o eliminar tablas de DataSet una vez que está asignada a un documento XML cargado.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>No se pueden agregar, eliminar o cambiar relaciones anidadas de DataSet una vez que está asignada a un documento XML cargado.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>El parámetro DataSet no es válido. No puede ser null.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>No se puede cambiar el nombre de DataSet una vez que está asignada a un documento XML cargado.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>No se puede clonar este tipo de nodo: {0}.</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>No se puede cargar XmlDataDocument si ya contiene datos. Utilice un nuevo XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>El DataSet se puede asociar a un XmlDataDocument como máximo. No se puede asociar el DataSet al XmlDataDocument actual porque ya está asociado a otro XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>Establezca DataSet.EnforceConstraints == false antes de intentar editar XmlDataDocument utilizando operaciones de XML.</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>DataDocument no admite GetElementById().</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>No se pueden crear referencias de entidad en DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>XmlDataDocument no admite la función Clear en DateSet y DataTable.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>No se puede eliminar la columna porque está incorporada a este dataSet.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>No se puede quitar la relación porque está integrada en este dataSet.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>Tiene lugar cuando la propiedad de este control cambia.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Tiene lugar cuando cambia la pertenencia a esta colección.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>No se puede obtener el valor porque es DBNull.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>La propiedad '{0}' necesita un sistema operativo Microsoft WindowsNT o WindowsNT.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>No se encuentra el proveedor de datos .NET Framework solicitado. Puede que no esté instalado.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>La implementación del proveedor de datos .NET Framework solicitado no tiene un campo de instancia de un tipo derivado de System.Data.Common.DbProviderFactory.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>No se encuentra o no se puede cargar el proveedor de datos .NET Framework registrado.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>Se necesita el nombre calificado con el ensamblado del proveedor de datos .NET Framework que falta.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>Sólo se permiten elementos.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>No se permiten nodos secundarios.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>Atributo no reconocido '{0}'.</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>Elemento no reconocido.</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>La sección '{0}' sólo puede aparecer una vez en cada archivo de configuración.</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>No se encuentra el atributo obligatorio '{0}'.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>El atributo necesario '{0}' no puede estar vacío.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>Se esperaba una matriz no vacía para el parámetro '{0}'.</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>El único valor permitido para la propiedad '{0}' es '{1}'.</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>Los valores permitidos para la propiedad '{0}' son '{1}' o '{2}'.</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>Los valores QuotePrefix y QuoteSuffix especificados no coinciden.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>La longitud del argumento '{0}' supera su límite de '{1}'.</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>Se esperaba un argumento del tipo {1}, pero se ha recibido del tipo {0}.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>Valor no válido para la clave '{0}'.</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>Para poder utilizar la clave '{0}', debe estar presente la clave '{1}'.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>La longitud del valor para la clave '{0}' supera el límite '{1}'.</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>Palabra clave no admitida: '{0}'.</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>No se puede cargar el archivo UDL.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>Archivo UDL no válido.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>Error interno de .NET Framework Data Provider {0}.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>Las propiedades QuotePrefix y QuoteSuffix no se pueden cambiar una vez que genera un comando Insert, Update o Delete.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>Necesita inicializar la propiedad DataAdapter.SelectCommand.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>Necesita inicializar la propiedad DataAdapter.SelectCommand.Connection;</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}".</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}", uso incorrecto de comillas.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}", el límite actual de "{2}" es insuficiente.</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>Fallo de SqlBulkCopy.WriteToServer porque SqlBulkCopy.DestinationTableName es un nombre de varias partes no válido.</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>Fallo al procesar los resultados de SQL Server por un nombre de varias partes no válido.</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName no es un nombre de varias partes válido</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName no es un nombre de varias partes válido</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>Fallo en SqlCommand.DeriveParameters, el valor de la propiedad SqlCommand.CommandText es un nombre de varias partes no válido.</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>Fallo en OdbcCommandBuilder.DeriveParameters porque el valor de propiedad OdbcCommand.CommandText es un nombre de varias partes no válido.</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>Fallo en OleDbCommandBuilder.DeriveParameters porque el valor de propiedad OleDbCommandBuilder.CommandText es un nombre de varias partes no válido</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>No se admite la conexión a una instancia de SQL Server reflejada mediante la opción de conexión MultiSubnetFailover.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>Error en la asignación de columna SourceColumn '{0}' porque DataColumn '{1}' es una columna calculada.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>Falta de coincidencia entre los tipos que no se pueden convertir SourceColumn '{0}' de {1} y DataColumn '{2}' de {3}.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>Falta DataColumn '{0}' en DataTable '{1}' para SourceColumn '{2}'.</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>SourceColumn no puede ser una cadena vacía.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>Falta la asignación de SourceColumn '{0}'.</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>El valor de enumeración de {0}, {1}, no es compatible con el método {2}.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>El proveedor de datos Odbc de .NET Framework no admite el valor de enumeración de {0}, {1}.</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>El proveedor de datos .NET Framework para OleDb no admite el valor de enumeración de {0}, {1}.</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>El proveedor de datos SqlClient de .Net Framework no admite el valor de enumeración de {0}, {1}.</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>No se puede recuperar ComputerNameDnsFullyQualified, {0}.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>Falta '{0}' DataTable para '{1}' SourceTable.</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>Es necesario que SourceTable no sea una cadena vacía</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>Falta la asignación de SourceTable: '{0}'</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: no se ha inicializado la propiedad CommandText</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: la propiedad Connection no se ha inicializado.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} requiere una Connection abierta y disponible. {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: la propiedad SelectCommand.Connection no se ha inicializado.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: la propiedad SelectCommand.Connection no se ha inicializado.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: la propiedad SelectCommand.Connection no se ha inicializado.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>La actualización requiere que InsertCommand tenga un objeto de conexión. La propiedad Connection de InsertCommand no se ha inicializado.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>La actualización requiere que UpdateCommand tenga un objeto de conexión. La propiedad Connection de UpdateCommand no se ha inicializado.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>La actualización requiere que DeleteCommand tenga un objeto de conexión. La propiedad Connection de DeleteCommand no se ha inicializado.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>La actualización requiere un objeto de conexión. La propiedad Connection no se ha inicializado.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>La actualización requiere que el clon del comando tenga un objeto de conexión. La propiedad Connection del clon del comando no se ha inicializado.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>La actualización requiere una conexión.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Update requiere que {0}Command tenga un objeto de conexión abierta. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Update requiere que {0}Command tenga un objeto de conexión abierta. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Update requiere que {0}Command tenga un objeto de conexión abierta. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Update requiere un comando de actualización para tener un objeto de conexión abierta. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>No existe el procedimiento almacenado '{0}'.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>La transacción asignada a este comando debe ser la transacción local pendiente más anidada.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>La transacción no está asociada a la conexión actual o se ha completado.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>La transacción asociada con la conexión actual se ha completado, pero no se ha desechado. Debe desecharse antes de utilizar la conexión para ejecutar instrucciones SQL.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>{0} requiere que el comando tenga una transacción cuando la conexión asignada al mismo está en una transacción local pendiente. No se ha inicializado la propiedad Transaction del comando.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>Hay abierto un SqlResultSet asociado a este comando que debe cerrarse antes.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>Ya hay un DataReader abierto asociado a {0}; debe cerrarlo primero.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>{0} DeriveParameters sólo admite CommandType.StoredProcedure, no CommandType.{1}.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>No se puede llamar al método '{0}' más de una vez para la misma ejecución.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>Resultado asíncrono incorrecto.</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>No se ha inicializado la propiedad SelectCommand antes de llamar a '{0}'.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>No se esperaba aquí el StatementType {0}.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: se esperaba una cadena que contenga datos para el nombre de SourceTable.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>El valor de MaxRecords {0} no es válido. El valor debe ser &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>El valor de StartRecord {0} no es válido. El valor debe ser &gt;= 0.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: se esperaba una cadena con datos para el nombre de SourceTable.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>Las columnas de capítulos jerárquicos se deben asignar a un AutoIncrement DataColumn.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) devolvió null.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>Especifique sólo un elemento en la matriz dataTables al utilizar valores distintos de cero para startRecords o maxRecords.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Update no puede encontrar TableMapping['{0}'] o DataTable '{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update: se esperaba un nombre de SourceTable que contenga datos.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>Falta TableMapping cuando TableMapping.DataSetTable='{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Update requiere que el clon del comando sea válido.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>La generación SQL automática durante la operación Update requiere que SelectCommand sea válido.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Update requiere que InsertCommand sea válido cuando se pasa la colección DataRow con nuevas filas.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>Update requiere que UpdateCommand sea válido cuando se pasa la colección DataRow con filas modificadas.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Update requiere que DeleteCommand sea válido cuando se pasa la colección DataRow con filas eliminadas.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}] pertenece a un DataTable diferente a DataRow[0].</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: errores; no hay información adicional disponible.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: errores; no hay información adicional disponible.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>Durante el procesamiento por lotes, se ha detectado que el valor de propiedad de UpdatedRowSource de UpdateRowSource.FirstReturnedRecord o UpdateRowSource.Both del comando no es válido.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>Infracción de simultaneidad: UpdateCommand afectó a {0} de los {1} registros esperados.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>Infracción de simultaneidad: DeleteCommand afectó a {0} de los {1} registros esperados.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>Infracción de simultaneidad: el comando por lotes afectó a {0} de los {1} registros esperados.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>No se puede llamar al método '{0}' más de una vez para la misma ejecución.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>Valor de CommandTimeout {0} no válido. El valor debe ser &gt;= 0.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: la propiedad Size tiene un tamaño no válido de 0.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>El método {0}.Prepare requiere que todos los parámetros tengan un tipo establecido de forma explícita.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>El método {0}.Prepare requiere que todos los parámetros de longitud variable tengan un valor distinto de cero explícitamente establecido para Size.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>El método {0}.Prepare requiere que los parámetros de tipo '{1}' tengan valores de Precision y Scale explícitamente establecidos.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>Llamada de método final no coincide para asyncResult. Se esperaba una llamada a {0} pero se llamó a {1} en su lugar.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>Operación no válida; se ha terminado la conexión.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>Se ha deshabilitado la conexión.</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>No se puede dar de alta en la transacción porque hay una transacción local en curso durante la conexión. Finalice la transacción local e inténtelo de nuevo.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>La conexión tiene actualmente dada de alta una transacción. Termine dicha transacción y vuelva a intentarlo.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>La base de datos no puede ser nula, la cadena no puede estar vacía o no puede constar solamente de espacios en blanco.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>El argumento es demasiado largo.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Valor de 'Connect Timeout' no válido, debe ser un número entero &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>Desplazamiento del búfer de origen (tamaño de {0}) no válido: {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>Desplazamiento del búfer de destino (tamaño de {0}) no válido: {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>El valor numérico es demasiado grande para ajustarlo a un valor decimal de 96 bits.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>Intento de {0} no válido cuando está cerrada la secuencia.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>El valor SeekOrigin especificado no es válido.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>La generación SQL dinámica no es compatible con varias tablas de base.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>La generación SQL dinámica no es compatible con SelectCommand, que no devuelve ninguna información de tabla base.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>La generación SQL dinámica para DeleteCommand no es compatible con SelectCommand, que no devuelve ninguna información sobre columnas clave.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>La generación SQL dinámica para UpdateCommand no es compatible con SelectCommand, que no devuelve ninguna información sobre columnas clave.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>La generación SQL dinámica para DeleteCommand no es compatible con SelectCommand que no contiene columna de versión de fila.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>La generación Dynamic SQL para UpdateCommand no es compatible con SelectCommand que no contiene columna de versión de fila.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>La generación SQL dinámica no es compatible con nombres de tablas '{0}' que contengan el carácter '{1}' de QuotePrefix o QuoteSuffix.</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>Intento no válido de leer el índice de columna '{0}'. Con CommandBehavior.SequentialAccess, solo se puede leer un índice de columna igual a '{1}' o mayor.</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>No se puede dar formato al tipo de datos '{0}' como literal porque tiene dígitos de fecha y hora no válidos.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>No se puede dar formato al valor como literal del tipo solicitado.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>No se puede dar formato al tipo de datos '{0}' como literal porque tiene una escala máxima no válida.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>El valor literal proporcionado no es un literal válido para el tipo de datos '{0}'.</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>'{0}':La longitud del valor literal debe ser par.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>'{0}':El valor literal debe ser una cadena con dígitos hexadecimales</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>{0} requiere una conexión abierta cuando no se ha establecido el prefijo de cita.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>No se pueden determinar los valores literales boolean correctos. No se pueden crear los literales Boolean.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>Los literales del tipo de datos nativo asociado al tipo de datos '{0}' no son compatibles.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>El tipo de datos del parámetro {0} no es válido.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>No hay ninguna asignación de tipo de objeto {0} a un tipo nativo de un proveedor administrado conocido.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>No se puede tratar un TypeCode {0} desconocido devuelto por Type {1}.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>No hay ninguna asignación de DbType {0} a ningún {1} conocido.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>La versión de SQL Server utilizada no es compatible con el tipo de datos '{0}'.</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>El valor de parámetro '{0}' está fuera del intervalo.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>El nombre de parámetro especificado '{0}' no es válido.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>No se admiten varios parámetros de valores devueltos.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>Valor del parámetro Size '{0}' no válido. El valor debe ser mayor o igual a 0.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>Valor no válido para el argumento '{0}'. El valor debe ser igual o mayor que 0.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>Valor no válido para este metadato.</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>Los metadatos deben ser SqlDbType.Row</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>Error al convertir el valor del parámetro de {0} a {1}.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} no admite transacciones paralelas.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>{0} se completó; ya no se puede utilizar.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>No se puede llamar a '{0}' cuando el registro es de solo lectura.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>No se puede llamar a '{0}' cuando DbDataRecord es de solo lectura.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>La conversión implícita del tipo de objeto '{0}' a tipo de dato '{1}' no es compatible.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>El desplazamiento del búfer '{1}' más los bytes disponibles '{0}' es mayor que la longitud del búfer introducido.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>La longitud de los datos '{0}' es menor que 0.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>La longitud '{0}' especificada está fuera del intervalo.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>Intento {2} no válido de dataIndex '{0}'. Con CommandBehavior.SequentialAccess, sólo puede leer de '{1}' dataIndex o mayores.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>El desplazamiento debe hacer referencia a una ubicación dentro del valor.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"El proveedor de ODBC administrado requiere que se especifique la restricción TABLE_NAME y que no sea null para la colección de índices GetSchema.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>Valor de argumento no válido para el método '{0}'.</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>El proveedor ODBC no devolvió resultados de SQLGETTYPEINFO.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>No se esperaba un argumento de DataTable null</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>No se esperaba un argumento de DataSet null.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>La cadena de conexión supera la longitud máxima permitida de {0}.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} - no se puede asignar el tipo.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>Tipo SQL desconocido - {0}.</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>Tipo URT desconocido - {0}.</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>Argumento negativo no válido</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>No se puede establecer la propiedad en una conexión abierta.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>Asignación no válida de SQL_TRANSACTION '{0}' a un valor de enumeración System.Data.IsolationLevel.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0}, no se puede habilitar la agrupación de conexiones...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0}, no se puede asignar un identificador de entorno.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} - no se puede obtener un identificador de descriptor.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>No en una transacción</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>Valor de enumeración OdbcType no válido={0}.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>Utilice IsDBNull cuando se espera DBNull.Value.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0}, información de error no disponible</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>La conexión está cerrada.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>Una conexión interna no tiene un propietario.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>El proveedor de datos Odbc de .NET Framework requiere tener instalada la versión 2.6 o posterior de Microsoft Data Access Components(MDAC). Actualmente tiene instalada la versión {0}.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>El proveedor de datos OleDb de .NET Framework requiere tener instalada la versión 2.6 o posterior de Microsoft Data Access Components(MDAC).  Actualmente tiene instalada la versión {0}.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>El proveedor '{1}' no admite la interfaz '{0}'.  GetOleDbSchemaTable no está disponible con el proveedor actual.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>Fallo de '{0}' con mensaje de error no disponible, código de resultado: {1}.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>Mensaje de error no disponible, código de resultado: {0}.</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>Los proveedores de datos .NET Framework requieren la instalación de Microsoft Data Access Components (MDAC). Instale la version 2.6 o posterior de Microsoft Data Access Components (MDAC).</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>El proveedor de datos .NET Framework para OLEDB (Microsoft.Data.OleDb) no admite el proveedor OLE DB de Microsoft para controladores ODBC (MSDASQL). Use el proveedor de datos .NET Framework para ODBC (System.Data.Odbc).</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>El proveedor de datos .NET Framework para OLEDB no permitirá que el proveedor de OLE DB pregunte al usuario en un entorno no interactivo.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>El proveedor '{0}' no está registrado en el equipo local.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>El proveedor '{0}' no admite la interfaz ICommandText. Utilice CommandType.TableDirect en su lugar.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>El proveedor '{0}' no admite la interfaz ITransactionLocal. Las transacciones locales no están disponibles con el proveedor actual.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>El formato de la cadena de inicialización no cumple con las especificaciones OLE DB.  Empieza alrededor del char [{0}] en la cadena de conexión.</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>El procesamiento asíncrono no es una característica admitida del proveedor de datos .NET Framework para OLE DB (Microsoft.Data.OleDb).</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>No se ha especificado un proveedor OLE DB en ConnectionString.  Un ejemplo sería, 'Provider=SQLOLEDB;'.</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>El proveedor OLE DB especificado en ConnectionString es demasiado largo.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>No se esperaban restricciones para DbInfoKeywords OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>No se esperaban restricciones para DbInfoLiterals OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>No se esperaban restricciones para el esquema guid OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>El proveedor '{1}' no admite el esquema OleDbSchemaGuid {0}.</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>La configuración '{0}' posee un número incorrecto de valores.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>No se puede cargar el archivo XML especificado en la configuración '{0}'.</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>Parámetro de comando [{0}] '{1}' no válido.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>No se puede convertir el valor de los datos del parámetro de comando [{0}] '{1}' por otras razones diferentes a la falta de correspondencia de signo o el desbordamiento de los datos.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>Error de conversión del parámetro de comando [{0}] '{1}' porque el valor de los datos es de tipo signed y el tipo utilizado por el proveedor es de tipo unsigned.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>Error de conversión del parámetro de comando [{0}] '{1}' porque el valor de datos ha desbordado el tipo utilizado por el proveedor.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>El proveedor encontró un error al enviar el valor del parámetro de comando [{0}] '{1}' y ha detenido el procesamiento.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>El parámetro [{0}] '{1}' no tiene un valor predeterminado.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>Error del parámetro[{0}]: {1}.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Error interno de Microsoft.Data.OleDb.OleDbDataAdapter: descriptor de acceso de parámetro incorrecto: {0} {1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter[{0}]: la propiedad OleDbType no está inicializada: OleDbType.{1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>El proveedor '{0}' no admite con la interfaz ICommandWithParameters. Los parámetros de comando no son compatibles con el proveedor actual.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>El proveedor '{0}' no admite la recuperación de información de parámetros de procedimientos.</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>No se puede determinar el separador decimal del servidor. No se pueden crear literales numéricos no enteros.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>El objeto no es ADODB.RecordSet ni ADODB.Record.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>No se puede recuperar la interfaz '{0}' del objeto ADODB.RecordSet.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: la propiedad Size tiene un tamaño no válido de 0.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>No se puede recuperar la interfaz IRow del objeto ADODB.Record.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>El método {0}.Prepare requiere que todos los parámetros tengan un tipo establecido de forma explícita.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>Este tipo no es compatible con la interfaz OLE DB ISourcesRowset</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>El método {0}.Prepare requiere que todos los parámetros de longitud variable tengan un valor distinto de cero explícitamente establecido para Size.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>No se puede crear la colección de esquemas ReservedWords porque el proveedor no es compatible con IDBInfo.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>El método {0}.Prepare requiere que los parámetros de tipo '{1}' tengan valores de Precision y Scale explícitamente establecidos.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>No se estableció el valor de la propiedad porque el proveedor no admite la propiedad '{0}' o el consumidor ha intentado obtener o establecer valores de propiedades que no pertenecen al grupo de propiedades de inicialización y el objeto de origen de datos no se ha inicializado.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>Llamada de método final no coincide para asyncResult. Se esperaba una llamada a {0} pero se llamó a {1} en su lugar.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>No se pudo inicializar la propiedad '{0}' debido a uno de los siguientes motivos:
-	El tipo de dato del valor no coincidía con el tipo de dato de la propiedad o no era null. Por ejemplo, la propiedad era DBPROP_MEMORYUSAGE, que tiene un tipo de dato Int32, y el tipo de dato era Int64.
-	El valor no era válido. Por ejemplo, la propiedad era DBPROP_MEMORYUSAGE y el valor era negativo.
-	El valor era válido para la propiedad y el proveedor es compatible con la misma como propiedad que se puede establecer, pero el proveedor no admite el valor especificado. Esto incluye el caso en el que se ha agregado el valor a la propiedad en OLE DB una vez escrito el proveedor.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>Operación no válida; se ha terminado la conexión.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>El valor de Options no es válido.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>No se puede dar de alta en la transacción porque hay una transacción local en curso durante la conexión. Finalice la transacción local e inténtelo de nuevo.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>El elemento ColumnID no es válido.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>La conexión tiene actualmente dada de alta una transacción. Termine dicha transacción y vuelva a intentarlo.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>Se ha especificado la aplicación de una propiedad '{0}' en todas las columnas, pero no se ha podido aplicar a una o varias de ellas.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>La base de datos no puede ser nula, la cadena no puede estar vacía o no puede constar solamente de espacios en blanco.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>La propiedad '{0}' es de solo lectura o el consumidor ha intentado establecer valores de propiedades en el grupo de propiedades de inicialización una vez inicializado el objeto de origen de datos. Los consumidores pueden establecer el valor de una propiedad de solo lectura en su valor actual. Este estado también se devuelve si no se puede establecer una propiedad de columna configurable para la columna en cuestión.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>Desplazamiento del búfer de origen (tamaño de {0}) no válido: {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>No se ha podido establecer el valor especificado para la propiedad '{0}' opcional.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>Desplazamiento del búfer de destino (tamaño de {0}) no válido: {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>No se ha establecido el valor de propiedad '{0}' porque entraría en conflicto con una propiedad existente.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>Intento de {0} no válido cuando está cerrada la secuencia.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>Reservado</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>El valor SeekOrigin especificado no es válido.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>El proveedor ha devuelto un valor DBPROPSTATUS_ desconocido '{0}'.</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>Intento no válido de leer el índice de columna '{0}'. Con CommandBehavior.SequentialAccess, solo se puede leer un índice de columna igual a '{1}' o mayor.</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>Se ha aplazado la validación del descriptor de acceso mientras el método devuelve datos. No se puede enlazar esta columna o parámetro.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>El tipo de datos del parámetro {0} no es válido.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>Error interno de OleDbDataAdapter: descriptor de acceso del conjunto de filas no válido: Ordinal={0} Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>No hay ninguna asignación de tipo de objeto {0} a un tipo nativo de un proveedor administrado conocido.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>No se puede convertir el valor de los datos por otras razones que no sean la falta de correspondencia de signo ni el desbordamiento de los datos. Por ejemplo, los datos están dañados en el almacén de datos aunque la fila se puede recuperar.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>No se puede tratar un TypeCode {0} desconocido devuelto por Type {1}.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>El proveedor no puede asignar memoria para devolver los datos {0}.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>No hay ninguna asignación de DbType {0} a ningún {1} conocido.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>Error de conversión, debido a que el valor de los datos {0} desbordó el tipo especificado para la parte de valor {0} en el búfer del consumidor.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>La versión de SQL Server utilizada no es compatible con el tipo de datos '{0}'.</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>Error interno de OleDbDataAdapter: tipo de datos de OLE DB [get] desconocido: 0x{0} ({1}).</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>El valor de parámetro '{0}' está fuera del intervalo.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>Error de conversión, debido a que el valor de los datos {0} se firmaron y el tipo especificado para la parte de valor {0} en el búfer del consumidor estaba sin firmar.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>El nombre de parámetro especificado '{0}' no es válido.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>Error interno de OleDbDataAdapter: [set] Tipo de datos OLE DB desconocido: 0x{0} ({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>Valor del parámetro Size '{0}' no válido. El valor debe ser mayor o igual a 0.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>El proveedor no puede determinar el valor {0}. Por ejemplo, la fila se acaba de crear, el valor predeterminado para la columna {0} no está disponible y el consumidor todavía no ha establecido un nuevo valor {0}.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>Valor no válido para el argumento '{0}'. El valor debe ser igual o mayor que 0.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>El proveedor OLE DB devolvió un valor de estado inesperado de {0}.</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>Valor no válido para este metadato.</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>OleDbDataReader.Read se debe utilizar desde el mismo subproceso en el que se creó si ApartmentState del subproceso no es ApartmentState.MTA.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>Error al convertir el valor del parámetro de {0} a {1}.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>Error no especificado: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} no admite transacciones paralelas.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>Error de IErrorInfo.GetDescription con {0}.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>{0} se completó; ya no se puede utilizar.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>Error de IErrorInfo.GetSource con {0}.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>La longitud '{0}' especificada está fuera del intervalo.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>El proveedor de datos .NET Framework para OLE DB (Microsoft.Data.OleDb). no admite los datos de DBTYPE_VECTOR.</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>Intento {2} no válido de dataIndex '{0}'. Con CommandBehavior.SequentialAccess, sólo puede leer de '{1}' dataIndex o mayores.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>Valor mínimo o máximo del tamaño de grupo no válido, el tamaño mínimo del grupo no puede ser mayor que el tamaño máximo del grupo.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>La palabra clave '{0}' está desusada. Use '{1}'.</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>No se puede obtener desde el servidor la dirección del coordinador de transacciones distribuidas. ¿DTC está habilitado en el servidor?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>La longitud del valor para el parámetro de conexión &lt;{0}&gt; supera el máximo permitido de 65535 caracteres.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>'Packet Size' no válido. El valor debe ser un entero &gt;= 512 y &lt;= 32768.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>Transacción o nombre no válido para un punto en el que se va a guardar la transacción.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>El valor de enumeración de {0}, {1}, no es compatible con SQL Server 7.0 o SQL Server 2000.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>No se admite utilizar User Instance y Failover. Elija uno de los dos en la cadena de conexión.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>No se puede establecer la propiedad Credential si se ha especificado "Authentication=Active Directory Integrated" en la cadena de conexión.</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>Se especificaron parámetros de autenticación incorrectos con la autenticación de certificado.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>La instancia de SQL Server con la que intenta conectar requiere cifrado, pero este equipo no lo admite.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>La instancia de SQL Server con la que intenta conectar no admite cifrado.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>La instancia de SQL Server con la que intenta conectar no admite CTAIP.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>Versión no compatible de SQL Server. El proveedor de datos SqlClient de .NET Framework solo se puede utilizar con SQL Server versión 7.0 o posterior.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>No se puede cambiar {0} mientras la operación asíncrona esté en proceso.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>Este comando requiere una conexión asincrónica. Establezca "Asynchronous Processing=true" en la cadena de conexión.</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>Se agotó el tiempo de espera del intento de conexión.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>Valor de tiempo de espera caducado. Por ello, se ha interrumpido la conexión.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>Error de instancia.</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>Código de error 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword requiere SQL Server 9.0 o posterior.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>Las instancias de usuario no locales no admiten la redirección SSE Instance.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>No se admite la autenticación "{0}".</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>No se admite el método de autenticación SQL "{0}".</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>No se pudo crear una instancia de un proveedor de autenticación con el tipo "{1}" para "{0}".</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>No se pudo crear una instancia de SqlAuthenticationInitializer con el tipo "{0}".</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>El proveedor "{0}" generó una excepción al inicializar.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>El proveedor "{0}" no admite la autenticación "{1}".</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>No se encuentra un proveedor de autenticación para ''{0}''. Instale el paquete NuGet "Microsoft.Data.SqlClient.Extensions.Azure" (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) para usar métodos de autenticación Active Directory (Id. de Entra).</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>No se pudo leer la sección de configuración para los proveedores de autenticación.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>El parámetro "{0}" no puede ser nulo ni estar vacío.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>La operación asincrónica ya se ha completado.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>La ejecución del comando no puede continuar debido a que ya está en curso una operación asincrónica pendiente.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>Comando no válido enviado a ExecuteXmlReader. El comando debe devolver un resultado Xml.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>Las notificaciones requieren tener instalado SQL Server 9.0 o posterior.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>Formato de nombre de parte 3 no válido para UdtTypeName.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>No se puede inicializar el paquete SSPI.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Valor de Timeout caducado. El período de tiempo de espera caducó antes de completar la operación o el servidor no responde.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>Valor de tiempo de espera caducado. El periodo de tiempo de espera se agotó al comienzo de la fase previa al inicio de sesión. El motivo podría ser que el tiempo proporcionado para el tiempo de espera de la conexión no fuera suficiente.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>Se solicitó una instancia de usuario en la cadena de conexión pero el servidor no admite esta opción.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>Error de validación de aplicación en el certificado de servidor.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>La longitud de datos {0} especificada supera la longitud máxima permitida de {1}.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>Intento de lectura no válido al no haber datos presentes.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>La longitud de los datos '{0}' es menor que 0.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>No se puede llamar a '{0}' cuando SqlDataRecord es de solo lectura.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>La colección asignada está en uso o no se puede tener acceso a la misma en este momento;</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>No se admite la conexión a la conexión de contexto mediante Microsoft.Data.SqlClient.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>No se admiten las TransactionScopes anidadas.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>Evento de servidor inesperado: {0}.</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>La longitud de '{0}' debe coincidir con la longitud de '{1}'.</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>SqlDbType '{0}' no es válido para {1}.  Sólo admite {2}.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>Demasiados valores.</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>La Stream no admite escritura.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>NULL</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>Mensaje</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>Desbordamiento aritmético.</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>Error al dividir por cero.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>Los datos tienen valor Null. No se puede llamar a este método o propiedad con valores Null.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>La aritmética numérica provoca truncamientos.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>Desbordamiento de SqlDateTime. Debe estar entre 1/1/1753 12:00:00 AM y 12/31/9999 11:59:59 PM.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>Las dos cadenas que se concatenan tienen una intercalación diferente.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>Las dos cadenas que se comparan tienen una intercalación diferente.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>Valor de marca no válido.</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>Desbordamiento de la conversión de SqlDecimal a Decimal.</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>Desbordamiento de conversión.</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>Estructura de SqlDateTime no válida.</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>Se ha especificado una zona horaria. SqlDateTime no admite zonas horarias.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>Tamaño de matriz no válido.</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>Precisión o escala numérica no válida.</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>La entrada no está en un formato correcto.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>Error de SqlType.</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>SqlBytes y SqlChars no admiten longitudes superiores a los 2GB en esta versión.</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>Error al leer.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Se ha cerrado o desechado Stream.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>No hay búfer. Error al realizar la operación de lectura o escritura.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>No se puede establecer una longitud distinta de cero porque el valor actual es Null.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>Tamaño de búfer insuficiente. Error al realizar la operación de lectura o escritura.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>No se puede escribir en un desplazamiento distinto de cero porque el valor actual es Null.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>No se puede escribir desde un desplazamiento mayor que la longitud actual, ya que dejaría datos no inicializados en el búfer.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>El tamaño de los datos devueltos supera los 2Gb. Utilice SequentialAccess command behavior para obtener todos los datos.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>El argumento de GetDayOfWeek debe ser un número entero entre 1 y 7.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>No se ha cargado el Type SQL con datos.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>El Type SQL ya se ha cargado con datos.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>Intento no válido de obtener acceso a un XmlReader cerrado.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>Intento no válido de llamar a {0} cuando la secuencia está cerrada.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>Intento no válido de llamar a {0} cuando no se puede escribir en la secuencia.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>Intento no válido de llamar a {0} cuando no se puede leer la secuencia.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>Intento no válido de llamar a {0} cuando no se puede buscar en la secuencia.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>La subclase no invalidó un método requerido.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>No se puede crear un normalizador para '{0}'.</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>Error interno</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>El parámetro de comando debe tener un texto de comando que no sea null o no esté vacío.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>La matriz del parámetro MetaData debe tener una longitud equivalente al argumento de la matriz ParameterDirection.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>Error de asignación de adaptador de datos.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>Error del adaptador de datos.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>Infracción de simultaneidad de la base de datos.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>Operación cancelada.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>Operación cancelada debido a una excepción (consulte InnerException para obtener detalles).</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Indica si se realiza Fill con una llamada a DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Indica si se realiza Update con una llamada a DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Si puede continuar o no al siguiente DataRow cuando los eventos Update, RowUpdating y RowUpdated y Status es UpdateStatus.ErrorsOccurred.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>Cómo rellena el adaptador la tabla DataTable de DataReader.</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>Acción realizada cuando falta una tabla o una columna en TableMappings.</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>Acción realizada cuando falta una tabla o una columna en DataSet.</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>Cómo asignar la tabla de origen a la tabla de DataSet.</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Evento que se desencadena cuando se produce un error recuperable durante Fill.</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Debe Fill devolver valores específicos del proveedor o valores CLSCompliant comunes.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>Nombre de la columna de origen- distinguir mayúsculas y minúsculas.</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>Número de elementos en la colección</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>Objeto DataColumnMapping especificado.</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>Asignaciones de columnas individuales cuando coincide esta asignación de tabla.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>El nombre de la tabla origen DataTableMapping. Este nombre distingue mayúsculas y minúsculas.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>Número de elementos en la colección</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>Objeto especificado DataTableMapping</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>Se emplea durante Update para filas eliminadas en DataSet.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Evento que se desencadena después de cada DataRow durante Update.</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>Número de filas que se deben procesar juntas por lotes antes de ejecutarlas en el origen de datos.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Conexión utilizada si Select/Insert/Update/DeleteCommands no tienen todavía una conexión.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>Se emplea durante Update para las filas eliminadas en DataTable.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>Se emplea durante Update para las nuevas filas de DataTable.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Utilizado durante Fill.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>Se emplea durante Update para las filas modificadas en DataTable.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Debe Fill devolver valores específicos del proveedor o valores CLSCompliant comunes.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>Cómo asignar la tabla de origen a DataTable.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>Cómo se generan Insert/Update/DeleteCommands cuando no han sido establecidos por el usuario.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>Número de filas que se deben procesar juntas por lotes antes de ejecutarlas en el origen de datos.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>Cadena de conexión utilizada para conectar con el origen de datos.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>Nombre del controlador ODBC que se debe utilizar al conectar con el Data Source.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>DSN que se debe utilizar al conectar con el Data Source.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>Cuando el valor es true, indica la agrupación de conexiones administradas que se debe utilizar.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>Archivo UDL que se debe utilizar al conectar con el Data Source.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>Especifica los OLE DB Services que se van a habilitar o deshabilitar con el OleDb Provider.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>Nombre del proveedor OLE DB que se debe utilizar para conectar con el Data Source.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>El nombre de la aplicación.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>Cuando el valor es true, se puede usar la funcionalidad asincrónica en el proveedor de datos .NET Framework.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>Nombre del archivo principal, incluido el nombre completo de ruta, de una base de datos que se puede adjuntar.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>Cuando el valor es true, indica que el estado de conexión se restablece cuando se elimina del grupo.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>Cuando es true, indica que la conexión debe ser desde el contexto de Sql Server. Disponible sólo cuando funciona en el proceso de Sql Server.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>Nombre de registro de lenguaje de SQL Server.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>Especifica el método de autenticación con SQL Server.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>Certificado de cliente especificado para la autenticación con SQL Server.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>Información utilizada para conectarse al origen de datos.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Valor actual de tiempo de espera de conexión, no se puede establecer en ConnectionString.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>Valor del catálogo del origen de datos actual, 'Database=X' en la cadena de conexión.</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>Origen de datos actuales, 'Server=X' en la cadena de conexión.</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>Controlador ODBC actual</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>El controlador ODBC ha obtenido acceso a la versión del producto.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>Información utilizada para conectarse al origen de datos.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Valor actual de tiempo de espera de conexión, 'Connect Timeout=X' en la cadena de conexión (ConnectionString).</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>Valor del catálogo del origen de datos actual, 'Initial Catalog=X' en la cadena de conexión.</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>Origen de datos actual, 'Data Source=X' en la cadena de conexión.</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>ProgID del proveedor OLE DB actual, 'Provider=X' en la cadena de conexión.</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>El proveedor OLE DB ha obtenido acceso a la versión del producto.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>Token de acceso para usar en la autenticación.</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>Estado de la conexión, sincrónica o asincrónica. 'Asynchronous Processing=x' en la cadena de conexión.</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>Información utilizada para conexión de replicación.</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>Información utilizada para conectar con DataSource, como 'Data Source=x;Initial Catalog=x;Integrated Security=SSPI'.</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>Recopilar estadísticas de esta conexión.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>Proveedores de almacenamiento de claves de cifrado de columnas personalizadas.</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>Un GUID para representar la conexión física.</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Alta automática en notificaciones utilizada por Microsoft SQL Server.</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>Cómo los comandos Update y Delete generan automáticamente la cláusula where cuando el usuario no lo especifica.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>Indica la posición del nombre de catálogo en un nombre de tabla completo de un comando de texto.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>Carácter que separa el nombre de catálogo del resto del identificador en un comando de texto.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>Carácter que separa el nombre de esquema del resto del identificador en un comando de texto.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Cadena de prefijo que se ajusta alrededor de los objetos sql.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Cadena de sufijo que se ajusta alrededor de los objetos sql.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter para el que generar automáticamente comandos.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>Utilice el esquema de DataTable o SelectCommand.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>Cómo se genera automáticamente la cláusula set para el comando Update cuando no ha sido especificada por el usuario.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter para generar automáticamente OdbcCommands</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>El carácter utilizado en un comando de texto, como la comilla de apertura para los identificadores de comillas que contienen caracteres especiales.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>El carácter utilizado en un comando de texto, como la comilla de cierre para los identificadores de comillas que contienen caracteres especiales.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter para generar automáticamente OleDbCommands</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Separador decimal utilizado en literales numéricos.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Cadena de prefijo que se ajusta alrededor de los objetos sql</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Cadena de sufijo que se ajusta alrededor de los objetos sql</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>DataAdapter para generar automáticamente SqlCommands</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Separador decimal utilizado en literales numéricos.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>El carácter utilizado en un comando de texto, como la comilla de apertura para los identificadores de comillas que contienen caracteres especiales.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>El carácter utilizado en un comando de texto, como la comilla de cierre para los identificadores de comillas que contienen caracteres especiales.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>Sólo es necesario establecerlo para parámetros numéricos y decimales al utilizar escenarios con Prepare, FillSchema y CommandBuilder.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>Sólo es necesario establecerlo para parámetros numéricos y decimales al utilizar escenarios con Prepare, FillSchema y CommandBuilder.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>Parámetro de tipo nativo.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>Parámetro de tipo nativo.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>Nombre del parámetro, formato '@p1'</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>Parámetro de tipo nativo.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>Nombre del servidor para el tipo.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>Desplazamiento en tipos de datos de longitud variable.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>No se admite la ParameterDirection '{0}' especificada para el parámetro '{1}'. Table-valued parameters sólo admiten ParameterDirection.Input.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>Se especificó TypeName para el parámetro '{0}'.  Solo se debe especificar TypeName para los parámetros Structured.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>El tipo SqlDbType.Structured sólo es compatible con varios tipos con valores.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>La columna DateType para el campo '{0}' en la tabla de esquema es null.  DataType debe ser no null.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>El número de campos del registro '{0}' no coincide con el número del registro original.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>intervalo: 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>error inesperado en el proveedor de datos SqlClient. {0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>No se puede obtener Type Info para {0},{1}</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>El proveedor no puede cargar el siguiente ensamblado: {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>Debe establecerse la propiedad UdtTypeName para los parámetros UDT.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>El tipo especificado no está registrado en el servidor de destino.{0}.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>No se permiten parámetros UDT en la cláusula where, salvo que formen parte de la clave principal.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>'{0}' es un tipo no válido definido por el usuario, motivo: {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>compatible con formatos en memoria y definidos por el usuario</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>No se puede admitir el formato nativo.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>no implementa IBinarySerialize</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>no serializable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>sin constructores públicos</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>no implementa INullable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>no tiene un constructor público</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>sin atributo UDT</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>La serialización sin asignación no se admite aún.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>falta el método 'public static x Parse(System.Data.SqlTypes.SqlString)'</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>falta el método 'public override string ToString()'</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>falta el método 'public static x Null { get; }'</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>El formato nativo no es compatible con los campos del tipo '{0}' (directamente o a través de otro campo)</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>El tipo no es público</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Native UDT sin diseño secuencial debido al tipo '{0}'</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Native UDT especifica un tamaño máximo de byte</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>el campo '{0}' está marcado como no serializado</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>El tipo de campo '{0}' está marcado como diseño explícito que no se permite en formato nativo</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>Las referencias de ensamblado con varios valores deben tener un identificador de ensamblado distinto de cero.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>Los tipos estructurados con varios valores sólo se pueden utilizar para parámetros y no se pueden anidar dentro de otro tipo.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>El nombre de la ruta de acceso no es válido.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>Error al intentar promover la transacción.</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>Objeto dependiente utilizado para recibir notificaciones de consulta.</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>Propiedad para indicar si esta dependencia no es válida.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>Para agregar un comando a un objeto dependiente existente.</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>El Command ya está asociado a otro objeto dependiente. No se puede sobrescribir.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>Este objeto SqlCommand ya está asociado a otro objeto SqlDependency.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>Timeout especificado no válido. El Timeout no puede ser &lt; 0.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>Error de notificación. Tipo={0}, Info={1}, Origen={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData no es válido para este SqlDbType.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>El dbType {0} no es válido para este constructor.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>Error interno. El valor de texto no cifrado no puede ser nulo.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>No se puede cifrar. El cifrado dio como resultado {0} bytes de texto cifrado, lo que supera el límite máximo permitido de {1} bytes. Probablemente, el valor de texto sin cifrar especificado es demasiado grande (tamaño de texto sin cifrar: {2} bytes).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>Error interno. El valor del texto cifrado no puede ser nulo.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>SQL Server no devolvió información de atestación. El tipo de enclave es "{0}" y la dirección URL de la atestación de enclave es "{1}".</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>No se puede establecer un canal seguro. Mensaje de error: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>Error interno. Se especificó un argumento nulo "{0}" al construir un objeto de tipo "{1}". "{0}" no puede ser nulo.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Especifica un punto de conexión de un servicio de atestación de enclave, que se utilizará para comprobar si el enclave, configurado en la instancia de SQL Server para cálculos en columnas de base de datos que se cifran mediante Always Encrypted, es válido y seguro.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>Error al leer la sección de configuración para los proveedores de enclave. Asegúrese de que la sección tiene el formato correcto en el archivo de configuración de la aplicación. Mensaje de error: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>No se pudo crear una instancia de un proveedor de enclave con el tipo "{1}" para el nombre "{0}". Mensaje de error: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>Error interno. SqlColumnEncryptionEnclaveProviderName no puede ser nulo ni estar vacío.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>Se ha producido un error al leer el conjunto de resultados "{0}". No se ha especificado la dirección URL de atestación en la cadena de conexión, pero la consulta requiere cálculos de enclave. El tipo de enclave es "{1}". </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>Error interno. El tipo de enclave recibido de SQL Server es nulo o está vacío al ejecutar una consulta que requiere cálculos de enclave.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>La ejecución de una consulta requiere cálculos de enclave, pero falta la sección de proveedor de enclave en la configuración de la aplicación.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>No se ha encontrado ningún proveedor de enclave para el tipo de enclave "{0}" y el protocolo de atestación "{1}". Especifique el protocolo de atestación correcto en la cadena de conexión. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>Valor de cifrado de columnas predeterminado para todos los comandos de la conexión.</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>Fuerza el cifrado del parámetro antes de enviar información confidencial al servidor. </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>El objeto de diccionario con nombres de SQL Server y sus rutas de clave maestras de columna de confianza.</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>No se admite la conexión a una instancia de SQL Server reflejada mediante la opción de conexión ApplicationIntent ReadOnly.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>Se ha recibido información de enrutamiento inesperada.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>Se recibió información de enrutamiento no válida.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>Se ha especificado una autenticación no admitida en este contexto: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Se ha agotado el tiempo de espera de la autenticación interactiva de Active Directory. El usuario tardó demasiado en responder a la solicitud de autenticación.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>No se puede usar "Authentication=Active Directory Interactive" si se ha establecido la propiedad Credential.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>Id. de proceso de servidor (SPID) de la conexión activa.</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Se ha agotado el tiempo de espera de la autenticación del flujo de código de dispositivo de Active Directory. El usuario tardó demasiado en responder a la solicitud de autenticación.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>No se puede establecer la propiedad Credential si se ha especificado "Authentication=Active Directory Device Code Flow" en la cadena de conexión.</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>Solo se admiten matrices de una sola dimensión para la acción solicitada.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>No se puede quitar el elemento especificado porque no se puede encontrar en la colección especificada.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>Número no negativo requerido.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>No se puede establecer la propiedad AccessTokenCallback si se ha especificado 'Authentication=Active Directory Default' en la cadena de conexión.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} devuelto {1}.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>Error de protocolo: un mensaje recibido contiene una signatura válida pero no se cifró como requería el nivel de protección efectivo.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>Error de {0}: {1}</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>Esta clase no implementa este método.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>No se admite el paquete de seguridad solicitado.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>Tipo physicalConnection incorrecto.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>Excepción al intentar establecer el modificador de AppContext '{0}'={1}.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>No se admite el tipo {0} en esta plataforma.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>No se admite el modo invariable de globalización.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>No se puede autenticar mediante Kerberos. Asegúrese de que Kerberos se ha inicializado en el cliente con "kinit" y de que se ha registrado un nombre de entidad de seguridad de servicio para el SQL Server para permitir la autenticación Kerberos.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>La palabra clave 'Network Library' no se admite en esta plataforma, anteponer el protocolo deseado al 'Origen de datos' ('tcp:' para una conexión TCP o 'np:' para una conexión de canalización con nombre).</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>El socket no produjo el esperado '{0}' con el código de error '{1}'.</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>El servidor está intentando usar una característica que no se admite en esta plataforma.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>La palabra clave '{0}' no se admite en esta plataforma.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>El archivo System.Transactions.dll cargado actualmente no admite transacciones globales.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>Se recibió un token no admitido '{0}' al leer los datos del servidor.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>'{0}' no es un tipo de controlador compatible.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream no se admite en esta plataforma.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>LocalDB no se admite en esta plataforma.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>Espacio de búfer insuficiente. Requerido: {0} Real: {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>Error en la operación de GSSAPI con el estado: {0} (Estado secundario: {1}).</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>Error en la operación GSSAPI: {0} ({1}).</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>No se admite el enlace de canal en sistemas operativos distintos de Windows.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>El nombre de destino no debe estar vacío si se pasan las credenciales predeterminadas.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>El nivel de protección solicitado no es compatible con la implementación de GSSAPI instalada actualmente.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>No se admite la implementación del servidor.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>La autenticación NTLM no es posible con las credenciales predeterminadas en esta plataforma.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>Cuando lo utiliza DataAdapter.Update, el valor del parámetro cambia de DBNull.Value a (Int32)1 o (Int32)0 si no es nulo.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Se ha superado el tamaño máximo del búfer: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>Falta DataColumn '{0}' para SourceColumn '{2}'.</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>No se ha inicializado la lista SqlBatchCommand.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index c943aeb1fb..f175dbf816 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>Croissant</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Index {0} non valide pour ce {1} avec Count={2}.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>L'élément {0} est déjà contenu dans un autre {1}.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>L'élément {0} est déjà contenu dans ce {1}.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0} accepte uniquement des objets de type {1} non null.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>Tentative de suppression d'un {0} qui n'est pas contenu dans ce {1}.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1} doit être unique, '{2}' existe déjà dans la collection.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>La connexion n'est pas fermée. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>Tentative d'appel de {0} non valide lorsque le lecteur est fermé.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>Inscription dans la transaction impossible car la connexion est la connexion principale d'une transaction déléguée ou promue.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>Décroissant</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>Chaîne non vide attendue pour le paramètre '{0}'.</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>La propriété ConnectionString n'a pas été initialisée.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>Exception non-CLS interceptée.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>L'élément de sécurité donné n'est pas un élément d'autorisation.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>Données</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>Mise à jour</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>Le ConnectionState indiquant si la connexion est ouverte ou fermée.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>Événement déclenché lorsque l'état de la connexion change.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>Le type generic du paramètre.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>Paramètre d'entrée, de sortie ou bidirectionnel.</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>une propriété au moment du design utilisée pour la génération de code fortement typé.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>Offset dans les types de données de longueur variable.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>Nom du paramètre.</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>Taille des types de données de longueur variable (chaîne &amp; tableaux).</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>Lorsqu'il est utilisé par un DataAdapter.Update, correspond au nom de la colonne source utilisé pour rechercher le nom DataSetColumn dans ColumnMappings. Sert à copier une valeur entre le paramètre et une ligne de données.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>Lorsqu'elle est utilisée par un DataAdapter.Update (uniquement UpdateCommand), correspond à la version de la valeur DataRow qui est utilisée pour mettre à jour la source de données.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>Lorsqu'elle est utilisée par DataAdapter.Update, la valeur de paramètre DBNull.Value est remplacée par (Int32)1 ou par (Int32)0 si elle n'est pas null.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>Valeur du paramètre.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>Impossible de créer la collection '{0}' car l'exécution de la requête SQL a échoué. Pour plus de détails, consultez l'exception interne.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>Un nombre de restrictions supérieur au nombre de restrictions pris en charge par le schéma demandé ('{0}') a été fourni.</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>'{2}' n'est pas une valeur valide pour la restriction '{1}' de la collection de schémas '{0}'.</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>La collection demandée ({0}) n'est pas définie.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>La collection demandée ({0}) n'est pas prise en charge par cette version du fournisseur.</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>L'une des tables DataSourceInformation requises est manquante.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>La table DataSourceInformation ne doit contenir qu'une seule ligne.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>Une ou plusieurs des colonnes requises de la collection de restrictions sont manquantes.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>Il existe une restriction sans ligne correspondante dans la collection de restrictions.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>La collection '{0}' est manquante dans le XML de métadonnées.</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>Le XML de métadonnées n'est pas valide.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>Le XML de métadonnées n'est pas valide. La collection {0} doit comporter une colonne {1}. Il doit s'agir d'une colonne de chaîne.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>Le XML de métadonnées n'est pas valide. La colonne {1} de la collection {0} doit comporter une chaîne non vide.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>Action</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>Comportement</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>Remplissage</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>InfoMessage</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>Mappage</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>Notification</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>Schéma</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>Regroupement</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>ConnectionString nommé</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>Sécurité</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>Résilience de la connexion</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>La collection qui contient les informations utilisateur personnalisées.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>Indique si la comparaison de chaînes dans le DataSet respecte la casse.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>Le nom de ce DataSet.</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>Indique une "vue" personnalisée des données contenues dans le DataSet. Cette vue permet le filtrage, la recherche et la navigation dans la vue de données personnalisée.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>Indique si les règles de contrainte doivent être suivies.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>Indique que le DataSet contient des erreurs.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>Indique des paramètres régionaux avec lesquels comparer des chaînes dans le DataSet.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>Indique l'espace de noms URI XML pour l'élément racine vers lequel pointe ce DataSet.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>Indique le préfixe de l'espace de noms utilisé pour ce DataSet.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>Collection qui contient les relations pour ce DataSet.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>La collection qui contient les tables pour ce DataSet.</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>Se produit lorsqu'il n'est pas possible de fusionner des schémas pour deux tables avec le même nom.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Intervient après la fin de l'Initialization.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>Représente un cache de données en mémoire.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>Indique si les chaînes de comparaison contenues dans la table respectent la casse.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>Retourne les relations enfants pour cette table.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>La collection qui contient les colonnes pour cette table.</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>La collection qui contient les contraintes pour cette table.</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>Indique le DataSet auquel appartient cette table.</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>DataView par défaut pour la table.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>L'expression utilisée pour calculer la valeur liée aux données de cette ligne.</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>Indique si la table contient des erreurs.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>Indique des paramètres régionaux avec lesquels comparer des chaînes dans la table.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>Indique une taille de début initiale pour cette table.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>Indique l'espace de noms URI XML pour les éléments contenus dans cette table.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>Indique le préfixe de l'espace de noms utilisé pour cette table dans la représentation XML.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>Retourne les relations parentes pour cette table.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>Indique les colonnes qui représentent la clé primaire pour cette table.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>Indique la collection qui contient les lignes de données pour cette table.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>Indique le nom utilisé pour rechercher dans cette table dans la collection Tables d'un DataSet.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>Se produit lorsqu'une ligne de la table a été modifiée avec succès.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>Se produit lorsque la ligne est en cours de modification afin que le gestionnaire d'événements puisse modifier ou annuler la modification. L'utilisateur peut modifier les valeurs dans la ligne et doit lever une exception pour annuler la modification.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>Se produit une fois qu'une ligne de la table a été supprimée avec succès.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>Se produit lorsqu'une ligne de la table est marquée pour suppression. Levez une exception pour annuler la suppression.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>Se produit lorsqu'une valeur a été envoyée pour cette colonne. L'utilisateur peut modifier la valeur proposée et doit lever une exception pour annuler la modification.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>Se produit lorsqu'une valeur a été modifiée pour cette colonne.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>Se produit avant que toutes les lignes de la table aient été effacées.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>Se produit lorsque toutes les lignes de la table ont été effacées avec succès.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>Se produit lorsqu'un nouveau DataRow a été instancié.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>Le nom utilisé pour rechercher cette relation dans la collection Relations d'un DataSet.</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>Indique les colonnes enfants de cette relation.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>Indique les colonnes parentes de cette relation.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>Indique si les relations sont imbriquées.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>Pour les suppressions, indique le type de cascade qui doit avoir lieu dans cette relation.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>Pour les mises à jour, indique le type de cascade qui doit avoir lieu dans cette relation.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>Pour l'acceptation ou le refus des modifications, indique le type de cascade qui doit avoir lieu dans cette relation.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>Indique les colonnes enfants de cette contrainte.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>Indique les colonnes parentes de cette contrainte.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>Indique la table enfant de cette contrainte.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>Indique les colonnes de cette contrainte.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>Indique si cette contrainte est une clé primaire.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>Indique le nom de cette contrainte.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>Indique la table de cette contrainte.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>Indique si des valeurs null sont autorisées dans cette colonne.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>Indique si la colonne s'incrémente automatiquement pour les lignes ajoutées à la table. Le type de cette colonne doit être Int16, Int32 ou Int64.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>Indique la valeur de départ pour une colonne AutoIncrement.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>Indique l'incrément utilisé par une colonne AutoIncrement.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>Indique la légende interface utilisateur par défaut pour cette colonne.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>Indique le nom utilisé pour rechercher cette colonne dans la collection Columns d'un DataTable.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>Retourne le DataTable auquel appartient cette colonne.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>Indique le type de données stockées dans cette colonne.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>Indique la valeur de la colonne par défaut utilisée lors de l'ajout de lignes à la table.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>Indique la valeur calculée par cette colonne pour chaque ligne à partir d'autres colonnes plutôt qu'à partir de l'entrée de l'utilisateur.</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>Indique comment cette colonne persiste en XML : en tant qu'attribut, élément, noeud de contenu simple ou rien.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>Indique l'URI XML pour les éléments ou les attributs stockés dans cette colonne.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>Indique le Prefix utilisé pour ce DataColumn en représentation xml.</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Indique l'index de cette colonne dans la collection Columns.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>Indique si cette colonne peut être modifiée une fois qu'une ligne a été ajoutée à la table.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>Indique si cette colonne doit limiter ses valeurs dans les lignes de la table afin d'être unique.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>Indique la longueur maximale de la valeur autorisée dans cette colonne.</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>Indique le DateTimeMode de cette propriété DataColumn.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>Indique si ce DataView et l'interface utilisateur associée permettent les suppressions.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>Indique si ce DataView et l'interface utilisateur associée permettent les modifications.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>Indique si ce DataView et l'interface utilisateur associée permettent l'ajout de nouvelles lignes.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>Retourne le nombre d'éléments actuellement dans cette vue.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>Un pointeur est retourné au DataViewManager qui possède ce DataSet (éventuel).</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>Indique si la vue est ouverte.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>Indique une expression utilisée pour filtrer les données retournées par ce DataView.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>Indique les versions des données retournées par ce DataView.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>Indique les noms de la colonne et l'ordre dans lequel les données sont retournées par ce DataView.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Indique si l'ordre de tri par défaut doit être utilisé lorsque la propriété Sort n'est pas définie.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>Indique la table que ce DataView utilise pour obtenir les données.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>Indique que les données retournées par ce DataView ont été modifiées.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>Indique la source des données pour ce DataViewManager.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>Indique les paramètres de tri/filtre/état pour une table dans le DataSet correspondant.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet ne prend pas en charge 'union' ou 'list' en tant que simpleType.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>Syntaxe {0} non valide : attribut requis '{1}' manquant.</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>La valeur '{1}' n'est pas valide pour l'attribut '{0}'.</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>La valeur de l'attribut '{0}' doit être '{1}' ou '{2}'.</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>Impossible de trouver ElementType name='{0}'.</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>Le nom de la table parente est absent de la relation '{0}'.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>Le nom de la table enfant est absent de la relation '{0}'.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>La clé de la table parente est absente de la relation '{0}'.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>La clé de la table enfant est absente de la relation '{0}'.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>Type de données non défini : '{0}'.</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>Type de données non défini.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>Sélection XPath non valide dans le noeud de champ. Impossible de trouver : {0}.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>Sélection XPath non valide à l'intérieur du noeud selector : {0}.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>Noeud 'Key' non valide dans la contrainte nommée : {0}.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>Le nom de la contrainte {0} est déjà utilisé dans le schéma.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>Impossible de convertir '{0}' en type '{1}'.</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>Partie '{0}' manquante dans la contrainte '{1}' nommée '{2}'.</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>Définition de Relation non valide : clés de longueur différente.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet n'autorise pas la référence circulaire dans le ComplexType nommé '{0}'.</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet ne peut pas instancier un ComplexType abstrait pour le noeud {0}.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Une erreur s'est produite au niveau du convertisseur multi-cibles lors de l'écriture d'un Schema Xml. Pour plus de détails, reportez-vous à l'exception interne.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Une erreur s'est produite au niveau du convertisseur multi-cibles lors de l'écriture d'un Schema Xml. Une chaîne null ou vide a été renvoyée.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>Déclaration '{0}' dupliquée.</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>Impossible de charger diffGram. La table '{0}' est absente du groupe de données de destination.</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>Impossible de charger diffGram. Le noeud 'sql' est absent.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>Le nom de la colonne '{0}' est défini pour différents types de mappages.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>Le préfixe '{0}' n'est pas valide, car il contient des caractères spéciaux.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>Référence circulaire dans une table à imbrication automatique '{0}'.</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet ne peut pas développer d'entités. Utilisez XmlValidatingReader et définissez la propriété EntityHandling en conséquence.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>Le type '{0}' n'implémente pas l'interface IXmlSerializable. Par conséquent, la sérialisation ne peut pas se poursuivre.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>Impossible de poursuivre la désérialisation. Les données n'implémentent pas IXMLSerializable. Par conséquent, le polymorphisme n'est pas pris en charge.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable ne prend pas en charge l'inférence de schéma de Xml.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>Impossible de poursuivre la sérialisation du DataTable '{0}'. Il contient un DataRow doté de plusieurs lignes parent au niveau de la même clé étrangère.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>L'attribut IsDataSet est manquant dans le Schema d'entrée.</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>Désolé... Nous ne pouvons pas déterminer l’élément DataSet. L’attribut IsDataSet existe plusieurs fois.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet ne sérialise pas les types qui implémentent IDynamicMetaObjectProvider mais n'implémentent pas IXmlSerializable.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>La fonctionnalité n'est pas implémentée. {0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>Erreur de syntaxe : opérande manquant après l'opérateur '{0}'.</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>Incompatibilité de type dans l'expression '{0}'.</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>Expression trop complexe.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>Impossible de trouver la colonne [{0}].</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>L'expression contient une constante de chaîne non valide : {0}.</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>L'expression contient un appel de fonction non défini {0}().</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>Erreur de syntaxe dans l'expression.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>Nombre d'arguments non valide : fonction {0}().</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>La parenthèse fermante est absente de l'expression.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>Impossible d'interpréter le jeton '{0}' à la position {1}.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>{0} attendu, mais jeton à la position {2} est {1}.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>Désolé... Nous ne pouvons pas convertir {0} en {1}.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>Désolé... Nous ne pouvons pas convertir une valeur « {0} » en un type « {1} ».</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>Nom de colonne [{0}] non valide.</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>L'expression contient une constante de date non valide '{0}'.</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>Seules les expressions de constante sont autorisées dans la liste des expressions pour l'opérateur IN.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Erreur dans l'opérateur Like : le modèle de chaîne '{0}' n'est pas valide.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>Erreur de syntaxe : les éléments qui suivent le mot clé IN doivent être séparés par des virgules et être entre parenthèses.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>Incompatibilité de type dans l'argument de fonction : {0}(), argument {1}, {2} attendu.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>Incompatibilité de type dans l'argument de fonction : {0}(), argument {1}, l'un des types Integer attendu.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>Impossible d'effectuer une opération '{0}' sur {1} et {2}.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>L'opérateur '{0}' est ambigu sur les opérandes de type '{1}' et '{2}'. Impossible de mélanger des types signés et non signés. Utilisez une fonction Convert() explicite.</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>Erreur de syntaxe : le mot clé IN doit être suivi d'une liste d'expressions non vide séparées par des virgules et entre parenthèses.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>L'expression contient un opérateur '{0}' non pris en charge.</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>L'expression contient un nom non valide : '{0}'.</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>Erreur de syntaxe : opérande manquant avant l'opérateur '{0}'.</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>Parenthèses fermantes trop nombreuses dans l'expression.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>La table [{0}] est incluse dans plusieurs relations. Vous devez mentionner explicitement un nom de relation dans l'expression '{1}'.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>Erreur de syntaxe dans l'argument d'agrégation : argument de colonne unique attendu avec un possible qualificateur 'Child'.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>Référence indépendante dans l'expression d'agrégation '{0}'.</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>Impossible d'évaluer une expression autre que de constante sans la ligne actuelle.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>Référence indépendante dans l'expression '{0}'.</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>Impossible de calculer. L'expression '{0}' n'est pas un agrégat.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>L'expression de filtre « {0} » ne peut pas correspondre à un terme booléen.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>Nom de type '{0}' non valide.</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>Erreur de syntaxe dans l'expression de recherche : mot clé 'Parent' attendu suivi d'un argument de colonne avec un qualificateur de relation si nécessaire : Parent[(&lt;nom_relation&gt;)].&lt;nom_colonne&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>Ligne ou table requise pour appeler DataFilter.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>Argument {0}() hors limites.</value>
-  </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>Erreur de syntaxe : utilisation non valide de l'opérateur 'Is'. La syntaxe correcte est : &lt;expression&gt; Is [Not] Null.</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>Offset et length étaient hors limites pour ce tableau ou bien le nombre est supérieur au nombre d'éléments de l'index à la fin de la collection source.</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>La valeur est trop grande ou trop petite pour le type '{0}'.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>Impossible de convertir l'objet de type « {0} » en objet de type « {1} ».</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>Erreur : division par zéro.</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>La seule valeur acceptable pour la propriété '{0}' est '{1}'.</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>Relation parent '{0}' introuvable.</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>Les valeurs acceptables de la propriété '{0}' sont '{1}' ou '{2}'.</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>Argument 'hours' hors limites. Spécifiez une valeur comprise entre -14 et +14.</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>Les valeurs spécifiées de QuotePrefix et de QuoteSuffix ne correspondent pas.</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>Argument 'minutes' hors limites. Spécifiez une valeur comprise entre -59 et +59.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>La longueur de l’argument «{0}» dépasse sa limite de «{1}».</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>La plage indiquée pour l'heure dépasse le total de 14 heures.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>Valeur non valide pour la clé « {0} ».</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>La propriété Kind de l'argument DateTime fourni ne correspond pas aux arguments 'hours' et 'minutes'.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>L'utilisation de la clé '{0}' nécessite la présence de la clé '{1}'.</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>Le DataColumn de type '{0}' ne prend pas en charge l'expression.</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>La longueur de la valeur pour la clé «{0}» dépasse sa limite de «{1}».</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>Impossible d'activer les contraintes. Une ou plusieurs lignes contiennent des valeurs qui violent les contraintes de type non null, unique ou de clé externe.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>Mot clé non pris en charge : « {0} ».</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>La collection elle-même n'est pas modifiable.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>Erreur interne du fournisseur de données .NET Framework {0}.</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>Le nom '{0}' spécifié correspond au moins à deux noms de l'objet Collection avec une casse différente, mais ne correspond à aucun d'eux avec une casse identique.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} « {1} ».</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>Le nom spécifié '{0}' correspond au moins à deux noms de l'objet Collection, avec des espaces de noms différents.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}", utilisation incorrecte de guillemets.</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>Offset et length étaient hors limites pour ce tableau ou bien le nombre est supérieur au nombre d'éléments de l'index à la fin de la collection source.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}", la limite actuelle de "{2}" est insuffisante.</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>Argument '{0}' hors limites.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>Échec de SqlBulkCopy.WriteToServer car SqlBulkCopy.DestinationTableName est un nom en plusieurs parties non valide</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>L'argument '{0}' ne peut pas être null.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>Échec du traitement des résultats provenant de SQL Server à cause d'un nom en plusieurs parties non valide</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>L'argument '{0}' contient la valeur null.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName est un nom en plusieurs parties non valide</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>Impossible de trouver la colonne {0}.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName est un nom en plusieurs parties non valide</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>La colonne '{0}' appartient déjà à ce DataTable.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>Échec de SqlCommand.DeriveParameters car la valeur de la propriété SqlCommand.CommandText est un nom en plusieurs parties non valide</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>La colonne '{0}' appartient déjà à un autre DataTable.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>La connexion à une instance de SQL Server mise en miroir à l'aide de l'option de connexion MultiSubnetFailover n'est pas prise en charge.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>Impossible d'avoir plus d'une colonne SimpleContent dans un DataTable.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>La valeur d'énumération {0}, {1}, n'est pas prise en charge par la méthode {2}.</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>Impossible d'ajouter une colonne SimpleContent à une table contenant des colonnes d'éléments ou des relations imbriquées.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>La valeur d'énumération {0}, {1}, n'est pas prise en charge par le fournisseur de données .NET Framework SqlClient.</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>Une colonne nommée '{0}' appartient déjà à ce DataTable.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0} : la propriété CommandText n'a pas été initialisée</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>Impossible d'ajouter une colonne nommée '{0}' : un tableau imbriqué avec le même nom appartient déjà à ce DataTable.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0} : la propriété Connection n'a pas été initialisée.</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>Une colonne nommée '{0}' appartient déjà à ce DataTable : impossible de définir un nom de tableau imbriqué avec ce même nom.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} nécessite une Connection ouverte et disponible. {1}</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>Impossible de supprimer une colonne qui n'appartient pas à cette table.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>La procédure stockée '{0}' n'existe pas.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>Impossible de supprimer cette colonne, car elle fait partie de la clé primaire.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>La transaction n'est pas associée à la connexion en cours ou s'est terminée.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>Impossible de supprimer cette colonne, car elle fait partie de la clé parente pour la relation {0}.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>La transaction associée à la connexion active est terminée mais n'a pas été supprimée. Pour pouvoir utiliser la transaction pour exécuter des instructions SQL vous devez la supprimer.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>Impossible de supprimer cette colonne, car elle fait partie de la contrainte {0} dans la table {1}.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>{0} implique que la commande comporte une transaction lorsque la connexion attribuée à la commande se trouve dans une transaction locale en attente. La propriété Transaction de la commande n'a pas été initialisée.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>Impossible de supprimer cette colonne, car elle fait partie d'une expression : {0} = {1}.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>Un DataReader ouvert est déjà associé à {0} et doit d'abord être fermé.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>Impossible de définir une propriété AutoIncrement pour une colonne calculée.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>DeriveParameters {0} ne prend en charge que CommandType.StoredProcedure, et pas CommandType.{1}.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>Impossible de définir la propriété AutoIncrement pour une colonne pour laquelle DefaultValue est défini.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>Impossible de définir un DefaultValue sur une colonne AutoIncrement.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep doit être une valeur différente de zéro.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>ColumnName est requis lorsqu'il fait partie d'un DataTable.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>Impossible de changer DataType d'une colonne lorsqu'il contient des données.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>La colonne requiert un DataType valide.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>Le DefaultValue pour la colonne {0} est de type {1} et ne peut pas être converti en {2}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>Le DefaultValue pour la colonne est de type {0} et ne peut pas être converti en {1}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>Le DefaultValue pour la colonne {0} est de type {1}, mais la colonne est de type {2}.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>Impossible de changer la propriété ReadOnly pour la colonne d'expression.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>Impossible de changer la propriété Unique pour la colonne d'expression.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>Impossible de créer une expression sur une colonne qui a AutoIncrement ou Unique.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>Impossible de définir l'expression, car la colonne ne peut pas être ReadOnly.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>Impossible de définir la propriété Expression sur la colonne {0}, car elle fait partie d'une contrainte.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>Impossible de créer une contrainte à partir d'une colonne Expression {0}.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>Impossible de définir la propriété Expression en raison d'une référence circulaire dans l'expression.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>La colonne '{0}' contient des valeurs null.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>La colonne '{0}' n'autorise pas les valeurs nulls.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>La colonne '{0}' est en lecture seule.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>La colonne '{0}' contient des valeurs qui ne sont pas uniques.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>La colonne '{0}' n'appartient pas à la table {1}.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>La colonne doit appartenir à une table.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>Impossible de stocker &lt;{0}&gt; dans la colonne {1}. Type attendu est {2}.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>Impossible de définir Column '{0}' à null. Utilisez DBNull à la place.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>Impossible de définir la colonne '{0}'. La valeur dépasse la limite MaxLength de cette colonne.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength s'applique uniquement au type de données string. Vous ne pouvez pas définir la propriété MaxLength de Column '{0}' avec un nombre non négatif.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>Impossible de définir la propriété MaxLength en '{1}' pour Column'{0}'. Au moins une chaîne dans la table est plus longue que la nouvelle limite.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Impossible de définir la propriété MaxLength de Column '{0}'. La colonne est de type SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>Impossible de définir la propriété DataType à {1} pour Column '{0}'. La colonne est de type SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>Impossible de définir la propriété MappingType à SimpleContent pour la colonne '{0}'. Le DataType de Column est {1}.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>Column '{0}' dépasse la limite MaxLength.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>La colonne '{0}' n'autorise pas DBNull.Value.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>Impossible de modifier la propriété Namespace de Column '{0}'. La colonne est de type SimpleContent.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>Impossible de modifier AutoIncrement d'un DataColumn du type '{0}' lorsqu'il comporte des données.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>La colonne '{0}' n'appartient pas à la table sous-jacente '{1}'.</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>DataColumn de type '{0}' est de type complexType. Impossible de sérialiser la valeur d'un type complexe comme Attribute</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>Possibilité de définir DateTimeMode uniquement sur les DataColumns du type DateTime.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>La valeur du DataSetDateTime de '{0}' n'est pas valide.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>Impossible de modifier DateTimeMode de '{0}' en '{1}' lorsque la table contient des données.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Type '{0}' ne contient pas la propriété ou le champ Null static.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>Le type '{0}' n'implémente pas IRevertibleChangeTracking ; impossible de poursuivre RejectChanges().</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>SetAdded et SetModified peuvent uniquement être appelés sur DataRows avec l'état DataRowState Unchanged.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>Le nombre ordinal « {0} » dépasse le nombre maximal.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet ne prend pas en charge System.Nullable&lt;&gt;.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>Impossible de changer le nom d'une contrainte en chaîne vide lorsqu'elle se trouve dans ConstraintCollection.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>Impossible d'appliquer des contraintes sur la contrainte {0}.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>La colonne '{0}' doit être unique. La valeur '{1}' est déjà présente.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>La contrainte '{0}' n'appartient pas à ce DataTable.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>Impossible de trouver la contrainte {0}.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>La contrainte correspond à la contrainte appelée {0} qui se trouve déjà dans la collection.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>Une Constraint appelée '{0}' appartient déjà à ce DataTable.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>Ces colonnes n'ont pas actuellement de valeurs uniques.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>Ces colonnes ne pointent pas vers cette table.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>Cette contrainte ne peut pas être activée, car toutes les valeurs n'ont pas de valeurs parentes correspondantes.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>Cette contrainte ne peut pas être ajoutée, car ForeignKey n'appartient pas à la table {0}.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>Impossible de supprimer une contrainte qui n'appartient pas à cette table.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>Impossible de supprimer la contrainte unique '{0}'. Supprimez d'abord la contrainte de clé étrangère '{1}'.</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>Impossible de supprimer cette ligne, car les contraintes sont appliquées sur la relation {0}. La suppression de cette ligne rendra les lignes enfants orphelines.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>Impossible d'apporter cette modification, car les contraintes sont appliquées sur la relation {0}. La modification de cette valeur rendra les lignes enfants orphelines.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>Impossible d'effacer la table {0}, car ForeignKeyConstraint {1} applique les contraintes et {2} contient des lignes enfants.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>ForeignKeyConstraint {0} a besoin des valeurs de clé enfant ({1}) dans la table parente.</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>Propriété inaccessible, car '{0}'.</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>Impossible de supprimer cette ligne, car elle a des lignes enfants et les contraintes sur la relation {0} sont appliquées.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>Impossible d'ajouter une contrainte de clé primaire, car la clé primaire est déjà définie pour la table.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>Impossible d'ajouter une contrainte à DataTable '{0}' qui est une table enfant dans deux relations imbriquées.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>Impossible de créer une clé à partir de colonnes qui appartiennent à des tables différentes.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>Impossible d'avoir 0 colonne.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>Impossible d'avoir plus de {0} colonnes.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>Impossible de créer une clé lorsque la même colonne est répertoriée plusieurs fois : '{0}'</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>Impossible de supprimer une contrainte unique, car il s'agit de la clé primaire d'une table.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>Impossible de supprimer une contrainte unique, car il s'agit de la clé primaire d'une table {0}.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>Les types des colonnes parentes et des colonnes enfants ne correspondent pas.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey et ChildKey sont identiques.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns et ChildColumns doivent avoir la même longueur.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns et ChildColumns ne doivent pas avoir une longueur égale à zéro.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>La ligne n'appartient pas au même DataSet que cette relation.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>RelationName est requis lorsqu'il fait partie d'un DataSet.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows requiert une ligne dont la table est {0}, mais la Table de la ligne spécifiée est {1}.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>Cette relation doit connecter deux tables dans ce DataSet pour être ajoutée à ce DataSet.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRow requiert une ligne dont la table est {0}, mais la table de la ligne spécifiée est {1}.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow requiert une ligne enfant dont la table est {0}, mais la table de la ligne spécifiée est {1}.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>Impossible d'avoir une relation entre des tables dans des DataSets différents.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>Impossible de créer une relation entre des tables dans des DataSets différents.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>Une relation existe déjà pour ces colonnes enfants.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>Cette relation n'appartient pas à cette collection relation.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Cette relation appartient déjà à un autre DataSet.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Cette relation appartient déjà à ce DataSet.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>Une Relation nommée '{0}' appartient déjà à ce DataSet.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>La Relation {0} n'appartient pas à ce DataSet.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>Impossible de trouver la relation {0}.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>Impossible de créer une collection sur une table null.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>La table dont cette collection affiche les relations a été supprimée de son DataSet.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>Impossible d'ajouter une relation à la collection ParentRelation de cette table lorsque cette table n'est pas la table enfant.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>Impossible d'ajouter une relation à la collection ChildRelation de cette table lorsque cette table n'est pas la table parente.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>Impossible de définir la valeur false pour la propriété 'Nested' pour cette relation.</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>La même table '{0}' ne peut pas être la table enfant dans deux relations imbriquées.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>La table ({0}) ne peut pas être sa table enfant dans les relations imbriquées.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>Impossible d'ajouter un DataRelation ou un Constraint ayant des paramètres Locale ou CaseSensitive différents entre ses tables parentes et enfants.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>Impossible de créer un DataRelation si les colonnes parent ou enfant ne se trouvent pas dans un DataSet.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>La table imbriquée '{0}' héritant de son espace de noms ne peut pas comporter plusieurs tables parent dans des espaces de noms distincts.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>La table imbriquée '{0}' avec espace de noms vide ne peut pas avoir plusieurs tables parentes dans différents espaces de noms.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>La ligne n'appartient pas au même DataSet que cette relation.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>Impossible d'effectuer cette opération sur une ligne qui ne se trouve pas dans la table.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>Cette relation et cette ligne enfant n'appartiennent pas au même DataSet.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>Impossible de changer une valeur proposée dans l'événement RowChanging.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>Impossible d'appeler EndEdit() dans un événement OnRowChanging.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>Impossible d'appeler BeginEdit() dans l'événement RowChanging.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>Impossible d'appeler CancelEdit() dans un événement OnRowChanging. Levez une exception pour annuler cette mise à jour.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>Impossible d'appeler Delete dans un événement OnRowDeleting. Levez une exception pour annuler cette suppression.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>Le tableau en entrée est plus long que le nombre de colonnes de cette table.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>Il n'y a pas de données Current auxquelles accéder.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>Il n'y a pas de données Original auxquelles accéder.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>Il n'y a pas de données Proposed auxquelles accéder.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>Cette ligne a été supprimée d'une table et ne contient pas de données. BeginEdit() permettra la création de nouvelles données dans cette ligne.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>Impossible d'accéder via la ligne aux informations de ligne supprimées.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>La version doit être Original, Current, ou Proposed.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>Aucune ligne à la position {0}.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>La position d'insertion de la ligne {0} n'est pas valide.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>rowOrder value={0} a été trouvé deux fois pour la table nommée '{1}'.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>Des valeurs manquent dans la séquence rowOrder pour la table '{0}'.</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>Le DataRow donné ne se trouve pas dans le DataRowCollection actuel.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>Cette ligne appartient déjà à une autre table.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>Cette ligne appartient déjà à cette table.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>Impossible de supprimer cette ligne, car elle est déjà supprimée.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>Cette ligne est vide.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>Impossible de supprimer une ligne qui a déjà été supprimée.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>Une ligne enfant a plusieurs parents.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>Modèle de bit non reconnu pour l'état de ligne.</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>Impossible de changer le nom du DataSet en une chaîne vide.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>Le nom '{0}' n'est pas valide. Un DataSet ne peut pas avoir le même nom que le DataTable.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>L'espace de noms du schéma est non valide. Utilisez plutôt celui-ci : {0}.</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>Impossible de modifier une propriété CaseSensitive ou Locale. Cette modification obligerait au moins un DataRelation ou un Constraint à posséder des paramètres Locale ou CaseSensitive différents entre ses tables connexes.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>La propriété SchemaSerializationMode ne peut être définie que si elle est remplacée par un DataSet dérivé.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>Les colonnes PrimaryKey n'appartiennent pas à cette table.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>Impossible d'ajouter une relation imbriquée ou une colonne d'éléments à une table contenant une colonne SimpleContent.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>TableName est requis lorsqu'il fait partie d'un DataSet.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable comporte déjà une colonne de contenu simple.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>La table n'a pas une clé primaire.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} n'est pas une entrée de chaîne Sort valide.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>Impossible de sérialiser le DataTable. Un DataTable utilisé dans des expressions DataColumn n'est pas un descendant du DataTable actuel.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>Ce DataTable peut uniquement être distant s'il fait partie de DataSet. Des colonnes d'expression font référence à d'autres DataTable(s).</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>DataSet et DataTable ne peuvent pas comporter des valeurs de propriété de format de communication à distance différentes.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>Impossible de sérialiser le DataTable. Le nom du DataTable n'est pas défini.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>Un DataTable appelé '{0}' appartient déjà à ce DataSet.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>Un DataTable nommé '{0}' avec le même Namespace '{1}' appartient déjà à ce DataSet.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>La table ({0}) ne peut pas être sa table enfant dans une relation imbriquée : le nom DataSet est en conflit avec le nom de la table.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>Le nom '{0}' n'est pas valide. Un DataTable ne peut pas avoir le même nom que le DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable appartient déjà à un autre DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable appartient déjà à ce DataSet.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>La table {0} n'appartient pas à ce DataSet.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>Impossible de trouver la table {0}.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>Impossible de supprimer une table qui a des relations existantes. Supprimez tout d'abord les relations.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>Impossible de supprimer la table {0}, car elle est référencée dans ForeignKeyConstraint {1}. Supprimez tout d'abord la contrainte.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>Le DataTable '{0}' ne correspond à aucun DataTable de la source.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>Définition DataSet cible manquante pour {0}.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>DataSet cible manquant {0} {1}.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} et &lt;source&gt;.{0} ont des propriétés en conflit : incompatibilité de propriété DataType.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>Length différent pour &lt;target&gt;.PrimaryKey et &lt;source&gt;.PrimaryKey.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>Colonnes incompatibles dans PrimaryKey : &lt;target&gt;.{0} versus &lt;source&gt;.{1}.</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>La Relation {0} ne peut pas être fusionnée, car les clés ont des colonnes incompatibles.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>La table cible {0} n'a pas de définition pour la colonne {1}.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>La colonne PrimaryKey {0} n'existe pas dans la table source.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>Le paramètre RowStates doit être défini à une combinaison valide de valeurs à partir de l'énumération DataViewRowState.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Find recherche une ligne en fonction d'un ordre de tri et aucun ordre de tri n'est spécifié.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>{0} valeurs attendues pour la clé indexée, mais {1} valeurs reçues.</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>Utilisation non valide de la fonction d'agrégation {0}() et du type : {1}.</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>Type d'enregistrement non valide : {0}.</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>La persistance Xml DataSet ne prend pas en charge la valeur '{0}' en tant que valeur Char, utilisez plutôt le stockage Byte.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>Le type de valeur ne correspond pas au type de colonne</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>Le type '{0}' n'implémente pas l'interface IComparable. Comparaison impossible.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>Impossible de définir {0}.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>Impossible de changer DataSet dans un DataViewManager qui est déjà la vue par défaut d'un DataSet.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter ne peut afficher ModifiedOriginals et ModifiedCurrents à la fois.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>Impossible de changer la propriété Table dans un DefaultView ou un DataView provenant d'un DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>Impossible de changer la propriété DataSet une fois qu'elle a été définie.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>DataSet doit être défini avant d'utiliser DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>Impossible de changer la propriété Table une fois qu'elle a été définie.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>DataTable doit être défini avant d'utiliser DataView.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>Impossible d'effectuer une liaison à DataTable sans nom.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>Impossible de définir un objet dans cette liste.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>Impossible d'appeler AddNew dans un DataView lorsque AllowNew a la valeur false.</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView n'est pas ouvert.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>La relation n'est pas apparentée à la table vers laquelle ce DataView pointe.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>Impossible de supprimer dans un DataSource lorsque AllowDelete a la valeur false.</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>Impossible de modifier dans un DataSource lorsque AllowEdit a la valeur false.</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>L'index {0} est négatif ou supérieur au nombre de lignes.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>Impossible d'ajouter des objets externes à cette liste.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>Impossible d'effacer cette liste.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>Impossible d'insérer des objets externes dans cette liste.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>Impossible de supprimer des objets qui ne sont pas dans la liste.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} n'est pas un DataColumn ou un DataRelation pour la table {1}.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>Min ({0}) doit être inférieur ou égal à max ({1}) dans un objet Range.</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>Il s'agit d'une plage null.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>MinimumCapacity ne doit pas être négatif.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>Impossible de générer l'identificateur pour le nom '{0}'.</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>Plusieurs tables portent le même nom '{0}' (même si l'espace de noms est différent).</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>Colonne '{0}' : Le type '{1}' ne peut pas être null.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>Colonne '{0}' : le type '{1}' n'a pas de constructeur sans paramètre.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>Colonne '{0}' : le type '{1}' n'a pas de constructeur avec un argument string.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>Impossible de convertir l'objet de type « {0} » en objet de type « {1} ».</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Exception Data.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Exception Constraint.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>Lignes supprimées inaccessibles.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>Nom dupliqué non autorisé.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>Opération non prise en charge dans l'événement RowChanging.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>Contrainte non valide.</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>Clé primaire manquante.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Valeur Null non autorisée.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>Colonne indiquée en lecture seule.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>Ligne introuvable dans la table.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>Version introuvable.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>Les données ReadOnly ont été modifiées.</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader non valide pour le DataTable '{0}' actuel.</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>Le schéma du DataTable '{0}' actuel de DataTableReader a été modifié, DataTableReader n'est pas valide.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>Impossible de créer DataTableReader. DataSet ne contient aucun DataTable.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>Impossible de créer DataTableReader. L'argument est vide.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>Impossible de créer DataTableReader. Les arguments contiennent la valeur null.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>Le DataRow actuel porte l'état Deleted ou Detached.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>Le DataTable actuel '{0}' est vide. DataTable ne contient aucun DataRow.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>L'index interne DataTable est endommagé : '{0}'.</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>La collection a été modifiée ; l'opération d'énumération risque de ne pas s'exécuter.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>Le type simple « {0} » a déjà été déclaré avec une autre valeur « {1} ».</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>Foliation non valide.</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>Impossible de changer le nom de la table une fois que le DataSet associé est mappé à un document XML chargé.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>Impossible de changer l'espace de noms de la table une fois que le DataSet associé est mappé à un document XML chargé.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>Impossible de changer le nom de la colonne une fois que le DataSet associé est mappé à un document XML chargé.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>Impossible de changer l'espace de noms de la colonne une fois que le DataSet associé est mappé à un document XML chargé.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>Impossible de changer la propriété ColumnMapping une fois que le DataSet associé est mappé à un document XML chargé.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>Impossible d'ajouter ou de supprimer des colonnes à partir de la table une fois que le DataSet est mappé à un document XML chargé.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>Impossible d'ajouter ou de supprimer des tables du DataSet une fois que le DataSet est mappé à un document XML chargé.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>Impossible d'ajouter, de supprimer ou de changer des relations imbriquées à partir du DataSet une fois que le DataSet est mappé à un document XML chargé.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>Le paramètre DataSet n'est pas valide. Il ne peut pas être null.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>Impossible de changer le nom DataSet une fois que le DataSet est mappé à un document XML chargé.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>Ce type de noeud ne peut pas être cloné : {0}.</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>Impossible de charger XmlDataDocument s'il contient déjà des données. Utilisez un nouveau XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>Le DataSet peut être associé à un XmlDataDocument maximum. Il est impossible d'associer le DataSet au XmlDataDocument actif, car le DataSet est déjà associé à un autre XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>Définissez DataSet.EnforceConstraints == false avant d'essayer de modifier XmlDataDocument à l'aide d'opérations XML.</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>GetElementById() n'est pas pris en charge dans DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>Impossible de créer des références d'entité sur DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>La fonction Clear sur DateSet et DataTable n'est pas prise en charge sur XmlDataDocument.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>Impossible de supprimer la colonne, car elle est intégrée dans ce dataSet.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>Désolé... Nous ne pouvons pas supprimer la relation, car elle est intégrée à ce jeu de données.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>Se produit lorsqu'une propriété pour ce contrôle change.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Se produit lorsque l'appartenance de cette collection change.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>Impossible d'obtenir la valeur, car il s'agit d'une valeur DBNull.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>La propriété '{0}' requiert Microsoft WindowsNT ou un système d'exploitation WindowsNT.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>Le fournisseur de données .NET Framework demandé est introuvable. Il n'est peut-être pas installé.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>L'implémentation du fournisseur de données .NET Framework demandée ne comporte pas de champ d'instance d'un type dérivé de System.Data.Common.DbProviderFactory.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>La recherche ou le chargement du fournisseur de données .NET Framework inscrit a échoué.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>Le nom qualifié d'assembly du fournisseur de données .NET Framework est obligatoire.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>Seuls éléments autorisés.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>Nœuds enfants non autorisés.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>Attribut '{0}' non reconnu.</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>Élément non reconnu.</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>La section '{0}' ne peut figurer qu'une seule fois par fichier de configuration.</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>L'attribut obligatoire '{0}' est introuvable.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>L'attribut requis '{0}' ne peut pas être vide.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>Tableau non vide attendu pour le paramètre '{0}'.</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>La seule valeur acceptable pour la propriété '{0}' est '{1}'.</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>Les valeurs acceptables de la propriété '{0}' sont '{1}' ou '{2}'.</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>Les valeurs spécifiées de QuotePrefix et de QuoteSuffix ne correspondent pas.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>La longueur de l’argument «{0}» dépasse sa limite de «{1}».</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>Argument de type {1} attendu, mais type {0} reçu.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>Valeur non valide pour la clé « {0} ».</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>L'utilisation de la clé '{0}' nécessite la présence de la clé '{1}'.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>La longueur de la valeur pour la clé «{0}» dépasse sa limite de «{1}».</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>Mot clé non pris en charge : « {0} ».</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>Impossible de charger le fichier UDL.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>Fichier UDL non valide.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>Erreur interne du fournisseur de données .NET Framework {0}.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>Les propriétés QuotePrefix et QuoteSuffix ne peuvent pas être changées lorsqu'une commande Insert, Update ou Delete a été générée.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>La propriété DataAdapter.SelectCommand doit être initialisée.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>La propriété DataAdapter.SelectCommand.Connection doit être initialisée ;</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} « {1} ».</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}", utilisation incorrecte de guillemets.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}", la limite actuelle de "{2}" est insuffisante.</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>Échec de SqlBulkCopy.WriteToServer car SqlBulkCopy.DestinationTableName est un nom en plusieurs parties non valide</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>Échec du traitement des résultats provenant de SQL Server à cause d'un nom en plusieurs parties non valide</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName est un nom en plusieurs parties non valide</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName est un nom en plusieurs parties non valide</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>Échec de SqlCommand.DeriveParameters car la valeur de la propriété SqlCommand.CommandText est un nom en plusieurs parties non valide</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>Échec de OdbcCommandBuilder.DeriveParameters car la valeur de la propriété OdbcCommand.CommandText est un nom en plusieurs parties non valide</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>Échec de OleDbCommandBuilder.DeriveParameters car la valeur de la propriété OleDbCommandBuilder.CommandText est un nom en plusieurs parties non valide</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>La connexion à une instance de SQL Server mise en miroir à l'aide de l'option de connexion MultiSubnetFailover n'est pas prise en charge.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>Le mappage de colonnes de SourceColumn '{0}' a échoué car le DataColumn '{1}' est une colonne calculée.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>Incompatibilité de type ne pouvant pas être converti entre SourceColumn '{0}' de {1} et DataColumn '{2}' de {3}.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>DataColumn '{0}' manquant dans DataTable '{1}' pour SourceColumn '{2}'.</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>SourceColumn doit être une chaîne non vide.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>Mappage SourceColumn manquant pour '{0}'.</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>La valeur d'énumération {0}, {1}, n'est pas prise en charge par la méthode {2}.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>La valeur d'énumération {0}, {1}, n'est pas prise en charge par le fournisseur de données .NET Framework ODBC.</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>La valeur d'énumération {0}, {1}, n'est pas prise en charge par le fournisseur de données .NET Framework OLEDB.</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>La valeur d'énumération {0}, {1}, n'est pas prise en charge par le fournisseur de données .NET Framework SqlClient.</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>Impossible d'extraire le nom complet ComputerNameDnsFullyQualified, {0}.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>DataTable '{0}' manquant pour le SourceTable '{1}'.</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>SourceTable doit être une chaîne non vide</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>Mappage SourceTable manquant : '{0}'</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0} : la propriété CommandText n'a pas été initialisée</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0} : la propriété Connection n'a pas été initialisée.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} nécessite une Connection ouverte et disponible. {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill : la propriété SelectCommand.Connection n'a pas été initialisée.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage : la propriété SelectCommand.Connection n'a pas été initialisée.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema : la propriété SelectCommand.Connection n'a pas été initialisée.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>Pour la mise à jour, la propriété InsertCommand doit posséder un objet connection. La propriété Connection de InsertCommand n'a pas été initialisée.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>UpdateCommand doit avoir un objet connection pour la mise à jour. La propriété Connection de UpdateCommand n'a pas été initialisée.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>DeleteCommand doit avoir un objet connection pour la mise à jour. La propriété Connection de DeleteCommand n'a pas été initialisée.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>Un objet de connexion doit être utilisé pour la mise à jour. La propriété Connection n'a pas été initialisée.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>Le clone de commande a besoin d'un objet connection pour la mise à jour. La propriété Connection du clone de la commande n'a pas été initialisée.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>La mise à jour nécessaire une connexion.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>{0}Command doit avoir un objet open connection pour Update. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>{0}Command doit avoir un objet open connection pour Update. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>{0}Command doit avoir un objet open connection pour Update. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>La commande de mise à jour doit avoir un objet open connection pour Update. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>La procédure stockée '{0}' n'existe pas.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>La transaction assignée à cette commande doit être la transaction locale en attente la plus imbriquée.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>La transaction n'est pas associée à la connexion en cours ou s'est terminée.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>La transaction associée à la connexion active est terminée mais n'a pas été supprimée. Pour pouvoir utiliser la transaction pour exécuter des instructions SQL vous devez la supprimer.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>{0} implique que la commande comporte une transaction lorsque la connexion attribuée à la commande se trouve dans une transaction locale en attente. La propriété Transaction de la commande n'a pas été initialisée.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>Un SqlResultSet associé à cette commande est déjà ouvert. Il doit d'abord être fermé.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>Un DataReader ouvert est déjà associé à {0} et doit d'abord être fermé.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>DeriveParameters {0} ne prend en charge que CommandType.StoredProcedure, et pas CommandType.{1}.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>La méthode '{0}' ne peut être appelée qu'une fois pour la même exécution.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>Le résultat asynchrone est incorrect.</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>La propriété SelectCommand n'a pas été initialisée avant l'appel de '{0}'.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>StatementType {0} non attendu ici.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema : chaîne non valide attendue pour le nom SourceTable.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>La valeur MaxRecords de {0} n'est pas valide ; la valeur doit être &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>La valeur StartRecord de {0} n'est pas valide ; la valeur doit être &gt;= 0.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill : chaîne non vide attendue pour le nom SourceTable.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>Les colonnes des chapitres hiérarchiques doivent mapper AutoIncrement DataColumn.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) a retourné la valeur null.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>Ne spécifiez qu'un seul élément dans le tableau dataTables lors de l'utilisation de valeurs non nulles pour startRecords ou maxRecords.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Impossible pour Update de trouver TableMapping['{0}'] ou DataTable '{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update : nom SourceTable non vide attendu.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>TableMapping manquant quand TableMapping.DataSetTable='{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Le clone de commande doit être valide pour Update.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>La génération SQL automatique pendant une Update requiert un SelectCommand valide.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Update requiert un InsertCommand valide lors du passage de la collection DataRow avec de nouvelles lignes.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>Update requiert un UpdateCommand valide lors du passage de la collection DataRow avec des lignes modifiées.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Update requiert un DeleteCommand valide lors du passage de la collection DataRow avec des lignes supprimées.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[0] est d'un autre DataTable que DataRow[{0}].</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent : des erreurs se sont produites ; aucune information supplémentaire n'est disponible.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent : des erreurs se sont produites ; aucune information supplémentaire n'est disponible.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>Dans un traitement par lots, la valeur de la propriété UpdatedRowSource de la commande pour UpdateRowSource.FirstReturnedRecord ou pour UpdateRowSource.Both n'est pas valide.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>Violation de l'accès concurrentiel : UpdateCommand a affecté {0} des enregistrements {1} attendus.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>Violation de l'accès concurrentiel : DeleteCommand a affecté {0} des enregistrements {1} attendus.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>Violation de l'accès concurrentiel : la commande automatisée a affecté {0} des enregistrements {1} attendus.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>La méthode '{0}' ne peut être appelée qu'une fois pour la même exécution.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>Valeur CommandTimeout {0} non valide ; la valeur doit être &gt;= 0.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}] : la propriété Size a une taille non valide, 0.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>La méthode {0}.Prepare requiert que tous les paramètres aient un type défini explicitement.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>La méthode {0}.Prepare requiert que tous les paramètres de longueur variable aient une valeur Size explicitement définie différente de zéro.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>La méthode {0}.Prepare requiert que les paramètres de type '{1}' aient des valeurs Precision et Scale explicitement définies.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>Appel de la méthode End incompatible avec asyncResult. Appel de {0} attendu, mais c'est la méthode {1} qui a été appelée.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>Opération non valide. La connexion est fermée.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>La connexion a été désactivée.</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>Inscription impossible dans la transaction car une transaction locale est en cours sur la connexion. Terminez la transaction locale et réessayez.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>La connexion comporte actuellement une transaction inscrite. Terminez la transaction en cours et réessayez.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>La base de données ne peut pas être null, une chaîne vide ou une chaîne exclusivement composée d'espaces.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>L'argument est trop long.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Valeur 'Connect Timeout' non valide qui doit être un entier &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>Mémoire tampon source non valide (taille de {0}) offset : {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>Mémoire tampon de destination non valide (taille de {0}) offset : {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>La valeur numérique est trop élevée pour tenir dans un décimal à 96 bits.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>Tentative non valide de {0} lorsque le flux est fermé.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>La valeur de SeekOrigin spécifiée n'est pas valide.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>La génération SQL dynamique n'est pas prise en charge pour plusieurs tables de base.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>La génération SQL dynamique n'est pas prise en charge pour un SelectCommand qui ne retourne pas des informations de table de base.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>La génération SQL dynamique de DeleteCommand n'est pas prise en charge pour un SelectCommand qui ne retourne pas des informations de colonne clé.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>La génération SQL dynamique de UpdateCommand n'est pas prise en charge pour un SelectCommand qui ne retourne pas des informations de colonne clé.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>La génération SQL dynamique de DeleteCommand n'est pas prise en charge pour un SelectCommand qui ne contient pas de colonne version de ligne.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>La génération SQL dynamique de UpdateCommand n'est pas prise en charge pour un SelectCommand qui ne contient pas de colonne version de ligne.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>La génération SQL dynamique n'est pas prise en charge pour les noms de table '{0}' qui contiennent le caractère QuotePrefix ou QuoteSuffix '{1}'.</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>Tentative non valide de lecture du numéro de colonne '{0}'. Avec CommandBehavior.SequentialAccess, vous ne pouvez lire qu'à partir du numéro de colonne '{1}' ou supérieur.</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>Le type de données '{0}' ne peut pas adopter le format littéral car sa valeur de date et d'heure n'est pas valide.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>La valeur ne peut pas adopter le format littéral du type demandé.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>Le type de données '{0}' ne peut pas adopter le format littéral car son échelle maximale n'est pas valide.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>La valeur littérale fournie n'est pas valide pour le type de données '{0}'.</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>'{0}' : la longueur de la valeur littérale doit être paire.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>'{0}' : la valeur littérale doit être une chaîne composée de chiffres hexadécimaux</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>{0} nécessite une connexion ouverte lorsque le préfixe de guillemet n'a pas été défini.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>Impossible de déterminer les valeurs littérales booléennes correctes. Impossible de créer des littéraux Boolean.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>Les littéraux du type de données natif associé au type de données '{0}' ne sont pas pris en charge.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>Le type de données du paramètre de {0} n'est pas valide.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>Aucun mappage n'existe à partir du type d'objet {0} vers un type connu de fournisseur natif managé.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>Impossible de gérer un TypeCode inconnu {0} retourné par le Type {1}.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>Aucun mappage n'existe à partir de DbType {0} vers un {1} connu.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>La version de SQL Server utilisée ne prend pas en charge le type de données '{0}'.</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>Valeur du paramètre '{0}' hors limites.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>Le nom de paramètre spécifié, '{0}', n'est pas valide.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>Les paramètres de valeur de retour multiples ne sont pas pris en charge.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>Valeur Size du paramètre '{0}' non valide. La valeur doit être supérieure ou égale à 0.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>Valeur non valide pour l'argument '{0}'. La valeur doit être supérieure ou égale à 0.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>Valeur non valide pour ces métadonnées.</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>Les métadonnées doivent être SqlDbType.Row</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>Échec de la conversion de la valeur de paramètre d'un {0} en un {1}.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>Les transactions parallèles ne sont pas prises en charge par {0}.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>{0} est terminé ; il n'est plus utilisable.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>'{0}' ne peut pas être appelé lorsque l'enregistrement est en lecture seule.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>'{0}' ne peut pas être appelé lorsque DbDataRecord est en lecture seule.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>La conversion implicite du type d'objet '{0}' en type de données '{1}' n'est pas prise en charge.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>L'offset de la mémoire tampon « {1} » plus les octets disponibles « {0} » sont supérieurs à la longueur de la mémoire tampon passée.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>La longueur des données « {0} » est inférieure à 0.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>La longueur spécifiée '{0}' est hors limites.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>Tentative {2} non valide au niveau de dataIndex '{0}'. Avec CommandBehavior.SequentialAccess ; vous ne pouvez lire qu'à partir de dataIndex '{1}' ou supérieur.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>Offset doit faire référence à un emplacement de la valeur.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>Pour le fournisseur managé par ODBC, la restriction TABLE_NAME doit être spécifiée et non null pour la collection d'index GetSchema.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>Valeur d'argument non valide pour la méthode '{0}'.</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>Le fournisseur ODBC n'a pas renvoyé de résultats à partir de SQLGETTYPEINFO.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>Argument DataTable null inattendu</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>Argument DataSet null inattendu.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>La chaîne de connexion dépasse la longueur maximale autorisée {0}.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} - Impossible de mapper le type.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>Type SQL inconnu - {0}.</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>Type URT inconnu - {0}.</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>Argument négatif non valide !</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>Impossible de définir une propriété sur une connexion ouverte.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>Aucun mappage valide d'une valeur SQL_TRANSACTION '{0}' vers une valeur d'énumération System.Data.IsolationLevel.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} - impossible d'activer le regroupement de connexions...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} - impossible d'allouer un handle d'environnement.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} - impossible d'obtenir le handle du descripteur.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>Ne se trouve pas dans une transaction</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>Énumération OdbcType value={0} non valide.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>Utilisez IsDBNull lorsque des données DBNull.Value sont attendues.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} - aucune information d'erreur disponible</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>La connexion est fermée.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>Une connexion interne n'a pas un propriétaire.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>Le fournisseur de données .NET Framework ODBC nécessite MDAC (Microsoft Data Access Components) version 2.6 ou ultérieure. La version {0} est actuellement installée.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>Le fournisseur de données .NET Framework OLEDB nécessite MDAC (Microsoft Data Access Components) version 2.6 ou ultérieure. La version {0} est actuellement installée.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>L'interface '{0}' n'est pas prise en charge par le fournisseur '{1}'. GetOleDbSchemaTable n'est pas disponible avec le fournisseur actuel.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>Échec de'{0}' sans aucun message d'erreur disponible, code de résultat : {1}.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>Aucune message d'erreur disponible, code de résultat : {0}.</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>Les fournisseurs de données .NET Framework nécessitent MDAC (Microsoft Data Access Components). Installez MDAC version 2.6 ou ultérieure.</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>Le fournisseur de données .NET Framework pour OLEDB (Microsoft.Data.OleDb) ne prend pas en charge le fournisseur Microsoft OLE DB pour les pilotes ODBC (MSDASQL). Utilisez le fournisseur de données .NET Framework pour ODBC (System.Data.Odbc).</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>Le fournisseur de données .NET Framework pour OLEDB n'autorisera pas le fournisseur OLE DB à afficher des invites utilisateur dans un environnement non interactif.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>Le fournisseur '{0}' n'est pas inscrit sur l'ordinateur local.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>L'interface ICommandText n'est pas prise en charge par le fournisseur '{0}'. Utilisez CommandType.TableDirect à la place.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>L'interface ITransactionLocal n'est pas prise en charge par le fournisseur '{0}'. Les transactions locales ne sont pas disponibles avec le fournisseur actuel.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>Le format de la chaîne d'initialisation n'est pas conforme à la spécification OLE DB. La chaîne de connexion commence aux alentours du caractère char[{0}].</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>La fonctionnalité de traitement asynchrone n'est pas prise en charge par le fournisseur de données .NET Framework OLE DB (Microsoft.Data.OleDb).</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>Un fournisseur OLE DB n'était pas spécifié dans ConnectionString. Par exemple, 'Provider=SQLOLEDB;'.</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>Le fournisseur OLE DB spécifié dans le ConnectionString est trop long.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>Aucune restriction n'est attendue pour le DbInfoKeywords OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>Aucune restriction n'est attendue pour DbInfoLiterals OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>Aucune restriction n'est attendue pour le guid de schéma OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>Le schéma OleDbSchemaGuid {0} n'est pas pris en charge par le fournisseur '{1}'.</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>Le paramètre de configuration '{0}' possède un nombre de valeurs incorrect.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>Impossible de charger le fichier XML spécifié dans le paramètre de configuration '{0}'.</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>Le paramètre de commande [{0}] '{1}' n'est pas valide.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>La valeur de données [{0}] '{1}' du paramètre de commande n'a pas pu être convertie pour des raisons autres que l'incompatibilité de signe ou le dépassement de données.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>Échec de la conversion pour le paramètre de commande [{0}] '{1}', car la valeur des données était signée et le type utilisé par le fournisseur n'était pas signé.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>La conversion a échoué pour le paramètre de commande [{0}] '{1}', car la valeur des données a dépassé le type utilisé par le fournisseur.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>Le fournisseur a rencontré une erreur lors de l'envoi d'une valeur [{0}] '{1}' de paramètre de commande et a arrêté le traitement.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>Le paramètre[{0}] '{1}' n'a pas de valeur par défaut.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>Une erreur s'est produite avec le paramètre de commande [{0}] : {1}.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Erreur interne Microsoft.Data.OleDb.OleDbDataAdapter : accesseur de paramètre non valide : {0} {1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter [{0}] : la propriété OleDbType n'est pas initialisée : OleDbType.{1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>L'interface ICommandWithParameters n'est pas prise en charge par le fournisseur '{0}'.  Les paramètres de commande ne sont pas pris en charge avec le fournisseur actuel.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>L'extraction des informations sur les paramètres de procédures n'est pas prise en charge par le fournisseur '{0}'.</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>Impossible de déterminer le séparateur décimal du serveur. Impossible de créer des littéraux numériques qui ne sont pas des entiers.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>L'objet n'est ni un ADODB.RecordSet, ni un ADODB.Record.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>Impossible d'extraire l'interface '{0}' de l'objet ADODB.RecordSet.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}] : la propriété Size a une taille non valide, 0.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>Impossible d'extraire une interface IRow de l'objet ADODB.Record.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>La méthode {0}.Prepare requiert que tous les paramètres aient un type défini explicitement.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>Le type ne prend pas en charge l'interface OLE DB ISourcesRowset</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>La méthode {0}.Prepare requiert que tous les paramètres de longueur variable aient une valeur Size explicitement définie différente de zéro.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>Impossible de construire la collection de schémas ReservedWords car le fournisseur ne prend pas en charge IDBInfo.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>La méthode {0}.Prepare requiert que les paramètres de type '{1}' aient des valeurs Precision et Scale explicitement définies.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>La valeur de la propriété n'est pas définie car le fournisseur ne prend pas en charge la propriété '{0}', ou le consommateur a tenté d'obtenir ou de définir des valeurs de propriété manquantes dans le groupe de propriétés Initialization et l'objet source de données n'est pas initialisé.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>Appel de la méthode End incompatible avec asyncResult. Appel de {0} attendu, mais c'est la méthode {1} qui a été appelée.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>Échec de l'initialisation de la propriété '{0}' pour l'une des raisons suivantes :
-	Le type de données de valeur n'est pas le type de la propriété ou n'est pas null. Par exemple, la propriété est DBPROP_MEMORYUSAGE, qui a le type de données Int32. Or, le type de données est Int64.
-	La valeur n'est pas valide. Par exemple, la propriété est DBPROP_MEMORYUSAGE et sa valeur est négative.
-	La valeur de la propriété est valide et le fournisseur la prend en charge en tant que propriété définissable, mais il ne prend pas en charge la valeur spécifiée. Cela concerne les cas où la valeur est ajoutée à la propriété dans OLE DB après l'inscription du fournisseur.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>Opération non valide. La connexion est fermée.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>La valeur de Options n'est pas valide.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>Inscription impossible dans la transaction car une transaction locale est en cours sur la connexion. Terminez la transaction locale et réessayez.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>L'élément ColumnID n'est pas valide.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>La connexion comporte actuellement une transaction inscrite. Terminez la transaction en cours et réessayez.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>Une propriété '{0}' a été spécifiée pour être appliquée à toutes les colonnes, mais n'a pas pu l'être à certaines colonnes.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>La base de données ne peut pas être null, une chaîne vide ou une chaîne exclusivement composée d'espaces.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>La propriété '{0}' est en lecture seule ou le consommateur a tenté de définir des valeurs de propriété dans le groupe de propriétés Initialization après l'initialisation de l'objet source de données. Les consommateurs peuvent définir la valeur d'une propriété en lecture seule sur sa valeur actuelle. Cet état est également retourné si une propriété de colonne définissable n'a pas pu être définie pour la colonne en question.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>Mémoire tampon source non valide (taille de {0}) offset : {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>La valeur de la propriété '{0}' facultative n'a pas été définie sur la valeur spécifiée. Ce type de définition est impossible.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>Mémoire tampon de destination non valide (taille de {0}) offset : {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>La valeur de la propriété '{0}' n'est pas définie pour ne pas entrer en conflit avec une propriété existante.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>Tentative non valide de {0} lorsque le flux est fermé.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(Réservé).</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>La valeur de SeekOrigin spécifiée n'est pas valide.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>Le fournisseur a retourné une valeur DBPROPSTATUS_ '{0}' inconnue.</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>Tentative non valide de lecture du numéro de colonne '{0}'. Avec CommandBehavior.SequentialAccess, vous ne pouvez lire qu'à partir du numéro de colonne '{1}' ou supérieur.</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>La validation de l'accesseur a été différée et a été effectuée lors du retour de données par la méthode. La liaison n'était pas valide pour cette colonne ou ce paramètre.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>Le type de données du paramètre de {0} n'est pas valide.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>Erreur interne OleDbDataAdapter : accesseur d'ensemble de lignes non valide : Ordinal={0} Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>Aucun mappage n'existe à partir du type d'objet {0} vers un type connu de fournisseur natif managé.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>La valeur des données n'a pas pu être convertie pour des raisons autres que l'incompatibilité de signe ou le dépassement de données. Par exemple, les données étaient endommagées dans le magasin de données mais la ligne pouvait toujours être extraite.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>Impossible de gérer un TypeCode inconnu {0} retourné par le Type {1}.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>Le fournisseur n'a pas pu allouer de la mémoire pour retourner les données {0}.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>Aucun mappage n'existe à partir de DbType {0} vers un {1} connu.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>Échec de la conversion, car la valeur des données {0} a dépassé le type spécifié pour la partie de la valeur {0} dans la mémoire tampon du consommateur.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>La version de SQL Server utilisée ne prend pas en charge le type de données '{0}'.</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>Erreur interne OleDbDataAdapter : [get] type de données OLE DB inconnu : 0x{0} ({1}).</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>Valeur du paramètre '{0}' hors limites.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>Échec de la conversion, car la valeur de données {0} était signée et le type spécifié pour la partie de la valeur {0} dans la mémoire tampon du consommateur n'était pas signé.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>Le nom de paramètre spécifié, '{0}', n'est pas valide.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>Erreur interne OleDbDataAdapter : [set] type de données OLE DB inconnu : 0x{0} ({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>Valeur Size du paramètre '{0}' non valide. La valeur doit être supérieure ou égale à 0.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>Le fournisseur n'a pas pu déterminer la valeur {0}. Par exemple, la ligne venait d'être créée, la valeur par défaut pour la colonne {0} n'était pas disponible et le consommateur n'avait pas encore défini une nouvelle valeur {0}.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>Valeur non valide pour l'argument '{0}'. La valeur doit être supérieure ou égale à 0.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>Le fournisseur OLE DB a retourné une valeur d'état {0} inattendue.</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>Valeur non valide pour ces métadonnées.</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>OleDbDataReader.Read doit être utilisé à partir du même thread que celui ayant servi à le créer si l'ApartmentState de ce thread n'est pas ApartmentState.MTA.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>Échec de la conversion de la valeur de paramètre d'un {0} en un {1}.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>Erreur non spécifiée : {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>Les transactions parallèles ne sont pas prises en charge par {0}.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>Échec de IErrorInfo.GetDescription avec {0}.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>{0} est terminé ; il n'est plus utilisable.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>Échec de IErrorInfo.GetSource avec {0}.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>La longueur spécifiée '{0}' est hors limites.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>Les données DBTYPE_VECTOR ne sont pas prises en charge par le fournisseur de données .NET Framework OLE DB (Microsoft.Data.OleDb).</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>Tentative {2} non valide au niveau de dataIndex '{0}'. Avec CommandBehavior.SequentialAccess ; vous ne pouvez lire qu'à partir de dataIndex '{1}' ou supérieur.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>Valeurs de taille de pool min et max non valides, la taille min ne peut pas être supérieure à la taille max.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>Le mot clé '{0}' est obsolète. Utilisez plutôt '{1}'.</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>Impossible d'obtenir du serveur l'adresse du coordinateur des transactions distribuées du serveur. DTC est-il activé sur le serveur ?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>La longueur de la valeur pour le paramètre de connexion &lt;{0}&gt; dépasse la valeur maximale autorisée de 65 535 caractères.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>'Packet Size' non valide. La valeur doit être un entier compris entre 512 et 32768.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>Transaction non valide ou nom non valide pour un point sur lequel enregistrer dans la transaction.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>La valeur d'énumération {0}, {1}, n'est pas prise en charge par SQL Server 7.0 ni par SQL Server 2000.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>User Instance et Failover ne sont pas des options compatibles. Ne choisissez que l'une d'elles dans la chaîne de connexion.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>Impossible de définir la propriété Credential si 'Authentication=Active Directory Integrated' a été spécifié dans la chaîne de connexion.</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>Des paramètres d'authentification incorrects ont été spécifiés avec l'authentification par certificat.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>L'instance de SQL Server à laquelle vous avez tenté de vous connecter doit être cryptée, mais cet ordinateur ne prend pas en charge le cryptage.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>L'instance de SQL Server à laquelle vous avez tenté de vous connecter ne prend pas en charge le cryptage.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>L'instance de SQL Server à laquelle vous avez tenté de vous connecter ne prend pas en charge CTAIP.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>Version de SQL Server non prise en charge. Le fournisseur de données .NET Framework SqlClient peut être utilisé avec SQL Server version 7.0 ou ultérieure uniquement.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>{0} ne peut pas être modifié tant qu'une opération asynchrone est en cours.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>Cette commande requiert une connexion asynchrone. Définissez "Asynchronous Processing=true" dans la chaîne de connexion.</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>La tentative de connexion a expiré.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>Le délai d'attente est arrivé à expiration. Par conséquent, la connexion a été interrompue.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>Échec d'instance.</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>Code d'erreur  0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword requiert SQL Server 9.0 ou version ultérieure.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>La redirection d'instance SSE n'est pas prise en charge pour les instances d'utilisateurs non locaux.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>L'authentification '{0}' n'est pas prise en charge.</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>La méthode d'authentification SQL '{0}' n'est pas prise en charge.</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>Échec de l'instanciation d'un fournisseur d'authentification ayant le type '{1}' pour '{0}'.</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>Échec de l'instanciation d'un SqlAuthenticationInitializer ayant le type '{0}'.</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>Le fournisseur '{0}' a levé une exception durant l'initialisation.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>Le fournisseur '{0}' ne prend pas en charge l'authentification '{1}'.</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Impossible de trouver un fournisseur d'authentification pour « {0} ». Installez le package NuGet « Microsoft.Data.SqlClient.Extensions.Azure » (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) pour utiliser les méthodes d'authentification Active Directory Domain Services (Entra ID).</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>Échec de lecture de la section de configuration des fournisseurs d'authentification.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Le paramètre « {0} » ne peut pas être Null ou vide.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>L'opération asynchrone est déjà terminée.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>Impossible de poursuivre l'exécution de la commande : une opération asynchrone en attente est déjà en cours.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>Commande non valide envoyée vers ExecuteXmlReader. La commande doit retourner un résultat Xml.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>Les notifications requièrent SQL Server 9.0 ou version ultérieure.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>Format de nom en 3 parties non valide pour UdtTypeName.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>Impossible d'initialiser le package SSPI.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Expiration du Timeout. Le délai d'attente s'est écoulé avant la fin de l'opération ou le serveur ne répond pas.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>Le délai d'attente pour la connexion expiré. Le délai d'attente s'est écoulé au début de la phase de préconnexion. Cela peut être dû à un manque de temps au niveau du délai d'attente de connexion.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>Une instance d'utilisateur a été demandée dans la chaîne de connexion, mais le serveur spécifié ne prend pas en charge cette option.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>La validation de l'application du certificat de serveur a échoué.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>La longueur de données spécifiée, {0}, est supérieure à la longueur maximale autorisée, {1}.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>Tentative de lecture non valide lorsque aucune donnée n'est présente.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>La longueur des données « {0} » est inférieure à 0.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>Impossible d'appeler '{0}' si le SqlDataRecord est en lecture seule.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>La collection mappée est utilisée et inaccessible pour l'instant ;</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>La connexion à la connexion de contexte à l’aide de Microsoft.Data.SqlClient n’est pas prise en charge.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>Les TransactionScopes imbriquées ne sont pas prises en charge.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>Événement serveur inattendu : {0}.</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>La longueur de '{0}' doit correspondre à celle de '{1}'.</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>Le type SqlDbType '{0}' n'est pas valide pour {1}. Seul {2} est pris en charge.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>Trop de valeurs.</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>Le Stream ne prend pas en charge l'écriture.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>Null</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>Message</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>Dépassement arithmétique.</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>Erreur : division par zéro.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>Les données sont null. Cette méthode ou propriété ne peut pas être appelée sur des valeurs Null.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>L'arithmétique numérique génère une troncation.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>Dépassement SqlDateTime. Doit être compris entre 1/1/1753 12:00:00 AM et 31/12/9999 11:59:59 PM.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>Les deux chaînes à concaténer ont un classement différent.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>Les deux chaînes à comparer ont un classement différent.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>Valeur d'indicateur non valide.</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>Dépassement lors de la conversion de SqlDecimal en Decimal.</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>Dépassement de la conversion.</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>SqlDateTime non valide.</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>Un fuseau horaire était spécifié. SqlDateTime ne prend pas en charge les fuseaux horaires.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>Taille de tableau non valide.</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>Précision numérique/échelle non valide.</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>L'entrée n'était pas dans un format correct.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>Erreur SqlType.</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>Les SqlBytes et SqlChars ne prennent pas en charge de longueur supérieure à 2GB dans cette version.</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>Erreur lors de la lecture.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Le Stream a été fermé ou supprimé.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>La mémoire tampon est manquante. Échec de l'opération de lecture ou d'écriture.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>Définition sur une longueur non nulle impossible : la valeur actuelle est Null.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>La mémoire tampon est insuffisante. Échec de l'opération de lecture ou d'écriture.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>Écriture dans l'offset non nul impossible : la valeur actuelle est Null.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>Aucune donnée ne peut être écrite à partir d'un offset supérieur à la longueur actuelle. Sinon, la mémoire tampon risque de contenir des données non initialisées.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>La taille des données retournées est supérieure à 2Gb. Utilisez le command behavior SequentialAccess pour obtenir l'ensemble de ces données.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>L'argument utilisé pour GetDayOfWeek doit être un entier compris entre 1 et 7.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>Le Type SQL n'a pas été chargé avec les données.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>Le Type SQL a déjà été chargé avec les données.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>Tentative d'accès à un XmlReader fermé non valide.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>Tentative d'appel de {0} non valide si le flux est fermé.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>Tentative d'appel de {0} non valide si des données ne peuvent pas être écrites dans le flux.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>Tentative d'appel de {0} non valide lorsque le flux ne peut pas être lu.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>Tentative d'appel de {0} non valide lorsque le flux ne peut pas être recherché.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>La sous-classe n'a pas substituée une méthode requise.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>Impossible de créer un normaliseur pour '{0}'.</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>Erreur interne</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>Un paramètre de commande doit contenir un texte de commande non null et non vide.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>La longueur du tableau de paramètres MetaData doit être équivalente à celle de l'argument de tableau ParameterDirection.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>Erreur de mappage de l'adaptateur de données.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>Erreur de l'adaptateur de données.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>Violation de l'accès concurrentiel à la base de données.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>Opération abandonnée.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>Opération abandonnée en raison d'une exception (pour plus de détails, consultez InnerException).</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Indique si Fill appelle DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Indique si Update appelle DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Indique s'il faut aller au DataRow suivant lorsque Status égale UpdateStatus.ErrorsOccurred pour les événements Update, RowUpdating et RowUpdated.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>Indique comment l'adaptateur remplit DataTable à partir de DataReader.</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>L'action entreprise lorsqu'une table ou une colonne de TableMappings manque.</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>L'action entreprise lorsqu'une table ou une colonne dans DataSet manque.</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>Comment mapper une table source à une table DataSet.</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Événement déclenché lorsqu'une erreur récupérable se produit lors d'un remplissage (Fill).</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Indique si Fill doit retourner les valeurs propres au fournisseur ou les valeurs CLSCompliant communes.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>Nom de la colonne source - respecte la casse.</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>Le nombre d'éléments dans la collection</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>L'objet DataColumnMapping spécifié.</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>Mappages de colonnes individuelles lorsqu'une correspondance de ce mappage de table est identifiée.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>Le nom de table source DataTableMapping. Ce nom respecte la casse.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>Le nombre d'éléments dans la collection</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>L'objet DataTableMapping spécifié</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>Utilisé lors de la mise à jour (Update) pour les lignes supprimées dans DataSet.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Événement déclenché après chaque DataRow lors de la mise à jour (Update).</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>Nombre de lignes à traiter par lots simultanément avant l'exécution pour la source de données.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Connexion utilisée si les commandes Select/Insert/Update/DeleteCommands n'en possèdent pas encore.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>Utilisé lors de la mise à jour pour les lignes supprimées du DataTable.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>Utilisé lors de Update pour les nouvelles lignes du DataTable.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Utilisé lors de Fill.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>Utilisé lors de Update pour les lignes modifiées du DataTable.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Indique si Fill doit retourner les valeurs propres au fournisseur ou les valeurs CLSCompliant communes.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>Indique la manière dont une table source doit être mappée vers DataTable.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>Indique la manière dont les Insert/Update/DeleteCommands sont générées lorsqu'elles ne sont pas définies par l'utilisateur.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>Nombre de lignes à traiter par lots simultanément avant l'exécution pour la source de données.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>Chaîne de connexion utilisée pour la connexion à la source de données.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>Nom du pilote ODBC à utiliser lors d'une connexion au Data Source.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>DSN à utiliser lors d'une connexion au Data Source.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>Lorsque sa valeur est true, indique que le regroupement de connexions managé doit être utilisé.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>Fichier UDL à utiliser lors d'une connexion au Data Source.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>Spécifie les OLE DB Services à activer ou à désactiver avec le OleDb Provider.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>Nom du fournisseur OLE DB à utiliser lors d'une connexion au Data Source.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>Le nom de l'application.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>Quand la valeur est true, active l'utilisation de la fonctionnalité asynchrone du fournisseur de données .NET Framework.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>Nom du fichier principal, comprenant le nom du chemin complet, d'une base de données pouvant être attachée.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>Lorsque sa valeur est true, indique que l'état de la connexion est rétabli lorsqu'elle est supprimée du pool.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>Lorsque sa valeur est true, indique que la connexion doit provenir du contexte Sql Server. Disponible uniquement en cas d'exécution dans le processus Sql Server.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>Nom de l'enregistrement de la langue de SQL Server.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>Spécifie la méthode d'authentification avec SQL Server.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>Certificat client spécifié pour l'authentification auprès de SQL Server.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>Les informations utilisées pour connecter une source de données.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Valeur du délai d'attente de la connexion actuelle, non définissable dans ConnectionString.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>Valeur du catalogue de la source de données actuelle, 'Database=X' dans la chaîne de connexion.</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>Source de données actuelle, 'Server=X' dans la chaîne de connexion.</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>Pilote ODBC actif.</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>Version du produit auquel accède le fournisseur ODBC.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>Les informations utilisées pour connecter une source de données.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Valeur du délai d'attente de la connexion actuelle, 'Connect Timeout=X' dans le ConnectionString.</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>Valeur du catalogue de la source de données actuelle, 'Initial Catalog=X' dans la chaîne de connexion.</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>Source de données actuelle, 'Data Source=X' dans la chaîne de connexion.</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>ProgID du fournisseur OLE DB actuel, 'Provider=X' dans la chaîne de connexion.</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>Version du produit auquel accède le fournisseur OLE DB.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>Jeton d’accès à utiliser pour l’authentification.</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>État de la connexion (synchrone ou asynchrone). La fonctionnalité 'Asynchronous Processing=x' est utilisée dans la chaîne de connexion.</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>Informations utilisées pour la connexion en vue de la réplication.</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>Informations utilisées pour la connexion à une DataSource, par exemple 'Data Source=x;Initial Catalog=x;Integrated Security=SSPI'.</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>Statistiques de collecte de cette connexion.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>Fournisseurs de magasins de clés de chiffrement de colonne personnalisée.</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>Un guid pour représenter la connexion physique.</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Inscription automatique aux notifications utilisée par Microsoft SQL Server.</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>Indique comment la clause where est automatiquement générée pour les commandes Update et Delete lorsqu'elle n'a pas été spécifiée par l'utilisateur.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>Indique la position du nom de catalogue dans le nom de table qualifié d'une commande de texte.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>Caractère séparant le nom du catalogue du reste de l'identificateur dans une commande de texte.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>Caractère séparant le nom du schéma du reste de l'identificateur dans une commande de texte.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Chaîne de préfixe autour des objets sql.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Chaîne de suffixe autour des objets sql.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter pour lequel générer automatiquement des commandes.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>Utilisez le schéma provenant de DataTable ou SelectCommand.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>Indique comment la clause set est automatiquement générée pour la commande Update lorsqu'elle n'est pas spécifiée par l'utilisateur.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter pour lequel il faut générer automatiquement OdbcCommands</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Caractère utilisé dans une commande de texte en tant que guillemet ouvrant pour les identificateurs qui contiennent des caractères spéciaux.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Caractère utilisé dans une commande de texte en tant que guillemet fermant pour les identificateurs qui contiennent des caractères spéciaux.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Le DataAdapter pour lequel générer automatiquement OleDbCommands</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Séparateur décimal utilisé dans les littéraux numériques.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>La chaîne de préfixe autour des objets sql</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>La chaîne de suffixe autour des objets sql</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>Le DataAdapter pour lequel générer automatiquement SqlCommands</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Séparateur décimal utilisé dans les littéraux numériques.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Caractère utilisé dans une commande de texte en tant que guillemet ouvrant pour les identificateurs qui contiennent des caractères spéciaux.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Caractère utilisé dans une commande de texte en tant que guillemet fermant pour les identificateurs qui contiennent des caractères spéciaux.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>Définition nécessaire uniquement pour les paramètres décimaux et numériques en cas d'utilisation avec les scénarios Prepare, FillSchema et CommandBuilder.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>Définition nécessaire uniquement pour les paramètres décimaux et numériques en cas d'utilisation avec les scénarios Prepare, FillSchema et CommandBuilder.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>Le type natif du paramètre.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>Le type natif du paramètre.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>Nom du paramètre, par exemple '@p1'</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>Le type natif du paramètre.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>Nom du serveur pour le type.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>Offset dans les types de données de longueur variable.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>Le ParameterDirection '{0}' spécifié pour le paramètre '{1}' n'est pas pris en charge. Les Table-valued parameters prennent uniquement en charge ParameterDirection.Input.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>TypeName spécifié pour le paramètre '{0}'. TypeName ne doit être défini que pour les paramètres Structured.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>Le type SqlDbType.Structured n'est pris en charge que pour plusieurs types avec valeur.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>La colonne DateType du champ '{0}' dans la table de schéma a la valeur null. Elle doit avoir une valeur autre que Null.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>Le nombre de champs de l'enregistrement '{0}' ne correspond pas au nombre de l'enregistrement d'origine.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>plage : 0-8 000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>Une erreur inattendue a été détectée chez le fournisseur de données SqlClient. {0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>Impossible d'obtenir les Type Info pour {0},{1}</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>Le fournisseur n'est pas parvenu à charger l'assembly suivant : {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>La propriété UdtTypeName doit être définie pour les paramètres UDT.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>Le type spécifié n'est pas inscrit sur le serveur cible. {0}.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>Les paramètres UDT ne sont pas autorisés dans la clause WHERE, sauf s'ils font partie de la clé primaire.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>'{0}' est un type défini par l'utilisateur non valide, raison : {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>prend en charge les formats en mémoire et ceux définis par l'utilisateur</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>Le format natif ne peut pas être pris en charge.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>n'implémente pas IBinarySerialize</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>non sérialisable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>aucun constructeur public</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>n'implémente pas INullable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>ne dispose d'aucun constructeur public</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>aucun attribut UDT</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>La sérialisation sans mappage n'est pas encore prise en charge.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>la méthode 'public static x Parse(System.Data.SqlTypes.SqlString)' est manquante</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>la méthode 'public override string ToString()' est manquante</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>la méthode 'public static x Null { get; }' est manquante</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>Le format natif ne prend pas en charge les champs (directement ou via un autre champ) de type '{0}'</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>Type non public</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Native UDT n'est pas une disposition séquentielle en raison du type '{0}'</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Native UDT spécifie une taille maximale, en byte</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>le champ '{0}' est marqué comme étant non sérialisé</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>Le type de champ « {0} » est marqué comme disposition explicite qui n’est pas autorisée dans le format natif</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>Plusieurs références d'assembly avec valeur doivent avoir un ID d'assembly non nul.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>Les types structurés à plusieurs valeurs ne peuvent être utilisés que pour les paramètres, et ne peuvent pas être imbriqués dans un autre type.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>Le nom du chemin d'accès n'est pas valide.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>Échec lors de la tentative de promotion de la transaction.</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>Objet de dépendance permettant de recevoir des notifications de requête.</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>Propriété permettant d'indiquer si cette dépendance est non valide.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>Permet d'ajouter une commande à un objet de dépendance existant.</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Command déjà associée à un autre objet de dépendance. Remplacement impossible.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>Cet objet SqlCommand est déjà associé à un autre objet SqlDependency.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>Le Timeout spécifié n'est pas valide. Il ne peut pas être &lt; 0.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>Erreur de notification. Type={0}, Info={1}, Source={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData n'est pas valide pour ce SqlDbType.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>Le dbType {0} n'est pas valide pour ce constructeur.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>Erreur interne. La valeur en texte en clair ne peut pas être null.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>Impossible d’effectuer le chiffrement. À l’issue du chiffrement, {0} octets de texte de chiffrement dépassent la limite maximale autorisée de {1} octets. La valeur en texte clair spécifiée est probablement trop grande (taille du texte en clair : {2} octets).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>Erreur interne. La valeur du texte de chiffrement ne peut pas être null.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>Les informations d'attestation n'ont pas été retournées par SQL Server. Le type d'enclave est '{0}' et l'URL d'attestation d'enclave est '{1}'.</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>Impossible d'établir un canal sécurisé. Message d'erreur : {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>Erreur interne. L'argument '{0}' de valeur Null spécifié durant la construction d'un objet de type '{1}' est vide. '{0}' ne peut pas avoir la valeur null.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Spécifie le point de terminaison d'un service d'attestation d'enclave pour vérifier si l'enclave, configurée dans l'instance SQL Server pour les calculs des colonnes de base de données chiffrées via Always Encrypted, est valide et sécurisée.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>Échec de lecture de la section de configuration des fournisseurs d'enclaves. Vérifiez que la section est correctement mise en forme dans le fichier de configuration de votre application. Message d'erreur : {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>Échec de l'instanciation d'un fournisseur d'enclave ayant le type '{1}' pour le nom '{0}'. Message d'erreur : {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>Erreur interne. SqlColumnEncryptionEnclaveProviderName ne peut pas avoir une valeur null ou être vide.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>Une erreur s'est produite lors de la lecture du jeu de résultats « {0} ». L'URL d'attestation n'a pas été spécifiée dans la chaîne de connexion, mais la requête nécessite des calculs d'enclave. Le type d'enclave est « {1} ». </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>Erreur interne. Le type d'enclave reçu de la part de SQL Server a une valeur null ou est vide durant l'exécution d'une requête qui nécessite des calculs d'enclave.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>L'exécution d'une requête nécessite des calculs d'enclave. Toutefois, il manque la section relative aux fournisseurs d'enclaves dans la configuration de l'application.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>Aucun fournisseur d'enclave pour le type d'enclave « {0} » et le protocole d'attestation « {1} ». Spécifiez le protocole d'attestation approprié dans la chaîne de connexion. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>Paramètre de chiffrement de colonne par défaut pour toutes les commandes sur la connexion.</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>Force le chiffrement du paramètre avant l’envoi de données sensibles vers le serveur. </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>Objet Dictionary contenant les noms SQL Server et leurs chemins d’accès de clé principale de colonne approuvés.</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>La connexion à une instance SQL Server en miroir à l'aide de l'option de connexion ApplicationIntent ReadOnly n'est pas prise en charge.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>Informations de routage inattendues reçues.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>Informations de routage non valides reçues.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>Authentification non prise en charge spécifiée dans ce contexte : {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>L'authentification interactive Active Directory a expiré. L'utilisateur a mis trop de temps à répondre à la demande d'authentification.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>Impossible d'utiliser « Authentication=Active Directory Interactive », si la propriété Credential a été définie.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>ID de processus serveur (SPID) de la connexion active.</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>L'authentification Active Directory Device Code Flow a expiré. L'utilisateur a mis trop de temps à répondre à la demande d'authentification.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>Impossible de définir la propriété Credential si « Authentication=Active Directory Device Code Flow » est spécifié dans la chaîne de connexion.</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>Seuls les tableaux unidimensionnels sont pris en charge pour l'action demandée.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>Impossible de supprimer l'élément spécifié, car il est introuvable dans la collection.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>Nombre non négatif obligatoire.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Impossible de définir la propriété AccessTokenCallback si 'Authentication=Active Directory Default' a été spécifié dans la chaîne de connexion.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} retourné {1}.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>Erreur de protocole : un message reçu contient une signature valide mais n’a pas été chiffré conformément au niveau de protection en application.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>{0} a échoué avec l’erreur : {1}</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>Cette méthode n’est pas implémentée par cette classe.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>Le package de sécurité demandé n’est pas pris en charge.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>Type physicalConnection incorrect.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>Une exception s’est produite lors de la tentative de définition du commutateur AppContext '{0}'={1}.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>Type {0} n’est pas pris en charge sur cette plateforme.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>Le mode invariant de la globalisation n’est pas pris en charge.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Authentification impossible à l’aide de Kerberos. Vérifiez que Kerberos a été initialisé sur le client avec « kinit » et qu’un nom de principal du service a été inscrit pour le SQL Server pour autoriser l’authentification Kerberos.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>La mot clé « Bibliothèque réseau » n’est pas prise en charge sur cette plateforme, préfixez la « Source de données » avec le protocole souhaité à la place (« tcp: » pour une connexion TCP ou « np: » pour une connexion de canal nommé).</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>Le socket n’a pas levé le '{0}' attendu avec le code d’erreur '{1}'.</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>Le serveur tente d’utiliser une fonctionnalité qui n’est pas prise en charge sur cette plateforme.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>Le mot-clé '{0}' n’est pas pris en charge sur cette plate-forme.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>Le fichier System.Transactions.dll actuellement chargé ne prend pas en charge les transactions globales.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>Réception d’un jeton non pris en charge '{0}' lors de la lecture des données du serveur.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>'{0}' n’est pas un type de handle pris en charge.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream n’est pas pris en charge sur cette plateforme.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>La Base de données locale n’est pas prise en charge sur cette plateforme.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>Espace de mémoire tampon insuffisant. Obligatoire : {0} réel : {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>Échec de l’opération GSSAPI avec le statut : {0} (statut mineur : {1}).</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>L’opération GSSAPI a échoué avec une erreur – {0} ({1}).</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>Aucune prise en charge de la liaison de canal sur les systèmes d’exploitation autres que Windows.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>Le nom cible ne doit pas être vide si les informations d’identification par défaut sont transmises.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>Le niveau de protection demandé n’est pas pris en charge avec l’implémentation GSSAPI actuellement installée.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>L’implémentation du serveur n’est pas prise en charge.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>L’authentification NTLM n’est pas possible avec les informations d’identification par défaut sur cette plateforme.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>Lorsqu’elle est utilisée par DataAdapter.Update, la valeur de paramètre DBNull.Value est remplacée par (Int32)1 ou par (Int32)0 si elle n’est pas null.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Taille maximale de la mémoire tampon dépassée : {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>DataColumn '{0}' manquant pour SourceColumn '{2}'.</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>La liste SqlBatchCommand n'a pas été initialisée.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 3b78cfd596..129310c5eb 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>Crescente</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Indice {0} non valido per {1} con Count={2}.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>{0} è già contenuto in un altro {1}.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>{0} è già contenuto in questo {1}.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0} accetta solo oggetti di tipo {1} non null.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>Tentativo di rimuovere un {0} non contenuto in {1}.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1} deve essere unico, '{2}' esiste già nella raccolta.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>La connessione non è stata chiusa. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>Tentativo non valido di chiamare {0} con reader chiuso.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>Impossibile inserire nella transazione, perché la connessione è la connessione primaria per una transazione delegata o promossa.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>Decrescente</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>Prevista stringa non vuota per il parametro "{0}".</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>La proprietà ConnectionString non è stata inizializzata.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>È stata rilevata Exception non CLS.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>L'elemento di sicurezza specificato non è un elemento di autorizzazione.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>Dati</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>Aggiornamento</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>ConnectionState indicante se la connessione è aperta o chiusa.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>Evento generato quando cambia lo stato della connessione.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>Il tipo generico del parametro.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>Parametro di input, di output o bidirezionale.</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>proprietà ora design utilizzata per generazione di codici fortemente marcata.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>Offset dei tipi di dati a lunghezza variabile.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>Nome del parametro.</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>Dimensione dei tipi di dati a lunghezza variabile (stringhe e matrici).</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>Se utilizzato da DataAdapter.Update, indica il nome della colonna di origine utilizzato per trovare il nome di DataSetColumn negli elementi ColumnMappings. Consente di copiare un valore tra il parametro e una riga di dati.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>Se utilizzato da DataAdapter.Update (solo UpdateCommand), indica la versione del valore DataRow utilizzato per aggiornare l'origine dati.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>Se utilizzato da un DataAdapter.Update, il valore del parametro viene modificato da DBNull.Value in (Int32)1 o (Int32)0 se diverso da null.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>Valore del parametro.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>Impossibile compilare la raccolta "{0}". Esecuzione della query SQL non riuscita. Per ulteriori informazioni, vedere l'eccezione interna.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>Sono state fornite più restrizioni di quante ne possa supportare lo schema richiesto ("{0}").</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>"{2}" non è un valore valido per la restrizione "{1}" della raccolta di schemi "{0}".</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>La raccolta richiesta ({0}) non è definita.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>La raccolta richiesta ({0}) non è supportata da questa versione del provider.</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>Manca una delle colonne obbligatorie della tabella DataSourceInformation.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>la tabella DataSourceInformation deve contenere esattamente una riga.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>Mancano una o più colonne obbligatorie della raccolta di restrizioni.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>Esiste una restrizione per la quale non c'è nessuna riga corrispondente nella raccolta di restrizioni.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>Dai metadati XML manca la raccolta "{0}".</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>I metadati XML non sono validi.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>I metadati XML non sono validi. La raccolta {0} deve contenere una colonna stringa {1}.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>I metadati XML non sono validi. La colonna {1} della raccolta {0} deve contenere una stringa non vuota.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>Azione</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>Comportamento</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>Riempimento</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>InfoMessage</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>Mapping</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>Notifica</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>Schema</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>Pooling</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>ConnectionString denominata</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>Sicurezza</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>Resilienza connessione</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>Raccolta che contiene le informazioni utente personalizzate.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>Indica se il confronto di stringhe all'interno del DataSet distingue tra maiuscole e minuscole.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>Nome di questo DataSet.</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>Indica una "vista" personalizzata dei dati contenuti nel DataSet. Tale vista consente di filtrare, eseguire ricerche ed esplorare all'interno della vista dei dati personalizzata.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>Indica se è necessario osservare regole di vincolo.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>Indica la presenza di errori nel DataSet.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>Indica le impostazioni locali in base a cui confrontare le stringhe all'interno del DataSet.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>Indica lo spazio dei nomi URI XML dell'elemento radice a cui si riferisce questo DataSet.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>Indica il prefisso dello spazio dei nomi utilizzato per questo DataSet.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>Raccolta che contiene le relazioni per questo DataSet.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>Raccolta che contiene le tabelle per questo DataSet.</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>Generato quando è impossibile unire gli schemi per due tabelle con lo stesso nome.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Avviene quando Initialization è completato.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>Rappresenta una cache di dati in memoria.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>Indica se il confronto di stringhe all'interno della tabella distingue tra maiuscole e minuscole.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>Restituisce le relazioni figlio per questa tabella.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>Raccolta che contiene le colonne per questa tabella.</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>Raccolta che contiene i vincoli per questa tabella.</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>Indica il DataSet a cui appartiene questa tabella.</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>DataView predefinito per la tabella.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>Espressione utilizzata per calcolare il valore con associazione a dati di questa riga.</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>Restituisce informazioni su eventuali errori della tabella.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>Indica le impostazioni locali in base a cui confrontare le stringhe all'interno della tabella.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>Indica una dimensione iniziale per questa tabella.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>Indica lo spazio dei nomi URI XML per gli elementi contenuti in questa tabella.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>Indica il prefisso dello spazio dei nomi utilizzato per questa tabella nella rappresentazione XML.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>Restituisce le relazioni padre per questa tabella.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>Indica una o più colonne che rappresentano la chiave primaria di questa tabella.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>Indica la raccolta che contiene le righe di dati di questa tabella.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>Indica il nome utilizzato per cercare questa tabella nella raccolta Tables di un DataSet.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>Generato in seguito alla modifica di una riga della tabella.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>Generato durante la modifica della riga affinché il gestore dell'evento possa cambiare o annullare la modifica. L'utente può modificare i valori della riga e deve generare un'eccezione per annullare la modifica.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>Generato in seguito all'eliminazione di una riga della tabella.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>Generato quando una riga della tabella viene contrassegnata per l'eliminazione. Generare un'eccezione per annullare l'eliminazione.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>Generato quando si propone un valore per questa colonna. L'utente può modificare il valore proposto e deve generare un eccezione per annullare la modifica.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>Generato quando si modifica un valore di questa colonna.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>Si verifica prima di eliminare tutte le righe dalla tabella.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>Si verifica dopo che tutte le righe nella tabella sono state eliminate correttamente.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>Si verifica dopo che è stata creata l'istanza di un nuovo DataRow.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>Nome utilizzato per cercare questa relazione nella raccolta Relations di un DataSet.</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>Indica le colonne figlio di questa relazione.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>Indica le colonne padre di questa relazione.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>Indica se le relazioni sono annidate.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>Indica il tipo di azioni a cascata associato a questa relazione per le eliminazioni.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>Indica il tipo di azioni a cascata associato a questa relazione per gli aggiornamenti.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>Indica il tipo di azioni a cascata associato a questa relazione per la conferma o l'annullamento delle modifiche.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>Indica le colonne figlio di questo vincolo.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>Indica le colonne padre di questo vincolo.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>Indica la tabella figlio del vincolo.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>Indica le colonne di questo vincolo.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>Indica se il vincolo è una chiave primaria.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>Indica il nome del vincolo.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>Indica la tabella del vincolo.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>Indica se sono consentiti valori null nella colonna.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>Indica se il valore della colonna viene incrementato automaticamente quando si aggiungono nuove righe alla tabella. La colonna deve essere di tipo Int16, Int32 o Int64.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>Indica il valore iniziale di una colonna AutoIncrement.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>Indica l'incremento utilizzato da una colonna AutoIncrement.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>Indica l'etichetta di interfaccia predefinita della colonna.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>Indica il nome usato per cercare questa colonna nella raccolta Columns di un oggetto DataTable.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>Restituisce la DataTable a cui appartiene questa colonna.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>Indica il tipo di dati memorizzati in questa colonna.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>Indica il valore predefinito che assume la colonna quando si aggiungono nuove righe alla tabella.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>Indica il valore che questa colonna calcola per ciascuna riga derivandolo dai valori di altre colonne invece di utilizzare l'input dell'utente.</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>Indica la modalità di persistenza di questa colonna nell'XML: attributo, elemento, nodo di contenuto semplice o nessuna.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>Indica l'URI XML per elementi o attributi archiviati in questa colonna.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>Indica Prefix utilizzato per questa DataColumn nella rappresentazione xml.</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Indica l'indice che identifica questa colonna nella raccolta Columns.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>Indica se questa colonna consente le modifiche dopo che è stata aggiunta una riga alla tabella.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>Indica se in questa colonna occorre impostare restrizioni sui valori contenuti nelle diverse righe della tabella affinché siano univoci.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>Indica la lunghezza massima del valore che può essere inserito in questa colonna. </value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>Indica il DateTimeMode di questa DataColumn.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>Indica se questo DataView e l'interfaccia utente ad esso associata consentono le eliminazioni.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>Indica se questo DataView e l'interfaccia utente ad esso associata consentono le modifiche.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>Indica se questo DataView e l'interfaccia utente ad esso associata consentono l'aggiunta di righe.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>Restituisce il numero di elementi presenti in questa vista.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>Restituisce un puntatore al DataViewManager proprietario del DataSet (se esiste).</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>Indica se la vista è aperta.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>Indica un'espressione utilizzata per filtrare i dati restituiti da questo DataView.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>Indica le versioni dei dati restituiti da questo DataView.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>Indica i nomi della colonna e l'ordine in cui vengono restituiti i dati da questo DataView.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Indica se utilizzare l'ordinamento predefinito, quando la proprietà Sort non è impostata.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>Indica la tabella da cui questo DataView recupera i dati.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>Indica che i dati restituiti da questo DataView hanno subito modifiche.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>Indica l'origine dati del DataViewManager.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>Indica le impostazioni di ordinamento/filtro/stato per le tabelle del DataSet corrispondente.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>Il DataSet non supporta 'union' e 'list' come simpleType.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>Sintassi {0} non valida: attributo richiesto '{1}' mancante.</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>Valore '{1}' non valido per l'attributo '{0}'.</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>Il valore dell'attributo '{0}' deve essere '{1}' o '{2}'.</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>Impossibile trovare ElementType name='{0}'.</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>Nome tabella padre mancante nella relazione '{0}'.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>Nome tabella figlio mancante nella relazione '{0}'.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>Chiave tabella padre mancante nella relazione '{0}'.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>Chiave tabella figlio mancante nella relazione '{0}'.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>Tipo di dati non definito: '{0}'.</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>Tipo di dati non definito.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>Selezione XPath non valida all'interno del nodo campo. Impossibile trovare {0}.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>Selezione XPath non valida all'interno del nodo selettore: {0}.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>Nodo 'Key' non valido all'interno del vincolo denominato {0}.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>Nome di vincolo {0} già utilizzato nello schema.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>Impossibile convertire "{0}" nel tipo "{1}".</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>Parte "{0}" mancante nel vincolo "{1}" denominato "{2}".</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>Definizione di Relation non valida: chiavi di lunghezza diversa.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>Il DataSet non consente il riferimento circolare nel ComplexType denominato '{0}'.</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet non è in grado di creare un'istanza di ComplexType astratto per il nodo {0}.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Errore del convertitore di più destinazioni durante la scrittura di un Xml Schema. Per dettagli, vedere l'eccezione interna.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Errore del convertitore di più destinazioni durante la scrittura di un Xml Schema. È stata restituita una stringa null o vuota.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>Dichiarazione '{0}' duplicata.</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>Impossibile caricare diffGram. Tabella "{0}" mancante nel DataSet di destinazione.</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>Impossibile caricare diffGram. Nodo 'sql' mancante.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>Nome di colonna '{0}' definito per diversi tipi di mapping.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>Prefisso '{0}' non valido perché contiene caratteri speciali.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>Riferimento circolare nella tabella autoannidata '{0}'.</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>Il DataSet non può espandere entità. Utilizzare XmlValidatingReader e impostare la proprietà EntityHandling in modo appropriato.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>Il tipo '{0}' non implementa l'interfaccia IXmlSerializable, pertanto non può procedere con la serializzazione.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>Non è possibile continuare con la deserializzazione. I dati non implementano IXMLSerializable, pertanto il polimorfismo non è supportato.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable non supporta l'inferenza di schema proveniente da Xml.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>Impossibile continuare la serializzazione di DataTable "{0}" poiché contiene un DataRow con più righe padre nello stesso Foreign Key.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>Attributo IsDataSet assente nello Schema input.</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>Non è possibile determinare l'elemento DataSet. L'attributo IsDataSet esiste più di una volta.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet non serializzerà i tipi che implementano IDynamicMetaObjectProvider ma che non implementano anche IXmlSerializable.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>Funzionalità non implementata. {0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>Errore di sintassi: operando mancante dopo l'operatore '{0}'.</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>Tipo non corrispondente nell'espressione '{0}'.</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>Espressione troppo complessa.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>Impossibile trovare la colonna [{0}].</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>L'espressione contiene una costante di stringa non valida: {0}.</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>L'espressione contiene una chiamata di funzione indefinita: {0}().</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>Errore di sintassi nell'espressione.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>Numero di argomenti non valido: funzione {0}().</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>Nell'espressione manca la parentesi di chiusura.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>Impossibile interpretare il token '{0}' nella posizione {1}.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>Previsto {0}. Il token nella posizione {2} è invece {1}.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>Non è possibile eseguire la conversione da {0} a {1}.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>Non è possibile convertire il valore '{0}' nel tipo {1}.</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>Nome di colonna non valido: [{0}].</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>L'espressione contiene una costante di data non valida: '{0}'.</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>Nell'elenco di espressioni per l'operatore IN è possibile specificare solo espressioni costanti.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Errore nell'operatore Like: modello di stringa '{0}' non valido.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>Errore di sintassi: le voci che seguono la parola chiave IN devono essere separate da virgole e racchiuse tra parentesi.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>Tipo non corrispondente nell'argomento della funzione: {0}(), argomento {1}, previsto {2}.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>Tipo non corrispondente nell'argomento della funzione: {0}(), argomento {1}, previsto uno dei tipi Integer.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>Impossibile eseguire l'operazione '{0}' su {1} e {2}.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>Operatore '{0}' ambiguo su operandi di tipo '{1}' e '{2}'. Impossibile combinare tipi con e senza segno. Utilizzare la funzione Convert() esplicita.</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>Errore di sintassi: la parola chiave IN deve essere seguita da un elenco non vuoto di espressioni separate da virgole e racchiuse tra parentesi.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>L'espressione contiene l'operatore non supportato '{0}'.</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>L'espressione contiene un nome non valido: '{0}'.</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>Errore di sintassi: operando mancante prima dell'operatore '{0}'.</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>L'espressione presenta troppe parentesi di chiusura.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>La tabella [{0}] è parte di più relazioni. Occorre specificare esplicitamente un nome di relazione nell'espressione '{1}'.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>Errore di sintassi nell'argomento di aggregazione: previsto un argomento a colonna singola con possibile qualificatore 'Child'.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>Riferimento non associato nell'espressione di aggregazione '{0}'.</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>Impossibile valutare un'espressione non costante senza riga corrente.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>Riferimento non associato nell'espressione '{0}'.</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>'{0}' non è un'espressione di aggregazione. Impossibile valutarla.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>L'espressione filtro '{0}' non restituisce un valore booleano.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>Nome di tipo non valido: '{0}'.</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>Errore di sintassi nell'espressione di ricerca: prevista la parola chiave 'Parent' seguita da un argomento che individua una sola colonna con possibile qualificatore di relazione: Parent[(&lt;nome_relazione&gt;)].&lt;nome_colonna&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>Per richiamare DataFilter occorre specificare una riga o una tabella.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>Argomento {0}() non compreso nell'intervallo.</value>
-  </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>Errore di sintassi: utilizzo non valido dell'operatore 'Is'. Sintassi corretta: &lt;espressione&gt; Is [Not] Null.</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>Offset e lunghezza eccedono i limiti della matrice oppure il conteggio è maggiore del numero di elementi presenti dall'indice alla fine della raccolta di origine.</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>Valore troppo grande o troppo piccolo per il tipo '{0}'.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>Non è possibile convertire oggetti di tipo '{0}' in oggetti di tipo '{1}'.</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>Errore di divisione per zero.</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>L'unico valore accettabile per la proprietà "{0}" è "{1}".</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>Impossibile trovare la relazione padre "{0}".</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>I valori accettabili per la proprietà "{0}" sono "{1}" oppure "{2}".</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>L'argomento 'hours' non è compreso nell'intervallo. Il valore deve essere compreso tra -14 e +14.</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>I valori specificati per QuotePrefix e QuoteSuffix non corrispondono.</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>L'argomento 'minutes' non è compreso nell'intervallo. Il valore deve essere compreso tra -59 e +59.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>La lunghezza dell'argomento '{0}' supera il limite di '{1}'.</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>L'intervallo fornito per l'ora supera il totale di 14 ore.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>Valore non valido per la chiave '{0}'.</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>La proprietà Kind dell'argomento DateTime fornito non corrisponde agli argomenti 'hours' e 'minutes'.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>L'utilizzo della chiave "{0}" richiede la presenza della chiave "{1}".</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>Un DataColumn di tipo '{0}' non supporta espressioni.</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>La lunghezza del valore per la chiave '{0}' supera il limite di '{1}'.</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>Impossibile attivare i vincoli. Una o più righe contengono valori che violano il vincolo non-null, unique o foreign-key.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>Parola chiave non supportata: '{0}'.</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>La raccolta stessa non è modificabile.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>Errore interno del provider di dati .NET Framework {0}.</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>Il nome '{0}' corrisponde ad almeno due nomi nell'oggetto Collection, ma con una diversa combinazione di maiuscole e minuscole.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}".</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>Il nome "{0}" corrisponde ad almeno due nomi nell'oggetto raccolta, ma con spazi dei nomi diversi.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}", uso incorretto delle virgolette.</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>Offset e lunghezza eccedono i limiti della matrice oppure il conteggio è maggiore del numero di elementi presenti dall'indice alla fine della raccolta di origine.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}", il limite corrente di "{2}" è insufficiente.</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>Argomento '{0}' non compreso nell'intervallo.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>SqlBulkCopy.WriteToServer non riuscito perché SqlBulkCopy.DestinationTableName è un nome a più parti non valido</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>L'argomento '{0}' non può essere null.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>Elaborazione dei risultati da SQL Server fallita a causa di un nome a più parti non valido</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>L'argomento "{0}" contiene un valore null.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName è un nome a più parti non valido</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>Impossibile trovare la colonna {0}.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName è un nome a più parti non valido</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>La colonna '{0}' appartiene già a questa DataTable.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>SqlCommand.DeriveParameters fallito perché il valore di proprietà SqlCommand.CommandText è un nome a più parti non valido</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>La colonna '{0}' appartiene già a un'altra DataTable.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>La connessione a un'istanza di SQL Server con mirroring utilizzando l'opzione di connessione MultiSubnetFailover non è supportata.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>Impossibile avere più di una colonna SimpleContent in una DataTable.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>Il valore {1} dell'enumerazione {0} non è supportato dal metodo {2}.</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>Impossibile aggiungere una colonna SimpleContent a una tabella contenente colonne di elementi o relazioni annidate.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>Il valore di enumerazione di {0}, {1}, non è supportato dal provider di dati .NET Framework SqlClient.</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>Una colonna denominata '{0}' appartiene già a questa DataTable.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: la proprietà CommandText non è stata inizializzata</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>Impossibile aggiungere colonna con nome '{0}': una tabella annidata con lo stesso nome appartiene già alla DataTable corrente.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: la proprietà Connection non è stata inizializzata.</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>Una colonna con nome '{0}' appartiene già alla DataTable corrente. Impossibile impostare una tabella annidata con lo stesso nome.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} richiede una oggetto Connection aperto e disponibile. {1}</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>Impossibile rimuovere una colonna che non appartiene a questa tabella.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>Stored procedure '{0}' inesistente.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>Impossibile rimuovere questa colonna, perché è parte della chiave primaria.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>La transazione non è associata alla connessione corrente oppure è stata completata.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>Impossibile rimuovere questa colonna, perché è parte della chiave padre della relazione {0}.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>La transazione associata alla connessione corrente è stata completata, ma non è stata eliminata. Per poter utilizzare la connessione per eseguire istruzioni SQL, è necessario eliminare la transazione.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>Impossibile rimuovere questa colonna, perché è una parte del vincolo {0} imposto sulla tabella {1}.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>{0} richiede che il comando abbia una transazione quando la connessione assegnata al comando è in una transazione locale in sospeso. La proprietà Transaction del comando non è stata inizializzata.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>Impossibile rimuovere questa colonna, perché è parte di un'espressione: {0} = {1}.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>A {0} è già associato un DataReader aperto, che deve prima essere chiuso.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>Impossibile impostare la proprietà AutoIncrement per una colonna calcolata.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>DeriveParameters {0} supporta solo CommandType.StoredProcedure, non CommandType.{1}.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>Impossibile impostare la proprietà AutoIncrement per una colonna con DefaultValue impostato.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>Impossibile impostare DefaultValue su una colonna AutoIncrement.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>Il valore di AutoIncrementStep deve essere diverso da zero.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>Quando è parte di DataTable, ColumnName è obbligatorio.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>Impossibile modificare il DataType di una colonna contenente dati.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>La colonna richiede un DataType valido.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>Il DefaultValue della colonna {0} è di tipo {1} e non può essere convertito in {2}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>Il DefaultValue della colonna è di tipo {0} e non può essere convertito in {1}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>Il DefaultValue della colonna {0} è di tipo {1}, ma la colonna è di tipo {2}.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>Impossibile modificare la proprietà ReadOnly della colonna espressioni.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>Impossibile modificare la proprietà Unique della colonna espressioni.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>Impossibile impostare la proprietà Expression di una colonna con AutoIncrement o Unique.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>Impossibile impostare la proprietà Expression, perché la colonna non può essere impostata su ReadOnly.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>Impossibile impostare la proprietà Expression sulla colonna {0}, perché è parte di un vincolo.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>Impossibile creare un vincolo basato sulla colonna Expression {0}.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>Impossibile impostare la proprietà Expression, perché contiene riferimenti circolari.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>La colonna '{0}' contiene valori null.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>La colonna '{0}' non accetta valori nulls.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>La colonna '{0}' è di sola lettura.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>Column '{0}' contiene valori non univoci.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>La colonna '{0}' non appartiene alla tabella {1}.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>La colonna deve appartenere a una tabella.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>Impossibile archiviare &lt;{0}&gt; nella colonna {1}. Il tipo previsto è {2}.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>Impossibile impostare Column '{0}' come null. Utilizzare invece DBNull.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>Impossibile impostare la colonna "{0}". Il valore viola il limite MaxLength della colonna.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength è applicabile solo ai dati di tipo stringa. Non è possibile impostare la proprietà MaxLength di Column '{0}' come numero non negativo.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>Impossibile impostare su '{1}' la proprietà MaxLength di Column '{0}'. La tabella contiene almeno una stringa di lunghezza superiore al nuovo limite.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Impossibile impostare la proprietà MaxLength di Column '{0}'. Column è SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>Impossibile impostare su {1} la proprietà DataType di Column '{0}'. Column è SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>Impossibile impostare su SimpleContent la proprietà MappingType della colonna '{0}'. DataType di Column è {1}.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>Column '{0}' supera il limite MaxLength.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>DBNull.Value non consentito per la colonna '{0}'.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>Impossibile modificare la proprietà Namespace di Column '{0}'. Column è SimpleContent.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>Impossibile modificare con il tipo "{0}" la proprietà AutoIncrement di una DataColumn contenente dati.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>La colonna "{0}" non appartiene alla tabella sottostante "{1}".</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>La DataColumn con il tipo "{0}" è una complexType. Impossibile serializzare il valore di un tipo complex come Attribute</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>La proprietà DateTimeMode può essere impostata solo su DataColumns di tipo DateTime.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>"{0}" è un valore di DataSetDateTime non valido.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>Impossibile modificare la proprietà DateTimeMode da '{0}' a '{1}' di una colonna contenente dati.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Type "{0}" non contiene proprietà o campi Null statici.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>Il tipo "{0}" non implementa IRevertibleChangeTracking, pertanto non può procedere con RejectChanges().</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>È possibile chiamare SetAdded e SetModified sui DataRows con DataRowState Unchanged.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>L'ordinale '{0}' supera il numero massimo.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet non supporta System.Nullable&lt;&gt;.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>Impossibile modificare in una stringa vuota il nome di un vincolo contenuto in ConstraintCollection.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>Impossibile imporre vincoli sul vincolo {0}.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>La colonna '{0}' deve contenere valori univoci. Il valore '{1}' è già presente.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>Il vincolo '{0}' non appartiene a questa DataTable.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>Impossibile trovare il vincolo {0}.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>Il vincolo corrisponde al vincolo {0} già presente nella raccolta.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>Un Constraint denominato '{0}' appartiene già a questo DataTable.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>Queste colonne non contengono valori univoci.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>Queste colonne non puntano a questa tabella.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>Impossibile attivare questo vincolo. Non tutti i valori hanno valori padre corrispondenti.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>Impossibile aggiungere il vincolo, perché ForeignKey non appartiene alla tabella {0}.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>Impossibile rimuovere un vincolo che non appartiene a questa tabella.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>Non è possibile rimuovere il vincolo univoco '{0}'. Rimuovere prima il vincolo '{1}' della chiave esterna.</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>Impossibile rimuovere questa colonna. I vincoli imposti sulla relazione {0} comporterebbero ripercussioni sulle righe figlio.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>Impossibile effettuare questa modifica. I vincoli imposti sulla relazione {0} comporterebbero ripercussioni sulle righe figlio.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>Impossibile cancellare la tabella {0}. I vincoli imposti da ForeignKeyConstraint {1} comporterebbero ripercussioni sulle righe figlio in {2}.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>ForeignKeyConstraint {0} richiede l'esistenza dei valori delle chiavi figlio ({1}) nella tabella padre.</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>Proprietà non accessibile. '{0}'.</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>Questa riga ha righe figlio. Impossibile rimuoverla per l'esistenza di vincoli sulla relazione {0}.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>Impossibile aggiungere vincoli per la chiave primaria, perché la chiave primaria è già impostata per la tabella.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>Impossibile aggiungere un vincolo a DataTable '{0}' che è una tabella figlia con due relazioni annidate.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>Impossibile creare una chiave da colonne appartenenti a tabelle diverse.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>Impossibile avere 0 colonne.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>Impossibile avere più di {0} colonne.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>Impossibile creare una chiave quando la stessa colonna è elencata più di una volta: '{0}'</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>Impossibile rimuovere il vincolo univoco perché è la chiave primaria di una tabella.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>Impossibile rimuovere il vincolo univoco perché è la chiave primaria della tabella {0}.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>Le colonne padre e le colonne figlio presentano tabelle di tipo non corrispondente.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey e ChildKey sono identiche.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>La lunghezza di ParentColumns e ChildColumns deve essere uguale.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>La lunghezza di ParentColumns e ChildColumns deve essere diversa da zero.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>La riga non appartiene allo stesso DataSet di questa relazione.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>RelationName è richiesto quando è parte di un DataSet.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows richiede una riga il cui oggetto Table sia {0}. L'oggetto Table della riga specificata è invece {1}.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>Per poter essere aggiunta a questo DataSet, la relazione deve connettere due tabelle del DataSet.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRow richiede una riga la cui tabella sia {0}. La tabella della riga specificata è invece {1}.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow richiede una riga figlio la cui tabella sia {0}. La tabella della riga specificata è invece {1}.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>Impossibile avere una relazione tra tabelle di DataSet diversi.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>Impossibile creare una relazione tra tabelle di DataSet diversi.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>Esiste già una relazione per queste colonne figlio.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>Questa relazione non appartiene a questa raccolta di relazioni.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>La relazione appartiene già a un DataSet diverso.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>La relazione appartiene già a questo DataSet.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>Un oggetto Relation denominato '{0}' appartiene già a questo DataSet.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>L'oggetto Relation {0} non appartiene a questo DataSet.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>Impossibile trovare la relazione {0}.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>Impossibile creare una raccolta su una tabella null.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>La tabella le cui relazioni sono visualizzate da questa raccolta è stata rimossa dal relativo DataSet.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>Impossibile aggiungere una relazione alla raccolta ParentRelation di questa tabella se non è la tabella figlio.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>Impossibile aggiungere una relazione alla raccolta ChildRelation della tabella se non è la tabella padre.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>Impossibile impostare la proprietà 'Nested' su false per questa relazione.</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>La stessa tabella '{0}' non può essere la tabella figlia in due relazioni annidate.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>La tabella ({0}) non può essere figlia di se stessa nelle relazioni annidate.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>Impossibile aggiungere DataRelation o Constraint con impostazioni Locale o CaseSensitive delle tabelle padre diverse da quelle delle tabelle figlio.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>Impossibile creare una DataRelation se non sono presenti colonne padre o figlio in un DataSet.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>La tabella annidata "{0}" che eredita il proprio spazio dei nomi non può avere più tabelle padre in spazi dei nomi differenti.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>La tabella annidata '{0}' con spazio dei nomi vuoto non può avere più tabelle padre in spazi dei nomi diversi.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>La riga non appartiene allo stesso DataSet di questa relazione.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>Impossibile eseguire questa operazione su una riga non presente nella tabella.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>Questa relazione e la riga figlio non appartengono allo stesso DataSet.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>Impossibile modificare un valore proposto nell'evento RowChanging.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>Impossibile chiamare EndEdit() dall'interno di un evento OnRowChanging.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>Impossibile chiamare BeginEdit() dall'interno dell'evento RowChanging.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>Impossibile chiamare CancelEdit() dall'interno di un evento OnRowChanging. Generare exception per annullare questo aggiornamento.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>Impossibile chiamare Delete dall'interno di un evento OnRowDeleting. Generare exception per annullare questa eliminazione.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>La matrice di input è più lunga del numero di colonne di questa tabella.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>Nessun dato corrente a cui accedere.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>Nessun dato originale a cui accedere.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>Nessun dato proposto a cui accedere.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>Questa riga è stata rimossa da una tabella e non contiene alcun dato. BeginEdit() consentirà di inserirvi nuovi dati.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>Impossibile accedere alle informazioni sulla riga eliminata tramite la riga.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>Version deve essere Original, Current o Proposed.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>Nessuna riga alla posizione {0}.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>La posizione di inserimento della riga, {0}, non è valida.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>Il valore {0} di rowOrder per la tabella denominata '{1}' è stato rilevato due volte.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>Valori mancanti nella sequenza rowOrder della tabella '{0}'.</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>Il DataRow specificato non si trova nel DataRowCollection corrente.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>La riga appartiene già a un'altra tabella.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>La riga appartiene già a questa tabella.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>La riga è già stata eliminata. Impossibile eliminarla di nuovo.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>Riga vuota.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>Impossibile rimuovere una riga già rimossa.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>Una riga figlio ha più padri.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>Modello di bit dello stato della riga non riconosciuto.</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>Impossibile modificare il nome del DataSet in una stringa vuota.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>Il nome '{0}' non è valido. Il nome di un DataSet non può essere uguale a quello del DataTable.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>Spazio dei nomi dello schema non valido. Utilizzare {0}.</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>Impossibile modificare la proprietà CaseSensitive o Locale. In seguito alla modifica, almeno un DataRelation o Constraint avrebbe impostazioni Locale o CaseSensitive diverse da quelle delle tabelle correlate.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>La proprietà SchemaSerializationMode può essere impostata soltanto se ignorata dal DataSet derivato.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>Le colonne PrimaryKey non appartengono a questa tabella.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>Impossibile aggiungere una relazione annidata o una colonna di elementi a una tabella contenente una colonna SimpleContent.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>TableName è obbligatorio quando è parte di un DataSet.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable dispone già di una colonna di contenuto semplice.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>La tabella non ha una chiave primaria.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} non è una stringa Sort valida.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>Impossibile serializzare il DataTable. Un DataTable utilizzato in una o più espressioni DataColumn non è un discendente della DataTable corrente.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>È possibile rimuovere questa DataTable solo come parte di DataSet. Una o più colonne Expression hanno riferimenti ad altre DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>Impossibile avere valori differenti della proprietà di formattazione remota per DataSet e DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>Impossibile serializzare la DataTable. Nome di DataTable non impostato.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>Un DataTable di nome '{0}' appartiene già a questo DataSet.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>Una DataTable denominata "{0}" con lo stesso Namespace "{1}" appartiene già a questo DataSet.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>La tabella ({0}) non può essere figlia di se stessa in una relazione annidata: il nome del DataSet è in conflitto con quello della tabella.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>Il nome '{0}' non è valido. Il nome di un DataTable non può essere uguale a quello del DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable già appartenente a un DataSet diverso.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable già appartenente a questo DataSet.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>La tabella {0} non appartiene a questo DataSet.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>Impossibile trovare la tabella {0}.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>Impossibile rimuovere una tabella con relazioni. Rimuovere prima le relazioni.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>Impossibile rimuovere la tabella {0} perché esiste un riferimento ad essa in ForeignKeyConstraint {1}. Impossibile rimuovere la tabella senza prima rimuovere il vincolo.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>La DataTable "{0}" non corrisponde ad alcuna DataTable nell'origine.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>Nel DataSet di destinazione manca la definizione per {0}.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>Nel DataSet di destinazione manca {0} {1}.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>Conflitto tra le proprietà &lt;target&gt;.{0} e &lt;source&gt;.{0} : proprietà DataType non corrispondente.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey e &lt;source&gt;.PrimaryKey hanno Length differenti.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>Errata corrispondenza di colonne nella chiave PrimaryKey tra &lt;target&gt;.{0} e &lt;source&gt;.{1}.</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>Non è possibile unire la relazione {0} perché le chiavi hanno colonne non corrispondenti.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>Nella tabella di destinazione {0} manca la definizione per la colonna {1}.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>La colonna PrimaryKey {0} non esiste nella tabella di origine.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>Il parametro RowStates deve essere impostato su una combinazione valida di valori appartenenti all'enumerazione DataViewRowState.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>La funzione Trova individua una riga in base a un criterio di ordinamento, ma non ne è stato specificato nessuno.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>Previsto il valore {0} per la chiave che si sta indicizzando. Ricevuto valore {1}.</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>Utilizzo non valido della funzione {0}() e del tipo di aggregazione: {1}.</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>Tipo di archiviazione non valido: {0}.</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>La persistenza DataSet Xml non supporta il valore '{0}' come Char. Utilizzare un archivio Byte.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>Il tipo di valore non è conforme al tipo di colonna</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>Il tipo "{0}" non implementa l'interfaccia IComparable. Impossibile eseguire il confronto.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>Impossibile impostare {0}.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>Impossibile modificare DataSet su un DataViewManager che è già la vista predefinita di un DataSet.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter non può mostrare ModifiedOriginals e ModifiedCurrents contemporaneamente.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>Impossibile modificare la proprietà Table su un DefaultView o un DataView di un DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>Impossibile modificare la proprietà DataSet dopo che è stata impostata.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>DataSet deve essere impostata prima dell'utilizzo di DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>Impossibile modificare la proprietà Table dopo che è stata impostata.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>DataTable deve essere impostata prima dell'utilizzo di DataView.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>Impossibile eseguire l'associazione a DataTable senza nome.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>Impossibile impostare un oggetto in questo elenco.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>Impossibile chiamare AddNew su un DataView in cui AllowNew è false.</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView non aperto.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>La relazione non interessa la tabella a cui fa riferimento questo DataView.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>Impossibile effettuare un'eliminazione su un DataSource in cui AllowDelete è false.</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>Impossibile effettuare una modifica su un DataSource in cui AllowEdit è false.</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>L'indice {0} è negativo oppure superiore al totale delle righe.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>Impossibile aggiungere oggetti esterni all'elenco.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>Impossibile cancellare questo elenco.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>Impossibile inserire oggetti esterni nell'elenco.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>Impossibile rimuovere oggetti non presenti nell'elenco.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} non è né una DataColumn, né una DataRelation per la tabella {1}.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>Min ({0}) deve essere minore o uguale a max ({1}) in un oggetto Range.</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>Intervallo null.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>MinimumCapacity non può essere negativa.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>Impossibile generare l'identificatore per il nome '{0}'.</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>Ci sono più tabelle con lo stesso nome "{0}" (anche se lo spazio dei nomi è diverso).</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>Colonna '{0}': il tipo '{1}' non può essere null.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>Colonna '{0}': il tipo '{1}' non ha costruttore senza parametri.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>Colonna '{0}': il tipo '{1}' non ha costruttore con argomento stringa.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>Non è possibile convertire oggetti di tipo '{0}' in oggetti di tipo '{1}'.</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>Righe eliminate inaccessibili.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>Nome duplicato non consentito.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>Operazione non supportata nell'evento RowChanging.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>Vincolo non valido.</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>Chiave primaria mancante.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Valore Null non consentito.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>La colonna è di sola lettura.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>Riga non trovata nella tabella.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>Versione non trovata.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>ReadOnly Data è Modified.</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader non valido per la DataTable "{0}" corrente.</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>Lo schema della DataTable "{0}" corrente in DataTableReader è cambiato. DataTableReader non è valido.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>Impossibile creare DataTableReader. Nessuna DataTable presente nel DataSet.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>Impossibile creare DataTableReader. L'argomento è vuoto.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>Impossibile creare DataTableReader. Gli argomenti contengono valori null.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>Lo stato della raccolta DataRow corrente è Deleted o Detached.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>DataTable "{0}" corrente vuota. Nessun DataRow presente in DataTable.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>Indice interno di DataTable corrotto: "{0}".</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>La raccolta è stata modificata; impossibile eseguire l'operazione di enumerazione.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>Il tipo semplice '{0}' è già stato dichiarato con un elemento '{1}' diverso.</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>Foliazione non valida.</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>Impossibile modificare il nome della tabella una volta che il DataSet associato è stato mappato a un documento XML caricato.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>Impossibile modificare lo spazio dei nomi della tabella una volta che il DataSet associato è stato mappato a un documento XML caricato.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>Impossibile modificare il nome della colonna dopo che il DataSet associato è stato mappato a un documento XML caricato.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>Impossibile modificare lo spazio dei nomi della colonna dopo che il DataSet associato è stato mappato a un documento XML caricato.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>Impossibile modificare la proprietà ColumnMapping dopo che il DataSet associato è stato mappato su un documento XML.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>Impossibile aggiungere o rimuovere colonne dalla tabella dopo che il DataSet è stato mappato a un documento XML caricato.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>Impossibile aggiungere o rimuovere tabelle dal DataSet dopo che è stato mappato a un documento XML caricato.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>Impossibile aggiungere, rimuovere o modificare le relazioni Nested del DataSet dopo che questo è stato mappato a un documento XML caricato.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>Parametro di DataSet non valido. Non può essere null.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>Impossibile modificare il nome del DataSet dopo che questo è stato mappato a un documento XML caricato.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>Impossibile duplicare questo tipo di nodo: {0}.</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>Impossibile caricare XmlDataDocument se contiene già dati. Utilizzare una nuova classe XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>Non è possibile associare un DataSet a più di un XmlDataDocument. Non è possibile associare il DataSet al XmlDataDocument corrente perché è già associato a un altro XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>Impostare DataSet.EnforceConstraints == false prima di tentare di modificare XmlDataDocument mediante operazioni XML.</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>GetElementById() non supportato su DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>Impossibile creare riferimenti a entità su DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>La funzione Clear in DateSet e DataTable non è supportata da XmlDataDocument.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>Impossibile rimuovere una colonna incorporata nel dataSet.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>Non è possibile rimuovere la relazione perché è incorporata in questo set di dati.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>Generato quando una proprietà di questo controllo cambia.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Generato quando si modifica l'appartenenza a questa raccolta.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>Impossibile ottenere il valore perché è DBNull.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>La proprietà '{0}' richiede Microsoft WindowsNT o un altro sistema operativo basato su WindowsNT.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>Non è possibile trovare il provider di dati .NET Framework richiesto. Potrebbe non essere installato.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>L'implementazione richiesta del provider di dati .NET Framework non possiede un campo Istanza di un tipo derivato System.Data.Common.DbProviderFactory.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>Non è stato possibile trovare o caricare il provider di dati .NET Framework registrato.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>È richiesto il nome qualificato dall'assembly del provider di dati .NET Framework mancante.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>Solo gli elementi consentiti.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>Nodi figlio non consentiti.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>Attributo "{0}" non riconosciuto.</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>Elemento non riconosciuto.</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>La sezione '{0}' può essere presente una sola volta in ogni file di configurazione.</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>L'attributo obbligatorio '{0}' non è stato trovato.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>L'attributo obbligatorio "{0}" non può essere vuoto.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>Prevista matrice non vuota per il parametro "{0}".</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>L'unico valore accettabile per la proprietà "{0}" è "{1}".</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>I valori accettabili per la proprietà "{0}" sono "{1}" oppure "{2}".</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>I valori specificati per QuotePrefix e QuoteSuffix non corrispondono.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>La lunghezza dell'argomento '{0}' supera il limite di '{1}'.</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>Previsto un argomento di tipo {1}. Ricevuto tipo {0}.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>Valore non valido per la chiave '{0}'.</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>L'utilizzo della chiave "{0}" richiede la presenza della chiave "{1}".</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>La lunghezza del valore per la chiave '{0}' supera il limite di '{1}'.</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>Parola chiave non supportata: '{0}'.</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>Impossibile caricare il file UDL.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>File UDL non valido.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>Errore interno del provider di dati .NET Framework {0}.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>Impossibile modificare le proprietà QuotePrefix e QuoteSuffix dopo la generazione di un comando Insert, Update o Delete.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>È necessario inizializzare la proprietà DataAdapter.SelectCommand.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>La proprietà DataAdapter.SelectCommand.Connection deve essere inizializzata.</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}".</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}", uso incorretto delle virgolette.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}", il limite corrente di "{2}" è insufficiente.</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>SqlBulkCopy.WriteToServer non riuscito perché SqlBulkCopy.DestinationTableName è un nome a più parti non valido</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>Elaborazione dei risultati da SQL Server fallita a causa di un nome a più parti non valido</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName è un nome a più parti non valido</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName è un nome a più parti non valido</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>SqlCommand.DeriveParameters fallito perché il valore di proprietà SqlCommand.CommandText è un nome a più parti non valido</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>OdbcCommandBuilder.DeriveParameters fallito perché il valore di proprietà OdbcCommand.CommandText è un nome a più parti non valido</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>OleDbCommandBuilder.DeriveParameters fallito perché il valore di proprietà OleDbCommandBuilder.CommandText è un nome a più parti non valido</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>La connessione a un'istanza di SQL Server con mirroring utilizzando l'opzione di connessione MultiSubnetFailover non è supportata.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>Impossibile eseguire il mapping dalla SourceColumn '{0}' perché la DataColumn '{1}' è una colonna calcolata.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>Impossibile eseguire la conversione. Il tipo della proprietà SourceColumn "{0}" di {1} non corrisponde a quello della proprietà DataColumn "{2}" di {3}.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>DataColumn '{0}' mancante nella DataTable '{1}' per la SourceColumn '{2}'.</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>SourceColumn deve essere una stringa non vuota.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>Mapping di SourceColumn mancante per '{0}'.</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Il valore {1} dell'enumerazione {0} non è supportato dal metodo {2}.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Il valore di enumerazione di {0}, {1}, non è supportato dal provider di dati .NET Framework Odbc.</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Il valore di enumerazione di {0}, {1}, non è supportato dal provider di dati .NET Framework OleDb.</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Il valore di enumerazione di {0}, {1}, non è supportato dal provider di dati .NET Framework SqlClient.</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>Impossibile recuperare ComputerNameDnsFullyQualified, {0}.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>DataTable '{0}' mancante per la SourceTable '{1}'.</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>SourceTable deve essere una stringa non vuota.</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>Mapping di SourceTable mancante: '{0}'</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: la proprietà CommandText non è stata inizializzata</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: la proprietà Connection non è stata inizializzata.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} richiede una oggetto Connection aperto e disponibile. {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: la proprietà SelectCommand.Connection non è stata inizializzata.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: la proprietà SelectCommand.Connection non è stata inizializzata.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: la proprietà SelectCommand.Connection non è stata inizializzata.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>Update richiede che InsertCommand abbia un oggetto connessione. La proprietà Connection di InsertCommand non è stata inizializzata.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>Update richiede che UpdateCommand abbia un oggetto connessione. La proprietà Connection di UpdateCommand non è stata inizializzata.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>Update richiede che DeleteCommand abbia un oggetto connessione. La proprietà Connection di DeleteCommand non è stata inizializzata.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>Update richiede un oggetto connessione. La proprietà Connection non è stata inizializzata.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>Update richiede che il duplicato di comando abbia un oggetto connessione. La proprietà Connection del duplicato di comando non è stata inizializzata.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>L'aggiornamento richiede una connessione.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Update richiede che {0}Command abbia un oggetto Connection aperto. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Update richiede che {0}Command abbia un oggetto Connection aperto. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Update richiede che {0}Command abbia un oggetto Connection aperto. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Update richiede che il comando di aggiornamento abbia un oggetto Connection aperto. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>Stored procedure '{0}' inesistente.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>La transazione assegnata a questo comando deve essere la transazione locale in sospeso più annidata.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>La transazione non è associata alla connessione corrente oppure è stata completata.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>La transazione associata alla connessione corrente è stata completata, ma non è stata eliminata. Per poter utilizzare la connessione per eseguire istruzioni SQL, è necessario eliminare la transazione.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>{0} richiede che il comando abbia una transazione quando la connessione assegnata al comando è in una transazione locale in sospeso. La proprietà Transaction del comando non è stata inizializzata.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>Al comando è già associato un SqlResultSet aperto, che deve essere chiuso.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>A {0} è già associato un DataReader aperto, che deve prima essere chiuso.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>DeriveParameters {0} supporta solo CommandType.StoredProcedure, non CommandType.{1}.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>Impossibile chiamare il metodo "{0}" più di una volta per la stessa esecuzione.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>Risultato asincrono non corretto.</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>Proprietà SelectCommand non inizializzata prima della chiamata a '{0}'.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>StatementType {0} non previsto in questo contesto.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: prevista stringa non vuota per il nome di SourceTable.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>Valore di MaxRecords non valido: {0}. Il valore deve essere &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>Valore di StartRecord non valido: {0}. Il valore deve essere &gt;= 0.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: prevista stringa non vuota per il nome di SourceTable.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>Le colonne del capitolo gerarchico devono essere mappate su una DataColumn AutoIncrement.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) ha restituito il valore null.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>Specificare soltanto un elemento nella matrice dataTables quando si utilizzano valori diversi da zero per startRecords o maxRecords.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Update non è in grado di trovare TableMapping['{0}'] o DataTable '{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update: previsto un nome SourceTable non vuoto.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>TableMapping mancante per TableMapping.DataSetTable='{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Update richiede che il duplicato di comando sia valido.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>La generazione SQL automatica durante un Update richiede un SelectCommand valido.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Update richiede un InsertCommand valido se la raccolta DataRow viene passata con righe nuove.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>Update richiede un UpdateCommand valido se la raccolta DataRow viene passata con righe modificate.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Update richiede un DeleteCommand valido se la raccolta DataRow viene passata con righe eliminate.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}] proviene da un DataTable diverso da DataRow[0].</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>Errori in RowUpdatedEvent. Nessuna informazione aggiuntiva disponibile.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>Errori in RowUpdatingEvent. Nessuna informazione aggiuntiva disponibile.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>Durante l'esecuzione di batch, il valore UpdateRowSource.FirstReturnedRecord oppure UpdateRowSource.Both della proprietà UpdatedRowSource del comando non è valido.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>Violazione di concorrenza: UpdateCommand ha modificato {0} dei {1} record previsti.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>Violazione di concorrenza: DeleteCommand ha modificato {0} dei {1} record previsti.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>Violazione di concorrenza: il comando in batch ha modificato {0} dei {1} record previsti.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>Impossibile chiamare il metodo "{0}" più di una volta per la stessa esecuzione.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>Valore di CommandTimeout non valido: {0}. Il valore deve essere &gt;= 0.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: la proprietà Size ha una dimensione 0 non valida.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>Il metodo {0}.Prepare richiede l'impostazione esplicita del tipo per tutti i parametri.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>Il metodo {0}.Prepare richiede l'impostazione esplicita di Size diversa da zero per tutti i parametri di lunghezza variabile.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>Il metodo {0}.Prepare richiede l'impostazione esplicita di Scale e Precision per i parametri di tipo '{1}'.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>Chiamata non corrispondente al metodo di fine per asyncResult. Era prevista una chiamata a {0} ma è stato chiamato {1}.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>Operazione non valida. La connessione è chiusa.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>La connessione è stata disattivata</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>Impossibile inserire la transazione nell'elenco. È in corso una transazione locale sulla connessione. Terminare la transazione locale e riprovare.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>La connessione ha una transazione correntemente inserita nell'elenco. Completare la transazione corrente e riprovare.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>Database non può essere null, una stringa vuota o una stringa di soli spazi.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>L'argomento è troppo lungo.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Valore di 'Connect Timeout' non valido. Il valore deve essere un integer &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>Offset buffer di origine (dimensione {0}) non valido: {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>Offset buffer di destinazione (dimensione {0}) non valido: {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>Il valore numerico non è contenibile in un numero decimale a 96 bit.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>Tentativo non valido di {0} con flusso chiuso.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>Il valore specificato per SeekOrigin non è valido.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>Generazione SQL dinamica non supportata per più tabelle di base.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>Generazione SQL dinamica non supportata per un SelectCommand che non restituisce informazioni di tabelle di base.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>Generazione SQL dinamica per DeleteCommand non supportata per un SelectCommand che non restituisce informazioni di colonne chiave.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>Generazione SQL dinamica per UpdateCommand non supportata per un SelectCommand che non restituisce informazioni di colonne chiave.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>Generazione SQL dinamica per DeleteCommand non supportata per un SelectCommand che non contiene una colonna con versione a righe.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>Generazione SQL dinamica per UpdateCommand non supportata per un SelectCommand che non contiene una colonna con versione a righe.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>Generazione SQL dinamica non supportata per nomi di tabella "{0}" che contengono il carattere "{1}" nella proprietà QuotePrefix o QuoteSuffix.</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>Tentativo non valido di leggere dall'ordinale di colonna "{0}". Con CommandBehavior.SequentialAccess è possibile leggere solo a partire dall'ordinale di colonna "{1}".</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>Impossibile formattare il tipo di dati "{0}" come rappresentazione formale perché presenta cifre di data/ora non valide.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>Impossibile formattare il valore come una rappresentazione formale del tipo richiesto.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>Impossibile formattare il tipo di dati "{0}" come rappresentazione formale perché ha una scala massima non valida.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>Il valore letterale fornito non è una rappresentazione formale valida per il tipo di dati "{0}".</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>"{0}":la lunghezza del valore letterale deve essere pari.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>"{0}":il valore letterale deve essere una stringa con cifre esadecimali</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>{0} richiede una connessione aperta se non è stata impostata la virgoletta di prefisso.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>Impossibile determinare i valori letterali booleani corretti. Impossibile creare valori letterali Boolean.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>Le rappresentazioni formali del tipo di dati nativo associato al tipo di dati "{0}" non sono supportate.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>Il tipo di dati del parametro di {0} non è valido.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>Nessun mapping esistente dal tipo di oggetto {0} a un tipo nativo di provider gestito noto.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>Impossibile gestire un TypeCode {0} sconosciuto restituito da Type {1}.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>Nessun mapping esistente dal DbType {0} a un {1} riconosciuto.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>La versione di SQL Server in uso non supporta il tipo di dati "{0}".</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>Il valore "{0}" del parametro non è compreso nell'intervallo.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>Il nome di parametro specificato "{0}" non è valido.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>Non sono supportati più parametri di valori restituiti.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>Valore '{0}' del parametro Size non valido. Il valore deve essere maggiore o uguale a zero.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>Valore non valido per l'argomento '{0}'. Il valore deve essere maggiore o uguale a 0.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>Valore non valido per questi metadati.</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>I metadati devono essere SqlDbType.Row</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>Impossibile convertire il valore del parametro da un {0} a un {1}.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} non supporta le transazioni parallele.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>La {0} è completata e non può più essere utilizzata.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>Impossibile chiamare "{0}" se il record è di sola lettura.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>Impossibile chiamare "{0}" se DbDataRecord è di sola lettura.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>Conversione implicita del tipo di oggetto "{0}" nel tipo di dati "{1}" non supportata.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>L'offset del buffer '{1}' sommato ai byte disponibili '{0}' è maggiore della lunghezza del buffer passato.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>Lunghezza dei dati '{0}' minore di 0.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>La lunghezza specificata "{0}" non è compresa nell'intervallo.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>Tentativo di {2} nel dataIndex '{0}' non valido. Con CommandBehavior.SequentialAccess è possibile iniziare la lettura solo dal dataIndex '{1}'.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>Offset deve fare riferimento a una posizione all'interno del valore.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"per il provider gestito ODBC è necessario specificare la restrizione TABLE_NAME e che i valori della raccolta di indici GetSchema non siano null.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>Valore di argomento non valido per il metodo "{0}".</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>Il provider ODBC non ha restituito risultati da SQLGETTYPEINFO.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>Argomento DataTable null imprevisto.</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>Argomento DataSet null imprevisto.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>La stringa di connessione supera la lunghezza massima consentita, pari a {0}.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0}: impossibile mappare il tipo.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>Tipo SQL sconosciuto - {0}.</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>Tipo URT sconosciuto - {0}.</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>Argomento negativo non valido.</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>Impossibile impostare proprietà su una connessione aperta.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>Nessun mapping valido per un SQL_TRANSACTION "{0}" a un valore di enumerazione System.Data.IsolationLevel.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0}. Impossibile attivare la creazione di un pool di connessioni.</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0}. Impossibile allocare l'handle di ambiente.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} - impossibile ottenere un handle descrittore.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>Non in una transazione.</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>Valore di enumerazione {0} non valido per OdbcType.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>Utilizzare IsDBNull se si prevedono dati DBNull.Value.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0}. Informazioni sull'errore non disponibili.</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>La connessione è chiusa.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>Una connessione interna non dispone di un proprietario.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>Il provider di dati .NET Framework Odbc richiede Microsoft Data Access Components (MDAC) versione 2.6 o successiva. Versione correntemente installata: {0}.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>Il provider di dati .NET Framework OleDb richiede Microsoft Data Access Components (MDAC) versione 2.6 o successiva. Versione correntemente installata: {0}.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>Il provider "{1}" non supporta l'interfaccia "{0}". GetOleDbSchemaTable non è disponibile con il provider corrente.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>'{0}' fallito senza alcun messaggio di errore disponibile, codice risultato: {1}.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>Nessun messaggio di errore disponibile, codice risultato: {0}.</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>I provider di dati .NET Framework richiedono Microsoft Data Access Components (MDAC). Installare Microsoft Data Access Components (MDAC) versione 2.6 o successiva.</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>Il provider di dati .NET Framework per OLEDB (Microsoft.Data.OleDb) non supporta il provider Microsoft OLE DB per driver ODBC (MSDASQL). Usare il provider di dati .NET Framework per ODBC (System.Data.Odbc).</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>Il provider di dati .NET Framework per OLEDB non consente al provider OLE DB di chiedere all'utente di specificare un valore in un ambiente non interattivo.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>Il provider '{0}' non è registrato nel computer locale.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>L'interfaccia ICommandText non è supportata dal provider '{0}'. Utilizzare CommandType.TableDirect.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>L'interfaccia ITransactionLocal non è supportata dal provider "{0}". Le transazioni locali non sono disponibili con il provider corrente.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>Formato della stringa di inizializzazione non conforme alle specifiche OLE DB, a partire da char[{0}] circa nella stringa di connessione.</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>'Elaborazione asincrona' non è una funzionalità supportata dal provider di dati .NET Framework OLE DB (Microsoft.Data.OleDb).</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>Provider OLE DB non specificato in ConnectionString. Utilizzare ad esempio 'Provider=SQLOLEDB;'.</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>Il provider OLE DB specificato in ConnectionString è troppo lungo.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>Non sono previste restrizioni per DbInfoKeywords OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>Non sono previste restrizioni per il campo DbInfoLiterals di OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>Non sono previste restrizioni per il guid dello schema OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>La {0} OleDbSchemaGuid non è uno schema supportato dal provider '{1}'.</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>Le impostazioni di configurazione "{0}" hanno un numero di valori errato.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>Impossibile caricare il file XML specificato nell'impostazione di configurazione "{0}".</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>Parametro Command [{0}] '{1}' non valido.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>Impossibile convertire il valore dei dati del parametro Command [{0}] "{1}" per ragioni diverse dalla mancata corrispondenza dei segni o dall'overflow dei dati.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>Impossibile convertire il parametro Command [{0}] '{1}'. Il valore dei dati è con segno, mentre il tipo utilizzato dal provider è senza segno.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>Impossibile convertire il parametro Command [{0}] '{1}'. Il valore dei dati ha determinato l'overflow del tipo utilizzato dal provider.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>Il provider ha rilevato un errore durante l'invio del valore del parametro Command [{0}] '{1}' e ha arrestato l'elaborazione.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>Il parametro [{0}] "{1}" non ha valore predefinito.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>Errore nel parametro [{0}]: {1}.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Errore interno di Microsoft.Data.OleDb.OleDbDataAdapter: funzione di accesso al parametro non valida: {0} {1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter[{0}]: proprietà OleDbType non inizializzata: OleDbType.{1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>L'interfaccia ICommandWithParameters non è supportata dal provider '{0}'. I parametri Command non sono supportati dal provider corrente.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>Il recupero di informazioni sui parametri di procedura non è supportato dal provider '{0}'.</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>Impossibile determinare il separatore decimale del server. Impossibile creare valori numerici letterali non Integer.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>L'oggetto non è un oggetto ADODB.RecordSet o un ADODB.Record.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>Impossibile recuperare l'interfaccia "{0}" dall'oggetto ADODB.RecordSet.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: la proprietà Size ha una dimensione 0 non valida.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>Impossibile recuperare l'interfaccia IRow dall'oggetto ADODB.Record.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>Il metodo {0}.Prepare richiede l'impostazione esplicita del tipo per tutti i parametri.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>Il tipo non supporta l'interfaccia OLE DB ISourcesRowset</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>Il metodo {0}.Prepare richiede l'impostazione esplicita di Size diversa da zero per tutti i parametri di lunghezza variabile.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>Impossibile costruire la raccolta di schemi ReservedWords. Il provider non supporta IDBInfo.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>Il metodo {0}.Prepare richiede l'impostazione esplicita di Scale e Precision per i parametri di tipo '{1}'.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>Il valore della proprietà non è stato impostato perché il provider non supportava la proprietà "{0}" oppure il consumer ha tentato di ottenere o impostare valori di proprietà non incluse nel gruppo Initialization e l'oggetto origine dati non è stato inizializzato.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>Chiamata non corrispondente al metodo di fine per asyncResult. Era prevista una chiamata a {0} ma è stato chiamato {1}.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>Impossibile inizializzare la proprietà "{0}" per uno dei seguenti motivi:
-	Il tipo di dati del valore non è il tipo di dati della proprietà oppure non era null. Ad esempio, la proprietà è DBPROP_MEMORYUSAGE, che ha un tipo di dati Int32, ma il tipo di dati è Int64.
-	Il valore non è valido. Ad esempio, la proprietà è DBPROP_MEMORYUSAGE e il valore è negativo.
-	Il valore è valido per la proprietà e il provider la supporta come proprietà impostabile, ma non supporta il valore specificato. Ad esempio, nel caso in cui il valore sia stato aggiunto alla proprietà in OLE DB dopo che sia stata eseguita un'operazione di scrittura nel provider.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>Operazione non valida. La connessione è chiusa.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>Valore di Options non valido.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>Impossibile inserire la transazione nell'elenco. È in corso una transazione locale sulla connessione. Terminare la transazione locale e riprovare.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>Elemento ColumnID non valido.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>La connessione ha una transazione correntemente inserita nell'elenco. Completare la transazione corrente e riprovare.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>La proprietà "{0}" è stata specificata per essere applicata a tutte le colonne, ma non è stato possibile applicarla a una o più colonne.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>Database non può essere null, una stringa vuota o una stringa di soli spazi.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>La proprietà "{0}" è di sola lettura oppure il consumer ha provato a impostare valori di proprietà nel gruppo delle proprietà Initialization dopo l'inizializzazione dell'oggetto origine dati. I consumer possono impostare una proprietà di sola lettura sul valore corrente. Questo stato viene inoltre restituito se non è stato possibile impostare una proprietà impostabile di colonna per la colonna specifica.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>Offset buffer di origine (dimensione {0}) non valido: {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>Il valore della proprietà facoltativa "{0}" non è stato impostato sul valore specificato e non è stato possibile impostare la proprietà sul valore specificato.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>Offset buffer di destinazione (dimensione {0}) non valido: {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>Il valore della proprietà "{0}" non è stato impostato, perché sarebbe stato in conflitto con una proprietà esistente.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>Tentativo non valido di {0} con flusso chiuso.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(Riservato).</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>Il valore specificato per SeekOrigin non è valido.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>Il provider ha restituito un valore DBPROPSTATUS_ value "{0}" sconosciuto.</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>Tentativo non valido di leggere dall'ordinale di colonna "{0}". Con CommandBehavior.SequentialAccess è possibile leggere solo a partire dall'ordinale di colonna "{1}".</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>La convalida della funzione di accesso è stata rinviata ed eseguita mentre il metodo restituiva i dati. L'associazione per questa colonna o parametro non era valida.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>Il tipo di dati del parametro di {0} non è valido.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>Errore interno di OleDbDataAdapter: funzione di accesso al set di righe non valida: Ordinal={0} Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>Nessun mapping esistente dal tipo di oggetto {0} a un tipo nativo di provider gestito noto.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>Il valore dei dati non può essere convertito per ragioni diverse dalla mancata corrispondenza dei segni o dall'overflow. È ad esempio possibile che i dati siano stati danneggiati nell'archivio pur restando possibile il recupero della riga.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>Impossibile gestire un TypeCode {0} sconosciuto restituito da Type {1}.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>Impossibile per il provider allocare la memoria in cui restituire i dati di {0}.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>Nessun mapping esistente dal DbType {0} a un {1} riconosciuto.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>Impossibile effettuare la conversione. Il valore dei dati {0} ha provocato un overflow del tipo specificato per la parte di valore {0} del buffer del consumer.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>La versione di SQL Server in uso non supporta il tipo di dati "{0}".</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>Errore interno OleDbDataAdapter: [get]. Tipo di dati OLE DB sconosciuto: 0x{0} ({1}).</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>Il valore "{0}" del parametro non è compreso nell'intervallo.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>Impossibile effettuare la conversione. Il valore dei dati {0} è con segno, mentre il tipo specificato per la parte del valore {0} nel buffer del consumer era senza segno.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>Il nome di parametro specificato "{0}" non è valido.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>Errore interno OleDbDataAdapter: [set]. Tipo di dati OLE DB sconosciuto: 0x{0} ({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>Valore '{0}' del parametro Size non valido. Il valore deve essere maggiore o uguale a zero.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>Il provider non ha potuto determinare il valore di {0}. Esempio: la riga è stata appena creata, non è disponibile un valore predefinito per la colonna {0} e il consumer non ha ancora assegnato a {0} un nuovo valore.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>Valore non valido per l'argomento '{0}'. Il valore deve essere maggiore o uguale a 0.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>Il provider OLE DB ha restituito un valore di stato non previsto: {0}</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>Valore non valido per questi metadati.</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>Se l'ApartmentState del thread non è ApartmentState.MTA, è necessario utilizzare OleDbDataReader.Read dal thread in cui è stato creato.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>Impossibile convertire il valore del parametro da un {0} a un {1}.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>Errore non specificato: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} non supporta le transazioni parallele.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>IErrorInfo.GetDescription non riuscito con {0}.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>La {0} è completata e non può più essere utilizzata.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>IErrorInfo.GetSource non riuscito con {0}.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>La lunghezza specificata "{0}" non è compresa nell'intervallo.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>I dati DBTYPE_VECTOR non sono supportati dal provider di dati .NET Framework OLE DB (Microsoft.Data.OleDb).</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>Tentativo di {2} nel dataIndex '{0}' non valido. Con CommandBehavior.SequentialAccess è possibile iniziare la lettura solo dal dataIndex '{1}'.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>Valori minimo e massimo delle dimensioni di pool non validi. La dimensione di pool minima deve essere inferiore a quella massima.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>La parola chiave "{0}" è obsoleta. Al suo posto usare "{1}".</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>Impossibile ottenere dal server l'indirizzo del coordinatore della transazione distribuita per il server.  Il DTC è abilitato sul server?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>Il valore per il parametro di connessione &lt;{0}&gt; supera la lunghezza massima consentita di 65535 caratteri.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>Valore di "Packet Size" non valido. Il valore deve essere un integer &gt;= 512 e &lt;= 32768.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>Transazione o nome non valido per un punto della transazione in cui effettuare il salvataggio.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>Il valore di enumerazione {0}, {1}, non è supportato da SQL Server 7.0 o SQL Server 2000.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>User Instance e Failover non sono opzioni compatibili.  Scegliere una delle due nella stringa della connessione.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>Non è possibile impostare la proprietà Credential se nella stringa di connessione è stato specificato 'Authentication=Active Directory Integrated'.</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>Parametri di autenticazione non corretti specificati con l'autenticazione del certificato.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>L'istanza di SQL Server a cui si è tentato di connettersi richiede la crittografia, ma questo computer non la supporta.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>L'istanza di SQL Server a cui si è tentato di connettersi non supporta la crittografia.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>L'istanza di SQL Server a cui si è tentato di connettersi non supporta CTAIP.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>Versione di SQL Server non supportata. È possibile usare il provider di dati di .NET Framework SqlClient solo con SQL Server versioni 7.0 e successive.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>{0} non può essere modificata mentre è in corso l'operazione asincrona.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>Il comando richiede una connessione asincrona. Impostare "Asynchronous Processing=true" nella stringa di connessione.</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>Timeout del tentativo di connessione.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>Timeout scaduto. La connessione è stata interrotta.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>Errore dell'istanza.</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>Codice errore: 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword richiede SQL Server 9.0 o versione successiva.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>Il reindirizzamento dell'istanza SSE non è supportato per le istanze di utenti non locali.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>L'autenticazione '{0}' non è supportata.</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>Il metodo di autenticazione SQL '{0}' non è supportato.</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>Non è stato possibile creare un'istanza di un provider di autenticazione di tipo '{1}' per '{0}'.</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>Non è stato possibile creare un'istanza di un elemento SqlAuthenticationInitializer di tipo '{0}'.</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>Il provider '{0}' ha generato un'eccezione durante l'inizializzazione.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>Il provider '{0}' non supporta l'autenticazione '{1}'.</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Non è possibile trovare un provider di autenticazione per '{0}'. Installare il pacchetto NuGet 'Microsoft.Data.SqlClient.Extensions.Azure' (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) per usare i metodi di autenticazione di Active Directory (Entra ID).</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>Non è stato possibile leggere la sezione di configurazione per i provider di autenticazione.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Il parametro '{0}' non può essere Null o vuoto.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>L'operazione asincrona è già completata.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>Impossibile eseguire il comando a causa di un'operazione asincrona in sospeso già in esecuzione.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>Comando non valido inviato a ExecuteXmlReader. Il comando deve restituire un risultato Xml.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>Le notifiche richiedono SQL Server 9.0 o versioni successive.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>Formato del nome in tre parti non valido per UdtTypeName.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>Impossibile inizializzare il pacchetto SSPI.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Timeout. Il tempo disponibile è scaduto prima del completamento dell'operazione o il server non risponde.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>Timeout di connessione scaduto. Il tempo disponibile è scaduto all'inizio della fase di pre-accesso. È possibile che il tempo fornito per il timeout della connessione non sia stato sufficiente.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>Nella stringa della connessione è stata richiesta un'istanza utente, ma il server specificato non supporta questa opzione.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>Il certificato del server non ha superato la convalida dell'applicazione.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>La lunghezza dati specificata {0} supera la lunghezza massima consentita di {1}.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>Tentativo non valido di eseguire la lettura in assenza di dati.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>Lunghezza dei dati '{0}' minore di 0.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>Impossibile chiamare "{0}" quando SqlDataRecord è di sola lettura.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>Non è possibile accedere alla raccolta mappata perché è attualmente in uso;</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>La connessione alla connessione di contesto tramite Microsoft.Data.SqlClient non è supportata.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>Non sono supportati TransactionScopes annidati.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>Evento server imprevisto: {0}.</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>La lunghezza di '{0}' deve corrispondere alla lunghezza di '{1}'.</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>SqlDbType '{0}' non è valido per {1}.  Solo {2} è supportato.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>Troppi valori.</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>Stream non supporta la scrittura.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>Null</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>Messaggio</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>Overflow aritmetico.</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>Errore di divisione per zero.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>I dati hanno valore Null. Impossibile chiamare il metodo o la proprietà su valori Null.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>Troncamento causato da un'operazione aritmetica.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>Overflow di SqlDateTime. Deve essere compreso tra 1/1/1753 12:00:00 AM e 12/31/9999 11:59:59 PM.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>Due stringhe da concatenare hanno regole di confronto diverse.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>Due stringhe da confrontare hanno regole di confronto diverse.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>Valore del flag non valido.</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>Overflow durante la conversione da SqlDecimal a Decimal.</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>Overflow di conversione.</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>SqlDateTime non valido.</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>È stato specificato un fuso orario. SqlDateTime non supporta i fusi orari.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>Dimensione matrice non valida.</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>Scala/precisione numerica non valida.</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>Input in formato non corretto.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>Errore di SqlType.</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>SqlBytes e SqlChars non supportano una lunghezza superiore a 2GB in questa versione.</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>Errore durante la lettura.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Stream è stato chiuso o eliminato.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>Nessun buffer presente. Operazione di lettura o scrittura non riuscita.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>Impossibile impostare una lunghezza diversa da zero. Il valore corrente è Null.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>Il buffer non è sufficiente. Operazione di lettura o scrittura non riuscita.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>Impossibile scrivere su un offset diverso da zero. Il valore corrente è Null.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>Impossibile scrivere da un offset di dimensioni maggiori della lunghezza corrente. Resterebbero dati non inizializzati nel buffer.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>I dati restituiti hanno una dimensione maggiore di 2Gb. Utilizzare SequentialAccess command behavior per ottenere tutti i dati.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>L'argomento per GetDayOfWeek deve essere un integer compreso tra 1 e 7.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>SQL Type non è stato caricato con i dati.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>SQL Type è già stato caricato con i dati.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>Tentativo non valido di accedere a un XmlReader chiuso.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>Tentativo non valido di chiamare {0} quando il flusso è chiuso.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>Tentativo non valido di chiamare {0} quando il flusso non è scrivibile.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>Tentativo non valido di chiamare {0} quando il flusso non è leggibile.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>Tentativo non valido di chiamare {0} quando il flusso non è ricercabile.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>La sottoclasse non ha eseguito l'override di un metodo di richiesta.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>Impossibile creare un normalizzatore per '{0}'.</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>Errore interno</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>Il parametro del comando deve avere un testo del comando non null e non vuoto.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>La lunghezza della matrice dei parametri MetaData deve essere equivalente all'argomento di matrice ParameterDirection.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>Errore di mappatura dell'adattatore dati.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>Errore adattatore dati.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>Violazione di concorrenza DB.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>Operazione interrotta.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>Operazione interrotta a causa di un eccezione (per ulteriori informazioni, vedere InnerException).</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Indica se Fill chiamerà o meno DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Indica se Update chiamerà o meno DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Indica se continuare o meno con il DataRow successivo quando si verificano gli eventi Update, RowUpdating e RowUpdated. Status è UpdateStatus.ErrorsOccurred.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>Indica il modo in cui l'adattatore riempirà la DataTable dal DataReader.</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>Azione intrapresa quando manca una tabella o una colonna di TableMappings.</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>Azione intrapresa quando manca una tabella o una colonna del DataSet.</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>Indica come effettuare il mapping di una tabella di origine sulla tabella DataSet.</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Evento generato quando si verifica un errore risolvibile durante un'operazione Fill.</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Indica se Fill restituisce valori specifici del provider oppure valori comuni conformi a CLSCompliant.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>Nome colonna di origine (con distinzione tra maiuscole e minuscole).</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>Numero di elementi contenuti nella raccolta</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>Oggetto DataColumnMapping specificato.</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>Mapping di singole colonne quando esiste una corrispondenza per il mapping della tabella.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>Nome della tabella di origine di DataTableMapping. Distingue tra maiuscole e minuscole.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>Numero di elementi contenuti nella raccolta</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>Oggetto DataTableMapping specificato.</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>Utilizzato durante l'aggiornamento per le righe eliminate dal DataSet.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Evento generato dopo ogni DataRow durante un'operazione di aggiornamento.</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>Numero di righe da riunire in batch prima di eseguirle sull'origine dati.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Connessione utilizzata se i comandi Select/Insert/Update/DeleteCommands non dispongono ancora di una connessione.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>Utilizzato durante Update per le righe eliminate nel DataTable.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>Utilizzato durante Update per le nuove righe nel DataTable.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Utilizzato durante le operazioni di Fill.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>Utilizzato durante Update per le righe modificate nel DataTable.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Indica se Fill restituisce valori specifici del provider oppure valori comuni conformi a CLSCompliant.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>Indica come mappare la tabella di origine a DataTable.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>Indica il modo in cui vengono generati i comandi Insert/Update/DeleteCommands se non è stato impostato dall'utente.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>Numero di righe da riunire in batch prima di eseguirle sull'origine dati.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>Stringa di connessione utilizzata per la connessione a Data Source.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>Nome del driver ODBC da utilizzare per la connessione a Data Source.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>DSN da utilizzare per la connessione a Data Source.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>Se il valore è true, indica che è necessario utilizzare un pool di connessioni gestito.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>File UDL da utilizzare per la connessione a Data Source.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>Specifica quali OLE DB Services attivare o disabilitare con OleDb Provider.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>Nome del provider OLE DB da utilizzare per la connessione a Data Source.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>Nome dell'applicazione.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>Se il valore è true, consente l'utilizzo della funzionalità asincrona nel provider di dati .NET Framework.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>Nome del file primario, incluso il nome completo del percorso, di un database collegabile.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>Se il valore è true, indica che lo stato della connessione viene reimpostato quando viene rimosso dal pool.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>Se il valore è true, indica che la connessione proviene dal contesto Sql Server.  Disponibile solo quando in esecuzione nel processo Sql Server.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>Nome del record di lingua di SQL Server.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>Specifica il metodo di autenticazione con SQL Server.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>Certificato client specificato per l'autenticazione con SQL Server.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>Informazioni utilizzate per la connessione a un DataSource.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Valore di timeout della connessione attuale, non impostabile nella proprietà ConnectionString.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>Valore del catalogo dell'origine dati attuale. 'Database=X' nella stringa di connessione.</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>Origine dati corrente. 'Server=X' nella stringa di connessione.</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>Driver ODBC attuale.</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>Versione del prodotto a cui accede il driver ODBC.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>Informazioni utilizzate per la connessione a un DataSource.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Valore di timeout della connessione corrente. 'Connect Timeout=X' in ConnectionString.</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>Valore del catalogo dell'origine dati corrente. 'Initial Catalog=X' nella stringa di connessione.</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>Origine dati corrente. 'Data Source=X' nella stringa di connessione.</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>ProgID del provider OLE DB corrente. "Provider=X" nella stringa di connessione.</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>Versione del prodotto a cui accede il provider OLE DB.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>Token di accesso da usare per l'autenticazione.</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>Stato della connessione, sincrona o asincrona. "Asynchronous Processing=x" nella stringa di connessione.</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>Informazioni utilizzate per eseguire la connessione per la replica.</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>Informazioni utilizzate per effettuare la connessione a un DataSource, quali 'Data Source=x;Initial Catalog=x;Integrated Security=SSPI'.</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>Raccogliere dati statistici per la connessione.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>Provider dell'archivio chiavi di crittografia di colonna personalizzati.</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>Guid che rappresenta la connessione fisica.</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Inserimento automatico nelle notifiche utilizzato da Microsoft SQL Server.</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>Come la clausola WHERE viene autogenerata per i comandi Update e Delete quando non specificata dall'utente.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>Indica la posizione del nome di catalogo in un nome di tabella qualificato in un comando di testo.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>Carattere che separa il nome di catalogo dal resto dell'identificatore in un comando di testo.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>Carattere che separa il nome dello schema dal resto dell'identificatore in un comando di testo.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Stringa di prefisso utilizzata con gli oggetti sql.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Stringa di suffisso utilizzata con gli oggetti sql.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter per il quale generare automaticamente comandi.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>Usare lo schema di DataTable o il SelectCommand.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>Indica il modo in cui viene generata automaticamente la clausola SET pre il comando Update quando non viene specificato dall'utente.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Indica il DataAdapter per cui generare automaticamente OdbcCommands.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Carattere utilizzato come virgoletta di apertura, necessaria per inserire nei comandi di testo identificatori che contengono caratteri speciali.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Carattere utilizzato come virgoletta di chiusura, necessaria per inserire nei comandi di testo identificatori che contengono caratteri speciali.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter per cui generare automaticamente OleDbCommands</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Separatore decimale utilizzato nei letterali numerici.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Stringa di prefisso utilizzata con gli oggetti sql.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Stringa di suffisso utilizzata con gli oggetti sql.</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>DataAdapter per cui generare automaticamente SqlCommands</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Separatore decimale utilizzato nei letterali numerici.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Carattere utilizzato come virgoletta di apertura, necessaria per inserire nei comandi di testo identificatori che contengono caratteri speciali.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Carattere utilizzato come virgoletta di chiusura, necessaria per inserire nei comandi di testo identificatori che contengono caratteri speciali.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>Impostazione necessaria soltanto i parametri con valore decimal e numeric quando si utilizzano gli scenari Prepare, FillSchema e CommandBuilder.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>Impostazione necessaria soltanto i parametri con valore decimal e numeric quando si utilizzano gli scenari Prepare, FillSchema e CommandBuilder.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>Tipo nativo del parametro.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>Tipo nativo del parametro.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>Nome del parametro, ad esempio '@p1'.</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>Tipo nativo del parametro.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>Il nome del server per il tipo.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>Offset dei tipi di dati a lunghezza variabile.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>ParameterDirection '{0}' specificato per il parametro '{1}' non è supportato. Table-valued parameters supportano solo ParameterDirection.Input.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>TypeName specificato per il parametro '{0}'. TypeName deve essere impostato solo per i parametri Structured.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>Il tipo SqlDbType.Structured è supportato solo per tipi con più valori.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>La colonna DateType per il campo '{0}' nello schema di tabella  è null. Il valore di DataType deve essere non Null.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>Il numero di campi nel record '{0}' non corrisponde al numero contenuto nel record originale.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>intervallo: 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>Errore imprevisto nel provider dati di SqlClient. {0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>Impossibile ottenere Type Info per {0},{1}</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>Il provider non è riuscito a caricare il seguente assembly: {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>È necessario impostare la proprietà UdtTypeName per i parametri UDT.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>I tipo specificato non è registrato sul server di destinazione.{0}.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>Parametri UDT non consentiti nella clausola WHERE a meno che non facciano parte della chiave primaria.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>"{0}" non è un tipo definito dall'utente valido. Motivo: {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>supporta sia formati in memoria che formati definiti dall'utente</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>Impossibile supportare il formato nativo.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>non implementa IBinarySerialize</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>non serializzabile</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>nessun costruttore pubblico disponibile</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>non implementa INullable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>non dispone di costruttori pubblici</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>nessun attributo UDT disponibile</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>Non è ancora supportata la serializzazione senza il mapping.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>Metodo "public static x Parse(System.Data.SqlTypes.SqlString)" mancante</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>Metodo "public override string ToString()" mancante</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>Metodo "public static x Null { get; }" mancante</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>Il formato nativo non supporta i campi (in modo diretto o attraverso un altro campo) di tipo "{0}"</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>Tipo non pubblico</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Layout non sequenziale Native UDT a causa del tipo "{0}"</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Native UDT specifica le dimensioni massime in byte</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>il campo "{0}" è contrassegnato come non serializzato</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>Il tipo di campo '{0}' è contrassegnato come layout esplicito e questo non è consentito nel formato nativo</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>I riferimenti con più valori agli assembly devono avere un ID assembly diverso da zero.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>I tipi strutturati con più valori possono essere utilizzati solo per i parametri e non possono essere annidati in un altro tipo.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>Nome di percorso non valido.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>Errore durante il tentativo di promuovere la transazione.</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>Oggetto dipendenza utilizzato per ricevere notifiche di query.</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>Proprietà per indicare se la dipendenza non è valida.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>Per aggiungere un comando all'oggetto dipendenza esistente.</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Command è già associato a un altro oggetto dipendenza. Impossibile sovrascrivere.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>L'oggetto SqlCommand è già associato a un altro oggetto SqlDependency.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>Timeout specificato non valido. Il timeout non può essere &lt; 0.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>Errore di notifica. Type={0}, Info={1}, Source={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData non è valido per questo SqlDbType.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>dbType {0} non è valido per questo costruttore.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>Errore interno. Il valore del testo normale non può essere Null.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>Non è possibile crittografare. In seguito alla crittografia sono stati restituiti {0} byte di testo crittografato oltre il limite massimo consentito pari a {1} byte. Il valore del testo normale specificato è probabilmente troppo grande (dimensioni del testo normale: {2} byte).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>Errore interno. Il valore del testo crittografato non può essere Null.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>SQL Server non ha restituito le informazioni sull'attestazione. Il tipo di enclave è '{0}' e l'URL di attestazione dell'enclave è '{1}'.</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>Non è possibile stabilire il canale sicuro. Messaggio di errore: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>Errore interno. È stato specificato un argomento '{0}' Null durante la costruzione di un oggetto di tipo '{1}'. '{0}' non può essere Null.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Specifica un endpoint di un servizio di attestazione enclave che verrà usato per verificare se l'enclave, configurato nell'istanza di SQL Server per i calcoli su colonne di database crittografate con Always Encrypted, è valido e sicuro.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>Non è stato possibile leggere la sezione di configurazione per i provider di enclave. Assicurarsi che la sezione sia formattata correttamente nel file di configurazione dell'applicazione. Messaggio di errore: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>Non è stato possibile creare un'istanza di un provider di enclave con il tipo '{1}' per il nome '{0}'. Messaggio di errore: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>Errore interno. l'elemento SqlColumnEncryptionEnclaveProviderName non può essere Null o vuoto.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>Si è verificato un errore durante la lettura del set di risultati '{0}'. L'URL di attestazione non è stato specificato nella stringa di connessione, ma la query richiede calcoli enclave. Il tipo di enclave è '{1}'. </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>Errore interno. Il tipo di enclave ricevuto da SQL Server è Null o vuoto quando si esegue una query che richiede calcoli enclave.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>Per eseguire una query, sono richiesti calcoli enclave, ma nella configurazione dell'applicazione manca la sezione relativa al provider di enclave.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>Non sono stati trovati provider di enclave per il tipo di enclave '{0}' e il protocollo di attestazione '{1}'. Specificare il protocollo di attestazione corretto nella stringa di connessione. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>Impostazione di crittografia di colonna predefinita per tutti i comandi della connessione.</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>Forza la crittografia del parametro prima dell'invio di dati sensibili al server. </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>Oggetto Dictionary che contiene i nomi di SQL Server e i relativi percorsi di chiave master di colonna attendibili.</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>La connessione a un'istanza di SQL Server con mirroring mediante l'opzione ApplicationIntent ReadOnly non è supportata.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>Ricevute informazioni di routing impreviste.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>Ricevute informazioni di routing non valide.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>Autenticazione non supportata specificata in questo contesto: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Timeout dell'autenticazione di Active Directory interattivo. L'utente ha impiegato troppo tempo per rispondere alla richiesta di autenticazione.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>Non è possibile usare 'Authentication=Active Directory Interactive' se è stata impostata la proprietà Credential.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>ID processo server (SPID) della connessione attiva.</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Timeout dell'autenticazione del flusso di codice del dispositivo di Active Directory. L'utente ha impiegato troppo tempo per rispondere alla richiesta di autenticazione.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>Non è possibile impostare la proprietà Credential se nella stringa di connessione è stato specificato 'Authentication=Active Directory Device Code Flow'.</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>Per l'azione richiesta sono supportate solo matrici unidimensionali.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>Impossibile rimuovere l'elemento specificato, perché non si trova nella raccolta indicata.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>Numero non negativo obbligatorio.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Impossibile impostare la proprietà AccessTokenCallback se nella stringa di connessione è stato specificato 'Authentication=Active Directory Default'.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} ha restituito {1}.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>Errore di protocollo: un messaggio ricevuto contiene una firma valida, ma non è stato crittografato come richiesto dal livello di protezione effettivo.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>{0} non è riuscito con errore {1}.</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>Questo metodo non è implementato da questa classe.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>Il pacchetto di sicurezza richiesto non è supportato.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>Tipo physicalConnection non corretto.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>Si è verificata un'eccezione durante il tentativo di impostazione dell’opzione AppContext '{0}'={1}.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>Il tipo {0} non è supportato in questa piattaforma.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>La modalità invariante di globalizzazione non è supportata.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Non è possibile eseguire l'autenticazione tramite Kerberos. Verificare che Kerberos sia stato inizializzato nel client con 'kinit' e che sia stato registrato un nome dell'entità servizio per il server SQL in modo da consentire l'autenticazione Kerberos.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>La parola chiave 'Network Library' non è supportata in questa piattaforma. Anteporre a "Origine dati" il protocollo desiderato ("tcp:" per una connessione TCP o "np:" per una connessione Named Pipe).</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>Il socket non ha generato '{0}' previsto con codice errore '{1}'.</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>Il server sta tentando di usare una funzionalità non supportata in questa piattaforma.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>La parola chiave '{0}' non è supportata in questa piattaforma.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>Il file System.Transactions.dll attualmente caricato non supporta le transazioni globali.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>È stato ricevuto un token '{0}' non supportato durante la lettura dei dati dal server.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>'{0}' non è un tipo di handle supportato.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream non è supportato in questa piattaforma.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>LocalDB non è supportato in questa piattaforma.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>Spazio buffer insufficiente. Richiesto: {0} Effettivo: {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>Operazione GSSAPI non riuscita con stato: {0} (stato secondario: {1}).</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>Operazione GSSAPI non riuscita. Errore: {0} ({1}).</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>Nessun supporto per l'associazione di canali in sistemi operativi diversi da Windows.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>Il nome di destinazione non deve essere vuoto se vengono passate le credenziali predefinite.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>Il livello di protezione richiesto non è supportato con l'implementazione GSSAPI attualmente installata.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>L'implementazione del server non è supportata.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>L'autenticazione NTLM non è possibile con le credenziali predefinite in questa piattaforma.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>Quando viene usato da DataAdapter.Update, il valore del parametro viene modificato da DBNull.Value in (Int32)1 o (Int32)0 se non è nullo.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Superata la dimensione massima del buffer: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>DataColumn '{0}' mancante per la SourceColumn '{2}'.</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>L'elenco SqlBatchCommand non è stato inizializzato.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index c6a208b5f7..f8b67f7cba 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>昇順</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Count={2} を持つこの {1} のインデックス {0} は無効です。</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>{0} は、既に別の {1} に含まれています。</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>{0} は、既にこの {1} に含まれています。</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0} は Null でない {1} 型オブジェクトのみ受け入れます。</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>この {1} に含まれない {0} を削除しようとしました。</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1} は一意でなければなりません。'{2}' は既にコレクションに存在します。</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>接続が閉じられていません。{0}。</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>リーダーが閉じている場合は、{0} の呼び出しは無効です。</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>接続が委任されたトランザクションまたは昇格されたトランザクションのプライマリ接続であるため、トランザクションに参加できません。</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>降順</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>'{0}' パラメーターには空でない文字列が必要です。</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>ConnectionString プロパティが初期化されていません。</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>非 CLS Exception が発生しました。</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>指定されたセキュリティ要素は、アクセス許可要素ではありません。</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>データ</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>更新</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>接続中であるか切断されているかを示す ConnectionState です。</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>接続が状態を変更するときにイベントが発生します。</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>パラメーターの一般的な型です。</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>入力、出力、または入出力のパラメーター。</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>厳密に型指定されたコード生成に使用されるデザイン タイムのプロパティです。</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>可変長データ型のオフセットです。</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>パラメーターの名前です。</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>可変長データ型 (文字列および配列) のサイズ。</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>DataAdapter.Update で使用するときに ColumnMappings の DataSetColumn 名の検索に使用する、基になる列の名前。これは、パラメーターとデータ行の間で値をコピーするためのものです。</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>DataAdapter.Update (UpdateCommand のみ) で使用するときにデータ ソースの更新に使用する、DataRow 値のバージョン。</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>DataAdapter.Update が使用する場合、Null 値でなければ、パラメーター値は DBNull.Value から (Int32)1 または (Int32)0 に変更されます。</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>パラメーターの値です。</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>SQL クエリの実行に失敗したため、'{0}' コレクションをビルドできません。詳細については、内部例外を参照してください。</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>要求されたスキーマ ('{0}') がサポートしているよりも多くの制約が指定されています。</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>'{2}' は、'{0}' スキーマ コレクションの '{1}' 制約としては無効な値です。</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>要求されたコレクション ({0}) は定義されていません。</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>要求されたコレクション ({0}) は、プロバイダーのこのバージョンではサポートされていません。</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>必要な DataSourceInformation テーブルの行のうち 1 つが見つかりません。</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>DataSourceInformation テーブルには、1 行のみが保持されている必要があります。</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>制約コレクションで必須の列が 1 つ以上ありません。</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>制約コレクション内の行に一致しない制約があります。</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>メタデータ XML に '{0}' がありません。</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>メタベース XML が無効です。</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>メタデータの XML が無効です。{0} コレクションには、文字列の列である {1} 列が必要です。</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>メタデータの XML が無効です。{0} コレクションの {1} 列には、空でない文字列が設定されている必要があります。</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>アクション</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>動作</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>塗りつぶし</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>情報メッセージ</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>マッピング</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>通知</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>スキーマ</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>プーリング</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>名前付き ConnectionString</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>セキュリティ</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>接続の復元性</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>カスタム ユーザー情報を保有するコレクションです。</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>DataSet 内部で比較する文字列に関して、大文字小文字を区別するかどうかを示します。</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>この DataSet の名前です。</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>DataSet に含まれるデータのカスタム "ビュー" を示します。このビューを使うと、カスタム データ ビューでフィルター、検索およびナビゲーションを行うことができます。</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>制約ルールを適用するかどうかを示します。</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>DataSet にエラーがあることを示します。</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>DataSet 内の文字列を比較するロケールを示します。</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>この DataSet で指定されたルート要素の XML URI 名前空間を示します。</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>この DataSet に使われる名前空間のプレフィックスを示します。</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>この DataSet のリレーションシップを保有するコレクションです。</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>この DataSet のテーブルを保持するコレクションです。</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>同じ名前を持つ 2 つのテーブルに対してスキーマをマージできない場合に発生します。</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Initialization の終了時に発生します。</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>データのメモリ内キャッシュを表します。</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>このテーブル内で比較する文字列に対して大文字小文字を区別するかどうかを指定します。</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>このテーブルの子リレーションシップを返します。</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>このテーブルの列を含むコレクションです。</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>このテーブルの制約を含むコレクションです。</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>このテーブルが属する DataSet を示します。</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>これは、テーブルの既定 DataView です。</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>この行のデータ連結値の計算に使用する式です。</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>テーブルにエラーがあるかどうかを返します。</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>テーブル内の文字列を比較するロケールを示します。</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>このテーブルの初期の開始サイズを示します。</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>このテーブルに含まれる要素の XML URI 名前空間を示します。</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>このテーブルに使われる名前空間のプレフィックスを XML で示します。</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>このテーブルの親リレーションシップを返します。</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>このテーブルの主キーを示す列を示します。</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>このテーブルのデータの行を保持するコレクションを示します。</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>DataSet の Tables コレクションでこのテーブルを照合するために使う名前を示します。</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>テーブルの行が正常に編集された後に発生します。</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>イベント ハンドラーが変更を修正またはキャンセルできるように行が変更されているときに発生します。ユーザーは行の値を変更することができます。また、編集をキャンセルするためには例外をスローする必要があります。</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>テーブルの行が正常に削除された後に発生します。</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>テーブルの行が削除にマークされているときに発生します。削除をキャンセルするには例外をスローしてください。</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>この列の値が送信されたときに発生します。ユーザーはこの指定された値を変更できます。また、編集をキャンセルするためには例外をスローする必要があります。</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>この列の値が変更されたときに発生します。</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>テーブルのすべての行がクリアされる前に発生します。</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>テーブルのすべての行が正常にクリアされた後に発生します。</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>新しい DataRow のインスタンスが作成された後に発生します。</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>DataSet の Relations コレクションにあるこのリレーションシップを照合するために使われる名前です。</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>このリレーションシップの子列を示します。</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>このリレーションシップの親列を示します。</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>リレーションシップが入れ子かどうかを示します。</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>削除操作において、このリレーションシップでどの連鎖処理を実行するかを示します。</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>更新操作において、このリレーションシップでどの連鎖処理を実行するかを示します。</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>承認および却下の変更において、このリレーションシップでどの連鎖処理を実行するかを示します。</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>この制約の子列を示します。</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>この制約の親列を示します。</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>この制約の子テーブルを示します。</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>この制約の列を示します。</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>この制約がプライマリ キーかどうかを示します。</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>この制約の名前を示します。</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>この制約のテーブルを示します。</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>この列で Null を指定できるかどうかを示します。</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>テーブルに新たに追加された行に対して列が自動的にインクリメントするかどうかを示します。この列の型は、Int16、Int32 または Int64 でなければなりません。</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>AutoIncrement 列の開始値を示します。</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>AutoIncrement 列で使用されるインクリメントを示します。</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>この列の、既定のユーザー インターフェイス タイトルを示します。</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>DataTable の列コレクションでこの列を検索するために使用される名前を示します。</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>この列が属する DataTable を返します。</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>この列に保存されたデータの型を示します。</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>新しい行をテーブルに追加するときに使う既定の列値を示します。</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>この列が、ユーザー入力を取り込まずに、ほかの列に基づいて各行の計算した値を示します。</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>この列が XML 内に属性、要素、シンプル コンテンツ ノード、またはとして永続するか、あるいは永続しないかを示します。</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>この列に格納される要素または属性の XML URI を示します。</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>xml 表現で、この DataColumn に使われる Prefix を示します。</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Columns コレクションにおけるこの列のインデックスを示します。</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>行がテーブルに追加された後にこの列を変更できるかどうかを示します。</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>列の値がテーブルの行内で一意になるように制限するかどうかを示します。</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>この列に許可された長さの最大値を示します。</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>この DataColumn の DateTimeMode を示します。</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>この DataView と、関連するユーザー インターフェイスが削除できるかどうかを示します。</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>この DataView と、関連するユーザー インターフェイスが編集できるかどうかを示します。</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>この DataView と、関連するユーザー インターフェイスに新しい行を追加できるかどうかを示します。</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>現在このビューで表示されている項目の数を返します。</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>これにより、この DataSet を所有する DataViewManager にポインターを返します。</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>ビューが開かれているかどうかを示します。</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>この DataView によって返されたデータのフィルターに使われる式です。</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>この DataView によって返されたデータのバージョンを示します。</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>この DataView によって返されたデータの順序と列の名前を示します。</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Sort プロパティが設定されていない場合に、既定の並べ替えを使用するかどうかを示します。</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>この DataView がデータの取得に使うテーブルを示します。</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>この DataView によって返されたデータが何らかの理由によって変更されたことを示します。</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>この DataViewManager のデータのソースを示します。</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>対応する DataSet のテーブルに対する並べ替え/フィルター/状態の設定を示します。</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet は、'union' または 'list' を simpleType としてサポートしません。</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>無効な {0} 構文 : 必要な '{1}' 属性がありません。</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>属性 '{0}' の値 '{1}' が無効です。</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>属性 '{0}' の値は '{1}' か '{2}' でなければなりません。</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>ElementType name='{0}' が見つかりません。</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>リレーションシップ '{0}' に親テーブル名が見つかりません。</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>リレーションシップ '{0}' に子テーブル名が見つかりません。</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>リレーションシップ '{0}' に親テーブル キーが見つかりません。</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>リレーションシップ '{0}' に子テーブル キーが見つかりません。</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>未定義のデータ型 : '{0}' です。</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>データ型が定義されていません。</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>フィールド ノード内部の XPath 選択が無効です。{0} が見つかりません。</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>セレクター ノード内で XPath の選択が無効です : {0}.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>{0} という制約内に無効な 'Key' ノードがあります。</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>制約名 {0} は既にスキーマで使われています。</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>'{0}' から '{1}' に変換できません。</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>'{2}' という '{1}' 制約に '{0}' の部分が見つかりません。</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>無効な Relation 定義 : キーの長さが異なります。</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet doesn't は、'{0} という名の ComplexType で循環参照を許可しません。</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet がノード {0} の抽象 ComplexType をインスタンス化できません。</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Xml Schema の書き込み中に複数のターゲット コンバーターでエラーが発生しました。詳細については、内部例外を参照してください。</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Xml Schema の書き込み中に複数のターゲット コンバーターでエラーが発生しました。null または空文字列が返されました。</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>宣言 '{0}' が重複しています。</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>diffGram を読み込めません。テーブル '{0}' がターゲット データセットに見つかりません。</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>diffGram を読み込めません。'sql' ノードが見つかりません。</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>列名 '{0}' は別のマップの種類に対して定義されています。</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>プレフィックス '{0}' は有効ではありません。特殊な文字が含まれています。</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>それ自体が入れ子になっているテーブル '{0}' の循環参照です。</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet は本体を展開できません。XmlValidatingReader を使用して、EntityHandling プロパティを適切に設定してください。</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>型 '{0}' は IXmlSerializable インターフェイスを実装しないため、シリアル化を実行できません。</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>シリアル化解除を実行できません。Data は IXMLSerializable を実装しないため、多態性はサポートされません。</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable は Xml のスキーマの推論をサポートしていません。</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>DataTable '{0}' のシリアル化を実行できません。この DataTable には、同一の外部キーに複数の親行がある DataRow が含まれています。</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>入力 Schema 内に IsDataSet 属性がありません。</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>DataSet 要素を特定できません。IsDataSet 属性が 2 回以上存在します。</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet は、IDynamicMetaObjectProvider を実装して IXmlSerializable を実装しない型をシリアル化しません。</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>機能が実装されていません。{0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>構文エラー : '{0}' 演算子の後にオペランドがありません。</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>式 '{0}' に型の不一致があります。</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>式が複雑すぎます。</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>列 [{0}] が見つかりません。</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>式に無効な文字列定数 : {0} が含まれています。</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>式に定義されていない関数呼び出し {0}() が含まれています。</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>式に構文エラーがあります。</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>無効な引数の数 : 関数 {0}()</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>式に閉じかっこが見つかりません。</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>位置 {1} のトークン '{0}' を変換できません。</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>{0} が必要ですが、位置 {2} の実際のトークンは {1} です。</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>{0} から {1} に変換できません。</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>値 '{0}' は型 '{1} に変換できません。</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>列名 [{0}] が無効です。</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>この式には無効な日付定数 '{0}' があります。</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>IN 演算子の式リストでは、定数式のみを使用できます。</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Like 演算子のエラー : 文字列パターン '{0}' が無効です。</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>構文エラー : IN キーワードの後に続く項目は、カンマで区切ってかっこで閉じなければなりません。</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>関数引数に型の不一致があります : {0}()、引数 {1} ですが、{2} が必要です。</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>関数引数 : {0}() に型の不一致があります : 引数 {1} には Integer 型を指定してください。</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>{1} および {2} で '{0}' 操作を実行できません。 </value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>型 '{1}' および '{2}' のオペランドの、演算子 '{0}' があいまいです。 符号付き型と符号なしの型を混合することはできません。明示的な Convert() 関数を使ってください。</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>構文エラー : IN キーワードの後には、カンマで区切られた、空でない式の一覧を指定しなければなりません。また、最後はかっこで閉じなければなりません。</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>式にサポートされない演算子 '{0}' が含まれています。</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>式に無効な名前 : '{0}' が含まれています。</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>構文エラー : '{0}' 演算子の前にオペランドがありません。</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>式に含まれる閉じかっこが多すぎます。</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>テーブル [{0}] が 2 つ以上のリレーションシップで呼び出されました。式 '{1}' のリレーションシップ名を明示的に記述してください。</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>集約引数の構文エラー : 可能な 'Child' 修飾子を含む単一列の引数を指定してください。</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>集約式 '{0}' に非連結参照があります。</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>カレント行なしで定数以外の式を評価することはできません。</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>式 '{0}' に非連結参照があります。</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>評価できません。式 '{0}' は集約ではありません。</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>フィルター式 '{0}' は Boolean 型に対して評価しません。</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>型名 '{0}' が無効です。</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>ルックアップ式の構文エラー : キーワード 'Parent' の後にリレーションシップ修飾子を含む単一列引数を指定してください : Parent[(&lt;relation_name&gt;)].&lt;column_name</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>DataFilter を呼び出すには行またはテーブルが必要です。</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>{0}() 引数が範囲外です。</value>
-  </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>構文エラー : 'Is' 演算子の使用が無効です。正しい構文 : &lt;expression&gt; Is [Not] Null</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>配列のオフセットおよび長さが制限を超えているか、カウンターがソース コレクションのインデックスから最後までの要素の数より大きい値です。</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>値が型 '{0}' に対して大きすぎるか、小さすぎます。</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>型 '{0}' のオブジェクトを型 '{1}' のオブジェクトに変換できません。</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>0 除算エラーが発生しました。</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>プロパティ '{0}' に使用できる値は '{1}' のみです。</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>親リレーションシップ '{0}' が見つかりません。</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>プロパティ '{0}' に使用できる値は '{1}' または '{2}' です。</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>'hours' 引数が有効範囲を超えています。-14 から +14 までの値を指定してください。</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>指定された QuotePrefix の値と QuoteSuffix の値が一致しません。</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>'minutes' 引数が有効範囲を超えています。-59 から +59 までの値を指定してください。</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>引数 '{0}' の長さが、上限の '{1}' を超えています。</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>タイム ゾーンに指定した範囲が、合計 14 時間を超えています。</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>キー '{0}' の値が無効です。</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>指定した DateTime 引数の Kind プロパティが、'hours' 引数および 'minutes' 引数と一致しません。</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>'{0}' キーを使用するには、キーとして '{1}' が指定されている必要があります。</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>型 '{0}' の DataColumn では式がサポートされていません。</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>キー '{0}' の値の長さが、制限 '{1}' を超えています。</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>制約を有効にできませんでした。行に入力できるのは、Null 以外の値、一意な値、あるいは外部キーですが、この制約の違反が 1 つ以上の行で発生しています。</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>キーワード '{0}' はサポートされていません。</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>コレクション自体を変更することはできません。</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>.NET Framework Data Provider の内部エラー {0} です。</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>指定された名前 '{0}' は、大文字小文字を区別しない場合は、コレクション オブジェクトの中で一致する名前が少なくとも 2 つあります。大文字小文字を区別する場合は、一致する名前はありません。</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}"。</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>指定された名前 '{0}' と同じ名前が、名前空間が異なるコレクション オブジェクト内に少なくとも 2 つあります。</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}"。引用符の使い方に誤りがあります。</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>配列のオフセットおよび長さが制限を超えているか、カウンターがソース コレクションのインデックスから最後までの要素の数より大きい値です。</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}"。現在の制限値 "{2}" は十分ではありません。</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>'{0}' 引数が範囲外です。</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>SqlBulkCopy.DestinationTableName は無効なマルチパート名のため、SqlBulkCopy.WriteToServer が失敗しました。</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>'{0}' 引数を Null にすることはできません。</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>マルチパート名が無効なため、SQL Server からの結果を処理することができませんでした。</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>'{0}' 引数に Null 値が含まれています。</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName は、無効なマルチパート名です。</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>列 {0} が見つかりません。</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName が無効なマルチパート名です</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>列 '{0}' は既にこの DataTable に属しています。</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>SqlCommand.CommandText プロパティの値が無効なマルチパート名のため、SqlCommand.DeriveParameters が失敗しました。</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>列 '{0}' は既に別の DataTable に属しています。</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>ミラー化された SQL Server インスタンスへの MultiSubnetFailover 接続オプションを使用した接続はサポートされていません。</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>DataTable に 2 つ以上の SimpleContent 列を設定することはできません。</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>{0} 列挙値 {1} は、{2} メソッドではサポートされていません。</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>SimpleContent 列を、要素列または入れ子にされたリレーションシップを含むテーブルには追加できません。</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>{0} の列挙値 {1} は、.NET Framework SqlClient データ プロバイダーではサポートされていません。</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>'{0}' という列は既にこの DataTable に属しています。</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: CommandText プロパティは初期化されていません。</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>'{0}' という列を追加できません。: 同じ名前の、入れ子にされたテーブルが既にこの DataTable に属しています。</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: Connection プロパティは初期化されていません。</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>'{0}' という列が既にこの DataTable に属しています : 入れ子されたテーブル名を同じ名前に設定できません。</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} には Connection が開かれていて使用可能なことが必要です。{1}</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>このテーブルに属していない列を削除することはできません。</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>ストアド プロシージャ '{0}' は存在しません。</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>この列は、主キーの一部であるため、削除できません。</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>トランザクションが、現在の接続に関連付けられていないか、完了していません。</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>この列は、リレーションシップ {0} の親キーの一部になっているため、削除できません。</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>現在の接続と関連付けられているトランザクションは完了しましたが、破棄されていません。トランザクションは、接続が SQL ステートメントの実行に使用される前に破棄されなければなりません。</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>この列は、テーブル {1} で制約 {0} の一部であるため、削除できません。</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>{0} は、コマンドに割り当てられた接続が保留状態であるローカルのトランザクションにあるとき、トランザクション オブジェクトを持つコマンドが必要です。コマンドの Transaction プロパティがまだ初期化されていません。</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>この列は、式 {0} = {1} の一部であるため、削除できません。</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>この {0} に関連付けられている DataReader が既に開かれています。これを最初に閉じる必要があります。</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>計算列の AutoIncrement プロパティを設定できません。</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>{0} DeriveParameters は、CommandType.{1} ではなく、 CommandType.StoredProcedure のみサポートします。</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>DefaultValue が設定された列に対して AutoIncrement プロパティを設定できません。</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>AutoIncrement 列で DefaultValue を設定できません。</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep は 0 以外の値でなければなりません。</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>ColumnName は、それが DataTable の一部である場合には必要です。</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>データを指定した後に DataType を変更することはできません。</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>列には有効な DataType が必要です。</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>列 {0} の DefaultValue は {1} 型です。{2} に変換することはできません。</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>列の DefaultValue は {0} 型です。{1} に変更することはできません。</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>列 {0} の DefaultValue は {1} 型ですが、この列は {2} 型です。</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>Expression 列の ReadOnly プロパティを変更できません。</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>式列の Unique プロパティを変更することはできません。</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>AutoIncrement または Unique を持つ列で式を作成することはできません。</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>列を ReadOnly モードにできないため、式を設定できません。</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>列 {0} に Expression プロパティを設定できません。これは制約の一部です。</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>Expression 列 {0} に基づく制約を作成できません。</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>式に循環参照が発生したため、Expression プロパティを設定できません。</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>列 '{0}' には null 値が含まれています。</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>列 '{0}' に nulls を使用することはできません。</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>列 '{0}' は読み取り専用です。</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>列 '{0}' には一意でない値が含まれています。</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>列 '{0}' はテーブル {1} に属していません。</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>列はテーブルに属していなければなりません。</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>列 {1} に &lt;{0}&gt; を格納できませんでした。 必要な型は {2} です。</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>Column '{0}' を null に設定できません。DBNull を使用してください。</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>列 '{0}' を設定できません。値が、この列に指定できる MaxLength の制限を超えています。</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength は、文字列データ型にのみ適用します。Column '{0}' プロパティの MaxLength を、負でない数に設定することはできません。</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>Column '{0}' プロパティの MaxLength を '{1}' に設定できません。テーブルに、新しい制限よりも長い文字列が少なくとも 1 つあります。</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Column '{0}' プロパティの MaxLength を設定できません。この Column は SimpleContent です。</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>Column '{0}' プロパティの DataType を {1} に設定できません。この Column は SimpleContent です。</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>Column '{0}' プロパティの MappingType を SimpleContent に設定できません。Column の DataType は {1} です。</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>Column '{0}' が MaxLength の制限を超えています。</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>列 '{0}' で DBNull.Value を使用できません。</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>Column '{0}' プロパティの Namespace を変更できません。この Column は SimpleContent です。</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>'{0}' 型 の DataColumn AutoIncrement は、一度データが設定されたら変更できません。</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>列 '{0}' は基になるテーブル {1} に属していません。</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>'{0}' 型の DataColumn は complexType です。複合型の値を Attribute としてシリアル化することはできません</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>DateTimeMode を設定できるのは、DateTime 型の DataColumns に対してのみです。</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>'{0}' は無効な DataSetDateTime 値です。</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>テーブルにデータを指定した後は、DateTimeMode を '{0}' から '{1}' に変更することはできません。</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Type '{0}' には static Null プロパティまたはフィールドがありません。</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>型 '{0}' は IRevertibleChangeTracking を実装しないため、RejectChanges() を実行できません。</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>SetAdded および SetModified を呼び出せるのは、DataRowState プロパティの値が Unchanged である DataRows オブジェクトからのみです。</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>序数 {0} は最大数を超えています。</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet は System.Nullable&lt;&gt; をサポートしていません。</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>制約の名前が ConstraintCollection にあるときは、それを空の文字列に変更することはできません。</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>制約 {0} の制約を適用できません。</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>列 '{0}' は一意であるように制約されています。値 '{1}' は既に存在します。</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>制約 '{0}' はこの DataTable に属していません。</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>制約 {0} が見つかりません。</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>{0} という制約に一致する制約が既にコレクションに存在します。</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>'{0}' という Constraint は既にこの DataTable に属しています。</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>これらの列には現在一意の値が含まれていません。</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>これらの列はこのテーブルをポイントしていません。</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>対応する親の値が指定されてない値があるため、この制約を有効にできません。</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>ForeignKey がテーブル {0} に属していないため、この制約を追加できません。</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>このテーブルに属していない制約を削除することはできません。</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>一意性制約 '{0}' を削除できません。外部キー制約 '{1}' を最初に削除してください。</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>制約がリレーションシップ {0} で適用され、この行を削除すると子行が孤立するため、この行を削除できません。</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>制約がリレーションシップ {0} で適用され、この値を変更すると子行が孤立するため、変更できません。</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>ForeignKeyConstraint {1} によって制約が実行され、{2} に子行が存在するため、テーブル {0} を消去できません。</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>ForeignKeyConstraint {0} には親テーブルに存在している子キー値 ({1}) が必要です。</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>以下の理由によりプロパティにアクセスできません : '{0}'</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>この行を削除できません。この行には子行が含まれており、リレーションシップ {0} の制約が適用されます。</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>主キーは既にテーブルで設定されているので、主キーの制約を追加できません。</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>入れ子になった 2 つのリレーションシップでは、子テーブルである DataTable '{0}' に制約を追加することはできません。</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>異なるテーブルに属する列からキーを作成することはできません。</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>0 個の列を指定することはできません。</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>{0} 列を超える列を指定することはできません。</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>同じ列が 2 つ以上リストにある場合はキーを作成できません : '{0}'</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>テーブルの主キーであるため、一意性制約を削除できません。</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>テーブル {0} の主キーであるため、一意性制約を削除できません。</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>親列および子列に型が一致する列が含まれていません。</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey と ChildKey が同一です。</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns と ChildColumns は同じ長さでなければなりません。</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns と ChildColumns の長さを 0 にすることはできません。</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>この行は、このリレーションシップと同じ DataSet に属していません。</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>RelationName は、DataSet の一部になっている場合には必要です。</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows には、Table {0} に属する行が必要ですが、指定された行の Table は {1} です。</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>このリレーションシップをこの DataSet に追加するには、DataSet にある 2 つのテーブルをこのリレーションシップで関連付けなければなりません。</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRows には、テーブル {0} に属する行が必要ですが、指定された行のテーブルは {1} です。</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow にはテーブル {0} の子行が必要ですが、指定された行のテーブルは {1} です。</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>異なる DataSet のテーブル間にリレーションシップを指定することはできません。</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>異なる DataSet のテーブル間にリレーションシップを作成することはできません。</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>これらの子列には既にリレーションシップが存在します。</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>このリレーションシップはこのリレーションシップ コレクションに属していません。</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>このリレーションシップは既に別の DataSet に属しています。</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>このリレーションシップは既にこの DataSet に属しています。</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>'{0}' という Relation は既にこの DataSet に属しています。</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>Relation {0} はこの DataSet に属していません。</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>リレーションシップ {0} が見つかりません。</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>null のテーブルにコレクションを作成することはできません。</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>このコレクションがリレーションシップを示すテーブルは、DataSet から削除されています。</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>子テーブルに指定されていないこのテーブルの ParentRelation コレクションにリレーションシップを追加することはできません。</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>リレーションシップをこのテーブルの ChildRelation コレクションに追加できません。このテーブルは親テーブルではありません。</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>このリレーションシップに対し、'Nested' プロパティを false に設定することはできません。</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>入れ子になった 2 つのリレーションシップでは、同じテーブル '{0}' を子テーブルにすることはできません。</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>テーブル ({0}) を、入れ子にされたリレーションシップでそれ自体の子テーブルにすることはできません。</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>親テーブルと子テーブル間で異なる Locale または CaseSensitive 設定を含む DataRelation または Constraint を追加できません。</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>親の列または子の列が DataSet にない場合は、DataRelation を作成できません。</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>それ自体の名前空間を継承する入れ子テーブル '{0}' は、名前空間が異なる複数の親テーブルを持つことはできません。</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>名前空間が空で、入れ子になったテーブル '{0}' は、異なる名前空間の親テーブルを複数持つことはできません。</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>この行は、このリレーションシップと同じ DataSet に属していません。</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>テーブルにない行でこの操作を実行することはできません。</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>このリレーションシップおよび子行は同じ DataSet に属していません。</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>RowChanging イベント内の各値を変更することはできません。</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>OnRowChanging イベント内部で EndEdit() を呼び出すことはできません。</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>RowChanging イベント内部で BeginEdit() を呼び出すことはできません。</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>OnRowChanging イベント内部で CancelEdit() を呼び出すことはできません。この更新をキャンセルするには exception をスローしてください。</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>OnRowDeleting イベント内部で Delete を呼び出せません。この Delete をキャンセルするには、exception をスローしてください。</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>入力アレイの長さがこのテーブルの列数を超えています。</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>アクセスする Current データがありません。</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>アクセスする Original データがありません。</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>アクセスする Proposed データがありません。</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>この行はテーブルから削除されており、データは含まれていません。BeginEdit() を使うとこの行に新しいデータを作成することができます。</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>削除された行を通して、その行の情報にアクセスすることはできません。</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>バージョンは、Original、Current、または Proposed でなければなりません。</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>位置 {0} に行がありません。</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>行の挿入位置 {0} が無効です。</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>'{1}' という名のテーブルの rowOrder value={0} が 2 度見つかりました。</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>テーブル '{0}' の rowOrder シーケンスに値がありません。</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>指定された DataRow は現在の DataRowCollection ではありません。</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>この行は既に別のテーブルに属しています。</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>この行は既にこのテーブルに属しています。</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>この行は既に削除されているため、さらに削除することはできません。</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>この行は空です。</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>既に削除されている行を削除することはできません。</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>子行に複数の親行が含まれています。</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>行状態のビット パターンを認識できません。</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>DataSet の名前を空の文字列に変更できません。</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>名前 '{0}' が無効です。DataSet に DataTable と同じ名前を指定することはできません。</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>スキーマ名前空間が無効です。{0} を使用してください。</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>CaseSensitive または Locale プロパティを変更できません。この変更によって、関連テーブル間に少なくとも1 つの DataRelation または Constraint の異なる Locale または CaseSensitive 設定が指定されることになります。</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>派生した DataSet に SchemaSerializationMode のプロパティがオーバーライドされる場合のみ、このプロパティを設定することができます。</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>PrimaryKey 列はこのテーブルのものではありません。</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>入れ子にされたリレーションシップまたは要素列を、SimpleContent 列を含むテーブルに追加することはできません。</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>TableName は、DataSet の一部になっている場合には必要です。</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable は既に単一のコンテンツ コラムを持っています。</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>テーブルに主キーがありません。</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} は有効な Sort 文字列エントリではありません。</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>DataTable をシリアル化できません。1 つ以上の DataColumn 式中で使われている DataTable が、現在の DataTable の子孫ではありません。</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>この DataTable は、DataSet の一部としてリモートから操作できません。1 つ以上の複数の式列に他の DataTable への参照が保持されています。</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>DataSet および DataTable のリモーティング フォーマット プロパティの値は、同じでなくてはなりません。</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>DataTable をシリアル化できません。DataTable の名前が設定されていません。</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>'{0}' という DataTable は既にこの DataSet に属しています。</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>同じ Namespace '{1}' の '{0}' という DataTable は、既にこの DataSet に属しています。</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>入れ子にされたリレーションシップで、テーブル ({0}) をそれ自体の子テーブルにすることはできません。DataSet 名がテーブル名と競合しています。 </value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>名前 '{0}' は無効です。DataTable に DataSet と同じ名前を指定することはできません。</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable は既に別の DataSet に属しています。</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable は既にこの DataSet に属しています。</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>テーブル {0} はこの DataSet に属していません。</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>テーブル {0} が見つかりません。</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>既存のリレーションシップを含むテーブルを削除することはできません。最初にリレーションシップを削除してください。</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>{0} は ForeignKeyConstraint {1} で参照されているため、削除できません。最初に制約を削除してください。</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>DataTable '{0}' は、ソースの DataTable のどれにも一致しません。</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>ターゲットの DataSet に {0} の定義が見つかりません。</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>ターゲットの DataSet に {0} {1} がありません。</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} と &lt;source&gt;.{0} は競合するプロパティがあります : DataType プロパティの不一致</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey と &lt;source&gt;.PrimaryKey の Length が異なります。</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>PrimaryKey 内に列の不一致があります : &lt;target&gt;.{0} に対する &lt;source&gt;.{1} です。</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>キーに一致しない列があるため、Relation {0} をマージできません。</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>ターゲット テーブル {0} に列 {1} の定義が見つかりません。</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>PrimaryKey 列 {0} は、ソースの Table にありません。</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>RowStates パラメーターには、DataViewRowState 列挙値の有効な組み合わせを設定する必要があります。</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Find は、並べ替え順序に基づいて行を検索しますが、並べ替え順序が指定されていません。</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>インデックスを付加するキーには {0} 値が必要ですが、{1} 値を取得しました。</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>集約関数 {0}() および型 : {1} の使用が無効です。</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>ストレージ型 : {0} が無効です。</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>DataSet Xml 持続性は、値 '{0}' を Char 値としてサポートしません。Byte ストレージを使用してください。</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>値の型が列の型と合いません。</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>型 '{0}' には IComparable インターフェイスは実装されていません。比較を実行できません。</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>{0} を設定できません。</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>既に DataSet の既定ビューになっている DataViewManager で DataSet を変更することはできません。</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter で、ModifiedOriginals と ModifiedCurrents を同時に表示することはできません。</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>DataViewManager の DefaultView または DataView で Table プロパティを変更することはできません。</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>設定された DataSet プロパティを変更することはできません。</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>DataViewManager を使う前に DataSet を設定しなければなりません。</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>設定された Table プロパティを変更することはできません。</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>DataView を使う前に DataTable を設定しなければなりません。</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>名前のない DataTable にはバインドできません。</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>オブジェクトをこの一覧に設定できません。</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>AllowNew が False のときに DataView で AddNew を呼び出すことはできません。</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView が開かれていません。</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>リレーションシップがこの DataView がポイントするテーブルの親になっていません。</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>AllowDelete が false のときに DataSource で削除することはできません。</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>AllowEdit が false のとき、DataSource を編集することはできません。</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>インデックス {0} は負の値であるか、行カウントの合計よりも小さい値です。</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>外部オブジェクトをこの一覧に追加できません。</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>この一覧をクリアできません。</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>外部オブジェクトをこの一覧に挿入することはできません。</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>一覧にないオブジェクトを削除できません。</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} は、テーブル {1} の DataColumn でも DataRelation でもありません。</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>Range オブジェクトの Min ({0}) は、 max ({1}) 以下でなければなりません。</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>範囲が null です。</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>MinimumCapacity は負でない値でなければなりません。</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>名前 '{0}' のための識別子を生成できません。</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>'{0}' という名前のテーブルが複数あります (名前空間は異なる場合があります)。</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>列 '{0}': 型 '{1}' を Null にすることはできません。</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>列 '{0}': 型 '{1}' にはパラメーターなしのコンストラクターがありません。</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>列 '{0}': 型 '{1}' には文字列引数を持つコンストラクターがありません。</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>型 '{0}' のオブジェクトを型 '{1}' のオブジェクトに変換できません。</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception が発生しました。</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception が発生しました。</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>削除された行にはアクセスできません。</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>重複した名前は許可されていません。</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>RowChanging イベントではサポートされない操作です。</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>制約が無効です。</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>主キーがありません。</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Null は許可されていません。</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>列は読み取り専用としてマークされています。</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>テーブルに行がありません。</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>バージョンが見つかりません。</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>ReadOnly データが変更されています。</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader は、現在の DataTable '{0}' に対しては無効です。</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader に保持されている DataTable '{0}' のスキーマは変更されています。DataTableReader は無効です。</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>DataTableReader を作成できません。DataSet に DataTable がありません。</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>DataTableReader を作成できません。引数が空です。</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>DataTableReader を作成できません。引数に null 値が保持されています。</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>現在の DataRow の状態は Deleted であるか Detached です。</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>現在の DataTable '{0}' は空です。DataTable に DataRow がありません。</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>DataTable の内部インデックスが破損しています。'{0}'</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>コレクションが修正されました。列挙操作が実行されない可能性があります。</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>単純型 '{0}' は既に別の '{1}' を使用して宣言されています。</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>foliation が無効です。</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>テーブル名に関連付けられた DataSet が読み込まれた XML ドキュメントに割り当てられた後は、このテーブル名を変更できません。</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>テーブル名前空間に関連付けられた DataSet が読み込まれた XML ドキュメントに割り当てられた後は、このテーブル名前空間を変更できません。</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>列名に関連付けられた DataSet が、読み込まれた XML ドキュメントに割り当てられた後は、この列名を変更できません。</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>列名前空間に関連付けられた DataSet が、読み込まれた XML ドキュメントに割り当てられた後は、この列名前空間を変更できません。</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>関連付けられた DataSet が、読み込まれた XML ドキュメントに割り当てられた後に ColumnMapping プロパティを変更できません。</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>DataSet が読み込まれた XML ドキュメントに割り当てられた後に、テーブルの列を追加または削除することはできません。</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>DataSet が読み込まれた XML ドキュメントに割り当てられた後に、DataSet のテーブルを追加または除することはできません。</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>DataSet が読み込まれた XML ドキュメントに割り当てられた後に、入れ子にされたデータセットのリレーションシップを追加、削除、または変更することはできません。</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>DataSet パラメーターが無効です。null にすることはできません。</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>DataSet が読み込まれた XML ドキュメントに割り当てられた後は DataSet 名を変更できません。</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>この種類のノードは複製できません : {0}</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>XmlDataDocument が既にデータを含んでいる場合はこの XmlDataDocument を読み込めません。新しい XmlDataDocument を使ってください。</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>DataSet は 1 つの XmlDataDocument のみに関連付けられます。この DataSet は既にほかの XmlDataDocument に関連付けられているため、現在の XmlDataDocument に DataSet を関連付けることはできません。</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>XML 操作を使って XmlDataDocument を編集する前に、DataSet.EnforceConstraints == false に設定してください。</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>GetElementById() は DataDocument でサポートされていません。</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>DataDocument にエンティティ参照を作成できません。</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>DateSet および DataTable の Clear 機能は XmlDataDocument でサポートされていません。</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>列がこの dataSet に組み込まれているため、削除できません。</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>リレーションシップがこの dataSet に組み込まれているため、削除できません。</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>このコントロールのプロパティが変わるときに発生します。</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>このコレクションのメンバーシップが変わるたびに発生します。</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>値が DBNull のため、取得できません。</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>'{0}' プロパティを使用する場合は、Microsoft WindowsNT または WindowsNT ベースのオペレーティング システムが必要になります。</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>要求された .NET Framework データ プロバイダーが見つかりません。これはインストールされていない可能性があります。</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>要求された .NET Framework データ プロバイダーの実装には、System.Data.Common.DbProviderFactory の派生型の Instance フィールドがありません。</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>登録されている .NET Framework データ プロバイダーが見つからないか、読み込めませんでした。</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>見つからない .NET Framework データ プロバイダーのアセンブリ修飾名は必須です。</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>指定できるのは要素だけです。</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>子ノードは指定できません。</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>認識されていない属性 '{0}' です。</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>認識されない要素です。</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>'{0}' セクションは、1 つの構成ファイルで 1 回しか使用できません。</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>必要な属性 '{0}' が見つかりません。</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>必要な属性 '{0}' を空にすることはできません。</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>'{0}' パラメーターには空でない配列が必要です。</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>プロパティ '{0}' に使用できる値は '{1}' のみです。</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>プロパティ '{0}' に使用できる値は '{1}' または '{2}' です。</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>指定された QuotePrefix の値と QuoteSuffix の値が一致しません。</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>引数 '{0}' の長さが、上限の '{1}' を超えています。</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>型 {1} の引数を予期していましたが、型 {0} が渡されました。</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>キー '{0}' の値が無効です。</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>'{0}' キーを使用するには、キーとして '{1}' が指定されている必要があります。</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>キー '{0}' の値の長さが、制限 '{1}' を超えています。</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>キーワード '{0}' はサポートされていません。</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>UDL ファイルを読み込めません。</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>無効な UDL ファイルです。</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>.NET Framework Data Provider の内部エラー {0} です。</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>QuotePrefix および QuoteSuffix プロパティは、Insert、Update または Delete コマンドが一度生成されると、もはや変更できません。</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>DataAdapter.SelectCommand プロパティを初期化する必要があります。</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>DataAdapter.SelectCommand.Connection プロパティは初期化する必要があります。</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}"。</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}"。引用符の使い方に誤りがあります。</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}"。現在の制限値 "{2}" は十分ではありません。</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>SqlBulkCopy.DestinationTableName は無効なマルチパート名のため、SqlBulkCopy.WriteToServer が失敗しました。</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>マルチパート名が無効なため、SQL Server からの結果を処理することができませんでした。</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName は、無効なマルチパート名です。</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName が無効なマルチパート名です</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>SqlCommand.CommandText プロパティの値が無効なマルチパート名のため、SqlCommand.DeriveParameters が失敗しました。</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>OdbcCommand.CommandText プロパティの値が無効なマルチパート名のため、OdbcCommandBuilder.DeriveParameters が失敗しました。</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>OleDbCommandBuilder.CommandText プロパティの値が無効なマルチパート名のため、OleDbCommandBuilder.DeriveParameters が失敗しました。</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>ミラー化された SQL Server インスタンスへの MultiSubnetFailover 接続オプションを使用した接続はサポートされていません。</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>DataColumn '{1}' は計算列であるため、SourceColumn '{0}' からの列マップは失敗しました。</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>SourceColumn '{1}' の '{0}' と {3} の DataColumn '{2}' の間に変換不可能な型の不一致があります。</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>SourceColumn '{2}' の DataTable '{1}' に DataColumn '{0}' が見つかりません。</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>SourceColumn には空でない文字列が必要です。</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>'{0}' の SourceColumn マップが見つかりません。</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} 列挙値 {1} は、{2} メソッドではサポートされていません。</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} の列挙値 {1} は、.NET Framework Odbc データ プロバイダーではサポートされていません。</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} の列挙値 {1} は、.NET Framework OleDb データ プロバイダーではサポートされていません。</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} の列挙値 {1} は、.NET Framework SqlClient データ プロバイダーではサポートされていません。</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>ComputerNameDnsFullyQualified を取得することができません。{0}。</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>'{1}' SourceTable の '{0}' DataTable が見つかりません。</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>SourceTable には空でない文字列が必要です。</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>SourceTable マップ : '{0}' が見つかりません。</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: CommandText プロパティは初期化されていません。</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: Connection プロパティは初期化されていません。</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} には Connection が開かれていて使用可能なことが必要です。{1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: SelectCommand.Connection プロパティが初期化されていません。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: SelectCommand.Connection プロパティが初期化されていません。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: SelectCommand.Connection プロパティが初期化されていません。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>更新には、InsertCommand に接続オブジェクトを指定する必要があります。InsertCommand の Connection プロパティは初期化されていません。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>更新には、UpdateCommand に接続オブジェクトを指定する必要があります。UpdateCommand の Connection プロパティは初期化されていません。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>更新には、DeleteCommand に接続オブジェクトを指定する必要があります。DeleteCommand の Connection プロパティは初期化されていません。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>更新には接続オブジェクトが必要ですが、Connection プロパティが初期化されていません。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>更新には、コマンドの複製に接続オブジェクトを指定する必要があります。コマンドの複製の Connection プロパティは初期化されていません。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>更新には接続が必要です。</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Update は {0}Command を使用して、開かれた接続オブジェクトを持つ必要があります。{1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Update は {0}Command を使用して、開かれた接続オブジェクトを持つ必要があります。{1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Update は {0}Command を使用して、開かれた接続オブジェクトを持つ必要があります。{1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Update は更新コマンドを使用して、開かれた接続オブジェクトを持つ必要があります。{1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>ストアド プロシージャ '{0}' は存在しません。</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>このコマンドに割り当てられたトランザクションは、最下層で入れ子にされた保留中のローカル トランザクションでなければなりません。</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>トランザクションが、現在の接続に関連付けられていないか、完了していません。</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>現在の接続と関連付けられているトランザクションは完了しましたが、破棄されていません。トランザクションは、接続が SQL ステートメントの実行に使用される前に破棄されなければなりません。</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>{0} は、コマンドに割り当てられた接続が保留状態であるローカルのトランザクションにあるとき、トランザクション オブジェクトを持つコマンドが必要です。コマンドの Transaction プロパティがまだ初期化されていません。</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>このコマンドに関連付けられている SqlResultSet が既に開かれています。これを先に閉じる必要があります。</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>この {0} に関連付けられている DataReader が既に開かれています。これを最初に閉じる必要があります。</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>{0} DeriveParameters は、CommandType.{1} ではなく、 CommandType.StoredProcedure のみサポートします。</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>同じ実行操作に対して、メソッド '{0}' を複数回呼び出すことはできません。</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>非同期の結果が正しくありません。</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>'{0}' を呼び出す前に、SelectCommand プロパティが初期化されませんでした。</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>StatementType {0} がここに存在するのは誤りです。</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: SourceTable 名に空の文字列を指定できません。</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>{0} の MaxRecords 値が無効です。値は 0 以上でなければなりません。</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>{0} の StartRecord 値が無効です。値は 0 以上でなければなりません。</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: SourceTable 名に空の文字列を指定できません。</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>階層チャプター コラムは AutoIncrement DataColumn に割り当てしなければなりません。</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) から null が返されました。</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>startRecords または maxRecords の値に 0 以外を使用するときは、配列 dataTables には項目を 1 つだけ指定してください。</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Update で TableMapping['{0}'] 、または DataTable '{0}' が見つかりませんでした。</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update : 空でない SourceTable 名を指定してください。</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>TableMapping.DataSetTable='{0}' のときに TableMapping が見つかりません。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Update ではコマンドの複製が有効である必要があります。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>Update 中の自動 SQL 生成には、有効な SelectCommand が必要です。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Update には、新しい行を含む DataRow コレクションが渡されたとき、有効な InsertCommand が必要です。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>更新には、変更された行を含む DataRow コレクションが渡されたとき、有効な UpdateCommand が必要です。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Update には、削除された行を含む DataRow コレクションが渡されたとき、有効な DeleteCommand が必要です。</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}] は DataRow[0] とは異なる DataTable からのものです。</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent : エラーが発生しました。エラーの詳細情報はありません。</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent : エラーが発生しました。エラーの詳細情報はありません。</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>バッチ処理をする場合、コマンドの UpdateRowSource.FirstReturnedRecord または UpdateRowSource.Both の UpdatedRowSource プロパティの値は無効です。</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>同時実行違反 : UpdateCommand によって、処理予定の {1} レコードのうち {0} 件が処理されました。</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>同時実行違反 : DeleteCommand によって、処理予定の {1} レコードのうち {0} 件が処理されました。</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>同時実行違反 : バッチ処理されたコマンドによって、処理予定の {1} レコードのうち {0} 件が処理されました。</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>同じ実行操作に対して、メソッド '{0}' を複数回呼び出すことはできません。</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>CommandTimeout 値 {0} が無効です。値は 0 以上でなければなりません。</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>'{1}[{0}]: Size プロパティのサイズが 0 です。これは無効です。</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>{0}.Prepare メソッドは、パラメーターはすべて明示的に設定された型を持つことを要求します。</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>{0}.Prepare メソッドは、可変長のパラメーターはすべて明示的に設定された non-zero Size を持つことを要求します。</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>{0}.Prepare メソッドは明示的に設定された Precision および Scale を持つ型 '{1}' のパラメーターが必要です。</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>asyncResult の end メソッド呼び出しが適切ではありません。{0} を呼び出す必要がありますが、{1} が呼び出されました。</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>操作が無効です。接続は閉じています。</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>接続が無効にされています。</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>接続上でローカル トランザクションが実行中のため、トランザクションに参加できません。ローカル トランザクションを終了して、再試行してください。</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>接続には現在参加しているトランザクションがあります。現在のトランザクションを終了して、再試行してください。</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>データベースを Null、空の文字列またはスペースのみを含む文字列にすることはできません。</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>引数が長すぎます。</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Connect Timeout' の値が無効です。値は、0 以上の整数値でなければなりません。</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>ソース バッファー (サイズ {0}) オフセットが無効です : {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>ターゲット バッファー (サイズ {0}) オフセット : {1} が無効です。</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>この数値は 10 進数の 96 ビットに適合させるには大きすぎます。</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>ストリームが閉じているときに {0} を実行しようとしましたが無効です。</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>指定した SeekOrigin の値は無効です。</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>複数のベース テーブルに対する動的 SQL の生成はサポートされません。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>動的 SQL 生成は、ベース テーブル情報を返さない SelectCommand に対してサポートされていません。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>DeleteCommand の動的 SQL 生成は、キー列情報を返さない SelectCommand に対してはサポートされていません。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>UpdateCommand の動的 SQL 生成は、キー列情報を返さない SelectCommand に対してはサポートされていません。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>DeleteCommand の動的 SQL 生成は、行バージョンの列を含まない SelectCommand に対してはサポートされていません。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>UpdateCommand の動的 SQL 生成は、行バージョンの列を含まない SelectCommand に対してはサポートされていません。</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>QuotePrefix または QuoteSuffix 文字 '{1}' を含むテーブル名 '{0}' は、動的 SQL 生成のサポートの対象になっていません。</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>列番号 '{0}' から読み取ろうとしました。これは無効な処理です。CommandBehavior.SequentialAccess を使う場合、序数値 '{1}' 以上の列からのみ読み取ることができます。</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>無効な日付と時刻の数字が指定されているため、データ型 '{0}' をリテラルとしてフォーマットできません。</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>この値は、要求したデータ型のリテラルとしてフォーマットできません。</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>無効な最大スケールがデータ型 '{0}' に含まれているため、これをリテラルとしてフォーマットすることはできません。</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>指定されたリテラル値は、データ型 '{0}' のリテラルとしては無効です。</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>'{0}': リテラル値の長さは偶数である必要があります。</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>'{0}': リテラル値は 16 進数表記の文字列である必要があります。</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>引用符で囲まれたプレフィックスが設定されていない場合、{0} には開かれている接続が必要です。</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>正しいブール型のリテラル値を特定できません。Boolean リテラルを作成できません。</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>データ型 '{0}' に関連付けられたネイティブ データ型のリテラルはサポートされていません。</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>{0} のパラメーター データ型が無効です。</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>オブジェクトの型 {0} から既知のマネージ プロバイダーのネイティブ型へのマップがありません。</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>型 {1} によって返された不明な TypeCode {0} を処理できません。</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>DbType {0} から周知の型 {1} へのマッピングは存在しません。</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>使用されている SQL Server のバージョンでは、データ型 '{0}' がサポートされていません。</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>パラメーター値 '{0}' が範囲外です。</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>指定したパラメーター名 '{0}' は無効です。</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>複数の戻り値パラメーターはサポートされていません。</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>パラメーター Size の値 '{0}' が無効です。値は 0 に等しいか、またはそれより大きくなければなりません。</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>引数 '{0}' は無効な値です。0 以上の値を指定してください。</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>このメタデータの値は無効です。</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>メタデータは SqlDbType.Row 型である必要があります。</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>パラメーター値を {0} から {1} に変換できませんでした。</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} はパラレル トランザクションをサポートしません。</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>この {0} は完了しています。再度使用することはできません。</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>レコードが読み取り専用の場合は、'{0}' を呼び出すことはできません。</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>DbDataRecord が読み取り専用の場合は、'{0}' を呼び出すことはできません。</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>オブジェクトの型 '{0}' のデータ型 '{1}' への暗黙的な変換はサポートされていません。</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>バッファー オフセット '{1}' と使用できるバイト数 '{0}' の合計が、バッファーに渡された長さを超えています。</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>データの長さ '{0}' が 0 未満です。</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>指定された長さ '{0}' は有効範囲外です。</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>dataIndex '{0}' での操作 {2} は無効です。CommandBehavior.SequentialAccess を使用する読み取りは、dataIndex '{1}' またはそれ以上のみ可能です</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>オフセットは、値内の場所を参照する必要があります。</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"ODBC マネージド プロバイダーでは、TABLE_NAME 制約の指定が必要です。GetSchema インデックス コレクションの場合は、この制約は Null でない必要があります。</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>メソッド '{0}' の引数の値が無効です。</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>ODBC プロバイダーが SQLGETTYPEINFO から結果を返しませんでした。</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>予期しない null DataTable 引数です。</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>予期しない null DataSet 引数です。</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>接続文字列が長さの最大許容値 {0} を超えています。</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} - 型をマップできません。</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>不明な SQL の種類です - {0}。</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>不明な URT の種類です - {0}。</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>無効な負の引数です!</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>プロパティは開いている接続には設定できません。</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>System.Data.IsolationLevel 列挙値への SQL_TRANSACTION '{0}' の有効なマップがありません。</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} - 接続プールを有効にすることができません...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} - 環境ハンドルを割り当てることができません。</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} - 記述子ハンドルを取得できません。</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>トランザクションにありません。</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>OdbcType 列挙の value={0} は無効です。</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>DBNull.Value データが渡される場合は、IsDBNull を使用してください。</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} - エラー情報が使用できません。</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>接続が閉じています。</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>内部接続の所有者がありません。</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>.NET Framework Odbc データ プロバイダーには、Microsoft Data Access Components(MDAC) バージョン 2.6 以降が必要です。現在インストールされているバージョンは {0} です。</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>.NET Framework OleDb データ プロバイダーには Microsoft Data Access Components(MDAC) バージョン 2.6 以降が必要です。現在インストールされているバージョンは {0} です。</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>'{0}' インターフェイスは、'{1}' プロバイダーではサポートしていません。GetOleDbSchemaTable を現在のプロバイダーで使用することはできません。</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>'{0}' は失敗しましたが、エラー メッセージはありません。結果コードは {1} です。</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>エラー メッセージはありません。結果コードは {0} です。</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>.NET Framework データ プロバイダーには Microsoft Data Access Components(MDAC) が必要です。Microsoft Data Access Components(MDAC) バージョン 2.6 以降をインストールしてください。</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>.NET Framework Data Provider for OLEDB (Microsoft.Data.OleDb) では、Microsoft OLE DB Provider for ODBC Drivers (MSDASQL) がサポートされていません。.NET Framework Data Provider for ODBC (System.Data.Odbc) を使用してください。</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>.NET Framework Data Provider for OLEDB では、非インタラクティブな環境にある場合、OLE DB プロバイダーがユーザーにメッセージを表示することを許可していません。</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>'{0}' プロバイダーはローカルのコンピューターに登録されていません。</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>ICommandText インターフェイスは '{0}' プロバイダーによってサポートされていません。代わりに、CommandType.TableDirect 使用してください。</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>ITransactionLocal インターフェイスは、'{0}' プロバイダーではサポートしていません。ローカル トランザクションを現在のプロバイダーで使用することはできません。</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>初期化文字列の形式が OLE DB 仕様に適合しません。接続文字列の char[{0}] 付近で始まっています。</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>'Asynchronous Processing' は、.NET Framework Data OLE DB Provider(Microsoft.Data.OleDb) でサポートされている機能ではありません。</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>OLE DB プロバイダーが ConnectionString で指定されませんでした。たとえば 'Provider=SQLOLEDB;' などの場合です。</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>ConnectionString で指定された OLE DB プロバイダーの文字列が長すぎます。</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>DbInfoKeywords OleDbSchemaGuid に制限が設定されているのは誤りです。</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>OleDbSchemaGuid DbInfoLiterals に制限はありません。</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>スキーマの guid、OleDbSchemaGuid に制限が設定されているのは誤りです。</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>{0} OleDbSchemaGuid は '{1}' プロバイダーによってサポートされたスキーマではありません。。</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>構成設定 '{0}' に指定されている値の数が正しくありません。</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>構成設定 '{0}' で指定されている XML ファイルを読み込めません。</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>コマンド引数 [{0}] '{1}' が無効です。</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>署名の不一致またはデータ オーバーフロー以外の理由により、コマンド引数 [{0}] '{1}' データ値を変換できませんでした。</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>コマンド引数 [{0}] '{1}' の変換に失敗しました。データ値が signed であるのに対し、プロバイダーが使用する型は unsigned です。</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>コマンド引数 [{0}] '{1}' の変換に失敗しました。データ値がプロバイダーで使われた型をオーバーフローしました。</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>コマンド引数 [{0}] '{1}' 値を送出中にエラーが発生したため、プロバイダーは処理を中止しました。</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>パラメーター [{0}] '{1}' に既定値がありません。</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>パラメーター [{0}] で、次のエラーが発生しました。{1}</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Microsoft.Data.OleDb.OleDbDataAdapter の内部エラー : パラメーター アクセサーが無効です: {0} {1}。</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter [{0}]: OleDbType プロパティが初期化されていません。OleDbType.{1}</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>ICommandWithParameters インターフェイスは '{0}' によってサポートされていません。現在のプロバイダーはコマンド パラメーターをサポートしません。</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>プロシージャ パラメーター情報の取得は '{0}' プロバイダーによってサポートされていません。</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>サーバーの桁区切り記号を特定できません。integer 以外の数値リテラルは作成できません。</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>オブジェクトは ADODB.RecordSet または ADODB.Record ではありません。</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>ADODB.RecordSet オブジェクトから '{0}' インターフェイスを取得することができません。</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>'{1}[{0}]: Size プロパティのサイズが 0 です。これは無効です。</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>ADODB.Record オブジェクトから IRow インターフェイスを取得することができません。</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>{0}.Prepare メソッドは、パラメーターはすべて明示的に設定された型を持つことを要求します。</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>型は OLE DB インターフェイス ISourcesRowset をサポートしていません。</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>{0}.Prepare メソッドは、可変長のパラメーターはすべて明示的に設定された non-zero Size を持つことを要求します。</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>プロバイダーが IDBInfo をサポートしていないため、ReservedWords スキーマ コレクションを作成できません。</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>{0}.Prepare メソッドは明示的に設定された Precision および Scale を持つ型 '{1}' のパラメーターが必要です。</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>プロパティの値は設定されませんでした。プロバイダーが '{0}' プロパティをサポートしていなかったか、Initialization プロパティ グループのメンバーではないプロパティの値をコンシューマーが取得または設定しようとしたときにデータ ソース オブジェクトが初期化されていませんでした。</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>asyncResult の end メソッド呼び出しが適切ではありません。{0} を呼び出す必要がありますが、{1} が呼び出されました。</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>次のいずれかの理由により、'{0}' プロパティを初期化できませんでした。
-	値のデータ型が、プロパティのデータ型ではないか、Null ではありません。たとえば、プロパティが DBPROP_MEMORYUSAGE で、このプロパティのデータ型は Int32 でしたが、値のデータ型は Int64 でした。 
-	値が無効な値です。たとえば、プロパティが DBPROP_MEMORYUSAGE でしたが、値が負の値でした。
-	値はプロパティの有効な値で、プロバイダーはプロパティを値の設定可能なプロパティとしてサポートしていますが、プロバイダーが指定された値をサポートしていません。これは、プロバイダーの作成後に OLE DB のこのプロパティに値が追加された場合などが挙げられます。</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>操作が無効です。接続は閉じています。</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>Options の値が無効な値でした。</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>接続上でローカル トランザクションが実行中のため、トランザクションに参加できません。ローカル トランザクションを終了して、再試行してください。</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>ColumnID の要素が無効な要素でした。</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>接続には現在参加しているトランザクションがあります。現在のトランザクションを終了して、再試行してください。</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>'{0}' プロパティはすべての列に適用されるように指定されていましたが、1 つ以上の列に適用できませんでした。</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>データベースを Null、空の文字列またはスペースのみを含む文字列にすることはできません。</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>'{0}' プロパティが読み取り専用であるか、データ ソース オブジェクトが初期化された後に使用者側が Initialization プロパティ グループのプロパティの値を設定しようとしました。使用者は読み取り専用プロパティの値を現在の値に設定することはできます。この状態は、特定の列の値の設定が可能な列プロパティに値が設定できなかった場合も返されます。</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>ソース バッファー (サイズ {0}) オフセットが無効です : {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>任意の '{0}' プロパティの値は指定された値に設定されませんでした。このプロパティに指定された値を設定することはできません。</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>ターゲット バッファー (サイズ {0}) オフセット : {1} が無効です。</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>既存のプロパティと競合する可能性があったため、'{0}' プロパティの値は設定されていません。</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>ストリームが閉じているときに {0} を実行しようとしましたが無効です。</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(予約済み)。</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>指定した SeekOrigin の値は無効です。</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>プロバイダーから不明な DBPROPSTATUS_ の値 '{0}' が返されました。</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>列番号 '{0}' から読み取ろうとしました。これは無効な処理です。CommandBehavior.SequentialAccess を使う場合、序数値 '{1}' 以上の列からのみ読み取ることができます。</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>アクセサーの妥当性の確認は延期され、メソッドがデータを返す間に実行されました。この列またはパラメーターの連結は無効です。</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>{0} のパラメーター データ型が無効です。</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>OleDbDataAdapter の内部エラー : 行セット アクセサーが無効です。Ordinal={0} Status={1}</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>オブジェクトの型 {0} から既知のマネージ プロバイダーのネイティブ型へのマップがありません。</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>符号の不一致またはデータ オーバーフロー以外の理由により、データ値を変換できませんでした。データ ストア内で破損しているデータが取得可能だった場合などが考えられます。</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>型 {1} によって返された不明な TypeCode {0} を処理できません。</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>プロバイダーによって、{0} データを返すメモリを割り当てることができませんでした。</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>DbType {0} から周知の型 {1} へのマッピングは存在しません。</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>変換に失敗しました。{0} データ値が、使用者側のバッファーの {0} 値に指定された型をオーバーフローしました。</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>使用されている SQL Server のバージョンでは、データ型 '{0}' がサポートされていません。</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter の内部エラー : [get] 不明な OLE DB データ型です : 0x{0} ({1})。</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>パラメーター値 '{0}' が範囲外です。</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>変換に失敗しました。{0} データ値が符号付きであるのに対し、コンシューマー バッファーの {0} 値には符号なしが指定されています。</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>指定したパラメーター名 '{0}' は無効です。</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter の内部エラー : [set] 不明な OLE DB データ型です。0x{0} ({1})</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>パラメーター Size の値 '{0}' が無効です。値は 0 に等しいか、またはそれより大きくなければなりません。</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>プロバイダーで {0} 値を特定できませんでした。たとえば、行が作成されたときに {0} 列の既定値が使用できない状態で、使用者が新しい {0} 値を設定していなかった場合が考えられます。</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>引数 '{0}' は無効な値です。0 以上の値を指定してください。</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>OLE DB プロバイダーが、予期しない {0} の状態値を返しました。</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>このメタデータの値は無効です。</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>スレッドの ApartmentState が ApartmentState.MTA 出ない場合、OleDbDataReader.Read を作成されたスレッドと同じスレッドから使用しなければなりません。</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>パラメーター値を {0} から {1} に変換できませんでした。</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>予期しないエラーです : {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} はパラレル トランザクションをサポートしません。</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>IErrorInfo.GetDescription が {0} で 失敗しました。</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>この {0} は完了しています。再度使用することはできません。</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>IErrorInfo.GetSource が {0} で 失敗しました。</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>指定された長さ '{0}' は有効範囲外です。</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>DBTYPE_VECTOR データは、.NET Framework Data OLE DB Provider(Microsoft.Data.OleDb) によってサポートされていません。</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>dataIndex '{0}' での操作 {2} は無効です。CommandBehavior.SequentialAccess を使用する読み取りは、dataIndex '{1}' またはそれ以上のみ可能です</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>プール サイズの最小値または最大値が無効です。最小プール サイズを最大プール サイズより大きい値に設定することはできません。</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>'{0}' は、古いキーワード です。代わりに '{1}' を使用してください。</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>サーバーに対する分散トランザクション コーディネーターのアドレスをサーバーから取得することができません。サーバーで DTC が有効になっているかどうかを確認してください。</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>接続パラメーター &lt;{0}&gt; の値の長さが使用できる最大値 65535 文字を超えています。</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>'Packet Size' が無効です。値は 512 以上 32768 以下の整数でなければなりません。</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>トランザクションが無効か、トランザクション内で保存するポイントの名前が無効です。</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>{0} 列挙値 {1} は SQL Server 7.0 または SQL Server 2000 ではサポートされていません。</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>User Instance と Failover は、互換性のないオプションです。接続文字列でどちらか一方のみを選択してください。</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>接続文字列で 'Authentication=Active Directory Integrated' が指定されている場合は、Credential プロパティを設定できません。</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>証明書認証で指定された認証パラメーターが正しくありません。</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>接続しようとした SQL Server インスタンスでは暗号化が必要とされていますが、このコンピューターは暗号化をサポートしていません。</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>接続しようとした SQL Server インスタンスは暗号化をサポートしていません。</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>接続しようとした SQL Server インスタンスは CTAIP をサポートしていません。</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>サポートされない SQL Server バージョンです。.NET Framework SqlClient データ プロバイダーは、SQL Server バージョン 7.0 以降でのみ使用できます。</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>非同期操作の実行中は、{0} を変更することはできません。</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>このコマンドには非同期接続が必要です。接続文字列に "Asynchronous Processing=true" を設定してください。</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>接続試行がタイムアウトしました。</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>タイムアウトに達しました。その結果、接続が切断されました。</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>インスタンス エラーです。</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>エラー コード 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword を使用するには SQL Server 9.0 以降が必要です。</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>非ローカル ユーザーのインスタンスでは、SSE インスタンスのリダイレクトを行うことはできません。</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>認証 '{0}' はサポートされていません。</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>SQL 認証方法 '{0}' はサポートされていません。</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>'{0}' の種類 '{1}' の認証プロバイダーをインスタンス化できませんでした。</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>種類 '{0}' の SqlAuthenticationInitializer をインスタンス化できませんでした。</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>初期化中にプロバイダー '{0}' が例外をスローしました。</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>プロバイダー '{0}' では認証 '{1}' はサポートされていません。</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>'{0}' の認証プロバイダーが見つかりません。Active Directory (Entra ID) 認証方法を使用するには、'Microsoft.Data.SqlClient.Extensions.Azure' NuGet パッケージ (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) をインストールしてください。</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>認証プロバイダーの構成セクションを読み取ることができませんでした。</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>パラメーター '{0}' を null や空にすることはできません。</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>この非同期操作は既に完了しています。</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>既に実行中の非同期操作が保留されているため、コマンドの実行を行えません。</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>無効なコマンドが ExecuteXmlReader に送られました。このコマンドは Xml 結果を返さなければなりません。</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>通知機能を使用するには SQL Server 9.0 以降が必要です。</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>UdtTypeName では 3 パート名のフォーマットは無効です。</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>SSPI パッケージを初期化できません。</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Timeout に達しました。操作が完了する前にタイムアウト期間が過ぎたか、またはサーバーが応答していません。</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>接続がタイムアウトしました。ログイン前フェーズの開始時にタイムアウト期間が過ぎました。接続タイムアウトに指定されている時間が短すぎる可能性があります。</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>接続文字列でユーザー インスタンスが要求されましたが、指定されたサーバーではこのオプションをサポートしていません。</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>サーバー証明書がアプリケーションの検証に失敗しました。</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>指定されているデータ長 {0} が、許可されている最大長 {1} を超えています。</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>データが存在しない場合、データの読み取りは無効です。</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>データの長さ '{0}' が 0 未満です。</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>SqlDataRecord が読み取り専用の場合は、'{0}' を呼び出すことはできません。</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>マップされているコレクションは使用中であるため、現在アクセスできません。</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>Microsoft.Data.SqlClient を使用したコンテキスト接続への接続はサポートされていません。</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>TransactionScopes を入れ子にすることはできません。</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>サーバーの予期しないイベント : {0}。</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>'{0}' と '{1}' の長さは同じである必要があります。</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>{1} に対し、SqlDbType '{0}' は無効です。サポートしているのは {2} のみです。</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>値が多すぎます。</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>Stream は書き込みをサポートしていません。</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>NULL</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>メッセージ</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>演算でオーバーフローしました。</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>0 除算エラーが発生しました。</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>データが Null です。このメソッド、またはプロパティは Null 値で呼び出せません。</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>数値演算で切り捨てが起こりました。</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>SqlDateTime のオーバーフローです。1/1/1753 12:00:00 AM から 12/31/9999 11:59:59 PM までの間でなければなりません。</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>連結する 2 つの文字列の照合順序が異なります。</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>比較する 2 つの文字列の照合順序が異なります。</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>フラグ値が無効です。</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>SqlDecimal から Decimal への変換はオーバーフローします。</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>変換オーバーフローです。</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>SqlDateTime が無効です。</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>タイム ゾーンが指定されました。SqlDateTime はタイム ゾーンをサポートしていません。</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>配列サイズが無効です。</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>数値の総桁数/小数点以下桁数が無効です。</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>入力の形式が正しくありません。</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>SqlType エラーが発生しました。</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>このバージョンでは、SqlBytes および SqlChars は 2GB までしかサポートしていません。</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>読み取り中にエラーが発生しました。</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Stream は閉じられているか後処理されています。</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>バッファーがありません。読み取りまたは書き込み操作が失敗しました。</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>現在の値は Null であるため、0 以外の長さを設定することはできません。</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>バッファーが十分にありません。読み取りまたは書き込み操作が失敗しました。</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>現在の値は Null であるため、0 以外のオフセットに書き込むことはできません。</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>現在のサイズを越えるオフセットからは書き込めません。このため、初期化されなかったデータがバッファーに残されます。</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>返されたデータのサイズが 2Gb を超えています。すべてのデータを取得するには、SequentialAccess command behavior を使用してください。</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>GetDayOfWeek の引数は 1 ～ 7 の整数である必要があります。</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>SQL Type にはデータが読み込まれていません。</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>SQL Type には既にデータが読み込まれています。</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>閉じられている XmlReader にアクセスしようとしましたが無効です。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>ストリームが閉じているときに {0} を呼び出そうとしましたが無効です。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>ストリームの書き込みができないときに {0} を呼び出そうとしましたが無効です。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>ストリームの読み取りができないときに {0} を呼び出そうとしましたが無効です。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>ストリームの検索ができないときに {0} を呼び出そうとしましたが無効です。</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>サブクラスが、必要なメソッドをオーバーライドしませんでした。</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>'{0}' のノーマライザーを作成できません。</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>内部エラー</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>コマンド パラメーターには、Null でも空でもないコマンド テキストを使用する必要があります。</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>MetaData パラメーター配列の長さは、ParameterDirection 配列引数の長さと同じである必要があります。</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>データ アダプターのマッピング エラーが発生しました。</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>データ アダプターのエラーが発生しました。</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>DB の同時実行違反が発生しました。</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>操作は中止されました。</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>例外が発生したため、操作は中止されました。詳細については、InnerException を確認してください。</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Fill が DataRow.AcceptChanges を呼び出すかどうかを示します。</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Update が DataRow.AcceptChanges を呼び出すかどうかを示します。</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Update イベント、RowUpdating および RowUpdated Status が UpdateStatus.ErrorsOccurred のとき、次の DataRow に進むかどうかを指示します。</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>アダプターが DataReader から DataTable に値を読み込む方法を示します。</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>TableMappings にテーブルまたは列が見つからない場合に実行する動作です。</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>DataSet にテーブルまたは列が見つからない場合に実行する動作です。</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>ソース テーブルを DataSet テーブルにどのように割り当てるかを指定します。</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Fill を実行中に修復可能なエラーが発生したときにイベントが発生します。</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Fill は、プロバイダー固有の値と共通の CLSCompliant の値のどちらかを返します。</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>ソース列名 - 大文字と小文字を区別します。</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>コレクション内の項目数です。</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>指定された DataColumnMapping オブジェクトです。</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>このテーブル マップが一致するときのコラム別のマップです。</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>DataTableMapping ソース テーブル名です。この名前は、大文字小文字を区別します。</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>コレクション内の項目数です。</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>指定された DataTableMapping オブジェクトです。</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>DataSet の削除された行の更新中に使用されます。</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>更新中のすべての DataRowRow の後にイベントが発生します。</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>データ ソースに対して実行される前に同時にバッチ処理される行の数です。</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Select/Insert/Update/DeleteCommands に接続が指定されていない場合に、使用される接続です。</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>DataTable 内の削除された行に対する Update の処理中に使用されます。</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>DataTable 内の新しい行に対する Update の処理中に使用されます。</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Fill の処理中に使用されます。</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>DataTable 内の変更された行に対する Update の処理中に使用されます。</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Fill は、プロバイダー固有の値と共通の CLSCompliant の値のどちらかを返します。</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>ソース テーブルを DataTable にマップする方法を示します。</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>ユーザーにより設定されていない場合に、Insert/Update/DeleteCommands が生成される方法を示します。</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>データ ソースに対して実行される前に同時にバッチ処理される行の数です。</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>Data Source への接続に使用される接続文字列です。</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>Data Source への接続時に使用される ODBC ドライバーの名前を示します。</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>Data Source への接続時に使用される DSN を示します。</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>True の場合は、管理下にある接続プールが使用されることを示します。</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>Data Source への接続時に使用される UDL ファイルを示します。</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>この OleDb Provider で有効または無効にされる OLE DB Services を示します。</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>Data Source への接続時に使用される OLE DB プロバイダーの名前を示します。</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>アプリケーションの名前。</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>True の場合は、.NET Framework データ プロバイダーの非同期機能を使用できるようになります。</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>完全なパス名を含む、接続可能なデータベースのプライマリ ファイル名です。</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>True の場合は、プールから削除されるときに接続の状態がリセットされることを示します。</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>True の場合は、接続元が Sql Server のコンテキストであることを示します。Sql Server のプロセスで実行する場合のみ使用できます。</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>SQL Server Language レコード名です。</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>SQL Server での認証方法を指定します。</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>SQL Server で認証するために指定されたクライアント証明書。</value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>データ ソースへの接続に使われる情報です。</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>ConnectionString 内では設定できない現在の接続タイムアウト値です。</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>現在のデータ ソース カタログ値は、接続文字列内の 'Database=X' です。</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>接続文字列の現在のデータ ソースは'Server=X' です。</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>現在の ODBC ドライバーです。</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>ODBC ドライバーによってアクセスされる製品のバージョンです。</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>データ ソースへの接続に使われる情報です。</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>現在の接続 timeout 値、ConnectionString 内の 'Connect Timeout=X' です。</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>現在のデータ ソース カタログ値、接続文字列の中の 'Initial Catalog=X' です。</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>接続文字列の中の現在のデータ ソース 'Data Source=X'。</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>接続文字列の中の現在の OLE DB プロバイダー ProgID 'Provider=X'。</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>OLE DB プロバイダーによってアクセスされる製品のバージョンです。</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>認証に使用するアクセス トークンです。</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>接続の状態 (同期であるか非同期であるか) です。接続文字列内では、'Asynchronous Processing=x' で表されます。</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>レプリケーション時の接続に使われる情報です。</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>'Data Source=x;Initial Catalog=x;Integrated Security=SSPI' などのように、DataSource への接続に使われる情報です。</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>この接続の統計情報を収集します。</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>カスタム列暗号化キー ストア プロバイダーです。</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>物理的な接続を表す GUID。</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Microsoft SQL Server が使用する通知に自動的に組み込まれるデータです。</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>ユーザーによって指定されない場合に、Update および Delete コマンドの Where 句をどのように自動生成するかを示します。</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>テキスト コマンド内の修飾されたテーブル名内のカタログ名の位置を示します。</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>カタログ名とテキスト コマンド内の識別子の他の部分とを区切る文字です。</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>スキーマ名とテキスト コマンド内の識別子の他の部分とを区切る文字です。</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>sql オブジェクトを囲むプレフィックス文字列です。</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>sql オブジェクトを囲むサフィックス文字列です。</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Command を自動的に生成する DataAdapter です。</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>DataTable のスキーマまたは SelectCommand を使用します。</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>ユーザーによって設定されていない場合に、Update コマンドの set 句が自動的に生成される方法を示します。</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>OdbcCommands を自動的に生成する DataAdapter</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>特殊文字を含む識別子を引用符で囲むために開始引用符としてテキスト コマンドで使用される文字です。</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>特別な文字を含む識別子を引用する際の閉じの引用符として、テキスト コマンドで使用される文字です。</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>自動的に OleDbCommands を生成する DataAdapter です。</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>数値リテラルで使用される桁区切り記号です。</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>sql オブジェクトを囲むプレフィックス文字列です。</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>sql オブジェクトを囲むサフィックス文字列です。</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>SqlCommands を自動的に生成する DataAdapter です。</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>数値リテラルで使用される桁区切り記号です。</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>特殊文字を含む識別子を引用符で囲むために開始引用符としてテキスト コマンドで使用される文字です。</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>特別な文字を含む識別子を引用する際の閉じの引用符として、テキスト コマンドで使用される文字です。</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>Prepare、FillSchema、および CommandBuilder シナリオで使用するときは、10 進パラメーターと数値パラメーターのみを設定する必要があります。</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>Prepare、FillSchema、および CommandBuilder シナリオで使用するときは、10 進パラメーターと数値パラメーターのみを設定する必要があります。</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>ネイティブ型のパラメーターです。</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>ネイティブ型のパラメーターです。</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>たとえば '@p1' のような、パラメーターの名前です。</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>ネイティブ型のパラメーターです。</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>型のサーバーの名前です。</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>可変長データ型のオフセットです。</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>パラメーター '{1}' に指定された ParameterDirection '{0}' はサポートされていません。Table-valued parameters では、ParameterDirection.Input だけがサポートされています。</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>パラメーター '{0}' に TypeName が指定されました。TypeName は Structured パラメーターだけに設定してください。</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>SqlDbType.Structured 型は、複数値型だけでサポートされています。</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>スキーマ テーブルのフィールド '{0}' に対する DateType 列が Null です。DataType は、null 以外でなければなりません。</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>レコード '{0}' のフィールド数が、元のレコードでの数と一致しません。</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>範囲 : 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>SqlClient データ プロバイダーに予期しないエラーが発生しました。{0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>{0},{1} の Type Info を取得できません。</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>プロバイダーが次のアセンブリを読み込めませんでした。{0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>UDT パラメーターには、UdtTypeName プロパティを設定する必要があります。</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>指定された型は、対象サーバー {0} に登録されていません。</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>UDT パラメーターは主キーの一部でない限り where 句では使用できません。</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>'{0}' は、無効なユーザー定義型です。理由 : {1}</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>インメモリ形式とユーザー定義形式の両方をサポートしています</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>ネイティブ形式はサポートできません。</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>IBinarySerialize を実装できません</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>シリアル化できません</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>パブリック コンストラクターがありません</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>INullable を実装できません</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>パブリック コンストラクターがありません</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>UDT 属性がありません</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>マップなしのシリアル化は、現時点ではサポートされていません。</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>'public static x Parse(System.Data.SqlTypes.SqlString)' メソッドが見つかりません</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>'public override string ToString()' メソッドが見つかりません</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>'public static x Null { get; }' メソッドが見つかりません</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>ネイティブ形式では、'{0}' 型のフィールド (直接または別のフィールドから) をサポートしていません。</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>型がパブリック型ではありません</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Native UDT は、'{0}' 型のためシーケンシャル レイアウトをサポートできません</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Native UDT は最大サイズ (byte) を指定しています。</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>フィールド '{0}' は、シリアル化されていないとマークされています。</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>フィールド '{0}' の型は明示的にレイアウトするように設定されていますが、ネイティブ形式では許可されません</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>複数の値をとるアセンブリ参照には、ゼロ以外のアセンブリ ID が必要です。</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>構造化された複数値型は、パラメーターだけで使用でき、他の型の内部で入れ子にすることはできません。</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>パス名が無効です。</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>トランザクションを進めるときにエラーが発生しました。</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>クエリ通知の受信に使用される従属オブジェクトです。</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>この依存関係が無効であるかどうかを示すプロパティです。</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>既存の従属オブジェクトにコマンドを追加します。</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Command が既に別の従属オブジェクトに関連付けられています。上書きできません。</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>この SqlCommand オブジェクトは、既に別の SqlDependency オブジェクトに関連付けられています。</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>指定された Timeout 値が無効です。タイムアウトには 0 より小さい数値は指定できません。</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>通知エラー。種類={0}、情報={1}、ソース={2}</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData は、この SqlDbType には無効です。</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>このコンストラクターに対し、dbType {0} は無効です。</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>内部エラー。プレーンテキストの値を Null にすることはできません。</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>暗号化できません。暗号化の結果、暗号化テキストが {0} バイトになりました。これは、最大許容サイズの {1} バイトを超えています。指定されたプレーンテキストの値が大きすぎる可能性があります (プレーンテキストのサイズは {2} バイトです)。</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>内部エラー。暗号化テキストの値を Null にすることはできません。</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>構成証明情報が SQL Server によって返されませんでした。エンクレーブ型は '{0}' で、エンクレーブ構成証明 URL は '{1}' です。</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>セキュリティで保護されたチャネルを確立できませんでした。エラー メッセージ: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>内部エラーです。型 '{1}' のオブジェクトを構築するときに null の引数 '{0}' が指定されました。'{0}' を null にすることはできません。</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>エンクレーブ構成証明サービスのエンドポイントを指定します。このエンドポイントは、Always Encrypted を使用して暗号化されたデータベース列に対する計算のために SQL Server インスタンス内で構成されたエンクレーブが有効であり、セキュリティで保護されているかどうかを確認するために使用されます。</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>エンクレーブ プロバイダーの構成セクションを読み取れませんでした。アプリケーション構成ファイルに含まれるそのセクションの形式が正しいことを確認してください。エラー メッセージ: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>型 '{1}'、名前 '{0}' のエンクレーブ プロバイダーをインスタンス化できませんでした。エラー メッセージ: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>内部エラーです。SqlColumnEncryptionEnclaveProviderName を null または空にすることはできません。</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>'{0}' 結果セットの読み取り中にエラーが発生しました。接続文字列の中では構成証明の URL が指定されていませんが、クエリではエンクレーブ計算が必要です。エンクレーブの種類は '{1}' です。 </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>内部エラーです。エンクレーブ計算が必要なクエリを実行するときに SQL Server から受信したエンクレーブ型が null または空です。</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>クエリを実行するためにエンクレーブ計算が必要ですが、アプリケーション構成にエンクレーブ プロバイダー セクションがありません。</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>エンクレーブの種類 '{0}' および構成証明プロトコル '{1}' に対して、エンクレーブ プロバイダーが見つかりませんでした。接続文字列に正しい構成証明プロトコルを指定してください。</value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>接続上のすべてのコマンドの既定の列暗号化設定です。</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>機密性の高いデータをサーバーに送信する前にパラメーターを強制的に暗号化する。 </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>SQL Server 名を格納しているディクショナリ オブジェクトと信頼された列マスター キーのパス。</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>ApplicationIntent ReadOnly 接続オプションを使用して SQL Server のミラー化されたインスタンスに接続することはできません。</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>予期しないルーティング情報を受信しました。</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>無効なルーティング情報を受信しました。</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>このコンテキストでサポートされていない認証が指定されています: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Active Directory 対話型認証がタイムアウトになりました。ユーザーが認証要求に応答するのに時間がかかりすぎました。</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>Credential プロパティが設定されている場合は、'Authentication=Active Directory Interactive' を使用できません。</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>アクティブな接続のサーバー プロセス ID (SPID)。</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Active Directory デバイス コード フロー認証がタイムアウトになりました。ユーザーが認証要求に応答するのに時間がかかりすぎました。</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>接続文字列で 'Authentication=Active Directory Device Code Flow' が指定されている場合は、Credential プロパティを設定できません。</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>要求されたアクションに対しては、1 次元配列のみがサポートされます。</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>指定された項目は、指定されたコレクションに見つからなかったため、削除できません。</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>負でない数値が必要です。</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>接続文字列に 'Authentication=Active Directory Default' が指定されている場合、AccessTokenCallback プロパティを設定できません。</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} が {1} を返しました。</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>プロトコル エラー: 受信したメッセージは有効な署名を含んでいますが、有効な保護レベルで必要な暗号化がされていません。</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>エラー {1} により {0} に失敗しました。</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>このメソッドは、このクラスで実装されていません。</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>要求されたセキュリティ パッケージは、サポートされていません。</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>physicalConnection の種類が正しくありません。</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>AppContext スイッチ '{0}'={1} の設定中に例外が発生しました。</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>型 {0} はこのプラットフォームでサポートされていません。</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>グローバリゼーション インバリアント モードはサポートされていません。</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Kerberos を使用して認証できません。クライアントで 'kinit' を使用して Kerberos が初期化されており、Kerberos 認証を許可するためのサービス プリンシパル名が SQL Server に登録されていることを確認してください。</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>キーワード 'Network Library' はこのプラットフォームでサポートされていません。代わりに 'Data Source' の前に必要なプロトコルを付けてください (TCP 接続の場合は 'tcp:'、名前付きパイプ接続の場合は 'np:')。</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>ソケットは予期された '{0}' をスローしませんでした。エラー コード '{1}'。</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>サーバーは、このプラットフォームでサポートされていない機能を使用しようとしています。</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>キーワード '{0}' はこのプラットフォームでサポートされていません。</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>現在読み込まれている System.Transactions.dll では、グローバル トランザクションはサポートされていません。</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>サーバーからデータを読み取り中に、サポートされていないトークン '{0}' を受信しました。</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>'{0}' はサポートされているハンドル型ではありません。</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream はこのプラットフォームでサポートされていません。</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>LocalDB はこのプラットフォームでサポートされていません。</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>バッファー領域が不足しています。必須: {0}、実際: {1}。</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>GSSAPI 操作が失敗しました。状態: {0} (マイナー状態: {1})。</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>エラー - {0} ({1}) により、GSSAPI 操作が失敗しました。</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>Windows 以外のオペレーティング システムでのチャネル バインドはサポートされていません。</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>既定の資格情報が渡される場合、ターゲット名を空にすることはできません。</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>要求された保護レベルは、現在インストールされている GSSAPI 実装ではサポートされていません。</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>サーバーの実装はサポートされていません。</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>このプラットフォームでは、既定の資格情報では NTLM 認証を実行できません。</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>DataAdapter.Update が使用する場合、パラメーター値は DBNull.Value から (Int32)1 または (Int32)0 (非 Null の場合) に変更されます。</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>バッファーの最大サイズを超えました: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>SourceColumn '{2}' の DataColumn '{0}' が見つかりません。</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>SqlBatchCommand リストが初期化されていません。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index 7f1832c415..a3a6bc51e4 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>오름차순</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Count={2}인 이 {1}에 대한 {0} 인덱스가 잘못되었습니다.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>{0}이(가) 이미 다른 {1}에 들어 있습니다.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>{0}이(가) 이미 해당 {1}에 들어 있습니다.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0}은(는) Null이 아닌 {1} 형식 개체만 허용합니다.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>이 {1}에 들어 있지 않은 {0}을(를) 제거하려 했습니다.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1}은(는) 고유해야 하는데 '{2}'이(가) 컬렉션에 이미 있습니다.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>연결이 닫혀 있지 않습니다. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>판독기가 닫혀 있으면 {0}을(를) 호출할 수 없습니다.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>연결이 위임된 트랜잭션이나 확장된 트랜잭션에 대한 기본 연결이므로 트랜잭션에 참여할 수 없습니다.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>내림차순</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>'{0}' 매개 변수에 대한 문자열은 비어 있지 않아야 합니다.</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>ConnectionString 속성이 초기화되지 않았습니다.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>비CLS Exception이 Catch되었습니다.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>지정된 보안 요소가 사용 권한 요소가 아닙니다.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>데이터</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>업데이트</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>연결 여부를 나타내는 ConnectionState입니다.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>연결 상태가 변경될 때 이벤트가 트리거됩니다.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>매개 변수의 일반적인 형식입니다.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>입력, 출력 또는 양방향 매개 변수입니다.</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>강력한 형식의 코드 생성에 사용되는 디자인 타임 속성입니다.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>가변 길이 데이터 형식의 오프셋입니다.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>매개 변수의 이름입니다.</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>가변 길이 데이터 형식(문자열 및 배열)의 크기입니다.</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>DataAdapter.Update에서 사용하는 경우 ColumnMappings에서 DataSetColumn 이름을 찾는 데 사용되는 원본 열 이름입니다. 매개 변수와 데이터 행 간의 값을 복사하는 데 사용됩니다.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>DataAdapter.Update(UpdateCommand 전용)에서 사용하는 경우 데이터 원본을 업데이트하는 데 사용되는 DataRow 값의 버전입니다.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>DataAdapter.Update에서 사용하는 경우 매개 변수 값이 Null이 아니면 DBNull.Value에서 (Int32)1 또는 (Int32)0으로 변경됩니다.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>매개 변수 값입니다.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>SQL 쿼리를 실행하지 못했으므로 '{0}' 컬렉션을 작성할 수 없습니다. 자세한 내용은 내부 예외를 참조하십시오.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>요청한 스키마('{0}')가 지원하는 것보다 더 많은 제한이 지정되었습니다.</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>'{2}'은(는) '{0}' 스키마 컬렉션의 '{1}' 제한에 올바른 값이 아닙니다.</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>요청한 컬렉션({0})이 정의되지 않았습니다.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>요청한 컬렉션({0})은 이 버전의 공급자에서 지원되지 않습니다.</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>필요한 DataSourceInformation 테이블 열 중 하나가 없습니다.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>DataSourceInformation 테이블에는 행이 하나만 있어야 합니다.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>제한 컬렉션의 필수 열이 하나 이상 없습니다.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>제한 컬렉션에 일치하는 행이 없는 제한이 있습니다.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>컬렉션 '{0}'이(가) 메타데이터 XML에 없습니다.</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>메타데이터 XML이 잘못되었습니다.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>메타데이터 XML이 잘못되었습니다. {0} 컬렉션에는 {1} 열이 있어야 하며 문자열 열이어야 합니다.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>메타데이터 XML이 잘못되었습니다. {0} 컬렉션의 {1} 열에는 비어 있지 않은 문자열이 있어야 합니다.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>동작</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>동작</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>채우기</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>InfoMessage</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>매핑</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>알림</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>스키마</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>풀링</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>명명된 ConnectionString</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>보안</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>연결 복구</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>사용자 지정 사용자 정보를 보유하는 컬렉션입니다.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>DataSet 내의 문자열을 비교하는 경우 대/소문자를 구분하는지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>이 DataSet의 이름입니다.</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>DataSet에 포함된 데이터의 사용자 지정 "뷰"를 나타냅니다. 이 뷰를 사용하면 사용자 지정 데이터 뷰를 통해 필터링, 검색, 탐색 등을 수행할 수 있습니다.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>제약 조건 규칙이 적용되는지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>DataSet에 오류가 있음을 나타냅니다.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>DataSet 내의 문자열을 비교할 로케일을 나타냅니다.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>이 DataSet에서 가리키는 루트 요소의 XML URI 네임스페이스를 나타냅니다.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>이 DataSet에 사용되는 네임스페이스의 접두사를 나타냅니다.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>이 DataSet에 대한 관계를 보유하는 컬렉션입니다.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>이 DataSet에 대한 테이블을 보유하는 컬렉션입니다.</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>이름이 같은 두 테이블의 스키마를 병합할 수 없는 경우 발생합니다.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Initialization이 완료된 후 발생합니다.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>데이터의 인-메모리 캐시를 나타냅니다.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>테이블 내의 문자열을 비교하는 경우 대/소문자를 구분하는지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>이 테이블에 대한 자식 관계를 반환합니다.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>이 테이블에 대한 열을 보유하는 컬렉션입니다.</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>이 테이블에 대한 제약 조건을 보유하는 컬렉션입니다.</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>이 테이블이 속해 있는 DataSet을 나타냅니다.</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>테이블에 대한 기본 DataView입니다.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>이 행의 데이터 바인딩된 값을 계산하는 데 사용되는 식입니다.</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>테이블에 오류가 있는지 여부를 반환합니다.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>테이블 내의 문자열을 비교할 로케일을 나타냅니다.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>이 테이블의 초기 시작 크기를 나타냅니다.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>이 테이블에 포함된 요소에 대한 XML URI 네임스페이스를 나타냅니다.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>이 테이블에 사용된 네임스페이스의 접두사를 XML 표현으로 나타냅니다.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>이 테이블에 대한 부모 관계를 반환합니다.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>이 테이블의 기본 키를 표현하는 열을 나타냅니다.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>이 테이블에 대한 데이터 행을 보유하는 컬렉션을 나타냅니다.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>DataSet의 Tables 컬렉션에서 이 테이블을 찾는 데 사용되는 이름을 나타냅니다.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>테이블에서 행을 편집한 후에 발생합니다.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>이벤트 처리기에서 변경 내용을 수정하거나 취소할 수 있도록 해당 행을 변경 중일 때 발생합니다. 사용자는 행의 값을 수정할 수 있으며 예외를 Throw하여 편집을 취소해야 합니다.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>테이블에서 행을 삭제한 후에 발생합니다.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>테이블의 행을 삭제하도록 표시한 경우 발생합니다. 예외를 Throw하여 삭제를 취소할 수 있습니다.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>이 열의 값이 제출될 때 발생합니다. 사용자는 제안된 값을 수정할 수 있으며 편집을 취소하려면 예외를 throw해야 합니다.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>이 열의 값이 변경될 때 발생합니다.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>테이블에서 모든 행을 지우기 전에 발생합니다.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>테이블에서 모든 행을 지운 후에 발생합니다.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>새 DataRow가 인스턴스화된 후에 발생합니다.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>DataSet의 Relations 컬렉션에서 이 관계를 찾는 데 사용되는 이름입니다.</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>이 관계의 자식 열을 나타냅니다.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>이 관계의 부모 열을 나타냅니다.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>관계가 중첩되었는지 여부를 나타냅니다.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>삭제할 경우 이 관계에 수행할 관련 항목 적용(Cascade) 유형을 나타냅니다.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>업데이트할 경우 이 관계에 수행할 관련 항목 적용(Cascade) 유형을 나타냅니다.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>변경 내용을 적용 및 취소하는 경우 이 관계에 수행할 관련 항목 적용(CASCADE) 유형을 나타냅니다.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>이 제약 조건의 자식 열을 나타냅니다.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>이 제약 조건의 부모 열을 나타냅니다.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>이 제약 조건의 자식 테이블을 나타냅니다.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>이 제약 조건의 열을 나타냅니다.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>이 제약 조건이 기본 키인지 여부를 나타냅니다.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>이 제약 조건의 이름을 나타냅니다.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>이 제약 조건의 테이블을 나타냅니다.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>이 열에 null 값을 사용할 수 있는지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>테이블에 새 행이 추가되는 경우 해당 열이 자동으로 증가하는지 여부를 나타냅니다. 열 형식은 Int16, Int32 또는 Int64여야 합니다.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>AutoIncrement 열의 시작 값을 나타냅니다.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>AutoIncrement 열에서 사용하는 증분을 나타냅니다.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>이 열의 기본 사용자 인터페이스 캡션을 나타냅니다.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>DataTable의 Columns 컬렉션에서 이 열을 찾는 데 사용되는 이름을 나타냅니다.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>이 열이 속해 있는 DataTable을 반환합니다.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>이 열에 저장된 데이터 형식을 나타냅니다.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>테이블에 새 행을 추가할 때 사용되는 기본 열 값을 나타냅니다.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>사용자가 직접 입력하는 대신 다른 열의 각 행에 대해 이 열에서 계산하는 값을 나타냅니다.</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>이 열이 XML에서 특성, 요소, 단순 콘텐츠 노드로 지속되는지 또는 아무 것도 아닌지 나타냅니다.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>이 열에 저장된 요소 또는 특성에 대한 XML URI를 나타냅니다.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>이 DataColumn에 사용된 Prefix를 xml 표현으로 나타냅니다.</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Columns 컬렉션에 있는 이 열의 인덱스를 나타냅니다.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>테이블에 행이 추가된 후 이 열에서 변경할 수 있는지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>이 열에서 테이블 행의 값을 고유한 값으로 제한할지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>이 열에 허용되는 값의 최대 길이를 나타냅니다.</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>이 DataColumn의 DateTimeMode를 나타냅니다.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>이 DataView 및 관련된 사용자 인터페이스에서 삭제할 수 있는지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>이 DataView 및 관련된 사용자 인터페이스에서 편집할 수 있는지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>이 DataView 및 관련된 사용자 인터페이스에서 새 행을 추가할 수 있는지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>현재 이 뷰에 있는 항목 수를 반환합니다.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>이 DataSet이 있을 경우 이를 소유하는 DataViewManager에 포인터를 반환합니다.</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>뷰가 열려 있는지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>이 DataView에서 반환된 데이터를 필터링하는 데 사용되는 식을 나타냅니다.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>이 DataView에서 반환된 데이터의 버전을 나타냅니다.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>이 DataView에서 반환하는 데이터의 순서와 열의 이름을 나타냅니다.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Sort 속성이 설정되어 있지 않은 경우 기본 정렬을 사용할지 여부를 나타냅니다.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>이 DataView에서 데이터를 가져오기 위해 사용하는 테이블을 나타냅니다.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>이 DataView에서 반환된 데이터가 변경되었음을 나타냅니다.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>이 DataViewManager의 데이터 원본을 나타냅니다.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>해당하는 DataSet의 테이블에 대한 정렬/필터링/상태 설정을 나타냅니다.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet은 simpleType으로 'union' 또는 'list'를 지원하지 않습니다.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>잘못된 {0} 구문: 필요한 '{1}' 특성이 없습니다.</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>'{1}' 값은 '{0}' 특성에 사용할 수 없습니다.</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>'{0}' 특성의 값은 '{1}' 또는 '{2}'(으)로 설정해야 합니다.</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>ElementType name='{0}'을(를) 찾을 수 없습니다.</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>'{0}' 관계에 부모 테이블 이름이 없습니다.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>'{0}' 관계에 자식 테이블 이름이 없습니다.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>'{0}' 관계에 부모 테이블 키가 없습니다.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>'{0}' 관계에 자식 테이블 키가 없습니다.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>정의되지 않은 데이터 형식입니다. '{0}'</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>데이터 형식이 정의되지 않았습니다.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>필드 노드 내의 XPath 선택이 잘못되었습니다. {0}을(를) 찾을 수 없습니다.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>선택기 노드 내부에 잘못된 XPath 선택이 있습니다. {0}.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>이름이 {0}인 제약 조건 내의 'Key' 노드가 잘못되었습니다.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>제약 조건 이름 {0}이(가) 스키마에서 이미 사용 중입니다.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>'{0}'을(를) 유형 '{1}'(으)로 변환할 수 없습니다.</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>'{2}'(이)라는 '{1}' 제약 조건에 '{0}' 부분이 없습니다.</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>잘못된 Relation 정의: 키 길이가 다릅니다.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet에서는 이름이 '{0}'인 ComplexType의 순환 참조를 허용하지 않습니다 .</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet은 노드 {0}에 대해 추상 ComplexType을 인스턴스화할 수 없습니다.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Xml Schema를 작성하는 동안 여러 대상 변환기에서 오류가 발생했습니다. 자세한 내용은 내부 예외를 참조하십시오.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Xml Schema를 작성하는 동안 여러 대상 변환기에서 오류가 발생했습니다. null 또는 빈 문자열이 반환되었습니다.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>'{0}' 선언이 중복되었습니다.</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>diffGram을 로드할 수 없습니다. 대상 데이터 세트에 테이블 '{0}'이(가) 없습니다.</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>diffGram을 로드할 수 없습니다. 'sql' 노드가 없습니다.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>열 이름 '{0}'이(가) 여러 매핑 형식에 대해 정의되어 있습니다.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>접두사 '{0}'은(는) 유효하지 않습니다. 접두사에 특수 문자가 들어 있기 때문입니다.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>자기 중첩 테이블 '{0}'의 순환 참조입니다.</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet의 엔터티를 확장할 수 없습니다. XmlValidatingReader를 사용하여 EntityHandling 속성을 적절하게 설정하십시오.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>유형 '{0}'은(는) IXmlSerializable 인터페이스를 구현하지 않으므로 serialization을 계속할 수 없습니다.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>역직렬화를 계속할 수 없습니다. 데이터가 IXMLSerializable을 구현하지 않으므로 다형성이 지원되지 않습니다.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable은 Xml에서 스키마 유추를 지원하지 않습니다.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>DataTable '{0}' serialization을 계속할 수 없습니다. 같은 외래 키에 여러 개의 부모 행이 있는 DataRow가 포함되어 있습니다.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>IsDataSet 특성이 입력 Schema에 없습니다.</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>DataSet 요소를 확인할 수 없습니다. IsDataSet 속성이 두 개 이상 있습니다.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>데이터 세트은 IDynamicMetaObjectProvider를 구현하면서 IXmlSerializable은 구현하지 않는 형식을 직렬화하지 않습니다.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>기능이 구현되지 않았습니다. {0}</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>구문 오류: '{0}' 연산자 뒤에 피연산자가 없습니다.</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>'{0}' 식의 형식이 일치하지 않습니다.</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>식이 너무 복잡합니다.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>열 [{0}]을(를) 찾을 수 없습니다.</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>식에 잘못된 문자열 상수가 있습니다. {0}</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>식에 정의되지 않은 함수 호출 {0}()이(가) 있습니다.</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>식에 구문 오류가 있습니다.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>인수 개수가 잘못되었습니다. 함수 {0}()</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>식에 닫는 괄호가 없습니다.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>{1} 위치의 '{0}' 토큰을 해석할 수 없습니다.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>{0}이(가) 필요한데 {2} 위치의 실제 토큰은 {1}입니다.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>{0}에서 {1}(으)로 변환할 수 없습니다.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>'{0}' 값을 '{1}' 형식으로 변환할 수 없습니다.</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>열 이름[{0}]이 잘못되었습니다.</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>식에 잘못된 날짜 상수 '{0}'이(가) 있습니다.</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>IN 연산자의 식 목록에는 상수 식만 사용할 수 있습니다.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Like 연산자에 오류가 있습니다. 문자열 패턴 '{0}'이(가) 잘못되었습니다.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>구문 오류: IN 키워드 다음에 오는 항목은 쉼표로 구분해야 하고 괄호로 묶어야 합니다.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>함수 인수의 형식이 일치하지 않습니다. 인수 {1}의 {0}()에는 {2}이(가) 필요합니다.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>함수 인수의 형식이 일치하지 않습니다. 인수 {1}의 {0}()에는 정수 형식이 필요합니다.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>{1} 및 {2}에서 '{0}' 작업을 수행할 수 없습니다.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>'{0}' 연산자는 '{1}' 및 '{2}' 형식의 피연산자에서 모호합니다. 부호 있는 형식과 부호 없는 형식을 함께 사용할 수 없습니다. 명시적 Convert() 함수를 사용하십시오.</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>구문 오류: IN 키워드 다음에는 쉼표로 구분된 비어 있지 않은 식 목록이 와야 하고 이를 괄호로 묶어야 합니다.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>식에 지원되지 않는 연산자 '{0}'이(가) 있습니다.</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>식에 잘못된 이름이 있습니다. '{0}'</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>구문 오류: '{0}' 연산자 앞에 피연산자가 없습니다.</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>식에 닫는 괄호가 너무 많이 있습니다.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>테이블[{0}]이 둘 이상의 관계에 관련되어 있습니다. '{1}' 식의 관계 이름을 명시적으로 기술해야 합니다.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>aggregate 인수에 구문 오류가 있습니다. 'Child' 한정자를 사용하는 단일 열 인수가 필요합니다.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>집계식 '{0}'에 바인딩되지 않은 참조가 있습니다.</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>현재 행이 없는 비상수 식을 계산할 수 없습니다.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>'{0}' 식에 바인딩되지 않은 참조가 있습니다.</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>계산할 수 없습니다. '{0}' 식은 집계식이 아닙니다.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>'{0}' 필터 식은 부울 형식으로 계산되지 않습니다.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>형식 이름 '{0}'이(가) 잘못되었습니다.</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>조회식에 구문 오류가 있습니다. 'Parent' 키워드 다음에는 관계 한정자를 사용하는 단일 열 인수가 필요합니다. Parent[(&lt;relation_name&gt;)].&lt;column_name&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>DataFilter를 호출할 행 또는 테이블이 필요합니다.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>{0}() 인수가 범위를 벗어났습니다.</value>
-  </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>구문 오류: 'Is' 연산자 사용이 잘못되었습니다. 올바른 구문: &lt;expression&gt; Is [Not] Null</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>오프셋 및 길이가 배열의 범위를 벗어났거나 카운트가 인덱스부터 소스 컬렉션 끝까지의 요소 수보다 큽니다.</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>값이 '{0}' 형식에 비해 너무 크거나 작습니다.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>'{0}' 유형의 개체를 '{1}' 유형의 개체로 변환할 수 없습니다.</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>0으로 나눔 오류가 발생했습니다.</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>속성 '{0}'에 대해 허용되는 유일한 값은 '{1}'입니다.</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>부모 관계 '{0}'을(를) 찾을 수 없습니다.</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>속성 '{0}'에 허용되는 값은 '{1}' 또는 '{2}'입니다.</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>'hours' 인수가 범위를 벗어났습니다. -14에서 +14 사이의 값이어야 합니다.</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>지정한 QuotePrefix 및 QuoteSuffix 값이 일치하지 않습니다.</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>'minutes' 인수가 범위를 벗어났습니다. -59에서 +59 사이의 값이어야 합니다.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>인수 '{0}'의 길이가 한계인 '{1}'을(를) 초과합니다.</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>제공된 시간 범위가 총 14시간을 초과합니다.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>키 '{0}'에 대한 값이 잘못되었습니다.</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>제공된 DateTime 인수의 Kind 속성이 'hours' 및 'minutes' 인수와 일치하지 않습니다.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>키 '{0}'을(를) 사용하려면 키 '{1}'이(가) 있어야 합니다.</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>형식이 '{0}'인 DataColumn은 식을 지원하지 않습니다.</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>키 '{0}'의 값 길이가 제한인 ‘{1}’을(를) 초과합니다.</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>제약 조건을 활성화하지 못했습니다. 하나 이상의 행에 NOT NULL, UNIQUE 또는 외래 키 제약 조건을 위반하는 값이 있습니다.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>지원되지 않는 키워드입니다: '{0}'.</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>컬렉션 자체를 수정할 수 없습니다.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>내부 .NET Framework Data Provider 오류 {0}입니다.</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>주어진 이름 '{0}'이(가) 대/소문자가 다른 컬렉션 개체의 이름과 적어도 두 개 이상 일치하지만 대/소문자가 일치하는 이름은 없습니다.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}".</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>지정된 이름 '{0}'이(가) 네임스페이스가 다른 컬렉션 개체에 있는 두 개 이상의 이름과 일치합니다.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}", 따옴표 사용이 잘못되었습니다.</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>오프셋 및 길이가 배열의 범위를 벗어났거나 카운트가 인덱스부터 소스 컬렉션 끝까지의 요소 수보다 큽니다.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}", 현재 한도 "{2}"이(가) 부족합니다.</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>'{0}' 인수가 범위를 벗어났습니다.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>SqlBulkCopy.DestinationTableName이 잘못된 multipart 이름이어서 SqlBulkCopy.WriteToServer에 실패했습니다.</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>'{0}' 인수는 Null일 수 없습니다.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>multipart 이름이 잘못되어 SQL Server 결과를 처리하지 못했습니다.</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>'{0}' 인수에 Null 값이 있습니다.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName은 잘못된 multipart 이름입니다.</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>{0} 열을 찾을 수 없습니다.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName은 잘못된 multipart 이름입니다.</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>'{0}' 열은 이미 현재 DataTable에 속해 있습니다.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>SqlCommand.CommandText 속성 값이 잘못된 multipart 이름이어서 SqlCommand.DeriveParameters에 실패했습니다.</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>'{0}' 열은 이미 다른 DataTable에 속해 있습니다.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>MultiSubnetFailover 연결 옵션을 사용하여 미러된 SQL Server 인스턴스에 연결이 지원되지 않습니다.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>DataTable에 SimpleContent 열이 둘 이상 포함될 수 없습니다.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>{0} 열거형 값 {1}은(는) {2} 메서드에서 지원되지 않습니다.</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>요소 열 또는 중첩 관계를 포함하는 테이블에 SimpleContent 열을 추가할 수 없습니다.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>{0} 열거형 값 {1}은(는) .NET Framework SqlClient Data Provider에서 지원되지 않습니다.</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>이름이 '{0}'인 열이 이 DataTable에 이미 속해 있습니다.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: CommandText 속성이 초기화되지 않았습니다.</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>이름이 '{0}'인 열을 추가할 수 없습니다. 같은 이름의 중첩 테이블이 이미 이 DataTable에 속해 있습니다.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: Connection 속성이 초기화되지 않았습니다.</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>이름이 '{0}'인 열이 이미 이 DataTable에 속해 있습니다. 중첩 테이블 이름을 같은 이름으로 설정할 수 없습니다.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0}을(를) 사용하려면 Connection이 열려 있고 사용 가능해야 합니다. {1}</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>이 테이블에 속하지 않는 열은 제거할 수 없습니다.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>'{0}' 저장 프로시저가 없습니다.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>이 열은 기본 키의 일부이므로 제거할 수 없습니다.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>트랜잭션이 현재 연결과 연결되어 있지 않거나 완료되었습니다.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>이 열은 {0} 관계의 부모 키 일부이므로 제거할 수 없습니다.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>현재 연결에 연결된 트랜잭션은 완료되었지만 삭제되지 않았습니다. 이 연결이 SQL 문을 실행하는 데 사용될 수 있으려면 먼저 트랜잭션이 삭제되어야 합니다.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>이 열은 {1} 테이블에서 {0} 제약 조건의 일부이므로 제거할 수 없습니다.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>명령에 할당된 연결이 보류 중인 로컬 트랜잭션에 연결되어 있는 경우 {0}을(를) 사용하려면 트랜잭션이 있어야 합니다. 명령의 Transaction 속성이 초기화되지 않았습니다.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>이 열은 식의 일부이므로 제거할 수 없습니다. {0} = {1}.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>이 {0}과(와) 연결된 DataReader가 이미 열려 있습니다. 먼저 닫아야 합니다.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>계산 열에 AutoIncrement 속성을 설정할 수 없습니다.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>{0} DeriveParameters는 CommandType.StoredProcedure만 지원하며 CommandType.{1}은(는) 지원하지 않습니다.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>DefaultValue가 설정된 열에 AutoIncrement 속성을 설정할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>AutoIncrement 열에 DefaultValue를 설정할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep 값은 0이 아니어야 합니다.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>DataTable의 일부인 경우 ColumnName이 필요합니다.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>열에 데이터가 있으면 해당 열의 DataType을 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>열에는 올바른 DataType이 필요합니다.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>{0} 열의 DefaultValue 형식은 {1}이며 {2}(으)로 변환할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>열의 DefaultValue 형식은 {0}이며 {1}(으)로 변환할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>{0} 열의 DefaultValue 형식은 {1}이지만 열 형식은 {2}입니다.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>Expression 열의 ReadOnly 속성을 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>Expression 열의 Unique 속성을 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>AutoIncrement 또는 Unique가 지정된 열에 식을 만들 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>열을 ReadOnly로 지정할 수 없으므로 식을 설정할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>{0} 열은 제약 조건의 일부이므로 이 열에 Expression 속성을 설정할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>Expression 열 {0}을(를) 기반으로 제약 조건을 만들 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>식에 순환 참조가 있으므로 Expression 속성을 설정할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>'{0}' 열에 null 값이 있습니다.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>'{0}' 열에 nulls를 사용할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>'{0}' 열은 읽기 전용입니다.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>열 '{0}'에 고유하지 않은 값이 있습니다.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>'{0}' 열은 {1} 테이블에 속하지 않습니다.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>열은 테이블에 속해야 합니다.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>&lt;{0}&gt;을(를) {1} 열에 저장할 수 없습니다. {2} 형식이 필요합니다.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>Column '{0}'을(를) null로 설정할 수 없습니다. 대신 DBNull을 사용하십시오.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>열 '{0}'을(를) 설정할 수 없습니다. 값이 이 열의 MaxLength 제한을 위반합니다.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength는 문자열 데이터 형식에만 적용됩니다. Column '{0}'의 MaxLength 속성을 음수가 아닌 숫자로 설정할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>Column '{0}'의 MaxLength 속성을 '{1}'(으)로 설정할 수 없습니다. 테이블에 새 제한값보다 긴 문자열이 최소한 하나 이상 있습니다.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Column '{0}'의 MaxLength 속성을 설정할 수 없습니다. 해당 열이 SimpleContent입니다.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>Column '{0}'의 DataType 속성을 {1}(으)로 설정할 수 없습니다. 해당 열이 SimpleContent입니다.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>Column '{0}'의 MappingType 속성을 SimpleContent로 설정할 수 없습니다. 해당 열의 DataType은 {1}입니다.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>Column '{0}'이(가) MaxLength 제한값을 초과합니다.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>열 '{0}'에는 DBNull.Value를 사용할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>Column '{0}'의 Namespace 속성을 변경할 수 없습니다. 해당 열이 SimpleContent입니다.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>DataColumn에 데이터가 있으면 유형이 '{0}'인 DataColumn의 AutoIncrement를 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>열 '{0}'은(는) 기본 테이블 '{1}'에 속하지 않습니다.</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>형식이 '{0}'인 DataColumn은 complexType입니다. 복합 형식의 값을 Attribute로 serialize할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>DateTimeMode는 DateTime 유형의 DataColumns에만 설정할 수 있습니다.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>'{0}'은(는) 잘못된 DataSetDateTime 값입니다.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>테이블에 데이터가 있으면 DateTimeMode를 '{0}'에서 '{1}'(으)로 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Type '{0}'에 static Null 속성 또는 필드가 없습니다.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>유형 '{0}'이(가) IRevertibleChangeTracking을 구현하지 않으므로 RejectChanges()를 계속할 수 없습니다.</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>SetAdded 및 SetModified는 DataRowState가 Unchanged인 DataRows에서만 호출할 수 있습니다.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>서수 '{0}'이(가) 최대 수를 초과합니다.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet에서 System.Nullable&lt;&gt;을 지원하지 않습니다.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>ConstraintCollection에 포함되어 있는 경우 해당 제약 조건의 이름을 빈 문자열로 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>{0} 제약 조건에 제약 조건을 적용할 수 없습니다.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>'{0}' 열은 고유 값을 가지도록 제약되어 있습니다. 값 '{1}'은(는) 이미 있습니다.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>제약 조건 '{0}'이(가) 이 DataTable에 속하지 않습니다.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>{0} 제약 조건을 찾을 수 없습니다.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>이름이 {0}인 제약 조건과 일치하는 제약 조건이 컬렉션에 이미 있습니다.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>이름이 '{0}'인 Constraint가 이 DataTable에 이미 속해 있습니다.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>이 열에는 현재 고유 값이 없습니다.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>해당 열이 이 테이블을 가리키지 않습니다.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>모든 값이 각각 대응하는 부모 값을 갖지 않으므로 이 제약 조건을 사용할 수 없습니다.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>ForeignKey가 {0} 테이블에 속하지 않으므로 이 제약 조건을 추가할 수 없습니다.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>이 테이블에 속하지 않는 제약 조건은 제거할 수 없습니다.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>UNIQUE 제약 조건 '{0}'을(를) 제거할 수 없습니다. 먼저 외래 키 제약 조건 '{1}'을(를) 제거하십시오.</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>{0} 관계에 제약 조건이 적용되어 있으므로 이 행을 삭제할 수 없습니다. 삭제하면 자식 행이 고립됩니다.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>{0} 관계에 제약 조건이 적용되어 있으므로 변경할 수 없습니다. 이 값을 변경하면 자식 행이 고립됩니다.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>ForeignKeyConstraint {1}(으)로 제약 조건을 적용하고 {2}에 자식 행이 있으므로 {0} 테이블을 지울 수 없습니다.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>ForeignKeyConstraint {0}을(를) 사용하려면 자식 키 값({1})이 부모 테이블에 있어야 합니다.</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>'{0}' 때문에 속성에 액세스할 수 없습니다.</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>이 행은 자식 행을 포함하고 {0} 관계에 제약 조건이 적용되므로 제거할 수 없습니다.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>이 테이블에 기본 키가 이미 설정되어 있으므로 기본 키 제약 조건을 추가할 수 없습니다.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>두 개의 중첩 관계에서 자식 테이블인 DataTable '{0}'에 제약 조건을 추가할 수 없습니다.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>다른 테이블에 속해 있는 열에서 키를 만들 수 없습니다.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>0개의 열을 가질 수 없습니다.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>{0}개가 넘는 열을 가질 수 없습니다.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>동일한 열이 두 번 이상 나열된 경우 키를 만들 수 없습니다. '{0}'</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>UNIQUE 제약 조건은 테이블의 기본 키이므로 제거할 수 없습니다.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>UNIQUE 제약 조건은 {0} 테이블의 기본 키이므로 제거할 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>부모 열과 자식 열에 형식이 일치하는 열이 없습니다.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey와 ChildKey가 동일합니다.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns와 ChildColumns의 길이는 동일해야 합니다.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns과 ChildColumns의 길이는 0이 아니어야 합니다.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>행이 이 관계와 동일한 DataSet에 속하지 않습니다.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>DataSet의 일부인 경우 RelationName이 필요합니다.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows에는 Table이 {0}인 행이 필요한데 Table이 {1}인 행을 지정했습니다.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>이 DataSet에 관계를 추가하려면 해당 DataSet의 두 테이블을 연결해야 합니다.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRow에는 테이블이 {0}인 행이 필요한데 테이블이 {1}인 행을 지정했습니다.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow에는 테이블이 {0}인 자식 행이 필요하지만 지정된 행의 테이블은 {1}입니다.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>서로 다른 DataSet의 테이블 간에 관계를 가질 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>서로 다른 DataSets의 테이블 간에 관계를 만들 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>해당 자식 열에 대한 관계가 이미 있습니다.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>이 관계는 현재 관계 컬렉션에 속하지 않습니다.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>이 관계는 이미 다른 DataSet에 속해 있습니다.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>이 관계는 이미 현재 DataSet에 속해 있습니다.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>이름이 '{0}'인 Relation이 이 DataSet에 이미 속해 있습니다.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>Relation {0}이(가) 이 DataSet에 속하지 않습니다.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>{0} 관계를 찾을 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>null 테이블에 컬렉션을 만들 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>이 컬렉션이 관계를 표시하는 테이블은 DataSet에서 제거되었습니다.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>이 테이블이 자식 테이블이 아닌 경우 테이블의 ParentRelation 컬렉션에 관계를 추가할 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>이 테이블이 부모 테이블이 아닌 경우 테이블의 ChildRelation 컬렉션에 관계를 추가할 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>이 관계에 대해 'Nested' 속성을 false로 설정할 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>동일한 테이블 '{0}'은(는) 두 개의 중첩 관계에서 자식 테이블이 될 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>테이블({0})은 중첩 관계에서 자신의 자식 테이블이 될 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>부모 테이블과 자식 테이블 간에 Locale 또는 CaseSensitive 설정이 다른 DataRelation 또는 Constraint를 추가할 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>Parent 또는 Child 열이 DataSet에 없는 경우 DataRelation을 만들 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>네임스페이스를 상속하는 중첩 테이블 '{0}'에는 네임스페이스가 다른 여러 부모 테이블을 사용할 수 없습니다.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>빈 네임스페이스가 있는 중첩 테이블 '{0}'에는 네임스페이스가 다른 여러 개의 부모 테이블을 사용할 수 없습니다.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>행이 이 관계와 동일한 DataSet에 속하지 않습니다.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>테이블에 없는 행에서는 이 작업을 수행할 수 없습니다.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>이 관계 및 자식 행이 동일한 DataSet에 속하지 않습니다.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>RowChanging 이벤트에서 제안한 값을 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>OnRowChanging 이벤트 내에서 EndEdit()을 호출할 수 없습니다.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>RowChanging 이벤트 내에서 BeginEdit()을 호출할 수 없습니다.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>OnRowChanging 이벤트 내에서 CancelEdit()을 호출할 수 없습니다. exception을 Throw하여 이 업데이트를 취소하십시오.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>OnRowDeleting 이벤트 내에서 Delete를 호출할 수 없습니다. exception을 Throw하여 삭제를 취소하십시오.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>입력 배열이 이 테이블의 열 개수보다 깁니다.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>액세스할 Current 데이터가 없습니다.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>액세스할 Original 데이터가 없습니다.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>액세스할 Proposed 데이터가 없습니다.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>이 행은 테이블에서 제거되었으며 어떤 데이터도 포함하고 있지 않습니다. BeginEdit()을 사용하여 이 행에 새 데이터를 만들 수 있습니다.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>해당 행을 통해 삭제된 행 정보에 액세스할 수 없습니다.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>버전은 Original, Current 또는 Proposed여야 합니다.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>위치 {0}에 행이 없습니다.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>행 삽입 위치 {0}이(가) 잘못되었습니다.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>이름이 '{1}'인 테이블에 rowOrder 값={0}이(가) 두 번 사용되었습니다.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>'{0}' 테이블의 rowOrder 시퀀스에 값이 없습니다.</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>지정된 DataRow가 현재 DataRowCollection에 없습니다.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>이 행은 이미 다른 테이블에 속해 있습니다.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>이 행은 이미 현재 테이블에 속해 있습니다.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>이 행은 이미 삭제되었으므로 다시 삭제할 수 없습니다.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>이 행이 비어 있습니다.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>이미 제거된 행이므로 다시 제거할 수 없습니다.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>자식 행에 부모가 여러 개 있습니다.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>인식할 수 없는 행 상태 비트 패턴입니다.</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>DataSet 이름을 빈 문자열로 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>이름 '{0}'이(가) 잘못되었습니다. DataSet 이름에는 DataTable과 같은 이름을 사용할 수 없습니다.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>스키마 네임스페이스가 잘못되었습니다. {0}을(를) 대신 사용하십시오.</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>CaseSensitive 또는 Locale 속성을 변경할 수 없습니다. 이 속성을 변경하면 최소한 하나의 DataRelation 또는 Constraint가 관련 테이블 간에 서로 다른 Locale 또는 CaseSensitive 설정을 포함하게 됩니다.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>SchemaSerializationMode 속성은 파생 DataSet에서 재정의한 경우에만 설정할 수 있습니다.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>PrimaryKey 열은 이 테이블에 속하지 않습니다.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>SimpleContent 열을 포함하는 테이블에 중첩 관계 또는 요소 열을 추가할 수 없습니다.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>DataSet의 일부인 경우 TableName이 필요합니다.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable에 단순 콘텐츠 열이 이미 있습니다.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>테이블에 기본 키가 없습니다.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0}은(는) 올바른 Sort 문자열 엔트리가 아닙니다.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>DataTable을 serialize할 수 없습니다. 하나 이상의 DataColumn 식에서 사용되는 DataTable이 현재 DataTable의 하위 항목이 아닙니다.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>이 DataTable은 DataSet의 일부로만 원격이 될 수 있습니다. 하나 이상의 Expression 열에 다른 DataTable에 대한 참조가 있습니다.</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>DataSet 및 DataTable에 대해 다른 원격 형식 속성 값을 설정할 수 없습니다.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>DataTable을 serialize할 수 없습니다. DataTable 이름이 설정되지 않았습니다.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>이름이 '{0}'인 DataTable이 이 DataSet에 이미 속해 있습니다.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>같은 Namespace '{1}'이(가) 있는 '{0}'(이)라는 DataTable이 이미 이 DataSet에 속해 있습니다.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>DataSet 이름과 테이블 이름이 충돌하므로, 중첩 관계에서 ({0}) 테이블은 자신의 자식 테이블이 될 수 없습니다.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>이름 '{0}'이(가) 잘못되었습니다. DataTable 이름에는 DataSet과 같은 이름을 사용할 수 없습니다.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable이 이미 다른 DataSet에 속해 있습니다.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable이 이미 현재 DataSet에 속해 있습니다.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>{0} 테이블은 이 DataSet에 속하지 않습니다.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>{0} 테이블을 찾을 수 없습니다.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>기존 관계를 포함하는 테이블을 제거할 수 없습니다. 먼저 관계를 제거하십시오.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>{0} 테이블은 ForeignKeyConstraint {1}에서 참조했으므로 제거할 수 없습니다. 먼저 제약 조건을 제거하십시오.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>DataTable '{0}'이(가) 원본의 모든 DataTable과 일치하지 않습니다.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>대상 DataSet에 {0}의 정의가 없습니다.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>대상 DataSet에 {0} {1}이(가) 없습니다.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0}과(와) &lt;source&gt;.{0}의 속성이 충돌합니다. DataType 속성이 일치하지 않습니다.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey와 &lt;source&gt;.PrimaryKey의 Length가 다릅니다.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>PrimaryKey의 열이 일치하지 않습니다 : &lt;target&gt;.{0} 및 &lt;source&gt;.{1}.</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>해당 키에 일치하지 않는 열이 있으므로 관계 {0}을(를) 병합할 수 없습니다.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>{0} 대상 테이블에 {1} 열의 정의가 없습니다.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>PrimaryKey 열 {0}이(가) 원본 테이블에 없습니다.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>RowStates 매개 변수는 DataViewRowState 열거형의 유효한 값 조합으로 설정해야 합니다.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Find는 정렬 순서에 따라 행을 찾지만 정렬 순서가 지정되어 있지 않습니다.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>인덱싱되는 키에 대한 {0} 값이 필요한데 {1} 값을 받았습니다.</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>집계 함수 {0}() 및 형식 {1} 사용이 잘못되었습니다.</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>스토리지 형식이 잘못되었습니다. {0}</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>DataSet Xml 지속성은 '{0}' 값을 Char 값으로 지원하지 않습니다. Byte 스토리지를 대신 사용하세요.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>값의 유형이 열 유형과 일치하지 않습니다.</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>유형 '{0}'이(가) IComparable 인터페이스를 구현하지 않습니다. 비교를 완료할 수 없습니다.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>{0}을(를) 설정할 수 없습니다.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>이미 DataSet의 기본 뷰인 DataViewManager에서는 DataSet을 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter는 ModifiedOriginals와 ModifiedCurrents를 동시에 표시할 수 없습니다.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>DataViewManager에서 파생되는 DefaultView 또는 DataView에서 Table 속성을 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>DataSet 속성을 설정한 후에는 다시 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>DataViewManager를 사용하기 전에 DataSet을 설정해야 합니다.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>Table 속성을 설정한 후에는 다시 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>DataView를 사용하기 전에 DataTable을 설정해야 합니다.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>이름이 없는 DataTable에 바인딩할 수 없습니다.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>이 목록에 개체를 설정할 수 없습니다.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>AllowNew가 false인 경우 DataView에서 AddNew를 호출할 수 없습니다.</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView가 열려 있지 않습니다.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>이 관계는 DataView가 가리키는 테이블로부터 생성된 것이 아닙니다.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>AllowDelete가 false인 경우 DataSource에서 삭제할 수 없습니다.</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>AllowEdit이 false인 경우 DataSource에서 편집할 수 없습니다.</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>인덱스 {0}이(가) 음수이거나 행 개수보다 큽니다.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>이 목록에 외부 개체를 추가할 수 없습니다.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>이 목록을 지울 수 없습니다.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>이 목록에 외부 개체를 삽입할 수 없습니다.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>목록에 없는 개체를 제거할 수 없습니다.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0}은(는) {1} 테이블의 DataColumn 또는 DataRelation이 아닙니다.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>Range 개체에서 Min({0})은 max({1})보다 작거나 같아야 합니다.</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>범위가 null입니다.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>MinimumCapacity는 음수가 아니어야 합니다.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>이름 '{0}'에 대한 식별자를 생성할 수 없습니다.</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>네임스페이스는 다르지만 이름이 '{0}'인 테이블이 둘 이상 있습니다.</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>열 '{0}': 형식 '{1}'은(는) null일 수 없습니다.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>열 '{0}': 형식 '{1}'에 매개 변수 없는 생성자가 없습니다.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>열 '{0}': 형식 '{1}'에 문자열 인수를 사용하는 생성자가 없습니다.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>'{0}' 유형의 개체를 '{1}' 유형의 개체로 변환할 수 없습니다.</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>삭제된 행에 액세스할 수 없습니다.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>중복 이름을 사용할 수 없습니다.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>RowChanging 이벤트에서는 작업이 지원되지 않습니다.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>제약 조건이 잘못되었습니다.</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>기본 키가 없습니다.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Null이 허용되지 않습니다.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>열이 읽기 전용으로 표시되어 있습니다.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>테이블에 행이 없습니다.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>버전을 찾을 수 없습니다.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>ReadOnly 데이터가 수정됩니다.</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader가 현재 DataTable '{0}'에 사용할 수 없습니다.</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader에 있는 현재 DataTable '{0}'의 스키마가 변경되었으며 DataTableReader가 잘못되었습니다.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>DataTableReader를 만들 수 없습니다. DataSet에 DataTable이 없습니다.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>DataTableReader를 만들 수 없습니다. 인수가 비어 있습니다.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>DataTableReader를 만들 수 없습니다. 인수에 null 값이 있습니다.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>현재 DataRow가 Deleted 상태이거나 Detached 상태입니다.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>현재 DataTable '{0}'이(가) 비어 있습니다. DataTable에 DataRow가 없습니다.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>DataTable 내부 인덱스가 손상되었습니다: '{0}'.</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>컬렉션이 수정되었습니다. 열거 작업이 실행되지 않았을 수 있습니다.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>단순 형식 '{0}'이(가) 다른 '{1}'(으)로 이미 선언되었습니다.</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>foliation이 잘못되었습니다.</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>연결된 DataSet이 로드된 XML 문서에 매핑된 후에는 테이블 이름을 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>연결된 DataSet이 로드된 XML 문서에 매핑된 후에는 테이블 네임스페이스를 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>연결된 DataSet이 로드된 XML 문서에 매핑된 후에는 열 이름을 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>연결된 DataSet이 로드된 XML 문서에 매핑된 후에는 열 네임스페이스를 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>연결된 DataSet이 로드된 XML 문서에 매핑된 후에는 ColumnMapping 속성을 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>DataSet이 로드된 XML 문서에 매핑된 후에는 테이블에서 열을 추가하거나 제거할 수 없습니다.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>DataSet이 로드된 XML 문서에 매핑된 후에는 DataSet에서 테이블을 추가하거나 제거할 수 없습니다.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>DataSet이 로드된 XML 문서에 매핑된 후에는 DataSet에서 중첩 관계를 추가, 제거 또는 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>DataSet 매개 변수가 잘못되었습니다. 이 매개 변수는 null일 수 없습니다.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>DataSet이 로드된 XML 문서에 매핑된 후에는 DataSet 이름을 변경할 수 없습니다.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>이 형식의 노드를 복제할 수 없습니다. {0}</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>XmlDataDocument에 이미 데이터가 포함되어 있는 경우 로드할 수 없습니다. 새 XmlDataDocument를 사용하십시오.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>DataSet은 최대 하나의 XmlDataDocument에 연결될 수 있습니다. DataSet이 다른 XmlDataDocument에 이미 연결되어 있으므로 현재 XmlDataDocument에 연결할 수 없습니다.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>XML 작업을 사용하여 XmlDataDocument를 편집하기 전에 DataSet.EnforceConstraints == false를 설정하십시오.</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>DataDocument에서는 GetElementById()를 지원하지 않습니다.</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>DataDocument에 엔터티 참조를 만들 수 없습니다.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>DateSet과 DataTable의 Clear 기능은 XmlDataDocument에서 지원되지 않습니다.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>이 열은 현재 dataSet에 내장되어 있으므로 제거할 수 없습니다.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>이 관계는 현재 dataSet에 내장되어 있으므로 제거할 수 없습니다.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>이 컨트롤의 속성이 변경될 때마다 발생합니다.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>이 컬렉션의 멤버가 변경될 때마다 발생합니다.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>값이 DBNull이므로 가져올 수 없습니다.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>'{0}' 속성을 사용하려면 Microsoft WindowsNT 또는 WindowsNT 기반 운영 체제가 필요합니다.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>요청한 .NET Framework 데이터 공급자를 찾을 수 없습니다. 설치되지 않았을 수 있습니다.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>요청한 .NET Framework 데이터 공급자 구현에 System.Data.Common.DbProviderFactory 파생 유형의 인스턴스 필드가 없습니다.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>등록된 .NET Framework 데이터 공급자를 찾거나 로드하지 못했습니다.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>누락된 .NET Framework 데이터 공급자의 정규화된 어셈블리 이름이 필요합니다.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>요소만 사용할 수 있습니다.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>자식 노드는 사용할 수 없습니다.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>인식할 수 없는 특성 '{0}'입니다.</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>인식할 수 없는 요소입니다.</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>'{0}' 섹션은 config 파일별로 한 번만 사용할 수 있습니다.</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>필수 특성 '{0}'을(를) 찾을 수 없습니다.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>필요한 '{0}' 특성은 비워 둘 수 없습니다.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>'{0}' 매개 변수에 대한 배열은 비어 있지 않아야 합니다.</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>속성 '{0}'에 대해 허용되는 유일한 값은 '{1}'입니다.</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>속성 '{0}'에 허용되는 값은 '{1}' 또는 '{2}'입니다.</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>지정한 QuotePrefix 및 QuoteSuffix 값이 일치하지 않습니다.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>인수 '{0}'의 길이가 한계인 '{1}'을(를) 초과합니다.</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>{1} 유형의 인수가 필요한데 {0} 유형을 수신했습니다.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>키 '{0}'에 대한 값이 잘못되었습니다.</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>키 '{0}'을(를) 사용하려면 키 '{1}'이(가) 있어야 합니다.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>키 '{0}'의 값 길이가 제한인 ‘{1}’을(를) 초과합니다.</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>지원되지 않는 키워드입니다: '{0}'.</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>UDL 파일을 로드할 수 없습니다.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>잘못된 UDL 파일입니다.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>내부 .NET Framework Data Provider 오류 {0}입니다.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>Insert, Update 또는 Delete 명령이 생성된 후에는 QuotePrefix 및 QuoteSuffix 속성을 변경할 수 없습니다.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>DataAdapter.SelectCommand 속성을 초기화해야 합니다.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>DataAdapter.SelectCommand.Connection 속성을 초기화해야 합니다.</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}".</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}", 따옴표 사용이 잘못되었습니다.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}", 현재 한도 "{2}"이(가) 부족합니다.</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>SqlBulkCopy.DestinationTableName이 잘못된 multipart 이름이어서 SqlBulkCopy.WriteToServer에 실패했습니다.</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>multipart 이름이 잘못되어 SQL Server 결과를 처리하지 못했습니다.</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName은 잘못된 multipart 이름입니다.</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName은 잘못된 multipart 이름입니다.</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>SqlCommand.CommandText 속성 값이 잘못된 multipart 이름이어서 SqlCommand.DeriveParameters에 실패했습니다.</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>OdbcCommand.CommandText 속성 값이 잘못된 multipart 이름이어서 OdbcCommandBuilder.DeriveParameters에 실패했습니다.</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>OleDbCommandBuilder.CommandText 속성 값이 잘못된 multipart 이름이어서 OleDbCommandBuilder.DeriveParameters에 실패했습니다.</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>MultiSubnetFailover 연결 옵션을 사용하여 미러된 SQL Server 인스턴스에 연결이 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>DataColumn '{1}'이(가) 계산 열이므로 SourceColumn '{0}'에서의 열 매핑에 실패했습니다.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>{1}의 SourceColumn '{0}'과(와) {3}의 DataColumn '{2}'의 유형이 일치하지 않습니다.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>SourceColumn '{2}'의 DataTable '{1}'에 DataColumn '{0}'이(가) 없습니다.</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>SourceColumn에는 비어 있지 않은 문자열이 필요합니다.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>'{0}'에 대한 SourceColumn 매핑이 없습니다.</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} 열거형 값 {1}은(는) {2} 메서드에서 지원되지 않습니다.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} 열거형 값 {1}은(는) .NET Framework Odbc Data Provider에서 지원되지 않습니다.</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} 열거형 값 {1}은(는) .NET Framework OleDb Data Provider에서 지원되지 않습니다.</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} 열거형 값 {1}은(는) .NET Framework SqlClient Data Provider에서 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>ComputerNameDnsFullyQualified, {0}을(를) 검색할 수 없습니다.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>'{1}' SourceTable에 대한 '{0}' DataTable이 없습니다.</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>SourceTable에는 비어 있지 않은 문자열이 필요합니다.</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>SourceTable 매핑이 없습니다. '{0}'</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: CommandText 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: Connection 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0}을(를) 사용하려면 Connection이 열려 있고 사용 가능해야 합니다. {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: SelectCommand.Connection 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: SelectCommand.Connection 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: SelectCommand.Connection 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>업데이트하려면 InsertCommand에 연결 개체가 있어야 합니다. InsertCommand의 Connection 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>업데이트하려면 UpdateCommand에서 연결 개체를 사용해야 합니다. UpdateCommand의 Connection 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>업데이트하려면 DeleteCommand에서 연결 개체를 사용해야 합니다. DeleteCommand의 Connection 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>업데이트하려면 연결 개체가 필요합니다. Connection 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>업데이트하려면 명령 복제에서 연결 개체를 사용해야 합니다. 명령 복제의 Connection 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>업데이트하려면 연결이 필요합니다.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Update하려면 {0}Command에서 열린 연결 개체를 사용해야 합니다. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Update하려면 {0}Command에서 열린 연결 개체를 사용해야 합니다. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Update하려면 {0}Command에서 열린 연결 개체를 사용해야 합니다. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Update하려면 업데이트 명령에서 열린 연결 개체를 사용해야 합니다. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>'{0}' 저장 프로시저가 없습니다.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>이 명령에 할당된 트랜잭션은 최대 중첩된 보류 중인 로컬 트랜잭션이어야 합니다.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>트랜잭션이 현재 연결과 연결되어 있지 않거나 완료되었습니다.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>현재 연결에 연결된 트랜잭션은 완료되었지만 삭제되지 않았습니다. 이 연결이 SQL 문을 실행하는 데 사용될 수 있으려면 먼저 트랜잭션이 삭제되어야 합니다.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>명령에 할당된 연결이 보류 중인 로컬 트랜잭션에 연결되어 있는 경우 {0}을(를) 사용하려면 트랜잭션이 있어야 합니다. 명령의 Transaction 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>이 명령과 연결된 SqlResultSet이 이미 열려 있습니다. 먼저 닫아야 합니다.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>이 {0}과(와) 연결된 DataReader가 이미 열려 있습니다. 먼저 닫아야 합니다.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>{0} DeriveParameters는 CommandType.StoredProcedure만 지원하며 CommandType.{1}은(는) 지원하지 않습니다.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>메서드 '{0}'은(는) 같은 실행에 대해 두 번 이상 호출할 수 없습니다.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>비동기 결과가 잘못되었습니다.</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>'{0}'을(를) 호출하기 전에 SelectCommand 속성이 초기화되지 않았습니다.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>StatementType {0}은(는) 여기에 사용할 수 없습니다.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: SourceTable 이름에는 비어 있지 않은 문자열이 필요합니다.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>MaxRecords 값 {0}이(가) 잘못되었습니다. 값은 0보다 크거나 같아야 합니다.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>StartRecord 값 {0}이(가) 잘못되었습니다. 값은 0보다 크거나 같아야 합니다.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: SourceTable 이름에는 비어 있지 않은 문자열이 필요합니다.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>계층적 장의 열은 AutoIncrement DataColumn에 매핑되어야 합니다.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0})에서 null을 반환했습니다.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>startRecords 또는 maxRecords에 0이 아닌 값을 사용하는 경우 dataTables 배열에서 한 항목만 지정하십시오.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Update로 TableMapping['{0}'] 또는 DataTable '{0}'을(를) 찾을 수 없습니다.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update: 비어 있지 않은 SourceTable 이름이 필요합니다.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>TableMapping.DataSetTable='{0}'인 TableMapping이 없습니다.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Update하려면 올바른 명령 복제가 필요합니다.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>Update하는 동안 자동 SQL 생성을 수행하려면 올바른 SelectCommand가 필요합니다.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>새 행을 포함하여 DataRow 컬렉션을 전달하는 경우 Update하려면 올바른 InsertCommand가 필요합니다.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>수정된 행을 포함하여 DataRow 컬렉션을 전달하는 경우 업데이트하려면 올바른 UpdateCommand가 필요합니다.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>삭제된 행을 포함하여 DataRow 컬렉션을 전달하는 경우 Update하려면 올바른 DeleteCommand가 필요합니다.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}]는 DataRow[0]와 DataTable이 다릅니다.</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: 오류가 발생했습니다. 추가 정보가 없습니다.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: 오류가 발생했습니다. 추가 정보가 없습니다.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>일괄 처리할 때 UpdateRowSource.FirstReturnedRecord 또는 UpdateRowSource.Both에 대한 명령의 UpdatedRowSource 속성 값이 잘못되었습니다.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>동시성 위반: 필요한 {1} 레코드 중 UpdateCommand의 영향을 받는 {0}이(가) 없습니다.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>동시성 위반: 필요한 {1} 레코드 중 DeleteCommand의 영향을 받는 {0}이(가) 없습니다.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>동시성 위반: 필요한 {1} 레코드 중 일괄 처리된 명령의 영향을 받는 {0}이(가) 없습니다.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>메서드 '{0}'은(는) 같은 실행에 대해 두 번 이상 호출할 수 없습니다.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>CommandTimeout 값 {0}이(가) 잘못되었습니다. 값은 0보다 크거나 같아야 합니다.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: Size 속성의 크기 0은 잘못되었습니다.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>{0}.Prepare 메서드에는 모든 매개 변수의 형식을 명시적으로 설정해야 합니다.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>{0}.Prepare 메서드에는 모든 가변 길이 매개 변수의 크기를 0이 아닌 Size로 명시적으로 설정해야 합니다.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>{0}.Prepare 메서드에는 Precision 및 Scale이 명시적으로 설정된 '{1}' 형식의 매개 변수가 필요합니다.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>asyncResult에 대한 end 메서드 호출이 일치하지 않습니다. {0}을(를) 호출해야 하는데 {1}이(가) 호출되었습니다.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>잘못된 작업입니다. 연결이 닫혔습니다.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>연결이 비활성화되었습니다.</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>로컬 트랜잭션이 연결 중이기 때문에 트랜잭션에 참여할 수 없습니다. 로컬 트랜잭션을 끝낸 후 다시 시도하십시오.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>현재 연결이 트랜잭션에 참여했습니다. 현재 트랜잭션을 끝낸 후 다시 시도하십시오.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>데이터베이스는 Null, 빈 문자열 또는 공백으로만 구성된 문자열일 수 없습니다.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>인수가 너무 깁니다.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>'Connect Timeout' 값이 잘못되었습니다. 이 값은 0보다 크거나 같은 정수여야 합니다.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>소스 버퍼(크기: {0}) 오프셋이 잘못되었습니다. {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>대상 버퍼(크기: {0}) 오프셋이 잘못되었습니다. {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>숫자 값이 너무 커서 96비트 10진수에 맞지 않습니다.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>스트림이 닫혀 있으면 {0}을(를) 수행할 수 없습니다.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>지정한 SeekOrigin 값이 잘못되었습니다.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>여러 기본 테이블에 대해서는 동적 SQL 생성이 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>기본 테이블 정보를 반환하지 않는 SelectCommand에 대해서는 동적 SQL 생성이 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>키 열 정보를 반환하지 않는 SelectCommand에 대해서는 DeleteCommand에 대한 동적 SQL 생성이 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>키 열 정보를 반환하지 않는 SelectCommand에 대해서는 UpdateCommand에 대한 동적 SQL 생성이 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>행 버전 정보를 표시한 열을 포함하지 않는 SelectCommand에 대해서는 DeleteCommand에 대한 동적 SQL 생성이 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>행 버전 정보를 표시한 열을 포함하지 않는 SelectCommand에 대해서는 UpdateCommand에 대한 동적 SQL 생성이 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>QuotePrefix 또는 QuoteSuffix 문자 '{1}'을(를) 포함하는 테이블 이름 '{0}'에 대해서는 동적 SQL 생성이 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>열 서수 '{0}'에서 읽으려고 했습니다. CommandBehavior.SequentialAccess를 사용하는 경우 열 서수 '{1}' 이상에서만 읽을 수 있습니다.</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>데이터 형식 '{0}'은(는) 날짜/시간 자릿수가 잘못되었기 때문에 리터럴 형식으로 지정할 수 없습니다.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>요청한 형식의 리터럴로 값의 형식을 지정할 수 없습니다.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>데이터 형식 '{0}'은(는) 최대 소수 자릿수가 잘못되었기 때문에 리터럴로 형식을 지정할 수 없습니다.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>지정한 리터럴 값은 데이터 유형 '{0}'에 적합하지 않은 리터럴입니다.</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>'{0}': 리터럴 값의 길이는 짝수여야 합니다.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>'{0}': 리터럴 값은 16진수의 문자열이어야 합니다.</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>따옴표 접두사를 설정하지 않은 경우 {0}을(를) 사용하려면 연결이 열려 있어야 합니다.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>올바른 부울 리터럴 값을 확인할 수 없습니다. Boolean 리터럴을 만들 수 없습니다.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>데이터 유형 '{0}'에 연결된 기본 데이터 유형의 리터럴은 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>매개 변수 데이터 형식 {0}이(가) 잘못되었습니다.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>개체 유형 {0}에서 알려진 관리되는 공급자 기본 유형으로의 매핑이 없습니다.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>Type {1}에서 반환한 알 수 없는 TypeCode {0}을(를) 처리할 수 없습니다.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>DbType {0}에서 {1}(으)로의 매핑이 없습니다.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>사용 중인 SQL Server 버전에서 데이터 유형 '{0}'을(를) 지원하지 않습니다.</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>매개 변수 값 '{0}'이(가) 범위를 벗어났습니다.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>지정한 매개 변수 이름 '{0}'이(가) 잘못되었습니다.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>반환 값이 여러 개인 매개 변수는 지원되지 않습니다.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>매개 변수 Size 값 '{0}'이(가) 잘못되었습니다. 값은 0보다 크거나 같아야 합니다.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>인수 '{0}'에 대한 값이 잘못되었습니다. 값은 0보다 크거나 같아야 합니다.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>이 메타데이터에 대한 값이 잘못되었습니다.</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>메타데이터는 SqlDbType.Row여야 합니다.</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>매개 변수 값을 {0}에서 {1}(으)로 변환하지 못했습니다.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0}에서 병렬 트랜잭션을 지원하지 않습니다.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>이 {0}이(가) 완료되었습니다. 더 이상 사용할 수 없습니다.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>레코드가 읽기 전용이면 '{0}'을(를) 호출할 수 없습니다.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>DbDataRecord가 읽기 전용이면 '{0}'을(를) 호출할 수 없습니다.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>개체 유형 '{0}'을(를) 데이터 형식 '{1}'(으)로 암시적으로 변환할 수 없습니다.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>버퍼 오프셋 '{1}'과(와) 사용 가능한 바이트 '{0}'을(를) 더한 값이 전달된 버퍼의 길이보다 큽니다.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>데이터 길이 '{0}'은(는) 0보다 작습니다.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>지정한 길이 '{0}'이(가) 범위를 벗어났습니다.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>'{0}' dataIndex에서 {2} 시도가 잘못되었습니다. CommandBehavior.SequentialAccess를 사용하는 경우 '{1}' dataIndex 이상에서만 읽을 수 있습니다.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>오프셋은 값 내의 위치를 참조해야 합니다.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>ODBC 관리되는 공급자를 사용하려면 TABLE_NAME 제한을 지정해야 하며 GetSchema 인덱스 컬렉션에 대해 Null이 아닌 값을 지정해야 합니다.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>메서드 '{0}'에 대한 인수 값이 잘못되었습니다.</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>ODBC 공급자가 SQLGETTYPEINFO에서 결과를 반환하지 않았습니다.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>예기치 않은 null DataTable 인수입니다.</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>예기치 않은 null DataSet 인수입니다.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>연결 문자열이 허용되는 최대 길이인 {0}을(를) 초과합니다.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} - 형식에 매핑할 수 없습니다.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>알 수 없는 SQL 형식입니다. {0}</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>알 수 없는 URT 형식입니다. {0}</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>음의 인수가 잘못되었습니다.</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>열려 있는 연결에는 속성을 설정할 수 없습니다.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>SQL_TRANSACTION '{0}'에서 System.Data.IsolationLevel 열거형 값으로의 올바른 매핑이 없습니다.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} - 연결 풀링을 사용할 수 없습니다.</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} - 환경 핸들을 할당할 수 없습니다.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} - 설명자 핸들을 가져올 수 없습니다.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>트랜잭션에 없습니다.</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>OdbcType 열거형 값={0}이(가) 잘못되었습니다.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>DBNull.Value 데이터가 필요한 경우 IsDBNull을 사용합니다.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0}[{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} - 오류 정보가 없습니다.</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>연결이 닫혀 있습니다.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>내부 연결에 소유자가 없습니다.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>.NET Framework Odbc Data Provider를 사용하려면 MDAC(Microsoft Data Access Components) 버전 2.6 이상이 필요합니다. 현재 버전 {0}이(가) 설치되어 있습니다.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>.NET Framework OleDb Data Provider를 사용하려면 MDAC(Microsoft Data Access Components) 버전 2.6 이상이 필요합니다. 현재 버전 {0}이(가) 설치되어 있습니다.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>'{0}' 인터페이스는 '{1}' 공급자에서 지원되지 않습니다. GetOleDbSchemaTable은 현재 공급자에서 사용할 수 없습니다.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>오류 메시지 없이 '{0}'이(가) 실패했습니다(결과 코드: {1}).</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>오류 정보가 없습니다. 결과 코드: {0}</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>.NET Framework 데이터 공급자를 사용하려면 MDAC(Microsoft Data Access Components)가 필요합니다. MDAC(Microsoft Data Access Components) 버전 2.6 이상을 설치하세요.</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>.NET Framework Data Provider for OLEDB(Microsoft.Data.OleDb)는 MSDASQL(Microsoft OLE DB Provider for ODBC Drivers)을 지원하지 않습니다. .NET Framework Data Provider for ODBC(System.Data.Odbc)를 사용하세요.</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>.NET Framework Data Provider for OLEDB는 대화형이 아닌 환경에서 OLE DB 공급자가 사용자에게 확인하는 작업을 허용하지 않습니다.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>'{0}' 공급자는 로컬 컴퓨터에 등록할 수 없습니다.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>ICommandText 인터페이스는 '{0}' 공급자에서 지원되지 않습니다. 대신 CommandType.TableDirect를 사용하십시오.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>ITransactionLocal 인터페이스는 '{0}' 공급자에서 지원되지 않습니다. 로컬 트랜잭션은 현재 공급자에서 사용할 수 없습니다.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>초기화 문자열 형식이 OLE DB 사양에 맞지 않습니다. '연결 문자열의 char[{0}] 주위에서 시작합니다.</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>'비동기 처리'는 .NET Framework Data OLE DB Provider(Microsoft.Data.OleDb)에서 지원하지 않는 기능입니다.</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>ConnectionString에 OLE DB 공급자를 지정하지 않았습니다(예: 'Provider=SQLOLEDB;').</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>ConnectionString에 지정된 OLE DB 공급자가 너무 깁니다.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>DbInfoKeywords OleDbSchemaGuid에 대한 제한이 없어야 합니다.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>DbInfoLiterals OleDbSchemaGuid에 제한 사항이 없어야 합니다.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>스키마 guid OleDbSchemaGuid에 대한 제한이 없어야 합니다.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>{0} OleDbSchemaGuid는 '{1}' 공급자에서 지원되는 스키마가 아닙니다.</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>'{0}' 구성 설정의 값 수가 잘못되었습니다.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>구성 설정 '{0}'에 지정된 XML 파일을 로드할 수 없습니다.</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>명령 매개 변수[{0}] '{1}'이(가) 잘못되었습니다.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>부호 불일치 또는 데이터 오버플로 이외의 다른 이유로 인해 명령 매개 변수[{0}] '{1}' 데이터 값을 변환할 수 없습니다.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>데이터 값은 부호가 있고 공급자에서 사용한 형식은 부호가 없기 때문에 명령 매개 변수[{0}] '{1}'을(를) 변환하지 못했습니다.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>공급자에서 사용한 형식에 대해 데이터 값 오버플로가 발생했기 때문에 명령 매개 변수[{0}] '{1}'을(를) 변환하지 못했습니다.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>명령 매개 변수[{0}] '{1}' 값을 보내는 동안 공급자에서 오류가 발생하여 처리가 중지되었습니다.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>매개 변수[{0}] '{1}'에 기본값이 없습니다.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>매개 변수[{0}]: {1}에서 오류가 발생했습니다.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Microsoft.Data.OleDb.OleDbDataAdapter 내부 오류: 매개 변수 접근자가 잘못되었습니다. {0} {1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter[{0}]: OleDbType 속성이 초기화되지 않았습니다. OleDbType.{1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>ICommandWithParameters 인터페이스는 '{0}' 공급자에서 지원되지 않습니다. 현재 공급자는 명령 매개 변수를 지원하지 않습니다.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>프로시저 매개 변수 정보 검색은 '{0}' 공급자에서 지원되지 않습니다.</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>서버의 소수 구분 기호를 확인할 수 없습니다. 정수가 아닌 숫자 리터럴을 만들 수 없습니다.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>ADODB.RecordSet 또는 ADODB.Record 개체가 아닙니다.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>ADODB.RecordSet 개체에서 '{0}' 인터페이스를 검색할 수 없습니다.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: Size 속성의 크기 0은 잘못되었습니다.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>ADODB.Record 개체에서 IRow 인터페이스를 검색할 수 없습니다.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>{0}.Prepare 메서드에는 모든 매개 변수의 형식을 명시적으로 설정해야 합니다.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>유형이 OLE DB 인터페이스 ISourcesRowset을 지원하지 않습니다.</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>{0}.Prepare 메서드에는 모든 가변 길이 매개 변수의 크기를 0이 아닌 Size로 명시적으로 설정해야 합니다.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>공급자가 IDBInfo를 지원하지 않기 때문에 ReservedWords 스키마 컬렉션을 생성할 수 없습니다.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>{0}.Prepare 메서드에는 Precision 및 Scale이 명시적으로 설정된 '{1}' 형식의 매개 변수가 필요합니다.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>공급자가 '{0}' 속성을 지원하지 않거나, 소비자가 Initialization 속성 그룹에 없는 속성의 값을 가져오거나 설정하려고 했으며 데이터 원본 개체가 초기화되지 않았기 때문에 속성의 값이 설정되지 않았습니다.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>asyncResult에 대한 end 메서드 호출이 일치하지 않습니다. {0}을(를) 호출해야 하는데 {1}이(가) 호출되었습니다.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>다음과 같은 이유로 인해 '{0}' 속성을 초기화하지 못했습니다.
-	값 데이터 유형이 속성의 데이터 유형이 아니거나 Null이 아닙니다. 예를 들어 속성은 데이터 유형이 Int32인 DBPROP_MEMORYUSAGE이고 데이터 유형은 Int64인 경우입니다.
-	값이 잘못되었습니다. 예를 들어 속성은 DBPROP_MEMORYUSAGE이고 값은 음수인 경우입니다.
-	값은 속성에 유효한 값이고 공급자는 설정 가능한 속성으로 해당 속성을 지원하지만 공급자는 지정된 값을 지원하지 않습니다. 여기에는 공급자가 기록된 후 OLE DB의 속성에 값이 추가된 경우가 포함됩니다.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>잘못된 작업입니다. 연결이 닫혔습니다.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>Options의 값이 잘못되었습니다.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>로컬 트랜잭션이 연결 중이기 때문에 트랜잭션에 참여할 수 없습니다. 로컬 트랜잭션을 끝낸 후 다시 시도하십시오.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>ColumnID 요소가 잘못되었습니다.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>현재 연결이 트랜잭션에 참여했습니다. 현재 트랜잭션을 끝낸 후 다시 시도하십시오.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>'{0}' 속성은 모든 열에 적용되도록 지정되었지만 하나 이상의 열에 적용할 수 없습니다.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>데이터베이스는 Null, 빈 문자열 또는 공백으로만 구성된 문자열일 수 없습니다.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>'{0}' 속성은 읽기 전용이거나 소비자가 데이터 원본 개체를 초기화한 후 Initialization 속성 그룹에서 속성의 값을 설정하려고 했습니다. 소비자는 읽기 전용 속성의 값을 현재 값으로 설정할 수 있습니다. 이 상태는 설정 가능한 열 속성을 특정 열에 대해 설정할 수 없는 경우에도 반환됩니다.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>소스 버퍼(크기: {0}) 오프셋이 잘못되었습니다. {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>선택적인 '{0}' 속성의 값이 지정된 값으로 설정되지 않았으며 지정된 값으로 설정할 수 없습니다.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>대상 버퍼(크기: {0}) 오프셋이 잘못되었습니다. {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>'{0}' 속성의 값을 설정하면 기존 속성과 충돌하기 때문에 설정되지 않았습니다.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>스트림이 닫혀 있으면 {0}을(를) 수행할 수 없습니다.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(예약됨)</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>지정한 SeekOrigin 값이 잘못되었습니다.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>공급자가 알 수 없는 DBPROPSTATUS_ 값 '{0}'을(를) 반환했습니다.</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>열 서수 '{0}'에서 읽으려고 했습니다. CommandBehavior.SequentialAccess를 사용하는 경우 열 서수 '{1}' 이상에서만 읽을 수 있습니다.</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>접근자 유효성 검사가 지연되었으며 메서드가 데이터를 반환하는 동안 수행되었습니다. 바인딩이 이 열 또는 매개 변수에 적합하지 않습니다.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>매개 변수 데이터 형식 {0}이(가) 잘못되었습니다.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>OleDbDataAdapter 내부 오류: 행 집합 접근자가 잘못되었습니다. Ordinal={0} Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>개체 유형 {0}에서 알려진 관리되는 공급자 기본 유형으로의 매핑이 없습니다.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>부호가 일치하지 않거나 데이터 오버플로 이외의 이유 때문에 데이터 값을 변환할 수 없습니다. 예를 들어, 데이터 저장소의 데이터는 손상되었지만 행을 계속 검색할 수 있는 경우입니다.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>Type {1}에서 반환한 알 수 없는 TypeCode {0}을(를) 처리할 수 없습니다.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>공급자가 {0} 데이터를 반환할 메모리를 할당할 수 없습니다.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>DbType {0}에서 {1}(으)로의 매핑이 없습니다.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>{0} 데이터 값이 소비자 버퍼의 {0} 값에 지정된 형식에 대해 오버플로되었기 때문에 변환하지 못했습니다.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>사용 중인 SQL Server 버전에서 데이터 유형 '{0}'을(를) 지원하지 않습니다.</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter 내부 오류: [get] 알 수 없는 OLE DB 데이터 형식입니다. 0x{0} ({1})</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>매개 변수 값 '{0}'이(가) 범위를 벗어났습니다.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>{0} 데이터 값은 부호가 있고 소비자 버퍼의 {0} 값에 지정한 형식은 부호가 없기 때문에 변환하지 못했습니다.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>지정한 매개 변수 이름 '{0}'이(가) 잘못되었습니다.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter 내부 오류: [set] 알 수 없는 OLE DB 데이터 형식입니다: 0x{0}({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>매개 변수 Size 값 '{0}'이(가) 잘못되었습니다. 값은 0보다 크거나 같아야 합니다.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>공급자가 {0} 값을 결정하지 못했습니다. 예를 들어 행을 새로 만들었거나, {0} 열의 기본값을 사용할 수 없거나, 소비자가 새 {0} 값을 아직 설정하지 않은 경우입니다.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>인수 '{0}'에 대한 값이 잘못되었습니다. 값은 0보다 크거나 같아야 합니다.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>OLE DB 공급자에서 예기치 않은 상태 코드 {0}을(를) 반환했습니다.</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>이 메타데이터에 대한 값이 잘못되었습니다.</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>해당 스레드의 ApartmentState가 ApartmentState.MTA가 아닌 경우 OleDbDataReader.Read는 이것을 만든 동일한 스레드에서 사용되어야 합니다.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>매개 변수 값을 {0}에서 {1}(으)로 변환하지 못했습니다.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>알 수 없는 오류입니다. {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0}에서 병렬 트랜잭션을 지원하지 않습니다.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>{0} 때문에 IErrorInfo.GetDescription이 실패했습니다.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>이 {0}이(가) 완료되었습니다. 더 이상 사용할 수 없습니다.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>{0} 때문에 IErrorInfo.GetSource가 실패했습니다.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>지정한 길이 '{0}'이(가) 범위를 벗어났습니다.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>DBTYPE_VECTOR 데이터는 .NET Framework Data OLE DB Provider(Microsoft.Data.OleDb)에서 지원되지 않습니다.</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>'{0}' dataIndex에서 {2} 시도가 잘못되었습니다. CommandBehavior.SequentialAccess를 사용하는 경우 '{1}' dataIndex 이상에서만 읽을 수 있습니다.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>풀 크기의 최소값 또는 최대값이 잘못되었습니다. 최소 풀 크기는 최대 풀 크기보다 클 수 없습니다.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>'{0}' 키워드는 사용되지 않습니다. 대신 '{1}'을(를) 사용하십시오.</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>서버에 대한 DTC(Distributed Transaction Coordinator) 주소를 서버로부터 가져올 수 없습니다. 서버에서 DTC를 활성화하시겠습니까?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>연결 매개 변수 &lt;{0}&gt; 값의 길이가 허용되는 최대 길이인 65535자를 초과합니다.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>'Packet Size'가 잘못되었습니다. 이 값은 512보다 크거나 같고 32768보다 작거나 같은 정수여야 합니다.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>트랜잭션이 잘못되었거나 트랜잭션에 저장할 지점 이름이 잘못되었습니다.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>{0} 열거형 값 {1}은(는) SQL Server 7.0 또는 SQL Server 2000에서 지원되지 않습니다.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>User Instance 및 Failover는 호환되지 않는 옵션입니다. 연결 문자열에서 둘 중 하나만 선택해야 합니다.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>'Authentication=Active Directory Integrated'가 연결 문자열에 지정된 경우 Credential 속성을 설정할 수 없습니다.</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>인증서 인증으로 지정된 인증 매개 변수가 잘못되었습니다.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>연결하려는 SQL Server 인스턴스에 암호화가 필요하지만 이 시스템에서 암호화를 지원하지 않습니다.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>연결하려는 SQL Server 인스턴스에서 암호화를 지원하지 않습니다.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>연결하려는 SQL Server 인스턴스에서 CTAIP를 지원하지 않습니다.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>지원되지 않는 SQL Server 버전입니다. .NET Framework SqlClient Data Provider는 SQL Server 버전 7.0 이상에서만 사용할 수 있습니다.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>비동기 작업이 진행 중인 동안에는 {0}을(를) 변경할 수 없습니다.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>이 명령을 사용하려면 비동기 연결이 필요합니다. 연결 문자열에서 "Asynchronous Processing=true"로 설정하십시오.</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>연결 시도 시간이 초과되었습니다.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>제한 시간이 만료되었으므로 연결이 끊겼습니다.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>인스턴스 오류입니다.</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>오류 코드 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword를 사용하려면 SQL Server 9.0 이상이 필요합니다.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>SSE 인스턴스 리디렉션은 로컬이 아닌 사용자 인스턴스에는 지원되지 않습니다.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>'{0}' 인증을 사용할 수 없습니다.</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>SQL 인증 방법 '{0}'을(를) 사용할 수 없습니다.</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>'{0}'에 대해 '{1}' 형식을 사용하여 인증 공급자를 인스턴스화하지 못했습니다.</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>'{0}' 형식을 사용하여 SqlAuthenticationInitializer를 인스턴스화하지 못했습니다.</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>초기화하는 동안 공급자 '{0}'에서 예외를 throw했습니다.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>'{0}' 공급자에서 '{1}' 인증을 지원하지 않습니다.</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>'{0}'에 대한 인증 공급자를 찾을 수 없습니다. Active Directory(Entra ID) 인증 방법을 사용하려면 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet 패키지(https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure)를 설치하세요.</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>인증 공급자에 대한 구성 섹션을 읽지 못했습니다.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>'{0}' 매개 변수는 null이거나 비워 둘 수 없습니다.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>비동기 작업이 이미 완료되었습니다.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>보류 중인 비동기 작업이 이미 진행 중이기 때문에 명령 실행을 계속할 수 없습니다.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>ExecuteXmlReader로 보낸 명령이 잘못되었습니다. 이 명령은 Xml 결과를 반환해야 합니다.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>알림을 사용하려면 SQL Server 9.0 이상이 필요합니다.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>UdtTypeName의 세 부분으로 된 이름 형식이 잘못되었습니다.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>SSPI 패키지를 초기화할 수 없습니다.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Timeout이 만료되었습니다. 작업을 완료하기 전에 제한 시간이 경과되었거나 서버가 응답하지 않았습니다.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>연결 제한 시간이 만료되었습니다. 사전 로그인 단계를 시작할 때 제한 시간이 경과되었습니다. 이 문제는 연결 제한 시간에 제공된 시간이 부족하기 때문일 수 있습니다.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>연결 문자열에서 사용자 인스턴스를 요청했지만 지정한 서버에서 이 옵션을 지원하지 않습니다.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>서버 인증서가 애플리케이션 유효성 검사에 실패했습니다.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>지정한 데이터 길이 {0}이(가) 허용되는 최대 길이 {1}을(를) 초과합니다.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>데이터가 없어서 읽을 수 없습니다.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>데이터 길이 '{0}'은(는) 0보다 작습니다.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>SqlDataRecord가 읽기 전용이면 '{0}'을(를) 호출할 수 없습니다.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>매핑된 컬렉션이 사용 중이며 현재 액세스할 수 없습니다.</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>Microsoft.Data.SqlClient를 사용하여 컨텍스트 연결에 연결할 수 없습니다.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>중첩 TransactionScopes는 지원되지 않습니다.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>예기치 않은 서버 이벤트가 발생했습니다. {0}</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>'{0}'의 길이는 '{1}'의 길이와 일치해야 합니다.</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>SqlDbType '{0}'은(는) {1}에 사용할 수 없습니다. {2}만 지원됩니다.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>값이 너무 많습니다.</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>Stream이 쓰기를 지원하지 않습니다.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>Null</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>메시지</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>산술 오버플로가 발생했습니다.</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>0으로 나눔 오류가 발생했습니다.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>Data가 Null입니다. 이 메서드 또는 속성은 Null 값에 호출될 수 없습니다.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>수치 연산을 수행하면 잘라내기가 발생합니다.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>SqlDateTime 오버플로가 발생했습니다. 1753년 1월 1일 오전 12:00:00에서 9999년 12월 31일 오후 11:59:59 사이에 있어야 합니다.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>연결할 두 문자열의 데이터가 다르게 정렬되어 있습니다.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>비교할 두 문자열의 데이터가 다르게 정렬되어 있습니다.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>플래그 값이 잘못되었습니다.</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>SqlDecimal에서 Decimal로 변환하는 동안 오버플로가 발생했습니다.</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>변환 오버플로가 발생했습니다.</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>SqlDateTime이 잘못되었습니다.</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>표준 시간대를 지정했습니다. SqlDateTime은 표준 시간대를 지원하지 않습니다.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>배열 크기가 잘못되었습니다.</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>전체 자릿수/소수 자릿수가 잘못되었습니다.</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>입력 형식이 잘못되었습니다.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>SqlType 오류입니다.</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>이 버전에서는 SqlBytes와 SqlChars가 2GB 이상의 길이를 지원하지 않습니다.</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>읽는 동안 오류가 발생했습니다.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Stream을 닫거나 삭제했습니다.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>버퍼가 없습니다. 읽기 또는 쓰기 작업이 실패했습니다.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>현재 값이 Null이므로 0이 아닌 길이로 설정할 수 없습니다.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>버퍼가 부족합니다. 읽기 또는 쓰기 작업이 실패했습니다.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>현재 값이 Null이므로 0이 아닌 오프셋에 쓸 수 없습니다.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>현재 길이보다 큰 오프셋에서 쓸 수 없습니다. 따라서 버퍼에 초기화되지 않은 데이터가 남게 됩니다.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>반환된 데이터의 크기가 2Gb보다 큽니다. 모든 데이터를 가져오려면 SequentialAccess command behavior를 사용하십시오.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>GetDayOfWeek에 대한 인수는 1에서 7 사이의 정수여야 합니다.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>SQL Type이 데이터와 함께 로드되지 않았습니다.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>SQL Type이 데이터와 함께 로드되었습니다.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>닫힌 XmlReader에 액세스할 수 없습니다.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>스트림이 닫혀 있으면 {0}을(를) 호출할 수 없습니다.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>스트림을 쓸 수 없으면 {0}을(를) 호출할 수 없습니다.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>스트림을 읽을 수 없으면 {0}을(를) 호출할 수 없습니다.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>스트림을 검색할 수 없으면 {0}을(를) 호출할 수 없습니다.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>서브클래스에서 필요한 메서드를 재정의하지 않았습니다.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>'{0}'에 대한 노멀라이저를 만들 수 없습니다.</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>내부 오류</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>Command 매개 변수에는 Null이 아니며 비어 있지 않은 명령 텍스트가 있어야 합니다.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>MetaData 매개 변수 배열의 길이는 ParameterDirection 배열 인수와 같아야 합니다.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>제공된 시간 범위가 총 14시간을 초과합니다.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>데이터 어댑터 오류입니다.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>DB 동시성 위반입니다.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>작업이 중단되었습니다.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>예외가 발생하여 작업이 중단되었습니다. 자세한 내용은 InnerException을 참조하십시오.</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Fill에서 DataRow.AcceptChanges를 호출할지 여부를 지정합니다.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Update에서 DataRow.AcceptChanges를 호출할지 여부입니다.</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Update 이벤트, RowUpdating과 RowUpdated, 그리고 Status가 UpdateStatus.ErrorsOccurred인 경우에 다음 DataRow로 이동할지 여부를 결정합니다.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>어댑터가 DataReader에서 DataTable을 채우는 방법입니다.</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>TableMappings의 테이블 또는 열이 없는 경우 수행되는 작업입니다.</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>DataSet의 테이블 또는 열이 없는 경우 수행되는 작업입니다.</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>DataSet 테이블에 소스 테이블을 매핑하는 방법을 지정합니다.</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Fill을 사용하는 동안 복구할 수 있는 오류가 발생할 때 이벤트가 트리거됩니다.</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Fill에서 공급자 관련 값 또는 공용 CLSCompliant 값을 반환해야 합니다.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>원본 열 이름 - 대/소문자 구분</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>컬렉션의 항목 수입니다.</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>지정된 DataColumnMapping 개체입니다.</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>이 테이블 매핑이 일치할 때의 개별 열 매핑입니다.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>DataTableMapping 소스 테이블 이름이며 대/소문자를 구분합니다.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>컬렉션의 항목 수입니다.</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>지정된 DataTableMapping 개체입니다.</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>DataSet의 삭제된 행을 업데이트하는 동안 사용됩니다.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>업데이트하는 동안 각 DataRow 다음에 이벤트가 트리거됩니다.</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>데이터 원본에 대해 실행하기 전에 함께 일괄 처리할 행 수입니다.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Select/Insert/Update/DeleteCommands에 연결이 없는 경우 사용되는 연결입니다.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>DataTable의 삭제된 행에 대한 Update 시 사용됩니다.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>DataTable의 새 행에 대한 Update 시 사용됩니다.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Fill 시 사용됩니다.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>DataTable의 수정된 행에 대한 Update 시 사용됩니다.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Fill에서 공급자 관련 값 또는 공용 CLSCompliant 값을 반환해야 합니다.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>원본 테이블을 DataTable에 매핑하는 방법입니다.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>사용자가 설정하지 않은 경우 Insert/Update/DeleteCommands가 생성되는 방법입니다.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>데이터 원본에 대해 실행하기 전에 함께 일괄 처리할 행 수입니다.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>Data Source에 연결하는 데 사용되는 연결 문자열입니다.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>Data Source에 연결할 때 사용할 ODBC 드라이버의 이름입니다.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>Data Source에 연결할 때 사용할 DSN입니다.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>true인 경우 관리되는 연결 풀링이 사용됨을 나타냅니다.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>Data Source에 연결할 때 사용할 UDL 파일입니다.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>OleDb Provider에서 OLE DB Services를 활성화거나 비활성화할지 여부를 지정합니다.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>Data Source에 연결할 때 사용할 OLE DB 공급자의 이름입니다.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>애플리케이션의 이름입니다.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>true인 경우 .NET Framework 데이터 공급자에서 비동기 기능의 사용을 활성화합니다.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>연결할 수 있는 데이터베이스의 기본 파일 이름(전체 경로 이름 포함)입니다.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>true인 경우 풀에서 제거될 때 연결 상태가 다시 설정됨을 나타냅니다.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>true인 경우 연결이 Sql Server 컨텍스트에서 시작되어야 함을 나타냅니다. Sql Server 프로세스에서 실행 중인 경우에만 사용할 수 있습니다.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>SQL Server 언어 레코드 이름입니다.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>SQL Server로 인증하는 방법을 지정합니다.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>SQL Server 인증을 위해 지정된 클라이언트 인증서입니다.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>데이터 원본에 연결하는 데 사용되는 정보입니다.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>ConnectionString에서 설정할 수 없는 현재 연결 시간 제한 값입니다.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>연결 문자열에서 현재 데이터 원본 카탈로그 값입니다('Database=X').</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>연결 문자열에서 현재 데이터 원본입니다('Server=X').</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>현재 ODBC 드라이버입니다.</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>ODBC 드라이버에서 액세스하는 제품의 버전입니다.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>데이터 원본에 연결하는 데 사용되는 정보입니다.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>ConnectionString에서 현재 연결 시간 제한 값입니다('Connect Timeout=X').</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>연결 문자열에서 현재 데이터 원본 카탈로그 값입니다('Initial Catalog=X').</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>연결 문자열에서 현재 데이터 원본입니다('Data Source=X').</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>연결 문자열에서 현재 OLE DB 공급자 ProgID입니다('Provider=X').</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>OLE DB 공급자에서 액세스하는 제품의 버전입니다.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>인증에 사용할 액세스 토큰입니다.</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>연결, 동기 또는 비동기 작업의 상태입니다. 연결 문자열에서 'Asynchronous Processing=x'입니다.</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>연결하는 데 사용되는 복제에 대한 정보입니다.</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>'Data Source=x;Initial Catalog=x;Integrated Security=SSPI'와 같이 DataSource에 연결하는 데 사용되는 정보입니다.</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>이 연결에 대한 통계를 수집합니다.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>사용자 지정 암호화 키 저장소 공급자입니다.</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>실제 연결을 나타내는 GUID입니다.</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Microsoft SQL Server에서 사용하는 알림의 자동 인리스트먼트입니다.</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>사용자가 지정하지 않은 경우 Update 및 Delete 명령에 대해 where 절이 자동 생성되는 방법입니다.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>텍스트 명령의 정규화된 테이블 이름에서 카탈로그 이름의 위치를 나타냅니다.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>텍스트 명령의 나머지 식별자와 카탈로그 이름을 구분하는 문자입니다.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>텍스트 명령의 나머지 식별자와 스키마 이름을 구분하는 문자입니다.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>접두 문자열이 sql 개체 이름에 연결되었습니다.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>접미 문자열이 sql 개체 이름에 연결되었습니다.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>자동으로 명령을 생성할 DataAdapter입니다.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>DataTable 또는 SelectCommand에서 스키마를 사용합니다.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>사용자가 지정하지 않은 경우 Update 명령에 대해 set 절이 자동 생성되는 방법입니다.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>OdbcCommands를 자동으로 생성하는 DataAdapter입니다.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>텍스트 명령에서 특수 문자가 포함된 식별자를 따옴표로 묶을 때, 여는 따옴표로 사용되는 문자입니다.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>텍스트 명령에서 특수 문자가 포함된 식별자를 따옴표로 묶을 때, 닫는 따옴표로 사용되는 문자입니다.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>OleDbCommands를 자동으로 생성하는 DataAdapter입니다.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>숫자 리터럴에서 사용되는 소수 구분 기호입니다.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>접두 문자열이 sql 개체 이름에 연결되었습니다.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>접미 문자열이 sql 개체 이름에 연결되었습니다.</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>SqlCommands를 자동으로 생성하는 DataAdapter입니다.</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>숫자 리터럴에서 사용되는 소수 구분 기호입니다.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>텍스트 명령에서 특수 문자가 포함된 식별자를 따옴표로 묶을 때, 여는 따옴표로 사용되는 문자입니다.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>텍스트 명령에서 특수 문자가 포함된 식별자를 따옴표로 묶을 때, 닫는 따옴표로 사용되는 문자입니다.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>Prepare, FillSchema 및 CommandBuilder 시나리오를 사용할 때는 decimal 및 numeric 매개 변수에 대해서만 설정해야 합니다.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>Prepare, FillSchema 및 CommandBuilder 시나리오를 사용할 때는 decimal 및 numeric 매개 변수에 대해서만 설정해야 합니다.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>기본 형식 매개 변수입니다.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>기본 형식 매개 변수입니다.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>매개 변수 이름입니다(예: '@p1').</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>기본 형식 매개 변수입니다.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>해당 형식의 서버 이름입니다.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>가변 길이 데이터 형식의 오프셋입니다.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>지정된 ParameterDirection '{0}'은(는) 매개 변수 '{1}'에 대해 지원되지 않습니다. Table-valued parameters는 ParameterDirection.Input만 지원합니다.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>매개 변수 '{0}'에 TypeName이 지정되었습니다.  TypeName은 Structured 매개 변수에만 설정해야 합니다.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>SqlDbType.Structured 형식은 다중 값 형식에만 지원됩니다.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>스키마 테이블의 '{0}' 필드의 DateType 열이 Null입니다. DataType은 null이 아니어야 합니다.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>'{0}' 레코드의 필드 수가 원본 레코드의 필드 수와 일치하지 않습니다.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>범위: 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>SqlClient 데이터 공급자에서 오류가 발생했습니다. {0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>{0},{1}에 대한 Type Info를 가져올 수 없습니다.</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>공급자가 다음 어셈블리를 로드하지 못했습니다: {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>UdtTypeName 속성은 UDT 매개 변수에 대해 설정해야 합니다.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>지정한 유형이 대상 서버에 등록되어 있지 않습니다.{0}.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>기본 키의 일부가 아닌 경우 UDT 매개 변수는 where 절에서 허용되지 않습니다.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>'{0}'은(는) 잘못된 사용자 정의 유형입니다. 이유: {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>인 메모리 및 사용자 정의 형식 모두를 지원합니다.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>네이티브 형식을 지원할 수 없습니다.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>IBinarySerialize를 구현하지 않습니다.</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>serialize할 수 없음</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>public 생성자 없음</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>INullable을 구현하지 않습니다.</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>public 생성자가 없습니다.</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>UDT 특성 없음</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>매핑 없는 serialization은 아직 지원되지 않습니다.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>'public static x Parse(System.Data.SqlTypes.SqlString)' 메서드가 없습니다.</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>'public override string ToString()' 메서드가 없습니다.</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>'public static x Null { get; }' 메서드가 없습니다.</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>네이티브 형식은 유형 '{0}'의 필드를 직접적으로나 다른 필드를 통해 지원하지 않습니다.</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>유형이 public이 아닙니다.</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Native UDT는 유형 '{0}'(으)로 인해 순차적 레이아웃이 아닙니다.</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Native UDT는 최대 byte 크기를 지정합니다.</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>필드 '{0}'이(가) serialize되지 않은 것으로 표시되어 있습니다.</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>필드 {0}의 유형이 네이티브 형식에서 허용되지 않는 명시적 레이아웃으로 표시되어 있습니다.</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>값이 여러 개인 어셈블리 참조에는 0이 아닌 어셈블리 ID가 있어야 합니다.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>Structured 다중 값 형식은 매개 변수에만 사용할 수 있으며 다른 형식 내에 중첩할 수 없습니다.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>경로 이름이 잘못되었습니다.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>트랜잭션을 확장하는 동안 오류가 발생했습니다.</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>쿼리 알림을 수신하는 데 사용되는 종속 개체입니다.</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>이 종속 관계가 잘못되었는지 여부를 나타내는 속성입니다.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>기존 종속 개체에 명령을 추가합니다.</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Command가 이미 다른 종속 개체에 연결되어 있습니다. 덮어쓸 수 없습니다.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>이 SqlCommand 개체는 이미 다른 SqlDependency 개체에 연결되어 있습니다.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>지정한 Timeout이 잘못되었습니다. Timeout은 0보다 작을 수 없습니다.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>알림 오류입니다. 유형={0}, 정보={1}, 원본={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData는 이 SqlDbType에 적합하지 않습니다.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>dbType {0}은(는) 이 생성자에 사용할 수 없습니다.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>내부 오류입니다. 일반 텍스트 값은 null일 수 없습니다.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>암호화할 수 없습니다. 암호화로 허용되는 제한인 {1}바이트를 초과하는 {0}바이트의 암호 텍스트가 생성되었습니다. 지정된 일반 텍스트 값은 너무 큰 것 같습니다(일반 텍스트 크기: {2}바이트).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>내부 오류입니다. 암호 텍스트 값은 null일 수 없습니다.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>SQL Server에서 증명 정보를 반환하지 않았습니다. enclave 형식은 '{0}'이고 enclave 증명 URL은 '{1}'입니다.</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>보안 채널을 설정할 수 없습니다. 오류 메시지: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>내부 오류가 발생했습니다. '{1}' 형식의 개체를 생성할 때 빈 null 인수 '{0}'이(가) 지정되었습니다. '{0}'은(는) null일 수 없습니다.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Always Encrypted를 사용하여 암호화된 데이터베이스 열의 계산에 대해 SQL Server 인스턴스에 구성된 elclave가 유효하고 안전한지를 확인하는 데 사용할 enclave 증명 서비스의 엔드포인트을 지정합니다.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>enclave 공급자의 구성 섹션을 읽지 못했습니다. 섹션이 애플리케이션 구성 파일에 올바르게 형식이 지정되어 있는지 확인하세요. 오류 메시지: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>이름 '{0}'에 대해 '{1}' 형식을 사용하여 enclave 공급자를 인스턴스화하지 못했습니다. 오류 메시지: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>내부 오류입니다. SqlColumnEncryptionEnclaveProviderName은 null이거나 비워둘 수 없습니다.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>'{0}' 결과 집합을 읽는 동안 오류가 발생했습니다. 연결 문자열에 증명 URL이 지정되지 않았지만 쿼리에 enclave 계산이 필요합니다. enclave 형식은 '{1}'입니다. </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>내부 오류가 발생했습니다. enclave 계산이 필요한 쿼리를 실행할 때 SQL Server에서 수신된 enclave 형식이 null이거나 비어 있습니다.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>쿼리를 실행하려면 enclave 계산이 필요하지만 애플리케이션 구성에 enclave 공급자 섹션이 없습니다.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>enclave 형식 '{0}' 및 증명 프로토콜 '{1}'에 대한 enclave 공급자를 찾을 수 없습니다. 연결 문자열에 올바른 증명 프로토콜을 지정하세요. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>연결에서 모든 명령에 대한 기본 열 암호화 설정입니다.</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>중요한 데이터를 서버에 보내기 전에 매개 변수를 강제로 암호화합니다.</value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>SQL Server 이름과 해당하는 신뢰할 수 있는 열 마스터 키 경로가 포함된 사전 개체입니다.</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>ApplicationIntent ReadOnly 연결 옵션을 사용하여 미러된 SQL Server 인스턴스에 연결할 수 없습니다.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>예기치 않은 라우팅 정보가 수신되었습니다.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>잘못된 라우팅 정보가 수신되었습니다.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>이 컨텍스트에 지원되지 않는 인증이 지정됨: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Active Directory Interactive 인증 시간이 초과되었습니다. 사용자가 인증 요청에 응답하는 데 시간이 너무 오래 걸렸습니다.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>Credential 속성이 설정된 경우 'Authentication=Active Directory Interactive'를 사용할 수 없습니다.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>활성 연결의 SPID(서버 프로세스 ID)입니다.</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Active Directory Device Code Flow 인증 시간이 초과되었습니다. 사용자가 인증 요청에 응답하는 데 시간이 너무 오래 걸렸습니다.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>'Authentication=Active Directory Device Code Flow'가 연결 문자열에 지정된 경우 Credential 속성을 설정할 수 없습니다.</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>요청한 동작에 대해 1차원 배열만 지원됩니다.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>해당 항목은 지정된 컬렉션에 없으므로 제거할 수 없습니다.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>음수가 아닌 수가 필요합니다.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>연결 문자열에 'Authentication=Active Directory Default'가 지정된 경우 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0}이(가) {1}을(를) 반환했습니다.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>프로토콜 오류: 수신된 메시지에 유효한 서명이 포함되어 있지만 유효한 보호 수준에서 요구하는 대로 암호화되지 않았습니다.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>{0}이(가) 오류 {1}(으)로 인해 실패했습니다.</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>이 메서드는 이 클래스에서 구현되지 않습니다.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>요청한 보안 패키지는 지원되지 않습니다.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>잘못된 physicalConnection 유형입니다.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>AppContext 스위치 '{0}'={1}을(를) 설정하는 동안 예외가 발생했습니다.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>{0} 유형은 이 플랫폼에서 지원되지 않습니다.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>전역화 고정 모드는 지원되지 않습니다.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Kerberos를 사용하여 인증할 수 없습니다. Kerberos가 'kinit'를 사용하여 클라이언트에서 초기화되었고 Kerberos 인증을 허용하도록 SQL Server에 대한 서비스 사용자 이름이 등록되었는지 확인하세요.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>'네트워크 라이브러리' 키워드는 이 플랫폼에서 지원되지 않습니다. 대신 원하는 프로토콜을 '데이터 원본' 앞에 붙입니다(TCP 연결의 경우 'tcp:' 또는 명명된 파이프 연결의 경우 'np:').</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>소켓이 오류 코드 '{1}'과(와) 예상되는 '{0}'을(를) throw하지 않았습니다.</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>서버가 이 플랫폼에서 지원되지 않는 기능을 사용하려고 합니다.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>'{0}' 키워드는 이 플랫폼에서 지원되지 않습니다.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>현재 로드된 System.Transactions.dll은 글로벌 트랜잭션을 지원하지 않습니다.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>서버에서 데이터를 읽는 동안 지원되지 않는 토큰 '{0}'을(를) 받았습니다.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>'{0}'은(는) 지원되는 핸들 유형이 아닙니다.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream은 이 플랫폼에서 지원되지 않습니다.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>LocalDB는 이 플랫폼에서 지원되지 않습니다.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>버퍼 공간이 부족합니다. 필수: {0} 실제: {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>상태가 {0}(사소한 상태: {1})이므로 GSSAPI 작업이 실패했습니다.</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>오류로 인해 GSSAPI 작업이 실패했습니다 - {0}({1}).</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>Windows 이외의 운영 체제에서는 채널 바인딩을 지원하지 않습니다.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>기본 자격 증명이 전달되는 경우 대상 이름은 비어 있지 않아야 합니다.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>현재 설치된 GSSAPI 구현에서는 요청한 보호 수준이 지원되지 않습니다.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>서버 구현은 지원되지 않습니다.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>이 플랫폼의 기본 자격 증명으로는 NTLM 인증을 사용할 수 없습니다.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>DataAdapter.Update에서 사용하는 경우 매개 변수 값은 DBNull.Value에서 (Int32)1로 변경되거나 null이 아닌 경우 (Int32)0으로 변경됩니다.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>버퍼 최대 크기 초과: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>SourceColumn '{2}'에 DataColumn '{0}'이(가) 없습니다.</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>SqlBatchCommand 목록이 초기화되지 않았습니다.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index f852b5ba98..eeb6d69665 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>Rosnąco</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Nieprawidłowy indeks {0} dla tego elementu {1}: Count={2}.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>Element {0} jest już zawarty w innym elemencie {1}.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>Element {0} jest już zawarty w tym elemencie {1}.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>Element {0} akceptuje tylko obiekty typu {1} o wartości innej niż null.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>Próbowano usunąć element {0}, który nie jest zawarty w tym elemencie {1}.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>Element {0}.{1} musi być unikatowy, element „{2}” już istnieje w kolekcji.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>Połączenie nie zostało zamknięte. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>Nieprawidłowa próba wywołania {0}, gdy czytnik jest zamknięty.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>Nie można zarejestrować transakcji, ponieważ połączenie jest połączeniem podstawowym dla transakcji delegowanej lub z podwyższonym poziomem.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>Malejąco</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>Oczekiwany jest niepusty ciąg dla parametru {0}.</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>Nie zainicjowano właściwości ConnectionString.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>Przechwycono wyjątek Exception niezgodny ze specyfikacją CLS.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>Dany element zabezpieczeń nie jest elementem uprawnień.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>Dane</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>Aktualizuj</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>Element ConnectionState wskazujący, czy połączenie jest otwarte, czy zamknięte.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>Zdarzenie wyzwalane po zmianie stanu połączenia.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>Ogólny typ parametru.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>Parametr wejściowy, wyjściowy lub dwukierunkowy.</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>właściwość czasu projektowania używana do generowania kodu o jednoznacznie określonych typach.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>Przesunięcie w typach danych o zmiennej długości.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>Nazwa parametru.</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>Rozmiar typów danych o zmiennej długości (ciąg i tablice).</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>Gdy nazwa kolumny źródłowej jest używana przez metodę DataAdapter.Update, służy do znajdowania nazwy DataSetColumn we właściwości ColumnMappings. Ma to na celu kopiowanie wartości między parametrem a wierszem danych.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>Gdy wersja wartości DataRow jest używana przez metodę DataAdapter.Update (tylko właściwość UpdateCommand), służy do aktualizowania źródła danych.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>Gdy jest używana przez element DataAdapter.Update, wartość parametru jest zmieniana z DBNull.Value na (Int32)1 lub (Int32)0, jeśli jest niezerowa.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>Wartość parametru.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>Nie można skompilować kolekcji {0}, ponieważ wykonanie zapytania SQL nie powiodło się. Zobacz wewnętrzny wyjątek, aby poznać szczegóły.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>Określono więcej ograniczeń, niż żądany schemat ({0}) może obsłużyć.</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>Wartość {2} nie jest prawidłową wartością ograniczenia {1} kolekcji schematów {0}.</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>Żądana kolekcja ({0}) nie została zdefiniowana.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>Żądana kolekcja ({0}) nie jest obsługiwana przez tę wersję dostawcy.</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>Brak jednej z wymaganych kolumn tabel DataSourceInformation.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>Tabela DataSourceInformation musi zawierać dokładnie jeden wiersz.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>Brak co najmniej jednej z wymaganych kolumn kolekcji ograniczeń.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>Istnieje ograniczenie, dla którego nie ma pasującego wiersza w kolekcji ograniczeń.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>Brak kolekcji {0} w elemencie XML metadanych.</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>Nieprawidłowy element XML metadanych.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>Nieprawidłowy element XML metadanych. Kolekcja {0} musi zawierać kolumnę {1} i musi być kolumną ciągu.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>Nieprawidłowy element XML metadanych. Kolumna {1} kolekcji {0} musi zawierać niepusty ciąg.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>Akcja</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>Zachowanie</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>Wypełnij</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>InfoMessage</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>Mapowanie</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>Powiadomienie</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>Schemat</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>Buforowanie</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>Nazwane parametry połączenia</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>Zabezpieczenia</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>Elastyczność połączenia</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>Kolekcja, która przechowuje niestandardowe informacje użytkownika.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>Wskazuje, czy porównywanie ciągów wewnątrz elementu DataSet odbywa się z uwzględnieniem wielkości liter.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>Nazwa tego elementu DataSet.</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>Wskazuje na niestandardowy „widok” danych zawartych w zestawie danych. Ten widok umożliwia filtrowanie, wyszukiwanie i nawigowanie po niestandardowym widoku danych.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>Wskazuje, czy należy stosować reguły ograniczeń.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>Wskazuje, że element DataSet zawiera błędy.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>Wskazuje ustawienia regionalne, przy użyciu których należy porównywać ciągi wewnątrz elementu DataSet.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>Wskazuje przestrzeń nazw identyfikatora XML URI dla elementu głównego wskazywanego przez ten element DataSet.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>Wskazuje prefiks przestrzeni nazw używany dla tego elementu DataSet.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>Kolekcja, która przechowuje relacje dla tego elementu DataSet.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>Kolekcja, która przechowuje tabele dla tego elementu DataSet.</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>Występuje, gdy nie można scalić schematów dla dwóch tabel z tą samą nazwą.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Występuje po zakończeniu inicjalizacji Initialization.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>Reprezentuje pamięć podręczną danych.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>Wskazuje, czy porównywanie ciągów wewnątrz tabeli odbywa się z uwzględnieniem wielkości liter.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>Zwraca relacje podrzędne dla tej tabeli.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>Kolekcja, która przechowuje kolumny dla tej tabeli.</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>Kolekcja, która przechowuje ograniczenia dla tej tabeli.</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>Wskazuje element DataSet, do którego należy ta tabela.</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>To jest domyślny element DataView dla tabeli.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>Wyrażenie używane do obliczenia wartości związanej z danymi w tym wierszu.</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>Zwraca informację, czy tablica zawiera błędy.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>Wskazuje ustawienia regionalne, przy użyciu których należy porównywać ciągi wewnątrz tabeli.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>Wskazuje początkowy rozmiar tej tabeli.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>Wskazuje przestrzeń nazw identyfikatora XML URI dla elementów zawartych w tej tabeli.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>Wskazuje element Prefix przestrzeni nazw używany dla tej tabeli w reprezentacji XML.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>Zwraca relacje nadrzędne dla tej tabeli.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>Wskazuje kolumny reprezentujące klucz podstawowy dla tej tabeli.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>Wskazuje kolekcję, która przechowuje wiersze danych dla tej tabeli.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>Wskazuje nazwę używaną do odszukania tej tabeli w kolekcji Tables elementu DataSet.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>Występuje po pomyślnej edycji wiersza w tabeli.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>Występuje, gdy wiersz jest zmieniany, aby program obsługi zdarzeń mógł zmodyfikować lub anulować zmianę. Użytkownik może modyfikować wartości w wierszu i powinien zgłosić wyjątek, aby anulować edytowanie.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>Występuje po pomyślnym usunięciu wiersza z tabeli.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>Występuje, gdy wiersz w tabeli jest oznaczony do usunięcia.  Zgłoś wyjątek, aby anulować usunięcie.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>Występuje, gdy wartość dla tej kolumny zostanie przesłana.  Użytkownik może zmodyfikować proponowaną wartość i zgłosić wyjątek, aby anulować edytowanie.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>Występuje, gdy wartość dla tej kolumny zostanie zmieniona.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>Występuje przed wyczyszczeniem wszystkich wierszy z tabeli.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>Występuje po pomyślnym wyczyszczeniu wszystkich wierszy z tabeli.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>Występuje po utworzeniu nowego wystąpienia elementu DataRow.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>Nazwa używana do odszukania tej relacji w kolekcji Relations elementu DataSet.</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>Wskazuje kolumny podrzędne tej relacji.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>Wskazuje kolumny nadrzędne tej relacji.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>Wskazuje, czy relacje są zagnieżdżone.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>Wskazuje, jaki rodzaj operacji kaskadowej ma zostać wykonany dla tej relacji przy usuwaniu.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>Wskazuje, jaki rodzaj operacji kaskadowej ma zostać wykonany dla tej relacji przy aktualizacji.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>Wskazuje, jaki rodzaj operacji kaskadowej ma zostać wykonany dla tej relacji przy akceptowaniu i odrzucaniu zmian.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>Wskazuje kolumny podrzędne tego ograniczenia.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>Wskazuje kolumny nadrzędne tego ograniczenia.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>Wskazuje tabelę podrzędną tego ograniczenia.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>Wskazuje kolumny tego ograniczenia.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>Wskazuje, czy to ograniczenie jest kluczem podstawowym.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>Wskazuje nazwę tego ograniczenia.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>Wskazuje tabelę tego ograniczenia.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>Wskazuje, czy w tej kolumnie są dozwolone wartości null.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>Wskazuje, czy kolumna automatycznie się zwiększa dla nowych wierszy dodawanych do tabeli.  Kolumna musi być typu Int16, Int32 lub Int64.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>Wskazuje początkową wartość dla kolumny typu AutoIncrement.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>Wskazuje przyrost używany w kolumnie typu AutoIncrement.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>Wskazuje domyślny podpis interfejsu użytkownika dla tej kolumny.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>Wskazuje nazwę używaną do odszukania tej kolumny w kolekcji Columns elementu DataTable.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>Zwraca element DataTable, do którego należy ta kolumna.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>Wskazuje typ danych przechowywanych w tej kolumnie.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>Wskazuje domyślną wartość kolumny używaną przy dodawaniu nowych wierszy do tabeli.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>Wskazuje wartość, która jest obliczana dla każdego wiersza w tej kolumnie na podstawie wartości znajdujących się w innych kolumnach, zamiast przyjmowania danych od użytkownika.</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>Wskazuje, w jaki sposób ta kolumna jest utrwalona w kodzie XML: jako atrybut, element, prosty węzeł zawartości czy wcale.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>Wskazuje identyfikator XML URI dla elementów lub atrybutów przechowywanych w tej kolumnie.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>Wskazuje element Prefix używany dla tego elementu DataColumn w reprezentacji xml.</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Wskazuje indeks tej kolumny w kolekcji Columns.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>Wskazuje, czy ta kolumna zezwala na zmiany po tym, jak wiersz zostanie dodany do tabeli.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>Wskazuje, czy ta kolumna powinna nałożyć ograniczenie na swoje wartości w wierszach tabeli tak, aby były one unikatowe.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>Wskazuje maksymalną długość wartości dozwoloną w tej kolumnie.</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>Wskazuje element DateTimeMode tego elementu DataColumn.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>Wskazuje, czy ten element DataView oraz skojarzony z nim interfejs użytkownika zezwalają na usuwanie.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>Wskazuje, czy ten element DataView oraz skojarzony z nim interfejs użytkownika zezwalają na edycję.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>Wskazuje, czy ten element DataView oraz skojarzony z nim interfejs użytkownika zezwalają na dodawanie nowych wierszy.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>Zwraca liczbę elementów aktualnie znajdujących się w tym widoku.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>Zwraca wskaźnik powrotny do elementu DataViewManager, który jest właścicielem tego elementu DataSet (jeśli taki istnieje).</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>Wskazuje, czy widok jest otwarty.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>Wskazuje wyrażenie używane do filtrowania danych zwróconych przez ten element DataView.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>Wskazuje wersje danych zwróconych przez ten element DataView.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>Wskazuje nazwy kolumn i kolejność, w której dane są zwracane przez ten element DataView.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Wskazuje, czy używać sortowania domyślnego, jeśli właściwość Sort nie została ustawiona.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>Wskazuje tabelę, która jest używana przez ten element DataView do pobierania danych.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>Wskazuje, że dane zwrócone przez ten element DataView zostały zmienione w dowolny sposób.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>Wskazuje źródło danych dla tego elementu DataViewManager.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>Wskazuje ustawienia sortowania/filtrowania/stanu dla dowolnej tabeli w odpowiadającym elemencie DataSet.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>Element DataSet nie obsługuje elementu „union” lub „list” jako elementu simpleType.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>Nieprawidłowa składnia {0}: brak wymaganego atrybutu „{1}”.</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>Wartość „{1}” jest nieprawidłowa dla atrybutu „{0}”.</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>Atrybut „{0}” powinien mieć wartość „{1}” lub „{2}”.</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>Nie można odnaleźć elementu ElementType name=„{0}”.</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>Brak nazwy tabeli nadrzędnej w relacji „{0}”.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>Brak nazwy tabeli podrzędnej w relacji „{0}”.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>Brak klucza tabeli nadrzędnej w relacji „{0}”.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>Brak klucza tabeli podrzędnej w relacji „{0}”.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>Niezdefiniowany typ danych: „{0}”.</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>Typ danych nie jest zdefiniowany.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>Nieprawidłowy wybór elementu XPath wewnątrz węzła pola. Nie można odnaleźć: {0}.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>Nieprawidłowy składnik elementu XPath wewnątrz węzła selektora: {0}.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>Nieprawidłowy węzeł 'Key' wewnątrz ograniczenia o nazwie: {0}.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>Nazwa ograniczenia {0} jest już używana w schemacie.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>Nie można przekonwertować elementu „{0}” na typ „{1}”.</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>Brak elementu „{0}” w ograniczeniu „{1}” o nazwie „{2}”.</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>Nieprawidłowa definicja relacji (Relation): różne długości klucza.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>Element DataSet nie zezwala na odwołania cykliczne w elemencie ComplexType o nazwie „{0}”.</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>Obiekt DataSet nie może utworzyć wystąpienia abstrakcyjnego obiektu ComplexType dla węzła {0}.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Wystąpił błąd z konwerterem wielu elementów docelowych podczas zapisywania schematu XML.  Zobacz wewnętrzny wyjątek, aby poznać szczegóły.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Wystąpił błąd z konwerterem wielu elementów docelowych podczas zapisywania schematu XML.  Zwrócono ciąg o wartości null lub pusty.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>Zduplikowana deklaracja „{0}”.</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>Nie można załadować elementu diffGram. Brak tabeli „{0}” w docelowym zestawie danych.</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>Nie można załadować elementu diffGram. Brak węzła „sql”.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>Nazwa kolumny „{0}” jest zdefiniowana dla różnych typów mapowania.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>Prefiks „{0}” jest nieprawidłowy, ponieważ zawiera znaki specjalne.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>Cykliczne odwołanie w tabeli „{0}”, która jest zagnieżdżona w samej sobie.</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>Element DataSet nie może rozszerzać jednostek. Użyj elementu XmlValidatingReader i odpowiednio ustaw właściwość EntityHandling.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>Typ „{0}” nie implementuje interfejsu IXmlSerializable, dlatego nie można kontynuować serializacji.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>Nie można kontynuować deserializacji. Dane nie implementują interfejsu IXMLSerializable, dlatego polimorfizm nie jest obsługiwany.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>Element DataTable nie obsługuje wnioskowania schematu na podstawie danych Xml.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>Nie można kontynuować serializowania DataTable „{0}”. Zawiera element DataRow, który ma wiele wierszy nadrzędnych w tym samym kluczu obcym.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>Brak atrybutu IsDataSet w schemacie wejściowym (Schema).</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>Nie można określić elementu DataSet. Atrybut IsDataSet istnieje więcej niż raz.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>Obiekt DataSet nie będzie serializował typów, które implementują interfejs IDynamicMetaObjectProvider, ale nie implementują interfejsu IXmlSerializable.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>Funkcja nie jest zaimplementowana. {0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>Błąd składni: brak operandu po operatorze {0}.</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>Niezgodność typów w wyrażeniu {0}.</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>Wyrażenie jest zbyt złożone.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>Nie można odnaleźć kolumny [{0}].</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>Wyrażenie zawiera nieprawidłową stałą typu string: {0}.</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>Wyrażenie zawiera niezdefiniowane wywołanie funkcji {0}().</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>Błąd składni w wyrażeniu.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>Niewłaściwa liczba argumentów: funkcja {0}().</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>W wyrażeniu brak nawiasu zamykającego.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>Nie można zinterpretować tokenu {0}' w pozycji {1}.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>Oczekiwano {0}, ale rzeczywistym tokenem w pozycji {2} jest {1}.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>Nie można przekonwertować elementu {0} na {1}.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>Nie można przekonwertować wartości „{0}” na typ {1}.</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>Nieprawidłowa nazwa kolumny: [{0}].</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>Wyrażenie zawiera nieprawidłową stałą daty {0}.</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>Na liście wyrażeń dla operatora IN mogą występować tylko wyrażenia stałe.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Błąd w operatorze Like: wzorzec ciągu {0} jest nieprawidłowy.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>Błąd składni: elementy występujące po słowie kluczowym IN muszą być oddzielone przecinkami i ujęte w zwykłe nawiasy.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>Niezgodność typów w argumencie funkcji: {0}(), argument {1}, oczekiwano {2}.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>Niezgodność typów w argumencie funkcji: {0}(), argument {1}, oczekiwano jednego z typów całkowitych.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>Nie można wykonać operacji {0} na {1} i {2}.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>Operator {0} jest niejednoznaczny dla operandów typu {1} i {2}. Nie można mieszać typów podpisanych i niepodpisanych. Użyj jawnej funkcji Convert().</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>Błąd składni: po słowie kluczowym IN musi nastąpić ujęta w nawiasy niepusta lista wyrażeń oddzielonych przecinkami.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>Wyrażenie zawiera nieobsługiwany operator {0}.</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>Wyrażenie zawiera nieprawidłową nazwę: {0}.</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>Błąd składni: brak operandu przed operatorem {0}.</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>Wyrażenie ma za dużo nawiasów zamykających.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>Tabela [{0}] jest związana z więcej niż jedną relacją. Musisz wyraźnie wskazać nazwę relacji w wyrażeniu {1}.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>Błąd składni w argumencie funkcji agregującej: oczekiwano argumentu oznaczającego pojedynczą kolumnę z ewentualnym kwalifikatorem „Child”.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>Niepowiązane odwołanie w wyrażeniu agregującym {0}.</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>Nie można obliczyć wartości wyrażenia niestałego bez bieżącego wiersza.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>Niepowiązane odwołania w wyrażeniu {0}.</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>Nie można obliczyć. Wyrażenie {0} nie jest wartością agregującą.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>Wyrażenie filtru „{0}” nie zwraca terminu wartości logicznej Boolean.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>Nieprawidłowa nazwa typu {0}.</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>Błąd składni w wyrażeniu wyszukiwania: oczekiwano słowa kluczowego „Parent”, a następnie argumentu w postaci pojedynczej kolumny z ewentualnym kwalifikatorem relacji: Parent[(&lt;nazwa_relacji&gt;)].&lt;nazwa_kolumny&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>Do wywołania elementu DataFilter niezbędny jest wiersz lub tabela.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>Argument {0}() jest poza zakresem.</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>Wartości przesunięcia i długości są spoza zakresu tablicy lub liczba przekracza liczbę elementów znajdujących się między indeksem a końcem kolekcji źródłowej.</value>
   </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>Błąd składni: nieprawidłowe użycie operatora „Is”. Poprawna składnia: &lt;wyrażenia&gt; [Nie] ma wartość null.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>Nie można przekonwertować obiektu typu „{0}” na obiekt typu „{1}”.</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>Wartość jest za mała albo za duża dla typu {0}.</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>Jedyną dopuszczalną wartością właściwości {0} jest {1}.</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>Wystąpił błąd dzielenia przez zero.</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>Dopuszczalne wartości właściwości {0} to {1} lub {2}.</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>Nie można odnaleźć relacji nadrzędnej {0}.</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>Określone wartości QuotePrefix i QuoteSuffix nie są zgodne.</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>Argument hours znajduje się poza zakresem. Wartość musi należeć do zakresu od 14 do 14.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>Długość argumentu {0} przekracza limit wynoszący {1}.</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>Argument minutes znajduje się poza zakresem. Wartość musi należeć do zakresu od 59 do 59.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>Nieprawidłowa wartość klucza „{0}”.</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>Dany zakres pierwszego czasu przekracza 14 godzin.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>Użycie klucza {0} wymaga obecności klucza {1}.</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>Właściwość Kind danego argumentu DateTime jest niezgodna z argumentami „hours” i „minutes”.</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>Długość wartości dla klucza {0} przekracza limit wynoszący {1}.</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>Element DataColumn typu {0} nie obsługuje wyrażeń.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>Słowo kluczowe jest nieobsługiwane: „{0}”.</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>Nie można włączyć ograniczeń. Co najmniej jeden wiersz zawiera wartości naruszające ograniczenia inne niż null, unikatowe lub obce.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>Błąd wewnętrzny dostawcy danych programu .NET Framework: {0}.</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>Nie można modyfikować kolekcji jako takiej.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} „{1}”.</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>Podana nazwa {0} pasuje do co najmniej dwóch nazw w obiekcie kolekcji, jeśli wielkość liter nie jest uwzględniana; jeśli wielkość liter jest uwzględniana, nazwa nie pasuje do żadnej z nich.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} „{1}” – nieprawidłowe użycie cudzysłowu.</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>Podana nazwa {0} pasuje do co najmniej dwóch nazw w obiekcie kolekcji z różnymi przestrzeniami nazw.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} „{1}” – bieżący limit, „{2}” jest niewystarczający.</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>Wartości przesunięcia i długości są spoza zakresu tablicy lub liczba przekracza liczbę elementów znajdujących się między indeksem a końcem kolekcji źródłowej.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>Operacja SqlBulkCopy.WriteToServer nie powiodła się, ponieważ element SqlBulkCopy.DestinationTableName jest nieprawidłową nazwą wieloczęściową</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>Argument {0} jest poza zakresem.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>Przetwarzanie wyników z programu SQL Server nie powiodło się z powodu nieprawidłowej nazwy wieloczęściowej</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>Argument {0} nie może mieć wartości null.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName jest nieprawidłową nazwą wieloczęściową</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>Argument {0} zawiera wartość zerową.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName jest nieprawidłową nazwą wieloczęściową</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>Nie można odnaleźć kolumny {0}.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>Operacja SqlCommand.DeriveParameters nie powiodła się, ponieważ właściwość SqlCommand.CommandText jest nieprawidłową nazwą wieloczęściową</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>Kolumna {0} już należy do tego elementu DataTable.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>Nawiązywanie połączenia z dublowanym wystąpieniem programu SQL Server z użyciem opcji połączenia MultiSubnetFailover jest nieobsługiwane.</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>Kolumna {0} już należy do innego elementu DataTable.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>Wartość wyliczenia elementu {0}, wynosząca {1}, nie jest obsługiwana przez metodę {2}.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>W elemencie DataTable nie może być więcej niż jedna kolumna typu SimpleContent.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>Wartość wyliczenia elementu{0} , wynosząca {1}, nie jest obsługiwana przez dostawcę danych SqlClient programu .NET Framework.</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>Nie można dodać kolumny typu SimpleContent do tabeli zawierającej kolumny typu Element lub relacje zagnieżdżone.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: właściwość CommandText nie została zainicjowana</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>Kolumna o nazwie {0} należy już do tego elementu DataTable.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: właściwość połączenia nie została zainicjowana.</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>Nie można dodać kolumny o nazwie {0}: tabela zagnieżdżona o takiej samej nazwie należy już do tego elementu DataTable.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>Element {0} wymaga otwartego i dostępnego połączenia (Connection). {1}</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>Kolumna o nazwie {0} należy już do tego elementu DataTable: nazwa ta nie może zostać użyta jako nazwa tabeli zagnieżdżonej.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>Przechowywana procedura {0} nie istnieje.</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>Nie można usunąć kolumny, która nie należy do tej tabeli.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>Transakcja nie jest skojarzona z bieżącym połączeniem lub została ukończona.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>Nie można usunąć tej kolumny, ponieważ jest ona częścią klucza podstawowego.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>Transakcja skojarzona z bieżącym połączeniem została ukończona, ale nie została usunięta.  Transakcja musi zostać usunięta, aby można było użyć połączenia do wykonywania instrukcji SQL.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>Nie można usunąć tej kolumny, ponieważ jest ona częścią klucza nadrzędnego dla relacji {0}.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>Element {0} wymaga, aby polecenie miało transakcję, gdy połączenie przypisane do polecenia jest w fazie oczekującej transakcji lokalnej.  Właściwość Transaction polecenia nie została zainicjowana.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>Nie można usunąć tej kolumny, ponieważ jest ona częścią ograniczenia {0} na tabeli {1}.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>Istnieje już skojarzony z tym poleceniem {0} otwarty element DataReader, który należy najpierw zamknąć.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>Nie można usunąć tej kolumny, ponieważ jest ona częścią wyrażenia: {0} = {1}.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>Element {0} DeriveParameters obsługuje tylko element CommandType.StoredProcedure, a nie element CommandType.{1}.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>Nie można ustawić właściwości AutoIncrement dla kolumny obliczanej.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>Nie można ustawić właściwości AutoIncrement dla kolumny z ustawionym elementem DefaultValue.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>Nie można ustawić elementu DefaultValue dla kolumny typu AutoIncrement.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>Wartość elementu AutoIncrementStep musi być niezerowa.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>Element ColumnName jest wymagany, jeśli jest on częścią elementu DataTable.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>Nie można zmienić elementu DataType kolumny, gdy kolumna zawiera już dane.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>Kolumna wymaga prawidłowego elementu DataType.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>Wartość DefaultValue dla kolumny {0} jest typu {1} i nie może być konwertowana na {2}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>Wartość DefaultValue dla kolumny jest typu {0} i nie może być konwertowana na {1}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>Wartość DefaultValue dla kolumny {0} jest typu {1}, ale kolumna jest typu {2}.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>Nie można zmienić właściwości ReadOnly dla kolumny wyrażenia.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>Nie można zmienić właściwości Unique dla kolumny wyrażenia.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>Nie można utworzyć wyrażenia w kolumnie, która ma typ AutoIncrement lub Unique.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>Nie można ustawić wyrażenia, ponieważ kolumna nie może być elementem ReadOnly.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>Nie można ustawić właściwości Expression dla kolumny {0}, ponieważ jest ona częścią ograniczeń.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>Nie można utworzyć ograniczenia opartego na kolumnie Expression {0}.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>Nie można ustawić właściwości Expression z powodu cyklicznego odwołania w wyrażeniu.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>Element Column {0} zawiera wartości null.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>Kolumna {0} nie zezwala na wartości nulls.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>Kolumna {0} jest tylko do odczytu.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>Kolumna {0} zawiera nieunikatowe wartości.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>Kolumna {0} nie należy do tabeli {1}.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>Kolumna musi należeć do tabeli.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>Nie można zapisać wartości &lt;{0}&gt; w kolumnie {1}.  Oczekiwany typ to {2}.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>Nie można ustawić wartości null dla właściwości Column {0}. Zamiast tego użyj biblioteki DBNull.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>Nie można ustawić kolumny {0}. Wartość narusza limit MaxLength tej kolumny.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>Parametr MaxLength ma zastosowanie tylko do ciągowego typu danych. Właściwość Column {0} parametru MaxLength nie może być liczbą nieujemną.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>Nie można ustawić właściwości Column {0} parametru MaxLength na {1}. Tabela zawiera co najmniej jeden ciąg dłuższy niż nowy limit.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Nie można ustawić właściwości Column {0} parametru MaxLength. Kolumna to SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>Nie można ustawić właściwości Column {0} parametru DataType na {1}. Kolumna to SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>Nie można ustawić właściwości Column {0} parametru MappingType na SimpleContent. Typ danych kolumny to {1}.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>Element Column {0} przekracza limit MaxLength.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>Kolumna „{0}” nie zezwala na wartości typu DBNull.Value.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>Nie można zmienić przestrzeni nazw właściwości Column {0}. Kolumna to SimpleContent.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>Nie można zmienić właściwości AutoIncrement elementu DataColumn z typem {0}, gdy kolumna zawiera już dane.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>Kolumna {0} nie należy do tabeli podstawowej {1}.</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>Element DataColumn o typie {0} jest typem complexType. Nie można serializować wartości typu złożonego jako atrybutu</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>Właściwość DateTimeMode można ustawić tylko w elementach DataColumns typu DateTime.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>{0} jest nieprawidłową wartością elementu DataSetDateTime.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>Nie można zmienić wartości właściwości DateTimeMode z {0} na {1}, gdy tabela zawiera już dane.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Type {0} nie zawiera statycznej właściwości Null lub statycznego pola static Null.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>Typ {0} nie implementuje interfejsu IRevertibleChangeTracking, dlatego nie można kontynuować wykonywania funkcji RejectChanges().</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>Elementy SetAdded i SetModified mogą być wywoływane tylko dla elementów DataRows z niezmienioną właściwością DataRowState.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>Liczba porządkowa „{0}” przekracza maksymalną liczbę.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>Element DataSet nie obsługuje elementu System.Nullable&lt;&gt;.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>Nie można zmienić nazwy ograniczenia na pusty ciąg, kiedy ograniczenie znajduje się w elemencie ConstraintCollection.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>Nie można wymusić ograniczeń na ograniczeniu {0}.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>Kolumna {0} jest musi być unikatowa.  Klucz {1} już istnieje.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>Ograniczenie {0} nie należy do tego elementu DataTable.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>Nie można odnaleźć ograniczenia {0}.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>Ograniczenie pasuje do znajdującego się już w kolekcji ograniczenia o nazwie {0}.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>Ograniczenie Constraint o nazwie {0} już należy do tego elementu DataTable.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>Te kolumny nie mają obecnie unikatowych wartości.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>Te kolumny nie wskazują na tę tabelę.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>To ograniczenie nie może być włączone, ponieważ nie wszystkim wartościom odpowiadają wartości nadrzędne.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>To ograniczenie nie może być dodane, ponieważ element ForeignKey nie należy do tabeli {0}.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>Nie można usunąć ograniczenia, które nie należy to tej tabeli.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>Nie można usunąć unikatowego ograniczenia '{0}'. Usuń najpierw ograniczenie klucza obcego '{1}'.</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>Nie można usunąć tego wiersza, ponieważ na relacji {0} wymuszone są ograniczenia i usunięcie tego wiersza spowoduje porzucenie wierszy podrzędnych.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>Nie można wprowadzić tej zmiany, ponieważ na relacji {0} wymuszone są ograniczenia i zmiana tej wartości spowoduje porzucenie wierszy podrzędnych.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>Nie można wyczyścić tabeli {0}, ponieważ element ForeignKeyConstraint {1} wymusza ograniczenia oraz w elemencie {2} istnieją wiersze podrzędne.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>Element ForeignKeyConstraint {0} wymaga, aby wartości klucza podrzędnego ({1}) istniały w tabeli nadrzędnej.</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>Właściwość nie dostępna, ponieważ {0}.</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>Nie można usunąć tego wiersza, ponieważ ma on wiersze podrzędne a na relacji {0} wymuszone są ograniczenia.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>Nie można dodać ograniczenia klucza podstawowego, ponieważ klucz podstawowy został już ustawiony dla tabeli.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>Nie można dodać ograniczenia do elementu DataTable {0}, który jest tabelą podrzędną w dwóch relacjach zagnieżdżonych.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>Nie można utworzyć klucza z kolumn, które należą do różnych tabel.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>Nie może być 0 kolumn.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>Nie może być więcej niż {0} kolumn.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>Nie można utworzyć klucza, gdy ta sama kolumna jest wymieniona więcej niż raz: {0}</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>Nie można usunąć ograniczenia unikatowości, ponieważ jest to klucz podstawowy tabeli.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>Nie można usunąć ograniczenia unikatowości, ponieważ jest to klucz podstawowy tabeli {0}.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>Kolumny nadrzędne i podrzędne mają niezgodne typy.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>Elementy ParentKey i ChildKey są identyczne.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>Elementy ParentColumns i ChildColumns powinny mieć taką samą długość.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>Elementy ParentColumns i ChildColumns muszą mieć niezerową długość.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>Wiersz nie należy do tego samego elementu DataSet co ta relacja.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>Element RelationName jest wymagany, jeśli jest częścią elementu DataSet.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>Element GetChildRows wymaga wiersza, którego właściwością Table jest {0}, a właściwością Table zaznaczonego wiersza jest {1}.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>Ta relacja powinna łączyć dwie tabele w tym elemencie DataSet, aby można ją było dodać do tego elementu.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>Element GetParentRow wymaga wiersza, którego tabelą jest {0}, a tabelą zaznaczonego wiersza jest {1}.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>Element SetParentRow wymaga wiersza podrzędnego, którego tabelą jest {0}, a tabelą określonego wiersza jest {1}.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>Nie można tworzyć relacji między tabelami w różnych elementach DataSet.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>Nie można utworzyć relacji między tabelami w różnych elementach DataSet.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>Dla tych kolumn podrzędnych już istnieje relacja.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>Ta relacja nie należy do tej kolekcji relacji.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Ta relacja należy już do innego elementu DataSet.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Ta relacja należy już do tego elementu DataSet.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>Relacja Relation o nazwie {0} już należy do tego elementu DataSet.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>Relacja Relation {0} nie należy do tego elementu DataSet.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>Nie można odnaleźć relacji {0}.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>Nie można utworzyć kolekcji dla tabeli null.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>Tabela, dla której relacje wyświetla ta kolekcja, została usunięta ze swojego elementu DataSet.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>Nie można dodać relacji do kolekcji tej tabeli ParentRelation, jeśli ta tabela nie jest tabelą podrzędną.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>Do kolekcji ChildRelation tej tabeli nie można dodać relacji, w której ta tabela nie jest tabelą nadrzędną.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>Nie można ustawić właściwości Nested na false dla tej relacji.</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>Ta sama tabela {0} nie może być tabelą podrzędną w dwóch relacjach zagnieżdżonych.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>Tabela ({0}) nie może być tabelą podrzędną dla samej siebie w relacjach zagnieżdżonych.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>Nie można dodać elementu DataRelation lub elementu Constraint, które maja różne ustawienia Locale lub CaseSensitive w tabeli nadrzędnej i jej tabelach podrzędnych.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>Nie można utworzyć elementu DataRelation, jeśli kolumn nadrzędnych lub podrzędnych nie ma w elemencie DataSet.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>Tabela zagnieżdżona {0}, która dziedziczy przestrzeń nazw, nie może mieć wielu tabel nadrzędnych w różnych przestrzeniach nazw.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>Tabela zagnieżdżona {0} z pustą przestrzenią nazw nie może mieć wielu tabel nadrzędnych w różnych przestrzeniach nazw.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>Wiersz nie należy do tego samego elementu DataSet co ta relacja.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>Nie można wykonać tej operacji na wierszu nieznajdującym się w tabeli.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>Ta relacja i wiersz podrzędny nie należą do tego samego elementu DataSet.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>Nie można zmienić proponowanej wartości w zdarzeniu RowChanging.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>Nie można wywołać elementu EndEdit() wewnątrz zdarzenia OnRowChanging.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>Nie można wywołać elementu BeginEdit() wewnątrz zdarzenia RowChanging.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>Nie można wywołać elementu CancelEdit() wewnątrz zdarzenia OnRowChanging.  Zgłoś wyjątek, aby anulować tę aktualizację.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>Nie można wywołać elementu Delete wewnątrz zdarzenia OnRowDeleting.  Zgłoś wyjątek, aby anulować to usunięcie.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>Tablica wejściowa jest dłuższa niż liczba kolumn w tej tabeli.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>Brak dostępnych danych o stanie Current.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>Brak dostępnych danych o stanie Original.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>Brak dostępnych danych o stanie Proposed.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>Ten wiersz został usunięty z tabeli i nie zawiera żadnych danych.  Funkcja BeginEdit() umożliwi tworzenie nowych danych w tym wierszu.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>Nie można uzyskać dostępu do informacji o usuniętym wierszu za pośrednictwem tego wiersza.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>Element Version musi być ustawiony na wartość Original, Current lub Proposed.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>Brak wiersza w pozycji {0}.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>Pozycja wstawiania wiersza {0} jest nieprawidłowa.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>Dwukrotnie znaleziono wartość rowOrder={0} w tabeli o nazwie {1}.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>Brak wartości w sekwencji rowOrder dla tabeli {0}.</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>Brak podanego wiersza DataRow w bieżącej kolekcji DataRowCollection.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>Ten wiersz należy już do innej tabeli.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>Ten wiersz należy już do tej tabeli.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>Nie można usunąć tego wiersza, ponieważ został już usunięty.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>Ten wiersz jest pusty.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>Nie można usunąć wiersza, który został już usunięty.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>Wiersz podrzędny ma wiele elementów nadrzędnych.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>Nierozpoznany wzorzec bitów stanu wiersza.</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>Nie można zmienić nazwy elementu DataSet na pusty ciąg.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>Nazwa „{0}” jest nieprawidłowa. Element DataSet nie może mieć tej samej nazwy co element DataTable.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>Przestrzeń nazw schematu jest nieprawidłowa. Zamiast tego użyj: {0}.</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>Nie można zmienić właściwości CaseSensitive ani Locale. Ta zmiana doprowadziłaby do tego, że co najmniej jeden element DataRelation lub Constraint miałby różne ustawienia Locale lub CaseSensitive w tabelach pokrewnych.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>Właściwość SchemaSerializationMode można ustawić tylko wtedy, jeśli jest ona zastępowana przez element pochodny DataSet.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>Kolumny PrimaryKey nie należą do tej tabeli.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>Nie można dodać zagnieżdżonej relacji lub kolumny typu Element do tabeli zawierającej kolumnę typu SimpleContent.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>Element TableName jest wymagany, jeśli jest on częścią elementu DataSet.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>Element DataTable już ma kolumnę SimpleContent.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>Tabela nie ma klucza podstawowego.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} nie jest prawidłowym wpisem ciągu Sort.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>Nie można serializować elementu DataTable. Element DataTable używany w jednym lub większej liczbie wyrażeń DataColumn nie jest elementem potomnym bieżącego elementu DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>Ten element DataTable może być zdalny tylko jako część elementu DataSet. Co najmniej jedna kolumna wyrażenia ma odwołanie do innych obiektów DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>Wartość właściwości formatu usług zdalnych musi być taka sama dla elementu DataSet i elementu DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>Nie można serializować elementu DataTable. Nie ustawiono nazwy elementu DataTable.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>Element DataTable o nazwie {0} już należy do tego elementu DataSet.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>Element DataTable o nazwie {0} z tą samą przestrzenią nazw Namespace ({1}) już należy do tego elementu DataSet.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>Tabela ({0}) nie może być tabelą podrzędną dla samej siebie w relacji zagnieżdżonej: istnieje konflikt między nazwą elementu DataSet i nazwą tabeli.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>Nazwa „{0}” jest nieprawidłowa. Element DataTable nie może mieć tej samej nazwy co element DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Element DataTable już należy do innego elementu DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Element DataTable już należy do tego elementu DataSet.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>Tabela {0} nie należy do tego elementu DataSet.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>Nie można odnaleźć tabeli {0}.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>Nie można usunąć tabeli, która ma istniejące relacje.  Najpierw usuń relacje.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>Nie można usunąć tabeli {0}, ponieważ odwołuje się ona do elementu ForeignKeyConstraint {1}.  Najpierw usuń ograniczenie.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>Element DataTable {0} nie odpowiada żadnemu elementowi DataTable istniejącemu w źródle.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>W docelowym elemencie DataSet brak definicji dla {0}.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>W docelowym elemencie DataSet brak {0} {1}.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} i &lt;source&gt;.{0} mają sprzeczne właściwości: niezgodność właściwości DataType.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>Elementy &lt;target&gt;.PrimaryKey i &lt;source&gt;.PrimaryKey mają różną długość Length.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>Niezgodność kolumn w elemencie PrimaryKey: &lt;target&gt;.{0} zamiast &lt;source&gt;.{1}.</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>Relacja {0} nie może być scalona, ponieważ klucze mają niezgodne kolumny.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>W tabeli docelowej {0} brak definicji dla kolumny {1}.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>Kolumna {0} elementu PrimaryKey nie istnieje w tabeli źródłowej.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>Parametr RowStates musi być ustawiony na prawidłową kombinację wartości z wyliczenia DataViewRowState.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Funkcja Find znajduje wiersz w oparciu o porządek sortowania, a nie określono żadnego porządku sortowania.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>Oczekiwano {0} wartości dla indeksowanego klucza, ale otrzymano {1} wartości.</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>Niewłaściwe użycie funkcji agregującej {0}() i typu: {1}.</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>Niewłaściwy typ magazynu: {0}.</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>Utrwalenie Xml elementu DataSet nie obsługuje wartości {0} jako wartości Char, w zamian użyj magazynu Byte.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>Typ wartości niezgodny z typem kolumny</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>Typ {0} nie implementuje interfejsu IComparable. Nie można wykonać porównania.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>Nie można ustawić {0}.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>Nie można zmienić elementu DataSet w elemencie DataViewManager, który jest już domyślnym widokiem dla elementu DataSet.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>Element RowStateFilter nie może pokazywać elementów ModifiedOriginals i ModifiedCurrents w tym samym czasie.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>Nie można zmienić właściwości Table w elemencie DefaultView lub DataView pochodzącym z elementu DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>Po ustawieniu właściwości DataSet nie można jej zmienić.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>Element DataSet musi być ustawiony przed użyciem elementu DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>Po ustawieniu właściwości Table nie można jej zmienić.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>Element DataTable musi być ustawiony przed użyciem elementu DataView.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>Nie można powiązać do elementu DataTable bez nazwy.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>Nie można ustawić obiektu dla tej listy.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>Nie można wywołać elementu AddNew w elemencie DataView, jeśli element AllowNew ma wartość false.</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>Element DataView nie jest otwarty.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>W tabeli, do której odnosi się ten element DataView, brak elementu nadrzędnego dla tej relacji.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>Nie można usunąć danych z elementu DataSource, jeśli element AllowDelete ma wartość false.</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>Nie można edytować danych z elementu DataSource, jeśli element AllowEdit ma wartość false.</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>Indeks {0} jest ujemny lub większy niż liczba wierszy.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>Nie można dodać obiektów zewnętrznych do tej listy.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>Nie można wyczyścić tej listy.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>Nie można wstawić obiektów zewnętrznych do tej listy.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>Nie można usunąć obiektów nieznajdujących się na liście.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} nie jest ani elementem DataColumn, ani elementem DataRelation dla tabeli {1}.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>Min ({0}) musi być mniejsze lub równe max ({1}) w obiekcie Range.</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>To jest zakres null.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>Element MinimumCapacity nie może być zerowy.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>Nie można wygenerować identyfikatora dla nazwy '{0}'.</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>Istnieje więcej niż jedna tabela o tej samej nazwie {0} (nawet jeśli przestrzeń nazw jest inna).</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>Kolumna '{0}': typ '{1}' nie może być zerowy.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>Kolumna {0}: typ {1} nie ma bezparametrowego konstruktora.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>Kolumna {0}: typ {1} nie ma konstruktora z argumentem typu string.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>Nie można przekonwertować obiektu typu „{0}” na obiekt typu „{1}”.</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>Usunięte wiersze są niedostępne.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>Zduplikowana nazwa nie jest dozwolona.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>Operacja nie jest obsługiwana w zdarzeniu RowChanging.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>Nieprawidłowe ograniczenie.</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>Brak klucza podstawowego.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Wartość Null jest niedozwolona.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>Kolumna jest oznaczona jako przeznaczona tylko do odczytu.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>Nie odnaleziono wiersza w tabeli.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>Nie odnaleziono wersji.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>Dane elementu ReadOnly mają właściwość Modified.</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>Element DataTableReader jest nieprawidłowy dla bieżącego elementu DataTable {0}.</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>Schemat bieżącego elementu DataTable {0} w elemencie DataTableReader został zmieniony – element DataTableReader jest nieprawidłowy.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>Nie można utworzyć elementu DataTableReader. Brak elementu DataTable w elemencie DataSet.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>Nie można utworzyć elementu DataTableReader. Argument jest pusty.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>Nie można utworzyć elementu DataTableReader. Argumenty zawierają wartość null.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>Bieżący element DataRow jest w stanie Deleted albo Detached.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>Bieżący element DataTable {0} jest pusty. Brak elementu DataRow w tabeli DataTable.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>Indeks wewnętrzny elementu DataTable jest uszkodzony: {0}.</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>Kolekcja została zmodyfikowana; nie można wykonać operacji wyliczania.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>Typ prosty „{0}” został już zadeklarowany z innym elementem „{1}”.</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>Niewłaściwe uwarstwienie.</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>Nie można zmienić nazwy tabeli po zmapowaniu skojarzonego elementu DataSet do załadowanego dokumentu XML.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>Nie można zmienić przestrzeni nazw tabeli po zmapowaniu skojarzonego elementu DataSet do załadowanego dokumentu XML.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>Nie można zmienić nazwy kolumny po zmapowaniu skojarzonego elementu DataSet do załadowanego dokumentu XML.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>Nie można zmienić przestrzeni nazw kolumny po zmapowaniu skojarzonego elementu DataSet do załadowanego dokumentu XML.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>Nie można zmienić właściwości ColumnMapping po zmapowaniu skojarzonego elementu DataSet do załadowanego dokumentu XML.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>Nie można dodać ani usunąć kolumn z tabeli po zmapowaniu elementu DataSet do załadowanego dokumentu XML.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>Nie można dodać lub usunąć tabel z elementu DataSet po zmapowaniu tego elementu do załadowanego dokumentu XML.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>Nie można dodać, usunąć lub zmienić relacji zagnieżdżonych z elementu DataSet po zmapowaniu tego elementu do załadowanego dokumentu XML.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>Parametr zestawu danych jest nieprawidłowy. Nie może mieć wartości null.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>Nie można zmienić nazwy elementu DataSet po zmapowaniu tego elementu do załadowanego dokumentu XML.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>Ten typ węzła nie może być klonowany: {0}.</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>Nie można załadować elementu XmlDataDocument, jeśli zawiera on już dane. Użyj nowego dokumentu XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>Element DataSet może być skojarzony z co najwyżej jednym elementem XmlDataDocument. Nie można skojarzyć elementu DataSet z bieżącym obiektem XmlDataDocument, ponieważ zestaw danych jest już skojarzony z innym obiektem XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>Ustaw ograniczenie DataSet.EnforceConstraints == false przed próbą edycji dokumentu XmlDataDocument przy użyciu operacji XML.</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>Element GetElementById() nie jest obsługiwany w dokumencie DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>Nie można stworzyć odwołań do jednostki w dokumencie DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>Wykonywanie funkcji Clear na elementach DateSet i DataTable nie jest obsługiwane w dokumencie XmlDataDocument.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>Nie można usunąć kolumny, ponieważ jest ona wbudowana do tego elementu dataSet.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>Nie można usunąć relacji, ponieważ jest ona wbudowana do tego elementu DataSet.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>Występuje za każdym razem, gdy ulega zmianie dowolna właściwość dla tego sterownika.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Występuje, gdy zmieni się członkostwo tej kolekcji.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>Nie można pobrać wartości, ponieważ jest to wartość DBNull.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>Właściwość {0} wymaga systemu operacyjnego Microsoft WindowsNT lub opartego na systemie WindowsNT.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>Nie można znaleźć żądanego dostawcy danych .NET Framework.  Być może nie jest zainstalowany.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>Żądana implementacja dostawcy danych programu .NET Framework nie ma pola wystąpienia typu pochodnego System.Data.Common.DbProviderFactory.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>Nie można odnaleźć lub załadować zarejestrowanego dostawcy danych programu .NET Framework.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>Brakująca nazwa kwalifikowana zestawu dostawcy danych programu .NET Framework jest wymagana.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>Dozwolone są tylko elementy.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>Węzły podrzędne nie są dozwolone.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>nierozpoznany atrybut {0}.</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>Nierozpoznany element.</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>W każdym pliku konfiguracyjnym sekcja {0} może wystąpić tylko raz.</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>Nie znaleziono wymaganego atrybutu „{0}”.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>Wymagany atrybut {0} nie może być pusty.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>Oczekiwana jest niepusta tablica dla parametru {0}.</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>Jedyną dopuszczalną wartością właściwości {0} jest {1}.</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>Dopuszczalne wartości właściwości {0} to {1} lub {2}.</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>Określone wartości QuotePrefix i QuoteSuffix nie są zgodne.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>Długość argumentu {0} przekracza limit wynoszący {1}.</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>Oczekiwano argumentu typu {1}, ale otrzymano typ {0}.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>Nieprawidłowa wartość klucza „{0}”.</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>Użycie klucza {0} wymaga obecności klucza {1}.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>Długość wartości dla klucza {0} przekracza limit wynoszący {1}.</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>Słowo kluczowe jest nieobsługiwane: „{0}”.</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>Nie można załadować pliku UDL.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>Nieprawidłowy plik UDL.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>Błąd wewnętrzny dostawcy danych programu .NET Framework: {0}.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>Właściwości QuotePrefix i QuoteSuffix nie mogą być już zmieniane po wygenerowaniu polecenia Insert, Update lub Delete.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>Właściwość DataAdapter.SelectCommand musi zostać zainicjowana.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>Właściwość DataAdapter.SelectCommand.Connection musi zostać zainicjowana;</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} „{1}”.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} „{1}” – nieprawidłowe użycie cudzysłowu.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} „{1}” – bieżący limit, „{2}” jest niewystarczający.</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>Operacja SqlBulkCopy.WriteToServer nie powiodła się, ponieważ element SqlBulkCopy.DestinationTableName jest nieprawidłową nazwą wieloczęściową</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>Przetwarzanie wyników z programu SQL Server nie powiodło się z powodu nieprawidłowej nazwy wieloczęściowej</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName jest nieprawidłową nazwą wieloczęściową</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName jest nieprawidłową nazwą wieloczęściową</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>Operacja SqlCommand.DeriveParameters nie powiodła się, ponieważ właściwość SqlCommand.CommandText jest nieprawidłową nazwą wieloczęściową</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>Operacja OdbcCommandBuilder.DeriveParameters nie powiodła się, ponieważ właściwość OdbcCommand.CommandText jest nieprawidłową nazwą wieloczęściową.</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>Operacja OleDbCommandBuilder.DeriveParameters nie powiodła się, ponieważ właściwość OleDbCommandBuilder.CommandText jest nieprawidłową nazwą wieloczęściową.</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>Nawiązywanie połączenia z dublowanym wystąpieniem programu SQL Server z użyciem opcji połączenia MultiSubnetFailover jest nieobsługiwane.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>Nie można mapować kolumn z elementu SourceColumn {0}, ponieważ element DataColumn {1} jest kolumną obliczaną.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>Niezgodność typów niemożliwych do konwersji między elementem SourceColumn {0} z {1} a elementem DataColumn {2} z {3}.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>Brak elementu DataColumn {0} w elemencie DataTable {1} dla elementu SourceColumn {2}.</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>Wymagane jest, aby element SourceColumn były niepustym ciągiem.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>Brak mapowania elementu SourceColumn dla {0}.</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Wartość wyliczenia elementu {0}, wynosząca {1}, nie jest obsługiwana przez metodę {2}.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Wartość wyliczenia elementu {0}, wynosząca {1}, nie jest obsługiwana przez dostawcę danych Odbc programu .NET Framework.</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Wartość wyliczenia elementu {0}, wynosząca {1}, nie jest obsługiwana przez dostawcę danych OleDb programu .NET Framework.</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Wartość wyliczenia elementu{0} , wynosząca {1}, nie jest obsługiwana przez dostawcę danych SqlClient programu .NET Framework.</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>Nie można pobrać danych ComputerNameDnsFullyQualified, {0}.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>Brak elementu DataTable {0} dla elementu SourceTable {1}.</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>Element SourceTable musi być ciągiem niepustym</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>Brak mapowania elementu SourceTable: {0}</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: właściwość CommandText nie została zainicjowana</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: właściwość połączenia nie została zainicjowana.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>Element {0} wymaga otwartego i dostępnego połączenia (Connection). {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: właściwość SelectCommand.Connection nie została zainicjowana.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: właściwość SelectCommand.Connection nie została zainicjowana.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: właściwość SelectCommand.Connection nie została zainicjowana.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>Aktualizacja wymaga, aby element InsertCommand miał obiekt połączenia. Właściwość Connection elementu InsertCommand nie została zainicjowana.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>Aktualizacja wymaga, aby element UpdateCommand miał obiekt połączenia. Właściwość Connection elementu UpdateCommand nie została zainicjowana.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>Aktualizacja wymaga, aby element DeleteCommand miał obiekt połączenia. Właściwość Connection elementu DeleteCommand nie została zainicjowana.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>Aktualizacja wymaga obiektu połączenia.  Nie zainicjowano właściwości Connection.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>Aktualizacja wymaga, aby klon polecenia miał obiekt połączenia. Właściwość Connection klona polecenia nie została zainicjowana.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>Aktualizacja wymaga połączenia.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Operacja Update wymaga, aby element {0}Command miał obiekt z otwartym połączeniem. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Operacja Update wymaga, aby element {0}Command miał obiekt z otwartym połączeniem. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Operacja Update wymaga, aby element {0}Command miał obiekt z otwartym połączeniem. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Operacja Update wymaga, aby polecenie aktualizujące miało obiekt z otwartym połączeniem. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>Przechowywana procedura {0} nie istnieje.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>Transakcja przypisana do tego polecenia musi być najbardziej zagnieżdżoną oczekującą transakcją lokalną.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>Transakcja nie jest skojarzona z bieżącym połączeniem lub została ukończona.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>Transakcja skojarzona z bieżącym połączeniem została ukończona, ale nie została usunięta.  Transakcja musi zostać usunięta, aby można było użyć połączenia do wykonywania instrukcji SQL.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>Element {0} wymaga, aby polecenie miało transakcję, gdy połączenie przypisane do polecenia jest w fazie oczekującej transakcji lokalnej.  Właściwość Transaction polecenia nie została zainicjowana.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>Istnieje już skojarzony z tym poleceniem otwarty element SqlResultSet, który należy najpierw zamknąć.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>Istnieje już skojarzony z tym poleceniem {0} otwarty element DataReader, który należy najpierw zamknąć.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>Element {0} DeriveParameters obsługuje tylko element CommandType.StoredProcedure, a nie element CommandType.{1}.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>Metoda {0} nie może być wywoływana więcej niż raz dla tego samego wykonania.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>Nieprawidłowy wynik operacji asynchronicznej.</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>Właściwość SelectCommand nie została zainicjowana przed wywołaniem {0}.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>Elementu StatementType {0} nie oczekiwano w tym miejscu.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>Operacja FillSchema: oczekiwano niepustego ciągu w nazwie elementu SourceTable.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>Nieprawidłowa wartość elementu MaxRecords wynosząca {0}; wartość musi być &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>Nieprawidłowa wartość elementu StartRecord wynosząca {0}; wartość musi być &gt;= 0.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Operacja Fill: oczekiwano niepustego ciągu w nazwie elementu SourceTable.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>Hierarchiczne kolumny rozdziałów muszą mapować do elementu DataColumn typu AutoIncrement.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>Element DataReader.GetFieldType({0}) zwrócił wartość null.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>W przypadku używania niezerowych wartości dla elementów startRecords lub maxRecords określ tylko jeden element w tablicy dataTables.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Operacja Update nie może odnaleźć elementu TableMapping[{0}] lub elementu DataTable {0}.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Operacja Update: oczekiwano niepustej nazwy elementu SourceTable.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>Brak elementu TableMapping, gdy element TableMapping.DataSetTable={0}.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Operacja Update wymaga prawidłowego klonu polecenia.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>Automatyczne generowanie kodu SQL podczas operacji Update wymaga prawidłowego elementu SelectCommand.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Operacja Update wymaga prawidłowego elementu InsertCommand podczas przekazywania kolekcji DataRow z nowymi wierszami.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>Operacja Update wymaga prawidłowego elementu UpdateCommand podczas przekazywania kolekcji DataRow ze zmodyfikowanymi wierszami.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Operacja Update wymaga prawidłowego elementu DeleteCommand podczas przekazywania kolekcji DataRow z usuniętymi wierszami.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>Element DataRow[{0}] jest z innego elementu DataTable niż element DataRow[0].</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: wystąpiły błędy; brak dodatkowych informacji.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: wystąpiły błędy; brak dodatkowych informacji.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>Podczas przetwarzania wsadowego wartość UpdateRowSource.FirstReturnedRecord lub UpdateRowSource.Both właściwości UpdatedRowSource polecenia jest nieprawidłowa.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>Naruszenie współbieżności: element UpdateCommand dotyczy następującej liczby rekordów: {0} (oczekiwana liczba rekordów: {1}).</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>Naruszenie współbieżności: element DeleteCommand dotyczy następującej liczby rekordów: {0} (oczekiwana liczba rekordów: {1}).</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>Naruszenie współbieżności: polecenie w trybie wsadowym wpłynęło na {0} z oczekiwanych {1} rekordów.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>Metoda {0} nie może być wywoływana więcej niż raz dla tego samego wykonania.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>Nieprawidłowa wartość elementu CommandTimeout {0}; wartość musi być &gt;= 0.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: właściwość Size ma nieprawidłowy rozmiar 0.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>Metoda {0}.Prepare wymaga, aby wszystkie parametry miały jawnie ustawiony typ.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>Metoda {0}.Prepare wymaga, aby wszystkie parametry o zmiennej długości miały jawnie ustawiony niezerowy element Size.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>Metoda {0}.Prepare wymaga, aby parametry typu {1} miały jawnie ustawione elementy Precision i Scale.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>Niezgodne wywołanie metody końcowej dla elementu asyncResult.  Oczekiwano wywołania {0}, ale zamiast tego wywołano {1}.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>Nieprawidłowa operacja. Połączenie jest zamknięte.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>Połączenie zostało wyłączone.</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>Nie można zarejestrować w transakcji, ponieważ transakcja lokalna jest w toku w połączeniu.  Zakończ transakcję lokalną i spróbuj ponownie.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>Połączenie ma obecnie zarejestrowaną transakcję.  Zakończ bieżącą transakcję i spróbuj ponownie.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>Baza danych nie może być zerowa, nie może być ciągiem pustym ani ciągiem złożonym tylko z odstępów.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>Argument jest za długi.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Nieprawidłowa wartość elementu Connect Timeout, która musi być liczbą całkowitą &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>Nieprawidłowe przesunięcie buforu źródłowego (rozmiar {0}): {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>Nieprawidłowe przesunięcie buforu docelowego (rozmiar {0}): {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>Wartość numeryczna jest za duża – nie mieści się w 96-bitowej zmiennej dziesiętnej.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>Nieprawidłowa próba {0} podjęta, gdy strumień jest zamknięty.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>Określona wartość elementu SeekOrigin jest nieprawidłowa.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>Dynamiczne generowanie kodu SQL nie jest obsługiwane dla wielu tabel podstawowych.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>Dynamiczne generowanie kodu SQL nie jest obsługiwane dla elementu SelectCommand, który nie zwraca żadnych informacji o tabeli podstawowej.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>Dynamiczne generowanie kodu SQL dla elementu DeleteCommand nie jest obsługiwane dla elementu SelectCommand, który nie zwraca żadnych informacji o kolumnie klucza.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>Dynamiczne generowanie kodu SQL dla elementu UpdateCommand nie jest obsługiwane dla elementu SelectCommand, który nie zwraca żadnych informacji o kolumnie klucza.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>Dynamiczne generowanie kodu SQL dla elementu DeleteCommand nie jest obsługiwane dla elementu SelectCommand, który nie zawiera kolumny wersji wiersza.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>Dynamiczne generowanie kodu SQL dla elementu UpdateCommand nie jest obsługiwane dla elementu SelectCommand, który nie zawiera kolumny wersji wiersza.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>Dynamiczne generowanie kodu SQL nie jest obsługiwane dla nazw tabel {0} zawierających znak {1} stanowiący element QuotePrefix lub QuoteSuffix.</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>Nieprawidłowa próba odczytu z numeru kolumny {0}.  Właściwość CommandBehavior.SequentialAccess umożliwia odczyt tylko z kolumn o liczbie porządkowej „{1}” lub większej.</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>Typu danych {0} nie można sformatować jako literału, ponieważ ma nieprawidłowe cyfry daty/godziny.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>Wartości nie można sformatować jako literału żądanego typu.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>Typu danych {0} nie można sformatować jako literału, ponieważ ma nieprawidłową maksymalną skalę.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>Podana wartość literału nie jest prawidłowym literałem dla typu danych {0}.</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>„{0}”: długość wartości literału musi być parzysta.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>{0}: wartość literału musi być ciągiem z cyframi szesnastkowymi.</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>Element {0} wymaga otwartego połączenia, gdy prefiks oferty nie został ustawiony.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>Nie można określić prawidłowych wartości literałów logicznych. Nie można utworzyć literałów logicznych.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>Literały macierzystego typu danych skojarzone z typem danych {0} nie są obsługiwane.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>Typ danych parametru {0} jest nieprawidłowy.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>Nie istnieje żadne mapowanie typu obiektu {0} do znanego zarządzanego typu macierzystego dostawcy.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>Nie można obsłużyć nieznanego elementu TypeCode {0} zwróconego przez typ {1}.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>Nie istnieje żadne mapowanie z elementu DbType {0} do znanego elementu {1}.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>Używana wersja programu SQL Server nie obsługuje typu danych {0}.</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>Wartość parametru {0} jest poza zakresem.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>Określona nazwa parametru „{0}” jest nieprawidłowa.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>Wiele parametrów wartości zwracanej nie jest obsługiwane.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>Nieprawidłowa wartość rozmiaru parametru {0}. Wartość musi być większa niż lub równa 0.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>Nieprawidłowa wartość argumentu {0}. Wartość musi być większa niż lub równa 0.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>Nieprawidłowa wartość dla tych metadanych.</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>Metadane muszą być elementem SqlDbType.Row</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>Nie można przekonwertować wartości parametru z {0} na {1}.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} nie obsługuje transakcji równoległych.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>Ten element {0} zakończył się; nie można go już używać.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>Nie można wywołać elementu {0}, jeśli rekord jest tylko do odczytu.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>Nie można wywołać elementu {0}, jeśli element DbDataRecord jest tylko do odczytu.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>Jawna konwersja typu obiektu „{0}” na typ danych „{1}” nie jest obsługiwana.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>Suma przesunięcia buforu „{1}” i liczby dostępnych bajtów „{0}” jest większa niż długość przekazana w buforze.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>Długość danych „{0}” ma wartość mniejszą niż 0.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>Określona długość {0} nie należy do zakresu.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>Nieprawidłowa próba {2} w indeksie dataIndex {0}.  Właściwość CommandBehavior.SequentialAccess umożliwia odczyt tylko z kolumn o liczbie porządkowej {1} lub większej.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>Przesunięcie musi odwoływać się do lokalizacji w wartości.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"Dostawca zarządzany za pośrednictwem ODBC wymaga, aby ograniczenie TABLE_NAME było określone i niezerowe dla kolekcji indeksów GetSchema.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>Nieprawidłowa wartość argumentu dla metody {0}.</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>Dostawca ODBC nie zwrócił wyników z funkcji SQLGETTYPEINFO.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>Nieoczekiwany argument null elementu DataTable</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>Nieoczekiwany zerowy argument null elementu DataSet.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>Parametry połączenia przekraczają maksymalną dozwoloną długość wynoszącą {0}.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} – nie można zmapować typu.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>Nieznany typ SQL – {0}.</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>Nieznany typ URT – {0}.</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>Nieprawidłowy argument ujemny!</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>Nie można ustawić właściwości dla otwartego połączenia.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>Brak prawidłowego mapowania dla elementu SQL_TRANSACTION {0} do wartości wyliczenia System.Data.IsolationLevel.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} – nie można włączyć puli połączeń...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} – nie można przydzielić uchwytu środowiska.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} – nie można pobrać uchwytu deskryptora.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>Poza transakcją</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>Nieprawidłowa wartość wyliczenia OdbcType={0}.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>Użyj elementu IsDBNull tam, gdzie oczekiwane są dane DBNull.Value.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} – brak dostępnych informacji o błędzie</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>Połączenie jest zamknięte.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>Połączenie wewnętrzne nie ma właściciela.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>Dostawca danych Odbc programu .NET Framework wymaga programu Microsoft Data Access Components (MDAC) w wersji 2.6 lub nowszej.  Znaleziono obecnie zainstalowaną wersję {0}.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>Dostawca danych OleDb programu .NET Framework wymaga składników programu Microsoft Data Access Components (MDAC) w wersji 2.6 lub nowszej.  Znaleziono obecnie zainstalowaną wersję {0}.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>Interfejs {0} nie jest obsługiwany przez dostawcę {1}.  Element GetOleDbSchemaTable jest niedostępny u bieżącego dostawcy.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>Niepowodzenie elementu {0}, żaden komunikat o błędzie nie jest dostępny. Kod wyniku: {1}.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>Brak dostępnych komunikatów o błędach, kod wyniku: {0}.</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>Dostawcy danych programu .NET Framework wymagają składników programu Microsoft Data Access Components(MDAC).  Zainstaluj program Microsoft Data Access Components (MDAC) w wersji 2.6 lub nowszej.</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>Dostawca danych programu .NET Framework dla OLEDB (Microsoft.Data.OleDb) nie obsługuje dostawcy OLE DB firmy Microsoft dla sterowników ODBC (MSDASQL). Użyj dostawcy danych programu .NET Framework dla interfejsu ODBC (System.Data.Odbc).</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>Dostawca danych (Provider) programu .NET Framework dla OLEDB nie pozwoli dostawcy bazy danych OLE DB Provider na monitowanie użytkownika w środowisku nieinterakcyjnym.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>Dostawca {0} nie jest zarejestrowany na lokalnym komputerze.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>Interfejs ICommandText nie jest obsługiwany przez dostawcę {0}. Zamiast tego użyj elementu CommandType.TableDirect.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>Interfejs ITransactionLocal nie jest obsługiwany przez dostawcę {0}.  Transakcje lokalne są niedostępne u bieżącego dostawcy.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>Format ciągu inicjowania jest niezgodny ze specyfikacją OLE DB.  Rozpoczynanie od znaku char[{0}] w parametrach połączenia.</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>„Przetwarzanie asynchroniczne” nie jest obsługiwaną funkcją dostawcy OLE DB danych programu .NET Framework (Microsoft.Data.OleDb).</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>Dostawca OLE DB nie został określony w parametrze ConnectionString.  Przykładem może być „Provider=SQLOLEDB;”.</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>Określenie dostawcy danych OLE DB w elemencie ConnectionString jest za długie.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>Nie oczekiwano żadnych ograniczeń dla elementu DbInfoKeywords OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>Nie oczekiwano żadnych ograniczeń dla elementu DbInfoLiterals OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>Nie oczekiwano żadnych ograniczeń dla identyfikatora guid schematu OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>Schemat OleDbSchemaGuid {0} nie jest obsługiwany przez dostawcę {1}.</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>Ustawienie konfiguracji {0} ma błędną liczbę wartości.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>Nie można załadować pliku XML określonego w ustawieniu konfiguracyjnym {0}.</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>Parametr polecenia[{0}] {1} jest nieprawidłowy.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>Nie można konwertować wartości danych parametru polecenia[{0}] {1} z innego powodu niż niezgodność podpisu lub przepełnienie danych.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>Nie można konwertować parametru polecenia[{0}] {1}, ponieważ wartość danych była typu signed, a typ użyty przez dostawcę był typem unsigned.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>Nie można konwertować parametru polecenia[{0}] {1}, ponieważ wartość danych przepełniła typ użyty przez dostawcę.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>Dostawca napotkał błąd podczas wysyłania wartości parametru polecenia[{0}] {1}, przetwarzanie zostało zatrzymane.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>Parametr[{0}] {1} nie ma wartości domyślnej.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>Wystąpił błąd parametru [{0}]: {1}.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Błąd wewnętrzny Microsoft.Data.OleDb.OleDbDataAdapter: nieprawidłowy metoda dostępu do parametru: {0}{1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter[{0}]: właściwość typu OleDbType nie została zainicjowana: OleDbType.{1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>Interfejs ICommandWithParameters nie jest obsługiwany przez dostawcę {0}.  Parametry polecenia nie są obsługiwane przez bieżącego dostawcę.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>Pobieranie informacji o parametrach procedury nie jest obsługiwane przez dostawcę {0}.</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>Nie można określić separatora dziesiętnego serwera. Nie można utworzyć literałów liczbowych innych niż całkowite.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>Obiekt nie jest ani elementem ADODB.RecordSet ani ADODB.Record.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>Nie można pobrać interfejsu {0} z obiektu ADODB.RecordSet.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: właściwość Size ma nieprawidłowy rozmiar 0.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>Nie można pobrać interfejsu IRow z obiektu ADODB.Record.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>Metoda {0}.Prepare wymaga, aby wszystkie parametry miały jawnie ustawiony typ.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>Typ nie obsługuje interfejsu ISourcesRowset bazy danych OLE DB.</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>Metoda {0}.Prepare wymaga, aby wszystkie parametry o zmiennej długości miały jawnie ustawiony niezerowy element Size.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>Nie można utworzyć kolekcji schematu ReservedWords, ponieważ dostawca nie obsługuje elementu IDBInfo.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>Metoda {0}.Prepare wymaga, aby parametry typu {1} miały jawnie ustawione elementy Precision i Scale.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>Wartość właściwości nie została ustawiona, ponieważ dostawca nie obsługuje właściwości {0} albo użytkownik próbował pobrać lub ustawić wartości właściwości poza grupą właściwości Initialization, podczas gdy obiekt źródła danych nie został zainicjowany.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>Niezgodne wywołanie metody końcowej dla elementu asyncResult.  Oczekiwano wywołania {0}, ale zamiast tego wywołano {1}.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>Nie można zainicjować właściwości {0} z jednego z następujących powodów:
-	Typ danych wartości nie był typem danych właściwości ani nie miał wartości null. Na przykład właściwość DBPROP_MEMORYUSAGE ma typ danych Int32, a typ danych to Int64.
-	Wartość nie była prawidłową wartością. Na przykład właściwość to DBPROP_MEMORYUSAGE, a wartość była ujemna.
-	Wartość była prawidłową wartością właściwości, a dostawca obsługuje tę właściwość jako właściwość ustawialną, ale dostawca nie obsługuje określonej wartości. Obejmuje to przypadek, w którym wartość została dodana do właściwości w OLE DB po zapisaniu dostawcy.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>Nieprawidłowa operacja. Połączenie jest zamknięte.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>Wartość opcji Options była nieprawidłowa.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>Nie można zarejestrować w transakcji, ponieważ transakcja lokalna jest w toku w połączeniu.  Zakończ transakcję lokalną i spróbuj ponownie.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>Element ColumnID był nieprawidłowy.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>Połączenie ma obecnie zarejestrowaną transakcję.  Zakończ bieżącą transakcję i spróbuj ponownie.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>Właściwość {0} została określona w celu zastosowania dla wszystkich kolumn, ale nie można jej zastosować dla co najmniej jednej z nich.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>Baza danych nie może być zerowa, nie może być ciągiem pustym ani ciągiem złożonym tylko z odstępów.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>Właściwość {0} była tylko do odczytu lub użytkownik próbował ustawić wartości właściwości w grupie właściwości Initialization po zainicjowaniu obiektu źródła danych. Użytkownicy mogą ustawić wartość właściwości tylko do odczytu na jej bieżącą wartość. Ten stan jest również zwracany, jeśli nie można ustawić właściwości kolumny ustawialnej dla określonej kolumny.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>Nieprawidłowe przesunięcie buforu źródłowego (rozmiar {0}): {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>Opcjonalna wartość właściwości {0} nie została ustawiona na określoną wielkość. Ustawienie właściwości na określoną wartość nie było niemożliwe.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>Nieprawidłowe przesunięcie buforu docelowego (rozmiar {0}): {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>Wartość właściwości {0} nie została ustawiona, ponieważ próba jej ustawienia spowodowała wystąpienie konfliktu z istniejącą właściwością.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>Nieprawidłowa próba {0} podjęta, gdy strumień jest zamknięty.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(Zarezerwowany).</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>Określona wartość elementu SeekOrigin jest nieprawidłowa.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>Dostawca zwrócił nieznaną wartość DBPROPSTATUS_ {0}.</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>Nieprawidłowa próba odczytu z numeru kolumny {0}.  Właściwość CommandBehavior.SequentialAccess umożliwia odczyt tylko z kolumn o liczbie porządkowej „{1}” lub większej.</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>Weryfikacja metody dostępu została odroczona i została wykonana, gdy metoda zwróciła dane. Powiązanie było nieprawidłowe dla tej kolumny lub parametru.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>Typ danych parametru {0} jest nieprawidłowy.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>Błąd wewnętrzny elementu OleDbDataAdapter: nieprawidłowy akcesor zestawu wierszy: liczba porządkowa Ordinal={0}, stan Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>Nie istnieje żadne mapowanie typu obiektu {0} do znanego zarządzanego typu macierzystego dostawcy.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>Nie można konwertować wartości danych z innego powodu niż niezgodność podpisu lub przepełnienie danych. Na przykład dane zostały uszkodzone w magazynie danych, ale wiersz nadal można było pobrać.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>Nie można obsłużyć nieznanego elementu TypeCode {0} zwróconego przez typ {1}.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>Dostawca nie mógł przydzielić pamięci, do której należy zwrócić dane {0}.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>Nie istnieje żadne mapowanie z elementu DbType {0} do znanego elementu {1}.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>Nie można dokonać konwersji, ponieważ wartość danych {0} przepełniła typ określony dla wartości {0} w buforze użytkownika.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>Używana wersja programu SQL Server nie obsługuje typu danych {0}.</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>Błąd wewnętrzny elementu OleDbDataAdapter: [get] Nieznany typ danych OLE DB: 0x{0} ({1}).</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>Wartość parametru {0} jest poza zakresem.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>Nie można dokonać konwersji, ponieważ wartość danych {0} była typu signed, a typ określony dla wartości {0} w buforze użytkownika był typem unsigned.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>Określona nazwa parametru „{0}” jest nieprawidłowa.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>Błąd wewnętrzny elementu OleDbDataAdapter: [set] nieznany typ danych OLE DB: 0x{0} ({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>Nieprawidłowa wartość rozmiaru parametru {0}. Wartość musi być większa niż lub równa 0.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>Dostawca nie mógł określić wartości {0}. Na przykład wiersz został właśnie utworzony, wartość domyślna kolumny {0} jest niedostępna, a użytkownik nie ustawił jeszcze nowej wartości {0}.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>Nieprawidłowa wartość argumentu {0}. Wartość musi być większa niż lub równa 0.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>Dostawca OLE DB zwrócił niespodziewaną wartość stanu wynoszącą {0}.</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>Nieprawidłowa wartość dla tych metadanych.</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>Element OleDbDataReader.Read musi być używany z tego samego wątku, w którym został stworzony, jeśli element ApartmentState tego wątku nie był elementem ApartmentState.MTA.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>Nie można przekonwertować wartości parametru z {0} na {1}.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>Nieokreślony błąd: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} nie obsługuje transakcji równoległych.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>Funkcja IErrorInfo.GetDescription nie powiodła się z {0}.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>Ten element {0} zakończył się; nie można go już używać.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>Funkcja IErrorInfo.GetSource nie powiodła się z {0}.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>Określona długość {0} nie należy do zakresu.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>Dane DBTYPE_VECTOR nie są obsługiwane przez dostawcę OLE DB danych programu .NET Framework (Microsoft.Data.OleDb).</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>Nieprawidłowa próba {2} w indeksie dataIndex {0}.  Właściwość CommandBehavior.SequentialAccess umożliwia odczyt tylko z kolumn o liczbie porządkowej {1} lub większej.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>Nieprawidłowa minimalna lub maksymalna wartość rozmiaru puli, minimalny rozmiar puli nie może być większy niż maksymalny rozmiar puli.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>Słowo kluczowe {0} jest przestarzałe. Zamiast tego użyj „{1}”.</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>Nie można pobrać z serwera adresu koordynatora transakcji rozproszonych (Distributed Transaction Coordinator) dla tego serwera.  Czy usługa DTC jest włączona na serwerze?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>Długość wartości parametru połączenia &lt;{0}&gt; przekracza maksymalną dozwoloną długość 65535 znaków.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>Nieprawidłowy „Rozmiar pakietu”.  Wartość musi być liczbą całkowitą z przedziału od 512 do 32768.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>Nieprawidłowa transakcja lub nieprawidłowa nazwa dla punktu, w którym następuje zapis stanu transakcji.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>Wartość wyliczenia elementu {0}, wynosząca {1}, nie jest obsługiwana przez program SQL Server 7.0 ani przez program SQL Server 2000.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>Wystąpienie użytkownika i tryb failover nie są zgodnymi opcjami.  Wybierz tylko jeden z dwóch parametrów połączenia.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>Nie można ustawić właściwości Credential, jeśli w parametrach połączenia ustawiono wartość „Authentication=Active Directory Integrated”.</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>Określono nieprawidłowe parametry uwierzytelniania z uwierzytelnianiem certyfikatu.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>Wystąpienie programu SQL Server, z którym próbowano się połączyć, wymaga szyfrowania, ale ten komputer go nie obsługuje.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>Wystąpienie programu SQL Server, z którym próbowano się połączyć, nie obsługuje szyfrowania.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>Wystąpienie programu SQL Server, z którym próbowano nawiązać połączenie, nie obsługuje funkcji CTAIP.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>Nieobsługiwana wersja programu SQL Server.  Dostawcy danych SqlClient programu .NET Framework można używać tylko z programem SQL Server w wersji 7.0 lub nowszej.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>Nie można zmienić elementu {0}, gdy operacja asynchroniczna jest w toku.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>To polecenie wymaga połączenia asynchronicznego. Ustaw wartość „Asynchronous Processing=true” w parametrach połączenia.</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>Upłynął limit czasu próby połączenia.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>Upłynął limit czasu.  W wyniku tego połączenie zostało przerwane.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>Błąd wystąpienia.</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>Kod błędu 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>Element ChangePassword wymaga programu SQL Server 9.0 lub nowszej wersji.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>Przekierowywanie wystąpienia SSE nie jest obsługiwane dla wystąpień użytkowników nielokalnych.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>Uwierzytelnianie „{0}” nie jest obsługiwane.</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>Metoda uwierzytelniania SQL „{0}” nie jest obsługiwana.</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>Nie można utworzyć wystąpienia dostawcy uwierzytelniania typu {1} dla elementu {0}.</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>Nie można utworzyć wystąpienia elementu SqlAuthenticationInitializer typu {0}.</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>Dostawca „{0}” zgłosił wyjątek podczas inicjowania.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>Dostawca „{0}” nie obsługuje uwierzytelniania „{1}”.</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Nie można odnaleźć dostawcy uwierzytelniania dla elementu „{0}”. Zainstaluj pakiet NuGet „Microsoft.Data.SqlClient.Extensions.Azure” (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure), aby korzystać z metod uwierzytelniania usługi Active Directory (Entra ID).</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>Nie można odczytać sekcji konfiguracji dla dostawców uwierzytelniania.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Parametr „{0}” nie może mieć wartości null ani być pusty.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>Operacja asynchroniczna została już ukończona.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>Nie można kontynuować wykonywania polecenia, ponieważ istnieje oczekująca operacja asynchroniczna, która jest już w toku.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>Do elementu ExecuteXmlReader wysłano nieprawidłowe polecenie.  Polecenie musi zwrócić wynik XML.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>Powiadomienia wymagają programu SQL Server 9.0 lub nowszej wersji.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>Nieprawidłowy format nazwy trzyczęściowej dla elementu UdtTypeName.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>Nie można zainicjować pakietu SSPI.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Upłynął limit czasu.  Limit czasu upłynął przed ukończeniem operacji lub serwer nie odpowiada.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>Upłynął limit czasu połączenia.  Limit czasu upłynął na początku fazy przed logowaniem.  Może to być spowodowane niewystarczającym czasem podanym dla limitu czasu połączenia.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>Wystąpienie użytkownika było żądane w parametrach połączenia, ale określony serwer nie obsługuje tej opcji.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>Weryfikacja aplikacji certyfikatu serwera nie powiodła się.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>Określona długość danych {0} przekracza dozwoloną maksymalną długość {1}.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>Nieprawidłowa próba odczytu, gdy brak jakichkolwiek danych.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>Długość danych „{0}” ma wartość mniejszą niż 0.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>Nie można wywołać elementu {0}, jeśli element SqlDataRecord jest tylko do odczytu.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>Mapowana kolekcja jest używana i w tym momencie nie można uzyskać do niej dostępu;</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>Nawiązywanie połączenia kontekstowego przy użyciu Microsoft.Data.SqlClient nie jest obsługiwane.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>Zagnieżdżone elementy TransactionScopes nie są obsługiwane.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>Nieoczekiwane zdarzenie serwera: {0}.</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>Długość {0} musi być zgodna z długością {1}.</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>Element SqlDbType „{0}” jest nieprawidłowy dla {1}.  Obsługiwany jest tylko element {2}.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>Zbyt wiele wartości.</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>Element Stream nie obsługuje zapisywania.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>Null</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>Wiadomość</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>Przepełnienie arytmetyczne.</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>Wystąpił błąd dzielenia przez zero.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>Dane mają wartość null. Tej metody lub właściwości nie można wywołać dla wartości null.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>Arytmetyka numeryczna powoduje obcięcie.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>Przepełnienie elementu SqlDateTime. Musi należeć do zakresu od 1.01.1753 12:00:00 do 31.12.9999 23:59:59.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>Dwa ciągi, które mają zostać złączone, są posortowane w różny sposób.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>Dwa ciągi, które mają zostać porównane, są posortowane w różny sposób.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>Nieprawidłowa wartość flagi.</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>Konwersja z elementu SqlDecimal na element Decimal spowodowała przepełnienie.</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>Przepełnienie konwersji.</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>Nieprawidłowy element SqlDateTime.</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>Określono strefę czasową. Element SqlDateTime nie obsługuje stref czasowych.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>Nieprawidłowy rozmiar tablicy.</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>Nieprawidłowa skala/precyzja numeryczna.</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>Dane wejściowe były w niepoprawnym formacie.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>Błąd elementu SqlType.</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>W tej wersji elementy SqlBytes i SqlChars nie obsługują długości przekraczającej 2GB.</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>Wystąpił błąd podczas odczytu.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Element Stream został zamknięty lub usunięty.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>Brak buforu. Operacja odczytu lub zapisu nie powiodła się.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>Nie można ustawić długości na niezerową, ponieważ bieżąca wartość jest równa Null.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>Bufor jest niewystarczający. Operacja odczytu lub zapisu nie powiodła się.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>Nie można zapisać danych do przesunięcia niezerowego, ponieważ bieżąca wartość jest równa Null.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>Nie można zapisać z przesunięcia większego niż bieżąca długość. Spowoduje to pozostawienie niezainicjowanych danych w buforze.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>Zwrócone dane mają rozmiar większy niż 2 Gb. Użyj zachowania polecenia SequentialAccess, aby uzyskać wszystkie dane.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>Argument dla elementu GetDayOfWeek musi być liczbą całkowitą z przedziału od 1 do 7.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>Element SQL Type nie został załadowany z danymi.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>Element SQL Type został już załadowany z danymi.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>Nieprawidłowa próba uzyskania dostępu do zamkniętego elementu XmlReader.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>Nieprawidłowa próba wywołania elementu {0} podjęta, gdy strumień jest zamknięty.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>Nieprawidłowa próba wywołania elementu {0} podjęta, gdy strumień jest nie do zapisu.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>Nieprawidłowa próba wywołania elementu {0} podjęta, gdy strumień jest nie do odczytu.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>Nieprawidłowa próba wywołania elementu {0} podjęta, gdy strumień jest niemożliwy do wyszukiwania.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>Podklasa nie przesłoniła wymaganej metody.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>Nie można utworzyć normalizatora dla „{0}”.</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>Błąd wewnętrzny</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>Parametr polecenia musi mieć niezerowy i niepusty tekst polecenia.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>Tablica parametru MetaData musi mieć długość odpowiadającą argumentowi tablicy ParameterDirection.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>Błąd mapowania karty danych.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>Błąd karty danych.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>Naruszenie współbieżności bazy danych.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>Operacja przerwana.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>Operacja została przerwana z powodu wyjątku (aby uzyskać szczegółowe informacje, zobacz element InnerException).</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Określa, czy operacja Fill wywoła element DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Określa, czy operacja Update wywoła element DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Określa, czy kontynuować do następnego wiersza danych DataRow, gdy stanem zdarzeń Update – RowUpdating i RowUpdated – jest stan Status UpdateStatus.ErrorsOccurred.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>Sposób wypełniania elementu DataTable z elementu DataReader.</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>Akcja podejmowana, gdy w elemencie TableMappings brakuje tabeli albo kolumny.</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>Akcja podejmowana, gdy w elemencie DataSet brakuje tabeli albo kolumny.</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>Określa, w jaki sposób mapować tabelę źródłową do tabeli DataSet.</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Zdarzenie wyzwalane, gdy wystąpi odwracalny błąd podczas operacji Fill.</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Czy operacja Fill ma zwracać wartości określone dla dostawcy, czy też wspólne wartości CLSCompliant.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>Nazwa kolumny źródłowej – uwzględniana wielkość liter.</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>Liczba elementów w kolekcji</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>Określony obiekt DataColumnMapping.</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>Mapowania poszczególnych kolumn przy dopasowywaniu mapowania tej tabeli.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>Nazwa tabeli źródłowej DataTableMapping. W tej nazwie jest uwzględniana wielkość liter.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>Liczba elementów w kolekcji</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>Określony obiekt DataTableMapping</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>Używane podczas aktualizacji na potrzeby usuniętych wierszy w elemencie DataSet.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Zdarzenie wyzwalane po każdym elemencie DataRow podczas operacji Update.</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>Liczba wierszy do przetwarzania partiami przed wykonywaniem względem źródła danych.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Połączenie używane, jeśli polecenia Select/Insert/Update/DeleteCommands nie mają jeszcze połączenia.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>Używane podczas operacji Update dla usuniętych wierszy w elemencie DataTable.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>Używane podczas operacji Update na potrzeby nowych wierszy w tabeli DataTable.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Używane podczas operacji Fill.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>Używane podczas operacji Update na potrzeby zmodyfikowanych wierszy w tabeli DataTable.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Czy operacja Fill ma zwracać wartości określone dla dostawcy, czy też wspólne wartości CLSCompliant.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>Określa sposób mapowania tabeli źródłowej do elementu DataTable.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>Sposób generowania poleceń Insert/Update/DeleteCommands, gdy nie zostały ustawione przez użytkownika.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>Liczba wierszy do przetwarzania partiami przed wykonywaniem względem źródła danych.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>Parametry połączenia użyte do nawiązania połączenia ze źródłem danych.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>Nazwa sterownika ODBC do użycia podczas połączenia ze źródłem danych Data Source.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>Nazwa DSN do użycia podczas połączenia ze źródłem danych Data Source.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>Gdy ma wartość true, wskazuje, że powinny być używane funkcje zarządzanej obsługi puli połączeń.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>Plik UDL do użycia podczas połączenia ze źródłem danych Data Source.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>Określa, które usługi bazy danych OLE DB Services włączyć lub wyłączyć dla dostawcy OleDb Provider.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>Nazwa dostawcy bazy danych OLE DB do użycia podczas połączenia ze źródłem danych Data Source.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>Nazwa aplikacji.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>Gdy ma wartość true, włącza użycie funkcji asynchroniczności w dostawcy danych programu .NET Framework.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>Nazwa pliku głównego (wraz z pełną nazwą ścieżki) bazą danych możliwej do dołączenia.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>Gdy ma wartość true, wskazuje, że stan połączenia jest resetowany w przypadku usunięcia z puli.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>Gdy ma wartość true, wskazuje, że połączenie powinno pochodzić z kontekstu programu Sql Server.  Dostępne tylko w przypadku uruchamiania w procesie programu Sql Server.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>Nazwa rekordu języka programu SQL Server.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>Określa metodę uwierzytelniania w programie SQL Server.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>Określony certyfikat klienta na potrzeby uwierzytelniania w programie SQL Server.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>Informacje używane do połączenia ze źródłem danych.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Bieżąca wartość limitu czasu, niemożliwa do ustawienia w elemencie ConnectionString.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>Bieżąca wartość wykazu źródeł danych, „Database=X” w parametrach połączenia.</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>Bieżące źródło danych, „Server=X” w parametrach połączenia.</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>Bieżący sterownik ODBC.</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>Wersja produktu, do której uzyskuje dostęp sterownik ODBC.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>Informacje używane do połączenia ze źródłem danych.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Bieżąca wartość limitu czasu połączenia, „Connect Timeout=X” w elemencie ConnectionString.</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>Bieżąca wartość wykazu źródeł danych, „Initial Catalog=X” w parametrach połączenia.</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>Bieżące źródło danych, „Data Source=X” w parametrach połączenia.</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>Bieżący identyfikator ProgID dostawcy OLE DB, „Provider=X” w parametrach połączenia.</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>Wersja produktu, do której uzyskuje dostęp dostawca OLE DB.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>Token dostępu używany na potrzeby uwierzytelniania.</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>Stan połączenia, synchroniczny lub asynchroniczny.  „Przetwarzanie asynchroniczne=x” w parametrach połączenia.</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>Informacje używane do połączenia na potrzeby replikacji.</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>Informacje używane do połączenia ze źródłem danych DataSource, na przykład „Data Source=x;Initial Catalog=x;Integrated Security=SSPI”.</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>Gromadzenie danych statystycznych dla tego połączenia.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>Niestandardowi dostawcy magazynu kluczy szyfrowania kolumn.</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>Identyfikator GUID służący do reprezentowania połączenia fizycznego.</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Automatyczne umieszczanie w powiadomieniach używane przez program Microsoft SQL Server.</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>Sposób automatycznego generowania klauzuli where dla poleceń Update i Delete, gdy nie został określony przez użytkownika.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>Wskazuje pozycję nazwy wykazu w kwalifikowanej nazwie tabeli w poleceniu tekstowym.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>Znak oddzielający nazwę wykazu od pozostałej części identyfikatora w poleceniu tekstowym.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>Znak oddzielający nazwę schematu od pozostałej części identyfikatora w poleceniu tekstowym.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Ciąg prefiksu otaczający obiekty sql.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Ciąg sufiksu otaczający obiekty sql.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Element DataAdapter, dla którego mają być automatycznie generowane polecenia.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>Użyj schematu z elementu DataTable lub polecenia SelectCommand.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>Sposób automatycznego generowania klauzuli set dla polecenia Update, gdy nie został określony przez użytkownika.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Element DataAdapter, dla którego mają być automatycznie generowane elementy OdbcCommands</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Znak używany w poleceniu tekstowym jako cudzysłów otwierający dla identyfikatorów, które zawierają znaki specjalne.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Znak używany w poleceniu tekstowym jako cudzysłów zamykający dla identyfikatorów, które zawierają znaki specjalne.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Element DataAdapter, dla którego mają być automatycznie generowane polecenia OleDbCommands</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Separator dziesiętny używany w literałach numerycznych.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Ciąg prefiksu otaczający obiekty sql</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Ciąg sufiksu otaczający obiekty sql</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>Element DataAdapter, dla którego mają być automatycznie generowane elementy SqlCommands</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Separator dziesiętny używany w literałach numerycznych.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Znak używany w poleceniu tekstowym jako cudzysłów otwierający dla identyfikatorów, które zawierają znaki specjalne.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Znak używany w poleceniu tekstowym jako cudzysłów zamykający dla identyfikatorów, które zawierają znaki specjalne.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>W przypadku korzystania ze scenariuszy Prepare, FillSchema i CommandBuilder opcję tę należy ustawić tylko dla parametrów numerycznych i dziesiętnych.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>W przypadku korzystania ze scenariuszy Prepare, FillSchema i CommandBuilder opcję tę należy ustawić tylko dla parametrów numerycznych i dziesiętnych.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>Macierzysty typ parametru.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>Macierzysty typ parametru.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>Nazwa parametru, np. „@p1”</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>Macierzysty typ parametru.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>Nazwa serwera dla typu.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>Przesunięcie w typach danych o zmiennej długości.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>Parametr ParameterDirection „{0}” określony dla parametru „{1}” nie jest obsługiwany. Parametry z wartościami przechowywanych w tabeli obsługują tylko parametr ParameterDirection.Input.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>Określono element TypeName dla parametru „{0}”.  Właściwość TypeName może być ustawiona tylko dla parametrów strukturalnych.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>Typ SqlDbType.Structured jest obsługiwany tylko w przypadku typów o wielu wartościach.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>Kolumna DateType pola {0} w tabeli schematów ma wartość null.  Element DataType musi mieć wartość inną niż null.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>Liczba pól w rekordzie „{0}” jest niezgodna z liczbą w rekordzie oryginalnym.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>zakres: 0–8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>napotkano nieoczekiwany błąd dostawcy danych SqlClient. {0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>Nie można uzyskać informacji Type Info dla elementu {0},{1}</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>Dostawca nie może załadować następującego zestawu: {0}.</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>Właściwość UdtTypeName musi być ustawiona dla parametrów UDT.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>Określony typ nie został zarejestrowany na serwerze docelowym {0}.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>Parametry UDT nie są dozwolone w klauzuli where, chyba że są częścią klucza podstawowego.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>„{0}” jest nieprawidłowym typem zdefiniowanym przez użytkownika, przyczyna: {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>obsługuje zarówno formaty w pamięci, jak i formaty zdefiniowane przez użytkownika</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>Nie można obsłużyć formatu macierzystego.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>nie implementuje interfejsu IBinarySerialize</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>nie można serializować</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>brak konstruktorów publicznych</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>nie implementuje interfejsu INullable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>nie ma konstruktora publicznego</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>brak atrybutu UDT</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>Serializacja bez mapowania nie jest jeszcze obsługiwana.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>brak metody „public static x Parse(System.Data.SqlTypes.SqlString)”</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>brak metody „public override string ToString()”</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>brak metody „public static x Null { get; }”</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>Format macierzysty nie obsługuje pól (jawnie ani przez inne pole) typu „{0}”</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>Typ nie jest publiczny</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Natywny układ UDT nie jest układem sekwencyjnym z powodu typu „{0}”</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Format macierzysty UDT (Native UDT) określa maksymalny rozmiar w bajtach (byte)</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>pole „{0}” jest oznaczone jako nieserializowane</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>Typ pola „{0}” jest oznaczony jako układ jawny, co jest niedozwolone w formacie natywnym</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>Odwołania do zestawów mające wiele wartości muszą mieć niezerowy identyfikator zestawu.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>Typy strukturalne o wielu wartościach mogą być używane tylko dla parametrów i nie mogą być zagnieżdżane w innych typach.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>Nazwa ścieżki jest nieprawidłowa.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>Błąd podczas próby podwyższenia poziomu transakcji.</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>Obiekt zależności używany do obierania powiadomień dotyczących zapytań.</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>Właściwość wskazująca, czy dana zależność jest nieprawidłowa.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>Dodawanie polecenia do istniejącego obiektu zależności.</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Polecenie jest już skojarzone z innym obiektem zależności. Nie można zastąpić.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>Ten obiekt SqlCommand został już skojarzony z innym obiektem SqlDependency.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>Określony limit czasu jest nieprawidłowy. Limit czasu nie może być &lt; 0.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>Błąd powiadomienia. Typ={0}, Info={1}, Źródło={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>Element GetMetaData nie jest prawidłowy dla tego elementu SqlDbType.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>Typ dbType {0} jest nieprawidłowy dla tego konstruktora.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>Błąd wewnętrzny. Zwykły tekst nie może mieć wartości null.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>Nie można zaszyfrować. Szyfrowanie spowodowało {0} B szyfru, który przekracza maksymalny dozwolony limit {1} B. Określona wartość w postaci zwykłego tekstu jest prawdopodobnie za duża (rozmiar zwykłego tekstu: {2} B).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>Błąd wewnętrzny. Tekst szyfrowany nie może mieć wartości null.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>Program SQL Server nie zwrócił informacji o zaświadczaniach. Typ enklawy to „{0}”, a adres URL zaświadczania enklawy to „{1}”.</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>Nie można ustanowić bezpiecznego kanału. Komunikat o błędzie: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>Błąd wewnętrzny. Argument o wartości null „{0}” określony podczas konstruowania obiektu typu „{1}”. Element „{0}” nie może mieć wartości null.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Określa punkt końcowy usługi zaświadczania enklawy, która będzie używana do sprawdzenia, czy enklawa skonfigurowana w wystąpieniu programu SQL Server dla obliczeń w kolumnach bazy danych zaszyfrowanych przy użyciu funkcji Always Encrypted jest prawidłowa i bezpieczna.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>Nie można odczytać sekcji konfiguracji dla dostawców enklawy. Upewnij się, że sekcja jest poprawnie sformatowana w pliku konfiguracji aplikacji. Komunikat o błędzie: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>Nie można utworzyć wystąpienia dostawcy enklawy typu „{1}” dla nazwy „{0}”. Komunikat o błędzie: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>Błąd wewnętrzny. Właściwość SqlColumnEncryptionEnchaveProviderName nie może mieć wartości null ani być pusta.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>Wystąpił błąd podczas odczytywania zestawu wyników „{0}”. Adres URL zaświadczania nie został określony w parametrach połączenia, ale zapytanie wymaga obliczeń enklawy.  Typ enklawy to „{1}”. </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>Błąd wewnętrzny. Typ enklawy odebrany z programu SQL Server ma wartość null lub jest pusty podczas wykonywania zapytania wymagającego obliczeń enklawy.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>Wykonanie zapytania wymaga obliczeń enklawy, ale w konfiguracji aplikacji brakuje sekcji dostawcy enklawy.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>Nie znaleziono dostawcy enklawy dla typu enklawy „{0}” i protokołu zaświadczania „{1}”. Określ poprawny protokół zaświadczania w parametrach połączenia. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>Domyślne ustawienie szyfrowania kolumny dla wszystkich poleceń w ramach połączenia.</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>Wymusza szyfrowanie parametru przed wysłaniem poufnych danych na serwer. </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>Obiekt słownika zawierający nazwy programu SQL Server i ich zaufane ścieżki klucza głównego kolumny.</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>Nawiązywanie połączenia z dublowanym wystąpieniem programu SQL Server z użyciem opcji połączenia ApplicationIntent ReadOnly jest nieobsługiwane.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>Odebrano nieoczekiwane informacje routingu.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>Odebrano nieprawidłowe informacje routingu.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>Nieobsługiwane uwierzytelnianie określone w tym kontekście: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Upłynął limit czasu uwierzytelniania interaktywnego usługi Active Directory. Użytkownik potrzebował zbyt dużo czasu, aby odpowiedzieć na żądanie uwierzytelnienia.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>Nie można użyć opcji „Authentication=Active Directory Interactive”, jeśli właściwość Credential została ustawiona.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>Identyfikator procesu serwera (SPID) aktywnego połączenia.</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Upłynął limit czasu uwierzytelniania przepływu kodu urządzenia usługi Active Directory. Użytkownik potrzebował zbyt dużo czasu, aby odpowiedzieć na żądanie uwierzytelnienia.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>Nie można ustawić właściwości Credential, jeśli w parametrach połączenia określono wartość „Authentication=Active Directory Device Code Flow”.</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>Dla żądanej akcji są obsługiwane tylko tablice jednowymiarowe.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>Nie można usunąć określonego elementu, ponieważ nie znaleziono go w określonej kolekcji.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>Wymagana jest liczba nieujemna.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Nie można ustawić właściwości AccessTokenCallback, jeśli w parametrach połączenia określono wartość „Authentication=Active Directory Default”.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} zwrócono {1}.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>Błąd protokołu: odebrana wiadomość zawiera prawidłowy podpis, ale nie została zaszyfrowana, czego wymagają ustawienia obowiązującego poziomu zabezpieczeń.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>Operacja {0} nie powiodła się z powodu błędu: {1}.</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>Metoda ta nie jest implementowana przez tę klasę.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>Żądany pakiet zabezpieczeń nie jest obsługiwany.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>Nieprawidłowy typ połączenia physicalConnection.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>Wystąpił wyjątek podczas próby ustawienia przełącznika AppContext „{0}”={1}.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>Typ {0} nie jest obsługiwany na tej platformie.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>Tryb niezmienny globalizacji nie jest obsługiwany.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Nie można uwierzytelnić przy użyciu protokołu Kerberos. Upewnij się, że protokół Kerberos został zainicjowany na kliencie za pomocą funkcji „kinit”, a nazwa główna usługi została zarejestrowana dla serwera Microsoft SQL Server, aby umożliwić uwierzytelnianie protokołu Kerberos.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>Słowo kluczowe „Biblioteka sieciowa” nie jest obsługiwane na tej platformie, zamiast tego należy poprzedzić „Źródło danych” żądanym protokołem („tcp:” dla połączenia TCP lub „np:” dla połączenia typu Nazwany potok).</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>Gniazdo nie zgłosiło oczekiwanego elementu „{0}” z kodem błędu „{1}”.</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>Serwer próbuje użyć funkcji, która nie jest obsługiwana na tej platformie.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>Słowo kluczowe „{0}” nie jest obsługiwane na tej platformie.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>Aktualnie załadowana biblioteka System.Transactions.dll nie obsługuje transakcji globalnych.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>Odebrano nieobsługiwany token „{0}” podczas odczytywania danych z serwera.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>„{0}” nie jest obsługiwanym typem uchwytu.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>Obiekt SqlFileStream nie jest obsługiwany na tej platformie.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>Usługa LocalDB nie jest obsługiwana na tej platformie.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>Za mało miejsca w buforze. Wymagane: {0} wartość rzeczywista: {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>Operacja GSSAPI nie powiodła się. Stan: {0} (Stan pomocniczy: {1}).</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>Operacja GSSAPI nie powiodła się z powodu błędu — {0} ({1}).</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>Brak obsługi powiązania kanałów w systemach operacyjnych innych niż Windows.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>Nazwa obiektu docelowego nie może być pusta, jeśli zostaną przekazane poświadczenia domyślne.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>Żądany poziom ochrony nie jest obsługiwany przez aktualnie zainstalowane wdrożenie interfejsu GSSAPI.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>Implementacja serwera nie jest obsługiwana.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>Uwierzytelnianie NTLM nie jest możliwe w przypadku poświadczeń domyślnych na tej platformie.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>Gdy jest używana przez element DataAdapter.Update, wartość parametru jest zmieniana z DBNull.Value na (Int32)1 lub (Int32)0, jeśli jest niezerowa.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Przekroczono maksymalny rozmiar buforu: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>Brak elementu DataColumn {0} dla elementu SourceColumn {2}.</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>Lista SqlBatchCommand nie została zainicjowana.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index c9f63ccb4c..5873d61783 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>Crescente</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Índice {0} inválido para esse {1} com Count={2}.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>Outro {1} já contém {0}.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>Este {1} já contém {0}.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0} só aceita objetos do tipo {1} não nulo.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>Tentativa de remoção de {0} que não estava contido em {1}.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1} deve ser exclusivo, '{2}' já existe na coleção.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>A conexão não foi fechada. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>Tentativa inválida de chamar {0} quando o leitor estava fechado.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>Não é possível se inscrever na transação porque a conexão é a conexão primária para uma transação delegada ou promovida.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>Decrescente</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>Esperando cadeia de caracteres não vazia para parâmetro '{0}'.</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>A propriedade ConnectionString não foi inicializada.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>Ocorreu uma Non CLS Exception.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>O elemento de segurança fornecido não é um elemento de permissão.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>Dados</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>Atualizar</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>ConnectionState que indica se a conexão está aberta ou fechada.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>Evento disparado quando o estado da conexão é alterado.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>Tipo genérico do parâmetro.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>Parâmetro de entrada, de saída ou bidirecional.</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>uma propriedade da fase de design usada para geração de código com rigidez de tipos.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>Deslocamento em tipos de dados de comprimento variável.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>Nome do parâmetro.</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>Tamanho dos tipos de dados de comprimento variável (cadeia de caracteres e matrizes).</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>Quando usado por um DataAdapter.Update, é o nome da coluna de origem usada para localizar o nome de DataSetColumn em ColumnMappings. Serve para copiar um valor entre o parâmetro e uma linha de dados.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>Quando usado por um DataAdapter.Update (somente UpdateCommand), é a versão do valor DataRow usado para atualizar a fonte de dados.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>Quando usado por DataAdapter.Update, o valor do parâmetro é alterado de DBNull.Value para (Int32)1 ou (Int32)0 se for não nulo.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>Valor do parâmetro.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>Não é possível criar a coleção '{0}' porque houve falha na execução da consulta SQL. Consulte a exceção interna para obter detalhes.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>Foram fornecidas mais restrições do que o suportado pelo esquema solicitado ('{0}').</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>'{2}' não é um valor válido para a restrição '{1}' da coleção de esquemas '{0}'.</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>Coleção solicitada ({0}) não definida.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>Esta versão do provedor não dá suporte à coleção solicitada ({0}).</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>Falta uma das colunas de tabelas DataSourceInformation necessárias.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>A tabela DataSourceInformation deve conter exatamente uma linha.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>Falta uma ou mais colunas necessárias da coleção de restrições.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>Há uma restrição sem linha correspondente na coleção de restrições.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>Falta a coleção '{0}' no XML de metadados.</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>O XML de metadados é inválido.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>O XML de metadados é inválido. A coleção {0} deve conter uma coluna {1} e ser uma coluna de cadeia de caracteres.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>O XML de metadados é inválido. A coluna {1} da coleção {0} deve conter uma cadeia de caracteres não vazia.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>Ação</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>Comportamento</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>Preenchimento</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>InfoMessage</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>Mapeamento</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>Notificação</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>Esquema</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>Pooling</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>ConnectionString Nomeada</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>Segurança</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>Resiliência da Conexão</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>A coleção que retém informações personalizadas sobre o usuário.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>Indica se cadeias de comparação dentro do DataSet diferenciam maiúsculas de minúsculas.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>O nome deste DataSet.</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>Indica um "modo de exibição" personalizado dos dados contidos em DataSet. Este modo de exibição permite filtrar e pesquisar os dados, bem como navegar neles.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>Indica se as regras de restrição devem ser seguidas.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>Indica que o DataSet tem erros.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>Indica uma localidade com a qual serão comparadas as cadeias de caracteres do DataSet.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>Indica o espaço para nome do uri de XML para o elemento raiz apontado por este DataSet.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>Indica o prefixo do espaço para nome usado neste DataSet.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>A coleção que retém as relações deste DataSet.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>A coleção que retém as tabelas deste DataSet.</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>Ocorre quando não é possível mesclar esquemas para duas tabelas com o mesmo nome.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Ocorre após a conclusão da Initialization.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>Representa um cache de dados na memória.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>Indica se a comparação de cadeias de caracteres dentro da tabela diferencia maiúsculas e minúsculas.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>Retorna as relações filho desta tabela.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>A coleção que retém as colunas desta tabela.</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>A coleção que retém as restrições desta tabela.</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>Indica o DataSet a que pertence esta tabela.</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>Este é o DataView padrão da tabela.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>A expressão usada para calcular o valor de limite de dados desta linha.</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>Retorna se há erros na tabela.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>Indica uma localidade com a qual serão comparadas as cadeias de caracteres da tabela.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>Indica o tamanho inicial desta tabela.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>Indica o espaço para nome do uri de XML para o elemento contido nesta tabela.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>Indica o prefixo do espaço para nome usado para esta tabela na representação XML.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>Retorna as relações pai desta tabela.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>Indica a(s) coluna(s) que representa(m) a chave primária desta tabela.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>Indica a coleção que retém as linhas de dados desta tabela.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>Indica o nome usado para pesquisar esta tabela na coleção Tables de um DataSet.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>Ocorre após a edição com êxito de uma linha da tabela.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>Ocorre quando a linha está sendo alterada para que o manipulador de eventos possa modificar ou cancelar a alteração. O usuário pode modificar valores da linha e deve gerar uma exceção para cancelar a edição.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>Ocorre depois que uma linha da tabela é excluída com êxito.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>Ocorre quando uma linha da tabela é marcada para exclusão. Gere uma exceção para cancelar a exclusão.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>Ocorre quando um valor é enviado a esta coluna. O usuário pode modificar o valor proposto e gerar uma exceção para cancelar a edição.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>Ocorre quando um valor é alterado nesta coluna.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>Ocorre antes da limpeza de todas as linhas da tabela.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>Ocorre após a limpeza com êxito de todas as linhas da tabela.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>Ocorre após uma nova DataRow ser instanciada.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>O nome usado para pesquisar esta relação na coleção Relations de um DataSet.</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>Indica as colunas filho desta relação.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>Indica as colunas pai desta relação.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>Indica se as relações são aninhadas.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>Para exclusões, indica que tipo de cascata deve ocorrer nesta relação.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>Para atualizações, indica que tipo de cascata deve ocorrer nesta relação.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>Para aceitar e rejeitar alterações, indica que tipo de cascata deve ocorrer nesta relação.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>Indica as colunas filho desta restrição.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>Indica as colunas pai desta restrição.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>Indica a tabela filho desta restrição.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>Indica as colunas desta restrição.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>Indica se esta restrição é uma chave primária.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>Indica o nome desta restrição.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>Indica a tabela desta restrição.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>Indica se valores nulos são permitidos na coluna.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>Indica se a coluna se incrementa automaticamente com novas linhas adicionadas à tabela. O tipo desta coluna deve ser Int16, Int32 ou Int64.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>Indica o valor inicial para uma coluna AutoIncrement.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>Indica o incremento usado por uma coluna AutoIncrement.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>Indica a legenda da interface de usuário padrão para esta coluna.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>Indica o nome usado para pesquisar esta coluna na coleção Columns de uma DataTable.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>Retorna a DataTable à qual esta coluna pertence.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>Indica o tipo dos dados armazenados na coluna.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>Indica o valor de coluna padrão usado ao serem adicionadas novas linhas à tabela.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>Indica o valor calculado por esta coluna para cada linha com base em outras colunas em vez de obter entrada do usuário.</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>Indica como esta coluna é mantida no XML: como um atributo, elemento, nó de conteúdo simples ou nada.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>Indica o uri de XML para elementos ou atributos armazenados nesta coluna.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>Indica o Prefix usado para esta DataColumn na representação xml.</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Indica o índice desta coluna na coleção Columns.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>Indica se esta coluna permitirá alterações depois que uma linha for adicionada à tabela.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>Indica se a coluna deve restringir que os valores nas linhas da tabela sejam únicos.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>Indica o comprimento máximo do valor permitido pela coluna.</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>Indica o DateTimeMode dessa DataColumn.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>Indica se este DataView e a interface do usuário associada a ele permitem exclusões.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>Indica se este DataView e a interface do usuário associada a ele permitem edições.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>Indica se este DataView e a interface do usuário associada a ele permitem a adição de novas linhas.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>Retorna o número de itens atualmente neste modo de exibição.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>Isso retorna um ponteiro ao DataViewManager que detém a propriedade deste DataSet (se houver algum).</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>Indica se este modo de exibição está aberto.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>Indica uma expressão usada para filtrar os dados retornados por este DataView.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>Indica as versões dos dados retornados por este DataView.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>Indica os nomes da coluna e a ordem em que os dados são retornados por este DataView.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Indica se a classificação padrão deverá ser usada quando a propriedade Sort não estiver definida.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>Indica a tabela usada por este DataView para obter dados.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>Indica se os dados retornados por este DataView sofreram alguma alteração.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>Indica a fonte de dados deste DataViewManager.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>Indica as configurações de classificação/filtro/estado de qualquer tabela do DataSet correspondente.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet não dá suporte para 'union' ou 'list' como simpleType.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>Sintaxe {0} inválida: falta o atributo necessário '{1}'.</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>Valor '{1}' é inválido para atributo '{0}'.</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>Valor do atributo '{0}' deve ser '{1}' ou '{2}'.</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>Não é possível encontrar ElementType name='{0}'.</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>Nome da tabela pai ausente na relação '{0}'.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>Nome da tabela filho ausente na relação '{0}'.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>Chave da tabela pai ausente na relação '{0}'.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>Chave de tabela filho ausente na relação '{0}'.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>Tipo de dados não definido: '{0}'.</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>Tipo de dados não definido.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>Seleção XPath inválida dentro do nó do campo. Não é possível encontrar: {0}.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>Seleção XPath inválida dentro do nó do seletor: {0}.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>Nó 'Key' inválido dentro da restrição chamada: {0}.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>O nome de restrição {0} já está em uso no esquema.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>Não é possível converter '{0}' no tipo '{1}'.</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>Falta a parte '{0}' na restrição '{1}' denominada '{2}'.</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>Definição de Relation inválida: chaves de comprimento diferentes.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet não permite referência circular no ComplexType chamado '{0}'.</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet não pode criar uma instância de um ComplexType abstrato para o nó {0}.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Erro com o conversor de vários destinos ao gravar um Xml Schema. Consulte a exceção interna para obter detalhes.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Erro com o conversor de vários destinos ao gravar um Xml Schema. Uma cadeia de caracteres null ou vazia foi retornada.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>Declaração duplicada '{0}'.</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>Não é possível carregar diffGram. Tabela '{0}' inexistente no DataSet de destino.</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>Não é possível carregar diffGram. Falta o nó 'sql'.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>Nome de coluna '{0}' foi definido para diferentes tipos de mapeamento.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>Prefixo '{0}' não é válido porque contém caracteres especiais.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>Referência circular em tabela aninhada em si mesma '{0}'.</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet não pode expandir entidades. Use XmlValidatingReader e defina a propriedade EntityHandling da mesma maneira.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>O tipo '{0}' não implementa a interface IXmlSerializable e, portanto, não pode continuar com a serialização.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>Não é possível continuar com a desserialização. Os dados não implementam IXMLSerializable e, portanto, não há suporte para polimorfismo.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable não oferece suporte a inferência de esquema de Xml.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>Não é possível continuar com a serialização de DataTable '{0}'. Ele contém um DataRow com várias linhas pai na mesma Chave Estrangeira.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>O atributo IsDataSet é inexistente no Schema de entrada.</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>Não é possível determinar o Elemento DataSet. O atributo IsDataSet existe mais de uma vez.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet não irá serializar tipos que implementam IDynamicMetaObjectProvider mas também não implementam IXmlSerializable.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>Recurso não implementado. {0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>Erro de sintaxe: operando ausente depois do operador '{0}'.</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>Tipo incompatível na expressão '{0}'.</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>Expressão muito complexa.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>Não é possível encontrar a coluna [{0}].</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>A expressão contém uma constante de cadeia de caracteres inválida: {0}.</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>A expressão contém chamada de função indefinida {0}().</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>Erro de sintaxe na expressão.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>Número de argumentos inválido: função {0}().</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>Falta o parêntese de fechamento na expressão.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>Não é possível interpretar símbolo '{0}' na posição {1}.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>{0} era esperado, mas o símbolo existente na posição {2} é {1}.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>Não é possível converter de {0} para {1}.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>Não é possível converter o valor ''{0}'' no Tipo: {1}.</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>Nome de coluna inválido [{0}].</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>A expressão contém constante de data inválida '{0}'.</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>Apenas expressões constantes são permitidas na lista de expressões para o operador IN.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Erro no operador Like: o padrão da cadeia de caracteres '{0}' é inválido.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>Erro de sintaxe: os itens seguintes à palavra-chave IN devem ser separados por vírgulas e devem ser delimitados por parênteses.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>Tipo incompatível em argumento de função: {0}(), argumento {1}, era esperado {2}.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>Tipo incompatível em argumento de função: {0}(), argumento {1}, era esperado um dos tipos inteiros.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>Não é possível realizar a operação '{0}' em {1} e {2}.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>Operador '{0}' é ambíguo nos operandos do tipo '{1}' e '{2}'. Não é possível misturar tipos assinados e não assinados. Use a função Convert() explícita.</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>Erro de sintaxe: a palavra-chave IN deve ser seguida por uma lista não vazia de expressões separadas por vírgulas e deve ser delimitada por parênteses.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>A expressão contém operador sem suporte '{0}'.</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>A expressão contém nome inválido: '{0}'.</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>Erro de sintaxe: operando ausente antes do operador '{0}'.</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>A expressão tem muitos parênteses de fechamento excedentes.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>A tabela [{0}] está envolvida em mais de uma relação. Mencione explicitamente um nome de relação na expressão '{1}'.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>Erro de sintaxe em argumento agregado: era esperado um argumento de uma única coluna com possível qualificador 'Child'.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>Referência não associada na expressão agregada '{0}'.</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>Não é possível avaliar uma expressão não constante sem linha atual.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>Referência não associada na expressão '{0}'.</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>Não é possível avaliar. Expressão '{0}' não é agregada.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>A expressão de filtro ''{0}'' não é avaliada como um termo Booliano.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>Nome de tipo inválido '{0}'.</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>Erro de sintaxe na expressão Lookup: é esperada a palavra-chave 'Parent' seguida de um argumento de coluna única com possível qualificador de relação: Parent[(&lt;nome_relação&gt;)].&lt;nome_relação&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>É necessária uma linha ou uma tabela para invocar DataFilter.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>Argumento {0}() está fora do intervalo.</value>
-  </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>Erro de sintaxe: uso inválido do operador 'Is'. Sintaxe correta: &lt;expression&gt; Is [Not] Null.</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>O deslocamento e o comprimento estavam fora dos limites para a matriz ou a contagem é maior do que o número de elementos do índice até o fim da coleção de origem.</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>Valor muito grande ou muito pequeno para Type '{0}'.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>Não é possível converter o objeto do tipo '{0}' em objeto do tipo '{1}'.</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>Erro de divisão por zero.</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>O único valor aceitável para a propriedade '{0}' é '{1}'.</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>Não é possível localizar a relação pai '{0}'.</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>Os valores aceitáveis para a propriedade '{0}' são '{1}' ou '{2}'.</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>O argumento 'hours' está fora do intervalo. O valor deve estar entre -14 e +14.</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>Valores de QuotePrefix e QuoteSuffix especificados não coincidem.</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>O argumento 'minutes' está fora do intervalo. O valor deve estar entre -59 e +59.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>O comprimento do argumento '{0}' excede seu limite de '{1}'.</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>O intervalo fornecido para a hora um excede o total de 14 horas.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>Valor inválido para a chave '{0}'.</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>A propriedade Kind do argumento DateTime fornecido não corresponde aos argumentos 'hours' e 'minutes'.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>O uso da chave '{0}' requer a presença da chave '{1}'.</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>Uma DataColumn de tipo '{0}' não dá suporte à expressão.</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>O comprimento do valor para a chave '{0}' excede seu limite de '{1}'.</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>Falha ao ativar restrições. Uma ou mais linhas contêm valores que violam as restrições non-null, unique ou foreign-key.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>Palavra-chave não suportada: '{0}'.</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>A coleção não é modificável.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>Erro interno do Provedor de Dados .NET Framework {0}.</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>O nome especificado '{0}' corresponde a pelo menos dois nomes no objeto da coleção com maiúsculas e minúsculas diferentes, mas não há uma correspondência com coincidência de maiúsculas e minúsculas.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}".</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>O nome fornecido '{0}' coincide com ao menos dois nomes no objeto de coleção com espaços para nome diferentes.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}", uso incorreto de aspas.</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>O deslocamento e o comprimento estavam fora dos limites para a matriz ou a contagem é maior do que o número de elementos do índice até o fim da coleção de origem.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}", o limite atual de "{2}" é insuficiente.</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>Argumento '{0}' está fora do intervalo.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>O SqlBulkCopy.WriteToServer falhou, pois o SqlBulkCopy.DestinationTableName é um nome composto inválido</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>Argumento '{0}' não pode ser nulo.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>O processamento de resultados do SQL Server falhou devido a um nome composto inválido</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>Argumento '{0}' contém valor nulo.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName é um nome composto inválido</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>Não é possível encontrar a coluna {0}.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>O SqlParameter.TypeName é um nome com várias partes inválido</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>A coluna '{0}' já pertence a esta DataTable.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>O SqlCommand.DeriveParameters falhou, pois o valor da propriedade SqlCommand.CommandText é um nome composto inválido</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>A coluna '{0}' já pertence a outra DataTable.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>Não há suporte para a conexão de uma instância espelhada do SQL Server usando a opção de conexão MultiSubnetFailover.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>Não é possível haver mais de uma coluna SimpleContent em uma DataTable.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>O método {2} não dá suporte ao valor de enumeração de {0}, {1}.</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>Não é possível adicionar uma coluna SimpleContent a uma tabela que contém colunas de elementos ou relações aninhadas.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>O Provedor de Dados .NET Framework para SqlClient não dá suporte ao valor de enumeração {0}, {1}.</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>Uma coluna chamada '{0}' já pertence a esta DataTable.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: propriedade CommandText não foi inicializada</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>Não é possível adicionar uma coluna chamada '{0}': uma tabela aninhada com o mesmo nome já pertence a esta DataTable.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: propriedade Connection não foi inicializada.</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>Uma coluna chamada '{0}' já pertence a esta DataTable: não é possível definir um nome de tabela aninhada como o mesmo nome.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} requer uma Connection aberta e disponível. {1}</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>Não é possível remover uma coluna que não pertence a esta tabela.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>O procedimento armazenado '{0}' não existe.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>Não é possível remover esta coluna porque ela é parte da chave primária.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>A transação não está associada à conexão atual ou já foi concluída.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>Não é possível remover esta coluna porque ela é parte da chave pai da relação {0}.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>A transação associada à conexão atual foi concluída, mas não foi descartada. A transação deve ser descartada antes do uso da conexão para executar as instruções SQL.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>Não é possível remover esta coluna porque ela é parte da restrição {0} na tabela {1}.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>{0} requer que o comando tenha uma transação quando a conexão atribuída ao comando estiver em uma transação local pendente. A propriedade Transaction do comando não foi inicializada.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>Não é possível remover esta coluna porque ela é parte de uma expressão: {0} = {1}.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>Já existe um DataReader aberto associado a este {0}, que precisa ser fechado primeiro.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>Não é possível definir a propriedade AutoIncrement para uma coluna calculada.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>{0} DeriveParameters só dá suporte para CommandType.StoredProcedure, e não para CommandType.{1}.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>Não é possível definir a propriedade AutoIncrement para uma coluna com DefaultValue definido.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>Não é possível definir DefaultValue em uma coluna AutoIncrement.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep deve ser um valor não nulo.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>ColumnName é necessário quando ele é parte de um DataTable.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>Não será possível alterar o DataType de uma coluna com dados.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>A coluna requer DataType válido.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>DefaultValue da coluna {0} é do tipo {1} e não pode ser convertido em {2}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>DefaultValue da coluna é do tipo {0} e não pode ser convertido em {1}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>DefaultValue da coluna {0} é do tipo {1}, mas a coluna é do tipo {2}.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>Não é possível alterar a propriedade ReadOnly para a coluna de expressões.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>Não é possível alterar a propriedade Unique da coluna de expressões.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>Não é possível criar uma expressão em uma coluna que tenha AutoIncrement ou Unique.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>Não é possível definir a expressão porque a coluna não pode se tornar ReadOnly.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>Não é possível definir a propriedade Expression na coluna {0} porque ela é parte de uma restrição.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>Não é possível criar uma restrição com base na coluna Expression {0}.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>Não é possível definir a propriedade Expression devido à referência circular na expressão.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>A coluna '{0}' tem valores nulls.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>Column '{0}' não permite valores nulls.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>Coluna '{0}' é somente leitura.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>A Column '{0}' contém valores não exclusivos.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>A coluna '{0}' não pertence à tabela {1}.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>A coluna deve pertencer a uma tabela.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>Não foi possível armazenar &lt;{0}&gt; na coluna {1}. O tipo esperado é {2}.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>Não é possível definir a Column '{0}' como null. Em seu lugar, use DBNull.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>Não é possível definir a coluna '{0}'. O valor viola o limite de MaxLength desta coluna.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength aplica-se apenas a tipo de dados de cadeia de caracteres. Não é possível definir a propriedade MaxLength da Column '{0}' como um número não negativo.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>Não é possível definir a propriedade MaxLength da Column '{0}' como '{1}'. Há pelo menos uma cadeia de caracteres da tabela maior do que o novo limite.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Não é possível definir a propriedade MaxLength da Column '{0}'. A Column é SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>Não é possível definir a propriedade DataType da Column '{0}' como {1}. A Column é SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>Não é possível definir a propriedade MappingType da Column '{0}' como SimpleContent. DataType de Column coluna é {1}.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>A Column '{0}' excede o limite de MaxLength.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>A coluna '{0}' não permite DBNull.Value.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>Não é possível alterar a propriedade Namespace da coluna '{0}'. Column é SimpleContent.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>Não é possível alterar AutoIncrement de um DataColumn com tipo '{0}' quando ele já tem dados.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>A coluna '{0}' não pertence à tabela '{1}' subjacente.</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>DataColumn com tipo '{0}' é um complexType. Não é possível serializar valor de tipo complexo como Attribute</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>DateTimeMode somente pode ser definido em DataColumns do tipo DateTime.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>'{0}' é um valor de DataSetDateTime inválido.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>Não é possível alterar DateTimeMode de '{0}' para '{1}' quando a tabela tem dados.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Type '{0}' não contém campo ou propriedade Null static.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>Tipo '{0}' não implementa IRevertibleChangeTracking; por isso não pode proceder com RejectChanges().</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>SetAdded e SetModified somente podem ser chamados em DataRows com Unchanged DataRowState.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>O ordinal ''{0}'' excede o número máximo.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet não dá suporte a System.Nullable&lt;&gt;.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>Não é possível trocar o nome de uma restrição por uma cadeia de caracteres vazia quando ela estiver na ConstraintCollection.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>Não é possível aplicar restrições na restrição {0}.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>A coluna '{0}' está restrita a conter valores exclusivos. O valor '{1}' já existe.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>A restrição '{0}' não pertence a esta DataTable.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>Não é possível encontrar a restrição {0}.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>Restrição corresponde à restrição chamada {0} que já existe na coleção.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>Uma Constraint nomeada '{0}' já pertence a esta DataTable.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>Estas colunas não têm valores exclusivos no momento.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>Estas colunas não apontam para esta tabela.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>Esta restrição não pode ser ativada porque nem todos os valores possuem valores pai correspondentes.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>Esta restrição não pode ser adicionada porque ForeignKey não pertence à tabela {0}.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>Não é possível remover uma restrição que não pertence a esta tabela.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>Não é possível remover restrição exclusiva '{0}'. Remova primeiro a restrição de chave estrangeira '{1}'.</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>Não é possível excluir esta linha porque as restrições são aplicadas na relação {0}. A exclusão desta linha deixará as linhas filho desamparadas.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>Não é possível fazer esta alteração porque as restrições são aplicadas na relação {0}. A alteração deste valor deixará as linhas filho desamparadas.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>Não é possível limpar a tabela {0} porque ForeignKeyConstraint {1} aplica restrições e existem linhas filho em {2}.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>ForeignKeyConstraint {0} exige que valores de chave filho ({1}) existam na tabela pai.</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>Propriedade não acessível porque '{0}'.</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>Não é possível remover esta linha porque ela possui linhas filho, e as restrições na relação {0} são aplicadas.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>Não é possível adicionar restrição de chave primária porque já foi definida uma chave primária para a tabela.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>Não é possível adicionar restrição a DataTable '{0}', que é tabela filha em duas relações aninhadas.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>Não é possível criar uma chave de colunas que pertençam a tabelas diferentes.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>Não é possível ter 0 coluna.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>Não é possível ter mais de {0} colunas.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>Não é possível criar uma chave quando a mesma coluna estiver listada mais de uma vez: '{0}'</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>Não é possível remover restrição exclusiva porque ela é a chave primária de uma tabela.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>Não é possível remover restrição exclusiva porque ela é a chave primária da tabela {0}.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>As colunas pai e filho não têm colunas de tipo correspondente.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey e ChildKey são idênticos.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns e ChildColumns devem ter o mesmo comprimento.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns e ChildColumns devem ter comprimento zero.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>A linha não pertence ao mesmo DataSet que esta relação.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>RelationName é necessário quando ele é parte de um DataSet.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows requer uma linha cuja Table seja {0}, mas a Table da linha especificada é {1}.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>Esta relação deve conectar duas tabelas neste DataSet a serem adicionadas a este DataSet.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRow requer uma linha da tabela {0}, mas a tabela da linha especificada é {1}.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow requer uma linha filho da tabela {0}, mas a tabela da linha especificada é {1}.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>Não é possível haver uma relação entre tabelas de DataSets diferentes.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>Não é possível criar uma relação entre tabelas de DataSets diferentes.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>Já existe uma relação para essas colunas filho.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>Esta relação não pertence a esta coleção de relações.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Esta relação já pertence a outro DataSet.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Esta relação já pertence a este DataSet.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>Este DataSet já possui uma Relation nomeada '{0}'.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>Relation {0} não pertence a este DataSet.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>Não é possível encontrar a relação {0}.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>Não é possível criar uma coleção em uma tabela null.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>A tabela cujas relações são exibidas nesta coleção foi removida de seu DataSet.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>Não é possível adicionar uma relação à coleção ParentRelation desta tabela, onde a tabela não é a tabela filho.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>Não é possível adicionar uma relação à coleção ChildRelation desta tabela, onde a tabela não é a tabela pai.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>Não é possível definir a propriedade 'Nested' como false para esta relação.</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>A mesma tabela '{0}' não pode ser tabela filha em duas relações aninhadas.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>A tabela ({0}) não pode ser a sua própria tabela filho em relações aninhadas.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>Não é possível adicionar DataRelation ou Constraint que têm configurações Locale ou CaseSensitive diferentes entre suas tabelas pai e filho.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>Não será possível criar DataRelation se a coluna Parent ou Child não estiver em DataSet.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>Tabela aninhada '{0}' com espaço para nome herdado não pode ter várias tabelas pais em espaços para nome diferentes.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>Tabela aninhada '{0}' com espaço para nome vazio não pode ter várias tabelas pais em espaços para nome diferentes.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>A linha não pertence ao mesmo DataSet que esta relação.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>Não é possível realizar esta operação em uma linha que não esteja na tabela.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>Esta relação e esta linha filho não pertencem ao mesmo DataSet.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>Não é possível alterar um valor proposto no evento RowChanging.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>Não é possível chamar EndEdit() dentro de um evento OnRowChanging.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>Não é possível chamar BeginEdit() dentro do evento RowChanging.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>Não é possível chamar CancelEdit() dentro de um evento OnRowChanging. Gere uma exception para cancelar esta atualização.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>Não é possível chamar Delete dentro de um evento OnRowDeleting. Gere uma exception para cancelar a exclusão.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>A matriz de entrada é maior do que o número de colunas desta tabela.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>Não existem dados atuais a serem acessados.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>Não existem dados originais a serem acessados.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>Não existem dados propostos a serem acessados.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>Esta linha foi removida de uma tabela e não possui dados. BeginEdit() permitirá a criação de dados novos nesta linha.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>Informações sobre a linha excluída não podem ser acessadas através da linha.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>A versão deve ser original, atual ou proposta.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>Não há linha na posição {0}.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>Ponto de inserção {0} da linha é inválido.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>Valor={0} de rowOrder foi encontrado duas vezes para a tabela chamada '{1}'.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>Faltam valores na sequência rowOrder da tabela '{0}'.</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>A DataRow especificada não está na DataRowCollection atual.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>Esta linha já pertence a outra tabela.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>Esta linha já pertence a esta tabela.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>Não é possível excluir esta linha porque ela já foi excluída.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>Esta linha está vazia.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>Não é possível remover uma linha que já foi removida.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>Uma linha filho tem várias linhas pai.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>Padrão de bits de estado de linha não reconhecido.</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>Não é possível alterar o nome do DataSet por uma cadeia de caracteres vazia.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>O nome '{0}' é inválido. Um DataSet não pode ter o mesmo nome da DataTable.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>O espaço para nome do esquema é inválido. Em seu lugar, use o seguinte: {0}.</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>Não é possível alterar a propriedade CaseSensitive ou Locale. Essa alteração levaria pelo menos uma DataRelation ou Constraint a ter configurações Locale ou CaseSensitive diferentes entre suas tabelas relacionadas.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>A propriedade SchemaSerializationMode somente pode ser definida se for substituída por DataSet derivado.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>Colunas PrimaryKey não pertencem a esta tabela.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>Não é possível adicionar uma relação aninhada ou uma coluna de elementos a uma tabela que contém uma coluna SimpleContent.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>TableName é necessário quando ele é parte de um DataSet.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable já tem uma coluna de conteúdo simples.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>Tabela não tem uma chave primária.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} não é uma entrada de cadeia de caracteres de Sort válida.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>Não é possível serializar a DataTable. Uma DataTable usada em uma ou mais expressões de DataColumn não descende de DataTable atual.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>Essa DataTable somente pode ser remota como parte de DataSet. Uma ou mais colunas de expressão fazem referência a outra DataTable(s).</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>Não é permitido valor de propriedade de formato remoto diferente para DataSet e DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>Não é possível serializar a DataTable. Nome de DataTable não definido.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>Uma DataTable chamada '{0}' já pertence a este DataSet.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>Este DataSet já possui uma DataTable nomeada '{0}' com o mesmo Namespace '{1}'.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>A tabela ({0}) não pode ser a tabela filho dela mesma em uma relação aninhada: o nome do DataSet está em conflito com o nome da tabela.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>O nome '{0}' é inválido. Uma DataTable não pode ter o mesmo nome do DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable já pertence a outro DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable já pertence a este DataSet.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>Tabela {0} não pertence a este DataSet.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>Não é possível encontrar a tabela {0}.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>Não é possível remover uma tabela que possui relações existentes. Remova as relações primeiro.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>Não é possível remover a tabela {0}, porque ForeignKeyConstraint {1} faz referência a ela. Remova a restrição primeiro.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>DataTable '{0}' não corresponde a qualquer DataTable na origem.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>DataSet de destino não tem definição para {0}.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>DataSet de destino inexistente {0} {1}.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} e &lt;source&gt;.{0} têm propriedades conflitantes: propriedade DataType incompatível.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey e &lt;source&gt;.PrimaryKey têm Length diferente.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>Colunas incompatíveis em PrimaryKey: &lt;target&gt;.{0} versus &lt;source&gt;.{1}.</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>A relação {0} não pode ser mesclada, pois as chaves têm colunas incompatíveis.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>Tabela de destino {0} não tem definição para a coluna {1}.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>Coluna PrimaryKey {0} não existe na tabela de origem.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>O parâmetro RowStates deve ser definido com uma combinação válida de valores da enumeração DataViewRowState.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Find encontra uma fila com base em uma ordem de classificação, mas nenhuma ordem de classificação foi especificada.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>Esperando {0} valor(es) para a chave que está sendo indexada, mas foi(foram) recebido(s) {1} valor(es).</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>Uso inválido da função de agregação {0}() e tipo: {1}.</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>Tipo de armazenamento inválido: {0}.</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>A persistência DataSet Xml não dá suporte para o valor '{0}' como valor Char. Em seu lugar, use armazenamento em Byte.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>Tipo de valor incompatível com tipo de coluna</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>Tipo '{0}' não implementa interface IComparable. Não é possível fazer comparação.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>Não é possível definir {0}.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>Não é possível alterar DataSet em um DataViewManager que já é o modo de exibição padrão de um DataSet.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter não pode mostrar ModifiedOriginals e ModifiedCurrents ao mesmo tempo.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>Não é possível alterar a propriedade Table em um DefaultView ou um DataView oriundo de um DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>Não é possível alterar a propriedade DataSet depois que ela é definida.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>DataSet deve ser definido antes de usar DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>Não é possível alterar a propriedade Table depois que ela é definida.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>DataTable deve ser definida antes de usar DataView.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>Não é possível associar a uma DataTable sem nome.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>Não é possível definir um objeto nesta lista.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>Não é possível chamar AddNew em um DataView em que AllowNew é false.</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView não está aberto.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>A relação não é pai da tabela para a qual este DataView aponta.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>Não é possível excluir em uma DataSource em que AllowDelete é false.</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>Não é possível editar em uma DataSource em que AllowEdit é false.</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>O índice {0} é negativo ou está acima da contagem de linhas.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>Não é possível adicionar objetos externos a esta lista.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>Não é possível limpar a lista.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>Não é possível inserir objetos externos na lista.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>Não é possível remover objetos que não estejam na lista.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} não é uma DataColumn nem uma DataRelation da tabela {1}.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>Min ({0}) deve ser menor ou igual ao max ({1}) em um objeto Range.</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>Este é um intervalo null.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>MinimumCapacity deve ser não negativo.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>Não é possível gerar identificador para o nome '{0}'.</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>Existe mais de uma tabela com o mesmo nome '{0}' (mesmo se o espaço para nome for diferente).</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>Coluna '{0}': tipo '{1}' não pode ser nulo.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>Coluna '{0}': tipo'{1}' não tem construtor sem parâmetros.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>Coluna '{0}': tipo '{1}' não tem construtor com argumento de cadeia de caracteres.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>Não é possível converter o objeto do tipo '{0}' em objeto do tipo '{1}'.</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>Linhas excluídas inacessíveis.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>Nome duplicado não permitido.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>Operação não tem suporte no evento RowChanging.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>Restrição inválida.</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>Chave primária ausente.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Null não permitido.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>Coluna marcada como somente leitura.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>Linha não localizada na tabela.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>Versão não encontrada.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>Dados ReadOnly modificados.</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader inválido para DataTable '{0}' atual.</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>Esquema de DataTable '{0}' atual em DataTableReader alterado, DataTableReader é inválido.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>DataTableReader não pode ser criado. Não há DataTable em DataSet.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>Não é possível criar DataTableReader. Argumento vazio.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>Não é possível criar DataTableReader. Argumentos contêm valor null.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>DataRow atual em estado Deleted ou Detached.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>DataTable '{0}' atual está vazia. Não há DataRow em DataTable.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>O índice interno DataTable está corrompido: '{0}'.</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>A coleção foi modificada. Talvez a operação de enumeração não seja executada.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>O tipo simples ''{0}'' já foi declarado com ''{1}'' diferente.</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>Foliação inválida.</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>Não será possível alterar o nome da tabela depois que o DataSet associado for mapeado para um documento XML carregado.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>Não será possível alterar o espaço para nome da tabela depois que o DataSet associado for mapeado para um documento XML carregado.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>Não será possível alterar o nome da coluna depois que o DataSet associado for mapeado para um documento XML carregado.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>Não será possível alterar o espaço para nome da coluna depois que o DataSet associado for mapeado para um documento XML carregado.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>Não será possível alterar a propriedade ColumnMapping depois que o DataSet associado for mapeado para um documento XML carregado.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>Não será possível adicionar ou remover colunas da tabela depois que o DataSet for mapeado para um documento XML carregado.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>Não será possível alterar o nome do DataSet depois que ele for mapeado para um documento XML carregado.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>Não será possível alterar o nome do DataSet depois que ele for mapeado para um documento XML carregado.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>O parâmetro DataSet é inválido. Ele não pode ser null.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>Não será possível alterar o nome do DataSet depois que ele for mapeado para um documento XML carregado.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>O tipo do nó não pode ser clonado: {0}.</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>Não é possível carregar XmlDataDocument caso ele já contenha dados. Use um novo XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>DataSet pode ser associado somente a um XmlDataDocument. Não é possível associar DataSet ao XmlDataDocument atual porque o DataSet já está associado a outro XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>Defina DataSet.EnforceConstraints == false antes de tentar editar XmlDataDocument usando operações XML.</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>Não há suporte para GetElementById() em DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>Não é possível criar referências de entidade em DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>A função Clear em DateSet e DataTable não oferece suporte em XmlDataDocument.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>Não é possível remover coluna porque ela é interna a este dataSet.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>Não é possível remover a relação porque ela é interna a esse conjunto de dados.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>Ocorre sempre que uma propriedade deste controle é alterada.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Ocorre sempre que os membros desta coleção são alterados.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>Não é possível obter o valor porque ele é DBNull.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>A propriedade '{0}' requer um sistema operacional com base em Microsoft WindowsNT ou em WindowsNT.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>Não foi possível localizar o Provedor de Dados .NET Framework solicitado. Talvez ele não esteja instalado.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>A implementação do Provedor de Dados .NET Framework solicitada não tem um campo de Instância de um tipo derivado de System.Data.Common.DbProviderFactory.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>Falha ao localizar ou carregar o Provedor de Dados .NET Framework registrado.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>O nome qualificado pelo assembly do Provedor de Dados .NET Framework ausente é obrigatório.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>Somente elementos permitidos.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>Não são permitidos nós filhos.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>Atributo '{0}' não reconhecido.</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>Elemento não reconhecido.</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>A seção '{0}' pode aparecer apenas uma vez por arquivo config.</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>Atributo '{0}' necessário não encontrado.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>O atributo solicitado '{0}' não pode ser vazio.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>Esperando matriz não vazia para o parâmetro '{0}'.</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>O único valor aceitável para a propriedade '{0}' é '{1}'.</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>Os valores aceitáveis para a propriedade '{0}' são '{1}' ou '{2}'.</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>Valores de QuotePrefix e QuoteSuffix especificados não coincidem.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>O comprimento do argumento '{0}' excede seu limite de '{1}'.</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>Esperado o tipo de argumento {1}, mas recebido o tipo {0}.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>Valor inválido para a chave '{0}'.</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>O uso da chave '{0}' requer a presença da chave '{1}'.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>O comprimento do valor para a chave '{0}' excede seu limite de '{1}'.</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>Palavra-chave não suportada: '{0}'.</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>Não é possível carregar o arquivo UDL.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>Arquivo UDL inválido.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>Erro interno do Provedor de Dados .NET Framework {0}.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>As propriedades QuotePrefix e QuoteSuffix não podem ser alteradas depois que um comando Insert, Update ou Delete é gerado.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>É necessário inicializar a propriedade DataAdapter.SelectCommand.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>É necessário inicializar a propriedade DataAdapter.SelectCommand.Connection;</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}".</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}", uso incorreto de aspas.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}", o limite atual de "{2}" é insuficiente.</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>O SqlBulkCopy.WriteToServer falhou, pois o SqlBulkCopy.DestinationTableName é um nome composto inválido</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>O processamento de resultados do SQL Server falhou devido a um nome composto inválido</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName é um nome composto inválido</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>O SqlParameter.TypeName é um nome com várias partes inválido</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>O SqlCommand.DeriveParameters falhou, pois o valor da propriedade SqlCommand.CommandText é um nome composto inválido</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>O OdbcCommandBuilder.DeriveParameters falhou, pois o valor da propriedade OdbcCommand.CommandText é um nome composto inválido</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>O OleDbCommandBuilder.DeriveParameters falhou, pois o valor da propriedade OleDbCommandBuilder.CommandText é um nome composto inválido</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>Não há suporte para a conexão de uma instância espelhada do SQL Server usando a opção de conexão MultiSubnetFailover.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>Falha no mapeamento de coluna de SourceColumn '{0}' porque DataColumn '{1}' é uma coluna calculada.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>Tipos não conversíveis incompatíveis entre SourceColumn '{0}' de {1} e DataColumn '{2}' de {3}.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>DataColumn '{0}' em DataTable '{1}' de SourceColumn '{2}' inexistente.</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>É necessário que SourceColumn seja uma cadeia de caracteres não vazia.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>Mapeamento de SourceColumn inexistente para '{0}'.</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>O método {2} não dá suporte ao valor de enumeração de {0}, {1}.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>O Provedor de Dados .NET Framework para ODBC não dá suporte ao valor de enumeração {0}, {1}.</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>O Provedor de Dados .NET Framework para OLEDB não dá suporte ao valor de enumeração {0}, {1}.</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>O Provedor de Dados .NET Framework para SqlClient não dá suporte ao valor de enumeração {0}, {1}.</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>Não foi possível recuperar ComputerNameDnsFullyQualified, {0}.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>DataTable '{0}' inexistente para SourceTable '{1}'.</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>É necessário que SourceTable seja uma cadeia de caracteres não vazia</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>Mapeamento de SourceTable inexistente: '{0}'</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: propriedade CommandText não foi inicializada</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: propriedade Connection não foi inicializada.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} requer uma Connection aberta e disponível. {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: Propriedade SelectCommand.Connection não foi inicializada.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: Propriedade SelectCommand.Connection não foi inicializada.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: Propriedade SelectCommand.Connection não foi inicializada.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>Atualização requer que InsertCommand tenha um objeto de conexão. A propriedade Connection de InsertCommand não foi inicializada.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>A atualização exige que UpdateCommand tenha um objeto de conexão. A propriedade Connection de UpdateCommand não foi inicializada.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>A atualização exige que DeleteCommand tenha um objeto de conexão. A propriedade Connection de DeleteCommand não foi inicializada.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>A atualização exige um objeto de conexão. A propriedade Connection não foi inicializada.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>A atualização exige que o clone de comando tenha um objeto de conexão. A propriedade Connection do clone de comando não foi inicializada.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>A atualização exige conexão.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Update exige que o {0}Command tenha um objeto de conexão aberta. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Update exige que o {0}Command tenha um objeto de conexão aberta. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Update exige que o {0}Command tenha um objeto de conexão aberta. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Update exige que o comando de atualização tenha um objeto de conexão aberta. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>O procedimento armazenado '{0}' não existe.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>A transação atribuída a este comando deve ser a transação local pendente mais aninhada.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>A transação não está associada à conexão atual ou já foi concluída.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>A transação associada à conexão atual foi concluída, mas não foi descartada. A transação deve ser descartada antes do uso da conexão para executar as instruções SQL.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>{0} requer que o comando tenha uma transação quando a conexão atribuída ao comando estiver em uma transação local pendente. A propriedade Transaction do comando não foi inicializada.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>Já existe um SqlResultSet aberto associado a este comando que deve ser fechado primeiro.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>Já existe um DataReader aberto associado a este {0}, que precisa ser fechado primeiro.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>{0} DeriveParameters só dá suporte para CommandType.StoredProcedure, e não para CommandType.{1}.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>O método '{0}' não pode ser chamado mais de uma vez para a mesma execução.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>Resultado de assinc incorreto.</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>A propriedade SelectCommand não foi inicializada antes de chamar '{0}'.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>StatementType {0} não é esperado aqui.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: era esperada uma cadeia de caracteres não vazia para o nome de SourceTable.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>O valor de MaxRecords de {0} é inválido; o valor deve ser &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>O valor de StartRecord de {0} é inválido; o valor deve ser &gt;= 0.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: era esperada uma cadeia de caracteres não vazia para o nome de SourceTable.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>Colunas de capítulo hierárquico devem mapear para AutoIncrement DataColumn.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) retornou null.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>Especifique apenas um item na matriz dataTables ao usar valores diferentes de zero para startRecords ou maxRecords.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Update não pode localizar TableMapping['{0}'] ou DataTable '{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update: era esperado um nome de SourceTable não vazio.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>TableMapping inexistente quando TableMapping.DataSetTable='{0}'.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Update exige um clone de comando válido.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>A geração SQL automática durante o Update requer um SelectCommand válido.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Update exige um InsertCommand válido para transmitir coleção DataRow com novas linhas.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>A atualização requer um UpdateCommand válido para transmitir coleção DataRow com linhas modificadas.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Update exige um DeleteCommand válido para transmitir coleção DataRow com linhas excluídas.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}] e DataRow[0] são de DataTable diferentes.</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: ocorreram erros; nenhuma informação adicional disponível.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: ocorreram erros; nenhuma informação adicional disponível.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>No loteamento, o valor de propriedade do comando UpdatedRowSource de UpdateRowSource.FirstReturnedRecord ou UpdateRowSource.Both é inválido.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>Violação de concorrência: UpdateCommand afetou {0} dos registros {1} esperados.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>Violação de concorrência: DeleteCommand afetou {0} dos registros {1} esperados.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>Violação de concorrência: o comando loteado afetou {0} dos {1} registros esperados.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>O método '{0}' não pode ser chamado mais de uma vez para a mesma execução.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>Valor {0} de CommandTimeout inválido; o valor deve ser &gt;= 0.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: a propriedade Size tem um tamanho inválido de 0.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>O método {0}.Prepare exige que todos os parâmetros tenham um tipo explicitamente definido.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>O método {0}.Prepare exige que todos os parâmetros de comprimento variável tenham um valor Size não nulo explicitamente definido.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>O método {0}.Prepare exige que parâmetros do tipo '{1}' tenham Precision e Scale explicitamente definidos.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>Chamada de método final para asyncResult incompatível. Era esperada camada de {0}, mas {1} foi chamado.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>Operação inválida. A conexão está fechada.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>A conexão foi desabilitada.</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>Não é possível se inscrever na transação, pois uma transação local está em andamento na conexão. Conclua a transação local e tente novamente.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>A conexão atualmente tem transação inscrita. Conclua a transação atual e tente novamente.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>Banco de dados não pode ser nulo, cadeia de caracteres vazia ou cadeia de caracteres contendo apenas espaços em branco.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>O argumento é muito longo.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Valor 'Connect Timeout' inválido; o valor deve ser um número inteiro &gt;= 0.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>Deslocamento de buffer de origem inválido (tamanho de {0}): {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>Deslocamento de buffer de destino inválido (tamanho de {0}): {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>Valor numérico muito grande para um decimal de 96 bits.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>Tentativa inválida de {0} quando o fluxo estava fechado.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>Valor de SeekOrigin especificado é inválido.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>Não há suporte para geração SQL dinâmica em várias tabelas base.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>Não há suporte para geração SQL dinâmica em SelectCommand que não retorna informações sobre uma tabela base.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>Não há suporte para geração SQL dinâmica para DeleteCommand em SelectCommand que não retorna informações importantes de coluna.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>Não há suporte para geração SQL dinâmica para UpdateCommand em SelectCommand que não retorne informações importantes de coluna.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>Não há suporte para geração SQL dinâmica para DeleteCommand em SelectCommand que não contenha uma coluna de versão de linha.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>Não há suporte para geração SQL dinâmica para UpdateCommand em SelectCommand que não contenha uma coluna de versão de linha.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>Não há suporte para geração SQL dinâmica em nomes de tabela '{0}' que contenham o caractere QuotePrefix ou QuoteSuffix '{1}'.</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>Tentativa inválida de leitura do ordinal de coluna '{0}'. Com CommandBehavior.SequentialAccess, só é possível ler do ordinal de coluna '{1}' ou maior.</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>Tipo de dados '{0}' não pode ser formatado como literal pois tem dígitos de data e hora inválidos.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>O valor não pode ser formatado como um literal do tipo requerido.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>Tipo de dados '{0}' não pode ser formatado como literal pois tem escalação máxima inválida.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>O valor literal fornecido não é um literal válido para o tipo de dados '{0}'.</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>'{0}':O comprimento do valor literal deve ser uniforme.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>'{0}':O valor literal deve ser uma cadeia de caracteres com dígitos hexadecimais</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>{0} requer conexão aberta quando o prefixo de aspas não tiver sido definido.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>Não é possível determinar os valores literais Boolean. Não é possível criar literais Boolean.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>Não há suporte para literais de tipo de dados nativo associados ao tipo de dados '{0}'.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>Tipo de dados de parâmetro de {0} é inválido.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>Não existe mapeamento do tipo de objeto {0} para um provedor gerenciado de tipo nativo.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>Não é possível tratar um TypeCode {0} desconhecido retornado pelo tipo {1}.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>Não existe mapeamento de DbType {0} para um {1} conhecido.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>A versão do SQL Server em uso não dá suporte ao tipo de dados '{0}'.</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>Valor de parâmetro '{0}' está fora do intervalo.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>Nome de parâmetro especificado '{0}' inválido.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>Não há suporte para vários parâmetros de valores de retorno.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>Valor '{0}' do parâmetro Size inválido. O valor deve ser maior ou igual a 0.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>Valor inválido para argumento '{0}'. O valor deve ser maior ou igual a 0.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>Valor inválido para este metadado.</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>Metadados devem ser SqlDbType.Row</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>Falha ao converter valor de parâmetro de {0} em {1}.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} não dá suporte para transações paralelas.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>Este {0} foi concluído; ele não pode mais ser usado.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>'{0}' não pode ser chamado quando o registro é somente leitura.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>'{0}' não pode ser chamado quando o DbDataRecord é somente leitura.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>Não há suporte para conversão implícita de tipo de objeto '{0}' para tipo de dados '{1}'.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>O valor de deslocamento de buffer '{1}' mais os bytes disponíveis '{0}' é maior que o tamanho passado no buffer.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>O comprimento de dados '{0}' é menor que 0.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>O comprimento especificado '{0}' está fora do intervalo.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>Tentativa de {2} inválida em dataIndex '{0}'. Com CommandBehavior.SequentialAccess, só é possível ler de dataIndex '{1}' ou maior.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>Deslocamento deve fazer referência a um local dentro do valor.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"O provedor gerenciado ODBC requer que a restrição TABLE_NAME seja especificada e não nula para a coleção de índices GetSchema.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>Valor de argumento inválido para o método '{0}'.</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>O provedor ODBC não retornou resultados de SQLGETTYPEINFO.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>Argumento DataTable null inesperado</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>Argumento DataSet null inesperado.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>Cadeia de conexão excede o comprimento máximo permitido de {0}.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} - não é possível mapear tipo.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>Tipo SQL desconhecido - {0}.</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>Tipo URT desconhecido - {0}.</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>Argumento negativo inválido!</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>Não é possível definir propriedade em uma conexão aberta.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>Não há mapeamento válido para uma SQL_TRANSACTION '{0}' para um valor de enumeração System.Data.IsolationLevel.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} - não é possível ativar pool de conexão...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} - não é possível alocar um identificador de ambiente.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} - não é possível obter o identificador do descritor.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>Fora de uma transação</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>Valor de enumeração OdbcType inválido={0}.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>Use o IsDBNull quando os dados DBNull.Value forem esperados.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} - nenhuma informação de erro disponível</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>A conexão está fechada.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>Uma conexão interna não tem um proprietário.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>O Provedor de Dados .NET Framework para ODBC exige os MDAC (Microsoft Data Access Components) versão 2.6 ou posterior. A versão {0} foi encontrada instalada no momento.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>O Provedor de Dados .NET Framework para OLEDB exige os MDAC (Microsoft Data Access Components) versão 2.6 ou posterior. A versão {0} foi encontrada instalada no momento.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>O provedor '{1}' não dá suporte para a interface '{0}'. GetOleDbSchemaTable não está disponível no provedor atual.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>'{0}' falhou sem nenhuma mensagem de erro disponível. Código do resultado: {1}.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>Nenhuma mensagem de erro disponível, código de resultado: {0}.</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>Os Provedores de Dados .NET Framework exigem os MDAC (Microsoft Data Access Components). Instale os MDAC (Microsoft Data Access Components) versão 2.6 ou posterior.</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>O Provedor de Dados .NET Framework para OLEDB (Microsoft.Data.OleDb) não dá suporte ao MSDASQL (Provedor OLE DB da Microsoft para Drivers ODBC). Use o Provedor de Dados .NET Framework para ODBC (System.Data.Odbc).</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>O Provedor de Dados .NET Framework para OLEDB não permitirá que o Provedor OLE DB faça solicitações ao usuário em um ambiente não interativo.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>O provedor '{0}' não está registrado na máquina local.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>O provedor '{0}' não dá suporte para a interface ICommandText. Em seu lugar, use CommandType.TableDirect.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>O provedor '{0}' não dá suporte para a interface ITransactionLocal. Transações locais não disponíveis com o provedor atual.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>Formato da cadeia de inicialização não está de acordo com a especificação de OLE DB. Iniciando próximo ao char[{0}] na cadeia de conexão.</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>Não há suporte para o recurso 'Processamento Assíncrono' do Provedor de Dados .NET Framework para OLE DB (Microsoft.Data.OleDb).</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>Provedor OLE DB não foi especificado em ConnectionString. Por exemplo, 'Provider=SQLOLEDB;'.</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>O provedor OLE DB especificado em ConnectionString é muito longo.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>Não são esperadas restrições para o DbInfoKeywords OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>Não são esperadas restrições para DbInfoLiterals OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>Não são esperadas restrições para o guid de esquemas OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>O provedor '{1}' não dá suporte para o esquema {0} OleDbSchemaGuid.</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>A definição de configuração '{0}' tem o número errado de valores.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>Não é possível carregar o arquivo XML especificado na definição de configuração '{0}'.</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>Parâmetro de comando [{0}] '{1}' inválido.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>Valor dos dados do parâmetro de comando [{0}] '{1}' não pôde ser convertido por razões diferentes de sinais incompatíveis ou estouro de dados.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>Falha na conversão do parâmetro de comando [{0}] '{1}' porque o valor dos dados tinha sinal e o tipo usado pelo provedor era sem sinal.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>Falha na conversão do parâmetro de comando [{0}] '{1}' porque o valor dos dados estourou o tipo usado pelo provedor.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>O provedor encontrou um erro ao enviar valor do parâmetro de comando [{0}] '{1}' e interrompeu o processamento.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>Parâmetro [{0}] '{1}' não tem valor padrão.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>Erro com o parâmetro[{0}]: {1}.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Erro interno do Microsoft.Data.OleDb.OleDbDataAdapter: acessador de parâmetro inválido: {0} {1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter[{0}]: a propriedade OleDbType não foi inicializada: OleDbType.{1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>O provedor '{0}' não dá suporte para a interface ICommandWithParameters. O provedor atual não dá suporte para os parâmetros de comando.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>O provedor '{0}' não dá suporte para recuperação de informações sobre parâmetro de procedimento.</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>Não é possível determinar o separador decimal do servidor. Não é possível criar literais numéricos não inteiros.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>Objeto não é um ADODB.RecordSet ou um ADODB.Record.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>Não é possível recuperar a interface '{0}' do objeto ADODB.RecordSet.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: a propriedade Size tem um tamanho inválido de 0.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>Não é possível recuperar a interface IRow do objeto ADODB.Record.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>O método {0}.Prepare exige que todos os parâmetros tenham um tipo explicitamente definido.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>O tipo não dá suporte para o ISourcesRowset da interface OLE DB</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>O método {0}.Prepare exige que todos os parâmetros de comprimento variável tenham um valor Size não nulo explicitamente definido.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>Não é possível construir a coleção de esquemas ReservedWords, pois o servidor não dá suporte para IDBInfo.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>O método {0}.Prepare exige que parâmetros do tipo '{1}' tenham Precision e Scale explicitamente definidos.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>O valor da propriedade não foi definido porque o provedor não dá suporte à propriedade '{0}', ou o consumidor tentou obter ou definir valores de propriedades fora do grupo de propriedades Initialization e o objeto de fonte de dados não foi inicializado.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>Chamada de método final para asyncResult incompatível. Era esperada camada de {0}, mas {1} foi chamado.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>Falha ao inicializar a propriedade '{0}' por uma das seguintes razões:
-	O tipo de dados de valor não é o tipo de dados da propriedade ou não é nulo. Por exemplo, a propriedade é DBPROP_MEMORYUSAGE, cujo tipo de dados é Int32, e o tipo de dados é Int64.
-	O valor é inválido. Por exemplo, a propriedade é DBPROP_MEMORYUSAGE e o valor é negativo.
-	O valor é válido para a propriedade e o provedor dá suporte à propriedade como propriedade que pode ser definida, mas ele não dá suporte ao valor especificado. Isso inclui o caso em que o valor foi adicionado à propriedade em OLE DB após o provedor ter sido gravado.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>Operação inválida. A conexão está fechada.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>O valor Options era inválido.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>Não é possível se inscrever na transação, pois uma transação local está em andamento na conexão. Conclua a transação local e tente novamente.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>O elemento ColumnID não era válido.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>A conexão atualmente tem transação inscrita. Conclua a transação atual e tente novamente.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>Uma propriedade '{0}' foi especificada para ser aplicada a todas as colunas, mas pode ser que isso não ocorra a uma ou mais delas.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>Banco de dados não pode ser nulo, cadeia de caracteres vazia ou cadeia de caracteres contendo apenas espaços em branco.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>A propriedade '{0}' é somente leitura ou o consumidor tentou definir valores de propriedades no grupo da propriedade Initialization após a inicialização do objeto de fonte de dados. Consumidores podem definir o valor de uma propriedade somente leitura para o valor atual. Esse status será retornado também se uma propriedade de coluna não puder ser definida para a coluna particular.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>Deslocamento de buffer de origem inválido (tamanho de {0}): {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>O valor da propriedade '{0}' opcional não foi definido para o valor especificado e a configuração da propriedade para o valor especificado não foi possível.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>Deslocamento de buffer de destino inválido (tamanho de {0}): {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>O valor da propriedade '{0}' não foi definido pois isso geraria conflito com uma propriedade existente.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>Tentativa inválida de {0} quando o fluxo estava fechado.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(Reservado).</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>Valor de SeekOrigin especificado é inválido.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>O provedor retornou um valor DBPROPSTATUS_ desconhecido '{0}'.</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>Tentativa inválida de leitura do ordinal de coluna '{0}'. Com CommandBehavior.SequentialAccess, só é possível ler do ordinal de coluna '{1}' ou maior.</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>Validação do acessador foi adiada e executada enquanto o método retornava dados. Associação inválida para esta coluna ou este parâmetro.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>Tipo de dados de parâmetro de {0} é inválido.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>Erro interno de OleDbDataAdapter: acessador de definição de linha inválido: Ordinal={0} Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>Não existe mapeamento do tipo de objeto {0} para um provedor gerenciado de tipo nativo.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>O valor dos dados não pôde ser convertido por razões diferentes de sinais incompatíveis ou estouro de dados. Por exemplo, os dados estavam corrompidos no repositório de dados, mas a linha ainda era recuperável.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>Não é possível tratar um TypeCode {0} desconhecido retornado pelo tipo {1}.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>O provedor não pôde alocar memória para retornar dados {0}.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>Não existe mapeamento de DbType {0} para um {1} conhecido.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>Falha na conversão porque o valor de dados {0} estourou o tipo especificado para a parte de valor {0} no buffer do consumidor.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>A versão do SQL Server em uso não dá suporte ao tipo de dados '{0}'.</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>Erro interno de OleDbDataAdapter: [get] tipo de dados OLE DB desconhecido: 0x{0} ({1}).</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>Valor de parâmetro '{0}' está fora do intervalo.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>Falha na conversão porque o valor dos dados {0} tinha sinal e o tipo especificado para a parte de valor {0} no buffer do consumidor era sem sinal.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>Nome de parâmetro especificado '{0}' inválido.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>Erro interno de OleDbDataAdapter: [set] Tipo de dados OLE DB desconhecido: 0x{0} ({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>Valor '{0}' do parâmetro Size inválido. O valor deve ser maior ou igual a 0.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>O provedor não pôde determinar o valor {0}. Por exemplo, a linha acabou de ser criada, o padrão para a coluna {0} não estava disponível, e o consumido ainda não definiu um novo valor {0}.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>Valor inválido para argumento '{0}'. O valor deve ser maior ou igual a 0.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>Provedor OLE DB retornou um valor de status inesperado de {0}.</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>Valor inválido para este metadado.</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>O OleDbDataReader.Read deve ser usado a partir do mesmo thread em que foi criado caso ApartmentState desse thread não seja ApartmentState.MTA.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>Falha ao converter valor de parâmetro de {0} em {1}.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>Erro não especificado: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} não dá suporte para transações paralelas.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>Falha de IErrorInfo.GetDescription com {0}.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>Este {0} foi concluído; ele não pode mais ser usado.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>Falha de IErrorInfo.GetSource com {0}.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>O comprimento especificado '{0}' está fora do intervalo.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>Não há suporte para os dados DBTYPE_VECTOR no Provedor de Dados .NET Framework para OLE DB (Microsoft.Data.OleDb).</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>Tentativa de {2} inválida em dataIndex '{0}'. Com CommandBehavior.SequentialAccess, só é possível ler de dataIndex '{1}' ou maior.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>Valores inválidos de tamanho mínimo e máximo de pool. O tamanho mínimo do pool não pode ser maior do que o tamanho máximo do pool.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>Palavra-chave '{0}' obsoleta. Em seu lugar, use '{1}'.</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>Não é possível obter o endereço do coordenador de transações distribuídas para o servidor, a partir do servidor. O DTC está habilitado no servidor?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>O comprimento do valor do parâmetro de conexão &lt;{0}&gt; excede o máximo permitido de 65535 caracteres.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>'Packet Size' inválido. O valor deve ser um inteiro &gt;= 512 e &lt;= 32768.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>Transação inválida ou nome inválido de um ponto da transação para executar salvamento.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>O SQL Server 7.0 ou SQL Server 2000 não dá suporte para o valor de enumeração {0}, {1}.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>User Instance e Failover não são opções compatíveis. Escolha apenas uma das duas cadeias de conexão.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>Não é possível definir a propriedade Credential quando 'Authentication=Active Directory Integrated' está especificado na cadeia de conexão.</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>Parâmetros de autenticação incorretos especificados com a autenticação de certificado.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>A instância do SQL Server à qual você tentou se conectar requer criptografia, porém não há suporte para isso neste computador.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>A instância do SQL Server à qual você tentou se conectar não dá suporte para criptografia.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>A instância do SQL Server à qual você tentou se conectar não dá suporte ao CTAIP.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>Versão do SQL Server sem suporte. O Provedor de Dados .NET Framework para SqlClient pode ser usado somente com as versões 7.0 e posteriores do SQL Server.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>{0} não pode ser alterado enquanto a operação async está em andamento.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>Este comando requer uma conexão assíncrona. Defina "Asynchronous Processing=true" na cadeia de conexão.</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>A tentativa de conexão atingiu o tempo limite.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>Tempo limite expirado. Como resultado a conexão foi quebrada.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>Falha da instância.</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>Código de erro 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword requer SQL Server 9.0 ou posterior.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>Não há suporte para redirecionamento da Instância SSE para instâncias de usuários que não sejam locais.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>A autenticação '{0}' não tem suporte.</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>Não há suporte para o método de autenticação SQL '{0}'.</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>Falha ao criar uma instância de um provedor de autenticação com o tipo '{1}' para '{0}'.</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>Falha ao criar um SqlAuthenticationInitializer com o tipo '{0}'.</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>O provedor '{0}' gerou uma exceção ao inicializar.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>O provedor '{0}' não dá suporte à autenticação '{1}'.</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Não é possível localizar um provedor de autenticação para '{0}'. Instale o pacote NuGet 'Microsoft.Data.SqlClient.Extensions.Azure' (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) para usar métodos de autenticação do Active Directory (Entra ID).</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>Falha ao ler a seção de configuração para os provedores de autenticação.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>O parâmetro '{0}' não pode ser nulo ou vazio.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>A operação assíncrona já foi concluída.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>A execução do comando não pode prosseguir devido a uma operação assíncrona pendente que já está em andamento.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>Comando inválido enviado a ExecuteXmlReader. O comando deve retornar um resultado Xml.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>Notificações requerem SQL Server 9.0 ou posterior.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>Formato de nome em 3 partes inválido para UdtTypeName.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>Não é possível inicializar pacote SSPI.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Timeout expirado. O timeout esgotou antes da conclusão da operação ou o servidor não está respondendo.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>Tempo Limite de Conexão Expirado.  O tempo limite decorrido no início da fase pré-logon. Talvez isso ocorra devido ao tempo insuficiente especificado como tempo limite de conexão.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>Uma instância do usuário foi solicitada na cadeia de conexão, mas o servidor especificado não oferece suporte para esta opção.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>Falha na validação do certificado do servidor no aplicativo.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>O comprimento dos dados especificados {0} excede o comprimento máximo de {1}.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>Tentativa inválida durante a leitura quando não há dados presentes.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>O comprimento de dados '{0}' é menor que 0.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>'{0}' não pode ser chamado quando o SqlDataRecord é somente leitura.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>A coleção mapeada está sendo usada e não pode ser acessada desta vez;</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>Não há suporte para a conexão de contexto usando Microsoft.Data.SqlClient.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>Não há suporte para TransactionScopes aninhados.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>Evento de servidor inesperado: {0}.</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>O comprimento de '{0}' deve corresponder ao comprimento de '{1}'.</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>A SqlDbType '{0}' é inválida para {1}. Há suporte apenas para {2}.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>Excesso de valores.</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>O Stream não dá suporte para gravação.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>Nulo</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>Mensagem</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>Estouro Aritmético.</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>Erro de divisão por zero.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>Dados são Null. Não é possível chamar este método ou esta propriedade em valores Null.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>Aritmética numérica causa truncamento.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>Estouro de SqlDateTime. Deve estar entre 1/1/1753 12:00:00 AM e 31/12/9999 11:59:59 PM.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>Duas cadeias de caracteres a serem concatenadas têm intercalação diferente.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>Duas cadeias de caracteres a serem comparadas têm intercalação diferente.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>Valor de sinalizador inválido.</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>Estouro na conversão de SqlDecimal em Decimal.</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>Estouros de conversão.</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>SqlDateTime inválido.</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>Um fuso horário foi especificado. SqlDateTime não oferece suporte a fusos horários.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>Tamanho de matriz inválido.</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>Precisão ou escala numérica inválida.</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>A entrada não estava em um formato correto.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>Erro de SqlType.</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>SqlBytes e SqlChars não oferecem suporte a mais de 2GB nesta versão.</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>Erro durante a leitura.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>O Stream foi fechado ou descartado.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>Não há buffer. Falha na operação de leitura ou gravação.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>Não é possível definir o tamanho como não nulo, pois o valor atual é Null.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>Buffer insuficiente. Falha na operação de leitura ou gravação.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>Não é possível gravar em deslocamento não nulo, pois o valor atual é Null.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>Não é possível gravar um deslocamento que seja maior que o tamanho atual. Dados não inicializados seriam deixados no buffer.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>O volume dos dados retornados são maiores do que 2Gb. Use SequentialAccess command behavior para obter todos os dados.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>O argumento para GetDayOfWeek deve ser um número inteiro entre 1 e 7.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>SQL Type não foi carregado com dados.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>SQL Type já foi carregado com dados.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>Tentativa inválida de acessar um XmlReader fechado.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>Tentativa inválida de chamar {0} quando o fluxo está fechado.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>Tentativa inválida de chamar {0} quando o fluxo não pode ser gravado.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>Tentativa inválida de chamar {0} quando o fluxo está ilegível.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>Tentativa inválida de chamar {0} quando o fluxo não pode ser buscado.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>A subclasse não substituiu um método necessário.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>Não é possível criar o normalizador para '{0}'.</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>Erro Interno</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>O parâmetro de comando deve ter um texto de comando não nulo e não vazio.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>A matriz do parâmetro MetaData deve ter o comprimento equivalente ao argumento da matriz ParameterDirection.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>Erro de mapeamento do adaptador de dados.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>Erro de adaptador de dados.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>Violação de concorrência DB.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>Operação anulada.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>Operação anulada devido a uma exceção (consulte InnerException para obter detalhes).</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Se Fill chamará ou não DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Se Update chamará ou não DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Indica se deve ou não continuar com a DataRow seguinte quando o Status dos eventos Update (RowUpdating e RowUpdated) for UpdateStatus.ErrorsOccurred.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>Como o adaptador preenche DataTable de DataReader.</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>A ação tomada quando uma tabela ou coluna de TableMappings estiver ausente.</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>A ação tomada quando uma tabela ou coluna de DataSet estiver ausente.</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>Como mapear a tabela de origem para a tabela de DataSet.</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Evento disparado quando um erro recuperável ocorre durante Fill.</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Caso Fill retorne valores específicos do provedor ou valores de CLSCompliant comuns.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>Nome da coluna de origem - diferencia maiúsculas de minúsculas.</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>Número de itens na coleção</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>O objeto DataColumnMapping especificado.</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>Mapeamento de colunas individuais quando há correspondência do mapeamento da coluna.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>O nome da tabela de origem DataTableMapping. Este nome diferencia maiúsculas e minúsculas.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>Número de itens na coleção</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>O objeto DataTableMapping especificado</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>Usado durante a atualização de linhas excluídas no DataSet.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Evento disparado depois de cada DataRow durante a atualização.</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>Número de linhas a serem juntadas em lote antes da execução na fonte de dados.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Conexão usada em Select/Insert/Update/DeleteCommands ainda não tem uma conexão.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>Usado durante Update de linhas excluídas no DataTable.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>Usado durante Update de novas linhas no DataTable.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Usado durante Fill.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>Usado durante Update de linhas modificadas no DataTable.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Caso Fill retorne valores específicos do provedor ou valores de CLSCompliant comuns.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>Como mapear a tabela de origem para DataTable.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>Como os comandos Insert/Update/DeleteCommands são gerados quando o usuário não os define.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>Número de linhas a serem juntadas em lote antes da execução na fonte de dados.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>A cadeia de conexão usada para conectar à Data Source.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>O nome do driver ODBC a ser usado na conexão com o Data Source.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>O DSN usado para conectar ao Data Source.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>Se for true, indica que pool de conexão gerenciado deve ser usado.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>O arquivo UDL usado para conectar ao Data Source.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>Especifica que OLE DB Services deve ser habilitado ou desabilitado com o OleDb Provider.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>O nome do Provedor OLE DB a ser usado na conexão com o Data Source.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>O nome do aplicativo.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>Quando é true, permite o uso da funcionalidade Assíncrona no Provedor de Dados .NET Framework.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>O nome do arquivo primário, incluindo o nome do caminho completo, de um banco de dados anexável.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>Se for true, indica que o estado da conexão foi redefinido ao ser removido do pool.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>Se for true, indica que a conexão deve ser do contexto do Sql Server. Disponível somente durante execução no processo do Sql Server.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>O nome de registro do SQL Server Language.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>Especifica o método de autenticação no SQL Server.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>Certificado do cliente especificado para autenticação no SQL Server.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>Informações usadas para conectar a uma Fonte de Dados.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Valor atual de tempo limite da conexão não pode ser definido em ConnectionString.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>Valor de catálogo da fonte de dados atual, 'Database=X' na cadeia de conexão.</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>Fonte de dados atual, 'Server=X' na cadeia de conexão.</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>Driver ODBC atual.</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>Versão do produto acessado pelo driver ODBC.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>Informações usadas para conectar a uma Fonte de Dados.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Valor de tempo limite da conexão atual, 'Connect Timeout=X' em ConnectionString.</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>Valor de catálogo da fonte de dados atual, 'Initial Catalog=X' na cadeia de conexão.</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>Fonte de dados atual, 'Data Source=X' na cadeia de conexão.</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>ProgID do provedor OLE DB atual, 'Provider=X' na cadeia de conexão.</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>Versão do produto acessado pelo provedor OLE DB.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>Token de acesso para usar para autenticação.</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>Estado de conexão, síncrono ou assíncrono. ' Asynchronous Processing=x ' na cadeia de conexão.</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>Informações usadas para estabelecer conexão para replicação.</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>Informações usadas para conectar-se a DataSource, como 'Data Source=x;Initial Catalog=x;Integrated Security=SSPI'.</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>Colete estatística para esta conexão.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>Provedores de armazenamento de chaves de criptografia de coluna personalizada.</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>Uma guid para representar a conexão física.</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Inscrição automática em notificações usadas pelo Microsoft SQL Server.</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>Como a cláusula where é gerada automaticamente para os comandos Update e Delete quando não especificada pelo usuário.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>Indica a posição do nome do catálogo em um nome de tabela qualificado em um comando de texto.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>O caractere que separa o nome do catálogo do resto do identificador em um comando de texto.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>O caractere que separa o nome do esquema do resto do identificador em um comando de texto.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Cadeia de caracteres de prefixo encapsulada com objetos sql.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Cadeia de caracteres de sufixo encapsulada com objetos sql.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>O DataAdapter para o qual gerar comandos automaticamente.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>Use esquema de DataTable ou SelectCommand.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>Como a cláusula set é gerada automaticamente para o comando Update quando não especificada pelo usuário.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>O DataAdapter para o qual OdbcCommands serão gerados automaticamente</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>O caractere usado em um comando de texto como aspas de abertura para delimitar identificadores que contêm caracteres especiais.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>O caractere usado em um comando de texto como aspas de fechamento para delimitar identificadores que contêm caracteres especiais.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>O DataAdapter para o qual OleDbCommands serão gerados automaticamente</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Separador decimal usado em literais numéricos.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Cadeia de caracteres de prefixo encapsulada com objetos sql</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Cadeia de caracteres de sufixo encapsulada com objetos sql</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>O DataAdapter para o qual SqlCommands serão gerados automaticamente</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Separador decimal usado em literais numéricos.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>O caractere usado em um comando de texto como aspas de abertura para delimitar identificadores que contêm caracteres especiais.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>O caractere usado em um comando de texto como aspas de fechamento para delimitar identificadores que contêm caracteres especiais.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>É necessário definir parâmetros numéricos e decimais somente ao usar cenários Prepare, FillSchema e CommandBuilder.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>É necessário definir parâmetros numéricos e decimais somente ao usar cenários Prepare, FillSchema e CommandBuilder.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>Tipo nativo do parâmetro.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>Tipo nativo do parâmetro.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>Nome do parâmetro, como '@p1'</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>Tipo nativo do parâmetro.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>O nome do servidor para o tipo.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>Deslocamento em tipos de dados de comprimento variável.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>O ParameterDirection '{0}' especificado para o parâmetro '{1}' não tem suporte. Os Table-valued parameters somente têm suporte para ParameterDirection.Input.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>O TypeName especificado para o parâmetro '{0}'. O TypeName deve ser estabelecido apenas por parâmetros Structured.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>O tipo SqlDbType.Structured só tem suporte para tipos de valores variados.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>A coluna DateType para o campo '{0}' na tabela do esquema é nula. A DataType não deve ser null.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>O número de campos no registro '{0}' não corresponde ao número do registro original.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>intervalo: 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>erro inesperado no provedor de dados SqlClient. {0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>Não é possível obter Type Info de {0},{1}</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>Falha do provedor ao carregar o seguinte assembly: {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>A propriedade UdtTypeName deve ser definida como parâmetros UDT.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>O tipo especificado não está registrado no servidor de destino.{0}.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>Os parâmetros UDT não são permitidos na cláusula where, a menos que façam parte da chave primária.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>'{0}' é um tipo definido pelo usuário inválido. Motivo: {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>oferece suporte a formatos de memória e definidos pelo usuário</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>Não há suporte para formato nativo.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>não implementa IBinarySerialize</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>não pode ser serializado</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>nenhum construtor público</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>não implementa INullable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>não tem um construtor público</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>nenhum atributo UDT</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>Ainda não há suporte para serialização sem mapeamento.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>O método 'public static x Parse(System.Data.SqlTypes.SqlString)' é inexistente</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>O método 'public override string ToString()' é inexistente</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>O método 'public static x Null { get; }' é inexistente</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>O formato nativo não oferece suporte a campos (diretamente ou por meio de outro campo) de tipo '{0}'</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>O tipo não é público</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>A Native UDT não apresenta layout sequencial devido ao tipo '{0}'</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>A Native UDT especifica o tamanho máximo de byte</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>o campo '{0}' está marcado como não serializado</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>O tipo de campo ''{0}'' está marcado como layout explícito, o que não é permitido no formato Nativo</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>Referências de assembly com valores múltiplos devem ter uma identificação de Assembly diferente de zero.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>Tipos Estruturados ou de valores múltiplos somente podem ser usados para parâmetros e não podem ser aninhados dentro de outro tipo.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>O nome do caminho não é válido.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>Falha ao tentar promover transação.</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>Objeto de dependência usado para receber notificações de consulta.</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>Propriedade para indicar se essa dependência é inválida.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>Para adicionar um comando a um objeto de dependência existente.</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>O Command já está associado a outro objeto de dependência. Não é possível substituir.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>Esse objeto SqlCommand já está associado a outro objeto SqlDependency.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>O Timeout especificado é inválido. O tempo limite não pode ser &lt; 0.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>Erro de Notificação. Tipo={0}, Informações={1}, Origem={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData não é válido para esse SqlDbType.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>O dbType {0} é inválido para esse construtor.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>Erro interno. O valor de texto sem formatação não pode ser nulo.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>Não é possível criptografar. A criptografia resultou em {0} bytes de texto cifrado que excedem o limite máximo permitido de {1} bytes. O valor especificado em texto sem formatação provavelmente é muito grande (tamanho de texto sem formatação é: {2} bytes).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>Erro interno. O valor do texto sem formatação não pode ser nulo.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>As informações de atestado não foram retornadas pelo SQL Server. O tipo de enclave é '{0}' e a URL do atestado de enclave é '{1}'.</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>Não é possível estabelecer um canal seguro. Mensagem de Erro: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>Erro Interno. Argumento {0} nulo especificado ao construir um objeto do tipo '{1}'. '{0}' não pode ser nulo.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Especifica um ponto de extremidade de um serviço de atestação de enclave, que será usado para verificar se o enclave, configurado na instância do SQL Server para cálculos em colunas de banco de dados criptografados usando Always Encrypted, é válido e seguro.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>Falha ao ler a seção de configuração para provedores de enclave. Verifique se que a seção está formatada corretamente no seu arquivo de configuração de aplicativo. Mensagem de Erro: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>Falha ao criar uma instância de um provedor de enclave com tipo '{1}' para o nome '{0}'. Mensagem de erro: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>Erro Interno. SqlColumnEncryptionEnclaveProviderName não pode ser nulo ou vazio.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>Erro ao ler o conjunto de regras '{0}'. A URL de Atestado não foi especificada na cadeia de conexão, mas a consulta exige computações de enclave. O tipo de enclave é '{1}'. </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>Erro Interno. O tipo de enclave recebido do SQL Server é nulo ou vazio ao executar uma consulta que requer cálculos de enclave.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>Executar uma consulta requer cálculos de enclave, mas na configuração do aplicativo está faltando a seção de provedor de enclave.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>Não foi encontrado nenhum provedor de enclave para o tipo enclave '{0}' e o protocolo de atestado '{1}'. Especifique o protocolo de atestado correto na cadeia de conexão. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>Configuração de criptografia de coluna padrão para todos os comandos na conexão.</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>Força a criptografia do parâmetro antes do envio de dados sensíveis ao servidor. </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>Objeto de dicionário contendo nomes SQL Server e seus caminhos confiáveis de chave mestra da coluna.</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>Não há suporte para a operação conectar com uma instância espelhada do SQL Server usando ApplicationIntent ReadOnly.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>Informações de roteamento inesperadas recebidas.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>Informações de roteamento inválidas recebidas.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>Autenticação sem suporte especificada neste contexto: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>A autenticação Interativa do Active Directory atingiu o tempo limite. O usuário demorou muito tempo para responder à solicitação de autenticação.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>Não é possível usar 'Authentication=Active Directory Interactive' quando a propriedade Credential está configurada.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>SPID (ID do Processo do Servidor) da conexão ativa.</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>A autenticação de Fluxo de Código de Dispositivo do Active Directory atingiu o tempo limite. O usuário demorou muito tempo para responder à solicitação de autenticação.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>Não é possível definir a propriedade Credential quando 'Authentication=Active Directory Device Code Flow' está especificado na cadeia de conexão.</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>A ação solicitada oferece suporte somente a matrizes dimensionais simples.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>Não é possível remover o item especificado porque ele não foi encontrado na Coleção especificada.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>É necessário um número não negativo.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Não é possível definir a propriedade AccessTokenCallback se 'Authentication=Active Directory Default' tiver sido especificado na cadeia de conexão.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} retornou {1}.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>Erro de protocolo: Uma mensagem recebida contém uma assinatura válida, mas não foi criptografada conforme exigido pelo Nível de Proteção efetivo.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>{0} falhou com erro {1}.</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>Este método não foi implementado por esta classe.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>O pacote de segurança solicitado não é suportado.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>Tipo de PhysicalConnection incorreto.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>Ocorreu uma exceção ao tentar definir o AppContext Switch '{0}'={1}.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>O tipo {0} não é suportado nesta plataforma.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>O modo invariante de globalização não é suportado.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Não é possível autenticar usando Kerberos. Certifique-se de que o Kerberos foi inicializado no cliente com 'kinit' e um nome principal de serviço foi registrado para o SQL Server para permitir a autenticação do Kerberos.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>A palavra-chave 'Biblioteca de Rede' não é suportada nesta plataforma, prefixe a 'Fonte de Dados' com o protocolo desejado ('tcp:' para uma conexão TCP ou 'np:' para uma conexão de Canal Nomeado).</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>O soquete não lançou o esperado '{0}' com código de erro '{1}'.</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>O servidor está tentando usar um recurso que não é suportado nesta plataforma.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>A palavra-chave '{0}' não é suportada nesta plataforma.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>O System.Transactions.dll atualmente carregado não oferece suporte a transações globais.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>Recebeu um token não suportado '{0}' ao ler dados do servidor.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>'{0}' não é um tipo de identificador com suporte.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream não tem suporte nesta plataforma.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>LocalDB não é suportado nesta plataforma.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>Espaço de buffer insuficiente. Obrigatório: {0} Real: {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>Falha na operação GSSAPI com status: {0} (status secundário: {1}).</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>A operação GSSAPI falhou com erro - {0} ({1}).</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>Não há suporte para vinculação de canal em sistemas operacionais diferentes do Windows.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>O nome de destino não deve estar vazio se as credenciais padrão forem passadas.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>O nível de proteção solicitado não é compatível com a implementação GSSAPI atualmente instalada.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>A implementação do servidor não é suportada.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>A autenticação NTLM não é possível com credenciais padrão nesta plataforma.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>Quando usado por DataAdapter.Update, o valor do parâmetro é alterado de DBNull.Value para (Int32)1 ou (Int32)0 se não for nulo.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Tamanho máximo do buffer excedido: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>DataColumn '{0}' de SourceColumn '{2}' inexistente.</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>A lista SqlBatchCommand não foi inicializada.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 57e1519dbe..9d1fcbc6f1 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>По возрастанию</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Недопустимый индекс {0} для этого {1} с Count={2}.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>{0} уже содержится в другом {1}.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>{0} уже содержится в этом {1}.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>Для {0} могут задаваться только объекты типа {1} с определенными значениями.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>Попытка удалить {0}, который не содержится в этом {1}.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1} должен быть уникальным, "{2}" уже имеется в этой коллекции.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>Подключение не было закрыто. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>Недопустимая попытка вызвать {0} при закрытом устройстве чтения.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>Невозможно включить в транзакцию, поскольку это главное подключение для делегированной или активизированной транзакции.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>По убыванию</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>Для параметра "{0}" ожидается непустая строка.</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>Свойство ConnectionString не инициализировано.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>Перехвачено исключение Non CLS Exception.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>Указанный элемент безопасности не является элементом разрешений.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>Данные</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>Обновление</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>ConnectionState, указывающий, открыто или закрыто подключение.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>Событие создается при изменении состояния подключения.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>Общий тип параметра.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>Входной, выходной или двунаправленный параметр.</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>свойство, используемое для создания кода со строгой типизацией.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>Смещение в типах данных переменной длины.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>Имя параметра.</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>Размер типов данных переменной длины (строки и массивы).</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>При использовании в DataAdapter.Update имя исходного столбца, применяемого для поиска имени DataSetColumn в ColumnMappings. Это необходимо для копирования значения между параметром и строкой данных.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>При использовании в DataAdapter.Update (только команда UpdateCommand) версия значения DataRow, применяемого для обновления источника данных.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>При использовании в DataAdapter.Update значение параметра изменяется с DBNull.Value на (Int32)1 или (Int32)0, если определено.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>Значение параметра.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>Не удается создать коллекцию "{0}", потому что произошел сбой запроса SQL. Дополнительные сведения см. во внутреннем исключении.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>Указано больше ограничений, чем поддерживается затребованной схемой ("{0}").</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>"{2}" не является действительным значением для ограничения "{1}" коллекции схемы "{0}".</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>Затребованная коллекция ({0}) не определена.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>Затребованная коллекция ({0}) не поддерживается поставщиком этой версии.</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>Отсутствует один из обязательных столбцов в таблице DataSourceInformation.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>Таблица DataSourceInformation должна содержать только одну строку.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>Отсутствует один или несколько обязательных столбцов в коллекции ограничений.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>Для одного из ограничений нет соответствующей строки в коллекции ограничений.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>Коллекции "{0}" нет в метаданных XML.</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>Метаданные XML недействительны.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>Метаданные XML недействительны. Коллекция {0} должна содержать столбец {1} строкового типа.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>Метаданные XML недействительны. Столбец {1} коллекции {0} должен содержать непустую строку.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>Действие</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>Режим работы</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>Заливка</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>InfoMessage</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>Сопоставление</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>Уведомление</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>Схема</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>Объединение</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>Именованная строка ConnectionString</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>Безопасность</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>Устойчивость подключений</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>Коллекция, содержащая особую информацию пользователя.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>Указывает, выполняется ли сравнение строк в DataSet с учетом регистра.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>Имя этого DataSet.</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>Указывает особое "представление" данных, содержащихся в DataSet. Это представление позволяет выполнять фильтрацию, поиск и перемещение по особому представлению данных.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>Указывает, следует ли соблюдать правила ограничений.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>Указывает, что DataSet содержит ошибки.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>Указывает языковой стандарт, в соответствии с которым должны сравниваться строки в DataSet.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>Указывает пространство имен URI XML для корневого элемента, заданного этим DataSet.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>Указывает префикс пространства имен, используемого для этого DataSet.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>Коллекция, в которой хранятся отношения для этого DataSet.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>Коллекция, в которой хранятся таблицы для этого DataSet.</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>Происходит, когда невозможно объединить схемы двух таблиц с одинаковыми именами.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Происходит после завершения инициализации Initialization.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>Представляет кэш данных в памяти.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>Указывает, выполняется ли сравнение строк в таблице с учетом регистра.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>Возвращает для этой таблицы дочерние отношения.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>Коллекция, в которой содержатся столбцы для этой таблицы.</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>Коллекция, в которой содержатся ограничения для этой таблицы.</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>Указывает DataSet, которому принадлежит эта таблица.</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>DataView по умолчанию для данной таблицы.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>Выражение для вычисления привязанного к данным значения этой строки.</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>Возвращает признак того, содержит ли таблица ошибки.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>Указывает языковой стандарт, в соответствии с которым должны сравниваться строки в данной таблице.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>Указывает исходный начальный размер этой таблицы.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>Указывает пространство имен URI XML для элементов, содержащихся в этой таблице.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>Указывает префикс пространства имен, используемого для этой таблицы в XML-представлении.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>Возвращает для этой таблицы родительские отношения.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>Указывает столбцы, где представлен первичный ключ этой таблицы.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>Указывает коллекцию, в которой содержатся строки данных для этой таблицы.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>Указывает имя, используемое для поиска этой таблицы в коллекции таблиц Tables из DataSet.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>Происходит после успешного завершения редактирования строки в этой таблице.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>Происходит при изменении строки таким образом, чтобы обработчик события мог изменить или отменить изменение. Пользователь может изменить значения в данной строке и должен создать исключение для отмены редактирования.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>Происходит после успешного удаления строки из этой таблицы.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>Происходит, когда строка этой таблицы помечается для удаления. Для отмены этого удаления создайте исключение.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>Происходит при передаче значения для этого столбца. Пользователь может изменить переданное значение и должен создать исключение для отмены редактирования.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>Происходит при изменении значения в этом столбце.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>Происходит перед очисткой всех строк в таблице.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>Происходит после успешной очистки всех строк в таблице.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>Происходит после создания нового экземпляра DataRow.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>Имя, используемое для поиска этого отношения в коллекции отношений Relations из DataSet.</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>Указывает дочерние столбцы этого отношения.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>Указывает родительские столбцы этого отношения.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>Указывает, являются ли отношения вложенными.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>Для удалений; указывает, какого рода каскадная схема должна использоваться в этом отношении.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>Для обновлений; указывает, какого рода каскадная схема должна использоваться в этом отношении.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>Для принятия и отклонения изменений; указывает, какого рода каскадная схема должна использоваться в этом отношении.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>Указывает дочерние столбцы этого ограничения.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>Указывает родительские столбцы этого ограничения.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>Указывает дочернюю таблицу для этого ограничения.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>Указывает столбцы для этого ограничения.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>Указывает, является ли это ограничение первичным ключом.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>Указывает имя этого ограничения.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>Указывает таблицу для этого ограничения.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>Указывает, допускаются ли в этом столбце значения null.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>Указывает, увеличиваются ли значения в столбце автоматически при добавлении в таблицу новых строк. Этот столбец должен иметь тип Int16, Int32 или Int64.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>Указывает начальное значение для столбца AutoIncrement.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>Указывает приращение, используемое в столбце AutoIncrement.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>Указывает для этого столбца заголовок интерфейса пользователя по умолчанию.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>Указывает имя, используемое для поиска этого столбца в коллекции столбцов из таблицы данных.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>Возвращает DataTable, которому принадлежит этот столбец.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>Указывает тип данных, хранящихся в этом столбце.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>Указывает для столбца значение по умолчанию при добавлении строк в таблицу.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>Указывает значение, вычисляемое для каждой строки этого столбца на основе значений в других столбцах вместо ввода значения пользователем).</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>Указывает, как этот столбец сохраняется в XML: как атрибут, как элемент, как узел с простым содержимым или не сохраняется.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>Указывает URI XML для элементов или атрибутов, хранящихся в этом столбце.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>Указывает префикс Prefix, используемый для этого DataColumn в представлении xml .</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Указывает индекс этого столбца в коллекции столбцов Columns.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>Указывает, допускаются ли изменения в этом столбце при добавлении в таблицу строки.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>Указывает, должны ли значения в строках этого столбца в данной таблице быть уникальными.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>Указывает максимальную длину значения, которая допустима для этого столбца.</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>Указывает DateTimeMode этого DataColumn.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>Указывает, разрешено ли удаление для этого DataView и связанного с ним интерфейса пользователя.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>Указывает, разрешено ли редактирование для этого DataView и связанного с ним интерфейса пользователя.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>Указывает, разрешено ли добавление новых строк для этого DataView и связанного с ним интерфейса пользователя.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>Возвращает текущее число элементов в этом представлении.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>Возвращает указатель назад на DataViewManager, которому принадлежит этот DataSet (если есть).</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>Указывает, открыто ли это представление.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>Указывает выражение, используемое для фильтрации данных, возвращаемых этим DataView.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>Указывает версии данных, возвращаемых этим DataView.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>Указывает имена столбцов и порядок возвращения данных этим DataView.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Указывает, должна ли использоваться сортировка по умолчанию, если свойство Sort не задано.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>Указывает таблицу, которую этот DataView использует для извлечения данных.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>Указывает, что данные, возвращенные этим DataView, каким-либо образом изменились.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>Указывает источник данных для этого DataViewManager.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>Указывает параметры сортировки, фильтрации и состояния для любой таблицы в соответствующем DataSet.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet не поддерживает union и list в качестве simpleType.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>Недопустимый синтаксис {0}: отсутствует обязательный атрибут "{1}".</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>Значение "{1}" является недопустимым для атрибута "{0}".</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>Значение атрибута "{0}" должно быть равно "{1}" или "{2}".</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>Не удается найти имя ElementType name="{0}".</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>В отношении "{0}" отсутствует имя родительской таблицы.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>В отношении "{0}" отсутствует имя дочерней таблицы.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>В отношении "{0}" отсутствует ключ родительской таблицы.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>В отношении "{0}" отсутствует ключ дочерней таблицы.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>Не определенный тип данных: "{0}".</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>Тип данных не определен.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>Недопустимый выбор XPath в узле поля. Не удается найти: {0}.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>Недопустимый выбор XPath в узле селектора. {0}.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>Недопустимый узел Key в ограничении с именем: {0}.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>Имя ограничения {0} уже используется в данной схеме.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>Невозможно привести "{0}" к типу "{1}".</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>Отсутствует часть "{0}" в составе ограничения "{1}" под названием "{2}".</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>Недопустимое определение отношения Relation: ключи разной длины.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet не допускает циклических ссылок в ComplexType с именем "{0}".</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet не удается создать экземпляр абстрактного ComplexType для узла {0}.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Произошла ошибка в преобразователе нескольких целей во время записи Xml Schema. Подробные сведения см. во внутреннем исключении.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Произошла ошибка в преобразователе нескольких целей во время записи Xml Schema. Возвращено значение null или пустая строка.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>Повторяющееся объявление "{0}".</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>Невозможно загрузить diffGram. В результирующем наборе данных отсутствует таблица "{0}".</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>Невозможно загрузить diffGram. Отсутствует узел sql.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>Имя столбца "{0}" определено для различных типов сопоставления.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>Префикс "{0}" является недопустимым, т.к. содержит специальные знаки.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>Циклическая ссылка во вложенной в себя таблице "{0}".</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet не может расширять объекты подстановки. Используйте XmlValidatingReader и задайте соответствующее значения свойства EntityHandling.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>Тип "{0}" не содержит реализации интерфейса IXmlSerializable; невозможно продолжить сериализацию.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>Продолжить десериализацию невозможно. Поскольку данные не содержат реализации IXMLSerializable, полиморфизм не поддерживается.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable не поддерживает выведение схемы из Xml.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>Невозможно продолжить сериализацию DataTable "{0}". Содержит DataRow, имеющую несколько родительских строк для одного внешнего ключа.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>Атрибут IsDataSet отсутствует во входной схеме Schema.</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>Не удается определить элемент набора данных. Атрибут IsDataSet встречается более одного раза.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet не сериализует типы, в которых реализован интерфейс IDynamicMetaObjectProvider, но не реализован интерфейс IXmlSerializable.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>Данная функциональная возможность не реализована. {0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>Синтаксическая ошибка: отсутствует операнд после оператора "{0}".</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>Несоответствие типов в выражении "{0}".</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>Выражение слишком сложное.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>Не удается найти столбец [{0}].</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>Данное выражение содержит недопустимую строковую константу: {0}.</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>Выражение содержит вызов не определенной функции {0}().</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>Синтаксическая ошибка в данном выражении.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>Недопустимое число аргументов: функция {0}().</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>В выражении отсутствуют закрывающая круглая скобка.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>Не удается интерпретировать маркер "{0}" в позиции {1}.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>Ожидалось {0}, но фактически в позиции {2} находится маркер {1}.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>Невозможно выполнить преобразование из {0} в {1}.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>Невозможно преобразовать значение "{0}" в тип: {1}.</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>Недопустимое имя столбца [{0}].</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>Выражение содержит недопустимую константу даты "{0}".</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>В выражении для оператора IN допускаются только константные выражения.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Ошибка в операторе Like: шаблон строки "{0}" является недопустимым.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>Синтаксическая ошибка: Элементы, стоящие за ключевым словом IN, должны быть разделены запятыми и заключены в круглые скобки.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>Несоответствие типов в аргументе функции: {0}(), аргумент {1}, ожидалось {2}.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>Несоответствие типов в аргументе функции: {0}(), аргумент {1}, ожидался целочисленный тип.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>Невозможно выполнить операцию "{0}" над {1} и {2}.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>Оператор "{0}" для операндов с типами "{1}" и "{2}" является неоднозначным. Невозможно использовать вместе типы со знаком и без знака. Используйте функцию Convert() явно.</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>Синтаксическая ошибка: За ключевым словом IN должен следовать непустой список выражений, разделенных запятыми и заключенных в круглые скобки.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>Выражение содержит не поддерживаемый оператор "{0}".</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>Выражение содержит недопустимое имя: "{0}".</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>Синтаксическая ошибка: отсутствует операнд перед оператором "{0}".</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>Выражение содержит лишние круглые скобки.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>Таблица [{0}] участвует в нескольких отношениях. В выражении "{1}" требуется указать имя отношения в явном виде.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>Синтаксическая ошибка в составном аргументе: ожидается аргумент, состоящий из одного столбца, возможно, с квалификатором Child.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>Не привязанная ссылка в составном выражении "{0}".</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>Невозможно вычислить непостоянное выражение без текущей строки.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>Не привязанная ссылка в выражении "{0}".</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>Невозможно вычислить. Выражение "{0}" не является составным.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>Выражение фильтра "{0}" не вычисляется как логический термин.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>Недопустимое имя типа "{0}".</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>Синтаксическая ошибка в выражении Lookup: Ожидается слово Parent, за которым следует аргумент, состоящий из одного столбца, возможно, с квалификатором отношения: Parent[(&lt;имя отношения&gt;)].&lt;имя столбца&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>Для вызова DataFilter требуется строка или таблица.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>Аргумент для {0}() вне допустимого диапазона.</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>Смещение и длина вышли за границы массива или значение счетчика превышает количество элементов от указателя до конца исходной коллекции.</value>
   </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>Синтаксическая ошибка: Недопустимое использование оператора Is. Допустимый синтаксис: &lt;выражение&gt; Is [Not] Null.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>Нельзя преобразовать объект типа "{0}" в объект типа "{1}".</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>Значение недопустимо мало или недопустимо велико для типа "{0}".</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>Свойство "{0}" может принимать только значение "{1}".</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>Ошибка деления на нуль.</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>Для свойства "{0}" допустимо только значение "{1}" или "{2}".</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>Невозможно найти родительское отношение"{0}".</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>Несоответствие указанных значений QuotePrefix и QuoteSuffix.</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>Аргумент "hours" находится вне допустимого диапазона. Это значение должно находиться в диапазоне от -14 до +14.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>Длина аргумента "{0}" превышает установленное для него ограничение "{1}".</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>Аргумент "minutes" находится вне допустимого диапазона. Это значение должно находиться в диапазоне от -59 до +59.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>Недопустимое значение ключа "{0}".</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>Приведенный диапазон для первого времени превышает 14 часов.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>Использование ключа "{0}" требует наличия ключа "{1}".</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>Свойство Kind приведенного аргумента DateTime не совпадает с аргументами "hours" и "minutes".</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>Длина значения для ключа "{0}" превышает лимит “{1}”.</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>DataColumn типа {0} не поддерживает выражения.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>Ключевое слово не поддерживается: "{0}".</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>Не удалось включить ограничения. По меньшей мере одна строка содержит значение, нарушающее ограничения по отсутствию пустых значений, уникальности или внешним ключам.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>Внутренняя ошибка {0} поставщика данных .NET Framework.</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>Сама коллекция не поддается изменению.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}".</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>Указанное имя "{0}" без учета регистра совпадает по меньшей мере с двумя именами в объекте коллекции, но с учетом регистра не совпадает ни с одним из этих имен.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}", неправильное использование кавычек.</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>Указанное имя "{0}" совпадает по меньшей мере с двумя именами в объекте коллекции с разными пространствами имен.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}", недостаточное текущее предельное значение "{2}".</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>Смещение и длина вышли за границы массива или значение счетчика превышает количество элементов от указателя до конца исходной коллекции.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>Сбой SqlBulkCopy.WriteToServer, поскольку SqlBulkCopy.DestinationTableName является недействительным составным именем.</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>Аргумент "{0}" вне допустимого диапазона.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>Сбой обработки полученных с сервера SQL Server результатов из-за недопустимого составного имени.</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>Аргумент "{0}" не может быть пустым.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName является недействительным составным именем.</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>Аргумент "{0}" содержит пустое значение.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName является недопустимым именем, состоящим из нескольких частей</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>Невозможно найти столбец {0}.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>Сбой SqlCommand.DeriveParameters из-за того, что значение свойства SqlCommand.CommandText является недействительным составным именем.</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>Столбец "{0}" уже принадлежит этому DataTable.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>Подключение к зеркальному экземпляру SQL Server с использованием параметра MultiSubnetFailover не поддерживается.</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>Столбец "{0}" уже принадлежит другому DataTable.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>Значение перечисления {0}, {1}, не поддерживается методом {2}.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>DataTable не может содержать несколько столбцов SimpleContent.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>Поставщик данных .NET Framework для SQL Server (SqlClient) не поддерживает значение перечисления {0} "{1}".</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>Невозможно добавить столбец SimpleContent к таблице со столбцами элементов или вложенными отношениями.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: Свойство CommandText не инициализировано</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>Столбец с именем "{0}" уже принадлежит этому DataTable.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: Свойство Connection не инициализировано.</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>Не удалось добавить столбец с именем "{0}": вложенная таблица с таким именем уже принадлежит этому DataTable.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>Для {0} нужно открытое и доступное подключение Connection. {1}</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>Столбец с именем "{0}" уже принадлежит этому DataTable: невозможно присвоить имя вложенной таблицы таблице с тем же именем.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>Сохраненная процедура "{0}" не существует.</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>Невозможно удалить столбец, не принадлежащий этой таблице.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>Транзакция не связана текущим соединением или уже завершена.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>Невозможно удалить этот столбец, т.к. он является частью первичного ключа.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>Транзакция, связанная с текущим соединением, завершена, но не удалена.  Это соединение можно будет использовать для выполнения инструкций SQL только после удаления транзакции.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>Невозможно удалить этот столбец, т.к. он является частью родительского ключа в отношении {0}.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>{0} требует, чтобы команда имела транзакцию, если подключение, назначенное команде, находится в отложенной локальной транзакции Свойство Transaction для команды не инициализировано.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>Невозможно удалить этот столбец, т.к. он является частью ограничения {0} для таблицы {1}.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>{0} уже имеет связанный открытый поставщик DataReader, который сначала нужно закрыть.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>Невозможно удалить этот столбец, т.к. он является частью выражения: {0} = {1}.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>DeriveParameters {0} поддерживает только CommandType.StoredProcedure, но не поддерживает CommandType.{1}.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>Невозможно задать свойство AutoIncrement для вычисляемого столбца.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>Невозможно задать свойство AutoIncrement для столбца с заданным DefaultValue.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>Невозможно задать DefaultValue для столбца AutoIncrement.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep не должен быть равен нулю.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>ColumnName обязателен, когда он является частью DataTable.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>Невозможно изменить DataType столбца, т.к. он содержит данные.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>Для столбца требуется допустимый DataType.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>Значение DefaultValue столбца {0} имеет тип {1}, и его невозможно преобразовать в {2}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>Значение DefaultValue данного столбца имеет тип {0}, и его невозможно преобразовать в {1}.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>Значение DefaultValue столбца {0} имеет тип {1}, хотя столбец имеет тип {2}.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>Невозможно изменить свойство ReadOnly для столбца выражений.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>Невозможно изменить свойство Unique для столбца выражений.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>Невозможно создать выражение в столбце, которому назначено свойство AutoIncrement или Unique.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>Невозможно задать выражение, т.к. столбец невозможно перевести в состояние ReadOnly.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>Невозможно задать свойство Expression столбца {0}, т.к. оно является частью ограничения.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>Невозможно создать ограничение на основе столбца Expression {0}.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>Невозможно задать свойство Expression по причине циклической ссылки в выражении.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>Столбец "{0}" содержит значения равные null.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>В столбце "{0}" не допускаются значения равные nulls.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>Столбец "{0}" доступен только для чтения.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>Столбец "{0}" содержит повторяющиеся значения.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>Столбец "{0}" не принадлежит таблице {1}.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>Столбец должен принадлежать таблице.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>Невозможно сохранить &lt;{0}&gt; в столбце {1}. Ожидался тип {2}.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>Невозможно присвоить столбцу Column "{0}" значение null. Используйте DBNull.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>Не удается задать столбец "{0}". Значение нарушает ограничение MaxLength для этого столбца.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength действует только в отношении данных строкового типа. Для свойства MaxLength столбца Column "{0}" невозможно установить значение в виде неотрицательного числа.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>Невозможно присвоить свойству MaxLength столбца Column "{0}" значение "{1}". Длина по меньшей мере одной строки в таблице превышает новое предельное значение.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Невозможно задать свойство MaxLength столбца Column "{0}". Он является столбцом Column SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>Невозможно присвоить свойству DataType столбца Column "{0}" значение {1}. Он является столбцом SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>Невозможно присвоить свойству MappingType столбца Column "{0}" значение SimpleContent. DataType столбца равен {1}.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>В столбце Column "{0}" превышено ограничение, которое задает MaxLength.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>Для столбца "{0}" использование DBNull.Value не разрешено.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>Невозможно изменить свойство Namespace столбца Column "{0}". Он является столбцом SimpleContent.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>Не удалось изменить AutoIncrement для DataColumn типа "{0}", поскольку он содержит данные.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>Столбец "{0}" не принадлежит базовой таблице "{1}".</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>DataColumn типа "{0}" относится к типу complexType. Невозможно сериализовать значение составного типа как атрибут Attribute.</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>DateTimeMode может быть назначен только для DataColumns типа DateTime.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>"{0}" является недействительным значением DataSetDateTime.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>Не удалось изменить DateTimeMode с "{0}" на "{1}", поскольку таблица содержит данные.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Тип Type "{0}" не содержит статическое свойство или поле static Null.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>Тип "{0}" не содержит реализации IRevertibleChangeTracking; невозможно продолжить RejectChanges().</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>SetAdded и SetModified могут вызываться только для DataRows с неизмененным DataRowState.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>Порядковый номер "{0}" превышает максимальное число.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet не поддерживает System.Nullable&lt;&gt;.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>Невозможно изменить имя ограничения на пустую строку, когда оно входит в ConstraintCollection.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>Невозможно наложить ограничения на ограничение {0}.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>На столбец "{0}" наложено ограничение по уникальности. Значение "{1}" уже имеется.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>Ограничение "{0}" не принадлежит этому DataTable.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>Невозможно найти ограничение {0}.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>Данное ограничение идентично ограничению с именем {0}, которое уже имеется в коллекции.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>Ограничение Constraint с именем "{0}" уже принадлежит этому DataTable.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>Эти столбцы в данный момент не содержат уникальных значений.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>Эти столбцы не указывают на данную таблицу.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>Невозможно включить это ограничение, т.к. не все значения имеют соответствующие родительские значения.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>Невозможно добавить это ограничение, т.к. ForeignKey не принадлежит таблице {0}.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>Невозможно удалить ограничение, не принадлежащее этой таблице.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>Невозможно переместить уникальное ограничение "{0}". Сначала удалите ограничение внешнего ключа "{1}".</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>Невозможно удалить эту строку, т.к. на отношение {0} наложены ограничения, и удаление этой строки вызовет конфликты в дочерних строках.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>Невозможно выполнить это изменение, т.к. на отношение {0} наложены ограничения, и изменение этого значения вызовет конфликты в дочерних строках.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>Невозможно очистить таблицу {0}, т.к. ForeignKeyConstraint {1} налагает ограничения и в {2} содержатся дочерние строки.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>Для ForeignKeyConstraint {0} требуется, чтобы в родительской таблице присутствовали значения дочерних ключей ({1}).</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>Свойство недоступно, т.к. "{0}".</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>Невозможно удалить эту строку, т.к. она имеет дочерние строки и на отношение {0} наложены ограничения.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>Невозможно добавить ограничение для первичного ключа, т.к. для этой таблицы уже назначен первичный ключ.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>Не удалось добавить ограничение к DataTable "{0}", которая является дочерней таблицей в двух вложенных отношениях.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>Невозможно создать ключ из столбцов, принадлежащих разным таблицам.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>Число столбцов не может равняться 0.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>Число столбцов не может превышать {0}.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>Невозможно создать ключ, когда один столбец участвует в перечислении несколько раз. "{0}"</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>Невозможно удалить ограничение по уникальности, т.к. оно образует первичный ключ таблицы.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>Невозможно удалить ограничение по уникальности, т.к. оно образует первичный ключ таблицы {0}.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>Среди родительских столбцов и дочерних столбцов отсутствуют столбцы совпадающих типов.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey и ChildKey совпадают.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns и ChildColumns должны иметь одинаковую длину.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns и ChildColumns должны иметь ненулевую длину.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>Данная строка и это отношение принадлежат разным DataSet.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>RelationName является обязательным, когда он - часть DataSet.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>Для GetChildRows требуется строка из таблицы {0}, но таблицей Table заданной строки является {1}.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>Это отношение должно соединять в данном DataSet две таблицы, подлежащие добавлению к этому DataSet.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>Для GetParentRow требуется строка из таблицы {0}, но таблицей заданной строки является {1}.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>Для SetParentRow требуется дочерняя строка из таблицы {0}, но таблицей заданной строки является {1}.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>Отношения между таблицами в различных DataSet невозможны.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>Невозможно создать отношение между таблицами в различных DataSet.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>Для этих дочерних столбцов уже существует отношение.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>Это отношение не принадлежит данной коллекции отношений.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Это отношение уже принадлежит другому DataSet.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Это отношение уже принадлежит этому DataSet.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>Отношение Relation с именем "{0}" уже принадлежит этому DataSet.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>Отношение Relation {0} не принадлежит этому DataSet.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>Невозможно найти отношение {0}.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>Невозможно создать коллекцию для таблицы со значением null.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>Таблица, для которой эта коллекция отображает отношения, удалена из своего DataSet.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>Невозможно добавить отношение в коллекцию ParentRelation этой таблицы, если для коллекции эта таблица не является дочерней.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>Невозможно добавить отношение в коллекцию ChildRelation этой таблицы, не являющейся в этой коллекции родительской таблицей.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>Невозможно присвоить свойству Nested этого отношения значение false (ложь).</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>Одна и та же таблица "{0}" не может быть дочерней в двух вложенных отношениях.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>Во вложенных отношениях таблица ({0}) не может быть дочерней по отношению к себе.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>Невозможно добавить DataRelation или Constraint, для которых значения параметров Locale или CaseSensitive различны в родительской и дочерней таблицах.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>Невозможно создать DataRelation, если родительские или дочерние столбцы не входят в DataSet.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>Вложенная таблица "{0}", которая наследует свое пространство имен, не может иметь несколько родительских таблиц в разных пространствах имен.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>Вложенная таблица "{0}" с пустым пространством имен не может иметь несколько родительских таблиц в разных пространствах имен.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>Данная строка и это отношение принадлежат разным DataSet.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>Невозможно выполнить эту операцию над строкой, не содержащейся в данной таблице.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>Это отношение и дочерняя строка не принадлежат одному DataSet.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>Невозможно изменить предложенное значение в событии RowChanging.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>Невозможно вызвать EndEdit() внутри события OnRowChanging.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>Невозможно вызвать BeginEdit() внутри события RowChanging.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>Невозможно вызвать CancelEdit() внутри события OnRowChanging. Для отмены этого обновления создайте исключение exception.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>Невозможно вызвать Delete внутри события OnRowDeleting. Для отмены этого удаления создайте исключение exception.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>Длина входного массива больше числа столбцов в этой таблице.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>Отсутствуют данные Current для доступа.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>Отсутствуют данные Original для доступа.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>Отсутствуют данные Proposed для доступа.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>Эта строка удалена из таблицы и не содержит данных. BeginEdit() позволит создать в этой строке новые данные.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>Невозможно получить доступ к удаленной информации строки через данную строку.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>Версия должна иметь значение Original, Current или Proposed.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>В позиции {0} строка отсутствует.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>Недопустимая позиция вставки строки {0}.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>Значение rowOrder value={0} для таблицы с именем "{1}" обнаружено дважды.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>Отсутствуют значения в последовательности rowOrder для таблицы "{0}".</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>Указанная DataRow отсутствует в текущей DataRowCollection.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>Эта строка уже принадлежит другой таблице.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>Эта строка уже принадлежит данной таблице.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>Невозможно удалить эту строку, т.к. она уже удалена.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>Эта строка пуста.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>Невозможно удалить строку, которая уже удалена.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>Дочерняя строка имеет несколько родительских строк.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>Неопознанное сочетание битов состояния строки.</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>Невозможно изменить имя DataSet на пустую строку.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>Недопустимое имя "{0}". Имя DataSet не может совпадать с именем DataTable.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>Пространство имен данной схемы недействительно. Вместо него используйте указанное: {0}.</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>Невозможно изменить свойство CaseSensitive или Locale. Такое изменение приведет к тому, что по меньшей мере один DataRelation или Constraint будет иметь другое значение параметра Locale или CaseSensitive в связанных с ним таблицах.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>Свойство SchemaSerializationMode может быть установлено только в том случае, если оно переопределено производным DataSet.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>Столбцы PrimaryKey не принадлежат этой таблице.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>Невозможно добавить вложенное отношение или столбец элементов в таблицу, содержащую столбец SimpleContent.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>TableName является обязательным, если является частью DataSet.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable уже содержит столбец с простым содержимым.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>Таблица не имеет первичного ключа.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} не является допустимой строковой записью сортировки Sort.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>Не удалось сериализовать DataTable. DataTable, использующаяся в одном или нескольких выражениях DataColumn, не является потомком текущей DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>Удаленное взаимодействие с этой DataTable возможно только в составе DataSet. Имеются столбцы Expression, ссылающиеся на другие DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>Невозможно использовать разные значения свойства удаленного форматирования для DataSet и DataTable.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>Не удалось сериализовать DataTable. Не указано имя DataTable.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>DataTable с именем "{0}" уже принадлежит этому DataSet.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>DataTable "{0}" с тем же пространством имен Namespace "{1}" уже принадлежит этому DataSet.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>Во вложенном отношении таблица ({0}) не может быть дочерней по отношению к себе: имя DataSet не согласуется с именем таблицы.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>Недопустимое имя "{0}". Имя DataTable не может совпадать с именем DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable уже принадлежит другому DataSet.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable уже принадлежит этому DataSet.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>Таблица {0} не принадлежит этому DataSet.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>Невозможно найти таблицу {0}.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>Невозможно удалить таблицу, для которой существуют отношения. Сначала удалите отношения.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>Невозможно удалить таблицу {0}, т.к. ссылка на нее содержится в ForeignKeyConstraint {1}. Сначала удалите это ограничение.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>DataTable "{0}" не соответствует ни одной DataTable в источнике.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>В конечном DataSet отсутствует определение {0}.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>В конечном DataSet отсутствует {1} {0}.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} и &lt;source&gt;.{0} имеют несовместимые свойства: несоответствие свойства DataType.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey и &lt;source&gt;.PrimaryKey имеют различную длину Length.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>Несоответствие столбцов в PrimaryKey: &lt;target&gt;.{0} относительно &lt;source&gt;.{1}.</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>Отношение {0} не может быть объединено, поскольку ключи имеют несовпадающие столбцы.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>В конечной таблице {0} отсутствует определение столбца {1}.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>Столбец PrimaryKey {0} отсутствует в исходной таблице.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>Параметру RowStates должно быть присвоено допустимое сочетание значений из перечисления DataViewRowState.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Поиск строк выполняется на основе порядка сортировки, а порядок сортировки не задан.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>Ожидалось {0} значение (значений) индексируемого ключа, а получено {1} значение (значений).</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>Недопустимое использование агрегатной функции {0}() и типа: {1}.</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>Недопустимый тип хранилища: {0}.</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>Режим хранения Xml DataSet не поддерживает значение "{0}" как значение типа Char, используйте хранилище данных типа Byte.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>Тип значения не соответствует типу столбца.</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>Тип "{0}" не содержит реализации интерфейса IComparable. Сравнение невозможно.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>Невозможно задать {0}.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>Невозможно изменить DataSet для DataViewManager, который уже является представлением по умолчанию для DataSet.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter не может одновременно отображать версии данных ModifiedOriginals и ModifiedCurrents.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>Невозможно изменить свойство Table для DefaultView или для DataView, считанного из DataViewManager.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>После задания свойства DataSet его невозможно изменить.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>Перед использованием DataViewManager требуется задать DataSet.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>После задания свойства Table его невозможно изменить.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>Перед использованием DataView требуется задать DataTable.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>Невозможно выполнить привязку к DataTable без имени.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>Невозможно поместить объект в этот список.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>Невозможно вызвать AddNew для DataView, в котором AllowNew имеет значение false (ложь).</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView не открыт.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>Отношение не назначено родительским для таблицы, на которую указывает этот DataView.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>Невозможно выполнить удаление для DataSource, в ктором AllowDelete имеет значение false (ложь).</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>Невозможно выполнить редактирование для DataSource, в котором AllowEdit имеет значение false (ложь).</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>Индекс {0} отрицательный или превышает общее число строк.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>Невозможно добавить в этот список внешние объекты.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>Невозможно очистить этот список.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>Невозможно вставить в этот список внешние объекты.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>Невозможно удалить объекты, отсутствующие в этом списке.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} не является для таблицы {1} ни DataColumn, ни DataRelation.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>В объекте Range минимум Min {0}) должен быть меньше или равен максимуму max ({1}).</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>Является неопределенным диапазоном null.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>Значение MinimumCapacity должно быть неотрицательным.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>Не удается создать идентификатор для имени "{0}".</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>Имеется несколько таблиц с именем "{0}" (даже если пространства имен отличаются).</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>Столбец "{0}": тип "{1}" не может иметь значение null.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>Столбец "{0}": Тип "{1}" не имеет беспараметрического конструктора.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>Столбец "{0}": Тип "{1}" не имеет конструктора со строковым аргументом.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>Нельзя преобразовать объект типа "{0}" в объект типа "{1}".</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Исключение данных Data Exception.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Исключение ограничения Constraint Exception.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>Удаленные строки недоступны.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>Повторяющиеся имена запрещены.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>Операция не поддерживается в событии RowChanging.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>Недействительное ограничение.</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>Отсутствует первичный ключ.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Значения Null не допускаются.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>Столбец доступен только для чтения.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>Строка в таблице не найдена.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>Версия не найдена.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>Изменены данные ReadOnly, доступные только для чтения. </value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>Недействительный DataTableReader для текущей DataTable "{0}".</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>Схема текущей DataTable "{0}" в DataTableReader изменилась; DataTableReader недействителен.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>Невозможно создать DataTableReader. В DataSet нет DataTable.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>Не удается создать DataTableReader. Пустой аргумент.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>Не удается создать DataTableReader. Аргументы содержат значение null.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>Текущий элемент DataRow находится в состоянии Deleted или Detached.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>Текущая DataTable "{0}" пуста. В DataTable нет DataRow.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>Поврежден внутренний индекс DataTable: "{0}".</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>Коллекция изменена, возможно операция перечисления не будет выполнена.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>Простой тип "{0}" уже объявлен с другим "{1}".</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>Недопустимая нумерация.</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>Невозможно изменить имя таблицы, когда соответствующий DataSet сопоставлен загруженному документу XML.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>Невозможно изменить пространство имен таблицы, когда соответствующий DataSet сопоставлен загруженному документу XML.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>Невозможно изменить имя столбца, когда соответствующий DataSet сопоставлен загруженному документу XML.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>Невозможно изменить пространство имен столбца, когда соответствующий DataSet сопоставлен загруженному документу XML.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>Невозможно изменить свойство ColumnMapping, когда соответствующий DataSet сопоставлен загруженному документу XML.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>Невозможно добавить или удалить столбцы таблицы, когда соответствующий DataSet сопоставлен загруженному документу XML.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>Невозможно добавить или удалить таблицы из DataSet, когда соответствующий DataSet сопоставлен загруженному документу XML.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>Невозможно добавить, удалить или изменить вложенное отношение в DataSet, когда соответствующий DataSet сопоставлен загруженному документу XML.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>Недопустимый параметр DataSet. Он не может иметь значение null.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>Невозможно изменить имя DataSet, когда соответствующий DataSet сопоставлен загруженному документу XML.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>Невозможно клонировать узел этого типа. {0}.</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>Невозможно загрузить XmlDataDocument, если он уже содержит данные. Используйте новый XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>Невозможно назначить DataSet по меньшей мере одному XmlDataDocument. Невозможно назначить DataSet текущему XmlDataDocument, т.к. данный DataSet уже назначен другому XmlDataDocument.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>Перед попыткой изменения XmlDataDocument с помощью операций XML присвойте DataSet.EnforceConstraints значение == false (ложь).</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>Метод GetElementById() для DataDocument не поддерживается.</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>Невозможно создать ссылки на объекты подстановки для DataDocument.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>Функция очистки Clear DateSet и DataTable для XmlDataDocument не поддерживается.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>Невозможно удалить столбец, т.к. он встроен в этот dataSet.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>Невозможно удалить отношение, поскольку оно встроено в этот набор данных.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>Происходит при каждом изменении любого свойства этого элемента управления.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Происходит при каждом изменении принадлежности этой коллекции.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>Невозможно получить значение, поскольку оно равно DBNull.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>Свойству "{0}" необходима Microsoft WindowsNT или другая операционная система на ее основе.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>Запрошенный поставщик данных .NET Framework не найден. Возможно, он не установлен.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>Реализация запрошенного поставщика данных .NET Framework не содержит поле Instance (Экземпляр) производного типа System.Data.Common.DbProviderFactory.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>Не удалось найти или загрузить зарегистрированный поставщик данных .NET Framework.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>Требуется полное имя сборки поставщика данных .NET Framework.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>Разрешены только элементы.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>Дочерние узлы не разрешены.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>Неопознанный атрибут "{0}".</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>Неизвестный элемент.</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>В файле конфигурации может быть только один раздел "{0}".</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>Обязательный атрибут "{0}" не найден.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>Обязательный атрибут "{0}" не может быть пустым.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>Для параметра "{0}" ожидается непустой массив.</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>Свойство "{0}" может принимать только значение "{1}".</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>Для свойства "{0}" допустимо только значение "{1}" или "{2}".</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>Несоответствие указанных значений QuotePrefix и QuoteSuffix.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>Длина аргумента "{0}" превышает установленное для него ограничение "{1}".</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>Ожидается аргумент типа {1}, получен аргумент типа {0}.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>Недопустимое значение ключа "{0}".</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>Использование ключа "{0}" требует наличия ключа "{1}".</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>Длина значения для ключа "{0}" превышает лимит “{1}”.</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>Ключевое слово не поддерживается: "{0}".</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>Не удалось загрузить файл UDL.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>Недопустимый файл UDL.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>Внутренняя ошибка {0} поставщика данных .NET Framework.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>Невозможно изменить свойства QuotePrefix и QuoteSuffix после того, как создана команда Insert, Update или Delete.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>Требуется инициализировать свойство DataAdapter.SelectCommand.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>Требуется инициализировать свойство DataAdapter.SelectCommand.Connection;</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}".</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}", неправильное использование кавычек.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}", недостаточное текущее предельное значение "{2}".</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>Сбой SqlBulkCopy.WriteToServer, поскольку SqlBulkCopy.DestinationTableName является недействительным составным именем.</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>Сбой обработки полученных с сервера SQL Server результатов из-за недопустимого составного имени.</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName является недействительным составным именем.</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName является недопустимым именем, состоящим из нескольких частей</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>Сбой SqlCommand.DeriveParameters из-за того, что значение свойства SqlCommand.CommandText является недействительным составным именем.</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>Сбой OdbcCommandBuilder.DeriveParameters из-за того, что значение свойства OdbcCommand.CommandText является недействительным составным именем.</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>Сбой OleDbCommandBuilder.DeriveParameters из-за того, что значение свойства OleDbCommandBuilder.CommandText является недействительным составным именем.</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>Подключение к зеркальному экземпляру SQL Server с использованием параметра MultiSubnetFailover не поддерживается.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>Сбой сопоставления столбцов из SourceColumn "{0}" из-за того, что DataColumn "{1}" является вычисляемым столбцом.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>Не поддающееся преобразованию несоответствие типов между SourceColumn "{0}" из {1} и DataColumn "{2}" из {3}.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>В DataTable "{1}" отсутствует DataColumn "{0}" для данного SourceColumn "{2}".</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>Значение SourceColumn не должно быть пустой строкой.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>Отсутствует сопоставление SourceColumn для "{0}".</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Значение перечисления {0}, {1}, не поддерживается методом {2}.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Поставщик данных .NET Framework для ODBC не поддерживает значение перечисления {0} "{1}".</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Поставщик данных .NET Framework для OLE DB не поддерживает значение перечисления {0} "{1}".</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>Поставщик данных .NET Framework для SQL Server (SqlClient) не поддерживает значение перечисления {0} "{1}".</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>Не удалось извлечь ComputerNameDnsFullyQualified, {0}.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>Для SourceTable "{1}" отсутствует DataTable "{0}".</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>Значение SourceTable не должно быть пустой строкой</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>Отсутствует сопоставление для SourceTable: "{0}"</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: Свойство CommandText не инициализировано</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: Свойство Connection не инициализировано.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>Для {0} нужно открытое и доступное подключение Connection. {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: Свойство SelectCommand.Connection не инициализировано.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: Свойство SelectCommand.Connection не инициализировано.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: Свойство SelectCommand.Connection не инициализировано.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>Для обновления требуется, чтобы InsertCommand имел объект подключения. Свойство Connection для InsertCommand не инициализировано.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>Для обновления требуется, чтобы UpdateCommand имел объект подключения. Свойство Connection для UpdateCommand не инициализировано.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>Для обновления требуется, чтобы свойство DeleteCommand имело объект подключения. Свойство Connection для DeleteCommand не инициализировано.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>Для обновления требуется объект подключения. Свойство Connection не инициализировано.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>Для обновления требуется, чтобы клон команды имел объект подключения. Свойство Connection для клона команды не инициализировано.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>Для обновления требуется подключение.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Для элемента Update требуется, чтобы команда {0}Command имела открытый объект подключения {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Для элемента Update требуется, чтобы команда {0}Command имела открытый объект подключения {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Для элемента Update требуется, чтобы команда {0}Command имела открытый объект подключения {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Для элемента Update требуется, чтобы команда обновления имела открытый объект подключения. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>Сохраненная процедура "{0}" не существует.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>Транзакция, назначенная этой команде, должна быть отложенной локальной транзакцией с наибольшим уровнем вложенности.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>Транзакция не связана текущим соединением или уже завершена.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>Транзакция, связанная с текущим соединением, завершена, но не удалена.  Это соединение можно будет использовать для выполнения инструкций SQL только после удаления транзакции.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>{0} требует, чтобы команда имела транзакцию, если подключение, назначенное команде, находится в отложенной локальной транзакции Свойство Transaction для команды не инициализировано.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>Существует назначенный этой команде открытый SqlResultSet, который требуется предварительно закрыть.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>{0} уже имеет связанный открытый поставщик DataReader, который сначала нужно закрыть.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>DeriveParameters {0} поддерживает только CommandType.StoredProcedure, но не поддерживает CommandType.{1}.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>Метод "{0}" не может быть вызван больше одного раза в одном и том же сеансе.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>Неверный асинхронный результат.</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>Перед вызовом "{0}" не было инициализировано свойство SelectCommand.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>StatementType {0} в этом месте не допускается.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: для имени SourceTable ожидалась непустая строка.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>Недопустимое значение MaxRecords, {0}; значение должно быть неотрицательным.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>Недопустимое значение StartRecord, {0}; значение должно быть неотрицательным.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: для имени SourceTable ожидалась непустая строка.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>Столбцы иерархических глав должны быть сопоставлены с DataColumn со свойством AutoIncrement.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) вернул значение null.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>Указывайте только один элемент в массиве dataTables в случае использования ненулевых значений для startRecords или maxRecords.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Операции Update не удалось найти TableMapping["{0}"] или DataTable "{0}".</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Операция Update: ожидалось непустое имя SourceTable.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>Отсутствует TableMapping при TableMapping.DataSetTable="{0}".</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Для элемента Update требуется действительный клон команды.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>Для автоматического создания SQL во время обновления (Update) требуется действительный SelectCommand.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Для элемента Update требуется действительный InsertCommand при передаче коллекции DataRow с новыми строками.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>Для обновления требуется действительный UpdateCommand при передаче коллекции DataRow с измененными строками.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Для элемента Update требуется действительный DeleteCommand при передаче коллекции DataRow с удаленными строками.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}] принадлежит не тому DataTable, которому принадлежит DataRow[0].</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: ошибки. Дополнительные сведения отсутствуют.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: ошибки. Дополнительные сведения отсутствуют.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>Недействительное значение свойства UpdatedRowSource (UpdateRowSource.FirstReturnedRecord или UpdateRowSource.Both) для команды в процессе пакетирования.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>Нарушение параллелизма: UpdateCommand затронула {0} из ожидаемых {1} записей.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>Нарушение параллелизма: DeleteCommand затронула {0} из ожидаемых {1} записей.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>Нарушение параллелизма: пакетная команда затронула {0} из ожидаемых {1} записей.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>Метод "{0}" не может быть вызван больше одного раза в одном и том же сеансе.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>Недопустимое значение CommandTimeout {0}; значение должно быть &gt;= 0.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: Свойство Size имеет недопустимый размер 0.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>Для метода {0}.Prepare требуется, чтобы для всех параметров был явно указан тип.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>Для метода {0}.Prepare требуется, чтобы всем параметрам переменной длины был в явном виде присвоен ненулевой Size.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>Для метода {0}.Prepare требуется, чтобы для параметров типа "{1}" были в явном виде заданы Precision и Scale.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>Вызов несоответствующего завершающего метода для asyncResult. Ожидался вызов {0}, но был вызван {1}.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>Недопустимая операция. Подключение закрыто.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>Подключение отключено.</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>Невозможно включить в транзакцию, т.к. через данное подключение выполняется локальная транзакция. Завершите локальную транзакцию и повторите попытку.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>Для этого подключения транзакция уже внесена в список. Завершите текущую транзакцию и повторите попытку.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>База данных не может быть пустой, не может являться пустой строкой или строкой, заполненной только пробелами или знаками табуляции.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>Слишком длинный аргумент.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Недопустимое значение "времени ожидания подключения" Connect Timeout. Оно должно быть целым неотрицательным числом.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>Недопустимое смещение в исходном буфере (размер: {0}): {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>Недопустимое смещение в конечном буфере (размер: {0}): {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>Численное значение не умещается в 96-разрядном десятичном числе.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>Недопустимая попытка {0} при закрытом потоке.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>Указанное значение SeekOrigin недействительно.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>Динамическое создание SQL для нескольких базовых таблиц не поддерживается.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>Динамическое создание SQL не поддерживается для SelectCommand, не возвращающего никакой информации о базовой таблице.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>Динамическое создание SQL для DeleteCommand не поддерживается для SelectCommand, не возвращающей никаких сведений о столбце ключей.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>Динамическое создание SQL для UpdateCommand не поддерживается для SelectCommand, не возвращающей никаких сведений о столбце ключей.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>Динамическое создание SQL для DeleteCommand не поддерживается для SelectCommand, не содержащей столбца, в котором указаны версии строк.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>Динамическое создание SQL для UpdateCommand не поддерживается для SelectCommand, не содержащей столбца, в котором указаны версии строк.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>Динамическое создание SQL не поддерживается для имен таблиц "{0}", содержащих знак QuotePrefix или QuoteSuffix "{1}".</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>Недопустимая попытка считывания из столбца с порядковым номером "{0}". С помощью CommandBehavior.SequentialAccess считывание разрешено только из столбцов с порядковым номером "{1}" и выше.</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>Тип данных "{0}" не может быть отформатирован в качестве литерала, поскольку имеет недопустимые разряды даты и времени.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>Значение не может быть отформатировано в качестве литерала требуемого типа.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>Тип данных "{0}" не может быть отформатирован в качестве литерала, поскольку имеет недопустимый максимальный масштаб.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>Указанное значение константы недопустимо для типа данных "{0}".</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>"{0}":длина значения литерала должна быть четным значением.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>"{0}":значением литерала должна быть строка шестнадцатеричных цифр</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>Если не указан префикс с кавычками, то для {0} требуется открытое подключение.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>Не удалось определить правильные значения логических констант. Логические литералы Boolean literals не могут быть созданы.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>Константы собственного типа данных, назначенные типу данных "{0}", не поддерживаются.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>Недопустимый тип данных параметра {0}.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>Отсутствует сопоставление типа объекта {0} с известным собственным типом управляемого поставщика.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>Не удалось обработать неизвестный код TypeCode {0}, возвращенный типом {1}.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>Отсутствует сопоставление DbType {0} с известным {1}.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>Используемая версия SQL Server не поддерживает тип данных "{0}".</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>Значение параметра "{0}" вне допустимого диапазона.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>Указанное имя параметра "{0}" является недопустимым.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>Параметры с несколькими возвращаемыми значениями не поддерживаются.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>Недопустимое значение параметра размера "{0}". Значение должно быть больше или равно 0.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>Недопустимое значение для аргумента "{0}". Значение должно быть больше или равно нулю.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>Недопустимое значение для этих метаданных.</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>Метаданные должны быть SqlDbType.Row</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>Не удалось преобразовать значение параметра из {0} в {1}.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} не поддерживает параллельные транзакции.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>Данный {0} завершен; его повторное использование невозможно.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>Нельзя вызвать "{0}", если запись доступна только для чтения.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>Нельзя вызвать "{0}", если запись DbDataRecord доступна только для чтения.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>Неявное преобразование типа объекта "{0}" в тип данных "{1}" не поддерживается.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>Смещение в буфере "{1}" и доступные байты "{0}" в сумме больше, чем длина, переданная в буфер.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>Длина данных "{0}" меньше 0.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>Указанная длина "{0}" находится вне допустимого диапазона.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>Недопустимая попытка {2} для dataIndex "{0}". При CommandBehavior.SequentialAccess считывание разрешается только при dataIndex "{1}" и больше.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>Смещение должно ссылаться на позицию в пределах значения.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"Управляемому поставщику ODBC необходимо, чтобы для коллекции индексов GetSchema ограничение TABLE_NAME было определено и не было пустым.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>Недопустимое значение аргумента для метода "{0}".</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>Поставщик ODBC не вернул результаты из SQLGETTYPEINFO.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>Непредусмотренный аргумент DataTable null</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>Непредусмотренный неопределенный аргумент null DataSet.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>Длина строки подключения превышает максимальную разрешенную величину {0}.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} — не удается произвести сопоставление типа.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>Неизвестный тип SQL - {0}.</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>Неизвестный тип URT - {0}.</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>Недопустимый отрицательный аргумент!</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>Невозможно назначить свойство для открытого подключения.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>Отсутствует действительное сопоставление SQL_TRANSACTION "{0}" значению перечисления System.Data.IsolationLevel.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} - не удалось активировать использование пула подключений...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} - не удалось выделить дескриптор среды.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} — не удалось получить дескриптор.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>Отсутствует в транзакции</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>Недопустимое значение value={0} перечисления OdbcType.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>Используйте IsDBNull, если ожидаются данные DBNull.Value.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} - информация об ошибках недоступна</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>Соединение закрыто.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>Внутреннее соединение не имеет владельца.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>Поставщик данных .NET Framework для ODBC требует наличия компонентов доступа к данным MDAC как минимум версии 2.6. Найдена установленная версия {0}.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>Поставщик данных .NET Framework для OLE DB требует наличия компонентов доступа к данным MDAC как минимум версии 2.6. Найдена установленная версия {0}.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>Интерфейс "{0}" не поддерживается поставщиком "{1}". GetOleDbSchemaTable недоступен в составе текущего поставщика.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>Сбой "{0}" без сообщения об ошибке, код результата: {1}.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>Сообщение об ошибке не предусмотрено, код результата: {0}.</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>Поставщики данных .NET Framework требуют наличия компонентов доступа к данным MDAC. Установите эти компоненты как минимум версии 2.6.</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>Поставщик данных .NET Framework для OLE DB (Microsoft.Data.OleDb) не поддерживает поставщик Microsoft OLE DB для драйверов ODBC (MSDASQL). Используйте поставщик данных .NET Framework для ODBC (System.Data.Odbc).</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>Поставщик данных .NET Framework для OLE DB не позволит поставщику OLE DB отправлять пользователю запросы в неинтерактивной среде.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>Поставщик "{0}" не зарегистрирован на локальном компьютере.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>Интерфейс ICommandText не поддерживается поставщиком "{0}". Используйте CommandType.TableDirect.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>Интерфейс ITransactionLocal не поддерживается поставщиком "{0}". Локальные транзакции недоступны с помощью текущего поставщика.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>Формат строки инициализации не соответствует спецификации OLE DB. Начинается с char[{0}] в строке подключения.</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>"Асинхронная обработка" не является поддерживаемой функцией поставщика данных .NET Framework для OLE DB (System.Data.OleDb).</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>В ConnectionString не задан поставщик OLE DB. Образец задания поставщика: "Provider=SQLOLEDB;".</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>Недопустимо большая длина указанного в ConnectionString поставщика OLE DB.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>Для поля DbInfoKeywords из OleDbSchemaGuid ограничений не предусмотрено.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>Для поля DbInfoLiterals из OleDbSchemaGuid ограничений не предусмотрено.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>Для идентификатора схемы guid OleDbSchemaGuid ограничений не предусмотрено.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>OleDbSchemaGuid {0} не является схемой, поддерживаемой поставщиком "{1}".</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>Параметр конфигурации "{0}" имеет неверное число значений.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>Не удается загрузить файл XML, указанный в параметре конфигурации "{0}".</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>Параметр команды [{0}] "{1}" является недопустимым.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>Невозможно преобразовать значение данных параметра команды [{0}] "{1}" по причине, отличной от несоответствия знака или переполнения данных.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>Сбой преобразования для параметра команды[{0}] "{1}" из-за того, что значение данных имеет знак, а поставщик использует тип без знака.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>Сбой преобразования параметра команды[{0}] "{1}" в силу того, что для значения данных произошло переполнение типа, используемого поставщиком.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>Поставщик обнаружил ошибку при передаче значения параметра команды [{0}] "{1}" и прекратил обработку.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>Параметр [{0}] "{1}" не имеет значения по умолчанию.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>Ошибка, связанная с параметром [{0}]: {1}.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Внутренняя ошибка System.Data.OleDb.OleDbDataAdapter. Недопустимый параметрический метод доступа: {0} {1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Параметр Parameter[{0}]: свойство OleDbType не инициализировано: OleDbType.{1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>Интерфейс ICommandWithParameters не поддерживается поставщиком "{0}". Параметры команды не поддерживаются текущим поставщиком.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>Извлечение сведений о параметрах процедур не поддерживается поставщиком "{0}".</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>Не удается определить используемый сервером разделитель для десятичной дробной части. Невозможно создать нецелую числовую константу.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>Объект не является ни ADODB.RecordSet, ни ADODB.Record.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>Не удалось извлечь интерфейс "{0}" из объекта ADODB.RecordSet.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: Свойство Size имеет недопустимый размер 0.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>Не удалось извлечь интерфейс IRow из объекта ADODB.Record.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>Для метода {0}.Prepare требуется, чтобы для всех параметров был явно указан тип.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>Тип не поддерживает интерфейс OLE DB ISourcesRowset</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>Для метода {0}.Prepare требуется, чтобы всем параметрам переменной длины был в явном виде присвоен ненулевой Size.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>Не удается создать коллекцию схемы ReservedWords, поскольку поставщик не поддерживает IDBInfo.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>Для метода {0}.Prepare требуется, чтобы для параметров типа "{1}" были в явном виде заданы Precision и Scale.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>Значение свойства не задано, поскольку поставщик не поддерживает свойство "{0}" либо пользователь попытался получить или задать значения свойств, не входящих в группу свойств инициализации, после инициализации объекта источника данных.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>Вызов несоответствующего завершающего метода для asyncResult. Ожидался вызов {0}, но был вызван {1}.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>При попытке инициализации свойства "{0}" произошел сбой. Возможные причины:
-	Тип данных значения не соответствовал типу данных свойства и был определен. Например, для свойства DBPROP_MEMORYUSAGE (тип данных Int32) указано значение с типом данных Int64.
-	Недопустимое значение. Например, для свойства DBPROP_MEMORYUSAGE указано отрицательное значение.
-	Указано действительное значение, но поставщик, поддерживая настройку свойства, не поддерживает именно этого значения. Например, значение добавлено к свойству в OLE DB после написания поставщика.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>Недопустимая операция. Подключение закрыто.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>Недействительное значение Options.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>Невозможно включить в транзакцию, т.к. через данное подключение выполняется локальная транзакция. Завершите локальную транзакцию и повторите попытку.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>Недействительный элемент ColumnID.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>Для этого подключения транзакция уже внесена в список. Завершите текущую транзакцию и повторите попытку.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>По определению свойство "{0}" должно применяться ко всем столбцам, но для одного или нескольких из них сделать это невозможно.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>База данных не может быть пустой, не может являться пустой строкой или строкой, заполненной только пробелами или знаками табуляции.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>Свойство "{0}" доступно только для чтения либо потребитель пытался установить значения свойств в группе Initialization уже после инициализации объекта источника данных. Потребитель может присвоить свойству, которое доступно только для чтения, его текущее значение. Это состояние возвращается также, если настраиваемое свойство столбца не может быть установлено для определенного столбца.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>Недопустимое смещение в исходном буфере (размер: {0}): {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>Необязательному свойству "{0}" указанное значение присвоено не было и это невозможно.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>Недопустимое смещение в конечном буфере (размер: {0}): {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>Значение свойства "{0}" не было установлено, поскольку это привело бы к возникновению конфликта с существующим свойством.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>Недопустимая попытка {0} при закрытом потоке.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(зарезервировано).</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>Указанное значение SeekOrigin недействительно.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>Поставщик вернул неизвестное значение DBPROPSTATUS_ "{0}".</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>Недопустимая попытка считывания из столбца с порядковым номером "{0}". С помощью CommandBehavior.SequentialAccess считывание разрешено только из столбцов с порядковым номером "{1}" и выше.</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>Проверка корректности функции доступа была отложена и выполнена при возвращении методом данных. Для этого столбца или параметра привязка была недействительной.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>Недопустимый тип данных параметра {0}.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>Внутренняя ошибка OleDbDataAdapter: недопустимая функция доступа к набору строк: Ordinal={0} Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>Отсутствует сопоставление типа объекта {0} с известным собственным типом управляемого поставщика.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>Невозможно преобразовать значение данных по причине, отличной от несоответствия знака или переполнения данных. Например, данные были повреждены в хранилище данных, но строку все еще можно считать.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>Не удалось обработать неизвестный код TypeCode {0}, возвращенный типом {1}.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>Данный поставщик не может выделить память, в которую возвращаются данные {0}.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>Отсутствует сопоставление DbType {0} с известным {1}.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>Сбой преобразования из-за того, что для значения данных {0} произошло переполнение типа, указанного для части значения {0} в буфере потребителя.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>Используемая версия SQL Server не поддерживает тип данных "{0}".</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>Внутренняя ошибка OleDbDataAdapter: [get] Неизвестный тип данных OLE DB: 0x{0} ({1}).</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>Значение параметра "{0}" вне допустимого диапазона.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>Сбой преобразования из-за того, что значение данных {0} имеет знак, а для части значения {0} в буфере потребителя указан тип без знака.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>Указанное имя параметра "{0}" является недопустимым.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>Внутренняя ошибка OleDbDataAdapter: [set] Неизвестный тип данных OLE DB: 0x{0} ({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>Недопустимое значение параметра размера "{0}". Значение должно быть больше или равно 0.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>Поставщик не смог определить значение {0}. Например, строка только что была создана, значение по умолчанию для столбца {0} не было доступно, а потребитель еще не задал нового значения {0}.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>Недопустимое значение для аргумента "{0}". Значение должно быть больше или равно нулю.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>Поставщик OLE DB возвратил непредусмотренное значение состояния, {0}.</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>Недопустимое значение для этих метаданных.</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>OleDbDataReader.Read должен выполняться в том же потоке, к котором был создан, если значением свойства ApartmentState этого потока не было ApartmentState.MTA.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>Не удалось преобразовать значение параметра из {0} в {1}.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>Нераспознанная ошибка: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} не поддерживает параллельные транзакции.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>Сбой IErrorInfo.GetDescription с {0}.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>Данный {0} завершен; его повторное использование невозможно.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>Сбой IErrorInfo.GetSource с {0}.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>Указанная длина "{0}" находится вне допустимого диапазона.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>Поставщик данных .NET Framework для OLE DB (System.Data.OleDb) не поддерживает данные DBTYPE_VECTOR.</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>Недопустимая попытка {2} для dataIndex "{0}". При CommandBehavior.SequentialAccess считывание разрешается только при dataIndex "{1}" и больше.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>Недопустимое значение минимального или максимального размера пула; минимальный размер пула не может быть больше максимального размера пула.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>Ключевое слово "{0}" является устаревшим. Используйте вместо него "{1}".</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>Не удалось получить от сервера адрес координатора распределенных транзакций (DTC) для сервера. Убедитесь, что координатор распределенных транзакций (DTC) на сервере включен.</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>Длина значения параметра подключения &lt;{0}&gt; превышает предельно допустимую длину в 65 535 знаков.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>Недопустимый "Packet Size". Значение должно быть целым числом в диапазоне от 512 до 32 768 включительно.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>Недопустимая транзакция или недопустимое имя для точки сохранения в транзакции.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>Значение перечисления {0}, {1}, не поддерживается SQL Server 7.0 и SQL Server 2000.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>Параметры User Instance и Failover несовместимы. Используйте в строке подключения только один из них.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>Не удается задать свойство "Credential", если в строке подключения указано "Authentication=Active Directory Integrated".</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>Указаны неверные параметры проверки подлинности с использованием сертификата.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>Экземпляр SQL Server, к которому устанавливалось подключение, требует шифрования, но оно не поддерживается этим компьютером.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>Экземпляр SQL Server, к которому устанавливалось подключение, не поддерживает шифрования.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>Экземпляр SQL Server, к которому вы пытались подключиться, не поддерживает CTAIP.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>Неподдерживаемая версия SQL Server. Поставщик данных .NET Framework для SQL Server (SqlClient) поддерживает только SQL Server 7.0 и более поздние версии.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>Нельзя изменить {0}, когда выполняется асинхронная операция.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>Для этой команды необходимо асинхронное подключение. Укажите в строке подключения «Asynchronous Processing=true».</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>Истекло время ожидания для попытки подключения.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>Истекло время ожидания. Подключение разорвано.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>Сбой экземпляра.</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>Код ошибки: 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>Для ChangePassword требуется SQL Server 9.0 или более поздней версии.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>Перенаправление экземпляра SSE не поддерживается для нелокальных пользовательских интерфейсов.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>Проверка подлинности "{0}" не поддерживается.</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>Метод проверки подлинности SQL "{0}" не поддерживается.</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>Не удалось создать экземпляр поставщика проверки подлинности с типом "{1}" для "{0}".</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>Не удалось создать экземпляр SqlAuthenticationInitializer с типом "{0}".</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>При инициализации поставщика "{0}" возникло исключение.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>Поставщик "{0}" не поддерживает проверку подлинности "{1}".</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Не удается найти поставщик проверки подлинности для "{0}". Установите пакет NuGet "Microsoft.Data.SqlClient.Extensions.Azure" (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) для использования методов проверки подлинности Active Directory (Entra ID).</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>Не удалось прочитать раздел конфигурации для поставщиков проверки подлинности.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Параметр «{0}» не может иметь значение NULL или быть пустым.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>Асинхронная операция уже завершилась.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>Выполнение команды не может быть продолжено до завершения отложенной асинхронной операции.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>В ExecuteXmlReader передана недопустимая команда. Команда должна возвращать результат Xml.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>Для уведомлений требуется SQL Server 9.0 или более поздней версии.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>Недопустимый трехэлементный формат имени для UdtTypeName.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>Невозможно инициализировать пакет SSPI.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Истекло время ожидания (Timeout). Время ожидания истекло до завершения операции или сервер не отвечает.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>Истекло время ожидания соединения. Время ожидания подключения истекло на начале этапа предварительного согласования. Это могло произойти из-за недостаточно большого временем ожидания соединения.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>В строке подключения был затребован пользовательский экземпляр, но указанный сервер не поддерживает этот параметр.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>Сертификат сервера не прошел проверку приложения.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>Указанная длина данных {0} превышает максимально допустимую длину {1}.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>Недопустимая попытка чтения при отсутствии данных.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>Длина данных "{0}" меньше 0.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>Нельзя вызвать "{0}", если SqlDataRecord доступна только для чтения.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>Сопоставленная коллекция уже используется и сейчас недоступна;</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>Подключение к контексту с помощью Microsoft.Data.SqlClient не поддерживается.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>Вложенные TransactionScopes не поддерживаются.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>Недопустимое серверное событие: {0}.</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>Длина "{0}" должна соответствовать длине "{1}".</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>SqlDbType "{0}" недопустим для {1}. Поддерживается только {2}.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>Слишком много значений.</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>Поток Stream не поддерживает записи.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>NULL</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>Сообщение</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>Арифметическое переполнение.</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>Ошибка деления на нуль.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>Неопределенные данные. Этот метод или свойство не может вызываться для значений равных Null.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>Арифметическая операция над числами вызвала усечение.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>Переполнение SqlDateTime. Должно находиться в пределах от 1/1/1753 12:00:00 AM и 12/31/9999 11:59:59 PM.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>Две соединяемые строки имеют различный порядок следования.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>Две сравниваемые строки имеют различный порядок следования.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>Недопустимое значение флага.</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>Переполнение при преобразовании из SqlDecimal в Decimal.</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>Переполнение при преобразовании.</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>Недопустимая структура SqlDateTime.</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>Указана временная зона. SqlDateTime не поддерживает временных зон.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>Недопустимый размер массива.</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>Недопустимая числовая точность или шкала.</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>Входные данные имели неверный формат.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>Ошибка SqlType.</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>В этой версии SqlBytes и SqlChars не поддерживают длину, превышающую 2 ГБ (2GB).</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>Возникла ошибка при чтении.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Поток Stream закрыт или удален.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>Нет буфера. Сбой операции чтения или записи.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>Невозможно назначить ненулевую длину, поскольку текущее значение равно Null.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>Недостаточный размер буфера. Сбой операции чтения или записи.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>Невозможно выполнить запись с ненулевым смещением, поскольку текущее значение равно Null.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>Невозможно выполнить запись со смещением, которое превышает текущую длину. При этом в буфере останутся неинициализированные данные.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>Размер возвращенных данных превышает 2 ГБ (2Gb). Используйте поведение command behavior SequentialAccess для получения всех данных.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>Аргументом для GetDayOfWeek должно быть целое число в диапазоне от 1 до 7.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>SQL Type не был загружен с данными.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>SQL Type был загружен с данными.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>Недопустимая попытка получить доступ к закрытому XmlReader.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>Недопустимая попытка вызвать {0} при закрытом потоке.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>Недопустимая попытка вызвать {0}, когда поток не поддерживает записи.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>Недопустимая попытка вызвать {0}, когда поток не поддерживает чтения.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>Недопустимая попытка вызвать {0}, когда поток не поддерживает поиска.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>Подклассы не переопределяют необходимый метод.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>Не удается создать нормализатор для "{0}".</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>Внутренняя ошибка</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>Параметр команды должен содержать непустой и определенный текст.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>Длина массива параметров MetaData должна быть равна аргументу массива ParameterDirection.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>Ошибка сопоставления адаптера данных.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>Ошибка адаптера данных.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>Нарушение параллелизма БД.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>Операция прервана.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>Операция прервана из-за исключения (дополнительные сведения см. в InnerException).</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Будет ли Fill вызывать DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Будет ли Update вызывать DataRow.AcceptChanges.</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Переходить ли к следующему DataRow, когда при выполнении Update после событий RowUpdating и RowUpdated возникает Status: UpdateStatus.ErrorsOccurred.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>Как адаптер заполняет DataTable из DataReader.</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>Действие, выполняемое при отсутствии таблицы или столбца в TableMappings.</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>Действие, выполняемое при отсутствии таблицы или столбца в DataSet.</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>Как исходная таблица отображается в таблицу DataSet.</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Событие создается при возникновении устранимой ошибки во время использования метода Fill.</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Должен Fill возвращать особые значения поставщика или обычные значения CLSCompliant.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>Имя исходного столбца - с учетом регистра.</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>Число элементов в данной коллекции</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>Указанный объект DataColumnMapping.</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>Сопоставления отдельных столбцов при соответствии сопоставления этой таблицы.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>Имя исходной таблицы DataTableMapping. Это имя задается с учетом регистра.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>Число элементов в данной коллекции</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>Указанный объект DataTableMapping</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>Используется при обновлении для удаленных строк в DataSet.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Событие создается после каждого DataRow во время обновления.</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>Количество строк, которые необходимо сгруппировать перед выполнением по отношению к источнику данных.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Подключение, которое используется, если у команд Select/Insert/Update/DeleteCommands еще нет подключения.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>Используется при обновлении для удаленных строк в DataTable.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>Используется при операции Update для новых строк в DataTable.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Используется при выполнении Fill.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>Используется при выполнении Update для измененных строк в DataTable.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Должен Fill возвращать особые значения поставщика или обычные значения CLSCompliant.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>Как исходная таблица отображается в DataTable.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>Как создаются команды Insert/Update/DeleteCommands, если они не определены пользователем.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>Количество строк, которые необходимо сгруппировать перед выполнением по отношению к источнику данных.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>Строка подключения, используемая для подключения к источнику данных Data Source.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>Имя драйвера ODBC, который следует использовать для подключения к источнику данных Data Source.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>Имя источника данных DSN, которое следует использовать для подключения к источнику данных Data Source.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>Когда true (истина), то указывает, что необходимо использовать управляемую группировку подключений.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>Файл UDL, который следует использовать для подключения к источнику данных Data Source.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>Указывает, какие службы OLE DB Services необходимо включить или выключить с поставщиком OleDb Provider.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>Имя поставщика OLE DB, который следует использовать для подключения к источнику данных Data Source.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>Имя приложения.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>При значении true (истина) позволяет использовать асинхронные функции в поставщике данных .NET Framework.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>Имя первичного файла прикрепляемой базы данных, включая полный путь.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>Когда true (истина), то указывает, что состояние подключения было сброшено при удалении из пула.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>Когда true (истина), то указывает, что подключение должно устанавливаться из контекста Sql Server. Доступно только, если запущен в процессе Sql Server.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>Имя записи SQL Server Language.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>Указывает метод проверки подлинности с SQL Server.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>Указанный сертификат клиента для проверки подлинности в SQL Server.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>Информация, используемая для подключения к источнику данных.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Время ожидания текущего подключения; не может задаваться в ConnectionString.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>Значение каталога текущего источника данных, "Database=X" в строке подключения.</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>Текущий источник данных, "Server=X" в строке подключения.</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>Текущий драйвер ODBC.</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>Версия продукта, к которому производит доступ драйвер ODBC.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>Информация, используемая для подключения к источнику данных.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Время ожидания текущего подключения; "Connect Timeout=X" в ConnectionString.</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>Значение каталога текущего источника данных, "Initial Catalog=X", в строке подключения.</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>Текущий источник данных, "Data Source=X", в строке подключения.</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>Текущий идентификатор ProgID поставщика OLE DB, "Provider=X" в строке подключения.</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>Версия продукта, к которому производит доступ поставщик OLE DB.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>Токен доступа, который следует использовать для аутентификации.</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>Состояние подключения (синхронное или асинхронное). "Asynchronous Processing=x" в строке подключения.</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>MILSCHK SS: Incorrect term. Please change as follows: Данные, использующиеся при подключении для репликации.</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>Информация, используемая для подключения к DataSource, например, "Data Source=x;Initial Catalog=x;Integrated Security=SSPI".</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>Сбор статистических данных для этого подключения.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>Поставщики хранилища ключей шифрования пользовательского столбца.</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>Идентификатор guid для представления физического соединения.</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Автоматический связующий объект в уведомлениях, использующихся Microsoft SQL Server.</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>Как конструкция Where автоматически создается для команд Update и Delete, если она не указана пользователем.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>Указывает позицию имени каталога в полном имени таблицы в составе текстовой команды.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>Знак, отделяющий имя каталога от остальной части идентификатора в текстовой команде.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>Знак, отделяющий имя схемы от остальной части идентификатора в текстовой команде.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Строка префикса, маркирующая объекты sql.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Строка суффикса, маркирующая объекты sql.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter, для которого будут автоматически создаваться команды.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>Используйте схему из DataTable или SelectCommand.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>Как конструкция Set автоматически создается для команды Update, если она не указана пользователем.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter, для которого будут автоматически создаваться OdbcCommands</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Знак, который используется в текстовых командах в качестве открывающей кавычки для заключения в кавычки идентификаторов, содержащих специальные знаки.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Знак, который используется в текстовых командах в качестве закрывающей кавычки для заключения в кавычки идентификаторов, содержащих специальные знаки.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>DataAdapter, для которого будут автоматически создаваться OleDbCommands</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Разделитель для десятичной дробной части, использующийся в числовых константах.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Строка префикса, маркирующая объекты sql</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Строка суффикса, маркирующая объекты sql</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>DataAdapter, для которого будут автоматически создаваться SqlCommands</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Разделитель для десятичной дробной части, использующийся в числовых константах.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Знак, который используется в текстовых командах в качестве открывающей кавычки для заключения в кавычки идентификаторов, содержащих специальные знаки.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Знак, который используется в текстовых командах в качестве закрывающей кавычки для заключения в кавычки идентификаторов, содержащих специальные знаки.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>Нужно устанавливать только для десятичных и числовых параметров в сценариях Prepare, FillSchema и CommandBuilder.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>Нужно устанавливать только для десятичных и числовых параметров в сценариях Prepare, FillSchema и CommandBuilder.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>Собственный тип параметра.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>Собственный тип параметра.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>Имя данного параметра, например, "@p1"</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>Собственный тип параметра.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>Имя сервера для типа.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>Смещение в типах данных переменной длины.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>Для параметра "{1}" не поддерживается указанное значение ParameterDirection, равное "{0}". Возвращающие табличное значение параметры Table-valued parameters поддерживают только ParameterDirection.Input.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>Имя TypeName, заданное для параметра "{0}".  Имя TypeName следует устанавливать только для структурных параметров Structured.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>Тип SqlDbType.Structured поддерживается только для многозначных типов.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>Столбец DateType для поля "{0}" в таблице схемы имеет значение NULL. Этот столбец должен иметь значение, отличное от null.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>Число полей в записи "{0}" не совпадает с числом полей в первоначальной записи.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>диапазон: 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>Непредвиденная ошибка в поставщике данных SqlClient: {0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>Не удается получить данные о типе Type Info для {0},{1}</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>Поставщику не удалось загрузить следующую сборку {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>Свойство UdtTypeName для параметров UDT должно быть установлено.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>Указанный тип не зарегистрирован на сервере назначения.{0}.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>Не допускается использование параметров UDT в составе конструкции Where, кроме случаев, когда они являются частью первичного ключа.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>"{0}" представляет собой недопустимый определенный пользователем тип, причина: {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>поддерживаются и форматы в памяти, и форматы, определенные пользователем.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>Собственный формат не поддерживается.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>Отсутствует реализация IBinarySerialize</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>не подлежит сериализации</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>нет публичных конструкторов</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>Отсутствует реализация INullable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>не имеет общего конструктора</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>нет атрибута UDT</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>Сериализация без сопоставления пока не поддерживается.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>Отсутствует метод "public static x Parse(System.Data.SqlTypes.SqlString)"</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>Отсутствует метод "public override string ToString()"</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>Отсутствует метод "public static x Null { get; }"</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>Собственный формат не поддерживает полей (напрямую или через другое поле) типа "{0}"</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>Не публичный тип</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Native UDT имеет непоследовательный макет из-за типа "{0}"</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Элемент Native UDT указывает максимальный размер в байтах (byte size)</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>поле "{0}" отмечено как несериализованное</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>Тип поля "{0}" помечен как явный макет, что не допускается в собственном формате</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>Многозначные ссылки на сборку должны иметь ненулевой идентификатор сборки.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>Многозначные типы Structured можно использовать лишь для параметров, их нельзя вложить в другой тип.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>Недопустимый путь.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>Сбой при попытке активизации транзакции.</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>Объект зависимости, использующийся для получения уведомлений о запросах.</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>Свойство, позволяющее определить, допустима ли данная зависимость.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>Для добавления команды к существующему объекту зависимости.</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Команда Command уже назначена другому объекту зависимости. Переопределение невозможно.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>Этот объект SqlCommand уже связан с другим объектом SqlDependency.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>Указано недействительное время ожидания Timeout. Время ожидания не может быть отрицательным.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>Ошибка уведомления. Type={0}, Info={1}, Source={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData недопустим для этого SqlDbType.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>dbType {0} недопустим для этого конструктора.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>Внутренняя ошибка. Открытый текст не может иметь значение Null.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>Не удается зашифровать. В результате шифрования было создано {0} байт зашифрованных данных, что превышает максимально допустимое значение, равное {1} байтам. Указанное значение открытого текста вероятнее всего превышает максимально допустимый размер (размер открытого текста: {2} байт).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>Внутренняя ошибка. Зашифрованные данные не могут иметь значение Null.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>SQL Server не вернул сведения об аттестации. Тип анклава — "{0}", а URL-адрес аттестации анклава — "{1}".</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>Не удается установить безопасный канал. Сообщение об ошибке: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>Внутренняя ошибка. При создании объекта типа "{1}" указан аргумент, равный NULL: "{0}". "{0}" не может быть равен NULL.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Указывает конечную точку службы аттестации анклава, которая будет использоваться для проверки того, допустим и безопасен ли анклав, настроенный в экземпляре SQL Server для вычислений в столбцах базы данных, зашифрованных с помощью постоянного шифрования.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>Не удалось прочитать раздел конфигурации для поставщиков анклава. Убедитесь, что раздел правильно отформатирован в файле конфигурации приложения. Сообщение об ошибке: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>Не удалось создать экземпляр поставщика анклава с типом "{1}" для имени "{0}". Сообщение об ошибке: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>Внутренняя ошибка. SqlColumnEncryptionEnclaveProviderName не может быть пустым или иметь значение NULL.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>Возникла ошибка при чтении набора результатов "{0}". Запрос требует вычислений на основе анклава, но в строке подключения не указан URL-адрес аттестации. Тип анклава — "{1}". </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>Внутренняя ошибка. При выполнении запроса, требующего вычислений анклава, из SQL Server получен пустой или равный NULL тип.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>Для выполнения запроса требуются вычисления анклава, но в конфигурации приложения отсутствует раздел поставщика анклава.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>Не найден поставщик для анклава типа "{0}" и протокола аттестации "{1}". Укажите корректный протокол аттестации в строке подключения. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>Параметр шифрования столбца по умолчанию для всех команд подключения.</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>Выполняет принудительное шифрование параметра перед отправкой конфиденциальных данных на сервер. </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>Объект словаря, содержащий имена серверов SQL Server и пути к их доверенным главным ключам столбцов.</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>Соединение с зеркальным экземпляром SQL Server с параметром ApplicationIntent, установленным в значение ReadOnly, не поддерживается.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>Получены непредвиденные сведения о маршрутизации.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>Получены недопустимые данные маршрутизации.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>Указан неподдерживаемый в этом контексте режим проверки подлинности: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Истекло время ожидания интерактивной проверки подлинности Active Directory. Пользователь слишком долго не отвечал на запрос проверки подлинности.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>Невозможно использовать Authentication=Active Directory Interactive, если задано свойство Credential.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>Идентификатор серверного процесса (SPID) активного подключения.</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Истекло время ожидания для проверки подлинности потока кода устройства Active Directory. Пользователь слишком долго не отвечал на запрос проверки подлинности.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>Не удается задать свойство Credential, если в строке подключения указано "Authentication=Active Directory Device Code Flow".</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>Для запрашиваемого действия поддерживаются только одномерные массивы.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>Невозможно удалить указанный элемент, так как он не найден в заданной коллекции.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>Требуется неотрицательное число.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Если в строке подключения указан параметр "Authentication=Active Directory Default", свойство AccessTokenCallback задать не удастся.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>Операция {0} возвратила {1}.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>Ошибка протокола: полученное сообщение содержит действительную подпись, но она не была зашифрована в соответствии с действующим уровнем защиты.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>Произошел сбой {0} с ошибкой {1}.</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>Этот метод в данном классе не реализован.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>Затребованный пакет безопасности не поддерживается.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>Неверный тип physicalConnection.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>Возникло исключение при попытке настроить параметр AppContext "{0}"={1}.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>Тип {0} не поддерживается этой платформой.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>Инвариантный режим глобализации не поддерживается.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Невозможно выполнить проверку подлинности с помощью Kerberos. Убедитесь, что Kerberos инициализирован в клиенте с помощью "kinit", а имя субъекта-службы зарегистрировано в SQL Server для разрешения проверки подлинности Kerberos.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>Ключевое слово "Библиотека сети" не поддерживается этой платформой. Вместо него используйте для параметра "Источник данных" префикс с требуемым протоколом ("tcp:" для TCP-подключения или "np:" для подключения к именованному каналу).</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>Сокет не вызвал ожидаемый "{0}" с кодом ошибки "{1}".</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>Сервер пытается использовать функцию, которая не поддерживается этой платформой.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>Ключевое слово "{0}" не поддерживается этой платформой.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>Загруженная библиотека System.Transactions.dll не поддерживает глобальные транзакции.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>Получен неподдерживаемый токен "{0}" при чтении данных с сервера.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>Тип дескриптора "{0}" не поддерживается.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream не поддерживается этой платформой.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>LocalDB не поддерживается этой платформой.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>Недостаточно места в буфере. Требуется: {0}, фактическое значение: {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>Сбой операции GSSAPI. Состояние: {0} (дополнительное состояние: {1}).</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>Операция GSSAPI завершилось ошибкой — {0} ({1}).</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>Привязка канала не поддерживается в операционных системах, отличных от Windows.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>Если переданы учетные данные по умолчанию, имя целевого объекта не должно быть пустым.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>Запрошенный уровень защиты не поддерживается при установленной в настоящее время реализации GSSAPI.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>Реализация сервера не поддерживается.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>Невозможно выполнить проверку подлинности NTLM с учетными данными по умолчанию на этой платформе.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>При использовании в DataAdapter.Update значение параметра изменяется с DBNull.Value на (Int32)1 или (Int32)0, если определено.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Превышен максимальный размер буфера: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>Отсутствует DataColumn "{0}" для данного SourceColumn "{2}".</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>Список SqlBatchCommand не инициализирован.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index b796999eab..65a0046cfb 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>Artan düzende</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>Bu {1} için geçersiz {0} dizini, Count={2}.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>{0} zaten başka bir {1} içinde yer alıyor.</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>{0} zaten bu {1} içinde yer alıyor.</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0}, yalnızca null olmayan {1} türündeki nesneleri kabul eder.</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>Bu {1} içinde yer almayan bir {0} kaldırılmaya çalışıldı.</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1} benzersiz olmalıdır, '{2}' zaten koleksiyonda var.</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>Bağlantı kapatılmadı. {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>Okuyucu kapalıyken {0} öğesini çağırma girişimi geçersiz.</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>Bağlantı, temsilci seçilen veya yükseltilen bir işlem için birincil bağlantı olduğundan işleme kaydedilemiyor.</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>Azalan düzende</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>'{0}' parametresi için boş olmayan dize bekleniyor.</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>ConnectionString özelliği başlatılmamış.</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>CLS olmayan bir Exception yakalandı.</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>Verilen güvenlik öğesi, izin öğesi değil.</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>Veri</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>Güncelleştir</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>Bağlantının açık ya da kapalı olduğunu gösteren ConnectionState.</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>Bağlantının durumu değiştiğinde harekete geçirilen olay.</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>Parametre genel türü.</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>Giriş veya çıkış parametresi veya çift yönlü parametre.</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>türü kesin olarak belirlenmiş kod oluşturma için kullanılan bir tasarım zamanı özelliği.</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>Değişken uzunlukta veri türlerinde uzaklık.</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>Parametrenin adı.</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>Değişken uzunluklu veri türlerinin boyutu (dize ve diziler).</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>Bir DataAdapter.Update tarafından kullanıldığında, ColumnMappings'de DataSetColumn adını bulmak için kullanılan kaynak sütun adı. Bunun amacı parametre ve veri satırı arasında bir değer kopyalamaktır.</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>Bir DataAdapter.Update tarafından kullanıldığında (yalnızca UpdateCommand), DataRow değerinin veri kaynağını güncelleştirmek için kullanılan sürümü.</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>DataAdapter.Update tarafından kullanıldığında, parametre değeri DBNull.Value değerinden (Int32)1 veya null değilse, (Int32)0 değerine değiştirilir.</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>Parametrenin değeri.</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>SQL sorgusu yürütülemediğinden '{0}' koleksiyonu oluşturulamıyor. Ayrıntılar için iç özel duruma bakın.</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>İstenen şemanın ('{0}') desteklediğinden daha çok kısıtlama sağlandı.</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>'{2}', '{0}' şema koleksiyonunun '{1}' kısıtlaması için geçerli bir değer değil.</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>İstenen koleksiyon ({0}) tanımlı değil.</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>İstenen ({0}) koleksiyonu, sağlayıcının bu sürümü tarafından desteklenmiyor.</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>Gereken DataSourceInformation tablolarından birinin gerekli sütunları eksik.</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>DataSourceInformation tablosu tam olarak bir satır içermelidir.</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>Gereken kısıtlamalar koleksiyonu sütunlarından bir veya daha fazlası eksik.</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>Kısıtlamalar koleksiyonunda kendisiyle eşleşen bir satır olmayan bir kısıtlama var.</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>Meta veri XML’inde '{0}' koleksiyonu eksik.</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>Meta veri XML’i geçersiz.</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>Meta veri XML’i geçersiz. {0} koleksiyonunun bir {1} sütunu içermesi ve bunun bir dize sütunu olması gerekiyor.</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>Meta veri XML’i geçersiz. {0} koleksiyonunun {1} sütunu boş olmayan bir dize içermeli.</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>Eylem</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>Davranış</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>Doldur</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>Bilgiİletisi</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>Eşleme</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>Bildirim</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>Şema</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>Biriktirme</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>Adlandırılmış ConnectionString</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>Güvenlik</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>Bağlantı Dayanıklılığı</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>Özel kullanıcı bilgilerini tutan koleksiyon.</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>DataSet içinde dize karşılaştırmanın büyük/küçük harf duyarlı olup olmadığını gösterir.</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>Bu DataSet'in adı.</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>DataSet'in içerdiği verilerin özel bir "görünümünü" gösterir. Bu görünüm filtrelemeye, aramaya ve özel veri görünümünde gezinmeye olanak sağlar.</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>Kısıtlama kurallarına uyulup uyulmayacağını gösterir.</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>DataSet'te hata olduğunu gösterir.</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>DataSet içindeki dizeleri karşılaştırmada esas alınan yerel ayarı gösterir.</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>Bu DataSet'in işaret ettiği kök öğesinin XML URI ad alanını gösterir.</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>Bu DataSet için kullanılan ad alanının önekini gösterir.</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>Bu DataSet'in ilişkilerini tutan koleksiyon.</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>Bu DataSet'in tablolarını tutan koleksiyon.</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>Aynı ada sahip iki tablonun şemalarını birleştirmek mümkün olmadığında ortaya çıkar.</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>Initialization bitirildikten sonra oluşur.</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>Verilerin alındığı bellek içi önbelleğini gösterir.</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>DataSet içinde dizi karşılaştırmanın büyük/küçük harf duyarlı olup olmadığını gösterir.</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>Bu tablonun alt ilişkilerini döndürür.</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>Bu tablonun sütunlarını tutan koleksiyon.</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>Bu tablonun kısıtlamalarını tutan koleksiyon.</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>Bu tablonun ait olduğu DataSet'i gösterir.</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>Bu, tablonun varsayılan DataView'ıdır.</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>Bu satırın veriye bağlı hesaplamada kullanılan ifade.</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>Tabloda hata olup olmadığını döndürür.</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>Tablo içindeki dizeleri karşılaştırmada esas alınan yerel ayarı gösterir.</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>Bu tablo için başlangıç boyutunu gösterir.</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>Bu tablo içindeki öğelerin XML URI ad alanını gösterir.</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>XML gösteriminde bu tablo için kullanılan alan adının Önekini gösterir.</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>Bu tablonun üst ilişkilerini döndürür.</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>Bu tablonun birincil anahtarını oluşturan sütunları gösterir.</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>Bu tablonun veri satırlarını tutan koleksiyonu gösterir.</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>Bir DataSet'in Tables koleksiyonunda bu tabloyu aramak için kullanılan adı gösterir.</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>Tablodaki bir sütun başarıyla düzenlendiğinde gerçekleşir.</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>Olay işleyicisinin değişikliği değiştirebilmesi veya iptal edebilmesi için satır değiştirilirken gerçekleşir. Kullanıcı, satırdaki değerleri değiştirebilir ve düzenlemeyi iptal etmek için bir özel durum oluşturması gerekir.</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>Tablodaki bir sütun başarıyla silindiğinde gerçekleşir.</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>Tablodaki bir satır silinmek üzere işaretlendiğinde gerçekleşir.  Silme işlemini iptal etmek için özel bir durum oluşturun.</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>Bu sütunun değerlerinden biri gönderildiğinde ortaya çıkar.  Kullanıcı önerilen değeri değiştirebilir ve düzenlemeyi iptal etmek için bir özel durum oluşturması gerekir.</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>Bu sütunun değerlerinden biri değiştiğinde ortaya çıkar.</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>Tablodaki tüm satırlar temizlenmeden önce gerçekleşir.</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>Tablodaki tüm satırlar başarılı bir şekilde temizlendikten sonra gerçekleşir.</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>Yeni bir DataRow örneği oluşturulduktan sonra gerçekleşir.</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>Bir DataSet'in Relations koleksiyonunda bu ilişkiyi aramak için kullanılan ad.</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>Bu ilişkinin alt sütunlarını gösterir.</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>Bu ilişkinin üst sütunlarını gösterir.</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>İlişkilerin iç içe olup olmadığını gösterir.</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>Silme işlemleri için bu ilişkide ne tür bir basamaklandırmanın gerçekleşmesi gerektiğini belirtir.</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>Güncellemeler için bu ilişkide ne tür bir basamaklandırmanın gerçekleşmesi gerektiğini belirtir.</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>Değişiklikleri kabul etmek ve reddetmek için bu ilişki boyunca ne tür bir basamaklandırmanın gerçekleşmesi gerektiğini belirtir.</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>Bu kısıtlamanın alt sütunlarını gösterir.</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>Bu kısıtlamanın üst sütunlarını gösterir.</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>Bu ilişkinin alt tablosunu gösterir.</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>Bu kısıtlamanın sütunlarını gösterir.</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>Kısıtlamanın bir birincil anahtar olup olmadığını gösterir.</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>Bu kısıtlamanın adını gösterir.</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>Bu kısıtlamanın tablosunu gösterir.</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>Bu sütunda null değerlere izin verilip verilmediğini gösterir.</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>Tabloya eklenen yeni eklenen satırlar için sütunun otomatik olarak kendini artırıp artırmadığını belirtir.  Bu sütunun türü Int16, Int32, or Int64 olmalı.</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>AutoIncrement bir sütun için başlangıç değerini gösterir.</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>AutoIncrement bir sütun tarafından kullanılan artım miktarını gösterir.</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>Bu sütunun varsayılan kullanıcı arabirimi başlığını gösterir.</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>Bir DataTable'ın Columns koleksiyonunda bu sütunu aramak için kullanılan adı gösterir.</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>Bu sütunun ait olduğu DataTable'ı döndürür.</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>Bu sütunda depolanan veri türünü gösterir.</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>Tabloya yeni satırlar eklenirken kullanılan varsayılan sütun değerini gösterir.</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>Bu sütunun, her bir satır için kullanıcıdan girdi almak yerine diğer sütunlara dayanarak hesapladığı değeri gösterir.</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>Bu sütunun XML'de ne olarak bulunduğunu gösterir: öznitelik, öğe, basit içerik düğümü veya hiçbir şey.</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>Bu sütunda saklanan öğe ve özniteliklerin XML URI'sini gösterir.</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>xml gösteriminde bu DataColumn için kullanılan Prefix'i gösterir.</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>Bu sütunun Columns koleksiyonundaki dizin numarasını gösterir.</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>Tabloya bir satır eklendikten sonra bu sütunun değişikliklere izin verip vermeyeceğini gösterir.</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>Bu sütunun, tablonun satırlarındaki değerlerini benzersiz olacak şekilde kısıtlayıp kısıtlamayacağını gösterir.</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>Bu sütunun izin verdiği en fazla değer uzunluğunu gösterir.</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>Bu DataColumn'ın DateTimeMode'unu gösterir.</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>Bu DataView ve ilişkili kullanıcı arabiriminin silmeye izin verip vermediğini gösterir.</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>Bu DataView ve ilişkili kullanıcı arabiriminin düzenlemeye izin verip vermediğini gösterir.</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>Bu DataView ve ilişkili kullanıcı arabiriminin yeni satır eklemeye izin verip vermediğini gösterir.</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>Bu görünümdeki geçerli öğe sayısını döndürür.</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>Bu, DataSet'in (varsa) sahibi olan DataViewManager'a geriye bir işaretçi döndürür.</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>Görünümün açık olup olmadığını belirtir.</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>Bu DataView tarafından döndürülen verileri filtrelemek için kullanılan ifadeyi gösterir.</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>Bu DataView tarafından döndürülen veri sürümlerini gösterir.</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>Bu DataView tarafından veri döndürmek için kullanılan sütun adlarını ve düzeni gösterir.</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>Sort özelliği ayarlı olmadığında varsayılan sıralamanın kullanılıp kullanılmayacağını gösterir.</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>Bu DataView'un veri almak için kullandığı tabloyu gösterir.</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>Bu DataView tarafından döndürülen verilerin bir şekilde değiştiğini gösterir.</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>Bu DataViewManager için veri kaynağını gösterir.</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>İlgili DataSet içindeki herhangi bir tablonun sıralama/filtreleme/durum ayarlarını gösterir.</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet, 'union' ve 'list' türlerini simpleType olarak desteklemiyor.</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>Geçersiz {0} sözdizimi: gerekli '{1}' özniteliği eksik.</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>'{1}' değeri '{0}' özniteliği için geçersizdir.</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>'{0}' özniteliğinin değeri '{1}' veya '{2}' olmalı.</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>Bulunamayan ElementType name='{0}'.</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>'{0}' ilişkisinde üst tablo adı eksik.</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>'{0}' ilişkisinde alt tablo adı eksik.</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>'{0}' ilişkisinde üst tablo anahtarı eksik.</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>'{0}' ilişkisinde alt tablo anahtarı eksik.</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>Tanımlanmamış veri türü: '{0}'.</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>Veri türü tanımlı değil.</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>Alan düğümünde geçersiz XPath seçimi. {0} bulunamıyor.</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>Seçici düğümünde geçersiz XPath seçimi: {0}.</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>{0} adlı kısıtlamada geçersiz 'Key' düğümü.</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>{0} kısıtlama adı bu şemada zaten kullanılıyor.</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>'{0}', '{1}' türüne dönüştürülemiyor.</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>'{2}' adlı '{1}' kısıtlamasında '{0}' kısmı eksik.</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>Geçersiz Relation tanımı: anahtarlar farklı uzunlukta.</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet, '{0}' adlı ComplexType içindeki döngüsel başvuruya izin vermiyor.</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet, {0} düğümü için soyut ComplexType örneği oluşturamıyor.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>Bir Xml Şeması yazılırken çoklu hedef dönüştürücüde bir hata oluştu.  Ayrıntılar için iç özel duruma bakın.</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>Bir Xml Şeması yazılırken çoklu hedef dönüştürücüde bir hata oluştu.  Null veya boş bir dize döndürüldü.</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>Yinelenen bildirim '{0}'.</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>diffGram yüklenemiyor. Hedef veri kümesinde '{0}' tablosu eksik.</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>diffGram yüklenemiyor. 'sql' düğümü eksik.</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>Sütun adı '{0}' farklı eşleştirme türleri için tanımlı.</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>Önek '{0}' geçerli değil, özel karakterler içeriyor.</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>Kendi kendine iç içe '{0}' tablosunda döngüsel başvuru.</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet varlıkları genişletemiyor. XmlValidatingReader kullanın ve EntityHandling özelliğini buna göre ayarlayın.</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>'{0}' türü IXmlSerializable arabirimini uygulamadığından serileştirme işlemi sürdürülemiyor.</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>Seri durumdan çıkarma işlemine devam edilemiyor. Veriler IXMLSerializable uygulamadığından, değişik aşamalardan geçme desteklenmiyor.</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable, Xml'den şema çıkarsamayı desteklemiyor.</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>DataTable '{0}' seri hale getirme işlemine devam edilemiyor. Aynı Yabancı Anahtarda birden çok üst satırı olan bir DataRow içeriyor.</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>Girdi Schema içinde IsDataSet özniteliği eksik.</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>DataSet Öğesi belirlenemiyor. IsDataSet özniteliği birden çok kez var.</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet, IDynamicMetaObjectProvider'ı uygulayan ancak beraberinde IXmlSerializable'ı da uygulamayan türleri seri hale getirmez.</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>Özellik uygulanmadı. {0}.</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>Söz dizimi hatası: ‘{0}’ işlecinden sonra işlenen eksik.</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>'{0}' ifadesinde tür uyuşmazlığı.</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>İfade çok karmaşık.</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>[{0}] sütunu bulunamadı.</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>İfade geçersiz dize sabiti içeriyor: {0}.</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>İfade, tanımlanmamış işlev çağrısı içeriyor: {0}().</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>İfadede sözdizimi hatası var.</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>Geçersiz sayıda bağımsız değişken: işlev {0}().</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>İfadenin kapanış parantezi eksik.</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>{1} konumundaki '{0}' belirteci yorumlanamıyor.</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>{0} bekleniyor ancak {2} konumundaki belirteç gerçekte {1}.</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>{0} ile {1} arasında dönüştürme yapılamıyor.</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>'{0}' değeri, {1} Türüne dönüştürülemiyor.</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>Geçersiz sütun adı [{0}].</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>İfade, geçersiz bir tarih sabiti içeriyor: '{0}'.</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>IN işlecinin ifade listesinde yalnızca sabit ifadelere izin verilir.</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Like işlecinde hata: Dize deseni '{0}' geçersiz.</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>Sözdizimi hatası: IN anahtar sözcüğünü izleyen öğeler virgülle ayrılmış ve parantez içine alınmış olmalıdır.</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>İşlev bağımsız değişkeninde tür uyuşmazlığı: {0}(), bağımsız değişken {1}, {2} bekleniyor.</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>İşlev bağımsız değişkeninde tür uyuşmazlığı: {0}(), bağımsız değişken {1}, Tamsayı türlerinden biri bekleniyor.</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>{1} ve {2} üzerinde '{0}' işlemi gerçekleştirilemiyor.</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>'{0}' işleci, '{1}' ve '{2}' türündeki işlenenler üzerinde belirsizdir. İmzalı ve imzasız türler karıştırılamaz. Lütfen açık Convert() işlevini kullanın.</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>Sözdizimi hatası: IN anahtar sözcüğünün arkasından boş olmayan bir virgülle ayrılmış ifade listesi gelmelidir ve ayrıca parantez içine alınmış olmalıdır.</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>İfade, desteklenmeyen '{0}’ işlecini içeriyor.</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>İfade geçersiz bir ad içeriyor: '{0}'.</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>Söz dizimi hatası: ‘{0}’ işlecinden önce işlenen eksik.</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>İfadede çok fazla sayıda kapanış parantezi var.</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>[{0}] tablosu birden fazla ilişkide yer alır. '{1}' ifadesinde açıkça bir ilişki adından bahsetmelisiniz.</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>Toplama bağımsız değişkeninde sözdizimi hatası: 'Child' niteleyicisine sahip olma ihtimali olan tek bir sütun argümanı bekleniyor.</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>'{0}' toplama ifadesinde bağlı olmayan başvuru.</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>Geçerli satır olmadan sabit olmayan ifade değerlendirilemez.</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>'{0}' ifadesinde bağlı olmayan başvuru.</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>Değerlendirilemiyor. '{0}' ifadesi bir toplama değil.</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>'{0}' filtre ifadesi, bir Boole koşulu sonucu vermiyor.</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>Geçersiz tür adı: ‘{0}’.</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>Arama ifadesinde sözdizimi hatası: 'Parent' anahtar sözcüğü ve ardından olası ilişki niteleyicisine sahip tek bir sütun bağımsız değişkeni bekleniyor: Parent[(&lt;relation_name&gt;)].&lt;column_name&gt;.</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>DataFilter'ı Çağırmak için satır veya tablo gerekli.</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>{0}() bağımsız değişkeni aralığın dışında.</value>
-  </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>Sözdizimi hatası: Geçersiz 'Is' işleci kullanımı. Doğru sözdizimi: &lt;expression&gt; Null [Not].</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>Uzaklık ve uzunluk dizi sınırlarının dışında yada sayı, dizinden kaynak koleksiyonun sonuna kadar olan öğelerin sayısından daha büyük.</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>Değer, '{0}' Türü için çok büyük ya da çok küçük.</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>'{0}' türündeki nesne '{1}' türündeki nesneye dönüştürülemiyor.</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>Sıfıra bölme hatasıyla karşılaşıldı.</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>'{0}' özelliği için yalnızca '{1}' değeri kabul edilebilir.</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>'{0}' üst ilişkisi bulunamadı.</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>'{0}' özelliği için '{1}' veya '{2}' değeri kabul edilebilir.</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>'hours' bağımsız değişkeni geçerli aralığın dışında. Değer -14 ile +14 arasında olmalıdır.</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>Belirtilen QuotePrefix ve QuoteSuffix değerleri eşleşmiyor.</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>'minutes' bağımsız değişkeni aralığın dışında. Değer -59 ile +59 arasında olmalıdır.</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>'{0}' bağımsız değişkeninin uzunluğu, bu değişkenin '{1}' sınırını aştı.</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>İlk zaman için sağlanan aralık, toplamda 14 saati aşıyor.</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>'{0}' anahtarı için geçersiz değer.</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>Sağlanan DateTime bağımsız değişkeninin Kind özelliği, 'hours' ve 'minutes' bağımsız değişkenleriyle eşleşmiyor.</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>'{0}' anahtarının kullanımı için '{1}' anahtarının olması gerekir.</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>'{0}’ türünde DataColumn, ifadeyi desteklemiyor.</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>'{0}' anahtarına ait değerin uzunluğu, anahtarın '{1}' sınırını aştı.</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>Kısıtlamalar etkinleştirilemedi. Bir veya daha fazla satır; null olmama, benzersiz olma veya yabancı anahtar kısıtlamalarını ihlal eden değerler içeriyor.</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>Anahtar sözcük desteklenmiyor: '{0}'.</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>Koleksiyonun kendisi değiştirilebilir değil.</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>Dahili .NET Framework Veri Sağlayıcısı hatası {0}.</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>Verilen ad ‘{0}’, koleksiyon nesnesinde büyük/küçük harf uyumu gözetilmediğinde en az iki adla eşleşiyor ancak gözetildiğinde ikisi ile de eşleşmiyor.</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}".</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>Verilen ad ‘{0}’, koleksiyon nesnesinde, ad alanları farklı olan en az iki adla eşleşiyor.</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}", tırnak işaretlerinin yanlış kullanımı.</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>Uzaklık ve uzunluk dizi sınırlarının dışında yada sayı, dizinden kaynak koleksiyonun sonuna kadar olan öğelerin sayısından daha büyük.</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}", geçerli "{2}" sınırı yetersiz.</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>'{0}' bağımsız değişkeni aralığın dışında.</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>SqlBulkCopy.DestinationTableName geçersiz bir çok parçalı ad olduğundan SqlBulkCopy.WriteToServer başarısız oldu</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>'{0}' bağımsız değişkeni null olamaz.</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>Geçersiz bir çok parçalı ad nedeniyle SQL Server sonuçları işlenemedi</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>'{0}' bağımsız değişkeni null değer içeriyor.</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName geçersiz bir çok parçalı ad</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>{0} sütunu bulunamadı.</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName, geçersiz bir çok parçalı ad</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>'{0}' sütunu zaten DataTable'a ait.</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>SqlCommand.CommandText özelliğinin değeri, geçersiz çoklu bir ad olduğundan SqlCommand.DeriveParameters başarısız oldu</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>'{0}' Sütunu zaten başka bir DataTable'a ait.</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>MultiSubnetFailover bağlantı seçeneğiyle yansıtılmış bir SQL Server örneğine bağlanma desteklenmiyor.</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>DataTable içinde birden fazla SimpleContent sütun olamaz.</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>{0} numaralandırma değeri {1}, {2} metodu tarafından desteklenmiyor.</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>Öğe sütunları veya iç içe ilişkiler içeren tabloya SimpleContent bir sütun eklenemez.</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>{0} numaralandırma değeri, {1}, .NET Framework SqlClient Veri Sağlayıcısı tarafından desteklenmiyor.</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>Bu DataTable'a ait '{0}' adlı bir sütun zaten var.</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: CommandText özelliği başlatılmamış</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>'{0}' adlı sütun eklenemez: bu DataTable'da aynı ada sahip bir iç içe tablo zaten var.</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: Connection özelliği başlatılmamış.</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>Bu DataTable'da '{0}' adlı bir sütun zaten var: aynı ada sahip bir iç içe tablo olamaz.</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} için açık ve kullanılabilen bir Connection gerekiyor. {1}</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>Bu tabloya ait olmayan bir sütun kaldırılamaz.</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>'{0}' saklı yordamı yok.</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>Birincil anahtarın bir parçası olduğundan bu sütun silinemez.</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>İşlem geçerli bağlantıyla ilişkili değil veya tamamlanmış.</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>{0} ilişkisinin üst anahtarının bir parçası olduğundan bu sütun silinemez.</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>Geçerli bağlantıyla ilişkili işlem tamamlandı, ancak atılmadı.  Bağlantının SQL deyimlerini yürütmek için kullanılabilmesi için işlemin atılması gerekiyor.</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>{1} tablosundaki {0} kısıtlamasının bir parçası olduğundan bu sütun silinemez.</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>{0}, komuta atanan bağlantı bekleyen bir yerel işlemde olduğunda komutun bir işleme sahip olmasını gerektirir.  Komuta ait Transaction özelliği başlatılmadı.</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>{0} = {1} ifadesinin bir parçası olduğundan bu sütun silinemez.</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>Bu {0} ile ilişkili, öncelikle kapatılması gereken açık bir DataReader zaten var.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>Hesaplanan bir sütun için AutoIncrement özelliği ayarlanamaz.</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>{0} DeriveParameters yalnızca CommandType.StoredProcedure'ı destekler, CommandType.{1} desteklemez.</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>DefaultValue değeri ayarlanmış bir sütun için AutoIncrement özelliği ayarlanamaz.</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>AutoIncrement bir sütuna DefaultValue ayarlanamaz.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep, sıfır dışında bir değer olmalıdır.</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>Bir DataTable'ın parçası olduğunda ColumnName gereklidir.</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>İçinde veri olan bir sütunun DataType'ı değiştirilemez.</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>Sütun, geçerli bir DataType gerektirir.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>{0} sütununun DefaultValue değerinin türü {1} ve {2} türüne dönüştürülemez.</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>Sütunun DefaultValue değerinin türü {0} ve {1} türüne dönüştürülemez.</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>{0} sütununun DefaultValue değerinin türü {1}, ancak sütunun türü {2}.</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>İfade sütununun ReadOnly özelliği değiştirilemez.</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>İfade sütununun Unique özelliği değiştirilemez.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>AutoIncrement veya Unique olan bir sütun için ifade oluşturulamaz.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>Sütun ReadOnly yapılamadığından ifade ayarlanamaz.</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>Bir kısıtlamanın parçası olduğundan, {0} sütunu için Expression özelliği ayarlanamaz.</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>{0} Expression sütununa dayanan bir kısıtlama oluşturulamaz.</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>İfadede döngüsel bir başvuru olduğundan Expression özelliği ayarlanamaz.</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>'{0}' Sütunu null değerler içeriyor.</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>'{0}' Sütunu null değerlere izin vermiyor.</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>'{0}' sütunu salt okunur.</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>'{0}' Column sütunu benzersiz olmayan değerler içeriyor.</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>'{0}' sütunu, {1} tablosuna ait değil.</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>Sütun bir tabloya ait olmalıdır.</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>&lt;{0}&gt; {1} Sütununda depolanamadı.  Beklenen tür {2}.</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>'{0}' Sütunu null olarak ayarlanamaz. Lütfen bunun yerine DBNull kullanın.</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>'{0}' sütunu ayarlanamıyor. Değer bu sütunun MaxLength sınırını ihlal ediyor.</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength yalnızca dize veri türü için geçerlidir. '{0}' Sütunu MaxLength özelliğini negatif olmayan bir sayı olarak ayarlayamazsınız.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>'{0}' Sütunu MaxLength özelliği '{1}' olarak ayarlanamaz. Tabloda yeni sınırdan daha uzun en az bir dize var.</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>Column '{0}' MaxLength özelliği ayarlanamıyor. Sütun SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>'{0}' Sütunu DataType özelliği {1} olarak ayarlanamaz. Sütun SimpleContent.</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>'{0}' Sütunu MappingType özelliği SimpleContent olarak ayarlanamaz. DataType Sütunu {1}.</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>'{0}' Sütunu MaxLength sınırını aşıyor.</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>'{0}' sütunu DBNull.Value kullanımına izin vermiyor.</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>'{0}' Sütunu Namespace özelliği değiştirilemiyor. Sütun SimpleContent.</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>İçinde veri olduğunda, '{0}' türündeki DataColumn sütununun AutoIncrement özelliği değiştirilemez.</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>'{0}' sütunu, temel alınan '{1}' tablosuna ait değil.</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>'{0}' türüne sahip DataColumn bir complexType. Karmaşık türün değeri Attribute olarak serileştirilemiyor</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>DateTimeMode, yalnızca DateTime türündeki DataColumns sütunlarında ayarlanabilir.</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>'{0}' geçersiz DataSetDateTime değeridir.</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>İçinde veri olan bir tablonun DateTimeMode modu, '{0}' değerinden '{1}' değerine değiştirilemez.</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>'{0}' türü statik Null özelliği veya alanı içermiyor.</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>'{0}' türü IRevertibleChangeTracking'i uygulamıyor; bu nedenle RejectChanges() devam edemez.</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>SetAdded ve SetModified, yalnızca DataRowState' i Değişmeyen DataRows'da çağrılabilir.</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>'{0}' sıra sayısı, maksimum sayıyı aşıyor.</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet tarafından desteklenmeyen: System.Nullable&lt;&gt;.</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>ConstraintCollection içinde olan bir kısıtlamanın adı boş dize olacak şekilde değiştirilemez.</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>{0} kısıtlaması üzerinde kısıtlamalar zorlanamaz.</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>'{0}' Sütunu benzersiz olacak şekilde kısıtlanmış.  '{1}' değeri zaten var.</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>'{0}' kısıtlaması bu DataTable'a ait değil.</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>{0} kısıtlaması bulunamadı.</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>Kısıtlama, koleksiyonda zaten var olan {0} adlı kısıtlamayla eşleşiyor.</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>Bu DataTable'a ait '{0}' adlı bir Constraint zaten var.</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>Bu satırlar şu anda benzersiz değerlere sahip değil.</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>Bu sütunlar bu tabloya işaret etmiyor.</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>Değerlerin tümünün karşılık gelen üst değerleri olmadığından kısıtlama etkinleştirilemez.</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>ForeignKey, {0} tablosuna ait olmadığından bu kısıtlama eklenemez.</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>Bu tabloya ait olmayan bir kısıtlama kaldırılamaz.</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>Benzersiz '{0}' kısıtlaması kaldırılamıyor. Önce '{1}' yabancı anahtar kısıtlamasını kaldırın.</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>{0} ilişkisinde kısıtlamalar zorlandığı ve bu satırın silinmesi alt satırlarını boşta bırakacağı için bu satır silinemez.</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>{0} ilişkisinde kısıtlamalar zorlandığı ve bu değerin değiştirilmesi alt satırları boşta bırakacağı için bu değişiklik yapılamaz.</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>ForeignKeyConstraint {1} kısıtlamaları zorladığı ve {2} içinde alt satırlar olduğu için {0} tablosu temizlenemez.</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>ForeignKeyConstraint {1}, alt anahtar değerlerinin ({0}) üst tabloda var olmasını gerektiriyor.</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>Özellik erişilebilir değil, nedeni: '{0}'.</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>Alt satırları olduğundan ve {0} ilişkisi üzerinde kısıtlamalar zorlandığından bu satır silinemez.</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>Tablonun birincil anahtarı zaten ayarlanmış olduğundan birincil anahtar kısıtlaması eklenemez.</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>İç içe iki ilişkideki alt tablo olan DataTable '{0}' tablosuna kısıtlama eklenemez.</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>Farklı tablolara ait olan Sütunlardan bir Anahtar oluşturulamaz.</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>Sütun sayısı 0 olamaz.</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>{0} sütundan fazla olamaz.</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>Aynı sütun birden fazla listelendiğinde Anahtar oluşturulamaz: '{0}'</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>Bir tablonun birincil anahtarı olduğundan kısıtlama kaldırılamaz.</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>{0} tablosunun birincil anahtarı olduğundan kısıtlama kaldırılamaz.</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>Üst Sütunlar ve Alt Sütunlar'da türü eşleşen sütunlar yok.</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey ve ChildKey özdeş.</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns ve ChildColumns aynı uzunlukla olmalıdır.</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns ve ChildColumns sıfır uzunlukta olmamalıdır.</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>Satır, bu ilişkiyle aynı DataSet'e ait değil.</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>Bir DataSet parçası olduğunda, RelationName gereklidir.</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows, tablosu {1} olan bir satır gerektirir ancak belirtilen satırın Tablosu {0}.</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>Bu ilişkinin bu DataSet'e eklenmesi için DataSet'teki iki tabloyu birbirine bağlaması gerekir.</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRow, tablosu {0} olan bir satır gerektirir ancak belirtilen satırın Tablosu {1}.</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow, Table'ı {0} olan bir alt satır gerektirir, ancak belirtilen satırın Table'ı {1}.</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>Farklı DataSet'lerdeki tablolar arasında ilişki olamaz.</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>Farklı DataSet'lerdeki tablolar arasında ilişki oluşturulamaz.</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>Bu alt sütunlar için bir ilişki zaten var.</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>Bu ilişki, bu ilişki koleksiyonuna ait değil.</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>Bu ilişki zaten başka bir DataSet'e ait.</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>Bu ilişki zaten bu DataSet'e ait.</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>Bu DataSet'e ait '{0}' adlı bir Relation zaten var.</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>{0} ilişkisi bu DataSet'e ait değil.</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>{0} ilişkisi bulunamadı.</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>null bir tabloda koleksiyon oluşturulamaz.</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>Bu koleksiyonun ilişkilerini gösterdiği tablo ait olduğu DataSet'ten çıkarılmış.</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>Bu tablo alt tablo olmadığında, tablonun ParentRelation koleksiyonuna ilişki eklenemez.</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>Bu tablo üst tablo olmadığında, tablonun ChildRelation koleksiyonuna ilişki eklenemez.</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>Bu ilişkinin 'Nested' özelliği false olarak ayarlanamaz.</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>İç içe iki ilişkide, aynı '{0}' tablosu alt tablo olamaz.</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>İç içe ilişkilerde tablo ({0}) kendisinin alt tablosu olamaz.</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>Üst veya alt tablolarında farklı Locale veya CaseSensitive ayarlarına sahip olan bir DataRelation veya Constraint eklenemez.</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>Üst veya Alt Sütunlar bir DataSet içinde değilse, DataRelation oluşturulamaz.</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>Ad alanını devralan '{0}' iç içe tablosunun, farklı ad alanlarına sahip birden çok üst tablosu olamaz.</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>Boş ad alanları olan '{0}' iç içe tablosunun, farklı ad alanlarına sahip birden çok üst tablosu olamaz.</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>Satır, bu ilişkiyle aynı DataSet'e ait değil.</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>Bu işlem tabloda olmayan bir satır üzerinde gerçekleştirilemez.</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>Bu ilişki ve alt satır aynı DataSet'e ait değil.</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>RowChanging olayı içinde önerilen bir değer değiştirilemez.</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>OnRowChanging olayı içinde EndEdit() çağrılamaz.</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>RowChanging olayı içinde BeginEdit() çağrılamaz.</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>OnRowChanging olayı içinde CancelEdit() çağrılamaz.  Bu güncelleştirmeyi iptal etmek için özel durum oluşturun.</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>OnRowDeleting olayı içinde Delete çağrılamaz.  Bu silme işlemini iptal etmek için özel durum oluşturun.</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>Girdi dizisi bu tablodaki sütun sayısından daha uzun.</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>Erişilecek Geçerli veri yok.</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>Erişilecek Özgün veri yok.</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>Erişilecek Önerilen veri yok.</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>Bu satır bir tablodan kaldırıldı ve hiç veri içermiyor.  BeginEdit(), bu satırda yeni veri oluşturulmasına izin verir.</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>Satır üzerinden silinen satır bilgilerine erişilemez.</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>Sürüm Özgün, Geçerli veya Önerilen olmalıdır.</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>{0} konumunda satır yok.</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>Satır ekleme konumu {0} geçersiz.</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>'{1}' adlı tablo için rowOrder value={0} iki kez bulundu.</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>'{0}' tablosunun rowOrder sıralamasında değerler eksik.</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>Verilen DataRow geçerli DataRowCollection içinde değil.</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>Bu satır başka bir tabloya ait.</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>Bu satır zaten bu tabloya ait.</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>Bu satır zaten silinmiş olduğundan silinemez.</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>Bu satır boş.</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>Zaten çıkarılmış olan bir satır çıkarılamaz.</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>Bir alt satırın birden çok üst satırı var.</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>Tanınmayan satır durumu bit deseni.</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>DataSet'in adı boş dize olacak şekilde değiştirilemez.</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>'{0}' adı geçersiz. Bir DataSet, DataTable ile aynı ada sahip olamaz.</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>Şema ad alanı geçersiz. Lütfen bunun yerine şunu kullanın: {0}.</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>CaseSensitive veya Locale özelliği değiştirilemez. Bu değişiklik en az bir DataRelation veya Constraint'in ilişkili tablolarından farklı bir Locale veya CaseSensitive ayarına sahip olmasına neden olur.</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>SchemaSerializationMode özelliği, yalnızca türetilen DataSet tarafından geçersiz kılınırsa ayarlanabilir.</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>PrimaryKey sütunları bu tabloya ait değil.</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>SimpleContent sütunu içeren bir tabloya iç içe ilişki veya öğe sütunu eklenemez.</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>TableName, DataSet'in bir parçası olduğunda gereklidir.</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable'ın bir basit içerik sütunu zaten var.</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>Tablonun birincil anahtarı yok.</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0}, geçerli bir Sort dizisi girişi değil.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>DataTable seri hale getirilemiyor. Bir veya daha fazla DataColumn ifadesinde kullanılan bir DataTable, geçerli DataTable’ın alt öğesi değil.</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>Bu DataTable, yalnızca DataSet’in bir parçası olarak uzaktan kullanılabilir. Bir veya daha fazla İfade Sütunu, diğer DataTable’lara başvuru içeriyor.</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>DataSet ve DataTable’ın uzaktan bağlanma biçimi özellik değerleri farklı olamaz.</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>DataTable seri hale getirilemiyor. DataTable adı ayarlanmamış.</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>Bu DataSet'e ait '{0}' adlı bir DataTable zaten var.</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>Bu DataSet’e ait olan ‘{0}’ adında ve aynı ‘{1}’ ad alanına sahip bir DataTable zaten mevcut.</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>Tablo ({0}), iç içe bir ilişkide kendisinin alt tablosu olamaz: DataSet adı tablo adıyla çakışıyor.</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>'{0}' adı geçersiz. Bir DataTable, DataSet ile aynı ada sahip olamaz.</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable zaten başka bir DataSet'e ait.</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable zaten bu DataSet'e ait.</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>{0} tablosu bu DataSet'e ait değil.</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>Tablo {0} bulunamadı.</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>Mevcut ilişkileri olan bir tablo kaldırılamaz.  Önce ilişkileri kaldırın.</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>ForeignKeyConstraint {1} içinde başvurulduğu için tablo {0} kaldırılamıyor.  Önce kısıtlamayı kaldırın.</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>DataTable '{0}', kaynaktaki hiçbir DataTable ile eşleşmiyor.</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>Hedef DataSet için {0} tanımı eksik.</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>Hedef DataSet için {0} {1} eksik.</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} ve &lt;source&gt;.{0} çakışan özelliklere sahip: DataType özelliği uyuşmazlığı.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey ve &lt;source&gt;.PrimaryKey farklı Length değerine sahip.</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>PrimaryKey'de uyuşmayan sütunlar var: &lt;target&gt;.{0} karşılık &lt;source&gt;.{1}.</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>Anahtarların uyuşmayan sütunları olduğundan {0} İlişkisi birleştirilemez.</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>{0} hedef tablosunda {1} sütununun tanımı eksik.</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>Kaynak tabloda {0} PrimaryKey sütunu yok.</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>RowStates parametresi, DataViewRowState numaralandırması değerlerinin geçerli bir birleşim kümesi olmalıdır.</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>Find, bir satırı Sort düzenine göre bulur ancak Sort düzeni belirtilmedi.</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>Dizini oluşturulan anahtar için {0} değer bekleniyordu ancak {1} değer alındı.</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>{0}() küme işlevi ve Tür: {1} kullanımı geçersiz.</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>Geçersiz depolama türü: {0}.</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>DataSet Xml kalıcılığı '{0}' değerini Char değeri olarak desteklemiyor, lütfen Byte depolamayı kullanın.</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>Değer türü, sütun türüyle uyuşmuyor</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>'{0}' türü IComparable arabirimini uygulamıyor. Karşılaştırma yapılamaz.</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>{0} ayarlanamıyor.</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>Bir DataSet için varsayılan görünüm olan bir DataViewManager’da, DataSet değiştirilemez.</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter, ModifiedOriginals ve ModifiedCurrents'ı aynı anda gösteremez.</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>DataViewManager'dan gelen bir DefaultView veya DataView üzerinde Table özelliği değiştirilemez.</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>DataSet özelliği ayarlandıktan sonra değiştirilemez.</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>DataSet, DataViewManager’ı kullanmadan önce ayarlanmalıdır.</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>Table özelliği ayarlandıktan sonra değiştirilemez.</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>DataTable, DataView’u kullanmadan önce ayarlanmalıdır.</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>Adı olmayan DataTable'a bağlanılamaz.</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>Bu listeye nesne ayarlanamaz.</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>AllowNew yanlış olduğunda DataView üzerinde AddNew çağrılamaz.</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView açık değil.</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>İlişki, bu DataView'un işaret ettiği tablonun üstü olarak atanmamış.</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>AllowDelete false olduğunda DataSource üzerinde silme işlemi yapılamaz.</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>AllowEdit false olduğunda DataSource üzerinde düzenleme işlemi yapılamaz.</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>{0} dizini negatif veya satır sayısının üzerinde.</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>Listeye dış nesneler eklenemez.</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>Bu liste temizlenemez.</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>Bu listeye dış nesne eklenemez.</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>Listede olmayan nesneler kaldırılamaz.</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0}, {1} tablosunun DataColumn'u veya DataRelation'ı değil.</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>Bir Range nesnesinde min ({0}) değeri, max ({1}) değerine eşit veya bundan küçük olmalıdır.</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>Bu null bir aralık.</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>MinimumCapacity negatif olmamalıdır.</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>'{0}' adı için tanımlayıcı oluşturulamıyor.</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>Aynı '{0}' adına sahip birden çok tablo var (ad alanı farklı olsa bile).</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>Sütun '{0}': Tür '{1}' boş (null) olamaz.</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>Sütun '{1}': Tür '{0}' parametresiz oluşturucuya sahip değil.</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>Sütun '{0}': Tür '{1}' dize bağımsız değişkeni olan oluşturucuya sahip değil.</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>'{0}' türündeki nesne '{1}' türündeki nesneye dönüştürülemiyor.</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception.</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception.</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>Silinen satırlara erişilemez.</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>Yinelenen ada izin verilmez.</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>İşlem RowChanging olayında desteklenmiyor.</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>Geçersiz kısıtlama.</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>Birincil anahtar eksik.</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>Null değere izin verilmez.</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>Sütun salt okunur olarak işaretli.</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>Satır tabloda bulunamadı.</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>Sürüm bulunamadı.</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>ReadOnly veriler değiştirildi.</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader, geçerli DataTable '{0}' için geçersiz.</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader içindeki geçerli DataTable '{0}' şeması değiştirilmiş, DataTableReader geçersiz.</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>DataTableReader oluşturulamıyor. DataSet’te DataTable yok.</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>DataTableReader oluşturulamıyor. Bağımsız değişken Boş.</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>DataTableReader oluşturulamıyor. Bağımsız değişkenler null değer içeriyor.</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>Geçerli DataRow Deleted veya Detached durumunda.</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>Geçerli DataTable '{0}' boş. DataTable’da DataRow yok.</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>DataTable iç dizini bozuk: '{0}'.</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>Koleksiyon değiştirilmiş, numaralama işlemi yürütülemeyebilir.</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>'{0}' basit türü, zaten farklı bir '{1}' ile bildirildi.</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>Geçersiz yaprak numaralama.</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>İlişkili DataSet yüklü bir XML belgesiyle eşleştirildikten sonra tablo adı değiştirilemez.</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>İlişkili DataSet yüklü bir XML belgesiyle eşleştirildikten sonra tablo ad alanı değiştirilemez.</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>İlişkili DataSet yüklü bir XML belgesiyle eşleştirildikten sonra sütun adı değiştirilemez.</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>İlişkili DataSet yüklü bir XML belgesiyle eşleştirildikten sonra sütun ad alanı değiştirilemez.</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>İlişkili DataSet yüklü bir XML belgesiyle eşleştirildikten sonra ColumnMapping özelliği değiştirilemez.</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>DataSet yüklü bir XML belgesiyle eşleştirildikten sonra tabloya satır eklenemez ve çıkarılamaz.</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>DataSet yüklü bir XML belgesiyle eşleştirildikten sonra DataSet'e tablo eklenemez veya çıkarılamaz.</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>DataSet yüklü bir XML belgesiyle eşleştirildikten sonra DataSet'e İç İçe ilişki eklenemez, çıkarılamaz ve değiştirilemez.</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>DataSet parametresi geçersiz. Null olamaz.</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>DataSet yüklü bir XML belgesiyle eşleştirildikten sonra DataSet adı değiştirilemez.</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>Bu tür düğüm kopyalanamaz: {0}.</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>Zaten veri içeriyorsa XmlDataDocument yüklenemez. Lütfen yeni bir XmlDataDocument kullanın.</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>DataSet en fazla bir XmlDataDocument ile ilişkilendirilebilir. DataSet zaten başka bir XmlDataDocument ile ilişkili olduğundan DataSet geçerli XmlDataDocument ile ilişkilendirilemiyor.</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>XML işlemleri kullanarak XmlDataDocument'i düzenlemeyi denemeden önce lütfen DataSet.EnforceConstraints == false olarak ayarlayın.</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>DataDocument üzerinde GetElementById() desteklenmiyor.</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>DataDocument üzerinde varlık başvuruları oluşturulamaz.</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>XmlDataDocument üzerindeki DateSet ve DataTable Clear işlevi desteklenmiyor.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>Bu dataSet'e yerleşik olduğundan sütun kaldırılamaz.</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>Bu ilişki, dataSet içinde yerleşik olduğundan kaldırılamaz.</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>Bu denetimin bir özelliği değiştiğinde hep ortaya çıkar.</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>Bu koleksiyonun üyeliği her değiştiğinde gerçekleşir.</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>DBNull olduğu için değer alınamadı.</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>'{0}' özelliği Microsoft WindowsNT veya WindowsNT tabanlı işletim sistemi gerektirir.</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>İstenen .NET Framework Veri Sağlayıcısı bulunamıyor.  Yüklenemiyor.</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>İstenen .NET Framework Veri Sağlayıcısı'nın uygulamasında, System.Data.Common.DbProviderFactory türetilen türünün Instance alanı yok.</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>Kayıtlı .NET Framework Veri Sağlayıcısı bulunamadı veya yüklenemedi.</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>Eksik olan .NET Framework Veri Sağlayıcısı bütünleştirilmiş kodu tanımlanmış adı gerekli.</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>Yalnızca öğelere izin verilir.</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>Alt düğümlere izin verilmez.</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>'{0}' özniteliği tanınmadı.</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>Tanınmayan öğe.</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>Her yapılandırma dosyasında tek bir '{0}' bölümü olabilir.</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>Gerekli '{0}' özniteliği bulunamadı.</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>Gerekli '{0}' özniteliği boş olamaz.</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>'{0}' parametresi için boş olmayan dizi bekleniyor.</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>'{0}' özelliği için yalnızca '{1}' değeri kabul edilebilir.</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>'{0}' özelliği için '{1}' veya '{2}' değeri kabul edilebilir.</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>Belirtilen QuotePrefix ve QuoteSuffix değerleri eşleşmiyor.</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>'{0}' bağımsız değişkeninin uzunluğu, bu değişkenin '{1}' sınırını aştı.</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>{1} türünde bağımsız değişken beklenirken {0} türü alındı.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>'{0}' anahtarı için geçersiz değer.</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>'{0}' anahtarının kullanımı için '{1}' anahtarının olması gerekir.</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>'{0}' anahtarına ait değerin uzunluğu, anahtarın '{1}' sınırını aştı.</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>Anahtar sözcük desteklenmiyor: '{0}'.</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>UDL dosyası yüklenemiyor.</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>Geçersiz UDL dosyası.</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>Dahili .NET Framework Veri Sağlayıcısı hatası {0}.</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>Bir Insert, Update veya Delete komutu üretildikten sonra QuotePrefix ve QuoteSuffix özellikleri değiştirilemez.</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>DataAdapter.SelectCommand özelliğinin başlatılması gerekiyor.</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>DataAdapter.SelectCommand.Connection özelliğinin başlatılması gerekiyor;</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}".</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}", tırnak işaretlerinin yanlış kullanımı.</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}", geçerli "{2}" sınırı yetersiz.</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>SqlBulkCopy.DestinationTableName geçersiz bir çok parçalı ad olduğundan SqlBulkCopy.WriteToServer başarısız oldu</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>Geçersiz bir çok parçalı ad nedeniyle SQL Server sonuçları işlenemedi</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName geçersiz bir çok parçalı ad</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName, geçersiz bir çok parçalı ad</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>SqlCommand.CommandText özelliğinin değeri, geçersiz çoklu bir ad olduğundan SqlCommand.DeriveParameters başarısız oldu</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>OdbcCommand.CommandText özelliğinin değeri geçersiz bir çok parçalı ad olduğundan OdbcCommandBuilder.DeriveParameters başarısız oldu</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>OleDbCommandBuilder.CommandText özelliğinin değeri, geçersiz bir çok parçalı ad olduğundan OleDbCommandBuilder.DeriveParameters başarısız oldu</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>MultiSubnetFailover bağlantı seçeneğiyle yansıtılmış bir SQL Server örneğine bağlanma desteklenmiyor.</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>DataColumn '{1}' hesaplanmış bir sütun olduğundan SourceColumn '{0}' eşlemesi başarısız oldu.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>'{1}' / {0} öğesine ait SourceColumn ile '{3}' / {2} öğesine ait DataColumn arasında dönüştürülemez tür uyuşmazlığı.</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>SourceColumn '{2}' için DataTable '{1}' içinde DataColumn '{0}' eksik.</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>SourceColumn, boş olmayan bir dize olmalıdır.</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>'{0}' için SourceColumn eşlemesi eksik.</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} numaralandırma değeri {1}, {2} metodu tarafından desteklenmiyor.</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} numaralandırma değeri {1}, .NET Framework Odbc Veri Sağlayıcısı tarafından desteklenmiyor.</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} Numaralandırma değeri {1}, .NET Framework OleDb Veri Sağlayıcısı tarafından desteklenmiyor.</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{0} numaralandırma değeri, {1}, .NET Framework SqlClient Veri Sağlayıcısı tarafından desteklenmiyor.</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>ComputerNameDnsFullyQualified {0} alınamadı.</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>'{1}' SourceTable için '{0}' DataTable eksik.</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>SourceTable, boş olmayan bir dize olmalıdır</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>Eksik SourceTable eşlemesi: '{0}'</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: CommandText özelliği başlatılmamış</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: Connection özelliği başlatılmamış.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} için açık ve kullanılabilen bir Connection gerekiyor. {1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: SelectCommand.Connection özelliği başlatılmamış.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: SelectCommand.Connection özelliği başlatılmamış.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: SelectCommand.Connection özelliği başlatılmamış.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>Update özelliği için InsertCommand içinde bir bağlantı nesnesi olmalıdır. InsertCommand için Connection özelliği başlatılmadı.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>Update özelliği için UpdateCommand içinde bir bağlantı nesnesi olmalıdır. UpdateCommand için Connection özelliği başlatılmadı.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>Update özelliği için DeleteCommand içinde bir bağlantı nesnesi olmalıdır. DeleteCommand için Connection özelliği başlatılmadı.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>Update için bir bağlantı gerekiyor.  Connection özelliği başlatılmamış.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>Update özelliği için komut kopyasında bir bağlantı nesnesi olmalıdır. Komut kopyalamanın Connection özelliği başlatılmadı.</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>Güncelleştirme, bir bağlantı gerektiriyor.</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Update, {0}Command'in açık bir bağlantı nesnesinin olmasını gerektirir. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Update, {0}Command'in açık bir bağlantı nesnesinin olmasını gerektirir. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Update, {0}Command'in açık bir bağlantı nesnesinin olmasını gerektirir. {1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Update, güncelleştirme yapan komutun açık bir bağlantı nesnesinin olmasını gerektirir. {1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>'{0}' saklı yordamı yok.</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>Bu komuta atanan işlem en içte kalan beklemedeki yerel işlem olmalıdır.</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>İşlem geçerli bağlantıyla ilişkili değil veya tamamlanmış.</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>Geçerli bağlantıyla ilişkili işlem tamamlandı, ancak atılmadı.  Bağlantının SQL deyimlerini yürütmek için kullanılabilmesi için işlemin atılması gerekiyor.</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>{0}, komuta atanan bağlantı bekleyen bir yerel işlemde olduğunda komutun bir işleme sahip olmasını gerektirir.  Komuta ait Transaction özelliği başlatılmadı.</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>Bu komut ile ilişkili, öncelikle kapatılması gereken açık bir SqlResultSet zaten var.</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>Bu {0} ile ilişkili, öncelikle kapatılması gereken açık bir DataReader zaten var.</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>{0} DeriveParameters yalnızca CommandType.StoredProcedure'ı destekler, CommandType.{1} desteklemez.</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>Aynı yürütme işlemi için '{0}' metodu birden fazla kez çağrılamaz.</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>Yanlış zaman uyumsuz sonuç.</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>'{0}' çağrılmadan önce SelectCommand özelliği başlatılmamış.</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>Burada StatementType {0} beklenmiyor.</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: SourceTable adı için boş olmayan bir dize bekleniyor.</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>MaxRecords değeri {0} geçersiz; değer &gt;= 0 olmalı.</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>StartRecord {0} değeri geçersiz; değer &gt;= 0 olmalı.</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: SourceTable adı için boş olmayan bir dize bekleniyor.</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>Sıradüzensel bölüm sütunları AutoIncrement bir DataColumn'la eşleşmelidir.</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) null döndürdü.</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>startRecords veya maxRecords için sıfır dışında değerler kullandığınızda, dataTables dizisinde yalnızca bir öğe belirtin.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>TableMapping['{0}'] veya DataTable '{0}' Update tarafından bulunamadı.</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update: boş olmayan bir SourceTable adı bekleniyor.</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>TableMapping.DataSetTable='{0}' iken TableMapping eksik.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Update, komut kopyasının geçerli olmasını gerektirir.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>Update sırasında Otomatik SQL üretimi geçerli bir SelectCommand gerektirir.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>Update, kendisine yeni satırlar bulunan DataRow koleksiyonu geçirildiğinde geçerli bir InsertCommand gerektirir.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>Update, kendisine değiştirilmiş satırları olan DataRow koleksiyonu geçirildiğinde geçerli bir UpdateCommand gerektirir.</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>Update, kendisine silinmiş satırlar bulunan DataRow koleksiyonu geçirildiğinde geçerli bir DeleteCommand gerektirir.</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}], DataRow[0] ile aynı DataTable'a ait değil.</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: Hata oluştu; kullanılabilir ek bilgi yok.</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: Hata oluştu; kullanılabilir ek bilgi yok.</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>Toplu işlem yapılırken, komutun UpdatedRowSource özelliği değeri UpdateRowSource.FirstReturnedRecord veya UpdateRowSource.Both geçersizdi.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>Tutarlılık ihlali: UpdateCommand, beklenen {1} kayıttan {0} kaydı etkiledi.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>Tutarlılık ihlali: DeleteCommand, beklenen {1} kayıttan {0} kaydı etkiledi.</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>Tutarlılık ihlali: toplu işleme alınan komut beklenen {1} kayıttan {0} kaydı etkiledi.</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>Aynı yürütme işlemi için '{0}' metodu birden fazla kez çağrılamaz.</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>CommandTimeout değeri {0} geçersiz; değer &gt;= 0 olmalı.</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: Size özelliğinin 0 olan boyutu geçersiz.</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>{0}.Prepare metodu, tüm parametrelerin açıkça ayarlanmış türe sahip olmalarını gerektirir.</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>{0}.Prepare metodu, değişken uzunluktaki tüm parametrelerin açıkça ayarlanmış, sıfırı olmayan bir Size sahibi olmalarını gerektirir.</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>{0}.Prepare metodu, '{1}' türü parametrelerin açıkça ayarlanmış Precision ve Scale sahibi olmasını gerektirir.</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>asyncResult için eşleşmeyen bitiş metot çağrısı.  {0} çağrısı bekleniyordu ancak bunun yerine {1} arandı.</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>Geçersiz işlem. Bağlantı kapalı.</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>Bağlantı devre dışı bırakılmış.</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>Bağlantı üzerinde devam eden yerel bir işlem olduğundan işleme kaydedilemiyor.  Yerel işlemi bitirip yeniden deneyin.</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>Bağlantıda şu anda kayıtlı işlem var.  Geçerli işlemi bitirip yeniden deneyin.</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>Veritabanı null, boş dize veya boşluk karakterlerinden oluşan dize olamaz.</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>Bağımsız değişken çok uzun.</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>Geçersiz 'Connect Timeout' değeri; &gt;= 0 bir tamsayı olmalı.</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>Geçersiz kaynak arabellek (boyutu {0}) uzaklığı: {1}.</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>Geçersiz hedef arabellek (boyutu {0}) uzaklığı: {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>Sayı değeri 96 bit ondalık basamağa sığmayacak kadar büyük.</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>Akış kapalıyken geçersiz {0} girişimi.</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>Belirtilen SeekOrigin değeri geçersiz.</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>Birden çok temel tabloda dinamik SQL üretimi desteklenmiyor.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>Hiç temel tablo bilgisi döndürmeyen bir SelectCommand'de dinamik SQL üretimi desteklenmiyor.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>Anahtar sütunu bilgileri döndürmeyen bir SelectCommand'e karşılık kullanılan DeleteCommand için dinamik SQL üretimi desteklenmiyor.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>Anahtar sütunu bilgileri döndürmeyen bir SelectCommand'e karşılık kullanılan UpdateCommand için dinamik SQL üretimi desteklenmiyor.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>Satır sürümü sütunu içermeyen bir SelectCommand'e karşılık kullanılan DeleteCommand için dinamik SQL üretimi desteklenmiyor.</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>Satır sürümü sütunu içermeyen bir SelectCommand'e karşılık kullanılan UpdateCommand için dinamik SQL üretimi desteklenmiyor.</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>'{1}' QuotePrefix veya QuoteSuffix karakterini içeren '{0}' tablo adlarında dinamik SQL üretimi desteklenmiyor.</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>'{0}' sütun sıra değerini okuma girişimi geçersiz.  CommandBehavior.SequentialAccess ile yalnızca '{1}' veya daha büyük bir sıra değerini okuyabilirsiniz.</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>'{0}' veri türü, tarih saat sayıları geçersiz olduğundan sabit değer olarak biçimlendirilemiyor.</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>Değer, istenen türde bir sabit değer olarak biçimlendirilemiyor.</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>'{0}' veri türü, geçersiz bir en yüksek ölçeğe sahip olduğundan sabit değer olarak biçimlendirilemiyor.</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>Sağlanan sabit değer, '{0}' veri türü için geçerli bir sabit değer değil.</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>'{0}': Sabit değerin uzunluğu çift sayı olmalıdır.</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>'{0}': Sabit değer onaltılık sayılardan oluşan bir dize olmalıdır</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>{0}, tırnak işareti öneki ayarlanmadığında açık bağlantı gerektirir.</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>Doğru boole sabit değerleri belirlenemiyor. Boole sabit değerleri oluşturulamıyor.</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>'{0}' veri türüyle ilişkili yerel veri türü sabit değerleri desteklenmiyor.</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>{0} parametre veri türü geçersiz.</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>{0} nesne türüyle, bilinen bir yönetilen sağlayıcı yerel türü arasında eşleme yok.</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>{1} Türü tarafından döndürülen bilinmeyen bir {0} TypeCode'u işlenemiyor.</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>{0} DbType'tan bilinen bir {1} öğesine herhangi bir eşleme yok.</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>Kullanılan SQL Server sürümü '{0}' veri türünü desteklemiyor.</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>'{0}' parametre değeri aralık dışı.</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>Belirtilen parametre adı '{0}' geçerli değil.</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>Birden çok dönüş değeri parametresi desteklenmiyor.</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>Parametre Size değeri '{0}' geçersiz. Değer 0'dan büyük veya eşit olmalıdır.</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>'{0}' bağımsız değişkeni için değer geçersiz. Değer 0'dan büyük veya eşit olmalıdır.</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>Bu meta verileri için geçersiz değer.</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>Meta veriler SqlDbType.Row olmalı</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>{0} olan parametre değeri {1} değerine dönüştürülemedi.</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0}, paralel işlemleri desteklemiyor.</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>Bu {0} tamamlandı; artık kullanılabilir değil.</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>Kayıt salt okunur olduğunda '{0}' çağrılamaz.</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>DbDataRecord salt okunur olduğunda '{0}' çağrılamaz.</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>'{0}' nesne türünün '{1}' veri türüne örtülü olarak dönüştürülmesi desteklenmiyor.</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>Arabellek uzaklığı '{1}' artı kullanılabilir bayt sayısı '{0}', geçirilen arabelleğin uzunluğundan büyük.</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>Veri uzunluğu '{0}' 0'dan küçük.</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>Belirtilen uzunluk '{0}', aralık dışında.</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>dataIndex '{0}' için geçersiz {2} denemesi.  CommandBehavior.SequentialAccess ile yalnızca '{1}' veya daha büyük bir dataIndex değerini okuyabilirsiniz.</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>Uzaklık, değerin içinde bir konumu göstermeli.</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"ODBC tarafından yönetilen sağlayıcı, TABLE_NAME kısıtlamasının belirtilmesini ve GetSchema dizinleri koleksiyonu için null olmamasını gerektirir.</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>'{0}' metodu için geçersiz bağımsız değişken değeri.</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>ODBC sağlayıcısı SQLGETTYPEINFO'dan sonuç döndürmedi.</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>Beklenmeyen null DataTable bağımsız değişkeni</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>Beklenmeyen null DataSet bağımsız değişkeni.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>Bağlantı dizesi izin verilen en fazla uzunluk olan {0} değerini aşıyor.</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} - tür eşlenemiyor.</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>Bilinmeyen SQL türü - {0}.</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>Bilinmeyen URT türü - {0}.</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>Geçersiz negatif bağımsız değişken!</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>Özellik, açık bir bağlantıya ayarlanamaz.</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>SQL_TRANSACTION '{0}' için bir System.Data.IsolationLevel numaralandırma değerine yapılan geçerli bir eşleme yok.</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} - bağlantı havuzu etkinleştirilemiyor...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} - ortam işleyici ayrılamıyor.</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} - tanımlayıcı işleyicisi alınamıyor.</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>İşlem içinde değil</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>Geçersiz OdbcType numaralandırma value={0}.</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>DBNull.Value verisi bekleniyorsa IsDBNull kullanın.</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} - kullanılabilir hata bilgisi yok</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>Bağlantı kapalı.</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>Bir dahili bağlantının sahibi yok.</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>NET Framework Odbc Veri Sağlayıcısı, Microsoft Veri Erişim Bileşenleri (MDAC) sürüm 2.6 veya üstünü gerektirir.  {0} sürümü şu anda yüklü olarak bulundu.</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>NET Framework OleDb Veri Sağlayıcısı, Microsoft Veri Erişim Bileşenleri (MDAC) sürüm 2.6 veya üstünü gerektirir.  {0} sürümü şu anda yüklü olarak bulundu.</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>'{0}’ arabirimi '{1}' sağlayıcısı tarafından desteklenmiyor.  GetOleDbSchemaTable geçerli sağlayıcı ile kullanılamıyor.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>'{0}' hata mesajı olmadan başarısız oldu, sonuç kodu: {1}.</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>Hata mesajı yok, sonuç kodu: {0}.</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>.NET Framework Veri Sağlayıcıları, Microsoft Veri Erişim Bileşenleri (MDAC) gerektirir.  Lütfen Microsoft Data Access Components (MDAC) sürüm 2.6 veya sonraki sürümünü yükleyin.</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>OLEDB için .NET Framework Veri Sağlayıcısı (Microsoft.Data.OleDb), ODBC Sürücüleri için Microsoft OLE DB Sağlayıcısını (MSDASQL) desteklemez. ODBC için .NET Framework Veri Sağlayıcısı'nı (System.Data.Odbc) kullanın.</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>OLEDB için .NET Framework Veri Sağlayıcısı, OLE DB Sağlayıcısının etkileşimli olmayan bir ortamda kullanıcıdan bilgi istemesine izin vermez.</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>'{0}' sağlayıcısı yerel makinede kayıtlı değil.</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>ICommandText arabirimi, ‘{0}’ sağlayıcısı tarafından desteklenmiyor. Bunun yerine CommandType.TableDirect kullanın.</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>ITransactionLocal arabirimi, '{0}' sağlayıcısı tarafından desteklenmiyor.  Geçerli sağlayıcıda yerel işlemler kullanılamıyor.</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>Başlatma dizesinin biçimi OLE DB belirtimine uygun değil.  Bağlantı dizesinde char[{0}] etrafında başlar.</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>'Asynchronous Processing' desteklenen bir .NET Framework Veri OLE DB sağlayıcısı (Microsoft.Data.OleDb) özelliği değil.</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>ConnectionString'de bir OLE DB Sağlayıcısı belirtilmedi.  Örnek olarak 'Provider=SQLOLEDB;' verilebilir.</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>ConnectionString içinde belirtilen OLE DB Sağlayıcısı çok uzun.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>DbInfoKeywords OleDbSchemaGuid için kısıtlama beklenmiyor.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>DbInfoLiterals OleDbSchemaGuid için hiçbir kısıtlama beklenmiyor.</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>OleDbSchemaGuid şema guid'si için kısıtlama beklenmiyor.</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>{0} OleDbSchemaGuid, '{1}' sağlayıcısı tarafından desteklenen bir şema değil.</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>'{0}' yapılandırma ayarındaki değer sayısı hatalı.</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>'{0}' yapılandırma ayarında belirtilen XML dosyası yüklenemiyor.</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>Komut parametresi[{0}] '{1}' geçersiz.</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>Komut parametresi[{0}] '{1}' veri değeri, işaret uyuşmazlığı veya veri taşması dışındaki nedenlerle dönüştürülemedi.</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>Veri değeri işaretli ve sağlayıcı tarafından kullanılan tür işaretsiz olduğu için [{0} ] '{1}' komut parametresi için dönüştürme başarısız oldu.</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>Veri değeri, sağlayıcı tarafından kullanılan türü aştığı için [{0}] '{1}' komut parametresi için dönüştürme başarısız oldu.</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>Sağlayıcı, komut parametresi[{0}] '{1}' değerini gönderirken bir hatayla karşılaştı ve işlemi durdurdu.</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>[{0}] '{1}' parametresinin varsayılan değeri yok.</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>[{0}] parametresinde bir hata oluştu: {1}.</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Microsoft.Data.OleDb.OleDbDataAdapter iç hatası: geçersiz parametre erişimcisi: {0} {1}.</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parametre[{0}]: OleDbType özelliği başlatılmamış: OleDbType. {1}.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>ICommandWithParameters arayüzü '{0}' sağlayıcısı tarafından desteklenmemektedir.  Komut parametreleri geçerli sağlayıcıda desteklenmiyor.</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>Yordam parametre bilgilerinin alınması '{0}' sağlayıcısı tarafından desteklenmiyor.</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>Sunucunun ondalık ayırıcısı belirlenemiyor. Tamsayı olmayan sayısal sabit değerler oluşturulamaz.</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>Nesne bir ADODB.RecordSet veya ADODB.Record değil.</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>ADODB.RecordSet nesnesinden '{0}' arabirimi alınamıyor.</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: Size özelliğinin 0 olan boyutu geçersiz.</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>ADODB.Record nesnesinde IRow arabirimi alınamıyor.</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>{0}.Prepare metodu, tüm parametrelerin açıkça ayarlanmış türe sahip olmalarını gerektirir.</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>Tür, OLE DB arabirimi ISourcesRowset'i desteklemiyor</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>{0}.Prepare metodu, değişken uzunluktaki tüm parametrelerin açıkça ayarlanmış, sıfırı olmayan bir Size sahibi olmalarını gerektirir.</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>Sağlayıcı IDBInfo'yu desteklemediğinden, ReservedWords şema koleksiyonu oluşturulamıyor.</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>{0}.Prepare metodu, '{1}' türü parametrelerin açıkça ayarlanmış Precision ve Scale sahibi olmasını gerektirir.</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>Sağlayıcı '{0}' özelliğini desteklemediği veya tüketici, Başlatma özellik grubunda olmayan özelliklerin değerlerini almaya veya ayarlamaya çalıştığından ve veri kaynağı nesnesi başlatılmadığından özelliğin değeri ayarlanamadı.</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>asyncResult için eşleşmeyen bitiş metot çağrısı.  {0} çağrısı bekleniyordu ancak bunun yerine {1} arandı.</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>‘{0}’ özelliği, şu nedenlerden biri yüzünden başlatılamadı:
-	Değer veri türü, özelliğin veri türü değildi veya null değildi. Örneğin, özellik, veri türü Int32 olan DBPROP_MEMORYUSAGE idi ve veri türü Int64 idi.
-	Değer, geçerli bir değer değildi. Örneğin, özellik DBPROP_MEMORYUSAGE idi ve değer negatifti.
-	Değer, özellik için geçerli bir değerdi ve sağlayıcı özelliği ayarlanabilir bir özellik olarak destekliyordu ancak sağlayıcı belirtilen değeri desteklemiyordu. Bu, değerin sağlayıcı yazıldıktan sonra OLE DB'deki özelliğe eklendiği durumu da içerir.</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>Geçersiz işlem. Bağlantı kapalı.</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>Options değeri geçersizdi.</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>Bağlantı üzerinde devam eden yerel bir işlem olduğundan işleme kaydedilemiyor.  Yerel işlemi bitirip yeniden deneyin.</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>ColumnID öğesi geçersizdi.</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>Bağlantıda şu anda kayıtlı işlem var.  Geçerli işlemi bitirip yeniden deneyin.</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>Tüm sütunlara uygulanmak üzere bir '{0}' özelliği belirtildi ancak bir veya daha fazlasına uygulanamadı.</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>Veritabanı null, boş dize veya boşluk karakterlerinden oluşan dize olamaz.</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>'{0}' özelliği salt okunurdu veya tüketici, veri kaynağı nesnesi başlatıldıktan sonra Başlatma özellik grubundaki özelliklerin değerlerini ayarlamaya çalıştı. Tüketiciler, salt okunur bir özelliğin değerini geçerli değerine ayarlayabilir. Bu durum, belirli bir sütun için ayarlanabilir bir sütun özelliği ayarlanamadığında da döndürülür.</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>Geçersiz kaynak arabellek (boyutu {0}) uzaklığı: {1}.</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>İsteğe bağlı '{0}' özelliğinin değeri belirtilen değere ayarlanmadı ve özelliği belirtilen değere ayarlamak mümkün olmadı.</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>Geçersiz hedef arabellek (boyutu {0}) uzaklığı: {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>'{0}' özelliğini ayarlamak, var olan bir özellikle çakışmaya neden olabileceğinden bu özellik ayarlanmadı.</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>Akış kapalıyken geçersiz {0} girişimi.</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(Ayrılmış).</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>Belirtilen SeekOrigin değeri geçersiz.</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>Sağlayıcı, bilinmeyen bir DBPROPSTATUS_ value '{0}' döndürdü.</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>'{0}' sütun sıra değerini okuma girişimi geçersiz.  CommandBehavior.SequentialAccess ile yalnızca '{1}' veya daha büyük bir sıra değerini okuyabilirsiniz.</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>Accessor doğrulaması ertelendi ve metot veri döndürürken gerçekleşti. Bu sütun veya parametre için bağlama geçersizdi.</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>{0} parametre veri türü geçersiz.</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>OleDbDataAdapter iç hatası: geçersiz satır kümesi erişeni: Ordinal={0} Status={1}.</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>{0} nesne türüyle, bilinen bir yönetilen sağlayıcı yerel türü arasında eşleme yok.</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>Veri değeri, işaret uyuşmazlığı veya veri taşması dışındaki nedenlerden dolayı dönüştürülemedi. Örneğin, veri deposundaki veriler bozulmuş ancak satır hala alınabilir durumdaydı.</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>{1} Türü tarafından döndürülen bilinmeyen bir {0} TypeCode'u işlenemiyor.</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>Sağlayıcı, {0} verilerini döndürmek için bellek ayıramadı.</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>{0} DbType'tan bilinen bir {1} öğesine herhangi bir eşleme yok.</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>{0} veri değeri, tüketicinin arabelleğinde {0} değeri kısmı için belirtilen türe göre taştığından dönüştürme başarısız oldu.</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>Kullanılan SQL Server sürümü '{0}' veri türünü desteklemiyor.</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter iç hatası: [get] Bilinmeyen OLE DB veri türü: 0x{0} ({1}).</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>'{0}' parametre değeri aralık dışı.</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>{0} veri değeri işaretli ancak tüketicinin arabelleğinde {0} değeri kısmı için belirtilen tür işaretsiz olduğundan dönüştürme başarısız oldu.</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>Belirtilen parametre adı '{0}' geçerli değil.</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter iç hatası: [set] Bilinmeyen OLE DB veri türü: 0x{0} ({1}).</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>Parametre Size değeri '{0}' geçersiz. Değer 0'dan büyük veya eşit olmalıdır.</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>Sağlayıcı, {0} değerini belirleyemedi. Örneğin, satır yeni oluşturuldu, {0} sütunu için varsayılan değer mevcut değil ve tüketici henüz yeni bir {0} değer belirlemedi.</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>'{0}' bağımsız değişkeni için değer geçersiz. Değer 0'dan büyük veya eşit olmalıdır.</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>OLE DB Sağlayıcısı beklenmeyen bir durum değeri döndürdü: {0}</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>Bu meta verileri için geçersiz değer.</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>OleDbDataReader.Read, iş parçacığının ApartmentState'i ApartmentState.MTA değilse söz konusu iş parçacığından kullanılmalıdır.</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>{0} olan parametre değeri {1} değerine dönüştürülemedi.</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>Belirtilmemiş hata: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0}, paralel işlemleri desteklemiyor.</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>IErrorInfo.GetDescription, {0} ile başarısız oldu.</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>Bu {0} tamamlandı; artık kullanılabilir değil.</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>IErrorInfo.GetSource {0} ile başarısız oldu.</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>Belirtilen uzunluk '{0}', aralık dışında.</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>DBTYPE_VECTOR verileri .NET Framework Data OLE DB Provider (Microsoft.Data.OleDb) tarafından desteklenmiyor.</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>dataIndex '{0}' için geçersiz {2} denemesi.  CommandBehavior.SequentialAccess ile yalnızca '{1}' veya daha büyük bir dataIndex değerini okuyabilirsiniz.</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>Geçersiz en küçük ve en büyük havuz boyutu değerleri, en küçük havuz boyutu, en büyük havuz boyutundan büyük olamaz.</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>'{0}' anahtar sözcüğü artık kullanılmıyor. Bunun yerine '{1}' kullanın.</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>Sunucu için dağıtılmış işlem düzenleyicisinin adresi sunucudan alınamıyor.  DTC sunucuda etkin mi?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>&lt;{0}&gt; bağlantı parametresi değerinin uzunluğu izin verilen 65535 karakterlik en fazla uzunluğu aşıyor.</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>Geçersiz 'Paket Boyutu'.  Değer &gt;= 512 ve &lt;= 32768 bir tamsayı olmalıdır.</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>Geçersiz işlem veya işlem içinde kaydedilecek nokta için geçersiz ad.</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>{0} numaralandırma değeri {1}, SQL Server 7.0 veya SQL Server 2000 tarafından desteklenmiyor.</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>Kullanıcı Örneği ve Yük Devretme uyumlu seçenekler değil.  Lütfen bağlantı dizesinde ikisinden yalnızca birini seçin.</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>Bağlantı dizesinde 'Authentication=Active Directory Integrated' belirtildiyse, Credential özelliği ayarlanamaz.</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>Sertifika kimlik doğrulaması ile belirtilen kimlik doğrulama parametreleri hatalı.</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>Bağlanmaya çalıştığınız SQL Server örneği şifreleme gerektiriyor, ancak bu makine şifrelemeyi desteklemiyor.</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>Bağlanmaya çalıştığınız SQL Server örneği şifrelemeyi desteklemiyor.</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>Bağlanmaya çalıştığınız SQL Server örneği CTAIP'yi desteklemiyor.</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>Desteklenmeyen SQL Server sürümü.  .NET Framework SqlClient Veri Sağlayıcısı yalnızca SQL Server sürüm 7.0 ve üstü ile kullanılabilir.</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>Zaman uyumsuz işlem yürütülürken {0} değiştirilemez.</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>Bu komut, zaman uyumsuz bağlantı gerektiriyor. Bağlantı dizesinde “Asynchronous Processing=true” ayarını yapın.</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>Bağlantı denemesi zaman aşımına uğradı.</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>Zaman aşımı süresi sona erdi.  Sonuç olarak bağlantı kesildi.</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>Örnek hatası.</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>Hata kodu 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword, SQL Server 9.0 veya sonraki sürümünü gerektirir.</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>SSE Örneği yeniden yönlendirmesi, yerel olmayan kullanıcı örnekleri için desteklenmiyor.</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>'{0}' kimlik doğrulaması desteklenmiyor.</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>SQL kimlik doğrulaması metodu '{0}' desteklenmiyor.</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>'{0}' için '{1}' türüne sahip bir kimlik doğrulama sağlayıcısı örneği oluşturulamadı.</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>'{0}' türüne sahip bir SqlAuthenticationInitializer örneği oluşturulamadı.</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>‘{0}’ adlı sağlayıcı başlatılırken bir özel durum oluşturdu.</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>'{0}' adlı sağlayıcı, '{1}' kimlik doğrulamasını desteklemiyor.</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>'{0}' için kimlik doğrulaması sağlayıcısı bulunamıyor. Active Directory (Entra ID) kimlik doğrulaması yöntemlerini kullanmak için ‘Microsoft.Data.SqlClient.Extensions.Azure’ NuGet paketini (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) yükleyin.</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>Kimlik doğrulama sağlayıcıları için yapılandırma bölümü okunamadı.</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>'{0}' parametresi null veya boş olamaz.</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>Zaman uyumsuz işlem zaten tamamlandı.</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>Beklemedeki zaman uyumsuz bir işlem sürdüğünden, komutun yürütülmesine devam edilemiyor.</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>ExecuteXmlReader'a geçersiz komut gönderildi.  Komut bir Xml sonucu döndürmelidir.</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>Bildirimler, SQL Server 9.0 veya sonraki sürümünü gerektirir.</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>UdtTypeName için geçersiz 3 parçalı ad biçimi.</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>SSPI paketi başlatılamıyor.</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Zaman aşımı süresi sona erdi.  İşlem tamamlanmadan zaman aşımı süresi doldu veya sunucu yanıt vermiyor.</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>Bağlantı Zaman Aşımı Süresi Doldu.  Ön oturum açma aşaması başında zaman aşımı süresi doldu.  Bunun nedeni bağlantı zaman aşımı için sağlanan sürenin yetersiz olması olabilir.</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>Bağlantı dizesinde kullanıcı örneği istendi, ancak belirtilen sunucu bu seçeneği desteklemiyor.</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>Sunucu sertifikası uygulama doğrulamasında başarısız oldu.</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>Belirtilen veri uzunluğu {0}, izin verilen en fazla veri uzunluğunu {1} aşıyor.</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>Hiç veri yokken okuma girişimi geçersiz.</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>Veri uzunluğu '{0}' 0'dan küçük.</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>SqlDataRecord salt okunur olduğunda '{0}' çağrılamaz.</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>Eşlenen koleksiyon kullanımda ve şu anda erişilemez;</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>Microsoft.Data.SqlClient kullanarak bağlam bağlantısına bağlanma desteklenmiyor.</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>İç içe TransactionScopes desteklenmiyor.</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>Beklenmeyen sunucu olayı: {0}.</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>‘{0}’ uzunluğu, ‘{1}’ uzunluğu ile aynı olmalıdır.</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>SqlDbType '{0}' {1} için geçersiz.  Yalnızca {2} desteklenir.</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>Çok fazla değer.</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>Stream yazmayı desteklemiyor.</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>Null</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>İleti</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>Aritmetik Taşma.</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>Sıfıra bölme hatasıyla karşılaşıldı.</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>Veri Null. Bu metot veya özellik Null değerler için çağrılamaz.</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>Sayısal matematiksel işlem kesmeye neden oldu.</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>SqlDateTime taşması. 1/1/1753 00:00:00 ile 31/12/9999 23:59:59 arasında olmalıdır.</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>Bitiştirilecek iki dizenin alfabe düzeni farklı.</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>Karşılaştırılacak iki dizenin alfabe düzeni farklı.</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>Geçersiz bayrak değeri.</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>SqlDecimal'den Decimal'e dönüştürmede taşma.</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>Dönüştürmede taşma.</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>Geçersiz SqlDateTime.</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>Bir saat dilimi belirtildi. SqlDateTime saat dilimlerini desteklemiyor.</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>Geçersiz dizi boyutu.</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>Geçersiz sayısal kesinlik/ölçek.</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>Girdi doğru biçimde değildi.</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>SqlType hatası.</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>SqlBytes ve SqlChars, bu sürümde 2GB'den fazla uzunluğu desteklemiyor.</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>Okuma sırasında hata oluştu.</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Stream kapatıldı veya kaldırıldı.</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>Arabellek yok. Okuma veya yazma işlemi başarısız oldu.</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>Geçerli değer Null olduğundan, sıfır olmayan bir uzunluğa ayarlanamıyor.</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>Arabellek yetersiz. Okuma veya yazma işlemi başarısız oldu.</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>Geçerli değer Null olduğundan, sıfır olmayan uzaklığa yazdırılamıyor.</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>Geçerli uzunluktan daha büyük bir kaydırmadan yazılamıyor. Arabellekte başlatılmamış veri bırakır.</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>Döndürülen veri boyutu 2 Gb'den büyük. Tüm verileri almak için SequentialAccess komut davranışını kullanın.</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>GetDayOfWeek bağımsız değişkeni 1 ile 7 arasında bir tamsayı olmalı.</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>SQL Type'a veriler yüklenmemiş.</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>SQL Type'a veriler önceden yüklenmiş.</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>Kapalı bir XmlReader'a erişme denemesi geçersiz.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>Akış kapalıyken geçersiz bir {0} çağırma denemesi.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>Akış yazılabilir değilken, geçersiz bir {0} çağırma denemesi.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>Akış okunabilir değilken, geçersiz bir {0} çağırma denemesi.</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>Akış aranabilir değilken, geçersiz bir {0} çağırma denemesi.</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>Alt sınıf gerekli metodu geçersiz kılamadı.</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>'{0}' için normalleştirici oluşturulamıyor.</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>İç Hata</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>Komut parametresinin null ve boş olmayan bir komut metni olmalı.</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>MetaData parametre dizisinin uzunluğu, ParameterDirection dizisi bağımsız değişkenine eşit olmalı.</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>Veri bağdaştırıcısı eşleme hatası.</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>Veri bağdaştırıcı hatası.</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>Veritabanı tutarlılık ihlali.</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>İşlem durduruldu.</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>İşlem özel bir durum nedeniyle durduruldu (ayrıntılar için bkz: InnerException).</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Fill metodunun DataRow.AcceptChanges'i çağırıp çağırmayacağı.</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Update metodunun DataRow.AcceptChanges değerini çağırıp çağırmayacağı.</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>Update olayları RowUpdating ve RowUpdated, Status değeri UpdateStatus.ErrorsOccurred olduğunda, sonraki DataRow'a devam edilip edilmeyeceği.</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>Bağdaştırıcının DataTable tablosunu DataReader okuyucusundan doldurma şekli.</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>TableMappings içindeki bir tablo veya sütun eksik olduğunda gerçekleştirilen eylem.</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>DataSet içindeki bir tablo veya sütun eksik olduğunda gerçekleştirilen eylem.</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>Kaynak tabloyu DataSet tablosuna eşleme.</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Fill sırasında kurtarılabilir bir hata oluştuğunda harekete geçirilen olay.</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Fill metodunun, sağlayıcıya özel değerler mi yoksa ortak CLSCompliant değerleri mi döndüreceği.</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>Kaynak sütun adı - büyük/küçük harf duyarlı.</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>Koleksiyondaki öğe sayısı</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>Belirtilen DataColumnMapping nesnesi.</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>Bu tablo eşlemesi sağlandığında tek tek sütun eşlemeleri.</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>DataTableMapping kaynak tablo adı. Bu ad büyük/küçük harfe duyarlıdır.</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>Koleksiyondaki öğe sayısı</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>Belirtilen DataTableMapping nesnesi</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>DataSet'teki silinen satırlara yönelik Update işleminde kullanılır.</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Update sırasında her DataRow'dan sonra harekete geçirilen olay.</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>Veri kaynağına karşı yürütülmeden önce bir araya getirilecek satır sayısı.</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Select/Insert/Update/DeleteCommands bir bağlantıya sahip olmadığında kullanılan bağlantı.</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>DataTable'da silinen satırlara yönelik Update işleminde kullanılır.</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>DataTable'daki yeni satırlara yönelik Update işleminde kullanılır.</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Fill işleminde kullanılır.</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>DataTable'da değiştirilen satırlara yönelik Update işleminde kullanılır.</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Fill metodunun, sağlayıcıya özel değerler mi yoksa ortak CLSCompliant değerleri mi döndüreceği.</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>Kaynak tablosu ile DataTable'ı eşleme şekli.</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>Kullanıcı tarafından ayarlanmadığında Insert/Update/DeleteCommands'in nasıl üretildiği.</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>Veri kaynağına karşı yürütülmeden önce bir araya getirilecek satır sayısı.</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>Veri Kaynağına bağlanmak için kullanılan bağlantı dizesi.</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>Data Source veri kaynağına bağlanırken kullanılacak ODBC Sürücüsünün adı.</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>Data Source veri kaynağına bağlanırken kullanılacak DSN.</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>Doğru olduğunda, yönetilen bağlantı havuzunun kullanılması gerektiğini gösterir.</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>Data Source veri kaynağına bağlanırken kullanılacak UDL dosyası.</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>OleDb Provider ile etkinleştirilecek veya devre dışı bırakılacak OLE DB Services'i belirtir.</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>Data Source veri kaynağına bağlanırken kullanılacak OLE DB Sağlayıcısı adı.</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>Uygulamanın adı.</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>Doğru olduğunda, .Net Framework Veri Sağlayıcısı içinde Zaman Uyumsuz işlevinin kullanımını etkinleştirir.</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>Bağlanabilen veritabanının, tam yol adını içerecek şekilde belirtilen birincil dosya adı.</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>Doğru olduğunda, havuzdan çıkarıldığında bağlantı durumunun sıfırlandığını gösterir.</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>Doğru olduğunda, bağlantının Sql Server bağlamından olması gerektiğini gösterir.  Yalnızca Sql Server işlemi çalıştırılırken kullanılabilir.</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>SQL Server Dili kayıt adı.</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>SQL Server ile kimlik doğrulama metodunu belirtir.</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>SQL Server ile kimlik doğrulaması için belirtilen istemci sertifikası.  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>Veri Kaynağına bağlanmak için kullanılan bilgiler.</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Geçerli bağlantı zaman aşımı değeri, ConnectionString içinde ayarlanabilir değil.</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>Geçerli veri kaynağı katalog değeri, bağlantı dizesindeki 'Database=X'.</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>Geçerli veri kaynağı, bağlantı dizesindeki 'Server=X'.</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>Geçerli ODBC sürücüsü.</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>ODBC Sürücü tarafından erişilen ürünün sürümü.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>Veri Kaynağına bağlanmak için kullanılan bilgiler.</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>Geçerli bağlantı zaman aşımı süresi, ConnectionString’de 'Connect Timeout=X'.</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>Geçerli veri kaynağı katalog değeri, bağlantı dizesindeki 'Initial Catalog=X'.</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>Geçerli veri kaynağı, bağlantı dizesindeki 'Data Source=X'.</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>Geçerli OLE DB sağlayıcısı ProgID, bağlantı dizesindeki 'Provider=X'.</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>OLE DB Sağlayıcısı tarafından erişilen ürünün sürümü.</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>Kimlik doğrulama için kullanılacak erişim belirteci.</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>Bağlantı durumu, zaman uyumlu veya zaman uyumsuz.  Bağlantı dizesinde “Asynchronous Processing=x”.</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>Çoğaltmaya bağlanmak için kullanılan bilgiler.</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>Bir DataSource'a bağlanmak için kullanılan bilgiler, 'Data Source=x;Initial Catalog=x;Integrated Security=SSPI' gibi.</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>Bu bağlantı için istatistik topla.</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>Özel sütun şifreleme anahtarı deposu sağlayıcıları.</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>Fiziksel bağlantıyı temsil eden bir guid.</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>Bildirimlerde Microsoft SQL Server tarafından kullanılan otomatik kayıt.</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>Where yan tümcesinin, kullanıcı tarafından belirtilmediği durumlarda Update ve Delete komutları için otomatik olarak üretilme şekli.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>Metin komutunda, nitelenmiş bir tablo adındaki katalog adının konumunu gösterir.</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>Metin komutunda, katalog adını tanımlayıcının geri kalanından ayıran karakter.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>Metin komutunda, şema adını tanımlayıcının geri kalanından ayıran karakter.</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>sql nesnelerini çevreleyen önek dizesi.</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>sql nesnelerini çevreleyen sonek dizesi.</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Komutların otomatik olarak oluşturulacağı DataAdapter.</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>DataTable veya SelectCommand'deki şemayı kullan.</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>Set yan tümcesinin, kullanıcı tarafından belirtilmediği durumlarda Update komutu için otomatik olarak üretilme şekli.</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Kendisi için otomatik olarak OdbcCommands üretilecek DataAdapter</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Bir metin komutunda, özel karakterler içeren tanımlayıcıları tırnak içine almak için açılış tırnak işareti olarak kullanılan karakter.</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Bir metin komutunda, özel karakterler içeren tanımlayıcıları tırnak içine almak için kapanış tırnak işareti olarak kullanılan karakter.</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>Kendisi için otomatik olarak OleDbCommands üretilecek DataAdapter</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Sayı sabit değerlerinde kullanılan ondalık ayırıcı.</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>sql nesnelerini çevreleyen önek dizesi</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>sql nesnelerini çevreleyen sonek dizesi</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>Kendisi için otomatik olarak SqlCommands üretilecek DataAdapter</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>Sayı sabit değerlerinde kullanılan ondalık ayırıcı.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>Bir metin komutunda, özel karakterler içeren tanımlayıcıları tırnak içine almak için açılış tırnak işareti olarak kullanılan karakter.</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>Bir metin komutunda, özel karakterler içeren tanımlayıcıları tırnak içine almak için kapanış tırnak işareti olarak kullanılan karakter.</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>Yalnızca, ondalık ve sayı parametrelerinin Prepare, FillSchema ve CommandBuilder senaryoları ile kullanıldığı durumlar için ayarlanması gerekir.</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>Yalnızca, ondalık ve sayı parametrelerinin Prepare, FillSchema ve CommandBuilder senaryoları ile kullanıldığı durumlar için ayarlanması gerekir.</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>Yerel parametre türü.</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>Yerel parametre türü.</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>Parametrenin adı, '@p1' gibi</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>Yerel parametre türü.</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>Tür için sunucu adı.</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>Değişken uzunlukta veri türlerinde uzaklık.</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>'{1}' parametresi için belirtilen ParameterDirection '{0}' desteklenmiyor. Tablo değerli parametreler yalnızca ParameterDirection.Input'u destekler.</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>'{0}' parametresi için TypeName belirtildi.  TypeName yalnızca Yapılandırılmış parametreler için ayarlanmalıdır.</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>SqlDbType.Structured türü yalnızca çok değer alabilen türler için desteklenir.</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>Şema tablosundaki '{0}' alanı için DateType sütunu null.  DataType null olmamalıdır.</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>'{0}' kaydındaki alanların sayısı, özgün kayıttaki sayıyla eşleşmiyor.</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>aralık: 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>SqlClient veri sağlayıcısında beklenmedik bir hatayla karşılaşıldı.{0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>{0},{1} için Tür Bilgisi alınamıyor</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>Sağlayıcı şu derlemeyi yükleyemedi: {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>UdtTypeName özelliği UDT parametreleri için ayarlanmalı.</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>Belirtilen tür, hedef sunucuya kayıtlı değil.{0}.</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>UDT parametrelerinin, birincil anahtarın parçası olmadıkları sürece where yan tümcesinde kullanılmasına izin verilmez.</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>'{0}' geçersiz bir kullanıcı tanımlı tür, neden: {1}.</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>hem bellek içi, hem de kullanıcı tanımlı biçimleri destekler</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>Yerel biçim desteklenemiyor.</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>IBinarySerialize uygulanmıyor</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>seri hale getirilemez</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>ortak oluşturucu yok</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>INullable uygulanamıyor</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>ortak oluşturucusu yok</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>UDT özniteliği yok</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>Eşleme olmadan serileştirme işlemi henüz desteklenmiyor.</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>'public static x Parse(System.Data.SqlTypes.SqlString)' metodu eksik</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>'public override string ToString()' metodu eksik</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>'public static x Null { get; }' metodu eksik</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>Yerel biçim (doğrudan veya başka bir alan aracılığıyla) '{0}' türündeki alanları desteklemez</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>Tür ortak değil</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Native UDT, '{0}' türü nedeniyle sıralı düzen değil</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Native UDT en yüksek byte boyutu belirtiyor</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>'{0}' alanı seri hale getirilmemiş olarak işaretli</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>'{0}' alanı türü, Native biçimde izin verilmeyen açık düzen olarak işaretli</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>Birden çok değeri olan bütünleştirilmiş kod başvurularının sıfır olmayan Bütünleştirilmiş Kod Tanımlayıcısı olmalıdır.</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>Çok değer alabilen Structured türleri yalnızca parametreler için kullanılabilir ve başka bir türün içine yerleştirilemez.</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>Yol adı geçerli değil.</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>İşlem yükseltilmeye çalışılırken hata oluştu.</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>Sorgu bildirimleri almak için kullanılan bağımlılık nesnesi.</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>Bu bağımlılığın geçersiz olup olmadığını gösteren özellik.</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>Var olan bağımlılık nesnesine komut eklemek için.</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Komut zaten başka bir bağımlılık nesnesiyle ilişkilendirilmiş. Üzerine yazılamaz.</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>Bu SqlCommand nesnesi, zaten başka bir SqlDependency nesnesiyle ilişkilendirildi.</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>Belirtilen zaman aşımı geçersiz. Zaman aşımı &lt; 0 olamaz.</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>Bildirim Hatası. Tür={0}, Bilgi={1}, Kaynak={2}.</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData bu SqlDbType için geçersiz.</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>dbType {0} bu oluşturucu için geçersiz.</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>İç hata. Düz metin değeri null olamaz.</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>Şifrelenemiyor. Şifreleme sonucunda {0} bayt şifreli metin elde edildi ve bu da izin verilen maksimum sınır olan {1} baytı aşıyor. Belirtilen düz metin değeri büyük olasılıkla çok büyük (düz metin boyutu: {2} bayt).</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>İç hata. Şifreli metin değeri null olamaz.</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>Kanıtlama bilgileri SQL Server tarafından döndürülmedi. Kapanım türü '{0}' ve kapanım kanıtlama URL'si '{1}'.</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>Güvenli kanal kurulamadı. Hata İletisi: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>İç Hata. '{1}' türünde bir nesne oluşturulurken '{0}' null bağımsız değişkeni belirtildi. '{0}' null olamaz.</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>Always Encrypted kullanılarak şifrelenen veritabanı sütunlarındaki hesaplamalar için SQL Server örneğinde yapılandırılan kapanımın geçerli ve güvenli olup olmadığını doğrulamak amacıyla kullanılacak bir kapanım kanıtlama hizmeti uç noktası belirtir.</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>Kapanım sağlayıcıları için yapılandırma bölümü okunamadı. Uygulama yapılandırma dosyanızda bölümün doğru biçimlendirildiğinden emin olun. Hata İletisi: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>'{0}' adı için '{1}' türüne sahip kapanım sağlayıcısının örneği oluşturulamadı. Hata iletisi: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>İç Hata. SqlColumnEncryptionEnclaveProviderName null veya boş olamaz.</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>'{0}' sonuç kümesi okunurken hata oluştu. Kanıtlama URL'si bağlantı dizesinde belirtilmemiş, ancak sorgu kapanım hesaplamaları gerektiriyor.  Kapanım Türü '{1}'. </value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>İç Hata. Kapanım hesaplamaları gerektiren bir sorgu yürütülürken SQL Server'dan alınan kapanım türü null veya boş.</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>Bir sorgunun yürütülmesi kapanım hesaplamaları gerektiriyor ancak uygulama yapılandırmasında kapanım sağlayıcısı bölümü eksik.</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>Kapanım türü '{0}' ve kanıtlama protokolü '{1}' için kapanım sağlayıcısı bulunamadı. Lütfen bağlantı dizesinde doğru kanıtlama protokolünü belirtin. </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>Bağlantıdaki tüm komutlar için varsayılan sütun şifreleme ayarı.</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>Gizli veriler sunucuya gönderilmeden önce parametrenin şifrelenmesini gerektirir. </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>SQL Server adlarını ve bunların güvenilen sütun ana anahtar yollarını içeren sözlük nesnesi.</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>ApplicationIntent ReadOnly bağlantı seçeneğiyle yansıtılmış bir SQL Server örneğine bağlanma desteklenmiyor.</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>Beklenmeyen yönlendirme bilgisi alındı.</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>Geçersiz yönlendirme bilgisi alındı.</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>Bu bağlamda belirtilen desteklenmeyen kimlik doğrulama: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Active Directory Etkileşimli kimlik doğrulaması zaman aşımına uğradı. Kullanıcının kimlik doğrulama isteğine yanıt vermesi çok uzun sürdü.</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>Kimlik Bilgisi özelliği ayarlanmışsa 'Authentication=Active Directory Interactive' kullanılamaz.</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>Etkin bağlantının Sunucu İşlem Kimliği (SPID).</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Active Directory Cihaz Kodu Akış kimlik doğrulaması zaman aşımına uğradı. Kullanıcının kimlik doğrulama isteğine yanıt vermesi çok uzun sürdü.</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>Bağlantı dizesinde 'Authentication=Active Directory Device Code Flow' belirtildiyse, Kimlik Bilgisi özelliği ayarlanamaz.</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>Yalnızca tek boyutlu diziler, istenen eylem için destekleniyor.</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>Belirtilen öğe belirtilen Koleksiyonda bulunamadığı için kaldırılamıyor.</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>Negatif olmayan sayı gerekiyor.</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Bağlantı dizesinde 'Authentication=Active Directory Default' belirtilmişse AccessTokenCallback özelliği ayarlanamaz.</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} {1} döndürdü.</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>Protokol hatası: Alınan ileti geçerli bir imza içeriyor ancak geçerli Koruma Düzeyinin gerektirdiği gibi şifrelenmemiş.</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>{0}, {1} hatasıyla başarısız oldu.</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>Bu metot, bu sınıf tarafından uygulanmıyor.</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>İstenen güvenlik paketi desteklenmiyor.</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>Yanlış physicalConnection türü.</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>AppContext Switch '{0}'={1} ayarlanırken özel durum oluştu.</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>{0} türü, bu platformda desteklenmiyor.</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>Küreselleşme Değişmez Modu desteklenmiyor.</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>Kerberos kullanılarak kimlik doğrulanamıyor. Kerberos kimlik doğrulaması yapılabilmesi için Kerberos'un istemcide 'kinit' ile başlatılmış olduğundan ve SQL Server’da Hizmet Asıl Adı'nın kaydedildiğinden emin olun.</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>'Ağ Kitaplığı' anahtar sözcüğü bu platformda desteklenmiyor. Bunun yerine istenen protokolle 'Veri Kaynağı' ön eki ekleyin (TCP bağlantısı için 'tcp:', Adlandırılmış Kanal bağlantısı için 'np:').</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>Yuva, '{1}' hata kodunu vererek beklenen '{0}' durumunu oluşturmadı.</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>Sunucu, bu platformda desteklenmeyen bir özelliği kullanmaya çalışıyor.</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>'{0}' anahtar sözcüğü, bu platformda desteklenmiyor.</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>Şu anda yüklü olan System.Transactions.dll, Genel İşlemleri desteklemiyor.</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>Sunucudan veri okunurken desteklenmeyen bir '{0}' belirteci alındı.</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>'{0}', desteklenen bir tanıtıcı türü değil.</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>SqlFileStream, bu platformda desteklenmiyor.</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>LocalDB, bu platformda desteklenmiyor.</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>Yetersiz arabellek alanı. Gerekli:{0}: Olan: {1}.</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>GSSAPI işlemi şu durumla başarısız oldu: {0} (İkincil durum: {1}).</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>GSSAPI işlemi, {0} ({1}) hatasıyla başarısız oldu.</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>Windows dışındaki işletim sistemlerinde kanal bağlama desteği bulunmuyor.</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>Varsayılan kimlik bilgileri geçilirse hedef adı boş olmamalıdır.</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>İstenen koruma düzeyi, şu anda yüklü olan GSSAPI uygulamasıyla desteklenmiyor.</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>Sunucu uygulaması desteklenmiyor.</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>Bu platformda, NTLM kimlik doğrulaması varsayılan kimlik bilgileriyle mümkün değildir.</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>DataAdapter.Update tarafından kullanıldığında, parametre değeri DBNull.Value değerinden (Int32)1 değerine veya null değilse, (Int32)0 değerine değiştirilir.</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>Arabellek boyut üst sınırı aşıldı: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>SourceColumn '{2}' için DataColumn '{0}' eksik.</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>SqlBatchCommand listesi başlatılmadı.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index f4f6ebd924..8f881105c9 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>升序</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>此 {1} 的 Count={2} 的索引 {0} 无效。</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>另一个 {1} 中已包含 {0}。</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>此 {1} 中已包含 {0}。</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0} 只接受非空的 {1} 类型对象。</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>试图移除此 {1} 不包含的 {0}。</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1} 必须是唯一的，“{2}”在集合中已存在。</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>连接未关闭。 {0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>阅读器关闭时尝试调用 {0} 无效。</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>无法登记在事务中，因为该连接是委派事务或提升事务的主要连接。</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>降序</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>应为“{0}”参数的非空字符串。</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>ConnectionString 属性尚未初始化。</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>捕获到非 CLS Exception。</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>给定的安全元素不是权限元素。</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>数据</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>更新</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>ConnectionState，指示连接是打开的还是关闭的。</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>当连接更改状态时触发的事件。</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>参数一般类型。</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>输入、输出或双向参数。</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>用于生成强类型代码的设计时属性。</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>可变长度数据类型中的偏移量。</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>参数的名称。</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>可变长度数据类型(字符串和数组)。</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>在由 DataAdapter.Update 使用时，是用于在 ColumnMappings 中查找 DataSetColumn 名称的源列名。这将在参数与数据行之间复制值。</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>由 DataAdapter.Update (仅 UpdateCommand)使用时，用于更新数据源的 DataRow 值的版本。</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>在 DataAdapter.Update 使用时，参数值由 DBNull.Value 更改为(Int32)1 或(Int32)0 (如果非空)。</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>参数值。</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>因为执行 SQL 查询失败，所以无法生成“{0}”集合。有关详细信息，请参见内部异常。</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>除必需的架构(“{0}”)支持外，还提供了更多的限制。</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>对于“{0}”架构集合的“{1}”限制，“{2}”不是有效值。</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>请求的集合({0})未定义。</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>此版本的提供程序不支持请求的集合 ({0})。</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>缺少必需的 DataSourceInformation 表列之一。</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>DataSourceInformation 表必须只包含一行。</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>限制集合中缺少一个或多个必选列。</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>限制集合中存在没有匹配行的限制。</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>元数据 XML 中缺少集合“{0}”。</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>元数据 XML 无效。</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>元数据 XML 无效。{0} 集合必须包含 {1} 列，并且必须为字符串列。</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>元数据 XML 无效。{0} 集合的 {1} 列必须包含非空字符串。</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>操作</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>行为</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>填充</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>InfoMessage</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>映射</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>通知</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>架构</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>池</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>命名 ConnectionString</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>安全性</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>连接复原能力</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>保留自定义用户信息的集合。</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>指示在 DataSet 内比较字符串是否区分大小写。</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>该 DataSet 的名称。</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>指示 DataSet 中所包含数据的自定义“视图”。此视图允许通过自定义数据视图进行筛选、搜索和导航。</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>指示是否遵循约束规则。</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>指示 DataSet 有错误。</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>指示在 DataSet 中比较字符串时所用的区域设置。</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>指示此 DataSet 指向的根元素的 XML URI 命名空间。</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>指示用于此 DataSet 的命名空间的前缀。</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>保存此 DataSet 的关系的集合。</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>保存此 DataSet 的表的集合。</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>当无法合并具有相同名称的两个表的架构时发生。</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>在 Initialization 完成之后发生。</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>表示数据在内存中的缓存。</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>指示在表中比较字符串是否区分大小写。</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>返回此表的子关系。</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>保留该表的列的集合。</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>保留该表的约束的集合。</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>指示此表所属的 DataSet。</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>这是该表的默认 DataView。</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>用于计算此行的数据绑定值的表达式。</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>返回该表是否有错误。</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>指示在表中比较字符串时所用的区域设置。</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>指示此表最初的起始大小。</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>指示此表中所包含元素的 XML URI 命名空间。</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>指示 XML 表示形式中用于此表的命名空间的前缀。</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>返回此表的父关系。</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>指示表示此表主键的列。</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>指示保留此表的数据行的集合。</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>指示在 DataSet 的 Tables 集合中查找此表时所用的表名称。</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>在表中某一行被成功编辑后发生。</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>当更改该行以便事件处理程序能够修改或取消所作更改时发生。用户能够修改该行中的值并应能够引发异常来取消编辑。</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>在表中某一行被成功删除后发生。</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>当表中某行被标记为删除时发生。引发异常以取消删除。</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>当已为该列提交值时发生。用户可以修改建议的值并且应当引发异常来取消编辑。</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>当已为该列更改值时发生。</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>发生在从表中清除所有行之前。</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>发生在表中的所有行成功地被清除之后。</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>发生在实例化新的 DataRow 之后。</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>在 DataSet 的 Relations 集合中查找此关系时所用的名称。</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>指示此关系的子列。</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>指示此关系的父列。</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>指示关系是否嵌套。</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>对于删除，指示通过此关系应发生哪种类型的级联。</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>对于更新，指示通过此关系应发生哪种类型的级联。</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>对于接受和拒绝更改，指示通过此关系应发生哪种类型的级联。</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>指示此约束的子列。</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>指示此约束的父列。</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>指示此约束的子表。</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>指示此约束的列。</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>指示此约束是否是主键。</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>指示此约束的名称。</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>指示此约束的表。</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>指示此列中是否允许包含 null 值。</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>指示对于添加到该表的新行，该列是否自动递增。该列的类型必须是 Int16、Int32 或 Int64。</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>指示 AutoIncrement 列的起始值。</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>指示 AutoIncrement 列所使用的增量。</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>指示该列的默认用户界面标题。</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>指示用于在 DataTable 的列集合中查找此列的名称。</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>返回此列所属的 DataTable。</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>指示在此列中存储的数据的类型。</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>指示向表中添加新行时所使用的默认列值。</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>指示该列根据其他列(而不是采用用户输入)为每行计算的值。</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>指示该列如何保持在 XML 中: 作为特性、元素、简单文本节点还是无定义。</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>指示此列中存储的元素或特性的 XML URI。</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>指示 xml 表示形式中用于此 DataColumn 的 Prefix。</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>指示 Columns 集合中此列的索引。</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>指示向表中添加一行后此列是否允许更改。</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>指示此列是否应将其在表行中的值限制为唯一的。</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>指示此列所允许的值的最大长度。</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>指示此 DataColumn 的 DateTimeMode。</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>指示此 DataView 以及与之关联的用户界面是否允许删除。</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>指示此 DataView 以及与之关联的用户界面是否允许编辑。</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>指示此 DataView 以及与之关联的用户界面是否允许添加新行。</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>返回此视图中当前的项数。</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>这使指针返回到拥有此 DataSet 的 DataViewManager (如果有)。</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>指示此视图是否处于打开状态。</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>指示用于筛选此 DataView 返回的数据的表达式。</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>指示此 DataView 返回的数据的版本。</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>指示列的名称和此 DataView 返回数据时所采用的顺序。</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>指示没有设置 Sort 属性时是否使用默认排序。</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>指示此 DataView 用来获取数据的表。</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>指示此 DataView 返回的数据被以某种方式进行了更改。</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>指示此 DataViewManager 的数据源。</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>指示相应 DataSet 中任意表的排序/筛选/状态设置。</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet 不支持“union”或“list”作为 simpleType。</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>无效的 {0} 语法: 缺少必需的“{1}”特性。</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>值“{1}”对于特性“{0}”无效。</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>特性“{0}”的值应为“{1}”或“{2}”。</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>找不到 ElementType name='{0}'。</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>在关系“{0}”中缺少父表名称。</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>在关系“{0}”中缺少子表名称。</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>在关系“{0}”中缺少父表键。</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>在关系“{0}”中缺少子表键。</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>未定义的数据类型:“{0}”。</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>未定义数据类型。</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>字段节点内的 XPath 选择无效。未找到: {0}。</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>选择器节点中的 XPath 选择无效: {0}。</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>名为 {0} 的约束中的“Key”节点无效。</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>约束名称 {0} 已用于架构中。</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>无法将“{0}”转换为类型“{1}”。</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>在名为“{2}”的“{1}”约束中缺少“{0}”部分。</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>无效的 Relation 定义: 不同长度的键。</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet 不允许在名为“{0}”的 ComplexType 中使用循环引用。</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet 无法为节点 {0} 实例化抽象 ComplexType。</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>多目标转换器在编写 Xml Schema 时出错。有关详细信息，请参见内部异常。</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>多目标转换器在编写 Xml Schema 时出错。返回了 null 或空字符串。</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>重复的声明“{0}”。</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>无法加载 diffGram。目标 DataSet 中缺少表“{0}”。</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>无法加载 diffGram。缺少“sql”节点。</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>列名“{0}”是为不同的映射类型定义的。</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>前缀“{0}”包含特殊字符，因此是无效的。</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>自我嵌套表“{0}”中的循环引用。</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet 无法扩展实体。使用 XmlValidatingReader 并相应地设置 EntityHandling 属性。</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>类型“{0}”未实现 IXmlSerializable 接口，因此不能继续序列化。</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>无法处理反序列化。数据不实现 IXMLSerializable，因此不支持多态性。</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable 不支持来自 Xml 的架构推断。</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>无法继续序列化 DataTable“{0}”。它包含的 DataRow 在同一外键上有多项父行。</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>输入 Schema 中缺少 IsDataSet 特性。</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>无法确定 DataSet 元素。IsDataSet 属性出现多次。</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet 将不对实现 IDynamicMetaObjectProvider 但不实现 IXmlSerializable 的类型进行序列化。</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>未实现此功能。 {0}。</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>语法错误:“{0}”运算符后缺少操作数。</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>表达式“{0}”中类型不匹配。</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>表达式太复杂。</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>未找到列 [{0}]。</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>表达式包含无效的字符串常量: {0}。</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>表达式包含未定义的函数调用 {0}()。</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>表达式中有语法错误。</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>无效的参数数目: 函数 {0}()。</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>表达式缺少右括号。</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>无法解释位置 {1} 的标记“{0}”。</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>应为 {0}，但位置 {2} 的实际标记是 {1}。</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>无法从 {0} 转换为 {1}。</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>无法将值 ‘{0}’ 转换为类型: {1}。</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>无效列名称 [{0}]。</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>表达式包含无效的日期常量“{0}”。</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>在 IN 运算符的表达式列表中只允许常量表达式。</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Like 运算符中出错: 字符串模式“{0}”无效。</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>语法错误: IN 关键字后面的项必须用逗号分隔，并且必须用括号括起来。</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>函数参数中的类型不匹配: {0}()，参数 {1}，应为 {2}。</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>函数参数中的类型不匹配: {0}()，参数 {1}，应为一种 Integer 类型。</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>无法在 {1} 和 {2} 上执行“{0}”操作。</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>运算符“{0}”对于类型“{1}”和“{2}”的操作数具有多义性。不能将有符号和无符号的类型混合起来。请使用显式 Convert() 函数。</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>语法错误: IN 关键字后面必须是由逗号分隔的非空表达式列表，并且必须用括号括起来。</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>表达式包含不支持的运算符“{0}”。</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>表达式包含无效名称:“{0}”。</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>语法错误:“{0}”运算符前缺少操作数。</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>表达式中右括号过多。</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>表 [{0}] 涉及不只一个关系。您必须在表达式“{1}”中明确提出一个关系名称。</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>聚合参数中的语法错误: 需要具有可能的“Child”限定符的单个列参数。</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>聚合表达式“{0}”中的未绑定引用。</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>没有当前行就无法计算非常数表达式。</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>表达式“{0}”中的未绑定引用。</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>无法计算。表达式“{0}”不是聚合。</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>筛选表达式 ‘{0}’ 的计算结果不是布尔项。</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>无效的类型名称“{0}”。</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>查找表达式中的语法错误: 关键字“Parent”之后应当是具有可能的关系限定符的单个列参数: Parent[(&lt;relation_name&gt;)].&lt;column_name&gt;。</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>需要一行或一个表来调用 DataFilter。</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>{0}()参数超出范围。</value>
-  </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>语法错误:“Is”运算符的用法无效。正确语法是: &lt;expression&gt; Is [Not] Null。</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>偏移量和长度超出数组的界限，或者计数大于从索引到源集合结尾处的元素数量。</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>值对于类型“{0}”而言或者太大或者太小。</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>无法将类型为“{0}”的对象转换成类型为“{1}”的对象。</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>出现被零除错误。</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>“{0}”可接受的唯一值是“{1}”。</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>找不到父关系“{0}”。</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>属性“{0}”可以接受的值为“{1}”或“{2}”。</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>“hours”参数超出范围。其值必须在 -14 到 +14 之间。</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>指定的 QuotePrefix 和 QuoteSuffix 值不匹配。</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>“minutes”参数超出范围。其值必须在 -59 到 +59 之间。</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>参数“{0}”的长度超出其“{1}”的限制。</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>为时区提供的范围超出了合计的 14 小时。</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>键“{0}”的值无效。</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>所提供的 DateTime 参数的 Kind 属性与“hours”和“minutes”参数不匹配。</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>使用键“{0}”要求存在键“{1}”。</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>类型为“{0}”的 DataColumn 不支持表达式。</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>密钥“{0}”值的长度超出其限制 {1}。</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>未能启用约束。一行或多行中包含违反非空、唯一或外键约束的值。</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>不支持的关键字:“{0}”。</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>集合本身是不可修改的。</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>内部 .NET Framework 数据提供程序错误 {0}。</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>给定的名称“{0}”至少与集合对象中的两个名称匹配，但大小写不同，并且不与其中任何一个的大小写匹配。</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0}“{1}”。</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>给定的名称“{0}”至少与集合对象中具有不同命名空间的两个名称相匹配。</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}"，引号的用法不正确。</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>偏移量和长度超出数组的界限，或者计数大于从索引到源集合结尾处的元素数量。</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}"，当前对“{2}”的限制不够。</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>“{0}”参数超出范围。</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>SqlBulkCopy.WriteToServer 失败，因为 SqlBulkCopy.DestinationTableName 是无效的多部分名称</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>“{0}”参数不能为空。</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>因为无效的多部分名称，处理来自 SQL Server 的结果失败</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>“{0}”参数包含 Null 值。</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName 是无效的多部分名称</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>无法找到列 {0}。</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName 是无效的多部分名称</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>列“{0}”已属于此 DataTable。</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>SqlCommand.DeriveParameters 失败，因为 SqlCommand.CommandText 属性值是无效的多部分名称</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>列“{0}”已属于另一个 DataTable。</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>不支持使用 MultiSubnetFailover 连接选项连接到镜像的 SQL Server 实例。</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>不能在 DataTable 中包含一个以上的 SimpleContent 列。</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>{2} 方法不支持 {0} 枚举值 {1}。</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>无法将 SimpleContent 列添加到包含元素列或嵌套关系的表中。</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>.NET Framework SqlClient 数据提供程序不支持 {0} 枚举值 {1}。</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>名为“{0}”的列已属于此 DataTable。</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: CommandText 属性尚未初始化</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>无法添加名为“{0}”的列: 此 DataTable 中已存在同名的嵌套表。</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: Connection 属性尚未初始化。</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>此 DataTable 中已经有一个名为“{0}”的列: 无法将嵌套表的名称设置为相同的名称。</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} 要求已打开且可用的 Connection。{1}</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>不能移除不属于此表的列。</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>存储过程“{0}”不存在。</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>此列是主键的一部分，因此不能移除。</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>事务要么与当前连接无关联，要么已完成。</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>此列是关系 {0} 的父键的一部分，因此不能移除。</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>与当前连接相关联的事务已经完成，但尚未释放。必须先释放该事务，然后才能使用该连接来执行 SQL 语句。</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>此列是表 {1} 的约束 {0} 的一部分，因此不能移除。</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>如果分配给命令的连接位于本地挂起事务中，{0} 要求命令拥有事务。命令的 Transaction 属性尚未初始化。</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>此列是表达式 {0} = {1} 的一部分，因此不能移除。</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>已有打开的与此 {0} 相关联的 DataReader，必须首先将它关闭。</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>无法为计算所得的列设置 AutoIncrement 属性。</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>{0} DeriveParameters 仅支持 CommandType.StoredProcedure，不支持 CommandType.{1}。</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>无法为已设置 DefaultValue 的列设置 AutoIncrement 属性。</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>在 AutoIncrement 列上不能设置 DefaultValue。</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep 必须是非零值。</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>当 ColumnName 作为 DataTable 的一部分时是需要的。</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>在列包含数据的情况下不能更改其 DataType。</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>列要求有效的 DataType。</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>{0} 列的 DefaultValue 的类型为 {1}，并且不能被转换为 {2}。</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>该列的 DefaultValue 的类型为 {0}，并且不能被转换为 {1}。</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>{0} 列的 DefaultValue 的类型为 {1}，但该列的类型为 {2}。</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>不能更改表达式列的 ReadOnly 属性。</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>不能更改表达式列的 Unique 属性。</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>在具有 AutoIncrement 或 Unique 的列上不能创建表达式。</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>不能设置表达式，因为列不能被设置为 ReadOnly。</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>不能在 {0} 列上设置 Expression 属性，因为它是约束的一部分。</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>不能基于 Expression 列 {0} 创建约束。</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>不能设置 Expression 属性，因为表达式中存在循环引用。</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>列“{0}”中包含 null 值。</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>列“{0}”不允许 nulls。</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>列“{0}”为只读。</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>列“{0}”包含不唯一的值。</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>列“{0}”不属于表 {1}。</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>列必须属于某个表。</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>不能在 {1} 列中存储 &lt;{0}&gt;。所需类型是 {2}。</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>不能将 Column“{0}”设置为 null。请改用 DBNull。</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>无法设置列“{0}”。此值违反了此列的 MaxLength 限制。</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength 仅适用于字符串数据类型。您不能将 Column“{0}”的属性 MaxLength 设置为非负数字。</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>无法将 Column“{0}”的属性 MaxLength 设置为“{1}”。表中至少存在一个长度超过新的限制的字符串。</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>无法设置 Column“{0}”的属性 MaxLength。该列为 SimpleContent。</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>无法将 Column“{0}”的属性 DataType 设置为 {1}。该列为 SimpleContent。</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>无法将 Column“{0}”的属性 MappingType 设置为 SimpleContent。Column DataType 为 {1}。</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>Column“{0}”超过 MaxLength 限制。</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>列“{0}”不允许 DBNull.Value。</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>无法更改 Column“{0}”的 Namespace 属性。该列为 SimpleContent。</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>类型为“{0}”的 DataColumn 一旦拥有数据，就无法更改其 AutoIncrement。</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>列“{0}”不属于基础表“{1}”。</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>类型“{0}”的 DataColumn 是 complexType。无法将复杂类型的值序列化为 Attribute</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>只可在 DateTime 类型的 DataColumns 上设置 DateTimeMode。</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>“{0}”是无效的 DataSetDateTime 值。</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>一旦表具有数据，就无法将 DateTimeMode 由“{0}”更改为“{1}”。</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Type“{0}”不包含 static Null 属性或字段。</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>类型“{0}”不实现 IRevertibleChangeTracking；因此不能使用 RejectChanges() 继续。</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>只能在具有 Unchanged DataRowState 的 DataRows 上调用 SetAdded 和 SetModified 。</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>序数 ‘{0}’ 超出最大数字。</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet 不支持 System.Nullable&lt;&gt;。</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>当约束处于 ConstraintCollection 中时，不能将其名称更改为空字符串。</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>不能在约束 {0} 上强制约束。</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>列“{0}”被约束为是唯一的。值“{1}”已存在。</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>约束“{0}”不属于此 DataTable。</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>无法找到约束 {0}。</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>约束与集合中已有的名为 {0} 的约束匹配。</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>名为“{0}”的 Constraint 已属于此 DataTable。</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>这些列当前不具有唯一值。</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>这些列不指向此表。</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>不能启用此约束，因为不是所有的值都具有相应的父值。</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>不能添加此约束，因为 ForeignKey 不属于表 {0}。</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>不能移除不属于该表的约束。</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>无法删除唯一约束“{0}”。首先删除外键约束“{1}”。</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>不能删除此行，原因是约束在关系 {0} 上是强制的，并且删除此行将影响子行。</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>不能进行此更改，原因是约束在关系 {0} 上是强制的，并且更改此值将影响子行。</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>不能清除表 {0}，原因是 ForeignKeyConstraint {1} 强制约束，并且在 {2} 中有子行。</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>ForeignKeyConstraint {0} 要求在父表中存在子键值({1})。</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>无法访问属性，因为“{0}”。</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>不能移除此行，原因是它具有子行，并且关系 {0} 上的约束是强制的。</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>已经为该表设置了主键，因此无法添加主键约束。</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>不能将约束添加到作为两个嵌套关系中的子表的 DataTable“{0}”。</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>不能根据属于多个不同表的列来创建键。</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>不能没有列。</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>包含的列不能超过 {0} 个。</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>当同一个列被列出不只一次时，不能创建键:“{0}”</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>唯一约束是表的主键，因此不能移除。</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>唯一约束是表 {0} 的主键，因此不能移除。</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>父列和子列不具有类型匹配的列。</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey 和 ChildKey 完全相同。</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns 和 ChildColumns 的长度应当相同。</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns 和 ChildColumns 的长度不能为零。</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>该行不属于与此关系相同的 DataSet。</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>当 RelationName 是 DataSet 的一部分时，它是必需的。</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows 要求表为 {0} 的行，但指定行的 Table 是 {1}。</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>此关系应连接 DataSet 中的两个表，以使该关系添加到该 DataSet 中。</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRow 要求表为 {0} 的行，但指定行的表是 {1}。</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow 要求表为 {0} 的子行，但指定行的表是 {1}。</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>在不同 DataSet 中的表之间不能建立关系。</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>不能在不同 DataSet 的各表之间建立关系。</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>这些子列之间已经存在某种关系。</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>该关系不属于此关系集合。</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>该关系已经属于另一个 DataSet。</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>该关系已经属于此 DataSet。</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>名为“{0}”的 Relation 已经属于此 DataSet。</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>Relation {0} 不属于此 DataSet。</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>无法找到关系 {0}。</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>不能在 null 表上创建集合。</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>此集合为其显示关系的表已经从其 DataSet 中移除。</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>如果此表在它的 ParentRelation 集合中不是子表，则不能将关系添加到该集合中。</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>如果此表在它的 ChildRelation 集合中不是父表，则不能将关系添加到该集合中。</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>不能将此关系的“Nested”属性设置为 false。</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>同样的表“{0}”不能作为两个嵌套关系中的子表。</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>表({0})在嵌套关系中不能是其自身的子表。</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>无法添加在父表和子表之间具有不同 Locale 或 CaseSensitive 设置的 DataRelation 或 Constraint 。</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>如果父列或子列不在 DataSet 中，则无法创建 DataRelation。</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>嵌套表“{0}”的命名空间是继承而来的，不能在不同的命名空间中拥有多个父表。</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>具有空命名空间的嵌套表“{0}”不能在不同命名空间中具有多个父表。</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>该行不属于与此关系相同的 DataSet。</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>不能对该表中没有的行执行此操作。</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>此关系和子行不属于同一个 DataSet。</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>不能在 RowChanging 事件中更改建议的值。</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>不能在 OnRowChanging 事件内部调用 EndEdit()。</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>不能在 RowChanging 事件内部调用 BeginEdit()。</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>不能在 OnRowChanging 事件内部调用 CancelEdit()。引发 exception 以取消此更新。</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>不能在 OnRowDeleting 事件内部调用 Delete。引发 exception 以取消此删除。</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>输入阵列的长度超过了此表中的列数。</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>没有要访问的 Current 数据。</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>没有要访问的 Original 数据。</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>没有要访问的 Proposed 数据。</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>此行已从表中移除并且没有任何数据。BeginEdit() 将允许在此行中创建新数据</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>不能通过已删除的行访问该行的信息。</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>版本必须是“Original”、“Current”或“Proposed”。</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>在位置 {0} 处没有任何行。</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>行插入位置 {0} 无效。</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>对于名为“{1}”的表，找到了两次 rowOrder value={0}。</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>表“{0}”的 rowOrder 序列中缺少值。</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>给定的 DataRow 不在当前的 DataRowCollection 中。</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>该行已经属于另一个表。</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>该行已经属于此表。</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>此行已被删除，因此不能删除。</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>此行是空行。</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>不能移除已被移除的行。</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>子行具有多个父行。</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>未识别的行状态位模式。</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>不能将此 DataSet 的名称更改为空字符串。</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>名称“{0}”无效。DataSet 不能与 DataTable 同名。</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>该架构命名空间无效。请改用此命名空间: {0}。</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>无法更改 CaseSensitive 或 Locale 属性。该更改可能导致至少一个 DataRelation 或 Constraint 在其相关表之间具有不同的 Locale 或 CaseSensitive 设置。</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>SchemaSerializationMode 属性只有在被派生的 DataSet 覆盖时才可以设置。</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>PrimaryKey 列不属于此表。</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>不能将嵌套关系或元素列添加到包含 SimpleContent 列的表中。</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>当 TableName 是 DataSet 的一部分时，它是必需的。</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable 已有简单的内容列。</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>表没有主键。</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} 不是有效的 Sort 字符串项。</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>无法序列化 DataTable。一个或多个 DataColumn 表达式中使用的 DataTable 不是当前 DataTable 的后代。</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>此 DataTable 只能远程作为 DataSet 的一部分。一个或多个表达式列引用了其他数据表。</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>不能对 DataSet 和 DataTable 使用不同的远程格式属性值。</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>无法序列化 DataTable。未设置 DataTable 名称。</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>名为“{0}”的 DataTable 已属于此 DataSet。</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>具有同一 Namespace“{1}”、名为“{0}”的 DataTable 已属于此 DataSet。</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>在嵌套关系中，表({0})不能是自身的子表: DataSet 名称与表名称冲突。</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>名称“{0}”无效。DataTable 不能与 DataSet 同名。</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable 已属于另一个 DataSet。</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable 已属于此 DataSet。</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>表 {0} 不属于此 DataSet。</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>无法找到表 {0}。</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>不能移除包含现有关系的表。请首先移除关系。</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>不能移除表 {0}，原因是它在 ForeignKeyConstraint {1} 中被引用。请首先移除该约束。</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>DataTable“{0}”与源中的任意 DataTable 都不匹配。</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>目标 DataSet 缺少 {0} 的定义。</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>目标 DataSet 缺少 {0} {1}。</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} 和 &lt;source&gt;.{0} 的属性冲突: DataType 属性不匹配。</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey 和 &lt;source&gt;.PrimaryKey 的 Length 不相同。</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>PrimaryKey 中的列不匹配 : &lt;target&gt;.{0} 与 &lt;source&gt;.{1} 不匹配。</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>无法合并关系 {0}，因为键的列不匹配。</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>目标表 {0} 缺少列 {1} 的定义。</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>源表中不存在 PrimaryKey 列 {0}。</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>RowStates 参数必须设置为 DataViewRowState 枚举值的有效组合。</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>查找基于排序顺序来查找行，但未指定任何排序顺序。</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>被编制索引的键需要 {0} 个值，但收到了 {1} 个值。</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>无效的聚合函数 {0}()和类型 {1} 的用法。</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>无效的存储类型: {0}。</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>DataSet Xml 持久性不支持值“{0}”为 Char 值，请改用 Byte 存储。</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>值类型与列类型不匹配</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>类型“{0}”不实现 IComparable 接口。无法进行比较。</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>不能设置 {0}。</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>不能在已成为 DataSet 默认视图的 DataViewManager 上更改 DataSet。</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter 不能同时显示 ModifiedOriginals 和 ModifiedCurrents。</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>不能在 DefaultView 或来自 DataViewManager 的 DataView 上更改 Table 属性。</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>DataSet 属性一旦设置便无法更改。</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>在使用 DataViewManager 前必须设置 DataSet。</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>Table 属性一旦设置便无法更改。</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>在使用 DataView 前必须设置 DataTable。</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>无法绑定到没有名称的 DataTable。</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>不能将一个对象设置到此列表中。</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>不能对 AllowNew 为假的 DataView 调用 AddNew。</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView 未打开。</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>该关系不是此 DataView 指向的表的父关系。</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>不能对 AllowDelete 为 false 的 DataSource 执行删除。</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>不能对 AllowEdit 为 false 的 DataSource 进行编辑。</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>索引 {0} 不是为负数，就是大于行数。</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>不能将外部对象添加到此列表。</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>不能清除此列表。</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>不能将外部对象插入此列表。</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>不能移除列表中没有的对象。</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} 既不是表 {1} 的 DataColumn 也不是 DataRelation。</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>在 Range 对象中，Min ({0})必须小于或等于 max ({1})。</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>这是 null 范围。</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>MinimumCapacity 必须是非负的。</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>无法为名称“{0}”生成标识符。</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>存在多个具有相同名称“{0}”的表(虽然命名空间不同)。</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>列“{0}”: 类型“{1}”不能为 null。</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>列“{0}”: 类型“{1}”没有无参数构造函数。</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>列“{0}”: 类型“{1}”没有带字符串参数的构造函数。</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>无法将类型为“{0}”的对象转换成类型为“{1}”的对象。</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception。</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception。</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>已删除的行不可访问。</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>不允许重名。</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>RowChanging 事件中不支持操作。</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>无效的约束。</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>缺少主键。</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>不允许 Null。</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>列被标记为只读。</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>在表中找不到行。</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>找不到版本。</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>修改了 ReadOnly 数据。</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>当前 DataTable“{0}”的 DataTableReader 无效。</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader 中的当前 DataTable“{0}”的架构已更改，DataTableReader 无效。</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>无法创建 DataTableReader。DataSet 中没有 DataTable。</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>无法创建 DataTableReader。参数为空。</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>无法创建 DataTableReader。参数包含 null 值。</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>当前 DataRow 的状态不是为 Deleted 就是为 Detached。</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>当前 DataTable“{0}”为空。DataTable 中没有 DataRow。</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>DataTable 内部索引已损坏:“{0}”。</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>集合已修改；枚举操作可能无法执行。</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>已使用不同的 ‘{1}’ 声明简单类型 ‘{0}’。</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>无效的编页。</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>只要相关的 DataSet 被映射到加载的 XML 文档中，就不能更改该表名称。</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>只要相关的 DataSet 被映射到加载的 XML 文档中，就不能更改该表命名空间。</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>只要相关的 DataSet 被映射到加载的 XML 文档中，就不能更改该列名称。</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>只要相关的 DataSet 被映射到加载的 XML 文档中，就不能更改列命名空间。</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>关联的 DataSet 映射到已加载的 XML 文档后，就不能更改 ColumnMapping 属性。</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>只要 DataSet 被映射到加载的 XML 文档中，就不能在该表中添加或移除列。</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>只要 DataSet 被映射到加载的 XML 文档中，就不能在该 DataSet 中添加或移除表。</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>只要 DataSet 被映射到加载的 XML 文档中，就不能在该 DataSet 中添加、移除或更改嵌套的关系。</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>该 DataSet 参数无效。它不能为 null。</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>只要 DataSet 被映射到加载的 XML 文档中，就不能更改 DataSet 的名称。</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>此节点类型不能克隆: {0}。</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>如果 XmlDataDocument 已经包含数据，则无法加载。请使用新的 XmlDataDocument。</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>DataSet 最多可与一个 XmlDataDocument 关联。不能将 DataSet 与当前的 XmlDataDocument 关联，因为该 DataSet 已与另一个 XmlDataDocument 关联。</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>在尝试使用 XML 操作编辑 XmlDataDocument 之前请设置 DataSet.EnforceConstraints == false。</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>DataDocument 上不支持 GetElementById()。</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>不能在 DataDocument 上创建实体引用。</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>XmlDataDocument 不支持在 DateSet 和 DataTable 上使用 Clear 函数。</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>不能移除列，因为它内置于此 dataSet 中。</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>无法移除关系，因为它内置于此 dataSet 中。</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>每当更改该控件的属性时发生。</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>每当此集合的成员更改时发生。</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>无法获取值，因为它是 DBNull。</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>“{0}”属性需要 Microsoft WindowsNT 或基于 WindowsNT 的操作系统。</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>找不到请求的 .NET Framework 数据提供程序。它可能没有安装。</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>请求的 .NET Framework 数据提供程序实现不包含具有 System.Data.Common.DbProviderFactory 派生类型的 Instance 字段。</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>找不到或无法加载已注册的 .NET Framework 数据提供程序。</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>缺少必需的 .NET Framework 数据提供程序程序集限定名称。</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>只允许元素。</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>不允许子节点。</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>无法识别的特性“{0}”。</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>无法识别的元素。</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>每个配置文件中只能出现一次“{0}”节。</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>找不到所需的特性“{0}”。</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>必需的特性“{0}”不能为空。</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>应为“{0}”参数的非空数组。</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>“{0}”可接受的唯一值是“{1}”。</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>属性“{0}”可以接受的值为“{1}”或“{2}”。</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>指定的 QuotePrefix 和 QuoteSuffix 值不匹配。</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>参数“{0}”的长度超出其“{1}”的限制。</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>应为 {1} 类型的参数，而收到的是 {0} 类型。</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>键“{0}”的值无效。</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>使用键“{0}”要求存在键“{1}”。</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>密钥“{0}”值的长度超出其限制 {1}。</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>不支持的关键字:“{0}”。</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>无法加载 UDL 文件。</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>无效的 UDL 文件。</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>内部 .NET Framework 数据提供程序错误 {0}。</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>生成了 Insert、Update 或 Delete 命令后，QuotePrefix 和 QuoteSuffix 属性就无法更改。</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>DataAdapter.SelectCommand 属性需要初始化。</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>DataAdapter.SelectCommand.Connection 属性需要初始化；</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0}“{1}”。</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}"，引号的用法不正确。</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}"，当前对“{2}”的限制不够。</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>SqlBulkCopy.WriteToServer 失败，因为 SqlBulkCopy.DestinationTableName 是无效的多部分名称</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>因为无效的多部分名称，处理来自 SQL Server 的结果失败</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName 是无效的多部分名称</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName 是无效的多部分名称</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>SqlCommand.DeriveParameters 失败，因为 SqlCommand.CommandText 属性值是无效的多部分名称</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>OdbcCommandBuilder.DeriveParameters 失败，因为 OdbcCommand.CommandText 属性值是无效的多部分名称</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>OleDbCommandBuilder.DeriveParameters 失败，因为 OleDbCommandBuilder.CommandText 属性值是无效的多部分名称</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>不支持使用 MultiSubnetFailover 连接选项连接到镜像的 SQL Server 实例。</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>来自 SourceColumn“{0}”的列映射失败，原因在于 DataColumn“{1}”是计算所得的列。</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>{1} 的 SourceColumn“{0}”和 {3} 的 DataColumn“{2}”之间无法转换的类型不匹配。</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>DataTable“{1}”中缺少 SourceColumn“{2}”的 DataColumn“{0}”。</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>SourceColumn 应为非空字符串。</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>缺少“{0}”的 SourceColumn 映射。</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{2} 方法不支持 {0} 枚举值 {1}。</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>.NET Framework Odbc 数据提供程序不支持 {0} 枚举值 {1}。</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>.NET Framework OleDb 数据提供程序不支持 {0} 枚举值 {1}。</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>.NET Framework SqlClient 数据提供程序不支持 {0} 枚举值 {1}。</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>无法检索 ComputerNameDnsFullyQualified {0}。</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>缺少“{1}”SourceTable 的“{0}”DataTable。</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>SourceTable 应为非空字符串</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>缺少 SourceTable 映射:“{0}”</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: CommandText 属性尚未初始化</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: Connection 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} 要求已打开且可用的 Connection。{1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: SelectCommand.Connection 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: SelectCommand.Connection 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: SelectCommand.Connection 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>更新要求 InsertCommand 具有连接对象。InsertCommand 的 Connection 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>更新要求 UpdateCommand 命令具有连接对象。UpdateCommand 的 Connection 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>更新要求 DeleteCommand 具有连接对象。该 DeleteCommand 的 Connection 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>更新要求连接对象。Connection 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>更新要求命令克隆具有连接对象。该命令克隆的 Connection 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>更新需要连接。</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Update 要求 {0}Command 具有打开的连接对象。{1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Update 要求 {0}Command 具有打开的连接对象。{1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Update 要求 {0}Command 具有打开的连接对象。{1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Update 要求更新命令具有打开的连接对象。{1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>存储过程“{0}”不存在。</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>分配给该命令的事务必须是最深层嵌套的本地挂起事务。</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>事务要么与当前连接无关联，要么已完成。</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>与当前连接相关联的事务已经完成，但尚未释放。必须先释放该事务，然后才能使用该连接来执行 SQL 语句。</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>如果分配给命令的连接位于本地挂起事务中，{0} 要求命令拥有事务。命令的 Transaction 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>已有一个打开的 SqlResultSet 与必须先关闭的此命令相关联。</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>已有打开的与此 {0} 相关联的 DataReader，必须首先将它关闭。</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>{0} DeriveParameters 仅支持 CommandType.StoredProcedure，不支持 CommandType.{1}。</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>同一次执行不能多次调用方法“{0}”。</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>异步结果不正确。</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>在调用“{0}”前，SelectCommand 属性尚未初始化。</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>此处不应为 StatementType {0}。</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: 应当为 SourceTable 名称输入一个非空字符串。</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>{0} 的 MaxRecords 值无效；该值必须大于等于 0。</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>{0} 的 StartRecord 值无效；该值必须大于等于 0。</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: 应当为 SourceTable 名称输入一个非空字符串。</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>分层章节列必须映射到 AutoIncrement DataColumn。</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) 返回了 null。</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>对 startRecords 或 maxRecords 使用非零值时，在 dataTables 数组中只指定一项。</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Update 无法找到 TableMapping['{0}'] 或 DataTable“{0}”。</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update: 应输入非空的 SourceTable 名称。</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>当 TableMapping.DataSetTable=“{0}”时缺少 TableMapping。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Update 要求命令复本是有效的。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>在 Update 期间自动 SQL 生成要求有效的 SelectCommand。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>当传递具有新行的 DataRow 集合时，Update 要求有效的 InsertCommand。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>当传递具有已修改行的 DataRow 集合时，更新要求有效的 UpdateCommand。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>当传递具有已删除行的 DataRow 集合时，Update 要求有效的 DeleteCommand。</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}] 和 DataRow[0] 来自不同的数据表。</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: 发生错误；未提供更多的信息。</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: 发生错误；未提供更多的信息。</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>进行批处理时，命令的 UpdatedRowSource 属性值 UpdateRowSource.FirstReturnedRecord 或 UpdateRowSource.Both 无效。</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>违反并发性: UpdateCommand 影响了预期 {1} 条记录中的 {0} 条。</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>违反并发性: DeleteCommand 影响了预期 {1} 条记录中的 {0} 条。</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>违反并发性: 成批命令影响了预期 {1} 条记录中的 {0} 条。</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>同一次执行不能多次调用方法“{0}”。</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>无效的 CommandTimeout 值 {0}；该值必须大于等于 0。</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: Size 属性具有无效大小值 0。</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>{0}.Prepare 方法要求所有参数具有显式设置的类型。</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>{0}.Prepare 方法要求所有可变长度参数具有显式设置的非零“Size”。</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>{0}.Prepare 方法要求“{1}”类型的参数具有显式设置的“Precision”和“Scale”。</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>为 asyncResult 调用了不匹配的 end 方法。应调用 {0}，但实际调用的是 {1}。</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>无效操作。连接被关闭。</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>连接已被禁用。</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>无法登记在事务中，因为连接上正在执行某个本地事务。请完成本地事务，然后重试。</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>连接当前已登记事务。请完成当前事务，然后重试。</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>数据库不能为空、空字符串或仅由空白组成的字符串。</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>参数太长。</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>“Connect Timeout”值无效，该值必须是大于等于 0 的整数。</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>无效的源缓冲区(大小为 {0})偏移量: {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>无效的目标缓冲区(大小为 {0})偏移量: {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>枚举值太大，不能适应 96 位十进制。</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>流关闭时 {0} 的尝试无效。</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>指定的 SeekOrigin 值无效。</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>对于多个基表不支持动态 SQL 生成。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>对于不返回任何基表信息的 SelectCommand 不支持动态 SQL 生成。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>对于不返回任何键列信息的 SelectCommand，不支持 DeleteCommand 的动态 SQL 生成。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>对于不返回任何键列信息的 SelectCommand，不支持 UpdateCommand 的动态 SQL 生成。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>对于没有行版本列的 SelectCommand，不支持 DeleteCommand 的动态 SQL 生成。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>对于没有行版本列的 SelectCommand，不支持 UpdateCommand 的动态 SQL 生成。</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>对于包含 QuotePrefix 或 QuoteSuffix 字符“{1}”的表名称“{0}”，不支持动态 SQL 生成。</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>读取列序号“{0}”的尝试无效。通过 CommandBehavior.SequentialAccess 只能读取“{1}”或更大的列序号。</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>数据类型“{0}”包含无效的日期时间数字，不能格式化为文本。</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>该值无法格式化为请求类型的文本。</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>数据类型“{0}”包含无效的最大小数位数，不能格式化为文本。</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>提供的文本值不是数据类型“{0}”的有效文本。</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>“{0}”: 文本值的长度必须为偶数。</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>“{0}”: 文本值必须是十六进制数字的字符串</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>未设置引号前缀时，{0} 要求已打开的连接。</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>无法确定正确的布尔文本值。无法创建 Boolean 文本。</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>不支持与数据类型“{0}”关联的本地数据类型文本。</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>{0} 的参数数据类型无效。</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>不存在从对象类型 {0} 到已知的托管提供程序本机类型的映射。</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>无法处理由类型 {1} 返回的未知 TypeCode {0}。</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>没有从 DbType {0} 到已知 {1} 的映射。</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>使用的 SQL Server 版本不支持数据类型“{0}”。</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>参数值“{0}”超出范围。</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>指定的参数名“{0}”无效。</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>不支持多个返回值参数。</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>无效的 Size 参数值“{0}”。该值必须大于或等于 0。</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>参数“{0}”的值无效。该值必须大于或等于 0。</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>此元数据的值无效。</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>元数据必须为 SqlDbType.Row</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>将参数值从 {0} 转换到 {1} 失败。</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} 不支持并行事务。</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>此 {0} 已完成；它再也无法使用。</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>记录为只读时不能调用“{0}”。</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>DbDataRecord 为只读时不能调用“{0}”。</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>不支持对象类型“{0}”到数据类型“{1}”的隐式转换。</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>缓冲区偏移量“{1}”加上“{0}”可用字节数大于在缓冲区中传递的长度。</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>数据长度“{0}”小于 0。</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>指定长度“{0}”超出了范围。</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>在 dataIndex“{0}”处的 {2} 尝试无效。通过 CommandBehavior.SequentialAccess 只能从“{1}”或更大的 dataIndex 处读取。</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>偏移量必须指向值内的某个位置。</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"ODBC 托管提供程序要求为 GetSchema 索引集合指定 TABLE_NAME 限制并且不能是 Null。</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>方法“{0}”的参数值无效。</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>ODBC 访问接口未从 SQLGETTYPEINFO 返回结果。</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>意外的 null DataTable 参数</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>意外的 null DataSet 参数。</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>连接字符串超出最大允许长度 {0}。</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} - 无法映射类型。</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>未知 SQL 类型 - {0}。</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>未知 URT 类型 - {0}。</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>无效的负参数！</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>无法对打开的连接设置属性。</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>没有 SQL_TRANSACTION“{0}”到 System.Data.IsolationLevel 枚举值的有效映射。</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} - 无法启用连接池...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} - 无法分配环境句柄。</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} – 无法获取说明符句柄。</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>不在事务中</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>OdbcType 枚举 value={0} 无效。</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>如果预期为 DBNull.Value 数据，请使用 IsDBNull。</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} - 没有可用的错误信息</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>连接已关闭。</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>内部连接没有所有者。</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>.NET Framework Odbc 数据提供程序需要 Microsoft 数据访问组件(MDAC)版本 2.6 或更高版本。当前已安装版本为 {0}。</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>.NET Framework OleDb 数据提供程序需要 Microsoft 数据访问组件(MDAC)版本 2.6 或更高版本。当前已安装版本为 {0}。</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>“{1}”提供程序不支持“{0}”接口。GetOleDbSchemaTable 不可用于当前提供程序。</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>“{0}”失败，没有可用的错误消息，结果代码: {1}。</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>没有可用的错误消息，结果代码: {0}。</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>.NET Framework 数据提供程序需要 Microsoft 数据访问组件(MDAC)。请安装 Microsoft 数据访问组件(MDAC)版本 2.6 或更高版本。</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>用于 OLEDB 的 .NET Framework 数据提供程序(Microsoft.Data.OleDb)不支持用于 ODBC 驱动程序的 Microsoft OLE DB 提供程序(MSDASQL)。请使用用于 ODBC 的 .Net Framework 数据提供程序(System.Data.Odbc)。</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>用于 OLEDB 的 .NET Framework 数据提供程序禁止 OLE DB 提供程序在非交互式环境中提示用户。</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>未在本地计算机上注册“{0}”提供程序。</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>“{0}”提供程序不支持 ICommandText 接口。请改用 CommandType.TableDirect。</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>“{0}”提供程序不支持 ITransactionLocal 接口。本地事务不可用于当前提供程序。</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>初始化字符串的格式不符合 OLE DB 规范。在连接字符串中开始于 char[{0}] 周围。</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>.NET Framework OLE DB 数据提供程序(Microsoft.Data.OleDb)不支持“异步处理”功能。</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>在 ConnectionString 中未指定 OLE DB 提供程序。示例为:“Provider=SQLOLEDB;”。</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>ConnectionString 中指定的 OLE DB 提供程序太长。</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>DbInfoKeywords OleDbSchemaGuid 不应有任何限制。</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>DbInfoLiterals OleDbSchemaGuid 不需要限制。</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>架构 guid OleDbSchemaGuid 不应有任何限制。</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>{0} OleDbSchemaGuid 是一个不受“{1}”提供程序支持的架构。</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>“{0}”配置设置包含不正确数目的值。</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>无法加载在配置设置“{0}”中指定的 XML 文件。</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>命令参数[{0}] '{1}' 无效。</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>由于符号不匹配或数据溢出以外的其他原因，无法转换命令参数[{0}]“{1}”数据值。</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>因为数据值是有符号的，而提供程序使用的类型是无符号的，所以命令参数[{0}] '{1}' 的转换失败。</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>因为数据值溢出了提供程序所使用的类型，所以命令参数[{0}] '{1}' 的转换失败。</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>提供程序在发送命令参数[{0}] '{1}' 值时遇到错误，已停止处理。</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>参数[{0}] '{1}' 没有默认值。</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>参数[{0}] 出现错误: {1}。</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Microsoft.Data.OleDb.OleDbDataAdapter 内部错误:参数访问器 {0} {1} 无效。</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter[{0}]: 未初始化 OleDbType 属性: OleDbType.{1}。</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>“{0}”提供程序不支持 ICommandWithParameters 接口。当前提供程序不支持命令参数。</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>“{0}”提供程序不支持检索过程参数信息。</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>无法确定服务器的十进制分隔符。不能创建非整数文本。</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>对象不是 ADODB.RecordSet 或 ADODB.Record。</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>无法从 ADODB.RecordSet 对象中检索“{0}”接口。</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: Size 属性具有无效大小值 0。</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>无法从 ADODB.Record 对象中检索 IRow 接口。</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>{0}.Prepare 方法要求所有参数具有显式设置的类型。</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>类型不支持 OLE DB 接口 ISourcesRowset</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>{0}.Prepare 方法要求所有可变长度参数具有显式设置的非零“Size”。</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>因为提供程序不支持 IDBInfo，所以不能构造 ReservedWords 架构集合。</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>{0}.Prepare 方法要求“{1}”类型的参数具有显式设置的“Precision”和“Scale”。</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>未设置属性的值，因为访问接口不支持“{0}”属性，或使用者尝试获取或设置的值所属的属性不在 Initialization 属性组中，并且未初始化数据源对象。</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>为 asyncResult 调用了不匹配的 end 方法。应调用 {0}，但实际调用的是 {1}。</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>由于下列原因之一，未能初始化“{0}”属性:
-	值数据类型不是属性的数据类型或者为非空。例如，属性为 DBPROP_MEMORYUSAGE，其数据类型为 Int32，而值数据类型为 Int64。
-	值不是有效值。例如，属性为 DBPROP_MEMORYUSAGE 而值为负值。
-	值为属性的有效值并且提供程序支持属性作为可设置的属性，但提供程序不支持指定的值。这包括在写入提供程序之后将值添加至 OLE DB 的属性中的情况。</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>无效操作。连接被关闭。</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>Options 值无效。</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>无法登记在事务中，因为连接上正在执行某个本地事务。请完成本地事务，然后重试。</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>ColumnID 元素无效。</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>连接当前已登记事务。请完成当前事务，然后重试。</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>“{0}”属性被指定为应用到所有列，但实际上无法应用到一个或多个列。</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>数据库不能为空、空字符串或仅由空白组成的字符串。</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>“{0}”属性是只读的，或者使用者试图在初始化数据源对象之后，在初始化属性组中设置属性值。使用者可以将只读属性的值设置为其当前值。如果不能将特定的列设置为可设置的列属性，则也会返回此状态。</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>无效的源缓冲区(大小为 {0})偏移量: {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>可选的“{0}”属性值未设置为指定值，而且不可能将属性设置为指定值。</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>无效的目标缓冲区(大小为 {0})偏移量: {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>未设置“{0}”属性值，因为这样做将与现有属性冲突。</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>流关闭时 {0} 的尝试无效。</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(已保留)。</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>指定的 SeekOrigin 值无效。</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>提供程序返回未知的 DBPROPSTATUS_ 值“{0}”。</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>读取列序号“{0}”的尝试无效。通过 CommandBehavior.SequentialAccess 只能读取“{1}”或更大的列序号。</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>访问器验证被推迟，并在该方法返回数据时已执行。绑定对于此列或参数无效。</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>{0} 的参数数据类型无效。</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>OleDbDataAdapter 内部错误: 无效的行集访问器: Ordinal={0} Status={1}。</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>不存在从对象类型 {0} 到已知的托管提供程序本机类型的映射。</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>由于符号不匹配或数据溢出以外的其他原因，未能转换数据值。例如，数据在数据存储区中已损坏，但该行仍可以检索。</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>无法处理由类型 {1} 返回的未知 TypeCode {0}。</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>提供程序无法分配返回 {0} 数据的内存。</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>没有从 DbType {0} 到已知 {1} 的映射。</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>转换失败，因为 {0} 数据值溢出了为使用者缓冲区中 {0} 值部分指定的类型。</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>使用的 SQL Server 版本不支持数据类型“{0}”。</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter 内部错误: [get] 未知的 OLE DB 数据类型: 0x{0} ({1})。</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>参数值“{0}”超出范围。</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>转换失败，因为 {0} 数据值带有正负号，而为使用者缓冲区中 {0} 值部分指定的类型不带符号。</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>指定的参数名“{0}”无效。</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter 内部错误: [set] 未知的 OLE DB 数据类型: 0x{0} ({1})。</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>无效的 Size 参数值“{0}”。该值必须大于或等于 0。</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>提供程序无法确定 {0} 值。例如，该行刚刚创建，未提供 {0} 列的默认值，并且使用者尚未设置新 {0} 值。</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>参数“{0}”的值无效。该值必须大于或等于 0。</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>OLE DB 提供程序返回意外状态值 {0}。</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>此元数据的值无效。</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>如果创建 OleDbDataReader.Read 的线程的 ApartmentState 不是 ApartmentState.MTA，则必须从该线程中使用 OleDbDataReader.Read。</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>将参数值从 {0} 转换到 {1} 失败。</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>未指定的错误: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} 不支持并行事务。</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>IErrorInfo.GetDescription 因 {0} 而失败。</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>此 {0} 已完成；它再也无法使用。</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>IErrorInfo.GetSource 因 {0} 而失败。</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>指定长度“{0}”超出了范围。</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>.NET Framework OLE DB 数据提供程序(Microsoft.Data.OleDb)不支持 DBTYPE_VECTOR 数据。</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>在 dataIndex“{0}”处的 {2} 尝试无效。通过 CommandBehavior.SequentialAccess 只能从“{1}”或更大的 dataIndex 处读取。</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>最小或最大池大小值无效，最小池大小不能大于最大池大小。</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>“{0}”关键字已过时。请使用“{1}”来代替。</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>无法从服务器获取服务器的分布式事务协调程序的地址。服务器上是否已启用 DTC?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>连接参数 &lt;{0}&gt; 的值的长度超出了最多 65535 个字符的限制。</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>“Packet Size”值无效。此值必须是大于等于 512 且小于等于 32768 的整数。</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>事务中要进行保存的点的事务或名称无效。</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>SQL Server 7.0 或 SQL Server 2000 不支持 {0} 枚举值 {1}。</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>User Instance 和 Failover 是不兼容的选项。请在连接字符串中只选择其中一个。</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>如果在连接字符串中指定了“Authentication=Active Directory Integrated”，则无法设置 Credential 属性。</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>使用证书身份验证指定的身份验证参数不正确。</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>您试图连接的 SQL Server 实例要求加密，但是此计算机不支持。</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>您试图连接的 SQL Server 实例不支持加密。</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>你试图连接的 SQL Server 实例不支持 CTAIP。</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>SQL Server 版本不受支持。.NET Framework SqlClient 数据提供程序只能用于 SQL Server 版本 7.0 及更高版本。</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>在进行异步操作时无法更改 {0}。</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>此命令要求异步连接。请在连接字符串中设置“Asynchronous Processing=true”。</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>连接尝试超时。</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>超时时间已到。因此，连接被中断。</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>实例失败。</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>错误代码 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword 要求 SQL Server 9.0 或更高版本。</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>非本地用户实例不支持 SSE 实例重定向。</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>不支持身份验证“{0}”。</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>不支持 SQL 身份验证方法“{0}”。</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>未能实例化“{0}”的类型为“{1}”的身份验证提供程序。</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>未能实例化类型为“{0}”的 SqlAuthenticationInitializer。</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>初始化时提供程序“{0}”引发了一个异常。</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>提供程序“{0}”不支持身份验证“{1}”。</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>找不到 ‘{0}’ 的身份验证提供程序。安装 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet 包(https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure)以使用 Active Directory (Entra ID)身份验证方法。</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>未能读取身份验证提供程序的配置节。</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>参数“{0}”不能为 null 或为空。</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>异步操作已完成。</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>命令执行无法继续，因为正在处理一个挂起的异步操作。</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>发送到 ExecuteXmlReader 的命令无效。该命令必须返回 Xml 结果。</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>通知要求 SQL Server 9.0 或更高版本。</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>用于 UdtTypeName 的 3 部分名称格式无效。</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>无法初始化 SSPI 软件包。</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>Timeout 时间已到。在操作完成之前超时时间已过或服务器未响应。</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>连接超时时间已到。在预登录开始阶段超过了此超时时间。这可能是因为为连接超时提供的时间不够。</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>在连接字符串中请求了用户实例，但是指定的服务器不支持此选项。</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>服务器证书无法通过应用程序验证。</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>指定的数据长度 {0} 超出了允许的最大长度 {1}。</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>没有数据时尝试进行无效的读操作。</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>数据长度“{0}”小于 0。</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>SqlDataRecord 为只读时，不能调用“{0}”。</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>映射集合正在使用中，此时无法访问；</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>不支持使用 Microsoft.Data.SqlClient 连接到上下文连接。</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>不支持嵌套的 TransactionScopes。</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>意外的服务器事件: {0}。</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>“{0}”的长度必须与“{1}”的长度匹配。</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>SqlDbType“{0}”对于 {1} 无效。只支持 {2}。</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>值太多。</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>Stream 不支持写入。</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>Null</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>消息</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>算术溢出。</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>出现被零除错误。</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>数据为空。不能对 Null 值调用此方法或属性。</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>数值算法导致截断。</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>SqlDateTime 溢出。必须介于 1/1/1753 12:00:00 AM 和 12/31/9999 11:59:59 PM 之间。</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>要连接的两个字符串具有不同的排序规则。</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>要比较的两个字符串具有不同的排序规则。</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>无效的标志值。</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>从 SqlDecimal 到 Decimal 的转换溢出。</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>转换溢出。</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>无效的 SqlDateTime。</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>已指定了时区。SqlDateTime 不支持时区。</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>无效的数组大小。</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>数值精度/小数位数无效。</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>输入采用的格式不正确。</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>SqlType 错误。</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>此版本中的 SqlBytes 和 SqlChars 不支持超过 2GB 的长度。</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>读取时出错。</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Stream 已关闭或已处理。</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>没有缓冲区。读或写操作失败。</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>无法设置非零长度，因为当前值为 Null。</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>缓冲区不足。读或写操作失败。</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>无法写入非零偏移量，因为当前值为 Null。</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>无法从超出当前长度的偏移位置执行写操作。这将在缓冲区中留下未初始化的数据。</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>返回的数据大小超出了 2Gb。请使用 SequentialAccess command behavior，以获取所有数据。</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>GetDayOfWeek 的参数必须是介于 1 与 7 之间的整数。</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>SQL Type 尚未与数据一起加载。</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>SQL Type 已与数据一起加载。</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>访问已关闭的 XmlReader 的尝试无效。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>流关闭时，调用 {0} 的尝试无效。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>流不可写时，调用 {0} 的尝试无效。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>流不可读时，调用 {0} 的尝试无效。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>流不可查找时，调用 {0} 的尝试无效。</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>子类未覆盖所需方法。</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>无法为“{0}”创建标准化程序。</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>内部错误</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>命令参数必须有一个非 Null 和非空的命令文本。</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>MetaData 参数数组的长度必须等于 ParameterDirection 数组参数。</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>数据适配器映射错误。</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>数据适配器错误。</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>DB 并发性违规。</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>操作已中止。</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>由于异常，操作已中止(有关详细信息，请参阅 InnerException)。</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Fill 是否调用 DataRow.AcceptChanges。</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Update 将是否调用 DataRow.AcceptChanges。</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>当 Update 事件(RowUpdating 和 RowUpdated)的 Status 是 UpdateStatus.ErrorsOccurred 时，是否继续到下一个 DataRow。</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>适配器从 DataReader 填充 DataTable 的方式。</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>当 TableMappings 中缺少表或列时将采取的措施。</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>当 DataSet 中缺少表或列时将采取的措施。</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>如何将源表映射到 DataSet 表。</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>Fill 期间发生可恢复错误时将触发的事件。</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Fill 应返回提供程序特定值还是普通 CLSCompliant 值。</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>源列名称 - 区分大小写。</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>集合中项的数目</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>指定的 DataColumnMapping 对象。</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>匹配此表映射时的各个列映射。</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>DataTableMapping 源表名称。该名称区分大小写。</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>集合中项的数目</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>指定的 DataTableMapping 对象</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>Update 期间用于 DataSet 中的已删除行。</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>Update 期间在每个 DataRow 之后触发的事件。</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>在数据源上执行之前要一起组成批的行数。</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>Select/Insert/Update/DeleteCommands 尚未拥有连接时将使用的连接。</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>Update 期间用于 DataTable 中已删除的行。</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>Update 期间用于 DataTable 中的新行。</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>Fill 期间使用。</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>Update 期间用于 DataTable 中已修改的行。</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Fill 应返回提供程序特定值还是普通 CLSCompliant 值。</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>如何将源表映射到 DataTable。</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>用户未设置时生成 Insert/Update/DeleteCommands 的方式。</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>在数据源上执行之前要一起组成批的行数。</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>用于连接 Data Source 的连接字符串。</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>连接到 Data Source 时要使用的 ODBC 驱动程序的名称。</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>连接到 Data Source 时要使用的 DSN。</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>如果为 True，则指示应使用托管连接池。</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>连接到 Data Source 时使用的 UDL 文件。</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>指定使用 OleDb Provider 时启用或禁用的 OLE DB Services。</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>连接到 Data Source 时要使用的 OLE DB 提供程序名。</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>应用程序的名称。</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>如果为 True，则启用 .NET Framework 数据提供程序中的异步功能。</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>主文件名称，包括可附加数据库的完整路径名。</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>如果为 True，则指示从池中删除后，连接状态为重置。</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>如果为 true，指示连接应来自 Sql Server 上下文。只有在 Sql Server 进程中运行时才可用。</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>SQL Server 语言记录名。</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>指定对 SQL Server 进行身份验证的方法。</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>指定的客户端证书，用于通过 SQL Server 进行身份验证。</value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>用于连接到数据源的信息。</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>当前连接超时值，不可在 ConnectionString 中设置。</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>当前数据源目录值，连接字符串中的“Database=X”。</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>当前数据源，连接字符串中的“Server=X”。</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>当前 ODBC 驱动程序。</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>ODBC 驱动程序访问的产品的版本。</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>用于连接到数据源的信息。</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>当前连接超时值，ConnectionString 中的“Connect Timeout=X”。</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>当前数据源目录值，连接字符串中的“Initial Catalog=X”。</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>当前数据源，连接字符串中的“Data Source=X”。</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>连接字符串中，当前 OLE DB 提供程序的 ProgID “Provider=X”。</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>OLE DB 提供程序访问的产品的版本。</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>要用于身份验证的访问令牌。</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>连接状态、同步或异步。连接字符串中“Asynchronous Processing=x”。</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>用于连接进行复制的信息。</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>连接到 DataSource 时所用的信息，例如“Data Source=x;Initial Catalog=x;Integrated Security=SSPI”。</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>收集此连接的统计信息。</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>自定义列加密密钥存储提供程序。</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>一个用于表示物理连接的 GUID。</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>自动登记在 Microsoft SQL Server 使用的通知中。</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>在用户未指定时，如何为 Update 和 Delete 命令自动生成 where 子句。</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>指示文本命令中目录名在合法表名中的位置。</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>文本命令中分隔目录名与其余标识符的字符串。</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>文本命令中分隔架构名与其余标识符的字符串。</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>环绕 sql 对象的前缀字符串。</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>环绕 sql 对象的后缀字符串。</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>自动为其生成命令的 DataAdapter。</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>使用来自 DataTable 或 SelectCommand 的架构。</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>用户未指定的情况下，如何自动生成 Update 命令的 Set 子语。</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>自动为其生成 OdbcCommands 的 DataAdapter</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>在文本命令中用作左引号的字符，用于将包含特殊字符的标识符括起来。</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>在文本命令中用作右引号的字符，用于将包含特殊字符的标识符括起来。</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>要为其自动生成 OleDbCommands 的 DataAdapter</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>用于十进制文本的十进制分隔符。</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>环绕 sql 对象的前缀字符串</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>环绕 sql 对象的后缀字符串</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>自动为其生成 SqlCommands 的 DataAdapter</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>用于十进制文本的十进制分隔符。</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>在文本命令中用作左引号的字符，用于将包含特殊字符的标识符括起来。</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>在文本命令中用作右引号的字符，用于将包含特殊字符的标识符括起来。</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>只有在与 Prepare、FillSchema 和 CommandBuilder 方案一起使用时，才需要设置小数和数值参数。</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>只有在与 Prepare、FillSchema 和 CommandBuilder 方案一起使用时，才需要设置小数和数值参数。</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>参数本机类型。</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>参数本机类型。</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>参数的名称，如“@p1”</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>参数本机类型。</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>类型的服务器名称。</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>可变长度数据类型中的偏移量。</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>不支持为参数“{1}”指定的 ParameterDirection“{0}”。Table-valued parameters 只支持 ParameterDirection.Input。</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>为参数“{0}”指定了 TypeName。只能为 Structured 参数设置 TypeName。</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>仅对多值类型支持 SqlDbType.Structured 类型。</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>架构表中的字段“{0}”的 DateType 列为 null。DataType 必须为非 null。</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>记录“{0}”中的字段数与原始记录中字段数不符。</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>范围: 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>SqlClient 数据提供程序遇到意外错误。{0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>无法获取 {0}、{1} 的 Type Info</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>提供程序加载以下程序集失败: {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>必须为 UDT 参数设置 UdtTypeName 属性。</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>指定类型未在目标服务器上注册。{0}。</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>除主键的一部分外，Where 子句中不允许 UDT 参数。</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>“{0}”是无效的用户定义类型，原因: {1}。</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>同时支持内存中格式和用户定义的格式</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>不支持本地格式。</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>未实现 IBinarySerialize</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>不可序列化</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>没有公共构造函数</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>没有实现 INullable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>没有公共构造函数</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>没有 UDT 特性</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>尚不支持没有映射的序列化。</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>缺少“public static x Parse(System.Data.SqlTypes.SqlString)”方法</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>缺少“public override string ToString()”方法</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>缺少“public static x Null { get; }”方法</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>Native 格式不支持“{0}”类型的字段(直接或通过另一字段)</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>不是公共类型</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>因为类型为“{0}”，所以 Native UDT 不是序列布局</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Native UDT 指定最大 byte 大小</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>字段“{0}”被标记为非序列化</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>字段 ‘{0}’ 的类型标记为显式布局，这在本机格式中是不允许的</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>有多个值的程序集引用必须有一个非零程序集 ID。</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>可以对参数使用结构化的、多值的类型，且不能将这些类型嵌套在其他类型中。</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>路径名无效。</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>试图提升事务时失败。</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>用于接收查询通知的相关性对象。</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>用于指示此相关性是否无效的属性。</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>向现有的相关性对象中添加命令。</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Command 已与另一个相关性对象建立关联。不能覆盖。</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>此 SqlCommand 对象已与另一 SqlDependency 对象关联。</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>指定的 Timeout 无效。Timeout 值不能小于 0。</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>通知错误。Type={0}，Info={1}，Source={2}。</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData 对 SqlDbType 无效。</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>dbType {0} 对于此构造函数无效。</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>内部错误。纯文本值不能为 null。</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>无法加密。加密生成了 {0} 字节的已加密文本，该大小超出允许的最大限制({1} 字节)。指定纯文本值可能太大(纯文本大小是: {2} 字节)。</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>内部错误。已加密文本值不能为 null。</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>SQL Server 未返回证明信息。Enclave 类型为“{0}”，enclave 证明 URL 为“{1}”。</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>无法建立安全通道。错误消息: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>出现内部错误。构造类型“{1}”的对象时指定了 null 参数“{0}”。“{0}”不能为 null。</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>指定 enclave 证明服务的终结点，以用于验证在 SQL Server 实例中配置的用于在使用“始终加密”加密的数据库列上执行计算的 enclave 是否安全有效。</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>未能读取 enclave 提供程序的配置节。请确保该节在应用程序配置文件中的格式正确。错误消息: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>未能实例化类型为“{1}”，名称“{0}”为的 enclave 提供程序。错误消息: {2} </value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>出现内部错误。SqlColumnEncryptionEnclaveProviderName 不能为 null 或为空。</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>读取“{0}”结果集时出错。尚未在连接字符串中指定证明 URL，但查询需要 enclave 计算。enclave 类型为“{1}”。</value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>出现内部错误。执行需要 enclave 计算的查询时，接收自 SQL Server 的 enclave 类型为 null 或为空。</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>需要 enclave 计算才可执行查询，但应用程序配置缺少 enclave 提供程序节。</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>未找到 enclave 类型“{0}”和证明协议“{1}”的 enclave 提供程序。请在连接字符串中指定正确的证明协议。</value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>用于连接上的所有命令的默认列加密设置。</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>在向服务器发送敏感数据前强制对参数进行加密。 </value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>包含 SQL Server 名称的字典对象及其信任的列的主密钥路径。</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>不支持使用 ApplicationIntent ReadOnly 连接选项连接到镜像的 SQL Server 实例。</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>收到了意外的路由信息。</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>收到了无效的路由信息。</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>在此上下文中指定的身份验证不受支持: {0}</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Active Directory 交互式身份验证超时。用户响应身份验证请求的时间过长。</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>如果设置了 Credential 属性，则无法使用 "Authentication=Active Directory Interactive"。</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>活动连接的服务器进程 ID (SPID)。</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Active Directory 设备代码流身份验证超时。用户响应身份验证请求的时间过长。</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>如果在连接字符串中指定了 "Authentication=Active Directory Device Code Flow"，则无法设置 Credential 属性。</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>所请求的操作仅支持一维数组。</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>未在指定的集合中找到指定的项，因此无法移除该项。</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>需要提供非负数。</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>如果在连接字符串中指定了 "Authentication=Active Directory Default"，则无法设置 AccessTokenCallback 属性。</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} 返回了 {1}。</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>协议错误: 接收的消息中包含有效的签名，但是没有按照有效的保护级别的要求对消息进行加密。</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>{0} 失败，出现错误 {1}。</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>此类未实现此方法。</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>不支持请求的安全包。</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>physicalConnection 类型不正确。</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>尝试设置 AppContext 交换机“{0}”={1} 时发生异常。</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>此平台不支持类型 {0}。</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>不支持全球化固定模式。</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>无法使用 Kerberos 进行身份验证。确保已在客户端上使用“kinit”初始化 Kerberos，并且已为 SQL Server 注册了服务主体名称以允许 Kerberos 身份验证。</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>此平台不支持关键字“网络库”，而是将“数据源”作为所需协议的前缀(对于 TCP 连接为“tcp:”或对于命名管道连接为“np:”)。</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>套接字未引发预期的“{0}”，错误代码为“{1}”。</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>服务器正在尝试使用此平台不支持的功能。</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>此平台不支持关键字“{0}”。</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>当前加载的 System.Transactions.dll 不支持全局事务。</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>从服务器读取数据时收到不受支持的令牌“{0}”。</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>“{0}”是不受支持的句柄类型。</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>此平台不支持 SqlFileStream。</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>此平台不支持 LocalDB。</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>缓冲区空间不足。必需: {0} 实际: {1}。</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>GSSAPI 操作失败，状态为: {0} (次要状态: {1})。</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>GSSAPI 操作失败，出现错误 - {0} ({1})。</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>不支持在除 Windows 以外的操作系统上进行通道绑定。</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>如果传递了默认凭据，则目标名称应为非空。</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>当前安装的 GSSAPI 实现不支持请求的保护级别。</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>不支持服务器实现。</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>无法在此平台上使用默认凭据进行 NTLM 身份验证。</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>在 DataAdapter.Update 使用时，参数值由 DBNull.Value 更改为 (Int32)1 或 (Int32)0 (如果非空)。</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>超出缓冲区最大大小： {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>缺少 SourceColumn“{2}”的 DataColumn“{0}”。</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>SqlBatchCommand 列表尚未初始化。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index 47d06afa4b..2081722fb7 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ADP_Ascending" xml:space="preserve">
-    <value>遞增</value>
-  </data>
   <data name="ADP_CollectionIndexInt32" xml:space="preserve">
     <value>此具有 Count={2} 的 {1} 有無效的索引 {0}。</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="ADP_CollectionIsNotParent" xml:space="preserve">
     <value>另一個 {1} 已經包含 {0}。</value>
   </data>
-  <data name="ADP_CollectionIsParent" xml:space="preserve">
-    <value>此 {1} 已經包含 {0}。</value>
-  </data>
   <data name="ADP_CollectionNullValue" xml:space="preserve">
     <value>{0} 只接受非 Null 的 {1} 型別物件。</value>
   </data>
   <data name="ADP_CollectionRemoveInvalidObject" xml:space="preserve">
     <value>此 {1} 嘗試移除不包含的 {0}。</value>
   </data>
-  <data name="ADP_CollectionUniqueValue" xml:space="preserve">
-    <value>{0}.{1} 必須是唯一的，'{2}' 以存在於集合中。</value>
-  </data>
   <data name="ADP_ConnectionAlreadyOpen" xml:space="preserve">
     <value>連接未關閉。{0}</value>
   </data>
@@ -171,12 +162,6 @@
   <data name="ADP_DataReaderClosed" xml:space="preserve">
     <value>當讀取器關閉時嘗試呼叫 {0} 無效。</value>
   </data>
-  <data name="ADP_DelegatedTransactionPresent" xml:space="preserve">
-    <value>無法編列至交易，因為連接已優先用於委派或提示交易。</value>
-  </data>
-  <data name="ADP_Descending" xml:space="preserve">
-    <value>遞減</value>
-  </data>
   <data name="ADP_EmptyString" xml:space="preserve">
     <value>'{0}' 參數必須是非空字串。</value>
   </data>
@@ -204,9 +189,6 @@
   <data name="ADP_NoConnectionString" xml:space="preserve">
     <value>尚未初始化 ConnectionString 屬性。</value>
   </data>
-  <data name="ADP_NonCLSException" xml:space="preserve">
-    <value>已找到 Non CLS Exception。</value>
-  </data>
   <data name="ADP_NotAPermissionElement" xml:space="preserve">
     <value>指定的安全性元素不是權限元素。</value>
   </data>
@@ -252,9 +234,6 @@
   <data name="DataCategory_Data" xml:space="preserve">
     <value>資料</value>
   </data>
-  <data name="DataCategory_StateChange" xml:space="preserve">
-    <value>StateChange</value>
-  </data>
   <data name="DataCategory_Update" xml:space="preserve">
     <value>更新</value>
   </data>
@@ -264,48 +243,12 @@
   <data name="DbConnection_State" xml:space="preserve">
     <value>ConnectionState 表示連接為開啟或關閉。</value>
   </data>
-  <data name="DbConnection_StateChange" xml:space="preserve">
-    <value>當連接狀態變更時觸發的事件。</value>
-  </data>
-  <data name="DbParameter_DbType" xml:space="preserve">
-    <value>參數的泛用型別。</value>
-  </data>
-  <data name="DbParameter_Direction" xml:space="preserve">
-    <value>輸入、輸出或雙向參數。</value>
-  </data>
-  <data name="DbParameter_IsNullable" xml:space="preserve">
-    <value>對強型別的程式碼產生使用了設計階段的屬性。</value>
-  </data>
-  <data name="DbParameter_Offset" xml:space="preserve">
-    <value>可變長度資料型別中的位移。</value>
-  </data>
-  <data name="DbParameter_ParameterName" xml:space="preserve">
-    <value>參數的名稱。</value>
-  </data>
-  <data name="DbParameter_Size" xml:space="preserve">
-    <value>可變長度資料類型 (字串與陣列) 的大小。(&amp; )</value>
-  </data>
-  <data name="DbParameter_SourceColumn" xml:space="preserve">
-    <value>由 DataAdapter.Update 使用時，用以在 ColumnMappings 中尋找 DataSetColumn 名稱的來源資料行名稱。此值由參數與資料列之間複製而來。</value>
-  </data>
-  <data name="DbParameter_SourceVersion" xml:space="preserve">
-    <value>由 DataAdapter.Update (只有 UpdateCommand) 使用時，用以更新資料來源的 DataRow 值版本。</value>
-  </data>
-  <data name="DbParameter_SourceColumnNullMapping" xml:space="preserve">
-    <value>由 DataAdapter.Update 使用時，參數值會由 DBNull.Value 變更為 (Int32)1 或 (Int32)0 (若為非 Null)。</value>
-  </data>
-  <data name="DbParameter_Value" xml:space="preserve">
-    <value>參數值。</value>
-  </data>
   <data name="MDF_QueryFailed" xml:space="preserve">
     <value>無法建置 '{0}' 集合，因為 SQL 查詢執行失敗。請參閱內部例外狀況以取得詳細資訊。</value>
   </data>
   <data name="MDF_TooManyRestrictions" xml:space="preserve">
     <value>提供的限制超過必要的結構描述 ('{0}') 所能支援的。</value>
   </data>
-  <data name="MDF_InvalidRestrictionValue" xml:space="preserve">
-    <value>'{2}' 不是 '{0}' 結構描述集合中 '{1}' 限制的有效值。</value>
-  </data>
   <data name="MDF_UndefinedCollection" xml:space="preserve">
     <value>未定義必要的集合 ({0})。</value>
   </data>
@@ -315,15 +258,6 @@
   <data name="MDF_UnsupportedVersion" xml:space="preserve">
     <value>提供者的版本不支援要求的集合 ({0})。</value>
   </data>
-  <data name="MDF_MissingDataSourceInformationColumn" xml:space="preserve">
-    <value>其中一個 DataSourceInformation tables 資料行遺失。</value>
-  </data>
-  <data name="MDF_IncorrectNumberOfDataSourceInformationRows" xml:space="preserve">
-    <value>DataSourceInformation 資料表必須至少包含一個資料列。</value>
-  </data>
-  <data name="MDF_MissingRestrictionColumn" xml:space="preserve">
-    <value>一個或多個限制集合的資料庫遺失。</value>
-  </data>
   <data name="MDF_MissingRestrictionRow" xml:space="preserve">
     <value>有一項限制為限制集合中沒有相符的資料列。</value>
   </data>
@@ -342,42 +276,21 @@
   <data name="MDF_DataTableDoesNotExist" xml:space="preserve">
     <value>集合 '{0}' 已從中繼資料 XML 中遺失。</value>
   </data>
-  <data name="MDF_InvalidXml" xml:space="preserve">
-    <value>中繼資料 XML 無效。</value>
-  </data>
-  <data name="MDF_InvalidXmlMissingColumn" xml:space="preserve">
-    <value>中繼資料 XML 無效。{0} 集合必須包含 {1} 資料行，且必須包含字串資料行。</value>
-  </data>
   <data name="MDF_InvalidXmlInvalidValue" xml:space="preserve">
     <value>中繼資料 XML 無效。{0} 集合的 {1} 資料行必須包含非空的字串。</value>
   </data>
-  <data name="DataCategory_Action" xml:space="preserve">
-    <value>動作</value>
-  </data>
-  <data name="DataCategory_Behavior" xml:space="preserve">
-    <value>行為</value>
-  </data>
   <data name="DataCategory_Fill" xml:space="preserve">
     <value>填滿</value>
   </data>
   <data name="DataCategory_InfoMessage" xml:space="preserve">
     <value>InfoMessage</value>
   </data>
-  <data name="DataCategory_Mapping" xml:space="preserve">
-    <value>對應</value>
-  </data>
   <data name="DataCategory_StatementCompleted" xml:space="preserve">
     <value>StatementCompleted</value>
   </data>
-  <data name="DataCategory_Udt" xml:space="preserve">
-    <value>UDT</value>
-  </data>
   <data name="DataCategory_Notification" xml:space="preserve">
     <value>通知</value>
   </data>
-  <data name="DataCategory_Schema" xml:space="preserve">
-    <value>結構描述</value>
-  </data>
   <data name="DataCategory_Xml" xml:space="preserve">
     <value>XML</value>
   </data>
@@ -393,9 +306,6 @@
   <data name="DataCategory_Pooling" xml:space="preserve">
     <value>共用</value>
   </data>
-  <data name="DataCategory_NamedConnectionString" xml:space="preserve">
-    <value>具名 ConnectionString</value>
-  </data>
   <data name="DataCategory_Security" xml:space="preserve">
     <value>安全性</value>
   </data>
@@ -408,2073 +318,204 @@
   <data name="DataCategory_ConnectionResiliency" xml:space="preserve">
     <value>連線復原</value>
   </data>
-  <data name="ExtendedPropertiesDescr" xml:space="preserve">
-    <value>保存自訂使用者資訊的集合。</value>
-  </data>
-  <data name="DataSetCaseSensitiveDescr" xml:space="preserve">
-    <value>指定在資料集 (DataSet) 中比較字串時是否要區分大小寫。</value>
-  </data>
-  <data name="DataSetDataSetNameDescr" xml:space="preserve">
-    <value>這個 DataSet 的名稱。</value>
-  </data>
-  <data name="DataSetDefaultViewDescr" xml:space="preserve">
-    <value>表示 DataSet 中包含資料的自訂檢視表。這個檢視表允許透過自訂資料檢視表執行篩選、搜尋和瀏覽。</value>
-  </data>
-  <data name="DataSetEnforceConstraintsDescr" xml:space="preserve">
-    <value>指定是否要遵循條件約束規則。</value>
-  </data>
-  <data name="DataSetHasErrorsDescr" xml:space="preserve">
-    <value>表示 DataSet 有錯誤。</value>
-  </data>
-  <data name="DataSetLocaleDescr" xml:space="preserve">
-    <value>表示在 DataSet 中比較字串時是否要使用地區設定。</value>
-  </data>
-  <data name="DataSetNamespaceDescr" xml:space="preserve">
-    <value>表示這個 DataSet 所指向根元素的 XML URI 命名空間。</value>
-  </data>
-  <data name="DataSetPrefixDescr" xml:space="preserve">
-    <value>表示這個 DataSet 所使用命名空間的前置詞。</value>
-  </data>
-  <data name="DataSetRelationsDescr" xml:space="preserve">
-    <value>保存這個 DataSet 關聯的集合。</value>
-  </data>
-  <data name="DataSetTablesDescr" xml:space="preserve">
-    <value>保存這個 DataSet 資料表的集合。</value>
-  </data>
-  <data name="DataSetMergeFailedDescr" xml:space="preserve">
-    <value>發生於不可能合併擁有相同名稱的兩個資料表的結構描述時。</value>
-  </data>
-  <data name="DataSetInitializedDescr" xml:space="preserve">
-    <value>在完成 Initialization 之後發生。</value>
-  </data>
-  <data name="DataSetDescr" xml:space="preserve">
-    <value>代表資料的記憶體中快取。</value>
-  </data>
-  <data name="DataTableCaseSensitiveDescr" xml:space="preserve">
-    <value>表示在資料表中比較字串時是否區分大小寫。</value>
-  </data>
-  <data name="DataTableChildRelationsDescr" xml:space="preserve">
-    <value>傳回這個資料表的子關聯。</value>
-  </data>
-  <data name="DataTableColumnsDescr" xml:space="preserve">
-    <value>保存這個資料表中資料行的集合。</value>
-  </data>
-  <data name="DataTableConstraintsDescr" xml:space="preserve">
-    <value>保存這個資料表中條件約束的集合。</value>
-  </data>
-  <data name="DataTableDataSetDescr" xml:space="preserve">
-    <value>表示這個 DataSet 所屬的資料集。</value>
-  </data>
-  <data name="DataTableDefaultViewDescr" xml:space="preserve">
-    <value>這是資料表的預設 DataView。</value>
-  </data>
-  <data name="DataTableDisplayExpressionDescr" xml:space="preserve">
-    <value>用來計算這個資料列資料繫結值的運算式。</value>
-  </data>
-  <data name="DataTableHasErrorsDescr" xml:space="preserve">
-    <value>傳回資料表是否有錯誤。</value>
-  </data>
-  <data name="DataTableLocaleDescr" xml:space="preserve">
-    <value>指定在資料表中比較字串時的使用地區設定。</value>
-  </data>
-  <data name="DataTableMinimumCapacityDescr" xml:space="preserve">
-    <value>表示這個資料表的初始開始大小。</value>
-  </data>
-  <data name="DataTableNamespaceDescr" xml:space="preserve">
-    <value>表示這個資料表中所包含元素的 XML URI 命名空間。</value>
-  </data>
-  <data name="DataTablePrefixDescr" xml:space="preserve">
-    <value>代表在 XML 表示中這個資料表所使用命名空間的前置詞。</value>
-  </data>
-  <data name="DataTableParentRelationsDescr" xml:space="preserve">
-    <value>傳回這個資料表的父關聯。</value>
-  </data>
-  <data name="DataTablePrimaryKeyDescr" xml:space="preserve">
-    <value>表示提供這個資料表主索引鍵的資料行。</value>
-  </data>
-  <data name="DataTableRowsDescr" xml:space="preserve">
-    <value>表示儲存這個資料表內資料的資料列的集合。</value>
-  </data>
-  <data name="DataTableTableNameDescr" xml:space="preserve">
-    <value>表示用來在 DataSet 的 Tables 集合中查詢這個資料表的名稱。</value>
-  </data>
-  <data name="DataTableRowChangedDescr" xml:space="preserve">
-    <value>發生在資料表中的資料列被成功編輯之後。</value>
-  </data>
-  <data name="DataTableRowChangingDescr" xml:space="preserve">
-    <value>發生於資料列被變更時，如此事件處理常式可以修改或取消變更。使用者可以修改資料列中的值，並且應該傳回例外狀況以取消編輯。</value>
-  </data>
-  <data name="DataTableRowDeletedDescr" xml:space="preserve">
-    <value>發生在資料表中的資料列被成功刪除之後。</value>
-  </data>
-  <data name="DataTableRowDeletingDescr" xml:space="preserve">
-    <value>當資料表中的資料列已被標示為刪除時發生。擲出取消刪除的一個例外狀況。</value>
-  </data>
-  <data name="DataTableColumnChangingDescr" xml:space="preserve">
-    <value>當值已經送給這個資料行時發生。使用者可以修改建議值，並且應該擲回例外狀況以取消編輯。</value>
-  </data>
-  <data name="DataTableColumnChangedDescr" xml:space="preserve">
-    <value>當這個資料行的值已經變更時發生。</value>
-  </data>
-  <data name="DataTableRowsClearingDescr" xml:space="preserve">
-    <value>當從資料表中清除所有資料列前會發生。</value>
-  </data>
-  <data name="DataTableRowsClearedDescr" xml:space="preserve">
-    <value>當成功清除資料表中的所有資料列後會發生。</value>
-  </data>
-  <data name="DataTableRowsNewRowDescr" xml:space="preserve">
-    <value>當新的 DataRow 具現化後會發生。</value>
-  </data>
-  <data name="DataRelationRelationNameDescr" xml:space="preserve">
-    <value>用來在 DataSet 的 Relations 集合中查詢這個關聯的名稱。</value>
-  </data>
-  <data name="DataRelationChildColumnsDescr" xml:space="preserve">
-    <value>表示這個關聯的子資料行。</value>
-  </data>
-  <data name="DataRelationParentColumnsDescr" xml:space="preserve">
-    <value>表示這個關聯的父資料行。</value>
-  </data>
-  <data name="DataRelationNested" xml:space="preserve">
-    <value>表示關聯是否為巢狀。</value>
-  </data>
-  <data name="ForeignKeyConstraintDeleteRuleDescr" xml:space="preserve">
-    <value>針對刪除，表示何種串聯必須跨這個關聯發生。</value>
-  </data>
-  <data name="ForeignKeyConstraintUpdateRuleDescr" xml:space="preserve">
-    <value>針對更新，表示何種串聯必須跨這個關聯發生。</value>
-  </data>
-  <data name="ForeignKeyConstraintAcceptRejectRuleDescr" xml:space="preserve">
-    <value>針對接受或拒絕變更，表示何種串聯必須跨這個關聯發生。</value>
-  </data>
-  <data name="ForeignKeyConstraintChildColumnsDescr" xml:space="preserve">
-    <value>表示這個條件約束的子資料行。</value>
-  </data>
-  <data name="ForeignKeyConstraintParentColumnsDescr" xml:space="preserve">
-    <value>表示這個條件約束的父資料行。</value>
-  </data>
-  <data name="ForeignKeyRelatedTableDescr" xml:space="preserve">
-    <value>為此條件約束的子資料表。</value>
-  </data>
-  <data name="KeyConstraintColumnsDescr" xml:space="preserve">
-    <value>表示這個條件約束的資料行。</value>
-  </data>
-  <data name="KeyConstraintIsPrimaryKeyDescr" xml:space="preserve">
-    <value>表示此條件約束是否為主索引鍵。</value>
-  </data>
-  <data name="ConstraintNameDescr" xml:space="preserve">
-    <value>表示此條件約束的名稱。</value>
-  </data>
-  <data name="ConstraintTableDescr" xml:space="preserve">
-    <value>表示此條件約束的表格。</value>
-  </data>
-  <data name="DataColumnAllowNullDescr" xml:space="preserve">
-    <value>指示這個資料行中是否允許 null 值。</value>
-  </data>
-  <data name="DataColumnAutoIncrementDescr" xml:space="preserve">
-    <value>表示針對要加入資料表的資料列，資料行是否自動累加本身。這個資料行的型別必須為 Int16、Int32 或 Int64。</value>
-  </data>
-  <data name="DataColumnAutoIncrementSeedDescr" xml:space="preserve">
-    <value>表示 AutoIncrement 資料行的起始值。</value>
-  </data>
-  <data name="DataColumnAutoIncrementStepDescr" xml:space="preserve">
-    <value>表示 AutoIncrement 資料行所使用的累加方式。</value>
-  </data>
-  <data name="DataColumnCaptionDescr" xml:space="preserve">
-    <value>表示這個資料行的預設使用者介面標題。</value>
-  </data>
-  <data name="DataColumnColumnNameDescr" xml:space="preserve">
-    <value>表示在 DataTable 的 Columns 集合中用來查詢這個資料行的名稱。</value>
-  </data>
-  <data name="DataColumnDataTableDescr" xml:space="preserve">
-    <value>傳回至這個資料行所屬的 DataTable。</value>
-  </data>
-  <data name="DataColumnDataTypeDescr" xml:space="preserve">
-    <value>表示儲存在這個資料行中的資料類型。</value>
-  </data>
-  <data name="DataColumnDefaultValueDescr" xml:space="preserve">
-    <value>表示當加入新資料列至資料表時所使用的預設資料行值。</value>
-  </data>
-  <data name="DataColumnExpressionDescr" xml:space="preserve">
-    <value>表示這個資料行會根據其他的資料行來計算其每一個資料列的值，而不使用使用者的輸入。</value>
-  </data>
-  <data name="DataColumnMappingDescr" xml:space="preserve">
-    <value>表示這個資料行保存在 XML 中的方法: 當作屬性、元素、簡單內容節點，或無。</value>
-  </data>
-  <data name="DataColumnNamespaceDescr" xml:space="preserve">
-    <value>表示這個資料行中所儲存元素或屬性的 XML URI。</value>
-  </data>
-  <data name="DataColumnPrefixDescr" xml:space="preserve">
-    <value>表示這個 DataColumn 在 xml 表示法中所使用的 Prefix。</value>
-  </data>
-  <data name="DataColumnOrdinalDescr" xml:space="preserve">
-    <value>表示在 Columns 集合中這個資料行的索引。</value>
-  </data>
-  <data name="DataColumnReadOnlyDescr" xml:space="preserve">
-    <value>表示一旦將資料列加入資料表後，這個資料行是否允許變更。</value>
-  </data>
-  <data name="DataColumnUniqueDescr" xml:space="preserve">
-    <value>表示這個資料行是否應在資料表的資料行中限制其值必須為唯一。</value>
-  </data>
-  <data name="DataColumnMaxLengthDescr" xml:space="preserve">
-    <value>表示這個資料行允許長度的最大值。</value>
-  </data>
-  <data name="DataColumnDateTimeModeDescr" xml:space="preserve">
-    <value>表示此 DataColumn 的 DateTimeMode。</value>
-  </data>
-  <data name="DataViewAllowDeleteDescr" xml:space="preserve">
-    <value>表示這個 DataView 和它關聯的使用者介面是否允許刪除。</value>
-  </data>
-  <data name="DataViewAllowEditDescr" xml:space="preserve">
-    <value>表示這個 DataView 和它關聯的使用者介面是否允許編輯。</value>
-  </data>
-  <data name="DataViewAllowNewDescr" xml:space="preserve">
-    <value>表示這個 DataView 和它關聯的使用者介面是否允許加入新資料列。</value>
-  </data>
-  <data name="DataViewCountDescr" xml:space="preserve">
-    <value>傳回目前在這個檢視表中的項目數目。</value>
-  </data>
-  <data name="DataViewDataViewManagerDescr" xml:space="preserve">
-    <value>這會傳回一個指標到擁有這個 DataSet (如果有的話) 的 DataViewManager。</value>
-  </data>
-  <data name="DataViewIsOpenDescr" xml:space="preserve">
-    <value>表示檢視表是否為開啟。</value>
-  </data>
-  <data name="DataViewRowFilterDescr" xml:space="preserve">
-    <value>表示用來篩選這個 DataView 傳回資料的運算式。</value>
-  </data>
-  <data name="DataViewRowStateFilterDescr" xml:space="preserve">
-    <value>表示由這個 DataView 傳回的資料版本。</value>
-  </data>
-  <data name="DataViewSortDescr" xml:space="preserve">
-    <value>表示由這個 DataView 傳回資料的資料行名稱與排列順序。</value>
-  </data>
-  <data name="DataViewApplyDefaultSortDescr" xml:space="preserve">
-    <value>指定若未設定 Sort 屬性，是否使用預設的排序。</value>
-  </data>
-  <data name="DataViewTableDescr" xml:space="preserve">
-    <value>表示這個 DataView 用來取得資料的資料表。</value>
-  </data>
-  <data name="DataViewListChangedDescr" xml:space="preserve">
-    <value>表示由這個 DataView 傳回的資料已經變更。</value>
-  </data>
-  <data name="DataViewManagerDataSetDescr" xml:space="preserve">
-    <value>表示這個 DataViewManager 的資料來源。</value>
-  </data>
-  <data name="DataViewManagerTableSettingsDescr" xml:space="preserve">
-    <value>表示在對應 DataSet 中任何資料表的排序/篩選/狀態設定。</value>
-  </data>
-  <data name="Xml_SimpleTypeNotSupported" xml:space="preserve">
-    <value>DataSet 並不支援 'union' 或 'list' 當作 simpleType 來使用。</value>
-  </data>
-  <data name="Xml_MissingAttribute" xml:space="preserve">
-    <value>無效的 {0} 語法: 遺漏必要的 '{1}' 屬性。</value>
-  </data>
-  <data name="Xml_ValueOutOfRange" xml:space="preserve">
-    <value>屬性 '{0}' 的值 '{1}' 無效。</value>
-  </data>
-  <data name="Xml_AttributeValues" xml:space="preserve">
-    <value>屬性 '{0}' 的值必須是 '{1}' 或 '{2}'。</value>
-  </data>
-  <data name="Xml_ElementTypeNotFound" xml:space="preserve">
-    <value>找不到 ElementType name='{0}'。</value>
-  </data>
-  <data name="Xml_RelationParentNameMissing" xml:space="preserve">
-    <value>關聯 '{0}' 中遺漏父資料表名稱。</value>
-  </data>
-  <data name="Xml_RelationChildNameMissing" xml:space="preserve">
-    <value>關聯 '{0}' 中遺漏子資料表名稱。</value>
-  </data>
-  <data name="Xml_RelationTableKeyMissing" xml:space="preserve">
-    <value>關聯 '{0}' 中遺漏父資料表索引鍵。</value>
-  </data>
-  <data name="Xml_RelationChildKeyMissing" xml:space="preserve">
-    <value>關聯 '{0}' 中遺漏子資料表索引鍵。</value>
-  </data>
-  <data name="Xml_UndefinedDatatype" xml:space="preserve">
-    <value>未定義的資料型別: '{0}'。</value>
-  </data>
-  <data name="Xml_DatatypeNotDefined" xml:space="preserve">
-    <value>未定義的資料型別。</value>
-  </data>
-  <data name="Xml_InvalidField" xml:space="preserve">
-    <value>欄位節點內 XPath 選取無效。找不到: {0}。</value>
-  </data>
-  <data name="Xml_InvalidSelector" xml:space="preserve">
-    <value>選取器節點內 XPath 選取無效: {0}。</value>
-  </data>
-  <data name="Xml_InvalidKey" xml:space="preserve">
-    <value>名稱為 {0} 條件約束內部的無效 'Key' 節點。</value>
-  </data>
-  <data name="Xml_DuplicateConstraint" xml:space="preserve">
-    <value>結構描述中已經使用條件約束名稱 {0}。</value>
-  </data>
-  <data name="Xml_CannotConvert" xml:space="preserve">
-    <value>無法將 '{0} 轉換成型別 '{1}'。</value>
-  </data>
-  <data name="Xml_MissingRefer" xml:space="preserve">
-    <value>在名稱為 '{2}' 的 '{1}' 條件約束中遺漏 '{0}' 部分。</value>
-  </data>
-  <data name="Xml_MismatchKeyLength" xml:space="preserve">
-    <value>無效的 Relation 定義: 不同的長度索引鍵。</value>
-  </data>
-  <data name="Xml_CircularComplexType" xml:space="preserve">
-    <value>DataSet 不允許名為 '{0}' 的 ComplexType 中有循環參考。</value>
-  </data>
-  <data name="Xml_CannotInstantiateAbstract" xml:space="preserve">
-    <value>DataSet 無法具現化抽象的節點 {0} 的 ComplexType。</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterError" xml:space="preserve">
-    <value>寫入 Xml Schema 時，多目標轉換器發生錯誤。詳細資訊請參閱內部例外狀況。</value>
-  </data>
-  <data name="Xml_MultipleTargetConverterEmpty" xml:space="preserve">
-    <value>寫入 Xml Schema 時，多目標轉換器發生錯誤。傳回的字串是 null 或空的。</value>
-  </data>
-  <data name="Xml_MergeDuplicateDeclaration" xml:space="preserve">
-    <value>重複的宣告 '{0}'。</value>
-  </data>
-  <data name="Xml_MissingTable" xml:space="preserve">
-    <value>無法載入 diffGram。目的資料集中遺漏資料表 '{0}'。</value>
-  </data>
-  <data name="Xml_MissingSQL" xml:space="preserve">
-    <value>無法載入 diffGram。遺漏 'sql' 節點。</value>
-  </data>
-  <data name="Xml_ColumnConflict" xml:space="preserve">
-    <value>資料行名稱 '{0}' 已經定義為不同的對應型別。</value>
-  </data>
-  <data name="Xml_InvalidPrefix" xml:space="preserve">
-    <value>前置字元 '{0}' 無效，因為其中含有特殊字元。</value>
-  </data>
-  <data name="Xml_NestedCircular" xml:space="preserve">
-    <value>自我巢狀資料表 '{0}' 中的循環參考。</value>
-  </data>
-  <data name="Xml_FoundEntity" xml:space="preserve">
-    <value>DataSet 無法展開實體。請使用 XmlValidatingReader 並適當地設定 EntityHandling 屬性。</value>
-  </data>
-  <data name="Xml_PolymorphismNotSupported" xml:space="preserve">
-    <value>型別 '{0}' 未實作 IXmlSerializable 介面，因此無法繼續序列化。</value>
-  </data>
-  <data name="Xml_CanNotDeserializeObjectType" xml:space="preserve">
-    <value>無法繼續還原序列化。資料未實作 IXMLSerializable，因此不支援多型。</value>
-  </data>
-  <data name="Xml_DataTableInferenceNotSupported" xml:space="preserve">
-    <value>DataTable 不支援來自 Xml 的結構描述介面。</value>
-  </data>
-  <data name="Xml_MultipleParentRows" xml:space="preserve">
-    <value>無法繼續序列化 DataTable '{0}'。它包含在相同的 Foreign Key 上有多個父資料列的 DataRow。</value>
-  </data>
-  <data name="Xml_IsDataSetAttributeMissingInSchema" xml:space="preserve">
-    <value>輸入的 Schema 中遺漏了 IsDataSet 屬性。</value>
-  </data>
-  <data name="Xml_TooManyIsDataSetAttributeInSchema" xml:space="preserve">
-    <value>無法判斷 DataSet 元素。IsDataSet 屬性存在一次以上。</value>
-  </data>
-  <data name="Xml_DynamicWithoutXmlSerializable" xml:space="preserve">
-    <value>DataSet 不會序列化實作 IDynamicMetaObjectProvider 但未同時實作 IXmlSerializable 的型別。</value>
-  </data>
-  <data name="Expr_NYI" xml:space="preserve">
-    <value>功能未實作。{0}。</value>
-  </data>
-  <data name="Expr_MissingOperand" xml:space="preserve">
-    <value>語法錯誤: '{0}' 運算子之後遺漏運算元。</value>
-  </data>
-  <data name="Expr_TypeMismatch" xml:space="preserve">
-    <value>運算式 '{0}' 中類型不符。</value>
-  </data>
-  <data name="Expr_ExpressionTooComplex" xml:space="preserve">
-    <value>運算式太複雜。</value>
-  </data>
-  <data name="Expr_UnboundName" xml:space="preserve">
-    <value>找不到資料行 [{0}]。</value>
-  </data>
-  <data name="Expr_InvalidString" xml:space="preserve">
-    <value>運算式包含無效的字串常數: {0}。</value>
-  </data>
-  <data name="Expr_UndefinedFunction" xml:space="preserve">
-    <value>運算式包含未定義的函式呼叫 {0}()。</value>
-  </data>
-  <data name="Expr_Syntax" xml:space="preserve">
-    <value>運算式中語法錯誤。</value>
-  </data>
-  <data name="Expr_FunctionArgumentCount" xml:space="preserve">
-    <value>無效的引數數目: 函式 {0}()。</value>
-  </data>
-  <data name="Expr_MissingRightParen" xml:space="preserve">
-    <value>運算式遺漏右括號。</value>
-  </data>
-  <data name="Expr_UnknownToken" xml:space="preserve">
-    <value>無法於位置 {1} 轉譯語彙基元 '{0}'。</value>
-  </data>
-  <data name="Expr_UnknownToken1" xml:space="preserve">
-    <value>必須是 {0}，但於位置 {2} 的實際語彙基元是 {1}。</value>
-  </data>
-  <data name="Expr_DatatypeConversion" xml:space="preserve">
-    <value>無法從 '{0} 轉換為 '{1}'。</value>
-  </data>
-  <data name="Expr_DatavalueConversion" xml:space="preserve">
-    <value>無法將 '{0}' 值轉換為類型 '{1}'。</value>
-  </data>
-  <data name="Expr_InvalidName" xml:space="preserve">
-    <value>無效的資料行名稱 [{0}]。</value>
-  </data>
-  <data name="Expr_InvalidDate" xml:space="preserve">
-    <value>運算式包含無效的日期常數 '{0}'。</value>
-  </data>
-  <data name="Expr_NonConstantArgument" xml:space="preserve">
-    <value>在 IN 運算子的運算式清單中只允許常數運算式。</value>
-  </data>
-  <data name="Expr_InvalidPattern" xml:space="preserve">
-    <value>Like 運算子中發生錯誤: 字串模式 '{0}' 無效。</value>
-  </data>
-  <data name="Expr_InWithoutParentheses" xml:space="preserve">
-    <value>語法錯誤: IN 關鍵字之後的項目必須以逗號分隔，而且必須位於括號中。</value>
-  </data>
-  <data name="Expr_ArgumentType" xml:space="preserve">
-    <value>函式引數中類型不符: {0}()，引數 {1}，必須是 {2}。</value>
-  </data>
-  <data name="Expr_ArgumentTypeInteger" xml:space="preserve">
-    <value>函式引數中類型不符: {0}()，引數 {1}，必須是 Integer 型別其中之一。</value>
-  </data>
-  <data name="Expr_TypeMismatchInBinop" xml:space="preserve">
-    <value>無法在 {1} 和 {2} 上執行 '{0}' 作業。</value>
-  </data>
-  <data name="Expr_AmbiguousBinop" xml:space="preserve">
-    <value>運算子 '{0}' 在型別 '{1}' 和 '{2}' 的運算元上模稜兩可。無法混合 signed 和 unsigned 型別。請使用明確的 Convert() 函式。</value>
-  </data>
-  <data name="Expr_InWithoutList" xml:space="preserve">
-    <value>語法錯誤: IN 關鍵字之後必須跟隨運算式以逗號分隔的非空白清單，而且必須包含在括號中。</value>
-  </data>
-  <data name="Expr_UnsupportedOperator" xml:space="preserve">
-    <value>運算式包含未支援的運算子 '{0}'。</value>
-  </data>
-  <data name="Expr_InvalidNameBracketing" xml:space="preserve">
-    <value>運算式包含無效的名稱: '{0}'。</value>
-  </data>
-  <data name="Expr_MissingOperandBefore" xml:space="preserve">
-    <value>語法錯誤: '{0}' 運算子之前遺漏運算元。</value>
-  </data>
-  <data name="Expr_TooManyRightParentheses" xml:space="preserve">
-    <value>運算式有太多右括號。</value>
-  </data>
-  <data name="Expr_UnresolvedRelation" xml:space="preserve">
-    <value>資料表 [{0}] 已經包含在多個關聯中。您必須在運算式 '{1}' 明確指定關聯名稱。</value>
-  </data>
-  <data name="Expr_AggregateArgument" xml:space="preserve">
-    <value>彙總引數中語法錯誤: 必須是擁有可能 'Child' 限定詞的單一資料行引數。</value>
-  </data>
-  <data name="Expr_AggregateUnbound" xml:space="preserve">
-    <value>彙總運算式 '{0}' 中未繫結的參考。</value>
-  </data>
-  <data name="Expr_EvalNoContext" xml:space="preserve">
-    <value>無法評估沒有目前資料列的非常數運算式。</value>
-  </data>
-  <data name="Expr_ExpressionUnbound" xml:space="preserve">
-    <value>運算式 '{0}' 中未繫結的參考。</value>
-  </data>
-  <data name="Expr_ComputeNotAggregate" xml:space="preserve">
-    <value>無法評估。運算式 '{0}' 不是彙總。</value>
-  </data>
-  <data name="Expr_FilterConversion" xml:space="preserve">
-    <value>篩選條件運算式 '{0}' 不會評估成 Boolean 詞彙。</value>
-  </data>
-  <data name="Expr_InvalidType" xml:space="preserve">
-    <value>無效的型別名稱 '{0}'。</value>
-  </data>
-  <data name="Expr_LookupArgument" xml:space="preserve">
-    <value>查詢運算式中語法錯誤: 必須是關鍵字 'Parent' 之後跟隨擁有可能關聯限定詞的單一資料行引數: Parent[(&lt;relation_name&gt;)].&lt;column_name&gt;。</value>
-  </data>
-  <data name="Expr_InvokeArgument" xml:space="preserve">
-    <value>需要資料列或資料表以叫用 DataFilter。</value>
-  </data>
-  <data name="Expr_ArgumentOutofRange" xml:space="preserve">
-    <value>{0}() 引數超過範圍。</value>
-  </data>
-  <data name="Expr_IsSyntax" xml:space="preserve">
-    <value>語法錯誤: 'Is' 運算子的用法無效。正確語法: &lt;expression&gt; Is [Not] Null。</value>
+  <data name="Data_InvalidOffsetLength" xml:space="preserve">
+    <value>位移和長度超過陣列的界限或計數大於從索引至來源集合尾端的項目數。</value>
   </data>
-  <data name="Expr_Overflow" xml:space="preserve">
-    <value>型別 '{0}' 的值太大或太小。</value>
+  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
+    <value>無法將類型 '{0}' 的物件轉換為類型 '{1}' 的物件。</value>
   </data>
-  <data name="Expr_DivideByZero" xml:space="preserve">
-    <value>發生除以零的錯誤。</value>
+  <data name="ADP_SingleValuedProperty" xml:space="preserve">
+    <value>屬性 '{0}' 僅可接受的值是 '{1}'。</value>
   </data>
-  <data name="Expr_BindFailure" xml:space="preserve">
-    <value>找不到父關聯 '{0}'。</value>
+  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
+    <value>屬性 '{0}' 可接受的值為 '{1}' 或 '{2}'。</value>
   </data>
-  <data name="Expr_InvalidHoursArgument" xml:space="preserve">
-    <value>'hours' 引數超出範圍。值必須介於 -14 到 +14 之間。</value>
+  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
+    <value>指定的 QuotePrefix 與 QuoteSuffix 值不符。</value>
   </data>
-  <data name="Expr_InvalidMinutesArgument" xml:space="preserve">
-    <value>'minutes' 引數超出範圍。值必須介於 -59 到 +59 之間。</value>
+  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
+    <value>引數 '{0}' 的長度超過其上限 '{1}'。</value>
   </data>
-  <data name="Expr_InvalidTimeZoneRange" xml:space="preserve">
-    <value>對時間一提供的範圍超過 14 小時的總數。</value>
+  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
+    <value>索引鍵 '{0}' 的值無效。</value>
   </data>
-  <data name="Expr_MismatchKindandTimeSpan" xml:space="preserve">
-    <value>提供的 DateTime 引數的 Kind 屬性，不符合 'hours' 和 'minutes' 引數。</value>
+  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
+    <value>必須要顯示索引鍵 '{1}' 才能使用索引鍵 '{0}'。</value>
   </data>
-  <data name="Expr_UnsupportedType" xml:space="preserve">
-    <value>型別 '{0}' 的 DataColumn 不支援運算式。</value>
+  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
+    <value>索引鍵 '{0}' 的值長度超過其上限 '{1}'。</value>
   </data>
-  <data name="Data_EnforceConstraints" xml:space="preserve">
-    <value>無法啟用條件約束。一或多個資料列的值違反非 Null、唯一或外部索引鍵條件約束。</value>
+  <data name="ADP_KeywordNotSupported" xml:space="preserve">
+    <value>不支援關鍵字: '{0}'。</value>
   </data>
-  <data name="Data_CannotModifyCollection" xml:space="preserve">
-    <value>集合本身無法修改。</value>
+  <data name="ADP_InternalProviderError" xml:space="preserve">
+    <value>內部 .NET Framework Data Provider 錯誤 {0}。</value>
   </data>
-  <data name="Data_CaseInsensitiveNameConflict" xml:space="preserve">
-    <value>指定名稱 '{0}' 至少與集合物件中的兩個物件名稱相符，但大小寫不完全相同。</value>
+  <data name="ADP_InvalidMultipartName" xml:space="preserve">
+    <value>{0} "{1}"。</value>
   </data>
-  <data name="Data_NamespaceNameConflict" xml:space="preserve">
-    <value>指定的名稱 '{0}' 與集合物件中至少兩個不同命名空間的名稱相符。</value>
+  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
+    <value>{0} "{1}"，引號的用法不正確。</value>
   </data>
-  <data name="Data_InvalidOffsetLength" xml:space="preserve">
-    <value>位移和長度超過陣列的界限或計數大於從索引至來源集合尾端的項目數。</value>
+  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
+    <value>{0} "{1}"，"{2}" 目前的限制不足。</value>
   </data>
-  <data name="Data_ArgumentOutOfRange" xml:space="preserve">
-    <value>'{0}' 引數超過範圍。</value>
+  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
+    <value>SqlBulkCopy.WriteToServer 已經失敗，因為 SqlBulkCopy.DestinationTableName 是無效的多部名稱</value>
   </data>
-  <data name="Data_ArgumentNull" xml:space="preserve">
-    <value>'{0}' 引數不可是 Null。</value>
+  <data name="SQL_TDSParserTableName" xml:space="preserve">
+    <value>由於某個無效的多部名稱，故無法處理來自 SQL Server 的結果</value>
   </data>
-  <data name="Data_ArgumentContainsNull" xml:space="preserve">
-    <value>'{0}' 引數包含空值。</value>
+  <data name="SQL_UDTTypeName" xml:space="preserve">
+    <value>SqlParameter.UdtTypeName 是無效的多部名稱</value>
   </data>
-  <data name="DataColumns_OutOfRange" xml:space="preserve">
-    <value>找不到資料行 {0}。</value>
+  <data name="SQL_TypeName" xml:space="preserve">
+    <value>SqlParameter.TypeName 是無效的多部名稱</value>
   </data>
-  <data name="DataColumns_Add1" xml:space="preserve">
-    <value>資料行 '{0}' 已經屬於這個 DataTable。</value>
+  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
+    <value>SqlCommand.DeriveParameters 已失敗，因為 SqlCommand.CommandText 屬性值為無效的多部名稱。</value>
   </data>
-  <data name="DataColumns_Add2" xml:space="preserve">
-    <value>資料行 '{0}' 已經屬於其他 DataTable。</value>
+  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
+    <value>不支援使用 MultiSubnetFailover 連接選項連接到鏡像的 SQL Server 執行個體。</value>
   </data>
-  <data name="DataColumns_Add3" xml:space="preserve">
-    <value>在 DataTable 中不可以有一個以上的 SimpleContent 資料行。</value>
+  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>{2} 方法不支援 {0} 的列舉值 {1}。</value>
   </data>
-  <data name="DataColumns_Add4" xml:space="preserve">
-    <value>無法將 SimpleContent 資料行加入至含有元素資料行或巢狀關聯的資料表。</value>
+  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
+    <value>.NET Framework SqlClient Data Provider 不支援 {0} 列舉值 {1}。</value>
   </data>
-  <data name="DataColumns_AddDuplicate" xml:space="preserve">
-    <value>這個 DataTable 已經有名稱為 '{0}' 的資料行。</value>
+  <data name="ADP_CommandTextRequired" xml:space="preserve">
+    <value>{0}: CommandText 屬性尚未初始化</value>
   </data>
-  <data name="DataColumns_AddDuplicate2" xml:space="preserve">
-    <value>無法加入名為 '{0}' 的資料行: 這個 DataTable 已經有同名的巢狀資料表。</value>
+  <data name="ADP_ConnectionRequired" xml:space="preserve">
+    <value>{0}: Connection 屬性尚未初始化。</value>
   </data>
-  <data name="DataColumns_AddDuplicate3" xml:space="preserve">
-    <value>這個 DataTable 已經有名為 '{0}' 的資料行: 無法將巢狀資料表名稱設定為相同的名稱。</value>
+  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
+    <value>{0} 必須有開啟與可用的 Connection。{1}</value>
   </data>
-  <data name="DataColumns_Remove" xml:space="preserve">
-    <value>無法移除不屬於這個資料表的資料行。</value>
+  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
+    <value>預存程序 '{0}' 不存在。</value>
   </data>
-  <data name="DataColumns_RemovePrimaryKey" xml:space="preserve">
-    <value>無法移除這個資料行，因為它是主索引鍵的一部分。</value>
+  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
+    <value>交易可能與目前連接無關，或是已完成。</value>
   </data>
-  <data name="DataColumns_RemoveChildKey" xml:space="preserve">
-    <value>無法移除這個資料行，因為它是關聯性 {0} 父索引鍵的一部分。</value>
+  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
+    <value>與目前連接關聯的交易已完成，但尚未處置。必須先處置交易，才能使用連接來執行 SQL 陳述式。</value>
   </data>
-  <data name="DataColumns_RemoveConstraint" xml:space="preserve">
-    <value>無法移除這個資料行，因為它是資料表 {1} 條件約束 {0} 中的一部分。</value>
+  <data name="ADP_TransactionRequired" xml:space="preserve">
+    <value>當指定給命令的連接為擱置的本機交易時，{0} 需要連接以交易。命令的 Transaction 屬性尚未初始化。</value>
   </data>
-  <data name="DataColumns_RemoveExpression" xml:space="preserve">
-    <value>無法移除這個資料行，因為它是運算式的一部分: {0} = {1}。</value>
+  <data name="ADP_OpenReaderExists" xml:space="preserve">
+    <value>已經開啟與這個 {0} 建立關聯的 DataReader，必須先將它關閉。</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndExpression" xml:space="preserve">
-    <value>無法設定計算資料行的 AutoIncrement 屬性。</value>
+  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
+    <value>{0} DeriveParameters 只支援 CommandType.StoredProcedure，不支援 CommandType.{1}。</value>
   </data>
-  <data name="DataColumn_AutoIncrementAndDefaultValue" xml:space="preserve">
-    <value>無法設定擁有 DefaultValue 值的資料行的 AutoIncrement 屬性。</value>
-  </data>
-  <data name="DataColumn_DefaultValueAndAutoIncrement" xml:space="preserve">
-    <value>無法在 AutoIncrement 資料行上設定 DefaultValue。</value>
-  </data>
-  <data name="DataColumn_AutoIncrementSeed" xml:space="preserve">
-    <value>AutoIncrementStep 必須是不為零的值。</value>
-  </data>
-  <data name="DataColumn_NameRequired" xml:space="preserve">
-    <value>當 ColumnName 是 DataTable 的一部分時，它是必要的。</value>
-  </data>
-  <data name="DataColumn_ChangeDataType" xml:space="preserve">
-    <value>當資料行擁有資料後就無法變更 DataType。</value>
-  </data>
-  <data name="DataColumn_NullDataType" xml:space="preserve">
-    <value>資料行需要有效的 DataType。</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType" xml:space="preserve">
-    <value>資料行 {0} 的 DefaultValue 是屬於型別 {1}，並且無法轉換成 {2}。</value>
-  </data>
-  <data name="DataColumn_DefaultValueDataType1" xml:space="preserve">
-    <value>資料行的 DefaultValue 是屬於型別 {0}，並且無法轉換成 {1}。</value>
-  </data>
-  <data name="DataColumn_DefaultValueColumnDataType" xml:space="preserve">
-    <value>資料行 {0} 的 DefaultValue 是屬於型別 {1}，但資料行是屬於型別 {2}。</value>
-  </data>
-  <data name="DataColumn_ReadOnlyAndExpression" xml:space="preserve">
-    <value>無法變更運算式資料行的 ReadOnly 屬性。</value>
-  </data>
-  <data name="DataColumn_UniqueAndExpression" xml:space="preserve">
-    <value>無法變更運算式資料行的 Unique 屬性。</value>
-  </data>
-  <data name="DataColumn_ExpressionAndUnique" xml:space="preserve">
-    <value>無法在擁有 AutoIncrement 或 Unique 的資料行上建立運算式。</value>
-  </data>
-  <data name="DataColumn_ExpressionAndReadOnly" xml:space="preserve">
-    <value>無法設定運算式，因為無法將資料行設定成 ReadOnly。</value>
-  </data>
-  <data name="DataColumn_ExpressionAndConstraint" xml:space="preserve">
-    <value>無法在資料行 {0} 上設定 Expression 屬性，因為它是條件約束的一部分。</value>
-  </data>
-  <data name="DataColumn_ExpressionInConstraint" xml:space="preserve">
-    <value>無法根據 Expression 資料行 {0} 建立條件約束。</value>
-  </data>
-  <data name="DataColumn_ExpressionCircular" xml:space="preserve">
-    <value>無法設定 Expression 屬性，因為在運算式中有循環參考。</value>
-  </data>
-  <data name="DataColumn_NullKeyValues" xml:space="preserve">
-    <value>資料行 '{0}' 中擁有 null 值。</value>
-  </data>
-  <data name="DataColumn_NullValues" xml:space="preserve">
-    <value>資料行 '{0}' 不允許 nulls。</value>
-  </data>
-  <data name="DataColumn_ReadOnly" xml:space="preserve">
-    <value>資料行 '{0}' 是唯讀。</value>
-  </data>
-  <data name="DataColumn_NonUniqueValues" xml:space="preserve">
-    <value>Column '{0}' 包含非唯一的值。</value>
-  </data>
-  <data name="DataColumn_NotInTheTable" xml:space="preserve">
-    <value>資料行 '{0}' 不屬於資料表 {1}。</value>
-  </data>
-  <data name="DataColumn_NotInAnyTable" xml:space="preserve">
-    <value>資料行必須屬於資料表。</value>
-  </data>
-  <data name="DataColumn_SetFailed" xml:space="preserve">
-    <value>無法在 {1} 資料行中儲存 &lt;{0}&gt;。需要的型別是 {2}。</value>
-  </data>
-  <data name="DataColumn_CannotSetToNull" xml:space="preserve">
-    <value>無法將 Column '{0}' 設定為 null，請改用 DBNull。</value>
-  </data>
-  <data name="DataColumn_LongerThanMaxLength" xml:space="preserve">
-    <value>無法設定資料行 '{0}'。該值違反了這個資料行的 MaxLength 限制。</value>
-  </data>
-  <data name="DataColumn_HasToBeStringType" xml:space="preserve">
-    <value>MaxLength 只適用於字串資料型別。您無法將 Column '{0}' 的 MaxLength 屬性設定成非負數。</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength" xml:space="preserve">
-    <value>無法將 Column '{0}' 的 MaxLength 屬性設定成 '{1}'。資料表中至少有一個字串的長度超過新的限制。</value>
-  </data>
-  <data name="DataColumn_CannotSetMaxLength2" xml:space="preserve">
-    <value>無法設定 Column '{0}' 的 MaxLength 屬性。Column 是 SimpleContent。</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContentType" xml:space="preserve">
-    <value>無法將 Column '{0}' 的 DataType 屬性設定成 {1}。Column 是 SimpleContent。</value>
-  </data>
-  <data name="DataColumn_CannotSimpleContent" xml:space="preserve">
-    <value>無法將 Column '{0}' 的 MappingType 屬性設定成 SimpleContent。Column 的 DataType 是 {1}。</value>
-  </data>
-  <data name="DataColumn_ExceedMaxLength" xml:space="preserve">
-    <value>Column '{0}' 超過 MaxLength 的限制。</value>
-  </data>
-  <data name="DataColumn_NotAllowDBNull" xml:space="preserve">
-    <value>資料行 '{0}' 不允許 DBNull.Value。</value>
-  </data>
-  <data name="DataColumn_CannotChangeNamespace" xml:space="preserve">
-    <value>無法變更 Column '{0}' 的 Namespace 屬性。Column 是 SimpleContent。</value>
-  </data>
-  <data name="DataColumn_AutoIncrementCannotSetIfHasData" xml:space="preserve">
-    <value>一旦 DataColumn 的 AutoIncrement 包含資料，就無法變更為型別 '{0}'。</value>
-  </data>
-  <data name="DataColumn_NotInTheUnderlyingTable" xml:space="preserve">
-    <value>資料行 '{0}' 不屬於下列的資料表 '{1}'。</value>
-  </data>
-  <data name="DataColumn_InvalidDataColumnMapping" xml:space="preserve">
-    <value>資料型別 '{0}' 的 DataColumn 是一個 complexType。無法將複雜型別的值序列化為 Attribute。</value>
-  </data>
-  <data name="DataColumn_CannotSetDateTimeModeForNonDateTimeColumns" xml:space="preserve">
-    <value>僅可在型別 DateTime 的 DataColumns 中設定 DateTimeMode。</value>
-  </data>
-  <data name="DataColumn_InvalidDateTimeMode" xml:space="preserve">
-    <value>'{0}' 不是有效的 DataSetDateTime 值。</value>
-  </data>
-  <data name="DataColumn_DateTimeMode" xml:space="preserve">
-    <value>一旦 DateTimeMode 表格中有資料時，就無法將 '{0}' 變更為 '{1}'。</value>
-  </data>
-  <data name="DataColumn_INullableUDTwithoutStaticNull" xml:space="preserve">
-    <value>Type '{0}' 不包含 static Null 屬性或欄位。</value>
-  </data>
-  <data name="DataColumn_UDTImplementsIChangeTrackingButnotIRevertible" xml:space="preserve">
-    <value>型別 '{0}' 不實作 IRevertibleChangeTracking；因此無法進行 RejectChanges()。</value>
-  </data>
-  <data name="DataColumn_SetAddedAndModifiedCalledOnNonUnchanged" xml:space="preserve">
-    <value>僅可使用未變更 DataRowState 的 DataRows 呼叫 SetAdded 與 SetModified。</value>
-  </data>
-  <data name="DataColumn_OrdinalExceedMaximum" xml:space="preserve">
-    <value>序數 '{0}' 超過數目上限。</value>
-  </data>
-  <data name="DataColumn_NullableTypesNotSupported" xml:space="preserve">
-    <value>DataSet 不支援 System.Nullable&lt;&gt;。</value>
-  </data>
-  <data name="DataConstraint_NoName" xml:space="preserve">
-    <value>當條件約束在 ConstraintCollection 中時，無法將它的名稱變更成空白字串。</value>
-  </data>
-  <data name="DataConstraint_Violation" xml:space="preserve">
-    <value>無法在條件約束 {0} 上強制使用條件約束。</value>
-  </data>
-  <data name="DataConstraint_ViolationValue" xml:space="preserve">
-    <value>資料行 '{0}' 被限制為唯一。值 '{1}' 已經存在。</value>
-  </data>
-  <data name="DataConstraint_NotInTheTable" xml:space="preserve">
-    <value>條件約束 '{0}' 不屬於這個 DataTable。</value>
-  </data>
-  <data name="DataConstraint_OutOfRange" xml:space="preserve">
-    <value>找不到條件約束 {0}。</value>
-  </data>
-  <data name="DataConstraint_Duplicate" xml:space="preserve">
-    <value>條件約束符合集合中名為 {0} 的條件約束。</value>
-  </data>
-  <data name="DataConstraint_DuplicateName" xml:space="preserve">
-    <value>名稱為 '{0}' 的 Constraint 已經屬於這個 DataTable。</value>
-  </data>
-  <data name="DataConstraint_UniqueViolation" xml:space="preserve">
-    <value>這些資料行目前沒有唯一的值。</value>
-  </data>
-  <data name="DataConstraint_ForeignTable" xml:space="preserve">
-    <value>這些資料行沒有指向這個資料表。</value>
-  </data>
-  <data name="DataConstraint_ParentValues" xml:space="preserve">
-    <value>無法啟用這個條件約束，因為不是所有值都有相對應的父值。</value>
-  </data>
-  <data name="DataConstraint_AddFailed" xml:space="preserve">
-    <value>無法加入這個條件約束，因為 ForeignKey 不屬於資料表 {0}。</value>
-  </data>
-  <data name="DataConstraint_RemoveFailed" xml:space="preserve">
-    <value>無法移除不屬於這個資料表的條件約束。</value>
-  </data>
-  <data name="DataConstraint_NeededForForeignKeyConstraint" xml:space="preserve">
-    <value>無法移除唯一的條件約束 '{0}'。請先移除外部索引鍵條件約束 '{1}'。</value>
-  </data>
-  <data name="DataConstraint_CascadeDelete" xml:space="preserve">
-    <value>無法刪除這個資料列，因為在關聯 {0} 上強制使用條件約束，而且刪除這個資料列將影響子資料列。</value>
-  </data>
-  <data name="DataConstraint_CascadeUpdate" xml:space="preserve">
-    <value>無法進行這項變更，因為在關聯 {0} 上強制使用條件約束，而且變更這個值將影響子資料列。</value>
-  </data>
-  <data name="DataConstraint_ClearParentTable" xml:space="preserve">
-    <value>無法清除資料表 {0}，因為 ForeignKeyConstraint {1} 強制使用條件約束，而且在 {2} 中有子資料列。</value>
-  </data>
-  <data name="DataConstraint_ForeignKeyViolation" xml:space="preserve">
-    <value>ForeignKeyConstraint {0} 需要子索引鍵值 ({1}) 存在於父資料表。</value>
-  </data>
-  <data name="DataConstraint_BadObjectPropertyAccess" xml:space="preserve">
-    <value>無法存取屬性，因為 '{0}'。</value>
-  </data>
-  <data name="DataConstraint_RemoveParentRow" xml:space="preserve">
-    <value>無法移除這個資料列，因為它擁有子資料列，而且強制使用關聯 {0} 上的條件約束。</value>
-  </data>
-  <data name="DataConstraint_AddPrimaryKeyConstraint" xml:space="preserve">
-    <value>由於已設定該資料表的主索引鍵，所以無法再加入主索引鍵條件約束。</value>
-  </data>
-  <data name="DataConstraint_CantAddConstraintToMultipleNestedTable" xml:space="preserve">
-    <value>無法對 DataTable '{0}' 新增約束，它是巢狀關聯的子資料表。</value>
-  </data>
-  <data name="DataKey_TableMismatch" xml:space="preserve">
-    <value>無法從屬於不同資料表的資料行建立索引鍵。</value>
-  </data>
-  <data name="DataKey_NoColumns" xml:space="preserve">
-    <value>無法擁有 0 個資料行。</value>
-  </data>
-  <data name="DataKey_TooManyColumns" xml:space="preserve">
-    <value>無法擁有超過 {0} 個資料行。</value>
-  </data>
-  <data name="DataKey_DuplicateColumns" xml:space="preserve">
-    <value>當相同資料行列出多次時，無法建立索引鍵: '{0}'</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey" xml:space="preserve">
-    <value>無法移除唯一的條件約束，因為它是資料表的主索引鍵。</value>
-  </data>
-  <data name="DataKey_RemovePrimaryKey1" xml:space="preserve">
-    <value>無法移除唯一的條件約束，因為它是資料表 {0} 的主索引鍵。</value>
-  </data>
-  <data name="DataRelation_ColumnsTypeMismatch" xml:space="preserve">
-    <value>父資料行和子資料行沒有型別相符的資料行。</value>
-  </data>
-  <data name="DataRelation_KeyColumnsIdentical" xml:space="preserve">
-    <value>ParentKey 和 ChildKey 相同。</value>
-  </data>
-  <data name="DataRelation_KeyLengthMismatch" xml:space="preserve">
-    <value>ParentColumns 和 ChildColumns 的長度必須相同。</value>
-  </data>
-  <data name="DataRelation_KeyZeroLength" xml:space="preserve">
-    <value>ParentColumns 和 ChildColumns 的長度不可為零。</value>
-  </data>
-  <data name="DataRelation_ForeignRow" xml:space="preserve">
-    <value>資料列和這個關聯不屬於相同的 DataSet。</value>
-  </data>
-  <data name="DataRelation_NoName" xml:space="preserve">
-    <value>當 RelationName 是 DataSet 的一部分時，它是必要的。</value>
-  </data>
-  <data name="DataRelation_ForeignTable" xml:space="preserve">
-    <value>GetChildRows 需要 Table 為 {0} 的資料列，但指定資料列的 Table 為 {1}。</value>
-  </data>
-  <data name="DataRelation_ForeignDataSet" xml:space="preserve">
-    <value>這個關聯必須連接這個 DataSet 中的兩個資料表以加入至這個 DataSet。</value>
-  </data>
-  <data name="DataRelation_GetParentRowTableMismatch" xml:space="preserve">
-    <value>GetParentRow 需要資料表為 {0} 的資料列，但指定資料列的資料表為 {1}。</value>
-  </data>
-  <data name="DataRelation_SetParentRowTableMismatch" xml:space="preserve">
-    <value>SetParentRow 需要資料表為 {0} 的子資料列，但指定資料列的資料表為 {1}。</value>
-  </data>
-  <data name="DataRelation_DataSetMismatch" xml:space="preserve">
-    <value>不同 DataSet 的資料表之間不可以有關聯性。</value>
-  </data>
-  <data name="DataRelation_TablesInDifferentSets" xml:space="preserve">
-    <value>無法在不同 DataSet 的資料表之間建立關聯。</value>
-  </data>
-  <data name="DataRelation_AlreadyExists" xml:space="preserve">
-    <value>已經存在這些子資料行的關聯。</value>
-  </data>
-  <data name="DataRelation_DoesNotExist" xml:space="preserve">
-    <value>這個關聯不屬於這個關聯集合。</value>
-  </data>
-  <data name="DataRelation_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>這個關聯已經屬於其他 DataSet。</value>
-  </data>
-  <data name="DataRelation_AlreadyInTheDataSet" xml:space="preserve">
-    <value>這個關聯已經屬於這個 DataSet。</value>
-  </data>
-  <data name="DataRelation_DuplicateName" xml:space="preserve">
-    <value>名稱為 '{0}' 的 Relation 已經屬於這個 DataSet。</value>
-  </data>
-  <data name="DataRelation_NotInTheDataSet" xml:space="preserve">
-    <value>Relation {0} 不屬於這個 DataSet。</value>
-  </data>
-  <data name="DataRelation_OutOfRange" xml:space="preserve">
-    <value>找不到關聯 {0}。</value>
-  </data>
-  <data name="DataRelation_TableNull" xml:space="preserve">
-    <value>無法在 null 資料表上建立集合。</value>
-  </data>
-  <data name="DataRelation_TableWasRemoved" xml:space="preserve">
-    <value>這個集合所顯示關聯的資料表已經從它的 DataSet 中移除。</value>
-  </data>
-  <data name="DataRelation_ChildTableMismatch" xml:space="preserve">
-    <value>無法加入關聯至這個資料表的 ParentRelation 集合，在該集合中這個資料表不是子資料表。</value>
-  </data>
-  <data name="DataRelation_ParentTableMismatch" xml:space="preserve">
-    <value>無法加入關聯至這個資料表的 ChildRelation 集合，在該集合中這個資料表不是父資料表。</value>
-  </data>
-  <data name="DataRelation_RelationNestedReadOnly" xml:space="preserve">
-    <value>無法將這個關聯的 'Nested' 屬性設定為 false。</value>
-  </data>
-  <data name="DataRelation_TableCantBeNestedInTwoTables" xml:space="preserve">
-    <value>在兩個巢狀關聯中，相同資料表 '{0}' 不可以是子資料表。</value>
-  </data>
-  <data name="DataRelation_LoopInNestedRelations" xml:space="preserve">
-    <value>在巢狀關聯中資料表 ({0}) 不可是自己的子資料表。</value>
-  </data>
-  <data name="DataRelation_CaseLocaleMismatch" xml:space="preserve">
-    <value>加入 DataRelation 或 Constraint 時，若其父和子資料表之間有不同的 Locale 或 CaseSensitive 設定，就無法加入。</value>
-  </data>
-  <data name="DataRelation_ParentOrChildColumnsDoNotHaveDataSet" xml:space="preserve">
-    <value>若 Parent 或 Child Columns 不在 DataSet 中時，無法建立 DataRelation。</value>
-  </data>
-  <data name="DataRelation_InValidNestedRelation" xml:space="preserve">
-    <value>繼承其命名空間的巢狀資料表 '{0}' 無法具有多個不同命名空間的父資料表。</value>
-  </data>
-  <data name="DataRelation_InValidNamespaceInNestedRelation" xml:space="preserve">
-    <value>附空白命名空間的巢狀資料表 '{0}' 無法具有多個不同命名空間的父資料表。</value>
-  </data>
-  <data name="DataRow_NotInTheDataSet" xml:space="preserve">
-    <value>資料列和這個關聯不屬於相同的 DataSet。</value>
-  </data>
-  <data name="DataRow_NotInTheTable" xml:space="preserve">
-    <value>無法對不存在於資料表中的資料列上執行這項作業。</value>
-  </data>
-  <data name="DataRow_ParentRowNotInTheDataSet" xml:space="preserve">
-    <value>這個關聯和子資料列不屬於相同的 DataSet。</value>
-  </data>
-  <data name="DataRow_EditInRowChanging" xml:space="preserve">
-    <value>無法變更 RowChanging 事件中的建議值。</value>
-  </data>
-  <data name="DataRow_EndEditInRowChanging" xml:space="preserve">
-    <value>無法在 OnRowChanging 事件內部呼叫 EndEdit。</value>
-  </data>
-  <data name="DataRow_BeginEditInRowChanging" xml:space="preserve">
-    <value>無法在 RowChanging 事件內呼叫 BeginEdit()。</value>
-  </data>
-  <data name="DataRow_CancelEditInRowChanging" xml:space="preserve">
-    <value>無法在 OnRowChanging 事件內部呼叫 CancelEdit()。擲回 exception 以取消這個更新。</value>
-  </data>
-  <data name="DataRow_DeleteInRowDeleting" xml:space="preserve">
-    <value>無法在 OnRowDeleting 事件內部呼叫 Delete。擲回 exception 以取消這個刪除。</value>
-  </data>
-  <data name="DataRow_ValuesArrayLength" xml:space="preserve">
-    <value>輸入陣列的長度大於這個資料表中的資料行數目。</value>
-  </data>
-  <data name="DataRow_NoCurrentData" xml:space="preserve">
-    <value>沒有可存取的 Current 資料。</value>
-  </data>
-  <data name="DataRow_NoOriginalData" xml:space="preserve">
-    <value>沒有可存取的 Original 資料。</value>
-  </data>
-  <data name="DataRow_NoProposedData" xml:space="preserve">
-    <value>沒有可存取的 Proposed 資料。</value>
-  </data>
-  <data name="DataRow_RemovedFromTheTable" xml:space="preserve">
-    <value>這個資料列已經從資料表中移除，而且沒有任何資料。BeginEdit() 將允許在這個資料列中建立新資料。</value>
-  </data>
-  <data name="DataRow_DeletedRowInaccessible" xml:space="preserve">
-    <value>無法經由資料列存取已刪除的資料列資訊。</value>
-  </data>
-  <data name="DataRow_InvalidVersion" xml:space="preserve">
-    <value>版本必須是 Original、Current 或 Proposed。</value>
-  </data>
-  <data name="DataRow_OutOfRange" xml:space="preserve">
-    <value>位置 {0} 沒有資料列。</value>
-  </data>
-  <data name="DataRow_RowInsertOutOfRange" xml:space="preserve">
-    <value>無效的資料列插入位置 {0}。</value>
-  </data>
-  <data name="DataRow_RowInsertTwice" xml:space="preserve">
-    <value>名稱為 '{1}' 的資料表中有兩個 rowOrder value={0}。</value>
-  </data>
-  <data name="DataRow_RowInsertMissing" xml:space="preserve">
-    <value>遺漏了資料表 '{0}' 的 rowOrder 順序中的值。</value>
-  </data>
-  <data name="DataRow_RowOutOfRange" xml:space="preserve">
-    <value>指定的 DataRow 不在目前的 DataRowCollection 中。</value>
-  </data>
-  <data name="DataRow_AlreadyInOtherCollection" xml:space="preserve">
-    <value>這個資料列已經屬於其他資料表。</value>
-  </data>
-  <data name="DataRow_AlreadyInTheCollection" xml:space="preserve">
-    <value>這個資料列已經屬於這個資料表。</value>
-  </data>
-  <data name="DataRow_AlreadyDeleted" xml:space="preserve">
-    <value>無法刪除這個資料列，因為它之前已經被刪除了。</value>
-  </data>
-  <data name="DataRow_Empty" xml:space="preserve">
-    <value>這個資料列是空的。</value>
-  </data>
-  <data name="DataRow_AlreadyRemoved" xml:space="preserve">
-    <value>無法移除已移除的資料列。</value>
-  </data>
-  <data name="DataRow_MultipleParents" xml:space="preserve">
-    <value>子資料列擁有多個父資料列。</value>
-  </data>
-  <data name="DataRow_InvalidRowBitPattern" xml:space="preserve">
-    <value>無法識別資料列位元模式。</value>
-  </data>
-  <data name="DataSet_SetNameToEmpty" xml:space="preserve">
-    <value>無法將 DataSet 的名稱變更為空白字串。</value>
-  </data>
-  <data name="DataSet_SetDataSetNameConflicting" xml:space="preserve">
-    <value>名稱 '{0}' 無效。DataSet 不可以和 DataTable 同名。</value>
-  </data>
-  <data name="DataSet_UnsupportedSchema" xml:space="preserve">
-    <value>結構描述命名空間無效，請改用這個命名空間: {0}。</value>
-  </data>
-  <data name="DataSet_CannotChangeCaseLocale" xml:space="preserve">
-    <value>無法變更 CaseSensitive 或 Locale 屬性。這項變更將會導致至少一個 DataRelation 或 Constraint 在它的相關資料表之間，擁有不同的 Locale 或 CaseSensitive 設定。</value>
-  </data>
-  <data name="DataSet_CannotChangeSchemaSerializationMode" xml:space="preserve">
-    <value>SchemaSerializationMode 屬性只有在被衍生 DataSet 忽略時才能設定。</value>
-  </data>
-  <data name="DataTable_ForeignPrimaryKey" xml:space="preserve">
-    <value>PrimaryKey 資料行不屬於個資料表。</value>
-  </data>
-  <data name="DataTable_CannotAddToSimpleContent" xml:space="preserve">
-    <value>無法加入巢狀關聯或元素資料行至包含 SimpleContent 資料行的資料表。</value>
-  </data>
-  <data name="DataTable_NoName" xml:space="preserve">
-    <value>當 TableName 是 DataSet 的一部分時，它是必要的。</value>
-  </data>
-  <data name="DataTable_MultipleSimpleContentColumns" xml:space="preserve">
-    <value>DataTable 已具有簡單內容資料行。</value>
-  </data>
-  <data name="DataTable_MissingPrimaryKey" xml:space="preserve">
-    <value>資料表沒有主索引鍵。</value>
-  </data>
-  <data name="DataTable_InvalidSortString" xml:space="preserve">
-    <value>{0} 不是有效的 Sort 字串項目。</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableHierarchy" xml:space="preserve">
-    <value>無法序列化 DataTable。用於一或多個 DataColumn 運算式的 DataTable 並非目前 DataTable 的下階。</value>
-  </data>
-  <data name="DataTable_CanNotRemoteDataTable" xml:space="preserve">
-    <value>此 DataTable 僅可被遠端控制為 DataSet 的一部分。一或多個 Expression Columns 已參考至其他 DataTable。</value>
-  </data>
-  <data name="DataTable_CanNotSetRemotingFormat" xml:space="preserve">
-    <value>DataSet 與 DataTable 無法具有不同的遠端格式屬性值。</value>
-  </data>
-  <data name="DataTable_CanNotSerializeDataTableWithEmptyName" xml:space="preserve">
-    <value>無法序列化 DataTable。未設定 DataTable 名稱。</value>
-  </data>
-  <data name="DataTable_DuplicateName" xml:space="preserve">
-    <value>名為 '{0}' 的 DataTable 已經屬於這個 DataSet。</value>
-  </data>
-  <data name="DataTable_DuplicateName2" xml:space="preserve">
-    <value>名為 '{0}' 且同為 Namespace 同為 '{1}' 的 DataTable 已屬於此 DataSet。</value>
-  </data>
-  <data name="DataTable_SelfnestedDatasetConflictingName" xml:space="preserve">
-    <value>資料表 ({0}) 在巢狀關聯中不可作為本身的子資料表: DataSet 名稱與資料表名稱發生衝突。</value>
-  </data>
-  <data name="DataTable_DatasetConflictingName" xml:space="preserve">
-    <value>名稱 '{0}' 無效。DataTable 不可以和 DataSet 同名。</value>
-  </data>
-  <data name="DataTable_AlreadyInOtherDataSet" xml:space="preserve">
-    <value>DataTable 已經屬於其他 DataSet。</value>
-  </data>
-  <data name="DataTable_AlreadyInTheDataSet" xml:space="preserve">
-    <value>DataTable 已經屬於這個 DataSet。</value>
-  </data>
-  <data name="DataTable_NotInTheDataSet" xml:space="preserve">
-    <value>資料表 {0} 不屬於這個 DataSet。</value>
-  </data>
-  <data name="DataTable_OutOfRange" xml:space="preserve">
-    <value>找不到資料表 {0}。</value>
-  </data>
-  <data name="DataTable_InRelation" xml:space="preserve">
-    <value>無法移除擁有已存在關聯的資料表。請先移除關聯。</value>
-  </data>
-  <data name="DataTable_InConstraint" xml:space="preserve">
-    <value>無法移除資料表 {0}，因為它在 ForeignKeyConstraint {1} 中被參考。請先移除條件約束。</value>
-  </data>
-  <data name="DataTable_TableNotFound" xml:space="preserve">
-    <value>DataTable '{0}' 與來源中的任何 DataTable 不相符。</value>
-  </data>
-  <data name="DataMerge_MissingDefinition" xml:space="preserve">
-    <value>目標 DataSet 遺漏 {0} 的定義。</value>
-  </data>
-  <data name="DataMerge_MissingConstraint" xml:space="preserve">
-    <value>目標 DataSet 遺漏 {0} {1}。</value>
-  </data>
-  <data name="DataMerge_DataTypeMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.{0} 和 &lt;source&gt;.{0} 擁有衝突的屬性: DataType 屬性不符。</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyMismatch" xml:space="preserve">
-    <value>&lt;target&gt;.PrimaryKey 和 &lt;source&gt;.PrimaryKey 擁有不同的 Length。</value>
-  </data>
-  <data name="DataMerge_PrimaryKeyColumnsMismatch" xml:space="preserve">
-    <value>不相符的資料行在 PrimaryKey 中: &lt;target&gt;.{0} 和 &lt;source&gt;.{1}。</value>
-  </data>
-  <data name="DataMerge_RelationKeyColumnsMismatch" xml:space="preserve">
-    <value>關係 {0} 無法合併，因為索引鍵擁有不相符的資料行。</value>
-  </data>
-  <data name="DataMerge_MissingColumnDefinition" xml:space="preserve">
-    <value>目標資料表 {0} 遺漏資料行 {1} 的定義。</value>
-  </data>
-  <data name="DataMerge_MissingPrimaryKeyColumnInSource" xml:space="preserve">
-    <value>PrimaryKey 資料欄 {0} 不存在於來源 Table 中。</value>
-  </data>
-  <data name="DataIndex_RecordStateRange" xml:space="preserve">
-    <value>RowStates 參數必須被設定為來自 DataViewRowState 列舉的有效值結合。</value>
-  </data>
-  <data name="DataIndex_FindWithoutSortOrder" xml:space="preserve">
-    <value>尋找會依排序順序尋找資料列，而未指定任何排序順序。</value>
-  </data>
-  <data name="DataIndex_KeyLength" xml:space="preserve">
-    <value>所檢索的索引鍵需要 {0} 個值，但接收到 {1} 個值。</value>
-  </data>
-  <data name="DataStorage_AggregateException" xml:space="preserve">
-    <value>彙總函式 {0}() 和型別的無效用法: {1}。</value>
-  </data>
-  <data name="DataStorage_InvalidStorageType" xml:space="preserve">
-    <value>無效的儲存型別: {0}。</value>
-  </data>
-  <data name="DataStorage_ProblematicChars" xml:space="preserve">
-    <value>DataSet Xml 永續性不支援值 '{0}' 當作 Char 值，請改用 Byte 存放區。</value>
-  </data>
-  <data name="DataStorage_SetInvalidDataType" xml:space="preserve">
-    <value>值型別與資料行類型不符</value>
-  </data>
-  <data name="DataStorage_IComparableNotDefined" xml:space="preserve">
-    <value>型別 '{0}' 無法實作 IComparable 介面。無法完成比較。</value>
-  </data>
-  <data name="DataView_SetFailed" xml:space="preserve">
-    <value>無法設定 {0}。</value>
-  </data>
-  <data name="DataView_SetDataSetFailed" xml:space="preserve">
-    <value>無法在已經是 DataSet 預設檢視表的 DataViewManager 上變更 DataSet。</value>
-  </data>
-  <data name="DataView_SetRowStateFilter" xml:space="preserve">
-    <value>RowStateFilter 無法同時顯示 ModifiedOriginals 和 ModifiedCurrents。</value>
-  </data>
-  <data name="DataView_SetTable" xml:space="preserve">
-    <value>無法在 DefaultView 或來自 DataViewManager 的 DataView 上變更 Table 屬性。</value>
-  </data>
-  <data name="DataView_CanNotSetDataSet" xml:space="preserve">
-    <value>一旦設定 DataSet 屬性之後就無法變更。</value>
-  </data>
-  <data name="DataView_CanNotUseDataViewManager" xml:space="preserve">
-    <value>在使用 DataViewManager 之前，必須先設定 DataSet。</value>
-  </data>
-  <data name="DataView_CanNotSetTable" xml:space="preserve">
-    <value>一旦設定 Table 屬性之後就無法變更。</value>
-  </data>
-  <data name="DataView_CanNotUse" xml:space="preserve">
-    <value>在使用 DataView 之前，必須先設定 DataTable。</value>
-  </data>
-  <data name="DataView_CanNotBindTable" xml:space="preserve">
-    <value>無法繫結至沒有名稱的 DataTable。</value>
-  </data>
-  <data name="DataView_SetIListObject" xml:space="preserve">
-    <value>無法設定物件至這個清單。</value>
-  </data>
-  <data name="DataView_AddNewNotAllowNull" xml:space="preserve">
-    <value>當 AllowNew 為 False 時，無法在 DataView 上呼叫 AddNew。</value>
-  </data>
-  <data name="DataView_NotOpen" xml:space="preserve">
-    <value>DataView 未開啟。</value>
-  </data>
-  <data name="DataView_CreateChildView" xml:space="preserve">
-    <value>關聯不是這個 DataView 指向資料表的父項。</value>
-  </data>
-  <data name="DataView_CanNotDelete" xml:space="preserve">
-    <value>當 AllowDelete 為 false 時，無法在 DataSource 上刪除。</value>
-  </data>
-  <data name="DataView_CanNotEdit" xml:space="preserve">
-    <value>當 AllowEdit 為 false 時，無法在 DataSource 上編輯。</value>
-  </data>
-  <data name="DataView_GetElementIndex" xml:space="preserve">
-    <value>索引 {0} 不是一個負數值，也不會超過資料列總數。</value>
-  </data>
-  <data name="DataView_AddExternalObject" xml:space="preserve">
-    <value>無法加入外部物件至這個清單。</value>
-  </data>
-  <data name="DataView_CanNotClear" xml:space="preserve">
-    <value>無法清除這個清單。</value>
-  </data>
-  <data name="DataView_InsertExternalObject" xml:space="preserve">
-    <value>無法插入外部物件至這個清單。</value>
-  </data>
-  <data name="DataView_RemoveExternalObject" xml:space="preserve">
-    <value>無法移除不在清單中的物件。</value>
-  </data>
-  <data name="DataROWView_PropertyNotFound" xml:space="preserve">
-    <value>{0} 既不是資料表 {1} 的 DataColumn，也不是該資料表的 DataRelation。</value>
-  </data>
-  <data name="Range_Argument" xml:space="preserve">
-    <value>在 Range 物件中，Min ({0}) 必須小於或等於 max ({1})。</value>
-  </data>
-  <data name="Range_NullRange" xml:space="preserve">
-    <value>這是 null 範圍。</value>
-  </data>
-  <data name="RecordManager_MinimumCapacity" xml:space="preserve">
-    <value>MinimumCapacity 必須為非負數。</value>
-  </data>
-  <data name="CodeGen_InvalidIdentifier" xml:space="preserve">
-    <value>無法產生名稱 '{0}' 的識別項。</value>
-  </data>
-  <data name="CodeGen_DuplicateTableName" xml:space="preserve">
-    <value>超過一個資料表使用相同的名稱 '{0}' (即使命名空間不同)。</value>
-  </data>
-  <data name="CodeGen_TypeCantBeNull" xml:space="preserve">
-    <value>資料行 '{0}': 類型 '{1}' 不可以是 null。</value>
-  </data>
-  <data name="CodeGen_NoCtor0" xml:space="preserve">
-    <value>資料行 '{0}': 型別 '{1}' 沒有無參數的建構函式。</value>
-  </data>
-  <data name="CodeGen_NoCtor1" xml:space="preserve">
-    <value>資料行 '{0}': 型別 '{1}' 沒有包含字串引數的建構函式。</value>
-  </data>
-  <data name="SqlConvert_ConvertFailed" xml:space="preserve">
-    <value>無法將類型 '{0}' 的物件轉換為類型 '{1}' 的物件。</value>
-  </data>
-  <data name="DataSet_DefaultDataException" xml:space="preserve">
-    <value>Data Exception。</value>
-  </data>
-  <data name="DataSet_DefaultConstraintException" xml:space="preserve">
-    <value>Constraint Exception。</value>
-  </data>
-  <data name="DataSet_DefaultDeletedRowInaccessibleException" xml:space="preserve">
-    <value>無法存取已刪除的資料列。</value>
-  </data>
-  <data name="DataSet_DefaultDuplicateNameException" xml:space="preserve">
-    <value>不允許重複的名稱。</value>
-  </data>
-  <data name="DataSet_DefaultInRowChangingEventException" xml:space="preserve">
-    <value>不支援在 RowChanging 事件中操作。</value>
-  </data>
-  <data name="DataSet_DefaultInvalidConstraintException" xml:space="preserve">
-    <value>無效的條件約束。</value>
-  </data>
-  <data name="DataSet_DefaultMissingPrimaryKeyException" xml:space="preserve">
-    <value>遺失的主索引鍵。</value>
-  </data>
-  <data name="DataSet_DefaultNoNullAllowedException" xml:space="preserve">
-    <value>不允許 Null。</value>
-  </data>
-  <data name="DataSet_DefaultReadOnlyException" xml:space="preserve">
-    <value>資料行已標示為唯讀。</value>
-  </data>
-  <data name="DataSet_DefaultRowNotInTableException" xml:space="preserve">
-    <value>資料表中找不到資料列。</value>
-  </data>
-  <data name="DataSet_DefaultVersionNotFoundException" xml:space="preserve">
-    <value>找不到版本。</value>
-  </data>
-  <data name="Load_ReadOnlyDataModified" xml:space="preserve">
-    <value>已修改 ReadOnly 資料。</value>
-  </data>
-  <data name="DataTableReader_InvalidDataTableReader" xml:space="preserve">
-    <value>DataTableReader 對目前的 DataTable '{0}' 無效。</value>
-  </data>
-  <data name="DataTableReader_SchemaInvalidDataTableReader" xml:space="preserve">
-    <value>在 DataTableReader 中的目前 DataTable '{0}' 結構描述已經變更，DataTableReader 無效。</value>
-  </data>
-  <data name="DataTableReader_CannotCreateDataReaderOnEmptyDataSet" xml:space="preserve">
-    <value>無法建立 DataTableReader。DataSet 中沒有 DataTable。</value>
-  </data>
-  <data name="DataTableReader_DataTableReaderArgumentIsEmpty" xml:space="preserve">
-    <value>無法建立 DataTableReader。引數為空。</value>
-  </data>
-  <data name="DataTableReader_ArgumentContainsNullValue" xml:space="preserve">
-    <value>無法建立 DataTableReader。引數包含 null。</value>
-  </data>
-  <data name="DataTableReader_InvalidRowInDataTableReader" xml:space="preserve">
-    <value>Current DataRow 是 Deleted 或 Detached 狀態。</value>
-  </data>
-  <data name="DataTableReader_DataTableCleared" xml:space="preserve">
-    <value>目前的 DataTable '{0}' 為空。DataTable 中沒有 DataRow。</value>
-  </data>
-  <data name="RbTree_InvalidState" xml:space="preserve">
-    <value>DataTable 內部索引已經毀損: '{0}'。</value>
-  </data>
-  <data name="RbTree_EnumerationBroken" xml:space="preserve">
-    <value>集合已經修改; 列舉作業可能無法執行。</value>
-  </data>
-  <data name="NamedSimpleType_InvalidDuplicateNamedSimpleTypeDeclaration" xml:space="preserve">
-    <value>已使用不同的 '{1}' 來宣告簡單類型 '{0}'。</value>
-  </data>
-  <data name="DataDom_Foliation" xml:space="preserve">
-    <value>無效的葉項。</value>
-  </data>
-  <data name="DataDom_TableNameChange" xml:space="preserve">
-    <value>一旦關聯的 DataSet 對應至載入的 XML 文件時，就無法變更資料表名稱。</value>
-  </data>
-  <data name="DataDom_TableNamespaceChange" xml:space="preserve">
-    <value>一旦關聯的 DataSet 對應至載入的 XML 文件時，就無法變更資料表命名空間。</value>
-  </data>
-  <data name="DataDom_ColumnNameChange" xml:space="preserve">
-    <value>一旦關聯的 DataSet 對應至載入的 XML 文件時，就無法變更資料行名稱。</value>
-  </data>
-  <data name="DataDom_ColumnNamespaceChange" xml:space="preserve">
-    <value>一旦關聯的 DataSet 對應至載入的 XML 文件時，就無法變更資料行命名空間。</value>
-  </data>
-  <data name="DataDom_ColumnMappingChange" xml:space="preserve">
-    <value>一旦關聯的 DataSet 對應至載入的 XML 文件時，就無法變更 ColumnMapping 屬性。</value>
-  </data>
-  <data name="DataDom_TableColumnsChange" xml:space="preserve">
-    <value>一旦 DataSet 對應至載入的 XML 文件時，就無法從資料表加入或移除資料行。</value>
-  </data>
-  <data name="DataDom_DataSetTablesChange" xml:space="preserve">
-    <value>一旦 DataSet 對應至載入的 XML 文件時，就無法從 DataSet 加入或移除資料表。</value>
-  </data>
-  <data name="DataDom_DataSetNestedRelationsChange" xml:space="preserve">
-    <value>資料集對應至載入的 XML 文件後，就無法從 DataSet 加入、移除或變更巢狀關聯。</value>
-  </data>
-  <data name="DataDom_DataSetNull" xml:space="preserve">
-    <value>DataSet 參數無效。它不可為 null。</value>
-  </data>
-  <data name="DataDom_DataSetNameChange" xml:space="preserve">
-    <value>一旦 DataSet 對應至載入的 XML 文件時，就無法變更 DataSet 名稱。</value>
-  </data>
-  <data name="DataDom_CloneNode" xml:space="preserve">
-    <value>無法複製這種類型的節點: {0}。</value>
-  </data>
-  <data name="DataDom_MultipleLoad" xml:space="preserve">
-    <value>如果 XmlDataDocument 已經包含資料，就無法載入它。請使用新的 XmlDataDocument。</value>
-  </data>
-  <data name="DataDom_MultipleDataSet" xml:space="preserve">
-    <value>DataSet 最多能與一個 XmlDataDocument 產生關聯。當 DataSet 已經與其他 XmlDataDocument 產生關聯時，就無法與目前的 XmlDataDocument 產生關聯。</value>
-  </data>
-  <data name="DataDom_EnforceConstraintsShouldBeOff" xml:space="preserve">
-    <value>在嘗試使用 XML 作業編輯 XmlDataDocument 前請設定 DataSet.EnforceConstraints == false。</value>
-  </data>
-  <data name="DataDom_NotSupport_GetElementById" xml:space="preserve">
-    <value>在 DataDocument 上不支援 GetElementById()。</value>
-  </data>
-  <data name="DataDom_NotSupport_EntRef" xml:space="preserve">
-    <value>無法在 DataDocument 上建立實體參考。</value>
-  </data>
-  <data name="DataDom_NotSupport_Clear" xml:space="preserve">
-    <value>XmlDataDocument 不支援對 DateSet 和 DataTable 使用 Clear 函式。</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveColumn" xml:space="preserve">
-    <value>無法移除資料行，因為它已內建在這個 dataSet。</value>
-  </data>
-  <data name="StrongTyping_CannotRemoveRelation" xml:space="preserve">
-    <value>無法移除關聯，因為它已內建在此 dataSet。</value>
-  </data>
-  <data name="propertyChangedEventDescr" xml:space="preserve">
-    <value>當這個控制項的屬性變更時發生。</value>
-  </data>
-  <data name="collectionChangedEventDescr" xml:space="preserve">
-    <value>當這個集合的成員資格變更時發生。</value>
-  </data>
-  <data name="StrongTyping_CannotAccessDBNull" xml:space="preserve">
-    <value>無法取得值，因為它是 DBNull。</value>
-  </data>
-  <data name="ADP_PropertyNotSupported" xml:space="preserve">
-    <value>屬性 '{0}' 需要 Microsoft WindowsNT 或 WindowsNT 作業系統。</value>
-  </data>
-  <data name="ConfigProviderNotFound" xml:space="preserve">
-    <value>找不到要求的 .NET Framework Data Provider。可能尚未安裝。</value>
-  </data>
-  <data name="ConfigProviderInvalid" xml:space="preserve">
-    <value>要求的 .NET Framework Data Provider 實作沒有 System.Data.Common.DbProviderFactory 衍生類型的執行個體欄位。</value>
-  </data>
-  <data name="ConfigProviderNotInstalled" xml:space="preserve">
-    <value>找不到或無法載入註冊的 .NET Framework Data Provider。</value>
-  </data>
-  <data name="ConfigProviderMissing" xml:space="preserve">
-    <value>所缺少的 .NET Framework Data Provider 組件限定名稱為必要項。</value>
-  </data>
-  <data name="ConfigBaseElementsOnly" xml:space="preserve">
-    <value>僅允許元素。</value>
-  </data>
-  <data name="ConfigBaseNoChildNodes" xml:space="preserve">
-    <value>不允許子節點。</value>
-  </data>
-  <data name="ConfigUnrecognizedAttributes" xml:space="preserve">
-    <value>無法識別的屬性 '{0}'。</value>
-  </data>
-  <data name="ConfigUnrecognizedElement" xml:space="preserve">
-    <value>無法辨認的項目。</value>
-  </data>
-  <data name="ConfigSectionsUnique" xml:space="preserve">
-    <value>'{0}' 區段僅可在每個組態檔中出現一次。</value>
-  </data>
-  <data name="ConfigRequiredAttributeMissing" xml:space="preserve">
-    <value>找不到必要的屬性 '{0}'。</value>
-  </data>
-  <data name="ConfigRequiredAttributeEmpty" xml:space="preserve">
-    <value>必要的屬性 '{0}' 不可為空。</value>
-  </data>
-  <data name="ADP_EmptyArray" xml:space="preserve">
-    <value>'{0}' 參數必須是非空陣列。</value>
-  </data>
-  <data name="ADP_SingleValuedProperty" xml:space="preserve">
-    <value>屬性 '{0}' 僅可接受的值是 '{1}'。</value>
-  </data>
-  <data name="ADP_DoubleValuedProperty" xml:space="preserve">
-    <value>屬性 '{0}' 可接受的值為 '{1}' 或 '{2}'。</value>
-  </data>
-  <data name="ADP_InvalidPrefixSuffix" xml:space="preserve">
-    <value>指定的 QuotePrefix 與 QuoteSuffix 值不符。</value>
-  </data>
-  <data name="ADP_InvalidArgumentLength" xml:space="preserve">
-    <value>引數 '{0}' 的長度超過其上限 '{1}'。</value>
-  </data>
-  <data name="SQL_WrongType" xml:space="preserve">
-    <value>必須要收到引數型別 {1}，卻收到型別 {0}。</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValue" xml:space="preserve">
-    <value>索引鍵 '{0}' 的值無效。</value>
-  </data>
-  <data name="ADP_MissingConnectionOptionValue" xml:space="preserve">
-    <value>必須要顯示索引鍵 '{1}' 才能使用索引鍵 '{0}'。</value>
-  </data>
-  <data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
-    <value>索引鍵 '{0}' 的值長度超過其上限 '{1}'。</value>
-  </data>
-  <data name="ADP_KeywordNotSupported" xml:space="preserve">
-    <value>不支援關鍵字: '{0}'。</value>
-  </data>
-  <data name="ADP_UdlFileError" xml:space="preserve">
-    <value>無法載入 UDL 檔案。</value>
-  </data>
-  <data name="ADP_InvalidUDL" xml:space="preserve">
-    <value>無效的 UDL 檔案。</value>
-  </data>
-  <data name="ADP_InternalProviderError" xml:space="preserve">
-    <value>內部 .NET Framework Data Provider 錯誤 {0}。</value>
-  </data>
-  <data name="ADP_NoQuoteChange" xml:space="preserve">
-    <value>一旦 Insert、Update 或 Delete 等命令產生後，就無法變更 QuotePrefix 和 QuoteSuffix 屬性。</value>
-  </data>
-  <data name="ADP_MissingSourceCommand" xml:space="preserve">
-    <value>必須初始化 DataAdapter.SelectCommand 屬性。</value>
-  </data>
-  <data name="ADP_MissingSourceCommandConnection" xml:space="preserve">
-    <value>必須初始化 DataAdapter.SelectCommand.Connection 屬性;</value>
-  </data>
-  <data name="ADP_InvalidMultipartName" xml:space="preserve">
-    <value>{0} "{1}"。</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameQuoteUsage" xml:space="preserve">
-    <value>{0} "{1}"，引號的用法不正確。</value>
-  </data>
-  <data name="ADP_InvalidMultipartNameToManyParts" xml:space="preserve">
-    <value>{0} "{1}"，"{2}" 目前的限制不足。</value>
-  </data>
-  <data name="SQL_BulkCopyDestinationTableName" xml:space="preserve">
-    <value>SqlBulkCopy.WriteToServer 已經失敗，因為 SqlBulkCopy.DestinationTableName 是無效的多部名稱</value>
-  </data>
-  <data name="SQL_TDSParserTableName" xml:space="preserve">
-    <value>由於某個無效的多部名稱，故無法處理來自 SQL Server 的結果</value>
-  </data>
-  <data name="SQL_UDTTypeName" xml:space="preserve">
-    <value>SqlParameter.UdtTypeName 是無效的多部名稱</value>
-  </data>
-  <data name="SQL_TypeName" xml:space="preserve">
-    <value>SqlParameter.TypeName 是無效的多部名稱</value>
-  </data>
-  <data name="SQL_SqlCommandCommandText" xml:space="preserve">
-    <value>SqlCommand.DeriveParameters 已失敗，因為 SqlCommand.CommandText 屬性值為無效的多部名稱。</value>
-  </data>
-  <data name="ODBC_ODBCCommandText" xml:space="preserve">
-    <value>OdbcCommandBuilder.DeriveParameters 已失敗，因為 OdbcCommand.CommandText 屬性值為無效的多部名稱。</value>
-  </data>
-  <data name="OLEDB_OLEDBCommandText" xml:space="preserve">
-    <value>OleDbCommandBuilder.DeriveParameters 已失敗，因為 OleDbCommandBuilder.CommandText 屬性值為無效的多部名稱。</value>
-  </data>
-  <data name="SQLMSF_FailoverPartnerNotSupported" xml:space="preserve">
-    <value>不支援使用 MultiSubnetFailover 連接選項連接到鏡像的 SQL Server 執行個體。</value>
-  </data>
-  <data name="ADP_ColumnSchemaExpression" xml:space="preserve">
-    <value>由於 DataColumn '{1}' 是一個計算資料行，所以無法從 SourceColumn '{0}' 進行資料行對應。</value>
-  </data>
-  <data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
-    <value>{1} 的 SourceColumn '{0}' 與 {3} 的 DataColumn '{2}' 之間發生不可轉換類型不符的問題。</value>
-  </data>
-  <data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
-    <value>在 DataTable '{1}' 中遺漏 SourceColumn '{2}' 的 DataColumn '{0}'。</value>
-  </data>
-  <data name="ADP_InvalidSourceColumn" xml:space="preserve">
-    <value>SourceColumn 必須是非空白字串。</value>
-  </data>
-  <data name="ADP_MissingColumnMapping" xml:space="preserve">
-    <value>遺漏 '{0}' 的 SourceColumn 對應。</value>
-  </data>
-  <data name="ADP_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>{2} 方法不支援 {0} 的列舉值 {1}。</value>
-  </data>
-  <data name="ODBC_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>.NET Framework Odbc Data Provider 不支援 {0} 列舉值 {1}。</value>
-  </data>
-  <data name="OLEDB_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>.Net Framework OleDb Data Provider 不支援 {0} 列舉值 {1}。</value>
-  </data>
-  <data name="SQL_NotSupportedEnumerationValue" xml:space="preserve">
-    <value>.NET Framework SqlClient Data Provider 不支援 {0} 列舉值 {1}。</value>
-  </data>
-  <data name="ADP_ComputerNameEx" xml:space="preserve">
-    <value>無法擷取 ComputerNameDnsFullyQualified，{0}。</value>
-  </data>
-  <data name="ADP_MissingTableSchema" xml:space="preserve">
-    <value>遺漏 '{1}' SourceTable 的 '{0}' DataTable。</value>
-  </data>
-  <data name="ADP_InvalidSourceTable" xml:space="preserve">
-    <value>SourceTable 必須為非空白字串</value>
-  </data>
-  <data name="ADP_MissingTableMapping" xml:space="preserve">
-    <value>遺漏 SourceTable 對應: '{0}'</value>
-  </data>
-  <data name="ADP_CommandTextRequired" xml:space="preserve">
-    <value>{0}: CommandText 屬性尚未初始化</value>
-  </data>
-  <data name="ADP_ConnectionRequired" xml:space="preserve">
-    <value>{0}: Connection 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired" xml:space="preserve">
-    <value>{0} 必須有開啟與可用的 Connection。{1}</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Fill" xml:space="preserve">
-    <value>Fill: SelectCommand.Connection 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillPage" xml:space="preserve">
-    <value>FillPage: SelectCommand.Connection 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_FillSchema" xml:space="preserve">
-    <value>FillSchema: SelectCommand.Connection 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Insert" xml:space="preserve">
-    <value>更新需要具有連接物件的 InsertCommand。InsertCommand 的 Connection 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Update" xml:space="preserve">
-    <value>更新需要具有連接物件的 UpdateCommand。UpdateCommand 的 Connection 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Delete" xml:space="preserve">
-    <value>更新需要具有連接物件的 DeleteCommand。DeleteCommand 的 Connection 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Batch" xml:space="preserve">
-    <value>更新需要連接物件。Connection 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_Clone" xml:space="preserve">
-    <value>更新需要具有連接物件的命令複製。命令複製的 Connection 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_ConnectionRequired_UpdateRows" xml:space="preserve">
-    <value>更新需要連線。</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Insert" xml:space="preserve">
-    <value>Update 需要具有開啟的連接物件的 {0}Command。{1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Update" xml:space="preserve">
-    <value>Update 需要具有開啟的連接物件的 {0}Command。{1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Delete" xml:space="preserve">
-    <value>Update 需要具有開啟的連接物件的 {0}Command。{1}</value>
-  </data>
-  <data name="ADP_OpenConnectionRequired_Clone" xml:space="preserve">
-    <value>Update 需要具有開啟的連接物件的更新命令。{1}</value>
-  </data>
-  <data name="ADP_NoStoredProcedureExists" xml:space="preserve">
-    <value>預存程序 '{0}' 不存在。</value>
-  </data>
-  <data name="ADP_TransactionCompleted" xml:space="preserve">
-    <value>指派給這個命令的交易必須是最內層的暫止本機交易。</value>
-  </data>
-  <data name="ADP_TransactionConnectionMismatch" xml:space="preserve">
-    <value>交易可能與目前連接無關，或是已完成。</value>
-  </data>
-  <data name="ADP_TransactionCompletedButNotDisposed" xml:space="preserve">
-    <value>與目前連接關聯的交易已完成，但尚未處置。必須先處置交易，才能使用連接來執行 SQL 陳述式。</value>
-  </data>
-  <data name="ADP_TransactionRequired" xml:space="preserve">
-    <value>當指定給命令的連接為擱置的本機交易時，{0} 需要連接以交易。命令的 Transaction 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_OpenResultSetExists" xml:space="preserve">
-    <value>已經開啟一個與這個命令相關的 SqlResultSet，必須先將它關閉。</value>
-  </data>
-  <data name="ADP_OpenReaderExists" xml:space="preserve">
-    <value>已經開啟與這個 {0} 建立關聯的 DataReader，必須先將它關閉。</value>
-  </data>
-  <data name="ADP_DeriveParametersNotSupported" xml:space="preserve">
-    <value>{0} DeriveParameters 只支援 CommandType.StoredProcedure，不支援 CommandType.{1}。</value>
-  </data>
-  <data name="ADP_CalledTwice" xml:space="preserve">
-    <value>執行同樣的動作時，僅可呼叫方法 '{0}' 一次。</value>
-  </data>
-  <data name="ADP_IncorrectAsyncResult" xml:space="preserve">
-    <value>不正確的非同步結果。</value>
-  </data>
-  <data name="ADP_MissingSelectCommand" xml:space="preserve">
-    <value>呼叫 '{0}' 之前，SelectCommand 屬性尚未初始化。</value>
-  </data>
-  <data name="ADP_UnwantedStatementType" xml:space="preserve">
-    <value>此處不應出現 StatementType {0}。</value>
-  </data>
-  <data name="ADP_FillSchemaRequiresSourceTableName" xml:space="preserve">
-    <value>FillSchema: SourceTable 名稱必須是非空白的字串。</value>
-  </data>
-  <data name="ADP_InvalidMaxRecords" xml:space="preserve">
-    <value>{0} 的 MaxRecords 值無效。值必須 &gt;= 0。</value>
-  </data>
-  <data name="ADP_InvalidStartRecord" xml:space="preserve">
-    <value>{0} 的 StartRecord 值無效。值必須是 &gt;= 0。</value>
-  </data>
-  <data name="ADP_FillRequiresSourceTableName" xml:space="preserve">
-    <value>Fill: SourceTable 名稱必須是非空白的字串。</value>
-  </data>
-  <data name="ADP_FillChapterAutoIncrement" xml:space="preserve">
-    <value>階層式章節資料行必須對應至 AutoIncrement DataColumn。</value>
-  </data>
-  <data name="ADP_MissingDataReaderFieldType" xml:space="preserve">
-    <value>DataReader.GetFieldType({0}) 已傳回 null。</value>
-  </data>
-  <data name="ADP_OnlyOneTableForStartRecordOrMaxRecords" xml:space="preserve">
-    <value>當使用 startRecords 或 maxRecords 的非零值時，僅指定 dataTables 陣列中的一個項目。</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTable" xml:space="preserve">
-    <value>Update 找不到 TableMapping['{0}'] 或 DataTable '{0}'。</value>
-  </data>
-  <data name="ADP_UpdateRequiresSourceTableName" xml:space="preserve">
-    <value>Update: 必須是非空白的 SourceTable 名稱。</value>
-  </data>
-  <data name="ADP_MissingTableMappingDestination" xml:space="preserve">
-    <value>當 TableMapping.DataSetTable='{0}' 時，遺漏 TableMapping。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandClone" xml:space="preserve">
-    <value>Update 需要有效的命令複製。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandSelect" xml:space="preserve">
-    <value>Update 自動 SQL 產生時需要有效的 SelectCommand。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandInsert" xml:space="preserve">
-    <value>當傳遞擁有新資料列的 DataRow 集合時，Update 需要有效的 InsertCommand。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandUpdate" xml:space="preserve">
-    <value>當傳遞擁有已修改資料列的 DataRow 集合時，更新需要有效的 UpdateCommand。</value>
-  </data>
-  <data name="ADP_UpdateRequiresCommandDelete" xml:space="preserve">
-    <value>當傳遞擁有已刪除資料列的 DataRow 集合時，Update 需要有效的 DeleteCommand。</value>
-  </data>
-  <data name="ADP_UpdateMismatchRowTable" xml:space="preserve">
-    <value>DataRow[{0}] 是從除了 DataRow[0] 以外的其他 DataTable 取得。</value>
-  </data>
-  <data name="ADP_RowUpdatedErrors" xml:space="preserve">
-    <value>RowUpdatedEvent: 已經發生錯誤。沒有其他可用的資訊。</value>
-  </data>
-  <data name="ADP_RowUpdatingErrors" xml:space="preserve">
-    <value>RowUpdatingEvent: 已經發生錯誤。沒有其他可用的資訊。</value>
-  </data>
-  <data name="ADP_ResultsNotAllowedDuringBatch" xml:space="preserve">
-    <value>當批次作業時，命令的 UpdateRowSource.FirstReturnedRecord 或 UpdateRowSource.Both 的 UpdatedRowSource 屬性值無效。</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Update" xml:space="preserve">
-    <value>並行違規: UpdateCommand 已經影響必須是 {1} 記錄的 {0}。</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Delete" xml:space="preserve">
-    <value>並行違規: DeleteCommand 已經影響必須是 {1} 記錄的 {0}。</value>
-  </data>
-  <data name="ADP_UpdateConcurrencyViolation_Batch" xml:space="preserve">
-    <value>並行違規: 批次作業的命令已經影響必須是 {1} 記錄的 {0}。</value>
+  <data name="ADP_CalledTwice" xml:space="preserve">
+    <value>執行同樣的動作時，僅可呼叫方法 '{0}' 一次。</value>
   </data>
   <data name="ADP_InvalidCommandTimeout" xml:space="preserve">
     <value>無效的 CommandTimeout 值 {0}。值必須是 &gt;= 0。</value>
   </data>
-  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
-    <value>{1}[{0}]: Size 屬性的大小 0 無效。</value>
-  </data>
-  <data name="ADP_PrepareParameterType" xml:space="preserve">
-    <value>{0}.Prepare 方法需要所有的參數都明確地設定型別。</value>
-  </data>
-  <data name="ADP_PrepareParameterSize" xml:space="preserve">
-    <value>{0}.Prepare 方法需要所有的可變長度參數明確設定為非零的 Size。</value>
-  </data>
-  <data name="ADP_PrepareParameterScale" xml:space="preserve">
-    <value>{0}.Prepare 方法必須使用型別為 '{1}' 且已明確設定 Precision 和 Scale 的參數。</value>
-  </data>
-  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
-    <value>不相符的 asyncResult 結束方法呼叫。必須要呼叫 {0} 卻呼叫 {1}。</value>
-  </data>
-  <data name="ADP_ClosedConnectionError" xml:space="preserve">
-    <value>作業無效。已經關閉連接。</value>
-  </data>
-  <data name="ADP_ConnectionIsDisabled" xml:space="preserve">
-    <value>連接已停用。</value>
-  </data>
-  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
-    <value>無法在交易中登記，因為本機交易正在連線上進行。請完成本機交易然後再試一次。</value>
-  </data>
-  <data name="ADP_TransactionPresent" xml:space="preserve">
-    <value>目前的連接中已有編列的交易。請完成目前的交易並重試。</value>
-  </data>
-  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
-    <value>資料庫不能是 Null、空字串或只有空白字元的字串。</value>
-  </data>
-  <data name="ADP_DatabaseNameTooLong" xml:space="preserve">
-    <value>引數太長。</value>
-  </data>
-  <data name="ADP_InvalidConnectTimeoutValue" xml:space="preserve">
-    <value>無效的 'Connect Timeout' 值，這個值必須是 &gt;= 0 的整數。</value>
-  </data>
-  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
-    <value>無效的來源緩衝區 ({0} 的大小) 位移: {1}</value>
-  </data>
-  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
-    <value>無效的目的緩衝區 ({0} 的大小) 位移: {1}</value>
-  </data>
-  <data name="ADP_NumericToDecimalOverflow" xml:space="preserve">
-    <value>數值太大，超過 96 位元小數。</value>
-  </data>
-  <data name="ADP_StreamClosed" xml:space="preserve">
-    <value>當資料流關閉時嘗試 {0} 無效。</value>
-  </data>
-  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
-    <value>指定的 SeekOrigin 值無效。</value>
-  </data>
-  <data name="ADP_DynamicSQLJoinUnsupported" xml:space="preserve">
-    <value>多個基底資料表不支援動態 SQL 產生。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoTableInfo" xml:space="preserve">
-    <value>沒有傳回任何基底資料表資訊的 SelectCommand 不支援動態 SQL 產生。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoDelete" xml:space="preserve">
-    <value>不會傳回任何重要資料行資訊的 SelectCommand 不支援 DeleteCommand 動態 SQL 的產生。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoUpdate" xml:space="preserve">
-    <value>不會傳回任何重要資料行資訊的 SelectCommand 不支援 UpdateCommand 動態 SQL 的產生。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionDelete" xml:space="preserve">
-    <value>當 SelectCommand 不包含資料列版本資料行時，DeleteCommand 的動態 SQL 產生便不受支援。</value>
-  </data>
-  <data name="ADP_DynamicSQLNoKeyInfoRowVersionUpdate" xml:space="preserve">
-    <value>當 SelectCommand 不包含資料列版本資料行時，UpdateCommand 的動態 SQL 產生便不受支援。</value>
-  </data>
-  <data name="ADP_DynamicSQLNestedQuote" xml:space="preserve">
-    <value>內含 QuotePrefix 或 QuoteSuffix 字元 '{1}' 的資料表名稱 '{0}' 不支援動態 SQL 的產生。</value>
-  </data>
-  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
-    <value>嘗試讀取資料行序數 '{0}' 無效。使用 CommandBehavior.SequentialAccess 時，您只能讀取大於或等於資料行序數 '{1}' 的值。</value>
-  </data>
-  <data name="ADP_InvalidDateTimeDigits" xml:space="preserve">
-    <value>資料型別 '{0}' 無法組成為文字，因為包含無效的日期時間數字。</value>
-  </data>
-  <data name="ADP_InvalidFormatValue" xml:space="preserve">
-    <value>值無法組成必要型別的文字。</value>
-  </data>
-  <data name="ADP_InvalidMaximumScale" xml:space="preserve">
-    <value>資料型別 '{0}' 無法組成文字，因為包含無效的小數位數上限。</value>
-  </data>
-  <data name="ADP_LiteralValueIsInvalid" xml:space="preserve">
-    <value>提供的文字值不是資料型別 '{0}' 的有效文字。</value>
-  </data>
-  <data name="ADP_EvenLengthLiteralValue" xml:space="preserve">
-    <value>'{0}':文字值的長度必須均等。</value>
-  </data>
-  <data name="ADP_HexDigitLiteralValue" xml:space="preserve">
-    <value>'{0}':文字值必須是十六進位的字串。</value>
-  </data>
-  <data name="ADP_QuotePrefixNotSet" xml:space="preserve">
-    <value>當尚未設定引號前置詞時，{0} 需要開啟的連接。</value>
-  </data>
-  <data name="ADP_UnableToCreateBooleanLiteral" xml:space="preserve">
-    <value>無法判斷正確的 Boolean 文字值。無法建立 Boolean 文字。</value>
-  </data>
-  <data name="ADP_UnsupportedNativeDataTypeOleDb" xml:space="preserve">
-    <value>不支援與資料型別 '{0}' 相關聯的原始資料型別。</value>
-  </data>
-  <data name="ADP_InvalidDataType" xml:space="preserve">
-    <value>{0} 的參數資料型別無效。</value>
-  </data>
-  <data name="ADP_UnknownDataType" xml:space="preserve">
-    <value>物件型別 {0} 與已知的管理提供者原始型別之間並無對應。</value>
-  </data>
-  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
-    <value>無法處理類型 {1} 所傳回的未知 TypeCode {0}。</value>
-  </data>
-  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
-    <value>DbType {0} 與已知的 {1} 之間並無對應。</value>
-  </data>
-  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
-    <value>使用中的 SQL Server 版本不支援資料型別 '{0}'。</value>
-  </data>
-  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
-    <value>參數值 '{0}' 超出範圍。</value>
-  </data>
-  <data name="ADP_BadParameterName" xml:space="preserve">
-    <value>指定的參數名稱 '{0}' 無效。</value>
-  </data>
-  <data name="ADP_MultipleReturnValue" xml:space="preserve">
-    <value>不支援多次傳回值參數。</value>
-  </data>
-  <data name="ADP_InvalidSizeValue" xml:space="preserve">
-    <value>參數 Size 的值 '{0}' 無效，該值必須大於或等於 0。</value>
-  </data>
-  <data name="ADP_NegativeParameter" xml:space="preserve">
-    <value>引數 '{0}' 的無效值。值必須大或等於 0。</value>
-  </data>
-  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
-    <value>此中繼資料的無效值。</value>
-  </data>
-  <data name="ADP_NotRowType" xml:space="preserve">
-    <value>中繼資料必須是 SqlDbType.Row</value>
-  </data>
-  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
-    <value>將參數值從 {0} 轉換成 {1} 失敗。</value>
-  </data>
-  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
-    <value>{0} 不支援平行交易處理。</value>
-  </data>
-  <data name="ADP_TransactionZombied" xml:space="preserve">
-    <value>這個 {0} 已經完成，它已不再是個可使用的項目。</value>
-  </data>
-  <data name="ADP_DbRecordReadOnly" xml:space="preserve">
-    <value>當記錄為唯讀時無法呼叫 '{0}'。</value>
-  </data>
-  <data name="ADP_DbDataUpdatableRecordReadOnly" xml:space="preserve">
-    <value>當 DbDataRecord 為唯讀時無法呼叫 '{0}'。</value>
-  </data>
-  <data name="ADP_InvalidImplicitConversion" xml:space="preserve">
-    <value>不支援將物件型別 '{0}' 隱含轉換成資料型別 '{1}'。</value>
-  </data>
-  <data name="ADP_InvalidBufferSizeOrIndex" xml:space="preserve">
-    <value>緩衝區位移 '{1}' 加上可用位元組 '{0}'，大於傳入之緩衝區的長度。</value>
-  </data>
-  <data name="ADP_InvalidDataLength" xml:space="preserve">
-    <value>資料長度 '{0}' 小於 0。</value>
-  </data>
-  <data name="ADP_InvalidDataLength2" xml:space="preserve">
-    <value>指定的長度 '{0}' 超出範圍。</value>
-  </data>
-  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
-    <value>在 dataIndex '{0}' 上無效的 {2} 嘗試。使用 CommandBehavior.SequentialAccess 時，您只能讀取大於或等於 dataIndex '{1}' 的值。</value>
-  </data>
-  <data name="ADP_OffsetOutOfRangeException" xml:space="preserve">
-    <value>位移必須參考值內的位置。</value>
-  </data>
-  <data name="ODBC_GetSchemaRestrictionRequired" xml:space="preserve">
-    <value>"The ODBC 管理提供者要求指定 TABLE_NAME 限制，且 GetSchema 索引集合為非空值。</value>
-  </data>
-  <data name="ADP_InvalidArgumentValue" xml:space="preserve">
-    <value>無效的方法 '{0}' 引數值。</value>
-  </data>
-  <data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
-    <value>ODBC 提供者未從 SQLGETTYPEINFO 傳回結果。</value>
-  </data>
-  <data name="ADP_NullDataTable" xml:space="preserve">
-    <value>未預期的 null DataTable 引數</value>
-  </data>
-  <data name="ADP_NullDataSet" xml:space="preserve">
-    <value>未預期的 null DataSet 引數。</value>
-  </data>
-  <data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
-    <value>連接字串超過允許的最大長度 {0}。</value>
-  </data>
-  <data name="Odbc_GetTypeMapping_UnknownType" xml:space="preserve">
-    <value>{0} - 無法對應型別。</value>
-  </data>
-  <data name="Odbc_UnknownSQLType" xml:space="preserve">
-    <value>未知的 SQL 型別 - {0}。</value>
-  </data>
-  <data name="Odbc_UnknownURTType" xml:space="preserve">
-    <value>未知的 URT 型別 - {0}。</value>
-  </data>
-  <data name="Odbc_NegativeArgument" xml:space="preserve">
-    <value>無效的負引數!</value>
-  </data>
-  <data name="Odbc_CantSetPropertyOnOpenConnection" xml:space="preserve">
-    <value>無法在開啟的連接上設定屬性。</value>
-  </data>
-  <data name="Odbc_NoMappingForSqlTransactionLevel" xml:space="preserve">
-    <value>SQL_TRANSACTION '{0}' 對應至 System.Data.IsolationLevel 列舉值無效。</value>
-  </data>
-  <data name="Odbc_CantEnableConnectionpooling" xml:space="preserve">
-    <value>{0} - 無法啟用連接共用...</value>
-  </data>
-  <data name="Odbc_CantAllocateEnvironmentHandle" xml:space="preserve">
-    <value>{0} - 無法配置環境控制代碼。</value>
-  </data>
-  <data name="Odbc_FailedToGetDescriptorHandle" xml:space="preserve">
-    <value>{0} – 無法取得描述元控制。</value>
-  </data>
-  <data name="Odbc_NotInTransaction" xml:space="preserve">
-    <value>不在交易之中</value>
-  </data>
-  <data name="Odbc_UnknownOdbcType" xml:space="preserve">
-    <value>無效的 OdbcType 列舉值={0}。</value>
-  </data>
-  <data name="Odbc_NullData" xml:space="preserve">
-    <value>當必須要產生 DBNull.Value 資料時請使用 IsDBNull。</value>
-  </data>
-  <data name="Odbc_ExceptionMessage" xml:space="preserve">
-    <value>{0} [{1}] {2}</value>
-  </data>
-  <data name="Odbc_ExceptionNoInfoMsg" xml:space="preserve">
-    <value>{0} - 找不到可用的錯誤資訊</value>
-  </data>
-  <data name="Odbc_ConnectionClosed" xml:space="preserve">
-    <value>連接已關閉。</value>
-  </data>
-  <data name="Odbc_OpenConnectionNoOwner" xml:space="preserve">
-    <value>內部連接沒有擁有者。</value>
-  </data>
-  <data name="Odbc_MDACWrongVersion" xml:space="preserve">
-    <value>.NET Framework Odbc 資料提供者需要 Microsoft Data Access Components(MDAC) 2.6 版或更新版本。目前發現已安裝版本 {0}。</value>
-  </data>
-  <data name="OleDb_MDACWrongVersion" xml:space="preserve">
-    <value>.NET Framework OleDb Data Provider 需要 Microsoft Data Access Components(MDAC) 2.6 版或更新版本。目前發現已安裝版本 {0}。</value>
-  </data>
-  <data name="OleDb_SchemaRowsetsNotSupported" xml:space="preserve">
-    <value>'{1}' 提供者不支援 '{0}' 介面。目前的提供者無法使用 GetOleDbSchemaTable。</value>
-  </data>
-  <data name="OleDb_NoErrorInformation2" xml:space="preserve">
-    <value>'{0}' 失敗，沒有錯誤訊息，編碼: {1}。</value>
-  </data>
-  <data name="OleDb_NoErrorInformation" xml:space="preserve">
-    <value>沒有錯誤訊息，編碼: {0}。</value>
-  </data>
-  <data name="OleDb_MDACNotAvailable" xml:space="preserve">
-    <value>.NET Framework Data Providers 需要 Microsoft Data Access Components(MDAC)。請安裝 Microsoft Data Access Components(MDAC) 2.6 版或更新版本。</value>
-  </data>
-  <data name="OleDb_MSDASQLNotSupported" xml:space="preserve">
-    <value>.NET Framework Data Provider for OLEDB (System.Data.OleDb) 不支援 Microsoft OLE DB Provider for ODBC Drivers (MSDASQL)。請使用 .NET Framework Data Provider for ODBC (System.Data.Odbc)。</value>
-  </data>
-  <data name="OleDb_PossiblePromptNotUserInteractive" xml:space="preserve">
-    <value>.NET Framework Data Provider for OLEDB 不允許 OLE DB Provider 在非互動式環境中提示使用者。</value>
-  </data>
-  <data name="OleDb_ProviderUnavailable" xml:space="preserve">
-    <value>'{0}' 提供者並未登錄於本機電腦上。</value>
-  </data>
-  <data name="OleDb_CommandTextNotSupported" xml:space="preserve">
-    <value>'{0}' 提供者不支援使用 ICommandText 介面。請改用 CommandType.TableDirect。</value>
-  </data>
-  <data name="OleDb_TransactionsNotSupported" xml:space="preserve">
-    <value>'{0}' 提供者不支援 ITransactionLocal 介面。目前的提供者不提供本機的交易。</value>
-  </data>
-  <data name="OleDb_ConnectionStringSyntax" xml:space="preserve">
-    <value>初始化字串的格式和 OLE DB 規格不一致。從連接字串中 char[{0}] 附近開始。</value>
-  </data>
-  <data name="OleDb_AsynchronousNotSupported" xml:space="preserve">
-    <value>.NET Framework Data OLE DB Provider(System.Data.OleDb) 不支援 'Asynchronous Processing' 功能。</value>
-  </data>
-  <data name="OleDb_NoProviderSpecified" xml:space="preserve">
-    <value>ConnectionString 中未指定 OLE DB Provider。正確範例為 'Provider=SQLOLEDB;'。</value>
-  </data>
-  <data name="OleDb_InvalidProviderSpecified" xml:space="preserve">
-    <value>在 ConnectionString 中指定的OLE DB Provider (名稱) 太長。</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoKeywords" xml:space="preserve">
-    <value>DbInfoKeywords OleDbSchemaGuid 應該是沒有限制的。</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsDbInfoLiteral" xml:space="preserve">
-    <value>DbInfoLiterals OleDbSchemaGuid 應該是沒有限制的。</value>
-  </data>
-  <data name="OleDb_InvalidRestrictionsSchemaGuids" xml:space="preserve">
-    <value>結構描述 guid OleDbSchemaGuid 應該是沒有限制的。</value>
-  </data>
-  <data name="OleDb_NotSupportedSchemaTable" xml:space="preserve">
-    <value>'{1}' 提供者不支援使用 {0} OleDbSchemaGuid 結構描述。</value>
-  </data>
-  <data name="OleDb_ConfigWrongNumberOfValues" xml:space="preserve">
-    <value>'{0}' 組態設定的數值錯誤。</value>
-  </data>
-  <data name="OleDb_ConfigUnableToLoadXmlMetaDataFile" xml:space="preserve">
-    <value>無法載入指定於組態設定 '{0}' 中的 XML 檔案。</value>
-  </data>
-  <data name="OleDb_CommandParameterBadAccessor" xml:space="preserve">
-    <value>命令參數[{0}] '{1}' 無效。</value>
-  </data>
-  <data name="OleDb_CommandParameterCantConvertValue" xml:space="preserve">
-    <value>因為正負號不符合或資料溢位之外的原因，無法轉換命令參數[{0}]'{1}' 資料值。</value>
-  </data>
-  <data name="OleDb_CommandParameterSignMismatch" xml:space="preserve">
-    <value>命令參數[{0}] '{1}' 的轉換失敗，因為資料值為 signed，而提供者使用的型別為 unsigned。</value>
-  </data>
-  <data name="OleDb_CommandParameterDataOverflow" xml:space="preserve">
-    <value>命令參數[{0}] '{1}' 的轉換失敗，因為資料值溢位提供者使用的型別。</value>
-  </data>
-  <data name="OleDb_CommandParameterUnavailable" xml:space="preserve">
-    <value>當傳送命令參數[{0}] '{1}' 值和停止處理時，提供者發生錯誤。</value>
-  </data>
-  <data name="OleDb_CommandParameterDefault" xml:space="preserve">
-    <value>參數[{0}] '{1}' 沒有預設值。</value>
-  </data>
-  <data name="OleDb_CommandParameterError" xml:space="preserve">
-    <value>使用參數[{0}]: {1} 時發生錯誤。</value>
-  </data>
-  <data name="OleDb_BadStatus_ParamAcc" xml:space="preserve">
-    <value>Microsoft.Data.OleDb.OleDbDataAdapter 內部錯誤: 參數存取子無效: {0} {1}。</value>
-  </data>
-  <data name="OleDb_UninitializedParameters" xml:space="preserve">
-    <value>Parameter[{0}]: OleDbType 屬性未初始化: OleDbType.{1}。</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForParameters" xml:space="preserve">
-    <value>'{0}' 提供者不支援使用 ICommandWithParameters 介面。目前的提供者並不支援這些命令參數。</value>
-  </data>
-  <data name="OleDb_NoProviderSupportForSProcResetParameters" xml:space="preserve">
-    <value>'{0}' 提供者不支援擷取程序的參數資訊。</value>
-  </data>
-  <data name="OleDb_CanNotDetermineDecimalSeparator" xml:space="preserve">
-    <value>無法判斷伺服器的小數位數分隔符號。無法建立非整數的數字。</value>
-  </data>
-  <data name="OleDb_Fill_NotADODB" xml:space="preserve">
-    <value>該物件不是一個 ADODB.RecordSet 或 ADODB.Record。</value>
-  </data>
-  <data name="OleDb_Fill_EmptyRecordSet" xml:space="preserve">
-    <value>無法擷取 ADODB.RecordSet 物件中的 '{0}' 介面。</value>
+  <data name="ADP_UninitializedParameterSize" xml:space="preserve">
+    <value>{1}[{0}]: Size 屬性的大小 0 無效。</value>
   </data>
-  <data name="OleDb_Fill_EmptyRecord" xml:space="preserve">
-    <value>無法擷取 ADODB.Record 物件中的 IRow 介面。</value>
+  <data name="ADP_PrepareParameterType" xml:space="preserve">
+    <value>{0}.Prepare 方法需要所有的參數都明確地設定型別。</value>
   </data>
-  <data name="OleDb_ISourcesRowsetNotSupported" xml:space="preserve">
-    <value>型別不支援 OLE DB 介面 ISourcesRowset</value>
+  <data name="ADP_PrepareParameterSize" xml:space="preserve">
+    <value>{0}.Prepare 方法需要所有的可變長度參數明確設定為非零的 Size。</value>
   </data>
-  <data name="OleDb_IDBInfoNotSupported" xml:space="preserve">
-    <value>無法建立 ReservedWords 結構描述集合，因為提供者不支援 IDBInfo。</value>
+  <data name="ADP_PrepareParameterScale" xml:space="preserve">
+    <value>{0}.Prepare 方法必須使用型別為 '{1}' 且已明確設定 Precision 和 Scale 的參數。</value>
   </data>
-  <data name="OleDb_PropertyNotSupported" xml:space="preserve">
-    <value>未設定屬性值，因為提供者不支援 '{0}' 屬性，或消費者嘗試取得或設定的屬性值不在初始化屬性群組中，且資料來源物件未初始化。</value>
+  <data name="ADP_MismatchedAsyncResult" xml:space="preserve">
+    <value>不相符的 asyncResult 結束方法呼叫。必須要呼叫 {0} 卻呼叫 {1}。</value>
   </data>
-  <data name="OleDb_PropertyBadValue" xml:space="preserve">
-    <value>初始化 '{0}' 屬性失敗，理由為下列其中之一:
-	值資料型別並非屬性的資料型別或並非空值。例如，資料型別為 Int32 的 DBPROP_MEMORYUSAGE 屬性，但資料型別卻為 Int64。
-	值為無效值。例如，屬性為 DBPROP_MEMORYUSAGE 且值為負數。
-	值為屬性的有效值，且提供者支援可設定的屬性，但卻不支援指定的值。例如，在寫入提供者後才新增至 OLE DB 屬性的值。</value>
+  <data name="ADP_ClosedConnectionError" xml:space="preserve">
+    <value>作業無效。已經關閉連接。</value>
   </data>
-  <data name="OleDb_PropertyBadOption" xml:space="preserve">
-    <value>Options 值無效。</value>
+  <data name="ADP_LocalTransactionPresent" xml:space="preserve">
+    <value>無法在交易中登記，因為本機交易正在連線上進行。請完成本機交易然後再試一次。</value>
   </data>
-  <data name="OleDb_PropertyBadColumn" xml:space="preserve">
-    <value>ColumnID 元素無效。</value>
+  <data name="ADP_TransactionPresent" xml:space="preserve">
+    <value>目前的連接中已有編列的交易。請完成目前的交易並重試。</value>
   </data>
-  <data name="OleDb_PropertyNotAllSettable" xml:space="preserve">
-    <value>指定 '{0}' 屬性套用於所有資料行，但無法套用至一或多個資料行。</value>
+  <data name="ADP_EmptyDatabaseName" xml:space="preserve">
+    <value>資料庫不能是 Null、空字串或只有空白字元的字串。</value>
   </data>
-  <data name="OleDb_PropertyNotSettable" xml:space="preserve">
-    <value>'{0}' 屬性是唯讀的，或消費者在已初始化資料來源物件後，才嘗試在初始化屬性群組中設定屬性值。消費者可以將唯讀屬性的值設定為目前的值。若無法在特定的資料行中設定可設定的資料行屬性，也可以傳回此狀態。</value>
+  <data name="ADP_InvalidSourceBufferIndex" xml:space="preserve">
+    <value>無效的來源緩衝區 ({0} 的大小) 位移: {1}</value>
   </data>
-  <data name="OleDb_PropertyNotSet" xml:space="preserve">
-    <value>選用的 '{0}' 屬性值未設定為指定值，且不可能設定屬性為指定值。</value>
+  <data name="ADP_InvalidDestinationBufferIndex" xml:space="preserve">
+    <value>無效的目的緩衝區 ({0} 的大小) 位移: {1}</value>
   </data>
-  <data name="OleDb_PropertyConflicting" xml:space="preserve">
-    <value>未設定 '{0}' 屬性值，因為這樣做會與已存的屬性衝突。</value>
+  <data name="ADP_StreamClosed" xml:space="preserve">
+    <value>當資料流關閉時嘗試 {0} 無效。</value>
   </data>
-  <data name="OleDb_PropertyNotAvailable" xml:space="preserve">
-    <value>(已保留)。</value>
+  <data name="ADP_InvalidSeekOrigin" xml:space="preserve">
+    <value>指定的 SeekOrigin 值無效。</value>
   </data>
-  <data name="OleDb_PropertyStatusUnknown" xml:space="preserve">
-    <value>提供者傳回未知的 DBPROPSTATUS_ value '{0}'。</value>
+  <data name="ADP_NonSequentialColumnAccess" xml:space="preserve">
+    <value>嘗試讀取資料行序數 '{0}' 無效。使用 CommandBehavior.SequentialAccess 時，您只能讀取大於或等於資料行序數 '{1}' 的值。</value>
   </data>
-  <data name="OleDb_BadAccessor" xml:space="preserve">
-    <value>當方法傳回資料時，已經延遲且執行存取子驗證。對這個資料行或參數的繫結無效。</value>
+  <data name="ADP_InvalidDataType" xml:space="preserve">
+    <value>{0} 的參數資料型別無效。</value>
   </data>
-  <data name="OleDb_BadStatusRowAccessor" xml:space="preserve">
-    <value>OleDbDataAdapter 內部錯誤: 無效的資料列集存取子: Ordinal={0} Status={1}。</value>
+  <data name="ADP_UnknownDataType" xml:space="preserve">
+    <value>物件型別 {0} 與已知的管理提供者原始型別之間並無對應。</value>
   </data>
-  <data name="OleDb_CantConvertValue" xml:space="preserve">
-    <value>因為發生非正負號不符或資料溢位的原因，資料值無法轉換。例如，資料於資料儲存中已經損毀但資料列仍可擷取。</value>
+  <data name="ADP_UnknownDataTypeCode" xml:space="preserve">
+    <value>無法處理類型 {1} 所傳回的未知 TypeCode {0}。</value>
   </data>
-  <data name="OleDb_CantCreate" xml:space="preserve">
-    <value>提供者無法配置傳回 {0} 資料的記憶體。</value>
+  <data name="ADP_DbTypeNotSupported" xml:space="preserve">
+    <value>DbType {0} 與已知的 {1} 之間並無對應。</value>
   </data>
-  <data name="OleDb_DataOverflow" xml:space="preserve">
-    <value>轉換失敗，因為 {0} 資料值溢位消費者緩衝區中 {0} 數值部分的指定型別。</value>
+  <data name="ADP_VersionDoesNotSupportDataType" xml:space="preserve">
+    <value>使用中的 SQL Server 版本不支援資料型別 '{0}'。</value>
   </data>
-  <data name="OleDb_GVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter 內部錯誤: [get] 未知的 OLE DB 資料型別: 0x{0} ({1})。</value>
+  <data name="ADP_ParameterValueOutOfRange" xml:space="preserve">
+    <value>參數值 '{0}' 超出範圍。</value>
   </data>
-  <data name="OleDb_SignMismatch" xml:space="preserve">
-    <value>轉換失敗，因為 {0} 資料值為 signed，而消費者緩衝區中 {0} 數值部分的指定型別為 unsigned。</value>
+  <data name="ADP_BadParameterName" xml:space="preserve">
+    <value>指定的參數名稱 '{0}' 無效。</value>
   </data>
-  <data name="OleDb_SVtUnknown" xml:space="preserve">
-    <value>OleDbDataAdapter 內部錯誤: [set] 未知的 OLE DB 資料型別: 0x{0} ({1})。</value>
+  <data name="ADP_InvalidSizeValue" xml:space="preserve">
+    <value>參數 Size 的值 '{0}' 無效，該值必須大於或等於 0。</value>
   </data>
-  <data name="OleDb_Unavailable" xml:space="preserve">
-    <value>提供者無法決定 {0} 值。例如，剛建立資料列，{0} 資料行的預設值無法使用，而消費者尚未設定新 {0} 值。</value>
+  <data name="ADP_NegativeParameter" xml:space="preserve">
+    <value>引數 '{0}' 的無效值。值必須大或等於 0。</value>
   </data>
-  <data name="OleDb_UnexpectedStatusValue" xml:space="preserve">
-    <value>OLE DB Provider 傳回 {0} 的未預期狀態值。</value>
+  <data name="ADP_InvalidMetaDataValue" xml:space="preserve">
+    <value>此中繼資料的無效值。</value>
   </data>
-  <data name="OleDb_ThreadApartmentState" xml:space="preserve">
-    <value>如果執行緒的 ApartmentState 不是 ApartmentState.MTA，OleDbDataReader.Read 必須在建立其本身的執行緒上使用。</value>
+  <data name="ADP_ParameterConversionFailed" xml:space="preserve">
+    <value>將參數值從 {0} 轉換成 {1} 失敗。</value>
   </data>
-  <data name="OleDb_NoErrorMessage" xml:space="preserve">
-    <value>未指定的錯誤: {0}</value>
+  <data name="ADP_ParallelTransactionsNotSupported" xml:space="preserve">
+    <value>{0} 不支援平行交易處理。</value>
   </data>
-  <data name="OleDb_FailedGetDescription" xml:space="preserve">
-    <value>IErrorInfo.GetDescription 因為 {0} 而失敗。</value>
+  <data name="ADP_TransactionZombied" xml:space="preserve">
+    <value>這個 {0} 已經完成，它已不再是個可使用的項目。</value>
   </data>
-  <data name="OleDb_FailedGetSource" xml:space="preserve">
-    <value>IErrorInfo.GetSource 因為 {0} 而失敗。</value>
+  <data name="ADP_InvalidDataLength2" xml:space="preserve">
+    <value>指定的長度 '{0}' 超出範圍。</value>
   </data>
-  <data name="OleDb_DBBindingGetVector" xml:space="preserve">
-    <value>.NET Framework Data OLE DB Provider(System.Data.OleDb) 不支援 DBTYPE_VECTOR 資料。</value>
+  <data name="ADP_NonSeqByteAccess" xml:space="preserve">
+    <value>在 dataIndex '{0}' 上無效的 {2} 嘗試。使用 CommandBehavior.SequentialAccess 時，您只能讀取大於或等於 dataIndex '{1}' 的值。</value>
   </data>
   <data name="ADP_InvalidMinMaxPoolSizeValues" xml:space="preserve">
     <value>無效的最小或最大共用區大小值，共用區最小值不可以大於共用區最大值。</value>
   </data>
-  <data name="ADP_ObsoleteKeyword" xml:space="preserve">
-    <value>'{0}' 關鍵字已過時。請改用 '{1}'。</value>
-  </data>
   <data name="SQL_CannotGetDTCAddress" xml:space="preserve">
     <value>無法自伺服器取得其分散式交易協調器的位址。伺服器上的 DTC 是否已經啟用?</value>
   </data>
-  <data name="SQL_InvalidOptionLength" xml:space="preserve">
-    <value>連接參數 &lt;{0}&gt; 的長度值超過所允許 65535 個字元的最大值。</value>
-  </data>
   <data name="SQL_InvalidPacketSizeValue" xml:space="preserve">
     <value>無效的 'Packet Size' 值。這個值必須是 &gt;= 512 且 &lt;= 32768 的整數。</value>
   </data>
   <data name="SQL_NullEmptyTransactionName" xml:space="preserve">
     <value>交易中儲存點的無效交易或無效名稱。</value>
   </data>
-  <data name="SQL_SnapshotNotSupported" xml:space="preserve">
-    <value>SQL Server 7.0 或 SQL Server 2000 不支援 {0} 的列舉值 {1}。</value>
-  </data>
   <data name="SQL_UserInstanceFailoverNotCompatible" xml:space="preserve">
     <value>User Instance 和 Failover 為不相容的選項。請在此連接字串中只選擇其中一個。</value>
   </data>
@@ -2499,33 +540,21 @@
   <data name="SQL_SettingCredentialWithIntegrated" xml:space="preserve">
     <value>如果連接字串中已指定 'Authentication=Active Directory Integrated'，則無法設定 Credential 屬性。</value>
   </data>
-  <data name="SQL_Certificate" xml:space="preserve">
-    <value>使用憑證驗證指定的驗證參數不正確。</value>
-  </data>
   <data name="SQL_EncryptionNotSupportedByClient" xml:space="preserve">
     <value>您嘗試連接的 SQL Server 執行個體需要加密，但此電腦不支援。</value>
   </data>
   <data name="SQL_EncryptionNotSupportedByServer" xml:space="preserve">
     <value>您嘗試連接的 SQL Server 執行個體不支援加密。</value>
   </data>
-  <data name="SQL_CTAIPNotSupportedByServer" xml:space="preserve">
-    <value>您嘗試連線的目標 SQL Server 執行個體不支援 CTAIP。</value>
-  </data>
   <data name="SQL_InvalidSQLServerVersionUnknown" xml:space="preserve">
     <value>不支援的 SQL Server 版本。.NET Framework SqlClient Data Provider 僅可搭配 SQL Server 7.0 版及更新版本使用。</value>
   </data>
   <data name="SQL_CannotModifyPropertyAsyncOperationInProgress" xml:space="preserve">
     <value>進行非同步操作時，{0} 無法變更。</value>
   </data>
-  <data name="SQL_AsyncConnectionRequired" xml:space="preserve">
-    <value>此命令需要非同步連接。請在連接字串中設定 "Asynchronous Processing=true"。</value>
-  </data>
   <data name="SQL_ConnectTimeout" xml:space="preserve">
     <value>連接嘗試逾時。</value>
   </data>
-  <data name="SQL_FatalTimeout" xml:space="preserve">
-    <value>等候逾時已過時。結果為已連接中斷。</value>
-  </data>
   <data name="SQL_InstanceFailure" xml:space="preserve">
     <value>執行個體失敗。</value>
   </data>
@@ -2556,27 +585,18 @@
   <data name="SQL_MSALInnerException" xml:space="preserve">
     <value>錯誤碼 0x{0}</value>
   </data>
-  <data name="SQL_ChangePasswordRequiresYukon" xml:space="preserve">
-    <value>ChangePassword 需要 SQL Server 9.0 或更新的版本。</value>
-  </data>
   <data name="SQL_NonLocalSSEInstance" xml:space="preserve">
     <value>不支援非本端使用者執行個體的 SSE 執行個體重新導向。</value>
   </data>
   <data name="SQL_UnsupportedAuthentication" xml:space="preserve">
     <value>不支援驗證 '{0}'。</value>
   </data>
-  <data name="SQL_UnsupportedSqlAuthenticationMethod" xml:space="preserve">
-    <value>不支援 SQL 驗證方法 '{0}'。</value>
-  </data>
   <data name="SQL_CannotCreateAuthProvider" xml:space="preserve">
     <value>無法為 '{0}' 具現化類型為 '{1}' 的驗證提供者。</value>
   </data>
   <data name="SQL_CannotCreateAuthInitializer" xml:space="preserve">
     <value>無法將類型為 '{0}' 的 SqlAuthenticationInitializer 具現化。</value>
   </data>
-  <data name="SQL_CannotInitializeAuthProvider" xml:space="preserve">
-    <value>提供者 '{0}' 在初始化期間擲回例外狀況。</value>
-  </data>
   <data name="SQL_UnsupportedAuthenticationByProvider" xml:space="preserve">
     <value>提供者 '{0}' 不支援驗證 '{1}'。</value>
   </data>
@@ -2586,24 +606,15 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>找不到 '{0}' 的驗證提供者。請安裝 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet 套件 (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure)，以使用 Active Directory (Entra ID) 認證方法。</value>
   </data>
-  <data name="SQL_CannotGetAuthProviderConfig" xml:space="preserve">
-    <value>無法讀取驗證提供者的組態區段。</value>
-  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>參數 '{0}' 不能是 Null 或空白。</value>
   </data>
-  <data name="SQL_AsyncOperationCompleted" xml:space="preserve">
-    <value>已完成非同步作業。</value>
-  </data>
   <data name="SQL_PendingBeginXXXExists" xml:space="preserve">
     <value>不可因為已在進行的非同步作業擱置而先執行命令。</value>
   </data>
   <data name="SQL_NonXmlResult" xml:space="preserve">
     <value>無效的命令傳送到 ExecuteXmlReader。命令必須傳回 Xml 結果。</value>
   </data>
-  <data name="SQL_NotificationsRequireYukon" xml:space="preserve">
-    <value>通知需要 SQL Server 9.0 或更新的版本。</value>
-  </data>
   <data name="SQL_InvalidUdt3PartNameFormat" xml:space="preserve">
     <value>UdtTypeName 的 3 個名稱組成格式無效。</value>
   </data>
@@ -2697,9 +708,6 @@
   <data name="SQL_SSPIInitializeError" xml:space="preserve">
     <value>無法初始化 SSPI 封裝。</value>
   </data>
-  <data name="SQL_Timeout" xml:space="preserve">
-    <value>已超過連接 Timeout 的設定。在作業完成之前超過逾時等待的時間，或者是伺服器未回應。</value>
-  </data>
   <data name="SQL_Timeout_PreLogin_Begin" xml:space="preserve">
     <value>已超過連接逾時的設定。在登入前的開始階段超過逾時等待的時間。這可能是因為連接逾時提供的時間不足所造成。</value>
   </data>
@@ -2745,12 +753,6 @@
   <data name="SQL_UserInstanceFailure" xml:space="preserve">
     <value>連接字串中要求一個使用者執行個體，但指定的伺服器並不支援此選項。</value>
   </data>
-  <data name="SQL_InvalidServerCertificate" xml:space="preserve">
-    <value>伺服器憑證無法用於驗證應用程式。</value>
-  </data>
-  <data name="SQL_ExceedsMaxDataLength" xml:space="preserve">
-    <value>指定資料的長度 {0} 超過允許的上限 {1}。</value>
-  </data>
   <data name="SQL_InvalidRead" xml:space="preserve">
     <value>當目前沒有資料時，嘗試讀取無效。</value>
   </data>
@@ -2775,9 +777,6 @@
   <data name="SQL_InvalidDataLength" xml:space="preserve">
     <value>資料長度 '{0}' 小於 0。</value>
   </data>
-  <data name="SQL_SqlUpdatableRecordReadOnly" xml:space="preserve">
-    <value>當 SqlDataRecord 為唯讀時，無法呼叫 '{0}'。</value>
-  </data>
   <data name="SQL_BulkLoadMappingInaccessible" xml:space="preserve">
     <value>對應的集合正在使用中且無法在此時存取;</value>
   </data>
@@ -2847,21 +846,6 @@
   <data name="SQL_ContextConnectionIsUnsupported" xml:space="preserve">
     <value>不支援使用 Microsoft.Data.SqlClient 連線至內容連線。</value>
   </data>
-  <data name="SQL_NestedTransactionScopesNotSupported" xml:space="preserve">
-    <value>不支援巢狀 TransactionScopes。</value>
-  </data>
-  <data name="SQL_UnexpectedSmiEvent" xml:space="preserve">
-    <value>未預期的伺服器事件: {0}。</value>
-  </data>
-  <data name="SQL_ArgumentLengthMismatch" xml:space="preserve">
-    <value>'{0}' 的長度必須和 '{1}' 的長度相符。</value>
-  </data>
-  <data name="SQL_InvalidSqlDbTypeWithOneAllowedType" xml:space="preserve">
-    <value>SqlDbType '{0}' 對 {1} 是無效的。只支援 {2}。</value>
-  </data>
-  <data name="SQL_TooManyValues" xml:space="preserve">
-    <value>太多數值。</value>
-  </data>
   <data name="SQL_StreamWriteNotSupported" xml:space="preserve">
     <value>此 Stream 不支援寫入動作。</value>
   </data>
@@ -2886,192 +870,36 @@
   <data name="SqlMisc_NullString" xml:space="preserve">
     <value>Null</value>
   </data>
-  <data name="SqlMisc_MessageString" xml:space="preserve">
-    <value>訊息</value>
-  </data>
-  <data name="SqlMisc_ArithOverflowMessage" xml:space="preserve">
-    <value>算術溢位。</value>
-  </data>
-  <data name="SqlMisc_DivideByZeroMessage" xml:space="preserve">
-    <value>發生除以零的錯誤。</value>
-  </data>
-  <data name="SqlMisc_NullValueMessage" xml:space="preserve">
-    <value>資料為 Null。無法在值為 Null 的情況下呼叫這個方法或屬性。</value>
-  </data>
-  <data name="SqlMisc_TruncationMessage" xml:space="preserve">
-    <value>數字算術導致截斷。</value>
-  </data>
   <data name="SqlMisc_DateTimeOverflowMessage" xml:space="preserve">
     <value>SqlDateTime 溢位。必須在 1/1/1753 12:00:00 AM 和 12/31/9999 11:59:59 PM 之間</value>
   </data>
-  <data name="SqlMisc_ConcatDiffCollationMessage" xml:space="preserve">
-    <value>要串連的兩個字串擁有不同的定序。</value>
-  </data>
-  <data name="SqlMisc_CompareDiffCollationMessage" xml:space="preserve">
-    <value>要比較的兩個字串擁有不同的定序。</value>
-  </data>
-  <data name="SqlMisc_InvalidFlagMessage" xml:space="preserve">
-    <value>無效的旗標值。</value>
-  </data>
-  <data name="SqlMisc_NumeToDecOverflowMessage" xml:space="preserve">
-    <value>從 SqlDecimal 轉換成 Decimal 溢位。</value>
-  </data>
   <data name="SqlMisc_ConversionOverflowMessage" xml:space="preserve">
     <value>轉換溢位。</value>
   </data>
-  <data name="SqlMisc_InvalidDateTimeMessage" xml:space="preserve">
-    <value>無效的 SqlDateTime。</value>
-  </data>
-  <data name="SqlMisc_TimeZoneSpecifiedMessage" xml:space="preserve">
-    <value>已經指定時區。SqlDateTime 不支援時區。</value>
-  </data>
   <data name="SqlMisc_InvalidArraySizeMessage" xml:space="preserve">
     <value>無效的陣列大小。</value>
   </data>
   <data name="SqlMisc_InvalidPrecScaleMessage" xml:space="preserve">
     <value>無效的數字整數位數/小數位數。</value>
   </data>
-  <data name="SqlMisc_FormatMessage" xml:space="preserve">
-    <value>輸入格式錯誤。</value>
-  </data>
-  <data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
-    <value>SqlType 錯誤。</value>
-  </data>
-  <data name="SqlMisc_LenTooLargeMessage" xml:space="preserve">
-    <value>在此版本中 SqlBytes 及 SqlChars 不支援大於 2GB 的長度。</value>
-  </data>
   <data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
     <value>讀取時發生錯誤。</value>
   </data>
-  <data name="SqlMisc_StreamClosedMessage" xml:space="preserve">
-    <value>Stream 已關閉或處置。</value>
-  </data>
-  <data name="SqlMisc_NoBufferMessage" xml:space="preserve">
-    <value>沒有緩衝區。讀取或寫入作業失敗。</value>
-  </data>
-  <data name="SqlMisc_SetNonZeroLenOnNullMessage" xml:space="preserve">
-    <value>無法設定非零的長度，因為目前的值是 Null。</value>
-  </data>
-  <data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
-    <value>緩衝無效。讀取或寫入作業失敗。</value>
-  </data>
-  <data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
-    <value>無法寫入非零的位移，因為目前的值是 Null。</value>
-  </data>
-  <data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
-    <value>無法從大於目前長度的位移寫入。將會在緩衝區留下未初始化的資料。</value>
-  </data>
   <data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
     <value>傳回的資料大小大於 2Gb。請使用 SequentialAccess command behavior 以取得所有資料。</value>
   </data>
-  <data name="SqlMisc_InvalidFirstDayMessage" xml:space="preserve">
-    <value>GetDayOfWeek 的引數必須為介於 1 與 7 間的整數。</value>
-  </data>
-  <data name="SqlMisc_NotFilledMessage" xml:space="preserve">
-    <value>SQL Type 尚未載入資料。</value>
-  </data>
-  <data name="SqlMisc_AlreadyFilledMessage" xml:space="preserve">
-    <value>SQL Type 已經載入資料。</value>
-  </data>
-  <data name="SqlMisc_ClosedXmlReaderMessage" xml:space="preserve">
-    <value>嘗試存取關閉的 XmlReader 無效。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamClosed" xml:space="preserve">
-    <value>當資料流已關閉時，嘗試呼叫 {0} 失敗。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonWritable" xml:space="preserve">
-    <value>當無法寫入資料流時，嘗試呼叫 {0} 失敗。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonReadable" xml:space="preserve">
-    <value>當無法讀取資料流時，嘗試呼叫 {0} 失敗。</value>
-  </data>
-  <data name="SqlMisc_InvalidOpStreamNonSeekable" xml:space="preserve">
-    <value>當找不到資料流時，嘗試呼叫 {0} 失敗。</value>
-  </data>
-  <data name="SqlMisc_SubclassMustOverride" xml:space="preserve">
-    <value>子類別並未覆寫所需的方法。</value>
-  </data>
   <data name="SQL_CannotCreateNormalizer" xml:space="preserve">
     <value>無法建立 '{0}' 的正規器。</value>
   </data>
   <data name="Sql_InternalError" xml:space="preserve">
     <value>內部錯誤</value>
   </data>
-  <data name="Sql_NullCommandText" xml:space="preserve">
-    <value>命令參數必須有一個非空值且非空的命令文字。</value>
-  </data>
-  <data name="Sql_MismatchedMetaDataDirectionArrayLengths" xml:space="preserve">
-    <value>MetaData 參數陣列必須有等同於 ParameterDirection 陣列引數的長度。</value>
-  </data>
-  <data name="ADP_AdapterMappingExceptionMessage" xml:space="preserve">
-    <value>資料配接器對應錯誤。</value>
-  </data>
-  <data name="ADP_DataAdapterExceptionMessage" xml:space="preserve">
-    <value>資料配接器錯誤。</value>
-  </data>
-  <data name="ADP_DBConcurrencyExceptionMessage" xml:space="preserve">
-    <value>資料庫並行違規。</value>
-  </data>
   <data name="ADP_OperationAborted" xml:space="preserve">
     <value>操作已中止。</value>
   </data>
   <data name="ADP_OperationAbortedExceptionMessage" xml:space="preserve">
     <value>由於例外狀況操作已中止 (請參閱 InnerException 以取得詳細資訊)。</value>
   </data>
-  <data name="DataAdapter_AcceptChangesDuringFill" xml:space="preserve">
-    <value>Fill 是否將呼叫 DataRow.AcceptChanges。</value>
-  </data>
-  <data name="DataAdapter_AcceptChangesDuringUpdate" xml:space="preserve">
-    <value>Update 是否會呼叫 DataRow.AcceptChanges。</value>
-  </data>
-  <data name="DataAdapter_ContinueUpdateOnError" xml:space="preserve">
-    <value>當 Update 事件 (RowUpdating 和 RowUpdated) 的 Status 為 UpdateStatus.ErrorsOccurred 時，是否要繼續執行下一個 DataRow。</value>
-  </data>
-  <data name="DataAdapter_FillLoadOption" xml:space="preserve">
-    <value>配接器如何從 DataReader 填滿 DataTable。</value>
-  </data>
-  <data name="DataAdapter_MissingMappingAction" xml:space="preserve">
-    <value>當在 TableMappings 中的資料表或資料行遺漏時所採取的動作。</value>
-  </data>
-  <data name="DataAdapter_MissingSchemaAction" xml:space="preserve">
-    <value>當在 DataSet 中的資料表或資料行遺漏時所採取的動作。</value>
-  </data>
-  <data name="DataAdapter_TableMappings" xml:space="preserve">
-    <value>如何將來源資料表對應至 DataSet 資料表。</value>
-  </data>
-  <data name="DataAdapter_FillError" xml:space="preserve">
-    <value>在 Fill 期間若發生可復原的錯誤時觸發的事件。</value>
-  </data>
-  <data name="DataAdapter_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Fill 應傳回給提供者特定值或一般 CLSCompliant 值。</value>
-  </data>
-  <data name="DataColumnMapping_DataSetColumn" xml:space="preserve">
-    <value>DataColumn.ColumnName</value>
-  </data>
-  <data name="DataColumnMapping_SourceColumn" xml:space="preserve">
-    <value>來源資料行名稱 - 區分大小寫。</value>
-  </data>
-  <data name="DataColumnMappings_Count" xml:space="preserve">
-    <value>集合中的項目數目</value>
-  </data>
-  <data name="DataColumnMappings_Item" xml:space="preserve">
-    <value>指定的 DataColumnMapping 物件。</value>
-  </data>
-  <data name="DataTableMapping_ColumnMappings" xml:space="preserve">
-    <value>當符合這個資料表的對應時，以個別資料行的方式對應。</value>
-  </data>
-  <data name="DataTableMapping_DataSetTable" xml:space="preserve">
-    <value>DataTable.TableName</value>
-  </data>
-  <data name="DataTableMapping_SourceTable" xml:space="preserve">
-    <value>DataTableMapping 來源資料表名稱。這個名稱有區分大小寫。</value>
-  </data>
-  <data name="DataTableMappings_Count" xml:space="preserve">
-    <value>集合中的項目數目</value>
-  </data>
-  <data name="DataTableMappings_Item" xml:space="preserve">
-    <value>指定的 DataTableMapping 物件</value>
-  </data>
   <data name="DbDataAdapter_DeleteCommand" xml:space="preserve">
     <value>在 DataSet 中對已刪除的資料列進行 Update 時使用。</value>
   </data>
@@ -3090,63 +918,9 @@
   <data name="DbDataAdapter_RowUpdating" xml:space="preserve">
     <value>在對每個 DataRow 進行 Update 之後觸發的事件。</value>
   </data>
-  <data name="DbDataAdapter_UpdateBatchSize" xml:space="preserve">
-    <value>執行前一同批次作業的資料列數與資料來源不符。</value>
-  </data>
-  <data name="DbTable_Connection" xml:space="preserve">
-    <value>若 Select/Insert/Update/DeleteCommands 尚未連接時，會使用連接。</value>
-  </data>
-  <data name="DbTable_DeleteCommand" xml:space="preserve">
-    <value>在 DataTable 中對已刪除的資料列進行 Update 時使用。</value>
-  </data>
-  <data name="DbTable_InsertCommand" xml:space="preserve">
-    <value>在 DataTable 中對新增的資料列進行 Update 時使用。</value>
-  </data>
-  <data name="DbTable_SelectCommand" xml:space="preserve">
-    <value>用於 Fill 時。</value>
-  </data>
-  <data name="DbTable_UpdateCommand" xml:space="preserve">
-    <value>在 DataTable 中對已修改的資料列進行 Update 時使用。</value>
-  </data>
-  <data name="DbTable_ReturnProviderSpecificTypes" xml:space="preserve">
-    <value>Fill 應傳回給提供者特定值或一般 CLSCompliant 值。</value>
-  </data>
-  <data name="DbTable_TableMapping" xml:space="preserve">
-    <value>如何將來源資料表對應至 DataTable。</value>
-  </data>
-  <data name="DbTable_ConflictDetection" xml:space="preserve">
-    <value>當使用者未設定時，如何產生 Insert/Update/DeleteCommands。</value>
-  </data>
-  <data name="DbTable_UpdateBatchSize" xml:space="preserve">
-    <value>執行前一同批次作業的資料列數與資料來源不符。</value>
-  </data>
-  <data name="DbConnectionString_ConnectionString" xml:space="preserve">
-    <value>用於連接至 Data Source 的連接字串。</value>
-  </data>
-  <data name="DbConnectionString_Driver" xml:space="preserve">
-    <value>當連接至 Data Source 所用的 ODBC Driver 名稱。</value>
-  </data>
-  <data name="DbConnectionString_DSN" xml:space="preserve">
-    <value>當連接至 Data Source 所用的 DSN。</value>
-  </data>
-  <data name="DbConnectionString_AdoNetPooler" xml:space="preserve">
-    <value>當 True 時，表示應使用管理連接集區。</value>
-  </data>
-  <data name="DbConnectionString_FileName" xml:space="preserve">
-    <value>當連接至 Data Source 所用的 UDL 檔案。</value>
-  </data>
-  <data name="DbConnectionString_OleDbServices" xml:space="preserve">
-    <value>指定要啟用的 OLE DB Services 或使用 OleDb Provider 來停用它。</value>
-  </data>
-  <data name="DbConnectionString_Provider" xml:space="preserve">
-    <value>當連接至 Data Source 時所用的 OLE DB Provider 名稱。</value>
-  </data>
   <data name="DbConnectionString_ApplicationName" xml:space="preserve">
     <value>應用程式的名稱。</value>
   </data>
-  <data name="DbConnectionString_AsynchronousProcessing" xml:space="preserve">
-    <value>若為 true，則允許在 .NET Framework Data Provider 中使用 Asynchronous 功能。</value>
-  </data>
   <data name="DbConnectionString_AttachDBFilename" xml:space="preserve">
     <value>可附加資料庫中的主要檔案名稱，包含名稱的完整路徑。</value>
   </data>
@@ -3156,9 +930,6 @@
   <data name="DbConnectionString_ConnectionReset" xml:space="preserve">
     <value>當 True 時，表示當連接狀態從集區中移除時已重設。</value>
   </data>
-  <data name="DbConnectionString_ContextConnection" xml:space="preserve">
-    <value>為 True 時，表示連結的來源應為 Sql Server 內容。只有在 Sql Server 程序中執行時才能使用。</value>
-  </data>
   <data name="DbConnectionString_CurrentLanguage" xml:space="preserve">
     <value>SQL Server Language 記錄名稱。</value>
   </data>
@@ -3252,54 +1023,9 @@
   <data name="DbConnectionString_Authentication" xml:space="preserve">
     <value>指定使用 SQL Server 的驗證方法。</value>
   </data>
-  <data name="DbConnectionString_Certificate" xml:space="preserve">
-    <value>用以向 SQL Server 驗證的指定用戶端憑證。  </value>
-  </data>
-  <data name="OdbcConnection_ConnectionString" xml:space="preserve">
-    <value>用來連接至資料來源的資訊。</value>
-  </data>
-  <data name="OdbcConnection_ConnectionTimeout" xml:space="preserve">
-    <value>目前的連接逾時值，無法於 ConnectionString 中設定。</value>
-  </data>
-  <data name="OdbcConnection_Database" xml:space="preserve">
-    <value>目前的資料來源目錄值，即為連接字串中的 'Database=X'。</value>
-  </data>
-  <data name="OdbcConnection_DataSource" xml:space="preserve">
-    <value>目前的資料來源，即為連接字串中的 'Server=X'。</value>
-  </data>
-  <data name="OdbcConnection_Driver" xml:space="preserve">
-    <value>目前所使用的 ODBC 驅動程式。</value>
-  </data>
-  <data name="OdbcConnection_ServerVersion" xml:space="preserve">
-    <value>ODBC 驅動程式所存取的產品版本。</value>
-  </data>
-  <data name="OleDbConnection_ConnectionString" xml:space="preserve">
-    <value>用來連接至資料來源的資訊。</value>
-  </data>
-  <data name="OleDbConnection_ConnectionTimeout" xml:space="preserve">
-    <value>目前連接的逾時值，即為 ConnectionString 中的 'Connect Timeout=X'。</value>
-  </data>
-  <data name="OleDbConnection_Database" xml:space="preserve">
-    <value>目前的資料來源目錄值，即為連接字串中的 'Initial Catalog=X'。</value>
-  </data>
-  <data name="OleDbConnection_DataSource" xml:space="preserve">
-    <value>目前的資料來源，即為連接字串中的 'Data Source=X'。</value>
-  </data>
-  <data name="OleDbConnection_Provider" xml:space="preserve">
-    <value>目前的 OLE DB 提供者 ProgID，即為連接字串中的 'Provider=X'。</value>
-  </data>
-  <data name="OleDbConnection_ServerVersion" xml:space="preserve">
-    <value>OLE DB Provider 所存取的產品版本。</value>
-  </data>
   <data name="SqlConnection_AccessToken" xml:space="preserve">
     <value>驗證要用的存取金鑰。</value>
   </data>
-  <data name="SqlConnection_Asynchronous" xml:space="preserve">
-    <value>連接、同步或非同步的狀態。即為連接字串中的 'Asynchronous Processing=x'。</value>
-  </data>
-  <data name="SqlConnection_Replication" xml:space="preserve">
-    <value>用於複寫連接的資訊。</value>
-  </data>
   <data name="SqlConnection_ConnectionString" xml:space="preserve">
     <value>用來連接至 DataSource 的資訊，例如 'Data Source=x;Initial Catalog=x;Integrated Security=SSPI'。</value>
   </data>
@@ -3324,9 +1050,6 @@
   <data name="SqlConnection_StatisticsEnabled" xml:space="preserve">
     <value>收集此連接的統計資料。</value>
   </data>
-  <data name="SqlConnection_CustomColumnEncryptionKeyStoreProviders" xml:space="preserve">
-    <value>自訂資料行加密金鑰存放區提供者。</value>
-  </data>
   <data name="SqlConnection_ClientConnectionId" xml:space="preserve">
     <value>代表實體連接的 Guid。</value>
   </data>
@@ -3363,99 +1086,9 @@
   <data name="SqlCommand_NotificationAutoEnlist" xml:space="preserve">
     <value>用於 Microsoft SQL Server 的自動編列通知。</value>
   </data>
-  <data name="DbCommandBuilder_ConflictOption" xml:space="preserve">
-    <value>當使用者未指定 Update 與 Delete 命令時，會如何自動產生 where 子句。</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogLocation" xml:space="preserve">
-    <value>表示在文字命令中，目錄名稱在適當資料表名稱中的位置。</value>
-  </data>
-  <data name="DbCommandBuilder_CatalogSeparator" xml:space="preserve">
-    <value>在文字命令中，將目錄名稱與其餘識別項分隔的字元。</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaSeparator" xml:space="preserve">
-    <value>在文字命令中，將結構描述名稱與其餘識別項分隔的字元。</value>
-  </data>
-  <data name="DbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>在 sql 物件周圍包裝的前置詞字串。</value>
-  </data>
-  <data name="DbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>在 sql 物件周圍包裝的後置詞字串。</value>
-  </data>
-  <data name="DbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>自動產生 Commands 的目標 DataAdapter。</value>
-  </data>
-  <data name="DbCommandBuilder_SchemaLocation" xml:space="preserve">
-    <value>使用 DataTable 或 SelectCommand 中的結構描述。</value>
-  </data>
-  <data name="DbCommandBuilder_SetAllValues" xml:space="preserve">
-    <value>當使用者未指定 Update 命令時，如何自動產生 set 子句。</value>
-  </data>
-  <data name="OdbcCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>用以自動產生 OdbcCommands 的 DataAdapter</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>文字命令中，用來當作引號識別項 (其中包含特殊字元) 開頭引號的字元。</value>
-  </data>
-  <data name="OdbcCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>文字命令中，用來當作引號識別項 (其中包含特殊字元) 結束引號的字元。</value>
-  </data>
-  <data name="OleDbCommandBuilder_DataAdapter" xml:space="preserve">
-    <value>自動產生 OleDbCommands 的 DataAdapter</value>
-  </data>
-  <data name="OleDbCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>用於數字的小數點分隔符號。</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>在 sql 物件周圍包裝的前置詞字串</value>
-  </data>
-  <data name="OleDbCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>在 sql 物件周圍包裝的後置詞字串</value>
-  </data>
   <data name="SqlCommandBuilder_DataAdapter" xml:space="preserve">
     <value>自動產生 SqlCommands 項目的 DataAdapter</value>
   </data>
-  <data name="SqlCommandBuilder_DecimalSeparator" xml:space="preserve">
-    <value>用於數字的小數點分隔符號。</value>
-  </data>
-  <data name="SqlCommandBuilder_QuotePrefix" xml:space="preserve">
-    <value>文字命令中，用來當作引號識別項 (其中包含特殊字元) 開頭引號的字元。</value>
-  </data>
-  <data name="SqlCommandBuilder_QuoteSuffix" xml:space="preserve">
-    <value>文字命令中，用來當作引號識別項 (其中包含特殊字元) 結束引號的字元。</value>
-  </data>
-  <data name="DbDataParameter_Precision" xml:space="preserve">
-    <value>當與 Prepare、FillSchema 和 CommandBuilder 情節搭配使用時，只需要設定為十進位數字參數。</value>
-  </data>
-  <data name="DbDataParameter_Scale" xml:space="preserve">
-    <value>當與 Prepare、FillSchema 和 CommandBuilder 情節搭配使用時，只需要設定為十進位數字參數。</value>
-  </data>
-  <data name="OdbcParameter_OdbcType" xml:space="preserve">
-    <value>參數原生型別。</value>
-  </data>
-  <data name="OleDbParameter_OleDbType" xml:space="preserve">
-    <value>參數原生型別。</value>
-  </data>
-  <data name="SqlParameter_ParameterName" xml:space="preserve">
-    <value>參數的名稱，例如 '@p1'</value>
-  </data>
-  <data name="SqlParameter_SqlDbType" xml:space="preserve">
-    <value>參數原生型別。</value>
-  </data>
-  <data name="SqlParameter_TypeName" xml:space="preserve">
-    <value>型別的伺服器名稱。</value>
-  </data>
-  <data name="SqlParameter_Offset" xml:space="preserve">
-    <value>可變長度資料型別中的位移。</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionDatabase" xml:space="preserve">
-    <value>XmlSchemaCollectionDatabase</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionOwningSchema" xml:space="preserve">
-    <value>XmlSchemaCollectionOwningSchema</value>
-  </data>
-  <data name="SqlParameter_XmlSchemaCollectionName" xml:space="preserve">
-    <value>XmlSchemaCollectionName</value>
-  </data>
   <data name="SqlParameter_UnsupportedTVPOutputParameter" xml:space="preserve">
     <value>不支援為參數 '{1}' 所指定的 ParameterDirection '{0}'。Table-valued parameters 只支援 support ParameterDirection.Input。</value>
   </data>
@@ -3468,9 +1101,6 @@
   <data name="SqlParameter_UnexpectedTypeNameForNonStruct" xml:space="preserve">
     <value>參數 '{0}' 指定的 TypeName。TypeName 必須只設定為 Structured 參數。</value>
   </data>
-  <data name="MetaType_SingleValuedStructNotSupported" xml:space="preserve">
-    <value>SqlDbType.Structured 型別只支援多值的型別。</value>
-  </data>
   <data name="NullSchemaTableDataTypeNotSupported" xml:space="preserve">
     <value>結構描述資料表中欄位 '{0}' 的 DateType 資料行為 null。DataType 不可為 null。</value>
   </data>
@@ -3483,18 +1113,9 @@
   <data name="SQL_EnumeratedRecordFieldCountChanged" xml:space="preserve">
     <value>記錄 '{0}' 中的欄位數目與原始記錄中的數目不符。</value>
   </data>
-  <data name="SQLUDT_MaxByteSizeValue" xml:space="preserve">
-    <value>範圍: 0-8000</value>
-  </data>
   <data name="SQLUDT_Unexpected" xml:space="preserve">
     <value>SqlClient 資料提供者發生無法預期的錯誤。{0}</value>
   </data>
-  <data name="SQLUDT_InvalidDbId" xml:space="preserve">
-    <value>無法取得 {0}、{1} 的 Type Info</value>
-  </data>
-  <data name="SQLUDT_CantLoadAssembly" xml:space="preserve">
-    <value>提供者載入下列組件失敗: {0}</value>
-  </data>
   <data name="SQLUDT_InvalidUdtTypeName" xml:space="preserve">
     <value>必須為 UDT 參數設定 UdtTypeName 屬性。</value>
   </data>
@@ -3504,72 +1125,9 @@
   <data name="SQLUDT_InvalidSqlType" xml:space="preserve">
     <value>指定的型別並未在目標伺服器上註冊。{0}。</value>
   </data>
-  <data name="SQLUDT_InWhereClause" xml:space="preserve">
-    <value>除非 UDT 參數為主索引鍵的一部分，否則不允許出現在 where 子句中。</value>
-  </data>
-  <data name="SqlUdt_InvalidUdtMessage" xml:space="preserve">
-    <value>'{0}' 是無效的使用者定義型別，理由是: {1}。</value>
-  </data>
-  <data name="SqlUdtReason_MultipleSerFormats" xml:space="preserve">
-    <value>同時支援記憶體中格式與使用者定義格式</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportNative" xml:space="preserve">
-    <value>不支援負數格式。</value>
-  </data>
-  <data name="SqlUdtReason_CannotSupportUserDefined" xml:space="preserve">
-    <value>未實作 IBinarySerialize</value>
-  </data>
-  <data name="SqlUdtReason_NotSerializable" xml:space="preserve">
-    <value>非連續的</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructors" xml:space="preserve">
-    <value>無公用建構函式</value>
-  </data>
-  <data name="SqlUdtReason_NotNullable" xml:space="preserve">
-    <value>沒有實作 INullable</value>
-  </data>
-  <data name="SqlUdtReason_NoPublicConstructor" xml:space="preserve">
-    <value>沒有公用建構函式</value>
-  </data>
   <data name="SqlUdtReason_NoUdtAttribute" xml:space="preserve">
     <value>無 UDT 屬性</value>
   </data>
-  <data name="SqlUdtReason_MaplessNotYetSupported" xml:space="preserve">
-    <value>尚未支援無對應的序列化。</value>
-  </data>
-  <data name="SqlUdtReason_ParseMethodMissing" xml:space="preserve">
-    <value>'public static x Parse(System.Data.SqlTypes.SqlString)' 方法遺失</value>
-  </data>
-  <data name="SqlUdtReason_ToStringMethodMissing" xml:space="preserve">
-    <value>'public override string ToString()' 方法遺失</value>
-  </data>
-  <data name="SqlUdtReason_NullPropertyMissing" xml:space="preserve">
-    <value>'public static x Null { get; }' 方法遺失</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatNoFieldSupport" xml:space="preserve">
-    <value>Native 不支援型別 '{0}' (直接或經由其他欄位) 的欄位</value>
-  </data>
-  <data name="SqlUdtReason_TypeNotPublic" xml:space="preserve">
-    <value>Type 並非公用的</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtNotSequentialLayout" xml:space="preserve">
-    <value>Native UDT 並非連續的配置，因為型別為 '{0}'</value>
-  </data>
-  <data name="SqlUdtReason_NativeUdtMaxByteSize" xml:space="preserve">
-    <value>Native UDT 指定最大 byte 大小</value>
-  </data>
-  <data name="SqlUdtReason_NonSerializableField" xml:space="preserve">
-    <value>欄位 '{0}' 已標示為非連續</value>
-  </data>
-  <data name="SqlUdtReason_NativeFormatExplicitLayoutNotAllowed" xml:space="preserve">
-    <value>'{0}' 欄位的類型標示為明確配置，原生格式不允許此種配置</value>
-  </data>
-  <data name="SqlUdtReason_MultivaluedAssemblyId" xml:space="preserve">
-    <value>多值的組件參考必須有非零的 Assembly Id。</value>
-  </data>
-  <data name="SQLTVP_TableTypeCanOnlyBeParameter" xml:space="preserve">
-    <value>結構化、多值型別只可以用於參數。不可以巢狀方式置於其他型別中。</value>
-  </data>
   <data name="SqlFileStream_InvalidPath" xml:space="preserve">
     <value>路徑名稱無效。</value>
   </data>
@@ -3585,9 +1143,6 @@
   <data name="SqlDelegatedTransaction_PromotionFailed" xml:space="preserve">
     <value>嘗試升級交易時失敗。</value>
   </data>
-  <data name="SqlDependency_SqlDependency" xml:space="preserve">
-    <value>用於接收查詢通知的依存物件。</value>
-  </data>
   <data name="SqlDependency_HasChanges" xml:space="preserve">
     <value>表示此相依性無效的屬性。</value>
   </data>
@@ -3600,9 +1155,6 @@
   <data name="SqlDependency_AddCommandDependency" xml:space="preserve">
     <value>新增命令至現存的依存物件。</value>
   </data>
-  <data name="SqlDependency_Duplicate" xml:space="preserve">
-    <value>Command 已與其他依存的物件關聯。無法覆寫。</value>
-  </data>
   <data name="SQLNotify_AlreadyHasCommand" xml:space="preserve">
     <value>SqlCommand 物件已與其他 SqlDependency 物件關聯。</value>
   </data>
@@ -3630,12 +1182,6 @@
   <data name="SqlDependency_InvalidTimeout" xml:space="preserve">
     <value>指定的等候 Timeout 無效。等候 Timeout 不可 &lt; 0。</value>
   </data>
-  <data name="SQLNotify_ErrorFormat" xml:space="preserve">
-    <value>通知錯誤。Type={0}, Info={1}, Source={2}。</value>
-  </data>
-  <data name="SqlMetaData_NoMetadata" xml:space="preserve">
-    <value>GetMetaData 對此 SqlDbType 無效。</value>
-  </data>
   <data name="SqlMetaData_InvalidSqlDbTypeForConstructorFormat" xml:space="preserve">
     <value>此建構函式的 dbType {0} 無效。</value>
   </data>
@@ -4104,9 +1650,6 @@
   <data name="TCE_NullPlainText" xml:space="preserve">
     <value>內部錯誤。Plaintext 值不能是 Null。</value>
   </data>
-  <data name="TCE_VeryLargeCiphertext" xml:space="preserve">
-    <value>無法加密。加密結果為 {0} 個位元組的 ciphertext，這超出了 {1} 個位元組的允許上限。指定的 plaintext 值可能太大 (plaintext 大小為: {2} 個位元組)。</value>
-  </data>
   <data name="TCE_NullCipherText" xml:space="preserve">
     <value>內部錯誤。Ciphertext 值不能是 Null。</value>
   </data>
@@ -4224,9 +1767,6 @@
   <data name="TCE_AttestationInfoNotReturnedFromSQLServer" xml:space="preserve">
     <value>SQL Server 未傳回證明資訊。enclave 類型為 '{0}'，enclave 證明 URL 為 '{1}'。</value>
   </data>
-  <data name="TCE_UnableToEstablishSecureChannel" xml:space="preserve">
-    <value>無法建立安全通道。錯誤訊息: {0}</value>
-  </data>
   <data name="TCE_NullArgumentInConstructorInternal" xml:space="preserve">
     <value>內部錯誤。建構類型為 '{1}' 的物件時，指定了 null 引數 '{0}'，但 '{0}' 不得為 null。</value>
   </data>
@@ -4242,15 +1782,6 @@
   <data name="TCE_DbConnectionString_EnclaveAttestationUrl" xml:space="preserve">
     <value>請指定 enclave 證明服務的端點，供驗證 SQL Server 執行個體中，為使用 Always Encrypted 加密之資料庫資料行計算而設定的 enclave 是否安全有效之用。</value>
   </data>
-  <data name="TCE_CannotGetSqlColumnEncryptionEnclaveProviderConfig" xml:space="preserve">
-    <value>無法讀取 enclave 提供者的組態區段。請確定您應用程式組態檔中的區段格式正確。錯誤訊息: {0}</value>
-  </data>
-  <data name="TCE_CannotCreateSqlColumnEncryptionEnclaveProvider" xml:space="preserve">
-    <value>無法具現化名稱為 '{0}' 類型為 '{1}' 的 enclave 提供者。錯誤訊息: {2}</value>
-  </data>
-  <data name="TCE_SqlColumnEncryptionEnclaveProviderNameCannotBeEmpty" xml:space="preserve">
-    <value>內部錯誤。SqlColumnEncryptionEnclaveProviderName 不得為 null 或空白。</value>
-  </data>
   <data name="TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe" xml:space="preserve">
     <value>讀取 '{0}' 結果集時發生錯誤。未在連接字串中指定證明 URL，但查詢需要記憶體保護區計算。記憶體保護區類型是 '{1}'。</value>
   </data>
@@ -4260,9 +1791,6 @@
   <data name="TCE_EnclaveTypeNullForEnclaveBasedQuery" xml:space="preserve">
     <value>內部錯誤。執行需要 enclave 計算的查詢時，從 SQL Server 收到了 null 或空白的 enclave 類型。</value>
   </data>
-  <data name="TCE_EnclaveProvidersNotConfiguredForEnclaveBasedQuery" xml:space="preserve">
-    <value>執行查詢需要 enclave 計算，但應用程式組態沒有 enclave 提供者區段。</value>
-  </data>
   <data name="TCE_EnclaveProviderNotFound" xml:space="preserve">
     <value>找不到記憶體保護區類型 '{0}' 和證明通訊協定 '{1}' 的記憶體保護區提供者。請在連接字串中指定正確的證明通訊協定。 </value>
   </data>
@@ -4320,9 +1848,6 @@
   <data name="TCE_DbConnectionString_ColumnEncryptionSetting" xml:space="preserve">
     <value>連線中所有命令的預設資料行加密設定。</value>
   </data>
-  <data name="TCE_SqlParameter_ForceColumnEncryption" xml:space="preserve">
-    <value>傳送敏感性資料至伺服器之前，強制加密參數。</value>
-  </data>
   <data name="TCE_SqlConnection_TrustedColumnMasterKeyPaths" xml:space="preserve">
     <value>包含 SQL Server 名稱及其信任的資料行主要金鑰路徑的字典物件。</value>
   </data>
@@ -4332,9 +1857,6 @@
   <data name="SQLROR_FailoverNotSupported" xml:space="preserve">
     <value>不支援使用 ApplicationIntent ReadOnly 連接選項連接到 SQL Server 鏡像執行個體。</value>
   </data>
-  <data name="SQLROR_UnexpectedRoutingInfo" xml:space="preserve">
-    <value>收到未預期的路由資訊。</value>
-  </data>
   <data name="SQLROR_InvalidRoutingInfo" xml:space="preserve">
     <value>收到無效的路由資訊。</value>
   </data>
@@ -4485,9 +2007,6 @@
   <data name="SQL_UnsupportedAuthenticationSpecified" xml:space="preserve">
     <value>在此內容 {0} 中指定了不支援的驗證</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_Interactive_Authentication" xml:space="preserve">
-    <value>Active Directory 互動式驗證逾時。使用者回應驗證要求所花的時間過長。</value>
-  </data>
   <data name="SQL_SettingInteractiveWithCredential" xml:space="preserve">
     <value>如果已設定 Credential 屬性，就無法使用 'Authentication=Active Directory Interactive'。</value>
   </data>
@@ -4497,9 +2016,6 @@
   <data name="SqlConnection_ServerProcessId" xml:space="preserve">
     <value>使用中連線的伺服器處理序識別碼 (SPID)。</value>
   </data>
-  <data name="SQL_Timeout_Active_Directory_DeviceFlow_Authentication" xml:space="preserve">
-    <value>Active Directory 裝置代碼流程驗證逾時。使用者回應驗證要求所花的時間過長。</value>
-  </data>
   <data name="SQL_SettingCredentialWithDeviceFlow" xml:space="preserve">
     <value>如果連接字串中已指定 'Authentication=Active Directory Device Code Flow'，則無法設定 Credential 屬性。</value>
   </data>
@@ -4533,9 +2049,6 @@
   <data name="Arg_RankMultiDimNotSupported" xml:space="preserve">
     <value>所要求的動作只支援一維陣列。</value>
   </data>
-  <data name="Arg_RemoveArgNotFound" xml:space="preserve">
-    <value>由於在指定的集合中找不到指定的項目，所以無法移除。</value>
-  </data>
   <data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
     <value>需要非負數。</value>
   </data>
@@ -4563,87 +2076,36 @@
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>如果已在連接字串中指定 'Authentication=Active Directory Default'，就不能設定 AccessTokenCallback 屬性。</value>
   </data>
-  <data name="event_OperationReturnedSomething" xml:space="preserve">
-    <value>{0} 已傳回 {1}。</value>
-  </data>
-  <data name="net_auth_message_not_encrypted" xml:space="preserve">
-    <value>通訊協定錯誤: 收到的訊息包含有效的簽章，但是未如生效的保護等級所要求加密。</value>
-  </data>
-  <data name="net_log_operation_failed_with_error" xml:space="preserve">
-    <value>{0} 失敗，發生錯誤: {1}。</value>
-  </data>
   <data name="net_MethodNotImplementedException" xml:space="preserve">
     <value>此方法尚未由此類別實作。</value>
   </data>
-  <data name="net_securitypackagesupport" xml:space="preserve">
-    <value>不支援要求的安全性套件。</value>
-  </data>
   <data name="SNI_IncorrectPhysicalConnectionType" xml:space="preserve">
     <value>不正確的 physicalConnection 類型。</value>
   </data>
   <data name="SqlAppContextSwitchManager_InvalidValue" xml:space="preserve">
     <value>嘗試設定 AppCoNtext 切換 '{0}'={1} 時發生例外。</value>
   </data>
-  <data name="SQL_DbTypeNotSupportedOnThisPlatform" xml:space="preserve">
-    <value>此平台上不支援類型 {0}。</value>
-  </data>
   <data name="SQL_GlobalizationInvariantModeNotSupported" xml:space="preserve">
     <value>不支援全域固定模式。</value>
   </data>
-  <data name="SQL_KerberosTicketMissingError" xml:space="preserve">
-    <value>無法使用 Kerberos 進行驗證。請確保已在用戶端上使用 'kinit' 初始化 Kerberos，並且已登錄 SQL Server 的服務主體名稱，以允許 Kerberos 驗證。</value>
-  </data>
   <data name="SQL_NetworkLibraryNotSupported" xml:space="preserve">
     <value>此平台上不支援關鍵字 'Network Library'，請改為為 'Data Source' 加上所需通訊協定的首碼 (TCP 連線為 'tcp:' 或具名管道連線為 'np:')。</value>
   </data>
   <data name="SQL_SocketDidNotThrow" xml:space="preserve">
     <value>通訊端未擲出預期的 '{0}'，錯誤碼為 '{1}'。</value>
   </data>
-  <data name="SQL_UnsupportedFeature" xml:space="preserve">
-    <value>伺服器正嘗試使用此平台上不支援的功能。</value>
-  </data>
   <data name="SQL_UnsupportedKeyword" xml:space="preserve">
     <value>此平台上不支援關鍵字 '{0}'。</value>
   </data>
   <data name="SQL_UnsupportedSysTxVersion" xml:space="preserve">
     <value>目前載入的 System.Transactions.dll 不支援全域交易。</value>
   </data>
-  <data name="SQL_UnsupportedToken" xml:space="preserve">
-    <value>從伺服器讀取資料時收到不支援的權杖 '{0}'。</value>
-  </data>
-  <data name="SSPIInvalidHandleType" xml:space="preserve">
-    <value>'{0}' 不是支援的控制代碼類型。</value>
-  </data>
   <data name="SqlFileStream_NotSupported" xml:space="preserve">
     <value>此平台上不支援 SqlFileStream。</value>
   </data>
   <data name="LocalDBNotSupported" xml:space="preserve">
     <value>此平台上不支援 LocalDB。</value>
   </data>
-  <data name="net_context_buffer_too_small" xml:space="preserve">
-    <value>緩衝區空間不足。需要: {0} 實際: {1}。</value>
-  </data>
-  <data name="net_gssapi_operation_failed" xml:space="preserve">
-    <value>GSSAPI 作業失敗，出現狀態: {0} (次要狀態: {1})。</value>
-  </data>
-  <data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
-    <value>GSSAPI 作業失敗，發生錯誤 - {0} ({1})。</value>
-  </data>
-  <data name="net_nego_channel_binding_not_supported" xml:space="preserve">
-    <value>不支援 Windows 以外作業系統上的通道繫結。</value>
-  </data>
-  <data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
-    <value>如果傳遞預設認證，則目標名稱應該不是空白。</value>
-  </data>
-  <data name="net_nego_protection_level_not_supported" xml:space="preserve">
-    <value>使用目前安裝的 GSSAPI 實作不支援要求的保護層級。</value>
-  </data>
-  <data name="net_nego_server_not_supported" xml:space="preserve">
-    <value>不支援伺服器實作。</value>
-  </data>
-  <data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
-    <value>此平台上的預設認證無法使用 NTLM 驗證。</value>
-  </data>
   <data name="SqlParameter_SourceColumnNullMapping" xml:space="preserve">
     <value>由 DataAdapter.Update 使用時，參數值會從 DBNull.Value 變更為 (Int32)1 或 (Int32)0 (如果非 Null)。</value>
   </data>
@@ -4668,9 +2130,6 @@
   <data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
     <value>已超過緩衝區大小上限: {0}</value>
   </data>
-  <data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
-    <value>遺漏 SourceColumn '{2}' 的 DataColumn '{0}'。</value>
-  </data>
   <data name="ADP_NoSqlBatchCommandList" xml:space="preserve">
     <value>SqlBatchCommand 列表尚未初始化。</value>
   </data>

From 34add538fef682ff6be115b9973cf4e064e4b8f2 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 24 Apr 2026 16:23:44 -0300
Subject: [PATCH 067/298] Add 7.0.1 release notes (#4191)

---
 .github/prompts/release-notes.prompt.md |  21 +++--
 CHANGELOG.md                            |  42 +++++++++
 release-notes/7.0/7.0.1.md              | 115 ++++++++++++++++++++++++
 release-notes/7.0/README.md             |   2 +-
 4 files changed, 173 insertions(+), 7 deletions(-)
 create mode 100644 release-notes/7.0/7.0.1.md

diff --git a/.github/prompts/release-notes.prompt.md b/.github/prompts/release-notes.prompt.md
index 55cc7785e2..b847e3c17a 100644
--- a/.github/prompts/release-notes.prompt.md
+++ b/.github/prompts/release-notes.prompt.md
@@ -1,19 +1,19 @@
 ---
 name: release-notes
 description: Generate release notes for a specific milestone, covering all packages in the repository that have changes.
-argument-hint: <milestone>
+argument-hint: <milestone> <branch>
 agent: agent
-tools: ['edit/createFile', 'edit/editFiles', 'read/readFile']
+tools: ['edit/createFile', 'edit/editFiles', 'read/readFile', 'execute/runInTerminal']
 ---
 
-Generate release notes for the milestone "${input:milestone}".
+Generate release notes for the milestone "${input:milestone}" on the branch "${input:branch}".
 
 This repository ships multiple packages. Only generate release notes for packages that have relevant PRs in the milestone. All packages use the same template: [release-notes/template/release-notes-template.md](release-notes/template/release-notes-template.md).
 
 ## Package Registry
 
 | Package | Release Notes Directory | How to Identify PRs |
-|---------|------------------------|---------------------|
+| ------- | ----------------------- | ------------------- |
 | `Microsoft.Data.SqlClient` | `release-notes/<Major.Minor>/` | Default — PRs not assigned to another package |
 | `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` | `release-notes/add-ons/AzureKeyVaultProvider/<Major.Minor>/` | Labels containing `AKV`, or PR titles/bodies/files referencing `AzureKeyVaultProvider`, `add-ons/`, or `AlwaysEncrypted.AzureKeyVaultProvider` |
 | `Microsoft.SqlServer.Server` | `release-notes/MSqlServerServer/<Major.Minor>/` | PR titles/bodies/files referencing `Microsoft.SqlServer.Server` or `src/Microsoft.SqlServer.Server/` |
@@ -26,7 +26,7 @@ This repository ships multiple packages. Only generate release notes for package
 Each package has its own versioning and dependency sources. Use these to determine package versions and dependency lists:
 
 | Package | Version Source | Dependency Source |
-|---------|---------------|-------------------|
+| ------- | -------------- | ----------------- |
 | `Microsoft.Data.SqlClient` | [tools/props/Versions.props](tools/props/Versions.props) (`MdsVersionDefault`) | [Directory.Packages.props](Directory.Packages.props) and the [project file](src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj) |
 | `AzureKeyVaultProvider` | [tools/props/Versions.props](tools/props/Versions.props) (`AkvVersionDefault`) | [AKV project file](src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj) and [Directory.Packages.props](Directory.Packages.props) |
 | `Microsoft.SqlServer.Server` | [tools/props/Versions.props](tools/props/Versions.props) (`SqlServerPackageVersion`) | [SqlServer project file](src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj) |
@@ -46,7 +46,8 @@ This prompt uses the following skill:
 ### 1. Fetch Milestone Items
 
 - Follow the instructions in the [fetch-milestone-prs](.github/skills/fetch-milestone-prs/SKILL.md) skill to fetch all merged PRs for the milestone "${input:milestone}".
-- The output will be saved to `.milestone-prs/${input:milestone}/` with individual JSON files per PR and an `_index.json` summary.
+- The output will be saved to `.milestone-prs/${input:milestone}/${input:branch}` with individual JSON files per PR and an `_index.json` summary.
+- Identify any milestone items that don't have corresponding commits on the release branch "${input:branch}", and vice versa.
 
 ### 2. Analyze and Categorize
 
@@ -119,6 +120,14 @@ For each package that has relevant PRs in the milestone:
   - If a section for the package doesn't yet exist, add one following the existing pattern (see the `AzureKeyVaultProvider` and `Microsoft.SqlServer.Server` sections for reference).
   - If the section already exists, add the new version link to its Release Information list.
 
+### 8. Markdown for GitHub Release
+
+- Use the contents of the new release notes markdown file to produce markdown suitable for pasting into a GitHub UI Release textbox.
+  - GitHub renders newlines within paragraphs and lists as hard breaks, so remove those.
+  - Omit the main heading and first sub-heading.
+  - Update any relative links to use absolute URLs pointing to the file in the repository.
+  - Provide this new markdown in a code block that can easily be copied and pasted directly into the GitHub UI.
+
 ## Notes
 
 - Packages may ship as preview or stable independently. Use the actual version from the project/spec files.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fedf1ad568..c73574f086 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,48 @@ 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 7.0.1] - 2026-04-23
+
+This update brings the following changes since the [7.0.0](release-notes/7.0/7.0.0.md) release.
+See the [full release notes](release-notes/7.0/7.0.1.md) for detailed descriptions.
+
+### Fixed
+
+- Fixed `SqlBulkCopy` failing on SQL Server 2016 with `Invalid column name 'graph_type'` error by using dynamic SQL to extract column names.
+  ([#3714](https://github.com/dotnet/SqlClient/issues/3714),
+   [#4092](https://github.com/dotnet/SqlClient/pull/4092),
+   [#4147](https://github.com/dotnet/SqlClient/pull/4147))
+
+- Fixed `SqlBulkCopy` failing on Azure Synapse Analytics dedicated SQL pools by using `STRING_AGG` for the column-list query when targeting Synapse.
+  ([#4149](https://github.com/dotnet/SqlClient/issues/4149),
+   [#4176](https://github.com/dotnet/SqlClient/pull/4176),
+   [#4182](https://github.com/dotnet/SqlClient/pull/4182))
+
+- Fixed `SqlDataReader.GetFieldType()` and `GetProviderSpecificFieldType()` returning incorrect type for vector float32 columns.
+  ([#4104](https://github.com/dotnet/SqlClient/issues/4104),
+   [#4105](https://github.com/dotnet/SqlClient/pull/4105),
+   [#4152](https://github.com/dotnet/SqlClient/pull/4152))
+
+- Added missing `System.Data.Common` (v4.3.0) NuGet package dependency for .NET Framework consumers to resolve `CS0012` compilation errors.
+  ([#4063](https://github.com/dotnet/SqlClient/pull/4063),
+   [#4074](https://github.com/dotnet/SqlClient/pull/4074))
+
+### Changed
+
+- Enabled the User Agent TDS feature extension unconditionally; removed the `Switch.Microsoft.Data.SqlClient.EnableUserAgent` AppContext switch.
+  ([#4124](https://github.com/dotnet/SqlClient/pull/4124),
+   [#4154](https://github.com/dotnet/SqlClient/pull/4154))
+
+- Added type forwards from the core assembly to public types moved to `Microsoft.Data.SqlClient.Extensions.Abstractions`.
+  ([#4067](https://github.com/dotnet/SqlClient/pull/4067),
+   [#4117](https://github.com/dotnet/SqlClient/pull/4117))
+
+- Fixed API documentation include paths and duplicate doc snippets.
+  ([#4084](https://github.com/dotnet/SqlClient/pull/4084),
+   [#4086](https://github.com/dotnet/SqlClient/pull/4086),
+   [#4107](https://github.com/dotnet/SqlClient/pull/4107),
+   [#4161](https://github.com/dotnet/SqlClient/pull/4161))
+
 ## [Stable Release 7.0.0] - 2026-03-17
 
 This section summarizes all changes across the 7.0 preview cycle for users upgrading from the latest 6.1 stable release.
diff --git a/release-notes/7.0/7.0.1.md b/release-notes/7.0/7.0.1.md
new file mode 100644
index 0000000000..9d64ae910c
--- /dev/null
+++ b/release-notes/7.0/7.0.1.md
@@ -0,0 +1,115 @@
+# Release Notes
+
+## Stable Release 7.0.1 - 2026-04-23
+
+This update brings the following changes since the [7.0.0](7.0.0.md) release:
+
+### Fixed
+
+- Fixed `SqlBulkCopy` failing on SQL Server 2016 with `Invalid column name 'graph_type'` error. The column metadata query now uses dynamic SQL so that references to the `graph_type` column (introduced in SQL Server 2017) are not compiled on older versions that lack the column.
+  ([#3714](https://github.com/dotnet/SqlClient/issues/3714),
+   [#4092](https://github.com/dotnet/SqlClient/pull/4092),
+   [#4147](https://github.com/dotnet/SqlClient/pull/4147))
+
+- Fixed `SqlBulkCopy` failing on Azure Synapse Analytics dedicated SQL pools. The column-list query previously used a variable-assignment pattern that Synapse does not support; it now uses `STRING_AGG` when targeting Synapse (engine edition 6) and falls back to the variable-assignment approach for SQL Server 2016 compatibility.
+  ([#4149](https://github.com/dotnet/SqlClient/issues/4149),
+   [#4176](https://github.com/dotnet/SqlClient/pull/4176),
+   [#4182](https://github.com/dotnet/SqlClient/pull/4182))
+
+- Fixed `SqlDataReader.GetFieldType()` and `GetProviderSpecificFieldType()` returning `typeof(byte[])` instead of `typeof(SqlVector<float>)` for vector float32 columns. The methods now follow the same type-determination logic as `GetValue()`.
+  ([#4104](https://github.com/dotnet/SqlClient/issues/4104),
+   [#4105](https://github.com/dotnet/SqlClient/pull/4105),
+   [#4152](https://github.com/dotnet/SqlClient/pull/4152))
+
+- Added missing `System.Data.Common` (v4.3.0) NuGet package dependency for .NET Framework consumers. The inbox `System.Data.Common` assembly on .NET Framework predates APIs such as `IDbColumnSchemaGenerator`; without the explicit NuGet dependency, consumers encountered `CS0012` compilation errors when using these types through `Microsoft.Data.SqlClient`.
+  ([#4063](https://github.com/dotnet/SqlClient/pull/4063),
+   [#4074](https://github.com/dotnet/SqlClient/pull/4074))
+
+### Changed
+
+- Enabled the User Agent TDS feature extension unconditionally. The `Switch.Microsoft.Data.SqlClient.EnableUserAgent` AppContext switch has been removed; the driver now always sends User Agent information during login.
+  ([#4124](https://github.com/dotnet/SqlClient/pull/4124),
+   [#4154](https://github.com/dotnet/SqlClient/pull/4154))
+
+- Added type forwards from the core `Microsoft.Data.SqlClient` assembly to public types that were moved to the `Microsoft.Data.SqlClient.Extensions.Abstractions` package: `SqlAuthenticationMethod`, `SqlAuthenticationParameters`, `SqlAuthenticationProvider`, `SqlAuthenticationProviderException`, and `SqlAuthenticationToken`. This ensures binary compatibility for assemblies compiled against earlier versions of `Microsoft.Data.SqlClient` where these types lived in the core assembly.
+  ([#4067](https://github.com/dotnet/SqlClient/pull/4067),
+   [#4117](https://github.com/dotnet/SqlClient/pull/4117))
+
+- Fixed API documentation include paths and duplicate doc snippets.
+  ([#4084](https://github.com/dotnet/SqlClient/pull/4084),
+   [#4086](https://github.com/dotnet/SqlClient/pull/4086),
+   [#4107](https://github.com/dotnet/SqlClient/pull/4107),
+   [#4161](https://github.com/dotnet/SqlClient/pull/4161))
+
+## Contributors
+
+We thank the following public contributors. Their efforts toward this project are very much appreciated.
+
+- [edwardneal](https://github.com/edwardneal)
+
+## Target Platform Support
+
+- .NET Framework 4.6.2+ (Windows x86, Windows x64, Windows ARM64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM, Windows ARM64, Linux, macOS)
+
+### Dependencies
+
+#### .NET 9.0
+
+- Microsoft.Bcl.Cryptography 9.0.13
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 9.0.13
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.13
+- System.Security.Cryptography.Pkcs 9.0.13
+
+#### .NET 8.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+
+#### .NET Standard 2.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+
+#### .NET Framework 4.6.2+
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- System.Buffers 4.6.1
+- System.Data.Common 4.3.0
+- System.Diagnostics.DiagnosticSource 10.0.3
+- System.Memory 4.6.3
+- System.Runtime.InteropServices.RuntimeInformation 4.3.0
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+- System.ValueTuple 4.6.2
diff --git a/release-notes/7.0/README.md b/release-notes/7.0/README.md
index 70cfdc3835..5b37ec17d8 100644
--- a/release-notes/7.0/README.md
+++ b/release-notes/7.0/README.md
@@ -4,9 +4,9 @@ The following Microsoft.Data.SqlClient 7.0 releases have been shipped:
 
 | Release Date | Version | Notes |
 | :-- | :-- | :--: |
+| 2026-04-23 | 7.0.1 | [Release Notes](7.0.1.md) |
 | 2026-03-17 | 7.0.0 | [Release Notes](7.0.0.md) |
 | 2026-03-05 | 7.0.0-preview4.26064.3 | [Release Notes](7.0.0-preview4.md) |
 | 2025-12-08 | 7.0.0-preview3.25342.7 | [Release Notes](7.0.0-preview3.md) |
 | 2025-10-16 | 7.0.0-preview2.25289.6 | [Release Notes](7.0.0-preview2.md) |
 | 2025-09-12 | 7.0.0-preview1.25257.1 | [Release Notes](7.0.0-preview1.md) |
-

From 62d96adb8652b6234c1a5e8acf3361c2e5dec464 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Fri, 24 Apr 2026 18:49:12 -0500
Subject: [PATCH 068/298] `build2.proj` All the Things (#4204)

* Adding steps/job for OneBranch pipeline builds to utilize build2.proj.

* Default ThisAssembly namespace to $\(AssemblyName\)

* Migrate Microsoft.SqlServer.Server to build2.proj norms

* Wire official pipeline to use build2.proj for SqlSever

* :robot: Wire SqlServer to CI/PR pipeline.

* Migrate Microsoft.Data.SqlClient.Logging to build2.proj norms

* Wire official pipeline to use build2.proj for Logging

* Migrate Microsoft.Data.SqlClient.Extensions.Abstractions to build2.proj norms

* Wire official pipeline to use build2.proj for Abstractions

* Migrate Microsoft.Data.SqlClient.Extensions.Azure to build2.proj norms

* Wire official pipeline to use build2.proj for Azure

* Move AKV Provider to root folder (since it is a package we release)

* Migrate Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider to build2.proj norms

* Wire official pipeline to use build2.proj for AkvProvider

* Migrate CI/PR pipeline AKV Provider build steps to directly call the csproj, just like all the other projects.

* Mds => SqlClient
Migrate the SqlClient csproj files to the same pattern as the other projects.

* Wire official pipeline to use build2.proj for SqlClient

* Wire CI/PR pipelines to use build2.proj for SqlClient

* Delete obsolete pipeline files and build.proj

* Update documentation in build2.proj

* Remove global versions.props and move build number coalescing to Directory.Build.props

* Remove tool restore from ref project

* Add utility targets

* BUILDGUIDE update and new TESTGUIDE

* Round one of code review changes

* build2.proj => build.proj

* Nobody cares how pretty I make the commits, so I might as well stop caring too.

* Oh look something else is broken

* Update instructions
---
 .github/copilot-instructions.md               |   11 +-
 .../ado-pipelines.instructions.md             |   27 +-
 .../onebranch-pipeline-design.instructions.md |   16 +-
 .github/prompts/ado-work-item-agent.prompt.md |    6 +-
 .github/prompts/fix-bug.prompt.md             |    6 +-
 .github/prompts/implement-feature.prompt.md   |    6 +-
 .github/prompts/release-notes.prompt.md       |    2 +-
 .../prompts/update-build-pipelines.prompt.md  |   28 +-
 BUILDGUIDE.md                                 |  425 +++---
 Directory.Packages.props                      |    4 +-
 TESTGUIDE.md                                  |  311 +++++
 build.proj                                    | 1160 ++++++++++++++---
 build2.proj                                   |  586 ---------
 .../templates/jobs/ci-build-nugets-job.yml    |   19 +-
 .../build-and-run-tests-netcore-step.yml      |    8 +-
 .../steps/build-and-run-tests-netfx-step.yml  |    8 +-
 .../templates/steps/ci-project-build-step.yml |   27 +-
 .../templates/steps/run-all-tests-step.yml    |   90 +-
 eng/pipelines/dotnet-sqlclient-ci-core.yml    |   15 +
 .../jobs/pack-sqlserver-package-ci-job.yml    |  113 ++
 .../jobs/test-azure-package-ci-job.yml        |    2 +-
 .../libraries/ci-build-variables.yml          |   16 +-
 .../onebranch/jobs/build-buildproj-job.yml    |  212 +++
 .../jobs/build-signed-csproj-package-job.yml  |  216 ---
 .../build-signed-sqlclient-package-job.yml    |  180 ---
 .../onebranch/jobs/publish-symbols-job.yml    |   25 +-
 .../jobs/validate-signed-package-job.yml      |   51 +-
 .../onebranch/stages/build-stages.yml         |  143 +-
 .../stages/publish-symbols-stage.yml          |   25 +-
 .../onebranch/steps/build-buildproj-step.yml  |   64 +
 .../onebranch/steps/build-csproj-step.yml     |   43 -
 .../onebranch/steps/build-sqlclient-step.yml  |   41 -
 .../onebranch/steps/pack-buildproj-step.yml   |   84 ++
 .../onebranch/steps/pack-csproj-step.yml      |   35 -
 .../onebranch/steps/pack-sqlclient-step.yml   |   42 -
 ...ml => roslyn-analyzers-buildproj-step.yml} |   34 +-
 .../steps/roslyn-analyzers-csproj-step.yml    |   39 -
 .../onebranch/variables/common-variables.yml  |   14 +-
 .../sqlclient-pr-package-ref-pipeline.yml     |    1 -
 .../sqlclient-pr-project-ref-pipeline.yml     |    1 -
 .../build-sqlserver-package-ci-stage.yml      |   83 ++
 .../stages/verify-nuget-packages-ci-stage.yml |   11 +-
 src/Directory.Build.props                     |   68 +-
 .../src}/.editorconfig                        |    0
 .../src}/AzureSqlKeyCryptographer.cs          |    0
 .../src}/Constants.cs                         |    0
 .../src}/LocalCache.cs                        |    0
 ...waysEncrypted.AzureKeyVaultProvider.csproj |   68 +-
 .../src}/PackageReadme.md                     |    0
 ...qlColumnEncryptionAzureKeyVaultProvider.cs |    0
 .../src}/Strings.Designer.cs                  |    0
 .../src}/Strings.resx                         |    0
 .../src}/Utils.cs                             |    0
 .../src/Versions.props                        |   86 ++
 .../Abstractions/src/Abstractions.csproj      |  118 +-
 .../src/AbstractionsVersions.props            |   67 -
 .../Abstractions/src/Versions.props           |   87 ++
 .../test/Abstractions.Test.csproj             |   38 +-
 .../Azure/src/Azure.csproj                    |  132 +-
 .../Azure/src/AzureVersions.props             |   66 -
 .../Azure/src/Versions.props                  |   86 ++
 .../Azure/test/Azure.Test.csproj              |   24 +-
 .../Logging/src/Logging.csproj                |  101 +-
 .../Logging/src/LoggingVersions.props         |   67 -
 .../Logging/src/Versions.props                |   87 ++
 src/Microsoft.Data.SqlClient.slnx             |    5 +-
 .../{MdsVersions.props => Versions.props}     |   38 +-
 .../AkvProviderVersions.props                 |   66 -
 .../Microsoft.Data.SqlClient.csproj           |   22 +-
 .../ref/Microsoft.Data.SqlClient.csproj       |   14 +-
 .../src/Microsoft.Data.SqlClient.csproj       |  118 +-
 .../src/Microsoft/Data/SqlClient/UserAgent.cs |   36 +-
 ...soft.Data.SqlClient.FunctionalTests.csproj |    5 -
 ...icrosoft.Data.SqlClient.ManualTests.csproj |    8 +-
 .../StressTests/Directory.Packages.props      |    6 -
 .../Microsoft.Data.SqlClient.UnitTests.csproj |    4 -
 .../tests/UnitTests/UserAgentTests.cs         |   30 +-
 src/Microsoft.SqlServer.Server/.editorconfig  |    8 -
 ...ize.cs => IBinarySerialize.netstandard.cs} |    4 +
 ....cs => InvalidUdtException.netstandard.cs} |    4 +
 .../Microsoft.SqlServer.Server.csproj         |   72 +-
 ...te.cs => SqlFacetAttribute.netstandard.cs} |    4 +
 ...cs => SqlFunctionAttribute.netstandard.cs} |    4 +
 ...e.cs => SqlMethodAttribute.netstandard.cs} |    4 +
 ...rDefinedAggregateAttribute.netstandard.cs} |    4 +
 ...qlUserDefinedTypeAttribute.netstandard.cs} |    4 +
 ...Helper.cs => StringsHelper.netstandard.cs} |    6 +-
 ...{TypeForwards.cs => TypeForwards.netfx.cs} |    5 +-
 src/Microsoft.SqlServer.Server/Versions.props |   87 ++
 tools/props/Versions.props                    |   39 -
 tools/targets/GenerateThisAssemblyCs.targets  |    4 +-
 91 files changed, 3210 insertions(+), 2716 deletions(-)
 create mode 100644 TESTGUIDE.md
 delete mode 100644 build2.proj
 create mode 100644 eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
 create mode 100644 eng/pipelines/onebranch/jobs/build-buildproj-job.yml
 delete mode 100644 eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
 delete mode 100644 eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
 create mode 100644 eng/pipelines/onebranch/steps/build-buildproj-step.yml
 delete mode 100644 eng/pipelines/onebranch/steps/build-csproj-step.yml
 delete mode 100644 eng/pipelines/onebranch/steps/build-sqlclient-step.yml
 create mode 100644 eng/pipelines/onebranch/steps/pack-buildproj-step.yml
 delete mode 100644 eng/pipelines/onebranch/steps/pack-csproj-step.yml
 delete mode 100644 eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
 rename eng/pipelines/onebranch/steps/{roslyn-analyzers-sqlclient-step.yml => roslyn-analyzers-buildproj-step.yml} (51%)
 delete mode 100644 eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
 create mode 100644 eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
 rename src/{Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider => Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src}/.editorconfig (100%)
 rename src/{Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider => Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src}/AzureSqlKeyCryptographer.cs (100%)
 rename src/{Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider => Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src}/Constants.cs (100%)
 rename src/{Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider => Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src}/LocalCache.cs (100%)
 rename src/{Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider => Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src}/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj (66%)
 rename src/{Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider => Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src}/PackageReadme.md (100%)
 rename src/{Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider => Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src}/SqlColumnEncryptionAzureKeyVaultProvider.cs (100%)
 rename src/{Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider => Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src}/Strings.Designer.cs (100%)
 rename src/{Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider => Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src}/Strings.resx (100%)
 rename src/{Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider => Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src}/Utils.cs (100%)
 create mode 100644 src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
 delete mode 100644 src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props
 create mode 100644 src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
 delete mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props
 create mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
 delete mode 100644 src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props
 create mode 100644 src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
 rename src/Microsoft.Data.SqlClient/{MdsVersions.props => Versions.props} (65%)
 delete mode 100644 src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props
 delete mode 100644 src/Microsoft.SqlServer.Server/.editorconfig
 rename src/Microsoft.SqlServer.Server/{IBinarySerialize.cs => IBinarySerialize.netstandard.cs} (97%)
 rename src/Microsoft.SqlServer.Server/{InvalidUdtException.cs => InvalidUdtException.netstandard.cs} (98%)
 rename src/Microsoft.SqlServer.Server/{SqlFacetAttribute.cs => SqlFacetAttribute.netstandard.cs} (98%)
 rename src/Microsoft.SqlServer.Server/{SqlFunctionAttribute.cs => SqlFunctionAttribute.netstandard.cs} (99%)
 rename src/Microsoft.SqlServer.Server/{SqlMethodAttribute.cs => SqlMethodAttribute.netstandard.cs} (98%)
 rename src/Microsoft.SqlServer.Server/{SqlUserDefinedAggregateAttribute.cs => SqlUserDefinedAggregateAttribute.netstandard.cs} (99%)
 rename src/Microsoft.SqlServer.Server/{SqlUserDefinedTypeAttribute.cs => SqlUserDefinedTypeAttribute.netstandard.cs} (99%)
 rename src/Microsoft.SqlServer.Server/{StringsHelper.cs => StringsHelper.netstandard.cs} (99%)
 rename src/Microsoft.SqlServer.Server/{TypeForwards.cs => TypeForwards.netfx.cs} (97%)
 create mode 100644 src/Microsoft.SqlServer.Server/Versions.props
 delete mode 100644 tools/props/Versions.props

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 4c80da66ff..0c78f461cb 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -11,17 +11,18 @@
 
 ## 📚 Project Overview
 This project is a .NET data provider for SQL Server, enabling .NET applications to interact with SQL Server databases. It supports various features like connection pooling, transaction management, and asynchronous operations.
-The project builds from a **single unified project** at `src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj` that multi-targets `net462`, `net8.0`, and `net9.0`. The legacy `netfx/` and `netcore/` directories are being phased out — only their `ref/` folders (which define the public API surface) remain active.
+The project builds from a **single unified project** at `src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj`. It targets `net8.0` and `net9.0` on all supported hosts, and adds `net462` only when building on Windows. The legacy `netfx/` and `netcore/` directories are being phased out — only their `ref/` folders (which define the public API surface) remain active.
 The project includes:
 - **Public APIs**: Defined in `netcore/ref/` and `netfx/ref/` directories.
 - **Implementations**: All source code in `src/Microsoft.Data.SqlClient/src/`.
 - **Tests**: Located in the `tests/` directory, covering unit and integration tests.
-  - **Unit Tests**: Located in `tests/UnitTests/` directory, which includes tests for individual components and methods.
-  - **Functional Tests**: Located in `tests/FunctionalTests/` directory, which includes tests for various features and functionalities that can be run without a SQL Server instance.
-  - **Manual Tests**: Located in `tests/ManualTests/` directory, which includes tests that require a SQL Server instance to run.
+  - **Unit Tests**: Located in `src/Microsoft.Data.SqlClient/tests/UnitTests/`.
+  - **Functional Tests**: Located in `src/Microsoft.Data.SqlClient/tests/FunctionalTests/`.
+  - **Manual Tests**: Located in `src/Microsoft.Data.SqlClient/tests/ManualTests/`.
+  - **Performance/Stress Tests**: Located in `src/Microsoft.Data.SqlClient/tests/PerformanceTests/` and `src/Microsoft.Data.SqlClient/tests/StressTests/`.
 - **Documentation**: Found in the `doc/` directory, including API documentation, usage examples.
 - **Policies**: Contribution guidelines, coding standards, and review policies in the `policy/` directory.
-- **Building**: The project uses MSBuild for building and testing, with configurations and targets defined in the `build.proj` file, whereas instructions are provided in the `BUILDGUIDE.md` file.
+- **Building**: The repo uses `build.proj` for orchestrated build/test/pack workflows, `src/Microsoft.Data.SqlClient.slnx` for solution-centric development tooling, and Azure DevOps YAML under `eng/pipelines/` plus `eng/pipelines/onebranch/` for CI and official release flows. See `BUILDGUIDE.md` for local build details.
 - **CI/CD**: ADO Pipelines for CI/CD and Pull request validation are defined in the `eng/` directory, ensuring code quality and automated testing.
 
 ## 📦 Products
diff --git a/.github/instructions/ado-pipelines.instructions.md b/.github/instructions/ado-pipelines.instructions.md
index db053130e0..5dfd35a12c 100644
--- a/.github/instructions/ado-pipelines.instructions.md
+++ b/.github/instructions/ado-pipelines.instructions.md
@@ -22,14 +22,14 @@ Top-level CI/PR pipeline files:
 - `dotnet-sqlclient-ci-project-reference-pipeline.yml` — CI with Project references (Release)
 - `sqlclient-pr-package-ref-pipeline.yml` — PR validation with Package references
 - `sqlclient-pr-project-ref-pipeline.yml` — PR validation with Project references
-- `stress-tests-pipeline.yml` — Stress tests triggered after successful CI-Package runs
+- `stress/stress-tests-pipeline.yml` — Stress test pipeline and templates
 
 Reusable templates are organized under:
 - `common/templates/jobs/` — Job templates (`ci-build-nugets-job`, `ci-code-coverage-job`, `ci-run-tests-job`)
 - `common/templates/stages/` — Stage templates (`ci-run-tests-stage`)
 - `common/templates/steps/` — Step templates (build, test, config, publish)
 - `jobs/` — Package-specific CI jobs (pack/test Abstractions, Azure, Logging, stress)
-- `stages/` — Package-specific CI stages (build Logging → Abstractions → SqlClient → Azure → verify → stress)
+- `stages/` — Package-specific CI stages (generate secrets, build SqlServer/Logging/Abstractions/SqlClient/Azure, verify packages)
 - `libraries/` — Shared variables (`ci-build-variables.yml`)
 - `steps/` — SDK install steps
 
@@ -43,10 +43,11 @@ Key parameters:
 - `testJobTimeout` (required) — test job timeout in minutes
 - `targetFrameworks` — Windows test TFMs; default `[net462, net8.0, net9.0, net10.0]`
 - `targetFrameworksUnix` — Unix test TFMs; default `[net8.0, net9.0, net10.0]`
+- `netcoreVersionTestUtils` — default runtime for shared test utilities; default `net10.0`
 - `testSets` — test partitions; default `[1, 2, 3]`
 - `useManagedSNI` — SNI variants to test; default `[false, true]`
 - `runAlwaysEncryptedTests` — include AE test set; default `true`
-- `enableStressTests` — enable stress test stage; default `false`
+- `runLegacySqlTests` — include SQL Server 2016/2017 manual-test legs; default `true`
 - `debug` — enable debug output; default `false`
 - `dotnetVerbosity` — MSBuild verbosity; default `normal`
 
@@ -54,14 +55,16 @@ Key parameters:
 
 Stages execute in dependency order (Package reference mode requires artifacts from prior stages):
 1. `generate_secrets` — Generate test secrets
-2. `build_logging_package_stage` — Build Logging package
-3. `build_abstractions_package_stage` — Build Abstractions (depends on Logging)
-4. `build_sqlclient_package_stage` — Build SqlClient + AKV Provider (depends on Abstractions + Logging)
-5. `build_azure_package_stage` — Build Azure extensions (depends on Abstractions + Logging + SqlClient)
-6. `verify_nuget_packages_stage` — Verify NuGet package metadata
-7. `stress_tests_stage` — Optional stress tests
+2. `build_sqlserver_package_stage` — Build `Microsoft.SqlServer.Server`
+3. `build_logging_package_stage` — Build Logging package
+4. `build_abstractions_package_stage` — Build Abstractions (package mode depends on Logging)
+5. `build_sqlclient_package_stage` — Build SqlClient and produce the AKV provider package
+6. `build_azure_package_stage` — Build Azure extensions
+7. `verify_nuget_packages_stage` — Verify NuGet package metadata
 8. `ci_run_tests_stage` — Run MDS and AKV test suites
 
+Stress testing is no longer a stage threaded through `dotnet-sqlclient-ci-core.yml`; it lives under `eng/pipelines/stress/` as a separate pipeline flow.
+
 When adding a new build stage, respect the dependency graph and pass artifact names/versions to downstream stages.
 
 ## PR vs CI Pipeline Differences
@@ -70,12 +73,12 @@ PR pipelines:
 - Trigger on PRs to `dev/*`, `feat/*`, `main`; exclude `eng/pipelines/onebranch/*` paths
 - Use reduced TFM matrix: `[net462, net8.0, net9.0]` (excludes net10.0)
 - Timeout: 90 minutes
-- Package-ref PR disables Always Encrypted tests in Debug config
+- Package-ref PR disables Always Encrypted tests in Debug config and also disables legacy SQL Server test legs to keep validation fast
 
 CI pipelines:
 - Trigger on push to `main` (GitHub) and `internal/main` (ADO) with `batch: true`
 - Scheduled weekday builds (see individual pipeline files for cron times)
-- Full TFM matrix including net10.0
+- Full TFM matrix including net10.0 test legs and legacy SQL Server manual-test coverage
 
 ## Test Configuration
 
@@ -97,7 +100,7 @@ Flaky test quarantine:
 
 SNI testing — `useManagedSNI` controls testing with native SNI (`false`) or managed SNI (`true`)
 
-Test timeout — `--blame-hang-timeout 10m` (configured in `build.proj`); tests exceeding 10 minutes are killed
+Test timeout — `--blame-hang-timeout 10m` (configured in `build.proj` and threaded through CI test steps); tests exceeding 10 minutes are killed
 
 ## Variables
 
diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index f1520fa0e0..2421674eef 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -34,7 +34,7 @@ Defined in `stages/build-stages.yml`. Four build stages plus validation, ordered
 - **`build_abstractions`** (Stage 2) — Abstractions; `dependsOn: build_independent`; downloads Logging artifact
 - **`build_dependent`** (Stage 3) — SqlClient and Extensions.Azure in parallel; `dependsOn: build_abstractions`; downloads Abstractions + Logging artifacts
 - **`build_addons`** (Stage 4) — AKV Provider; `dependsOn: build_dependent`; downloads SqlClient + Abstractions + Logging artifacts
-- **`mds_package_validation`** — Validates signed SqlClient package; `dependsOn: build_dependent`; runs in parallel with Stage 4
+- **`sqlclient_package_validation`** — Validates signed SqlClient package; `dependsOn: build_dependent`; runs in parallel with Stage 4
 
 Each build job copies PDB files into `$(JOB_OUTPUT)/symbols/` so they are included in the auto-published pipeline artifact alongside the NuGet packages in `$(JOB_OUTPUT)/packages/`.
 
@@ -47,17 +47,16 @@ Stage conditional rules:
 
 ## Job Templates
 
-- **`build-signed-csproj-package-job.yml`** — Generic job for csproj-based packages (Logging, SqlServer.Server, Abstractions, Azure, AKV Provider). Flow: Build DLLs → ESRP DLL signing → NuGet pack (`NoBuild=true`) → ESRP NuGet signing → Copy PDBs to artifact
-- **`build-signed-sqlclient-package-job.yml`** — SqlClient-specific job (nuspec-based). Flow: Build all configurations → ESRP DLL signing (main + resource DLLs) → NuGet pack via nuspec → ESRP NuGet signing → Copy PDBs to artifact
+- **`build-buildproj-job.yml`** — Shared build.proj-driven package job used for all shipped packages. Flow: build via `build.proj` → optional ESRP DLL signing → pack via `build.proj` → optional ESRP NuGet signing → copy outputs for APIScan/artifacts
 - **`validate-signed-package-job.yml`** — Validates signed MDS package (signature, strong names, folder structure, target frameworks)
 - **`publish-nuget-package-job.yml`** — Reusable release job using OneBranch `templateContext.type: releaseJob` with `inputs` for artifact download; pushes via `NuGetCommand@2`
 - **`publish-symbols-job.yml`** — Reusable symbols job: downloads a build artifact, locates PDBs under `symbols/`, and invokes `publish-symbols-step.yml`
 
-When adding a new csproj-based package:
-- Use `build-signed-csproj-package-job.yml` with appropriate `packageName`, `packageFullName`, `versionProperties`, and `downloadArtifacts`
-- Add build and pack targets to `build.proj`
+When adding a new package to the OneBranch flow:
+- Extend `build-buildproj-job.yml` inputs with the new package metadata and dependency artifacts
+- Add or update the corresponding build/pack targets in `build.proj`
 - Add version variables to `variables/common-variables.yml`
-- Add artifact name variable to `variables/onebranch-variables.yml`
+- Add artifact name variables to `variables/onebranch-variables.yml`
 
 ## Symbols Publishing Stage
 
@@ -124,8 +123,7 @@ Variable groups:
 
 - Uses ESRP v6 tasks (`EsrpMalwareScanning@6`, `EsrpCodeSigning@6`) with MSI/federated identity authentication
 - Signing only runs when `isOfficial: true` — non-official pipelines skip ESRP steps
-- csproj-based packages: sign DLLs first → pack with `NoBuild=true` → sign NuGet package (ensures NuGet contains signed DLLs)
-- SqlClient: sign DLLs (including resource DLLs) → nuspec pack → sign NuGet package
+- The shared OneBranch job signs DLLs before packing and signs the resulting NuGet package afterward so the published package contains signed binaries
 - DLL signing uses keyCode `CP-230012` (Authenticode); NuGet signing uses keyCode `CP-401405`
 - All ESRP credentials come from variable groups — never hardcode secrets in YAML
 
diff --git a/.github/prompts/ado-work-item-agent.prompt.md b/.github/prompts/ado-work-item-agent.prompt.md
index 6eb6319ef6..e94d667bac 100644
--- a/.github/prompts/ado-work-item-agent.prompt.md
+++ b/.github/prompts/ado-work-item-agent.prompt.md
@@ -23,7 +23,7 @@ Perform the following steps to address the work item. Think step-by-step.
 - Locate the relevant code in `src/` or `tests/`.
 
 ### 2. Planning and Branching
-- Propose a descriptive branch name following the pattern `dev/username/branch-name` (e.g., `dev/jdoe/fix-connection-pool`).
+- Propose a descriptive branch name following the repository rule `dev/automation/<branch-name>` (e.g., `dev/automation/fix-connection-pool`).
 - Identify any dependencies or potential breaking changes.
 
 ### 3. Implementation
@@ -33,13 +33,13 @@ Perform the following steps to address the work item. Think step-by-step.
 
 ### 4. Testing and Verification
 - **Mandatory**: All changes must be tested.
-- Create new unit tests in `tests/UnitTests` or functional tests in `tests/FunctionalTests` as appropriate.
+- Create new unit tests in `src/Microsoft.Data.SqlClient/tests/UnitTests` or functional tests in `src/Microsoft.Data.SqlClient/tests/FunctionalTests` as appropriate.
 - Verify that the tests pass.
 
 ### 5. Documentation and Finalization
 - If public APIs are modified, update the documentation in `doc/`.
 - Provide a clear summary of changes for the Pull Request.
-- Suggest an entry for [CHANGELOG.md](CHANGELOG.md) if the change is significant.
+- Suggest a release-note entry under `release-notes/` or in the PR description if the change is significant; do not edit `CHANGELOG.md` directly.
 
 ## Input
 **Work Item ID**: ${input:workItemId}
diff --git a/.github/prompts/fix-bug.prompt.md b/.github/prompts/fix-bug.prompt.md
index 47b143f31f..ade780708d 100644
--- a/.github/prompts/fix-bug.prompt.md
+++ b/.github/prompts/fix-bug.prompt.md
@@ -25,9 +25,9 @@ Follow this workflow step-by-step:
 ## 3. Write a Failing Test
 - Create a test that reproduces the bug BEFORE implementing the fix.
 - Choose the correct test project:
-  - `tests/UnitTests/` — for isolated logic tests (no SQL Server needed)
-  - `tests/FunctionalTests/` — for API behavior tests (no SQL Server needed)
-  - `tests/ManualTests/` — for integration tests (requires SQL Server)
+  - `src/Microsoft.Data.SqlClient/tests/UnitTests/` — for isolated logic tests (no SQL Server needed)
+  - `src/Microsoft.Data.SqlClient/tests/FunctionalTests/` — for API behavior tests (no SQL Server needed)
+  - `src/Microsoft.Data.SqlClient/tests/ManualTests/` — for integration tests (requires SQL Server)
 - Follow existing naming conventions: `{ClassName}Tests.cs` with methods named `{MethodName}_{Scenario}_{ExpectedResult}`.
 - If the bug is platform-specific, add appropriate `[ConditionalFact]` or `[ConditionalTheory]` attributes with `[PlatformSpecific]`.
 - **Cover both sync and async code paths** if the affected API has both variants (e.g., `Open`/`OpenAsync`, `ExecuteReader`/`ExecuteReaderAsync`). Sync and async paths often have different internal implementations and a bug may manifest in only one.
diff --git a/.github/prompts/implement-feature.prompt.md b/.github/prompts/implement-feature.prompt.md
index 4beae539fe..4623cb235c 100644
--- a/.github/prompts/implement-feature.prompt.md
+++ b/.github/prompts/implement-feature.prompt.md
@@ -62,9 +62,9 @@ Before writing code, produce a brief implementation plan covering:
 4. Test against multiple SQL Server versions.
 
 ## 5. Write Tests
-- **Unit tests** in `tests/UnitTests/` for isolated logic.
-- **Functional tests** in `tests/FunctionalTests/` for API behavior without SQL Server.
-- **Manual tests** in `tests/ManualTests/` for full integration with SQL Server.
+- **Unit tests** in `src/Microsoft.Data.SqlClient/tests/UnitTests/` for isolated logic.
+- **Functional tests** in `src/Microsoft.Data.SqlClient/tests/FunctionalTests/` for API behavior without SQL Server.
+- **Manual tests** in `src/Microsoft.Data.SqlClient/tests/ManualTests/` for full integration with SQL Server.
 - Cover:
   - Happy path and edge cases
   - **Both sync and async code paths** where the feature exposes both variants
diff --git a/.github/prompts/release-notes.prompt.md b/.github/prompts/release-notes.prompt.md
index b847e3c17a..0370e2b720 100644
--- a/.github/prompts/release-notes.prompt.md
+++ b/.github/prompts/release-notes.prompt.md
@@ -28,7 +28,7 @@ Each package has its own versioning and dependency sources. Use these to determi
 | Package | Version Source | Dependency Source |
 | ------- | -------------- | ----------------- |
 | `Microsoft.Data.SqlClient` | [tools/props/Versions.props](tools/props/Versions.props) (`MdsVersionDefault`) | [Directory.Packages.props](Directory.Packages.props) and the [project file](src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj) |
-| `AzureKeyVaultProvider` | [tools/props/Versions.props](tools/props/Versions.props) (`AkvVersionDefault`) | [AKV project file](src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj) and [Directory.Packages.props](Directory.Packages.props) |
+| `AzureKeyVaultProvider` | [tools/props/Versions.props](tools/props/Versions.props) (`AkvVersionDefault`) | [AKV project file](src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj) and [Directory.Packages.props](Directory.Packages.props) |
 | `Microsoft.SqlServer.Server` | [tools/props/Versions.props](tools/props/Versions.props) (`SqlServerPackageVersion`) | [SqlServer project file](src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj) |
 | `Extensions.Abstractions` | [AbstractionsVersions.props](src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props) | [Abstractions.csproj](src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj) |
 | `Extensions.Azure` | [AzureVersions.props](src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props) | [Azure.csproj](src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj) |
diff --git a/.github/prompts/update-build-pipelines.prompt.md b/.github/prompts/update-build-pipelines.prompt.md
index a4715fa000..63c87ea9c3 100644
--- a/.github/prompts/update-build-pipelines.prompt.md
+++ b/.github/prompts/update-build-pipelines.prompt.md
@@ -15,35 +15,40 @@ Follow this workflow step-by-step:
 ## 1. Understand the Pipeline Architecture
 - Read the relevant pipeline file(s) in `eng/pipelines/`.
 - Key pipelines:
-  - `dotnet-sqlclient-ci-core.yml` — Core CI pipeline (reusable by reference pipelines)
+  - `dotnet-sqlclient-ci-core.yml` — Core CI pipeline template used by CI and PR definitions
   - `dotnet-sqlclient-ci-project-reference-pipeline.yml` — CI with project references
   - `dotnet-sqlclient-ci-package-reference-pipeline.yml` — CI with package references
   - `sqlclient-pr-project-ref-pipeline.yml` — PR validation (project references)
   - `sqlclient-pr-package-ref-pipeline.yml` — PR validation (package references)
-  - `dotnet-sqlclient-signing-pipeline.yml` — Package signing
-  - `akv-official-pipeline.yml` — AKV provider official build (1ES/OneBranch)
-  - `stress-tests-pipeline.yml` — Stress tests
+  - `onebranch/sqlclient-official.yml` — official OneBranch build/release pipeline
+  - `onebranch/sqlclient-non-official.yml` — non-official OneBranch build/release pipeline
+  - `stress/stress-tests-pipeline.yml` — stress test pipeline
 - Shared templates live in `eng/pipelines/common/templates/` (jobs/, stages/, steps/).
-- Variables are defined in `eng/pipelines/variables/` and `eng/pipelines/libraries/`.
+- CI variables are defined in `eng/pipelines/libraries/`; OneBranch variables are defined in `eng/pipelines/onebranch/variables/`.
 
 ## 2. Identify What Needs to Change
 - Determine which pipeline files are affected.
 - Check if the change impacts shared templates that are reused across multiple pipelines.
 - Identify if new parameters, variables, or stages need to be added.
 - Review existing parameters to understand the current configuration surface:
-  - `targetFrameworks` / `targetFrameworksUnix` — test target frameworks
+  - `targetFrameworks` / `targetFrameworksUnix` — Windows and Unix test TFMs
+  - `netcoreVersionTestUtils` — runtime used by shared test utilities
   - `referenceType` — Project or Package reference
   - `buildConfiguration` — Debug/Release
   - `useManagedSNI` — Managed vs Native SNI testing
+  - `runLegacySqlTests` — whether to include SQL Server 2016/2017 legs
 
 ## 3. Implement the Change
 - Modify YAML files following the existing patterns and indentation style.
 - When adding new stages, follow the existing stage ordering:
-  1. `build_abstractions_package_stage`
-  2. `build_sqlclient_package_stage`
-  3. `build_azure_package_stage`
-  4. `stress_tests_stage` (optional)
-  5. `run_tests_stage`
+  1. `generate_secrets`
+  2. `build_sqlserver_package_stage`
+  3. `build_logging_package_stage`
+  4. `build_abstractions_package_stage`
+  5. `build_sqlclient_package_stage`
+  6. `build_azure_package_stage`
+  7. `verify_nuget_packages_stage`
+  8. `ci_run_tests_stage`
 - When adding new test parameters, ensure they are wired through to test execution steps.
 - When modifying shared templates, verify all consuming pipelines still work.
 
@@ -52,6 +57,7 @@ Follow this workflow step-by-step:
 - Test filters by platform: `nonnetfxtests`, `nonnetcoreapptests`, `nonwindowstests`, `nonlinuxtests`.
 - SNI testing matrix: both Native (`useManagedSNI=false`) and Managed (`useManagedSNI=true`).
 - Always Encrypted tests controlled by `runAlwaysEncryptedTests` parameter.
+- Stress coverage is maintained under `eng/pipelines/stress/`, not as a stage inside `dotnet-sqlclient-ci-core.yml`.
 
 ## 5. Validate
 - Verify YAML syntax is valid.
diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 5da2e2ffd6..7c8e4acb93 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -1,271 +1,318 @@
-# Guidelines for Building Microsoft.Data.SqlClient
+# Build Guide for Microsoft.Data.SqlClient and Related Packages
 
-This document provides all the necessary details to build the driver and run tests present in the repository.
+This document provides details on how to build the Microsoft.Data.SqlClient package and the other related packages
+contained within this repository.
 
 ## Prerequisites
 
 ### .NET SDK
+Projects in this repository require the .NET SDK to be installed in order to build. For the exact version required for
+building the current version, see [global.json](global.json). Downloads for .NET SDK can be found at:
+https://dotnet.microsoft.com/en-us/download/dotnet
 
-The projects in this repo require the .NET 10.0 SDK to build.  Please ensure you
-have the latest version of that SDK installed.
+The .NET SDK contains support for building for previous versions of .NET, including support for building .NET Framework
+on operating systems that do not support .NET Framework. As such, it is not necessary to install any version of the
+.NET SDK aside from the version specified in [global.json](global.json).
 
-Tests and tools may require different .NET Runtimes that may be installed
-independently.  For example, tests targeting .NET 8.0 will need that runtime
-installed.
+### Miscellaneous
 
-### Visual Studio
+**Powershell** is required to run several miscellaneous tasks as part of building and packaging. On Windows systems,
+no action is required. On Linux and MacOS systems, the `pwsh` command is required to be in the `$PATH` environment
+variable. For specific instructions see: [Install PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/install-powershell)
 
-This project should be built with Visual Studio 2019+ for the best compatibility. The required set of components are provided in the below file:
+The **NuGet** binary is required to package the Microsoft.Data.SqlClient project. For convenience, this can be be done
+via the PowerShell script [tools/scripts/downloadLatestNuget.ps1](tools/scripts/downloadLatestNuget.ps1), however, any
+`nuget.exe` binary can be used.
 
-- **Visual Studio 2019** with imported components: [VS19Components](/tools/vsconfig/VS19Components.vsconfig)
+## Developer Workflow
 
-- **Powershell**: To build SqlClient on Linux, powershell is needed as well. Follow the distro specific instructions at [Install Powershell on Linux](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-linux?view=powershell-7.4)
+Once you've cloned the repository and made your changes to the codebase, it is time to build, test, and optionally
+package the project. The `build.proj` file provides convenient targets to accomplish these tasks.
 
-Once the environment is setup properly, execute the desired set of commands below from the _root_ folder to perform the respective operations:
+> [!NOTE]
+> Although every effort has been made to make building and testing work in your IDE of choice, some quirks in behavior
+> may be noticed, possibly severe. All official build and test infrastructure uses the `build.proj` entrypoint, and it
+> is recommended that `build.proj` is used for local development, as well.
 
-### Manual Test Prerequisites
+> [!TIP]
+> `build.proj` was written with the intention of being called from `msbuild`. As such, the following examples below
+> use `msbuild`. On systems where `msbuild` is not available, simply replace `msbuild` with `dotnet msbuild` to get the
+> same behavior.
 
-Manual Tests require the below setup to run:
+> [!TIP]
+> This section is not exhaustive of all targets or parameters to `build.proj`. Complete documentation is avilable in
+> [`build.proj`](build.proj).
 
-- SQL Server with enabled Shared Memory, TCP and Named Pipes Protocols and access to the Client OS.
-- Databases "NORTHWIND" and "UdtTestDb" present in SQL Server, created using SQL scripts [createNorthwindDb.sql](tools/testsql/createNorthwindDb.sql) and [createUdtTestDb.sql](tools/testsql/createUdtTestDb.sql). To setup an Azure Database with "NORTHWIND" tables, use SQL Script: [createNorthwindAzureDb.sql](tools/testsql/createNorthwindAzureDb.sql).
-- Make a copy of the configuration file [config.default.json](src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json) and rename it to `config.json`. Update the values in `config.json`:
+### Building Projects
 
-  |Property|Description|Value|
-  |------|--------|-------------------|
-  |TCPConnectionString | Connection String for a TCP enabled SQL Server instance. | `Server={servername};Database={Database_Name};Trusted_Connection=True;` <br/> OR `Data Source={servername};Initial Catalog={Database_Name};Integrated Security=True;`|
-  |NPConnectionString | Connection String for a Named Pipes enabled SQL Server instance.| `Server=\\{servername}\pipe\sql\query;Database={Database_Name};Trusted_Connection=True;` <br/> OR <br/> `Data Source=np:{servername};Initial Catalog={Database_Name};Integrated Security=True;`|
-  |TCPConnectionStringHGSVBS | (Optional) Connection String for a TCP enabled SQL Server with Host Guardian Service (HGS) attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = HGS; Enclave Attestation Url = {AttestationURL};`|
-  |TCPConnectionStringNoneVBS | (Optional) Connection String for a TCP enabled SQL Server with a VBS Enclave and using None Attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = NONE;`|
-  |TCPConnectionStringAASSGX | (Optional) Connection String for a TCP enabled SQL Server with a SGX Enclave and using Microsoft Azure Attestation (AAS) attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = AAS; Enclave Attestation Url = {AttestationURL};`|
-  |EnclaveEnabled | Enables tests requiring an enclave-configured server.|
-  |TracingEnabled | Enables EventSource related tests |
-  |AADAuthorityURL | (Optional) Identifies the OAuth2 authority resource for `Server` specified in `AADPasswordConnectionString` | `https://login.windows.net/<tenant>`, where `<tenant>` is the tenant ID of the Entra ID (Azure AD) tenant |
-  |AADPasswordConnectionString | (Optional) Connection String for testing Entra ID Password Authentication. | `Data Source={server.database.windows.net}; Initial Catalog={Azure_DB_Name};Authentication=Active Directory Password; User ID={AAD_User}; Password={AAD_User_Password};`|
-  |AADSecurePrincipalId | (Optional) The Application Id of a registered application which has been granted permission to the database defined in the AADPasswordConnectionString. | {Application ID} |
-  |AADSecurePrincipalSecret | (Optional) A Secret defined for a registered application which has been granted permission to the database defined in the AADPasswordConnectionString. | {Secret} |
-  |AzureKeyVaultURL | (Optional) Azure Key Vault Identifier URL | `https://{keyvaultname}.vault.azure.net/` |
-  |AzureKeyVaultTenantId | (Optional) The Entra ID tenant (directory) Id of the service principal. | _{Tenant ID of Active Directory}_ |
-  |SupportsIntegratedSecurity | (Optional) Whether or not the USER running tests has integrated security access to the target SQL Server.| `true` OR `false`|
-  |LocalDbAppName | (Optional) If Local Db Testing is supported, this property configures the name of Local DB App instance available in client environment. Empty string value disables Local Db testing. | Name of Local Db App to connect to.|
-  |LocalDbSharedInstanceName | (Optional) If LocalDB testing is supported and the instance is shared, this property configures the name of the shared instance of LocalDB to connect to. | Name of shared instance of LocalDB. |
-  |FileStreamDirectory | (Optional) If File Stream is enabled on SQL Server, pass local directory path to be used for setting up File Stream enabled database. |  `D:\\escaped\\absolute\\path\\to\\directory\\` |
-  |UseManagedSNIOnWindows | (Optional) Enables testing with Managed SNI on Windows| `true` OR `false`|
-  |DNSCachingConnString | Connection string for a server that supports DNS Caching|
-  |EnclaveAzureDatabaseConnString | (Optional) Connection string for Azure database with enclaves |
-  |ManagedIdentitySupported | (Optional) When set to `false` **Managed Identity** related tests won't run. The default value is `true`. |
-  |IsManagedInstance | (Optional) When set to `true` **TVP** related tests will use non-Azure bsl files to compare test results. This is needed when testing against Azure Managed Instances; otherwise TVP Tests will fail on TestSet 3. The default value is `false`. |
-  |PowerShellPath | The full path to PowerShell.exe. This is not required if the path is present in the PATH environment variable. | `D:\\escaped\\absolute\\path\\to\\PowerShell.exe` |
+From the root of your repository, run `msbuild` against `build.proj` with a build target, following this pattern:
 
-## Test Configuration Environment Variables
+```bash
+msbuild build.proj -t:<build_target> [optional_parameters]
+```
+
+The following build targets can be used to build the following projects. All targets will implicitly build any other
+projects they depend on.
+
+| `<build_target>`            | Description                                                                     |
+|:----------------------------|:--------------------------------------------------------------------------------|
+| `Build`                     | Builds all projects for all platforms                                           |
+| `BuildAbstractions`         | Builds Microsoft.Data.SqlClient.Extensions.Abstractions                         |
+| `BuildAkvProvider`          | Builds Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider           |
+| `BuildAzure`                | Builds Microsoft.Data.SqlClient.Extensions.Azure                                |
+| `BuildLogging`              | Builds Microsoft.Data.SqlClient.Internal.Logging                                |
+| `BuildSqlClient`            | Builds all variants of Microsoft.Data.SqlClient, for all platforms              |
+| `BuildSqlClientRef`         | Builds the reference assemblies for Microsoft.Data.SqlClient                    |
+| `BuildSqlClientUnsupported` | Builds the "unsupported platform" assemblies for Microsoft.Data.SqlClient       |
+| `BuildSqlClientUnix`        | Builds the Unix-specific implementation binaries of Microsoft.Data.SqlClient    |
+| `BuildSqlClientWindows`     | Builds the Windows-specific implementation binaries of Microsoft.Data.SqlClient |
+| `BuildSqlServer`            | Builds Microsoft.SqlServer.Server                                               |
+
+A selection of parameters for build targets in `build.proj` can be found below:
+
+| `[optional_parameter]`            | Allowed Values                   | Default   | Description                                                                                                                                   |
+|-----------------------------------|----------------------------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| `-p:Configuration=`               | `Debug`, `Release`               | `Debug`   | Build configuration                                                                                                                           |
+| `-p:PackageVersion<TargetPackage> | `major.minor.patch[-prerelease]` | `[blank]` | Version to assign to the target package. Assembly and file versions are derived from this, if it is provided. See Versioning for more details |
+
+For most projects, build output is placed in `artifacts/<package_name>/Project-<configuration>/<tfm>`. `<package_name>`
+is the full name of the package, `<configuration>` is the build configuration, and `<tfm>` is the target framework
+moniker. SqlClient deviates slightly from this convention, since it consists of multiple projects and the
+implementation project is OS-specific. Implementation project output is placed in
+`artifacts/Microsoft.Data.SqlClient/Project-<configuration>/<os>/<tfm>`. The unsupported platform assemblies are placed
+in `artifacts/Microsoft.Data.SqlClient.unsupported/Project-<configuration>/<tfm>`, and the reference assemblies are
+placed in `artifacts/Microsoft.Data.SqlClient.ref/Project-<configuration>/<tfm>`.
+
+#### Examples
+
+Build all projects:
+```bash
+msbuild build.proj -t:Build
+```
 
-Environment variables can be used to override test configuration without modifying `config.json`
-files directly. This is useful when running tests via the command line, in CI/CD pipelines,
-containerized environments, or when switching between configurations frequently.
+Build Microsoft.Data.SqlClient in Release configuration:
+```bash
+msbuild build.proj -t:BuildSqlClient -p:Configuration=Release
+```
 
-### Main Test Suite (`Microsoft.Data.SqlClient.TestUtilities`)
+Build v1.2.3 of Microsoft.Data.SqlClient.Extensions.Abstractions:
+```bash
+msbuild build.proj -t:BuildAbstractions -p:PackageVersion=1.2.3
+```
 
-These variables apply to unit, functional, and manual tests. The configuration is defined in
-[`Config.cs`](src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs).
+### Testing Projects
 
-| Variable | Description | Default |
-|----------|-------------|---------|
-| `TEST_MDS_CONFIG` | Override the path to the `config.json` file used by the test runner. | `config.json` (in the working directory) |
-| `MDS_TCPConnectionString` | Override the TCP connection string. Takes precedence over the value in `config.json`. | Value from `config.json` |
+This section provides a summary and brief example of how to execute tests for projects in this repository. **For more
+information about test procedures, including config file setup, see [TESTGUIDE.md](TESTGUIDE.md).**
 
-Example:
+From the root of your repository, run `msbuild` against `build.proj` with a test target, following this pattern:
 
 ```bash
-export TEST_MDS_CONFIG=~/my-test-config.json
-export MDS_TCPConnectionString="Server=myserver;Database=mydb;Trusted_Connection=True;"
-dotnet test src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+msbuild build.proj -t:<test_target> [optional_parameters]
 ```
 
-### Performance Tests
+| `<test_target>`            | Description                                                                                                                                         |
+|----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------|
+| `Test`                     | Runs all tests in the repository for all platforms supported by the host OS. _This will take a considerable amount of time and is not recommended_. |
+| `TestAzure`                | Runs all tests for Microsoft.Data.SqlClient.Extensions.Azure                                                                                        |
+| `TestSqlClient`            | Runs all tests for Microsoft.Data.SqlClient.                                                                                                        |
+| `TestSqlClientFunctional`  | Runs the "functional" test project for Microsoft.Data.SqlClient. These are a mix of unit and integration tests against live servers.                |
+| `TestSqlClientManual`      | Runs the "manual" test project for Microsoft.Data.SqlClient. These are generally integration tests against live servers.                            |
+| `TestSqlClientUnit`        | Runs the unit test project for Microsoft.Data.SqlClient. These are a mix of unit tests and integration tests against simulated servers.             |
 
-These variables apply to performance benchmarks. The configuration is defined in
-[`Config.cs`](src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs).
+> [!TIP]
+> Test targets will automatically build the projects they depend on. Therefore, it is not necessary to explicitly build
+> (eg) SqlClient before executing the (eg) functional tests target.
 
-| Variable | Description | Default |
-|----------|-------------|---------|
-| `RUNNER_CONFIG` | Override the path to the `runnerconfig.json` file used by performance benchmarks. | `runnerconfig.json` (in the DLL output directory) |
+A selection of parameters for test targets in `build.proj` relevant to common developer workflows can be found below:
 
-See [Run Performance Tests](#run-performance-tests) for more details.
+| `[optional_parameter]` | Default Value                                            | Description                                                                                                                                                                                         |
+|------------------------|----------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `-p:Configuration=`    | `Debug`                                                  | Build configuration. Can be `Debug` or `Release`.                                                                                                                                                   |
+| `-p:DotnetPath=`       | `[blank]`                                                | Path to `dotnet` binary to run the test project. This is useful for running tests against x86 platform on a x86_64 machine. Path must end with `\` or `/`.                                          |
+| `-p:TestBlameTimeout=` | `10m`                                                    | How long to wait on a test before timing it out. Use `0` to disable hang timeouts.                                                                                                                  |
+| `-p:TestFilters=`      | `category!=failing&category!=flaky&category!=interactive` | Filters to use to select the xUnit tests to execute. Use `none` to run all possible tests.                                                                                                          |
+| `-p:TestFramework=`    | `[blank]`                                                | Target framework moniker for the version of .NET to use to execute tests.                                                                                                                           |
+| `-p:TestSet=`          | `[blank]`                                                | The `TestSqlClientManual` project is very large and is split into multiple sets that can be executed individually. This parameter allows selecting between test sets: `1`, `2`, `3`, and `AE`. |
 
-### Azure Extension Tests
+#### Examples
 
-These variables apply to the Azure extension test suite. The configuration is defined in
-[`Config.cs`](src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs).
+Run Microsoft.Data.SqlClient unit tests:
 
-| Variable | Description | Default |
-|----------|-------------|---------|
-| `TEST_MDS_CONFIG` | Override the path to the `config.json` file used by Azure extension tests. | `config.json` |
-| `ADO_POOL` | Set to any value to indicate tests are running in an Azure DevOps CI pool. | _(unset)_ |
-| `SYSTEM_ACCESSTOKEN` | Azure Pipelines system access token, used for workload identity federation tests. | _(unset)_ |
-| `TEST_DEBUG_EMIT` | Set to any value to enable debug output of configuration values during test startup. Sensitive values are Base64-encoded. | _(unset)_ |
+```bash
+msbuild build.proj -t:TestSqlClientUnit
+```
 
-## MSBuild Reference
+Run Microsoft.Data.SqlClient manual test set 2:
+```bash
+msbuild build.proj -t:TestSqlClientManual -p:TestSet=2
+```
 
-### Targets
+Run Microsoft.Data.SqlClient functional tests against x86 dotnet:
+```bash
+msbuild build.proj -t:TestSqlClientFunctional -p:DotnetPath='C:\path\to\dotnet\x86\'
+```
 
-The following build targets are defined in `build.proj`:
+Run all Microsoft.Data.SqlClient.Extensions.Azure unit tests, including interactive, but excluding failing tests:
+```bash
+msbuild build.proj -t:TestAzure -p:TestFilters=category!=failing
+```
 
-|Target|Description|
-|-|-|
-|`BuildAbstractions`|Restore and build the Abstractions package.|
-|`BuildAkvProvider`|Builds the Azure Key Vault Provider package for all supported platforms.|
-|`BuildAllConfigurations`|Default target. Builds the .NET Framework and .NET drivers for all target frameworks and operating systems.|
-|`BuildAzure`|Restore and build the Azure package.|
-|`BuildLogging`|Restore and build the Logging package.|
-|`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.|
-|`BuildSqlClient`|Build the driver for all target frameworks.|
-|`Clean`|Cleans all generated files.|
-|`PackAbstractions`|Pack the Abstractions NuGet package into `packages/`. Requires `BuildAbstractions` first.|
-|`PackAkvProvider`|Pack the Azure Key Vault Provider NuGet package (requires a prior build).|
-|`PackAzure`|Pack the Azure NuGet package into `packages/`. Requires `BuildAzure` first.|
-|`PackLogging`|Pack the Logging NuGet package into `packages/`. Requires `BuildLogging` first.|
-|`Restore`|Restores NuGet packages.|
-|`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|
+Run Microsoft.Data.SqlClient functional tests against net8.0 runtime:
+```bash
+msbuild build.proj -t:TestSqlClientFunctional -p:TestFramework=net8.0
+```
 
-### Parameters
+### Packaging Projects
 
-The following parameters may be defined as MSBuild properties to configure the
-build:
+Just like bulding and testing the various projects in this repository, packaging the projects into NuGet packages is
+also handle by `build.proj`. From the root of your repository, run `msbuild` against `build.proj` with a test target,
+following this pattern:
 
-|Name|Supported Values|Default|Description|
-|-|-|-|-|
-|`Configuration`|`Debug`, `Release`|`Debug`|Sets the release configuration.|
-|`OSGroup`|`Unix`, `Windows_NT`, `AnyOS`|typically defaults to the client system's OS, unless using `BuildAllConfigurations` or an `AnyOS` specific target|The operating system to target.|
-|`Platform`|`AnyCPU`, `x86`, `x64`, `ARM`, `ARM64`|`AnyCPU`|May only be set when using package reference type or running tests.|
-|`TestSet`|`1`, `2`, `3`, `AE`, or any combination thereof|`''`|Build or run a subset of the manual tests. Omit (default) to run all tests.|
-|`DotnetPath`|Absolute file path to an installed `dotnet` version.|The system default specified by the path variable|Set to run tests using a specific dotnet version (e.g. C:\net6-win-x86\)|
-|`TF`|`net8.0`, `net462`, `net47`, `net471`, `net472`, `net48`, `net481`|`net9.0` in netcore, `net462` in netfx|Sets the target framework when building or running tests. Not applicable when building the drivers.|
-|`ResultsDirectory`|An absolute file path|./TestResults relative to current directory|Specifies where to write test results.|
+```bash
+msbuild build.proj -t:<pack_target> [optional_parameters]
+```
 
-## Example Commands to Run Tests Using MSBuild (Recommended)
+| `<build_target>`   | Desription                                                                          |
+|--------------------|-------------------------------------------------------------------------------------|
+| `Pack`             | Packages all projects in the repository.                                            |
+| `PackAbstractions` | Packages the Microsoft.Data.SqlClient.Extensions.Abstractions package               |
+| `PackAkvProvider`  | Packages the Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider package |
+| `PackAzure`        | Packages the Microsoft.Data.SqlClient.Extensions.Azure package                      |
+| `PackLogging`      | Packages the Microsoft.Data.SqlClient.Internal.Logging package                      |
+| `PackSqlClient`    | Packages the Microsoft.Data.SqlClient package                                       |
+| `PackSqlServer`    | Packages the Microsoft.SqlServer.Server package                                     |
 
-Using the default configuration and running all tests:
+> [!TIP]
+> For convenience, the Pack targets will automatically build the target project and any dependencies.
 
-```bash
-msbuild -t:RunTests
-```
+A selection of parameters for pack targets in `build.proj` relevant to common developer workflows can be found below:
+
+| `[optional_parameter]`             | Default Value | Allowed Values        | Description                                                                                                                                                    |
+|------------------------------------|---------------|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `-p:Configuration=`                | `Debug`       | `Debug`, `Release`    | Build configuration. Only applies if project and dependencies are being built.                                                                                 |
+| `-p:NugetPath=`                    | `[blank]`     | eg. `C:\my\nuget.exe` | _Only applies to `PackSqlClient`._ Path to `nuget.exe` that to use. If not provided, defaults to `nuget.exe` in the PATH.                                      |
+| `-p:PackBuild=`                    | `true`        | `true`, `false`       | Whether or not to build the project before packing. If `false`, project must be built using the same parameters.                                               |
+| `-p:PackageVersion<TargetProject>` | `[blank]`     | eg. `1.2.3-dev123`    | Version to assign to the package. If `PackBuild` is `true`, the assembly and file versions will be derived from this version. See Versioning for more details. |
 
-Using the Release configuration:
+#### Examples
 
+Package Microsoft.Data.SqlClient.Internal.Logging into a NuGet package:
 ```bash
-msbuild -t:RunTests -p:Configuration=Release
+msbuild build.proj -t:PackLogging
 ```
 
-Running only the unit tests:
-
+Package Microsoft.Data.SqlClient if `nuget.exe` is not in the `$PATH` environment variable:
 ```bash
-msbuild -t:RunUnitTests
+msbuild build.proj -t:PackSqlClient -p:NugetPath="C:\my\nuget.exe"
 ```
 
-Using a specific .NET runtime to run tests:
-
+Package version 1.2.3 of Microsoft.Data.SqlClient.Extensions.Abstractions:
 ```bash
-msbuild -t:RunTests -p:DotnetPath=C:\net8-win-x86\
+msbuild build.proj -t:PackAbstractions -p:PackageVersionAbstractions=1.2.3
 ```
 
-To run tests against a specific version of .NET/.NET Framework, set the `-p:TF` parameter.
-
+Package version Microsoft.Data.SqlClient.Extensions.Azure without building it beforehand:
 ```bash
-msbuild -t:RunTests -p:TF=net8.0
-msbuild -t:RunTests -p:TF=net462
+msbuild build.proj -t:PackAzure -p:PackBuild=false
 ```
 
-## Example Commands to Run Tests using `dotnet`
+## Versioning
 
-Under the hood, the MSBuild commands to run tests use `dotnet` commands. But, if you wish to run
-them without the overhead of wrapping/unwrapping in MSBuild, you can run them directly.
+Versioning can be accomplished by using a mix of different parameters to the `build.proj` targets:
+`PackageVersion<TargetProject>`, `BuildNumber`, and `BuildSuffix`. Using these in different combinations, can generate
+appropriate package, assembly, and file versions for different scenarios. For most developer workflows, it is not
+necessary to specify any of these parameters - appropriate versions based on the latest release will be generated
+automatically. This section primarily exists to document the various parameters, their effects, and the scenarios they
+can be useful for.
 
-To change the processor architecture that runs the test (where possible, ie, x86 on x64), use the
-appropriate `dotnet` executable.
+`PackageVersion<TargetProject>` applies to whatever package is being built. For example, if you are building the
+Microsoft.Data.SqlClient package, the appropriate parameter is `-p:PackageVersionSqlClient`.
 
-By default, the tests will be executed on all supported .NET/.NET framework versions. To run on a
-specific version, pass the `-f` parameter with the desired version (eg `net9.0`).
+Each package has a `Versions.props` file in its root directory that defines a "default" version. This should be defined
+as the latest released version of the package. For the table below, we assume this is "1.2.3".
 
-The `--filter` parameter is used to select which tests run. The default `category!=failing&
-category!=flaky&category!=interactive` prevents tests that are known to be failing or flaky from
-running. To run a specific test, use `FullyQualifiedName=[fully qualified name of the test method]`
-as the filter parameter. To run all possible tests, even known failing and flaky ones, simply omit
-the filter parameter. Please note, however, that this will still omit tests that cannot run on the
-current platform or with the current test configuration (eg, Windows tests on Linux, or SQL DB tests
-when Azure Synapse is configured).
+| `PackageVersion` | `BuildNumber` | `BuildSuffix` | Package Version  | Assembly Version | File Version  | Scenario                                                   |
+|------------------|---------------|---------------|------------------|------------------|---------------|------------------------------------------------------------|
+| N/A              | N/A           | N/A           | `1.2.3-dev`      | `1.0.0`          | `1.2.3.0`     | Standard developer scenario                                |
+| `9.8.7`          | N/A           | N/A           | `9.8.7`          | `9.0.0`          | `9.8.7.0`     | Developer is building a specific version of the package    |
+| `9.8.7-preview1` | N/A           | N/A           | `9.8.7-preview1` | `9.0.0`          | `9.8.7.0`     | Developer is buildins a pre-release version of the package |
+| N/A              | `1234`        | N/A           | `1.2.3`          | `1.0.0`          | `1.2.3.1234`  | Automated pipelines building GA releases                   |
+| N/A              | `1234`        | `ci`          | `1.2.3-ci1234`   | `1.0.0`          | `1.2.3.1234`  | Automated pipelines building non-prod releases             |
 
-### Run Functional Tests
+---
 
-```bash
-dotnet test "src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj" \
-  -p:Configuration=Release \
-  --filter "category!=failing&category!=flaky&category!=interactive"
+## Package Mode Builds
 
-```
+The above documentation is the default mode of operation, and is the recommended mode for most developers. However,
+`build.proj` supports "package mode" builds. In this mode, instead of projects depending on other projects, they
+depend on NuGet packages. This mode is useful for verifying that packages work with each other, especially in automated
+build scenarios. For completeness, and debugging of autoamted builds, this section documents behavior of "package mode".
 
-### Run Manual Tests
+To switch to "package mode", set the `ReferenceType` parameter in `build.proj` to `Package`. And, optionally, include
+one or more of the following parameters:
 
-```bash
-dotnet test "src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" \
-  -p:Configuration=Release \
-  --filter "category!=failing&category!=flaky&category!=interactive"
-```
+* `PackageVersionAbstractions`
+* `PackageVersionAkvProvider`
+* `PackageVersionAzure`
+* `PackageVersionLogging`
+* `PackageVersionSqlClient`
+* `PackageVersionSqlServer`
 
-### Run Unit Tests
-```bash
-dotnet test "src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj" \
-  -p:Configuration=Release \
-  --filter "category!=failing&category!=flaky&category!=interactive"
-```
+These parameters pull double duty. In targets where the package is being built, the parameter sets the version of the
+package. In targets where the package is being referenced, the parameter sets the version of the package that is being
+referenced.
 
-## Testing with Package References
+If these parameters are not specified, the latest version, as defined in the `Versions.props` file, will be used.
 
-The MDS driver consists of several components, each of which produces its own
-NuGet package.  During development, components reference each other via
-`<ProjectReference>` properties by default.  This means that building
-and testing one component will implicitly build its project referenced
-dependencies.
+The `nuget.config` for this repository defines a local feed that points to the `packages` directory. This allows
+developers that need to test against development packages to drop their development packages into this directory, and
+run subsequent `build.proj` targets against them.
 
-Alternatively, the `ReferenceType` build property may be specified with a value
-of `Package`.  This will change inter-component dependencies to use
-`<PackageReference>` dependencies, and require that dependent components be
-built and packaged before building the depending component.  This will generate NuGet
-packages in the root packages/ directory, and will be automatically searched by NuGet
-(see our root `NuGet.config`).
+### Examples
 
-Then, you can specify `Package` references be used, for example:
+Build Microsoft.Data.SqlClient version 7.1.1 that references Microsoft.Data.SqlClient.Extensions.Abstractions v1.0.1
+and Microsoft.Data.SqlClient.Internal.Logging v2.2.2.
 
 ```bash
-dotnet build -t:BuildLogging,PackLogging
-dotnet build -t:BuildSqlServer,PackSqlServer
-dotnet build -t:BuildAbstractions,PackAbstractions -p:ReferenceType=Package
-dotnet build -t:BuildAzure,PackAzure -p:ReferenceType=Package
-dotnet build -t:BuildSqlClient -p:ReferenceType=Package
-dotnet build -t:GenerateMdsPackage
-dotnet build -t:BuildAKVNetCore -p:ReferenceType=Package
-dotnet build -t:GenerateAkvPackage
+# Build v2.2.2 of Logging and copy to packages
+msbuild build.proj -t:PackLogging \
+  -p:ReferenceType=Package \
+  -p:PackageVersionLogging=2.2.2
+cp artifacts/Microsoft.Data.SqlClient.Internal.Logging/Debug/*.*pkg packages/
+
+# Build v1.0.1 of Abstractions that depends on v2.2.2 of Logging
+msbuild build.proj -t:PackAbstractions \
+  -p:ReferenceType=Package \
+  -p:PackageVersionAbstractions=1.0.1 \
+  -p:PackageVersionLogging=2.2.2 \
+cp artifacts/Microsoft.Data.SqlClient.Extensions.Abstractions/Package-Debug/*.*pkg packages/
+
+# Build SqlClient
+msbuild -t:PackSqlClient \
+  -p:ReferenceType=Package \
+  -p:PackageVersionSqlClient=7.1.1 \
+  -p:PackageVersionAbstractions=1.0.1 \
+  -p:PackageVersionLogging=2.2.2
+cp artifacts/Microsoft.Data.SqlClient/Package-Debug/*.*pkg packages/
 ```
 
-The above will build the MDS and AKV components, place their NuGet packages into
-the `packages/` directory.
+Run Microsoft.Data.SqlClient functional tests against the versions build above:
+```bash
+msbuild build.proj -t:TestSqlClientFunctional \
+  -p:ReferenceType=Package \
+  -p:PackageVersionSqlClient=7.1.1 \
+  -p:PackageVersionAbstractions=1.0.1 \
+  -p:PackageVersionLogging=2.2.2
+```
 
-A non-AnyCPU platform reference can only be used with package reference type.
-Otherwise, the specified platform will be replaced with AnyCPU in the build
-process.
+----
 
-### Running Tests with Reference Type
 
-Provide property to `dotnet test` commands for testing desired reference type.
+Manual test prerequisites and configuration are covered in [TESTGUIDE.md](TESTGUIDE.md#manual-test-prerequisites).
 
-```bash
-dotnet test -p:ReferenceType=Project ...
-```
 
+---
 
 ## Using Managed SNI on Windows
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
index b1a858bf72..62918f7d65 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -40,10 +40,10 @@
       Version="$(AzurePackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient"
-      Version="$(MdsPackageVersion)" />
+      Version="$(SqlClientPackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider"
-      Version="$(AkvPackageVersion)" />
+      Version="$(AkvProviderPackageVersion)" />
   </ItemGroup>
 
   <!-- ===================================================================== -->
diff --git a/TESTGUIDE.md b/TESTGUIDE.md
new file mode 100644
index 0000000000..fdcb8749ec
--- /dev/null
+++ b/TESTGUIDE.md
@@ -0,0 +1,311 @@
+# Test Guide for Microsoft.Data.SqlClient
+
+This guide describes how to run the test projects in this repository and how to configure the SQL Server-backed manual
+tests.
+
+For build prerequisites and general `build.proj` usage, see [BUILDGUIDE.md](BUILDGUIDE.md).
+
+## Test Projects
+
+The primary test projects for Microsoft.Data.SqlClient are under
+[src/Microsoft.Data.SqlClient/tests](src/Microsoft.Data.SqlClient/tests):
+
+| Project          | Path                                                                                                                                                                                                     | Purpose                                                                                                           |
+|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|
+| Unit tests       | [src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj](src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj)                         | Unit tests and tests against simulated servers.                                                                   |
+| Functional tests | [src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj](src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj) | Functional tests for public and internal behavior. Some tests use simulated servers or local test infrastructure. |
+| Manual tests     | [src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj](src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj)                 | Integration tests that generally require a configured SQL Server or Azure SQL target.                             |
+
+These projects target `net8.0`, `net9.0`, and `net10.0` on all platforms. On Windows, they also target `net462`.
+
+## Recommended Entry Point
+
+Use [build.proj](build.proj) from the repository root:
+
+```bash
+msbuild build.proj -t:<test_target> [optional_parameters]
+```
+
+If `msbuild` is not available, use `dotnet msbuild`:
+
+```bash
+dotnet msbuild build.proj -t:<test_target> [optional_parameters]
+```
+
+Test targets build the projects they depend on, so a separate build step is not required for normal test runs.
+
+## Test Targets
+
+| Target                    | Description                                                                                                              |
+|---------------------------|--------------------------------------------------------------------------------------------------------------------------|
+| `Test`                    | Runs all test targets in the repository. This can take a long time and is not recommended for routine local development. |
+| `TestAbstractions`        | Runs Microsoft.Data.SqlClient.Extensions.Abstractions tests.                                                             |
+| `TestAzure`               | Runs Microsoft.Data.SqlClient.Extensions.Azure tests.                                                                    |
+| `TestSqlClient`           | Runs all Microsoft.Data.SqlClient test projects.                                                                         |
+| `TestSqlClientUnit`       | Runs Microsoft.Data.SqlClient unit tests.                                                                                |
+| `TestSqlClientFunctional` | Runs Microsoft.Data.SqlClient functional tests.                                                                          |
+| `TestSqlClientManual`     | Runs Microsoft.Data.SqlClient manual tests.                                                                              |
+
+## Common Commands
+
+Run the SqlClient unit tests:
+
+```bash
+msbuild build.proj -t:TestSqlClientUnit
+```
+
+Run the SqlClient functional tests:
+
+```bash
+msbuild build.proj -t:TestSqlClientFunctional
+```
+
+Run the SqlClient manual tests:
+
+```bash
+msbuild build.proj -t:TestSqlClientManual
+```
+
+Run only manual test set 2:
+
+```bash
+msbuild build.proj -t:TestSqlClientManual -p:TestSet=2
+```
+
+Run manual test sets 1 and 3:
+
+```bash
+msbuild build.proj -t:TestSqlClientManual -p:TestSet=13
+```
+
+Run Always Encrypted manual tests:
+
+```bash
+msbuild build.proj -t:TestSqlClientManual -p:TestSet=AE
+```
+
+Run a specific target framework:
+
+```bash
+msbuild build.proj -t:TestSqlClientFunctional -p:TestFramework=net8.0
+```
+
+Run functional tests against an x86 `dotnet` installation:
+
+```bash
+msbuild build.proj -t:TestSqlClientFunctional -p:DotnetPath='C:\path\to\dotnet\x86\'
+```
+
+Run all Azure extension tests, including `interactive` tests, while still excluding tests marked `failing` or `flaky`:
+
+```bash
+msbuild build.proj -t:TestAzure -p:TestFilters=category!=failing
+```
+
+## Test Parameters
+
+The most commonly used test parameters are:
+
+| Parameter                   | Default                                                   | Description                                                                                                                   |
+|-----------------------------|-----------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|
+| `-p:Configuration=`         | `Debug`                                                   | Build configuration. Use `Debug` or `Release`.                                                                                |
+| `-p:DotnetPath=`            | Empty                                                     | Path to the folder containing the `dotnet` binary. The path must end with `\` or `/`.                                         |
+| `-p:ReferenceType=`         | `Project`                                                 | For functional and manual SqlClient tests, use `Project` to test the source project or `Package` to test a package reference. |
+| `-p:TestBlameTimeout=`      | `10m`                                                     | Enables hang blame collection with the specified timeout. Use `0` to disable hang timeouts.                                   |
+| `-p:TestCodeCoverage=`      | `true`                                                    | Collects code coverage when set to `true`.                                                                                    |
+| `-p:TestFilters=`           | `category!=failing&category!=flaky&category!=interactive` | xUnit filter expression. Use `none` to run without the default filter.                                                        |
+| `-p:TestFramework=`         | Empty                                                     | Target framework to run. If omitted, all target frameworks supported by the project and host OS are run.                      |
+| `-p:TestResultsFolderPath=` | `test_results`                                            | Directory where test results are written.                                                                                     |
+| `-p:TestSet=`               | Empty                                                     | Selects manual test sets. Supported values include `1`, `2`, `3`, `AE`, and combinations such as `13` or `12AE`.              |
+
+## Test Filters
+
+`build.proj` passes `TestFilters` to `dotnet test --filter`. By default, tests marked with these categories are excluded:
+
+| Category      | Why it is excluded by default                                                       |
+|---------------|-------------------------------------------------------------------------------------|
+| `failing`     | Known failing tests.                                                                |
+| `flaky`       | Intermittently failing tests.                                                       |
+| `interactive` | Tests that require user interaction or external setup not suitable for normal runs. |
+
+Examples:
+
+```bash
+# Run a single test by fully-qualified name.
+msbuild build.proj -t:TestSqlClientUnit -p:TestFilters=FullyQualifiedName=Namespace.ClassName.MethodName
+
+# Run only flaky tests while investigating quarantine failures.
+msbuild build.proj -t:TestSqlClientManual -p:TestFilters=category=flaky
+
+# Disable the default filter.
+msbuild build.proj -t:TestSqlClientFunctional -p:TestFilters=none
+```
+
+When passing filter expressions that contain shell-sensitive characters such as `&`, quote or escape the value as
+required by your shell.
+
+## Running Test Projects Directly
+
+`build.proj` is the recommended entry point because it keeps logging, code coverage, package-reference mode, and
+common parameters consistent. For quick local investigation, you can run a test project directly:
+
+```bash
+dotnet test src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj \
+  -p:Configuration=Debug \
+  --filter "category!=failing&category!=flaky&category!=interactive"
+```
+
+For manual tests, pass `TestSet` to the test project when needed:
+
+```bash
+dotnet test src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj \
+  -p:Configuration=Debug \
+  -p:TestSet=2 \
+  --filter "category!=failing&category!=flaky&category!=interactive"
+```
+
+## Manual Test Prerequisites
+
+Manual tests require SQL Server or Azure SQL resources and a local test configuration file.
+
+For a basic local SQL Server run, prepare:
+
+- A SQL Server instance that the test machine can reach.
+- Shared Memory, TCP, and Named Pipes protocols enabled when testing local Windows SQL Server scenarios.
+- The `NORTHWIND` database created from [tools/testsql/createNorthwindDb.sql](tools/testsql/createNorthwindDb.sql). For
+  Azure SQL, use [tools/testsql/createNorthwindAzureDb.sql](tools/testsql/createNorthwindAzureDb.sql).
+- The `UdtTestDb` database created from [tools/testsql/createUdtTestDb.sql](tools/testsql/createUdtTestDb.sql) if you
+  want UDT tests to run.
+- A login or integrated-security principal with permissions to create and drop the temporary objects used by the tests.
+
+Feature-specific tests require additional resources. If those resources are not configured, the corresponding
+conditional tests are skipped.
+
+## Manual Test Configuration
+
+Edit the source configuration file at `src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/
+config.json`. The test utilities project copies that file to the test output directory, where the manual tests load it
+by default.
+
+The template file is:
+
+[src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json](src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json)
+
+`config.json` is git-ignored. If it does not exist, the test utilities project copies `config.default.json` to
+`config.json` before compile. You can also create it manually:
+
+```bash
+cp src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json \
+  src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.json
+```
+
+Update `config.json` for your environment before running manual tests. The most important values for a basic run are `TCPConnectionString` and `NPConnectionString`.
+
+```jsonc
+{
+  "TCPConnectionString": "Data Source=tcp:localhost;Database=Northwind;Integrated Security=true;Encrypt=false;",
+  "NPConnectionString": "Data Source=np:localhost;Database=Northwind;Integrated Security=true;Encrypt=false;",
+  "EnclaveEnabled": false,
+  "TracingEnabled": false,
+  "SupportsIntegratedSecurity": true
+}
+```
+
+For SQL Server in a Linux container, WSL, or another host where SQL authentication is easier than integrated security, use a TCP connection string like:
+
+```jsonc
+{
+  "TCPConnectionString": "Data Source=tcp:127.0.0.1;User Id=sa;Password=<password>;Database=Northwind;Encrypt=false;TrustServerCertificate=true"
+}
+```
+
+You can override the config file path with the `MDS_TEST_CONFIG` environment variable:
+
+```bash
+MDS_TEST_CONFIG=/path/to/config.json msbuild build.proj -t:TestSqlClientManual -p:TestSet=2
+```
+
+On PowerShell:
+
+```powershell
+$env:MDS_TEST_CONFIG = "C:\path\to\config.json"
+msbuild build.proj -t:TestSqlClientManual -p:TestSet=2
+```
+
+## Configuration Properties
+
+| Property                         | Description                                                                                 | Example or notes                                                                       |
+|----------------------------------|---------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------|
+| `TCPConnectionString`            | Connection string for a TCP-enabled SQL Server or Azure SQL database.                       | `Data Source=tcp:localhost;Database=Northwind;Integrated Security=true;Encrypt=false;` |
+| `NPConnectionString`             | Connection string for a Named Pipes-enabled SQL Server instance.                            | `Data Source=np:localhost;Database=Northwind;Integrated Security=true;Encrypt=false;`  |
+| `TCPConnectionStringHGSVBS`      | Optional connection string for SQL Server with VBS enclave and HGS attestation.             | Include `Attestation Protocol=HGS` and `Enclave Attestation Url`.                      |
+| `TCPConnectionStringNoneVBS`     | Optional connection string for SQL Server with VBS enclave and no attestation.              | Include `Attestation Protocol=None`.                                                   |
+| `TCPConnectionStringAASSGX`      | Optional connection string for SQL Server with SGX enclave and Microsoft Azure Attestation. | Include `Attestation Protocol=AAS` and `Enclave Attestation Url`.                      |
+| `EnclaveEnabled`                 | Enables tests that require an enclave-configured server.                                    | `true` or `false`.                                                                     |
+| `TracingEnabled`                 | Enables tracing-related tests.                                                              | `true` or `false`.                                                                     |
+| `AADAuthorityURL`                | Optional OAuth authority for `AADPasswordConnectionString`.                                 | `https://login.windows.net/<tenant>`                                                   |
+| `AADPasswordConnectionString`    | Optional connection string for Microsoft Entra ID password authentication tests.            | Uses `Authentication=Active Directory Password`.                                       |
+| `AADServicePrincipalId`          | Optional application ID for service-principal authentication tests.                         | Former docs may refer to this as a secure principal ID.                                |
+| `AADServicePrincipalSecret`      | Optional application secret for service-principal authentication tests.                     | Keep this only in local, ignored config files or secure pipeline variables.            |
+| `AzureKeyVaultURL`               | Optional Azure Key Vault URL for Always Encrypted tests.                                    | `https://<keyvaultname>.vault.azure.net/`                                              |
+| `AzureKeyVaultTenantId`          | Optional Entra ID tenant ID for Azure Key Vault tests.                                      | Tenant ID GUID.                                                                        |
+| `SupportsIntegratedSecurity`     | Whether the user running tests has integrated-security access to the target SQL Server.     | `true` or `false`.                                                                     |
+| `LocalDbAppName`                 | Optional LocalDB instance name. Empty disables LocalDB testing.                             | `MSSQLLocalDB` or another local instance.                                              |
+| `LocalDbSharedInstanceName`      | Optional shared LocalDB instance name.                                                      | Used only when testing shared LocalDB.                                                 |
+| `SupportsFileStream`             | Whether FileStream tests are supported by the target.                                       | `true` or `false`.                                                                     |
+| `FileStreamDirectory`            | Directory used for FileStream database setup.                                               | Use an escaped absolute path in JSON.                                                  |
+| `UseManagedSNIOnWindows`         | Enables Managed SNI on Windows test coverage.                                               | `true` or `false`.                                                                     |
+| `DNSCachingConnString`           | Optional connection string for DNS caching tests.                                           | Used with DNS caching server settings.                                                 |
+| `DNSCachingServerCR`             | Optional DNS caching control-ring server.                                                   | Feature-specific tests only.                                                           |
+| `DNSCachingServerTR`             | Optional DNS caching tenant-ring server.                                                    | Feature-specific tests only.                                                           |
+| `IsDNSCachingSupportedCR`        | Enables DNS caching control-ring tests.                                                     | `true` or `false`.                                                                     |
+| `IsDNSCachingSupportedTR`        | Enables DNS caching tenant-ring tests.                                                      | `true` or `false`.                                                                     |
+| `IsAzureSynapse`                 | Marks the target as Azure Synapse.                                                          | Some SQL Server-specific tests are skipped when `true`.                                |
+| `EnclaveAzureDatabaseConnString` | Optional Azure SQL database connection string for enclave tests.                            | Feature-specific tests only.                                                           |
+| `ManagedIdentitySupported`       | Whether managed identity tests should run.                                                  | Defaults to `true`. Set `false` if unavailable.                                        |
+| `UserManagedIdentityClientId`    | Optional client ID for user-assigned managed identity tests.                                | Feature-specific tests only.                                                           |
+| `KerberosDomainUser`             | Optional Kerberos test domain user.                                                         | Feature-specific tests only.                                                           |
+| `KerberosDomainPassword`         | Optional Kerberos test domain password.                                                     | Keep only in local, ignored config files or secure pipeline variables.                 |
+| `IsManagedInstance`              | Marks the target as Azure SQL Managed Instance.                                             | Set `true` for Managed Instance to use non-Azure TVP baseline files in test set 3.     |
+| `PowerShellPath`                 | Full path to PowerShell if it is not on `PATH`.                                             | `C:\\escaped\\path\\to\\powershell.exe`                                                |
+| `AliasName`                      | Optional SQL Server alias used by alias-related tests.                                      | Feature-specific tests only.                                                           |
+
+## Manual Test Sets
+
+The manual test project is split into compile-time sets so large runs can be parallelized.
+
+| TestSet | Coverage                                                                                                                                         |
+|---------|--------------------------------------------------------------------------------------------------------------------------------------------------|
+| `1`     | Smaller SQL connectivity and command scenarios.                                                                                                  |
+| `2`     | Broad data access coverage, including adapters, bulk copy, retry logic, data reader, schema, DNS caching, and related scenarios.                 |
+| `3`     | Additional integration coverage, including LocalDB, pooling, parameters, transactions, JSON, Kerberos, UDT, vector, and other SQL feature tests. |
+| `AE`    | Always Encrypted tests.                                                                                                                          |
+
+If `TestSet` is omitted, all sets are compiled and run. You can combine sets by concatenating values, for example
+`-p:TestSet=23` or `-p:TestSet=12AE`.
+
+## Results and Diagnostics
+
+Test results are written to `test_results` by default. Override the location with `TestResultsFolderPath`:
+
+```bash
+msbuild build.proj -t:TestSqlClientUnit -p:TestResultsFolderPath=/tmp/sqlclient-test-results
+```
+
+Hang blame collection is enabled by default with a `10m` timeout. To increase the timeout:
+
+```bash
+msbuild build.proj -t:TestSqlClientManual -p:TestBlameTimeout=30m
+```
+
+To disable hang blame collection:
+
+```bash
+msbuild build.proj -t:TestSqlClientManual -p:TestBlameTimeout=0
+```
+
+Code coverage is enabled by default. To disable it for a faster local run:
+
+```bash
+msbuild build.proj -t:TestSqlClientUnit -p:TestCodeCoverage=false
+```
diff --git a/build.proj b/build.proj
index f6954667c4..e32caef276 100644
--- a/build.proj
+++ b/build.proj
@@ -1,270 +1,1022 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
+  <!-- Imports ========================================================= -->
   <Import Project="src/Directory.Build.props" />
-  <Import Project="$(ToolsDir)targets\CompareMdsRefAssemblies.targets" />
 
+  <!-- Build Parameters ================================================ -->
+  <!-- @TODO: Add a Help target that lists targets and these descriptions of the parameters -->
   <PropertyGroup>
-    <!-- SourceLink variable-->
-    <DisableSourceLink>false</DisableSourceLink>
+    <!--
+      BuildNumber
+      Applies to:     Build*, Pack*
+      Description:    Number that identifies the build.
+
+                      For local developer builds, this does not need to be used. The developer
+                      should either specify an entire package version override (via
+                      PackageVersion*, et. al.) or by omitting the package version.
+
+                      For automated builds, this should always be specified instead of
+                      a package version. Thus, the version base is controlled via source and the
+                      build number is simply appended as a revision number.
+      Default value:  [blank]
+      Example:        1234
+    -->
+    <!-- @TODO: Currently this is defaulted to 0 by Directory.Build.props, which is the same default used later on anyhow. -->
+    <BuildNumber Condition="'$(BuildNumber)' == ''" />
+    <BuildNumberArgument Condition="'$(BuildNumber)' != ''">
+      -p:BuildNumber=$(BuildNumber)
+    </BuildNumberArgument>
 
+    <!--
+      BuildSuffix
+      Aplies to:      Build*, Pack*
+      Description:    Suffix to add at the end of the package version to indicate the generated
+                      version is a pre-release.
+
+                      For local developer builds, this does not need to be set. If a specific
+                      package version is needed, specify PackageVersionMds. Otherwise, the
+                      generated package version will eg, 1.2.3.dev.
+
+                      For automated builds, this should only be specified on pre-release builds, ie
+                      PR/CI pipeline runs. For official, production-ready builds, omit this field
+                      and include a BuildNumber.
+      Default value:  [blank]
+      Example:        prbuild
+    -->
+    <BuildSuffix Condition="'$(BuildSuffix)' == ''" />
+    <BuildSuffixArgument Condition="'$(BuildSuffix)' != ''">
+      -p:BuildSuffix=$(BuildSuffix)
+    </BuildSuffixArgument>
+
+    <!--
+      Configuration
+      Applies to:     All targets
+      Description:    Which build configuration to build
+      Default value:  Debug
+      Allowed values: Debug, Release
+    -->
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
 
-    <ResultsDirectory Condition="$(ResultsDirectory) == ''">TestResults</ResultsDirectory>
     <!--
-      Path to a `dotnet` version like a x86 or any especific versions in addition to a default installed version.
-      This property is empty by default to use the default path of the system's path variable.
-      The provided path should be ended to a `\` character without white spaces: Ex. C:\x86\
+      DotnetPath
+      Applies to:    All targets
+      Description:   Path to folder containing the `dotnet` binary. Override this if a specific
+                     version (eg, x86) is required. Otherwise, this defaults to using the dotnet
+                     binary in the PATH variable. The provided path should end with a `\` (or `/`)
+                     character.
+      Default value: [blank]
+      Example:       C:\x86\
     -->
-    <DotnetPath></DotnetPath>
-  </PropertyGroup>
+    <DotnetPath Condition="'$(DotnetPath)' == ''" />
 
-  <!-- Release Build properties must be turned on for Release purposes, and turned off for Code Coverage calculations -->
-  <PropertyGroup>
-    <BuildForRelease Condition="$(BuildForRelease) == ''">true</BuildForRelease>
-    <CI>ContinuousIntegrationBuild=$(BuildForRelease);EmbedUntrackedSources=$(BuildForRelease)</CI>
-  </PropertyGroup>
+    <!--
+      NugetPath
+      Applies to:     PackSqlClient
+      Description:    Path to NuGet executable. Override if `nuget` is not included in the PATH
+                      variable.
+      Default value:  nuget
+      Example:        C:\nuget\nuget.exe
+    -->
+    <NugetPath Condition="'$(NugetPath)' == ''">nuget</NugetPath>
 
-  <!-- Populate all managed projects -->
-  <ItemGroup>
-    <Tools Include="tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj" />
-    <SqlServer Include="**/Microsoft.SqlServer.Server.csproj" />
-    <Abstractions Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-    <Azure Include="src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
-    <Logging Include="src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
+    <!--
+      PackBuild
+      Applies to:     Pack*
+      Description:    Whether the Pack* targets should buiild the project before packaging. If
+                      true, the project will be built as part of packaging. If false, it will not.
+
+                      For most developers, building immediately before packing is the norm, and
+                      this functionality is added for convenience. However, for official builds,
+                      binaries are signed between building and packing, so building immediately
+                      before packing would clobber the signed binaries.
+      Default value:  true
+      Allowed values: (true|false)
+    -->
+    <PackBuild Condition="'$(PackBuild)' == ''">true</PackBuild>
+    <PackBuildArgument Condition="'$(PackBuild.ToLower())' != 'true'">
+      --no-build
+    </PackBuildArgument>
+    <!--
+      @TODO: This is kinda hacky, ideally we can pack via dotnet pack, which will handle building,
+        and can thus be switched off by passing -no-build. However, we're not there because we need
+        to build multiple projects before packaging, and thus need to use nuget. So, until then we
+        will switch off dependency building dynamically building the target dependencies
+    -->
+    <PackSqlClientDependsOn Condition="'$(PackBuild.ToLower())' == 'true'">BuildSqlClient</PackSqlClientDependsOn>
 
-    <AKVProvider Include="**/add-ons/**/AzureKeyVaultProvider/*.csproj" />
-  </ItemGroup>
+    <!--
+      PackageVersionAbstractions
+      Applies to:     BuildAbstractions, PackAbstractions
+      Description:    Specifies what version to assign to the Microsoft.Data.SqlClient.Extensions.Abstractions
+                      package. If this is omitted, the assigned version will default to the version
+                      calculated by Versions.props. If this is provided, it will override the
+                      package version and assembly versions will be calculated based on it.
+
+      Applies to:     BuildSqlClient*, PackSqlClient, TestSqlClient, TestSqlClientFunctional, TestSqlClientManual
+                      BuildAkvProvider, PackAkvProvider
+                      (with -p:ReferenceType=Package)
+      Description:    Specifies what version of Microsoft.Data.SqlClient.Extensions.Abstractions
+                      to use when compiling/packaging/testing the specified package.
+
+      Default value:  [blank]
+      Example:        1.0.1-dev2345
+    -->
+    <PackageVersionAbstractions Condition="'$(PackageVersionAbstractions)' == ''" />
+    <PackageVersionAbstractionsArgument Condition="'$(PackageVersionAbstractions)' != ''">
+      -p:AbstractionsPackageVersion=$(PackageVersionAbstractions)
+    </PackageVersionAbstractionsArgument>
 
-  <!-- SqlServer Targets -->
-  <PropertyGroup>
-    <SqlServerProperties>$(CommonProperties)</SqlServerProperties>
+    <!--
+      PackageVersionAkvProvider
+      Applies to:     BuildAkvProvider, PackAkvProvider
+      Description:    Specifies what version to assign to Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
+                      when building/packing the AKV provider. If this is omitted, the assigned
+                      version will default to the version calculated by Versions.props. If this is
+                      provided, it will override the package version and assembly version will be
+                      calculated based on it.
+      Default value:  [blank]
+      Example:        1.0.1-dev2345
+    -->
+    <PackageVersionAkvProvider Condition="'$(PackageVersionAkvProvider)' == ''" />
+    <PackageVersionAkvProviderArgument Condition="'$(PackageVersionAkvProvider)' != ''">
+      -p:AkvProviderPackageVersion=$(PackageVersionAkvProvider)
+    </PackageVersionAkvProviderArgument>
 
-    <SqlServerProperties Condition="'$(SqlServerPackageVersion)' != ''">
-      $(SqlServerProperties);SqlServerPackageVersion=$(SqlServerPackageVersion)
-    </SqlServerProperties>
+    <!--
+      PackageVersionAzure
+      Applies to:     BuildAzure, PackAzure
+      Description:    Specifies what version to assign to Microsoft.Data.SqlClient.Extensions.Azure
+                      when building/packing the Azure package. If this is omitted, the assigned
+                      version will default to the version calculated by Versions.props. If this is
+                      provided, it will override the package version and assembly version will be
+                      calculated based on it.
+      Default value:  [blank]
+      Example:        1.0.1-dev2345
+    -->
+    <PackageVersionAzure Condition="'$(PackageVersionAzure)' == ''" />
+    <PackageVersionAzureArgument Condition="'$(PackageVersionAzure)' != ''">
+      -p:AzurePackageVersion=$(PackageVersionAbstractions)
+    </PackageVersionAzureArgument>
 
-    <SqlServerProperties Condition="'$(SqlServerAssemblyFileVersion)' != ''">
-      $(SqlServerProperties);SqlServerAssemblyFileVersion=$(SqlServerAssemblyFileVersion)
-    </SqlServerProperties>
-  </PropertyGroup>
+    <!--
+      PackageVersionLogging
+      Applies to:     BuildLogging, PackLogging
+      Description:    Specifies what version to assign to Microsoft.Data.SqlClient.Internal.Logging
+                      when building/packing the Logging package. If this is omitted, the assigned
+                      version will default to the version calculated by Versions.props. If this is
+                      provided, it will override the package version and assembly version will be
+                      calculated based on it.
+
+      Applies to:     BuildSqlClient*, PackSqlClient, TestSqlClient, TestSqlClientFunctional, TestSqlClientManual
+                      BuildAkvProvider, PackAkvProvider
+                      BuildAbstractions, PackAbstractions
+                      BuildAzure, PackAzure,
+                      (with -p:ReferenceType=Package)
+      Description:    Specifies what version of Microsoft.Data.SqlClient.Internal.Logging
+                      to use when compiling/packaging/testing the specified package.
+
+      Default value:  [blank]
+      Example:        1.0.1-dev2345
+    -->
+    <PackageVersionLogging Condition="'$(PackageVersionLogging)' == ''" />
+    <PackageVersionLoggingArgument Condition="'$(PackageVersionLogging)' != ''">
+      -p:LoggingPackageVersion=$(PackageVersionLogging)
+    </PackageVersionLoggingArgument>
 
-  <Target Name="RestoreSqlServer">
-    <MSBuild Projects="@(SqlServer)" Targets="restore" Properties="$(SqlServerProperties)" />
-  </Target>
+    <!--
+      PackageVersionSqlClient
+      Applies to:     TestSqlClient, TestSqlClientFunctional, TestSqlClientManual
+                      BuildAkvProvider, PackAkvProvider
+                      TestAzure
+                      (with -p:ReferenceType=Package)
+      Description     Specifies what version of Microsoft.Data.SqlClient to use when compiling
+                      to use when compiling/packaging/testing the specified package.
+
+      Applies to:     BuildSqlClient*, PackSqlClient
+      Description:    Specifies what version to assign to Microsoft.Data.SqlClient when building/
+                      packing the SqlClient package. If this is omitted, the assigned
+                      version will default to the version calculated by Versions.props. If this is
+                      provided, it will override the package version and assembly version will be
+                      calculated based on it.
+
+      Default value:  [blank]
+      Example:        7.0.0-preview4
+    -->
+    <PackageVersionSqlClient Condition="'$(PackageVersionSqlClient)' == ''" />
+    <PackageVersionSqlClientArgument Condition="'$(PackageVersionSqlClient)' != ''">
+      -p:SqlClientPackageVersion=$(PackageVersionSqlClient)
+    </PackageVersionSqlClientArgument>
 
-  <Target Name="BuildSqlServer" DependsOnTargets="RestoreSqlServer">
-    <MSBuild
-      Projects="@(SqlServer)"
-      Targets="Build"
-      Properties="$(CI);$(SqlServerProperties)" />
-  </Target>
+    <!--
+      PackageVersionSqlServer
+      Applies to:     BuildSqlServer
+      Description:    Specifies the package version to use for Microsoft.SqlServer.Server. If this
+                      is specified, it will be used preferentially: assembly version and file
+                      version will be derived from the specified package version.
+      Default value:  [blank]
+      Example:        1.0.0-dev2345
+    -->
+    <PackageVersionSqlServer Condition="'$(PackageVersionSqlServer)' == ''" />
+    <PackageVersionSqlServerArgument Condition="'$(PackageVersionSqlServer)' != ''">
+      -p:SqlServerPackageVersion=$(PackageVersionSqlServer)
+    </PackageVersionSqlServerArgument>
 
-  <Target Name="PackSqlServer">
-    <MSBuild
-      Projects="@(SqlServer)"
-      Targets="Pack"
-      Properties="$(SqlServerProperties);NoBuild=true" />
-  </Target>
+    <!--
+      ReferenceType
+      Applies to:     BuildSqlClient, BuildSqlClientUnix, BuildSqlClientWindows
+      Description:    Determines how to build SqlClient. If set to "Project", any cross-project
+                      references (eg, Abstractions from SqlClient) will be made as project references. If
+                      set to "Package", package references will be made instead. When running in
+                      package mode, target versions can be specified via PackageVersion* build
+                      parameters. If these are not provided, the central feed version will be used
+                      instead (see Directory.Packages.props). When running in project mode, the
+                      dependencies will be built automatically.
+
+      Applies to:     TestSqlClientFunctional, TestSqlClientManual
+      Description:    Determines whether to test against a project reference or a package version
+                      of the test targets. Same description above applies.
+
+      Default value:  Project
+      Allowed values: (Package|Project)
+    -->
+    <ReferenceType Condition="'$(ReferenceType)' == ''">Project</ReferenceType>
+    <ReferenceTypeArgument Condition="'$(ReferenceType.ToLower())' == 'package'">
+      -p:ReferenceType=Package
+    </ReferenceTypeArgument>
 
-  <!-- Abstractions Targets -->
-  <PropertyGroup>
-    <AbstractionsProperties>$(CommonProperties)</AbstractionsProperties>
+    <!--
+      SigningKeyPath
+      Applies to:     Build*, Pack*
+      Description:    Path to the key to use to strong name sign binaries. If omitted, binaries
+                      will not be strong name signed.
+                      For Pack* targets, this only applies to a build - ie, if PackBuild is set to
+                      false, SigningKeyPath will have no effect.
+      Default value:  [blank]
+      Example:        C:\path\to\my\signing\key.snk
+    -->
+    <SigningKeyPath Condition="'$(SigningKeyPath)' == ''" />
+    <SigningKeyPathArgument Condition="'$(SigningKeyPath)' != ''">
+      -p:SigningKeyPath="$(SigningKeyPath)"
+    </SigningKeyPathArgument>
+
+    <!--
+      TestBlameTimeout
+      Applies to:     Test* targets
+      Description:    How long to wait on a test before timing it out. This will be fed to the
+                      dotnet blame-hang-timeout argument. If 0 is specified, hang timeout will be
+                      disabled. For more details and supported suffixes see:
+                      https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-test-vstest#options
+      Default value:  10m
+      Allowed values: (time_expression|0)
+    -->
+    <TestBlameTimeout Condition="'$(TestBlameTimeout)' == ''">10m</TestBlameTimeout>
+    <TestBlameArgument Condition="'$(TestBlameTimeout)' != '0'">
+      --blame-hang
+      --blame-hang-dump-type full
+      --blame-hang-timeout $(TestBlameTimeout)
+    </TestBlameArgument>
+
+    <!--
+      TestCodeCoverage
+      Applies to:     Test* targets
+      Description:    Whether code coverage data should be collected during test target execution.
+      Default value:  true
+      Allowed value:  (true|false)
+    -->
+    <TestCodeCoverage Condition="'$(TestCodeCoverage)' == ''">true</TestCodeCoverage>
+    <TestCodeCoverageArgument Condition="'$(TestCodeCoverage.ToLower())' == 'true'">
+      --collect "Code coverage"
+      --settings "$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings"
+    </TestCodeCoverageArgument>
+
+    <!--
+      TestFilters
+      Applies to:     Test* targets
+      Description:    Filter to use to include or exclude any tests. If not specified, this defaults
+                      to including all tests that are not in the category "failing", "flaky", or
+                      "interactive". Use "none" to disable filtering and run all tests in the
+                      target. For more information see:
+                      https://learn.microsoft.com/en-us/dotnet/core/testing/selective-unit-tests
+      Default value:  category!=failing&category!=flaky&category!=interactive
+      Allowed values: (category_expression|none)
+    -->
+    <TestFilters Condition="'$(TestFilters)' == ''">category!=failing&amp;category!=flaky&amp;category!=interactive</TestFilters>
+    <TestFilters Condition="'$(TestFilters.ToLower())' == 'none'" />
+    <TestFiltersArgument Condition="'$(TestFilters)' != ''">
+      --filter "$(TestFilters)"
+    </TestFiltersArgument>
 
     <!--
-      If the AbstractionsPackageVersion property was supplied on the
-      command-line, then pass it along to the Abstractions build.  Otherwise,
-      omit it entirely to avoid it expanding as empty here and thus overriding
-      the default behaviour in the Abstractions project.  Command-line
-      properties take precedence over project defaults, even if their value is
-      empty.  For example:
+      TestFramework
+      Applies to:    Test* targets
+      Description:   Target framework moniker for the version of .NET to use to execute the
+                     specified test target. If not specified, this defaults to running tests for
+                     *all* framework versions supported for the project.
+      Default value: [blank]
+      Example:       net462
+    -->
+    <TestFramework Condition="'$(TestFramework)' == ''" />
+    <TestFrameworkArgument Condition="'$(TestFramework)' != ''">-f $(TestFramework)</TestFrameworkArgument>
 
-        dotnet build -p:AbstractionsPackageVersion=
+    <!--
+      TestResultsFolderPath
+      Applies to:    Test* targets
+      Description:   Absolute path to directory where any test results should be dumped. If not
+                     specified, this path will default to test_results in the root of the
+                     repository.
+      Default value: $(RepoRoot)\test_results
+      Example:       C:\my_test_results\my_extra_special_test_run_folder\
+    -->
+    <TestResultsFolderPath Condition="'$(TestResultsFolderPath)' == ''">$(RepoRoot)test_results</TestResultsFolderPath>
 
-      That results in $(AbstractionsPackageVersion) being defined as empty,
-      and cannot be overridden by the project.
+    <!--
+      TestSet
+      Applies to:     TestSqlClientManual
+      Description:    Used to select a set of tests to run from the SqlClient manual tests project. If not
+                      specified, all tests will be executed.
+      Default value:  [blank]
+      Allowed values: ([1][2][3][AE])
+      Examples:       "1", "12", "AE", "12AE"
     -->
-    <AbstractionsProperties Condition="'$(AbstractionsPackageVersion)' != ''">
-      $(AbstractionsProperties);AbstractionsPackageVersion=$(AbstractionsPackageVersion)
-    </AbstractionsProperties>
-
-    <!-- Do the same for the AbstractionsAssemblyFileVersion property. -->
-    <AbstractionsProperties Condition="'$(AbstractionsAssemblyFileVersion)' != ''">
-      $(AbstractionsProperties);AbstractionsAssemblyFileVersion=$(AbstractionsAssemblyFileVersion)
-    </AbstractionsProperties>
+    <TestSet Condition="'$(TestSet)' == ''" />
+    <TestSetArgument Condition="'$(TestSet)' != ''">-p:TestSet="$(TestSet)"</TestSetArgument>
   </PropertyGroup>
 
-  <Target Name="RestoreAbstractions" DependsOnTargets="RestoreLogging">
-    <MSBuild
-      Projects="@(Abstractions)"
-      Targets="Restore"
-      Properties="$(AbstractionsProperties)" />
+  <!-- ================================================================= -->
+  <!-- Top Level/Miscellaneous Targets -->
+
+  <!--
+    Build: Builds all packages
+    Note: These have been ordered in a vague attempt to minimize multiple rebuilds of dependencies.
+  -->
+  <Target Name="Build" DependsOnTargets="BuildLogging;BuildAbstractions;BuildSqlClient;BuildAzure;BuildAkvProvider;BuildSqlServer" />
+
+  <!-- Clean: Convenience target to remove build/test output -->
+  <Target Name="Clean">
+    <!-- Remove known build output paths -->
+    <RemoveDir Directories="$([System.IO.Directory]::GetDirectories('.', 'artifacts', SearchOption.AllDirectories))" />
+    <RemoveDir Directories="$([System.IO.Directory]::GetDirectories('.', 'test_results', SearchOption.AllDirectories))" />
+
+    <!-- Remove remaining bin/intermediate paths, eg test binaries -->
+    <RemoveDir Directories="$([System.IO.Directory]::GetDirectories('.', 'bin', SearchOption.AllDirectories))" />
+    <RemoveDir Directories="$([System.IO.Directory]::GetDirectories('.', 'obj', SearchOption.AllDirectories))" />
   </Target>
 
-  <Target Name="BuildAbstractions" DependsOnTargets="RestoreAbstractions;BuildLogging">
-    <MSBuild
-      Projects="@(Abstractions)"
-      Targets="Build"
-      Properties="$(CI);$(AbstractionsProperties)" />
+  <!--
+    Pack: Packages all packages
+    Note: These have been ordered in a vague attempt to minimize multiple rebuilds of dependencies.
+  -->
+  <Target Name="Pack" DependsOnTargets="PackLogging;PackAbstractions;PackSqlClient;PackAzure;PackAkvProvider;PackSqlServer" />
+
+  <!--
+    Test: Run all test targets for all packages.
+    Note: This will run for a *very* long time and it is not recommended, even in automated test
+      environments. Please consider running project specific test targets or specific test sets
+      within the project.
+  -->
+  <Target Name="Test" DependsOnTargets="TestAbstractions;TestAzure;TestSqlClient" />
+
+  <!-- ================================================================= -->
+  <!-- Microsoft.Data.SqlClient Targets -->
+  <PropertyGroup>
+    <!-- Root for SqlClient projects -->
+    <SqlClientSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient/</SqlClientSrcRoot>
+    <SqlClientArtifactRoot>$(RepoRoot)artifacts/Microsoft.Data.SqlClient/</SqlClientArtifactRoot>
+
+    <!-- Project Path -->
+    <SqlClientProjectPath>$(SqlClientSrcRoot)src/Microsoft.Data.SqlClient.csproj</SqlClientProjectPath>
+    <SqlClientRefProjectPath>$(SqlClientSrcRoot)ref/Microsoft.Data.SqlClient.csproj</SqlClientRefProjectPath>
+    <SqlClientNotSupportedProjectPath>$(SqlClientSrcRoot)notsupported/Microsoft.Data.SqlClient.csproj</SqlClientNotSupportedProjectPath>
+
+    <!-- Test Project Paths -->
+    <SqlClientFunctionalTestProjectPath>$(SqlClientSrcRoot)tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj</SqlClientFunctionalTestProjectPath>
+    <SqlClientManualTestProjectPath>$(SqlClientSrcRoot)tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj</SqlClientManualTestProjectPath>
+    <SqlClientUnitTestProjectPath>$(SqlClientSrcRoot)tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj</SqlClientUnitTestProjectPath>
+
+    <!-- Tools/Specs Paths -->
+    <SqlClientNuspecPath>$(RepoRoot)tools/specs/Microsoft.Data.SqlClient.nuspec</SqlClientNuspecPath>
+    <GenApiPath>$(RepoRoot)tools/GenAPI/Microsoft.DotNet.GenAPI/</GenApiPath>
+    <GenApiProjectPath>$(GenApiPath)Microsoft.DotNet.GenAPI.csproj</GenApiProjectPath>
+  </PropertyGroup>
+
+  <!-- Build SqlClient Targets =============================================== -->
+  <!-- BuildSqlClient: Builds all binaries for SqlClient -->
+  <Target Name="BuildSqlClient" DependsOnTargets="BuildSqlClientUnix;BuildSqlClientWindows;BuildSqlClientRef;BuildSqlClientNotSupported" />
+
+  <!--
+    BuildSqlClientNotSupported: Builds a version of the SqlClient assemblies that always throws
+    PlatformNotSupportedException. It generates the source for this using GenAPI which is built as
+    the first step of this target.
+  -->
+  <Target Name="BuildSqlClientNotSupported">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(GenApiProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building GenAPI project via command: '$(DotnetCommand)'"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+
+    <!-- Get the path to the GenAPI artifact -->
+    <ItemGroup>
+      <GenApiArtifactPath Include="$(GenApiPath)bin/$(Configuration)/**/Microsoft.DotNet.GenAPI.dll" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientNotSupportedProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:GenApiPath="@(GenApiArtifactPath->'%(FullPath)')"
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionSqlClientArgument)
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building not supported binaries project via command: '$(DotnetCommand)'"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
-  <Target Name="PackAbstractions">
-    <MSBuild
-      Projects="@(Abstractions)"
-      Targets="Pack"
-      Properties="$(AbstractionsProperties);NoBuild=true" />
+  <!-- BuildSqlClientRef: Builds the ref binaries project for SqlClient, which is OS-agnostic -->
+  <Target Name="BuildSqlClientRef">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build $(SqlClientRefProjectPath)
+        -p:Configuration=$(Configuration)
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionSqlClientArgument)
+
+        <!-- Reference type arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building SqlClient ref binaries via command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
-  <!-- Logging Targets -->
-  <PropertyGroup>
-    <LoggingProperties>$(CommonProperties)</LoggingProperties>
+  <!-- BuildSqlClientUnix: Builds all unix-specific SqlClient binaries -->
+  <Target Name="BuildSqlClientUnix">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build $(SqlClientProjectPath)
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Unix
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionSqlClientArgument)
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building SqlClient for Unix via command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
 
-    <!--
-      If the LoggingPackageVersion property was supplied on the command-line,
-      then pass it along to the Logging build.  Otherwise, omit it entirely
-      to avoid it expanding as empty here and thus overriding the default
-      behaviour in the Logging project.
-    -->
-    <LoggingProperties Condition="'$(LoggingPackageVersion)' != ''">
-      $(LoggingProperties);LoggingPackageVersion=$(LoggingPackageVersion)
-    </LoggingProperties>
-
-    <!-- Do the same for the LoggingAssemblyFileVersion property. -->
-    <LoggingProperties Condition="'$(LoggingAssemblyFileVersion)' != ''">
-      $(LoggingProperties);LoggingAssemblyFileVersion=$(LoggingAssemblyFileVersion)
-    </LoggingProperties>
-  </PropertyGroup>
+  <!-- BuildSqlClientWindows: Builds all windows-specific SqlClient binaries -->
+  <Target Name="BuildSqlClientWindows">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build $(SqlClientProjectPath)
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Windows_NT
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning Arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionSqlClientArgument)
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Text=">>> Building SqlClient for Windows via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
 
-  <Target Name="RestoreLogging">
-    <MSBuild
-      Projects="@(Logging)"
-      Targets="Restore"
-      Properties="$(LoggingProperties)" />
+  <!-- Pack SqlClient Target ===================================================== -->
+  <!--
+    PackSqlClient: Packages SqlClient binaries into a NuGet package.
+    Because the SqlClient package depends on the "not supported" and ref projects, we can't use dotnet to
+    automatically build before packaging. Instead, we rely on target dependency to handle building
+    the same binaries that will be packaged.
+  -->
+  <Target Name="PackSqlClient" DependsOnTargets="$(PackSqlClientDependsOn)">
+    <PropertyGroup>
+      <GitCommand>
+        git rev-parse HEAD
+      </GitCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <GitCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GitCommand), "\s+", " "))</GitCommand>
+    </PropertyGroup>
+    <Message Text=">>> Fetching latest git commit hash via command: $(GitCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(GitCommand)">
+      <Output TaskParameter="ConsoleOutput" PropertyName="CommitId" />
+    </Exec>
+
+    <!-- This is a bit hacky, and can be (@TODO:) removed once packaging is done w/o a nuspec from dotnet -->
+    <PropertyGroup>
+      <GetSqlClientPackageVersionCommand>
+        "$(DotnetPath)dotnet" msbuild "$(SqlClientProjectPath)"
+        -nologo
+        -verbosity:quiet
+        -getProperty:SqlClientPackageVersion
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionSqlClientArgument)
+      </GetSqlClientPackageVersionCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <GetSqlClientPackageVersionCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GetSqlClientPackageVersionCommand), "\s+", " "))</GetSqlClientPackageVersionCommand>
+    </PropertyGroup>
+    <Message Text=">>> Evaluating SqlClient package version via command: $(GetSqlClientPackageVersionCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(GetSqlClientPackageVersionCommand)">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_EvaluatedSqlClientPackageVersion" />
+    </Exec>
+    <Error Text="Failed to evaluate SqlClientPackageVersion for PackSqlClient."
+           Condition="'$(_EvaluatedSqlClientPackageVersion)' == ''" />
+
+    <PropertyGroup>
+      <_EvaluatedSqlClientPackageVersion>$([System.Text.RegularExpressions.Regex]::Replace($(_EvaluatedSqlClientPackageVersion), "\s", ""))</_EvaluatedSqlClientPackageVersion>
+      <CommitId>$([System.Text.RegularExpressions.Regex]::Replace($(CommitId), "\s", ""))</CommitId>
+      <NuGetCommand>
+        "$(NugetPath)" pack "$(SqlClientNuspecPath)"
+        -Symbols
+        -SymbolPackageFormat snupkg
+        -Version "$(_EvaluatedSqlClientPackageVersion)"
+        -OutputDirectory "$(SqlClientArtifactRoot)/$(ReferenceType)-$(Configuration)"
+        -properties "COMMITID=$(CommitId);Configuration=$(Configuration);ReferenceType=$(ReferenceType);AbstractionsPackageVersion=$(PackageVersionAbstractions);LoggingPackageVersion=$(PackageVersionLogging)"
+      </NuGetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <NuGetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(NuGetCommand), "\s+", " "))</NuGetCommand>
+    </PropertyGroup>
+    <Message Text=">>> Packing SqlClient nuget via command: $(NuGetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(NuGetCommand)" />
   </Target>
 
-  <Target Name="BuildLogging" DependsOnTargets="RestoreLogging">
-    <MSBuild
-      Projects="@(Logging)"
-      Targets="Build"
-      Properties="$(CI);$(LoggingProperties)" />
+  <!-- Test SqlClient Targets ==================================================== -->
+  <!-- TestSqlClient: Runs all test projects for SqlClient -->
+  <Target Name="TestSqlClient" DependsOnTargets="TestSqlClientFunctional;TestSqlClientManual;TestSqlClientUnit" />
+
+  <!-- TestSqlClientFunctional: Runs functional tests for SqlClient -->
+  <Target Name="TestSqlClientFunctional">
+    <!-- @TODO: Prevent from running in non-admin user mode -->
+    <PropertyGroup>
+      <LogFilePrefix>SqlClientFunctional-$(OS)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
+
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(SqlClientFunctionalTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(TestBlameArgument)
+        $(TestCodeCoverageArgument)
+        $(TestFiltersArgument)
+        $(TestFrameworkArgument)
+        --results-directory "$(TestResultsFolderPath)"
+        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Text=">>> Running functional tests for SqlClient via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
-  <Target Name="PackLogging">
-    <MSBuild
-      Projects="@(Logging)"
-      Targets="Pack"
-      Properties="$(LoggingProperties);NoBuild=true" />
+  <!-- TestSqlClientManual: Runs manual tests for SqlClient -->
+  <Target Name="TestSqlClientManual">
+    <PropertyGroup>
+      <LogFilePrefix>SqlClientManual-$(OS)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestSet)' != ''">$(LogFilePrefix)-$(TestSet)</LogFilePrefix>
+
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(SqlClientManualTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(TestBlameArgument)
+        $(TestCodeCoverageArgument)
+        $(TestFiltersArgument)
+        $(TestFrameworkArgument)
+        $(TestSetArgument)
+        --results-directory "$(TestResultsFolderPath)"
+        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Text=">>> Running manual tests for SqlClient via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
-  <!-- Azure Targets -->
+  <!-- TestSqlClientUnit: Runs unit tests for SqlClient -->
+  <Target Name="TestSqlClientUnit">
+    <PropertyGroup>
+      <!--
+        Note: This test exclusively uses project references, so neither ReferenceType nor any
+            package version arguments are specified in this command.
+      -->
+      <LogFilePrefix>SqlClientUnit-$(OS)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
+
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(SqlClientUnitTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(TestBlameArgument)
+        $(TestCodeCoverageArgument)
+        $(TestFiltersArgument)
+        $(TestFrameworkArgument)
+        --results-directory "$(TestResultsFolderPath)"
+        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
+      </DotnetCommand>
+
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Text=">>> Running unit tests for SqlClient via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- ================================================================= -->
+  <!-- Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider Targets -->
   <PropertyGroup>
-    <AzureProperties>$(CommonProperties)</AzureProperties>
+    <AkvProviderSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/</AkvProviderSrcRoot>
+    <AkvProviderProjectPath>$(AkvProviderSrcRoot)src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj</AkvProviderProjectPath>
+  </PropertyGroup>
 
-    <!--
-      If the AzurePackageVersion property was supplied on the command-line, then
-      pass it along to the Azure build.  Otherwise, omit it entirely to avoid it
-      expanding as empty here and thus overriding the default behaviour in the
-      Azure project.  Command-line properties take precedence over project
-      defaults, even if their value is empty.  For example:
+  <!-- BuildAkvProvider: Builds Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider -->
+  <Target Name="BuildAkvProvider">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(AkvProviderProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(SigningKeyPathArgument)
+
+        <!--Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionAkvProviderArgument)
+
+        <!-- Reference type arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
 
-        dotnet build -p:AzurePackageVersion=
+  <!-- PackAkvProvider: Packages Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider -->
+  <Target Name="PackAkvProvider">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" pack "$(AkvProviderProjectpath)"
+        -p:Configuration=$(Configuration)
+        $(PackBuildArgument)
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionAkvProviderArgument)
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Packaging Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
 
-      That results in $(AzurePackageVersion) being defined as empty, and cannot
-      be overridden by the project.
-    -->
-    <AzureProperties Condition="'$(AzurePackageVersion)' != ''">
-      $(AzureProperties);AzurePackageVersion=$(AzurePackageVersion)
-    </AzureProperties>
-
-    <!-- Do the same for the AzureAssemblyFileVersion property. -->
-    <AzureProperties Condition="'$(AzureAssemblyFileVersion)' != ''">
-      $(AzureProperties);AzureAssemblyFileVersion=$(AzureAssemblyFileVersion)
-    </AzureProperties>
+  <!-- ================================================================= -->
+  <!-- Microsoft.Data.SqlClient.Extensions.Abstractions Targets -->
+  <PropertyGroup>
+    <AbstractionsSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient.Extensions/Abstractions/</AbstractionsSrcRoot>
+    <AbstractionsProjectPath>$(AbstractionsSrcRoot)src/Abstractions.csproj</AbstractionsProjectPath>
+    <AbstractionsTestProjectPath>$(AbstractionsSrcRoot)test/Abstractions.Test.csproj</AbstractionsTestProjectPath>
   </PropertyGroup>
 
-  <Target Name="RestoreAzure">
-    <MSBuild
-      Projects="@(Azure)"
-      Targets="Restore"
-      Properties="$(AzureProperties)" />
+  <!-- BuildAbstractions: Builds Microsoft.Data.SqlClient.Extensions.Abstractions -->
+  <Target Name="BuildAbstractions">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(AbstractionsProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionAbstractionsArgument)
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionLoggingArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building Microsoft.Data.SqlClient.Extensions.Abstractions via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
-  <Target Name="BuildAzure" DependsOnTargets="RestoreAzure">
-    <MSBuild
-      Projects="@(Azure)"
-      Targets="Build"
-      Properties="$(CI);$(AzureProperties)" />
+  <!-- PackAbstractions: Packages Microsoft.Data.SqlClient.Extensions.Abstractions -->
+  <Target Name="PackAbstractions">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" pack "$(AbstractionsProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(PackBuildArgument)
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionAbstractionsArgument)
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionLoggingArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Packaging Microsoft.Data.SqlClient.Extensions.Abstractions via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- TestAbstractions: Runs Microsoft.Data.SqlClient.Extensions.Abstractions.Tests -->
+  <Target Name="TestAbstractions">
+    <PropertyGroup>
+      <!--
+        Note: This test exclusively uses project references, so neither ReferenceType nor any
+            package version arguments are specified in this command.
+      -->
+      <LogFilePrefix>AbstractionsTests-$(OS)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
+
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(AbstractionsTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(TestBlameArgument)
+        $(TestCodeCoverageArgument)
+        $(TestFiltersArgument)
+        $(TestFrameworkArgument)
+        --results-directory "$(TestResultsFolderPath)"
+        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Running tests for Abstractions via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- ================================================================= -->
+  <!-- Microsoft.Data.SqlClient.Extensions.Azure Targets -->
+  <PropertyGroup>
+    <AzureSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient.Extensions/Azure/</AzureSrcRoot>
+    <AzureProjectPath>$(AzureSrcRoot)src/Azure.csproj</AzureProjectPath>
+    <AzureTestProjectPath>$(AzureSrcRoot)test/Azure.Test.csproj</AzureTestProjectPath>
+  </PropertyGroup>
+
+  <!-- BuildAzure: Builds Microsoft.Data.SqlClient.Extensions.Azure -->
+  <Target Name="BuildAzure">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(AzureProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionAzureArgument)
+
+        <!-- Reference type arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionLoggingArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building Microsoft.Data.SqlClient.Extensions.Azure via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
+  <!-- PackAzure: Packages Microsoft.Data.SqlClient.Extensions.Azure -->
   <Target Name="PackAzure">
-    <MSBuild
-      Projects="@(Azure)"
-      Targets="Pack"
-      Properties="$(AzureProperties);NoBuild=true" />
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" pack "$(AzureProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(PackBuildArgument)
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionAzureArgument)
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionLoggingArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Packaging Microsoft.Data.SqlClient.Extensions.Azure via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
-  <!-- Clean all build outputs. -->
-  <Target Name="Clean">
-    <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "artifacts", SearchOption.AllDirectories))' />
-    <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "bin", SearchOption.AllDirectories))' />
-    <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", ".nuget", SearchOption.AllDirectories))' />
-    <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "obj", SearchOption.AllDirectories))' />
-    <!-- Remove generated .nupkg and .snupkg files from packages/ and output/. -->
-    <ItemGroup>
-      <PackagesToDelete Include="$(RepoRoot)/packages/*.nupkg" />
-      <PackagesToDelete Include="$(RepoRoot)/packages/*.snupkg" />
-      <PackagesToDelete Include="$(RepoRoot)/output/*.nupkg" />
-      <PackagesToDelete Include="$(RepoRoot)/output/*.snupkg" />
-    </ItemGroup>
-    <Delete Files="@(PackagesToDelete)" />
+  <!-- TestAzure: Runs Microsoft.Data.SqlClient.Extensions.Azure.Tests -->
+  <Target Name="TestAzure">
+    <PropertyGroup>
+      <LogFilePrefix>AzureTests-$(OS)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
+
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(AzureTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(TestBlameArgument)
+        $(TestCodeCoverageArgument)
+        $(TestFiltersArgument)
+        $(TestFrameworkArgument)
+        --results-directory "$(TestResultsFolderPath)"
+        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
+
+        <!-- Reference type arguments -->
+        $(ReferenceTypeArgument)
+
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Running tests for Abstractions via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
-  <!-- AKV Provider Targets ==================================================== -->
+  <!-- ================================================================= -->
+  <!-- Microsoft.Data.SqlClient.Internal.Logging Targets -->
   <PropertyGroup>
-    <AkvProviderProperties>$(CommonProperties)</AkvProviderProperties>
-
-    <AkvProviderProperties
-      Condition="'$(AkvPackageVersion)' != ''">
-      $(AkvProviderProperties);AkvPackageVersion=$(AkvPackageVersion)
-    </AkvProviderProperties>
-
-    <AkvProviderProperties
-      Condition="'$(AkvAssemblyFileVersion)' != ''">
-      $(AkvProviderProperties);AkvAssemblyFileVersion=$(AkvAssemblyFileVersion)
-    </AkvProviderProperties>
-
-    <AkvProviderProperties
-      Condition="'$(MdsPackageVersion)' != ''">
-      $(AkvProviderProperties);MdsPackageVersion=$(MdsPackageVersion)
-    </AkvProviderProperties>
-
-    <AkvProviderProperties
-      Condition="'$(LoggingPackageVersion)' != ''">
-      $(AkvProviderProperties);LoggingPackageVersion=$(LoggingPackageVersion)
-    </AkvProviderProperties>
-
-    <AkvProviderProperties
-      Condition="'$(AbstractionsPackageVersion)' != ''">
-      $(AkvProviderProperties);AbstractionsPackageVersion=$(AbstractionsPackageVersion)
-    </AkvProviderProperties>
+    <LoggingSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient.Internal/Logging/src/</LoggingSrcRoot>
+    <LoggingProjectPath>$(LoggingSrcRoot)Logging.csproj</LoggingProjectPath>
   </PropertyGroup>
 
-  <Target Name="RestoreAkvProvider">
-    <MSBuild Projects="@(AKVProvider)" Targets="Restore" Properties="$(AkvProviderProperties)" />
+  <!-- BuildLogging: Builds Microsoft.Data.SqlClient.Internal.Logging -->
+  <Target Name="BuildLogging">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build $(LoggingProjectPath)
+        -p:Configuration=$(Configuration)
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionLoggingArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building Microsoft.Data.SqlClient.Internal.Logging via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
-  <Target Name="BuildAkvProvider" DependsOnTargets="RestoreAkvProvider">
-    <MSBuild
-      Projects="@(AKVProvider)"
-      Targets="Build"
-      Properties="$(CI);$(AkvProviderProperties)" />
+  <!-- PackLogging: Packages Microsoft.Data.SqlClient.Internal.Logging -->
+  <Target Name="PackLogging">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" pack $(LoggingProjectPath)
+        -p:Configuration=$(Configuration)
+        $(PackBuildArgument)
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionLoggingArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Packaging Microsoft.Data.SqlClient.Internal.Logging via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
-  <Target Name="PackAkvProvider">
-    <MSBuild
-      Projects="@(AKVProvider)"
-      Targets="Pack"
-      Properties="$(AkvProviderProperties);NoBuild=true" />
+  <!-- ================================================================= -->
+  <!-- Microsoft.SqlServer.Server Targets -->
+  <PropertyGroup>
+    <SqlServerSrcRoot>$(RepoRoot)src/Microsoft.SqlServer.Server/</SqlServerSrcRoot>
+    <SqlServerProjectPath>$(SqlServerSrcRoot)Microsoft.SqlServer.Server.csproj</SqlServerProjectPath>
+  </PropertyGroup>
+
+  <!-- BuildSqlServer: Builds the Microsoft.SqlServer.Server project -->
+  <Target Name="BuildSqlServer">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build $(SqlServerProjectPath)
+        -p:Configuration=$(Configuration)
+        $(SigningKeyPathArgument)
+
+        <!--Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionSqlServerArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building Microsoft.SqlServer.Server via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
+  <!-- PackSqlServer: Packages the Microsoft.SqlServer.Server project -->
+  <Target Name="PackSqlServer">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" pack $(SqlServerProjectPath)
+        -p:Configuration=$(Configuration)
+        $(PackBuildArgument)
+        $(SigningKeyPathArgument)
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionSqlServerArgument)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Packaging Microsoft.SqlServer.Server via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
 </Project>
diff --git a/build2.proj b/build2.proj
deleted file mode 100644
index e2f760af75..0000000000
--- a/build2.proj
+++ /dev/null
@@ -1,586 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Imports ========================================================= -->
-  <Import Project="src/Directory.Build.props" />
-
-  <!-- Build Parameters ================================================ -->
-  <!-- @TODO: Add a Help target that lists targets and these descriptions of the parameters -->
-  <PropertyGroup>
-    <!--
-      BuildNumber
-      Applies to:     BuildMds*, PackMds
-      Description:    Number that identifies the build.
-                      For local developer builds, this does not need to be used. The developer
-                      should either specify an entire package version override (via
-                      PackageVersionMds, et. al.) or by omitting the package version.
-                      For automated builds, this should always be specified instead of
-                      a package version. Thus, the version base is controlled via source and the
-                      build number is simply appended as a revision number.
-      Default value:  [blank]
-      Example:        1234
-    -->
-    <!-- @TODO: Currently this is defaulted to 0 by Directory.Build.props, which is the same default used later on anyhow. -->
-    <BuildNumber Condition="'$(BuildNumber)' == ''" />
-    <BuildNumberArgument Condition="'$(BuildNumber)' != ''">
-      -p:BuildNumber=$(BuildNumber)
-    </BuildNumberArgument>
-
-    <!--
-      BuildSuffix
-      Aplies to:      BuildMds*, PackMds
-      Description:    Suffix to add at the end of the package version to indicate the generated
-                      version is a pre-release.
-                      For local developer builds, this does not need to be set. If a specific
-                      package version is needed, specify PackageVersionMds. Otherwise, the
-                      generated package version will eg, 1.2.3.dev.
-                      For automated builds, this should only be specified on pre-release builds, ie
-                      PR/CI pipeline runs. For official, production-ready builds, omit this field
-                      and include a BuildNumber.
-      Default value:  [blank]
-      Example:        prbuild
-    -->
-    <BuildSuffix Condition="'$(BuildSuffix)' == ''" />
-    <BuildSuffixArgument Condition="'$(BuildSuffix)' != ''">
-      -p:BuildSuffix=$(BuildSuffix)
-    </BuildSuffixArgument>
-
-    <!--
-      Configuration
-      Applies to:     All targets
-      Description:    Which build configuration to build
-      Default value:  Debug
-      Allowed values: Debug, Release
-    -->
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-
-    <!--
-      DotnetPath
-      Applies to:    All targets
-      Description:   Path to folder containing the `dotnet` binary. Override this if a specific
-                     version (eg, x86) is required. Otherwise, this defaults to using the dotnet
-                     binary in the PATH variable. The provided path should end with a `\` (or `/`)
-                     character.
-      Default value: [blank]
-      Example:       C:\x86\
-    -->
-    <DotnetPath Condition="'$(DotnetPath)' == ''" />
-
-    <!--
-      NugetPath
-      Applies to:     PackMds
-      Description:    Path to NuGet executable. Override if `nuget` is not included in the PATH
-                      variable.
-      Default value:  nuget
-      Example:        C:\nuget\nuget.exe
-    -->
-    <NugetPath Condition="'$(NugetPath)' == ''">nuget</NugetPath>
-
-    <!--
-      PackBuild
-      Applies to:     PackMds
-      Description:    Whether the PackMds target should run BuildMds before packing. If true,
-                      BuildMds will be called as a dependency of PackMds. If false, it will not.
-                      For most developers, building immediately before packing is the norm, and
-                      this functionality is added for convenience. However, for official builds,
-                      binaries are signed between building and packing, so building immediately
-                      before packing would clobber the signed binaries.
-      Default value:  true
-      Allowed values: (true|false)
-    -->
-    <!--
-      @TODO: This is kinda hacky, ideally we can pack via dotnet pack, which will handle building,
-        and can thus be switched off by passing -no-build. However, we're not there because we need
-        to build multiple projects before packaging, and thus need to use nuget. So, until then we
-        will switch off dependency building dynamically building the target dependencies
-    -->
-    <PackBuild Condition="'$(PackBuild)' == ''">true</PackBuild>
-    <PackMdsDependsOn Condition="'$(PackBuild.ToLower())' == 'true'">BuildMds</PackMdsDependsOn>
-
-    <!--
-      PackageVersionAbstractions
-      Applies to:     BuildMds, BuildMdsRef, BuildMdsUnix, BuildMdsWindows
-                      PackMds
-                      TestMds, TestMdsFunctional, TestMdsManual
-      Description:    Specifies what version of the Microsoft.Data.SqlClient.Abstractions to use
-                      when compiling MDS. If not specified, the version defined in
-                      Directory.Packages.props is used. This argument only has effect if the
-                      ReferenceType argument is set to "Package".
-      Default value:  [blank]
-      Example:        1.0.1-dev2345
-    -->
-    <PackageVersionAbstractions Condition="'$(PackageVersionAbstractions)' == ''" />
-    <PackageVersionAbstractionsArgument Condition="'$(PackageVersionAbstractions)' != ''">
-      -p:AbstractionsPackageVersion=$(PackageVersionAbstractions)
-    </PackageVersionAbstractionsArgument>
-
-    <!--
-      PackageVersionLogging
-      Applies to:     BuildMds, BuildMdsUnix, BuildMdsWindows
-                      PackMds
-                      TestMds, TestMdsFunctional, TestMdsManual
-      Description:    Specifies what version of the Microsoft.Data.SqlClient.Internal.Logging to use
-                      when compiling MDS. If not specified, the version defined in
-                      Directory.Packages.props is used. This argument only has effect if the
-                      ReferenceType argument is set to "Package".
-      Default value:  [blank]
-      Example:        1.0.1-dev2345
-    -->
-    <PackageVersionLogging Condition="'$(PackageVersionLogging)' == ''" />
-    <PackageVersionLoggingArgument Condition="'$(PackageVersionLogging)' != ''">
-      -p:LoggingPackageVersion=$(PackageVersionLogging)
-    </PackageVersionLoggingArgument>
-
-    <!--
-      PackageVersionMds
-      Applies to:     TestMdsFunctional, TestMdsManual (when ReferenceType is Package)
-      Description:    Specifies what version of the Microsoft.Data.SqlClient package to run tests
-                      against. If not specified, the version pinned in Directory.Packages.props
-                      will be used.
-
-      Applies to:     BuildMds*
-      Description:    Specifies the version to assign to the MDS NuGet package and assembly files.
-                      If this is not specified, the version defined in MdsVersions.props is used.
-
-      Applies to:     PackMds
-      Description:    Specifies the version to assign to the MDS NuGet package. If not specified,
-                      the target will fail (@TODO).
-
-      Default value:  [blank]
-      Example:        7.0.0-preview4
-    -->
-    <PackageVersionMds Condition="'$(PackageVersionMds)' == ''" />
-    <PackageVersionMdsArgument Condition="'$(PackageVersionMds)' != ''">
-      -p:MdsPackageVersion=$(PackageVersionMds)
-    </PackageVersionMdsArgument>
-
-    <!--
-      ReferenceType
-      Applies to:     BuildMds, BuildMdsUnix, BuildMdsWindows
-      Description:    Determines how to build MDS. If set to "Project", any cross-project
-                      references (eg, Abstractions from MDS) will be made as project references. If
-                      set to "Package", package references will be made instead. When running in
-                      package mode, target versions can be specified via PackageVersion* build
-                      parameters. If these are not provided, the central feed version will be used
-                      instead (see Directory.Packages.props). When running in project mode, the
-                      dependencies will be built automatically.
-
-      Applies to:     TestMdsFunctional, TestMdsManual
-      Description:    Determines whether to test against a project reference or a package version
-                      of the test targets. Same description above applies.
-
-      Default value:  Project
-      Allowed values: (Package|Project)
-    -->
-    <ReferenceType Condition="'$(ReferenceType)' == ''">Project</ReferenceType>
-    <ReferenceTypeArgument Condition="'$(ReferenceType.ToLower())' == 'package'">
-      -p:ReferenceType=Package
-    </ReferenceTypeArgument>
-
-    <!--
-      SigningKeyPath
-      Applies to:     Build*
-      Description:    Path to the key to use to strong name sign binaries. If omitted, binaries
-                      will not be strong name signed.
-      Default value:  [blank]
-      Example:        C:\path\to\my\signing\key.snk
-    -->
-    <SigningKeyPath Condition="'$(SigningKeyPath)' == ''" />
-    <SigningKeyPathArgument Condition="'$(SigningKeyPath)' != ''">
-      -p:SigningKeyPath="$(SigningKeyPath)"
-    </SigningKeyPathArgument>
-
-    <!--
-      TestBlameTimeout
-      Applies to:     Test* targets
-      Description:    How long to wait on a test before timing it out. This will be fed to the
-                      dotnet blame-hang-timeout argument. If 0 is specified, hang timeout will be
-                      disabled. For more details and supported suffixes see:
-                      https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-test-vstest#options
-      Default value:  10m
-      Allowed values: (time_expression|0)
-    -->
-    <TestBlameTimeout Condition="'$(TestBlameTimeout)' == ''">10m</TestBlameTimeout>
-    <TestBlameArgument Condition="'$(TestBlameTimeout)' != '0'">
-      --blame-hang
-      --blame-hang-dump-type full
-      --blame-hang-timeout $(TestBlameTimeout)
-    </TestBlameArgument>
-
-    <!--
-      TestCodeCoverage
-      Applies to:     Test* targets
-      Description:    Whether code coverage data should be collected during test target execution.
-      Default value:  true
-      Allowed value:  (true|false)
-    -->
-    <TestCodeCoverage Condition="'$(TestCodeCoverage)' == ''">true</TestCodeCoverage>
-    <TestCodeCoverageArgument Condition="'$(TestCodeCoverage.ToLower())' == 'true'">
-      --collect "Code coverage"
-      --settings "$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings"
-    </TestCodeCoverageArgument>
-
-    <!--
-      TestFilters
-      Applies to:     Test* targets
-      Description:    Filter to use to include or exclude any tests. If not specified, this defaults
-                      to including all tests that are not in the category "failing" or "flaky". Use
-                      "none" to disable filtering and run all tests in the target.
-                      For more information see:
-                      https://learn.microsoft.com/en-us/dotnet/core/testing/selective-unit-tests
-      Default value:  category!=failing&category!=flaky
-      Allowed values: (category_expression|none)
-    -->
-    <TestFilters Condition="'$(TestFilters)' == ''">category!=failing&amp;category!=flaky</TestFilters>
-    <TestFilters Condition="'$(TestFilters.ToLower())' == 'none'" />
-    <TestFiltersArgument Condition="'$(TestFilters)' != ''">
-      --filter "$(TestFilters)"
-    </TestFiltersArgument>
-
-    <!--
-      TestFramework
-      Applies to:    Test* targets
-      Description:   Target framework moniker for the version of .NET to use to execute the
-                     specified test target. If not specified, this defaults to running tests for
-                     *all* framework versions supported for the project.
-      Default value: [blank]
-      Example:       net462
-    -->
-    <TestFramework Condition="'$(TestFramework)' == ''" />
-    <TestFrameworkArgument Condition="'$(TestFramework)' != ''">-f $(TestFramework)</TestFrameworkArgument>
-
-    <!--
-      TestResultsFolderPath
-      Applies to:    Test* targets
-      Description:   Absolute path to directory where any test results should be dumped. If not
-                     specified, this path will default to test_results in the root of the
-                     repository.
-      Default value: $(REPO_ROOT)\test_results
-      Example:       C:\my_test_results\my_extra_special_test_run_folder\
-    -->
-    <TestResultsFolderPath Condition="'$(TestResultsFolderPath)' == ''">$(RepoRoot)test_results</TestResultsFolderPath>
-
-    <!--
-      TestSet
-      Applies to:     TestMdsManual target
-      Description:    Used to select a set of tests to run from the MDS manual tests project. If not
-                      specified, all tests will be executed.
-      Default value:  [blank]
-      Allowed values: ([1][2][3][AE])
-      Examples:       "1", "12", "AE", "12AE"
-    -->
-    <TestSet Condition="'$(TestSet)' == ''" />
-    <TestSetArgument Condition="'$(TestSet)' != ''">-p:TestSet="$(TestSet)"</TestSetArgument>
-  </PropertyGroup>
-
-  <!-- ================================================================= -->
-  <!-- Microsoft.Data.SqlClient Targets -->
-  <PropertyGroup>
-    <!-- Root for MDS projects -->
-    <MdsSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient/</MdsSrcRoot>
-    <MdsArtifactRoot>$(RepoRoot)artifacts/Microsoft.Data.SqlClient/</MdsArtifactRoot>
-
-    <!-- Project Path -->
-    <MdsProjectPath>$(MdsSrcRoot)src/Microsoft.Data.SqlClient.csproj</MdsProjectPath>
-    <MdsRefProjectPath>$(MdsSrcRoot)ref/Microsoft.Data.SqlClient.csproj</MdsRefProjectPath>
-    <MdsNotSupportedProjectPath>$(MdsSrcRoot)notsupported/Microsoft.Data.SqlClient.csproj</MdsNotSupportedProjectPath>
-
-    <!-- Test Project Paths -->
-    <MdsFunctionalTestProjectPath>$(MdsSrcRoot)tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj</MdsFunctionalTestProjectPath>
-    <MdsManualTestProjectPath>$(MdsSrcRoot)tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj</MdsManualTestProjectPath>
-    <MdsUnitTestProjectPath>$(MdsSrcRoot)tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj</MdsUnitTestProjectPath>
-
-    <!-- Tools/Specs Paths -->
-    <MdsNuspecPath>$(RepoRoot)tools/specs/Microsoft.Data.SqlClient.nuspec</MdsNuspecPath>
-    <GenApiPath>$(RepoRoot)tools/GenAPI/Microsoft.DotNet.GenAPI/</GenApiPath>
-    <GenApiProjectPath>$(GenApiPath)Microsoft.DotNet.GenAPI.csproj</GenApiProjectPath>
-  </PropertyGroup>
-
-  <!-- Build MDS Targets =============================================== -->
-  <!-- BuildMds: Builds all binaries for MDS -->
-  <Target Name="BuildMds" DependsOnTargets="BuildMdsUnix;BuildMdsWindows;BuildMdsRef;BuildMdsNotSupported" />
-
-  <!--
-    BuildMdsNotSupported: Builds a version of the MDS assemblies that always throws
-    PlatformNotSupportedException. It generates the source for this using GenAPI which is built as
-    the first step of this target.
-  -->
-  <Target Name="BuildMdsNotSupported">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build "$(GenApiProjectPath)"
-        -p:Configuration=$(Configuration)
-      </DotnetCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-
-    <Message Text=">>> Building GenAPI project via command: '$(DotnetCommand)'"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-
-    <!-- Get the path to the GenAPI artifact -->
-    <ItemGroup>
-      <GenApiArtifactPath Include="$(GenApiPath)bin/$(Configuration)/**/Microsoft.DotNet.GenAPI.dll" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build "$(MdsNotSupportedProjectPath)"
-        -p:Configuration=$(Configuration)
-        -p:GenApiPath="@(GenApiArtifactPath->'%(FullPath)')"
-        $(SigningKeyPathArgument)
-
-        <!-- Versioning arguments -->
-        $(BuildNumberArgument)
-        $(BuildSuffixArgument)
-        $(PackageVersionMdsArgument)
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-      </DotnetCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-
-    <Message Text=">>> Building not supported binaries project via command: '$(DotnetCommand)'"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <!-- BuildMdsRef: Builds the ref binaries project for MDS, which is OS-agnostic -->
-  <Target Name="BuildMdsRef">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build $(MdsRefProjectPath)
-        -p:Configuration=$(Configuration)
-        $(SigningKeyPathArgument)
-
-        <!-- Versioning arguments -->
-        $(BuildNumberArgument)
-        $(BuildSuffixArgument)
-        $(PackageVersionMdsArgument)
-
-        <!-- Reference type arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-      </DotnetCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-
-    <Message Text=">>> Building MDS ref binaries via command: $(DotnetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <!-- BuildMdsUnix: Builds all unix-specific MDS binaries -->
-  <Target Name="BuildMdsUnix">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build $(MdsProjectPath)
-        -p:Configuration=$(Configuration)
-        -p:TargetOs=Unix
-        $(SigningKeyPathArgument)
-
-        <!-- Versioning arguments -->
-        $(BuildNumberArgument)
-        $(BuildSuffixArgument)
-        $(PackageVersionMdsArgument)
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-      </DotnetCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-
-    <Message Text=">>> Building MDS for Unix via command: $(DotnetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <!-- BuildMdsWindows: Builds all windows-specific MDS binaries -->
-  <Target Name="BuildMdsWindows">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build $(MdsProjectPath)
-        -p:Configuration=$(Configuration)
-        -p:TargetOs=Windows_NT
-        $(SigningKeyPathArgument)
-
-        <!-- Versioning Arguments -->
-        $(BuildNumberArgument)
-        $(BuildSuffixArgument)
-        $(PackageVersionMdsArgument)
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-      </DotnetCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Text=">>> Building MDS for Windows via command: $(DotnetCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <!-- Pack MDS Target ===================================================== -->
-  <!--
-    PackMds: Packages MDS binaries into a NuGet package.
-    Because the MDS package depends on the "not supported" and ref projects, we can't use dotnet to
-    automatically build before packaging. Instead, we rely on target dependency to handle building
-    the same binaries that will be packaged.
-  -->
-  <Target Name="PackMds" DependsOnTargets="$(PackMdsDependsOn)">
-    <Error Text="PackageVersionAbstractions must be set!"
-           Condition="'$(PackageVersionAbstractions)' == ''" />
-    <Error Text="PackageVersionLogging must be set!"
-           Condition="'$(PackageVersionLogging)' == ''" />
-
-    <PropertyGroup>
-      <GitCommand>
-        git rev-parse HEAD
-      </GitCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <GitCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GitCommand), "\s+", " "))</GitCommand>
-    </PropertyGroup>
-    <Message Text=">>> Fetching latest git commit hash via command: $(GitCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(GitCommand)">
-      <Output TaskParameter="ConsoleOutput" PropertyName="CommitId" />
-    </Exec>
-
-    <!-- This is a bit hacky, and can be (@TODO:) removed once packaging is done w/o a nuspec from dotnet -->
-    <PropertyGroup>
-      <GetMdsPackageVersionCommand>
-        "$(DotnetPath)dotnet" msbuild "$(MdsProjectPath)"
-        -nologo
-        -verbosity:quiet
-        -getProperty:MdsPackageVersion
-
-        <!-- Versioning arguments -->
-        $(BuildNumberArgument)
-        $(BuildSuffixArgument)
-        $(PackageVersionMdsArgument)
-      </GetMdsPackageVersionCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <GetMdsPackageVersionCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GetMdsPackageVersionCommand), "\s+", " "))</GetMdsPackageVersionCommand>
-    </PropertyGroup>
-    <Message Text=">>> Evaluating MDS package version via command: $(GetMdsPackageVersionCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(GetMdsPackageVersionCommand)">
-      <Output TaskParameter="ConsoleOutput" PropertyName="_EvaluatedMdsPackageVersion" />
-    </Exec>
-    <Error Text="Failed to evaluate MdsPackageVersion for PackMds."
-           Condition="'$(_EvaluatedMdsPackageVersion)' == ''" />
-
-    <PropertyGroup>
-      <_EvaluatedMdsPackageVersion>$([System.Text.RegularExpressions.Regex]::Replace($(_EvaluatedMdsPackageVersion), "\s", ""))</_EvaluatedMdsPackageVersion>
-      <CommitId>$([System.Text.RegularExpressions.Regex]::Replace($(CommitId), "\s", ""))</CommitId>
-      <NuGetCommand>
-        "$(NugetPath)" pack "$(MdsNuspecPath)"
-        -Symbols
-        -SymbolPackageFormat snupkg
-        -Version "$(_EvaluatedMdsPackageVersion)"
-        -OutputDirectory "$(MdsArtifactRoot)/$(ReferenceType)-$(Configuration)"
-        -properties "COMMITID=$(CommitId);Configuration=$(Configuration);ReferenceType=$(ReferenceType);AbstractionsPackageVersion=$(PackageVersionAbstractions);LoggingPackageVersion=$(PackageVersionLogging)"
-      </NuGetCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <NuGetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(NuGetCommand), "\s+", " "))</NuGetCommand>
-    </PropertyGroup>
-    <Message Text=">>> Packing MDS nuget via command: $(NuGetCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(NuGetCommand)" />
-  </Target>
-
-  <!-- Test MDS Targets ==================================================== -->
-  <!-- TestMds: Runs all test projects for MDS -->
-  <Target Name="TestMds" DependsOnTargets="TestMdsFunctional;TestMdsManual;TestMdsUnit" />
-
-  <!-- TestMdsFunctional: Runs functional tests for MDS -->
-  <Target Name="TestMdsFunctional">
-    <!-- @TODO: Prevent from running in non-admin user mode -->
-    <PropertyGroup>
-      <LogFilePrefix>MdsFunctional-$(OS)</LogFilePrefix>
-      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
-
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" test "$(MdsFunctionalTestProjectPath)"
-        -p:Configuration=$(Configuration)
-        $(TestBlameArgument)
-        $(TestCodeCoverageArgument)
-        $(TestFiltersArgument)
-        $(TestFrameworkArgument)
-        --results-directory "$(TestResultsFolderPath)"
-        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-        $(PackageVersionMdsArgument)
-      </DotnetCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running functional tests for MDS via command: $(DotnetCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <!-- TestMdsManual: Runs manual tests for MDS -->
-  <Target Name="TestMdsManual">
-    <PropertyGroup>
-      <LogFilePrefix>MdsManual-$(OS)</LogFilePrefix>
-      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
-      <LogFilePrefix Condition="'$(TestSet)' != ''">$(LogFilePrefix)-$(TestSet)</LogFilePrefix>
-
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" test "$(MdsManualTestProjectPath)"
-        -p:Configuration=$(Configuration)
-        $(TestBlameArgument)
-        $(TestCodeCoverageArgument)
-        $(TestFiltersArgument)
-        $(TestFrameworkArgument)
-        $(TestSetArgument)
-        --results-directory "$(TestResultsFolderPath)"
-        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-        $(PackageVersionMdsArgument)
-      </DotnetCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running manual tests for MDS via command: $(DotnetCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <!-- TestMdsUnit: Runs unit tests for MDS -->
-  <Target Name="TestMdsUnit">
-    <PropertyGroup>
-      <!--
-        Note: This test exclusively uses project references, so neither ReferenceType nor any
-            package version arguments are specified in this command.
-      -->
-      <LogFilePrefix>MdsUnit-$(OS)</LogFilePrefix>
-      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
-
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" test "$(MdsUnitTestProjectPath)"
-        -p:Configuration=$(Configuration)
-        $(TestBlameArgument)
-        $(TestCodeCoverageArgument)
-        $(TestFiltersArgument)
-        $(TestFrameworkArgument)
-        --results-directory "$(TestResultsFolderPath)"
-        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
-      </DotnetCommand>
-
-      <!-- Convert more than one whitespace character into one space -->
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running unit tests for MDS via command: $(DotnetCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-</Project>
diff --git a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
index 5e17b506c1..afb20ac80e 100644
--- a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
@@ -176,20 +176,15 @@ jobs:
       mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
       akvPackageVersion: ${{ parameters.akvPackageVersion }}
 
-  - task: MSBuild@1
+  - task: DotNetCoreCLI@2
     displayName: 'Create AKV Provider NuGet Package'
     inputs:
-      solution: build.proj
-      msbuildArchitecture: x64
-      platform: '${{ parameters.platform }}'
-      configuration: '${{ parameters.buildConfiguration }}'
-      msbuildArguments: >-
-        -t:PackAkvProvider
-        -p:ReferenceType=${{ parameters.referenceType }}
-        -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-        -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-        -p:AkvPackageVersion=${{ parameters.akvPackageVersion }}
-        -p:PackageOutputPath=$(packagePath)
+      command: pack
+      packagesToPack: src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
+      configurationToPack: ${{ parameters.buildConfiguration }}
+      nobuild: true
+      packDirectory: $(packagePath)
+      buildProperties: ReferenceType=${{ parameters.referenceType }};AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};LoggingPackageVersion=${{ parameters.loggingPackageVersion }};SqlClientPackageVersion=${{ parameters.mdsPackageVersion }};AkvProviderPackageVersion=${{ parameters.akvPackageVersion }};BuildNumber=$(Build.BuildNumber);AssemblyBuildNumber=$(assemblyBuildNumber)
 
   - task: PublishPipelineArtifact@1
     displayName: 'Publish Pipeline Artifacts'
diff --git a/eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml b/eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml
index 8c1d665e60..2fe5cb5fe8 100644
--- a/eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml
+++ b/eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml
@@ -49,7 +49,7 @@ steps:
       -p:ReferenceType=Package
       -p:Configuration=Release
       -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
       --no-build
       -v n
       --filter "category!=failing&category!=flaky&category!=interactive"
@@ -70,7 +70,7 @@ steps:
       -p:ReferenceType=Package
       -p:Configuration=Release
       -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
       --no-build
       -v n
       --filter "category=flaky"
@@ -92,7 +92,7 @@ steps:
       -p:ReferenceType=Package
       -p:Configuration=Release
       -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
       --no-build
       -v n
       --filter "category!=failing&category!=flaky&category!=interactive"
@@ -114,7 +114,7 @@ steps:
       -p:ReferenceType=Package
       -p:Configuration=Release
       -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
       --no-build
       -v n
       --filter "category=flaky"
diff --git a/eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml b/eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml
index c13256c614..2783094ce7 100644
--- a/eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml
+++ b/eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml
@@ -49,7 +49,7 @@ steps:
       -p:ReferenceType=Package
       -p:Configuration=Release
       -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
       --no-build
       -v n
       --filter "category!=failing&category!=flaky&category!=interactive"
@@ -70,7 +70,7 @@ steps:
       -p:ReferenceType=Package
       -p:Configuration=Release
       -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
       --no-build
       -v n
       --filter "category=flaky"
@@ -92,7 +92,7 @@ steps:
       -p:ReferenceType=Package
       -p:Configuration=Release
       -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
       --no-build
       -v n
       --filter "category!=failing&category!=flaky&category!=interactive"
@@ -114,7 +114,7 @@ steps:
       -p:ReferenceType=Package
       -p:Configuration=Release
       -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
       --no-build
       -v n
       --filter "category=flaky"
diff --git a/eng/pipelines/common/templates/steps/ci-project-build-step.yml b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
index d2604e0b3d..bbd2d10744 100644
--- a/eng/pipelines/common/templates/steps/ci-project-build-step.yml
+++ b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
@@ -79,40 +79,33 @@ steps:
       displayName: 'Build Driver'
       condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
       inputs:
-        solution: build2.proj
+        solution: build.proj
         msbuildArchitecture: x64
         platform: '${{ parameters.platform }}'
         configuration: '${{ parameters.buildConfiguration }}'
         msbuildArguments:
-          -t:BuildMds
+          -t:BuildSqlClient
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:BuildNumber=${{ parameters.assemblyBuildNumber }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
 
   # Build AKV Provider
   - ${{ if or(eq(parameters.build, 'AkvProvider'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
-    - task: MSBuild@1
+    - task: DotNetCoreCLI@2
       displayName: 'Build AKV Provider'
       condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
       inputs:
-        solution: build.proj
-        msbuildArchitecture: x64
-        platform: '${{ parameters.platform }}'
-        configuration: '${{ parameters.buildConfiguration }}'
-        msbuildArguments: >-
-          -t:BuildAkvProvider
+        command: build
+        projects: src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
+        arguments: >-
+          --configuration ${{ parameters.buildConfiguration }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:TestEnabled=true
-          -p:GenerateNuget=false
-          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:BuildNumber=${{ parameters.buildNumber }}
           -p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
-          -p:AkvPackageVersion=${{ parameters.akvPackageVersion }}
+          -p:AkvProviderPackageVersion=${{ parameters.akvPackageVersion }}
           -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
           -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-        verbosityRestore: Detailed
-        verbosityPack: Detailed
+          -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
 
diff --git a/eng/pipelines/common/templates/steps/run-all-tests-step.yml b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
index 68689adf44..e3397e45f0 100644
--- a/eng/pipelines/common/templates/steps/run-all-tests-step.yml
+++ b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
@@ -81,19 +81,19 @@ steps:
       displayName: 'Run Unit Tests ${{parameters.msbuildArchitecture }}'
       condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
-        solution: build2.proj
+        solution: build.proj
         msbuildArchitecture: ${{parameters.msbuildArchitecture }}
         platform: '${{parameters.platform }}'
         configuration: '${{parameters.buildConfiguration }}'
         ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
           msbuildArguments: >-
-            -t:TestMdsUnit
+            -t:TestSqlClientUnit
             -p:TestFramework=${{ parameters.targetFramework }}
             -p:ReferenceType=${{ parameters.referenceType }}
             -p:TestResultsFolderPath=TestResults
         ${{ else }}: # x86
           msbuildArguments: >-
-            -t:TestMdsUnit
+            -t:TestSqlClientUnit
             -p:TestFramework=${{ parameters.targetFramework }}
             -p:ReferenceType=${{ parameters.referenceType }}
             -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
@@ -103,13 +103,13 @@ steps:
       displayName: 'Run Flaky Unit Tests ${{parameters.msbuildArchitecture }}'
       condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
-        solution: build2.proj
+        solution: build.proj
         msbuildArchitecture: ${{parameters.msbuildArchitecture }}
         platform: '${{parameters.platform }}'
         configuration: '${{parameters.buildConfiguration }}'
         ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
           msbuildArguments: >-
-            -t:TestMdsUnit
+            -t:TestSqlClientUnit
             -p:TestFramework=${{ parameters.targetFramework }}
             -p:ReferenceType=${{ parameters.referenceType }}
             -p:TestFilters="category=flaky"
@@ -117,7 +117,7 @@ steps:
             -p:TestCodeCoverage=false
         ${{ else }}: # x86
           msbuildArguments: >-
-            -t:TestMdsUnit
+            -t:TestSqlClientUnit
             -p:TestFramework=${{ parameters.targetFramework }}
             -p:ReferenceType=${{ parameters.referenceType }}
             -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
@@ -130,27 +130,27 @@ steps:
     displayName: 'Run Functional Tests ${{parameters.msbuildArchitecture }}'
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
-      solution: build2.proj
+      solution: build.proj
       msbuildArchitecture: ${{parameters.msbuildArchitecture }}
       platform: '${{parameters.platform }}'
       configuration: '${{parameters.buildConfiguration }}'
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
         msbuildArguments: >-
-          -t:TestMdsFunctional
+          -t:TestSqlClientFunctional
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
         msbuildArguments: >-
-          -t:TestMdsFunctional
+          -t:TestSqlClientFunctional
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestResultsFolderPath=TestResults
 
@@ -158,29 +158,29 @@ steps:
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     displayName: 'Run Flaky Functional Tests ${{parameters.msbuildArchitecture }}'
     inputs:
-      solution: build2.proj
+      solution: build.proj
       msbuildArchitecture: ${{parameters.msbuildArchitecture }}
       platform: '${{parameters.platform }}'
       configuration: '${{parameters.buildConfiguration }}'
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
         msbuildArguments: >-
-          -t:TestMdsFunctional
+          -t:TestSqlClientFunctional
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
           -p:TestCodeCoverage=false
       ${{ else }}: # x86
         msbuildArguments: >-
-          -t:TestMdsFunctional
+          -t:TestSqlClientFunctional
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
@@ -191,29 +191,29 @@ steps:
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     displayName: 'Run Manual Tests ${{parameters.msbuildArchitecture }}'
     inputs:
-      solution: build2.proj
+      solution: build.proj
       msbuildArchitecture: ${{parameters.msbuildArchitecture }}
       platform: '${{parameters.platform }}'
       configuration: '${{parameters.buildConfiguration }}'
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
         msbuildArguments: >-
-          -t:TestMdsManual
+          -t:TestSqlClientManual
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
         msbuildArguments: >-
-          -t:TestMdsManual
+          -t:TestSqlClientManual
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestResultsFolderPath=TestResults
     retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
@@ -222,31 +222,31 @@ steps:
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     displayName: 'Run Flaky Manual Tests ${{parameters.msbuildArchitecture }}'
     inputs:
-      solution: build2.proj
+      solution: build.proj
       msbuildArchitecture: ${{parameters.msbuildArchitecture }}
       platform: '${{parameters.platform }}'
       configuration: '${{parameters.buildConfiguration }}'
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
         msbuildArguments: >-
-          -t:TestMdsManual
+          -t:TestSqlClientManual
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
           -p:TestCodeCoverage=false
       ${{ else }}: # x86
         msbuildArguments: >-
-          -t:TestMdsManual
+          -t:TestSqlClientManual
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
@@ -260,15 +260,15 @@ steps:
       condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
         command: custom
-        projects: build2.proj
+        projects: build.proj
         custom: msbuild
         arguments: >-
-          -t:TestMdsUnit
+          -t:TestSqlClientUnit
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:Configuration=${{ parameters.buildConfiguration }}
           -p:TestResultsFolderPath=TestResults
         verbosityRestore: Detailed
@@ -279,15 +279,15 @@ steps:
       condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
         command: custom
-        projects: build2.proj
+        projects: build.proj
         custom: msbuild
         arguments: >-
-          -t:TestMdsUnit
+          -t:TestSqlClientUnit
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:Configuration=${{ parameters.buildConfiguration }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
@@ -301,15 +301,15 @@ steps:
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
       command: custom
-      projects: build2.proj
+      projects: build.proj
       custom: msbuild
       arguments: >-
-        -t:TestMdsFunctional
+        -t:TestSqlClientFunctional
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-        -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
         -p:Configuration=${{ parameters.buildConfiguration }}
         -p:TestResultsFolderPath=TestResults
       verbosityRestore: Detailed
@@ -320,15 +320,15 @@ steps:
     displayName: 'Run Flaky Functional Tests'
     inputs:
       command: custom
-      projects: build2.proj
+      projects: build.proj
       custom: msbuild
       arguments: >-
-        -t:TestMdsFunctional
+        -t:TestSqlClientFunctional
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-        -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
         -p:Configuration=${{ parameters.buildConfiguration }}
         -p:TestFilters="category=flaky"
         -p:TestResultsFolderPath=TestResults
@@ -336,22 +336,21 @@ steps:
       verbosityRestore: Detailed
       verbosityPack: Detailed
     continueOnError: true
-
   - task: DotNetCoreCLI@2
     displayName: 'Run Manual Tests'
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
       command: custom
-      projects: build2.proj
+      projects: build.proj
       custom: msbuild
       arguments: >-
-        -t:TestMdsManual
+        -t:TestSqlClientManual
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:TestSet=${{ parameters.testSet }}
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-        -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
         -p:Configuration=${{ parameters.buildConfiguration }}
         -p:TestResultsFolderPath=TestResults
       verbosityRestore: Detailed
@@ -363,16 +362,16 @@ steps:
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
       command: custom
-      projects: build2.proj
+      projects: build.proj
       custom: msbuild
       arguments: >-
-        -t:TestMdsManual
+        -t:TestSqlClientManual
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:TestSet=${{ parameters.testSet }}
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-        -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
         -p:Configuration=${{ parameters.buildConfiguration }}
         -p:TestFilters="category=flaky"
         -p:TestResultsFolderPath=TestResults
@@ -380,3 +379,4 @@ steps:
       verbosityRestore: Detailed
       verbosityPack: Detailed
     continueOnError: true
+
diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index d39c590efc..c8181aff5a 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -119,12 +119,26 @@ variables:
   - name: mdsArtifactsName
     value: MDS.Artifacts
 
+  - name: sqlServerArtifactsName
+    value: SqlServer.Artifacts
+
 stages:
   # Generate secrets used throughout the pipeline.
   - template: /eng/pipelines/stages/generate-secrets-ci-stage.yml@self
     parameters:
       debug: ${{ parameters.debug }}
 
+  # Build the SqlServer package, and publish it to the pipeline artifacts
+  # under the given artifact name.  This runs in parallel with the Secrets
+  # generation stage since it has no package dependencies.
+  - template: /eng/pipelines/stages/build-sqlserver-package-ci-stage.yml@self
+    parameters:
+      sqlServerArtifactsName: $(sqlServerArtifactsName)
+      sqlServerPackageVersion: $(sqlServerPackageVersion)
+      buildConfiguration: ${{ parameters.buildConfiguration }}
+      debug: ${{ parameters.debug }}
+      dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+
   # Build the Logging package, and publish it to the pipeline artifacts
   # under the given artifact name.  This runs in parallel with the Secrets
   # generation stage since it has no package dependencies.
@@ -212,6 +226,7 @@ stages:
       azureArtifactsName: $(azureArtifactsName)
       loggingArtifactsName: $(loggingArtifactsName)
       mdsArtifactsName: $(mdsArtifactsName)
+      sqlServerArtifactsName: $(sqlServerArtifactsName)
 
   # Run the MDS and AKV tests.
   - template: /eng/pipelines/common/templates/stages/ci-run-tests-stage.yml@self
diff --git a/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml b/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
new file mode 100644
index 0000000000..915bf1e9bd
--- /dev/null
+++ b/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
@@ -0,0 +1,113 @@
+################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET
+# Foundation licenses this file to you under the MIT license.  See the LICENSE
+# file in the project root for more information.
+################################################################################
+
+# This job packs the Microsoft.SqlServer.Server package into NuGet and symbols
+# packages and publishes them as a named pipeline artifact.
+#
+# This template defines a job named 'pack_sqlserver_package_job' that can be
+# depended on by downstream jobs.
+
+parameters:
+
+  # The type of build to produce (Release or Debug)
+  - name: buildConfiguration
+    type: string
+    values:
+    - Release
+    - Debug
+
+  # True to emit debug information and steps.
+  - name: debug
+    type: boolean
+    default: false
+
+  # The name of the pipeline artifacts to publish.
+  - name: sqlServerArtifactsName
+    type: string
+    default: SqlServer.Artifacts
+
+  # The version to apply to the SqlServer NuGet package and its assemblies.
+  - name: sqlServerPackageVersion
+    type: string
+
+  # The list of upstream jobs to depend on.
+  - name: dependsOn
+    type: object
+    default: []
+
+  # The verbosity level for the dotnet CLI commands.
+  - name: dotnetVerbosity
+    type: string
+    default: normal
+    values:
+    - quiet
+    - minimal
+    - normal
+    - detailed
+    - diagnostic
+
+jobs:
+
+  - job: pack_sqlserver_package_job
+    displayName: Pack SqlServer Package
+
+    dependsOn: ${{ parameters.dependsOn }}
+
+    pool:
+      name: Azure Pipelines
+      vmImage: ubuntu-latest
+
+    variables:
+
+      # The SqlServer project file to use for all dotnet CLI commands.
+      - name: project
+        value: src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj
+
+      # The directory where the NuGet packages will be staged before being
+      # published as pipeline artifacts.
+      - name: dotnetPackagesDir
+        value: $(Build.StagingDirectory)/dotnetPackages
+
+      # Explicitly unset the $PLATFORM environment variable that is set by the
+      # 'ADO Build properties' Library in the ADO SqlClientDrivers public project.
+      - name: Platform
+        value: ''
+
+      # Do the same for $CONFIGURATION since we explicitly set it using our
+      # 'buildConfiguration' parameter, and we don't want the environment to
+      # override us.
+      - name: Configuration
+        value: ''
+
+    steps:
+
+      # Emit environment variables if debug is enabled.
+      - ${{ if eq(parameters.debug, true) }}:
+        - pwsh: 'Get-ChildItem Env: | Sort-Object Name'
+          displayName: '[Debug] Print Environment Variables'
+
+      # Install the .NET SDK.
+      - template: /eng/pipelines/steps/install-dotnet.yml@self
+        parameters:
+          debug: ${{ parameters.debug }}
+
+      # Create the NuGet packages.
+      - task: DotNetCoreCLI@2
+        displayName: Create NuGet Package
+        inputs:
+          command: pack
+          packagesToPack: $(project)
+          configurationToPack: ${{ parameters.buildConfiguration }}
+          packDirectory: $(dotnetPackagesDir)
+          verbosityToPack: ${{ parameters.dotnetVerbosity }}
+          buildProperties: SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }}
+
+      - task: PublishPipelineArtifact@1
+        displayName: Publish Pipeline Artifact
+        inputs:
+          targetPath: $(dotnetPackagesDir)
+          artifactName: ${{ parameters.sqlServerArtifactsName }}
+          publishLocation: pipeline
diff --git a/eng/pipelines/jobs/test-azure-package-ci-job.yml b/eng/pipelines/jobs/test-azure-package-ci-job.yml
index 5e5dffe381..0ad4246cb0 100644
--- a/eng/pipelines/jobs/test-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-azure-package-ci-job.yml
@@ -153,7 +153,7 @@ jobs:
           --verbosity ${{ parameters.dotnetVerbosity }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
+          -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
 
       # Explicitly unset the $PLATFORM environment variable that is set by the
       # 'ADO Build properties' Library in the ADO SqlClientDrivers public
diff --git a/eng/pipelines/libraries/ci-build-variables.yml b/eng/pipelines/libraries/ci-build-variables.yml
index 027501df0f..6d39d085b7 100644
--- a/eng/pipelines/libraries/ci-build-variables.yml
+++ b/eng/pipelines/libraries/ci-build-variables.yml
@@ -28,7 +28,7 @@ variables:
 
   # Abstractions library NuGet package version
   - name: abstractionsPackageVersion
-    value: 1.0.0.$(Build.BuildNumber)-ci
+    value: 1.0.0-ci$(Build.BuildNumber)
 
   # AKV provider assembly file version
   - name: akvAssemblyFileVersion
@@ -36,7 +36,7 @@ variables:
 
   # AKV provider NuGet package version
   - name: akvPackageVersion
-    value: 7.0.0.$(Build.BuildNumber)-ci
+    value: 7.0.0-ci$(Build.BuildNumber)
 
   # Azure library assembly file version
   - name: azureAssemblyFileVersion
@@ -44,7 +44,7 @@ variables:
 
   # Azure library NuGet package version
   - name: azurePackageVersion
-    value: 1.0.0.$(Build.BuildNumber)-ci
+    value: 1.0.0-ci$(Build.BuildNumber)
 
   # Logging library assembly file version
   - name: loggingAssemblyFileVersion
@@ -52,16 +52,22 @@ variables:
 
   # Logging library NuGet package version
   - name: loggingPackageVersion
-    value: 1.0.0.$(Build.BuildNumber)-ci
+    value: 1.0.0-ci$(Build.BuildNumber)
 
   # MDS library NuGet package version
   # NOTE: This differs from the other structures! MdsVersions.props will deconstruct a provided
   #    package version and build an assembly version from it. If the build number is included
   #    before the "-" the build number will be appended again, generating an invalid file version.
-  # @TODO: This is a band-aid to ensure that CI builds until we can centralize versioning.
   - name: mdsPackageVersion
     value: 7.0.0-ci$(AssemblyBuildNumber)
 
+  # SqlServer library NuGet package version
+  # NOTE: SqlServer's version props derive file version from the package version by appending the
+  #    assembly build number, so this must remain a three-part SemVer base with a prerelease
+  #    suffix, not a four-part numeric version.
+  - name: sqlServerPackageVersion
+    value: 1.0.0-ci$(AssemblyBuildNumber)
+
   # Local NuGet feed directory where downloaded pipeline artifacts are placed.
   # NuGet.config references this as a local package source for restore.
   - name: localFeedPath
diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
new file mode 100644
index 0000000000..c700a57701
--- /dev/null
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -0,0 +1,212 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Generic job template for building and signing simple build.proj packages.
+#
+# The job builds DLLs via build.proj, ESRP signs the DLLs, creates NuGet packages from the signed
+# DLLs, ESRP signs the NuGet packages, and finally copies all the build output to the job output.
+
+parameters:
+  # Common Build Job Properties ############################################
+  - name: apiScanDllPath
+    type: string
+
+  - name: apiScanPdbPath
+    type: string
+
+  # True to enable ESRP malware scanning and code signing steps, which should not be run on
+  # non-official pipelines as they access production resources. If true, Signing* parameters must
+  # be provided.
+  - name: shouldSignPackage
+    type: boolean
+
+  # Signing Parameters -----------------------------------------------------
+  # @TODO: Signing Parameters Object
+
+  - name: signingAppRegistrationClientId
+    type: string
+
+  - name: signingAppRegistrationTenantId
+    type: string
+
+  - name: signingAuthAkvName
+    type: string
+
+  - name: signingAuthSignCertName
+    type: string
+
+  - name: signingEsrpClientId
+    type: string
+
+  - name: signingEsrpConnectedServiceName
+    type: string
+
+  # Package Properties #####################################################
+
+  # A list of packages that the package being built with this job depends on. Each entry in the
+  # object should have the fields:
+  # * artifactName - Name of the artifact published in a previous job that contains the desired
+  #   version of the dependency.
+  # * shortName - Short name of the dependency. This name should correspond to the short name used
+  #   when building the package via build.proj
+  # * version - the version of the dependency that this package depends on
+  - name: dependencies
+    type: object
+    default: []
+
+  # Assembly file version for APIScan (e.g. 1.0.0.12345).
+  - name: fileVersion
+    type: string
+
+  # The full name of the package. This is used in the job name, and to form DLL and PDB filenames
+  # for APIScan.
+  - name: packageFullName
+    type: string
+    values:
+      - 'Microsoft.Data.SqlClient'
+      - 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
+      - 'Microsoft.Data.SqlClient.Extensions.Abstractions'
+      - 'Microsoft.Data.SqlClient.Extensions.Azure'
+      - 'Microsoft.Data.SqlClient.Internal.Logging'
+      - 'Microsoft.SqlServer.Server'
+
+  # Short package name used in the job name, display strings, filesystem paths, and as a suffix for
+  # the default Build and Pack targets if those aren't specified.
+  - name: packageShortName
+    type: string
+    values:
+      - 'Abstractions'
+      - 'AkvProvider'
+      - 'Azure'
+      - 'Logging'
+      - 'SqlClient'
+      - 'SqlServer'
+
+  # The version of the package.
+  - name: packageVersion
+    type: string
+
+jobs:
+  - job: 'build_package_${{ parameters.packageShortName }}'
+    displayName: 'Build: ${{ parameters.packageFullName }}'
+    pool:
+      type: windows
+
+    variables:
+      # Placeholder for dependency package arguments. This will be constructed later as it depends
+      # on scripting to decompose parameters.dependencies.
+      dependencyPackageArguments: ''
+
+      ob_outputDirectory: '$(JOB_OUTPUT)'
+
+      # APIScan configuration for the package being built by this job.
+      ob_sdl_apiscan_enabled: true
+      ob_sdl_apiscan_softwareFolder: ${{ parameters.apiScanDllPath }}
+      ob_sdl_apiscan_symbolsFolder: ${{ parameters.apiScanPdbPath }}
+      ob_sdl_apiscan_softwarename: ${{ parameters.packageFullName }}
+      ob_sdl_apiscan_versionNumber: ${{ parameters.fileVersion }}
+
+    steps:
+      - template: /eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self
+
+      # Constructs the dependency package version parameters to pass to the build steps. Generates
+      # a string of the form (eg) "-p:PackageVersionAzure=1.2.3"
+      - ${{ each package in parameters.dependencies }}:
+          # Append the dependency to the package dependency arguments argument in the form of, eg:
+          # -p:PackageVersionAzure=1.2.3
+          - script: echo "##vso[task.setvariable variable=dependencyPackageArguments]$(dependencyPackageArguments) -p:PackageVersion${{ package.shortName }}=${{ package.version }}
+            displayName: "Append Package Version Argument - ${{ package.shortName }}"
+
+          # Download the pipeline artifact for this dependency package
+          - task: DownloadPipelineArtifact@2
+            displayName: "Download Artifact - ${{ package.shortName }}"
+            inputs:
+              artifactName: ${{ package.artifactName }}
+              targetPath: $(REPO_ROOT)/packages
+
+      # Install the .NET SDK.
+      - template: /eng/pipelines/steps/install-dotnet.yml@self
+
+      # Perform Roslyn analysis before building, since this step will clobber build output.
+      - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml@self
+        parameters:
+          dependencyArguments: $(dependencyPackageArguments)
+          packageShortName: ${{ parameters.packageShortName }}
+          packageVersion: ${{ parameters.packageVersion }}
+
+      # Build the package, producing DLLs only (no NuGet package yet).
+      - template: /eng/pipelines/onebranch/steps/build-buildproj-step.yml@self
+        parameters:
+          buildConfiguration: Release
+          dependencyArguments: $(dependencyPackageArguments)
+          packageShortName: ${{ parameters.packageShortName }}
+          packageVersion: ${{ parameters.packageVersion }}
+
+      - ${{ if eq(parameters.shouldSignPackage, true) }}:
+          # ESRP sign the DLLs.
+          - template: /eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml@self
+            parameters:
+              appRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+              appRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+              authAkvName: '${{ parameters.signingAuthAkvName }}'
+              authSignCertName: '${{ parameters.signingAuthSignCertName }}'
+              esrpClientId: '${{ parameters.signingEsrpClientId }}'
+              esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+              pattern: '${{ parameters.packageFullName }}.dll'
+
+      # Copy signed/unsigned DLLs and PDBs to APIScan folders.
+      - task: CopyFiles@2
+        displayName: Copy DLLs for APIScan
+        inputs:
+          SourceFolder: $(BUILD_OUTPUT)/${{ parameters.packageFullName }}
+          Contents: "**/${{ parameters.packageFullName }}.dll"
+          TargetFolder: '${{ parameters.apiScanDllPath }}'
+          # We must preserve the folder structure since our C# projects may produce multiple
+          # identically named DLLs for different target frameworks (e.g. netstandard2.0, net5.0,
+          # etc.), and we need to keep those separate for APIScan to work correctly.
+          flattenFolders: false
+
+      - task: CopyFiles@2
+        displayName: Copy PDBs for APIScan
+        inputs:
+          SourceFolder: $(BUILD_OUTPUT)/${{ parameters.packageFullName }}
+          Contents: "**/${{ parameters.packageFullName }}.pdb"
+          TargetFolder: '${{ parameters.apiScanPdbPath }}'
+          # We must preserve the folder structure since our C# projects may produce multiple
+          # identically named DLLs for different target frameworks (e.g. netstandard2.0, net5.0,
+          # etc.), and we need to keep those separate for APIScan to work correctly.
+          flattenFolders: false
+
+      # Pack the signed DLLs into NuGet package (NoBuild=true).
+      - template: /eng/pipelines/onebranch/steps/pack-buildproj-step.yml@self
+        parameters:
+          buildConfiguration: Release
+          dependencyArguments: $(dependencyPackageArguments)
+          packageFullName: ${{ parameters.packageFullName }}
+          packageShortName: ${{ parameters.packageShortName }}
+          packageVersion: ${{ parameters.packageVersion }}
+
+      - ${{ if eq(parameters.shouldSignPackage, true) }}:
+          # ESRP sign the NuGet package.
+          - template: /eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml@self
+            parameters:
+              appRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+              appRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+              authAkvName: '${{ parameters.signingAuthAkvName }}'
+              authSignCertName: '${{ parameters.signingAuthSignCertName }}'
+              esrpClientId: '${{ parameters.signingEsrpClientId }}'
+              esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+              searchPath: '$(PACK_OUTPUT)'
+              searchPattern: '${{ parameters.packageFullName}}.*nupkg'
+
+      # Copy the contents of the build output for this package to the artifacts folder
+      - task: CopyFiles@2
+        displayName: Copy Build Output to Artifacts Folder
+        inputs:
+          SourceFolder: '$(BUILD_OUTPUT)/${{ parameters.packageFullName }}'
+          Contents: '**/*.*'
+          TargetFolder: '$(JOB_OUTPUT)'
+          flattenFolders: false
diff --git a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
deleted file mode 100644
index 94e6438ef5..0000000000
--- a/eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml
+++ /dev/null
@@ -1,216 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# Generic job template for building and signing simple csproj-based packages, currently:
-#
-#  - Abstractions
-#  - Azure
-#  - Logging
-#  - SqlServer
-#
-# The job builds DLLs via build.proj, ESRP signs the DLLs, then creates NuGet packages from the
-# signed DLLs, and finally ESRP signs the NuGet packages.
-
-parameters:
-
-  # Signing Parameters -----------------------------------------------------
-
-  - name: signingAppRegistrationClientId
-    type: string
-
-  - name: signingAppRegistrationTenantId
-    type: string
-
-  - name: signingAuthAkvName
-    type: string
-
-  - name: signingAuthSignCertName
-    type: string
-
-  - name: signingEsrpClientId
-    type: string
-
-  - name: signingEsrpConnectedServiceName
-    type: string
-
-  # OTHERS +=====================================
-
-  # Short package name used in the job name, display strings, filesystem paths, and as a suffix for
-  # the default Build and Pack targets if those aren't specified.
-  - name: packageName
-    type: string
-    values:
-      - Abstractions
-      - AkvProvider
-      - Azure
-      - Logging
-      - SqlServer
-
-  # The full name of the package.  This is used in the job name, and to form DLL and PDB filenames
-  # for APIScan.
-  - name: packageFullName
-    type: string
-
-  # The MSBuild build target in build.proj (e.g. BuildLogging).  If not specified, defaults to
-  # Build<packageName>.
-  - name: buildTarget
-    type: string
-    default: ""
-
-  # True to enable ESRP malware scanning and code signing steps, which should not be
-  # run on non-official pipelines as they access production resources.
-  - name: isOfficial
-    type: boolean
-
-  # The MSBuild pack target in build.proj (e.g. PackLogging).  If not specified, defaults to
-  # Pack<packageName>.
-  - name: packTarget
-    type: string
-    default: ""
-
-  # Additional MSBuild -p: arguments for version properties.  These may include versions of
-  # packages this package depends on, or versions for this package itself.
-  - name: versionProperties
-    type: string
-    default: ""
-
-  # Assembly file version for APIScan (e.g. 1.0.0.12345).
-  - name: assemblyFileVersion
-    type: string
-
-  # Optional list of pipeline artifacts to download before building.  Each entry is an object
-  # with 'artifactName' (the pipeline artifact name) and 'displayName' (used in the task label).
-  # This replaces hard-coded packageName conditionals so callers declare their own dependencies.
-  - name: downloadArtifacts
-    type: object
-    default: []
-
-jobs:
-  - job: build_package_${{ parameters.packageName }}
-    displayName: Build ${{ parameters.packageFullName }}
-    pool:
-      type: windows
-
-    variables:
-      # Inform OneBranch that files put in this directory should be uploaded as artifacts.
-      ob_outputDirectory: $(JOB_OUTPUT)
-
-      # APIScan configuration for this Extension package
-      ob_sdl_apiscan_enabled: true
-      ob_sdl_apiscan_softwareFolder: $(JOB_OUTPUT)/assemblies
-      ob_sdl_apiscan_symbolsFolder: $(JOB_OUTPUT)/symbols
-      ob_sdl_apiscan_softwarename: ${{ parameters.packageFullName }}
-      ob_sdl_apiscan_versionNumber: ${{ parameters.assemblyFileVersion }}
-
-      # If parameters.buildTarget is not provided, default to "Build{parameters.packageName}"
-      buildTarget: ${{ coalesce(parameters.buildTarget, format('Build{0}', parameters.packageName)) }}
-
-      # If parameters.packTarget is not provided, default to "Pack{parameters.packageName}"
-      packTarget: ${{ coalesce(parameters.packTarget, format('Pack{0}', parameters.packageName)) }}
-
-    steps:
-      - template: /eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self
-
-      # Download any pipeline artifacts this package depends on.
-      - ${{ each artifact in parameters.downloadArtifacts }}:
-          - task: DownloadPipelineArtifact@2
-            displayName: Download ${{ artifact.displayName }}
-            inputs:
-              artifactName: ${{ artifact.artifactName }}
-              targetPath: $(JOB_INPUT)
-
-      # Install the .NET SDK.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
-
-      # Perform Roslyn analysis before building, since this step will clobber build output.
-      - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml@self
-        parameters:
-          buildTarget: '${{ variables.buildTarget }}'
-          msBuildArguments: >-
-            -p:Configuration=Release
-            -p:ReferenceType=Package
-            ${{ parameters.versionProperties }}
-
-      # Build the package, producing DLLs only (no NuGet package yet).
-      - template: /eng/pipelines/onebranch/steps/build-csproj-step.yml@self
-        parameters:
-          buildTarget: '${{ variables.buildTarget }}'
-          versionProperties: ${{ parameters.versionProperties }}
-
-      - ${{ if eq(parameters.isOfficial, true) }}:
-          # ESRP sign the DLLs.
-          - template: /eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml@self
-            parameters:
-              appRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
-              appRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
-              authAkvName: '${{ parameters.signingAuthAkvName }}'
-              authSignCertName: '${{ parameters.signingAuthSignCertName }}'
-              esrpClientId: '${{ parameters.signingEsrpClientId }}'
-              esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              # Minimatch pattern (multi-line, one pattern per line).
-              # **/ matches any nested directory (e.g. net8.0/, netstandard2.0/fr/).
-              #
-              # Matches:  net8.0/<packageFullName>.dll
-              #           netstandard2.0/fr/<packageFullName>.resources.dll
-              pattern: |
-                **/${{ parameters.packageFullName }}.dll
-                **/${{ parameters.packageFullName }}.resources.dll
-
-      # Copy DLLs to the assemblies/ subdirectory for APIScan.
-      - task: CopyFiles@2
-        displayName: Copy DLLs for APIScan
-        inputs:
-          SourceFolder: $(BUILD_OUTPUT)/Package/bin
-          # Matches: <packageFullName>.dll (main assembly) across all TFM subdirs
-          #          <packageFullName>.resources.dll (localized satellite assemblies in locale subdirs, if any)
-          Contents: |
-            **/${{ parameters.packageFullName }}.dll
-            **/${{ parameters.packageFullName }}.resources.dll
-          TargetFolder: $(JOB_OUTPUT)/assemblies
-          # We must preserve the folder structure since our C# projects may produce multiple
-          # identically named DLLs for different target frameworks (e.g. netstandard2.0, net5.0,
-          # etc.), and we need to keep those separate for APIScan to work correctly.
-          flattenFolders: false
-
-      # Copy PDBs into the output directory so they are included in the published pipeline
-      # artifact. The symbols publishing stage will download this artifact and publish PDBs
-      # for this package using the files under symbols/.
-      - task: CopyFiles@2
-        displayName: Copy PDBs for APIScan and Symbols Publishing
-        inputs:
-          SourceFolder: $(BUILD_OUTPUT)/Package/bin
-          # Matches: <packageFullName>.pdb across all TFM subdirs.
-          # Note: Resource DLLs are resource-only satellite assemblies and do not produce PDBs.
-          Contents: '**/${{ parameters.packageFullName }}.pdb'
-          TargetFolder: $(JOB_OUTPUT)/symbols
-          flattenFolders: false
-
-      # Pack the signed DLLs into NuGet package (NoBuild=true).
-      - template: /eng/pipelines/onebranch/steps/pack-csproj-step.yml@self
-        parameters:
-          packTarget: ${{ variables.packTarget }}
-          versionProperties: ${{ parameters.versionProperties }}
-
-      - ${{ if eq(parameters.isOfficial, true) }}:
-          # ESRP sign the NuGet package.
-          - template: /eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml@self
-            parameters:
-              appRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
-              appRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
-              authAkvName: '${{ parameters.signingAuthAkvName }}'
-              authSignCertName: '${{ parameters.signingAuthSignCertName }}'
-              esrpClientId: '${{ parameters.signingEsrpClientId }}'
-              esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              searchPath: $(JOB_OUTPUT)/packages
-              # Minimatch pattern with extglob.
-              # [0-9] matches a single digit, anchoring to the version segment so
-              # similarly-prefixed package names are not matched.
-              # ?(s) is an extglob that optionally matches 's'.
-              #
-              # Matches:  <packageFullName>.1.0.0.nupkg
-              #           <packageFullName>.1.0.0-preview.1.snupkg
-              # Excludes: <packageFullName>.SomeOther.1.0.0.nupkg
-              searchPattern: '${{ parameters.packageFullName }}.[0-9]*.?(s)nupkg'
diff --git a/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml b/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
deleted file mode 100644
index 5bf33f9c09..0000000000
--- a/eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml
+++ /dev/null
@@ -1,180 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# Job that performs a build of Microsoft.Data.SqlClient using the build2.proj file.
-
-parameters:
-  # Whether this build is for an "official" OneBranch pipeline. This is used to enable ESRP signing
-  # on the artifacts of this job.
-  - name: isOfficial
-    type: boolean
-
-  - name: signingAppRegistrationClientId
-    type: string
-
-  - name: signingAppRegistrationTenantId
-    type: string
-
-  - name: signingAuthAkvName
-    type: string
-
-  - name: signingAuthSignCertName
-    type: string
-
-  - name: signingEsrpClientId
-    type: string
-
-  - name: signingEsrpConnectedServiceName
-    type: string
-
-  # Package Parameters
-  - name: abstractionsArtifactName
-    type: string
-
-  - name: abstractionsPackageVersion
-    type: string
-
-  - name: loggingArtifactName
-    type: string
-
-  - name: loggingPackageVersion
-    type: string
-
-  - name: sqlClientAssemblyFileVersion
-    type: string
-
-  - name: sqlClientPackageVersion
-    type: string
-
-jobs:
-  - job: build_package_SqlClient
-    displayName: 'Build Microsoft.Data.SqlClient'
-    pool:
-      type: windows
-
-    variables:
-      ob_outputDirectory: '$(JOB_OUTPUT)'
-      ob_sdl_apiscan_softwareFolder: $(JOB_OUTPUT)/assemblies
-      ob_sdl_apiscan_symbolsFolder: $(JOB_OUTPUT)/symbols
-      ob_sdl_apiscan_softwarename: 'Microsoft.Data.SqlClient'
-      ob_sdl_apiscan_versionNumber: ${{ parameters.sqlClientAssemblyFileVersion }}
-
-    steps:
-      # Dump environment and parameters
-      - template: /eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self
-
-      - powershell: |
-          $jsonParams = '${{ convertToJson(parameters) }}' -replace '\\', '\\'
-          $jsonParams | ConvertFrom-Json | Format-List
-        displayName: 'Output Job Parameters'
-
-      # Download Abstractions and Logging packages from previous stages into /packages/ so they
-      # are available via the local NuGet feed when restoring.
-      # @TODO: With the new build2.proj pack targets, this technically is not necessary.
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Microsoft.Data.SqlClient.Extensions.Abstractions Artifact
-        inputs:
-          artifactName: '${{ parameters.abstractionsArtifactName }}'
-          targetPath: '$(JOB_INPUT)'
-
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Microsoft.Data.SqlClient.Extensions.Logging Artifact
-        inputs:
-          artifactName: '${{ parameters.loggingArtifactName }}'
-          targetPath: '$(JOB_INPUT)'
-
-      # Install the .NET SDK
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
-
-      # Perform analysis before building, since this step will clobber build output
-      - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml@self
-        parameters:
-          abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
-          loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
-          sqlClientPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
-
-      # Perform the actual build
-      - template: /eng/pipelines/onebranch/steps/build-sqlclient-step.yml@self
-        parameters:
-          abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
-          loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
-          sqlClientPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
-
-      # Sign the DLLs
-      - ${{ if parameters.isOfficial }}:
-          - template: /eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml@self
-            parameters:
-              appRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
-              appRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
-              authAkvName: '${{ parameters.signingAuthAkvName }}'
-              authSignCertName: '${{ parameters.signingAuthSignCertName }}'
-              esrpClientId: '${{ parameters.signingEsrpClientId }}'
-              esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              # Minimatch pattern (multi-line, one pattern per line).
-              # **/ matches any nested directory (e.g. net8.0/, net462/fr/).
-              #
-              # Matches:  net8.0/Microsoft.Data.SqlClient.dll
-              #           net462/fr/Microsoft.Data.SqlClient.resources.dll
-              # Excludes: net8.0/Microsoft.Data.SqlClient.SNI.dll (no ** path matches)
-              pattern: |
-                **/Microsoft.Data.SqlClient.dll
-                **/Microsoft.Data.SqlClient.resources.dll
-
-      # Copy DLLs to the assemblies/ subdirectory for APIScan.
-      - task: CopyFiles@2
-        displayName: Copy DLLs for APIScan
-        inputs:
-          SourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/Package-Release'
-          # Matches: Microsoft.Data.SqlClient.dll (main assembly)
-          #          Microsoft.Data.SqlClient.resources.dll (localized satellite assemblies in locale subdirs)
-          # Excludes: Microsoft.Data.SqlClient.SNI*.dll (native SNI — not part of this package)
-          Contents: |
-            **/Microsoft.Data.SqlClient.dll
-            **/Microsoft.Data.SqlClient.resources.dll
-          TargetFolder: '$(JOB_OUTPUT)/assemblies'
-          flattenFolders: false
-
-      # Copy PDBs into the output directory so they are included in the published pipeline
-      # artifact. The symbols publishing stage will download this artifact and publish PDBs
-      # for this package using the files under symbols/.
-      - task: CopyFiles@2
-        displayName: Copy PDBs for APIScan and Symbols Publishing
-        inputs:
-          SourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/Package-Release'
-          # Matches: Microsoft.Data.SqlClient.pdb (main assembly symbols)
-          # Excludes: Microsoft.Data.SqlClient.SNI*.pdb (native SNI — symbols published separately)
-          # Note: Resource DLLs are resource-only satellite assemblies and do not produce PDBs.
-          Contents: '**/Microsoft.Data.SqlClient.pdb'
-          TargetFolder: '$(JOB_OUTPUT)/symbols'
-          flattenFolders: false
-
-      # Package the build output into a NuGet package
-      - template: /eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
-        parameters:
-          abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
-          loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
-          sqlClientPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
-
-      # Sign the NuGet packages
-      - ${{ if parameters.isOfficial }}:
-          - template: /eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml@self
-            parameters:
-              appRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
-              appRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
-              authAkvName: '${{ parameters.signingAuthAkvName }}'
-              authSignCertName: '${{ parameters.signingAuthSignCertName }}'
-              esrpClientId: '${{ parameters.signingEsrpClientId }}'
-              esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              searchPath: '$(JOB_OUTPUT)/packages'
-              # Minimatch pattern with extglob.
-              # [0-9] matches a single digit, anchoring to the version segment so
-              # names like Microsoft.Data.SqlClient.SNI are not matched.
-              # ?(s) is an extglob that optionally matches 's'.
-              #
-              # Matches:  Microsoft.Data.SqlClient.6.1.0.nupkg
-              #           Microsoft.Data.SqlClient.6.1.0.snupkg
-              # Excludes: Microsoft.Data.SqlClient.SNI.6.0.0.nupkg
-              searchPattern: 'Microsoft.Data.SqlClient.[0-9]*.?(s)nupkg'
diff --git a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
index de2d7e4634..8ee37ad7d7 100644
--- a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
+++ b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
@@ -17,20 +17,16 @@ parameters:
   - name: artifactName
     type: string
 
-  # Short package name used in the job name (e.g. Logging, SqlServer, SqlClient).
-  - name: packageName
-    type: string
-
   # The full NuGet package name (e.g. Microsoft.Data.SqlClient.Internal.Logging).
   - name: packageFullName
     type: string
 
-  # The package version, used for symbol versioning.
-  - name: packageVersion
+  # Short package name used in the job name (e.g. Logging, SqlServer, SqlClient).
+  - name: packageShortName
     type: string
 
-  # Pattern to use to search for PDB files to upload/publish, relative to the symbols folder.
-  - name: searchPattern
+  # The package version, used for symbol versioning.
+  - name: packageVersion
     type: string
 
   # Symbols Publishing Parameters ------------------------------------------
@@ -51,7 +47,7 @@ parameters:
     type: string
 
 jobs:
-  - job: publish_symbols_${{ parameters.packageName }}
+  - job: 'publish_symbols_${{ parameters.packageShortName }}'
     displayName: 'Publish Symbols: ${{ parameters.packageFullName }}'
     pool:
       type: linux
@@ -69,10 +65,7 @@ jobs:
       ob_sdl_binskim_enabled: false
 
       # Path where the downloaded artifact will be placed.
-      artifactPath: $(Pipeline.Workspace)/${{ parameters.artifactName }}
-
-      # Path to the PDB files within the downloaded artifact.
-      symbolsPath: $(Pipeline.Workspace)/${{ parameters.artifactName }}/symbols
+      artifactPath: '$(Pipeline.Workspace)/${{ parameters.packageFullName }}'
 
       # PublishSymbols@2 runs on the OneBranch host agent (outside the build container) due to 1ES
       # Pipeline Template credential isolation. On Linux, the host resolves to the Microsoft org by
@@ -96,7 +89,7 @@ jobs:
         displayName: 'Download ${{ parameters.packageFullName }} Artifact'
         inputs:
           artifactName: '${{ parameters.artifactName }}'
-          targetPath: '$(artifactPath)'
+          targetPath: '${{ variables.artifactPath }}'
 
       - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
         parameters:
@@ -108,7 +101,7 @@ jobs:
           publishToInternal: true
           publishToPublic: true
           publishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-          searchPattern: '${{ parameters.searchPattern }}'
-          symbolsFolder: '$(symbolsPath)'
+          searchPattern: '**/${{ parameters.packageFullName }}.pdb'
+          symbolsFolder: '${{ variables.artifactPath }}'
           uploadAccount: '${{ parameters.symbolsUploadAccount }}'
           version: '${{ parameters.packageVersion }}'
diff --git a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
index a99b46d45f..afa5aa5918 100644
--- a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
@@ -49,8 +49,8 @@ jobs:
     variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
 
       # Path within the downloaded artifact where NuGet packages are located.
-      - name: packagesPath
-        value: '$(Pipeline.Workspace)\${{ parameters.artifactName }}\packages'
+      - name: artifactPath
+        value: '$(Pipeline.Workspace)\${{ parameters.artifactName }}'
 
       # Path to the SqlClient NuGet package after installation. This path will only exist once the package
       # been installed.
@@ -86,31 +86,62 @@ jobs:
       - ${{ if eq(parameters.isOfficial, true) }}:
           - powershell: |
               # Propagate parameters to PS variables #######################
-              $packagesPath = "${{ variables.packagesPath }}"
-              echo "packagesPath= $packagesPath"
+              $artifactPath = "${{ variables.artifactPath }}"
+              echo "artifactPath= $artifactPath"
+
+              # Discover packages ##########################################
+              $packageFiles = Get-ChildItem -Path $artifactPath -Recurse -File -Include *.nupkg,*.snupkg
+              if ($packageFiles.Count -eq 0)
+              {
+                Write-Error "No NuGet package files were found under '$artifactPath'."
+              }
 
               # Verify package signatures ##################################
               echo "> 1. Verify signature of source package(s)"
-              nuget verify -All $packagesPath\*.nupkg
+              $packageFiles | Where-Object { $_.Extension -eq ".nupkg" } | ForEach-Object {
+                nuget verify -All $_.FullName
+              }
 
               echo "> 2. Verify signature of symbols package(s)"
-              nuget verify -All $packagesPath\*.snupkg
+              $packageFiles | Where-Object { $_.Extension -eq ".snupkg" } | ForEach-Object {
+                nuget verify -All $_.FullName
+              }
             displayName: "Verify nuget signature"
 
       # Install NuGet package to the temporary directory
       - powershell: |
           # Propagate pipeline to PS variables #############################
-          $packagesPath = "${{ variables.packagesPath }}"
-          echo "packagesPath= $packagesPath"
+          $artifactPath = "${{ variables.artifactPath }}"
+          echo "artifactPath= $artifactPath"
+
+          $expectedPackageVersion = "${{ parameters.expectedPackageVersion }}"
+          echo "expectedPackageVersion= $expectedPackageVersion"
 
           $nugetPackageInstallRoot = "${{ variables.nugetPackageInstallRoot }}"
           echo "nugetPackageInstallRoot= $nugetPackageInstallRoot"
 
+          # Find the SqlClient NuGet package ###############################
+          Get-ChildItem "$artifactPath" -Recurse
+
+          $packagePaths = @(Get-ChildItem -Path $artifactPath -Recurse -File -Filter "Microsoft.Data.SqlClient.$expectedPackageVersion.nupkg")
+          if ($packagePaths.Count -eq 0)
+          {
+            Write-Error "Unable to find Microsoft.Data.SqlClient.$expectedPackageVersion.nupkg under '$artifactPath'."
+          }
+          if ($packagePaths.Count -gt 1)
+          {
+            Write-Error "Multiple Microsoft.Data.SqlClient.$expectedPackageVersion.nupkg files were found under '$artifactPath'."
+          }
+
+          $packageSource = Split-Path -Path $packagePaths[0].FullName -Parent
+          echo "Found package path: $($packagePaths[0].FullName)"
+          echo "Using package source: $packageSource"
+
           # Install NuGet Package ##########################################
           echo "> 1. Installing Microsoft.Data.SqlClient NuGet package..."
           Install-Package `
             -Name "Microsoft.Data.SqlClient" `
-            -Source "$packagesPath" `
+            -Source "$packageSource" `
             -Destination $nugetPackageInstallRoot `
             -Force `
             -SkipDependencies
@@ -118,8 +149,6 @@ jobs:
           echo "> 2. Listing contents of installed Microsoft.Data.SqlClient NuGet package:"
           Write-Host $nugetPackageInstallRoot
           Get-ChildItem $nugetPackageInstallRoot
-          Write-Host "$packagesPath"
-          Get-ChildItem "$packagesPath"
         displayName: "Install NuGet Package"
 
       # Find all DLL files in the installed NuGet package, verify each is signed with a strong name
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index 252f63fb0a..096da7e949 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -119,8 +119,12 @@ stages:
 
     jobs:
       - ${{ if or(eq(parameters.buildAkvProvider, true), eq(parameters.buildSqlClient, true)) }}:
-        - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+        # Build Microsoft.Data.SqlClient.Internal.Logging
+        - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
           parameters:
+            apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Internal.Logging/dlls'
+            apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Internal.Logging/pdbs'
+            shouldSignPackage: ${{ parameters.isOfficial }}
             signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
             signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
             signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
@@ -128,18 +132,20 @@ stages:
             signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
             signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
 
-            isOfficial: ${{ parameters.isOfficial }}
-            packageName: Logging
-            packageFullName: Microsoft.Data.SqlClient.Internal.Logging
-            versionProperties: >-
-              -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-              -p:LoggingAssemblyFileVersion=${{ parameters.loggingFileVersion }}
-            assemblyFileVersion: '${{ parameters.loggingFileVersion }}'
+            dependencies: []
+            fileVersion: '${{ parameters.loggingFileVersion }}'
+            packageFullName: 'Microsoft.Data.SqlClient.Internal.Logging'
+            packageShortName: 'Logging'
+            packageVersion: '${{ parameters.loggingPackageVersion }}'
 
 
       - ${{ if eq(parameters.buildSqlServerServer, true) }}:
-        - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+        # Build Microsoft.SqlServer.Server
+        - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
           parameters:
+            apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.SqlServer.Server/dlls'
+            apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.SqlServer.Server/pdbs'
+            shouldSignPackage: ${{ parameters.isOfficial }}
             signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
             signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
             signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
@@ -147,13 +153,11 @@ stages:
             signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
             signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
 
-            isOfficial: ${{ parameters.isOfficial }}
-            packageName: SqlServer
-            packageFullName: Microsoft.SqlServer.Server
-            versionProperties: >-
-              -p:SqlServerAssemblyFileVersion=${{ parameters.sqlServerFileVersion }}
-              -p:SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }}
-            assemblyFileVersion: '${{ parameters.sqlServerFileVersion }}'
+            dependencies: []
+            fileVersion: '${{ parameters.sqlServerFileVersion }}'
+            packageFullName: 'Microsoft.SqlServer.Server'
+            packageShortName: 'SqlServer'
+            packageVersion: '${{ parameters.sqlServerPackageVersion }}'
 
   # ====================================================================
   # Stage 2: Abstractions package (depends on Logging from Stage 1)
@@ -166,8 +170,12 @@ stages:
         dependsOn: build_independent
 
         jobs:
-          - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+          # Build Microsoft.Data.SqlClient.Extensions.Abstractions
+          - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
             parameters:
+              apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Abstractions/dlls'
+              apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Abstractions/pdbs'
+              shouldSignPackage: ${{ parameters.isOfficial }}
               signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
               signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
               signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
@@ -175,17 +183,14 @@ stages:
               signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
               signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
 
-              isOfficial: ${{ parameters.isOfficial }}
-              packageName: Abstractions
-              packageFullName: Microsoft.Data.SqlClient.Extensions.Abstractions
-              versionProperties: >-
-                -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-                -p:AbstractionsAssemblyFileVersion=${{ parameters.abstractionsFileVersion }}
-                -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-              assemblyFileVersion: '${{ parameters.abstractionsFileVersion }}'
-              downloadArtifacts:
+              dependencies:
                 - artifactName: '${{ parameters.loggingArtifactsName }}'
-                  displayName: 'Logging Package'
+                  shortName: 'Logging'
+                  version: '${{ parameters.loggingPackageVersion }}'
+              fileVersion: '${{ parameters.abstractionsFileVersion }}'
+              packageFullName: 'Microsoft.Data.SqlClient.Extensions.Abstractions'
+              packageShortName: 'Abstractions'
+              packageVersion: '${{ parameters.abstractionsPackageVersion }}'
 
   # ====================================================================
   # Stage 3: Core packages (depend on Abstractions)
@@ -198,9 +203,11 @@ stages:
         dependsOn: build_abstractions
 
         jobs:
-          - template: /eng/pipelines/onebranch/jobs/build-signed-sqlclient-package-job.yml@self
+          - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
             parameters:
-              isOfficial: ${{ parameters.isOfficial }}
+              apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/dlls'
+              apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/pdbs'
+              shouldSignPackage: ${{ parameters.isOfficial }}
               signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
               signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
               signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
@@ -208,15 +215,24 @@ stages:
               signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
               signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
 
-              abstractionsArtifactName: '${{ parameters.abstractionsArtifactsName }}'
-              abstractionsPackageVersion: '${{ parameters.abstractionsPackageVersion }}'
-              loggingArtifactName: '${{ parameters.loggingArtifactsName }}'
-              loggingPackageVersion: '${{ parameters.loggingPackageVersion }}'
-              sqlClientAssemblyFileVersion: '${{ parameters.sqlClientFileVersion }}'
-              sqlClientPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
-
-          - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+              dependencies:
+                - artifactName: '${{ parameters.abstractionsArtifactsName }}'
+                  shortName: 'Abstractions'
+                  version: '${{ parameters.abstractionsPackageVersion }}'
+                - artifactName: '${{ parameters.loggingArtifactsName }}'
+                  shortName: 'Logging'
+                  version: '${{ parameters.loggingPackageVersion }}'
+              fileVersion: '${{ parameters.sqlClientFileVersion }}'
+              packageFullName: 'Microsoft.Data.SqlClient'
+              packageShortName: 'SqlClient'
+              packageVersion: '${{ parameters.sqlClientPackageVersion }}'
+
+          # Build Microsoft.Data.SqlClient.Extensions.Azure
+          - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
             parameters:
+              apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Azure/dlls'
+              apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Azure/pdbs'
+              shouldSignPackage: ${{ parameters.isOfficial }}
               signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
               signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
               signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
@@ -224,20 +240,17 @@ stages:
               signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
               signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
 
-              isOfficial: ${{ parameters.isOfficial }}
-              packageName: Azure
-              packageFullName: Microsoft.Data.SqlClient.Extensions.Azure
-              versionProperties: >-
-                -p:AzurePackageVersion=${{ parameters.azurePackageVersion }}
-                -p:AzureAssemblyFileVersion=${{ parameters.azureFileVersion }}
-                -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-                -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-              assemblyFileVersion: '${{ parameters.azureFileVersion }}'
-              downloadArtifacts:
+              dependencies:
                 - artifactName: '${{ parameters.abstractionsArtifactsName }}'
-                  displayName: Abstractions Package
+                  shortName: 'Abstractions'
+                  version: '${{ parameters.abstractionsPackageVersion }}'
                 - artifactName: '${{ parameters.loggingArtifactsName }}'
-                  displayName: Logging Package
+                  shortName: 'Logging'
+                  version: '${{ parameters.loggingPackageVersion }}'
+              fileVersion: '${{ parameters.azureFileVersion }}'
+              packageFullName: 'Microsoft.Data.SqlClient.Extensions.Azure'
+              packageShortName: 'Azure'
+              packageVersion: '${{ parameters.azurePackageVersion }}'
 
   # ====================================================================
   # Stage 4: Add-on packages (depend on core packages)
@@ -249,8 +262,11 @@ stages:
         dependsOn: build_dependent
 
         jobs:
-          - template: /eng/pipelines/onebranch/jobs/build-signed-csproj-package-job.yml@self
+          - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
             parameters:
+              apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/dlls'
+              apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/pdbs'
+              shouldSignPackage: ${{ parameters.isOfficial }}
               signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
               signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
               signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
@@ -258,23 +274,20 @@ stages:
               signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
               signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
 
-              isOfficial: ${{ parameters.isOfficial }}
-              packageName: AkvProvider
-              packageFullName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
-              versionProperties: >-
-                -p:AkvPackageVersion=${{ parameters.akvProviderPackageVersion }}
-                -p:AkvAssemblyFileVersion=${{ parameters.akvProviderFileVersion }}
-                -p:MdsPackageVersion=${{ parameters.sqlClientPackageVersion }}
-                -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-                -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-              assemblyFileVersion: '${{ parameters.akvProviderFileVersion }}'
-              downloadArtifacts:
-                - artifactName: '${{ parameters.sqlClientArtifactsName }}'
-                  displayName: SqlClient Package
+              dependencies:
                 - artifactName: '${{ parameters.abstractionsArtifactsName }}'
-                  displayName: Abstractions Package
+                  shortName: 'Abstractions'
+                  version: '${{ parameters.abstractionsPackageVersion }}'
                 - artifactName: '${{ parameters.loggingArtifactsName }}'
-                  displayName: Logging Package
+                  shortName: 'Logging'
+                  version: '${{ parameters.loggingPackageVersion }}'
+                - artifactName: '${{ parameters.sqlClientArtifactsName }}'
+                  shortName: 'SqlClient'
+                  version: '${{ parameters.sqlClientPackageVersion }}'
+              fileVersion: '${{ parameters.akvProviderFileVersion }}'
+              packageFullName: 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
+              packageShortName: 'AkvProvider'
+              packageVersion: '${{ parameters.akvProviderPackageVersion }}'
 
   # ====================================================================
   # Validation
diff --git a/eng/pipelines/onebranch/stages/publish-symbols-stage.yml b/eng/pipelines/onebranch/stages/publish-symbols-stage.yml
index e716d2255d..56e8f827b8 100644
--- a/eng/pipelines/onebranch/stages/publish-symbols-stage.yml
+++ b/eng/pipelines/onebranch/stages/publish-symbols-stage.yml
@@ -129,11 +129,9 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
             parameters:
               artifactName: '${{ parameters.loggingArtifactsName }}'
-              packageName: Logging
               packageFullName: Microsoft.Data.SqlClient.Internal.Logging
+              packageShortName: Logging
               packageVersion: '${{ parameters.loggingPackageVersion }}'
-              # Matches: Microsoft.Data.SqlClient.Internal.Logging.pdb across all TFM subdirs.
-              searchPattern: '**/Microsoft.Data.SqlClient.Internal.Logging.pdb'
               symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
               symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
               symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
@@ -145,11 +143,9 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
             parameters:
               artifactName: '${{ parameters.sqlServerArtifactsName }}'
-              packageName: SqlServer
               packageFullName: Microsoft.SqlServer.Server
+              packageShortName: SqlServer
               packageVersion: '${{ parameters.sqlServerPackageVersion }}'
-              # Matches: Microsoft.SqlServer.Server.pdb across all TFM subdirs.
-              searchPattern: '**/Microsoft.SqlServer.Server.pdb'
               symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
               symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
               symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
@@ -161,11 +157,9 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
             parameters:
               artifactName: '${{ parameters.abstractionsArtifactsName }}'
-              packageName: Abstractions
               packageFullName: Microsoft.Data.SqlClient.Extensions.Abstractions
+              packageShortName: Abstractions
               packageVersion: '${{ parameters.abstractionsPackageVersion }}'
-              # Matches: Microsoft.Data.SqlClient.Extensions.Abstractions.pdb across all TFM subdirs.
-              searchPattern: '**/Microsoft.Data.SqlClient.Extensions.Abstractions.pdb'
               symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
               symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
               symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
@@ -177,12 +171,9 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
             parameters:
               artifactName: '${{ parameters.sqlClientArtifactsName }}'
-              packageName: SqlClient
               packageFullName: Microsoft.Data.SqlClient
+              packageShortName: SqlClient
               packageVersion: '${{ parameters.sqlClientPackageVersion }}'
-              # Matches: Microsoft.Data.SqlClient.pdb across all OS/TFM subdirs.
-              # Excludes: Microsoft.Data.SqlClient.SNI*.pdb (native SNI — symbols published separately).
-              searchPattern: '**/Microsoft.Data.SqlClient.pdb'
               symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
               symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
               symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
@@ -194,11 +185,9 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
             parameters:
               artifactName: '${{ parameters.azureArtifactsName }}'
-              packageName: Azure
               packageFullName: Microsoft.Data.SqlClient.Extensions.Azure
+              packageShortName: Azure
               packageVersion: '${{ parameters.azurePackageVersion }}'
-              # Matches: Microsoft.Data.SqlClient.Extensions.Azure.pdb across all TFM subdirs.
-              searchPattern: '**/Microsoft.Data.SqlClient.Extensions.Azure.pdb'
               symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
               symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
               symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
@@ -210,11 +199,9 @@ stages:
           - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
             parameters:
               artifactName: '${{ parameters.akvProviderArtifactsName }}'
-              packageName: AkvProvider
               packageFullName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
+              packageShortName: AkvProvider
               packageVersion: '${{ parameters.akvProviderPackageVersion }}'
-              # Matches: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb across all TFM subdirs.
-              searchPattern: '**/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb'
               symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
               symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
               symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
diff --git a/eng/pipelines/onebranch/steps/build-buildproj-step.yml b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
new file mode 100644
index 0000000000..69c402792e
--- /dev/null
+++ b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
@@ -0,0 +1,64 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This collection of steps to build a project via the build.proj. This will execute the "Build*"
+# target in build.proj, where * is the packageShortName provided in the parameters.
+
+parameters:
+  # Build configuration - Release or Debug.
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # Optional arguments to pass to msbuild to indicate what version of dependencies should be used.
+  # They should be in the form of "-p:PackageVersionFooBar=1.2.3 ..."
+  - name: dependencyArguments
+    type: string
+    default: ''
+
+  # Project to build. This short name will be appended to "Build" to generate the appropriate
+  # target to build from build.proj.
+  - name: packageShortName
+    type: string
+    values:
+      - Azure
+      - AkvProvider
+      - Abstractions
+      - Logging
+      - SqlClient
+      - SqlServer
+
+  #  Version to assign to the project to build. This will be passed into msbuild as
+  #  "-p:PackageVersion(packageShortName)".
+  # @TODO: Make this optional to enable progressively migrating to single-source versioning.
+  - name: packageVersion
+    type: string
+
+steps:
+  # Download the strong name signing key from secure file storage
+  - task: DownloadSecureFile@1
+    displayName: 'Download Signing Key'
+    inputs:
+      secureFile: 'netfxKeypair.snk'
+    name: keyFile
+
+  - task: MSBuild@1
+    displayName: 'build.proj - Build${{ parameters.packageShortName }}'
+    inputs:
+      solution: '$(REPO_ROOT)/build.proj'
+      configuration: '${{ parameters.buildConfiguration }}'
+      msbuildArguments: >-
+        -t:Build${{ parameters.packageShortName }}
+        -p:ReferenceType=Package
+        -p:SigningKeyPath="$(keyFile.secureFilePath)"
+        -p:BuildNumber="$(Build.BuildNumber)"
+        -p:PackageVersion${{ parameters.packageShortName }}="${{ parameters.packageVersion }}"
+        ${{ parameters.dependencyArguments }}
+
+  - script: tree /a /f $(BUILD_OUTPUT)
+    displayName: Output Build Output Tree
diff --git a/eng/pipelines/onebranch/steps/build-csproj-step.yml b/eng/pipelines/onebranch/steps/build-csproj-step.yml
deleted file mode 100644
index a4a38b9fc3..0000000000
--- a/eng/pipelines/onebranch/steps/build-csproj-step.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# Generic build step for csproj-based packages.  Each project uses a build.proj target that runs
-# Build only and produces assemblies within $(BUILD_OUTPUT).  Downstream ESRP DLL signing must
-# locate the assemblies within $(BUILD_OUTPUT) for all target frameworks that the csproj targets.
-# NuGet packaging is done separately via pack-csproj-step.yml after DLL signing.
-
-parameters:
-  # The MSBuild build target in build.proj (e.g. BuildLogging, BuildAbstractions,
-  # BuildAzure).
-  - name: buildTarget
-    type: string
-
-  # Additional MSBuild arguments for version properties, e.g.
-  # -p:LoggingPackageVersion=1.0.0 -p:LoggingAssemblyFileVersion=1.0.123
-  - name: versionProperties
-    type: string
-    default: ''
-
-steps:
-  - task: DownloadSecureFile@1
-    displayName: Download Signing Key
-    inputs:
-      secureFile: netfxKeypair.snk
-    name: keyFile
-
-  - task: MSBuild@1
-    displayName: 'Build.proj - ${{ parameters.buildTarget }}'
-    inputs:
-      solution: '$(REPO_ROOT)/build.proj'
-      configuration: 'Release'
-      msbuildArguments: >-
-        -t:${{ parameters.buildTarget }}
-        -p:ReferenceType=Package
-        -p:SigningKeyPath=$(keyFile.secureFilePath)
-        ${{ parameters.versionProperties }}
-
-  - script: tree /a /f $(BUILD_OUTPUT)
-    displayName: Output Build Output Tree
diff --git a/eng/pipelines/onebranch/steps/build-sqlclient-step.yml b/eng/pipelines/onebranch/steps/build-sqlclient-step.yml
deleted file mode 100644
index 390d17fc34..0000000000
--- a/eng/pipelines/onebranch/steps/build-sqlclient-step.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# This collection of steps builds Microsoft.Data.SqlClient via build2.proj
-
-parameters:
-  - name: abstractionsPackageVersion
-    type: string
-
-  - name: loggingPackageVersion
-    type: string
-
-  - name: sqlClientPackageVersion
-    type: string
-
-steps:
-  - task: DownloadSecureFile@1
-    displayName: 'Download Signing Key'
-    inputs:
-      secureFile: 'netfxKeypair.snk'
-    name: keyFile
-
-  - task: MSBuild@1
-    displayName: 'Build2.proj - Build SqlClient'
-    inputs:
-      solution: '$(REPO_ROOT)/build2.proj'
-      configuration: 'Release'
-      msbuildArguments: >-
-        -t:BuildMds
-        -p:BuildNumber="$(Build.BuildNumber)"
-        -p:PackageVersionAbstractions="${{ parameters.abstractionsPackageVersion }}"
-        -p:PackageVersionLogging="${{ parameters.loggingPackageVersion }}"
-        -p:PackageVersionMds="${{ parameters.sqlClientPackageVersion }}"
-        -p:ReferenceType=Package
-        -p:SigningKeyPath="$(keyFile.secureFilePath)"
-
-  - script: tree /a /f $(BUILD_OUTPUT)
-    displayName: Output Build Output Tree
diff --git a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
new file mode 100644
index 0000000000..a0e6e02426
--- /dev/null
+++ b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
@@ -0,0 +1,84 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Generic pack step for build.proj packages. This step runs the Pack* target to generate a NuGet
+# package of the target package. The generated NuGet packages will then be copied to $(PACK_OUTPUT).
+#
+# Note: This step assumes that the package has been built previously using a Build* target.
+#   `-p:PackBuild=false` will be passed to msbuild to ensure the previously built assemblies are
+#   not trampled.
+
+parameters:
+  # Build configuration - Release or Debug.
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # Optional arguments to pass to msbuild to indicate what version of dependencies should be used.
+  # They should be in the form of "-p:PackageVersionFooBar=1.2.3 ..."
+  - name: dependencyArguments
+    type: string
+    default: ''
+
+  # The full name of the package. This will be used to generate paths when copying NuGet packages
+  # out of the build output.
+  - name: packageFullName
+    type: string
+    values:
+      - Microsoft.Data.SqlClient
+      - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
+      - Microsoft.Data.SqlClient.Extensions.Abstractions
+      - Microsoft.Data.SqlClient.Extensions.Azure
+      - Microsoft.Data.SqlClient.Internal.Logging
+      - Microsoft.SqlServer.Server
+
+  # Project to build. This short name will be appended to "Pack" to generate the appropriate
+  # target to package via build.proj.
+  - name: packageShortName
+    type: string
+    values:
+      - Abstractions
+      - AkvProvider
+      - Azure
+      - Logging
+      - SqlClient
+      - SqlServer
+
+  #  Version to assign to the project to build. This will be passed into msbuild as
+  #  "-p:PackageVersion(packageShortName)".
+  # @TODO: Make this optional to enable progressively migrating to single-source versioning.
+  - name: packageVersion
+    type: string
+
+steps:
+  - task: MSBuild@1
+    displayName: 'build.proj - Pack${{ parameters.packageShortName }}'
+    inputs:
+      solution: '$(REPO_ROOT)/build.proj'
+      configuration: '${{ parameters.buildConfiguration }}'
+      msbuildArguments: >-
+        -t:Pack${{ parameters.packageShortName }}
+        -p:PackBuild=false
+        -p:ReferenceType=Package
+        -p:BuildNumber="$(Build.BuildNumber)"
+        -p:PackageVersion${{ parameters.packageShortName }}="${{ parameters.packageVersion }}"
+        ${{ parameters.dependencyArguments }}
+
+  - script: tree /a /f $(BUILD_OUTPUT)
+    displayName: Output Build Output Tree
+
+  - task: CopyFiles@2
+    displayName: 'Copy NuGet Packages to PACK_OUTPUT'
+    inputs:
+      contents: '**/${{ parameters.packageFullName }}*.*nupkg'
+      flattenFolders: true
+      sourceFolder: '$(BUILD_OUTPUT)/${{ parameters.packageFullName }}/'
+      targetFolder: '$(PACK_OUTPUT)'
+
+  - script: tree /a /f $(PACK_OUTPUT)
+    displayName: Output Package Output Tree
diff --git a/eng/pipelines/onebranch/steps/pack-csproj-step.yml b/eng/pipelines/onebranch/steps/pack-csproj-step.yml
deleted file mode 100644
index 535106a9d1..0000000000
--- a/eng/pipelines/onebranch/steps/pack-csproj-step.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# Generic pack step for csproj-based Extension packages (Logging, Abstractions,
-# Azure).  This step runs the Pack target after DLLs have been signed.  The
-# NoBuild=true property ensures the DLLs are not rebuilt.
-
-parameters:
-  # The MSBuild pack target in build.proj (e.g. PackLogging, PackAbstractions,
-  # PackAzure).
-  - name: packTarget
-    type: string
-
-  # Additional MSBuild arguments for version properties.
-  - name: versionProperties
-    type: string
-    default: ''
-
-steps:
-  - task: MSBuild@1
-    displayName: 'Build.proj - ${{ parameters.packTarget }}'
-    inputs:
-      solution: '$(REPO_ROOT)/build.proj'
-      configuration: 'Release'
-      msbuildArguments: >-
-        -t:${{ parameters.packTarget }}
-        -p:ReferenceType=Package
-        -p:PackagesDir=$(JOB_OUTPUT)/packages/
-        ${{ parameters.versionProperties }}
-
-  - script: tree /a /f $(JOB_OUTPUT)/packages
-    displayName: List Pack Output Tree After Pack
diff --git a/eng/pipelines/onebranch/steps/pack-sqlclient-step.yml b/eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
deleted file mode 100644
index 73229fe834..0000000000
--- a/eng/pipelines/onebranch/steps/pack-sqlclient-step.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-parameters:
-  # Package version parameters ----
-  - name: abstractionsPackageVersion
-    type: string
-
-  - name: loggingPackageVersion
-    type: string
-
-  - name: sqlClientPackageVersion
-    type: string
-
-steps:
-  - task: MSBuild@1
-    displayName: 'Build2.proj - Pack SqlClient'
-    inputs:
-      solution: '$(REPO_ROOT)/build2.proj'
-      configuration: 'Release'
-      msbuildArguments: >-
-        -t:PackMds
-        -p:BuildNumber="$(Build.BuildNumber)"
-        -p:PackBuild=false
-        -p:PackageVersionAbstractions="${{ parameters.abstractionsPackageVersion }}"
-        -p:PackageVersionLogging="${{ parameters.loggingPackageVersion }}"
-        -p:PackageVersionMds="${{ parameters.sqlClientPackageVersion }}"
-        -p:ReferenceType=Package
-
-  - script: tree /a /f $(BUILD_OUTPUT)
-    displayName: Output Build Output Tree
-
-  - task: CopyFiles@2
-    displayName: 'Copy NuGet Packages to JOB_OUTPUT'
-    inputs:
-      contents: '**/Microsoft.Data.SqlClient*.*nupkg'
-      flattenFolders: true
-      sourceFolder: '$(BUILD_OUTPUT)/Microsoft.Data.SqlClient/'
-      targetFolder: '$(JOB_OUTPUT)/packages'
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
similarity index 51%
rename from eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml
rename to eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
index ac515aa021..ba8cb79c83 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
@@ -13,28 +13,44 @@
 # steps that perform versioning or signing.
 
 parameters:
-  - name: abstractionsPackageVersion
+  # Optional arguments to pass to msbuild to indicate what version of dependencies should be used.
+  - name: dependencyArguments
     type: string
+    default: ''
 
-  - name: loggingPackageVersion
+  # Project to build. This short name will be appended to "Build" to generate the appropriate
+  # target to build from build.proj.
+  - name: packageShortName
     type: string
+    values:
+      - Abstractions
+      - AkvProvider
+      - Azure
+      - Logging
+      - SqlClient
+      - SqlServer
 
-  - name: sqlClientPackageVersion
+  #  Version to assign to the project to build. This will be passed into msbuild as
+  #  "-p:PackageVersion(packageShortName)".
+  # @TODO: Make this optional to enable progressively migrating to single-source versioning.
+  - name: packageVersion
     type: string
 
 steps:
+  # GOTCHA: If there are any blank lines in msbuildCommandLine, it will consider it "multiple
+  #         arguments" and fail. So, don't split msBuildCommandLine into multiple blocks.
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
-    displayName: 'Roslyn Analyzers: build2.proj Build SqlClient'
+    displayName: 'Roslyn Analyzers - build.proj Build${{ parameters.packageShortName }}'
     inputs:
       msBuildArchitecture: x64
       msBuildCommandLine: >-
         msbuild
-        $(REPO_ROOT)/build2.proj
-        -t:BuildMds
+        $(REPO_ROOT)/build.proj
+        -t:Build${{ parameters.packageShortName }}
         -p:Configuration=Release
-        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-        -p:PackageVersionMds=${{ parameters.sqlClientPackageVersion }}
         -p:ReferenceType=Package
+        -p:BuildNumber="$(Build.BuildNumber)"
+        -p:PackageVersion${{ parameters.packageShortName }}="${{ parameters.packageVersion }}"
+        ${{ parameters.dependencyArguments }}
       msBuildVersion: 17.0
       setupCommandLinePicker: vs2022
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
deleted file mode 100644
index 53b17d4bb9..0000000000
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# This template defines a step to run Roslyn Analyzers against builds driven by
-# build.proj. It is used for both the full Microsoft.Data.SqlClient (SqlClient) build
-# and for individual extension packages; callers control the analyzed targets
-# via the msBuildArguments parameter.
-# It uses the RoslynAnalyzers@3 task from the Secure Development Team's SDL
-# extension:
-# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-mohanb/security-integration/guardian-wiki/sdl-azdo-extension/roslyn-analyzers-build-task
-#
-# GOTCHA: This step will clobber any existing build output. It should be run
-# _before_ any build steps that perform versioning or signing.
-
-parameters:
-  # Target to build from build.proj. This is separated from the rest of the msBuildArguments to
-  # provide a rich display name.
-  - name: buildTarget
-    type: string
-
-  # Additional build arguments to append to the end of the MSBuild command.
-  - name: msBuildArguments
-    type: string
-
-steps:
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
-    displayName: 'Roslyn Analyzers: build.proj ${{ parameters.buildTarget }}'
-    inputs:
-      msBuildVersion: 17.0
-      msBuildArchitecture: x64
-      setupCommandLinePicker: vs2022
-      msBuildCommandLine: >-
-        msbuild
-        $(REPO_ROOT)\build.proj
-        -t:${{ parameters.buildTarget }}
-        ${{ parameters.msBuildArguments }}
diff --git a/eng/pipelines/onebranch/variables/common-variables.yml b/eng/pipelines/onebranch/variables/common-variables.yml
index 3df1a6264f..5b6209d59d 100644
--- a/eng/pipelines/onebranch/variables/common-variables.yml
+++ b/eng/pipelines/onebranch/variables/common-variables.yml
@@ -18,8 +18,7 @@ variables:
     value: $(Build.SourcesDirectory)
 
   # This is where our C# projects place their build outputs (see Directory.Build.props
-  # <ArtifactsPath>). We exclude the reference type here since Official pipelines always use
-  # Package mode.
+  # <ArtifactsPath>).
   - name: BUILD_OUTPUT
     value: $(REPO_ROOT)/artifacts
 
@@ -30,14 +29,7 @@ variables:
   - name: JOB_INPUT
     value: $(REPO_ROOT)/packages
 
-  # Root directory for all job output artifacts (NuGet packages, symbols, etc.).
-  # OneBranch auto-publishes everything under this directory. It is intentionally
-  # separated from packages/ (where downloaded pipeline artifacts go) so that ESRP
-  # signing and OneBranch artifact publishing only operate on the current job's output.
-  #
-  # Sub-directory layout:
-  #   assemblies/ - DLL assemblies for APIScan (preserving TFM folder structure)
-  #   packages/   - NuGet packages (.nupkg, .snupkg)
-  #   symbols/    - PDB symbol files (preserving TFM folder structure)
+  # Root directory for all job output artifacts (NuGet packages, symbols, etc.). OneBranch auto
+  # publishes everything under this directory as the artifact for the job.
   - name: JOB_OUTPUT
     value: $(REPO_ROOT)/output
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index 32921a733e..ba2ff262bf 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -46,7 +46,6 @@ pr:
       - tools/*
       - azurepipelines-coverage.yml
       - build.proj
-      - build2.proj
       - Directory.Packages.props
       - dotnet-tools.json
       - global.json
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index 738f8c1b6a..a928175f17 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -46,7 +46,6 @@ pr:
       - tools/*
       - azurepipelines-coverage.yml
       - build.proj
-      - build2.proj
       - Directory.Packages.props
       - dotnet-tools.json
       - global.json
diff --git a/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml b/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
new file mode 100644
index 0000000000..1711725373
--- /dev/null
+++ b/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
@@ -0,0 +1,83 @@
+################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET
+# Foundation licenses this file to you under the MIT license.  See the LICENSE
+# file in the project root for more information.
+################################################################################
+
+# This stage builds the Microsoft.SqlServer.Server package and publishes the
+# resulting NuGet packages as pipeline artifacts.
+#
+# The NuGet packages have the following properties:
+#
+#   Name:     Microsoft.SqlServer.Server
+#   Version:  <sqlServerPackageVersion> (from parameter)
+#
+# The following NuGet packages are published:
+#
+#   Microsoft.SqlServer.Server.<version>.nupkg
+#   Microsoft.SqlServer.Server.<version>.snupkg (symbols)
+#
+# The packages are published to pipeline artifacts with the name specified by
+# the sqlServerArtifactsName parameter.
+#
+# This template defines a stage named 'build_sqlserver_package_stage' that
+# can be depended on by downstream stages.
+
+parameters:
+
+  # Additional stages we depend on, if any.
+  - name: additionalDependsOn
+    type: object
+    default: []
+
+  # The type of build to produce (Release or Debug)
+  - name: buildConfiguration
+    type: string
+    default: Release
+    values:
+    - Release
+    - Debug
+
+  # True to emit debug information and steps.
+  - name: debug
+    type: boolean
+    default: false
+
+  # The name of the pipeline artifacts to publish.
+  - name: sqlServerArtifactsName
+    type: string
+    default: SqlServer.Artifacts
+
+  # The version to apply to the SqlServer NuGet package and DLLs.
+  - name: sqlServerPackageVersion
+    type: string
+
+  # The verbosity level for the dotnet CLI commands.
+  - name: dotnetVerbosity
+    type: string
+    default: normal
+    values:
+    - quiet
+    - minimal
+    - normal
+    - detailed
+    - diagnostic
+
+stages:
+
+  - stage: build_sqlserver_package_stage
+    displayName: Build SqlServer Package
+
+    dependsOn:
+      - secrets_stage
+      - ${{ each dep in parameters.additionalDependsOn }}:
+        - ${{ dep }}
+
+    jobs:
+      - template: /eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml@self
+        parameters:
+          buildConfiguration: ${{ parameters.buildConfiguration }}
+          debug: ${{ parameters.debug }}
+          sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
+          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
+          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml b/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml
index 845f944edb..3dccd61989 100644
--- a/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml
+++ b/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml
@@ -34,6 +34,10 @@ parameters:
     type: string
     default: MDS.Artifacts
 
+  - name: sqlServerArtifactsName
+    type: string
+    default: SqlServer.Artifacts
+
 stages:
 
   - stage: verify_nuget_packages_stage
@@ -43,6 +47,7 @@ stages:
       - build_abstractions_package_stage
       - build_azure_package_stage
       - build_logging_package_stage
+      - build_sqlserver_package_stage
       - build_sqlclient_package_stage
 
     jobs:
@@ -85,7 +90,11 @@ stages:
               artifactName: ${{ parameters.mdsArtifactsName }}
               targetPath: $(packagesDir)
 
-          # TODO: Add SqlServer here when we start building it as part of PR/CI pipelines.
+          - task: DownloadPipelineArtifact@2
+            displayName: Download SqlServer Package Artifacts
+            inputs:
+              artifactName: ${{ parameters.sqlServerArtifactsName }}
+              targetPath: $(packagesDir)
 
           # Run the verification tool against all downloaded packages.
           - template: /eng/pipelines/common/templates/steps/verify-nuget-package-step.yml@self
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 6dcd4bbbd9..6ec3fba9a8 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -12,6 +12,51 @@
     <ReferenceType Condition="'$(ReferenceType)' == ''">Project</ReferenceType>
   </PropertyGroup>
 
+  <!-- Compiler Settings =============================================== -->
+  <PropertyGroup>
+    <!-- We treat all warnings as errors. -->
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+    <!--
+      There may be a few specific warnings that should _not_ be considered an error. This list
+      should be used sparingly to avoid important warnings being ignored.
+    -->
+    <WarningsNotAsErrors />
+
+    <!--
+      If a build is failing due to vulnerable dependencies, you may temporarily uncomment the
+      following line to treat the audit warnings as non-errors. This should only be done as a
+      temporary measure while addressing the vulnerable dependencies. See:
+      https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904
+    -->
+    <!-- <WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors> -->
+  </PropertyGroup>
+
+  <!-- Versioning ====================================================== -->
+  <!--
+    Versions for packages are assigned in the project's Versions.props file. Below, we provide
+    defaults for components of versions that are shared across all projects
+  -->
+  <PropertyGroup>
+    <!--
+      Build numbers from pipelines may be in the format "AABBB.CC". Where AA is the short form of
+      the current year, BBB is the current day of the year, and CC which build of the day it is
+      (eg, .4 means this was the 4th build of the day).
+
+      The build number is used in two places:
+      * FileVersion - this is of the form major.minor.patch.revision, and revision is where we
+        use the build number. The revision field of a version object is an unsigned 16-bit integer,
+        so an AABBB.CC build number will be invalid. Concatenating to AABBBCC is also out because
+        it has the potential to over flow. Instead, we simply truncate the .CC part of the build
+        number.
+      * PackageVersion - this is in the form of major.minor.patch[-prereleasesuffix], and
+        prereleasesuffix is where we use the build number. This is a free-form string, so the
+        build number AABBB.CC form is acceptable as-is.
+    -->
+    <BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
+    <FileVersionBuildNumber>$(BuildNumber.Split('.')[0])</FileVersionBuildNumber>
+  </PropertyGroup>
+
   <!-- @TODO: What is this? -->
   <PropertyGroup Condition="$(BuildForRelease) == 'true'">
     <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
@@ -62,26 +107,6 @@
     <NuGetAuditLevel>low</NuGetAuditLevel>
   </PropertyGroup>
 
-  <!-- Build Warning/Error Settings -->
-  <PropertyGroup>
-    <!-- We treat all warnings as errors. -->
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-
-    <!--
-      There may be a few specific warnings that should _not_ be considered an error. This list
-      should be used sparingly to avoid important warnings being ignored.
-    -->
-    <WarningsNotAsErrors />
-
-    <!--
-      If a build is failing due to vulnerable dependencies, you may temporarily uncomment the
-      following line to treat the audit warnings as non-errors. This should only be done as a
-      temporary measure while addressing the vulnerable dependencies. See:
-      https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904
-    -->
-    <!-- <WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors> -->
-  </PropertyGroup>
-
   <!-- Strong name signing ============================================= -->
 
   <!-- When a signing key is specified, we will perform strong name assembly signing. -->
@@ -103,9 +128,6 @@
     <DisableSourceLinkTranslation Condition="'$(DisableSourceLinkTranslation)' == ''">false</DisableSourceLinkTranslation>
   </PropertyGroup>
 
-  <!-- Provides Version properties -->
-  <Import Project="$(ToolsDir)props\Versions.props" />
-
   <!-- Provides Build properties -->
   <Import Project="$(ToolsDir)props\AssemblyInfo.props" />
   <Import Project="$(ToolsDir)props\AssemblyRef.props" />
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/.editorconfig b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/.editorconfig
similarity index 100%
rename from src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/.editorconfig
rename to src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/.editorconfig
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AzureSqlKeyCryptographer.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/AzureSqlKeyCryptographer.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AzureSqlKeyCryptographer.cs
rename to src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/AzureSqlKeyCryptographer.cs
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Constants.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Constants.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Constants.cs
rename to src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Constants.cs
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/LocalCache.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/LocalCache.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/LocalCache.cs
rename to src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/LocalCache.cs
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
similarity index 66%
rename from src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
rename to src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
index bfef481e09..909e36df7f 100644
--- a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
@@ -1,53 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <!--
-    Additional project config is imported from parent Directory.Build.props
-    files.
-
-    AKV Provider versioning information found in our sibling file AkvProviderVersions.props
-    is imported via tools/props/Versions.props.
-  -->
-
-  <!-- Target Config -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- General Properties ============================================== -->
   <PropertyGroup>
+    <AssemblyName>Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider</AssemblyName>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <!-- Build Config -->
+  <!-- Compiler Options ================================================ -->
   <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider</AssemblyName>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <RootNamespace>Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider</RootNamespace>
-
-    <!--
-      We pin the AssemblyVersion of our package to the default major version
-      number, with all remaining parts set to 0.
-    -->
-    <AssemblyVersion>$(AkvDefaultMajorVersion).0.0.0</AssemblyVersion>
-
-    <AssemblyFileVersion>$(AkvAssemblyFileVersion)</AssemblyFileVersion>
-    <FileVersion>$(AkvAssemblyFileVersion)</FileVersion>
-    <Version>$(AkvPackageVersion)</Version>
   </PropertyGroup>
 
-  <!-- Build Output Config -->
+  <!-- Versioning ====================================================== -->
+  <Import Project="Versions.props" />
   <PropertyGroup>
-    <!-- Use a shorter directory name to avoid exceeding the Windows MAX_PATH (260 char) limit.
-         The full AssemblyName is 63 chars and appears in both the directory and generated filenames. -->
-    <IntermediateOutputPath>$(Artifacts)/obj/$(Configuration)/AzureKeyVaultProvider</IntermediateOutputPath>
-    <OutputPath>$(Artifacts)/bin/$(Configuration)/AzureKeyVaultProvider</OutputPath>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyVersion>$(AkvProviderAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(AkvProviderFileVersion)</FileVersion>
+    <Version>$(AkvProviderPackageVersion)</Version>
   </PropertyGroup>
 
-  <!--
-    NuGet Package Config
+  <!-- Strong name signing ============================================= -->
+  <!-- This is done in Directory.Build.props -->
 
-    See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target
-  -->
+  <!-- Build Output ==================================================== -->
+  <PropertyGroup>
+    <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
+    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)</OutputPath>
+  </PropertyGroup>
+
+  <!-- NuGet Package Config ============================================ -->
+  <!-- See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target -->
   <PropertyGroup>
     <PackageId>$(AssemblyName)</PackageId>
-    <PackageVersion>$(AkvPackageVersion)</PackageVersion>
-    <PackageOutputPath>$(PackagesDir)</PackageOutputPath>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
@@ -83,7 +67,6 @@
   </ItemGroup>
 
   <!-- References ====================================================== -->
-
   <!-- SqlClient Reference -->
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\ref\Microsoft.Data.SqlClient.csproj"
@@ -93,11 +76,11 @@
   </ItemGroup>
 
   <!-- Logging Reference -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" />
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging"
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 
   <!-- Other dependencies -->
@@ -106,5 +89,4 @@
     <PackageReference Include="Azure.Security.KeyVault.Keys" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
   </ItemGroup>
-
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/PackageReadme.md b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/PackageReadme.md
similarity index 100%
rename from src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/PackageReadme.md
rename to src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/PackageReadme.md
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/SqlColumnEncryptionAzureKeyVaultProvider.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/SqlColumnEncryptionAzureKeyVaultProvider.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/SqlColumnEncryptionAzureKeyVaultProvider.cs
rename to src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/SqlColumnEncryptionAzureKeyVaultProvider.cs
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Strings.Designer.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Strings.Designer.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Strings.Designer.cs
rename to src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Strings.Designer.cs
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Strings.resx b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Strings.resx
similarity index 100%
rename from src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Strings.resx
rename to src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Strings.resx
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Utils.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Utils.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Utils.cs
rename to src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Utils.cs
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
new file mode 100644
index 0000000000..25e3ff90ff
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
@@ -0,0 +1,86 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    This file contains versioning information for the Microsoft.Data.SqlClient package.
+    We will calculate three different version variables, used for different purposes:
+
+    * AkvProviderAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the
+      version reported to user if they open the assembly properties. It *must not* change within
+      major versions in order for minor versions to be considered backwards compatible via strong
+      naming. It must be in the form: (Major).0.0.0
+    * AkvProviderFileVersion - this will be used as the <FileVersion> property. It should be in the
+      form: (Major).(Minor).(Patch).(BuildNumber)
+    * AkvProviderPackageVersion - this will be used as the <Version> property, the version of the
+      NuGet package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
+  -->
+
+  <!-- Set up the default version for fallback if a version is not provided -->
+  <PropertyGroup>
+    <!--
+      This is the *next* version to release of AkvProvider. Update this after a version is released.
+      @TODO: Determine how versions should be updated in release branches vs main
+    -->
+    <AkvProviderVersionDefault>7.0.0</AkvProviderVersionDefault>
+  </PropertyGroup>
+
+  <!-- Determine file version and package version based on what was provided. -->
+  <Choose>
+    <When Condition="'$(AkvProviderPackageVersion)' != ''">
+      <!--
+        When a package version is provided, it supercedes all other choices. It will be used as the
+        package version and the file version will be based on it. This situation is used for
+        local developer scenarios and (@TODO:) old build pipelines that stored their version
+        information in the pipeline yaml.
+      -->
+      <PropertyGroup>
+        <AkvProviderFileVersion>$(AkvProviderPackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</AkvProviderFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(BuildNumber)' != '' AND '$(BuildNumber)' != '0'">
+      <!--
+        When a build number is provided, the default version is used as the base of the package and
+        file versions.
+
+        If a build suffix is provided, this is appended to the package version. This is meant to be
+        used by automated pre-release systems to indicate the source of the build.
+
+        If a build suffix is not provided, no pre-release tag will be added to package version. If
+        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
+        will be retained for the package version, but will be stripped off for the file version
+        (letters are not allowed in file/assembly versions). This is meant to be used by official
+        build pipelines to generate production-ready builds.
+      -->
+      <PropertyGroup>
+        <AkvProviderPackageVersion Condition="'$(BuildSuffix)' != ''">$(AkvProviderVersionDefault)-$(BuildSuffix)$(BuildNumber)</AkvProviderPackageVersion>
+        <AkvProviderPackageVersion Condition="'$(BuildSuffix)' == ''">$(AkvProviderVersionDefault)</AkvProviderPackageVersion>
+
+        <AkvProviderFileVersion>$(AkvProviderVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AkvProviderFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <Otherwise>
+      <!--
+        When a build number or package number are not provided, the build is expected to be a pre-
+        release version. In this case, a suffix is appended to the default version, and 0 is used
+        for the build number in the file version. This is meant to be used by developers that
+        want a quick build without supplying any parameters.
+      -->
+      <PropertyGroup>
+        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
+
+        <AkvProviderPackageVersion>$(AkvProviderVersionDefault)-$(BuildSuffix)</AkvProviderPackageVersion>
+        <AkvProviderFileVersion>$(AkvProviderVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AkvProviderFileVersion>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <!--
+    Finally, we take the file version and break off the major version to determine the assembly
+    version.
+
+    IMPORTANT: This must always be major.0.0.0 for assembly-level backwards compatibility.
+  -->
+  <PropertyGroup>
+    <AkvProviderAssemblyVersion>$(AkvProviderFileVersion.Split('.')[0]).0.0.0</AkvProviderAssemblyVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
index edd9144040..45acd55488 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
@@ -1,51 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <!--
-    Additional project config is imported from parent Directory.Build.props
-    files.
-
-    Abstractions versioning information found in our sibling file
-    AbstractionsVersions.props is imported via tools/props/Versions.props.
-  -->
-
-  <!-- Target Config -->
+  <!-- General Properties ============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <AssemblyName>Microsoft.Data.SqlClient.Extensions.Abstractions</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <!-- When we're not signing, we are permitted to expose our internals to tests. -->
-  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
-    <InternalsVisibleTo Include="$(AssemblyName).Test" />
-  </ItemGroup>
-
-  <!-- Compiler Config -->
+  <!-- Compiler Options ================================================ -->
   <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <RootNamespace>Microsoft.Data.SqlClient</RootNamespace>
   </PropertyGroup>
 
-  <!-- Build Config -->
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient.Extensions.Abstractions</AssemblyName>
-
-    <!--
-      Clear the root namespace since our directory structure doesn't match our
-      namespace definitions.  Otherwise, if omitted it would default to the
-      AssemblyName.
-    -->
-    <RootNamespace></RootNamespace>
-
-    <!--
-      We pin the AssemblyVersion of our package to the default major version
-      number, with all remaining parts set to 0.
-    -->
-    <AssemblyVersion>$(AbstractionsDefaultMajorVersion).0.0.0</AssemblyVersion>
-
-    <AssemblyFileVersion>$(AbstractionsAssemblyFileVersion)</AssemblyFileVersion>
-    <FileVersion>$(AbstractionsAssemblyFileVersion)</FileVersion>
-    <Version>$(AbstractionsPackageVersion)</Version>
-  </PropertyGroup>
+  <!-- CLS Compliance ================================================== -->
   <ItemGroup>
     <!-- Our API is CLS Compliant. -->
     <AssemblyAttribute Include="System.CLSCompliantAttribute">
@@ -53,36 +21,30 @@
     </AssemblyAttribute>
   </ItemGroup>
 
-  <!-- Build Output Config-->
+  <!-- Versioning ====================================================== -->
+  <Import Project="Versions.props" />
   <PropertyGroup>
+    <AssemblyVersion>$(AbstractionsAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(AbstractionsFileVersion)</FileVersion>
+    <Version>$(AbstractionsPackageVersion)</Version>
+  </PropertyGroup>
 
-    <!--
-      The obj/ folder for each target framework.  This contains intermediate files used during the
-      build process.
-    -->
-    <IntermediateOutputPath>$(Artifacts)/obj/$(Configuration)/$(AssemblyName)</IntermediateOutputPath>
-
-    <!-- The bin/ folder for each target framework. This contains the final build artifacts. -->
-    <OutputPath>$(Artifacts)/bin/$(Configuration)/$(AssemblyName)</OutputPath>
-
-    <!--
-      Generate XML documentation from /// comments.  The compiler places the
-      XML file alongside the assembly in $(OutputPath).  SDK Pack then includes
-      this file automatically in the NuGet package under lib/<tfm>/.
-    -->
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  <!-- Strong name signing ============================================= -->
+  <!-- This is done in Directory.Build.props -->
+  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
+    <InternalsVisibleTo Include="$(AssemblyName).Test" />
+  </ItemGroup>
 
+  <!-- Build Output ==================================================== -->
+  <PropertyGroup>
+    <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
+    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)/</OutputPath>
   </PropertyGroup>
 
-  <!--
-    NuGet Package Config
-
-    See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target
-  -->
+  <!-- NuGet Package Config ============================================ -->
+  <!-- See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target -->
   <PropertyGroup>
     <PackageId>$(AssemblyName)</PackageId>
-    <PackageVersion>$(AbstractionsPackageVersion)</PackageVersion>
-    <PackageOutputPath>$(PackagesDir)</PackageOutputPath>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
@@ -105,29 +67,15 @@
     <None Include="PackageReadme.md" Pack="true" PackagePath="README.md" />
   </ItemGroup>
 
-  <!--
-    Refer to the Logging package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj"/>
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" />
+  <!-- References ====================================================== -->
+  <!-- Reference to Logging  -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj"
+                      Condition="'$(ReferenceType)' != 'Package' "/>
+    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging"
+                      Condition="'$(ReferenceType)' == 'Package' "/>
   </ItemGroup>
 
-  <!--
-    Generate ThisAssembly.cs which contains some version information that is
-    used at runtime and otherwise would not be available.
-  -->
-  <PropertyGroup>
-    <!--
-      We must specify a unique namespace for ThisAssembly since MDS puts its
-      ThisAssembly class in the System namespace, and we cannot have two
-      classes with the same name in the same namespace.
-    -->
-    <ThisAssemblyNamespace>$(AssemblyName)</ThisAssemblyNamespace>
-  </PropertyGroup>
-  <Import Project="$(ToolsDir)/targets/GenerateThisAssemblyCs.targets" />
-
+  <!-- CodeGen Targets ================================================= -->
+  <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
 </Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props
deleted file mode 100644
index 75be8d98c3..0000000000
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!--
-    This file contains the Abstractions package version information.  It is
-    separate from the Abstractions .csproj file so these versions can be
-    imported into the overall MDS build without including other project
-    variables.
-
-    Private properties, not intended to be set or used externally, are prefixed
-    with an underscore (_).
-  -->
-
-  <!-- This file uses several properties defined in tools/props/Versions.props. -->
-
-  <!-- Versioning Properties -->
-  <PropertyGroup>
-    <!--
-      We accept two public properties to control versioning:
-
-        AbstractionsPackageVersion:
-          - Used as the NuGet package version, both in the package file name
-            and in the package metadata.
-          - Used as the base value of the assembly attribute
-            'AssemblyInformationalVersion' generated by MSBuild.
-          - If not specified, defaults to:
-              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
-
-        AbstractionsAssemblyFileVersion:
-          - Used as the value of the assembly attribute 'AssemblyFileVersion'
-            generated by MSBuild.
-          - If not specified:
-            - If $(AbstractionsPackageVersion) is specified, use the numeric
-              parts of its value, for example 1.0.0.345.
-            - Otherwise, defaults to:
-              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber).
-
-      We use private properties to hold the computed values, and then always
-      assign those to the public properties.  After importing this file, the
-      public properties will always be set.
-    -->
-
-    <!-- The default major version number. -->
-    <AbstractionsDefaultMajorVersion>1</AbstractionsDefaultMajorVersion>
-
-    <!-- Determine the package version. -->
-    <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' != ''">$(AbstractionsPackageVersion)</_OurPackageVersion>
-    <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' == ''">$(AbstractionsDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_OurPackageVersion>
-
-    <!--Determine the assembly file version. -->
-    <!-- If AbstractionsAssemblyFileVersion is set, use its value as-is. -->
-    <_OurAssemblyFileVersion Condition="'$(AbstractionsAssemblyFileVersion)' != ''">$(AbstractionsAssemblyFileVersion)</_OurAssemblyFileVersion>
-    <!-- If AbstractionsPackageVersion is set, use its trimmed value. -->
-    <_OurAssemblyFileVersion Condition="'$(AbstractionsAssemblyFileVersion)' == '' and '$(AbstractionsPackageVersion)' != ''">$(AbstractionsPackageVersion.Split('-')[0])</_OurAssemblyFileVersion>
-    <!-- If neither property is set, use the default value.-->
-    <_OurAssemblyFileVersion Condition="'$(AbstractionsAssemblyFileVersion)' == '' and '$(AbstractionsPackageVersion)' == ''">$(AbstractionsDefaultMajorVersion).0.0.$(AssemblyBuildNumber)</_OurAssemblyFileVersion>
-
-    <!--
-      Assign the public properties.  This has no effect if they were
-      specified on the command-line, in which case they are read-only.
-    -->
-    <AbstractionsPackageVersion>$(_OurPackageVersion)</AbstractionsPackageVersion>
-    <AbstractionsAssemblyFileVersion>$(_OurAssemblyFileVersion)</AbstractionsAssemblyFileVersion>
-
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
new file mode 100644
index 0000000000..32330ad3a6
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
@@ -0,0 +1,87 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    This file contains versioning information for the Microsoft.Data.SqlClient.Extensions.Abstractions package.
+    We will calculate three different version variables, used for different purposes:
+
+    * AbstractionsPackageVersion - this will be used as the <Version> property, the version of the
+      NuGet package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
+    * AbstractionsFileVersion - this will be used as the <FileVersion> property. It should be in the
+      form: (Major).(Minor).(Patch).(BuildNumber)
+    * AbstractionsAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the
+      version reported to user if they open the assembly properties. It *must not* change within
+      major versions in order for minor versions to be considered backwards compatible via strong
+      naming. It must be in the form: (Major).0.0.0
+  -->
+
+  <!-- Set up the default version for fallback if a version is not provided -->
+  <PropertyGroup>
+    <!--
+      This is the *next* version to release of Abstractions. Update this when the next version is
+      decided.
+      @TODO: Determine how versions should be updated in release branches vs main
+    -->
+    <AbstractionsVersionDefault>1.0.0</AbstractionsVersionDefault>
+  </PropertyGroup>
+
+  <!-- Determine file version and package version based on what was provided. -->
+  <Choose>
+    <When Condition="'$(AbstractionsPackageVersion)' != ''">
+      <!--
+        When a package version is provided, it supercedes all other choices. It will be used as the
+        package version and the file version will be based on it. This situation is used for
+        local developer scenarios and (@TODO:) old build pipelines that stored their version
+        information in the pipeline yaml.
+      -->
+      <PropertyGroup>
+        <AbstractionsFileVersion>$(AbstractionsPackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</AbstractionsFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(BuildNumber)' != '' AND '$(BuildNumber)' != '0'">
+      <!--
+        When a build number is provided, the default version is used as the base of the package and
+        file versions.
+
+        If a build suffix is provided, this is appended to the package version. This is meant to be
+        used by automated pre-release systems to indicate the source of the build.
+
+        If a build suffix is not provided, no pre-release tag will be added to package version. If
+        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
+        will be retained for the package version, but will be stripped off for the file version
+        (letters are not allowed in file/assembly versions). This is meant to be used by official
+        build pipelines to generate production-ready builds.
+      -->
+      <PropertyGroup>
+        <AbstractionsPackageVersion Condition="'$(BuildSuffix)' != ''">$(AbstractionsVersionDefault)-$(BuildSuffix)$(BuildNumber)</AbstractionsPackageVersion>
+        <AbstractionsPackageVersion Condition="'$(BuildSuffix)' == ''">$(AbstractionsVersionDefault)</AbstractionsPackageVersion>
+
+        <AbstractionsFileVersion>$(AbstractionsVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AbstractionsFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <Otherwise>
+      <!--
+        When a build number or package number are not provided, the build is expected to be a pre-
+        release version. In this case, a suffix is appended to the default version, and 0 is used
+        for the build number in the file version. This is meant to be used by developers that
+        want a quick build without supplying any parameters.
+      -->
+      <PropertyGroup>
+        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
+
+        <AbstractionsPackageVersion>$(AbstractionsVersionDefault)-$(BuildSuffix)</AbstractionsPackageVersion>
+        <AbstractionsFileVersion>$(AbstractionsVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AbstractionsFileVersion>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <!--
+    Finally, we take the file version and break off the major version to determine the assembly
+    version.
+
+    IMPORTANT: This must always be major.0.0.0 for assembly-level backwards compatibility.
+  -->
+  <PropertyGroup>
+    <AbstractionsAssemblyVersion>$(AbstractionsFileVersion.Split('.')[0]).0.0.0</AbstractionsAssemblyVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj
index aeb752d648..427a7aaf9f 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj
@@ -1,29 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <!-- General Properties ============================================== -->
   <PropertyGroup>
+    <AssemblyName>Microsoft.Data.SqlClient.Extensions.Abstractions.Test</AssemblyName>
     <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <AssemblyName>Microsoft.Data.SqlClient.Extensions.Abstractions.Test</AssemblyName>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="../src/Abstractions.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="xunit.runner.console" />
-  </ItemGroup>
+  <!-- Compiler Options ================================================ -->
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 
+  <!-- Global Usings =================================================== -->
   <ItemGroup>
     <Using Include="Xunit" />
   </ItemGroup>
 
+  <!-- Embedded resources and content files ============================ -->
   <ItemGroup>
     <Content Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -31,4 +27,18 @@
     </Content>
   </ItemGroup>
 
+  <!-- References ====================================================== -->
+  <!-- Test Target Reference -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
+  </ItemGroup>
+
+  <!-- Other References -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="xunit.runner.console" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
index b244dd467e..423c55387f 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
@@ -1,51 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <!--
-    Additional project config is imported from parent Directory.Build.props
-    files.
-
-    Azure versioning information found in our sibling file AzureVersions.props
-    is imported via tools/props/Versions.props.
-  -->
-
-  <!-- Target Config -->
+  <!-- General Properties ============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+    <AssemblyName>Microsoft.Data.SqlClient.Extensions.Azure</AssemblyName>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
-  <!-- When we're not signing, we are permitted to expose our internals to tests. -->
-  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
-    <InternalsVisibleTo Include="$(AssemblyName).Test" />
-  </ItemGroup>
-
-  <!-- Compiler Config -->
+  <!-- Compiler Options ================================================ -->
   <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <RootNamespace>Microsoft.Data.SqlClient</RootNamespace>
   </PropertyGroup>
 
-  <!-- Build Config -->
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient.Extensions.Azure</AssemblyName>
-
-    <!--
-      Clear the root namespace since our directory structure doesn't match our
-      namespace definitions.  Otherwise, if omitted it would default to the
-      AssemblyName.
-    -->
-    <RootNamespace></RootNamespace>
-
-    <!--
-      We pin the AssemblyVersion of our package to the default major version
-      number, with all remaining parts set to 0.
-    -->
-    <AssemblyVersion>$(AzureDefaultMajorVersion).0.0.0</AssemblyVersion>
-
-    <AssemblyFileVersion>$(AzureAssemblyFileVersion)</AssemblyFileVersion>
-    <FileVersion>$(AzureAssemblyFileVersion)</FileVersion>
-    <Version>$(AzurePackageVersion)</Version>
-  </PropertyGroup>
+  <!-- CLS Compliance ================================================== -->
   <ItemGroup>
     <!-- Our API is CLS Compliant. -->
     <AssemblyAttribute Include="System.CLSCompliantAttribute">
@@ -53,36 +21,30 @@
     </AssemblyAttribute>
   </ItemGroup>
 
-  <!-- Build Output Config-->
+  <!-- Versioning ====================================================== -->
+  <Import Project="Versions.props" />
   <PropertyGroup>
+    <AssemblyVersion>$(AzureAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(AzureFileVersion)</FileVersion>
+    <Version>$(AzurePackageVersion)</Version>
+  </PropertyGroup>
 
-    <!--
-      The obj/ folder for each target framework.  This contains intermediate files used during the
-      build process.
-    -->
-    <IntermediateOutputPath>$(Artifacts)/obj/$(Configuration)/$(AssemblyName)</IntermediateOutputPath>
-
-    <!-- The bin/ folder for each target framework. This contains the final build artifacts. -->
-    <OutputPath>$(Artifacts)/bin/$(Configuration)/$(AssemblyName)</OutputPath>
-
-    <!--
-      Generate XML documentation from /// comments.  The compiler places the
-      XML file alongside the assembly in $(OutputPath).  SDK Pack then includes
-      this file automatically in the NuGet package under lib/<tfm>/.
-    -->
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  <!-- Strong name signing ============================================= -->
+  <!-- This is done in Directory.Build.props -->
+  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
+    <InternalsVisibleTo Include="$(AssemblyName).Test" />
+  </ItemGroup>
 
+  <!-- Build Output ==================================================== -->
+  <PropertyGroup>
+    <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
+    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)/</OutputPath>
   </PropertyGroup>
 
-  <!--
-    NuGet Package Config
-
-    See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target
-  -->
+  <!-- NuGet Package Config ============================================ -->
+  <!-- See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target -->
   <PropertyGroup>
     <PackageId>$(AssemblyName)</PackageId>
-    <PackageVersion>$(AzurePackageVersion)</PackageVersion>
-    <PackageOutputPath>$(PackagesDir)</PackageOutputPath>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
@@ -105,28 +67,24 @@
     <None Include="PackageReadme.md" Pack="true" PackagePath="README.md" />
   </ItemGroup>
 
-  <!--
-    Refer to the Abstractions package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj"/>
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
+  <!-- References ====================================================== -->
+  <!-- Reference to Abstractions -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 
-  <!--
-    Refer to the Logging package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj"/>
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" />
+  <!-- Reference to Logging -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging"
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 
+  <!-- Other references -->
   <ItemGroup>
     <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
@@ -135,18 +93,6 @@
     <PackageReference Include="Microsoft.Identity.Client" />
   </ItemGroup>
 
-  <!--
-    Generate ThisAssembly.cs which contains some version information that is
-    used at runtime and otherwise would not be available.
-  -->
-  <PropertyGroup>
-    <!--
-      We must specify a unique namespace for ThisAssembly since MDS puts its
-      ThisAssembly class in the System namespace, and we cannot have two
-      classes with the same name in the same namespace.
-    -->
-    <ThisAssemblyNamespace>$(AssemblyName)</ThisAssemblyNamespace>
-  </PropertyGroup>
+  <!-- CodeGen Targets ================================================= -->
   <Import Project="$(ToolsDir)/targets/GenerateThisAssemblyCs.targets" />
-
 </Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props
deleted file mode 100644
index 2102cd798a..0000000000
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!--
-    This file contains the Azure package version information.  It is separate
-    from the Azure .csproj file so these versions can be imported into the
-    overall MDS build without including other project variables.
-
-    Private properties, not intended to be set or used externally, are prefixed
-    with an underscore (_).
-  -->
-
-  <!-- This file uses several properties defined in tools/props/Versions.props. -->
-
-  <!-- Versioning Properties -->
-  <PropertyGroup>
-    <!--
-      We accept two public properties to control versioning:
-
-        AzurePackageVersion:
-          - Used as the NuGet package version, both in the package file name
-            and in the package metadata.
-          - Used as the base value of the assembly attribute
-            'AssemblyInformationalVersion' generated by MSBuild.
-          - If not specified, defaults to:
-              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
-
-        AzureAssemblyFileVersion:
-          - Used as the value of the assembly attribute 'AssemblyFileVersion'
-            generated by MSBuild.
-          - If not specified:
-            - If $(AzurePackageVersion) is specified, use the numeric
-              parts of its value, for example 1.0.0.345.
-            - Otherwise, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber).
-
-      We use private properties to hold the computed values, and then always
-      assign those to the public properties.  After importing this file, the
-      public properties will always be set.
-    -->
-
-    <!-- The default major version number. -->
-    <AzureDefaultMajorVersion>1</AzureDefaultMajorVersion>
-
-    <!-- Determine the package version. -->
-    <_OurPackageVersion Condition="'$(AzurePackageVersion)' != ''">$(AzurePackageVersion)</_OurPackageVersion>
-    <_OurPackageVersion Condition="'$(AzurePackageVersion)' == ''">$(AzureDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_OurPackageVersion>
-
-    <!--Determine the assembly file version. -->
-    <!-- If AzureAssemblyFileVersion is set, use its value as-is. -->
-    <_OurAssemblyFileVersion Condition="'$(AzureAssemblyFileVersion)' != ''">$(AzureAssemblyFileVersion)</_OurAssemblyFileVersion>
-    <!-- If AzurePackageVersion is set, use its trimmed value. -->
-    <_OurAssemblyFileVersion Condition="'$(AzureAssemblyFileVersion)' == '' and '$(AzurePackageVersion)' != ''">$(AzurePackageVersion.Split('-')[0])</_OurAssemblyFileVersion>
-    <!-- If neither property is set, use the default value.-->
-    <_OurAssemblyFileVersion Condition="'$(AzureAssemblyFileVersion)' == '' and '$(AzurePackageVersion)' == ''">$(AzureDefaultMajorVersion).0.0.$(AssemblyBuildNumber)</_OurAssemblyFileVersion>
-
-    <!--
-      Assign the public properties.  This has no effect if they were
-      specified on the command-line, in which case they are read-only.
-    -->
-    <AzurePackageVersion>$(_OurPackageVersion)</AzurePackageVersion>
-    <AzureAssemblyFileVersion>$(_OurAssemblyFileVersion)</AzureAssemblyFileVersion>
-
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
new file mode 100644
index 0000000000..1876c965eb
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
@@ -0,0 +1,86 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    This file contains versioning information for the Microsoft.Data.SqlClient.Extensions.Azure package.
+    We will calculate three different version variables, used for different purposes:
+
+    * AzureAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the
+      version reported to user if they open the assembly properties. It *must not* change within
+      major versions in order for minor versions to be considered backwards compatible via strong
+      naming. It must be in the form: (Major).0.0.0
+    * AzurePackageVersion - this will be used as the <Version> property, the version of the
+      NuGet package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
+    * AzureFileVersion - this will be used as the <FileVersion> property. It should be in the
+      form: (Major).(Minor).(Patch).(BuildNumber)
+  -->
+
+  <!-- Set up the default version for fallback if a version is not provided -->
+  <PropertyGroup>
+    <!--
+      This is the *next* version to release of Azure. Update this when the next version is decided.
+      @TODO: Determine how versions should be updated in release branches vs main
+    -->
+    <AzureVersionDefault>1.0.0</AzureVersionDefault>
+  </PropertyGroup>
+
+  <!-- Determine file version and package version based on what was provided. -->
+  <Choose>
+    <When Condition="'$(AzurePackageVersion)' != ''">
+      <!--
+        When a package version is provided, it supercedes all other choices. It will be used as the
+        package version and the file version will be based on it. This situation is used for
+        local developer scenarios and (@TODO:) old build pipelines that stored their version
+        information in the pipeline yaml.
+      -->
+      <PropertyGroup>
+        <AzureFileVersion>$(AzurePackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</AzureFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(BuildNumber)' != '' AND '$(BuildNumber)' != '0'">
+      <!--
+        When a build number is provided, the default version is used as the base of the package and
+        file versions.
+
+        If a build suffix is provided, this is appended to the package version. This is meant to be
+        used by automated pre-release systems to indicate the source of the build.
+
+        If a build suffix is not provided, no pre-release tag will be added to package version. If
+        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
+        will be retained for the package version, but will be stripped off for the file version
+        (letters are not allowed in file/assembly versions). This is meant to be used by official
+        build pipelines to generate production-ready builds.
+      -->
+      <PropertyGroup>
+        <AzurePackageVersion Condition="'$(BuildSuffix)' != ''">$(AzureVersionDefault)-$(BuildSuffix)$(BuildNumber)</AzurePackageVersion>
+        <AzurePackageVersion Condition="'$(BuildSuffix)' == ''">$(AzureVersionDefault)</AzurePackageVersion>
+
+        <AzureFileVersion>$(AzureVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AzureFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <Otherwise>
+      <!--
+        When a build number or package number are not provided, the build is expected to be a pre-
+        release version. In this case, a suffix is appended to the default version, and 0 is used
+        for the build number in the file version. This is meant to be used by developers that
+        want a quick build without supplying any parameters.
+      -->
+      <PropertyGroup>
+        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
+
+        <AzurePackageVersion>$(AzureVersionDefault)-$(BuildSuffix)</AzurePackageVersion>
+        <AzureFileVersion>$(AzureVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AzureFileVersion>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <!--
+    Finally, we take the file version and break off the major version to determine the assembly
+    version.
+
+    IMPORTANT: This must always be major.0.0.0 for assembly-level backwards compatibility.
+  -->
+  <PropertyGroup>
+    <AzureAssemblyVersion>$(AzureFileVersion.Split('.')[0]).0.0.0</AzureAssemblyVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
index 7d2a0c56a5..1c020c2ae4 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
@@ -4,23 +4,8 @@
     <AssemblyName>Microsoft.Data.SqlClient.Extensions.Azure.Test</AssemblyName>
     <RootNamespace>Microsoft.Data.SqlClient.Extensions.Azure.Test</RootNamespace>
 
-    <ImplicitUsings>enable</ImplicitUsings>
-    <IsTestProject>true</IsTestProject>
-    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-
-    <!--
-      Exclude Interactive tests by default since they require user interaction (e.g. browser
-      sign-in).
-
-      To run them explicitly:
-        dotnet test -filter "Category=Interactive"
-
-      Note that the "filter" argument actually requires two dashes, but that character sequence
-      isn't permitted within an XML comment, so we only show a single dash above.
-    -->
-    <!-- @TODO: Integrate this into build.proj so that filters can be composed at command line -->
-    <VSTestTestCaseFilter>Category!=Interactive</VSTestTestCaseFilter>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
@@ -34,6 +19,12 @@
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
+  <!-- Compiler Options ================================================ -->
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
   <!-- Global Usings =================================================== -->
   <ItemGroup>
     <Using Include="Xunit" />
@@ -56,7 +47,6 @@
                       Condition="'$(ReferenceType)' == 'Package'"/>
 
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
-    <!-- @TODO: Should we have a package mode reference for azure? -->
   </ItemGroup>
 
   <!-- References for netfx -->
diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj
index 1146e92c8f..f8461d8b92 100644
--- a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj
+++ b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj
@@ -1,51 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <!--
-    Additional project config is imported from parent Directory.Build.props
-    files.
-
-    Logging versioning information found in our sibling file LoggingVersions.props
-    is imported via tools/props/Versions.props.
-  -->
-
-  <!-- Target Config -->
+  <!-- General Properties ============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <AssemblyName>Microsoft.Data.SqlClient.Internal.Logging</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <!-- When we're not signing, we are permitted to expose our internals to tests. -->
-  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
-    <InternalsVisibleTo Include="$(AssemblyName).Test" />
-  </ItemGroup>
-
-  <!-- Compiler Config -->
+  <!-- Compiler Options ================================================ -->
   <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <!-- Build Config -->
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient.Internal.Logging</AssemblyName>
-
-    <!--
-      Clear the root namespace since our directory structure doesn't match our
-      namespace definitions.  Otherwise, if omitted it would default to the
-      AssemblyName.
-    -->
-    <RootNamespace></RootNamespace>
-
-    <!--
-      We pin the AssemblyVersion of our package to the default major version
-      number, with all remaining parts set to 0.
-    -->
-    <AssemblyVersion>$(LoggingDefaultMajorVersion).0.0.0</AssemblyVersion>
 
-    <AssemblyFileVersion>$(LoggingAssemblyFileVersion)</AssemblyFileVersion>
-    <FileVersion>$(LoggingAssemblyFileVersion)</FileVersion>
-    <Version>$(LoggingPackageVersion)</Version>
+    <!-- @TODO: Can we just change the one file namespace to Microsoft.Data.SqlClient.Internal.Logging -->
+    <RootNamespace>Microsoft.Data.SqlClient.Internal</RootNamespace>
   </PropertyGroup>
+
+  <!-- CLS Compliance ================================================== -->
   <ItemGroup>
     <!-- Our API is CLS Compliant. -->
     <AssemblyAttribute Include="System.CLSCompliantAttribute">
@@ -53,36 +23,30 @@
     </AssemblyAttribute>
   </ItemGroup>
 
-  <!-- Build Output Config-->
+  <!-- Versioning ====================================================== -->
+  <Import Project="Versions.props" />
   <PropertyGroup>
+    <AssemblyVersion>$(LoggingAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(LoggingFileVersion)</FileVersion>
+    <Version>$(LoggingPackageVersion)</Version>
+  </PropertyGroup>
 
-    <!--
-      The obj/ folder for each target framework.  This contains intermediate files used during the
-      build process.
-    -->
-    <IntermediateOutputPath>$(Artifacts)/obj/$(Configuration)/$(AssemblyName)</IntermediateOutputPath>
-
-    <!-- The bin/ folder for each target framework. This contains the final build artifacts. -->
-    <OutputPath>$(Artifacts)/bin/$(Configuration)/$(AssemblyName)</OutputPath>
-
-    <!--
-      Generate XML documentation from /// comments.  The compiler places the
-      XML file alongside the assembly in $(OutputPath).  SDK Pack then includes
-      this file automatically in the NuGet package under lib/<tfm>/.
-    -->
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  <!-- Strong name signing ============================================= -->
+  <!-- This is done in Directory.Build.props -->
+  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
+    <InternalsVisibleTo Include="$(AssemblyName).Test" />
+  </ItemGroup>
 
+  <!-- Build Output ==================================================== -->
+  <PropertyGroup>
+    <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
+    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)/</OutputPath>
   </PropertyGroup>
 
-  <!--
-    NuGet Package Config
-
-    See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target
-  -->
+  <!-- NuGet Package Config ============================================ -->
+  <!-- See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target -->
   <PropertyGroup>
     <PackageId>$(AssemblyName)</PackageId>
-    <PackageVersion>$(LoggingPackageVersion)</PackageVersion>
-    <PackageOutputPath>$(PackagesDir)</PackageOutputPath>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
@@ -111,18 +75,7 @@
     <None Include="PackageReadme.md" Pack="true" PackagePath="README.md" />
   </ItemGroup>
 
-  <!--
-    Generate ThisAssembly.cs which contains some version information that is
-    used at runtime and otherwise would not be available.
-  -->
-  <PropertyGroup>
-    <!--
-      We must specify a unique namespace for ThisAssembly since MDS puts its
-      ThisAssembly class in the System namespace, and we cannot have two
-      classes with the same name in the same namespace.
-    -->
-    <ThisAssemblyNamespace>$(AssemblyName)</ThisAssemblyNamespace>
-  </PropertyGroup>
+  <!-- CodeGen Targets ================================================= -->
   <Import Project="$(ToolsDir)/targets/GenerateThisAssemblyCs.targets" />
 
 </Project>
diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props b/src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props
deleted file mode 100644
index 9205b88793..0000000000
--- a/src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!--
-    This file contains the Logging package version information.  It is
-    separate from the Logging .csproj file so these versions can be
-    imported into the overall MDS build without including other project
-    variables.
-
-    Private properties, not intended to be set or used externally, are prefixed
-    with an underscore (_).
-  -->
-
-  <!-- This file uses several properties defined in tools/props/Versions.props. -->
-
-  <!-- Versioning Properties -->
-  <PropertyGroup>
-    <!--
-      We accept two public properties to control versioning:
-
-        LoggingPackageVersion:
-          - Used as the NuGet package version, both in the package file name
-            and in the package metadata.
-          - Used as the base value of the assembly attribute
-            'AssemblyInformationalVersion' generated by MSBuild.
-          - If not specified, defaults to:
-              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
-
-        LoggingAssemblyFileVersion:
-          - Used as the value of the assembly attribute 'AssemblyFileVersion'
-            generated by MSBuild.
-          - If not specified:
-            - If $(LoggingPackageVersion) is specified, use the numeric
-              parts of its value, for example 1.0.0.345.
-            - Otherwise, defaults to:
-              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber).
-
-      We use private properties to hold the computed values, and then always
-      assign those to the public properties.  After importing this file, the
-      public properties will always be set.
-    -->
-
-    <!-- The default major version number. -->
-    <LoggingDefaultMajorVersion>1</LoggingDefaultMajorVersion>
-
-    <!-- Determine the package version. -->
-    <_OurPackageVersion Condition="'$(LoggingPackageVersion)' != ''">$(LoggingPackageVersion)</_OurPackageVersion>
-    <_OurPackageVersion Condition="'$(LoggingPackageVersion)' == ''">$(LoggingDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_OurPackageVersion>
-
-    <!--Determine the assembly file version. -->
-    <!-- If LoggingAssemblyFileVersion is set, use its value as-is. -->
-    <_OurAssemblyFileVersion Condition="'$(LoggingAssemblyFileVersion)' != ''">$(LoggingAssemblyFileVersion)</_OurAssemblyFileVersion>
-    <!-- If LoggingPackageVersion is set, use its trimmed value. -->
-    <_OurAssemblyFileVersion Condition="'$(LoggingAssemblyFileVersion)' == '' and '$(LoggingPackageVersion)' != ''">$(LoggingPackageVersion.Split('-')[0])</_OurAssemblyFileVersion>
-    <!-- If neither property is set, use the default value.-->
-    <_OurAssemblyFileVersion Condition="'$(LoggingAssemblyFileVersion)' == '' and '$(LoggingPackageVersion)' == ''">$(LoggingDefaultMajorVersion).0.0.$(AssemblyBuildNumber)</_OurAssemblyFileVersion>
-
-    <!--
-      Assign the public properties.  This has no effect if they were
-      specified on the command-line, in which case they are read-only.
-    -->
-    <LoggingPackageVersion>$(_OurPackageVersion)</LoggingPackageVersion>
-    <LoggingAssemblyFileVersion>$(_OurAssemblyFileVersion)</LoggingAssemblyFileVersion>
-
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
new file mode 100644
index 0000000000..3278bdc2e9
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
@@ -0,0 +1,87 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    This file contains versioning information for the Microsoft.Data.SqlClient.Internal.Logging package.
+    We will calculate three different version variables, used for different purposes:
+
+    * LoggingPackageVersion - this will be used as the <Version> property, the version of the
+      NuGet package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
+    * LoggingFileVersion - this will be used as the <FileVersion> property. It should be in the
+      form: (Major).(Minor).(Patch).(BuildNumber)
+    * LoggingAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the
+      version reported to user if they open the assembly properties. It *must not* change within
+      major versions in order for minor versions to be considered backwards compatible via strong
+      naming. It must be in the form: (Major).0.0.0
+  -->
+
+  <!-- Set up the default version for fallback if a version is not provided -->
+  <PropertyGroup>
+    <!--
+      This is the *next* version to release of Logging. Update this when the next version is
+      decided.
+      @TODO: Determine how versions should be updated in release branches vs main
+    -->
+    <LoggingVersionDefault>1.0.0</LoggingVersionDefault>
+  </PropertyGroup>
+
+  <!-- Determine file version and package version based on what was provided. -->
+  <Choose>
+    <When Condition="'$(LoggingPackageVersion)' != ''">
+      <!--
+        When a package version is provided, it supercedes all other choices. It will be used as the
+        package version and the file version will be based on it. This situation is used for
+        local developer scenarios and (@TODO:) old build pipelines that stored their version
+        information in the pipeline yaml.
+      -->
+      <PropertyGroup>
+        <LoggingFileVersion>$(LoggingPackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</LoggingFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(BuildNumber)' != '' AND '$(BuildNumber)' != '0'">
+      <!--
+        When a build number is provided, the default version is used as the base of the package and
+        file versions.
+
+        If a build suffix is provided, this is appended to the package version. This is meant to be
+        used by automated pre-release systems to indicate the source of the build.
+
+        If a build suffix is not provided, no pre-release tag will be added to package version. If
+        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
+        will be retained for the package version, but will be stripped off for the file version
+        (letters are not allowed in file/assembly versions). This is meant to be used by official
+        build pipelines to generate production-ready builds.
+      -->
+      <PropertyGroup>
+        <LoggingPackageVersion Condition="'$(BuildSuffix)' != ''">$(LoggingVersionDefault)-$(BuildSuffix)$(BuildNumber)</LoggingPackageVersion>
+        <LoggingPackageVersion Condition="'$(BuildSuffix)' == ''">$(LoggingVersionDefault)</LoggingPackageVersion>
+
+        <LoggingFileVersion>$(LoggingVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</LoggingFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <Otherwise>
+      <!--
+        When a build number or package number are not provided, the build is expected to be a pre-
+        release version. In this case, a suffix is appended to the default version, and 0 is used
+        for the build number in the file version. This is meant to be used by developers that
+        want a quick build without supplying any parameters.
+      -->
+      <PropertyGroup>
+        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
+
+        <LoggingPackageVersion>$(LoggingVersionDefault)-$(BuildSuffix)</LoggingPackageVersion>
+        <LoggingFileVersion>$(LoggingVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</LoggingFileVersion>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <!--
+    Finally, we take the file version and break off the major version to determine the assembly
+    version.
+
+    IMPORTANT: This must always be major.0.0.0 for assembly-level backwards compatibility.
+  -->
+  <PropertyGroup>
+    <LoggingAssemblyVersion>$(LoggingFileVersion.Split('.')[0]).0.0.0</LoggingAssemblyVersion>
+  </PropertyGroup>
+</Project>
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
index e08e693479..1b6b3440f8 100644
--- a/src/Microsoft.Data.SqlClient.slnx
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -128,7 +128,6 @@
   </Folder>
   <Folder Name="/eng/">
     <File Path="../build.proj" />
-    <File Path="../build2.proj" />
     <Project Path="../eng/pipelines/Pipelines.csproj">
       <Build Project="false" />
     </Project>
@@ -137,7 +136,7 @@
     <File Path="Directory.Build.props" />
   </Folder>
   <Folder Name="/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/">
-    <Project Path="Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
+    <Project Path="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
   </Folder>
   <Folder Name="/src/Microsoft.Data.SqlClient.Extensions.Abstractions/">
     <Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
@@ -151,7 +150,7 @@
     <Project Path="Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
   </Folder>
   <Folder Name="/src/Microsoft.Data.SqlClient/">
-    <File Path="Microsoft.Data.SqlClient/MdsVersions.props" />
+    <File Path="Microsoft.Data.SqlClient/Versions.props" />
   </Folder>
   <Folder Name="/src/Microsoft.Data.SqlClient/notsupported/">
     <Project Path="../tools/GenAPI/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj">
diff --git a/src/Microsoft.Data.SqlClient/MdsVersions.props b/src/Microsoft.Data.SqlClient/Versions.props
similarity index 65%
rename from src/Microsoft.Data.SqlClient/MdsVersions.props
rename to src/Microsoft.Data.SqlClient/Versions.props
index 97063881d9..ea6b557467 100644
--- a/src/Microsoft.Data.SqlClient/MdsVersions.props
+++ b/src/Microsoft.Data.SqlClient/Versions.props
@@ -3,31 +3,28 @@
     This file contains versioning information for the Microsoft.Data.SqlClient package.
     We will calculate three different version variables, used for different purposes:
 
-    * MdsPackageVersion - this will be used as the <Version> property, the version of the NuGet
-      package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
-    * MdsFileVersion - this will be used as the <FileVersion> property. It should be in the form:
-      (Major).(Minor).(Patch).(BuildNumber)
-    * MdsAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the version
+    * SqlClientAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the version
       reported to user if they open the assembly properties. It *must not* change within major
       versions in order for minor versions to be considered backwards compatible via strong naming.
       It must be in the form: (Major).0.0.0
+    * SqlClientFileVersion - this will be used as the <FileVersion> property. It should be in the form:
+      (Major).(Minor).(Patch).(BuildNumber)
+    * SqlClientPackageVersion - this will be used as the <Version> property, the version of the NuGet
+      package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
   -->
 
-
   <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
-    <!-- This is the *next* version to release of MDS. Update this after a version is released -->
-    <MdsVersionDefault>7.0.0</MdsVersionDefault>
-
     <!--
-      Build number is being coalesced to 0 and adjusted for overflow in /tools/props/Versions.props.
-      It is stored as: AssemblyBuildNumber
+      This is the *next* version to release of SqlClient. Update this after a version is released.
+      @TODO: Determine how versions should be updated in release branches vs main
     -->
+    <SqlClientVersionDefault>7.0.0</SqlClientVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
   <Choose>
-    <When Condition="'$(MdsPackageVersion)' != ''">
+    <When Condition="'$(SqlClientPackageVersion)' != ''">
       <!--
         When a package version is provided, it supercedes all other choices. It will be used as the
         package version and the file version will be based on it. This situation is used for
@@ -35,7 +32,7 @@
         information in the pipeline yaml.
       -->
       <PropertyGroup>
-        <MdsFileVersion>$(MdsPackageVersion.Split('-')[0]).$(AssemblyBuildNumber)</MdsFileVersion>
+        <SqlClientFileVersion>$(SqlClientPackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</SqlClientFileVersion>
       </PropertyGroup>
     </When>
 
@@ -54,10 +51,10 @@
         build pipelines to generate production-ready builds.
       -->
       <PropertyGroup>
-        <MdsPackageVersion Condition="'$(BuildSuffix)' != ''">$(MdsVersionDefault)-$(BuildSuffix)$(AssemblyBuildNumber)</MdsPackageVersion>
-        <MdsPackageVersion Condition="'$(BuildSuffix)' == ''">$(MdsVersionDefault)</MdsPackageVersion>
+        <SqlClientPackageVersion Condition="'$(BuildSuffix)' != ''">$(SqlClientVersionDefault)-$(BuildSuffix)$(BuildNumber)</SqlClientPackageVersion>
+        <SqlClientPackageVersion Condition="'$(BuildSuffix)' == ''">$(SqlClientVersionDefault)</SqlClientPackageVersion>
 
-        <MdsFileVersion>$(MdsVersionDefault.Split('-')[0]).$(AssemblyBuildNumber)</MdsFileVersion>
+        <SqlClientFileVersion>$(SqlClientVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</SqlClientFileVersion>
       </PropertyGroup>
     </When>
 
@@ -71,8 +68,8 @@
       <PropertyGroup>
         <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
 
-        <MdsPackageVersion>$(MdsVersionDefault)-$(BuildSuffix)</MdsPackageVersion>
-        <MdsFileVersion>$(MdsVersionDefault.Split('-')[0]).$(AssemblyBuildNumber)</MdsFileVersion>
+        <SqlClientPackageVersion>$(SqlClientVersionDefault)-$(BuildSuffix)</SqlClientPackageVersion>
+        <SqlClientFileVersion>$(SqlClientVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</SqlClientFileVersion>
       </PropertyGroup>
     </Otherwise>
   </Choose>
@@ -80,9 +77,10 @@
   <!--
     Finally, we take the file version and break off the major version to determine the assembly
     version.
+
+    IMPORTANT: This must always be major.0.0.0 for assembly-level backwards compatibility.
   -->
   <PropertyGroup>
-    <MdsAssemblyVersion>$(MdsFileVersion.Split('.')[0]).0.0.0</MdsAssemblyVersion>
+    <SqlClientAssemblyVersion>$(SqlClientFileVersion.Split('.')[0]).0.0.0</SqlClientAssemblyVersion>
   </PropertyGroup>
-
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props
deleted file mode 100644
index 47982a6478..0000000000
--- a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!--
-    This file contains the AKV Provider package version information.  It is
-    separate from the AKV Provider .csproj file so these versions can be imported into
-    the overall MDS build without including other project variables.
-
-    Private properties, not intended to be set or used externally, are prefixed
-    with an underscore (_).
-  -->
-
-  <!-- This file uses several properties defined in tools/props/Versions.props. -->
-
-  <!-- Versioning Properties -->
-  <PropertyGroup>
-    <!--
-      We accept two public properties to control versioning:
-
-        AkvPackageVersion:
-          - Used as the NuGet package version, both in the package file name
-            and in the package metadata.
-          - Used as the base value of the assembly attribute
-            'AssemblyInformationalVersion' generated by MSBuild.
-          - If not specified, defaults to:
-              $(AkvDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
-
-        AkvAssemblyFileVersion:
-          - Used as the value of the assembly attribute 'AssemblyFileVersion'
-            generated by MSBuild.
-          - If not specified:
-            - If $(AkvPackageVersion) is specified, use the numeric
-              parts of its value, for example 7.0.0.345.
-            - Otherwise, defaults to:
-              $(AkvDefaultMajorVersion).0.0.$(AssemblyBuildNumber).
-
-      We use private properties to hold the computed values, and then always
-      assign those to the public properties.  After importing this file, the
-      public properties will always be set.
-    -->
-
-    <!-- The default major version number. -->
-    <AkvDefaultMajorVersion>7</AkvDefaultMajorVersion>
-
-    <!-- Determine the package version. -->
-    <_AkvPackageVersion Condition="'$(AkvPackageVersion)' != ''">$(AkvPackageVersion)</_AkvPackageVersion>
-    <_AkvPackageVersion Condition="'$(AkvPackageVersion)' == ''">$(AkvDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_AkvPackageVersion>
-
-    <!-- Determine the assembly file version. -->
-    <!-- If AkvAssemblyFileVersion is set, use its value as-is. -->
-    <_AkvAssemblyFileVersion Condition="'$(AkvAssemblyFileVersion)' != ''">$(AkvAssemblyFileVersion)</_AkvAssemblyFileVersion>
-    <!-- If AkvPackageVersion is set, use its trimmed value. -->
-    <_AkvAssemblyFileVersion Condition="'$(AkvAssemblyFileVersion)' == '' and '$(AkvPackageVersion)' != ''">$(AkvPackageVersion.Split('-')[0])</_AkvAssemblyFileVersion>
-    <!-- If neither property is set, use the default value. -->
-    <_AkvAssemblyFileVersion Condition="'$(AkvAssemblyFileVersion)' == '' and '$(AkvPackageVersion)' == ''">$(AkvDefaultMajorVersion).0.0.$(AssemblyBuildNumber)</_AkvAssemblyFileVersion>
-
-    <!--
-      Assign the public properties.  This has no effect if they were
-      specified on the command-line, in which case they are read-only.
-    -->
-    <AkvPackageVersion>$(_AkvPackageVersion)</AkvPackageVersion>
-    <AkvAssemblyFileVersion>$(_AkvAssemblyFileVersion)</AkvAssemblyFileVersion>
-
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
index 4099207511..ca4c73a6ec 100644
--- a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
@@ -38,9 +38,9 @@
     adding a reference from this project to the GenAPI project. Although this is possible, it is
     not a clean solution (due to reasons related to target frameworks). Thus, building this project
     assumes the GenAPI project has already been built in a previous step. Instead, use the
-    following command in build2.proj to build the "not supported" binaries:
+    following command in build.proj to build the "not supported" binaries:
 
-    > msbuild build2.proj /t:BuildMdsNotSupported
+    > msbuild build.proj /t:BuildSqlClientNotSupported
 
     @TODO: Remove this project
     The primary prerequisite for removing this project is making the "common" MDS project OS-
@@ -55,6 +55,11 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
     <TargetFrameworks>net462;net8.0;net9.0;netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <!-- Compiler Options ================================================ -->
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
 
     <!--
       Files to compile will be generated per-framework by the GenerateNotSupportedSource target and
@@ -68,13 +73,16 @@
   </PropertyGroup>
 
   <!-- Versioning ====================================================== -->
-  <Import Project="../MdsVersions.props" />
+  <Import Project="../Versions.props" />
   <PropertyGroup>
-    <AssemblyVersion>$(MdsAssemblyVersion)</AssemblyVersion>
-    <FileVersion>$(MdsFileVersion)</FileVersion>
-    <Version>$(MdsPackageVersion)</Version>
+    <AssemblyVersion>$(SqlClientAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(SqlClientFileVersion)</FileVersion>
+    <Version>$(SqlClientPackageVersion)</Version>
   </PropertyGroup>
 
+  <!-- Strong name signing ============================================= -->
+  <!-- This is done in Directory.Build.props -->
+
   <!-- Build Output ==================================================== -->
   <PropertyGroup>
     <!--
@@ -208,7 +216,7 @@
       <GenApiCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GenApiCommand), "\s+", " "))</GenApiCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building MDS 'Not Supported' binaries via command: $(GenApiCommand)"/>
+    <Message Text=">>> Building SqlClient 'Not Supported' binaries via command: $(GenApiCommand)"/>
     <Exec Command="$(GenApiCommand)" ConsoleToMsBuild="true" />
 
     <!-- Include the "Not Supported" source file into this project -->
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
index dfad9e601c..2895ce5a4a 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -1,16 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <!-- General Properties ============================================== -->
   <PropertyGroup>
     <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
     <TargetFrameworks>net462;net8.0;net9.0;netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <!-- Compiler Options ================================================ -->
+  <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <!-- Versioning ====================================================== -->
-  <Import Project="../MdsVersions.props" />
+  <Import Project="../Versions.props" />
   <PropertyGroup>
-    <AssemblyVersion>$(MdsAssemblyVersion)</AssemblyVersion>
-    <FileVersion>$(MdsFileVersion)</FileVersion>
-    <Version>$(MdsPackageVersion)</Version>
+    <AssemblyVersion>$(SqlClientAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(SqlClientFileVersion)</FileVersion>
+    <Version>$(SqlClientPackageVersion)</Version>
   </PropertyGroup>
 
   <!-- CLS Compliance ================================================== -->
@@ -47,6 +52,7 @@
   <Target Name="TrimDocsForIntelliSense"
           AfterTargets="Build"
           Condition="'$(IsCrossTargetingBuild)' != 'true' AND '$(GenerateDocumentationFile)' == 'true'">
+
     <PropertyGroup>
       <PowerShellCommand Condition="'$(OS)' == 'Windows_NT'">powershell.exe</PowerShellCommand>
       <PowerShellCommand Condition="'$(OS)' != 'Windows_NT'">pwsh</PowerShellCommand>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 31a13c5801..cffc9fe96f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -2,37 +2,8 @@
   <!-- General Properties ============================================== -->
   <PropertyGroup>
     <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
-    <Configurations>Debug;Release;</Configurations>
-    <RootNamespace />
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <!-- Versioning ====================================================== -->
-  <Import Project="../MdsVersions.props" />
-  <PropertyGroup>
-    <AssemblyVersion>$(MdsAssemblyVersion)</AssemblyVersion>
-    <FileVersion>$(MdsFileVersion)</FileVersion>
-    <Version>$(MdsPackageVersion)</Version>
-  </PropertyGroup>
-
-  <!-- CLS Compliance ================================================== -->
-  <ItemGroup>
-    <AssemblyAttribute Include="System.CLSCompliantAttribute">
-      <_Parameter1>true</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <!-- Strong name signing ============================================= -->
-  <!-- Strong naming is being done in Directory.Build.props -->
-  <!-- Otherwise, we're not signing, so we are permitted to expose our internals to tests. -->
-  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-      <_Parameter1>UnitTests</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
   <!-- OS Constants ==================================================== -->
   <PropertyGroup>
     <!-- If the TargetOs was not specified (as is the case during IDE development), the build     -->
@@ -64,9 +35,39 @@
     <TargetFrameworks Condition="'$(NormalizedTargetOs)' == 'windows_nt'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
+  <!-- Compiler Options ================================================ -->
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <!-- CLS Compliance ================================================== -->
+  <ItemGroup>
+    <AssemblyAttribute Include="System.CLSCompliantAttribute">
+      <_Parameter1>true</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <!-- Versioning ====================================================== -->
+  <Import Project="../Versions.props" />
+  <PropertyGroup>
+    <AssemblyVersion>$(SqlClientAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(SqlClientFileVersion)</FileVersion>
+    <Version>$(SqlClientPackageVersion)</Version>
+  </PropertyGroup>
+
+  <!-- Strong name signing ============================================= -->
+  <!-- Strong naming is being done in Directory.Build.props -->
+  <!-- If we're not signing, we are permitted to expose our internals to tests. -->
+  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>UnitTests</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
   <!-- Build Output ==================================================== -->
   <PropertyGroup>
-    <!-- @TODO: Move to directory.build.props? -->
     <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
 
     <!-- MSBuild will add the target framework to the end of this path by default. Telling it not -->
@@ -112,6 +113,30 @@
   </ItemGroup>
 
   <!-- References ====================================================== -->
+  <!-- Reference to Abstractions -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
+                      Condition="'$(ReferenceType)' == 'Package'" />
+  </ItemGroup>
+
+  <!-- Reference to Logging -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging"
+                      Condition="'$(ReferenceType)' == 'Package'" />
+  </ItemGroup>
+
+  <!-- Reference to SqlServer -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.SqlServer.Server"
+                      Condition="'$(ReferenceType)' == 'Package'" />
+  </ItemGroup>
+
   <!-- References for netframework -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Configuration" />
@@ -148,39 +173,6 @@
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
   </ItemGroup>
 
-  <!--
-    Refer to the Abstractions package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Logging package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" />
-  </ItemGroup>
-
-  <!--
-    Refer to the SqlServer package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project' and '$(TargetFramework)' != 'net462'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package' and '$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Microsoft.SqlServer.Server" />
-  </ItemGroup>
-
   <!-- CodeGen Targets ================================================= -->
   <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
index 55bc3b8208..a8fcf7ca88 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Data.SqlClient;
 ///   This class uses runtime environment information to produce a value
 ///   suitable for use in the TDS LOGIN7 USERAGENT Feature Extension
 ///   payload.
-///   
+///
 ///   See the spec here:
 ///
 ///   <see href="https://microsoft.sharepoint-df.com/:w:/t/sqldevx/IQASFk7dM5QsS66DR8mj5SmMASPyzUn3-osv8F2fMV-p3LU?e=FTph5o">
@@ -24,13 +24,13 @@ namespace Microsoft.Data.SqlClient;
 internal static class UserAgent
 {
     #region Properties
-    
+
     /// <summary>
     ///   <para>
     ///     The pipe-delimited payload as a string, never null, never empty, and
     ///     never larger than 256 characters.
     ///   </para>
-    ///   <para> 
+    ///   <para>
     ///     The format is pipe ('|') delimited into 7 parts:
     ///
     ///     <code>1|MS-MDS|{Driver Version}|{Arch}|{OS Type}|{OS Info}|{Runtime Info}</code>
@@ -63,7 +63,7 @@ internal static class UserAgent
     ///     The <c>{OS Info}</c> part will be sourced from the
     ///     <see cref="RuntimeInformation.OSDescription">
     ///       OSDescription
-    ///     </see> 
+    ///     </see>
     ///     value, or "Unknown" if that value is empty or all whitespace.
     ///     Maximum length is 44 characters.
     ///   </para>
@@ -105,7 +105,7 @@ internal static class UserAgent
     internal static ReadOnlyMemory<byte> Ucs2Bytes { get; }
 
     #endregion Properties
-    
+
     #region Helpers
 
     /// <summary>
@@ -145,12 +145,12 @@ static UserAgent()
             MaxLenOverall,
             PayloadVersion,
             DriverName,
-            System.ThisAssembly.NuGetPackageVersion,
+            ThisAssembly.NuGetPackageVersion,
             RuntimeInformation.ProcessArchitecture,
             osType,
             RuntimeInformation.OSDescription,
             RuntimeInformation.FrameworkDescription);
-        
+
         // Convert it to UCS-2 bytes.
         //
         // The default Unicode instance doesn't throw if encoding fails, so
@@ -170,25 +170,25 @@ static UserAgent()
     ///   The maximum length of the returned value.
     /// </param>
     /// <param name="payloadVersion">
-    ///   The value of the payload version part. 
+    ///   The value of the payload version part.
     /// </param>
     /// <param name="driverName">
-    ///   The value of the driver name part. 
+    ///   The value of the driver name part.
     /// </param>
     /// <param name="driverVersion">
-    ///   The value of the driver version part. 
+    ///   The value of the driver version part.
     /// </param>
     /// <param name="arch">
     ///   The value of the Architecture part.
     /// </param>
     /// <param name="osType">
-    ///   The value of the OS Type part. 
+    ///   The value of the OS Type part.
     /// </param>
     /// <param name="osInfo">
-    ///   The value of the OS Info part. 
+    ///   The value of the OS Info part.
     /// </param>
     /// <param name="runtimeInfo">
-    ///   The value of the Runtime Info part. 
+    ///   The value of the Runtime Info part.
     /// </param>
     /// <returns>
     ///   The payload string value, never null, never empty, and never longer
@@ -238,11 +238,11 @@ internal static string Build(
             // Add the OS Type, truncating to its max length.
             name.Append(Truncate(Clean(osType), MaxLenOsType));
             name.Append('|');
-            
+
             // Add the OS Info, truncating to its max length.
             name.Append(Truncate(Clean(osInfo), MaxLenOsInfo));
             name.Append('|');
-            
+
             // Add the Runtime Info, truncating to its max length.
             name.Append(Truncate(Clean(runtimeInfo), MaxLenRuntimeInfo));
 
@@ -320,7 +320,7 @@ internal static string Clean(string? value)
         {
             return Unknown;
         }
-        
+
         // Remove any leading and trailing whitespace.
         value = value.Trim();
 
@@ -345,7 +345,7 @@ internal static string Clean(string? value)
                     (c >= 'A' && c <= 'Z')
                     || (c >= 'a' && c <= 'z')
                     || (c >= '0' && c <= '9')
-                    #endif 
+                    #endif
                     || c == ' '
                     || c == '.'
                     || c == '+'
@@ -406,7 +406,7 @@ internal static string Truncate(string value, ushort maxLength)
 
     // The overall maximum length of Value.
     private const ushort MaxLenOverall = 256;
-    
+
     // Maximum part lengths as promised in our API.
     private const ushort MaxLenPayloadVersion = 2;
     private const ushort MaxLenDriverName = 12;
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
index 7045eecc65..3bc6ea9fa7 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -41,11 +41,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>xunit.runner.json</Link>
     </None>
-
-    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>CodeCoverage.runsettings</Link>
-    </None>
   </ItemGroup>
 
   <!-- References ====================================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 110547a5de..1c1553e6c1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -73,10 +73,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>xunit.runner.json</Link>
     </None>
-    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>CodeCoverage.runsettings</Link>
-    </None>
   </ItemGroup>
 
   <!-- Items to include in test set 1 -->
@@ -347,7 +343,7 @@
     <PackageReference Include="Microsoft.Data.SqlClient"
                       Condition="'$(ReferenceType)' == 'Package'" />
 
-    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
     <!-- @TODO: Should there be a package mode test for AKV? -->
   </ItemGroup>
 
@@ -421,5 +417,5 @@
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props
index e6df2da836..1d19b81910 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props
@@ -3,12 +3,6 @@
 
   <!-- We purposely do not include any parent Directory.Packages.props files. -->
 
-  <!--
-    We do, however, include Versions.props to get some default version
-    numbers for dependent packages.
-  -->
-  <Import Project="../../../../tools/props/Versions.props" />
-
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <!-- We enable transitive pinning here because we are an application project. -->
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index 3c35a1a205..96c3c052b1 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -34,10 +34,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>xunit.runner.json</Link>
     </None>
-    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>CodeCoverage.runsettings</Link>
-    </None>
   </ItemGroup>
 
   <!-- References ====================================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs
index 49bd92b399..8331fdb654 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs
@@ -78,12 +78,12 @@ public void Value_Runtime_Parts()
         Assert.Equal(7, parts.Length);
         Assert.Equal("1", parts[0]);
         Assert.Equal("MS-MDS", parts[1]);
-        Assert.Equal(System.ThisAssembly.NuGetPackageVersion, parts[2]);
+        Assert.Equal(ThisAssembly.NuGetPackageVersion, parts[2]);
 
         // Architecture must be non-empty and 10 characters or less.
         Assert.True(parts[3] == "Unknown" || parts[3].Length > 0);
         Assert.True(parts[3].Length <= 10);
-        
+
         // Check the OS Type against the guaranteed values.
         var osType = parts[4];
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -112,7 +112,7 @@ public void Value_Runtime_Parts()
         // OS Info must be non-empty and 44 characters or less.
         Assert.True(parts[5] == "Unknown" || parts[5].Length > 0);
         Assert.True(parts[5].Length <= 44);
-        
+
         // Runtime Info must be non-empty and 44 characters or less.
         Assert.True(parts[6] == "Unknown" || parts[6].Length > 0);
         Assert.True(parts[6].Length <= 44);
@@ -145,7 +145,7 @@ public void Ucs2Bytes_Runtime_Parts()
             #else
             Encoding.Unicode.GetString(bytes.ToArray());
             #endif
-        
+
         Assert.Equal(UserAgent.Value, value);
     }
 
@@ -197,7 +197,7 @@ public void Build_Truncate_Payload_Version()
             "P",
             UserAgent.Build(
                 1, "PV", "A", "B", Architecture.X64, "C", "D", "E"));
-        
+
         // The payload version is longer than its per-field max length of 2.
         Assert.Equal(
             "12|A|B|X64|C|D|E",
@@ -216,7 +216,7 @@ public void Build_Truncate_Driver_Name()
             "2|DriverNa",
             UserAgent.Build(
                 10, "2", "DriverName", "B", Architecture.X64, "C", "D", "E"));
-        
+
         // The driver name is longer than its per-field max length of 12.
         Assert.Equal(
             "2|LongDriverNa|B|X64|C|D|E",
@@ -237,7 +237,7 @@ public void Build_Truncate_Driver_Version()
             UserAgent.Build(
                 12, "2", "A", "DriverVersion", Architecture.X64, "C", "D",
                 "E"));
-        
+
         // The driver version is longer than its per-field max length of 24.
         Assert.Equal(
             "2|A|ReallyLongDriverVersionS|X64|C|D|E",
@@ -281,7 +281,7 @@ public void Build_Truncate_OS_Type()
             "2|A|B|X64|LongOs",
             UserAgent.Build(
                 16, "2", "A", "B", Architecture.X64, "LongOsName", "D", "E"));
-        
+
         // The OS Type is longer than its per-field max length of 10.
         Assert.Equal(
             "2|A|B|X64|VeryLongOs|D|E",
@@ -301,7 +301,7 @@ public void Build_Truncate_OS_Info()
             "2|A|B|X64|C|LongOsI",
             UserAgent.Build(
                 19, "2", "A", "B", Architecture.X64, "C", "LongOsInfo", "E"));
-        
+
         // The OS Type is longer than its per-field max length of 44.
         Assert.Equal(
             "2|A|B|X64|C|01234567890123456789012345678901234567890123|E",
@@ -323,7 +323,7 @@ public void Build_Truncate_Runtime_Info()
             UserAgent.Build(
                 22, "2", "A", "B", Architecture.X64, "C", "D",
                 "LongRuntimeInfo"));
-        
+
         // The Runtime Type is longer than its per-field max length of 44.
         Assert.Equal(
             "2|A|B|X64|C|D|01234567890123456789012345678901234567890123",
@@ -339,7 +339,7 @@ public void Build_Truncate_Runtime_Info()
     [Fact]
     public void Build_Truncate_Most()
     {
-        var name = 
+        var name =
             UserAgent.Build(
                 192,
                 // Payload version > 2 chars.
@@ -379,7 +379,7 @@ public void Build_Truncate_Most()
     [Fact]
     public void Build_Truncate_All()
     {
-        var name = 
+        var name =
             UserAgent.Build(
                 192,
                 // Payload version > 2 chars.
@@ -536,19 +536,19 @@ public void Truncate()
         Assert.Equal("", UserAgent.Truncate(" ", 0));
         Assert.Equal("", UserAgent.Truncate("A", 0));
         Assert.Equal("", UserAgent.Truncate("ABCDE FGHIJ", 0));
-        
+
         // Max length of 1.
         Assert.Equal("", UserAgent.Truncate("", 1));
         Assert.Equal(" ", UserAgent.Truncate(" ", 1));
         Assert.Equal("A", UserAgent.Truncate("A", 1));
         Assert.Equal("A", UserAgent.Truncate("ABCDE FGHIJ", 1));
-        
+
         // Max length of 5.
         Assert.Equal("", UserAgent.Truncate("", 5));
         Assert.Equal(" ", UserAgent.Truncate(" ", 5));
         Assert.Equal("A", UserAgent.Truncate("A", 5));
         Assert.Equal("ABCDE", UserAgent.Truncate("ABCDE FGHIJ", 5));
-        
+
         // Max length of 100.
         Assert.Equal("", UserAgent.Truncate("", 100));
         Assert.Equal(" ", UserAgent.Truncate(" ", 100));
diff --git a/src/Microsoft.SqlServer.Server/.editorconfig b/src/Microsoft.SqlServer.Server/.editorconfig
deleted file mode 100644
index f700e14ef5..0000000000
--- a/src/Microsoft.SqlServer.Server/.editorconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-# editorconfig.org
-
-# top-most EditorConfig file
-root = false
-
-[*.cs]
-# CA1310: Specify StringComparison for correctness
-dotnet_diagnostic.CA1310.severity = error
diff --git a/src/Microsoft.SqlServer.Server/IBinarySerialize.cs b/src/Microsoft.SqlServer.Server/IBinarySerialize.netstandard.cs
similarity index 97%
rename from src/Microsoft.SqlServer.Server/IBinarySerialize.cs
rename to src/Microsoft.SqlServer.Server/IBinarySerialize.netstandard.cs
index a975887161..a42c02146e 100644
--- a/src/Microsoft.SqlServer.Server/IBinarySerialize.cs
+++ b/src/Microsoft.SqlServer.Server/IBinarySerialize.netstandard.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETSTANDARD
+
 using System.IO;
 
 namespace Microsoft.SqlServer.Server
@@ -19,3 +21,5 @@ public interface IBinarySerialize
         void Write(BinaryWriter w);
     }
 }
+
+#endif
diff --git a/src/Microsoft.SqlServer.Server/InvalidUdtException.cs b/src/Microsoft.SqlServer.Server/InvalidUdtException.netstandard.cs
similarity index 98%
rename from src/Microsoft.SqlServer.Server/InvalidUdtException.cs
rename to src/Microsoft.SqlServer.Server/InvalidUdtException.netstandard.cs
index 395b02af61..87e12e64ac 100644
--- a/src/Microsoft.SqlServer.Server/InvalidUdtException.cs
+++ b/src/Microsoft.SqlServer.Server/InvalidUdtException.netstandard.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETSTANDARD
+
 using System;
 using System.Runtime.Serialization;
 
@@ -49,3 +51,5 @@ public static InvalidUdtException Create(Type udtType, string resourceReason = "
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj b/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj
index 74409ebf5e..ead90d9eac 100644
--- a/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj
+++ b/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj
@@ -1,40 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <!-- General Properties ============================================== -->
   <PropertyGroup>
     <AssemblyName>Microsoft.SqlServer.Server</AssemblyName>
-    <Description>This is the helper library for Microsoft.Data.SqlClient for cross framework compatibility support of UDT types.</Description>
-    <BaseProduct>Microsoft SqlServer Server</BaseProduct>
     <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
-    <DebugType>portable</DebugType>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
-  <!-- Build Output Config-->
+  <!-- Versioning ====================================================== -->
+  <Import Project="Versions.props" />
   <PropertyGroup>
+    <AssemblyVersion>$(SqlServerAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(SqlServerFileVersion)</FileVersion>
+    <Version>$(SqlServerPackageVersion)</Version>
+  </PropertyGroup>
 
-    <!--
-      The obj/ folder for each target framework.  This contains intermediate files used during the
-      build process.
-    -->
-    <IntermediateOutputPath>$(Artifacts)/obj/$(Configuration)/$(AssemblyName)</IntermediateOutputPath>
-
-    <!-- The bin/ folder for each target framework. This contains the final build artifacts. -->
-    <OutputPath>$(Artifacts)/bin/$(Configuration)/$(AssemblyName)</OutputPath>
-
-    <!-- The doc/ folder for each target framework. -->
-    <DocumentationFile>$(Artifacts)/doc/$(TargetFramework)/$(AssemblyName).xml</DocumentationFile>
+  <!-- Strong name signing ============================================= -->
+  <!-- This is done in Directory.Build.props -->
 
+  <!-- Build Output ==================================================== -->
+  <PropertyGroup>
+    <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
+    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)/</OutputPath>
   </PropertyGroup>
 
-  <!--
-    NuGet Package Config
-
-    See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target
-  -->
+  <!-- NuGet Package Config ============================================ -->
+  <!-- See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target -->
   <PropertyGroup>
     <PackageId>$(AssemblyName)</PackageId>
-    <PackageVersion>$(SqlServerPackageVersion)</PackageVersion>
-    <PackageOutputPath>$(PackagesDir)</PackageOutputPath>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
@@ -70,34 +61,9 @@ Microsoft.SqlServer.Server.Format</Description>
     <None Include="PackageReadme.md" Pack="true" PackagePath="README.md" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove=".AssemblyAttributes" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
-    <Compile Include="TypeForwards.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' != 'net46'">
-    <Compile Include="IBinarySerialize.cs" />
-    <Compile Include="InvalidUdtException.cs" />
-    <Compile Include="SqlFacetAttribute.cs" />
-    <Compile Include="SqlFunctionAttribute.cs" />
-    <Compile Include="SqlMethodAttribute.cs" />
-    <Compile Include="SqlUserDefinedAggregateAttribute.cs" />
-    <Compile Include="SqlUserDefinedTypeAttribute.cs" />
-    <Compile Include="StringsHelper.cs" />
-    <Compile Include="Strings.Designer.cs" />
-    <Compile Update="Strings.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-    <EmbeddedResource Update="Strings.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
+  <!-- CodeGen Targets ================================================= -->
+  <PropertyGroup>
+    <!-- This is backwards compatibility only - @TODO: We should assess whether we actually need it in System or it can default to the assembly namespace -->
+  </PropertyGroup>
   <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
 </Project>
diff --git a/src/Microsoft.SqlServer.Server/SqlFacetAttribute.cs b/src/Microsoft.SqlServer.Server/SqlFacetAttribute.netstandard.cs
similarity index 98%
rename from src/Microsoft.SqlServer.Server/SqlFacetAttribute.cs
rename to src/Microsoft.SqlServer.Server/SqlFacetAttribute.netstandard.cs
index ba5cd82683..e2e3d555d8 100644
--- a/src/Microsoft.SqlServer.Server/SqlFacetAttribute.cs
+++ b/src/Microsoft.SqlServer.Server/SqlFacetAttribute.netstandard.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETSTANDARD
+
 using System;
 
 namespace Microsoft.SqlServer.Server
@@ -49,3 +51,5 @@ public bool IsNullable
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.SqlServer.Server/SqlFunctionAttribute.cs b/src/Microsoft.SqlServer.Server/SqlFunctionAttribute.netstandard.cs
similarity index 99%
rename from src/Microsoft.SqlServer.Server/SqlFunctionAttribute.cs
rename to src/Microsoft.SqlServer.Server/SqlFunctionAttribute.netstandard.cs
index 4d735cd77f..aed0b27d8b 100644
--- a/src/Microsoft.SqlServer.Server/SqlFunctionAttribute.cs
+++ b/src/Microsoft.SqlServer.Server/SqlFunctionAttribute.netstandard.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETSTANDARD
+
 using System;
 
 namespace Microsoft.SqlServer.Server
@@ -102,3 +104,5 @@ public string FillRowMethodName
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.SqlServer.Server/SqlMethodAttribute.cs b/src/Microsoft.SqlServer.Server/SqlMethodAttribute.netstandard.cs
similarity index 98%
rename from src/Microsoft.SqlServer.Server/SqlMethodAttribute.cs
rename to src/Microsoft.SqlServer.Server/SqlMethodAttribute.netstandard.cs
index a28afa2251..75af831b70 100644
--- a/src/Microsoft.SqlServer.Server/SqlMethodAttribute.cs
+++ b/src/Microsoft.SqlServer.Server/SqlMethodAttribute.netstandard.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETSTANDARD
+
 using System;
 
 namespace Microsoft.SqlServer.Server
@@ -45,3 +47,5 @@ public bool InvokeIfReceiverIsNull
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.cs b/src/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.netstandard.cs
similarity index 99%
rename from src/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.cs
rename to src/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.netstandard.cs
index 6e3e949f16..9a35e6b50d 100644
--- a/src/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.cs
+++ b/src/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.netstandard.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETSTANDARD
+
 using System;
 using System.Globalization;
 
@@ -132,3 +134,5 @@ public string Name
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.cs b/src/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.netstandard.cs
similarity index 99%
rename from src/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.cs
rename to src/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.netstandard.cs
index 0f24b89150..3f3103ee85 100644
--- a/src/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.cs
+++ b/src/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.netstandard.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETSTANDARD
+
 using System;
 using System.Globalization;
 
@@ -138,3 +140,5 @@ public string Name
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.SqlServer.Server/StringsHelper.cs b/src/Microsoft.SqlServer.Server/StringsHelper.netstandard.cs
similarity index 99%
rename from src/Microsoft.SqlServer.Server/StringsHelper.cs
rename to src/Microsoft.SqlServer.Server/StringsHelper.netstandard.cs
index 8f3915e18c..54d536ffb8 100644
--- a/src/Microsoft.SqlServer.Server/StringsHelper.cs
+++ b/src/Microsoft.SqlServer.Server/StringsHelper.netstandard.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETSTANDARD
+
 using System.Globalization;
 using System.Resources;
 using System.Runtime.CompilerServices;
@@ -32,7 +34,7 @@ private static StringsHelper GetLoader()
         public static ResourceManager Resources => GetLoader()._resources;
 
 
-        // This method is used to decide if we need to append the exception message parameters to the message when calling Strings.Format. 
+        // This method is used to decide if we need to append the exception message parameters to the message when calling Strings.Format.
         // by default it returns false.
         // Native code generators can replace the value this returns based on user input at the time of native code generation.
         // Marked as NoInlining because if this is used in an AoT compiled app that is not compiled into a single file, the user
@@ -129,3 +131,5 @@ public static string Format(string resourceFormat, object p1, object p2, object
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.SqlServer.Server/TypeForwards.cs b/src/Microsoft.SqlServer.Server/TypeForwards.netfx.cs
similarity index 97%
rename from src/Microsoft.SqlServer.Server/TypeForwards.cs
rename to src/Microsoft.SqlServer.Server/TypeForwards.netfx.cs
index 8f1161bce9..6c3cc7c2b3 100644
--- a/src/Microsoft.SqlServer.Server/TypeForwards.cs
+++ b/src/Microsoft.SqlServer.Server/TypeForwards.netfx.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NETFRAMEWORK
+
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.SqlServer.Server.IBinarySerialize))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.SqlServer.Server.InvalidUdtException))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.SqlServer.Server.Format))]
@@ -12,4 +14,5 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.SqlServer.Server.SqlUserDefinedTypeAttribute))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.SqlServer.Server.DataAccessKind))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.SqlServer.Server.SystemDataAccessKind))]
-namespace Microsoft.SqlServer.Server { }
+
+#endif
diff --git a/src/Microsoft.SqlServer.Server/Versions.props b/src/Microsoft.SqlServer.Server/Versions.props
new file mode 100644
index 0000000000..ec959cafbf
--- /dev/null
+++ b/src/Microsoft.SqlServer.Server/Versions.props
@@ -0,0 +1,87 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    This file contains versioning information for the Microsoft.SqlServer.Server package.
+    We will calculate three different version variables, used for different purposes:
+
+    * SqlServerPackageVersion - this will be used as the <Version> property, the version of the
+      NuGet package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
+    * SqlServerFileVersion - this will be used as the <FileVersion> property. It should be in the
+      form: (Major).(Minor).(Patch).(BuildNumber)
+    * SqlServerAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the
+      version reported to user if they open the assembly properties. It *must not* change within
+      major versions in order for minor versions to be considered backwards compatible via strong
+      naming. It must be in the form: (Major).0.0.0
+  -->
+
+  <!-- Set up the default version for fallback if a version is not provided -->
+  <PropertyGroup>
+    <!--
+      This is the *next* version to release of SqlServer. Update this when the next version is
+      decided.
+      @TODO: Determine how versions should be updated in release branches vs main
+    -->
+    <SqlServerVersionDefault>1.0.0</SqlServerVersionDefault>
+  </PropertyGroup>
+
+  <!-- Determine file version and package version based on what was provided. -->
+  <Choose>
+    <When Condition="'$(SqlServerPackageVersion)' != ''">
+      <!--
+        When a package version is provided, it supercedes all other choices. It will be used as the
+        package version and the file version will be based on it. This situation is used for
+        local developer scenarios and (@TODO:) old build pipelines that stored their version
+        information in the pipeline yaml.
+      -->
+      <PropertyGroup>
+        <SqlServerFileVersion>$(SqlServerPackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</SqlServerFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <When Condition="'$(BuildNumber)' != '' AND '$(BuildNumber)' != '0'">
+      <!--
+        When a build number is provided, the default version is used as the base of the package and
+        file versions.
+
+        If a build suffix is provided, this is appended to the package version. This is meant to be
+        used by automated pre-release systems to indicate the source of the build.
+
+        If a build suffix is not provided, no pre-release tag will be added to package version. If
+        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
+        will be retained for the package version, but will be stripped off for the file version
+        (letters are not allowed in file/assembly versions). This is meant to be used by official
+        build pipelines to generate production-ready builds.
+      -->
+      <PropertyGroup>
+        <SqlServerPackageVersion Condition="'$(BuildSuffix)' != ''">$(SqlServerVersionDefault)-$(BuildSuffix)$(BuildNumber)</SqlServerPackageVersion>
+        <SqlServerPackageVersion Condition="'$(BuildSuffix)' == ''">$(SqlServerVersionDefault)</SqlServerPackageVersion>
+
+        <SqlServerFileVersion>$(SqlServerVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</SqlServerFileVersion>
+      </PropertyGroup>
+    </When>
+
+    <Otherwise>
+      <!--
+        When a build number or package number are not provided, the build is expected to be a pre-
+        release version. In this case, a suffix is appended to the default version, and 0 is used
+        for the build number in the file version. This is meant to be used by developers that
+        want a quick build without supplying any parameters.
+      -->
+      <PropertyGroup>
+        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
+
+        <SqlServerPackageVersion>$(SqlServerVersionDefault)-$(BuildSuffix)</SqlServerPackageVersion>
+        <SqlServerFileVersion>$(SqlServerVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</SqlServerFileVersion>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <!--
+    Finally, we take the file version and break off the major version to determine the assembly
+    version.
+
+    IMPORTANT: This must always be major.0.0.0 for assembly-level backwards compatibility.
+  -->
+  <PropertyGroup>
+    <SqlServerAssemblyVersion>$(SqlServerFileVersion.Split('.')[0]).0.0.0</SqlServerAssemblyVersion>
+  </PropertyGroup>
+</Project>
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
deleted file mode 100644
index f2132677c9..0000000000
--- a/tools/props/Versions.props
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Common Package Properties -->
-  <PropertyGroup>
-    <BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
-    <!--
-      Build numbers from CI pipelines may be in format "XXXXX.YY".
-      Extract just the first part before any decimal point for use in
-      assembly version components (which must be 16-bit unsigned integers).
-    -->
-    <AssemblyBuildNumber>$(BuildNumber.Split('.')[0])</AssemblyBuildNumber>
-  </PropertyGroup>
-
-  <!-- SqlServer Package Properties -->
-  <PropertyGroup>
-    <!-- This version section corresponds to version info of Microsoft.SqlServer.Server Assembly. -->
-    <!-- Should only be changed in future when a non-backwards compatible driver is released. -->
-    <!-- Future Assembly Version values shall be Major.Minor.0.0; e.g. 1.0.0.0 -->
-    <SqlServerAssemblyVersion>1.0.0.0</SqlServerAssemblyVersion>
-    <SqlServerAssemblyFileVersion Condition="'$(SqlServerAssemblyFileVersion)' == ''">1.0.0.0</SqlServerAssemblyFileVersion>
-    <SqlServerPackageVersion Condition="'$(SqlServerPackageVersion)' == ''">1.0.0.$(AssemblyBuildNumber)-dev</SqlServerPackageVersion>
-    <SqlServerVersion>$(SqlServerPackageVersion)</SqlServerVersion>
-  </PropertyGroup>
-
-  <!-- Abstractions Package Properties -->
-  <Import Project="..\..\src\Microsoft.Data.SqlClient.Extensions\Abstractions\src\AbstractionsVersions.props" />
-
-  <!-- Logging Package Properties -->
-  <Import Project="..\..\src\Microsoft.Data.SqlClient.Internal\Logging\src\LoggingVersions.props" />
-
-  <!-- For MDS Versioning, see src/Microsoft.Data.SqlClient/MdsVersions.props -->
-
-  <!-- Azure Package Properties -->
-  <Import Project="..\..\src\Microsoft.Data.SqlClient.Extensions\Azure\src\AzureVersions.props" />
-
-  <!-- AKV Provider Package Properties -->
-  <Import Project="..\..\src\Microsoft.Data.SqlClient\add-ons\AzureKeyVaultProvider\AkvProviderVersions.props" />
-</Project>
diff --git a/tools/targets/GenerateThisAssemblyCs.targets b/tools/targets/GenerateThisAssemblyCs.targets
index 8632d80dc4..6ed66d74ed 100644
--- a/tools/targets/GenerateThisAssemblyCs.targets
+++ b/tools/targets/GenerateThisAssemblyCs.targets
@@ -11,8 +11,8 @@
       <!-- If an AssemblyFileVersion was provided, use that. Otherwise, use the FileVersion -->
       <AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">$(FileVersion)</AssemblyFileVersion>
 
-      <!-- Put the ThisAssembly class in the System namespace by default. -->
-      <ThisAssemblyNamespace Condition="'$(ThisAssemblyNamespace)' == ''">System</ThisAssemblyNamespace>
+      <!-- Put the ThisAssembly class in the assembly's name namespace by default. -->
+      <ThisAssemblyNamespace Condition="'$(ThisAssemblyNamespace)' == ''">$(AssemblyName)</ThisAssemblyNamespace>
 
       <ThisAssemblyCsContents>
 // Licensed to the .NET Foundation under one or more agreements.

From 771b16cd95018814e15d6decaa3e68f0a8575eef Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Mon, 27 Apr 2026 23:03:51 -0500
Subject: [PATCH 069/298] [v7.1.0-preview1] Release Notes and vBump (#4241)

* vbumpo

* :robot: Release notes and updates to related agent stuff
---
 .../instructions/architecture.instructions.md |  15 +-
 .github/instructions/testing.instructions.md  |  20 +-
 .../skills/generate-mstest-filter/SKILL.md    |   2 +-
 CHANGELOG.md                                  |  67 +++++-
 .../libraries/ci-build-variables.yml          |   2 +-
 .../onebranch/variables/package-variables.yml |   6 +-
 release-notes/7.1/7.1.0-preview1.md           | 193 ++++++++++++++++++
 release-notes/7.1/README.md                   |   7 +
 release-notes/README.md                       |   1 +
 src/Microsoft.Data.SqlClient/Versions.props   |   2 +-
 10 files changed, 291 insertions(+), 24 deletions(-)
 create mode 100644 release-notes/7.1/7.1.0-preview1.md
 create mode 100644 release-notes/7.1/README.md

diff --git a/.github/instructions/architecture.instructions.md b/.github/instructions/architecture.instructions.md
index 3314babb7c..e1578592fe 100644
--- a/.github/instructions/architecture.instructions.md
+++ b/.github/instructions/architecture.instructions.md
@@ -34,10 +34,11 @@ src/
 ## Unified Project Model
 
 ### Architecture Goal
-The driver is transitioning away from separate `netfx/` and `netcore/` project files toward a **single unified project** at `src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj`. This project multi-targets all supported frameworks from one codebase:
+The driver is transitioning away from separate `netfx/` and `netcore/` project files toward a **single unified project** at `src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj`. This project targets the modern .NET TFMs on every host and conditionally adds .NET Framework on Windows:
 
 ```xml
-<TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
+<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+<TargetFrameworks Condition="'$(NormalizedTargetOs)' == 'windows_nt'">$(TargetFrameworks);net462</TargetFrameworks>
 ```
 
 **All new code MUST go into `src/Microsoft.Data.SqlClient/src/`**. Do NOT add files to the legacy `netcore/src/` or `netfx/src/` directories.
@@ -82,7 +83,7 @@ When writing code that differs by platform, use these preprocessor directives:
 | `#if _UNIX` | Code for Unix/Linux/macOS OS (any framework) |
 
 Guidelines:
-1. All code must compile for all target frameworks (`net462`, `net8.0`, `net9.0`)
+1. All code must compile for the TFMs supported by the current target OS: `net8.0`/`net9.0` everywhere, plus `net462` on Windows builds
 2. Use `#if NETFRAMEWORK` or `#if NET` for framework-specific code paths
 3. Use `#if _WINDOWS` or `#if _UNIX` for OS-specific code paths
 4. Avoid APIs that don't exist on a target platform without conditional compilation
@@ -104,11 +105,15 @@ The `ref/` directories define the public API surface:
 **IMPORTANT**: Any public API changes MUST update the corresponding reference assembly in the appropriate `ref/` directory.
 
 ### Build Output
-Build artifacts are organized by framework and OS:
+Build artifacts are organized by reference mode, configuration, OS, and framework:
 ```
-artifacts/Microsoft.Data.SqlClient/{Configuration}/{TargetOs}/{TargetFramework}/
+artifacts/Microsoft.Data.SqlClient/{ReferenceType}-{Configuration}/{NormalizedTargetOs}/{TargetFramework}/
 ```
 
+`ReferenceType` is a first-class build dimension in this branch. Local and CI builds may run in:
+- `Project` mode — sibling packages referenced as projects
+- `Package` mode — sibling packages restored from locally produced NuGet packages
+
 ## SNI (SQL Server Network Interface) Layer
 
 Two implementations exist:
diff --git a/.github/instructions/testing.instructions.md b/.github/instructions/testing.instructions.md
index 4f651a7104..b5e7d28479 100644
--- a/.github/instructions/testing.instructions.md
+++ b/.github/instructions/testing.instructions.md
@@ -9,6 +9,8 @@ applyTo: "**/tests/**,**/*Test*.cs"
 src/Microsoft.Data.SqlClient/tests/
 ├── FunctionalTests/          # Tests without SQL Server dependency
 ├── ManualTests/              # Integration tests requiring SQL Server
+├── PerformanceTests/         # Benchmark-style perf validation
+├── StressTests/              # Long-running stress coverage
 ├── UnitTests/                # Unit tests with minimal dependencies
 └── tools/
     └── Microsoft.Data.SqlClient.TestUtilities/
@@ -109,11 +111,11 @@ public async Task OpenAsync_TimingDependent_MayFail() { ... }
 All test runs use `--blame-hang-timeout 10m` to kill tests that hang for more than 10 minutes. This is configured in `build.proj` and applied to all test targets. If a test is expected to run longer than 10 minutes, it must be restructured or split.
 
 ### Test Filter Configuration
-The default test filter is defined in `build.proj`:
+The default test filter is defined in `build.proj` via `TestFilters`:
 ```xml
-<FilterStatement Condition="'$(FilterStatement)' == ''">category!=failing&amp;category!=flaky</FilterStatement>
+<TestFilters Condition="'$(TestFilters)' == ''">category!=failing&amp;category!=flaky&amp;category!=interactive</TestFilters>
 ```
-This can be overridden via MSBuild property: `msbuild -p:FilterStatement="your_filter"`.
+This can be overridden via MSBuild property: `msbuild build.proj -t:TestSqlClientUnit -p:TestFilters="your_filter"`.
 
 ### Test Attributes
 ```csharp
@@ -140,16 +142,16 @@ public void TestIntermittentlyFails() { ... }
 ### Using MSBuild (Recommended)
 ```bash
 # Build and run all unit tests
-msbuild -t:RunUnitTests
+msbuild build.proj -t:TestSqlClientUnit
 
 # Run functional tests only
-msbuild -t:RunFunctionalTests
+msbuild build.proj -t:TestSqlClientFunctional
 
 # Run manual tests for specific framework
-msbuild -t:RunManualTests -p:TF=net8.0
+msbuild build.proj -t:TestSqlClientManual -p:TestFramework=net8.0
 
 # Run specific test set
-msbuild -t:RunManualTests -p:TestSet=1
+msbuild build.proj -t:TestSqlClientManual -p:TestSet=1
 ```
 
 ### Using dotnet CLI
@@ -159,7 +161,7 @@ dotnet test "src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClie
   -p:Configuration=Release
 
 # Functional tests with filter (excludes failing, flaky, and interactive tests)
-dotnet test "src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj" \
+dotnet test "src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj" \
   --filter "category!=failing&category!=flaky&category!=interactive"
 
 # Run ONLY quarantined flaky tests (for investigation)
@@ -323,7 +325,7 @@ AssertExtensions.ThrowsContains<SqlException>(() => action(), "expected message"
 
 ### Running with Coverage
 ```bash
-msbuild -t:RunTests -p:CollectCoverage=true
+msbuild build.proj -t:TestSqlClientUnit -p:TestCodeCoverage=true
 ```
 
 ### Coverage Targets
diff --git a/.github/skills/generate-mstest-filter/SKILL.md b/.github/skills/generate-mstest-filter/SKILL.md
index 8441823347..3d2039259b 100644
--- a/.github/skills/generate-mstest-filter/SKILL.md
+++ b/.github/skills/generate-mstest-filter/SKILL.md
@@ -187,7 +187,7 @@ dotnet test <project.csproj> --list-tests --filter "<your-filter>" --framework <
 
 ```bash
 # Generate filter for "ChannelDbConnectionPoolTest" class
-dotnet test tests/UnitTests/UnitTests.csproj --list-tests --filter "FullyQualifiedName~ChannelDbConnectionPoolTest" --framework net9.0
+dotnet test src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj --list-tests --filter "FullyQualifiedName~ChannelDbConnectionPoolTest" --framework net9.0
 
 # Expected output shows matching tests:
 # The following Tests are available:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c73574f086..a4682ab2cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,65 @@ 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).
 
+## [Preview Release 7.1.0-preview1] - 2026-04-29
+
+This update brings the following changes since the [7.0.0](release-notes/7.0/7.0.0.md) release.
+See the [full release notes](release-notes/7.1/7.1.0-preview1.md) for detailed descriptions.
+
+### Added
+
+- Added `SqlBatch` support on .NET Framework so the batching API is available across the full supported platform matrix.
+  ([#3926](https://github.com/dotnet/SqlClient/pull/3926))
+
+- Added additional accepted connection-string synonyms for cross-driver alignment, including `ColumnEncryption`, `ConnectTimeout`, `FailoverPartner`, `PacketSize`, and `WorkstationId`.
+  ([#4192](https://github.com/dotnet/SqlClient/pull/4192))
+
+### Changed
+
+- `SqlConnection.ClearPool` and `SqlConnection.ClearAllPools` now work correctly with the channel-based pool implementation.
+  ([#4194](https://github.com/dotnet/SqlClient/pull/4194))
+
+- Added type forwards for public authentication abstractions moved into `Microsoft.Data.SqlClient.Extensions.Abstractions`.
+  ([#4067](https://github.com/dotnet/SqlClient/pull/4067),
+   [#4117](https://github.com/dotnet/SqlClient/pull/4117))
+
+- Enabled the User Agent feature extension by default.
+  ([#4124](https://github.com/dotnet/SqlClient/pull/4124),
+   [#4154](https://github.com/dotnet/SqlClient/pull/4154))
+
+- Reduced allocations when sending large string values, plus related source-build and packaging consolidation updates.
+  ([#4072](https://github.com/dotnet/SqlClient/pull/4072),
+   [#4033](https://github.com/dotnet/SqlClient/pull/4033),
+   [#4068](https://github.com/dotnet/SqlClient/pull/4068),
+   [#4204](https://github.com/dotnet/SqlClient/pull/4204))
+
+### Fixed
+
+- Fixed `SqlBulkCopy` on SQL Server 2016 graph tables by extracting graph metadata with dynamic SQL.
+  ([#3714](https://github.com/dotnet/SqlClient/issues/3714),
+   [#4092](https://github.com/dotnet/SqlClient/pull/4092),
+   [#4147](https://github.com/dotnet/SqlClient/pull/4147))
+
+- Fixed `SqlBulkCopy` support for Azure Synapse Analytics dedicated SQL pools.
+  ([#4149](https://github.com/dotnet/SqlClient/issues/4149),
+   [#4176](https://github.com/dotnet/SqlClient/pull/4176),
+   [#4182](https://github.com/dotnet/SqlClient/pull/4182))
+
+- Fixed vector float32 metadata so `GetFieldType()` and `GetProviderSpecificFieldType()` return the expected vector type.
+  ([#4104](https://github.com/dotnet/SqlClient/issues/4104),
+   [#4105](https://github.com/dotnet/SqlClient/pull/4105),
+   [#4152](https://github.com/dotnet/SqlClient/pull/4152))
+
+- Added the missing `System.Data.Common` dependency for .NET Framework consumers.
+  ([#4063](https://github.com/dotnet/SqlClient/pull/4063),
+   [#4074](https://github.com/dotnet/SqlClient/pull/4074))
+
+- Fixed a `SqlDataReader` streaming bug triggered by calling `IsDBNull()` before reading streamed column data.
+  ([#4082](https://github.com/dotnet/SqlClient/pull/4082))
+
+- Fixed a `NullReferenceException` in `SqlDataReader`.
+  ([#4159](https://github.com/dotnet/SqlClient/pull/4159))
+
 ## [Stable Release 7.0.1] - 2026-04-23
 
 This update brings the following changes since the [7.0.0](release-notes/7.0/7.0.0.md) release.
@@ -480,7 +539,7 @@ This update brings the following changes over the previous preview release:
 
 *What Changed:*
 
-- Updated pipelines and test suites to compile the driver using the .NET 10 SDK. Cleaned up unnecessary dependency references. 
+- Updated pipelines and test suites to compile the driver using the .NET 10 SDK. Cleaned up unnecessary dependency references.
   ([#3686](https://github.com/dotnet/SqlClient/pull/3686))
 
 *Who Benefits:*
@@ -687,7 +746,7 @@ This update brings the following changes since [7.0.0-preview1.25257.1]
 
 #### Other changes
 
-- Improve performance in `SqlStatistics` by using `Environment.TickCount` for calculating execution timing 
+- Improve performance in `SqlStatistics` by using `Environment.TickCount` for calculating execution timing
   ([#3609](https://github.com/dotnet/SqlClient/pull/3609))
 
 - Improve performance in Always Encrypted scenarios by using lower-allocation primitives
@@ -1359,7 +1418,7 @@ This update brings the below changes over the previous release:
 - Added support for Georgian collation [#2194](https://github.com/dotnet/SqlClient/pull/2194)
 - Added Localization support on .NET [#2210](https://github.com/dotnet/SqlClient/pull/2110)
 - Added .NET 8 support [#2230](https://github.com/dotnet/SqlClient/pull/2230)
-- Added explicit version for major .NET version dependencies on System.Runtime.Caching 8.0.0, System.Configuration.ConfigurationManager 8.0.0, and System.Diagnostics. 
+- Added explicit version for major .NET version dependencies on System.Runtime.Caching 8.0.0, System.Configuration.ConfigurationManager 8.0.0, and System.Diagnostics.
 - DiagnosticSource 8.0.0 [#2303](https://github.com/dotnet/SqlClient/pull/2303)
 
 ### Fixed
@@ -1597,7 +1656,7 @@ This update brings the below changes over the previous release:
 
 - Moved to new System.Data.SqlTypes APIs in **.NET 7** and upper. [1934](https://github.com/dotnet/SqlClient/pull/1934) and [#1981](https://github.com/dotnet/SqlClient/pull/1981)
 - Changed **[UseOneSecFloorInTimeoutCalculationDuringLogin](https://learn.microsoft.com/sql/connect/ado-net/appcontext-switches#enable-a-minimum-timeout-during-login)** App Context switch default to **true** and extended its effect to .NET and .NET Standard. [#2012](https://github.com/dotnet/SqlClient/pull/2012)
-- Updated `Microsoft.Identity.Client` version from 4.47.2 to 4.53.0. [#2031](https://github.com/dotnet/SqlClient/pull/2031), [#2055](https://github.com/dotnet/SqlClient/pull/2055) 
+- Updated `Microsoft.Identity.Client` version from 4.47.2 to 4.53.0. [#2031](https://github.com/dotnet/SqlClient/pull/2031), [#2055](https://github.com/dotnet/SqlClient/pull/2055)
 - Code health improvement: [#1985](https://github.com/dotnet/SqlClient/pull/1985)
 
 ## [Stable Release 2.1.6] - 2023-04-27
diff --git a/eng/pipelines/libraries/ci-build-variables.yml b/eng/pipelines/libraries/ci-build-variables.yml
index 6d39d085b7..142e5e21fe 100644
--- a/eng/pipelines/libraries/ci-build-variables.yml
+++ b/eng/pipelines/libraries/ci-build-variables.yml
@@ -59,7 +59,7 @@ variables:
   #    package version and build an assembly version from it. If the build number is included
   #    before the "-" the build number will be appended again, generating an invalid file version.
   - name: mdsPackageVersion
-    value: 7.0.0-ci$(AssemblyBuildNumber)
+    value: 7.1.0-preview1ci$(AssemblyBuildNumber)
 
   # SqlServer library NuGet package version
   # NOTE: SqlServer's version props derive file version from the package version by appending the
diff --git a/eng/pipelines/onebranch/variables/package-variables.yml b/eng/pipelines/onebranch/variables/package-variables.yml
index b1466b06b9..0a84bc3a70 100644
--- a/eng/pipelines/onebranch/variables/package-variables.yml
+++ b/eng/pipelines/onebranch/variables/package-variables.yml
@@ -113,13 +113,13 @@ variables:
     value: 'drop_build_dependent_build_package_SqlClient'
 
   - name: sqlClientFileVersion
-    value: '7.0.0.$(_assemblyBuildNumber)'
+    value: '7.1.0.$(_assemblyBuildNumber)'
 
   - name: sqlClientPackageVersion
     ${{ if parameters.isPreview }}:
-      value: '7.0.0-preview4.$(Build.BuildNumber)'
+      value: '7.1.0-preview1.$(Build.BuildNumber)'
     ${{ else }}:
-      value: '7.0.0'
+      value: '7.1.0'
 
   # ------------------------------------------------------------------------
   # SqlServer Package
diff --git a/release-notes/7.1/7.1.0-preview1.md b/release-notes/7.1/7.1.0-preview1.md
new file mode 100644
index 0000000000..beb95c6a7b
--- /dev/null
+++ b/release-notes/7.1/7.1.0-preview1.md
@@ -0,0 +1,193 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview1 - 2026-04-29
+
+This update brings the following changes since the [7.0.0](../7.0/7.0.0.md) release:
+
+### Added
+
+#### `SqlBatch` Support on .NET Framework
+
+*What Changed:*
+
+- Added `SqlBatch` and related batch-command support for the .NET Framework target so the batching API is now available across the full supported platform matrix, including `net462`.
+  ([#3926](https://github.com/dotnet/SqlClient/pull/3926))
+
+*Who Benefits:*
+
+- Applications that target .NET Framework but also want to use the newer batching APIs no longer need a separate implementation strategy from .NET 8/9 applications.
+- Libraries that multi-target .NET Framework and modern .NET can use a more consistent data-access surface area.
+
+*Impact:*
+
+- `SqlBatch`, `SqlBatchCommand`, and the related execution methods are now usable on .NET Framework builds in addition to .NET.
+
+#### Cross-Driver Connection-String Synonym Alignment
+
+*What Changed:*
+
+- Added additional accepted connection-string synonyms for better compatibility with other SQL Server drivers and existing connection-string conventions. Newly accepted synonyms include `ColumnEncryption`, `ConnectTimeout`, `FailoverPartner`, `PacketSize`, and `WorkstationId`.
+  ([#4192](https://github.com/dotnet/SqlClient/pull/4192))
+
+*Who Benefits:*
+
+- Applications migrating connection strings from other SQL Server drivers or shared infrastructure can reuse more existing keywords without rewriting them first.
+
+*Impact:*
+
+- Existing canonical keywords continue to work unchanged; this preview simply accepts more equivalent aliases during parsing.
+
+### Changed
+
+#### Connection Pool Clearing Now Works With Pool v2 (Experimental)
+
+*What Changed:*
+
+- Implemented the channel-based pool clear path so `SqlConnection.ClearPool(SqlConnection)` and `SqlConnection.ClearAllPools()` now work correctly when the newer pool v2 implementation is active.
+  ([#4194](https://github.com/dotnet/SqlClient/pull/4194))
+
+*Who Benefits:*
+
+- Applications that rely on pool clearing after failover, credential rotation, or server-side configuration changes now get the same semantics regardless of which internal pool implementation is active.
+
+*Impact:*
+
+- Idle pooled connections are closed immediately during a clear operation, while in-use connections are invalidated and discarded when returned to the pool.
+
+*Please Note:* Connection Pooling v2 is still experiemental.
+
+#### Type Forwards for Authentication Abstractions
+
+*What Changed:*
+
+- Added type forwards from the core `Microsoft.Data.SqlClient` assembly to public authentication-related types that were moved into `Microsoft.Data.SqlClient.Extensions.Abstractions`, including `SqlAuthenticationMethod`, `SqlAuthenticationParameters`, `SqlAuthenticationProvider`, `SqlAuthenticationProviderException`, and `SqlAuthenticationToken`.
+  ([#4067](https://github.com/dotnet/SqlClient/pull/4067),
+   [#4117](https://github.com/dotnet/SqlClient/pull/4117))
+
+*Who Benefits:*
+
+- Applications and libraries compiled against earlier package layouts retain binary compatibility when those authentication types are resolved from the core assembly name.
+
+*Impact:*
+
+- No application code changes are required; the type forwards preserve existing compiled references.
+
+#### User Agent Feature Extension Enabled by Default
+
+*What Changed:*
+
+- Enabled the User Agent TDS feature extension by default and removed the opt-in requirement to toggle it through `Switch.Microsoft.Data.SqlClient.EnableUserAgent`.
+  ([#4124](https://github.com/dotnet/SqlClient/pull/4124),
+   [#4154](https://github.com/dotnet/SqlClient/pull/4154))
+
+*Who Benefits:*
+
+- Operators and diagnostic tooling gain more consistent client-identification metadata during connection establishment without extra application configuration.
+
+*Impact:*
+
+- User-agent metadata is now always sent during login. Applications that previously enabled the switch explicitly can remove that configuration with no functional loss.
+
+#### Other changes
+
+- Reduced allocations when sending large string values to SQL Server.
+  ([#4072](https://github.com/dotnet/SqlClient/pull/4072))
+
+- Internal source-build and packaging consolidation updates:
+  ([#4033](https://github.com/dotnet/SqlClient/pull/4033),
+   [#4068](https://github.com/dotnet/SqlClient/pull/4068),
+   [#4204](https://github.com/dotnet/SqlClient/pull/4204))
+
+### Fixed
+
+- Fixed `SqlBulkCopy` failing on SQL Server 2016 with `Invalid column name 'graph_type'` by extracting graph-column metadata with dynamic SQL instead of referencing the column directly.
+  ([#3714](https://github.com/dotnet/SqlClient/issues/3714),
+   [#4092](https://github.com/dotnet/SqlClient/pull/4092),
+   [#4147](https://github.com/dotnet/SqlClient/pull/4147))
+
+- Fixed `SqlBulkCopy` support for Azure Synapse Analytics dedicated SQL pools by using a Synapse-compatible column-list query path.
+  ([#4149](https://github.com/dotnet/SqlClient/issues/4149),
+   [#4176](https://github.com/dotnet/SqlClient/pull/4176),
+   [#4182](https://github.com/dotnet/SqlClient/pull/4182))
+
+- Fixed `SqlDataReader.GetFieldType()` and `GetProviderSpecificFieldType()` to return `SqlVector<float>` metadata for vector float32 columns instead of `byte[]`.
+  ([#4104](https://github.com/dotnet/SqlClient/issues/4104),
+   [#4105](https://github.com/dotnet/SqlClient/pull/4105),
+   [#4152](https://github.com/dotnet/SqlClient/pull/4152))
+
+- Added the missing `System.Data.Common` NuGet dependency for .NET Framework consumers to avoid `CS0012` compile failures against newer ADO.NET surface area.
+  ([#4063](https://github.com/dotnet/SqlClient/pull/4063),
+   [#4074](https://github.com/dotnet/SqlClient/pull/4074))
+
+- Fixed a `SqlDataReader` streaming bug where calling `IsDBNull()` before reading a streamed value could skip column data.
+  ([#4082](https://github.com/dotnet/SqlClient/pull/4082))
+
+- Fixed a `NullReferenceException` in `SqlDataReader` during specific reader state transitions.
+  ([#4159](https://github.com/dotnet/SqlClient/pull/4159))
+
+## Target Platform Support
+
+- .NET Framework 4.6.2+ (Windows x86, Windows x64, Windows ARM64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM, Windows ARM64, Linux, macOS)
+
+### Dependencies
+
+#### .NET 9.0
+
+- Microsoft.Bcl.Cryptography 9.0.13
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 9.0.13
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.13
+- System.Security.Cryptography.Pkcs 9.0.13
+
+#### .NET 8.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+
+#### .NET Standard 2.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+
+#### .NET Framework 4.6.2+
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 1.0.0
+- Microsoft.Data.SqlClient.Internal.Logging 1.0.0
+- Microsoft.Data.SqlClient.SNI 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- System.Buffers 4.6.1
+- System.Data.Common 4.3.0
+- System.Diagnostics.DiagnosticSource 10.0.3
+- System.Memory 4.6.3
+- System.Runtime.InteropServices.RuntimeInformation 4.3.0
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+- System.ValueTuple 4.6.2
diff --git a/release-notes/7.1/README.md b/release-notes/7.1/README.md
new file mode 100644
index 0000000000..7bb05b1a70
--- /dev/null
+++ b/release-notes/7.1/README.md
@@ -0,0 +1,7 @@
+# Microsoft.Data.SqlClient 7.1 Releases
+
+The following Microsoft.Data.SqlClient 7.1 releases have been shipped:
+
+| Release Date | Version        |               Notes                |
+|:-------------|:---------------|:----------------------------------:|
+| 2026-04-29   | 7.1.0-preview1 | [Release Notes](7.1.0-preview1.md) |
diff --git a/release-notes/README.md b/release-notes/README.md
index a511a589bc..f75cc4dfb9 100644
--- a/release-notes/README.md
+++ b/release-notes/README.md
@@ -4,6 +4,7 @@ The latest stable release is [Microsoft.Data.SqlClient 7.0](7.0).
 
 ## Release Information
 
+- [Microsoft.Data.SqlClient 7.1](7.1)
 - [Microsoft.Data.SqlClient 7.0](7.0)
 - [Microsoft.Data.SqlClient 6.1](6.1)
 - [Microsoft.Data.SqlClient 6.0](6.0)
diff --git a/src/Microsoft.Data.SqlClient/Versions.props b/src/Microsoft.Data.SqlClient/Versions.props
index ea6b557467..5ec3b8b9ac 100644
--- a/src/Microsoft.Data.SqlClient/Versions.props
+++ b/src/Microsoft.Data.SqlClient/Versions.props
@@ -19,7 +19,7 @@
       This is the *next* version to release of SqlClient. Update this after a version is released.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <SqlClientVersionDefault>7.0.0</SqlClientVersionDefault>
+    <SqlClientVersionDefault>7.1.0-preview1</SqlClientVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->

From 407db24f97edf9298159a7ea5a277a2d07b3e08e Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 28 Apr 2026 07:55:41 -0300
Subject: [PATCH 070/298] Write release notes for 6.1.5 (#4169)

---
 CHANGELOG.md                | 17 ++++++-
 release-notes/6.1/6.1.5.md  | 88 +++++++++++++++++++++++++++++++++++++
 release-notes/6.1/README.md |  1 +
 3 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 release-notes/6.1/6.1.5.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4682ab2cb..f5fd80d19e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,6 @@ 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/)
 
-
 > **Note:** Releases are sorted in reverse chronological order (newest first).
 
 ## [Preview Release 7.1.0-preview1] - 2026-04-29
@@ -66,6 +65,22 @@ See the [full release notes](release-notes/7.1/7.1.0-preview1.md) for detailed d
 - Fixed a `NullReferenceException` in `SqlDataReader`.
   ([#4159](https://github.com/dotnet/SqlClient/pull/4159))
 
+## [Stable Release 6.1.5] - 2026-04-27
+
+This update brings the following changes since the [6.1.4](release-notes/6.1/6.1.4.md) release.
+See the [full release notes](release-notes/6.1/6.1.5.md) for target platform support and dependency information.
+
+### Fixed
+
+- Fixed a connection performance regression where SPN (Service Principal Name) generation was triggered for non-integrated authentication modes (e.g., SQL authentication) on the native SNI path, causing unnecessary DNS lookups and significantly slower connection times.
+  ([#3523](https://github.com/dotnet/SqlClient/issues/3523), [#3946](https://github.com/dotnet/SqlClient/pull/3946))
+
+- Fixed `ExecuteScalar` to properly propagate errors when the server sends data followed by an error token. Previously, errors such as conversion failures during `WHERE` clause evaluation were silently consumed during `SqlDataReader.Close()` instead of being thrown to the caller, which could result in transactions being unexpectedly zombied.
+  ([#3736](https://github.com/dotnet/SqlClient/issues/3736), [#3947](https://github.com/dotnet/SqlClient/pull/3947))
+
+- Fixed `SqlDataReader.GetFieldType` and `SqlDataReader.GetProviderSpecificFieldType` to return the correct type (`SqlVector<float>`) for vector float32 columns.
+  ([#4104](https://github.com/dotnet/SqlClient/issues/4104), [#4151](https://github.com/dotnet/SqlClient/pull/4151))
+
 ## [Stable Release 7.0.1] - 2026-04-23
 
 This update brings the following changes since the [7.0.0](release-notes/7.0/7.0.0.md) release.
diff --git a/release-notes/6.1/6.1.5.md b/release-notes/6.1/6.1.5.md
new file mode 100644
index 0000000000..5241f68a58
--- /dev/null
+++ b/release-notes/6.1/6.1.5.md
@@ -0,0 +1,88 @@
+# Release Notes
+
+## Stable Release 6.1.5 - 2026-04-27
+
+This update brings the following changes since the [6.1.4](6.1.4.md) release:
+
+### Fixed
+
+- Fixed a connection performance regression where SPN (Service Principal Name) generation was triggered for non-integrated authentication modes (e.g., SQL authentication) on the native SNI path, causing unnecessary DNS lookups and significantly slower connection times.
+  ([#3523](https://github.com/dotnet/SqlClient/issues/3523), [#3946](https://github.com/dotnet/SqlClient/pull/3946))
+
+- Fixed `ExecuteScalar` to properly propagate errors when the server sends data followed by an error token. Previously, errors such as conversion failures during `WHERE` clause evaluation were silently consumed during `SqlDataReader.Close()` instead of being thrown to the caller, which could result in transactions being unexpectedly zombied.
+  ([#3736](https://github.com/dotnet/SqlClient/issues/3736), [#3947](https://github.com/dotnet/SqlClient/pull/3947))
+
+- Fixed `SqlDataReader.GetFieldType` and `SqlDataReader.GetProviderSpecificFieldType` to return the correct type (`SqlVector<float>`) for vector float32 columns. Previously, these methods did not follow the same type-resolution logic as `GetValue`, returning an incorrect type for vector columns.
+  ([#4104](https://github.com/dotnet/SqlClient/issues/4104), [#4151](https://github.com/dotnet/SqlClient/pull/4151))
+
+## Target Platform Support
+
+- .NET Framework 4.6.2+ (Windows x86, Windows x64, Windows ARM64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM64, Linux, macOS)
+- .NET Standard 2.0+ (Windows x86, Windows x64, Windows ARM64, Linux, macOS)
+
+### Dependencies
+
+#### .NET Framework 4.6.2
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.80.0
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- System.Buffers 4.6.1
+- System.Data.Common 4.3.0
+- System.Diagnostics.DiagnosticSource 8.0.1
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Memory 4.6.3
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 8.0.6
+- System.Text.RegularExpressions 4.3.1
+
+#### .NET 8.0
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.80.0
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Diagnostics.DiagnosticSource 8.0.1
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Security.Cryptography.Pkcs 8.0.1
+
+#### .NET 9.0
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 9.0.11
+- Microsoft.Identity.Client 4.80.0
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.11
+- System.Diagnostics.DiagnosticSource 9.0.11
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Security.Cryptography.Pkcs 9.0.11
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.80.0
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Diagnostics.DiagnosticSource 8.0.1
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 8.0.6
diff --git a/release-notes/6.1/README.md b/release-notes/6.1/README.md
index b068a545cc..ed5770b672 100644
--- a/release-notes/6.1/README.md
+++ b/release-notes/6.1/README.md
@@ -4,6 +4,7 @@ The following Microsoft.Data.SqlClient 6.1 stable releases have been shipped:
 
 | Release Date | Version | Notes |
 | :-- | :-- | :--: |
+| 2026-04-27 | 6.1.5 | [Release Notes](6.1.5.md) |
 | 2026-01-15 | 6.1.4 | [Release Notes](6.1.4.md) |
 | 2025-11-12 | 6.1.3 | [Release Notes](6.1.3.md) |
 | 2025-10-07 | 6.1.2 | [Release Notes](6.1.2.md) |

From 86324fd11c1800d7a6e8e97edffdca869f984235 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Tue, 28 Apr 2026 21:00:28 +1000
Subject: [PATCH 071/298] Avoid redundant array alloc when
 TryReadSqlValueInternal for SQLVECTOR (#4156)

---
 .../src/Microsoft/Data/SqlClient/TdsParser.cs                  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 2d1807e7b5..29352c5460 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -7447,8 +7447,7 @@ internal TdsOperationStatus TryReadSqlValueInternal(SqlBuffer value, byte tdsTyp
                     {
                         // Note: Better not come here with plp data!!
                         Debug.Assert(length <= TdsEnums.MAXSIZE);
-                        byte[] b = new byte[length];
-                        result = stateObj.TryReadByteArrayWithContinue(length, isPlp: false, out b);
+                        result = stateObj.TryReadByteArrayWithContinue(length, isPlp: false, out byte[] b);
                         if (result != TdsOperationStatus.Done)
                         {
                             return result;

From 3af6e09257eedd607f445c5647cf62550bb8aee9 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Tue, 28 Apr 2026 14:34:18 -0500
Subject: [PATCH 072/298] Add glob to ESRP search pattern (#4245)

---
 eng/pipelines/onebranch/jobs/build-buildproj-job.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index c700a57701..7f12caaee4 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -155,7 +155,7 @@ jobs:
               authSignCertName: '${{ parameters.signingAuthSignCertName }}'
               esrpClientId: '${{ parameters.signingEsrpClientId }}'
               esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              pattern: '${{ parameters.packageFullName }}.dll'
+              pattern: '**/${{ parameters.packageFullName }}.dll'
 
       # Copy signed/unsigned DLLs and PDBs to APIScan folders.
       - task: CopyFiles@2

From f5942fd51f1ac2578cf286bd66eff1ad09222471 Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Wed, 29 Apr 2026 14:14:15 +0530
Subject: [PATCH 073/298] Add float16 vector backward compatibility tests and
 refactor float32 vectors as varchar(max) test suite. (#4234)

This commit refactors test suite for testing float32 vectors as varchar(max).
Adds testcases for testing float16 vectors as varchar(max).
Avoids test duplication and use RAII classes.
---
 .../ManualTests/DataCommon/DataTestUtility.cs |  63 ++
 ...icrosoft.Data.SqlClient.ManualTests.csproj |   2 +
 ...t16VectorTypeBackwardCompatibilityTests.cs | 106 +++
 .../VectorBackwardCompatTestBase.cs           | 464 +++++++++++++
 .../VectorTypeBackwardCompatibilityTests.cs   | 638 ++----------------
 5 files changed, 698 insertions(+), 575 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/Float16VectorTypeBackwardCompatibilityTests.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorBackwardCompatTestBase.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index 0145978d72..b66c72774e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -95,6 +95,7 @@ public static class DataTestUtility
         // SQL Server capabilities
         private static bool? s_isDataClassificationSupported;
         private static bool? s_isVectorSupported;
+        private static bool? s_isVectorFloat16Supported;
 
         // Azure Synapse EngineEditionId == 6
         // More could be read at https://learn.microsoft.com/en-us/sql/t-sql/functions/serverproperty-transact-sql?view=sql-server-ver16#propertyname
@@ -156,6 +157,68 @@ public static string SQLServerVersion
             s_isVectorSupported ??= IsTCPConnStringSetup() &&
                 IsTypePresent("vector");
 
+        /// <summary>
+        /// Determines whether the SQL Server supports the 'float16' base type for the 'vector' data type.
+        /// </summary>
+        /// <remarks>
+        /// Probes the server by first executing
+        /// <c>ALTER DATABASE SCOPED CONFIGURATION SET PREVIEW_FEATURES = ON;</c> and then executing
+        /// <c>DECLARE @v AS VECTOR(5, float16) = '[1.0, 1.0, 1.0, 1.0, 1.0]'; SELECT @v;</c>.
+        /// As a side effect, this enables preview features for the current database. If the server does not
+        /// recognize <c>float16</c> as a vector base type, if the server does not support the required syntax,
+        /// if the current principal lacks permission to change the database scoped configuration, or if another
+        /// server-side error occurs while running the probe, this method returns
+        /// <see langword="false"/>. Implies <see cref="IsSqlVectorSupported"/>.
+        /// </remarks>
+        /// <returns><see langword="true"/> if the 'float16' vector base type is supported; otherwise, <see langword="false"/>.</returns>
+        public static bool IsSqlVectorFloat16Supported =>
+            s_isVectorFloat16Supported ??= IsTCPConnStringSetup() &&
+                IsSqlVectorSupported &&
+                CheckVectorFloat16Supported();
+
+        private static bool CheckVectorFloat16Supported()
+        {
+            try
+            {
+                using SqlConnection connection = new(TCPConnectionString);
+                // Enable preview features (required while float16 is in preview), then declare a
+                // float16 vector and select it back. Without a negotiated float16 feature extension,
+                // the server returns the value as a varchar(max) JSON string, which the client can
+                // safely read. We use 1.0 (exactly representable in IEEE-754 binary16) so the
+                // round-tripped JSON matches the input bit-for-bit. Any failure (server parse
+                // error such as Msg 195 "'float16' is not a recognized vector base type.", lack of
+                // permission to set PREVIEW_FEATURES, etc.) means we cannot exercise the float16
+                // path.
+                float[] expected = { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f };
+                using SqlCommand command = new(
+                    "ALTER DATABASE SCOPED CONFIGURATION SET PREVIEW_FEATURES = ON;" +
+                    "DECLARE @v AS VECTOR(5, float16) = '[1.0, 1.0, 1.0, 1.0, 1.0]'; SELECT @v;",
+                    connection);
+                connection.Open();
+                using SqlDataReader reader = command.ExecuteReader();
+                if (!reader.Read())
+                {
+                    return false;
+                }
+                string json = reader.GetString(0);
+                float[] actual = System.Text.Json.JsonSerializer.Deserialize<float[]>(json);
+                return actual != null && actual.Length == expected.Length
+                    && actual.AsSpan().SequenceEqual(expected);
+            }
+            catch (SqlException)
+            {
+                // Server-side failure (e.g. Msg 195 "'float16' is not a recognized vector base
+                // type.", Msg 102 syntax errors on older servers, lack of permission to set
+                // PREVIEW_FEATURES) — float16 path is unavailable.
+                return false;
+            }
+            catch (System.Text.Json.JsonException)
+            {
+                // Server returned a payload we can't parse as a float[] JSON array.
+                return false;
+            }
+        }
+
         static DataTestUtility()
         {
             Config c = Config.Load();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 1c1553e6c1..cf7bbf236a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -243,8 +243,10 @@
     <Compile Include="SQL\UdtTest\UdtTest2.cs" />
     <Compile Include="SQL\UdtTest\UdtTestHelpers.cs" />
     <Compile Include="SQL\Utf8SupportTest\Utf8SupportTest.cs" />
+    <Compile Include="SQL\VectorTest\Float16VectorTypeBackwardCompatibilityTests.cs" />
     <Compile Include="SQL\VectorTest\NativeVectorFloat32Tests.cs" />
     <Compile Include="SQL\VectorTest\VectorAPIValidationTest.cs" />
+    <Compile Include="SQL\VectorTest\VectorBackwardCompatTestBase.cs" />
     <Compile Include="SQL\VectorTest\VectorTypeBackwardCompatibilityTests.cs" />
     <Compile Include="SQL\WeakRefTest\WeakRefTest.cs" />
     <Compile Include="SQL\WeakRefTestYukonSpecific\WeakRefTestYukonSpecific.cs" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/Float16VectorTypeBackwardCompatibilityTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/Float16VectorTypeBackwardCompatibilityTests.cs
new file mode 100644
index 0000000000..2ea6a10ab8
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/Float16VectorTypeBackwardCompatibilityTests.cs
@@ -0,0 +1,106 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.VectorTest
+{
+    /// <summary>
+    /// Provides parameterized test data for backward compatibility tests that exchange
+    /// float16 vector data as varchar(max) JSON strings.
+    /// </summary>
+    public static class Float16VarcharVectorTestData
+    {
+        // Values chosen to be exactly representable in IEEE-754 binary16 (float16),
+        // so JSON round-trips through a vector(N, float16) column without precision loss.
+        public static readonly float[] TestData = { 1.0f, 2.0f, 3.0f };
+
+        /// <summary>
+        /// Generates test cases for all 4 SqlParameter construction patterns x 2 value types (non-null + null).
+        /// Each case yields: [int pattern, string jsonOrNull, float[] expectedData]
+        /// where jsonOrNull is null when testing DBNull insertion.
+        /// </summary>
+        public static IEnumerable<object[]> GetVarcharVectorInsertTestData()
+        {
+            string json = JsonSerializer.Serialize(TestData);
+
+            // Pattern 1-4 with non-null JSON value
+            yield return new object[] { 1, json, TestData };
+            yield return new object[] { 2, json, TestData };
+            yield return new object[] { 3, json, TestData };
+            yield return new object[] { 4, json, TestData };
+
+            // Pattern 1-4 with null value
+            yield return new object[] { 1, null, null };
+            yield return new object[] { 2, null, null };
+            yield return new object[] { 3, null, null };
+            yield return new object[] { 4, null, null };
+        }
+    }
+
+    public sealed class Float16VectorTypeBackwardCompatibilityTests : VectorBackwardCompatTestBase
+    {
+        public Float16VectorTypeBackwardCompatibilityTests(ITestOutputHelper output)
+            : base(output, columnDefinition: "vector(3, float16)", namePrefix: "VectorF16")
+        {
+        }
+
+        protected override float[] GetPrepareTestValues(int i) =>
+            new float[] { i + 1, i + 2, i + 3 };
+
+        #region Insert Tests
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorFloat16Supported))]
+        [MemberData(nameof(Float16VarcharVectorTestData.GetVarcharVectorInsertTestData), MemberType = typeof(Float16VarcharVectorTestData), DisableDiscoveryEnumeration = true)]
+        public void TestVectorDataInsertionAsVarchar(int pattern, string jsonValue, float[] expectedData)
+            => InsertAndValidateAsVarchar(pattern, jsonValue, expectedData);
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorFloat16Supported))]
+        [MemberData(nameof(Float16VarcharVectorTestData.GetVarcharVectorInsertTestData), MemberType = typeof(Float16VarcharVectorTestData), DisableDiscoveryEnumeration = true)]
+        public async Task TestVectorDataInsertionAsVarcharAsync(int pattern, string jsonValue, float[] expectedData)
+            => await InsertAndValidateAsVarcharAsync(pattern, jsonValue, expectedData);
+
+        #endregion
+
+        #region Stored Procedure Tests
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorFloat16Supported))]
+        public void TestStoredProcParamsForVectorAsVarchar()
+            => StoredProcRoundTrip(Float16VarcharVectorTestData.TestData);
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorFloat16Supported))]
+        public async Task TestStoredProcParamsForVectorAsVarcharAsync()
+            => await StoredProcRoundTripAsync(Float16VarcharVectorTestData.TestData);
+
+        #endregion
+
+        #region Bulk Copy Tests
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorFloat16Supported))]
+        [InlineData(1)]
+        [InlineData(2)]
+        public void TestSqlBulkCopyForVectorAsVarchar(int bulkCopySourceMode)
+            => BulkCopyRoundTrip(bulkCopySourceMode, Float16VarcharVectorTestData.TestData);
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorFloat16Supported))]
+        [InlineData(1)]
+        [InlineData(2)]
+        public async Task TestSqlBulkCopyForVectorAsVarcharAsync(int bulkCopySourceMode)
+            => await BulkCopyRoundTripAsync(bulkCopySourceMode, Float16VarcharVectorTestData.TestData);
+
+        #endregion
+
+        #region Prepared Statement Tests
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorFloat16Supported))]
+        public void TestInsertVectorsAsVarcharWithPrepare()
+            => PreparedInsertRoundTrip();
+
+        #endregion
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorBackwardCompatTestBase.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorBackwardCompatTestBase.cs
new file mode 100644
index 0000000000..1b2d4c792f
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorBackwardCompatTestBase.cs
@@ -0,0 +1,464 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data;
+using System.Data.SqlTypes;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.VectorTest
+{
+    /// <summary>
+    /// Abstract base class for vector backward compatibility tests that exchange
+    /// vector data as varchar(max) JSON strings. Eliminates duplication between
+    /// float32 and float16 test classes while allowing each to specify its own
+    /// ConditionalFact/ConditionalTheory predicates.
+    /// </summary>
+    public abstract class VectorBackwardCompatTestBase : IDisposable
+    {
+        private static readonly string s_connectionString = DataTestUtility.TCPConnectionString;
+        private static readonly string s_vectorParamName = "@VectorData";
+
+        private readonly SqlConnection _connection;
+        private readonly Table _vectorTable;
+        private readonly Table _bulkCopySrcTable;
+        private readonly StoredProcedure _storedProc;
+
+        private readonly string _selectCmdString;
+        private readonly string _insertCmdString;
+
+        protected ITestOutputHelper Output { get; }
+
+        /// <summary>
+        /// Generates the test data values to use with Prepare tests.
+        /// Float32 uses fractional values (e.g. i+0.1f), float16 uses whole numbers (e.g. i+1).
+        /// </summary>
+        protected abstract float[] GetPrepareTestValues(int i);
+
+        protected VectorBackwardCompatTestBase(
+            ITestOutputHelper output,
+            string columnDefinition,
+            string namePrefix)
+        {
+            Output = output;
+            _connection = new SqlConnection(s_connectionString);
+            _connection.Open();
+
+            _vectorTable = new Table(_connection, namePrefix + "TestTable",
+                $"(Id INT PRIMARY KEY IDENTITY, VectorData {columnDefinition} NULL)");
+
+            _bulkCopySrcTable = new Table(_connection, namePrefix + "BulkCopyTestTable",
+                "(Id INT PRIMARY KEY IDENTITY, VectorData varchar(max) NULL)");
+
+            string storedProcBody = $@"
+                @InputVectorJson VARCHAR(MAX),   -- Input: Serialized float[] as JSON string
+                @OutputVectorJson VARCHAR(MAX) OUTPUT  -- Output: Echoed back from latest inserted row
+                AS
+                BEGIN
+                SET NOCOUNT ON;
+
+                -- Insert into vector table
+                INSERT INTO {_vectorTable.Name} (VectorData)
+                VALUES (@InputVectorJson);
+
+                -- Retrieve latest entry (assumes auto-incrementing ID)
+                SELECT TOP 1 @OutputVectorJson = VectorData
+                FROM {_vectorTable.Name}
+                ORDER BY Id DESC;
+                END;";
+
+            _storedProc = new StoredProcedure(_connection, namePrefix + "AsVarcharSp", storedProcBody);
+
+            _selectCmdString = $"SELECT VectorData FROM {_vectorTable.Name} ORDER BY Id DESC";
+            _insertCmdString = $"INSERT INTO {_vectorTable.Name} (VectorData) VALUES (@VectorData)";
+        }
+
+        public void Dispose()
+        {
+            // RAII objects drop themselves on Dispose in reverse order.
+            _storedProc?.Dispose();
+            _bulkCopySrcTable?.Dispose();
+            _vectorTable?.Dispose();
+            _connection?.Dispose();
+        }
+
+        #region Shared Helpers
+
+        /// <summary>
+        /// Creates a SqlParameter with varchar(max) type based on the specified pattern.
+        /// Mirrors the 4 parameter construction patterns tested in NativeVectorFloat32Tests
+        /// but uses SqlDbType.VarChar instead of SqlDbTypeExtensions.Vector.
+        /// </summary>
+        private static SqlParameter CreateVarcharParameter(int pattern, string jsonValue)
+        {
+            object value = jsonValue != null ? (object)jsonValue : DBNull.Value;
+
+            return pattern switch
+            {
+                // Pattern 1: Default constructor + property setters
+                1 => new SqlParameter
+                {
+                    ParameterName = s_vectorParamName,
+                    SqlDbType = SqlDbType.VarChar,
+                    Size = -1, // varchar(max)
+                    Value = value
+                },
+                // Pattern 2: Name + value constructor
+                2 => new SqlParameter(s_vectorParamName, value),
+                // Pattern 3: Name + SqlDbType constructor
+                3 => new SqlParameter(s_vectorParamName, SqlDbType.VarChar) { Value = value },
+                // Pattern 4: Name + SqlDbType + Size constructor
+                4 => new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = value },
+                _ => throw new ArgumentOutOfRangeException(nameof(pattern), $"Unsupported pattern: {pattern}")
+            };
+        }
+
+        private void ValidateInsertedData(SqlConnection connection, float[] expectedData)
+        {
+            using var selectCmd = new SqlCommand(_selectCmdString, connection);
+            using var reader = selectCmd.ExecuteReader();
+            Assert.True(reader.Read(), "No data found in the table.");
+
+            if (expectedData != null)
+            {
+                // Validate non-null data through all string read APIs
+                string result = reader.GetString(0);
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(result));
+
+                result = reader.GetSqlString(0).Value;
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(result));
+
+                result = reader.GetFieldValue<string>(0);
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(result));
+            }
+            else
+            {
+                Assert.True(reader.IsDBNull(0), "Expected null but got non-null value.");
+                Assert.Equal(DBNull.Value, reader.GetValue(0));
+                Assert.Throws<SqlNullValueException>(() => reader.GetString(0));
+                Assert.Throws<SqlNullValueException>(() => reader.GetSqlString(0).Value);
+                Assert.Throws<SqlNullValueException>(() => reader.GetFieldValue<string>(0));
+            }
+        }
+
+        private async Task ValidateInsertedDataAsync(SqlConnection connection, float[] expectedData)
+        {
+            using var selectCmd = new SqlCommand(_selectCmdString, connection);
+            using var reader = await selectCmd.ExecuteReaderAsync();
+            Assert.True(await reader.ReadAsync(), "No data found in the table.");
+
+            if (expectedData != null)
+            {
+                // Validate non-null data through all string read APIs
+                string result = reader.GetString(0);
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(result));
+
+                result = reader.GetSqlString(0).Value;
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(result));
+
+                result = await reader.GetFieldValueAsync<string>(0);
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(result));
+            }
+            else
+            {
+                Assert.True(await reader.IsDBNullAsync(0), "Expected null but got non-null value.");
+                Assert.Equal(DBNull.Value, reader.GetValue(0));
+                Assert.Throws<SqlNullValueException>(() => reader.GetString(0));
+                Assert.Throws<SqlNullValueException>(() => reader.GetSqlString(0).Value);
+                await Assert.ThrowsAsync<SqlNullValueException>(async () => await reader.GetFieldValueAsync<string>(0));
+            }
+        }
+
+        #endregion
+
+        #region Test Implementations
+
+        protected void InsertAndValidateAsVarchar(int pattern, string jsonValue, float[] expectedData)
+        {
+            using var conn = new SqlConnection(s_connectionString);
+            conn.Open();
+
+            using var insertCmd = new SqlCommand(_insertCmdString, conn);
+            SqlParameter param = CreateVarcharParameter(pattern, jsonValue);
+            insertCmd.Parameters.Add(param);
+            Assert.Equal(1, insertCmd.ExecuteNonQuery());
+            insertCmd.Parameters.Clear();
+
+            ValidateInsertedData(conn, expectedData);
+        }
+
+        protected async Task InsertAndValidateAsVarcharAsync(int pattern, string jsonValue, float[] expectedData)
+        {
+            using var conn = new SqlConnection(s_connectionString);
+            await conn.OpenAsync();
+
+            using var insertCmd = new SqlCommand(_insertCmdString, conn);
+            SqlParameter param = CreateVarcharParameter(pattern, jsonValue);
+            insertCmd.Parameters.Add(param);
+            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
+            insertCmd.Parameters.Clear();
+
+            await ValidateInsertedDataAsync(conn, expectedData);
+        }
+
+        protected void StoredProcRoundTrip(float[] data)
+        {
+            string dataAsJson = JsonSerializer.Serialize(data);
+
+            using var conn = new SqlConnection(s_connectionString);
+            conn.Open();
+
+            using var command = new SqlCommand(_storedProc.Name, conn)
+            {
+                CommandType = CommandType.StoredProcedure
+            };
+
+            // Test with non-null value
+            var inputParam = new SqlParameter("@InputVectorJson", SqlDbType.VarChar, -1) { Value = dataAsJson };
+            command.Parameters.Add(inputParam);
+            var outputParam = new SqlParameter("@OutputVectorJson", SqlDbType.VarChar, -1)
+            {
+                Direction = ParameterDirection.Output
+            };
+            command.Parameters.Add(outputParam);
+
+            command.ExecuteNonQuery();
+
+            var dbDataAsJson = outputParam.Value as string;
+            Assert.NotNull(dbDataAsJson);
+            Assert.Equal(data, JsonSerializer.Deserialize<float[]>(dbDataAsJson));
+
+            // Test with null value
+            command.Parameters.Clear();
+            inputParam.Value = DBNull.Value;
+            command.Parameters.Add(inputParam);
+            command.Parameters.Add(outputParam);
+            command.ExecuteNonQuery();
+
+            Assert.Equal(DBNull.Value, outputParam.Value);
+        }
+
+        protected async Task StoredProcRoundTripAsync(float[] data)
+        {
+            string dataAsJson = JsonSerializer.Serialize(data);
+
+            using var conn = new SqlConnection(s_connectionString);
+            await conn.OpenAsync();
+
+            using var command = new SqlCommand(_storedProc.Name, conn)
+            {
+                CommandType = CommandType.StoredProcedure
+            };
+
+            // Test with non-null value
+            var inputParam = new SqlParameter("@InputVectorJson", SqlDbType.VarChar, -1) { Value = dataAsJson };
+            command.Parameters.Add(inputParam);
+            var outputParam = new SqlParameter("@OutputVectorJson", SqlDbType.VarChar, -1)
+            {
+                Direction = ParameterDirection.Output
+            };
+            command.Parameters.Add(outputParam);
+
+            await command.ExecuteNonQueryAsync();
+
+            var dbDataAsJson = outputParam.Value as string;
+            Assert.NotNull(dbDataAsJson);
+            Assert.Equal(data, JsonSerializer.Deserialize<float[]>(dbDataAsJson));
+
+            // Test with null value
+            command.Parameters.Clear();
+            inputParam.Value = DBNull.Value;
+            command.Parameters.Add(inputParam);
+            command.Parameters.Add(outputParam);
+
+            await command.ExecuteNonQueryAsync();
+
+            Assert.Equal(DBNull.Value, outputParam.Value);
+        }
+
+        protected void BulkCopyRoundTrip(int bulkCopySourceMode, float[] testData)
+        {
+            string testDataAsJson = JsonSerializer.Serialize(testData);
+
+            using var sourceConnection = new SqlConnection(s_connectionString);
+            sourceConnection.Open();
+            using var destinationConnection = new SqlConnection(s_connectionString);
+            destinationConnection.Open();
+
+            DataTable table = null;
+            switch (bulkCopySourceMode)
+            {
+                case 1:
+                    // Use SQL Server table as source with varchar(max) data
+                    using (var insertCmd = new SqlCommand($"insert into {_bulkCopySrcTable.Name} values (@VectorData)", sourceConnection))
+                    {
+                        var varcharVectorParam = new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = testDataAsJson };
+                        insertCmd.Parameters.Add(varcharVectorParam);
+                        Assert.Equal(1, insertCmd.ExecuteNonQuery());
+                        insertCmd.Parameters.Clear();
+                        varcharVectorParam.Value = DBNull.Value;
+                        insertCmd.Parameters.Add(varcharVectorParam);
+                        Assert.Equal(1, insertCmd.ExecuteNonQuery());
+                    }
+                    break;
+                case 2:
+                    // Use DataTable as source
+                    table = new DataTable(_bulkCopySrcTable.Name);
+                    table.Columns.Add("Id", typeof(int));
+                    table.Columns.Add("VectorData", typeof(string));
+                    table.Rows.Add(1, testDataAsJson);
+                    table.Rows.Add(2, DBNull.Value);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(bulkCopySourceMode), $"Unsupported bulk copy source mode: {bulkCopySourceMode}");
+            }
+
+            // Verify that the destination table is empty before bulk copy
+            using SqlCommand countCommand = new SqlCommand($"SELECT COUNT(*) FROM {_vectorTable.Name}", destinationConnection);
+            Assert.Equal(0, Convert.ToInt16(countCommand.ExecuteScalar()));
+
+            // Initialize bulk copy configuration
+            using SqlBulkCopy bulkCopy = new SqlBulkCopy(destinationConnection)
+            {
+                DestinationTableName = _vectorTable.Name,
+            };
+
+            switch (bulkCopySourceMode)
+            {
+                case 1:
+                    using (SqlCommand sourceDataCommand = new SqlCommand($"SELECT Id, VectorData FROM {_bulkCopySrcTable.Name}", sourceConnection))
+                    using (SqlDataReader reader = sourceDataCommand.ExecuteReader())
+                    {
+                        bulkCopy.WriteToServer(reader);
+                    }
+                    break;
+                case 2:
+                    bulkCopy.WriteToServer(table);
+                    break;
+            }
+
+            // Verify that 2 rows were copied
+            Assert.Equal(2, Convert.ToInt16(countCommand.ExecuteScalar()));
+
+            // Read data from destination table and verify
+            using SqlCommand verifyCommand = new SqlCommand($"SELECT VectorData from {_vectorTable.Name}", destinationConnection);
+            using SqlDataReader verifyReader = verifyCommand.ExecuteReader();
+
+            Assert.True(verifyReader.Read(), "No data found in destination table after bulk copy.");
+            Assert.False(verifyReader.IsDBNull(0), "First row in the table is null.");
+            Assert.Equal(testData, JsonSerializer.Deserialize<float[]>(verifyReader.GetString(0)));
+
+            Assert.True(verifyReader.Read(), "Second row not found in the table");
+            Assert.True(verifyReader.IsDBNull(0));
+        }
+
+        protected async Task BulkCopyRoundTripAsync(int bulkCopySourceMode, float[] testData)
+        {
+            string testDataAsJson = JsonSerializer.Serialize(testData);
+
+            using var sourceConnection = new SqlConnection(s_connectionString);
+            await sourceConnection.OpenAsync();
+            using var destinationConnection = new SqlConnection(s_connectionString);
+            await destinationConnection.OpenAsync();
+
+            DataTable table = null;
+            switch (bulkCopySourceMode)
+            {
+                case 1:
+                    // Use SQL Server table as source with varchar(max) data
+                    using (var insertCmd = new SqlCommand($"insert into {_bulkCopySrcTable.Name} values (@VectorData)", sourceConnection))
+                    {
+                        var varcharVectorParam = new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = testDataAsJson };
+                        insertCmd.Parameters.Add(varcharVectorParam);
+                        Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
+                        insertCmd.Parameters.Clear();
+                        varcharVectorParam.Value = DBNull.Value;
+                        insertCmd.Parameters.Add(varcharVectorParam);
+                        Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
+                    }
+                    break;
+                case 2:
+                    // Use DataTable as source
+                    table = new DataTable(_bulkCopySrcTable.Name);
+                    table.Columns.Add("Id", typeof(int));
+                    table.Columns.Add("VectorData", typeof(string));
+                    table.Rows.Add(1, testDataAsJson);
+                    table.Rows.Add(2, DBNull.Value);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(bulkCopySourceMode), $"Unsupported bulk copy source mode: {bulkCopySourceMode}");
+            }
+
+            // Verify that the destination table is empty before bulk copy
+            using SqlCommand countCommand = new SqlCommand($"SELECT COUNT(*) FROM {_vectorTable.Name}", destinationConnection);
+            Assert.Equal(0, Convert.ToInt16(await countCommand.ExecuteScalarAsync()));
+
+            // Initialize bulk copy configuration
+            using SqlBulkCopy bulkCopy = new SqlBulkCopy(destinationConnection)
+            {
+                DestinationTableName = _vectorTable.Name,
+            };
+
+            switch (bulkCopySourceMode)
+            {
+                case 1:
+                    using (SqlCommand sourceDataCommand = new SqlCommand($"SELECT Id, VectorData FROM {_bulkCopySrcTable.Name}", sourceConnection))
+                    using (SqlDataReader reader = await sourceDataCommand.ExecuteReaderAsync())
+                    {
+                        await bulkCopy.WriteToServerAsync(reader);
+                    }
+                    break;
+                case 2:
+                    await bulkCopy.WriteToServerAsync(table);
+                    break;
+            }
+
+            // Verify that 2 rows were copied
+            Assert.Equal(2, Convert.ToInt16(await countCommand.ExecuteScalarAsync()));
+
+            // Read data from destination table and verify
+            using SqlCommand verifyCommand = new SqlCommand($"SELECT VectorData from {_vectorTable.Name}", destinationConnection);
+            using SqlDataReader verifyReader = await verifyCommand.ExecuteReaderAsync();
+
+            Assert.True(await verifyReader.ReadAsync(), "No data found in destination table after bulk copy.");
+            Assert.False(verifyReader.IsDBNull(0), "First row in the table is null.");
+            Assert.Equal(testData, JsonSerializer.Deserialize<float[]>(verifyReader.GetString(0)));
+
+            Assert.True(await verifyReader.ReadAsync(), "Second row not found in the table");
+            Assert.True(await verifyReader.IsDBNullAsync(0));
+        }
+
+        protected void PreparedInsertRoundTrip()
+        {
+            using SqlConnection conn = new SqlConnection(s_connectionString);
+            conn.Open();
+            using SqlCommand command = new SqlCommand(_insertCmdString, conn);
+            SqlParameter vectorParam = new SqlParameter("@VectorData", SqlDbType.VarChar, -1);
+            command.Parameters.Add(vectorParam);
+            command.Prepare();
+            for (int i = 0; i < 10; i++)
+            {
+                vectorParam.Value = JsonSerializer.Serialize(GetPrepareTestValues(i));
+                command.ExecuteNonQuery();
+            }
+            using SqlCommand validateCommand = new SqlCommand($"SELECT VectorData FROM {_vectorTable.Name}", conn);
+            using SqlDataReader reader = validateCommand.ExecuteReader();
+            int rowcnt = 0;
+            while (reader.Read())
+            {
+                float[] expectedData = GetPrepareTestValues(rowcnt);
+                float[] dbData = JsonSerializer.Deserialize<float[]>(reader.GetString(0))!;
+                Assert.Equal(expectedData, dbData);
+                rowcnt++;
+            }
+            Assert.Equal(10, rowcnt);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs
index b3f42a5617..9db91d767f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs
@@ -2,10 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlTypes;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Xunit;
@@ -13,604 +10,95 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.VectorTest
 {
-    public sealed class VectorTypeBackwardCompatibilityTests : IDisposable
+    /// <summary>
+    /// Provides parameterized test data for backward compatibility tests that exchange
+    /// vector data as varchar(max) JSON strings.
+    /// </summary>
+    public static class VarcharVectorTestData
     {
-        private readonly ITestOutputHelper _output;
-        private static readonly string s_connectionString = ManualTesting.Tests.DataTestUtility.TCPConnectionString;
-        private static readonly string s_tableName = DataTestUtility.GetShortName("VectorTestTable");
-        private static readonly string s_bulkCopySrcTableName = DataTestUtility.GetShortName("VectorBulkCopyTestTable");
-        private static readonly string s_bulkCopySrcTableDef = $@"(Id INT PRIMARY KEY IDENTITY, VectorData varchar(max) NULL)";
-        private static readonly string s_tableDefinition = $@"(Id INT PRIMARY KEY IDENTITY, VectorData vector(3) NULL)";
-        private static readonly string s_selectCmdString = $"SELECT VectorData FROM {s_tableName} ORDER BY Id DESC";
-        private static readonly string s_insertCmdString = $"INSERT INTO {s_tableName} (VectorData) VALUES (@VectorData)";
-        private static readonly string s_vectorParamName = $"@VectorData";
-        private static readonly string s_storedProcName = DataTestUtility.GetShortName("VectorsAsVarcharSp");
-        private static readonly string s_storedProcBody = $@"
-                @InputVectorJson VARCHAR(MAX),   -- Input: Serialized float[] as JSON string
-                @OutputVectorJson VARCHAR(MAX) OUTPUT  -- Output: Echoed back from latest inserted row
-                AS
-                BEGIN
-                SET NOCOUNT ON;
-
-                -- Insert into vector table
-                INSERT INTO {s_tableName} (VectorData)
-                VALUES (@InputVectorJson);
-
-                -- Retrieve latest entry (assumes auto-incrementing ID)
-                SELECT TOP 1 @OutputVectorJson = VectorData
-                FROM {s_tableName}
-                ORDER BY Id DESC;
-                END;";
-
-        public VectorTypeBackwardCompatibilityTests(ITestOutputHelper output)
-        {
-            _output = output;
-            using var connection = new SqlConnection(s_connectionString);
-            connection.Open();
-            DataTestUtility.CreateTable(connection, s_tableName, s_tableDefinition);
-            DataTestUtility.CreateTable(connection, s_bulkCopySrcTableName, s_bulkCopySrcTableDef);
-            DataTestUtility.CreateSP(connection, s_storedProcName, s_storedProcBody);
-        }
-
-        public void Dispose()
-        {
-            using var connection = new SqlConnection(s_connectionString);
-            connection.Open();
-            DataTestUtility.DropTable(connection, s_tableName);
-            DataTestUtility.DropTable(connection, s_bulkCopySrcTableName);
-            DataTestUtility.DropStoredProcedure(connection, s_storedProcName);
-        }
-
-        private void ValidateInsertedData(SqlConnection connection, float[] expectedData)
-        {
-            using var selectCmd = new SqlCommand(s_selectCmdString, connection);
-            using var reader = selectCmd.ExecuteReader();
-            Assert.True(reader.Read(), "No data found in the table.");
-
-            if (!reader.IsDBNull(0))
-            {
-                string jsonFromDb = reader.GetString(0);
-                float[] deserialized = JsonSerializer.Deserialize<float[]>(jsonFromDb)!;
-                Assert.Equal(expectedData, deserialized);
-            }
-            else
-            {
-                Assert.Null(expectedData);
-                var val = reader.GetValue(0);
-                Assert.Equal(DBNull.Value, val);
-            }
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
-        public void TestVectorDataInsertionAsVarchar()
+        public static readonly float[] TestData = { 1.1f, 2.2f, 3.3f };
+
+        /// <summary>
+        /// Generates test cases for all 4 SqlParameter construction patterns x 2 value types (non-null + null).
+        /// Each case yields: [int pattern, string jsonOrNull, float[] expectedData]
+        /// where jsonOrNull is null when testing DBNull insertion.
+        /// </summary>
+        public static IEnumerable<object[]> GetVarcharVectorInsertTestData()
         {
-            float[] data = { 1.1f, 2.2f, 3.3f };
-            string json = JsonSerializer.Serialize(data);
-
-            using var conn = new SqlConnection(s_connectionString);
-            conn.Open();
-
-            using var insertCmd = new SqlCommand(s_insertCmdString, conn);
-
-            // Pattern 1: Default constructor + property setters
-            var p1 = new SqlParameter();
-            p1.ParameterName = s_vectorParamName;
-            p1.SqlDbType = SqlDbType.VarChar;
-            p1.Size = -1; //varchar(max)
-            p1.Value = json;
-            insertCmd.Parameters.Add(p1);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-            insertCmd.Parameters.Clear();
-            ValidateInsertedData(conn, data);
-
-            var nullp1 = new SqlParameter();
-            nullp1.ParameterName = s_vectorParamName;
-            nullp1.SqlDbType = SqlDbType.VarChar;
-            nullp1.Size = -1; //varchar(max)
-            nullp1.Value = DBNull.Value;
-            insertCmd.Parameters.Add(nullp1);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-            insertCmd.Parameters.Clear();
-            ValidateInsertedData(conn, null);
-
-            // Pattern 2: Name + value constructor
-            var p2 = new SqlParameter(s_vectorParamName, json);
-            insertCmd.Parameters.Add(p2);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-            insertCmd.Parameters.Clear();
-            ValidateInsertedData(conn, data);
-
-            var nullp2 = new SqlParameter(s_vectorParamName, DBNull.Value);
-            insertCmd.Parameters.Add(nullp2);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-            insertCmd.Parameters.Clear();
-            ValidateInsertedData(conn, null);
-
-            // Pattern 3: Name + SqlDbType constructor
-            var p3 = new SqlParameter(s_vectorParamName, SqlDbType.VarChar) { Value = json };
-            insertCmd.Parameters.Add(p3);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-            insertCmd.Parameters.Clear();
-            ValidateInsertedData(conn, data);
-
-            var nullp3 = new SqlParameter(s_vectorParamName, SqlDbType.VarChar) { Value = DBNull.Value };
-            insertCmd.Parameters.Add(nullp3);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-            insertCmd.Parameters.Clear();
-            ValidateInsertedData(conn, null);
-
-            // Pattern 4: Name + SqlDbType + Size constructor
-            var p4 = new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = json };
-            insertCmd.Parameters.Add(p4);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-            insertCmd.Parameters.Clear();
-            ValidateInsertedData(conn, data);
-
-            var nullp4 = new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = DBNull.Value };
-            insertCmd.Parameters.Add(nullp4);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-            insertCmd.Parameters.Clear();
-            ValidateInsertedData(conn, null);
-        }
-
-        private async Task ValidateInsertedDataAsync(SqlConnection connection, float[] expectedData)
-        {
-            using var selectCmd = new SqlCommand(s_selectCmdString, connection);
-            using var reader = await selectCmd.ExecuteReaderAsync();
-            Assert.True(await reader.ReadAsync(), "No data found in the table.");
-
-            if (!await reader.IsDBNullAsync(0))
-            {
-                string jsonFromDb = reader.GetString(0);
-                float[] deserialized = JsonSerializer.Deserialize<float[]>(jsonFromDb)!;
-                Assert.Equal(expectedData, deserialized);
-            }
-            else
-            {
-                Assert.Null(expectedData);
-                var val = reader.GetValue(0);
-                Assert.Equal(DBNull.Value, val);
-            }
+            string json = JsonSerializer.Serialize(TestData);
+
+            // Pattern 1-4 with non-null JSON value
+            yield return new object[] { 1, json, TestData };
+            yield return new object[] { 2, json, TestData };
+            yield return new object[] { 3, json, TestData };
+            yield return new object[] { 4, json, TestData };
+
+            // Pattern 1-4 with null value
+            yield return new object[] { 1, null, null };
+            yield return new object[] { 2, null, null };
+            yield return new object[] { 3, null, null };
+            yield return new object[] { 4, null, null };
         }
+    }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
-        public async Task TestVectorParameterInitializationAsync()
+    public sealed class VectorTypeBackwardCompatibilityTests : VectorBackwardCompatTestBase
+    {
+        public VectorTypeBackwardCompatibilityTests(ITestOutputHelper output)
+            : base(output, columnDefinition: "vector(3)", namePrefix: "Vector")
         {
-            float[] data = { 1.1f, 2.2f, 3.3f };
-            string json = JsonSerializer.Serialize(data);
-
-            using var conn = new SqlConnection(s_connectionString);
-            await conn.OpenAsync();
-
-            using var insertCmd = new SqlCommand(s_insertCmdString, conn);
-
-            // Pattern 1: Default constructor + property setters
-            var p1 = new SqlParameter();
-            p1.ParameterName = s_vectorParamName;
-            p1.SqlDbType = SqlDbType.VarChar;
-            p1.Size = -1;
-            p1.Value = json;
-            insertCmd.Parameters.Add(p1);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-            insertCmd.Parameters.Clear();
-            await ValidateInsertedDataAsync(conn, data);
-
-            var nullp1 = new SqlParameter();
-            nullp1.ParameterName = s_vectorParamName;
-            nullp1.SqlDbType = SqlDbType.VarChar;
-            nullp1.Size = -1;
-            nullp1.Value = DBNull.Value;
-            insertCmd.Parameters.Add(nullp1);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-            insertCmd.Parameters.Clear();
-            await ValidateInsertedDataAsync(conn, null);
-
-            // Pattern 2: Name + value constructor
-            var p2 = new SqlParameter(s_vectorParamName, json);
-            insertCmd.Parameters.Add(p2);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-            insertCmd.Parameters.Clear();
-            await ValidateInsertedDataAsync(conn, data);
-
-            var nullp2 = new SqlParameter(s_vectorParamName, DBNull.Value);
-            insertCmd.Parameters.Add(nullp2);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-            insertCmd.Parameters.Clear();
-            await ValidateInsertedDataAsync(conn, null);
-
-            // Pattern 3: Name + SqlDbType constructor
-            var p3 = new SqlParameter(s_vectorParamName, SqlDbType.VarChar) { Value = json };
-            insertCmd.Parameters.Add(p3);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-            insertCmd.Parameters.Clear();
-            await ValidateInsertedDataAsync(conn, data);
-
-            var nullp3 = new SqlParameter(s_vectorParamName, SqlDbType.VarChar) { Value = DBNull.Value };
-            insertCmd.Parameters.Add(nullp3);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-            insertCmd.Parameters.Clear();
-            await ValidateInsertedDataAsync(conn, null);
-
-            // Pattern 4: Name + SqlDbType + Size constructor
-            var p4 = new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = json };
-            insertCmd.Parameters.Add(p4);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-            insertCmd.Parameters.Clear();
-            await ValidateInsertedDataAsync(conn, data);
-
-            var nullp4 = new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = DBNull.Value };
-            insertCmd.Parameters.Add(nullp4);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-            insertCmd.Parameters.Clear();
-            await ValidateInsertedDataAsync(conn, null);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
-        public void TestVectorDataReadsAsVarchar()
-        {
-            float[] data = { 1.1f, 2.2f, 3.3f };
-            string dataAsJson = JsonSerializer.Serialize(data);
-
-            using var conn = new SqlConnection(s_connectionString);
-            conn.Open();
-
-            //Insert non-null values and validate APIs for reading vector data as varchar(max)
-            using var insertCmd = new SqlCommand(s_insertCmdString, conn);
-            var p1 = new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = dataAsJson };
-            insertCmd.Parameters.Add(p1);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-
-            //Validate Reader
-            using SqlCommand verifyCommand = new SqlCommand(s_selectCmdString, conn);
-            var reader = verifyCommand.ExecuteReader();
-            Assert.True(reader.Read(), "No data found in the table.");
-
-            //Read using GetString
-            string result = reader.GetString(0);
-            float[] dbData = JsonSerializer.Deserialize<float[]>(result)!;
-            Assert.Equal(data, dbData);
-
-            //Read using GetSqlString
-            result = reader.GetSqlString(0).Value;
-            dbData = JsonSerializer.Deserialize<float[]>(result)!;
-            Assert.Equal(data, dbData);
+        protected override float[] GetPrepareTestValues(int i) =>
+            new float[] { i + 0.1f, i + 0.2f, i + 0.3f };
 
-            //Read using GetFieldValue<string>
-            result = reader.GetFieldValue<string>(0);
-            dbData = JsonSerializer.Deserialize<float[]>(result)!;
-            Assert.Equal(data, dbData);
+        #region Insert Tests
 
-            reader.Close();
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
+        [MemberData(nameof(VarcharVectorTestData.GetVarcharVectorInsertTestData), MemberType = typeof(VarcharVectorTestData), DisableDiscoveryEnumeration = true)]
+        public void TestVectorDataInsertionAsVarchar(int pattern, string jsonValue, float[] expectedData)
+            => InsertAndValidateAsVarchar(pattern, jsonValue, expectedData);
 
-            // Validate For Null Value
-            insertCmd.Parameters.Clear();
-            p1.Value = DBNull.Value;
-            insertCmd.Parameters.Add(p1);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
+        [MemberData(nameof(VarcharVectorTestData.GetVarcharVectorInsertTestData), MemberType = typeof(VarcharVectorTestData), DisableDiscoveryEnumeration = true)]
+        public async Task TestVectorDataInsertionAsVarcharAsync(int pattern, string jsonValue, float[] expectedData)
+            => await InsertAndValidateAsVarcharAsync(pattern, jsonValue, expectedData);
 
-            //Validate Reader for null value
-            reader = verifyCommand.ExecuteReader();
-            Assert.True(reader.Read(), "No data found in the table.");
+        #endregion
 
-            //Read using GetString
-            Assert.Throws<SqlNullValueException>(() => reader.GetString(0));
-
-            //Read using GetSqlString
-            Assert.Throws<SqlNullValueException>(() => reader.GetString(0));
-
-            //Read using GetFieldValue<string>
-            Assert.Throws<SqlNullValueException>(() => reader.GetFieldValue<string>(0));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
-        public async Task TestVectorDataReadsAsVarcharAsync()
-        {
-            float[] data = { 1.1f, 2.2f, 3.3f };
-            string dataAsJson = JsonSerializer.Serialize(data);
-
-            using var conn = new SqlConnection(s_connectionString);
-            await conn.OpenAsync();
-
-            //Insert non-null values and validate APIs for reading vector data as varchar(max)
-            using var insertCmd = new SqlCommand(s_insertCmdString, conn);
-            var p1 = new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = dataAsJson };
-            insertCmd.Parameters.Add(p1);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-
-            //Validate Reader
-            using SqlCommand verifyCommand = new SqlCommand(s_selectCmdString, conn);
-            using var reader = await verifyCommand.ExecuteReaderAsync();
-            Assert.True(await reader.ReadAsync(), "No data found in the table.");
-
-            //Read using GetString
-            string result = reader.GetString(0);
-            float[] dbData = JsonSerializer.Deserialize<float[]>(result)!;
-            Assert.Equal(data, dbData);
-
-            //Read using GetSqlString
-            result = reader.GetSqlString(0).Value;
-            dbData = JsonSerializer.Deserialize<float[]>(result)!;
-            Assert.Equal(data, dbData);
-
-            //Read using GetFieldValue<string>
-            result = await reader.GetFieldValueAsync<string>(0);
-            dbData = JsonSerializer.Deserialize<float[]>(result)!;
-            Assert.Equal(data, dbData);
-
-            reader.Close();
-
-            // Validate For Null Value
-            insertCmd.Parameters.Clear();
-            p1.Value = DBNull.Value;
-            insertCmd.Parameters.Add(p1);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-
-            //Validate Reader for null value
-            var reader2 = await verifyCommand.ExecuteReaderAsync();
-            Assert.True(await reader2.ReadAsync(), "No data found in the table.");
-
-            //Read using GetString
-            Assert.Throws<SqlNullValueException>(() => reader2.GetString(0));
-
-            //Read using GetSqlString
-            Assert.Throws<SqlNullValueException>(() => reader2.GetString(0));
-
-            //Read using GetFieldValueAsync<string>
-            await Assert.ThrowsAsync<SqlNullValueException>(async () => await reader2.GetFieldValueAsync<string>(0));
-        }
+        #region Stored Procedure Tests
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
         public void TestStoredProcParamsForVectorAsVarchar()
-        {
-            // Test data
-            float[] data = { 7.1f, 8.2f, 9.3f };
-            string dataAsJson = JsonSerializer.Serialize(data);
-
-            //Create SP for test
-            using var conn = new SqlConnection(s_connectionString);
-            conn.Open();
-            DataTestUtility.CreateSP(conn, s_storedProcName, s_storedProcBody);
-            using var command = new SqlCommand(s_storedProcName, conn)
-            {
-                CommandType = CommandType.StoredProcedure
-            };
-
-            // Set input and output parameters
-            var inputParam = new SqlParameter("@InputVectorJson", SqlDbType.VarChar, -1);
-            inputParam.Value = dataAsJson;
-            command.Parameters.Add(inputParam);
-            var outputParam = new SqlParameter("@OutputVectorJson", SqlDbType.VarChar, -1)
-            {
-                Direction = ParameterDirection.Output
-            };
-            command.Parameters.Add(outputParam);
-
-            // Execute the stored procedure
-            command.ExecuteNonQuery();
-
-            // Validate the output parameter
-            var dbDataAsJson = outputParam.Value as string;
-            float[] dbData = JsonSerializer.Deserialize<float[]>(dbDataAsJson)!;
-            Assert.NotNull(dbDataAsJson);
-            Assert.Equal(data, dbData);
-
-            // Test with null value
-            command.Parameters.Clear();
-            inputParam.Value = DBNull.Value;
-            command.Parameters.Add(inputParam);
-            command.Parameters.Add(outputParam);
-            command.ExecuteNonQuery();
-
-            // Validate output paramter for null value
-            Assert.True(outputParam.Value == DBNull.Value);
-        }
+            => StoredProcRoundTrip(VarcharVectorTestData.TestData);
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
         public async Task TestStoredProcParamsForVectorAsVarcharAsync()
-        {
-            // Test data
-            float[] data = { 7.1f, 8.2f, 9.3f };
-            string dataAsJson = JsonSerializer.Serialize(data);
-
-            // Create SP for test
-            using var conn = new SqlConnection(s_connectionString);
-            await conn.OpenAsync();
-            DataTestUtility.CreateSP(conn, s_storedProcName, s_storedProcBody);
-
-            using var command = new SqlCommand(s_storedProcName, conn)
-            {
-                CommandType = CommandType.StoredProcedure
-            };
-
-            // Set input and output parameters
-            var inputParam = new SqlParameter("@InputVectorJson", SqlDbType.VarChar, -1)
-            {
-                Value = dataAsJson
-            };
-            command.Parameters.Add(inputParam);
-
-            var outputParam = new SqlParameter("@OutputVectorJson", SqlDbType.VarChar, -1)
-            {
-                Direction = ParameterDirection.Output
-            };
-            command.Parameters.Add(outputParam);
-
-            // Execute the stored procedure
-            await command.ExecuteNonQueryAsync();
-
-            // Validate the output parameter
-            var dbDataAsJson = outputParam.Value as string;
-            float[] dbData = JsonSerializer.Deserialize<float[]>(dbDataAsJson)!;
-            Assert.NotNull(dbDataAsJson);
-            Assert.Equal(data, dbData);
-
-            // Test with null value
-            command.Parameters.Clear();
-            inputParam.Value = DBNull.Value;
-            command.Parameters.Add(inputParam);
-            command.Parameters.Add(outputParam);
+            => await StoredProcRoundTripAsync(VarcharVectorTestData.TestData);
 
-            await command.ExecuteNonQueryAsync();
+        #endregion
 
-            // Validate output parameter for null value
-            Assert.True(outputParam.Value == DBNull.Value);
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
-        public void TestSqlBulkCopyForVectorAsVarchar()
-        {
-            //Setup source with test data and create destination table for bulkcopy.
-            SqlConnection sourceConnection = new SqlConnection(s_connectionString);
-            sourceConnection.Open();
-            SqlConnection destinationConnection = new SqlConnection(s_connectionString);
-            destinationConnection.Open();
-            float[] testData = { 1.1f, 2.2f, 3.3f };
-            string testDataAsJson = JsonSerializer.Serialize(testData);
-            using var insertCmd = new SqlCommand($"insert into {s_bulkCopySrcTableName} values (@VectorData)", sourceConnection);
-            var varcharVectorParam = new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = testDataAsJson };
-            insertCmd.Parameters.Add(varcharVectorParam);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-            insertCmd.Parameters.Clear();
-            varcharVectorParam.Value = DBNull.Value;
-            insertCmd.Parameters.Add(varcharVectorParam);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-
-            //Bulkcopy from sql server table to destination table
-            using SqlCommand sourceDataCommand = new SqlCommand($"SELECT Id, VectorData FROM {s_bulkCopySrcTableName}", sourceConnection);
-            using SqlDataReader reader = sourceDataCommand.ExecuteReader();
-
-            // Verify that the destination table is empty before bulk copy
-            using SqlCommand countCommand = new SqlCommand($"SELECT COUNT(*) FROM {s_tableName}", destinationConnection);
-            Assert.Equal(0, Convert.ToInt16(countCommand.ExecuteScalar()));
-
-            // Initialize bulk copy configuration
-            using SqlBulkCopy bulkCopy = new SqlBulkCopy(destinationConnection)
-            {
-                DestinationTableName = s_tableName,
-            };
-
-            try
-            {
-                // Perform bulk copy from source to destination table
-                bulkCopy.WriteToServer(reader);
-            }
-            catch (Exception ex)
-            {
-                // If bulk copy fails, fail the test with the exception message
-                Assert.Fail($"Bulk copy failed: {ex.Message}");
-            }
-
-            // Verify that the 2 rows from the source table have been copied into the destination table.
-            Assert.Equal(2, Convert.ToInt16(countCommand.ExecuteScalar()));
-
-            // Read the data from destination table as varbinary to verify the UTF-8 byte sequence
-            using SqlCommand verifyCommand = new SqlCommand($"SELECT VectorData from {s_tableName}", destinationConnection);
-            using SqlDataReader verifyReader = verifyCommand.ExecuteReader();
-
-            // Verify that we have data in the destination table
-            Assert.True(verifyReader.Read(), "No data found in destination table after bulk copy.");
-
-            // Validate first non-null value.
-            Assert.True(!verifyReader.IsDBNull(0), "First row in the table is null.");
-            Assert.Equal(testData, JsonSerializer.Deserialize<float[]>(verifyReader.GetString(0)));
-
-            // Verify that we have another row
-            Assert.True(verifyReader.Read(), "Second row not found in the table");
-
-            // Verify that we have encountered null.
-            Assert.True(verifyReader.IsDBNull(0));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
-        public async Task TestSqlBulkCopyForVectorAsVarcharAsync()
-        {
-            //Setup source with test data and create destination table for bulkcopy.
-            SqlConnection sourceConnection = new SqlConnection(s_connectionString);
-            await sourceConnection.OpenAsync();
-            SqlConnection destinationConnection = new SqlConnection(s_connectionString);
-            await destinationConnection.OpenAsync();
-            float[] testData = { 1.1f, 2.2f, 3.3f };
-            string testDataAsJson = JsonSerializer.Serialize(testData);
-            using var insertCmd = new SqlCommand($"insert into {s_bulkCopySrcTableName} values (@VectorData)", sourceConnection);
-            var varcharVectorParam = new SqlParameter(s_vectorParamName, SqlDbType.VarChar, -1) { Value = testDataAsJson };
-            insertCmd.Parameters.Add(varcharVectorParam);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-            insertCmd.Parameters.Clear();
-            varcharVectorParam.Value = DBNull.Value;
-            insertCmd.Parameters.Add(varcharVectorParam);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-
-            //Bulkcopy from sql server table to destination table
-            using SqlCommand sourceDataCommand = new SqlCommand($"SELECT Id, VectorData FROM {s_bulkCopySrcTableName}", sourceConnection);
-            using SqlDataReader reader = await sourceDataCommand.ExecuteReaderAsync();
-
-            // Verify that the destination table is empty before bulk copy
-            using SqlCommand countCommand = new SqlCommand($"SELECT COUNT(*) FROM {s_tableName}", destinationConnection);
-            Assert.Equal(0, Convert.ToInt16(await countCommand.ExecuteScalarAsync()));
-
-            // Initialize bulk copy configuration
-            using SqlBulkCopy bulkCopy = new SqlBulkCopy(destinationConnection)
-            {
-                DestinationTableName = s_tableName,
-            };
+        #region Bulk Copy Tests
 
-            try
-            {
-                // Perform bulk copy from source to destination table
-                await bulkCopy.WriteToServerAsync(reader);
-            }
-            catch (Exception ex)
-            {
-                // If bulk copy fails, fail the test with the exception message
-                Assert.Fail($"Bulk copy failed: {ex.Message}");
-            }
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
+        [InlineData(1)]
+        [InlineData(2)]
+        public void TestSqlBulkCopyForVectorAsVarchar(int bulkCopySourceMode)
+            => BulkCopyRoundTrip(bulkCopySourceMode, VarcharVectorTestData.TestData);
 
-            // Verify that the 2 rows from the source table have been copied into the destination table.
-            Assert.Equal(2, Convert.ToInt16(await countCommand.ExecuteScalarAsync()));
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
+        [InlineData(1)]
+        [InlineData(2)]
+        public async Task TestSqlBulkCopyForVectorAsVarcharAsync(int bulkCopySourceMode)
+            => await BulkCopyRoundTripAsync(bulkCopySourceMode, VarcharVectorTestData.TestData);
 
-            // Read the data from destination table as varbinary to verify the UTF-8 byte sequence
-            using SqlCommand verifyCommand = new SqlCommand($"SELECT VectorData from {s_tableName}", destinationConnection);
-            using SqlDataReader verifyReader = await verifyCommand.ExecuteReaderAsync();
+        #endregion
 
-            // Verify that we have data in the destination table
-            Assert.True(await verifyReader.ReadAsync(), "No data found in destination table after bulk copy.");
-
-            // Validate first non-null value.
-            Assert.True(!verifyReader.IsDBNull(0), "First row in the table is null.");
-            Assert.Equal(testData, JsonSerializer.Deserialize<float[]>(verifyReader.GetString(0)));
-
-            // Verify that we have another row
-            Assert.True(await verifyReader.ReadAsync(), "Second row not found in the table");
-
-            // Verify that we have encountered null.
-            Assert.True(await verifyReader.IsDBNullAsync(0));
-        }
+        #region Prepared Statement Tests
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSqlVectorSupported))]
         public void TestInsertVectorsAsVarcharWithPrepare()
-        {
-            SqlConnection conn = new SqlConnection(s_connectionString);
-            conn.Open();
-            SqlCommand command = new SqlCommand(s_insertCmdString, conn);
-            SqlParameter vectorParam = new SqlParameter("@VectorData", SqlDbType.VarChar, -1);
-            command.Parameters.Add(vectorParam);
-            command.Prepare();
-            for (int i = 0; i < 10; i++)
-            {
-                vectorParam.Value = JsonSerializer.Serialize<float[]>(new float[] { i + 0.1f, i + 0.2f, i + 0.3f });
-                command.ExecuteNonQuery();
-            }
-            SqlCommand validateCommand = new SqlCommand($"SELECT VectorData FROM {s_tableName}", conn);
-            using SqlDataReader reader = validateCommand.ExecuteReader();
-            int rowcnt = 0;
-            while (reader.Read())
-            {
-                float[] expectedData = new float[] { rowcnt + 0.1f, rowcnt + 0.2f, rowcnt + 0.3f };
-                float[] dbData = JsonSerializer.Deserialize<float[]>(reader.GetString(0))!;
-                Assert.Equal(expectedData, dbData);
-                rowcnt++;
-            }
-            Assert.Equal(10, rowcnt);
-        }
+            => PreparedInsertRoundTrip();
+
+        #endregion
     }
 }

From 061c45bc4610473e67a01b863828e6888279211e Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Wed, 29 Apr 2026 12:39:03 -0500
Subject: [PATCH 074/298] ESRP sign resources files, too (#4248)

---
 eng/pipelines/onebranch/jobs/build-buildproj-job.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index 7f12caaee4..6eda6a3d1c 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -155,7 +155,9 @@ jobs:
               authSignCertName: '${{ parameters.signingAuthSignCertName }}'
               esrpClientId: '${{ parameters.signingEsrpClientId }}'
               esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              pattern: '**/${{ parameters.packageFullName }}.dll'
+              pattern: |
+                **/${{ parameters.packageFullName }}.dll
+                **/${{ parameters.packageFullName }}.resources.dll
 
       # Copy signed/unsigned DLLs and PDBs to APIScan folders.
       - task: CopyFiles@2

From d6e20fc845eb8bdb6ab9ebe0345ddcccb423fbf7 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Wed, 29 Apr 2026 23:20:20 -0500
Subject: [PATCH 075/298] [v7.1.0-preview1] ESRP Nuget Signing Path Fix (#4249)

---
 .../onebranch/jobs/build-buildproj-job.yml          |  4 ++--
 .../onebranch/steps/pack-buildproj-step.yml         | 13 +------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index 6eda6a3d1c..3fa44c3ce6 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -201,8 +201,8 @@ jobs:
               authSignCertName: '${{ parameters.signingAuthSignCertName }}'
               esrpClientId: '${{ parameters.signingEsrpClientId }}'
               esrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-              searchPath: '$(PACK_OUTPUT)'
-              searchPattern: '${{ parameters.packageFullName}}.*nupkg'
+              searchPath: '$(BUILD_OUTPUT)'
+              searchPattern: '**/${{ parameters.packageFullName}}.*nupkg'
 
       # Copy the contents of the build output for this package to the artifacts folder
       - task: CopyFiles@2
diff --git a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
index a0e6e02426..96bba59c20 100644
--- a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
@@ -5,7 +5,7 @@
 #################################################################################
 
 # Generic pack step for build.proj packages. This step runs the Pack* target to generate a NuGet
-# package of the target package. The generated NuGet packages will then be copied to $(PACK_OUTPUT).
+# package of the target package.
 #
 # Note: This step assumes that the package has been built previously using a Build* target.
 #   `-p:PackBuild=false` will be passed to msbuild to ensure the previously built assemblies are
@@ -71,14 +71,3 @@ steps:
 
   - script: tree /a /f $(BUILD_OUTPUT)
     displayName: Output Build Output Tree
-
-  - task: CopyFiles@2
-    displayName: 'Copy NuGet Packages to PACK_OUTPUT'
-    inputs:
-      contents: '**/${{ parameters.packageFullName }}*.*nupkg'
-      flattenFolders: true
-      sourceFolder: '$(BUILD_OUTPUT)/${{ parameters.packageFullName }}/'
-      targetFolder: '$(PACK_OUTPUT)'
-
-  - script: tree /a /f $(PACK_OUTPUT)
-    displayName: Output Package Output Tree

From 7a01dbe66eb55ee8e5310fd13e7e8c4dfcea4f1f Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Thu, 30 Apr 2026 22:42:45 +0530
Subject: [PATCH 076/298] Fix non-deterministic NuGet packages by enabling
 ContinuousIntegrationBuild for OneBranch builds (#4251)

---
 .../onebranch/sqlclient-non-official.yml      |  8 ++++++
 .../onebranch/sqlclient-official.yml          |  7 +++++
 src/Directory.Build.props                     | 26 +++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index 4ae301020f..882e7e0658 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -96,6 +96,14 @@ variables:
     parameters:
       isPreview: ${{ parameters.isPreview }}
 
+  # Drives ContinuousIntegrationBuild=true in src/Directory.Build.props so this
+  # pipeline produces deterministic packages identical (modulo signing) to the
+  # official pipeline.  Keeping this enabled here ensures the deterministic
+  # build path is exercised on every non-official run, catching regressions
+  # before they reach the official release pipeline.
+  - name: BuildForRelease
+    value: true
+
 resources:
   repositories:
     - repository: templates
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 96fb0dc5f5..07b8da1b17 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -118,6 +118,13 @@ variables:
     parameters:
       isPreview: ${{ parameters.isPreview }}
 
+  # Drives ContinuousIntegrationBuild=true in src/Directory.Build.props so the shipped
+  # DLLs/PDBs embed portable /_/... source paths and the produced NuGet packages pass
+  # NuGet Package Explorer's "Deterministic (build)" check.  Set on both OneBranch
+  # pipelines; PR/CI builds leave it unset (false).
+  - name: BuildForRelease
+    value: true
+
 resources:
   repositories:
     - repository: templates
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 6ec3fba9a8..3ed4e8cfb0 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -126,6 +126,32 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUnTrackedSources>true</EmbedUnTrackedSources>
     <DisableSourceLinkTranslation Condition="'$(DisableSourceLinkTranslation)' == ''">false</DisableSourceLinkTranslation>
+
+    <!--
+      BuildForRelease gates the release-only behaviors below.  It defaults to false so that
+      PR validation, scheduled CI, and local developer builds use the simpler dev-friendly
+      behavior.  Both OneBranch pipelines (official and non-official) set this to true via
+      a pipeline variable so that release packages are built deterministically and the
+      non-official pipeline exercises the same path as official before any release.
+    -->
+    <BuildForRelease Condition="'$(BuildForRelease)' == ''">false</BuildForRelease>
+
+    <!--
+      Explicit deterministic build flag.  This is also the SDK default, but we set it
+      explicitly so the build does not silently regress if a future SDK changes the default.
+    -->
+    <Deterministic>true</Deterministic>
+
+    <!--
+      ContinuousIntegrationBuild enables DeterministicSourcePaths, which remaps the source
+      root to a portable form (/_/...) inside embedded PDB paths.  Without this property
+      set to true, NuGet Package Explorer's "Deterministic (build)" check fails because
+      the PDBs embed absolute build-agent paths (e.g. C:\__w\1\s\...).
+
+      Gated on BuildForRelease so PR/CI/local builds keep their pre-#4204 behavior; both
+      OneBranch pipelines (which set BuildForRelease=true) enable this.
+    -->
+    <ContinuousIntegrationBuild Condition="'$(ContinuousIntegrationBuild)' == ''">$(BuildForRelease)</ContinuousIntegrationBuild>
   </PropertyGroup>
 
   <!-- Provides Build properties -->

From 11293878debfa177c6b63daf87e0653bdb250767 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Fri, 1 May 2026 07:33:39 -0500
Subject: [PATCH 077/298] [7.1.0-preview1] Fix TFM Attributes (#4254)

---
 src/Directory.Build.props         | 5 -----
 src/Microsoft.Data.SqlClient.slnx | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 3ed4e8cfb0..e760ebe9f3 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -57,11 +57,6 @@
     <FileVersionBuildNumber>$(BuildNumber.Split('.')[0])</FileVersionBuildNumber>
   </PropertyGroup>
 
-  <!-- @TODO: What is this? -->
-  <PropertyGroup Condition="$(BuildForRelease) == 'true'">
-    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
-  </PropertyGroup>
-
   <ItemGroup Condition="$(BuildForRelease) == 'true'">
     <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
     <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
index 1b6b3440f8..d65c3edc90 100644
--- a/src/Microsoft.Data.SqlClient.slnx
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -134,6 +134,7 @@
   </Folder>
   <Folder Name="/src/">
     <File Path="Directory.Build.props" />
+    <File Path="Directory.Build.targets" />
   </Folder>
   <Folder Name="/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/">
     <Project Path="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />

From 6d26a9e6c9c26a31678db5d179a2e4f57f8f5eba Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Mon, 4 May 2026 12:22:44 -0700
Subject: [PATCH 078/298] Fix package path for release (#4258)

---
 .../onebranch/jobs/publish-nuget-package-job.yml     |  2 +-
 eng/pipelines/onebranch/stages/release-stages.yml    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml b/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
index 21d36b9640..25f1586f09 100644
--- a/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
@@ -74,7 +74,7 @@ jobs:
         value: $(Pipeline.Workspace)/${{ parameters.artifactName }}
 
       - name: packageToPush
-        value: $(artifactPath)/${{ coalesce(parameters.packagePath, format('packages/{0}.*.nupkg', parameters.packageName)) }}
+        value: $(artifactPath)/${{ coalesce(parameters.packagePath, format('Package-Release/{0}.*.nupkg', parameters.packageName)) }}
 
     # Template context inputs are used to pass parameters to the deployment job since it doesn't
     # automatically download pipeline artifacts.
diff --git a/eng/pipelines/onebranch/stages/release-stages.yml b/eng/pipelines/onebranch/stages/release-stages.yml
index 6ee3fbc88e..45309a77c6 100644
--- a/eng/pipelines/onebranch/stages/release-stages.yml
+++ b/eng/pipelines/onebranch/stages/release-stages.yml
@@ -193,7 +193,7 @@ stages:
             parameters:
               packageName: Microsoft.SqlServer.Server
               artifactName: '${{ parameters.sqlServerArtifactsName }}'
-              packagePath: 'packages/Microsoft.SqlServer.Server.${{ parameters.sqlServerPackageVersion }}.nupkg'
+              packagePath: 'Package-Release/Microsoft.SqlServer.Server.${{ parameters.sqlServerPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -203,7 +203,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.Internal.Logging
               artifactName: '${{ parameters.loggingArtifactsName }}'
-              packagePath: 'packages/Microsoft.Data.SqlClient.Internal.Logging.${{ parameters.loggingPackageVersion }}.nupkg'
+              packagePath: 'Package-Release/Microsoft.Data.SqlClient.Internal.Logging.${{ parameters.loggingPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -213,7 +213,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Abstractions
               artifactName: '${{ parameters.abstractionsArtifactsName }}'
-              packagePath: 'packages/Microsoft.Data.SqlClient.Extensions.Abstractions.${{ parameters.abstractionsPackageVersion }}.nupkg'
+              packagePath: 'Package-Release/Microsoft.Data.SqlClient.Extensions.Abstractions.${{ parameters.abstractionsPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -223,7 +223,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient
               artifactName: '${{ parameters.sqlClientArtifactsName }}'
-              packagePath: 'packages/Microsoft.Data.SqlClient.${{ parameters.sqlClientPackageVersion }}.nupkg'
+              packagePath: 'Package-Release/Microsoft.Data.SqlClient.${{ parameters.sqlClientPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -233,7 +233,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Azure
               artifactName: '${{ parameters.azureArtifactsName }}'
-              packagePath: 'packages/Microsoft.Data.SqlClient.Extensions.Azure.${{ parameters.azurePackageVersion }}.nupkg'
+              packagePath: 'Package-Release/Microsoft.Data.SqlClient.Extensions.Azure.${{ parameters.azurePackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -243,7 +243,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
               artifactName: '${{ parameters.akvProviderArtifactsName }}'
-              packagePath: 'packages/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.${{ parameters.akvProviderPackageVersion }}.nupkg'
+              packagePath: 'Package-Release/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.${{ parameters.akvProviderPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}

From b1c082e5c137d70667e2f451c5f6b2e60c109430 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Mon, 4 May 2026 20:56:09 -0700
Subject: [PATCH 079/298] Remove unnecessary inheritance structure from pool
 key class. (#4235)

---
 ...nectionPoolKey.cs => ConnectionPoolKey.cs} | 37 ++++++------
 .../ConnectionPool/DbConnectionPoolGroup.cs   |  6 +-
 .../ConnectionPool/DbConnectionPoolKey.cs     | 58 -------------------
 .../Microsoft/Data/SqlClient/SqlConnection.cs | 18 +++---
 .../Data/SqlClient/SqlConnectionFactory.cs    | 28 ++++-----
 .../ConnectionPoolHelper.cs                   |  2 +-
 .../ChannelDbConnectionPoolTest.cs            | 16 ++---
 ...itHandleDbConnectionPoolTransactionTest.cs |  4 +-
 8 files changed, 56 insertions(+), 113 deletions(-)
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/{SqlConnectionPoolKey.cs => ConnectionPoolKey.cs} (75%)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolKey.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolKey.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolKey.cs
similarity index 75%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolKey.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolKey.cs
index 31da3521df..1499154cf0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolKey.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolKey.cs
@@ -6,14 +6,14 @@
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Data.Common;
 
 namespace Microsoft.Data.SqlClient.ConnectionPool
 {
-    // SqlConnectionPoolKey: Implementation of a key to connection pool groups for specifically to be used for SqlConnection
-    //  Connection string and SqlCredential are used as a key
-    internal class SqlConnectionPoolKey : DbConnectionPoolKey
+    // ConnectionPoolKey: Key to connection pool groups for SqlConnection
+    //  Connection string, SqlCredential, access token, access token callback, and SSPI context provider are used as a key
+    internal class ConnectionPoolKey : ICloneable
     {
+        private string _connectionString;
         private int _hashValue;
         private readonly SqlCredential _credential;
         private readonly string _accessToken;
@@ -25,24 +25,25 @@ internal class SqlConnectionPoolKey : DbConnectionPoolKey
         internal Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> AccessTokenCallback => _accessTokenCallback;
         internal SspiContextProvider SspiContextProvider => _sspiContextProvider;
 
-        internal override string ConnectionString
+        internal string ConnectionString
         {
-            get => base.ConnectionString;
+            get => _connectionString;
             set
             {
-                base.ConnectionString = value;
+                _connectionString = value;
                 CalculateHashCode();
             }
         }
 
-        internal SqlConnectionPoolKey(
+        internal ConnectionPoolKey(
             string connectionString,
             SqlCredential credential,
             string accessToken,
             Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> accessTokenCallback,
-            SspiContextProvider sspiContextProvider) : base(connectionString)
+            SspiContextProvider sspiContextProvider)
         {
             Debug.Assert(credential == null || accessToken == null || accessTokenCallback == null, "Credential, AccessToken, and Callback can't have a value at the same time.");
+            _connectionString = connectionString;
             _credential = credential;
             _accessToken = accessToken;
             _accessTokenCallback = accessTokenCallback;
@@ -50,26 +51,26 @@ internal SqlConnectionPoolKey(
             CalculateHashCode();
         }
 
-        private SqlConnectionPoolKey(SqlConnectionPoolKey key) : base(key)
+        private ConnectionPoolKey(ConnectionPoolKey key)
         {
-            _credential = key.Credential;
-            _accessToken = key.AccessToken;
+            _connectionString = key._connectionString;
+            _credential = key._credential;
+            _accessToken = key._accessToken;
             _accessTokenCallback = key._accessTokenCallback;
             _sspiContextProvider = key._sspiContextProvider;
-
             CalculateHashCode();
         }
 
-        public override object Clone()
+        public object Clone()
         {
-            return new SqlConnectionPoolKey(this);
+            return new ConnectionPoolKey(this);
         }
 
         public override bool Equals(object obj)
         {
-            return (obj is SqlConnectionPoolKey key
+            return (obj is ConnectionPoolKey key
                 && _credential == key._credential
-                && ConnectionString == key.ConnectionString
+                && _connectionString == key._connectionString
                 && _accessTokenCallback == key._accessTokenCallback
                 && string.CompareOrdinal(_accessToken, key._accessToken) == 0
                 && _sspiContextProvider == key._sspiContextProvider);
@@ -82,7 +83,7 @@ public override int GetHashCode()
 
         private void CalculateHashCode()
         {
-            _hashValue = base.GetHashCode();
+            _hashValue = _connectionString == null ? 0 : _connectionString.GetHashCode();
 
             if (_credential != null)
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
index fc14e62d58..f1bf850582 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
@@ -34,7 +34,7 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     sealed internal class DbConnectionPoolGroup
     {
         private readonly DbConnectionOptions _connectionOptions;
-        private readonly DbConnectionPoolKey _poolKey;
+        private readonly ConnectionPoolKey _poolKey;
         private readonly DbConnectionPoolGroupOptions _poolGroupOptions;
         private ConcurrentDictionary<DbConnectionPoolIdentity, IDbConnectionPool> _poolCollection;
 
@@ -50,7 +50,7 @@ sealed internal class DbConnectionPoolGroup
         private const int PoolGroupStateIdle = 2; // all pools are pruned via Clear
         private const int PoolGroupStateDisabled = 4; // factory pool entry pruning method
 
-        internal DbConnectionPoolGroup(DbConnectionOptions connectionOptions, DbConnectionPoolKey key, DbConnectionPoolGroupOptions poolGroupOptions)
+        internal DbConnectionPoolGroup(DbConnectionOptions connectionOptions, ConnectionPoolKey key, DbConnectionPoolGroupOptions poolGroupOptions)
         {
             Debug.Assert(connectionOptions != null, "null connection options");
 
@@ -68,7 +68,7 @@ internal DbConnectionPoolGroup(DbConnectionOptions connectionOptions, DbConnecti
 
         internal DbConnectionOptions ConnectionOptions => _connectionOptions;
 
-        internal DbConnectionPoolKey PoolKey => _poolKey;
+        internal ConnectionPoolKey PoolKey => _poolKey;
 
         internal DbConnectionPoolGroupProviderInfo ProviderInfo
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolKey.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolKey.cs
deleted file mode 100644
index bfcd4cd2ef..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolKey.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-namespace Microsoft.Data.SqlClient.ConnectionPool
-{
-    // DbConnectionPoolKey: Base class implementation of a key to connection pool groups
-    //  Only connection string is used as a key
-    internal class DbConnectionPoolKey : ICloneable
-    {
-        private string _connectionString;
-
-        internal DbConnectionPoolKey(string connectionString)
-        {
-            _connectionString = connectionString;
-        }
-
-        protected DbConnectionPoolKey(DbConnectionPoolKey key)
-        {
-            _connectionString = key.ConnectionString;
-        }
-
-        public virtual object Clone()
-        {
-            return new DbConnectionPoolKey(this);
-        }
-
-        internal virtual string ConnectionString
-        {
-            get
-            {
-                return _connectionString;
-            }
-
-            set
-            {
-                _connectionString = value;
-            }
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            return (obj is DbConnectionPoolKey key && _connectionString == key._connectionString);
-        }
-
-        public override int GetHashCode()
-        {
-            return _connectionString == null ? 0 : _connectionString.GetHashCode();
-        }
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index b96e6f654d..127f47e19d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -708,7 +708,7 @@ public override string ConnectionString
                         CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback(connectionOptions);
                     }
                 }
-                ConnectionString_Set(new SqlConnectionPoolKey(value, _credential, _accessToken, _accessTokenCallback, _sspiContextProvider));
+                ConnectionString_Set(new ConnectionPoolKey(value, _credential, _accessToken, _accessTokenCallback, _sspiContextProvider));
                 _connectionString = value;  // Change _connectionString value only after value is validated
                 CacheConnectionStringProperties();
             }
@@ -768,7 +768,7 @@ public string AccessToken
                 }
 
                 // Need to call ConnectionString_Set to do proper pool group check
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: value, accessTokenCallback: null, sspiContextProvider: null));
+                ConnectionString_Set(new ConnectionPoolKey(_connectionString, credential: _credential, accessToken: value, accessTokenCallback: null, sspiContextProvider: null));
                 _accessToken = value;
             }
         }
@@ -791,7 +791,7 @@ public Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticati
                     CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback((SqlConnectionString)ConnectionOptions);
                 }
 
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: value, sspiContextProvider: null));
+                ConnectionString_Set(new ConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: value, sspiContextProvider: null));
                 _accessTokenCallback = value;
             }
         }
@@ -808,7 +808,7 @@ public SspiContextProvider SspiContextProvider
                     throw ADP.OpenConnectionPropertySet(nameof(SspiContextProvider), InnerConnection.State);
                 }
 
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: value));
+                ConnectionString_Set(new ConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: value));
                 _sspiContextProvider = value;
             }
         }
@@ -1111,7 +1111,7 @@ public SqlCredential Credential
                 _credential = value;
 
                 // Need to call ConnectionString_Set to do proper pool group check
-                ConnectionString_Set(new SqlConnectionPoolKey(_connectionString, _credential, accessToken: _accessToken, accessTokenCallback: _accessTokenCallback, sspiContextProvider: null));
+                ConnectionString_Set(new ConnectionPoolKey(_connectionString, _credential, accessToken: _accessToken, accessTokenCallback: _accessTokenCallback, sspiContextProvider: null));
             }
         }
 
@@ -2511,7 +2511,7 @@ private string ConnectionString_Get()
             return connectionOptions != null ? connectionOptions.UsersConnectionString(hidePassword) : "";
         }
 
-        private void ConnectionString_Set(DbConnectionPoolKey key)
+        private void ConnectionString_Set(ConnectionPoolKey key)
         {
             DbConnectionOptions connectionOptions = null;
             DbConnectionPoolGroup poolGroup = ConnectionFactory.GetConnectionPoolGroup(key, null, ref connectionOptions);
@@ -2617,7 +2617,7 @@ public static void ChangePassword(string connectionString, string newPassword)
                     throw ADP.InvalidArgumentLength(nameof(newPassword), TdsEnums.MAXLEN_NEWPASSWORD);
                 }
 
-                SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
+                ConnectionPoolKey key = new ConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
                 SqlConnectionString connectionOptions = SqlConnectionFactory.Instance.FindSqlConnectionOptions(key);
                 if (connectionOptions.IntegratedSecurity || connectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryIntegrated)
@@ -2671,7 +2671,7 @@ public static void ChangePassword(string connectionString, SqlCredential credent
                     throw ADP.InvalidArgumentLength(nameof(newSecurePassword), TdsEnums.MAXLEN_NEWPASSWORD);
                 }
 
-                SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
+                ConnectionPoolKey key = new ConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
                 SqlConnectionString connectionOptions = SqlConnectionFactory.Instance.FindSqlConnectionOptions(key);
 
@@ -2721,7 +2721,7 @@ private static void ChangePassword(string connectionString, SqlConnectionString
             {
                 con?.Dispose();
             }
-            SqlConnectionPoolKey key = new SqlConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
+            ConnectionPoolKey key = new ConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
             SqlConnectionFactory.Instance.ClearPool(key);
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index 8d49f4dc30..9fd1485db4 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -45,7 +45,7 @@ internal class SqlConnectionFactory
         private readonly List<DbConnectionPoolGroup> _poolGroupsToRelease;
         private readonly List<IDbConnectionPool> _poolsToRelease;
         private readonly Timer _pruningTimer;
-        private Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup> _connectionPoolGroups;
+        private Dictionary<ConnectionPoolKey, DbConnectionPoolGroup> _connectionPoolGroups;
 
         #endregion
         
@@ -53,7 +53,7 @@ internal class SqlConnectionFactory
         
         protected SqlConnectionFactory()
         {
-            _connectionPoolGroups = new Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup>();
+            _connectionPoolGroups = new Dictionary<ConnectionPoolKey, DbConnectionPoolGroup>();
             _poolsToRelease = new List<IDbConnectionPool>();
             _poolGroupsToRelease = new List<DbConnectionPoolGroup>();
             _pruningTimer = ADP.UnsafeCreateTimer(
@@ -97,7 +97,7 @@ internal void ClearPool(DbConnection connection)
             poolGroup?.Clear();
         }
         
-        internal void ClearPool(DbConnectionPoolKey key)
+        internal void ClearPool(ConnectionPoolKey key)
         {
             ADP.CheckArgumentNull(key.ConnectionString, $"{nameof(key)}.{nameof(key.ConnectionString)}");
             
@@ -174,7 +174,7 @@ internal DbConnectionInternal CreatePooledConnection(
         }
 
         internal DbConnectionPoolGroup GetConnectionPoolGroup(
-            DbConnectionPoolKey key,
+            ConnectionPoolKey key,
             DbConnectionPoolGroupOptions poolOptions,
             ref DbConnectionOptions userConnectionOptions)
         {
@@ -202,7 +202,7 @@ internal DbConnectionPoolGroup GetConnectionPoolGroup(
                     if ((object)expandedConnectionString != (object)key.ConnectionString)
                     {
                         // CONSIDER: caching the original string to reduce future parsing
-                        DbConnectionPoolKey newKey = (DbConnectionPoolKey)key.Clone();
+                        ConnectionPoolKey newKey = (ConnectionPoolKey)key.Clone();
                         newKey.ConnectionString = expandedConnectionString;
                         return GetConnectionPoolGroup(newKey, null, ref userConnectionOptions);
                     }
@@ -233,9 +233,9 @@ internal DbConnectionPoolGroup GetConnectionPoolGroup(
                             };
 
                         // build new dictionary with space for new connection string
-                        Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup> newConnectionPoolGroups = 
-                            new Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup>(1 + _connectionPoolGroups.Count);
-                        foreach (KeyValuePair<DbConnectionPoolKey, DbConnectionPoolGroup> entry in _connectionPoolGroups)
+                        Dictionary<ConnectionPoolKey, DbConnectionPoolGroup> newConnectionPoolGroups = 
+                            new Dictionary<ConnectionPoolKey, DbConnectionPoolGroup>(1 + _connectionPoolGroups.Count);
+                        foreach (KeyValuePair<ConnectionPoolKey, DbConnectionPoolGroup> entry in _connectionPoolGroups)
                         {
                             newConnectionPoolGroups.Add(entry.Key, entry.Value);
                         }
@@ -469,7 +469,7 @@ internal DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo
             DbConnectionOptions connectionOptions) =>
             new SqlConnectionPoolGroupProviderInfo((SqlConnectionString)connectionOptions);
 
-        internal SqlConnectionString FindSqlConnectionOptions(SqlConnectionPoolKey key)
+        internal SqlConnectionString FindSqlConnectionOptions(ConnectionPoolKey key)
         {
             Debug.Assert(key is not null, "Key cannot be null");
 
@@ -576,14 +576,14 @@ internal void SetInnerConnectionTo(DbConnection owningObject, DbConnectionIntern
         // @TODO: I think this could be broken down into methods more specific to use cases above
         protected virtual DbConnectionInternal CreateConnection(
             DbConnectionOptions options,
-            DbConnectionPoolKey poolKey,
+            ConnectionPoolKey poolKey,
             DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
             IDbConnectionPool pool,
             DbConnection owningConnection,
             DbConnectionOptions userOptions)
         {
             SqlConnectionString opt = (SqlConnectionString)options;
-            SqlConnectionPoolKey key = (SqlConnectionPoolKey)poolKey;
+            ConnectionPoolKey key = poolKey;
             SessionData recoverySessionData = null;
 
             SqlConnection sqlOwningConnection = owningConnection as SqlConnection;
@@ -899,10 +899,10 @@ private void PruneConnectionPoolGroups(object state)
             // one. This will cause any empty pools to be put into the release list.
             lock (this)
             {
-                Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup> connectionPoolGroups = _connectionPoolGroups;
-                Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup> newConnectionPoolGroups = new Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup>(connectionPoolGroups.Count);
+                Dictionary<ConnectionPoolKey, DbConnectionPoolGroup> connectionPoolGroups = _connectionPoolGroups;
+                Dictionary<ConnectionPoolKey, DbConnectionPoolGroup> newConnectionPoolGroups = new Dictionary<ConnectionPoolKey, DbConnectionPoolGroup>(connectionPoolGroups.Count);
 
-                foreach (KeyValuePair<DbConnectionPoolKey, DbConnectionPoolGroup> entry in connectionPoolGroups)
+                foreach (KeyValuePair<ConnectionPoolKey, DbConnectionPoolGroup> entry in connectionPoolGroups)
                 {
                     if (entry.Value != null)
                     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Common/SystemDataInternals/ConnectionPoolHelper.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Common/SystemDataInternals/ConnectionPoolHelper.cs
index acaf348a52..adfb0bbb6c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Common/SystemDataInternals/ConnectionPoolHelper.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Common/SystemDataInternals/ConnectionPoolHelper.cs
@@ -20,7 +20,7 @@ internal static class ConnectionPoolHelper
         private static Type s_dbConnectionPoolGroup = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolGroup");
         private static Type s_dbConnectionPoolIdentity = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolIdentity");
         private static Type s_sqlConnectionFactory = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.SqlConnectionFactory");
-        private static Type s_dbConnectionPoolKey = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolKey");
+        private static Type s_dbConnectionPoolKey = s_MicrosoftDotData.GetType("Microsoft.Data.SqlClient.ConnectionPool.ConnectionPoolKey");
         private static Type s_dictStringPoolGroup = typeof(Dictionary<,>).MakeGenericType(s_dbConnectionPoolKey, s_dbConnectionPoolGroup);
         private static Type s_dictPoolIdentityPool = typeof(ConcurrentDictionary<,>).MakeGenericType(s_dbConnectionPoolIdentity, s_dbConnectionPool);
         // Resolve Count from the interface so it works with both pool implementations
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index c7df9dc2c6..48bcc87ad2 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -37,7 +37,7 @@ private ChannelDbConnectionPool ConstructPool(SqlConnectionFactory connectionFac
             );
             dbConnectionPoolGroup ??= new DbConnectionPoolGroup(
                 new DbConnectionOptions("DataSource=localhost;", null),
-                new DbConnectionPoolKey("TestDataSource"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions
             );
             return new ChannelDbConnectionPool(
@@ -615,7 +615,7 @@ public void TestPoolGroup()
         {
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
                 new DbConnectionOptions("DataSource=localhost;", null),
-                new DbConnectionPoolKey("TestDataSource"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 new DbConnectionPoolGroupOptions(
                     poolByIdentity: false,
                     minPoolSize: 0,
@@ -936,7 +936,7 @@ internal class SuccessfulSqlConnectionFactory : SqlConnectionFactory
         {
             protected override DbConnectionInternal CreateConnection(
                 DbConnectionOptions options,
-                DbConnectionPoolKey poolKey,
+                ConnectionPoolKey poolKey,
                 DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
                 IDbConnectionPool pool,
                 DbConnection owningConnection,
@@ -950,7 +950,7 @@ internal class TimeoutSqlConnectionFactory : SqlConnectionFactory
         {
             protected override DbConnectionInternal CreateConnection(
                 DbConnectionOptions options,
-                DbConnectionPoolKey poolKey,
+                ConnectionPoolKey poolKey,
                 DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
                 IDbConnectionPool pool,
                 DbConnection owningConnection,
@@ -1007,7 +1007,7 @@ public void Constructor_WithZeroMaxPoolSize_ThrowsArgumentOutOfRangeException()
             );
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
                 new DbConnectionOptions("DataSource=localhost;", null),
-                new DbConnectionPoolKey("TestDataSource"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions
             );
 
@@ -1038,7 +1038,7 @@ public void Constructor_WithLargeMaxPoolSize()
             );
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
                 new DbConnectionOptions("DataSource=localhost;", null),
-                new DbConnectionPoolKey("TestDataSource"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions
             );
 
@@ -1079,7 +1079,7 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
             );
             var dbConnectionPoolGroup1 = new DbConnectionPoolGroup(
                 new DbConnectionOptions("DataSource=localhost;", null),
-                new DbConnectionPoolKey("TestDataSource"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions1
             );
 
@@ -1105,7 +1105,7 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
             );
             var dbConnectionPoolGroup2 = new DbConnectionPoolGroup(
                 new DbConnectionOptions("DataSource=localhost;", null),
-                new DbConnectionPoolKey("TestDataSource"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions2
             );
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
index cafea0dad4..bc637087a1 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
@@ -60,7 +60,7 @@ private WaitHandleDbConnectionPool CreatePool(
 
         var dbConnectionPoolGroup = new DbConnectionPoolGroup(
             new DbConnectionOptions("DataSource=localhost;", null),
-            new DbConnectionPoolKey("TestDataSource"),
+            new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
             poolGroupOptions
         );
 
@@ -901,7 +901,7 @@ internal class MockSqlConnectionFactory : SqlConnectionFactory
     {
         protected override DbConnectionInternal CreateConnection(
             DbConnectionOptions options,
-            DbConnectionPoolKey poolKey,
+            ConnectionPoolKey poolKey,
             DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
             IDbConnectionPool pool,
             DbConnection owningConnection,

From 4820ba4323449a16fb890cf0041e47f0086431ec Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 4 May 2026 22:05:53 -0700
Subject: [PATCH 080/298] Minor touch-ups to BuildGuide and build.proj (#4246)

---
 BUILDGUIDE.md | 34 +++++++++++++++++-----------------
 build.proj    | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 7c8e4acb93..715923d1b3 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -16,11 +16,11 @@ on operating systems that do not support .NET Framework. As such, it is not nece
 
 ### Miscellaneous
 
-**Powershell** is required to run several miscellaneous tasks as part of building and packaging. On Windows systems,
-no action is required. On Linux and MacOS systems, the `pwsh` command is required to be in the `$PATH` environment
+**PowerShell** is required to run several miscellaneous tasks as part of building and packaging. On Windows systems,
+no action is required. On Linux and macOS systems, the `pwsh` command is required to be in the `$PATH` environment
 variable. For specific instructions see: [Install PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/install-powershell)
 
-The **NuGet** binary is required to package the Microsoft.Data.SqlClient project. For convenience, this can be be done
+The **NuGet** binary is required to package the Microsoft.Data.SqlClient project. For convenience, this can be done
 via the PowerShell script [tools/scripts/downloadLatestNuget.ps1](tools/scripts/downloadLatestNuget.ps1), however, any
 `nuget.exe` binary can be used.
 
@@ -35,12 +35,12 @@ package the project. The `build.proj` file provides convenient targets to accomp
 > is recommended that `build.proj` is used for local development, as well.
 
 > [!TIP]
-> `build.proj` was written with the intention of being called from `msbuild`. As such, the following examples below
+> `build.proj` was written with the intention of being called from `msbuild`. As such, the examples below
 > use `msbuild`. On systems where `msbuild` is not available, simply replace `msbuild` with `dotnet msbuild` to get the
 > same behavior.
 
 > [!TIP]
-> This section is not exhaustive of all targets or parameters to `build.proj`. Complete documentation is avilable in
+> This section is not exhaustive of all targets or parameters to `build.proj`. Complete documentation is available in
 > [`build.proj`](build.proj).
 
 ### Building Projects
@@ -73,7 +73,7 @@ A selection of parameters for build targets in `build.proj` can be found below:
 | `[optional_parameter]`            | Allowed Values                   | Default   | Description                                                                                                                                   |
 |-----------------------------------|----------------------------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------|
 | `-p:Configuration=`               | `Debug`, `Release`               | `Debug`   | Build configuration                                                                                                                           |
-| `-p:PackageVersion<TargetPackage> | `major.minor.patch[-prerelease]` | `[blank]` | Version to assign to the target package. Assembly and file versions are derived from this, if it is provided. See Versioning for more details |
+| `-p:PackageVersion<TargetPackage>=` | `major.minor.patch[-prerelease]` | `[blank]` | Version to assign to the target package, where `<TargetPackage>` can be one of: `['Abstractions', 'Azure', 'AkvProvider', 'Logging', 'SqlClient', 'SqlServer']`. Assembly and file versions are derived from this, if it is provided. See Versioning for more details |
 
 For most projects, build output is placed in `artifacts/<package_name>/Project-<configuration>/<tfm>`. `<package_name>`
 is the full name of the package, `<configuration>` is the build configuration, and `<tfm>` is the target framework
@@ -97,7 +97,7 @@ msbuild build.proj -t:BuildSqlClient -p:Configuration=Release
 
 Build v1.2.3 of Microsoft.Data.SqlClient.Extensions.Abstractions:
 ```bash
-msbuild build.proj -t:BuildAbstractions -p:PackageVersion=1.2.3
+msbuild build.proj -t:BuildAbstractions -p:PackageVersionAbstractions=1.2.3
 ```
 
 ### Testing Projects
@@ -165,15 +165,15 @@ msbuild build.proj -t:TestSqlClientFunctional -p:TestFramework=net8.0
 
 ### Packaging Projects
 
-Just like bulding and testing the various projects in this repository, packaging the projects into NuGet packages is
-also handle by `build.proj`. From the root of your repository, run `msbuild` against `build.proj` with a test target,
+Just like building and testing the various projects in this repository, packaging the projects into NuGet packages is
+also handled by `build.proj`. From the root of your repository, run `msbuild` against `build.proj` with a pack target,
 following this pattern:
 
 ```bash
 msbuild build.proj -t:<pack_target> [optional_parameters]
 ```
 
-| `<build_target>`   | Desription                                                                          |
+| `<pack_target>`   | Description                                                                         |
 |--------------------|-------------------------------------------------------------------------------------|
 | `Pack`             | Packages all projects in the repository.                                            |
 | `PackAbstractions` | Packages the Microsoft.Data.SqlClient.Extensions.Abstractions package               |
@@ -191,9 +191,9 @@ A selection of parameters for pack targets in `build.proj` relevant to common de
 | `[optional_parameter]`             | Default Value | Allowed Values        | Description                                                                                                                                                    |
 |------------------------------------|---------------|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `-p:Configuration=`                | `Debug`       | `Debug`, `Release`    | Build configuration. Only applies if project and dependencies are being built.                                                                                 |
-| `-p:NugetPath=`                    | `[blank]`     | eg. `C:\my\nuget.exe` | _Only applies to `PackSqlClient`._ Path to `nuget.exe` that to use. If not provided, defaults to `nuget.exe` in the PATH.                                      |
+| `-p:NugetPath=`                    | `[blank]`     | eg. `C:\my\nuget.exe` | _Only applies to `PackSqlClient`._ Path to `nuget.exe` to use. If not provided, defaults to `nuget.exe` in the PATH.                                           |
 | `-p:PackBuild=`                    | `true`        | `true`, `false`       | Whether or not to build the project before packing. If `false`, project must be built using the same parameters.                                               |
-| `-p:PackageVersion<TargetProject>` | `[blank]`     | eg. `1.2.3-dev123`    | Version to assign to the package. If `PackBuild` is `true`, the assembly and file versions will be derived from this version. See Versioning for more details. |
+| `-p:PackageVersion<TargetPackage>=` | `[blank]`     | eg. `1.2.3-dev123`    | Version to assign to the package, where `<TargetPackage>` can be one of: `['Abstractions', 'Azure', 'AkvProvider', 'Logging', 'SqlClient', 'SqlServer']`. If `PackBuild` is `true`, the assembly and file versions will be derived from this version. See Versioning for more details. |
 
 #### Examples
 
@@ -212,7 +212,7 @@ Package version 1.2.3 of Microsoft.Data.SqlClient.Extensions.Abstractions:
 msbuild build.proj -t:PackAbstractions -p:PackageVersionAbstractions=1.2.3
 ```
 
-Package version Microsoft.Data.SqlClient.Extensions.Azure without building it beforehand:
+Package Microsoft.Data.SqlClient.Extensions.Azure without building it beforehand:
 ```bash
 msbuild build.proj -t:PackAzure -p:PackBuild=false
 ```
@@ -236,7 +236,7 @@ as the latest released version of the package. For the table below, we assume th
 |------------------|---------------|---------------|------------------|------------------|---------------|------------------------------------------------------------|
 | N/A              | N/A           | N/A           | `1.2.3-dev`      | `1.0.0`          | `1.2.3.0`     | Standard developer scenario                                |
 | `9.8.7`          | N/A           | N/A           | `9.8.7`          | `9.0.0`          | `9.8.7.0`     | Developer is building a specific version of the package    |
-| `9.8.7-preview1` | N/A           | N/A           | `9.8.7-preview1` | `9.0.0`          | `9.8.7.0`     | Developer is buildins a pre-release version of the package |
+| `9.8.7-preview1` | N/A           | N/A           | `9.8.7-preview1` | `9.0.0`          | `9.8.7.0`     | Developer is building a pre-release version of the package |
 | N/A              | `1234`        | N/A           | `1.2.3`          | `1.0.0`          | `1.2.3.1234`  | Automated pipelines building GA releases                   |
 | N/A              | `1234`        | `ci`          | `1.2.3-ci1234`   | `1.0.0`          | `1.2.3.1234`  | Automated pipelines building non-prod releases             |
 
@@ -247,7 +247,7 @@ as the latest released version of the package. For the table below, we assume th
 The above documentation is the default mode of operation, and is the recommended mode for most developers. However,
 `build.proj` supports "package mode" builds. In this mode, instead of projects depending on other projects, they
 depend on NuGet packages. This mode is useful for verifying that packages work with each other, especially in automated
-build scenarios. For completeness, and debugging of autoamted builds, this section documents behavior of "package mode".
+build scenarios. For completeness, and debugging of automated builds, this section documents behavior of "package mode".
 
 To switch to "package mode", set the `ReferenceType` parameter in `build.proj` to `Package`. And, optionally, include
 one or more of the following parameters:
@@ -297,7 +297,7 @@ msbuild -t:PackSqlClient \
 cp artifacts/Microsoft.Data.SqlClient/Package-Debug/*.*pkg packages/
 ```
 
-Run Microsoft.Data.SqlClient functional tests against the versions build above:
+Run Microsoft.Data.SqlClient functional tests against the versions built above:
 ```bash
 msbuild build.proj -t:TestSqlClientFunctional \
   -p:ReferenceType=Package \
@@ -422,7 +422,7 @@ copy the file into the `artifacts` directory alongside the benchmark DLL.  By
 default, the benchmarks look for `runnerconfig.json` in the same directory as
 the DLL.
 
-Optionally, to avoid polluting your git workspace and requring a build after
+Optionally, to avoid polluting your git workspace and requiring a build after
 each config change, copy `runnerconfig.json` to a new file, make your edits
 there, and then specify the new file with the RUNNER_CONFIG environment
 variable.
diff --git a/build.proj b/build.proj
index e32caef276..a0ef562934 100644
--- a/build.proj
+++ b/build.proj
@@ -155,7 +155,7 @@
     -->
     <PackageVersionAzure Condition="'$(PackageVersionAzure)' == ''" />
     <PackageVersionAzureArgument Condition="'$(PackageVersionAzure)' != ''">
-      -p:AzurePackageVersion=$(PackageVersionAbstractions)
+      -p:AzurePackageVersion=$(PackageVersionAzure)
     </PackageVersionAzureArgument>
 
     <!--
@@ -572,8 +572,52 @@
     <Error Text="Failed to evaluate SqlClientPackageVersion for PackSqlClient."
            Condition="'$(_EvaluatedSqlClientPackageVersion)' == ''" />
 
+    <!-- Evaluate AbstractionsPackageVersion from project if not provided -->
+    <PropertyGroup Condition="'$(PackageVersionAbstractions)' == ''">
+      <GetAbstractionsPackageVersionCommand>
+        "$(DotnetPath)dotnet" msbuild "$(AbstractionsProjectPath)"
+        -nologo
+        -verbosity:quiet
+        -getProperty:AbstractionsPackageVersion
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+      </GetAbstractionsPackageVersionCommand>
+      <GetAbstractionsPackageVersionCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GetAbstractionsPackageVersionCommand), "\s+", " "))</GetAbstractionsPackageVersionCommand>
+    </PropertyGroup>
+    <Message Text=">>> Evaluating Abstractions package version via command: $(GetAbstractionsPackageVersionCommand)"
+             Condition="'$(PackageVersionAbstractions)' == ''" />
+    <Exec ConsoleToMsBuild="true" Command="$(GetAbstractionsPackageVersionCommand)"
+          Condition="'$(PackageVersionAbstractions)' == ''">
+      <Output TaskParameter="ConsoleOutput" PropertyName="PackageVersionAbstractions" />
+    </Exec>
+    <Error Text="Failed to evaluate AbstractionsPackageVersion for PackSqlClient."
+           Condition="'$(PackageVersionAbstractions)' == ''" />
+
+    <!-- Evaluate LoggingPackageVersion from project if not provided -->
+    <PropertyGroup Condition="'$(PackageVersionLogging)' == ''">
+      <GetLoggingPackageVersionCommand>
+        "$(DotnetPath)dotnet" msbuild "$(LoggingProjectPath)"
+        -nologo
+        -verbosity:quiet
+        -getProperty:LoggingPackageVersion
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+      </GetLoggingPackageVersionCommand>
+      <GetLoggingPackageVersionCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GetLoggingPackageVersionCommand), "\s+", " "))</GetLoggingPackageVersionCommand>
+    </PropertyGroup>
+    <Message Text=">>> Evaluating Logging package version via command: $(GetLoggingPackageVersionCommand)"
+             Condition="'$(PackageVersionLogging)' == ''" />
+    <Exec ConsoleToMsBuild="true" Command="$(GetLoggingPackageVersionCommand)"
+          Condition="'$(PackageVersionLogging)' == ''">
+      <Output TaskParameter="ConsoleOutput" PropertyName="PackageVersionLogging" />
+    </Exec>
+    <Error Text="Failed to evaluate LoggingPackageVersion for PackSqlClient."
+           Condition="'$(PackageVersionLogging)' == ''" />
+
     <PropertyGroup>
       <_EvaluatedSqlClientPackageVersion>$([System.Text.RegularExpressions.Regex]::Replace($(_EvaluatedSqlClientPackageVersion), "\s", ""))</_EvaluatedSqlClientPackageVersion>
+      <PackageVersionAbstractions>$([System.Text.RegularExpressions.Regex]::Replace($(PackageVersionAbstractions), "\s", ""))</PackageVersionAbstractions>
+      <PackageVersionLogging>$([System.Text.RegularExpressions.Regex]::Replace($(PackageVersionLogging), "\s", ""))</PackageVersionLogging>
       <CommitId>$([System.Text.RegularExpressions.Regex]::Replace($(CommitId), "\s", ""))</CommitId>
       <NuGetCommand>
         "$(NugetPath)" pack "$(SqlClientNuspecPath)"

From 34b400ea544c5ff9edde8d89024dc74a2350134c Mon Sep 17 00:00:00 2001
From: Shreya Laxminarayana Rao
 <147193825+ShreyaLaxminarayan@users.noreply.github.com>
Date: Tue, 5 May 2026 11:00:28 +0530
Subject: [PATCH 081/298] Fix Kerberos SSPI authentication failure when using
 TCP proxy in manual tests (#4146)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
CreateAndStartProxy used in manual tests rewrites the connection string address to 127.0.0.1, causing kerberos to construct the wrong SPN (MSSQLSvc/localhost) instead of the real server name.
Since localhost is not registered in Active Directory, SSPI authentication fails with
Microsoft.Data.SqlClient.SqlException: The target principal name is incorrect. Cannot generate SSPI context.

Fix:
Capture the original server name before the proxy rewrites the address. After rewriting, explicitly set ServerSPN in the connection string to the real server's SPN using DataTestUtility.GetMachineFQDN,
but only if ServerSPN is not already set by the caller.

Tests Affected:
SqlCommandCancelTest.TimeOutDuringRead_Tcp— previously failing with SSPI error, now passing
---
 .../tests/ManualTests/DataCommon/ProxyServer.cs             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/ProxyServer.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/ProxyServer.cs
index c53b554f18..4c8376ef9f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/ProxyServer.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/ProxyServer.cs
@@ -321,6 +321,7 @@ public static ProxyServer CreateAndStartProxy(string connectionString, out strin
             // Build builders
             SqlConnectionStringBuilder connStringbuilder = new SqlConnectionStringBuilder(connectionString);
             DataSourceBuilder dataSourceBuilder = new DataSourceBuilder(connStringbuilder.DataSource);
+            string originalServerName = dataSourceBuilder.ServerName;
 
             // Setup proxy
             Task<System.Net.IPHostEntry> ipEntryTask = Dns.GetHostEntryAsync(dataSourceBuilder.ServerName);
@@ -338,6 +339,11 @@ public static ProxyServer CreateAndStartProxy(string connectionString, out strin
             connStringbuilder.DataSource = dataSourceBuilder.ToString();
             connStringbuilder.Remove("Network Library");
 
+            if (string.IsNullOrEmpty(connStringbuilder.ServerSPN))
+            {
+                connStringbuilder.ServerSPN = $"MSSQLSvc/{DataTestUtility.GetMachineFQDN(originalServerName)}";
+            }
+
             newConnectionString = connStringbuilder.ToString();
             return proxy;
         }

From fdbc56e7b9b87d8a7043603b22ebf4a4bab35be8 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Tue, 5 May 2026 15:48:02 +0100
Subject: [PATCH 082/298] Fix | SqlVector: Explicitly perform little-endian
 multibyte writes (#3861)

---
 .../src/Microsoft/Data/SqlTypes/SqlVector.cs  | 88 +++++++++++++------
 .../Microsoft/Data/SqlTypes/SqlVectorTest.cs  |  9 +-
 2 files changed, 70 insertions(+), 27 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs
index 2e83b8daff..d87a539c37 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlVector.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -39,13 +39,12 @@ namespace Microsoft.Data.SqlTypes;
 
     private SqlVector(int length)
     {
-        if (length < 0)
+        (_elementType, _elementSize, int maxElements) = GetTypeFieldsOrThrow();
+        if (length < 0 || length > maxElements)
         {
             throw ADP.InvalidArraySize(nameof(length));
         }
 
-        (_elementType, _elementSize) = GetTypeFieldsOrThrow();
-
         IsNull = true;
 
         Length = length;
@@ -61,7 +60,11 @@ private SqlVector(int length)
     /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlTypes/SqlVector.xml' path='docs/members[@name="SqlVector"]/ctor1/*' />
     public SqlVector(ReadOnlyMemory<T> memory)
     {
-        (_elementType, _elementSize) = GetTypeFieldsOrThrow();
+        (_elementType, _elementSize, int maxElements) = GetTypeFieldsOrThrow();
+        if (memory.Length > maxElements)
+        {
+            throw ADP.InvalidArraySize(nameof(memory));
+        }
 
         IsNull = false;
 
@@ -74,7 +77,7 @@ public SqlVector(ReadOnlyMemory<T> memory)
 
     internal SqlVector(byte[] tdsBytes)
     {
-        (_elementType, _elementSize) = GetTypeFieldsOrThrow();
+        (_elementType, _elementSize, _) = GetTypeFieldsOrThrow();
 
         (Length, _size) = GetCountsOrThrow(tdsBytes);
 
@@ -125,10 +128,11 @@ internal string GetString()
 
     #region Helpers
 
-    private (byte, byte) GetTypeFieldsOrThrow()
+    private static (byte, byte, int) GetTypeFieldsOrThrow()
     {
         byte elementType;
         byte elementSize;
+        int maxSize;
 
         if (typeof(T) == typeof(float))
         {
@@ -139,12 +143,17 @@ internal string GetString()
         {
             throw SQL.VectorTypeNotSupported(typeof(T).FullName);
         }
+        // The size of a vector (including its header) must not exceed the maximum size of a TDS packet.
+        // Calculate the maximum number of elements to simplify the validation of input sizes in constructors.
+        maxSize = (TdsEnums.MAXSIZE - TdsEnums.VECTOR_HEADER_SIZE) / elementSize;
 
-        return (elementType, elementSize);
+        return (elementType, elementSize, maxSize);
     }
 
     private byte[] MakeTdsBytes(ReadOnlyMemory<T> values)
     {
+        Debug.Assert(Length <= ushort.MaxValue);
+
         //Refer to TDS section 2.2.5.5.7 for vector header format
         // +------------------------+-----------------+----------------------+------------------+----------------------------+--------------+
         // | Field                  | Size (bytes)    | Example Value         | Description                                                 |
@@ -158,32 +167,42 @@ private byte[] MakeTdsBytes(ReadOnlyMemory<T> values)
         // +------------------------+-----------------+----------------------+--------------------------------------------------------------+
 
         byte[] result = new byte[_size];
+        ReadOnlySpan<T> valueSpan = values.Span;
 
         // Header Bytes
         result[0] = VecHeaderMagicNo;
         result[1] = VecVersionNo;
-        result[2] = (byte)(Length & 0xFF);
-        result[3] = (byte)((Length >> 8) & 0xFF);
+        BinaryPrimitives.WriteUInt16LittleEndian(result.AsSpan(2), (ushort)Length);
         result[4] = _elementType;
         result[5] = 0x00;
         result[6] = 0x00;
         result[7] = 0x00;
 
-#if NETFRAMEWORK
-        // Copy data via marshaling.
-        if (MemoryMarshal.TryGetArray(values, out ArraySegment<T> segment))
+        // If .NET is running on a little-endian architecture, cast directly to a byte array and proceed.
+        // This optimisation relies upon the base type of the vector transporting values in a format and
+        // endianness which is identical to the client. This is true for all little-endian clients reading
+        // float32-based vectors.
+        if (BitConverter.IsLittleEndian)
         {
-            Buffer.BlockCopy(segment.Array, segment.Offset * _elementSize, result, TdsEnums.VECTOR_HEADER_SIZE, segment.Count * _elementSize);
+            ReadOnlySpan<byte> valuesAsBytes = MemoryMarshal.AsBytes(valueSpan);
+
+            valuesAsBytes.CopyTo(result.AsSpan(TdsEnums.VECTOR_HEADER_SIZE));
         }
         else
         {
-            Buffer.BlockCopy(values.ToArray(), 0, result, TdsEnums.VECTOR_HEADER_SIZE, values.Length * _elementSize);
+            if (typeof(T) == typeof(float))
+            {
+                for (int i = 0, currPosition = TdsEnums.VECTOR_HEADER_SIZE; i < values.Length; i++, currPosition += _elementSize)
+                {
+                    #if NET
+                    BinaryPrimitives.WriteSingleLittleEndian(result.AsSpan(currPosition), (float)(object)valueSpan[i]);
+                    #else
+                    BinaryPrimitives.WriteInt32LittleEndian(result.AsSpan(currPosition), BitConverterCompatible.SingleToInt32Bits((float)(object)valueSpan[i]));
+                    #endif
+                }
+            }
         }
-#else
-        // Fast span-based copy.
-        var byteSpan = MemoryMarshal.AsBytes(values.Span);
-        byteSpan.CopyTo(result.AsSpan(TdsEnums.VECTOR_HEADER_SIZE));
-#endif
+
         return result;
     }
 
@@ -227,15 +246,32 @@ private T[] MakeArray()
             return Array.Empty<T>();
         }
 
-#if NETFRAMEWORK
         // Allocate array and copy bytes into it
         T[] result = new T[Length];
-        Buffer.BlockCopy(_tdsBytes, 8, result, 0, _elementSize * Length);
+
+        // See the comment in MakeTdsBytes for more information on this optimisation.
+        if (BitConverter.IsLittleEndian)
+        {
+            Span<byte> valuesAsBytes = MemoryMarshal.AsBytes(result.AsSpan());
+
+            _tdsBytes.AsSpan(TdsEnums.VECTOR_HEADER_SIZE).CopyTo(valuesAsBytes);
+        }
+        else
+        {
+            if (typeof(T) == typeof(float))
+            {
+                for (int i = 0, currPosition = TdsEnums.VECTOR_HEADER_SIZE; i < Length; i++, currPosition += _elementSize)
+                {
+                    #if NET
+                    result[i] = (T)(object)BinaryPrimitives.ReadSingleLittleEndian(_tdsBytes.AsSpan(currPosition));
+                    #else
+                    result[i] = (T)(object)BitConverterCompatible.Int32BitsToSingle(BinaryPrimitives.ReadInt32LittleEndian(_tdsBytes.AsSpan(currPosition)));
+                    #endif
+                }
+            }
+        }
+
         return result;
-#else
-        ReadOnlySpan<byte> dataSpan = _tdsBytes.AsSpan(8, _elementSize * Length);
-        return MemoryMarshal.Cast<byte, T>(dataSpan).ToArray();
-#endif
     }
 
     #endregion
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlVectorTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlVectorTest.cs
index 1b34c66298..545f8af083 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlVectorTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlTypes/SqlVectorTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -28,6 +28,13 @@ public void Construct_Length_Negative()
         Assert.Throws<ArgumentOutOfRangeException>(() => SqlVector<float>.CreateNull(-1));
     }
 
+    [Fact]
+    public void Construct_Length_Exceeds_8000()
+    {
+        Assert.Throws<ArgumentOutOfRangeException>(() => SqlVector<float>.CreateNull(1999));
+        Assert.Throws<ArgumentOutOfRangeException>(() => SqlVector<float>.CreateNull(int.MaxValue / 2));
+    }
+
     [Fact]
     public void Construct_Length()
     {

From 49f640e6a6cf597fbe391973150f53f9892ba60b Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 5 May 2026 12:20:07 -0300
Subject: [PATCH 083/298] Added instructions for identifying changes specific
 to a subset of TFMs and OSes, where applicable. (#4243)

---
 .github/prompts/release-notes.prompt.md | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/.github/prompts/release-notes.prompt.md b/.github/prompts/release-notes.prompt.md
index 0370e2b720..523fe3524c 100644
--- a/.github/prompts/release-notes.prompt.md
+++ b/.github/prompts/release-notes.prompt.md
@@ -58,6 +58,52 @@ This prompt uses the following skill:
 - Identify the contributors for the "Contributors" section.
 - **Assign each PR to one or more packages** using the identification rules in the Package Registry table. A PR may be relevant to multiple packages. PRs not matching any non-core package belong to `Microsoft.Data.SqlClient`.
 
+### 2.1. Determine Target Framework (TFM) Scope Per Change
+
+For each PR included in release notes, determine whether it applies to all supported TFMs for the package or only a subset.
+
+Use source-level evidence (not assumptions) to classify scope:
+
+- **TFM-specific files** indicate scoped impact (for example, `.netfx.cs`, `.netcore.cs`).
+- **Conditional compilation** indicates scoped impact (for example, `#if NETFRAMEWORK`, `#if NET`).
+- **Project or build conditions** indicate scoped impact (for example, `Condition` expressions on `TargetFramework` or `TargetFrameworks`).
+- **Tests-only TFM changes** should not be called out as customer-facing unless the behavior change is also present in product code.
+
+When writing notes:
+
+- If the change affects **all supported TFMs** for that package, do not add a TFM qualifier.
+- If the change affects **only some TFMs**, include an explicit qualifier in the relevant bullet or section title.
+- Use concise qualifiers like:
+  - `(net462 only)`
+  - `(net8.0/net9.0 only)`
+
+Do not infer TFM scope from labels alone; verify from changed files and code paths.
+
+### 2.2. Determine Operating System (OS) Scope Per Change
+
+For each PR included in release notes, determine whether it applies to all supported OS targets for the package or only a subset.
+
+Use source-level evidence (not assumptions) to classify scope:
+
+- **OS-specific files** indicate scoped impact (for example, `.windows.cs`, `.unix.cs`).
+- **OS preprocessor symbols** indicate scoped impact (for example, `#if _WINDOWS`, `#if _UNIX`).
+- **Project/build conditions** indicate scoped impact (for example, `TargetOs`, `NormalizedTargetOs`, or OS-conditional `ItemGroup`/`PropertyGroup` entries).
+- **SNI implementation or native dependency gates** can imply OS scope when behavior changes only apply to native Windows SNI vs managed cross-platform paths.
+- **Tests-only OS changes** should not be called out as customer-facing unless the behavior change is also present in product code.
+
+When writing notes:
+
+- If the change affects **all supported OS targets**, do not add an OS qualifier.
+- If the change affects **only some OS targets**, include an explicit qualifier in the relevant bullet or section title.
+- Use concise qualifiers like:
+  - `(Windows only)`
+  - `(Unix only)`
+  - `(Linux only)`
+  - `(macOS only)`
+- If both TFM and OS are scoped, combine them in one qualifier, for example: `(net8.0/net9.0 on Windows only)`.
+
+Do not infer OS scope from labels alone; verify from changed files and code paths.
+
 ### 3. Enrich Feature Sections with Issue Context
 
 For significant features or bug fixes that reference a GitHub issue:
@@ -84,6 +130,7 @@ For each package that has relevant PRs in the milestone:
    - Use the template from [release-notes/template/release-notes-template.md](release-notes/template/release-notes-template.md).
    - Fill in the template following the instructions in each section.
    - Only include sections (Added, Changed, Fixed, Removed) that have entries.
+   - For each Added/Changed/Fixed/Removed item, include TFM and OS scope qualifiers when Step 2.1 or Step 2.2 determines the change is not universal across the package's supported targets.
    - Look up dependencies using the Dependency Sources from the lookup table above. Resolve concrete versions from [Directory.Packages.props](Directory.Packages.props).
    - List dependencies per target framework. Use the project file's `<TargetFrameworks>` to determine which frameworks to list.
    - Omit the Contributors section for packages with no public contributors.

From 8ed0162f26a847ee9537b0fcb59bdee8daed3216 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Tue, 5 May 2026 16:27:25 +0100
Subject: [PATCH 084/298] Feature | Implement SqlConnection.GetSchemaAsync
 (#3005)

---
 .../SqlConnection.xml                         | 69 ++++++++++++++-
 .../ref/Microsoft.Data.SqlClient.cs           | 15 ++++
 .../Data/ProviderBase/DbConnectionClosed.cs   | 10 +++
 .../Data/ProviderBase/DbConnectionInternal.cs | 16 ++++
 .../Microsoft/Data/SqlClient/SqlConnection.cs | 31 +++++++
 .../Data/SqlClient/SqlMetaDataFactory.cs      | 66 ++++++++++-----
 .../FunctionalTests/SqlConnectionTest.cs      | 42 ++++++++++
 .../ConnectionSchemaTest.cs                   | 80 ++++++++++--------
 .../SqlSchemaInfoTest/SqlSchemaInfoTest.cs    | 84 +++++++++++++++++--
 .../tests/ManualTests/SQL/UdtTest/UdtTest2.cs | 12 ++-
 .../SimulatedServerTests/ConnectionTests.cs   |  3 +-
 11 files changed, 356 insertions(+), 72 deletions(-)

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
index f2e03ebf26..55b60b6120 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@@ -1371,12 +1371,28 @@ For more information on working with events, see [Connection Events](https://lea
     </FireInfoMessageEventOnUserErrors>
     <GetSchema2>
       <summary>
-        Returns schema information for the data source of this <see cref="T:Microsoft.Data.SqlClient.SqlConnection" />. For more information about scheme, see <see href="https://learn.microsoft.com/sql/connect/ado-net/sql-server-schema-collections">SQL Server Schema Collections</see>.
+        Returns schema information for the data source of this <see cref="T:Microsoft.Data.SqlClient.SqlConnection" />. For more information about schemas, see <see href="https://learn.microsoft.com/sql/connect/ado-net/sql-server-schema-collections">SQL Server Schema Collections</see>.
       </summary>
       <returns>
         A <see cref="T:System.Data.DataTable" /> that contains schema information.
       </returns>
     </GetSchema2>
+    <GetSchemaAsync>
+      <param name="cancellationToken">
+        The cancellation token.
+      </param>
+      <summary>
+        An asynchronous version of <see cref="M:Microsoft.Data.SqlClient.SqlConnection.GetSchema()" />, which returns schema information for the data source of this <see cref="T:Microsoft.Data.SqlClient.SqlConnection" />. For more information about schemas, see <see href="https://learn.microsoft.com/sql/connect/ado-net/sql-server-schema-collections">SQL Server Schema Collections</see>.
+      </summary>
+      <returns>
+        A task representing the asynchronous operation.
+      </returns>
+      <remarks>
+        <para>
+          For more information about asynchronous programming in the .NET Framework Data Provider for SQL Server, see <see href="https://learn.microsoft.com/sql/connect/ado-net/asynchronous-programming">Asynchronous Programming</see>.
+        </para>
+      </remarks>
+    </GetSchemaAsync>
     <GetSchemaCollectionName>
       <param name="collectionName">
         Specifies the name of the schema to return.
@@ -1662,6 +1678,28 @@ For more information on working with events, see [Connection Events](https://lea
         <paramref name="collectionName" /> is specified as null.
       </exception>
     </GetSchemaCollectionName>
+    <GetSchemaCollectionNameAsync>
+      <param name="collectionName">
+        Specifies the name of the schema to return.
+      </param>
+      <param name="cancellationToken">
+        The cancellation token.
+      </param>
+      <summary>
+        An asynchronous version of <see cref="M:Microsoft.Data.SqlClient.SqlConnection.GetSchema(string)" />, which returns schema information for the data source of this <see cref="T:Microsoft.Data.SqlClient.SqlConnection" /> using the specified string for the schema name.
+      </summary>
+      <returns>
+        A task representing the asynchronous operation.
+      </returns>
+      <remarks>
+        <para>
+          For more information about asynchronous programming in the .NET Framework Data Provider for SQL Server, see <see href="https://learn.microsoft.com/sql/connect/ado-net/asynchronous-programming">Asynchronous Programming</see>.
+        </para>
+      </remarks>
+      <exception cref="T:System.ArgumentException">
+        <paramref name="collectionName" /> is specified as null.
+      </exception>
+    </GetSchemaCollectionNameAsync>
     <GetSchemaCollectionNameRestrictionValues>
       <param name="collectionName">
         Specifies the name of the schema to return.
@@ -1691,6 +1729,35 @@ For more information on working with events, see [Connection Events](https://lea
       </exception>
       <seealso cref="M:Microsoft.Data.SqlClient.SqlConnection.GetSchema" />
     </GetSchemaCollectionNameRestrictionValues>
+    <GetSchemaCollectionNameRestrictionValuesAsync>
+      <param name="collectionName">
+        Specifies the name of the schema to return.
+      </param>
+      <param name="restrictionValues">
+        A set of restriction values for the requested schema.
+      </param>
+      <param name="cancellationToken">
+        The cancellation token.
+      </param>
+      <summary>
+        An asynchronous version of <see cref="M:Microsoft.Data.SqlClient.SqlConnection.GetSchema(string, string[])" />, which returns schema information for the data source of this <see cref="T:Microsoft.Data.SqlClient.SqlConnection" /> using the specified string for the schema name and the specified string array for the restriction values.
+      </summary>
+      <returns>
+        A task representing the asynchronous operation.
+      </returns>
+      <remarks>
+        <para>
+          The <paramref name="restrictionValues" /> parameter can supply <i>n</i> depth of values, which are specified by the restrictions collection for a specific collection. In order to set values on a given restriction, and not set the values of other restrictions, you need to set the preceding restrictions to <see langword="null" /> and then put the appropriate value in for the restriction that you would like to specify a value for.
+        </para>
+        <para>
+          An example of this is the "Tables" collection. If the "Tables" collection has three restrictions--database, owner, and table name--and you want to get back only the tables associated with the owner "Carl", you need to pass in the following values: null, "Carl". If a restriction value is not passed in, the default values are used for that restriction. This is the same mapping as passing in <see langword="null" />, which is different from passing in an empty string for the parameter value. In that case, the empty string ("") is considered to be the value for the specified parameter.
+        </para>
+      </remarks>
+      <exception cref="T:System.ArgumentException">
+        <paramref name="collectionName" /> is specified as null.
+      </exception>
+      <seealso cref="M:Microsoft.Data.SqlClient.SqlConnection.GetSchema" />
+    </GetSchemaCollectionNameRestrictionValuesAsync>
     <InfoMessage>
       <summary>
         Occurs when SQL Server returns a warning or informational message.
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
index de581dbb0e..e52cbdc8d3 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
@@ -1099,6 +1099,21 @@ public event Microsoft.Data.SqlClient.SqlInfoMessageEventHandler InfoMessage { a
     public override System.Data.DataTable GetSchema(string collectionName) { throw null; }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionNameRestrictionValues/*'/>
     public override System.Data.DataTable GetSchema(string collectionName, string[] restrictionValues) { throw null; }
+    #if NET
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaAsync/*'/>
+    public override System.Threading.Tasks.Task<System.Data.DataTable> GetSchemaAsync(System.Threading.CancellationToken cancellationToken = default) { throw null; }
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionNameAsync/*'/>
+    public override System.Threading.Tasks.Task<System.Data.DataTable> GetSchemaAsync(string collectionName, System.Threading.CancellationToken cancellationToken = default) { throw null; }
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionNameRestrictionValuesAsync/*'/>
+    public override System.Threading.Tasks.Task<System.Data.DataTable> GetSchemaAsync(string collectionName, string[] restrictionValues, System.Threading.CancellationToken cancellationToken = default) { throw null; }
+    #else
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaAsync/*'/>
+    public System.Threading.Tasks.Task<System.Data.DataTable> GetSchemaAsync(System.Threading.CancellationToken cancellationToken = default) { throw null; }
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionNameAsync/*'/>
+    public System.Threading.Tasks.Task<System.Data.DataTable> GetSchemaAsync(string collectionName, System.Threading.CancellationToken cancellationToken = default) { throw null; }
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionNameRestrictionValuesAsync/*'/>
+    public System.Threading.Tasks.Task<System.Data.DataTable> GetSchemaAsync(string collectionName, string[] restrictionValues, System.Threading.CancellationToken cancellationToken = default) { throw null; }
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/Open/*'/>
     public override void Open() { }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/OpenWithOverrides/*'/>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
index 15c32053d6..91b9be9b6a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
@@ -5,6 +5,7 @@
 using System.Data;
 using System.Data.Common;
 using System.Diagnostics;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.Common;
 using Microsoft.Data.Common.ConnectionString;
@@ -48,6 +49,15 @@ protected internal override DataTable GetSchema(
             throw ADP.ClosedConnectionError();
         }
 
+        protected internal override Task<DataTable> GetSchemaAsync(
+            SqlConnectionFactory factory,
+            DbConnectionPoolGroup poolGroup,
+            DbConnection outerConnection,
+            string collectionName,
+            string[] restrictions,
+            CancellationToken cancellationToken)
+            => throw ADP.ClosedConnectionError();
+
         protected override DbReferenceCollection CreateReferenceCollection() => throw ADP.ClosedConnectionError();
 
         internal override bool TryOpenConnection(
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
index 5d3143783f..67ef4a533a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -878,6 +878,22 @@ protected internal virtual DataTable GetSchema(
             return metaDataFactory.GetSchema(outerConnection, collectionName, restrictions);
         }
 
+        protected internal virtual Task<DataTable> GetSchemaAsync(
+            SqlConnectionFactory factory,
+            DbConnectionPoolGroup poolGroup,
+            DbConnection outerConnection,
+            string collectionName,
+            string[] restrictions,
+            CancellationToken cancellationToken)
+        {
+            Debug.Assert(outerConnection is not null, "outerConnection may not be null.");
+
+            SqlMetaDataFactory metaDataFactory = factory.GetMetaDataFactory(poolGroup, this);
+            Debug.Assert(metaDataFactory is not null, "metaDataFactory may not be null.");
+
+            return metaDataFactory.GetSchemaAsync(outerConnection, collectionName, restrictions, cancellationToken);
+        }
+
         protected virtual bool ObtainAdditionalLocksForClose()
         {
             // No additional locks in default implementation
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index 127f47e19d..fa7a456e1a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -2026,12 +2026,32 @@ public override DataTable GetSchema()
             return GetSchema(DbMetaDataCollectionNames.MetaDataCollections, null);
         }
 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaAsync/*' />
+#if NET
+        public override Task<DataTable> GetSchemaAsync(CancellationToken cancellationToken = default)
+#else
+        public Task<DataTable> GetSchemaAsync(CancellationToken cancellationToken = default)
+#endif
+        {
+            return GetSchemaAsync(DbMetaDataCollectionNames.MetaDataCollections, cancellationToken);
+        }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionName/*' />
         public override DataTable GetSchema(string collectionName)
         {
             return GetSchema(collectionName, null);
         }
 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionNameAsync/*' />
+#if NET
+        public override Task<DataTable> GetSchemaAsync(string collectionName, CancellationToken cancellationToken = default)
+#else
+        public Task<DataTable> GetSchemaAsync(string collectionName, CancellationToken cancellationToken = default)
+#endif
+        {
+            return GetSchemaAsync(collectionName, null, cancellationToken);
+        }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionNameRestrictionValues/*' />
         public override DataTable GetSchema(string collectionName, string[] restrictionValues)
         {
@@ -2042,6 +2062,17 @@ public override DataTable GetSchema(string collectionName, string[] restrictionV
             return InnerConnection.GetSchema(ConnectionFactory, PoolGroup, this, collectionName, restrictionValues);
         }
 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/GetSchemaCollectionNameRestrictionValuesAsync/*' />
+#if NET
+        public override Task<DataTable> GetSchemaAsync(string collectionName, string[] restrictionValues, CancellationToken cancellationToken = default)
+#else
+        public Task<DataTable> GetSchemaAsync(string collectionName, string[] restrictionValues, CancellationToken cancellationToken = default)
+#endif
+        {
+            SqlClientEventSource.Log.TryTraceEvent("SqlConnection.GetSchemaAsync | Info | Object Id {0}, Collection Name '{1}'", ObjectID, collectionName);
+            return InnerConnection.GetSchemaAsync(ConnectionFactory, PoolGroup, this, collectionName, restrictionValues, cancellationToken);
+        }
+
 #if NET
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/CanCreateBatch/*'/>
         public override bool CanCreateBatch => true;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
index ca3dec0658..0c659579e7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
@@ -10,6 +10,8 @@
 using System.Globalization;
 using System.IO;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Xml;
 using Microsoft.Data.Common;
 
@@ -159,13 +161,20 @@ private DataRow FindMetaDataCollectionRow(string collectionName)
 
         }
 
-        public DataTable GetSchema(DbConnection connection, string collectionName, string[] restrictions)
+        public DataTable GetSchema(DbConnection connection, string collectionName, string[] restrictions) =>
+            GetSchemaCore(connection, collectionName, restrictions, isAsync: false, default).Result;
+
+        public async Task<DataTable> GetSchemaAsync(DbConnection connection, string collectionName, string[] restrictions, CancellationToken cancellationToken) =>
+            await GetSchemaCore(connection, collectionName, restrictions, isAsync: true, cancellationToken).ConfigureAwait(false);
+
+        public async ValueTask<DataTable> GetSchemaCore(DbConnection connection, string collectionName, string[] restrictions, bool isAsync, CancellationToken cancellationToken)
         {
             const string DataTableKey = "DataTable";
             const string SqlCommandKey = "SQLCommand";
             const string PrepareCollectionKey = "PrepareCollection";
 
             Debug.Assert(_collectionDataSet is not null);
+            cancellationToken.ThrowIfCancellationRequested();
 
             DataTable metaDataCollectionsTable = _collectionDataSet.Tables[DbMetaDataCollectionNames.MetaDataCollections];
             DataColumn populationMechanismColumn = metaDataCollectionsTable.Columns[PopulationMechanismKey];
@@ -187,6 +196,7 @@ public DataTable GetSchema(DbConnection connection, string collectionName, strin
                 }
             }
 
+            cancellationToken.ThrowIfCancellationRequested();
             string populationMechanism = requestedCollectionRow[populationMechanismColumn, DataRowVersion.Current] as string;
 
             DataTable requestedSchema;
@@ -207,11 +217,11 @@ public DataTable GetSchema(DbConnection connection, string collectionName, strin
                     break;
 
                 case SqlCommandKey:
-                    requestedSchema = ExecuteCommand(requestedCollectionRow, restrictions, connection);
+                    requestedSchema = await ExecuteCommandAsync(requestedCollectionRow, restrictions, connection, isAsync, cancellationToken);
                     break;
 
                 case PrepareCollectionKey:
-                    requestedSchema = PrepareCollection(exactCollectionName, restrictions, connection);
+                    requestedSchema = await PrepareCollectionAsync(exactCollectionName, restrictions, connection, isAsync, cancellationToken);
                     break;
 
                 default:
@@ -360,7 +370,7 @@ private string GetParameterName(string neededCollectionName, int neededRestricti
             return result;
         }
 
-        private DataTable ExecuteCommand(DataRow requestedCollectionRow, string[] restrictions, DbConnection connection)
+        private async ValueTask<DataTable> ExecuteCommandAsync(DataRow requestedCollectionRow, string[] restrictions, DbConnection connection, bool isAsync, CancellationToken cancellationToken)
         {
             Debug.Assert(requestedCollectionRow is not null);
 
@@ -410,7 +420,7 @@ private DataTable ExecuteCommand(DataRow requestedCollectionRow, string[] restri
             {
                 try
                 {
-                    reader = command.ExecuteReader();
+                    reader = isAsync ? await command.ExecuteReaderAsync(cancellationToken) : command.ExecuteReader();
                 }
                 catch (Exception e)
                 {
@@ -427,16 +437,26 @@ private DataTable ExecuteCommand(DataRow requestedCollectionRow, string[] restri
                     Locale = CultureInfo.InvariantCulture
                 };
 
+                // reader.GetColumnSchema waits synchronously for the reader to receive its type metadata.
+                // Instead, we invoke reader.ReadAsync outside of the while loop, which will implicitly ensure that
+                // the metadata is available. ReadAsync/Read will throw an exception if necessary, so we can trust
+                // that the list of fields is available if the call returns.
+                bool firstResultAvailable = isAsync ? await reader.ReadAsync(cancellationToken) : reader.Read();
                 System.Collections.ObjectModel.ReadOnlyCollection<DbColumn> colSchema = reader.GetColumnSchema();
+
                 foreach (DbColumn col in colSchema)
                 {
                     resultTable.Columns.Add(col.ColumnName, col.DataType);
                 }
-                object[] values = new object[resultTable.Columns.Count];
-                while (reader.Read())
+
+                if (firstResultAvailable)
                 {
-                    reader.GetValues(values);
-                    resultTable.Rows.Add(values);
+                    object[] values = new object[resultTable.Columns.Count];
+                    do
+                    {
+                        reader.GetValues(values);
+                        resultTable.Rows.Add(values);
+                    } while (isAsync ? await reader.ReadAsync(cancellationToken) : reader.Read());
                 }
             }
             finally
@@ -448,7 +468,7 @@ private DataTable ExecuteCommand(DataRow requestedCollectionRow, string[] restri
         #endregion
 
         #region GetSchema Helpers: PrepareCollection Population Method
-        private static void AddUDTsToDataTypesTable(DataTable dataTypesTable, SqlConnection connection, string serverVersion)
+        private static async ValueTask AddUDTsToDataTypesTableAsync(DataTable dataTypesTable, SqlConnection connection, string serverVersion, bool isAsync, CancellationToken cancellationToken)
         {
             const string GetEngineEditionSqlCommand = "SELECT SERVERPROPERTY('EngineEdition');";
             const string ListUdtSqlCommand =
@@ -487,7 +507,7 @@ private static void AddUDTsToDataTypesTable(DataTable dataTypesTable, SqlConnect
             using SqlCommand command = connection.CreateCommand();
 
             command.CommandText = GetEngineEditionSqlCommand;
-            int engineEdition = (int)command.ExecuteScalar();
+            int engineEdition = (int)(isAsync ? await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false) : command.ExecuteScalar());
 
             if (s_assemblyPropertyUnsupportedEngines.Contains(engineEdition))
             {
@@ -516,10 +536,10 @@ private static void AddUDTsToDataTypesTable(DataTable dataTypesTable, SqlConnect
             // Execute the SELECT statement
             command.CommandText = ListUdtSqlCommand;
 
-            using SqlDataReader reader = command.ExecuteReader();
+            using SqlDataReader reader = isAsync ? await command.ExecuteReaderAsync(cancellationToken).ConfigureAwait(false) : command.ExecuteReader();
             object[] values = new object[11];
 
-            while (reader.Read())
+            while (isAsync ? await reader.ReadAsync(cancellationToken).ConfigureAwait(false) : reader.Read())
             {
                 reader.GetValues(values);
                 DataRow newRow = dataTypesTable.NewRow();
@@ -577,10 +597,12 @@ private static void AddUDTsToDataTypesTable(DataTable dataTypesTable, SqlConnect
                     dataTypesTable.Rows.Add(newRow);
                     newRow.AcceptChanges();
                 } // if assembly name
+
+                cancellationToken.ThrowIfCancellationRequested();
             }//end while
         }
 
-        private static void AddTVPsToDataTypesTable(DataTable dataTypesTable, SqlConnection connection, string serverVersion)
+        private static async ValueTask AddTVPsToDataTypesTableAsync(DataTable dataTypesTable, SqlConnection connection, string serverVersion, bool isAsync, CancellationToken cancellationToken)
         {
             const string ListTvpsSqlCommand =
                 "select " +
@@ -618,10 +640,10 @@ private static void AddTVPsToDataTypesTable(DataTable dataTypesTable, SqlConnect
             Debug.Assert(typeName is not null, "typeName column not found");
             Debug.Assert(isNullable is not null, "isNullable column not found");
 
-            using SqlDataReader reader = command.ExecuteReader();
+            using SqlDataReader reader = isAsync ? await command.ExecuteReaderAsync(cancellationToken).ConfigureAwait(false) : command.ExecuteReader();
 
             object[] values = new object[11];
-            while (reader.Read())
+            while (isAsync ? await reader.ReadAsync(cancellationToken) : reader.Read())
             {
 
                 reader.GetValues(values);
@@ -641,10 +663,12 @@ private static void AddTVPsToDataTypesTable(DataTable dataTypesTable, SqlConnect
 
                 dataTypesTable.Rows.Add(newRow);
                 newRow.AcceptChanges();
+
+                cancellationToken.ThrowIfCancellationRequested();
             }//end while
         }
 
-        private DataTable GetDataTypesTable(SqlConnection connection)
+        private async ValueTask<DataTable> GetDataTypesTable(SqlConnection connection, bool isAsync, CancellationToken cancellationToken)
         {
             // verify the existence of the table in the data set
             Debug.Assert(_collectionDataSet.Tables.Contains(DbMetaDataCollectionNames.DataTypes), "DataTypes collection not found in the DataSet");
@@ -652,14 +676,14 @@ private DataTable GetDataTypesTable(SqlConnection connection)
             // copy the table filtering out any rows that don't apply to tho current version of the provider
             DataTable dataTypesTable = CloneAndFilterCollection(DbMetaDataCollectionNames.DataTypes, []);
 
-            AddUDTsToDataTypesTable(dataTypesTable, connection, _serverVersion);
-            AddTVPsToDataTypesTable(dataTypesTable, connection, _serverVersion);
+            await AddUDTsToDataTypesTableAsync(dataTypesTable, connection, _serverVersion, isAsync, cancellationToken).ConfigureAwait(false);
+            await AddTVPsToDataTypesTableAsync(dataTypesTable, connection, _serverVersion, isAsync, cancellationToken).ConfigureAwait(false);
 
             dataTypesTable.AcceptChanges();
             return dataTypesTable;
         }
 
-        private DataTable PrepareCollection(string collectionName, string[] restrictions, DbConnection connection)
+        private async ValueTask<DataTable> PrepareCollectionAsync(string collectionName, string[] restrictions, DbConnection connection, bool isAsync, CancellationToken cancellationToken)
         {
             SqlConnection sqlConnection = (SqlConnection)connection;
             DataTable resultTable = null;
@@ -670,7 +694,7 @@ private DataTable PrepareCollection(string collectionName, string[] restrictions
                 {
                     throw ADP.TooManyRestrictions(DbMetaDataCollectionNames.DataTypes);
                 }
-                resultTable = GetDataTypesTable(sqlConnection);
+                resultTable = await GetDataTypesTable(sqlConnection, isAsync, cancellationToken).ConfigureAwait(false);
             }
 
             if (resultTable == null)
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
index d61866f176..f203920df1 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using Xunit;
 using System.Reflection;
+using System.Threading.Tasks;
 
 namespace Microsoft.Data.SqlClient.Tests
 {
@@ -354,6 +355,47 @@ public void GetSchema_Connection_Closed()
             Assert.NotNull(ex.Message);
         }
 
+        [Fact]
+        public async Task GetSchemaAsync_Connection_Closed()
+        {
+            SqlConnection cn = new SqlConnection();
+
+            InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(() => cn.GetSchemaAsync());
+            // Invalid operation. The connection is closed
+            Assert.Null(ex.InnerException);
+            Assert.NotNull(ex.Message);
+
+            ex = await Assert.ThrowsAsync<InvalidOperationException>(() => cn.GetSchemaAsync("Tables"));
+            // Invalid operation. The connection is closed
+            Assert.Null(ex.InnerException);
+            Assert.NotNull(ex.Message);
+
+            ex = await Assert.ThrowsAsync<InvalidOperationException>(() => cn.GetSchemaAsync(null));
+            // Invalid operation. The connection is closed
+            Assert.Null(ex.InnerException);
+            Assert.NotNull(ex.Message);
+
+            ex = await Assert.ThrowsAsync<InvalidOperationException>(() => cn.GetSchemaAsync("Tables", new string[] { "master" }));
+            // Invalid operation. The connection is closed
+            Assert.Null(ex.InnerException);
+            Assert.NotNull(ex.Message);
+
+            ex = await Assert.ThrowsAsync<InvalidOperationException>(() => cn.GetSchemaAsync(null, new string[] { "master" }));
+            // Invalid operation. The connection is closed
+            Assert.Null(ex.InnerException);
+            Assert.NotNull(ex.Message);
+
+            ex = await Assert.ThrowsAsync<InvalidOperationException>(() => cn.GetSchemaAsync("Tables", null));
+            // Invalid operation. The connection is closed
+            Assert.Null(ex.InnerException);
+            Assert.NotNull(ex.Message);
+
+            ex = await Assert.ThrowsAsync<InvalidOperationException>(() => cn.GetSchemaAsync(null, null));
+            // Invalid operation. The connection is closed
+            Assert.Null(ex.InnerException);
+            Assert.NotNull(ex.Message);
+        }
+
         [Theory]
         [InlineData("Authentication = ActiveDirectoryIntegrated;Password = ''")]
         [InlineData("Authentication = ActiveDirectoryIntegrated;PWD = ''")]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs
index 41e6ecb451..e765f56ce8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.Data;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
@@ -18,96 +19,96 @@ public static bool CanRunSchemaTests()
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetTablesFromSchema()
+        public static async Task GetTablesFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.Tables, new string[] { "TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME", "TABLE_TYPE" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.Tables, new string[] { "TABLE_CATALOG", "TABLE_SCHEMA", "TABLE_NAME", "TABLE_TYPE" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetProceduresFromSchema()
+        public static async Task GetProceduresFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.Procedures, new string[] { "ROUTINE_SCHEMA", "ROUTINE_NAME", "ROUTINE_TYPE" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.Procedures, new string[] { "ROUTINE_SCHEMA", "ROUTINE_NAME", "ROUTINE_TYPE" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetProcedureParametersFromSchema()
+        public static async Task GetProcedureParametersFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.ProcedureParameters, new string[] { "PARAMETER_MODE", "PARAMETER_NAME" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.ProcedureParameters, new string[] { "PARAMETER_MODE", "PARAMETER_NAME" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetDatabasesFromSchema()
+        public static async Task GetDatabasesFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.Databases, new string[] { "database_name", "dbid", "create_date" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.Databases, new string[] { "database_name", "dbid", "create_date" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetForeignKeysFromSchema()
+        public static async Task GetForeignKeysFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.ForeignKeys, new string[] { "CONSTRAINT_TYPE", "IS_DEFERRABLE", "INITIALLY_DEFERRED" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.ForeignKeys, new string[] { "CONSTRAINT_TYPE", "IS_DEFERRABLE", "INITIALLY_DEFERRED" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetIndexesFromSchema()
+        public static async Task GetIndexesFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.Indexes, new string[] { "index_name", "constraint_name" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.Indexes, new string[] { "index_name", "constraint_name" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetIndexColumnsFromSchema()
+        public static async Task GetIndexColumnsFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.IndexColumns, new string[] { "index_name", "KeyType", "column_name" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.IndexColumns, new string[] { "index_name", "KeyType", "column_name" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetColumnsFromSchema()
+        public static async Task GetColumnsFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.Columns, new string[] { "IS_NULLABLE", "COLUMN_DEFAULT" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.Columns, new string[] { "IS_NULLABLE", "COLUMN_DEFAULT" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetAllColumnsFromSchema()
+        public static async Task GetAllColumnsFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.AllColumns, new string[] { "IS_NULLABLE", "COLUMN_DEFAULT", "IS_FILESTREAM", "IS_SPARSE", "IS_COLUMN_SET" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.AllColumns, new string[] { "IS_NULLABLE", "COLUMN_DEFAULT", "IS_FILESTREAM", "IS_SPARSE", "IS_COLUMN_SET" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetColumnSetColumnsFromSchema()
+        public static async Task GetColumnSetColumnsFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.ColumnSetColumns, new string[] { "IS_NULLABLE", "COLUMN_DEFAULT", "IS_FILESTREAM", "IS_SPARSE", "IS_COLUMN_SET" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.ColumnSetColumns, new string[] { "IS_NULLABLE", "COLUMN_DEFAULT", "IS_FILESTREAM", "IS_SPARSE", "IS_COLUMN_SET" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetUsersFromSchema()
+        public static async Task GetUsersFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.Users, new string[] { "uid", "user_name" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.Users, new string[] { "uid", "user_name" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetViewsFromSchema()
+        public static async Task GetViewsFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.Views, new string[] { "TABLE_NAME", "CHECK_OPTION", "IS_UPDATABLE" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.Views, new string[] { "TABLE_NAME", "CHECK_OPTION", "IS_UPDATABLE" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetViewColumnsFromSchema()
+        public static async Task GetViewColumnsFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.ViewColumns, new string[] { "VIEW_CATALOG", "VIEW_SCHEMA", "VIEW_NAME" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.ViewColumns, new string[] { "VIEW_CATALOG", "VIEW_SCHEMA", "VIEW_NAME" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetUserDefinedTypesFromSchema()
+        public static async Task GetUserDefinedTypesFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.UserDefinedTypes, new string[] { "assembly_name", "version_revision", "culture_info" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.UserDefinedTypes, new string[] { "assembly_name", "version_revision", "culture_info" });
         }
 
         [ConditionalFact(nameof(CanRunSchemaTests))]
-        public static void GetStructuredTypeMembersFromSchema()
+        public static async Task GetStructuredTypeMembersFromSchema()
         {
-            VerifySchemaTable(SqlClientMetaDataCollectionNames.StructuredTypeMembers, new string[] { "TYPE_CATALOG", "TYPE_SCHEMA", "TYPE_NAME", "MEMBER_NAME", "ORDINAL_POSITION" });
+            await VerifySchemaTable(SqlClientMetaDataCollectionNames.StructuredTypeMembers, new string[] { "TYPE_CATALOG", "TYPE_SCHEMA", "TYPE_NAME", "MEMBER_NAME", "ORDINAL_POSITION" });
         }
 
-        private static void VerifySchemaTable(string schemaItemName, string[] testColumnNames)
+        private static async Task VerifySchemaTable(string schemaItemName, string[] testColumnNames)
         {
             SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString)
             {
@@ -118,17 +119,24 @@ private static void VerifySchemaTable(string schemaItemName, string[] testColumn
             {
                 // Connect to the database then retrieve the schema information
                 connection.Open();
-                DataTable table = connection.GetSchema(schemaItemName);
+                DataTable syncTable = connection.GetSchema(schemaItemName);
+                DataTable asyncTable = await connection.GetSchemaAsync(schemaItemName);
 
                 // Get all table columns
-                HashSet<string> columnNames = new HashSet<string>();
+                HashSet<string> syncColumnNames = new HashSet<string>();
+                HashSet<string> asyncColumnNames = new HashSet<string>();
 
-                foreach (DataColumn column in table.Columns)
+                foreach (DataColumn column in syncTable.Columns)
                 {
-                    columnNames.Add(column.ColumnName);
+                    syncColumnNames.Add(column.ColumnName);
+                }
+                foreach (DataColumn column in asyncTable.Columns)
+                {
+                    asyncColumnNames.Add(column.ColumnName);
                 }
 
-                Assert.All<string>(testColumnNames, column => Assert.Contains<string>(column, columnNames));
+                Assert.All<string>(testColumnNames, column => Assert.Contains<string>(column, syncColumnNames));
+                Assert.All<string>(testColumnNames, column => Assert.Contains<string>(column, asyncColumnNames));
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs
index 742a4fbbad..6f4c602c27 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs
@@ -8,6 +8,7 @@
 using System.Data;
 using System.Data.Common;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
@@ -22,23 +23,35 @@ public static void TestGetSchema(bool openTransaction)
         {
             using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
             {
-                conn.Open();
-                DataTable dataBases;
+                SqlTransaction transaction = null;
 
-                if (openTransaction)
+                conn.Open();
+                try
                 {
-                    using (SqlTransaction transaction = conn.BeginTransaction())
+                    if (openTransaction)
                     {
-                        dataBases = conn.GetSchema("DATABASES");
+                        transaction = conn.BeginTransaction();
                     }
+
+                    DataTable dataBases = conn.GetSchema("DATABASES");
+                    Assert.True(dataBases.Rows.Count > 0, "At least one database is expected");
+
+                    string firstDatabaseName = dataBases.Rows[0]["database_name"] as string;
+                    dataBases = conn.GetSchema("DATABASES", [firstDatabaseName]);
+
+                    Assert.Equal(1, dataBases.Rows.Count);
+                    Assert.Equal(firstDatabaseName, dataBases.Rows[0]["database_name"] as string);
+
+                    string nonexistentDatabaseName = DataTestUtility.GenerateRandomCharacters("NonExistentDatabase_");
+                    dataBases = conn.GetSchema("DATABASES", [nonexistentDatabaseName]);
+
+                    Assert.Equal(0, dataBases.Rows.Count);
                 }
-                else
+                finally
                 {
-                    dataBases = conn.GetSchema("DATABASES");
+                    transaction?.Dispose();
                 }
 
-                Assert.True(dataBases.Rows.Count > 0, "At least one database is expected");
-
                 DataTable metaDataCollections = conn.GetSchema(DbMetaDataCollectionNames.MetaDataCollections);
                 Assert.True(metaDataCollections != null && metaDataCollections.Rows.Count > 0);
 
@@ -57,6 +70,59 @@ public static void TestGetSchema(bool openTransaction)
             }
         }
 
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [InlineData(true)]
+        [InlineData(false)]
+        public static async Task TestGetSchemaAsync(bool openTransaction)
+        {
+            using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
+            {
+                SqlTransaction transaction = null;
+
+                await conn.OpenAsync();
+                try
+                {
+                    if (openTransaction)
+                    {
+                        transaction = conn.BeginTransaction();
+                    }
+
+                    DataTable dataBases = await conn.GetSchemaAsync("DATABASES");
+                    Assert.True(dataBases.Rows.Count > 0, "At least one database is expected");
+
+                    string firstDatabaseName = dataBases.Rows[0]["database_name"] as string;
+                    dataBases = await conn.GetSchemaAsync("DATABASES", [firstDatabaseName]);
+
+                    Assert.Equal(1, dataBases.Rows.Count);
+                    Assert.Equal(firstDatabaseName, dataBases.Rows[0]["database_name"] as string);
+
+                    string nonexistentDatabaseName = DataTestUtility.GenerateRandomCharacters("NonExistentDatabase_");
+                    dataBases = await conn.GetSchemaAsync("DATABASES", [nonexistentDatabaseName]);
+
+                    Assert.Equal(0, dataBases.Rows.Count);
+                }
+                finally
+                {
+                    transaction?.Dispose();
+                }
+
+                DataTable metaDataCollections = await conn.GetSchemaAsync(DbMetaDataCollectionNames.MetaDataCollections);
+                Assert.True(metaDataCollections != null && metaDataCollections.Rows.Count > 0);
+
+                DataTable metaDataSourceInfo = await conn.GetSchemaAsync(DbMetaDataCollectionNames.DataSourceInformation);
+                Assert.True(metaDataSourceInfo != null && metaDataSourceInfo.Rows.Count > 0);
+
+                DataTable metaDataTypes = await conn.GetSchemaAsync(DbMetaDataCollectionNames.DataTypes);
+                Assert.True(metaDataTypes != null && metaDataTypes.Rows.Count > 0);
+
+                var tinyintRow = metaDataTypes.Rows.OfType<DataRow>().Where(p => (string)p["TypeName"] == "tinyint");
+                foreach (var row in tinyintRow)
+                {
+                    Assert.True((String)row["TypeName"] == "tinyint" && (String)row["DataType"] == "System.Byte" && (bool)row["IsUnsigned"]);
+                }
+            }
+        }
+
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         public static void TestCommandBuilder()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
index 1dae314730..2159589f9c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
@@ -518,18 +518,22 @@ public void TestSchemaTable()
 
                 using (SqlDataReader reader = cmd.ExecuteReader())
                 {
-                    DataTable t = reader.GetSchemaTable();
+                    DataTable syncSchemaTable = reader.GetSchemaTable();
 
                     string expectedSchemaTableValues =
                         "ids, 0, 4, 10, 255, False, , , , ids, , , System.Int32, True, 8, , , False, False, False, , False, False, System.Data.SqlTypes.SqlInt32, int, , , , , 8, False, " + Environment.NewLine +
                         "pos, 1, 20, 255, 255, False, , , , pos, , , Line, True, 29, , , False, False, False, , False, False, Line, UdtTestDb.dbo.Line, , , , Line, Shapes, Version=1.2.0.0, Culture=neutral, PublicKeyToken=a3e3aa32e6a16344, 29, False, " + Environment.NewLine;
 
                     StringBuilder builder = new StringBuilder();
-                    foreach (DataRow row in t.Rows)
+                    for (int i = 0; i < syncSchemaTable.Rows.Count; i++)
                     {
-                        foreach (DataColumn col in t.Columns)
+                        DataRow syncRow = syncSchemaTable.Rows[i];
+
+                        for (int j = 0; j < syncSchemaTable.Columns.Count; j++)
                         {
-                            builder.Append(row[col] + ", ");
+                            DataColumn syncColumn = syncSchemaTable.Columns[j];
+
+                            builder.Append(syncRow[syncColumn] + ", ");
                         }
 
                         builder.AppendLine();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index e3a4e26957..57e8d17632 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -352,10 +352,11 @@ public void SqlConnectionInvalidParameters(string connString)
         }
 
         [Fact]
-        public void ClosedConnectionSchemaRetrieval()
+        public async Task ClosedConnectionSchemaRetrieval()
         {
             using SqlConnection connection = new(string.Empty);
             Assert.Throws<InvalidOperationException>(() => connection.GetSchema());
+            await Assert.ThrowsAsync<InvalidOperationException>(() => connection.GetSchemaAsync());
         }
 
         [Theory]

From be95ca2928f9947dd4a9c4c00dc839ad40cc66e3 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Tue, 5 May 2026 17:36:36 -0700
Subject: [PATCH 085/298] Remove connection options inheritance (#4237)

* Rename SqlConnectionString to SqlConnectionOptions

* Remove the DbConnectionOptions parent class.

* Fix netfx compilation issues.

* Add comments and missing using.

* Fix compilation issues.

* Fix compilation issues.

* Remove stale file.

* Clean up redundant casts.

* Fix unit tests.

* Fix compilation issue.

* Fix test connection string.
---
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |   2 +-
 .../ConnectionString/DbConnectionOptions.cs   | 782 ------------------
 .../DbConnectionString.netfx.cs               |  14 +-
 .../Data/ProviderBase/DbConnectionClosed.cs   |  11 +-
 .../Data/ProviderBase/DbConnectionInternal.cs |   7 +-
 .../Data/SqlClient/Connection/ServerInfo.cs   |   8 +-
 .../Connection/SqlConnectionInternal.cs       |  26 +-
 .../ConnectionPool/ChannelDbConnectionPool.cs |   9 +-
 .../ConnectionPool/DbConnectionPoolGroup.cs   |   7 +-
 .../ConnectionPool/IDbConnectionPool.cs       |   5 +-
 .../SqlConnectionPoolGroupProviderInfo.cs     |   8 +-
 .../WaitHandleDbConnectionPool.cs             |  17 +-
 .../SqlClient/SSPI/SspiContextProvider.cs     |   2 +-
 .../SqlClient/SqlClientPermission.netfx.cs    |  10 +-
 .../Microsoft/Data/SqlClient/SqlConnection.cs | 163 ++--
 .../Data/SqlClient/SqlConnectionFactory.cs    |  50 +-
 .../SqlConnectionOptions.Debug.cs}            |  39 +-
 ...ctionString.cs => SqlConnectionOptions.cs} | 770 ++++++++++++++++-
 .../SqlClient/SqlConnectionStringBuilder.cs   |  34 +-
 .../Microsoft/Data/SqlClient/SqlDataReader.cs |  74 +-
 .../Microsoft/Data/SqlClient/SqlDependency.cs |   4 +-
 .../Data/SqlClient/SqlDependencyListener.cs   |  10 +-
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |   2 +-
 .../Data/SqlClient/TdsParserStaticMethods.cs  |   4 +-
 .../tests/FunctionalTests/SqlExceptionTest.cs |   2 +-
 .../ChannelDbConnectionPoolTest.cs            |  92 +--
 .../TransactedConnectionPoolTest.cs           |   4 +-
 ...itHandleDbConnectionPoolTransactionTest.cs |  10 +-
 ...ingTest.cs => SqlConnectionOptionsTest.cs} |  10 +-
 29 files changed, 1069 insertions(+), 1107 deletions(-)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.cs
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/{Common/ConnectionString/DbConnectionOptions.Debug.cs => SqlClient/SqlConnectionOptions.Debug.cs} (94%)
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/{SqlConnectionString.cs => SqlConnectionOptions.cs} (59%)
 rename src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/{SqlConnectionStringTest.cs => SqlConnectionOptionsTest.cs} (93%)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index ecefa338c9..c0e170b3f8 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -514,7 +514,7 @@ internal static ArgumentException InvalidArgumentLength(string argumentName, int
 
         internal static Exception CreateSqlException(
             SqlAuthenticationProviderException authException,
-            SqlConnectionString connectionOptions,
+            SqlConnectionOptions connectionOptions,
             SqlConnectionInternal sender,
             string username)
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.cs
deleted file mode 100644
index 57f1f0e0d3..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.cs
+++ /dev/null
@@ -1,782 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-
-#if NETFRAMEWORK
-using System.Security;
-#endif
-
-namespace Microsoft.Data.Common.ConnectionString
-{
-    internal partial class DbConnectionOptions
-    {
-        // instances of this class are intended to be immutable, i.e readonly
-        // used by pooling classes so it is much easier to verify correctness
-        // when not worried about the class being modified during execution
-
-        private const string ConnectionStringValidKeyPattern = "^(?![;\\s])[^\\p{Cc}]+(?<!\\s)$"; // key not allowed to start with semi-colon or space or contain non-visible characters or end with space
-        private const string ConnectionStringValidValuePattern = "^[^\u0000]*$";                    // value not allowed to contain embedded null
-        private const string ConnectionStringQuoteValuePattern = "^[^\"'=;\\s\\p{Cc}]*$";           // generally do not quote the value if it matches the pattern
-        private const string ConnectionStringQuoteOdbcValuePattern = "^\\{([^\\}\u0000]|\\}\\})*\\}$"; // do not quote odbc value if it matches this pattern
-        internal const string DataDirectory = "|datadirectory|";
-
-        private static readonly Regex s_connectionStringValidKeyRegex = new Regex(ConnectionStringValidKeyPattern, RegexOptions.Compiled);
-        private static readonly Regex s_connectionStringValidValueRegex = new Regex(ConnectionStringValidValuePattern, RegexOptions.Compiled);
-
-        private static readonly Regex s_connectionStringQuoteValueRegex = new Regex(ConnectionStringQuoteValuePattern, RegexOptions.Compiled);
-        private static readonly Regex s_connectionStringQuoteOdbcValueRegex = new Regex(ConnectionStringQuoteOdbcValuePattern, RegexOptions.ExplicitCapture | RegexOptions.Compiled);
-
-        internal readonly bool _hasPasswordKeyword;
-        internal readonly bool _hasUserIdKeyword;
-        internal readonly NameValuePair _keyChain;
-
-        private readonly string _usersConnectionString;
-        private readonly Dictionary<string, string> _parsetable;
-
-        internal Dictionary<string, string> Parsetable => _parsetable;
-        public bool IsEmpty => _keyChain == null;
-
-        public DbConnectionOptions(string connectionString, IReadOnlyDictionary<string, string> synonyms)
-        {
-            _parsetable = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
-            _usersConnectionString = connectionString ?? "";
-
-            // first pass on parsing, initial syntax check
-            if (_usersConnectionString.Length > 0)
-            {
-                _keyChain = ParseInternal(_parsetable, _usersConnectionString, true, synonyms, false);
-                _hasPasswordKeyword = _parsetable.ContainsKey(DbConnectionStringKeywords.Password) || 
-                                      _parsetable.ContainsKey(DbConnectionStringSynonyms.Pwd);
-                _hasUserIdKeyword = _parsetable.ContainsKey(DbConnectionStringKeywords.UserId) ||
-                                    _parsetable.ContainsKey(DbConnectionStringSynonyms.Uid);
-            }
-        }
-
-        protected DbConnectionOptions(DbConnectionOptions connectionOptions)
-        { // Clone used by SqlConnectionString
-            _usersConnectionString = connectionOptions._usersConnectionString;
-            _parsetable = connectionOptions._parsetable;
-            _keyChain = connectionOptions._keyChain;
-            _hasPasswordKeyword = connectionOptions._hasPasswordKeyword;
-            _hasUserIdKeyword = connectionOptions._hasUserIdKeyword;
-        }
-
-        internal bool TryGetParsetableValue(string key, out string value) => _parsetable.TryGetValue(key, out value);
-
-        // same as Boolean, but with SSPI thrown in as valid yes
-        public bool ConvertValueToIntegratedSecurity()
-        {
-            return _parsetable.TryGetValue(DbConnectionStringKeywords.IntegratedSecurity, out string value) && value != null
-                ? ConvertValueToIntegratedSecurityInternal(value)
-                : false;
-        }
-
-        internal bool ConvertValueToIntegratedSecurityInternal(string stringValue)
-        {
-            if (CompareInsensitiveInvariant(stringValue, "sspi") || CompareInsensitiveInvariant(stringValue, "true") || CompareInsensitiveInvariant(stringValue, "yes"))
-            {
-                return true;
-            }
-            
-            if (CompareInsensitiveInvariant(stringValue, "false") || CompareInsensitiveInvariant(stringValue, "no"))
-            {
-                return false;
-            }
-
-            string tmp = stringValue.Trim();  // Remove leading & trailing whitespace.
-            if (CompareInsensitiveInvariant(tmp, "sspi") || CompareInsensitiveInvariant(tmp, "true") || CompareInsensitiveInvariant(tmp, "yes"))
-            {
-                return true;
-            }
-
-            if (CompareInsensitiveInvariant(tmp, "false") || CompareInsensitiveInvariant(tmp, "no"))
-            {
-                return false;
-            }
-
-            throw ADP.InvalidConnectionOptionValue(DbConnectionStringKeywords.IntegratedSecurity);
-        }
-
-        public int ConvertValueToInt32(string keyName, int defaultValue)
-        {
-            return _parsetable.TryGetValue(keyName, out string value) && value != null ?
-                   ConvertToInt32Internal(keyName, value) :
-                   defaultValue;
-        }
-
-        internal static int ConvertToInt32Internal(string keyname, string stringValue)
-        {
-            try
-            {
-                return int.Parse(stringValue, System.Globalization.NumberStyles.Integer, CultureInfo.InvariantCulture);
-            }
-            catch (FormatException e)
-            {
-                throw ADP.InvalidConnectionOptionValue(keyname, e);
-            }
-            catch (OverflowException e)
-            {
-                throw ADP.InvalidConnectionOptionValue(keyname, e);
-            }
-        }
-
-        public string ConvertValueToString(string keyName, string defaultValue)
-            => _parsetable.TryGetValue(keyName, out string value) && value != null ? value : defaultValue;
-
-        public bool ContainsKey(string keyword) => _parsetable.ContainsKey(keyword);
-
-        protected internal virtual string Expand() => _usersConnectionString;
-
-        public string UsersConnectionString(bool hidePassword) => UsersConnectionString(hidePassword, false);
-
-        internal string UsersConnectionStringForTrace() => UsersConnectionString(true, true);
-
-        private string UsersConnectionString(bool hidePassword, bool forceHidePassword)
-        {
-            string connectionString = _usersConnectionString;
-            if (_hasPasswordKeyword && (forceHidePassword || (hidePassword && !HasPersistablePassword)))
-            {
-                ReplacePasswordPwd(out connectionString, false);
-            }
-            return connectionString ?? string.Empty;
-        }
-
-        internal bool HasPersistablePassword => _hasPasswordKeyword
-            ? ConvertValueToBoolean(DbConnectionStringKeywords.PersistSecurityInfo, DbConnectionStringDefaults.PersistSecurityInfo)
-            : true; // no password means persistable password so we don't have to munge
-
-        public bool ConvertValueToBoolean(string keyName, bool defaultValue)
-        {
-            string value;
-            return _parsetable.TryGetValue(keyName, out value) ?
-                ConvertValueToBooleanInternal(keyName, value) :
-                defaultValue;
-        }
-
-        internal static bool ConvertValueToBooleanInternal(string keyName, string stringValue)
-        {
-            if (CompareInsensitiveInvariant(stringValue, "true") || CompareInsensitiveInvariant(stringValue, "yes"))
-            {
-                return true;
-            }
-            else if (CompareInsensitiveInvariant(stringValue, "false") || CompareInsensitiveInvariant(stringValue, "no"))
-            {
-                return false;
-            }
-            else
-            {
-                string tmp = stringValue.Trim();  // Remove leading & trailing whitespace.
-                if (CompareInsensitiveInvariant(tmp, "true") || CompareInsensitiveInvariant(tmp, "yes"))
-                {
-                    return true;
-                }
-                else if (CompareInsensitiveInvariant(tmp, "false") || CompareInsensitiveInvariant(tmp, "no"))
-                {
-                    return false;
-                }
-                else
-                {
-                    throw ADP.InvalidConnectionOptionValue(keyName);
-                }
-            }
-        }
-
-        private static bool CompareInsensitiveInvariant(string strvalue, string strconst)
-            => (0 == StringComparer.OrdinalIgnoreCase.Compare(strvalue, strconst));
-
-        private static string GetKeyName(StringBuilder buffer)
-        {
-            int count = buffer.Length;
-            while ((0 < count) && char.IsWhiteSpace(buffer[count - 1]))
-            {
-                count--; // trailing whitespace
-            }
-            return buffer.ToString(0, count).ToLower(CultureInfo.InvariantCulture);
-        }
-
-        private static string GetKeyValue(StringBuilder buffer, bool trimWhitespace)
-        {
-            int count = buffer.Length;
-            int index = 0;
-            if (trimWhitespace)
-            {
-                while ((index < count) && char.IsWhiteSpace(buffer[index]))
-                {
-                    index++; // leading whitespace
-                }
-                while ((0 < count) && char.IsWhiteSpace(buffer[count - 1]))
-                {
-                    count--; // trailing whitespace
-                }
-            }
-            return buffer.ToString(index, count - index);
-        }
-
-        // transition states used for parsing
-        private enum ParserState
-        {
-            NothingYet = 1,   //start point
-            Key,
-            KeyEqual,
-            KeyEnd,
-            UnquotedValue,
-            DoubleQuoteValue,
-            DoubleQuoteValueQuote,
-            SingleQuoteValue,
-            SingleQuoteValueQuote,
-            BraceQuoteValue,
-            BraceQuoteValueQuote,
-            QuotedValueEnd,
-            NullTermination,
-        };
-
-        // @TODO: This should probably be extracted into its own parser class
-        internal static int GetKeyValuePair(string connectionString, int currentPosition, StringBuilder buffer, bool useOdbcRules, out string keyname, out string keyvalue)
-        {
-            int startposition = currentPosition;
-
-            buffer.Length = 0;
-            keyname = null;
-            keyvalue = null;
-
-            char currentChar = '\0';
-
-            ParserState parserState = ParserState.NothingYet;
-            int length = connectionString.Length;
-            for (; currentPosition < length; ++currentPosition)
-            {
-                currentChar = connectionString[currentPosition];
-
-                switch (parserState)
-                {
-                    case ParserState.NothingYet: // [\\s;]*
-                        if ((';' == currentChar) || char.IsWhiteSpace(currentChar))
-                        {
-                            continue;
-                        }
-                        if ('\0' == currentChar)
-                        { parserState = ParserState.NullTermination; continue; }
-                        if (char.IsControl(currentChar))
-                        { throw ADP.ConnectionStringSyntax(startposition); }
-                        startposition = currentPosition;
-                        if ('=' != currentChar)
-                        {
-                            parserState = ParserState.Key;
-                            break;
-                        }
-                        else
-                        {
-                            parserState = ParserState.KeyEqual;
-                            continue;
-                        }
-
-                    case ParserState.Key: // (?<key>([^=\\s\\p{Cc}]|\\s+[^=\\s\\p{Cc}]|\\s+==|==)+)
-                        if ('=' == currentChar)
-                        { parserState = ParserState.KeyEqual; continue; }
-                        if (char.IsWhiteSpace(currentChar))
-                        { break; }
-                        if (char.IsControl(currentChar))
-                        { throw ADP.ConnectionStringSyntax(startposition); }
-                        break;
-
-                    case ParserState.KeyEqual: // \\s*=(?!=)\\s*
-                        if (!useOdbcRules && '=' == currentChar)
-                        { parserState = ParserState.Key; break; }
-                        keyname = GetKeyName(buffer);
-                        if (string.IsNullOrEmpty(keyname))
-                        { throw ADP.ConnectionStringSyntax(startposition); }
-                        buffer.Length = 0;
-                        parserState = ParserState.KeyEnd;
-                        goto case ParserState.KeyEnd;
-
-                    case ParserState.KeyEnd:
-                        if (char.IsWhiteSpace(currentChar))
-                        { continue; }
-                        if (useOdbcRules)
-                        {
-                            if ('{' == currentChar)
-                            { parserState = ParserState.BraceQuoteValue; break; }
-                        }
-                        else
-                        {
-                            if ('\'' == currentChar)
-                            { parserState = ParserState.SingleQuoteValue; continue; }
-                            if ('"' == currentChar)
-                            { parserState = ParserState.DoubleQuoteValue; continue; }
-                        }
-                        if (';' == currentChar)
-                        { goto ParserExit; }
-                        if ('\0' == currentChar)
-                        { goto ParserExit; }
-                        if (char.IsControl(currentChar))
-                        { throw ADP.ConnectionStringSyntax(startposition); }
-                        parserState = ParserState.UnquotedValue;
-                        break;
-
-                    case ParserState.UnquotedValue: // "((?![\"'\\s])" + "([^;\\s\\p{Cc}]|\\s+[^;\\s\\p{Cc}])*" + "(?<![\"']))"
-                        if (char.IsWhiteSpace(currentChar))
-                        { break; }
-                        if (char.IsControl(currentChar) || ';' == currentChar)
-                        { goto ParserExit; }
-                        break;
-
-                    case ParserState.DoubleQuoteValue: // "(\"([^\"\u0000]|\"\")*\")"
-                        if ('"' == currentChar)
-                        { parserState = ParserState.DoubleQuoteValueQuote; continue; }
-                        if ('\0' == currentChar)
-                        { throw ADP.ConnectionStringSyntax(startposition); }
-                        break;
-
-                    case ParserState.DoubleQuoteValueQuote:
-                        if ('"' == currentChar)
-                        { parserState = ParserState.DoubleQuoteValue; break; }
-                        keyvalue = GetKeyValue(buffer, false);
-                        parserState = ParserState.QuotedValueEnd;
-                        goto case ParserState.QuotedValueEnd;
-
-                    case ParserState.SingleQuoteValue: // "('([^'\u0000]|'')*')"
-                        if ('\'' == currentChar)
-                        { parserState = ParserState.SingleQuoteValueQuote; continue; }
-                        if ('\0' == currentChar)
-                        { throw ADP.ConnectionStringSyntax(startposition); }
-                        break;
-
-                    case ParserState.SingleQuoteValueQuote:
-                        if ('\'' == currentChar)
-                        { parserState = ParserState.SingleQuoteValue; break; }
-                        keyvalue = GetKeyValue(buffer, false);
-                        parserState = ParserState.QuotedValueEnd;
-                        goto case ParserState.QuotedValueEnd;
-
-                    case ParserState.BraceQuoteValue: // "(\\{([^\\}\u0000]|\\}\\})*\\})"
-                        if ('}' == currentChar)
-                        { parserState = ParserState.BraceQuoteValueQuote; break; }
-                        if ('\0' == currentChar)
-                        { throw ADP.ConnectionStringSyntax(startposition); }
-                        break;
-
-                    case ParserState.BraceQuoteValueQuote:
-                        if ('}' == currentChar)
-                        { parserState = ParserState.BraceQuoteValue; break; }
-                        keyvalue = GetKeyValue(buffer, false);
-                        parserState = ParserState.QuotedValueEnd;
-                        goto case ParserState.QuotedValueEnd;
-
-                    case ParserState.QuotedValueEnd:
-                        if (char.IsWhiteSpace(currentChar))
-                        { continue; }
-                        if (';' == currentChar)
-                        { goto ParserExit; }
-                        if ('\0' == currentChar)
-                        { parserState = ParserState.NullTermination; continue; }
-                        throw ADP.ConnectionStringSyntax(startposition);  // unbalanced single quote
-
-                    case ParserState.NullTermination: // [\\s;\u0000]*
-                        if ('\0' == currentChar)
-                        { continue; }
-                        if (char.IsWhiteSpace(currentChar))
-                        { continue; }
-                        throw ADP.ConnectionStringSyntax(currentPosition);
-
-                    default:
-                        throw ADP.InternalError(ADP.InternalErrorCode.InvalidParserState1);
-                }
-                buffer.Append(currentChar);
-            }
-        ParserExit:
-            switch (parserState)
-            {
-                case ParserState.Key:
-                case ParserState.DoubleQuoteValue:
-                case ParserState.SingleQuoteValue:
-                case ParserState.BraceQuoteValue:
-                    // keyword not found/unbalanced double/single quote
-                    throw ADP.ConnectionStringSyntax(startposition);
-
-                case ParserState.KeyEqual:
-                    // equal sign at end of line
-                    keyname = GetKeyName(buffer);
-                    if (string.IsNullOrEmpty(keyname))
-                    { throw ADP.ConnectionStringSyntax(startposition); }
-                    break;
-
-                case ParserState.UnquotedValue:
-                    // unquoted value at end of line
-                    keyvalue = GetKeyValue(buffer, true);
-
-                    char tmpChar = keyvalue[keyvalue.Length - 1];
-                    if (!useOdbcRules && (('\'' == tmpChar) || ('"' == tmpChar)))
-                    {
-                        throw ADP.ConnectionStringSyntax(startposition);    // unquoted value must not end in quote, except for odbc
-                    }
-                    break;
-
-                case ParserState.DoubleQuoteValueQuote:
-                case ParserState.SingleQuoteValueQuote:
-                case ParserState.BraceQuoteValueQuote:
-                case ParserState.QuotedValueEnd:
-                    // quoted value at end of line
-                    keyvalue = GetKeyValue(buffer, false);
-                    break;
-
-                case ParserState.NothingYet:
-                case ParserState.KeyEnd:
-                case ParserState.NullTermination:
-                    // do nothing
-                    break;
-
-                default:
-                    throw ADP.InternalError(ADP.InternalErrorCode.InvalidParserState2);
-            }
-            if ((';' == currentChar) && (currentPosition < connectionString.Length))
-            {
-                currentPosition++;
-            }
-            return currentPosition;
-        }
-
-        private static bool IsValueValidInternal(string keyvalue)
-        {
-            if (keyvalue != null)
-            {
-#if DEBUG
-                bool compValue = s_connectionStringValidValueRegex.IsMatch(keyvalue);
-                Debug.Assert((-1 == keyvalue.IndexOf('\u0000')) == compValue, "IsValueValid mismatch with regex");
-#endif
-                return (-1 == keyvalue.IndexOf('\u0000'));
-            }
-            return true;
-        }
-
-        private static bool IsKeyNameValid(string keyname)
-        {
-            if (keyname != null)
-            {
-#if DEBUG
-                bool compValue = s_connectionStringValidKeyRegex.IsMatch(keyname);
-                Debug.Assert(((0 < keyname.Length) && (';' != keyname[0]) && !char.IsWhiteSpace(keyname[0]) && (-1 == keyname.IndexOf('\u0000'))) == compValue, "IsValueValid mismatch with regex");
-#endif
-                return ((0 < keyname.Length) && (';' != keyname[0]) && !char.IsWhiteSpace(keyname[0]) && (-1 == keyname.IndexOf('\u0000')));
-            }
-            return false;
-        }
-
-        private static NameValuePair ParseInternal(
-            Dictionary<string, string> parsetable,
-            string connectionString,
-            bool buildChain,
-            IReadOnlyDictionary<string, string> synonyms,
-            bool firstKey)
-        {
-            Debug.Assert(connectionString != null, "null connectionstring");
-            StringBuilder buffer = new StringBuilder();
-            NameValuePair localKeychain = null, keychain = null;
-
-            #if DEBUG
-            try
-            {
-            #endif
-                int nextStartPosition = 0;
-                int endPosition = connectionString.Length;
-                while (nextStartPosition < endPosition)
-                {
-                    int startPosition = nextStartPosition;
-
-                    string keyname, keyvalue;
-                    nextStartPosition = GetKeyValuePair(connectionString, startPosition, buffer, firstKey, out keyname, out keyvalue);
-                    if (string.IsNullOrEmpty(keyname))
-                    {
-                        // if (nextStartPosition != endPosition) { throw; }
-                        break;
-                    }
-
-                    DebugTraceKeyValuePair(keyname, keyvalue, synonyms);
-                    Debug.Assert(IsKeyNameValid(keyname), "ParseFailure, invalid keyname");
-                    Debug.Assert(IsValueValidInternal(keyvalue), "parse failure, invalid keyvalue");
-
-                    string realkeyname = (synonyms is not null) ?
-                                         (synonyms.TryGetValue(keyname, out string synonym) ? synonym : null) :
-                                          keyname;
-
-                    if (!IsKeyNameValid(realkeyname))
-                    {
-                        throw ADP.KeywordNotSupported(keyname);
-                    }
-                    if (!firstKey || !parsetable.ContainsKey(realkeyname))
-                    {
-                        parsetable[realkeyname] = keyvalue; // last key-value pair wins (or first)
-                    }
-
-                    if (localKeychain != null)
-                    {
-                        localKeychain = localKeychain.Next = new NameValuePair(realkeyname, keyvalue, nextStartPosition - startPosition);
-                    }
-                    else if (buildChain)
-                    { // first time only - don't contain modified chain from UDL file
-                        keychain = localKeychain = new NameValuePair(realkeyname, keyvalue, nextStartPosition - startPosition);
-                    }
-                }
-            #if DEBUG
-            }
-            catch (ArgumentException e)
-            {
-                ParseComparison(parsetable, connectionString, synonyms, firstKey, e);
-                throw;
-            }
-            ParseComparison(parsetable, connectionString, synonyms, firstKey, null);
-            #endif
-            
-            return keychain;
-        }
-
-        internal NameValuePair ReplacePasswordPwd(out string constr, bool fakePassword)
-        {
-            bool expanded = false;
-            int copyPosition = 0;
-            NameValuePair head = null, tail = null, next = null;
-            StringBuilder builder = new StringBuilder(_usersConnectionString.Length);
-            for (NameValuePair current = _keyChain; current != null; current = current.Next)
-            {
-                if (!CompareInsensitiveInvariant(DbConnectionStringKeywords.Password, current.Name) &&
-                    !CompareInsensitiveInvariant(DbConnectionStringSynonyms.Pwd, current.Name))
-                {
-                    builder.Append(_usersConnectionString, copyPosition, current.Length);
-                    if (fakePassword)
-                    {
-                        next = new NameValuePair(current.Name, current.Value, current.Length);
-                    }
-                }
-                else if (fakePassword)
-                {
-                    // replace user password/pwd value with *
-                    const string equalstar = "=*;";
-                    builder.Append(current.Name).Append(equalstar);
-                    next = new NameValuePair(current.Name, "*", current.Name.Length + equalstar.Length);
-                    expanded = true;
-                }
-                else
-                {
-                    // drop the password/pwd completely in returning for user
-                    expanded = true;
-                }
-
-                if (fakePassword)
-                {
-                    if (tail != null)
-                    {
-                        tail = tail.Next = next;
-                    }
-                    else
-                    {
-                        tail = head = next;
-                    }
-                }
-                copyPosition += current.Length;
-            }
-            Debug.Assert(expanded, "password/pwd was not removed");
-            constr = builder.ToString();
-            return head;
-        }
-        
-        // SxS notes:
-        // * this method queries "DataDirectory" value from the current AppDomain.
-        //   This string is used for to replace "!DataDirectory!" values in the connection string, it is not considered as an "exposed resource".
-        // * This method uses GetFullPath to validate that root path is valid, the result is not exposed out.
-        internal static string ExpandDataDirectory(string keyword, string value)
-        {
-            string fullPath = null;
-            if (value != null && value.StartsWith(DataDirectory, StringComparison.OrdinalIgnoreCase))
-            {
-                // find the replacement path
-                object rootFolderObject = AppDomain.CurrentDomain.GetData("DataDirectory");
-                var rootFolderPath = (rootFolderObject as string);
-                if (rootFolderObject != null && rootFolderPath == null)
-                {
-                    throw ADP.InvalidDataDirectory();
-                }
-
-                if (string.IsNullOrEmpty(rootFolderPath))
-                {
-                    rootFolderPath = AppDomain.CurrentDomain.BaseDirectory;
-                }
-
-                var fileName = value.Substring(DataDirectory.Length);
-
-                if (Path.IsPathRooted(fileName))
-                {
-                    fileName = fileName.TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
-                }
-
-                fullPath = Path.Combine(rootFolderPath, fileName);
-
-                // verify root folder path is a real path without unexpected "..\"
-                if (!Path.GetFullPath(fullPath).StartsWith(rootFolderPath, StringComparison.Ordinal))
-                {
-                    throw ADP.InvalidConnectionOptionValue(keyword);
-                }
-            }
-            return fullPath;
-        }
-        
-        #region NetCore Methods
-        #if NET
-        
-        internal string ExpandAttachDbFileName(string replacementValue)
-        {
-            int copyPosition = 0;
-
-            StringBuilder builder = new(_usersConnectionString.Length);
-            for (NameValuePair current = _keyChain; current != null; current = current.Next)
-            {
-                if (string.Equals(current.Name, DbConnectionStringKeywords.AttachDbFilename, StringComparison.InvariantCultureIgnoreCase))
-                {
-                    builder.Append($"{current.Name}={replacementValue};");
-                }
-                else
-                {
-                    builder.Append(_usersConnectionString, copyPosition, current.Length);
-                }
-                copyPosition += current.Length;
-            }
-
-            return builder.ToString();
-        }
-        
-        #endif
-        #endregion
-        
-        #region NetFx Methods
-        #if NETFRAMEWORK
-        
-        public string this[string keyword] => _parsetable[keyword];
-
-        private PermissionSet _permissionset;
-
-        protected internal virtual PermissionSet CreatePermissionSet() => null;
-
-        internal void DemandPermission()
-        {
-            if (_permissionset is null)
-            {
-                _permissionset = CreatePermissionSet();
-            }
-            _permissionset.Demand();
-        }
-
-        internal bool HasBlankPassword
-        {
-            get
-            {
-                if (!ConvertValueToIntegratedSecurity())
-                {
-                    if (_parsetable.TryGetValue(DbConnectionStringKeywords.Password, out string value))
-                    {
-                        return string.IsNullOrEmpty(value);
-                    }
-                    
-                    if (_parsetable.TryGetValue(DbConnectionStringSynonyms.Pwd, out value))
-                    {
-                        return string.IsNullOrEmpty(value); // MDAC 83097
-                    }
-
-                    return (_parsetable.TryGetValue(DbConnectionStringKeywords.UserId, out value) && !string.IsNullOrEmpty(value)) || 
-                           (_parsetable.TryGetValue(DbConnectionStringSynonyms.Uid, out value) && !string.IsNullOrEmpty(value));
-                }
-                return false;
-            }
-        }
-
-        internal string ExpandKeyword(string keyword, string replacementValue)
-        {
-            // preserve duplicates, updated keyword value with replacement value
-            // if keyword not specified, append to end of the string
-            bool expanded = false;
-            int copyPosition = 0;
-
-            StringBuilder builder = new(_usersConnectionString.Length);
-            for (NameValuePair current = _keyChain; current != null; current = current.Next)
-            {
-                if ((current.Name == keyword) && (current.Value == this[keyword]))
-                {
-                    // only replace the parse end-result value instead of all values
-                    // so that when duplicate-keywords occur other original values remain in place
-                    AppendKeyValuePairBuilder(builder, current.Name, replacementValue);
-                    builder.Append(';');
-                    expanded = true;
-                }
-                else
-                {
-                    builder.Append(_usersConnectionString, copyPosition, current.Length);
-                }
-                copyPosition += current.Length;
-            }
-
-            if (!expanded)
-            {
-                AppendKeyValuePairBuilder(builder, keyword, replacementValue);
-            }
-            return builder.ToString();
-        }
-
-        internal static void AppendKeyValuePairBuilder(StringBuilder builder, string keyName, string keyValue)
-        {
-            ADP.CheckArgumentNull(builder, nameof(builder));
-            ADP.CheckArgumentLength(keyName, nameof(keyName));
-
-            if (keyName == null || !s_connectionStringValidKeyRegex.IsMatch(keyName))
-            {
-                throw ADP.InvalidKeyname(keyName);
-            }
-            if (keyValue != null && !IsValueValidInternal(keyValue))
-            {
-                throw ADP.InvalidValue(keyName);
-            }
-
-            if ((0 < builder.Length) && (';' != builder[builder.Length - 1]))
-            {
-                builder.Append(";");
-            }
-
-            builder.Append(keyName.Replace("=", "=="));
-            builder.Append("=");
-
-            if (keyValue != null)
-            { // else <keyword>=;
-                if (s_connectionStringQuoteValueRegex.IsMatch(keyValue))
-                {
-                    // <value> -> <value>
-                    builder.Append(keyValue);
-                }
-                else if ((-1 != keyValue.IndexOf('\"')) && (-1 == keyValue.IndexOf('\'')))
-                {
-                    // <val"ue> -> <'val"ue'>
-                    builder.Append('\'');
-                    builder.Append(keyValue);
-                    builder.Append('\'');
-                }
-                else
-                {
-                    // <val'ue> -> <"val'ue">
-                    // <=value> -> <"=value">
-                    // <;value> -> <";value">
-                    // < value> -> <" value">
-                    // <va lue> -> <"va lue">
-                    // <va'"lue> -> <"va'""lue">
-                    builder.Append('\"');
-                    builder.Append(keyValue.Replace("\"", "\"\""));
-                    builder.Append('\"');
-                }
-            }
-        }
-        #endif
-        #endregion
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionString.netfx.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionString.netfx.cs
index dfb383d6b1..841369423b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionString.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionString.netfx.cs
@@ -15,7 +15,9 @@
 
 namespace Microsoft.Data.Common
 {
-    // @TODO: Theoretically this class could be replaced with SqlConnectionString.
+    // Note: This class exists exclusively for use in SqlClientPermission. It provides a stable serialization format when the permission set is serialized
+    // by Code Access Security (CAS). CAS itself is deprecated in all versions of .NET and .NET Framework, but it won't be dropped from .NET Framework.
+    // We should maintain this class and SqlClientPermission to ensure that existing CAS-based security checks continue to work correctly on .NET Framework.
     
     [Serializable] // MDAC 83147
     internal sealed class DbConnectionString
@@ -53,20 +55,20 @@ internal DbConnectionString(
             string restrictions,
             KeyRestrictionBehavior behavior,
             IReadOnlyDictionary<string, string> synonyms)
-            : this(new DbConnectionOptions(value, synonyms), restrictions, behavior, synonyms, false)
+            : this(new SqlConnectionOptions(value), restrictions, behavior, synonyms, false)
         {
             // The IReadOnlyDictionary doesn't need to be cloned since it isn't shared with anything else
         }
 
-        internal DbConnectionString(DbConnectionOptions connectionOptions)
+        internal DbConnectionString(SqlConnectionOptions connectionOptions)
             : this(connectionOptions, (string)null, KeyRestrictionBehavior.AllowOnly, null, true)
         {
-            // used by DBDataPermission to convert from DbConnectionOptions to DbConnectionString
+            // used by DBDataPermission to convert from SqlConnectionOptions to DbConnectionString
             // since backward compatibility requires Everett level classes
         }
 
         private DbConnectionString(
-            DbConnectionOptions connectionOptions,
+            SqlConnectionOptions connectionOptions,
             string restrictions,
             KeyRestrictionBehavior behavior,
             IReadOnlyDictionary<string, string> synonyms,
@@ -505,7 +507,7 @@ private static string[] ParseRestrictions(string restrictions, IReadOnlyDictiona
                 int startPosition = nextStartPosition;
 
                 string keyname; // since parsing restrictions ignores values, it doesn't matter if we use ODBC rules or OLEDB rules
-                nextStartPosition = DbConnectionOptions.GetKeyValuePair(restrictions, startPosition, buffer, false, out keyname, out _);
+                nextStartPosition = SqlConnectionOptions.GetKeyValuePair(restrictions, startPosition, buffer, false, out keyname, out _);
                 if (!string.IsNullOrEmpty(keyname))
                 {
 #if DEBUG
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
index 91b9be9b6a..2bb0c202a7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
@@ -8,7 +8,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.Common;
-using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.SqlClient;
 using Microsoft.Data.SqlClient.ConnectionPool;
 
@@ -64,7 +63,7 @@ internal override bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions) =>
+            SqlConnectionOptions userOptions) =>
             TryOpenConnectionInternal(outerConnection, connectionFactory, retry, userOptions);
 
         /// <inheritdoc/>
@@ -81,7 +80,7 @@ internal override bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions)
+            SqlConnectionOptions userOptions)
             => throw ADP.ConnectionAlreadyOpen(State);
     }
 
@@ -123,14 +122,14 @@ internal override bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions) =>
+            SqlConnectionOptions userOptions) =>
             TryOpenConnection(outerConnection, connectionFactory, retry, userOptions);
 
         internal override bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions)
+            SqlConnectionOptions userOptions)
         {
             if (retry == null || !retry.Task.IsCompleted)
             {
@@ -179,7 +178,7 @@ internal override bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions) =>
+            SqlConnectionOptions userOptions) =>
             TryOpenConnection(outerConnection, connectionFactory, retry, userOptions);
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
index 67ef4a533a..b6b6d727ed 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -10,7 +10,6 @@
 using System.Threading.Tasks;
 using System.Transactions;
 using Microsoft.Data.Common;
-using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.SqlClient;
 using Microsoft.Data.SqlClient.ConnectionPool;
 using Microsoft.Data.SqlClient.Internal;
@@ -802,7 +801,7 @@ internal virtual bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions)
+            SqlConnectionOptions userOptions)
         {
             throw ADP.ConnectionAlreadyOpen(State);
         }
@@ -811,7 +810,7 @@ internal virtual bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions)
+            SqlConnectionOptions userOptions)
         {
             throw ADP.MethodNotImplemented();
         }
@@ -914,7 +913,7 @@ protected bool TryOpenConnectionInternal(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions)
+            SqlConnectionOptions userOptions)
         {
             // ?->Connecting: prevent set_ConnectionString during Open
             if (connectionFactory.SetInnerConnectionFrom(outerConnection, DbConnectionClosedConnecting.SingletonInstance, this))
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/ServerInfo.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/ServerInfo.cs
index 45519cbf93..4999e47b1a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/ServerInfo.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/ServerInfo.cs
@@ -14,7 +14,7 @@ internal sealed class ServerInfo
         /// <summary>
         /// Initialize server info from connection options alone.
         /// </summary>
-        internal ServerInfo(SqlConnectionString userOptions)
+        internal ServerInfo(SqlConnectionOptions userOptions)
             : this(userOptions, userOptions.DataSource, userOptions.ServerSPN)
         { }
 
@@ -22,7 +22,7 @@ internal ServerInfo(SqlConnectionString userOptions)
         /// Initialize server info from connection options, but override DataSource and ServerSPN
         /// with given server name and server SPN.
         /// </summary>
-        internal ServerInfo(SqlConnectionString userOptions, string serverName, string serverSpn)
+        internal ServerInfo(SqlConnectionOptions userOptions, string serverName, string serverSpn)
             : this(userOptions, serverName)
         {
             ServerSPN = serverSpn;
@@ -33,7 +33,7 @@ internal ServerInfo(SqlConnectionString userOptions, string serverName, string s
         /// Initialize server info from connection options, but override DataSource with given
         /// server name.
         /// </summary>
-        private ServerInfo(SqlConnectionString userOptions, string serverName)
+        private ServerInfo(SqlConnectionOptions userOptions, string serverName)
         {
             Debug.Assert(userOptions != null);
             Debug.Assert(serverName != null, "server name should never be null");
@@ -56,7 +56,7 @@ private ServerInfo(SqlConnectionString userOptions, string serverName)
         /// server name.
         /// </summary>
         internal ServerInfo(
-            SqlConnectionString userOptions,
+            SqlConnectionOptions userOptions,
             RoutingInfo routing,
             string preRoutingServerName,
             string serverSpn)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index cf0a296b30..6c5be8930c 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -313,18 +313,18 @@ internal class SqlConnectionInternal : DbConnectionInternal, IDisposable
         ///   new Login7 packet will always write out the new password (or a length of zero and no
         ///   bytes if not present).
         /// - userConnectionOptions may be different to connectionOptions if the connection string
-        ///   has been expanded (see SqlConnectionString.Expand)
+        ///   has been expanded (see SqlConnectionOptions.Expand)
         /// </remarks>
         // @TODO: We really really need simplify what we pass into this. All these optional parameters need to go!
         internal SqlConnectionInternal(
             DbConnectionPoolIdentity identity,
-            SqlConnectionString connectionOptions,
+            SqlConnectionOptions connectionOptions,
             SqlCredential credential,
             DbConnectionPoolGroupProviderInfo providerInfo,
             string newPassword,
             SecureString newSecurePassword,
             bool redirectedUserInstance,
-            SqlConnectionString userConnectionOptions = null,
+            SqlConnectionOptions userConnectionOptions = null,
             SessionData reconnectSessionData = null,
             bool applyTransientFaultHandling = false,
             string accessToken = null,
@@ -508,7 +508,7 @@ internal Guid ClientConnectionId
         /// <summary>
         /// The connection options to be used for this connection.
         /// </summary>
-        internal SqlConnectionString ConnectionOptions { get; }
+        internal SqlConnectionOptions ConnectionOptions { get; }
 
         /// <summary>
         /// The current database for this connection. Null if the connection is not open yet.
@@ -941,7 +941,7 @@ internal void CheckEnlistedTransactionBinding()
 
             if (enlistedTransaction != null)
             {
-                if (ConnectionOptions.TransactionBinding is SqlConnectionString.TransactionBindingEnum.ExplicitUnbind)
+                if (ConnectionOptions.TransactionBinding is SqlConnectionOptions.TransactionBindingEnum.ExplicitUnbind)
                 {
                     Transaction currentTransaction = Transaction.Current;
                     if (enlistedTransaction.TransactionInformation.Status != TransactionStatus.Active || !enlistedTransaction.Equals(currentTransaction))
@@ -1971,7 +1971,7 @@ internal override bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions)
+            SqlConnectionOptions userOptions)
         {
             return TryOpenConnectionInternal(outerConnection, connectionFactory, retry, userOptions);
         }
@@ -2233,7 +2233,7 @@ private void AttemptOneLogin(
         // @TODO: Rename to meet naming conventions
         private bool AttemptRetryADAuthWithTimeoutError(
             SqlException sqlex,
-            SqlConnectionString connectionOptions, // @TODO: this is not used
+            SqlConnectionOptions connectionOptions, // @TODO: this is not used
             TimeoutTimer timeout)
         {
             if (!_activeDirectoryAuthTimeoutRetryHelper.CanRetryWithSqlException(sqlex))
@@ -3140,7 +3140,7 @@ private void LoginNoFailover(
             string newPassword,
             SecureString newSecurePassword,
             bool redirectedUserInstance,
-            SqlConnectionString connectionOptions,
+            SqlConnectionOptions connectionOptions,
             SqlCredential credential,
             TimeoutTimer timeout)
         {
@@ -3464,7 +3464,7 @@ private void LoginWithFailover(
             string newPassword,
             SecureString newSecurePassword,
             bool redirectedUserInstance,
-            SqlConnectionString connectionOptions,
+            SqlConnectionOptions connectionOptions,
             SqlCredential credential, // @TODO: This isn't used anywhere
             TimeoutTimer timeout)
         {
@@ -3779,7 +3779,7 @@ private bool IsTransientError(SqlException exc)
 
         private void OpenLoginEnlist(
             TimeoutTimer timeout,
-            SqlConnectionString connectionOptions,
+            SqlConnectionOptions connectionOptions,
             SqlCredential credential,
             string newPassword,
             SecureString newSecurePassword,
@@ -3905,7 +3905,7 @@ internal override void ResetConnection()
             }
         }
 
-        private void ResolveExtendedServerName(ServerInfo serverInfo, bool aliasLookup, SqlConnectionString options)
+        private void ResolveExtendedServerName(ServerInfo serverInfo, bool aliasLookup, SqlConnectionOptions options)
         {
             // @TODO: Invert to save on indentation
             if (serverInfo.ExtendedServerName == null)
@@ -3946,7 +3946,7 @@ private void ResolveExtendedServerName(ServerInfo serverInfo, bool aliasLookup,
                     if (options.EnforceLocalHost)
                     {
                         // Verify LocalHost for |DataDirectory| usage
-                        SqlConnectionString.VerifyLocalHostAndFixup(
+                        SqlConnectionOptions.VerifyLocalHostAndFixup(
                             ref host,
                             enforceLocalHost: true,
                             fixup: true);
@@ -3958,7 +3958,7 @@ private void ResolveExtendedServerName(ServerInfo serverInfo, bool aliasLookup,
         }
 
         #if NETFRAMEWORK
-        private bool ShouldDisableTnir(SqlConnectionString connectionOptions)
+        private bool ShouldDisableTnir(SqlConnectionOptions connectionOptions)
         {
             bool isAzureEndPoint = ADP.IsAzureSqlServerEndpoint(connectionOptions.DataSource);
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index d6db51e5bb..41d49508be 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -12,7 +12,6 @@
 using System.Threading.Tasks;
 using System.Transactions;
 using Microsoft.Data.Common;
-using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.ProviderBase;
 using static Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolState;
 using Microsoft.Data.SqlClient.Internal;
@@ -225,7 +224,7 @@ public void PutObjectFromTransactedPool(DbConnectionInternal connection)
         /// <inheritdoc />
         public DbConnectionInternal ReplaceConnection(
             DbConnection owningObject, 
-            DbConnectionOptions userOptions, 
+            SqlConnectionOptions userOptions, 
             DbConnectionInternal oldConnection)
         {
             throw new NotImplementedException();
@@ -283,7 +282,7 @@ public void TransactionEnded(Transaction transaction, DbConnectionInternal trans
         public bool TryGetConnection(
             DbConnection owningObject, 
             TaskCompletionSource<DbConnectionInternal>? taskCompletionSource,
-            DbConnectionOptions userOptions, 
+            SqlConnectionOptions userOptions, 
             out DbConnectionInternal? connection)
         {
             var timeout = TimeSpan.FromSeconds(owningObject.ConnectionTimeout);
@@ -384,7 +383,7 @@ public bool TryGetConnection(
         /// </exception>
         private DbConnectionInternal? OpenNewInternalConnection(
             DbConnection? owningConnection, 
-            DbConnectionOptions userOptions, 
+            SqlConnectionOptions userOptions, 
             CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
@@ -513,7 +512,7 @@ private void RemoveConnection(DbConnectionInternal connection)
         /// </exception>
         private async Task<DbConnectionInternal> GetInternalConnection(
             DbConnection owningConnection, 
-            DbConnectionOptions userOptions, 
+            SqlConnectionOptions userOptions, 
             bool async, 
             TimeSpan timeout)
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
index f1bf850582..8f62787e30 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
@@ -8,7 +8,6 @@
 using System.Diagnostics;
 using System.Threading;
 using Microsoft.Data.Common;
-using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.Internal;
 
@@ -33,7 +32,7 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
 
     sealed internal class DbConnectionPoolGroup
     {
-        private readonly DbConnectionOptions _connectionOptions;
+        private readonly SqlConnectionOptions _connectionOptions;
         private readonly ConnectionPoolKey _poolKey;
         private readonly DbConnectionPoolGroupOptions _poolGroupOptions;
         private ConcurrentDictionary<DbConnectionPoolIdentity, IDbConnectionPool> _poolCollection;
@@ -50,7 +49,7 @@ sealed internal class DbConnectionPoolGroup
         private const int PoolGroupStateIdle = 2; // all pools are pruned via Clear
         private const int PoolGroupStateDisabled = 4; // factory pool entry pruning method
 
-        internal DbConnectionPoolGroup(DbConnectionOptions connectionOptions, ConnectionPoolKey key, DbConnectionPoolGroupOptions poolGroupOptions)
+        internal DbConnectionPoolGroup(SqlConnectionOptions connectionOptions, ConnectionPoolKey key, DbConnectionPoolGroupOptions poolGroupOptions)
         {
             Debug.Assert(connectionOptions != null, "null connection options");
 
@@ -66,7 +65,7 @@ internal DbConnectionPoolGroup(DbConnectionOptions connectionOptions, Connection
             _state = PoolGroupStateActive;
         }
 
-        internal DbConnectionOptions ConnectionOptions => _connectionOptions;
+        internal SqlConnectionOptions ConnectionOptions => _connectionOptions;
 
         internal ConnectionPoolKey PoolKey => _poolKey;
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
index 8a6ae397ed..904c19f28e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
@@ -7,7 +7,6 @@
 using System.Data.Common;
 using System.Threading.Tasks;
 using System.Transactions;
-using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.ProviderBase;
 
 #nullable enable
@@ -123,7 +122,7 @@ internal interface IDbConnectionPool
         /// <param name="userOptions">The user options to use if a new connection must be opened.</param>
         /// <param name="connection">The retrieved connection will be passed out via this parameter.</param>
         /// <returns>True if a connection was set in the out parameter, otherwise returns false.</returns>
-        bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, DbConnectionOptions userOptions, out DbConnectionInternal? connection);
+        bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, SqlConnectionOptions userOptions, out DbConnectionInternal? connection);
 
         /// <summary>
         /// Replaces the internal connection currently associated with owningObject with a new internal connection from the pool.
@@ -132,7 +131,7 @@ internal interface IDbConnectionPool
         /// <param name="userOptions">The user options to use if a new connection must be opened.</param>
         /// <param name="oldConnection">The internal connection currently associated with the owning object.</param>
         /// <returns>A reference to the new DbConnectionInternal.</returns>
-        DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection);
+        DbConnectionInternal ReplaceConnection(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection);
 
         /// <summary>
         /// Returns an internal connection to the pool.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolGroupProviderInfo.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolGroupProviderInfo.cs
index db2a17bd56..1b6e6a02d3 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolGroupProviderInfo.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/SqlConnectionPoolGroupProviderInfo.cs
@@ -17,7 +17,7 @@ internal sealed class SqlConnectionPoolGroupProviderInfo : DbConnectionPoolGroup
         private PermissionSet _failoverPermissionSet;
 #endif
 
-        internal SqlConnectionPoolGroupProviderInfo(SqlConnectionString connectionOptions)
+        internal SqlConnectionPoolGroupProviderInfo(SqlConnectionOptions connectionOptions)
         {
             // This is for the case where the user specified the failover partner
             // in the connection string and we have not yet connected to get the
@@ -54,7 +54,7 @@ internal void AliasCheck(string server)
             }
         }
 
-        internal void FailoverCheck(bool actualUseFailoverPartner, SqlConnectionString userConnectionOptions, string actualFailoverPartner)
+        internal void FailoverCheck(bool actualUseFailoverPartner, SqlConnectionOptions userConnectionOptions, string actualFailoverPartner)
         {
             if (UseFailoverPartner != actualUseFailoverPartner)
             {
@@ -87,7 +87,7 @@ internal void FailoverCheck(bool actualUseFailoverPartner, SqlConnectionString u
         }
 
 #if NETFRAMEWORK
-        private PermissionSet CreateFailoverPermission(SqlConnectionString userConnectionOptions, string actualFailoverPartner)
+        private PermissionSet CreateFailoverPermission(SqlConnectionOptions userConnectionOptions, string actualFailoverPartner)
         {
             string keywordToReplace;
 
@@ -116,7 +116,7 @@ private PermissionSet CreateFailoverPermission(SqlConnectionString userConnectio
             }
 
             string failoverConnectionString = userConnectionOptions.ExpandKeyword(keywordToReplace, actualFailoverPartner);
-            return (new SqlConnectionString(failoverConnectionString)).CreatePermissionSet();
+            return (new SqlConnectionOptions(failoverConnectionString)).CreatePermissionSet();
         }
 
         internal void FailoverPermissionDemand()
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index b7fa972e85..96a1a6e5f3 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -13,7 +13,6 @@
 using System.Threading.Tasks;
 using System.Transactions;
 using Microsoft.Data.Common;
-using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.ProviderBase;
 using static Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolState;
 using Microsoft.Data.SqlClient.Internal;
@@ -62,7 +61,7 @@ internal sealed class WaitHandleDbConnectionPool : IDbConnectionPool
 
         private sealed class PendingGetConnection
         {
-            public PendingGetConnection(long dueTime, DbConnection owner, TaskCompletionSource<DbConnectionInternal> completion, DbConnectionOptions userOptions)
+            public PendingGetConnection(long dueTime, DbConnection owner, TaskCompletionSource<DbConnectionInternal> completion, SqlConnectionOptions userOptions)
             {
                 DueTime = dueTime;
                 Owner = owner;
@@ -72,7 +71,7 @@ public PendingGetConnection(long dueTime, DbConnection owner, TaskCompletionSour
             public long DueTime { get; private set; }
             public DbConnection Owner { get; private set; }
             public TaskCompletionSource<DbConnectionInternal> Completion { get; private set; }
-            public DbConnectionOptions UserOptions { get; private set; }
+            public SqlConnectionOptions UserOptions { get; private set; }
         }
 
         private sealed class PoolWaitHandles
@@ -492,7 +491,7 @@ private Timer CreateCleanupTimer() =>
 
         private bool IsBlockingPeriodEnabled()
         {
-            var poolGroupConnectionOptions = _connectionPoolGroup.ConnectionOptions as SqlConnectionString;
+            var poolGroupConnectionOptions = _connectionPoolGroup.ConnectionOptions;
             if (poolGroupConnectionOptions == null)
             {
                 return true;
@@ -523,7 +522,7 @@ private bool IsBlockingPeriodEnabled()
             }
         }
 
-        private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
+        private DbConnectionInternal CreateObject(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection)
         {
             DbConnectionInternal newObj = null;
 
@@ -876,7 +875,7 @@ private void WaitForPendingOpen()
             } while (_pendingOpens.TryPeek(out next));
         }
 
-        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal> taskCompletionSource, DbConnectionOptions userOptions, out DbConnectionInternal connection)
+        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal> taskCompletionSource, SqlConnectionOptions userOptions, out DbConnectionInternal connection)
         {
             uint waitForMultipleObjectsTimeout = 0;
             bool allowCreate = false;
@@ -935,7 +934,7 @@ public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbC
 #if NETFRAMEWORK
         [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")] // copied from Triaged.cs
 #endif
-        private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObjectsTimeout, bool allowCreate, bool onlyOneCheckConnection, DbConnectionOptions userOptions, out DbConnectionInternal connection)
+        private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObjectsTimeout, bool allowCreate, bool onlyOneCheckConnection, SqlConnectionOptions userOptions, out DbConnectionInternal connection)
         {
             DbConnectionInternal obj = null;
             Transaction transaction = null;
@@ -1135,7 +1134,7 @@ private void PrepareConnection(DbConnection owningObject, DbConnectionInternal o
         /// <param name="userOptions">Options used to create the new connection</param>
         /// <param name="oldConnection">Inner connection that will be replaced</param>
         /// <returns>A new inner connection that is attached to the <paramref name="owningObject"/></returns>
-        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
+        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection)
         {
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.ReplaceConnection|RES|CPOOL> {0}, replacing connection.", Id);
             DbConnectionInternal newConnection = UserCreateRequest(owningObject, userOptions, oldConnection);
@@ -1523,7 +1522,7 @@ public void TransactionEnded(Transaction transaction, DbConnectionInternal trans
             }
         }
 
-        private DbConnectionInternal UserCreateRequest(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection = null)
+        private DbConnectionInternal UserCreateRequest(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection = null)
         {
             // called by user when they were not able to obtain a free object but
             // instead obtained creation mutex
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs
index 757e57e1c3..c48f9ada8b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/SspiContextProvider.cs
@@ -58,7 +58,7 @@ internal void Initialize(
 
             Initialize();
 
-            static SspiAuthenticationParameters CreateAuthParams(SqlConnectionString connString, string serverSpn) => new(
+            static SspiAuthenticationParameters CreateAuthParams(SqlConnectionOptions connString, string serverSpn) => new(
                 resource: serverSpn,
                 serverName: connString.DataSource,
                 databaseName: connString.InitialCatalog,
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientPermission.netfx.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientPermission.netfx.cs
index b42310af12..0a670ad97f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientPermission.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientPermission.netfx.cs
@@ -18,6 +18,10 @@
 
 namespace Microsoft.Data.SqlClient
 {
+    // Note: This class implements Code Access Security (CAS) permission for SQL Server connections. CAS is deprecated
+    // in all modern versions of .NET and .NET Framework, but it will not be removed from .NET Framework. This class
+    // should be maintained to ensure that existing CAS-based security checks continue to work correctly on .NET Framework.
+
     /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientPermission.xml' path='docs/members[@name="SqlClientPermission"]/SqlClientPermission/*' />
     [Serializable]
     public sealed class SqlClientPermission : DBDataPermission
@@ -55,9 +59,9 @@ internal SqlClientPermission(SqlClientPermissionAttribute permissionAttribute) :
             // Used by SqlClientPermissionAttribute.CreatePermission
         }
 
-        internal SqlClientPermission(SqlConnectionString constr) : base(PermissionState.None)
+        internal SqlClientPermission(SqlConnectionOptions constr) : base(PermissionState.None)
         {
-            // Used by SqlConnectionString.CreatePermissionSet
+            // Used by SqlConnectionOptions.CreatePermissionSet
             
             if (constr != null)
             {
@@ -106,7 +110,7 @@ private bool _IsUnrestricted
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientPermission.xml' path='docs/members[@name="SqlClientPermission"]/Add[@name="connectionStringAndrestrictionsStringAndBehavior"]/*' />
         public override void Add(string connectionString, string restrictions, KeyRestrictionBehavior behavior)
         {
-            DbConnectionString constr = new DbConnectionString(connectionString, restrictions, behavior, SqlConnectionString.KeywordMap);
+            DbConnectionString constr = new DbConnectionString(connectionString, restrictions, behavior, SqlConnectionOptions.KeywordMap);
             AddPermissionEntry(constr);
         }
         
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index fa7a456e1a..b0c9cc4289 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -51,7 +51,7 @@ public sealed partial class SqlConnection : DbConnection, ICloneable
         private static readonly SqlConnectionFactory s_connectionFactory = SqlConnectionFactory.Instance;
         private static int _objectTypeCount; // EventSource Counter
 
-        private DbConnectionOptions _userConnectionOptions;
+        private SqlConnectionOptions _userConnectionOptions;
         private DbConnectionPoolGroup _poolGroup;
         private DbConnectionInternal _innerConnection;
         private int _closeCount;
@@ -201,41 +201,40 @@ public SqlConnection(string connectionString, SqlCredential credential) : this()
                 // The following checks are necessary as setting Credential property will call CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential
                 //  CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential it will throw InvalidOperationException rather than ArgumentException
                 //  Need to call setter on Credential property rather than setting _credential directly as pool groups need to be checked
-                SqlConnectionString connectionOptions = (SqlConnectionString)ConnectionOptions;
-                if (UsesClearUserIdOrPassword(connectionOptions))
+                if (UsesClearUserIdOrPassword(ConnectionOptions))
                 {
                     throw ADP.InvalidMixedArgumentOfSecureAndClearCredential();
                 }
 
-                if (UsesIntegratedSecurity(connectionOptions))
+                if (UsesIntegratedSecurity(ConnectionOptions))
                 {
                     throw ADP.InvalidMixedArgumentOfSecureCredentialAndIntegratedSecurity();
                 }
-                else if (UsesActiveDirectoryIntegrated(connectionOptions))
+                else if (UsesActiveDirectoryIntegrated(ConnectionOptions))
                 {
                     throw SQL.SettingCredentialWithIntegratedArgument();
                 }
-                else if (UsesActiveDirectoryInteractive(connectionOptions))
+                else if (UsesActiveDirectoryInteractive(ConnectionOptions))
                 {
                     throw SQL.SettingCredentialWithInteractiveArgument();
                 }
-                else if (UsesActiveDirectoryDeviceCodeFlow(connectionOptions))
+                else if (UsesActiveDirectoryDeviceCodeFlow(ConnectionOptions))
                 {
                     throw SQL.SettingCredentialWithDeviceFlowArgument();
                 }
-                else if (UsesActiveDirectoryManagedIdentity(connectionOptions))
+                else if (UsesActiveDirectoryManagedIdentity(ConnectionOptions))
                 {
                     throw SQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryManagedIdentityString);
                 }
-                else if (UsesActiveDirectoryMSI(connectionOptions))
+                else if (UsesActiveDirectoryMSI(ConnectionOptions))
                 {
                     throw SQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryMSIString);
                 }
-                else if (UsesActiveDirectoryDefault(connectionOptions))
+                else if (UsesActiveDirectoryDefault(ConnectionOptions))
                 {
                     throw SQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryDefaultString);
                 }
-                else if (UsesActiveDirectoryWorkloadIdentity(connectionOptions))
+                else if (UsesActiveDirectoryWorkloadIdentity(ConnectionOptions))
                 {
                     throw SQL.SettingCredentialWithNonInteractiveArgument(DbConnectionStringUtilities.ActiveDirectoryWorkloadIdentityString);
                 }
@@ -337,8 +336,7 @@ internal bool IsColumnEncryptionSettingEnabled
         {
             get
             {
-                SqlConnectionString opt = (SqlConnectionString)ConnectionOptions;
-                return opt?.ColumnEncryptionSetting == SqlConnectionColumnEncryptionSetting.Enabled;
+                return ConnectionOptions?.ColumnEncryptionSetting == SqlConnectionColumnEncryptionSetting.Enabled;
             }
         }
 
@@ -433,9 +431,9 @@ private static void ValidateCustomProviders(IDictionary<string, SqlColumnEncrypt
 
         internal SqlConnectionFactory ConnectionFactory => s_connectionFactory;
 
-        internal DbConnectionOptions ConnectionOptions => PoolGroup?.ConnectionOptions;
+        internal SqlConnectionOptions ConnectionOptions => PoolGroup?.ConnectionOptions;
 
-        internal DbConnectionOptions UserConnectionOptions => _userConnectionOptions;
+        internal SqlConnectionOptions UserConnectionOptions => _userConnectionOptions;
 
         internal DbConnectionInternal InnerConnection => _innerConnection;
 
@@ -455,7 +453,7 @@ internal DbConnectionPoolGroup PoolGroup
         /// </summary>
         internal string EnclaveAttestationUrl
         {
-            get => ((SqlConnectionString)ConnectionOptions).EnclaveAttestationUrl;
+            get => ConnectionOptions.EnclaveAttestationUrl;
         }
 
         /// <summary>
@@ -463,7 +461,7 @@ internal string EnclaveAttestationUrl
         /// </summary>
         internal SqlConnectionAttestationProtocol AttestationProtocol
         {
-            get => ((SqlConnectionString)ConnectionOptions).AttestationProtocol;
+            get => ConnectionOptions.AttestationProtocol;
         }
 
         /// <summary>
@@ -471,25 +469,24 @@ internal SqlConnectionAttestationProtocol AttestationProtocol
         /// </summary>
         internal SqlConnectionIPAddressPreference iPAddressPreference
         {
-            get => ((SqlConnectionString)ConnectionOptions).IPAddressPreference;
+            get => ConnectionOptions.IPAddressPreference;
         }
 
         // This method will be called once connection string is set or changed.
         private void CacheConnectionStringProperties()
         {
-            SqlConnectionString connString = ConnectionOptions as SqlConnectionString;
-            if (connString != null)
+            if (ConnectionOptions != null)
             {
-                _connectRetryCount = connString.ConnectRetryCount;
+                _connectRetryCount = ConnectionOptions.ConnectRetryCount;
                 // For Azure Synapse ondemand connections, set _connectRetryCount to 5 instead of 1 to greatly improve recovery
                 //  success rate. Note: Synapse should be detected first as it could be detected as a regular Azure SQL DB endpoint.
-                if (_connectRetryCount == 1 && ADP.IsAzureSynapseOnDemandEndpoint(connString.DataSource))
+                if (_connectRetryCount == 1 && ADP.IsAzureSynapseOnDemandEndpoint(ConnectionOptions.DataSource))
                 {
                     _connectRetryCount = 5;
                 }
                 // For Azure SQL connection, set _connectRetryCount to 2 instead of 1 will greatly improve recovery
                 //  success rate
-                else if (_connectRetryCount == 1 && ADP.IsAzureSqlServerEndpoint(connString.DataSource))
+                else if (_connectRetryCount == 1 && ADP.IsAzureSqlServerEndpoint(ConnectionOptions.DataSource))
                 {
                     _connectRetryCount = 2;
                 }
@@ -563,54 +560,54 @@ internal bool AsyncCommandInProgress
             set => _AsyncCommandInProgress = value;
         }
 
-        private bool UsesActiveDirectoryIntegrated(SqlConnectionString opt)
+        private bool UsesActiveDirectoryIntegrated(SqlConnectionOptions opt)
         {
             return opt != null && opt.Authentication == SqlAuthenticationMethod.ActiveDirectoryIntegrated;
         }
 
-        private bool UsesActiveDirectoryInteractive(SqlConnectionString opt)
+        private bool UsesActiveDirectoryInteractive(SqlConnectionOptions opt)
         {
             return opt != null && opt.Authentication == SqlAuthenticationMethod.ActiveDirectoryInteractive;
         }
 
-        private bool UsesActiveDirectoryDeviceCodeFlow(SqlConnectionString opt)
+        private bool UsesActiveDirectoryDeviceCodeFlow(SqlConnectionOptions opt)
         {
             return opt != null && opt.Authentication == SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow;
         }
 
-        private bool UsesActiveDirectoryManagedIdentity(SqlConnectionString opt)
+        private bool UsesActiveDirectoryManagedIdentity(SqlConnectionOptions opt)
         {
             return opt != null && opt.Authentication == SqlAuthenticationMethod.ActiveDirectoryManagedIdentity;
         }
 
-        private bool UsesActiveDirectoryMSI(SqlConnectionString opt)
+        private bool UsesActiveDirectoryMSI(SqlConnectionOptions opt)
         {
             return opt != null && opt.Authentication == SqlAuthenticationMethod.ActiveDirectoryMSI;
         }
 
-        private bool UsesActiveDirectoryDefault(SqlConnectionString opt)
+        private bool UsesActiveDirectoryDefault(SqlConnectionOptions opt)
         {
             return opt != null && opt.Authentication == SqlAuthenticationMethod.ActiveDirectoryDefault;
         }
 
-        private bool UsesActiveDirectoryWorkloadIdentity(SqlConnectionString opt)
+        private bool UsesActiveDirectoryWorkloadIdentity(SqlConnectionOptions opt)
         {
             return opt != null && opt.Authentication == SqlAuthenticationMethod.ActiveDirectoryWorkloadIdentity;
         }
 
-        private bool UsesAuthentication(SqlConnectionString opt)
+        private bool UsesAuthentication(SqlConnectionOptions opt)
         {
             return opt != null && opt.Authentication != SqlAuthenticationMethod.NotSpecified;
         }
 
         // Does this connection use Integrated Security?
-        private bool UsesIntegratedSecurity(SqlConnectionString opt)
+        private bool UsesIntegratedSecurity(SqlConnectionOptions opt)
         {
             return opt != null && opt.IntegratedSecurity;
         }
 
         // Does this connection use old style of clear userID or Password in connection string?
-        private bool UsesClearUserIdOrPassword(SqlConnectionString opt)
+        private bool UsesClearUserIdOrPassword(SqlConnectionOptions opt)
         {
             bool result = false;
             if (opt != null)
@@ -620,24 +617,24 @@ private bool UsesClearUserIdOrPassword(SqlConnectionString opt)
             return result;
         }
 
-        internal SqlConnectionString.TransactionBindingEnum TransactionBinding
+        internal SqlConnectionOptions.TransactionBindingEnum TransactionBinding
         {
-            get => ((SqlConnectionString)ConnectionOptions).TransactionBinding;
+            get => ConnectionOptions.TransactionBinding;
         }
 
-        internal SqlConnectionString.TypeSystem TypeSystem
+        internal SqlConnectionOptions.TypeSystem TypeSystem
         {
-            get => ((SqlConnectionString)ConnectionOptions).TypeSystemVersion;
+            get => ConnectionOptions.TypeSystemVersion;
         }
 
         internal Version TypeSystemAssemblyVersion
         {
-            get => ((SqlConnectionString)ConnectionOptions).TypeSystemAssemblyVersion;
+            get => ConnectionOptions.TypeSystemAssemblyVersion;
         }
 
         internal int ConnectRetryInterval
         {
-            get => ((SqlConnectionString)ConnectionOptions).ConnectRetryInterval;
+            get => ConnectionOptions.ConnectRetryInterval;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ConnectionString/*' />
@@ -659,7 +656,7 @@ public override string ConnectionString
             {
                 if (_credential != null || _accessToken != null || _accessTokenCallback != null)
                 {
-                    SqlConnectionString connectionOptions = new SqlConnectionString(value);
+                    SqlConnectionOptions connectionOptions = new SqlConnectionOptions(value);
                     if (_credential != null)
                     {
                         // Check for Credential being used with Authentication=ActiveDirectoryIntegrated | ActiveDirectoryInteractive |
@@ -722,8 +719,7 @@ public override int ConnectionTimeout
         {
             get
             {
-                SqlConnectionString constr = (SqlConnectionString)ConnectionOptions;
-                return constr != null ? constr.ConnectTimeout : DbConnectionStringDefaults.ConnectTimeout;
+                return ConnectionOptions != null ? ConnectionOptions.ConnectTimeout : DbConnectionStringDefaults.ConnectTimeout;
             }
         }
 
@@ -734,8 +730,7 @@ public int CommandTimeout
         {
             get
             {
-                SqlConnectionString constr = (SqlConnectionString)ConnectionOptions;
-                return constr != null ? constr.CommandTimeout : DbConnectionStringDefaults.CommandTimeout;
+                return ConnectionOptions != null ? ConnectionOptions.CommandTimeout : DbConnectionStringDefaults.CommandTimeout;
             }
         }
 
@@ -750,8 +745,7 @@ public string AccessToken
             {
                 // When a connection is connecting or is ever opened, make AccessToken available only if "Persist Security Info" is set to true
                 // otherwise, return null
-                SqlConnectionString connectionOptions = (SqlConnectionString)UserConnectionOptions;
-                return InnerConnection.ShouldHidePassword && connectionOptions != null && !connectionOptions.PersistSecurityInfo ? null : _accessToken;
+                return InnerConnection.ShouldHidePassword && UserConnectionOptions != null && !UserConnectionOptions.PersistSecurityInfo ? null : _accessToken;
             }
             set
             {
@@ -764,7 +758,7 @@ public string AccessToken
                 if (value != null)
                 {
                     // Check if the usage of AccessToken has any conflict with the keys used in connection string and credential
-                    CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessToken((SqlConnectionString)ConnectionOptions);
+                    CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessToken(ConnectionOptions);
                 }
 
                 // Need to call ConnectionString_Set to do proper pool group check
@@ -788,7 +782,7 @@ public Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticati
                 if (value != null)
                 {
                     // Check if the usage of AccessToken has any conflict with the keys used in connection string and credential
-                    CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback((SqlConnectionString)ConnectionOptions);
+                    CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback(ConnectionOptions);
                 }
 
                 ConnectionString_Set(new ConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: value, sspiContextProvider: null));
@@ -831,8 +825,7 @@ public override string Database
                 }
                 else
                 {
-                    SqlConnectionString constr = (SqlConnectionString)ConnectionOptions;
-                    result = constr != null ? constr.InitialCatalog : DbConnectionStringDefaults.InitialCatalog;
+                    result = ConnectionOptions != null ? ConnectionOptions.InitialCatalog : DbConnectionStringDefaults.InitialCatalog;
                 }
 
                 return result;
@@ -903,8 +896,7 @@ public override string DataSource
                 }
                 else
                 {
-                    SqlConnectionString constr = (SqlConnectionString)ConnectionOptions;
-                    result = constr != null ? constr.DataSource : DbConnectionStringDefaults.DataSource;
+                    result = ConnectionOptions != null ? ConnectionOptions.DataSource : DbConnectionStringDefaults.DataSource;
                 }
 
                 return result;
@@ -930,8 +922,7 @@ public int PacketSize
                 }
                 else
                 {
-                    SqlConnectionString constr = (SqlConnectionString)ConnectionOptions;
-                    result = constr != null ? constr.PacketSize : DbConnectionStringDefaults.PacketSize;
+                    result = ConnectionOptions != null ? ConnectionOptions.PacketSize : DbConnectionStringDefaults.PacketSize;
                 }
 
                 return result;
@@ -1025,9 +1016,8 @@ public string WorkstationId
                 // If not supplied by the user, the default value is the MachineName
                 // Note: In Longhorn you'll be able to rename a machine without
                 // rebooting.  Therefore, don't cache this machine name.
-                SqlConnectionString constr = (SqlConnectionString)ConnectionOptions;
 
-                return constr?.WorkstationId
+                return ConnectionOptions?.WorkstationId
                     // Getting machine name requires Environment.Permission.
                     // User must have that permission in order to retrieve this
                     ?? Environment.MachineName;
@@ -1046,8 +1036,7 @@ public SqlCredential Credential
 
                 // When a connection is connecting or is ever opened, make credential available only if "Persist Security Info" is set to true
                 //  otherwise, return null
-                SqlConnectionString connectionOptions = (SqlConnectionString)UserConnectionOptions;
-                if (InnerConnection.ShouldHidePassword && connectionOptions != null && !connectionOptions.PersistSecurityInfo)
+                if (InnerConnection.ShouldHidePassword && UserConnectionOptions != null && !UserConnectionOptions.PersistSecurityInfo)
                 {
                     result = null;
                 }
@@ -1066,41 +1055,40 @@ public SqlCredential Credential
                 // check if the usage of credential has any conflict with the keys used in connection string
                 if (value != null)
                 {
-                    var connectionOptions = (SqlConnectionString)ConnectionOptions;
                     // Check for Credential being used with Authentication=ActiveDirectoryIntegrated | ActiveDirectoryInteractive |
                     // ActiveDirectoryDeviceCodeFlow | ActiveDirectoryManagedIdentity/ActiveDirectoryMSI | ActiveDirectoryDefault. Since a different error string is used
                     // for this case in ConnectionString setter vs in Credential setter, check for this error case before calling
                     // CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential, which is common to both setters.
-                    if (UsesActiveDirectoryIntegrated(connectionOptions))
+                    if (UsesActiveDirectoryIntegrated(ConnectionOptions))
                     {
                         throw SQL.SettingCredentialWithIntegratedInvalid();
                     }
-                    else if (UsesActiveDirectoryInteractive(connectionOptions))
+                    else if (UsesActiveDirectoryInteractive(ConnectionOptions))
                     {
                         throw SQL.SettingCredentialWithInteractiveInvalid();
                     }
-                    else if (UsesActiveDirectoryDeviceCodeFlow(connectionOptions))
+                    else if (UsesActiveDirectoryDeviceCodeFlow(ConnectionOptions))
                     {
                         throw SQL.SettingCredentialWithDeviceFlowInvalid();
                     }
-                    else if (UsesActiveDirectoryManagedIdentity(connectionOptions))
+                    else if (UsesActiveDirectoryManagedIdentity(ConnectionOptions))
                     {
                         throw SQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryManagedIdentityString);
                     }
-                    else if (UsesActiveDirectoryMSI(connectionOptions))
+                    else if (UsesActiveDirectoryMSI(ConnectionOptions))
                     {
                         throw SQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryMSIString);
                     }
-                    else if (UsesActiveDirectoryDefault(connectionOptions))
+                    else if (UsesActiveDirectoryDefault(ConnectionOptions))
                     {
                         throw SQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryDefaultString);
                     }
-                    else if (UsesActiveDirectoryWorkloadIdentity(connectionOptions))
+                    else if (UsesActiveDirectoryWorkloadIdentity(ConnectionOptions))
                     {
                         throw SQL.SettingCredentialWithNonInteractiveInvalid(DbConnectionStringUtilities.ActiveDirectoryWorkloadIdentityString);
                     }
 
-                    CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential(connectionOptions);
+                    CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential(ConnectionOptions);
 
                     if (_accessToken != null)
                     {
@@ -1119,7 +1107,7 @@ public SqlCredential Credential
         //  with the keys used in connection string
         //  If there is any conflict, it throws InvalidOperationException
         //  This is used in the setter of ConnectionString and Credential properties.
-        private void CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential(SqlConnectionString connectionOptions)
+        private void CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential(SqlConnectionOptions connectionOptions)
         {
             if (UsesClearUserIdOrPassword(connectionOptions))
             {
@@ -1136,7 +1124,7 @@ private void CheckAndThrowOnInvalidCombinationOfConnectionStringAndSqlCredential
         //  with the keys used in connection string and credential
         //  If there is any conflict, it throws InvalidOperationException
         //  This is to be used setter of ConnectionString and AccessToken properties
-        private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessToken(SqlConnectionString connectionOptions)
+        private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessToken(SqlConnectionOptions connectionOptions)
         {
             if (UsesClearUserIdOrPassword(connectionOptions))
             {
@@ -1173,7 +1161,7 @@ private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessToken(S
         //  with the keys used in connection string and credential
         //  If there is any conflict, it throws InvalidOperationException
         //  This is to be used setter of ConnectionString and AccessTokenCallback properties
-        private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback(SqlConnectionString connectionOptions)
+        private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback(SqlConnectionOptions connectionOptions)
         {
             if (UsesIntegratedSecurity(connectionOptions))
             {
@@ -1359,7 +1347,7 @@ public static void ClearPool(SqlConnection connection)
         {
             ADP.CheckArgumentNull(connection, nameof(connection));
 
-            DbConnectionOptions connectionOptions = connection.UserConnectionOptions;
+            SqlConnectionOptions connectionOptions = connection.UserConnectionOptions;
             if (connectionOptions != null)
             {
 #if NETFRAMEWORK
@@ -1648,7 +1636,7 @@ public void Open(SqlConnectionOverrides overrides)
 
         internal void RegisterWaitingForReconnect(Task waitingTask)
         {
-            if (((SqlConnectionString)ConnectionOptions).MARS)
+            if (ConnectionOptions.MARS)
             {
                 return;
             }
@@ -2178,7 +2166,6 @@ private void PrepareStatisticsForNewConnection()
 
         private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, SqlConnectionOverrides overrides = SqlConnectionOverrides.None)
         {
-            SqlConnectionString connectionOptions = (SqlConnectionString)ConnectionOptions;
             bool result = false;
 
             if (LocalAppContextSwitches.GlobalizationInvariantMode)
@@ -2186,18 +2173,18 @@ private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, SqlConnec
                 throw SQL.GlobalizationInvariantModeNotSupported();
             }
 
-            _applyTransientFaultHandling = (!overrides.HasFlag(SqlConnectionOverrides.OpenWithoutRetry) && connectionOptions != null && connectionOptions.ConnectRetryCount > 0);
+            _applyTransientFaultHandling = !overrides.HasFlag(SqlConnectionOverrides.OpenWithoutRetry) && ConnectionOptions != null && ConnectionOptions.ConnectRetryCount > 0;
 
-            if (connectionOptions != null &&
-                (connectionOptions.Authentication == SqlAuthenticationMethod.SqlPassword ||
+            if (ConnectionOptions != null &&
+                (ConnectionOptions.Authentication == SqlAuthenticationMethod.SqlPassword ||
                 #pragma warning disable 0618 // Use of obsolete member 'SqlAuthenticationMethod.ActiveDirectoryPassword'
-                    connectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryPassword ||
+                    ConnectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryPassword ||
                 #pragma warning restore 0618 // Use of obsolete member 'SqlAuthenticationMethod.ActiveDirectoryPassword'
-                    connectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryServicePrincipal) &&
-                (!connectionOptions._hasUserIdKeyword || !connectionOptions._hasPasswordKeyword) &&
+                    ConnectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryServicePrincipal) &&
+                (!ConnectionOptions._hasUserIdKeyword || !ConnectionOptions._hasPasswordKeyword) &&
                 _credential == null)
             {
-                throw SQL.CredentialsNotProvided(connectionOptions.Authentication);
+                throw SQL.CredentialsNotProvided(ConnectionOptions.Authentication);
             }
 
 #if NETFRAMEWORK
@@ -2220,7 +2207,7 @@ private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, SqlConnec
             }
             else
             {
-                if (this.UsesIntegratedSecurity(connectionOptions) || this.UsesActiveDirectoryIntegrated(connectionOptions))
+                if (this.UsesIntegratedSecurity(ConnectionOptions) || this.UsesActiveDirectoryIntegrated(ConnectionOptions))
                 {
                     _lastIdentity = DbConnectionPoolIdentity.GetCurrentWindowsIdentity();
                 }
@@ -2288,13 +2275,13 @@ internal void PermissionDemand()
             Debug.Assert(DbConnectionClosedConnecting.SingletonInstance == _innerConnection, "not connecting");
 
             DbConnectionPoolGroup poolGroup = PoolGroup;
-            DbConnectionOptions connectionOptions = poolGroup != null ? poolGroup.ConnectionOptions : null;
+            SqlConnectionOptions connectionOptions = poolGroup != null ? poolGroup.ConnectionOptions : null;
             if (connectionOptions == null || connectionOptions.IsEmpty)
             {
                 throw ADP.NoConnectionString();
             }
 
-            DbConnectionOptions userConnectionOptions = UserConnectionOptions;
+            SqlConnectionOptions userConnectionOptions = UserConnectionOptions;
             Debug.Assert(userConnectionOptions != null, "null UserConnectionOptions");
 
 #if NETFRAMEWORK
@@ -2538,13 +2525,13 @@ private string ConnectionString_Get()
         {
             SqlClientEventSource.Log.TryTraceEvent("<prov.DbConnectionHelper.ConnectionString_Get|API> {0}", ObjectID);
             bool hidePassword = InnerConnection.ShouldHidePassword;
-            DbConnectionOptions connectionOptions = UserConnectionOptions;
+            SqlConnectionOptions connectionOptions = UserConnectionOptions;
             return connectionOptions != null ? connectionOptions.UsersConnectionString(hidePassword) : "";
         }
 
         private void ConnectionString_Set(ConnectionPoolKey key)
         {
-            DbConnectionOptions connectionOptions = null;
+            SqlConnectionOptions connectionOptions = null;
             DbConnectionPoolGroup poolGroup = ConnectionFactory.GetConnectionPoolGroup(key, null, ref connectionOptions);
             DbConnectionInternal connectionInternal = InnerConnection;
             bool flag = connectionInternal.AllowSetConnectionString;
@@ -2650,7 +2637,7 @@ public static void ChangePassword(string connectionString, string newPassword)
 
                 ConnectionPoolKey key = new ConnectionPoolKey(connectionString, credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
-                SqlConnectionString connectionOptions = SqlConnectionFactory.Instance.FindSqlConnectionOptions(key);
+                SqlConnectionOptions connectionOptions = SqlConnectionFactory.Instance.FindSqlConnectionOptions(key);
                 if (connectionOptions.IntegratedSecurity || connectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryIntegrated)
                 {
                     throw SQL.ChangePasswordConflictsWithSSPI();
@@ -2704,7 +2691,7 @@ public static void ChangePassword(string connectionString, SqlCredential credent
 
                 ConnectionPoolKey key = new ConnectionPoolKey(connectionString, credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: null);
 
-                SqlConnectionString connectionOptions = SqlConnectionFactory.Instance.FindSqlConnectionOptions(key);
+                SqlConnectionOptions connectionOptions = SqlConnectionFactory.Instance.FindSqlConnectionOptions(key);
 
                 // Check for connection string values incompatible with SqlCredential
                 if (!string.IsNullOrEmpty(connectionOptions.UserID) || !string.IsNullOrEmpty(connectionOptions.Password))
@@ -2731,7 +2718,7 @@ public static void ChangePassword(string connectionString, SqlCredential credent
             }
         }
 
-        private static void ChangePassword(string connectionString, SqlConnectionString connectionOptions, SqlCredential credential, string newPassword, SecureString newSecurePassword)
+        private static void ChangePassword(string connectionString, SqlConnectionOptions connectionOptions, SqlCredential credential, string newPassword, SecureString newSecurePassword)
         {
             // note: This is the only case where we directly construct the internal connection, passing in the new password.
             // Normally we would simply create a regular connection and open it, but there is no other way to pass the
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index 9fd1485db4..981ca17641 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -108,15 +108,15 @@ internal void ClearPool(ConnectionPoolKey key)
             }
         }
 
-        internal DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(DbConnectionOptions connectionOptions) =>
-            ((SqlConnectionString)connectionOptions).UserInstance
+        internal DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(SqlConnectionOptions connectionOptions) =>
+            connectionOptions.UserInstance
                 ? new SqlConnectionPoolProviderInfo()
                 : null;
         
         internal DbConnectionInternal CreateNonPooledConnection(
             DbConnection owningConnection,
             DbConnectionPoolGroup poolGroup,
-            DbConnectionOptions userOptions)
+            SqlConnectionOptions userOptions)
         {
             Debug.Assert(owningConnection is not null, "null owningConnection?");
             Debug.Assert(poolGroup is not null, "null poolGroup?");
@@ -141,7 +141,7 @@ internal DbConnectionInternal CreateNonPooledConnection(
         internal DbConnectionInternal CreatePooledConnection(
             DbConnection owningConnection,
             IDbConnectionPool pool,
-            DbConnectionOptions userOptions)
+            SqlConnectionOptions userOptions)
         {
             Debug.Assert(pool != null, "null pool?");
 
@@ -176,7 +176,7 @@ internal DbConnectionInternal CreatePooledConnection(
         internal DbConnectionPoolGroup GetConnectionPoolGroup(
             ConnectionPoolKey key,
             DbConnectionPoolGroupOptions poolOptions,
-            ref DbConnectionOptions userConnectionOptions)
+            ref SqlConnectionOptions userConnectionOptions)
         {
             if (string.IsNullOrEmpty(key.ConnectionString))
             {
@@ -190,7 +190,7 @@ internal DbConnectionPoolGroup GetConnectionPoolGroup(
                 // our collection of pool entries, then we need to create a
                 // new pool entry and add it to our collection.
 
-                SqlConnectionString connectionOptions = new SqlConnectionString(key.ConnectionString);
+                SqlConnectionOptions connectionOptions = new SqlConnectionOptions(key.ConnectionString);
 
                 if (userConnectionOptions is null)
                 {
@@ -316,7 +316,7 @@ internal void QueuePoolGroupForRelease(DbConnectionPoolGroup poolGroup)
         internal bool TryGetConnection(
             DbConnection owningConnection,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions,
+            SqlConnectionOptions userOptions,
             DbConnectionInternal oldConnection,
             out DbConnectionInternal connection)
         {
@@ -466,14 +466,14 @@ internal bool TryGetConnection(
         #endregion
 
         internal DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(
-            DbConnectionOptions connectionOptions) =>
-            new SqlConnectionPoolGroupProviderInfo((SqlConnectionString)connectionOptions);
+            SqlConnectionOptions connectionOptions) =>
+            new SqlConnectionPoolGroupProviderInfo(connectionOptions);
 
-        internal SqlConnectionString FindSqlConnectionOptions(ConnectionPoolKey key)
+        internal SqlConnectionOptions FindSqlConnectionOptions(ConnectionPoolKey key)
         {
             Debug.Assert(key is not null, "Key cannot be null");
 
-            DbConnectionOptions connectionOptions = null;
+            SqlConnectionOptions connectionOptions = null;
             
             if (!string.IsNullOrEmpty(key.ConnectionString) &&
                 _connectionPoolGroups.TryGetValue(key, out DbConnectionPoolGroup poolGroup))
@@ -483,7 +483,7 @@ internal SqlConnectionString FindSqlConnectionOptions(ConnectionPoolKey key)
             
             if (connectionOptions is null)
             {
-                connectionOptions = new SqlConnectionString(key.ConnectionString);
+                connectionOptions = new SqlConnectionOptions(key.ConnectionString);
             }
             
             if (connectionOptions.IsEmpty)
@@ -491,7 +491,7 @@ internal SqlConnectionString FindSqlConnectionOptions(ConnectionPoolKey key)
                 throw ADP.NoConnectionString();
             }
             
-            return (SqlConnectionString)connectionOptions;
+            return connectionOptions;
         }
 
         // @TODO: All these methods seem redundant ... shouldn't we always have a SqlConnection?
@@ -575,28 +575,28 @@ internal void SetInnerConnectionTo(DbConnection owningObject, DbConnectionIntern
         
         // @TODO: I think this could be broken down into methods more specific to use cases above
         protected virtual DbConnectionInternal CreateConnection(
-            DbConnectionOptions options,
+            SqlConnectionOptions options,
             ConnectionPoolKey poolKey,
             DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
             IDbConnectionPool pool,
             DbConnection owningConnection,
-            DbConnectionOptions userOptions)
+            SqlConnectionOptions userOptions)
         {
-            SqlConnectionString opt = (SqlConnectionString)options;
+            SqlConnectionOptions opt = options;
             ConnectionPoolKey key = poolKey;
             SessionData recoverySessionData = null;
 
             SqlConnection sqlOwningConnection = owningConnection as SqlConnection;
             bool applyTransientFaultHandling = sqlOwningConnection?._applyTransientFaultHandling ?? false;
 
-            SqlConnectionString userOpt = null;
+            SqlConnectionOptions userOpt = null;
             if (userOptions != null)
             {
-                userOpt = (SqlConnectionString)userOptions;
+                userOpt = userOptions;
             }
             else if (sqlOwningConnection != null)
             {
-                userOpt = (SqlConnectionString)(sqlOwningConnection.UserConnectionOptions);
+                userOpt = sqlOwningConnection.UserConnectionOptions;
             }
 
             if (sqlOwningConnection != null)
@@ -636,7 +636,7 @@ protected virtual DbConnectionInternal CreateConnection(
                     // NOTE: Cloning connection option opt to set 'UserInstance=True' and 'Enlist=False'
                     //       This first connection is established to SqlExpress to get the instance name
                     //       of the UserInstance.
-                    SqlConnectionString sseopt = new SqlConnectionString(
+                    SqlConnectionOptions sseopt = new SqlConnectionOptions(
                         opt,
                         opt.DataSource,
                         userInstance: true,
@@ -688,7 +688,7 @@ protected virtual DbConnectionInternal CreateConnection(
                 // NOTE: Here connection option opt is cloned to set 'instanceName=<UserInstanceName>' that was
                 //       retrieved from the previous SSE connection. For this UserInstance connection 'Enlist=True'.
                 // options immutable - stored in global hash - don't modify
-                opt = new SqlConnectionString(opt, instanceName, userInstance: false, setEnlistValue: null);
+                opt = new SqlConnectionOptions(opt, instanceName, userInstance: false, setEnlistValue: null);
                 poolGroupProviderInfo = null; // null so we do not pass to constructor below...
             }
 
@@ -709,9 +709,9 @@ protected virtual DbConnectionInternal CreateConnection(
                 key.SspiContextProvider);
         }
 
-        private static DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(SqlConnectionString connectionOptions)
+        private static DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(SqlConnectionOptions connectionOptions)
         {
-            SqlConnectionString opt = (SqlConnectionString)connectionOptions;
+            SqlConnectionOptions opt = connectionOptions;
 
             DbConnectionPoolGroupOptions poolingOptions = null;
 
@@ -768,7 +768,7 @@ private Task<DbConnectionInternal> CreateReplaceConnectionContinuation(
             Task<DbConnectionInternal> task,
             DbConnection owningConnection,
             TaskCompletionSource<DbConnectionInternal> retry,
-            DbConnectionOptions userOptions,
+            SqlConnectionOptions userOptions,
             DbConnectionInternal oldConnection,
             DbConnectionPoolGroup poolGroup,
             CancellationTokenSource cancellationTokenSource)
@@ -826,7 +826,7 @@ private IDbConnectionPool GetConnectionPool(
                 DbConnectionPoolGroupOptions poolOptions = connectionPoolGroup.PoolGroupOptions;
 
                 // get the string to hash on again
-                DbConnectionOptions connectionOptions = connectionPoolGroup.ConnectionOptions;
+                SqlConnectionOptions connectionOptions = connectionPoolGroup.ConnectionOptions;
                 Debug.Assert(connectionOptions != null, "prevent expansion of connectionString");
 
                 connectionPoolGroup = GetConnectionPoolGroup(connectionPoolGroup.PoolKey, poolOptions, ref connectionOptions);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.Debug.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.Debug.cs
similarity index 94%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.Debug.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.Debug.cs
index 2c1a107ba4..30743b3eeb 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionOptions.Debug.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.Debug.cs
@@ -7,12 +7,13 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Text.RegularExpressions;
-using Microsoft.Data.SqlClient;
+using Microsoft.Data.Common;
+using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.SqlClient.Internal;
 
-namespace Microsoft.Data.Common.ConnectionString
+namespace Microsoft.Data.SqlClient
 {
-    internal partial class DbConnectionOptions
+    internal sealed partial class SqlConnectionOptions
     {
         #if DEBUG
         private const string ConnectionStringPattern =                     // may not contain embedded null except trailing last value
@@ -32,7 +33,7 @@ internal partial class DbConnectionOptions
             + ")*"                                                     // repeat the key-value pair
             + "[\\s;]*[\u0000\\s]*";                                   // trailing whitespace/semicolons (DataSourceLocator), embedded nulls are allowed only in the end
         private static readonly Regex ConnectionStringRegex = new Regex(ConnectionStringPattern, RegexOptions.ExplicitCapture | RegexOptions.Compiled);
-        
+
         private const string ConnectionStringPatternOdbc =             // may not contain embedded null except trailing last value
             "([\\s;]*"                                                 // leading whitespace and extra semicolons
             + "(?![\\s;])"                                             // key does not start with space or semicolon
@@ -49,7 +50,7 @@ internal partial class DbConnectionOptions
             + "[\\s;]*[\u0000\\s]*";                                   // trailing whitespace/semicolons (DataSourceLocator), embedded nulls are allowed only in the end
         private static readonly Regex ConnectionStringRegexOdbc = new Regex(ConnectionStringPatternOdbc, RegexOptions.ExplicitCapture | RegexOptions.Compiled);
         #endif
-        
+
         [Conditional("DEBUG")]
         private static void DebugTraceKeyValuePair(string keyname, string keyvalue, IReadOnlyDictionary<string, string> synonyms)
         {
@@ -64,16 +65,16 @@ private static void DebugTraceKeyValuePair(string keyname, string keyvalue, IRea
                     // don't trace passwords ever!
                     if (keyvalue != null)
                     {
-                        SqlClientEventSource.Log.AdvancedTraceEvent("<comm.DbConnectionOptions|INFO|ADV> KeyName='{0}', KeyValue='{1}'", keyname, keyvalue);
+                        SqlClientEventSource.Log.AdvancedTraceEvent("<comm.SqlConnectionOptions|INFO|ADV> KeyName='{0}', KeyValue='{1}'", keyname, keyvalue);
                     }
                     else
                     {
-                        SqlClientEventSource.Log.AdvancedTraceEvent("<comm.DbConnectionOptions|INFO|ADV> KeyName='{0}'", keyname);
+                        SqlClientEventSource.Log.AdvancedTraceEvent("<comm.SqlConnectionOptions|INFO|ADV> KeyName='{0}'", keyname);
                     }
                 }
             }
         }
-        
+
         #if DEBUG
         private static void ParseComparison(
             Dictionary<string, string> parseTable,
@@ -88,8 +89,8 @@ private static void ParseComparison(
                 foreach (var parsedValue in parsedValues)
                 {
                     string key = parsedValue.Key;
-                    string value1 = parsedValue.Value; 
-                    
+                    string value1 = parsedValue.Value;
+
                     bool parseTableContainsKey = parseTable.TryGetValue(key, out string value2);
                     Debug.Assert(parseTableContainsKey, $"{nameof(ParseInternal)} code vs. regex mismatch keyname <{key}>");
                     Debug.Assert(value1 == value2, $"{nameof(ParseInternal)} code vs. regex mismatch keyvalue <{value1}> <{value2}>");
@@ -107,28 +108,28 @@ private static void ParseComparison(
                     bool isEquivalent = msg1 == msg2;
                     if (!isEquivalent)
                     {
-                        // We also accept cases were Regex parser (debug only) reports "wrong format" and 
+                        // We also accept cases were Regex parser (debug only) reports "wrong format" and
                         // retail parsing code reports format exception in different location or "keyword not supported"
                         if (msg2.StartsWith(WrongFormatMessagePrefix, StringComparison.Ordinal))
                         {
-                            if (msg1.StartsWith(KeywordNotSupportedMessagePrefix, StringComparison.Ordinal) || 
+                            if (msg1.StartsWith(KeywordNotSupportedMessagePrefix, StringComparison.Ordinal) ||
                                 msg1.StartsWith(WrongFormatMessagePrefix, StringComparison.Ordinal))
                             {
                                 isEquivalent = true;
                             }
                         }
                     }
-                    
+
                     Debug.Assert(isEquivalent, "ParseInternal code vs regex message mismatch: <" + msg1 + "> <" + msg2 + ">");
                 }
                 else
                 {
                     Debug.Fail("ParseInternal code vs regex throw mismatch " + f.Message);
                 }
-                
+
                 e = null;
             }
-            
+
             if (e != null)
             {
                 Debug.Fail("ParseInternal code threw exception vs regex mismatch");
@@ -156,7 +157,7 @@ private static Dictionary<string, string> SplitConnectionString(
                 {
                     throw ADP.ConnectionStringSyntax(match.Length);
                 }
-                
+
                 int indexValue = 0;
                 CaptureCollection keyValues = match.Groups[ValueIndex].Captures;
                 foreach (Capture keypair in match.Groups[KeyIndex].Captures)
@@ -184,7 +185,7 @@ private static Dictionary<string, string> SplitConnectionString(
                     {
                         keyValue = null;
                     }
-                    
+
                     DebugTraceKeyValuePair(keyName, keyValue, synonyms);
                     string realKeyName = synonyms != null
                         ? synonyms.TryGetValue(keyName, out string synonym) ? synonym : null
@@ -194,14 +195,14 @@ private static Dictionary<string, string> SplitConnectionString(
                     {
                         throw ADP.KeywordNotSupported(keyName);
                     }
-                    
+
                     if (!firstKey || !parseTable.ContainsKey(realKeyName))
                     {
                         parseTable[realKeyName] = keyValue; // last key-value pair wins (or first)
                     }
                 }
             }
-            
+
             return parseTable;
         }
         #endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
similarity index 59%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
index ad05f67830..6eafb195c8 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
@@ -6,8 +6,11 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
 using System.Net;
 using System.Net.NetworkInformation;
+using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Security;
 using System.Security.Permissions;
@@ -17,12 +20,37 @@
 
 namespace Microsoft.Data.SqlClient
 {
-    internal sealed class SqlConnectionString : DbConnectionOptions
+    internal sealed partial class SqlConnectionOptions
     {
         // instances of this class are intended to be immutable, i.e readonly
         // used by pooling classes so it is much easier to verify correctness
         // when not worried about the class being modified during execution
 
+        #region DbConnectionOptions fields
+
+        private const string ConnectionStringValidKeyPattern = "^(?![;\\s])[^\\p{Cc}]+(?<!\\s)$"; // key not allowed to start with semi-colon or space or contain non-visible characters or end with space
+        private const string ConnectionStringValidValuePattern = "^[^\u0000]*$";                    // value not allowed to contain embedded null
+        private const string ConnectionStringQuoteValuePattern = "^[^\"'=;\\s\\p{Cc}]*$";           // generally do not quote the value if it matches the pattern
+        private const string ConnectionStringQuoteOdbcValuePattern = "^\\{([^\\}\u0000]|\\}\\})*\\}$"; // do not quote odbc value if it matches this pattern
+        internal const string DataDirectory = "|datadirectory|";
+
+        private static readonly Regex s_connectionStringValidKeyRegex = new Regex(ConnectionStringValidKeyPattern, RegexOptions.Compiled);
+        private static readonly Regex s_connectionStringValidValueRegex = new Regex(ConnectionStringValidValuePattern, RegexOptions.Compiled);
+        private static readonly Regex s_connectionStringQuoteValueRegex = new Regex(ConnectionStringQuoteValuePattern, RegexOptions.Compiled);
+        private static readonly Regex s_connectionStringQuoteOdbcValueRegex = new Regex(ConnectionStringQuoteOdbcValuePattern, RegexOptions.ExplicitCapture | RegexOptions.Compiled);
+
+        internal readonly bool _hasPasswordKeyword;
+        internal readonly bool _hasUserIdKeyword;
+        internal readonly NameValuePair _keyChain;
+
+        private readonly string _usersConnectionString;
+        private readonly Dictionary<string, string> _parsetable;
+
+        internal Dictionary<string, string> Parsetable => _parsetable;
+        public bool IsEmpty => _keyChain == null;
+
+        #endregion
+
         internal enum TypeSystem
         {
             Latest = 2008,
@@ -115,7 +143,7 @@ internal static class TRANSACTIONBINDING
         /// <summary>
         /// Static constructor to do things that we can't do in a single line initialization.
         /// </summary>
-        static SqlConnectionString()
+        static SqlConnectionOptions()
         {
             // Add keywords and synonyms to the keyword map.
             // @TODO: About half of these synonyms are just the same as the keyword but with spaces
@@ -209,8 +237,19 @@ static SqlConnectionString()
             #endif
         }
 
-        internal SqlConnectionString(string connectionString): base(connectionString, s_keywordMap)
+        internal SqlConnectionOptions(string connectionString)
         {
+            // Initialize parse table (inlined from DbConnectionOptions base constructor)
+            _parsetable = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
+            _usersConnectionString = connectionString ?? "";
+            if (_usersConnectionString.Length > 0)
+            {
+                _keyChain = ParseInternal(_parsetable, _usersConnectionString, true, s_keywordMap, false);
+                _hasPasswordKeyword = _parsetable.ContainsKey(DbConnectionStringKeywords.Password) ||
+                                      _parsetable.ContainsKey(DbConnectionStringSynonyms.Pwd);
+                _hasUserIdKeyword = _parsetable.ContainsKey(DbConnectionStringKeywords.UserId) ||
+                                    _parsetable.ContainsKey(DbConnectionStringSynonyms.Uid);
+            }
 #if !NETFRAMEWORK
             ThrowUnsupportedIfKeywordSet(DbConnectionStringKeywords.ConnectionReset);
 
@@ -512,8 +551,14 @@ internal SqlConnectionString(string connectionString): base(connectionString, s_
 
         // This c-tor is used to create SSE and user instance connection strings when user instance is set to true
         // BUG (VSTFDevDiv) 479687: Using TransactionScope with Linq2SQL against user instances fails with "connection has been broken" message
-        internal SqlConnectionString(SqlConnectionString connectionOptions, string dataSource, bool userInstance, bool? setEnlistValue) : base(connectionOptions)
+        internal SqlConnectionOptions(SqlConnectionOptions connectionOptions, string dataSource, bool userInstance, bool? setEnlistValue)
         {
+            // Copy parse state (inlined from DbConnectionOptions copy constructor)
+            _usersConnectionString = connectionOptions._usersConnectionString;
+            _parsetable = connectionOptions._parsetable;
+            _keyChain = connectionOptions._keyChain;
+            _hasPasswordKeyword = connectionOptions._hasPasswordKeyword;
+            _hasUserIdKeyword = connectionOptions._hasUserIdKeyword;
             _integratedSecurity = connectionOptions._integratedSecurity;
             _encrypt = connectionOptions._encrypt;
 
@@ -641,7 +686,7 @@ internal bool EnforceLocalHost
             }
         }
 
-        protected internal override string Expand()
+        internal string Expand()
         {
             if (_expandedAttachDBFilename != null)
             {
@@ -653,7 +698,7 @@ protected internal override string Expand()
             }
             else
             {
-                return base.Expand();
+                return _usersConnectionString;
             }
         }
 
@@ -973,7 +1018,7 @@ internal static class NETLIB
         private static Dictionary<string, string> s_netlibMapping;
 
 #if NETFRAMEWORK
-        protected internal override PermissionSet CreatePermissionSet()
+        internal PermissionSet CreatePermissionSet()
         {
             PermissionSet permissionSet = new(PermissionState.None);
             permissionSet.AddPermission(new SqlClientPermission(this));
@@ -1004,5 +1049,716 @@ private static void AddKeywordToMap(string keyword, params string[] synonyms)
         }
 
         #endregion
+
+        #region DbConnectionOptions methods
+
+        internal bool TryGetParsetableValue(string key, out string value) => _parsetable.TryGetValue(key, out value);
+
+        // same as Boolean, but with SSPI thrown in as valid yes
+        public bool ConvertValueToIntegratedSecurity()
+        {
+            return _parsetable.TryGetValue(DbConnectionStringKeywords.IntegratedSecurity, out string value) && value != null
+                ? ConvertValueToIntegratedSecurityInternal(value)
+                : false;
+        }
+
+        internal bool ConvertValueToIntegratedSecurityInternal(string stringValue)
+        {
+            if (CompareInsensitiveInvariant(stringValue, "sspi") || CompareInsensitiveInvariant(stringValue, "true") || CompareInsensitiveInvariant(stringValue, "yes"))
+            {
+                return true;
+            }
+
+            if (CompareInsensitiveInvariant(stringValue, "false") || CompareInsensitiveInvariant(stringValue, "no"))
+            {
+                return false;
+            }
+
+            string tmp = stringValue.Trim();  // Remove leading & trailing whitespace.
+            if (CompareInsensitiveInvariant(tmp, "sspi") || CompareInsensitiveInvariant(tmp, "true") || CompareInsensitiveInvariant(tmp, "yes"))
+            {
+                return true;
+            }
+
+            if (CompareInsensitiveInvariant(tmp, "false") || CompareInsensitiveInvariant(tmp, "no"))
+            {
+                return false;
+            }
+
+            throw ADP.InvalidConnectionOptionValue(DbConnectionStringKeywords.IntegratedSecurity);
+        }
+
+        public int ConvertValueToInt32(string keyName, int defaultValue)
+        {
+            return _parsetable.TryGetValue(keyName, out string value) && value != null ?
+                   ConvertToInt32Internal(keyName, value) :
+                   defaultValue;
+        }
+
+        internal static int ConvertToInt32Internal(string keyname, string stringValue)
+        {
+            try
+            {
+                return int.Parse(stringValue, System.Globalization.NumberStyles.Integer, CultureInfo.InvariantCulture);
+            }
+            catch (FormatException e)
+            {
+                throw ADP.InvalidConnectionOptionValue(keyname, e);
+            }
+            catch (OverflowException e)
+            {
+                throw ADP.InvalidConnectionOptionValue(keyname, e);
+            }
+        }
+
+        public string ConvertValueToString(string keyName, string defaultValue)
+            => _parsetable.TryGetValue(keyName, out string value) && value != null ? value : defaultValue;
+
+        public bool ContainsKey(string keyword) => _parsetable.ContainsKey(keyword);
+
+        public string UsersConnectionString(bool hidePassword) => UsersConnectionString(hidePassword, false);
+
+        internal string UsersConnectionStringForTrace() => UsersConnectionString(true, true);
+
+        private string UsersConnectionString(bool hidePassword, bool forceHidePassword)
+        {
+            string connectionString = _usersConnectionString;
+            if (_hasPasswordKeyword && (forceHidePassword || (hidePassword && !HasPersistablePassword)))
+            {
+                ReplacePasswordPwd(out connectionString, false);
+            }
+            return connectionString ?? string.Empty;
+        }
+
+        internal bool HasPersistablePassword => _hasPasswordKeyword
+            ? ConvertValueToBoolean(DbConnectionStringKeywords.PersistSecurityInfo, DbConnectionStringDefaults.PersistSecurityInfo)
+            : true; // no password means persistable password so we don't have to munge
+
+        public bool ConvertValueToBoolean(string keyName, bool defaultValue)
+        {
+            string value;
+            return _parsetable.TryGetValue(keyName, out value) ?
+                ConvertValueToBooleanInternal(keyName, value) :
+                defaultValue;
+        }
+
+        internal static bool ConvertValueToBooleanInternal(string keyName, string stringValue)
+        {
+            if (CompareInsensitiveInvariant(stringValue, "true") || CompareInsensitiveInvariant(stringValue, "yes"))
+            {
+                return true;
+            }
+            else if (CompareInsensitiveInvariant(stringValue, "false") || CompareInsensitiveInvariant(stringValue, "no"))
+            {
+                return false;
+            }
+            else
+            {
+                string tmp = stringValue.Trim();  // Remove leading & trailing whitespace.
+                if (CompareInsensitiveInvariant(tmp, "true") || CompareInsensitiveInvariant(tmp, "yes"))
+                {
+                    return true;
+                }
+                else if (CompareInsensitiveInvariant(tmp, "false") || CompareInsensitiveInvariant(tmp, "no"))
+                {
+                    return false;
+                }
+                else
+                {
+                    throw ADP.InvalidConnectionOptionValue(keyName);
+                }
+            }
+        }
+
+        private static bool CompareInsensitiveInvariant(string strvalue, string strconst)
+            => (0 == StringComparer.OrdinalIgnoreCase.Compare(strvalue, strconst));
+
+        private static string GetKeyName(StringBuilder buffer)
+        {
+            int count = buffer.Length;
+            while ((0 < count) && char.IsWhiteSpace(buffer[count - 1]))
+            {
+                count--; // trailing whitespace
+            }
+            return buffer.ToString(0, count).ToLower(CultureInfo.InvariantCulture);
+        }
+
+        private static string GetKeyValue(StringBuilder buffer, bool trimWhitespace)
+        {
+            int count = buffer.Length;
+            int index = 0;
+            if (trimWhitespace)
+            {
+                while ((index < count) && char.IsWhiteSpace(buffer[index]))
+                {
+                    index++; // leading whitespace
+                }
+                while ((0 < count) && char.IsWhiteSpace(buffer[count - 1]))
+                {
+                    count--; // trailing whitespace
+                }
+            }
+            return buffer.ToString(index, count - index);
+        }
+
+        // transition states used for parsing
+        private enum ParserState
+        {
+            NothingYet = 1,   //start point
+            Key,
+            KeyEqual,
+            KeyEnd,
+            UnquotedValue,
+            DoubleQuoteValue,
+            DoubleQuoteValueQuote,
+            SingleQuoteValue,
+            SingleQuoteValueQuote,
+            BraceQuoteValue,
+            BraceQuoteValueQuote,
+            QuotedValueEnd,
+            NullTermination,
+        };
+
+        // @TODO: This should probably be extracted into its own parser class
+        internal static int GetKeyValuePair(string connectionString, int currentPosition, StringBuilder buffer, bool useOdbcRules, out string keyname, out string keyvalue)
+        {
+            int startposition = currentPosition;
+
+            buffer.Length = 0;
+            keyname = null;
+            keyvalue = null;
+
+            char currentChar = '\0';
+
+            ParserState parserState = ParserState.NothingYet;
+            int length = connectionString.Length;
+            for (; currentPosition < length; ++currentPosition)
+            {
+                currentChar = connectionString[currentPosition];
+
+                switch (parserState)
+                {
+                    case ParserState.NothingYet: // [\\s;]*
+                        if ((';' == currentChar) || char.IsWhiteSpace(currentChar))
+                        {
+                            continue;
+                        }
+                        if ('\0' == currentChar)
+                        { parserState = ParserState.NullTermination; continue; }
+                        if (char.IsControl(currentChar))
+                        { throw ADP.ConnectionStringSyntax(startposition); }
+                        startposition = currentPosition;
+                        if ('=' != currentChar)
+                        {
+                            parserState = ParserState.Key;
+                            break;
+                        }
+                        else
+                        {
+                            parserState = ParserState.KeyEqual;
+                            continue;
+                        }
+
+                    case ParserState.Key: // (?<key>([^=\\s\\p{Cc}]|\\s+[^=\\s\\p{Cc}]|\\s+==|==)+)
+                        if ('=' == currentChar)
+                        { parserState = ParserState.KeyEqual; continue; }
+                        if (char.IsWhiteSpace(currentChar))
+                        { break; }
+                        if (char.IsControl(currentChar))
+                        { throw ADP.ConnectionStringSyntax(startposition); }
+                        break;
+
+                    case ParserState.KeyEqual: // \\s*=(?!=)\\s*
+                        if (!useOdbcRules && '=' == currentChar)
+                        { parserState = ParserState.Key; break; }
+                        keyname = GetKeyName(buffer);
+                        if (string.IsNullOrEmpty(keyname))
+                        { throw ADP.ConnectionStringSyntax(startposition); }
+                        buffer.Length = 0;
+                        parserState = ParserState.KeyEnd;
+                        goto case ParserState.KeyEnd;
+
+                    case ParserState.KeyEnd:
+                        if (char.IsWhiteSpace(currentChar))
+                        { continue; }
+                        if (useOdbcRules)
+                        {
+                            if ('{' == currentChar)
+                            { parserState = ParserState.BraceQuoteValue; break; }
+                        }
+                        else
+                        {
+                            if ('\'' == currentChar)
+                            { parserState = ParserState.SingleQuoteValue; continue; }
+                            if ('"' == currentChar)
+                            { parserState = ParserState.DoubleQuoteValue; continue; }
+                        }
+                        if (';' == currentChar)
+                        { goto ParserExit; }
+                        if ('\0' == currentChar)
+                        { goto ParserExit; }
+                        if (char.IsControl(currentChar))
+                        { throw ADP.ConnectionStringSyntax(startposition); }
+                        parserState = ParserState.UnquotedValue;
+                        break;
+
+                    case ParserState.UnquotedValue: // "((?![\"'\\s])" + "([^;\\s\\p{Cc}]|\\s+[^;\\s\\p{Cc}])*" + "(?<![\"']))"
+                        if (char.IsWhiteSpace(currentChar))
+                        { break; }
+                        if (char.IsControl(currentChar) || ';' == currentChar)
+                        { goto ParserExit; }
+                        break;
+
+                    case ParserState.DoubleQuoteValue: // "(\"([^\"\u0000]|\"\")*\")"
+                        if ('"' == currentChar)
+                        { parserState = ParserState.DoubleQuoteValueQuote; continue; }
+                        if ('\0' == currentChar)
+                        { throw ADP.ConnectionStringSyntax(startposition); }
+                        break;
+
+                    case ParserState.DoubleQuoteValueQuote:
+                        if ('"' == currentChar)
+                        { parserState = ParserState.DoubleQuoteValue; break; }
+                        keyvalue = GetKeyValue(buffer, false);
+                        parserState = ParserState.QuotedValueEnd;
+                        goto case ParserState.QuotedValueEnd;
+
+                    case ParserState.SingleQuoteValue: // "('([^'\\u0000]|'')*')"
+                        if ('\'' == currentChar)
+                        { parserState = ParserState.SingleQuoteValueQuote; continue; }
+                        if ('\0' == currentChar)
+                        { throw ADP.ConnectionStringSyntax(startposition); }
+                        break;
+
+                    case ParserState.SingleQuoteValueQuote:
+                        if ('\'' == currentChar)
+                        { parserState = ParserState.SingleQuoteValue; break; }
+                        keyvalue = GetKeyValue(buffer, false);
+                        parserState = ParserState.QuotedValueEnd;
+                        goto case ParserState.QuotedValueEnd;
+
+                    case ParserState.BraceQuoteValue: // "(\\{([^\\}\\u0000]|\\}\\})*\\})"
+                        if ('}' == currentChar)
+                        { parserState = ParserState.BraceQuoteValueQuote; break; }
+                        if ('\0' == currentChar)
+                        { throw ADP.ConnectionStringSyntax(startposition); }
+                        break;
+
+                    case ParserState.BraceQuoteValueQuote:
+                        if ('}' == currentChar)
+                        { parserState = ParserState.BraceQuoteValue; break; }
+                        keyvalue = GetKeyValue(buffer, false);
+                        parserState = ParserState.QuotedValueEnd;
+                        goto case ParserState.QuotedValueEnd;
+
+                    case ParserState.QuotedValueEnd:
+                        if (char.IsWhiteSpace(currentChar))
+                        { continue; }
+                        if (';' == currentChar)
+                        { goto ParserExit; }
+                        if ('\0' == currentChar)
+                        { parserState = ParserState.NullTermination; continue; }
+                        throw ADP.ConnectionStringSyntax(startposition);  // unbalanced single quote
+
+                    case ParserState.NullTermination: // [\\s;\\u0000]*
+                        if ('\0' == currentChar)
+                        { continue; }
+                        if (char.IsWhiteSpace(currentChar))
+                        { continue; }
+                        throw ADP.ConnectionStringSyntax(currentPosition);
+
+                    default:
+                        throw ADP.InternalError(ADP.InternalErrorCode.InvalidParserState1);
+                }
+                buffer.Append(currentChar);
+            }
+        ParserExit:
+            switch (parserState)
+            {
+                case ParserState.Key:
+                case ParserState.DoubleQuoteValue:
+                case ParserState.SingleQuoteValue:
+                case ParserState.BraceQuoteValue:
+                    // keyword not found/unbalanced double/single quote
+                    throw ADP.ConnectionStringSyntax(startposition);
+
+                case ParserState.KeyEqual:
+                    // equal sign at end of line
+                    keyname = GetKeyName(buffer);
+                    if (string.IsNullOrEmpty(keyname))
+                    { throw ADP.ConnectionStringSyntax(startposition); }
+                    break;
+
+                case ParserState.UnquotedValue:
+                    // unquoted value at end of line
+                    keyvalue = GetKeyValue(buffer, true);
+
+                    char tmpChar = keyvalue[keyvalue.Length - 1];
+                    if (!useOdbcRules && (('\'' == tmpChar) || ('"' == tmpChar)))
+                    {
+                        throw ADP.ConnectionStringSyntax(startposition);    // unquoted value must not end in quote, except for odbc
+                    }
+                    break;
+
+                case ParserState.DoubleQuoteValueQuote:
+                case ParserState.SingleQuoteValueQuote:
+                case ParserState.BraceQuoteValueQuote:
+                case ParserState.QuotedValueEnd:
+                    // quoted value at end of line
+                    keyvalue = GetKeyValue(buffer, false);
+                    break;
+
+                case ParserState.NothingYet:
+                case ParserState.KeyEnd:
+                case ParserState.NullTermination:
+                    // do nothing
+                    break;
+
+                default:
+                    throw ADP.InternalError(ADP.InternalErrorCode.InvalidParserState2);
+            }
+            if ((';' == currentChar) && (currentPosition < connectionString.Length))
+            {
+                currentPosition++;
+            }
+            return currentPosition;
+        }
+
+        private static bool IsValueValidInternal(string keyvalue)
+        {
+            if (keyvalue != null)
+            {
+#if DEBUG
+                bool compValue = s_connectionStringValidValueRegex.IsMatch(keyvalue);
+                Debug.Assert((-1 == keyvalue.IndexOf('\u0000')) == compValue, "IsValueValid mismatch with regex");
+#endif
+                return (-1 == keyvalue.IndexOf('\u0000'));
+            }
+            return true;
+        }
+
+        private static bool IsKeyNameValid(string keyname)
+        {
+            if (keyname != null)
+            {
+#if DEBUG
+                bool compValue = s_connectionStringValidKeyRegex.IsMatch(keyname);
+                Debug.Assert(((0 < keyname.Length) && (';' != keyname[0]) && !char.IsWhiteSpace(keyname[0]) && (-1 == keyname.IndexOf('\u0000'))) == compValue, "IsValueValid mismatch with regex");
+#endif
+                return ((0 < keyname.Length) && (';' != keyname[0]) && !char.IsWhiteSpace(keyname[0]) && (-1 == keyname.IndexOf('\u0000')));
+            }
+            return false;
+        }
+
+        private static NameValuePair ParseInternal(
+            Dictionary<string, string> parsetable,
+            string connectionString,
+            bool buildChain,
+            IReadOnlyDictionary<string, string> synonyms,
+            bool firstKey)
+        {
+            Debug.Assert(connectionString != null, "null connectionstring");
+            StringBuilder buffer = new StringBuilder();
+            NameValuePair localKeychain = null, keychain = null;
+
+            #if DEBUG
+            try
+            {
+            #endif
+                int nextStartPosition = 0;
+                int endPosition = connectionString.Length;
+                while (nextStartPosition < endPosition)
+                {
+                    int startPosition = nextStartPosition;
+
+                    string keyname, keyvalue;
+                    nextStartPosition = GetKeyValuePair(connectionString, startPosition, buffer, firstKey, out keyname, out keyvalue);
+                    if (string.IsNullOrEmpty(keyname))
+                    {
+                        // if (nextStartPosition != endPosition) { throw; }
+                        break;
+                    }
+
+                    DebugTraceKeyValuePair(keyname, keyvalue, synonyms);
+                    Debug.Assert(IsKeyNameValid(keyname), "ParseFailure, invalid keyname");
+                    Debug.Assert(IsValueValidInternal(keyvalue), "parse failure, invalid keyvalue");
+
+                    string realkeyname = (synonyms is not null) ?
+                                         (synonyms.TryGetValue(keyname, out string synonym) ? synonym : null) :
+                                          keyname;
+
+                    if (!IsKeyNameValid(realkeyname))
+                    {
+                        throw ADP.KeywordNotSupported(keyname);
+                    }
+                    if (!firstKey || !parsetable.ContainsKey(realkeyname))
+                    {
+                        parsetable[realkeyname] = keyvalue; // last key-value pair wins (or first)
+                    }
+
+                    if (localKeychain != null)
+                    {
+                        localKeychain = localKeychain.Next = new NameValuePair(realkeyname, keyvalue, nextStartPosition - startPosition);
+                    }
+                    else if (buildChain)
+                    { // first time only - don't contain modified chain from UDL file
+                        keychain = localKeychain = new NameValuePair(realkeyname, keyvalue, nextStartPosition - startPosition);
+                    }
+                }
+            #if DEBUG
+            }
+            catch (ArgumentException e)
+            {
+                ParseComparison(parsetable, connectionString, synonyms, firstKey, e);
+                throw;
+            }
+            ParseComparison(parsetable, connectionString, synonyms, firstKey, null);
+            #endif
+
+            return keychain;
+        }
+
+        internal NameValuePair ReplacePasswordPwd(out string constr, bool fakePassword)
+        {
+            bool expanded = false;
+            int copyPosition = 0;
+            NameValuePair head = null, tail = null, next = null;
+            StringBuilder builder = new StringBuilder(_usersConnectionString.Length);
+            for (NameValuePair current = _keyChain; current != null; current = current.Next)
+            {
+                if (!CompareInsensitiveInvariant(DbConnectionStringKeywords.Password, current.Name) &&
+                    !CompareInsensitiveInvariant(DbConnectionStringSynonyms.Pwd, current.Name))
+                {
+                    builder.Append(_usersConnectionString, copyPosition, current.Length);
+                    if (fakePassword)
+                    {
+                        next = new NameValuePair(current.Name, current.Value, current.Length);
+                    }
+                }
+                else if (fakePassword)
+                {
+                    // replace user password/pwd value with *
+                    const string equalstar = "=*;";
+                    builder.Append(current.Name).Append(equalstar);
+                    next = new NameValuePair(current.Name, "*", current.Name.Length + equalstar.Length);
+                    expanded = true;
+                }
+                else
+                {
+                    // drop the password/pwd completely in returning for user
+                    expanded = true;
+                }
+
+                if (fakePassword)
+                {
+                    if (tail != null)
+                    {
+                        tail = tail.Next = next;
+                    }
+                    else
+                    {
+                        tail = head = next;
+                    }
+                }
+                copyPosition += current.Length;
+            }
+            Debug.Assert(expanded, "password/pwd was not removed");
+            constr = builder.ToString();
+            return head;
+        }
+
+        // SxS notes:
+        // * this method queries "DataDirectory" value from the current AppDomain.
+        //   This string is used for to replace "!DataDirectory!" values in the connection string, it is not considered as an "exposed resource".
+        // * This method uses GetFullPath to validate that root path is valid, the result is not exposed out.
+        internal static string ExpandDataDirectory(string keyword, string value)
+        {
+            string fullPath = null;
+            if (value != null && value.StartsWith(DataDirectory, StringComparison.OrdinalIgnoreCase))
+            {
+                // find the replacement path
+                object rootFolderObject = AppDomain.CurrentDomain.GetData("DataDirectory");
+                var rootFolderPath = (rootFolderObject as string);
+                if (rootFolderObject != null && rootFolderPath == null)
+                {
+                    throw ADP.InvalidDataDirectory();
+                }
+
+                if (string.IsNullOrEmpty(rootFolderPath))
+                {
+                    rootFolderPath = AppDomain.CurrentDomain.BaseDirectory;
+                }
+
+                var fileName = value.Substring(DataDirectory.Length);
+
+                if (Path.IsPathRooted(fileName))
+                {
+                    fileName = fileName.TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+                }
+
+                fullPath = Path.Combine(rootFolderPath, fileName);
+
+                // verify root folder path is a real path without unexpected "..\"
+                if (!Path.GetFullPath(fullPath).StartsWith(rootFolderPath, StringComparison.Ordinal))
+                {
+                    throw ADP.InvalidConnectionOptionValue(keyword);
+                }
+            }
+            return fullPath;
+        }
+
+        #region Net methods
+
+#if NET
+        internal string ExpandAttachDbFileName(string replacementValue)
+        {
+            int copyPosition = 0;
+
+            StringBuilder builder = new(_usersConnectionString.Length);
+            for (NameValuePair current = _keyChain; current != null; current = current.Next)
+            {
+                if (string.Equals(current.Name, DbConnectionStringKeywords.AttachDbFilename, StringComparison.InvariantCultureIgnoreCase))
+                {
+                    builder.Append($"{current.Name}={replacementValue};");
+                }
+                else
+                {
+                    builder.Append(_usersConnectionString, copyPosition, current.Length);
+                }
+                copyPosition += current.Length;
+            }
+
+            return builder.ToString();
+        }
+#endif
+
+        #endregion
+
+        #region NetFx methods
+
+#if NETFRAMEWORK
+        public string this[string keyword] => _parsetable[keyword];
+
+        private PermissionSet _permissionset;
+
+        internal void DemandPermission()
+        {
+            if (_permissionset is null)
+            {
+                _permissionset = CreatePermissionSet();
+            }
+            _permissionset.Demand();
+        }
+
+        internal bool HasBlankPassword
+        {
+            get
+            {
+                if (!ConvertValueToIntegratedSecurity())
+                {
+                    if (_parsetable.TryGetValue(DbConnectionStringKeywords.Password, out string value))
+                    {
+                        return string.IsNullOrEmpty(value);
+                    }
+
+                    if (_parsetable.TryGetValue(DbConnectionStringSynonyms.Pwd, out value))
+                    {
+                        return string.IsNullOrEmpty(value); // MDAC 83097
+                    }
+
+                    return (_parsetable.TryGetValue(DbConnectionStringKeywords.UserId, out value) && !string.IsNullOrEmpty(value)) ||
+                           (_parsetable.TryGetValue(DbConnectionStringSynonyms.Uid, out value) && !string.IsNullOrEmpty(value));
+                }
+                return false;
+            }
+        }
+
+        internal string ExpandKeyword(string keyword, string replacementValue)
+        {
+            // preserve duplicates, updated keyword value with replacement value
+            // if keyword not specified, append to end of the string
+            bool expanded = false;
+            int copyPosition = 0;
+
+            StringBuilder builder = new(_usersConnectionString.Length);
+            for (NameValuePair current = _keyChain; current != null; current = current.Next)
+            {
+                if ((current.Name == keyword) && (current.Value == this[keyword]))
+                {
+                    // only replace the parse end-result value instead of all values
+                    // so that when duplicate-keywords occur other original values remain in place
+                    AppendKeyValuePairBuilder(builder, current.Name, replacementValue);
+                    builder.Append(';');
+                    expanded = true;
+                }
+                else
+                {
+                    builder.Append(_usersConnectionString, copyPosition, current.Length);
+                }
+                copyPosition += current.Length;
+            }
+
+            if (!expanded)
+            {
+                AppendKeyValuePairBuilder(builder, keyword, replacementValue);
+            }
+            return builder.ToString();
+        }
+
+        internal static void AppendKeyValuePairBuilder(StringBuilder builder, string keyName, string keyValue)
+        {
+            ADP.CheckArgumentNull(builder, nameof(builder));
+            ADP.CheckArgumentLength(keyName, nameof(keyName));
+
+            if (keyName == null || !s_connectionStringValidKeyRegex.IsMatch(keyName))
+            {
+                throw ADP.InvalidKeyname(keyName);
+            }
+            if (keyValue != null && !IsValueValidInternal(keyValue))
+            {
+                throw ADP.InvalidValue(keyName);
+            }
+
+            if ((0 < builder.Length) && (';' != builder[builder.Length - 1]))
+            {
+                builder.Append(";");
+            }
+
+            builder.Append(keyName.Replace("=", "=="));
+            builder.Append("=");
+
+            if (keyValue != null)
+            { // else <keyword>=;
+                if (s_connectionStringQuoteValueRegex.IsMatch(keyValue))
+                {
+                    // <value> -> <value>
+                    builder.Append(keyValue);
+                }
+                else if ((-1 != keyValue.IndexOf('\"')) && (-1 == keyValue.IndexOf('\'')))
+                {
+                    // <val"ue> -> <'val"ue'>
+                    builder.Append('\'');
+                    builder.Append(keyValue);
+                    builder.Append('\'');
+                }
+                else
+                {
+                    // <val'ue> -> <"val'ue">
+                    // <=value> -> <"=value">
+                    // <;value> -> <";value">
+                    // < value> -> <" value">
+                    // <va lue> -> <"va lue">
+                    // <va'"lue> -> <"va'""lue">
+                    builder.Append('\"');
+                    builder.Append(keyValue.Replace("\"", "\"\""));
+                    builder.Append('\"');
+                }
+            }
+        }
+#endif
+
+        #endregion
+
+        #endregion
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
index 33d78c57c7..4e54a32c75 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
@@ -193,7 +193,7 @@ private static Dictionary<string, Keywords> CreateKeywordsDictionary()
             // @TODO: Ok, I think we should consider centralizing all these keywords into a single
             //    place. We have DbConnectionString*, Keywords, etc.
             //    Can we consider something DbConnectionOptions as backing store for the values
-            //    and both SqlConnectionStringBuilder and SqlConnectionString use it to store?
+            //    and both SqlConnectionStringBuilder and SqlConnectionOptions use it to store?
             Dictionary<string, Keywords> pairs = new(StringComparer.OrdinalIgnoreCase)
             {
                 { DbConnectionStringKeywords.ApplicationIntent, Keywords.ApplicationIntent },
@@ -828,19 +828,19 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                     svalue = svalue.Trim();
                     if (StringComparer.OrdinalIgnoreCase.Equals(svalue, NamedPipes))
                     {
-                        return SqlConnectionString.NETLIB.NamedPipes;
+                        return SqlConnectionOptions.NETLIB.NamedPipes;
                     }
                     else if (StringComparer.OrdinalIgnoreCase.Equals(svalue, SharedMemory))
                     {
-                        return SqlConnectionString.NETLIB.SharedMemory;
+                        return SqlConnectionOptions.NETLIB.SharedMemory;
                     }
                     else if (StringComparer.OrdinalIgnoreCase.Equals(svalue, TCPIP))
                     {
-                        return SqlConnectionString.NETLIB.TCPIP;
+                        return SqlConnectionOptions.NETLIB.TCPIP;
                     }
                     else if (StringComparer.OrdinalIgnoreCase.Equals(svalue, VIA))
                     {
-                        return SqlConnectionString.NETLIB.VIA;
+                        return SqlConnectionOptions.NETLIB.VIA;
                     }
                     else
                     {
@@ -859,10 +859,10 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
                 {
                     return svalue.Trim().ToLower(CultureInfo.InvariantCulture) switch
                     {
-                        SqlConnectionString.NETLIB.NamedPipes => NamedPipes,
-                        SqlConnectionString.NETLIB.SharedMemory => SharedMemory,
-                        SqlConnectionString.NETLIB.TCPIP => TCPIP,
-                        SqlConnectionString.NETLIB.VIA => VIA,
+                        SqlConnectionOptions.NETLIB.NamedPipes => NamedPipes,
+                        SqlConnectionOptions.NETLIB.SharedMemory => SharedMemory,
+                        SqlConnectionOptions.NETLIB.TCPIP => TCPIP,
+                        SqlConnectionOptions.NETLIB.VIA => VIA,
                         _ => svalue,
                     };
                 }
@@ -1877,14 +1877,14 @@ public string NetworkLibrary
                 {
                     value = value.Trim().ToLower(CultureInfo.InvariantCulture) switch
                     {
-                        SqlConnectionString.NETLIB.AppleTalk => SqlConnectionString.NETLIB.AppleTalk,
-                        SqlConnectionString.NETLIB.BanyanVines => SqlConnectionString.NETLIB.BanyanVines,
-                        SqlConnectionString.NETLIB.IPXSPX => SqlConnectionString.NETLIB.IPXSPX,
-                        SqlConnectionString.NETLIB.Multiprotocol => SqlConnectionString.NETLIB.Multiprotocol,
-                        SqlConnectionString.NETLIB.NamedPipes => SqlConnectionString.NETLIB.NamedPipes,
-                        SqlConnectionString.NETLIB.SharedMemory => SqlConnectionString.NETLIB.SharedMemory,
-                        SqlConnectionString.NETLIB.TCPIP => SqlConnectionString.NETLIB.TCPIP,
-                        SqlConnectionString.NETLIB.VIA => SqlConnectionString.NETLIB.VIA,
+                        SqlConnectionOptions.NETLIB.AppleTalk => SqlConnectionOptions.NETLIB.AppleTalk,
+                        SqlConnectionOptions.NETLIB.BanyanVines => SqlConnectionOptions.NETLIB.BanyanVines,
+                        SqlConnectionOptions.NETLIB.IPXSPX => SqlConnectionOptions.NETLIB.IPXSPX,
+                        SqlConnectionOptions.NETLIB.Multiprotocol => SqlConnectionOptions.NETLIB.Multiprotocol,
+                        SqlConnectionOptions.NETLIB.NamedPipes => SqlConnectionOptions.NETLIB.NamedPipes,
+                        SqlConnectionOptions.NETLIB.SharedMemory => SqlConnectionOptions.NETLIB.SharedMemory,
+                        SqlConnectionOptions.NETLIB.TCPIP => SqlConnectionOptions.NETLIB.TCPIP,
+                        SqlConnectionOptions.NETLIB.VIA => SqlConnectionOptions.NETLIB.VIA,
                         _ => throw ADP.InvalidConnectionOptionValue(DbConnectionStringKeywords.NetworkLibrary),
                     };
                 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index f01fe4506d..649c73147c 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -66,7 +66,7 @@ internal class SharedState
         private ALTROWSTATUS _altRowStatus;
         private int _recordsAffected = -1;
         private long _defaultTimeoutMilliseconds;
-        private SqlConnectionString.TypeSystem _typeSystem;
+        private SqlConnectionOptions.TypeSystem _typeSystem;
 
         // SQLStatistics support
         private SqlStatistics _statistics;
@@ -572,7 +572,7 @@ internal DataTable BuildSchemaTable()
                 schemaRow[nonVersionedProviderType] = (int)(col.cipherMD != null ? col.baseTI.type : col.type); // SqlDbType enum value - does not change with TypeSystem.
                 schemaRow[dataTypeName] = GetDataTypeNameInternal(col);
 
-                if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && col.Is2008DateTimeType)
+                if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && col.Is2008DateTimeType)
                 {
                     schemaRow[providerType] = SqlDbType.NVarChar;
                     switch (col.type)
@@ -594,9 +594,9 @@ internal DataTable BuildSchemaTable()
                             break;
                     }
                 }
-                else if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && col.IsLargeUdt)
+                else if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && col.IsLargeUdt)
                 {
-                    if (_typeSystem == SqlConnectionString.TypeSystem.SQLServer2005)
+                    if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005)
                     {
                         schemaRow[providerType] = SqlDbType.VarBinary;
                     }
@@ -606,7 +606,7 @@ internal DataTable BuildSchemaTable()
                         schemaRow[providerType] = SqlDbType.Image;
                     }
                 }
-                else if (_typeSystem != SqlConnectionString.TypeSystem.SQLServer2000)
+                else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
                 {
                     // TypeSystem.SQLServer2005 and above
 
@@ -654,7 +654,7 @@ internal DataTable BuildSchemaTable()
                     schemaRow[precision] = col.metaType.Precision;
                 }
 
-                if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && col.Is2008DateTimeType)
+                if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && col.Is2008DateTimeType)
                 {
                     schemaRow[scale] = MetaType.MetaNVarChar.Scale;
                 }
@@ -1194,13 +1194,13 @@ private string GetDataTypeNameInternal(_SqlMetaData metaData)
         {
             string dataTypeName = null;
 
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
             {
                 dataTypeName = MetaType.MetaNVarChar.TypeName;
             }
-            else if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
+            else if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
             {
-                if (_typeSystem == SqlConnectionString.TypeSystem.SQLServer2005)
+                if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005)
                 {
                     dataTypeName = MetaType.MetaMaxVarBinary.TypeName;
                 }
@@ -1210,7 +1210,7 @@ private string GetDataTypeNameInternal(_SqlMetaData metaData)
                     dataTypeName = MetaType.MetaImage.TypeName;
                 }
             }
-            else if (_typeSystem != SqlConnectionString.TypeSystem.SQLServer2000)
+            else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
             {
                 // TypeSystem.SQLServer2005 and above
 
@@ -1282,14 +1282,14 @@ private Type GetFieldTypeInternal(_SqlMetaData metaData)
         {
             Type fieldType = null;
 
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
             {
                 // Return 2008 types as string
                 fieldType = MetaType.MetaNVarChar.ClassType;
             }
-            else if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
+            else if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
             {
-                if (_typeSystem == SqlConnectionString.TypeSystem.SQLServer2005)
+                if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005)
                 {
                     fieldType = MetaType.MetaMaxVarBinary.ClassType;
                 }
@@ -1299,7 +1299,7 @@ private Type GetFieldTypeInternal(_SqlMetaData metaData)
                     fieldType = MetaType.MetaImage.ClassType;
                 }
             }
-            else if (_typeSystem != SqlConnectionString.TypeSystem.SQLServer2000)
+            else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
             {
                 // TypeSystem.SQLServer2005 and above
                 if (metaData.type == SqlDbType.Udt)
@@ -1415,13 +1415,13 @@ private Type GetProviderSpecificFieldTypeInternal(_SqlMetaData metaData)
         {
             Type providerSpecificFieldType = null;
 
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
             {
                 providerSpecificFieldType = MetaType.MetaNVarChar.SqlType;
             }
-            else if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
+            else if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
             {
-                if (_typeSystem == SqlConnectionString.TypeSystem.SQLServer2005)
+                if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005)
                 {
                     providerSpecificFieldType = MetaType.MetaMaxVarBinary.SqlType;
                 }
@@ -1431,7 +1431,7 @@ private Type GetProviderSpecificFieldTypeInternal(_SqlMetaData metaData)
                     providerSpecificFieldType = MetaType.MetaImage.SqlType;
                 }
             }
-            else if (_typeSystem != SqlConnectionString.TypeSystem.SQLServer2000)
+            else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
             {
                 // TypeSystem.SQLServer2005 and above
                 if (metaData.type == SqlDbType.Udt)
@@ -2402,7 +2402,7 @@ override public DateTime GetDateTime(int i)
 
             DateTime dt = _data[i].DateTime;
             // This accessor can be called for regular DateTime column. In this case we should not throw
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && _metaData[i].Is2008DateTimeType)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && _metaData[i].Is2008DateTimeType)
             {
                 // TypeSystem.SQLServer2005 or less
 
@@ -2501,7 +2501,7 @@ virtual public SqlChars GetSqlChars(int i)
             ReadColumn(i);
             SqlString data;
             // Convert 2008 types to string
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && _metaData[i].Is2008DateTimeType)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && _metaData[i].Is2008DateTimeType)
             {
                 data = _data[i].Sql2008DateTimeSqlString;
             }
@@ -2580,7 +2580,7 @@ virtual public SqlString GetSqlString(int i)
         {
             ReadColumn(i);
 
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && _metaData[i].Is2008DateTimeType)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && _metaData[i].Is2008DateTimeType)
             {
                 return _data[i].Sql2008DateTimeSqlString;
             }
@@ -2594,7 +2594,7 @@ virtual public SqlXml GetSqlXml(int i)
             ReadColumn(i);
             SqlXml sx = null;
 
-            if (_typeSystem != SqlConnectionString.TypeSystem.SQLServer2000)
+            if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
             {
                 // TypeSystem.SQLServer2005
 
@@ -2680,15 +2680,15 @@ private object GetSqlValueFromSqlBufferInternal(SqlBuffer data, _SqlMetaData met
             Debug.Assert(!data.IsEmpty || data.IsNull || metaData.type == SqlDbType.Timestamp, "Data has been read, but the buffer is empty");
 
             // Convert 2008 types to string
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
             {
                 return data.Sql2008DateTimeSqlString;
             }
-            else if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
+            else if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
             {
                 return data.SqlValue;
             }
-            else if (_typeSystem != SqlConnectionString.TypeSystem.SQLServer2000)
+            else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
             {
                 // TypeSystem.SQLServer2005 and above
 
@@ -2759,7 +2759,7 @@ override public string GetString(int i)
         {
             ReadColumn(i);
             // Convert 2008 value to string if type system knob is 2005 or earlier
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && _metaData[i].Is2008DateTimeType)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && _metaData[i].Is2008DateTimeType)
             {
                 return _data[i].Sql2008DateTimeString;
             }
@@ -2808,7 +2808,7 @@ virtual public TimeSpan GetTimeSpan(int i)
 
             TimeSpan t = _data[i].Time;
 
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005)
             {
                 // TypeSystem.SQLServer2005 or less
 
@@ -2830,7 +2830,7 @@ virtual public DateTimeOffset GetDateTimeOffset(int i)
 
             DateTimeOffset dto = _data[i].DateTimeOffset;
 
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005)
             {
                 // TypeSystem.SQLServer2005 or less
 
@@ -2868,7 +2868,7 @@ private object GetValueFromSqlBufferInternal(SqlBuffer data, _SqlMetaData metaDa
         {
             Debug.Assert(!data.IsEmpty || data.IsNull || metaData.type == SqlDbType.Timestamp, "Data has been read, but the buffer is empty");
 
-            if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
+            if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
             {
                 if (data.IsNull)
                 {
@@ -2879,11 +2879,11 @@ private object GetValueFromSqlBufferInternal(SqlBuffer data, _SqlMetaData metaDa
                     return data.Sql2008DateTimeString;
                 }
             }
-            else if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
+            else if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
             {
                 return data.Value;
             }
-            else if (_typeSystem != SqlConnectionString.TypeSystem.SQLServer2000)
+            else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
             {
                 // TypeSystem.SQLServer2005 and above
 
@@ -2990,20 +2990,20 @@ private T GetFieldValueFromSqlBufferInternal<T>(SqlBuffer data, _SqlMetaData met
             {
                 return (T)(object)data.Decimal;
             }
-            else if (typeof(T) == typeof(DateTimeOffset) && dataType == typeof(DateTimeOffset) && _typeSystem > SqlConnectionString.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
+            else if (typeof(T) == typeof(DateTimeOffset) && dataType == typeof(DateTimeOffset) && _typeSystem > SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
             {
                 return (T)(object)data.DateTimeOffset;
             }
-            else if (typeof(T) == typeof(DateTime) && dataType == typeof(DateTime) && _typeSystem > SqlConnectionString.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
+            else if (typeof(T) == typeof(DateTime) && dataType == typeof(DateTime) && _typeSystem > SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.Is2008DateTimeType)
             {
                 return (T)(object)data.DateTime;
             }
 #if !NETFRAMEWORK
-            else if (typeof(T) == typeof(DateOnly) && dataType == typeof(DateTime) && _typeSystem > SqlConnectionString.TypeSystem.SQLServer2005)
+            else if (typeof(T) == typeof(DateOnly) && dataType == typeof(DateTime) && _typeSystem > SqlConnectionOptions.TypeSystem.SQLServer2005)
             {
                 return (T)(object)data.DateOnly;
             }
-            else if (typeof(T) == typeof(TimeOnly) && dataType == typeof(TimeOnly) && _typeSystem > SqlConnectionString.TypeSystem.SQLServer2005)
+            else if (typeof(T) == typeof(TimeOnly) && dataType == typeof(TimeOnly) && _typeSystem > SqlConnectionOptions.TypeSystem.SQLServer2005)
             {
                 return (T)(object)data.TimeOnly;
             }
@@ -3244,7 +3244,7 @@ override public int GetValues(object[] values)
 
         private MetaType GetVersionedMetaType(MetaType actualMetaType)
         {
-            Debug.Assert(_typeSystem == SqlConnectionString.TypeSystem.SQLServer2000, "Should not be in this function under anything else but SQLServer2000");
+            Debug.Assert(_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2000, "Should not be in this function under anything else but SQLServer2000");
 
             MetaType metaType = null;
 
@@ -5996,7 +5996,7 @@ private ReadOnlyCollection<DbColumn> BuildColumnSchema()
                 _SqlMetaData col = md[i];
                 SqlDbColumn dbColumn = new SqlDbColumn(md[i]);
 
-                if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && col.Is2008DateTimeType)
+                if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && col.Is2008DateTimeType)
                 {
                     dbColumn.SqlNumericScale = MetaType.MetaNVarChar.Scale;
                 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
index 94d42a3393..9304f3051a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
@@ -576,7 +576,7 @@ internal static bool Start(string connectionString, string queue, bool useDefaul
 #if NETFRAMEWORK
                 // Create new connection options for demand on their connection string.  We modify the connection string
                 // and assert on our modified string when we create the container.
-                SqlConnectionString connectionStringObject = new(connectionString);
+                SqlConnectionOptions connectionStringObject = new(connectionString);
                 connectionStringObject.DemandPermission();
                 if (connectionStringObject.LocalDBInstance != null)
                 {
@@ -719,7 +719,7 @@ internal static bool Stop(string connectionString, string queue, bool useDefault
 #if NETFRAMEWORK
                 // Create new connection options for demand on their connection string.  We modify the connection string
                 // and assert on our modified string when we create the container.
-                SqlConnectionString connectionStringObject = new(connectionString);
+                SqlConnectionOptions connectionStringObject = new(connectionString);
                 connectionStringObject.DemandPermission();
                 if (connectionStringObject.LocalDBInstance != null)
                 {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
index b3d5191e1a..004ae0ed08 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
@@ -85,7 +85,7 @@ internal SqlConnectionContainer(SqlConnectionContainerHashHelper hashHelper, str
                     _queue = _hashHelper.Queue;
                 }
 #if DEBUG
-                SqlConnectionString connectionStringOptions = new(_hashHelper.ConnectionStringBuilder.ConnectionString);
+                SqlConnectionOptions connectionStringOptions = new(_hashHelper.ConnectionStringBuilder.ConnectionString);
                 SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlConnectionContainer|DEP> Modified connection string: '{0}'", connectionStringOptions.UsersConnectionStringForTrace());
 #endif
 
@@ -93,10 +93,10 @@ internal SqlConnectionContainer(SqlConnectionContainerHashHelper hashHelper, str
                 // connection string used in the hashHelper.
                 _con = new SqlConnection(_hashHelper.ConnectionStringBuilder.ConnectionString); // Create connection and open.
 
+#if NETFRAMEWORK
                 // Assert permission for this particular connection string since it differs from the user passed string
                 // which we have already demanded upon.  
-                SqlConnectionString connStringObj = (SqlConnectionString)_con.ConnectionOptions;
-#if NETFRAMEWORK
+                SqlConnectionOptions connStringObj = _con.ConnectionOptions;
                 connStringObj.CreatePermissionSet().Assert();
                 if (connStringObj.LocalDBInstance != null)
                 {
@@ -1627,7 +1627,7 @@ private bool Start(
                                                                 out user,
                                                                     queueService);
 #if DEBUG
-            SqlConnectionString connectionStringOptions = new(connectionStringBuilder.ConnectionString);
+            SqlConnectionOptions connectionStringOptions = new(connectionStringBuilder.ConnectionString);
             SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependencyProcessDispatcher.Start|DEP> Modified connection string: '{0}'", connectionStringOptions.UsersConnectionStringForTrace());
 #endif
 
@@ -1703,7 +1703,7 @@ internal bool Stop(
                                                               out user,
                                                                   queueService);
 #if DEBUG
-            SqlConnectionString connectionStringOptions = new(connectionStringBuilder.ConnectionString);
+            SqlConnectionOptions connectionStringOptions = new(connectionStringBuilder.ConnectionString);
             SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependencyProcessDispatcher.Stop|DEP> Modified connection string: '{0}'", connectionStringOptions.UsersConnectionStringForTrace());
 #endif
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 29352c5460..53b89fbc90 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -376,7 +376,7 @@ internal void Connect(
             ServerInfo serverInfo,
             SqlConnectionInternal connHandler,
             TimeoutTimer timeout,
-            SqlConnectionString connectionOptions,
+            SqlConnectionOptions connectionOptions,
 
             #if NETFRAMEWORK
             bool withFailover,
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
index 56ead6a4a2..a384095254 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
@@ -63,7 +63,7 @@ static internal void AliasRegistryLookup(ref string host, ref string protocol)
                                 if (-1 != index && index + 1 < parsedAliasName.Length)
                                 {
                                     parsedProtocol = parsedAliasName.Substring(0, index);
-                                    if (SqlConnectionString.ValidProtocol(parsedProtocol))
+                                    if (SqlConnectionOptions.ValidProtocol(parsedProtocol))
                                     {
                                         protocol = parsedProtocol;
                                         host = parsedAliasName.Substring(index + 1);
@@ -72,7 +72,7 @@ static internal void AliasRegistryLookup(ref string host, ref string protocol)
                             }
                             else
                             {
-                                protocol = (string)SqlConnectionString.NetlibMapping()[parsedProtocol];
+                                protocol = (string)SqlConnectionOptions.NetlibMapping()[parsedProtocol];
                                 if (protocol != null)
                                 {
                                     host = parsedAliasName;
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlExceptionTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlExceptionTest.cs
index 5106a287c5..2fe9e63aed 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlExceptionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlExceptionTest.cs
@@ -43,7 +43,7 @@ public void JSONSerializationTest()
                         + @"""$type"":""System.Collections.ListDictionaryInternal, System.Private.CoreLib""},"
                         + @"""InnerException"":null,"
                         + @"""HelpURL"":null,"
-                        + @"""StackTraceString"":""   at Microsoft.Data.SqlClient.SqlInternalConnectionTds..ctor(DbConnectionPoolIdentity identity, SqlConnectionString connectionOptions, SqlCredential credential, Object providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString userConnectionOptions, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken)\\n   at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, Object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions)\\n   at System.Data.ProviderBase.DbConnectionFactory.CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions)\\n   at System.Data.ProviderBase.DbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)\\n   at System.Data.ProviderBase.DbConnectionPool.UserCreateRequest(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)\\n   at System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, DbConnectionOptions userOptions, DbConnectionInternal& connection)\\n   at System.Data.ProviderBase.DbConnectionPool.WaitForPendingOpen()\\n"","
+                        + @"""StackTraceString"":""   at Microsoft.Data.SqlClient.SqlInternalConnectionTds..ctor(DbConnectionPoolIdentity identity, SqlConnectionOptions connectionOptions, SqlCredential credential, Object providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions userConnectionOptions, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken)\\n   at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(SqlConnectionOptions options, DbConnectionPoolKey poolKey, Object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, SqlConnectionOptions userOptions)\\n   at System.Data.ProviderBase.DbConnectionFactory.CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, SqlConnectionOptions options, DbConnectionPoolKey poolKey, SqlConnectionOptions userOptions)\\n   at System.Data.ProviderBase.DbConnectionPool.CreateObject(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection)\\n   at System.Data.ProviderBase.DbConnectionPool.UserCreateRequest(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection)\\n   at System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, SqlConnectionOptions userOptions, DbConnectionInternal& connection)\\n   at System.Data.ProviderBase.DbConnectionPool.WaitForPendingOpen()\\n"","
                         + @"""RemoteStackTraceString"":null,"
                         + @"""RemoteStackIndex"":0,"
                         + @"""ExceptionMethod"":null,"
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 48bcc87ad2..2b1d437f98 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -36,7 +36,7 @@ private ChannelDbConnectionPool ConstructPool(SqlConnectionFactory connectionFac
                     hasTransactionAffinity: true
             );
             dbConnectionPoolGroup ??= new DbConnectionPoolGroup(
-                new DbConnectionOptions("DataSource=localhost;", null),
+                new SqlConnectionOptions("Data Source=localhost;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions
             );
@@ -63,7 +63,7 @@ public void GetConnectionEmptyPool_ShouldCreateNewConnection(int numConnections)
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -93,7 +93,7 @@ public async Task GetConnectionAsyncEmptyPool_ShouldCreateNewConnection(int numC
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     tcs,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -119,7 +119,7 @@ public void GetConnectionMaxPoolSize_ShouldTimeoutAfterPeriod()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -133,7 +133,7 @@ out DbConnectionInternal? internalConnection
                 var exceeded = pool.TryGetConnection(
                     new SqlConnection("Timeout=1"),
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? extraConnection
                 );
             }
@@ -159,7 +159,7 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldTimeoutAfterPeriod()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -174,7 +174,7 @@ out DbConnectionInternal? internalConnection
                 var exceeded = pool.TryGetConnection(
                     new SqlConnection("Timeout=1"),
                     taskCompletionSource,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? extraConnection
                 );
                 await taskCompletionSource.Task;
@@ -200,7 +200,7 @@ public async Task GetConnectionMaxPoolSize_ShouldReuseAfterConnectionReleased()
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -209,7 +209,7 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -225,7 +225,7 @@ out DbConnectionInternal? internalConnection
                 var exceeded = pool.TryGetConnection(
                     new SqlConnection(""),
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? extraConnection
                 );
                 return extraConnection;
@@ -247,7 +247,7 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldReuseAfterConnectionReleas
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -256,7 +256,7 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -270,7 +270,7 @@ out DbConnectionInternal? internalConnection
             var exceeded = pool.TryGetConnection(
                 new SqlConnection(""),
                 taskCompletionSource,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? recycledConnection
             );
             pool.ReturnInternalConnection(firstConnection!, firstOwningConnection);
@@ -291,7 +291,7 @@ public async Task GetConnectionMaxPoolSize_ShouldRespectOrderOfRequest()
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -300,7 +300,7 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -321,7 +321,7 @@ out DbConnectionInternal? internalConnection
                 pool.TryGetConnection(
                     new SqlConnection(""),
                     null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? recycledConnection
                 );
                 return recycledConnection;
@@ -334,7 +334,7 @@ out DbConnectionInternal? recycledConnection
                 pool.TryGetConnection(
                     new SqlConnection("Timeout=1"),
                     null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? failedConnection
                 );
                 return failedConnection;
@@ -360,7 +360,7 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldRespectOrderOfRequest()
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -369,7 +369,7 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -384,7 +384,7 @@ out DbConnectionInternal? internalConnection
             var exceeded = pool.TryGetConnection(
                 new SqlConnection(""),
                 recycledTaskCompletionSource,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? recycledConnection
             );
 
@@ -394,7 +394,7 @@ out DbConnectionInternal? recycledConnection
             var exceeded2 = pool.TryGetConnection(
                 new SqlConnection("Timeout=1"),
                 failedCompletionSource,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? failedConnection
             );
 
@@ -417,7 +417,7 @@ public void ConnectionsAreReused()
             var completed1 = pool.TryGetConnection(
                 owningConnection,
                 null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? internalConnection1
             );
 
@@ -432,7 +432,7 @@ out DbConnectionInternal? internalConnection1
             var completed2 = pool.TryGetConnection(
                 owningConnection,
                 null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? internalConnection2
             );
 
@@ -454,7 +454,7 @@ public void GetConnectionTimeout_ShouldThrowTimeoutException()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
             });
@@ -475,7 +475,7 @@ public async Task GetConnectionAsyncTimeout_ShouldThrowTimeoutException()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -500,7 +500,7 @@ public void StressTest()
                     var completed = pool.TryGetConnection(
                         owningObject,
                         taskCompletionSource: null,
-                        new DbConnectionOptions("", null),
+                        new SqlConnectionOptions(""),
                         out DbConnectionInternal? internalConnection
                     );
                     if (completed)
@@ -534,7 +534,7 @@ public void StressTestAsync()
                     var completed = pool.TryGetConnection(
                         owningObject,
                         taskCompletionSource,
-                        new DbConnectionOptions("", null),
+                        new SqlConnectionOptions(""),
                         out DbConnectionInternal? internalConnection
                     );
                     internalConnection = await taskCompletionSource.Task;
@@ -614,7 +614,7 @@ public void TestLoadBalanceTimeout()
         public void TestPoolGroup()
         {
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
-                new DbConnectionOptions("DataSource=localhost;", null),
+                new SqlConnectionOptions("Data Source=localhost;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 new DbConnectionPoolGroupOptions(
                     poolByIdentity: false,
@@ -731,7 +731,7 @@ public void Clear_MultipleIdleConnections_AllAreDestroyed()
                 pool.TryGetConnection(
                     owningConnections[i],
                     taskCompletionSource: null,
-                    new DbConnectionOptions("", null),
+                    new SqlConnectionOptions(""),
                     out internalConnections[i]
                 );
                 Assert.Equal(0, internalConnections[i]!.ClearGeneration);
@@ -760,7 +760,7 @@ public void Clear_BusyConnection_NotDestroyedImmediately()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? busyConnection
             );
             Assert.NotNull(busyConnection);
@@ -784,7 +784,7 @@ public void Clear_BusyConnectionReturned_IsDestroyed()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? busyConnection
             );
             Assert.NotNull(busyConnection);
@@ -814,13 +814,13 @@ public void Clear_MixedBusyAndIdle_OnlyIdleDestroyedImmediately()
             pool.TryGetConnection(
                 busyOwner,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? busyConnection
             );
             pool.TryGetConnection(
                 idleOwner,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? idleConnection
             );
             Assert.NotNull(busyConnection);
@@ -853,7 +853,7 @@ public void Clear_NewConnectionsAfterClear_ArePooledNormally()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? oldConnection
             );
             Assert.Equal(0, oldConnection!.ClearGeneration);
@@ -867,7 +867,7 @@ out DbConnectionInternal? oldConnection
             pool.TryGetConnection(
                 newOwner,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? newConnection
             );
             Assert.NotNull(newConnection);
@@ -885,7 +885,7 @@ out DbConnectionInternal? newConnection
             pool.TryGetConnection(
                 reuseOwner,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? reusedConnection
             );
             Assert.Same(newConnection, reusedConnection);
@@ -902,7 +902,7 @@ public void Clear_MultipleClearCalls_DoNotCorruptState()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? connection
             );
             Assert.Equal(0, connection!.ClearGeneration);
@@ -921,7 +921,7 @@ out DbConnectionInternal? connection
             pool.TryGetConnection(
                 newOwner,
                 taskCompletionSource: null,
-                new DbConnectionOptions("", null),
+                new SqlConnectionOptions(""),
                 out DbConnectionInternal? newConnection
             );
             Assert.NotNull(newConnection);
@@ -935,12 +935,12 @@ out DbConnectionInternal? newConnection
         internal class SuccessfulSqlConnectionFactory : SqlConnectionFactory
         {
             protected override DbConnectionInternal CreateConnection(
-                DbConnectionOptions options,
+                SqlConnectionOptions options,
                 ConnectionPoolKey poolKey,
                 DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
                 IDbConnectionPool pool,
                 DbConnection owningConnection,
-                DbConnectionOptions userOptions)
+                SqlConnectionOptions userOptions)
             {
                 return new StubDbConnectionInternal();
             }
@@ -949,12 +949,12 @@ protected override DbConnectionInternal CreateConnection(
         internal class TimeoutSqlConnectionFactory : SqlConnectionFactory
         {
             protected override DbConnectionInternal CreateConnection(
-                DbConnectionOptions options,
+                SqlConnectionOptions options,
                 ConnectionPoolKey poolKey,
                 DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
                 IDbConnectionPool pool,
                 DbConnection owningConnection,
-                DbConnectionOptions userOptions)
+                SqlConnectionOptions userOptions)
             {
                 throw ADP.PooledOpenTimeout();
             }
@@ -1006,7 +1006,7 @@ public void Constructor_WithZeroMaxPoolSize_ThrowsArgumentOutOfRangeException()
                 hasTransactionAffinity: true
             );
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
-                new DbConnectionOptions("DataSource=localhost;", null),
+                new SqlConnectionOptions("Data Source=localhost;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions
             );
@@ -1037,7 +1037,7 @@ public void Constructor_WithLargeMaxPoolSize()
                 hasTransactionAffinity: true
             );
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
-                new DbConnectionOptions("DataSource=localhost;", null),
+                new SqlConnectionOptions("Data Source=localhost;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions
             );
@@ -1078,7 +1078,7 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
                 hasTransactionAffinity: true
             );
             var dbConnectionPoolGroup1 = new DbConnectionPoolGroup(
-                new DbConnectionOptions("DataSource=localhost;", null),
+                new SqlConnectionOptions("Data Source=localhost;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions1
             );
@@ -1104,7 +1104,7 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
                 hasTransactionAffinity: true
             );
             var dbConnectionPoolGroup2 = new DbConnectionPoolGroup(
-                new DbConnectionOptions("DataSource=localhost;", null),
+                new SqlConnectionOptions("Data Source=localhost;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions2
             );
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
index 9f284be22a..c03c7cc550 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
@@ -676,12 +676,12 @@ internal class MockDbConnectionPool : IDbConnectionPool
 
         public void Clear() => throw new NotImplementedException();
 
-        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, DbConnectionOptions userOptions, out DbConnectionInternal? connection)
+        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, SqlConnectionOptions userOptions, out DbConnectionInternal? connection)
         {
             throw new NotImplementedException();
         }
 
-        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
+        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection)
         {
             throw new NotImplementedException();
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
index bc637087a1..4b4a30ce19 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
@@ -59,7 +59,7 @@ private WaitHandleDbConnectionPool CreatePool(
         );
 
         var dbConnectionPoolGroup = new DbConnectionPoolGroup(
-            new DbConnectionOptions("DataSource=localhost;", null),
+            new SqlConnectionOptions("Data Source=localhost;"),
             new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
             poolGroupOptions
         );
@@ -82,7 +82,7 @@ private DbConnectionInternal GetConnection(SqlConnection owner)
         _pool.TryGetConnection(
             owner,
             taskCompletionSource: null,
-            new DbConnectionOptions("", null),
+            new SqlConnectionOptions(""),
             out DbConnectionInternal? connection);
         return connection!;
     }
@@ -95,7 +95,7 @@ private async Task<DbConnectionInternal> GetConnectionAsync(
         _pool.TryGetConnection(
             owner,
             taskCompletionSource: tcs,
-            new DbConnectionOptions("", null),
+            new SqlConnectionOptions(""),
             out DbConnectionInternal? connection);
         return connection ?? await tcs.Task;
     }
@@ -900,12 +900,12 @@ public void SequentialTransactions_CanReuseConnections()
     internal class MockSqlConnectionFactory : SqlConnectionFactory
     {
         protected override DbConnectionInternal CreateConnection(
-            DbConnectionOptions options,
+            SqlConnectionOptions options,
             ConnectionPoolKey poolKey,
             DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
             IDbConnectionPool pool,
             DbConnection owningConnection,
-            DbConnectionOptions userOptions)
+            SqlConnectionOptions userOptions)
         {
             return new MockDbConnectionInternal();
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStringTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
similarity index 93%
rename from src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStringTest.cs
rename to src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
index 3c8689ef09..fb2e969dec 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStringTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.Microsoft.Data.SqlClient
 {
-    public class SqlConnectionStringTest : IDisposable
+    public class SqlConnectionOptionsTest : IDisposable
     {
         // Ensure we restore the original app context switch values after each
         // test.
@@ -45,7 +45,7 @@ public void TestDefaultTnir(string dataSource, bool? tnirEnabledInConnString, bo
             // Note: TNIR is disabled by default for Azure SQL Database servers (i.e. *.database.windows.net)
             // and when using federated auth unless explicitly set in the connection string.
             // However, this evaluation only happens at login time so TNIR behavior may not match
-            // the value of TransparentNetworkIPResolution property in SqlConnectionString.
+            // the value of TransparentNetworkIPResolution property in SqlConnectionOptions.
 
             // Arrange
             _appContextSwitchHelper.DisableTnirByDefault = tnirDisabledAppContext;
@@ -57,7 +57,7 @@ public void TestDefaultTnir(string dataSource, bool? tnirEnabledInConnString, bo
             {
                 builder.TransparentNetworkIPResolution = tnirEnabledInConnString.Value;
             }
-            SqlConnectionString connectionString = new(builder.ConnectionString);
+            SqlConnectionOptions connectionString = new(builder.ConnectionString);
 
             // Assert
             Assert.Equal(expectedValue, connectionString.TransparentNetworkIPResolution);
@@ -83,7 +83,7 @@ public void TestDefaultMultiSubnetFailover(bool? msfInConnString, bool? msfEnabl
             {
                 builder.MultiSubnetFailover = msfInConnString.Value;
             }
-            SqlConnectionString connectionString = new(builder.ConnectionString);
+            SqlConnectionOptions connectionString = new(builder.ConnectionString);
 
             Assert.Equal(expectedValue, connectionString.MultiSubnetFailover);
         }
@@ -103,7 +103,7 @@ public void TestMultiSubnetFailoverWithFailoverPartnerThrows()
                 InitialCatalog = "database"
             };
 
-            Assert.Throws<ArgumentException>(() => new SqlConnectionString(builder.ConnectionString));
+            Assert.Throws<ArgumentException>(() => new SqlConnectionOptions(builder.ConnectionString));
         }
     }
 }

From 8266a5ac604212dad13803ee3efce1301a0804e8 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 7 May 2026 08:13:50 -0300
Subject: [PATCH 086/298] Finish sqlclient-stress pipeline (#4198)

---
 eng/pipelines/stress/stress-tests-job.yml     | 46 +++++++++++++++++--
 .../stress/stress-tests-pipeline.yml          | 18 ++++++--
 eng/pipelines/stress/stress-tests-stage.yml   | 12 ++++-
 .../Microsoft.Data.SqlClient.csproj           |  4 +-
 .../ref/Microsoft.Data.SqlClient.csproj       |  4 +-
 .../src/Microsoft.Data.SqlClient.csproj       |  5 +-
 ...soft.Data.SqlClient.FunctionalTests.csproj | 20 ++------
 ...icrosoft.Data.SqlClient.ManualTests.csproj | 20 ++------
 .../tests/StressTests/Directory.Build.props   | 11 ++---
 .../Microsoft.Data.SqlClient.UnitTests.csproj | 18 ++------
 10 files changed, 83 insertions(+), 75 deletions(-)

diff --git a/eng/pipelines/stress/stress-tests-job.yml b/eng/pipelines/stress/stress-tests-job.yml
index 40cecf6e93..6eda90890b 100644
--- a/eng/pipelines/stress/stress-tests-job.yml
+++ b/eng/pipelines/stress/stress-tests-job.yml
@@ -48,6 +48,11 @@ parameters:
   - name: jobNameSuffix
     type: string
 
+  # True to fail the job when stress tests fail.  When false, test failures produce warnings
+  # (SucceededWithIssues) but do not fail the job.
+  - name: failOnTestFailure
+    type: boolean
+
   # The list of .NET Framework runtimes to test against.
   - name: netFrameworkTestRuntimes
     type: object
@@ -88,10 +93,13 @@ jobs:
 
     variables:
 
-      # The directory where dotnet artifacts will be staged.  Not to be
-      # confused with pipeline artifacts.
-      - name: dotnetArtifactsDir
-        value: $(Build.StagingDirectory)/dotnetArtifacts
+      # Import the variable group that provides SQL Server build properties used by the
+      # shared configure-sql-server-*-step.yml templates (e.g. x64AliasRegistryPath,
+      # x86AliasRegistryPath, SQLAliasName, SQLAliasPort).
+      - group: ADO Build Properties
+
+      # Import the variable group that provides SQL Server test configuration variables.
+      - group: ADO Test Configuration Properties
 
       # The top-level project file to build and run.
       - name: project
@@ -101,7 +109,6 @@ jobs:
       - name: dotnetArguments
         value: >-
           --verbosity ${{ parameters.dotnetVerbosity }}
-          --artifacts-path $(dotnetArtifactsDir)
           --configuration ${{ parameters.buildConfiguration }}
 
       # The contents of the config file to use for all tests.  We will write this to a JSON file and
@@ -153,6 +160,12 @@ jobs:
             # Write the JSON content to the config file.
             $content | Out-File -FilePath "config.json"
 
+      # Authenticate with NuGet feeds so that upstream packages (e.g. runtime host packs) can be
+      # fetched through the ADO Artifacts feed.  This is required on hosted pool agents (macOS)
+      # that do not have pre-configured feed credentials.
+      - task: NuGetAuthenticate@1
+        displayName: Authenticate NuGet feeds
+
       # Build the project.
       - task: DotNetCoreCLI@2
         displayName: Build Project
@@ -161,10 +174,31 @@ jobs:
           projects: $(project)
           arguments: $(dotnetArguments)
 
+      # Set a flag so test steps can distinguish a build failure from a test failure.
+      - pwsh: Write-Host "##vso[task.setvariable variable=buildSucceeded]true"
+        displayName: Set build success flag
+
       # Run the stress tests for each .NET runtime.
+      #
+      # The condition and continueOnError work together to achieve the following behavior:
+      #
+      #   condition: and(succeededOrFailed(), eq(variables['buildSucceeded'], 'true'))
+      #     - succeededOrFailed() allows the step to run even if a *previous test* step failed,
+      #       ensuring all runtimes are exercised regardless of earlier failures.
+      #     - eq(variables['buildSucceeded'], 'true') gates on the flag set above, so tests are
+      #       skipped entirely if the build or any setup step failed (since there's nothing to run).
+      #
+      #   continueOnError: ${{ not(parameters.failOnTestFailure) }}
+      #     - When failOnTestFailure is false, continueOnError is true: a test failure marks the
+      #       step and job as SucceededWithIssues (orange warning) rather than Failed.
+      #     - When failOnTestFailure is true, continueOnError is false: a test failure fails the
+      #       job (red), though subsequent runtimes still run due to the condition above.
+      #
       - ${{ each runtime in parameters.netTestRuntimes }}:
         - task: DotNetCoreCLI@2
           displayName: Test [${{ runtime }}]
+          condition: and(succeededOrFailed(), eq(variables['buildSucceeded'], 'true'))
+          continueOnError: ${{ not(parameters.failOnTestFailure) }}
           inputs:
             command: run
             projects: $(project)
@@ -174,6 +208,8 @@ jobs:
       - ${{ each runtime in parameters.netFrameworkTestRuntimes }}:
         - task: DotNetCoreCLI@2
           displayName: Test [${{ runtime }}]
+          condition: and(succeededOrFailed(), eq(variables['buildSucceeded'], 'true'))
+          continueOnError: ${{ not(parameters.failOnTestFailure) }}
           inputs:
             command: run
             projects: $(project)
diff --git a/eng/pipelines/stress/stress-tests-pipeline.yml b/eng/pipelines/stress/stress-tests-pipeline.yml
index cec68912fb..1f2e356461 100644
--- a/eng/pipelines/stress/stress-tests-pipeline.yml
+++ b/eng/pipelines/stress/stress-tests-pipeline.yml
@@ -8,13 +8,13 @@
 #
 # Public project:
 #   Triggering pipelines: PR-SqlClient-Project, CI-SqlClient (branch main only)
-#   Pipeline name:        Stress-SqlClient
-#   Pipeline URL:         TODO: Create the Azure DevOps pipeline.
+#   Pipeline name:        sqlclient-stress
+#   Pipeline URL:         https://sqlclientdrivers.visualstudio.com/public/_build?definitionId=2250
 #
 # ADO.Net project:
 #   Triggering pipeline:  MDS Main CI (branch internal/main only)
-#   Pipeline name:        Stress-SqlClient
-#   Pipeline URL:         TODO: Create the Azure DevOps pipeline.
+#   Pipeline name:        sqlclient-stress
+#   Pipeline URL:         TODO: add URL when pipeline is created
 
 # Set the pipeline run name to the day-of-year and the daily run counter.
 name: $(DayOfYear)$(Rev:rr)
@@ -49,7 +49,7 @@ resources:
     # The MDS Main CI pipeline in the ADO.Net project.
     - pipeline: ADO-Net-Internal-CI-MDS-Main-CI
       project: ADO.Net
-      source: /Internal CI/MDS Main CI
+      source: /CI/MDS Main CI
       trigger:
         branches:
           include:
@@ -73,6 +73,13 @@ parameters:
     type: boolean
     default: false
 
+  # True to fail the pipeline when stress tests fail.  When false (default), test failures produce
+  # warnings but do not fail the overall pipeline run.
+  - name: failOnTestFailure
+    displayName: Fail pipeline on test failure
+    type: boolean
+    default: false
+
   # Dotnet CLI verbosity level.
   - name: dotnetVerbosity
     displayName: dotnet CLI Verbosity
@@ -98,4 +105,5 @@ stages:
     parameters:
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
+      failOnTestFailure: ${{ parameters.failOnTestFailure }}
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/stress/stress-tests-stage.yml b/eng/pipelines/stress/stress-tests-stage.yml
index 0f0000f99a..f641ea0e7e 100644
--- a/eng/pipelines/stress/stress-tests-stage.yml
+++ b/eng/pipelines/stress/stress-tests-stage.yml
@@ -32,6 +32,10 @@ parameters:
     type: boolean
     default: false
 
+  # True to fail the job when stress tests fail.  When false, test failures produce warnings.
+  - name: failOnTestFailure
+    type: boolean
+
   # The verbosity level for the dotnet CLI commands.
   - name: dotnetVerbosity
     type: string
@@ -48,10 +52,11 @@ parameters:
     type: object
     default: [net462]
 
-  # The list of .NET runtimes to test against.
+  # The list of .NET runtimes to test against.  These must align with the TargetFrameworks defined
+  # in the stress test Directory.Build.props and the TFMs that SqlClient ships.
   - name: netTestRuntimes
     type: object
-    default: [net8.0, net9.0, net10.0]
+    default: [net8.0, net9.0]
 
 stages:
   - stage: stress_tests_stage
@@ -75,6 +80,7 @@ stages:
         debug: ${{ parameters.debug }}
         displayNamePrefix: Linux
         dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+        failOnTestFailure: ${{ parameters.failOnTestFailure }}
         jobNameSuffix: linux
         netTestRuntimes: ${{ parameters.netTestRuntimes }}
         poolName: ADO-CI-1ES-Pool
@@ -94,6 +100,7 @@ stages:
         debug: ${{ parameters.debug }}
         displayNamePrefix: Win
         dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+        failOnTestFailure: ${{ parameters.failOnTestFailure }}
         jobNameSuffix: windows
         # Note that we include the .NET Framework runtimes for test runs on Windows.
         netFrameworkTestRuntimes: ${{ parameters.netFrameworkTestRuntimes }}
@@ -117,6 +124,7 @@ stages:
         debug: ${{ parameters.debug }}
         displayNamePrefix: macOS
         dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+        failOnTestFailure: ${{ parameters.failOnTestFailure }}
         jobNameSuffix: macos
         netTestRuntimes: ${{ parameters.netTestRuntimes }}
         # We don't have any 1ES Hosted Pool images for macOS, so we use a generic one from Azure
diff --git a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
index ca4c73a6ec..9d3860476c 100644
--- a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
@@ -137,9 +137,7 @@
     <Reference Include="System.Xml" />
 
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI"
-                      PrivateAssets="all"
-                      IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" />
+    <PackageReference Include="Microsoft.Data.SqlClient.SNI" ExcludeAssets="compile" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
index 2895ce5a4a..0b6282965d 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -93,9 +93,7 @@
     <Reference Include="System.Xml" />
 
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI"
-                      PrivateAssets="all"
-                      IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" />
+    <PackageReference Include="Microsoft.Data.SqlClient.SNI" ExcludeAssets="compile" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index cffc9fe96f..559099062a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -144,10 +144,7 @@
     <Reference Include="System.Transactions" />
 
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI">
-      <PrivateAssets>All</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Data.SqlClient.SNI" ExcludeAssets="compile" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
index 3bc6ea9fa7..8fe4c2be23 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -63,8 +63,6 @@
 
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI"
-                      Condition="'$(ReferenceType)' != 'Package'" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
@@ -75,12 +73,8 @@
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.console"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
-    <PackageReference Include="xunit.runner.visualstudio"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
+    <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
 
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
@@ -94,8 +88,6 @@
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime"
-                      Condition="'$(ReferenceType)' != 'Package'" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
@@ -105,12 +97,8 @@
     <PackageReference Include="System.Data.Odbc" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.console"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
-    <PackageReference Include="xunit.runner.visualstudio"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
+    <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
 
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index cf7bbf236a..8ea8a7cecc 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -357,8 +357,6 @@
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
     <PackageReference Include="System.Memory" />
     <PackageReference Include="System.ValueTuple" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI"
-                      Condition="'$(ReferenceType)' != 'Package'" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
@@ -367,12 +365,8 @@
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="System.ServiceProcess.ServiceController" />
     <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.console"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
-    <PackageReference Include="xunit.runner.visualstudio"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
+    <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
 
     <ProjectReference Include="SQL/UdtTest/UDTs/Address/Address.csproj" />
     <ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
@@ -391,8 +385,6 @@
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime"
-                      Condition="'$(ReferenceType)' != 'Package'" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
@@ -400,12 +392,8 @@
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="System.ServiceProcess.ServiceController" />
     <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.console"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
-    <PackageReference Include="xunit.runner.visualstudio"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
+    <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
 
     <ProjectReference Include="SQL/UdtTest/UDTs/Address/Address.csproj" />
     <ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
index 49b7a47634..910f8d53a0 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
@@ -10,18 +10,15 @@
     <!-- The stress tests root. -->
     <StressRoot>$(MSBuildThisFileDirectory)</StressRoot>
 
-    <!-- Target all frameworks that MDS supports. -->
+    <!-- Target the same frameworks that the rest of the SqlClient tests do. -->
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      We can only build MDS for net462 if we are building for Windows, so we will only build this
-      for net462 if we are on Windows.
-    -->
+    <!-- We can only run .NET Framework tests on Windows, so add net462 if that is the host OS. -->
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
 
     <!--
-      Use the latest C# language version, regardless of what a particular
-      target framework claims to support.
+      Use the latest C# language version, regardless of what a particular target framework claims to
+      support.
     -->
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index 96c3c052b1..8c59d27572 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -46,19 +46,14 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Transactions" />
 
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.console"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
-    <PackageReference Include="xunit.runner.visualstudio"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
+    <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
 
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS\TDS.csproj" />
@@ -68,18 +63,13 @@
 
   <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.console"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
-    <PackageReference Include="xunit.runner.visualstudio"
-                      IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
-                      PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
+    <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
 
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS\TDS.csproj" />

From a3648e409a30debdc7161ad5554338fb2390b727 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 7 May 2026 08:15:26 -0300
Subject: [PATCH 087/298] Create YAML Kerberos Test Pipeline (#4252)

Co-authored-by: Priyanka Tiwari <prtiwar@microsoft.com>
---
 .../kerberos/build-and-test-steps.yml         | 144 +++++++++
 eng/pipelines/kerberos/linux-cleanup-step.yml |  45 +++
 eng/pipelines/kerberos/linux-init-step.yml    | 117 +++++++
 eng/pipelines/kerberos/sqlclient-kerberos.yml | 292 ++++++++++++++++++
 .../sqlclient-pr-package-ref-pipeline.yml     |   1 +
 .../sqlclient-pr-project-ref-pipeline.yml     |   1 +
 6 files changed, 600 insertions(+)
 create mode 100644 eng/pipelines/kerberos/build-and-test-steps.yml
 create mode 100644 eng/pipelines/kerberos/linux-cleanup-step.yml
 create mode 100644 eng/pipelines/kerberos/linux-init-step.yml
 create mode 100644 eng/pipelines/kerberos/sqlclient-kerberos.yml

diff --git a/eng/pipelines/kerberos/build-and-test-steps.yml b/eng/pipelines/kerberos/build-and-test-steps.yml
new file mode 100644
index 0000000000..307c93f978
--- /dev/null
+++ b/eng/pipelines/kerberos/build-and-test-steps.yml
@@ -0,0 +1,144 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Shared build-and-test steps used by both the Windows and Linux Kerberos jobs.
+#
+# Parameters:
+#   buildTarget   — The build.proj target that builds SqlClient for the current
+#                   OS (e.g. BuildSqlClientWindows or BuildSqlClientUnix).
+#   testFramework — The TFM to test against (e.g. net9.0, net462).
+#   testRunTitle  — Title for the published test results (displayed in the ADO
+#                   Tests tab).
+#   artifactName  — Name of the published pipeline artifact that carries the
+#                   test results and coverage files.
+
+parameters:
+
+  # build.proj target to build SqlClient for the current OS.
+  - name: buildTarget
+    type: string
+
+  # TFM to pass to the test targets (-p:TestFramework).
+  - name: testFramework
+    type: string
+
+  # Title shown in the ADO Tests tab for this run.
+  - name: testRunTitle
+    type: string
+
+  # Pipeline artifact name for test results and coverage.
+  - name: artifactName
+    type: string
+
+steps:
+
+  # ---------------------------------------------------------------------------
+  # Build
+  # ---------------------------------------------------------------------------
+
+  # Build the given target.
+  #
+  # The test stages build as part of their targets, but this separate step isolates build failures
+  # so we can fail fast before running tests. Retries are enabled intentionally (1 attempt for
+  # build, 2 attempts for test steps) to reduce transient infrastructure-related failures.
+  #
+  - task: DotNetCoreCLI@2
+    displayName: Build SqlClient
+    retryCountOnTaskFailure: 1
+    inputs:
+      command: build
+      projects: build.proj
+      arguments: >-
+        -t:${{ parameters.buildTarget }}
+        -p:Configuration=Release
+
+  # ---------------------------------------------------------------------------
+  # Run tests in separate steps to permit focused retries.
+  # ---------------------------------------------------------------------------
+
+  # Run the Unit Test suite.
+  - task: DotNetCoreCLI@2
+    displayName: Run Unit Tests (${{ parameters.testFramework }})
+    retryCountOnTaskFailure: 2
+    inputs:
+      command: build
+      projects: build.proj
+      arguments: >-
+        -t:TestSqlClientUnit
+        -p:TestFramework=${{ parameters.testFramework }}
+        -p:Configuration=Release
+
+  # Run the Functional Test suite.
+  - task: DotNetCoreCLI@2
+    displayName: Run Functional Tests (${{ parameters.testFramework }})
+    retryCountOnTaskFailure: 2
+    inputs:
+      command: build
+      projects: build.proj
+      arguments: >-
+        -t:TestSqlClientFunctional
+        -p:TestFramework=${{ parameters.testFramework }}
+        -p:Configuration=Release
+
+  # Run the Manual Test suite.
+  - task: DotNetCoreCLI@2
+    displayName: Run Manual Tests (${{ parameters.testFramework }})
+    retryCountOnTaskFailure: 2
+    inputs:
+      command: build
+      projects: build.proj
+      arguments: >-
+        -t:TestSqlClientManual
+        -p:TestFramework=${{ parameters.testFramework }}
+        -p:Configuration=Release
+
+  # ---------------------------------------------------------------------------
+  # Publish results & coverage
+  # ---------------------------------------------------------------------------
+
+  # Publish the TRX test results to the pipeline run.
+  - task: PublishTestResults@2
+    displayName: Publish Test Results
+    condition: succeededOrFailed()
+    inputs:
+      testResultsFormat: VSTest
+      # build.proj defines TestResultsFolderPath which defaults to
+      # $(Build.SourcesDirectory)/test_results, so we look there for the results and coverage files.
+      testResultsFiles:  $(Build.SourcesDirectory)/test_results/**/*.trx
+      mergeTestResults: true
+      testRunTitle: ${{ parameters.testRunTitle }}
+      buildConfiguration: Release
+
+  # Azure Pipelines task conditions do not support path existence checks directly,
+  # so compute this once and gate later steps on the variable.
+  - pwsh: |
+      $resultsDir = "$(Build.SourcesDirectory)/test_results"
+      if (Test-Path -LiteralPath $resultsDir) {
+        Write-Host "##vso[task.setvariable variable=HasTestResultsDir]true"
+      }
+      else {
+        Write-Host "##vso[task.setvariable variable=HasTestResultsDir]false"
+      }
+    displayName: Detect test_results directory
+    condition: succeededOrFailed()
+
+  # Give our coverage files a unique name to make it clear where they originated when we download
+  # the artifacts from all jobs in the merge stage.
+  - pwsh: |
+      cd $(Build.SourcesDirectory)/test_results
+      Get-ChildItem -Filter "*.coverage" -Recurse |
+        Rename-Item -NewName { "${{ parameters.testFramework }}" + $_.Name }
+    displayName: Rename coverage files
+    condition: and(succeededOrFailed(), eq(variables['HasTestResultsDir'], 'true'))
+
+  # Publish TRX test results and coverage files as pipeline artifacts.  The merge stage needs the
+  # coverage files from all of the jobs.
+  - task: PublishPipelineArtifact@1
+    displayName: Publish Test Artifacts
+    condition: and(succeededOrFailed(), eq(variables['HasTestResultsDir'], 'true'))
+    inputs:
+      targetPath: $(Build.SourcesDirectory)/test_results
+      artifact: ${{ parameters.artifactName }}
diff --git a/eng/pipelines/kerberos/linux-cleanup-step.yml b/eng/pipelines/kerberos/linux-cleanup-step.yml
new file mode 100644
index 0000000000..d3491bb337
--- /dev/null
+++ b/eng/pipelines/kerberos/linux-cleanup-step.yml
@@ -0,0 +1,45 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This template leaves the Active Directory domain and destroys Kerberos
+# credentials.  It should be referenced at the end of any job that called
+# linux-init-step.yml.
+#
+# All steps use condition: always() so that cleanup runs even when previous
+# steps fail.
+
+parameters:
+
+  # The Active Directory domain to leave (e.g. mydomain.contoso.com).
+  - name: kerberosDomain
+    type: string
+
+  # The domain user account used during the join.
+  - name: kerberosDomainUser
+    type: string
+
+  # The password for the domain user account.
+  - name: kerberosDomainPassword
+    type: string
+
+steps:
+
+  - bash: |
+      set -uo pipefail
+
+      DOMAIN="${{ parameters.kerberosDomain }}"
+      DOMAIN_USER="${{ parameters.kerberosDomainUser }}"
+      DOMAIN_PASSWORD="${{ parameters.kerberosDomainPassword }}"
+      DOMAIN_UPPER=$(echo "$DOMAIN" | tr '[:lower:]' '[:upper:]')
+
+      # Leave the domain
+      echo "$DOMAIN_PASSWORD" | sudo realm leave "$DOMAIN_UPPER" --verbose \
+        -U "$DOMAIN_USER@$DOMAIN_UPPER" || true
+
+      # Destroy the TGT and credential cache
+      kdestroy || true
+    displayName: Clean up Kerberos (domain leave + kdestroy)
+    condition: always()
diff --git a/eng/pipelines/kerberos/linux-init-step.yml b/eng/pipelines/kerberos/linux-init-step.yml
new file mode 100644
index 0000000000..c0c4603232
--- /dev/null
+++ b/eng/pipelines/kerberos/linux-init-step.yml
@@ -0,0 +1,117 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This template joins a Linux agent to an Active Directory domain using Kerberos
+# and acquires a TGT (Ticket-Granting Ticket) for the specified domain user.
+#
+# Prerequisites:
+#   - The agent must be running on Ubuntu/Debian (uses apt-get).
+#   - The domain controller must be reachable from the agent network.
+#
+# After this step completes successfully, the agent will have:
+#   - Kerberos packages installed (krb5-user, realmd, sssd, adcli, etc.)
+#   - Hostname set to FQDN within the domain
+#   - NTP synchronized with the domain controller
+#   - Machine joined to the AD domain
+#   - A valid Kerberos TGT for the specified user
+
+parameters:
+
+  # The Active Directory domain to join (e.g. mydomain.contoso.com).
+  - name: kerberosDomain
+    type: string
+
+  # The Organizational Unit in which to place the computer account.
+  - name: kerberosDomainOU
+    type: string
+
+  # The domain user account to authenticate with (sAMAccountName, without @realm).
+  - name: kerberosDomainUser
+    type: string
+
+  # The password for the domain user account.
+  - name: kerberosDomainPassword
+    type: string
+
+steps:
+
+  - bash: |
+      set -euo pipefail
+
+      DOMAIN="${{ parameters.kerberosDomain }}"
+      DOMAIN_OU="${{ parameters.kerberosDomainOU }}"
+      DOMAIN_USER="${{ parameters.kerberosDomainUser }}"
+      DOMAIN_PASSWORD="${{ parameters.kerberosDomainPassword }}"
+      DOMAIN_UPPER=$(echo "$DOMAIN" | tr '[:lower:]' '[:upper:]')
+
+      echo "Domain:   $DOMAIN"
+      echo "Realm:    $DOMAIN_UPPER"
+      echo "User:     $DOMAIN_USER"
+      echo "OU:       $DOMAIN_OU"
+
+      if [ -z "$DOMAIN_PASSWORD" ]; then
+        echo "##vso[task.logissue type=error]KerberosDomainPassword is empty"
+        exit 1
+      fi
+
+      # -----------------------------------------------------------------------
+      # Install Kerberos and AD integration packages
+      # -----------------------------------------------------------------------
+      echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
+
+      sudo apt-get -y update
+      sudo apt-get install -y dialog apt-utils
+      sudo apt-get install -y \
+        krb5-user samba sssd sssd-tools libnss-sss libpam-sss \
+        ntp ntpdate realmd adcli
+
+      # -----------------------------------------------------------------------
+      # Set the hostname to FQDN within the domain
+      # -----------------------------------------------------------------------
+      CURRENT_HOSTNAME="$(hostname)"
+      if [ "$CURRENT_HOSTNAME" = "$DOMAIN" ] || [[ "$CURRENT_HOSTNAME" == *".$DOMAIN" ]]; then
+        echo "Hostname already uses domain suffix '.$DOMAIN': $CURRENT_HOSTNAME"
+      else
+        sudo hostnamectl set-hostname "$CURRENT_HOSTNAME.$DOMAIN"
+      fi
+
+      # -----------------------------------------------------------------------
+      # Synchronize time with the domain controller (required for Kerberos)
+      # -----------------------------------------------------------------------
+      if ! sudo grep -Fqx "server $DOMAIN" /etc/ntp.conf; then
+        echo "server $DOMAIN" | sudo tee -a /etc/ntp.conf
+      fi
+      sudo systemctl stop ntp
+      sudo ntpdate "$DOMAIN"
+      sudo systemctl start ntp
+
+      # -----------------------------------------------------------------------
+      # Configure Kerberos realm
+      # -----------------------------------------------------------------------
+      echo "[libdefaults]
+              default_realm = $DOMAIN_UPPER
+              rdns = false" | sudo tee /etc/krb5.conf
+
+      # -----------------------------------------------------------------------
+      # Discover and join the domain
+      # -----------------------------------------------------------------------
+      sudo realm discover "$DOMAIN_UPPER"
+
+      echo "$DOMAIN_PASSWORD" | sudo realm join --verbose "$DOMAIN_UPPER" \
+        -U "$DOMAIN_USER@$DOMAIN_UPPER" \
+        --computer-ou "OU=$DOMAIN_OU"
+
+      realm list
+
+      # -----------------------------------------------------------------------
+      # Acquire a Kerberos TGT
+      # -----------------------------------------------------------------------
+      echo "$DOMAIN_PASSWORD" | kinit "$DOMAIN_USER@$DOMAIN_UPPER"
+
+      klist
+      sudo ip addr
+      sudo ip route
+    displayName: Initialize Kerberos (domain join + kinit)
diff --git a/eng/pipelines/kerberos/sqlclient-kerberos.yml b/eng/pipelines/kerberos/sqlclient-kerberos.yml
new file mode 100644
index 0000000000..1cd19961e7
--- /dev/null
+++ b/eng/pipelines/kerberos/sqlclient-kerberos.yml
@@ -0,0 +1,292 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# =============================================================================
+# sqlclient-kerberos
+# =============================================================================
+# Daily Kerberos authentication test pipeline for Microsoft.Data.SqlClient.
+# Replaces the Classic "Test-SqlClient-Kerberos-Azure" pipeline.
+#
+# Schedule: daily at 07:00 UTC on main, release/6.1, and release/7.0.
+#
+# Job breakdown (10 total):
+#   Stage: windows           → 7 jobs  (net462 + net8/9/10 × NativeSNI/ManagedSNI)
+#   Stage: linux             → 3 jobs  (net8, net9, net10 — ManagedSNI only)
+#   Stage: Merge-Code-Coverage → 1 job
+#
+# Shared steps:
+#   Build and test steps are defined in build-and-test-steps.yml and reused
+#   by both stages. Each stage passes its OS-specific build target and the
+#   per-job testFramework matrix variable.
+#
+# Required ADO variable groups (link in pipeline UI):
+#   - kv-sqldrivers-shared    (provides the agent-at-sqldrv-ad secret)
+#
+# Variables defined in this file (no pipeline UI configuration needed):
+#   - KerberosDomain          sqldrv.ad
+#   - KerberosDomainOU        agents
+#   - KerberosDomainUser      agent
+#   - KerberosDomainPassword  $(agent-at-sqldrv-ad) from kv-sqldrivers-shared
+#   - REMOTE_TCP_CONN_STRING  TCP connection string to sqldrv-sql22
+#   - REMOTE_NP_CONN_STRING   Named Pipe connection string to sqldrv-sql22
+# =============================================================================
+
+trigger: none   # Scheduled runs only — no CI trigger
+pr: none        # Not triggered by PRs
+
+schedules:
+  - cron: '0 7 * * *'
+    displayName: Daily run (07:00 UTC)
+    branches:
+      include:
+        - main
+        - release/6.1
+        - release/7.0
+    always: true
+
+name: $(date:yyyyMMdd)$(rev:.r)
+
+variables:
+  # Our Kerberos environment doesn't change often, so we can define these variables here rather than
+  # in the Pipeline UI or in Libraries.
+  - name: KerberosDomain
+    value: sqldrv.ad
+
+  - name: KerberosDomainOU
+    value: agents
+
+  - name: KerberosDomainUser
+    value: agent
+
+  - name: KerberosDomainPassword
+    value: $(agent-at-sqldrv-ad)   # Secret from kv-sqldrivers-shared variable group
+
+  - name: REMOTE_TCP_CONN_STRING
+    value: Data Source=tcp:sqldrv-sql22.sqldrv.ad\sql2022;Initial Catalog=Northwind;Integrated Security=true;Encrypt=false;TrustServerCertificate=true
+
+  - name: REMOTE_NP_CONN_STRING
+    value: Data Source=np:sqldrv-sql22.sqldrv.ad\sql2022;Initial Catalog=Northwind;Integrated Security=true;Encrypt=false;TrustServerCertificate=true
+
+# =============================================================================
+# STAGES
+# =============================================================================
+stages:
+
+  # ===========================================================================
+  # Stage 1 - Windows (7 jobs = net462 + 3 TFs × 2 ManagedSNI)
+  # ===========================================================================
+  - stage: windows
+    displayName: Windows
+    dependsOn: []
+    variables:
+      # KerberosDomainPassword expands at runtime in this stage from the agent-at-sqldrv-ad secret
+      # exposed by this variable group.
+      - group: kv-sqldrivers-shared
+    jobs:
+      - job: windows
+        displayName: Windows
+        timeoutInMinutes: 90
+        workspace:
+          clean: all    # Purge obj/artifacts from prior runs on self-hosted agents
+        strategy:
+          matrix:
+            # Azure Pipelines exposes matrix variables as environment variables for each step.
+            # Do not use the name targetFramework here: MSBuild imports environment variables as
+            # properties, and TargetFramework would leak into dotnet build build.proj, forcing
+            # transitive project references onto an invalid TFM (for example SqlServer.Server -> net9.0).
+            net462_NativeSNI:
+              testFramework: net462
+              managedSNI: 'false'
+            net8_NativeSNI:
+              testFramework: net8.0
+              managedSNI: 'false'
+            net8_ManagedSNI:
+              testFramework: net8.0
+              managedSNI: 'true'
+            net9_NativeSNI:
+              testFramework: net9.0
+              managedSNI: 'false'
+            net9_ManagedSNI:
+              testFramework: net9.0
+              managedSNI: 'true'
+            net10_NativeSNI:
+              testFramework: net10.0
+              managedSNI: 'false'
+            net10_ManagedSNI:
+              testFramework: net10.0
+              managedSNI: 'true'
+        pool:
+          name: ADO-Trusted-Domain-Win-WestUS2
+          demands:
+            - ImageOverride -equals ADO-MMS22-SQL19
+        steps:
+
+          - checkout: self
+            clean: true
+            fetchDepth: 1
+            fetchTags: false
+
+          - template: /eng/pipelines/steps/install-dotnet.yml@self
+            parameters:
+              runtimes: [8.x, 9.x]
+
+          # --- Update test configuration ---
+          # Uses runtime variables from the matrix ($(managedSNI)) so we use
+          # inline PowerShell instead of the shared config template which
+          # requires compile-time parameters.
+          - pwsh: |
+              $managedSni = [System.Convert]::ToBoolean($env:MANAGED_SNI)
+              $jdata = Get-Content -Raw "config.default.json" | ConvertFrom-Json
+              foreach ($p in $jdata) {
+                  $p.TCPConnectionString       = $env:REMOTE_TCP_CONN_STRING
+                  $p.NPConnectionString        = $env:REMOTE_NP_CONN_STRING
+                  $p.SupportsIntegratedSecurity = $true
+                  $p.UseManagedSNIOnWindows    = $managedSni
+              }
+              $jdata | ConvertTo-Json | Set-Content "config.json"
+            workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
+            displayName: Update test config.json
+            env:
+              REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
+              REMOTE_NP_CONN_STRING: $(REMOTE_NP_CONN_STRING)
+              MANAGED_SNI: $(managedSNI)
+
+          # --- Prepare Windows services ---
+          - powershell: |
+              $svc = Get-Service -Name SQLBrowser -ErrorAction SilentlyContinue
+              if ($null -ne $svc) {
+                  Set-Service -StartupType Automatic SQLBrowser
+                  if ($svc.Status -ne 'Running') { Start-Service SQLBrowser }
+                  Get-Service SQLBrowser | Select-Object Name, StartType, Status
+              }
+            displayName: Start SQL Server Browser
+
+          - powershell: |
+              Set-DtcNetworkSetting -DtcName "Local" `
+                -InboundTransactionsEnabled $true `
+                -OutboundTransactionsEnabled $true `
+                -RemoteClientAccessEnabled $true `
+                -Confirm:$false
+
+              Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (RPC)"      | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
+              Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (RPC-EPMAP)" | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
+              Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (TCP-Out)"   | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
+              Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (TCP-In)"    | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
+            displayName: Enable Network DTC Access
+
+          # --- Build and test ---
+          - template: /eng/pipelines/kerberos/build-and-test-steps.yml@self
+            parameters:
+              buildTarget: BuildSqlClientWindows
+              testFramework: $(testFramework)
+              testRunTitle: Windows-$(testFramework)-ManagedSNI_$(managedSNI)
+              artifactName: $(testFramework)-ManagedSNI_$(managedSNI)-$(System.JobId)
+
+  # ===========================================================================
+  # Stage 2 - Linux - .NET Core + Kerberos (3 jobs = 3 TFs)
+  # ===========================================================================
+  - stage: linux
+    displayName: Linux
+    dependsOn: []
+    variables:
+      # KerberosDomainPassword expands at runtime in this stage from the agent-at-sqldrv-ad secret
+      # exposed by this variable group.
+      - group: kv-sqldrivers-shared
+    jobs:
+      - job: linux
+        displayName: Linux
+        timeoutInMinutes: 90
+        workspace:
+          clean: all    # Purge leftovers on self-hosted agents to reduce cross-run flakiness
+        strategy:
+          matrix:
+            net8:
+              testFramework: net8.0
+            net9:
+              testFramework: net9.0
+            net10:
+              testFramework: net10.0
+        pool:
+          name: ADO-Trusted-Linux-WestUS2
+          demands:
+            - ImageOverride -equals ADO-UB20-SQL22
+
+        steps:
+
+          - checkout: self
+            clean: true
+            fetchDepth: 1
+            fetchTags: false
+
+          # --- Install .NET SDK and runtimes ---
+          - template: /eng/pipelines/steps/install-dotnet.yml@self
+            parameters:
+              runtimes: [8.x, 9.x]
+
+          # --- Update test configuration (with Kerberos credentials) ---
+          - pwsh: |
+              $jdata = Get-Content -Raw "config.default.json" | ConvertFrom-Json
+              foreach ($p in $jdata) {
+                  $p.TCPConnectionString       = $env:REMOTE_TCP_CONN_STRING
+                  $p.NPConnectionString        = $env:REMOTE_NP_CONN_STRING
+                  $p.SupportsIntegratedSecurity = $true
+              }
+              $jdata | Add-Member -NotePropertyName "KerberosDomainUser"     -NotePropertyValue $env:KERBEROS_DOMAIN_USER     -Force
+              $jdata | Add-Member -NotePropertyName "KerberosDomainPassword" -NotePropertyValue $env:KERBEROS_DOMAIN_PASSWORD -Force
+              $jdata | ConvertTo-Json | Set-Content "config.json"
+            workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
+            displayName: Update test config.json (Kerberos)
+            env:
+              REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
+              REMOTE_NP_CONN_STRING: $(REMOTE_NP_CONN_STRING)
+              KERBEROS_DOMAIN_USER: $(KerberosDomainUser)
+              KERBEROS_DOMAIN_PASSWORD: $(KerberosDomainPassword)
+
+          # --- Kerberos domain join ---
+          - template: /eng/pipelines/kerberos/linux-init-step.yml@self
+            parameters:
+              kerberosDomain: $(KerberosDomain)
+              kerberosDomainOU: $(KerberosDomainOU)
+              kerberosDomainUser: $(KerberosDomainUser)
+              kerberosDomainPassword: $(KerberosDomainPassword)
+
+          # --- Verify SQL connectivity ---
+          - pwsh: |
+              Install-Module -Name SqlServer -Force -Confirm:$false
+              Import-Module SqlServer
+              Invoke-Sqlcmd -Query "SELECT @@VERSION, @@SERVERNAME" -ConnectionString $env:REMOTE_TCP_CONN_STRING
+            displayName: Verify SQL connectivity
+            env:
+              REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
+
+          # --- Build and test ---
+          - template: /eng/pipelines/kerberos/build-and-test-steps.yml@self
+            parameters:
+              buildTarget: BuildSqlClientUnix
+              testFramework: $(testFramework)
+              testRunTitle: Linux-$(testFramework)
+              artifactName: $(testFramework)-linux-$(System.JobId)
+
+          # --- Kerberos cleanup (always runs) ---
+          - template: /eng/pipelines/kerberos/linux-cleanup-step.yml@self
+            parameters:
+              kerberosDomain: $(KerberosDomain)
+              kerberosDomainUser: $(KerberosDomainUser)
+              kerberosDomainPassword: $(KerberosDomainPassword)
+
+  # ===========================================================================
+  # Stage 3 — Merge Code Coverage (1 job)
+  # ===========================================================================
+  - stage: merge
+    displayName: Merge Code Coverage
+    dependsOn:
+      - windows
+      - linux
+    condition: succeededOrFailed()
+    jobs:
+      - template: /eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml@self
+        parameters:
+          upload: false
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index ba2ff262bf..be7e2e9e3b 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -51,6 +51,7 @@ pr:
       - global.json
       - NuGet.config
     exclude:
+      - eng/pipelines/kerberos/*
       - eng/pipelines/onebranch/*
       - eng/pipelines/stress/*
 
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index a928175f17..30950ec21c 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -51,6 +51,7 @@ pr:
       - global.json
       - NuGet.config
     exclude:
+      - eng/pipelines/kerberos/*
       - eng/pipelines/onebranch/*
       - eng/pipelines/stress/*
 

From 95d212a54b574b3f89302ea5ecce30263f502702 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 7 May 2026 08:19:56 -0300
Subject: [PATCH 088/298] Tweaks for hotfix cherry-pick workflow (#4166)

---
 .github/scripts/cherry-pick-to-release.sh     | 21 +++++++-
 .../scripts/tests/cherry-pick-to-release.bats | 49 +++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/cherry-pick-to-release.sh b/.github/scripts/cherry-pick-to-release.sh
index a8612e7453..69a655d110 100755
--- a/.github/scripts/cherry-pick-to-release.sh
+++ b/.github/scripts/cherry-pick-to-release.sh
@@ -193,10 +193,29 @@ else
 
   lookup_milestone "${VERSION}"
 
+  # Build the PR body using printf to avoid quoting pitfalls with embedded
+  # newlines (mixed $'...' and '...' quoting can leave literal \n in output).
+  CONFLICT_BODY="$(printf '%s' \
+    "Cherry-pick of #${PR_NUMBER} (${MERGE_COMMIT_SHA}) into " \
+    "\`${TARGET_BRANCH}\` **failed due to merge conflicts**." \
+    "${MILESTONE_NOTE}" \
+    $'\n\nPlease resolve manually:\n```bash\n' \
+    "git fetch origin" \
+    $'\n' \
+    "git checkout ${CHERRY_PICK_BRANCH}" \
+    $'\n' \
+    "${CHERRY_PICK_CMD}" \
+    $'\n' \
+    "# resolve conflicts" \
+    $'\n' \
+    "git push origin ${CHERRY_PICK_BRANCH} --force" \
+    $'\n```')"
+
   gh pr create \
+    --draft \
     --base "${TARGET_BRANCH}" \
     --head "${CHERRY_PICK_BRANCH}" \
     --title "[${VERSION} Cherry-pick - CONFLICTS] ${PR_TITLE}" \
     ${MILESTONE_ARG} \
-    --body $'Cherry-pick of #'"${PR_NUMBER}"' ('"${MERGE_COMMIT_SHA}"') into `'"${TARGET_BRANCH}"'` **failed due to merge conflicts**.'"${MILESTONE_NOTE}"$'\n\nPlease resolve manually:\n```bash\ngit fetch origin\ngit checkout '"${CHERRY_PICK_BRANCH}"'\n'"${CHERRY_PICK_CMD}"$'\n# resolve conflicts\ngit push origin '"${CHERRY_PICK_BRANCH}"' --force\n```'
+    --body "${CONFLICT_BODY}"
 fi
diff --git a/.github/scripts/tests/cherry-pick-to-release.bats b/.github/scripts/tests/cherry-pick-to-release.bats
index 68ef3d7f8c..3484b48ea9 100644
--- a/.github/scripts/tests/cherry-pick-to-release.bats
+++ b/.github/scripts/tests/cherry-pick-to-release.bats
@@ -296,3 +296,52 @@ STUB
   # Should have created an empty commit.
   grep -q "GIT: commit --allow-empty" "${STUB_DIR}/git.log"
 }
+
+@test "conflict PR body contains real newlines, not literal backslash-n" {
+  write_git_mock '
+    if [[ "$1" == "fetch" ]]; then exit 0; fi
+    if [[ "$1" == "cherry" ]]; then echo "+ abc123"; exit 0; fi
+    if [[ "$1" == "checkout" ]]; then exit 0; fi
+    if [[ "$1" == "rev-list" ]]; then echo "abc123def456 parent1"; exit 0; fi
+    if [[ "$1" == "cherry-pick" ]]; then
+      if [[ "$2" == "--abort" ]]; then exit 0; fi
+      exit 1
+    fi
+    if [[ "$1" == "commit" ]]; then exit 0; fi
+    if [[ "$1" == "push" ]]; then exit 0; fi
+    exit 0
+  '
+  # Capture the full --body argument to a file for inspection.
+  write_gh_mock '
+    if [[ "$1" == "api" ]]; then echo "7.0.1"; exit 0; fi
+    if [[ "$1" == "pr" && "$2" == "create" ]]; then
+      while [[ $# -gt 0 ]]; do
+        if [[ "$1" == "--body" ]]; then
+          printf "%s" "$2" > "'"${STUB_DIR}"'/pr-body.txt"
+          break
+        fi
+        shift
+      done
+      exit 0
+    fi
+    exit 0
+  '
+
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+
+  # The body file must exist (gh pr create was called with --body).
+  [ -f "${STUB_DIR}/pr-body.txt" ]
+
+  local body
+  body="$(cat "${STUB_DIR}/pr-body.txt")"
+
+  # Must NOT contain literal two-character sequence '\n'.
+  [[ "$body" != *'\\n'* ]]
+  # Each command in the code block must be on its own line.
+  [[ "$body" == *$'\ngit fetch origin\n'* ]]
+  [[ "$body" == *$'\ngit checkout dev/automation/pr-42-to-7.0.1\n'* ]]
+  [[ "$body" == *$'\ngit cherry-pick abc123def456\n'* ]]
+  [[ "$body" == *$'\n# resolve conflicts\n'* ]]
+  [[ "$body" == *$'\ngit push origin dev/automation/pr-42-to-7.0.1 --force\n'* ]]
+}

From 4a3639970f35bc4c5e67432fbedd9f193727d1f0 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Thu, 7 May 2026 06:43:26 -0700
Subject: [PATCH 089/298] Remove extra connection options parameters (#4261)

---
 .../Data/ProviderBase/DbConnectionClosed.cs   |  21 ++-
 .../Data/ProviderBase/DbConnectionInternal.cs |  13 +-
 .../Connection/SqlConnectionInternal.cs       |  31 +---
 .../ConnectionPool/ChannelDbConnectionPool.cs |  12 +-
 .../ConnectionPool/IDbConnectionPool.cs       |   8 +-
 .../WaitHandleDbConnectionPool.cs             |  35 ++---
 .../Microsoft/Data/SqlClient/SqlConnection.cs |   4 +-
 .../Data/SqlClient/SqlConnectionFactory.cs    |  37 ++---
 .../ChannelDbConnectionPoolTest.cs            |  46 +-----
 .../TransactedConnectionPoolTest.cs           |   4 +-
 ...itHandleDbConnectionPoolTransactionTest.cs |   5 +-
 .../Microsoft/Data/SqlClient/CasTest.cs       | 135 ++++++++++++++++++
 12 files changed, 186 insertions(+), 165 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/CasTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
index 2bb0c202a7..96704bacce 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
@@ -62,9 +62,8 @@ protected internal override Task<DataTable> GetSchemaAsync(
         internal override bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions) =>
-            TryOpenConnectionInternal(outerConnection, connectionFactory, retry, userOptions);
+            TaskCompletionSource<DbConnectionInternal> retry) =>
+            TryOpenConnectionInternal(outerConnection, connectionFactory, retry);
 
         /// <inheritdoc/>
         internal override void ResetConnection() => throw ADP.ClosedConnectionError();
@@ -79,8 +78,7 @@ protected DbConnectionBusy(ConnectionState state) : base(state, true, false)
         internal override bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions)
+            TaskCompletionSource<DbConnectionInternal> retry)
             => throw ADP.ConnectionAlreadyOpen(State);
     }
 
@@ -121,15 +119,13 @@ internal override void CloseConnection(DbConnection owningObject, SqlConnectionF
         internal override bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions) =>
-            TryOpenConnection(outerConnection, connectionFactory, retry, userOptions);
+            TaskCompletionSource<DbConnectionInternal> retry) =>
+            TryOpenConnection(outerConnection, connectionFactory, retry);
 
         internal override bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions)
+            TaskCompletionSource<DbConnectionInternal> retry)
         {
             if (retry == null || !retry.Task.IsCompleted)
             {
@@ -177,8 +173,7 @@ private DbConnectionClosedPreviouslyOpened() : base(ConnectionState.Closed, true
         internal override bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions) =>
-            TryOpenConnection(outerConnection, connectionFactory, retry, userOptions);
+            TaskCompletionSource<DbConnectionInternal> retry) =>
+            TryOpenConnection(outerConnection, connectionFactory, retry);
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
index b6b6d727ed..ac3949c726 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -688,7 +688,7 @@ internal void MakePooledConnection(IDbConnectionPool connectionPool)
 
         internal virtual void OpenConnection(DbConnection outerConnection, SqlConnectionFactory connectionFactory)
         {
-            if (!TryOpenConnection(outerConnection, connectionFactory, null, null))
+            if (!TryOpenConnection(outerConnection, connectionFactory, null))
             {
                 throw ADP.InternalError(ADP.InternalErrorCode.SynchronousConnectReturnedPending);
             }
@@ -800,8 +800,7 @@ internal void SetInStasis()
         internal virtual bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions)
+            TaskCompletionSource<DbConnectionInternal> retry)
         {
             throw ADP.ConnectionAlreadyOpen(State);
         }
@@ -809,8 +808,7 @@ internal virtual bool TryOpenConnection(
         internal virtual bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions)
+            TaskCompletionSource<DbConnectionInternal> retry)
         {
             throw ADP.MethodNotImplemented();
         }
@@ -912,8 +910,7 @@ protected virtual void ReleaseAdditionalLocksForClose(bool lockToken)
         protected bool TryOpenConnectionInternal(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions)
+            TaskCompletionSource<DbConnectionInternal> retry)
         {
             // ?->Connecting: prevent set_ConnectionString during Open
             if (connectionFactory.SetInnerConnectionFrom(outerConnection, DbConnectionClosedConnecting.SingletonInstance, this))
@@ -922,7 +919,7 @@ protected bool TryOpenConnectionInternal(
                 try
                 {
                     connectionFactory.PermissionDemand(outerConnection);
-                    if (!connectionFactory.TryGetConnection(outerConnection, retry, userOptions, this, out openConnection))
+                    if (!connectionFactory.TryGetConnection(outerConnection, retry, this, out openConnection))
                     {
                         return false;
                     }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index 6c5be8930c..e62541137c 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -312,8 +312,6 @@ internal class SqlConnectionInternal : DbConnectionInternal, IDisposable
         /// - Although the new password is generally not used it must be passed to the ctor. The
         ///   new Login7 packet will always write out the new password (or a length of zero and no
         ///   bytes if not present).
-        /// - userConnectionOptions may be different to connectionOptions if the connection string
-        ///   has been expanded (see SqlConnectionOptions.Expand)
         /// </remarks>
         // @TODO: We really really need simplify what we pass into this. All these optional parameters need to go!
         internal SqlConnectionInternal(
@@ -324,7 +322,6 @@ internal SqlConnectionInternal(
             string newPassword,
             SecureString newSecurePassword,
             bool redirectedUserInstance,
-            SqlConnectionOptions userConnectionOptions = null,
             SessionData reconnectSessionData = null,
             bool applyTransientFaultHandling = false,
             string accessToken = null,
@@ -341,29 +338,6 @@ internal SqlConnectionInternal(
             {
                 reconnectSessionData._debugReconnectDataApplied = true;
             }
-
-            #if NETFRAMEWORK
-            try
-            {
-                // use this to help validate this object is only created after the following
-                // permission has been previously demanded in the current codepath
-                if (userConnectionOptions != null)
-                {
-                    // As mentioned above, userConnectionOptions may be different to
-                    // connectionOptions, so we need to demand on the correct connection string
-                    userConnectionOptions.DemandPermission();
-                }
-                else
-                {
-                    connectionOptions.DemandPermission();
-                }
-            }
-            catch (SecurityException)
-            {
-                Debug.Assert(false, "unexpected SecurityException for current codepath");
-                throw;
-            }
-            #endif
             #endif
 
             Debug.Assert(reconnectSessionData == null || connectionOptions.ConnectRetryCount > 0,
@@ -1970,10 +1944,9 @@ internal void OnLoginAck(SqlLoginAck rec)
         internal override bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions)
+            TaskCompletionSource<DbConnectionInternal> retry)
         {
-            return TryOpenConnectionInternal(outerConnection, connectionFactory, retry, userOptions);
+            return TryOpenConnectionInternal(outerConnection, connectionFactory, retry);
         }
 
         internal void ValidateConnectionForExecute(SqlCommand command)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 41d49508be..b83434cac6 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -224,7 +224,6 @@ public void PutObjectFromTransactedPool(DbConnectionInternal connection)
         /// <inheritdoc />
         public DbConnectionInternal ReplaceConnection(
             DbConnection owningObject, 
-            SqlConnectionOptions userOptions, 
             DbConnectionInternal oldConnection)
         {
             throw new NotImplementedException();
@@ -282,7 +281,6 @@ public void TransactionEnded(Transaction transaction, DbConnectionInternal trans
         public bool TryGetConnection(
             DbConnection owningObject, 
             TaskCompletionSource<DbConnectionInternal>? taskCompletionSource,
-            SqlConnectionOptions userOptions, 
             out DbConnectionInternal? connection)
         {
             var timeout = TimeSpan.FromSeconds(owningObject.ConnectionTimeout);
@@ -292,7 +290,6 @@ public bool TryGetConnection(
             {
                 var task = GetInternalConnection(
                         owningObject,
-                        userOptions,
                         async: false,
                         timeout);
 
@@ -340,7 +337,6 @@ public bool TryGetConnection(
                 {
                     connection = await GetInternalConnection(
                         owningObject,
-                        userOptions,
                         async: true,
                         timeout
                     ).ConfigureAwait(false);
@@ -375,7 +371,6 @@ public bool TryGetConnection(
         /// Opens a new internal connection to the database.
         /// </summary>
         /// <param name="owningConnection">The owning connection.</param>
-        /// <param name="userOptions">The options for the connection.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <returns>A task representing the asynchronous operation, with a result of the new internal connection.</returns>
         /// <exception cref="OperationCanceledException">
@@ -383,7 +378,6 @@ public bool TryGetConnection(
         /// </exception>
         private DbConnectionInternal? OpenNewInternalConnection(
             DbConnection? owningConnection, 
-            SqlConnectionOptions userOptions, 
             CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
@@ -405,8 +399,7 @@ public bool TryGetConnection(
                     // when this support is added to DbConnectionInternal.
                     var connection = ConnectionFactory.CreatePooledConnection(
                         owningConnection,
-                        this,
-                        userOptions);
+                        this);
 
                     if (connection is not null)
                     {
@@ -498,7 +491,6 @@ private void RemoveConnection(DbConnectionInternal connection)
         /// Gets an internal connection from the pool, either by retrieving an idle connection or opening a new one.
         /// </summary>
         /// <param name="owningConnection">The DbConnection that will own this internal connection</param>
-        /// <param name="userOptions">The user options to set on the internal connection</param>
         /// <param name="async">A boolean indicating whether the operation should be asynchronous.</param>
         /// <param name="timeout">The timeout for the operation.</param>
         /// <returns>Returns a DbConnectionInternal that is retrieved from the pool.</returns>
@@ -512,7 +504,6 @@ private void RemoveConnection(DbConnectionInternal connection)
         /// </exception>
         private async Task<DbConnectionInternal> GetInternalConnection(
             DbConnection owningConnection, 
-            SqlConnectionOptions userOptions, 
             bool async, 
             TimeSpan timeout)
         {
@@ -533,7 +524,6 @@ private async Task<DbConnectionInternal> GetInternalConnection(
                     // If we didn't find an idle connection, try to open a new one.  
                     connection ??= OpenNewInternalConnection(
                         owningConnection,
-                        userOptions,
                         cancellationToken);
 
                     // If we're at max capacity and couldn't open a connection. Block on the idle channel with a
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
index 904c19f28e..43dae3fa0f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
@@ -119,19 +119,17 @@ internal interface IDbConnectionPool
         /// <param name="owningObject">The SqlConnection that will own this internal connection.</param>
         /// <param name="taskCompletionSource">Used when calling this method in an async context. 
         /// The internal connection will be set on completion source rather than passed out via the out parameter.</param>
-        /// <param name="userOptions">The user options to use if a new connection must be opened.</param>
         /// <param name="connection">The retrieved connection will be passed out via this parameter.</param>
         /// <returns>True if a connection was set in the out parameter, otherwise returns false.</returns>
-        bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, SqlConnectionOptions userOptions, out DbConnectionInternal? connection);
+        bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, out DbConnectionInternal? connection);
 
         /// <summary>
         /// Replaces the internal connection currently associated with owningObject with a new internal connection from the pool.
         /// </summary>
-        /// <param name="owningObject">The connection whos internal connection should be replaced.</param>
-        /// <param name="userOptions">The user options to use if a new connection must be opened.</param>
+        /// <param name="owningObject">The connection whose internal connection should be replaced.</param>
         /// <param name="oldConnection">The internal connection currently associated with the owning object.</param>
         /// <returns>A reference to the new DbConnectionInternal.</returns>
-        DbConnectionInternal ReplaceConnection(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection);
+        DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionInternal oldConnection);
 
         /// <summary>
         /// Returns an internal connection to the pool.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index 96a1a6e5f3..4243e777ba 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -61,17 +61,15 @@ internal sealed class WaitHandleDbConnectionPool : IDbConnectionPool
 
         private sealed class PendingGetConnection
         {
-            public PendingGetConnection(long dueTime, DbConnection owner, TaskCompletionSource<DbConnectionInternal> completion, SqlConnectionOptions userOptions)
+            public PendingGetConnection(long dueTime, DbConnection owner, TaskCompletionSource<DbConnectionInternal> completion)
             {
                 DueTime = dueTime;
                 Owner = owner;
                 Completion = completion;
-                UserOptions = userOptions;
             }
             public long DueTime { get; private set; }
             public DbConnection Owner { get; private set; }
             public TaskCompletionSource<DbConnectionInternal> Completion { get; private set; }
-            public SqlConnectionOptions UserOptions { get; private set; }
         }
 
         private sealed class PoolWaitHandles
@@ -522,7 +520,7 @@ private bool IsBlockingPeriodEnabled()
             }
         }
 
-        private DbConnectionInternal CreateObject(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection)
+        private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectionInternal oldConnection)
         {
             DbConnectionInternal newObj = null;
 
@@ -530,8 +528,7 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, SqlConnecti
             {
                 newObj = _connectionFactory.CreatePooledConnection(
                     owningObject,
-                    this,
-                    userOptions);
+                    this);
 
                 lock (_objectList)
                 {
@@ -837,7 +834,6 @@ private void WaitForPendingOpen()
                                 delay,
                                 allowCreate: true,
                                 onlyOneCheckConnection: false,
-                                next.UserOptions,
                                 out connection);
                         }
                         // @TODO: CER Exception Handling was removed here (see GH#3581)
@@ -875,7 +871,7 @@ private void WaitForPendingOpen()
             } while (_pendingOpens.TryPeek(out next));
         }
 
-        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal> taskCompletionSource, SqlConnectionOptions userOptions, out DbConnectionInternal connection)
+        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal> taskCompletionSource, out DbConnectionInternal connection)
         {
             uint waitForMultipleObjectsTimeout = 0;
             bool allowCreate = false;
@@ -901,7 +897,7 @@ public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbC
             }
 
             bool onlyOneCheckConnection = true;
-            if (TryGetConnection(owningObject, waitForMultipleObjectsTimeout, allowCreate, onlyOneCheckConnection, userOptions, out connection))
+            if (TryGetConnection(owningObject, waitForMultipleObjectsTimeout, allowCreate, onlyOneCheckConnection, out connection))
             {
                 return true;
             }
@@ -915,8 +911,7 @@ public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbC
                 new PendingGetConnection(
                     CreationTimeout == 0 ? Timeout.Infinite : ADP.TimerCurrent() + ADP.TimerFromSeconds(CreationTimeout / 1000),
                     owningObject,
-                    taskCompletionSource,
-                    userOptions);
+                    taskCompletionSource);
             _pendingOpens.Enqueue(pendingGetConnection);
 
             // it is better to StartNew too many times than not enough
@@ -934,7 +929,7 @@ public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbC
 #if NETFRAMEWORK
         [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")] // copied from Triaged.cs
 #endif
-        private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObjectsTimeout, bool allowCreate, bool onlyOneCheckConnection, SqlConnectionOptions userOptions, out DbConnectionInternal connection)
+        private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObjectsTimeout, bool allowCreate, bool onlyOneCheckConnection, out DbConnectionInternal connection)
         {
             DbConnectionInternal obj = null;
             Transaction transaction = null;
@@ -985,7 +980,7 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, Creating new connection.", Id);
                                 try
                                 {
-                                    obj = UserCreateRequest(owningObject, userOptions);
+                                    obj = UserCreateRequest(owningObject);
                                 }
                                 catch
                                 {
@@ -1045,7 +1040,7 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                                         if (semaphoreHolder.Obtained)
                                         {
                                             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, Creating new connection.", Id);
-                                            obj = UserCreateRequest(owningObject, userOptions);
+                                            obj = UserCreateRequest(owningObject);
                                         }
                                         else
                                         {
@@ -1131,13 +1126,12 @@ private void PrepareConnection(DbConnection owningObject, DbConnectionInternal o
         /// Creates a new connection to replace an existing connection
         /// </summary>
         /// <param name="owningObject">Outer connection that currently owns <paramref name="oldConnection"/></param>
-        /// <param name="userOptions">Options used to create the new connection</param>
         /// <param name="oldConnection">Inner connection that will be replaced</param>
         /// <returns>A new inner connection that is attached to the <paramref name="owningObject"/></returns>
-        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection)
+        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionInternal oldConnection)
         {
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.ReplaceConnection|RES|CPOOL> {0}, replacing connection.", Id);
-            DbConnectionInternal newConnection = UserCreateRequest(owningObject, userOptions, oldConnection);
+            DbConnectionInternal newConnection = UserCreateRequest(owningObject, oldConnection);
 
             if (newConnection != null)
             {
@@ -1277,8 +1271,7 @@ private void PoolCreateRequest(object state)
                                         {
                                             try
                                             {
-                                                // Don't specify any user options because there is no outer connection associated with the new connection
-                                                newObj = CreateObject(owningObject: null, userOptions: null, oldConnection: null);
+                                                newObj = CreateObject(owningObject: null, oldConnection: null);
                                             }
                                             catch
                                             {
@@ -1522,7 +1515,7 @@ public void TransactionEnded(Transaction transaction, DbConnectionInternal trans
             }
         }
 
-        private DbConnectionInternal UserCreateRequest(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection = null)
+        private DbConnectionInternal UserCreateRequest(DbConnection owningObject, DbConnectionInternal oldConnection = null)
         {
             // called by user when they were not able to obtain a free object but
             // instead obtained creation mutex
@@ -1542,7 +1535,7 @@ private DbConnectionInternal UserCreateRequest(DbConnection owningObject, SqlCon
                     // TODO: Consider implement a control knob here; why do we only check for dead objects ever other time?  why not every 10th time or every time?
                     if ((oldConnection != null) || (Count & 0x1) == 0x1 || !ReclaimEmancipatedObjects())
                     {
-                        obj = CreateObject(owningObject, userOptions, oldConnection);
+                        obj = CreateObject(owningObject, oldConnection);
                     }
                 }
                 return obj;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index b0c9cc4289..aa9d8edc06 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -2228,14 +2228,14 @@ private bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry)
         {
             if (ForceNewConnection)
             {
-                if (!InnerConnection.TryReplaceConnection(this, ConnectionFactory, retry, UserConnectionOptions))
+                if (!InnerConnection.TryReplaceConnection(this, ConnectionFactory, retry))
                 {
                     return false;
                 }
             }
             else
             {
-                if (!InnerConnection.TryOpenConnection(this, ConnectionFactory, retry, UserConnectionOptions))
+                if (!InnerConnection.TryOpenConnection(this, ConnectionFactory, retry))
                 {
                     return false;
                 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index 981ca17641..30010d0d4b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -115,8 +115,7 @@ internal DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(SqlConnec
         
         internal DbConnectionInternal CreateNonPooledConnection(
             DbConnection owningConnection,
-            DbConnectionPoolGroup poolGroup,
-            SqlConnectionOptions userOptions)
+            DbConnectionPoolGroup poolGroup)
         {
             Debug.Assert(owningConnection is not null, "null owningConnection?");
             Debug.Assert(poolGroup is not null, "null poolGroup?");
@@ -126,8 +125,7 @@ internal DbConnectionInternal CreateNonPooledConnection(
                 poolGroup.PoolKey,
                 poolGroup.ProviderInfo,
                 pool: null,
-                owningConnection,
-                userOptions);
+                owningConnection);
             if (newConnection is not null)
             {
                 SqlClientDiagnostics.Metrics.HardConnectRequest();
@@ -140,8 +138,7 @@ internal DbConnectionInternal CreateNonPooledConnection(
 
         internal DbConnectionInternal CreatePooledConnection(
             DbConnection owningConnection,
-            IDbConnectionPool pool,
-            SqlConnectionOptions userOptions)
+            IDbConnectionPool pool)
         {
             Debug.Assert(pool != null, "null pool?");
 
@@ -150,8 +147,7 @@ internal DbConnectionInternal CreatePooledConnection(
                 pool.PoolGroup.PoolKey,
                 pool.PoolGroup.ProviderInfo,
                 pool,
-                owningConnection,
-                userOptions);
+                owningConnection);
 
             if (newConnection is null)
             {
@@ -316,7 +312,6 @@ internal void QueuePoolGroupForRelease(DbConnectionPoolGroup poolGroup)
         internal bool TryGetConnection(
             DbConnection owningConnection,
             TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions,
             DbConnectionInternal oldConnection,
             out DbConnectionInternal connection)
         {
@@ -387,7 +382,6 @@ internal bool TryGetConnection(
                                 s_pendingOpenNonPooled[idx],
                                 owningConnection,
                                 retry,
-                                userOptions,
                                 oldConnection,
                                 poolGroup,
                                 cancellationTokenSource);
@@ -413,7 +407,7 @@ internal bool TryGetConnection(
                         return false;
                     }
 
-                    connection = CreateNonPooledConnection(owningConnection, poolGroup, userOptions);
+                    connection = CreateNonPooledConnection(owningConnection, poolGroup);
 
                     SqlClientDiagnostics.Metrics.EnterNonPooledConnection();
                 }
@@ -423,11 +417,11 @@ internal bool TryGetConnection(
                     {
                         Debug.Assert(oldConnection is not DbConnectionClosed, "Force new connection, but there is no old connection");
                         
-                        connection = connectionPool.ReplaceConnection(owningConnection, userOptions, oldConnection);
+                        connection = connectionPool.ReplaceConnection(owningConnection, oldConnection);
                     }
                     else
                     {
-                        if (!connectionPool.TryGetConnection(owningConnection, retry, userOptions, out connection))
+                        if (!connectionPool.TryGetConnection(owningConnection, retry, out connection))
                         {
                             return false;
                         }
@@ -579,8 +573,7 @@ protected virtual DbConnectionInternal CreateConnection(
             ConnectionPoolKey poolKey,
             DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
             IDbConnectionPool pool,
-            DbConnection owningConnection,
-            SqlConnectionOptions userOptions)
+            DbConnection owningConnection)
         {
             SqlConnectionOptions opt = options;
             ConnectionPoolKey key = poolKey;
@@ -589,16 +582,6 @@ protected virtual DbConnectionInternal CreateConnection(
             SqlConnection sqlOwningConnection = owningConnection as SqlConnection;
             bool applyTransientFaultHandling = sqlOwningConnection?._applyTransientFaultHandling ?? false;
 
-            SqlConnectionOptions userOpt = null;
-            if (userOptions != null)
-            {
-                userOpt = userOptions;
-            }
-            else if (sqlOwningConnection != null)
-            {
-                userOpt = sqlOwningConnection.UserConnectionOptions;
-            }
-
             if (sqlOwningConnection != null)
             {
                 recoverySessionData = sqlOwningConnection._recoverySessionData;
@@ -700,7 +683,6 @@ protected virtual DbConnectionInternal CreateConnection(
                 newPassword: string.Empty,
                 newSecurePassword: null,
                 redirectedUserInstance,
-                userOpt,
                 recoverySessionData,
                 applyTransientFaultHandling,
                 key.AccessToken,
@@ -768,7 +750,6 @@ private Task<DbConnectionInternal> CreateReplaceConnectionContinuation(
             Task<DbConnectionInternal> task,
             DbConnection owningConnection,
             TaskCompletionSource<DbConnectionInternal> retry,
-            SqlConnectionOptions userOptions,
             DbConnectionInternal oldConnection,
             DbConnectionPoolGroup poolGroup,
             CancellationTokenSource cancellationTokenSource)
@@ -781,7 +762,7 @@ private Task<DbConnectionInternal> CreateReplaceConnectionContinuation(
                     {
                         ADP.SetCurrentTransaction(retry.Task.AsyncState as System.Transactions.Transaction);
                         
-                        DbConnectionInternal newConnection = CreateNonPooledConnection(owningConnection, poolGroup, userOptions);
+                        DbConnectionInternal newConnection = CreateNonPooledConnection(owningConnection, poolGroup);
                         
                         if (oldConnection?.State == ConnectionState.Open)
                         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 2b1d437f98..7c1593af14 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -63,7 +63,6 @@ public void GetConnectionEmptyPool_ShouldCreateNewConnection(int numConnections)
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -93,7 +92,6 @@ public async Task GetConnectionAsyncEmptyPool_ShouldCreateNewConnection(int numC
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     tcs,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -119,7 +117,6 @@ public void GetConnectionMaxPoolSize_ShouldTimeoutAfterPeriod()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -133,7 +130,6 @@ out DbConnectionInternal? internalConnection
                 var exceeded = pool.TryGetConnection(
                     new SqlConnection("Timeout=1"),
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? extraConnection
                 );
             }
@@ -159,7 +155,6 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldTimeoutAfterPeriod()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -174,7 +169,6 @@ out DbConnectionInternal? internalConnection
                 var exceeded = pool.TryGetConnection(
                     new SqlConnection("Timeout=1"),
                     taskCompletionSource,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? extraConnection
                 );
                 await taskCompletionSource.Task;
@@ -200,7 +194,6 @@ public async Task GetConnectionMaxPoolSize_ShouldReuseAfterConnectionReleased()
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -209,7 +202,6 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -225,7 +217,6 @@ out DbConnectionInternal? internalConnection
                 var exceeded = pool.TryGetConnection(
                     new SqlConnection(""),
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? extraConnection
                 );
                 return extraConnection;
@@ -247,7 +238,6 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldReuseAfterConnectionReleas
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -256,7 +246,6 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -270,7 +259,6 @@ out DbConnectionInternal? internalConnection
             var exceeded = pool.TryGetConnection(
                 new SqlConnection(""),
                 taskCompletionSource,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? recycledConnection
             );
             pool.ReturnInternalConnection(firstConnection!, firstOwningConnection);
@@ -291,7 +279,6 @@ public async Task GetConnectionMaxPoolSize_ShouldRespectOrderOfRequest()
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -300,7 +287,6 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -321,7 +307,6 @@ out DbConnectionInternal? internalConnection
                 pool.TryGetConnection(
                     new SqlConnection(""),
                     null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? recycledConnection
                 );
                 return recycledConnection;
@@ -334,7 +319,6 @@ out DbConnectionInternal? recycledConnection
                 pool.TryGetConnection(
                     new SqlConnection("Timeout=1"),
                     null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? failedConnection
                 );
                 return failedConnection;
@@ -360,7 +344,6 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldRespectOrderOfRequest()
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -369,7 +352,6 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -384,7 +366,6 @@ out DbConnectionInternal? internalConnection
             var exceeded = pool.TryGetConnection(
                 new SqlConnection(""),
                 recycledTaskCompletionSource,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? recycledConnection
             );
 
@@ -394,7 +375,6 @@ out DbConnectionInternal? recycledConnection
             var exceeded2 = pool.TryGetConnection(
                 new SqlConnection("Timeout=1"),
                 failedCompletionSource,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? failedConnection
             );
 
@@ -417,7 +397,6 @@ public void ConnectionsAreReused()
             var completed1 = pool.TryGetConnection(
                 owningConnection,
                 null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? internalConnection1
             );
 
@@ -432,7 +411,6 @@ out DbConnectionInternal? internalConnection1
             var completed2 = pool.TryGetConnection(
                 owningConnection,
                 null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? internalConnection2
             );
 
@@ -454,7 +432,6 @@ public void GetConnectionTimeout_ShouldThrowTimeoutException()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
             });
@@ -475,7 +452,6 @@ public async Task GetConnectionAsyncTimeout_ShouldThrowTimeoutException()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource,
-                    new SqlConnectionOptions(""),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -500,7 +476,6 @@ public void StressTest()
                     var completed = pool.TryGetConnection(
                         owningObject,
                         taskCompletionSource: null,
-                        new SqlConnectionOptions(""),
                         out DbConnectionInternal? internalConnection
                     );
                     if (completed)
@@ -534,7 +509,6 @@ public void StressTestAsync()
                     var completed = pool.TryGetConnection(
                         owningObject,
                         taskCompletionSource,
-                        new SqlConnectionOptions(""),
                         out DbConnectionInternal? internalConnection
                     );
                     internalConnection = await taskCompletionSource.Task;
@@ -692,7 +666,7 @@ public void TestPutObjectFromTransactedPool()
         public void TestReplaceConnection()
         {
             var pool = ConstructPool(SuccessfulConnectionFactory);
-            Assert.Throws<NotImplementedException>(() => pool.ReplaceConnection(null!, null!, null!));
+            Assert.Throws<NotImplementedException>(() => pool.ReplaceConnection(null!, null!));
         }
 
         [Fact]
@@ -731,7 +705,6 @@ public void Clear_MultipleIdleConnections_AllAreDestroyed()
                 pool.TryGetConnection(
                     owningConnections[i],
                     taskCompletionSource: null,
-                    new SqlConnectionOptions(""),
                     out internalConnections[i]
                 );
                 Assert.Equal(0, internalConnections[i]!.ClearGeneration);
@@ -760,7 +733,6 @@ public void Clear_BusyConnection_NotDestroyedImmediately()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? busyConnection
             );
             Assert.NotNull(busyConnection);
@@ -784,7 +756,6 @@ public void Clear_BusyConnectionReturned_IsDestroyed()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? busyConnection
             );
             Assert.NotNull(busyConnection);
@@ -814,13 +785,11 @@ public void Clear_MixedBusyAndIdle_OnlyIdleDestroyedImmediately()
             pool.TryGetConnection(
                 busyOwner,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? busyConnection
             );
             pool.TryGetConnection(
                 idleOwner,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? idleConnection
             );
             Assert.NotNull(busyConnection);
@@ -853,7 +822,6 @@ public void Clear_NewConnectionsAfterClear_ArePooledNormally()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? oldConnection
             );
             Assert.Equal(0, oldConnection!.ClearGeneration);
@@ -867,7 +835,6 @@ out DbConnectionInternal? oldConnection
             pool.TryGetConnection(
                 newOwner,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? newConnection
             );
             Assert.NotNull(newConnection);
@@ -885,7 +852,6 @@ out DbConnectionInternal? newConnection
             pool.TryGetConnection(
                 reuseOwner,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? reusedConnection
             );
             Assert.Same(newConnection, reusedConnection);
@@ -902,7 +868,6 @@ public void Clear_MultipleClearCalls_DoNotCorruptState()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? connection
             );
             Assert.Equal(0, connection!.ClearGeneration);
@@ -921,7 +886,6 @@ out DbConnectionInternal? connection
             pool.TryGetConnection(
                 newOwner,
                 taskCompletionSource: null,
-                new SqlConnectionOptions(""),
                 out DbConnectionInternal? newConnection
             );
             Assert.NotNull(newConnection);
@@ -939,8 +903,7 @@ protected override DbConnectionInternal CreateConnection(
                 ConnectionPoolKey poolKey,
                 DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
                 IDbConnectionPool pool,
-                DbConnection owningConnection,
-                SqlConnectionOptions userOptions)
+                DbConnection owningConnection)
             {
                 return new StubDbConnectionInternal();
             }
@@ -953,8 +916,7 @@ protected override DbConnectionInternal CreateConnection(
                 ConnectionPoolKey poolKey,
                 DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
                 IDbConnectionPool pool,
-                DbConnection owningConnection,
-                SqlConnectionOptions userOptions)
+                DbConnection owningConnection)
             {
                 throw ADP.PooledOpenTimeout();
             }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
index c03c7cc550..521ded14b8 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
@@ -676,12 +676,12 @@ internal class MockDbConnectionPool : IDbConnectionPool
 
         public void Clear() => throw new NotImplementedException();
 
-        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, SqlConnectionOptions userOptions, out DbConnectionInternal? connection)
+        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, out DbConnectionInternal? connection)
         {
             throw new NotImplementedException();
         }
 
-        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection)
+        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionInternal oldConnection)
         {
             throw new NotImplementedException();
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
index 4b4a30ce19..a5e5d0339f 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
@@ -82,7 +82,6 @@ private DbConnectionInternal GetConnection(SqlConnection owner)
         _pool.TryGetConnection(
             owner,
             taskCompletionSource: null,
-            new SqlConnectionOptions(""),
             out DbConnectionInternal? connection);
         return connection!;
     }
@@ -95,7 +94,6 @@ private async Task<DbConnectionInternal> GetConnectionAsync(
         _pool.TryGetConnection(
             owner,
             taskCompletionSource: tcs,
-            new SqlConnectionOptions(""),
             out DbConnectionInternal? connection);
         return connection ?? await tcs.Task;
     }
@@ -904,8 +902,7 @@ protected override DbConnectionInternal CreateConnection(
             ConnectionPoolKey poolKey,
             DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
             IDbConnectionPool pool,
-            DbConnection owningConnection,
-            SqlConnectionOptions userOptions)
+            DbConnection owningConnection)
         {
             return new MockDbConnectionInternal();
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/CasTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/CasTest.cs
new file mode 100644
index 0000000000..d69ca287d5
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/CasTest.cs
@@ -0,0 +1,135 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NETFRAMEWORK
+using System;
+using System.Data;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests
+{
+    /// <summary>
+    /// Tests for Code Access Security (CAS) permission demands in SqlConnection.
+    ///
+    /// CAS is a .NET Framework security mechanism that restricts what code can do based on
+    /// its origin and identity. SqlConnection.Open() calls DemandPermission(), which performs
+    /// a stack walk to verify that all callers have been granted SqlClientPermission. If any
+    /// caller lacks the permission, a SecurityException is thrown before any network I/O occurs.
+    ///
+    /// These tests use AppDomain sandboxing to create partial-trust environments with controlled
+    /// permission sets, proving that the permission demand is enforced during Open().
+    /// </summary>
+    public class CasTest
+    {
+        /// <summary>
+        /// Verify that calling Open() in a partial-trust sandbox without SqlClientPermission
+        /// causes a SecurityException. Paired with the next test, this experimentally proves
+        /// that SqlClientPermission is the specific permission being demanded: the only
+        /// difference between the two sandboxes is SqlClientPermission being granted.
+        /// </summary>
+        [Fact]
+        public void Open_WithoutSqlClientPermission_ThrowsSecurityException()
+        {
+            var permissions = new System.Security.PermissionSet(System.Security.Permissions.PermissionState.None);
+            permissions.AddPermission(new System.Security.Permissions.SecurityPermission(
+                System.Security.Permissions.SecurityPermissionFlag.Execution));
+
+            var setup = new AppDomainSetup
+            {
+                ApplicationBase = AppDomain.CurrentDomain.SetupInformation.ApplicationBase
+            };
+
+            AppDomain sandbox = AppDomain.CreateDomain("PermissionTest_NoPerm", null, setup, permissions);
+            try
+            {
+                Assert.Throws<System.Security.SecurityException>(() =>
+                    sandbox.DoCallBack(OpenConnectionInSandbox));
+            }
+            finally
+            {
+                AppDomain.Unload(sandbox);
+            }
+        }
+
+        /// <summary>
+        /// Same sandbox as above, but with a narrow SqlClientPermission granted for the exact
+        /// connection string used in OpenConnectionInSandbox. The SecurityException goes away,
+        /// proving that the CAS demand is specifically for SqlClientPermission scoped to that
+        /// connection string. (Open still fails with a non-security error because we can't connect.)
+        /// </summary>
+        [Fact]
+        public void Open_WithSqlClientPermission_DoesNotThrowSecurityException()
+        {
+            var permissions = new System.Security.PermissionSet(System.Security.Permissions.PermissionState.None);
+            permissions.AddPermission(new System.Security.Permissions.SecurityPermission(
+                System.Security.Permissions.SecurityPermissionFlag.Execution));
+            var sqlPerm = new SqlClientPermission(System.Security.Permissions.PermissionState.None);
+            sqlPerm.Add("Server=will_not_resolve_12345;Connect Timeout=1;", "", KeyRestrictionBehavior.AllowOnly);
+            permissions.AddPermission(sqlPerm);
+
+            var setup = new AppDomainSetup
+            {
+                ApplicationBase = AppDomain.CurrentDomain.SetupInformation.ApplicationBase
+            };
+
+            AppDomain sandbox = AppDomain.CreateDomain("PermissionTest_WithPerm", null, setup, permissions);
+            try
+            {
+                var ex = Record.Exception(() => sandbox.DoCallBack(OpenConnectionInSandbox));
+                Assert.NotNull(ex);
+                Assert.IsNotType<System.Security.SecurityException>(ex);
+            }
+            finally
+            {
+                AppDomain.Unload(sandbox);
+            }
+        }
+
+        /// <summary>
+        /// Grant a narrow SqlClientPermission for a different server than the one used in Open().
+        /// This proves that the permission demand checks the connection string content, not just
+        /// whether any SqlClientPermission is present.
+        /// </summary>
+        [Fact]
+        public void Open_WithMismatchedSqlClientPermission_ThrowsSecurityException()
+        {
+            var permissions = new System.Security.PermissionSet(System.Security.Permissions.PermissionState.None);
+            permissions.AddPermission(new System.Security.Permissions.SecurityPermission(
+                System.Security.Permissions.SecurityPermissionFlag.Execution));
+            var sqlPerm = new SqlClientPermission(System.Security.Permissions.PermissionState.None);
+            sqlPerm.Add("Server=some_other_server;", "", KeyRestrictionBehavior.AllowOnly);
+            permissions.AddPermission(sqlPerm);
+
+            var setup = new AppDomainSetup
+            {
+                ApplicationBase = AppDomain.CurrentDomain.SetupInformation.ApplicationBase
+            };
+
+            AppDomain sandbox = AppDomain.CreateDomain("PermissionTest_Mismatch", null, setup, permissions);
+            try
+            {
+                var ex = Record.Exception(() => sandbox.DoCallBack(OpenConnectionInSandbox));
+                Assert.NotNull(ex);
+                // The demand fails because the granted permission ("some_other_server") doesn't
+                // cover the demanded permission ("will_not_resolve_12345"). This surfaces as
+                // SecurityException or FileLoadException (the CLR encounters a circular assembly
+                // load when constructing SecurityException with the custom permission type).
+                Assert.True(
+                    ex is System.Security.SecurityException || ex is System.IO.FileLoadException,
+                    $"Expected security failure, got {ex.GetType().FullName}: {ex.Message}");
+            }
+            finally
+            {
+                AppDomain.Unload(sandbox);
+            }
+        }
+
+        private static void OpenConnectionInSandbox()
+        {
+            using var connection = new SqlConnection("Server=will_not_resolve_12345;Connect Timeout=1;");
+            connection.Open();
+        }
+    }
+}
+#endif

From 959d2fc46826f54f58a82de68fdd01d57925d3b6 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 7 May 2026 12:52:38 -0300
Subject: [PATCH 090/298] Restrict kerberos pipeline to main branch (#4265)

---
 eng/pipelines/kerberos/sqlclient-kerberos.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eng/pipelines/kerberos/sqlclient-kerberos.yml b/eng/pipelines/kerberos/sqlclient-kerberos.yml
index 1cd19961e7..a480ee8fb7 100644
--- a/eng/pipelines/kerberos/sqlclient-kerberos.yml
+++ b/eng/pipelines/kerberos/sqlclient-kerberos.yml
@@ -10,7 +10,7 @@
 # Daily Kerberos authentication test pipeline for Microsoft.Data.SqlClient.
 # Replaces the Classic "Test-SqlClient-Kerberos-Azure" pipeline.
 #
-# Schedule: daily at 07:00 UTC on main, release/6.1, and release/7.0.
+# Schedule: daily at 07:00 UTC on main.
 #
 # Job breakdown (10 total):
 #   Stage: windows           → 7 jobs  (net462 + net8/9/10 × NativeSNI/ManagedSNI)
@@ -43,8 +43,6 @@ schedules:
     branches:
       include:
         - main
-        - release/6.1
-        - release/7.0
     always: true
 
 name: $(date:yyyyMMdd)$(rev:.r)

From 822dca423b79699d7f612f0a49ac05d7ef37bb18 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 8 May 2026 16:10:26 -0300
Subject: [PATCH 091/298] Migrate SqlClient packaging to dotnet pack and
 centralize pack fallback (#4257)

---
 .github/copilot-instructions.md               |   8 +
 AGENTS.md                                     |  11 +
 BUILDGUIDE.md                                 |  67 ++---
 TESTGUIDE.md                                  |  44 ++--
 build.proj                                    | 138 +++-------
 .../templates/jobs/ci-build-nugets-job.yml    |  33 ++-
 .../steps/generate-nuget-package-step.yml     |  80 ------
 .../template/release-notes-template.md        |   2 +-
 .../src/Versions.props                        |   4 +-
 .../Abstractions/src/Versions.props           |   4 +-
 .../Azure/src/Versions.props                  |   4 +-
 .../Logging/src/Versions.props                |   4 +-
 src/Microsoft.Data.SqlClient/Versions.props   |   4 +-
 .../src/Microsoft.Data.SqlClient.csproj       | 124 ++++++++-
 .../src/Microsoft.Data.SqlClient.nuspec       | 238 ++++++++++++++++++
 src/Microsoft.SqlServer.Server/Versions.props |   4 +-
 tools/scripts/downloadLatestNuget.ps1         |  27 --
 tools/specs/Microsoft.Data.SqlClient.nuspec   | 234 -----------------
 18 files changed, 493 insertions(+), 537 deletions(-)
 delete mode 100644 eng/pipelines/common/templates/steps/generate-nuget-package-step.yml
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
 delete mode 100644 tools/scripts/downloadLatestNuget.ps1
 delete mode 100644 tools/specs/Microsoft.Data.SqlClient.nuspec

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 0c78f461cb..51ce83bb10 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -150,6 +150,14 @@ When a new issue is created, follow these steps:
 - Do not modify `CHANGELOG.md` unless executing a release workflow (see `release-notes` prompt).
 - Do not close issues without a fix or without providing a clear reason.
 
+## Terminal Execution Safety
+- Treat any non-zero shell exit code as a failed step that requires correction before proceeding.
+- If a bash process exits, do not wait for more output from that process; rerun the command in a fresh terminal session.
+- Validate that expected command output was produced before using it as evidence for conclusions.
+- When terminal execution fails, surface the failure immediately and retry with a corrected command.
+- Avoid `set -e` in this automation workflow; use focused commands and verify each result explicitly so shell exits are observable and attributable.
+- Prefer short, single-purpose terminal commands over long chained scripts when debugging or gathering state.
+
 ## 📝 Notes
 - Update policies and guidelines in the `policy/` directory as needed based on trending practices and team feedback.
 - Regularly review and update the `doc/` directory to ensure it reflects the current state of the project.
diff --git a/AGENTS.md b/AGENTS.md
index 690e9c9c8d..42f3a39399 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -54,6 +54,17 @@ This repository provides reusable prompts in `.github/prompts/` for common maint
 6. **Performance Optimization**: Use pooling, async, efficient allocations
 7. **Observability**: EventSource tracing, meaningful errors
 
+## Terminal Reliability Rules
+
+When using shell/terminal tools, follow these rules strictly:
+
+1. Treat non-zero terminal exit codes as immediate failures to investigate; do not continue as if the command succeeded.
+2. If a bash session exits, assume it is dead and start a new command/session; do not wait for additional output from that session.
+3. After any command expected to gather data, verify output was actually returned before proceeding.
+4. If command execution failed, report the failure clearly and retry with a corrected command instead of waiting.
+5. Avoid `set -e` in this automation context; prefer single-purpose commands with explicit follow-up checks so failures are visible without killing the shell unexpectedly.
+6. Prefer shorter command batches over long chained scripts when collecting evidence; this makes bash exits easier to detect and recover from.
+
 ## Branch Naming
 
 All branches created by AI agents **must** live under the `dev/automation/` prefix. Use a descriptive suffix, for example:
diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 715923d1b3..16aa709fe5 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -20,9 +20,8 @@ on operating systems that do not support .NET Framework. As such, it is not nece
 no action is required. On Linux and macOS systems, the `pwsh` command is required to be in the `$PATH` environment
 variable. For specific instructions see: [Install PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/install-powershell)
 
-The **NuGet** binary is required to package the Microsoft.Data.SqlClient project. For convenience, this can be done
-via the PowerShell script [tools/scripts/downloadLatestNuget.ps1](tools/scripts/downloadLatestNuget.ps1), however, any
-`nuget.exe` binary can be used.
+The **NuGet** binary is optional for inspection and feed-management workflows, but build and packaging flows in this
+repository are run through `dotnet build` against `build.proj`.
 
 ## Developer Workflow
 
@@ -34,21 +33,16 @@ package the project. The `build.proj` file provides convenient targets to accomp
 > may be noticed, possibly severe. All official build and test infrastructure uses the `build.proj` entrypoint, and it
 > is recommended that `build.proj` is used for local development, as well.
 
-> [!TIP]
-> `build.proj` was written with the intention of being called from `msbuild`. As such, the examples below
-> use `msbuild`. On systems where `msbuild` is not available, simply replace `msbuild` with `dotnet msbuild` to get the
-> same behavior.
-
 > [!TIP]
 > This section is not exhaustive of all targets or parameters to `build.proj`. Complete documentation is available in
 > [`build.proj`](build.proj).
 
 ### Building Projects
 
-From the root of your repository, run `msbuild` against `build.proj` with a build target, following this pattern:
+From the root of your repository, run `dotnet build` against `build.proj` with a build target, following this pattern:
 
 ```bash
-msbuild build.proj -t:<build_target> [optional_parameters]
+dotnet build build.proj -t:<build_target> [optional_parameters]
 ```
 
 The following build targets can be used to build the following projects. All targets will implicitly build any other
@@ -86,18 +80,21 @@ placed in `artifacts/Microsoft.Data.SqlClient.ref/Project-<configuration>/<tfm>`
 #### Examples
 
 Build all projects:
+
 ```bash
-msbuild build.proj -t:Build
+dotnet build build.proj -t:Build
 ```
 
 Build Microsoft.Data.SqlClient in Release configuration:
+
 ```bash
-msbuild build.proj -t:BuildSqlClient -p:Configuration=Release
+dotnet build build.proj -t:BuildSqlClient -p:Configuration=Release
 ```
 
 Build v1.2.3 of Microsoft.Data.SqlClient.Extensions.Abstractions:
+
 ```bash
-msbuild build.proj -t:BuildAbstractions -p:PackageVersionAbstractions=1.2.3
+dotnet build build.proj -t:BuildAbstractions -p:PackageVersionAbstractions=1.2.3
 ```
 
 ### Testing Projects
@@ -105,10 +102,10 @@ msbuild build.proj -t:BuildAbstractions -p:PackageVersionAbstractions=1.2.3
 This section provides a summary and brief example of how to execute tests for projects in this repository. **For more
 information about test procedures, including config file setup, see [TESTGUIDE.md](TESTGUIDE.md).**
 
-From the root of your repository, run `msbuild` against `build.proj` with a test target, following this pattern:
+From the root of your repository, run `dotnet build` against `build.proj` with a test target, following this pattern:
 
 ```bash
-msbuild build.proj -t:<test_target> [optional_parameters]
+dotnet build build.proj -t:<test_target> [optional_parameters]
 ```
 
 | `<test_target>`            | Description                                                                                                                                         |
@@ -140,37 +137,37 @@ A selection of parameters for test targets in `build.proj` relevant to common de
 Run Microsoft.Data.SqlClient unit tests:
 
 ```bash
-msbuild build.proj -t:TestSqlClientUnit
+dotnet build build.proj -t:TestSqlClientUnit
 ```
 
 Run Microsoft.Data.SqlClient manual test set 2:
 ```bash
-msbuild build.proj -t:TestSqlClientManual -p:TestSet=2
+dotnet build build.proj -t:TestSqlClientManual -p:TestSet=2
 ```
 
 Run Microsoft.Data.SqlClient functional tests against x86 dotnet:
 ```bash
-msbuild build.proj -t:TestSqlClientFunctional -p:DotnetPath='C:\path\to\dotnet\x86\'
+dotnet build build.proj -t:TestSqlClientFunctional -p:DotnetPath='C:\path\to\dotnet\x86\'
 ```
 
 Run all Microsoft.Data.SqlClient.Extensions.Azure unit tests, including interactive, but excluding failing tests:
 ```bash
-msbuild build.proj -t:TestAzure -p:TestFilters=category!=failing
+dotnet build build.proj -t:TestAzure -p:TestFilters=category!=failing
 ```
 
 Run Microsoft.Data.SqlClient functional tests against net8.0 runtime:
 ```bash
-msbuild build.proj -t:TestSqlClientFunctional -p:TestFramework=net8.0
+dotnet build build.proj -t:TestSqlClientFunctional -p:TestFramework=net8.0
 ```
 
 ### Packaging Projects
 
 Just like building and testing the various projects in this repository, packaging the projects into NuGet packages is
-also handled by `build.proj`. From the root of your repository, run `msbuild` against `build.proj` with a pack target,
+also handled by `build.proj`. From the root of your repository, run `dotnet build` against `build.proj` with a pack target,
 following this pattern:
 
 ```bash
-msbuild build.proj -t:<pack_target> [optional_parameters]
+dotnet build build.proj -t:<pack_target> [optional_parameters]
 ```
 
 | `<pack_target>`   | Description                                                                         |
@@ -191,30 +188,36 @@ A selection of parameters for pack targets in `build.proj` relevant to common de
 | `[optional_parameter]`             | Default Value | Allowed Values        | Description                                                                                                                                                    |
 |------------------------------------|---------------|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `-p:Configuration=`                | `Debug`       | `Debug`, `Release`    | Build configuration. Only applies if project and dependencies are being built.                                                                                 |
-| `-p:NugetPath=`                    | `[blank]`     | eg. `C:\my\nuget.exe` | _Only applies to `PackSqlClient`._ Path to `nuget.exe` to use. If not provided, defaults to `nuget.exe` in the PATH.                                           |
 | `-p:PackBuild=`                    | `true`        | `true`, `false`       | Whether or not to build the project before packing. If `false`, project must be built using the same parameters.                                               |
 | `-p:PackageVersion<TargetPackage>=` | `[blank]`     | eg. `1.2.3-dev123`    | Version to assign to the package, where `<TargetPackage>` can be one of: `['Abstractions', 'Azure', 'AkvProvider', 'Logging', 'SqlClient', 'SqlServer']`. If `PackBuild` is `true`, the assembly and file versions will be derived from this version. See Versioning for more details. |
 
+For `PackSqlClient`, these additional parameters are optional overrides for dependency versions injected into the SqlClient nuspec during pack:
+
+- `-p:PackageVersionAbstractions=<version>`
+- `-p:PackageVersionLogging=<version>`
+
+If omitted, `PackSqlClient` computes `AbstractionsPackageVersion` and `LoggingPackageVersion` from sibling projects using the current `BuildNumber` and `BuildSuffix` context.
+
 #### Examples
 
 Package Microsoft.Data.SqlClient.Internal.Logging into a NuGet package:
 ```bash
-msbuild build.proj -t:PackLogging
+dotnet build build.proj -t:PackLogging
 ```
 
-Package Microsoft.Data.SqlClient if `nuget.exe` is not in the `$PATH` environment variable:
+Package Microsoft.Data.SqlClient:
 ```bash
-msbuild build.proj -t:PackSqlClient -p:NugetPath="C:\my\nuget.exe"
+dotnet build build.proj -t:PackSqlClient
 ```
 
 Package version 1.2.3 of Microsoft.Data.SqlClient.Extensions.Abstractions:
 ```bash
-msbuild build.proj -t:PackAbstractions -p:PackageVersionAbstractions=1.2.3
+dotnet build build.proj -t:PackAbstractions -p:PackageVersionAbstractions=1.2.3
 ```
 
 Package Microsoft.Data.SqlClient.Extensions.Azure without building it beforehand:
 ```bash
-msbuild build.proj -t:PackAzure -p:PackBuild=false
+dotnet build build.proj -t:PackAzure -p:PackBuild=false
 ```
 
 ## Versioning
@@ -276,20 +279,20 @@ and Microsoft.Data.SqlClient.Internal.Logging v2.2.2.
 
 ```bash
 # Build v2.2.2 of Logging and copy to packages
-msbuild build.proj -t:PackLogging \
+dotnet build build.proj -t:PackLogging \
   -p:ReferenceType=Package \
   -p:PackageVersionLogging=2.2.2
 cp artifacts/Microsoft.Data.SqlClient.Internal.Logging/Debug/*.*pkg packages/
 
 # Build v1.0.1 of Abstractions that depends on v2.2.2 of Logging
-msbuild build.proj -t:PackAbstractions \
+dotnet build build.proj -t:PackAbstractions \
   -p:ReferenceType=Package \
   -p:PackageVersionAbstractions=1.0.1 \
   -p:PackageVersionLogging=2.2.2 \
 cp artifacts/Microsoft.Data.SqlClient.Extensions.Abstractions/Package-Debug/*.*pkg packages/
 
 # Build SqlClient
-msbuild -t:PackSqlClient \
+dotnet build build.proj -t:PackSqlClient \
   -p:ReferenceType=Package \
   -p:PackageVersionSqlClient=7.1.1 \
   -p:PackageVersionAbstractions=1.0.1 \
@@ -299,7 +302,7 @@ cp artifacts/Microsoft.Data.SqlClient/Package-Debug/*.*pkg packages/
 
 Run Microsoft.Data.SqlClient functional tests against the versions built above:
 ```bash
-msbuild build.proj -t:TestSqlClientFunctional \
+dotnet build build.proj -t:TestSqlClientFunctional \
   -p:ReferenceType=Package \
   -p:PackageVersionSqlClient=7.1.1 \
   -p:PackageVersionAbstractions=1.0.1 \
diff --git a/TESTGUIDE.md b/TESTGUIDE.md
index fdcb8749ec..349674deee 100644
--- a/TESTGUIDE.md
+++ b/TESTGUIDE.md
@@ -23,13 +23,7 @@ These projects target `net8.0`, `net9.0`, and `net10.0` on all platforms. On Win
 Use [build.proj](build.proj) from the repository root:
 
 ```bash
-msbuild build.proj -t:<test_target> [optional_parameters]
-```
-
-If `msbuild` is not available, use `dotnet msbuild`:
-
-```bash
-dotnet msbuild build.proj -t:<test_target> [optional_parameters]
+dotnet build build.proj -t:<test_target> [optional_parameters]
 ```
 
 Test targets build the projects they depend on, so a separate build step is not required for normal test runs.
@@ -51,55 +45,55 @@ Test targets build the projects they depend on, so a separate build step is not
 Run the SqlClient unit tests:
 
 ```bash
-msbuild build.proj -t:TestSqlClientUnit
+dotnet build build.proj -t:TestSqlClientUnit
 ```
 
 Run the SqlClient functional tests:
 
 ```bash
-msbuild build.proj -t:TestSqlClientFunctional
+dotnet build build.proj -t:TestSqlClientFunctional
 ```
 
 Run the SqlClient manual tests:
 
 ```bash
-msbuild build.proj -t:TestSqlClientManual
+dotnet build build.proj -t:TestSqlClientManual
 ```
 
 Run only manual test set 2:
 
 ```bash
-msbuild build.proj -t:TestSqlClientManual -p:TestSet=2
+dotnet build build.proj -t:TestSqlClientManual -p:TestSet=2
 ```
 
 Run manual test sets 1 and 3:
 
 ```bash
-msbuild build.proj -t:TestSqlClientManual -p:TestSet=13
+dotnet build build.proj -t:TestSqlClientManual -p:TestSet=13
 ```
 
 Run Always Encrypted manual tests:
 
 ```bash
-msbuild build.proj -t:TestSqlClientManual -p:TestSet=AE
+dotnet build build.proj -t:TestSqlClientManual -p:TestSet=AE
 ```
 
 Run a specific target framework:
 
 ```bash
-msbuild build.proj -t:TestSqlClientFunctional -p:TestFramework=net8.0
+dotnet build build.proj -t:TestSqlClientFunctional -p:TestFramework=net8.0
 ```
 
 Run functional tests against an x86 `dotnet` installation:
 
 ```bash
-msbuild build.proj -t:TestSqlClientFunctional -p:DotnetPath='C:\path\to\dotnet\x86\'
+dotnet build build.proj -t:TestSqlClientFunctional -p:DotnetPath='C:\path\to\dotnet\x86\'
 ```
 
 Run all Azure extension tests, including `interactive` tests, while still excluding tests marked `failing` or `flaky`:
 
 ```bash
-msbuild build.proj -t:TestAzure -p:TestFilters=category!=failing
+dotnet build build.proj -t:TestAzure -p:TestFilters=category!=failing
 ```
 
 ## Test Parameters
@@ -132,13 +126,13 @@ Examples:
 
 ```bash
 # Run a single test by fully-qualified name.
-msbuild build.proj -t:TestSqlClientUnit -p:TestFilters=FullyQualifiedName=Namespace.ClassName.MethodName
+dotnet build build.proj -t:TestSqlClientUnit -p:TestFilters=FullyQualifiedName=Namespace.ClassName.MethodName
 
 # Run only flaky tests while investigating quarantine failures.
-msbuild build.proj -t:TestSqlClientManual -p:TestFilters=category=flaky
+dotnet build build.proj -t:TestSqlClientManual -p:TestFilters=category=flaky
 
 # Disable the default filter.
-msbuild build.proj -t:TestSqlClientFunctional -p:TestFilters=none
+dotnet build build.proj -t:TestSqlClientFunctional -p:TestFilters=none
 ```
 
 When passing filter expressions that contain shell-sensitive characters such as `&`, quote or escape the value as
@@ -222,14 +216,14 @@ For SQL Server in a Linux container, WSL, or another host where SQL authenticati
 You can override the config file path with the `MDS_TEST_CONFIG` environment variable:
 
 ```bash
-MDS_TEST_CONFIG=/path/to/config.json msbuild build.proj -t:TestSqlClientManual -p:TestSet=2
+MDS_TEST_CONFIG=/path/to/config.json dotnet build build.proj -t:TestSqlClientManual -p:TestSet=2
 ```
 
 On PowerShell:
 
 ```powershell
 $env:MDS_TEST_CONFIG = "C:\path\to\config.json"
-msbuild build.proj -t:TestSqlClientManual -p:TestSet=2
+dotnet build build.proj -t:TestSqlClientManual -p:TestSet=2
 ```
 
 ## Configuration Properties
@@ -289,23 +283,23 @@ If `TestSet` is omitted, all sets are compiled and run. You can combine sets by
 Test results are written to `test_results` by default. Override the location with `TestResultsFolderPath`:
 
 ```bash
-msbuild build.proj -t:TestSqlClientUnit -p:TestResultsFolderPath=/tmp/sqlclient-test-results
+dotnet build build.proj -t:TestSqlClientUnit -p:TestResultsFolderPath=/tmp/sqlclient-test-results
 ```
 
 Hang blame collection is enabled by default with a `10m` timeout. To increase the timeout:
 
 ```bash
-msbuild build.proj -t:TestSqlClientManual -p:TestBlameTimeout=30m
+dotnet build build.proj -t:TestSqlClientManual -p:TestBlameTimeout=30m
 ```
 
 To disable hang blame collection:
 
 ```bash
-msbuild build.proj -t:TestSqlClientManual -p:TestBlameTimeout=0
+dotnet build build.proj -t:TestSqlClientManual -p:TestBlameTimeout=0
 ```
 
 Code coverage is enabled by default. To disable it for a faster local run:
 
 ```bash
-msbuild build.proj -t:TestSqlClientUnit -p:TestCodeCoverage=false
+dotnet build build.proj -t:TestSqlClientUnit -p:TestCodeCoverage=false
 ```
diff --git a/build.proj b/build.proj
index a0ef562934..14db6015ba 100644
--- a/build.proj
+++ b/build.proj
@@ -69,16 +69,6 @@
     -->
     <DotnetPath Condition="'$(DotnetPath)' == ''" />
 
-    <!--
-      NugetPath
-      Applies to:     PackSqlClient
-      Description:    Path to NuGet executable. Override if `nuget` is not included in the PATH
-                      variable.
-      Default value:  nuget
-      Example:        C:\nuget\nuget.exe
-    -->
-    <NugetPath Condition="'$(NugetPath)' == ''">nuget</NugetPath>
-
     <!--
       PackBuild
       Applies to:     Pack*
@@ -96,13 +86,6 @@
     <PackBuildArgument Condition="'$(PackBuild.ToLower())' != 'true'">
       --no-build
     </PackBuildArgument>
-    <!--
-      @TODO: This is kinda hacky, ideally we can pack via dotnet pack, which will handle building,
-        and can thus be switched off by passing -no-build. However, we're not there because we need
-        to build multiple projects before packaging, and thus need to use nuget. So, until then we
-        will switch off dependency building dynamically building the target dependencies
-    -->
-    <PackSqlClientDependsOn Condition="'$(PackBuild.ToLower())' == 'true'">BuildSqlClient</PackSqlClientDependsOn>
 
     <!--
       PackageVersionAbstractions
@@ -394,7 +377,6 @@
     <SqlClientUnitTestProjectPath>$(SqlClientSrcRoot)tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj</SqlClientUnitTestProjectPath>
 
     <!-- Tools/Specs Paths -->
-    <SqlClientNuspecPath>$(RepoRoot)tools/specs/Microsoft.Data.SqlClient.nuspec</SqlClientNuspecPath>
     <GenApiPath>$(RepoRoot)tools/GenAPI/Microsoft.DotNet.GenAPI/</GenApiPath>
     <GenApiProjectPath>$(GenApiPath)Microsoft.DotNet.GenAPI.csproj</GenApiProjectPath>
   </PropertyGroup>
@@ -531,107 +513,47 @@
 
   <!-- Pack SqlClient Target ===================================================== -->
   <!--
-    PackSqlClient: Packages SqlClient binaries into a NuGet package.
-    Because the SqlClient package depends on the "not supported" and ref projects, we can't use dotnet to
-    automatically build before packaging. Instead, we rely on target dependency to handle building
-    the same binaries that will be packaged.
+    SqlClient packaging uses the output from multiple projects, so we cannot simply ask dotnet
+    pack to package the SqlClient project alone.  We must ensure that all of the satellite
+    projects are built as well.  To achieve this, when PackBuild is true, we add the compound
+    BuildSqlClient target as a dependency of PackSqlClient.  This ensures all SqlClient targets are
+    built before packing.
   -->
-  <Target Name="PackSqlClient" DependsOnTargets="$(PackSqlClientDependsOn)">
-    <PropertyGroup>
-      <GitCommand>
-        git rev-parse HEAD
-      </GitCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <GitCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GitCommand), "\s+", " "))</GitCommand>
-    </PropertyGroup>
-    <Message Text=">>> Fetching latest git commit hash via command: $(GitCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(GitCommand)">
-      <Output TaskParameter="ConsoleOutput" PropertyName="CommitId" />
-    </Exec>
+  <PropertyGroup>
+    <PackSqlClientDependsOn Condition="'$(PackBuild.ToLower())' == 'true'">BuildSqlClient</PackSqlClientDependsOn>
+  </PropertyGroup>
 
-    <!-- This is a bit hacky, and can be (@TODO:) removed once packaging is done w/o a nuspec from dotnet -->
+  <!--
+    PackSqlClient: Packages SqlClient binaries with dotnet pack.
+    The package layout is defined by a nuspec file because we package the artifacts from multiple
+    projects into a single .nupkg file.
+  -->
+  <Target Name="PackSqlClient" DependsOnTargets="$(PackSqlClientDependsOn)">
     <PropertyGroup>
-      <GetSqlClientPackageVersionCommand>
-        "$(DotnetPath)dotnet" msbuild "$(SqlClientProjectPath)"
-        -nologo
-        -verbosity:quiet
-        -getProperty:SqlClientPackageVersion
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" pack "$(SqlClientProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(PackBuildArgument)
+        $(SigningKeyPathArgument)
 
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
-      </GetSqlClientPackageVersionCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <GetSqlClientPackageVersionCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GetSqlClientPackageVersionCommand), "\s+", " "))</GetSqlClientPackageVersionCommand>
-    </PropertyGroup>
-    <Message Text=">>> Evaluating SqlClient package version via command: $(GetSqlClientPackageVersionCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(GetSqlClientPackageVersionCommand)">
-      <Output TaskParameter="ConsoleOutput" PropertyName="_EvaluatedSqlClientPackageVersion" />
-    </Exec>
-    <Error Text="Failed to evaluate SqlClientPackageVersion for PackSqlClient."
-           Condition="'$(_EvaluatedSqlClientPackageVersion)' == ''" />
-
-    <!-- Evaluate AbstractionsPackageVersion from project if not provided -->
-    <PropertyGroup Condition="'$(PackageVersionAbstractions)' == ''">
-      <GetAbstractionsPackageVersionCommand>
-        "$(DotnetPath)dotnet" msbuild "$(AbstractionsProjectPath)"
-        -nologo
-        -verbosity:quiet
-        -getProperty:AbstractionsPackageVersion
-        $(BuildNumberArgument)
-        $(BuildSuffixArgument)
-      </GetAbstractionsPackageVersionCommand>
-      <GetAbstractionsPackageVersionCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GetAbstractionsPackageVersionCommand), "\s+", " "))</GetAbstractionsPackageVersionCommand>
-    </PropertyGroup>
-    <Message Text=">>> Evaluating Abstractions package version via command: $(GetAbstractionsPackageVersionCommand)"
-             Condition="'$(PackageVersionAbstractions)' == ''" />
-    <Exec ConsoleToMsBuild="true" Command="$(GetAbstractionsPackageVersionCommand)"
-          Condition="'$(PackageVersionAbstractions)' == ''">
-      <Output TaskParameter="ConsoleOutput" PropertyName="PackageVersionAbstractions" />
-    </Exec>
-    <Error Text="Failed to evaluate AbstractionsPackageVersion for PackSqlClient."
-           Condition="'$(PackageVersionAbstractions)' == ''" />
-
-    <!-- Evaluate LoggingPackageVersion from project if not provided -->
-    <PropertyGroup Condition="'$(PackageVersionLogging)' == ''">
-      <GetLoggingPackageVersionCommand>
-        "$(DotnetPath)dotnet" msbuild "$(LoggingProjectPath)"
-        -nologo
-        -verbosity:quiet
-        -getProperty:LoggingPackageVersion
-        $(BuildNumberArgument)
-        $(BuildSuffixArgument)
-      </GetLoggingPackageVersionCommand>
-      <GetLoggingPackageVersionCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GetLoggingPackageVersionCommand), "\s+", " "))</GetLoggingPackageVersionCommand>
-    </PropertyGroup>
-    <Message Text=">>> Evaluating Logging package version via command: $(GetLoggingPackageVersionCommand)"
-             Condition="'$(PackageVersionLogging)' == ''" />
-    <Exec ConsoleToMsBuild="true" Command="$(GetLoggingPackageVersionCommand)"
-          Condition="'$(PackageVersionLogging)' == ''">
-      <Output TaskParameter="ConsoleOutput" PropertyName="PackageVersionLogging" />
-    </Exec>
-    <Error Text="Failed to evaluate LoggingPackageVersion for PackSqlClient."
-           Condition="'$(PackageVersionLogging)' == ''" />
 
-    <PropertyGroup>
-      <_EvaluatedSqlClientPackageVersion>$([System.Text.RegularExpressions.Regex]::Replace($(_EvaluatedSqlClientPackageVersion), "\s", ""))</_EvaluatedSqlClientPackageVersion>
-      <PackageVersionAbstractions>$([System.Text.RegularExpressions.Regex]::Replace($(PackageVersionAbstractions), "\s", ""))</PackageVersionAbstractions>
-      <PackageVersionLogging>$([System.Text.RegularExpressions.Regex]::Replace($(PackageVersionLogging), "\s", ""))</PackageVersionLogging>
-      <CommitId>$([System.Text.RegularExpressions.Regex]::Replace($(CommitId), "\s", ""))</CommitId>
-      <NuGetCommand>
-        "$(NugetPath)" pack "$(SqlClientNuspecPath)"
-        -Symbols
-        -SymbolPackageFormat snupkg
-        -Version "$(_EvaluatedSqlClientPackageVersion)"
-        -OutputDirectory "$(SqlClientArtifactRoot)/$(ReferenceType)-$(Configuration)"
-        -properties "COMMITID=$(CommitId);Configuration=$(Configuration);ReferenceType=$(ReferenceType);AbstractionsPackageVersion=$(PackageVersionAbstractions);LoggingPackageVersion=$(PackageVersionLogging)"
-      </NuGetCommand>
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+
+        <!-- Pack settings are defined in Microsoft.Data.SqlClient.csproj -->
+        -p:PackageOutputPath="$(SqlClientArtifactRoot)/$(ReferenceType)-$(Configuration)"
+      </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
-      <NuGetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(NuGetCommand), "\s+", " "))</NuGetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Text=">>> Packing SqlClient nuget via command: $(NuGetCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(NuGetCommand)" />
+    <Message Text=">>> Packing SqlClient via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- Test SqlClient Targets ==================================================== -->
diff --git a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
index afb20ac80e..31bf8be63b 100644
--- a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
@@ -143,16 +143,29 @@ jobs:
       abstractionsPackageVersion: ${{parameters.abstractionsPackageVersion}}
       loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
 
-  - template: /eng/pipelines/common/templates/steps/generate-nuget-package-step.yml@self
-    parameters:
-      buildConfiguration: ${{ parameters.buildConfiguration }}
-      displayName: 'Create MDS NuGet Package'
-      generateSymbolsPackage: true
-      nuspecPath: 'tools/specs/Microsoft.Data.SqlClient.nuspec'
-      outputDirectory: $(packagePath)
-      packageVersion: ${{ parameters.mdsPackageVersion }}
-      properties: 'AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};LoggingPackageVersion=${{ parameters.loggingPackageVersion }}'
-      referenceType: ${{ parameters.referenceType }}
+  - task: DotNetCoreCLI@2
+    displayName: 'Create MDS NuGet Package'
+    inputs:
+      command: build
+      projects: build.proj
+      arguments: >-
+        -t:PackSqlClient
+        -p:PackBuild=false
+        -p:Configuration=${{ parameters.buildConfiguration }}
+        -p:ReferenceType=${{ parameters.referenceType }}
+        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+
+  # PackSqlClient outputs to artifacts/Microsoft.Data.SqlClient/<ReferenceType>-<Configuration>/.
+  # Downstream steps (local feed copy, AKV pack, artifact publish) all expect packages at
+  # $(packagePath), so copy them there.
+  - task: CopyFiles@2
+    displayName: Copy MDS Package to Output Directory
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/artifacts/Microsoft.Data.SqlClient/${{ parameters.referenceType }}-${{ parameters.buildConfiguration }}
+      contents: 'Microsoft.Data.SqlClient.*'
+      targetFolder: $(packagePath)
 
   # When building in Package mode, the AKV Provider restore needs to find the MDS package
   # we just built. Copy it to the local NuGet feed so NuGet.config can resolve it.
diff --git a/eng/pipelines/common/templates/steps/generate-nuget-package-step.yml b/eng/pipelines/common/templates/steps/generate-nuget-package-step.yml
deleted file mode 100644
index 46c5c61492..0000000000
--- a/eng/pipelines/common/templates/steps/generate-nuget-package-step.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-parameters:
-  - name: nuspecPath
-    type: string
-
-  - name: packageVersion
-    type: string
-
-  - name: outputDirectory
-    type: string
-    default: '$(Build.SourcesDirectory)/output'
-
-  # The C# build configuration (e.g. Debug or Release) to use when building the NuGet package.
-  - name: buildConfiguration
-    type: string
-    default: Debug
-    values:
-      - Debug
-      - Release
-
-  - name: generateSymbolsPackage
-    type: boolean
-
-  - name: displayName
-    type: string
-
-  - name: installNuget
-    type: boolean
-    default: true
-
-  # The C# project reference type to use when building and packing the packages.
-  - name: referenceType
-    type: string
-    values:
-      # Reference sibling packages as NuGet packages.
-      - Package
-      # Reference sibling packages as C# projects.
-      - Project
-
-  # Semi-colon separated properties to pass to nuget pack via the -properties argument.
-  - name: properties
-    type: string
-    default: ''
-
-steps:
-- ${{ if parameters.installNuget }}:
-  - task: NuGetToolInstaller@1
-    displayName: 'Install Latest Nuget'
-    inputs:
-      checkLatest: true
-
-- powershell: |
-    $Commit=git rev-parse HEAD
-    Write-Host "##vso[task.setvariable variable=CommitHead;]$Commit"
-  displayName: CommitHead
-
-- task: NuGetCommand@2
-  displayName: ${{parameters.displayName }}
-  inputs:
-    command: custom
-    ${{ if parameters.generateSymbolsPackage }}:
-      arguments: >-
-        pack
-        -Symbols
-        -SymbolPackageFormat snupkg
-        ${{parameters.nuspecPath}}
-        -Version ${{parameters.packageVersion}}
-        -OutputDirectory ${{parameters.outputDirectory}}
-        -properties "COMMITID=$(CommitHead);Configuration=${{parameters.buildConfiguration}};ReferenceType=${{parameters.referenceType}};${{parameters.properties}}"
-    ${{else }}:
-      arguments: >-
-        pack
-        ${{parameters.nuspecPath}}
-        -Version ${{parameters.packageVersion}}
-        -OutputDirectory ${{parameters.outputDirectory}}
-        -properties "COMMITID=$(CommitHead);Configuration=${{parameters.buildConfiguration}};ReferenceType=${{parameters.referenceType}};${{parameters.properties}}"
diff --git a/release-notes/template/release-notes-template.md b/release-notes/template/release-notes-template.md
index 4e3ebcb0c0..9df5a11e7f 100644
--- a/release-notes/template/release-notes-template.md
+++ b/release-notes/template/release-notes-template.md
@@ -87,7 +87,7 @@ We thank the following public contributors. Their efforts toward this project ar
 
 ### Dependencies
 
-(Use the dependencies listed in the package's NuGet spec under tools/specs/ or the project file.)
+(Use the dependencies listed in the package's NuGet spec beside the SqlClient project file, or in the project file.)
 
 #### [Target Framework Version]
 
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
index 25e3ff90ff..31f85b7da4 100644
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
@@ -66,9 +66,7 @@
         want a quick build without supplying any parameters.
       -->
       <PropertyGroup>
-        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
-
-        <AkvProviderPackageVersion>$(AkvProviderVersionDefault)-$(BuildSuffix)</AkvProviderPackageVersion>
+        <AkvProviderPackageVersion>$(AkvProviderVersionDefault)-dev</AkvProviderPackageVersion>
         <AkvProviderFileVersion>$(AkvProviderVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AkvProviderFileVersion>
       </PropertyGroup>
     </Otherwise>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
index 32330ad3a6..14daeda570 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
@@ -67,9 +67,7 @@
         want a quick build without supplying any parameters.
       -->
       <PropertyGroup>
-        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
-
-        <AbstractionsPackageVersion>$(AbstractionsVersionDefault)-$(BuildSuffix)</AbstractionsPackageVersion>
+        <AbstractionsPackageVersion>$(AbstractionsVersionDefault)-dev</AbstractionsPackageVersion>
         <AbstractionsFileVersion>$(AbstractionsVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AbstractionsFileVersion>
       </PropertyGroup>
     </Otherwise>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
index 1876c965eb..3c4bb9dfac 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
@@ -66,9 +66,7 @@
         want a quick build without supplying any parameters.
       -->
       <PropertyGroup>
-        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
-
-        <AzurePackageVersion>$(AzureVersionDefault)-$(BuildSuffix)</AzurePackageVersion>
+        <AzurePackageVersion>$(AzureVersionDefault)-dev</AzurePackageVersion>
         <AzureFileVersion>$(AzureVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AzureFileVersion>
       </PropertyGroup>
     </Otherwise>
diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
index 3278bdc2e9..eeb25b93ca 100644
--- a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
@@ -67,9 +67,7 @@
         want a quick build without supplying any parameters.
       -->
       <PropertyGroup>
-        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
-
-        <LoggingPackageVersion>$(LoggingVersionDefault)-$(BuildSuffix)</LoggingPackageVersion>
+        <LoggingPackageVersion>$(LoggingVersionDefault)-dev</LoggingPackageVersion>
         <LoggingFileVersion>$(LoggingVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</LoggingFileVersion>
       </PropertyGroup>
     </Otherwise>
diff --git a/src/Microsoft.Data.SqlClient/Versions.props b/src/Microsoft.Data.SqlClient/Versions.props
index 5ec3b8b9ac..2a915285b0 100644
--- a/src/Microsoft.Data.SqlClient/Versions.props
+++ b/src/Microsoft.Data.SqlClient/Versions.props
@@ -66,9 +66,7 @@
         want a quick build without supplying any parameters.
       -->
       <PropertyGroup>
-        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
-
-        <SqlClientPackageVersion>$(SqlClientVersionDefault)-$(BuildSuffix)</SqlClientPackageVersion>
+        <SqlClientPackageVersion>$(SqlClientVersionDefault)-dev</SqlClientPackageVersion>
         <SqlClientFileVersion>$(SqlClientVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</SqlClientFileVersion>
       </PropertyGroup>
     </Otherwise>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 559099062a..cd7fdb4b79 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -76,6 +76,126 @@
     <OutputPath>$(ArtifactPath)$(AssemblyName)/$(ReferenceType)-$(Configuration)/$(NormalizedTargetOs)/</OutputPath>
   </PropertyGroup>
 
+  <!-- NuGet Package Config ============================================ -->
+  <PropertyGroup>
+
+    <!-- Spec and proj paths. -->
+    <SqlClientPackNuspecTemplatePath>$(MSBuildProjectDirectory)/Microsoft.Data.SqlClient.nuspec</SqlClientPackNuspecTemplatePath>
+    <SqlClientPackNuspecGeneratedPath>$(BaseIntermediateOutputPath)Microsoft.Data.SqlClient.pack.nuspec</SqlClientPackNuspecGeneratedPath>
+
+    <AbstractionsProjectPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj</AbstractionsProjectPath>
+    <LoggingProjectPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj</LoggingProjectPath>
+    <AbstractionsVersionsPropsPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props</AbstractionsVersionsPropsPath>
+    <LoggingVersionsPropsPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props</LoggingVersionsPropsPath>
+
+    <!-- Properties consumed by the SDK NuGet pack task (NuGet.Build.Tasks.Pack.targets). -->
+
+    <!--
+      Path to the nuspec to pack from. Initialized to the template path. During
+      PrepareSqlClientPackNuspec this is always switched to the generated intermediate nuspec
+      before GenerateNuspec runs.
+    -->
+    <NuspecFile>$(SqlClientPackNuspecTemplatePath)</NuspecFile>
+
+    <!--
+      Root used to resolve relative file paths in the nuspec (for example lib/ and runtimes/).
+      The SDK pack targets do not provide a default value; PackTask receives this value as-is.
+      Artifact entries in this nuspec are authored relative to the repo artifacts directory so
+      this must point to $(RepoRoot)artifacts.
+    -->
+    <NuspecBasePath>$(RepoRoot)artifacts</NuspecBasePath>
+
+    <!--
+      Semicolon-separated key=value substitutions for $KEY$ tokens in nuspec metadata.
+      In this flow, metadata fields like $Version$ are substituted by PackTask, but dependency
+      version attribute tokens are not reliably substituted and are pre-expanded in
+      PrepareSqlClientPackNuspec.
+    -->
+    <NuspecProperties>Version=$(Version);Configuration=$(Configuration);ReferenceType=$(ReferenceType)</NuspecProperties>
+
+    <!-- Emit a .snupkg symbols package alongside the main .nupkg. -->
+    <IncludeSymbols>true</IncludeSymbols>
+
+    <!-- Use snupkg (NuGet.org symbol package format). -->
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+    <!--
+      Keep dependency information sourced from the nuspec; do not auto-generate from project
+      references.  This is necessary because, with NuspecFile-based pack, all dependency information
+      must come from the nuspec file.  The SDK will not automatically populate dependencies for us.
+    -->
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+
+  </PropertyGroup>
+
+  <!--
+    Conditionally import the Abstractions and Logging Versions.props files to obtain their
+    calculated package version values.
+  -->
+  <Import Project="$(AbstractionsVersionsPropsPath)"
+    Condition="'$(AbstractionsPackageVersion)' == '' AND Exists('$(AbstractionsVersionsPropsPath)')" />
+  <Import Project="$(LoggingVersionsPropsPath)"
+    Condition="'$(LoggingPackageVersion)' == '' AND Exists('$(LoggingVersionsPropsPath)')" />
+
+  <!--
+    SDK pack does not reliably substitute dependency version tokens in this nuspec flow.
+    We materialize those dependency versions into an intermediate nuspec before PackTask runs.
+
+    Why an intermediate nuspec is generated:
+    * The source nuspec keeps dependency versions as tokens to stay template-driven.
+    * During SDK-style packing, dependency token substitution is not consistently applied in this flow.
+    * Expanding tokens up front guarantees deterministic dependency versions in the final package metadata.
+
+    Why sibling package versions are resolved here:
+    * Pack entrypoints may call this project directly and omit Abstractions/Logging version overrides.
+    * Those versions must still align with sibling projects' versioning rules (BuildNumber/BuildSuffix and defaults).
+    * Conditional imports of sibling Versions.props preserve a single source of version truth.
+
+    Known SDK behavior (SDK 10.0.107):
+    * Tokens in NuspecProperties are substituted for string-valued metadata fields (for example $Version$).
+    * Tokens used as dependency version attribute values are not reliably substituted in this flow, which can
+      surface as: "An error occurred while trying to parse the value '' of property 'dependencies' in the
+      manifest file" and "'' is not a valid version string."
+    * Pre-materializing dependency version tokens into the generated intermediate nuspec avoids this failure.
+
+    Related upstream issues:
+    * dotnet/sdk#15482
+    * dotnet/sdk#29661
+    * dotnet/sdk#10516
+    * dotnet/sdk#15407
+    * dotnet/sdk#16816
+  -->
+  <Target Name="PrepareSqlClientPackNuspec"
+          BeforeTargets="GenerateNuspec"
+          DependsOnTargets="InitializeSourceControlInformation">
+
+    <!-- Mirror SDK pack behavior: default CommitId from SourceRevisionId when not explicitly set. -->
+    <PropertyGroup>
+      <CommitId Condition="'$(CommitId)' == ''">$(SourceRevisionId)</CommitId>
+      <NuspecProperties>$(NuspecProperties);COMMITID=$(CommitId)</NuspecProperties>
+      <_AbstractionsPackageVersionTrimmed>$([System.String]::Copy('$(AbstractionsPackageVersion)').Trim())</_AbstractionsPackageVersionTrimmed>
+      <_LoggingPackageVersionTrimmed>$([System.String]::Copy('$(LoggingPackageVersion)').Trim())</_LoggingPackageVersionTrimmed>
+    </PropertyGroup>
+
+    <Error Condition="'$(_AbstractionsPackageVersionTrimmed)' == ''"
+      Text="AbstractionsPackageVersion is required for SqlClient packaging. When packing via build.proj, set -p:PackageVersionAbstractions=&lt;version&gt;; when packing the project directly, set -p:AbstractionsPackageVersion=&lt;version&gt;; otherwise ensure the Abstractions Versions.props import can resolve a value." />
+    <Error Condition="'$(_LoggingPackageVersionTrimmed)' == ''"
+      Text="LoggingPackageVersion is required for SqlClient packaging. When packing via build.proj, set -p:PackageVersionLogging=&lt;version&gt;; when packing the project directly, set -p:LoggingPackageVersion=&lt;version&gt;; otherwise ensure the Logging Versions.props import can resolve a value." />
+
+    <!-- Expand the SqlClientPackNuspec template with the computed package versions. -->
+    <PropertyGroup>
+      <_SqlClientPackNuspecExpandedText>$([System.IO.File]::ReadAllText('$(SqlClientPackNuspecTemplatePath)').Replace('$AbstractionsPackageVersion$','$(AbstractionsPackageVersion)').Replace('$LoggingPackageVersion$','$(LoggingPackageVersion)'))</_SqlClientPackNuspecExpandedText>
+    </PropertyGroup>
+    <WriteLinesToFile File="$(SqlClientPackNuspecGeneratedPath)"
+                      Lines="$(_SqlClientPackNuspecExpandedText)"
+                      Overwrite="true" />
+
+    <!-- Set the NuspecFile property to the generated nuspec file. -->
+    <PropertyGroup>
+      <NuspecFile>$(SqlClientPackNuspecGeneratedPath)</NuspecFile>
+    </PropertyGroup>
+  </Target>
+
   <!-- Embedded resources ============================================== -->
   <ItemGroup>
     <!-- Linker directives to replace UseManagedNetworking with a constant if consumer specifies  -->
@@ -115,7 +235,7 @@
   <!-- References ====================================================== -->
   <!-- Reference to Abstractions -->
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj"
+    <ProjectReference Include="$(AbstractionsProjectPath)"
                       Condition="'$(ReferenceType)' != 'Package'" />
     <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
                       Condition="'$(ReferenceType)' == 'Package'" />
@@ -123,7 +243,7 @@
 
   <!-- Reference to Logging -->
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj"
+    <ProjectReference Include="$(LoggingProjectPath)"
                       Condition="'$(ReferenceType)' != 'Package'" />
     <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging"
                       Condition="'$(ReferenceType)' == 'Package'" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
new file mode 100644
index 0000000000..8f04553f94
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata minClientVersion="2.12">
+    <id>Microsoft.Data.SqlClient</id>
+    <version>$Version$</version>
+    <title>Microsoft.Data.SqlClient</title>
+    <authors>Microsoft</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://aka.ms/sqlclientproject</projectUrl>
+    <icon>dotnet.png</icon>
+    <readme>README.md</readme>
+    <repository type="git" url="https://github.com/dotnet/sqlclient" commit="$COMMITID$" />
+    <description>The current data provider for SQL Server and Azure SQL databases. This has replaced System.Data.SqlClient. These classes provide access to SQL and encapsulate database-specific protocols, including tabular data stream (TDS).
+
+      Commonly Used Types:
+      Microsoft.Data.SqlClient.SqlConnection
+      Microsoft.Data.SqlClient.SqlException
+      Microsoft.Data.SqlClient.SqlParameter
+      Microsoft.Data.SqlClient.SqlDataReader
+      Microsoft.Data.SqlClient.SqlCommand
+      Microsoft.Data.SqlClient.SqlTransaction
+      Microsoft.Data.SqlClient.SqlParameterCollection
+      Microsoft.Data.SqlClient.SqlClientFactory
+
+      When using NuGet 3.x this package requires at least version 3.4.</description>
+    <releaseNotes>https://go.microsoft.com/fwlink/?linkid=2090501</releaseNotes>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    <tags>sqlclient microsoft.data.sqlclient</tags>
+
+    <!--
+      Dependency versions are materialized before dotnet pack runs. They may be
+      supplied explicitly by the caller or resolved from the sibling Versions.props
+      fallback used by the SqlClient pack flow.
+    -->
+
+    <dependencies>
+      <group targetFramework="net462">
+        <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
+        <dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
+        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
+        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
+        <dependency id="System.Buffers" version="4.6.1" />
+        <dependency id="System.Data.Common" version="4.3.0" />
+        <dependency id="System.Diagnostics.DiagnosticSource" version="10.0.3" />
+        <dependency id="System.Memory" version="4.6.3" />
+        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
+        <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
+        <dependency id="System.Text.Json" version="10.0.3" />
+        <dependency id="System.Threading.Channels" version="10.0.3" />
+        <dependency id="System.ValueTuple" version="4.6.2" />
+      </group>
+      <group targetFramework="net8.0">
+        <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
+        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
+        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
+        <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
+        <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
+        <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
+      </group>
+      <group targetFramework="net9.0">
+        <dependency id="Microsoft.Bcl.Cryptography" version="9.0.13" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.13" exclude="Compile" />
+        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
+        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
+        <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
+        <dependency id="System.Configuration.ConfigurationManager" version="9.0.13" exclude="Compile" />
+        <dependency id="System.Security.Cryptography.Pkcs" version="9.0.13" />
+      </group>
+      <group targetFramework="netstandard2.0">
+        <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
+        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
+        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
+        <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
+        <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
+        <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
+        <dependency id="System.Text.Json" version="10.0.3" />
+        <dependency id="System.Threading.Channels" version="10.0.3" />
+      </group>
+    </dependencies>
+
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="mscorlib" targetFramework="net462" />
+      <frameworkAssembly assemblyName="System.Data" targetFramework="net462" />
+    </frameworkAssemblies>
+    <references>
+      <group targetFramework="net462">
+        <reference file="Microsoft.Data.SqlClient.dll" />
+        <reference file="Microsoft.Data.SqlClient.xml" />
+      </group>
+      <group targetFramework="net8.0">
+        <reference file="Microsoft.Data.SqlClient.dll" />
+        <reference file="Microsoft.Data.SqlClient.xml" />
+      </group>
+      <group targetFramework="net9.0">
+        <reference file="Microsoft.Data.SqlClient.dll" />
+        <reference file="Microsoft.Data.SqlClient.xml" />
+      </group>
+      <group targetFramework="netstandard2.0">
+        <reference file="Microsoft.Data.SqlClient.dll" />
+        <reference file="Microsoft.Data.SqlClient.xml" />
+      </group>
+    </references>
+  </metadata>
+  <files>
+    <file src="..\tools\icons\dotnet.png" target="" />
+    <file src="..\src\Microsoft.Data.SqlClient\src\PackageReadme.md" target="README.md" />
+
+    <!--
+      All file paths are relative to the artifacts directory created by the build, so
+      the pack flow sets NuspecBasePath to that artifacts directory.
+
+      The pack flow supplies $ReferenceType$ to indicate which build output layout
+      should be packaged.
+    -->
+
+    <!-- Lib Binaries ================================================== -->
+    <!-- lib/net462 - These contain the implementation -->
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.dll" target="lib\net462\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.pdb" target="lib\net462\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.xml" target="lib\net462\" exclude="" />
+
+    <!-- lib/net462 Localized Resources -->
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\cs\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\de\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\es\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\fr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\it\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ja\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ko\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pl\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pt-BR\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ru\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\tr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hans\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hant\" exclude="" />
+
+    <!-- lib/net8.0 - These are PlatformNotSupportedException assemblies -->
+    <file src="Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.dll" target="lib\net8.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.pdb" target="lib\net8.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.xml" target="lib\net8.0\" exclude="" />
+
+    <!-- lib/net8.0 Localized Resources -->
+    <!-- Note: although these come from windows_nt, they will work on any OS -->
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\cs\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\de\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\es\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\fr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\it\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ja\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ko\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pl\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pt-BR\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ru\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\tr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hans\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hant\" exclude="" />
+
+    <!-- lib/net9.0 - These are PlatformNotSupportedException assemblies -->
+    <file src="Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.dll" target="lib\net9.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.pdb" target="lib\net9.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.xml" target="lib\net9.0\" exclude="" />
+
+    <!-- lib/net9.0 Localized Resources -->
+    <!-- Note: although these come from windows_nt, they will work on any OS -->
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\cs\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\de\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\es\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\fr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\it\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ja\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ko\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pl\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pt-BR\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ru\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\tr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hans\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hant\" exclude="" />
+
+    <!-- lib/netstandard2.0 - These are PlatformNotSupportedException assemblies -->
+    <file src="Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.dll" target="lib\netstandard2.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.pdb" target="lib\netstandard2.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.xml" target="lib\netstandard2.0\" exclude="" />
+
+    <!-- Ref Binaries ================================================== -->
+    <!-- ref/net462 -->
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.dll" target="ref\net462\" exclude="" />
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.xml" target="ref\net462\" exclude="" />
+
+    <!-- ref/net8.0 -->
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.dll" target="ref\net8.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.xml" target="ref\net8.0\" exclude="" />
+
+    <!-- ref/net9.0 -->
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.dll" target="ref\net9.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.xml" target="ref\net9.0\" exclude="" />
+
+    <!-- ref/netstandard2.0 -->
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.dll" target="ref\netstandard2.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.xml" target="ref\netstandard2.0\" exclude="" />
+
+    <!-- Runtime Binaries ============================================== -->
+    <!-- runtimes/win/lib/net462 -->
+    <!-- @TODO: We include the impl version in the lib folder - is the runtimes version necessary? -->
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net462\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net462\" exclude="" />
+
+    <!-- runtimes/unix/lib/net8.0 -->
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net8.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
+
+    <!-- runtimes/win/lib/net8.0 -->
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net8.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net8.0\" exclude="" />
+
+    <!-- runtimes/unix/lib/net9.0 -->
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net9.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net9.0\" exclude="" />
+
+    <!-- runtimes/win/lib/net9.0 -->
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net9.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net9.0\" exclude="" />
+  </files>
+</package>
diff --git a/src/Microsoft.SqlServer.Server/Versions.props b/src/Microsoft.SqlServer.Server/Versions.props
index ec959cafbf..0a342f9426 100644
--- a/src/Microsoft.SqlServer.Server/Versions.props
+++ b/src/Microsoft.SqlServer.Server/Versions.props
@@ -67,9 +67,7 @@
         want a quick build without supplying any parameters.
       -->
       <PropertyGroup>
-        <BuildSuffix Condition="'$(BuildSuffix)' == ''">dev</BuildSuffix>
-
-        <SqlServerPackageVersion>$(SqlServerVersionDefault)-$(BuildSuffix)</SqlServerPackageVersion>
+        <SqlServerPackageVersion>$(SqlServerVersionDefault)-dev</SqlServerPackageVersion>
         <SqlServerFileVersion>$(SqlServerVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</SqlServerFileVersion>
       </PropertyGroup>
     </Otherwise>
diff --git a/tools/scripts/downloadLatestNuget.ps1 b/tools/scripts/downloadLatestNuget.ps1
deleted file mode 100644
index faddf3bb09..0000000000
--- a/tools/scripts/downloadLatestNuget.ps1
+++ /dev/null
@@ -1,27 +0,0 @@
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-# Script: downloadLatestNuget.ps1
-# Author: Keerat Singh
-# Date:   07-Dec-2018
-# Comments: This script downloads the latest NuGet Binary.
-#
-param(
-    [string]$nugetDestPath,
-    [string]$nugetSrcPath="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
-)
-Function DownloadLatestNuget()
-{
-    if(!$nugetDestPath)
-    {
-        $nugetDestPath = (Get-location).ToString() +'\.nuget\'
-    }
-    if (!(Test-Path $nugetDestPath))
-    {
-        New-Item -ItemType Directory -Path $nugetDestPath
-    }
-    Write-Output "Source: $nugetSrcPath"
-    Write-Output "Destination: $nugetDestPath"
-    Start-BitsTransfer -Source $nugetSrcPath -Destination $nugetDestPath\nuget.exe
-}
-DownloadLatestNuget
\ No newline at end of file
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
deleted file mode 100644
index 75aa9e786d..0000000000
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata minClientVersion="2.12">
-    <id>Microsoft.Data.SqlClient</id>
-    <version>1.0.0</version>
-    <title>Microsoft.Data.SqlClient</title>
-    <authors>Microsoft</authors>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <license type="expression">MIT</license>
-    <projectUrl>https://aka.ms/sqlclientproject</projectUrl>
-    <icon>dotnet.png</icon>
-    <readme>README.md</readme>
-    <repository type="git" url="https://github.com/dotnet/sqlclient" commit="$COMMITID$" />
-    <description>The current data provider for SQL Server and Azure SQL databases. This has replaced System.Data.SqlClient. These classes provide access to SQL and encapsulate database-specific protocols, including tabular data stream (TDS).
-
-      Commonly Used Types:
-      Microsoft.Data.SqlClient.SqlConnection
-      Microsoft.Data.SqlClient.SqlException
-      Microsoft.Data.SqlClient.SqlParameter
-      Microsoft.Data.SqlClient.SqlDataReader
-      Microsoft.Data.SqlClient.SqlCommand
-      Microsoft.Data.SqlClient.SqlTransaction
-      Microsoft.Data.SqlClient.SqlParameterCollection
-      Microsoft.Data.SqlClient.SqlClientFactory
-
-      When using NuGet 3.x this package requires at least version 3.4.</description>
-    <releaseNotes>https://go.microsoft.com/fwlink/?linkid=2090501</releaseNotes>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>sqlclient microsoft.data.sqlclient</tags>
-
-    <!--
-      We require the $AbstractionsPackageVersion$ and $LoggingPackageVersion$
-      properties to be supplied on the nuget pack command line to indicate which
-      version of the Abstractions and Logging packages we depend on.
-    -->
-
-    <dependencies>
-      <group targetFramework="net462">
-        <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
-        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
-        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
-        <dependency id="System.Buffers" version="4.6.1" />
-        <dependency id="System.Data.Common" version="4.3.0" />
-        <dependency id="System.Diagnostics.DiagnosticSource" version="10.0.3" />
-        <dependency id="System.Memory" version="4.6.3" />
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
-        <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
-        <dependency id="System.Text.Json" version="10.0.3" />
-        <dependency id="System.Threading.Channels" version="10.0.3" />
-        <dependency id="System.ValueTuple" version="4.6.2" />
-      </group>
-      <group targetFramework="net8.0">
-        <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
-        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
-        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
-        <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
-        <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
-        <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
-      </group>
-      <group targetFramework="net9.0">
-        <dependency id="Microsoft.Bcl.Cryptography" version="9.0.13" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.13" exclude="Compile" />
-        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
-        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
-        <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
-        <dependency id="System.Configuration.ConfigurationManager" version="9.0.13" exclude="Compile" />
-        <dependency id="System.Security.Cryptography.Pkcs" version="9.0.13" />
-      </group>
-      <group targetFramework="netstandard2.0">
-        <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
-        <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
-        <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
-        <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
-        <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
-        <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
-        <dependency id="System.Text.Json" version="10.0.3" />
-        <dependency id="System.Threading.Channels" version="10.0.3" />
-      </group>
-    </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="mscorlib" targetFramework="net462" />
-      <frameworkAssembly assemblyName="System.Data" targetFramework="net462" />
-    </frameworkAssemblies>
-    <references>
-      <group targetFramework="net462">
-        <reference file="Microsoft.Data.SqlClient.dll" />
-        <reference file="Microsoft.Data.SqlClient.xml" />
-      </group>
-      <group targetFramework="net8.0">
-        <reference file="Microsoft.Data.SqlClient.dll" />
-        <reference file="Microsoft.Data.SqlClient.xml" />
-      </group>
-      <group targetFramework="net9.0">
-        <reference file="Microsoft.Data.SqlClient.dll" />
-        <reference file="Microsoft.Data.SqlClient.xml" />
-      </group>
-      <group targetFramework="netstandard2.0">
-        <reference file="Microsoft.Data.SqlClient.dll" />
-        <reference file="Microsoft.Data.SqlClient.xml" />
-      </group>
-    </references>
-  </metadata>
-  <files>
-    <file src="..\icons\dotnet.png" target="" />
-    <file src="..\..\src\Microsoft.Data.SqlClient\src\PackageReadme.md" target="README.md" />
-
-    <!--
-      We require the $ReferenceType$ property to be supplied on the nuget pack
-      command line to indicate where the DLLs are.
-    -->
-
-    <!-- Lib Binaries ================================================== -->
-    <!-- lib/net462 - These contain the implementation -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.dll" target="lib\net462\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.pdb" target="lib\net462\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.xml" target="lib\net462\" exclude="" />
-
-    <!-- lib/net462 Localized Resources -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\cs\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\de\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\es\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\fr\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\it\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ja\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ko\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pl\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pt-BR\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ru\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\tr\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hans\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hant\" exclude="" />
-
-    <!-- lib/net8.0 - These are PlatformNotSupportedException assemblies -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.dll" target="lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.pdb" target="lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.xml" target="lib\net8.0\" exclude="" />
-
-    <!-- lib/net8.0 Localized Resources -->
-    <!-- Note: although these come from windows_nt, they will work on any OS -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\cs\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\de\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\es\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\fr\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\it\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ja\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ko\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pl\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pt-BR\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ru\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\tr\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hans\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hant\" exclude="" />
-
-    <!-- lib/net9.0 - These are PlatformNotSupportedException assemblies -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.dll" target="lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.pdb" target="lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.xml" target="lib\net9.0\" exclude="" />
-
-    <!-- lib/net9.0 Localized Resources -->
-    <!-- Note: although these come from windows_nt, they will work on any OS -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\cs\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\de\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\es\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\fr\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\it\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ja\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ko\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pl\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pt-BR\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ru\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\tr\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hans\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hant\" exclude="" />
-
-    <!-- lib/netstandard2.0 - These are PlatformNotSupportedException assemblies -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.dll" target="lib\netstandard2.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.pdb" target="lib\netstandard2.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.xml" target="lib\netstandard2.0\" exclude="" />
-
-    <!-- Ref Binaries ================================================== -->
-    <!-- ref/net462 -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.dll" target="ref\net462\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.xml" target="ref\net462\" exclude="" />
-
-    <!-- ref/net8.0 -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.dll" target="ref\net8.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.xml" target="ref\net8.0\" exclude="" />
-
-    <!-- ref/net9.0 -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.dll" target="ref\net9.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.xml" target="ref\net9.0\" exclude="" />
-
-    <!-- ref/netstandard2.0 -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.dll" target="ref\netstandard2.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.xml" target="ref\netstandard2.0\" exclude="" />
-
-    <!-- Runtime Binaries ============================================== -->
-    <!-- runtimes/win/lib/net462 -->
-    <!-- @TODO: We include the impl version in the lib folder - is the runtimes version necessary? -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net462\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net462\" exclude="" />
-
-    <!-- runtimes/unix/lib/net8.0 -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
-
-    <!-- runtimes/win/lib/net8.0 -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net8.0\" exclude="" />
-
-    <!-- runtimes/unix/lib/net9.0 -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net9.0\" exclude="" />
-
-    <!-- runtimes/win/lib/net9.0 -->
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net9.0\" exclude="" />
-  </files>
-</package>

From 3a3181aa44d53c460a767fb27cf6f9e1b0e12f7c Mon Sep 17 00:00:00 2001
From: Shreya Laxminarayana Rao
 <147193825+ShreyaLaxminarayan@users.noreply.github.com>
Date: Sat, 9 May 2026 03:50:02 +0530
Subject: [PATCH 092/298] Fix flaky SequentialAccess test with dynamic expected
 value (#4224)

---
 .../SQL/DataStreamTest/DataStreamTest.cs       | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
index 01c539043c..a49e14de6e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
@@ -961,6 +961,7 @@ private static void SequentialAccess(string connectionString)
             long cb = 0;
             long di = 0;
             long cbTotal = 0;
+            long expectedTotal = 0;
             object o;
             int i;
             SqlBinary sqlbin;
@@ -968,6 +969,15 @@ private static void SequentialAccess(string connectionString)
             using (SqlConnection conn = new SqlConnection(connectionString))
             {
                 conn.Open();
+                // Compute the expected total bytes independently of the C# APIs under test in order to compare.
+                //The inner SELECT generates the XML, CAST converts it to a Unicode string, LEN() * 2 matches s.Length * 2 in C# since UTF-16 uses 2 bytes per character.
+                // SUM() totals across all rows, matching the loop below.
+                using (SqlCommand cmdExpected = new SqlCommand("SELECT SUM(LEN(CAST(xml_data AS NVARCHAR(MAX))) * 2) FROM " +
+                                                "(SELECT CAST((SELECT * FROM orders FOR XML AUTO) AS NVARCHAR(MAX)) AS xml_data) t", conn))
+                {
+                    expectedTotal = (long)cmdExpected.ExecuteScalar();
+                }
+
                 using (SqlCommand cmd = new SqlCommand("select * from orders for xml auto", conn))
                 {
                     // Simple reads
@@ -982,7 +992,7 @@ private static void SequentialAccess(string connectionString)
                             }
                         } while (reader.NextResult());
                     }
-                    DataTestUtility.AssertEqualsWithDescription((long)536198, cbTotal, "FAILED: cbTotal result did not have expected value");
+                    DataTestUtility.AssertEqualsWithDescription(expectedTotal, cbTotal, "FAILED: cbTotal result did not have expected value");
 
                     // Simple GetFieldValue<T>
                     cbTotal = 0;
@@ -997,7 +1007,7 @@ private static void SequentialAccess(string connectionString)
                             }
                         } while (reader.NextResult());
                     }
-                    DataTestUtility.AssertEqualsWithDescription((long)536198, cbTotal, "FAILED: cbTotal result did not have expected value");
+                    DataTestUtility.AssertEqualsWithDescription(expectedTotal, cbTotal, "FAILED: cbTotal result did not have expected value");
 
                     // Simple GetFieldValueAsync<T>
                     cbTotal = 0;
@@ -1012,7 +1022,7 @@ private static void SequentialAccess(string connectionString)
                             }
                         } while (reader.NextResult());
                     }
-                    DataTestUtility.AssertEqualsWithDescription((long)536198, cbTotal, "FAILED: cbTotal result did not have expected value");
+                    DataTestUtility.AssertEqualsWithDescription(expectedTotal, cbTotal, "FAILED: cbTotal result did not have expected value");
 
                     // test sequential access reading everything
                     cbTotal = 0;
@@ -1036,7 +1046,7 @@ private static void SequentialAccess(string connectionString)
                             }
                         } while (reader.NextResult());
                     }
-                    DataTestUtility.AssertEqualsWithDescription((long)536198, cbTotal, "FAILED: cbTotal result did not have expected value");
+                    DataTestUtility.AssertEqualsWithDescription(expectedTotal, cbTotal, "FAILED: cbTotal result did not have expected value");
                 }
 
                 // Test IsDBNull

From dc19dcda53f669f944cb0695775ba6b7138c714d Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Wed, 13 May 2026 00:54:45 +1000
Subject: [PATCH 093/298] remove redundant Attribute( suffixes (#4158)

Co-authored-by: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
---
 .../DbConnectionString.netfx.cs               |  8 ++--
 .../Data/SqlClient/SqlCommandBuilder.cs       | 14 +++----
 .../Microsoft/Data/SqlClient/SqlConnection.cs | 22 +++++-----
 .../Data/SqlClient/SqlDataAdapter.cs          | 24 +++++------
 .../Microsoft/Data/SqlClient/SqlDataReader.cs |  4 +-
 .../Microsoft/Data/SqlClient/SqlDependency.cs | 40 +++++++++----------
 .../Microsoft/Data/SqlClient/SqlException.cs  |  6 +--
 .../Data/SqlClient/SqlParameterCollection.cs  |  6 +--
 8 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionString.netfx.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionString.netfx.cs
index 841369423b..ff6659745a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionString.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionString.netfx.cs
@@ -326,7 +326,7 @@ private void ValidateCombinedSet(DbConnectionString componentSet, DbConnectionSt
                         HashSet<string> component = new HashSet<string>(componentSet._restrictionValues);
                         combined.ExceptWith(component);
                         Debug.Assert(combined.Count == 0, "Combined set allows values not allowed by component set");
-#endif 
+#endif
                     }
                     else if (combinedSet._behavior == KeyRestrictionBehavior.PreventUsage)
                     {
@@ -350,7 +350,7 @@ private void ValidateCombinedSet(DbConnectionString componentSet, DbConnectionSt
                         HashSet<string> component = new HashSet<string>(componentSet._restrictionValues);
                         combined.IntersectWith(component);
                         Debug.Assert(combined.Count == 0, "Combined values allows values prevented by component set");
-#endif 
+#endif
                     }
                     else if (combinedSet._behavior == KeyRestrictionBehavior.PreventUsage)
                     {
@@ -362,7 +362,7 @@ private void ValidateCombinedSet(DbConnectionString componentSet, DbConnectionSt
                         HashSet<string> component = new HashSet<string>(componentSet._restrictionValues);
                         component.IntersectWith(combined);
                         Debug.Assert(component.Count == 0, "Combined values does not prevent all of the values prevented by the component set");
-#endif 
+#endif
                     }
                     else
                     {
@@ -564,7 +564,7 @@ static internal string[] RemoveDuplicates(string[] restrictions)
             return restrictions;
         }
 
-        [ConditionalAttribute("DEBUG")]
+        [Conditional("DEBUG")]
         private static void Verify(string[] restrictionValues)
         {
             if (restrictionValues != null)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandBuilder.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandBuilder.cs
index 4ba8f27d79..e2296b1635 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandBuilder.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandBuilder.cs
@@ -37,7 +37,7 @@ public SqlCommandBuilder(SqlDataAdapter adapter) : this()
         /// <devnote>SqlServer only supports CatalogLocation.Start</devnote>
         [
         Browsable(false),
-        EditorBrowsableAttribute(EditorBrowsableState.Never),
+        EditorBrowsable(EditorBrowsableState.Never),
         DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),
         ]
         public override CatalogLocation CatalogLocation
@@ -59,7 +59,7 @@ public override CatalogLocation CatalogLocation
         /// <devnote>SqlServer only supports '.'</devnote>
         [
         Browsable(false),
-        EditorBrowsableAttribute(EditorBrowsableState.Never),
+        EditorBrowsable(EditorBrowsableState.Never),
         DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),
         ]
         public override string CatalogSeparator
@@ -80,8 +80,8 @@ public override string CatalogSeparator
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommandBuilder.xml' path='docs/members[@name="SqlCommandBuilder"]/DataAdapter/*'/>
         [
         DefaultValue(null),
-        ResCategoryAttribute(nameof(Strings.DataCategory_Update)),
-        ResDescriptionAttribute(nameof(Strings.SqlCommandBuilder_DataAdapter)),
+        ResCategory(nameof(Strings.DataCategory_Update)),
+        ResDescription(nameof(Strings.SqlCommandBuilder_DataAdapter)),
         ]
         public new SqlDataAdapter DataAdapter
         {
@@ -99,7 +99,7 @@ public override string CatalogSeparator
         /// <devnote>SqlServer only supports '.'</devnote>
         [
         Browsable(false),
-        EditorBrowsableAttribute(EditorBrowsableState.Never),
+        EditorBrowsable(EditorBrowsableState.Never),
         DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),
         ]
         public override string QuotePrefix
@@ -121,7 +121,7 @@ public override string QuotePrefix
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommandBuilder.xml' path='docs/members[@name="SqlCommandBuilder"]/QuoteSuffix/*'/>
         [
         Browsable(false),
-        EditorBrowsableAttribute(EditorBrowsableState.Never),
+        EditorBrowsable(EditorBrowsableState.Never),
         DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),
         ]
         public override string QuoteSuffix
@@ -143,7 +143,7 @@ public override string QuoteSuffix
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommandBuilder.xml' path='docs/members[@name="SqlCommandBuilder"]/SchemaSeparator/*'/>
         [
         Browsable(false),
-        EditorBrowsableAttribute(EditorBrowsableState.Never),
+        EditorBrowsable(EditorBrowsableState.Never),
         DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),
         ]
         public override string SchemaSeparator
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index aa9d8edc06..8b06a4f90f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -163,19 +163,19 @@ public SqlRetryLogicBaseProvider RetryLogicProvider
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ColumnEncryptionKeyCacheTtl/*' />
         [DefaultValue(null)]
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Data))]
+        [ResCategory(nameof(Strings.DataCategory_Data))]
         [ResDescription(nameof(Strings.TCE_SqlConnection_ColumnEncryptionKeyCacheTtl))]
         public static TimeSpan ColumnEncryptionKeyCacheTtl { get; set; } = TimeSpan.FromHours(2);
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ColumnEncryptionQueryMetadataCacheEnabled/*' />
         [DefaultValue(null)]
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Data))]
+        [ResCategory(nameof(Strings.DataCategory_Data))]
         [ResDescription(nameof(Strings.TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled))]
         public static bool ColumnEncryptionQueryMetadataCacheEnabled { get; set; } = true;
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ColumnEncryptionTrustedMasterKeyPaths/*' />
         [DefaultValue(null)]
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Data))]
+        [ResCategory(nameof(Strings.DataCategory_Data))]
         [ResDescription(nameof(Strings.TCE_SqlConnection_TrustedColumnMasterKeyPaths))]
         public static IDictionary<string, IList<string>> ColumnEncryptionTrustedMasterKeyPaths => _ColumnEncryptionTrustedMasterKeyPaths;
 
@@ -265,7 +265,7 @@ private SqlConnection(SqlConnection connection)
 
         internal static bool TryGetSystemColumnEncryptionKeyStoreProvider(string keyStoreName, out SqlColumnEncryptionKeyStoreProvider provider)
         {
-            return s_systemColumnEncryptionKeyStoreProviders.TryGetValue(keyStoreName, out provider); 
+            return s_systemColumnEncryptionKeyStoreProviders.TryGetValue(keyStoreName, out provider);
         }
 
         /// <summary>
@@ -508,7 +508,7 @@ private void CacheConnectionStringProperties()
         //  connect the parser to the object.
         //  if there is no parser at this time we need to connect it after creation.
         [DefaultValue(false)]
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Data))]
+        [ResCategory(nameof(Strings.DataCategory_Data))]
         [ResDescription(nameof(Strings.SqlConnection_StatisticsEnabled))]
         public bool StatisticsEnabled
         {
@@ -642,9 +642,9 @@ internal int ConnectRetryInterval
 #pragma warning disable 618 // ignore obsolete warning about RecommendedAsConfigurable to use SettingsBindableAttribute
         [RecommendedAsConfigurable(true)]
 #pragma warning restore 618
-        [SettingsBindableAttribute(true)]
+        [SettingsBindable(true)]
         [RefreshProperties(RefreshProperties.All)]
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Data))]
+        [ResCategory(nameof(Strings.DataCategory_Data))]
         [ResDescription(nameof(Strings.SqlConnection_ConnectionString))]
         public override string ConnectionString
         {
@@ -1190,7 +1190,7 @@ protected override DbProviderFactory DbProviderFactory
         //
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/InfoMessage/*' />
-        [ResCategoryAttribute(nameof(Strings.DataCategory_InfoMessage))]
+        [ResCategory(nameof(Strings.DataCategory_InfoMessage))]
         [ResDescription(nameof(Strings.DbConnection_InfoMessage))]
 #if NET
         public event SqlInfoMessageEventHandler InfoMessage;
@@ -1320,7 +1320,7 @@ public override void ChangeDatabase(string database)
             SqlStatistics statistics = null;
             RepairInnerConnection();
             SqlClientEventSource.Log.TryCorrelationTraceEvent("SqlConnection.ChangeDatabase | API | Correlation | Object Id {0}, Activity Id {1}, Database {2}", ObjectID, ActivityCorrelator.Current, database);
-            
+
             try
             {
                 statistics = SqlStatistics.StartTimer(Statistics);
@@ -1396,7 +1396,7 @@ public override void Close()
 
                 SqlStatistics statistics = null;
                 Exception e = null;
-                
+
                 try
                 {
                     statistics = SqlStatistics.StartTimer(Statistics);
@@ -1889,7 +1889,7 @@ internal void Abort(Exception e)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/OpenAsync/*' />
-        public override Task OpenAsync(CancellationToken cancellationToken) 
+        public override Task OpenAsync(CancellationToken cancellationToken)
             => OpenAsync(SqlConnectionOverrides.None, cancellationToken);
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/OpenAsyncWithOverrides/*' />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs
index 28c3c965ec..3b07ab0706 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs
@@ -66,8 +66,8 @@ private SqlDataAdapter(SqlDataAdapter from) : base(from)
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/DeleteCommand/*' />
         [DefaultValue(null)]
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Update))]
-        [ResDescriptionAttribute(nameof(Strings.DbDataAdapter_DeleteCommand))]
+        [ResCategory(nameof(Strings.DataCategory_Update))]
+        [ResDescription(nameof(Strings.DbDataAdapter_DeleteCommand))]
         new public SqlCommand DeleteCommand
         {
             get { return _deleteCommand; }
@@ -83,8 +83,8 @@ IDbCommand IDbDataAdapter.DeleteCommand
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/InsertCommand/*' />
         [DefaultValue(null)]
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Update))]
-        [ResDescriptionAttribute(nameof(Strings.DbDataAdapter_InsertCommand))]
+        [ResCategory(nameof(Strings.DataCategory_Update))]
+        [ResDescription(nameof(Strings.DbDataAdapter_InsertCommand))]
         new public SqlCommand InsertCommand
         {
             get { return _insertCommand; }
@@ -100,8 +100,8 @@ IDbCommand IDbDataAdapter.InsertCommand
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/SelectCommand/*' />
         [DefaultValue(null)]
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Fill))]
-        [ResDescriptionAttribute(nameof(Strings.DbDataAdapter_SelectCommand))]
+        [ResCategory(nameof(Strings.DataCategory_Fill))]
+        [ResDescription(nameof(Strings.DbDataAdapter_SelectCommand))]
         new public SqlCommand SelectCommand
         {
             get { return _selectCommand; }
@@ -117,8 +117,8 @@ IDbCommand IDbDataAdapter.SelectCommand
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/UpdateCommand/*' />
         [DefaultValue(null)]
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Update))]
-        [ResDescriptionAttribute(nameof(Strings.DbDataAdapter_UpdateCommand))]
+        [ResCategory(nameof(Strings.DataCategory_Update))]
+        [ResDescription(nameof(Strings.DbDataAdapter_UpdateCommand))]
         new public SqlCommand UpdateCommand
         {
             get { return _updateCommand; }
@@ -243,8 +243,8 @@ protected override RowUpdatingEventArgs CreateRowUpdatingEvent(DataRow dataRow,
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/RowUpdated/*' />
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Update))]
-        [ResDescriptionAttribute(nameof(Strings.DbDataAdapter_RowUpdated))]
+        [ResCategory(nameof(Strings.DataCategory_Update))]
+        [ResDescription(nameof(Strings.DbDataAdapter_RowUpdated))]
         public event SqlRowUpdatedEventHandler RowUpdated
         {
             add
@@ -258,8 +258,8 @@ public event SqlRowUpdatedEventHandler RowUpdated
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/RowUpdating/*' />
-        [ResCategoryAttribute(nameof(Strings.DataCategory_Update))]
-        [ResDescriptionAttribute(nameof(Strings.DbDataAdapter_RowUpdating))]
+        [ResCategory(nameof(Strings.DataCategory_Update))]
+        [ResDescription(nameof(Strings.DbDataAdapter_RowUpdating))]
         public event SqlRowUpdatingEventHandler RowUpdating
         {
             add
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index 649c73147c..e316bb3c08 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -2075,7 +2075,7 @@ override public TextReader GetTextReader(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetChar/*' />
-        [EditorBrowsableAttribute(EditorBrowsableState.Never)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         override public char GetChar(int i)
         {
             throw ADP.NotSupported();
@@ -2388,7 +2388,7 @@ internal long GetStreamingXmlChars(int i, long dataIndex, char[] buffer, int buf
 
 #if NETFRAMEWORK
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/System.Data.IDataRecord.GetData/*' />
-        [EditorBrowsableAttribute(EditorBrowsableState.Never)] // MDAC 69508
+        [EditorBrowsable(EditorBrowsableState.Never)] // MDAC 69508
         IDataReader IDataRecord.GetData(int i)
         {
             throw ADP.NotSupported();
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
index 9304f3051a..836fbb7dd4 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
@@ -236,7 +236,7 @@ public SqlClientObjRef(SqlDependencyProcessDispatcher dispatcher) : base()
         private List<EventContextPair> _eventList = new();
         private readonly object _eventHandlerLock = new(); // Lock for event serialization.
         // Track the time that this dependency should time out. If the server didn't send a change
-        // notification or a time-out before this point then the client will perform a client-side 
+        // notification or a time-out before this point then the client will perform a client-side
         // timeout.
         private DateTime _expirationTime = DateTime.MaxValue;
         // Used for invalidation of dependencies based on which servers they rely upon.
@@ -247,8 +247,8 @@ public SqlClientObjRef(SqlDependencyProcessDispatcher dispatcher) : base()
 
         private static readonly object s_startStopLock = new();
         private static readonly string s_appDomainKey = Guid.NewGuid().ToString();
-        // Hashtable containing all information to match from a server, user, database triple to the service started for that 
-        // triple.  For each server, there can be N users.  For each user, there can be N databases.  For each server, user, 
+        // Hashtable containing all information to match from a server, user, database triple to the service started for that
+        // triple.  For each server, there can be N users.  For each user, there can be N databases.  For each server, user,
         // database, there can only be one service.
         private static readonly Dictionary<string, Dictionary<IdentityUserNamePair, List<DatabaseServicePair>>> s_serverUserHash =
                    new(StringComparer.OrdinalIgnoreCase);
@@ -257,7 +257,7 @@ public SqlClientObjRef(SqlDependencyProcessDispatcher dispatcher) : base()
         // The following two strings are used for AppDomain.CreateInstance.
         private static readonly string s_assemblyName = (typeof(SqlDependencyProcessDispatcher)).Assembly.FullName;
         private static readonly string s_typeName = (typeof(SqlDependencyProcessDispatcher)).FullName;
-#endif 
+#endif
 
         // EventSource members
         private static int s_objectTypeCount; // EventSourceCounter counter
@@ -266,7 +266,7 @@ public SqlClientObjRef(SqlDependencyProcessDispatcher dispatcher) : base()
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDependency.xml' path='docs/members[@name="SqlDependency"]/ctor2/*' />
         // Constructors
 #if NETFRAMEWORK
-        [System.Security.Permissions.HostProtectionAttribute(ExternalThreading = true)]
+        [HostProtection(ExternalThreading = true)]
 #endif
         public SqlDependency() : this(null, null, SQL.SqlDependencyTimeoutDefault)
         {
@@ -274,7 +274,7 @@ public SqlDependency() : this(null, null, SQL.SqlDependencyTimeoutDefault)
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDependency.xml' path='docs/members[@name="SqlDependency"]/ctorCommand/*' />
 #if NETFRAMEWORK
-        [System.Security.Permissions.HostProtectionAttribute(ExternalThreading = true)]
+        [HostProtection(ExternalThreading = true)]
 #endif
         public SqlDependency(SqlCommand command) : this(command, null, SQL.SqlDependencyTimeoutDefault)
         {
@@ -313,8 +313,8 @@ public SqlDependency(SqlCommand command, string options, int timeout)
 /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDependency.xml' path='docs/members[@name="SqlDependency"]/HasChanges/*' />
 #if NETFRAMEWORK
         [
-        ResCategoryAttribute(nameof(Strings.DataCategory_Data)),
-        ResDescriptionAttribute(nameof(Strings.SqlDependency_HasChanges))
+        ResCategory(nameof(Strings.DataCategory_Data)),
+        ResDescription(nameof(Strings.SqlDependency_HasChanges))
         ]
 #endif
         public bool HasChanges => _dependencyFired;
@@ -322,8 +322,8 @@ public SqlDependency(SqlCommand command, string options, int timeout)
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDependency.xml' path='docs/members[@name="SqlDependency"]/Id/*' />
 #if NETFRAMEWORK
         [
-        ResCategoryAttribute(nameof(Strings.DataCategory_Data)),
-        ResDescriptionAttribute(nameof(Strings.SqlDependency_Id))
+        ResCategory(nameof(Strings.DataCategory_Data)),
+        ResDescription(nameof(Strings.SqlDependency_Id))
         ]
 #endif
         public string Id => _id;
@@ -344,8 +344,8 @@ public SqlDependency(SqlCommand command, string options, int timeout)
 /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDependency.xml' path='docs/members[@name="SqlDependency"]/OnChange/*' />
 #if NETFRAMEWORK
         [
-        ResCategoryAttribute(nameof(Strings.DataCategory_Data)),
-        ResDescriptionAttribute(nameof(Strings.SqlDependency_OnChange))
+        ResCategory(nameof(Strings.DataCategory_Data)),
+        ResDescription(nameof(Strings.SqlDependency_OnChange))
         ]
 #endif
         public event OnChangeEventHandler OnChange
@@ -422,8 +422,8 @@ public event OnChangeEventHandler OnChange
 /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDependency.xml' path='docs/members[@name="SqlDependency"]/AddCommandDependency/*' />
 #if NETFRAMEWORK
         [
-        ResCategoryAttribute(nameof(Strings.DataCategory_Data)),
-        ResDescriptionAttribute(nameof(Strings.SqlDependency_AddCommandDependency))
+        ResCategory(nameof(Strings.DataCategory_Data)),
+        ResDescription(nameof(Strings.SqlDependency_AddCommandDependency))
         ]
 #endif
         public void AddCommandDependency(SqlCommand command)
@@ -466,9 +466,9 @@ private static void ObtainProcessDispatcher()
 #if DEBUG       // Possibly expensive, limit to debug.
                 SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependency.ObtainProcessDispatcher|DEP> AppDomain.CurrentDomain.FriendlyName: {0}", AppDomain.CurrentDomain.FriendlyName);
 #endif // DEBUG
-                
+
                 _AppDomain masterDomain = AppDomain.CurrentDomain;
-                
+
                 ObjectHandle handle = CreateProcessDispatcher(masterDomain);
                 if (handle != null)
                 {
@@ -484,9 +484,9 @@ private static void ObtainProcessDispatcher()
                             SqlClientObjRef objRef = new(s_processDispatcher);
                             DataContractSerializer serializer = new(objRef.GetType());
                             GetSerializedObject(objRef, serializer, stream);
-                            
+
                             // Native will be forced to synchronize and not overwrite.
-                            SqlDependencyProcessDispatcherStorage.NativeSetData(stream.ToArray()); 
+                            SqlDependencyProcessDispatcherStorage.NativeSetData(stream.ToArray());
                         }
                     }
                     else
@@ -914,7 +914,7 @@ private static void RemoveFromServerUserHash(string server, IdentityUserNamePair
 
         internal static string GetDefaultComposedOptions(string server, string failoverServer, IdentityUserNamePair identityUser, string database)
         {
-            // Server must be an exact match, but user and database only needs to match exactly if there is more than one 
+            // Server must be an exact match, but user and database only needs to match exactly if there is more than one
             // for the given user or database passed.  That is ambiguous and we must fail.
             long scopeID = SqlClientEventSource.Log.TryNotificationScopeEnterEvent("<sc.SqlDependency.GetDefaultComposedOptions|DEP> server: '{0}', failoverServer: '{1}', database: '{2}'", server, failoverServer, database);
             try
@@ -1014,7 +1014,7 @@ internal static string GetDefaultComposedOptions(string server, string failoverS
 
         // Internal Methods
 
-        // Called by SqlCommand upon execution of a SqlNotificationRequest class created by this dependency.  We 
+        // Called by SqlCommand upon execution of a SqlNotificationRequest class created by this dependency.  We
         // use this list for a reverse lookup based on server.
         internal void AddToServerList(string server)
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs
index a1735fabe7..d06a02413f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs
@@ -25,15 +25,15 @@ public sealed partial class SqlException : System.Data.Common.DbException
 
         private readonly SqlErrorCollection _errors;
 #if NETFRAMEWORK
-        [System.Runtime.Serialization.OptionalFieldAttribute(VersionAdded = 4)]
+        [OptionalField(VersionAdded = 4)]
 #endif
         private Guid _clientConnectionId = Guid.Empty;
 #if NETFRAMEWORK
-        [System.Runtime.Serialization.IgnoreDataMember]
+        [IgnoreDataMember]
 #endif
         private SqlBatchCommand _batchCommand;
 #if NETFRAMEWORK
-        [System.Runtime.Serialization.IgnoreDataMember]
+        [IgnoreDataMember]
 #endif
         // Do not serialize this field! It is used to indicate that no reconnection attempts are required
         internal bool _doNotReconnect = false;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameterCollection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameterCollection.cs
index 80f9540a9a..e79edb9092 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameterCollection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameterCollection.cs
@@ -15,7 +15,7 @@
 // New attributes that are designed to work with Microsoft.Data.SqlClient and are publicly documented should be included in future.
 namespace Microsoft.Data.SqlClient
 {
-    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlParameterCollection.xml' path='docs/members[@name="SqlParameterCollection"]/SqlParameterCollection/*' />    
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlParameterCollection.xml' path='docs/members[@name="SqlParameterCollection"]/SqlParameterCollection/*' />
     [
     ListBindable(false)
     ]
@@ -107,8 +107,8 @@ public SqlParameter Add(SqlParameter value)
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlParameterCollection.xml' path='docs/members[@name="SqlParameterCollection"]/SyncRoot/*' />
         public override object SyncRoot => ((System.Collections.ICollection)InnerList).SyncRoot;
 
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlParameterCollection.xml' path='docs/members[@name="SqlParameterCollection"]/AddValue2/*' />      
-        [EditorBrowsableAttribute(EditorBrowsableState.Never)]
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlParameterCollection.xml' path='docs/members[@name="SqlParameterCollection"]/AddValue2/*' />
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public override int Add(object value)
         {
             IsDirty = true;

From ef6aacfa970eaf5fbb11bb4d809eeb0ca99cba90 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 12 May 2026 16:24:25 -0300
Subject: [PATCH 094/298] Fix TryOpenInner InvalidCast race and add unit
 regression tests (#3314) (#4179)

---
 .../Microsoft/Data/SqlClient/SqlConnection.cs |  13 +-
 .../SqlConnectionConcurrentOpenTests.cs       | 113 ++++++++++++++++++
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index 8b06a4f90f..9021d3e259 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -2242,7 +2242,18 @@ private bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry)
             }
             // does not require GC.KeepAlive(this) because of ReRegisterForFinalize below.
 
-            var tdsInnerConnection = (SqlConnectionInternal)InnerConnection;
+            // Capture InnerConnection once into a local to avoid a TOCTOU race: another thread
+            // concurrently calling Open() on the same SqlConnection instance can change
+            // _innerConnection to DbConnectionClosedConnecting between the TryOpenConnection()
+            // call above and the cast below. Without this local capture the second read of
+            // InnerConnection may return DbConnectionClosedConnecting, which is not assignable
+            // to SqlConnectionInternal and would produce an opaque InvalidCastException.
+            // See GitHub issue #3314.
+            var innerConnection = InnerConnection;
+            if (innerConnection is not SqlConnectionInternal tdsInnerConnection)
+            {
+                throw ADP.ConnectionAlreadyOpen(innerConnection.State);
+            }
 
             Debug.Assert(tdsInnerConnection.Parser != null, "Where's the parser?");
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
new file mode 100644
index 0000000000..c38a30d317
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
@@ -0,0 +1,113 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.Connection;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.Microsoft.Data.SqlClient
+{
+    /// <summary>
+    /// Regression tests for GitHub issue #3314.
+    ///
+    /// Root cause: TryOpenInner() read InnerConnection twice - once for TryOpenConnection() and
+    /// again for the cast to SqlConnectionInternal. Between those two reads another thread could
+    /// change _innerConnection to DbConnectionClosedConnecting, which is not assignable to
+    /// SqlConnectionInternal, causing an opaque InvalidCastException.
+    ///
+    /// Fix: InnerConnection is now captured into a local variable once; if it is not a
+    /// SqlConnectionInternal an InvalidOperationException with a descriptive message is thrown
+    /// instead of an InvalidCastException.
+    /// </summary>
+    public class SqlConnectionConcurrentOpenTests
+    {
+        private static readonly MethodInfo s_tryOpenInner = typeof(SqlConnection)
+            .GetMethod("TryOpenInner", BindingFlags.Instance | BindingFlags.NonPublic)!;
+
+        private static DbConnectionInternal GetConnectingSingleton()
+        {
+            return DbConnectionClosedConnecting.SingletonInstance;
+        }
+
+        private static void ForceInnerConnection(SqlConnection connection, DbConnectionInternal innerConnectionValue)
+        {
+            connection.SetInnerConnectionTo(innerConnectionValue);
+        }
+
+        private static bool InvokeTryOpenInner(SqlConnection connection, TaskCompletionSource<DbConnectionInternal> retry)
+        {
+            try
+            {
+                return (bool)s_tryOpenInner.Invoke(connection, [retry])!;
+            }
+            catch (TargetInvocationException tie) when (tie.InnerException != null)
+            {
+                throw tie.InnerException;
+            }
+        }
+
+        [Fact]
+        public void InnerConnection_DbConnectionClosedConnecting_IsNotAssignableToSqlConnectionInternal()
+        {
+            DbConnectionInternal connectingSingleton = GetConnectingSingleton();
+
+            Assert.False(
+                connectingSingleton is SqlConnectionInternal,
+                "DbConnectionClosedConnecting must NOT be assignable to SqlConnectionInternal. " +
+                "If it were, the race condition in #3314 would not manifest.");
+        }
+
+        [Fact]
+        public void InnerConnection_InConnectingState_ReportsConnectingState()
+        {
+            DbConnectionInternal connectingSingleton = GetConnectingSingleton();
+
+            var connection = new SqlConnection("Data Source=localhost");
+            ForceInnerConnection(connection, connectingSingleton);
+
+            Assert.Equal(ConnectionState.Connecting, connection.State);
+        }
+
+        [Fact]
+        public void Open_WhenAlreadyConnecting_ThrowsInvalidOperation()
+        {
+            DbConnectionInternal connectingSingleton = GetConnectingSingleton();
+
+            var connection = new SqlConnection("Data Source=localhost");
+            ForceInnerConnection(connection, connectingSingleton);
+
+            Assert.Throws<InvalidOperationException>(() => connection.Open());
+        }
+
+        [Fact]
+        public void TryOpenInner_WhenInnerConnectionRacesToNonSqlConnectionInternalState_ThrowsInvalidOperation_NotInvalidCast()
+        {
+            DbConnectionInternal initialConnectingState = GetConnectingSingleton();
+            DbConnectionInternal racedNonSqlConnectionInternalState = DbConnectionOpenBusy.SingletonInstance;
+
+            var connection = new SqlConnection("Data Source=localhost");
+            ForceInnerConnection(connection, initialConnectingState);
+
+            TaskCompletionSource<DbConnectionInternal> completedRetry = new();
+            completedRetry.SetResult(racedNonSqlConnectionInternalState);
+
+            Exception ex = Assert.ThrowsAny<Exception>(() =>
+            {
+                InvokeTryOpenInner(connection, completedRetry);
+            });
+
+            Assert.True(
+                ex is InvalidOperationException,
+                $"Expected InvalidOperationException but got {ex.GetType().Name}: {ex.Message}. " +
+                "The fix for #3314 must throw InvalidOperationException (not InvalidCastException) " +
+                "when _innerConnection races to a non-SqlConnectionInternal state inside TryOpenInner.");
+
+            Assert.Contains("connection", ex.Message, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
\ No newline at end of file

From b700269fb1be1b8882738d8172107b954a0b3647 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Wed, 13 May 2026 02:42:23 +0530
Subject: [PATCH 095/298] Add agentic workflow for automated issue triage
 (#4177)

* Add agentic workflow for automated issue triage

Introduces a GitHub Agentic Workflow (gh-aw) that automatically triages
new issues using Copilot. The workflow:

- Classifies issue type (Bug/Feature/Question/Task)
- Validates environment details for bugs
- Assigns area labels based on issue content
- Searches for duplicate issues in the repo
- Checks for regressions
- Posts a single consolidated triage summary comment
- Assigns Copilot coding agent for confirmed bugs with complete info

Files added:
- .github/workflows/issue-triage.md (workflow definition)
- .github/workflows/issue-triage.lock.yml (compiled Actions YAML)
- .github/aw/actions-lock.json (pinned action versions)

* Align triage label names with issue template conventions

* Constrain to single area label to stay within max:5 safe-outputs limit

* Address PR review: roles:all, min-integrity:none, explicit permissions, fix Bug classification wording, fix Needs More Info label format

* Recompile triage workflow with gh-aw v0.68.1 (MCP gateway v0.2.17, AWF v0.25.18)

* Update issue-triage: add Required Context, Phase 2 assign-to-agent, AI disclaimer

* Fix label name: align 'Triage Needed :new:' with repo convention
---
 .gitattributes                          |    2 +
 .github/aw/actions-lock.json            |   14 +
 .github/workflows/issue-triage.lock.yml | 1162 +++++++++++++++++++++++
 .github/workflows/issue-triage.md       |  147 +++
 4 files changed, 1325 insertions(+)
 create mode 100644 .github/aw/actions-lock.json
 create mode 100644 .github/workflows/issue-triage.lock.yml
 create mode 100644 .github/workflows/issue-triage.md

diff --git a/.gitattributes b/.gitattributes
index 1ff0c42304..b678750c67 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -61,3 +61,5 @@
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
+
+.github/workflows/*.lock.yml linguist-generated=true merge=ours
\ No newline at end of file
diff --git a/.github/aw/actions-lock.json b/.github/aw/actions-lock.json
new file mode 100644
index 0000000000..4f7d36b947
--- /dev/null
+++ b/.github/aw/actions-lock.json
@@ -0,0 +1,14 @@
+{
+  "entries": {
+    "actions/github-script@v8": {
+      "repo": "actions/github-script",
+      "version": "v8",
+      "sha": "ed597411d8f924073f98dfc5c65a23a2325f34cd"
+    },
+    "github/gh-aw-actions/setup@v0.68.1": {
+      "repo": "github/gh-aw-actions/setup",
+      "version": "v0.68.1",
+      "sha": "2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc"
+    }
+  }
+}
diff --git a/.github/workflows/issue-triage.lock.yml b/.github/workflows/issue-triage.lock.yml
new file mode 100644
index 0000000000..8f4f2d04d4
--- /dev/null
+++ b/.github/workflows/issue-triage.lock.yml
@@ -0,0 +1,1162 @@
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"ddda208c8014c64e57436e95b5e1c92431c6815b5d0f782bb6a01ee1e84a63d9","compiler_version":"v0.68.1","strict":true,"agent_id":"copilot"}
+# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9"},{"repo":"actions/upload-artifact","sha":"bbbca2ddaa5d8feaa63e36b76fdaad77386f024f","version":"v7"},{"repo":"github/gh-aw-actions/setup","sha":"2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc","version":"v0.68.1"}]}
+#    ___                   _   _      
+#   / _ \                 | | (_)     
+#  | |_| | __ _  ___ _ __ | |_ _  ___ 
+#  |  _  |/ _` |/ _ \ '_ \| __| |/ __|
+#  | | | | (_| |  __/ | | | |_| | (__ 
+#  \_| |_/\__, |\___|_| |_|\__|_|\___|
+#          __/ |
+#  _    _ |___/ 
+# | |  | |                / _| |
+# | |  | | ___ _ __ _  __| |_| | _____      ____
+# | |/\| |/ _ \ '__| |/ /|  _| |/ _ \ \ /\ / / ___|
+# \  /\  / (_) | | | | ( | | | | (_) \ V  V /\__ \
+#  \/  \/ \___/|_| |_|\_\|_| |_|\___/ \_/\_/ |___/
+#
+# This file was automatically generated by gh-aw (v0.68.1). DO NOT EDIT.
+#
+# To update this file, edit the corresponding .md file and run:
+#   gh aw compile
+# Not all edits will cause changes to this file.
+#
+# For more information: https://github.github.com/gh-aw/introduction/overview/
+#
+#
+# Secrets used:
+#   - COPILOT_GITHUB_TOKEN
+#   - GH_AW_GITHUB_MCP_SERVER_TOKEN
+#   - GH_AW_GITHUB_TOKEN
+#   - GITHUB_TOKEN
+#
+# Custom actions used:
+#   - actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+#   - actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+#   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+#   - actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
+#   - github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+
+name: "SqlClient Issue Auto-Triage"
+"on":
+  issues:
+    types:
+    - opened
+  # roles: all # Roles processed as role check in pre-activation job
+
+permissions: {}
+
+concurrency:
+  group: "gh-aw-${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}"
+
+run-name: "SqlClient Issue Auto-Triage"
+
+jobs:
+  activation:
+    runs-on: ubuntu-slim
+    permissions:
+      actions: read
+      contents: read
+    outputs:
+      body: ${{ steps.sanitized.outputs.body }}
+      comment_id: ""
+      comment_repo: ""
+      lockdown_check_failed: ${{ steps.generate_aw_info.outputs.lockdown_check_failed == 'true' }}
+      model: ${{ steps.generate_aw_info.outputs.model }}
+      secret_verification_result: ${{ steps.validate-secret.outputs.verification_result }}
+      setup-trace-id: ${{ steps.setup.outputs.trace-id }}
+      stale_lock_file_failed: ${{ steps.check-lock-file.outputs.stale_lock_file_failed == 'true' }}
+      text: ${{ steps.sanitized.outputs.text }}
+      title: ${{ steps.sanitized.outputs.title }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+      - name: Generate agentic run info
+        id: generate_aw_info
+        env:
+          GH_AW_INFO_ENGINE_ID: "copilot"
+          GH_AW_INFO_ENGINE_NAME: "GitHub Copilot CLI"
+          GH_AW_INFO_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || 'auto' }}
+          GH_AW_INFO_VERSION: "1.0.21"
+          GH_AW_INFO_AGENT_VERSION: "1.0.21"
+          GH_AW_INFO_CLI_VERSION: "v0.68.1"
+          GH_AW_INFO_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_INFO_EXPERIMENTAL: "false"
+          GH_AW_INFO_SUPPORTS_TOOLS_ALLOWLIST: "true"
+          GH_AW_INFO_STAGED: "false"
+          GH_AW_INFO_ALLOWED_DOMAINS: '["defaults"]'
+          GH_AW_INFO_FIREWALL_ENABLED: "true"
+          GH_AW_INFO_AWF_VERSION: "v0.25.18"
+          GH_AW_INFO_AWMG_VERSION: ""
+          GH_AW_INFO_FIREWALL_TYPE: "squid"
+          GH_AW_COMPILED_STRICT: "true"
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/generate_aw_info.cjs');
+            await main(core, context);
+      - name: Validate COPILOT_GITHUB_TOKEN secret
+        id: validate-secret
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/validate_multi_secret.sh" COPILOT_GITHUB_TOKEN 'GitHub Copilot CLI' https://github.github.com/gh-aw/reference/engines/#github-copilot-default
+        env:
+          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
+      - name: Checkout .github and .agents folders
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            .github
+            .agents
+          sparse-checkout-cone-mode: true
+          fetch-depth: 1
+      - name: Check workflow lock file
+        id: check-lock-file
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_WORKFLOW_FILE: "issue-triage.lock.yml"
+          GH_AW_CONTEXT_WORKFLOW_REF: "${{ github.workflow_ref }}"
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/check_workflow_timestamp_api.cjs');
+            await main();
+      - name: Check compile-agentic version
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_COMPILED_VERSION: "v0.68.1"
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/check_version_updates.cjs');
+            await main();
+      - name: Compute current body text
+        id: sanitized
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/compute_text.cjs');
+            await main();
+      - name: Create prompt with built-in context
+        env:
+          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_SAFE_OUTPUTS: ${{ runner.temp }}/gh-aw/safeoutputs/outputs.jsonl
+          GH_AW_GITHUB_ACTOR: ${{ github.actor }}
+          GH_AW_GITHUB_EVENT_COMMENT_ID: ${{ github.event.comment.id }}
+          GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER: ${{ github.event.discussion.number }}
+          GH_AW_GITHUB_EVENT_ISSUE_NUMBER: ${{ github.event.issue.number }}
+          GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
+          GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
+          GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
+          GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
+        # poutine:ignore untrusted_checkout_exec
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
+          {
+          cat << 'GH_AW_PROMPT_bef3a8b6a480c883_EOF'
+          <system>
+          GH_AW_PROMPT_bef3a8b6a480c883_EOF
+          cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
+          cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
+          cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
+          cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
+          cat << 'GH_AW_PROMPT_bef3a8b6a480c883_EOF'
+          <safe-output-tools>
+          Tools: add_comment, add_labels(max:5), missing_tool, missing_data, noop
+          </safe-output-tools>
+          <github-context>
+          The following GitHub context information is available for this workflow:
+          {{#if __GH_AW_GITHUB_ACTOR__ }}
+          - **actor**: __GH_AW_GITHUB_ACTOR__
+          {{/if}}
+          {{#if __GH_AW_GITHUB_REPOSITORY__ }}
+          - **repository**: __GH_AW_GITHUB_REPOSITORY__
+          {{/if}}
+          {{#if __GH_AW_GITHUB_WORKSPACE__ }}
+          - **workspace**: __GH_AW_GITHUB_WORKSPACE__
+          {{/if}}
+          {{#if __GH_AW_GITHUB_EVENT_ISSUE_NUMBER__ }}
+          - **issue-number**: #__GH_AW_GITHUB_EVENT_ISSUE_NUMBER__
+          {{/if}}
+          {{#if __GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER__ }}
+          - **discussion-number**: #__GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER__
+          {{/if}}
+          {{#if __GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER__ }}
+          - **pull-request-number**: #__GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER__
+          {{/if}}
+          {{#if __GH_AW_GITHUB_EVENT_COMMENT_ID__ }}
+          - **comment-id**: __GH_AW_GITHUB_EVENT_COMMENT_ID__
+          {{/if}}
+          {{#if __GH_AW_GITHUB_RUN_ID__ }}
+          - **workflow-run-id**: __GH_AW_GITHUB_RUN_ID__
+          {{/if}}
+          </github-context>
+          
+          GH_AW_PROMPT_bef3a8b6a480c883_EOF
+          cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          cat << 'GH_AW_PROMPT_bef3a8b6a480c883_EOF'
+          </system>
+          {{#runtime-import .github/workflows/issue-triage.md}}
+          GH_AW_PROMPT_bef3a8b6a480c883_EOF
+          } > "$GH_AW_PROMPT"
+      - name: Interpolate variables and render templates
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/interpolate_prompt.cjs');
+            await main();
+      - name: Substitute placeholders
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_GITHUB_ACTOR: ${{ github.actor }}
+          GH_AW_GITHUB_EVENT_COMMENT_ID: ${{ github.event.comment.id }}
+          GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER: ${{ github.event.discussion.number }}
+          GH_AW_GITHUB_EVENT_ISSUE_NUMBER: ${{ github.event.issue.number }}
+          GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
+          GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
+          GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
+          GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            
+            const substitutePlaceholders = require('${{ runner.temp }}/gh-aw/actions/substitute_placeholders.cjs');
+            
+            // Call the substitution function
+            return await substitutePlaceholders({
+              file: process.env.GH_AW_PROMPT,
+              substitutions: {
+                GH_AW_GITHUB_ACTOR: process.env.GH_AW_GITHUB_ACTOR,
+                GH_AW_GITHUB_EVENT_COMMENT_ID: process.env.GH_AW_GITHUB_EVENT_COMMENT_ID,
+                GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER: process.env.GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER,
+                GH_AW_GITHUB_EVENT_ISSUE_NUMBER: process.env.GH_AW_GITHUB_EVENT_ISSUE_NUMBER,
+                GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER: process.env.GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER,
+                GH_AW_GITHUB_REPOSITORY: process.env.GH_AW_GITHUB_REPOSITORY,
+                GH_AW_GITHUB_RUN_ID: process.env.GH_AW_GITHUB_RUN_ID,
+                GH_AW_GITHUB_WORKSPACE: process.env.GH_AW_GITHUB_WORKSPACE
+              }
+            });
+      - name: Validate prompt placeholders
+        env:
+          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+        # poutine:ignore untrusted_checkout_exec
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/validate_prompt_placeholders.sh"
+      - name: Print prompt
+        env:
+          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+        # poutine:ignore untrusted_checkout_exec
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/print_prompt_summary.sh"
+      - name: Upload activation artifact
+        if: success()
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
+        with:
+          name: activation
+          path: |
+            /tmp/gh-aw/aw_info.json
+            /tmp/gh-aw/aw-prompts/prompt.txt
+            /tmp/gh-aw/github_rate_limits.jsonl
+          if-no-files-found: ignore
+          retention-days: 1
+
+  agent:
+    needs: activation
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: read
+      pull-requests: read
+    env:
+      DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+      GH_AW_ASSETS_ALLOWED_EXTS: ""
+      GH_AW_ASSETS_BRANCH: ""
+      GH_AW_ASSETS_MAX_SIZE_KB: 0
+      GH_AW_MCP_LOG_DIR: /tmp/gh-aw/mcp-logs/safeoutputs
+      GH_AW_WORKFLOW_ID_SANITIZED: issuetriage
+    outputs:
+      checkout_pr_success: ${{ steps.checkout-pr.outputs.checkout_pr_success || 'true' }}
+      effective_tokens: ${{ steps.parse-mcp-gateway.outputs.effective_tokens }}
+      has_patch: ${{ steps.collect_output.outputs.has_patch }}
+      inference_access_error: ${{ steps.detect-inference-error.outputs.inference_access_error || 'false' }}
+      model: ${{ needs.activation.outputs.model }}
+      output: ${{ steps.collect_output.outputs.output }}
+      output_types: ${{ steps.collect_output.outputs.output_types }}
+      setup-trace-id: ${{ steps.setup.outputs.trace-id }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+          trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+      - name: Set runtime paths
+        id: set-runtime-paths
+        run: |
+          echo "GH_AW_SAFE_OUTPUTS=${RUNNER_TEMP}/gh-aw/safeoutputs/outputs.jsonl" >> "$GITHUB_OUTPUT"
+          echo "GH_AW_SAFE_OUTPUTS_CONFIG_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" >> "$GITHUB_OUTPUT"
+          echo "GH_AW_SAFE_OUTPUTS_TOOLS_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/tools.json" >> "$GITHUB_OUTPUT"
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+      - name: Create gh-aw temp directory
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/create_gh_aw_tmp_dir.sh"
+      - name: Configure gh CLI for GitHub Enterprise
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/configure_gh_for_ghe.sh"
+        env:
+          GH_TOKEN: ${{ github.token }}
+      - name: Configure Git credentials
+        env:
+          REPO_NAME: ${{ github.repository }}
+          SERVER_URL: ${{ github.server_url }}
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+          git config --global am.keepcr true
+          # Re-authenticate git with GitHub token
+          SERVER_URL_STRIPPED="${SERVER_URL#https://}"
+          git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@${SERVER_URL_STRIPPED}/${REPO_NAME}.git"
+          echo "Git configured with standard GitHub Actions identity"
+      - name: Checkout PR branch
+        id: checkout-pr
+        if: |
+          github.event.pull_request || github.event.issue.pull_request
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/checkout_pr_branch.cjs');
+            await main();
+      - name: Install GitHub Copilot CLI
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.21
+        env:
+          GH_HOST: github.com
+      - name: Install AWF binary
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.18
+      - name: Parse integrity filter lists
+        id: parse-guard-vars
+        env:
+          GH_AW_BLOCKED_USERS_VAR: ${{ vars.GH_AW_GITHUB_BLOCKED_USERS || '' }}
+          GH_AW_TRUSTED_USERS_VAR: ${{ vars.GH_AW_GITHUB_TRUSTED_USERS || '' }}
+          GH_AW_APPROVAL_LABELS_VAR: ${{ vars.GH_AW_GITHUB_APPROVAL_LABELS || '' }}
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/parse_guard_list.sh"
+      - name: Download container images
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.25.18 ghcr.io/github/gh-aw-firewall/api-proxy:0.25.18 ghcr.io/github/gh-aw-firewall/squid:0.25.18 ghcr.io/github/gh-aw-mcpg:v0.2.17 ghcr.io/github/github-mcp-server:v0.32.0 node:lts-alpine
+      - name: Write Safe Outputs Config
+        run: |
+          mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
+          mkdir -p /tmp/gh-aw/safeoutputs
+          mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_6f7dd6f136148d14_EOF'
+          {"add_comment":{"hide_older_comments":true,"max":1},"add_labels":{"max":5},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
+          GH_AW_SAFE_OUTPUTS_CONFIG_6f7dd6f136148d14_EOF
+      - name: Write Safe Outputs Tools
+        env:
+          GH_AW_TOOLS_META_JSON: |
+            {
+              "description_suffixes": {
+                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added.",
+                "add_labels": " CONSTRAINTS: Maximum 5 label(s) can be added."
+              },
+              "repo_params": {},
+              "dynamic_tools": []
+            }
+          GH_AW_VALIDATION_JSON: |
+            {
+              "add_comment": {
+                "defaultMax": 1,
+                "fields": {
+                  "body": {
+                    "required": true,
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 65000
+                  },
+                  "item_number": {
+                    "issueOrPRNumber": true
+                  },
+                  "repo": {
+                    "type": "string",
+                    "maxLength": 256
+                  }
+                }
+              },
+              "add_labels": {
+                "defaultMax": 5,
+                "fields": {
+                  "item_number": {
+                    "issueNumberOrTemporaryId": true
+                  },
+                  "labels": {
+                    "required": true,
+                    "type": "array",
+                    "itemType": "string",
+                    "itemSanitize": true,
+                    "itemMaxLength": 128
+                  },
+                  "repo": {
+                    "type": "string",
+                    "maxLength": 256
+                  }
+                }
+              },
+              "missing_data": {
+                "defaultMax": 20,
+                "fields": {
+                  "alternatives": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 256
+                  },
+                  "context": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 256
+                  },
+                  "data_type": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 128
+                  },
+                  "reason": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 256
+                  }
+                }
+              },
+              "missing_tool": {
+                "defaultMax": 20,
+                "fields": {
+                  "alternatives": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 512
+                  },
+                  "reason": {
+                    "required": true,
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 256
+                  },
+                  "tool": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 128
+                  }
+                }
+              },
+              "noop": {
+                "defaultMax": 1,
+                "fields": {
+                  "message": {
+                    "required": true,
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 65000
+                  }
+                }
+              },
+              "report_incomplete": {
+                "defaultMax": 5,
+                "fields": {
+                  "details": {
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 65000
+                  },
+                  "reason": {
+                    "required": true,
+                    "type": "string",
+                    "sanitize": true,
+                    "maxLength": 1024
+                  }
+                }
+              }
+            }
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/generate_safe_outputs_tools.cjs');
+            await main();
+      - name: Generate Safe Outputs MCP Server Config
+        id: safe-outputs-config
+        run: |
+          # Generate a secure random API key (360 bits of entropy, 40+ chars)
+          # Mask immediately to prevent timing vulnerabilities
+          API_KEY=$(openssl rand -base64 45 | tr -d '/+=')
+          echo "::add-mask::${API_KEY}"
+          
+          PORT=3001
+          
+          # Set outputs for next steps
+          {
+            echo "safe_outputs_api_key=${API_KEY}"
+            echo "safe_outputs_port=${PORT}"
+          } >> "$GITHUB_OUTPUT"
+          
+          echo "Safe Outputs MCP server will run on port ${PORT}"
+          
+      - name: Start Safe Outputs MCP HTTP Server
+        id: safe-outputs-start
+        env:
+          DEBUG: '*'
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
+          GH_AW_SAFE_OUTPUTS_PORT: ${{ steps.safe-outputs-config.outputs.safe_outputs_port }}
+          GH_AW_SAFE_OUTPUTS_API_KEY: ${{ steps.safe-outputs-config.outputs.safe_outputs_api_key }}
+          GH_AW_SAFE_OUTPUTS_TOOLS_PATH: ${{ runner.temp }}/gh-aw/safeoutputs/tools.json
+          GH_AW_SAFE_OUTPUTS_CONFIG_PATH: ${{ runner.temp }}/gh-aw/safeoutputs/config.json
+          GH_AW_MCP_LOG_DIR: /tmp/gh-aw/mcp-logs/safeoutputs
+        run: |
+          # Environment variables are set above to prevent template injection
+          export DEBUG
+          export GH_AW_SAFE_OUTPUTS
+          export GH_AW_SAFE_OUTPUTS_PORT
+          export GH_AW_SAFE_OUTPUTS_API_KEY
+          export GH_AW_SAFE_OUTPUTS_TOOLS_PATH
+          export GH_AW_SAFE_OUTPUTS_CONFIG_PATH
+          export GH_AW_MCP_LOG_DIR
+          
+          bash "${RUNNER_TEMP}/gh-aw/actions/start_safe_outputs_server.sh"
+          
+      - name: Start MCP Gateway
+        id: start-mcp-gateway
+        env:
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
+          GH_AW_SAFE_OUTPUTS_API_KEY: ${{ steps.safe-outputs-start.outputs.api_key }}
+          GH_AW_SAFE_OUTPUTS_PORT: ${{ steps.safe-outputs-start.outputs.port }}
+          GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+        run: |
+          set -eo pipefail
+          mkdir -p /tmp/gh-aw/mcp-config
+          
+          # Export gateway environment variables for MCP config and gateway script
+          export MCP_GATEWAY_PORT="80"
+          export MCP_GATEWAY_DOMAIN="host.docker.internal"
+          MCP_GATEWAY_API_KEY=$(openssl rand -base64 45 | tr -d '/+=')
+          echo "::add-mask::${MCP_GATEWAY_API_KEY}"
+          export MCP_GATEWAY_API_KEY
+          export MCP_GATEWAY_PAYLOAD_DIR="/tmp/gh-aw/mcp-payloads"
+          mkdir -p "${MCP_GATEWAY_PAYLOAD_DIR}"
+          export MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD="524288"
+          export DEBUG="*"
+          
+          export GH_AW_ENGINE="copilot"
+          export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GH_AW_SAFE_OUTPUTS_PORT -e GH_AW_SAFE_OUTPUTS_API_KEY -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.2.17'
+          
+          mkdir -p /home/runner/.copilot
+          cat << GH_AW_MCP_CONFIG_47425e2eb31c9c9e_EOF | bash "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.sh"
+          {
+            "mcpServers": {
+              "github": {
+                "type": "stdio",
+                "container": "ghcr.io/github/github-mcp-server:v0.32.0",
+                "env": {
+                  "GITHUB_HOST": "\${GITHUB_SERVER_URL}",
+                  "GITHUB_PERSONAL_ACCESS_TOKEN": "\${GITHUB_MCP_SERVER_TOKEN}",
+                  "GITHUB_READ_ONLY": "1",
+                  "GITHUB_TOOLSETS": "context,repos,issues,pull_requests"
+                },
+                "guard-policies": {
+                  "allow-only": {
+                    "approval-labels": ${{ steps.parse-guard-vars.outputs.approval_labels }},
+                    "blocked-users": ${{ steps.parse-guard-vars.outputs.blocked_users }},
+                    "min-integrity": "none",
+                    "repos": "all",
+                    "trusted-users": ${{ steps.parse-guard-vars.outputs.trusted_users }}
+                  }
+                }
+              },
+              "safeoutputs": {
+                "type": "http",
+                "url": "http://host.docker.internal:$GH_AW_SAFE_OUTPUTS_PORT",
+                "headers": {
+                  "Authorization": "\${GH_AW_SAFE_OUTPUTS_API_KEY}"
+                },
+                "guard-policies": {
+                  "write-sink": {
+                    "accept": [
+                      "*"
+                    ]
+                  }
+                }
+              }
+            },
+            "gateway": {
+              "port": $MCP_GATEWAY_PORT,
+              "domain": "${MCP_GATEWAY_DOMAIN}",
+              "apiKey": "${MCP_GATEWAY_API_KEY}",
+              "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
+            }
+          }
+          GH_AW_MCP_CONFIG_47425e2eb31c9c9e_EOF
+      - name: Download activation artifact
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: activation
+          path: /tmp/gh-aw
+      - name: Clean git credentials
+        continue-on-error: true
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/clean_git_credentials.sh"
+      - name: Execute GitHub Copilot CLI
+        id: agentic_execution
+        # Copilot CLI tool arguments (sorted):
+        timeout-minutes: 20
+        run: |
+          set -o pipefail
+          touch /tmp/gh-aw/agent-step-summary.md
+          (umask 177 && touch /tmp/gh-aw/agent-stdio.log)
+          # shellcheck disable=SC1003
+          sudo -E awf --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" --env-all --exclude-env COPILOT_GITHUB_TOKEN --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_API_KEY --allow-domains api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --image-tag 0.25.18 --skip-pull --enable-api-proxy \
+            -- /bin/bash -c 'node ${RUNNER_TEMP}/gh-aw/actions/copilot_driver.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --allow-all-tools --allow-all-paths --add-dir "${GITHUB_WORKSPACE}" --prompt "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)"' 2>&1 | tee -a /tmp/gh-aw/agent-stdio.log
+        env:
+          COPILOT_AGENT_RUNNER_TYPE: STANDALONE
+          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
+          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || '' }}
+          GH_AW_MCP_CONFIG: /home/runner/.copilot/mcp-config.json
+          GH_AW_PHASE: agent
+          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
+          GH_AW_VERSION: v0.68.1
+          GITHUB_API_URL: ${{ github.api_url }}
+          GITHUB_AW: true
+          GITHUB_HEAD_REF: ${{ github.head_ref }}
+          GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          GITHUB_REF_NAME: ${{ github.ref_name }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_STEP_SUMMARY: /tmp/gh-aw/agent-step-summary.md
+          GITHUB_WORKSPACE: ${{ github.workspace }}
+          GIT_AUTHOR_EMAIL: github-actions[bot]@users.noreply.github.com
+          GIT_AUTHOR_NAME: github-actions[bot]
+          GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
+          GIT_COMMITTER_NAME: github-actions[bot]
+          XDG_CONFIG_HOME: /home/runner
+      - name: Detect inference access error
+        id: detect-inference-error
+        if: always()
+        continue-on-error: true
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/detect_inference_access_error.sh"
+      - name: Configure Git credentials
+        env:
+          REPO_NAME: ${{ github.repository }}
+          SERVER_URL: ${{ github.server_url }}
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+          git config --global am.keepcr true
+          # Re-authenticate git with GitHub token
+          SERVER_URL_STRIPPED="${SERVER_URL#https://}"
+          git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@${SERVER_URL_STRIPPED}/${REPO_NAME}.git"
+          echo "Git configured with standard GitHub Actions identity"
+      - name: Copy Copilot session state files to logs
+        if: always()
+        continue-on-error: true
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/copy_copilot_session_state.sh"
+      - name: Stop MCP Gateway
+        if: always()
+        continue-on-error: true
+        env:
+          MCP_GATEWAY_PORT: ${{ steps.start-mcp-gateway.outputs.gateway-port }}
+          MCP_GATEWAY_API_KEY: ${{ steps.start-mcp-gateway.outputs.gateway-api-key }}
+          GATEWAY_PID: ${{ steps.start-mcp-gateway.outputs.gateway-pid }}
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/stop_mcp_gateway.sh" "$GATEWAY_PID"
+      - name: Redact secrets in logs
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/redact_secrets.cjs');
+            await main();
+        env:
+          GH_AW_SECRET_NAMES: 'COPILOT_GITHUB_TOKEN,GH_AW_GITHUB_MCP_SERVER_TOKEN,GH_AW_GITHUB_TOKEN,GITHUB_TOKEN'
+          SECRET_COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
+          SECRET_GH_AW_GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN }}
+          SECRET_GH_AW_GITHUB_TOKEN: ${{ secrets.GH_AW_GITHUB_TOKEN }}
+          SECRET_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Append agent step summary
+        if: always()
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/append_agent_step_summary.sh"
+      - name: Copy Safe Outputs
+        if: always()
+        env:
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
+        run: |
+          mkdir -p /tmp/gh-aw
+          cp "$GH_AW_SAFE_OUTPUTS" /tmp/gh-aw/safeoutputs.jsonl 2>/dev/null || true
+      - name: Ingest agent output
+        id: collect_output
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
+          GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_API_URL: ${{ github.api_url }}
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/collect_ndjson_output.cjs');
+            await main();
+      - name: Parse agent logs for step summary
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_AGENT_OUTPUT: /tmp/gh-aw/sandbox/agent/logs/
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_copilot_log.cjs');
+            await main();
+      - name: Parse MCP Gateway logs for step summary
+        if: always()
+        id: parse-mcp-gateway
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_mcp_gateway_log.cjs');
+            await main();
+      - name: Print firewall logs
+        if: always()
+        continue-on-error: true
+        env:
+          AWF_LOGS_DIR: /tmp/gh-aw/sandbox/firewall/logs
+        run: |
+          # Fix permissions on firewall logs so they can be uploaded as artifacts
+          # AWF runs with sudo, creating files owned by root
+          sudo chmod -R a+r /tmp/gh-aw/sandbox/firewall/logs 2>/dev/null || true
+          # Only run awf logs summary if awf command exists (it may not be installed if workflow failed before install step)
+          if command -v awf &> /dev/null; then
+            awf logs summary | tee -a "$GITHUB_STEP_SUMMARY"
+          else
+            echo 'AWF binary not installed, skipping firewall log summary'
+          fi
+      - name: Parse token usage for step summary
+        if: always()
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_token_usage.cjs');
+            await main();
+      - name: Write agent output placeholder if missing
+        if: always()
+        run: |
+          if [ ! -f /tmp/gh-aw/agent_output.json ]; then
+            echo '{"items":[]}' > /tmp/gh-aw/agent_output.json
+          fi
+      - name: Upload agent artifacts
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
+        with:
+          name: agent
+          path: |
+            /tmp/gh-aw/aw-prompts/prompt.txt
+            /tmp/gh-aw/sandbox/agent/logs/
+            /tmp/gh-aw/redacted-urls.log
+            /tmp/gh-aw/mcp-logs/
+            /tmp/gh-aw/proxy-logs/
+            !/tmp/gh-aw/proxy-logs/proxy-tls/
+            /tmp/gh-aw/agent_usage.json
+            /tmp/gh-aw/agent-stdio.log
+            /tmp/gh-aw/agent/
+            /tmp/gh-aw/github_rate_limits.jsonl
+            /tmp/gh-aw/safeoutputs.jsonl
+            /tmp/gh-aw/agent_output.json
+            /tmp/gh-aw/aw-*.patch
+            /tmp/gh-aw/aw-*.bundle
+          if-no-files-found: ignore
+      - name: Upload firewall audit logs
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
+        with:
+          name: firewall-audit-logs
+          path: |
+            /tmp/gh-aw/sandbox/firewall/logs/
+            /tmp/gh-aw/sandbox/firewall/audit/
+          if-no-files-found: ignore
+
+  conclusion:
+    needs:
+      - activation
+      - agent
+      - detection
+      - safe_outputs
+    if: >
+      always() && (needs.agent.result != 'skipped' || needs.activation.outputs.lockdown_check_failed == 'true' ||
+      needs.activation.outputs.stale_lock_file_failed == 'true')
+    runs-on: ubuntu-slim
+    permissions:
+      contents: read
+      discussions: write
+      issues: write
+      pull-requests: write
+    concurrency:
+      group: "gh-aw-conclusion-issue-triage"
+      cancel-in-progress: false
+    outputs:
+      incomplete_count: ${{ steps.report_incomplete.outputs.incomplete_count }}
+      noop_message: ${{ steps.noop.outputs.noop_message }}
+      tools_reported: ${{ steps.missing_tool.outputs.tools_reported }}
+      total_count: ${{ steps.missing_tool.outputs.total_count }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+          trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+      - name: Download agent output artifact
+        id: download-agent-output
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: agent
+          path: /tmp/gh-aw/
+      - name: Setup agent output environment variable
+        id: setup-agent-output-env
+        if: steps.download-agent-output.outcome == 'success'
+        run: |
+          mkdir -p /tmp/gh-aw/
+          find "/tmp/gh-aw/" -type f -print
+          echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+      - name: Process No-Op Messages
+        id: noop
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_NOOP_MAX: "1"
+          GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
+          GH_AW_NOOP_REPORT_AS_ISSUE: "true"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/handle_noop_message.cjs');
+            await main();
+      - name: Record missing tool
+        id: missing_tool
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_MISSING_TOOL_CREATE_ISSUE: "true"
+          GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/missing_tool.cjs');
+            await main();
+      - name: Record incomplete
+        id: report_incomplete
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_REPORT_INCOMPLETE_CREATE_ISSUE: "true"
+          GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/report_incomplete_handler.cjs');
+            await main();
+      - name: Handle agent failure
+        id: handle_agent_failure
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
+          GH_AW_WORKFLOW_ID: "issue-triage"
+          GH_AW_ENGINE_ID: "copilot"
+          GH_AW_SECRET_VERIFICATION_RESULT: ${{ needs.activation.outputs.secret_verification_result }}
+          GH_AW_CHECKOUT_PR_SUCCESS: ${{ needs.agent.outputs.checkout_pr_success }}
+          GH_AW_INFERENCE_ACCESS_ERROR: ${{ needs.agent.outputs.inference_access_error }}
+          GH_AW_LOCKDOWN_CHECK_FAILED: ${{ needs.activation.outputs.lockdown_check_failed }}
+          GH_AW_STALE_LOCK_FILE_FAILED: ${{ needs.activation.outputs.stale_lock_file_failed }}
+          GH_AW_GROUP_REPORTS: "false"
+          GH_AW_FAILURE_REPORT_AS_ISSUE: "true"
+          GH_AW_TIMEOUT_MINUTES: "20"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/handle_agent_failure.cjs');
+            await main();
+
+  detection:
+    needs:
+      - activation
+      - agent
+    if: >
+      always() && needs.agent.result != 'skipped' && (needs.agent.outputs.output_types != '' || needs.agent.outputs.has_patch == 'true')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      detection_conclusion: ${{ steps.detection_conclusion.outputs.conclusion }}
+      detection_success: ${{ steps.detection_conclusion.outputs.success }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+          trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+      - name: Download agent output artifact
+        id: download-agent-output
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: agent
+          path: /tmp/gh-aw/
+      - name: Setup agent output environment variable
+        id: setup-agent-output-env
+        if: steps.download-agent-output.outcome == 'success'
+        run: |
+          mkdir -p /tmp/gh-aw/
+          find "/tmp/gh-aw/" -type f -print
+          echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+      - name: Checkout repository for patch context
+        if: needs.agent.outputs.has_patch == 'true'
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+      # --- Threat Detection ---
+      - name: Download container images
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.25.18 ghcr.io/github/gh-aw-firewall/api-proxy:0.25.18 ghcr.io/github/gh-aw-firewall/squid:0.25.18
+      - name: Check if detection needed
+        id: detection_guard
+        if: always()
+        env:
+          OUTPUT_TYPES: ${{ needs.agent.outputs.output_types }}
+          HAS_PATCH: ${{ needs.agent.outputs.has_patch }}
+        run: |
+          if [[ -n "$OUTPUT_TYPES" || "$HAS_PATCH" == "true" ]]; then
+            echo "run_detection=true" >> "$GITHUB_OUTPUT"
+            echo "Detection will run: output_types=$OUTPUT_TYPES, has_patch=$HAS_PATCH"
+          else
+            echo "run_detection=false" >> "$GITHUB_OUTPUT"
+            echo "Detection skipped: no agent outputs or patches to analyze"
+          fi
+      - name: Clear MCP configuration for detection
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        run: |
+          rm -f /tmp/gh-aw/mcp-config/mcp-servers.json
+          rm -f /home/runner/.copilot/mcp-config.json
+          rm -f "$GITHUB_WORKSPACE/.gemini/settings.json"
+      - name: Prepare threat detection files
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        run: |
+          mkdir -p /tmp/gh-aw/threat-detection/aw-prompts
+          cp /tmp/gh-aw/aw-prompts/prompt.txt /tmp/gh-aw/threat-detection/aw-prompts/prompt.txt 2>/dev/null || true
+          cp /tmp/gh-aw/agent_output.json /tmp/gh-aw/threat-detection/agent_output.json 2>/dev/null || true
+          for f in /tmp/gh-aw/aw-*.patch; do
+            [ -f "$f" ] && cp "$f" /tmp/gh-aw/threat-detection/ 2>/dev/null || true
+          done
+          for f in /tmp/gh-aw/aw-*.bundle; do
+            [ -f "$f" ] && cp "$f" /tmp/gh-aw/threat-detection/ 2>/dev/null || true
+          done
+          echo "Prepared threat detection files:"
+          ls -la /tmp/gh-aw/threat-detection/ 2>/dev/null || true
+      - name: Setup threat detection
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          WORKFLOW_DESCRIPTION: "No description provided"
+          HAS_PATCH: ${{ needs.agent.outputs.has_patch }}
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/setup_threat_detection.cjs');
+            await main();
+      - name: Ensure threat-detection directory and log
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        run: |
+          mkdir -p /tmp/gh-aw/threat-detection
+          touch /tmp/gh-aw/threat-detection/detection.log
+      - name: Install GitHub Copilot CLI
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.21
+        env:
+          GH_HOST: github.com
+      - name: Install AWF binary
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.18
+      - name: Execute GitHub Copilot CLI
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        id: detection_agentic_execution
+        # Copilot CLI tool arguments (sorted):
+        timeout-minutes: 20
+        run: |
+          set -o pipefail
+          touch /tmp/gh-aw/agent-step-summary.md
+          (umask 177 && touch /tmp/gh-aw/threat-detection/detection.log)
+          # shellcheck disable=SC1003
+          sudo -E awf --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" --env-all --exclude-env COPILOT_GITHUB_TOKEN --allow-domains api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,github.com,host.docker.internal,telemetry.enterprise.githubcopilot.com --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --image-tag 0.25.18 --skip-pull --enable-api-proxy \
+            -- /bin/bash -c 'node ${RUNNER_TEMP}/gh-aw/actions/copilot_driver.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --allow-all-tools --add-dir "${GITHUB_WORKSPACE}" --prompt "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)"' 2>&1 | tee -a /tmp/gh-aw/threat-detection/detection.log
+        env:
+          COPILOT_AGENT_RUNNER_TYPE: STANDALONE
+          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
+          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_DETECTION_COPILOT || '' }}
+          GH_AW_PHASE: detection
+          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_VERSION: v0.68.1
+          GITHUB_API_URL: ${{ github.api_url }}
+          GITHUB_AW: true
+          GITHUB_HEAD_REF: ${{ github.head_ref }}
+          GITHUB_REF_NAME: ${{ github.ref_name }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_STEP_SUMMARY: /tmp/gh-aw/agent-step-summary.md
+          GITHUB_WORKSPACE: ${{ github.workspace }}
+          GIT_AUTHOR_EMAIL: github-actions[bot]@users.noreply.github.com
+          GIT_AUTHOR_NAME: github-actions[bot]
+          GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
+          GIT_COMMITTER_NAME: github-actions[bot]
+          XDG_CONFIG_HOME: /home/runner
+      - name: Upload threat detection log
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
+        with:
+          name: detection
+          path: /tmp/gh-aw/threat-detection/detection.log
+          if-no-files-found: ignore
+      - name: Parse and conclude threat detection
+        id: detection_conclusion
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          RUN_DETECTION: ${{ steps.detection_guard.outputs.run_detection }}
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_threat_detection_results.cjs');
+            await main();
+
+  safe_outputs:
+    needs:
+      - activation
+      - agent
+      - detection
+    if: (!cancelled()) && needs.agent.result != 'skipped' && needs.detection.result == 'success'
+    runs-on: ubuntu-slim
+    permissions:
+      contents: read
+      discussions: write
+      issues: write
+      pull-requests: write
+    timeout-minutes: 15
+    env:
+      GH_AW_CALLER_WORKFLOW_ID: "${{ github.repository }}/issue-triage"
+      GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens }}
+      GH_AW_ENGINE_ID: "copilot"
+      GH_AW_ENGINE_MODEL: ${{ needs.agent.outputs.model }}
+      GH_AW_WORKFLOW_ID: "issue-triage"
+      GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+    outputs:
+      code_push_failure_count: ${{ steps.process_safe_outputs.outputs.code_push_failure_count }}
+      code_push_failure_errors: ${{ steps.process_safe_outputs.outputs.code_push_failure_errors }}
+      comment_id: ${{ steps.process_safe_outputs.outputs.comment_id }}
+      comment_url: ${{ steps.process_safe_outputs.outputs.comment_url }}
+      create_discussion_error_count: ${{ steps.process_safe_outputs.outputs.create_discussion_error_count }}
+      create_discussion_errors: ${{ steps.process_safe_outputs.outputs.create_discussion_errors }}
+      process_safe_outputs_processed_count: ${{ steps.process_safe_outputs.outputs.processed_count }}
+      process_safe_outputs_temporary_id_map: ${{ steps.process_safe_outputs.outputs.temporary_id_map }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+          trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+      - name: Download agent output artifact
+        id: download-agent-output
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: agent
+          path: /tmp/gh-aw/
+      - name: Setup agent output environment variable
+        id: setup-agent-output-env
+        if: steps.download-agent-output.outcome == 'success'
+        run: |
+          mkdir -p /tmp/gh-aw/
+          find "/tmp/gh-aw/" -type f -print
+          echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+      - name: Configure GH_HOST for enterprise compatibility
+        id: ghes-host-config
+        shell: bash
+        run: |
+          # Derive GH_HOST from GITHUB_SERVER_URL so the gh CLI targets the correct
+          # GitHub instance (GHES/GHEC). On github.com this is a harmless no-op.
+          GH_HOST="${GITHUB_SERVER_URL#https://}"
+          GH_HOST="${GH_HOST#http://}"
+          echo "GH_HOST=${GH_HOST}" >> "$GITHUB_ENV"
+      - name: Process Safe Outputs
+        id: process_safe_outputs
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_API_URL: ${{ github.api_url }}
+          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"hide_older_comments\":true,\"max\":1},\"add_labels\":{\"max\":5},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"true\"},\"report_incomplete\":{}}"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/safe_output_handler_manager.cjs');
+            await main();
+      - name: Upload Safe Outputs Items
+        if: always()
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
+        with:
+          name: safe-outputs-items
+          path: /tmp/gh-aw/safe-output-items.jsonl
+          if-no-files-found: ignore
+
diff --git a/.github/workflows/issue-triage.md b/.github/workflows/issue-triage.md
new file mode 100644
index 0000000000..8523f53dd1
--- /dev/null
+++ b/.github/workflows/issue-triage.md
@@ -0,0 +1,147 @@
+---
+on:
+  issues:
+    types: [opened]
+  roles: all
+
+engine: copilot
+
+permissions:
+  contents: read
+  issues: read
+  pull-requests: read
+
+tools:
+  github:
+    min-integrity: none
+
+safe-outputs:
+  add-comment:
+    max: 1
+    hide-older-comments: true
+  add-labels:
+    max: 5
+  # Phase 2: Uncomment when ready to enable automatic Copilot coding agent assignment
+  # assign-to-agent:
+  #   github-token: ${{ secrets.GH_AW_AGENT_TOKEN }}
+---
+
+# SqlClient Issue Auto-Triage
+
+You are a triage specialist for **Microsoft.Data.SqlClient**.
+A new issue has just been opened. Your job is to:
+
+1. Read the issue silently using GitHub read tools
+2. Apply labels silently using `add_labels`
+3. Post **one** triage summary comment using `add_comment`
+
+That is the entire workflow. Do NOT call `add_comment` more than once.
+Do NOT post intermediate findings. Do NOT post separate comments for
+area detection, duplicate checking, or environment validation.
+Everything goes into the single triage summary at the end.
+
+---
+
+## Required Context
+
+Before analyzing the issue, you MUST read all project knowledge base files
+from the checked-out repository. Recursively list the `.github/` directory
+and read every markdown file (`.md`) found under it, excluding the `workflows/`
+subdirectory. This includes but is not limited to instructions, prompts,
+issue templates, skills, plans, and any other documentation files present.
+
+Use these files to inform your area classification, duplicate detection,
+environment validation, and analysis. Do not skip this step.
+
+---
+
+## Instructions
+
+Read the issue body. Then do ALL of the following analysis silently
+(using read tools and search only — no comments, no outputs):
+
+**A. Classify issue type**: Bug (reports unexpected behavior, crash, regression, or incorrect results), Feature (has proposal), Question, or Task.
+
+**B. Validate environment** (bugs only): Check for these required fields:
+SqlClient version, .NET target framework, SQL Server version, OS,
+repro steps, expected vs actual behavior.
+If any are missing, list them explicitly in the triage summary (e.g. "Missing: SQL Server version, OS").
+Proceed with all remaining triage steps regardless of missing environment details.
+
+**C. Classify area**: Based on the issue content, pick the single best matching area label from this list:
+
+| Label | Scope |
+|-------|-------|
+| `Area\Connection Pooling` | Pool behavior, timeouts, pool size, pool exhaustion |
+| `Area\AKV Provider` | Always Encrypted Azure Key Vault provider |
+| `Area\Json` | JSON data type support |
+| `Area\Managed SNI` | Managed SNI / network layer |
+| `Area\Native SNI` | Native SNI / network layer |
+| `Area\Sql Bulk Copy` | SqlBulkCopy operations |
+| `Area\Netcore` | .NET runtime / netcore specific |
+| `Area\Netfx` | .NET Framework specific |
+| `Area\Tests` | Test code / test projects |
+| `Area\Documentation` | Docs and samples |
+| `Area\Azure Connectivity` | Azure connectivity |
+| `Area\Engineering` | Build, CI/CD, infrastructure |
+| `Area\Vector` | Vector feature |
+| `Area\Async` | Async operations |
+
+**D. Search for duplicates**: Search `repo:dotnet/SqlClient <key terms>` for similar issues.
+
+**E. Check for regression**: If the reporter mentions a previously working version, note the version boundary.
+
+---
+
+## Actions (execute in this order)
+
+**First**: Call `add_labels` with at most 5 labels total (safe-outputs limit):
+- `Triage Needed :new:` (always)
+- Exactly **one** `Area\*` label from the table above (pick the single best match)
+- `Needs More Info :information_source:` if critical environment details are missing (bugs only)
+- `Repro Available :heavy_check_mark:` if repro steps are provided
+- `Regression :boom:` if this appears to be a regression
+
+If the issue spans multiple areas, pick the primary area as the label and mention
+other relevant areas in the triage summary comment instead.
+
+**Then**: Call `add_comment` exactly **once** with this markdown:
+
+```
+## 🔍 Triage Summary
+
+| Check | Result |
+|-------|--------|
+| Issue type | <Bug / Feature / Question / Task> |
+| Environment | <All required environment details provided for investigation / ⚠️ Missing: list specific fields> |
+| Area | <Area label applied or "no match"> |
+| Duplicates | <None found / Potentially related: #NNN, #NNN> |
+| Regression | <Not indicated / Likely regression from vX.Y.Z / Inconclusive> |
+
+### Analysis
+
+<2-4 sentences: what the issue is about, which component is likely affected,
+and severity assessment (P0-P3)>
+
+### Next Steps
+
+<Actionable items. Be specific, not vague.
+- If environment details are missing: explicitly ask the author to provide the
+  specific missing fields (e.g. "@author, please provide: .NET target framework,
+  SQL Server version, and Operating system so we can proceed with investigation.")
+- If environment is complete and this is a confirmed bug: state that assign this issue to Copilot coding agent to investigate, AND include specific
+  investigation guidance based on the analysis (e.g. "Assign to Copilot coding
+  agent to investigate SqlDataReader.GetFieldValueAsync and related async internals
+  to apply the same Nullable<T> handling logic present in the synchronous path.")
+- If duplicates were found: recommend reviewing the linked issues before proceeding.
+- If regression: note the version boundary and state that bisection is recommended.>
+
+> **Note**: This triage summary is auto-generated by an AI agent. The analysis and suggestions above have not been verified by a human maintainer. Please treat as preliminary guidance only.
+```
+
+<!-- Phase 2: Uncomment when ready to enable automatic Copilot coding agent assignment
+**Finally**: If this is a confirmed code bug with complete environment info,
+call `assign_to_agent` to assign Copilot coding agent.
+-->
+
+If the issue is spam or no action is needed, call the `noop` tool instead.
\ No newline at end of file

From 97b2c47283ee01f9d129f04acf69bcbe928cce4b Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 13 May 2026 00:21:37 -0700
Subject: [PATCH 096/298] Upgrade and regenerate outdated agentic workflow
 artifacts (#4279)

* Upgrade and regenerate outdated aw artifacts

* + update other gh workflows
---
 .github/agents/agentic-workflows.agent.md | 196 ++++++++++++
 .github/aw/actions-lock.json              |  29 +-
 .github/workflows/cherry-pick-hotfix.yml  |   4 +-
 .github/workflows/codeql.yml              |   4 +-
 .github/workflows/copilot-setup-steps.yml |  26 ++
 .github/workflows/issue-triage.lock.yml   | 360 ++++++++++++++++------
 .github/workflows/issue-triage.md         |   8 -
 7 files changed, 515 insertions(+), 112 deletions(-)
 create mode 100644 .github/agents/agentic-workflows.agent.md
 create mode 100644 .github/workflows/copilot-setup-steps.yml

diff --git a/.github/agents/agentic-workflows.agent.md b/.github/agents/agentic-workflows.agent.md
new file mode 100644
index 0000000000..cd376c5b1b
--- /dev/null
+++ b/.github/agents/agentic-workflows.agent.md
@@ -0,0 +1,196 @@
+---
+description: GitHub Agentic Workflows (gh-aw) - Create, debug, and upgrade AI-powered workflows with intelligent prompt routing
+disable-model-invocation: true
+---
+
+# GitHub Agentic Workflows Agent
+
+This agent helps you work with **GitHub Agentic Workflows (gh-aw)**, a CLI extension for creating AI-powered workflows in natural language using markdown files.
+
+## What This Agent Does
+
+This is a **dispatcher agent** that routes your request to the appropriate specialized prompt based on your task:
+
+- **Creating new workflows**: Routes to `create` prompt
+- **Updating existing workflows**: Routes to `update` prompt
+- **Debugging workflows**: Routes to `debug` prompt  
+- **Upgrading workflows**: Routes to `upgrade-agentic-workflows` prompt
+- **Creating report-generating workflows**: Routes to `report` prompt — consult this whenever the workflow posts status updates, audits, analyses, or any structured output as issues, discussions, or comments
+- **Creating shared components**: Routes to `create-shared-agentic-workflow` prompt
+- **Fixing Dependabot PRs**: Routes to `dependabot` prompt — use this when Dependabot opens PRs that modify generated manifest files (`.github/workflows/package.json`, `.github/workflows/requirements.txt`, `.github/workflows/go.mod`). Never merge those PRs directly; instead update the source `.md` files and rerun `gh aw compile --dependabot` to bundle all fixes
+- **Analyzing test coverage**: Routes to `test-coverage` prompt — consult this whenever the workflow reads, analyzes, or reports on test coverage data from PRs or CI runs
+- **CLI commands and triggering workflows**: Routes to `cli-commands` guide — consult this whenever the user asks how to run, compile, debug, or manage workflows from the command line, or when they need the MCP tool equivalent of a `gh aw` command
+
+Workflows may optionally include:
+
+- **Project tracking / monitoring** (GitHub Projects updates, status reporting)
+- **Orchestration / coordination** (one workflow assigning agents or dispatching and coordinating other workflows)
+
+## Files This Applies To
+
+- Workflow files: `.github/workflows/*.md` and `.github/workflows/**/*.md`
+- Workflow lock files: `.github/workflows/*.lock.yml`
+- Shared components: `.github/workflows/shared/*.md`
+- Configuration: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/github-agentic-workflows.md
+
+## Problems This Solves
+
+- **Workflow Creation**: Design secure, validated agentic workflows with proper triggers, tools, and permissions
+- **Workflow Debugging**: Analyze logs, identify missing tools, investigate failures, and fix configuration issues
+- **Version Upgrades**: Migrate workflows to new gh-aw versions, apply codemods, fix breaking changes
+- **Component Design**: Create reusable shared workflow components that wrap MCP servers
+
+## How to Use
+
+When you interact with this agent, it will:
+
+1. **Understand your intent** - Determine what kind of task you're trying to accomplish
+2. **Route to the right prompt** - Load the specialized prompt file for your task
+3. **Execute the task** - Follow the detailed instructions in the loaded prompt
+
+## Available Prompts
+
+### Create New Workflow
+**Load when**: User wants to create a new workflow from scratch, add automation, or design a workflow that doesn't exist yet
+
+**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/create-agentic-workflow.md
+
+**Use cases**:
+- "Create a workflow that triages issues"
+- "I need a workflow to label pull requests"
+- "Design a weekly research automation"
+
+### Update Existing Workflow  
+**Load when**: User wants to modify, improve, or refactor an existing workflow
+
+**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/update-agentic-workflow.md
+
+**Use cases**:
+- "Add web-fetch tool to the issue-classifier workflow"
+- "Update the PR reviewer to use discussions instead of issues"
+- "Improve the prompt for the weekly-research workflow"
+
+### Debug Workflow  
+**Load when**: User needs to investigate, audit, debug, or understand a workflow, troubleshoot issues, analyze logs, or fix errors
+
+**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/debug-agentic-workflow.md
+
+**Use cases**:
+- "Why is this workflow failing?"
+- "Analyze the logs for workflow X"
+- "Investigate missing tool calls in run #12345"
+
+### Upgrade Agentic Workflows
+**Load when**: User wants to upgrade workflows to a new gh-aw version or fix deprecations
+
+**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/upgrade-agentic-workflows.md
+
+**Use cases**:
+- "Upgrade all workflows to the latest version"
+- "Fix deprecated fields in workflows"
+- "Apply breaking changes from the new release"
+
+### Create a Report-Generating Workflow
+**Load when**: The workflow being created or updated produces reports — recurring status updates, audit summaries, analyses, or any structured output posted as a GitHub issue, discussion, or comment
+
+**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/report.md
+
+**Use cases**:
+- "Create a weekly CI health report"
+- "Post a daily security audit to Discussions"
+- "Add a status update comment to open PRs"
+
+### Create Shared Agentic Workflow
+**Load when**: User wants to create a reusable workflow component or wrap an MCP server
+
+**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/create-shared-agentic-workflow.md
+
+**Use cases**:
+- "Create a shared component for Notion integration"
+- "Wrap the Slack MCP server as a reusable component"
+- "Design a shared workflow for database queries"
+
+### Fix Dependabot PRs
+**Load when**: User needs to close or fix open Dependabot PRs that update dependencies in generated manifest files (`.github/workflows/package.json`, `.github/workflows/requirements.txt`, `.github/workflows/go.mod`)
+
+**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/dependabot.md
+
+**Use cases**:
+- "Fix the open Dependabot PRs for npm dependencies"
+- "Bundle and close the Dependabot PRs for workflow dependencies"
+- "Update @playwright/test to fix the Dependabot PR"
+
+### Analyze Test Coverage
+**Load when**: The workflow reads, analyzes, or reports test coverage — whether triggered by a PR, a schedule, or a slash command. Always consult this prompt before designing the coverage data strategy.
+
+**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/test-coverage.md
+
+**Use cases**:
+- "Create a workflow that comments coverage on PRs"
+- "Analyze coverage trends over time"
+- "Add a coverage gate that blocks PRs below a threshold"
+
+### CLI Commands Reference
+**Load when**: The user asks how to run, compile, debug, or manage workflows from the command line; needs the MCP tool equivalent of a `gh aw` command; or is in a restricted environment (e.g., Copilot Cloud) without direct CLI access.
+
+**Reference file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/cli-commands.md
+
+**Use cases**:
+- "How do I trigger workflow X on the main branch?"
+- "What's the MCP equivalent of `gh aw logs`?"
+- "I'm in Copilot Cloud — how do I compile a workflow?"
+- "Show me all available gh aw commands"
+
+## Instructions
+
+When a user interacts with you:
+
+1. **Identify the task type** from the user's request
+2. **Load the appropriate prompt** from the GitHub repository URLs listed above
+3. **Follow the loaded prompt's instructions** exactly
+4. **If uncertain**, ask clarifying questions to determine the right prompt
+
+## Quick Reference
+
+```bash
+# Initialize repository for agentic workflows
+gh aw init
+
+# Generate the lock file for a workflow
+gh aw compile [workflow-name]
+
+# Trigger a workflow on demand (preferred over gh workflow run)
+gh aw run <workflow-name>             # interactive input collection
+gh aw run <workflow-name> --ref main  # run on a specific branch
+
+# Debug workflow runs
+gh aw logs [workflow-name]
+gh aw audit <run-id>
+
+# Upgrade workflows
+gh aw fix --write
+gh aw compile --validate
+```
+
+## Key Features of gh-aw
+
+- **Natural Language Workflows**: Write workflows in markdown with YAML frontmatter
+- **AI Engine Support**: Copilot, Claude, Codex, or custom engines
+- **MCP Server Integration**: Connect to Model Context Protocol servers for tools
+- **Safe Outputs**: Structured communication between AI and GitHub API
+- **Strict Mode**: Security-first validation and sandboxing
+- **Shared Components**: Reusable workflow building blocks
+- **Repo Memory**: Persistent git-backed storage for agents
+- **Sandboxed Execution**: All workflows run in the Agent Workflow Firewall (AWF) sandbox, enabling full `bash` and `edit` tools by default
+
+## Important Notes
+
+- Always reference the instructions file at https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/github-agentic-workflows.md for complete documentation
+- Use the MCP tool `agentic-workflows` when running in GitHub Copilot Cloud
+- Workflows must be compiled to `.lock.yml` files before running in GitHub Actions
+- **Bash tools are enabled by default** - Don't restrict bash commands unnecessarily since workflows are sandboxed by the AWF
+- Follow security best practices: minimal permissions, explicit network access, no template injection
+- **Network configuration**: Use ecosystem identifiers (`node`, `python`, `go`, etc.) or explicit FQDNs in `network.allowed`. Bare shorthands like `npm` or `pypi` are **not** valid. See https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/network.md for the full list of valid ecosystem identifiers and domain patterns.
+- **Single-file output**: When creating a workflow, produce exactly **one** workflow `.md` file. Do not create separate documentation files (architecture docs, runbooks, usage guides, etc.). If documentation is needed, add a brief `## Usage` section inside the workflow file itself.
+- **Triggering runs**: Always use `gh aw run <workflow-name>` to trigger a workflow on demand — not `gh workflow run <file>.lock.yml`. `gh aw run` handles workflow resolution by short name, input parsing and validation, and correct run-tracking for agentic workflows. Use `--ref <branch>` to run on a specific branch.
+- **CLI commands reference**: For a complete guide on all `gh aw` commands and their MCP tool equivalents (for restricted environments), see https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/cli-commands.md
diff --git a/.github/aw/actions-lock.json b/.github/aw/actions-lock.json
index 4f7d36b947..79ade5bd6f 100644
--- a/.github/aw/actions-lock.json
+++ b/.github/aw/actions-lock.json
@@ -1,14 +1,31 @@
 {
   "entries": {
-    "actions/github-script@v8": {
+    "actions/github-script@v9.0.0": {
       "repo": "actions/github-script",
-      "version": "v8",
-      "sha": "ed597411d8f924073f98dfc5c65a23a2325f34cd"
+      "version": "v9.0.0",
+      "sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
     },
-    "github/gh-aw-actions/setup@v0.68.1": {
+    "github/gh-aw-actions/setup@v0.72.1": {
       "repo": "github/gh-aw-actions/setup",
-      "version": "v0.68.1",
-      "sha": "2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc"
+      "version": "v0.72.1",
+      "sha": "bc56a0cad2f450c562810785ef38649c04db812a"
+    }
+  },
+  "containers": {
+    "ghcr.io/github/gh-aw-firewall/agent:0.25.41": {
+      "image": "ghcr.io/github/gh-aw-firewall/agent:0.25.41",
+      "digest": "sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770",
+      "pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770"
+    },
+    "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41": {
+      "image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41",
+      "digest": "sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0",
+      "pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0"
+    },
+    "ghcr.io/github/gh-aw-firewall/squid:0.25.41": {
+      "image": "ghcr.io/github/gh-aw-firewall/squid:0.25.41",
+      "digest": "sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4",
+      "pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4"
     }
   }
 }
diff --git a/.github/workflows/cherry-pick-hotfix.yml b/.github/workflows/cherry-pick-hotfix.yml
index 794d8e41d3..678a6b20b3 100644
--- a/.github/workflows/cherry-pick-hotfix.yml
+++ b/.github/workflows/cherry-pick-hotfix.yml
@@ -57,7 +57,7 @@ jobs:
       versions: ${{ steps.extract.outputs.versions }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           # Only the scripts directory is needed; skip full history.
           sparse-checkout: .github/scripts
@@ -91,7 +91,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           # Full history is required so the merge commit and target branch are available
           # for the cherry-pick operation.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c1e985ea03..75e4411e4b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -66,10 +66,10 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Setup .NET Core SDK
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.2.0
       with:
         global-json-file: global.json
 
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
new file mode 100644
index 0000000000..0ae42f6f5c
--- /dev/null
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -0,0 +1,26 @@
+name: "Copilot Setup Steps"
+
+# This workflow configures the environment for GitHub Copilot Agent with gh-aw MCP server
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+jobs:
+  # The job MUST be called 'copilot-setup-steps' to be recognized by GitHub Copilot Agent
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+
+    # Set minimal permissions for setup steps
+    # Copilot Agent receives its own token with appropriate permissions
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Install gh-aw extension
+        uses: github/gh-aw-actions/setup-cli@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+        with:
+          version: v0.72.1
diff --git a/.github/workflows/issue-triage.lock.yml b/.github/workflows/issue-triage.lock.yml
index 8f4f2d04d4..08a2e176b1 100644
--- a/.github/workflows/issue-triage.lock.yml
+++ b/.github/workflows/issue-triage.lock.yml
@@ -1,5 +1,5 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"ddda208c8014c64e57436e95b5e1c92431c6815b5d0f782bb6a01ee1e84a63d9","compiler_version":"v0.68.1","strict":true,"agent_id":"copilot"}
-# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9"},{"repo":"actions/upload-artifact","sha":"bbbca2ddaa5d8feaa63e36b76fdaad77386f024f","version":"v7"},{"repo":"github/gh-aw-actions/setup","sha":"2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc","version":"v0.68.1"}]}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"ddda208c8014c64e57436e95b5e1c92431c6815b5d0f782bb6a01ee1e84a63d9","compiler_version":"v0.72.1","strict":true,"agent_id":"copilot"}
+# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"bc56a0cad2f450c562810785ef38649c04db812a","version":"v0.72.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.41","digest":"sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41","digest":"sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.41","digest":"sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.6","digest":"sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.6@sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c"},{"image":"ghcr.io/github/github-mcp-server:v1.0.3","digest":"sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959","pinned_image":"ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959"},{"image":"node:lts-alpine","digest":"sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f","pinned_image":"node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f"}]}
 #    ___                   _   _      
 #   / _ \                 | | (_)     
 #  | |_| | __ _  ___ _ __ | |_ _  ___ 
@@ -14,7 +14,7 @@
 # \  /\  / (_) | | | | ( | | | | (_) \ V  V /\__ \
 #  \/  \/ \___/|_| |_|\_\|_| |_|\___/ \_/\_/ |___/
 #
-# This file was automatically generated by gh-aw (v0.68.1). DO NOT EDIT.
+# This file was automatically generated by gh-aw (v0.72.1). DO NOT EDIT.
 #
 # To update this file, edit the corresponding .md file and run:
 #   gh aw compile
@@ -32,9 +32,18 @@
 # Custom actions used:
 #   - actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 #   - actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-#   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
-#   - actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
-#   - github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+#   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+#   - actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+#   - actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+#   - github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+#
+# Container images used:
+#   - ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770
+#   - ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0
+#   - ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4
+#   - ghcr.io/github/gh-aw-mcpg:v0.3.6@sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c
+#   - ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959
+#   - node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f
 
 name: "SqlClient Issue Auto-Triage"
 "on":
@@ -60,6 +69,7 @@ jobs:
       body: ${{ steps.sanitized.outputs.body }}
       comment_id: ""
       comment_repo: ""
+      engine_id: ${{ steps.generate_aw_info.outputs.engine_id }}
       lockdown_check_failed: ${{ steps.generate_aw_info.outputs.lockdown_check_failed == 'true' }}
       model: ${{ steps.generate_aw_info.outputs.model }}
       secret_verification_result: ${{ steps.validate-secret.outputs.verification_result }}
@@ -70,30 +80,34 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+        uses: github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
+        env:
+          GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.40"
       - name: Generate agentic run info
         id: generate_aw_info
         env:
           GH_AW_INFO_ENGINE_ID: "copilot"
           GH_AW_INFO_ENGINE_NAME: "GitHub Copilot CLI"
-          GH_AW_INFO_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || 'auto' }}
-          GH_AW_INFO_VERSION: "1.0.21"
-          GH_AW_INFO_AGENT_VERSION: "1.0.21"
-          GH_AW_INFO_CLI_VERSION: "v0.68.1"
+          GH_AW_INFO_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || 'claude-sonnet-4.6' }}
+          GH_AW_INFO_VERSION: "1.0.40"
+          GH_AW_INFO_AGENT_VERSION: "1.0.40"
+          GH_AW_INFO_CLI_VERSION: "v0.72.1"
           GH_AW_INFO_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_INFO_EXPERIMENTAL: "false"
           GH_AW_INFO_SUPPORTS_TOOLS_ALLOWLIST: "true"
           GH_AW_INFO_STAGED: "false"
           GH_AW_INFO_ALLOWED_DOMAINS: '["defaults"]'
           GH_AW_INFO_FIREWALL_ENABLED: "true"
-          GH_AW_INFO_AWF_VERSION: "v0.25.18"
+          GH_AW_INFO_AWF_VERSION: "v0.25.41"
           GH_AW_INFO_AWMG_VERSION: ""
           GH_AW_INFO_FIREWALL_TYPE: "squid"
           GH_AW_COMPILED_STRICT: "true"
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -112,11 +126,23 @@ jobs:
           sparse-checkout: |
             .github
             .agents
+            .claude
+            .codex
+            .crush
+            .gemini
+            .opencode
+            .pi
           sparse-checkout-cone-mode: true
           fetch-depth: 1
+      - name: Save agent config folders for base branch restoration
+        env:
+          GH_AW_AGENT_FOLDERS: ".agents .claude .codex .crush .gemini .github .opencode .pi"
+          GH_AW_AGENT_FILES: ".crush.json AGENTS.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
+        # poutine:ignore untrusted_checkout_exec
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/save_base_github_folders.sh"
       - name: Check workflow lock file
         id: check-lock-file
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_WORKFLOW_FILE: "issue-triage.lock.yml"
           GH_AW_CONTEXT_WORKFLOW_REF: "${{ github.workflow_ref }}"
@@ -127,9 +153,9 @@ jobs:
             const { main } = require('${{ runner.temp }}/gh-aw/actions/check_workflow_timestamp_api.cjs');
             await main();
       - name: Check compile-agentic version
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          GH_AW_COMPILED_VERSION: "v0.68.1"
+          GH_AW_COMPILED_VERSION: "v0.72.1"
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -138,7 +164,9 @@ jobs:
             await main();
       - name: Compute current body text
         id: sanitized
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -172,6 +200,9 @@ jobs:
           <safe-output-tools>
           Tools: add_comment, add_labels(max:5), missing_tool, missing_data, noop
           </safe-output-tools>
+          GH_AW_PROMPT_bef3a8b6a480c883_EOF
+          cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
+          cat << 'GH_AW_PROMPT_bef3a8b6a480c883_EOF'
           <github-context>
           The following GitHub context information is available for this workflow:
           {{#if __GH_AW_GITHUB_ACTOR__ }}
@@ -208,9 +239,10 @@ jobs:
           GH_AW_PROMPT_bef3a8b6a480c883_EOF
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_ENGINE_ID: "copilot"
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -218,7 +250,7 @@ jobs:
             const { main } = require('${{ runner.temp }}/gh-aw/actions/interpolate_prompt.cjs');
             await main();
       - name: Substitute placeholders
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
           GH_AW_GITHUB_ACTOR: ${{ github.actor }}
@@ -229,6 +261,7 @@ jobs:
           GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
           GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
           GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
+          GH_AW_MCP_CLI_SERVERS_LIST: '- `safeoutputs` — run `safeoutputs --help` to see available tools'
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -247,7 +280,8 @@ jobs:
                 GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER: process.env.GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER,
                 GH_AW_GITHUB_REPOSITORY: process.env.GH_AW_GITHUB_REPOSITORY,
                 GH_AW_GITHUB_RUN_ID: process.env.GH_AW_GITHUB_RUN_ID,
-                GH_AW_GITHUB_WORKSPACE: process.env.GH_AW_GITHUB_WORKSPACE
+                GH_AW_GITHUB_WORKSPACE: process.env.GH_AW_GITHUB_WORKSPACE,
+                GH_AW_MCP_CLI_SERVERS_LIST: process.env.GH_AW_MCP_CLI_SERVERS_LIST
               }
             });
       - name: Validate prompt placeholders
@@ -262,13 +296,18 @@ jobs:
         run: bash "${RUNNER_TEMP}/gh-aw/actions/print_prompt_summary.sh"
       - name: Upload activation artifact
         if: success()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: activation
+          include-hidden-files: true
           path: |
             /tmp/gh-aw/aw_info.json
             /tmp/gh-aw/aw-prompts/prompt.txt
+            /tmp/gh-aw/aw-prompts/prompt-template.txt
+            /tmp/gh-aw/aw-prompts/prompt-import-tree.json
             /tmp/gh-aw/github_rate_limits.jsonl
+            /tmp/gh-aw/base
+            /tmp/gh-aw/.github/agents
           if-no-files-found: ignore
           retention-days: 1
 
@@ -287,28 +326,37 @@ jobs:
       GH_AW_MCP_LOG_DIR: /tmp/gh-aw/mcp-logs/safeoutputs
       GH_AW_WORKFLOW_ID_SANITIZED: issuetriage
     outputs:
+      agentic_engine_timeout: ${{ steps.detect-copilot-errors.outputs.agentic_engine_timeout || 'false' }}
       checkout_pr_success: ${{ steps.checkout-pr.outputs.checkout_pr_success || 'true' }}
       effective_tokens: ${{ steps.parse-mcp-gateway.outputs.effective_tokens }}
       has_patch: ${{ steps.collect_output.outputs.has_patch }}
-      inference_access_error: ${{ steps.detect-inference-error.outputs.inference_access_error || 'false' }}
+      inference_access_error: ${{ steps.detect-copilot-errors.outputs.inference_access_error || 'false' }}
+      mcp_policy_error: ${{ steps.detect-copilot-errors.outputs.mcp_policy_error || 'false' }}
       model: ${{ needs.activation.outputs.model }}
+      model_not_supported_error: ${{ steps.detect-copilot-errors.outputs.model_not_supported_error || 'false' }}
       output: ${{ steps.collect_output.outputs.output }}
       output_types: ${{ steps.collect_output.outputs.output_types }}
       setup-trace-id: ${{ steps.setup.outputs.trace-id }}
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+        uses: github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+        env:
+          GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.40"
       - name: Set runtime paths
         id: set-runtime-paths
         run: |
-          echo "GH_AW_SAFE_OUTPUTS=${RUNNER_TEMP}/gh-aw/safeoutputs/outputs.jsonl" >> "$GITHUB_OUTPUT"
-          echo "GH_AW_SAFE_OUTPUTS_CONFIG_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" >> "$GITHUB_OUTPUT"
-          echo "GH_AW_SAFE_OUTPUTS_TOOLS_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/tools.json" >> "$GITHUB_OUTPUT"
+          {
+            echo "GH_AW_SAFE_OUTPUTS=${RUNNER_TEMP}/gh-aw/safeoutputs/outputs.jsonl"
+            echo "GH_AW_SAFE_OUTPUTS_CONFIG_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/config.json"
+            echo "GH_AW_SAFE_OUTPUTS_TOOLS_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/tools.json"
+          } >> "$GITHUB_OUTPUT"
       - name: Checkout repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
@@ -336,7 +384,7 @@ jobs:
         id: checkout-pr
         if: |
           github.event.pull_request || github.event.issue.pull_request
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
         with:
@@ -347,11 +395,11 @@ jobs:
             const { main } = require('${{ runner.temp }}/gh-aw/actions/checkout_pr_branch.cjs');
             await main();
       - name: Install GitHub Copilot CLI
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.21
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.40
         env:
           GH_HOST: github.com
       - name: Install AWF binary
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.18
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.41
       - name: Parse integrity filter lists
         id: parse-guard-vars
         env:
@@ -359,9 +407,25 @@ jobs:
           GH_AW_TRUSTED_USERS_VAR: ${{ vars.GH_AW_GITHUB_TRUSTED_USERS || '' }}
           GH_AW_APPROVAL_LABELS_VAR: ${{ vars.GH_AW_GITHUB_APPROVAL_LABELS || '' }}
         run: bash "${RUNNER_TEMP}/gh-aw/actions/parse_guard_list.sh"
+      - name: Download activation artifact
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: activation
+          path: /tmp/gh-aw
+      - name: Restore agent config folders from base branch
+        if: steps.checkout-pr.outcome == 'success'
+        env:
+          GH_AW_AGENT_FOLDERS: ".agents .claude .codex .crush .gemini .github .opencode .pi"
+          GH_AW_AGENT_FILES: ".crush.json AGENTS.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_base_github_folders.sh"
+      - name: Restore inline sub-agents from activation artifact
+        env:
+          GH_AW_SUB_AGENT_DIR: ".github/agents"
+          GH_AW_SUB_AGENT_EXT: ".agent.md"
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_inline_sub_agents.sh"
       - name: Download container images
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.25.18 ghcr.io/github/gh-aw-firewall/api-proxy:0.25.18 ghcr.io/github/gh-aw-firewall/squid:0.25.18 ghcr.io/github/gh-aw-mcpg:v0.2.17 ghcr.io/github/github-mcp-server:v0.32.0 node:lts-alpine
-      - name: Write Safe Outputs Config
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770 ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0 ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4 ghcr.io/github/gh-aw-mcpg:v0.3.6@sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959 node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f
+      - name: Generate Safe Outputs Config
         run: |
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
@@ -369,12 +433,12 @@ jobs:
           cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_6f7dd6f136148d14_EOF'
           {"add_comment":{"hide_older_comments":true,"max":1},"add_labels":{"max":5},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
           GH_AW_SAFE_OUTPUTS_CONFIG_6f7dd6f136148d14_EOF
-      - name: Write Safe Outputs Tools
+      - name: Generate Safe Outputs Tools
         env:
           GH_AW_TOOLS_META_JSON: |
             {
               "description_suffixes": {
-                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added.",
+                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added. Supports reply_to_id for discussion threading.",
                 "add_labels": " CONSTRAINTS: Maximum 5 label(s) can be added."
               },
               "repo_params": {},
@@ -394,6 +458,10 @@ jobs:
                   "item_number": {
                     "issueOrPRNumber": true
                   },
+                  "reply_to_id": {
+                    "type": "string",
+                    "maxLength": 256
+                  },
                   "repo": {
                     "type": "string",
                     "maxLength": 256
@@ -493,7 +561,7 @@ jobs:
                 }
               }
             }
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -549,11 +617,12 @@ jobs:
           GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
         run: |
           set -eo pipefail
-          mkdir -p /tmp/gh-aw/mcp-config
+          mkdir -p "${RUNNER_TEMP}/gh-aw/mcp-config"
           
           # Export gateway environment variables for MCP config and gateway script
-          export MCP_GATEWAY_PORT="80"
+          export MCP_GATEWAY_PORT="8080"
           export MCP_GATEWAY_DOMAIN="host.docker.internal"
+          export MCP_GATEWAY_HOST_DOMAIN="localhost"
           MCP_GATEWAY_API_KEY=$(openssl rand -base64 45 | tr -d '/+=')
           echo "::add-mask::${MCP_GATEWAY_API_KEY}"
           export MCP_GATEWAY_API_KEY
@@ -563,15 +632,19 @@ jobs:
           export DEBUG="*"
           
           export GH_AW_ENGINE="copilot"
-          export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GH_AW_SAFE_OUTPUTS_PORT -e GH_AW_SAFE_OUTPUTS_API_KEY -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.2.17'
+          MCP_GATEWAY_UID=$(id -u 2>/dev/null || echo '0')
+          MCP_GATEWAY_GID=$(id -g 2>/dev/null || echo '0')
+          DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
+          export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GH_AW_SAFE_OUTPUTS_PORT -e GH_AW_SAFE_OUTPUTS_API_KEY -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.6'
           
           mkdir -p /home/runner/.copilot
-          cat << GH_AW_MCP_CONFIG_47425e2eb31c9c9e_EOF | bash "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.sh"
+          GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
+          cat << GH_AW_MCP_CONFIG_47425e2eb31c9c9e_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
               "github": {
                 "type": "stdio",
-                "container": "ghcr.io/github/github-mcp-server:v0.32.0",
+                "container": "ghcr.io/github/github-mcp-server:v1.0.3",
                 "env": {
                   "GITHUB_HOST": "\${GITHUB_SERVER_URL}",
                   "GITHUB_PERSONAL_ACCESS_TOKEN": "\${GITHUB_MCP_SERVER_TOKEN}",
@@ -611,14 +684,27 @@ jobs:
             }
           }
           GH_AW_MCP_CONFIG_47425e2eb31c9c9e_EOF
-      - name: Download activation artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      - name: Mount MCP servers as CLIs
+        id: mount-mcp-clis
+        continue-on-error: true
+        env:
+          MCP_GATEWAY_API_KEY: ${{ steps.start-mcp-gateway.outputs.gateway-api-key }}
+          MCP_GATEWAY_DOMAIN: ${{ steps.start-mcp-gateway.outputs.gateway-domain }}
+          MCP_GATEWAY_PORT: ${{ steps.start-mcp-gateway.outputs.gateway-port }}
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
-          name: activation
-          path: /tmp/gh-aw
-      - name: Clean git credentials
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/mount_mcp_as_cli.cjs');
+            await main();
+      - name: Clean credentials
         continue-on-error: true
         run: bash "${RUNNER_TEMP}/gh-aw/actions/clean_git_credentials.sh"
+      - name: Audit pre-agent workspace
+        id: pre_agent_audit
+        continue-on-error: true
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/audit_pre_agent_workspace.sh"
       - name: Execute GitHub Copilot CLI
         id: agentic_execution
         # Copilot CLI tool arguments (sorted):
@@ -626,21 +712,27 @@ jobs:
         run: |
           set -o pipefail
           touch /tmp/gh-aw/agent-step-summary.md
+          GH_AW_NODE_BIN=$(command -v node 2>/dev/null || true)
+          export GH_AW_NODE_BIN
           (umask 177 && touch /tmp/gh-aw/agent-stdio.log)
+          printf '%s\n' '{"$schema":"https://github.com/github/gh-aw-firewall/releases/download/v0.25.41/awf-config.schema.json","network":{"allowDomains":["api.business.githubcopilot.com","api.enterprise.githubcopilot.com","api.github.com","api.githubcopilot.com","api.individual.githubcopilot.com","api.snapcraft.io","archive.ubuntu.com","azure.archive.ubuntu.com","crl.geotrust.com","crl.globalsign.com","crl.identrust.com","crl.sectigo.com","crl.thawte.com","crl.usertrust.com","crl.verisign.com","crl3.digicert.com","crl4.digicert.com","crls.ssl.com","github.com","host.docker.internal","json-schema.org","json.schemastore.org","keyserver.ubuntu.com","ocsp.digicert.com","ocsp.geotrust.com","ocsp.globalsign.com","ocsp.identrust.com","ocsp.sectigo.com","ocsp.ssl.com","ocsp.thawte.com","ocsp.usertrust.com","ocsp.verisign.com","packagecloud.io","packages.cloud.google.com","packages.microsoft.com","ppa.launchpad.net","raw.githubusercontent.com","registry.npmjs.org","s.symcb.com","s.symcd.com","security.ubuntu.com","telemetry.enterprise.githubcopilot.com","ts-crl.ws.symantec.com","ts-ocsp.ws.symantec.com","www.googleapis.com"]},"apiProxy":{"enabled":true,"models":{"auto":["large"],"deep-research":["copilot/deep-research*","copilot/o3-deep-research*","copilot/o4-mini-deep-research*","google/deep-research*","openai/o3-deep-research*","openai/o4-mini-deep-research*"],"gemini-flash":["copilot/gemini-*flash*","google/gemini-*flash*"],"gemini-pro":["copilot/gemini-*pro*","google/gemini-*pro*"],"gpt-4.1":["copilot/gpt-4.1*","openai/gpt-4.1*"],"gpt-5":["copilot/gpt-5*","openai/gpt-5*"],"gpt-5-codex":["copilot/gpt-5*codex*","openai/gpt-5*codex*"],"gpt-5-mini":["copilot/gpt-5*mini*","openai/gpt-5*mini*"],"gpt-5-nano":["copilot/gpt-5*nano*","openai/gpt-5*nano*"],"gpt-5-pro":["copilot/gpt-5*pro*","openai/gpt-5*pro*"],"haiku":["copilot/*haiku*","anthropic/*haiku*"],"large":["sonnet","gpt-5-pro","gpt-5","gemini-pro"],"mini":["haiku","gpt-5-mini","gpt-5-nano","gemini-flash"],"opus":["copilot/*opus*","anthropic/*opus*"],"reasoning":["copilot/o1*","copilot/o3*","copilot/o4*","openai/o1*","openai/o3*","openai/o4*"],"small":["mini"],"sonnet":["copilot/*sonnet*","anthropic/*sonnet*"]}},"container":{"imageTag":"0.25.41,squid=sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4,agent=sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770,api-proxy=sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0"}}' > "${RUNNER_TEMP}/gh-aw/awf-config.json" && cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
           # shellcheck disable=SC1003
-          sudo -E awf --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" --env-all --exclude-env COPILOT_GITHUB_TOKEN --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_API_KEY --allow-domains api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --image-tag 0.25.18 --skip-pull --enable-api-proxy \
-            -- /bin/bash -c 'node ${RUNNER_TEMP}/gh-aw/actions/copilot_driver.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --allow-all-tools --allow-all-paths --add-dir "${GITHUB_WORKSPACE}" --prompt "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)"' 2>&1 | tee -a /tmp/gh-aw/agent-stdio.log
+          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" --env-all --exclude-env COPILOT_GITHUB_TOKEN --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_API_KEY --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
+            -- /bin/bash -c 'export PATH="${RUNNER_TEMP}/gh-aw/mcp-cli/bin:$PATH" && export PATH="$(find /opt/hostedtoolcache /home/runner/work/_tool -maxdepth 4 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || echo node)"; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --allow-all-paths --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/agent-stdio.log
         env:
+          AWF_REFLECT_ENABLED: 1
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
+          COPILOT_API_KEY: dummy-byok-key-for-offline-mode
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || '' }}
+          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || 'claude-sonnet-4.6' }}
           GH_AW_MCP_CONFIG: /home/runner/.copilot/mcp-config.json
           GH_AW_PHASE: agent
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
           GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
-          GH_AW_VERSION: v0.68.1
+          GH_AW_VERSION: v0.72.1
           GITHUB_API_URL: ${{ github.api_url }}
           GITHUB_AW: true
+          GITHUB_COPILOT_INTEGRATION_ID: agentic-workflows
           GITHUB_HEAD_REF: ${{ github.head_ref }}
           GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           GITHUB_REF_NAME: ${{ github.ref_name }}
@@ -652,11 +744,11 @@ jobs:
           GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
           GIT_COMMITTER_NAME: github-actions[bot]
           XDG_CONFIG_HOME: /home/runner
-      - name: Detect inference access error
-        id: detect-inference-error
+      - name: Detect Copilot errors
+        id: detect-copilot-errors
         if: always()
         continue-on-error: true
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/detect_inference_access_error.sh"
+        run: node "${RUNNER_TEMP}/gh-aw/actions/detect_copilot_errors.cjs"
       - name: Configure Git credentials
         env:
           REPO_NAME: ${{ github.repository }}
@@ -685,7 +777,7 @@ jobs:
           bash "${RUNNER_TEMP}/gh-aw/actions/stop_mcp_gateway.sh" "$GATEWAY_PID"
       - name: Redact secrets in logs
         if: always()
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -711,7 +803,7 @@ jobs:
       - name: Ingest agent output
         id: collect_output
         if: always()
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
           GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
@@ -725,7 +817,7 @@ jobs:
             await main();
       - name: Parse agent logs for step summary
         if: always()
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: /tmp/gh-aw/sandbox/agent/logs/
         with:
@@ -737,7 +829,7 @@ jobs:
       - name: Parse MCP Gateway logs for step summary
         if: always()
         id: parse-mcp-gateway
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -750,9 +842,9 @@ jobs:
         env:
           AWF_LOGS_DIR: /tmp/gh-aw/sandbox/firewall/logs
         run: |
-          # Fix permissions on firewall logs so they can be uploaded as artifacts
+          # Fix permissions on firewall logs/audit dirs so they can be uploaded as artifacts
           # AWF runs with sudo, creating files owned by root
-          sudo chmod -R a+r /tmp/gh-aw/sandbox/firewall/logs 2>/dev/null || true
+          sudo chmod -R a+rX /tmp/gh-aw/sandbox/firewall 2>/dev/null || true
           # Only run awf logs summary if awf command exists (it may not be installed if workflow failed before install step)
           if command -v awf &> /dev/null; then
             awf logs summary | tee -a "$GITHUB_STEP_SUMMARY"
@@ -762,13 +854,23 @@ jobs:
       - name: Parse token usage for step summary
         if: always()
         continue-on-error: true
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
             setupGlobals(core, github, context, exec, io, getOctokit);
             const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_token_usage.cjs');
             await main();
+      - name: Print AWF reflect summary
+        if: always()
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/awf_reflect_summary.cjs');
+            await main();
       - name: Write agent output placeholder if missing
         if: always()
         run: |
@@ -778,7 +880,7 @@ jobs:
       - name: Upload agent artifacts
         if: always()
         continue-on-error: true
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: agent
           path: |
@@ -790,22 +892,17 @@ jobs:
             !/tmp/gh-aw/proxy-logs/proxy-tls/
             /tmp/gh-aw/agent_usage.json
             /tmp/gh-aw/agent-stdio.log
+            /tmp/gh-aw/pre-agent-audit.txt
             /tmp/gh-aw/agent/
             /tmp/gh-aw/github_rate_limits.jsonl
             /tmp/gh-aw/safeoutputs.jsonl
             /tmp/gh-aw/agent_output.json
             /tmp/gh-aw/aw-*.patch
             /tmp/gh-aw/aw-*.bundle
-          if-no-files-found: ignore
-      - name: Upload firewall audit logs
-        if: always()
-        continue-on-error: true
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
-        with:
-          name: firewall-audit-logs
-          path: |
+            /tmp/gh-aw/awf-config.json
             /tmp/gh-aw/sandbox/firewall/logs/
             /tmp/gh-aw/sandbox/firewall/audit/
+            /tmp/gh-aw/sandbox/firewall/awf-reflect.json
           if-no-files-found: ignore
 
   conclusion:
@@ -834,11 +931,15 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+        uses: github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+        env:
+          GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.40"
       - name: Download agent output artifact
         id: download-agent-output
         continue-on-error: true
@@ -853,9 +954,9 @@ jobs:
           mkdir -p /tmp/gh-aw/
           find "/tmp/gh-aw/" -type f -print
           echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
-      - name: Process No-Op Messages
+      - name: Process no-op messages
         id: noop
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_NOOP_MAX: "1"
@@ -870,9 +971,25 @@ jobs:
             setupGlobals(core, github, context, exec, io, getOctokit);
             const { main } = require('${{ runner.temp }}/gh-aw/actions/handle_noop_message.cjs');
             await main();
+      - name: Log detection run
+        id: detection_runs
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
+          GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/handle_detection_runs.cjs');
+            await main();
       - name: Record missing tool
         id: missing_tool
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_MISSING_TOOL_CREATE_ISSUE: "true"
@@ -886,7 +1003,7 @@ jobs:
             await main();
       - name: Record incomplete
         id: report_incomplete
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_REPORT_INCOMPLETE_CREATE_ISSUE: "true"
@@ -901,21 +1018,28 @@ jobs:
       - name: Handle agent failure
         id: handle_agent_failure
         if: always()
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
           GH_AW_WORKFLOW_ID: "issue-triage"
+          GH_AW_ACTION_FAILURE_ISSUE_EXPIRES_HOURS: "168"
           GH_AW_ENGINE_ID: "copilot"
           GH_AW_SECRET_VERIFICATION_RESULT: ${{ needs.activation.outputs.secret_verification_result }}
           GH_AW_CHECKOUT_PR_SUCCESS: ${{ needs.agent.outputs.checkout_pr_success }}
           GH_AW_INFERENCE_ACCESS_ERROR: ${{ needs.agent.outputs.inference_access_error }}
+          GH_AW_MCP_POLICY_ERROR: ${{ needs.agent.outputs.mcp_policy_error }}
+          GH_AW_AGENTIC_ENGINE_TIMEOUT: ${{ needs.agent.outputs.agentic_engine_timeout }}
+          GH_AW_MODEL_NOT_SUPPORTED_ERROR: ${{ needs.agent.outputs.model_not_supported_error }}
+          GH_AW_ENGINE_API_HOSTS: "api.enterprise.githubcopilot.com,api.githubcopilot.com,api.business.githubcopilot.com,api.individual.githubcopilot.com"
           GH_AW_LOCKDOWN_CHECK_FAILED: ${{ needs.activation.outputs.lockdown_check_failed }}
           GH_AW_STALE_LOCK_FILE_FAILED: ${{ needs.activation.outputs.stale_lock_file_failed }}
           GH_AW_GROUP_REPORTS: "false"
           GH_AW_FAILURE_REPORT_AS_ISSUE: "true"
+          GH_AW_MISSING_TOOL_REPORT_AS_FAILURE: "true"
+          GH_AW_MISSING_DATA_REPORT_AS_FAILURE: "true"
           GH_AW_TIMEOUT_MINUTES: "20"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
@@ -936,15 +1060,20 @@ jobs:
       contents: read
     outputs:
       detection_conclusion: ${{ steps.detection_conclusion.outputs.conclusion }}
+      detection_reason: ${{ steps.detection_conclusion.outputs.reason }}
       detection_success: ${{ steps.detection_conclusion.outputs.success }}
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+        uses: github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+        env:
+          GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.40"
       - name: Download agent output artifact
         id: download-agent-output
         continue-on-error: true
@@ -965,8 +1094,12 @@ jobs:
         with:
           persist-credentials: false
       # --- Threat Detection ---
+      - name: Clean stale firewall files from agent artifact
+        run: |
+          rm -rf /tmp/gh-aw/sandbox/firewall/logs
+          rm -rf /tmp/gh-aw/sandbox/firewall/audit
       - name: Download container images
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.25.18 ghcr.io/github/gh-aw-firewall/api-proxy:0.25.18 ghcr.io/github/gh-aw-firewall/squid:0.25.18
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770 ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0 ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4
       - name: Check if detection needed
         id: detection_guard
         if: always()
@@ -981,10 +1114,10 @@ jobs:
             echo "run_detection=false" >> "$GITHUB_OUTPUT"
             echo "Detection skipped: no agent outputs or patches to analyze"
           fi
-      - name: Clear MCP configuration for detection
+      - name: Clear MCP Config for detection
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         run: |
-          rm -f /tmp/gh-aw/mcp-config/mcp-servers.json
+          rm -f "${RUNNER_TEMP}/gh-aw/mcp-config/mcp-servers.json"
           rm -f /home/runner/.copilot/mcp-config.json
           rm -f "$GITHUB_WORKSPACE/.gemini/settings.json"
       - name: Prepare threat detection files
@@ -1003,7 +1136,7 @@ jobs:
           ls -la /tmp/gh-aw/threat-detection/ 2>/dev/null || true
       - name: Setup threat detection
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           WORKFLOW_DESCRIPTION: "No description provided"
@@ -1019,33 +1152,45 @@ jobs:
         run: |
           mkdir -p /tmp/gh-aw/threat-detection
           touch /tmp/gh-aw/threat-detection/detection.log
+      - name: Setup Node.js
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version: '24'
+          package-manager-cache: false
       - name: Install GitHub Copilot CLI
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.21
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.40
         env:
           GH_HOST: github.com
       - name: Install AWF binary
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.18
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.41
       - name: Execute GitHub Copilot CLI
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        continue-on-error: true
         id: detection_agentic_execution
         # Copilot CLI tool arguments (sorted):
         timeout-minutes: 20
         run: |
           set -o pipefail
           touch /tmp/gh-aw/agent-step-summary.md
+          GH_AW_NODE_BIN=$(command -v node 2>/dev/null || true)
+          export GH_AW_NODE_BIN
           (umask 177 && touch /tmp/gh-aw/threat-detection/detection.log)
+          printf '%s\n' '{"$schema":"https://github.com/github/gh-aw-firewall/releases/download/v0.25.41/awf-config.schema.json","network":{"allowDomains":["api.business.githubcopilot.com","api.enterprise.githubcopilot.com","api.github.com","api.githubcopilot.com","api.individual.githubcopilot.com","github.com","host.docker.internal","telemetry.enterprise.githubcopilot.com"]},"apiProxy":{"enabled":true},"container":{"imageTag":"0.25.41"}}' > "${RUNNER_TEMP}/gh-aw/awf-config.json" && cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
           # shellcheck disable=SC1003
-          sudo -E awf --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" --env-all --exclude-env COPILOT_GITHUB_TOKEN --allow-domains api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,github.com,host.docker.internal,telemetry.enterprise.githubcopilot.com --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --image-tag 0.25.18 --skip-pull --enable-api-proxy \
-            -- /bin/bash -c 'node ${RUNNER_TEMP}/gh-aw/actions/copilot_driver.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --allow-all-tools --add-dir "${GITHUB_WORKSPACE}" --prompt "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)"' 2>&1 | tee -a /tmp/gh-aw/threat-detection/detection.log
+          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" --env-all --exclude-env COPILOT_GITHUB_TOKEN --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
+            -- /bin/bash -c 'export PATH="$(find /opt/hostedtoolcache /home/runner/work/_tool -maxdepth 4 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || echo node)"; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/threat-detection/detection.log
         env:
+          AWF_REFLECT_ENABLED: 1
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
+          COPILOT_API_KEY: dummy-byok-key-for-offline-mode
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_DETECTION_COPILOT || '' }}
+          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_DETECTION_COPILOT || 'claude-sonnet-4.6' }}
           GH_AW_PHASE: detection
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
-          GH_AW_VERSION: v0.68.1
+          GH_AW_VERSION: v0.72.1
           GITHUB_API_URL: ${{ github.api_url }}
           GITHUB_AW: true
+          GITHUB_COPILOT_INTEGRATION_ID: agentic-workflows
           GITHUB_HEAD_REF: ${{ github.head_ref }}
           GITHUB_REF_NAME: ${{ github.ref_name }}
           GITHUB_SERVER_URL: ${{ github.server_url }}
@@ -1058,7 +1203,7 @@ jobs:
           XDG_CONFIG_HOME: /home/runner
       - name: Upload threat detection log
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: detection
           path: /tmp/gh-aw/threat-detection/detection.log
@@ -1066,15 +1211,33 @@ jobs:
       - name: Parse and conclude threat detection
         id: detection_conclusion
         if: always()
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           RUN_DETECTION: ${{ steps.detection_guard.outputs.run_detection }}
+          GH_AW_DETECTION_CONTINUE_ON_ERROR: "true"
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
-            setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_threat_detection_results.cjs');
-            await main();
+            try {
+              const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+              setupGlobals(core, github, context, exec, io, getOctokit);
+              const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_threat_detection_results.cjs');
+              await main();
+            } catch (loadErr) {
+              const continueOnError = process.env.GH_AW_DETECTION_CONTINUE_ON_ERROR !== 'false';
+              const msg = 'ERR_SYSTEM: \u274C Unexpected error loading threat detection module: ' + (loadErr && loadErr.message ? loadErr.message : String(loadErr));
+              core.error(msg);
+              core.setOutput('reason', 'parse_error');
+              if (continueOnError) {
+                core.warning('\u26A0\uFE0F ' + msg);
+                core.setOutput('conclusion', 'warning');
+                core.setOutput('success', 'false');
+              } else {
+                core.setOutput('conclusion', 'failure');
+                core.setOutput('success', 'false');
+                core.setFailed(msg);
+              }
+            }
 
   safe_outputs:
     needs:
@@ -1091,9 +1254,12 @@ jobs:
     timeout-minutes: 15
     env:
       GH_AW_CALLER_WORKFLOW_ID: "${{ github.repository }}/issue-triage"
+      GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
+      GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
       GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens }}
       GH_AW_ENGINE_ID: "copilot"
       GH_AW_ENGINE_MODEL: ${{ needs.agent.outputs.model }}
+      GH_AW_ENGINE_VERSION: "1.0.40"
       GH_AW_WORKFLOW_ID: "issue-triage"
       GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
     outputs:
@@ -1108,11 +1274,15 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@2fe53acc038ba01c3bbdc767d4b25df31ca5bdfc # v0.68.1
+        uses: github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+        env:
+          GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.40"
       - name: Download agent output artifact
         id: download-agent-output
         continue-on-error: true
@@ -1138,7 +1308,7 @@ jobs:
           echo "GH_HOST=${GH_HOST}" >> "$GITHUB_ENV"
       - name: Process Safe Outputs
         id: process_safe_outputs
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
@@ -1154,9 +1324,11 @@ jobs:
             await main();
       - name: Upload Safe Outputs Items
         if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: safe-outputs-items
-          path: /tmp/gh-aw/safe-output-items.jsonl
+          path: |
+            /tmp/gh-aw/safe-output-items.jsonl
+            /tmp/gh-aw/temporary-id-map.json
           if-no-files-found: ignore
 
diff --git a/.github/workflows/issue-triage.md b/.github/workflows/issue-triage.md
index 8523f53dd1..8974ec6a38 100644
--- a/.github/workflows/issue-triage.md
+++ b/.github/workflows/issue-triage.md
@@ -21,9 +21,6 @@ safe-outputs:
     hide-older-comments: true
   add-labels:
     max: 5
-  # Phase 2: Uncomment when ready to enable automatic Copilot coding agent assignment
-  # assign-to-agent:
-  #   github-token: ${{ secrets.GH_AW_AGENT_TOKEN }}
 ---
 
 # SqlClient Issue Auto-Triage
@@ -139,9 +136,4 @@ and severity assessment (P0-P3)>
 > **Note**: This triage summary is auto-generated by an AI agent. The analysis and suggestions above have not been verified by a human maintainer. Please treat as preliminary guidance only.
 ```
 
-<!-- Phase 2: Uncomment when ready to enable automatic Copilot coding agent assignment
-**Finally**: If this is a confirmed code bug with complete environment info,
-call `assign_to_agent` to assign Copilot coding agent.
--->
-
 If the issue is spam or no action is needed, call the `noop` tool instead.
\ No newline at end of file

From 6de7d3c06693248707bd7bca353fe4969bc8572f Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Wed, 13 May 2026 07:04:46 -0700
Subject: [PATCH 097/298] Test | Convert DateTimeVariantTests to xunit (#4196)

---
 .github/instructions/testing.instructions.md  |   32 +
 .../tests/Common/DisposableArray.cs           |   20 +-
 ...icrosoft.Data.SqlClient.ManualTests.csproj |    5 -
 .../SQL/ParameterTest/DateTimeVariant.bsl     | 1158 --------------
 .../SQL/ParameterTest/DateTimeVariantTest.cs  | 1304 ----------------
 .../SQL/ParameterTest/DateTimeVariantTests.cs | 1334 ++++++++++++++++-
 6 files changed, 1303 insertions(+), 2550 deletions(-)
 delete mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariant.bsl
 delete mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTest.cs

diff --git a/.github/instructions/testing.instructions.md b/.github/instructions/testing.instructions.md
index b5e7d28479..761c056399 100644
--- a/.github/instructions/testing.instructions.md
+++ b/.github/instructions/testing.instructions.md
@@ -321,6 +321,38 @@ Extended assertions for SqlClient:
 AssertExtensions.ThrowsContains<SqlException>(() => action(), "expected message");
 ```
 
+### RAII Database Object Classes
+When writing manual integration tests that require transient database objects, use the RAII classes from `Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects` instead of manually writing `try/finally` blocks with DDL `DROP`/`CREATE` statements.
+
+**Available classes:**
+
+| Class | SQL generated | Example definition argument |
+|-------|--------------|----------------------------|
+| `Table` | `CREATE TABLE {Name} {definition}` | `"(Id INT, Value NVARCHAR(100))"` |
+| `StoredProcedure` | `CREATE PROCEDURE {Name} {definition}` | `"AS BEGIN SELECT 1 END"` |
+| `UserDefinedType` | `CREATE TYPE [dbo].{Name} AS {definition}` | `"TABLE (f1 INT)"` |
+
+Each class generates a unique object name from the given prefix (incorporating a timestamp-based GUID, username, and machine name), creates the object on construction (requiring the connection to already be open), and drops it when disposed. The generated name is available via the `.Name` property.
+
+**Pattern:**
+```csharp
+using SqlConnection conn = new(DataTestUtility.TCPConnectionString);
+conn.Open();
+
+using Table testTable = new(conn, "MyTable", "(Id INT, Name NVARCHAR(100))");
+using StoredProcedure proc = new(conn, "MyProc", $"AS BEGIN SELECT * FROM {testTable.Name} END");
+
+using SqlCommand cmd = conn.CreateCommand();
+cmd.CommandText = proc.Name;
+cmd.CommandType = CommandType.StoredProcedure;
+// ... objects are automatically dropped when the scope ends
+```
+
+**Rules:**
+- Open the connection **before** constructing any database object (the constructor executes DDL immediately)
+- When objects depend on each other (e.g., a stored procedure that references a table), declare the dependent object **last** so it is disposed first — `using` declarations are disposed in reverse order
+- Use the `.Name` property directly wherever you need to reference the object in SQL; for `UserDefinedType` this already includes the `[dbo].` schema prefix, making it suitable for use as a TVP `TypeName`
+
 ## Code Coverage
 
 ### Running with Coverage
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/DisposableArray.cs b/src/Microsoft.Data.SqlClient/tests/Common/DisposableArray.cs
index a5ca8e639a..8baca10e21 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/DisposableArray.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/DisposableArray.cs
@@ -60,16 +60,32 @@ public T this[int i]
 
         /// <summary>
         /// Disposes all elements in the current instance. Each element will be checked for
-        /// <c>null</c> before disposing it.
+        /// <c>null</c> before disposing it. All elements are disposed even if earlier disposals
+        /// throw; any exceptions are collected and rethrown as an <see cref="AggregateException"/>
+        /// after all elements have been attempted.
         /// </summary>
         public void Dispose()
         {
+            List<Exception>? exceptions = null;
+
             foreach (T element in _elements)
             {
-                element?.Dispose();
+                try
+                {
+                    element?.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    (exceptions ??= new List<Exception>()).Add(ex);
+                }
             }
 
             GC.SuppressFinalize(this);
+
+            if (exceptions is not null)
+            {
+                throw new AggregateException(exceptions);
+            }
         }
 
         /// <inheritdoc/>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 8ea8a7cecc..71d0f0b0cb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -206,7 +206,6 @@
     <Compile Include="SQL\MARSTest\MARSTest.cs" />
     <Compile Include="SQL\MirroringTest\ConnectionOnMirroringTest.cs" />
     <Compile Include="SQL\ParallelTransactionsTest\ParallelTransactionsTest.cs" />
-    <Compile Include="SQL\ParameterTest\DateTimeVariantTest.cs" />
     <Compile Include="SQL\ParameterTest\ParametersTest.cs" />
     <Compile Include="SQL\ParameterTest\SqlAdapterUpdateBatch.cs" />
     <Compile Include="SQL\ParameterTest\SteAttribute.cs" />
@@ -262,10 +261,6 @@
              CopyToOutputDirectory="PreserveNewest" />
 
     <!-- Baseline files for individual test groups -->
-    <Content Include="SQL\ParameterTest\DateTimeVariant.bsl">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>DateTimeVariant.bsl</Link>
-    </Content>
     <Content Include="SQL\ParameterTest\StreamInputParameter_DebugMode.bsl">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>StreamInputParameter_DebugMode.bsl</Link>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariant.bsl b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariant.bsl
deleted file mode 100644
index aa19a20d9a..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariant.bsl
+++ /dev/null
@@ -1,1158 +0,0 @@
-
------------------------------- TestSimpleParameter_Type [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSimpleParameter_Variant [type: date value:1/1/0001 00:00:00] ------------------------------
-TestSimpleParameter_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: date value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataRecordParameterToTVP_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: date value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReaderParameterToTVP_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReader_TVP_Type [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataReader_TVP_Variant [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : date
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSimpleDataReader_Type [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSimpleDataReader_Variant [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : date
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : date
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopyDataTable_Type [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopyDataTable_Variant [type: date value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataTable_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- SqlBulkCopyDataRow_Type [type: date value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopyDataRow_Variant [type: date value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataRow_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSimpleParameter_Type [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-Test Simple Parameter [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSimpleParameter_Variant [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test Simple Parameter [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = date]
-Test Simple Parameter [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-Test SqlDataRecord Parameter To TVP [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataRecord Parameter To TVP [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = date]
-Test SqlDataRecord Parameter To TVP [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-Test SqlDataReader Parameter To TVP [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataReader Parameter To TVP [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = date]
-Test SqlDataReader Parameter To TVP [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReader_TVP_Type [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-Test SqlDataReader TVP [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReader_TVP_Variant [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : date
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-Test SqlDataReader TVP [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSimpleDataReader_Type [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-Test Simple Data Reader [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSimpleDataReader_Variant [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : date
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-Test Simple Data Reader [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-SqlBulkCopy From SqlDataReader [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : date
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-SqlBulkCopy From SqlDataReader [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataTable_Type [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-SqlBulkCopy From Data Table [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataTable_Variant [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Table [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = date]
-SqlBulkCopy From Data Table [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataRow_Type [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378112000000000
-SqlBulkCopy From Data Row [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 12:00:00 AM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataRow_Variant [type: date value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == date : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Row [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = date]
-SqlBulkCopy From Data Row [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSimpleParameter_Type [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSimpleParameter_Variant [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-TestSimpleParameter_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataRecordParameterToTVP_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReaderParameterToTVP_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReader_TVP_Type [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataReader_TVP_Variant [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime2
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSimpleDataReader_Type [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSimpleDataReader_Variant [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime2
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime2
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopyDataTable_Type [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopyDataTable_Variant [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataTable_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- SqlBulkCopyDataRow_Type [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopyDataRow_Variant [type: datetime2 value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataRow_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSimpleParameter_Type [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSimpleParameter_Variant [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test Simple Parameter [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = datetime2]
-Test Simple Parameter [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataRecord Parameter To TVP [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = datetime2]
-Test SqlDataRecord Parameter To TVP [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataReader Parameter To TVP [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = datetime2]
-Test SqlDataReader Parameter To TVP [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReader_TVP_Type [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSqlDataReader_TVP_Variant [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime2
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSimpleDataReader_Type [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSimpleDataReader_Variant [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime2
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime2
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopyDataTable_Type [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopyDataTable_Variant [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Table [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = datetime2]
-SqlBulkCopy From Data Table [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataRow_Type [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopyDataRow_Variant [type: datetime2 value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Row [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = datetime2]
-SqlBulkCopy From Data Row [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSimpleParameter_Type [type: datetime value:1/1/0001 00:00:00] ------------------------------
-TestSimpleParameter_Type[EXPECTED EXCEPTION] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSimpleParameter_Variant [type: datetime value:1/1/0001 00:00:00] ------------------------------
-TestSimpleParameter_Variant[EXPECTED EXCEPTION] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: datetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataRecordParameterToTVP_Type[EXPECTED EXCEPTION] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: datetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataRecordParameterToTVP_Variant[EXPECTED EXCEPTION] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: datetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReaderParameterToTVP_Type[EXPECTED EXCEPTION] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: datetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReaderParameterToTVP_Variant[EXPECTED EXCEPTION] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReader_TVP_Type [type: datetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReader_TVP_Type[EXPECTED EXCEPTION] The conversion of a varchar data type to a datetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- TestSqlDataReader_TVP_Variant [type: datetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReader_TVP_Variant[EXPECTED EXCEPTION] The conversion of a varchar data type to a datetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- TestSimpleDataReader_Type [type: datetime value:1/1/0001 00:00:00] ------------------------------
-TestSimpleDataReader_Type[EXPECTED EXCEPTION] The conversion of a varchar data type to a datetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- TestSimpleDataReader_Variant [type: datetime value:1/1/0001 00:00:00] ------------------------------
-TestSimpleDataReader_Variant[EXPECTED EXCEPTION] The conversion of a varchar data type to a datetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: datetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopySqlDataReader_Type[EXPECTED EXCEPTION] The conversion of a varchar data type to a datetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: datetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopySqlDataReader_Variant[EXPECTED EXCEPTION] The conversion of a varchar data type to a datetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- SqlBulkCopyDataTable_Type [type: datetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataTable_Type[EXPECTED EXCEPTION] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- SqlBulkCopyDataTable_Variant [type: datetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataTable_Variant[EXPECTED EXCEPTION] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- SqlBulkCopyDataRow_Type [type: datetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataRow_Type[EXPECTED EXCEPTION] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- SqlBulkCopyDataRow_Variant [type: datetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataRow_Variant[EXPECTED EXCEPTION] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSimpleParameter_Type [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test Simple Parameter [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSimpleParameter_Variant [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test Simple Parameter [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataRecord Parameter To TVP [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataRecord Parameter To TVP [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataReader Parameter To TVP [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataReader Parameter To TVP [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReader_TVP_Type [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSqlDataReader_TVP_Type[EXPECTED EXCEPTION] Conversion failed when converting date and/or time from character string.
-
------------------------------- TestSqlDataReader_TVP_Variant [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSqlDataReader_TVP_Variant[EXPECTED EXCEPTION] Conversion failed when converting date and/or time from character string.
-
------------------------------- TestSimpleDataReader_Type [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSimpleDataReader_Type[EXPECTED EXCEPTION] Conversion failed when converting date and/or time from character string.
-
------------------------------- TestSimpleDataReader_Variant [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSimpleDataReader_Variant[EXPECTED EXCEPTION] Conversion failed when converting date and/or time from character string.
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-SqlBulkCopySqlDataReader_Type[EXPECTED EXCEPTION] Conversion failed when converting date and/or time from character string.
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-SqlBulkCopySqlDataReader_Variant[EXPECTED EXCEPTION] Conversion failed when converting date and/or time from character string.
-
------------------------------- SqlBulkCopyDataTable_Type [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Table [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataTable_Variant [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Table [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataRow_Type [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Row [Data Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataRow_Variant [type: datetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Row [Variant Type][EXPECTED ERROR]: VALUE MISMATCH - [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSimpleParameter_Type [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSimpleParameter_Variant [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataReader_TVP_Type [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSqlDataReader_TVP_Variant [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSimpleDataReader_Type [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSimpleDataReader_Variant [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopyDataTable_Type [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopyDataTable_Variant [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopyDataRow_Type [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 0 : 0
-
------------------------------- SqlBulkCopyDataRow_Variant [type: datetimeoffset value:1/1/0001 00:00:00 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 0 : 0
-
------------------------------- TestSimpleParameter_Type [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSimpleParameter_Variant [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSqlDataReader_TVP_Type [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSqlDataReader_TVP_Variant [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSimpleDataReader_Type [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSimpleDataReader_Variant [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopyDataTable_Type [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopyDataTable_Variant [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopyDataRow_Type [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- SqlBulkCopyDataRow_Variant [type: datetimeoffset value:12/31/9999 23:59:59.9999999 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999999999
-
------------------------------- TestSimpleParameter_Type [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630822815999999999 : 630822815999999999
-
------------------------------- TestSimpleParameter_Variant [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 630822815999999999 : 630822815999999999
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630822815999999999 : 630822815999999999
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 630822815999999999 : 630822815999999999
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630822815999999999 : 630822815999999999
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 630822815999999999 : 630822815999999999
-
------------------------------- TestSqlDataReader_TVP_Type [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630822815999999999 : 630823121999999999
-
------------------------------- TestSqlDataReader_TVP_Variant [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 630822815999999999 : 630823121999999999
-
------------------------------- TestSimpleDataReader_Type [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630822815999999999 : 630823121999999999
-
------------------------------- TestSimpleDataReader_Variant [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 630822815999999999 : 630823121999999999
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630822815999999999 : 630823121999999999
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 630822815999999999 : 630823121999999999
-
------------------------------- SqlBulkCopyDataTable_Type [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630822815999999999 : 630822815999999999
-
------------------------------- SqlBulkCopyDataTable_Variant [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 630822815999999999 : 630822815999999999
-
------------------------------- SqlBulkCopyDataRow_Type [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630822815999999999 : 630822815999999999
-
------------------------------- SqlBulkCopyDataRow_Variant [type: datetimeoffset value:12/31/1999 23:59:59.9999999 -08:30:00] ------------------------------
-Type        => Expected : Actual == System.DateTimeOffset : System.DateTimeOffset
-Base Type   => Expected : Actual == datetimeoffset : datetimeoffset
-Value       => Expected : Actual == 630822815999999999 : 630822815999999999
-
------------------------------- TestSimpleParameter_Type [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- TestSimpleParameter_Variant [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime
-Value       => Expected : Actual == 630192959999950000 : 630192959999970000
-Test Simple Parameter [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = datetime2]
-Test Simple Parameter [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 1/1/1998 11:59:59 PM] [Expected = 1/1/1998 11:59:59 PM]
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime
-Value       => Expected : Actual == 630192959999950000 : 630192959999970000
-Test SqlDataRecord Parameter To TVP [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = datetime2]
-Test SqlDataRecord Parameter To TVP [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 1/1/1998 11:59:59 PM] [Expected = 1/1/1998 11:59:59 PM]
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime
-Value       => Expected : Actual == 630192959999950000 : 630192959999970000
-Test SqlDataReader Parameter To TVP [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = datetime2]
-Test SqlDataReader Parameter To TVP [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 1/1/1998 11:59:59 PM] [Expected = 1/1/1998 11:59:59 PM]
-
------------------------------- TestSqlDataReader_TVP_Type [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- TestSqlDataReader_TVP_Variant [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime2
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- TestSimpleDataReader_Type [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- TestSimpleDataReader_Variant [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime2
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime2
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- SqlBulkCopyDataTable_Type [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- SqlBulkCopyDataTable_Variant [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime
-Value       => Expected : Actual == 630192959999950000 : 630192959999970000
-SqlBulkCopy From Data Table [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = datetime2]
-SqlBulkCopy From Data Table [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 1/1/1998 11:59:59 PM] [Expected = 1/1/1998 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataRow_Type [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual ==  : 
-Value       => Expected : Actual == 630192959999950000 : 630192959999950000
-
------------------------------- SqlBulkCopyDataRow_Variant [type: datetime2 value:1/1/1998 23:59:59.9950000] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == datetime2 : datetime
-Value       => Expected : Actual == 630192959999950000 : 630192959999970000
-SqlBulkCopy From Data Row [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = datetime2]
-SqlBulkCopy From Data Row [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 1/1/1998 11:59:59 PM] [Expected = 1/1/1998 11:59:59 PM]
-
------------------------------- TestSimpleParameter_Type [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-TestSimpleParameter_Type>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSimpleParameter_Variant [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-TestSimpleParameter_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataRecordParameterToTVP_Type>>> EXCEPTION: [System.ArgumentException] Invalid value for this metadata.
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataRecordParameterToTVP_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReaderParameterToTVP_Type>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReaderParameterToTVP_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReader_TVP_Type [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReader_TVP_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] The conversion of a varchar data type to a smalldatetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- TestSqlDataReader_TVP_Variant [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReader_TVP_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] The conversion of a varchar data type to a smalldatetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- TestSimpleDataReader_Type [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-TestSimpleDataReader_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] The conversion of a varchar data type to a smalldatetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- TestSimpleDataReader_Variant [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-TestSimpleDataReader_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] The conversion of a varchar data type to a smalldatetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopySqlDataReader_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] The conversion of a varchar data type to a smalldatetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopySqlDataReader_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] The conversion of a varchar data type to a smalldatetime data type resulted in an out-of-range value.
-The statement has been terminated.
-
------------------------------- SqlBulkCopyDataTable_Type [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataTable_Type>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- SqlBulkCopyDataTable_Variant [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataTable_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- SqlBulkCopyDataRow_Type [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataRow_Type>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- SqlBulkCopyDataRow_Variant [type: smalldatetime value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataRow_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSimpleParameter_Type [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSimpleParameter_Type>>> EXCEPTION: [System.ArgumentOutOfRangeException] The added or subtracted value results in an un-representable DateTime.
-Parameter name: value
-
------------------------------- TestSimpleParameter_Variant [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == smalldatetime : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test Simple Parameter [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = smalldatetime]
-Test Simple Parameter [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSqlDataRecordParameterToTVP_Type>>> EXCEPTION: [System.ArgumentException] Invalid value for this metadata.
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == smalldatetime : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataRecord Parameter To TVP [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = smalldatetime]
-Test SqlDataRecord Parameter To TVP [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSqlDataReaderParameterToTVP_Type>>> EXCEPTION: [System.ArgumentOutOfRangeException] The added or subtracted value results in an un-representable DateTime.
-Parameter name: value
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == smalldatetime : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataReader Parameter To TVP [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = smalldatetime]
-Test SqlDataReader Parameter To TVP [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReader_TVP_Type [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSqlDataReader_TVP_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting character string to smalldatetime data type.
-
------------------------------- TestSqlDataReader_TVP_Variant [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSqlDataReader_TVP_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting character string to smalldatetime data type.
-
------------------------------- TestSimpleDataReader_Type [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSimpleDataReader_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting character string to smalldatetime data type.
-
------------------------------- TestSimpleDataReader_Variant [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSimpleDataReader_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting character string to smalldatetime data type.
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-SqlBulkCopySqlDataReader_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting character string to smalldatetime data type.
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-SqlBulkCopySqlDataReader_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting character string to smalldatetime data type.
-
------------------------------- SqlBulkCopyDataTable_Type [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-SqlBulkCopyDataTable_Type>>> EXCEPTION: [System.ArgumentOutOfRangeException] The added or subtracted value results in an un-representable DateTime.
-Parameter name: value
-
------------------------------- SqlBulkCopyDataTable_Variant [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == smalldatetime : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Table [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = smalldatetime]
-SqlBulkCopy From Data Table [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataRow_Type [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-SqlBulkCopyDataRow_Type>>> EXCEPTION: [System.ArgumentOutOfRangeException] The added or subtracted value results in an un-representable DateTime.
-Parameter name: value
-
------------------------------- SqlBulkCopyDataRow_Variant [type: smalldatetime value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == smalldatetime : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Row [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = smalldatetime]
-SqlBulkCopy From Data Row [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSimpleParameter_Type [type: time value:-10675199.02:48:05.4775808] ------------------------------
-TestSimpleParameter_Type>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '-10675199.02:48:05.4775808' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- TestSimpleParameter_Variant [type: time value:-10675199.02:48:05.4775808] ------------------------------
-TestSimpleParameter_Variant>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '-10675199.02:48:05.4775808' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: time value:-10675199.02:48:05.4775808] ------------------------------
-TestSqlDataRecordParameterToTVP_Type>>> EXCEPTION: [System.ArgumentException] Invalid value for this metadata.
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: time value:-10675199.02:48:05.4775808] ------------------------------
-Type        => Expected : Actual == System.TimeSpan : System.TimeSpan
-Base Type   => Expected : Actual == time : time
-Test SqlDataRecord Parameter To TVP [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 00:00:00] [Expected = -10675199.02:48:05.4775808]
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: time value:-10675199.02:48:05.4775808] ------------------------------
-TestSqlDataReaderParameterToTVP_Type>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '-10675199.02:48:05.4775808' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: time value:-10675199.02:48:05.4775808] ------------------------------
-TestSqlDataReaderParameterToTVP_Variant>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '-10675199.02:48:05.4775808' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- TestSqlDataReader_TVP_Type [type: time value:-10675199.02:48:05.4775808] ------------------------------
-TestSqlDataReader_TVP_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- TestSqlDataReader_TVP_Variant [type: time value:-10675199.02:48:05.4775808] ------------------------------
-TestSqlDataReader_TVP_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- TestSimpleDataReader_Type [type: time value:-10675199.02:48:05.4775808] ------------------------------
-TestSimpleDataReader_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- TestSimpleDataReader_Variant [type: time value:-10675199.02:48:05.4775808] ------------------------------
-TestSimpleDataReader_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: time value:-10675199.02:48:05.4775808] ------------------------------
-SqlBulkCopySqlDataReader_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: time value:-10675199.02:48:05.4775808] ------------------------------
-SqlBulkCopySqlDataReader_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- SqlBulkCopyDataTable_Type [type: time value:-10675199.02:48:05.4775808] ------------------------------
-SqlBulkCopyDataTable_Type>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '-10675199.02:48:05.4775808' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- SqlBulkCopyDataTable_Variant [type: time value:-10675199.02:48:05.4775808] ------------------------------
-SqlBulkCopyDataTable_Variant>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '-10675199.02:48:05.4775808' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- SqlBulkCopyDataRow_Type [type: time value:-10675199.02:48:05.4775808] ------------------------------
-SqlBulkCopyDataRow_Type>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '-10675199.02:48:05.4775808' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- SqlBulkCopyDataRow_Variant [type: time value:-10675199.02:48:05.4775808] ------------------------------
-SqlBulkCopyDataRow_Variant>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '-10675199.02:48:05.4775808' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- TestSimpleParameter_Type [type: time value:10675199.02:48:05.4775807] ------------------------------
-TestSimpleParameter_Type>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '10675199.02:48:05.4775807' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- TestSimpleParameter_Variant [type: time value:10675199.02:48:05.4775807] ------------------------------
-TestSimpleParameter_Variant>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '10675199.02:48:05.4775807' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: time value:10675199.02:48:05.4775807] ------------------------------
-TestSqlDataRecordParameterToTVP_Type>>> EXCEPTION: [System.ArgumentException] Invalid value for this metadata.
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: time value:10675199.02:48:05.4775807] ------------------------------
-TestSqlDataRecordParameterToTVP_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] The incoming tabular data stream (TDS) remote procedure call (RPC) protocol stream is incorrect. Table-valued parameter 0 (""), row 1, column 1: The supplied value is not a valid instance of data type sql_variant. Check the source data for invalid values. An example of an invalid value is data of numeric type with scale greater than precision.
-The statement has been terminated.
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: time value:10675199.02:48:05.4775807] ------------------------------
-TestSqlDataReaderParameterToTVP_Type>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '10675199.02:48:05.4775807' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: time value:10675199.02:48:05.4775807] ------------------------------
-TestSqlDataReaderParameterToTVP_Variant>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '10675199.02:48:05.4775807' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- TestSqlDataReader_TVP_Type [type: time value:10675199.02:48:05.4775807] ------------------------------
-TestSqlDataReader_TVP_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- TestSqlDataReader_TVP_Variant [type: time value:10675199.02:48:05.4775807] ------------------------------
-TestSqlDataReader_TVP_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- TestSimpleDataReader_Type [type: time value:10675199.02:48:05.4775807] ------------------------------
-TestSimpleDataReader_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- TestSimpleDataReader_Variant [type: time value:10675199.02:48:05.4775807] ------------------------------
-TestSimpleDataReader_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: time value:10675199.02:48:05.4775807] ------------------------------
-SqlBulkCopySqlDataReader_Type>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: time value:10675199.02:48:05.4775807] ------------------------------
-SqlBulkCopySqlDataReader_Variant>>> EXCEPTION: [Microsoft.Data.SqlClient.SqlException] Conversion failed when converting date and/or time from character string.
-
------------------------------- SqlBulkCopyDataTable_Type [type: time value:10675199.02:48:05.4775807] ------------------------------
-SqlBulkCopyDataTable_Type>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '10675199.02:48:05.4775807' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- SqlBulkCopyDataTable_Variant [type: time value:10675199.02:48:05.4775807] ------------------------------
-SqlBulkCopyDataTable_Variant>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '10675199.02:48:05.4775807' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- SqlBulkCopyDataRow_Type [type: time value:10675199.02:48:05.4775807] ------------------------------
-SqlBulkCopyDataRow_Type>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '10675199.02:48:05.4775807' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- SqlBulkCopyDataRow_Variant [type: time value:10675199.02:48:05.4775807] ------------------------------
-SqlBulkCopyDataRow_Variant>>> EXCEPTION: [System.OverflowException] SqlDbType.Time overflow.  Value '10675199.02:48:05.4775807' is out of range.  Must be between 00:00:00.0000000 and 23:59:59.9999999.
-
------------------------------- TestSimpleParameter_Type [type: time value:1/1/0001 00:00:00] ------------------------------
-TestSimpleParameter_Type>>> EXCEPTION: [System.InvalidCastException] Failed to convert parameter value from a DateTime to a TimeSpan.
-
------------------------------- TestSimpleParameter_Variant [type: time value:1/1/0001 00:00:00] ------------------------------
-TestSimpleParameter_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: time value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataRecordParameterToTVP_Type>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: time value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataRecordParameterToTVP_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: time value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReaderParameterToTVP_Type>>> EXCEPTION: [System.InvalidCastException] Failed to convert parameter value from a DateTime to a TimeSpan.
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: time value:1/1/0001 00:00:00] ------------------------------
-TestSqlDataReaderParameterToTVP_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSqlDataReader_TVP_Type [type: time value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual ==  : 
-TestSqlDataReader_TVP_Type>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- TestSqlDataReader_TVP_Variant [type: time value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual == time : time
-TestSqlDataReader_TVP_Variant>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- TestSimpleDataReader_Type [type: time value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual ==  : 
-TestSimpleDataReader_Type>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- TestSimpleDataReader_Variant [type: time value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual == time : time
-TestSimpleDataReader_Variant>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: time value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual ==  : 
-SqlBulkCopySqlDataReader_Type>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: time value:1/1/0001 00:00:00] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual == time : time
-SqlBulkCopySqlDataReader_Variant>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- SqlBulkCopyDataTable_Type [type: time value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataTable_Type[EXPECTED INVALID OPERATION EXCEPTION] The given value '1/1/0001 00:00:00' of type DateTime from the data source cannot be converted to type time for Column 0 [f1] Row 1.
-
------------------------------- SqlBulkCopyDataTable_Variant [type: time value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataTable_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- SqlBulkCopyDataRow_Type [type: time value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataRow_Type[EXPECTED INVALID OPERATION EXCEPTION] The given value '1/1/0001 00:00:00' of type DateTime from the data source cannot be converted to type time for Column 0 [f1] Row 1.
-
------------------------------- SqlBulkCopyDataRow_Variant [type: time value:1/1/0001 00:00:00] ------------------------------
-SqlBulkCopyDataRow_Variant>>> EXCEPTION: [System.Data.SqlTypes.SqlTypeException] SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.
-
------------------------------- TestSimpleParameter_Type [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSimpleParameter_Type>>> EXCEPTION: [System.InvalidCastException] Failed to convert parameter value from a DateTime to a TimeSpan.
-
------------------------------- TestSimpleParameter_Variant [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == time : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test Simple Parameter [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = time]
-Test Simple Parameter [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataRecordParameterToTVP_Type [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSqlDataRecordParameterToTVP_Type>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- TestSqlDataRecordParameterToTVP_Variant [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == time : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataRecord Parameter To TVP [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = time]
-Test SqlDataRecord Parameter To TVP [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReaderParameterToTVP_Type [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-TestSqlDataReaderParameterToTVP_Type>>> EXCEPTION: [System.InvalidCastException] Failed to convert parameter value from a DateTime to a TimeSpan.
-
------------------------------- TestSqlDataReaderParameterToTVP_Variant [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == time : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-Test SqlDataReader Parameter To TVP [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = time]
-Test SqlDataReader Parameter To TVP [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- TestSqlDataReader_TVP_Type [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual ==  : 
-TestSqlDataReader_TVP_Type>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- TestSqlDataReader_TVP_Variant [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual == time : time
-TestSqlDataReader_TVP_Variant>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- TestSimpleDataReader_Type [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual ==  : 
-TestSimpleDataReader_Type>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- TestSimpleDataReader_Variant [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual == time : time
-TestSimpleDataReader_Variant>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- SqlBulkCopySqlDataReader_Type [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual ==  : 
-SqlBulkCopySqlDataReader_Type>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- SqlBulkCopySqlDataReader_Variant [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.TimeSpan
-Base Type   => Expected : Actual == time : time
-SqlBulkCopySqlDataReader_Variant>>> EXCEPTION: [System.InvalidCastException] Specified cast is not valid.
-
------------------------------- SqlBulkCopyDataTable_Type [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-SqlBulkCopyDataTable_Type[EXPECTED INVALID OPERATION EXCEPTION] The given value '12/31/9999 23:59:59.9999999' of type DateTime from the data source cannot be converted to type time for Column 0 [f1] Row 1.
-
------------------------------- SqlBulkCopyDataTable_Variant [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == time : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Table [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = time]
-SqlBulkCopy From Data Table [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
-
------------------------------- SqlBulkCopyDataRow_Type [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-SqlBulkCopyDataRow_Type[EXPECTED INVALID OPERATION EXCEPTION] The given value '12/31/9999 23:59:59.9999999' of type DateTime from the data source cannot be converted to type time for Column 0 [f1] Row 1.
-
------------------------------- SqlBulkCopyDataRow_Variant [type: time value:12/31/9999 23:59:59.9999999] ------------------------------
-Type        => Expected : Actual == System.DateTime : System.DateTime
-Base Type   => Expected : Actual == time : datetime
-Value       => Expected : Actual == 3155378975999999999 : 3155378975999970000
-SqlBulkCopy From Data Row [Variant Type]>>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = datetime] [Expected = time]
-SqlBulkCopy From Data Row [Variant Type]>>> ERROR: VALUE MISMATCH!!! [Actual = 12/31/9999 11:59:59 PM] [Expected = 12/31/9999 11:59:59 PM]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTest.cs
deleted file mode 100644
index e984a379b8..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTest.cs
+++ /dev/null
@@ -1,1304 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Data;
-using Microsoft.Data.SqlClient.Server;
-
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
-{
-    public static class DateTimeVariantTest
-    {
-        private static string s_connStr;
-
-        /// <summary>
-        /// Tests all 2008 DateTime types inside sql_variant to server using sql_variant parameter, SqlBulkCopy, and TVP parameter with sql_variant inside.
-        /// </summary>
-        public static void TestAllDateTimeWithDataTypeAndVariant(string connStr)
-        {
-            s_connStr = connStr;
-
-            SendInfo(System.DateTime.MinValue, "System.DateTime", "date");
-            SendInfo(System.DateTime.MaxValue, "System.DateTime", "date");
-
-            SendInfo(System.DateTime.MinValue, "System.DateTime", "datetime2");
-            SendInfo(System.DateTime.MaxValue, "System.DateTime", "datetime2");
-
-            SendInfo(System.DateTime.MinValue, "System.DateTime", "datetime");
-            SendInfo(System.DateTime.MaxValue, "System.DateTime", "datetime");
-
-            SendInfo(System.DateTimeOffset.MinValue, "System.DateTimeOffset", "datetimeoffset");
-            SendInfo(System.DateTimeOffset.MaxValue, "System.DateTimeOffset", "datetimeoffset");
-
-            SendInfo(System.DateTimeOffset.Parse("12/31/1999 23:59:59.9999999 -08:30"), "System.DateTimeOffset", "datetimeoffset");
-            SendInfo(System.DateTime.Parse("1998-01-01 23:59:59.995"), "System.DateTime", "datetime2");
-
-            SendInfo(System.DateTime.MinValue, "System.DateTime", "smalldatetime");
-            SendInfo(System.DateTime.MaxValue, "System.DateTime", "smalldatetime");
-
-            SendInfo(System.TimeSpan.MinValue, "System.TimeSpan", "time");
-            SendInfo(System.TimeSpan.MaxValue, "System.TimeSpan", "time");
-
-            SendInfo(System.DateTime.MinValue, "System.DateTime", "time");
-            SendInfo(System.DateTime.MaxValue, "System.DateTime", "time");
-        }
-
-        private static void SendInfo(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            TestSimpleParameter_Type(paramValue, expectedTypeName, expectedBaseTypeName);
-            TestSimpleParameter_Variant(paramValue, expectedTypeName, expectedBaseTypeName);
-
-            TestSqlDataRecordParameterToTVP_Type(paramValue, expectedTypeName, expectedBaseTypeName);
-            TestSqlDataRecordParameterToTVP_Variant(paramValue, expectedTypeName, expectedBaseTypeName);
-
-            TestSqlDataReaderParameterToTVP_Type(paramValue, expectedTypeName, expectedBaseTypeName);
-            TestSqlDataReaderParameterToTVP_Variant(paramValue, expectedTypeName, expectedBaseTypeName);
-
-            TestSqlDataReader_TVP_Type(paramValue, expectedTypeName, expectedBaseTypeName);
-            TestSqlDataReader_TVP_Variant(paramValue, expectedTypeName, expectedBaseTypeName);
-
-            TestSimpleDataReader_Type(paramValue, expectedTypeName, expectedBaseTypeName);
-            TestSimpleDataReader_Variant(paramValue, expectedTypeName, expectedBaseTypeName);
-
-            SqlBulkCopySqlDataReader_Type(paramValue, expectedTypeName, expectedBaseTypeName);
-            SqlBulkCopySqlDataReader_Variant(paramValue, expectedTypeName, expectedBaseTypeName);
-
-            SqlBulkCopyDataTable_Type(paramValue, expectedTypeName, expectedBaseTypeName);
-            SqlBulkCopyDataTable_Variant(paramValue, expectedTypeName, expectedBaseTypeName);
-
-            SqlBulkCopyDataRow_Type(paramValue, expectedTypeName, expectedBaseTypeName);
-            SqlBulkCopyDataRow_Variant(paramValue, expectedTypeName, expectedBaseTypeName);
-        }
-
-        private static void TestSimpleParameter_Type(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "TestSimpleParameter_Type";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string procName = DataTestUtility.GetLongName("paramProc1");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropStoredProcedure(conn, procName);
-                xsql(conn, string.Format("create proc {0} (@param {1}) as begin select @param end;", procName, expectedBaseTypeName));
-
-                using SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = procName;
-                cmd.CommandType = CommandType.StoredProcedure;
-                SqlParameter p = cmd.Parameters.AddWithValue("@param", paramValue);
-                cmd.Parameters[0].SqlDbType = GetSqlDbType(expectedBaseTypeName);
-                using (SqlDataReader dr = cmd.ExecuteReader())
-                {
-                    dr.Read();
-                    VerifyReaderTypeAndValue("Test Simple Parameter [Data Type]", expectedBaseTypeName, expectedTypeName, dr[0], expectedTypeName, paramValue);
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropStoredProcedure(conn, procName);
-            }
-        }
-
-        // sql_variant parameters and sql_variant TVPs store all datetime values internally
-        // as datetime, hence breaking for 2008 types
-        private static void TestSimpleParameter_Variant(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "TestSimpleParameter_Variant";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string procName = DataTestUtility.GetLongName("paramProc2");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropStoredProcedure(conn, procName);
-                xsql(conn, string.Format("create proc {0} (@param sql_variant) as begin select @param, sql_variant_property(@param,'BaseType') as BaseType end;", procName));
-
-                using SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = procName;
-                cmd.CommandType = CommandType.StoredProcedure;
-                SqlParameter p = cmd.Parameters.AddWithValue("@param", paramValue);
-                cmd.Parameters[0].SqlDbType = SqlDbType.Variant;
-                using (SqlDataReader dr = cmd.ExecuteReader())
-                {
-                    dr.Read();
-                    VerifyReaderTypeAndValue("Test Simple Parameter [Variant Type]", "SqlDbType.Variant", dr, expectedTypeName, expectedBaseTypeName, paramValue);
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropStoredProcedure(conn, procName);
-            }
-        }
-
-        private static void TestSqlDataRecordParameterToTVP_Type(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "TestSqlDataRecordParameterToTVP_Type";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string tvpTypeName = DataTestUtility.GetLongName("tvpType");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropType(conn, tvpTypeName);
-                xsql(conn, string.Format("create type dbo.{0} as table (f1 {1})", tvpTypeName, expectedBaseTypeName));
-
-                // Send TVP using SqlMetaData.
-                SqlMetaData[] metadata = new SqlMetaData[1];
-                metadata[0] = new SqlMetaData("f1", GetSqlDbType(expectedBaseTypeName));
-                SqlDataRecord[] record = new SqlDataRecord[1];
-                record[0] = new SqlDataRecord(metadata);
-                record[0].SetValue(0, paramValue);
-
-                using SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = "select f1 from @tvpParam";
-                SqlParameter p = cmd.Parameters.AddWithValue("@tvpParam", record);
-                p.SqlDbType = SqlDbType.Structured;
-                p.TypeName = string.Format("dbo.{0}", tvpTypeName);
-                using (SqlDataReader dr = cmd.ExecuteReader())
-                {
-                    dr.Read();
-                    VerifyReaderTypeAndValue("Test SqlDataRecord Parameter To TVP [Data Type]", expectedBaseTypeName, expectedTypeName, dr[0], expectedTypeName, paramValue);
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropType(conn, tvpTypeName);
-            }
-        }
-
-        // sql_variant parameters and sql_variant TVPs store all datetime values internally
-        // as datetime, hence breaking for 2008 types
-        private static void TestSqlDataRecordParameterToTVP_Variant(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "TestSqlDataRecordParameterToTVP_Variant";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string tvpTypeName = DataTestUtility.GetLongName("tvpVariant");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropType(conn, tvpTypeName);
-                xsql(conn, string.Format("create type dbo.{0} as table (f1 sql_variant)", tvpTypeName));
-
-                // Send TVP using SqlMetaData.
-                SqlMetaData[] metadata = new SqlMetaData[1];
-                metadata[0] = new SqlMetaData("f1", SqlDbType.Variant);
-                SqlDataRecord[] record = new SqlDataRecord[1];
-                record[0] = new SqlDataRecord(metadata);
-                record[0].SetValue(0, paramValue);
-
-                using SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = "select f1, sql_variant_property(f1,'BaseType') as BaseType from @tvpParam";
-                SqlParameter p = cmd.Parameters.AddWithValue("@tvpParam", record);
-                p.SqlDbType = SqlDbType.Structured;
-                p.TypeName = string.Format("dbo.{0}", tvpTypeName);
-                using (SqlDataReader dr = cmd.ExecuteReader())
-                {
-                    dr.Read();
-                    VerifyReaderTypeAndValue("Test SqlDataRecord Parameter To TVP [Variant Type]", "SqlDbType.Variant", dr, expectedTypeName, expectedBaseTypeName, paramValue);
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropType(conn, tvpTypeName);
-            }
-        }
-
-        private static void TestSqlDataReaderParameterToTVP_Type(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "TestSqlDataReaderParameterToTVP_Type";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string tvpTypeName = DataTestUtility.GetLongName("tvpType");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropType(conn, tvpTypeName);
-                xsql(conn, string.Format("create type dbo.{0} as table (f1 {1})", tvpTypeName, expectedBaseTypeName));
-                using (SqlConnection connInput = new(s_connStr))
-                {
-                    connInput.Open();
-                    using (SqlCommand cmdInput = connInput.CreateCommand())
-                    {
-                        cmdInput.CommandText = "select @p1 as f1";
-                        cmdInput.Parameters.Add("@p1", GetSqlDbType(expectedBaseTypeName));
-                        cmdInput.Parameters["@p1"].Value = paramValue;
-                        using SqlDataReader drInput = cmdInput.ExecuteReader(CommandBehavior.CloseConnection);
-                        using SqlCommand cmd = conn.CreateCommand();
-                        cmd.CommandText = "select f1 from @tvpParam";
-                        SqlParameter p = cmd.Parameters.AddWithValue("@tvpParam", drInput);
-                        p.SqlDbType = SqlDbType.Structured;
-                        p.TypeName = string.Format("dbo.{0}", tvpTypeName);
-                        using (SqlDataReader dr = cmd.ExecuteReader())
-                        {
-                            dr.Read();
-                            VerifyReaderTypeAndValue("Test SqlDataReader Parameter To TVP [Data Type]", expectedBaseTypeName, expectedTypeName, dr[0], expectedTypeName, paramValue);
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropType(conn, tvpTypeName);
-            }
-        }
-
-        // sql_variant parameters and sql_variant TVPs store all datetime values internally
-        // as datetime, hence breaking for 2008 types
-        private static void TestSqlDataReaderParameterToTVP_Variant(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "TestSqlDataReaderParameterToTVP_Variant";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string tvpTypeName = DataTestUtility.GetLongName("tvpVariant");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropType(conn, tvpTypeName);
-                xsql(conn, string.Format("create type dbo.{0} as table (f1 sql_variant)", tvpTypeName));
-
-                // Send TVP using SqlDataReader.
-                using (SqlConnection connInput = new(s_connStr))
-                {
-                    connInput.Open();
-                    using (SqlCommand cmdInput = connInput.CreateCommand())
-                    {
-                        cmdInput.CommandText = "select @p1 as f1";
-                        cmdInput.Parameters.Add("@p1", SqlDbType.Variant);
-                        cmdInput.Parameters["@p1"].Value = paramValue;
-                        using SqlDataReader drInput = cmdInput.ExecuteReader(CommandBehavior.CloseConnection);
-                        using SqlCommand cmd = conn.CreateCommand();
-                        cmd.CommandText = "select f1, sql_variant_property(f1,'BaseType') as BaseType from @tvpParam";
-                        SqlParameter p = cmd.Parameters.AddWithValue("@tvpParam", drInput);
-                        p.SqlDbType = SqlDbType.Structured;
-                        p.TypeName = string.Format("dbo.{0}", tvpTypeName);
-                        using (SqlDataReader dr = cmd.ExecuteReader())
-                        {
-                            dr.Read();
-                            VerifyReaderTypeAndValue("Test SqlDataReader Parameter To TVP [Variant Type]", "SqlDbType.Variant", dr, expectedTypeName, expectedBaseTypeName, paramValue);
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropType(conn, tvpTypeName);
-            }
-        }
-
-        // sql_variant parameters and sql_variant TVPs store all datetime values internally
-        // as datetime, hence breaking for 2008 types
-        private static void TestSqlDataReader_TVP_Type(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "TestSqlDataReader_TVP_Type";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string tvpTypeName = DataTestUtility.GetLongName("tvpType");
-            string InputTableName = DataTestUtility.GetLongName("InputTable");
-            string OutputTableName = DataTestUtility.GetLongName("OutputTable");
-            string ProcName = DataTestUtility.GetLongName("spTVPProc");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-
-                DropStoredProcedure(conn, ProcName);
-                DropTable(conn, InputTableName);
-                DropTable(conn, OutputTableName);
-                DropType(conn, $"dbo.{tvpTypeName}");
-
-                xsql(conn, string.Format("create type dbo.{0} as table (f1 {1})", tvpTypeName, expectedBaseTypeName));
-                xsql(conn, string.Format("create table {0} (f1 {1})", InputTableName, expectedBaseTypeName));
-                xsql(conn, string.Format("create table {0} (f1 {1})", OutputTableName, expectedBaseTypeName));
-
-                string value = string.Empty;
-                if (paramValue.GetType() == typeof(DateTimeOffset))
-                {
-                    DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
-                    value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
-                }
-                else if (paramValue.GetType() == typeof(TimeSpan))
-                {
-                    value = ((TimeSpan)paramValue).ToString();
-                }
-                else
-                {
-                    value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
-                }
-                xsql(conn, string.Format("insert into {0} values(CAST('{1}' AS {2}))", InputTableName, value, expectedBaseTypeName));
-                xsql(conn, string.Format("create proc {0} (@P {1} READONLY) as begin insert into {2} select * from @P; end", ProcName, tvpTypeName, OutputTableName));
-
-                SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = string.Format("SELECT * FROM {0}", InputTableName);
-                using SqlDataReader r = cmd.ExecuteReader();
-                using (SqlConnection conn2 = new(s_connStr))
-                {
-                    conn2.Open();
-                    SqlCommand cmd2 = new(ProcName, conn2)
-                    {
-                        CommandType = CommandType.StoredProcedure
-                    };
-                    SqlParameter p = cmd2.Parameters.AddWithValue("@P", r);
-                    p.SqlDbType = SqlDbType.Structured;
-                    p.TypeName = tvpTypeName;
-                    cmd2.ExecuteNonQuery();
-
-                    cmd2.CommandText = string.Format("SELECT f1 FROM {0}", OutputTableName);
-                    cmd2.CommandType = CommandType.Text;
-                    using (SqlDataReader dr = cmd2.ExecuteReader())
-                    {
-                        dr.Read();
-                        VerifyReaderTypeAndValue("Test SqlDataReader TVP [Data Type]", expectedBaseTypeName, expectedTypeName, dr[0], expectedTypeName, paramValue);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropStoredProcedure(conn, ProcName);
-                DropTable(conn, InputTableName);
-                DropTable(conn, OutputTableName);
-                DropType(conn, tvpTypeName);
-            }
-        }
-
-        private static void TestSqlDataReader_TVP_Variant(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "TestSqlDataReader_TVP_Variant";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string tvpTypeName = DataTestUtility.GetLongName("tvpVariant_DRdrTVPVar");
-            string InputTableName = DataTestUtility.GetLongName("InputTable");
-            string OutputTableName = DataTestUtility.GetLongName("OutputTable");
-            string ProcName = DataTestUtility.GetLongName("spTVPProc_DRdrTVPVar");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-
-                DropStoredProcedure(conn, ProcName);
-                DropTable(conn, InputTableName);
-                DropTable(conn, OutputTableName);
-                DropType(conn, tvpTypeName);
-
-                xsql(conn, string.Format("create type {0} as table (f1 sql_variant)", tvpTypeName));
-                xsql(conn, string.Format("create table {0} (f1 sql_variant)", InputTableName));
-                xsql(conn, string.Format("create table {0} (f1 sql_variant)", OutputTableName));
-
-                string value = string.Empty;
-                if (paramValue.GetType() == typeof(DateTimeOffset))
-                {
-                    DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
-                    value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
-                }
-                else if (paramValue.GetType() == typeof(TimeSpan))
-                {
-                    value = ((TimeSpan)paramValue).ToString();
-                }
-                else
-                {
-                    value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
-                }
-                xsql(conn, string.Format("insert into {0} values(CAST('{1}' AS {2}))", InputTableName, value, expectedBaseTypeName));
-                xsql(conn, string.Format("create proc {0} (@P {1} READONLY) as begin insert into {2} select * from @P; end", ProcName, tvpTypeName, OutputTableName));
-
-                SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = string.Format("SELECT * FROM {0}", InputTableName);
-                using SqlDataReader r = cmd.ExecuteReader();
-                using (SqlConnection conn2 = new(s_connStr))
-                {
-                    conn2.Open();
-                    using (SqlCommand cmd2 = new(ProcName, conn2))
-                    {
-                        cmd2.CommandType = CommandType.StoredProcedure;
-                        SqlParameter p = cmd2.Parameters.AddWithValue("@P", r);
-                        p.SqlDbType = SqlDbType.Structured;
-                        p.TypeName = tvpTypeName;
-                        cmd2.ExecuteNonQuery();
-
-                        cmd2.CommandText = string.Format("SELECT f1, sql_variant_property(f1,'BaseType') as BaseType FROM {0}", OutputTableName);
-                        ;
-                        cmd2.CommandType = CommandType.Text;
-                        using (SqlDataReader dr = cmd2.ExecuteReader())
-                        {
-                            dr.Read();
-                            VerifyReaderTypeAndValue("Test SqlDataReader TVP [Variant Type]", "SqlDbType.Variant", dr, expectedTypeName, expectedBaseTypeName, paramValue);
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropStoredProcedure(conn, ProcName);
-                DropTable(conn, InputTableName);
-                DropTable(conn, OutputTableName);
-                DropType(conn, tvpTypeName);
-            }
-        }
-
-        // sql_variant parameters and sql_variant TVPs store all datetime values internally
-        // as datetime, hence breaking for 2008 types
-        private static void TestSimpleDataReader_Type(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "TestSimpleDataReader_Type";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string inputTable = DataTestUtility.GetLongName("inputTable");
-            string procName = DataTestUtility.GetLongName("paramProc3");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, inputTable);
-                DropStoredProcedure(conn, procName);
-
-                string value = string.Empty;
-                if (paramValue.GetType() == typeof(DateTimeOffset))
-                {
-                    DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
-                    value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
-                }
-                else if (paramValue.GetType() == typeof(TimeSpan))
-                {
-                    value = ((TimeSpan)paramValue).ToString();
-                }
-                else
-                {
-                    value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
-                }
-                xsql(conn, string.Format("create table {0} (f1 {1})", inputTable, expectedBaseTypeName));
-                xsql(conn, string.Format("insert into {0}(f1) values('{1}');", inputTable, value));
-                xsql(conn, string.Format("create proc {0} as begin select f1 from {1} end;", procName, inputTable));
-
-                using SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = procName;
-                cmd.CommandType = CommandType.StoredProcedure;
-                using (SqlDataReader dr = cmd.ExecuteReader())
-                {
-                    dr.Read();
-                    VerifyReaderTypeAndValue("Test Simple Data Reader [Data Type]", expectedBaseTypeName, expectedTypeName, dr[0], expectedTypeName, paramValue);
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropStoredProcedure(conn, procName);
-                DropTable(conn, inputTable);
-            }
-        }
-
-        private static void TestSimpleDataReader_Variant(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "TestSimpleDataReader_Variant";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string inputTable = DataTestUtility.GetLongName("inputTable");
-            string procName = DataTestUtility.GetLongName("paramProc4");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, inputTable);
-                DropStoredProcedure(conn, procName);
-
-                string value = string.Empty;
-                if (paramValue.GetType() == typeof(DateTimeOffset))
-                {
-                    DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
-                    value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
-                }
-                else if (paramValue.GetType() == typeof(TimeSpan))
-                {
-                    value = ((TimeSpan)paramValue).ToString();
-                }
-                else
-                {
-                    value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
-                }
-                xsql(conn, string.Format("create table {0} (f1 sql_variant)", inputTable));
-                xsql(conn, string.Format("insert into {0}(f1) values(CAST('{1}' AS {2}));", inputTable, value, expectedBaseTypeName));
-                xsql(conn, string.Format("create proc {0} as begin select f1, sql_variant_property(f1,'BaseType') as BaseType from {1} end;", procName, inputTable));
-
-                using SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = procName;
-                cmd.CommandType = CommandType.StoredProcedure;
-                using (SqlDataReader dr = cmd.ExecuteReader())
-                {
-                    dr.Read();
-                    VerifyReaderTypeAndValue("Test Simple Data Reader [Variant Type]", "SqlDbType.Variant", dr, expectedTypeName, expectedBaseTypeName, paramValue);
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropStoredProcedure(conn, procName);
-                DropTable(conn, inputTable);
-            }
-        }
-
-        private static void SqlBulkCopySqlDataReader_Type(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "SqlBulkCopySqlDataReader_Type";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string bulkCopySrcTableName = DataTestUtility.GetLongName("bulkSrcTable");
-            string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestTable");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-                xsql(conn, string.Format("create table {0} (f1 {1})", bulkCopyTableName, expectedBaseTypeName));
-
-                DropTable(conn, bulkCopySrcTableName);
-                xsql(conn, string.Format("create table {0} (f1 {1})", bulkCopySrcTableName, expectedBaseTypeName));
-                string value = string.Empty;
-                if (paramValue.GetType() == typeof(DateTimeOffset))
-                {
-                    DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
-                    value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
-                }
-                else if (paramValue.GetType() == typeof(TimeSpan))
-                {
-                    value = ((TimeSpan)paramValue).ToString();
-                }
-                else
-                {
-                    value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
-                }
-                xsql(conn, string.Format("insert into {0}(f1) values(CAST('{1}' AS {2}));", bulkCopySrcTableName, value, expectedBaseTypeName));
-
-                using SqlConnection connInput = new(s_connStr);
-                connInput.Open();
-                using (SqlCommand cmdInput = connInput.CreateCommand())
-                {
-                    cmdInput.CommandText = string.Format("select * from {0}", bulkCopySrcTableName);
-                    using SqlDataReader drInput = cmdInput.ExecuteReader();
-                    // Perform bulk copy to target.
-                    using (SqlBulkCopy bulkCopy = new(conn))
-                    {
-                        bulkCopy.BulkCopyTimeout = 60;
-                        bulkCopy.BatchSize = 1;
-                        bulkCopy.DestinationTableName = bulkCopyTableName;
-                        bulkCopy.WriteToServer(drInput);
-                    }
-
-                    // Verify target.
-                    using SqlCommand cmd = conn.CreateCommand();
-                    cmd.CommandText = string.Format("select f1 from {0}", bulkCopyTableName);
-                    using (SqlDataReader drVerify = cmd.ExecuteReader())
-                    {
-                        drVerify.Read();
-                        VerifyReaderTypeAndValue("SqlBulkCopy From SqlDataReader [Data Type]", expectedBaseTypeName, expectedTypeName, drVerify[0], expectedTypeName, paramValue);
-                    }
-                }
-                connInput.Close();
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-                DropTable(conn, bulkCopySrcTableName);
-            }
-
-        }
-
-        private static void SqlBulkCopySqlDataReader_Variant(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "SqlBulkCopySqlDataReader_Variant";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string bulkCopySrcTableName = DataTestUtility.GetLongName("bulkSrcTable");
-            string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestTable");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-                xsql(conn, string.Format("create table {0} (f1 sql_variant)", bulkCopyTableName));
-
-                DropTable(conn, bulkCopySrcTableName);
-                xsql(conn, string.Format("create table {0} (f1 {1})", bulkCopySrcTableName, expectedBaseTypeName));
-                string value = string.Empty;
-                if (paramValue.GetType() == typeof(DateTimeOffset))
-                {
-                    DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
-                    value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
-                }
-                else if (paramValue.GetType() == typeof(TimeSpan))
-                {
-                    value = ((TimeSpan)paramValue).ToString();
-                }
-                else
-                {
-                    value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
-                }
-                xsql(conn, string.Format("insert into {0}(f1) values(CAST('{1}' AS {2}));", bulkCopySrcTableName, value, expectedBaseTypeName));
-
-                using (SqlConnection connInput = new(s_connStr))
-                {
-                    connInput.Open();
-                    using (SqlCommand cmdInput = connInput.CreateCommand())
-                    {
-                        cmdInput.CommandText = string.Format("select * from {0}", bulkCopySrcTableName);
-                        using SqlDataReader drInput = cmdInput.ExecuteReader();
-                        {
-                            // Perform bulk copy to target.
-                            using (SqlBulkCopy bulkCopy = new(conn))
-                            {
-                                bulkCopy.BulkCopyTimeout = 60;
-                                bulkCopy.BatchSize = 1;
-                                bulkCopy.DestinationTableName = bulkCopyTableName;
-                                bulkCopy.WriteToServer(drInput);
-                            }
-
-                            // Verify target.
-                            using SqlCommand cmd = conn.CreateCommand();
-                            cmd.CommandText = string.Format("select f1, sql_variant_property(f1,'BaseType') as BaseType from {0}", bulkCopyTableName);
-                            using (SqlDataReader drVerify = cmd.ExecuteReader())
-                            {
-                                drVerify.Read();
-                                VerifyReaderTypeAndValue("SqlBulkCopy From SqlDataReader [Variant Type]", "SqlDbType.Variant", drVerify, expectedTypeName, expectedBaseTypeName, paramValue);
-                            }
-                        }
-                    }
-                }
-
-                conn.Close();
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-                DropTable(conn, bulkCopySrcTableName);
-            }
-        }
-
-        private static void SqlBulkCopyDataTable_Type(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "SqlBulkCopyDataTable_Type";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestType");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-                xsql(conn, string.Format("create table {0} (f1 {1})", bulkCopyTableName, expectedBaseTypeName));
-
-                // Send using DataTable as source.
-                DataTable t = new();
-                t.Columns.Add("f1", paramValue.GetType());
-                t.Rows.Add(new object[] { paramValue });
-
-                // Perform bulk copy to target.
-                using (SqlBulkCopy bulkCopy = new(conn))
-                {
-                    bulkCopy.BulkCopyTimeout = 60;
-                    bulkCopy.BatchSize = 1;
-                    bulkCopy.DestinationTableName = bulkCopyTableName;
-                    bulkCopy.WriteToServer(t, DataRowState.Added);
-                }
-
-                // Verify target.
-                using SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = string.Format("select f1 from {0}", bulkCopyTableName);
-                using (SqlDataReader drVerify = cmd.ExecuteReader())
-                {
-                    drVerify.Read();
-                    VerifyReaderTypeAndValue("SqlBulkCopy From Data Table [Data Type]", expectedBaseTypeName, expectedTypeName, drVerify[0], expectedTypeName, paramValue);
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else if (IsExpectedInvalidOperationException(e, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED INVALID OPERATION EXCEPTION] " + AmendTheGivenMessageDateValueException(e.Message, paramValue));
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-            }
-        }
-
-        // sql_variant parameters and sql_variant TVPs store all datetime values internally
-        // as datetime, hence breaking for 2008 types
-        private static void SqlBulkCopyDataTable_Variant(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "SqlBulkCopyDataTable_Variant";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestVariant");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-                xsql(conn, string.Format("create table {0} (f1 sql_variant)", bulkCopyTableName));
-
-                // Send using DataTable as source.
-                DataTable t = new();
-                t.Columns.Add("f1", typeof(object));
-                t.Rows.Add(new object[] { paramValue });
-
-                // Perform bulk copy to target.
-                using (SqlBulkCopy bulkCopy = new(conn))
-                {
-                    bulkCopy.BulkCopyTimeout = 60;
-                    bulkCopy.BatchSize = 1;
-                    bulkCopy.DestinationTableName = bulkCopyTableName;
-                    bulkCopy.WriteToServer(t, DataRowState.Added);
-                }
-
-                // Verify target.
-                using SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = string.Format("select f1, sql_variant_property(f1,'BaseType') as BaseType from {0}", bulkCopyTableName);
-                using (SqlDataReader drVerify = cmd.ExecuteReader())
-                {
-                    drVerify.Read();
-                    VerifyReaderTypeAndValue("SqlBulkCopy From Data Table [Variant Type]", "SqlDbType.Variant", drVerify, expectedTypeName, expectedBaseTypeName, paramValue);
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-            }
-        }
-
-        private static void SqlBulkCopyDataRow_Type(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "SqlBulkCopyDataRow_Type";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestType");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-                xsql(conn, string.Format("create table {0} (f1 {1})", bulkCopyTableName, expectedBaseTypeName));
-                DataTable t = new();
-                t.Columns.Add("f1", paramValue.GetType());
-                t.Rows.Add(new object[] { paramValue });
-                DataRow[] rowToSend = t.Select();
-                using (SqlBulkCopy bulkCopy = new(conn))
-                {
-                    bulkCopy.BulkCopyTimeout = 60;
-                    bulkCopy.BatchSize = 1;
-                    bulkCopy.DestinationTableName = bulkCopyTableName;
-                    bulkCopy.WriteToServer(rowToSend);
-                }
-                using SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = string.Format("select f1 from {0}", bulkCopyTableName);
-                using (SqlDataReader drVerify = cmd.ExecuteReader())
-                {
-                    drVerify.Read();
-                    VerifyReaderTypeAndValue("SqlBulkCopy From Data Row [Data Type]", expectedBaseTypeName, expectedTypeName, drVerify[0], expectedTypeName, paramValue);
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else if (IsExpectedInvalidOperationException(e, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED INVALID OPERATION EXCEPTION] " + AmendTheGivenMessageDateValueException(e.Message, paramValue));
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-            }
-        }
-
-        // sql_variant parameters and sql_variant TVPs store all datetime values internally
-        // as datetime, hence breaking for 2008 types
-        private static void SqlBulkCopyDataRow_Variant(object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            string tag = "SqlBulkCopyDataRow_Variant";
-            DisplayHeader(tag, paramValue, expectedBaseTypeName);
-            string bulkCopyTableName = DataTestUtility.GetLongName("bulkDestVariant");
-            try
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-                xsql(conn, string.Format("create table {0} (f1 sql_variant)", bulkCopyTableName));
-                DataTable t = new();
-                t.Columns.Add("f1", typeof(object));
-                t.Rows.Add(new object[] { paramValue });
-                DataRow[] rowToSend = t.Select();
-                using (SqlBulkCopy bulkCopy = new(conn))
-                {
-                    bulkCopy.BulkCopyTimeout = 60;
-                    bulkCopy.BatchSize = 1;
-                    bulkCopy.DestinationTableName = bulkCopyTableName;
-                    bulkCopy.WriteToServer(rowToSend);
-                }
-                using SqlCommand cmd = conn.CreateCommand();
-                cmd.CommandText = string.Format("select f1, sql_variant_property(f1,'BaseType') as BaseType from {0}", bulkCopyTableName);
-                using (SqlDataReader drVerify = cmd.ExecuteReader())
-                {
-                    drVerify.Read();
-                    VerifyReaderTypeAndValue("SqlBulkCopy From Data Row [Variant Type]", "SqlDbType.Variant", drVerify, expectedTypeName, expectedBaseTypeName, paramValue);
-                }
-            }
-            catch (Exception e)
-            {
-                if (IsExpectedException(e, paramValue, expectedTypeName, expectedBaseTypeName))
-                {
-                    LogMessage(tag, "[EXPECTED EXCEPTION] " + e.Message);
-                }
-                else
-                {
-                    DisplayError(tag, e);
-                }
-            }
-            finally
-            {
-                using SqlConnection conn = new(s_connStr);
-                conn.Open();
-                DropTable(conn, bulkCopyTableName);
-            }
-        }
-
-        // NOTE: Actions
-
-        private static SqlDbType GetSqlDbType(string expectedBaseTypeName)
-        {
-            return expectedBaseTypeName.ToLowerInvariant() switch
-            {
-                "time" => SqlDbType.Time,
-                "date" => SqlDbType.Date,
-                "smalldatetime" => SqlDbType.SmallDateTime,
-                "datetime" => SqlDbType.DateTime,
-                "datetime2" => SqlDbType.DateTime2,
-                "datetimeoffset" => SqlDbType.DateTimeOffset,
-                _ => SqlDbType.Variant,
-            };
-        }
-
-        private static void xsql(SqlConnection conn, string sql)
-        {
-            using SqlCommand cmd = conn.CreateCommand();
-            cmd.CommandText = sql;
-            cmd.ExecuteNonQuery();
-        }
-
-        private static void DropStoredProcedure(SqlConnection conn, string procName)
-        {
-            xsql(conn, string.Format("if exists(select 1 from sys.procedures where name='{0}') begin drop proc {1} end", procName.Substring(1, procName.Length - 2), procName));
-        }
-
-        private static void DropTable(SqlConnection conn, string tableName)
-        {
-            xsql(conn, string.Format("if exists(select 1 from sys.tables where name='{0}') begin drop table {1} end", tableName.Substring(1, tableName.Length - 2), tableName));
-        }
-
-        private static void DropType(SqlConnection conn, string typeName)
-        {
-            xsql(conn, string.Format("if exists(select 1 from sys.types where name='{0}') begin drop type {1} end", typeName.Substring(1, typeName.Length - 2), typeName));
-        }
-
-        // NOTE: Checking and Verification
-        private static void VerifyReaderTypeAndValue(string tag, string expectedBaseTypeName, string type, object actualValue, string expectedTypeName, object expectedValue)
-        {
-            string actualTypeName = actualValue.GetType().ToString();
-
-            LogValues(tag, expectedTypeName, string.Empty, expectedValue, actualTypeName, string.Empty, actualValue);
-
-            if (!actualTypeName.Equals(expectedTypeName))
-            {
-                string ErrorMessage = string.Format(">>> ERROR: TYPE MISMATCH!!! [Actual = {0}] [Expected = {1}]",
-                    actualTypeName,
-                    expectedTypeName);
-
-                LogMessage(tag, ErrorMessage);
-            }
-            if (!actualValue.Equals(expectedValue))
-            {
-                string ErrorMessage;
-                if (IsValueCorrectForType(expectedBaseTypeName, expectedValue, actualValue))
-                {
-                    ErrorMessage = string.Format("[EXPECTED ERROR]: VALUE MISMATCH - [Actual = {0}] [Expected = {1}]",
-                    DataTestUtility.GetValueString(actualValue),
-                    DataTestUtility.GetValueString(expectedValue));
-                }
-                else
-                {
-                    ErrorMessage = string.Format(">>> ERROR: VALUE MISMATCH!!! [Actual = {0}] [Expected = {1}]",
-                    DataTestUtility.GetValueString(actualValue),
-                    DataTestUtility.GetValueString(expectedValue));
-                }
-                LogMessage(tag, ErrorMessage);
-            }
-        }
-
-        private static void VerifyReaderTypeAndValue(string tag, string type, SqlDataReader dr, string expectedTypeName, string expectedBaseTypeName, object expectedValue)
-        {
-            object actualValue = dr[0];
-            string actualTypeName = actualValue.GetType().ToString();
-            string actualBaseTypeName = dr.GetString(1);
-
-            LogValues(tag, expectedTypeName, expectedBaseTypeName, expectedValue, actualTypeName, actualBaseTypeName, actualValue);
-
-            if (!actualTypeName.Equals(expectedTypeName))
-            {
-                string ErrorMessage = string.Format(">>> ERROR: TYPE MISMATCH!!! [Actual = {0}] [Expected = {1}]",
-                    actualTypeName,
-                    expectedTypeName);
-                LogMessage(tag, ErrorMessage);
-            }
-            if (!actualBaseTypeName.Equals(expectedBaseTypeName))
-            {
-                if (((actualTypeName.ToLowerInvariant() != "system.datetime") || (actualTypeName.ToLowerInvariant() != "system.datetimeoffset"))
-                    && (actualBaseTypeName != "datetime2"))
-                {
-                    string ErrorMessage = string.Format(">>> ERROR: VARIANT BASE TYPE MISMATCH!!! [Actual = {0}] [Expected = {1}]",
-                        actualBaseTypeName,
-                        expectedBaseTypeName);
-                    LogMessage(tag, ErrorMessage);
-                }
-            }
-            if (!actualValue.Equals(expectedValue))
-            {
-                string ErrorMessage;
-                if (IsValueCorrectForType(expectedBaseTypeName, expectedValue, actualValue))
-                {
-                    ErrorMessage = string.Format("[EXPECTED ERROR]: VALUE MISMATCH - [Actual = {0}] [Expected = {1}]",
-                    DataTestUtility.GetValueString(actualValue),
-                    DataTestUtility.GetValueString(expectedValue));
-                }
-                else
-                {
-                    ErrorMessage = string.Format(">>> ERROR: VALUE MISMATCH!!! [Actual = {0}] [Expected = {1}]",
-                    DataTestUtility.GetValueString(actualValue),
-                    DataTestUtility.GetValueString(expectedValue));
-                }
-                LogMessage(tag, ErrorMessage);
-            }
-        }
-
-        private static bool IsValueCorrectForType(string expectedBaseTypeName, object expectedValue, object actualValue)
-        {
-            switch (expectedBaseTypeName)
-            {
-                case "date":
-                    if (((DateTime)expectedValue).ToString("M/d/yyyy").Equals(((DateTime)actualValue).ToString("M/d/yyyy")))
-                    {
-                        return true;
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                case "datetime":
-                    if ((((DateTime)expectedValue).Ticks == 3155378975999999999) &&
-                        (((DateTime)actualValue).Ticks == 3155378975999970000))
-                    {
-                        return true;
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                default:
-                    return false;
-            }
-        }
-
-        private static bool IsExpectedException(Exception e, object paramValue, string expectedTypeName, string expectedBaseTypeName)
-        {
-            if ((e.GetType() == typeof(System.Data.SqlTypes.SqlTypeException)) &&
-                                (expectedBaseTypeName == "datetime") &&
-                                (e.Message.Contains("1753")) &&
-                                (((DateTime)paramValue).Year < 1753))
-            {
-                return true;
-            }
-            else if ((e.GetType() == typeof(SqlException)) &&
-                                (expectedBaseTypeName == "datetime") &&
-                                (e.Message.Contains("conversion of a varchar data type to a datetime data type")) &&
-                                (((DateTime)paramValue).Year < 1753))
-            {
-                return true;
-            }
-            else if ((e.GetType() == typeof(SqlException)) &&
-                                (expectedBaseTypeName == "datetime") &&
-                                (e.Message.Contains("converting date and/or time from character string")) &&
-                                (((DateTime)paramValue) == DateTime.MaxValue))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        private static bool IsExpectedInvalidOperationException(Exception e, string expectedBaseTypeName)
-        {
-            return ((e.GetType() == typeof(InvalidOperationException)) &&
-                    (expectedBaseTypeName == "time") &&
-                    (e.Message.Contains("The given value ")));
-        }
-
-        private static string AmendTheGivenMessageDateValueException(string message, object paramValue)
-        {
-            string value;
-            if (paramValue.GetType() == typeof(DateTimeOffset))
-            {
-                DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
-                value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
-            }
-            else if (paramValue.GetType() == typeof(TimeSpan))
-            {
-                value = ((TimeSpan)paramValue).ToString();
-            }
-            else
-            {
-                value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
-            }
-
-            return message.Replace(paramValue.ToString(), value);
-        }
-
-        // NOTE: Logging and Display
-        private static void DisplayHeader(string tag, object paramValue, string expectedBaseTypeName)
-        {
-            Console.WriteLine("");
-            string value;
-            if (paramValue.GetType() == typeof(DateTimeOffset))
-            {
-                DateTimeOffset dt = (DateTimeOffset)paramValue;
-                value = dt.DateTime.ToString("M/d/yyyy") + " " + dt.DateTime.TimeOfDay + " " + dt.Offset;
-            }
-            else if (paramValue.GetType() == typeof(TimeSpan))
-            {
-                value = ((TimeSpan)paramValue).ToString();
-            }
-            else
-            {
-                value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
-            }
-
-            Console.WriteLine(string.Format("------------------------------ {0} [type: {1} value:{2}] ------------------------------", tag, expectedBaseTypeName, value));
-        }
-
-        private static void DisplayError(string tag, Exception e)
-        {
-            string ExceptionMessage = string.Format(">>> EXCEPTION: [{0}] {1}", e.GetType(), e.Message);
-
-            // InvalidCastException message is different between core and framework for this cast attempt.
-            // Make them the same for the purposes of comparing test output.
-            if (e is InvalidCastException &&
-                e.Message.Equals("Unable to cast object of type 'System.TimeSpan' to type 'System.DateTime'."))
-            {
-                ExceptionMessage = string.Format(">>> EXCEPTION: [{0}] {1}", e.GetType(), "Specified cast is not valid.");
-            }
-
-            if (e is ArgumentOutOfRangeException &&
-                e.Message.Equals("The added or subtracted value results in an un-representable DateTime. (Parameter 'value')"))
-            {
-                ExceptionMessage = string.Format(">>> EXCEPTION: [{0}] {1}", e.GetType(), "The added or subtracted value results in an un-representable DateTime.\nParameter name: value");
-            }
-
-            LogMessage(tag, ExceptionMessage);
-        }
-
-        private static void LogMessage(string tag, string message)
-        {
-            Console.WriteLine(string.Format("{0}{1}", tag, message));
-        }
-
-        private static void LogValues(string tag, string expectedTypeName, string expectedBaseTypeName, object expectedValue, string actualTypeName, string actualBaseTypeName, object actualValue)
-        {
-            Console.WriteLine(string.Format("Type        => Expected : Actual == {0} : {1}", expectedTypeName, actualTypeName));
-            Console.WriteLine(string.Format("Base Type   => Expected : Actual == {0} : {1}", expectedBaseTypeName, actualBaseTypeName));
-            if (expectedTypeName == "System.DateTimeOffset")
-            {
-                Console.WriteLine(string.Format("Value       => Expected : Actual == {0} : {1}", ((DateTimeOffset)expectedValue).Ticks.ToString(), ((DateTimeOffset)actualValue).Ticks.ToString()));
-            }
-            else if (expectedTypeName == "System.DateTime")
-            {
-                Console.WriteLine(string.Format("Value       => Expected : Actual == {0} : {1}", ((DateTime)expectedValue).Ticks.ToString(), ((DateTime)actualValue).Ticks.ToString()));
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
index 8bb470a369..ec9f516260 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
@@ -3,125 +3,1297 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
+using System.Data;
 using System.Globalization;
-using System.IO;
-using System.Text;
 using System.Threading;
+using Microsoft.Data.SqlClient.Server;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
+#nullable enable
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    public enum TestVariations
+    {
+        TestSimpleParameter_Type,
+        TestSimpleParameter_Variant,
+        TestSqlDataRecordParameterToTVP_Type,
+        TestSqlDataRecordParameterToTVP_Variant,
+        TestSqlDataReaderParameterToTVP_Type,
+        TestSqlDataReaderParameterToTVP_Variant,
+        TestSqlDataReader_TVP_Type,
+        TestSqlDataReader_TVP_Variant,
+        TestSimpleDataReader_Type,
+        TestSimpleDataReader_Variant,
+        SqlBulkCopySqlDataReader_Type,
+        SqlBulkCopySqlDataReader_Variant,
+        SqlBulkCopyDataTable_Type,
+        SqlBulkCopyDataTable_Variant,
+        SqlBulkCopyDataRow_Type,
+        SqlBulkCopyDataRow_Variant
+    }
+
+    public struct TestResult
+    {
+        public object Value { get; }
+        public string BaseTypeName { get; }
+
+        public TestResult(object value, string baseTypeName)
+        {
+            Value = value;
+            BaseTypeName = baseTypeName;
+        }
+    }
+
+    public delegate bool ExceptionChecker(Exception e, object paramValue);
+
     /// <summary>
     /// Tests for DateTime variant parameters with different date/time types.
-    /// These tests run independently with their own baseline comparison.
     /// </summary>
-    [Collection("ParameterBaselineTests")]
+    [Trait("Category", "flaky")]
     public class DateTimeVariantTests
     {
-        private readonly string _connStr;
+        private static void RunTest(
+            TestVariations tag,
+            Func<object, string, string, TestResult> action,
+            object paramValue, 
+            string expectedBaseTypeName, 
+            string connStr, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            CultureInfo previousCulture = Thread.CurrentThread.CurrentCulture;
+            Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
+            TestResult? result = null;
+            Exception? caughtException = null;
+            try
+            {
+                result = action(paramValue, expectedBaseTypeName, connStr);
+            }
+            catch (Exception e)
+            {
+                caughtException = e;
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = previousCulture;
+            }
+
+            if (caughtException != null)
+            {
+                if (expectedExceptions.TryGetValue(tag, out var isExpectedException))
+                {
+                    Assert.True(isExpectedException(caughtException, paramValue), caughtException.Message);
+                }
+                else
+                {
+                    Assert.Fail($"Unexpected exception was thrown for test variation {tag} with parameter value {paramValue}. Exception: {caughtException}");
+                }
+            }
+            else
+            {
+                expectedValueOverrides.TryGetValue(tag, out var expectedValueOverride);
+                expectedBaseTypeOverrides.TryGetValue(tag, out var expectedBaseTypeOverride);
 
-        public DateTimeVariantTests()
+                TestResult testResult = result!.Value;
+                Assert.Equal(expectedValueOverride ?? paramValue, testResult.Value);
+                Assert.Equal(expectedBaseTypeOverride ?? expectedBaseTypeName, testResult.BaseTypeName);
+            }
+        }
+
+        private static SqlDbType GetSqlDbType(string expectedBaseTypeName)
         {
-            _connStr = DataTestUtility.TCPConnectionString;
+            return expectedBaseTypeName.ToLowerInvariant() switch
+            {
+                "time" => SqlDbType.Time,
+                "date" => SqlDbType.Date,
+                "smalldatetime" => SqlDbType.SmallDateTime,
+                "datetime" => SqlDbType.DateTime,
+                "datetime2" => SqlDbType.DateTime2,
+                "datetimeoffset" => SqlDbType.DateTimeOffset,
+                _ => SqlDbType.Variant,
+            };
         }
 
-        [Trait("Category", "flaky")]
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
-        public void DateTimeVariantParameterTest()
+        private static void xsql(SqlConnection conn, string sql)
         {
-            Assert.True(RunTestAndCompareWithBaseline());
+            using SqlCommand cmd = conn.CreateCommand();
+            cmd.CommandText = sql;
+            cmd.ExecuteNonQuery();
         }
 
-        private bool RunTestAndCompareWithBaseline()
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void TestSimpleParameter_Type(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
-            CultureInfo previousCulture = Thread.CurrentThread.CurrentCulture;
-            Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
-            try
-            {
-            string outputPath = "DateTimeVariant.out";
-            string baselinePath = "DateTimeVariant.bsl";
+            RunTest(
+                TestVariations.TestSimpleParameter_Type,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+                    using StoredProcedure proc = new(conn, "paramProc1", $"(@param {expectedBaseTypeName}) AS BEGIN SELECT @param, sql_variant_property(@param,'BaseType') AS BaseType END;");
+
+                    using SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = proc.Name;
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    SqlParameter p = cmd.Parameters.AddWithValue("@param", paramValue);
+                    cmd.Parameters[0].SqlDbType = GetSqlDbType(expectedBaseTypeName);
+                    using (SqlDataReader dr = cmd.ExecuteReader())
+                    {
+                        dr.Read();
+                        return new TestResult(dr[0], dr.GetString(1));
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
 
-            var fstream = new FileStream(outputPath, FileMode.Create, FileAccess.Write, FileShare.Read);
-            var swriter = new StreamWriter(fstream, Encoding.UTF8);
-            var twriter = new TvpTest.CarriageReturnLineFeedReplacer(swriter);
-            Console.SetOut(twriter);
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void TestSimpleParameter_Variant(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.TestSimpleParameter_Variant,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+                    using StoredProcedure proc = new(conn, "paramProc2", "(@param sql_variant) AS BEGIN SELECT @param, sql_variant_property(@param,'BaseType') AS BaseType END;");
 
-            // Run Test
-            DateTimeVariantTest.TestAllDateTimeWithDataTypeAndVariant(_connStr);
+                    using SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = proc.Name;
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    SqlParameter p = cmd.Parameters.AddWithValue("@param", paramValue);
+                    cmd.Parameters[0].SqlDbType = SqlDbType.Variant;
+                    using (SqlDataReader dr = cmd.ExecuteReader())
+                    {
+                        dr.Read();
+                        return new TestResult(dr[0], dr.GetString(1));
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
 
-            Console.Out.Flush();
-            Console.Out.Dispose();
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void TestSqlDataRecordParameterToTVP_Type(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.TestSqlDataRecordParameterToTVP_Type,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+                    using UserDefinedType tvpType = new(conn, "tvpType", $"TABLE (f1 {expectedBaseTypeName})");
 
-            // Recover the standard output stream
-            StreamWriter standardOutput = new(Console.OpenStandardOutput());
-            standardOutput.AutoFlush = true;
-            Console.SetOut(standardOutput);
+                    // Send TVP using SqlMetaData.
+                    SqlMetaData[] metadata = new SqlMetaData[1];
+                    metadata[0] = new SqlMetaData("f1", GetSqlDbType(expectedBaseTypeName));
+                    SqlDataRecord[] record = new SqlDataRecord[1];
+                    record[0] = new SqlDataRecord(metadata);
+                    record[0].SetValue(0, paramValue);
 
-            // Compare output file
-            var comparisonResult = FindDiffFromBaseline(baselinePath, outputPath);
+                    using SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = "select f1, sql_variant_property(f1,'BaseType') as BaseType from @tvpParam";
+                    SqlParameter p = cmd.Parameters.AddWithValue("@tvpParam", record);
+                    p.SqlDbType = SqlDbType.Structured;
+                    p.TypeName = tvpType.Name;
+                    using (SqlDataReader dr = cmd.ExecuteReader())
+                    {
+                        dr.Read();
+                        return new TestResult(dr[0], dr.GetString(1));
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
 
-            if (string.IsNullOrEmpty(comparisonResult))
-            {
-                return true;
-            }
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void TestSqlDataRecordParameterToTVP_Variant(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.TestSqlDataRecordParameterToTVP_Variant,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+                    using UserDefinedType tvpType = new(conn, "tvpVariant", "TABLE (f1 sql_variant)");
 
-            Console.WriteLine("DateTimeVariantParameterTest Failed!");
-            Console.WriteLine("Please compare baseline: {0} with output: {1}", Path.GetFullPath(baselinePath), Path.GetFullPath(outputPath));
-            Console.WriteLine("Comparison Results:");
-            Console.WriteLine(comparisonResult);
-            return false;
-            }
-            finally
-            {
-                Thread.CurrentThread.CurrentCulture = previousCulture;
-            }
+                    // Send TVP using SqlMetaData.
+                    SqlMetaData[] metadata = new SqlMetaData[1];
+                    metadata[0] = new SqlMetaData("f1", SqlDbType.Variant);
+                    SqlDataRecord[] record = new SqlDataRecord[1];
+                    record[0] = new SqlDataRecord(metadata);
+                    record[0].SetValue(0, paramValue);
+
+                    using SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = "select f1, sql_variant_property(f1,'BaseType') as BaseType from @tvpParam";
+                    SqlParameter p = cmd.Parameters.AddWithValue("@tvpParam", record);
+                    p.SqlDbType = SqlDbType.Structured;
+                    p.TypeName = tvpType.Name;
+                    using (SqlDataReader dr = cmd.ExecuteReader())
+                    {
+                        dr.Read();
+                        return new TestResult(dr[0], dr.GetString(1));
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
         }
 
-        private static string FindDiffFromBaseline(string baselinePath, string outputPath)
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void TestSqlDataReaderParameterToTVP_Type(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
-            var expectedLines = File.ReadAllLines(baselinePath);
-            var outputLines = File.ReadAllLines(outputPath);
+            RunTest(
+                TestVariations.TestSqlDataReaderParameterToTVP_Type,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+                    using UserDefinedType tvpType = new(conn, "tvpType", $"TABLE (f1 {expectedBaseTypeName})");
+                    using (SqlConnection connInput = new(connStr))
+                    {
+                        connInput.Open();
+                        using (SqlCommand cmdInput = connInput.CreateCommand())
+                        {
+                            cmdInput.CommandText = "select @p1 as f1";
+                            cmdInput.Parameters.Add("@p1", GetSqlDbType(expectedBaseTypeName));
+                            cmdInput.Parameters["@p1"].Value = paramValue;
+                            using SqlDataReader drInput = cmdInput.ExecuteReader(CommandBehavior.CloseConnection);
+                            using SqlCommand cmd = conn.CreateCommand();
+                            cmd.CommandText = "select f1, sql_variant_property(f1,'BaseType') as BaseType from @tvpParam";
+                            SqlParameter p = cmd.Parameters.AddWithValue("@tvpParam", drInput);
+                            p.SqlDbType = SqlDbType.Structured;
+                            p.TypeName = tvpType.Name;
+                            using (SqlDataReader dr = cmd.ExecuteReader())
+                            {
+                                dr.Read();
+                                return new TestResult(dr[0], dr.GetString(1));
+                            }
+                        }
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
 
-            var comparisonSb = new StringBuilder();
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void TestSqlDataReaderParameterToTVP_Variant(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.TestSqlDataReaderParameterToTVP_Variant,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+                    using UserDefinedType tvpType = new(conn, "tvpVariant", "TABLE (f1 sql_variant)");
 
-            var expectedLength = expectedLines.Length;
-            var outputLength = outputLines.Length;
-            var findDiffLength = Math.Min(expectedLength, outputLength);
+                    // Send TVP using SqlDataReader.
+                    using (SqlConnection connInput = new(connStr))
+                    {
+                        connInput.Open();
+                        using (SqlCommand cmdInput = connInput.CreateCommand())
+                        {
+                            cmdInput.CommandText = "select @p1 as f1";
+                            cmdInput.Parameters.Add("@p1", SqlDbType.Variant);
+                            cmdInput.Parameters["@p1"].Value = paramValue;
+                            using SqlDataReader drInput = cmdInput.ExecuteReader(CommandBehavior.CloseConnection);
+                            using SqlCommand cmd = conn.CreateCommand();
+                            cmd.CommandText = "select f1, sql_variant_property(f1,'BaseType') as BaseType from @tvpParam";
+                            SqlParameter p = cmd.Parameters.AddWithValue("@tvpParam", drInput);
+                            p.SqlDbType = SqlDbType.Structured;
+                            p.TypeName = tvpType.Name;
+                            using (SqlDataReader dr = cmd.ExecuteReader())
+                            {
+                                dr.Read();
+                                return new TestResult(dr[0], dr.GetString(1));
+                            }
+                        }
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
 
-            for (var lineNo = 0; lineNo < findDiffLength; lineNo++)
-            {
-                if (!expectedLines[lineNo].Equals(outputLines[lineNo]))
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void TestSqlDataReader_TVP_Type(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.TestSqlDataReader_TVP_Type,
+                (paramValue, expectedBaseTypeName, connStr) =>
                 {
-                    comparisonSb.AppendFormat("** DIFF at line {0} \n", lineNo);
-                    comparisonSb.AppendFormat("A : {0} \n", outputLines[lineNo]);
-                    comparisonSb.AppendFormat("E : {0} \n", expectedLines[lineNo]);
-                }
-            }
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
 
-            var startIndex = findDiffLength - 1;
-            if (startIndex < 0)
-            {
-                startIndex = 0;
-            }
+                    using UserDefinedType tvpType = new(conn, "tvpType", $"TABLE (f1 {expectedBaseTypeName})");
+                    using Table inputTable = new(conn, "InputTable", $"(f1 {expectedBaseTypeName})");
+                    using Table outputTable = new(conn, "OutputTable", $"(f1 {expectedBaseTypeName})");
 
-            if (findDiffLength < expectedLength)
-            {
-                comparisonSb.AppendFormat("** MISSING \n");
-                for (var lineNo = startIndex; lineNo < expectedLength; lineNo++)
+                    string value = string.Empty;
+                    if (paramValue.GetType() == typeof(DateTimeOffset))
+                    {
+                        DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
+                        value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
+                    }
+                    else if (paramValue.GetType() == typeof(TimeSpan))
+                    {
+                        value = ((TimeSpan)paramValue).ToString();
+                    }
+                    else
+                    {
+                        value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
+                    }
+                    xsql(conn, string.Format("insert into {0} values(CAST('{1}' AS {2}))", inputTable.Name, value, expectedBaseTypeName));
+                    using StoredProcedure proc = new(conn, "spTVPProc", $"(@P {tvpType.Name} READONLY) AS BEGIN INSERT INTO {outputTable.Name} SELECT * FROM @P; END");
+
+                    SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = string.Format("SELECT * FROM {0}", inputTable.Name);
+                    using SqlDataReader r = cmd.ExecuteReader();
+                    using (SqlConnection conn2 = new(connStr))
+                    {
+                        conn2.Open();
+                        SqlCommand cmd2 = new(proc.Name, conn2)
+                        {
+                            CommandType = CommandType.StoredProcedure
+                        };
+                        SqlParameter p = cmd2.Parameters.AddWithValue("@P", r);
+                        p.SqlDbType = SqlDbType.Structured;
+                        p.TypeName = tvpType.Name;
+                        cmd2.ExecuteNonQuery();
+
+                        cmd2.CommandText = string.Format("SELECT f1, sql_variant_property(f1,'BaseType') as BaseType FROM {0}", outputTable.Name);
+                        cmd2.CommandType = CommandType.Text;
+                        using (SqlDataReader dr = cmd2.ExecuteReader())
+                        {
+                            dr.Read();
+                            return new TestResult(dr[0], dr.GetString(1));
+                        }
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void TestSqlDataReader_TVP_Variant(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.TestSqlDataReader_TVP_Variant,
+                (paramValue, expectedBaseTypeName, connStr) =>
                 {
-                    comparisonSb.AppendFormat("{0} : {1}", lineNo, expectedLines[lineNo]);
-                }
-            }
-            if (findDiffLength < outputLength)
-            {
-                comparisonSb.AppendFormat("** EXTRA \n");
-                for (var lineNo = startIndex; lineNo < outputLength; lineNo++)
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+
+                    using UserDefinedType tvpType = new(conn, "tvpVariant_DRdrTVPVar", "TABLE (f1 sql_variant)");
+                    using Table inputTable = new(conn, "InputTable", "(f1 sql_variant)");
+                    using Table outputTable = new(conn, "OutputTable", "(f1 sql_variant)");
+
+                    string value = string.Empty;
+                    if (paramValue.GetType() == typeof(DateTimeOffset))
+                    {
+                        DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
+                        value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
+                    }
+                    else if (paramValue.GetType() == typeof(TimeSpan))
+                    {
+                        value = ((TimeSpan)paramValue).ToString();
+                    }
+                    else
+                    {
+                        value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
+                    }
+                    xsql(conn, string.Format("insert into {0} values(CAST('{1}' AS {2}))", inputTable.Name, value, expectedBaseTypeName));
+                    using StoredProcedure proc = new(conn, "spTVPProc_DRdrTVPVar", $"(@P {tvpType.Name} READONLY) AS BEGIN INSERT INTO {outputTable.Name} SELECT * FROM @P; END");
+
+                    SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = string.Format("SELECT * FROM {0}", inputTable.Name);
+                    using SqlDataReader r = cmd.ExecuteReader();
+                    using (SqlConnection conn2 = new(connStr))
+                    {
+                        conn2.Open();
+                        using (SqlCommand cmd2 = new(proc.Name, conn2))
+                        {
+                            cmd2.CommandType = CommandType.StoredProcedure;
+                            SqlParameter p = cmd2.Parameters.AddWithValue("@P", r);
+                            p.SqlDbType = SqlDbType.Structured;
+                            p.TypeName = tvpType.Name;
+                            cmd2.ExecuteNonQuery();
+
+                            cmd2.CommandText = string.Format("SELECT f1, sql_variant_property(f1,'BaseType') as BaseType FROM {0}", outputTable.Name);
+                            cmd2.CommandType = CommandType.Text;
+                            using (SqlDataReader dr = cmd2.ExecuteReader())
+                            {
+                                dr.Read();
+                                return new TestResult(dr[0], dr.GetString(1));
+                            }
+                        }
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void TestSimpleDataReader_Type(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.TestSimpleDataReader_Type,
+                (paramValue, expectedBaseTypeName, connStr) =>
                 {
-                    comparisonSb.AppendFormat("{0} : {1}", lineNo, outputLines[lineNo]);
-                }
-            }
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+
+                    using Table inputTable = new(conn, "inputTable", $"(f1 {expectedBaseTypeName})");
+                    string value = string.Empty;
+                    if (paramValue.GetType() == typeof(DateTimeOffset))
+                    {
+                        DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
+                        value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
+                    }
+                    else if (paramValue.GetType() == typeof(TimeSpan))
+                    {
+                        value = ((TimeSpan)paramValue).ToString();
+                    }
+                    else
+                    {
+                        value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
+                    }
+                    xsql(conn, string.Format("insert into {0}(f1) values('{1}');", inputTable.Name, value));
+                    using StoredProcedure proc = new(conn, "paramProc3", $"AS BEGIN SELECT f1, sql_variant_property(f1,'BaseType') AS BaseType FROM {inputTable.Name} END;");
+
+                    using SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = proc.Name;
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    using (SqlDataReader dr = cmd.ExecuteReader())
+                    {
+                        dr.Read();
+                        return new TestResult(dr[0], dr.GetString(1));
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void TestSimpleDataReader_Variant(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.TestSimpleDataReader_Variant,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+
+                    using Table inputTable = new(conn, "inputTable", "(f1 sql_variant)");
+                    string value = string.Empty;
+                    if (paramValue.GetType() == typeof(DateTimeOffset))
+                    {
+                        DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
+                        value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
+                    }
+                    else if (paramValue.GetType() == typeof(TimeSpan))
+                    {
+                        value = ((TimeSpan)paramValue).ToString();
+                    }
+                    else
+                    {
+                        value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
+                    }
+                    xsql(conn, string.Format("insert into {0}(f1) values(CAST('{1}' AS {2}));", inputTable.Name, value, expectedBaseTypeName));
+                    using StoredProcedure proc = new(conn, "paramProc4", $"AS BEGIN SELECT f1, sql_variant_property(f1,'BaseType') AS BaseType FROM {inputTable.Name} END;");
+
+                    using SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = proc.Name;
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    using (SqlDataReader dr = cmd.ExecuteReader())
+                    {
+                        dr.Read();
+                        return new TestResult(dr[0], dr.GetString(1));
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void SqlBulkCopySqlDataReader_Type(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.SqlBulkCopySqlDataReader_Type,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+
+                    using Table bulkCopyDestTable = new(conn, "bulkDestTable", $"(f1 {expectedBaseTypeName})");
+                    using Table bulkCopySrcTable = new(conn, "bulkSrcTable", $"(f1 {expectedBaseTypeName})");
+                    string value = string.Empty;
+                    if (paramValue.GetType() == typeof(DateTimeOffset))
+                    {
+                        DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
+                        value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
+                    }
+                    else if (paramValue.GetType() == typeof(TimeSpan))
+                    {
+                        value = ((TimeSpan)paramValue).ToString();
+                    }
+                    else
+                    {
+                        value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
+                    }
+                    xsql(conn, string.Format("insert into {0}(f1) values(CAST('{1}' AS {2}));", bulkCopySrcTable.Name, value, expectedBaseTypeName));
+
+                    using SqlConnection connInput = new(connStr);
+                    connInput.Open();
+                    using (SqlCommand cmdInput = connInput.CreateCommand())
+                    {
+                        cmdInput.CommandText = string.Format("select * from {0}", bulkCopySrcTable.Name);
+                        using SqlDataReader drInput = cmdInput.ExecuteReader();
+                        // Perform bulk copy to target.
+                        using (SqlBulkCopy bulkCopy = new(conn))
+                        {
+                            bulkCopy.BulkCopyTimeout = 60;
+                            bulkCopy.BatchSize = 1;
+                            bulkCopy.DestinationTableName = bulkCopyDestTable.Name;
+                            bulkCopy.WriteToServer(drInput);
+                        }
 
-            return comparisonSb.ToString();
+                        // Verify target.
+                        using SqlCommand cmd = conn.CreateCommand();
+                        cmd.CommandText = string.Format("select f1, sql_variant_property(f1,'BaseType') as BaseType from {0}", bulkCopyDestTable.Name);
+                        using (SqlDataReader drVerify = cmd.ExecuteReader())
+                        {
+                            drVerify.Read();
+                            return new TestResult(drVerify[0], drVerify.GetString(1));
+                        }
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
         }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void SqlBulkCopySqlDataReader_Variant(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.SqlBulkCopySqlDataReader_Variant,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+
+                    using Table bulkCopyDestTable = new(conn, "bulkDestTable", "(f1 sql_variant)");
+                    using Table bulkCopySrcTable = new(conn, "bulkSrcTable", $"(f1 {expectedBaseTypeName})");
+                    string value = string.Empty;
+                    if (paramValue.GetType() == typeof(DateTimeOffset))
+                    {
+                        DateTime dt = ((DateTimeOffset)paramValue).UtcDateTime;
+                        value = dt.ToString("M/d/yyyy") + " " + dt.TimeOfDay;
+                    }
+                    else if (paramValue.GetType() == typeof(TimeSpan))
+                    {
+                        value = ((TimeSpan)paramValue).ToString();
+                    }
+                    else
+                    {
+                        value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
+                    }
+                    xsql(conn, string.Format("insert into {0}(f1) values(CAST('{1}' AS {2}));", bulkCopySrcTable.Name, value, expectedBaseTypeName));
+
+                    using (SqlConnection connInput = new(connStr))
+                    {
+                        connInput.Open();
+                        using (SqlCommand cmdInput = connInput.CreateCommand())
+                        {
+                            cmdInput.CommandText = string.Format("select * from {0}", bulkCopySrcTable.Name);
+                            using SqlDataReader drInput = cmdInput.ExecuteReader();
+                            {
+                                // Perform bulk copy to target.
+                                using (SqlBulkCopy bulkCopy = new(conn))
+                                {
+                                    bulkCopy.BulkCopyTimeout = 60;
+                                    bulkCopy.BatchSize = 1;
+                                    bulkCopy.DestinationTableName = bulkCopyDestTable.Name;
+                                    bulkCopy.WriteToServer(drInput);
+                                }
+
+                                // Verify target.
+                                using SqlCommand cmd = conn.CreateCommand();
+                                cmd.CommandText = string.Format("select f1, sql_variant_property(f1,'BaseType') as BaseType from {0}", bulkCopyDestTable.Name);
+                                using (SqlDataReader drVerify = cmd.ExecuteReader())
+                                {
+                                    drVerify.Read();
+                                    return new TestResult(drVerify[0], drVerify.GetString(1));
+                                }
+                            }
+                        }
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void SqlBulkCopyDataTable_Type(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.SqlBulkCopyDataTable_Type,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+
+                    using Table bulkCopyTable = new(conn, "bulkDestType", $"(f1 {expectedBaseTypeName})");
+
+                    // Send using DataTable as source.
+                    DataTable t = new();
+                    t.Columns.Add("f1", paramValue.GetType());
+                    t.Rows.Add(new object[] { paramValue });
+
+                    // Perform bulk copy to target.
+                    using (SqlBulkCopy bulkCopy = new(conn))
+                    {
+                        bulkCopy.BulkCopyTimeout = 60;
+                        bulkCopy.BatchSize = 1;
+                        bulkCopy.DestinationTableName = bulkCopyTable.Name;
+                        bulkCopy.WriteToServer(t, DataRowState.Added);
+                    }
+
+                    // Verify target.
+                    using SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = string.Format("select f1, sql_variant_property(f1,'BaseType') as BaseType from {0}", bulkCopyTable.Name);
+                    using (SqlDataReader drVerify = cmd.ExecuteReader())
+                    {
+                        drVerify.Read();
+                        return new TestResult(drVerify[0], drVerify.GetString(1));
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void SqlBulkCopyDataTable_Variant(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.SqlBulkCopyDataTable_Variant,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+
+                    using Table bulkCopyTable = new(conn, "bulkDestVariant", "(f1 sql_variant)");
+
+                    // Send using DataTable as source.
+                    DataTable t = new();
+                    t.Columns.Add("f1", typeof(object));
+                    t.Rows.Add(new object[] { paramValue });
+
+                    // Perform bulk copy to target.
+                    using (SqlBulkCopy bulkCopy = new(conn))
+                    {
+                        bulkCopy.BulkCopyTimeout = 60;
+                        bulkCopy.BatchSize = 1;
+                        bulkCopy.DestinationTableName = bulkCopyTable.Name;
+                        bulkCopy.WriteToServer(t, DataRowState.Added);
+                    }
+
+                    // Verify target.
+                    using SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = string.Format("select f1, sql_variant_property(f1,'BaseType') as BaseType from {0}", bulkCopyTable.Name);
+                    using (SqlDataReader drVerify = cmd.ExecuteReader())
+                    {
+                        drVerify.Read();
+                        return new TestResult(drVerify[0], drVerify.GetString(1));
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void SqlBulkCopyDataRow_Type(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.SqlBulkCopyDataRow_Type,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+
+                    using Table bulkCopyTable = new(conn, "bulkDestType", $"(f1 {expectedBaseTypeName})");
+                    DataTable t = new();
+                    t.Columns.Add("f1", paramValue.GetType());
+                    t.Rows.Add(new object[] { paramValue });
+                    DataRow[] rowToSend = t.Select();
+                    using (SqlBulkCopy bulkCopy = new(conn))
+                    {
+                        bulkCopy.BulkCopyTimeout = 60;
+                        bulkCopy.BatchSize = 1;
+                        bulkCopy.DestinationTableName = bulkCopyTable.Name;
+                        bulkCopy.WriteToServer(rowToSend);
+                    }
+                    using SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = string.Format("select f1, sql_variant_property(f1,'BaseType') as BaseType from {0}", bulkCopyTable.Name);
+                    using (SqlDataReader drVerify = cmd.ExecuteReader())
+                    {
+                        drVerify.Read();
+                        return new TestResult(drVerify[0], drVerify.GetString(1));
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
+        public void SqlBulkCopyDataRow_Variant(
+            object paramValue, 
+            string expectedBaseTypeName, 
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            Dictionary<TestVariations, object> expectedValueOverrides,
+            Dictionary<TestVariations, string> expectedBaseTypeOverrides)
+        {
+            RunTest(
+                TestVariations.SqlBulkCopyDataRow_Variant,
+                (paramValue, expectedBaseTypeName, connStr) =>
+                {
+                    using SqlConnection conn = new(connStr);
+                    conn.Open();
+
+                    using Table bulkCopyTable = new(conn, "bulkDestVariant", "(f1 sql_variant)");
+                    DataTable t = new();
+                    t.Columns.Add("f1", typeof(object));
+                    t.Rows.Add(new object[] { paramValue });
+                    DataRow[] rowToSend = t.Select();
+                    using (SqlBulkCopy bulkCopy = new(conn))
+                    {
+                        bulkCopy.BulkCopyTimeout = 60;
+                        bulkCopy.BatchSize = 1;
+                        bulkCopy.DestinationTableName = bulkCopyTable.Name;
+                        bulkCopy.WriteToServer(rowToSend);
+                    }
+                    using SqlCommand cmd = conn.CreateCommand();
+                    cmd.CommandText = string.Format("select f1, sql_variant_property(f1,'BaseType') as BaseType from {0}", bulkCopyTable.Name);
+                    using (SqlDataReader drVerify = cmd.ExecuteReader())
+                    {
+                        drVerify.Read();
+                        return new TestResult(drVerify[0], drVerify.GetString(1));
+                    }
+                },
+                paramValue, 
+                expectedBaseTypeName, 
+                DataTestUtility.TCPConnectionString, 
+                expectedExceptions, 
+                expectedValueOverrides,
+                expectedBaseTypeOverrides);
+        }
+
+        /// <summary>
+        /// Gets parameter combinations for MemberData. Each entry yields the full parameter value,
+        /// expected base type name, expected exceptions, expected value overrides, and expected base
+        /// type overrides. <see cref="MemberDataAttribute.DisableDiscoveryEnumeration"/> is set to
+        /// avoid xUnit serialization issues with the complex types used in each row.
+        /// </summary>
+        public static IEnumerable<object[]> GetParameterCombinations()
+        {
+            yield return new object[] { DateTime.MinValue, "date",
+                new Dictionary<TestVariations, ExceptionChecker> {
+                    { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, 
+                new Dictionary<TestVariations, object>(), 
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateTime.MaxValue, "date", 
+                new Dictionary<TestVariations, ExceptionChecker>(), 
+                new Dictionary<TestVariations, object>
+                {
+                    { TestVariations.TestSimpleParameter_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSimpleParameter_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataReader_TVP_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSqlDataReader_TVP_Variant, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSimpleDataReader_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSimpleDataReader_Variant, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopyDataTable_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.SqlBulkCopyDataRow_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(3155378975999970000) }
+                },
+                new Dictionary<TestVariations, string>
+                {
+                    {TestVariations.TestSimpleParameter_Variant, "datetime"},
+                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, "datetime"},
+                    {TestVariations.TestSqlDataReaderParameterToTVP_Variant, "datetime"},
+                    {TestVariations.SqlBulkCopyDataTable_Variant, "datetime"},
+                    {TestVariations.SqlBulkCopyDataRow_Variant, "datetime"}
+                }
+            };
+            yield return new object[] { DateTime.MinValue, "datetime2",
+                new Dictionary<TestVariations, ExceptionChecker> {
+                    { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, 
+                new Dictionary<TestVariations, object>(),
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateTime.MaxValue, "datetime2", 
+                new Dictionary<TestVariations, ExceptionChecker>(),
+                new Dictionary<TestVariations, object> {
+                    {TestVariations.TestSimpleParameter_Variant, new DateTime(3155378975999970000)},
+                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(3155378975999970000)},
+                    {TestVariations.TestSqlDataReaderParameterToTVP_Variant, new DateTime(3155378975999970000)},
+                    {TestVariations.SqlBulkCopyDataTable_Variant, new DateTime(3155378975999970000)},
+                    {TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(3155378975999970000)}
+                },
+                new Dictionary<TestVariations, string>
+                {
+                    {TestVariations.TestSimpleParameter_Variant, "datetime"},
+                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, "datetime"},
+                    {TestVariations.TestSqlDataReaderParameterToTVP_Variant, "datetime"},
+                    {TestVariations.SqlBulkCopyDataTable_Variant, "datetime"},
+                    {TestVariations.SqlBulkCopyDataRow_Variant, "datetime"}
+                }};
+            yield return new object[] { DateTime.MinValue, "datetime", 
+                new Dictionary<TestVariations, ExceptionChecker> { 
+                    { TestVariations.TestSimpleParameter_Type, SqlDateTimeOverflow },
+                    { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReader_TVP_Type, VarcharToDateTimeOutOfRange},
+                    { TestVariations.TestSqlDataReader_TVP_Variant, VarcharToDateTimeOutOfRange},
+                    { TestVariations.TestSimpleDataReader_Type, VarcharToDateTimeOutOfRange},
+                    { TestVariations.TestSimpleDataReader_Variant, VarcharToDateTimeOutOfRange},
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, VarcharToDateTimeOutOfRange},
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, VarcharToDateTimeOutOfRange}, 
+                    { TestVariations.SqlBulkCopyDataTable_Type, SqlDateTimeOverflow},
+                    { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow},
+                    { TestVariations.SqlBulkCopyDataRow_Type, SqlDateTimeOverflow},
+                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow}},
+                new Dictionary<TestVariations, object>(),
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateTime.MaxValue, "datetime", 
+                new Dictionary<TestVariations, ExceptionChecker> { 
+                    { TestVariations.TestSqlDataReader_TVP_Type, CannotConvertCharacterStringToDateOrTime},
+                    { TestVariations.TestSqlDataReader_TVP_Variant, CannotConvertCharacterStringToDateOrTime},
+                    { TestVariations.TestSimpleDataReader_Type, CannotConvertCharacterStringToDateOrTime},
+                    { TestVariations.TestSimpleDataReader_Variant, CannotConvertCharacterStringToDateOrTime},
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, CannotConvertCharacterStringToDateOrTime},
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, CannotConvertCharacterStringToDateOrTime}}, 
+                new Dictionary<TestVariations, object>
+                {
+                    { TestVariations.TestSimpleParameter_Type, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSimpleParameter_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataReader_TVP_Type, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataReader_TVP_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSimpleDataReader_Type, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSimpleDataReader_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, new DateTime(3155378975999970000) },
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.SqlBulkCopyDataTable_Type, new DateTime(3155378975999970000) },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.SqlBulkCopyDataRow_Type, new DateTime(3155378975999970000) },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(3155378975999970000) }
+                },
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateTimeOffset.MinValue, "datetimeoffset",
+                new Dictionary<TestVariations, ExceptionChecker>(),
+                new Dictionary<TestVariations, object>(),
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateTimeOffset.MaxValue, "datetimeoffset",
+                new Dictionary<TestVariations, ExceptionChecker>(),
+                new Dictionary<TestVariations, object>(),
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateTimeOffset.Parse("12/31/1999 23:59:59.9999999 -08:30"), "datetimeoffset",
+                new Dictionary<TestVariations, ExceptionChecker>(),
+                new Dictionary<TestVariations, object>(),
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateTime.Parse("1998-01-01 23:59:59.995"), "datetime2",
+                new Dictionary<TestVariations, ExceptionChecker>(),
+                new Dictionary<TestVariations, object>
+                {
+                    {TestVariations.TestSimpleParameter_Variant, DateTime.Parse("1998-01-01 23:59:59.997")},
+                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, DateTime.Parse("1998-01-01 23:59:59.997")},
+                    {TestVariations.TestSqlDataReaderParameterToTVP_Variant, DateTime.Parse("1998-01-01 23:59:59.997")},
+                    {TestVariations.SqlBulkCopyDataTable_Variant, DateTime.Parse("1998-01-01 23:59:59.997")},
+                    {TestVariations.SqlBulkCopyDataRow_Variant, DateTime.Parse("1998-01-01 23:59:59.997")}
+                },
+                new Dictionary<TestVariations, string>
+                {
+                    {TestVariations.TestSimpleParameter_Variant, "datetime"},
+                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, "datetime"},
+                    {TestVariations.TestSqlDataReaderParameterToTVP_Variant, "datetime"},
+                    {TestVariations.SqlBulkCopyDataTable_Variant, "datetime"},
+                    {TestVariations.SqlBulkCopyDataRow_Variant, "datetime"}
+                }};
+            yield return new object[] { DateTime.MinValue, "smalldatetime",
+                new Dictionary<TestVariations, ExceptionChecker> {
+                    { TestVariations.TestSimpleParameter_Type, SqlDateTimeOverflow },
+                    { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, InvalidValueForMetadata },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReader_TVP_Type, VarcharToSmallDateTimeOutOfRange },
+                    { TestVariations.TestSqlDataReader_TVP_Variant, VarcharToSmallDateTimeOutOfRange },
+                    { TestVariations.TestSimpleDataReader_Type, VarcharToSmallDateTimeOutOfRange },
+                    { TestVariations.TestSimpleDataReader_Variant, VarcharToSmallDateTimeOutOfRange },
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, VarcharToSmallDateTimeOutOfRange },
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, VarcharToSmallDateTimeOutOfRange },
+                    { TestVariations.SqlBulkCopyDataTable_Type, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Type, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }},
+                new Dictionary<TestVariations, object>(),
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateTime.MaxValue, "smalldatetime",
+                new Dictionary<TestVariations, ExceptionChecker> {
+                    { TestVariations.TestSimpleParameter_Type, UnRepresentableDateTime },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, InvalidValueForMetadata },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, UnRepresentableDateTime },
+                    { TestVariations.TestSqlDataReader_TVP_Type, ConversionFailedCharStringToSmallDateTime },
+                    { TestVariations.TestSqlDataReader_TVP_Variant, ConversionFailedCharStringToSmallDateTime },
+                    { TestVariations.TestSimpleDataReader_Type, ConversionFailedCharStringToSmallDateTime },
+                    { TestVariations.TestSimpleDataReader_Variant, ConversionFailedCharStringToSmallDateTime },
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, ConversionFailedCharStringToSmallDateTime },
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, ConversionFailedCharStringToSmallDateTime },
+                    { TestVariations.SqlBulkCopyDataTable_Type, UnRepresentableDateTime },
+                    { TestVariations.SqlBulkCopyDataRow_Type, UnRepresentableDateTime }}, 
+                new Dictionary<TestVariations, object> {
+                    { TestVariations.TestSimpleParameter_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, new DateTime(3155378975999970000) },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(3155378975999970000) }
+                },
+                new Dictionary<TestVariations, string>
+                {
+                    {TestVariations.TestSimpleParameter_Variant, "datetime"},
+                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, "datetime"},
+                    {TestVariations.TestSqlDataReaderParameterToTVP_Variant, "datetime"},
+                    {TestVariations.SqlBulkCopyDataTable_Variant, "datetime"},
+                    {TestVariations.SqlBulkCopyDataRow_Variant, "datetime"}
+                }};
+            yield return new object[] { TimeSpan.MinValue, "time",
+                new Dictionary<TestVariations, ExceptionChecker> {
+                    { TestVariations.TestSimpleParameter_Type, TimeOverflow },
+                    { TestVariations.TestSimpleParameter_Variant, TimeOverflow },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, InvalidValueForMetadata },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, TimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, TimeOverflow },
+                    { TestVariations.TestSqlDataReader_TVP_Type, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.TestSqlDataReader_TVP_Variant, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.TestSimpleDataReader_Type, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.TestSimpleDataReader_Variant, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.SqlBulkCopyDataTable_Type, TimeOverflow },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, TimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Type, TimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, TimeOverflow }},
+                new Dictionary<TestVariations, object> {
+                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, TimeSpan.Zero},
+                },
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { TimeSpan.MaxValue, "time",
+                new Dictionary<TestVariations, ExceptionChecker> {
+                    { TestVariations.TestSimpleParameter_Type, TimeOverflow },
+                    { TestVariations.TestSimpleParameter_Variant, TimeOverflow },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, InvalidValueForMetadata },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, TdsRpcProtocolStreamIncorrect },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, TimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, TimeOverflow },
+                    { TestVariations.TestSqlDataReader_TVP_Type, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.TestSqlDataReader_TVP_Variant, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.TestSimpleDataReader_Type, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.TestSimpleDataReader_Variant, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, CannotConvertCharacterStringToDateOrTime },
+                    { TestVariations.SqlBulkCopyDataTable_Type, TimeOverflow },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, TimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Type, TimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, TimeOverflow }},
+                new Dictionary<TestVariations, object>(),
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateTime.MinValue, "time",
+                new Dictionary<TestVariations, ExceptionChecker> { 
+                    { TestVariations.SqlBulkCopyDataTable_Type, CannotConvertMinDateTimeToTime},
+                    { TestVariations.SqlBulkCopyDataRow_Type, CannotConvertMinDateTimeToTime},
+                    { TestVariations.TestSimpleParameter_Type, InvalidCastDateTimeToTimeSpan },
+                    { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, InvalidCastNotValid },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, InvalidCastDateTimeToTimeSpan },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReader_TVP_Type, InvalidCastNotValid },
+                    { TestVariations.TestSqlDataReader_TVP_Variant, InvalidCastNotValid },
+                    { TestVariations.TestSimpleDataReader_Type, InvalidCastNotValid },
+                    { TestVariations.TestSimpleDataReader_Variant, InvalidCastNotValid },
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, InvalidCastNotValid },
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, InvalidCastNotValid },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, 
+                new Dictionary<TestVariations, object> {
+                    {TestVariations.SqlBulkCopySqlDataReader_Type, TimeSpan.Zero},
+                    {TestVariations.SqlBulkCopySqlDataReader_Variant, TimeSpan.Zero},
+                    {TestVariations.TestSqlDataReader_TVP_Type, TimeSpan.Zero},
+                    {TestVariations.TestSqlDataReader_TVP_Variant, TimeSpan.Zero},
+                    {TestVariations.TestSimpleDataReader_Type, TimeSpan.Zero},
+                    {TestVariations.TestSimpleDataReader_Variant, TimeSpan.Zero},
+                },
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateTime.MaxValue, "time",
+                new Dictionary<TestVariations, ExceptionChecker> { 
+                    { TestVariations.SqlBulkCopyDataTable_Type, CannotConvertMaxDateTimeToTime },
+                    { TestVariations.SqlBulkCopyDataRow_Type, CannotConvertMaxDateTimeToTime },
+                    { TestVariations.TestSimpleParameter_Type, InvalidCastDateTimeToTimeSpan },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, InvalidCastNotValid },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, InvalidCastDateTimeToTimeSpan },
+                    { TestVariations.TestSqlDataReader_TVP_Type, InvalidCastNotValid },
+                    { TestVariations.TestSqlDataReader_TVP_Variant, InvalidCastNotValid },
+                    { TestVariations.TestSimpleDataReader_Type, InvalidCastNotValid },
+                    { TestVariations.TestSimpleDataReader_Variant, InvalidCastNotValid },
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, InvalidCastNotValid },
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, InvalidCastNotValid }}, 
+                new Dictionary<TestVariations, object> {
+                    {TestVariations.TestSqlDataReader_TVP_Variant, TimeSpan.Parse("23:59:59.9999999")},
+                    {TestVariations.SqlBulkCopySqlDataReader_Type, TimeSpan.Parse("23:59:59.9999999")},
+                    {TestVariations.SqlBulkCopySqlDataReader_Variant, TimeSpan.Parse("23:59:59.9999999")},
+                    {TestVariations.TestSqlDataReader_TVP_Type, TimeSpan.Parse("23:59:59.9999999")},
+                    {TestVariations.TestSimpleDataReader_Type, TimeSpan.Parse("23:59:59.9999999")},
+                    {TestVariations.TestSimpleDataReader_Variant, TimeSpan.Parse("23:59:59.9999999")},
+                    {TestVariations.TestSimpleParameter_Variant, new DateTime(3155378975999970000)},
+                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(3155378975999970000)},
+                    {TestVariations.TestSqlDataReaderParameterToTVP_Variant, new DateTime(3155378975999970000)},
+                    {TestVariations.SqlBulkCopyDataTable_Variant, new DateTime(3155378975999970000)},
+                    {TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(3155378975999970000)}
+                },
+                new Dictionary<TestVariations, string>
+                {
+                    {TestVariations.TestSimpleParameter_Variant, "datetime"},
+                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, "datetime"},
+                    {TestVariations.TestSqlDataReaderParameterToTVP_Variant, "datetime"},
+                    {TestVariations.SqlBulkCopyDataTable_Variant, "datetime"},
+                    {TestVariations.SqlBulkCopyDataRow_Variant, "datetime"}
+                }};
+        }
+
+        private static ExceptionChecker SqlDateTimeOverflow = (e, paramValue) =>
+            (e.GetType() == typeof(System.Data.SqlTypes.SqlTypeException)) &&
+            e.Message.Contains("SqlDateTime overflow. Must be between 1/1/1753 12:00:00 AM and 12/31/9999 11:59:59 PM.");
+
+        private static ExceptionChecker VarcharToDateTimeOutOfRange = (e, paramValue) =>
+            (e.GetType() == typeof(SqlException)) &&
+            e.Message.Contains("The conversion of a varchar data type to a datetime data type resulted in an out-of-range value.");
+
+        private static ExceptionChecker CannotConvertMinDateTimeToTime = (e, paramValue) =>
+            (e.GetType() == typeof(InvalidOperationException)) &&
+            e.Message.Contains("The given value '1/1/0001 12:00:00 AM' of type DateTime from the data source cannot be converted to type time for Column 0 [f1] Row 1.");
+
+        private static ExceptionChecker CannotConvertMaxDateTimeToTime = (e, paramValue) =>
+            (e.GetType() == typeof(InvalidOperationException)) &&
+            e.Message.Contains("The given value '12/31/9999 11:59:59 PM' of type DateTime from the data source cannot be converted to type time for Column 0 [f1] Row 1.");
+
+        private static ExceptionChecker CannotConvertCharacterStringToDateOrTime = (e, paramValue) =>
+            (e.GetType() == typeof(SqlException)) &&
+            e.Message.Contains("Conversion failed when converting date and/or time from character string.");
+
+        private static ExceptionChecker InvalidValueForMetadata = (e, paramValue) =>
+            (e.GetType() == typeof(ArgumentException)) &&
+            e.Message.Contains("Invalid value for this metadata.");
+
+        private static ExceptionChecker VarcharToSmallDateTimeOutOfRange = (e, paramValue) =>
+            (e.GetType() == typeof(SqlException)) &&
+            e.Message.Contains("The conversion of a varchar data type to a smalldatetime data type resulted in an out-of-range value.");
+
+        private static ExceptionChecker ConversionFailedCharStringToSmallDateTime = (e, paramValue) =>
+            (e.GetType() == typeof(SqlException)) &&
+            e.Message.Contains("Conversion failed when converting character string to smalldatetime data type.");
+
+        private static ExceptionChecker UnRepresentableDateTime = (e, paramValue) =>
+            (e.GetType() == typeof(ArgumentOutOfRangeException)) &&
+            e.Message.Contains("The added or subtracted value results in an un-representable DateTime.");
+
+        private static ExceptionChecker TimeOverflow = (e, paramValue) =>
+            (e.GetType() == typeof(OverflowException)) &&
+            e.Message.Contains("SqlDbType.Time overflow.");
+
+        private static ExceptionChecker InvalidCastDateTimeToTimeSpan = (e, paramValue) =>
+            (e.GetType() == typeof(InvalidCastException)) &&
+            e.Message.Contains("Failed to convert parameter value from a DateTime to a TimeSpan.");
+
+        private static ExceptionChecker InvalidCastNotValid = (e, paramValue) =>
+            (e.GetType() == typeof(InvalidCastException)) &&
+            e.Message.Contains("Specified cast is not valid.");
+
+        private static ExceptionChecker TdsRpcProtocolStreamIncorrect = (e, paramValue) =>
+            (e.GetType() == typeof(SqlException)) &&
+            e.Message.Contains("The incoming tabular data stream (TDS) remote procedure call (RPC) protocol stream is incorrect.");
+
     }
 }

From 7a896ef40d3a1b74e8b8f498f9ac940e84a92f24 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 13 May 2026 15:26:42 -0300
Subject: [PATCH 098/298] Use dotnet CLI exclusively (no MSBuild) (#4168)

---
 .github/copilot-instructions.md               |   4 +-
 .../ado-pipelines.instructions.md             |   2 +-
 .../instructions/architecture.instructions.md |   2 +-
 .github/instructions/testing.instructions.md  |  23 ++-
 .../apicompat-ref-assembly-validation.md      |  12 +-
 BUILDGUIDE.md                                 | 127 ++++++++++------
 TESTGUIDE.md                                  |  62 +++++---
 build.proj                                    |   2 +-
 doc/apps/AzureAuthentication/README.md        |   2 +-
 .../templates/jobs/ci-build-nugets-job.yml    |  32 ++--
 .../templates/jobs/ci-run-tests-job.yml       |   1 -
 .../templates/steps/ci-project-build-step.yml |  32 ++--
 .../templates/steps/run-all-tests-step.yml    | 143 +++++++-----------
 .../jobs/test-abstractions-package-ci-job.yml |   2 +-
 .../jobs/test-azure-package-ci-job.yml        |   2 +-
 .../onebranch/steps/build-buildproj-step.yml  |   9 +-
 .../onebranch/steps/pack-buildproj-step.yml   |   9 +-
 .../steps/roslyn-analyzers-buildproj-step.yml |   5 +-
 eng/pipelines/stress/stress-tests-job.yml     |  16 +-
 tools/targets/CompareMdsRefAssemblies.targets |   8 +-
 20 files changed, 266 insertions(+), 229 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 51ce83bb10..e024b30d6f 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -34,7 +34,7 @@ This project includes several key products and libraries that facilitate SQL Ser
 ## 🛠️ Key Features
 - **Connectivity to SQL Server**: Provides robust and secure connections to SQL Server databases, using various authentication methods, such as Windows Authentication, SQL Server Authentication, and Entra ID authentication, e.g. `ActiveDirectoryIntegrated`, `ActiveDirectoryPassword`, `ActiveDirectoryServicePrincipal`,`ActiveDirectoryInteractive`, `ActiveDirectoryDefault`, and `ActiveDirectoryManagedIdentity`.
 - **Connection Resiliency**: Implements connection resiliency features to handle transient faults and network issues, ensuring reliable database connectivity.
-- **TLS Encryption**: Supports secure connections using TLS protocols to encrypt data in transit. Supports TLS 1.2 and higher, ensuring secure communication with SQL Server. Supported encryption modes are: 
+- **TLS Encryption**: Supports secure connections using TLS protocols to encrypt data in transit. Supports TLS 1.2 and higher, ensuring secure communication with SQL Server. Supported encryption modes are:
   - **Optional**: Encryption is used if available, but not required.
   - **Mandatory**: Encryption is mandatory for the connection.
   - **Strict**: Enforces strict TLS requirements, ensuring only secure connections are established.
@@ -123,7 +123,7 @@ When a new issue is created, follow these steps:
 - Ensure the PR passes all CI checks before merging.
 
 ### ✅ Closing Issues
-- Add a comment summarizing the fix and referencing the PR 
+- Add a comment summarizing the fix and referencing the PR
 
 ### ⚙️ Automating Workflows
 - Auto-label PRs based on folder paths (e.g., changes in `src/Microsoft.Data.SqlClient/src/` → `Area\SqlClient`, changes in `tests/` → `Area\Testing`) and whether they add new public APIs or introduce a breaking change.
diff --git a/.github/instructions/ado-pipelines.instructions.md b/.github/instructions/ado-pipelines.instructions.md
index 5dfd35a12c..9260a78b3d 100644
--- a/.github/instructions/ado-pipelines.instructions.md
+++ b/.github/instructions/ado-pipelines.instructions.md
@@ -49,7 +49,7 @@ Key parameters:
 - `runAlwaysEncryptedTests` — include AE test set; default `true`
 - `runLegacySqlTests` — include SQL Server 2016/2017 manual-test legs; default `true`
 - `debug` — enable debug output; default `false`
-- `dotnetVerbosity` — MSBuild verbosity; default `normal`
+- `dotnetVerbosity` — build verbosity; default `normal`
 
 ## Build Stage Order
 
diff --git a/.github/instructions/architecture.instructions.md b/.github/instructions/architecture.instructions.md
index e1578592fe..2fd30c9f55 100644
--- a/.github/instructions/architecture.instructions.md
+++ b/.github/instructions/architecture.instructions.md
@@ -49,7 +49,7 @@ The `netcore/` and `netfx/` directories are legacy artifacts from the old dual-p
 - `netcore/ref/` and `netfx/ref/` — **STILL ACTIVE**. Reference assemblies remain in these directories and define the public API surface for each target framework.
 
 ### OS Targeting with `TargetOs`
-The unified project uses a `TargetOs` MSBuild property to handle OS-specific compilation:
+The unified project uses a `TargetOs` build property to handle OS-specific compilation:
 
 ```xml
 <!-- Automatic OS detection -->
diff --git a/.github/instructions/testing.instructions.md b/.github/instructions/testing.instructions.md
index 761c056399..20fe03b1e8 100644
--- a/.github/instructions/testing.instructions.md
+++ b/.github/instructions/testing.instructions.md
@@ -115,7 +115,7 @@ The default test filter is defined in `build.proj` via `TestFilters`:
 ```xml
 <TestFilters Condition="'$(TestFilters)' == ''">category!=failing&amp;category!=flaky&amp;category!=interactive</TestFilters>
 ```
-This can be overridden via MSBuild property: `msbuild build.proj -t:TestSqlClientUnit -p:TestFilters="your_filter"`.
+This can be overridden via build property: `dotnet build build.proj -t:TestSqlClientUnit -p:TestFilters="your_filter"`.
 
 ### Test Attributes
 ```csharp
@@ -139,19 +139,19 @@ public void TestIntermittentlyFails() { ... }
 
 ## Running Tests
 
-### Using MSBuild (Recommended)
+### Using `build.proj` targets (Recommended)
 ```bash
 # Build and run all unit tests
-msbuild build.proj -t:TestSqlClientUnit
+dotnet build build.proj -t:TestSqlClientUnit
 
 # Run functional tests only
-msbuild build.proj -t:TestSqlClientFunctional
+dotnet build build.proj -t:TestSqlClientFunctional
 
 # Run manual tests for specific framework
-msbuild build.proj -t:TestSqlClientManual -p:TestFramework=net8.0
+dotnet build build.proj -t:TestSqlClientManual -p:TestFramework=net8.0
 
 # Run specific test set
-msbuild build.proj -t:TestSqlClientManual -p:TestSet=1
+dotnet build build.proj -t:TestSqlClientManual -p:TestSet=1
 ```
 
 ### Using dotnet CLI
@@ -357,7 +357,7 @@ cmd.CommandType = CommandType.StoredProcedure;
 
 ### Running with Coverage
 ```bash
-msbuild build.proj -t:TestSqlClientUnit -p:TestCodeCoverage=true
+dotnet build build.proj -t:TestSqlClientUnit -p:TestCodeCoverage=true
 ```
 
 ### Coverage Targets
@@ -367,16 +367,11 @@ msbuild build.proj -t:TestSqlClientUnit -p:TestCodeCoverage=true
 
 ## Debugging Tests
 
-### Visual Studio
+### IDE
 1. Set breakpoints in test code
-2. Right-click test → Debug Test
+2. Right-click test → Debug Test (or use CodeLens "Debug Test" link)
 3. Use Test Explorer for navigation
 
-### VS Code
-1. Configure C# extension
-2. Use CodeLens "Debug Test" link
-3. Attach to test process
-
 ### Command Line
 ```bash
 # Enable verbose output
diff --git a/.github/plans/apicompat-ref-assembly-validation.md b/.github/plans/apicompat-ref-assembly-validation.md
index b968dbf678..3ae4f0a46d 100644
--- a/.github/plans/apicompat-ref-assembly-validation.md
+++ b/.github/plans/apicompat-ref-assembly-validation.md
@@ -9,7 +9,7 @@ The comparison uses `Microsoft.DotNet.ApiCompat.Tool` in **strict mode**, which
 ## Usage
 
 ```
-dotnet msbuild build.proj /t:CompareRefAssemblies /p:BaselinePackageVersion=6.1.4
+dotnet build build.proj /t:CompareMdsRefAssemblies /p:BaselinePackageVersion=6.1.4
 ```
 
 - `BaselinePackageVersion` is **required** (no default). The user must specify which published package to compare against.
@@ -22,7 +22,7 @@ dotnet msbuild build.proj /t:CompareRefAssemblies /p:BaselinePackageVersion=6.1.
 
 Add an entry for version `9.0.200` alongside the existing `dotnet-coverage` entry. This enables `dotnet apicompat` after `dotnet tool restore`.
 
-### 2. Create `tools/targets/CompareRefAssemblies.targets`
+### 2. Create `tools/targets/CompareMdsRefAssemblies.targets`
 
 A single new file containing all properties, items, and targets (steps 3–11 below). Follows the naming convention of existing files like `GenerateMdsPackage.targets`.
 
@@ -85,7 +85,7 @@ Runs `<Exec Command="dotnet tool restore" WorkingDirectory="$(RepoRoot)" />`.
 - Preceded by `<Message Importance="high">` labelling each comparison
 - Uses item metadata to map `net462` to `$(LegacyNetFxRefDir)` and others to `$(LegacyNetCoreRefDir)`
 
-### 11. `CompareRefAssemblies` target (public entry point)
+### 11. `CompareMdsRefAssemblies` target (public entry point)
 
 - Declared with `DependsOnTargets="_RunRefApiCompat"`
 - Emits a final `<Message>` summarizing completion
@@ -95,12 +95,12 @@ Runs `<Exec Command="dotnet tool restore" WorkingDirectory="$(RepoRoot)" />`.
 Add one line after the existing `.targets` imports (after line 7):
 
 ```xml
-<Import Project="$(ToolsDir)targets\CompareRefAssemblies.targets" />
+<Import Project="$(ToolsDir)targets\CompareMdsRefAssemblies.targets" />
 ```
 
 ## Design Decisions
 
-- **Single new file** at `tools/targets/CompareRefAssemblies.targets` — only one `<Import>` line added to `build.proj`.
+- **Single new file** at `tools/targets/CompareMdsRefAssemblies.targets` — only one `<Import>` line added to `build.proj`.
 - **Internal targets prefixed with `_`** to signal they're not intended to be called directly.
 - **Strict mode** ensures API additions are also flagged — important for detecting accidental public surface changes during file reorganization.
 - **`ContinueOnError="ErrorAndContinue"`** on each apicompat `Exec` so all 8 comparisons run and all differences are reported together.
@@ -111,7 +111,7 @@ Add one line after the existing `.targets` imports (after line 7):
 ## Verification
 
 ```
-dotnet msbuild build.proj /t:CompareRefAssemblies /p:BaselinePackageVersion=6.1.4
+dotnet build build.proj /t:CompareMdsRefAssemblies /p:BaselinePackageVersion=6.1.4
 ```
 
 - Downloads 6.1.4 nupkg, builds both ref project variants, runs 8 comparisons (4 TFMs × 2 variants).
diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 16aa709fe5..a927945c05 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -1,3 +1,5 @@
+<!-- markdownlint-disable MD024 -->
+
 # Build Guide for Microsoft.Data.SqlClient and Related Packages
 
 This document provides details on how to build the Microsoft.Data.SqlClient package and the other related packages
@@ -6,9 +8,10 @@ contained within this repository.
 ## Prerequisites
 
 ### .NET SDK
+
 Projects in this repository require the .NET SDK to be installed in order to build. For the exact version required for
-building the current version, see [global.json](global.json). Downloads for .NET SDK can be found at:
-https://dotnet.microsoft.com/en-us/download/dotnet
+building the current version, see [global.json](global.json). Downloads for .NET SDK can be found at
+[.NET Downloads](https://dotnet.microsoft.com/en-us/download/dotnet).
 
 The .NET SDK contains support for building for previous versions of .NET, including support for building .NET Framework
 on operating systems that do not support .NET Framework. As such, it is not necessary to install any version of the
@@ -16,9 +19,11 @@ on operating systems that do not support .NET Framework. As such, it is not nece
 
 ### Miscellaneous
 
-**PowerShell** is required to run several miscellaneous tasks as part of building and packaging. On Windows systems,
-no action is required. On Linux and macOS systems, the `pwsh` command is required to be in the `$PATH` environment
-variable. For specific instructions see: [Install PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/install-powershell)
+**PowerShell** is required to run several miscellaneous tasks as part of building and packaging. On
+Windows systems, either the built-in `powershell.exe` will be used, or if installed, the modern
+`pwsh` will be used. On Linux and macOS systems, the `pwsh` command is required to be in the `$PATH`
+environment variable. For specific instructions see: [Install
+PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/install-powershell)
 
 The **NuGet** binary is optional for inspection and feed-management workflows, but build and packaging flows in this
 repository are run through `dotnet build` against `build.proj`.
@@ -33,6 +38,8 @@ package the project. The `build.proj` file provides convenient targets to accomp
 > may be noticed, possibly severe. All official build and test infrastructure uses the `build.proj` entrypoint, and it
 > is recommended that `build.proj` is used for local development, as well.
 
+<!-- Avoid MD028 (blank line inside a blockquote - these are 2 separate blockquotes. -->
+
 > [!TIP]
 > This section is not exhaustive of all targets or parameters to `build.proj`. Complete documentation is available in
 > [`build.proj`](build.proj).
@@ -45,11 +52,21 @@ From the root of your repository, run `dotnet build` against `build.proj` with a
 dotnet build build.proj -t:<build_target> [optional_parameters]
 ```
 
+Since `build.proj` is the only project file in the repo root, it can be omitted when building from
+the root:
+
+```bash
+dotnet build -t:<build_target> [optional_parameters]
+```
+
+The command-line examples below will assume that `build.proj` is selected by default and will omit
+it from the `dotnet build` command.
+
 The following build targets can be used to build the following projects. All targets will implicitly build any other
 projects they depend on.
 
 | `<build_target>`            | Description                                                                     |
-|:----------------------------|:--------------------------------------------------------------------------------|
+|-----------------------------|---------------------------------------------------------------------------------|
 | `Build`                     | Builds all projects for all platforms                                           |
 | `BuildAbstractions`         | Builds Microsoft.Data.SqlClient.Extensions.Abstractions                         |
 | `BuildAkvProvider`          | Builds Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider           |
@@ -64,11 +81,15 @@ projects they depend on.
 
 A selection of parameters for build targets in `build.proj` can be found below:
 
+<!-- markdownlint-disable MD060 -->
+
 | `[optional_parameter]`            | Allowed Values                   | Default   | Description                                                                                                                                   |
 |-----------------------------------|----------------------------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------|
 | `-p:Configuration=`               | `Debug`, `Release`               | `Debug`   | Build configuration                                                                                                                           |
 | `-p:PackageVersion<TargetPackage>=` | `major.minor.patch[-prerelease]` | `[blank]` | Version to assign to the target package, where `<TargetPackage>` can be one of: `['Abstractions', 'Azure', 'AkvProvider', 'Logging', 'SqlClient', 'SqlServer']`. Assembly and file versions are derived from this, if it is provided. See Versioning for more details |
 
+<!-- markdownlint-enable MD060 -->
+
 For most projects, build output is placed in `artifacts/<package_name>/Project-<configuration>/<tfm>`. `<package_name>`
 is the full name of the package, `<configuration>` is the build configuration, and `<tfm>` is the target framework
 moniker. SqlClient deviates slightly from this convention, since it consists of multiple projects and the
@@ -82,19 +103,19 @@ placed in `artifacts/Microsoft.Data.SqlClient.ref/Project-<configuration>/<tfm>`
 Build all projects:
 
 ```bash
-dotnet build build.proj -t:Build
+dotnet build -t:Build
 ```
 
 Build Microsoft.Data.SqlClient in Release configuration:
 
 ```bash
-dotnet build build.proj -t:BuildSqlClient -p:Configuration=Release
+dotnet build -t:BuildSqlClient -p:Configuration=Release
 ```
 
 Build v1.2.3 of Microsoft.Data.SqlClient.Extensions.Abstractions:
 
 ```bash
-dotnet build build.proj -t:BuildAbstractions -p:PackageVersionAbstractions=1.2.3
+dotnet build -t:BuildAbstractions -p:PackageVersionAbstractions=1.2.3
 ```
 
 ### Testing Projects
@@ -105,7 +126,7 @@ information about test procedures, including config file setup, see [TESTGUIDE.m
 From the root of your repository, run `dotnet build` against `build.proj` with a test target, following this pattern:
 
 ```bash
-dotnet build build.proj -t:<test_target> [optional_parameters]
+dotnet build -t:<test_target> [optional_parameters]
 ```
 
 | `<test_target>`            | Description                                                                                                                                         |
@@ -123,6 +144,8 @@ dotnet build build.proj -t:<test_target> [optional_parameters]
 
 A selection of parameters for test targets in `build.proj` relevant to common developer workflows can be found below:
 
+<!-- markdownlint-disable MD060 -->
+
 | `[optional_parameter]` | Default Value                                            | Description                                                                                                                                                                                         |
 |------------------------|----------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `-p:Configuration=`    | `Debug`                                                  | Build configuration. Can be `Debug` or `Release`.                                                                                                                                                   |
@@ -132,32 +155,38 @@ A selection of parameters for test targets in `build.proj` relevant to common de
 | `-p:TestFramework=`    | `[blank]`                                                | Target framework moniker for the version of .NET to use to execute tests.                                                                                                                           |
 | `-p:TestSet=`          | `[blank]`                                                | The `TestSqlClientManual` project is very large and is split into multiple sets that can be executed individually. This parameter allows selecting between test sets: `1`, `2`, `3`, and `AE`. |
 
+<!-- markdownlint-enable MD060 -->
+
 #### Examples
 
 Run Microsoft.Data.SqlClient unit tests:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientUnit
+dotnet build -t:TestSqlClientUnit
 ```
 
 Run Microsoft.Data.SqlClient manual test set 2:
+
 ```bash
-dotnet build build.proj -t:TestSqlClientManual -p:TestSet=2
+dotnet build -t:TestSqlClientManual -p:TestSet=2
 ```
 
 Run Microsoft.Data.SqlClient functional tests against x86 dotnet:
+
 ```bash
-dotnet build build.proj -t:TestSqlClientFunctional -p:DotnetPath='C:\path\to\dotnet\x86\'
+dotnet build -t:TestSqlClientFunctional -p:DotnetPath='C:\path\to\dotnet\x86\'
 ```
 
 Run all Microsoft.Data.SqlClient.Extensions.Azure unit tests, including interactive, but excluding failing tests:
+
 ```bash
-dotnet build build.proj -t:TestAzure -p:TestFilters=category!=failing
+dotnet build -t:TestAzure -p:TestFilters=category!=failing
 ```
 
 Run Microsoft.Data.SqlClient functional tests against net8.0 runtime:
+
 ```bash
-dotnet build build.proj -t:TestSqlClientFunctional -p:TestFramework=net8.0
+dotnet build -t:TestSqlClientFunctional -p:TestFramework=net8.0
 ```
 
 ### Packaging Projects
@@ -167,10 +196,10 @@ also handled by `build.proj`. From the root of your repository, run `dotnet buil
 following this pattern:
 
 ```bash
-dotnet build build.proj -t:<pack_target> [optional_parameters]
+dotnet build -t:<pack_target> [optional_parameters]
 ```
 
-| `<pack_target>`   | Description                                                                         |
+| `<pack_target>`    | Description                                                                         |
 |--------------------|-------------------------------------------------------------------------------------|
 | `Pack`             | Packages all projects in the repository.                                            |
 | `PackAbstractions` | Packages the Microsoft.Data.SqlClient.Extensions.Abstractions package               |
@@ -185,12 +214,16 @@ dotnet build build.proj -t:<pack_target> [optional_parameters]
 
 A selection of parameters for pack targets in `build.proj` relevant to common developer workflows can be found below:
 
+<!-- markdownlint-disable MD060 -->
+
 | `[optional_parameter]`             | Default Value | Allowed Values        | Description                                                                                                                                                    |
 |------------------------------------|---------------|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `-p:Configuration=`                | `Debug`       | `Debug`, `Release`    | Build configuration. Only applies if project and dependencies are being built.                                                                                 |
 | `-p:PackBuild=`                    | `true`        | `true`, `false`       | Whether or not to build the project before packing. If `false`, project must be built using the same parameters.                                               |
 | `-p:PackageVersion<TargetPackage>=` | `[blank]`     | eg. `1.2.3-dev123`    | Version to assign to the package, where `<TargetPackage>` can be one of: `['Abstractions', 'Azure', 'AkvProvider', 'Logging', 'SqlClient', 'SqlServer']`. If `PackBuild` is `true`, the assembly and file versions will be derived from this version. See Versioning for more details. |
 
+<!-- markdownlint-enable MD060 -->
+
 For `PackSqlClient`, these additional parameters are optional overrides for dependency versions injected into the SqlClient nuspec during pack:
 
 - `-p:PackageVersionAbstractions=<version>`
@@ -201,23 +234,27 @@ If omitted, `PackSqlClient` computes `AbstractionsPackageVersion` and `LoggingPa
 #### Examples
 
 Package Microsoft.Data.SqlClient.Internal.Logging into a NuGet package:
+
 ```bash
-dotnet build build.proj -t:PackLogging
+dotnet build -t:PackLogging
 ```
 
 Package Microsoft.Data.SqlClient:
+
 ```bash
-dotnet build build.proj -t:PackSqlClient
+dotnet build -t:PackSqlClient
 ```
 
 Package version 1.2.3 of Microsoft.Data.SqlClient.Extensions.Abstractions:
+
 ```bash
-dotnet build build.proj -t:PackAbstractions -p:PackageVersionAbstractions=1.2.3
+dotnet build -t:PackAbstractions -p:PackageVersionAbstractions=1.2.3
 ```
 
 Package Microsoft.Data.SqlClient.Extensions.Azure without building it beforehand:
+
 ```bash
-dotnet build build.proj -t:PackAzure -p:PackBuild=false
+dotnet build -t:PackAzure -p:PackBuild=false
 ```
 
 ## Versioning
@@ -255,12 +292,12 @@ build scenarios. For completeness, and debugging of automated builds, this secti
 To switch to "package mode", set the `ReferenceType` parameter in `build.proj` to `Package`. And, optionally, include
 one or more of the following parameters:
 
-* `PackageVersionAbstractions`
-* `PackageVersionAkvProvider`
-* `PackageVersionAzure`
-* `PackageVersionLogging`
-* `PackageVersionSqlClient`
-* `PackageVersionSqlServer`
+- `PackageVersionAbstractions`
+- `PackageVersionAkvProvider`
+- `PackageVersionAzure`
+- `PackageVersionLogging`
+- `PackageVersionSqlClient`
+- `PackageVersionSqlServer`
 
 These parameters pull double duty. In targets where the package is being built, the parameter sets the version of the
 package. In targets where the package is being referenced, the parameter sets the version of the package that is being
@@ -277,22 +314,27 @@ run subsequent `build.proj` targets against them.
 Build Microsoft.Data.SqlClient version 7.1.1 that references Microsoft.Data.SqlClient.Extensions.Abstractions v1.0.1
 and Microsoft.Data.SqlClient.Internal.Logging v2.2.2.
 
+Build v2.2.2 of Logging and copy to packages:
+
 ```bash
-# Build v2.2.2 of Logging and copy to packages
-dotnet build build.proj -t:PackLogging \
-  -p:ReferenceType=Package \
-  -p:PackageVersionLogging=2.2.2
+dotnet build -t:PackLogging -p:ReferenceType=Package -p:PackageVersionLogging=2.2.2
 cp artifacts/Microsoft.Data.SqlClient.Internal.Logging/Debug/*.*pkg packages/
+```
+
+Build v1.0.1 of Abstractions that depends on v2.2.2 of Logging:
 
-# Build v1.0.1 of Abstractions that depends on v2.2.2 of Logging
-dotnet build build.proj -t:PackAbstractions \
+```bash
+dotnet build -t:PackAbstractions \
   -p:ReferenceType=Package \
   -p:PackageVersionAbstractions=1.0.1 \
-  -p:PackageVersionLogging=2.2.2 \
+  -p:PackageVersionLogging=2.2.2
 cp artifacts/Microsoft.Data.SqlClient.Extensions.Abstractions/Package-Debug/*.*pkg packages/
+```
 
-# Build SqlClient
-dotnet build build.proj -t:PackSqlClient \
+Build SqlClient:
+
+```bash
+dotnet build -t:PackSqlClient \
   -p:ReferenceType=Package \
   -p:PackageVersionSqlClient=7.1.1 \
   -p:PackageVersionAbstractions=1.0.1 \
@@ -301,22 +343,17 @@ cp artifacts/Microsoft.Data.SqlClient/Package-Debug/*.*pkg packages/
 ```
 
 Run Microsoft.Data.SqlClient functional tests against the versions built above:
+
 ```bash
-dotnet build build.proj -t:TestSqlClientFunctional \
+dotnet build -t:TestSqlClientFunctional \
   -p:ReferenceType=Package \
   -p:PackageVersionSqlClient=7.1.1 \
   -p:PackageVersionAbstractions=1.0.1 \
   -p:PackageVersionLogging=2.2.2
 ```
 
-----
-
-
 Manual test prerequisites and configuration are covered in [TESTGUIDE.md](TESTGUIDE.md#manual-test-prerequisites).
 
-
----
-
 ## Using Managed SNI on Windows
 
 Managed SNI can be enabled on Windows by enabling the below AppContext switch:
@@ -371,10 +408,14 @@ PowerShell:
 
 Bash:
 
+<!-- markdownlint-disable MD014 -->
+
 ```bash
 $ cd src/Microsoft.Data.SqlClient/tests/PerformanceTests
 ```
 
+<!-- markdownlint-enable MD014 -->
+
 ### Create Database
 
 Create an empty database for the benchmarks to use.  This example assumes
diff --git a/TESTGUIDE.md b/TESTGUIDE.md
index 349674deee..aab773a080 100644
--- a/TESTGUIDE.md
+++ b/TESTGUIDE.md
@@ -26,6 +26,16 @@ Use [build.proj](build.proj) from the repository root:
 dotnet build build.proj -t:<test_target> [optional_parameters]
 ```
 
+Since `build.proj` is the only project file in the repo root, it can be omitted when building from
+the root:
+
+```bash
+dotnet build -t:<test_target> [optional_parameters]
+```
+
+The command-line examples below will assume that `build.proj` is selected by default and will omit
+it from the `dotnet build` command.
+
 Test targets build the projects they depend on, so a separate build step is not required for normal test runs.
 
 ## Test Targets
@@ -45,55 +55,55 @@ Test targets build the projects they depend on, so a separate build step is not
 Run the SqlClient unit tests:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientUnit
+dotnet build -t:TestSqlClientUnit
 ```
 
 Run the SqlClient functional tests:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientFunctional
+dotnet build -t:TestSqlClientFunctional
 ```
 
 Run the SqlClient manual tests:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientManual
+dotnet build -t:TestSqlClientManual
 ```
 
 Run only manual test set 2:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientManual -p:TestSet=2
+dotnet build -t:TestSqlClientManual -p:TestSet=2
 ```
 
 Run manual test sets 1 and 3:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientManual -p:TestSet=13
+dotnet build -t:TestSqlClientManual -p:TestSet=13
 ```
 
 Run Always Encrypted manual tests:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientManual -p:TestSet=AE
+dotnet build -t:TestSqlClientManual -p:TestSet=AE
 ```
 
 Run a specific target framework:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientFunctional -p:TestFramework=net8.0
+dotnet build -t:TestSqlClientFunctional -p:TestFramework=net8.0
 ```
 
 Run functional tests against an x86 `dotnet` installation:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientFunctional -p:DotnetPath='C:\path\to\dotnet\x86\'
+dotnet build -t:TestSqlClientFunctional -p:DotnetPath='C:\path\to\dotnet\x86\'
 ```
 
 Run all Azure extension tests, including `interactive` tests, while still excluding tests marked `failing` or `flaky`:
 
 ```bash
-dotnet build build.proj -t:TestAzure -p:TestFilters=category!=failing
+dotnet build -t:TestAzure -p:TestFilters=category!=failing
 ```
 
 ## Test Parameters
@@ -124,15 +134,22 @@ The most commonly used test parameters are:
 
 Examples:
 
+Run a single test by fully-qualified name:
+
 ```bash
-# Run a single test by fully-qualified name.
-dotnet build build.proj -t:TestSqlClientUnit -p:TestFilters=FullyQualifiedName=Namespace.ClassName.MethodName
+dotnet build -t:TestSqlClientUnit -p:TestFilters=FullyQualifiedName=Namespace.ClassName.MethodName
+```
+
+Run only flaky tests while investigating quarantine failures:
+
+```bash
+dotnet build -t:TestSqlClientManual -p:TestFilters=category=flaky
+```
 
-# Run only flaky tests while investigating quarantine failures.
-dotnet build build.proj -t:TestSqlClientManual -p:TestFilters=category=flaky
+Disable the default filter:
 
-# Disable the default filter.
-dotnet build build.proj -t:TestSqlClientFunctional -p:TestFilters=none
+```bash
+dotnet build -t:TestSqlClientFunctional -p:TestFilters=none
 ```
 
 When passing filter expressions that contain shell-sensitive characters such as `&`, quote or escape the value as
@@ -216,14 +233,14 @@ For SQL Server in a Linux container, WSL, or another host where SQL authenticati
 You can override the config file path with the `MDS_TEST_CONFIG` environment variable:
 
 ```bash
-MDS_TEST_CONFIG=/path/to/config.json dotnet build build.proj -t:TestSqlClientManual -p:TestSet=2
+MDS_TEST_CONFIG=/path/to/config.json dotnet build -t:TestSqlClientManual -p:TestSet=2
 ```
 
 On PowerShell:
 
 ```powershell
 $env:MDS_TEST_CONFIG = "C:\path\to\config.json"
-dotnet build build.proj -t:TestSqlClientManual -p:TestSet=2
+dotnet build -t:TestSqlClientManual -p:TestSet=2
 ```
 
 ## Configuration Properties
@@ -280,26 +297,27 @@ If `TestSet` is omitted, all sets are compiled and run. You can combine sets by
 
 ## Results and Diagnostics
 
-Test results are written to `test_results` by default. Override the location with `TestResultsFolderPath`:
+Test results are written to the `test_results` directory by default. Override the location with
+`TestResultsFolderPath`:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientUnit -p:TestResultsFolderPath=/tmp/sqlclient-test-results
+dotnet build -t:TestSqlClientUnit -p:TestResultsFolderPath=/tmp/sqlclient-test-results
 ```
 
 Hang blame collection is enabled by default with a `10m` timeout. To increase the timeout:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientManual -p:TestBlameTimeout=30m
+dotnet build -t:TestSqlClientManual -p:TestBlameTimeout=30m
 ```
 
 To disable hang blame collection:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientManual -p:TestBlameTimeout=0
+dotnet build -t:TestSqlClientManual -p:TestBlameTimeout=0
 ```
 
 Code coverage is enabled by default. To disable it for a faster local run:
 
 ```bash
-dotnet build build.proj -t:TestSqlClientUnit -p:TestCodeCoverage=false
+dotnet build -t:TestSqlClientUnit -p:TestCodeCoverage=false
 ```
diff --git a/build.proj b/build.proj
index 14db6015ba..971cfb12fa 100644
--- a/build.proj
+++ b/build.proj
@@ -72,7 +72,7 @@
     <!--
       PackBuild
       Applies to:     Pack*
-      Description:    Whether the Pack* targets should buiild the project before packaging. If
+      Description:    Whether the Pack* targets should build the project before packaging. If
                       true, the project will be built as part of packaging. If false, it will not.
 
                       For most developers, building immediately before packing is the norm, and
diff --git a/doc/apps/AzureAuthentication/README.md b/doc/apps/AzureAuthentication/README.md
index a0d9d8b7ba..967a728007 100644
--- a/doc/apps/AzureAuthentication/README.md
+++ b/doc/apps/AzureAuthentication/README.md
@@ -28,7 +28,7 @@ The app is designed to run against both **published NuGet packages** and **local
 
 ## Build Parameters
 
-Package versions are controlled through MSBuild properties. Pass them on the command line with `-p:`
+Package versions are controlled through build properties. Pass them on the command line with `-p:`
 (or `/p:`) to override the defaults defined in `Directory.Packages.props`.
 
 | Property | Default | Description |
diff --git a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
index 31bf8be63b..8d051e5167 100644
--- a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
@@ -85,7 +85,6 @@ jobs:
     name: ${{parameters.poolName }}
     demands:
     - imageOverride -equals ${{ parameters.imageOverride }}
-    - msbuild
 
   variables:
     - template: /eng/pipelines/libraries/ci-build-variables.yml@self
@@ -130,7 +129,6 @@ jobs:
         buildConfiguration: Release
         referenceType: Project
         build: all
-        assemblyBuildNumber: $(assemblyBuildNumber)
 
   - template: /eng/pipelines/common/templates/steps/ci-project-build-step.yml@self
     parameters:
@@ -139,7 +137,6 @@ jobs:
       referenceType: ${{ parameters.referenceType }}
       operatingSystem: Windows
       build: MDS
-      assemblyBuildNumber: $(assemblyBuildNumber)
       abstractionsPackageVersion: ${{parameters.abstractionsPackageVersion}}
       loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
 
@@ -183,7 +180,6 @@ jobs:
       buildConfiguration: ${{ parameters.buildConfiguration }}
       referenceType: ${{ parameters.referenceType }}
       build: AkvProvider
-      assemblyBuildNumber: $(assemblyBuildNumber)
       abstractionsPackageVersion: ${{parameters.abstractionsPackageVersion}}
       loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
       mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
@@ -192,12 +188,28 @@ jobs:
   - task: DotNetCoreCLI@2
     displayName: 'Create AKV Provider NuGet Package'
     inputs:
-      command: pack
-      packagesToPack: src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
-      configurationToPack: ${{ parameters.buildConfiguration }}
-      nobuild: true
-      packDirectory: $(packagePath)
-      buildProperties: ReferenceType=${{ parameters.referenceType }};AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};LoggingPackageVersion=${{ parameters.loggingPackageVersion }};SqlClientPackageVersion=${{ parameters.mdsPackageVersion }};AkvProviderPackageVersion=${{ parameters.akvPackageVersion }};BuildNumber=$(Build.BuildNumber);AssemblyBuildNumber=$(assemblyBuildNumber)
+      command: build
+      projects: build.proj
+      arguments: >-
+        -t:PackAkvProvider
+        -p:Configuration=${{ parameters.buildConfiguration }}
+        -p:PackBuild=false
+        -p:ReferenceType=${{ parameters.referenceType }}
+        -p:BuildNumber=$(Build.BuildNumber)
+        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionAkvProvider=${{ parameters.akvPackageVersion }}
+
+  - task: CopyFiles@2
+    displayName: Copy AKV Package to Output Folder
+    inputs:
+      sourceFolder: artifacts/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/${{ parameters.buildConfiguration }}
+      contents: |
+        **/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider*.nupkg
+        **/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider*.snupkg
+      targetFolder: $(packagePath)
+      flattenFolders: true
 
   - task: PublishPipelineArtifact@1
     displayName: 'Publish Pipeline Artifacts'
diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
index 8666cd0dbb..5c593e11e3 100644
--- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
@@ -215,7 +215,6 @@ jobs:
         build: allNoDocs
         buildConfiguration: ${{ parameters.buildConfiguration }}
         referenceType: Project
-        assemblyBuildNumber: $(assemblyBuildNumber)
 
   - ${{ if ne(parameters.configProperties, '{}') }}:
     - template: /eng/pipelines/common/templates/steps/update-config-file-step.yml@self # update config.json file
diff --git a/eng/pipelines/common/templates/steps/ci-project-build-step.yml b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
index bbd2d10744..fe46ad66a2 100644
--- a/eng/pipelines/common/templates/steps/ci-project-build-step.yml
+++ b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
@@ -46,10 +46,6 @@ parameters:
       - all
       - allNoDocs
 
-  # The build number suffix to apply to all assembly file versions built by this step.
-  - name: assemblyBuildNumber
-    type: string
-
   # Necessary to build MDS when referenceType is Package.  Ignored when referenceType is Project.
   - name: abstractionsPackageVersion
     type: string
@@ -75,18 +71,17 @@ parameters:
 steps:
   # Build MDS
   - ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
-    - task: MSBuild@1
+    - task: DotNetCoreCLI@2
       displayName: 'Build Driver'
       condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
       inputs:
-        solution: build.proj
-        msbuildArchitecture: x64
-        platform: '${{ parameters.platform }}'
-        configuration: '${{ parameters.buildConfiguration }}'
-        msbuildArguments:
+        command: build
+        projects: build.proj
+        arguments: >-
           -t:BuildSqlClient
+          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:BuildNumber=${{ parameters.assemblyBuildNumber }}
+          -p:BuildNumber=${{ parameters.buildNumber }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
@@ -98,14 +93,13 @@ steps:
       condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
       inputs:
         command: build
-        projects: src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
+        projects: build.proj
         arguments: >-
-          --configuration ${{ parameters.buildConfiguration }}
+          -t:BuildAkvProvider
+          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:BuildNumber=${{ parameters.buildNumber }}
-          -p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
-          -p:AkvProviderPackageVersion=${{ parameters.akvPackageVersion }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
-
+          -p:PackageVersionAkvProvider=${{ parameters.akvPackageVersion }}
+          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
diff --git a/eng/pipelines/common/templates/steps/run-all-tests-step.yml b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
index e3397e45f0..cf3ce206a4 100644
--- a/eng/pipelines/common/templates/steps/run-all-tests-step.yml
+++ b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
@@ -77,96 +77,91 @@ steps:
 
 - ${{if eq(parameters.operatingSystem, 'Windows')}}:
   - ${{if eq(parameters.referenceType, 'Project')}}:
-    - task: MSBuild@1
+    - task: DotNetCoreCLI@2
       displayName: 'Run Unit Tests ${{parameters.msbuildArchitecture }}'
       condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
-        solution: build.proj
-        msbuildArchitecture: ${{parameters.msbuildArchitecture }}
-        platform: '${{parameters.platform }}'
-        configuration: '${{parameters.buildConfiguration }}'
+        command: build
+        projects: build.proj
         ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
-          msbuildArguments: >-
+          arguments: >-
             -t:TestSqlClientUnit
             -p:TestFramework=${{ parameters.targetFramework }}
-            -p:ReferenceType=${{ parameters.referenceType }}
+            -p:Configuration=${{ parameters.buildConfiguration }}
             -p:TestResultsFolderPath=TestResults
         ${{ else }}: # x86
-          msbuildArguments: >-
+          arguments: >-
             -t:TestSqlClientUnit
             -p:TestFramework=${{ parameters.targetFramework }}
-            -p:ReferenceType=${{ parameters.referenceType }}
+            -p:Configuration=${{ parameters.buildConfiguration }}
             -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
             -p:TestResultsFolderPath=TestResults
 
-    - task: MSBuild@1
+    - task: DotNetCoreCLI@2
       displayName: 'Run Flaky Unit Tests ${{parameters.msbuildArchitecture }}'
       condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
-        solution: build.proj
-        msbuildArchitecture: ${{parameters.msbuildArchitecture }}
-        platform: '${{parameters.platform }}'
-        configuration: '${{parameters.buildConfiguration }}'
+        command: build
+        projects: build.proj
         ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
-          msbuildArguments: >-
+          arguments: >-
             -t:TestSqlClientUnit
             -p:TestFramework=${{ parameters.targetFramework }}
-            -p:ReferenceType=${{ parameters.referenceType }}
+            -p:Configuration=${{ parameters.buildConfiguration }}
             -p:TestFilters="category=flaky"
             -p:TestResultsFolderPath=TestResults
             -p:TestCodeCoverage=false
         ${{ else }}: # x86
-          msbuildArguments: >-
+          arguments: >-
             -t:TestSqlClientUnit
             -p:TestFramework=${{ parameters.targetFramework }}
-            -p:ReferenceType=${{ parameters.referenceType }}
+            -p:Configuration=${{ parameters.buildConfiguration }}
             -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
             -p:TestFilters="category=flaky"
             -p:TestResultsFolderPath=TestResults
             -p:TestCodeCoverage=false
       continueOnError: true
 
-  - task: MSBuild@1
+  - task: DotNetCoreCLI@2
     displayName: 'Run Functional Tests ${{parameters.msbuildArchitecture }}'
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
-      solution: build.proj
-      msbuildArchitecture: ${{parameters.msbuildArchitecture }}
-      platform: '${{parameters.platform }}'
-      configuration: '${{parameters.buildConfiguration }}'
+      command: build
+      projects: build.proj
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
-        msbuildArguments: >-
+        arguments: >-
           -t:TestSqlClientFunctional
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
-        msbuildArguments: >-
+        arguments: >-
           -t:TestSqlClientFunctional
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestResultsFolderPath=TestResults
 
-  - task: MSBuild@1
-    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
+  - task: DotNetCoreCLI@2
     displayName: 'Run Flaky Functional Tests ${{parameters.msbuildArchitecture }}'
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
-      solution: build.proj
-      msbuildArchitecture: ${{parameters.msbuildArchitecture }}
-      platform: '${{parameters.platform }}'
-      configuration: '${{parameters.buildConfiguration }}'
+      command: build
+      projects: build.proj
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
-        msbuildArguments: >-
+        arguments: >-
           -t:TestSqlClientFunctional
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
@@ -174,10 +169,11 @@ steps:
           -p:TestResultsFolderPath=TestResults
           -p:TestCodeCoverage=false
       ${{ else }}: # x86
-        msbuildArguments: >-
+        arguments: >-
           -t:TestSqlClientFunctional
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
@@ -187,30 +183,30 @@ steps:
           -p:TestCodeCoverage=false
     continueOnError: true
 
-  - task: MSBuild@1
-    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
+  - task: DotNetCoreCLI@2
     displayName: 'Run Manual Tests ${{parameters.msbuildArchitecture }}'
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
-      solution: build.proj
-      msbuildArchitecture: ${{parameters.msbuildArchitecture }}
-      platform: '${{parameters.platform }}'
-      configuration: '${{parameters.buildConfiguration }}'
+      command: build
+      projects: build.proj
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
-        msbuildArguments: >-
+        arguments: >-
           -t:TestSqlClientManual
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
-        msbuildArguments: >-
+        arguments: >-
           -t:TestSqlClientManual
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
@@ -218,20 +214,19 @@ steps:
           -p:TestResultsFolderPath=TestResults
     retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
 
-  - task: MSBuild@1
-    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
+  - task: DotNetCoreCLI@2
     displayName: 'Run Flaky Manual Tests ${{parameters.msbuildArchitecture }}'
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
-      solution: build.proj
-      msbuildArchitecture: ${{parameters.msbuildArchitecture }}
-      platform: '${{parameters.platform }}'
-      configuration: '${{parameters.buildConfiguration }}'
+      command: build
+      projects: build.proj
       ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
-        msbuildArguments: >-
+        arguments: >-
           -t:TestSqlClientManual
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
@@ -239,11 +234,12 @@ steps:
           -p:TestResultsFolderPath=TestResults
           -p:TestCodeCoverage=false
       ${{ else }}: # x86
-        msbuildArguments: >-
+        arguments: >-
           -t:TestSqlClientManual
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
@@ -259,124 +255,97 @@ steps:
       displayName: 'Run Unit Tests'
       condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
-        command: custom
+        command: build
         projects: build.proj
-        custom: msbuild
         arguments: >-
           -t:TestSqlClientUnit
           -p:TestFramework=${{ parameters.targetFramework }}
-          -p:ReferenceType=${{ parameters.referenceType }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:Configuration=${{ parameters.buildConfiguration }}
           -p:TestResultsFolderPath=TestResults
-        verbosityRestore: Detailed
-        verbosityPack: Detailed
 
     - task: DotNetCoreCLI@2
       displayName: 'Run Flaky Unit Tests'
       condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
       inputs:
-        command: custom
+        command: build
         projects: build.proj
-        custom: msbuild
         arguments: >-
           -t:TestSqlClientUnit
           -p:TestFramework=${{ parameters.targetFramework }}
-          -p:ReferenceType=${{ parameters.referenceType }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
           -p:Configuration=${{ parameters.buildConfiguration }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
           -p:TestCodeCoverage=false
-        verbosityRestore: Detailed
-        verbosityPack: Detailed
       continueOnError: true
 
   - task: DotNetCoreCLI@2
     displayName: 'Run Functional Tests'
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
-      command: custom
+      command: build
       projects: build.proj
-      custom: msbuild
       arguments: >-
         -t:TestSqlClientFunctional
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:ReferenceType=${{ parameters.referenceType }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
         -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
-        -p:Configuration=${{ parameters.buildConfiguration }}
         -p:TestResultsFolderPath=TestResults
-      verbosityRestore: Detailed
-      verbosityPack: Detailed
 
   - task: DotNetCoreCLI@2
-    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     displayName: 'Run Flaky Functional Tests'
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
-      command: custom
+      command: build
       projects: build.proj
-      custom: msbuild
       arguments: >-
         -t:TestSqlClientFunctional
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:ReferenceType=${{ parameters.referenceType }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
         -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
-        -p:Configuration=${{ parameters.buildConfiguration }}
         -p:TestFilters="category=flaky"
         -p:TestResultsFolderPath=TestResults
         -p:TestCodeCoverage=false
-      verbosityRestore: Detailed
-      verbosityPack: Detailed
     continueOnError: true
   - task: DotNetCoreCLI@2
     displayName: 'Run Manual Tests'
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
-      command: custom
+      command: build
       projects: build.proj
-      custom: msbuild
       arguments: >-
         -t:TestSqlClientManual
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:TestSet=${{ parameters.testSet }}
         -p:ReferenceType=${{ parameters.referenceType }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
         -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
-        -p:Configuration=${{ parameters.buildConfiguration }}
         -p:TestResultsFolderPath=TestResults
-      verbosityRestore: Detailed
-      verbosityPack: Detailed
     retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
 
   - task: DotNetCoreCLI@2
     displayName: 'Run Flaky Manual Tests'
     condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
     inputs:
-      command: custom
+      command: build
       projects: build.proj
-      custom: msbuild
       arguments: >-
         -t:TestSqlClientManual
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:TestSet=${{ parameters.testSet }}
         -p:ReferenceType=${{ parameters.referenceType }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
         -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
-        -p:Configuration=${{ parameters.buildConfiguration }}
         -p:TestFilters="category=flaky"
         -p:TestResultsFolderPath=TestResults
         -p:TestCodeCoverage=false
-      verbosityRestore: Detailed
-      verbosityPack: Detailed
     continueOnError: true
-
diff --git a/eng/pipelines/jobs/test-abstractions-package-ci-job.yml b/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
index a88d4dc347..226dc1ae2a 100644
--- a/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
@@ -91,7 +91,7 @@ jobs:
       # dotnet CLI arguments for build/test/pack commands
       - name: buildArguments
         value: >-
-          --configuration ${{ parameters.buildConfiguration }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
           --verbosity ${{ parameters.dotnetVerbosity }}
 
       # Explicitly unset the $PLATFORM environment variable that is set by the
diff --git a/eng/pipelines/jobs/test-azure-package-ci-job.yml b/eng/pipelines/jobs/test-azure-package-ci-job.yml
index 0ad4246cb0..cd9b87e103 100644
--- a/eng/pipelines/jobs/test-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-azure-package-ci-job.yml
@@ -149,7 +149,7 @@ jobs:
       # dotnet CLI arguments for build/test/pack commands.
       - name: buildArguments
         value: >-
-          --configuration ${{ parameters.buildConfiguration }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
           --verbosity ${{ parameters.dotnetVerbosity }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
diff --git a/eng/pipelines/onebranch/steps/build-buildproj-step.yml b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
index 69c402792e..9e02243537 100644
--- a/eng/pipelines/onebranch/steps/build-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
@@ -47,13 +47,14 @@ steps:
       secureFile: 'netfxKeypair.snk'
     name: keyFile
 
-  - task: MSBuild@1
+  - task: DotNetCoreCLI@2
     displayName: 'build.proj - Build${{ parameters.packageShortName }}'
     inputs:
-      solution: '$(REPO_ROOT)/build.proj'
-      configuration: '${{ parameters.buildConfiguration }}'
-      msbuildArguments: >-
+      command: build
+      projects: '$(REPO_ROOT)/build.proj'
+      arguments: >-
         -t:Build${{ parameters.packageShortName }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
         -p:ReferenceType=Package
         -p:SigningKeyPath="$(keyFile.secureFilePath)"
         -p:BuildNumber="$(Build.BuildNumber)"
diff --git a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
index 96bba59c20..7a97c260d1 100644
--- a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
@@ -56,13 +56,14 @@ parameters:
     type: string
 
 steps:
-  - task: MSBuild@1
+  - task: DotNetCoreCLI@2
     displayName: 'build.proj - Pack${{ parameters.packageShortName }}'
     inputs:
-      solution: '$(REPO_ROOT)/build.proj'
-      configuration: '${{ parameters.buildConfiguration }}'
-      msbuildArguments: >-
+      command: build
+      projects: '$(REPO_ROOT)/build.proj'
+      arguments: >-
         -t:Pack${{ parameters.packageShortName }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
         -p:PackBuild=false
         -p:ReferenceType=Package
         -p:BuildNumber="$(Build.BuildNumber)"
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
index ba8cb79c83..1f7c22a554 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
@@ -13,7 +13,8 @@
 # steps that perform versioning or signing.
 
 parameters:
-  # Optional arguments to pass to msbuild to indicate what version of dependencies should be used.
+  # Optional arguments to pass to dotnet build to indicate what version of dependencies should be
+  # used.
   - name: dependencyArguments
     type: string
     default: ''
@@ -30,7 +31,7 @@ parameters:
       - SqlClient
       - SqlServer
 
-  #  Version to assign to the project to build. This will be passed into msbuild as
+  #  Version to assign to the project to build. This will be passed into dotnet build as
   #  "-p:PackageVersion(packageShortName)".
   # @TODO: Make this optional to enable progressively migrating to single-source versioning.
   - name: packageVersion
diff --git a/eng/pipelines/stress/stress-tests-job.yml b/eng/pipelines/stress/stress-tests-job.yml
index 6eda90890b..a216c23864 100644
--- a/eng/pipelines/stress/stress-tests-job.yml
+++ b/eng/pipelines/stress/stress-tests-job.yml
@@ -105,8 +105,14 @@ jobs:
       - name: project
         value: $(Build.SourcesDirectory)/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
 
-      # dotnet CLI arguments.
-      - name: dotnetArguments
+      # dotnet CLI arguments for build.
+      - name: buildArguments
+        value: >-
+          --verbosity ${{ parameters.dotnetVerbosity }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
+
+      # dotnet CLI arguments for run.
+      - name: runArguments
         value: >-
           --verbosity ${{ parameters.dotnetVerbosity }}
           --configuration ${{ parameters.buildConfiguration }}
@@ -172,7 +178,7 @@ jobs:
         inputs:
           command: build
           projects: $(project)
-          arguments: $(dotnetArguments)
+          arguments: $(buildArguments)
 
       # Set a flag so test steps can distinguish a build failure from a test failure.
       - pwsh: Write-Host "##vso[task.setvariable variable=buildSucceeded]true"
@@ -202,7 +208,7 @@ jobs:
           inputs:
             command: run
             projects: $(project)
-            arguments: $(dotnetArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.json -- $(testArguments)
+            arguments: $(runArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.json -- $(testArguments)
 
       # Run the stress tests for each .NET Framework runtime.
       - ${{ each runtime in parameters.netFrameworkTestRuntimes }}:
@@ -213,4 +219,4 @@ jobs:
           inputs:
             command: run
             projects: $(project)
-            arguments: $(dotnetArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.json -- $(testArguments)
+            arguments: $(runArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.json -- $(testArguments)
diff --git a/tools/targets/CompareMdsRefAssemblies.targets b/tools/targets/CompareMdsRefAssemblies.targets
index 1e89a26bf3..bccfa00930 100644
--- a/tools/targets/CompareMdsRefAssemblies.targets
+++ b/tools/targets/CompareMdsRefAssemblies.targets
@@ -102,9 +102,9 @@
   <!-- ================================================================== -->
   <Target Name="_BuildRefProject" DependsOnTargets="_SetApiCompatProperties">
     <Message Importance="high" Text="Building consolidated ref project (all TFMs)..." />
-    <MSBuild 
-      Targets="Restore;Build" 
-      Projects="$(RefProjectPath)"/>
+    <Exec
+      Command="dotnet build &quot;$(RefProjectPath)&quot; -p:Configuration=$(Configuration) -p:ReferenceType=$(ReferenceType)"
+      WorkingDirectory="$(RepoRoot)" />
   </Target>
 
   <!-- ================================================================== -->
@@ -134,7 +134,7 @@
       Text="--- Comparing %(_RefTfm.Identity) ref vs baseline $(BaselinePackageVersion) ---" />
 
     <Exec
-      Command="dotnet apicompat -l &quot;$(BaselineExtractDir)ref\%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; -r &quot;$(RefOutputDir)%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; --strict-mode &gt; &quot;$(ApiCompatResultsDir)%(_RefTfm.Identity).txt&quot; 2&gt;&amp;1"
+      Command="dotnet apicompat -l &quot;$(BaselineExtractDir)ref/%(_RefTfm.Identity)/Microsoft.Data.SqlClient.dll&quot; -r &quot;$(RefOutputDir)%(_RefTfm.Identity)/Microsoft.Data.SqlClient.dll&quot; --strict-mode &gt; &quot;$(ApiCompatResultsDir)%(_RefTfm.Identity).txt&quot; 2&gt;&amp;1"
       WorkingDirectory="$(RepoRoot)"
       ContinueOnError="ErrorAndContinue" />
 

From a9bde001b8326a4e6ecd266ff8a96e3607abf047 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 13 May 2026 12:45:44 -0700
Subject: [PATCH 099/298] Setup autosync workflow (#4221)

* Setup autosync workflow

Co-authored-by: Copilot <copilot@github.com>

* Update comment

* Updates

Co-authored-by: Copilot <copilot@github.com>

* Update pipeline definition

* Fix error when only 1 commit exists

* throw with error

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 eng/pipelines/github-sync-pipeline.yml     |  87 ++++++
 eng/pipelines/scripts/Sync-GitHubToAdo.ps1 | 293 +++++++++++++++++++++
 2 files changed, 380 insertions(+)
 create mode 100644 eng/pipelines/github-sync-pipeline.yml
 create mode 100644 eng/pipelines/scripts/Sync-GitHubToAdo.ps1

diff --git a/eng/pipelines/github-sync-pipeline.yml b/eng/pipelines/github-sync-pipeline.yml
new file mode 100644
index 0000000000..699270f4de
--- /dev/null
+++ b/eng/pipelines/github-sync-pipeline.yml
@@ -0,0 +1,87 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This pipeline synchronizes the GitHub dotnet/SqlClient repository's main
+# branch into the internal ADO repository by:
+#
+#   1. Fetching the latest commits from GitHub main.
+#   2. Pushing them to a dev/autosync/github-main branch in ADO.
+#   3. Creating (or updating) a pull request targeting internal/main.
+#
+# It runs on a daily schedule at 02:00 UTC and can also be triggered manually.
+# The pipeline does not auto-complete the PR — changes must be reviewed and
+# merged manually.
+#
+# Prerequisites:
+#
+#   - The build service identity must have "Contribute", "Create branch", and
+#     "Contribute to pull requests" permissions on the ADO repository.
+#
+# This pipeline definition is mapped to the following Azure DevOps pipeline:
+#
+# - GitHub Sync in the ADO.Net project:
+#
+#   https://sqlclientdrivers.visualstudio.com/ADO.Net/_build?definitionId=2263
+
+# Set the pipeline run name to the calendar date (yyyyMMdd) and the daily run counter.
+name: Sync-$(Date:yyyyMMdd)$(Rev:.r)
+
+# Do not trigger this pipeline on commits or PRs.
+trigger: none
+pr: none
+
+# Trigger this pipeline on a daily schedule.
+schedules:
+  - cron: '0 2 * * *'
+    displayName: Daily GitHub Sync (02:00 UTC)
+    branches:
+      include:
+        - internal/main
+    always: true
+
+# Pipeline parameters, visible in the Azure DevOps UI.
+parameters:
+
+  # The GitHub branch to sync from.
+  - name: githubBranch
+    displayName: GitHub Branch
+    type: string
+    default: main
+
+  # The ADO target branch to create the PR against.
+  - name: targetBranch
+    displayName: ADO Target Branch
+    type: string
+    default: internal/main
+
+jobs:
+  - job: SyncGitHub
+    displayName: Sync GitHub to ADO
+    pool:
+      vmImage: 'ubuntu-latest'
+
+    steps:
+      # Check out the ADO repo with full history so we can compare branches.
+      - checkout: self
+        persistCredentials: true
+        fetchDepth: 0
+
+      # Run the sync script.
+      - task: PowerShell@2
+        displayName: Sync GitHub main to ADO
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/pipelines/scripts/Sync-GitHubToAdo.ps1
+          arguments: >-
+            -GitHubRepoUrl "https://github.com/dotnet/SqlClient.git"
+            -GitHubBranch "${{ parameters.githubBranch }}"
+            -TargetBranch "${{ parameters.targetBranch }}"
+            -SyncBranchName "dev/autosync/github-${{ parameters.githubBranch }}"
+            -AdoOrgUrl "$(System.CollectionUri)"
+            -AdoProject "$(System.TeamProject)"
+            -AdoRepoName "$(Build.Repository.Name)"
+          pwsh: true
+        env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
diff --git a/eng/pipelines/scripts/Sync-GitHubToAdo.ps1 b/eng/pipelines/scripts/Sync-GitHubToAdo.ps1
new file mode 100644
index 0000000000..e8b7738021
--- /dev/null
+++ b/eng/pipelines/scripts/Sync-GitHubToAdo.ps1
@@ -0,0 +1,293 @@
+<#
+.SYNOPSIS
+    Syncs a GitHub branch into an Azure DevOps repository via a pull request.
+
+.DESCRIPTION
+    This script fetches the latest commits from a public GitHub repository,
+    force-pushes them to a sync branch in the ADO repo, then creates or updates
+    a pull request targeting the specified ADO branch.
+
+    If there are no new commits (the branches are already in sync), the script
+    exits cleanly with no changes.
+
+.PARAMETER GitHubRepoUrl
+    The HTTPS clone URL of the public GitHub repository.
+
+.PARAMETER GitHubBranch
+    The branch to sync from GitHub (e.g. "main").
+
+.PARAMETER TargetBranch
+    The ADO branch the PR should target (e.g. "internal/main").
+
+.PARAMETER SyncBranchName
+    The ADO branch name to push GitHub commits to (e.g. "dev/autosync/github-main").
+
+.PARAMETER AdoOrgUrl
+    The Azure DevOps organization URL (e.g. "https://dev.azure.com/org/").
+
+.PARAMETER AdoProject
+    The Azure DevOps project name.
+
+.PARAMETER AdoRepoName
+    The Azure DevOps repository name.
+
+.PARAMETER AccessToken
+    The access token for ADO REST API and git push operations.
+    Defaults to the SYSTEM_ACCESSTOKEN environment variable.
+
+.NOTES
+    This pipeline is intended to be run only in the internal ADO.Net project.
+    It must never be run in the Public project or triggered by changes in GitHub.
+#>
+
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the MIT license.
+# See the LICENSE file in the project root for more information.
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory)]
+    [string]$GitHubRepoUrl,
+
+    [Parameter(Mandatory)]
+    [string]$GitHubBranch,
+
+    [Parameter(Mandatory)]
+    [string]$TargetBranch,
+
+    [Parameter(Mandatory)]
+    [string]$SyncBranchName,
+
+    [Parameter(Mandatory)]
+    [string]$AdoOrgUrl,
+
+    [Parameter(Mandatory)]
+    [string]$AdoProject,
+
+    [Parameter(Mandatory)]
+    [string]$AdoRepoName,
+
+    [string]$AccessToken = $env:SYSTEM_ACCESSTOKEN
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+#region Validation
+if ([string]::IsNullOrWhiteSpace($AccessToken)) {
+    throw "Access token is required. Set SYSTEM_ACCESSTOKEN or pass -AccessToken."
+}
+#endregion
+
+#region Helper Functions
+
+function Invoke-AdoApi {
+    <#
+    .SYNOPSIS
+        Calls an Azure DevOps REST API endpoint.
+    #>
+    param(
+        [Parameter(Mandatory)][string]$Uri,
+        [string]$Method = 'GET',
+        [object]$Body = $null
+    )
+
+    $headers = @{
+        'Authorization' = "Bearer $AccessToken"
+        'Content-Type'  = 'application/json'
+    }
+
+    $params = @{
+        Uri     = $Uri
+        Method  = $Method
+        Headers = $headers
+    }
+
+    if ($null -ne $Body) {
+        $params['Body'] = ($Body | ConvertTo-Json -Depth 10)
+    }
+
+    $response = Invoke-RestMethod @params -ErrorAction Stop
+    return $response
+}
+
+function Get-CommitSummary {
+    <#
+    .SYNOPSIS
+        Returns a markdown-formatted list of commits between two refs.
+    #>
+    param(
+        [Parameter(Mandatory)][string]$BaseRef,
+        [Parameter(Mandatory)][string]$HeadRef,
+        [int]$MaxCommits = 50
+    )
+
+    $logOutput = git log --oneline "$BaseRef..$HeadRef" -n $MaxCommits 2>&1
+    if ($LASTEXITCODE -ne 0) {
+        Write-Warning "Could not retrieve commit log: $logOutput"
+        return "_(commit log unavailable)_"
+    }
+
+    $lines = @($logOutput -split "`n" | Where-Object { $_ -match '\S' })
+    if ($lines.Count -eq 0) {
+        return "_(no commits)_"
+    }
+
+    $summary = ($lines | ForEach-Object { "- ``$_``" }) -join "`n"
+
+    $totalCount = (git rev-list --count "$BaseRef..$HeadRef" 2>&1)
+    if ($LASTEXITCODE -eq 0 -and [int]$totalCount -gt $MaxCommits) {
+        $summary += "`n`n_...and $($totalCount - $MaxCommits) more commit(s)._"
+    }
+
+    return $summary
+}
+
+#endregion
+
+#region Git Operations
+
+Write-Host "=== GitHub to ADO Sync ==="
+Write-Host "GitHub : $GitHubRepoUrl @ $GitHubBranch"
+Write-Host "ADO    : $AdoProject/$AdoRepoName @ $TargetBranch"
+Write-Host "Sync   : $SyncBranchName"
+Write-Host ""
+
+# Configure git identity for any merge commits (shouldn't be needed for
+# force-push, but set it defensively).
+git config user.email "ado-sync-bot@microsoft.com"
+git config user.name "ADO Sync Bot"
+
+# Add GitHub as a remote and fetch the branch we want to sync.
+Write-Host "Fetching GitHub branch '$GitHubBranch'..."
+$remoteExists = git remote | Where-Object { $_ -eq 'github' }
+if ($remoteExists) {
+    git remote set-url github $GitHubRepoUrl
+} else {
+    git remote add github $GitHubRepoUrl
+}
+
+git fetch github $GitHubBranch --verbose
+if ($LASTEXITCODE -ne 0) {
+    throw "Failed to fetch '$GitHubBranch' from GitHub."
+}
+
+# Resolve the SHA of the fetched GitHub branch.
+$githubSha = git rev-parse "github/$GitHubBranch"
+if ($LASTEXITCODE -ne 0) {
+    throw "Failed to resolve SHA for 'github/$GitHubBranch'."
+}
+Write-Host "GitHub HEAD : $githubSha"
+
+# Check if the target branch exists and compare SHAs.
+$targetRef = git rev-parse "origin/$TargetBranch" 2>&1
+$targetExists = ($LASTEXITCODE -eq 0)
+
+if ($targetExists) {
+    Write-Host "Target HEAD : $targetRef"
+}
+
+# Check if the sync branch already exists in origin.
+$syncRef = git rev-parse "origin/$SyncBranchName" 2>&1
+$syncBranchExists = ($LASTEXITCODE -eq 0)
+
+if ($syncBranchExists -and $syncRef -eq $githubSha) {
+    Write-Host ""
+    Write-Host "Sync branch is already at GitHub HEAD. Nothing to do."
+    exit 0
+}
+
+# Create the sync branch pointing to the GitHub HEAD and force-push it.
+Write-Host ""
+Write-Host "Updating sync branch '$SyncBranchName' to GitHub HEAD..."
+git checkout -B $SyncBranchName "github/$GitHubBranch" --quiet
+if ($LASTEXITCODE -ne 0) {
+    throw "Failed to create sync branch."
+}
+
+git push origin $SyncBranchName --force --quiet
+if ($LASTEXITCODE -ne 0) {
+    throw "Failed to push sync branch to ADO."
+}
+Write-Host "Sync branch pushed successfully."
+
+#endregion
+
+#region Pull Request Management
+
+# Build the commit summary for the PR description / comment.
+$commitSummary = if ($targetExists) {
+    Get-CommitSummary -BaseRef "origin/$TargetBranch" -HeadRef "github/$GitHubBranch"
+} else {
+    "_(target branch does not exist yet — initial sync)_"
+}
+
+# Normalize the ADO org URL (remove trailing slash for consistent URI construction).
+$AdoOrgUrl = $AdoOrgUrl.TrimEnd('/')
+
+# URL-encode the project name for REST API calls.
+$encodedProject = [Uri]::EscapeDataString($AdoProject)
+$encodedRepo = [Uri]::EscapeDataString($AdoRepoName)
+$apiBase = "$AdoOrgUrl/$encodedProject/_apis/git/repositories/$encodedRepo"
+
+# Search for an existing active PR from the sync branch to the target branch.
+Write-Host ""
+Write-Host "Checking for existing pull requests..."
+
+$encodedSyncBranch = [Uri]::EscapeDataString($SyncBranchName)
+$encodedTargetBranch = [Uri]::EscapeDataString($TargetBranch)
+$searchUri = "$apiBase/pullrequests?searchCriteria.sourceRefName=refs/heads/$encodedSyncBranch" +
+             "&searchCriteria.targetRefName=refs/heads/$encodedTargetBranch" +
+             "&searchCriteria.status=active" +
+             "&api-version=7.1"
+
+$existingPrs = Invoke-AdoApi -Uri $searchUri
+$activePr = $existingPrs.value | Select-Object -First 1
+
+if ($activePr) {
+    # An active PR already exists — update its description and add a comment.
+    $prId = $activePr.pullRequestId
+    Write-Host "Active PR #$prId found. Updating description and posting comment..."
+
+    # 1. PATCH the PR description with the refreshed commit summary.
+    $patchUri = "$apiBase/pullrequests/$prId?api-version=7.1"
+    $patchBody = @{
+        description = "## Automated GitHub Sync`n`nThis PR was updated automatically by the GitHub sync pipeline.`n`nSource: [dotnet/SqlClient@$GitHubBranch](https://github.com/dotnet/SqlClient/tree/$GitHubBranch)`nSync branch: ``$SyncBranchName```n`n### Latest Commits`n`n$commitSummary`n`n---`n_This PR requires manual review and merge. Auto-complete is not enabled._"
+    }
+    Invoke-AdoApi -Uri $patchUri -Method 'PATCH' -Body $patchBody | Out-Null
+    Write-Host "PR #$prId description updated."
+
+    # 2. Post a comment thread summarising the new commits.
+    $commentUri = "$apiBase/pullrequests/$prId/threads?api-version=7.1"
+    $commentBody = @{
+        comments = @(
+            @{
+                parentCommentId = 0
+                content         = "## Sync Update`n`nPR updated by the GitHub sync pipeline on $((Get-Date).ToUniversalTime().ToString('yyyy-MM-dd HH:mm')) UTC.`n`nNew commits from GitHub ``$GitHubBranch``:`n`n$commitSummary"
+                commentType     = 1  # Text
+            }
+        )
+        status = 1  # Active
+    }
+    Invoke-AdoApi -Uri $commentUri -Method 'POST' -Body $commentBody | Out-Null
+    Write-Host "Update comment posted to PR #$prId."
+} else {
+    # No active PR — create a new one.
+    Write-Host "No active PR found. Creating a new pull request..."
+
+    $prUri = "$apiBase/pullrequests?api-version=7.1"
+    $prBody = @{
+        sourceRefName = "refs/heads/$SyncBranchName"
+        targetRefName = "refs/heads/$TargetBranch"
+        title         = "[GitHub Sync] Update $TargetBranch from GitHub $GitHubBranch"
+        description   = "## Automated GitHub Sync`n`nThis PR was created automatically by the GitHub sync pipeline.`n`nSource: [dotnet/SqlClient@$GitHubBranch](https://github.com/dotnet/SqlClient/tree/$GitHubBranch)`nSync branch: ``$SyncBranchName```n`n### Commits`n`n$commitSummary`n`n---`n_This PR requires manual review and merge. Auto-complete is not enabled._"
+    }
+
+    $newPr = Invoke-AdoApi -Uri $prUri -Method 'POST' -Body $prBody
+    Write-Host "Created PR #$($newPr.pullRequestId): $($newPr.title)"
+}
+
+#endregion
+
+Write-Host ""
+Write-Host "=== Sync complete ==="

From 7a49600759968413b93562799dc0e981c3226c67 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Thu, 14 May 2026 08:49:24 +1000
Subject: [PATCH 100/298] remove redundant StopWatch.Stop in
 SendBroadcastUDPRequest (#4102)

Co-authored-by: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
---
 .../ManagedSni/SsrpClient.netcore.cs          | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs
index 43b411fb5d..4544d1169f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs
@@ -414,24 +414,16 @@ internal static string SendBroadcastUDPRequest()
                     Task<int> sendTask = clientListener.SendAsync(CLNT_BCAST_EX_Request, CLNT_BCAST_EX_Request.Length, new IPEndPoint(IPAddress.Broadcast, SqlServerBrowserPort));
                     Task<UdpReceiveResult> receiveTask = null;
                     SqlClientEventSource.Log.TrySNITraceEvent(nameof(SsrpClient), EventType.INFO, "Waiting for UDP Client to fetch list of instances.");
-                    Stopwatch sw = new Stopwatch(); //for waiting until 15 sec elapsed
-                    sw.Start();
-                    try
+                    Stopwatch sw = Stopwatch.StartNew(); //for waiting until 15 sec elapsed
+                    while ((receiveTask = clientListener.ReceiveAsync()).Wait(currentTimeOut) && sw.ElapsedMilliseconds <= ReceiveMAXTimeoutsForCLNT_BCAST_EX && receiveTask != null)
                     {
-                        while ((receiveTask = clientListener.ReceiveAsync()).Wait(currentTimeOut) && sw.ElapsedMilliseconds <= ReceiveMAXTimeoutsForCLNT_BCAST_EX && receiveTask != null)
+                        currentTimeOut = ReceiveTimeoutsForCLNT_BCAST_EX;
+                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SsrpClient), EventType.INFO, "Received instnace info from UDP Client.");
+                        if (receiveTask.Result.Buffer.Length < ValidResponseSizeForCLNT_BCAST_EX) //discard invalid response
                         {
-                            currentTimeOut = ReceiveTimeoutsForCLNT_BCAST_EX;
-                            SqlClientEventSource.Log.TrySNITraceEvent(nameof(SsrpClient), EventType.INFO, "Received instance info from UDP Client.");
-                            if (receiveTask.Result.Buffer.Length < ValidResponseSizeForCLNT_BCAST_EX) //discard invalid response
-                            {
-                                response.Append(Encoding.ASCII.GetString(receiveTask.Result.Buffer, ServerResponseHeaderSizeForCLNT_BCAST_EX, receiveTask.Result.Buffer.Length - ServerResponseHeaderSizeForCLNT_BCAST_EX)); //RESP_DATA(VARIABLE) - 3 (RESP_SIZE + SVR_RESP)
-                            }
+                            response.Append(Encoding.ASCII.GetString(receiveTask.Result.Buffer, ServerResponseHeaderSizeForCLNT_BCAST_EX, receiveTask.Result.Buffer.Length - ServerResponseHeaderSizeForCLNT_BCAST_EX)); //RESP_DATA(VARIABLE) - 3 (RESP_SIZE + SVR_RESP)
                         }
                     }
-                    finally
-                    {
-                        sw.Stop();
-                    }
                 }
             }
             return response.ToString();

From fbfd82719c79e28fa968683f6c0568faf8a1bd2a Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Thu, 14 May 2026 10:25:34 +0100
Subject: [PATCH 101/298] Fix | Build DataTypes table in code, add `json` data
 type (#3858)

* Create structure of DataTypes static population
* Remove redundant data types from metadata
SqlClient cannot connect to SQL Server 2000 instances, so the minimum server version is 9.0.
* Remove data type entries with a maximum version below this.
* Remove the minimum version constraint where this constraint will always be true.
* Populate DataTypes table from MetaType information
* Add test to verify presence of data types
* Add json data type to DataTypes schema collection
* Use IsJsonSupported more widely
This enables the JSON tests to run against SQL Server 2025.
Also correct a comment in LoadDataTypesDataTables.
* Plumb minimum version logic to AddStringOrBinaryType
* Address MARS JSON test failure
This was manually constructing a connection string, which didn't work on one CI leg.
---
 .../SqlClient/SqlMetaDataFactory.DataTypes.cs | 438 +++++++++++
 .../Data/SqlClient/SqlMetaDataFactory.cs      |  40 +-
 .../Microsoft.Data.SqlClient.SqlMetaData.xml  | 689 ------------------
 .../ManualTests/DataCommon/DataTestUtility.cs |  12 +
 .../ConnectionSchemaTest.cs                   | 107 ++-
 .../SQL/JsonTest/JsonBulkCopyTest.cs          |   4 +-
 .../SQL/JsonTest/JsonStreamTest.cs            |   4 +-
 .../ManualTests/SQL/JsonTest/JsonTest.cs      |  19 +-
 8 files changed, 551 insertions(+), 762 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.DataTypes.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.DataTypes.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.DataTypes.cs
new file mode 100644
index 0000000000..eba61969c3
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.DataTypes.cs
@@ -0,0 +1,438 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Data;
+using System.Data.Common;
+using System.Diagnostics;
+using Microsoft.Data.Common;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient;
+
+internal sealed partial class SqlMetaDataFactory
+{
+    private static void LoadDataTypesDataTables(DataSet metaDataCollectionsDataSet)
+    {
+        DataTable dataTypesDataTable = CreateDataTypesDataTable();
+
+        dataTypesDataTable.BeginLoadData();
+
+        // SQL Server data types are grouped into the rough categories below:
+        // 1. Fixed-scale and fixed-precision numeric types: tinyint, smallint, int, bigint, real, money, smallmoney, bit.
+        // 2. Variable-precision numeric types: float and decimal / numeric.
+        // 3. Fixed-precision date/time types: datetime, smalldatetime, date.
+        // 4. Variable-precision date/time types: time, datetime2, datetimeoffset.
+        // 5. Long types: xml, json, text, ntext, image.
+        // 6. Fixed-length string and binary types: char, nchar, binary.
+        // 7. Variable-length string and binary types: varchar, nvarchar, varbinary.
+        // 8. Miscellaneous fixed-length types: uniqueidentifier, sql_variant, timestamp
+
+        AddFixedNumericType(SqlDbType.TinyInt, isBestMatch: true);
+        AddFixedNumericType(SqlDbType.SmallInt, isBestMatch: true);
+        AddFixedNumericType(SqlDbType.Int, isBestMatch: true);
+        AddFixedNumericType(SqlDbType.BigInt, isBestMatch: true);
+        AddFixedNumericType(SqlDbType.Real, isBestMatch: true);
+        // Money and smallmoney are not the best ways to represent System.Decimal values. SQL Server
+        // provides a variable-precision "numeric" type for that purpose.
+        AddFixedNumericType(SqlDbType.Money, isBestMatch: false);
+        AddFixedNumericType(SqlDbType.SmallMoney, isBestMatch: false);
+        AddFixedNumericType(SqlDbType.Bit, isBestMatch: false);
+
+        AddVariablePrecisionNumericType(SqlDbType.Float, columnSize: 53);
+        AddVariablePrecisionNumericType(SqlDbType.Decimal, columnSize: 38);
+        AddVariablePrecisionNumericType(SqlDbType.Decimal, columnSize: 38,
+            aliasType: "numeric");
+
+        AddFixedPrecisionDateTimeType(SqlDbType.DateTime, isBestMatch: true);
+        AddFixedPrecisionDateTimeType(SqlDbType.SmallDateTime, isBestMatch: true);
+        AddFixedPrecisionDateTimeType(SqlDbType.Date, isBestMatch: false,
+            minimumVersion: "10.00.000.0");
+
+        AddVariablePrecisionDateTimeType(SqlDbType.Time, columnSize: 5, isBestMatch: false,
+            minimumVersion: "10.00.000.0");
+        AddVariablePrecisionDateTimeType(SqlDbType.DateTime2, columnSize: 8,
+            minimumVersion: "10.00.000.0");
+        AddVariablePrecisionDateTimeType(SqlDbType.DateTimeOffset, columnSize: 10,
+            minimumVersion: "10.00.000.0");
+
+        AddLongStringOrBinaryType(SqlDbType.Xml);
+        AddLongStringOrBinaryType(SqlDbTypeExtensions.Json, literalPrefix: "'", literalSuffix: "'",
+            minimumVersion: "17.00.000.0");
+        AddLongStringOrBinaryType(SqlDbType.Text, literalPrefix: "'", literalSuffix: "'");
+        AddLongStringOrBinaryType(SqlDbType.NText, literalPrefix: "N'", literalSuffix: "'");
+        AddLongStringOrBinaryType(SqlDbType.Image, literalPrefix: "0x");
+
+        AddFixedLengthStringOrBinaryType(SqlDbType.Char, literalPrefix: "'", literalSuffix: "'");
+        AddFixedLengthStringOrBinaryType(SqlDbType.NChar, literalPrefix: "N'", literalSuffix: "'");
+        AddFixedLengthStringOrBinaryType(SqlDbType.Binary, literalPrefix: "0x");
+
+        AddVariableLengthStringOrBinaryType(SqlDbType.VarChar, literalPrefix: "'", literalSuffix: "'");
+        AddVariableLengthStringOrBinaryType(SqlDbType.NVarChar, literalPrefix: "N'", literalSuffix: "'");
+        AddVariableLengthStringOrBinaryType(SqlDbType.VarBinary, literalPrefix: "0x");
+
+        AddUniqueIdentifierType();
+        AddSqlVariantType();
+        AddRowVersionType();
+
+        dataTypesDataTable.EndLoadData();
+        dataTypesDataTable.AcceptChanges();
+
+        metaDataCollectionsDataSet.Tables.Add(dataTypesDataTable);
+
+        void AddFixedNumericType(SqlDbType integerDbType, bool isBestMatch)
+        {
+            MetaType metaType = MetaType.GetMetaTypeFromSqlDbType(integerDbType, isMultiValued: false);
+            DataRow typeRow = dataTypesDataTable.NewRow();
+
+            typeRow[DbMetaDataColumnNames.TypeName] = metaType.TypeName;
+            typeRow[DbMetaDataColumnNames.ProviderDbType] = (int)metaType.SqlDbType;
+            typeRow[DbMetaDataColumnNames.CreateFormat] = metaType.TypeName;
+
+            // A fixed-scale integer always has precision equal to the column size and a scale of 0xFF.
+            // If the precision is marked as unknown, then report the column size directly.
+            Debug.Assert(metaType.Scale == TdsEnums.UNKNOWN_PRECISION_SCALE);
+            typeRow[DbMetaDataColumnNames.ColumnSize] =
+                metaType.Precision == TdsEnums.UNKNOWN_PRECISION_SCALE
+                    ? metaType.FixedLength
+                    : metaType.Precision;
+
+            typeRow[DbMetaDataColumnNames.DataType] = metaType.ClassType.FullName;
+            // Of all fixed-scale integer types, only "tinyint", "smallint", "int" and "bigint" are auto-incrementable.
+            typeRow[DbMetaDataColumnNames.IsAutoIncrementable] =
+                integerDbType is SqlDbType.TinyInt or SqlDbType.SmallInt or SqlDbType.Int or SqlDbType.BigInt;
+            typeRow[DbMetaDataColumnNames.IsBestMatch] = isBestMatch;
+            typeRow[DbMetaDataColumnNames.IsCaseSensitive] = false;
+            typeRow[DbMetaDataColumnNames.IsConcurrencyType] = false;
+            typeRow[DbMetaDataColumnNames.IsFixedLength] = true;
+            // "real" is an ISO synonym of "float(24)". This means that it's a fixed-scale alias of a dynamic-scale type.
+            // "bit" is also not considered fixed precision/scale, since SQL Server packs multiple bit columns into the same byte.
+            typeRow[DbMetaDataColumnNames.IsFixedPrecisionScale] = integerDbType is not SqlDbType.Real and not SqlDbType.Bit;
+            typeRow[DbMetaDataColumnNames.IsLong] = false;
+            typeRow[DbMetaDataColumnNames.IsNullable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchableWithLike] = false;
+            // Only "tinyint" is unsigned. "bit" does not have the concept of signed/unsigned.
+            if (integerDbType is not SqlDbType.Bit)
+            {
+                typeRow[DbMetaDataColumnNames.IsUnsigned] = integerDbType is SqlDbType.TinyInt;
+            }
+
+            dataTypesDataTable.Rows.Add(typeRow);
+        }
+
+        void AddVariablePrecisionNumericType(SqlDbType numericDbType, int columnSize,
+            string? aliasType = null)
+        {
+            MetaType metaType = MetaType.GetMetaTypeFromSqlDbType(numericDbType, isMultiValued: false);
+            string typeName = aliasType ?? metaType.TypeName;
+            bool variableScale = numericDbType is SqlDbType.Decimal;
+            DataRow typeRow = dataTypesDataTable.NewRow();
+
+            typeRow[DbMetaDataColumnNames.TypeName] = typeName;
+            typeRow[DbMetaDataColumnNames.ProviderDbType] = (int)metaType.SqlDbType;
+            typeRow[DbMetaDataColumnNames.ColumnSize] = columnSize;
+
+            // Both "float" and "decimal" have variable precision, but "decimal" also has variable scale.
+            if (variableScale)
+            {
+                typeRow[DbMetaDataColumnNames.CreateFormat] = $"{typeName}({{0}}, {{1}})";
+                typeRow[DbMetaDataColumnNames.CreateParameters] = "precision,scale";
+                typeRow[DbMetaDataColumnNames.MinimumScale] = 0;
+                // The data type is a fixed number of bytes, which can be distributed between the precision
+                // and the scale. Therefore, the maximum scale is equal to the column size.
+                typeRow[DbMetaDataColumnNames.MaximumScale] = columnSize;
+            }
+            else
+            {
+                typeRow[DbMetaDataColumnNames.CreateFormat] = $"{typeName}({{0}})";
+                typeRow[DbMetaDataColumnNames.CreateParameters] = "number of bits used to store the mantissa";
+            }
+
+            typeRow[DbMetaDataColumnNames.DataType] = metaType.ClassType.FullName;
+            // Only the "decimal" type is auto-incrementable.
+            typeRow[DbMetaDataColumnNames.IsAutoIncrementable] = numericDbType is SqlDbType.Decimal;
+            typeRow[DbMetaDataColumnNames.IsBestMatch] = true;
+            typeRow[DbMetaDataColumnNames.IsCaseSensitive] = false;
+            typeRow[DbMetaDataColumnNames.IsConcurrencyType] = false;
+            typeRow[DbMetaDataColumnNames.IsFixedLength] = true;
+            typeRow[DbMetaDataColumnNames.IsFixedPrecisionScale] = false;
+            typeRow[DbMetaDataColumnNames.IsLong] = false;
+            typeRow[DbMetaDataColumnNames.IsNullable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchableWithLike] = false;
+            typeRow[DbMetaDataColumnNames.IsUnsigned] = false;
+
+            dataTypesDataTable.Rows.Add(typeRow);
+        }
+
+        void AddFixedPrecisionDateTimeType(SqlDbType dateTimeDbType, bool isBestMatch,
+            string? minimumVersion = null)
+        {
+            MetaType metaType = MetaType.GetMetaTypeFromSqlDbType(dateTimeDbType, isMultiValued: false);
+            DataRow typeRow = dataTypesDataTable.NewRow();
+
+            typeRow[DbMetaDataColumnNames.TypeName] = metaType.TypeName;
+            typeRow[DbMetaDataColumnNames.ProviderDbType] = (int)metaType.SqlDbType;
+            // "date" reports an unknown precision and an unknown scale, even though its precision and scale are fixed.
+            // To that end, we report its column length directly.
+            typeRow[DbMetaDataColumnNames.ColumnSize] =
+                metaType.Precision == TdsEnums.UNKNOWN_PRECISION_SCALE
+                    ? metaType.FixedLength
+                    : metaType.Precision;
+            typeRow[DbMetaDataColumnNames.CreateFormat] = metaType.TypeName;
+            typeRow[DbMetaDataColumnNames.DataType] = metaType.ClassType.FullName;
+            typeRow[DbMetaDataColumnNames.IsAutoIncrementable] = false;
+            typeRow[DbMetaDataColumnNames.IsBestMatch] = isBestMatch;
+            typeRow[DbMetaDataColumnNames.IsCaseSensitive] = false;
+            typeRow[DbMetaDataColumnNames.IsConcurrencyType] = false;
+            typeRow[DbMetaDataColumnNames.IsFixedLength] = true;
+            typeRow[DbMetaDataColumnNames.IsFixedPrecisionScale] = dateTimeDbType is SqlDbType.Date;
+            typeRow[DbMetaDataColumnNames.IsLong] = false;
+            typeRow[DbMetaDataColumnNames.IsNullable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchableWithLike] = true;
+            typeRow[DbMetaDataColumnNames.LiteralPrefix] = @"{ts '";
+            typeRow[DbMetaDataColumnNames.LiteralSuffix] = @"'}";
+
+            if (minimumVersion is not null)
+            {
+                typeRow[MinimumVersionKey] = minimumVersion;
+            }
+
+            dataTypesDataTable.Rows.Add(typeRow);
+        }
+
+        void AddVariablePrecisionDateTimeType(SqlDbType dateTimeDbType, int columnSize,
+            bool isBestMatch = true,
+            string? minimumVersion = null)
+        {
+            MetaType metaType = MetaType.GetMetaTypeFromSqlDbType(dateTimeDbType, isMultiValued: false);
+            DataRow typeRow = dataTypesDataTable.NewRow();
+
+            typeRow[DbMetaDataColumnNames.TypeName] = metaType.TypeName;
+            typeRow[DbMetaDataColumnNames.ProviderDbType] = (int)metaType.SqlDbType;
+            typeRow[DbMetaDataColumnNames.ColumnSize] = columnSize;
+            typeRow[DbMetaDataColumnNames.CreateFormat] = $"{metaType.TypeName}({{0}})";
+            // The documentation describes these data types as having variable precision, but GetSchema reports that they
+            // have variable scale.
+            typeRow[DbMetaDataColumnNames.CreateParameters] = "scale";
+            typeRow[DbMetaDataColumnNames.DataType] = metaType.ClassType.FullName;
+            typeRow[DbMetaDataColumnNames.IsAutoIncrementable] = false;
+            typeRow[DbMetaDataColumnNames.IsBestMatch] = isBestMatch;
+            typeRow[DbMetaDataColumnNames.IsCaseSensitive] = false;
+            typeRow[DbMetaDataColumnNames.IsConcurrencyType] = false;
+            typeRow[DbMetaDataColumnNames.IsFixedLength] = false;
+            typeRow[DbMetaDataColumnNames.IsFixedPrecisionScale] = false;
+            typeRow[DbMetaDataColumnNames.IsLong] = false;
+            typeRow[DbMetaDataColumnNames.IsNullable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchableWithLike] = true;
+            typeRow[DbMetaDataColumnNames.MinimumScale] = 0;
+            typeRow[DbMetaDataColumnNames.MaximumScale] = metaType.Scale;
+            typeRow[DbMetaDataColumnNames.LiteralPrefix] = @"{ts '";
+            typeRow[DbMetaDataColumnNames.LiteralSuffix] = @"'}";
+
+            if (minimumVersion is not null)
+            {
+                typeRow[MinimumVersionKey] = minimumVersion;
+            }
+
+            dataTypesDataTable.Rows.Add(typeRow);
+        }
+
+        void AddLongStringOrBinaryType(SqlDbType longDbType,
+            string? literalPrefix = null, string? literalSuffix = null,
+            string? minimumVersion = null) =>
+            AddStringOrBinaryType(longDbType,
+                // The column size is measured in elements, not bytes. For ntext, each element is a 2 byte Unicode character.
+                columnSize: longDbType is SqlDbType.NText ? int.MaxValue / ADP.CharSize : int.MaxValue,
+                isLong: true, isFixedLength: false,
+                isSearchable: false,
+                literalPrefix: literalPrefix, literalSuffix: literalSuffix,
+                minimumVersion: minimumVersion);
+
+        void AddFixedLengthStringOrBinaryType(SqlDbType fixedLengthDbType,
+            string? literalPrefix = null, string? literalSuffix = null) =>
+            AddStringOrBinaryType(fixedLengthDbType,
+                // See the comment on AddLongStringOrBinary regarding column sizes. To add: the "binary" type can be up to 8000 bytes.
+                columnSize: fixedLengthDbType switch
+                {
+                    SqlDbType.Binary => 8000,
+                    SqlDbType.NChar => int.MaxValue / ADP.CharSize,
+                    _ => int.MaxValue
+                },
+                isLong: false, isFixedLength: true,
+                isSearchable: true,
+                literalPrefix: literalPrefix, literalSuffix: literalSuffix);
+
+        void AddVariableLengthStringOrBinaryType(SqlDbType variableLengthDbType,
+            string? literalPrefix = null, string? literalSuffix = null) =>
+            AddStringOrBinaryType(variableLengthDbType,
+                // See the comment on AddLongStringOrBinary regarding column sizes. Unlike the "binary" type, varbinary is reported to
+                // have a maximum column size of (2^32-1) / 2 elements, just as nvarchar does.
+                columnSize: variableLengthDbType is SqlDbType.NVarChar or SqlDbType.VarBinary
+                    ? int.MaxValue / ADP.CharSize
+                    : int.MaxValue,
+                isLong: false, isFixedLength: false,
+                isSearchable: true,
+                literalPrefix: literalPrefix, literalSuffix: literalSuffix);
+
+        void AddRowVersionType() =>
+            AddStringOrBinaryType(SqlDbType.Timestamp,
+            columnSize: TdsEnums.TEXT_TIME_STAMP_LEN, isLong: false, isFixedLength: true,
+            isSearchable: true,
+            literalPrefix: "0x");
+
+        void AddStringOrBinaryType(SqlDbType sqlDbType, int columnSize, bool isLong,
+            bool isFixedLength, bool isSearchable,
+            string? literalPrefix = null, string? literalSuffix = null,
+            string? minimumVersion = null)
+        {
+            MetaType metaType = MetaType.GetMetaTypeFromSqlDbType(sqlDbType, isMultiValued: false);
+            DataRow typeRow = dataTypesDataTable.NewRow();
+            bool hasLengthSpecifier = sqlDbType is SqlDbType.Char or SqlDbType.NChar or SqlDbType.Binary
+                or SqlDbType.VarChar or SqlDbType.NVarChar or SqlDbType.VarBinary;
+
+            typeRow[DbMetaDataColumnNames.TypeName] = metaType.TypeName;
+            typeRow[DbMetaDataColumnNames.ProviderDbType] = (int)metaType.SqlDbType;
+            typeRow[DbMetaDataColumnNames.ColumnSize] = columnSize;
+            // Several string or binary data types do not include the length in their type declaration.
+            // Of the data types which do, fixed-length types use the length parameter to decide the full length,
+            // while the rest use it to decide the maximum length.
+            if (hasLengthSpecifier)
+            {
+                typeRow[DbMetaDataColumnNames.CreateFormat] = $"{metaType.TypeName}({{0}})";
+                typeRow[DbMetaDataColumnNames.CreateParameters] =
+                    isFixedLength ? "length" : "max length";
+            }
+            else
+            {
+                typeRow[DbMetaDataColumnNames.CreateFormat] = metaType.TypeName;
+            }
+            typeRow[DbMetaDataColumnNames.DataType] = metaType.ClassType.FullName;
+            typeRow[DbMetaDataColumnNames.IsAutoIncrementable] = false;
+            // The DataType for XML is string, which is not the best match for an XML type.
+            // Similarly, although timestamp/rowversion is represented as a byte array, it's not best
+            // represented as such.
+            typeRow[DbMetaDataColumnNames.IsBestMatch] = sqlDbType is not SqlDbType.Xml and not SqlDbType.Timestamp and not SqlDbTypeExtensions.Json;
+            typeRow[DbMetaDataColumnNames.IsCaseSensitive] = false;
+            typeRow[DbMetaDataColumnNames.IsConcurrencyType] = sqlDbType is SqlDbType.Timestamp;
+            typeRow[DbMetaDataColumnNames.IsFixedLength] = isFixedLength;
+            typeRow[DbMetaDataColumnNames.IsFixedPrecisionScale] = false;
+            typeRow[DbMetaDataColumnNames.IsLong] = isLong;
+            typeRow[DbMetaDataColumnNames.IsNullable] = sqlDbType is not SqlDbType.Timestamp;
+            typeRow[DbMetaDataColumnNames.IsSearchable] = isSearchable;
+            // String types are searchable with LIKE; binary types are not. SQL Server considers XML and JSON a binary type for this purpose.
+            typeRow[DbMetaDataColumnNames.IsSearchableWithLike] =
+                metaType.IsCharType && sqlDbType is not SqlDbType.Xml and not SqlDbTypeExtensions.Json;
+
+            if (literalPrefix is null && literalSuffix is null)
+            {
+                // If no literal prefix or suffix is specified, then literal support is not available.
+                typeRow[DbMetaDataColumnNames.IsLiteralSupported] = false;
+            }
+            else
+            {
+                if (literalPrefix is not null)
+                {
+                    typeRow[DbMetaDataColumnNames.LiteralPrefix] = literalPrefix;
+                }
+                if (literalSuffix is not null)
+                {
+                    typeRow[DbMetaDataColumnNames.LiteralSuffix] = literalSuffix;
+                }
+            }
+
+            if (minimumVersion is not null)
+            {
+                typeRow[MinimumVersionKey] = minimumVersion;
+            }
+
+            dataTypesDataTable.Rows.Add(typeRow);
+        }
+
+        void AddSqlVariantType()
+        {
+            MetaType metaType = MetaType.GetMetaTypeFromSqlDbType(SqlDbType.Variant, isMultiValued: false);
+            DataRow typeRow = dataTypesDataTable.NewRow();
+
+            typeRow[DbMetaDataColumnNames.TypeName] = metaType.TypeName;
+            typeRow[DbMetaDataColumnNames.ProviderDbType] = (int)metaType.SqlDbType;
+            typeRow[DbMetaDataColumnNames.CreateFormat] = metaType.TypeName;
+            typeRow[DbMetaDataColumnNames.DataType] = metaType.ClassType.FullName;
+            typeRow[DbMetaDataColumnNames.IsAutoIncrementable] = false;
+            typeRow[DbMetaDataColumnNames.IsBestMatch] = true;
+            typeRow[DbMetaDataColumnNames.IsCaseSensitive] = false;
+            typeRow[DbMetaDataColumnNames.IsConcurrencyType] = false;
+            typeRow[DbMetaDataColumnNames.IsFixedLength] = false;
+            typeRow[DbMetaDataColumnNames.IsFixedPrecisionScale] = false;
+            typeRow[DbMetaDataColumnNames.IsLong] = false;
+            typeRow[DbMetaDataColumnNames.IsNullable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchableWithLike] = false;
+            typeRow[DbMetaDataColumnNames.IsLiteralSupported] = false;
+
+            dataTypesDataTable.Rows.Add(typeRow);
+        }
+
+        void AddUniqueIdentifierType()
+        {
+            MetaType metaType = MetaType.GetMetaTypeFromSqlDbType(SqlDbType.UniqueIdentifier, isMultiValued: false);
+            DataRow typeRow = dataTypesDataTable.NewRow();
+
+            typeRow[DbMetaDataColumnNames.TypeName] = metaType.TypeName;
+            typeRow[DbMetaDataColumnNames.ProviderDbType] = (int)metaType.SqlDbType;
+            typeRow[DbMetaDataColumnNames.ColumnSize] = metaType.FixedLength;
+            typeRow[DbMetaDataColumnNames.CreateFormat] = metaType.TypeName;
+            typeRow[DbMetaDataColumnNames.DataType] = metaType.ClassType.FullName;
+            typeRow[DbMetaDataColumnNames.IsAutoIncrementable] = false;
+            typeRow[DbMetaDataColumnNames.IsBestMatch] = true;
+            typeRow[DbMetaDataColumnNames.IsCaseSensitive] = false;
+            typeRow[DbMetaDataColumnNames.IsConcurrencyType] = false;
+            typeRow[DbMetaDataColumnNames.IsFixedLength] = true;
+            typeRow[DbMetaDataColumnNames.IsFixedPrecisionScale] = false;
+            typeRow[DbMetaDataColumnNames.IsLong] = false;
+            typeRow[DbMetaDataColumnNames.IsNullable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchable] = true;
+            typeRow[DbMetaDataColumnNames.IsSearchableWithLike] = false;
+            typeRow[DbMetaDataColumnNames.LiteralPrefix] = "'";
+            typeRow[DbMetaDataColumnNames.LiteralSuffix] = "'";
+
+            dataTypesDataTable.Rows.Add(typeRow);
+        }
+    }
+
+    private static DataTable CreateDataTypesDataTable()
+        => new(DbMetaDataCollectionNames.DataTypes)
+        {
+            Columns =
+            {
+                new DataColumn(DbMetaDataColumnNames.TypeName, typeof(string)),
+                new DataColumn(DbMetaDataColumnNames.ProviderDbType, typeof(int)),
+                new DataColumn(DbMetaDataColumnNames.ColumnSize, typeof(long)),
+                new DataColumn(DbMetaDataColumnNames.CreateFormat, typeof(string)),
+                new DataColumn(DbMetaDataColumnNames.CreateParameters, typeof(string)),
+                new DataColumn(DbMetaDataColumnNames.DataType, typeof(string)),
+                new DataColumn(DbMetaDataColumnNames.IsAutoIncrementable, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.IsBestMatch, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.IsCaseSensitive, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.IsFixedLength, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.IsFixedPrecisionScale, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.IsLong, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.IsNullable, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.IsSearchable, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.IsSearchableWithLike, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.IsUnsigned, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.MaximumScale, typeof(short)),
+                new DataColumn(DbMetaDataColumnNames.MinimumScale, typeof(short)),
+                new DataColumn(DbMetaDataColumnNames.IsConcurrencyType, typeof(bool)),
+                new DataColumn(MaximumVersionKey, typeof(string)),
+                new DataColumn(MinimumVersionKey, typeof(string)),
+                new DataColumn(DbMetaDataColumnNames.IsLiteralSupported, typeof(bool)),
+                new DataColumn(DbMetaDataColumnNames.LiteralPrefix, typeof(string)),
+                new DataColumn(DbMetaDataColumnNames.LiteralSuffix, typeof(string))
+            }
+        };
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
index 0c659579e7..1d9ceebafd 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
@@ -17,7 +17,7 @@
 
 namespace Microsoft.Data.SqlClient
 {
-    internal sealed class SqlMetaDataFactory : IDisposable
+    internal sealed partial class SqlMetaDataFactory : IDisposable
     {
         // Well-known column names
         private const string CollectionNameKey = "CollectionName";
@@ -713,6 +713,9 @@ private DataSet LoadDataSetFromXml(Stream XmlStream)
             {
                 Locale = CultureInfo.InvariantCulture
             };
+
+            LoadDataTypesDataTables(metaDataCollectionsDataSet);
+
             XmlReaderSettings settings = new()
             {
                 XmlResolver = null,
@@ -762,9 +765,6 @@ private DataSet LoadDataSetFromXml(Stream XmlStream)
                         dataTable = CreateDataSourceInformationDataTable();
                         rowFixup = FixUpDataSourceInformationRow;
                         break;
-                    case "DataTypesTable":
-                        dataTable = CreateDataTypesDataTable();
-                        break;
                     case "ReservedWordsTable":
                         dataTable = CreateReservedWordsDataTable();
                         break;
@@ -898,38 +898,6 @@ private static DataTable CreateDataSourceInformationDataTable()
                 }
             };
 
-        private static DataTable CreateDataTypesDataTable()
-            => new(DbMetaDataCollectionNames.DataTypes)
-            {
-                Columns =
-                {
-                    new DataColumn(DbMetaDataColumnNames.TypeName, typeof(string)),
-                    new DataColumn(DbMetaDataColumnNames.ProviderDbType, typeof(int)),
-                    new DataColumn(DbMetaDataColumnNames.ColumnSize, typeof(long)),
-                    new DataColumn(DbMetaDataColumnNames.CreateFormat, typeof(string)),
-                    new DataColumn(DbMetaDataColumnNames.CreateParameters, typeof(string)),
-                    new DataColumn(DbMetaDataColumnNames.DataType, typeof(string)),
-                    new DataColumn(DbMetaDataColumnNames.IsAutoIncrementable, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.IsBestMatch, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.IsCaseSensitive, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.IsFixedLength, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.IsFixedPrecisionScale, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.IsLong, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.IsNullable, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.IsSearchable, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.IsSearchableWithLike, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.IsUnsigned, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.MaximumScale, typeof(short)),
-                    new DataColumn(DbMetaDataColumnNames.MinimumScale, typeof(short)),
-                    new DataColumn(DbMetaDataColumnNames.IsConcurrencyType, typeof(bool)),
-                    new DataColumn(MaximumVersionKey, typeof(string)),
-                    new DataColumn(MinimumVersionKey, typeof(string)),
-                    new DataColumn(DbMetaDataColumnNames.IsLiteralSupported, typeof(bool)),
-                    new DataColumn(DbMetaDataColumnNames.LiteralPrefix, typeof(string)),
-                    new DataColumn(DbMetaDataColumnNames.LiteralSuffix, typeof(string))
-                }
-            };
-
         private static DataTable CreateReservedWordsDataTable()
             => new(DbMetaDataCollectionNames.ReservedWords)
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Microsoft.Data.SqlClient.SqlMetaData.xml b/src/Microsoft.Data.SqlClient/src/Resources/Microsoft.Data.SqlClient.SqlMetaData.xml
index 15090edf8e..494e9a9106 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Microsoft.Data.SqlClient.SqlMetaData.xml
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Microsoft.Data.SqlClient.SqlMetaData.xml
@@ -580,695 +580,6 @@
       <SupportedJoinOperators>15</SupportedJoinOperators>
     </DataSourceInformation>
   </DataSourceInformationTable>
-  <DataTypesTable>
-    <DataTypes>
-      <TypeName>smallint</TypeName>
-      <ProviderDbType>16</ProviderDbType>
-      <ColumnSize>5</ColumnSize>
-      <CreateFormat>smallint</CreateFormat>
-      <DataType>System.Int16</DataType>
-      <IsAutoIncrementable>true</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>true</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsUnsigned>false</IsUnsigned>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>int</TypeName>
-      <ProviderDbType>8</ProviderDbType>
-      <ColumnSize>10</ColumnSize>
-      <CreateFormat>int</CreateFormat>
-      <DataType>System.Int32</DataType>
-      <IsAutoIncrementable>true</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>true</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsUnsigned>false</IsUnsigned>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>real</TypeName>
-      <ProviderDbType>13</ProviderDbType>
-      <ColumnSize>7</ColumnSize>
-      <CreateFormat>real</CreateFormat>
-      <DataType>System.Single</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsUnsigned>false</IsUnsigned>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>float</TypeName>
-      <ProviderDbType>6</ProviderDbType>
-      <ColumnSize>53</ColumnSize>
-      <CreateFormat>float({0})</CreateFormat>
-      <CreateParameters>number of bits used to store the mantissa</CreateParameters>
-      <DataType>System.Double</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsUnsigned>false</IsUnsigned>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>money</TypeName>
-      <ProviderDbType>9</ProviderDbType>
-      <ColumnSize>19</ColumnSize>
-      <CreateFormat>money</CreateFormat>
-      <DataType>System.Decimal</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>false</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>true</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsUnsigned>false</IsUnsigned>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>smallmoney</TypeName>
-      <ProviderDbType>17</ProviderDbType>
-      <ColumnSize>10</ColumnSize>
-      <CreateFormat>smallmoney</CreateFormat>
-      <DataType>System.Decimal</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>false</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>true</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsUnsigned>false</IsUnsigned>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>bit</TypeName>
-      <ProviderDbType>2</ProviderDbType>
-      <ColumnSize>1</ColumnSize>
-      <CreateFormat>bit</CreateFormat>
-      <DataType>System.Boolean</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>false</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>tinyint</TypeName>
-      <ProviderDbType>20</ProviderDbType>
-      <ColumnSize>3</ColumnSize>
-      <CreateFormat>tinyint</CreateFormat>
-      <DataType>System.Byte</DataType>
-      <IsAutoIncrementable>true</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>true</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsUnsigned>true</IsUnsigned>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>bigint</TypeName>
-      <ProviderDbType>0</ProviderDbType>
-      <ColumnSize>19</ColumnSize>
-      <CreateFormat>bigint</CreateFormat>
-      <DataType>System.Int64</DataType>
-      <IsAutoIncrementable>true</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>true</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsUnsigned>false</IsUnsigned>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>varbinary</TypeName>
-      <ProviderDbType>21</ProviderDbType>
-      <ColumnSize>8000</ColumnSize>
-      <CreateFormat>varbinary({0})</CreateFormat>
-      <CreateParameters>max length</CreateParameters>
-      <DataType>System.Byte[]</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <MaximumVersion>08.99.999.9</MaximumVersion>
-      <LiteralPrefix>0x</LiteralPrefix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>timestamp</TypeName>
-      <ProviderDbType>19</ProviderDbType>
-      <ColumnSize>8</ColumnSize>
-      <CreateFormat>timestamp</CreateFormat>
-      <DataType>System.Byte[]</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>false</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>true</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>false</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <LiteralPrefix>0x</LiteralPrefix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>binary</TypeName>
-      <ProviderDbType>1</ProviderDbType>
-      <ColumnSize>8000</ColumnSize>
-      <CreateFormat>binary({0})</CreateFormat>
-      <CreateParameters>length</CreateParameters>
-      <DataType>System.Byte[]</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <LiteralPrefix>0x</LiteralPrefix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>image</TypeName>
-      <ProviderDbType>7</ProviderDbType>
-      <ColumnSize>2147483647</ColumnSize>
-      <CreateFormat>image</CreateFormat>
-      <DataType>System.Byte[]</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>true</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>false</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <LiteralPrefix>0x</LiteralPrefix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>char</TypeName>
-      <ProviderDbType>3</ProviderDbType>
-      <ColumnSize>8000</ColumnSize>
-      <CreateFormat>char</CreateFormat>
-      <CreateParameters>length</CreateParameters>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MaximumVersion>08.99.999.9</MaximumVersion>
-      <LiteralPrefix>'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>text</TypeName>
-      <ProviderDbType>18</ProviderDbType>
-      <ColumnSize>2147483647</ColumnSize>
-      <CreateFormat>text</CreateFormat>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>true</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>false</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <LiteralPrefix>'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>varchar</TypeName>
-      <ProviderDbType>22</ProviderDbType>
-      <ColumnSize>8000</ColumnSize>
-      <CreateFormat>varchar({0})</CreateFormat>
-      <CreateParameters>max length</CreateParameters>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MaximumVersion>08.99.999.9</MaximumVersion>
-      <LiteralPrefix>'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>nchar</TypeName>
-      <ProviderDbType>10</ProviderDbType>
-      <ColumnSize>4000</ColumnSize>
-      <CreateFormat>nchar({0})</CreateFormat>
-      <CreateParameters>length</CreateParameters>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MaximumVersion>08.99.999.9</MaximumVersion>
-      <LiteralPrefix>N'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>ntext</TypeName>
-      <ProviderDbType>11</ProviderDbType>
-      <ColumnSize>1073741823</ColumnSize>
-      <CreateFormat>ntext</CreateFormat>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>true</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>false</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <LiteralPrefix>N'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>nvarchar</TypeName>
-      <ProviderDbType>12</ProviderDbType>
-      <ColumnSize>4000</ColumnSize>
-      <CreateFormat>nvarchar({0})</CreateFormat>
-      <CreateParameters>max length</CreateParameters>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MaximumVersion>08.99.999.9</MaximumVersion>
-      <LiteralPrefix>N'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>decimal</TypeName>
-      <ProviderDbType>5</ProviderDbType>
-      <ColumnSize>38</ColumnSize>
-      <CreateFormat>decimal({0}, {1})</CreateFormat>
-      <CreateParameters>precision,scale</CreateParameters>
-      <DataType>System.Decimal</DataType>
-      <IsAutoIncrementable>true</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsUnsigned>false</IsUnsigned>
-      <MaximumScale>38</MaximumScale>
-      <MinimumScale>0</MinimumScale>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>numeric</TypeName>
-      <ProviderDbType>5</ProviderDbType>
-      <ColumnSize>38</ColumnSize>
-      <CreateFormat>numeric({0}, {1})</CreateFormat>
-      <CreateParameters>precision,scale</CreateParameters>
-      <DataType>System.Decimal</DataType>
-      <IsAutoIncrementable>true</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsUnsigned>false</IsUnsigned>
-      <MaximumScale>38</MaximumScale>
-      <MinimumScale>0</MinimumScale>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>datetime</TypeName>
-      <ProviderDbType>4</ProviderDbType>
-      <ColumnSize>23</ColumnSize>
-      <CreateFormat>datetime</CreateFormat>
-      <DataType>System.DateTime</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <LiteralPrefix>{ts '</LiteralPrefix>
-      <LiteralSuffix>'}</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>smalldatetime</TypeName>
-      <ProviderDbType>15</ProviderDbType>
-      <ColumnSize>16</ColumnSize>
-      <CreateFormat>smalldatetime</CreateFormat>
-      <DataType>System.DateTime</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <LiteralPrefix>{ts '</LiteralPrefix>
-      <LiteralSuffix>'}</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>sql_variant</TypeName>
-      <ProviderDbType>23</ProviderDbType>
-      <CreateFormat>sql_variant</CreateFormat>
-      <DataType>System.Object</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <IsLiteralSupported>false</IsLiteralSupported>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>xml</TypeName>
-      <ProviderDbType>25</ProviderDbType>
-      <ColumnSize>2147483647</ColumnSize>
-      <CreateFormat>xml</CreateFormat>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>false</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>true</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>false</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <MinimumVersion>09.00.000.0</MinimumVersion>
-      <IsLiteralSupported>false</IsLiteralSupported>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>varchar</TypeName>
-      <ProviderDbType>22</ProviderDbType>
-      <ColumnSize>2147483647</ColumnSize>
-      <CreateFormat>varchar({0})</CreateFormat>
-      <CreateParameters>max length</CreateParameters>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MinimumVersion>09.00.000.0</MinimumVersion>
-      <LiteralPrefix>'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>char</TypeName>
-      <ProviderDbType>3</ProviderDbType>
-      <ColumnSize>2147483647</ColumnSize>
-      <CreateFormat>char({0})</CreateFormat>
-      <CreateParameters>length</CreateParameters>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MinimumVersion>09.00.000.0</MinimumVersion>
-      <LiteralPrefix>'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>nchar</TypeName>
-      <ProviderDbType>10</ProviderDbType>
-      <ColumnSize>1073741823</ColumnSize>
-      <CreateFormat>nchar({0})</CreateFormat>
-      <CreateParameters>length</CreateParameters>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MinimumVersion>09.00.000.0</MinimumVersion>
-      <LiteralPrefix>N'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>nvarchar</TypeName>
-      <ProviderDbType>12</ProviderDbType>
-      <ColumnSize>1073741823</ColumnSize>
-      <CreateFormat>nvarchar({0})</CreateFormat>
-      <CreateParameters>max length</CreateParameters>
-      <DataType>System.String</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MinimumVersion>09.00.000.0</MinimumVersion>
-      <LiteralPrefix>N'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>varbinary</TypeName>
-      <ProviderDbType>21</ProviderDbType>
-      <ColumnSize>1073741823</ColumnSize>
-      <CreateFormat>varbinary({0})</CreateFormat>
-      <CreateParameters>max length</CreateParameters>
-      <DataType>System.Byte[]</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <MinimumVersion>09.00.000.0</MinimumVersion>
-      <LiteralPrefix>0x</LiteralPrefix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>uniqueidentifier</TypeName>
-      <ProviderDbType>14</ProviderDbType>
-      <ColumnSize>16</ColumnSize>
-      <CreateFormat>uniqueidentifier</CreateFormat>
-      <DataType>System.Guid</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>false</IsSearchableWithLike>
-      <LiteralPrefix>'</LiteralPrefix>
-      <LiteralSuffix>'</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>date</TypeName>
-      <ProviderDbType>31</ProviderDbType>
-      <ColumnSize>3</ColumnSize>
-      <CreateFormat>date</CreateFormat>
-      <DataType>System.DateTime</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>false</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>true</IsFixedLength>
-      <IsFixedPrecisionScale>true</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MinimumVersion>10.00.000.0</MinimumVersion>
-      <LiteralPrefix>{ts '</LiteralPrefix>
-      <LiteralSuffix>'}</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>time</TypeName>
-      <ProviderDbType>32</ProviderDbType>
-      <ColumnSize>5</ColumnSize>
-      <CreateFormat>time({0})</CreateFormat>
-      <CreateParameters>scale</CreateParameters>
-      <DataType>System.TimeSpan</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>false</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MaximumScale>7</MaximumScale>
-      <MinimumScale>0</MinimumScale>
-      <MinimumVersion>10.00.000.0</MinimumVersion>
-      <LiteralPrefix>{ts '</LiteralPrefix>
-      <LiteralSuffix>'}</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>datetime2</TypeName>
-      <ProviderDbType>33</ProviderDbType>
-      <ColumnSize>8</ColumnSize>
-      <CreateFormat>datetime2({0})</CreateFormat>
-      <CreateParameters>scale</CreateParameters>
-      <DataType>System.DateTime</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MaximumScale>7</MaximumScale>
-      <MinimumScale>0</MinimumScale>
-      <MinimumVersion>10.00.000.0</MinimumVersion>
-      <LiteralPrefix>{ts '</LiteralPrefix>
-      <LiteralSuffix>'}</LiteralSuffix>
-    </DataTypes>
-    <DataTypes>
-      <TypeName>datetimeoffset</TypeName>
-      <ProviderDbType>34</ProviderDbType>
-      <ColumnSize>10</ColumnSize>
-      <CreateFormat>datetimeoffset({0})</CreateFormat>
-      <CreateParameters>scale</CreateParameters>
-      <DataType>System.DateTimeOffset</DataType>
-      <IsAutoIncrementable>false</IsAutoIncrementable>
-      <IsBestMatch>true</IsBestMatch>
-      <IsCaseSensitive>false</IsCaseSensitive>
-      <IsConcurrencyType>false</IsConcurrencyType>
-      <IsFixedLength>false</IsFixedLength>
-      <IsFixedPrecisionScale>false</IsFixedPrecisionScale>
-      <IsLong>false</IsLong>
-      <IsNullable>true</IsNullable>
-      <IsSearchable>true</IsSearchable>
-      <IsSearchableWithLike>true</IsSearchableWithLike>
-      <MaximumScale>7</MaximumScale>
-      <MinimumScale>0</MinimumScale>
-      <MinimumVersion>10.00.000.0</MinimumVersion>
-      <LiteralPrefix>{ts '</LiteralPrefix>
-      <LiteralSuffix>'}</LiteralSuffix>
-    </DataTypes>
-  </DataTypesTable>
   <ReservedWordsTable>
     <ReservedWords>
       <ReservedWord>ADD</ReservedWord>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index b66c72774e..1e5458e130 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -94,6 +94,7 @@ public static class DataTestUtility
 
         // SQL Server capabilities
         private static bool? s_isDataClassificationSupported;
+        private static bool? s_isJsonSupported;
         private static bool? s_isVectorSupported;
         private static bool? s_isVectorFloat16Supported;
 
@@ -146,6 +147,17 @@ public static string SQLServerVersion
             s_isDataClassificationSupported ??= IsTCPConnStringSetup() &&
                 IsObjectPresent("SYS.SENSITIVITY_CLASSIFICATIONS");
 
+        /// <summary>
+        /// Determines whether the SQL Server supports the 'json' data type.
+        /// </summary>
+        /// <remarks>
+        /// This method attempts to connect to the SQL Server and check for the existence of the
+        /// 'json' data type.
+        /// </remarks>
+        public static bool IsJsonSupported =>
+            s_isJsonSupported ??= IsTCPConnStringSetup() &&
+                IsTypePresent("json");
+
         /// <summary>
         /// Determines whether the SQL Server supports the 'vector' data type.
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs
index e765f56ce8..028447251c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Common;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -108,36 +109,94 @@ public static async Task GetStructuredTypeMembersFromSchema()
             await VerifySchemaTable(SqlClientMetaDataCollectionNames.StructuredTypeMembers, new string[] { "TYPE_CATALOG", "TYPE_SCHEMA", "TYPE_NAME", "MEMBER_NAME", "ORDINAL_POSITION" });
         }
 
-        private static async Task VerifySchemaTable(string schemaItemName, string[] testColumnNames)
-        {
-            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString)
+        [ConditionalFact(nameof(CanRunSchemaTests))]
+        public static async Task GetDataTypesFromSchema()
+        {
+            (DataTable syncSchemaTable, DataTable asyncSchemaTable) = await VerifySchemaTable(DbMetaDataCollectionNames.DataTypes, [
+                DbMetaDataColumnNames.TypeName,
+                DbMetaDataColumnNames.ProviderDbType,
+                DbMetaDataColumnNames.ColumnSize,
+                DbMetaDataColumnNames.CreateFormat,
+                DbMetaDataColumnNames.CreateParameters,
+                DbMetaDataColumnNames.DataType,
+                DbMetaDataColumnNames.IsAutoIncrementable,
+                DbMetaDataColumnNames.IsBestMatch,
+                DbMetaDataColumnNames.IsCaseSensitive,
+                DbMetaDataColumnNames.IsFixedLength,
+                DbMetaDataColumnNames.IsFixedPrecisionScale,
+                DbMetaDataColumnNames.IsLong,
+                DbMetaDataColumnNames.IsNullable,
+                DbMetaDataColumnNames.IsSearchable,
+                DbMetaDataColumnNames.IsSearchableWithLike,
+                DbMetaDataColumnNames.IsUnsigned,
+                DbMetaDataColumnNames.MaximumScale,
+                DbMetaDataColumnNames.MinimumScale,
+                DbMetaDataColumnNames.IsConcurrencyType,
+                DbMetaDataColumnNames.IsLiteralSupported,
+                DbMetaDataColumnNames.LiteralPrefix,
+                DbMetaDataColumnNames.LiteralSuffix
+            ]);
+
+            VerifyDataTypesTable(syncSchemaTable);
+            VerifyDataTypesTable(asyncSchemaTable);
+        }
+
+        private static async Task<(DataTable SyncSchema, DataTable AsyncSchema)> VerifySchemaTable(string schemaItemName, string[] testColumnNames)
+        {
+            SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString)
             {
                 InitialCatalog = "master"
             };
+            using SqlConnection connection = new(builder.ConnectionString);
+            HashSet<string> syncColumnNames = [];
+            HashSet<string> asyncColumnNames = [];
+
+            // Connect to the database then retrieve the schema information
+            connection.Open();
+
+            DataTable syncTable = connection.GetSchema(schemaItemName);
+            DataTable asyncTable = await connection.GetSchemaAsync(schemaItemName);
+
+            // Get all table columns
+            foreach (DataColumn column in syncTable.Columns)
+            {
+                syncColumnNames.Add(column.ColumnName);
+            }
+            foreach (DataColumn column in asyncTable.Columns)
+            {
+                asyncColumnNames.Add(column.ColumnName);
+            }
+
+            Assert.All(testColumnNames, column => Assert.Contains(column, syncColumnNames));
+            Assert.All(testColumnNames, column => Assert.Contains(column, asyncColumnNames));
+            return (syncTable, asyncTable);
+        }
+
+        private static void VerifyDataTypesTable(DataTable dataTypesTable)
+        {
+            string[] expectedTypes = [
+                "smallint", "int", "real", "float", "money", "smallmoney", "bit", "tinyint", "bigint", "timestamp",
+                "binary", "image", "text", "ntext", "decimal", "numeric", "datetime", "smalldatetime", "sql_variant", "xml",
+                "varchar", "char", "nchar", "nvarchar", "varbinary", "uniqueidentifier", "date", "time", "datetime2", "datetimeoffset"
+            ];
+            HashSet<string> actualTypes = [];
 
-            using (SqlConnection connection = new SqlConnection(builder.ConnectionString))
+            // Get every type name, asserting that it is a unique string.
+            foreach (DataRow row in dataTypesTable.Rows)
             {
-                // Connect to the database then retrieve the schema information
-                connection.Open();
-                DataTable syncTable = connection.GetSchema(schemaItemName);
-                DataTable asyncTable = await connection.GetSchemaAsync(schemaItemName);
-
-                // Get all table columns
-                HashSet<string> syncColumnNames = new HashSet<string>();
-                HashSet<string> asyncColumnNames = new HashSet<string>();
-
-                foreach (DataColumn column in syncTable.Columns)
-                {
-                    syncColumnNames.Add(column.ColumnName);
-                }
-                foreach (DataColumn column in asyncTable.Columns)
-                {
-                    asyncColumnNames.Add(column.ColumnName);
-                }
-
-                Assert.All<string>(testColumnNames, column => Assert.Contains<string>(column, syncColumnNames));
-                Assert.All<string>(testColumnNames, column => Assert.Contains<string>(column, asyncColumnNames));
+                string typeName = row[DbMetaDataColumnNames.TypeName] as string;
+
+                Assert.False(string.IsNullOrEmpty(typeName));
+                Assert.True(actualTypes.Add(typeName));
             }
+
+            // Every expected type should be present. There will often be additional types present - user-defined table types
+            // and CLR types (such as geography and geometry.)
+            Assert.All(expectedTypes, type => Assert.Contains(type, actualTypes));
+
+            // The "json" type should only be present when running against a SQL Server version which supports it.
+            // SQL Azure reports a version of 12.x but supports JSON, so SqlClient doesn't include it in the list of types.
+            Assert.Equal(DataTestUtility.IsJsonSupported && DataTestUtility.IsNotAzureServer(), actualTypes.Contains("json"));
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
index 03c5f794c0..06b76c7ed4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
@@ -269,7 +269,7 @@ private async Task BulkCopyDataAsync(CommandBehavior cb, bool enableStraming, in
             }
         }
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsJsonSupported))]
         [MemberData(
             nameof(JsonBulkCopyTestData)
 #if NETFRAMEWORK
@@ -293,7 +293,7 @@ public void TestJsonBulkCopy(CommandBehavior cb, bool enableStraming, int jsonAr
             }
         }
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsJsonSupported))]
         [MemberData(
             nameof(JsonBulkCopyTestData)
 #if NETFRAMEWORK
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
index cbba92153a..3cb0f1b534 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
@@ -162,7 +162,7 @@ private void DeleteFile(string filename)
             }
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsJsonSupported))]
         public void TestJsonStreaming()
         {
             try
@@ -184,7 +184,7 @@ public void TestJsonStreaming()
             }
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsJsonSupported))]
         public async Task TestJsonStreamingAsync()
         {
             try
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
index 0652251447..2b2fd2c8db 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
@@ -74,7 +74,7 @@ private void ValidateNullJson(SqlDataReader reader)
             }
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public void TestJsonWrite()
         {
             using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
@@ -120,7 +120,7 @@ public void TestJsonWrite()
             ValidateRowsAffected(rowsAffected4);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public async Task TestJsonWriteAsync()
         {
             using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
@@ -165,7 +165,7 @@ public async Task TestJsonWriteAsync()
             ValidateRowsAffected(rowsAffected4);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public void TestJsonRead()
         {
             using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
@@ -205,7 +205,7 @@ public void TestJsonRead()
             ValidateRows(reader2);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public async Task TestJsonReadAsync()
         {
             using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
@@ -245,7 +245,7 @@ public async Task TestJsonReadAsync()
             await ValidateRowsAsync(reader2);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public void TestNullJson()
         {
             using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
@@ -268,7 +268,7 @@ public void TestNullJson()
             ValidateNullJson(reader);
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public void TestJsonAPIs()
         {
             using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
@@ -299,10 +299,11 @@ public void TestJsonAPIs()
             }
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public void TestJsonWithMARS()
         {
-            using SqlConnection connection = new(DataTestUtility.TCPConnectionString + "MultipleActiveResultSets=True;");
+            SqlConnectionStringBuilder csbMarsEnabledTcp = new(DataTestUtility.TCPConnectionString) { MultipleActiveResultSets = true };
+            using SqlConnection connection = new(csbMarsEnabledTcp.ConnectionString);
             connection.Open();
 
             using Table jsonTable1 = new(connection, nameof(TestJsonWithMARS), "(Data json)");
@@ -339,7 +340,7 @@ public void TestJsonWithMARS()
             }
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAzureServer), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsJsonSupported))]
         public void TestJsonSPParams()
         {
             using SqlConnection connection = new(DataTestUtility.TCPConnectionString);

From 0b53d9fc989d3ce10b6548a7ac0b4aaa576cd9c8 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Thu, 14 May 2026 15:05:11 +0530
Subject: [PATCH 102/298] Prepend internal/ to schedule branch filter in
 sqlclient-kerberos pipeline (#4285)

Agent-Logs-Url: https://github.com/dotnet/SqlClient/sessions/05fdb01b-de95-4747-8891-ca640d6bdc46

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: paulmedynski <31868385+paulmedynski@users.noreply.github.com>
---
 eng/pipelines/kerberos/sqlclient-kerberos.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/kerberos/sqlclient-kerberos.yml b/eng/pipelines/kerberos/sqlclient-kerberos.yml
index a480ee8fb7..eb0016f9fc 100644
--- a/eng/pipelines/kerberos/sqlclient-kerberos.yml
+++ b/eng/pipelines/kerberos/sqlclient-kerberos.yml
@@ -10,7 +10,7 @@
 # Daily Kerberos authentication test pipeline for Microsoft.Data.SqlClient.
 # Replaces the Classic "Test-SqlClient-Kerberos-Azure" pipeline.
 #
-# Schedule: daily at 07:00 UTC on main.
+# Schedule: daily at 07:00 UTC on internal/main.
 #
 # Job breakdown (10 total):
 #   Stage: windows           → 7 jobs  (net462 + net8/9/10 × NativeSNI/ManagedSNI)
@@ -42,7 +42,7 @@ schedules:
     displayName: Daily run (07:00 UTC)
     branches:
       include:
-        - main
+        - internal/main
     always: true
 
 name: $(date:yyyyMMdd)$(rev:.r)

From bf9c17d56068523d3ccf84ed55815c5eb0e27980 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 14 May 2026 06:42:14 -0300
Subject: [PATCH 103/298] Add audit-variable-groups prompt for ADO variable
 group lifecycle management (#4181)

---
 .../prompts/audit-variable-groups.prompt.md   | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)
 create mode 100644 .github/prompts/audit-variable-groups.prompt.md

diff --git a/.github/prompts/audit-variable-groups.prompt.md b/.github/prompts/audit-variable-groups.prompt.md
new file mode 100644
index 0000000000..075e12d99a
--- /dev/null
+++ b/.github/prompts/audit-variable-groups.prompt.md
@@ -0,0 +1,164 @@
+---
+name: audit-variable-groups
+description: Audit Azure DevOps variable groups by searching repos/branches for usage and updating descriptions accordingly.
+argument-hint: <optional: specific repos, branches, or variable groups to audit>
+tools: ['execute/runInTerminal', 'execute/getTerminalOutput', 'edit/createFile', 'read/readFile']
+---
+
+Audit Azure DevOps variable groups in the **sqlclientdrivers** organization, **ADO.Net** project. Use the `az` CLI where possible; fall back to direct REST API calls where `az` doesn't provide sufficient coverage (e.g., repo file scanning, AzureKeyVault group updates).
+
+## Safety constraints
+
+- **Read-only by default.** Steps 1–4 are purely read-only (listing, searching, summarizing). Do NOT issue any write operations (`PUT`, `PATCH`, `POST`, `az pipelines variable-group update`, or any command that modifies state) until the user has explicitly approved changes in step 5.
+- **No implicit approval.** Silence, ambiguous replies, or partial acknowledgements do NOT count as approval. You must receive an unambiguous "go" (or equivalent affirmative) from the user before proceeding to step 6.
+- **Scope lock.** Only update variable group descriptions. Never delete variable groups, modify variables within a group, or change any pipeline definitions.
+- **Dry-run first.** When presenting the summary in step 4, show the exact before/after description text for every group that would be modified so the user can verify the changes.
+- **Abort on doubt.** If any step produces unexpected errors, ambiguous results, or data that contradicts expectations, stop and ask the user for guidance rather than proceeding.
+
+## Inputs
+
+If the user provided arguments, parse `${input:scope}` for overrides — it may contain specific repos, branches, or variable group names to scope the audit. Apply any recognized values as overrides to the defaults below; ignore unrecognized tokens.
+
+The user may override any of the following defaults:
+
+- **Organization**: `https://sqlclientdrivers.visualstudio.com`
+- **Project**: `ADO.Net`
+- **Repos & branches to search**:
+  - `dotnet-sqlclient`: `internal/main`, `internal/release/7.0`, `internal/release/6.1`
+  - `Microsoft.Data.SqlClient`: `ConfigFuzz`
+  - `Microsoft.Data.SqlClient.Ctaip`: `certAuth`
+  - `Microsoft.Data.SqlClient.sni`: `master`, `release/6.0`
+- **Unused marker text**: `UNUSED - WILL BE DELETED SHORTLY`
+
+## Workflow
+
+### 1. List all variable groups
+
+```
+az pipelines variable-group list --org <ORG> --project <PROJECT> -o json
+```
+
+- Save the output.
+- Identify which groups are already marked with the unused marker text and which are active.
+- Use **fuzzy matching** when detecting the unused marker: check for the presence of both "unused" and "delete" (case-insensitive) in the description, since the actual marker text may vary (e.g. a person's name inserted before "WILL DELETE").
+- In later steps, ignore the current group description when determining usage to avoid biasing the search results.
+
+### 2. Search repos for variable group references
+
+For each repo/branch combination, use the Azure DevOps REST API (Items endpoint) to:
+
+1. List all files recursively in the repo at the given branch.
+2. Filter to `.yml` and `.yaml` files.
+3. Fetch the content of each YAML file.
+4. Search for each variable group name using **exact-match** patterns that prevent prefix false positives (e.g., searching for `Foo` must not match `FooBar`). Match against these forms, ensuring the name is delimited by quotes or end-of-value (whitespace/newline/comment):
+   - `group: '<name>'`  (single-quoted — name bounded by quotes)
+   - `group: "<name>"`  (double-quoted — name bounded by quotes)
+   - `group: <name>` followed by end-of-line, whitespace, or `#` (unquoted — no trailing alphanumeric characters)
+
+Use a Bearer token from `az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query accessToken -o tsv`.
+
+REST API endpoints:
+- **List items**: `{org}/{project}/_apis/git/repositories/{repo}/items?recursionLevel=Full&versionDescriptor.version={branch}&versionDescriptor.versionType=branch&api-version=7.1`
+- **Get file content**: Same endpoint with `path={URL-encoded filePath}&$format=text` (URL-encode the `path` value; use `$format=text` to retrieve raw file content instead of JSON metadata)
+
+Avoid cloning repos. Only use the REST API to fetch file listings and content.
+
+**Performance & rate-limiting guidance**:
+- Filter the file listing to paths likely to contain pipelines (e.g., `eng/`, `pipelines/`, or root-level YAML files) before fetching content, to reduce API calls.
+- Add a short delay (e.g., 200ms) between file-content fetches to avoid hitting Azure DevOps rate limits.
+- If a `429 Too Many Requests` or `503` response is received, back off exponentially (1s, 2s, 4s, …) and retry up to 3 times before logging a warning and moving on.
+
+### 3. Search Classic pipelines for variable group references
+
+Query all **enabled** Classic build and release pipeline definitions for variable group usage.
+
+#### Classic Build pipelines
+
+```
+GET {org}/{project}/_apis/build/definitions?api-version=7.1
+```
+
+- Page through all results (`$top` / `continuationToken` if needed).
+- Keep only definitions where `queueStatus` is **`enabled`**.
+- For each enabled definition, fetch its full JSON:
+  ```
+  GET {org}/{project}/_apis/build/definitions/{id}?api-version=7.1
+  ```
+- Inspect the `variableGroups` array; each element has an `id` that maps to a variable group ID.
+
+#### Classic Release pipelines
+
+The Release API lives on the `vsrm.` sub-domain, but direct REST calls to that sub-domain may fail with SSL certificate errors for `.visualstudio.com` organizations. Use `az devops invoke` instead:
+
+```
+az devops invoke --area release --resource definitions \
+  --org <ORG> --route-parameters project=<PROJECT> \
+  --query-parameters '$expand=environments' '$top=200' \
+  -o json
+```
+
+- Page through results using `continuation_token` if present in the response.
+- Exclude definitions where `isDeleted` is `true`.
+- Each definition can reference variable groups at two levels:
+  - **Definition level**: `variableGroups` array on the root object.
+  - **Stage/environment level**: each element in `environments` has its own `variableGroups` array.
+- Collect all referenced variable group IDs from both levels.
+
+#### Recording results
+
+For every variable group ID found, record:
+- The pipeline **name** and **type** (Build / Release).
+- The stage name (for release-environment-level references).
+
+Merge these results with the repo/branch search results from step 2 so the summary in the next step covers both YAML and Classic usage.
+
+### 4. Summarize findings
+
+Present a clear summary table to the user **before making any changes**. The summary must include:
+
+- **Used groups**: group name, ID, which repos/branches and/or Classic pipelines reference it, and the proposed new description.
+- **Unused groups**: group name, ID, current description, and confirmation it will be marked with the unused marker.
+- **Surprise findings**: any group already marked unused that is actually still referenced (these should be un-marked).
+- **No-change groups**: groups already marked unused and confirmed unused.
+
+### 5. Prompt for go/no-go
+
+**This is a mandatory gate — do NOT skip or auto-approve.**
+
+Ask the user to confirm before applying any changes and require an explicit selection from the options below (do not infer approval from ambiguous replies). Offer options:
+- **Apply all** — apply every proposed change from step 4
+- **Apply subset** — let the user specify which groups to update (by name or ID)
+- **Export script** — write all update commands to a shell script file for the user to inspect and run manually. Do NOT execute any updates. Save the script to a path the user specifies (default: `./audit-variable-group-updates.sh`). The script must include the full `az` CLI commands and REST API `curl` fallbacks (for AzureKeyVault-type groups) with comments identifying each group by name and ID. Mark the file executable.
+- **Abort** — make no changes at all
+
+Do NOT proceed to step 6 unless the user selects "Apply all" or "Apply subset" and, for the subset case, clearly identifies which groups to update. If the user selects "Export script", generate the file and stop — do NOT execute step 6. If the user says "abort" or does not respond, stop here.
+
+### 6. Apply description updates
+
+**Prerequisites**: Step 5 must have completed with explicit user approval. If you have not received approval, do NOT execute this step.
+
+For each group that needs updating, try:
+
+```
+az pipelines variable-group update --group-id <ID> --description "<new description>" --org <ORG> --project <PROJECT> --detect false
+```
+
+**Fallback for AzureKeyVault-type groups**: The `az pipelines variable-group update` command may fail with 500 errors on groups whose `type` is `AzureKeyVault` (it tries to refresh the vault connection). When this happens, fall back to the REST API:
+
+1. `GET {org}/{project}/_apis/distributedtask/variablegroups/{id}?api-version=7.1`
+2. Update **both** the top-level `description` field **and** every entry in `variableGroupProjectReferences[].description` in the JSON.
+3. `PUT` the modified JSON back to the same URL with `Content-Type: application/json`.
+
+**Description rules**:
+- **Used groups**: Prepend `[Used by: <repo>: <branch1>, <branch2>; <repo2>: <branch>; Classic/<type>: <pipeline name>] ` to the existing description (after stripping any previous `[Used by: ...]` prefix). `<type>` is `Build` or `Release`.
+- **Unused groups**: Set description to the unused marker text.
+- **Incorrectly marked unused**: Replace the unused marker with `[Used by: ...]`.
+- **Already correct**: Skip groups whose description would not change.
+
+Report the outcome of each update (success/failure) and a final tally.
+
+## Error handling
+
+- If a repo or branch does not exist or returns an error, log a warning and continue with the remaining repos/branches.
+- If a variable group update fails, log the error and continue with the remaining updates.
+- At the end, report any failures so the user can address them manually.

From ab5324d9ce62eb974128c13ba56cff008811214a Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Thu, 14 May 2026 19:47:26 +1000
Subject: [PATCH 104/298] avoid Lock acquisition on ErrorCount/WarningCount
 when no errors exist (#4157)

* avoid Lock acquisition on ErrorCount/WarningCount when no errors exist

  1. _hasErrorOrWarning marked volatile (line 278) -- the field was already read without a lock at line 1212, so this  makes the existing pattern and the new fast paths correct across all memory models.
  2. ErrorCount fast path -- returns 0 immediately when _hasErrorOrWarning is false, skipping the lock. Safe because  _hasErrorOrWarning is only set to false under the lock when _errors is also nulled.
  3. WarningCount fast path -- same treatment.

* Update src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update TdsParserStateObject.cs

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../Microsoft/Data/SqlClient/TdsParserStateObject.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
index b7fa5c865b..ad8651cebd 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
@@ -275,7 +275,7 @@ private enum SnapshotStatus
         internal SqlErrorCollection _errors;
         internal SqlErrorCollection _warnings;
         internal object _errorAndWarningsLock = new object();
-        private bool _hasErrorOrWarning;
+        private volatile bool _hasErrorOrWarning;
 
         // local exceptions to cache warnings and errors that occurred prior to sending attention
         internal SqlErrorCollection _preAttentionErrors;
@@ -2672,6 +2672,12 @@ internal int ErrorCount
         {
             get
             {
+                if (!_hasErrorOrWarning &&
+                    Volatile.Read(ref _errors) == null &&
+                    Volatile.Read(ref _warnings) == null)
+                {
+                    return 0;
+                }
                 int count = 0;
                 lock (_errorAndWarningsLock)
                 {
@@ -2713,6 +2719,10 @@ internal int WarningCount
         {
             get
             {
+                if (!_hasErrorOrWarning && _warnings == null)
+                {
+                    return 0;
+                }
                 int count = 0;
                 lock (_errorAndWarningsLock)
                 {

From a561c787b23cd741b6be41a0b680ce2742415665 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 15 May 2026 06:06:32 -0700
Subject: [PATCH 105/298] Tests | Attempt to fix enable file stream failures +
 fix flaky tests (#4220)

Co-authored-by: Copilot <copilot@github.com>
---
 .../steps/configure-sql-server-win-step.yml   | 117 ++++++++++++------
 .../ParameterTest/SqlVariantParameterTests.cs |   1 +
 .../ManualTests/TracingTests/MetricsTest.cs   |   1 +
 .../ConnectionFailoverTests.cs                |   1 +
 4 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
index 50925d00d5..2e58e5013c 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
@@ -62,8 +62,21 @@ parameters:
     type: string
     default: $(LocalDbSharedInstanceName)
 
+# Step execution order:
+#   1. Enable TCP, NP & Firewall   — Enable TCP and Named Pipes protocols, open firewall ports
+#   2. Create SQL user              — Create test login/user, grant sysadmin, enable SA; restarts SQL if needed
+#   3. Enable FileStream [Win]      — (conditional) Enable FileStream via WMI; sp_configure deferred to step 8
+#   4. Create FileStreamFolder      — (conditional) Create the FileStream data directory
+#   5. Setup SQL Alias              — Register TCP aliases in x86/x64 registry paths
+#   6. Add SQL Certificate          — Generate self-signed cert, trust it, bind to SQL Server, grant key access
+#   7. Restart SQL Server           — Restart to pick up protocol, cert, and FileStream WMI changes; wait for readiness
+#   8. Configure FileStream Access  — (conditional) Run sp_configure filestream_access_level after restart
+#   9. Start SQL Server Browser     — Start the Browser service for named-instance discovery
+#  10. Enable LocalDB               — (conditional) Start and share the LocalDB instance
+
 steps:
 
+  # Step 1: Enable TCP, Named Pipes protocols and configure Windows Firewall rules.
   # GOTCHA: We must use the Windows-only powershell task here instead of the cross-platform pwsh
   # task because we call some Windows-specific cmdlets.
   - powershell: |
@@ -108,6 +121,9 @@ steps:
     displayName: 'Enable TCP, NP & Firewall [Win]'
     retryCountOnTaskFailure: 2
 
+  # Step 2: Create test login and user with sysadmin privileges, enable and set the SA password.
+  # If SQL Server is unresponsive (e.g. after protocol changes), this step will restart it once
+  # and retry before failing.
   - powershell: |
       $password = "${{ parameters.saPassword }}"
 
@@ -119,11 +135,19 @@ steps:
 
       Write-Host $machineName
       Import-Module "sqlps"
+
+      # Determine the Windows service name for this SQL instance.
+      $serviceName = "${{parameters.instanceName }}"
+      if ("${{parameters.instanceName }}" -ne "MSSQLSERVER") {
+          $serviceName = "MSSQL`$${{parameters.instanceName }}"
+      }
+
+      $hasRestarted = $false
       $tries = 0
       while ($true) {
           $tries++
           try {
-              Invoke-Sqlcmd -ServerInstance "$machineName" @"
+              Invoke-Sqlcmd -ServerInstance "$machineName" -ConnectionTimeout 5 @"
                   CREATE LOGIN [${{parameters.user }}] WITH PASSWORD=N'$password',
                   DEFAULT_DATABASE=[master], DEFAULT_LANGUAGE=[us_english], CHECK_EXPIRATION=OFF, CHECK_POLICY=OFF;
                   CREATE USER [${{parameters.user }}] FROM LOGIN [${{parameters.user }}];
@@ -133,11 +157,20 @@ steps:
       "@
               break
           } catch {
-              if ($tries -ge 5) {
-                  Write-Host "##[error]Failed to create database user after $tries tries."
-                  break
+              if (-not $hasRestarted -and $tries -ge 5) {
+                  # SQL Server may need a restart after protocol changes (TCP/NP).
+                  Write-Host "Connection failed after $tries attempts. Restarting SQL Server ($serviceName) and retrying..."
+                  Restart-Service -Name $serviceName -Force -ErrorAction Stop
+                  $hasRestarted = $true
+                  $tries = 0
+                  Start-Sleep -Seconds 5
+                  continue
+              }
+              if ($tries -ge 10) {  
+                  Write-Host "##[error]Failed to create database user after $tries tries (including a restart)."
+                  throw
               }
-              Write-Host "Failed to connect to server. Retrying in 5 seconds..."
+              Write-Host "Failed to connect to server (attempt $tries). Retrying in 5 seconds..."
               Start-Sleep -Seconds 5
           }
       }
@@ -146,49 +179,21 @@ steps:
       SQL_USER: ${{parameters.user }}
       SQL_PASSWD: ${{ parameters.saPassword }}
 
+  # Step 3: Enable FileStream at the OS/WMI level (conditional on SQLRootPath being set).
+  # Only the WMI flag is toggled here. The T-SQL sp_configure call happens in step 8,
+  # after the full SQL Server restart in step 7, to avoid needing a double restart.
   - ${{ if ne(parameters.SQLRootPath, '') }}:
     - powershell: |
-        #Enable FileStream
+        #Enable FileStream via WMI.
+        # The sp_configure call is deferred to after the "Restart SQL Server [Win]"
+        # step so we don't need a separate restart here.
         $instance = "${{parameters.instanceName }}"
         $wmi = Get-WmiObject -Namespace "${{parameters.SQLRootPath }}" -Class FilestreamSettings | where {$_.InstanceName -eq $instance}
         $wmi.EnableFilestream(3, $instance)
-
-        $machineName = $env:COMPUTERNAME
-
-        if ("${{parameters.instanceName }}" -ne "MSSQLSERVER"){
-          $machineName += "\${{parameters.instanceName }}"
-        }
-
-        #Change the access level for FileStream for SQLServer
-        Set-ExecutionPolicy Unrestricted
-        Import-Module "sqlps"
-
-        # Retry loop: SQL Server may be temporarily unavailable after enabling FileStream via WMI.
-        # Worst-case budget: 10 attempts x (5s connection timeout + 5s sleep) = ~100s
-        $tries = 0
-        while ($true) {
-            $tries++
-            try {
-                Invoke-Sqlcmd -ServerInstance "$machineName" -ConnectionTimeout 5 @"
-                    EXEC sp_configure filestream_access_level, 2;
-                    RECONFIGURE;
-        "@
-                Write-Host "FileStream access level configured successfully."
-                break
-            } catch {
-                if ($tries -ge 10) {
-                    Write-Host "##[error]Failed to configure FileStream access level after $tries tries."
-                    throw
-                }
-                Write-Host "Failed to connect to SQL Server (attempt $tries/10). Retrying in 5 seconds..."
-                Start-Sleep -Seconds 5
-            }
-        }
+        Write-Host "FileStream enabled via WMI for instance '$instance'."
       displayName: 'Enable FileStream [Win]'
-      env:
-        SQL_USER: ${{parameters.user }}
-        SQL_PASSWD: ${{ parameters.saPassword }}
 
+  # Step 4: Create the FileStream data directory (conditional on fileStreamDirectory being set).
   - ${{ if ne(parameters.FileStreamDirectory, '') }}:
     - powershell: |
         New-Item -Path ${{ parameters.fileStreamDirectory }} -ItemType Directory
@@ -196,6 +201,8 @@ steps:
       retryCountOnTaskFailure: 1
       continueOnError: true
 
+  # Step 5: Register TCP-based SQL Server aliases in both x86 and x64 registry hives
+  # so test connections using the alias name resolve to the correct host and port.
   - powershell: |
       $SQLServerName = ("{0}" -f [System.Net.Dns]::GetHostByName($env:computerName).HostName)
       Write-Host  FQDN is: $SQLServerName
@@ -214,6 +221,9 @@ steps:
       New-ItemProperty -Path ${{parameters.x64AliasRegistryPath }} -Name ${{parameters.SQLAliasName }} -PropertyType string -Value $TCPAliasName
     displayName: 'Setup SQL Alias [Win]'
 
+  # Step 6: Generate a self-signed TLS certificate, add it to the trusted root store,
+  # bind it to all SQL Server instances, and grant the SQL service account read access
+  # to the private key.
   - powershell: |
       # Create Certificate
       $computerDnsName = [System.Net.Dns]::Resolve($null).HostName
@@ -251,6 +261,9 @@ steps:
       }
     displayName: 'Add SQL Certificate [Win]'
 
+  # Step 7: Restart SQL Server to apply all preceding configuration changes (protocols,
+  # certificate, FileStream WMI). Waits for SQL Server to accept connections before
+  # proceeding (up to ~160s).
   - powershell: |
       # You need to restart SQL Server for the change to persist
       # -Force takes care of any dependent services, like SQL Agent.
@@ -295,6 +308,27 @@ steps:
 
     displayName: 'Restart SQL Server [Win]'
 
+  # Step 8: Configure FileStream access level via T-SQL after the restart so we don't
+  # need a separate restart in the "Enable FileStream [Win]" step.
+  - ${{ if ne(parameters.SQLRootPath, '') }}:
+    - powershell: |
+        $machineName = $env:COMPUTERNAME
+        if ("${{parameters.instanceName }}" -ne "MSSQLSERVER") {
+            $machineName += "\${{parameters.instanceName }}"
+        }
+
+        Set-ExecutionPolicy Unrestricted
+        Import-Module "sqlps"
+
+        Invoke-Sqlcmd -ServerInstance "$machineName" -ConnectionTimeout 5 @"
+            EXEC sp_configure filestream_access_level, 2;
+            RECONFIGURE;
+        "@
+        Write-Host "FileStream access level configured successfully."
+      displayName: 'Configure FileStream Access Level [Win]'
+
+  # Step 9: Start the SQL Server Browser service so that named instances can be
+  # discovered by clients.
   - powershell: |
       $arrService = Get-Service -Name "SQLBrowser"
       $arrService
@@ -314,6 +348,7 @@ steps:
       }
     displayName: 'Start Sql Server Browser [Win]'
 
+  # Step 10: Start and share the LocalDB instance (conditional on enableLocalDB).
   - ${{ if parameters.enableLocalDB }}:
     - powershell: |
         #script to enable local db
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
index d6d9791738..5f47576baa 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
@@ -210,6 +210,7 @@ public void SqlType_BulkCopyFromDataTable_RoundTripsCorrectly(object paramValue,
         /// </summary>
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(BulkCopySqlTypeTestData), DisableDiscoveryEnumeration = true)]
+        [Trait("Category", "flaky")]
         public void SqlType_BulkCopyFromDataRow_RoundTripsCorrectly(object paramValue, string expectedTypeName, string expectedBaseTypeName)
         {
             // Arrange
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
index af10a5824e..6f9abd12cb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
@@ -177,6 +177,7 @@ public void StasisCounters_Functional()
             Assert.Equal(0, SqlClientEventSourceProps.StasisConnections);
         }
 
+        [Trait("Category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public void TransactedConnectionPool_VerifyActiveConnectionCounters()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index d3a0bcd07b..33a7d7c600 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -527,6 +527,7 @@ public void TransientFault_WithUserProvidedPartner_RetryDisabled_ShouldFail(uint
         }
 
         [Fact]
+        [Trait("Category", "flaky")]
         public void TransientFault_IgnoreServerProvidedFailoverPartner_ShouldConnectToUserProvidedPartner()
         {
             // Arrange

From 57b65818ca3933a3a6765b5e8ad463441876013f Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Fri, 15 May 2026 18:53:10 +0100
Subject: [PATCH 106/298] Feature | Support SQL Graph column aliases in
 SqlBulkCopy (#3677)

---
 .../Microsoft/Data/SqlClient/SqlBulkCopy.cs   |  93 +++++++++++-
 .../SqlClient/SqlBulkCopyColumnMapping.cs     |   7 +
 .../SQL/SqlBulkCopyTest/CopyAllFromReader.cs  |  12 +-
 .../SQL/SqlBulkCopyTest/SqlGraphTables.cs     | 133 ++++++++++++++++++
 4 files changed, 236 insertions(+), 9 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
index 3ebf10e7fc..414be57eb0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -154,12 +154,17 @@ public SourceColumnMetadata(ValueMethod method, bool isSqlType, bool isDataFeed)
         // Transaction count has only one value in one column and one row
         // MetaData has n columns but no rows
         // Collation has 4 columns and n rows
+        // Column aliases has 3 columns and n rows
 
         private const int MetaDataResultId = 1;
 
         private const int CollationResultId = 2;
         private const int CollationId = 3;
 
+        private const int ColumnAliasesResultId = 3;
+        private const int ColumnCanonicalNameColumnId = 0;
+        private const int ColumnAliasColumnId = 1;
+
         private const int MAX_LENGTH = 0x7FFFFFFF;
 
         private const int DefaultCommandTimeout = 30;
@@ -495,6 +500,15 @@ private string CreateInitialQuery()
             //
             // See: https://learn.microsoft.com/sql/relational-databases/graphs/sql-graph-architecture#syscolumns
             //
+            // Other columns have aliases assigned to them. The SQL Graph columns $node_id, $edge_id,
+            // $to_id and $from_id are actually aliases for columns with different canonical names.
+            // SqlBulkCopy generates these mappings by searching for columns with the below graph_type
+            // values.
+            //
+            //   2 = GRAPH_ID_COMPUTED = $node_id, $edge_id
+            //   5 = GRAPH_FROM_ID_COMPUTED = $from_id
+            //   8 = GRAPH_TO_ID_COMPUTED = $to_id
+            //
             // The column-name query is built as dynamic SQL and executed via sp_executesql so
             // that it is not compiled (and rejected) on SQL Server versions that lack the
             // graph_type column (e.g. SQL 2016).  CatalogName and escapedObjectName are
@@ -522,6 +536,13 @@ private string CreateInitialQuery()
 DECLARE @Column_Name_Query NVARCHAR(MAX);
 DECLARE @Column_Names NVARCHAR(MAX) = NULL;
 
+CREATE TABLE #Column_Aliases
+(
+    [Canonical_Column_Name] SYSNAME,
+    [Canonical_Column_Id] INT,
+    [Aliased_Column_Name] SYSNAME
+)
+
 IF CAST(SERVERPROPERTY('EngineEdition') AS INT) = 6
 BEGIN
     SET @Column_Name_Query_SELECT = N'SELECT @Column_Names = STRING_AGG(CAST(QUOTENAME([name]) AS NVARCHAR(MAX)), '', '') WITHIN GROUP (ORDER BY [column_id] ASC)';
@@ -536,6 +557,17 @@ IF CAST(SERVERPROPERTY('EngineEdition') AS INT) = 6
 IF EXISTS (SELECT TOP 1 * FROM sys.all_columns WHERE [object_id] = OBJECT_ID('sys.all_columns') AND [name] = 'graph_type')
 BEGIN
     SET @Column_Name_Query_FILTER = N'WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) NOT IN (1, 3, 4, 6, 7)';
+
+    EXEC sp_executesql N'
+    INSERT INTO #Column_Aliases ([Canonical_Column_Name], [Canonical_Column_Id], [Aliased_Column_Name])
+        SELECT [name], [column_id], ''$to_id'' FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 8
+    UNION ALL
+        SELECT [name], [column_id], ''$from_id'' FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 5
+    UNION ALL
+        SELECT [name], [column_id], ''$edge_id'' FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 2 AND [name] LIKE ''$edge[_]id[_]%''
+    UNION ALL
+        SELECT [name], [column_id], ''$node_id'' FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 2 AND [name] LIKE ''$node[_]id[_]%''',
+    N'@Object_ID INT', @Object_ID = @Object_ID
 END
 ELSE
 BEGIN
@@ -551,6 +583,13 @@ IF EXISTS (SELECT TOP 1 * FROM sys.all_columns WHERE [object_id] = OBJECT_ID('sy
 SET FMTONLY OFF;
 
 EXEC {CatalogName}..{TableCollationsStoredProc} N'{SchemaName}.{TableName}';
+
+SELECT [Canonical_Column_Name], [Aliased_Column_Name]
+FROM #Column_Aliases
+WHERE [Aliased_Column_Name] NOT IN (SELECT [name] FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID)
+ORDER BY [Canonical_Column_Id] ASC
+
+DROP TABLE #Column_Aliases
 """;
         }
 
@@ -647,9 +686,9 @@ private string AnalyzeTargetAndCreateUpdateBulkCommand(BulkCopySimpleResultSet i
             // Keep track of any result columns that we don't have a local
             // mapping for.
             #if NETFRAMEWORK
-            HashSet<string> unmatchedColumns = new();
+            HashSet<string> unmatchedColumns = new(StringComparer.OrdinalIgnoreCase);
             #else
-            HashSet<string> unmatchedColumns = new(_localColumnMappings.Count);
+            HashSet<string> unmatchedColumns = new(_localColumnMappings.Count, StringComparer.OrdinalIgnoreCase);
             #endif
 
             // Start by assuming all locally mapped Destination columns will be
@@ -659,6 +698,50 @@ private string AnalyzeTargetAndCreateUpdateBulkCommand(BulkCopySimpleResultSet i
                 unmatchedColumns.Add(_localColumnMappings[i].DestinationColumn);
             }
 
+            // Apply any necessary column aliases. If an aliased name exists in the
+            // local column mappings but the canonical name does not, update them.
+            Result columnAliasResults = internalResults[ColumnAliasesResultId];
+            for (int i = 0; i < columnAliasResults.Count; i++)
+            {
+                Row aliasRow = columnAliasResults[i];
+                SqlString canonicalName = (SqlString)aliasRow[ColumnCanonicalNameColumnId];
+                SqlString aliasedName = (SqlString)aliasRow[ColumnAliasColumnId];
+
+                if (canonicalName.IsNull || aliasedName.IsNull)
+                {
+                    continue;
+                }
+
+                string canonical = canonicalName.Value;
+                bool canonicalNameExists = unmatchedColumns.Contains(canonical)
+                    // The destination columns might be escaped. If so, search for those instead
+                    || unmatchedColumns.Contains(SqlServerEscapeHelper.EscapeIdentifier(canonical));
+
+                if (canonicalNameExists)
+                {
+                    continue;
+                }
+
+                // The canonical name does not exist. Look for a local column mapping which matches
+                // the alias (or its escaped variant) and replace its name with its canonical name.
+                string alias = aliasedName.Value;
+                string escapedAlias = SqlServerEscapeHelper.EscapeIdentifier(alias);
+
+                for (int j = 0; j < _localColumnMappings.Count; j++)
+                {
+                    if (unmatchedColumns.Comparer.Equals(_localColumnMappings[j].DestinationColumn, alias)
+                        || unmatchedColumns.Comparer.Equals(_localColumnMappings[j].DestinationColumn, escapedAlias))
+                    {
+                        unmatchedColumns.Remove(_localColumnMappings[j].DestinationColumn);
+
+                        unmatchedColumns.Add(canonical);
+                        _localColumnMappings[j].MappedDestinationColumn = canonical;
+
+                        break;
+                    }
+                }
+            }
+
             // Flag to remember whether or not we need to append a comma before
             // the next column in the command text.
             bool appendComma = false;
@@ -682,7 +765,7 @@ private string AnalyzeTargetAndCreateUpdateBulkCommand(BulkCopySimpleResultSet i
                     // Are we missing a mapping between the result column and
                     // this local column (by ordinal or name)?
                     if (localColumn._destinationColumnOrdinal != metadata.ordinal
-                        && UnquotedName(localColumn._destinationColumnName) != metadata.column)
+                        && UnquotedName(localColumn.MappedDestinationColumn) != metadata.column)
                     {
                         // Yes, so move on to the next local column.
                         continue;
@@ -692,8 +775,8 @@ private string AnalyzeTargetAndCreateUpdateBulkCommand(BulkCopySimpleResultSet i
                     matched = true;
 
                     // Remove it from our unmatched set.
-                    unmatchedColumns.Remove(localColumn.DestinationColumn);
-
+                    unmatchedColumns.Remove(localColumn.MappedDestinationColumn);
+                    
                     // Check for column types that we refuse to bulk load, even
                     // though we found a match.
                     //
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopyColumnMapping.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopyColumnMapping.cs
index 734e0615a7..295fa56d0e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopyColumnMapping.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopyColumnMapping.cs
@@ -19,6 +19,13 @@ public sealed class SqlBulkCopyColumnMapping
         internal int _internalDestinationColumnOrdinal;
         internal int _internalSourceColumnOrdinal;   // -1 indicates an undetermined value
 
+        // Used by SqlBulkCopy to generate the correct column name after mapping alternate names.
+        internal string MappedDestinationColumn
+        {
+            get => field ?? DestinationColumn;
+            set => field = value;
+        }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMapping.xml' path='docs/members[@name="SqlBulkCopyColumnMapping"]/DestinationColumn/*'/>
         public string DestinationColumn
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
index a0ccf69301..7dcb0a8111 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
@@ -40,6 +40,10 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
                         using (DbDataReader reader = srcCmd.ExecuteReader())
                         {
                             IDictionary stats;
+                            long expectedIduCount = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 1 : 0;
+                            long expectedSelectCount = DataTestUtility.IsAzureSynapse ? 4 : 12;
+                            long expectedSelectRows = DataTestUtility.IsAzureSynapse ? 4 : 14;
+                            long expectedTransactions = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 1 : 0;
                             using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                             {
                                 bulkcopy.DestinationTableName = dstTable;
@@ -60,12 +64,12 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
 
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersReceived"], "Unexpected BuffersReceived value.");
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersSent"], "Unexpected BuffersSent value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)0, stats["IduCount"], "Unexpected IduCount value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)11, stats["SelectCount"], "Unexpected SelectCount value.");
+                            DataTestUtility.AssertEqualsWithDescription(expectedIduCount, stats["IduCount"], "Unexpected IduCount value.");
+                            DataTestUtility.AssertEqualsWithDescription(expectedSelectCount, stats["SelectCount"], "Unexpected SelectCount value.");
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["ServerRoundtrips"], "Unexpected ServerRoundtrips value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)14, stats["SelectRows"], "Unexpected SelectRows value.");
+                            DataTestUtility.AssertEqualsWithDescription(expectedSelectRows, stats["SelectRows"], "Unexpected SelectRows value.");
                             DataTestUtility.AssertEqualsWithDescription((long)2, stats["SumResultSets"], "Unexpected SumResultSets value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)0, stats["Transactions"], "Unexpected Transactions value.");
+                            DataTestUtility.AssertEqualsWithDescription(expectedTransactions, stats["Transactions"], "Unexpected Transactions value.");
                         }
                     }
                 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
index 621784bafa..a5b702f6b4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
@@ -35,5 +35,138 @@ public void WriteToServer_CopyToSqlGraphNodeTable_Succeeds()
             nodeCopy.ColumnMappings.Add("Name", "Name");
             nodeCopy.WriteToServer(nodes);
         }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAtLeastSQL2017))]
+        public void WriteToServer_CopyToAliasedColumnName_Succeeds()
+        {
+            string connectionString = DataTestUtility.TCPConnectionString;
+
+            using SqlConnection dstConn = new SqlConnection(connectionString);
+            using DataTable edges = new DataTable()
+            {
+                Columns = { new DataColumn("To_ID", typeof(string)), new DataColumn("From_ID", typeof(string)), new DataColumn("Description", typeof(string)) }
+            };
+
+            dstConn.Open();
+
+            using Table srcNodeTable = new(dstConn, "SqlGraph_NodeByAlias", "(Id INT PRIMARY KEY IDENTITY(1,1), [Name] VARCHAR(100)) AS NODE");
+            using Table dstEdgeTable = new(dstConn, "SqlGraph_EdgeByAlias", "([Description] VARCHAR(100)) AS EDGE");
+
+            string sampleNodeDataCommand = @$"INSERT INTO {srcNodeTable.Name} ([Name]) SELECT LEFT([name], 100) FROM sys.sysobjects";
+            using (SqlCommand insertSampleNodes = new(sampleNodeDataCommand, dstConn))
+            {
+                insertSampleNodes.ExecuteNonQuery();
+            }
+
+            using (SqlCommand nodeQuery = new SqlCommand($"SELECT $node_id FROM {srcNodeTable.Name}", dstConn))
+            using (SqlDataReader reader = nodeQuery.ExecuteReader())
+            {
+                bool firstRead = reader.Read();
+                string toId;
+                string fromId;
+
+                Assert.True(firstRead);
+                toId = reader.GetString(0);
+
+                while (reader.Read())
+                {
+                    fromId = reader.GetString(0);
+
+                    edges.Rows.Add(toId, fromId, "Test Description");
+                    toId = fromId;
+                }
+            }
+
+            using (SqlBulkCopy edgeCopy = new(dstConn))
+            {
+                edgeCopy.DestinationTableName = dstEdgeTable.Name;
+                edgeCopy.ColumnMappings.Add("To_ID", "$to_id");
+                edgeCopy.ColumnMappings.Add("From_ID", "$from_id");
+                edgeCopy.ColumnMappings.Add("Description", "Description");
+
+                edgeCopy.WriteToServer(edges);
+            }
+
+            // Read the values back, comparing to the source DataTable
+            using SqlCommand dstVerificationCommand = new($"SELECT $to_id, $from_id, [Description] FROM {dstEdgeTable.Name} ORDER BY $to_id ASC", dstConn);
+            using SqlDataReader dstVerificationReader = dstVerificationCommand.ExecuteReader();
+            int currentRow = 0;
+            DataRow[] sortedRows = edges.Select(filterExpression: null, sort: "To_ID ASC");
+
+            while (dstVerificationReader.Read())
+            {
+                string toId = dstVerificationReader.GetString(0);
+                string fromId = dstVerificationReader.GetString(1);
+                string description = dstVerificationReader.GetString(2);
+                DataRow currSourceRow = sortedRows[currentRow];
+
+                Assert.Equal(currSourceRow["To_ID"], toId);
+                Assert.Equal(currSourceRow["From_ID"], fromId);
+                Assert.Equal(currSourceRow["Description"], description);
+
+                currentRow++;
+            }
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAtLeastSQL2017))]
+        public void WriteToServer_CopyToTableWithSameNameAsColumnAlias_Succeeds()
+        {
+            string connectionString = DataTestUtility.TCPConnectionString;
+
+            using SqlConnection dstConn = new SqlConnection(connectionString);
+            using DataTable nodes = new DataTable()
+            {
+                Columns = { new DataColumn("Name", typeof(string)) }
+            };
+
+            dstConn.Open();
+
+            for (int i = 0; i < 5; i++)
+            {
+                nodes.Rows.Add($"Name {i}");
+            }
+
+            using Table dstGraphTable = new(dstConn, "SqlGraph_NodeWithAlias", "(Id INT PRIMARY KEY IDENTITY(1,1), [Name] VARCHAR(100), [$node_id] VARCHAR(100)) AS NODE");
+            using Table dstNormalTable = new(dstConn, "NonGraph_NodeWithAlias", "(Id INT PRIMARY KEY IDENTITY(1,1), [Name] VARCHAR(100), [$node_id] VARCHAR(100))");
+
+            using (SqlBulkCopy nodeCopy = new SqlBulkCopy(dstConn))
+            {
+                nodeCopy.DestinationTableName = dstGraphTable.Name;
+                nodeCopy.ColumnMappings.Add("Name", "Name");
+                nodeCopy.ColumnMappings.Add("Name", "$node_id");
+                nodeCopy.WriteToServer(nodes);
+
+                nodeCopy.DestinationTableName = dstNormalTable.Name;
+                nodeCopy.WriteToServer(nodes);
+            }
+
+            // Read the values back, ensuring that we haven't overwritten the $node_id alias with the contents of the [$node_id] column.
+            // SELECTing $node_id will read the SQL Graph's node ID, SELECTing [$node_id] will read the column named $node_id.
+            using (SqlCommand graphVerificationCommand = new SqlCommand($"SELECT Id, $node_id, [$node_id], Name FROM {dstGraphTable.Name}", dstConn))
+            using (SqlDataReader reader = graphVerificationCommand.ExecuteReader())
+            {
+                while (reader.Read())
+                {
+                    string aliasNodeId = reader.GetString(1);
+                    string physicalNodeId = reader.GetString(2);
+                    string name = reader.GetString(3);
+
+                    Assert.NotEqual(physicalNodeId, aliasNodeId);
+                    Assert.Equal(name, physicalNodeId);
+                }
+            }
+
+            using (SqlCommand normalVerificationCommand = new SqlCommand($"SELECT [$node_id], Name FROM {dstNormalTable.Name}", dstConn))
+            using (SqlDataReader reader = normalVerificationCommand.ExecuteReader())
+            {
+                while (reader.Read())
+                {
+                    string physicalNodeId = reader.GetString(0);
+                    string name = reader.GetString(1);
+
+                    Assert.Equal(name, physicalNodeId);
+                }
+            }
+        }
     }
 }

From b37896e1c78da282529a1583bdcd4756af18acd9 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Mon, 18 May 2026 17:14:10 +0100
Subject: [PATCH 107/298] Feature | Use hardcoded LCID mappings when decoding
 strings (#4212)

* Use hardcoded LCID mappings when decoding strings

* Reformat LCID/codepage mapping table, adding LCID descriptions

* Correct debug assertions, remove unused using

* Add unit tests for LocalesHelper
---
 .../Microsoft/Data/SqlClient/LocalesHelper.cs | 210 ++++++++++++++
 .../src/Microsoft/Data/SqlClient/TdsEnums.cs  | 261 ------------------
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |  87 +-----
 .../Data/SqlClient/LocalesHelperTest.cs       | 105 +++++++
 4 files changed, 319 insertions(+), 344 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalesHelper.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalesHelperTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalesHelper.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalesHelper.cs
new file mode 100644
index 0000000000..a0881453d8
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalesHelper.cs
@@ -0,0 +1,210 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient;
+
+internal static class LocalesHelper
+{
+    private const int LocaleMappingCount = 207;
+
+    /// <summary>
+    /// Array copied directly from tdssort.h from luxor.
+    /// Use the sort ID as an index into this array to retrieve the code page.
+    /// If the value is zero, the index is not a valid sort ID.
+    /// </summary>
+    private static ReadOnlySpan<ushort> SortIdToCodePageMappings => [
+        // 0-29: reserved
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        // 30-35
+        437, 437, 437, 437, 437, 437,
+        // 36-39: reserved
+        0, 0, 0, 0,
+        // 40-45
+        850, 850, 850, 850, 850, 850,
+        // 46-48: reserved
+        0, 0, 0,
+        // 49-61
+        850, 1252, 1252, 1252, 1252, 1252, 850, 850, 850, 850, 850, 850, 850,
+        // 62-70: reserved
+        0, 0, 0, 0, 0, 0, 0, 0, 0,
+        // 71-75
+        1252, 1252, 1252, 1252, 1252,
+        // 76-79: reserved
+        0, 0, 0, 0,
+        // 80-98
+        1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250, 1250,
+        // 99-103: reserved
+        0, 0, 0, 0, 0,
+        // 104-108
+        1251, 1251, 1251, 1251, 1251,
+        // 109-111: reserved
+        0, 0, 0,
+        // 112-114
+        1253, 1253, 1253,
+        // 115-119: reserved
+        0, 0, 0, 0, 0,
+        // 120-122
+        1253, 1253, 1253,
+        // 123: reserved
+        0,
+        // 124
+        1253,
+        // 125-127: reserved
+        0, 0, 0,
+        // 128-130
+        1254, 1254, 1254,
+        // 131-135: reserved
+        0, 0, 0, 0, 0,
+        // 136-138
+        1255, 1255, 1255,
+        // 139-143: reserved
+        0, 0, 0, 0, 0,
+        // 144-146
+        1256, 1256, 1256,
+        // 147-151: reserved
+        0, 0, 0, 0, 0,
+        // 152-160
+        1257, 1257, 1257, 1257, 1257, 1257, 1257, 1257, 1257,
+        // 161-182: reserved
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        // 183-186
+        1252, 1252, 1252, 1252,
+        // 187-191: reserved
+        0, 0, 0, 0, 0,
+        // 192-206
+        932, 932, 949, 949, 950, 950, 936, 936, 932, 949, 950, 936, 874, 874, 874,
+        // 207-209: reserved
+        0, 0, 0,
+        // 210-217
+        1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252,
+        // 218-255
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    ];
+
+    /// <summary>
+    /// Maps LCIDs to code pages. Each pair of values in the array represents an LCID and its corresponding code page.
+    /// This means that even indexes in the array are LCIDs, and the following odd index is the code page for that LCID.
+    /// </summary>
+    /// <remarks>
+    /// This is aligned with the mssql-jdbc driver. See the following file for the original data:
+    /// https://github.com/microsoft/mssql-jdbc/blob/23e935b846af5f112f445289e89d54a379e8b8ed/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java#L141-L361
+    /// </remarks>
+    private static ReadOnlySpan<int> LcidToCodePageMappings => [
+        // ar_SA         bg_BG            ca_ES            zh_TW            cs_CZ            da_DK            de_DE            el_GR
+        0x0401, 1256,    0x0402, 1251,    0x0403, 1252,    0x0404, 950,     0x0405, 1250,    0x0406, 1252,    0x0407, 1252,    0x0408, 1253,
+
+        // en_US         es_ES_tradnl     fi_FI            fr_FR            he_IL            hu_HU            is_IS            it_IT
+        0x0409, 1252,    0x040a, 1252,    0x040b, 1252,    0x040c, 1252,    0x040d, 1255,    0x040e, 1250,    0x040f, 1252,    0x0410, 1252,
+
+        // ja_JP         ko_KR            nl_NL            nb_NO            pl_PL            pt_BR            rm_CH            ro_RO
+        0x0411, 932,     0x0412, 949,     0x0413, 1252,    0x0414, 1252,    0x0415, 1250,    0x0416, 1252,    0x0417, 1252,    0x0418, 1250,
+
+        // ru_RU         hr_HR            sk_SK            sq_AL            sv_SE            th_TH            tr_TR            ur_PK
+        0x0419, 1251,    0x041a, 1250,    0x041b, 1250,    0x041c, 1250,    0x041d, 1252,    0x041e, 874,     0x041f, 1254,    0x0420, 1256,
+
+        // id_ID         uk_UA            be_BY            sl_SI            et_EE            lv_LV            lt_LT            tg_Cyrl_TJ
+        0x0421, 1252,    0x0422, 1251,    0x0423, 1251,    0x0424, 1250,    0x0425, 1257,    0x0426, 1257,    0x0427, 1257,    0x0428, 1251,
+
+        // fa_IR         vi_VN            hy_AM            az_Latn_AZ       eu_ES            wen_DE           mk_MK            tn_ZA
+        0x0429, 1256,    0x042a, 1258,    0x042b, 1252,    0x042c, 1254,    0x042d, 1252,    0x042e, 1252,    0x042f, 1251,    0x0432, 1252,
+
+        // xh_ZA         zu_ZA            af_ZA            ka_GE            fo_FO            hi_IN            mt_MT            se_NO
+        0x0434, 1252,    0x0435, 1252,    0x0436, 1252,    0x0437, 1252,    0x0438, 1252,    0x0439, 1200,    0x043a, 1200,    0x043b, 1252,
+
+        // ms_MY         kk_KZ            ky_KG            sw_KE            tk_TM            uz_Latn_UZ       tt_RU            bn_IN
+        0x043e, 1252,    0x043f, 1251,    0x0440, 1251,    0x0441, 1252,    0x0442, 1250,    0x0443, 1254,    0x0444, 1251,    0x0445, 1200,
+
+        // pa_IN         gu_IN            or_IN            ta_IN            te_IN            kn_IN            ml_IN            as_IN
+        0x0446, 1200,    0x0447, 1200,    0x0448, 1200,    0x0449, 1200,    0x044a, 1200,    0x044b, 1200,    0x044c, 1200,    0x044d, 1200,
+
+        // mr_IN         sa_IN            mn_MN            bo_CN            cy_GB            km_KH            lo_LA            gl_ES
+        0x044e, 1200,    0x044f, 1200,    0x0450, 1251,    0x0451, 1200,    0x0452, 1252,    0x0453, 1200,    0x0454, 1200,    0x0456, 1252,
+
+        // kok_IN        syr_SY           si_LK            iu_Cans_CA       am_ET            ne_NP            fy_NL            ps_AF
+        0x0457, 1200,    0x045a, 1200,    0x045b, 1200,    0x045d, 1252,    0x045e, 1252,    0x0461, 1200,    0x0462, 1252,    0x0463, 1200,
+
+        // fil_PH        dv_MV            ha_Latn_NG       yo_NG            quz_BO           nso_ZA           ba_RU            lb_LU
+        0x0464, 1252,    0x0465, 1200,    0x0468, 1252,    0x046a, 1252,    0x046b, 1252,    0x046c, 1252,    0x046d, 1251,    0x046e, 1252,
+
+        // kl_GL         ig_NG            ii_CN            arn_CL           moh_CA           br_FR            ug_CN            mi_NZ
+        0x046f, 1252,    0x0470, 1252,    0x0478, 1252,    0x047a, 1252,    0x047c, 1252,    0x047e, 1252,    0x0480, 1256,    0x0481, 1200,
+
+        // oc_FR         co_FR            gsw_FR           sah_RU           qut_GT           rw_RW            wo_SN            prs_AF
+        0x0482, 1252,    0x0483, 1252,    0x0484, 1252,    0x0485, 1251,    0x0486, 1252,    0x0487, 1252,    0x0488, 1252,    0x048c, 1256,
+
+        // ar_IQ         zh_CN            de_CH            en_GB            es_MX            fr_BE            it_CH            nl_BE
+        0x0801, 1256,    0x0804, 936,     0x0807, 1252,    0x0809, 1252,    0x080a, 1252,    0x080c, 1252,    0x0810, 1252,    0x0813, 1252,
+
+        // nn_NO         pt_PT            sr_Latn_CS       sv_FI            Lithuanian_Classic  az_Cyrl_AZ    dsb_DE           se_SE
+        0x0814, 1252,    0x0816, 1252,    0x081a, 1250,    0x081d, 1252,    0x0827, 1257,    0x082c, 1251,    0x082e, 1252,    0x083b, 1252,
+
+        // ga_IE         ms_BN            uz_Cyrl_UZ       bn_BD            mn_Mong_CN       iu_Latn_CA       tzm_Latn_DZ      quz_EC
+        0x083c, 1252,    0x083e, 1252,    0x0843, 1251,    0x0845, 1200,    0x0850, 1251,    0x085d, 1252,    0x085f, 1252,    0x086b, 1252,
+
+        // ar_EG         zh_HK            de_AT            en_AU            es_ES            fr_CA            sr_Cyrl_CS       se_FI
+        0x0c01, 1256,    0x0c04, 950,     0x0c07, 1252,    0x0c09, 1252,    0x0c0a, 1252,    0x0c0c, 1252,    0x0c1a, 1251,    0x0c3b, 1252,
+
+        // quz_PE        ar_LY            zh_SG            de_LU            en_CA            es_GT            fr_CH            hr_BA
+        0x0c6b, 1252,    0x1001, 1256,    0x1004, 936,     0x1007, 1252,    0x1009, 1252,    0x100a, 1252,    0x100c, 1252,    0x101a, 1250,
+
+        // smj_NO        ar_DZ            zh_MO            de_LI            en_NZ            es_CR            fr_LU            bs_Latn_BA
+        0x103b, 1252,    0x1401, 1256,    0x1404, 950,     0x1407, 1252,    0x1409, 1252,    0x140a, 1252,    0x140c, 1252,    0x141a, 1250,
+
+        // smj_SE        ar_MA            en_IE            es_PA            fr_MC            sr_Latn_BA       sma_NO           ar_TN
+        0x143b, 1252,    0x1801, 1256,    0x1809, 1252,    0x180a, 1252,    0x180c, 1252,    0x181a, 1250,    0x183b, 1252,    0x1c01, 1256,
+
+        // en_ZA         es_DO            sr_Cyrl_BA       sma_SB           ar_OM            en_JM            es_VE            bs_Cyrl_BA
+        0x1c09, 1252,    0x1c0a, 1252,    0x1c1a, 1251,    0x1c3b, 1252,    0x2001, 1256,    0x2009, 1252,    0x200a, 1252,    0x201a, 1251,
+
+        // sms_FI        ar_YE            en_CB            es_CO            smn_FI           ar_SY            en_BZ            es_PE
+        0x203b, 1252,    0x2401, 1256,    0x2409, 1252,    0x240a, 1252,    0x243b, 1252,    0x2801, 1256,    0x2809, 1252,    0x280a, 1252,
+
+        // ar_JO         en_TT            es_AR            ar_LB            en_ZW            es_EC            ar_KW            en_PH
+        0x2c01, 1256,    0x2c09, 1252,    0x2c0a, 1252,    0x3001, 1256,    0x3009, 1252,    0x300a, 1252,    0x3401, 1256,    0x3409, 1252,
+
+        // es_CL         ar_AE            es_UY            ar_BH            es_PY            ar_QA            en_IN            es_BO
+        0x340a, 1252,    0x3801, 1256,    0x380a, 1252,    0x3c01, 1256,    0x3c0a, 1252,    0x4001, 1256,    0x4009, 1252,    0x400a, 1252,
+
+        // en_MY         es_SV            en_SG            es_HN            es_NI            es_PR            es_US
+        0x4409, 1252,    0x440a, 1252,    0x4809, 1252,    0x480a, 1252,    0x4c0a, 1252,    0x500a, 1252,    0x540a, 1252,
+    ];
+
+    public static bool TryGetCodePage(int lcid, int sortId, out int codePage)
+    {
+        if (sortId != 0)
+        {
+            codePage = (uint)sortId < SortIdToCodePageMappings.Length
+                ? SortIdToCodePageMappings[sortId]
+                : 0;
+        }
+        else
+        {
+            codePage = GetCodePageByLcid(lcid & 0xFFFF);
+        }
+        return codePage != 0;
+    }
+
+    private static int GetCodePageByLcid(int lcid)
+    {
+        Debug.Assert(LcidToCodePageMappings.Length == LocaleMappingCount * 2);
+
+        ReadOnlySpan<int> lcidMappings = LcidToCodePageMappings;
+        int mappingIndex = lcidMappings.IndexOf(lcid);
+
+        // If LCID is not found, or if it's found at an odd index (which would be a code page, not an LCID), return zero
+        // to indicate that the code page could not be found.
+        // Also include an explicit bounds check to ensure that the method doesn't contain any exception paths.
+        if (mappingIndex == -1 || (mappingIndex % 2) != 0 || ((uint)mappingIndex + 1) >= lcidMappings.Length)
+        {
+            return 0;
+        }
+
+        return lcidMappings[mappingIndex + 1];
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
index cf8f4b3893..25a489d91d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
@@ -630,267 +630,6 @@ public enum ActiveDirectoryWorkflow : byte
         internal const ushort MAXLEN_ATTACHDBFILE = 260; // the filename for a database that is to be attached during the connection process
         internal const ushort MAXLEN_NEWPASSWORD = 128; // new password for the specified login.
 
-
-        // array copied directly from tdssort.h from luxor
-        public static readonly ushort[] CODE_PAGE_FROM_SORT_ID = {
-            0,      /*   0 */
-            0,      /*   1 */
-            0,      /*   2 */
-            0,      /*   3 */
-            0,      /*   4 */
-            0,      /*   5 */
-            0,      /*   6 */
-            0,      /*   7 */
-            0,      /*   8 */
-            0,      /*   9 */
-            0,      /*  10 */
-            0,      /*  11 */
-            0,      /*  12 */
-            0,      /*  13 */
-            0,      /*  14 */
-            0,      /*  15 */
-            0,      /*  16 */
-            0,      /*  17 */
-            0,      /*  18 */
-            0,      /*  19 */
-            0,      /*  20 */
-            0,      /*  21 */
-            0,      /*  22 */
-            0,      /*  23 */
-            0,      /*  24 */
-            0,      /*  25 */
-            0,      /*  26 */
-            0,      /*  27 */
-            0,      /*  28 */
-            0,      /*  29 */
-            437,    /*  30 */
-            437,    /*  31 */
-            437,    /*  32 */
-            437,    /*  33 */
-            437,    /*  34 */
-            0,      /*  35 */
-            0,      /*  36 */
-            0,      /*  37 */
-            0,      /*  38 */
-            0,      /*  39 */
-            850,    /*  40 */
-            850,    /*  41 */
-            850,    /*  42 */
-            850,    /*  43 */
-            850,    /*  44 */
-            0,      /*  45 */
-            0,      /*  46 */
-            0,      /*  47 */
-            0,      /*  48 */
-            850,    /*  49 */
-            1252,   /*  50 */
-            1252,   /*  51 */
-            1252,   /*  52 */
-            1252,   /*  53 */
-            1252,   /*  54 */
-            850,    /*  55 */
-            850,    /*  56 */
-            850,    /*  57 */
-            850,    /*  58 */
-            850,    /*  59 */
-            850,    /*  60 */
-            850,    /*  61 */
-            0,      /*  62 */
-            0,      /*  63 */
-            0,      /*  64 */
-            0,      /*  65 */
-            0,      /*  66 */
-            0,      /*  67 */
-            0,      /*  68 */
-            0,      /*  69 */
-            0,      /*  70 */
-            1252,   /*  71 */
-            1252,   /*  72 */
-            1252,   /*  73 */
-            1252,   /*  74 */
-            1252,   /*  75 */
-            0,      /*  76 */
-            0,      /*  77 */
-            0,      /*  78 */
-            0,      /*  79 */
-            1250,   /*  80 */
-            1250,   /*  81 */
-            1250,   /*  82 */
-            1250,   /*  83 */
-            1250,   /*  84 */
-            1250,   /*  85 */
-            1250,   /*  86 */
-            1250,   /*  87 */
-            1250,   /*  88 */
-            1250,   /*  89 */
-            1250,   /*  90 */
-            1250,   /*  91 */
-            1250,   /*  92 */
-            1250,   /*  93 */
-            1250,   /*  94 */
-            1250,   /*  95 */
-            1250,   /*  96 */
-            1250,   /*  97 */
-            1250,   /*  98 */
-            0,      /*  99 */
-            0,      /* 100 */
-            0,      /* 101 */
-            0,      /* 102 */
-            0,      /* 103 */
-            1251,   /* 104 */
-            1251,   /* 105 */
-            1251,   /* 106 */
-            1251,   /* 107 */
-            1251,   /* 108 */
-            0,      /* 109 */
-            0,      /* 110 */
-            0,      /* 111 */
-            1253,   /* 112 */
-            1253,   /* 113 */
-            1253,   /* 114 */
-            0,      /* 115 */
-            0,      /* 116 */
-            0,      /* 117 */
-            0,      /* 118 */
-            0,      /* 119 */
-            1253,   /* 120 */
-            1253,   /* 121 */
-            1253,   /* 122 */
-            0,      /* 123 */
-            1253,   /* 124 */
-            0,      /* 125 */
-            0,      /* 126 */
-            0,      /* 127 */
-            1254,   /* 128 */
-            1254,   /* 129 */
-            1254,   /* 130 */
-            0,      /* 131 */
-            0,      /* 132 */
-            0,      /* 133 */
-            0,      /* 134 */
-            0,      /* 135 */
-            1255,   /* 136 */
-            1255,   /* 137 */
-            1255,   /* 138 */
-            0,      /* 139 */
-            0,      /* 140 */
-            0,      /* 141 */
-            0,      /* 142 */
-            0,      /* 143 */
-            1256,   /* 144 */
-            1256,   /* 145 */
-            1256,   /* 146 */
-            0,      /* 147 */
-            0,      /* 148 */
-            0,      /* 149 */
-            0,      /* 150 */
-            0,      /* 151 */
-            1257,   /* 152 */
-            1257,   /* 153 */
-            1257,   /* 154 */
-            1257,   /* 155 */
-            1257,   /* 156 */
-            1257,   /* 157 */
-            1257,   /* 158 */
-            1257,   /* 159 */
-            1257,   /* 160 */
-            0,      /* 161 */
-            0,      /* 162 */
-            0,      /* 163 */
-            0,      /* 164 */
-            0,      /* 165 */
-            0,      /* 166 */
-            0,      /* 167 */
-            0,      /* 168 */
-            0,      /* 169 */
-            0,      /* 170 */
-            0,      /* 171 */
-            0,      /* 172 */
-            0,      /* 173 */
-            0,      /* 174 */
-            0,      /* 175 */
-            0,      /* 176 */
-            0,      /* 177 */
-            0,      /* 178 */
-            0,      /* 179 */
-            0,      /* 180 */
-            0,      /* 181 */
-            0,      /* 182 */
-            1252,   /* 183 */
-            1252,   /* 184 */
-            1252,   /* 185 */
-            1252,   /* 186 */
-            0,      /* 187 */
-            0,      /* 188 */
-            0,      /* 189 */
-            0,      /* 190 */
-            0,      /* 191 */
-            932,    /* 192 */
-            932,    /* 193 */
-            949,    /* 194 */
-            949,    /* 195 */
-            950,    /* 196 */
-            950,    /* 197 */
-            936,    /* 198 */
-            936,    /* 199 */
-            932,    /* 200 */
-            949,    /* 201 */
-            950,    /* 202 */
-            936,    /* 203 */
-            874,    /* 204 */
-            874,    /* 205 */
-            874,    /* 206 */
-            0,      /* 207 */
-            0,      /* 208 */
-            0,      /* 209 */
-            1252,   /* 210 */
-            1252,   /* 211 */
-            1252,   /* 212 */
-            1252,   /* 213 */
-            1252,   /* 214 */
-            1252,   /* 215 */
-            1252,   /* 216 */
-            1252,   /* 217 */
-            0,      /* 218 */
-            0,      /* 219 */
-            0,      /* 220 */
-            0,      /* 221 */
-            0,      /* 222 */
-            0,      /* 223 */
-            0,      /* 224 */
-            0,      /* 225 */
-            0,      /* 226 */
-            0,      /* 227 */
-            0,      /* 228 */
-            0,      /* 229 */
-            0,      /* 230 */
-            0,      /* 231 */
-            0,      /* 232 */
-            0,      /* 233 */
-            0,      /* 234 */
-            0,      /* 235 */
-            0,      /* 236 */
-            0,      /* 237 */
-            0,      /* 238 */
-            0,      /* 239 */
-            0,      /* 240 */
-            0,      /* 241 */
-            0,      /* 242 */
-            0,      /* 243 */
-            0,      /* 244 */
-            0,      /* 245 */
-            0,      /* 246 */
-            0,      /* 247 */
-            0,      /* 248 */
-            0,      /* 249 */
-            0,      /* 250 */
-            0,      /* 251 */
-            0,      /* 252 */
-            0,      /* 253 */
-            0,      /* 254 */
-            0,      /* 255 */
-        };
-
 #if NETFRAMEWORK
         internal enum UDTFormatType
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 53b89fbc90..8bfedc3539 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -5103,93 +5103,14 @@ private void WriteCollation(SqlCollation collation, TdsParserStateObject stateOb
 
         internal int GetCodePage(SqlCollation collation, TdsParserStateObject stateObj)
         {
-            int codePage = 0;
+            bool success = LocalesHelper.TryGetCodePage(collation.LCID, collation._sortId, out int codePage);
 
-            if (0 != collation._sortId)
+            if (!success)
             {
-                codePage = TdsEnums.CODE_PAGE_FROM_SORT_ID[collation._sortId];
-                Debug.Assert(0 != codePage, "GetCodePage accessed codepage array and produced 0!, sortID =" + ((Byte)(collation._sortId)).ToString((IFormatProvider)null));
+                ThrowUnsupportedCollationEncountered(stateObj);
             }
-            else
-            {
-                int cultureId = collation.LCID;
-                bool success = false;
-
-                try
-                {
-                    codePage = CultureInfo.GetCultureInfo(cultureId).TextInfo.ANSICodePage;
-
-                    // SqlHot 50001398: CodePage can be zero, but we should defer such errors until
-                    //  we actually MUST use the code page (i.e. don't error if no ANSI data is sent).
-                    success = true;
-                }
-                catch (ArgumentException e)
-                {
-                    ADP.TraceExceptionWithoutRethrow(e);
-                }
-
-                // If we failed, it is quite possible this is because certain culture id's
-                // were removed in Win2k and beyond, however Sql Server still supports them.
-                // In this case we will mask off the sort id (the leading 1). If that fails,
-                // or we have a culture id other than the cases below, we throw an error and
-                // throw away the rest of the results. For additional info, see MDAC 65963.
 
-                // SqlHot 50001398: Sometimes GetCultureInfo will return CodePage 0 instead of throwing.
-                // This should be treated as an error and functionality switches into the following logic.
-                if (!success || codePage == 0)
-                {
-                    switch (cultureId)
-                    {
-                        case 0x10404: // zh-TW
-                        case 0x10804: // zh-CN
-                        case 0x10c04: // zh-HK
-                        case 0x11004: // zh-SG
-                        case 0x11404: // zh-MO
-                        case 0x10411: // ja-JP
-                        case 0x10412: // ko-KR
-                            // If one of the following special cases, mask out sortId and
-                            // retry.
-                            cultureId = cultureId & 0x03fff;
-
-                            try
-                            {
-                                codePage = new CultureInfo(cultureId).TextInfo.ANSICodePage;
-                                success = true;
-                            }
-                            catch (ArgumentException e)
-                            {
-                                ADP.TraceExceptionWithoutRethrow(e);
-                            }
-                            break;
-                        case 0x827:     // Mapping Non-supported Lithuanian code page to supported Lithuanian.
-                            try
-                            {
-                                codePage = new CultureInfo(0x427).TextInfo.ANSICodePage;
-                                success = true;
-                            }
-                            catch (ArgumentException e)
-                            {
-                                ADP.TraceExceptionWithoutRethrow(e);
-                            }
-                            break;
-                        case 0x43f:
-                            codePage = 1251;  // Kazakh code page based on SQL Server
-                            break;
-                        case 0x10437:
-                            codePage = 1252;  // Georgian code page based on SQL Server
-                            break;
-                        default:
-                            break;
-                    }
-
-                    if (!success)
-                    {
-                        ThrowUnsupportedCollationEncountered(stateObj);
-                    }
-
-                    Debug.Assert(codePage >= 0, $"Invalid code page. codePage: {codePage}. cultureId: {cultureId}");
-                }
-            }
+            Debug.Assert(codePage != 0, $"Invalid code page. codePage: {codePage}. cultureId: {collation.LCID}");
 
             return codePage;
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalesHelperTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalesHelperTest.cs
new file mode 100644
index 0000000000..0c79ebc92f
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalesHelperTest.cs
@@ -0,0 +1,105 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests;
+
+/// <summary>
+/// Provides unit tests which validate the behaviour of LocalesHelper.
+/// </summary>
+public class LocalesHelperTest
+{
+    /// <summary>
+    /// Verifies that a sort ID which would be out of the array's range is provided,
+    /// the method returns false rather than throwing an IndexOutOfRangeException.
+    /// </summary>
+    /// <param name="sortId">The sort ID.</param>
+    [Theory]
+    [InlineData(int.MinValue)]
+    [InlineData(-1)]
+    [InlineData(256)]
+    [InlineData(int.MaxValue)]
+    public void OutOfRangeSortId_ReturnsFalse(int sortId) =>
+        AssertFailingLookup(lcid: 0, sortId);
+
+    /// <summary>
+    /// Verifies that if an invalid sort ID is provided, the method returns false.
+    /// </summary>
+    [Fact]
+    public void InvalidSortId_ReturnsFalse() =>
+        AssertFailingLookup(lcid: 0, sortId: 37);
+
+    /// <summary>
+    /// Verifies that if a valid sort ID which is known to map to code page 437 is
+    /// provided, a code page is returned.
+    /// </summary>
+    [Fact]
+    public void ValidSortId_ReturnsCodePage() =>
+        AssertSuccessfulLookup(lcid: 0, sortId: 30, expectedCodePage: 437);
+
+    /// <summary>
+    /// Verifies that if both a valid sort ID and a valid LCID are provided, the
+    /// code page associated with the sort ID takes priority.
+    /// </summary>
+    [Fact]
+    public void ValidSortIdCodePage_PrioritisedOverLcidCodePage()
+    {
+        bool sortIdCodePageRetrieved = LocalesHelper.TryGetCodePage(lcid: 0, sortId: 30, out int sortIdCodePage);
+        bool lcidCodePageRetrieved = LocalesHelper.TryGetCodePage(lcid: 0x0409, sortId: 0, out int lcidCodePage);
+        bool lcidAndSortIdCodePageRetrieved = LocalesHelper.TryGetCodePage(lcid: 0x0409, sortId: 30, out int sortIdAndLcidCodePage);
+
+        Assert.True(sortIdCodePageRetrieved);
+        Assert.True(lcidCodePageRetrieved);
+        Assert.True(lcidAndSortIdCodePageRetrieved);
+
+        Assert.Equal(437, sortIdCodePage);
+        Assert.Equal(1252, lcidCodePage);
+
+        Assert.Equal(437, sortIdAndLcidCodePage);
+    }
+
+    /// <summary>
+    /// Verifies that if an invalid LCID is provided, the method returns false.
+    /// </summary>
+    [Fact]
+    public void MissingLcid_ReturnsFalse() =>
+        AssertFailingLookup(lcid: 0xFFFF, sortId: 0);
+
+    /// <summary>
+    /// Verifies that if a valid LCID which is known to map to code page 1252 is provided,
+    /// this code page is provided.
+    /// </summary>
+    /// <param name="lcid">The LCID which maps to code page 1252</param>
+    [Theory]
+    // en_US
+    [InlineData(0x0409)]
+    // en_US, but with other bits in the collation identifier set.
+    [InlineData(0x0001_0409)]
+    public void ValidLcid_ReturnsCodePage(int lcid) =>
+        AssertSuccessfulLookup(lcid, sortId: 0, expectedCodePage: 1252);
+
+    /// <summary>
+    /// Verifies that if an invalid LCID which overlaps with a code page ID is provided,
+    /// the method returns false.
+    /// </summary>
+    [Fact]
+    public void InvalidLcidOverlappingCodePageId_ReturnsFalse() =>
+        AssertFailingLookup(lcid: 1200, sortId: 0);
+
+    private static void AssertFailingLookup(int lcid, int sortId)
+    {
+        bool codePageRetrieved = LocalesHelper.TryGetCodePage(lcid, sortId, out _);
+
+        Assert.False(codePageRetrieved);
+    }
+
+    private static void AssertSuccessfulLookup(int lcid, int sortId, int expectedCodePage)
+    {
+        bool codePageRetrieved = LocalesHelper.TryGetCodePage(lcid, sortId, out int codePage);
+
+        Assert.True(codePageRetrieved);
+        Assert.Equal(expectedCodePage, codePage);
+    }
+}

From 58d784eff74282096d1122bfff7d656ecf1d0015 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Mon, 18 May 2026 21:15:46 +0100
Subject: [PATCH 108/298] Tests | Flakiness improvements to XEventsTracingTest
 (#4262)

* Flakiness improvements to XEventsTracingTest

* Refactor one test method into three distinct test cases.
* Add reasons for the tests being marked as flaky.
* Switch call to 'sp_help' to a new, simpler SP.
* Switch execution of 'SELECT @@VERSION' to a simpler 'SELECT 1' statement.
* Use new FlushResultSet helper.
* Simplify XEvent session name generation.
* Add test case to verify that an activity ID is recorded in the extended event when the SQL statement throws an error.

* Cut MAX_MEMORY on XEvents session to 4MB

* Add explanatory comment to MAX_MEMORY

* Update comments and remove Flaky trait
---
 .../ManualTests/DataCommon/XEventScope.cs     |  5 +-
 .../TracingTests/XEventsTracingTest.cs        | 94 +++++++++++++++----
 2 files changed, 78 insertions(+), 21 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/XEventScope.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/XEventScope.cs
index 906efdce8e..ab89a97b10 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/XEventScope.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/XEventScope.cs
@@ -94,13 +94,16 @@ public XEventScope(
                 ? $"MAX_DURATION={_durationInMinutes} MINUTES,"
                 : string.Empty;
 
+            // MAX_MEMORY = 4 MB is a compromise which is designed to allow extended events to be recorded,
+            // while also preventing a large number of simultaneous sessions from consuming all of the 128 MB
+            // memory which Azure SQL allocates to extended events sessions.
             string xEventCreateAndStartCommandText =
                 $"CREATE EVENT SESSION [{SessionName}] ON {sessionLocation}" +
                 $"  {eventSpecification} " +
                 $"  {targetSpecification} " +
                 $"WITH (" +
                 $"  {duration} " +
-                $"  MAX_MEMORY=16 MB," +
+                $"  MAX_MEMORY=4 MB," +
                 $"  EVENT_RETENTION_MODE=ALLOW_SINGLE_EVENT_LOSS, " +
                 $"  MAX_DISPATCH_LATENCY={MaxDispatchLatencySeconds} SECONDS, " +
                 $"  MAX_EVENT_SIZE=0 KB, " +
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs
index c97435b427..b03fc8b224 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs
@@ -1,11 +1,14 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Xml;
 using System.Xml.XPath;
+using Microsoft.Data.SqlClient.Tests.Common;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -89,23 +92,63 @@ public class XEventCleanerCollection : ICollectionFixture<XEventCleaner>
     {
     }
 
+    /// <summary>
+    /// These tests validate that activity IDs are properly transferred to the server and recorded in XEvent sessions,
+    /// even in error scenarios. This is important to ensure that customers can rely on activity IDs being present in
+    /// XEvent sessions for troubleshooting and correlation purposes.
+    /// </summary>
     [Collection("XEventCleaner")]
     public class XEventsTracingTest
     {
-        private readonly string _testName;
-
-        public XEventsTracingTest(ITestOutputHelper outputHelper)
+        private const int CustomErrorNumber = 50001;
+
+        /// <summary>
+        /// Verifies that the attach_activity_id_xfer in the 'rpc_starting' extended event is consistent with the tracing
+        /// context when executing a stored procedure.
+        /// </summary>
+        /// <remarks>
+        /// This test has historically been marked as flaky following occasional failures due to deadlocks on the remote
+        /// SQL Server instance. This first became apparent when running 'sp_help' on an Azure SQL instance under load.
+        /// This appears to have been resolved by switching to a temporary stored procedure which consists of a simple
+        /// 'SELECT 1' statement.
+        /// </remarks>
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        public void XEventActivityIDConsistentWithTracing_RpcStarting()
         {
-            _testName = DataTestUtility.CurrentTestName(outputHelper);
+            using SqlConnection managementConnection = new(DataTestUtility.TCPConnectionString);
+            using StoredProcedure sp = new(managementConnection, nameof(XEventActivityIDConsistentWithTracing_RpcStarting), " AS SELECT 1 AS [Field1];");
+
+            // Our stored procedure name is an escaped SQL Server object name. This will not match the object_name data
+            // in the XEvent XML, which records it as an unescaped name.
+            string unescapedProcedureName = sp.Name.Substring(1, sp.Name.Length - 2).Replace("]]", "]");
+
+            VerifyXEventActivityIDConsistentWithTracing(unescapedProcedureName, System.Data.CommandType.StoredProcedure, "rpc_starting");
         }
 
-        [Trait("Category", "flaky")]
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
-        [InlineData("SELECT @@VERSION", System.Data.CommandType.Text, "sql_statement_starting")]
-        [InlineData("sp_help", System.Data.CommandType.StoredProcedure, "rpc_starting")]
-        public void XEventActivityIDConsistentWithTracing(string query, System.Data.CommandType commandType, string xEvent)
+        /// <summary>
+        /// Verifies that the attach_activity_id_xfer in the 'sql_statement_starting' extended event is consistent with the tracing
+        /// context when executing a SQL statement which is not a stored procedure.
+        /// </summary>
+        /// <remarks>
+        /// This test has historically been marked as flaky following occasional failures due to deadlocks on the remote
+        /// SQL Server instance. This first became apparent when running 'SELECT @@VERSION' on an Azure SQL instance under load.
+        /// This appears to have been resolved by switching to a simpler 'SELECT 1' statement.
+        /// </remarks>
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        public void XEventActivityIDConsistentWithTracing_SqlStatementStarting() =>
+            VerifyXEventActivityIDConsistentWithTracing("SELECT 1 AS [Field1]", System.Data.CommandType.Text, "sql_statement_starting");
+
+        /// <summary>
+        /// Validates that the activity ID is consistently recorded in an XEvent session even when a command generates an error.
+        /// </summary>
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        public void XEventActivityIDConsistentWithTracing_ActivityIDTransferOnError() =>
+            VerifyXEventActivityIDConsistentWithTracing($"THROW {CustomErrorNumber}, 'Sample message', 0", System.Data.CommandType.Text, "sql_statement_starting");
+
+        private void VerifyXEventActivityIDConsistentWithTracing(string query, System.Data.CommandType commandType, string xEvent,
+            [CallerMemberName] string testName = "")
         {
-            // This test validates that the activity ID recorded in the client-side trace is passed through to the server,
+            // This method validates that the activity ID recorded in the client-side trace is passed through to the server,
             // where it can be recorded in an XEvent session. This is documented at:
             // https://learn.microsoft.com/en-us/sql/relational-databases/native-client/features/accessing-diagnostic-information-in-the-extended-events-log
 
@@ -119,7 +162,7 @@ public void XEventActivityIDConsistentWithTracing(string query, System.Data.Comm
             xEventManagementConnection.Open();
 
             using XEventScope xEventSession = new(
-                _testName,
+                testName,
                 xEventManagementConnection,
                 $@"ADD EVENT SQL_STATEMENT_STARTING (ACTION (client_connection_id) WHERE (client_connection_id='{connectionId}')),
                     ADD EVENT RPC_STARTING (ACTION (client_connection_id) WHERE (client_connection_id='{connectionId}'))",
@@ -127,12 +170,19 @@ ADD EVENT RPC_STARTING (ACTION (client_connection_id) WHERE (client_connection_i
 
             using (DataTestUtility.MDSEventListener TraceListener = new())
             {
-                using SqlCommand command = new(query, activityConnection) { CommandType = commandType };
-                using SqlDataReader reader = command.ExecuteReader();
-                while (reader.Read())
+                try
                 {
-                    // Flush data
+                    using SqlCommand command = new(query, activityConnection) { CommandType = commandType };
+                    using SqlDataReader reader = command.ExecuteReader();
+
+                    reader.FlushResultSet();
                 }
+                // We only want to catch and swallow our custom user error number. Error number 1205 should continue to cause the
+                // test to fail, as it indicates a deadlock.
+                // @TODO: If deadlocks continue to cause test failures, we should record the xml_deadlock_report extended event to
+                // capture more information about the deadlock and output it to the test logs for analysis.
+                catch (SqlException sqlEx) when (sqlEx.Number == CustomErrorNumber)
+                { }
 
                 ids = TraceListener.ActivityIDs;
             }
@@ -146,22 +196,26 @@ ADD EVENT RPC_STARTING (ACTION (client_connection_id) WHERE (client_connection_i
 
         private static string GetCommandActivityId(string commandText, string eventName, Guid connectionId, XmlDocument xEvents)
         {
+            // We manually build the XPath query and cannot escape quotes, so disallow them from the command text to simplify
+            // the test.
+            Assert.DoesNotContain("\"", commandText);
+
             XPathNavigator? xPathRoot = xEvents.CreateNavigator();
             Assert.NotNull(xPathRoot);
 
             // The transferred activity ID is attached to the "attach_activity_id_xfer" action within
             // the "sql_statement_starting" and the "rpc_starting" events.
             XPathNodeIterator statementStartingQuery = xPathRoot.Select(
-                $"/RingBufferTarget/event[@name='{eventName}'"
-                + $" and action[@name='client_connection_id']/value='{connectionId.ToString().ToUpper()}'"
-                + $" and (data[@name='statement']='{commandText}' or data[@name='object_name']='{commandText}')]");
+                $"/RingBufferTarget/event[@name=\"{eventName}\""
+                + $" and action[@name=\"client_connection_id\"]/value=\"{connectionId.ToString().ToUpper()}\""
+                + $" and (data[@name=\"statement\"]=\"{commandText}\" or data[@name=\"object_name\"]=\"{commandText}\")]");
 
             Assert.Equal(1, statementStartingQuery.Count);
             Assert.True(statementStartingQuery.MoveNext());
 
             XPathNavigator? current = statementStartingQuery.Current;
             Assert.NotNull(current);
-            XPathNavigator? activityIdElement = current.SelectSingleNode("action[@name='attach_activity_id_xfer']/value");
+            XPathNavigator? activityIdElement = current.SelectSingleNode("action[@name=\"attach_activity_id_xfer\"]/value");
 
             Assert.NotNull(activityIdElement);
             Assert.NotNull(activityIdElement.Value);

From eb9fcc3e709629e53ecca333c19cfe0233d82b00 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 18 May 2026 13:16:43 -0700
Subject: [PATCH 109/298] Update .NET 10 to 10.0.300 (#4287)

Co-authored-by: Malcolm Daigle <mdaigle@microsoft.com>
---
 global.json | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/global.json b/global.json
index 48cbbf1a80..5d6e4f2f39 100644
--- a/global.json
+++ b/global.json
@@ -2,14 +2,9 @@
   "sdk":
   {
     // We currently require the .NET 10 SDK to build and test the project.
-    //
-    // GOTCHA: Our CI infrastructure for Windows uses VS 2022 which comes with MSBuild 17.x.  The
-    // .NET 10 SDK versions in the 10.0.2xx series require MSBuild 18.x, so we specify the most
-    // recent 10.0.1xx series release which is compatible with MSBuild 17.x.
-    //
-    "version": "10.0.107",
+    "version": "10.0.300",
 
-    // We cannot allow any roll forward due to the above MSBuild compatibility issues.
+    // Lock to the above version so that we can control when we take breaking sdk changes.
     "rollForward": "disable",
 
     // Do not allow pre-release versions.

From c92d901238b129c88341da94c7daa37ae9bf5304 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Tue, 19 May 2026 13:16:56 +0530
Subject: [PATCH 110/298] Remove labeling from auto-triage workflow (#4289)

- Remove add-labels safe-output from frontmatter
- Remove add_labels action instructions from workflow body
- Remove Required Context section (full .github/ scan)
- Update triage comment template (area from table, not label)
- Move AI disclaimer before Next Steps
- Recompile lock.yml

Labels will be managed via GitHub Projects and human triage instead.
---
 .github/workflows/issue-triage.lock.yml | 54 ++++++++-----------------
 .github/workflows/issue-triage.md       | 22 +++-------
 2 files changed, 22 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/issue-triage.lock.yml b/.github/workflows/issue-triage.lock.yml
index 08a2e176b1..54d5661b0c 100644
--- a/.github/workflows/issue-triage.lock.yml
+++ b/.github/workflows/issue-triage.lock.yml
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"ddda208c8014c64e57436e95b5e1c92431c6815b5d0f782bb6a01ee1e84a63d9","compiler_version":"v0.72.1","strict":true,"agent_id":"copilot"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"20b8fbbfaae4d08b3206fb6b2f4000e43b8915e37f5afc9a534056f8ce9a563b","compiler_version":"v0.72.1","strict":true,"agent_id":"copilot"}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"bc56a0cad2f450c562810785ef38649c04db812a","version":"v0.72.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.41","digest":"sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41","digest":"sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.41","digest":"sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.6","digest":"sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.6@sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c"},{"image":"ghcr.io/github/github-mcp-server:v1.0.3","digest":"sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959","pinned_image":"ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959"},{"image":"node:lts-alpine","digest":"sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f","pinned_image":"node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f"}]}
 #    ___                   _   _      
 #   / _ \                 | | (_)     
@@ -189,20 +189,20 @@ jobs:
         run: |
           bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
           {
-          cat << 'GH_AW_PROMPT_bef3a8b6a480c883_EOF'
+          cat << 'GH_AW_PROMPT_b5f7a25dd7272e5f_EOF'
           <system>
-          GH_AW_PROMPT_bef3a8b6a480c883_EOF
+          GH_AW_PROMPT_b5f7a25dd7272e5f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_bef3a8b6a480c883_EOF'
+          cat << 'GH_AW_PROMPT_b5f7a25dd7272e5f_EOF'
           <safe-output-tools>
-          Tools: add_comment, add_labels(max:5), missing_tool, missing_data, noop
+          Tools: add_comment, missing_tool, missing_data, noop
           </safe-output-tools>
-          GH_AW_PROMPT_bef3a8b6a480c883_EOF
+          GH_AW_PROMPT_b5f7a25dd7272e5f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          cat << 'GH_AW_PROMPT_bef3a8b6a480c883_EOF'
+          cat << 'GH_AW_PROMPT_b5f7a25dd7272e5f_EOF'
           <github-context>
           The following GitHub context information is available for this workflow:
           {{#if __GH_AW_GITHUB_ACTOR__ }}
@@ -231,12 +231,12 @@ jobs:
           {{/if}}
           </github-context>
           
-          GH_AW_PROMPT_bef3a8b6a480c883_EOF
+          GH_AW_PROMPT_b5f7a25dd7272e5f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          cat << 'GH_AW_PROMPT_bef3a8b6a480c883_EOF'
+          cat << 'GH_AW_PROMPT_b5f7a25dd7272e5f_EOF'
           </system>
           {{#runtime-import .github/workflows/issue-triage.md}}
-          GH_AW_PROMPT_bef3a8b6a480c883_EOF
+          GH_AW_PROMPT_b5f7a25dd7272e5f_EOF
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -430,16 +430,15 @@ jobs:
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_6f7dd6f136148d14_EOF'
-          {"add_comment":{"hide_older_comments":true,"max":1},"add_labels":{"max":5},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_6f7dd6f136148d14_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_421fab10d521b1cd_EOF'
+          {"add_comment":{"hide_older_comments":true,"max":1},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
+          GH_AW_SAFE_OUTPUTS_CONFIG_421fab10d521b1cd_EOF
       - name: Generate Safe Outputs Tools
         env:
           GH_AW_TOOLS_META_JSON: |
             {
               "description_suffixes": {
-                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added. Supports reply_to_id for discussion threading.",
-                "add_labels": " CONSTRAINTS: Maximum 5 label(s) can be added."
+                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added. Supports reply_to_id for discussion threading."
               },
               "repo_params": {},
               "dynamic_tools": []
@@ -468,25 +467,6 @@ jobs:
                   }
                 }
               },
-              "add_labels": {
-                "defaultMax": 5,
-                "fields": {
-                  "item_number": {
-                    "issueNumberOrTemporaryId": true
-                  },
-                  "labels": {
-                    "required": true,
-                    "type": "array",
-                    "itemType": "string",
-                    "itemSanitize": true,
-                    "itemMaxLength": 128
-                  },
-                  "repo": {
-                    "type": "string",
-                    "maxLength": 256
-                  }
-                }
-              },
               "missing_data": {
                 "defaultMax": 20,
                 "fields": {
@@ -639,7 +619,7 @@ jobs:
           
           mkdir -p /home/runner/.copilot
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_47425e2eb31c9c9e_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_95017dc8ef4cee83_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
               "github": {
@@ -683,7 +663,7 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_47425e2eb31c9c9e_EOF
+          GH_AW_MCP_CONFIG_95017dc8ef4cee83_EOF
       - name: Mount MCP servers as CLIs
         id: mount-mcp-clis
         continue-on-error: true
@@ -1314,7 +1294,7 @@ jobs:
           GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_API_URL: ${{ github.api_url }}
-          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"hide_older_comments\":true,\"max\":1},\"add_labels\":{\"max\":5},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"true\"},\"report_incomplete\":{}}"
+          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"hide_older_comments\":true,\"max\":1},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"true\"},\"report_incomplete\":{}}"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
diff --git a/.github/workflows/issue-triage.md b/.github/workflows/issue-triage.md
index 8974ec6a38..793dfc81c3 100644
--- a/.github/workflows/issue-triage.md
+++ b/.github/workflows/issue-triage.md
@@ -19,8 +19,6 @@ safe-outputs:
   add-comment:
     max: 1
     hide-older-comments: true
-  add-labels:
-    max: 5
 ---
 
 # SqlClient Issue Auto-Triage
@@ -29,10 +27,10 @@ You are a triage specialist for **Microsoft.Data.SqlClient**.
 A new issue has just been opened. Your job is to:
 
 1. Read the issue silently using GitHub read tools
-2. Apply labels silently using `add_labels`
-3. Post **one** triage summary comment using `add_comment`
+2. Post **one** triage summary comment using `add_comment`
 
 That is the entire workflow. Do NOT call `add_comment` more than once.
+Do NOT call `add_labels`. Do NOT apply any labels.
 Do NOT post intermediate findings. Do NOT post separate comments for
 area detection, duplicate checking, or environment validation.
 Everything goes into the single triage summary at the end.
@@ -90,19 +88,9 @@ Proceed with all remaining triage steps regardless of missing environment detail
 
 ---
 
-## Actions (execute in this order)
+## Actions
 
-**First**: Call `add_labels` with at most 5 labels total (safe-outputs limit):
-- `Triage Needed :new:` (always)
-- Exactly **one** `Area\*` label from the table above (pick the single best match)
-- `Needs More Info :information_source:` if critical environment details are missing (bugs only)
-- `Repro Available :heavy_check_mark:` if repro steps are provided
-- `Regression :boom:` if this appears to be a regression
-
-If the issue spans multiple areas, pick the primary area as the label and mention
-other relevant areas in the triage summary comment instead.
-
-**Then**: Call `add_comment` exactly **once** with this markdown:
+Call `add_comment` exactly **once** with this markdown:
 
 ```
 ## 🔍 Triage Summary
@@ -111,7 +99,7 @@ other relevant areas in the triage summary comment instead.
 |-------|--------|
 | Issue type | <Bug / Feature / Question / Task> |
 | Environment | <All required environment details provided for investigation / ⚠️ Missing: list specific fields> |
-| Area | <Area label applied or "no match"> |
+| Area | <Best matching area from classification table> |
 | Duplicates | <None found / Potentially related: #NNN, #NNN> |
 | Regression | <Not indicated / Likely regression from vX.Y.Z / Inconclusive> |
 

From 9c0d240aa8b18993cdec2d9ae9ba99f2b46f384a Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Wed, 20 May 2026 19:44:50 +0100
Subject: [PATCH 111/298] Always Encrypted | Align reads of CekMdVersion and
 EkValueCount with TDS specification (#4240)

* Align read of keyMDVersion with TDS ULONGLONG datatype
* Align read of EkValueCount in COLMETADATA with TDS USHORT datatype
* Address test failures
Test code uses reflection to call SqlTceCipherInfoEntry.Add
---
 .../SqlClient/AlwaysEncryptedHelperClasses.cs | 20 +++++++--------
 .../Data/SqlClient/ColumnEncryptionKeyInfo.cs | 25 +++++++------------
 .../Data/SqlClient/SqlCommand.Encryption.cs   |  3 ++-
 .../src/Microsoft/Data/SqlClient/TdsParser.cs | 15 +++++------
 .../ExceptionsAlgorithmErrors.cs              | 14 +++++------
 .../AlwaysEncryptedTests/Utility.cs           |  2 +-
 6 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedHelperClasses.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedHelperClasses.cs
index 659d2e9f0f..cb37486a42 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedHelperClasses.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedHelperClasses.cs
@@ -1,8 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.Data.SqlClient.Server;
@@ -20,7 +21,7 @@ internal class SqlEncryptionKeyInfo
         internal int databaseId;
         internal int cekId;
         internal int cekVersion;
-        internal byte[] cekMdVersion;
+        internal ulong cekMdVersion;
         internal string keyPath;
         internal string keyStoreName;
         internal string algorithmName;
@@ -63,7 +64,7 @@ internal class SqlTceCipherInfoEntry
         /// <summary>
         /// Cek MD Version
         /// </summary>
-        private byte[] _cekMdVersion;
+        private ulong _cekMdVersion;
 
         /// <summary>
         /// Return the ordinal.
@@ -112,7 +113,7 @@ internal int CekVersion
         /// <summary>
         /// Return the CEK MD Version.
         /// </summary>
-        internal byte[] CekMdVersion
+        internal ulong CekMdVersion
         {
             get
             {
@@ -142,7 +143,7 @@ internal List<SqlEncryptionKeyInfo> ColumnEncryptionKeyValues
         /// <param name="keyPath"></param>
         /// <param name="keyStoreName"></param>
         /// <param name="algorithmName"></param>
-        internal void Add(byte[] encryptedKey, int databaseId, int cekId, int cekVersion, byte[] cekMdVersion, string keyPath, string keyStoreName, string algorithmName)
+        internal void Add(byte[] encryptedKey, int databaseId, int cekId, int cekVersion, ulong cekMdVersion, string keyPath, string keyStoreName, string algorithmName)
         {
 
             Debug.Assert(_columnEncryptionKeyValues != null, "_columnEncryptionKeyValues should already be initialized.");
@@ -172,7 +173,6 @@ internal void Add(byte[] encryptedKey, int databaseId, int cekId, int cekVersion
                 Debug.Assert(_databaseId == databaseId);
                 Debug.Assert(_cekId == cekId);
                 Debug.Assert(_cekVersion == cekVersion);
-                Debug.Assert(_cekMdVersion != null && cekMdVersion != null && _cekMdVersion.Length == _cekMdVersion.Length);
             }
         }
 
@@ -186,7 +186,7 @@ internal SqlTceCipherInfoEntry(int ordinal = 0)
             _databaseId = 0;
             _cekId = 0;
             _cekVersion = 0;
-            _cekMdVersion = null;
+            _cekMdVersion = 0;
             _columnEncryptionKeyValues = new List<SqlEncryptionKeyInfo>();
         }
     }
@@ -550,7 +550,7 @@ private byte[] SerializeToWriteFormat()
             totalLength += sizeof(int);
 
             // Metadata version of the encryption key.
-            totalLength += _cipherMetadata.EncryptionKeyInfo.cekMdVersion.Length;
+            totalLength += sizeof(ulong);
 
             // Normalization Rule Version.
             totalLength += sizeof(byte);
@@ -576,8 +576,8 @@ private byte[] SerializeToWriteFormat()
             SerializeIntIntoBuffer(_cipherMetadata.EncryptionKeyInfo.cekVersion, serializedWireFormat, ref consumedBytes);
 
             // 6 - Write the metadata version of the encryption key.
-            Buffer.BlockCopy(_cipherMetadata.EncryptionKeyInfo.cekMdVersion, 0, serializedWireFormat, consumedBytes, _cipherMetadata.EncryptionKeyInfo.cekMdVersion.Length);
-            consumedBytes += _cipherMetadata.EncryptionKeyInfo.cekMdVersion.Length;
+            BinaryPrimitives.WriteUInt64LittleEndian(serializedWireFormat.AsSpan(consumedBytes), _cipherMetadata.EncryptionKeyInfo.cekMdVersion);
+            consumedBytes += sizeof(ulong);
 
             // 7 - Write Normalization Rule Version.
             serializedWireFormat[consumedBytes++] = _cipherMetadata.NormalizationRuleVersion;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ColumnEncryptionKeyInfo.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ColumnEncryptionKeyInfo.cs
index 6c99dd8432..f738a465c0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ColumnEncryptionKeyInfo.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ColumnEncryptionKeyInfo.cs
@@ -1,8 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Buffers.Binary;
 
 namespace Microsoft.Data.SqlClient
 {
@@ -16,10 +17,9 @@ internal class ColumnEncryptionKeyInfo
         internal readonly byte[] DecryptedKeyBytes;
         internal readonly byte[] KeyIdBytes;
         internal readonly byte[] DatabaseIdBytes;
-        internal readonly byte[] KeyMetadataVersionBytes;
+        internal readonly ulong KeyMetadataVersion;
 
         private static readonly string _decryptedKeyName = "DecryptedKey";
-        private static readonly string _keyMetadataVersionName = "KeyMetadataVersion";
         private static readonly string _className = "ColumnEncryptionKeyInfo";
         private static readonly string _bytePackageName = "BytePackage";
         private static readonly string _serializeToBufferMethodName = "SerializeToBuffer";
@@ -32,7 +32,7 @@ internal class ColumnEncryptionKeyInfo
         /// <param name="databaseId">database id for this column encryption key</param>
         /// <param name="keyMetadataVersion">key metadata version for this column encryption key</param>
         /// <param name="keyid">key id for this column encryption key</param>
-        internal ColumnEncryptionKeyInfo(byte[] decryptedKey, int databaseId, byte[] keyMetadataVersion, int keyid)
+        internal ColumnEncryptionKeyInfo(byte[] decryptedKey, int databaseId, ulong keyMetadataVersion, int keyid)
         {
 
             if (decryptedKey == null)
@@ -43,19 +43,11 @@ internal ColumnEncryptionKeyInfo(byte[] decryptedKey, int databaseId, byte[] key
             {
                 throw SQL.EmptyArgumentInConstructorInternal(_decryptedKeyName, _className);
             }
-            if (keyMetadataVersion == null)
-            {
-                throw SQL.NullArgumentInConstructorInternal(_keyMetadataVersionName, _className);
-            }
-            if (0 == keyMetadataVersion.Length)
-            {
-                throw SQL.EmptyArgumentInConstructorInternal(_keyMetadataVersionName, _className);
-            }
 
             KeyId = keyid;
             DatabaseId = databaseId;
             DecryptedKeyBytes = decryptedKey;
-            KeyMetadataVersionBytes = keyMetadataVersion;
+            KeyMetadataVersion = keyMetadataVersion;
 
             //Covert keyId to Bytes
             ushort keyIdUShort;
@@ -96,7 +88,8 @@ internal int GetLengthForSerialization()
             lengthForSerialization += DecryptedKeyBytes.Length;
             lengthForSerialization += KeyIdBytes.Length;
             lengthForSerialization += DatabaseIdBytes.Length;
-            lengthForSerialization += KeyMetadataVersionBytes.Length;
+            // KeyMetadataVersion is of type ulong which is 8 bytes
+            lengthForSerialization += sizeof(ulong);
             return lengthForSerialization;
         }
 
@@ -131,8 +124,8 @@ internal int SerializeToBuffer(byte[] bytePackage, int startOffset)
 
             Buffer.BlockCopy(DatabaseIdBytes, 0, bytePackage, startOffset, DatabaseIdBytes.Length);
             startOffset += DatabaseIdBytes.Length;
-            Buffer.BlockCopy(KeyMetadataVersionBytes, 0, bytePackage, startOffset, KeyMetadataVersionBytes.Length);
-            startOffset += KeyMetadataVersionBytes.Length;
+            BinaryPrimitives.WriteUInt64LittleEndian(bytePackage.AsSpan(startOffset), KeyMetadataVersion);
+            startOffset += sizeof(ulong);
             Buffer.BlockCopy(KeyIdBytes, 0, bytePackage, startOffset, KeyIdBytes.Length);
             startOffset += KeyIdBytes.Length;
             Buffer.BlockCopy(DecryptedKeyBytes, 0, bytePackage, startOffset, DecryptedKeyBytes.Length);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs
index 59a2fddadc..fa5cfb5ab2 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Buffers.Binary;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -1016,7 +1017,7 @@ private bool ReadDescribeEncryptionParameterResultsKeys(
                     databaseId: ds.GetInt32((int)DescribeParameterEncryptionResultSet1.DbId),
                     cekId: ds.GetInt32((int)DescribeParameterEncryptionResultSet1.KeyId),
                     cekVersion: ds.GetInt32((int)DescribeParameterEncryptionResultSet1.KeyVersion),
-                    cekMdVersion: keyMdVersion,
+                    cekMdVersion: BinaryPrimitives.ReadUInt64LittleEndian(keyMdVersion),
                     keyPath: keyPath,
                     keyStoreName: providerName,
                     algorithmName: ds.GetString((int)DescribeParameterEncryptionResultSet1.KeyEncryptionAlgorithm));
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 8bfedc3539..66e9c3e52e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -5288,6 +5288,10 @@ internal TdsOperationStatus TryProcessAltMetaData(int cColumns, TdsParserStateOb
         /// <summary>
         /// <para> Parses the TDS message to read single CIPHER_INFO entry.</para>
         /// </summary>
+        /// <remarks>
+        /// The CIPHER_INFO structure is represented as an EK_INFO structure in the TDS protocol.
+        /// </remarks>
+        /// <seealso href="https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-tds/b0f2c914-c5ee-4714-802a-f118edf1b33d"/>.
         internal TdsOperationStatus TryReadCipherInfoEntry(TdsParserStateObject stateObj, out SqlTceCipherInfoEntry entry)
         {
             byte cekValueCount = 0;
@@ -5318,8 +5322,7 @@ internal TdsOperationStatus TryReadCipherInfoEntry(TdsParserStateObject stateObj
             }
 
             // Read the key MD Version
-            byte[] keyMDVersion = new byte[8];
-            result = stateObj.TryReadByteArray(keyMDVersion, 8);
+            result = stateObj.TryReadInt64(out long keyMDVersion);
             if (result != TdsOperationStatus.Done)
             {
                 return result;
@@ -5414,7 +5417,7 @@ internal TdsOperationStatus TryReadCipherInfoEntry(TdsParserStateObject stateObj
                     databaseId: dbId,
                     cekId: keyId,
                     cekVersion: keyVersion,
-                    cekMdVersion: keyMDVersion,
+                    cekMdVersion: unchecked((ulong)keyMDVersion),
                     keyPath: keyPath,
                     keyStoreName: keyStoreName,
                     algorithmName: algorithmName);
@@ -5429,9 +5432,8 @@ internal TdsOperationStatus TryReadCipherInfoEntry(TdsParserStateObject stateObj
         internal TdsOperationStatus TryProcessCipherInfoTable(TdsParserStateObject stateObj, out SqlTceCipherInfoTable cipherTable)
         {
             // Read count
-            short tableSize = 0;
             cipherTable = null;
-            TdsOperationStatus result = stateObj.TryReadInt16(out tableSize);
+            TdsOperationStatus result = stateObj.TryReadUInt16(out ushort tableSize);
             if (result != TdsOperationStatus.Done)
             {
                 return result;
@@ -11445,8 +11447,7 @@ internal void WriteEncryptionEntries(ref SqlTceCipherInfoTable cekTable, TdsPars
                 WriteInt(cekTable[i].CekVersion, stateObj);
 
                 // Write 8 bytes of key MD Version
-                Debug.Assert(8 == cekTable[i].CekMdVersion.Length);
-                stateObj.WriteByteArray(cekTable[i].CekMdVersion, 8, 0);
+                WriteUnsignedLong(cekTable[i].CekMdVersion, stateObj);
 
                 // We don't really need to send the keys
                 stateObj.WriteByte(0x00);
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/ExceptionsAlgorithmErrors.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/ExceptionsAlgorithmErrors.cs
index caa98cc686..c12f73e29f 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/ExceptionsAlgorithmErrors.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/ExceptionsAlgorithmErrors.cs
@@ -72,7 +72,7 @@ public void TestInvalidEncryptionType()
         {
             const byte invalidEncryptionType = 3;
             Object cipherMD = GetSqlCipherMetadata(0, 2, null, invalidEncryptionType, 0x01);
-            AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, new byte[] { 0x01, 0x02, 0x03 }, _certificatePath, "MSSQL_CERTIFICATE_STORE", "RSA_OAEP");
+            AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, 0x010203, _certificatePath, "MSSQL_CERTIFICATE_STORE", "RSA_OAEP");
             byte[] plainText = Encoding.Unicode.GetBytes("HelloWorld");
             byte[] cipherText = EncryptDataUsingAED(plainText, _cek, CColumnEncryptionType.Deterministic);
 
@@ -135,7 +135,7 @@ public void TestNullColumnEncryptionAlgorithm()
             string expectedMessage = string.Format(SystemDataResourceManager.Instance.TCE_NullColumnEncryptionAlgorithm,
                 "'AEAD_AES_256_CBC_HMAC_SHA256'");
             Object cipherMD = GetSqlCipherMetadata(0, 0, null, 1, 0x01);
-            AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, new byte[] { 0x01, 0x02, 0x03 }, _certificatePath, "MSSQL_CERTIFICATE_STORE", "RSA_OAEP");
+            AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, 0x010203, _certificatePath, "MSSQL_CERTIFICATE_STORE", "RSA_OAEP");
             byte[] plainText = Encoding.Unicode.GetBytes("HelloWorld");
             byte[] cipherText = EncryptDataUsingAED(plainText, _cek, CColumnEncryptionType.Deterministic);
 
@@ -153,7 +153,7 @@ public void TestUnknownEncryptionAlgorithmId()
             string expectedMessage = string.Format(SystemDataResourceManager.Instance.TCE_UnknownColumnEncryptionAlgorithmId,
                 unknownEncryptionAlgoId, "'1', '2'");
             Object cipherMD = GetSqlCipherMetadata(0, unknownEncryptionAlgoId, null, 1, 0x01);
-            AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, new byte[] { 0x01, 0x02, 0x03 }, _certificatePath, "MSSQL_CERTIFICATE_STORE", "RSA_OAEP");
+            AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, 0x010203, _certificatePath, "MSSQL_CERTIFICATE_STORE", "RSA_OAEP");
             byte[] plainText = Encoding.Unicode.GetBytes("HelloWorld");
             byte[] cipherText = EncryptDataUsingAED(plainText, _cek, CColumnEncryptionType.Deterministic);
 
@@ -177,7 +177,7 @@ public void TestUnknownCustomKeyStoreProvider()
                 string expectedMessage = string.Format(SystemDataResourceManager.Instance.TCE_UnrecognizedKeyStoreProviderName,
                     invalidProviderName, "'MSSQL_CERTIFICATE_STORE', 'MSSQL_CNG_STORE', 'MSSQL_CSP_PROVIDER'", "");
                 Object cipherMD = GetSqlCipherMetadata(0, 1, null, 1, 0x03);
-                AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, new byte[] { 0x01, 0x02, 0x03 }, _certificatePath, invalidProviderName, "RSA_OAEP");
+                AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, 0x010203, _certificatePath, invalidProviderName, "RSA_OAEP");
                 byte[] plainText = Encoding.Unicode.GetBytes("HelloWorld");
                 byte[] cipherText = EncryptDataUsingAED(plainText, _cek, CColumnEncryptionType.Deterministic);
 
@@ -199,7 +199,7 @@ public void TestTceUnknownEncryptionAlgorithm()
             string expectedMessage = string.Format(SystemDataResourceManager.Instance.TCE_UnknownColumnEncryptionAlgorithm,
                 unknownEncryptionAlgorithm, "'AEAD_AES_256_CBC_HMAC_SHA256'");
             Object cipherMD = GetSqlCipherMetadata(0, 0, "Dummy", 1, 0x01);
-            AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, new byte[] { 0x01, 0x02, 0x03 }, _certificatePath, "MSSQL_CERTIFICATE_STORE", "RSA_OAEP");
+            AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, 0x010203, _certificatePath, "MSSQL_CERTIFICATE_STORE", "RSA_OAEP");
             byte[] plainText = Encoding.Unicode.GetBytes("HelloWorld");
             byte[] cipherText = EncryptDataUsingAED(plainText, _cek, CColumnEncryptionType.Deterministic);
 
@@ -220,7 +220,7 @@ public void TestExceptionsFromCertStore()
                 "MSSQL_CERTIFICATE_STORE", BitConverter.ToString(corruptedCek, corruptedCek.Length - 10, 10));
 
             Object cipherMD = GetSqlCipherMetadata(0, 1, null, 1, 0x01);
-            AddEncryptionKeyToCipherMD(cipherMD, corruptedCek, 0, 0, 0, new byte[] { 0x01, 0x02, 0x03 }, _certificatePath, "MSSQL_CERTIFICATE_STORE", "RSA_OAEP");
+            AddEncryptionKeyToCipherMD(cipherMD, corruptedCek, 0, 0, 0, 0x010203, _certificatePath, "MSSQL_CERTIFICATE_STORE", "RSA_OAEP");
             byte[] plainText = Encoding.Unicode.GetBytes("HelloWorld");
             byte[] cipherText = EncryptDataUsingAED(plainText, _cek, CColumnEncryptionType.Deterministic);
 
@@ -244,7 +244,7 @@ public void TestExceptionsFromCustomKeyStore()
                 SqlConnection.RegisterColumnEncryptionKeyStoreProviders(customProviders);
 
                 object cipherMD = GetSqlCipherMetadata(0, 1, null, 1, 0x01);
-                AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, new byte[] { 0x01, 0x02, 0x03 }, _certificatePath, "DummyProvider", "DummyAlgo");
+                AddEncryptionKeyToCipherMD(cipherMD, _encryptedCek, 0, 0, 0, 0x010203, _certificatePath, "DummyProvider", "DummyAlgo");
                 byte[] plainText = Encoding.Unicode.GetBytes("HelloWorld");
                 byte[] cipherText = EncryptDataUsingAED(plainText, _cek, CColumnEncryptionType.Deterministic);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs
index e53fa6491e..c51dcecf99 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/Utility.cs
@@ -217,7 +217,7 @@ internal static void AddEncryptionKeyToCipherMD(
                 int databaseId,
                 int cekId,
                 int cekVersion,
-                byte[] cekMdVersion,
+                ulong cekMdVersion,
                 string keyPath,
                 string keyStoreName,
                 string algorithmName)

From 8afb242e01860b3f41157cdd230a1ed731dd2b49 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 20 May 2026 16:32:42 -0300
Subject: [PATCH 112/298] Add SqlServer.Server as a sibling project reference
 (#4291)

---
 .gitignore                                    |   3 +
 Directory.Packages.props                      |  53 ++++--
 build.proj                                    | 170 +++++++++++++++---
 doc/Directory.Packages.props                  |   1 +
 .../Microsoft.Data.SqlClient.Samples.csproj   |  13 +-
 .../templates/jobs/ci-build-nugets-job.yml    |  20 +++
 .../templates/jobs/ci-run-tests-job.yml       |  18 ++
 .../templates/stages/ci-run-tests-stage.yml   |  14 ++
 .../templates/steps/ci-project-build-step.yml |   7 +
 .../templates/steps/run-all-tests-step.yml    |  15 ++
 eng/pipelines/dotnet-sqlclient-ci-core.yml    |  19 +-
 .../jobs/test-azure-package-ci-job.yml        |  34 ++++
 .../libraries/ci-build-variables.yml          |  18 +-
 .../onebranch/stages/build-stages.yml         |   6 +
 .../onebranch/steps/build-buildproj-step.yml  |   1 +
 .../steps/roslyn-analyzers-buildproj-step.yml |   1 +
 .../stages/build-azure-package-ci-stage.yml   |  49 +++++
 .../build-sqlclient-package-ci-stage.yml      |  12 ++
 src/Directory.Build.props                     |   6 +-
 ...waysEncrypted.AzureKeyVaultProvider.csproj |   5 +-
 .../src/Versions.props                        |  12 +-
 .../Abstractions/src/Abstractions.csproj      |   9 +-
 .../Abstractions/src/Versions.props           |  12 +-
 .../Azure/src/Azure.csproj                    |   5 +-
 .../Azure/src/Versions.props                  |  12 +-
 .../Logging/src/Logging.csproj                |   5 +-
 .../Logging/src/Versions.props                |  12 +-
 src/Microsoft.Data.SqlClient/Versions.props   |  10 ++
 .../Microsoft.Data.SqlClient.csproj           |  20 ++-
 .../ref/Microsoft.Data.SqlClient.csproj       |  14 +-
 .../src/Microsoft.Data.SqlClient.csproj       |  22 ++-
 .../src/Microsoft.Data.SqlClient.nuspec       |   6 +-
 ...Microsoft.Data.SqlClient.TestCommon.csproj |   1 +
 .../FunctionalTests/SqlDataRecordTest.cs      |   4 +-
 ...icrosoft.Data.SqlClient.ManualTests.csproj |   9 +-
 .../SQL/UdtTest/SqlServerTypesTest.cs         |  12 ++
 .../SQL/UdtTest/UDTs/Address/Address.csproj   |   7 +-
 .../SQL/UdtTest/UDTs/Circle/Circle.csproj     |   7 +-
 .../SQL/UdtTest/UDTs/Shapes/Shapes.csproj     |   5 +-
 .../UdtTest/UDTs/Utf8String/Utf8String.csproj |   5 +-
 .../Microsoft.Data.SqlClient.UnitTests.csproj |  13 +-
 .../Microsoft.SqlServer.Server.csproj         |   5 +-
 src/Microsoft.SqlServer.Server/Versions.props |  12 +-
 43 files changed, 588 insertions(+), 96 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0d8dfed6d5..da143d57ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -376,3 +376,6 @@ MigrationBackup/
 
 # MDS "Not Supported" GenAPI code
 **/notsupported/*.cs
+
+# C# language server cache
+*.lscache
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 62918f7d65..37b72ca205 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,4 +1,33 @@
 <Project>
+
+  <!-- ===================================================================== -->
+  <!--
+    Versions.props import strategy:
+
+    Each product has a Versions.props that computes its version properties (e.g.
+    SqlClientPackageVersion).  These files can be imported from two places:
+
+      1. Here, in Directory.Packages.props (Package mode only) — imports ALL
+         Versions.props early so that centrally-managed PackageVersion items can
+         reference the computed version values for sibling package pinning.
+
+      2. In each product's own csproj (conditional) — imports the product's own
+         Versions.props so standalone / Project-mode builds still get versions.
+
+    To prevent double-evaluation when both paths fire, every Versions.props sets
+    an import-guard property (e.g. SqlClientVersionsImported=true) on first load.
+    The csproj-level import checks that guard and becomes a no-op if the file was
+    already imported here.
+  -->
+  <ImportGroup Condition="'$(ReferenceType)' == 'Package'">
+    <Import Project="src/Microsoft.Data.SqlClient/Versions.props" />
+    <Import Project="src/Microsoft.SqlServer.Server/Versions.props" />
+    <Import Project="src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props" />
+    <Import Project="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props" />
+    <Import Project="src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props" />
+    <Import Project="src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props" />
+  </ImportGroup>
+
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <!--
@@ -14,33 +43,23 @@
   <!-- ===================================================================== -->
   <!-- Driver Packages -->
 
-  <!-- Ordered from least dependent to most dependent, and then alphabetically. -->
-
-  <ItemGroup>
-    <!--
-      We never reference this package via its project, so we always need a
-      version specified.
-    -->
-    <PackageVersion Include="Microsoft.SqlServer.Server" Version="1.0.0" />
-  </ItemGroup>
-
-  <!--
-    We only need other driver package versions specified when building via
-    package references.
-  -->
+  <!-- The driver packages need version numbers when we build via Package references. -->
   <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
+    <PackageVersion
+      Include="Microsoft.SqlServer.Server"
+      Version="$(SqlServerPackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Internal.Logging"
       Version="$(LoggingPackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
       Version="$(AbstractionsPackageVersion)" />
-    <PackageVersion
-      Include="Microsoft.Data.SqlClient.Extensions.Azure"
-      Version="$(AzurePackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient"
       Version="$(SqlClientPackageVersion)" />
+    <PackageVersion
+      Include="Microsoft.Data.SqlClient.Extensions.Azure"
+      Version="$(AzurePackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider"
       Version="$(AkvProviderPackageVersion)" />
diff --git a/build.proj b/build.proj
index 971cfb12fa..b8ac7d44ed 100644
--- a/build.proj
+++ b/build.proj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
   <!-- Imports ========================================================= -->
   <Import Project="src/Directory.Build.props" />
 
@@ -208,12 +209,15 @@
       ReferenceType
       Applies to:     BuildSqlClient, BuildSqlClientUnix, BuildSqlClientWindows
       Description:    Determines how to build SqlClient. If set to "Project", any cross-project
-                      references (eg, Abstractions from SqlClient) will be made as project references. If
-                      set to "Package", package references will be made instead. When running in
-                      package mode, target versions can be specified via PackageVersion* build
-                      parameters. If these are not provided, the central feed version will be used
-                      instead (see Directory.Packages.props). When running in project mode, the
-                      dependencies will be built automatically.
+                      references (eg, Abstractions from SqlClient) will be made as project
+                      references. If set to "Package", package references will be made instead. When
+                      running in package mode, target versions can be specified via PackageVersion*
+                      build parameters. If these are not provided, the central feed version will be
+                      used instead (see Directory.Packages.props). In package mode, all Pack*
+                      targets also mirror their .nupkg/.snupkg output into the local NuGet feed
+                      directory (packages/) so that downstream builds in the same invocation can
+                      restore them without a separate feed publish step. When running in project
+                      mode, the dependencies will be built automatically.
 
       Applies to:     TestSqlClientFunctional, TestSqlClientManual
       Description:    Determines whether to test against a project reference or a package version
@@ -227,6 +231,19 @@
       -p:ReferenceType=Package
     </ReferenceTypeArgument>
 
+    <!--
+      SkipDependencyPack
+      Applies to:     Build* targets in Package mode
+      Description:    When true, suppresses the automatic DependsOnTargets that pack sibling
+                      packages before building a downstream package. This is intended for CI
+                      systems (e.g. OneBranch) that build each package in a separate job and
+                      supply pre-built dependency packages externally. Without this flag,
+                      Build targets in Package mode will first run Pack targets for their
+                      dependencies to populate the local NuGet feed.
+      Default value:  false
+    -->
+    <SkipDependencyPack Condition="'$(SkipDependencyPack)' == ''">false</SkipDependencyPack>
+
     <!--
       SigningKeyPath
       Applies to:     Build*, Pack*
@@ -285,6 +302,12 @@
     -->
     <TestFilters Condition="'$(TestFilters)' == ''">category!=failing&amp;category!=flaky&amp;category!=interactive</TestFilters>
     <TestFilters Condition="'$(TestFilters.ToLower())' == 'none'" />
+    <!--
+      Exclude tests in the "signed" category when building unsigned assemblies.  We have some tests
+      that require signed assemblies, and they would fail with strong name validation exceptions on
+      .NET Framework.
+    -->
+    <TestFilters Condition="'$(TestFilters)' != '' AND '$(SigningKeyPath)' == ''">$(TestFilters)&amp;category!=signed</TestFilters>
     <TestFiltersArgument Condition="'$(TestFilters)' != ''">
       --filter "$(TestFilters)"
     </TestFiltersArgument>
@@ -370,6 +393,7 @@
     <SqlClientProjectPath>$(SqlClientSrcRoot)src/Microsoft.Data.SqlClient.csproj</SqlClientProjectPath>
     <SqlClientRefProjectPath>$(SqlClientSrcRoot)ref/Microsoft.Data.SqlClient.csproj</SqlClientRefProjectPath>
     <SqlClientNotSupportedProjectPath>$(SqlClientSrcRoot)notsupported/Microsoft.Data.SqlClient.csproj</SqlClientNotSupportedProjectPath>
+    <SqlClientPackageArtifactRoot>$(SqlClientArtifactRoot)$(ReferenceType)-$(Configuration)/</SqlClientPackageArtifactRoot>
 
     <!-- Test Project Paths -->
     <SqlClientFunctionalTestProjectPath>$(SqlClientSrcRoot)tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj</SqlClientFunctionalTestProjectPath>
@@ -390,7 +414,10 @@
     PlatformNotSupportedException. It generates the source for this using GenAPI which is built as
     the first step of this target.
   -->
-  <Target Name="BuildSqlClientNotSupported">
+  <PropertyGroup>
+    <BuildSqlClientNotSupportedDependsOn Condition="'$(ReferenceType.ToLower())' == 'package' AND '$(SkipDependencyPack)' != 'true'">PackLogging;PackAbstractions;PackSqlServer</BuildSqlClientNotSupportedDependsOn>
+  </PropertyGroup>
+  <Target Name="BuildSqlClientNotSupported" DependsOnTargets="$(BuildSqlClientNotSupportedDependsOn)">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(GenApiProjectPath)"
@@ -424,6 +451,7 @@
         $(ReferenceTypeArgument)
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -434,7 +462,10 @@
   </Target>
 
   <!-- BuildSqlClientRef: Builds the ref binaries project for SqlClient, which is OS-agnostic -->
-  <Target Name="BuildSqlClientRef">
+  <PropertyGroup>
+    <BuildSqlClientRefDependsOn Condition="'$(ReferenceType.ToLower())' == 'package' AND '$(SkipDependencyPack)' != 'true'">PackLogging;PackAbstractions;PackSqlServer</BuildSqlClientRefDependsOn>
+  </PropertyGroup>
+  <Target Name="BuildSqlClientRef" DependsOnTargets="$(BuildSqlClientRefDependsOn)">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build $(SqlClientRefProjectPath)
@@ -449,6 +480,7 @@
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
         $(PackageVersionAbstractionsArgument)
+        $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -459,7 +491,10 @@
   </Target>
 
   <!-- BuildSqlClientUnix: Builds all unix-specific SqlClient binaries -->
-  <Target Name="BuildSqlClientUnix">
+  <PropertyGroup>
+    <BuildSqlClientUnixDependsOn Condition="'$(ReferenceType.ToLower())' == 'package' AND '$(SkipDependencyPack)' != 'true'">PackLogging;PackAbstractions;PackSqlServer</BuildSqlClientUnixDependsOn>
+  </PropertyGroup>
+  <Target Name="BuildSqlClientUnix" DependsOnTargets="$(BuildSqlClientUnixDependsOn)">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build $(SqlClientProjectPath)
@@ -476,6 +511,7 @@
         $(ReferenceTypeArgument)
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -486,7 +522,10 @@
   </Target>
 
   <!-- BuildSqlClientWindows: Builds all windows-specific SqlClient binaries -->
-  <Target Name="BuildSqlClientWindows">
+  <PropertyGroup>
+    <BuildSqlClientWindowsDependsOn Condition="'$(ReferenceType.ToLower())' == 'package' AND '$(SkipDependencyPack)' != 'true'">PackLogging;PackAbstractions;PackSqlServer</BuildSqlClientWindowsDependsOn>
+  </PropertyGroup>
+  <Target Name="BuildSqlClientWindows" DependsOnTargets="$(BuildSqlClientWindowsDependsOn)">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build $(SqlClientProjectPath)
@@ -503,6 +542,7 @@
         $(ReferenceTypeArgument)
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -545,15 +585,27 @@
         $(ReferenceTypeArgument)
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlServerArgument)
 
         <!-- Pack settings are defined in Microsoft.Data.SqlClient.csproj -->
-        -p:PackageOutputPath="$(SqlClientArtifactRoot)/$(ReferenceType)-$(Configuration)"
+        -p:PackageOutputPath="$(SqlClientPackageArtifactRoot)"
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
     <Message Text=">>> Packing SqlClient via command: $(DotnetCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+
+    <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
+    <ItemGroup Condition="'$(ReferenceType.ToLower())' == 'package'">
+      <SqlClientPackedArtifacts Include="$(SqlClientPackageArtifactRoot)*.nupkg" />
+      <SqlClientPackedArtifacts Include="$(SqlClientPackageArtifactRoot)*.snupkg" />
+    </ItemGroup>
+    <Copy
+      Condition="'$(ReferenceType.ToLower())' == 'package'"
+      SourceFiles="@(SqlClientPackedArtifacts)"
+      DestinationFolder="$(PackagesDir)"
+      SkipUnchangedFiles="true" />
   </Target>
 
   <!-- Test SqlClient Targets ==================================================== -->
@@ -582,6 +634,7 @@
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
         $(PackageVersionSqlClientArgument)
+        $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -613,6 +666,7 @@
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
         $(PackageVersionSqlClientArgument)
+        $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -650,14 +704,18 @@
   </Target>
 
   <!-- ================================================================= -->
-  <!-- Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider Targets -->
+  <!-- Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider Targets -->
   <PropertyGroup>
     <AkvProviderSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/</AkvProviderSrcRoot>
     <AkvProviderProjectPath>$(AkvProviderSrcRoot)src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj</AkvProviderProjectPath>
+    <AkvProviderArtifactRoot>$(RepoRoot)artifacts/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/$(Configuration)/</AkvProviderArtifactRoot>
   </PropertyGroup>
 
-  <!-- BuildAkvProvider: Builds Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider -->
-  <Target Name="BuildAkvProvider">
+  <!-- BuildAkvProvider: Builds Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider -->
+  <PropertyGroup>
+    <BuildAkvProviderDependsOn Condition="'$(ReferenceType.ToLower())' == 'package' AND '$(SkipDependencyPack)' != 'true'">PackSqlClient;PackLogging</BuildAkvProviderDependsOn>
+  </PropertyGroup>
+  <Target Name="BuildAkvProvider" DependsOnTargets="$(BuildAkvProviderDependsOn)">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(AkvProviderProjectPath)"
@@ -674,12 +732,13 @@
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
         $(PackageVersionSqlClientArgument)
+        $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider via command: $(DotnetCommand)" />
+    <Message Text=">>> Building Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider via command: $(DotnetCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -687,7 +746,7 @@
   <Target Name="PackAkvProvider">
     <PropertyGroup>
       <DotnetCommand>
-        "$(DotnetPath)dotnet" pack "$(AkvProviderProjectpath)"
+        "$(DotnetPath)dotnet" pack "$(AkvProviderProjectPath)"
         -p:Configuration=$(Configuration)
         $(PackBuildArgument)
         $(SigningKeyPathArgument)
@@ -702,25 +761,42 @@
         $(PackageVersionAbstractionsArgument)
         $(PackageVersionLoggingArgument)
         $(PackageVersionSqlClientArgument)
+        $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Packaging Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider via command: $(DotnetCommand)" />
+    <Message Text=">>> Packaging Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider via command: $(DotnetCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+
+    <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
+    <ItemGroup Condition="'$(ReferenceType.ToLower())' == 'package'">
+      <AkvProviderPackedArtifacts Include="$(AkvProviderArtifactRoot)*.nupkg" />
+      <AkvProviderPackedArtifacts Include="$(AkvProviderArtifactRoot)*.snupkg" />
+    </ItemGroup>
+    <Copy
+      Condition="'$(ReferenceType.ToLower())' == 'package'"
+      SourceFiles="@(AkvProviderPackedArtifacts)"
+      DestinationFolder="$(PackagesDir)"
+      SkipUnchangedFiles="true" />
   </Target>
 
   <!-- ================================================================= -->
   <!-- Microsoft.Data.SqlClient.Extensions.Abstractions Targets -->
+
   <PropertyGroup>
     <AbstractionsSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient.Extensions/Abstractions/</AbstractionsSrcRoot>
     <AbstractionsProjectPath>$(AbstractionsSrcRoot)src/Abstractions.csproj</AbstractionsProjectPath>
     <AbstractionsTestProjectPath>$(AbstractionsSrcRoot)test/Abstractions.Test.csproj</AbstractionsTestProjectPath>
+    <AbstractionsArtifactRoot>$(RepoRoot)artifacts/Microsoft.Data.SqlClient.Extensions.Abstractions/$(Configuration)/</AbstractionsArtifactRoot>
   </PropertyGroup>
 
   <!-- BuildAbstractions: Builds Microsoft.Data.SqlClient.Extensions.Abstractions -->
-  <Target Name="BuildAbstractions">
+  <PropertyGroup>
+    <BuildAbstractionsDependsOn Condition="'$(ReferenceType.ToLower())' == 'package' AND '$(SkipDependencyPack)' != 'true'">PackLogging</BuildAbstractionsDependsOn>
+  </PropertyGroup>
+  <Target Name="BuildAbstractions" DependsOnTargets="$(BuildAbstractionsDependsOn)">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(AbstractionsProjectPath)"
@@ -768,6 +844,17 @@
 
     <Message Text=">>> Packaging Microsoft.Data.SqlClient.Extensions.Abstractions via command: $(DotnetCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+
+    <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
+    <ItemGroup Condition="'$(ReferenceType.ToLower())' == 'package'">
+      <AbstractionsPackedArtifacts Include="$(AbstractionsArtifactRoot)*.nupkg" />
+      <AbstractionsPackedArtifacts Include="$(AbstractionsArtifactRoot)*.snupkg" />
+    </ItemGroup>
+    <Copy
+      Condition="'$(ReferenceType.ToLower())' == 'package'"
+      SourceFiles="@(AbstractionsPackedArtifacts)"
+      DestinationFolder="$(PackagesDir)"
+      SkipUnchangedFiles="true" />
   </Target>
 
   <!-- TestAbstractions: Runs Microsoft.Data.SqlClient.Extensions.Abstractions.Tests -->
@@ -804,10 +891,14 @@
     <AzureSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient.Extensions/Azure/</AzureSrcRoot>
     <AzureProjectPath>$(AzureSrcRoot)src/Azure.csproj</AzureProjectPath>
     <AzureTestProjectPath>$(AzureSrcRoot)test/Azure.Test.csproj</AzureTestProjectPath>
+    <AzureArtifactRoot>$(RepoRoot)artifacts/Microsoft.Data.SqlClient.Extensions.Azure/$(Configuration)/</AzureArtifactRoot>
   </PropertyGroup>
 
   <!-- BuildAzure: Builds Microsoft.Data.SqlClient.Extensions.Azure -->
-  <Target Name="BuildAzure">
+  <PropertyGroup>
+    <BuildAzureDependsOn Condition="'$(ReferenceType.ToLower())' == 'package' AND '$(SkipDependencyPack)' != 'true'">PackLogging;PackAbstractions</BuildAzureDependsOn>
+  </PropertyGroup>
+  <Target Name="BuildAzure" DependsOnTargets="$(BuildAzureDependsOn)">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(AzureProjectPath)"
@@ -855,6 +946,17 @@
 
     <Message Text=">>> Packaging Microsoft.Data.SqlClient.Extensions.Azure via command: $(DotnetCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+
+    <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
+    <ItemGroup Condition="'$(ReferenceType.ToLower())' == 'package'">
+      <AzurePackedArtifacts Include="$(AzureArtifactRoot)*.nupkg" />
+      <AzurePackedArtifacts Include="$(AzureArtifactRoot)*.snupkg" />
+    </ItemGroup>
+    <Copy
+      Condition="'$(ReferenceType.ToLower())' == 'package'"
+      SourceFiles="@(AzurePackedArtifacts)"
+      DestinationFolder="$(PackagesDir)"
+      SkipUnchangedFiles="true" />
   </Target>
 
   <!-- TestAzure: Runs Microsoft.Data.SqlClient.Extensions.Azure.Tests -->
@@ -875,14 +977,16 @@
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
-
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
         $(PackageVersionSqlClientArgument)
+        $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Running tests for Abstractions via command: $(DotnetCommand)" />
+    <Message Text=">>> Running tests for Azure via command: $(DotnetCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -891,6 +995,7 @@
   <PropertyGroup>
     <LoggingSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient.Internal/Logging/src/</LoggingSrcRoot>
     <LoggingProjectPath>$(LoggingSrcRoot)Logging.csproj</LoggingProjectPath>
+    <LoggingArtifactRoot>$(RepoRoot)artifacts/Microsoft.Data.SqlClient.Internal.Logging/$(Configuration)/</LoggingArtifactRoot>
   </PropertyGroup>
 
   <!-- BuildLogging: Builds Microsoft.Data.SqlClient.Internal.Logging -->
@@ -934,6 +1039,17 @@
 
     <Message Text=">>> Packaging Microsoft.Data.SqlClient.Internal.Logging via command: $(DotnetCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+
+    <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
+    <ItemGroup Condition="'$(ReferenceType.ToLower())' == 'package'">
+      <LoggingPackedArtifacts Include="$(LoggingArtifactRoot)*.nupkg" />
+      <LoggingPackedArtifacts Include="$(LoggingArtifactRoot)*.snupkg" />
+    </ItemGroup>
+    <Copy
+      Condition="'$(ReferenceType.ToLower())' == 'package'"
+      SourceFiles="@(LoggingPackedArtifacts)"
+      DestinationFolder="$(PackagesDir)"
+      SkipUnchangedFiles="true" />
   </Target>
 
   <!-- ================================================================= -->
@@ -941,6 +1057,7 @@
   <PropertyGroup>
     <SqlServerSrcRoot>$(RepoRoot)src/Microsoft.SqlServer.Server/</SqlServerSrcRoot>
     <SqlServerProjectPath>$(SqlServerSrcRoot)Microsoft.SqlServer.Server.csproj</SqlServerProjectPath>
+    <SqlServerArtifactRoot>$(RepoRoot)artifacts/Microsoft.SqlServer.Server/$(Configuration)/</SqlServerArtifactRoot>
   </PropertyGroup>
 
   <!-- BuildSqlServer: Builds the Microsoft.SqlServer.Server project -->
@@ -984,5 +1101,16 @@
 
     <Message Text=">>> Packaging Microsoft.SqlServer.Server via command: $(DotnetCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+
+    <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
+    <ItemGroup Condition="'$(ReferenceType.ToLower())' == 'package'">
+      <SqlServerPackedArtifacts Include="$(SqlServerArtifactRoot)*.nupkg" />
+      <SqlServerPackedArtifacts Include="$(SqlServerArtifactRoot)*.snupkg" />
+    </ItemGroup>
+    <Copy
+      Condition="'$(ReferenceType.ToLower())' == 'package'"
+      SourceFiles="@(SqlServerPackedArtifacts)"
+      DestinationFolder="$(PackagesDir)"
+      SkipUnchangedFiles="true" />
   </Target>
 </Project>
diff --git a/doc/Directory.Packages.props b/doc/Directory.Packages.props
index 2ead6c1757..d47f7e01b9 100644
--- a/doc/Directory.Packages.props
+++ b/doc/Directory.Packages.props
@@ -6,5 +6,6 @@
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.0-preview4.26064.3" />
     <PackageVersion Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="7.0.0-preview1.26064.3" />
     <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="1.0.0-preview1.26064.3" />
+    <PackageVersion Include="Microsoft.SqlServer.Server" Version="1.0.0" />
   </ItemGroup>
 </Project>
diff --git a/doc/samples/Microsoft.Data.SqlClient.Samples.csproj b/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
index c194fac4d0..44a153f6f2 100644
--- a/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
+++ b/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
@@ -10,14 +10,19 @@
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
 
+  <!-- The Samples only support referencing the SqlClient suite via package reference. -->
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Azure.Core" />
-    <PackageReference Include="Microsoft.Identity.Client" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="Microsoft.Data.SqlClient" />
     <PackageReference Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" />
     <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Azure" />
+    <PackageReference Include="Microsoft.SqlServer.Server" />
+  </ItemGroup>
+
+  <!-- Other package references. -->
+  <ItemGroup>
+    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Microsoft.Identity.Client" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
   </ItemGroup>
diff --git a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
index 8d051e5167..e9c3ad7c64 100644
--- a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
@@ -77,6 +77,16 @@ parameters:
   - name: akvPackageVersion
     type: string
 
+  # The version of the SqlServer package to depend on when referenceType is 'Package'.
+  - name: sqlServerPackageVersion
+    type: string
+    default: $(sqlServerPackageVersion)
+
+  # The name of the SqlServer pipeline artifact to download when referenceType is 'Package'.
+  - name: sqlServerArtifactsName
+    type: string
+    default: SqlServer.Artifacts
+
 jobs:
 - job: build_mds_akv_packages_job
   displayName: Build MDS & AKV Packages
@@ -115,6 +125,12 @@ jobs:
         artifactName: ${{ parameters.loggingArtifactsName }}
         targetPath: $(localFeedPath)
 
+    - task: DownloadPipelineArtifact@2
+      displayName: Download SqlServer Package Artifacts
+      inputs:
+        artifactName: ${{ parameters.sqlServerArtifactsName }}
+        targetPath: $(localFeedPath)
+
   # Install the .NET SDK.
   - template: /eng/pipelines/steps/install-dotnet.yml@self
 
@@ -139,6 +155,7 @@ jobs:
       build: MDS
       abstractionsPackageVersion: ${{parameters.abstractionsPackageVersion}}
       loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
+      sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
 
   - task: DotNetCoreCLI@2
     displayName: 'Create MDS NuGet Package'
@@ -153,6 +170,7 @@ jobs:
         -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+        -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
 
   # PackSqlClient outputs to artifacts/Microsoft.Data.SqlClient/<ReferenceType>-<Configuration>/.
   # Downstream steps (local feed copy, AKV pack, artifact publish) all expect packages at
@@ -184,6 +202,7 @@ jobs:
       loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
       mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
       akvPackageVersion: ${{ parameters.akvPackageVersion }}
+      sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
 
   - task: DotNetCoreCLI@2
     displayName: 'Create AKV Provider NuGet Package'
@@ -199,6 +218,7 @@ jobs:
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
         -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:PackageVersionAkvProvider=${{ parameters.akvPackageVersion }}
 
   - task: CopyFiles@2
diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
index 5c593e11e3..8b79bf7274 100644
--- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
@@ -88,6 +88,16 @@ parameters:
   - name: mdsPackageVersion
     type: string
 
+  # The name of the SqlServer pipeline artifact to download when referenceType is 'Package'.
+  - name: sqlServerArtifactsName
+    type: string
+    default: SqlServer.Artifacts
+
+  # The version of the SqlServer package to depend on when referenceType is 'Package'.
+  - name: sqlServerPackageVersion
+    type: string
+    default: $(sqlServerPackageVersion)
+
   # TODO: What is this for?
   - name: netcoreVersionTestUtils
     type: string
@@ -194,6 +204,12 @@ jobs:
         artifactName: ${{ parameters.mdsArtifactsName }}
         targetPath: $(Build.SourcesDirectory)/packages
 
+    - task: DownloadPipelineArtifact@2
+      displayName: Download SqlServer Package Artifacts
+      inputs:
+        artifactName: ${{ parameters.sqlServerArtifactsName }}
+        targetPath: $(Build.SourcesDirectory)/packages
+
   # Install the .NET SDK and Runtimes.
   - template: /eng/pipelines/steps/install-dotnet.yml@self
     parameters:
@@ -364,6 +380,7 @@ jobs:
         abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
         loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
         mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+        sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
 
   - ${{ if and(eq(parameters.enableX86Test, true), eq(parameters.operatingSystem, 'Windows')) }}:
     - template: /eng/pipelines/common/templates/steps/run-all-tests-step.yml@self
@@ -379,6 +396,7 @@ jobs:
         abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
         loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
         mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+        sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
 
   - template: /eng/pipelines/common/templates/steps/publish-test-results-step.yml@self
     parameters:
diff --git a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
index fd87d7d9ac..86ddc0ca45 100644
--- a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
+++ b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
@@ -50,6 +50,16 @@ parameters:
   - name: mdsPackageVersion
     type: string
 
+  # The name of the SqlServer pipeline artifacts to download.
+  - name: sqlServerArtifactsName
+    type: string
+    default: SqlServer.Artifacts
+
+  # The version of the SqlServer package to depend on when referenceType is 'Package'.
+  - name: sqlServerPackageVersion
+    type: string
+    default: $(sqlServerPackageVersion)
+
   # Jobs to run after the test jobs complete, if any.
   - name: postTestJobs
     type: jobList
@@ -114,6 +124,8 @@ stages:
                   loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
                   mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
                   mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+                  sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
+                  sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
                   prebuildSteps: ${{ parameters.prebuildSteps }}
                   targetFramework: ${{ targetFramework }}
                   netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
@@ -150,6 +162,8 @@ stages:
                     loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
                     mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
                     mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+                    sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
+                    sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
                     prebuildSteps: ${{ parameters.prebuildSteps }}
                     targetFramework: ${{ targetFramework }}
                     netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
diff --git a/eng/pipelines/common/templates/steps/ci-project-build-step.yml b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
index fe46ad66a2..e5fa6d4424 100644
--- a/eng/pipelines/common/templates/steps/ci-project-build-step.yml
+++ b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
@@ -68,6 +68,11 @@ parameters:
     type: string
     default: $(akvPackageVersion)
 
+  # Necessary when referenceType is Package.  Ignored when referenceType is Project.
+  - name: sqlServerPackageVersion
+    type: string
+    default: $(sqlServerPackageVersion)
+
 steps:
   # Build MDS
   - ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
@@ -85,6 +90,7 @@ steps:
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
 
   # Build AKV Provider
   - ${{ if or(eq(parameters.build, 'AkvProvider'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
@@ -103,3 +109,4 @@ steps:
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
diff --git a/eng/pipelines/common/templates/steps/run-all-tests-step.yml b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
index cf3ce206a4..5730b8cc0d 100644
--- a/eng/pipelines/common/templates/steps/run-all-tests-step.yml
+++ b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
@@ -22,6 +22,9 @@ parameters:
   - name: mdsPackageVersion
     type: string
 
+  - name: sqlServerPackageVersion
+    type: string
+
   - name: platform
     type: string
     default: $(Platform)
@@ -137,6 +140,7 @@ steps:
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
         arguments: >-
@@ -147,6 +151,7 @@ steps:
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestResultsFolderPath=TestResults
 
@@ -165,6 +170,7 @@ steps:
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
           -p:TestCodeCoverage=false
@@ -177,6 +183,7 @@ steps:
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
@@ -199,6 +206,7 @@ steps:
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
         arguments: >-
@@ -210,6 +218,7 @@ steps:
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestResultsFolderPath=TestResults
     retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
@@ -230,6 +239,7 @@ steps:
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
           -p:TestCodeCoverage=false
@@ -243,6 +253,7 @@ steps:
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
@@ -292,6 +303,7 @@ steps:
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
         -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:TestResultsFolderPath=TestResults
 
   - task: DotNetCoreCLI@2
@@ -308,6 +320,7 @@ steps:
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
         -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:TestFilters="category=flaky"
         -p:TestResultsFolderPath=TestResults
         -p:TestCodeCoverage=false
@@ -327,6 +340,7 @@ steps:
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
         -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:TestResultsFolderPath=TestResults
     retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
 
@@ -345,6 +359,7 @@ steps:
         -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
         -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
         -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:TestFilters="category=flaky"
         -p:TestResultsFolderPath=TestResults
         -p:TestCodeCoverage=false
diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index c8181aff5a..f5f2269494 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -185,14 +185,17 @@ stages:
       mdsPackageVersion: $(mdsPackageVersion)
       akvPackageVersion: $(akvPackageVersion)
       referenceType: ${{ parameters.referenceType }}
+      sqlServerArtifactsName: $(sqlServerArtifactsName)
+      sqlServerPackageVersion: $(sqlServerPackageVersion)
       SNIVersion: ${{ parameters.SNIVersion }}
       SNIValidationFeed: ${{ parameters.SNIValidationFeed }}
-      # When building SqlClient via packages, we must depend on the Abstractions and Logging
-      # packages.
+      # When building SqlClient via packages, we must depend on the Abstractions, Logging,
+      # and SqlServer packages.
       ${{ if eq(parameters.referenceType, 'Package') }}:
         additionalDependsOn:
           - build_abstractions_package_stage
           - build_logging_package_stage
+          - build_sqlserver_package_stage
 
   # Build the Azure package, and publish it to the pipeline artifacts under the
   # given artifact name.
@@ -206,16 +209,21 @@ stages:
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
       # When building via packages, we must depend on the Abstractions, Logging,
-      # and MDS packages.
+      # SqlServer, and MDS packages.
       ${{ if eq(parameters.referenceType, 'Package') }}:
         additionalDependsOn:
           - build_abstractions_package_stage
           - build_logging_package_stage
+          - build_sqlserver_package_stage
           - build_sqlclient_package_stage
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+      loggingArtifactsName: $(loggingArtifactsName)
+      loggingPackageVersion: $(loggingPackageVersion)
       mdsArtifactsName: $(mdsArtifactsName)
       mdsPackageVersion: $(mdsPackageVersion)
       referenceType: ${{ parameters.referenceType }}
+      sqlServerArtifactsName: $(sqlServerArtifactsName)
+      sqlServerPackageVersion: $(sqlServerPackageVersion)
 
   # Verify that all NuGet packages comply with Microsoft metadata requirements.
   # This runs on a Windows agent after all packages have been built and
@@ -240,14 +248,17 @@ stages:
       loggingPackageVersion: $(loggingPackageVersion)
       mdsArtifactsName: $(mdsArtifactsName)
       mdsPackageVersion: $(mdsPackageVersion)
+      sqlServerArtifactsName: $(sqlServerArtifactsName)
+      sqlServerPackageVersion: $(sqlServerPackageVersion)
       testJobTimeout: ${{ parameters.testJobTimeout }}
 
       # When testing MDS via packages, we must depend on the Abstractions,
-      # Logging, MDS, and Azure packages.
+      # Logging, SqlServer, MDS, and Azure packages.
       ${{ if eq(parameters.referenceType, 'Package') }}:
         additionalDependsOn:
           - build_abstractions_package_stage
           - build_logging_package_stage
+          - build_sqlserver_package_stage
           - build_sqlclient_package_stage
           - build_azure_package_stage
 
diff --git a/eng/pipelines/jobs/test-azure-package-ci-job.yml b/eng/pipelines/jobs/test-azure-package-ci-job.yml
index cd9b87e103..9c70433e33 100644
--- a/eng/pipelines/jobs/test-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-azure-package-ci-job.yml
@@ -26,6 +26,13 @@ parameters:
     type: string
     default: Logging.Artifacts
 
+  # The Logging package version to depend on.
+  #
+  # This is used when the referenceType is 'Package'.
+  - name: loggingPackageVersion
+    type: string
+    default: ''
+
   # The Abstractions package verion to depend on.
   #
   # This is used when the referenceType is 'Package'.
@@ -79,6 +86,21 @@ parameters:
   - name: mdsPackageVersion
     type: string
 
+  # The name of the SqlServer pipeline artifacts to download.
+  #
+  # This is used when the referenceType is 'Package'.  MDS depends on
+  # SqlServer.Server, so the package must be available for transitive restore.
+  - name: sqlServerArtifactsName
+    type: string
+    default: SqlServer.Artifacts
+
+  # The SqlServer package version to depend on.
+  #
+  # This is used when the referenceType is 'Package'.
+  - name: sqlServerPackageVersion
+    type: string
+    default: ''
+
   # The list of .NET Framework runtimes to test against.
   - name: netFrameworkRuntimes
     type: object
@@ -153,7 +175,9 @@ jobs:
           --verbosity ${{ parameters.dotnetVerbosity }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
+          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
           -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
+          -p:SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }}
 
       # Explicitly unset the $PLATFORM environment variable that is set by the
       # 'ADO Build properties' Library in the ADO SqlClientDrivers public
@@ -208,6 +232,16 @@ jobs:
             artifactName: ${{ parameters.mdsArtifactsName }}
             targetPath: $(Build.SourcesDirectory)/packages
 
+        # Download the SqlServer package artifacts into packages/.
+        #
+        # MDS depends on SqlServer.Server, so the package must be available for
+        # transitive restore.
+        - task: DownloadPipelineArtifact@2
+          displayName: Download SqlServer Package Artifacts
+          inputs:
+            artifactName: ${{ parameters.sqlServerArtifactsName }}
+            targetPath: $(Build.SourcesDirectory)/packages
+
       # Install the .NET SDK and Runtimes.
       - template: /eng/pipelines/steps/install-dotnet.yml@self
         parameters:
diff --git a/eng/pipelines/libraries/ci-build-variables.yml b/eng/pipelines/libraries/ci-build-variables.yml
index 142e5e21fe..438b011fab 100644
--- a/eng/pipelines/libraries/ci-build-variables.yml
+++ b/eng/pipelines/libraries/ci-build-variables.yml
@@ -24,35 +24,35 @@ variables:
 
   # Abstractions library assembly file version
   - name: abstractionsAssemblyFileVersion
-    value: 1.0.0.$(assemblyBuildNumber)
+    value: 1.1.0.$(assemblyBuildNumber)
 
   # Abstractions library NuGet package version
   - name: abstractionsPackageVersion
-    value: 1.0.0-ci$(Build.BuildNumber)
+    value: 1.1.0-preview1ci$(Build.BuildNumber)
 
   # AKV provider assembly file version
   - name: akvAssemblyFileVersion
-    value: 7.0.0.$(assemblyBuildNumber)
+    value: 7.1.0.$(assemblyBuildNumber)
 
   # AKV provider NuGet package version
   - name: akvPackageVersion
-    value: 7.0.0-ci$(Build.BuildNumber)
+    value: 7.1.0-preview1ci$(Build.BuildNumber)
 
   # Azure library assembly file version
   - name: azureAssemblyFileVersion
-    value: 1.0.0.$(assemblyBuildNumber)
+    value: 1.1.0.$(assemblyBuildNumber)
 
   # Azure library NuGet package version
   - name: azurePackageVersion
-    value: 1.0.0-ci$(Build.BuildNumber)
+    value: 1.1.0-preview1ci$(Build.BuildNumber)
 
   # Logging library assembly file version
   - name: loggingAssemblyFileVersion
-    value: 1.0.0.$(assemblyBuildNumber)
+    value: 1.1.0.$(assemblyBuildNumber)
 
   # Logging library NuGet package version
   - name: loggingPackageVersion
-    value: 1.0.0-ci$(Build.BuildNumber)
+    value: 1.1.0-preview1ci$(Build.BuildNumber)
 
   # MDS library NuGet package version
   # NOTE: This differs from the other structures! MdsVersions.props will deconstruct a provided
@@ -66,7 +66,7 @@ variables:
   #    assembly build number, so this must remain a three-part SemVer base with a prerelease
   #    suffix, not a four-part numeric version.
   - name: sqlServerPackageVersion
-    value: 1.0.0-ci$(AssemblyBuildNumber)
+    value: 1.1.0-preview1ci$(AssemblyBuildNumber)
 
   # Local NuGet feed directory where downloaded pipeline artifacts are placed.
   # NuGet.config references this as a local package source for restore.
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index 096da7e949..62f26b7aa3 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -222,6 +222,9 @@ stages:
                 - artifactName: '${{ parameters.loggingArtifactsName }}'
                   shortName: 'Logging'
                   version: '${{ parameters.loggingPackageVersion }}'
+                - artifactName: '${{ parameters.sqlServerArtifactsName }}'
+                  shortName: 'SqlServer'
+                  version: '${{ parameters.sqlServerPackageVersion }}'
               fileVersion: '${{ parameters.sqlClientFileVersion }}'
               packageFullName: 'Microsoft.Data.SqlClient'
               packageShortName: 'SqlClient'
@@ -284,6 +287,9 @@ stages:
                 - artifactName: '${{ parameters.sqlClientArtifactsName }}'
                   shortName: 'SqlClient'
                   version: '${{ parameters.sqlClientPackageVersion }}'
+                - artifactName: '${{ parameters.sqlServerArtifactsName }}'
+                  shortName: 'SqlServer'
+                  version: '${{ parameters.sqlServerPackageVersion }}'
               fileVersion: '${{ parameters.akvProviderFileVersion }}'
               packageFullName: 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
               packageShortName: 'AkvProvider'
diff --git a/eng/pipelines/onebranch/steps/build-buildproj-step.yml b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
index 9e02243537..080896ee10 100644
--- a/eng/pipelines/onebranch/steps/build-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
@@ -56,6 +56,7 @@ steps:
         -t:Build${{ parameters.packageShortName }}
         -p:Configuration=${{ parameters.buildConfiguration }}
         -p:ReferenceType=Package
+        -p:SkipDependencyPack=true
         -p:SigningKeyPath="$(keyFile.secureFilePath)"
         -p:BuildNumber="$(Build.BuildNumber)"
         -p:PackageVersion${{ parameters.packageShortName }}="${{ parameters.packageVersion }}"
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
index 1f7c22a554..89177f1d88 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
@@ -50,6 +50,7 @@ steps:
         -t:Build${{ parameters.packageShortName }}
         -p:Configuration=Release
         -p:ReferenceType=Package
+        -p:SkipDependencyPack=true
         -p:BuildNumber="$(Build.BuildNumber)"
         -p:PackageVersion${{ parameters.packageShortName }}="${{ parameters.packageVersion }}"
         ${{ parameters.dependencyArguments }}
diff --git a/eng/pipelines/stages/build-azure-package-ci-stage.yml b/eng/pipelines/stages/build-azure-package-ci-stage.yml
index 3b57ce8c3b..1da56a18ef 100644
--- a/eng/pipelines/stages/build-azure-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-azure-package-ci-stage.yml
@@ -101,6 +101,20 @@ parameters:
     - detailed
     - diagnostic
 
+  # The name of the Logging pipeline artifacts to download.
+  #
+  # This is used when the referenceType is 'Package'.
+  - name: loggingArtifactsName
+    type: string
+    default: Logging.Artifacts
+
+  # The Logging package version to depend on.
+  #
+  # This is used when the referenceType is 'Package'.
+  - name: loggingPackageVersion
+    type: string
+    default: ''
+
   # The name of the MDS pipeline artifacts to download.
   #
   # This is used when the referenceType is 'Package'.
@@ -114,6 +128,21 @@ parameters:
   - name: mdsPackageVersion
     type: string
 
+  # The name of the SqlServer pipeline artifacts to download.
+  #
+  # This is used when the referenceType is 'Package'.  MDS depends on
+  # SqlServer.Server, so the package must be available for transitive restore.
+  - name: sqlServerArtifactsName
+    type: string
+    default: SqlServer.Artifacts
+
+  # The SqlServer package version to depend on.
+  #
+  # This is used when the referenceType is 'Package'.
+  - name: sqlServerPackageVersion
+    type: string
+    default: ''
+
   # The C# project reference type to use when building and packing the packages.
   - name: referenceType
     type: string
@@ -152,8 +181,12 @@ stages:
           displayNamePrefix: Linux
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           jobNameSuffix: linux
+          loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
+          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
           mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+          sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
+          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.azurePoolName }}
@@ -170,8 +203,12 @@ stages:
           displayNamePrefix: Linux Integration
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           jobNameSuffix: linux_integration
+          loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
+          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
           mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+          sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
+          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.adoPoolName }}
@@ -197,8 +234,12 @@ stages:
           displayNamePrefix: Win
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           jobNameSuffix: windows
+          loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
+          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
           mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+          sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
+          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
           netFrameworkRuntimes: [net462]
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.azurePoolName }}
@@ -215,8 +256,12 @@ stages:
           displayNamePrefix: Win Integration
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           jobNameSuffix: windows_integration
+          loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
+          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
           mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+          sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
+          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
           netFrameworkRuntimes: [net462]
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.adoPoolName }}
@@ -251,8 +296,12 @@ stages:
           displayNamePrefix: macOS
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           jobNameSuffix: macos
+          loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
+          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
           mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+          sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
+          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.azurePoolName }}
diff --git a/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml b/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
index 57343a0006..858f1c8500 100644
--- a/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
@@ -56,6 +56,16 @@ parameters:
   - name: akvPackageVersion
     type: string
 
+  # The name of the SqlServer pipeline artifacts to download.
+  - name: sqlServerArtifactsName
+    type: string
+    default: SqlServer.Artifacts
+
+  # The SqlServer package version.
+  - name: sqlServerPackageVersion
+    type: string
+    default: $(sqlServerPackageVersion)
+
   # The C# project reference type to use when building and packing the packages.
   - name: referenceType
     type: string
@@ -97,6 +107,8 @@ stages:
         mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
         mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
         akvPackageVersion: ${{ parameters.akvPackageVersion }}
+        sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
+        sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
         ${{ if ne(parameters.SNIVersion, '') }}:
           prebuildSteps:
             - template: /eng/pipelines/common/templates/steps/override-sni-version.yml@self
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index e760ebe9f3..f8ac03e168 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -35,7 +35,11 @@
   <!-- Versioning ====================================================== -->
   <!--
     Versions for packages are assigned in the project's Versions.props file. Below, we provide
-    defaults for components of versions that are shared across all projects
+    defaults for components of versions that are shared across all projects.
+
+    Directory.Build.props evaluates before Directory.Packages.props, so defining these here
+    ensures FileVersionBuildNumber is set before any Versions.props runs (including those
+    imported by Directory.Packages.props in Package mode).
   -->
   <PropertyGroup>
     <!--
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
index 909e36df7f..203aabd1f5 100644
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
@@ -12,7 +12,10 @@
   </PropertyGroup>
 
   <!-- Versioning ====================================================== -->
-  <Import Project="Versions.props" />
+  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
+       in Package mode).  The guard property inside Versions.props makes this a no-op on the
+       second import. -->
+  <Import Project="Versions.props" Condition="'$(AkvProviderVersionsImported)' != 'true'" />
   <PropertyGroup>
     <AssemblyVersion>$(AkvProviderAssemblyVersion)</AssemblyVersion>
     <FileVersion>$(AkvProviderFileVersion)</FileVersion>
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
index 31f85b7da4..dd9ddc03d5 100644
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
@@ -13,13 +13,23 @@
       NuGet package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
   -->
 
+  <!--
+    Import guard: set on first import so that subsequent imports of this file are skipped.
+    Directory.Packages.props imports all Versions.props early in Package mode; the guard
+    prevents each csproj's own conditional import from re-importing and re-evaluating
+    version properties.
+  -->
+  <PropertyGroup>
+    <AkvProviderVersionsImported>true</AkvProviderVersionsImported>
+  </PropertyGroup>
+
   <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
     <!--
       This is the *next* version to release of AkvProvider. Update this after a version is released.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <AkvProviderVersionDefault>7.0.0</AkvProviderVersionDefault>
+    <AkvProviderVersionDefault>7.1.0-preview1</AkvProviderVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
index 45acd55488..0a9d29aa1e 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
@@ -22,7 +22,10 @@
   </ItemGroup>
 
   <!-- Versioning ====================================================== -->
-  <Import Project="Versions.props" />
+  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
+       in Package mode).  The guard property inside Versions.props makes this a no-op on the
+       second import. -->
+  <Import Project="Versions.props" Condition="'$(AbstractionsVersionsImported)' != 'true'" />
   <PropertyGroup>
     <AssemblyVersion>$(AbstractionsAssemblyVersion)</AssemblyVersion>
     <FileVersion>$(AbstractionsFileVersion)</FileVersion>
@@ -71,9 +74,9 @@
   <!-- Reference to Logging  -->
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj"
-                      Condition="'$(ReferenceType)' != 'Package' "/>
+                      Condition="'$(ReferenceType)' != 'Package'" />
     <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging"
-                      Condition="'$(ReferenceType)' == 'Package' "/>
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 
   <!-- CodeGen Targets ================================================= -->
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
index 14daeda570..cc6d4ca14a 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
@@ -13,6 +13,16 @@
       naming. It must be in the form: (Major).0.0.0
   -->
 
+  <!--
+    Import guard: set on first import so that subsequent imports of this file are skipped.
+    Directory.Packages.props imports all Versions.props early in Package mode; the guard
+    prevents each csproj's own conditional import from re-importing and re-evaluating
+    version properties.
+  -->
+  <PropertyGroup>
+    <AbstractionsVersionsImported>true</AbstractionsVersionsImported>
+  </PropertyGroup>
+
   <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
     <!--
@@ -20,7 +30,7 @@
       decided.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <AbstractionsVersionDefault>1.0.0</AbstractionsVersionDefault>
+    <AbstractionsVersionDefault>1.1.0-preview1</AbstractionsVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
index 423c55387f..dddf5673f9 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
@@ -22,7 +22,10 @@
   </ItemGroup>
 
   <!-- Versioning ====================================================== -->
-  <Import Project="Versions.props" />
+  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
+       in Package mode).  The guard property inside Versions.props makes this a no-op on the
+       second import. -->
+  <Import Project="Versions.props" Condition="'$(AzureVersionsImported)' != 'true'" />
   <PropertyGroup>
     <AssemblyVersion>$(AzureAssemblyVersion)</AssemblyVersion>
     <FileVersion>$(AzureFileVersion)</FileVersion>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
index 3c4bb9dfac..636face4e6 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
@@ -13,13 +13,23 @@
       form: (Major).(Minor).(Patch).(BuildNumber)
   -->
 
+  <!--
+    Import guard: set on first import so that subsequent imports of this file are skipped.
+    Directory.Packages.props imports all Versions.props early in Package mode; the guard
+    prevents each csproj's own conditional import from re-importing and re-evaluating
+    version properties.
+  -->
+  <PropertyGroup>
+    <AzureVersionsImported>true</AzureVersionsImported>
+  </PropertyGroup>
+
   <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
     <!--
       This is the *next* version to release of Azure. Update this when the next version is decided.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <AzureVersionDefault>1.0.0</AzureVersionDefault>
+    <AzureVersionDefault>1.1.0-preview1</AzureVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj
index f8461d8b92..d1c3e0fc5c 100644
--- a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj
+++ b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj
@@ -24,7 +24,10 @@
   </ItemGroup>
 
   <!-- Versioning ====================================================== -->
-  <Import Project="Versions.props" />
+  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
+       in Package mode).  The guard property inside Versions.props makes this a no-op on the
+       second import. -->
+  <Import Project="Versions.props" Condition="'$(LoggingVersionsImported)' != 'true'" />
   <PropertyGroup>
     <AssemblyVersion>$(LoggingAssemblyVersion)</AssemblyVersion>
     <FileVersion>$(LoggingFileVersion)</FileVersion>
diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
index eeb25b93ca..9d031d21d0 100644
--- a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
@@ -13,6 +13,16 @@
       naming. It must be in the form: (Major).0.0.0
   -->
 
+  <!--
+    Import guard: set on first import so that subsequent imports of this file are skipped.
+    Directory.Packages.props imports all Versions.props early in Package mode; the guard
+    prevents each csproj's own conditional import from re-importing and re-evaluating
+    version properties.
+  -->
+  <PropertyGroup>
+    <LoggingVersionsImported>true</LoggingVersionsImported>
+  </PropertyGroup>
+
   <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
     <!--
@@ -20,7 +30,7 @@
       decided.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <LoggingVersionDefault>1.0.0</LoggingVersionDefault>
+    <LoggingVersionDefault>1.1.0-preview1</LoggingVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
diff --git a/src/Microsoft.Data.SqlClient/Versions.props b/src/Microsoft.Data.SqlClient/Versions.props
index 2a915285b0..712263b73e 100644
--- a/src/Microsoft.Data.SqlClient/Versions.props
+++ b/src/Microsoft.Data.SqlClient/Versions.props
@@ -13,6 +13,16 @@
       package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
   -->
 
+  <!--
+    Import guard: set on first import so that subsequent imports of this file are skipped.
+    Directory.Packages.props imports all Versions.props early in Package mode; the guard
+    prevents each csproj's own conditional import from re-importing and re-evaluating
+    version properties.
+  -->
+  <PropertyGroup>
+    <SqlClientVersionsImported>true</SqlClientVersionsImported>
+  </PropertyGroup>
+
   <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
     <!--
diff --git a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
index 9d3860476c..a9474613e6 100644
--- a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
@@ -73,7 +73,10 @@
   </PropertyGroup>
 
   <!-- Versioning ====================================================== -->
-  <Import Project="../Versions.props" />
+  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
+       in Package mode).  The guard property inside Versions.props makes this a no-op on the
+       second import. -->
+  <Import Project="../Versions.props" Condition="'$(SqlClientVersionsImported)' != 'true'" />
   <PropertyGroup>
     <AssemblyVersion>$(SqlClientAssemblyVersion)</AssemblyVersion>
     <FileVersion>$(SqlClientFileVersion)</FileVersion>
@@ -112,9 +115,9 @@
   </ItemGroup>
 
   <!--
-    Reference to Abstractions package. Even though the ref project has a reference to the
-    abstractions package, the binaries will not be copied into this project's output, so we need to
-    make our own reference to the package to ensure it is brought in for compilation.
+    Reference to SqlServer and Abstractions packages. Even though the ref project has a reference to
+    these packages, their binaries will not be copied into this project's output, so we need to make
+    our own reference to them to ensure they are brought in for compilation.
   -->
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj"
@@ -122,6 +125,13 @@
     <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
                       Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
+  <!-- .NET Framework and .NET Standard 2.0 don't need to reference SqlServer. -->
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462' AND '$(TargetFramework)' != 'netstandard2.0'">
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.SqlServer.Server"
+                      Condition="'$(ReferenceType)' == 'Package'" />
+  </ItemGroup>
 
   <!-- References to external packages that the API refers to -->
   <!-- References for netframework -->
@@ -156,7 +166,6 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="System.Text.Json" />
@@ -170,7 +179,6 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
   </ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
index 0b6282965d..fe871099e6 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -11,7 +11,10 @@
   </PropertyGroup>
 
   <!-- Versioning ====================================================== -->
-  <Import Project="../Versions.props" />
+  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
+       in Package mode).  The guard property inside Versions.props makes this a no-op on the
+       second import. -->
+  <Import Project="../Versions.props" Condition="'$(SqlClientVersionsImported)' != 'true'" />
   <PropertyGroup>
     <AssemblyVersion>$(SqlClientAssemblyVersion)</AssemblyVersion>
     <FileVersion>$(SqlClientFileVersion)</FileVersion>
@@ -79,6 +82,13 @@
     <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
                       Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
+  <!-- .NET Framework and .NET Standard 2.0 don't need to reference SqlServer. -->
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462' AND '$(TargetFramework)' != 'netstandard2.0'">
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.SqlServer.Server"
+                      Condition="'$(ReferenceType)' == 'Package'" />
+  </ItemGroup>
 
   <!-- References for netframework -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
@@ -112,7 +122,6 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
   </ItemGroup>
@@ -124,7 +133,6 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="System.Text.Json" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index cd7fdb4b79..d7a7ef060a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -50,7 +50,10 @@
   </ItemGroup>
 
   <!-- Versioning ====================================================== -->
-  <Import Project="../Versions.props" />
+  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
+       in Package mode).  The guard property inside Versions.props makes this a no-op on the
+       second import. -->
+  <Import Project="../Versions.props" Condition="'$(SqlClientVersionsImported)' != 'true'" />
   <PropertyGroup>
     <AssemblyVersion>$(SqlClientAssemblyVersion)</AssemblyVersion>
     <FileVersion>$(SqlClientFileVersion)</FileVersion>
@@ -87,6 +90,7 @@
     <LoggingProjectPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj</LoggingProjectPath>
     <AbstractionsVersionsPropsPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props</AbstractionsVersionsPropsPath>
     <LoggingVersionsPropsPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props</LoggingVersionsPropsPath>
+    <SqlServerVersionsPropsPath>$(RepoRoot)/src/Microsoft.SqlServer.Server/Versions.props</SqlServerVersionsPropsPath>
 
     <!-- Properties consumed by the SDK NuGet pack task (NuGet.Build.Tasks.Pack.targets). -->
 
@@ -129,13 +133,15 @@
   </PropertyGroup>
 
   <!--
-    Conditionally import the Abstractions and Logging Versions.props files to obtain their
-    calculated package version values.
+    Conditionally import sibling Versions.props files to obtain their calculated package
+    version values for nuspec dependency token expansion.
   -->
   <Import Project="$(AbstractionsVersionsPropsPath)"
     Condition="'$(AbstractionsPackageVersion)' == '' AND Exists('$(AbstractionsVersionsPropsPath)')" />
   <Import Project="$(LoggingVersionsPropsPath)"
     Condition="'$(LoggingPackageVersion)' == '' AND Exists('$(LoggingVersionsPropsPath)')" />
+  <Import Project="$(SqlServerVersionsPropsPath)"
+    Condition="'$(SqlServerPackageVersion)' == '' AND Exists('$(SqlServerVersionsPropsPath)')" />
 
   <!--
     SDK pack does not reliably substitute dependency version tokens in this nuspec flow.
@@ -173,18 +179,24 @@
     <PropertyGroup>
       <CommitId Condition="'$(CommitId)' == ''">$(SourceRevisionId)</CommitId>
       <NuspecProperties>$(NuspecProperties);COMMITID=$(CommitId)</NuspecProperties>
+    </PropertyGroup>
+
+    <!-- Check for empty sibling package versions. -->
+    <PropertyGroup>
       <_AbstractionsPackageVersionTrimmed>$([System.String]::Copy('$(AbstractionsPackageVersion)').Trim())</_AbstractionsPackageVersionTrimmed>
       <_LoggingPackageVersionTrimmed>$([System.String]::Copy('$(LoggingPackageVersion)').Trim())</_LoggingPackageVersionTrimmed>
+      <_SqlServerPackageVersionTrimmed>$([System.String]::Copy('$(SqlServerPackageVersion)').Trim())</_SqlServerPackageVersionTrimmed>
     </PropertyGroup>
-
     <Error Condition="'$(_AbstractionsPackageVersionTrimmed)' == ''"
       Text="AbstractionsPackageVersion is required for SqlClient packaging. When packing via build.proj, set -p:PackageVersionAbstractions=&lt;version&gt;; when packing the project directly, set -p:AbstractionsPackageVersion=&lt;version&gt;; otherwise ensure the Abstractions Versions.props import can resolve a value." />
     <Error Condition="'$(_LoggingPackageVersionTrimmed)' == ''"
       Text="LoggingPackageVersion is required for SqlClient packaging. When packing via build.proj, set -p:PackageVersionLogging=&lt;version&gt;; when packing the project directly, set -p:LoggingPackageVersion=&lt;version&gt;; otherwise ensure the Logging Versions.props import can resolve a value." />
+    <Error Condition="'$(_SqlServerPackageVersionTrimmed)' == ''"
+      Text="SqlServerPackageVersion is required for SqlClient packaging. When packing via build.proj, set -p:PackageVersionSqlServer=&lt;version&gt;; when packing the project directly, set -p:SqlServerPackageVersion=&lt;version&gt;; otherwise ensure the SqlServer Versions.props import can resolve a value." />
 
     <!-- Expand the SqlClientPackNuspec template with the computed package versions. -->
     <PropertyGroup>
-      <_SqlClientPackNuspecExpandedText>$([System.IO.File]::ReadAllText('$(SqlClientPackNuspecTemplatePath)').Replace('$AbstractionsPackageVersion$','$(AbstractionsPackageVersion)').Replace('$LoggingPackageVersion$','$(LoggingPackageVersion)'))</_SqlClientPackNuspecExpandedText>
+      <_SqlClientPackNuspecExpandedText>$([System.IO.File]::ReadAllText('$(SqlClientPackNuspecTemplatePath)').Replace('$AbstractionsPackageVersion$','$(AbstractionsPackageVersion)').Replace('$LoggingPackageVersion$','$(LoggingPackageVersion)').Replace('$SqlServerPackageVersion$','$(SqlServerPackageVersion)'))</_SqlClientPackNuspecExpandedText>
     </PropertyGroup>
     <WriteLinesToFile File="$(SqlClientPackNuspecGeneratedPath)"
                       Lines="$(_SqlClientPackNuspecExpandedText)"
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
index 8f04553f94..da3a17bb9c 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
@@ -61,7 +61,7 @@
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
-        <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
+        <dependency id="Microsoft.SqlServer.Server" version="$SqlServerPackageVersion$" />
         <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
       </group>
@@ -73,7 +73,7 @@
         <dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.13" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
-        <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
+        <dependency id="Microsoft.SqlServer.Server" version="$SqlServerPackageVersion$" />
         <dependency id="System.Configuration.ConfigurationManager" version="9.0.13" exclude="Compile" />
         <dependency id="System.Security.Cryptography.Pkcs" version="9.0.13" />
       </group>
@@ -85,7 +85,7 @@
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
-        <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
+        <dependency id="Microsoft.SqlServer.Server" version="$SqlServerPackageVersion$" />
         <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
         <dependency id="System.Text.Json" version="10.0.3" />
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index 3f014f9fbe..71e4f305e1 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -3,6 +3,7 @@
     <AssemblyName>Microsoft.Data.SqlClient.TestCommon</AssemblyName>
     <RootNamespace>Microsoft.Data.SqlClient.TestCommon</RootNamespace>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
 
     <!--
       This is a shared helper library, not a test project. IsTestProject prevents test adapters
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs
index 0576a64eba..b051f2cc26 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs
@@ -333,6 +333,9 @@ public void GetChar_ThrowsNotSupported()
         }
 
         [Theory]
+        #if NETFRAMEWORK
+        [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+        #endif
         [MemberData(
             nameof(GetUdtTypeTestData.Get),
             MemberType = typeof(GetUdtTypeTestData),
@@ -350,7 +353,6 @@ public void GetUdt_ReturnsValue(Type udtType, object value, string serverTypeNam
 
             Assert.Equal(value.ToString(), record.GetValue(0).ToString());
         }
-
         [Theory]
         [MemberData(
             nameof(GetXXXBadTypeTestData.Get),
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 71d0f0b0cb..1145fa4790 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -328,6 +328,13 @@
 
   <!-- References ====================================================== -->
   <!-- Test target references -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.SqlServer.Server"
+                      Condition="'$(ReferenceType)' == 'Package'" />
+  </ItemGroup>
+
   <ItemGroup>
     <!-- If the tests are compiled/running in "Package" mode, the reference to MDS will be to the -->
     <!-- nuget package. This enables ensuring the tests run successfully against a fully-packaged -->
@@ -367,7 +374,6 @@
     <ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
     <ProjectReference Include="SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
     <ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
@@ -394,7 +400,6 @@
     <ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
     <ProjectReference Include="SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
     <ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
index 3719a09328..b590a7c451 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
@@ -35,6 +35,9 @@ public static class SqlServerTypesTest
 
         // Synapse: Parse error at line: 1, column: 48: Incorrect syntax near 'hierarchyid'.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        #if NETFRAMEWORK
+        [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+        #endif
         public static void GetSchemaTableTest()
         {
             string db = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString).InitialCatalog;
@@ -61,6 +64,9 @@ public static void GetSchemaTableTest()
 
         // Synapse: Parse error at line: 1, column: 48: Incorrect syntax near 'hierarchyid'.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        #if NETFRAMEWORK
+        [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+        #endif
         public static void GetValueTest()
         {
             using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
@@ -219,6 +225,9 @@ void ActAndAssert(int index, string expectedHexString)
 
         // Synapse: Parse error at line: 1, column: 41: Incorrect syntax near 'hierarchyid'.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        #if NETFRAMEWORK
+        [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+        #endif
         public static void TestUdtSchemaMetadata()
         {
             using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
@@ -373,6 +382,9 @@ private static string GetUdtName(Type udtClrType)
 
         // Synapse: Parse error at line: 1, column: 8: Incorrect syntax near 'geometry'.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        #if NETFRAMEWORK
+        [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+        #endif
         public static void TestSqlServerTypesInsertAndRead()
         {
             string tableName = DataTestUtility.GetLongName("Type");
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
index d481e4cca6..c98b9b3fae 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>Address</RootNamespace>
     <AssemblyName>Address</AssemblyName>
@@ -16,6 +16,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SqlServer.Server" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.SqlServer.Server"
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
index 6066c1c751..db53171c6e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>Circle</RootNamespace>
     <AssemblyName>Circle</AssemblyName>
@@ -16,6 +16,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SqlServer.Server" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.SqlServer.Server"
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
index 67f26c9ae9..e115355bfe 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
@@ -16,6 +16,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SqlServer.Server" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.SqlServer.Server"
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
index aa1dd19dd2..02e0193f82 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
@@ -16,6 +16,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SqlServer.Server" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.SqlServer.Server"
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index 8c59d27572..82e900e54c 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -39,16 +39,26 @@
   <!-- References ====================================================== -->
   <!-- Test target reference -->
   <ItemGroup>
+    <!--
+      The Unit Test project only supports ReferenceType = Project since it needs access to the
+      internals of sibling packages.
+    -->
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj" />
   </ItemGroup>
 
+  <Target Name="ValidateReferenceType"
+          BeforeTargets="Restore;PrepareForBuild"
+          Condition="'$(ReferenceType)' != 'Project'">
+    <Error Text="Microsoft.Data.SqlClient.UnitTests.csproj only supports ReferenceType=Project." />
+  </Target>
+
   <!-- References for netframework -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Transactions" />
 
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <PackageReference Include="xunit" />
@@ -65,7 +75,6 @@
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
diff --git a/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj b/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj
index ead90d9eac..a995fa13b9 100644
--- a/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj
+++ b/src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj
@@ -6,7 +6,10 @@
   </PropertyGroup>
 
   <!-- Versioning ====================================================== -->
-  <Import Project="Versions.props" />
+  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
+       in Package mode).  The guard property inside Versions.props makes this a no-op on the
+       second import. -->
+  <Import Project="Versions.props" Condition="'$(SqlServerVersionsImported)' != 'true'" />
   <PropertyGroup>
     <AssemblyVersion>$(SqlServerAssemblyVersion)</AssemblyVersion>
     <FileVersion>$(SqlServerFileVersion)</FileVersion>
diff --git a/src/Microsoft.SqlServer.Server/Versions.props b/src/Microsoft.SqlServer.Server/Versions.props
index 0a342f9426..3615bd95a8 100644
--- a/src/Microsoft.SqlServer.Server/Versions.props
+++ b/src/Microsoft.SqlServer.Server/Versions.props
@@ -13,6 +13,16 @@
       naming. It must be in the form: (Major).0.0.0
   -->
 
+  <!--
+    Import guard: set on first import so that subsequent imports of this file are skipped.
+    Directory.Packages.props imports all Versions.props early in Package mode; the guard
+    prevents each csproj's own conditional import from re-importing and re-evaluating
+    version properties.
+  -->
+  <PropertyGroup>
+    <SqlServerVersionsImported>true</SqlServerVersionsImported>
+  </PropertyGroup>
+
   <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
     <!--
@@ -20,7 +30,7 @@
       decided.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <SqlServerVersionDefault>1.0.0</SqlServerVersionDefault>
+    <SqlServerVersionDefault>1.1.0-preview1</SqlServerVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->

From 0759beef16ec4101f7b32a1745d517b68893c392 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Wed, 20 May 2026 14:44:11 -0700
Subject: [PATCH 113/298] Remove mcp.json (#4296)

* Move from .vscode/mcp.json to .mcp.json

* Clean up MCP servers

* Delete .mcp.json
---
 .vscode/mcp.json | 75 ------------------------------------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 .vscode/mcp.json

diff --git a/.vscode/mcp.json b/.vscode/mcp.json
deleted file mode 100644
index a3f5378943..0000000000
--- a/.vscode/mcp.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-	"servers": {
-		"ado": {
-			"args": [
-				"-y",
-				"@azure-devops/mcp",
-				"SqlClientDrivers"
-			],
-			"command": "npx",
-			"type": "stdio"
-		},
-		"bluebird_ctaip": {
-			"headers": {
-				"x-mcp-ec-branch": "certAuth",
-				"x-mcp-ec-organization": "sqlclientdrivers",
-				"x-mcp-ec-project": "ADO.NET",
-				"x-mcp-ec-repository": "Microsoft.Data.SqlClient.Ctaip"
-			},
-			"type": "http",
-			"url": "https://mcp.bluebird-ai.net/"
-		},
-		"bluebird_onebranchwiki": {
-			"headers": {
-				"x-mcp-ec-branch": "main",
-				"x-mcp-ec-organization": "onebranch",
-				"x-mcp-ec-project": "OneBranch Customer Wiki",
-				"x-mcp-ec-repository": "OneBranch-Customer-Wiki.v2"
-			},
-			"type": "http",
-			"url": "https://mcp.bluebird-ai.net/"
-		},
-		"bluebird-mcp-1es-docs": {
-			"headers": {
-				"x-mcp-ec-branch": "main",
-				"x-mcp-ec-organization": "mseng",
-				"x-mcp-ec-project": "1ES",
-				"x-mcp-ec-repository": "1ES-on-EngHub"
-			},
-			"type": "http",
-			"url": "https://mcp.bluebird-ai.net/"
-		},
-		"bluebird-mcp-sni": {
-			"headers": {
-				"x-mcp-ec-branch": "master",
-				"x-mcp-ec-organization": "SqlClientDrivers",
-				"x-mcp-ec-project": "ADO.NET",
-				"x-mcp-ec-repository": "Microsoft.Data.SqlClient.SNI"
-			},
-			"type": "http",
-			"url": "https://mcp.bluebird-ai.net/"
-		},
-		"bluebird-mcp-sqlclient": {
-			"headers": {
-				"x-mcp-ec-branch": "internal/main",
-				"x-mcp-ec-organization": "SqlClientDrivers",
-				"x-mcp-ec-project": "ADO.NET",
-				"x-mcp-ec-repository": "dotnet-sqlclient"
-			},
-			"type": "http",
-			"url": "https://mcp.bluebird-ai.net/"
-		},
-		"github": {
-			"type": "http",
-			"url": "https://api.githubcopilot.com/mcp/"
-		},
-		"icm": {
-			"type": "http",
-			"url": "https://icm-mcp-prod.azure-api.net/v1/"
-		},
-		"microsoft-learn": {
-			"type": "http",
-			"url": "https://learn.microsoft.com/api/mcp"
-		}
-	}
-}
\ No newline at end of file

From 8da13c8d8af6b6acfab20ba77b3062bf3776681c Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 21 May 2026 12:40:49 -0300
Subject: [PATCH 114/298] Fix LoginWithFailover missing parser state check
 (#4140)

---
 .github/copilot-instructions.md               |   1 +
 .github/instructions/features.instructions.md |   1 +
 AGENTS.md                                     |   9 +-
 .../Connection/SqlConnectionInternal.cs       |  12 +-
 .../Data/SqlClient/LocalAppContextSwitches.cs |  25 ++
 .../Common/LocalAppContextSwitchesHelper.cs   |  15 +
 .../SqlClient/LocalAppContextSwitchesTest.cs  |   1 +
 .../ConnectionFailoverTests.cs                | 342 +++++++++++++++++-
 .../TDS.Servers/TransientTdsErrorTdsServer.cs |   2 +-
 .../TransientTdsErrorTdsServerArguments.cs    |   8 +
 10 files changed, 409 insertions(+), 7 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index e024b30d6f..c0bbc25457 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -50,6 +50,7 @@ This project includes several key products and libraries that facilitate SQL Ser
 - **Data Encryption**: Supports data encryption for secure data transmission.
 - **Logging and Diagnostics**: Provides event source tracing diagnostic capabilities for troubleshooting.
 - **Failover Support**: Handles automatic failover scenarios for high availability.
+  - Compatibility switch: `Switch.Microsoft.Data.SqlClient.UseLegacyFailoverAlternationOnLoginSqlErrors` (default `false`) can restore legacy alternation behavior in `LoginWithFailover` for login-phase SQL errors.
 - **Cross-Platform Support**: Compatible with both .NET Framework and .NET Core, allowing applications to run on Windows, Linux, and macOS.
 - **Column Encryption AKV Provider**: Supports Azure Key Vault (AKV) provider for acquiring keys from Azure Key Vault to be used for encryption and decryption.
 
diff --git a/.github/instructions/features.instructions.md b/.github/instructions/features.instructions.md
index 3ecba2cc4e..34262b8db6 100644
--- a/.github/instructions/features.instructions.md
+++ b/.github/instructions/features.instructions.md
@@ -246,6 +246,7 @@ AppContext switches allow runtime behavior changes without modifying connection
 | `Switch.Microsoft.Data.SqlClient.EnableMultiSubnetFailoverByDefault` | `false` | Sets `MultiSubnetFailover=true` as the default for all connections |
 | `Switch.Microsoft.Data.SqlClient.EnableUserAgent` | varies | Controls sending user agent information to SQL Server |
 | `Switch.Microsoft.Data.SqlClient.IgnoreServerProvidedFailoverPartner` | `false` | Ignores failover partner information sent by the server |
+| `Switch.Microsoft.Data.SqlClient.UseLegacyFailoverAlternationOnLoginSqlErrors` | `false` | Restores legacy `LoginWithFailover` alternation for login-phase SQL errors when parser state is not `Closed` |
 | `Switch.Microsoft.Data.SqlClient.LegacyRowVersionNullBehavior` | `false` | Restores legacy null handling for rowversion columns |
 | `Switch.Microsoft.Data.SqlClient.LegacyVarTimeZeroScaleBehaviour` | `false` | Restores legacy zero-scale behavior for time/datetime2/datetimeoffset |
 | `Switch.Microsoft.Data.SqlClient.MakeReadAsyncBlocking` | `false` | Makes ReadAsync behave synchronously (legacy compat) |
diff --git a/AGENTS.md b/AGENTS.md
index 42f3a39399..06bc0edfd1 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -79,10 +79,11 @@ Do **not** create branches directly under `main`, `dev/`, or any other top-level
 ### Bug Fix Workflow
 1. Understand the issue from the bug report
 2. Locate relevant code in `src/Microsoft.Data.SqlClient/src/` (do NOT modify legacy `netcore/src/` or `netfx/src/`)
-3. Write a failing test that reproduces the issue
-4. Implement the fix
-5. Ensure all tests pass
-6. Update documentation if behavior changes
+3. Check `.github/instructions/features.instructions.md` for existing AppContext switches (including failover compatibility switches) before introducing behavior changes
+4. Write a failing test that reproduces the issue
+5. Implement the fix
+6. Ensure all tests pass
+7. Update documentation if behavior changes
 
 ### Feature Implementation
 1. Review the feature specification
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index e62541137c..6d067bab7f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -3635,7 +3635,17 @@ private void LoginWithFailover(
                         continue;
                     }
 
-                    if (IsDoNotRetryConnectError(sqlex) || timeout.IsExpired)
+                    bool isLoginPhaseSqlError = _parser?.State is not TdsParserState.Closed;
+
+                    // If state != closed, indicates that the parser encountered an error while
+                    // processing the login response (e.g. an explicit error token). Transient
+                    // network errors that impact connectivity will result in parser state being
+                    // closed. Only network-level errors should trigger failover alternation;
+                    // login-phase errors (like transient errors) should be thrown so they can
+                    // be handled by the outer ConnectRetryCount loop.
+                    if ((isLoginPhaseSqlError && !LocalAppContextSwitches.UseLegacyFailoverAlternationOnLoginSqlErrors) ||
+                        IsDoNotRetryConnectError(sqlex) ||
+                        timeout.IsExpired)
                     {
                         // No more time to try again.
                         // Caller will call LoginFailure()
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
index 16e0abb7ec..0177338bf2 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
@@ -58,6 +58,13 @@ internal static class LocalAppContextSwitches
     private const string IgnoreServerProvidedFailoverPartnerString =
         "Switch.Microsoft.Data.SqlClient.IgnoreServerProvidedFailoverPartner";
 
+    /// <summary>
+    /// The name of the app context switch that controls whether failover
+    /// alternation should use legacy behavior for login-phase SQL errors.
+    /// </summary>
+    private const string UseLegacyFailoverAlternationOnLoginSqlErrorsString =
+        "Switch.Microsoft.Data.SqlClient.UseLegacyFailoverAlternationOnLoginSqlErrors";
+
     /// <summary>
     /// The name of the app context switch that controls whether to preserve
     /// legacy behavior where Timestamp/RowVersion fields return empty byte
@@ -182,6 +189,11 @@ private enum SwitchValue : byte
     /// </summary>
     private static SwitchValue s_ignoreServerProvidedFailoverPartner = SwitchValue.None;
 
+    /// <summary>
+    /// The cached value of the UseLegacyFailoverAlternationOnLoginSqlErrors switch.
+    /// </summary>
+    private static SwitchValue s_useLegacyFailoverAlternationOnLoginSqlErrors = SwitchValue.None;
+
     /// <summary>
     /// The cached value of the LegacyRowVersionNullBehavior switch.
     /// </summary>
@@ -409,6 +421,19 @@ public static bool GlobalizationInvariantMode
             defaultValue: false,
             ref s_ignoreServerProvidedFailoverPartner);
 
+    /// <summary>
+    /// When set to true, LoginWithFailover preserves legacy behavior and may
+    /// alternate to the failover partner on login-phase SQL errors where the
+    /// parser state is not Closed.
+    ///
+    /// The default value of this switch is false.
+    /// </summary>
+    public static bool UseLegacyFailoverAlternationOnLoginSqlErrors =>
+        AcquireAndReturn(
+            UseLegacyFailoverAlternationOnLoginSqlErrorsString,
+            defaultValue: false,
+            ref s_useLegacyFailoverAlternationOnLoginSqlErrors);
+
     /// <summary>
     /// In System.Data.SqlClient and Microsoft.Data.SqlClient prior to 3.0.0 a
     /// field with type Timestamp/RowVersion would return an empty byte array.
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
index 8102f47d51..11523b3f83 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
@@ -47,6 +47,7 @@ public sealed class LocalAppContextSwitchesHelper : IDisposable
     private readonly bool? _globalizationInvariantModeOriginal;
     #endif
     private readonly bool? _ignoreServerProvidedFailoverPartnerOriginal;
+    private readonly bool? _useLegacyFailoverAlternationOnLoginSqlErrorsOriginal;
     private readonly bool? _legacyRowVersionNullBehaviorOriginal;
     private readonly bool? _legacyVarTimeZeroScaleBehaviourOriginal;
     private readonly bool? _makeReadAsyncBlockingOriginal;
@@ -98,6 +99,8 @@ public LocalAppContextSwitchesHelper()
             #endif
             _ignoreServerProvidedFailoverPartnerOriginal =
                 GetSwitchValue("s_ignoreServerProvidedFailoverPartner");
+            _useLegacyFailoverAlternationOnLoginSqlErrorsOriginal =
+                GetSwitchValue("s_useLegacyFailoverAlternationOnLoginSqlErrors");
             _legacyRowVersionNullBehaviorOriginal =
                 GetSwitchValue("s_legacyRowVersionNullBehavior");
             _legacyVarTimeZeroScaleBehaviourOriginal =
@@ -154,6 +157,9 @@ public void Dispose()
             SetSwitchValue(
                 "s_ignoreServerProvidedFailoverPartner",
                 _ignoreServerProvidedFailoverPartnerOriginal);
+            SetSwitchValue(
+                "s_useLegacyFailoverAlternationOnLoginSqlErrors",
+                _useLegacyFailoverAlternationOnLoginSqlErrorsOriginal);
             SetSwitchValue(
                 "s_legacyRowVersionNullBehavior", 
                 _legacyRowVersionNullBehaviorOriginal);
@@ -242,6 +248,15 @@ public bool? IgnoreServerProvidedFailoverPartner
         set => SetSwitchValue("s_ignoreServerProvidedFailoverPartner", value);
     }
 
+    /// <summary>
+    /// Get or set the UseLegacyFailoverAlternationOnLoginSqlErrors switch value.
+    /// </summary>
+    public bool? UseLegacyFailoverAlternationOnLoginSqlErrors
+    {
+        get => GetSwitchValue("s_useLegacyFailoverAlternationOnLoginSqlErrors");
+        set => SetSwitchValue("s_useLegacyFailoverAlternationOnLoginSqlErrors", value);
+    }
+
     /// <summary>
     /// Get or set the LegacyRowVersionNullBehavior switch value.
     /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
index a5db02faa0..a468d8fd37 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
@@ -28,6 +28,7 @@ public void TestDefaultAppContextSwitchValues()
         Assert.False(LocalAppContextSwitches.UseConnectionPoolV2);
         Assert.False(LocalAppContextSwitches.TruncateScaledDecimal);
         Assert.False(LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner);
+        Assert.False(LocalAppContextSwitches.UseLegacyFailoverAlternationOnLoginSqlErrors);
         Assert.False(LocalAppContextSwitches.EnableMultiSubnetFailoverByDefault);
         #if NET
         Assert.False(LocalAppContextSwitches.GlobalizationInvariantMode);
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index 33a7d7c600..f2c50285ed 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Data;
+using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.Connection;
 using Microsoft.Data.SqlClient.Tests.Common;
 using Microsoft.SqlServer.TDS.Servers;
@@ -172,7 +173,7 @@ public void NetworkTimeout_ShouldFail()
                 InitialCatalog = "master",// Required for failover partner to work
                 ConnectTimeout = 1,
                 ConnectRetryInterval = 1,
-                ConnectRetryCount = 0, // Disable retry 
+                ConnectRetryCount = 0, // Disable retry
                 Encrypt = false,
                 MultiSubnetFailover = false,
 #if NETFRAMEWORK
@@ -336,6 +337,10 @@ public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFai
             Assert.Equal(1, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
         }
 
+        /// <summary>
+        /// Verifies login-phase transient SQL errors are retried on the primary endpoint and
+        /// do not trigger failover-partner alternation.
+        /// </summary>
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -372,6 +377,8 @@ public void TransientFault_ShouldConnectToPrimary(uint errorCode)
             using SqlConnection connection = new(builder.ConnectionString);
 
             // Act
+            // First login receives the transient token; outer connect retry opens a fresh parser
+            // and retries against the same primary endpoint.
             connection.Open();
 
             // Assert
@@ -380,6 +387,8 @@ public void TransientFault_ShouldConnectToPrimary(uint errorCode)
 
             // Failures should prompt the client to return to the original server, resulting in a login count of 2
             Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
+            // Login-phase errors must NOT trigger failover alternation
+            Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
         [Theory]
@@ -430,6 +439,10 @@ public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
             Assert.Fail();
         }
 
+        /// <summary>
+        /// Verifies user-provided failover partner does not change behavior for login-phase
+        /// transient SQL errors; retries stay on primary.
+        /// </summary>
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -467,6 +480,8 @@ public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint e
             using SqlConnection connection = new(builder.ConnectionString);
 
             // Act
+            // Even with a configured partner, this path should use outer connect retry
+            // against primary rather than alternation inside LoginWithFailover.
             connection.Open();
 
             // Assert
@@ -475,6 +490,8 @@ public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint e
 
             // Failures should prompt the client to return to the original server, resulting in a login count of 2
             Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
+            // Login-phase errors must NOT trigger failover alternation
+            Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
         [Theory]
@@ -592,5 +609,328 @@ public void TransientFault_IgnoreServerProvidedFailoverPartner_ShouldConnectToUs
             // 1 for the failover connection
             Assert.Equal(1, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
         }
+
+        /// <summary>
+        /// Async parity for primary-only retry behavior on login-phase transient SQL errors.
+        /// </summary>
+        [Theory]
+        [InlineData(40613)]
+        [InlineData(42108)]
+        [InlineData(42109)]
+        public async Task TransientFault_Async_ShouldConnectToPrimary_NotFailover(uint errorCode)
+        {
+            // Async parity for TransientFault_ShouldConnectToPrimary.
+            // A transient login-token error must be retried against the primary;
+            // the failover partner must never be contacted.
+
+            using TdsServer failoverServer = new(
+                new TdsServerArguments
+                {
+                    FailoverPartner = "localhost,1234",
+                });
+            failoverServer.Start();
+
+            using TransientTdsErrorTdsServer server = new(
+                new TransientTdsErrorTdsServerArguments()
+                {
+                    IsEnabledTransientError = true,
+                    Number = errorCode,
+                    FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+                });
+            server.Start();
+
+            SqlConnectionStringBuilder builder = new()
+            {
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                InitialCatalog = "master",
+                ConnectTimeout = 30,
+                ConnectRetryInterval = 1,
+                Encrypt = false,
+                Pooling = false,
+            };
+            using SqlConnection connection = new(builder.ConnectionString);
+
+            // Asserts async open follows the same retry and failover-selection rules as sync.
+            await connection.OpenAsync();
+
+            Assert.Equal(ConnectionState.Open, connection.State);
+            Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
+            Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
+            // Login-phase errors must NOT trigger failover alternation
+            Assert.Equal(0, failoverServer.PreLoginCount);
+        }
+
+        /// <summary>
+        /// Async parity with user-provided partner: login-phase transient SQL errors should
+        /// still retry on primary without failover alternation.
+        /// </summary>
+        [Theory]
+        [InlineData(40613)]
+        [InlineData(42108)]
+        [InlineData(42109)]
+        public async Task TransientFault_WithUserProvidedPartner_Async_ShouldConnectToPrimary_NotFailover(uint errorCode)
+        {
+            // Async parity for TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary.
+            // Even with a user-provided failover partner, a login-token error must not
+            // cause alternation to the failover server.
+
+            using TdsServer failoverServer = new(
+                new TdsServerArguments
+                {
+                    FailoverPartner = "localhost,1234",
+                });
+            failoverServer.Start();
+
+            using TransientTdsErrorTdsServer server = new(
+                new TransientTdsErrorTdsServerArguments()
+                {
+                    IsEnabledTransientError = true,
+                    Number = errorCode,
+                    FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+                });
+            server.Start();
+
+            SqlConnectionStringBuilder builder = new()
+            {
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                InitialCatalog = "master",
+                ConnectTimeout = 30,
+                ConnectRetryInterval = 1,
+                Encrypt = false,
+                FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+            };
+            using SqlConnection connection = new(builder.ConnectionString);
+
+            // Asserts async open with explicit partner still avoids failover alternation.
+            await connection.OpenAsync();
+
+            Assert.Equal(ConnectionState.Open, connection.State);
+            Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
+            Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
+            // Login-phase errors must NOT trigger failover alternation
+            Assert.Equal(0, failoverServer.PreLoginCount);
+        }
+
+        /// <summary>
+        /// Verifies pooled connections are not cleared and failover is not attempted when a
+        /// login-phase transient SQL error occurs with a user-provided failover partner.
+        /// </summary>
+        [Theory]
+        [InlineData(40613)]
+        [InlineData(42108)]
+        [InlineData(42109)]
+        public void TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(uint errorCode)
+        {
+            // With pooling enabled and a user-provided failover partner, a transient
+            // login-token error must not clear the pool and must not contact the failover server.
+
+            using TdsServer failoverServer = new(
+                new TdsServerArguments
+                {
+                    FailoverPartner = "localhost,1234",
+                });
+            failoverServer.Start();
+
+            // Start with errors disabled so the pool warms up successfully.
+            using TransientTdsErrorTdsServer server = new(
+                new TransientTdsErrorTdsServerArguments()
+                {
+                    FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+                });
+            server.Start();
+
+            SqlConnectionStringBuilder builder = new()
+            {
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                InitialCatalog = "master",
+                ConnectTimeout = 30,
+                ConnectRetryInterval = 1,
+                Encrypt = SqlConnectionEncryptOption.Optional,
+                FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+                Pooling = true,
+            };
+
+            // Keep one connection open so the next Open() cannot reuse it and must perform login.
+            using SqlConnection warmup = new(builder.ConnectionString);
+            warmup.Open();
+
+            // Enable the transient error for the next login attempt.
+            server.SetErrorBehavior(true, errorCode);
+
+            // ConnectRetryCount > 0 (default 1) so the client retries and succeeds.
+            using SqlConnection connection = new(builder.ConnectionString);
+            connection.Open();
+            Assert.Equal(ConnectionState.Open, connection.State);
+            Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
+
+            connection.Close();
+            warmup.Close();
+
+            // If the pool is not cleared, this open should reuse a pooled connection without a new login.
+            using SqlConnection pooledConnection = new(builder.ConnectionString);
+            pooledConnection.Open();
+
+            Assert.Equal(ConnectionState.Open, pooledConnection.State);
+            Assert.Equal($"localhost,{server.EndPoint.Port}", pooledConnection.DataSource);
+
+            // 1 warmup login + 1 failed login + 1 retry login.
+            Assert.Equal(3, server.PreLoginCount - server.AbandonedPreLoginCount);
+            Assert.Equal(3, server.Login7Count);
+            // Failover server must never have been contacted.
+            Assert.Equal(0, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
+            Assert.Equal(0, failoverServer.Login7Count);
+        }
+
+        /// <summary>
+        /// Verifies ConnectRetryCount=0 propagates login-phase transient SQL errors immediately
+        /// and never attempts failover alternation.
+        /// </summary>
+        [Theory]
+        [InlineData(40613)]
+        [InlineData(42108)]
+        [InlineData(42109)]
+        public void TransientFault_RetryDisabled_WithUserProvidedPartner_ShouldFail_NotFailover(uint errorCode)
+        {
+            // When ConnectRetryCount = 0 and the server returns a login-phase token error,
+            // the exception must propagate immediately and the failover partner must not be
+            // contacted (parser state is not Closed, so the new guard must kick in).
+
+            using TdsServer failoverServer = new(
+                new TdsServerArguments
+                {
+                    FailoverPartner = "localhost,1234",
+                });
+            failoverServer.Start();
+
+            using TransientTdsErrorTdsServer server = new(
+                new TransientTdsErrorTdsServerArguments()
+                {
+                    IsEnabledTransientError = true,
+                    Number = errorCode,
+                    FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+                });
+            server.Start();
+
+            SqlConnectionStringBuilder builder = new()
+            {
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                InitialCatalog = "master",
+                ConnectTimeout = 30,
+                ConnectRetryInterval = 1,
+                ConnectRetryCount = 0,
+                Encrypt = false,
+                FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+            };
+            using SqlConnection connection = new(builder.ConnectionString);
+
+            // No outer connect retry is allowed, so the first transient error should surface.
+            SqlException ex = Assert.Throws<SqlException>(() => connection.Open());
+
+            Assert.Equal((int)errorCode, ex.Number);
+            Assert.Equal(ConnectionState.Closed, connection.State);
+            // The parser was not closed (login-phase error), so the failover alternation branch
+            // must not have been entered.
+            Assert.Equal(0, failoverServer.PreLoginCount);
+        }
+
+        /// <summary>
+        /// Isolates the parser-state guard by using a non-fatal login error token: without the
+        /// guard, LoginWithFailover alternates to partner; with the guard, retry stays on primary.
+        /// </summary>
+        [Fact]
+        public void NonFatalTransientLoginError_WithUserProvidedPartner_ShouldRetryPrimary_NotFailover()
+        {
+            // This test isolates the parser-state guard added to LoginWithFailover.
+            // We emit a transient login error with non-fatal severity so the connection
+            // is not automatically doomed/broken by existing breakConnection logic.
+
+            using TdsServer failoverServer = new(
+                new TdsServerArguments
+                {
+                    FailoverPartner = "localhost,1234",
+                });
+            failoverServer.Start();
+
+            using TransientTdsErrorTdsServer server = new(
+                new TransientTdsErrorTdsServerArguments()
+                {
+                    IsEnabledTransientError = true,
+                    Number = 40613,
+                    // Use non-fatal severity so break/doom logic does not short-circuit the path.
+                    ErrorClass = 16,
+                    RepeatCount = 1,
+                    FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+                });
+            server.Start();
+
+            SqlConnectionStringBuilder builder = new()
+            {
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                InitialCatalog = "master",
+                ConnectTimeout = 30,
+                ConnectRetryInterval = 1,
+                Encrypt = false,
+                Pooling = false,
+                FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+            };
+
+            using SqlConnection connection = new(builder.ConnectionString);
+            connection.Open();
+
+            Assert.Equal(ConnectionState.Open, connection.State);
+            Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
+            Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
+            Assert.Equal(0, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
+        }
+
+        /// <summary>
+        /// Verifies opt-in legacy behavior: login-phase SQL errors can alternate to the
+        /// failover partner when UseLegacyFailoverAlternationOnLoginSqlErrors is enabled.
+        /// </summary>
+        [Fact]
+        public void NonFatalTransientLoginError_WithLegacySwitch_ShouldAlternateToFailoverPartner()
+        {
+            using LocalAppContextSwitchesHelper switchesHelper = new();
+            switchesHelper.UseLegacyFailoverAlternationOnLoginSqlErrors = true;
+
+            using TdsServer failoverServer = new(
+                new TdsServerArguments
+                {
+                    FailoverPartner = "localhost,1234",
+                });
+            failoverServer.Start();
+
+            using TransientTdsErrorTdsServer server = new(
+                new TransientTdsErrorTdsServerArguments()
+                {
+                    IsEnabledTransientError = true,
+                    Number = 40613,
+                    // Keep the login token non-fatal so parser state, not break/doom behavior,
+                    // drives this branch decision.
+                    ErrorClass = 16,
+                    RepeatCount = 1,
+                    FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+                });
+            server.Start();
+
+            SqlConnectionStringBuilder builder = new()
+            {
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                InitialCatalog = "master",
+                ConnectTimeout = 30,
+                ConnectRetryInterval = 1,
+                Encrypt = false,
+                Pooling = false,
+                FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
+            };
+
+            using SqlConnection connection = new(builder.ConnectionString);
+            connection.Open();
+
+            Assert.Equal(ConnectionState.Open, connection.State);
+            Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", connection.DataSource);
+            Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
+            Assert.Equal(1, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
+        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs
index 6ec7ac2528..ba20fb4d02 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs
@@ -89,7 +89,7 @@ private TDSMessageCollection GenerateErrorMessage(TDSMessage request)
             TDSUtilities.Log(Arguments.Log, "Request", request);
 
             // Prepare ERROR token with the denial details
-            TDSErrorToken errorToken = new TDSErrorToken(errorNumber, 1, 20, errorMessage);
+            TDSErrorToken errorToken = new TDSErrorToken(errorNumber, 1, Arguments.ErrorClass, errorMessage);
 
             // Log response
             TDSUtilities.Log(Arguments.Log, "Response", errorToken);
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServerArguments.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServerArguments.cs
index 6a61d9cc6f..5f1adacd61 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServerArguments.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServerArguments.cs
@@ -25,5 +25,13 @@ public class TransientTdsErrorTdsServerArguments : TdsServerArguments
         /// The number of times the transient error should be raised.
         /// </summary>
         public int RepeatCount { get; set; } = 1;
+
+        /// <summary>
+        /// Error class (severity) to emit in ERROR token.
+        /// The default is 20 to preserve existing fatal-error behavior.
+        /// Fatal starts at 20 (TdsEnums.FATAL_ERROR_CLASS), so set values below 20
+        /// when a test needs to avoid automatic break/doom behavior in the client.
+        /// </summary>
+        public byte ErrorClass { get; set; } = 20;
     }
 }

From ed896eb910107aa7edd6e454198b88231b97ee06 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Thu, 21 May 2026 11:45:40 -0500
Subject: [PATCH 115/298] Add CodeQL suppression "random number" dictionary key
 (#4276)

---
 .../src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs
index b990270924..23fa1c9359 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs
@@ -89,7 +89,7 @@ private SqlDependencyPerAppDomainDispatcher()
 #if NETFRAMEWORK
                 _timeoutTimer = new Timer(new TimerCallback(TimeoutTimerCallback), null, Timeout.Infinite, Timeout.Infinite);
 
-                // If rude abort - we'll leak.  This is acceptable for now.  
+                // If rude abort - we'll leak.  This is acceptable for now.
                 AppDomain.CurrentDomain.DomainUnload += new EventHandler(UnloadEventHandler);
 #else
                 _timeoutTimer = ADP.UnsafeCreateTimer(
@@ -131,7 +131,7 @@ private void UnloadEventHandler(object sender, EventArgs e)
             }
         }
 
-        //  When remoted across appdomains, MarshalByRefObject links by default time out if there is no activity 
+        //  When remoted across appdomains, MarshalByRefObject links by default time out if there is no activity
         //  within a few minutes.  Add this override to prevent marshaled links from timing out.
 #if NET
         [Obsolete("InitializeLifetimeService() is not supported after .Net5.0 and throws PlatformNotSupportedException.")]
@@ -216,7 +216,7 @@ internal string AddCommandEntry(string commandHash, SqlDependency dep)
                             dependencyList.Add(dep);
 
                             // map command hash to notification we just created to reuse it for the next client
-                            _commandHashToNotificationId.Add(commandHash, notificationId);
+                            _commandHashToNotificationId.Add(commandHash, notificationId); // CodeQL [SM04207] This value is an opaque query-notification correlation identifier, not a secret or security token. It is used only for uniqueness and exact dictionary lookup after SQL Server round-trips the user data. Guid.NewGuid provides sufficient collision resistance for the expected in-process notification cardinality, and changing the generator would not materially improve security.
                             _notificationIdToDependenciesHash.Add(notificationId, dependencyList);
                         }
 

From c7245542d2307db07835eb7fae35857ac8fcd6a8 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Fri, 22 May 2026 04:49:12 -0700
Subject: [PATCH 116/298] pwsh via dotnet tool (#4134)

Co-authored-by: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
---
 .github/workflows/codeql.yml                  |  4 +++
 BUILDGUIDE.md                                 | 17 ++++++++----
 dotnet-tools.json                             |  7 +++++
 .../templates/jobs/ci-build-nugets-job.yml    |  3 +++
 .../templates/jobs/ci-run-tests-job.yml       |  3 +++
 eng/pipelines/steps/restore-dotnet-tools.yml  | 14 ++++++++++
 .../ref/Microsoft.Data.SqlClient.csproj       | 18 ++++++++++---
 .../SQL/AdapterTest/AdapterTest.cs            |  2 ++
 tools/targets/CompareMdsRefAssemblies.targets | 27 ++++++++++++-------
 9 files changed, 77 insertions(+), 18 deletions(-)
 create mode 100644 eng/pipelines/steps/restore-dotnet-tools.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 75e4411e4b..45890dfdf4 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -72,6 +72,10 @@ jobs:
       uses: actions/setup-dotnet@v5.2.0
       with:
         global-json-file: global.json
+      
+    - name: Restore dotnet tools
+      shell: bash
+      run: dotnet tool restore
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index a927945c05..073f6afc68 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -19,15 +19,22 @@ on operating systems that do not support .NET Framework. As such, it is not nece
 
 ### Miscellaneous
 
-**PowerShell** is required to run several miscellaneous tasks as part of building and packaging. On
-Windows systems, either the built-in `powershell.exe` will be used, or if installed, the modern
-`pwsh` will be used. On Linux and macOS systems, the `pwsh` command is required to be in the `$PATH`
-environment variable. For specific instructions see: [Install
-PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/install-powershell)
+**PowerShell** is included as a .NET local tool in this repository. Running `dotnet tool restore`
+(see below) will make it available via `dotnet tool run pwsh -- <args>`. Note that `pwsh` is not
+added to PATH — it must be invoked through `dotnet tool run`. Build targets handle this
+automatically; manual invocation is only needed for ad-hoc scripting.
 
 The **NuGet** binary is optional for inspection and feed-management workflows, but build and packaging flows in this
 repository are run through `dotnet build` against `build.proj`.
 
+### .NET Tools
+
+This repository uses .NET local tools (e.g. PowerShell) that must be restored before building. Run the following from the repository root:
+
+```bash
+dotnet tool restore
+```
+
 ## Developer Workflow
 
 Once you've cloned the repository and made your changes to the codebase, it is time to build, test, and optionally
diff --git a/dotnet-tools.json b/dotnet-tools.json
index 1f59e06063..11e3494512 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -15,6 +15,13 @@
         "apicompat"
       ],
       "rollForward": false
+    },
+    "powershell": {
+      "version": "7.6.0",
+      "commands": [
+        "pwsh"
+      ],
+      "rollForward": false
     }
   }
 }
\ No newline at end of file
diff --git a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
index e9c3ad7c64..de9b4d284f 100644
--- a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
@@ -134,6 +134,9 @@ jobs:
   # Install the .NET SDK.
   - template: /eng/pipelines/steps/install-dotnet.yml@self
 
+  # Restore dotnet CLI tools (e.g. pwsh, apicompat) before building.
+  - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+
   # When we're performing a Debug build, we still want to try _compiling_ the
   # code in Release mode to ensure downstream pipelines don't encounter
   # compilation errors.  We won't use the Release artifacts for anything else
diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
index 8b79bf7274..4c42af8dc1 100644
--- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
@@ -222,6 +222,9 @@ jobs:
       ${{ else }}:
         runtimes: [8.x, 9.x]
 
+  # Restore dotnet CLI tools (e.g. pwsh, apicompat) before building.
+  - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+
   - ${{ if ne(parameters.prebuildSteps, '') }}:
     - ${{ parameters.prebuildSteps }} # extra steps to run before the build like downloading sni and the required configuration
 
diff --git a/eng/pipelines/steps/restore-dotnet-tools.yml b/eng/pipelines/steps/restore-dotnet-tools.yml
new file mode 100644
index 0000000000..b213583e82
--- /dev/null
+++ b/eng/pipelines/steps/restore-dotnet-tools.yml
@@ -0,0 +1,14 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Restores dotnet CLI tools defined in dotnet-tools.json.
+# This step should be invoked after install-dotnet.yml and before any build
+# steps that depend on the restored tools (e.g. pwsh, apicompat).
+
+steps:
+  - script: dotnet tool restore
+    displayName: Restore .NET Tools
+    workingDirectory: $(Build.SourcesDirectory)
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
index fe871099e6..43aca3f1c1 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -44,6 +44,7 @@
     <OutputPath>$(ArtifactPath)$(AssemblyName).ref/$(ReferenceType)-$(Configuration)/</OutputPath>
   </PropertyGroup>
 
+
   <!-- Trim Docs for IntelliSense ====================================== -->
   <!--
     It has been determined that including the remarks section in IntelliSense docs looks bad in
@@ -51,16 +52,27 @@
     them in the xml files, though, because those are the source for the docs site, which needs to
     have the full documentation.
   -->
+  <!-- Verifies that dotnet local tools have been restored (pwsh is required for doc trimming). -->
+  <Target Name="_CheckPwshToolRestored">
+    <Exec Command="dotnet tool run pwsh -- -Version"
+          WorkingDirectory="$(RepoRoot)"
+          ConsoleToMsBuild="true"
+          IgnoreExitCode="true">
+      <Output TaskParameter="ExitCode" PropertyName="_PwshExitCode" />
+    </Exec>
+    <Error Condition="'$(_PwshExitCode)' != '0'"
+           Text="The 'pwsh' dotnet local tool is not available. Run 'dotnet tool restore' from the repository root before building." />
+  </Target>
+
   <!-- This target runs after Build, and trims XML documentation generated in the $(OutputPath) of the project where this target is included.-->
   <Target Name="TrimDocsForIntelliSense"
           AfterTargets="Build"
+          DependsOnTargets="_CheckPwshToolRestored"
           Condition="'$(IsCrossTargetingBuild)' != 'true' AND '$(GenerateDocumentationFile)' == 'true'">
 
     <PropertyGroup>
-      <PowerShellCommand Condition="'$(OS)' == 'Windows_NT'">powershell.exe</PowerShellCommand>
-      <PowerShellCommand Condition="'$(OS)' != 'Windows_NT'">pwsh</PowerShellCommand>
       <PowerShellCommand>
-        $(PowerShellCommand)
+        dotnet tool run pwsh --
           -NonInteractive
           -ExecutionPolicy Unrestricted
           -Command "$(RepoRoot)tools\intellisense\TrimDocs.ps1 -inputFile '$(DocumentationFile)' -outputFile '$(DocumentationFile)'"
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
index 9bf5351a83..798890c3fa 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
@@ -107,6 +107,8 @@ public void SimpleFillTest()
 
         // TODO Synapse: Remove Northwind dependency by creating required tables in setup.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        // https://github.com/dotnet/SqlClient/issues/4135
+        [Trait("Category", "flaky")]
         public void FillShouldAllowRetryLogicProviderToBeInvoked()
         {
             int maxRetries = 3;
diff --git a/tools/targets/CompareMdsRefAssemblies.targets b/tools/targets/CompareMdsRefAssemblies.targets
index bccfa00930..47caaa7a56 100644
--- a/tools/targets/CompareMdsRefAssemblies.targets
+++ b/tools/targets/CompareMdsRefAssemblies.targets
@@ -59,10 +59,24 @@
       Text="BaselinePackageVersion is required. Specify the published MDS NuGet package version to compare against, e.g.: /p:BaselinePackageVersion=6.1.4" />
   </Target>
 
+  <!-- ================================================================== -->
+  <!-- _CheckApiCompatToolRestored                                        -->
+  <!-- ================================================================== -->
+  <Target Name="_CheckApiCompatToolRestored">
+    <Exec Command="dotnet tool run apicompat -- --version"
+          WorkingDirectory="$(RepoRoot)"
+          ConsoleToMsBuild="true"
+          IgnoreExitCode="true">
+      <Output TaskParameter="ExitCode" PropertyName="_ApiCompatExitCode" />
+    </Exec>
+    <Error Condition="'$(_ApiCompatExitCode)' != '0'"
+           Text="The 'apicompat' dotnet local tool is not available. Run 'dotnet tool restore' from the repository root before running this target." />
+  </Target>
+
   <!-- ================================================================== -->
   <!-- _DownloadBaselinePackage                                           -->
   <!-- ================================================================== -->
-  <Target Name="_DownloadBaselinePackage" DependsOnTargets="_ValidateBaselineVersion;_SetApiCompatProperties">
+  <Target Name="_DownloadBaselinePackage" DependsOnTargets="_ValidateBaselineVersion;_CheckApiCompatToolRestored;_SetApiCompatProperties">
     <!-- Skip download if already extracted -->
     <Message
       Condition="Exists('$(BaselineExtractDir)')"
@@ -90,13 +104,6 @@
       Text="Baseline ref assemblies available at $(BaselineExtractDir)ref\" />
   </Target>
 
-  <!-- ================================================================== -->
-  <!-- _RestoreTools                                                      -->
-  <!-- ================================================================== -->
-  <Target Name="_RestoreTools" DependsOnTargets="_SetApiCompatProperties">
-    <Exec Command="dotnet tool restore" WorkingDirectory="$(RepoRoot)" />
-  </Target>
-
   <!-- ================================================================== -->
   <!-- _BuildRefProject                                                   -->
   <!-- ================================================================== -->
@@ -111,7 +118,7 @@
   <!-- _RunRefApiCompat                                                   -->
   <!-- ================================================================== -->
   <Target Name="_RunRefApiCompat"
-          DependsOnTargets="_DownloadBaselinePackage;_RestoreTools;_BuildRefProject">
+          DependsOnTargets="_DownloadBaselinePackage;_BuildRefProject">
 
     <!--
       For each TFM, compare the consolidated ref output against the baseline
@@ -134,7 +141,7 @@
       Text="--- Comparing %(_RefTfm.Identity) ref vs baseline $(BaselinePackageVersion) ---" />
 
     <Exec
-      Command="dotnet apicompat -l &quot;$(BaselineExtractDir)ref/%(_RefTfm.Identity)/Microsoft.Data.SqlClient.dll&quot; -r &quot;$(RefOutputDir)%(_RefTfm.Identity)/Microsoft.Data.SqlClient.dll&quot; --strict-mode &gt; &quot;$(ApiCompatResultsDir)%(_RefTfm.Identity).txt&quot; 2&gt;&amp;1"
+      Command="dotnet tool run apicompat -- -l &quot;$(BaselineExtractDir)ref/%(_RefTfm.Identity)/Microsoft.Data.SqlClient.dll&quot; -r &quot;$(RefOutputDir)%(_RefTfm.Identity)/Microsoft.Data.SqlClient.dll&quot; --strict-mode &gt; &quot;$(ApiCompatResultsDir)%(_RefTfm.Identity).txt&quot; 2&gt;&amp;1"
       WorkingDirectory="$(RepoRoot)"
       ContinueOnError="ErrorAndContinue" />
 

From 4601acc21e813530f656ef55fb46d631d71d0e5f Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Wed, 27 May 2026 16:51:38 -0500
Subject: [PATCH 117/298] Use symbols-variables-v3 not Symbols Publishing
 library (#4216)

---
 eng/pipelines/onebranch/sqlclient-non-official.yml        | 4 ++--
 eng/pipelines/onebranch/variables/onebranch-variables.yml | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index 882e7e0658..584bd050f9 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -235,8 +235,8 @@ extends:
           symbolsAzureSubscription: '$(SymbolsAzureSubscription)'
           symbolsPublishProjectName: '$(SymbolsPublishProjectNameSqlClient)'
           # Non-Official pipelines must publish to the PPE symbol server.
-          symbolsPublishServer: '$(SymbolsPublishServerPPE)'
-          symbolsPublishTokenUri: '$(SymbolsPublishTokenUriPPE)'
+          symbolsPublishServer: '$(SymbolsPublishServerPpe)'
+          symbolsPublishTokenUri: '$(SymbolsPublishTokenUriPpe)'
           symbolsUploadAccount: '$(SymbolsUploadAccount)'
 
       - template: /eng/pipelines/onebranch/stages/release-stages.yml@self
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index d5fa784885..5a36dbbe75 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -25,10 +25,12 @@ variables:
   #
   # SymbolsAzureSubscription
   # SymbolsPublishProjectNameSqlClient
-  # SymbolsPublishServerProd / SymbolsPublishServerPPE
-  # SymbolsPublishTokenUriProd / SymbolsPublishTokenUriPPE
+  # SymbolsPublishServerProd
+  # SymbolsPublishServerPpe
+  # SymbolsPublishTokenUriProd
+  # SymbolsPublishTokenUriPpe
   # SymbolsUploadAccount
-  - group: 'Symbols Publishing'
+  - group: 'symbols-variables-v3'
 
   # OneBranch Template Variables ###########################################
 

From 50ed7c7e0b97b245b7317bd76d8b087429e5dba9 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 28 May 2026 09:03:22 -0700
Subject: [PATCH 118/298] Eng | Fix official and kerberos pipelines (#4313)

* Eng | Fix official and kerberos pipelines

* Do not publish code coverage when previous stages failed
---
 eng/pipelines/kerberos/sqlclient-kerberos.yml        | 10 +++++++++-
 eng/pipelines/onebranch/jobs/build-buildproj-job.yml |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/kerberos/sqlclient-kerberos.yml b/eng/pipelines/kerberos/sqlclient-kerberos.yml
index eb0016f9fc..af1b04266f 100644
--- a/eng/pipelines/kerberos/sqlclient-kerberos.yml
+++ b/eng/pipelines/kerberos/sqlclient-kerberos.yml
@@ -131,6 +131,10 @@ stages:
             parameters:
               runtimes: [8.x, 9.x]
 
+          # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets
+          # such as _CheckPwshToolRestored that run during the SqlClient ref project build.
+          - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+
           # --- Update test configuration ---
           # Uses runtime variables from the matrix ($(managedSNI)) so we use
           # inline PowerShell instead of the shared config template which
@@ -224,6 +228,10 @@ stages:
             parameters:
               runtimes: [8.x, 9.x]
 
+          # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets
+          # such as _CheckPwshToolRestored that run during the SqlClient ref project build.
+          - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+
           # --- Update test configuration (with Kerberos credentials) ---
           - pwsh: |
               $jdata = Get-Content -Raw "config.default.json" | ConvertFrom-Json
@@ -283,7 +291,7 @@ stages:
     dependsOn:
       - windows
       - linux
-    condition: succeededOrFailed()
+    condition: succeeded()
     jobs:
       - template: /eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml@self
         parameters:
diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index 3fa44c3ce6..34c775ad5c 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -130,6 +130,10 @@ jobs:
       # Install the .NET SDK.
       - template: /eng/pipelines/steps/install-dotnet.yml@self
 
+      # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets
+      # such as _CheckPwshToolRestored that run during RoslynAnalyzers and Build.
+      - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+
       # Perform Roslyn analysis before building, since this step will clobber build output.
       - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml@self
         parameters:

From 4a4bd9d1f8ba8e6fae92782a6eb9f5224646f8f0 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 28 May 2026 09:12:17 -0700
Subject: [PATCH 119/298] Disable Async cancellation tests on Kerberos/Managed
 Instance pipelines (#4311)

---
 .../tests/ManualTests/DataCommon/DataTestUtility.cs          | 2 ++
 .../SQL/AsyncTest/AsyncCancelledConnectionsTest.cs           | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index 1e5458e130..623f645ddb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -387,6 +387,8 @@ private static Task<string> AcquireTokenAsync(string authorityURL, string userID
 
         public static bool IsKerberosTest => !string.IsNullOrEmpty(KerberosDomainUser) && !string.IsNullOrEmpty(KerberosDomainPassword);
 
+        public static bool IsNotKerberosTest => !IsKerberosTest;
+
         #nullable enable
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs
index 9dd87d8f21..00bba56fc2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs
@@ -25,7 +25,10 @@ public class AsyncCancelledConnectionsTest
         private Random _random;
 
         // Disabled on Azure since this test fails on concurrent runs on same database.
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        // Disabled on Kerberos and Managed Instance pipelines due to environment-specific instability.
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup),
+            nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotManagedInstance),
+            nameof(DataTestUtility.IsNotKerberosTest))]
         [InlineData(true)]
         [InlineData(false)]
         public async Task CancelAsyncConnections(bool useMars)

From 3499785cbf5947be3e2df914b9ed32388161d745 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 28 May 2026 23:26:50 -0700
Subject: [PATCH 120/298] Tests | Address transient errors in CI pipelines
 (#4314)

* Retry installing dotnet in CI + address flaky tests

* One more flaky test

* FIx TestDefaultAppContextSwitchValues to be deterministic
---
 eng/pipelines/steps/install-dotnet.yml        | 10 ++++++
 .../SqlClient/LocalAppContextSwitchesTest.cs  | 33 ++++++++++++++++++-
 .../ConnectionFailoverTests.cs                |  2 ++
 .../ConnectionRoutingTestsAzure.cs            |  1 +
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/steps/install-dotnet.yml b/eng/pipelines/steps/install-dotnet.yml
index e6a50ee03f..5774984663 100644
--- a/eng/pipelines/steps/install-dotnet.yml
+++ b/eng/pipelines/steps/install-dotnet.yml
@@ -55,8 +55,12 @@ steps:
   - ${{ if ne(parameters.architecture, 'arm64') }}:
 
     # Install the SDK listed in the global.json file.
+    #
+    # retryCountOnTaskFailure is set because UseDotNet@2 fails intermittently
+    # in CI due to transient network/CDN issues when downloading the SDK.
     - task: UseDotNet@2
       displayName: Install .NET SDK (global.json)
+      retryCountOnTaskFailure: 3
       inputs:
         installationPath: ${{ parameters.installDir }}
         packageType: sdk
@@ -69,6 +73,7 @@ steps:
     - ${{ each version in parameters.runtimes }}:
       - task: UseDotNet@2
         displayName: Install .NET ${{ version }} Runtime
+        retryCountOnTaskFailure: 3
         inputs:
           installationPath: ${{ parameters.installDir }}
           packageType: runtime
@@ -81,8 +86,13 @@ steps:
   - ${{ else }}:
 
     # Use the install script for ARM64.
+    #
+    # retryCountOnTaskFailure provides an outer retry around the script's
+    # internal retry loop, in case the script download itself or the entire
+    # step fails due to transient issues.
     - task: PowerShell@2
       displayName: Install .NET SDK and Runtimes for ARM64
+      retryCountOnTaskFailure: 3
       inputs:
         targetType: filePath
         pwsh: true
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
index a468d8fd37..075cca0cb1 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
+using Microsoft.Data.SqlClient.Tests.Common;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.UnitTests;
@@ -18,6 +18,37 @@ public class LocalAppContextSwitchesTest
     [Fact]
     public void TestDefaultAppContextSwitchValues()
     {
+        // LocalAppContextSwitches caches each switch value on first access for
+        // the lifetime of the process.  Other tests running in parallel may
+        // already have triggered caching, or may use LocalAppContextSwitchesHelper
+        // to mutate the cached fields via reflection.  To make this test
+        // deterministic, acquire the helper (which serializes against every
+        // other helper user via a process-wide semaphore) and reset each
+        // cached field to None so the properties re-read from AppContext.
+        using LocalAppContextSwitchesHelper switchesHelper = new();
+
+        switchesHelper.EnableMultiSubnetFailoverByDefault = null;
+        switchesHelper.IgnoreServerProvidedFailoverPartner = null;
+        switchesHelper.UseLegacyFailoverAlternationOnLoginSqlErrors = null;
+        switchesHelper.LegacyRowVersionNullBehavior = null;
+        switchesHelper.LegacyVarTimeZeroScaleBehaviour = null;
+        switchesHelper.MakeReadAsyncBlocking = null;
+        switchesHelper.SuppressInsecureTlsWarning = null;
+        switchesHelper.TruncateScaledDecimal = null;
+        switchesHelper.UseCompatibilityAsyncBehaviour = null;
+        switchesHelper.UseCompatibilityProcessSni = null;
+        switchesHelper.UseConnectionPoolV2 = null;
+        switchesHelper.UseMinimumLoginTimeout = null;
+        #if NET
+        switchesHelper.GlobalizationInvariantMode = null;
+        #endif
+        #if NET && _WINDOWS
+        switchesHelper.UseManagedNetworking = null;
+        #endif
+        #if NETFRAMEWORK
+        switchesHelper.DisableTnirByDefault = null;
+        #endif
+
         Assert.False(LocalAppContextSwitches.LegacyRowVersionNullBehavior);
         Assert.False(LocalAppContextSwitches.SuppressInsecureTlsWarning);
         Assert.False(LocalAppContextSwitches.MakeReadAsyncBlocking);
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index f2c50285ed..18e12aa368 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -395,6 +395,7 @@ public void TransientFault_ShouldConnectToPrimary(uint errorCode)
         [InlineData(40613)]
         [InlineData(42108)]
         [InlineData(42109)]
+        [Trait("Category", "flaky")]
         public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
         {
             // Arrange
@@ -498,6 +499,7 @@ public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint e
         [InlineData(40613)]
         [InlineData(42108)]
         [InlineData(42109)]
+        [Trait("Category", "flaky")]
         public void TransientFault_WithUserProvidedPartner_RetryDisabled_ShouldFail(uint errorCode)
         {
             // Arrange
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
index 84c3452826..3cd2628300 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
@@ -158,6 +158,7 @@ public void NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed()
         }
 
         [Fact]
+        [Trait("Category", "flaky")]
         public void NetworkTimeoutAtRoutedLocation_RetryDisabled_ShouldFail()
         {
             // Arrange

From 520b40be8b0a95a30e485c4ff4b8249369658323 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 29 May 2026 11:30:07 -0300
Subject: [PATCH 121/298] Cleanup: git config, implicit usings, test common
 fixes, and build props (#4301)

---
 .gitattributes                                |  66 +----
 .gitignore                                    | 268 ++----------------
 src/Directory.Build.props                     |   2 +-
 .../tests/Common/DisposableArray.cs           |   4 -
 .../Fixtures/AzureKeyVaultKeyFixtureBase.cs   |   4 +-
 .../Common/Fixtures/CertificateFixtureBase.cs |  13 +-
 .../ColumnEncryptionCertificateFixture.cs     |   1 -
 .../ColumnMasterKeyCertificateFixture.cs      |   1 -
 .../Common/Fixtures/CspCertificateFixture.cs  |   1 -
 .../DatabaseObjects/DatabaseObject.cs         |   4 +-
 .../Common/LocalAppContextSwitchesHelper.cs   |   2 -
 ...Microsoft.Data.SqlClient.TestCommon.csproj |   2 +
 ...Data.SqlClient.ManualTesting.Tests.ruleset |   4 +-
 tools/props/AssemblyInfo.props                |   2 +-
 tools/props/AssemblyRef.props                 |   2 +-
 tools/targets/RepositoryInfo.targets          |   2 +-
 16 files changed, 35 insertions(+), 343 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index b678750c67..a1d79dfeee 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,65 +1,5 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
+# Normalize line endings
 * text=auto
 
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
-
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
-
-###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
-###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
-
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain
-
-.github/workflows/*.lock.yml linguist-generated=true merge=ours
\ No newline at end of file
+# Treat workflow lock files as generated
+.github/workflows/*.lock.yml linguist-generated=true merge=ours
diff --git a/.gitignore b/.gitignore
index da143d57ac..37b3509b0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## .gitignore for Microsoft.Data.SqlClient
 
 # User-specific files
 *.rsuser
@@ -10,12 +7,6 @@
 *.userosscache
 *.sln.docstates
 
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Mono auto generated files
-mono_crash.*
-
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -29,14 +20,11 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
-.nuget/
 
-# Visual Studio 2015/2017 cache/options directory
+# Visual Studio cache/options directory
 .vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
 
-# Visual Studio 2017 auto generated files
+# Visual Studio auto generated files
 Generated\ Files/
 **/.AssemblyAttributes
 
@@ -44,34 +32,21 @@ Generated\ Files/
 .vscode/*
 !.vscode/mcp.json
 
-# MSTest test Results
+# MSTest test results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUnit
-*.VisualState.xml
-TestResult.xml
-nunit-*.xml
-
 # TRX format test results
 **/*.trx
 
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
+# Benchmark results
 BenchmarkDotNet.Artifacts/
 
-# .NET Core
+# .NET project lock files and build artifacts
 project.lock.json
 project.fragment.lock.json
 artifacts/
 
-# StyleCop
-StyleCopReport.xml
-
 # Files built by Visual Studio
 *_i.c
 *_p.c
@@ -101,139 +76,36 @@ StyleCopReport.xml
 *.svclog
 *.scc
 
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# Visual Studio Trace Files
-*.e2e
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
+# ReSharper
 _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
 
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
+# NuGet packages
 *.nupkg
-# NuGet Symbol Packages
 *.snupkg
-# Most of the packages folder can be ignored.
 **/[Pp]ackages/*
 !**/[Pp]ackages/.gitkeep
+.nuget/
 
-# Most of the output folder can be ignored.
+# Output folder
 **/[Oo]utput/*
 !**/[Oo]utput/.gitkeep
 
-# NuGet v3's project.json files produces more ignorable files
+# NuGet v3 project.json auxiliary files
 *.nuget.props
 *.nuget.targets
 
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-*.appxbundle
-*.appxupload
-
 # Visual Studio cache files
-# files ending in .cache can be ignored
 *.[Cc]ache
-# but keep track of directories ending in .cache
+# but keep directories ending in .cache
 !?*.[Cc]ache/
 
-# Others
-ClientBin/
+# Temp and backup files
 ~$*
 *~
 *.dbmdl
@@ -241,133 +113,27 @@ ClientBin/
 *.jfm
 *.pfx
 *.publishsettings
-orleans.codegen.cs
 
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
-
-# SQL Server files
+# SQL Server data files
 *.mdf
 *.ldf
 *.ndf
 
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
-
 # Microsoft Fakes
 FakesAssemblies/
 
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
+# Node modules
 node_modules/
 
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
+# MSBuild binary and structured log
 *.binlog
 
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
 # Local History for Visual Studio
 .localhistory/
 
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# JetBrains Rider (cross platform .NET IDE) working folder
+# JetBrains Rider
 .idea/
 
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Nuget package files
-.nuget/
-
 # Config Json file
 **/config.json
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f8ac03e168..b3e0663fd3 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!--
       "ReferenceType" property supports below options:
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/DisposableArray.cs b/src/Microsoft.Data.SqlClient/tests/Common/DisposableArray.cs
index 8baca10e21..6dcf6ef67b 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/DisposableArray.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/DisposableArray.cs
@@ -2,11 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Collections;
-using System.Collections.Generic;
-
-#nullable enable
 
 namespace Microsoft.Data.SqlClient.Tests.Common
 {
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs
index f70560be9e..e6e3bf4996 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs
@@ -1,9 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.using System;
+// See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
 using Azure.Core;
 using Azure.Security.KeyVault.Keys;
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CertificateFixtureBase.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CertificateFixtureBase.cs
index e3dd3902f0..5081bc8b18 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CertificateFixtureBase.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CertificateFixtureBase.cs
@@ -2,13 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using System.Threading;
 
 namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures;
 
@@ -110,7 +107,7 @@ protected X509Certificate2 CreateCertificate(string subjectName, IEnumerable<str
                     ephemeral.Export(X509ContentType.Pkcs12, password),
                     password,
                     keyStorageFlags,
-                    new Pkcs12LoaderLimits(Pkcs12LoaderLimits.Defaults) 
+                    new Pkcs12LoaderLimits(Pkcs12LoaderLimits.Defaults)
                     {
                         PreserveStorageProvider = true,
                         PreserveKeyName = true
@@ -211,7 +208,7 @@ exit 1
             for (int attempt = 1; attempt <= retries; ++attempt)
             {
                 using Process psProcess = new() { StartInfo = startInfo };
-            
+
                 psProcess.Start();
                 commandOutput = psProcess.StandardOutput.ReadToEnd();
 
@@ -227,15 +224,15 @@ exit 1
                 {
                     return new X509Certificate2(Convert.FromBase64String(commandOutput), password, X509KeyStorageFlags.Exportable);
                 }
-                
+
                 Console.WriteLine(
                     $"PowerShell command failed with exit code {code} on " +
                     $"attempt {attempt} of {retries}; " +
                     $"retrying in {delay} seconds...");
-                
+
                 Thread.Sleep(TimeSpan.FromSeconds(delay));
             }
-                
+
             throw new Exception(
                 "PowerShell command raised exception: " +
                 $"{commandOutput}; command was: {formattedCommand}");
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnEncryptionCertificateFixture.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnEncryptionCertificateFixture.cs
index 0c51a7e17b..c5b527c690 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnEncryptionCertificateFixture.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnEncryptionCertificateFixture.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Principal;
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs
index 7b431782af..c4fbbad613 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Security.Cryptography.X509Certificates;
 
 namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures;
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CspCertificateFixture.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CspCertificateFixture.cs
index 56463e91b8..4d46032ce2 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CspCertificateFixture.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CspCertificateFixture.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
index 2dc539b5f5..78fa16080f 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
@@ -2,9 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Text;
-using System.Threading;
 
 namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 
@@ -170,7 +168,7 @@ public static string GenerateLongName(string prefix, bool escape = true)
     ///
     /// The GUID parts will be the characters from the 1st and 4th blocks
     /// from a traditional string representation, as shown here:
-    /// 
+    ///
     /// <code>
     ///   7ff01cb8-88c7-11f0-b433-00155d7e531e
     ///   ^^^^^^^^           ^^^^
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
index 11523b3f83..db84a0a51a 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
@@ -2,9 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Reflection;
-using System.Threading;
 
 namespace Microsoft.Data.SqlClient.Tests.Common;
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index 71e4f305e1..ef4ac391d6 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.Data.SqlClient.TestCommon</AssemblyName>
     <RootNamespace>Microsoft.Data.SqlClient.TestCommon</RootNamespace>
+
+    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.ruleset b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.ruleset
index 153e4717db..eeefbfdaaf 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.ruleset
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.ruleset
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Microsoft Managed Recommended Rules" Description="These rules focus on the most critical problems in your code, including potential security holes, application crashes, and other important logic and design errors. It is recommended to include this rule set in any custom rule set you create for your projects." ToolsVersion="Latest">
+<RuleSet Name="Microsoft Managed Recommended Rules" Description="These rules focus on the most critical problems in your code, including potential security holes, application crashes, and other important logic and design errors. It is recommended to include this rule set in any custom rule set you create for your projects.">
   <Localization ResourceAssembly="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.dll" ResourceBaseName="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.Localized">
     <Name Resource="MinimumRecommendedRules_Name" />
     <Description Resource="MinimumRecommendedRules_Description" />
@@ -71,4 +71,4 @@
   <Rules AnalyzerId="xunit.analyzers" RuleNamespace="xunit.analyzers">
     <Rule Id="xUnit1024" Action="Info" />
   </Rules>
-</RuleSet>
\ No newline at end of file
+</RuleSet>
diff --git a/tools/props/AssemblyInfo.props b/tools/props/AssemblyInfo.props
index 344862fec4..0cbd62f346 100644
--- a/tools/props/AssemblyInfo.props
+++ b/tools/props/AssemblyInfo.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Description>Microsoft.Data.SqlClient</Description>
     <Authors>Microsoft</Authors>
diff --git a/tools/props/AssemblyRef.props b/tools/props/AssemblyRef.props
index e27f711eb5..b407db8084 100644
--- a/tools/props/AssemblyRef.props
+++ b/tools/props/AssemblyRef.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <MicrosoftVSDesigner>"Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"</MicrosoftVSDesigner>
     <SystemDrawing>"System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"</SystemDrawing>
diff --git a/tools/targets/RepositoryInfo.targets b/tools/targets/RepositoryInfo.targets
index dec4f95206..a439809a67 100644
--- a/tools/targets/RepositoryInfo.targets
+++ b/tools/targets/RepositoryInfo.targets
@@ -35,6 +35,6 @@ file to you under the MIT license. -->
                     $(_TranslateUrlPattern), $(_TranslateUrlReplacement)))</ScmRepositoryUrl>
             </SourceRoot>
         </ItemGroup>
-        <Message Text="Final Translated ScmRepositoryUrl to $(ScmRepositoryUrl)" Importance="high" />    
+        <Message Text="Final Translated ScmRepositoryUrl to $(ScmRepositoryUrl)" />
     </Target>
 </Project>

From f873c1ac05e7736fef4a5e81347847a87babf67b Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 29 May 2026 11:42:47 -0300
Subject: [PATCH 122/298] Enable InternalsVisibleTo for UnitTests in Package
 mode (#4300)

* Enable InternalsVisibleTo for test projects in Package mode

* Pipeline: run unit tests in both Project and Package modes

* Reverted some straggler leftover changes from previous attempts.

* Addressed Copilot feedback.
---
 build.proj                                    |  24 ++-
 .../templates/steps/run-all-tests-step.yml    | 156 ++++++++++--------
 .../src/Microsoft.Data.SqlClient.csproj       |  15 +-
 ...Microsoft.Data.SqlClient.TestCommon.csproj |  12 +-
 .../Microsoft.Data.SqlClient.UnitTests.csproj |  51 ++++--
 ...rosoft.Data.SqlClient.TestUtilities.csproj |   8 +
 .../TDS/TDS.EndPoint/TDS.EndPoint.csproj      |   9 +
 .../tools/TDS/TDS.Servers/TDS.Servers.csproj  |   6 +
 .../tests/tools/TDS/TDS/TDS.csproj            |   6 +
 9 files changed, 200 insertions(+), 87 deletions(-)

diff --git a/build.proj b/build.proj
index b8ac7d44ed..c13b40e246 100644
--- a/build.proj
+++ b/build.proj
@@ -259,6 +259,20 @@
       -p:SigningKeyPath="$(SigningKeyPath)"
     </SigningKeyPathArgument>
 
+    <!--
+      TestSigningKeyPath
+      Applies to:     TestSqlClientUnit
+      Description:    Path to the key used to sign test assemblies. Required in Package mode when
+                      SigningKeyPath is set so that InternalsVisibleTo grants from signed driver
+                      assemblies can be fulfilled.
+      Default value:  [blank]
+      Example:        C:\path\to\sqlclient-test-key.snk
+    -->
+    <TestSigningKeyPath Condition="'$(TestSigningKeyPath)' == ''" />
+    <TestSigningKeyPathArgument Condition="'$(TestSigningKeyPath)' != ''">
+      -p:TestSigningKeyPath="$(TestSigningKeyPath)"
+    </TestSigningKeyPathArgument>
+
     <!--
       TestBlameTimeout
       Applies to:     Test* targets
@@ -678,10 +692,6 @@
   <!-- TestSqlClientUnit: Runs unit tests for SqlClient -->
   <Target Name="TestSqlClientUnit">
     <PropertyGroup>
-      <!--
-        Note: This test exclusively uses project references, so neither ReferenceType nor any
-            package version arguments are specified in this command.
-      -->
       <LogFilePrefix>SqlClientUnit-$(OS)</LogFilePrefix>
       <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
 
@@ -692,6 +702,10 @@
         $(TestCodeCoverageArgument)
         $(TestFiltersArgument)
         $(TestFrameworkArgument)
+        $(ReferenceTypeArgument)
+        $(TestSigningKeyPathArgument)
+        $(PackageVersionSqlClientArgument)
+        $(PackageVersionSqlServerArgument)
         --results-directory "$(TestResultsFolderPath)"
         --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
       </DotnetCommand>
@@ -862,7 +876,7 @@
     <PropertyGroup>
       <!--
         Note: This test exclusively uses project references, so neither ReferenceType nor any
-            package version arguments are specified in this command.
+        package version arguments are specified in this command.
       -->
       <LogFilePrefix>AbstractionsTests-$(OS)</LogFilePrefix>
       <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
diff --git a/eng/pipelines/common/templates/steps/run-all-tests-step.yml b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
index 5730b8cc0d..e41c7d22b2 100644
--- a/eng/pipelines/common/templates/steps/run-all-tests-step.yml
+++ b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
@@ -79,51 +79,62 @@ steps:
     condition: succeededOrFailed()
 
 - ${{if eq(parameters.operatingSystem, 'Windows')}}:
-  - ${{if eq(parameters.referenceType, 'Project')}}:
-    - task: DotNetCoreCLI@2
-      displayName: 'Run Unit Tests ${{parameters.msbuildArchitecture }}'
-      condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
-      inputs:
-        command: build
-        projects: build.proj
-        ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
-          arguments: >-
-            -t:TestSqlClientUnit
-            -p:TestFramework=${{ parameters.targetFramework }}
-            -p:Configuration=${{ parameters.buildConfiguration }}
-            -p:TestResultsFolderPath=TestResults
-        ${{ else }}: # x86
-          arguments: >-
-            -t:TestSqlClientUnit
-            -p:TestFramework=${{ parameters.targetFramework }}
-            -p:Configuration=${{ parameters.buildConfiguration }}
-            -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
-            -p:TestResultsFolderPath=TestResults
+  - task: DotNetCoreCLI@2
+    displayName: 'Run Unit Tests ${{parameters.msbuildArchitecture }}'
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
+    inputs:
+      command: build
+      projects: build.proj
+      ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
+        arguments: >-
+          -t:TestSqlClientUnit
+          -p:TestFramework=${{ parameters.targetFramework }}
+          -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
+          -p:TestResultsFolderPath=TestResults
+      ${{ else }}: # x86
+        arguments: >-
+          -t:TestSqlClientUnit
+          -p:TestFramework=${{ parameters.targetFramework }}
+          -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
+          -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
+          -p:TestResultsFolderPath=TestResults
 
-    - task: DotNetCoreCLI@2
-      displayName: 'Run Flaky Unit Tests ${{parameters.msbuildArchitecture }}'
-      condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
-      inputs:
-        command: build
-        projects: build.proj
-        ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
-          arguments: >-
-            -t:TestSqlClientUnit
-            -p:TestFramework=${{ parameters.targetFramework }}
-            -p:Configuration=${{ parameters.buildConfiguration }}
-            -p:TestFilters="category=flaky"
-            -p:TestResultsFolderPath=TestResults
-            -p:TestCodeCoverage=false
-        ${{ else }}: # x86
-          arguments: >-
-            -t:TestSqlClientUnit
-            -p:TestFramework=${{ parameters.targetFramework }}
-            -p:Configuration=${{ parameters.buildConfiguration }}
-            -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
-            -p:TestFilters="category=flaky"
-            -p:TestResultsFolderPath=TestResults
-            -p:TestCodeCoverage=false
-      continueOnError: true
+  - task: DotNetCoreCLI@2
+    displayName: 'Run Flaky Unit Tests ${{parameters.msbuildArchitecture }}'
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
+    inputs:
+      command: build
+      projects: build.proj
+      ${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
+        arguments: >-
+          -t:TestSqlClientUnit
+          -p:TestFramework=${{ parameters.targetFramework }}
+          -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
+          -p:TestFilters="category=flaky"
+          -p:TestResultsFolderPath=TestResults
+          -p:TestCodeCoverage=false
+      ${{ else }}: # x86
+        arguments: >-
+          -t:TestSqlClientUnit
+          -p:TestFramework=${{ parameters.targetFramework }}
+          -p:ReferenceType=${{ parameters.referenceType }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
+          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
+          -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
+          -p:TestFilters="category=flaky"
+          -p:TestResultsFolderPath=TestResults
+          -p:TestCodeCoverage=false
+    continueOnError: true
 
   - task: DotNetCoreCLI@2
     displayName: 'Run Functional Tests ${{parameters.msbuildArchitecture }}'
@@ -261,33 +272,38 @@ steps:
     continueOnError: true
 
 - ${{ else }}: # Linux or macOS
-  - ${{if eq(parameters.referenceType, 'Project')}}:
-    - task: DotNetCoreCLI@2
-      displayName: 'Run Unit Tests'
-      condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
-      inputs:
-        command: build
-        projects: build.proj
-        arguments: >-
-          -t:TestSqlClientUnit
-          -p:TestFramework=${{ parameters.targetFramework }}
-          -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:TestResultsFolderPath=TestResults
+  - task: DotNetCoreCLI@2
+    displayName: 'Run Unit Tests'
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
+    inputs:
+      command: build
+      projects: build.proj
+      arguments: >-
+        -t:TestSqlClientUnit
+        -p:TestFramework=${{ parameters.targetFramework }}
+        -p:ReferenceType=${{ parameters.referenceType }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
+        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
+        -p:TestResultsFolderPath=TestResults
 
-    - task: DotNetCoreCLI@2
-      displayName: 'Run Flaky Unit Tests'
-      condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
-      inputs:
-        command: build
-        projects: build.proj
-        arguments: >-
-          -t:TestSqlClientUnit
-          -p:TestFramework=${{ parameters.targetFramework }}
-          -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:TestFilters="category=flaky"
-          -p:TestResultsFolderPath=TestResults
-          -p:TestCodeCoverage=false
-      continueOnError: true
+  - task: DotNetCoreCLI@2
+    displayName: 'Run Flaky Unit Tests'
+    condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
+    inputs:
+      command: build
+      projects: build.proj
+      arguments: >-
+        -t:TestSqlClientUnit
+        -p:TestFramework=${{ parameters.targetFramework }}
+        -p:ReferenceType=${{ parameters.referenceType }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
+        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
+        -p:TestFilters="category=flaky"
+        -p:TestResultsFolderPath=TestResults
+        -p:TestCodeCoverage=false
+    continueOnError: true
 
   - task: DotNetCoreCLI@2
     displayName: 'Run Functional Tests'
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index d7a7ef060a..24c6a548f9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -62,13 +62,26 @@
 
   <!-- Strong name signing ============================================= -->
   <!-- Strong naming is being done in Directory.Build.props -->
-  <!-- If we're not signing, we are permitted to expose our internals to tests. -->
+
+  <!-- Unsigned: expose internals to UnitTests in any reference mode. -->
   <ItemGroup Condition="'$(SigningKeyPath)' == ''">
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>UnitTests</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
 
+  <!--
+    Signed + Package mode: expose internals to UnitTests signed with the test key.
+    Signed + Project mode is intentionally omitted: production-signed assemblies should not
+    grant internal access to test assemblies during local development. Tests that need internals
+    in Project mode run unsigned; only the CI package-validation pipeline uses signed packages.
+  -->
+  <ItemGroup Condition="'$(SigningKeyPath)' != '' AND '$(ReferenceType)' == 'Package'">
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>UnitTests, PublicKey=00240000048000001401000006020000002400005253413100080000010001003D19684676DA365F331D00CE7BD4B8EF03E74102F39A5681B40622703D68F0298ECACECC723D3FFC1EA9365AF4958578550EA1EBEEC084B0B3757F3762449F5365E872802A4B548056760764FAD062BFEE81ED26183109AD46810E7E6E965419D0A10473680144D20C1BFE1027A5F586CA987523C06F5C126C44EA7D4F51EB023867A9F294315F95775ACEFD2D678186919458DFCCB4DE2E9F53AEFC766C7CBCEC474ED21C1616E5A9414D366D91D121C39F5FE6641295ADC058EF3FB10593BCDE2E82D9F217C2634909EEF496CD53AE78ABBEA572B871D72EBFC5378205950ABA97C7CCC2B9635D96933D5F9C9624D71FF53EE2094CF3A6BD38534D66E414B7</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
   <!-- Build Output ==================================================== -->
   <PropertyGroup>
     <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index ef4ac391d6..67c5250748 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -14,6 +14,13 @@
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
+  <!-- Strong name signing ============================================= -->
+  <!-- Sign with the test key so signed test assemblies can reference this project. -->
+  <PropertyGroup Condition="'$(TestSigningKeyPath)' != ''">
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(TestSigningKeyPath)</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
@@ -28,7 +35,10 @@
   <!-- References ====================================================== -->
   <!-- Test target reference -->
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient"
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 
   <!-- References for netfx -->
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index 82e900e54c..4501d710a9 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -36,22 +36,53 @@
     </None>
   </ItemGroup>
 
+  <!-- Strong name signing ============================================= -->
+  <!-- When a test signing key is provided, sign UnitTests so IVT from signed SqlClient works. -->
+  <PropertyGroup Condition="'$(TestSigningKeyPath)' != ''">
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(TestSigningKeyPath)</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
   <!-- References ====================================================== -->
   <!-- Test target reference -->
-  <ItemGroup>
-    <!--
-      The Unit Test project only supports ReferenceType = Project since it needs access to the
-      internals of sibling packages.
-    -->
+  <ItemGroup Condition="'$(ReferenceType)' != 'Package'">
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj" />
   </ItemGroup>
 
-  <Target Name="ValidateReferenceType"
-          BeforeTargets="Restore;PrepareForBuild"
-          Condition="'$(ReferenceType)' != 'Project'">
-    <Error Text="Microsoft.Data.SqlClient.UnitTests.csproj only supports ReferenceType=Project." />
-  </Target>
+  <!--
+    Package mode: Unit tests exercise internal types that only exist in the implementation assembly
+    (runtimes/{rid}/lib/{tfm}/), not in the ref assembly (ref/{tfm}/).  We exclude the ref
+    compile asset and reference the runtime DLL directly so the compiler can see internals.
+
+    TODO: This is fragile, depending on our SqlClient NuGet package layout and supported TFMs.  It
+    is only necessary because we produce ref and not-supported assemblies and package them.  By
+    default, the compiler will use the ref assemblies if present, which we must explicitly override
+    as explained above.
+  -->
+  <PropertyGroup Condition="'$(ReferenceType)' == 'Package'">
+    <_SqlClientRid Condition="'$(OS)' != 'Windows_NT'">unix</_SqlClientRid>
+    <_SqlClientRid Condition="'$(OS)' == 'Windows_NT'">win</_SqlClientRid>
+    <!-- Map test TFM to the closest available package TFM (package ships net8.0/net9.0/net462) -->
+    <_SqlClientPackageTfm Condition="'$(TargetFramework)' == 'net8.0'">net8.0</_SqlClientPackageTfm>
+    <_SqlClientPackageTfm Condition="'$(TargetFramework)' == 'net462'">net462</_SqlClientPackageTfm>
+    <_SqlClientPackageTfm Condition="'$(_SqlClientPackageTfm)' == ''">net9.0</_SqlClientPackageTfm>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
+    <!-- Brings in transitive dependencies and runtime deployment; ExcludeAssets="compile" prevents
+         the compiler from using the ref assembly (which only contains public API surface).
+         GeneratePathProperty="true" causes NuGet restore to emit $(PkgMicrosoft_Data_SqlClient)
+         pointing to the extracted package folder in the global packages cache. -->
+    <PackageReference Include="Microsoft.Data.SqlClient"
+                      GeneratePathProperty="true"
+                      ExcludeAssets="compile" />
+    <!-- Compile against the implementation assembly so the compiler can resolve internal types
+         exposed via InternalsVisibleTo.  The path uses $(PkgMicrosoft_Data_SqlClient) generated
+         above to locate the runtime DLL inside the NuGet package layout. -->
+    <Reference Include="Microsoft.Data.SqlClient"
+               HintPath="$(PkgMicrosoft_Data_SqlClient)/runtimes/$(_SqlClientRid)/lib/$(_SqlClientPackageTfm)/Microsoft.Data.SqlClient.dll" />
+    <PackageReference Include="Microsoft.SqlServer.Server" />
+  </ItemGroup>
 
   <!-- References for netframework -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
index 083cca8a61..c50a251e4f 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
@@ -2,6 +2,14 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
+
+  <!-- Strong name signing ============================================= -->
+  <!-- Sign with the test key so signed test assemblies can reference this project. -->
+  <PropertyGroup Condition="'$(TestSigningKeyPath)' != ''">
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(TestSigningKeyPath)</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
   <Target Name="CopyConfig" BeforeTargets="Compile">
     <Copy SourceFiles="config.default.json" DestinationFiles="config.json" Condition="!Exists('config.json')" />
   </Target>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
index 2e1a1b5c81..c9dce97ddb 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
@@ -3,6 +3,15 @@
     <RootNamespace>Microsoft.SqlServer.TDS.EndPoint</RootNamespace>
     <AssemblyName>Microsoft.SqlServer.TDS.EndPoint</AssemblyName>
     <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Sign when a test key is provided so signed test assemblies can reference this. -->
+  <PropertyGroup Condition="'$(TestSigningKeyPath)' != ''">
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(TestSigningKeyPath)</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj
index 57d3dfadd2..b6f33b0977 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj
@@ -4,6 +4,12 @@
     <AssemblyName>Microsoft.SqlServer.TDS.Servers</AssemblyName>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
+
+  <!-- Sign when a test key is provided so signed test assemblies can reference this. -->
+  <PropertyGroup Condition="'$(TestSigningKeyPath)' != ''">
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(TestSigningKeyPath)</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj
index a4da7c8b92..39d5aae2de 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj
@@ -4,4 +4,10 @@
     <AssemblyName>Microsoft.SqlServer.TDS</AssemblyName>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
+
+  <!-- Sign when a test key is provided so signed test assemblies can reference this. -->
+  <PropertyGroup Condition="'$(TestSigningKeyPath)' != ''">
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(TestSigningKeyPath)</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
 </Project>

From 61148688fff5742b5715c770e84dc7a17aea2230 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Fri, 29 May 2026 10:19:01 -0700
Subject: [PATCH 123/298] Add instructions file for determining dependency
 versions (#4318)

* Add instructions file.

* Add categorization instructions
---
 .../package-versions.instructions.md          | 206 ++++++++++++++++++
 1 file changed, 206 insertions(+)
 create mode 100644 .github/instructions/package-versions.instructions.md

diff --git a/.github/instructions/package-versions.instructions.md b/.github/instructions/package-versions.instructions.md
new file mode 100644
index 0000000000..9dba7acb8e
--- /dev/null
+++ b/.github/instructions/package-versions.instructions.md
@@ -0,0 +1,206 @@
+---
+applyTo: "**/Directory.Packages.props,**/*.csproj,**/Directory.Build.props,**/*.nuspec"
+---
+# Choosing Package Versions in Multi-Targeted Projects
+
+Guidance for choosing NuGet package versions in multi-targeted projects (e.g. `net462;net8.0;net9.0`).
+
+## Rule
+For runtime-aligned packages, **the package major must match the target runtime major**: 8.x on `net8.0`, 9.x on `net9.0`, 10.x on `net10.0`, and so on. TFMs that aren't tied to a specific runtime major (`net462`, `netstandard2.0`) get the major of the floor LTS. Other categories are versioned as described below.
+
+Split package references into three categories:
+
+### 1. Runtime-aligned packages — **version per TFM, matching the runtime band**
+
+Packages whose major version ships with (or is tightly coupled to) a specific .NET runtime:
+
+- `Microsoft.Extensions.*` (Logging, DependencyInjection, Configuration, Hosting, Options, Caching, Http, Primitives, ...)
+- `Microsoft.AspNetCore.*`
+- `Microsoft.EntityFrameworkCore.*`
+- `System.Text.Json`, `System.Memory`, `System.IO.Pipelines`, `System.Formats.Asn1`, `System.Security.Cryptography.Pkcs`
+- `Microsoft.Bcl.*`
+
+Use the major version that matches the TFM. For TFMs without a corresponding runtime major (`net462`, `netstandard2.0`, etc.), use the major of the **lowest supported modern TFM** — typically the floor LTS (e.g. `8.x` while net8 is supported). This keeps the legacy targets on a long-lived, well-patched band and avoids dragging in transitive deps from a newer major:
+
+```xml
+<!-- Defaults: lowest supported runtime band (e.g. net8 LTS); also applies to net462 / netstandard2.0 -->
+<ItemGroup>
+  <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+  <PackageVersion Include="System.Text.Json"             Version="8.0.5" />
+</ItemGroup>
+
+<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+  <PackageVersion Update="Microsoft.Extensions.Logging" Version="9.0.0" />
+  <PackageVersion Update="System.Text.Json"             Version="9.0.0" />
+</ItemGroup>
+```
+
+When the floor LTS drops out of support, bump the default block to the new floor LTS major and drop any conditional block that becomes redundant.
+
+### 2. Independent packages — **single version across all TFMs**
+
+Packages whose versioning is decoupled from the .NET runtime:
+
+- `Newtonsoft.Json`, `Polly.*`, `Serilog.*`
+- `Azure.*`, `Microsoft.Identity.*`, `Microsoft.IdentityModel.*`
+- `Microsoft.Data.SqlClient`, `Dapper`, `StackExchange.Redis`
+- Most third-party packages
+
+Reference one (latest stable) version unconditionally:
+
+```xml
+<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
+<PackageVersion Include="Azure.Identity"  Version="1.17.1" />
+```
+
+### 3. Polyfills — **conditional presence, single version**
+
+Packages that only exist (or are only needed) on older TFMs. The polyfill major doesn't have to match any runtime band (older TFMs have no in-box equivalent), so pick the latest stable available:
+
+```xml
+<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net462'">
+  <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
+</ItemGroup>
+```
+
+Condition the *presence* of the reference, not the version.
+
+## How to categorize a package
+
+The named lists above aren't exhaustive. To classify a package you don't recognize, work through these steps in order:
+
+### 1. Read the nuget.org description
+
+Pure polyfills almost always say so explicitly. For example, `Microsoft.Bcl.TimeProvider`'s page reads: *"For apps targeting .NET 8 and newer versions, referencing this package is unnecessary, as the types it contains are already included in the .NET 8 and higher platform versions."*
+
+If the description says "for apps targeting .NET X and earlier" or "unnecessary on .NET X+", treat as polyfill candidate and continue to step 2 to confirm. If it makes no such claim and the package owner is Microsoft + a major number tracks the .NET release train, treat as runtime-aligned candidate.
+
+### 2. Inspect the package's `lib/` layout
+
+Look at the "Frameworks" tab on nuget.org or open the `.nupkg`:
+
+| `lib/` layout | Category |
+|---|---|
+| Only older TFM folders (`netstandard2.0`, `net462`) — no modern TFMs | Pure polyfill |
+| `lib/net8.0/_._`, `lib/net9.0/_._` placeholders + real DLL only on older TFMs | Pure polyfill (no-op on modern TFMs) |
+| Real DLLs in `lib/net8.0/`, `lib/net9.0/`, `lib/net10.0/`, differing per band | Runtime-aligned |
+| Real DLLs on every TFM including older ones, single major doesn't track .NET releases | Independent |
+
+### 3. Check the release cadence
+
+- Runtime-aligned: new major every November in lockstep with .NET (8.0, 9.0, 10.0, ...) plus monthly servicing patches.
+- Independent: releases on its own schedule, major doesn't correlate with .NET versions.
+- Pure polyfill: usually freezes at one major and rarely bumps; new majors only to ride the build train.
+
+### 4. Functional test — remove the reference and rebuild
+
+The decisive test for the polyfill-vs-runtime-aligned boundary: remove the `PackageReference` on a modern TFM (e.g. net8) and build.
+
+- Builds clean → package was acting as a polyfill on that TFM. Confirm category 3.
+- Fails with `CS0246`/`CS1061` (missing type or method) → the package contributes API the in-box BCL doesn't have. Treat as runtime-aligned (category 1), even if the description sounds polyfill-ish.
+
+### Beware hybrids
+
+Some packages look like polyfills but add API beyond the in-box BCL even on modern TFMs. Treat these like runtime-aligned packages.
+
+### When in doubt
+
+Treat as **runtime-aligned** (category 1) and reference on every TFM with per-TFM majors.
+
+- Cost of mis-classifying a true polyfill this way: a redundant `_._` asset at restore. Harmless.
+- Cost of mis-classifying a hybrid as a pure polyfill: a compile break on the TFMs where you dropped the reference.
+
+## Why
+
+### Why latest minor/patch always
+
+`PackageReference` versions are minimums (`[X, ∞)`), so writing a stale minor or patch buys nothing for downgrade-safety and only loses fixes:
+
+- **Security**: BCL and Extensions packages ship CVE patches in minor/patch bumps. Pinning to an older patch means a customer who doesn't transitively pull a newer version stays on the vulnerable floor.
+- **Bug fixes**: Same logic for non-security fixes. We have no reason to anchor customers to an older `8.0.0` when `8.0.5` is available.
+- **NU1605 risk is small and easy to fix**: NU1605 fires on *any* downgrade, including minor/patch within the same major (e.g. our `8.0.5` transitive vs. a customer's direct `8.0.0`). In practice this is rare and trivial to resolve — the customer bumps their direct reference to a current patch. The cost of *not* tracking latest (stale security/bug fixes for every consumer who doesn't override) is larger than the cost of an occasional one-line bump in a consumer project.
+- **Reduces noise from automated bumps**: Dependabot/Renovate PRs disappear if we already track latest.
+
+This rule applies to all three categories. The category decides the major; "latest" decides the minor and patch.
+
+### NuGet `PackageReference` versions are minimums, not pins
+
+`Version="X"` means `[X, ∞)`. The resolver picks the highest version requested across the graph, with one critical exception: a **direct** reference wins over a transitive one (nearest-wins).
+
+### NU1605 fires when the customer's direct version is *lower* than your transitive version
+
+If your library transitively requires `Microsoft.Extensions.Logging 10.0.0` and the consuming app has a direct `<PackageReference Version="8.0.0" />`, NuGet detects a downgrade and emits **NU1605**. In modern SDKs this is an **error**, not a warning — the customer's build fails.
+
+The reverse (customer's direct version higher than your transitive) resolves cleanly with no warning.
+
+### The asymmetry drives the rule
+
+| Your transitive version | Customer's direct version | Result |
+|---|---|---|
+| 10.x | 8.x | **NU1605 error** |
+| 10.x | 10.x or higher | Clean |
+| 8.x  | 8.x or higher | Clean |
+
+Pinning runtime-aligned packages to the **band matching each TFM** means a net8 consumer transitively gets 8.x (no friction with their own 8.x reference), and a net10 consumer transitively gets 10.x.
+
+Pinning everything to the latest major (e.g. `10.x` unconditionally) forces every net8 customer to roll their direct references forward or hit NU1605.
+
+### Independent packages don't have this problem
+
+`Newtonsoft.Json 13.x`, `Azure.Identity 1.17.x`, etc. aren't tied to a runtime version. Customers don't have a "matching" version in mind, and the package's own multi-targeted assets handle TFM selection internally. One version is simpler and avoids needless conditional blocks.
+
+### Framework-provided assemblies win at runtime anyway
+
+On .NET 8+, packages like `System.Text.Json` and `System.Memory` are part of the shared framework. Even if you reference `System.Text.Json 9.0.0`, a net8 app uses the in-box net8 copy at runtime. Referencing 10.x on net8 just creates restore-graph noise with no runtime benefit — another reason to match the band.
+
+## Tradeoffs and alternatives considered
+
+### Per-TFM (the rule) vs. single lowest-LTS version
+
+A "pin everything to the lowest supported LTS major (e.g. 8.x everywhere) and bump only when that LTS drops" policy is also downgrade-safe and simpler in `Directory.Packages.props`. We rejected it because:
+
+- Customers on newer runtimes lose access to perf/feature work that landed in later package majors for packages that *aren't* fully overridden by the in-box shared framework (e.g. `Microsoft.Extensions.Caching.Memory`, `System.Configuration.ConfigurationManager`).
+- The simplification is small: one extra conditional `ItemGroup` per runtime-aligned package.
+- A coordinated bump when the floor LTS drops is a larger, riskier change than incremental per-TFM updates.
+
+Per-TFM keeps each runtime on its matching band and confines change to one `Update` line at a time.
+
+### Why no upper bounds
+
+Customers can transitively pull in a *higher* major than your reference. NuGet resolves nearest-wins with no warning, so a major that broke API can produce `MissingMethodException`/`TypeLoadException` at runtime rather than a restore-time failure.
+
+An upper bound (e.g. `Version="[8.0.0, 10.0.0)"`) would convert that runtime failure into a restore-time `NU1107` and is the only way to guarantee compatibility. We still avoid it because:
+
+- It blocks customers from rolling forward to fix CVEs or take perf wins in the newer major.
+- It propagates conflicts deep into customer dependency graphs that we can't see.
+- Microsoft's [library guidance](https://learn.microsoft.com/dotnet/standard/library-guidance/dependencies#nuget-dependency-version-ranges) explicitly says **AVOID upper bounds**, and the foundational Microsoft libraries (EF Core, ASP.NET Core, Aspire, Orleans, the BCL itself, Azure SDK) follow it.
+- Exact pins (`[X]`) in Microsoft repos are reserved for host-coupled scenarios: Roslyn analyzers (`Microsoft.CodeAnalysis.*`), MSBuild API consumers (`Microsoft.Build`), VS extensibility. None apply to runtime libraries like SqlClient.
+
+We accept the SemVer-break risk in exchange for not breaking customer rollforward. If a specific package is known to break compatibility at a future major, document it in code review and revisit — don't blanket-bound.
+
+### Downgrade direction matters
+
+| Your transitive | Customer's direct | Result |
+|---|---|---|
+| Higher | Lower | **NU1605 error** (we cause this) |
+| Lower | Higher | Clean restore, customer's wins |
+| Equal | Equal | Clean |
+
+The asymmetry is the entire reason per-TFM matching works: it makes us the *lower* or *equal* for any customer who has aligned their own references with their runtime.
+
+## Checklist before changing a package version
+
+1. Is the package in the runtime-aligned list above? → use per-TFM conditional `PackageVersion Update`, latest minor/patch in each band.
+2. Is it independent? → single `PackageVersion`, latest stable.
+3. Is it a polyfill? → conditional `PackageReference` only on TFMs that need it, latest stable.
+4. Always pick the latest available minor/patch within the chosen major. Don't carry forward a stale minor when bumping or adding.
+5. Prefer Central Package Management (`Directory.Packages.props`) over per-project versions.
+6. Never use exact-version (`[X]`) or upper-bound (`[X, Y)`) ranges on `PackageReference` unless you have a documented compatibility reason.
+
+## Sources
+
+- [NU1605 — Detected package downgrade](https://learn.microsoft.com/nuget/reference/errors-and-warnings/nu1605)
+- [NuGet Package versioning — version ranges](https://learn.microsoft.com/nuget/concepts/package-versioning#version-ranges)
+- [NuGet dependency resolution](https://learn.microsoft.com/nuget/concepts/dependency-resolution)
+- [Library guidance — Dependencies](https://learn.microsoft.com/dotnet/standard/library-guidance/dependencies)
+- [Library guidance — Cross-platform targeting](https://learn.microsoft.com/dotnet/standard/library-guidance/cross-platform-targeting)

From 045adc5e608f42ce98eff8c12b920f18218e6855 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sat, 30 May 2026 04:12:08 +1000
Subject: [PATCH 124/298] avoid stack trace cost via exception when (#4099)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
---
 .../Connection/SqlConnectionInternal.cs       |  34 ++---
 .../WaitHandleDbConnectionPool.cs             |  59 ++++-----
 .../ManagedSni/SniTcpHandle.netcore.cs        | 125 +++++++++---------
 .../Data/SqlClient/Server/ValueUtilsSmi.cs    |   6 +-
 .../Microsoft/Data/SqlClient/SqlBulkCopy.cs   |  12 +-
 .../Data/SqlClient/SqlCommand.NonQuery.cs     |  11 +-
 .../Data/SqlClient/SqlCommand.Reader.cs       |  45 +++----
 .../Data/SqlClient/SqlCommand.Xml.cs          |  19 +--
 .../Microsoft/Data/SqlClient/SqlCommand.cs    |   6 +-
 .../Microsoft/Data/SqlClient/SqlConnection.cs |   7 +-
 .../Microsoft/Data/SqlClient/SqlDataReader.cs |  53 ++------
 .../Microsoft/Data/SqlClient/SqlDependency.cs |  23 +---
 .../Data/SqlClient/SqlDependencyListener.cs   |  97 +++-----------
 .../Data/SqlClient/SqlDependencyUtils.cs      |  19 +--
 .../Data/SqlClient/SqlInternalTransaction.cs  |  42 ++----
 .../Data/SqlClient/SqlMetaDataFactory.cs      |   6 +-
 .../Microsoft/Data/SqlClient/SqlParameter.cs  |   7 +-
 .../Data/SqlClient/SqlQueryMetadataCache.cs   |  22 +--
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |  73 ++++------
 .../Data/SqlClient/TdsParserStateObject.cs    |  13 +-
 20 files changed, 206 insertions(+), 473 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index 6d067bab7f..ac9d36bdd7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -424,19 +424,14 @@ internal SqlConnectionInternal(
                         break;
                     }
                     catch (SqlException sqlex)
+                        when (
+                            connectionEstablishCount != i + 1
+                            && applyTransientFaultHandling
+                            && !_timeout.IsExpired
+                            && _timeout.MillisecondsRemaining >= transientRetryIntervalInMilliSeconds
+                            && IsTransientError(sqlex))
                     {
-                        if (connectionEstablishCount == i + 1
-                            || !applyTransientFaultHandling
-                            || _timeout.IsExpired
-                            || _timeout.MillisecondsRemaining < transientRetryIntervalInMilliSeconds
-                            || !IsTransientError(sqlex))
-                        {
-                            throw;
-                        }
-                        else
-                        {
-                            Thread.Sleep(transientRetryIntervalInMilliSeconds);
-                        }
+                        Thread.Sleep(transientRetryIntervalInMilliSeconds);
                     }
                 }
             }
@@ -2073,13 +2068,8 @@ protected override void Deactivate()
                 }
             }
             // @TODO: CER Exception Handling was removed here (see GH#3581)
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
-
                 // If an exception occurred, the inner connection will be marked as unusable and
                 // destroyed upon returning to the pool
                 DoomThisConnection();
@@ -3845,13 +3835,9 @@ private void OpenLoginEnlist(
 
                 _timeoutErrorInternal.EndPhase(SqlConnectionTimeoutErrorPhase.PostLogin);
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                if (ADP.IsCatchableExceptionType(e))
-                {
-                    LoginFailure();
-                }
-
+                LoginFailure();
                 throw;
             }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index 4243e777ba..fa704ab438 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     /// <summary>
     /// A concrete implementation of <see cref="IDbConnectionPool"/> used by <c>Microsoft.Data.SqlClient</c>
     /// to efficiently manage a pool of reusable <see cref="DbConnectionInternal"/> objects backing ADO.NET <c>SqlConnection</c> instances.
-    /// 
+    ///
     /// <para><b>Primary Responsibilities:</b></para>
     /// <list type="bullet">
     ///   <item><description><b>Connection Reuse and Pooling:</b> Uses two stacks (<c>_stackNew</c> and <c>_stackOld</c>) to manage idle connections. Ensures efficient reuse and limits new connection creation.</description></item>
@@ -36,7 +36,7 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     ///   <item><description><b>Pending Request Queue:</b> Queues unresolved connection requests in <c>_pendingOpens</c> and processes them using background threads.</description></item>
     ///   <item><description><b>Identity and Authentication Context:</b> Manages identity-based reuse via a dictionary of <c>DbConnectionPoolAuthenticationContext</c> keyed by user identity.</description></item>
     /// </list>
-    /// 
+    ///
     /// <para><b>Key Concepts in Design:</b></para>
     /// <list type="bullet">
     ///   <item><description>Stacks and queues for free and pending connections</description></item>
@@ -379,7 +379,7 @@ private void CleanupCallback(object state)
                         //   ONLY touch obj after lock release if shouldDestroy is false!!!  Otherwise, it may be destroyed
                         //   by transaction-end thread!
 
-                        // Note that there is a minor race condition between this task and the transaction end event, if the latter runs 
+                        // Note that there is a minor race condition between this task and the transaction end event, if the latter runs
                         //  between the lock above and the SetInStasis call below. The result is that the stasis counter may be
                         //  incremented without a corresponding decrement (the transaction end task is normally expected
                         //  to decrement, but will only do so if the stasis flag is set when it runs). I've minimized the size
@@ -547,14 +547,8 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
                 // Reset the error wait:
                 _errorWait = ERROR_WAIT_DEFAULT;
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                // UNDONE - should not be catching all exceptions!!!
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
-
                 ADP.TraceExceptionWithoutRethrow(e);
 
                 if (!IsBlockingPeriodEnabled())
@@ -577,7 +571,7 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
                 Timer t = new Timer(new TimerCallback(this.ErrorCallback), null, Timeout.Infinite, Timeout.Infinite);
 
                 bool timerIsNotDisposed;
-                
+
                 _waitHandles.ErrorEvent.Set();
                 _errorOccurred = true;
 
@@ -624,16 +618,16 @@ private void DeactivateObject(DbConnectionInternal obj)
                     // be returned to a different customer until the transaction
                     // actually completes, so we send it into Stasis -- the SysTx
                     // transaction object will ensure that it is owned (not lost),
-                    // and it will be certain to put it back into the pool.                    
+                    // and it will be certain to put it back into the pool.
 
                     if (State is ShuttingDown)
                     {
                         if (obj.IsTransactionRoot)
                         {
-                            // SQLHotfix# 50003503 - connections that are affiliated with a 
-                            //   root transaction and that also happen to be in a connection 
-                            //   pool that is being shutdown need to be put in stasis so that 
-                            //   the root transaction isn't effectively orphaned with no 
+                            // SQLHotfix# 50003503 - connections that are affiliated with a
+                            //   root transaction and that also happen to be in a connection
+                            //   pool that is being shutdown need to be put in stasis so that
+                            //   the root transaction isn't effectively orphaned with no
                             //   means to promote itself to a full delegated transaction or
                             //   Commit or Rollback
                             obj.SetInStasis();
@@ -666,7 +660,7 @@ private void DeactivateObject(DbConnectionInternal obj)
                             {
                                 // NOTE: we're not locking on _state, so it's possible that its
                                 //   value could change between the conditional check and here.
-                                //   Although perhaps not ideal, this is OK because the 
+                                //   Although perhaps not ideal, this is OK because the
                                 //   DelegatedTransactionEnded event will clean up the
                                 //   connection appropriately regardless of the pool state.
                                 Debug.Assert(_transactedConnectionPool != null, "Transacted connection pool was not expected to be null.");
@@ -685,13 +679,13 @@ private void DeactivateObject(DbConnectionInternal obj)
                             {
                                 // SQLHotfix# 50003503 - if the object cannot be pooled but is a transaction
                                 //   root, then we must have hit one of two race conditions:
-                                //       1) PruneConnectionPoolGroups shutdown the pool and marked this connection 
+                                //       1) PruneConnectionPoolGroups shutdown the pool and marked this connection
                                 //          as non-poolable while we were processing within this lock
                                 //       2) The LoadBalancingTimeout expired on this connection and marked this
                                 //          connection as DoNotPool.
                                 //
                                 //   This connection needs to be put in stasis so that the root transaction isn't
-                                //   effectively orphaned with no means to promote itself to a full delegated 
+                                //   effectively orphaned with no means to promote itself to a full delegated
                                 //   transaction or Commit or Rollback
                                 obj.SetInStasis();
                                 rootTxn = true;
@@ -716,7 +710,7 @@ private void DeactivateObject(DbConnectionInternal obj)
             }
             else if (destroyObject)
             {
-                // Connections that have been marked as no longer 
+                // Connections that have been marked as no longer
                 // poolable (e.g. exceeded their connection lifetime) are not, in fact,
                 // returned to the general pool
                 DestroyObject(obj);
@@ -783,7 +777,7 @@ private void ErrorCallback(object state)
 
         private Exception TryCloneCachedException()
         // Cached exception can be of any type, so is not always cloneable.
-        // This functions clones SqlException 
+        // This functions clones SqlException
         // OleDb and Odbc connections are not passing throw this code
             => _resError is SqlException sqlEx ? sqlEx.InternalClone() : _resError;
 
@@ -796,7 +790,7 @@ private void WaitForPendingOpen()
             do
             {
                 bool started = false;
-                
+
                 try
                 {
                     started = Interlocked.CompareExchange(ref _pendingOpensWaiting, 1, 0) == 0;
@@ -825,7 +819,7 @@ private void WaitForPendingOpen()
                         DbConnectionInternal connection = null;
                         bool timeout = false;
                         Exception caughtException = null;
-                        
+
                         try
                         {
                             ADP.SetCurrentTransaction(next.Completion.Task.AsyncState as Transaction);
@@ -1165,8 +1159,8 @@ private DbConnectionInternal GetFromGeneralPool()
                 Debug.Assert(obj != null, "null connection is not expected");
             }
 
-            // When another thread is clearing this pool,  
-            // it will remove all connections in this pool which causes the 
+            // When another thread is clearing this pool,
+            // it will remove all connections in this pool which causes the
             // following assert to fire, which really mucks up stress against
             // checked bits.
 
@@ -1275,7 +1269,7 @@ private void PoolCreateRequest(object state)
                                             }
                                             catch
                                             {
-                                                // Catch all the exceptions occuring during CreateObject so that they 
+                                                // Catch all the exceptions occuring during CreateObject so that they
                                                 // don't emerge as unhandled on the thread pool and don't crash applications
                                                 // The error is handled in CreateObject and surfaced to the caller of the Connection Pool
                                                 // using the ErrorEvent. Hence it is OK to swallow all exceptions here.
@@ -1301,15 +1295,10 @@ private void PoolCreateRequest(object state)
                                     QueuePoolCreateRequest();
                                 }
                             }
-                            catch (Exception e)
+                            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                             {
-                                if (!ADP.IsCatchableExceptionType(e))
-                                {
-                                    throw;
-                                }
-
                                 // Now that CreateObject can throw, we need to catch the exception and discard it.
-                                // There is no further action we can take beyond tracing.  The error will be 
+                                // There is no further action we can take beyond tracing.  The error will be
                                 // thrown to the user the next time they request a connection.
                                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.PoolCreateRequest|RES|CPOOL> {0}, PoolCreateRequest called CreateConnection which threw an exception: {1}", Id, e);
                             }
@@ -1494,14 +1483,14 @@ public void Shutdown()
 
         // TransactionEnded merely provides the plumbing for DbConnectionInternal to access the transacted pool
         //   that is implemented inside DbConnectionPool. This method's counterpart (PutTransactedObject) should
-        //   only be called from DbConnectionPool.DeactivateObject and thus the plumbing to provide access to 
+        //   only be called from DbConnectionPool.DeactivateObject and thus the plumbing to provide access to
         //   other objects is unnecessary (hence the asymmetry of Ended but no Begin)
         public void TransactionEnded(Transaction transaction, DbConnectionInternal transactedObject)
         {
             Debug.Assert(transaction != null, "null transaction?");
             Debug.Assert(transactedObject != null, "null transactedObject?");
 
-            // Note: connection may still be associated with transaction due to Explicit Unbinding requirement.          
+            // Note: connection may still be associated with transaction due to Explicit Unbinding requirement.
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.TransactionEnded|RES|CPOOL> {0}, Transaction {1}, Connection {2}, Transaction Completed", Id, transaction.GetHashCode(), transactedObject.ObjectID);
 
             // called by the internal connection when it get's told that the
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs
index c7d562750a..15a856dcec 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs
@@ -171,84 +171,79 @@ public SniTcpHandle(
                             _socket = Connect(serverName, port, timeout, ipPreference, cachedFQDN, ref pendingDNSInfo);
                         }
                     }
+                    // Connection failed with a retryable exception and we have cached DNS info: retry using cached IPs.
                     catch (Exception ex)
+                        when (!timeout.IsExpired &&
+                              hasCachedDNSInfo &&
+                              ex is (SocketException or ArgumentException or AggregateException))
                     {
-                        if (timeout.IsExpired)
+                        // Retry with cached IP address
+                        int portRetry = string.IsNullOrEmpty(cachedDNSInfo.Port) ? port : int.Parse(cachedDNSInfo.Port);
+
+                        string firstCachedIP;
+                        string secondCachedIP;
+
+                        if (SqlConnectionIPAddressPreference.IPv6First == ipPreference)
                         {
-                            throw;
+                            firstCachedIP = cachedDNSInfo.AddrIPv6;
+                            secondCachedIP = cachedDNSInfo.AddrIPv4;
                         }
-                        // Retry with cached IP address
-                        if (ex is SocketException || ex is ArgumentException || ex is AggregateException)
+                        else
+                        {
+                            firstCachedIP = cachedDNSInfo.AddrIPv4;
+                            secondCachedIP = cachedDNSInfo.AddrIPv6;
+                        }
+
+                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniTcpHandle), EventType.INFO, "Connection Id {0}, Retrying with cached DNS IP Address {1} and port {2}", args0: _connectionId, args1: firstCachedIP, args2: portRetry);
+
+                        try
                         {
-                            if (hasCachedDNSInfo == false)
+                            if (parallel)
                             {
-                                SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniTcpHandle), EventType.ERR, "Connection Id {0}, Cached DNS Info not found, exception occurred thrown: {1}", args0: _connectionId, args1: ex?.Message);
-                                throw;
+                                _socket = TryConnectParallel(firstCachedIP, portRetry, timeout, ref reportError, cachedFQDN, ref pendingDNSInfo);
                             }
                             else
                             {
-                                int portRetry = string.IsNullOrEmpty(cachedDNSInfo.Port) ? port : int.Parse(cachedDNSInfo.Port);
-                                SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniTcpHandle), EventType.INFO, "Connection Id {0}, Retrying with cached DNS IP Address {1} and port {2}", args0: _connectionId, args1: cachedDNSInfo.AddrIPv4, args2: cachedDNSInfo.Port);
-
-                                string firstCachedIP;
-                                string secondCachedIP;
-
-                                if (SqlConnectionIPAddressPreference.IPv6First == ipPreference)
-                                {
-                                    firstCachedIP = cachedDNSInfo.AddrIPv6;
-                                    secondCachedIP = cachedDNSInfo.AddrIPv4;
-                                }
-                                else
-                                {
-                                    firstCachedIP = cachedDNSInfo.AddrIPv4;
-                                    secondCachedIP = cachedDNSInfo.AddrIPv6;
-                                }
-
-                                try
-                                {
-                                    if (parallel)
-                                    {
-                                        _socket = TryConnectParallel(firstCachedIP, portRetry, timeout, ref reportError, cachedFQDN, ref pendingDNSInfo);
-                                    }
-                                    else
-                                    {
-                                        _socket = Connect(firstCachedIP, portRetry, timeout, ipPreference, cachedFQDN, ref pendingDNSInfo);
-                                    }
-                                }
-                                catch (Exception exRetry)
-                                {
-                                    if (timeout.IsExpired)
-                                    {
-                                        throw;
-                                    }
-                                    if (exRetry is
-                                        SocketException or
-                                        ArgumentException or
-                                        AggregateException)
-                                    {
-                                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniTcpHandle), EventType.INFO, "Connection Id {0}, Retrying exception {1}", args0: _connectionId, args1: exRetry?.Message);
-                                        if (parallel)
-                                        {
-                                            _socket = TryConnectParallel(secondCachedIP, portRetry, timeout, ref reportError, cachedFQDN, ref pendingDNSInfo);
-                                        }
-                                        else
-                                        {
-                                            _socket = Connect(secondCachedIP, portRetry, timeout, ipPreference, cachedFQDN, ref pendingDNSInfo);
-                                        }
-                                    }
-                                    else
-                                    {
-                                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniTcpHandle), EventType.ERR, "Connection Id {0}, Retry failed, exception occurred: {1}", args0: _connectionId, args1: exRetry?.Message);
-                                        throw;
-                                    }
-                                }
+                                _socket = Connect(firstCachedIP, portRetry, timeout, ipPreference, cachedFQDN, ref pendingDNSInfo);
                             }
                         }
-                        else
+                        catch (Exception exRetry)
+                            when (!timeout.IsExpired &&
+                                  exRetry is
+                                      SocketException or
+                                      ArgumentNullException or
+                                      ArgumentException or
+                                      ArgumentOutOfRangeException or
+                                      AggregateException)
+                        {
+                            SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniTcpHandle), EventType.INFO, "Connection Id {0}, Retrying exception {1}", args0: _connectionId, args1: exRetry?.Message);
+                            if (parallel)
+                            {
+                                _socket = TryConnectParallel(secondCachedIP, portRetry, timeout, ref reportError, cachedFQDN, ref pendingDNSInfo);
+                            }
+                            else
+                            {
+                                _socket = Connect(secondCachedIP, portRetry, timeout, ipPreference, cachedFQDN, ref pendingDNSInfo);
+                            }
+                        }
+                        catch (Exception exRetry) when (!timeout.IsExpired)
                         {
+                            SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniTcpHandle), EventType.ERR, "Connection Id {0}, Retry failed, exception occurred: {1}", args0: _connectionId, args1: exRetry?.Message);
                             throw;
                         }
                     }
+                    // Connection failed with a retryable exception but no cached DNS info available: log and rethrow.
+                    catch (Exception ex)
+                        when (!timeout.IsExpired &&
+                              !hasCachedDNSInfo &&
+                              ex is
+                                  SocketException or
+                                  ArgumentException or
+                                  AggregateException)
+                    {
+                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniTcpHandle), EventType.ERR, "Connection Id {0}, Cached DNS Info not found, exception occurred thrown: {1}", args0: _connectionId, args1: ex?.Message);
+                        throw;
+                    }
 
                     if (_socket == null || !_socket.Connected)
                     {
@@ -424,7 +419,7 @@ private static Socket Connect(string serverName, int port, TimeoutTimer timeout,
                             List<Socket> checkErrorLst;
 
                             // Repeating Socket.Select several times if our timeout is greater
-                            // than int.MaxValue microseconds because of 
+                            // than int.MaxValue microseconds because of
                             // https://github.com/dotnet/SqlClient/pull/1029#issuecomment-875364044
                             // which states that Socket.Select can't handle timeouts greater than int.MaxValue microseconds
                             do
@@ -583,7 +578,7 @@ private static Socket ParallelConnect(IPAddress[] serverAddresses, int port, Tim
                     try
                     {
                         // Repeating Socket.Select several times if our timeout is greater
-                        // than int.MaxValue microseconds because of 
+                        // than int.MaxValue microseconds because of
                         // https://github.com/dotnet/SqlClient/pull/1029#issuecomment-875364044
                         // which states that Socket.Select can't handle timeouts greater than int.MaxValue microseconds
                         do
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs
index 0b75a6178d..94338c8dfb 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs
@@ -2384,12 +2384,8 @@ private static void SetCharsOrString_FromReader(ITypedSettersV3 setters, int ord
                 SetChars_FromReader(setters, ordinal, metaData, reader, offset);
                 success = true;
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
             }
 
             if (!success)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
index 414be57eb0..af2091d7f6 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -1092,12 +1092,8 @@ private void Dispose(bool disposing)
                             _internalTransaction = null;
                         }
                     }
-                    catch (Exception e)
+                    catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                     {
-                        if (!ADP.IsCatchableExceptionType(e))
-                        {
-                            throw;
-                        }
                         ADP.TraceExceptionWithoutRethrow(e);
                     }
                 }
@@ -1861,12 +1857,8 @@ private object ConvertValue(object value, _SqlMetaData metadata, bool isNull, re
 
                 return value;
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
                 throw SQL.BulkLoadCannotConvertValue(value.GetType(), type, metadata.ordinal, RowNumber, metadata.isEncrypted, metadata.column, value.ToString(), e);
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
index 36d727575c..141416537f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
@@ -236,21 +236,14 @@ private IAsyncResult BeginExecuteNonQueryInternal(
                         BeginExecuteNonQueryInternalReadStage(localCompletion);
                     }
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableOrSecurityExceptionType(e))
                 {
-                    // @TODO: Invert.
-                    if (!ADP.IsCatchableOrSecurityExceptionType(e))
-                    {
-                        // Exception is not catchable, the connection has already been caught and
-                        // doomed in a lower level.
-                        throw;
-                    }
-
                     // For async, RunExecuteReader will never put the stateObj back into the pool,
                     // so, do so now.
                     ReliablePutStateObject();
                     throw;
                 }
+                // Allow other exceptions to bubble up as-is.
 
                 // When we use query caching for parameter encryption we need to retry on specific errors.
                 // In these cases finalize the call internally and trigger a retry when needed.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
index d9f6c33233..a98d82118b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
@@ -290,15 +290,8 @@ private IAsyncResult BeginExecuteReaderInternal(
                         isRetry,
                         nameof(BeginExecuteReader));
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableOrSecurityExceptionType(e))
                 {
-                    if (!ADP.IsCatchableOrSecurityExceptionType(e))
-                    {
-                        // If not catchable - the connection has already been caught and doomed in
-                        // RunExecuteReader.
-                        throw;
-                    }
-
                     // For async, RunExecuteReader will never put the stateObj back into the pool,
                     // so, do so now.
                     ReliablePutStateObject();
@@ -307,6 +300,7 @@ private IAsyncResult BeginExecuteReaderInternal(
                         throw;
                     }
                 }
+                // Allow other exceptions to bubble up as-is.
 
                 if (writeTask is not null)
                 {
@@ -848,28 +842,25 @@ private void FinishExecuteReader(
                     // @TODO: Why does the command set whether the reader is initialized??
                     ds.IsInitialized = true;
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                 {
-                    if (ADP.IsCatchableExceptionType(e))
+                    if (_inPrepare)
                     {
-                        if (_inPrepare)
-                        {
-                            // The flag is expected to be reset by OnReturnValue. We should receive
-                            // the handle unless command execution failed. If it fails, move back
-                            // to pending state.
-                            _inPrepare = false;                  // reset the flag
-                            IsDirty = true;                      // mark command as dirty so it will be prepared next time we're coming through
-                            _execType = EXECTYPE.PREPAREPENDING; // reset execution type to pending
-                        }
+                        // The flag is expected to be reset by OnReturnValue. We should receive
+                        // the handle unless command execution failed. If it fails, move back
+                        // to pending state.
+                        _inPrepare = false;                  // reset the flag
+                        IsDirty = true;                      // mark command as dirty so it will be prepared next time we're coming through
+                        _execType = EXECTYPE.PREPAREPENDING; // reset execution type to pending
+                    }
 
-                        try
-                        {
-                            ds.Close();
-                        }
-                        catch (Exception eClose)
-                        {
-                            Debug.WriteLine($"Received this exception from SqlDataReader.Close() while in another catch block: {eClose}");
-                        }
+                    try
+                    {
+                        ds.Close();
+                    }
+                    catch (Exception eClose)
+                    {
+                        Debug.WriteLine($"Received this exception from SqlDataReader.Close() while in another catch block: {eClose}");
                     }
 
                     throw;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
index c025e1d3b7..2be6166e8b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
@@ -165,13 +165,9 @@ private static XmlReader CompleteXmlReader(SqlDataReader dataReader, bool isAsyn
                         processAllRows: metaData[0].SqlDbType is not SqlDbType.Xml);
                     xmlReader = sqlStream.ToXmlReader(isAsync);
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                 {
-                    if (ADP.IsCatchableExceptionType(e))
-                    {
-                        dataReader.Close();
-                    }
-
+                    dataReader.Close();
                     throw;
                 }
             }
@@ -253,21 +249,14 @@ private IAsyncResult BeginExecuteXmlReaderInternal(
 
                     // @TODO: NonQuery pathway has the continueTaskWithState block inside this try. One or the other seems wrong 
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableOrSecurityExceptionType(e))
                 {
-                    // @TODO: Invert
-                    if (!ADP.IsCatchableOrSecurityExceptionType(e))
-                    {
-                        // If not catchable - the connection has already been caught and doomed in
-                        // RunExecuteReader.
-                        throw;
-                    }
-
                     // For async, RunExecuteReader will never put the stateObj back into the pool,
                     // so, do so now.
                     ReliablePutStateObject();
                     throw;
                 }
+                // Allow other exceptions to bubble up as-is.
 
                 if (writeTask is not null)
                 {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
index 1073bb137c..ec26b955e1 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -1829,12 +1829,8 @@ internal void OnStatementCompleted(int recordCount)
 
                         handler(this, new StatementCompletedEventArgs(recordCount));
                     }
-                    catch (Exception e)
+                    catch (Exception e) when (ADP.IsCatchableOrSecurityExceptionType(e))
                     {
-                        if (!ADP.IsCatchableOrSecurityExceptionType(e))
-                        {
-                            throw;
-                        }
                     }
                 }
             }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index 9021d3e259..47a1be163a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -2610,13 +2610,8 @@ internal void OnInfoMessage(SqlInfoMessageEventArgs imevent, out bool notified)
                 {
                     handler(this, imevent);
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableOrSecurityExceptionType(e))
                 {
-                    if (!ADP.IsCatchableOrSecurityExceptionType(e))
-                    {
-                        throw;
-                    }
-
                     ADP.TraceExceptionWithoutRethrow(e);
                 }
             }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index e316bb3c08..ca44267eb6 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -1875,12 +1875,8 @@ private TdsOperationStatus TryGetBytesInternal(int i, long dataIndex, byte[] buf
 
                 Buffer.BlockCopy(data, ndataIndex, buffer, bufferIndex, cbytes);
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
                 cbytes = data.Length;
 
                 if (length < 0)
@@ -2152,17 +2148,10 @@ override public long GetChars(int i, long dataIndex, char[] buffer, int bufferIn
                         {
                             CheckDataIsReady(columnIndex: i, allowPartiallyReadColumn: true);
                         }
-                        catch (Exception ex)
+                        catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
                         {
                             // We need to wrap all exceptions inside a TargetInvocationException to simulate calling CreateSqlReader via MethodInfo.Invoke
-                            if (ADP.IsCatchableExceptionType(ex))
-                            {
-                                throw new TargetInvocationException(ex);
-                            }
-                            else
-                            {
-                                throw;
-                            }
+                            throw new TargetInvocationException(ex);
                         }
                         charsRead = GetStreamingXmlChars(i, dataIndex, buffer, bufferIndex, length);
                     }
@@ -2232,12 +2221,8 @@ override public long GetChars(int i, long dataIndex, char[] buffer, int bufferIn
                     Array.Copy(_columnDataChars, ndataIndex, buffer, bufferIndex, cchars);
                     _columnDataCharsRead += cchars;
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                 {
-                    if (!ADP.IsCatchableExceptionType(e))
-                    {
-                        throw;
-                    }
                     cchars = _columnDataChars.Length;
 
                     if (length < 0)
@@ -5044,12 +5029,8 @@ public override Task<bool> ReadAsync(CancellationToken cancellationToken)
 #endif
                     }
                 }
-                catch (Exception ex)
+                catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
                 {
-                    if (!ADP.IsCatchableExceptionType(ex))
-                    {
-                        throw;
-                    }
                     return Task.FromException<bool>(ex);
                 }
 
@@ -5146,12 +5127,8 @@ override public Task<bool> IsDBNullAsync(int i, CancellationToken cancellationTo
             {
                 CheckHeaderIsReady(columnIndex: i);
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
-                if (!ADP.IsCatchableExceptionType(ex))
-                {
-                    throw;
-                }
                 return Task.FromException<bool>(ex);
             }
 
@@ -5204,12 +5181,8 @@ override public Task<bool> IsDBNullAsync(int i, CancellationToken cancellationTo
 #endif
                     }
                 }
-                catch (Exception ex)
+                catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
                 {
-                    if (!ADP.IsCatchableExceptionType(ex))
-                    {
-                        throw;
-                    }
                     return Task.FromException<bool>(ex);
                 }
 
@@ -5305,12 +5278,8 @@ override public Task<T> GetFieldValueAsync<T>(int i, CancellationToken cancellat
                     }
                 }
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
-                if (!ADP.IsCatchableExceptionType(ex))
-                {
-                    throw;
-                }
                 return Task.FromException<T>(ex);
             }
 
@@ -5346,12 +5315,8 @@ override public Task<T> GetFieldValueAsync<T>(int i, CancellationToken cancellat
 #endif
                 }
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
-                if (!ADP.IsCatchableExceptionType(ex))
-                {
-                    throw;
-                }
                 return Task.FromException<T>(ex);
             }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
index 836fbb7dd4..a101099dd8 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
@@ -638,13 +638,8 @@ internal static bool Start(string connectionString, string queue, bool useDefaul
                                         {
                                             Stop(connectionString, queue, useDefaults, true);
                                         }
-                                        catch (Exception e)
-                                        { // Discard stop failure!
-                                            if (!ADP.IsCatchableExceptionType(e))
-                                            {
-                                                throw;
-                                            }
-
+                                        catch (Exception e) when (ADP.IsCatchableExceptionType(e))
+                                        {
                                             ADP.TraceExceptionWithoutRethrow(e); // Discard failure, but trace for now.
                                             SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependency.Start|DEP|ERR> Exception occurred from Stop() after duplicate was found on Start().");
                                         }
@@ -666,13 +661,8 @@ internal static bool Start(string connectionString, string queue, bool useDefaul
                             // to provide options themselves.
                         }
                     }
-                    catch (Exception e)
+                    catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                     {
-                        if (!ADP.IsCatchableExceptionType(e))
-                        {
-                            throw;
-                        }
-
                         ADP.TraceExceptionWithoutRethrow(e); // Discard failure, but trace for now.
                         SqlClientEventSource.Log.TryNotificationTraceEvent("<sc.SqlDependency.Start|DEP|ERR> Exception occurred from _processDispatcher.Start(...), calling Invalidate(...).");
                         throw;
@@ -785,13 +775,8 @@ internal static bool Stop(string connectionString, string queue, bool useDefault
                                 // to provide options themselves.
                             }
                         }
-                        catch (Exception e)
+                        catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                         {
-                            if (!ADP.IsCatchableExceptionType(e))
-                            {
-                                throw;
-                            }
-
                             ADP.TraceExceptionWithoutRethrow(e); // Discard failure, but trace for now.
                         }
                     }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
index 004ae0ed08..faf088b9b5 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyListener.cs
@@ -177,13 +177,8 @@ internal SqlConnectionContainer(SqlConnectionContainerHashHelper hashHelper, str
                 _timeoutParam.Value = _defaultWaitforTimeout; // Sync successful, extend timeout to 60 seconds.
                 AsynchronouslyQueryServiceBrokerQueue();
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
-
                 ADP.TraceExceptionWithoutRethrow(e); // Discard failure, but trace for now.
                 if (setupCompleted)
                 {
@@ -400,12 +395,8 @@ private void CreateQueueAndService(bool restart)
                         {
                             com.ExecuteNonQuery(); // Cannot add 'IF OBJECT_ID' to create procedure query - wrap and discard failure.
                         }
-                        catch (Exception e)
+                        catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                         {
-                            if (!ADP.IsCatchableExceptionType(e))
-                            {
-                                throw;
-                            }
                             ADP.TraceExceptionWithoutRethrow(e);
 
                             try
@@ -416,12 +407,8 @@ private void CreateQueueAndService(bool restart)
                                     trans = null;
                                 }
                             }
-                            catch (Exception f)
+                            catch (Exception f) when (ADP.IsCatchableExceptionType(f))
                             {
-                                if (!ADP.IsCatchableExceptionType(f))
-                                {
-                                    throw;
-                                }
                                 ADP.TraceExceptionWithoutRethrow(f); // Discard failure, but trace for now.
                             }
                         }
@@ -479,12 +466,8 @@ private void CreateQueueAndService(bool restart)
                             trans.Rollback();
                             trans = null;
                         }
-                        catch (Exception e)
+                        catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                         {
-                            if (!ADP.IsCatchableExceptionType(e))
-                            {
-                                throw;
-                            }
                             ADP.TraceExceptionWithoutRethrow(e); // Discard failure, but trace for now.
                         }
                     }
@@ -580,12 +563,8 @@ private void ProcessNotificationResults(SqlDataReader reader)
                                             {
                                                 dispatcher.InvalidateCommandID(notification); // CROSS APP-DOMAIN CALL!
                                             }
-                                            catch (Exception e)
+                                            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                                             {
-                                                if (!ADP.IsCatchableExceptionType(e))
-                                                {
-                                                    throw;
-                                                }
                                                 ADP.TraceExceptionWithoutRethrow(e); // Discard failure.  User event could throw exception.
                                             }
                                         }
@@ -664,12 +643,8 @@ private void Restart(object unused)
                             {
                                 _con.Close();
                             }
-                            catch (Exception e)
+                            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                             {
-                                if (!ADP.IsCatchableExceptionType(e))
-                                {
-                                    throw;
-                                }
                                 ADP.TraceExceptionWithoutRethrow(e); // Discard close failure, if it occurs.  Only trace it.
                             }
                         }
@@ -717,12 +692,8 @@ private void Restart(object unused)
                                 {
                                     CreateQueueAndService(true); // Ensure service, queue, etc is present, if we created it.
                                 }
-                                catch (Exception e)
+                                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                                 {
-                                    if (!ADP.IsCatchableExceptionType(e))
-                                    {
-                                        throw;
-                                    }
                                     ADP.TraceExceptionWithoutRethrow(e); // Discard failure, but trace for now.
                                     failure = true;
                                 }
@@ -765,12 +736,8 @@ private void Restart(object unused)
                         TearDownAndDispose(); // Function will lock(this).
                     }
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                 {
-                    if (!ADP.IsCatchableExceptionType(e))
-                    {
-                        throw;
-                    }
                     ADP.TraceExceptionWithoutRethrow(e);
 
                     try
@@ -786,12 +753,8 @@ private void Restart(object unused)
                                                                        SqlNotificationType.Change,
                                                                        null));
                     }
-                    catch (Exception f)
+                    catch (Exception f) when (ADP.IsCatchableExceptionType(f))
                     {
-                        if (!ADP.IsCatchableExceptionType(f))
-                        {
-                            throw;
-                        }
                         ADP.TraceExceptionWithoutRethrow(f); // Discard exception from Invalidate.  User events can throw.
                     }
 
@@ -799,12 +762,8 @@ private void Restart(object unused)
                     {
                         _con.Close();
                     }
-                    catch (Exception f)
+                    catch (Exception f) when (ADP.IsCatchableExceptionType(f))
                     {
-                        if (!ADP.IsCatchableExceptionType(f))
-                        {
-                            throw;
-                        }
                         ADP.TraceExceptionWithoutRethrow(f); // Discard close failure, if it occurs.  Only trace it.
                     }
 
@@ -884,12 +843,8 @@ internal bool Stop(string appDomainKey, out bool appDomainStop)
                             // Rather than fighting the race condition, just call it and discard any potential failure.
                             _com.Cancel(); // Cancel the pending command.  No-op if connection closed.
                         }
-                        catch (Exception e)
+                        catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                         {
-                            if (!ADP.IsCatchableExceptionType(e))
-                            {
-                                throw;
-                            }
                             ADP.TraceExceptionWithoutRethrow(e); // Discard failure, if it should occur.
                         }
                         _stop = true;
@@ -992,12 +947,8 @@ private void TearDownAndDispose()
                                     _com.Parameters.Remove(_timeoutParam);
                                     _com.ExecuteNonQuery();
                                 }
-                                catch (Exception e)
+                                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                                 {
-                                    if (!ADP.IsCatchableExceptionType(e))
-                                    {
-                                        throw;
-                                    }
                                     ADP.TraceExceptionWithoutRethrow(e); // Discard failure.
                                 }
                             }
@@ -1016,12 +967,8 @@ private void TearDownAndDispose()
                                 {
                                     _com.ExecuteNonQuery();
                                 }
-                                catch (Exception e)
+                                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                                 {
-                                    if (!ADP.IsCatchableExceptionType(e))
-                                    {
-                                        throw;
-                                    }
                                     ADP.TraceExceptionWithoutRethrow(e); // Discard failure.
                                 }
                             }
@@ -1104,12 +1051,8 @@ internal static SqlNotification ProcessMessage(SqlXml xmlMessage)
                                             type = temp;
                                         }
                                     }
-                                    catch (Exception e)
+                                    catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                                     {
-                                        if (!ADP.IsCatchableExceptionType(e))
-                                        {
-                                            throw;
-                                        }
                                         ADP.TraceExceptionWithoutRethrow(e); // Discard failure, if it should occur.
                                     }
                                     messageAttributes |= MessageAttributes.Type;
@@ -1123,12 +1066,8 @@ internal static SqlNotification ProcessMessage(SqlXml xmlMessage)
                                             source = temp;
                                         }
                                     }
-                                    catch (Exception e)
+                                    catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                                     {
-                                        if (!ADP.IsCatchableExceptionType(e))
-                                        {
-                                            throw;
-                                        }
                                         ADP.TraceExceptionWithoutRethrow(e); // Discard failure, if it should occur.
                                     }
                                     messageAttributes |= MessageAttributes.Source;
@@ -1468,17 +1407,13 @@ private void Invalidate(string server, SqlNotification sqlNotification)
                     {
                         perAppDomainDispatcher.InvalidateServer(server, sqlNotification);
                     }
-                    catch (Exception f)
+                    catch (Exception f) when (ADP.IsCatchableExceptionType(f))
                     {
                         // Since we are looping over dependency dispatchers, do not allow one Invalidate
                         // that results in a throw prevent us from invalidating all dependencies
                         // related to this server.
                         // NOTE - SqlDependencyPerAppDomainDispatcher already wraps individual dependency invalidates
                         // with try/catch, but we should be careful and do the same here.
-                        if (!ADP.IsCatchableExceptionType(f))
-                        {
-                            throw;
-                        }
                         ADP.TraceExceptionWithoutRethrow(f); // Discard failure, but trace.
                     }
                 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs
index 23fa1c9359..b850376c51 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.cs
@@ -272,15 +272,11 @@ internal void InvalidateCommandID(SqlNotification sqlNotification)
                         {
                             dependency.Invalidate(sqlNotification.Type, sqlNotification.Info, sqlNotification.Source);
                         }
-                        catch (Exception e)
+                        catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                         {
                             // Since we are looping over dependencies, do not allow one Invalidate
                             // that results in a throw prevent us from invalidating all dependencies
                             // related to this server.
-                            if (!ADP.IsCatchableExceptionType(e))
-                            {
-                                throw;
-                            }
                             ADP.TraceExceptionWithoutRethrow(e);
                         }
                     }
@@ -327,15 +323,11 @@ internal void InvalidateServer(string server, SqlNotification sqlNotification)
                     {
                         dependency.Invalidate(sqlNotification.Type, sqlNotification.Info, sqlNotification.Source);
                     }
-                    catch (Exception e)
+                    catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                     {
                         // Since we are looping over dependencies, do not allow one Invalidate
                         // that results in a throw prevent us from invalidating all dependencies
                         // related to this server.
-                        if (!ADP.IsCatchableExceptionType(e))
-                        {
-                            throw;
-                        }
                         ADP.TraceExceptionWithoutRethrow(e);
                     }
                 }
@@ -581,13 +573,8 @@ private static void TimeoutTimerCallback(object state)
                             // to invoke user-code while holding an internal lock.
                             dependencies[i].Invalidate(SqlNotificationType.Change, SqlNotificationInfo.Error, SqlNotificationSource.Timeout);
                         }
-                        catch (Exception e)
+                        catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                         {
-                            if (!ADP.IsCatchableExceptionType(e))
-                            {
-                                throw;
-                            }
-
                             // This is an exception in user code, and we're in a thread-pool thread
                             // without user's code up in the stack, no much we can do other than
                             // eating the exception.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs
index bc5f5cbccb..ee6557e55b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs
@@ -181,12 +181,8 @@ private void CheckTransactionLevelAndZombie()
                     Zombie();
                 }
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
 #if NETFRAMEWORK
                 ADP.TraceExceptionWithoutRethrow(e);
 #endif
@@ -243,13 +239,9 @@ internal void Commit()
                     _innerConnection.ExecuteTransaction(TransactionRequest.Commit, null, IsolationLevel.Unspecified, null, false);
                     ZombieParent();
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                 {
-                    if (ADP.IsCatchableExceptionType(e))
-                    {
-                        CheckTransactionLevelAndZombie();
-                    }
-
+                    CheckTransactionLevelAndZombie();
                     throw;
                 }
             }
@@ -350,18 +342,11 @@ internal void Rollback()
                     // server transaction level.  This transaction has been completed.
                     Zombie();
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                 {
-                    if (ADP.IsCatchableExceptionType(e))
-                    {
-                        CheckTransactionLevelAndZombie();
+                    CheckTransactionLevelAndZombie();
 
-                        if (!_disposing)
-                        {
-                            throw;
-                        }
-                    }
-                    else
+                    if (!_disposing)
                     {
                         throw;
                     }
@@ -394,12 +379,9 @@ internal void Rollback(string transactionName)
                 {
                     _innerConnection.ExecuteTransaction(TransactionRequest.Rollback, transactionName, IsolationLevel.Unspecified, null, false);
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                 {
-                    if (ADP.IsCatchableExceptionType(e))
-                    {
-                        CheckTransactionLevelAndZombie();
-                    }
+                    CheckTransactionLevelAndZombie();
                     throw;
                 }
             }
@@ -426,13 +408,9 @@ internal void Save(string savePointName)
                 {
                     _innerConnection.ExecuteTransaction(TransactionRequest.Save, savePointName, IsolationLevel.Unspecified, null, false);
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                 {
-                    if (ADP.IsCatchableExceptionType(e))
-                    {
-                        CheckTransactionLevelAndZombie();
-                    }
-
+                    CheckTransactionLevelAndZombie();
                     throw;
                 }
             }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
index 1d9ceebafd..841c71d410 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
@@ -422,12 +422,8 @@ private async ValueTask<DataTable> ExecuteCommandAsync(DataRow requestedCollecti
                 {
                     reader = isAsync ? await command.ExecuteReaderAsync(cancellationToken) : command.ExecuteReader();
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                 {
-                    if (!ADP.IsCatchableExceptionType(e))
-                    {
-                        throw;
-                    }
                     throw ADP.QueryFailed(collectionName, e);
                 }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
index 621413f9c1..e030fb11f5 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
@@ -2419,13 +2419,8 @@ value is IEnumerable<SqlDataRecord>
                         value = Convert.ChangeType(value, destinationType.ClassType, null);
                     }
                 }
-                catch (Exception e)
+                catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                 {
-                    if (!ADP.IsCatchableExceptionType(e))
-                    {
-                        throw;
-                    }
-
                     throw ADP.ParameterConversionFailed(value, destinationType.ClassType, e);
                 }
             }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs
index 51f0abc7cf..3fb1ec1db6 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs
@@ -123,29 +123,29 @@ internal bool GetQueryMetadataIfExists(SqlCommand sqlCommand)
                     {
                         SqlSecurityUtility.DecryptSymmetricKey(cipherMdCopy, sqlCommand.Connection, sqlCommand);
                     }
-                    catch (Exception ex)
+                    catch (Exception ex) when (ex is SqlException or ArgumentException)
                     {
                         // Invalidate the cache entry.
                         InvalidateCacheEntry(sqlCommand);
 
-                        // If we get one of the expected exceptions, just fail the cache lookup, otherwise throw.
-                        if (ex is SqlException or ArgumentException)
+                        foreach (SqlParameter paramToCleanup in sqlCommand.Parameters)
                         {
-                            foreach (SqlParameter paramToCleanup in sqlCommand.Parameters)
-                            {
-                                paramToCleanup.CipherMetadata = null;
-                            }
-
-                            IncrementCacheMisses();
-                            return false;
+                            paramToCleanup.CipherMetadata = null;
                         }
 
+                        IncrementCacheMisses();
+                        return false;
+                    }
+                    catch (Exception)
+                    {
+                        // Invalidate the cache entry.
+                        InvalidateCacheEntry(sqlCommand);
                         throw;
                     }
                 }
             }
 
-            ConcurrentDictionary<int, SqlTceCipherInfoEntry> enclaveKeys = 
+            ConcurrentDictionary<int, SqlTceCipherInfoEntry> enclaveKeys =
                 _cache.Get<ConcurrentDictionary<int, SqlTceCipherInfoEntry>>(enclaveLookupKey);
             if (enclaveKeys is not null)
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 66e9c3e52e..0e8548c2b1 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -208,7 +208,7 @@ static TdsParser()
         {
             // For CoreCLR, we need to register the ANSI Code Page encoding provider before attempting to get an Encoding from a CodePage
             // For a default installation of SqlServer the encoding exchanged during Login is 1252. This encoding is not loaded by default
-            // See Remarks at https://msdn.microsoft.com/en-us/library/system.text.encodingprovider(v=vs.110).aspx 
+            // See Remarks at https://msdn.microsoft.com/en-us/library/system.text.encodingprovider(v=vs.110).aspx
             // SqlClient needs to register the encoding providers to make sure that even basic scenarios work with Sql Server.
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
         }
@@ -683,7 +683,7 @@ internal void RemoveEncryption()
 
             // create a new packet encryption changes the internal packet size Bug# 228403
             _physicalStateObj.ClearAllWritePackets();
-        }   
+        }
 
         internal void EnableMars()
         {
@@ -1376,11 +1376,11 @@ internal void TdsLogin(
                 int feOffset = length;
                 // calculate and reserve the required bytes for the featureEx
                 length = ApplyFeatureExData(
-                    requestedFeatures, 
-                    recoverySessionData, 
+                    requestedFeatures,
+                    recoverySessionData,
                     fedAuthFeatureExtensionData,
                     UserAgent.Ucs2Bytes,
-                    useFeatureExt, 
+                    useFeatureExt,
                     length
                     );
 
@@ -2792,7 +2792,7 @@ internal TdsOperationStatus TryRun(RunBehavior runBehavior, SqlCommand cmdHandle
                         {
                             _connHandler._federatedAuthenticationInfoReceived = true;
                             SqlFedAuthInfo info;
-                            
+
                             result = TryProcessFedAuthInfo(stateObj, tokenLength, out info);
                             if (result != TdsOperationStatus.Done)
                             {
@@ -5713,7 +5713,7 @@ private TdsOperationStatus TryCommonProcessMetaData(TdsParserStateObject stateOb
             {
                 return result;
             }
-         
+
             // read flags and set appropriate flags in structure
             byte flags;
             result = stateObj.TryReadByte(out flags);
@@ -7042,7 +7042,7 @@ internal TdsOperationStatus TryReadSqlValue(SqlBuffer value,
                         return result;
                     }
 
-                    // Internally, we use Sqlbinary to deal with varbinary data and store it in 
+                    // Internally, we use Sqlbinary to deal with varbinary data and store it in
                     // SqlBuffer as SqlBinary value.
 #if NET
                     value.SqlBinary = SqlBinary.WrapBytes(b);
@@ -8796,14 +8796,8 @@ private void ProcessAttention(TdsParserStateObject stateObj)
                 // Call run loop to process looking for attention ack.
                 Run(RunBehavior.Attention, null, null, null, stateObj);
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                // UNDONE - should not be catching all exceptions!!!
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
-
                 // If an exception occurs - break the connection.
                 // Attention error will not be thrown in this case by Run(), but other failures may.
                 ADP.TraceExceptionWithoutRethrow(e);
@@ -9171,7 +9165,7 @@ internal int WriteFedAuthFeatureRequest(FederatedAuthenticationFeatureExtensionD
         /// </remarks>
         internal int WriteVectorSupportFeatureRequest(bool write)
         {
-            const int len = 6; 
+            const int len = 6;
 
             if (write)
             {
@@ -9529,15 +9523,11 @@ private void WriteLoginData(SqlLogin rec,
                     true
                     );
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                // UNDONE - should not be catching all exceptions!!!
-                if (ADP.IsCatchableExceptionType(e))
-                {
-                    // be sure to wipe out our buffer if we started sending stuff
-                    _physicalStateObj.ResetPacketCounters();
-                    _physicalStateObj.ResetBuffer();
-                }
+                // be sure to wipe out our buffer if we started sending stuff
+                _physicalStateObj.ResetPacketCounters();
+                _physicalStateObj.ResetBuffer();
 
                 throw;
             }
@@ -9892,13 +9882,8 @@ internal SqlDataReader TdsExecuteTransactionManagerRequest(
 
                 return dtcReader;
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
-
                 FailureCleanup(stateObj, e);
 
                 throw;
@@ -10069,14 +10054,8 @@ internal Task TdsExecuteSQLBatch(string text, int timeout, SqlNotificationReques
                 // Finished sync
                 return null;
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                // UNDONE - should not be catching all exceptions!!!
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
-
                 FailureCleanup(stateObj, e);
 
                 throw;
@@ -10369,7 +10348,7 @@ private Task TDSExecuteRPCAddParameter(TdsParserStateObject stateObj, SqlParamet
             {
                 isSqlVal = param.ParameterIsSqlType;  // We have to forward the TYPE info, we need to know what type we are returning.  Once we null the parameter we will no longer be able to distinguish what type were seeing.
 
-                // Output parameter of SqlDbType vector are defined through SqlParameter.Value. 
+                // Output parameter of SqlDbType vector are defined through SqlParameter.Value.
                 // This check ensures that we do not discard the parameter value when SqlDbType is vector.
                 if (mt.SqlDbType != SqlDbTypeExtensions.Vector)
                 {
@@ -10654,7 +10633,7 @@ private Task TDSExecuteRPCAddParameter(TdsParserStateObject stateObj, SqlParamet
 
                         Debug.Assert(udtVal != null, "GetBytes returned null instance. Make sure that it always returns non-null value");
                         size = udtVal.Length;
-                        
+
                         if (size >= maxSupportedSize && maxsize != -1)
                         {
                             throw SQL.UDTInvalidSize(maxsize, maxSupportedSize);
@@ -13155,7 +13134,7 @@ private Task WriteUnterminatedValue(object value, MetaType type, byte scale, int
                             {
                                 if (type.NullableType == TdsEnums.SQLJSON)
                                 {
-                                    // TODO : Performance and BOM check. Saurabh 
+                                    // TODO : Performance and BOM check. Saurabh
                                     byte[] jsonAsBytes = Encoding.UTF8.GetBytes((string)value);
                                     WriteInt(jsonAsBytes.Length, stateObj);
                                     return stateObj.WriteByteArray(jsonAsBytes, jsonAsBytes.Length, 0, canAccumulate: false);
@@ -13813,13 +13792,13 @@ internal TdsOperationStatus TryReadPlpUnicodeCharsWithContinue(TdsParserStateObj
             }
 
             TdsOperationStatus result = TryReadPlpUnicodeChars(
-                ref temp, 
-                0, 
-                length >> 1, 
-                stateObj, 
-                out length, 
+                ref temp,
+                0,
+                length >> 1,
+                stateObj,
+                out length,
                 supportRentedBuff: !canContinue, // do not use the arraypool if we are going to keep the buffer in the snapshot
-                rentedBuff: ref buffIsRented, 
+                rentedBuff: ref buffIsRented,
                 startOffset,
                 canContinue
             );
@@ -14029,7 +14008,7 @@ bool writeDataSizeToSnapshot
                         stateObj._longlenleft--;
                         if (writeDataSizeToSnapshot)
                         {
-                            // we need to write the single b1 byte to the array because we may run out of data 
+                            // we need to write the single b1 byte to the array because we may run out of data
                             // and need to wait for another packet
                             buff[offst] = (char)((b1 & 0xff));
                             currentPacketId = IncrementSnapshotDataSize(stateObj, restartingDataSizeCount, currentPacketId, 1);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
index ad8651cebd..45ed29c2ce 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
@@ -1083,13 +1083,8 @@ internal bool Deactivate()
                     goodForReuse = true;
                 }
             }
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
-                if (!ADP.IsCatchableExceptionType(e))
-                {
-                    throw;
-                }
-
                 ADP.TraceExceptionWithoutRethrow(e);
             }
             return goodForReuse;
@@ -3835,12 +3830,8 @@ private bool OnTimeoutCore(int expectedState, int targetState, bool asyncClose =
                             {
                                 SendAttention(mustTakeWriteLock: true, asyncClose);
                             }
-                            catch (Exception e)
+                            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
                             {
-                                if (!ADP.IsCatchableExceptionType(e))
-                                {
-                                    throw;
-                                }
                                 // if unable to send attention, cancel the _networkPacketTaskSource to
                                 // request the parser be broken.  SNIWritePacket errors will already
                                 // be in the _errors collection.

From bfbdd30d89d7381073ee350e04ef4f0b5743cee5 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Fri, 29 May 2026 13:17:44 -0700
Subject: [PATCH 125/298] Connect timeout propagated through pool (#4270)

---
 Directory.Packages.props                      |   2 +
 .../src/Microsoft.Data.SqlClient.csproj       |   1 +
 .../src/Microsoft.Data.SqlClient.nuspec       |   2 +
 .../Data/ProviderBase/DbConnectionClosed.cs   |  21 +-
 .../Data/ProviderBase/DbConnectionInternal.cs |  19 +-
 .../Data/ProviderBase/TimeoutTimer.cs         | 467 +++++++++++-----
 .../Connection/SqlConnectionInternal.cs       |  53 +-
 .../ConnectionPool/ChannelDbConnectionPool.cs |  28 +-
 .../ConnectionPool/IDbConnectionPool.cs       |   7 +-
 .../WaitHandleDbConnectionPool.cs             |  95 +++-
 .../Data/SqlClient/LocalAppContextSwitches.cs |  26 +
 .../ManagedSni/SniTcpHandle.netcore.cs        |   3 +
 .../Microsoft/Data/SqlClient/SqlConnection.cs |  15 +-
 .../Data/SqlClient/SqlConnectionFactory.cs    |  28 +-
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |   2 +-
 .../Common/LocalAppContextSwitchesHelper.cs   |  15 +
 .../tests/Directory.Packages.props            |   1 +
 .../AsyncCancelledConnectionsTest.cs          | 136 ++++-
 .../SQL/InstanceNameTest/InstanceNameTest.cs  |  12 +-
 .../DistributedTransactionTest.cs             |   5 +-
 .../ChannelDbConnectionPoolTest.cs            | 248 +++++++--
 .../TransactedConnectionPoolTest.cs           |   4 +-
 .../WaitHandleDbConnectionPoolBudgetTest.cs   | 232 ++++++++
 ...itHandleDbConnectionPoolTransactionTest.cs |   5 +-
 .../Microsoft.Data.SqlClient.UnitTests.csproj |   9 +
 .../SqlClient/LocalAppContextSwitchesTest.cs  |   1 +
 .../SqlConnectionInternalTimeoutTests.cs      |  74 +++
 .../ProviderBase/TimeoutTimerTest.cs          | 513 ++++++++++++++++++
 .../ConnectionFailoverTests.cs                |   1 +
 29 files changed, 1757 insertions(+), 268 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalTimeoutTests.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ProviderBase/TimeoutTimerTest.cs

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 37b72ca205..a74caf225a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -124,12 +124,14 @@
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="9.0.16" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.13" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.13" />
   </ItemGroup>
 
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <PackageVersion Include="Microsoft.Bcl.Cryptography" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.1" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
   </ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 24c6a548f9..e9b3ad2741 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -289,6 +289,7 @@
     <Reference Include="System.Transactions" />
 
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
+    <PackageReference Include="Microsoft.Bcl.TimeProvider" />
     <PackageReference Include="Microsoft.Data.SqlClient.SNI" ExcludeAssets="compile" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
index da3a17bb9c..a302359ea0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
@@ -37,6 +37,7 @@
     <dependencies>
       <group targetFramework="net462">
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
+        <dependency id="Microsoft.Bcl.TimeProvider" version="8.0.1" />
         <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
         <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
         <dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
@@ -79,6 +80,7 @@
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
+        <dependency id="Microsoft.Bcl.TimeProvider" version="8.0.1" />
         <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
         <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
index 96704bacce..f5ae12f5a1 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
@@ -62,8 +62,9 @@ protected internal override Task<DataTable> GetSchemaAsync(
         internal override bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry) =>
-            TryOpenConnectionInternal(outerConnection, connectionFactory, retry);
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout) =>
+            TryOpenConnectionInternal(outerConnection, connectionFactory, retry, timeout);
 
         /// <inheritdoc/>
         internal override void ResetConnection() => throw ADP.ClosedConnectionError();
@@ -78,7 +79,8 @@ protected DbConnectionBusy(ConnectionState state) : base(state, true, false)
         internal override bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry)
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout)
             => throw ADP.ConnectionAlreadyOpen(State);
     }
 
@@ -119,13 +121,15 @@ internal override void CloseConnection(DbConnection owningObject, SqlConnectionF
         internal override bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry) =>
-            TryOpenConnection(outerConnection, connectionFactory, retry);
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout) =>
+            TryOpenConnection(outerConnection, connectionFactory, retry, timeout);
 
         internal override bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry)
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout)
         {
             if (retry == null || !retry.Task.IsCompleted)
             {
@@ -173,7 +177,8 @@ private DbConnectionClosedPreviouslyOpened() : base(ConnectionState.Closed, true
         internal override bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry) =>
-            TryOpenConnection(outerConnection, connectionFactory, retry);
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout) =>
+            TryOpenConnection(outerConnection, connectionFactory, retry, timeout);
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
index ac3949c726..b295f84b3d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -686,14 +686,6 @@ internal void MakePooledConnection(IDbConnectionPool connectionPool)
             Pool = connectionPool;
         }
 
-        internal virtual void OpenConnection(DbConnection outerConnection, SqlConnectionFactory connectionFactory)
-        {
-            if (!TryOpenConnection(outerConnection, connectionFactory, null))
-            {
-                throw ADP.InternalError(ADP.InternalErrorCode.SynchronousConnectReturnedPending);
-            }
-        }
-
         internal void PostPop(DbConnection newOwner)
         {
             // Called by IDbConnectionPool right after it pulls this from its pool, we take this
@@ -800,7 +792,8 @@ internal void SetInStasis()
         internal virtual bool TryOpenConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry)
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout)
         {
             throw ADP.ConnectionAlreadyOpen(State);
         }
@@ -808,7 +801,8 @@ internal virtual bool TryOpenConnection(
         internal virtual bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry)
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout)
         {
             throw ADP.MethodNotImplemented();
         }
@@ -910,7 +904,8 @@ protected virtual void ReleaseAdditionalLocksForClose(bool lockToken)
         protected bool TryOpenConnectionInternal(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry)
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout)
         {
             // ?->Connecting: prevent set_ConnectionString during Open
             if (connectionFactory.SetInnerConnectionFrom(outerConnection, DbConnectionClosedConnecting.SingletonInstance, this))
@@ -919,7 +914,7 @@ protected bool TryOpenConnectionInternal(
                 try
                 {
                     connectionFactory.PermissionDemand(outerConnection);
-                    if (!connectionFactory.TryGetConnection(outerConnection, retry, this, out openConnection))
+                    if (!connectionFactory.TryGetConnection(outerConnection, retry, this, timeout, out openConnection))
                     {
                         return false;
                     }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/TimeoutTimer.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/TimeoutTimer.cs
index 37c94fe355..fdb6a52705 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/TimeoutTimer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/TimeoutTimer.cs
@@ -2,200 +2,185 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Data.Common;
+#nullable enable
+
 using System;
 using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Microsoft.Data.ProviderBase
 {
-    // Purpose:
-    //   Manages determining and tracking timeouts
-    //
-    // Intended use:
-    //   Call StartXXXXTimeout() to get a timer with the given expiration point
-    //   Get remaining time in appropriate format to pass to subsystem timeouts
-    //   Check for timeout via IsExpired for checks in managed code.
-    //   Simply abandon to GC when done.
+    /// <summary>
+    /// Manages determining and tracking timeouts for use by subsystems that perform
+    /// time-bounded operations.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Intended use:
+    /// </para>
+    /// <para>
+    /// Call <see cref="StartNew(TimeSpan)"/> (or the overload that accepts a
+    /// <see cref="TimeProvider"/>) to get a timer with the given expiration point.
+    /// Read the remaining time in the appropriate format to pass to subsystem timeouts.
+    /// Check for timeout via <see cref="IsExpired"/> for checks in managed code.
+    /// Simply abandon the instance to the GC when done.
+    /// </para>
+    /// <para>
+    /// All time reads (current time and remaining time calculations) and any
+    /// <see cref="CancellationTokenSource"/> instances created by this timer flow
+    /// through the supplied <see cref="TimeProvider"/>. This allows tests to inject
+    /// a fake time provider (for example
+    /// <c>Microsoft.Extensions.Time.Testing.FakeTimeProvider</c>) and deterministically
+    /// trigger expiration without relying on wall-clock delays.
+    /// </para>
+    /// </remarks>
     internal class TimeoutTimer
     {
-        //-------------------
-        // Fields
-        //-------------------
-        private long _timerExpire;
-        private bool _isInfiniteTimeout;
-        private long _originalTimerTicks;
-
-        //-------------------
-        // Timeout-setting methods
-        //-------------------
-
-        // Get a new timer that will expire in the given number of seconds
-        //  For input, a value of zero seconds indicates infinite timeout
-        internal static TimeoutTimer StartSecondsTimeout(int seconds)
-        {
-            //--------------------
-            // Preconditions: None (seconds must conform to SetTimeoutSeconds requirements)
+        #region Fields
 
-            //--------------------
-            // Method body
-            var timeout = new TimeoutTimer();
-            timeout.SetTimeoutSeconds(seconds);
+        /// <summary>
+        /// The sentinel value (<c>0</c>) used to indicate an infinite timeout when starting a timer.
+        /// </summary>
+        internal const long InfiniteTimeout = 0;
 
-            //---------------------
-            // Postconditions
-            Debug.Assert(timeout != null); // Need a valid timeouttimer if no error
+        #endregion
 
-            return timeout;
-        }
+        #region Constructors
 
-        // Get a new timer that will expire in the given number of milliseconds
-        //  No current need to support infinite milliseconds timeout
-        internal static TimeoutTimer StartMillisecondsTimeout(long milliseconds)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TimeoutTimer"/> class with the
+        /// specified expiration duration and time source.
+        /// </summary>
+        /// <param name="expiration">
+        /// The duration before the timer expires. A value whose ticks equal
+        /// <see cref="InfiniteTimeout"/> indicates an infinite timeout.
+        /// </param>
+        /// <param name="timeProvider">
+        /// The <see cref="TimeProvider"/> used to read the current time and schedule
+        /// cancellation.
+        /// </param>
+        /// <exception cref="OverflowException">
+        /// Thrown when computing the absolute expiration point in checked arithmetic,
+        /// if the sum of the current file-time ticks and <paramref name="expiration"/>
+        /// ticks falls outside the <see cref="long"/> range.
+        /// </exception>
+        private TimeoutTimer(TimeSpan expiration, TimeProvider timeProvider)
         {
-            //--------------------
-            // Preconditions
-            Debug.Assert(0 <= milliseconds);
-
-            //--------------------
-            // Method body
-            var timeout = new TimeoutTimer();
-            timeout._originalTimerTicks = milliseconds * TimeSpan.TicksPerMillisecond;
-            timeout._timerExpire = checked(ADP.TimerCurrent() + timeout._originalTimerTicks);
-            timeout._isInfiniteTimeout = false;
-
-            //---------------------
-            // Postconditions
-            Debug.Assert(timeout != null); // Need a valid timeouttimer if no error
-
-            return timeout;
+            TimeProvider = timeProvider;
+            OriginalTicks = expiration.Ticks;
+            IsInfinite = OriginalTicks == InfiniteTimeout;
+            ExpirationTicks = checked(NowTicks() + OriginalTicks);
         }
 
-        //-------------------
-        // Methods for changing timeout
-        //-------------------
-
-        internal void SetTimeoutSeconds(int seconds)
-        {
-            //--------------------
-            // Preconditions
-            Debug.Assert(0 <= seconds || InfiniteTimeout == seconds);  // no need to support negative seconds at present
+        #endregion
 
-            //--------------------
-            // Method body
-            if (InfiniteTimeout == seconds)
-            {
-                _isInfiniteTimeout = true;
-            }
-            else
-            {
-                // Stash current time + timeout
-                _originalTimerTicks = ADP.TimerFromSeconds(seconds);
-                _timerExpire = checked(ADP.TimerCurrent() + _originalTimerTicks);
-                _isInfiniteTimeout = false;
-            }
+        #region Properties
 
-            //---------------------
-            // Postconditions:None
-        }
-
-        // Reset timer to original duration.
-        internal void Reset()
+        /// <summary>
+        /// Gets the tick value at which this timer is considered expired.
+        /// Do not use this value directly; instead, use <see cref="IsExpired"/> to check if the timer has expired.
+        /// Does not return a meaningful value when the timer is infinite.
+        /// </summary>
+        /// <value>
+        /// The tick count, in file-time units (100-nanosecond intervals since
+        /// 1601-01-01 UTC), at which the timer expires.
+        /// </value>
+        /// <remarks>
+        /// The tick scale is intentionally compatible with
+        /// <see cref="DateTime.ToFileTimeUtc()"/>
+        /// </remarks>
+        internal long ExpirationTicks
         {
-            if (InfiniteTimeout == _originalTimerTicks)
-            {
-                _isInfiniteTimeout = true;
-            }
-            else
-            {
-                _timerExpire = checked(ADP.TimerCurrent() + _originalTimerTicks);
-                _isInfiniteTimeout = false;
-            }
+            get;
+            //TODO: Remove this when we disable Reset()
+            private set;
         }
 
-        //-------------------
-        // Timeout info properties
-        //-------------------
-
-        // Indicator for infinite timeout when starting a timer
-        internal static readonly long InfiniteTimeout = 0;
-
-        // Is this timer in an expired state?
+        /// <summary>
+        /// Gets a value indicating whether this timer has expired.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if the timer is not infinite and the current time
+        /// (as read from the configured <see cref="TimeProvider"/>) has passed
+        /// <see cref="ExpirationTicks"/>; otherwise, <see langword="false"/>.
+        /// </value>
         internal bool IsExpired
         {
             get
             {
-                return !IsInfinite && ADP.TimerHasExpired(_timerExpire);
-            }
-        }
-
-        // is this an infinite-timeout timer?
-        internal bool IsInfinite
-        {
-            get
-            {
-                return _isInfiniteTimeout;
+                return !IsInfinite && NowTicks() > ExpirationTicks;
             }
         }
 
-        // Special accessor for TimerExpire for use when thunking to legacy timeout methods.
-        public long LegacyTimerExpire
-        {
-            get
-            {
-                return (_isInfiniteTimeout) ? long.MaxValue : _timerExpire;
-            }
-        }
+        /// <summary>
+        /// Gets a value indicating whether this timer represents an infinite timeout.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if the timer was created with an expiration whose
+        /// ticks equal <see cref="InfiniteTimeout"/>; otherwise, <see langword="false"/>.
+        /// </value>
+        internal bool IsInfinite { get; }
 
-        // Returns milliseconds remaining trimmed to zero for none remaining
-        //  and long.MaxValue for infinite
-        // This method should be preferred for internal calculations that are not
-        //  yet common enough to code into the TimeoutTimer class itself.
+        /// <summary>
+        /// Gets the number of milliseconds remaining before this timer expires,
+        /// truncated to <c>0</c> when none remain, and approximated to <see cref="long.MaxValue"/>
+        /// when the timer is infinite.
+        /// </summary>
+        /// <value>
+        /// A non-negative count of milliseconds remaining; <see cref="long.MaxValue"/>
+        /// when <see cref="IsInfinite"/> is <see langword="true"/>.
+        /// </value>
+        /// <remarks>
+        /// This property should be preferred for internal calculations that are not
+        /// yet common enough to code into the <see cref="TimeoutTimer"/> class itself.
+        /// </remarks>
         internal long MillisecondsRemaining
         {
             get
             {
-                //-------------------
-                // Preconditions: None
-
-                //-------------------
-                // Method Body
                 long milliseconds;
-                if (_isInfiniteTimeout)
+                if (IsInfinite)
                 {
                     milliseconds = long.MaxValue;
                 }
                 else
                 {
-                    milliseconds = ADP.TimerRemainingMilliseconds(_timerExpire);
+                    milliseconds = TicksToMilliseconds(ExpirationTicks - NowTicks());
                     if (0 > milliseconds)
                     {
                         milliseconds = 0;
                     }
                 }
 
-                //--------------------
-                // Postconditions
                 Debug.Assert(0 <= milliseconds); // This property guarantees no negative return values
 
                 return milliseconds;
             }
         }
 
-        // Returns milliseconds remaining trimmed to zero for none remaining
+        /// <summary>
+        /// Gets the number of milliseconds remaining before this timer expires as
+        /// a 32-bit integer, trimmed to <c>0</c> when none remain and approximated to
+        /// <see cref="int.MaxValue"/> when the remaining time exceeds that value or
+        /// when the timer is infinite.
+        /// </summary>
+        /// <value>
+        /// A non-negative count of milliseconds remaining, never exceeding
+        /// <see cref="int.MaxValue"/>.
+        /// </value>
         internal int MillisecondsRemainingInt
         {
             get
             {
-                //-------------------
-                // Method Body
                 int milliseconds;
-                if (_isInfiniteTimeout)
+                if (IsInfinite)
                 {
                     milliseconds = int.MaxValue;
                 }
                 else
                 {
-                    long longMilliseconds = ADP.TimerRemainingMilliseconds(_timerExpire);
+                    long longMilliseconds = TicksToMilliseconds(ExpirationTicks - NowTicks());
                     if (0 > longMilliseconds)
                     {
                         milliseconds = 0;
@@ -210,12 +195,220 @@ internal int MillisecondsRemainingInt
                     }
                 }
 
-                //--------------------
-                // Postconditions
                 Debug.Assert(0 <= milliseconds);
 
                 return milliseconds;
             }
         }
+
+        /// <summary>
+        /// Gets the original timeout duration, in ticks, that was supplied when the
+        /// timer was created. Used by <see cref="Reset"/> to restore the original
+        /// expiration window.
+        /// </summary>
+        internal long OriginalTicks { get; }
+
+        /// <summary>
+        /// Gets the <see cref="TimeProvider"/> used by this timer. Exposed for
+        /// callers that need to construct related timers or schedule cancellation
+        /// against the same time source.
+        /// </summary>
+        internal TimeProvider TimeProvider { get; }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Creates and starts a new <see cref="TimeoutTimer"/> with the specified
+        /// expiration duration, using <see cref="TimeProvider.System"/> as the time
+        /// source.
+        /// </summary>
+        /// <param name="expiration">
+        /// The duration before the returned timer expires. A value whose ticks equal
+        /// <see cref="InfiniteTimeout"/> produces an infinite timer.
+        /// </param>
+        /// <returns>A new <see cref="TimeoutTimer"/> instance that has already started.</returns>
+        internal static TimeoutTimer StartNew(TimeSpan expiration)
+            => new TimeoutTimer(expiration, TimeProvider.System);
+
+        /// <summary>
+        /// Creates and starts a new <see cref="TimeoutTimer"/> with the specified
+        /// expiration duration and time source.
+        /// </summary>
+        /// <param name="expiration">
+        /// The duration before the returned timer expires. A value whose ticks equal
+        /// <see cref="InfiniteTimeout"/> produces an infinite timer.
+        /// </param>
+        /// <param name="timeProvider">
+        /// The <see cref="TimeProvider"/> used to read the current time and schedule
+        /// cancellation. Pass a fake provider in tests to deterministically control
+        /// expiration.
+        /// </param>
+        /// <returns>A new <see cref="TimeoutTimer"/> instance that has already started.</returns>
+        internal static TimeoutTimer StartNew(TimeSpan expiration, TimeProvider timeProvider)
+            => new TimeoutTimer(expiration, timeProvider);
+
+        /// <summary>
+        /// Creates a new <see cref="TimeoutTimer"/> that is already expired,
+        /// using <see cref="TimeProvider.System"/> as the time source.
+        /// </summary>
+        /// <returns>
+        /// A finite <see cref="TimeoutTimer"/> whose <see cref="IsExpired"/> is
+        /// already <see langword="true"/> and whose <see cref="MillisecondsRemaining"/>
+        /// is zero.
+        /// </returns>
+        internal static TimeoutTimer StartExpired()
+            => StartExpired(TimeProvider.System);
+
+        /// <summary>
+        /// Creates a new <see cref="TimeoutTimer"/> that is already expired.
+        /// </summary>
+        /// <param name="timeProvider">
+        /// The <see cref="TimeProvider"/> used to read the current time and schedule
+        /// cancellation.
+        /// </param>
+        /// <returns>
+        /// A finite <see cref="TimeoutTimer"/> whose <see cref="IsExpired"/> is
+        /// already <see langword="true"/> and whose <see cref="MillisecondsRemaining"/>
+        /// is zero. Useful when a code path needs to hand off an already-exhausted
+        /// timeout (for example, a child timer whose parent has no remaining
+        /// budget) without resorting to negative durations or the
+        /// <see cref="InfiniteTimeout"/> sentinel.
+        /// </returns>
+        /// <remarks>
+        /// Implemented by anchoring the expiration one tick before "now" on the
+        /// supplied <paramref name="timeProvider"/>. The timer is finite, so
+        /// <see cref="IsInfinite"/> is <see langword="false"/>.
+        /// </remarks>
+        internal static TimeoutTimer StartExpired(TimeProvider timeProvider)
+            => new TimeoutTimer(TimeSpan.FromTicks(-1), timeProvider);
+
+        /// <summary>
+        /// Creates and starts a new <see cref="TimeoutTimer"/> nested under this
+        /// (parent) timer. The child shares the parent's <see cref="TimeProvider"/>
+        /// and is capped so that it cannot outlast the parent's remaining time.
+        /// </summary>
+        /// <param name="duration">
+        /// The desired duration of the child timer, interpreted literally — a
+        /// value of <see cref="TimeSpan.Zero"/> means "expire immediately" and
+        /// is <em>not</em> treated as the <see cref="InfiniteTimeout"/>
+        /// sentinel. A non-positive value yields an already-expired child.
+        /// </param>
+        /// <returns>
+        /// A new <see cref="TimeoutTimer"/> that uses this timer's
+        /// <see cref="TimeProvider"/>. The child is finite unless the parent is
+        /// infinite, in which case the requested <paramref name="duration"/> is
+        /// honored as-is. When the parent is finite, the child's expiration is
+        /// capped at the parent's remaining time.
+        /// </returns>
+        /// <remarks>
+        /// Behavior matrix:
+        /// <list type="bullet">
+        ///   <item><description>Parent infinite → finite child with the requested duration (or already-expired when <paramref name="duration"/> ≤ 0).</description></item>
+        ///   <item><description>Parent finite, duration longer than parent's remaining → finite child capped at the parent's remaining time.</description></item>
+        ///   <item><description>Parent finite, duration shorter than parent's remaining → finite child with the requested duration.</description></item>
+        ///   <item><description>Parent finite with no remaining time, or <paramref name="duration"/> ≤ 0 → already-expired child (see <see cref="StartExpired(TimeProvider)"/>).</description></item>
+        /// </list>
+        /// To request a truly infinite timeout, call <see cref="StartNew(TimeSpan, TimeProvider)"/>
+        /// directly with <see cref="TimeSpan.Zero"/>; this method does not
+        /// produce infinite children.
+        /// </remarks>
+        internal TimeoutTimer StartChild(TimeSpan duration)
+        {
+            long requestedMs = (long)duration.TotalMilliseconds;
+
+            // Caller asked for a non-positive duration: already expired.
+            if (requestedMs <= 0)
+            {
+                return StartExpired(TimeProvider);
+            }
+
+            // Parent finite: cap at parent's remaining time. If the cap leaves
+            // no time, return an already-expired timer rather than colliding
+            // with the 0-ticks-means-infinite sentinel.
+            long childMs = Math.Min(requestedMs, MillisecondsRemaining);
+            if (childMs <= 0)
+            {
+                return StartExpired(TimeProvider);
+            }
+
+            return new TimeoutTimer(TimeSpan.FromMilliseconds(childMs), TimeProvider);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="CancellationTokenSource"/> that will be canceled
+        /// when this timer expires, using the same <see cref="TimeProvider"/> the
+        /// timer was constructed with.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="CancellationTokenSource"/> scheduled to cancel after
+        /// <see cref="MillisecondsRemainingInt"/> milliseconds. When
+        /// <see cref="IsInfinite"/> is <see langword="true"/>, the returned source
+        /// is never automatically canceled. When the timer has already expired, the
+        /// returned source is already canceled.
+        /// </returns>
+        internal CancellationTokenSource CreateCancellationTokenSource()
+        {
+            if (IsInfinite)
+            {
+                return new CancellationTokenSource();
+            }
+
+            int remaining = MillisecondsRemainingInt;
+            if (remaining == 0)
+            {
+                CancellationTokenSource cts = new CancellationTokenSource();
+                cts.Cancel();
+                return cts;
+            }
+
+            // Route the timer through the configured TimeProvider so that fake
+            // time providers can advance virtual time and trigger cancellation
+            // deterministically in tests.
+#if NET
+            // On .NET 8+ the BCL provides this constructor directly; avoid the
+            // Microsoft.Bcl.TimeProvider extension so the produced assembly
+            // doesn't carry a hard reference to the polyfill package, which the
+            // .NET SDK prunes from downstream consumers' restore graphs.
+            return new CancellationTokenSource(TimeSpan.FromMilliseconds(remaining), TimeProvider);
+#else
+            // .NET Framework lacks the constructor overload; use the extension
+            // method shipped by Microsoft.Bcl.TimeProvider.
+            return TimeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(remaining));
+#endif
+        }
+
+        /// <summary>
+        /// Resets the timeout to its original duration.
+        /// </summary>
+        /// <remarks>
+        /// This method is only used to retry after federated authentication timeouts,
+        /// which can use up the whole timeout due to MFA. Has no effect when
+        /// <see cref="IsInfinite"/> is <see langword="true"/>.
+        /// </remarks>
+        internal void Reset()
+        {
+            if (!IsInfinite)
+            {
+                ExpirationTicks = checked(NowTicks() + OriginalTicks);
+            }
+        }
+
+        /// <summary>
+        /// Reads the configured <see cref="TimeProvider"/>'s current UTC time and
+        /// returns it as file-time ticks (100-nanosecond intervals since
+        /// 1601-01-01 UTC). This keeps <see cref="ExpirationTicks"/> in the same
+        /// scale historically produced by <c>DateTime.UtcNow.ToFileTimeUtc()</c>.
+        /// </summary>
+        internal long NowTicks() => TimeProvider.GetUtcNow().UtcDateTime.ToFileTimeUtc();
+
+        /// <summary>
+        /// Converts a tick count (100-nanosecond intervals) to milliseconds, matching
+        /// the conversion historically performed by <c>ADP.TimerToMilliseconds</c>.
+        /// </summary>
+        internal static long TicksToMilliseconds(long ticks) => ticks / TimeSpan.TicksPerMillisecond;
+
+        #endregion
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index ac9d36bdd7..295286b1e5 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -317,6 +317,7 @@ internal class SqlConnectionInternal : DbConnectionInternal, IDisposable
         internal SqlConnectionInternal(
             DbConnectionPoolIdentity identity,
             SqlConnectionOptions connectionOptions,
+            TimeoutTimer timeout,
             SqlCredential credential,
             DbConnectionPoolGroupProviderInfo providerInfo,
             string newPassword,
@@ -399,7 +400,10 @@ internal SqlConnectionInternal(
 
             try
             {
-                _timeout = TimeoutTimer.StartSecondsTimeout(connectionOptions.ConnectTimeout);
+                // If we want to consider pool operations against the overall connect timeout, 
+                // use the provided timeout. Otherwise, start a fresh timeout to receive the full
+                // connect timeout.
+                _timeout = ResolveLoginTimeout(timeout, connectionOptions.ConnectTimeout);
 
                 // If transient fault handling is enabled then we can retry the login up to the
                 // ConnectRetryCount.
@@ -761,6 +765,25 @@ private SqlInternalTransaction AvailableInternalTransaction
         // @TODO: Make private field.
         private bool IsAzureSqlConnection { get; set; }
 
+        internal TimeoutTimer Timeout => _timeout;
+
+        /// <summary>
+        /// Selects the <see cref="TimeoutTimer"/> that governs the login phase based on
+        /// <see cref="LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait"/>.
+        /// </summary>
+        /// <remarks>
+        /// When the switch is enabled the caller-supplied <paramref name="callerTimeout"/>
+        /// is returned as-is so any time already consumed (e.g., waiting for the pool) counts
+        /// against the overall ConnectTimeout. When disabled, a fresh timer is started from
+        /// <paramref name="connectTimeoutSeconds"/>, preserving legacy behavior. Extracted so
+        /// this branch can be unit-tested without standing up a real connection.
+        /// </remarks>
+        internal static TimeoutTimer ResolveLoginTimeout(TimeoutTimer callerTimeout, int connectTimeoutSeconds)
+        {
+            return LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait
+                ? callerTimeout
+                : TimeoutTimer.StartNew(TimeSpan.FromSeconds(connectTimeoutSeconds));
+        }
         #endregion
 
         #region Public and Internal Methods
@@ -1939,9 +1962,10 @@ internal void OnLoginAck(SqlLoginAck rec)
         internal override bool TryReplaceConnection(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
-            TaskCompletionSource<DbConnectionInternal> retry)
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout)
         {
-            return TryOpenConnectionInternal(outerConnection, connectionFactory, retry);
+            return TryOpenConnectionInternal(outerConnection, connectionFactory, retry, timeout);
         }
 
         internal void ValidateConnectionForExecute(SqlCommand command)
@@ -2194,6 +2218,7 @@ private void AttemptOneLogin(
         /// if a cached token exists from a previous auth attempt (see GetFedAuthToken).
         /// </summary>
         // @TODO: Rename to meet naming conventions
+        // TODO: if this call timed out, what reason do we have to believe some other call succeeded? why not just fail?
         private bool AttemptRetryADAuthWithTimeoutError(
             SqlException sqlex,
             SqlConnectionOptions connectionOptions, // @TODO: this is not used
@@ -3190,7 +3215,6 @@ private void LoginNoFailover(
 
                     // Set timeout for this attempt, but don't exceed original timer
                     long nextTimeoutInterval = checked(timeoutUnitInterval * multiplier);
-                    long milliseconds = timeout.MillisecondsRemaining;
 
                     #if NETFRAMEWORK
                     // If it is the first attempt at TNIR connection, then allow at least 500ms for
@@ -3202,11 +3226,11 @@ private void LoginNoFailover(
                     }
                     #endif
 
-                    if (nextTimeoutInterval > milliseconds)
-                    {
-                        nextTimeoutInterval = milliseconds;
-                    }
-                    intervalTimer = TimeoutTimer.StartMillisecondsTimeout(nextTimeoutInterval);
+                    // StartChild propagates the parent TimeProvider, caps the
+                    // requested duration at the parent's remaining time, and
+                    // returns an already-expired timer when the parent has no
+                    // remaining budget (no 0-means-infinite ambiguity).
+                    intervalTimer = timeout.StartChild(TimeSpan.FromMilliseconds(nextTimeoutInterval));
                 }
 
                 // Re-allocate parser each time to make sure state is known.
@@ -3485,13 +3509,12 @@ private void LoginWithFailover(
             {
                 // Set timeout for this attempt, but don't exceed original timer
                 long nextTimeoutInterval = checked(timeoutUnitInterval * ((attemptNumber / 2) + 1));
-                long milliseconds = timeout.MillisecondsRemaining;
-                if (nextTimeoutInterval > milliseconds)
-                {
-                    nextTimeoutInterval = milliseconds;
-                }
 
-                TimeoutTimer intervalTimer = TimeoutTimer.StartMillisecondsTimeout(nextTimeoutInterval);
+                // StartChild propagates the parent TimeProvider, caps the
+                // requested duration at the parent's remaining time, and
+                // returns an already-expired timer when the parent has no
+                // remaining budget (no 0-means-infinite ambiguity).
+                TimeoutTimer intervalTimer = timeout.StartChild(TimeSpan.FromMilliseconds(nextTimeoutInterval));
 
                 // Re-allocate parser each time to make sure state is known. If parser was created
                 // by previous attempt, dispose it to properly close the socket, if created.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index b83434cac6..45e82eda91 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -224,7 +224,8 @@ public void PutObjectFromTransactedPool(DbConnectionInternal connection)
         /// <inheritdoc />
         public DbConnectionInternal ReplaceConnection(
             DbConnection owningObject, 
-            DbConnectionInternal oldConnection)
+            DbConnectionInternal oldConnection,
+            TimeoutTimer timeout)
         {
             throw new NotImplementedException();
         }
@@ -281,10 +282,9 @@ public void TransactionEnded(Transaction transaction, DbConnectionInternal trans
         public bool TryGetConnection(
             DbConnection owningObject, 
             TaskCompletionSource<DbConnectionInternal>? taskCompletionSource,
+            TimeoutTimer timeout,
             out DbConnectionInternal? connection)
         {
-            var timeout = TimeSpan.FromSeconds(owningObject.ConnectionTimeout);
-
             // If taskCompletionSource is null, we are in a sync context.
             if (taskCompletionSource is null)
             {
@@ -372,13 +372,16 @@ public bool TryGetConnection(
         /// </summary>
         /// <param name="owningConnection">The owning connection.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
+        /// <param name="timeout">The overall timeout budget. Passed through to the physical connection 
+        /// so it uses the remaining budget rather than starting a fresh timeout.</param>
         /// <returns>A task representing the asynchronous operation, with a result of the new internal connection.</returns>
         /// <exception cref="OperationCanceledException">
         /// Thrown when the cancellation token is cancelled before the connection operation completes.
         /// </exception>
         private DbConnectionInternal? OpenNewInternalConnection(
             DbConnection? owningConnection, 
-            CancellationToken cancellationToken)
+            CancellationToken cancellationToken,
+            TimeoutTimer timeout)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -397,9 +400,11 @@ public bool TryGetConnection(
                     // DbConnectionInternal doesn't support an async open. It's better to block this thread and keep
                     // throughput high than to queue all of our opens onto a single worker thread. Add an async path 
                     // when this support is added to DbConnectionInternal.
+                    // TODO: ultimately, the connection factory should also accept our cancellation token.
                     var connection = ConnectionFactory.CreatePooledConnection(
                         owningConnection,
-                        this);
+                        this,
+                        timeout);
 
                     if (connection is not null)
                     {
@@ -492,7 +497,8 @@ private void RemoveConnection(DbConnectionInternal connection)
         /// </summary>
         /// <param name="owningConnection">The DbConnection that will own this internal connection</param>
         /// <param name="async">A boolean indicating whether the operation should be asynchronous.</param>
-        /// <param name="timeout">The timeout for the operation.</param>
+        /// <param name="timeout">The overall timeout budget for this connection request. Time spent waiting
+        /// in the pool is deducted from the budget available for physical connection creation.</param>
         /// <returns>Returns a DbConnectionInternal that is retrieved from the pool.</returns>
         /// <exception cref="InvalidOperationException">
         /// Thrown when an OperationCanceledException is caught, indicating that the timeout period 
@@ -505,10 +511,13 @@ private void RemoveConnection(DbConnectionInternal connection)
         private async Task<DbConnectionInternal> GetInternalConnection(
             DbConnection owningConnection, 
             bool async, 
-            TimeSpan timeout)
+            TimeoutTimer timeout)
         {
             DbConnectionInternal? connection = null;
-            using CancellationTokenSource cancellationTokenSource = new(timeout);
+
+            // Derive a CancellationTokenSource from the TimeoutTimer so pool-internal wait operations
+            // (channel reads, semaphore waits) are cancelled when the overall budget expires.
+            using CancellationTokenSource cancellationTokenSource = timeout.CreateCancellationTokenSource();
             CancellationToken cancellationToken = cancellationTokenSource.Token;
 
             // Continue looping until we create or retrieve a connection
@@ -524,7 +533,8 @@ private async Task<DbConnectionInternal> GetInternalConnection(
                     // If we didn't find an idle connection, try to open a new one.  
                     connection ??= OpenNewInternalConnection(
                         owningConnection,
-                        cancellationToken);
+                        cancellationToken,
+                        timeout);
 
                     // If we're at max capacity and couldn't open a connection. Block on the idle channel with a
                     // timeout. Note that Channels guarantee fair FIFO behavior to callers of ReadAsync
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
index 43dae3fa0f..2ae8e8ea98 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
@@ -119,17 +119,20 @@ internal interface IDbConnectionPool
         /// <param name="owningObject">The SqlConnection that will own this internal connection.</param>
         /// <param name="taskCompletionSource">Used when calling this method in an async context. 
         /// The internal connection will be set on completion source rather than passed out via the out parameter.</param>
+        /// <param name="timeout">The overall timeout budget for this connection request. Time spent waiting in
+        /// the pool is deducted from the budget available for physical connection creation.</param>
         /// <param name="connection">The retrieved connection will be passed out via this parameter.</param>
         /// <returns>True if a connection was set in the out parameter, otherwise returns false.</returns>
-        bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, out DbConnectionInternal? connection);
+        bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, TimeoutTimer timeout, out DbConnectionInternal? connection);
 
         /// <summary>
         /// Replaces the internal connection currently associated with owningObject with a new internal connection from the pool.
         /// </summary>
         /// <param name="owningObject">The connection whose internal connection should be replaced.</param>
         /// <param name="oldConnection">The internal connection currently associated with the owning object.</param>
+        /// <param name="timeout">The overall timeout budget for this connection request.</param>
         /// <returns>A reference to the new DbConnectionInternal.</returns>
-        DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionInternal oldConnection);
+        DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionInternal oldConnection, TimeoutTimer timeout);
 
         /// <summary>
         /// Returns an internal connection to the pool.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index fa704ab438..ecf8840ebb 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -61,15 +61,17 @@ internal sealed class WaitHandleDbConnectionPool : IDbConnectionPool
 
         private sealed class PendingGetConnection
         {
-            public PendingGetConnection(long dueTime, DbConnection owner, TaskCompletionSource<DbConnectionInternal> completion)
+            public PendingGetConnection(long dueTime, DbConnection owner, TaskCompletionSource<DbConnectionInternal> completion, TimeoutTimer timeout)
             {
                 DueTime = dueTime;
                 Owner = owner;
                 Completion = completion;
+                Timeout = timeout;
             }
             public long DueTime { get; private set; }
             public DbConnection Owner { get; private set; }
             public TaskCompletionSource<DbConnectionInternal> Completion { get; private set; }
+            public TimeoutTimer Timeout { get; private set; }
         }
 
         private sealed class PoolWaitHandles
@@ -520,7 +522,7 @@ private bool IsBlockingPeriodEnabled()
             }
         }
 
-        private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectionInternal oldConnection)
+        private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectionInternal oldConnection, TimeoutTimer timeout)
         {
             DbConnectionInternal newObj = null;
 
@@ -528,7 +530,8 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
             {
                 newObj = _connectionFactory.CreatePooledConnection(
                     owningObject,
-                    this);
+                    this,
+                    timeout);
 
                 lock (_objectList)
                 {
@@ -828,6 +831,7 @@ private void WaitForPendingOpen()
                                 delay,
                                 allowCreate: true,
                                 onlyOneCheckConnection: false,
+                                next.Timeout,
                                 out connection);
                         }
                         // @TODO: CER Exception Handling was removed here (see GH#3581)
@@ -865,24 +869,42 @@ private void WaitForPendingOpen()
             } while (_pendingOpens.TryPeek(out next));
         }
 
-        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal> taskCompletionSource, out DbConnectionInternal connection)
+        /// <summary>
+        /// Resolves the <c>WaitHandle.WaitAny</c> timeout (milliseconds) for a synchronous
+        /// pool acquire.
+        /// </summary>
+        /// <remarks>
+        /// When <see cref="LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait"/>
+        /// is enabled the caller's remaining <see cref="TimeoutTimer"/> budget is used so
+        /// the pool wait participates in the overall ConnectTimeout. Otherwise the legacy
+        /// behavior is preserved: the static pool <c>CreationTimeout</c> is used, with
+        /// <c>0</c> mapped to <see cref="Timeout.Infinite"/>. Extracted so this branch can
+        /// be unit-tested without timing-based assertions.
+        /// </remarks>
+        internal static uint ResolvePoolWaitTimeoutMs(TimeoutTimer timeout, int creationTimeoutMs)
+        {
+            if (LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait)
+            {
+                return timeout.IsInfinite
+                    ? unchecked((uint)Timeout.Infinite)
+                    : (uint)timeout.MillisecondsRemainingInt;
+            }
+
+            uint legacy = (uint)creationTimeoutMs;
+            return legacy == 0 ? unchecked((uint)Timeout.Infinite) : legacy;
+        }
+
+        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal> taskCompletionSource, TimeoutTimer timeout, out DbConnectionInternal connection)
         {
             uint waitForMultipleObjectsTimeout = 0;
             bool allowCreate = false;
 
             if (taskCompletionSource == null)
             {
-                waitForMultipleObjectsTimeout = (uint)CreationTimeout;
-
-                // Set the wait timeout to INFINITE (-1) if the SQL connection timeout is 0 (== infinite)
-                if (waitForMultipleObjectsTimeout == 0)
-                {
-                    waitForMultipleObjectsTimeout = unchecked((uint)Timeout.Infinite);
-                }
-
+                waitForMultipleObjectsTimeout = ResolvePoolWaitTimeoutMs(timeout, CreationTimeout);
                 allowCreate = true;
-            }
-
+            }            
+            
             if (State is not Running)
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, DbConnectionInternal State != Running.", Id);
@@ -891,7 +913,7 @@ public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbC
             }
 
             bool onlyOneCheckConnection = true;
-            if (TryGetConnection(owningObject, waitForMultipleObjectsTimeout, allowCreate, onlyOneCheckConnection, out connection))
+            if (TryGetConnection(owningObject, waitForMultipleObjectsTimeout, allowCreate, onlyOneCheckConnection, timeout, out connection))
             {
                 return true;
             }
@@ -901,11 +923,28 @@ public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbC
                 return true;
             }
 
+            long dueTime;
+            if (LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait)
+            {
+                // Anchor the pending request's due time on the caller's remaining budget so
+                // the async waiter loop respects the overall ConnectTimeout. ExpirationTicks
+                // is in DateTime.ToFileTimeUtc() units, matching ADP.TimerCurrent() so it
+                // can flow through the existing TimerRemainingMilliseconds path unchanged.
+                dueTime = timeout.IsInfinite ? Timeout.Infinite : timeout.ExpirationTicks;
+            }
+            else
+            {
+                dueTime = CreationTimeout == 0
+                    ? Timeout.Infinite
+                    : ADP.TimerCurrent() + ADP.TimerFromSeconds(CreationTimeout / 1000);
+            }
+
             var pendingGetConnection =
                 new PendingGetConnection(
-                    CreationTimeout == 0 ? Timeout.Infinite : ADP.TimerCurrent() + ADP.TimerFromSeconds(CreationTimeout / 1000),
+                    dueTime,
                     owningObject,
-                    taskCompletionSource);
+                    taskCompletionSource,
+                    timeout);
             _pendingOpens.Enqueue(pendingGetConnection);
 
             // it is better to StartNew too many times than not enough
@@ -923,7 +962,7 @@ public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbC
 #if NETFRAMEWORK
         [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")] // copied from Triaged.cs
 #endif
-        private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObjectsTimeout, bool allowCreate, bool onlyOneCheckConnection, out DbConnectionInternal connection)
+        private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObjectsTimeout, bool allowCreate, bool onlyOneCheckConnection, TimeoutTimer timeout, out DbConnectionInternal connection)
         {
             DbConnectionInternal obj = null;
             Transaction transaction = null;
@@ -974,7 +1013,7 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, Creating new connection.", Id);
                                 try
                                 {
-                                    obj = UserCreateRequest(owningObject);
+                                    obj = UserCreateRequest(owningObject, timeout);
                                 }
                                 catch
                                 {
@@ -1034,7 +1073,7 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                                         if (semaphoreHolder.Obtained)
                                         {
                                             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, Creating new connection.", Id);
-                                            obj = UserCreateRequest(owningObject);
+                                            obj = UserCreateRequest(owningObject, timeout);
                                         }
                                         else
                                         {
@@ -1121,11 +1160,12 @@ private void PrepareConnection(DbConnection owningObject, DbConnectionInternal o
         /// </summary>
         /// <param name="owningObject">Outer connection that currently owns <paramref name="oldConnection"/></param>
         /// <param name="oldConnection">Inner connection that will be replaced</param>
+        /// <param name="timeout">Overall timeout budget for this connection request.</param>
         /// <returns>A new inner connection that is attached to the <paramref name="owningObject"/></returns>
-        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionInternal oldConnection)
+        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionInternal oldConnection, TimeoutTimer timeout)
         {
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.ReplaceConnection|RES|CPOOL> {0}, replacing connection.", Id);
-            DbConnectionInternal newConnection = UserCreateRequest(owningObject, oldConnection);
+            DbConnectionInternal newConnection = UserCreateRequest(owningObject, timeout, oldConnection);
 
             if (newConnection != null)
             {
@@ -1265,7 +1305,12 @@ private void PoolCreateRequest(object state)
                                         {
                                             try
                                             {
-                                                newObj = CreateObject(owningObject: null, oldConnection: null);
+                                                // Pool replenishment runs on a background worker without an
+                                                // owning Open() call, so use a fresh per-attempt timeout based on
+                                                // the pool's CreationTimeout (matches the original behavior).
+                                                TimeoutTimer replenishTimeout = TimeoutTimer.StartNew(
+                                                    TimeSpan.FromMilliseconds(CreationTimeout));
+                                                newObj = CreateObject(owningObject: null, oldConnection: null, timeout: replenishTimeout);
                                             }
                                             catch
                                             {
@@ -1504,7 +1549,7 @@ public void TransactionEnded(Transaction transaction, DbConnectionInternal trans
             }
         }
 
-        private DbConnectionInternal UserCreateRequest(DbConnection owningObject, DbConnectionInternal oldConnection = null)
+        private DbConnectionInternal UserCreateRequest(DbConnection owningObject, TimeoutTimer timeout, DbConnectionInternal oldConnection = null)
         {
             // called by user when they were not able to obtain a free object but
             // instead obtained creation mutex
@@ -1524,7 +1569,7 @@ private DbConnectionInternal UserCreateRequest(DbConnection owningObject, DbConn
                     // TODO: Consider implement a control knob here; why do we only check for dead objects ever other time?  why not every 10th time or every time?
                     if ((oldConnection != null) || (Count & 0x1) == 0x1 || !ReclaimEmancipatedObjects())
                     {
-                        obj = CreateObject(owningObject, oldConnection);
+                        obj = CreateObject(owningObject, oldConnection, timeout);
                     }
                 }
                 return obj;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
index 0177338bf2..df762ed7ae 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
@@ -125,6 +125,13 @@ internal static class LocalAppContextSwitches
     private const string UseConnectionPoolV2String =
         "Switch.Microsoft.Data.SqlClient.UseConnectionPoolV2";
 
+    /// <summary>
+    /// The name of the app context switch that controls whether pool operations
+    /// should count against the caller's overall ConnectTimeout budget.
+    /// </summary>
+    private const string UseOverallConnectTimeoutForPoolWaitString =
+        "Switch.Microsoft.Data.SqlClient.UseOverallConnectTimeoutForPoolWait";
+
     #if NET && _WINDOWS
     /// <summary>
     /// The name of the app context switch that controls whether to use the
@@ -234,6 +241,11 @@ private enum SwitchValue : byte
     /// </summary>
     private static SwitchValue s_useConnectionPoolV2 = SwitchValue.None;
 
+    /// <summary>
+    /// The cached value of the UseOverallConnectTimeoutForPoolWait switch.
+    /// </summary>
+    private static SwitchValue s_useOverallConnectTimeoutForPoolWait = SwitchValue.None;
+
     #if NET && _WINDOWS
     /// <summary>
     /// The cached value of the UseManagedNetworking switch.
@@ -564,6 +576,20 @@ public static bool UseCompatibilityAsyncBehaviour
             defaultValue: false,
             ref s_useConnectionPoolV2);
 
+    /// <summary>
+    /// When set to true, pool operations count against the
+    /// caller's ConnectTimeout budget. This includes waits and async operations.
+    /// When false, pool operations receive a full ConnectTimeout and
+    /// network calls receive a further full ConnectTimeout.
+    ///
+    /// The default value of this switch is false.
+    /// </summary>
+    public static bool UseOverallConnectTimeoutForPoolWait =>
+        AcquireAndReturn(
+            UseOverallConnectTimeoutForPoolWaitString,
+            defaultValue: false,
+            ref s_useOverallConnectTimeoutForPoolWait);
+
     #if NET && _WINDOWS
     /// <summary>
     /// When set to true, .NET on Windows will use the managed SNI
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs
index 15a856dcec..176420db87 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs
@@ -892,6 +892,9 @@ public override uint Receive(out SniPacket packet, int timeoutInMilliseconds)
 
                 try
                 {
+                    // TODO: convert these to async versions that accept a cancellation token
+                    // this will let us pass fake time providers all the way down the stack
+                    // and easily test timeout behavior.
                     if (timeoutInMilliseconds > 0)
                     {
                         _socket.ReceiveTimeout = timeoutInMilliseconds;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index 47a1be163a..6a4d7b8972 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -2226,16 +2226,26 @@ private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, SqlConnec
 
         private bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry)
         {
+            // Create a single TimeoutTimer that represents the overall connection-open budget for this
+            // attempt. The timer is threaded through every layer (inner connection state transitions,
+            // connection factory, pool wait, physical connection establishment) so that all of those
+            // costs are charged against the same budget. This prevents the cumulative wait from exceeding
+            // the configured ConnectTimeout. A fresh timer is created per TryOpen call so that each
+            // retry attempt gets its own budget, matching the existing behavior.
+            // Note: TimeoutTimer treats 0 seconds as infinite timeout, which matches ConnectTimeout=0 semantics.
+            TimeoutTimer timeout = TimeoutTimer.StartNew(
+                TimeSpan.FromSeconds(ConnectionOptions?.ConnectTimeout ?? ADP.DefaultConnectionTimeout));
+
             if (ForceNewConnection)
             {
-                if (!InnerConnection.TryReplaceConnection(this, ConnectionFactory, retry))
+                if (!InnerConnection.TryReplaceConnection(this, ConnectionFactory, retry, timeout))
                 {
                     return false;
                 }
             }
             else
             {
-                if (!InnerConnection.TryOpenConnection(this, ConnectionFactory, retry))
+                if (!InnerConnection.TryOpenConnection(this, ConnectionFactory, retry, timeout))
                 {
                     return false;
                 }
@@ -2735,6 +2745,7 @@ private static void ChangePassword(string connectionString, SqlConnectionOptions
                 con = new SqlConnectionInternal(
                     identity: null,
                     connectionOptions,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(connectionOptions.ConnectTimeout)),
                     credential,
                     providerInfo: null,
                     newPassword,
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index 30010d0d4b..4cdee8bdc2 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -115,7 +115,8 @@ internal DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(SqlConnec
         
         internal DbConnectionInternal CreateNonPooledConnection(
             DbConnection owningConnection,
-            DbConnectionPoolGroup poolGroup)
+            DbConnectionPoolGroup poolGroup,
+            TimeoutTimer timeout)
         {
             Debug.Assert(owningConnection is not null, "null owningConnection?");
             Debug.Assert(poolGroup is not null, "null poolGroup?");
@@ -125,7 +126,8 @@ internal DbConnectionInternal CreateNonPooledConnection(
                 poolGroup.PoolKey,
                 poolGroup.ProviderInfo,
                 pool: null,
-                owningConnection);
+                owningConnection,
+                timeout);
             if (newConnection is not null)
             {
                 SqlClientDiagnostics.Metrics.HardConnectRequest();
@@ -138,7 +140,8 @@ internal DbConnectionInternal CreateNonPooledConnection(
 
         internal DbConnectionInternal CreatePooledConnection(
             DbConnection owningConnection,
-            IDbConnectionPool pool)
+            IDbConnectionPool pool,
+            TimeoutTimer timeout)
         {
             Debug.Assert(pool != null, "null pool?");
 
@@ -147,7 +150,8 @@ internal DbConnectionInternal CreatePooledConnection(
                 pool.PoolGroup.PoolKey,
                 pool.PoolGroup.ProviderInfo,
                 pool,
-                owningConnection);
+                owningConnection,
+                timeout);
 
             if (newConnection is null)
             {
@@ -313,6 +317,7 @@ internal bool TryGetConnection(
             DbConnection owningConnection,
             TaskCompletionSource<DbConnectionInternal> retry,
             DbConnectionInternal oldConnection,
+            TimeoutTimer timeout,
             out DbConnectionInternal connection)
         {
             Debug.Assert(owningConnection is not null, "null owningConnection?");
@@ -384,6 +389,7 @@ internal bool TryGetConnection(
                                 retry,
                                 oldConnection,
                                 poolGroup,
+                                timeout,
                                 cancellationTokenSource);
 
                             // Place this new task in the slot so any future work will be queued behind it
@@ -407,7 +413,7 @@ internal bool TryGetConnection(
                         return false;
                     }
 
-                    connection = CreateNonPooledConnection(owningConnection, poolGroup);
+                    connection = CreateNonPooledConnection(owningConnection, poolGroup, timeout);
 
                     SqlClientDiagnostics.Metrics.EnterNonPooledConnection();
                 }
@@ -417,11 +423,11 @@ internal bool TryGetConnection(
                     {
                         Debug.Assert(oldConnection is not DbConnectionClosed, "Force new connection, but there is no old connection");
                         
-                        connection = connectionPool.ReplaceConnection(owningConnection, oldConnection);
+                        connection = connectionPool.ReplaceConnection(owningConnection, oldConnection, timeout);
                     }
                     else
                     {
-                        if (!connectionPool.TryGetConnection(owningConnection, retry, out connection))
+                        if (!connectionPool.TryGetConnection(owningConnection, retry, timeout, out connection))
                         {
                             return false;
                         }
@@ -573,7 +579,8 @@ protected virtual DbConnectionInternal CreateConnection(
             ConnectionPoolKey poolKey,
             DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
             IDbConnectionPool pool,
-            DbConnection owningConnection)
+            DbConnection owningConnection,
+            TimeoutTimer timeout)
         {
             SqlConnectionOptions opt = options;
             ConnectionPoolKey key = poolKey;
@@ -628,6 +635,7 @@ protected virtual DbConnectionInternal CreateConnection(
                     SqlConnectionInternal sseConnection = new SqlConnectionInternal(
                         identity,
                         sseopt,
+                        timeout,
                         key.Credential,
                         providerInfo: null,
                         newPassword: string.Empty,
@@ -678,6 +686,7 @@ protected virtual DbConnectionInternal CreateConnection(
             return new SqlConnectionInternal(
                 identity,
                 opt,
+                timeout,
                 key.Credential,
                 poolGroupProviderInfo,
                 newPassword: string.Empty,
@@ -752,6 +761,7 @@ private Task<DbConnectionInternal> CreateReplaceConnectionContinuation(
             TaskCompletionSource<DbConnectionInternal> retry,
             DbConnectionInternal oldConnection,
             DbConnectionPoolGroup poolGroup,
+            TimeoutTimer timeout,
             CancellationTokenSource cancellationTokenSource)
         {
             return task.ContinueWith(
@@ -762,7 +772,7 @@ private Task<DbConnectionInternal> CreateReplaceConnectionContinuation(
                     {
                         ADP.SetCurrentTransaction(retry.Task.AsyncState as System.Transactions.Transaction);
                         
-                        DbConnectionInternal newConnection = CreateNonPooledConnection(owningConnection, poolGroup);
+                        DbConnectionInternal newConnection = CreateNonPooledConnection(owningConnection, poolGroup, timeout);
                         
                         if (oldConnection?.State == ConnectionState.Open)
                         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 0e8548c2b1..bb625d563d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -542,7 +542,7 @@ bool withFailover
             }
             _state = TdsParserState.OpenNotLoggedIn;
             _physicalStateObj.SniContext = SniContext.Snix_PreLoginBeforeSuccessfulWrite;
-            _physicalStateObj.TimeoutTime = timeout.LegacyTimerExpire;
+            _physicalStateObj.TimeoutTime = timeout.IsInfinite ? long.MaxValue : timeout.ExpirationTicks;
 
             bool marsCapable = false;
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
index db84a0a51a..430d6645a8 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
@@ -54,6 +54,7 @@ public sealed class LocalAppContextSwitchesHelper : IDisposable
     private readonly bool? _useCompatibilityAsyncBehaviourOriginal;
     private readonly bool? _useCompatibilityProcessSniOriginal;
     private readonly bool? _useConnectionPoolV2Original;
+    private readonly bool? _useOverallConnectTimeoutForPoolWaitOriginal;
     #if NET && _WINDOWS
     private readonly bool? _useManagedNetworkingOriginal;
     #endif    
@@ -115,6 +116,8 @@ public LocalAppContextSwitchesHelper()
                 GetSwitchValue("s_useCompatibilityProcessSni");
             _useConnectionPoolV2Original =
                 GetSwitchValue("s_useConnectionPoolV2");
+            _useOverallConnectTimeoutForPoolWaitOriginal =
+                GetSwitchValue("s_useOverallConnectTimeoutForPoolWait");
             #if NET && _WINDOWS
             _useManagedNetworkingOriginal =
                 GetSwitchValue("s_useManagedNetworking");
@@ -182,6 +185,9 @@ public void Dispose()
             SetSwitchValue(
                 "s_useConnectionPoolV2",
                 _useConnectionPoolV2Original);
+            SetSwitchValue(
+                "s_useOverallConnectTimeoutForPoolWait",
+                _useOverallConnectTimeoutForPoolWaitOriginal);
             #if NET && _WINDOWS
             SetSwitchValue(
                 "s_useManagedNetworking",
@@ -327,6 +333,15 @@ public bool? UseConnectionPoolV2
         set => SetSwitchValue("s_useConnectionPoolV2", value);
     }
 
+    /// <summary>
+    /// Get or set the UseOverallConnectTimeoutForPoolWait switch value.
+    /// </summary>
+    public bool? UseOverallConnectTimeoutForPoolWait
+    {
+        get => GetSwitchValue("s_useOverallConnectTimeoutForPoolWait");
+        set => SetSwitchValue("s_useOverallConnectTimeoutForPoolWait", value);
+    }
+
     #if NET && _WINDOWS
     /// <summary>
     /// Get or set the UseManagedNetworking switch value.
diff --git a/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props b/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
index 72bddcc898..7925952d11 100644
--- a/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
+++ b/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
@@ -4,6 +4,7 @@
   <!-- Dependencies shared with SqlClient tests and Extensions/Internal tests. -->
   <ItemGroup>
     <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.25476.3" />
+    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.6.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs
index 00bba56fc2..26f65b6fae 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs
@@ -9,6 +9,58 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    /// <summary>
+    /// Stress test that verifies cancelling a command mid-stream does not
+    /// corrupt the underlying connection, the connection pool, or (when MARS
+    /// is enabled) the MARS session state machine.
+    ///
+    /// <para>
+    /// For each of <see cref="NumberOfTasks"/> parallel tasks, the test:
+    /// </para>
+    /// <list type="number">
+    ///   <item><description>
+    ///     Runs a single "poisoned" command: a 4-batch query with
+    ///     <c>WAITFOR DELAY '00:00:01'</c> between batches, paired with a
+    ///     <see cref="TimeBombAsync"/> background task that fires
+    ///     <see cref="SqlCommand.Cancel"/> after a random 100-3000 ms delay.
+    ///     The streaming <see cref="SqlDataReader"/> is expected to throw
+    ///     either <see cref="OperationCanceledException"/> or a
+    ///     <see cref="SqlException"/> whose message contains
+    ///     "operation cancelled/canceled"; that exception is swallowed.
+    ///   </description></item>
+    ///   <item><description>
+    ///     Runs up to <see cref="NumberOfNonPoisoned"/> follow-up commands on
+    ///     the same physical resources (the same MARS connection when
+    ///     <c>useMars</c> is true, otherwise fresh pooled connections). These
+    ///     must all complete cleanly; any failure here indicates the prior
+    ///     cancellation corrupted shared state.
+    ///   </description></item>
+    /// </list>
+    ///
+    /// <para>
+    /// The test asserts implicitly: any exception that is not the expected
+    /// cancellation is rethrown and fails the test. The known regression
+    /// signature for a desynchronized MARS framing buffer
+    /// ("The MARS TDS header contained errors.") is treated as a hard stop
+    /// via <c>_continue</c>.
+    /// </para>
+    ///
+    /// <para>
+    /// <b>What this test is not.</b> It is not a coverage test for
+    /// <c>OpenAsync</c>, <c>Connect Timeout</c>, or pool queue-wait behavior.
+    /// <c>OpenAsync</c> is treated as pre-work that must succeed so the
+    /// cancellation/poisoning scenario can run. Because
+    /// <see cref="NumberOfTasks"/> simultaneous opens race against an empty
+    /// pool whose connection-creation path is serialized internally
+    /// (<c>WaitHandleDbConnectionPool.WaitForPendingOpen</c>), the caller's
+    /// per-open <c>Connect Timeout</c> budget must be generous enough to
+    /// cover queue-wait + physical connect for the last open in the burst.
+    /// The test therefore overrides <c>Connect Timeout</c> on the builder
+    /// (see <see cref="ConnectTimeoutSeconds"/>) rather than relying on the
+    /// default 15 s; bump that constant if slow CI agents are seeing
+    /// pool-timeout failures on otherwise healthy runs.
+    /// </para>
+    /// </summary>
     public class AsyncCancelledConnectionsTest
     {
         /// <summary>
@@ -21,9 +73,28 @@ public class AsyncCancelledConnectionsTest
         /// </summary>
         private const int NumberOfNonPoisoned = 10;
 
+        /// <summary>
+        /// Per-open <c>Connect Timeout</c> applied to every connection in
+        /// this test. Sized to comfortably cover the serialized
+        /// connection-creation queue depth produced by
+        /// <see cref="NumberOfTasks"/> simultaneous opens on slow CI agents.
+        /// Note: with strict timeout propagation through the pool, the
+        /// caller's budget covers both pool queue wait and physical connect,
+        /// so the default 15 s is too tight for this burst pattern.
+        /// </summary>
+        private const int ConnectTimeoutSeconds = 60;
+
         private bool _continue = true;
         private Random _random;
 
+        /// <summary>
+        /// Drives <see cref="NumberOfTasks"/> parallel <see cref="DoManyAsync"/>
+        /// runs against the configured TCP test server and waits for all of
+        /// them to complete. The theory matrix toggles MARS so that both the
+        /// shared-connection (MARS) and per-call-connection (non-MARS) paths
+        /// are exercised. The test passes if every task either succeeds or
+        /// fails only with the expected cancellation exception.
+        /// </summary>
         // Disabled on Azure since this test fails on concurrent runs on same database.
         // Disabled on Kerberos and Managed Instance pipelines due to environment-specific instability.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup),
@@ -36,6 +107,12 @@ public async Task CancelAsyncConnections(bool useMars)
             // Arrange
             SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString);
             builder.MultipleActiveResultSets = useMars;
+            // The pool serializes physical connection creation, and with
+            // strict Connect Timeout propagation through the pool, the
+            // caller's budget must cover queue-wait time for the last open
+            // in a NumberOfTasks-wide burst. Bump the default 15 s budget so
+            // a slow CI agent doesn't time out legitimately-queued opens.
+            builder.ConnectTimeout = ConnectTimeoutSeconds;
 
             SqlConnection.ClearAllPools();
 
@@ -53,7 +130,16 @@ public async Task CancelAsyncConnections(bool useMars)
             // Assert - If test runs to completion, it is successful
         }
 
-        // This is the main body that our Tasks run
+        /// <summary>
+        /// Body run by each parallel task. When <see cref="SqlConnectionStringBuilder.MultipleActiveResultSets"/>
+        /// is enabled, opens a single long-lived MARS connection that is
+        /// reused by every <see cref="DoOneAsync"/> call in this task so that
+        /// cancellation effects on the shared MARS session are observable.
+        /// Then runs exactly one poisoned attempt followed by up to
+        /// <see cref="NumberOfNonPoisoned"/> non-poisoned attempts (gated by
+        /// <see cref="_continue"/>, which is cleared on a MARS-header
+        /// corruption signature).
+        /// </summary>
         private async Task DoManyAsync(SqlConnectionStringBuilder connectionStringBuilder)
         {
             string connectionString = connectionStringBuilder.ToString();
@@ -74,6 +160,24 @@ private async Task DoManyAsync(SqlConnectionStringBuilder connectionStringBuilde
             }
         }
 
+        /// <summary>
+        /// Executes one 4-batch query and reads every result set. When
+        /// <paramref name="poison"/> is true, the batches are interleaved
+        /// with <c>WAITFOR DELAY '00:00:01'</c> so the command runs long
+        /// enough for <see cref="TimeBombAsync"/> to cancel it mid-stream;
+        /// the resulting cancellation exception is expected and swallowed.
+        /// When <paramref name="poison"/> is false the command must complete
+        /// cleanly - this is the assertion that prior cancellation did not
+        /// corrupt shared state (the MARS session or the pooled connection).
+        /// </summary>
+        /// <param name="marsConnection">Shared MARS connection to reuse when
+        /// open; otherwise a fresh per-call <see cref="SqlConnection"/> is
+        /// opened from <paramref name="connectionString"/>.</param>
+        /// <param name="connectionString">Connection string used for the
+        /// non-MARS path.</param>
+        /// <param name="poison">If true, schedules a time-bomb
+        /// <see cref="SqlCommand.Cancel"/> and expects the cancellation
+        /// exception; if false, the command must succeed.</param>
         private async Task DoOneAsync(SqlConnection marsConnection, string connectionString, bool poison)
         {
             // This will do our work, open a connection, and run a query (that returns 4 results sets)
@@ -121,6 +225,14 @@ private async Task DoOneAsync(SqlConnection marsConnection, string connectionStr
             }
         }
 
+        /// <summary>
+        /// Recognizes the two exception shapes that a mid-stream
+        /// <see cref="SqlCommand.Cancel"/> can surface as: a managed
+        /// <see cref="OperationCanceledException"/>, or a
+        /// <see cref="SqlException"/> whose message reports the server-side
+        /// "operation cancelled/canceled" error. Any other exception is, by
+        /// design, treated as a real failure of the test.
+        /// </summary>
         private static bool IsExpectedCancellation(Exception ex)
         {
             switch (ex)
@@ -135,6 +247,19 @@ private static bool IsExpectedCancellation(Exception ex)
             }
         }
 
+        /// <summary>
+        /// Issues <paramref name="commandText"/> on
+        /// <paramref name="connection"/> via
+        /// <see cref="SqlCommand.ExecuteReaderAsync()"/> and drains every
+        /// row of every result set. When <paramref name="poison"/> is true a
+        /// <see cref="TimeBombAsync"/> is started in parallel to cancel the
+        /// command mid-read, and the inner <c>catch (SqlException)</c>
+        /// deliberately tries to drain remaining result sets after the
+        /// initial failure - this simulates the realistic dispose-on-error
+        /// pattern where a caller may attempt cleanup reads on a reader that
+        /// already faulted, and ensures it doesn't itself wedge the
+        /// connection.
+        /// </summary>
         private async Task RunCommand(SqlConnection connection, string commandText, bool poison)
         {
             using SqlCommand command = connection.CreateCommand();
@@ -187,6 +312,15 @@ private async Task RunCommand(SqlConnection connection, string commandText, bool
             }
         }
 
+        /// <summary>
+        /// Waits a random 100-3000 ms and then calls
+        /// <see cref="SqlCommand.Cancel"/> on the supplied command. The
+        /// randomized delay is intentional: it spreads cancellations across
+        /// different points in the reader's lifecycle (pre-execute,
+        /// mid-first-result, between result sets, etc.) to exercise more of
+        /// the cancellation state machine across the
+        /// <see cref="NumberOfTasks"/> parallel runs.
+        /// </summary>
         private async Task TimeBombAsync(SqlCommand command)
         {
             // Sleep a random amount between 100 and 3000 ms.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
index 42a2331be6..ca22d6eafd 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
@@ -172,12 +172,14 @@ private static string GetSPNInfo(string dataSource, string inInstanceName)
 
             Type[] getPortByInstanceNameTypesArray = new Type[] { typeof(string), typeof(string), timeoutTimerType, typeof(bool), typeof(Microsoft.Data.SqlClient.SqlConnectionIPAddressPreference) };
 
-            Type[] startSecondsTimeoutTypesArray = new Type[] { typeof(int) };
+            // The current TimeoutTimer API exposes only a static StartNew(TimeSpan)
+            // factory; the legacy parameterless constructor + StartSecondsTimeout(int)
+            // shape no longer exists.
+            Type[] startNewTypesArray = new Type[] { typeof(TimeSpan) };
 
             ConstructorInfo sniProxyConstructor = sniProxyType.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, CallingConventions.Any, Type.EmptyTypes, null);
             ConstructorInfo SSRPConstructor = ssrpType.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, CallingConventions.Any, Type.EmptyTypes, null);
             ConstructorInfo dataSourceConstructor = dataSourceType.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, CallingConventions.Any, dataSourceConstructorTypesArray, null);
-            ConstructorInfo timeoutTimerConstructor = timeoutTimerType.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, CallingConventions.Any, Type.EmptyTypes, null);
 
             object sniProxyObj = sniProxyConstructor.Invoke(new object[] { });
 
@@ -185,11 +187,9 @@ private static string GetSPNInfo(string dataSource, string inInstanceName)
 
             object ssrpObj = SSRPConstructor.Invoke(new object[] { });
 
-            object timeoutTimerObj = timeoutTimerConstructor.Invoke(new object[] { });
+            MethodInfo startNewInfo = timeoutTimerType.GetMethod("StartNew", BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic, null, CallingConventions.Any, startNewTypesArray, null);
 
-            MethodInfo startSecondsTimeoutInfo = timeoutTimerObj.GetType().GetMethod("StartSecondsTimeout", BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic, null, CallingConventions.Any, startSecondsTimeoutTypesArray, null);
-
-            timeoutTimerObj = startSecondsTimeoutInfo.Invoke(dataSourceObj, new object[] { 30 });
+            object timeoutTimerObj = startNewInfo.Invoke(null, new object[] { TimeSpan.FromSeconds(30) });
 
             MethodInfo parseServerNameInfo = dataSourceObj.GetType().GetMethod("ParseServerName", BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic, null, CallingConventions.Any, dataSourceConstructorTypesArray, null);
             object dataSrcInfo = parseServerNameInfo.Invoke(dataSourceObj, new object[] { dataSource });
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs
index 28aa62ccf5..9ed25a6e74 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs
@@ -55,7 +55,10 @@ public async Task Delegated_transaction_deadlock_in_SinglePhaseCommit()
         public async Task Test_EnlistedTransactionPreservedWhilePooled()
         {
             #if NET
-            TransactionManager.ImplicitDistributedTransactions = true;
+            if (OperatingSystem.IsWindows())
+            {
+                TransactionManager.ImplicitDistributedTransactions = true;
+            }
             #endif
 
             await RunTestSet(EnlistedTransactionPreservedWhilePooled);
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 7c1593af14..1fea8aede1 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -12,6 +12,7 @@
 using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Extensions.Time.Testing;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
@@ -63,6 +64,7 @@ public void GetConnectionEmptyPool_ShouldCreateNewConnection(int numConnections)
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -92,6 +94,7 @@ public async Task GetConnectionAsyncEmptyPool_ShouldCreateNewConnection(int numC
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     tcs,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -117,6 +120,7 @@ public void GetConnectionMaxPoolSize_ShouldTimeoutAfterPeriod()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -124,23 +128,27 @@ out DbConnectionInternal? internalConnection
                 Assert.NotNull(internalConnection);
             }
 
-            try
+            // Build a timer backed by a fake time provider, then advance virtual time past
+            // the timer's expiration so the pool's CancellationTokenSource is created
+            // already-cancelled and the timeout path fires deterministically without any
+            // wall-clock wait.
+            var fakeTime = new FakeTimeProvider();
+            TimeoutTimer expiredTimer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(1), fakeTime);
+            fakeTime.Advance(TimeSpan.FromSeconds(2));
+
+            // Act & Assert
+            var ex = Assert.Throws<InvalidOperationException>(() =>
             {
-                // Act
-                var exceeded = pool.TryGetConnection(
-                    new SqlConnection("Timeout=1"),
+                pool.TryGetConnection(
+                    new SqlConnection(),
                     taskCompletionSource: null,
-                    out DbConnectionInternal? extraConnection
-                );
-            }
-            catch (Exception ex)
-            {
-                // Assert
-                Assert.IsType<InvalidOperationException>(ex);
-                Assert.Equal("Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.", ex.Message);
-            }
+                    expiredTimer,
+                    out DbConnectionInternal? extraConnection);
+            });
 
-            // Assert
+            Assert.Equal(
+                "Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.",
+                ex.Message);
             Assert.Equal(pool.PoolGroupOptions.MaxPoolSize, pool.Count);
         }
 
@@ -155,6 +163,7 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldTimeoutAfterPeriod()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -162,25 +171,25 @@ out DbConnectionInternal? internalConnection
                 Assert.NotNull(internalConnection);
             }
 
-            try
-            {
-                // Act
-                TaskCompletionSource<DbConnectionInternal> taskCompletionSource = new();
-                var exceeded = pool.TryGetConnection(
-                    new SqlConnection("Timeout=1"),
-                    taskCompletionSource,
-                    out DbConnectionInternal? extraConnection
-                );
-                await taskCompletionSource.Task;
-            }
-            catch (Exception ex)
-            {
-                // Assert
-                Assert.IsType<InvalidOperationException>(ex);
-                Assert.Equal("Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.", ex.Message);
-            }
+            // Build a timer backed by a fake time provider then advance past expiration so
+            // the pool's CTS is created already-cancelled.
+            var fakeTime = new FakeTimeProvider();
+            TimeoutTimer expiredTimer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(1), fakeTime);
+            fakeTime.Advance(TimeSpan.FromSeconds(2));
 
-            // Assert
+            // Act & Assert
+            TaskCompletionSource<DbConnectionInternal> taskCompletionSource = new();
+            pool.TryGetConnection(
+                new SqlConnection(),
+                taskCompletionSource,
+                expiredTimer,
+                out _);
+
+            var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => taskCompletionSource.Task);
+
+            Assert.Equal(
+                "Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.",
+                ex.Message);
             Assert.Equal(pool.PoolGroupOptions.MaxPoolSize, pool.Count);
         }
 
@@ -194,6 +203,7 @@ public async Task GetConnectionMaxPoolSize_ShouldReuseAfterConnectionReleased()
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -202,6 +212,7 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -217,6 +228,7 @@ out DbConnectionInternal? internalConnection
                 var exceeded = pool.TryGetConnection(
                     new SqlConnection(""),
                     taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? extraConnection
                 );
                 return extraConnection;
@@ -238,6 +250,7 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldReuseAfterConnectionReleas
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -246,6 +259,7 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -259,6 +273,7 @@ out DbConnectionInternal? internalConnection
             var exceeded = pool.TryGetConnection(
                 new SqlConnection(""),
                 taskCompletionSource,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? recycledConnection
             );
             pool.ReturnInternalConnection(firstConnection!, firstOwningConnection);
@@ -279,6 +294,7 @@ public async Task GetConnectionMaxPoolSize_ShouldRespectOrderOfRequest()
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -287,6 +303,7 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -307,6 +324,7 @@ out DbConnectionInternal? internalConnection
                 pool.TryGetConnection(
                     new SqlConnection(""),
                     null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? recycledConnection
                 );
                 return recycledConnection;
@@ -319,6 +337,7 @@ out DbConnectionInternal? recycledConnection
                 pool.TryGetConnection(
                     new SqlConnection("Timeout=1"),
                     null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(1)),
                     out DbConnectionInternal? failedConnection
                 );
                 return failedConnection;
@@ -344,6 +363,7 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldRespectOrderOfRequest()
             pool.TryGetConnection(
                 firstOwningConnection,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? firstConnection
             );
 
@@ -352,6 +372,7 @@ out DbConnectionInternal? firstConnection
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
                 );
 
@@ -366,6 +387,7 @@ out DbConnectionInternal? internalConnection
             var exceeded = pool.TryGetConnection(
                 new SqlConnection(""),
                 recycledTaskCompletionSource,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? recycledConnection
             );
 
@@ -375,6 +397,7 @@ out DbConnectionInternal? recycledConnection
             var exceeded2 = pool.TryGetConnection(
                 new SqlConnection("Timeout=1"),
                 failedCompletionSource,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(1)),
                 out DbConnectionInternal? failedConnection
             );
 
@@ -397,6 +420,7 @@ public void ConnectionsAreReused()
             var completed1 = pool.TryGetConnection(
                 owningConnection,
                 null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? internalConnection1
             );
 
@@ -411,6 +435,7 @@ out DbConnectionInternal? internalConnection1
             var completed2 = pool.TryGetConnection(
                 owningConnection,
                 null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? internalConnection2
             );
 
@@ -432,11 +457,14 @@ public void GetConnectionTimeout_ShouldThrowTimeoutException()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
                 );
             });
 
-            Assert.Equal("Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.", ex.Message);
+            // Use the resource-backed message rather than a hardcoded English
+            // string so the assertion stays meaningful under any localized build.
+            Assert.Equal(ADP.PooledOpenTimeout().Message, ex.Message);
         }
 
         [Fact]
@@ -452,13 +480,16 @@ public async Task GetConnectionAsyncTimeout_ShouldThrowTimeoutException()
                 var completed = pool.TryGetConnection(
                     new SqlConnection(),
                     taskCompletionSource,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
                 );
 
                 await taskCompletionSource.Task;
             });
 
-            Assert.Equal("Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.", ex.Message);
+            // Use the resource-backed message rather than a hardcoded English
+            // string so the assertion stays meaningful under any localized build.
+            Assert.Equal(ADP.PooledOpenTimeout().Message, ex.Message);
         }
 
         [Fact]
@@ -476,6 +507,7 @@ public void StressTest()
                     var completed = pool.TryGetConnection(
                         owningObject,
                         taskCompletionSource: null,
+                        TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                         out DbConnectionInternal? internalConnection
                     );
                     if (completed)
@@ -509,6 +541,7 @@ public void StressTestAsync()
                     var completed = pool.TryGetConnection(
                         owningObject,
                         taskCompletionSource,
+                        TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                         out DbConnectionInternal? internalConnection
                     );
                     internalConnection = await taskCompletionSource.Task;
@@ -666,7 +699,7 @@ public void TestPutObjectFromTransactedPool()
         public void TestReplaceConnection()
         {
             var pool = ConstructPool(SuccessfulConnectionFactory);
-            Assert.Throws<NotImplementedException>(() => pool.ReplaceConnection(null!, null!));
+            Assert.Throws<NotImplementedException>(() => pool.ReplaceConnection(null!, null!, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
         }
 
         [Fact]
@@ -705,6 +738,7 @@ public void Clear_MultipleIdleConnections_AllAreDestroyed()
                 pool.TryGetConnection(
                     owningConnections[i],
                     taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out internalConnections[i]
                 );
                 Assert.Equal(0, internalConnections[i]!.ClearGeneration);
@@ -733,6 +767,7 @@ public void Clear_BusyConnection_NotDestroyedImmediately()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? busyConnection
             );
             Assert.NotNull(busyConnection);
@@ -756,6 +791,7 @@ public void Clear_BusyConnectionReturned_IsDestroyed()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? busyConnection
             );
             Assert.NotNull(busyConnection);
@@ -785,11 +821,13 @@ public void Clear_MixedBusyAndIdle_OnlyIdleDestroyedImmediately()
             pool.TryGetConnection(
                 busyOwner,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? busyConnection
             );
             pool.TryGetConnection(
                 idleOwner,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? idleConnection
             );
             Assert.NotNull(busyConnection);
@@ -822,6 +860,7 @@ public void Clear_NewConnectionsAfterClear_ArePooledNormally()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? oldConnection
             );
             Assert.Equal(0, oldConnection!.ClearGeneration);
@@ -835,6 +874,7 @@ out DbConnectionInternal? oldConnection
             pool.TryGetConnection(
                 newOwner,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? newConnection
             );
             Assert.NotNull(newConnection);
@@ -852,6 +892,7 @@ out DbConnectionInternal? newConnection
             pool.TryGetConnection(
                 reuseOwner,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? reusedConnection
             );
             Assert.Same(newConnection, reusedConnection);
@@ -868,6 +909,7 @@ public void Clear_MultipleClearCalls_DoNotCorruptState()
             pool.TryGetConnection(
                 owningConnection,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? connection
             );
             Assert.Equal(0, connection!.ClearGeneration);
@@ -886,6 +928,7 @@ out DbConnectionInternal? connection
             pool.TryGetConnection(
                 newOwner,
                 taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                 out DbConnectionInternal? newConnection
             );
             Assert.NotNull(newConnection);
@@ -898,13 +941,17 @@ out DbConnectionInternal? newConnection
         #region Test classes
         internal class SuccessfulSqlConnectionFactory : SqlConnectionFactory
         {
+            internal TimeoutTimer? CapturedTimeout { get; private set; }
+
             protected override DbConnectionInternal CreateConnection(
                 SqlConnectionOptions options,
                 ConnectionPoolKey poolKey,
                 DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
                 IDbConnectionPool pool,
-                DbConnection owningConnection)
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
             {
+                CapturedTimeout = timeout;
                 return new StubDbConnectionInternal();
             }
         }
@@ -916,7 +963,8 @@ protected override DbConnectionInternal CreateConnection(
                 ConnectionPoolKey poolKey,
                 DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
                 IDbConnectionPool pool,
-                DbConnection owningConnection)
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
             {
                 throw ADP.PooledOpenTimeout();
             }
@@ -1081,5 +1129,131 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
             Assert.NotNull(pool2);
             Assert.Equal(0, pool2.Count);
         }
+
+        #region Connection Timeout Awareness Tests
+
+        /// <summary>
+        /// Verifies that two concurrent callers waiting for the same exhausted
+        /// pool observe their own per-caller <see cref="TimeoutTimer"/> deadlines
+        /// independently: the caller with the shorter timeout fails with the
+        /// pool-timeout error while the caller with the longer timeout continues
+        /// to wait and eventually succeeds when a connection is returned.
+        /// </summary>
+        /// <remarks>
+        /// Both callers share a single <see cref="FakeTimeProvider"/> so that
+        /// advancing virtual time deterministically expires only the short-timeout
+        /// caller's CTS without consuming any wall-clock time.
+        /// </remarks>
+        [Fact]
+        public async Task ConcurrentCallers_ShouldTimeoutIndependently()
+        {
+            // Arrange: pool at max capacity so both callers must wait
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: 1,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true
+            );
+            var pool = ConstructPool(SuccessfulConnectionFactory, poolGroupOptions: poolGroupOptions);
+
+            SqlConnection firstOwner = new();
+            pool.TryGetConnection(firstOwner, taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? firstConnection);
+            Assert.NotNull(firstConnection);
+
+            // Use a single fake time provider shared by both callers so we can independently
+            // expire each caller's timeout via virtual time without any wall-clock waits.
+            // Build the timers up-front so they are anchored at virtual time t=0.
+            var fakeTime = new FakeTimeProvider();
+            TimeoutTimer timerA = TimeoutTimer.StartNew(TimeSpan.FromSeconds(1), fakeTime);
+            TimeoutTimer timerB = TimeoutTimer.StartNew(TimeSpan.FromSeconds(10), fakeTime);
+
+            // Caller A: 1s virtual timeout, Caller B: 10s virtual timeout. Both run in
+            // background tasks so the sync pool path can block on the channel as in production.
+            var callerATask = Task.Run(() =>
+            {
+                pool.TryGetConnection(
+                    new SqlConnection(),
+                    taskCompletionSource: null,
+                    timerA,
+                    out DbConnectionInternal? connectionA);
+                return connectionA;
+            });
+
+            var callerBTask = Task.Run(() =>
+            {
+                pool.TryGetConnection(
+                    new SqlConnection(),
+                    taskCompletionSource: null,
+                    timerB,
+                    out DbConnectionInternal? connectionB);
+                return connectionB;
+            });
+
+            // Act: advance virtual time past A's 1s timeout but well within B's 10s timeout.
+            // A's CancellationTokenSource fires (cancelling its channel wait), B's does not.
+            fakeTime.Advance(TimeSpan.FromSeconds(2));
+
+            // Assert: Caller A should observe the timeout
+            var exA = await Assert.ThrowsAsync<InvalidOperationException>(() => callerATask);
+            Assert.Equal(
+                "Timeout expired.  The timeout period elapsed prior to obtaining a connection from the pool.  This may have occurred because all pooled connections were in use and max pool size was reached.",
+                exA.Message);
+
+            // Caller B should still be waiting (8s of virtual budget remain)
+            Assert.False(callerBTask.IsCompleted, "Caller B should still be waiting");
+
+            // Release the connection so caller B can succeed
+            pool.ReturnInternalConnection(firstConnection, firstOwner);
+
+            // Bound the wait so a regression in the pool can't hang the test suite
+            // indefinitely; a real success completes well under this budget.
+            Task completed = await Task.WhenAny(callerBTask, Task.Delay(TimeSpan.FromSeconds(30)));
+            Assert.Same(callerBTask, completed);
+            var resultB = await callerBTask;
+
+            // Caller B got the connection
+            Assert.NotNull(resultB);
+            Assert.Same(firstConnection, resultB);
+        }
+
+        /// <summary>
+        /// Verifies that the <see cref="TimeoutTimer"/> the pool hands to the
+        /// connection factory reports a reduced remaining-time budget once the
+        /// timer's clock has advanced. This guarantees the factory observes the
+        /// actual remaining budget at the moment of the call rather than a
+        /// fresh, full timeout.
+        /// </summary>
+        /// <remarks>
+        /// Drives elapsed time deterministically with a
+        /// <see cref="FakeTimeProvider"/> so the test does not depend on real
+        /// wall-clock waits or thread sleeps.
+        /// </remarks>
+        [Fact]
+        public void GetConnection_TimeoutTimerReflectsPoolWaitTime()
+        {
+            // Arrange: a capturing factory and a fake-time-backed timer with a
+            // 30-second budget anchored at virtual time t = 0.
+            var factory = new SuccessfulSqlConnectionFactory();
+            var pool = ConstructPool(factory);
+            var owner = new SqlConnection("Timeout=30");
+            var fakeTime = new FakeTimeProvider();
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(30), fakeTime);
+
+            // Act: advance virtual time by 5 seconds before invoking the pool,
+            // simulating budget that was consumed elsewhere (e.g., waiting on a
+            // pool slot) before the factory was called.
+            fakeTime.Advance(TimeSpan.FromSeconds(5));
+            pool.TryGetConnection(owner, taskCompletionSource: null, timer, out DbConnectionInternal? connection);
+
+            // Assert: factory received the same timer, and it reports the
+            // reduced 25-second remaining budget.
+            Assert.NotNull(connection);
+            Assert.Same(timer, factory.CapturedTimeout);
+            Assert.Equal(25_000, factory.CapturedTimeout!.MillisecondsRemainingInt);
+        }
+
+        #endregion
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
index 521ded14b8..a29abd6bbb 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
@@ -676,12 +676,12 @@ internal class MockDbConnectionPool : IDbConnectionPool
 
         public void Clear() => throw new NotImplementedException();
 
-        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, out DbConnectionInternal? connection)
+        public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbConnectionInternal>? taskCompletionSource, TimeoutTimer timeout, out DbConnectionInternal? connection)
         {
             throw new NotImplementedException();
         }
 
-        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionInternal oldConnection)
+        public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConnectionInternal oldConnection, TimeoutTimer timeout)
         {
             throw new NotImplementedException();
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs
new file mode 100644
index 0000000000..6c00f8e38e
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs
@@ -0,0 +1,232 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data.Common;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Transactions;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Data.SqlClient.Tests.Common;
+using Microsoft.Extensions.Time.Testing;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool;
+
+/// <summary>
+/// Verifies that <see cref="WaitHandleDbConnectionPool"/> propagates the
+/// caller's overall <see cref="TimeoutTimer"/> budget through both the pool
+/// wait and the physical connection-creation factory call, mirroring the
+/// budget-propagation coverage already in place for
+/// <c>ChannelDbConnectionPool</c>.
+/// </summary>
+public class WaitHandleDbConnectionPoolBudgetTest : IDisposable
+{
+    private const int DefaultMaxPoolSize = 50;
+    private const int DefaultMinPoolSize = 0;
+    private const int DefaultCreationTimeoutInMilliseconds = 15_000;
+
+    private WaitHandleDbConnectionPool? _pool;
+
+    public void Dispose()
+    {
+        _pool?.Shutdown();
+        _pool?.Clear();
+    }
+
+    private WaitHandleDbConnectionPool CreatePool(
+        SqlConnectionFactory connectionFactory,
+        int maxPoolSize = DefaultMaxPoolSize,
+        int creationTimeoutMs = DefaultCreationTimeoutInMilliseconds)
+    {
+        var poolGroupOptions = new DbConnectionPoolGroupOptions(
+            poolByIdentity: false,
+            minPoolSize: DefaultMinPoolSize,
+            maxPoolSize: maxPoolSize,
+            creationTimeout: creationTimeoutMs,
+            loadBalanceTimeout: 0,
+            hasTransactionAffinity: true);
+
+        var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+            new SqlConnectionOptions("Data Source=localhost;"),
+            new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+            poolGroupOptions);
+
+        var pool = new WaitHandleDbConnectionPool(
+            connectionFactory,
+            dbConnectionPoolGroup,
+            DbConnectionPoolIdentity.NoIdentity,
+            new DbConnectionPoolProviderInfo());
+
+        pool.Startup();
+        _pool = pool;
+        return pool;
+    }
+
+    /// <summary>
+    /// Verifies that the <see cref="TimeoutTimer"/> the pool hands to the
+    /// connection factory reports a reduced remaining-time budget when the
+    /// timer's clock has advanced before the pool was entered. Both the
+    /// synchronous (<c>taskCompletionSource == null</c>) and asynchronous
+    /// paths must forward the caller's already-advanced timer rather than
+    /// constructing a fresh one from <c>CreationTimeout</c>. Mirrors
+    /// <c>ChannelDbConnectionPoolTest.GetConnection_TimeoutTimerReflectsPoolWaitTime</c>.
+    /// </summary>
+    [Theory]
+    [InlineData(false)] // sync
+    [InlineData(true)]  // async
+    public async Task GetConnection_TimeoutTimerReflectsTimeAlreadyConsumed(bool async)
+    {
+        // Arrange: capturing factory and a fake-time-backed timer with a
+        // 30-second budget anchored at virtual time t = 0.
+        var factory = new MockSqlConnectionFactory();
+        var pool = CreatePool(factory);
+        var owner = new SqlConnection("Timeout=30");
+        var fakeTime = new FakeTimeProvider();
+        TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(30), fakeTime);
+        TaskCompletionSource<DbConnectionInternal>? tcs =
+            async ? new TaskCompletionSource<DbConnectionInternal>() : null;
+
+        // Act: simulate 5s of budget consumed elsewhere (e.g., higher-level
+        // Open() work) before the pool is entered, then request a connection.
+        fakeTime.Advance(TimeSpan.FromSeconds(5));
+        bool completed = pool.TryGetConnection(
+            owner,
+            tcs,
+            timer,
+            out DbConnectionInternal? connection);
+
+        if (async)
+        {
+            // Bound the await so a regression in the pool can't hang the suite.
+            Task winner = await Task.WhenAny(tcs!.Task, Task.Delay(TimeSpan.FromSeconds(30)));
+            Assert.Same(tcs.Task, winner);
+            connection = await tcs.Task;
+        }
+        else
+        {
+            Assert.True(completed);
+        }
+
+        // Assert: factory received the same timer, and it reports the reduced
+        // 25-second remaining budget rather than the original 30s or the
+        // pool's static 15s CreationTimeout.
+        Assert.NotNull(connection);
+        Assert.Same(timer, factory.CapturedTimeout);
+        Assert.Equal(25_000, factory.CapturedTimeout!.MillisecondsRemainingInt);
+    }
+
+    /// <summary>
+    /// Identifies which kind of caller-supplied <see cref="TimeoutTimer"/> a
+    /// parameterized test should construct. Used because
+    /// <see cref="InlineDataAttribute"/> cannot carry a live
+    /// <see cref="TimeoutTimer"/> instance.
+    /// </summary>
+    public enum TimerKind
+    {
+        Expired,
+        Infinite,
+    }
+
+    /// <summary>
+    /// Verifies the resolution matrix for the synchronous
+    /// <c>WaitHandle.WaitAny</c> timeout:
+    /// <list type="bullet">
+    ///   <item>switch ON  → use the caller timer's remaining budget
+    ///   (expired → 0, infinite → <see cref="Timeout.Infinite"/>);</item>
+    ///   <item>switch OFF → ignore the caller timer and use
+    ///   <c>CreationTimeout</c>, treating <c>0</c> as
+    ///   <see cref="Timeout.Infinite"/> per legacy behavior.</item>
+    /// </list>
+    /// </summary>
+    [Theory]
+    [InlineData(true,  TimerKind.Expired,  5_000, 0u)]
+    [InlineData(true,  TimerKind.Infinite, 5_000, unchecked((uint)Timeout.Infinite))]
+    [InlineData(false, TimerKind.Expired,  1_500, 1_500u)]
+    [InlineData(false, TimerKind.Expired,  0,     unchecked((uint)Timeout.Infinite))]
+    public void ResolvePoolWaitTimeoutMs_ReturnsExpected(
+        bool switchEnabled,
+        TimerKind timerKind,
+        int creationTimeoutMs,
+        uint expected)
+    {
+        // Arrange
+        using LocalAppContextSwitchesHelper switches = new()
+        {
+            UseOverallConnectTimeoutForPoolWait = switchEnabled,
+        };
+        TimeoutTimer timer = timerKind switch
+        {
+            TimerKind.Expired => TimeoutTimer.StartExpired(),
+            TimerKind.Infinite => TimeoutTimer.StartNew(TimeSpan.Zero),
+            _ => throw new ArgumentOutOfRangeException(nameof(timerKind)),
+        };
+
+        // Act
+        uint result = WaitHandleDbConnectionPool.ResolvePoolWaitTimeoutMs(
+            timer,
+            creationTimeoutMs);
+
+        // Assert
+        Assert.Equal(expected, result);
+    }
+
+    /// <summary>
+    /// SqlConnectionFactory test double that captures the
+    /// <see cref="TimeoutTimer"/> handed to <c>CreateConnection</c> so tests
+    /// can assert the pool propagated the caller's budget rather than
+    /// constructing a fresh timer from <c>CreationTimeout</c>.
+    /// </summary>
+    internal sealed class MockSqlConnectionFactory : SqlConnectionFactory
+    {
+        internal TimeoutTimer? CapturedTimeout { get; private set; }
+
+        protected override DbConnectionInternal CreateConnection(
+            SqlConnectionOptions options,
+            ConnectionPoolKey poolKey,
+            DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+            IDbConnectionPool pool,
+            DbConnection owningConnection,
+            TimeoutTimer timeout)
+        {
+            CapturedTimeout = timeout;
+            return new MockDbConnectionInternal();
+        }
+    }
+
+    /// <summary>
+    /// Minimal <see cref="DbConnectionInternal"/> stub. Mirrors the helper in
+    /// <c>WaitHandleDbConnectionPoolTransactionTest</c> but is duplicated
+    /// locally so this test file remains self-contained.
+    /// </summary>
+    internal sealed class MockDbConnectionInternal : DbConnectionInternal
+    {
+        public override string ServerVersion => "Mock";
+
+        public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
+            => throw new NotImplementedException();
+
+        public override void EnlistTransaction(Transaction? transaction)
+        {
+            if (transaction != null)
+            {
+                EnlistedTransaction = transaction;
+            }
+        }
+
+        protected override void Activate(Transaction? transaction)
+        {
+            EnlistedTransaction = transaction;
+        }
+
+        protected override void Deactivate()
+        {
+        }
+
+        internal override void ResetConnection()
+        {
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
index a5e5d0339f..555de74b29 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
@@ -82,6 +82,7 @@ private DbConnectionInternal GetConnection(SqlConnection owner)
         _pool.TryGetConnection(
             owner,
             taskCompletionSource: null,
+            TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
             out DbConnectionInternal? connection);
         return connection!;
     }
@@ -94,6 +95,7 @@ private async Task<DbConnectionInternal> GetConnectionAsync(
         _pool.TryGetConnection(
             owner,
             taskCompletionSource: tcs,
+            TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
             out DbConnectionInternal? connection);
         return connection ?? await tcs.Task;
     }
@@ -902,7 +904,8 @@ protected override DbConnectionInternal CreateConnection(
             ConnectionPoolKey poolKey,
             DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
             IDbConnectionPool pool,
-            DbConnection owningConnection)
+            DbConnection owningConnection,
+            TimeoutTimer timeout)
         {
             return new MockDbConnectionInternal();
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index 4501d710a9..e09e49c967 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -89,6 +89,14 @@
     <Reference Include="System.Transactions" />
 
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
+    <!--
+      Microsoft.Extensions.TimeProvider.Testing ships a buildTransitive .targets
+      file under net462 that unconditionally emits a TFM-support warning saying
+      the package isn't tested on .NET Framework. The lib/net462 compile and
+      runtime assets are fine for our FakeTimeProvider usage, so exclude only
+      the build* assets to suppress the warning without giving up the package.
+    -->
+    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" ExcludeAssets="build;buildTransitive" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
@@ -105,6 +113,7 @@
   <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
+    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="xunit" />
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
index 075cca0cb1..c5c6f7ec73 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
@@ -57,6 +57,7 @@ public void TestDefaultAppContextSwitchValues()
         Assert.True(LocalAppContextSwitches.UseCompatibilityProcessSni);
         Assert.True(LocalAppContextSwitches.UseCompatibilityAsyncBehaviour);
         Assert.False(LocalAppContextSwitches.UseConnectionPoolV2);
+        Assert.False(LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait);
         Assert.False(LocalAppContextSwitches.TruncateScaledDecimal);
         Assert.False(LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner);
         Assert.False(LocalAppContextSwitches.UseLegacyFailoverAlternationOnLoginSqlErrors);
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalTimeoutTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalTimeoutTests.cs
new file mode 100644
index 0000000000..acf6e27622
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalTimeoutTests.cs
@@ -0,0 +1,74 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.Connection;
+using Microsoft.Data.SqlClient.Tests.Common;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests;
+
+/// <summary>
+/// Verifies how <see cref="SqlConnectionInternal"/> selects the
+/// <see cref="TimeoutTimer"/> that governs the login phase, driven by the
+/// <c>UseOverallConnectTimeoutForPoolWait</c> AppContext switch.
+///
+/// When the switch is enabled the connection must reuse the caller-supplied
+/// timer as-is so the remaining budget (already reflecting any time spent
+/// waiting for the pool) is honored during login. When disabled it must
+/// construct a fresh timer from <c>ConnectTimeout</c>, preserving legacy
+/// behavior. Asserting against the extracted
+/// <see cref="SqlConnectionInternal.ResolveLoginTimeout"/> helper keeps this
+/// branch coverage free of any real network connection.
+/// </summary>
+public class SqlConnectionInternalTimeoutTests
+{
+    /// <summary>
+    /// Verifies the branch selection in
+    /// <see cref="SqlConnectionInternal.ResolveLoginTimeout"/>:
+    /// <list type="bullet">
+    ///   <item>switch ON  → the caller's <see cref="TimeoutTimer"/> instance
+    ///   flows through unchanged (asserted by reference identity), so any
+    ///   time already consumed counts against the overall ConnectTimeout;</item>
+    ///   <item>switch OFF → a fresh timer is started from
+    ///   <c>ConnectTimeout</c> (asserted by inspecting
+    ///   <see cref="TimeoutTimer.OriginalTicks"/>), preserving legacy
+    ///   behavior where login always gets the full configured budget.</item>
+    /// </list>
+    /// </summary>
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void ResolveLoginTimeout_HonorsSwitch(bool switchEnabled)
+    {
+        // Arrange
+        using LocalAppContextSwitchesHelper switches = new()
+        {
+            UseOverallConnectTimeoutForPoolWait = switchEnabled,
+        };
+        const int ConnectTimeoutSeconds = 30;
+        TimeoutTimer callerTimeout = TimeoutTimer.StartNew(TimeSpan.FromSeconds(ConnectTimeoutSeconds));
+
+        // Act
+        TimeoutTimer resolved = SqlConnectionInternal.ResolveLoginTimeout(
+            callerTimeout,
+            ConnectTimeoutSeconds);
+
+        // Assert
+        if (switchEnabled)
+        {
+            // Switch on: caller's timer must flow through unchanged so any
+            // time already consumed counts against the overall budget.
+            Assert.Same(callerTimeout, resolved);
+        }
+        else
+        {
+            // Switch off (legacy): a fresh timer must be started from
+            // ConnectTimeout, independent of the caller's timer.
+            Assert.NotSame(callerTimeout, resolved);
+            Assert.Equal(TimeSpan.FromSeconds(ConnectTimeoutSeconds).Ticks, resolved.OriginalTicks);
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ProviderBase/TimeoutTimerTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ProviderBase/TimeoutTimerTest.cs
new file mode 100644
index 0000000000..5d98837806
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ProviderBase/TimeoutTimerTest.cs
@@ -0,0 +1,513 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Data.Common;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Extensions.Time.Testing;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ProviderBase
+{
+    /// <summary>
+    /// Verifies <see cref="TimeoutTimer"/> behavior: expiration evaluation,
+    /// remaining-time reporting, reset, infinite timers, and the cancellation
+    /// token source it produces.
+    /// </summary>
+    public class TimeoutTimerTest
+    {
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.IsExpired"/> flips from
+        /// <see langword="false"/> to <see langword="true"/> once the timer's
+        /// configured duration has elapsed (as measured by its
+        /// <see cref="TimeProvider"/>), and that
+        /// <see cref="TimeoutTimer.MillisecondsRemainingInt"/> reports zero in
+        /// the expired state.
+        /// </summary>
+        [Fact]
+        public void IsExpired_BecomesTrueAfterDuration()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(5), fake);
+            Assert.False(timer.IsExpired);
+
+            // Act: advance virtual time past the expiration; no real time elapses.
+            fake.Advance(TimeSpan.FromSeconds(6));
+
+            // Assert
+            Assert.True(timer.IsExpired);
+            Assert.Equal(0, timer.MillisecondsRemainingInt);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.MillisecondsRemainingInt"/>
+        /// counts down as virtual time advances, matching the original duration
+        /// minus the elapsed amount.
+        /// </summary>
+        [Fact]
+        public void MillisecondsRemaining_DecreasesAsTimeElapses()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(10), fake);
+            Assert.Equal(10_000, timer.MillisecondsRemainingInt);
+
+            // Act
+            fake.Advance(TimeSpan.FromSeconds(3));
+
+            // Assert
+            Assert.Equal(7_000, timer.MillisecondsRemainingInt);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.Reset"/> restarts the countdown
+        /// from the original duration, discarding any time that had already
+        /// elapsed.
+        /// </summary>
+        [Fact]
+        public void Reset_RestoresOriginalDuration()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(5), fake);
+            fake.Advance(TimeSpan.FromSeconds(4));
+            Assert.Equal(1_000, timer.MillisecondsRemainingInt);
+
+            // Act
+            timer.Reset();
+
+            // Assert
+            Assert.Equal(5_000, timer.MillisecondsRemainingInt);
+        }
+
+        /// <summary>
+        /// Verifies that the <see cref="CancellationTokenSource"/> produced by
+        /// <see cref="TimeoutTimer.CreateCancellationTokenSource"/> is wired to the
+        /// timer's <see cref="TimeProvider"/> rather than the system clock.
+        /// </summary>
+        /// <remarks>
+        /// The CTS is constructed with a one-hour delay. If it were backed by real
+        /// time, the test could not complete within the runner's per-test timeout.
+        /// Because <c>CreateCancellationTokenSource</c> passes the timer's
+        /// <see cref="TimeProvider"/> to the CTS constructor, advancing the
+        /// <see cref="FakeTimeProvider"/> by two virtual hours synchronously fires
+        /// the registered timer callback (queued to the thread pool by the fake
+        /// provider), which cancels the source. The test then polls briefly via
+        /// <see cref="WaitForAsync"/> to absorb thread-pool dispatch latency
+        /// before asserting cancellation. A successful run completes in
+        /// milliseconds, proving cancellation is driven by virtual time and not
+        /// by wall-clock elapsed time.
+        /// </remarks>
+        [Fact]
+        public async Task CreateCancellationTokenSource_FiresWhenTimerExpires()
+        {
+            // Arrange: use an hour-long timer; if the CTS were backed by real
+            // time the test would never complete in the runner's timeout. It
+            // only finishes promptly because the CTS is scheduled through the
+            // fake provider.
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromHours(1), fake);
+            using CancellationTokenSource cts = timer.CreateCancellationTokenSource();
+            Assert.False(cts.IsCancellationRequested);
+
+            // Act: advancing the fake provider past the expiration deadline must
+            // cause the CTS to fire deterministically; no real time passes.
+            fake.Advance(TimeSpan.FromHours(2));
+
+            // Assert: FakeTimeProvider schedules timer callbacks on the thread
+            // pool, so yield briefly to let the cancellation propagate before
+            // asserting.
+            await WaitForAsync(() => cts.IsCancellationRequested);
+            Assert.True(cts.IsCancellationRequested);
+        }
+
+        /// <summary>
+        /// Verifies that requesting a <see cref="CancellationTokenSource"/> from
+        /// a timer whose deadline has already passed returns a source that is
+        /// already canceled, rather than scheduling a new timer callback.
+        /// </summary>
+        [Fact]
+        public void CreateCancellationTokenSource_AlreadyExpired_ReturnsCanceledSource()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(1), fake);
+            fake.Advance(TimeSpan.FromSeconds(2));
+
+            // Act
+            using CancellationTokenSource cts = timer.CreateCancellationTokenSource();
+
+            // Assert
+            Assert.True(cts.IsCancellationRequested);
+        }
+
+        /// <summary>
+        /// Verifies that an infinite timer (constructed from
+        /// <see cref="TimeSpan.Zero"/>) produces a
+        /// <see cref="CancellationTokenSource"/> that never auto-cancels, even
+        /// after a large amount of virtual time has elapsed.
+        /// </summary>
+        [Fact]
+        public void CreateCancellationTokenSource_InfiniteTimer_NeverCancels()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.Zero, fake);
+            using CancellationTokenSource cts = timer.CreateCancellationTokenSource();
+
+            // Act
+            fake.Advance(TimeSpan.FromHours(1));
+
+            // Assert
+            Assert.True(timer.IsInfinite);
+            Assert.False(cts.IsCancellationRequested);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.TimeProvider"/> exposes the
+        /// exact <see cref="TimeProvider"/> instance supplied to
+        /// <see cref="TimeoutTimer.StartNew(TimeSpan, TimeProvider)"/>.
+        /// </summary>
+        [Fact]
+        public void TimeProvider_ReturnsProviderPassedToStartNew()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider();
+
+            // Act
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(1), fake);
+
+            // Assert
+            Assert.Same(fake, timer.TimeProvider);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.StartExpired(TimeProvider)"/>
+        /// returns a finite timer that is already expired, reports zero
+        /// remaining time, and uses the supplied <see cref="TimeProvider"/>.
+        /// </summary>
+        [Fact]
+        public void StartExpired_ReturnsFiniteAlreadyExpiredTimer()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+
+            // Act
+            TimeoutTimer timer = TimeoutTimer.StartExpired(fake);
+
+            // Assert
+            Assert.False(timer.IsInfinite);
+            Assert.True(timer.IsExpired);
+            Assert.Equal(0, timer.MillisecondsRemainingInt);
+            Assert.Same(fake, timer.TimeProvider);
+        }
+
+        /// <summary>
+        /// Verifies that the <see cref="CancellationTokenSource"/> produced by
+        /// an expired timer is already canceled.
+        /// </summary>
+        [Fact]
+        public void StartExpired_CreateCancellationTokenSource_IsAlreadyCanceled()
+        {
+            // Arrange
+            TimeoutTimer timer = TimeoutTimer.StartExpired(new FakeTimeProvider(DateTimeOffset.UtcNow));
+
+            // Act
+            using CancellationTokenSource cts = timer.CreateCancellationTokenSource();
+
+            // Assert
+            Assert.True(cts.IsCancellationRequested);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.StartChild"/> propagates the
+        /// parent's <see cref="TimeProvider"/> to the child so child timers see
+        /// the same virtual clock as their parent.
+        /// </summary>
+        [Fact]
+        public void StartChild_PropagatesParentTimeProvider()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider();
+            TimeoutTimer parent = TimeoutTimer.StartNew(TimeSpan.FromSeconds(30), fake);
+
+            // Act
+            TimeoutTimer child = parent.StartChild(TimeSpan.FromSeconds(5));
+
+            // Assert
+            Assert.Same(fake, child.TimeProvider);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.StartChild"/> caps the child's
+        /// duration at the parent's remaining time when the requested duration
+        /// would otherwise outlast the parent.
+        /// </summary>
+        [Fact]
+        public void StartChild_RequestedDurationLongerThanParent_IsCappedAtParentRemaining()
+        {
+            // Arrange: parent has 5 s remaining; caller asks for 30 s.
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer parent = TimeoutTimer.StartNew(TimeSpan.FromSeconds(5), fake);
+
+            // Act
+            TimeoutTimer child = parent.StartChild(TimeSpan.FromSeconds(30));
+
+            // Assert: child remaining should match parent remaining (5 s).
+            Assert.Equal(parent.MillisecondsRemainingInt, child.MillisecondsRemainingInt);
+            Assert.False(child.IsInfinite);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.StartChild"/> uses the requested
+        /// duration when it is shorter than the parent's remaining time.
+        /// </summary>
+        [Fact]
+        public void StartChild_RequestedDurationShorterThanParent_UsesRequested()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer parent = TimeoutTimer.StartNew(TimeSpan.FromSeconds(30), fake);
+
+            // Act
+            TimeoutTimer child = parent.StartChild(TimeSpan.FromSeconds(5));
+
+            // Assert
+            Assert.Equal(5_000, child.MillisecondsRemainingInt);
+            Assert.False(child.IsInfinite);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.StartChild"/> returns an
+        /// already-expired child when the parent has already expired.
+        /// </summary>
+        [Fact]
+        public void StartChild_ParentExpired_ReturnsAlreadyExpiredChild()
+        {
+            // Arrange: parent is already expired.
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer parent = TimeoutTimer.StartNew(TimeSpan.FromSeconds(1), fake);
+            fake.Advance(TimeSpan.FromSeconds(2));
+            Assert.True(parent.IsExpired);
+
+            // Act
+            TimeoutTimer child = parent.StartChild(TimeSpan.FromSeconds(30));
+
+            // Assert
+            Assert.False(child.IsInfinite);
+            Assert.True(child.IsExpired);
+            Assert.Equal(0, child.MillisecondsRemainingInt);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.StartChild"/> with an infinite
+        /// parent honors the requested finite duration rather than producing
+        /// another infinite timer.
+        /// </summary>
+        [Fact]
+        public void StartChild_InfiniteParent_UsesRequestedDuration()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer parent = TimeoutTimer.StartNew(TimeSpan.Zero, fake);
+            Assert.True(parent.IsInfinite);
+
+            // Act
+            TimeoutTimer child = parent.StartChild(TimeSpan.FromSeconds(5));
+
+            // Assert
+            Assert.False(child.IsInfinite);
+            Assert.Equal(5_000, child.MillisecondsRemainingInt);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.StartChild"/> interprets
+        /// <see cref="TimeSpan.Zero"/> literally as "expire immediately"
+        /// rather than as the infinite-timeout sentinel, even when the parent
+        /// is infinite.
+        /// </summary>
+        [Fact]
+        public void StartChild_ZeroDuration_IsLiteralAndReturnsAlreadyExpiredChild()
+        {
+            // Arrange: an infinite parent so the only way Zero could become
+            // "infinite" would be via the sentinel; verify it does not.
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer parent = TimeoutTimer.StartNew(TimeSpan.Zero, fake);
+            Assert.True(parent.IsInfinite);
+
+            // Act
+            TimeoutTimer child = parent.StartChild(TimeSpan.Zero);
+
+            // Assert
+            Assert.False(child.IsInfinite);
+            Assert.True(child.IsExpired);
+            Assert.Equal(0, child.MillisecondsRemainingInt);
+        }
+
+        // Polls the predicate on a short cadence so test runs aren't sensitive
+        // to thread-pool scheduling latency when FakeTimeProvider fires its
+        // registered timer callbacks.
+        private static async Task WaitForAsync(Func<bool> predicate)
+        {
+            for (int i = 0; i < 50; i++)
+            {
+                if (predicate())
+                {
+                    return;
+                }
+                await Task.Delay(20);
+            }
+        }
+
+        /// <summary>
+        /// Verifies that the wall-clock reading the timer derives from
+        /// <see cref="TimeProvider.System"/> matches the legacy
+        /// <see cref="ADP.TimerCurrent"/> reading. Both are expected to return
+        /// UTC "now" expressed in file-time ticks (100 ns since 1601-01-01 UTC),
+        /// so two back-to-back samples should differ by no more than a small
+        /// scheduling jitter.
+        /// </summary>
+        [Fact]
+        public void SystemTimeProvider_AgreesWithAdpTimerCurrent()
+        {
+            // 50 ms in file-time ticks. Generous enough to absorb GC pauses
+            // and CI jitter while still being far smaller than any meaningful
+            // timeout this class is used for.
+            const long ToleranceTicks = 50 * TimeSpan.TicksPerMillisecond;
+
+            // Sample both clocks back-to-back, then bracket the TimeoutTimer
+            // reading between two ADP readings.
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(1));
+            long adpBefore = ADP.TimerCurrent();
+            long providerNow = timer.NowTicks();
+            long adpAfter = ADP.TimerCurrent();
+
+            Assert.InRange(providerNow, adpBefore - ToleranceTicks, adpAfter + ToleranceTicks);
+        }
+
+        /// <summary>
+        /// Verifies the same equivalence end-to-end: a timer started with
+        /// <see cref="TimeProvider.System"/> places its <c>ExpirationTicks</c>
+        /// at <c>ADP.TimerCurrent() + duration</c> within scheduling jitter.
+        /// This is the relationship legacy callers depend on when comparing
+        /// <c>TimeoutTimer.ExpirationTicks</c> against <see cref="ADP.TimerCurrent"/>.
+        /// </summary>
+        [Fact]
+        public void StartNew_WithSystemTimeProvider_ExpirationMatchesAdpClock()
+        {
+            const long ToleranceTicks = 50 * TimeSpan.TicksPerMillisecond;
+            TimeSpan duration = TimeSpan.FromSeconds(30);
+
+            long adpBefore = ADP.TimerCurrent();
+            TimeoutTimer timer = TimeoutTimer.StartNew(duration);
+            long adpAfter = ADP.TimerCurrent();
+
+            Assert.InRange(
+                timer.ExpirationTicks,
+                adpBefore + duration.Ticks - ToleranceTicks,
+                adpAfter + duration.Ticks + ToleranceTicks);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.MillisecondsRemaining"/>
+        /// (the <see cref="long"/> variant) counts down as virtual time
+        /// elapses and reports the full original duration when no time has
+        /// passed yet.
+        /// </summary>
+        [Fact]
+        public void MillisecondsRemaining_Long_DecreasesAsTimeElapses()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(10), fake);
+            Assert.Equal(10_000L, timer.MillisecondsRemaining);
+
+            // Act
+            fake.Advance(TimeSpan.FromSeconds(3));
+
+            // Assert
+            Assert.Equal(7_000L, timer.MillisecondsRemaining);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.MillisecondsRemaining"/>
+        /// floors at zero (rather than going negative) once the timer's
+        /// deadline has passed.
+        /// </summary>
+        [Fact]
+        public void MillisecondsRemaining_Long_IsZeroAfterExpiration()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(1), fake);
+
+            // Act
+            fake.Advance(TimeSpan.FromSeconds(5));
+
+            // Assert
+            Assert.True(timer.IsExpired);
+            Assert.Equal(0L, timer.MillisecondsRemaining);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.MillisecondsRemaining"/>
+        /// reports <see cref="long.MaxValue"/> for an infinite timer, even
+        /// after a large amount of virtual time has elapsed.
+        /// </summary>
+        [Fact]
+        public void MillisecondsRemaining_Long_InfiniteTimer_ReturnsMaxValue()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.Zero, fake);
+            Assert.True(timer.IsInfinite);
+
+            // Act
+            fake.Advance(TimeSpan.FromHours(1));
+
+            // Assert
+            Assert.Equal(long.MaxValue, timer.MillisecondsRemaining);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.MillisecondsRemainingInt"/>
+        /// reports <see cref="int.MaxValue"/> for an infinite timer.
+        /// </summary>
+        [Fact]
+        public void MillisecondsRemainingInt_InfiniteTimer_ReturnsMaxValue()
+        {
+            // Arrange
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.Zero, fake);
+            Assert.True(timer.IsInfinite);
+
+            // Assert
+            Assert.Equal(int.MaxValue, timer.MillisecondsRemainingInt);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="TimeoutTimer.MillisecondsRemainingInt"/>
+        /// saturates at <see cref="int.MaxValue"/> when the remaining time
+        /// would otherwise overflow a 32-bit integer (anything beyond ~24.8
+        /// days), while <see cref="TimeoutTimer.MillisecondsRemaining"/>
+        /// reports the full <see cref="long"/> value.
+        /// </summary>
+        [Fact]
+        public void MillisecondsRemainingInt_LargeDuration_SaturatesAtMaxValue()
+        {
+            // Arrange: a finite duration that exceeds int.MaxValue ms.
+            TimeSpan longDuration = TimeSpan.FromMilliseconds((long)int.MaxValue + 1_000L);
+            var fake = new FakeTimeProvider(DateTimeOffset.UtcNow);
+            TimeoutTimer timer = TimeoutTimer.StartNew(longDuration, fake);
+
+            // Assert
+            Assert.False(timer.IsInfinite);
+            Assert.Equal(int.MaxValue, timer.MillisecondsRemainingInt);
+            Assert.Equal((long)longDuration.TotalMilliseconds, timer.MillisecondsRemaining);
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index 18e12aa368..ea3e2d3da7 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -495,6 +495,7 @@ public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint e
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
+        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]

From 0521cdea3baf4a175e819922c4591eef49707b3d Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Wed, 3 Jun 2026 04:27:59 -0500
Subject: [PATCH 126/298] Test | Break Up SqlBulkCopyTest (#4076)

* Break down SqlBulkCopyTest.cs and distribute test attributes to the test methods.

* Replace calls to mirrors of DataTestUtility members with direct references to DataTestUtility.

* Move bulk copy tests to the root of the project.

* Correct namespaces for bulk copy tests

* SqlBulkCopyTest.ConnectionString -> DataTestUtility.TCPConnectionString
SqlBulkCopyTest.AddGuid -> DataTestUtility.GetShortName

* Try bug84548 on azure server
---
 .../AdjustPrecScaleForBulkCopy.cs             |   5 +-
 .../AzureDistributedTransaction.cs            |  10 +-
 .../SqlBulkCopyTest => BulkCopy}/Bug84548.cs  |  10 +-
 .../SqlBulkCopyTest => BulkCopy}/Bug85007.cs  |  10 +-
 .../SqlBulkCopyTest => BulkCopy}/Bug903514.cs |   8 +-
 .../SqlBulkCopyTest => BulkCopy}/Bug98182.cs  |  11 +-
 .../CacheMetadata.cs                          |  54 ++-
 .../CheckConstraints.cs                       |  10 +-
 .../ColumnCollation.cs                        |   9 +-
 .../CopyAllFromReader.cs                      |  10 +-
 .../CopyAllFromReader1.cs                     |  12 +-
 .../CopyAllFromReaderAsync.cs                 |  11 +-
 .../CopyAllFromReaderCancelAsync.cs           |  10 +-
 .../CopyAllFromReaderConnectionCloseAsync.cs  |   9 +-
 ...llFromReaderConnectionCloseOnEventAsync.cs |  10 +-
 .../CopyMultipleReaders.cs                    |  10 +-
 .../CopySomeFromDatatable.cs                  |  10 +-
 .../CopySomeFromDatatableAsync.cs             |   9 +-
 .../CopySomeFromReader.cs                     |  10 +-
 .../CopySomeFromRowArray.cs                   |  10 +-
 .../CopySomeFromRowArrayAsync.cs              |   9 +-
 .../CopyVariants.cs                           |   9 +-
 .../CopyWidenNullInexactNumerics.cs           |  10 +-
 .../CopyWithEvent.cs                          |  10 +-
 .../CopyWithEvent1.cs                         |  11 +-
 .../CopyWithEventAsync.cs                     |  10 +-
 .../DataConversionErrorMessageTest.cs         |   7 +-
 .../DestinationTableNameWithSpecialChar.cs    |   9 +-
 .../ErrorOnRowsMarkedAsDeleted.cs             |  10 +-
 .../FireTrigger.cs                            |   9 +-
 .../SqlBulkCopyTest => BulkCopy}/Helpers.cs   |   3 +-
 .../HiddenTargetColumn.cs                     |   4 +-
 .../InvalidAccessFromEvent.cs                 |  10 +-
 .../SqlBulkCopyTest => BulkCopy}/KeepNulls.cs |  15 +-
 .../MissingTargetColumn.cs                    |  10 +-
 .../MissingTargetColumns.cs                   |  10 +-
 .../MissingTargetTable.cs                     |   9 +-
 .../SqlBulkCopyTest => BulkCopy}/OrderHint.cs |  13 +-
 .../OrderHintAsync.cs                         |  15 +-
 .../OrderHintDuplicateColumn.cs               |  12 +-
 .../OrderHintIdentityColumn.cs                |  13 +-
 .../OrderHintMissingTargetColumn.cs           |  12 +-
 .../OrderHintTransaction.cs                   |  15 +-
 .../SpecialCharacterNames.cs                  |  12 +-
 .../SqlGraphTables.cs                         |   3 +-
 .../SqlBulkCopyTest => BulkCopy}/TableLock.cs |  15 +-
 .../TestBulkCopyWithUTF8.cs                   |   3 +-
 .../Transaction.cs                            |  10 +-
 .../Transaction1.cs                           |  10 +-
 .../Transaction2.cs                           |   9 +-
 .../Transaction3.cs                           |  10 +-
 .../Transaction4.cs                           |  10 +-
 .../TransactionTestAsync.cs                   |   9 +-
 .../WriteToServerTest.cs                      |   4 +-
 ...icrosoft.Data.SqlClient.ManualTests.csproj | 109 +++---
 .../SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs    | 366 ------------------
 56 files changed, 475 insertions(+), 568 deletions(-)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/AdjustPrecScaleForBulkCopy.cs (96%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/AzureDistributedTransaction.cs (84%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/Bug84548.cs (87%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/Bug85007.cs (91%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/Bug903514.cs (86%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/Bug98182.cs (84%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CacheMetadata.cs (86%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CheckConstraints.cs (84%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/ColumnCollation.cs (83%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyAllFromReader.cs (91%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyAllFromReader1.cs (80%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyAllFromReaderAsync.cs (84%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyAllFromReaderCancelAsync.cs (83%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyAllFromReaderConnectionCloseAsync.cs (82%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyAllFromReaderConnectionCloseOnEventAsync.cs (86%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyMultipleReaders.cs (83%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopySomeFromDatatable.cs (84%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopySomeFromDatatableAsync.cs (86%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopySomeFromReader.cs (79%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopySomeFromRowArray.cs (81%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopySomeFromRowArrayAsync.cs (85%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyVariants.cs (92%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyWidenNullInexactNumerics.cs (86%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyWithEvent.cs (86%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyWithEvent1.cs (86%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/CopyWithEventAsync.cs (88%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/DataConversionErrorMessageTest.cs (97%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/DestinationTableNameWithSpecialChar.cs (86%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/ErrorOnRowsMarkedAsDeleted.cs (93%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/FireTrigger.cs (85%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/Helpers.cs (97%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/HiddenTargetColumn.cs (96%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/InvalidAccessFromEvent.cs (91%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/KeepNulls.cs (72%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/MissingTargetColumn.cs (79%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/MissingTargetColumns.cs (80%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/MissingTargetTable.cs (81%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/OrderHint.cs (92%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/OrderHintAsync.cs (89%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/OrderHintDuplicateColumn.cs (84%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/OrderHintIdentityColumn.cs (84%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/OrderHintMissingTargetColumn.cs (86%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/OrderHintTransaction.cs (78%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/SpecialCharacterNames.cs (80%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/SqlGraphTables.cs (98%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/TableLock.cs (72%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/TestBulkCopyWithUTF8.cs (98%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/Transaction.cs (79%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/Transaction1.cs (80%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/Transaction2.cs (83%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/Transaction3.cs (83%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/Transaction4.cs (78%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/TransactionTestAsync.cs (83%)
 rename src/Microsoft.Data.SqlClient/tests/ManualTests/{SQL/SqlBulkCopyTest => BulkCopy}/WriteToServerTest.cs (98%)
 delete mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AdjustPrecScaleForBulkCopy.cs
similarity index 96%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AdjustPrecScaleForBulkCopy.cs
index 49912202d6..6fdd82a6a1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AdjustPrecScaleForBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AdjustPrecScaleForBulkCopy.cs
@@ -5,10 +5,11 @@
 using System;
 using System.Data;
 using System.Data.SqlTypes;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Microsoft.Data.SqlClient.Tests.Common;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public static class AdjustPrecScaleForBulkCopy
     {
@@ -29,7 +30,7 @@ public static void RunTest()
             Assert.Equal("12.3", value.ToString());
 
             value = BulkCopySqlDecimalToTable(new SqlDecimal(123.45), 10, 2, 4, 1);
-            
+
             bool? truncate = appContextSwitches.TruncateScaledDecimal;
             if (truncate.HasValue && truncate.Value)
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AzureDistributedTransaction.cs
similarity index 84%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AzureDistributedTransaction.cs
index 2a853d7ed4..e767d5e6eb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/AzureDistributedTransaction.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AzureDistributedTransaction.cs
@@ -1,12 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Transactions;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class AzureDistributedTransaction
     {
@@ -15,8 +16,9 @@ public class AzureDistributedTransaction
         private static readonly string s_createTableCmd = $"CREATE TABLE {s_tableName} (NAME NVARCHAR(40), AGE INT)";
         private static readonly string s_sqlBulkCopyCmd = "SELECT * FROM(VALUES ('Fuller', 33), ('Davon', 49)) AS q (FirstName, Age)";
         private static readonly int s_commandTimeout = 30;
-
-        public static void Test()
+        // Synapse: Promote Transaction not supported by Azure Synapse
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAzureServer))]
+        public void Test()
         {
             try
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug84548.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs
similarity index 87%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug84548.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs
index 48c65a4247..02ac15a4c4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug84548.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs
@@ -3,13 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Bug84548
     {
-        public static void Test(string srcConstr, string dstConstr, string targettable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string targettable = DataTestUtility.GetShortName("SqlBulkCopyTest_Bug84548", false);
             string targetCustomerTable = targettable + "_customer";
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug85007.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs
similarity index 91%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug85007.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs
index 26d9db5bda..05eb812bbb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug85007.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs
@@ -3,13 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Bug85007
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Bug85007", false);
             string targetCustomerTable = dstTable + "_customer";
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug903514.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs
similarity index 86%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug903514.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs
index c1a1f9824c..2e51711339 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug903514.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs
@@ -4,14 +4,18 @@
 
 using System;
 using System.Data;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Bug903514
     {
-        public static void Test(string constr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string constr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Bug903514", false);
             using (SqlConnection dstConn = new SqlConnection(constr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug98182.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs
similarity index 84%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug98182.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs
index c6e629b40a..49699a81b7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Bug98182.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs
@@ -3,13 +3,18 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Bug98182
     {
-        public static void Test(string constr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string constr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("@SqlBulkCopyTest_Bug98182 ", false);
             string srctable = "[" + dstTable + " src]";
             dstTable = "[" + dstTable + "]";
 
@@ -47,7 +52,7 @@ public static void Test(string constr, string dstTable)
                                 ColumnMappings.Add("col 2", "[col 2]");
 
                                 bulkcopy.WriteToServer(reader);
-                                
+
                                 DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 1, "Unexpected number of rows.");
                             }
                             Helpers.VerifyResults(dstConn, dstTable, 2, 1);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CacheMetadata.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs
similarity index 86%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CacheMetadata.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs
index 36f37fc2e7..15f591524d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CacheMetadata.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs
@@ -5,9 +5,10 @@
 using System;
 using System.Data;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CacheMetadata
     {
@@ -16,8 +17,12 @@ public class CacheMetadata
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
 
         // Test that CacheMetadata option works for multiple WriteToServer calls to the same table.
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadata", false);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
@@ -76,8 +81,12 @@ public class CacheMetadataInvalidate
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
 
         // Test that ClearCachedMetadata forces a fresh metadata query.
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataInvalidate", false);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
@@ -128,8 +137,13 @@ public class CacheMetadataDestinationChange
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
 
         // Test that changing DestinationTableName invalidates the cache and works correctly with a new table.
-        public static void Test(string srcConstr, string dstConstr, string dstTable1, string dstTable2)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable1 = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataDstChange0", false);
+            string dstTable2 = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataDstChange1", false);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
             string initialQuery1 = string.Format(initialQueryTemplate, dstTable1);
             string initialQuery2 = string.Format(initialQueryTemplate, dstTable2);
@@ -182,8 +196,12 @@ public class CacheMetadataWithoutFlag
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
 
         // Test that without the CacheMetadata flag, multiple writes still work (no regression).
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataNoFlag", false);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
@@ -230,8 +248,11 @@ public class CacheMetadataWithDataTable
         private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(50), col3 nvarchar(50))";
 
         // Test that CacheMetadata works with DataTable source as well as IDataReader.
-        public static void Test(string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataDT", false);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using DataTable sourceData = new();
@@ -275,8 +296,11 @@ public class CacheMetadataColumnMappingsChange
         // Test that changing ColumnMappings between WriteToServer calls works correctly with CacheMetadata.
         // The cached metadata describes the destination table schema, not the column mappings,
         // so modifying mappings between calls should work without cache invalidation.
-        public static void Test(string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataColMap", false);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using DataTable sourceData = new DataTable();
@@ -348,8 +372,11 @@ public class CacheMetadataColumnSubsetChange
         // second call, works correctly with CacheMetadata. This verifies that null-pruning of
         // unmatched columns in AnalyzeTargetAndCreateUpdateBulkCommand does not mutate the
         // cached metadata, which would cause a NullReferenceException on the second call.
-        public static void Test(string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataSubset", false);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using DataTable sourceData = new DataTable();
@@ -407,8 +434,12 @@ public class CacheMetadataAsync
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
 
         // Test that CacheMetadata works correctly with WriteToServerAsync.
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataAsync", false);
             Task t = TestAsync(srcConstr, dstConstr, dstTable);
             t.Wait();
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
@@ -472,8 +503,11 @@ public class CacheMetadataCombinedWithKeepNulls
         private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(50) default 'DefaultVal', col3 nvarchar(50))";
 
         // Test that CacheMetadata works correctly when combined with other SqlBulkCopyOptions.
-        public static void Test(string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataKeepNulls", false);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using DataTable sourceData = new();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CheckConstraints.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs
similarity index 84%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CheckConstraints.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs
index ed1a57ba91..f083cd28d1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CheckConstraints.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs
@@ -3,13 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CheckConstraints
     {
-        public static void Test(string constr, string srctable, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string constr = DataTestUtility.TCPConnectionString;
+            string srctable = DataTestUtility.GetShortName("SqlBulkCopyTest_Extensionsrc", false);
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Extensiondst", false);
             using (SqlConnection dstConn = new SqlConnection(constr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/ColumnCollation.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs
similarity index 83%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/ColumnCollation.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs
index 5e39517391..df2ccc5f6b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/ColumnCollation.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs
@@ -3,13 +3,18 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class ColumnCollation
     {
-        public static void Test(string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_ColumnCollation", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
similarity index 91%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
index 7dcb0a8111..1211d861d6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
@@ -5,9 +5,10 @@
 using System.Collections;
 using System.Data.Common;
 using System.Diagnostics;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyAllFromReader
     {
@@ -15,9 +16,12 @@ public class CopyAllFromReader
         private static readonly string sourceTable = "employees";
         private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10))";
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
-
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopyAllFromReader", false);
             Debug.Assert((int)SqlBulkCopyOptions.UseInternalTransaction == 1 << 5, "Compiler screwed up the options");
 
             dstTable = destinationTable != null ? destinationTable : dstTable;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs
similarity index 80%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader1.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs
index 9dea10c9e4..1557217f31 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReader1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs
@@ -3,13 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyAllFromReader1
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopyAllFromReader1", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
@@ -34,7 +40,7 @@ public static void Test(string srcConstr, string dstConstr, string dstTable)
                                 ColumnMappings.Add("FirstName", "col3");
 
                                 bulkcopy.WriteToServer(reader);
-                                
+
                                 DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 5, "Unexpected number of rows.");
                                 DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied64, (long)5, "Unexpected number of rows.");
                             }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs
similarity index 84%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderAsync.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs
index cdeffa2e89..ab62f4843e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs
@@ -5,14 +5,19 @@
 using System.Data.Common;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyAllFromReaderAsync
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest1", false);
             // Use this semaphore to ensure that results are written to the log in the correct order
             SemaphoreSlim outputSemaphore = new SemaphoreSlim(0, 1);
 
@@ -50,7 +55,7 @@ private static async Task TestAsync(string srcConstr, string dstConstr, string d
 
                                 await bulkcopy.WriteToServerAsync(reader);
                                 await outputSemaphore.WaitAsync();
-                                
+
                                 DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 5, "Unexpected number of rows.");
                                 DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied64, (long)5, "Unexpected number of rows.");
                             }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderCancelAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs
similarity index 83%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderCancelAsync.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs
index 3fb3d051a1..acf93a4228 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderCancelAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs
@@ -6,16 +6,20 @@
 using System.Data.Common;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyAllFromReaderCancelAsync
     {
         static CancellationTokenSource cts = null;
-
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest5", false);
             cts = new CancellationTokenSource();
             cts.Cancel();
             Task t = TestAsync(srcConstr, dstConstr, dstTable, cts.Token);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs
similarity index 82%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseAsync.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs
index ede16437d3..5cea2952cd 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs
@@ -5,14 +5,19 @@
 using System;
 using System.Data.Common;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyAllFromReaderConnectionClosedAsync
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest6", false);
             Task t = TestAsync(srcConstr, dstConstr, dstTable);
             DataTestUtility.AssertThrowsInner<AggregateException, InvalidOperationException>(() => t.Wait());
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseOnEventAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
similarity index 86%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseOnEventAsync.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
index 3d832925a6..89b354c3b2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyAllFromReaderConnectionCloseOnEventAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
@@ -5,13 +5,19 @@
 using System;
 using System.Data.Common;
 using System.IO;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyAllFromReaderConnectionClosedOnEventAsync
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest7", false);
 #if DEBUG
             string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 varchar(8000))";
             string sourceQuery = "select EmployeeID, LastName, FirstName, REPLICATE('a', 8000) from employees";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyMultipleReaders.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs
similarity index 83%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyMultipleReaders.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs
index a9c41818f3..f97020024a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyMultipleReaders.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs
@@ -3,13 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyMultipleReaders
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopyMultipleReaders", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromDatatable.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs
similarity index 84%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromDatatable.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs
index b0306fa278..f380dbcf41 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromDatatable.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs
@@ -3,13 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopySomeFromDataTable
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopySomeFromDataTable", false);
             DataSet dataset;
             SqlDataAdapter adapter;
             DataTable datatable;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromDatatableAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs
similarity index 86%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromDatatableAsync.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs
index 0942ddb723..afac0b87b3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromDatatableAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs
@@ -5,14 +5,19 @@
 using System.Data;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopySomeFromDataTableAsync
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest3", false);
             // Use this semaphore to ensure that results are written to the log in the correct order
             SemaphoreSlim outputSemaphore = new SemaphoreSlim(0, 1);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs
similarity index 79%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromReader.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs
index a2b3c9f005..ada0ea4d1e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs
@@ -3,13 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopySomeFromReader
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopySomeFromReader", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromRowArray.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs
similarity index 81%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromRowArray.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs
index 8093f9f3e1..5a3975ca22 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromRowArray.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs
@@ -3,13 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopySomeFromRowArray
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopySomeFromRowArray", false);
             DataSet dataset;
             SqlDataAdapter adapter;
             DataTable datatable;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromRowArrayAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs
similarity index 85%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromRowArrayAsync.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs
index de275989ff..20349dd153 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopySomeFromRowArrayAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs
@@ -5,14 +5,19 @@
 using System.Data;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopySomeFromRowArrayAsync
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest2", false);
             // Use this semaphore to ensure that results are written to the log in the correct order
             SemaphoreSlim outputSemaphore = new SemaphoreSlim(0, 1);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyVariants.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs
similarity index 92%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyVariants.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs
index 1670c097db..6126a50c1a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyVariants.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs
@@ -3,13 +3,18 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyVariants
     {
-        public static void Test(string constr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string constr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Variants", false);
             string[] prologue =
             {
                 "create table " + dstTable + "_src (col_1 int primary key, col_2 sql_variant)",
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWidenNullInexactNumerics.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWidenNullInexactNumerics.cs
similarity index 86%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWidenNullInexactNumerics.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWidenNullInexactNumerics.cs
index f961521233..9fd56392c3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWidenNullInexactNumerics.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWidenNullInexactNumerics.cs
@@ -1,17 +1,21 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Collections.Generic;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyWidenNullInexactNumerics
     {
-        public static void Test(string sourceDatabaseConnectionString, string destinationDatabaseConnectionString)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string sourceDatabaseConnectionString = DataTestUtility.TCPConnectionString;
+            string destinationDatabaseConnectionString = DataTestUtility.TCPConnectionString;
             string sourceTableName = DataTestUtility.GetLongName("BCP_SRC");
             string destTableName = DataTestUtility.GetLongName("BCP_DST");
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEvent.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs
similarity index 86%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEvent.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs
index 284b82e8c5..00aae3c5a9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEvent.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs
@@ -3,9 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyWithEvent
     {
@@ -17,9 +18,12 @@ protected static void OnRowCopied(object sender, SqlRowsCopiedEventArgs e)
             Assert.True(currentRowCopyResult < ExpectedRowCopiedResults.Length, "More row copies than expected!");
             DataTestUtility.AssertEqualsWithDescription(ExpectedRowCopiedResults[currentRowCopyResult++], e.RowsCopied, "Unexpected Rows Copied count.");
         }
-
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopyWithEvent", false);
             DataSet dataset;
             SqlDataAdapter adapter;
             DataTable datatable;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEvent1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs
similarity index 86%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEvent1.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs
index 8bc72435d0..60d4dc5774 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEvent1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs
@@ -3,14 +3,14 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyWithEvent1
     {
         private static SqlBulkCopy bulkcopy;
-
         private static readonly long[] ExpectedRowCopiedResults = { 50, 100 };
         private static int currentRowCopyResult = 0;
 
@@ -32,9 +32,12 @@ private static void OnRowCopied(object sender, SqlRowsCopiedEventArgs e)
                 bulkcopy.NotifyAfter = 10; // decrease notification frequency
             }
         }
-
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopyWithEvent1", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEventAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs
similarity index 88%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEventAsync.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs
index 60e3ee0583..24cad97bf0 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/CopyWithEventAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs
@@ -5,9 +5,10 @@
 using System.Data;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class CopyWithEventAsync
     {
@@ -19,9 +20,12 @@ private static void OnRowCopied(object sender, SqlRowsCopiedEventArgs e)
             Assert.True(currentRowCopyResult < ExpectedRowCopiedResults.Length, "More row copies than expected!");
             DataTestUtility.AssertEqualsWithDescription(ExpectedRowCopiedResults[currentRowCopyResult++], e.RowsCopied, "Unexpected Rows Copied count.");
         }
-
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest4", false);
             // Use this semaphore to ensure that results are written to the log in the correct order
             SemaphoreSlim outputSemaphore = new SemaphoreSlim(0, 1);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs
similarity index 97%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs
index 4a722dd409..bb9af9d2fd 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DataConversionErrorMessageTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs
@@ -5,9 +5,10 @@
 using System;
 using System.Data;
 using System.Text;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     internal enum ColumnsEnum
     {
@@ -101,8 +102,8 @@ public DataConversionErrorMessageTest(InitialDatabase fixture)
             _fixture = fixture;
         }
 
-        // Synapse: Column count in target table does not match column count specified in input. 
-        //          If BCP command, ensure format file column count matches destination table. 
+        // Synapse: Column count in target table does not match column count specified in input.
+        //          If BCP command, ensure format file column count matches destination table.
         //          If SSIS data import, check column mappings are consistent with target.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public void StringToIntErrorMessageTest()
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DestinationTableNameWithSpecialChar.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs
similarity index 86%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DestinationTableNameWithSpecialChar.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs
index ce0cff6ae0..301f272190 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/DestinationTableNameWithSpecialChar.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs
@@ -3,13 +3,18 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class DestinationTableNameWithSpecialChar
     {
-        public static void Test(string constr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public void Test()
         {
+            string constr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_DestinationTableNameWithSpecialChar", false);
             string srctable = "[" + dstTable + "src]";
             string dsttable = "@" + dstTable;       // a tablename that cannot be created without brackets (e.g., @sometablename)
             string[] dsttablecombo =
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/ErrorOnRowsMarkedAsDeleted.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs
similarity index 93%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/ErrorOnRowsMarkedAsDeleted.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs
index 85e08190ef..d52c62947e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/ErrorOnRowsMarkedAsDeleted.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs
@@ -5,8 +5,10 @@
 using System;
 using System.Data;
 using System.Text;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     /// <summary>
     /// Test case for SqlBulkEdit raising exception on rows marked as deleted
@@ -25,9 +27,11 @@ enum SqlBulkCopyInputType
             DataTable,
             RowsList
         }
-
-        public static void Test(string dstConstr, string targettable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string targettable = DataTestUtility.GetShortName("SqlBulkCopyTest_ErrorOnRowsMarkedAsDeleted", false);
             using (SqlConnection destConn = new SqlConnection(dstConstr))
             {
                 destConn.Open();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/FireTrigger.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs
similarity index 85%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/FireTrigger.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs
index a57217cb09..321cd5b738 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/FireTrigger.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs
@@ -3,14 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class FireTrigger
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_FireTrigger", false);
             string dstTable1 = dstTable + "_1"; // this table will receive a value if the trigger fires!
             string trigger = dstTable + "_2";
             string[] prologue =
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Helpers.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Helpers.cs
similarity index 97%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Helpers.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Helpers.cs
index e28a1d02b5..274750bc09 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Helpers.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Helpers.cs
@@ -4,8 +4,9 @@
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Helpers
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/HiddenTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs
similarity index 96%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/HiddenTargetColumn.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs
index 1322120b55..50c56dbd02 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/HiddenTargetColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs
@@ -2,11 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SqlBulkCopyTests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class HiddenTargetColumn
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/InvalidAccessFromEvent.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs
similarity index 91%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/InvalidAccessFromEvent.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs
index c22039c2de..bcc3a50471 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/InvalidAccessFromEvent.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs
@@ -4,9 +4,10 @@
 
 using System;
 using System.Data;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class InvalidAccessFromEvent
     {
@@ -47,9 +48,12 @@ protected static void OnRowCopiedBulkCopy(object sender, SqlRowsCopiedEventArgs
         {
             InnerTest(null);
         }
-
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_InvalidAccessFromEvent", false);
             _dstConstr = dstConstr;
             _dstTable = dstTable;
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/KeepNulls.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs
similarity index 72%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/KeepNulls.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs
index 0c054dd1f4..7067cf5d7b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/KeepNulls.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs
@@ -1,15 +1,22 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
-    class KeepNulls
+    public class KeepNulls
     {
-        public static void Test(string srcconstr, string dstconstr, string srctable, string dsttable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcconstr = DataTestUtility.TCPConnectionString;
+            string dstconstr = DataTestUtility.TCPConnectionString;
+            string srctable = DataTestUtility.GetShortName("SqlBulkCopyTest_KeepNulls0", false);
+            string dsttable = DataTestUtility.GetShortName("SqlBulkCopyTest_KeepNulls1", false);
             using SqlConnection destConn = new(dstconstr);
             destConn.Open();
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs
similarity index 79%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumn.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs
index e4df366137..c3e0f62789 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs
@@ -4,13 +4,19 @@
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class MissingTargetColumn
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_MissingTargetColumn", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumns.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs
similarity index 80%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumns.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs
index 5fb47f44c1..9265263b5d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetColumns.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs
@@ -4,13 +4,19 @@
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class MissingTargetColumns
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_MissingTargetColumns", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetTable.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs
similarity index 81%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetTable.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs
index 0592f2cb09..a440771203 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/MissingTargetTable.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs
@@ -4,14 +4,19 @@
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class MissingTargetTable
     {
-        public static void Test(string srcConstr, string dstConstr, string targetTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string targetTable = DataTestUtility.GetShortName("@SqlBulkCopyTest_MissingTargetTable", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHint.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHint.cs
similarity index 92%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHint.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHint.cs
index fbfbb57ecd..77512a4fdd 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHint.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHint.cs
@@ -1,13 +1,14 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class OrderHint
     {
@@ -18,9 +19,13 @@ public class OrderHint
         private static readonly string sourceQueryTemplate = "SELECT CustomerID, CompanyName, ContactName FROM {0}";
         private static readonly string sourceQueryTemplate2 = "SELECT LastName, FirstName FROM {0}";
         private static readonly string getRowCountQueryTemplate = "SELECT COUNT(*) FROM {0}";
-
-        public static void Test(string connStr, string dstTable, string dstTable2)
+        // TODO Synapse: Remove dependency on Northwind database
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        public void Test()
         {
+            string connStr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_OrderHint", false);
+            string dstTable2 = DataTestUtility.GetShortName("SqlBulkCopyTest_OrderHint2", false);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
             string sourceQuery2 = string.Format(sourceQueryTemplate2, sourceTable2);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintAsync.cs
similarity index 89%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintAsync.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintAsync.cs
index c818200864..7b84097c1f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintAsync.cs
@@ -1,14 +1,14 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Data;
 using System.Data.Common;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class OrderHintAsync
     {
@@ -19,9 +19,14 @@ public class OrderHintAsync
         private static readonly string sourceQueryTemplate = "SELECT CustomerID, CompanyName, ContactName FROM {0}";
         private static readonly string sourceQueryTemplate2 = "SELECT LastName, FirstName FROM {0}";
         private static readonly string getRowCountQueryTemplate = "SELECT COUNT(*) FROM {0}";
-
-        public static void Test(string srcConstr, string dstTable, string dstTable2)
+        // Synapse: Cannot create more than one clustered index on table '<table_name>'.
+        // Drop the existing clustered index 'ClusteredIndex_fe3d8c967ac142468ec4f81ff1faaa50' before creating another.
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_OrderHintAsync", false);
+            string dstTable2 = DataTestUtility.GetShortName("SqlBulkCopyTest_OrderHintAsync2", false);
             Task t = TestAsync(srcConstr, dstTable, dstTable2);
             t.Wait();
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintDuplicateColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintDuplicateColumn.cs
similarity index 84%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintDuplicateColumn.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintDuplicateColumn.cs
index ebed5e9918..0b15f4e063 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintDuplicateColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintDuplicateColumn.cs
@@ -1,12 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class OrderHintDuplicateColumn
     {
@@ -14,9 +15,12 @@ public class OrderHintDuplicateColumn
         private static readonly string initialQueryTemplate = "create table {0} (CustomerID nvarchar(50), CompanyName nvarchar(50), ContactName nvarchar(50))";
         private static readonly string sourceQueryTemplate = "SELECT CustomerID, CompanyName, ContactName FROM {0}";
         private static readonly string getRowCountQueryTemplate = "SELECT COUNT(*) FROM {0}";
-
-        public static void Test(string connStr, string dstTable)
+        // Synapse: Remove dependency on Northwind database.
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        public void Test()
         {
+            string connStr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_OrderHintDuplicateColumn", false);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
             string getRowCountQuery = string.Format(getRowCountQueryTemplate, sourceTable);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintIdentityColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintIdentityColumn.cs
similarity index 84%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintIdentityColumn.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintIdentityColumn.cs
index 04cd1977b4..4bc75496ee 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintIdentityColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintIdentityColumn.cs
@@ -1,11 +1,13 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class OrderHintIdentityColumn
     {
@@ -13,9 +15,12 @@ public class OrderHintIdentityColumn
         private static readonly string initialQueryTemplate = "create table {0} (CustomerID int IDENTITY NOT NULL, CompanyName nvarchar(50), ContactName nvarchar(50))";
         private static readonly string sourceQueryTemplate = "SELECT CustomerId, CompanyName, ContactName FROM {0}";
         private static readonly string getRowCountQueryTemplate = "SELECT COUNT(*) FROM {0}";
-
-        public static void Test(string connStr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [ActiveIssue("12219")]
+        public void Test()
         {
+            string connStr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_OrderHintIdentityColumn", false);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
             string getRowCountQuery = string.Format(getRowCountQueryTemplate, sourceTable);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintMissingTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintMissingTargetColumn.cs
similarity index 86%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintMissingTargetColumn.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintMissingTargetColumn.cs
index cc486e9e4e..2245453bc4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintMissingTargetColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintMissingTargetColumn.cs
@@ -1,21 +1,25 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class OrderHintMissingTargetColumn
     {
         private static readonly string sourceTable = "Customers";
         private static readonly string initialQueryTemplate = "create table {0} (CustomerID nvarchar(50), CompanyName nvarchar(50), ContactName nvarchar(50))";
         private static readonly string sourceQueryTemplate = "SELECT CustomerID, CompanyName, ContactName FROM {0}";
-
-        public static void Test(string connStr, string dstTable)
+        // Synapse: Remove dependency on Northwind database.
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        public void Test()
         {
+            string connStr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_OrderHintMissingTargetColumn", false);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintTransaction.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs
similarity index 78%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintTransaction.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs
index 94bd28b02a..30a17024f9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/OrderHintTransaction.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs
@@ -1,19 +1,24 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
-    class OrderHintTransaction
+    public class OrderHintTransaction
     {
         private static readonly string sourceTable = "Customers";
         private static readonly string initialQueryTemplate = "create table {0} (CustomerID nvarchar(50), CompanyName nvarchar(50), ContactName nvarchar(50))";
         private static readonly string sourceQueryTemplate = "SELECT CustomerID, CompanyName, ContactName FROM {0}";
-
-        public static void Test(string connStr, string dstTable)
+        // Synapse: 111212;Operation cannot be performed within a transaction.
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        public void Test()
         {
+            string connStr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_OrderHintTransaction", false);
             string initialQuery = string.Format(initialQueryTemplate, dstTable);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SpecialCharacterNames.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs
similarity index 80%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SpecialCharacterNames.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs
index 96c50225a0..1f57f32f19 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SpecialCharacterNames.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class SpecialCharacterNames
     {
@@ -10,9 +13,12 @@ private static string EscapeIdentifier(string name)
         {
             return "[" + name.Replace("]", "]]") + "]";
         }
-
-        public static void Test(string srcConstr, string dstConstr, string dstPrefix)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstPrefix = DataTestUtility.GetShortName("@SqlBulkCopyTest_SpecialCharacterNames", false);
             // create schema and table names with special characters, with ] character escaped.
             string dstschema = dstPrefix + "_Schema'-]['']";
             dstschema = EscapeIdentifier(dstschema);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs
similarity index 98%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs
index a5b702f6b4..0c0ec9aa1a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlGraphTables.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs
@@ -3,10 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SqlBulkCopyTests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class SqlGraphTables
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TableLock.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs
similarity index 72%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TableLock.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs
index c39ffcc01e..9bddfcea17 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TableLock.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs
@@ -1,15 +1,22 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
-    class TableLock
+    public class TableLock
     {
-        public static void Test(string srcconstr, string dstconstr, string srctable, string dsttable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcconstr = DataTestUtility.TCPConnectionString;
+            string dstconstr = DataTestUtility.TCPConnectionString;
+            string srctable = DataTestUtility.GetShortName("SqlBulkCopyTest_TableLock0", false);
+            string dsttable = DataTestUtility.GetShortName("SqlBulkCopyTest_TableLock1", false);
             using SqlConnection destConn = new(dstconstr);
             destConn.Open();
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs
similarity index 98%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs
index da5287e831..db3ea66f94 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TestBulkCopyWithUTF8.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs
@@ -5,9 +5,10 @@
 using System;
 using System.Data;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     /// <summary>
     /// Validates SqlBulkCopy functionality when working with UTF-8 encoded data.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs
similarity index 79%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs
index 0738f32010..6fe82ab11e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs
@@ -4,13 +4,19 @@
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Transaction
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Transaction0", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs
similarity index 80%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction1.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs
index 930e1ac6f5..c60a76a5f7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs
@@ -4,13 +4,19 @@
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Transaction1
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Transaction1", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction2.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs
similarity index 83%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction2.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs
index 7b315afcc4..3e28ab5d72 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction2.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs
@@ -3,14 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Transaction2
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Transaction2", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction3.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs
similarity index 83%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction3.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs
index 4b65f2a5d2..0b3bd0b999 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction3.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs
@@ -4,13 +4,19 @@
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Transaction3
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Transaction3", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction4.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs
similarity index 78%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction4.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs
index 40b2d2c251..9d219187d8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/Transaction4.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs
@@ -4,13 +4,19 @@
 
 using System;
 using System.Data.Common;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Transaction4
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Transaction4", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TransactionTestAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs
similarity index 83%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TransactionTestAsync.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs
index 729dac74a9..11a1049292 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/TransactionTestAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs
@@ -5,14 +5,19 @@
 using System;
 using System.Data.Common;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class TransactionTestAsync
     {
-        public static void Test(string srcConstr, string dstConstr, string dstTable)
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public void Test()
         {
+            string srcConstr = DataTestUtility.TCPConnectionString;
+            string dstConstr = DataTestUtility.TCPConnectionString;
+            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_TransactionTestAsync", false);
             Task t = TestAsync(srcConstr, dstConstr, dstTable);
             DataTestUtility.AssertThrowsInner<AggregateException, InvalidOperationException>(() => t.Wait());
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/WriteToServerTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/WriteToServerTest.cs
similarity index 98%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/WriteToServerTest.cs
rename to src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/WriteToServerTest.cs
index 20f63a2e0a..871aaf3495 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/WriteToServerTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/WriteToServerTest.cs
@@ -2,12 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Data;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class WriteToServerTest
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 1145fa4790..83dd4a8351 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -121,61 +121,60 @@
     <Compile Include="SQL\RetryLogic\SqlCommandReliabilityTest.cs" />
     <Compile Include="SQL\RetryLogic\SqlConfigurationManagerReliabilityTest.cs" />
     <Compile Include="SQL\RetryLogic\SqlConnectionReliabilityTest.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\AdjustPrecScaleForBulkCopy.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\AzureDistributedTransaction.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\Bug84548.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\Bug85007.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\Bug903514.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\Bug98182.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CacheMetadata.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CheckConstraints.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyWidenNullInexactNumerics.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\DataConversionErrorMessageTest.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\DestinationTableNameWithSpecialChar.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\ErrorOnRowsMarkedAsDeleted.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\ColumnCollation.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyAllFromReader.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyAllFromReader1.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyAllFromReaderAsync.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyAllFromReaderCancelAsync.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyAllFromReaderConnectionCloseAsync.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyAllFromReaderConnectionCloseOnEventAsync.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyMultipleReaders.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopySomeFromDatatable.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopySomeFromDatatableAsync.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopySomeFromReader.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopySomeFromRowArray.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopySomeFromRowArrayAsync.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyVariants.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyWithEvent.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyWithEvent1.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\CopyWithEventAsync.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\FireTrigger.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\Helpers.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\HiddenTargetColumn.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\InvalidAccessFromEvent.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\KeepNulls.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\MissingTargetColumn.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\MissingTargetColumns.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\MissingTargetTable.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\OrderHint.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\OrderHintAsync.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\OrderHintDuplicateColumn.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\OrderHintIdentityColumn.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\OrderHintMissingTargetColumn.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\OrderHintTransaction.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\SpecialCharacterNames.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\SqlBulkCopyTest.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\SqlGraphTables.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\TableLock.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\TestBulkCopyWithUTF8.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\Transaction.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\Transaction1.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\Transaction2.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\Transaction3.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\Transaction4.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\TransactionTestAsync.cs" />
-    <Compile Include="SQL\SqlBulkCopyTest\WriteToServerTest.cs" />
+    <Compile Include="BulkCopy\AdjustPrecScaleForBulkCopy.cs" />
+    <Compile Include="BulkCopy\AzureDistributedTransaction.cs" />
+    <Compile Include="BulkCopy\Bug84548.cs" />
+    <Compile Include="BulkCopy\Bug85007.cs" />
+    <Compile Include="BulkCopy\Bug903514.cs" />
+    <Compile Include="BulkCopy\Bug98182.cs" />
+    <Compile Include="BulkCopy\CacheMetadata.cs" />
+    <Compile Include="BulkCopy\CheckConstraints.cs" />
+    <Compile Include="BulkCopy\CopyWidenNullInexactNumerics.cs" />
+    <Compile Include="BulkCopy\DataConversionErrorMessageTest.cs" />
+    <Compile Include="BulkCopy\DestinationTableNameWithSpecialChar.cs" />
+    <Compile Include="BulkCopy\ErrorOnRowsMarkedAsDeleted.cs" />
+    <Compile Include="BulkCopy\ColumnCollation.cs" />
+    <Compile Include="BulkCopy\CopyAllFromReader.cs" />
+    <Compile Include="BulkCopy\CopyAllFromReader1.cs" />
+    <Compile Include="BulkCopy\CopyAllFromReaderAsync.cs" />
+    <Compile Include="BulkCopy\CopyAllFromReaderCancelAsync.cs" />
+    <Compile Include="BulkCopy\CopyAllFromReaderConnectionCloseAsync.cs" />
+    <Compile Include="BulkCopy\CopyAllFromReaderConnectionCloseOnEventAsync.cs" />
+    <Compile Include="BulkCopy\CopyMultipleReaders.cs" />
+    <Compile Include="BulkCopy\CopySomeFromDatatable.cs" />
+    <Compile Include="BulkCopy\CopySomeFromDatatableAsync.cs" />
+    <Compile Include="BulkCopy\CopySomeFromReader.cs" />
+    <Compile Include="BulkCopy\CopySomeFromRowArray.cs" />
+    <Compile Include="BulkCopy\CopySomeFromRowArrayAsync.cs" />
+    <Compile Include="BulkCopy\CopyVariants.cs" />
+    <Compile Include="BulkCopy\CopyWithEvent.cs" />
+    <Compile Include="BulkCopy\CopyWithEvent1.cs" />
+    <Compile Include="BulkCopy\CopyWithEventAsync.cs" />
+    <Compile Include="BulkCopy\FireTrigger.cs" />
+    <Compile Include="BulkCopy\Helpers.cs" />
+    <Compile Include="BulkCopy\HiddenTargetColumn.cs" />
+    <Compile Include="BulkCopy\InvalidAccessFromEvent.cs" />
+    <Compile Include="BulkCopy\KeepNulls.cs" />
+    <Compile Include="BulkCopy\MissingTargetColumn.cs" />
+    <Compile Include="BulkCopy\MissingTargetColumns.cs" />
+    <Compile Include="BulkCopy\MissingTargetTable.cs" />
+    <Compile Include="BulkCopy\OrderHint.cs" />
+    <Compile Include="BulkCopy\OrderHintAsync.cs" />
+    <Compile Include="BulkCopy\OrderHintDuplicateColumn.cs" />
+    <Compile Include="BulkCopy\OrderHintIdentityColumn.cs" />
+    <Compile Include="BulkCopy\OrderHintMissingTargetColumn.cs" />
+    <Compile Include="BulkCopy\OrderHintTransaction.cs" />
+    <Compile Include="BulkCopy\SpecialCharacterNames.cs" />
+    <Compile Include="BulkCopy\SqlGraphTables.cs" />
+    <Compile Include="BulkCopy\TableLock.cs" />
+    <Compile Include="BulkCopy\TestBulkCopyWithUTF8.cs" />
+    <Compile Include="BulkCopy\Transaction.cs" />
+    <Compile Include="BulkCopy\Transaction1.cs" />
+    <Compile Include="BulkCopy\Transaction2.cs" />
+    <Compile Include="BulkCopy\Transaction3.cs" />
+    <Compile Include="BulkCopy\Transaction4.cs" />
+    <Compile Include="BulkCopy\TransactionTestAsync.cs" />
+    <Compile Include="BulkCopy\WriteToServerTest.cs" />
     <Compile Include="SQL\SqlDSEnumeratorTest\SqlDataSourceEnumeratorTest.cs" />
   </ItemGroup>
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs
deleted file mode 100644
index 90a4e5cbf3..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs
+++ /dev/null
@@ -1,366 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Xunit;
-
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests
-{
-    public class SqlBulkCopyTest
-    {
-        private string _connStr = null;
-        private static bool IsAzureServer() => !DataTestUtility.IsNotAzureServer();
-        private static bool IsNotAzureSynapse => DataTestUtility.IsNotAzureSynapse();
-        private static bool AreConnectionStringsSetup() => DataTestUtility.AreConnStringsSetup();
-
-        public SqlBulkCopyTest()
-        {
-            _connStr = DataTestUtility.TCPConnectionString;
-        }
-
-        public string AddGuid(string stringin)
-        {
-            stringin += "_" + Guid.NewGuid().ToString().Replace('-', '_');
-            return stringin;
-        }
-
-        // Synapse: Promote Transaction not supported by Azure Synapse
-        [ConditionalFact(nameof(AreConnectionStringsSetup), nameof(IsNotAzureSynapse), nameof(IsAzureServer))]
-        public void AzureDistributedTransactionTest()
-        {
-            AzureDistributedTransaction.Test();
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopyAllFromReaderTest()
-        {
-            CopyAllFromReader.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CopyAllFromReader"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopyAllFromReader1Test()
-        {
-            CopyAllFromReader1.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CopyAllFromReader1"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopyMultipleReadersTest()
-        {
-            CopyMultipleReaders.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CopyMultipleReaders"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopySomeFromReaderTest()
-        {
-            CopySomeFromReader.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CopySomeFromReader"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopySomeFromDataTableTest()
-        {
-            CopySomeFromDataTable.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CopySomeFromDataTable"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopySomeFromRowArrayTest()
-        {
-            CopySomeFromRowArray.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CopySomeFromRowArray"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopyWithEventTest()
-        {
-            CopyWithEvent.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CopyWithEvent"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopyWithEvent1Test()
-        {
-            CopyWithEvent1.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CopyWithEvent1"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void InvalidAccessFromEventTest()
-        {
-            InvalidAccessFromEvent.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_InvalidAccessFromEvent"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void Bug84548Test()
-        {
-            Bug84548.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_Bug84548"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void MissingTargetTableTest()
-        {
-            MissingTargetTable.Test(_connStr, _connStr, AddGuid("@SqlBulkCopyTest_MissingTargetTable"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void MissingTargetColumnTest()
-        {
-            MissingTargetColumn.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_MissingTargetColumn"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void MissingTargetColumnsTest()
-        {
-            MissingTargetColumns.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_MissingTargetColumns"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void Bug85007Test()
-        {
-            Bug85007.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_Bug85007"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CheckConstraintsTest()
-        {
-            CheckConstraints.Test(_connStr, AddGuid("SqlBulkCopyTest_Extensionsrc"), AddGuid("SqlBulkCopyTest_Extensiondst"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void TableLockTest()
-        {
-            TableLock.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_TableLock0"), AddGuid("SqlBulkCopyTest_TableLock1"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void KeepNullsTest()
-        {
-            KeepNulls.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_KeepNulls0"), AddGuid("SqlBulkCopyTest_KeepNulls1"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void TransactionTest()
-        {
-            Transaction.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_Transaction0"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void Transaction1Test()
-        {
-            Transaction1.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_Transaction1"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void Transaction2Test()
-        {
-            Transaction2.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_Transaction2"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void Transaction3Test()
-        {
-            Transaction3.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_Transaction3"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void Transaction4Test()
-        {
-            Transaction4.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_Transaction4"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopyVariantsTest()
-        {
-            CopyVariants.Test(_connStr, AddGuid("SqlBulkCopyTest_Variants"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void Bug98182Test()
-        {
-            Bug98182.Test(_connStr, AddGuid("@SqlBulkCopyTest_Bug98182 "));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void FireTriggerTest()
-        {
-            FireTrigger.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_FireTrigger"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void ErrorOnRowsMarkedAsDeletedTest()
-        {
-            ErrorOnRowsMarkedAsDeleted.Test(_connStr, AddGuid("SqlBulkCopyTest_ErrorOnRowsMarkedAsDeleted"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void SpecialCharacterNamesTest()
-        {
-            SpecialCharacterNames.Test(_connStr, _connStr, AddGuid("@SqlBulkCopyTest_SpecialCharacterNames"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void Bug903514Test()
-        {
-            Bug903514.Test(_connStr, AddGuid("SqlBulkCopyTest_Bug903514"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void ColumnCollationTest()
-        {
-            ColumnCollation.Test(_connStr, AddGuid("SqlBulkCopyTest_ColumnCollation"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopyAllFromReaderAsyncTest()
-        {
-            CopyAllFromReaderAsync.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_AsyncTest1")); //Async + Reader
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopySomeFromRowArrayAsyncTest()
-        {
-            CopySomeFromRowArrayAsync.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_AsyncTest2")); //Async + Some Rows
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopySomeFromDataTableAsyncTest()
-        {
-            CopySomeFromDataTableAsync.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_AsyncTest3")); //Async + Some Table
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopyWithEventAsyncTest()
-        {
-            CopyWithEventAsync.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_AsyncTest4")); //Async + Rows + Notification
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        public void CopyAllFromReaderCancelAsyncTest()
-        {
-            CopyAllFromReaderCancelAsync.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_AsyncTest5")); //Async + Reader + cancellation token
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        public void CopyAllFromReaderConnectionClosedAsyncTest()
-        {
-            CopyAllFromReaderConnectionClosedAsync.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_AsyncTest6")); //Async + Reader + Connection closed
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        public void CopyAllFromReaderConnectionClosedOnEventAsyncTest()
-        {
-            CopyAllFromReaderConnectionClosedOnEventAsync.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_AsyncTest7")); //Async + Reader + Connection closed during the event
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        public void TransactionTestAsyncTest()
-        {
-            TransactionTestAsync.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_TransactionTestAsync")); //Async + Transaction rollback
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CopyWidenNullInexactNumericsTest()
-        {
-            CopyWidenNullInexactNumerics.Test(_connStr, _connStr);
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        public void DestinationTableNameWithSpecialCharTest()
-        {
-            DestinationTableNameWithSpecialChar.Test(_connStr, AddGuid("SqlBulkCopyTest_DestinationTableNameWithSpecialChar"));
-        }
-
-        // TODO Synapse: Remove dependency on Northwind database
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
-        public void OrderHintTest()
-        {
-            OrderHint.Test(_connStr, AddGuid("SqlBulkCopyTest_OrderHint"), AddGuid("SqlBulkCopyTest_OrderHint2"));
-        }
-
-        // Synapse: Cannot create more than one clustered index on table '<table_name>'.
-        // Drop the existing clustered index 'ClusteredIndex_fe3d8c967ac142468ec4f81ff1faaa50' before creating another.
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
-        public void OrderHintAsyncTest()
-        {
-            OrderHintAsync.Test(_connStr, AddGuid("SqlBulkCopyTest_OrderHintAsync"), AddGuid("SqlBulkCopyTest_OrderHintAsync2"));
-        }
-
-        // Synapse: Remove dependency on Northwind database.
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
-        public void OrderHintMissingTargetColumnTest()
-        {
-            OrderHintMissingTargetColumn.Test(_connStr, AddGuid("SqlBulkCopyTest_OrderHintMissingTargetColumn"));
-        }
-
-        // Synapse: Remove dependency on Northwind database.
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
-        public void OrderHintDuplicateColumnTest()
-        {
-            OrderHintDuplicateColumn.Test(_connStr, AddGuid("SqlBulkCopyTest_OrderHintDuplicateColumn"));
-        }
-
-        // Synapse: 111212;Operation cannot be performed within a transaction.
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
-        public void OrderHintTransactionTest()
-        {
-            OrderHintTransaction.Test(_connStr, AddGuid("SqlBulkCopyTest_OrderHintTransaction"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [ActiveIssue("12219")]
-        public void OrderHintIdentityColumnTest()
-        {
-            OrderHintIdentityColumn.Test(_connStr, AddGuid("SqlBulkCopyTest_OrderHintIdentityColumn"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CacheMetadataTest()
-        {
-            CacheMetadata.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CacheMetadata"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CacheMetadataInvalidateTest()
-        {
-            CacheMetadataInvalidate.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CacheMetadataInvalidate"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CacheMetadataDestinationChangeTest()
-        {
-            CacheMetadataDestinationChange.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CacheMetadataDstChange0"), AddGuid("SqlBulkCopyTest_CacheMetadataDstChange1"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CacheMetadataWithoutFlagTest()
-        {
-            CacheMetadataWithoutFlag.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CacheMetadataNoFlag"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CacheMetadataWithDataTableTest()
-        {
-            CacheMetadataWithDataTable.Test(_connStr, AddGuid("SqlBulkCopyTest_CacheMetadataDT"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CacheMetadataColumnMappingsChangeTest()
-        {
-            CacheMetadataColumnMappingsChange.Test(_connStr, AddGuid("SqlBulkCopyTest_CacheMetadataColMap"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CacheMetadataColumnSubsetChangeTest()
-        {
-            CacheMetadataColumnSubsetChange.Test(_connStr, AddGuid("SqlBulkCopyTest_CacheMetadataSubset"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CacheMetadataCombinedWithKeepNullsTest()
-        {
-            CacheMetadataCombinedWithKeepNulls.Test(_connStr, AddGuid("SqlBulkCopyTest_CacheMetadataKeepNulls"));
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        public void CacheMetadataAsyncTest()
-        {
-            CacheMetadataAsync.Test(_connStr, _connStr, AddGuid("SqlBulkCopyTest_CacheMetadataAsync"));
-        }
-    }
-}

From f880e408375d0b4aa9526e26ee6f33c5d933ad40 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Wed, 3 Jun 2026 15:51:46 -0500
Subject: [PATCH 127/298] PR Pipeline - Build/Pack and Local Tests (#4326)

* Move install-dotnet to common/steps, first bits of pipeline

# Conflicts:
#	eng/pipelines/common/steps/restore-dotnet-tools.yml

* Adding build and pack steps and writing up the build/pack stage.
Leaving the unused build step for now just in case we need it later

* Move common variables to common folder. Move OneBranch specific variables to OneBranch variables file

* Rename prci-pipeline to pr-pipeline

* First round of tests

* Run build/pack regardless of previous package.

* Run tree and publish artifact regardless of previous success

* Completely untested, let's see what it does.

* Rename build-and-pack-stage.yml

* tree on linux

* Fix test framework

* Switch images to ones that have sql server on it
Move a couple things around
WIP for manual test configuration generation

* :robot: Implement config file generation for manual test

* Fix build name

* WIP

* WIP

* Add secret generation stage

* Run pack-stage and generate-secrets-stage in parallel

* More WIP to wire up manual test config

* :robot: Finish wiring up what exists today. Time to try it out and see what's broken.

* Fine, :robot:, you were right. Adding back the operating system parameters

* Fix link to linux config step

* :robot: remove dependency on extutilities

* :robot: Get connection string for setting up northwind from config

* :robot: Only swap out the initial catalog field.

* :robot: vs :robot: :fight:

* Sync config.cs and config.json

* Cleanup powershells

* Config steps

* :hammer:

* Diagnostic

* Stupid powershell.

* Making demands.

* Fixing the first round of manual tests.

* Increase timeout on sql notification test... not ideal but if it helps it helps.

* Add retries to dotnet install steps

* Cleanup and add explicit disposal logic to AlwaysEncrypted.ApiShould.TestExecuteReaderAsyncWithLargeQuery

* Temporarily mark SqlNotificationTest.Test_SingleDependency_AllDefaults_SqlAuth as flay

* Comments for pipeline, stages, jobs, variables.
Moving the SA password retrieval deeper into the manual test job

* Fix SA password issue.

* :hammer:

* Exclude AE ApiShould tests on debug builds.

* Address copilot feedback round 1 of `n`

* Config.json changes applied to pipelines.

* Restore tools in all instances before running jobs.

* Getting really tired of these changes

* wouldn't it be nice if we had something to verify this before pushing a bunch of tiny little changes?

* Hope it can handle extra spaces.

* Fix path to dotnet arm64 installation script

* Remove reference to ADO Test Configuration Properties variable group.

* Parameterize the pool

* It's not a pipeline parameter you stupid :robot:

* :rage:

* INVERSION

* Fix kerberos pipeline install-dotnet.yml path
---
 .../steps/install-dotnet-arm64.ps1            |   0
 .../{ => common}/steps/install-dotnet.yml     |   3 +-
 .../steps/restore-dotnet-tools.yml            |   0
 .../templates/jobs/ci-build-nugets-job.yml    |   4 +-
 .../templates/jobs/ci-code-coverage-job.yml   |   2 +-
 .../templates/jobs/ci-run-tests-job.yml       |  12 +-
 .../common/templates/steps/pre-build-step.yml |   2 +-
 .../steps/update-config-file-step.yml         |  11 -
 .../steps/verify-nuget-package-step.yml       |   2 +-
 .../variables/common-variables.yml            |  16 +-
 .../jobs/pack-abstractions-package-ci-job.yml |   2 +-
 .../jobs/pack-azure-package-ci-job.yml        |   2 +-
 .../jobs/pack-logging-package-ci-job.yml      |   2 +-
 .../jobs/pack-sqlserver-package-ci-job.yml    |   2 +-
 .../jobs/test-abstractions-package-ci-job.yml |   2 +-
 .../jobs/test-azure-package-ci-job.yml        |   2 +-
 eng/pipelines/kerberos/sqlclient-kerberos.yml |   8 +-
 .../onebranch/jobs/build-buildproj-job.yml    |   4 +-
 .../onebranch/sqlclient-non-official.yml      |   2 +-
 .../onebranch/sqlclient-official.yml          |   2 +-
 .../onebranch/steps/build-buildproj-step.yml  |   4 +
 .../variables/onebranch-variables.yml         |  19 +-
 eng/pipelines/pr/jobs/test-buildproj-job.yml  |  89 ++++++++
 .../pr/jobs/test-sqlclientmanual-job.yml      | 160 ++++++++++++++
 eng/pipelines/pr/pr-pipeline.yml              |  77 +++++++
 .../pr/stages/generate-secrets-stage.yml      |  69 ++++++
 eng/pipelines/pr/stages/pack-stage.yml        | 128 ++++++++++++
 eng/pipelines/pr/stages/test-stages.yml       | 197 ++++++++++++++++++
 .../pr/steps/build-buildproj-step.yml         |  46 ++++
 .../steps/configure-sqlserver-linux-step.yml  | 127 +++++++++++
 .../pr/steps/configure-sqlserver-step.yml     |  30 +++
 .../configure-sqlserver-windows-step.yml      | 115 ++++++++++
 eng/pipelines/pr/steps/install-dotnet.yml     |  27 +++
 .../pr/steps/pack-buildproj-step.yml          |  59 ++++++
 .../pr/steps/test-buildproj-step.yml          |  59 ++++++
 eng/pipelines/pr/variables/pr-variables.yml   |  30 +++
 eng/pipelines/stress/stress-tests-job.yml     |   2 +-
 .../tests/Common/SqlDataReaderExtensions.cs   |  28 +++
 .../ManualTests/AlwaysEncrypted/ApiShould.cs  |  73 ++++---
 .../ManualTests/DataCommon/DataTestUtility.cs |  14 ++
 .../SQL/InstanceNameTest/InstanceNameTest.cs  |  12 +-
 .../SQL/SqlCommand/SqlCommandCancelTest.cs    |   2 +
 .../SqlNotificationTest.cs                    |   3 +-
 .../Config.cs                                 |  11 +-
 .../config.default.json                       |   7 +-
 45 files changed, 1360 insertions(+), 108 deletions(-)
 rename eng/pipelines/{ => common}/steps/install-dotnet-arm64.ps1 (100%)
 rename eng/pipelines/{ => common}/steps/install-dotnet.yml (97%)
 rename eng/pipelines/{ => common}/steps/restore-dotnet-tools.yml (100%)
 rename eng/pipelines/{onebranch => common}/variables/common-variables.yml (54%)
 create mode 100644 eng/pipelines/pr/jobs/test-buildproj-job.yml
 create mode 100644 eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
 create mode 100644 eng/pipelines/pr/pr-pipeline.yml
 create mode 100644 eng/pipelines/pr/stages/generate-secrets-stage.yml
 create mode 100644 eng/pipelines/pr/stages/pack-stage.yml
 create mode 100644 eng/pipelines/pr/stages/test-stages.yml
 create mode 100644 eng/pipelines/pr/steps/build-buildproj-step.yml
 create mode 100644 eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml
 create mode 100644 eng/pipelines/pr/steps/configure-sqlserver-step.yml
 create mode 100644 eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
 create mode 100644 eng/pipelines/pr/steps/install-dotnet.yml
 create mode 100644 eng/pipelines/pr/steps/pack-buildproj-step.yml
 create mode 100644 eng/pipelines/pr/steps/test-buildproj-step.yml
 create mode 100644 eng/pipelines/pr/variables/pr-variables.yml

diff --git a/eng/pipelines/steps/install-dotnet-arm64.ps1 b/eng/pipelines/common/steps/install-dotnet-arm64.ps1
similarity index 100%
rename from eng/pipelines/steps/install-dotnet-arm64.ps1
rename to eng/pipelines/common/steps/install-dotnet-arm64.ps1
diff --git a/eng/pipelines/steps/install-dotnet.yml b/eng/pipelines/common/steps/install-dotnet.yml
similarity index 97%
rename from eng/pipelines/steps/install-dotnet.yml
rename to eng/pipelines/common/steps/install-dotnet.yml
index 5774984663..6ce99316b2 100644
--- a/eng/pipelines/steps/install-dotnet.yml
+++ b/eng/pipelines/common/steps/install-dotnet.yml
@@ -69,6 +69,7 @@ steps:
         env:
           PROCESSOR_ARCHITECTURE: x86
 
+
     # Install the desired Runtimes, if any.
     - ${{ each version in parameters.runtimes }}:
       - task: UseDotNet@2
@@ -96,7 +97,7 @@ steps:
       inputs:
         targetType: filePath
         pwsh: true
-        filePath: $(Build.SourcesDirectory)/eng/pipelines/steps/install-dotnet-arm64.ps1
+        filePath: $(Build.SourcesDirectory)/eng/pipelines/common/steps/install-dotnet-arm64.ps1
         # Arguments:
         #
         # -Debug:
diff --git a/eng/pipelines/steps/restore-dotnet-tools.yml b/eng/pipelines/common/steps/restore-dotnet-tools.yml
similarity index 100%
rename from eng/pipelines/steps/restore-dotnet-tools.yml
rename to eng/pipelines/common/steps/restore-dotnet-tools.yml
diff --git a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
index de9b4d284f..aa6a1c50c5 100644
--- a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
@@ -132,10 +132,10 @@ jobs:
         targetPath: $(localFeedPath)
 
   # Install the .NET SDK.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
+  - template: /eng/pipelines/common/steps/install-dotnet.yml@self
 
   # Restore dotnet CLI tools (e.g. pwsh, apicompat) before building.
-  - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+  - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
   # When we're performing a Debug build, we still want to try _compiling_ the
   # code in Release mode to ensure downstream pipelines don't encounter
diff --git a/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml b/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
index 09c72e9719..95c0ac0f3c 100644
--- a/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
@@ -44,7 +44,7 @@ jobs:
           displayName: '[Debug] List Environment Variables'
 
       # Install the .NET SDK.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}
 
diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
index 4c42af8dc1..5eed840236 100644
--- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
@@ -30,11 +30,9 @@ parameters:
   # template expansion.
   #
   #   EnclaveEnabled
-  #   IsAzureSynapse
   #   IsDNSCachingSupportedCR
   #   IsDNSCachingSupportedTR
   #   ManagedIdentitySupported
-  #   SupportsFileStream
   #   SupportsIntegratedSecurity
   #   TracingEnabled
   #
@@ -211,7 +209,7 @@ jobs:
         targetPath: $(Build.SourcesDirectory)/packages
 
   # Install the .NET SDK and Runtimes.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
+  - template: /eng/pipelines/common/steps/install-dotnet.yml@self
     parameters:
       debug: ${{ parameters.debug }}
       ${{ if parameters.isArm64 }}:
@@ -223,7 +221,7 @@ jobs:
         runtimes: [8.x, 9.x]
 
   # Restore dotnet CLI tools (e.g. pwsh, apicompat) before building.
-  - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+  - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
   - ${{ if ne(parameters.prebuildSteps, '') }}:
     - ${{ parameters.prebuildSteps }} # extra steps to run before the build like downloading sni and the required configuration
@@ -279,8 +277,6 @@ jobs:
           AliasName: ${{ parameters.configProperties.AliasName }}
         ${{ if parameters.configProperties.SupportsIntegratedSecurity }}:
           SupportsIntegratedSecurity: ${{ eq(parameters.configProperties.SupportsIntegratedSecurity, 'true') }}
-        ${{ if parameters.configProperties.SupportsFileStream }}:
-          SupportsFileStream: ${{ eq(parameters.configProperties.SupportsFileStream, 'true') }}
         ${{ if parameters.configProperties.DNSCachingConnString }}:
           DNSCachingConnString: ${{ parameters.configProperties.DNSCachingConnString }}
         ${{ if parameters.configProperties.DNSCachingServerCR }}:
@@ -293,8 +289,6 @@ jobs:
           IsDNSCachingSupportedCR: ${{ eq(parameters.configProperties.IsDNSCachingSupportedCR, 'true') }}
         ${{ if parameters.configProperties.IsDNSCachingSupportedTR }}:
           IsDNSCachingSupportedTR: ${{ eq(parameters.configProperties.IsDNSCachingSupportedTR, 'true') }}
-        ${{ if parameters.configProperties.IsAzureSynapse }}:
-          IsAzureSynapse: ${{ eq(parameters.configProperties.IsAzureSynapse, 'true') }}
         ${{ if parameters.configProperties.ManagedIdentitySupported }}:
           ManagedIdentitySupported: ${{ eq(parameters.configProperties.ManagedIdentitySupported, 'true') }}
 
@@ -352,7 +346,7 @@ jobs:
   - ${{ if and(eq(parameters.enableX86Test, true), eq(parameters.operatingSystem, 'Windows')) }}:
     - ${{ if ne(variables['dotnetx86RootPath'], '') }}:
       # Install the .NET SDK and Runtimes for x86.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           architecture: x86
           debug: ${{ parameters.debug }}
diff --git a/eng/pipelines/common/templates/steps/pre-build-step.yml b/eng/pipelines/common/templates/steps/pre-build-step.yml
index 068223af70..1d57d18296 100644
--- a/eng/pipelines/common/templates/steps/pre-build-step.yml
+++ b/eng/pipelines/common/templates/steps/pre-build-step.yml
@@ -5,7 +5,7 @@
 #################################################################################
 steps:
   # Install the .NET SDK and Runtimes.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
+  - template: /eng/pipelines/common/steps/install-dotnet.yml@self
     parameters:
       runtimes: [8.x, 9.x]
 
diff --git a/eng/pipelines/common/templates/steps/update-config-file-step.yml b/eng/pipelines/common/templates/steps/update-config-file-step.yml
index b10abdc617..b0612fa248 100644
--- a/eng/pipelines/common/templates/steps/update-config-file-step.yml
+++ b/eng/pipelines/common/templates/steps/update-config-file-step.yml
@@ -93,10 +93,6 @@ parameters:
     type: boolean
     default: false
 
-  - name: SupportsFileStream
-    type: boolean
-    default: false
-
   - name: DNSCachingConnString
     type: string
     default: ''
@@ -121,10 +117,6 @@ parameters:
     type: boolean
     default: false
 
-  - name: IsAzureSynapse
-    type: boolean
-    default: false
-
   - name: ManagedIdentitySupported
     type: boolean
     default: true
@@ -188,8 +180,6 @@ steps:
 
           $p.DNSCachingConnString="${{parameters.DNSCachingConnString }}"
 
-          $p.SupportsFileStream="${{parameters.SupportsFileStream }}"
-
           $p.LocalDbAppName="${{parameters.LocalDbAppName }}"
 
           $p.TCPConnectionStringAASSGX="${{parameters.TCPConnectionStringAASSGX }}"
@@ -201,7 +191,6 @@ steps:
           $p.UseManagedSNIOnWindows=[System.Convert]::ToBoolean("${{parameters.UseManagedSNIOnWindows }}")
           $p.SupportsIntegratedSecurity=[System.Convert]::ToBoolean("${{parameters.SupportsIntegratedSecurity }}")
           $p.ManagedIdentitySupported=[System.Convert]::ToBoolean("${{parameters.ManagedIdentitySupported }}")
-          $p.IsAzureSynapse=[System.Convert]::ToBoolean("${{parameters.IsAzureSynapse }}")
           $p.IsDNSCachingSupportedTR=[System.Convert]::ToBoolean("${{parameters.IsDNSCachingSupportedTR }}")
           $p.IsDNSCachingSupportedCR=[System.Convert]::ToBoolean("${{parameters.IsDNSCachingSupportedCR }}")
           $p.TracingEnabled=[System.Convert]::ToBoolean("${{parameters.TracingEnabled }}")
diff --git a/eng/pipelines/common/templates/steps/verify-nuget-package-step.yml b/eng/pipelines/common/templates/steps/verify-nuget-package-step.yml
index 6c74c01988..604f1b7894 100644
--- a/eng/pipelines/common/templates/steps/verify-nuget-package-step.yml
+++ b/eng/pipelines/common/templates/steps/verify-nuget-package-step.yml
@@ -34,7 +34,7 @@ parameters:
 
 steps:
   # Install the .NET SDK, required by the PowerShell script.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
+  - template: /eng/pipelines/common/steps/install-dotnet.yml@self
 
   # Invoke the script with the path to the packages to verify.
   - task: PowerShell@2
diff --git a/eng/pipelines/onebranch/variables/common-variables.yml b/eng/pipelines/common/variables/common-variables.yml
similarity index 54%
rename from eng/pipelines/onebranch/variables/common-variables.yml
rename to eng/pipelines/common/variables/common-variables.yml
index 5b6209d59d..5f4532778d 100644
--- a/eng/pipelines/onebranch/variables/common-variables.yml
+++ b/eng/pipelines/common/variables/common-variables.yml
@@ -4,11 +4,9 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# Common variables shared across all OneBranch Official pipelines.
+# Common variables shared across all pipelines.
 
 variables:
-  - name: CommitHead
-    value: '' # the value will be extracted from the repo's head
 
   ##########################################################################
   # "Well-Known" Variables that are ok to use directly, anywhere in the pipeline.
@@ -21,15 +19,3 @@ variables:
   # <ArtifactsPath>).
   - name: BUILD_OUTPUT
     value: $(REPO_ROOT)/artifacts
-
-  # Directory where downloaded pipeline artifacts (NuGet packages from earlier
-  # stages) are placed. Build jobs use this as a local NuGet package source so
-  # that downstream packages can resolve dependencies on packages built by
-  # upstream stages.
-  - name: JOB_INPUT
-    value: $(REPO_ROOT)/packages
-
-  # Root directory for all job output artifacts (NuGet packages, symbols, etc.). OneBranch auto
-  # publishes everything under this directory as the artifact for the job.
-  - name: JOB_OUTPUT
-    value: $(REPO_ROOT)/output
diff --git a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
index aed7672618..a9cb5b1043 100644
--- a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
@@ -103,7 +103,7 @@ jobs:
           displayName: '[Debug] Print Environment Variables'
 
       # Install the .NET SDK.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}
 
diff --git a/eng/pipelines/jobs/pack-azure-package-ci-job.yml b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
index 3b03dc0adc..eaf0e3c66f 100644
--- a/eng/pipelines/jobs/pack-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
@@ -146,7 +146,7 @@ jobs:
             targetPath: $(Build.SourcesDirectory)/packages
 
       # Install the .NET SDK.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}
 
diff --git a/eng/pipelines/jobs/pack-logging-package-ci-job.yml b/eng/pipelines/jobs/pack-logging-package-ci-job.yml
index dd748cb4b2..f2a42699e0 100644
--- a/eng/pipelines/jobs/pack-logging-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-logging-package-ci-job.yml
@@ -94,7 +94,7 @@ jobs:
           displayName: '[Debug] Print Environment Variables'
 
       # Install the .NET SDK.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}
 
diff --git a/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml b/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
index 915bf1e9bd..6b19e8c154 100644
--- a/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
@@ -90,7 +90,7 @@ jobs:
           displayName: '[Debug] Print Environment Variables'
 
       # Install the .NET SDK.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}
 
diff --git a/eng/pipelines/jobs/test-abstractions-package-ci-job.yml b/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
index 226dc1ae2a..83366b52a9 100644
--- a/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
@@ -122,7 +122,7 @@ jobs:
           displayName: '[Debug] Print Environment Variables'
 
       # Install the .NET SDK and Runtimes.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}
           runtimes: [8.x, 9.x]
diff --git a/eng/pipelines/jobs/test-azure-package-ci-job.yml b/eng/pipelines/jobs/test-azure-package-ci-job.yml
index 9c70433e33..42097daa42 100644
--- a/eng/pipelines/jobs/test-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-azure-package-ci-job.yml
@@ -243,7 +243,7 @@ jobs:
             targetPath: $(Build.SourcesDirectory)/packages
 
       # Install the .NET SDK and Runtimes.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}
           runtimes: [8.x, 9.x]
diff --git a/eng/pipelines/kerberos/sqlclient-kerberos.yml b/eng/pipelines/kerberos/sqlclient-kerberos.yml
index af1b04266f..f43ee0a280 100644
--- a/eng/pipelines/kerberos/sqlclient-kerberos.yml
+++ b/eng/pipelines/kerberos/sqlclient-kerberos.yml
@@ -127,13 +127,13 @@ stages:
             fetchDepth: 1
             fetchTags: false
 
-          - template: /eng/pipelines/steps/install-dotnet.yml@self
+          - template: /eng/pipelines/common/steps/install-dotnet.yml@self
             parameters:
               runtimes: [8.x, 9.x]
 
           # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets
           # such as _CheckPwshToolRestored that run during the SqlClient ref project build.
-          - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+          - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
           # --- Update test configuration ---
           # Uses runtime variables from the matrix ($(managedSNI)) so we use
@@ -224,13 +224,13 @@ stages:
             fetchTags: false
 
           # --- Install .NET SDK and runtimes ---
-          - template: /eng/pipelines/steps/install-dotnet.yml@self
+          - template: /eng/pipelines/common/steps/install-dotnet.yml@self
             parameters:
               runtimes: [8.x, 9.x]
 
           # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets
           # such as _CheckPwshToolRestored that run during the SqlClient ref project build.
-          - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+          - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
           # --- Update test configuration (with Kerberos credentials) ---
           - pwsh: |
diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index 34c775ad5c..51c70e8c64 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -128,11 +128,11 @@ jobs:
               targetPath: $(REPO_ROOT)/packages
 
       # Install the .NET SDK.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
 
       # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets
       # such as _CheckPwshToolRestored that run during RoslynAnalyzers and Build.
-      - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+      - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
       # Perform Roslyn analysis before building, since this step will clobber build output.
       - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml@self
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index 584bd050f9..abf9b6dcbe 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -90,7 +90,7 @@ parameters:
     default: false
 
 variables:
-  - template: /eng/pipelines/onebranch/variables/common-variables.yml@self
+  - template: /eng/pipelines/common/variables/common-variables.yml@self
   - template: /eng/pipelines/onebranch/variables/onebranch-variables.yml@self
   - template: /eng/pipelines/onebranch/variables/package-variables.yml@self
     parameters:
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 07b8da1b17..8ea429bb00 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -112,7 +112,7 @@ parameters:
     default: false
 
 variables:
-  - template: /eng/pipelines/onebranch/variables/common-variables.yml@self
+  - template: /eng/pipelines/common/variables/common-variables.yml@self
   - template: /eng/pipelines/onebranch/variables/onebranch-variables.yml@self
   - template: /eng/pipelines/onebranch/variables/package-variables.yml@self
     parameters:
diff --git a/eng/pipelines/onebranch/steps/build-buildproj-step.yml b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
index 080896ee10..2a5730c848 100644
--- a/eng/pipelines/onebranch/steps/build-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
@@ -6,6 +6,10 @@
 
 # This collection of steps to build a project via the build.proj. This will execute the "Build*"
 # target in build.proj, where * is the packageShortName provided in the parameters.
+#
+# Note: This differs from the pr/ci build-buildproj-step.yml in that it always strong-name signs
+#    the assemblies, it only builds in package reference mode, and as such allows for version
+#    parameters to be provided.
 
 parameters:
   # Build configuration - Release or Debug.
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index 5a36dbbe75..7d940c1cb7 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -32,8 +32,25 @@ variables:
   # SymbolsUploadAccount
   - group: 'symbols-variables-v3'
 
+  # Well-Known Variables ###################################################
+
+  # Directory where downloaded pipeline artifacts (NuGet packages from earlier
+  # stages) are placed. Build jobs use this as a local NuGet package source so
+  # that downstream packages can resolve dependencies on packages built by
+  # upstream stages.
+  - name: JOB_INPUT
+    value: $(REPO_ROOT)/packages
+
+  # Root directory for all job output artifacts (NuGet packages, symbols, etc.). OneBranch auto
+  # publishes everything under this directory as the artifact for the job.
+  - name: JOB_OUTPUT
+    value: $(REPO_ROOT)/output
+
   # OneBranch Template Variables ###########################################
 
+  - name: CommitHead
+    value: '' # the value will be extracted from the repo's head
+
   # https://aka.ms/obpipelines/sdl
   - name: ob_sdl_binskim_break
     value: true
@@ -42,7 +59,7 @@ variables:
     value: true
 
   # OneBranch supplies a variety of container images we must use for our jobs.
-  #
+
   # Windows jobs use this image.
   - name: WindowsContainerImage
     value: onebranch.azurecr.io/windows/ltsc2022/vse2022:latest
diff --git a/eng/pipelines/pr/jobs/test-buildproj-job.yml b/eng/pipelines/pr/jobs/test-buildproj-job.yml
new file mode 100644
index 0000000000..0b051bf50e
--- /dev/null
+++ b/eng/pipelines/pr/jobs/test-buildproj-job.yml
@@ -0,0 +1,89 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+parameters:
+  # General Parameters =====================================================
+
+  # Configuration with which to build the packages and execute the tests.
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # Suffix to append to the package version to indicate it is a pre-release/development build.
+  - name: buildSuffix
+    type: string
+
+  # Platform Parameters ====================================================
+
+  # Display name of the platform. This will be formatted into the job's official name as well as
+  # the display name for the job. As such, only alphanumeric and _ characters are permitted.
+  - name: platformDisplayName
+    type: string
+
+  # TFM name of the version of dotnet to run this test with.
+  - name: platformDotnet
+    type: string
+
+  # Name of the image in the customized ADO pool to use to execute this job.
+  - name: platformImage
+    type: string
+
+  # Name of the pool to use for jobs that require customized VM images.
+  - name: poolName
+    type: string
+
+  # Test Parameters ========================================================
+
+  # Name of the project to run tests for. This will be used to generate the build.proj target to
+  # execute: Test{packageShortName}{testProject}
+  - name: packageShortName
+    type: string
+    values:
+      - Azure
+      - AkvProvider
+      - Abstractions
+      - Logging
+      - SqlClient
+      - SqlServer
+
+  # Display name of the test target that is being executed. This will be formatted into the job's
+  # official name as well as the display name for the job. As such, only alphanumeric and _
+  # characters are permitted.
+  - name: testDisplayName
+    type: string
+
+  # Optional test project name to execute. This only applies to packages that have >1 test target.
+  # eg, for TestSqlClientManual, this should be "Manual"
+  - name: testProject
+    type: string
+    default: ''
+
+jobs:
+  - job: "test_${{ parameters.platformDisplayName }}_${{ parameters.testDisplayName }}"
+    displayName: "${{ parameters.testDisplayName }}_${{ parameters.platformDisplayName }}"
+
+    pool:
+      name: ${{ parameters.poolName }}
+      demands:
+        - imageOverride -equals ${{ parameters.platformImage }}
+
+    steps:
+      # Install the version of the dotnet runtime we will use to execute the test target.
+      - template: /eng/pipelines/pr/steps/install-dotnet.yml@self
+        parameters:
+          runtimeVersion: ${{ parameters.platformDotnet }}
+
+      # Execute the test target
+      - template: /eng/pipelines/pr/steps/test-buildproj-step.yml
+        parameters:
+          buildConfiguration: ${{ parameters.buildConfiguration }}
+          buildSuffix: ${{ parameters.buildSuffix }}
+
+          packageShortName: ${{ parameters.packageShortName }}
+          testFramework: ${{ parameters.platformDotnet }}
+          testProject: ${{ parameters.testProject }}
diff --git a/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml b/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
new file mode 100644
index 0000000000..ff81d983a3
--- /dev/null
+++ b/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
@@ -0,0 +1,160 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+parameters:
+  # Configuration with which to build the packages and execute the tests.
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # Suffix to append to the package version to indicate it is a pre-release/development build.
+  - name: buildSuffix
+    type: string
+
+  # Name of the stage that generated the SA password
+  - name: stageNameSecrets
+    type: string
+
+  # Platform Parameters ====================================================
+
+  # Display name of the platform. This will be formatted into the job's official name as well as
+  # the display name for the job. As such, only alphanumeric and _ characters are permitted.
+  - name: platformDisplayName
+    type: string
+
+  # TFM name of the version of dotnet to run this test with.
+  - name: platformDotnet
+    type: string
+
+  # Name of the image in the customized ADO pool to use to execute this job.
+  - name: platformImage
+    type: string
+
+  # General name of the operating system that will be used to execute the job.
+  # Note: This is used at compile time to determine which SQL Server setup steps to use. As such,
+  #    this cannot be replaced with the agent's operating system, as this value is only available
+  #    at runtime.
+  - name: platformOperatingSystem
+    type: string
+    values:
+      - Windows
+      - Linux
+
+  # Name of the pool to use for jobs that require customized VM images.
+  - name: poolName
+    type: string
+
+  # Test Configuration Parameters ==========================================
+
+  # Azure Key Vault tenant ID that will be set in the config.json file.
+  - name: azureKeyVaultTenantId
+    type: string
+
+  # Azure Key Vault URL that will be set in the config.json file.
+  - name: azureKeyVaultUrl
+    type: string
+
+  # Connection string using named pipes that will be set in the config.json file.
+  - name: connectionStringNp
+    type: string
+
+  # Connection string using TCP that will be set in the config.json file.
+  - name: connectionStringTcp
+    type: string
+
+  # Path to use for file stream tests, this value will be stored in the config.json file.
+  - name: fileStreamDirectory
+    type: string
+
+  # Name of the local DB application name for localdb tests, this value will be stored in the
+  # config.json
+  - name: localDbAppName
+    type: string
+
+  # Name of the local DB shared instance name for localdb tests, this value will be stored in the
+  # config.json
+  - name: localDbSharedInstanceName
+    type: string
+
+jobs:
+  - job: "test_${{ parameters.platformDisplayName }}_sqlclient_manual"
+    displayName: "sqlclient_manual_${{ parameters.platformDisplayName }}"
+
+    pool:
+      name: ${{ parameters.poolName }}
+      demands:
+        - imageOverride -equals ${{ parameters.platformImage }}
+
+    variables:
+      # Bring the generated SA password from the secrets stage into scope for this test stage.
+      # Note: Because this is set at runtime, it must be referenced as `$(saPassword)`.
+      - name: saPassword
+        value: $[stageDependencies.${{ parameters.stageNameSecrets }}.secrets_job.outputs['SaPassword.Value']]
+
+    steps:
+      # Install the version of the dotnet runtime we will use to execute the test target.
+      - template: /eng/pipelines/pr/steps/install-dotnet.yml@self
+        parameters:
+          runtimeVersion: ${{ parameters.platformDotnet }}
+
+      # Configure the local SQL Server instance
+      - template: /eng/pipelines/pr/steps/configure-sqlserver-step.yml@self
+        parameters:
+          fileStreamDirectory: ${{ parameters.fileStreamDirectory }}
+          operatingSystem: ${{ parameters.platformOperatingSystem }}
+          saPassword: $(saPassword)
+
+      # Assign the generated SA password to the $Password field. This will allow $(Password) to be
+      # be replaced in connection strings with whatever set in the secrets stage.
+      - pwsh: |
+          $password = "$(saPassword)"
+          Write-Host "##vso[task.setvariable variable=Password;isSecret=true]$password"
+        displayName: Set Connection String Password
+
+      # Write configuration information to the config.json file.
+      - pwsh: |
+          # Read existing default configuration from file
+          $defaultConfigPath = "$(REPO_ROOT)/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json"
+          $configDirectory = "$(Agent.TempDirectory)/mds-config"
+          $configPath = Join-Path $configDirectory "config.json"
+          $config = Get-Content -Raw $defaultConfigPath | ConvertFrom-Json
+
+          # Update the config values
+          $config.TCPConnectionString = "${{ parameters.connectionStringTcp }}"
+          $config.NPConnectionString = "${{ parameters.connectionStringNp }}"
+          $config.AzureKeyVaultURL = "${{ parameters.azureKeyVaultUrl }}"
+          $config.AzureKeyVaultTenantId = "${{ parameters.azureKeyVaultTenantId }}"
+          $config.LocalDbAppName = "${{ parameters.localDbAppName }}"
+          $config.LocalDbSharedInstanceName = "${{ parameters.localDbSharedInstanceName }}"
+          $config.ManagedIdentitySupported = $true
+          $config.SupportsIntegratedSecurity = $false
+
+          if ("${{ parameters.platformOperatingSystem  }}" -eq "Windows") {
+              $config.FileStreamDirectory = "${{ parameters.fileStreamDirectory }}"
+          } else {
+              $config.FileStreamDirectory = ""
+          }
+
+          # Write config object to config file
+          New-Item -ItemType Directory -Force -Path $configDirectory | Out-Null
+          $config | ConvertTo-Json | Set-Content $configPath
+
+          # Set generated config file path to environment variable
+          Write-Host "##vso[task.setvariable variable=TEST_MDS_CONFIG]$configPath"
+        displayName: 'Generate manual test config'
+
+      # Execute TestSqlClientManual target from build.proj
+      - template: /eng/pipelines/pr/steps/test-buildproj-step.yml
+        parameters:
+          buildConfiguration: ${{ parameters.buildConfiguration }}
+          buildSuffix: ${{ parameters.buildSuffix }}
+
+          packageShortName: "SqlClient"
+          testFramework: ${{ parameters.platformDotnet }}
+          testProject: "Manual"
+
diff --git a/eng/pipelines/pr/pr-pipeline.yml b/eng/pipelines/pr/pr-pipeline.yml
new file mode 100644
index 0000000000..9774ebdbfa
--- /dev/null
+++ b/eng/pipelines/pr/pr-pipeline.yml
@@ -0,0 +1,77 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+name: $(DayOfYear)$(Rev:rr)
+
+variables:
+  - template: /eng/pipelines/common/variables/common-variables.yml@self
+  - template: /eng/pipelines/pr/variables/pr-variables.yml@self
+
+stages:
+  # Stage 1a: Build and pack all projects in the repository
+  - template: /eng/pipelines/pr/stages/pack-stage.yml
+    parameters:
+      buildConfiguration: Debug
+      buildSuffix: pr
+      stageName: ${{ variables.stageNamePack }}
+
+  # Stage 1b: Generate secrets
+  - template: /eng/pipelines/pr/stages/generate-secrets-stage.yml
+    parameters:
+      stageName: ${{ variables.stageNameSecrets }}
+
+  # Stage 2: Execute tests and collect code coverage
+  - template: /eng/pipelines/pr/stages/test-stages.yml
+    parameters:
+      buildConfiguration: Debug
+      buildSuffix: pr
+      poolName: $(PoolNameDefault)
+      stageNamePack: ${{ variables.stageNamePack }}
+      stageNameSecrets: ${{ variables.stageNameSecrets }}
+
+      platforms:
+        - displayName: "windows_net462"
+          dotnet: "net462"
+          image: "ADO-MMS22-SQL22"
+          operatingSystem: "Windows"
+        - displayName: "windows_net8"
+          dotnet: "net8.0"
+          image: "ADO-MMS22-SQL22"
+          operatingSystem: "Windows"
+        - displayName: "windows_net9"
+          dotnet: "net9.0"
+          image: "ADO-MMS22-SQL22"
+          operatingSystem: "Windows"
+        - displayName: "windows_net10"
+          dotnet: "net10.0"
+          image: "ADO-MMS22-SQL22"
+          operatingSystem: "Windows"
+
+        - displayName: "linux_net8"
+          dotnet: "net8.0"
+          image: "ADO-UB22-SQL22"
+          operatingSystem: "Linux"
+        - displayName: "linux_net9"
+          dotnet: "net9.0"
+          image: "ADO-UB22-SQL22"
+          operatingSystem: "Linux"
+        - displayName: "linux_net10"
+          dotnet: "net10.0"
+          image: "ADO-UB22-SQL22"
+          operatingSystem: "Linux"
+
+      manualTestAzureKeyVaultUrl: $(AzureKeyVaultUrl)
+      manualTestAzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
+      manualTestConnectionStringNpLocalhost: $(ConnectionStringNp_LocalhostDefault_UsernamePassword)
+      manualTestConnectionStringTcpLocalhost: $(ConnectionStringTcp_LocalhostDefault_UsernamePassword)
+      manualTestConnectionStringNpAzure: $(ConnectionStringNp_Azure_ManagedIdentity)
+      manualTestConnectionStringTcpAzure: $(ConnectionStringTcp_Azure_ManagedIdentity)
+      manualTestFileStreamDirectory: "$(Pipeline.Workspace)/filestream"
+      manualTestLocalDbAppName: $(LocalDbAppName)
+      manualTestLocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
+
+  # Stage 3: Collect code coverage
+  # @TODO:
diff --git a/eng/pipelines/pr/stages/generate-secrets-stage.yml b/eng/pipelines/pr/stages/generate-secrets-stage.yml
new file mode 100644
index 0000000000..20a81fe626
--- /dev/null
+++ b/eng/pipelines/pr/stages/generate-secrets-stage.yml
@@ -0,0 +1,69 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# This stage generates the following random secrets for use throughout the PR and CI pipelines:
+#   SaPassword - A random GUID suitable for use as the SA password of local SQL Server instances.
+#
+# Subsequent stages may reference these variables as:
+#   $[stageDependencies.${{ stageName }}.secrets_job.outputs['SaPassword.Value']]
+#
+# For further details on the stage-dependency syntax, see:
+# https://learn.microsoft.com/en-us/azure/devops/pipelines/process/set-variables-scripts?view=azure-devops&tabs=bash#set-an-output-variable-for-use-in-future-stages
+#
+# Any stages that use these secrets must depend on this stage:
+#   ${{ stageName }}
+#
+# None of the values produced here are actual secrets - they are just random values that are
+# suitable for testing purposes, and do not need to be protected. For simplicity, they are emitted
+# as regular output variables of script steps, are not formally marked as secrets, and not stored in
+# the Azure DevOps Library or Key Vault.
+
+parameters:
+
+  # True to emit debug information and steps.
+  - name: debug
+    type: boolean
+    default: false
+
+  - name: stageName
+    type: string
+
+stages:
+
+  # The stage downstream stages must depend on to ensure the secrets are generated before they are
+  # used.
+  - stage: ${{ parameters.stageName }}
+    displayName: Generate Secrets
+    dependsOn: []
+
+    jobs:
+
+      # The job that generates the secrets.  Each secret is emitted as an output variable of a
+      # script step and can be referenced by downstream stages via the stage-dependencies syntax.
+      - job: secrets_job
+        displayName: Generate Secrets
+        pool:
+          # We don't need anything special, so use the standard Microsoft-hosted Ubuntu image, which
+          # is typically very fast to spin up.
+          vmImage: ubuntu-latest
+
+        steps:
+
+          # We don't need the repo checked out.
+          - checkout: none
+
+          # Generate a password suitable for the SA user of local SQL Server instances.
+          # This creates the SaPassword.Value variable.
+          - bash: |
+              guid=$(cat /proc/sys/kernel/random/uuid)
+              echo "##vso[task.setvariable variable=Value;isOutput=true]$guid"
+            name: SaPassword
+            displayName: Generate SA password
+
+          # Emit the SA password, if desired.
+          - ${{ if eq(parameters.debug, true) }}:
+              - bash: |
+                  echo "SA password: $(SaPassword.Value)"
+                displayName: '[Debug] Emit SA password'
diff --git a/eng/pipelines/pr/stages/pack-stage.yml b/eng/pipelines/pr/stages/pack-stage.yml
new file mode 100644
index 0000000000..c0a135e246
--- /dev/null
+++ b/eng/pipelines/pr/stages/pack-stage.yml
@@ -0,0 +1,128 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This stage is meant to perform a sanity check of the source code at the current point in time.
+# Although the test targets will implicitly build the projects they depend on, this stage allows
+# for fast failure of the build if the source code is not in a state that can be built.
+#
+# This stage will also be used to generate nuget packages based on the current source code. These
+# will be uploaded, along with the build output as the artifacts of the build.
+#
+# Developer notes ---
+# * Because we want a single artifact for build output, and we want to minimize overhead for build,
+#   we build all packages as a single job rather than one job per package.
+# * Although theoretically in package build we could arrange build steps to minimize re-building,
+#   build.proj isn't properly aware of how to do this. So, instead, arranging the build steps
+#   alphabetically is the best way to arrange for now.
+
+parameters:
+
+  # Configuration with which to build the packages and execute the tests.
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # Suffix to append to the package version to indicate it is a pre-release/development build.
+  - name: buildSuffix
+    type: string
+
+  # Name to use for the stage. This is parameterized to allow a higher level of the pipeline to
+  # define the name and pass it to sibling stages (ie, test stage) and avoid relying on brittle
+  # hard-coded stage names.
+  - name: stageName
+    type: string
+
+stages:
+  - stage: ${{ parameters.stageName }}
+    displayName: Build and Pack Projects
+    dependsOn: []
+
+    jobs:
+      - job: pack_job
+        displayName: Build and Pack Projects
+
+        pool:
+          vmImage: 'ubuntu-latest'
+
+        steps:
+          # Install dotnet SDK and restore tools
+          - template: /eng/pipelines/pr/steps/install-dotnet.yml@self
+
+          # ################################################################
+          # Build/Pack Microsoft.Data.SqlClient
+          - template: /eng/pipelines/pr/steps/pack-buildproj-step.yml
+            parameters:
+              condition: succeeded() # Only run if dotnet was installed successfully
+
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              packageShortName: SqlClient
+
+          # ################################################################
+          # Build/Pack Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
+          - template: /eng/pipelines/pr/steps/pack-buildproj-step.yml
+            parameters:
+              condition: succeededOrFailed()
+
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              packageShortName: AkvProvider
+
+          # ################################################################
+          # Build/Pack Microsoft.Data.SqlClient.Extensions.Abstractions
+          - template: /eng/pipelines/pr/steps/pack-buildproj-step.yml
+            parameters:
+              condition: succeededOrFailed()
+
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              packageShortName: Abstractions
+
+          # ################################################################
+          # Build/Pack Microsoft.Data.SqlClient.Extensions.Azure
+          - template: /eng/pipelines/pr/steps/pack-buildproj-step.yml
+            parameters:
+              condition: succeededOrFailed()
+
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              packageShortName: Azure
+
+          # ################################################################
+          # Build/Pack Microsoft.Data.SqlClient.Internal.Logging
+          - template: /eng/pipelines/pr/steps/pack-buildproj-step.yml
+            parameters:
+              condition: succeededOrFailed()
+
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              packageShortName: Logging
+
+          # ################################################################
+          # Build/Pack Microsoft.SqlServer.Server
+          - template: /eng/pipelines/pr/steps/pack-buildproj-step.yml
+            parameters:
+              condition: succeededOrFailed()
+
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              packageShortName: SqlServer
+
+          # Emit the build output
+          - script: tree -a $(BUILD_OUTPUT)
+            displayName: Output Build Output Tree
+            condition: succeededOrFailed()
+
+          # Upload the build output as the artifact of the job
+          - publish: $(BUILD_OUTPUT)
+            artifact: build_and_pack_projects
+            condition: succeededOrFailed()
+
+
+
+
diff --git a/eng/pipelines/pr/stages/test-stages.yml b/eng/pipelines/pr/stages/test-stages.yml
new file mode 100644
index 0000000000..f2ffbc09cf
--- /dev/null
+++ b/eng/pipelines/pr/stages/test-stages.yml
@@ -0,0 +1,197 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# These stages are meant to validate a PR against a battery of tests to ensure confidence in the
+# changes the PR presents. There is, however, a balance to be struck between completeness of
+# confidence and expedience of validation.
+
+parameters:
+  # Configuration with which to build the packages and execute the tests.
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # Suffix to append to the package version to indicate it is a pre-release/development build.
+  - name: buildSuffix
+    type: string
+
+  # Name of the build/pack stage that this stage will depend on.
+  - name: stageNamePack
+    type: string
+
+  # Name of the secret generation job used to determine the path to the SA password variable.
+  - name: stageNameSecrets
+    type: string
+
+  # Name of the pool to use for jobs that require customized VM images.
+  - name: poolName
+    type: string
+
+  # Manual Test Configuration Parameters ==================================
+
+  # Azure Key Vault tenant ID that will be set in the config.json file for sqlclient manual tests.
+  - name: manualTestAzureKeyVaultTenantId
+    type: string
+
+  # Azure Key Vault URL that will be set in the config.json file for sqlclient manual tests.
+  - name: manualTestAzureKeyVaultUrl
+    type: string
+
+  # Connection string to Azure SQL using named pipes that will be set in the config.json file for
+  # sqlclient manual tests against Azure SQL.
+  - name: manualTestConnectionStringNpAzure
+    type: string
+
+  # Connection string to localhost using named pipes that will be set in the config.json file for
+  # sqlclient manual tests against a local box product.
+  - name: manualTestConnectionStringNpLocalhost
+    type: string
+
+  # Connection string to Azure SQL using TCP that will be set in the config.json file for sqlclient
+  # manual tests against Azure SQL.
+  - name: manualTestConnectionStringTcpAzure
+    type: string
+
+  # Connection string to localhost using TCP that will be set in the config.json file for sqlclient
+  # manual tests against a local box product.
+  - name: manualTestConnectionStringTcpLocalhost
+    type: string
+
+  # Path to use for file stream tests, this value will be stored in the config.json for sqlclient
+  # manual tests.
+  - name: manualTestFileStreamDirectory
+    type: string
+
+  # Name of the local DB application name for localdb tests, this value will be stored in the
+  # config.json for sqlclient manual tests.
+  - name: manualTestLocalDbAppName
+    type: string
+
+  # Name of the local DB shared instance name for localdb tests, this value will be stored in the
+  # config.json for sqlclient manual tests.
+  - name: manualTestLocalDbSharedInstanceName
+    type: string
+
+  # This is an array of objects with the following fields:
+  # - displayName     - Friendly name to use when displaying the stage name and job names. This
+  #                     must only contain alphanumeric characters and '_'. It will be used for both
+  #                     display name fields and stage/job names.
+  # - dotnet          - Version of dotnet runtime to use to execute the tests
+  # - image           - Image to use to execute the test jobs in the pipeline
+  # - operatingSystem - General OS "class" that the image contains. This is used to switch between
+  #                     server configuration behaviors.
+  #
+  # Each one of the objects in this parameter will become a stage that executes all test projects
+  # available.
+  - name: platforms
+    type: object
+    default: []
+
+stages:
+  - ${{ each platform in parameters.platforms }}:
+      - stage: "test_${{ platform.displayName }}"
+        displayName: "Test: ${{ platform.displayName }}"
+        dependsOn:
+          - ${{ parameters.stageNamePack }}
+          - ${{ parameters.stageNameSecrets }}
+
+        jobs:
+          # TestAbstractions
+          - template: /eng/pipelines/pr/jobs/test-buildproj-job.yml@self
+            parameters:
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              platformDisplayName: ${{ platform.displayName }}
+              platformDotnet: ${{ platform.dotnet }}
+              platformImage: ${{ platform.image }}
+              poolName: ${{ parameters.poolName }}
+
+              packageShortName: "Abstractions"
+              testDisplayName: "abstractions"
+
+          # TestAzure
+          - template: /eng/pipelines/pr/jobs/test-buildproj-job.yml@self
+            parameters:
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              platformDisplayName: ${{ platform.displayName }}
+              platformDotnet: ${{ platform.dotnet }}
+              platformImage: ${{ platform.image }}
+              poolName: ${{ parameters.poolName }}
+
+              packageShortName: "Azure"
+              testDisplayName: "azure"
+
+          # TestSqlClientFunctional
+          - template: /eng/pipelines/pr/jobs/test-buildproj-job.yml@self
+            parameters:
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              platformDisplayName: ${{ platform.displayName }}
+              platformDotnet: ${{ platform.dotnet }}
+              platformImage: ${{ platform.image }}
+              poolName: ${{ parameters.poolName }}
+
+              packageShortName: "SqlClient"
+              testDisplayName: "sqlclient_functional"
+              testProject: "Functional"
+
+          # TestSqlClientManual - Localhost
+          - template: /eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml@self
+            parameters:
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              stageNameSecrets: ${{ parameters.stageNameSecrets }}
+
+              platformDisplayName: ${{ platform.displayName }}
+              platformDotnet: ${{ platform.dotnet }}
+              platformImage: ${{ platform.image }}
+              platformOperatingSystem: ${{ platform.operatingSystem }}
+              poolName: ${{ parameters.poolName }}
+
+              azureKeyVaultTenantId: ${{ parameters.manualTestAzureKeyVaultTenantId }}
+              azureKeyVaultUrl: ${{ parameters.manualTestAzureKeyVaultUrl }}
+              connectionStringNp: ${{ parameters.manualTestConnectionStringNpLocalhost }}
+              connectionStringTcp: ${{ parameters.manualTestConnectionStringTcpLocalhost }}
+              fileStreamDirectory: ${{ parameters.manualTestFileStreamDirectory }}
+              localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
+              localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
+
+           # @TODO:
+#          # TestSqlClientManual - Azure
+#          - template: /eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml@self
+#            parameters:
+#              buildConfiguration: ${{ parameters.buildConfiguration }}
+#              buildSuffix: ${{ parameters.buildSuffix }}
+#              platformDisplayName: ${{ platform.displayName }}
+#              platformDotnet: ${{ platform.dotnet }}
+#              platformImage: ${{ platform.image }}
+#              poolName: ${{ parameters.poolName }}
+#
+#              azureKeyVaultTenantId: ${{ parameters.manualTestAzureKeyVaultTenantId }}
+#              azureKeyVaultUrl: ${{ parameters.manualTestAzureKeyVaultUrl }}
+#              connectionStringNp: ${{ parameters.manualTestConnectionStringNpAzure }}
+#              connectionStringTcp: ${{ parameters.manualTestConnectionStringTcpAzure }}
+#              fileStreamDirectory: ${{ parameters.manualTestFileStreamDirectory }}
+#              localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
+#              localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
+#              saPassword: $(manualTestSaPassword)
+
+          # TestSqlClientUnit
+          - template: /eng/pipelines/pr/jobs/test-buildproj-job.yml@self
+            parameters:
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              platformDisplayName: ${{ platform.displayName }}
+              platformDotnet: ${{ platform.dotnet }}
+              platformImage: ${{ platform.image }}
+              poolName: ${{ parameters.poolName }}
+
+              packageShortName: "SqlClient"
+              testDisplayName: "sqlclient_unit"
+              testProject: "Unit"
diff --git a/eng/pipelines/pr/steps/build-buildproj-step.yml b/eng/pipelines/pr/steps/build-buildproj-step.yml
new file mode 100644
index 0000000000..3e81edfbf4
--- /dev/null
+++ b/eng/pipelines/pr/steps/build-buildproj-step.yml
@@ -0,0 +1,46 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This collection of steps to build a project via the build.proj. This will execute the "Build*"
+# target in build.proj, where * is the packageShortName provided in the parameters.
+#
+# Note: This differs from the onebranch build-buildproj-step.yml in that it does *not* strong-name
+#    sign the assemblies, it only builds in project reference mode, and as such it does not allow
+#    version parameters or dependencies to be provided.
+
+parameters:
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  - name: buildSuffix
+    type: string
+
+  - name: packageShortName
+    type: string
+    values:
+      - Azure
+      - AkvProvider
+      - Abstractions
+      - Logging
+      - SqlClient
+      - SqlServer
+
+steps:
+  - task: DotNetCoreCLI@2
+    displayName: 'build.proj - Build${{ parameters.packageShortName }}'
+    inputs:
+      command: build
+      projects: build.proj
+      arguments: >-
+        -t:Build${{ parameters.packageShortName }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
+        -p:BuildNumber='$(Build.BuildNumber)'
+        -p:BuildSuffix='${{ parameters.buildSuffix }}'
+
+
diff --git a/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml b/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml
new file mode 100644
index 0000000000..8eb8cc40d6
--- /dev/null
+++ b/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml
@@ -0,0 +1,127 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# 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:
+
+  # The SA password to set when configuring SQL Server.
+  - name: saPassword
+    type: string
+
+steps:
+
+  # Configure SQL Server.
+  - bash: |
+      set -u
+
+      if ! command -v sudo >/dev/null 2>&1; then
+        echo "ERROR: 'sudo' is required to configure SQL Server on Linux."
+        exit 1
+      fi
+
+      if [ ! -x /opt/mssql/bin/mssql-conf ]; then
+        echo "ERROR: '/opt/mssql/bin/mssql-conf' was not found."
+        exit 1
+      fi
+
+      SQLCMD_BIN=""
+      if command -v sqlcmd >/dev/null 2>&1; then
+        SQLCMD_BIN="$(command -v sqlcmd)"
+      elif [ -x /opt/mssql-tools18/bin/sqlcmd ]; then
+        SQLCMD_BIN="/opt/mssql-tools18/bin/sqlcmd"
+      elif [ -x /opt/mssql-tools/bin/sqlcmd ]; then
+        SQLCMD_BIN="/opt/mssql-tools/bin/sqlcmd"
+      else
+        echo "ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations."
+        exit 1
+      fi
+
+      sudo systemctl stop mssql-server
+      errstatus=$?
+      if [ $errstatus -ne 0 ]
+      then
+        echo "ERROR: stopping mssql-server failed with exit code $errstatus."
+        exit $errstatus
+      fi
+
+      # Password for the SA user (required)
+      MSSQL_SA_PW="${{ parameters.saPassword }}"
+
+      # Product ID of the version of SQL server you're installing
+      # Must be evaluation, developer, express, web, standard, enterprise, or your 25 digit product key
+      MSSQL_PID="enterprise"
+
+      echo Running mssql-conf setup...
+      sudo MSSQL_SA_PASSWORD="$MSSQL_SA_PW" \
+            MSSQL_PID="$MSSQL_PID" \
+            /opt/mssql/bin/mssql-conf -n setup accept-eula
+      errstatus=$?
+      if [ $errstatus -ne 0 ]
+      then
+        echo "ERROR: mssql-conf setup failed with exit code $errstatus."
+        exit $errstatus
+      fi
+
+      # Connect to server and get the version:
+      counter=1
+      errstatus=1
+      while [ $counter -le 5 ] && [ $errstatus -ne 0 ]
+      do
+        echo Waiting for SQL Server to start...
+        sleep 3s
+        "$SQLCMD_BIN" \
+          -S localhost \
+          -U SA \
+          -P "$MSSQL_SA_PW" \
+          -Q "SELECT @@VERSION" 2>/dev/null
+        errstatus=$?
+        ((counter++))
+      done
+
+      # Display error if connection failed:
+      if [ $errstatus -ne 0 ]
+      then
+        echo Cannot connect to SQL Server, installation aborted
+        exit $errstatus
+      fi
+    displayName: 'Configure SQL Server [Linux]'
+
+  - bash: |
+      set -u
+
+      SCRIPT_PATH="$(Build.SourcesDirectory)/tools/testsql/createNorthwindDb.sql"
+      MSSQL_SA_PW="${{ parameters.saPassword }}"
+
+      SQLCMD_BIN=""
+      if command -v sqlcmd >/dev/null 2>&1; then
+        SQLCMD_BIN="$(command -v sqlcmd)"
+      elif [ -x /opt/mssql-tools18/bin/sqlcmd ]; then
+        SQLCMD_BIN="/opt/mssql-tools18/bin/sqlcmd"
+      elif [ -x /opt/mssql-tools/bin/sqlcmd ]; then
+        SQLCMD_BIN="/opt/mssql-tools/bin/sqlcmd"
+      else
+        echo "ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations."
+        exit 1
+      fi
+
+      "$SQLCMD_BIN" \
+        -S localhost \
+        -U SA \
+        -P "$MSSQL_SA_PW" \
+        -Q "IF DB_ID(N'Northwind') IS NOT NULL BEGIN ALTER DATABASE [Northwind] SET SINGLE_USER WITH ROLLBACK IMMEDIATE; DROP DATABASE [Northwind]; END" \
+        -b
+
+      "$SQLCMD_BIN" \
+        -S localhost \
+        -U SA \
+        -P "$MSSQL_SA_PW" \
+        -i "$SCRIPT_PATH" \
+        -b
+    displayName: 'Create Northwind Database [Linux]'
+    retryCountOnTaskFailure: 1
diff --git a/eng/pipelines/pr/steps/configure-sqlserver-step.yml b/eng/pipelines/pr/steps/configure-sqlserver-step.yml
new file mode 100644
index 0000000000..ebae5390e4
--- /dev/null
+++ b/eng/pipelines/pr/steps/configure-sqlserver-step.yml
@@ -0,0 +1,30 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+parameters:
+
+  # Path to use for file stream tests. This only applies to Windows test runs.
+  - name: fileStreamDirectory
+    type: string
+
+  - name: operatingSystem
+    type: string
+
+  # Password to use for the SA account. This should be generated from the generate-secrets-stage.
+  - name: saPassword
+    type: string
+
+steps:
+  - ${{ if eq(parameters.operatingSystem, 'Windows') }}:
+      - template: /eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml@self
+        parameters:
+          fileStreamDirectory: ${{ parameters.fileStreamDirectory }}
+          saPassword: ${{ parameters.saPassword }}
+
+  - ${{ elseif eq(parameters.operatingSystem, 'Linux') }}:
+      - template: /eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml@self
+        parameters:
+          saPassword: ${{ parameters.saPassword }}
diff --git a/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml b/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
new file mode 100644
index 0000000000..d1567beaee
--- /dev/null
+++ b/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
@@ -0,0 +1,115 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# 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:
+
+  # Path to use for file stream tests.
+  - name: fileStreamDirectory
+    type: string
+
+  # Password to use for the SA account. This should be generated from the generate-secrets-stage.
+  - name: saPassword
+    type: string
+
+steps:
+  # GOTCHA: We must use the Windows-only powershell task here instead of the cross-platform pwsh
+  # task because we call some Windows-specific cmdlets.
+
+  # Enable TCP and NP protocols on the default SQL Server instance
+  - powershell: |
+      try
+      {
+        echo "> 1. Acquire WMI handle"
+        Import-Module "sqlps"
+        $smo = 'Microsoft.SqlServer.Management.Smo.'
+        $wmi = new-object ($smo + 'Wmi.ManagedComputer')
+
+
+        Write-Host "WMI Information:"
+        $wmi
+
+        echo "> 2. Enable TCP on the default instance"
+        $Tcp = $wmi.GetSmoObject("ManagedComputer[@Name='$env:COMPUTERNAME']/ ServerInstance[@Name='MSSQLSERVER']/ServerProtocol[@Name='Tcp']")
+        $Tcp.IsEnabled = $true
+        $Tcp.Alter()
+
+        Write-Host "TCP Information:"
+        $Tcp
+
+        echo "> 3. Enable named pipes on the default instance"
+        $Np = $wmi.GetSmoObject("ManagedComputer[@Name='$env:COMPUTERNAME']/ ServerInstance[@Name='MSSQLSERVER']/ServerProtocol[@Name='Np']")
+        $Np.IsEnabled = $true
+        $Np.Alter()
+
+        Write-Host "NP Information:"
+        $Np
+      }
+      catch
+      {
+        $error[0] | format-list -force
+        throw
+      }
+
+      New-NetFirewallRule -DisplayName "SQL TCP Ports" -Direction Inbound -Protocol TCP -LocalPort 1433 -Action allow
+      $sqlSrvPath = (Get-WmiObject win32_service | ?{$_.DisplayName -eq 'SQL Server (MSSQLSERVER)'} | select @{Name="Path"; Expression={$_.PathName.split('"')[1]}}).Path
+      New-NetFirewallRule -DisplayName "sqlservr.exe" -Program "$sqlSrvPath"
+    displayName: 'Enable TCP, NP & Firewall [Win]'
+    retryCountOnTaskFailure: 2
+
+  # Set the SA password on the default instance
+  - powershell: |
+      # Propagate parameters to PS variables ###############################
+      $password = "${{ parameters.saPassword }}"
+
+      # Connect to database and update SA account ##########################
+      Import-Module "sqlps"
+      $machineName = $env:COMPUTERNAME
+
+      Invoke-Sqlcmd -ServerInstance "$machineName" @"
+          ALTER LOGIN [sa] ENABLE;
+          ALTER LOGIN [sa] WITH PASSWORD = '$password';
+      "@
+    displayName: 'Set SA Password [Win]'
+    retryCountOnTaskFailure: 5
+
+  # Create folder for file stream tests
+  - powershell: |
+      New-Item -Path ${{ parameters.fileStreamDirectory }} -ItemType Directory
+    displayName: 'Create FileStreamFolder'
+    retryCountOnTaskFailure: 1
+    continueOnError: true
+
+  # Install northwind database
+  - powershell: |
+      # Propagate parameters to PS variables ###############################
+      $repoRoot = "$(REPO_ROOT)"
+      echo "repoRoot= $repoRoot"
+
+      # Install Northwind Database #########################################
+      Import-Module "sqlps"
+      $machineName = $env:COMPUTERNAME
+
+      # Delete any existing northwind database
+      Invoke-Sqlcmd `
+          -ServerInstance "$machineName" `
+          -Database "master" `
+          -Query @"
+              IF DB_ID(N'Northwind') IS NOT NULL
+                BEGIN
+              ALTER DATABASE [Northwind] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
+              DROP DATABASE [Northwind];
+              END
+      "@
+
+      # Install northwind database via script
+      $scriptPath = "$repoRoot\tools\testsql\createNorthwindDb.sql"
+      Invoke-Sqlcmd -ServerInstance "$machineName" -Database "master" -InputFile $scriptPath
+    displayName: 'Create Northwind Database [Win]'
+    retryCountOnTaskFailure: 1
diff --git a/eng/pipelines/pr/steps/install-dotnet.yml b/eng/pipelines/pr/steps/install-dotnet.yml
new file mode 100644
index 0000000000..fe1c8f7878
--- /dev/null
+++ b/eng/pipelines/pr/steps/install-dotnet.yml
@@ -0,0 +1,27 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This is a step to wrap the install-dotnet step for use in the PR pipeline. It will always install
+# the SDK version specified in the global.json file, and if the runtime version specified does not
+# begin with "net4" (ie, indicating netfx runtime is being used), the version will be passed in as
+# part of the runtime parameters.
+#
+# This version chains into the common install-dotnet step to enable the pr pipeline to call a
+# single step template and get the desired behavior without complexity.
+
+parameters:
+  - name: runtimeVersion
+    type: string
+    default: ''
+
+steps:
+  - template: /eng/pipelines/common/steps/install-dotnet.yml@self
+    parameters:
+      ${{ if and( not(eq(parameters.runtimeVersion, '' )), not(contains(parameters.runtimeVersion, 'net4')) ) }}:
+        runtimes:
+          - "${{ replace(parameters.runtimeVersion, 'net', '') }}.x"
+
+  - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
diff --git a/eng/pipelines/pr/steps/pack-buildproj-step.yml b/eng/pipelines/pr/steps/pack-buildproj-step.yml
new file mode 100644
index 0000000000..6b2980cbb4
--- /dev/null
+++ b/eng/pipelines/pr/steps/pack-buildproj-step.yml
@@ -0,0 +1,59 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This is a step to build a project via the build.proj. This will execute the "Pack*" target in
+# build.proj, where * is the packageShortName provided in the parameters. Because the "no build"
+# parameter is not provided, the target will implicitly build the projects required to create the
+# NuGet package.
+
+parameters:
+  # General Parameters =====================================================
+
+  # Condition parameter to forward onto the DotNetCoreCLI task.
+  - name: condition
+    type: string
+    default: succeeded()
+
+  # Build Parameters =======================================================
+
+  # Configuration to use to build the project.
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # Suffix to apply to the generated packages such that the package will be considered a prerelease
+  # version. The resulting package version will look like: `1.2.3-suffix888.1` where 1.2.3 is the
+  # default version specified in Versions.props, suffix is this parameter, and 888.1 is the build
+  # number for the currently executing build.
+  - name: buildSuffix
+    type: string
+
+  # Package/project to build and pack.
+  - name: packageShortName
+    type: string
+    values:
+      - Azure
+      - AkvProvider
+      - Abstractions
+      - Logging
+      - SqlClient
+      - SqlServer
+
+steps:
+  - task: DotNetCoreCLI@2
+    displayName: 'build.proj - Build${{ parameters.packageShortName }}'
+    condition: ${{ parameters.condition }}
+    inputs:
+      command: build
+      projects: build.proj
+      verbosity: detailed
+      arguments: >-
+        -t:Pack${{ parameters.packageShortName }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
+        -p:BuildNumber='$(Build.BuildNumber)'
+        -p:BuildSuffix='${{ parameters.buildSuffix }}'
diff --git a/eng/pipelines/pr/steps/test-buildproj-step.yml b/eng/pipelines/pr/steps/test-buildproj-step.yml
new file mode 100644
index 0000000000..5309e7ef96
--- /dev/null
+++ b/eng/pipelines/pr/steps/test-buildproj-step.yml
@@ -0,0 +1,59 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+parameters:
+  # General Parameters =======================================================
+
+  # Configuration to use to build the project.
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # Suffix to apply to the generated packages such that the package will be considered a prerelease
+  # version. The resulting package version will look like: `1.2.3-suffix888.1` where 1.2.3 is the
+  # default version specified in Versions.props, suffix is this parameter, and 888.1 is the build
+  # number for the currently executing build.
+  - name: buildSuffix
+    type: string
+
+  # Test Parameters ========================================================
+
+  # Package/project to test.
+  - name: packageShortName
+    type: string
+    values:
+      - Azure
+      - AkvProvider
+      - Abstractions
+      - Logging
+      - SqlClient
+      - SqlServer
+
+  - name: testFramework
+    type: string
+
+  # If the project to test has multiple projects supported by build.proj, use this optional
+  # parameter to specify the project to execute. This will be appended to Test{PackageShortName} to
+  # generate the target to execute. See build.proj for supported targets.
+  - name: testProject
+    type: string
+    default: ''
+
+steps:
+  - task: DotNetCoreCLI@2
+    displayName: 'build.proj - Test${{ parameters.packageShortName }}${{ parameters.testProject }}'
+    inputs:
+      command: build
+      projects: build.proj
+      verbosity: detailed
+      arguments: >-
+        -t:Test${{ parameters.packageShortName }}${{ parameters.testProject }}
+        -p:Configuration=${{ parameters.buildConfiguration }}
+        -p:BuildNumber='$(Build.BuildNumber)'
+        -p:BuildSuffix='${{ parameters.buildSuffix }}'
+        -p:TestFramework=${{ parameters.testFramework }}
diff --git a/eng/pipelines/pr/variables/pr-variables.yml b/eng/pipelines/pr/variables/pr-variables.yml
new file mode 100644
index 0000000000..4a28253dc7
--- /dev/null
+++ b/eng/pipelines/pr/variables/pr-variables.yml
@@ -0,0 +1,30 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This file contains variables used for running PR pipelines.
+
+variables:
+  # Libraries ==============================================================
+
+  # These variables are used to construct the config file for manual tests.
+  #
+  # AzureKeyVaultTenantId
+  # AzureKeyVaultUrl
+  # ConnectionStringNp_Azure_ManagedIdentity
+  # ConnectionStringNp_LocalhostDefault_UsernamePassword
+  # ConnectionStringTcp_Azure_ManagedIdentity
+  # ConnectionStringTcp_LocalhostDefault_UsernamePassword
+  # LocalDbAppName
+  # LocalDbSharedInstanceName
+  # PoolNameDefault
+  - group: sqlclient-testconfig-v1
+
+  # General Variables ======================================================
+  - name: stageNamePack
+    value: "pack_stage"
+
+  - name: stageNameSecrets
+    value: "secrets_stage"
diff --git a/eng/pipelines/stress/stress-tests-job.yml b/eng/pipelines/stress/stress-tests-job.yml
index a216c23864..ac82002ece 100644
--- a/eng/pipelines/stress/stress-tests-job.yml
+++ b/eng/pipelines/stress/stress-tests-job.yml
@@ -144,7 +144,7 @@ jobs:
     steps:
 
       # Install the .NET SDK and Runtimes.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           runtimes: [8.x, 9.x]
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/SqlDataReaderExtensions.cs b/src/Microsoft.Data.SqlClient/tests/Common/SqlDataReaderExtensions.cs
index 43c7bde4bd..8851cb5210 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/SqlDataReaderExtensions.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/SqlDataReaderExtensions.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Threading.Tasks;
+
 namespace Microsoft.Data.SqlClient.Tests.Common
 {
     /// <summary>
@@ -21,6 +23,19 @@ public static void FlushAllResults(this SqlDataReader dataReader)
             } while (dataReader.NextResult());
         }
 
+        /// <summary>
+        /// Reads all result sets in the provided <paramref name="dataReader"/> and discards them
+        /// asynchronously.
+        /// </summary>
+        /// <param name="dataReader">Reader to flush results from.</param>
+        public static async Task FlushAllResultsAsync(this SqlDataReader dataReader)
+        {
+            do
+            {
+                await dataReader.FlushResultSetAsync();
+            } while (await dataReader.NextResultAsync());
+        }
+
         /// <summary>
         /// Reads all results in the current result set of the provided <paramref name="dataReader"/>
         /// and discards them.
@@ -33,5 +48,18 @@ public static void FlushResultSet(this SqlDataReader dataReader)
                 // Discard results.
             }
         }
+
+        /// <summary>
+        /// Reads all results in the current result set of the provided <paramref name="dataReader"/>
+        /// and discards them asynchronously.
+        /// </summary>
+        /// <param name="dataReader">Reader to flush results from.</param>
+        public static async Task FlushResultSetAsync(this SqlDataReader dataReader)
+        {
+            while (await dataReader.ReadAsync())
+            {
+                // Discard results.
+            }
+        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
index 1c16e90ac4..620d7bd99a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
@@ -14,13 +14,18 @@
 using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider;
 using Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted.Setup;
 using Microsoft.Data.SqlClient.ManualTesting.Tests.SystemDataInternals;
+using Microsoft.Data.SqlClient.Tests.Common;
 using Xunit;
 
+using CommonObjects = Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
     /// <summary>
     /// Always Encrypted public API Manual tests.
     /// </summary>
+    // @TODO: These tests are known to not run reliably in DEBUG mode.
+    [ConditionalClass(typeof(DataTestUtility), nameof(DataTestUtility.IsNotDebugBuild))]
     public sealed class ApiShould : IClassFixture<SQLSetupStrategyCertStoreProvider>, IDisposable
     {
         private SQLSetupStrategy _fixture;
@@ -726,37 +731,41 @@ public void TestExecuteReader(string connection)
         [ClassData(typeof(AEConnectionStringProvider))]
         public async Task TestExecuteReaderAsyncWithLargeQuery(string connectionString)
         {
-            string randomName = DataTestUtility.GetShortName(Guid.NewGuid().ToString().Replace("-", ""), false);
-            if (randomName.Length > 50)
-            {
-                randomName = randomName.Substring(0, 50);
-            }
-            string tableName = $"VeryLong_{randomName}_TestTableName";
-            int columnsCount = 50;
-
-            // Arrange - drops the table with long name and re-creates it with 52 columns (ID, name, ColumnName0..49)
-            using SqlConnection connection = new SqlConnection(connectionString);
+            // Arrange
+            // - Set up connection to run the test
+            using SqlConnection connection = new(connectionString);
             await connection.OpenAsync();
 
-            using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects.Table wideTable = new(connection, tableName, GenerateBitTableDefinition(columnsCount));
-            string name = "nobody";
+            // - Drop and create table with 52 columns (ID, name, ColumnName0..49)
+            string tableName = DataTestUtility.GetShortName("VeryLongTestTableName_", withBracket: false);
+            const int columnsCount = 50;
+            using CommonObjects.Table wideTable = new(connection, tableName, GenerateBitTableDefinition(columnsCount));
 
-            // This creates a "select top 100" query that has over 40k characters
-            using SqlCommand sqlCommand = new(GenerateSelectQuery(wideTable.Name, columnsCount, 10, "WHERE Name = @FirstName AND ID = @CustomerId"),
+            // - Create SELECT query that has over 40k characters *and repeats 10 times*
+            using SqlCommand sqlCommand = new(
+                GenerateSelectQuery(wideTable.Name, columnsCount, 10, "WHERE Name = @FirstName AND ID = @CustomerId"),
                 connection,
                 transaction: null,
                 columnEncryptionSetting: SqlCommandColumnEncryptionSetting.Enabled);
-            sqlCommand.Parameters.Add(@"CustomerId", SqlDbType.Int);
-            sqlCommand.Parameters.Add(@"FirstName", SqlDbType.VarChar, name.Length);
 
-            sqlCommand.Parameters[0].Value = 0;
-            sqlCommand.Parameters[1].Value = name;
+            SqlParameter parameter1 = sqlCommand.Parameters.Add(@"CustomerId", SqlDbType.Int);
+            parameter1.Value = 0;
+
+            SqlParameter parameter2 = sqlCommand.Parameters.Add(@"FirstName", SqlDbType.VarChar);
+            parameter2.Value = "nobody";
 
-            // Act and Assert
-            // Test that execute reader async does not throw an exception.
-            // The table is empty so there should be no results; however, the bug previously found is that it causes a TDS RPC exception on enclave.
+            // Act
             using SqlDataReader sqlDataReader = await sqlCommand.ExecuteReaderAsync();
+
+            // Assert
+            // - The table is empty so there should be no results; however, the bug previously
+            //   found is that it causes a TDS RPC exception on enclave.
             Assert.False(sqlDataReader.HasRows, "The table should be empty");
+
+            // Cleanup
+            // - Explicitly throw away the results from the reader to avoid any race conditions in
+            //   disposal logic.
+            await sqlDataReader.FlushAllResultsAsync();
         }
 
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsTargetReadyForAeWithKeyStore))]
@@ -1914,7 +1923,7 @@ public void TestExecuteXmlReader(string connection)
             IList<object> values = GetValues(dataHint: 60);
             int numberOfRows = 10;
 
-            // Insert a bunch of rows in to the table.	
+            // Insert a bunch of rows in to the table.
             int rowsAffected = InsertRows(tableName: _tableName, numberofRows: numberOfRows, values: values, connection: connection);
             Assert.True(rowsAffected == numberOfRows, "number of rows affected is unexpected.");
 
@@ -1922,12 +1931,12 @@ public void TestExecuteXmlReader(string connection)
             {
                 sqlConnection.Open();
 
-                // select the set of rows that were inserted just now.	
+                // select the set of rows that were inserted just now.
                 using (SqlCommand sqlCommand = new SqlCommand($"SELECT LastName FROM [{_tableName}] WHERE FirstName = @FirstName AND CustomerId = @CustomerId FOR XML AUTO;", sqlConnection, transaction: null, columnEncryptionSetting: SqlCommandColumnEncryptionSetting.Enabled))
                 {
                     if (DataTestUtility.EnclaveEnabled)
                     {
-                        //Increase Time out for enclave-enabled server.	
+                        //Increase Time out for enclave-enabled server.
                         sqlCommand.CommandTimeout = 90;
                     }
                     sqlCommand.Parameters.Add(@"CustomerId", SqlDbType.Int);
@@ -2031,7 +2040,7 @@ public void TestSqlCommandCancel(string connection, string value)
                      * Use long-running tasks to create the thread. This enables any failed assertions to propagate, rather than
                      * allowing the exception to kill the thread and the process.
                      * These threads should progress in the sequence below:
-                     * 
+                     *
                      * Workload Thread                      | Cancel Thread
                      * ------------------------------------ | -------------
                      * Start thread                         | Start thread
@@ -2307,7 +2316,7 @@ public void TestConnectionCustomKeyStoreProviderDuringAeQuery(string connectionS
                     () => ExecuteQueryThatRequiresCustomKeyStoreProvider(connection));
                 AssertExceptionCausedByFailureToDecrypt(ex);
 
-                // not required provider will replace the previous entry so required provider will not be found 
+                // not required provider will replace the previous entry so required provider will not be found
                 connection.RegisterColumnEncryptionKeyStoreProvidersOnConnection(_notRequiredProvider);
                 ex = Assert.Throws<ArgumentException>(
                     () => ExecuteQueryThatRequiresCustomKeyStoreProvider(connection));
@@ -2448,7 +2457,7 @@ public void TestRetryWhenAEParameterMetadataCacheIsStale(string connectionString
             cmd.CommandText = string.Format(alterCekQueryFormatString, _tableName, table.columnEncryptionKey2.Name);
             cmd.ExecuteNonQuery();
 
-            // execute the select query again. it will attempt to use the stale cache entry, receive 
+            // execute the select query again. it will attempt to use the stale cache entry, receive
             // a retryable error from the server, remove the stale cache entry, retry and succeed
             cmd.CommandText = enclaveSelectQuery;
             cmd.Parameters.AddWithValue("@CustomerId", 0);
@@ -2562,7 +2571,7 @@ public void TestRetryWhenAEEnclaveCacheIsStale(string connectionString)
             readAsyncTask2.GetAwaiter().GetResult();
 #endif
             */
-            
+
             // revert the CEK change to the CustomerId column
             cmd.Parameters.Clear();
             cmd.CommandText = string.Format(alterCekQueryFormatString, _tableName, table.columnEncryptionKey1.Name);
@@ -2699,8 +2708,8 @@ private DataTable CreateDataTable(string tableName, int numberofRows)
             };
             table.Columns.Add(column);
 
-            // Create three new DataRow objects and add  
-            // them to the DataTable 
+            // Create three new DataRow objects and add
+            // them to the DataTable
             for (int i = 0; i < numberofRows; i++)
             {
                 row = table.NewRow();
@@ -2810,7 +2819,7 @@ private async Task<object> VerifyExecuteScalarAsync(SqlCommand sqlCommand)
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="sqlCommand"></param>
         /// <param name="cancellationToken"></param>
@@ -2821,7 +2830,7 @@ private async Task ExecuteNonQueryAsync(SqlCommand sqlCommand, CancellationToken
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="sqlCommand"></param>
         /// <returns></returns>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index 623f645ddb..9bf1c0f519 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -188,6 +188,20 @@ public static string SQLServerVersion
                 IsSqlVectorSupported &&
                 CheckVectorFloat16Supported();
 
+        public static bool IsDebugBuild
+        {
+            get
+            {
+                #if DEBUG
+                return true;
+                #else
+                return false;
+                #endif
+            }
+        }
+
+        public static bool IsNotDebugBuild() => !IsDebugBuild;
+
         private static bool CheckVectorFloat16Supported()
         {
             try
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
index ca22d6eafd..4612145331 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
@@ -22,16 +22,10 @@ public static class InstanceNameTest
         public static void ConnectToSQLWithInstanceNameTest()
         {
             SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString);
+            DataTestUtility.ParseDataSource(builder.DataSource, out string hostname, out _, out _);
 
-            bool proceed = true;
-            string dataSourceStr = builder.DataSource.Replace("tcp:", "");
-            string[] serverNamePartsByBackSlash = dataSourceStr.Split('\\');
-            string hostname = serverNamePartsByBackSlash[0];
-            if (!dataSourceStr.Contains(",") && serverNamePartsByBackSlash.Length == 2)
-            {
-                proceed = !string.IsNullOrWhiteSpace(hostname) && IsBrowserAlive(hostname);
-            }
-
+            // @TODO: This test as it is written will report success even if it doesn't test anything.
+            bool proceed = !string.IsNullOrWhiteSpace(hostname) && IsBrowserAlive(hostname);
             if (proceed)
             {
                 using SqlConnection connection = new(builder.ConnectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
index 552fd4cea5..04b0de8072 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
@@ -150,6 +150,8 @@ public static void CancelAndDisposePreparedCommand_NamedPipe() =>
         public static void TimeOutDuringRead_Tcp() =>
             TimeOutDuringRead(tcp_connStr);
 
+        // @TODO: This test does not test NP behavior as the proxy server converts the named pipe connection string to a TCP connection string.
+        [ActiveIssue("https://dev.azure.com/SqlClientDrivers/ADO.Net/_workitems/edit/40840/")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotNamedInstance))]
         [PlatformSpecific(TestPlatforms.Windows)]
         public static void TimeOutDuringRead_NamedPipe() =>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
index e4bd1133ac..24f34bbf12 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     public sealed class SqlNotificationTest : IDisposable
     {
         // Misc constants
-        private const int CALLBACK_TIMEOUT = 5000; // milliseconds
+        private const int CALLBACK_TIMEOUT = 20000; // milliseconds
 
         // Database schema
         private readonly string _tableName = $"dbo.[SQLDEP_{Guid.NewGuid().ToString()}]";
@@ -143,6 +143,7 @@ public void Test_SingleDependency_Stopped()
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        [Trait("Category", "flaky")]
         public void Test_SingleDependency_AllDefaults_SqlAuth()
         {
             Assert.True(SqlDependency.Start(_startConnectionString), "Failed to start listener.");
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
index 6e82dc5076..24c9c4f884 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
@@ -15,33 +15,32 @@ public class Config
         public string TCPConnectionStringHGSVBS = null;
         public string TCPConnectionStringNoneVBS = null;
         public string TCPConnectionStringAASSGX = null;
+        public bool EnclaveEnabled = false;
+        public bool TracingEnabled = false;
         public string AADAuthorityURL = null;
         public string AADPasswordConnectionString = null;
         public string AADServicePrincipalId = null;
         public string AADServicePrincipalSecret = null;
         public string AzureKeyVaultURL = null;
         public string AzureKeyVaultTenantId = null;
+        public bool SupportsIntegratedSecurity = false;
         public string LocalDbAppName = null;
         public string LocalDbSharedInstanceName = null;
-        public bool EnclaveEnabled = false;
-        public bool TracingEnabled = false;
-        public bool SupportsIntegratedSecurity = false;
-        public bool ManagedIdentitySupported = true;
         public string FileStreamDirectory = null;
         public bool UseManagedSNIOnWindows = false;
         public string DNSCachingConnString = null;
         public string DNSCachingServerCR = null;  // this is for the control ring
         public string DNSCachingServerTR = null;  // this is for the tenant ring
-        public bool IsAzureSynapse = false; // True for Azure Data Warehouse/Synapse
         public bool IsDNSCachingSupportedCR = false;  // this is for the control ring
         public bool IsDNSCachingSupportedTR = false;  // this is for the tenant ring
         public string EnclaveAzureDatabaseConnString = null;
+        public bool ManagedIdentitySupported = true;
         public string UserManagedIdentityClientId = null;
         public string PowerShellPath = null;
+        public string AliasName = null;
         public string KerberosDomainPassword = null;
         public string KerberosDomainUser = null;
         public bool IsManagedInstance = false;
-        public string AliasName = null;
 
         public static Config Load(string configPath = @"config.json")
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json
index 4362d07c75..b2200b03c0 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json
@@ -22,7 +22,6 @@
     "SupportsIntegratedSecurity": true,
     "LocalDbAppName": "",
     "LocalDbSharedInstanceName": "",
-    "SupportsFileStream": false,
     "FileStreamDirectory": "",
     "UseManagedSNIOnWindows": false,
     "DNSCachingConnString": "",
@@ -30,11 +29,13 @@
     "DNSCachingServerTR": "",
     "IsDNSCachingSupportedCR": false,
     "IsDNSCachingSupportedTR": false,
-    "IsAzureSynapse": false,
     "EnclaveAzureDatabaseConnString": "",
     "ManagedIdentitySupported": true,
     "UserManagedIdentityClientId": "",
     "PowerShellPath": "",
     "AliasName": "",
-    "WorkloadIdentityFederationServiceConnectionId": ""
+    "WorkloadIdentityFederationServiceConnectionId": "",
+    "KerberosDomainPassword": "",
+    "KerberosDomainUser": "",
+    "IsManagedInstance": false
 }

From 4afd45edb1b48144450f1ccf0a22f24015283257 Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Fri, 5 Jun 2026 21:09:28 +0530
Subject: [PATCH 128/298] Add automatic idle connection pruning to
 ChannelDbConnectionPool (#4304)

Introduce a PoolPruner that periodically samples the pool's idle
connection count and, once a sampling window completes, prunes the
median number of idle connections. This lets the pool shrink back
toward MinPoolSize after load subsides while avoiding over-pruning
during brief lulls.
---
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |  36 +-
 .../ConnectionPool/ChannelDbConnectionPool.cs | 133 ++--
 .../SqlClient/ConnectionPool/PoolPruner.cs    | 230 +++++++
 .../ChannelDbConnectionPoolPruningTest.cs     | 622 ++++++++++++++++++
 4 files changed, 960 insertions(+), 61 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index c0e170b3f8..568592072d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -159,32 +159,22 @@ internal static Timer UnsafeCreateTimer(
                 state,
                 TimeSpan.FromMilliseconds(dueTimeMilliseconds),
                 TimeSpan.FromMilliseconds(periodMilliseconds));
-        
+
         internal static Timer UnsafeCreateTimer(TimerCallback callback, object state, TimeSpan dueTime, TimeSpan period)
         {
-            // Don't capture the current ExecutionContext and its AsyncLocals onto 
+            // Don't capture the current ExecutionContext and its AsyncLocals onto
             // a global timer causing them to live forever
-            bool restoreFlow = false;
-            try
+            if (ExecutionContext.IsFlowSuppressed())
             {
-                if (!ExecutionContext.IsFlowSuppressed())
-                {
-                    ExecutionContext.SuppressFlow();
-                    restoreFlow = true;
-                }
-
                 return new Timer(callback, state, dueTime, period);
             }
-            finally
+
+            using (ExecutionContext.SuppressFlow())
             {
-                // Restore the current ExecutionContext
-                if (restoreFlow)
-                {
-                    ExecutionContext.RestoreFlow();
-                }
+                return new Timer(callback, state, dueTime, period);
             }
         }
-            
+
 
 #region COM+ exceptions
         internal static ArgumentException Argument(string error)
@@ -639,7 +629,7 @@ internal static string BuildMultiPartName(string[] strings)
         {
             StringBuilder bld = new();
             // Assume we want to build a full multi-part name with all parts except trimming separators for
-            // leading empty names (null or empty strings, but not whitespace). Separators in the middle 
+            // leading empty names (null or empty strings, but not whitespace). Separators in the middle
             // should be added, even if the name part is null/empty, to maintain proper location of the parts.
             for (int i = 0; i < strings.Length; i++)
             {
@@ -839,14 +829,14 @@ internal static Version GetAssemblyVersion()
         /// Represents a collection of Azure SQL Server endpoint URLs for various regions and environments.
         /// </summary>
         /// <remarks>This array includes endpoint URLs for Azure SQL in global, Germany, US Government,
-        /// China, and Fabric environments. These endpoints are used to identify and interact with Azure SQL services 
+        /// China, and Fabric environments. These endpoints are used to identify and interact with Azure SQL services
         /// in their respective regions or environments.</remarks>
         internal static readonly List<string> s_azureSqlServerEndpoints = new() { AZURE_SQL,
                                                                         AZURE_SQL_GERMANY,
                                                                         AZURE_SQL_USGOV,
                                                                         AZURE_SQL_CHINA,
                                                                         AZURE_SQL_FABRIC };
-        
+
         /// <summary>
         /// Contains endpoint strings for Azure SQL Server on-demand services.
         /// Each entry is a combination of the ONDEMAND_PREFIX and a specific Azure SQL endpoint string.
@@ -872,9 +862,9 @@ internal static Version GetAssemblyVersion()
         internal static bool IsAzureSynapseOnDemandEndpoint(string dataSource)
         {
             return IsEndpoint(dataSource, s_azureSynapseOnDemandEndpoints)
-                || dataSource.IndexOf(AZURE_SYNAPSE, StringComparison.OrdinalIgnoreCase) >= 0; 
+                || dataSource.IndexOf(AZURE_SYNAPSE, StringComparison.OrdinalIgnoreCase) >= 0;
         }
-        
+
         internal static bool IsAzureSqlServerEndpoint(string dataSource)
         {
             return IsEndpoint(dataSource, s_azureSqlServerEndpoints);
@@ -1088,7 +1078,7 @@ internal enum InternalErrorCode
 
             SqlDependencyObtainProcessDispatcherFailureObjectHandle = 50,
             SqlDependencyProcessDispatcherFailureCreateInstance = 51,
-            
+
             SqlDependencyCommandHashIsNotAssociatedWithNotification = 53,
 
             UnknownTransactionFailure = 60,
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 45e82eda91..3218bf461b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -23,10 +23,10 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     /// <summary>
     /// A connection pool implementation based on the channel data structure.
     /// Provides methods to manage the pool of connections, including acquiring and releasing connections.
-    /// 
+    ///
     /// This implementation uses <see cref="System.Threading.Channels.Channel{T}"/> for managing idle connections,
     /// which offers several advantages over the traditional <c>WaitHandleDbConnectionPool</c>:
-    /// 
+    ///
     /// <list type="bullet">
     /// <item><description>
     /// <strong>Better async performance:</strong> Channels provide native async/await support without blocking
@@ -45,11 +45,11 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     /// the potential for race conditions in connection lifecycle management.
     /// </description></item>
     /// </list>
-    /// 
+    ///
     /// The trade-off is slightly higher memory overhead per pool instance due to the channel infrastructure,
     /// but this is generally offset by the performance benefits in async-heavy workloads.
     /// </summary>
-    internal sealed class ChannelDbConnectionPool : IDbConnectionPool
+    internal sealed class ChannelDbConnectionPool : IDbConnectionPool, IDisposable
     {
         #region Fields
         // Limits synchronous operations which depend on async operations on managed
@@ -115,13 +115,20 @@ internal ChannelDbConnectionPool(
             _connectionSlots = new(MaxPoolSize);
             _idleChannel = new();
 
+            // Pruning is only useful when the pool can grow beyond MinPoolSize.
+            // If min >= max, the pool is fixed-size and pruning would never activate.
+            if (MinPoolSize < MaxPoolSize)
+            {
+                Pruner = new PoolPruner(this, PoolGroupOptions.LoadBalanceTimeout);
+            }
+
             State = Running;
         }
 
         #region Properties
         /// <inheritdoc />
         public ConcurrentDictionary<
-            DbConnectionPoolAuthenticationContextKey, 
+            DbConnectionPoolAuthenticationContextKey,
             DbConnectionPoolAuthenticationContext> AuthenticationContexts { get; }
 
         /// <inheritdoc />
@@ -168,6 +175,8 @@ public ConcurrentDictionary<
         public bool UseLoadBalancing => PoolGroupOptions.UseLoadBalancing;
 
         private uint MaxPoolSize { get; }
+
+        private int MinPoolSize => PoolGroupOptions.MinPoolSize;
         #endregion
 
         #region Methods
@@ -223,7 +232,7 @@ public void PutObjectFromTransactedPool(DbConnectionInternal connection)
 
         /// <inheritdoc />
         public DbConnectionInternal ReplaceConnection(
-            DbConnection owningObject, 
+            DbConnection owningObject,
             DbConnectionInternal oldConnection,
             TimeoutTimer timeout)
         {
@@ -242,13 +251,13 @@ public void ReturnInternalConnection(DbConnectionInternal connection, DbConnecti
             }
 
             SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.DeactivateObject|RES|CPOOL> {0}, Connection {1}, Deactivating.", 
-                Id, 
+                "<prov.DbConnectionPool.DeactivateObject|RES|CPOOL> {0}, Connection {1}, Deactivating.",
+                Id,
                 connection.ObjectID);
             connection.DeactivateConnection();
 
-            if (connection.IsConnectionDoomed || 
-                !connection.CanBePooled || 
+            if (connection.IsConnectionDoomed ||
+                !connection.CanBePooled ||
                 State == ShuttingDown)
             {
                 RemoveConnection(connection);
@@ -263,9 +272,15 @@ public void ReturnInternalConnection(DbConnectionInternal connection, DbConnecti
         /// <inheritdoc />
         public void Shutdown()
         {
-            // No-op for now, warmup will be implemented later.
+            State = ShuttingDown;
+            Pruner?.Dispose();
         }
 
+        /// <summary>
+        /// Disposes the pool by calling <see cref="Shutdown"/>. Does not throw.
+        /// </summary>
+        public void Dispose() => Shutdown();
+
         /// <inheritdoc />
         public void Startup()
         {
@@ -280,7 +295,7 @@ public void TransactionEnded(Transaction transaction, DbConnectionInternal trans
 
         /// <inheritdoc />
         public bool TryGetConnection(
-            DbConnection owningObject, 
+            DbConnection owningObject,
             TaskCompletionSource<DbConnectionInternal>? taskCompletionSource,
             TimeoutTimer timeout,
             out DbConnectionInternal? connection)
@@ -307,19 +322,19 @@ public bool TryGetConnection(
                 connection = null;
                 return false;
             }
- 
+
             // This is ugly, but async anti-patterns above and below us in the stack necessitate a fresh task to be
-            // created. Ideally we would just return the Task from GetInternalConnection and let the caller await 
+            // created. Ideally we would just return the Task from GetInternalConnection and let the caller await
             // it as needed, but instead we need to signal to the provided TaskCompletionSource when the connection
-            // is established. This pattern has implications for connection open retry logic that are intricate 
-            // enough to merit dedicated work. For now, callers that need to open many connections asynchronously 
-            // and in parallel *must* pre-prevision threads in the managed thread pool to avoid exhaustion and 
+            // is established. This pattern has implications for connection open retry logic that are intricate
+            // enough to merit dedicated work. For now, callers that need to open many connections asynchronously
+            // and in parallel *must* pre-prevision threads in the managed thread pool to avoid exhaustion and
             // timeouts.
-            // 
-            // Also note that we don't have access to the cancellation token passed by the caller to the original 
+            //
+            // Also note that we don't have access to the cancellation token passed by the caller to the original
             // OpenAsync call. This means that we cannot cancel the connection open operation if the caller's token
-            // is cancelled. We can only cancel based on our own timeout, which is set to the owningObject's 
-            // ConnectionTimeout. 
+            // is cancelled. We can only cancel based on our own timeout, which is set to the owningObject's
+            // ConnectionTimeout.
             Task.Run(async () =>
             {
                 if (taskCompletionSource.Task.IsCompleted)
@@ -372,14 +387,14 @@ public bool TryGetConnection(
         /// </summary>
         /// <param name="owningConnection">The owning connection.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
-        /// <param name="timeout">The overall timeout budget. Passed through to the physical connection 
+        /// <param name="timeout">The overall timeout budget. Passed through to the physical connection
         /// so it uses the remaining budget rather than starting a fresh timeout.</param>
         /// <returns>A task representing the asynchronous operation, with a result of the new internal connection.</returns>
         /// <exception cref="OperationCanceledException">
         /// Thrown when the cancellation token is cancelled before the connection operation completes.
         /// </exception>
         private DbConnectionInternal? OpenNewInternalConnection(
-            DbConnection? owningConnection, 
+            DbConnection? owningConnection,
             CancellationToken cancellationToken,
             TimeoutTimer timeout)
         {
@@ -389,16 +404,16 @@ public bool TryGetConnection(
             // Instead, we reserve a connection slot prior to attempting to open a new connection and release the slot
             // in case of an exception.
 
-            return _connectionSlots.Add(
+            var result = _connectionSlots.Add(
                 createCallback: () =>
                 {
                     // https://github.com/dotnet/SqlClient/issues/3459
                     // TODO: This blocks the thread for several network calls!
-                    // When running async, the blocked thread is one allocated from the managed thread pool (due to 
-                    // use of Task.Run in TryGetConnection). This is why it's critical for async callers to 
-                    // pre-provision threads in the managed thread pool. Our options are limited because 
+                    // When running async, the blocked thread is one allocated from the managed thread pool (due to
+                    // use of Task.Run in TryGetConnection). This is why it's critical for async callers to
+                    // pre-provision threads in the managed thread pool. Our options are limited because
                     // DbConnectionInternal doesn't support an async open. It's better to block this thread and keep
-                    // throughput high than to queue all of our opens onto a single worker thread. Add an async path 
+                    // throughput high than to queue all of our opens onto a single worker thread. Add an async path
                     // when this support is added to DbConnectionInternal.
                     // TODO: ultimately, the connection factory should also accept our cancellation token.
                     var connection = ConnectionFactory.CreatePooledConnection(
@@ -420,6 +435,15 @@ public bool TryGetConnection(
                     _idleChannel?.TryWrite(null);
                     newConnection?.Dispose();
                 });
+
+            if (result is not null)
+            {
+                // A new connection was added to the pool. If we've grown past MinPoolSize,
+                // start the pruning timer so idle connections can be reclaimed.
+                Pruner?.UpdateTimer();
+            }
+
+            return result;
         }
 
         /// <summary>
@@ -457,13 +481,16 @@ private bool IsLiveConnection(DbConnectionInternal connection)
         private void RemoveConnection(DbConnectionInternal connection)
         {
             _connectionSlots.TryRemove(connection);
-            
+
             // Removing a connection from the pool opens a free slot.
             // Write a null to the idle connection channel to wake up a waiter, who can now open a new
             // connection. Statement order is important since we have synchronous completions on the channel.
             _idleChannel.TryWrite(null);
 
             connection.Dispose();
+
+            // If this removal brought us back to MinPoolSize, disable the pruning timer.
+            Pruner?.UpdateTimer();
         }
 
         /// <summary>
@@ -475,7 +502,7 @@ private void RemoveConnection(DbConnectionInternal connection)
             // The channel may contain nulls. Read until we find a non-null connection or exhaust the channel.
             while (_idleChannel.TryRead(out DbConnectionInternal? connection))
             {
-                if (connection is null) 
+                if (connection is null)
                 {
                     continue;
                 }
@@ -501,16 +528,16 @@ private void RemoveConnection(DbConnectionInternal connection)
         /// in the pool is deducted from the budget available for physical connection creation.</param>
         /// <returns>Returns a DbConnectionInternal that is retrieved from the pool.</returns>
         /// <exception cref="InvalidOperationException">
-        /// Thrown when an OperationCanceledException is caught, indicating that the timeout period 
+        /// Thrown when an OperationCanceledException is caught, indicating that the timeout period
         /// elapsed prior to obtaining a connection from the pool.
         /// </exception>
         /// <exception cref="Exception">
-        /// Thrown when a ChannelClosedException is caught, indicating that the connection pool 
+        /// Thrown when a ChannelClosedException is caught, indicating that the connection pool
         /// has been shut down.
         /// </exception>
         private async Task<DbConnectionInternal> GetInternalConnection(
-            DbConnection owningConnection, 
-            bool async, 
+            DbConnection owningConnection,
+            bool async,
             TimeoutTimer timeout)
         {
             DbConnectionInternal? connection = null;
@@ -530,7 +557,7 @@ private async Task<DbConnectionInternal> GetInternalConnection(
                     connection ??= GetIdleConnection();
 
 
-                    // If we didn't find an idle connection, try to open a new one.  
+                    // If we didn't find an idle connection, try to open a new one.
                     connection ??= OpenNewInternalConnection(
                         owningConnection,
                         cancellationToken,
@@ -604,18 +631,18 @@ private async Task<DbConnectionInternal> GetInternalConnection(
         }
 
         /// <summary>
-        /// Sets connection state and activates the connection for use. Should always be called after a connection is 
+        /// Sets connection state and activates the connection for use. Should always be called after a connection is
         /// created or retrieved from the pool.
         /// </summary>
         /// <param name="owningObject">The owning DbConnection instance.</param>
         /// <param name="connection">The DbConnectionInternal to be activated.</param>
         /// <exception cref="Exception">
-        /// Thrown when any exception occurs during connection activation. 
+        /// Thrown when any exception occurs during connection activation.
         /// </exception>
         private void PrepareConnection(DbConnection owningObject, DbConnectionInternal connection)
         {
             lock (connection)
-            {   
+            {
                 // Protect against Clear which calls IsEmancipated, which is affected by PrePush and PostPop
                 connection.PostPop(owningObject);
             }
@@ -653,5 +680,35 @@ private void ValidateOwnershipAndSetPoolingState(DbConnectionInternal connection
             }
         }
         #endregion
+
+        #region Pruning
+        /// <summary>
+        /// Manages idle connection pruning. Null when the pool is fixed-size (MinPoolSize >= MaxPoolSize)
+        /// because pruning would never activate.
+        /// </summary>
+        internal PoolPruner? Pruner { get; }
+
+        /// <summary>
+        /// Removes up to <paramref name="count"/> idle connections from the pool, respecting
+        /// the <see cref="MinPoolSize"/> floor. Called by <see cref="PoolPruner"/> after computing
+        /// the median of collected samples.
+        /// </summary>
+        internal void PruneConnections(int count)
+        {
+            while (count > 0
+                && IsRunning
+                && _connectionSlots.ReservationCount > MinPoolSize
+                && _idleChannel.TryRead(out var connection))
+            {
+                if (connection is null)
+                {
+                    continue;
+                }
+
+                RemoveConnection(connection);
+                count--;
+            }
+        }
+        #endregion
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs
new file mode 100644
index 0000000000..07899d26e3
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs
@@ -0,0 +1,230 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+using System.Threading;
+using Microsoft.Data.Common;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.ConnectionPool
+{
+    /// <summary>
+    /// Encapsulates idle connection pruning logic for <see cref="ChannelDbConnectionPool"/>.
+    /// Periodically samples the idle connection count and, once enough samples are collected,
+    /// computes the median and prunes that many idle connections from the pool.
+    /// <para>
+    /// This type is only instantiated when the pool can shrink (MinPoolSize &lt; MaxPoolSize).
+    /// When the pool is fixed-size, the pool holds no <see cref="PoolPruner"/> instance.
+    /// </para>
+    /// </summary>
+    internal sealed class PoolPruner : IDisposable
+    {
+        /// <summary>
+        /// Maximum allowed sample buffer size to prevent excessive memory allocation
+        /// from very large lifetime values. With a 10-second interval this supports
+        /// idle lifetimes up to 3000 seconds (50 minutes).
+        /// </summary>
+        internal const int MaxSampleSize = 300;
+
+        /// <summary>
+        /// Default sampling interval.
+        /// </summary>
+        private static readonly TimeSpan DefaultSamplingInterval = TimeSpan.FromSeconds(10);
+
+        /// <summary>
+        /// Default lifetime window used for sample size calculation when
+        /// LoadBalanceTimeout (Connection Lifetime) is zero.
+        /// </summary>
+        private static readonly TimeSpan DefaultLifetimeWindow = TimeSpan.FromSeconds(300);
+
+        /// <summary>
+        /// The owning connection pool whose idle connections are pruned.
+        /// </summary>
+        private readonly ChannelDbConnectionPool _pool;
+
+        /// <summary>
+        /// One-shot timer that triggers pruning evaluation. Re-armed manually after each
+        /// pruning operation to prevent overlapping invocations.
+        /// </summary>
+        private readonly Timer _timer;
+
+        /// <summary>
+        /// The interval between pruning samples/evaluations.
+        /// </summary>
+        private readonly TimeSpan _samplingInterval;
+
+        /// <summary>
+        /// Number of idle count samples to collect before computing the median and pruning.
+        /// Equals lifetime / interval (rounded up), clamped to <see cref="MaxSampleSize"/>.
+        /// </summary>
+        private readonly int _sampleSize;
+
+        /// <summary>
+        /// Buffer of idle count snapshots, one recorded per timer tick.
+        /// Sorted in-place when full to compute the median, then reset for the next window.
+        /// </summary>
+        private readonly int[] _samples;
+
+        /// <summary>
+        /// The 0-based index into the sorted <see cref="_samples"/> array that represents the median.
+        /// Always >= 0 because <see cref="DivideRoundingUp"/> returns >= 1.
+        /// </summary>
+        private readonly int _medianIndex;
+
+        /// <summary>
+        /// Whether the pruning timer is currently armed and firing.
+        /// Volatile because it is read outside the lock as a fast pre-check.
+        /// </summary>
+        private volatile bool _timerEnabled;
+
+        /// <summary>
+        /// Current write position in the <see cref="_samples"/> buffer.
+        /// Only accessed under the <see cref="_timer"/> lock.
+        /// </summary>
+        private int _sampleIndex;
+
+        /// <summary>
+        /// Creates a new pruner for the given pool.
+        /// </summary>
+        /// <param name="pool">The owning connection pool.</param>
+        /// <param name="lifetimeWindow">
+        /// The connection lifetime window used to compute sample count.
+        /// When zero or negative, <see cref="DefaultLifetimeWindow"/> is used.
+        /// </param>
+        internal PoolPruner(ChannelDbConnectionPool pool, TimeSpan lifetimeWindow)
+        {
+            _pool = pool;
+            _samplingInterval = DefaultSamplingInterval;
+
+            int lifetimeSeconds = (int)lifetimeWindow.TotalSeconds;
+            if (lifetimeSeconds <= 0)
+            {
+                lifetimeSeconds = (int)DefaultLifetimeWindow.TotalSeconds;
+            }
+
+            int intervalSeconds = (int)_samplingInterval.TotalSeconds;
+            _sampleSize = Math.Min(
+                DivideRoundingUp(lifetimeSeconds, intervalSeconds),
+                MaxSampleSize);
+
+            // Subtract 1 to convert from length to 0-based index. Safe because
+            // DivideRoundingUp always returns >= 1, so _sampleSize >= 1.
+            _medianIndex = DivideRoundingUp(_sampleSize, 2) - 1;
+            _samples = new int[_sampleSize];
+
+            _timer = ADP.UnsafeCreateTimer(OnPruningCallback, null, Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
+        }
+
+        #region Internal test surface
+
+        /// <summary>Whether the pruning timer is currently armed. Exposed for unit tests.</summary>
+        internal bool IsTimerEnabled => _timerEnabled;
+
+        /// <summary>Current write position in the sample buffer. Exposed for unit tests.</summary>
+        internal int SampleIndex => _sampleIndex;
+
+        /// <summary>Total number of samples collected per pruning window. Exposed for unit tests.</summary>
+        internal int SampleSize => _sampleSize;
+
+        /// <summary>Read-only view of the sample buffer contents. Exposed for unit tests.</summary>
+        internal ReadOnlySpan<int> Samples => _samples;
+
+        #endregion
+
+        /// <summary>
+        /// Enables or disables the pruning timer based on the current pool size relative to MinPoolSize.
+        /// Called by the pool after connections are opened or closed.
+        /// </summary>
+        internal void UpdateTimer()
+        {
+            if (!_pool.IsRunning)
+            {
+                return;
+            }
+
+            lock (_timer)
+            {
+                // Re-check after acquiring lock — Shutdown() may have disposed the timer.
+                if (!_pool.IsRunning)
+                {
+                    return;
+                }
+
+                int numConnections = _pool.Count;
+
+                if (numConnections > _pool.PoolGroupOptions.MinPoolSize && !_timerEnabled)
+                {
+                    // Pool grew beyond min — start collecting samples.
+                    _timerEnabled = true;
+                    _timer.Change(_samplingInterval, Timeout.InfiniteTimeSpan);
+                }
+                else if (numConnections <= _pool.PoolGroupOptions.MinPoolSize && _timerEnabled)
+                {
+                    // Pool shrunk back to min — stop pruning, reset sample buffer.
+                    _timer.Change(Timeout.Infinite, Timeout.Infinite);
+                    _sampleIndex = 0;
+                    _timerEnabled = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Timer callback that samples the idle count and, once enough samples are collected,
+        /// prunes idle connections based on the median of recent samples.
+        /// </summary>
+        internal void OnPruningCallback(object? state)
+        {
+            int toPrune;
+
+            lock (_timer)
+            {
+                // Guard against races with Dispose or UpdateTimer disabling the timer.
+                if (!_timerEnabled)
+                {
+                    return;
+                }
+
+                // Record the current idle count as a sample.
+                _samples[_sampleIndex] = _pool.IdleCount;
+
+                if (_sampleIndex != _sampleSize - 1)
+                {
+                    // Buffer not full yet — keep collecting, re-arm timer.
+                    _sampleIndex++;
+                    _timer.Change(_samplingInterval, Timeout.InfiniteTimeSpan);
+                    return;
+                }
+
+                // Buffer full — sort to find the median, then reset and re-arm.
+                // Array.Sort is O(n log n) but acceptable here since _sampleSize is capped at 300.
+                Array.Sort(_samples);
+                toPrune = _samples[_medianIndex];
+                _sampleIndex = 0;
+                _timer.Change(_samplingInterval, Timeout.InfiniteTimeSpan);
+            }
+
+            // Prune outside the lock to avoid holding it during I/O.
+            _pool.PruneConnections(toPrune);
+        }
+
+        /// <summary>
+        /// Stops the pruning timer and releases resources. Safe to call multiple times;
+        /// <see cref="Timer.Dispose()"/> is idempotent and does not throw.
+        /// </summary>
+        public void Dispose()
+        {
+            lock (_timer)
+            {
+                _timerEnabled = false;
+                _timer.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Returns the ceiling of <paramref name="value"/> / <paramref name="divisor"/>
+        /// using integer arithmetic. Always returns >= 1 for positive inputs.
+        /// </summary>
+        internal static int DivideRoundingUp(int value, int divisor) => 1 + (value - 1) / divisor;
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs
new file mode 100644
index 0000000000..74d9758cde
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs
@@ -0,0 +1,622 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Transactions;
+using Microsoft.Data.Common;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Xunit;
+using static Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolState;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Unit tests for the pruning feature in <see cref="ChannelDbConnectionPool"/>.
+    /// </summary>
+    public class ChannelDbConnectionPoolPruningTest
+    {
+        private static readonly SqlConnectionFactory ConnectionFactory = new SuccessfulSqlConnectionFactory();
+
+        #region Helpers
+
+        private static ChannelDbConnectionPool ConstructPool(
+            int minPoolSize = 0,
+            int maxPoolSize = 50,
+            int loadBalanceTimeout = 0)
+        {
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: minPoolSize,
+                maxPoolSize: maxPoolSize,
+                creationTimeout: 15,
+                loadBalanceTimeout: loadBalanceTimeout,
+                hasTransactionAffinity: true
+            );
+            var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+                new SqlConnectionOptions("Data Source=localhost;"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                poolGroupOptions
+            );
+            return new ChannelDbConnectionPool(
+                ConnectionFactory,
+                dbConnectionPoolGroup,
+                DbConnectionPoolIdentity.NoIdentity,
+                new DbConnectionPoolProviderInfo()
+            );
+        }
+
+        /// <summary>
+        /// A checked-out connection, pairing the owning <see cref="SqlConnection"/> with its
+        /// internal connection so the two can never be mismatched.
+        /// </summary>
+        private record BusyConnection(SqlConnection Owner, DbConnectionInternal InternalDbConnection);
+
+        /// <summary>
+        /// Checks out <paramref name="count"/> connections from the pool and leaves them in use.
+        /// Returns the checked-out connections so the caller can later return them via
+        /// <see cref="ReturnConnections"/>.
+        /// </summary>
+        private static List<BusyConnection> CheckOutConnections(
+            ChannelDbConnectionPool pool, int count)
+        {
+            var connections = new List<BusyConnection>(count);
+
+            for (int i = 0; i < count; i++)
+            {
+                var owner = new SqlConnection();
+                var completed = pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out var connection);
+                Assert.True(completed);
+                Assert.NotNull(connection);
+                connections.Add(new BusyConnection(owner, connection));
+            }
+
+            return connections;
+        }
+
+        /// <summary>
+        /// Returns previously checked-out connections to the pool, making them idle.
+        /// </summary>
+        private static void ReturnConnections(
+            ChannelDbConnectionPool pool,
+            List<BusyConnection> connections)
+        {
+            foreach (var connection in connections)
+            {
+                pool.ReturnInternalConnection(connection.InternalDbConnection, connection.Owner);
+            }
+        }
+
+        /// <summary>
+        /// Opens <paramref name="count"/> connections and returns them to the pool so they are idle.
+        /// </summary>
+        private static void FillPoolWithIdleConnections(ChannelDbConnectionPool pool, int count)
+        {
+            var connections = CheckOutConnections(pool, count);
+            ReturnConnections(pool, connections);
+        }
+
+        /// <summary>
+        /// Asserts that the pool has a non-null <see cref="PoolPruner"/> and returns it.
+        /// </summary>
+        private static PoolPruner GetPruner(ChannelDbConnectionPool pool)
+        {
+            PoolPruner? pruner = pool.Pruner;
+            Assert.NotNull(pruner);
+            return pruner;
+        }
+
+        /// <summary>
+        /// Asserts the pruner state that matters for pruning progression: the timer-enabled flag,
+        /// the sample index, and the valid samples.
+        /// </summary>
+        /// <remarks>
+        /// Only the samples in the range <c>[0, SampleIndex)</c> are meaningful and validated.
+        /// Callers must pass exactly the valid samples, i.e. <paramref name="expectedSamples"/>
+        /// must have <paramref name="sampleIndex"/> elements.
+        /// </remarks>
+        private static void AssertPrunerState(
+            PoolPruner pruner,
+            bool isTimerEnabled,
+            int sampleIndex,
+            params int[] expectedSamples)
+        {
+            Assert.Equal(isTimerEnabled, pruner.IsTimerEnabled);
+            Assert.Equal(sampleIndex, pruner.SampleIndex);
+
+            // Enforce that the caller validates every valid sample (and only valid samples).
+            Assert.Equal(sampleIndex, expectedSamples.Length);
+
+            for (int i = 0; i < expectedSamples.Length; i++)
+            {
+                Assert.Equal(expectedSamples[i], pruner.Samples[i]);
+            }
+        }
+
+        #endregion
+
+        #region Timer Creation / Configuration Tests
+
+        [Fact]
+        public void Constructor_MinPoolSizeLessThanMax_CreatesPruningTimer()
+        {
+            // When min < max, the pool can shrink so a pruning timer should be created.
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10);
+
+            Assert.NotNull(pool.Pruner);
+        }
+
+        [Fact]
+        public void Constructor_MinPoolSizeEqualsMax_DoesNotCreatePruningTimer()
+        {
+            // When min == max, the pool is fixed-size — pruning would never activate.
+            using var pool = ConstructPool(minPoolSize: 10, maxPoolSize: 10);
+
+            Assert.Null(pool.Pruner);
+        }
+
+        [Fact]
+        public void Constructor_PruningTimerStartsDisabled()
+        {
+            // Timer should be created but not armed (pool starts empty, below MinPoolSize threshold).
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10);
+            var pruner = GetPruner(pool);
+
+            AssertPrunerState(pruner, false, 0);
+        }
+
+        [Theory]
+        [InlineData(100, 10)]   // 100 / 10 = 10 samples
+        [InlineData(300, 30)]   // 300 / 10 = 30 samples
+        [InlineData(60, 6)]     // 60 / 10 = 6 samples
+        [InlineData(15, 2)]     // 15 / 10 = 2 samples (rounds up)
+        [InlineData(0, 30)]     // 0 falls back to DefaultLifetimeWindow (300) / 10 = 30 samples
+        [InlineData(10000, 300)] // 10000 / 10 = 1000, clamped to MaxPruningSampleSize (300)
+        public void Constructor_CalculatesSampleSizeFromLoadBalanceTimeout(
+            int loadBalanceTimeout, int expectedSampleSize)
+        {
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10, loadBalanceTimeout: loadBalanceTimeout);
+            var pruner = GetPruner(pool);
+
+            Assert.Equal(expectedSampleSize, pruner.SampleSize);
+        }
+
+        #endregion
+
+        #region UpdatePruningTimer Tests
+
+        [Fact]
+        public void UpdatePruningTimer_PoolGrowsBeyondMinPoolSize_EnablesTimer()
+        {
+            using var pool = ConstructPool(minPoolSize: 2, maxPoolSize: 10);
+            var pruner = GetPruner(pool);
+
+            // Pool starts empty, timer should be disabled
+            AssertPrunerState(pruner, false, 0);
+
+            // Add connections to grow beyond MinPoolSize
+            FillPoolWithIdleConnections(pool, 3);
+
+            // After growing beyond min, UpdatePruningTimer is called internally
+            // and should enable the timer.
+            AssertPrunerState(pruner, true, 0);
+        }
+
+        [Fact]
+        public void UpdatePruningTimer_PoolAtMinPoolSize_TimerRemainsDisabled()
+        {
+            using var pool = ConstructPool(minPoolSize: 2, maxPoolSize: 10);
+            var pruner = GetPruner(pool);
+
+            // Add exactly MinPoolSize connections
+            FillPoolWithIdleConnections(pool, 2);
+
+            // Timer should stay disabled since we're at (not above) MinPoolSize
+            AssertPrunerState(pruner, false, 0);
+        }
+
+        [Fact]
+        public void UpdatePruningTimer_PoolShrinksBackToMin_DisablesTimerAndResetsSamples()
+        {
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10);
+            var pruner = GetPruner(pool);
+
+            // Grow the pool to enable the timer
+            FillPoolWithIdleConnections(pool, 3);
+            AssertPrunerState(pruner, true, 0);
+
+            // Now prune all connections back to 0 (MinPoolSize) by filling the sample buffer.
+            // Each callback before the buffer fills records the current idle count (3) and
+            // advances the sample index without pruning.
+            int sampleSize = pruner.SampleSize;
+            for (int i = 0; i < sampleSize - 1; i++)
+            {
+                pruner.OnPruningCallback(null);
+
+                // After each non-final callback the timer stays enabled, the index advances,
+                // and every previously recorded sample remains unchanged.
+                int[] expectedSamples = new int[i + 1];
+                for (int j = 0; j <= i; j++)
+                {
+                    expectedSamples[j] = 3;
+                }
+                AssertPrunerState(pruner, true, i + 1, expectedSamples);
+            }
+
+            // The final callback fills the buffer, takes the median (3), and prunes all idle
+            // connections back to MinPoolSize (0). That disables the timer and resets the index.
+            pruner.OnPruningCallback(null);
+            AssertPrunerState(pruner, false, 0);
+            Assert.Equal(0, pool.Count);
+        }
+
+        #endregion
+
+        #region PruneIdleConnections Tests
+
+        [Fact]
+        public void PruneIdleConnections_BufferNotFull_CollectsSampleWithoutPruning()
+        {
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10, loadBalanceTimeout: 30);
+            var pruner = GetPruner(pool);
+            // loadBalanceTimeout=30 → sample size = 30/10 = 3
+
+            // Fill the pool so pruning timer is active
+            FillPoolWithIdleConnections(pool, 5);
+            int initialCount = pool.Count;
+
+            // First invocation: records idle count in sample[0], buffer not full
+            pruner.OnPruningCallback(null);
+
+            // No connections should be pruned yet
+            Assert.Equal(initialCount, pool.Count);
+            AssertPrunerState(pruner, true, 1, 5);
+        }
+
+        [Fact]
+        public void PruneIdleConnections_RespectsMinPoolSizeFloor()
+        {
+            // loadBalanceTimeout=20 → 2 samples
+            using var pool = ConstructPool(minPoolSize: 5, maxPoolSize: 20, loadBalanceTimeout: 20);
+            var pruner = GetPruner(pool);
+
+            // Fill pool with 10 idle connections
+            FillPoolWithIdleConnections(pool, 10);
+            Assert.Equal(10, pool.Count);
+
+            // Fill sample buffer and trigger pruning
+            pruner.OnPruningCallback(null); // sample 1
+            AssertPrunerState(pruner, true, 1, 10);
+
+            pruner.OnPruningCallback(null); // sample 2 → prune
+            // Pruning brings the pool down to MinPoolSize (5), so the pruner disables its timer.
+            AssertPrunerState(pruner, false, 0);
+
+            // Pool should not drop below MinPoolSize (5).
+            // 10 idle connections, median of 2 samples (both 10) = 10, but floor is MinPoolSize=5.
+            Assert.Equal(5, pool.Count);
+        }
+
+        [Fact]
+        public void PruneIdleConnections_TimerDisabled_ReturnsEarlyWithoutPruning()
+        {
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10, loadBalanceTimeout: 20);
+            var pruner = GetPruner(pool);
+
+            // Pool starts empty, timer is disabled. Calling prune should be a no-op.
+            pruner.OnPruningCallback(null);
+
+            Assert.Equal(0, pool.Count);
+            AssertPrunerState(pruner, false, 0);
+        }
+
+        [Fact]
+        public void PruneIdleConnections_DoesNotRemoveInUseConnections()
+        {
+            // loadBalanceTimeout=20 → 2 samples
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 20, loadBalanceTimeout: 20);
+            var pruner = GetPruner(pool);
+
+            // Get 5 connections and KEEP them checked out (in use)
+            CheckOutConnections(pool, 5);
+
+            // Also add 5 idle connections
+            FillPoolWithIdleConnections(pool, 5);
+
+            // Total = 10 (5 in-use + 5 idle)
+            Assert.Equal(10, pool.Count);
+
+            // Fill sample buffer and trigger pruning
+            pruner.OnPruningCallback(null); // sample 1 (idle count = 5)
+            AssertPrunerState(pruner, true, 1, 5);
+
+            pruner.OnPruningCallback(null); // sample 2 → prune
+            AssertPrunerState(pruner, true, 0);
+
+            // In-use connections must not be removed.
+            // 5 idle connections, median of 2 samples (both 5) = 5, all 5 idle pruned → 5 in-use remain.
+            Assert.Equal(5, pool.Count);
+        }
+
+        #endregion
+
+        #region Shutdown Tests
+
+        [Fact]
+        public void Shutdown_DisposesPruningTimer()
+        {
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10);
+            var pruner = GetPruner(pool);
+
+            // Enable the timer by growing the pool beyond MinPoolSize
+            FillPoolWithIdleConnections(pool, 3);
+            AssertPrunerState(pruner, true, 0);
+
+            pool.Shutdown();
+
+            Assert.Equal(ShuttingDown, pool.State);
+            // After shutdown, the timer-enabled flag must be cleared.
+            AssertPrunerState(pruner, false, 0);
+        }
+
+        [Fact]
+        public void Shutdown_NullTimer_DoesNotThrow()
+        {
+            // Fixed-size pool has no timer
+            using var pool = ConstructPool(minPoolSize: 5, maxPoolSize: 5);
+            Assert.Null(pool.Pruner);
+
+            // Should not throw
+            pool.Shutdown();
+            Assert.Equal(ShuttingDown, pool.State);
+        }
+
+        [Fact]
+        public void Shutdown_CalledMultipleTimes_IsIdempotent()
+        {
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10);
+            var pruner = GetPruner(pool);
+
+            // Enable the timer so there is real state to tear down.
+            FillPoolWithIdleConnections(pool, 3);
+            AssertPrunerState(pruner, true, 0);
+
+            pool.Shutdown();
+            AssertPrunerState(pruner, false, 0);
+
+            // A repeated shutdown plus an explicit pruner Dispose must be safe no-ops.
+            // (The `using` block will also dispose the pool, calling Shutdown a third time.)
+            pool.Shutdown();
+            pruner.Dispose();
+
+            Assert.Equal(ShuttingDown, pool.State);
+            AssertPrunerState(pruner, false, 0);
+        }
+
+        #endregion
+
+        #region DivideRoundingUp Tests
+
+        [Theory]
+        [InlineData(10, 10, 1)]
+        [InlineData(11, 10, 2)]
+        [InlineData(300, 10, 30)]
+        [InlineData(1, 1, 1)]
+        [InlineData(7, 3, 3)]  // ceil(7/3) = 3
+        [InlineData(6, 3, 2)]  // exact division
+        [InlineData(15, 10, 2)] // ceil(15/10) = 2
+        public void DivideRoundingUp_ReturnsCorrectCeiling(int value, int divisor, int expected)
+        {
+            int result = PoolPruner.DivideRoundingUp(value, divisor);
+
+            Assert.Equal(expected, result);
+        }
+
+        #endregion
+
+        #region Integration Tests
+
+        [Fact]
+        public void PruneIdleConnections_AllIdleWithZeroMinPoolSize_PrunesEntirePool()
+        {
+            // Given: A pool with many idle connections and low recent usage.
+            // When: The pruning interval elapses (sample buffer fills).
+            // Then: The pool closes excess idle connections.
+
+            // Use loadBalanceTimeout=20 for 2 samples (fast buffer fill)
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 50, loadBalanceTimeout: 20);
+            var pruner = GetPruner(pool);
+
+            // Simulate high load: open 20 connections
+            FillPoolWithIdleConnections(pool, 20);
+            Assert.Equal(20, pool.Count);
+
+            // Pruning samples will both record idle=20, so toPrune=20.
+            pruner.OnPruningCallback(null); // sample 1
+            AssertPrunerState(pruner, true, 1, 20);
+
+            pruner.OnPruningCallback(null); // sample 2 → prune
+            // Pruning empties the pool to MinPoolSize (0), so the pruner disables its timer.
+            AssertPrunerState(pruner, false, 0);
+
+            // All 20 idle connections should be pruned since MinPoolSize is 0.
+            // Both samples record idle=20, median=20, all pruned.
+            Assert.Equal(0, pool.Count);
+        }
+
+        [Fact]
+        public void PruneIdleConnections_VariedSamples_UsesMedianNotCurrentIdleCount()
+        {
+            // Given: A pool with high recent usage but currently many idle connections due to a brief lull.
+            // When: The pruning interval elapses.
+            // Then: Pruning uses sampled usage data (median) to avoid being too aggressive.
+
+            // Use 3 samples (loadBalanceTimeout=30)
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 50, loadBalanceTimeout: 30);
+            var pruner = GetPruner(pool);
+
+            // Simulate varied usage:
+            // Sample 1: 2 idle (high demand, most connections checked out)
+            FillPoolWithIdleConnections(pool, 10);
+            // Check out 8, leaving 2 idle
+            var busyConnections = CheckOutConnections(pool, 8);
+            pruner.OnPruningCallback(null); // sample[0] = 2 idle
+            AssertPrunerState(pruner, true, 1, 2);
+            Assert.Equal(10, pool.Count);
+
+            // Sample 2: 2 idle (still high demand)
+            pruner.OnPruningCallback(null); // sample[1] = 2 idle
+            AssertPrunerState(pruner, true, 2, 2, 2);
+            Assert.Equal(10, pool.Count);
+
+            // Now return all busy connections, creating a brief lull (10 idle)
+            ReturnConnections(pool, busyConnections);
+
+            // Sample 3: 10 idle (lull). Buffer full → sorted=[2,2,10], median at index 1 = 2.
+            int countBefore = pool.Count;
+            pruner.OnPruningCallback(null);
+            // Only 2 are pruned (10 → 8), so the pool stays above MinPoolSize and the timer
+            // remains enabled; the index resets for the next window.
+            AssertPrunerState(pruner, true, 0);
+
+            // Pruning should remove exactly 2 connections (the median), not 10 (the current idle count).
+            // This verifies that sampling prevents aggressive pruning during brief lulls.
+            int pruned = countBefore - pool.Count;
+            Assert.Equal(2, pruned);
+        }
+
+        [Fact]
+        public void PruneIdleConnections_EvenSampleCountWithDistinctValues_UsesLowerMiddleSample()
+        {
+            // With an even number of samples the median index is the lower-middle element
+            // (_medianIndex = DivideRoundingUp(sampleSize, 2) - 1). For 2 samples that is index 0.
+            // Using distinct sample values proves the lower-middle is chosen rather than the
+            // upper-middle or an average.
+
+            // loadBalanceTimeout=20 → 2 samples
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 20, loadBalanceTimeout: 20);
+            var pruner = GetPruner(pool);
+
+            // Start with 8 idle connections.
+            FillPoolWithIdleConnections(pool, 8);
+
+            // Check out 4 so only 4 remain idle for the first sample.
+            var busyConnections = CheckOutConnections(pool, 4);
+
+            // Sample 1: 4 idle.
+            pruner.OnPruningCallback(null);
+            AssertPrunerState(pruner, true, 1, 4);
+            Assert.Equal(8, pool.Count);
+
+            // Return the 4 busy connections so 8 are idle for the second sample.
+            ReturnConnections(pool, busyConnections);
+
+            // Sample 2: 8 idle. Buffer full → sorted=[4,8], median at index 0 = 4.
+            int countBefore = pool.Count;
+            pruner.OnPruningCallback(null);
+            AssertPrunerState(pruner, true, 0);
+
+            // Exactly 4 (the lower-middle sample) should be pruned, not 8.
+            int pruned = countBefore - pool.Count;
+            Assert.Equal(4, pruned);
+            Assert.Equal(4, pool.Count);
+        }
+
+        [Fact]
+        public void PruneIdleConnections_SecondWindowAfterPrune_RecomputesMedianFromFreshSamples()
+        {
+            // After a window completes and prunes, the pruner re-arms and starts a fresh sampling
+            // window. This test proves that the second window samples and prunes independently of
+            // the first: it computes its own median from newly recorded samples and prunes the
+            // correct amount, confirming the collect → prune → reset → collect cycle is repeatable.
+
+            // loadBalanceTimeout=20 → 2 samples per window
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 20, loadBalanceTimeout: 20);
+            var pruner = GetPruner(pool);
+
+            // --- Window 1: produces a median of 4 ---
+            FillPoolWithIdleConnections(pool, 12);
+            // Check out 8, leaving 4 idle.
+            var busyConnections = CheckOutConnections(pool, 8);
+
+            pruner.OnPruningCallback(null); // sample[0] = 4 idle
+            AssertPrunerState(pruner, true, 1, 4);
+
+            pruner.OnPruningCallback(null); // buffer full [4,4], median 4, prune 4 idle
+            // Window 1 done: timer stays enabled (pool still above min), index reset for window 2.
+            AssertPrunerState(pruner, true, 0);
+            Assert.Equal(8, pool.Count); // 8 busy remain, 0 idle
+
+            // Return the 8 busy connections so they are idle for window 2.
+            ReturnConnections(pool, busyConnections);
+            Assert.Equal(8, pool.Count);
+
+            // --- Window 2: 8 idle, produces its own median of 8 ---
+            pruner.OnPruningCallback(null); // sample[0] = 8
+            // The new window records a fresh sample (8), independent of window 1's median (4).
+            AssertPrunerState(pruner, true, 1, 8);
+
+            int countBefore = pool.Count;
+            pruner.OnPruningCallback(null); // buffer full [8,8], median 8, prune 8
+            AssertPrunerState(pruner, false, 0);
+
+            // Window 2's median was 8 (its own samples), so all 8 idle connections are pruned.
+            Assert.Equal(8, countBefore - pool.Count);
+            Assert.Equal(0, pool.Count);
+        }
+
+        #endregion
+
+        #region Test classes
+
+        internal class SuccessfulSqlConnectionFactory : SqlConnectionFactory
+        {
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+            {
+                return new StubDbConnectionInternal();
+            }
+        }
+
+        internal class StubDbConnectionInternal : DbConnectionInternal
+        {
+            public override string ServerVersion => throw new NotImplementedException();
+
+            public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
+            {
+                throw new NotImplementedException();
+            }
+
+            public override void EnlistTransaction(Transaction transaction)
+            {
+                return;
+            }
+
+            protected override void Activate(Transaction transaction)
+            {
+                return;
+            }
+
+            protected override void Deactivate()
+            {
+                return;
+            }
+
+            internal override void ResetConnection()
+            {
+                return;
+            }
+        }
+
+        #endregion
+    }
+}

From 3488b364e2ebddfa53d12887ac1d835ac2e7f3b5 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 5 Jun 2026 09:37:18 -0700
Subject: [PATCH 129/298] Fix fetching signature verification result from cache
 (#4339)

* Fix fetching signature verification result from cache

* Introduce Tri-State

* Remove stale content, clean ups
---
 .../SqlClient/SignatureVerificationCache.cs   | 188 +++++++++++-------
 .../Data/SqlClient/SqlSecurityUtility.cs      |  18 +-
 .../SignatureVerificationCacheTests.cs        |  49 +++++
 3 files changed, 175 insertions(+), 80 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SignatureVerificationCacheTests.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs
index 8d1ce98df1..dc086d4610 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SignatureVerificationCache.cs
@@ -9,6 +9,29 @@
 
 namespace Microsoft.Data.SqlClient
 {
+    /// <summary>
+    /// Tri-state result returned by <see cref="ColumnMasterKeyMetadataSignatureVerificationCache.GetSignatureVerificationResult"/>.
+    /// Distinguishes a cache miss from a cached negative result so callers cannot conflate the two.
+    /// </summary>
+    internal enum SignatureVerificationResult
+    {
+        /// <summary>
+        /// No cached entry exists for the requested CMK metadata. 
+        /// The caller must verify the signature with the key store provider.
+        /// </summary>
+        NotFound,
+
+        /// <summary>
+        /// A cached entry exists and indicates that signature verification previously failed.
+        /// </summary>
+        False,
+
+        /// <summary>
+        /// A cached entry exists and indicates that signature verification previously succeeded.
+        /// </summary>
+        True,
+    }
+
     /// <summary>
     /// Cache for storing result of signature verification of CMK Metadata
     /// </summary>
@@ -16,138 +39,159 @@ internal class ColumnMasterKeyMetadataSignatureVerificationCache
     {
         private const int CacheSize = 2000; // Cache size in number of entries.
         private const int CacheTrimThreshold = 300; // Threshold above the cache size when we start trimming.
-
-        private const string _className = "ColumnMasterKeyMetadataSignatureVerificationCache";
-        private const string _getSignatureVerificationResultMethodName = "GetSignatureVerificationResult";
-        private const string _addSignatureVerificationResultMethodName = "AddSignatureVerificationResult";
-        private const string _masterkeypathArgumentName = "masterKeyPath";
-        private const string _keyStoreNameArgumentName = "keyStoreName";
-        private const string _signatureName = "signature";
         private const string _cacheLookupKeySeparator = ":";
 
-        private static readonly ColumnMasterKeyMetadataSignatureVerificationCache _signatureVerificationCache = new ColumnMasterKeyMetadataSignatureVerificationCache();
         private static readonly TimeSpan s_verificationCacheTimeout = TimeSpan.FromDays(10);
 
-        //singleton instance
-        internal static ColumnMasterKeyMetadataSignatureVerificationCache Instance { get { return _signatureVerificationCache; } }
+        /// <summary>
+        /// Gets the process-wide singleton instance of the signature verification cache.
+        /// </summary>
+        internal static ColumnMasterKeyMetadataSignatureVerificationCache Instance { get; } = new();
 
         private readonly MemoryCache _cache;
-        private int _inTrim = 0;
+        private int _inTrim;
 
         private ColumnMasterKeyMetadataSignatureVerificationCache()
         {
             _cache = new MemoryCache(new MemoryCacheOptions());
-            _inTrim = 0;
         }
 
         /// <summary>
-        /// Get signature verification result for given CMK metadata (KeystoreName, MasterKeyPath, allowEnclaveComputations) and a given signature
+        /// Get signature verification result for given CMK metadata 
+        /// (KeystoreName, MasterKeyPath, allowEnclaveComputations) and a given signature
         /// </summary>
         /// <param name="keyStoreName">Key Store name for CMK</param>
         /// <param name="masterKeyPath">Key Path for CMK</param>
         /// <param name="allowEnclaveComputations">boolean indicating whether the key can be sent to enclave</param>
         /// <param name="signature">Signature for the CMK metadata</param>
-        internal bool GetSignatureVerificationResult(string keyStoreName, string masterKeyPath, bool allowEnclaveComputations, byte[] signature)
+        /// <returns>Tri-state result indicating whether signature verification succeeded, failed, or was not found in cache</returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when <paramref name="masterKeyPath"/>, <paramref name="keyStoreName"/>, 
+        /// or <paramref name="signature"/> is <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="System.ArgumentException">
+        /// Thrown when <paramref name="masterKeyPath"/> or <paramref name="keyStoreName"/> 
+        /// is empty or whitespace, or when <paramref name="signature"/> has length zero.
+        /// </exception>
+        internal SignatureVerificationResult GetSignatureVerificationResult(string keyStoreName, string masterKeyPath, bool allowEnclaveComputations, byte[] signature)
         {
-            ValidateStringArgumentNotNullOrEmpty(masterKeyPath, _masterkeypathArgumentName, _getSignatureVerificationResultMethodName);
-            ValidateStringArgumentNotNullOrEmpty(keyStoreName, _keyStoreNameArgumentName, _getSignatureVerificationResultMethodName);
-            ValidateSignatureNotNullOrEmpty(signature, _getSignatureVerificationResultMethodName);
+            ValidateStringArgumentNotNullOrEmpty(masterKeyPath, nameof(masterKeyPath), nameof(GetSignatureVerificationResult));
+            ValidateStringArgumentNotNullOrEmpty(keyStoreName, nameof(keyStoreName), nameof(GetSignatureVerificationResult));
+            ValidateSignatureNotNullOrEmpty(signature, nameof(GetSignatureVerificationResult));
 
             string cacheLookupKey = GetCacheLookupKey(masterKeyPath, allowEnclaveComputations, signature, keyStoreName);
 
-            return _cache.TryGetValue<bool>(cacheLookupKey, out bool value);
+            if (!_cache.TryGetValue(cacheLookupKey, out bool value))
+            {
+                return SignatureVerificationResult.NotFound;
+            }
+
+            return value ? SignatureVerificationResult.True : SignatureVerificationResult.False;
         }
 
         /// <summary>
-        /// Add signature verification result for given CMK metadata (KeystoreName, MasterKeyPath, allowEnclaveComputations) and a given signature in the cache
+        /// Add signature verification result for given CMK metadata (KeystoreName, 
+        /// MasterKeyPath, allowEnclaveComputations) and a given signature in the cache
         /// </summary>
         /// <param name="keyStoreName">Key Store name for CMK</param>
         /// <param name="masterKeyPath">Key Path for CMK</param>
         /// <param name="allowEnclaveComputations">boolean indicating whether the key can be sent to enclave</param>
         /// <param name="signature">Signature for the CMK metadata</param>
         /// <param name="result">result indicating signature verification success/failure</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when <paramref name="masterKeyPath"/>, <paramref name="keyStoreName"/>, 
+        /// or <paramref name="signature"/> is <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="System.ArgumentException">
+        /// Thrown when <paramref name="masterKeyPath"/> or <paramref name="keyStoreName"/> is empty or whitespace, 
+        /// or when <paramref name="signature"/> has length zero.
+        /// </exception>
         internal void AddSignatureVerificationResult(string keyStoreName, string masterKeyPath, bool allowEnclaveComputations, byte[] signature, bool result)
         {
-            ValidateStringArgumentNotNullOrEmpty(masterKeyPath, _masterkeypathArgumentName, _addSignatureVerificationResultMethodName);
-            ValidateStringArgumentNotNullOrEmpty(keyStoreName, _keyStoreNameArgumentName, _addSignatureVerificationResultMethodName);
-            ValidateSignatureNotNullOrEmpty(signature, _addSignatureVerificationResultMethodName);
+            ValidateStringArgumentNotNullOrEmpty(masterKeyPath, nameof(masterKeyPath), nameof(AddSignatureVerificationResult));
+            ValidateStringArgumentNotNullOrEmpty(keyStoreName, nameof(keyStoreName), nameof(AddSignatureVerificationResult));
+            ValidateSignatureNotNullOrEmpty(signature, nameof(AddSignatureVerificationResult));
 
             string cacheLookupKey = GetCacheLookupKey(masterKeyPath, allowEnclaveComputations, signature, keyStoreName);
 
             TrimCacheIfNeeded();
 
             // By default evict after 10 days.
-            _cache.Set<bool>(cacheLookupKey, result, absoluteExpirationRelativeToNow: s_verificationCacheTimeout);
+            _cache.Set(cacheLookupKey, result, absoluteExpirationRelativeToNow: s_verificationCacheTimeout);
         }
 
-        private void ValidateSignatureNotNullOrEmpty(byte[] signature, string methodName)
+        private static void ValidateSignatureNotNullOrEmpty(byte[] signature, string methodName)
         {
-            if (signature == null || signature.Length == 0)
+            if (signature is null)
+            {
+                throw SQL.NullArgumentInternal(nameof(signature), nameof(ColumnMasterKeyMetadataSignatureVerificationCache), methodName);
+            }
+            if (signature.Length == 0)
             {
-                if (signature == null)
-                {
-                    throw SQL.NullArgumentInternal(_signatureName, _className, methodName);
-                }
-                else
-                {
-                    throw SQL.EmptyArgumentInternal(_signatureName, _className, methodName);
-                }
+                throw SQL.EmptyArgumentInternal(nameof(signature), nameof(ColumnMasterKeyMetadataSignatureVerificationCache), methodName);
             }
         }
 
-        private void ValidateStringArgumentNotNullOrEmpty(string stringArgValue, string stringArgName, string methodName)
+        private static void ValidateStringArgumentNotNullOrEmpty(string value, string argumentName, string methodName)
         {
-            if (string.IsNullOrWhiteSpace(stringArgValue))
+            if (value is null)
+            {
+                throw SQL.NullArgumentInternal(argumentName, nameof(ColumnMasterKeyMetadataSignatureVerificationCache), methodName);
+            }
+            if (string.IsNullOrWhiteSpace(value))
             {
-                if (stringArgValue == null)
-                {
-                    throw SQL.NullArgumentInternal(stringArgName, _className, methodName);
-                }
-                else
-                {
-                    throw SQL.EmptyArgumentInternal(stringArgName, _className, methodName);
-                }
+                throw SQL.EmptyArgumentInternal(argumentName, nameof(ColumnMasterKeyMetadataSignatureVerificationCache), methodName);
             }
         }
 
+
         private void TrimCacheIfNeeded()
         {
             // If the size of the cache exceeds the threshold, set that we are in trimming and trim the cache accordingly.
             long currentCacheSize = _cache.Count;
-            if ((currentCacheSize > CacheSize + CacheTrimThreshold) && (0 == Interlocked.CompareExchange(ref _inTrim, 1, 0)))
+            if (currentCacheSize <= CacheSize + CacheTrimThreshold || Interlocked.CompareExchange(ref _inTrim, 1, 0) != 0)
             {
-                try
-                {
-                    // Example: 2301 - 2000 = 301; 301 / 2301 = 0.1308 * 100 = 13% compacting
-                    _cache.Compact((((double)(currentCacheSize - CacheSize) / (double)currentCacheSize) * 100));
-                }
-                finally
-                {
-                    // Reset _inTrim flag
-                    Interlocked.CompareExchange(ref _inTrim, 0, 1);
-                }
+                return;
+            }
+
+            try
+            {
+                // Example: 2301 - 2000 = 301; 301 / 2301 = 0.1308 * 100 = 13% compacting
+                _cache.Compact((double)(currentCacheSize - CacheSize) / currentCacheSize * 100);
+            }
+            finally
+            {
+                Interlocked.Exchange(ref _inTrim, 0);
             }
         }
 
-        private string GetCacheLookupKey(string masterKeyPath, bool allowEnclaveComputations, byte[] signature, string keyStoreName)
+        /// <summary>
+        /// Generates a cache key for the given CMK metadata and signature. The key is a
+        /// concatenation of the key store name, master key path, allowEnclaveComputations value, and signature, separated by a delimiter.
+        /// </summary>
+        /// <param name="masterKeyPath">The master key path.</param>
+        /// <param name="allowEnclaveComputations">Whether enclave computations are allowed.</param>
+        /// <param name="signature">The signature.</param>
+        /// <param name="keyStoreName">The key store name.</param>
+        /// <returns>A string that can be used as a cache key.</returns>
+        private static string GetCacheLookupKey(string masterKeyPath, bool allowEnclaveComputations, byte[] signature, string keyStoreName)
         {
-            StringBuilder cacheLookupKeyBuilder = new StringBuilder(keyStoreName,
-                capacity:
-                    keyStoreName.Length +
-                    masterKeyPath.Length +
-                    SqlSecurityUtility.GetBase64LengthFromByteLength(signature.Length) +
-                    3 /*separators*/ +
-                    10 /*boolean value + somebuffer*/);
-
-            cacheLookupKeyBuilder.Append(_cacheLookupKeySeparator);
-            cacheLookupKeyBuilder.Append(masterKeyPath);
-            cacheLookupKeyBuilder.Append(_cacheLookupKeySeparator);
-            cacheLookupKeyBuilder.Append(allowEnclaveComputations);
-            cacheLookupKeyBuilder.Append(_cacheLookupKeySeparator);
-            cacheLookupKeyBuilder.Append(Convert.ToBase64String(signature));
-            cacheLookupKeyBuilder.Append(_cacheLookupKeySeparator);
-            string cacheLookupKey = cacheLookupKeyBuilder.ToString();
-            return cacheLookupKey;
+            int cacheCapacity =
+                keyStoreName.Length +
+                masterKeyPath.Length +
+                SqlSecurityUtility.GetBase64LengthFromByteLength(signature.Length) +
+                4 * _cacheLookupKeySeparator.Length +
+                10 /* boolean value + buffer */;
+
+            return new StringBuilder(keyStoreName, capacity: cacheCapacity)
+                .Append(_cacheLookupKeySeparator)
+                .Append(masterKeyPath)
+                .Append(_cacheLookupKeySeparator)
+                .Append(allowEnclaveComputations)
+                .Append(_cacheLookupKeySeparator)
+                .Append(Convert.ToBase64String(signature))
+                .Append(_cacheLookupKeySeparator)
+                .ToString();
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs
index 253ab92db8..79ebc60d27 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs
@@ -332,18 +332,20 @@ internal static void VerifyColumnMasterKeySignature(string keyStoreName, string
                 }
                 else
                 {
-                    bool signatureVerificationResult = ColumnMasterKeyMetadataSignatureVerificationCache.GetSignatureVerificationResult(keyStoreName, keyPath, isEnclaveEnabled, CMKSignature);
-                    if (signatureVerificationResult == false)
-                    {
-                        // We will simply bubble up the exception from VerifyColumnMasterKeyMetadata function.
-                        isValidSignature = provider.VerifyColumnMasterKeyMetadata(keyPath, isEnclaveEnabled,
-                                CMKSignature);
+                    SignatureVerificationResult cachedResult = ColumnMasterKeyMetadataSignatureVerificationCache.Instance
+                        .GetSignatureVerificationResult(keyStoreName, keyPath, isEnclaveEnabled, CMKSignature);
 
-                        ColumnMasterKeyMetadataSignatureVerificationCache.AddSignatureVerificationResult(keyStoreName, keyPath, isEnclaveEnabled, CMKSignature, isValidSignature);
+                    if (cachedResult == SignatureVerificationResult.NotFound)
+                    {
+                        // Cache miss: verify with the provider and cache the result.
+                        // Exceptions from VerifyColumnMasterKeyMetadata bubble up to the outer catch.
+                        isValidSignature = provider.VerifyColumnMasterKeyMetadata(keyPath, isEnclaveEnabled, CMKSignature);
+                        ColumnMasterKeyMetadataSignatureVerificationCache.Instance
+                            .AddSignatureVerificationResult(keyStoreName, keyPath, isEnclaveEnabled, CMKSignature, isValidSignature);
                     }
                     else
                     {
-                        isValidSignature = signatureVerificationResult;
+                        isValidSignature = cachedResult == SignatureVerificationResult.True;
                     }
                 }
             }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SignatureVerificationCacheTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SignatureVerificationCacheTests.cs
new file mode 100644
index 0000000000..a03dd8910e
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SignatureVerificationCacheTests.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests
+{
+    public class SignatureVerificationCacheTests
+    {
+        [Fact]
+        public void GetSignatureVerificationResult_ReturnsFalseForCachedFailure()
+        {
+            ColumnMasterKeyMetadataSignatureVerificationCache cache = ColumnMasterKeyMetadataSignatureVerificationCache.Instance;
+            string keyStoreName = $"TEST_PROVIDER_{Guid.NewGuid():N}";
+            string masterKeyPath = $"https://unit-test/{Guid.NewGuid():N}";
+            byte[] signature = [1, 2, 3, 4];
+
+            cache.AddSignatureVerificationResult(keyStoreName, masterKeyPath, allowEnclaveComputations: true, signature, result: false);
+
+            Assert.Equal(SignatureVerificationResult.False, cache.GetSignatureVerificationResult(keyStoreName, masterKeyPath, allowEnclaveComputations: true, signature));
+        }
+
+        [Fact]
+        public void GetSignatureVerificationResult_ReturnsTrueForCachedSuccess()
+        {
+            ColumnMasterKeyMetadataSignatureVerificationCache cache = ColumnMasterKeyMetadataSignatureVerificationCache.Instance;
+            string keyStoreName = $"TEST_PROVIDER_{Guid.NewGuid():N}";
+            string masterKeyPath = $"https://unit-test/{Guid.NewGuid():N}";
+            byte[] signature = [4, 3, 2, 1];
+
+            cache.AddSignatureVerificationResult(keyStoreName, masterKeyPath, allowEnclaveComputations: true, signature, result: true);
+
+            Assert.Equal(SignatureVerificationResult.True, cache.GetSignatureVerificationResult(keyStoreName, masterKeyPath, allowEnclaveComputations: true, signature));
+        }
+
+        [Fact]
+        public void GetSignatureVerificationResult_ReturnsNotFoundForCacheMiss()
+        {
+            ColumnMasterKeyMetadataSignatureVerificationCache cache = ColumnMasterKeyMetadataSignatureVerificationCache.Instance;
+            string keyStoreName = $"TEST_PROVIDER_{Guid.NewGuid():N}";
+            string masterKeyPath = $"https://unit-test/{Guid.NewGuid():N}";
+            byte[] signature = [9, 9, 9, 9];
+
+            Assert.Equal(SignatureVerificationResult.NotFound, cache.GetSignatureVerificationResult(keyStoreName, masterKeyPath, allowEnclaveComputations: true, signature));
+        }
+    }
+}
\ No newline at end of file

From 7721c98e8900291dd879e6ef7d8d42f4c2092842 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 5 Jun 2026 14:20:05 -0700
Subject: [PATCH 130/298] Actions | Introduce auto-assign-pr workflow (#4275)

---
 .github/scripts/auto-assign-pr.js    | 133 +++++++++++++++++++++++++++
 .github/workflows/auto-assign-pr.yml |  38 ++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 .github/scripts/auto-assign-pr.js
 create mode 100644 .github/workflows/auto-assign-pr.yml

diff --git a/.github/scripts/auto-assign-pr.js b/.github/scripts/auto-assign-pr.js
new file mode 100644
index 0000000000..0f2e77d3c1
--- /dev/null
+++ b/.github/scripts/auto-assign-pr.js
@@ -0,0 +1,133 @@
+// Auto-assign PR load balancer.
+//
+// Selects up to 2 assignees for a qualifying PR from a configurable pool,
+// balancing by current open-PR assignment count. Invoked by the
+// `auto-assign-pr.yml` workflow via `actions/github-script`.
+module.exports = async ({ github, context, core }) => {
+  const owner = context.repo.owner;
+  const repo = context.repo.repo;
+  const prNumber = context.issue.number;
+  const author = context.payload.pull_request.user.login;
+  const normalizeLogin = login => login.toLowerCase();
+  const parseCsvLogins = value => (value ?? '')
+    .split(',')
+    .map(entry => entry.trim())
+    .filter(entry => entry.length > 0);
+
+  // Fallback pool keeps behavior unchanged when no repo variable is configured.
+  const defaultPool = ['cheenamalhotra', 'paulmedynski', 'priyankatiwari08', 'benrr101', 'mdaigle', 'apoorvdeshmukh'];
+  const configuredPool = parseCsvLogins(process.env.PR_REVIEWER_POOL);
+  const rawPool = configuredPool.length > 0 ? configuredPool : defaultPool;
+  const seenPoolUsers = new Set();
+  const pool = [];
+  for (const user of rawPool) {
+    const normalized = normalizeLogin(user);
+    if (!seenPoolUsers.has(normalized)) {
+      seenPoolUsers.add(normalized);
+      pool.push(user);
+    }
+  }
+
+  let latestPr;
+  try {
+    const response = await github.rest.pulls.get({
+      owner,
+      repo,
+      pull_number: prNumber
+    });
+    latestPr = response.data;
+  } catch (error) {
+    throw new Error(`Failed to fetch latest PR details: ${error.message}`);
+  }
+
+  if (latestPr.state !== 'open' || latestPr.draft || !latestPr.milestone) {
+    console.log('PR is no longer assignment-eligible (not open, draft, or missing milestone).');
+    return;
+  }
+
+  const currentAssignees = (latestPr.assignees ?? []).map(a => a.login);
+
+  console.log(`PR Author: ${author}`);
+  console.log(`Event Name: ${context.eventName}; Is Fork PR: ${context.payload.pull_request.head.repo.fork === true}`);
+  console.log(`Current Assignees: ${currentAssignees.join(', ')}`);
+
+  if (currentAssignees.length >= 2) {
+    console.log('PR already has 2 or more assignees. No action needed.');
+    return;
+  }
+
+  const neededAssigneesCount = 2 - currentAssignees.length;
+
+  const candidates = pool.filter(user =>
+    normalizeLogin(user) !== normalizeLogin(author) &&
+    !currentAssignees.some(a => normalizeLogin(a) === normalizeLogin(user))
+  );
+
+  if (candidates.length === 0) {
+    console.log('No valid candidates left in the pool.');
+    return;
+  }
+
+  const workloads = {};
+  const canonicalCandidateByNormalized = {};
+  candidates.forEach(user => {
+    const normalized = normalizeLogin(user);
+    workloads[normalized] = 0;
+    canonicalCandidateByNormalized[normalized] = user;
+  });
+
+  try {
+    // Rank candidates by current assignment count across all open PRs.
+    const iterator = github.paginate.iterator(github.rest.pulls.list, {
+      owner,
+      repo,
+      state: 'open',
+      per_page: 100
+    });
+
+    for await (const response of iterator) {
+      for (const pr of response.data) {
+        if (pr.draft) continue;
+        if (pr.assignees) {
+          for (const assignee of pr.assignees) {
+            const login = normalizeLogin(assignee.login);
+            if (workloads[login] !== undefined) {
+              workloads[login]++;
+            }
+          }
+        }
+      }
+    }
+  } catch (error) {
+    throw new Error(`Failed to fetch open PRs for auto-assignment: ${error.message}`);
+  }
+
+  const workloadArray = candidates.map(user => {
+    const normalized = normalizeLogin(user);
+    return { user: canonicalCandidateByNormalized[normalized], count: workloads[normalized] };
+  });
+  console.log('Current Workloads:', workloadArray);
+
+  // Shuffle before sorting so ties are broken fairly instead of favoring pool order.
+  for (let i = workloadArray.length - 1; i > 0; i--) {
+    const j = Math.floor(Math.random() * (i + 1));
+    [workloadArray[i], workloadArray[j]] = [workloadArray[j], workloadArray[i]];
+  }
+
+  workloadArray.sort((a, b) => a.count - b.count);
+
+  const selectedAssignees = workloadArray.slice(0, neededAssigneesCount).map(w => w.user);
+  console.log(`Selected candidates: ${selectedAssignees.join(', ')}`);
+
+  if (selectedAssignees.length === 0) {
+    console.log('No assignees selected. No action needed.');
+    return;
+  }
+
+  await github.rest.issues.addAssignees({
+    owner,
+    repo,
+    issue_number: prNumber,
+    assignees: selectedAssignees
+  });
+};
diff --git a/.github/workflows/auto-assign-pr.yml b/.github/workflows/auto-assign-pr.yml
new file mode 100644
index 0000000000..ba5654969f
--- /dev/null
+++ b/.github/workflows/auto-assign-pr.yml
@@ -0,0 +1,38 @@
+name: Auto Assign PR Load Balancer
+
+on:
+  pull_request_target:
+    types: [opened, reopened, ready_for_review, milestoned]
+
+concurrency:
+  group: auto-assign-pr-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  load-balance-assignees:
+    # Only run for assignment-eligible PRs in the upstream repository. Use
+    # pull_request_target so the workflow only runs once per PR event.
+    # Exclude PRs from forks as GitHub Actions does not have permissions to assign users on PRs from forks.
+    if: github.repository == 'dotnet/SqlClient' && github.event.pull_request.state == 'open'  && github.event.pull_request.draft == false && github.event.pull_request.milestone != null && github.event.pull_request.head.repo.fork == false
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
+    env:
+      PR_REVIEWER_POOL: ${{ vars.PR_REVIEWER_POOL }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            .github/scripts/auto-assign-pr.js
+          sparse-checkout-cone-mode: false
+          persist-credentials: false
+
+      - name: Calculate Workload and Apply
+        uses: actions/github-script@v9
+        with:
+          script: |
+            const script = require('./.github/scripts/auto-assign-pr.js');
+            await script({ github, context, core });

From 793d5ad1c6f32f5bc6b9869e20d9110bf9adeec5 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Mon, 8 Jun 2026 04:26:11 -0500
Subject: [PATCH 131/298] Move Test Config to Jsonc (#4297)

---
 .devcontainer/setup-sqlserver.sh              |   6 +-
 .github/instructions/testing.instructions.md  |  10 +-
 .gitignore                                    |   1 +
 TESTGUIDE.md                                  |  22 ++-
 .../templates/jobs/ci-run-tests-job.yml       |   2 +-
 .../steps/update-config-file-step.yml         |  12 +-
 eng/pipelines/dotnet-sqlclient-ci-core.yml    |   2 +-
 .../jobs/test-azure-package-ci-job.yml        |   2 +-
 eng/pipelines/kerberos/sqlclient-kerberos.yml |  12 +-
 eng/pipelines/stress/stress-tests-job.yml     |   6 +-
 .../Azure/test/Config.cs                      |  16 +--
 ...icrosoft.Data.SqlClient.ManualTests.csproj |   2 +
 .../SqlDbManager.cs                           |   6 +-
 .../Config.cs                                 | 131 +++++++++++-------
 ...rosoft.Data.SqlClient.TestUtilities.csproj |  13 +-
 ...nfig.default.json => config.default.jsonc} |   0
 16 files changed, 139 insertions(+), 104 deletions(-)
 rename src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/{config.default.json => config.default.jsonc} (100%)

diff --git a/.devcontainer/setup-sqlserver.sh b/.devcontainer/setup-sqlserver.sh
index 6b4ee480ed..fc962c3053 100755
--- a/.devcontainer/setup-sqlserver.sh
+++ b/.devcontainer/setup-sqlserver.sh
@@ -29,11 +29,11 @@ REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 
 # Write test config file so the test suite can find the connection string.
 CONFIG_DIR="${REPO_ROOT}/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities"
-CONFIG_DEFAULT_FILE="${CONFIG_DIR}/config.default.json"
-CONFIG_FILE="${CONFIG_DIR}/config.json"
+CONFIG_DEFAULT_FILE="${CONFIG_DIR}/config.default.jsonc"
+CONFIG_FILE="${CONFIG_DIR}/config.jsonc"
 echo "Writing test config to ${CONFIG_FILE} (based on ${CONFIG_DEFAULT_FILE})..."
 TCP_CONN_STR="Data Source=tcp:${SQL_HOST},${SQL_PORT};Database=Northwind;User Id=sa;Password=${SA_PASSWORD};Encrypt=false;TrustServerCertificate=true"
-# config.default.json contains JS-style comments (// ...) which are not valid JSON.
+# config.default.jsonc contains JS-style comments (// ...) which are not valid JSON.
 # Strip single-line comments before feeding to jq.
 sed 's|//.*||' "${CONFIG_DEFAULT_FILE}" \
   | jq --arg cs "${TCP_CONN_STR}" \
diff --git a/.github/instructions/testing.instructions.md b/.github/instructions/testing.instructions.md
index 20fe03b1e8..bd9db72c4a 100644
--- a/.github/instructions/testing.instructions.md
+++ b/.github/instructions/testing.instructions.md
@@ -14,8 +14,8 @@ src/Microsoft.Data.SqlClient/tests/
 ├── UnitTests/                # Unit tests with minimal dependencies
 └── tools/
     └── Microsoft.Data.SqlClient.TestUtilities/
-        ├── config.default.json   # Template configuration
-        └── config.json           # Local test configuration (git-ignored)
+        ├── config.default.jsonc  # Template configuration
+        └── config.jsonc          # Local test configuration (git-ignored)
 ```
 
 ## Test Categories
@@ -34,14 +34,14 @@ src/Microsoft.Data.SqlClient/tests/
 
 ### Manual Tests (`ManualTests/`)
 - Full integration tests with SQL Server
-- Require `config.json` setup
+- Require `config.jsonc` setup
 - Test real database operations
 - Include Always Encrypted, Entra ID tests
 
 ## Test Configuration
 
-### Setting Up `config.json`
-Copy `config.default.json` to `config.json` and configure:
+### Setting Up `config.jsonc`
+Copy `config.default.jsonc` to `config.jsonc` and configure:
 
 ```json
 {
diff --git a/.gitignore b/.gitignore
index 37b3509b0d..06d3a36078 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,6 +136,7 @@ node_modules/
 
 # Config Json file
 **/config.json
+**/config.jsonc
 
 # Generated Milestone PR metadata files
 .milestone-prs/
diff --git a/TESTGUIDE.md b/TESTGUIDE.md
index aab773a080..791d4a7bcc 100644
--- a/TESTGUIDE.md
+++ b/TESTGUIDE.md
@@ -195,22 +195,22 @@ conditional tests are skipped.
 ## Manual Test Configuration
 
 Edit the source configuration file at `src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/
-config.json`. The test utilities project copies that file to the test output directory, where the manual tests load it
+config.jsonc`. The test utilities project copies that file to the test output directory, where the manual tests load it
 by default.
 
 The template file is:
 
-[src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json](src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json)
+[src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc](src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc)
 
-`config.json` is git-ignored. If it does not exist, the test utilities project copies `config.default.json` to
-`config.json` before compile. You can also create it manually:
+`config.jsonc` is git-ignored. If it does not exist, the test utilities project copies `config.default.jsonc` to
+`config.jsonc` before compile. You can also create it manually:
 
 ```bash
-cp src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json \
-  src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.json
+cp src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc \
+  src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.jsonc
 ```
 
-Update `config.json` for your environment before running manual tests. The most important values for a basic run are `TCPConnectionString` and `NPConnectionString`.
+Update `config.jsonc` for your environment before running manual tests. The most important values for a basic run are `TCPConnectionString` and `NPConnectionString`.
 
 ```jsonc
 {
@@ -230,16 +230,16 @@ For SQL Server in a Linux container, WSL, or another host where SQL authenticati
 }
 ```
 
-You can override the config file path with the `MDS_TEST_CONFIG` environment variable:
+You can override the config file path with the `TEST_MDS_CONFIG` environment variable:
 
 ```bash
-MDS_TEST_CONFIG=/path/to/config.json dotnet build -t:TestSqlClientManual -p:TestSet=2
+TEST_MDS_CONFIG=/path/to/config.jsonc dotnet build -t:TestSqlClientManual -p:TestSet=2
 ```
 
 On PowerShell:
 
 ```powershell
-$env:MDS_TEST_CONFIG = "C:\path\to\config.json"
+$env:TEST_MDS_CONFIG = "C:\path\to\config.jsonc"
 dotnet build -t:TestSqlClientManual -p:TestSet=2
 ```
 
@@ -263,7 +263,6 @@ dotnet build -t:TestSqlClientManual -p:TestSet=2
 | `SupportsIntegratedSecurity`     | Whether the user running tests has integrated-security access to the target SQL Server.     | `true` or `false`.                                                                     |
 | `LocalDbAppName`                 | Optional LocalDB instance name. Empty disables LocalDB testing.                             | `MSSQLLocalDB` or another local instance.                                              |
 | `LocalDbSharedInstanceName`      | Optional shared LocalDB instance name.                                                      | Used only when testing shared LocalDB.                                                 |
-| `SupportsFileStream`             | Whether FileStream tests are supported by the target.                                       | `true` or `false`.                                                                     |
 | `FileStreamDirectory`            | Directory used for FileStream database setup.                                               | Use an escaped absolute path in JSON.                                                  |
 | `UseManagedSNIOnWindows`         | Enables Managed SNI on Windows test coverage.                                               | `true` or `false`.                                                                     |
 | `DNSCachingConnString`           | Optional connection string for DNS caching tests.                                           | Used with DNS caching server settings.                                                 |
@@ -271,7 +270,6 @@ dotnet build -t:TestSqlClientManual -p:TestSet=2
 | `DNSCachingServerTR`             | Optional DNS caching tenant-ring server.                                                    | Feature-specific tests only.                                                           |
 | `IsDNSCachingSupportedCR`        | Enables DNS caching control-ring tests.                                                     | `true` or `false`.                                                                     |
 | `IsDNSCachingSupportedTR`        | Enables DNS caching tenant-ring tests.                                                      | `true` or `false`.                                                                     |
-| `IsAzureSynapse`                 | Marks the target as Azure Synapse.                                                          | Some SQL Server-specific tests are skipped when `true`.                                |
 | `EnclaveAzureDatabaseConnString` | Optional Azure SQL database connection string for enclave tests.                            | Feature-specific tests only.                                                           |
 | `ManagedIdentitySupported`       | Whether managed identity tests should run.                                                  | Defaults to `true`. Set `false` if unavailable.                                        |
 | `UserManagedIdentityClientId`    | Optional client ID for user-assigned managed identity tests.                                | Feature-specific tests only.                                                           |
diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
index 5eed840236..1b1ea7a2e7 100644
--- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
@@ -234,7 +234,7 @@ jobs:
         referenceType: Project
 
   - ${{ if ne(parameters.configProperties, '{}') }}:
-    - template: /eng/pipelines/common/templates/steps/update-config-file-step.yml@self # update config.json file
+    - template: /eng/pipelines/common/templates/steps/update-config-file-step.yml@self # update config.jsonc file
       parameters:
         debug: ${{ parameters.debug }}
         saPassword: ${{ parameters.saPassword }}
diff --git a/eng/pipelines/common/templates/steps/update-config-file-step.yml b/eng/pipelines/common/templates/steps/update-config-file-step.yml
index b0612fa248..fd57828df0 100644
--- a/eng/pipelines/common/templates/steps/update-config-file-step.yml
+++ b/eng/pipelines/common/templates/steps/update-config-file-step.yml
@@ -143,9 +143,9 @@ steps:
       Write-Host "##vso[task.setvariable variable=Password;isSecret=true]$password"
     displayName: Set Connection String Password
 
-  # All properties should be added here, and this template should be used for any manipulation of the config.json file.
+  # All properties should be added here, and this template should be used for any manipulation of the config.jsonc file.
   - pwsh: |
-      $jdata = Get-Content -Raw "config.default.json" | ConvertFrom-Json
+      $jdata = Get-Content -Raw "config.default.jsonc" | ConvertFrom-Json
       foreach ($p in $jdata)
       {
           $p.TCPConnectionString="${{parameters.TCPConnectionString }}"
@@ -197,13 +197,13 @@ steps:
           $p.EnclaveEnabled=[System.Convert]::ToBoolean("${{parameters.EnclaveEnabled }}")
           $p.WorkloadIdentityFederationServiceConnectionId="${{parameters.WorkloadIdentityFederationServiceConnectionId }}"
       }
-      $jdata | ConvertTo-Json | Set-Content "config.json"
+      $jdata | ConvertTo-Json | Set-Content "config.jsonc"
     workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
-    displayName: 'Update config.json'
+    displayName: 'Update config.jsonc'
 
   - ${{ if eq(parameters.debug, true) }}:
     - pwsh: |
-        $jdata = Get-Content -Raw "config.json" | ConvertFrom-Json
+        $jdata = Get-Content -Raw "config.jsonc" | ConvertFrom-Json
         foreach ($p in $jdata)
         {
             foreach ($prop in $p.PSObject.Properties)
@@ -212,4 +212,4 @@ steps:
             }
         }
       workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
-      displayName: '[Debug] Emit config.json'
+      displayName: '[Debug] Emit config.jsonc'
diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index f5f2269494..6c4399c9cb 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -371,7 +371,7 @@ stages:
           useManagedSNI: ${{parameters.useManagedSNI }}
           configSqlFor: local
           operatingSystem: Windows
-          # config.json properties
+          # config.jsonc properties
           configProperties:
             TCPConnectionString: $(SQL_TCP_CONN_STRING)
             NPConnectionString: $(SQL_NP_CONN_STRING)
diff --git a/eng/pipelines/jobs/test-azure-package-ci-job.yml b/eng/pipelines/jobs/test-azure-package-ci-job.yml
index 42097daa42..eb9e36152a 100644
--- a/eng/pipelines/jobs/test-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-azure-package-ci-job.yml
@@ -261,7 +261,7 @@ jobs:
           debug: ${{ parameters.debug }}
           saPassword: ${{ parameters.saPassword }}
 
-          # The config.json file has many options, but only some of them are
+          # The config.jsonc file has many options, but only some of them are
           # used by the Azure package tests.  We only specify the ones that are
           # necessary here.
 
diff --git a/eng/pipelines/kerberos/sqlclient-kerberos.yml b/eng/pipelines/kerberos/sqlclient-kerberos.yml
index f43ee0a280..a8c4463c13 100644
--- a/eng/pipelines/kerberos/sqlclient-kerberos.yml
+++ b/eng/pipelines/kerberos/sqlclient-kerberos.yml
@@ -141,16 +141,16 @@ stages:
           # requires compile-time parameters.
           - pwsh: |
               $managedSni = [System.Convert]::ToBoolean($env:MANAGED_SNI)
-              $jdata = Get-Content -Raw "config.default.json" | ConvertFrom-Json
+              $jdata = Get-Content -Raw "config.default.jsonc" | ConvertFrom-Json
               foreach ($p in $jdata) {
                   $p.TCPConnectionString       = $env:REMOTE_TCP_CONN_STRING
                   $p.NPConnectionString        = $env:REMOTE_NP_CONN_STRING
                   $p.SupportsIntegratedSecurity = $true
                   $p.UseManagedSNIOnWindows    = $managedSni
               }
-              $jdata | ConvertTo-Json | Set-Content "config.json"
+              $jdata | ConvertTo-Json | Set-Content "config.jsonc"
             workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
-            displayName: Update test config.json
+            displayName: Update test config.jsonc
             env:
               REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
               REMOTE_NP_CONN_STRING: $(REMOTE_NP_CONN_STRING)
@@ -234,7 +234,7 @@ stages:
 
           # --- Update test configuration (with Kerberos credentials) ---
           - pwsh: |
-              $jdata = Get-Content -Raw "config.default.json" | ConvertFrom-Json
+              $jdata = Get-Content -Raw "config.default.jsonc" | ConvertFrom-Json
               foreach ($p in $jdata) {
                   $p.TCPConnectionString       = $env:REMOTE_TCP_CONN_STRING
                   $p.NPConnectionString        = $env:REMOTE_NP_CONN_STRING
@@ -242,9 +242,9 @@ stages:
               }
               $jdata | Add-Member -NotePropertyName "KerberosDomainUser"     -NotePropertyValue $env:KERBEROS_DOMAIN_USER     -Force
               $jdata | Add-Member -NotePropertyName "KerberosDomainPassword" -NotePropertyValue $env:KERBEROS_DOMAIN_PASSWORD -Force
-              $jdata | ConvertTo-Json | Set-Content "config.json"
+              $jdata | ConvertTo-Json | Set-Content "config.jsonc"
             workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
-            displayName: Update test config.json (Kerberos)
+            displayName: Update test config.jsonc (Kerberos)
             env:
               REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
               REMOTE_NP_CONN_STRING: $(REMOTE_NP_CONN_STRING)
diff --git a/eng/pipelines/stress/stress-tests-job.yml b/eng/pipelines/stress/stress-tests-job.yml
index ac82002ece..2633445214 100644
--- a/eng/pipelines/stress/stress-tests-job.yml
+++ b/eng/pipelines/stress/stress-tests-job.yml
@@ -164,7 +164,7 @@ jobs:
             "@
 
             # Write the JSON content to the config file.
-            $content | Out-File -FilePath "config.json"
+            $content | Out-File -FilePath "config.jsonc"
 
       # Authenticate with NuGet feeds so that upstream packages (e.g. runtime host packs) can be
       # fetched through the ADO Artifacts feed.  This is required on hosted pool agents (macOS)
@@ -208,7 +208,7 @@ jobs:
           inputs:
             command: run
             projects: $(project)
-            arguments: $(runArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.json -- $(testArguments)
+            arguments: $(runArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.jsonc -- $(testArguments)
 
       # Run the stress tests for each .NET Framework runtime.
       - ${{ each runtime in parameters.netFrameworkTestRuntimes }}:
@@ -219,4 +219,4 @@ jobs:
           inputs:
             command: run
             projects: $(project)
-            arguments: $(runArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.json -- $(testArguments)
+            arguments: $(runArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.jsonc -- $(testArguments)
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs
index f153096d9f..cec4721b95 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs
@@ -10,9 +10,9 @@ namespace Microsoft.Data.SqlClient.Extensions.Azure.Test;
 
 /// <summary>
 /// This class reads configuration information from environment variables and
-/// the config.json file for use by our tests.
+/// the config.jsonc file for use by our tests.
 ///
-/// Environment variables take precedence over config.json settings.  Note that
+/// Environment variables take precedence over config.jsonc settings.  Note that
 /// variable names are case-sensitive on non-Windows platforms.
 ///
 /// The following variables are supported:
@@ -30,7 +30,7 @@ namespace Microsoft.Data.SqlClient.Extensions.Azure.Test;
 ///   TEST_MDS_CONFIG:
 ///     The path to the config file to use instead of the default.  If not
 ///     supplied, the config file is assumed to be located next to the test
-///     assembly and is named config.json.
+///     assembly and is named config.jsonc.
 /// </summary>
 internal static class Config
 {
@@ -86,13 +86,13 @@ internal static bool IsAzureSqlServer() =>
     /// </summary>
     static Config()
     {
-        // Read from the config.json file.  If the TEST_MDS_CONFIG environment
+        // Read from the config.jsonc file.  If the TEST_MDS_CONFIG environment
         // variable is set, use it.  Otherwise, assume the config file is in the
-        // working directory and named config.json.
+        // working directory and named config.jsonc.
         string configPath = GetEnvVar("TEST_MDS_CONFIG");
         if (configPath.IsEmpty())
         {
-            configPath = "config.json";
+            configPath = "config.jsonc";
         }
 
         try
@@ -109,10 +109,10 @@ static Config()
             JsonElement root = doc.RootElement;
             // See the sample config file for information about these settings:
             //
-            // src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json
+            // src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc
             //
             // The sample file is copied to the build output directory as
-            // config.json by the TestUtilities project file.
+            // config.jsonc by the TestUtilities project file.
             //
             IntegratedSecuritySupported = GetBool(root, "SupportsIntegratedSecurity");
             ManagedIdentitySupported = GetBool(root, "ManagedIdentitySupported");
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 83dd4a8351..d47ec611de 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -361,6 +361,7 @@
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
+    <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
@@ -388,6 +389,7 @@
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
+    <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="System.ServiceProcess.ServiceController" />
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs
index 52bf5c30f4..6b229d5bc0 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs
@@ -19,7 +19,7 @@ public static class SqlDbManager
         private const string DB_Northwind = "Northwind";
         private const string DB_Master = "master";
         private const string NorthWindScriptPath = @"../../../../../tools/testsql/createNorthwindDb.sql";
-        private const string ConfigPath = @"../Microsoft.Data.SqlClient.TestUtilities/config.json";
+        private const string ConfigPath = @"../Microsoft.Data.SqlClient.TestUtilities/config.jsonc";
 
         private const string TCPConnectionString = "TCPConnectionString";
         private const string NPConnectionString = "NPConnectionString";
@@ -68,7 +68,7 @@ public static void Run(string[] args)
                                     CreateDatabase(dbName, context);
                                     Console.WriteLine($"Database [{dbName}] created successfully in {builder.DataSource}");
                                 }
-                                // Update Config.json accordingly
+                                // Update config.jsonc accordingly
                                 builder.InitialCatalog = dbName;
                                 UpdateConfig(activeConnString.Key, builder);
                             }
@@ -96,7 +96,7 @@ public static void Run(string[] args)
                 }
                 if (args[0] == "CreateDatabase")
                 {
-                    // Update config.json with Initial Catalog = <dbName> for "Active Connection Strings"
+                    // Update config.jsonc with Initial Catalog = <dbName> for "Active Connection Strings"
                     Config.UpdateConfig(s_configJson, ConfigPath);
                 }
             }
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
index 24c9c4f884..6b1dda8ae0 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs
@@ -4,71 +4,73 @@
 
 using System;
 using System.IO;
-using Newtonsoft.Json;
+using System.Text.Json;
+
+#nullable enable
 
 namespace Microsoft.Data.SqlClient.TestUtilities
 {
     public class Config
     {
-        public string TCPConnectionString = null;
-        public string NPConnectionString = null;
-        public string TCPConnectionStringHGSVBS = null;
-        public string TCPConnectionStringNoneVBS = null;
-        public string TCPConnectionStringAASSGX = null;
+        private static readonly JsonSerializerOptions JsonSerializerOptions = new()
+        {
+            AllowTrailingCommas = true,
+            IncludeFields = true,
+            PropertyNameCaseInsensitive = true,
+            ReadCommentHandling = JsonCommentHandling.Skip,
+        };
+
+        public string? TCPConnectionString = null;
+        public string? NPConnectionString = null;
+        public string? TCPConnectionStringHGSVBS = null;
+        public string? TCPConnectionStringNoneVBS = null;
+        public string? TCPConnectionStringAASSGX = null;
         public bool EnclaveEnabled = false;
         public bool TracingEnabled = false;
-        public string AADAuthorityURL = null;
-        public string AADPasswordConnectionString = null;
-        public string AADServicePrincipalId = null;
-        public string AADServicePrincipalSecret = null;
-        public string AzureKeyVaultURL = null;
-        public string AzureKeyVaultTenantId = null;
+        public string? AADAuthorityURL = null;
+        public string? AADPasswordConnectionString = null;
+        public string? AADServicePrincipalId = null;
+        public string? AADServicePrincipalSecret = null;
+        public string? AzureKeyVaultURL = null;
+        public string? AzureKeyVaultTenantId = null;
         public bool SupportsIntegratedSecurity = false;
-        public string LocalDbAppName = null;
-        public string LocalDbSharedInstanceName = null;
-        public string FileStreamDirectory = null;
+        public string? LocalDbAppName = null;
+        public string? LocalDbSharedInstanceName = null;
+        public string? FileStreamDirectory = null;
         public bool UseManagedSNIOnWindows = false;
-        public string DNSCachingConnString = null;
-        public string DNSCachingServerCR = null;  // this is for the control ring
-        public string DNSCachingServerTR = null;  // this is for the tenant ring
+        public string? DNSCachingConnString = null;
+        public string? DNSCachingServerCR = null;  // this is for the control ring
+        public string? DNSCachingServerTR = null;  // this is for the tenant ring
         public bool IsDNSCachingSupportedCR = false;  // this is for the control ring
         public bool IsDNSCachingSupportedTR = false;  // this is for the tenant ring
-        public string EnclaveAzureDatabaseConnString = null;
+        public string? EnclaveAzureDatabaseConnString = null;
         public bool ManagedIdentitySupported = true;
-        public string UserManagedIdentityClientId = null;
-        public string PowerShellPath = null;
-        public string AliasName = null;
-        public string KerberosDomainPassword = null;
-        public string KerberosDomainUser = null;
+        public string? UserManagedIdentityClientId = null;
+        public string? PowerShellPath = null;
+        public string? AliasName = null;
+        public string? KerberosDomainPassword = null;
+        public string? KerberosDomainUser = null;
         public bool IsManagedInstance = false;
 
-        public static Config Load(string configPath = @"config.json")
+        public static Config Load(string configPath)
         {
-            // Allow an override of the config path via an environment variable.
-            configPath = Environment.GetEnvironmentVariable("TEST_MDS_CONFIG") ?? configPath;
+            Config config = LoadInternal(Environment.GetEnvironmentVariable("TEST_MDS_CONFIG")) ??
+                            LoadInternal(configPath) ??
+                            throw new FileNotFoundException("Could not find test configuration file.");
 
-            Config config;
-            try
-            {
-                using (StreamReader r = new StreamReader(configPath))
-                {
-                    config = JsonConvert.DeserializeObject<Config>(r.ReadToEnd())
-                        ?? throw new InvalidOperationException($"Failed to deserialize config from '{configPath}'.");
-                }
-            }
-            catch
-            {
-                throw;
-            }
+            // Allow environment variables to override individual config values.
+            SetFromEnv("MDS_TCPConnectionString", ref config.TCPConnectionString);
 
-            static void SetFromEnv(string envVar, ref string configValue)
-            {
-                string envValue = Environment.GetEnvironmentVariable(envVar);
-                if (!string.IsNullOrEmpty(envValue))
-                {
-                    configValue = envValue;
-                }
-            }
+            return config;
+        }
+
+        public static Config Load()
+        {
+            // Load config from environment variable first, jsonc file second, json file last.
+            Config config = LoadInternal(Environment.GetEnvironmentVariable("TEST_MDS_CONFIG")) ??
+                            LoadInternal("config.jsonc") ??
+                            LoadInternal("config.json") ??
+                            throw new FileNotFoundException("Could not find test configuration file.");
 
             // Allow environment variables to override individual config values.
             SetFromEnv("MDS_TCPConnectionString", ref config.TCPConnectionString);
@@ -76,10 +78,39 @@ static void SetFromEnv(string envVar, ref string configValue)
             return config;
         }
 
-        public static void UpdateConfig(Config updatedConfig, string configPath = @"config.json")
+        public static void UpdateConfig(Config updatedConfig, string configPath = @"config.jsonc")
         {
-            string config = JsonConvert.SerializeObject(updatedConfig);
+            string config = JsonSerializer.Serialize(updatedConfig, JsonSerializerOptions);
             File.WriteAllText(configPath, config);
         }
+
+        private static Config? LoadInternal(string? configPath)
+        {
+            if (configPath is null)
+            {
+                return null;
+            }
+
+            try
+            {
+                using StreamReader sr = new StreamReader(configPath);
+                return JsonSerializer.Deserialize<Config>(sr.ReadToEnd(), JsonSerializerOptions) ??
+                       throw new InvalidOperationException($"Failed to deserialize config from '{configPath}'");
+            }
+            catch (Exception e) when (e is FileNotFoundException or DirectoryNotFoundException)
+            {
+                // File did not exist at the path given. We will try a different location.
+                return null;
+            }
+        }
+
+        private static void SetFromEnv(string envVar, ref string? configValue)
+        {
+            string? envValue = Environment.GetEnvironmentVariable(envVar);
+            if (!string.IsNullOrEmpty(envValue))
+            {
+                configValue = envValue;
+            }
+        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
index c50a251e4f..05444fd022 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
@@ -10,13 +10,16 @@
     <AssemblyOriginatorKeyFile>$(TestSigningKeyPath)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
+  <!-- Copy config file ================================================ -->
   <Target Name="CopyConfig" BeforeTargets="Compile">
-    <Copy SourceFiles="config.default.json" DestinationFiles="config.json" Condition="!Exists('config.json')" />
+    <Copy SourceFiles="config.default.jsonc" DestinationFiles="config.jsonc" Condition="!Exists('config.jsonc')" />
   </Target>
   <ItemGroup>
-    <None Update="config.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <PackageReference Include="Newtonsoft.Json" />
+    <None Update="config.jsonc" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <!-- References ====================================================== -->
+  <ItemGroup>
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json
rename to src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc

From 29a9b2a87db0417b6eddb5d490894dcbf0735417 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Mon, 8 Jun 2026 14:57:57 +0530
Subject: [PATCH 132/298] Enforce `gh aw compile` + lock-file regeneration for
 agentic workflows (#4298)

---
 .../agentic-workflows.instructions.md         | 49 +++++++++++++++++++
 .github/workflows/verify-aw-lock.yml          | 32 ++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 .github/instructions/agentic-workflows.instructions.md
 create mode 100644 .github/workflows/verify-aw-lock.yml

diff --git a/.github/instructions/agentic-workflows.instructions.md b/.github/instructions/agentic-workflows.instructions.md
new file mode 100644
index 0000000000..6a42c0dce3
--- /dev/null
+++ b/.github/instructions/agentic-workflows.instructions.md
@@ -0,0 +1,49 @@
+---
+applyTo: ".github/workflows/**/*.md"
+description: Rules for editing gh-aw agentic workflow Markdown files.
+---
+
+# Agentic Workflow Edit Rules (`gh aw`)
+
+This repository authors GitHub Actions agentic workflows in Markdown using
+[`gh aw`](https://github.com/githubnext/gh-aw). Each workflow `.md` file under
+`.github/workflows/` compiles to a sibling `.lock.yml`, and **only the
+`.lock.yml` is executed by GitHub Actions at runtime.**
+
+## Mandatory rule
+
+Whenever you create, edit, rename, or delete a file matching
+`.github/workflows/**/*.md`, you **MUST**, in the **same commit / PR**:
+
+1. Run `gh aw compile` from the repository root.
+2. Stage and commit the regenerated sibling `<name>.lock.yml`.
+3. If you deleted a workflow `.md`, also delete its `.lock.yml`.
+
+If the `.lock.yml` is stale or missing, the workflow fails at runtime
+(see PR #4279 for the exact failure mode). The
+`Verify gh aw lock files` CI check will block the PR in that case.
+
+## How to verify locally
+
+```bash
+gh aw compile
+git status        # both the .md and .lock.yml should appear
+gh aw compile     # second run must be a no-op (clean diff)
+```
+
+## Code-review checklist
+
+When reviewing a PR that touches `.github/workflows/**/*.md`:
+
+- [ ] A matching `.lock.yml` is updated in the same PR.
+- [ ] `gh aw compile` produces no further diff on top of the PR.
+- [ ] If new tools, network endpoints, or permissions are added in the `.md`,
+      they are present in the regenerated `.lock.yml`.
+
+## Out of scope
+
+- Do **not** hand-edit `.lock.yml` files. They are generated; edit the `.md`
+  source and recompile.
+- For deeper authoring guidance (creating, debugging, upgrading workflows),
+  invoke the `agentic-workflows` agent at
+  `.github/agents/agentic-workflows.agent.md`.
diff --git a/.github/workflows/verify-aw-lock.yml b/.github/workflows/verify-aw-lock.yml
new file mode 100644
index 0000000000..1d37e610e8
--- /dev/null
+++ b/.github/workflows/verify-aw-lock.yml
@@ -0,0 +1,32 @@
+name: Verify gh aw lock files
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/**/*.md'
+      - '.github/workflows/**/*.lock.yml'
+
+permissions:
+  contents: read
+
+jobs:
+  verify:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install gh-aw extension
+        uses: github/gh-aw-actions/setup-cli@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+        with:
+          version: v0.72.1
+
+      - name: Recompile agentic workflows
+        run: gh aw compile
+
+      - name: Fail if any .lock.yml is out of date
+        run: |
+          if ! git diff --exit-code -- '.github/workflows/**/*.lock.yml'; then
+            echo "::error::One or more .github/workflows/**/*.lock.yml files are out of date relative to their .md source (running 'gh aw compile' produced a diff)."
+            echo "::error::Run 'gh aw compile' locally and commit the regenerated .lock.yml files in this PR."
+            exit 1
+          fi

From 323aba913a1937acd25dc9cf4cd65b5a4f9af307 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 8 Jun 2026 07:47:01 -0300
Subject: [PATCH 133/298] Agents | Add Azure DevOps work item markdown
 formatting guide & PR feedback prompt (#4253)

---
 .../ado-work-items-markdown.instructions.md   | 139 ++++++++++++++++++
 .github/prompts/review-pr-feedback.prompt.md  | 123 ++++++++++++++++
 AGENTS.md                                     |  10 ++
 3 files changed, 272 insertions(+)
 create mode 100644 .github/instructions/ado-work-items-markdown.instructions.md
 create mode 100644 .github/prompts/review-pr-feedback.prompt.md

diff --git a/.github/instructions/ado-work-items-markdown.instructions.md b/.github/instructions/ado-work-items-markdown.instructions.md
new file mode 100644
index 0000000000..2a70fd124a
--- /dev/null
+++ b/.github/instructions/ado-work-items-markdown.instructions.md
@@ -0,0 +1,139 @@
+---
+applyTo: "**"
+---
+# Azure DevOps Work Items: Markdown Description Rules
+
+Use this guide whenever creating or updating Azure DevOps work items that include rich text in `System.Description`.
+
+## Goals
+
+- Ensure descriptions render as Markdown (not HTML/plain text)
+- Preserve newline characters and list structure
+- Verify work items after every batch update
+
+## Required Behavior
+
+1. Always use `az rest` for description content-type changes.
+2. Use `application/json-patch+json` for PATCH requests.
+3. Set `multilineFieldsFormat.System.Description` to `markdown`.
+4. Preserve exact newlines in the Markdown body.
+5. Verify both format and newline integrity after updates.
+
+## Authentication and Resource
+
+Use Azure DevOps resource audience when calling `az rest`:
+
+- Resource: `499b84ac-1321-427f-aa17-267ca6975798`
+
+Example auth check:
+
+```bash
+az rest \
+  --method GET \
+  --resource 499b84ac-1321-427f-aa17-267ca6975798 \
+  --url "https://dev.azure.com/<org>/_apis/projects?api-version=7.1-preview.4"
+```
+
+Note: API versions can differ by endpoint. The examples below use `7.1-preview.3` for work item PATCH calls, while this auth check uses `7.1-preview.4`.
+
+## Safe Update Pattern (Prevents Type/Value Errors)
+
+Some work items reject a direct type switch unless a valid value is provided. Use this two-step process:
+
+### Step 1: Capture current description
+
+```bash
+az boards work-item show --id <id> | jq -j '.fields["System.Description"] // ""' > ./desc-backup.txt
+```
+
+> **NOTE**: Writing to a file preserves all characters including trailing newlines.
+> Command substitution (`$(...)`) silently strips trailing newlines, which would
+> corrupt multi-line Markdown content.
+
+### Step 2: Force markdown type with temporary empty value
+
+```bash
+PATCH_STEP1_FILE="${PATCH_STEP1_FILE:-./patch-step1.json}"
+
+jq -n '[
+  {"op":"replace","path":"/fields/System.Description","value":""},
+  {"op":"replace","path":"/multilineFieldsFormat/System.Description","value":"markdown"}
+]' >"$PATCH_STEP1_FILE"
+
+az rest \
+  --method PATCH \
+  --resource 499b84ac-1321-427f-aa17-267ca6975798 \
+  --url "https://dev.azure.com/<org>/<project>/_apis/wit/workitems/<id>?api-version=7.1-preview.3" \
+  --headers "Content-Type=application/json-patch+json" \
+  --body @"$PATCH_STEP1_FILE"
+```
+
+### Step 3: Restore exact Markdown text
+
+```bash
+PATCH_STEP2_FILE="${PATCH_STEP2_FILE:-./patch-step2.json}"
+
+jq -n --rawfile d ./desc-backup.txt '[
+  {"op":"replace","path":"/fields/System.Description","value":$d}
+]' >"$PATCH_STEP2_FILE"
+
+az rest \
+  --method PATCH \
+  --resource 499b84ac-1321-427f-aa17-267ca6975798 \
+  --url "https://dev.azure.com/<org>/<project>/_apis/wit/workitems/<id>?api-version=7.1-preview.3" \
+  --headers "Content-Type=application/json-patch+json" \
+  --body @"$PATCH_STEP2_FILE"
+```
+
+## Newline Integrity Checks
+
+After updates, confirm newline characters are still present and structure was not flattened.
+
+### Check format and description sample
+
+```bash
+az boards work-item show --id <id> | jq '.multilineFieldsFormat, .fields["System.Description"][0:200]'
+```
+
+Expected:
+
+- `multilineFieldsFormat.System.Description == "markdown"`
+- Description text contains `\n` where line breaks are expected
+
+### Check line count did not collapse
+
+```bash
+az boards work-item show --id <id> \
+| jq -r '.fields["System.Description"]' \
+| awk 'END { print NR }'
+```
+
+If a multi-line description unexpectedly returns `1`, newline content was likely lost.
+
+## Batch Verification Script
+
+Use this after bulk updates:
+
+```bash
+python3 - <<'PY'
+import json, subprocess
+ids = [12345, 12346]  # replace with your target IDs
+bad = []
+for i in ids:
+    out = subprocess.check_output(["az", "boards", "work-item", "show", "--id", str(i)], text=True)
+    j = json.loads(out)
+    fmt = (j.get("multilineFieldsFormat") or {}).get("System.Description")
+    desc = j.get("fields", {}).get("System.Description") or ""
+    if fmt != "markdown" or "\n" not in desc:
+        bad.append((i, fmt, "has_newlines" if "\n" in desc else "missing_newlines"))
+print("noncompliant:", len(bad))
+for row in bad:
+    print(row)
+PY
+```
+
+## Common Failure Modes
+
+- `401` or `TF400813`: wrong token audience or insufficient auth context
+- `Content-Type ... not supported`: must use `application/json-patch+json`
+- `type changed without a value`: use two-step pattern (empty + markdown type, then restore text)
diff --git a/.github/prompts/review-pr-feedback.prompt.md b/.github/prompts/review-pr-feedback.prompt.md
new file mode 100644
index 0000000000..c14a7b96cb
--- /dev/null
+++ b/.github/prompts/review-pr-feedback.prompt.md
@@ -0,0 +1,123 @@
+---
+name: review-pr-feedback
+description: Uses gh CLI to collect unresolved PR review feedback, optionally includes discussion comments, applies fixes, and reports status.
+argument-hint: pr=<number-or-url> repo=<owner/repo-optional> includeDiscussionComments=<true|false> authorFilter=<optional regex or csv> testScope=<optional test hint>
+tools: ['edit/editFiles', 'edit/createFile', 'read/readFile', 'read/problems', 'search/codebase', 'search/textSearch', 'search/fileSearch', 'execute/runInTerminal', 'execute/getTerminalOutput']
+---
+You are an expert software maintenance agent focused on resolving pull request feedback quickly, safely, and with clear traceability.
+
+## Context
+- Workspace root: ${workspaceFolder}
+- Target PR: ${input:pr}
+- Optional repository override: ${input:repo}
+- Include non-review discussion comments: ${input:includeDiscussionComments}
+- Optional author filter: ${input:authorFilter}
+- Optional focused testing hint: ${input:testScope}
+- Optional selected context: ${selection}
+
+## Skills
+#skill:generate-mstest-filter
+
+Use this skill when building a dotnet test filter:
+- [generate-mstest-filter](.github/skills/generate-mstest-filter/SKILL.md)
+
+Follow the referenced skill instructions before producing any custom filter.
+
+## Task
+1. Validate prerequisites
+- Confirm gh CLI is installed and authenticated.
+- Resolve repository from ${input:repo}, or infer from git remote.
+- Resolve PR number from ${input:pr} (accept number or URL).
+- Discover the correct git remote name from the current repository and store it for later commands.
+- Use that discovered remote name for push and any other git operations that require a remote; do not assume `origin`.
+
+2. Gather actionable review feedback
+- Query PR review threads with gh api GraphQL.
+- Keep only unresolved threads where isResolved is false.
+- Extract thread id, file path, line/startLine, comment url, author login, and body.
+- If ${input:authorFilter} is provided, apply it case-insensitively.
+
+3. Optionally gather non-review discussion comments
+- If ${input:includeDiscussionComments} is true, fetch PR issue comments.
+- Mark these as Informational because they do not have open/resolved state.
+- Apply ${input:authorFilter} if provided.
+
+4. Build an implementation plan
+- Group unresolved review feedback by file and risk.
+- Determine minimal safe edits needed.
+- Identify comments that are non-actionable or ambiguous.
+- Ask the user to confirm the plan before proceeding, showing a concise summary of proposed changes and rationale.
+
+5. Implement and verify
+- Apply required code or test updates with smallest safe change set.
+- Run targeted checks first.
+- If ${input:testScope} is provided, generate and use a focused MSTest filter via the skill.
+- Collect diagnostics when tests cannot run.
+
+6. Classify each item
+- Fixed: change implemented and validated.
+- Needs Clarification: ambiguous, conflicting, or insufficiently specified.
+- Blocked: external dependency, permission, or missing context.
+- Informational: non-review discussion comment captured only.
+
+7. Produce a final report
+- Keep review-thread outcomes and discussion outcomes in separate sections.
+- Include evidence for each item: file location, change summary, validation result.
+- Draft a distinct reply for each comment item that addresses that exact comment's request, context, and outcome.
+
+8. Commit changes
+- If any changes were made, create a commit with a clear message referencing the PR and summarizing the resolution.
+- Prompt the user to review and confirm the commit message before finalizing.
+- When suggesting or performing a push, use the discovered git remote name.
+- Prompt the user to push the commit if they have permissions, or provide instructions if they do not.
+- Prompt the user to reply to each original PR comment with a comment-specific response and link to the relevant commit or code location, if appropriate.
+- Prompt the user to mark review threads as resolved in GitHub if they have permissions, or provide instructions if they do not.
+
+## Output Format
+1. PR Scope
+- Repo
+- PR number
+- Unresolved review threads found
+- Discussion comments found (if enabled)
+
+2. Unresolved Review Feedback (Actionable)
+- Item: <comment url>
+- Location: <file>:<line>
+- Author: <login>
+- Request summary: <concise>
+- Action taken: <change or rationale>
+- Status: Fixed | Needs Clarification | Blocked
+- Evidence: <tests/diagnostics>
+- Suggested reply: <specific response for this exact comment>
+
+3. Discussion Comments (Informational, optional)
+- Item: <comment url>
+- Author: <login>
+- Summary: <concise>
+- Notes: <if converted to actionable task, explain>
+- Suggested reply: <specific response for this exact comment>
+
+4. Validation
+- Commands run
+- Filters used
+- Pass/fail summary
+- Remaining warnings/errors
+
+5. Final Summary
+- Files changed
+- Number fixed
+- Number needing clarification
+- Number blocked
+- Number informational
+- Recommended next step
+
+## Rules
+- Do not invent comments; only act on data fetched from gh.
+- Review-thread resolution tracking is authoritative for unresolved state.
+- Keep behavior-compatible edits unless feedback explicitly requires change.
+- If no unresolved review threads exist, report that explicitly.
+- If auth or permission fails, report exact failure and minimum required user action.
+- Do not use `set -e` in bash commands or scripts.
+- After each terminal step, verify the bash session is still alive; if it died, report it immediately, start a new session, and continue from the last confirmed checkpoint.
+- Use the discovered git remote name consistently anywhere a remote is required.
+- Do not post generic batch replies; each reply must be tailored to the specific comment content and its exact resolution status.
diff --git a/AGENTS.md b/AGENTS.md
index 06bc0edfd1..c461eec189 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -5,6 +5,7 @@ This document provides guidance for AI coding agents working with the Microsoft.
 ## Quick Start
 
 ### Essential Context Files
+
 Before making changes, agents should be aware of:
 
 | File | Purpose |
@@ -15,6 +16,7 @@ Before making changes, agents should be aware of:
 | [.github/copilot-instructions.md](.github/copilot-instructions.md) | Copilot-specific instructions |
 
 ### Detailed Technical Instructions
+
 The `.github/instructions/` directory contains comprehensive guides:
 
 | Guide | Coverage |
@@ -29,6 +31,7 @@ The `.github/instructions/` directory contains comprehensive guides:
 | [features.instructions.md](.github/instructions/features.instructions.md) | Feature reference, keywords |
 | [documentation.instructions.md](.github/instructions/documentation.instructions.md) | Documentation and samples |
 | [external-resources.instructions.md](.github/instructions/external-resources.instructions.md) | Docs links, version matrix, external references |
+| [ado-work-items-markdown.instructions.md](.github/instructions/ado-work-items-markdown.instructions.md) | Ensure Azure DevOps work item descriptions are Markdown and preserve newlines |
 
 ## Workflow Prompts
 
@@ -77,6 +80,7 @@ Do **not** create branches directly under `main`, `dev/`, or any other top-level
 ## Common Tasks
 
 ### Bug Fix Workflow
+
 1. Understand the issue from the bug report
 2. Locate relevant code in `src/Microsoft.Data.SqlClient/src/` (do NOT modify legacy `netcore/src/` or `netfx/src/`)
 3. Check `.github/instructions/features.instructions.md` for existing AppContext switches (including failover compatibility switches) before introducing behavior changes
@@ -86,6 +90,7 @@ Do **not** create branches directly under `main`, `dev/`, or any other top-level
 7. Update documentation if behavior changes
 
 ### Feature Implementation
+
 1. Review the feature specification
 2. Plan the implementation (see `implement-feature` prompt)
 3. Update reference assemblies if adding public APIs
@@ -94,6 +99,7 @@ Do **not** create branches directly under `main`, `dev/`, or any other top-level
 6. Do not edit `CHANGELOG.md` directly; instead, add a suggested release-note entry (per `.github/copilot-instructions.md`) in the PR description or via the release-notes workflow/prompt.
 
 ### Adding Connection String Keywords
+
 1. Add to `SqlConnectionStringBuilder`
 2. Update connection string parser
 3. Default to backward-compatible value
@@ -101,6 +107,7 @@ Do **not** create branches directly under `main`, `dev/`, or any other top-level
 5. Document in feature reference
 
 ### Protocol Changes
+
 1. Reference MS-TDS specification
 2. Update `TdsEnums.cs` for new constants
 3. Implement in `TdsParser.cs` and related files
@@ -108,6 +115,7 @@ Do **not** create branches directly under `main`, `dev/`, or any other top-level
 5. Consider backward compatibility
 
 ### Performance Optimization
+
 1. Profile the issue using benchmarks or traces
 2. Identify allocation hotspots (see `perf-optimization` prompt)
 3. Apply patterns: `ArrayPool<T>`, `Span<T>`, static/cached instances, source generation
@@ -117,6 +125,7 @@ Do **not** create branches directly under `main`, `dev/`, or any other top-level
 
 
 ### Key Documentation Links
+
 - [Microsoft.Data.SqlClient on Microsoft Learn](https://learn.microsoft.com/sql/connect/ado-net/introduction-microsoft-data-sqlclient-namespace)
 - [MS-TDS Protocol Specification](https://learn.microsoft.com/openspecs/windows_protocols/ms-tds)
 - [SQL Server Documentation](https://learn.microsoft.com/sql/sql-server/)
@@ -124,6 +133,7 @@ Do **not** create branches directly under `main`, `dev/`, or any other top-level
 ## Repository Policies
 
 See the `policy/` directory for:
+
 - [coding-best-practices.md](policy/coding-best-practices.md) - Programming standards
 - [coding-style.md](policy/coding-style.md) - Code formatting guidelines
 - [review-process.md](policy/review-process.md) - PR review requirements

From 5ac26c96708478d06efd7afd044d24a025200da8 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 8 Jun 2026 07:55:53 -0300
Subject: [PATCH 134/298] Move package compatibility app to tools and add
 robust test coverage (#4242)

---
 .github/instructions/testing.instructions.md  |  39 ++
 .../Directory.Packages.props                  |  32 --
 doc/apps/AzureAuthentication/README.md        | 165 -------
 src/Microsoft.Data.SqlClient.slnx             |   6 +-
 .../Directory.Build.props                     |   0
 .../Directory.Packages.props                  |  44 ++
 .../PackageCompatibility}/NuGet.config        |   0
 tools/PackageCompatibility/README.md          | 266 ++++++++++++
 tools/PackageCompatibility/global.json        |  15 +
 .../PackageCompatibility}/packages/.gitkeep   |   0
 .../PackageCompatibility/src}/App.cs          |  11 +-
 .../PackageCompatibility/src}/EntryPoint.cs   |  12 +-
 .../src}/GeneratePackageVersions.targets      |   0
 .../src/PackageCompatibility.csproj           |  18 +-
 .../src}/PackageVersions.Partial.cs           |   4 +-
 .../src}/SqlClientEventListener.cs            |   2 +-
 tools/PackageCompatibility/test/AppTests.cs   | 126 ++++++
 .../test/BuildVersionOverrideTests.cs         | 408 ++++++++++++++++++
 .../test/ConsoleCollection.cs                 |  27 ++
 .../test/EntryPointTests.cs                   | 103 +++++
 .../test/IsExternalInit.cs                    |  13 +
 .../test/PackageCompatibility.Test.csproj     |  25 ++
 22 files changed, 1100 insertions(+), 216 deletions(-)
 delete mode 100644 doc/apps/AzureAuthentication/Directory.Packages.props
 delete mode 100644 doc/apps/AzureAuthentication/README.md
 rename {doc/apps/AzureAuthentication => tools/PackageCompatibility}/Directory.Build.props (100%)
 create mode 100644 tools/PackageCompatibility/Directory.Packages.props
 rename {doc/apps/AzureAuthentication => tools/PackageCompatibility}/NuGet.config (100%)
 create mode 100644 tools/PackageCompatibility/README.md
 create mode 100644 tools/PackageCompatibility/global.json
 rename {doc/apps/AzureAuthentication => tools/PackageCompatibility}/packages/.gitkeep (100%)
 rename {doc/apps/AzureAuthentication => tools/PackageCompatibility/src}/App.cs (92%)
 rename {doc/apps/AzureAuthentication => tools/PackageCompatibility/src}/EntryPoint.cs (84%)
 rename {doc/apps/AzureAuthentication => tools/PackageCompatibility/src}/GeneratePackageVersions.targets (100%)
 rename doc/apps/AzureAuthentication/AzureAuthentication.csproj => tools/PackageCompatibility/src/PackageCompatibility.csproj (73%)
 rename {doc/apps/AzureAuthentication => tools/PackageCompatibility/src}/PackageVersions.Partial.cs (85%)
 rename {doc/apps/AzureAuthentication => tools/PackageCompatibility/src}/SqlClientEventListener.cs (97%)
 create mode 100644 tools/PackageCompatibility/test/AppTests.cs
 create mode 100644 tools/PackageCompatibility/test/BuildVersionOverrideTests.cs
 create mode 100644 tools/PackageCompatibility/test/ConsoleCollection.cs
 create mode 100644 tools/PackageCompatibility/test/EntryPointTests.cs
 create mode 100644 tools/PackageCompatibility/test/IsExternalInit.cs
 create mode 100644 tools/PackageCompatibility/test/PackageCompatibility.Test.csproj

diff --git a/.github/instructions/testing.instructions.md b/.github/instructions/testing.instructions.md
index bd9db72c4a..df6b909f8a 100644
--- a/.github/instructions/testing.instructions.md
+++ b/.github/instructions/testing.instructions.md
@@ -173,6 +173,45 @@ dotnet test ... --filter "FullyQualifiedName=Namespace.ClassName.MethodName"
 
 ## Writing Tests
 
+### Test Documentation Requirements
+
+To keep tests maintainable for contributors and AI agents, test intent must be documented at
+class and method level.
+
+#### Required XML Documentation
+- Add XML `<summary>` comments to every test class.
+- Add XML `<summary>` comments to every test method (`[Fact]`, `[Theory]`, conditional variants).
+- For helper methods used by tests, add XML `<summary>` comments and XML `<param>` / `<returns>`
+  where applicable.
+- For fixture and collection types, add XML `<summary>` comments describing why the fixture exists
+  (for example, serialization of console-mutating tests).
+
+#### What the Comments Must Explain
+- The behavior/contract being tested (not just restating the method name).
+- Why the scenario matters (for example: regression guard, parsing contract, sync/async parity,
+  isolation requirement).
+- For helper methods, what side effects occur (for example console redirection, file system
+  copying, process execution) and why they are needed.
+
+#### Style Guidance
+- Keep comments concise and factual.
+- Prefer behavior-focused wording over implementation trivia.
+- Avoid comments that merely repeat obvious code.
+- Use inline comments inside test methods only for non-obvious setup/act/assert details.
+
+#### Example
+```csharp
+/// <summary>
+/// Ensures malformed connection strings return a non-zero exit code and emit a parse error
+/// without verbose exception details.
+/// </summary>
+[Fact]
+public void AppRunWithMalformedConnectionStringReturnsOneAndWritesParseError()
+{
+        // Arrange / Act / Assert
+}
+```
+
 ### Test Structure
 ```csharp
 public class FeatureNameTests
diff --git a/doc/apps/AzureAuthentication/Directory.Packages.props b/doc/apps/AzureAuthentication/Directory.Packages.props
deleted file mode 100644
index b512683765..0000000000
--- a/doc/apps/AzureAuthentication/Directory.Packages.props
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- We purposely do not include any parent Directory.Packages.props files. -->
-
-  <PropertyGroup>
-    <!-- Use SqlClient 7.0.0 Preview 4 if no version was specified. -->
-    <SqlClientVersion>7.0.0-preview4.26064.3</SqlClientVersion>
-
-    <!-- Use AKV Provider 7.0.0 Preview 1 if no version was specified. -->
-    <AkvProviderVersion>7.0.0-preview1.26064.3</AkvProviderVersion>
-  </PropertyGroup>
-
-  <!-- SqlClient Packages -->
-  <ItemGroup>
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="$(SqlClientVersion)" />
-    <PackageVersion Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="$(AkvProviderVersion)" />
-
-    <!-- Declare a version for the Azure package if one was specified. -->
-    <PackageVersion
-      Include="Microsoft.Data.SqlClient.Extensions.Azure"
-      Version="$(AzureVersion)"
-      Condition="'$(AzureVersion)' != ''" />
-  </ItemGroup>
-
-  <!-- Other Packages -->
-  <ItemGroup>
-    <PackageVersion Include="Azure.Identity" Version="1.17.1" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.3" />
-  </ItemGroup>
-
-</Project>
diff --git a/doc/apps/AzureAuthentication/README.md b/doc/apps/AzureAuthentication/README.md
deleted file mode 100644
index 967a728007..0000000000
--- a/doc/apps/AzureAuthentication/README.md
+++ /dev/null
@@ -1,165 +0,0 @@
-# AzureAuthentication Sample App
-
-A minimal console application that verifies **SqlClient** can connect to a SQL Server using Entra ID
-authentication (formerly Azure Active Directory authentication) via the **Azure** package. It also
-references the **Azure Key Vault Provider** package to confirm there are no transitive dependency
-conflicts between the packages.
-
-The following SqlClient packages are used, either directly or transitively:
-
-- `Microsoft.Data.SqlClient`
-- `Microsoft.SqlServer.Server`
-- `Microsoft.Data.SqlClient.Internal.Logging`
-- `Microsoft.Data.SqlClient.Extensions.Abstractions`
-- `Microsoft.Data.SqlClient.Extensions.Azure`
-- `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
-
-## Purpose
-
-This app serves as a smoke test for package compatibility. It:
-
-1. Instantiates `SqlColumnEncryptionAzureKeyVaultProvider` to ensure the AKV provider assembly loads
-   without conflicts.
-2. Opens a `SqlConnection` using a connection string you provide, validating that authentication and
-   connectivity work end-to-end.
-
-The app is designed to run against both **published NuGet packages** and **locally-built packages**
-(via the `packages/` directory configured in `NuGet.config`).
-
-## Build Parameters
-
-Package versions are controlled through build properties. Pass them on the command line with `-p:`
-(or `/p:`) to override the defaults defined in `Directory.Packages.props`.
-
-| Property | Default | Description |
-| --- | --- | --- |
-| `SqlClientVersion` | `7.0.0-preview4.26064.3` | Version of `Microsoft.Data.SqlClient` to reference. |
-| `AkvProviderVersion` | `7.0.0-preview1.26064.3` | Version of `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` to reference. |
-| `AzureVersion` | None | Version of `Microsoft.Data.SqlClient.Extensions.Azure` to reference.  When omitted, the `Azure` package will not be referenced. |
-
-## Local Package Source
-
-The `NuGet.config` adds a `packages/` directory as a local package source. To test against packages
-that haven't been published to NuGet yet, copy the `.nupkg` files into this folder and specify the
-matching version via the build properties above.
-
-NuGet will cache copies of the packages it finds in `packages/` after a successful restore.  If you
-update the `.nupkg` files in `packages/` without incrementing their version numbers (and referencing
-those new version numbers) you will have to clear the NuGet caches in order for the next restore
-operation to pick them up:
-
-```bash
-dotnet nuget locals all --clear
-```
-
-## Running the App
-
-The app has built-in help:
-
-```bash
-dotnet run -- --help
-
-Description:
-  Azure Authentication Tester
-  ---------------------------
-
-  Validates SqlClient connectivity using EntraID (formerly Azure Active Directory) authentication.
-  Connects to SQL Server using the supplied connection string, which must specify the authentication method.
-
-  Supply specific package versions when building to test different versions of the SqlClient suite, for example:
-
-    -p:SqlClientVersion=7.0.0.preview4
-    -p:AkvProviderVersion=7.0.1-preview2
-    -p:AzureVersion=1.0.0-preview1
-
-Usage:
-  AzureAuthentication [options]
-
-Options:
-  -c, --connection-string <connection-string> (REQUIRED)  The ADO.NET connection string used to connect to SQL Server.
-                                                          Supports SQL, Entra ID, and integrated authentication modes.
-  -l, --log-events                                        Enable SqlClient event emission to the console.
-  -t, --trace                                             Pauses execution to allow dotnet-trace to be attached.
-  -v, --verbose                                           Enable verbose output with detailed error information.
-  -?, -h, --help                                          Show help and usage information
-  --version                                               Show version information
-```
-
-The app expects a single argument: a full connection string.
-
-```bash
-dotnet run -- -c "<connection string>"
-```
-
-For Entra ID authentication, use an `Authentication` keyword in the connection string. For example:
-
-```bash
-dotnet run -- -c "Server=myserver.database.windows.net;Database=mydb;Authentication=ActiveDirectoryDefault"
-```
-
-On success the app emits to standard out:
-
-```bash
-Azure Authentication Tester
----------------------------
-
-Packages used:
-  SqlClient:     7.0.0-preview4.26055.1
-  AKV Provider:  6.1.2
-  Azure:         1.0.0-preview1.26055.1
-
-Connection details:
-  Data Source:      adotest.database.windows.net
-  Initial Catalog:  Northwind
-  Authentication:   ActiveDirectoryPassword
-
-Testing connectivity...
-Connected successfully!
-    Server version: 12.00.1017
-```
-
-Errors will be emitted to standard error:
-
-```bash
-Testing connectivity...
-Connection failed:
-  Cannot find an authentication provider for 'ActiveDirectoryPassword'.
-```
-
-### Examples
-
-Run with the default (published) package versions, and no `Azure` package:
-
-```bash
-dotnet run -- -c "<connection string>"
-```
-
-If the connection string specifies one of the Entra ID authentication methods,
-`SqlClient` will fail with an error indicating that no authentication provider has been registered.
-This is because the `Azure` package was not referenced, and the app did not provide its own custom
-authentication provider.
-
-Run against locally-built packages (drop `.nupkg` files into the `packages/` folder first):
-
-```bash
-dotnet run -p:SqlClientVersion=7.0.0-preview4 -- -c "<connection string>"
-```
-
-Run including the `Azure` extensions package:
-
-```bash
-dotnet run -p:AzureVersion=1.0.0-preview1 -- -c "<connection string>"
-```
-
-Override all three versions at once:
-
-```bash
-dotnet run -p:SqlClientVersion=7.0.0-preview1 -p:AkvProviderVersion=7.0.0-preview1 -p:AzureVersion=1.0.0-preview1 -- -c "<connection string>"
-```
-
-## Prerequisites
-
-- [.NET 10.0 SDK](https://dotnet.microsoft.com/download) and .NET Framework 4.8.1 or later.
-- A SQL Server or Azure SQL instance accessible with Entra ID credentials.
-- Azure credentials available to `DefaultAzureCredential` (e.g. Azure CLI login, environment
-  variables, or managed identity).
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
index d65c3edc90..c45bbdf485 100644
--- a/src/Microsoft.Data.SqlClient.slnx
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -10,9 +10,6 @@
       <Platform Solution="*|x86" Project="x86" />
     </Project>
   </Folder>
-  <Folder Name="/doc/apps/">
-    <Project Path="../doc/apps/AzureAuthentication/AzureAuthentication.csproj" />
-  </Folder>
   <Folder Name="/doc/snippets/" />
   <Folder Name="/doc/snippets/Microsoft.Data.Sql/">
     <File Path="../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml" />
@@ -170,7 +167,6 @@
   <Folder Name="/src/Microsoft.Data.SqlClient/src/">
     <Project Path="Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
   </Folder>
-  <Folder Name="/src/Microsoft.Data.SqlClient/tests/" />
   <Folder Name="/src/Microsoft.SqlServer.Server/">
     <Project Path="Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj" />
   </Folder>
@@ -215,4 +211,6 @@
     <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
     <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
   </Folder>
+  <Project Path="../tools/PackageCompatibility/src/PackageCompatibility.csproj" />
+  <Project Path="../tools/PackageCompatibility/test/PackageCompatibility.Test.csproj" />
 </Solution>
diff --git a/doc/apps/AzureAuthentication/Directory.Build.props b/tools/PackageCompatibility/Directory.Build.props
similarity index 100%
rename from doc/apps/AzureAuthentication/Directory.Build.props
rename to tools/PackageCompatibility/Directory.Build.props
diff --git a/tools/PackageCompatibility/Directory.Packages.props b/tools/PackageCompatibility/Directory.Packages.props
new file mode 100644
index 0000000000..161a606355
--- /dev/null
+++ b/tools/PackageCompatibility/Directory.Packages.props
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- We purposely do not include any parent Directory.Packages.props files. -->
+
+  <PropertyGroup>
+    <!-- Use the following package versions if not supplied. -->
+    <AbstractionsVersion>1.0.0</AbstractionsVersion>
+    <AkvProviderVersion>7.0.0</AkvProviderVersion>
+    <LoggingVersion>1.0.0</LoggingVersion>
+    <SqlClientVersion>7.0.1</SqlClientVersion>
+    <SqlServerVersion>1.0.0</SqlServerVersion>
+
+    <!-- We omit referencing the Azure package entirely by default. -->
+  </PropertyGroup>
+
+  <!-- SqlClient Packages -->
+  <ItemGroup>
+    <!--
+      Normal apps wouldn't explicitly reference these 2 packages, but we do here to force the
+      desired versions.  This helps detect version conflicts.
+    -->
+    <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Abstractions" Version="$(AbstractionsVersion)" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.Internal.Logging" Version="$(LoggingVersion)" />
+
+    <!-- These are normal references for apps. -->
+    <PackageVersion Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" Version="$(AkvProviderVersion)" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="$(SqlClientVersion)" />
+    <PackageVersion Include="Microsoft.SqlServer.Server" Version="$(SqlServerVersion)" />
+
+    <!-- Declare a version for the Azure package if one was specified. -->
+    <PackageVersion
+      Include="Microsoft.Data.SqlClient.Extensions.Azure"
+      Version="$(AzureVersion)"
+      Condition="'$(AzureVersion)' != ''" />
+  </ItemGroup>
+
+  <!-- Other Packages -->
+  <ItemGroup>
+    <PackageVersion Include="System.CommandLine" Version="2.0.6" />
+    <PackageVersion Include="xunit.v3" Version="4.0.0-pre.81" />
+  </ItemGroup>
+
+</Project>
diff --git a/doc/apps/AzureAuthentication/NuGet.config b/tools/PackageCompatibility/NuGet.config
similarity index 100%
rename from doc/apps/AzureAuthentication/NuGet.config
rename to tools/PackageCompatibility/NuGet.config
diff --git a/tools/PackageCompatibility/README.md b/tools/PackageCompatibility/README.md
new file mode 100644
index 0000000000..a629156afc
--- /dev/null
+++ b/tools/PackageCompatibility/README.md
@@ -0,0 +1,266 @@
+# PackageCompatibility Tool
+
+A minimal console application that verifies that a set of SqlClient packages can coexist without
+transitive dependency conflicts, API surface mismatches, or broken runtime functionality.  It forces
+the AKV provider type to load (pulling in that assembly and its transitive dependencies) and then
+opens a `SqlConnection` to confirm that the resolved package graph works end-to-end against a real
+SQL Server instance.
+
+The following SqlClient packages are verified, either directly or transitively:
+
+- `Microsoft.Data.SqlClient`
+- `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
+- `Microsoft.Data.SqlClient.Internal.Logging`
+- `Microsoft.Data.SqlClient.Extensions.Abstractions`
+- `Microsoft.Data.SqlClient.Extensions.Azure` *(optional — included when `AzureVersion` is set)*
+- `Microsoft.SqlServer.Server`
+
+## Purpose
+
+This tool is a smoke test for inter-package compatibility across the SqlClient suite.  It catches
+problems such as:
+
+- Assembly binding conflicts caused by mismatched transitive dependencies.
+- API surface mismatches between independently-versioned packages.
+- Runtime failures that only appear when multiple packages are loaded together.
+
+Specifically, it:
+
+1. Instantiates `SqlColumnEncryptionAzureKeyVaultProvider` to force the AKV provider assembly and
+   all its transitive dependencies to load alongside SqlClient.
+2. Opens a `SqlConnection` using a connection string you provide, exercising the authentication
+   and network code paths end-to-end.
+
+The app is designed to run against both **published NuGet packages** and **locally-built packages**
+(via the `packages/` directory configured in `NuGet.config`).
+
+## How This Differs From the Existing Test Suite
+
+The SqlClient repository has a large suite of unit, functional, and manual tests.  This tool
+complements — but does not replace — those tests.  The key differences are:
+
+### Heterogeneous package versions
+
+The test projects reference sibling packages via project references or a shared `Directory.Packages.
+props` file.  Every test run uses a **single, uniform version set** derived from whatever is
+currently checked out.  You cannot ask the test suite to run `SqlClient 7.0.1` against
+`AkvProvider 7.1.0-preview1` without editing project files.
+
+This tool accepts any combination of independent version numbers — including versions that have not
+been published yet — at the command line:
+
+```bash
+dotnet run \
+  -p:SqlClientVersion=7.0.1 \
+  -p:AkvProviderVersion=7.1.0-preview1 \
+  -- -c "<connection string>"
+```
+
+This makes it straightforward to answer questions like *"does the new AKV provider build work
+against the last published SqlClient release?"* without modifying any source files.
+
+### Pre-release and locally-built packages
+
+Because NuGet resolves packages from the `packages/` local feed before falling back to NuGet.org,
+you can drop pre-release `.nupkg` files in that folder and reference them immediately — even before
+they have been published.  The existing tests have no equivalent mechanism; they can only reference
+packages that are either checked out as source or already published to a configured feed.
+
+### End-to-end runtime coverage across the full package graph
+
+The test suite exercises individual classes and APIs in isolation.  Functional and manual tests do
+open real connections, but they always run against the packages as built from source in the current
+branch.
+
+This tool loads every package in the dependency graph simultaneously in a single process and then
+opens a live `SqlConnection`.  This catches a class of failures that isolated tests miss:
+
+- **Binding redirect conflicts**: two packages pulling in incompatible versions of a shared
+  dependency (`Azure.Core`, `Microsoft.Identity.*`, etc.) that only manifest when all packages are
+  present in the same AppDomain.
+- **Transitive version mismatches**: a package expecting an internal API surface that has changed in
+  a sibling package across a version boundary.
+- **Registration side-effects**: authentication providers or other singleton registrations that
+  interfere when packages are composed in an unexpected order or version combination.
+
+### Diagnostic console output
+
+When a connection fails, the tool can emit structured TDS-level and authentication trace output via
+the `--log` and `--trace` flags.  This output is written directly to the console and requires no
+test harness or log configuration — useful for quickly diagnosing authentication failures in CI
+environments or on developer machines where full test infrastructure is unavailable.
+
+The test suite's diagnostics are routed through `EventSource`/`DiagnosticListener` and are only
+visible if a listener is attached (e.g. via `dotnet-trace` or a custom test initializer).
+
+### What this tool does NOT do
+
+- It does not assert on individual API behaviours, query results, or error messages.  For that, use
+  the existing unit and functional tests.
+- It cannot run without a real SQL Server instance.  The manual test suite has the same constraint
+  for connectivity tests, but unit and functional tests run without a server.
+- It does not cover every authentication mode automatically.  You must provide a suitable connection
+  string for each mode you want to validate.
+
+## Project Layout
+
+- `src/` contains the tool source files and project file.
+- `test/` is reserved for tests.
+
+## Authentication Modes
+
+The authentication mode embedded in the connection string controls which code paths and packages are
+exercised during the connectivity test.  Use different modes to broaden coverage:
+
+| Authentication mode | `Authentication=` value | Packages exercised |
+| --- | --- | --- |
+| SQL Server auth | *(omit or `SqlPassword`)* | `Microsoft.Data.SqlClient` only |
+| Entra ID — integrated | `ActiveDirectoryIntegrated` | `Microsoft.Data.SqlClient` + `Extensions.Azure` (requires `AzureVersion`) |
+| Entra ID — default chain | `ActiveDirectoryDefault` | `Microsoft.Data.SqlClient` + `Extensions.Azure` (requires `AzureVersion`) |
+| Entra ID — password | `ActiveDirectoryPassword` | `Microsoft.Data.SqlClient` + `Extensions.Azure` (requires `AzureVersion`) |
+| Entra ID — interactive | `ActiveDirectoryInteractive` | `Microsoft.Data.SqlClient` + `Extensions.Azure` (requires `AzureVersion`) |
+| Entra ID — service principal | `ActiveDirectoryServicePrincipal` | `Microsoft.Data.SqlClient` + `Extensions.Azure` (requires `AzureVersion`) |
+| Entra ID — managed identity | `ActiveDirectoryManagedIdentity` | `Microsoft.Data.SqlClient` + `Extensions.Azure` (requires `AzureVersion`) |
+
+> **Note:** All Entra ID modes require the `Extensions.Azure` package to be referenced (pass
+> `-p:AzureVersion=<version>`).  Without it, SqlClient will throw at runtime because no
+> authentication provider is registered for those modes.
+
+## Build Parameters
+
+Package versions are controlled through build properties. Pass them on the command line with `-p:`
+(or `/p:`) to override the defaults defined in `Directory.Packages.props`.
+
+| Property | Default | Description |
+| --- | --- | --- |
+| `AbstractionsVersion` | `1.0.0` | Version of `Microsoft.Data.SqlClient.Extensions.Abstractions` to reference. |
+| `AkvProviderVersion` | `7.0.0` | Version of `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` to reference. |
+| `AzureVersion` | None | Version of `Microsoft.Data.SqlClient.Extensions.Azure` to reference.  When omitted, the `Azure` package will not be referenced. |
+| `LoggingVersion` | `1.0.0` | Version of `Microsoft.Data.SqlClient.Internal.Logging` to reference. |
+| `SqlClientVersion` | `7.0.1` | Version of `Microsoft.Data.SqlClient` to reference. |
+| `SqlServerVersion` | `1.0.0` | Version of `Microsoft.SqlServer.Server` to reference. |
+
+## Local Package Source
+
+The `NuGet.config` adds a `packages/` directory as a local package source. To test against packages
+that haven't been published to NuGet yet, copy the `.nupkg` files into this folder and specify the
+matching version via the build properties above.
+
+NuGet will cache copies of the packages it finds in `packages/` after a successful restore.  If you
+update the `.nupkg` files in `packages/` without incrementing their version numbers (and referencing
+those new version numbers) you will have to clear the NuGet caches in order for the next restore
+operation to pick them up:
+
+```bash
+dotnet nuget locals all --clear
+```
+
+## Running the App
+
+The app has built-in help:
+
+```bash
+dotnet run -- --help
+
+Description:
+  Package Compatibility Tester
+  ----------------------------
+
+  Validates SqlClient connectivity using EntraID (formerly Azure Active Directory) authentication.
+  Connects to SQL Server using the supplied connection string, which must specify the authentication method.
+
+  ...
+```
+
+The app requires a connection string.  Use SQL authentication for a basic connectivity check:
+
+```bash
+dotnet run -- -c "Server=myserver;Database=mydb;User ID=sa;Password=<pw>;Encrypt=Mandatory;TrustServerCertificate=true"
+```
+
+To exercise Entra ID flows, include an `Authentication` keyword and reference the `Extensions.Azure`
+package:
+
+```bash
+dotnet run -p:AzureVersion=1.0.0 -- -c "Server=myserver.database.windows.net;Database=mydb;Authentication=ActiveDirectoryDefault"
+```
+
+On success the app emits to standard out:
+
+```bash
+Package Compatibility Tester
+----------------------------
+
+Packages used:
+  Abstractions:  1.0.1
+  AKV Provider:  7.0.0
+  Azure:         1.1.0-preview1
+  Logging:       1.0.1
+  SqlClient:     7.1.0.preview1
+  SqlServer:     1.0.0
+
+Connection details:
+  Data Source:      adotest.database.windows.net
+  Initial Catalog:  Northwind
+  Authentication:   ActiveDirectoryPassword
+
+Testing connectivity...
+Connected successfully!
+    Server version: 12.00.1017
+```
+
+Errors will be emitted to standard error:
+
+```bash
+Testing connectivity...
+Connection failed:
+  Cannot find an authentication provider for 'ActiveDirectoryPassword'.
+```
+
+### Examples
+
+Run a basic SQL authentication check using the default package versions:
+
+```bash
+dotnet run -- -c "Server=myserver;Database=mydb;User ID=sa;Password=<pw>;Encrypt=Mandatory;TrustServerCertificate=true"
+```
+
+Run with no `Azure` package — Entra ID modes will fail at runtime if specified in the connection
+string, which is itself useful for confirming the error path:
+
+```bash
+dotnet run -- -c "<connection string>"
+```
+
+Include the `Azure` package to enable Entra ID authentication flows:
+
+```bash
+dotnet run -p:AzureVersion=1.0.0-preview1 -- -c "<connection string>"
+```
+
+Run against locally-built packages (drop `.nupkg` files into `packages/` first):
+
+```bash
+dotnet run -p:SqlClientVersion=7.1.0-preview1 -- -c "<connection string>"
+```
+
+Override all five package versions at once:
+
+```bash
+dotnet run \
+  -p:AbstractionsVersion=1.0.1 \
+  -p:AkvProviderVersion=7.1.0-preview1 \
+  -p:AzureVersion=1.0.0 \
+  -p:LoggingVersion=1.0.1 \
+  -p:SqlClientVersion=7.1.0-preview1 \
+  -p:SqlServerVersion=1.0.0 \
+  -- -c "<connection string>"
+```
+
+## Prerequisites
+
+- [.NET 10.0 SDK](https://dotnet.microsoft.com/download) and .NET Framework 4.8.1 or later.
+- A SQL Server or Azure SQL instance reachable from the machine running the tool.
+- For Entra ID authentication modes: Azure credentials available to `DefaultAzureCredential`
+  (e.g. Azure CLI login, environment variables, or managed identity), and the `AzureVersion`
+  build property set so the `Extensions.Azure` package is included.
diff --git a/tools/PackageCompatibility/global.json b/tools/PackageCompatibility/global.json
new file mode 100644
index 0000000000..7c7fca5caa
--- /dev/null
+++ b/tools/PackageCompatibility/global.json
@@ -0,0 +1,15 @@
+{
+  "test": {
+    // xUnit v3 runs on Microsoft.Testing.Platform rather than the older VSTest runner.
+    // On .NET 10, dotnet test must therefore be opted into MTP mode for this test project.
+    "runner": "Microsoft.Testing.Platform"
+  },
+  "sdk": {
+    // global.json lookup stops at the nearest file and does not merge with the repo-root file.
+    // This subtree therefore needs to repeat the root SDK settings so commands run from
+    // tools/PackageCompatibility keep using the same pinned SDK behavior.
+    "version": "10.0.300",
+    "rollForward": "disable",
+    "allowPrerelease": false
+  }
+}
diff --git a/doc/apps/AzureAuthentication/packages/.gitkeep b/tools/PackageCompatibility/packages/.gitkeep
similarity index 100%
rename from doc/apps/AzureAuthentication/packages/.gitkeep
rename to tools/PackageCompatibility/packages/.gitkeep
diff --git a/doc/apps/AzureAuthentication/App.cs b/tools/PackageCompatibility/src/App.cs
similarity index 92%
rename from doc/apps/AzureAuthentication/App.cs
rename to tools/PackageCompatibility/src/App.cs
index 3447e5489f..2864ad0158 100644
--- a/doc/apps/AzureAuthentication/App.cs
+++ b/tools/PackageCompatibility/src/App.cs
@@ -3,7 +3,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider;
 
-namespace Microsoft.Data.SqlClient.Samples.AzureAuthentication;
+namespace Microsoft.Data.SqlClient.Tools.PackageCompatibility;
 
 /// <summary>
 /// Console application that validates SqlClient connectivity using Entra ID (formerly Azure Active
@@ -63,9 +63,12 @@ internal int Run(RunOptions options)
             ---------------------------
 
             Packages used:
-              SqlClient:     {PackageVersions.MicrosoftDataSqlClient}
+              Abstractions:  {PackageVersions.MicrosoftDataSqlClientExtensionsAbstractions}
               AKV Provider:  {PackageVersions.MicrosoftDataSqlClientAlwaysEncryptedAzureKeyVaultProvider}
-              Azure:         {PackageVersions.AzureExtensionsVersion}
+              Azure:         {PackageVersions.MicrosoftDataSqlClientExtensionsAzureVersion}
+              Logging:       {PackageVersions.MicrosoftDataSqlClientInternalLogging}
+              SqlClient:     {PackageVersions.MicrosoftDataSqlClient}
+              SqlServer:     {PackageVersions.MicrosoftSqlServerServer}
 
             """);
 
@@ -192,7 +195,7 @@ internal static void Err(string message)
     /// <summary>
     /// The display name of the application.
     /// </summary>
-    internal const string AppName = "Azure Authentication Tester";
+    internal const string AppName = "Package Compatibility Tester";
 
     /// <summary>
     /// The optional event listener used to capture SqlClient diagnostic events.
diff --git a/doc/apps/AzureAuthentication/EntryPoint.cs b/tools/PackageCompatibility/src/EntryPoint.cs
similarity index 84%
rename from doc/apps/AzureAuthentication/EntryPoint.cs
rename to tools/PackageCompatibility/src/EntryPoint.cs
index 20885ae1af..8729352024 100644
--- a/doc/apps/AzureAuthentication/EntryPoint.cs
+++ b/tools/PackageCompatibility/src/EntryPoint.cs
@@ -1,6 +1,6 @@
 using System.CommandLine;
 
-namespace Microsoft.Data.SqlClient.Samples.AzureAuthentication;
+namespace Microsoft.Data.SqlClient.Tools.PackageCompatibility;
 
 /// <summary>
 /// Contains the application entry point responsible for parsing command-line arguments and
@@ -50,14 +50,20 @@ which must specify the authentication method.
             Supply specific package versions when building to test different versions of the
             SqlClient suite, for example:
 
-              -p:SqlClientVersion=7.0.0-preview4
+              -p:AbstractionsVersion=1.0.1
               -p:AkvProviderVersion=7.0.1-preview2
               -p:AzureVersion=1.0.0-preview1
+              -p:LoggingVersion=1.0.2
+              -p:SqlClientVersion=7.0.0-preview4
+              -p:SqlServerVersion=1.0.0
 
             Current package versions:
+              Logging:       {PackageVersions.MicrosoftDataSqlClientInternalLogging}
+              Abstractions:  {PackageVersions.MicrosoftDataSqlClientExtensionsAbstractions}
               SqlClient:     {PackageVersions.MicrosoftDataSqlClient}
+              SqlServer:     {PackageVersions.MicrosoftSqlServerServer}
               AKV Provider:  {PackageVersions.MicrosoftDataSqlClientAlwaysEncryptedAzureKeyVaultProvider}
-              Azure:         {PackageVersions.AzureExtensionsVersion}
+              Azure:         {PackageVersions.MicrosoftDataSqlClientExtensionsAzureVersion}
             """)
         {
             connectionStringOption,
diff --git a/doc/apps/AzureAuthentication/GeneratePackageVersions.targets b/tools/PackageCompatibility/src/GeneratePackageVersions.targets
similarity index 100%
rename from doc/apps/AzureAuthentication/GeneratePackageVersions.targets
rename to tools/PackageCompatibility/src/GeneratePackageVersions.targets
diff --git a/doc/apps/AzureAuthentication/AzureAuthentication.csproj b/tools/PackageCompatibility/src/PackageCompatibility.csproj
similarity index 73%
rename from doc/apps/AzureAuthentication/AzureAuthentication.csproj
rename to tools/PackageCompatibility/src/PackageCompatibility.csproj
index 8b7c6f5ee9..d33eff8e52 100644
--- a/doc/apps/AzureAuthentication/AzureAuthentication.csproj
+++ b/tools/PackageCompatibility/src/PackageCompatibility.csproj
@@ -2,8 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+
     <TargetFrameworks>net481;net10.0</TargetFrameworks>
-    <RootNamespace>Microsoft.Data.SqlClient.Samples.AzureAuthentication</RootNamespace>
+
+    <RootNamespace>Microsoft.Data.SqlClient.Tools.PackageCompatibility</RootNamespace>
+
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
@@ -12,11 +15,10 @@
   <!-- SqlClient Packages -->
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.SqlClient" />
-    <!--
-      We include the AKV Provider to ensure there are no transitive dependency conflicts.  It is
-      instantiated to ensure its assembly isn't elided, but we don't actually use it.
-    -->
     <PackageReference Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" />
+    <PackageReference Include="Microsoft.SqlServer.Server" />
 
     <!-- Include the Azure package if a version for it was specified. -->
     <PackageReference
@@ -39,6 +41,12 @@
     <PackageReference Include="System.CommandLine" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>PackageCompatibility.Test</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
   <!-- Generate code with the SqlClient package versions. -->
   <Import Project="GeneratePackageVersions.targets" />
 
diff --git a/doc/apps/AzureAuthentication/PackageVersions.Partial.cs b/tools/PackageCompatibility/src/PackageVersions.Partial.cs
similarity index 85%
rename from doc/apps/AzureAuthentication/PackageVersions.Partial.cs
rename to tools/PackageCompatibility/src/PackageVersions.Partial.cs
index 3c88781daa..0e34418e85 100644
--- a/doc/apps/AzureAuthentication/PackageVersions.Partial.cs
+++ b/tools/PackageCompatibility/src/PackageVersions.Partial.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.Data.SqlClient.Samples.AzureAuthentication;
+namespace Microsoft.Data.SqlClient.Tools.PackageCompatibility;
 
 /// <summary>
 /// Hand-written companion to the auto-generated <c>PackageVersions.g.cs</c> file
@@ -14,7 +14,7 @@ internal static partial class PackageVersions
     /// <summary>
     /// Version of the Azure extensions package, or "N/A" when not referenced.
     /// </summary>
-    public const string AzureExtensionsVersion =
+    public const string MicrosoftDataSqlClientExtensionsAzureVersion =
         #if AZURE_EXTENSIONS
             MicrosoftDataSqlClientExtensionsAzure;
         #else
diff --git a/doc/apps/AzureAuthentication/SqlClientEventListener.cs b/tools/PackageCompatibility/src/SqlClientEventListener.cs
similarity index 97%
rename from doc/apps/AzureAuthentication/SqlClientEventListener.cs
rename to tools/PackageCompatibility/src/SqlClientEventListener.cs
index 5e861f4796..686a4f2c9a 100644
--- a/doc/apps/AzureAuthentication/SqlClientEventListener.cs
+++ b/tools/PackageCompatibility/src/SqlClientEventListener.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.Tracing;
 
-namespace Microsoft.Data.SqlClient.Samples.AzureAuthentication;
+namespace Microsoft.Data.SqlClient.Tools.PackageCompatibility;
 
 /// <summary>
 /// Listens for events from <c>Microsoft.Data.SqlClient.EventSource</c> and emits them via the
diff --git a/tools/PackageCompatibility/test/AppTests.cs b/tools/PackageCompatibility/test/AppTests.cs
new file mode 100644
index 0000000000..3a80de1eaf
--- /dev/null
+++ b/tools/PackageCompatibility/test/AppTests.cs
@@ -0,0 +1,126 @@
+using System;
+using System.IO;
+
+using Microsoft.Data.SqlClient.Tools.PackageCompatibility;
+
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.Tools.PackageCompatibility.Tests;
+
+/// <summary>
+/// Verifies <see cref="App.Run(App.RunOptions)"/> control flow and diagnostics for common failure
+/// and instrumentation paths without requiring a live SQL Server.
+/// </summary>
+[Collection(ConsoleCollection.Name)]
+public class AppTests
+{
+    /// <summary>
+    /// Ensures malformed connection strings produce a parse error and a non-zero exit code in
+    /// non-verbose mode, without leaking full exception details.
+    /// </summary>
+    [Fact]
+    public void AppRunWithMalformedConnectionStringReturnsOneAndWritesParseError()
+    {
+        // Use an intentionally invalid connection string to force parse failure branch.
+        CommandResult result = ExecuteApp(
+            connectionString: "Server",
+            verbose: false);
+
+        // Non-verbose mode should report a friendly error without full exception type details.
+        Assert.Equal(1, result.ExitCode);
+        Assert.Contains("Failed to parse connection string:", result.StandardError, StringComparison.Ordinal);
+        Assert.DoesNotContain("System.", result.StandardError, StringComparison.Ordinal);
+    }
+
+    /// <summary>
+    /// Ensures malformed connection strings produce detailed exception output when verbose mode is
+    /// enabled.
+    /// </summary>
+    [Fact]
+    public void AppRunWithMalformedConnectionStringAndVerboseIncludesExceptionDetails()
+    {
+        // Same malformed input, but verbose mode should include full exception diagnostics.
+        CommandResult result = ExecuteApp(
+            connectionString: "Server",
+            verbose: true);
+
+        // Verbose mode intentionally includes type/stack-friendly exception text.
+        Assert.Equal(1, result.ExitCode);
+        Assert.Contains("Failed to parse connection string:", result.StandardError, StringComparison.Ordinal);
+        Assert.Contains("System.", result.StandardError, StringComparison.Ordinal);
+    }
+
+    /// <summary>
+    /// Ensures enabling event logging emits the expected logging banner before the eventual
+    /// connection failure for an unreachable endpoint.
+    /// </summary>
+    [Fact]
+    public void AppRunWithLogEventsEmitsLoggingMessageBeforeConnectionFailure()
+    {
+        // Use an unreachable endpoint to keep this deterministic while exercising log-events path.
+        CommandResult result = ExecuteApp(
+            connectionString: "Server=127.0.0.1,1;Database=master;User ID=sa;Password=invalid;Connect Timeout=1;Encrypt=False",
+            logEvents: true,
+            verbose: false);
+
+        // App should announce event logging before eventually failing the connection attempt.
+        Assert.Equal(1, result.ExitCode);
+        Assert.Contains("SqlClient event logging enabled; events will be prefixed with [EVENT]", result.StandardOutput, StringComparison.Ordinal);
+        Assert.Contains("Connection failed:", result.StandardError, StringComparison.Ordinal);
+    }
+
+    /// <summary>
+    /// Executes <see cref="App.Run(App.RunOptions)"/> with redirected console streams and returns
+    /// captured output and exit code for assertions.
+    /// </summary>
+    /// <param name="connectionString">Connection string supplied to <see cref="App.RunOptions.ConnectionString"/>.</param>
+    /// <param name="logEvents">Whether to enable event listener wiring during the run.</param>
+    /// <param name="trace">Whether to enable trace-attach pause behavior.</param>
+    /// <param name="verbose">Whether to emit verbose diagnostic details.</param>
+    /// <returns>Captured stdout, stderr, and process-equivalent exit code.</returns>
+    private static CommandResult ExecuteApp(string connectionString, bool logEvents = false, bool trace = false, bool verbose = false)
+    {
+        // Redirect process-wide console streams so assertions can inspect output.
+        TextWriter originalOut = Console.Out;
+        TextWriter originalError = Console.Error;
+        using StringWriter standardOutput = new();
+        using StringWriter standardError = new();
+
+        // Construct the same internal options object EntryPoint passes to App.Run.
+        using App app = new();
+        App.RunOptions runOptions = new()
+        {
+            ConnectionString = connectionString,
+            LogEvents = logEvents,
+            Trace = trace,
+            Verbose = verbose
+        };
+
+        try
+        {
+            Console.SetOut(standardOutput);
+            Console.SetError(standardError);
+
+            // Act: execute one App.Run invocation for the provided scenario.
+            int exitCode = app.Run(runOptions);
+
+            // Capture both streams because App writes info and errors separately.
+            return new CommandResult(exitCode, standardOutput.ToString(), standardError.ToString());
+        }
+        finally
+        {
+            // Restore global console streams to prevent cross-test interference.
+            Console.SetOut(originalOut);
+            Console.SetError(originalError);
+        }
+    }
+
+    /// <summary>
+    /// Represents the observed result of a single in-process <see cref="App.Run(App.RunOptions)"/>
+    /// invocation.
+    /// </summary>
+    /// <param name="ExitCode">Return code from <see cref="App.Run(App.RunOptions)"/>.</param>
+    /// <param name="StandardOutput">Captured standard output stream contents.</param>
+    /// <param name="StandardError">Captured standard error stream contents.</param>
+    private sealed record CommandResult(int ExitCode, string StandardOutput, string StandardError);
+}
diff --git a/tools/PackageCompatibility/test/BuildVersionOverrideTests.cs b/tools/PackageCompatibility/test/BuildVersionOverrideTests.cs
new file mode 100644
index 0000000000..493e1d1209
--- /dev/null
+++ b/tools/PackageCompatibility/test/BuildVersionOverrideTests.cs
@@ -0,0 +1,408 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.Tools.PackageCompatibility.Tests;
+
+/// <summary>
+/// Build-focused tests that verify MSBuild property overrides (for package versions) are reflected
+/// in generated package-version constants.
+/// </summary>
+public class BuildVersionOverrideTests
+{
+    /// <summary>
+    /// Ensures building with explicit <c>-p:</c> overrides produces matching version constants in
+    /// the generated <c>PackageVersions.g.cs</c> file.
+    /// </summary>
+    /// <param name="buildProperties">MSBuild properties to override during build.</param>
+    /// <param name="expectedVersions">Expected package label-to-version mappings.</param>
+    [Theory]
+    [MemberData(nameof(GetVersionPropertyTestCases))]
+    public void BuildGeneratesExpectedPackageVersionsWhenCustomPropertiesAreSupplied(
+        Dictionary<string, string> buildProperties,
+        Dictionary<string, string> expectedVersions)
+    {
+        // Build in an isolated copy so per-test overrides cannot leak into repo obj/bin state.
+        BuildArtifacts artifacts = BuildAppWithProperties(buildProperties);
+
+        try
+        {
+            // The generated source file is the authoritative output of GeneratePackageVersions.targets.
+            string generatedVersions = File.ReadAllText(artifacts.GeneratedVersionsFile);
+
+            // Assert each expected package label maps to the generated constant/version pair.
+            foreach (var kvp in expectedVersions)
+            {
+                string constantName = GetPackageVersionsConstantName(kvp.Key);
+                string expected = $"public const string {constantName} = \"{kvp.Value}\";";
+                Assert.Contains(expected, generatedVersions, StringComparison.Ordinal);
+            }
+        }
+        finally
+        {
+            if (!ShouldPreserveTempBuildDirectories())
+            {
+                TryDeleteDirectory(artifacts.ProjectDirectory);
+                TryDeleteDirectory(artifacts.OutputDirectory);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Provides test vectors for single, partial, and full package-version override scenarios.
+    /// </summary>
+    /// <returns>
+    /// Theory data containing MSBuild override properties and expected generated version values.
+    /// </returns>
+    public static IEnumerable<object[]> GetVersionPropertyTestCases()
+    {
+        // Override only SqlClient to prove a single-property override flows to generated code.
+        yield return new object[]
+        {
+            new Dictionary<string, string> { { "SqlClientVersion", "7.0.0" } },
+            new Dictionary<string, string>
+            {
+                { "SqlClient", "7.0.0" },
+                { "Abstractions", "1.0.0" },
+                { "Logging", "1.0.0" },
+                { "SqlServer", "1.0.0" }
+            }
+        };
+
+        // Override a subset of properties to verify mixed default/override behavior.
+        yield return new object[]
+        {
+            new Dictionary<string, string>
+            {
+                { "SqlClientVersion", "7.0.0" },
+                { "LoggingVersion", "1.0.0" },
+                { "AbstractionsVersion", "1.0.0" }
+            },
+            new Dictionary<string, string>
+            {
+                { "SqlClient", "7.0.0" },
+                { "Logging", "1.0.0" },
+                { "Abstractions", "1.0.0" },
+                { "AKV Provider", "7.0.0" }
+            }
+        };
+
+        // Override all supported package properties to validate full replacement behavior.
+        yield return new object[]
+        {
+            new Dictionary<string, string>
+            {
+                { "AbstractionsVersion", "1.0.0" },
+                { "AkvProviderVersion", "7.0.0" },
+                { "LoggingVersion", "1.0.0" },
+                { "SqlClientVersion", "7.0.0" },
+                { "SqlServerVersion", "1.0.0" }
+            },
+            new Dictionary<string, string>
+            {
+                { "Abstractions", "1.0.0" },
+                { "AKV Provider", "7.0.0" },
+                { "Logging", "1.0.0" },
+                { "SqlClient", "7.0.0" },
+                { "SqlServer", "1.0.0" }
+            }
+        };
+    }
+
+    /// <summary>
+    /// Builds an isolated copy of the PackageCompatibility project with optional version override
+    /// properties and returns paths to relevant build artifacts.
+    /// </summary>
+    /// <param name="properties">MSBuild properties passed via <c>-p:</c> arguments.</param>
+    /// <returns>Paths to the isolated workspace, output folder, and generated versions file.</returns>
+    private static bool ShouldPreserveTempBuildDirectories()
+    {
+        string? preserve = Environment.GetEnvironmentVariable("PACKAGECOMPATIBILITY_PRESERVE_TEMP");
+        return string.Equals(preserve, "1", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(preserve, "true", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static void TryDeleteDirectory(string path)
+    {
+        if (string.IsNullOrEmpty(path) || !Directory.Exists(path))
+        {
+            return;
+        }
+
+        try
+        {
+            Directory.Delete(path, recursive: true);
+        }
+        catch (IOException)
+        {
+        }
+        catch (UnauthorizedAccessException)
+        {
+        }
+    }
+
+    private static BuildArtifacts BuildAppWithProperties(Dictionary<string, string> properties)
+    {
+        // Locate and clone the package-compatibility subtree so test builds are hermetic.
+        string packageCompatibilityDir = GetPackageCompatibilityDirectory();
+        string tempProjectDir = Path.Combine(Path.GetTempPath(), $"PackageCompatibilityProject_{Guid.NewGuid():N}");
+        string tempOutputDir = Path.Combine(Path.GetTempPath(), $"PackageCompatibility_{Guid.NewGuid():N}");
+
+        CopyDirectory(packageCompatibilityDir, tempProjectDir);
+
+        // Create an empty packages/ directory so NuGet.config source path remains valid.
+        Directory.CreateDirectory(Path.Combine(tempProjectDir, "packages"));
+        Directory.CreateDirectory(tempOutputDir);
+
+        string copiedProjectFile = Path.Combine(tempProjectDir, "src", "PackageCompatibility.csproj");
+        string generatedVersionsFile = Path.Combine(tempProjectDir, "src", "obj", "Release", "net10.0", "PackageVersions.g.cs");
+
+        // Build with explicit property overrides; MSBuild treats these as highest-priority values.
+        var buildArgs = new List<string>
+        {
+            "build",
+            copiedProjectFile,
+            "-c", "Release",
+            "-f", "net10.0",
+            "-o", tempOutputDir
+        };
+
+        // Add requested test case overrides as -p:<Name>=<Value> arguments.
+        foreach (var kvp in properties)
+        {
+            buildArgs.Add($"-p:{kvp.Key}={kvp.Value}");
+        }
+
+        var psi = new ProcessStartInfo
+        {
+            FileName = "dotnet",
+            UseShellExecute = false,
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+            CreateNoWindow = true
+        };
+
+#if NET
+        foreach (string buildArg in buildArgs)
+        {
+            psi.ArgumentList.Add(buildArg);
+        }
+#else
+        psi.Arguments = string.Join(" ", buildArgs.Select(QuoteArgument));
+#endif
+
+        using (var process = Process.Start(psi))
+        {
+            if (process == null)
+            {
+                throw new InvalidOperationException("Failed to start build process");
+            }
+
+            string stdout = string.Empty;
+            string stderr = string.Empty;
+
+#if NET
+            bool completed = process.WaitForExit(TimeSpan.FromSeconds(60));
+            if (!completed)
+            {
+                process.Kill();
+                throw new InvalidOperationException("Build timed out after 60 seconds");
+            }
+
+            stdout = process.StandardOutput.ReadToEnd();
+            stderr = process.StandardError.ReadToEnd();
+#else
+            Task<string> stdoutTask = process.StandardOutput.ReadToEndAsync();
+            Task<string> stderrTask = process.StandardError.ReadToEndAsync();
+            bool completed = process.WaitForExit(60000);
+            stdout = stdoutTask.GetAwaiter().GetResult();
+            stderr = stderrTask.GetAwaiter().GetResult();
+            if (!completed)
+            {
+                process.Kill();
+                throw new InvalidOperationException("Build timed out after 60 seconds");
+            }
+#endif
+
+            // Fail fast with full command/stdout/stderr context for easy diagnosis.
+            if (process.ExitCode != 0)
+            {
+                throw new InvalidOperationException(
+                    $"Build failed with exit code {process.ExitCode}.\n" +
+                    $"Command: dotnet {string.Join(" ", buildArgs)}\n" +
+                    $"Output:\n{stdout}\n" +
+                    $"Errors:\n{stderr}");
+            }
+        }
+
+        // Validate that the generator actually produced its output file.
+        Assert.True(File.Exists(generatedVersionsFile), $"Generated versions file not found at {generatedVersionsFile}");
+
+        return new BuildArtifacts(tempProjectDir, tempOutputDir, generatedVersionsFile);
+    }
+
+    /// <summary>
+    /// Maps human-readable package labels used in test vectors to generated constant names in
+    /// <c>PackageVersions.g.cs</c>.
+    /// </summary>
+    /// <param name="packageLabel">Package label used by test case data.</param>
+    /// <returns>Generated constant name expected in <c>PackageVersions.g.cs</c>.</returns>
+    private static string GetPackageVersionsConstantName(string packageLabel)
+    {
+        // Keep human-readable labels in test cases while asserting exact generated symbol names.
+        return packageLabel switch
+        {
+            "Abstractions" => "MicrosoftDataSqlClientExtensionsAbstractions",
+            "AKV Provider" => "MicrosoftDataSqlClientAlwaysEncryptedAzureKeyVaultProvider",
+            "Logging" => "MicrosoftDataSqlClientInternalLogging",
+            "SqlClient" => "MicrosoftDataSqlClient",
+            "SqlServer" => "MicrosoftSqlServerServer",
+            _ => throw new InvalidOperationException($"Unsupported package label '{packageLabel}'.")
+        };
+    }
+
+    /// <summary>
+    /// Recursively copies the source tree into an isolated workspace, excluding generated artifacts
+    /// and test folders that can destabilize isolated build behavior.
+    /// </summary>
+    /// <param name="sourceDirectory">Source directory to copy.</param>
+    /// <param name="destinationDirectory">Destination directory for the isolated copy.</param>
+    private static void CopyDirectory(string sourceDirectory, string destinationDirectory)
+    {
+        // Copy source tree into temp workspace while excluding volatile build/test folders.
+        Directory.CreateDirectory(destinationDirectory);
+
+        foreach (string directory in Directory.GetDirectories(sourceDirectory, "*", SearchOption.AllDirectories))
+        {
+            string relativePath = GetRelativePath(sourceDirectory, directory);
+            if (ShouldSkip(relativePath))
+            {
+                continue;
+            }
+
+            Directory.CreateDirectory(Path.Combine(destinationDirectory, relativePath));
+        }
+
+        foreach (string file in Directory.GetFiles(sourceDirectory, "*", SearchOption.AllDirectories))
+        {
+            string relativePath = GetRelativePath(sourceDirectory, file);
+            if (ShouldSkip(relativePath))
+            {
+                continue;
+            }
+
+            string destinationFile = Path.Combine(destinationDirectory, relativePath);
+            Directory.CreateDirectory(Path.GetDirectoryName(destinationFile)!);
+            File.Copy(file, destinationFile, overwrite: true);
+        }
+    }
+
+    /// <summary>
+    /// Determines whether a relative path should be excluded from the isolated workspace copy.
+    /// </summary>
+    /// <param name="relativePath">Path relative to the copy source root.</param>
+    /// <returns><see langword="true"/> when the path should be skipped; otherwise <see langword="false"/>.</returns>
+    private static bool ShouldSkip(string relativePath)
+    {
+        // Ignore generated artifacts and the test project itself to avoid recursive/self-copy issues.
+        string normalizedPath = relativePath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+        string[] segments = normalizedPath.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries);
+
+        foreach (string segment in segments)
+        {
+            if (segment.Equals("bin", StringComparison.Ordinal)
+                || segment.Equals("obj", StringComparison.Ordinal)
+                || segment.Equals("packages", StringComparison.Ordinal)
+                || segment.Equals("test", StringComparison.Ordinal))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Resolves and validates the repository path for the PackageCompatibility subtree that contains
+    /// the source project and central package-management files.
+    /// </summary>
+    /// <returns>Absolute path to the PackageCompatibility subtree root.</returns>
+    private static string GetPackageCompatibilityDirectory()
+    {
+        // Resolve the PackageCompatibility folder relative to the running test assembly.
+        string testDir = Path.GetDirectoryName(typeof(BuildVersionOverrideTests).Assembly.Location)
+            ?? throw new InvalidOperationException("Cannot determine test assembly directory");
+
+        string packageCompatibilityDir = Path.Combine(testDir, "..", "..", "..", "..");
+
+        packageCompatibilityDir = Path.GetFullPath(packageCompatibilityDir);
+
+        if (!Directory.Exists(packageCompatibilityDir))
+        {
+            throw new InvalidOperationException(
+                $"PackageCompatibility directory not found at {packageCompatibilityDir}.\n" +
+                $"Test assembly location: {testDir}\n" +
+                $"Calculated package compat dir: {Path.GetFullPath(packageCompatibilityDir)}");
+        }
+
+        // Ensure the expected project file exists before attempting to build.
+        string csprojFile = Path.Combine(packageCompatibilityDir, "src", "PackageCompatibility.csproj");
+        if (!File.Exists(csprojFile))
+        {
+            throw new InvalidOperationException(
+                $"Project file not found at {csprojFile}.\n" +
+                $"Expected to find PackageCompatibility.csproj in {packageCompatibilityDir}/src");
+        }
+
+        return packageCompatibilityDir;
+    }
+
+    /// <summary>
+    /// Paths to the isolated build workspace and generated version artifacts for a single test run.
+    /// </summary>
+    /// <param name="ProjectDirectory">Root of the isolated copied project tree.</param>
+    /// <param name="OutputDirectory">Build output directory for binaries.</param>
+    /// <param name="GeneratedVersionsFile">Path to generated <c>PackageVersions.g.cs</c>.</param>
+    private sealed record BuildArtifacts(string ProjectDirectory, string OutputDirectory, string GeneratedVersionsFile);
+
+#if !NET
+    /// <summary>
+    /// Quotes a single command-line argument for use with <see cref="System.Diagnostics.ProcessStartInfo.Arguments"/>
+    /// on .NET Framework, where <c>ArgumentList</c> is unavailable.
+    /// Wraps the value in double-quotes and escapes any embedded double-quotes.
+    /// </summary>
+    /// <param name="arg">The argument to quote.</param>
+    /// <returns>The argument, quoted if it contains whitespace or double-quote characters.</returns>
+    private static string QuoteArgument(string arg)
+    {
+        if (arg.IndexOfAny(new[] { ' ', '\t', '"' }) < 0)
+        {
+            return arg;
+        }
+
+        return "\"" + arg.Replace("\\", "\\\\").Replace("\"", "\\\"") + "\"";
+    }
+#endif
+
+    /// <summary>
+    /// Returns the relative path from <paramref name="relativeTo"/> to <paramref name="path"/>.
+    /// Polyfills <see cref="Path.GetRelativePath"/> which is unavailable on .NET Framework.
+    /// </summary>
+    private static string GetRelativePath(string relativeTo, string path)
+    {
+#if NET
+        return Path.GetRelativePath(relativeTo, path);
+#else
+        // Ensure the base URI ends with a separator so MakeRelativeUri treats it as a directory.
+        string baseStr = relativeTo.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
+            + Path.DirectorySeparatorChar;
+        Uri baseUri = new Uri(baseStr);
+        Uri targetUri = new Uri(path);
+        return Uri.UnescapeDataString(baseUri.MakeRelativeUri(targetUri).ToString())
+            .Replace('/', Path.DirectorySeparatorChar);
+#endif
+    }
+}
diff --git a/tools/PackageCompatibility/test/ConsoleCollection.cs b/tools/PackageCompatibility/test/ConsoleCollection.cs
new file mode 100644
index 0000000000..1072c85279
--- /dev/null
+++ b/tools/PackageCompatibility/test/ConsoleCollection.cs
@@ -0,0 +1,27 @@
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.Tools.PackageCompatibility.Tests;
+
+/// <summary>
+/// xUnit collection definition used by tests that temporarily redirect global console streams.
+/// Parallelization is disabled so tests that mutate <see cref="System.Console.Out"/> and
+/// <see cref="System.Console.Error"/> cannot interfere with one another.
+/// </summary>
+[CollectionDefinition(Name, DisableParallelization = true)]
+public sealed class ConsoleCollection : ICollectionFixture<ConsoleCollectionFixture>
+{
+    /// <summary>
+    /// Stable collection name referenced by console-mutating test classes.
+    /// </summary>
+    public const string Name = "Console";
+}
+
+/// <summary>
+/// Fixture type associated with <see cref="ConsoleCollection"/>.
+/// Present to satisfy xUnit collection fixture wiring; individual test classes in this collection
+/// capture and restore console streams in their own constructor/Dispose lifecycle to keep each
+/// test isolated.
+/// </summary>
+public sealed class ConsoleCollectionFixture
+{
+}
\ No newline at end of file
diff --git a/tools/PackageCompatibility/test/EntryPointTests.cs b/tools/PackageCompatibility/test/EntryPointTests.cs
new file mode 100644
index 0000000000..a068a5e8f8
--- /dev/null
+++ b/tools/PackageCompatibility/test/EntryPointTests.cs
@@ -0,0 +1,103 @@
+using System;
+using System.IO;
+using System.Threading;
+
+using Microsoft.Data.SqlClient.Tools.PackageCompatibility;
+
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.Tools.PackageCompatibility.Tests;
+
+/// <summary>
+/// Verifies command-line entry-point behavior, including required argument handling and help-text
+/// content that documents default package versions and override examples.
+/// </summary>
+[Collection(ConsoleCollection.Name)]
+public class EntryPointTests : IDisposable
+{
+    private readonly TextWriter _originalOut;
+    private readonly TextWriter _originalError;
+    private readonly StringWriter _output;
+
+    public EntryPointTests(ConsoleCollectionFixture _)
+    {
+        _originalOut = Console.Out;
+        _originalError = Console.Error;
+        _output = new StringWriter();
+        Console.SetOut(_output);
+        Console.SetError(_output);
+    }
+
+    public void Dispose()
+    {
+        Console.SetOut(_originalOut);
+        Console.SetError(_originalError);
+        _output.Dispose();
+    }
+
+    /// <summary>
+    /// Ensures invoking the entry point without the required connection-string argument fails and
+    /// reports the missing option to the caller.
+    /// </summary>
+    [Fact]
+    public void EntryPointWithoutConnectionStringReturnsNonZero()
+    {
+        // Act: invoke with no arguments; --connection-string is required.
+        int exitCode = EntryPoint.Main(Array.Empty<string>());
+
+        // Wait for command help/validation text to flush before asserting.
+        string commandOutput = WaitForCapturedOutput(_output, "--connection-string");
+
+        // Assert: parser should reject the command and mention the missing option.
+        Assert.NotEqual(0, exitCode);
+        Assert.Contains("--connection-string", commandOutput, StringComparison.Ordinal);
+    }
+
+    /// <summary>
+    /// Ensures help output includes both version-override examples and currently resolved default
+    /// package versions so users can understand and troubleshoot package selection.
+    /// </summary>
+    [Fact]
+    public void HelpOutputContainsDefaultVersions()
+    {
+        // Act: request help; this should never fail.
+        int exitCode = EntryPoint.Main(new[] { "--help" });
+        Assert.Equal(0, exitCode);
+
+        // Ensure final help footer is present so all formatted content has been emitted.
+        string helpOutput = WaitForCapturedOutput(_output, "--version");
+
+        // Assert: sample property overrides remain documented in help text.
+        Assert.Contains("-p:AbstractionsVersion=1.0.1", helpOutput, StringComparison.Ordinal);
+        Assert.Contains("-p:AkvProviderVersion=7.0.1-preview2", helpOutput, StringComparison.Ordinal);
+        Assert.Contains("-p:AzureVersion=1.0.0-preview1", helpOutput, StringComparison.Ordinal);
+        Assert.Contains("-p:LoggingVersion=1.0.2", helpOutput, StringComparison.Ordinal);
+        Assert.Contains("-p:SqlClientVersion=7.0.0-preview4", helpOutput, StringComparison.Ordinal);
+        Assert.Contains("-p:SqlServerVersion=1.0.0", helpOutput, StringComparison.Ordinal);
+
+        // Assert: currently resolved package defaults are visible to aid troubleshooting.
+        Assert.Contains($"Abstractions:  {PackageVersions.MicrosoftDataSqlClientExtensionsAbstractions}", helpOutput, StringComparison.Ordinal);
+        Assert.Contains($"AKV Provider:  {PackageVersions.MicrosoftDataSqlClientAlwaysEncryptedAzureKeyVaultProvider}", helpOutput, StringComparison.Ordinal);
+        Assert.Contains("Azure:         N/A", helpOutput, StringComparison.Ordinal);
+        Assert.Contains($"Logging:       {PackageVersions.MicrosoftDataSqlClientInternalLogging}", helpOutput, StringComparison.Ordinal);
+        Assert.Contains($"SqlClient:     {PackageVersions.MicrosoftDataSqlClient}", helpOutput, StringComparison.Ordinal);
+        Assert.Contains($"SqlServer:     {PackageVersions.MicrosoftSqlServerServer}", helpOutput, StringComparison.Ordinal);
+    }
+
+    /// <summary>
+    /// Waits briefly for asynchronously emitted command output to include a marker substring before
+    /// assertions run, reducing flakiness in console-capture tests.
+    /// </summary>
+    /// <param name="output">Captured console output writer.</param>
+    /// <param name="expectedSubstring">Marker text that indicates output emission has completed.</param>
+    /// <returns>The current captured output text.</returns>
+    private static string WaitForCapturedOutput(StringWriter output, string expectedSubstring)
+    {
+        // CommandLine writes asynchronously; wait briefly for expected marker text.
+        SpinWait.SpinUntil(
+            () => output.ToString().Contains(expectedSubstring, StringComparison.Ordinal),
+            TimeSpan.FromSeconds(1));
+
+        return output.ToString();
+    }
+}
diff --git a/tools/PackageCompatibility/test/IsExternalInit.cs b/tools/PackageCompatibility/test/IsExternalInit.cs
new file mode 100644
index 0000000000..d108129a8e
--- /dev/null
+++ b/tools/PackageCompatibility/test/IsExternalInit.cs
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// Polyfill required for 'record' types and 'init' setters on .NET Framework.
+// The compiler emits a reference to this type when using these C# features; .NET 5+
+// includes it in the BCL, but .NET Framework does not.
+#if NETFRAMEWORK
+namespace System.Runtime.CompilerServices
+{
+    internal static class IsExternalInit { }
+}
+#endif
diff --git a/tools/PackageCompatibility/test/PackageCompatibility.Test.csproj b/tools/PackageCompatibility/test/PackageCompatibility.Test.csproj
new file mode 100644
index 0000000000..4cf6dc685a
--- /dev/null
+++ b/tools/PackageCompatibility/test/PackageCompatibility.Test.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+
+    <TargetFrameworks>net481;net10.0</TargetFrameworks>
+
+    <RootNamespace>Microsoft.Data.SqlClient.Tools.PackageCompatibility.Test</RootNamespace>
+
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>latest</LangVersion>
+
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="xunit.v3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../src/PackageCompatibility.csproj" />
+  </ItemGroup>
+
+</Project>

From 1d44a2e08003b8f9c9d9d0552354d89e5f53df99 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Mon, 8 Jun 2026 12:46:31 -0500
Subject: [PATCH 135/298] Tests | Manual Test "Set" Trait (#4071)

Co-authored-by: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
---
 build.proj                                    |  21 +-
 src/Microsoft.Data.SqlClient.slnx             |  10 +-
 ...soft.Data.SqlClient.FunctionalTests.csproj |   4 +-
 .../ManualTests/AlwaysEncrypted/AKVTests.cs   |  13 +-
 .../AlwaysEncrypted/AKVUnitTests.cs           |   1 +
 .../ManualTests/AlwaysEncrypted/ApiShould.cs  |   3 +-
 .../ManualTests/AlwaysEncrypted/BulkCopyAE.cs |   1 +
 .../AlwaysEncrypted/BulkCopyAEErrorMessage.cs |   1 +
 .../ColumnDecryptErrorTests.cs                |  11 +-
 .../AlwaysEncrypted/ConversionTests.cs        |   7 +-
 .../AlwaysEncrypted/CspProviderExt.cs         |   3 +-
 .../DateOnlyReadTests.netcore.cs              |  11 +-
 .../EnclaveAzureDatabaseTests.cs              |   3 +-
 .../AlwaysEncrypted/End2EndSmokeTests.cs      |  47 +--
 .../AlwaysEncrypted/ExceptionTestAKVStore.cs  |   1 +
 .../AlwaysEncrypted/ExceptionsGenericError.cs |   3 +-
 .../AlwaysEncrypted/SqlBulkCopyTruncation.cs  |   5 +-
 .../AlwaysEncrypted/SqlNullValues.cs          |   3 +-
 .../TestTrustedMasterKeyPaths.cs              |  25 +-
 .../BulkCopy/AdjustPrecScaleForBulkCopy.cs    |   3 +-
 .../BulkCopy/AzureDistributedTransaction.cs   |   1 +
 .../tests/ManualTests/BulkCopy/Bug84548.cs    |   1 +
 .../tests/ManualTests/BulkCopy/Bug85007.cs    |   1 +
 .../tests/ManualTests/BulkCopy/Bug903514.cs   |   1 +
 .../tests/ManualTests/BulkCopy/Bug98182.cs    |   1 +
 .../ManualTests/BulkCopy/CacheMetadata.cs     |   9 +
 .../ManualTests/BulkCopy/CheckConstraints.cs  |   1 +
 .../ManualTests/BulkCopy/ColumnCollation.cs   |   1 +
 .../ManualTests/BulkCopy/CopyAllFromReader.cs |   1 +
 .../BulkCopy/CopyAllFromReader1.cs            |   1 +
 .../BulkCopy/CopyAllFromReaderAsync.cs        |   1 +
 .../BulkCopy/CopyAllFromReaderCancelAsync.cs  |   1 +
 .../CopyAllFromReaderConnectionCloseAsync.cs  |   1 +
 ...llFromReaderConnectionCloseOnEventAsync.cs |   1 +
 .../BulkCopy/CopyMultipleReaders.cs           |   1 +
 .../BulkCopy/CopySomeFromDatatable.cs         |   1 +
 .../BulkCopy/CopySomeFromDatatableAsync.cs    |   1 +
 .../BulkCopy/CopySomeFromReader.cs            |   1 +
 .../BulkCopy/CopySomeFromRowArray.cs          |   1 +
 .../BulkCopy/CopySomeFromRowArrayAsync.cs     |   1 +
 .../ManualTests/BulkCopy/CopyVariants.cs      |   1 +
 .../BulkCopy/CopyWidenNullInexactNumerics.cs  |   1 +
 .../ManualTests/BulkCopy/CopyWithEvent.cs     |   1 +
 .../ManualTests/BulkCopy/CopyWithEvent1.cs    |   1 +
 .../BulkCopy/CopyWithEventAsync.cs            |   1 +
 .../DataConversionErrorMessageTest.cs         |   1 +
 .../DestinationTableNameWithSpecialChar.cs    |   1 +
 .../BulkCopy/ErrorOnRowsMarkedAsDeleted.cs    |   1 +
 .../tests/ManualTests/BulkCopy/FireTrigger.cs |   1 +
 .../BulkCopy/HiddenTargetColumn.cs            |   3 +-
 .../BulkCopy/InvalidAccessFromEvent.cs        |   1 +
 .../tests/ManualTests/BulkCopy/KeepNulls.cs   |   1 +
 .../BulkCopy/MissingTargetColumn.cs           |   1 +
 .../BulkCopy/MissingTargetColumns.cs          |   1 +
 .../BulkCopy/MissingTargetTable.cs            |   1 +
 .../tests/ManualTests/BulkCopy/OrderHint.cs   |   1 +
 .../ManualTests/BulkCopy/OrderHintAsync.cs    |   1 +
 .../BulkCopy/OrderHintDuplicateColumn.cs      |   1 +
 .../BulkCopy/OrderHintIdentityColumn.cs       |   1 +
 .../BulkCopy/OrderHintMissingTargetColumn.cs  |   1 +
 .../BulkCopy/OrderHintTransaction.cs          |   1 +
 .../BulkCopy/SpecialCharacterNames.cs         |   1 +
 .../ManualTests/BulkCopy/SqlGraphTables.cs    |   3 +-
 .../tests/ManualTests/BulkCopy/TableLock.cs   |   1 +
 .../BulkCopy/TestBulkCopyWithUTF8.cs          |   1 +
 .../tests/ManualTests/BulkCopy/Transaction.cs |   1 +
 .../ManualTests/BulkCopy/Transaction1.cs      |   1 +
 .../ManualTests/BulkCopy/Transaction2.cs      |   1 +
 .../ManualTests/BulkCopy/Transaction3.cs      |   1 +
 .../ManualTests/BulkCopy/Transaction4.cs      |   1 +
 .../BulkCopy/TransactionTestAsync.cs          |   1 +
 .../ManualTests/BulkCopy/WriteToServerTest.cs |   1 +
 .../DDBasics/DDAsyncTest/DDAsyncTest.cs       |   3 +-
 .../DDDataTypesTest/DDDataTypesTest.cs        |   3 +-
 .../DDBasics/DDMARSTest/DDMARSTest.cs         |   3 +-
 ...icrosoft.Data.SqlClient.ManualTests.csproj | 325 ++----------------
 .../MultipleResultsTest.cs                    |   3 +-
 .../ProviderAgnostic/ReaderTest/ReaderTest.cs |   3 +-
 .../AADFedAuthTokenRefreshTest.cs             |   5 +-
 .../SQL/AdapterTest/AdapterTest.cs            |   3 +-
 .../AsyncCancelledConnectionsTest.cs          |   3 +-
 .../SQL/AsyncTest/AsyncTimeoutTest.cs         |   1 +
 .../SQL/AsyncTest/BeginExecAsyncTest.cs       |   1 +
 .../SQL/AsyncTest/BeginExecReaderAsyncTest.cs |   1 +
 .../SQL/AsyncTest/XmlReaderAsyncTest.cs       |   1 +
 .../tests/ManualTests/SQL/Batch/BatchTests.cs |   5 +-
 .../ConfigurableIpPreferenceTest.cs           |   1 +
 .../ConnectionPoolStressTest.cs               |   3 +-
 .../ConnectionPoolTest.Debug.cs               |   1 +
 .../ConnectionPoolTest/ConnectionPoolTest.cs  |   5 +-
 .../ConnectionPoolTest/PoolBlockPeriodTest.cs |   1 +
 .../ConnectionPoolTest/TransactionPoolTest.cs |   3 +-
 .../CertificateTest.cs                        |   1 +
 .../CertificateTestWithTdsServer.cs           |   1 +
 .../ConnectivityTests/AADConnectionTest.cs    |   1 +
 .../ConnectionBehaviorTest.cs                 |   1 +
 .../SQL/ConnectivityTests/ConnectivityTest.cs |   3 +-
 .../TcpDefaultForAzureTest.cs                 |   3 +-
 .../SQL/DNSCachingTest/DNSCachingTest.cs      |  15 +-
 .../ConnectionSchemaTest.cs                   |   3 +-
 .../DataClassificationTest.cs                 |   1 +
 .../DataReaderCancellationTest.cs             |   3 +-
 .../DataReaderTest/DataReaderStreamsTest.cs   |   1 +
 .../SQL/DataReaderTest/DataReaderTest.cs      |   3 +-
 .../DataSourceParserTest.cs                   |   1 +
 .../SQL/DataStreamTest/DataStreamTest.cs      |   3 +-
 .../SQL/DateTimeTest/DateTimeTest.cs          |   3 +-
 .../ExceptionTest/ConnectionExceptionTest.cs  |   3 +-
 .../SQL/ExceptionTest/ExceptionTest.cs        |   3 +-
 .../SQL/InstanceNameTest/InstanceNameTest.cs  |   3 +-
 .../IntegratedAuthenticationTest.cs           |   1 +
 .../SQL/JsonTest/JsonBulkCopyTest.cs          |   1 +
 .../SQL/JsonTest/JsonStreamTest.cs            |   1 +
 .../ManualTests/SQL/JsonTest/JsonTest.cs      |   5 +-
 .../SQL/KerberosTests/KerberosTest.cs         |   1 +
 .../SQL/LocalDBTest/LocalDBTest.cs            |   3 +-
 .../MarsSessionPoolingTest.cs                 |   3 +-
 .../ManualTests/SQL/MARSTest/MARSTest.cs      |   3 +-
 .../ConnectionOnMirroringTest.cs              |   1 +
 .../ParallelTransactionsTest.cs               |   3 +-
 .../SQL/ParameterTest/DateTimeVariantTests.cs | 269 +++++++--------
 .../SQL/ParameterTest/OutputParameterTests.cs |   3 +-
 .../SQL/ParameterTest/ParametersTest.cs       |   3 +-
 .../ParameterTest/SqlAdapterUpdateBatch.cs    |   1 +
 .../ParameterTest/SqlVariantParameterTests.cs |   5 +-
 .../StreamInputParameterTests.cs              |   3 +-
 .../ParameterTest/TvpColumnBoundariesTests.cs |   3 +-
 .../SQL/ParameterTest/TvpQueryHintsTests.cs   |   3 +-
 .../ManualTests/SQL/ParameterTest/TvpTest.cs  |   5 +-
 .../SQL/RandomStressTest/RandomStressTest.cs  |   1 +
 .../SQL/RetryLogic/RetryLogicCounterTest.cs   |   1 +
 .../SQL/RetryLogic/RetryLogicTestHelper.cs    |   1 +
 .../RetryLogic/SqlCommandReliabilityTest.cs   |   1 +
 .../SqlConfigurationManagerReliabilityTest.cs |   1 +
 .../SqlConnectionReliabilityTest.cs           |   1 +
 .../SQL/SplitPacketTest/SplitPacketTest.cs    |   3 +-
 .../SQL/SqlCommand/SqlCommandCancelTest.cs    |   3 +-
 .../SQL/SqlCommand/SqlCommandCompletedTest.cs |   1 +
 .../SqlCommand/SqlCommandExecuteScalarTest.cs |   3 +-
 .../SQL/SqlCommand/SqlCommandSetTest.cs       |   1 +
 .../SqlCommand/SqlCommandStoredProcTest.cs    |   3 +-
 .../SqlCredentialTest/SqlCredentialTest.cs    |   1 +
 .../SqlDataSourceEnumeratorTest.cs            |   3 +-
 .../SqlDependencyTest/SqlDependencyTest.cs    |   1 +
 .../SqlFileStreamTest/SqlFileStreamTest.cs    |  13 +-
 .../SqlNamedPipesTest/SqlNamedPipesTest.cs    |   3 +-
 .../SqlNotificationTest.cs                    |   3 +-
 .../SqlSchemaInfoTest/SqlSchemaInfoTest.cs    |   1 +
 .../SqlStatisticsTest/SqlStatisticsTest.cs    |   1 +
 .../DistributedTransactionTest.cs             |   1 +
 .../TransactionEnlistmentTest.cs              |   1 +
 .../SQL/TransactionTest/TransactionTest.cs    |   3 +-
 .../SQL/UdtTest/SqlServerTypesTest.cs         |   3 +-
 .../SQL/UdtTest/UdtBulkCopyTest.cs            |   3 +-
 .../SQL/UdtTest/UdtDateTimeOffsetTest.cs      |   1 +
 .../tests/ManualTests/SQL/UdtTest/UdtTest.cs  |   3 +-
 .../tests/ManualTests/SQL/UdtTest/UdtTest2.cs |   3 +-
 .../SQL/Utf8SupportTest/Utf8SupportTest.cs    |   1 +
 .../VectorTest/NativeVectorFloat32Tests.cs    |   3 +-
 .../SQL/VectorTest/VectorAPIValidationTest.cs |   1 +
 .../VectorTypeBackwardCompatibilityTests.cs   |   3 +-
 .../SQL/WeakRefTest/WeakRefTest.cs            |   3 +-
 .../WeakRefTestYukonSpecific.cs               |   3 +-
 .../TracingTests/DiagnosticTest.cs            |   3 +
 .../TracingTests/EventSourceTest.cs           |   3 +-
 .../ManualTests/TracingTests/MetricsTest.cs   |   1 +
 .../TracingTests/XEventsTracingTest.cs        |   2 +-
 .../UDTs => TestUdts}/Address/Address.cs      |   0
 .../UDTs => TestUdts}/Address/Address.csproj  |   0
 .../UDTs => TestUdts}/Circle/Circle.cs        |   0
 .../UDTs => TestUdts}/Circle/Circle.csproj    |   0
 .../UDTs => TestUdts}/Circle/Point1.cs        |   0
 .../UdtTest/UDTs => TestUdts}/Shapes/Line.cs  |   0
 .../UdtTest/UDTs => TestUdts}/Shapes/Point.cs |   0
 .../UDTs => TestUdts}/Shapes/Shapes.csproj    |   0
 .../Utf8String/Utf8String.cs                  |   0
 .../Utf8String/Utf8String.csproj              |   0
 177 files changed, 495 insertions(+), 575 deletions(-)
 rename src/Microsoft.Data.SqlClient/tests/{ManualTests/SQL/UdtTest/UDTs => TestUdts}/Address/Address.cs (100%)
 rename src/Microsoft.Data.SqlClient/tests/{ManualTests/SQL/UdtTest/UDTs => TestUdts}/Address/Address.csproj (100%)
 rename src/Microsoft.Data.SqlClient/tests/{ManualTests/SQL/UdtTest/UDTs => TestUdts}/Circle/Circle.cs (100%)
 rename src/Microsoft.Data.SqlClient/tests/{ManualTests/SQL/UdtTest/UDTs => TestUdts}/Circle/Circle.csproj (100%)
 rename src/Microsoft.Data.SqlClient/tests/{ManualTests/SQL/UdtTest/UDTs => TestUdts}/Circle/Point1.cs (100%)
 rename src/Microsoft.Data.SqlClient/tests/{ManualTests/SQL/UdtTest/UDTs => TestUdts}/Shapes/Line.cs (100%)
 rename src/Microsoft.Data.SqlClient/tests/{ManualTests/SQL/UdtTest/UDTs => TestUdts}/Shapes/Point.cs (100%)
 rename src/Microsoft.Data.SqlClient/tests/{ManualTests/SQL/UdtTest/UDTs => TestUdts}/Shapes/Shapes.csproj (100%)
 rename src/Microsoft.Data.SqlClient/tests/{ManualTests/SQL/UdtTest/UDTs => TestUdts}/Utf8String/Utf8String.cs (100%)
 rename src/Microsoft.Data.SqlClient/tests/{ManualTests/SQL/UdtTest/UDTs => TestUdts}/Utf8String/Utf8String.csproj (100%)

diff --git a/build.proj b/build.proj
index c13b40e246..4ff29a08df 100644
--- a/build.proj
+++ b/build.proj
@@ -353,13 +353,13 @@
       TestSet
       Applies to:     TestSqlClientManual
       Description:    Used to select a set of tests to run from the SqlClient manual tests project. If not
-                      specified, all tests will be executed.
+                      specified, all manual tests will be executed. In the manual test target, this
+                      value is converted into a Set trait filter and combined with any TestFilters.
       Default value:  [blank]
       Allowed values: ([1][2][3][AE])
       Examples:       "1", "12", "AE", "12AE"
     -->
     <TestSet Condition="'$(TestSet)' == ''" />
-    <TestSetArgument Condition="'$(TestSet)' != ''">-p:TestSet="$(TestSet)"</TestSetArgument>
   </PropertyGroup>
 
   <!-- ================================================================= -->
@@ -664,14 +664,27 @@
       <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
       <LogFilePrefix Condition="'$(TestSet)' != ''">$(LogFilePrefix)-$(TestSet)</LogFilePrefix>
 
+      <!-- Join test sets together, if any were selected -->
+      <NormalizedTestSet>$(TestSet.ToUpper())</NormalizedTestSet>
+      <TestSetFilter Condition="$(NormalizedTestSet.Contains('1'))">Set=1</TestSetFilter>
+      <TestSetFilter Condition="$(NormalizedTestSet.Contains('2'))">$(TestSetFilter)|Set=2</TestSetFilter>
+      <TestSetFilter Condition="$(NormalizedTestSet.Contains('3'))">$(TestSetFilter)|Set=3</TestSetFilter>
+      <TestSetFilter Condition="$(NormalizedTestSet.Contains('AE'))">$(TestSetFilter)|Set=AE</TestSetFilter>
+      <TestSetFilter>$(TestSetFilter.Trim('|'))</TestSetFilter>
+
+      <!-- Combine existing filters with test set filters -->
+      <ManualTestFilters Condition="'$(TestSetFilter)' != '' and '$(TestFilters)' != ''">$(TestFilters)&amp;($(TestSetFilter))</ManualTestFilters>
+      <ManualTestFilters Condition="'$(TestSetFilter)' == ''">$(TestFilters)</ManualTestFilters>
+      <ManualTestFilters Condition="'$(TestFilters)' == ''">$(TestSetFilter)</ManualTestFilters>
+      <ManualTestFiltersArgument Condition="'$(ManualTestFilters)' != ''">--filter "$(ManualTestFilters)"</ManualTestFiltersArgument>
+
       <DotnetCommand>
         "$(DotnetPath)dotnet" test "$(SqlClientManualTestProjectPath)"
         -p:Configuration=$(Configuration)
         $(TestBlameArgument)
         $(TestCodeCoverageArgument)
-        $(TestFiltersArgument)
+        $(ManualTestFiltersArgument)
         $(TestFrameworkArgument)
-        $(TestSetArgument)
         --results-directory "$(TestResultsFolderPath)"
         --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
 
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
index c45bbdf485..a578a82db6 100644
--- a/src/Microsoft.Data.SqlClient.slnx
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -205,11 +205,11 @@
     <Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj" />
     <Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj" />
   </Folder>
-  <Folder Name="/test/TestClr/">
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj" />
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
+  <Folder Name="/test/TestUdts/">
+    <Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj" />
   </Folder>
   <Project Path="../tools/PackageCompatibility/src/PackageCompatibility.csproj" />
   <Project Path="../tools/PackageCompatibility/test/PackageCompatibility.Test.csproj" />
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
index 8fe4c2be23..13673697db 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -77,7 +77,7 @@
     <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
 
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
@@ -101,7 +101,7 @@
     <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
 
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs
index 8a56a7690c..53232b1431 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs
@@ -12,6 +12,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public class AKVTest : IClassFixture<SQLSetupStrategyAzureKeyVault>
     {
         private readonly SQLSetupStrategyAzureKeyVault _fixture;
@@ -59,12 +60,12 @@ public void TestEncryptDecryptWithAKV()
         }
 
         /*
-         This unit test is going to assess an issue where a failed decryption leaves a connection in a bad state  
+         This unit test is going to assess an issue where a failed decryption leaves a connection in a bad state
          when it is returned to the connection pool. If a subsequent connection is retried it will result in an "Internal connection fatal error",
-         which causes that connection to be doomed, preventing it from being returned to the pool. 
+         which causes that connection to be doomed, preventing it from being returned to the pool.
          Consequently, retrying a third connection will encounter the same decryption error, leading to a repetitive failure cycle.
 
-         The purpose of this unit test is to simulate a decryption error and verify that the connection remains usable when returned to the pool. 
+         The purpose of this unit test is to simulate a decryption error and verify that the connection remains usable when returned to the pool.
          It aims to confirm that three consecutive connections will consistently fail with the "Failed to decrypt column" error.
         */
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringSetupForAE), nameof(DataTestUtility.IsAKVSetupAvailable))]
@@ -100,10 +101,10 @@ public void ForcedColumnDecryptErrorTestShouldFail()
             // does not leave the connection in a bad state.
             // In each try, when a "Failed to decrypt error" is thrown, the connection's TDS Parser state object buffer is drained of any
             // pending data so it does not interfere with future operations. In addition, the TDS parser state object's reader.DataReady flag
-            // is set to false so that the calling function that catches the exception will not continue to use the reader. Otherwise, it will 
+            // is set to false so that the calling function that catches the exception will not continue to use the reader. Otherwise, it will
             // timeout waiting to read data that doesn't exist. Also, the TDS Parser state object HasPendingData flag is also set to false
             // to indicate that the buffer has been cleared and to avoid it getting cleared again in SqlDataReader.TryCloseInternal function.
-            // Finally, after successfully handling the decryption error, the connection is then returned back to the connection pool without 
+            // Finally, after successfully handling the decryption error, the connection is then returned back to the connection pool without
             // an error. A proof that the connection's state object is clean is in the second connection being able to throw the same error.
             // The third connection is for making sure we test 3 times as the minimum number of connections to reproduce the issue previously.
             for (int i = 0; i < 3; i++)
@@ -182,7 +183,7 @@ public void TestLocalCekCacheIsScopedToProvider()
             sqlDataReader2.Close();
 
             // global cek cache and local cek cache are populated above
-            // when using a new per-command provider, it will only use its local cek cache 
+            // when using a new per-command provider, it will only use its local cek cache
             // the following query should fail due to an empty cek cache and invalid credentials
             customProvider[SqlColumnEncryptionAzureKeyVaultProvider.ProviderName] =
                 new SqlColumnEncryptionAzureKeyVaultProvider(new ClientSecretCredential("tenant", "client", "secret"));
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs
index 54c0c12192..c8c3820978 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs
@@ -12,6 +12,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public class AKVUnitTests : IClassFixture<AzureKeyVaultKeyFixture>
     {
         const string EncryptionAlgorithm = "RSA_OAEP";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
index 620d7bd99a..feefe77adb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -24,6 +24,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
     /// <summary>
     /// Always Encrypted public API Manual tests.
     /// </summary>
+    [Trait("Set", "AE")]
     // @TODO: These tests are known to not run reliably in DEBUG mode.
     [ConditionalClass(typeof(DataTestUtility), nameof(DataTestUtility.IsNotDebugBuild))]
     public sealed class ApiShould : IClassFixture<SQLSetupStrategyCertStoreProvider>, IDisposable
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAE.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAE.cs
index c0b80fe977..eee3a71ebb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAE.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAE.cs
@@ -12,6 +12,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
     /// <summary>
     /// Always Encrypted public API Manual tests.
     /// </summary>
+    [Trait("Set", "AE")]
     public sealed class BulkCopyAE : IClassFixture<SQLSetupStrategyCertStoreProvider>, IDisposable
     {
         private SQLSetupStrategy fixture;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAEErrorMessage.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAEErrorMessage.cs
index a824575f6f..b08b8eb325 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAEErrorMessage.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/BulkCopyAEErrorMessage.cs
@@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
     /// <summary>
     /// Always Encrypted public API Manual tests.
     /// </summary>
+    [Trait("Set", "AE")]
     public class BulkCopyAEErrorMessage : IClassFixture<SQLSetupStrategyCertStoreProvider>
     {
         private SQLSetupStrategy _fixture;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ColumnDecryptErrorTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ColumnDecryptErrorTests.cs
index d7435b95af..7ed66d6708 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ColumnDecryptErrorTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ColumnDecryptErrorTests.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public sealed class ColumnDecryptErrorTests : IClassFixture<SQLSetupStrategyAzureKeyVault>, IDisposable
     {
         private SQLSetupStrategyAzureKeyVault fixture;
@@ -28,13 +29,13 @@ public ColumnDecryptErrorTests(SQLSetupStrategyAzureKeyVault context)
          * properly reset before being returned to the pool. If this doesn't happen, then random bytes
          * may be left in the connection's state. These can interfere with the next operation that utilizes
          * the connection.
-         * 
+         *
          * We test that state is properly reset by triggering the same error condition twice. Routing column key discovery
-         * away from AKV toward a dummy key store achieves this. Each connection pulls from a pool of max 
-         * size one to ensure we are using the same internal connection/socket both times. We expect to 
+         * away from AKV toward a dummy key store achieves this. Each connection pulls from a pool of max
+         * size one to ensure we are using the same internal connection/socket both times. We expect to
          * receive the "Failed to decrypt column" exception twice. If the state were not cleaned properly,
          * the second error would be different because the TDS stream would be unintelligible.
-         * 
+         *
          * Finally, we assert that restoring the connection to AKV allows a successful query.
          */
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsTargetReadyForAeWithKeyStore), nameof(DataTestUtility.IsAKVSetupAvailable))]
@@ -75,7 +76,7 @@ public void TestCleanConnectionAfterDecryptFail(string connString, string select
 
                 using SqlCommand sqlCommand = new SqlCommand(string.Format(selectQuery, tableName),
                                                             sqlConnection, null, SqlCommandColumnEncryptionSetting.Enabled);
-                
+
                 using SqlDataReader sqlDataReader = sqlCommand.ExecuteReader();
 
                 Assert.True(sqlDataReader.HasRows, "FAILED: Select statement did not return any rows.");
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs
index f54609e2c0..5574b83c45 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.using System;
 
@@ -18,6 +18,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public sealed class ConversionTests : IDisposable, IClassFixture<ColumnMasterKeyCertificateFixture>
     {
 
@@ -621,7 +622,7 @@ private void AdjustSizePrecisionAndScale(ref ColumnMetaData largeColumnMeta, ref
 
             if (TypeHasSize(largeColumnMeta.ColumnType))
             {
-                // 20% of the time use (max) as the length.                
+                // 20% of the time use (max) as the length.
                 largeColumnMeta.UseMax = (largeColumnMeta.ColumnType is SqlDbType.VarChar ||
                     largeColumnMeta.ColumnType is SqlDbType.NVarChar ||
                     largeColumnMeta.ColumnType is SqlDbType.VarBinary) &&
@@ -683,7 +684,7 @@ largeColumnMeta.ColumnType is SqlDbType.NVarChar ||
                 {
                     smallColumnMeta.Precision = 0;
 
-                    // For Time / DateTime2 / DateTimeOffset types, actual scale is set to 7 when parameter.scale is zero. 
+                    // For Time / DateTime2 / DateTimeOffset types, actual scale is set to 7 when parameter.scale is zero.
                     // Active Issue in SQLParameter.cs when user wants to specify zero as the actual scale.
                     smallColumnMeta.Scale = random.Next(minScale, largeColumnMeta.Scale);
                 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
index acb2e9278c..27b78acd10 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -18,6 +18,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
     /// Always Encrypted public CspProvider Manual tests.
     /// </summary>
     // TODO: These tests are marked as Windows only for now but should be run for all platforms once the Master Key is accessible to this app from Azure Key Vault.
+    [Trait("Set", "AE")]
     [PlatformSpecific(TestPlatforms.Windows)]
     public class CspProviderExt
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/DateOnlyReadTests.netcore.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/DateOnlyReadTests.netcore.cs
index 4c0900a68b..f91788c9c1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/DateOnlyReadTests.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/DateOnlyReadTests.netcore.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -13,6 +13,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public sealed class DateOnlyReadTests : IClassFixture<SQLSetupStrategyCertStoreProvider>, IDisposable
     {
         private SQLSetupStrategy fixture;
@@ -41,10 +42,10 @@ public void TestSelectOnEncryptedNonEncryptedColumns(string connString, string s
 
                 // insert 1 row data
                 CustomerDateOnly customer = new CustomerDateOnly(
-                    45, 
-                    "Microsoft", 
-                    "Corporation", 
-                    new DateOnly(2001, 1, 31), 
+                    45,
+                    "Microsoft",
+                    "Corporation",
+                    new DateOnly(2001, 1, 31),
                     new TimeOnly(18, 36, 45));
 
                 DatabaseHelper.InsertCustomerDateOnlyData(sqlConn, null, tableName, customer);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs
index 536be83a3e..4de82d39b7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.using System;
 
@@ -14,6 +14,7 @@
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
     // This test class is for internal use only
+    [Trait("Set", "AE")]
     public sealed class EnclaveAzureDatabaseTests : IDisposable, IClassFixture<AzureKeyVaultKeyFixture>
     {
         private ColumnMasterKey akvColumnMasterKey;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/End2EndSmokeTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/End2EndSmokeTests.cs
index a9c30646ae..6581fcf2e8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/End2EndSmokeTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/End2EndSmokeTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public sealed class End2EndSmokeTests : IClassFixture<SQLSetupStrategyCertStoreProvider>, IDisposable
     {
         private SQLSetupStrategy fixture;
@@ -160,13 +161,13 @@ public IEnumerator<object[]> GetEnumerator()
         {
             foreach (string connStrAE in DataTestUtility.AEConnStrings)
             {
-                yield return new object[] { 
-                    connStrAE, 
+                yield return new object[] {
+                    connStrAE,
                     true, /*sync*/
                     @"select CustomerId, FirstName, LastName from [{0}] where CustomerId = @CustomerId and FirstName = @FirstName",
                     3, /*total number of columns in select statement*/
-                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/ 
-                                   @"string", /*unencrypted datatype of second column in select statement*/ 
+                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/
+                                   @"string", /*unencrypted datatype of second column in select statement*/
                                    @"string" /*datatype of third column in select statement*/},
                     2, /*no:of input parameters*/
                     new object[] { @"CustomerId", /*input parameter name*/
@@ -177,13 +178,13 @@ public IEnumerator<object[]> GetEnumerator()
                                    @"Microsoft" /*input parameter value*/}
                 };
 
-                yield return new object[] { 
+                yield return new object[] {
                     connStrAE,
                     true, /*sync*/
                     @"select CustomerId, FirstName, LastName from [{0}] where CustomerId = @CustomerId",
                     3, /*total number of columns in select statement*/
-                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/ 
-                                   @"string", /*unencrypted datatype of second column in select statement*/ 
+                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/
+                                   @"string", /*unencrypted datatype of second column in select statement*/
                                    @"string" /*datatype of third column in select statement*/},
                     1, /*no:of input parameters*/
                     new object[] { @"CustomerId", /*input parameter name*/
@@ -191,13 +192,13 @@ public IEnumerator<object[]> GetEnumerator()
                                    45, /*input parameter value*/}
                 };
 
-                yield return new object[] { 
+                yield return new object[] {
                     connStrAE,
                     true, /*sync*/
                     @"select CustomerId, FirstName, LastName from [{0}] where FirstName = @FirstName",
                     3, /*total number of columns in select statement*/
-                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/ 
-                                   @"string", /*unencrypted datatype of second column in select statement*/ 
+                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/
+                                   @"string", /*unencrypted datatype of second column in select statement*/
                                    @"string" /*datatype of third column in select statement*/},
                     1, /*no:of input parameters*/
                     new object[] { @"FirstName", /*input parameter name*/
@@ -210,8 +211,8 @@ public IEnumerator<object[]> GetEnumerator()
                     true, /*sync*/
                     @"select CustomerId, FirstName, LastName from [{0}] where LastName = @LastName",
                     3, /*total number of columns in select statement*/
-                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/ 
-                                   @"string", /*unencrypted datatype of second column in select statement*/ 
+                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/
+                                   @"string", /*unencrypted datatype of second column in select statement*/
                                    @"string" /*datatype of third column in select statement*/},
                     1, /*no:of input parameters*/
                     new object[] { @"LastName", /*input parameter name*/
@@ -224,7 +225,7 @@ public IEnumerator<object[]> GetEnumerator()
                     true, /*sync*/
                     @"select CustomerId, FirstName from [{0}] where CustomerId = @CustomerId and FirstName = @FirstName",
                     2, /*total number of columns in select statement*/
-                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/ 
+                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/
                                    @"string", /*unencrypted datatype of second column in select statement*/},
                     2, /*no:of input parameters*/
                     new object[] { @"CustomerId", /*input parameter name*/
@@ -240,8 +241,8 @@ public IEnumerator<object[]> GetEnumerator()
                     false, /*sync*/
                     @"select CustomerId, FirstName, LastName from [{0}] where CustomerId = @CustomerId and FirstName = @FirstName",
                     3, /*total number of columns in select statement*/
-                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/ 
-                                   @"string", /*unencrypted datatype of second column in select statement*/ 
+                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/
+                                   @"string", /*unencrypted datatype of second column in select statement*/
                                    @"string" /*datatype of third column in select statement*/},
                     2, /*no:of input parameters*/
                     new object[] { @"CustomerId", /*input parameter name*/
@@ -257,8 +258,8 @@ public IEnumerator<object[]> GetEnumerator()
                     false, /*sync*/
                     @"select CustomerId, FirstName, LastName from [{0}] where CustomerId = @CustomerId",
                     3, /*total number of columns in select statement*/
-                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/ 
-                                   @"string", /*unencrypted datatype of second column in select statement*/ 
+                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/
+                                   @"string", /*unencrypted datatype of second column in select statement*/
                                    @"string" /*datatype of third column in select statement*/},
                     1, /*no:of input parameters*/
                     new object[] { @"CustomerId", /*input parameter name*/
@@ -271,8 +272,8 @@ public IEnumerator<object[]> GetEnumerator()
                     false, /*sync*/
                     @"select CustomerId, FirstName, LastName from [{0}] where FirstName = @FirstName",
                     3, /*total number of columns in select statement*/
-                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/ 
-                                   @"string", /*unencrypted datatype of second column in select statement*/ 
+                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/
+                                   @"string", /*unencrypted datatype of second column in select statement*/
                                    @"string" /*datatype of third column in select statement*/},
                     1, /*no:of input parameters*/
                     new object[] { @"FirstName", /*input parameter name*/
@@ -285,8 +286,8 @@ public IEnumerator<object[]> GetEnumerator()
                     false, /*sync*/
                     @"select CustomerId, FirstName, LastName from [{0}] where LastName = @LastName",
                     3, /*total number of columns in select statement*/
-                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/ 
-                                   @"string", /*unencrypted datatype of second column in select statement*/ 
+                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/
+                                   @"string", /*unencrypted datatype of second column in select statement*/
                                    @"string" /*datatype of third column in select statement*/},
                     1, /*no:of input parameters*/
                     new object[] { @"LastName", /*input parameter name*/
@@ -299,7 +300,7 @@ public IEnumerator<object[]> GetEnumerator()
                     false, /*sync*/
                     @"select CustomerId, FirstName from [{0}] where CustomerId = @CustomerId and FirstName = @FirstName",
                     2, /*total number of columns in select statement*/
-                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/ 
+                    new string[] { @"int", /*unencrypted datatype of first column in select statement*/
                                    @"string", /*unencrypted datatype of second column in select statement*/},
                     2, /*no:of input parameters*/
                     new object[] { @"CustomerId", /*input parameter name*/
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs
index 15679176ac..9f006c3f55 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public class ExceptionTestAKVStore : IClassFixture<SQLSetupStrategyAzureKeyVault>
     {
         private const string MasterKeyEncAlgo = "RSA_OAEP";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs
index 1e3a00931a..00e45951db 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public class ExceptionsGenericErrors : IClassFixture<ExceptionGenericErrorFixture>
     {
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringSetupForAE), nameof(DataTestUtility.IsNotAzureServer), Skip = "ActiveIssue 10036")]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlBulkCopyTruncation.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlBulkCopyTruncation.cs
index 0bc6d63545..b80ed2c861 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlBulkCopyTruncation.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlBulkCopyTruncation.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public class SqlBulkCopyTruncation : IClassFixture<SQLSetupStrategyCertStoreProvider>
     {
         private SQLSetupStrategy _fixture;
@@ -416,7 +417,7 @@ public void BulkCopySmallBinary(string connectionString)
             try
             {
                 DoBulkCopy(tableNames["TabSmallBinarySource"], tableNames["TabSmallBinaryTarget"], connectionString);
-                // Verify its 8000            
+                // Verify its 8000
                 using (SqlConnection conn = new SqlConnection(GetOpenConnectionString(connectionString, true)))
                 {
                     conn.Open();
@@ -548,7 +549,7 @@ internal void TruncateTables(string sourceName, string targetName, string connec
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="connection"></param>
         /// <param name="commandText"></param>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs
index c69a3cc314..f409a7db77 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public sealed class SqlNullValuesTests : IClassFixture<SQLSetupStrategyCertStoreProvider>, IDisposable
     {
         private SQLSetupStrategy fixture;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestTrustedMasterKeyPaths.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestTrustedMasterKeyPaths.cs
index 5a4d3579be..b8ca21a68f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestTrustedMasterKeyPaths.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestTrustedMasterKeyPaths.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
+    [Trait("Set", "AE")]
     public class TestTrustedMasterKeyPaths : IClassFixture<SQLSetupStrategyCertStoreProvider>
     {
         private readonly string dummyThumbprint;
@@ -68,8 +69,8 @@ public void TestTrustedColumnEncryptionMasterKeyPathsWithNullDictionary(string c
 
                 // Test INPUT parameter on an encrypted parameter
                 using (SqlCommand sqlCommand = new SqlCommand(
-                       $@"SELECT CustomerId, FirstName, LastName 
-                          FROM [{tableName}] 
+                       $@"SELECT CustomerId, FirstName, LastName
+                          FROM [{tableName}]
                           WHERE FirstName = @firstName",
                        sqlConnection))
                 {
@@ -113,8 +114,8 @@ public void TestTrustedColumnEncryptionMasterKeyPathsWithOneServer(string connec
 
                 // Test INPUT parameter on an encrypted parameter
                 using (SqlCommand sqlCommand = new SqlCommand(
-                       $@"SELECT CustomerId, FirstName, LastName 
-                          FROM [{tableName}] 
+                       $@"SELECT CustomerId, FirstName, LastName
+                          FROM [{tableName}]
                           WHERE FirstName = @firstName",
                        sqlConnection))
                 {
@@ -171,8 +172,8 @@ public void TestTrustedColumnEncryptionMasterKeyPathsWithMultipleServers(string
 
                 // Test INPUT parameter on an encrypted parameter
                 using (SqlCommand sqlCommand = new SqlCommand(
-                       $@"SELECT CustomerId, FirstName, LastName 
-                          FROM [{tableName}] 
+                       $@"SELECT CustomerId, FirstName, LastName
+                          FROM [{tableName}]
                           WHERE FirstName = @firstName",
                        sqlConnection))
                 {
@@ -217,8 +218,8 @@ public void TestTrustedColumnEncryptionMasterKeyPathsWithInvalidInputs(string co
 
                 // Test INPUT parameter on an encrypted parameter
                 using (SqlCommand sqlCommand = new SqlCommand(
-                       $@"SELECT CustomerId, FirstName, LastName 
-                          FROM [{tableName}] 
+                       $@"SELECT CustomerId, FirstName, LastName
+                          FROM [{tableName}]
                           WHERE FirstName = @firstName",
                        sqlConnection))
                 {
@@ -249,8 +250,8 @@ FROM [{tableName}]
 
                 // Test INPUT parameter on an encrypted parameter
                 using (SqlCommand sqlCommand = new SqlCommand(
-                       $@"SELECT CustomerId, FirstName, LastName 
-                          FROM [{tableName}] 
+                       $@"SELECT CustomerId, FirstName, LastName
+                          FROM [{tableName}]
                           WHERE FirstName = @firstName",
                        sqlConnection))
                 {
@@ -283,8 +284,8 @@ FROM [{tableName}]
 
                 // Test INPUT parameter on an encrypted parameter
                 using (SqlCommand sqlCommand = new SqlCommand(
-                       $@"SELECT CustomerId, FirstName, LastName 
-                          FROM [{tableName}] 
+                       $@"SELECT CustomerId, FirstName, LastName
+                          FROM [{tableName}]
                           WHERE FirstName = @firstName",
                        sqlConnection))
                 {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AdjustPrecScaleForBulkCopy.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AdjustPrecScaleForBulkCopy.cs
index 6fdd82a6a1..1e64bf8255 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AdjustPrecScaleForBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AdjustPrecScaleForBulkCopy.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public static class AdjustPrecScaleForBulkCopy
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AzureDistributedTransaction.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AzureDistributedTransaction.cs
index e767d5e6eb..69ec0c7660 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AzureDistributedTransaction.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/AzureDistributedTransaction.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class AzureDistributedTransaction
     {
         private static readonly string s_connectionString = DataTestUtility.TCPConnectionString;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs
index 02ac15a4c4..fad361ff9e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class Bug84548
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs
index 05eb812bbb..b3de348137 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class Bug85007
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs
index 2e51711339..d720fd9ebc 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class Bug903514
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs
index 49699a81b7..f611e2e3b1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class Bug98182
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs
index 15f591524d..7443a99734 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CacheMetadata
     {
         private static readonly string sourceTable = "employees";
@@ -74,6 +75,7 @@ public void Test()
         }
     }
 
+    [Trait("Set", "2")]
     public class CacheMetadataInvalidate
     {
         private static readonly string sourceTable = "employees";
@@ -130,6 +132,7 @@ public void Test()
         }
     }
 
+    [Trait("Set", "2")]
     public class CacheMetadataDestinationChange
     {
         private static readonly string sourceTable = "employees";
@@ -189,6 +192,7 @@ public void Test()
         }
     }
 
+    [Trait("Set", "2")]
     public class CacheMetadataWithoutFlag
     {
         private static readonly string sourceTable = "employees";
@@ -243,6 +247,7 @@ public void Test()
         }
     }
 
+    [Trait("Set", "2")]
     public class CacheMetadataWithDataTable
     {
         private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(50), col3 nvarchar(50))";
@@ -289,6 +294,7 @@ public void Test()
         }
     }
 
+    [Trait("Set", "2")]
     public class CacheMetadataColumnMappingsChange
     {
         private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(50), col3 nvarchar(50))";
@@ -364,6 +370,7 @@ public void Test()
         }
     }
 
+    [Trait("Set", "2")]
     public class CacheMetadataColumnSubsetChange
     {
         private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(50), col3 nvarchar(50))";
@@ -427,6 +434,7 @@ public void Test()
         }
     }
 
+    [Trait("Set", "2")]
     public class CacheMetadataAsync
     {
         private static readonly string sourceTable = "employees";
@@ -498,6 +506,7 @@ private static async Task TestAsync(string srcConstr, string dstConstr, string d
         }
     }
 
+    [Trait("Set", "2")]
     public class CacheMetadataCombinedWithKeepNulls
     {
         private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(50) default 'DefaultVal', col3 nvarchar(50))";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs
index f083cd28d1..ede548f9cf 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CheckConstraints
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs
index df2ccc5f6b..4cffae2fb2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class ColumnCollation
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
index 1211d861d6..23ff5ed245 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyAllFromReader
     {
         private static readonly string destinationTable = null;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs
index 1557217f31..78bc18f17a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyAllFromReader1
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs
index ab62f4843e..d9cc530472 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyAllFromReaderAsync
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs
index acf93a4228..4329f7f5f4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyAllFromReaderCancelAsync
     {
         static CancellationTokenSource cts = null;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs
index 5cea2952cd..44b9c89dd7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyAllFromReaderConnectionClosedAsync
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
index 89b354c3b2..4938014ca3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyAllFromReaderConnectionClosedOnEventAsync
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs
index f97020024a..043c0f75f5 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyMultipleReaders
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs
index f380dbcf41..324ddad5c8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopySomeFromDataTable
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs
index afac0b87b3..7a5eb6d8e7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopySomeFromDataTableAsync
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs
index ada0ea4d1e..9d52892baf 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopySomeFromReader
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs
index 5a3975ca22..be48bf4351 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopySomeFromRowArray
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs
index 20349dd153..b74144fc77 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopySomeFromRowArrayAsync
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs
index 6126a50c1a..d690f849ca 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyVariants
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWidenNullInexactNumerics.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWidenNullInexactNumerics.cs
index 9fd56392c3..00dd954119 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWidenNullInexactNumerics.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWidenNullInexactNumerics.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyWidenNullInexactNumerics
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs
index 00aae3c5a9..fedfde00b9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyWithEvent
     {
         private static readonly long[] ExpectedRowCopiedResults = { 50, 100 };
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs
index 60d4dc5774..4388594033 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyWithEvent1
     {
         private static SqlBulkCopy bulkcopy;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs
index 24cad97bf0..f552b0610b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class CopyWithEventAsync
     {
         private static readonly long[] ExpectedRowCopiedResults = { 50, 100 };
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs
index bb9af9d2fd..11c4a262a1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs
@@ -86,6 +86,7 @@ public void Dispose()
         }
     }
 
+    [Trait("Set", "2")]
     public class DataConversionErrorMessageTest : IClassFixture<InitialDatabase>
     {
         private readonly InitialDatabase _fixture;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs
index 301f272190..230d450f80 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class DestinationTableNameWithSpecialChar
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs
index d52c62947e..3ac8636467 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
     /// <summary>
     /// Test case for SqlBulkEdit raising exception on rows marked as deleted
     /// </summary>
+    [Trait("Set", "2")]
     public class ErrorOnRowsMarkedAsDeleted
     {
         // This char is used to mark the row as 'to be deleted'.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs
index 321cd5b738..6353197634 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class FireTrigger
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs
index 50c56dbd02..0f18df215e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class HiddenTargetColumn
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs
index bcc3a50471..19bdf2193e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class InvalidAccessFromEvent
     {
         private static string _dstConstr;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs
index 7067cf5d7b..5228c1a35d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class KeepNulls
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs
index c3e0f62789..ac5651f34f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class MissingTargetColumn
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs
index 9265263b5d..2728b1efb4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class MissingTargetColumns
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs
index a440771203..af103c1c0a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class MissingTargetTable
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHint.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHint.cs
index 77512a4fdd..aeb6a277ed 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHint.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHint.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class OrderHint
     {
         private static readonly string sourceTable = "Customers";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintAsync.cs
index 7b84097c1f..4741f66293 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintAsync.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class OrderHintAsync
     {
         private static readonly string sourceTable = "Customers";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintDuplicateColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintDuplicateColumn.cs
index 0b15f4e063..4a07b5b6a4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintDuplicateColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintDuplicateColumn.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class OrderHintDuplicateColumn
     {
         private static readonly string sourceTable = "Customers";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintIdentityColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintIdentityColumn.cs
index 4bc75496ee..96a218bfdc 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintIdentityColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintIdentityColumn.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class OrderHintIdentityColumn
     {
         private static readonly string sourceTable = "Customers";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintMissingTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintMissingTargetColumn.cs
index 2245453bc4..51d9c7abcd 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintMissingTargetColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintMissingTargetColumn.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class OrderHintMissingTargetColumn
     {
         private static readonly string sourceTable = "Customers";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs
index 30a17024f9..e8a0571467 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class OrderHintTransaction
     {
         private static readonly string sourceTable = "Customers";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs
index 1f57f32f19..1c10feebad 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs
@@ -7,6 +7,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class SpecialCharacterNames
     {
         private static string EscapeIdentifier(string name)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs
index 0c0ec9aa1a..12353e8695 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class SqlGraphTables
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAtLeastSQL2017))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs
index 9bddfcea17..69c090d655 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class TableLock
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs
index db3ea66f94..21cf670ae7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs
@@ -14,6 +14,7 @@ namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
     /// Validates SqlBulkCopy functionality when working with UTF-8 encoded data.
     /// Ensures that data copied from a UTF-8 source table to a destination table retains its encoding and content integrity.
     /// </summary>
+    [Trait("Set", "2")]
     public sealed class TestBulkCopyWithUtf8 : IDisposable
     {
         private static string s_sourceTable = DataTestUtility.GetShortName("SourceTableForUTF8Data");
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs
index 6fe82ab11e..b5f5e32b53 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class Transaction
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs
index c60a76a5f7..665b5a5108 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class Transaction1
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs
index 3e28ab5d72..9c3f69e28a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class Transaction2
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs
index 0b3bd0b999..f28aaad8c3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class Transaction3
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs
index 9d219187d8..2c48368483 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class Transaction4
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs
index 11a1049292..537f68d8f0 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class TransactionTestAsync
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/WriteToServerTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/WriteToServerTest.cs
index 871aaf3495..3a4acc0e9b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/WriteToServerTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/WriteToServerTest.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
+    [Trait("Set", "2")]
     public class WriteToServerTest
     {
         private readonly string _connectionString = null;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDAsyncTest/DDAsyncTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDAsyncTest/DDAsyncTest.cs
index bb1fd24a1f..ec2d5f060e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDAsyncTest/DDAsyncTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDAsyncTest/DDAsyncTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class DDAsyncTest
     {
         #region <<ExecuteCommand_WithNewConnection>>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDDataTypesTest/DDDataTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDDataTypesTest/DDDataTypesTest.cs
index eda1a2c788..320102318e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDDataTypesTest/DDDataTypesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDDataTypesTest/DDDataTypesTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class DDDataTypesTest
     {
         // Synapse: Cannot find data type 'XML'.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDMARSTest/DDMARSTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDMARSTest/DDMARSTest.cs
index ad057e587d..33dbf2600a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDMARSTest/DDMARSTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDMARSTest/DDMARSTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -6,6 +6,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class DDMARSTest
     {
         // TODO Synapse: Remove dependency from Northwind database
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index d47ec611de..ce159f7821 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -4,9 +4,6 @@
     <AssemblyName>ManualTests</AssemblyName>
     <RootNamespace>Microsoft.Data.SqlClient.ManualTests</RootNamespace>
     <IsTestProject>true</IsTestProject>
-
-    <!-- This is only required today because of the separate test sets -->
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
@@ -20,245 +17,8 @@
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
-  <!-- Test Set ======================================================== -->
-  <PropertyGroup>
-    <!-- This is a measure to allow parallelizing this test project across multiple jobs. By -->
-    <!-- default, all tests will run, but if $(TestSet) is specified, a subset of files (see -->
-    <!-- below) will be compiled.                                                            -->
-    <!-- Allowed values: 1, 2, 3, AE, or any subset of these (eg, 123, AE23)                 -->
-    <TestSet Condition="'$(TestSet)' == ''">123AE</TestSet>
-    <NormalizedTestSet>$(TestSet.ToLower())</NormalizedTestSet>
-  </PropertyGroup>
-
-  <!-- Links to project files ========================================== -->
-  <!-- Items to include in all test sets -->
+  <!-- Links to Resources/etc ========================================== -->
   <ItemGroup>
-    <Compile Include="DataCommon\AADUtility.cs" />
-    <Compile Include="DataCommon\AssemblyResourceManager.cs" />
-    <Compile Include="DataCommon\ConnectionTestParameters.cs" />
-    <Compile Include="DataCommon\ConnectionTestParametersData.cs" />
-    <Compile Include="DataCommon\DataSourceBuilder.cs" />
-    <Compile Include="DataCommon\DataTestUtility.cs" />
-    <Compile Include="DataCommon\ManagedIdentityProvider.cs" />
-    <Compile Include="DataCommon\ProxyServer.cs" />
-    <Compile Include="DataCommon\SqlClientCustomTokenCredential.cs" />
-    <Compile Include="DataCommon\SystemDataResourceManager.cs" />
-    <Compile Include="DataCommon\UsernamePasswordProvider.cs" />
-    <Compile Include="DataCommon\XEventScope.cs" />
-    <Compile Include="Extensions\StreamExtensions.netfx.cs" />
-    <Compile Include="SQL\Common\AsyncDebugScope.cs" />
-    <Compile Include="SQL\Common\ConnectionPoolWrapper.cs" />
-    <Compile Include="SQL\Common\InternalConnectionWrapper.cs" />
-    <Compile Include="SQL\Common\SystemDataExtensions.cs" />
-    <Compile Include="SQL\Common\SystemDataInternals\CommandHelper.cs" />
-    <Compile Include="SQL\Common\SystemDataInternals\ConnectionHelper.cs" />
-    <Compile Include="SQL\Common\SystemDataInternals\ConnectionPoolHelper.cs" />
-    <Compile Include="SQL\Common\SystemDataInternals\DataReaderHelper.cs" />
-    <Compile Include="SQL\Common\SystemDataInternals\FedAuthTokenHelper.cs" />
-    <Compile Include="SQL\Common\SystemDataInternals\TdsParserHelper.cs" />
-    <Compile Include="SQL\Common\SystemDataInternals\TdsParserStateObjectHelper.cs" />
-    <Compile Include="XUnitAssemblyAttributes.cs" />
-
-    <!-- Content files -->
-    <None Update="makepfxcert.ps1"
-          CopyToOutputDirectory="PreserveNewest" />
-    <None Update="mismatchedcert.cer"
-          CopyToOutputDirectory="PreserveNewest" />
-    <None Update="removecert.ps1"
-          CopyToOutputDirectory="PreserveNewest" />
-    <None Update="SQL\ConnectionTestWithSSLCert\GenerateSelfSignedCertificate.ps1"
-          CopyToOutputDirectory="Always" />
-
-    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>xunit.runner.json</Link>
-    </None>
-  </ItemGroup>
-
-  <!-- Items to include in test set 1 -->
-  <ItemGroup Condition="$(NormalizedTestSet.Contains('1'))">
-    <Compile Include="SQL\AsyncTest\AsyncCancelledConnectionsTest.cs" />
-    <Compile Include="SQL\AsyncTest\AsyncTimeoutTest.cs" />
-    <Compile Include="SQL\AsyncTest\BeginExecAsyncTest.cs" />
-    <Compile Include="SQL\AsyncTest\BeginExecReaderAsyncTest.cs" />
-    <Compile Include="SQL\AsyncTest\XmlReaderAsyncTest.cs" />
-    <Compile Include="SQL\ConnectionTestWithSSLCert\CertificateTest.cs" />
-    <Compile Include="SQL\ConnectionTestWithSSLCert\CertificateTestWithTdsServer.cs" />
-    <Compile Include="SQL\SqlCommand\SqlCommandStoredProcTest.cs" />
-  </ItemGroup>
-
-  <!-- Items to include in test set 2 -->
-  <ItemGroup Condition="$(NormalizedTestSet.Contains('2'))">
-    <Compile Include="SQL\AdapterTest\AdapterTest.cs" />
-    <Compile Include="SQL\ConfigurableIpPreferenceTest\ConfigurableIpPreferenceTest.cs" />
-    <Compile Include="SQL\ConnectivityTests\AADConnectionTest.cs" />
-    <Compile Include="SQL\ConnectivityTests\ConnectionBehaviorTest.cs" />
-    <Compile Include="SQL\ConnectivityTests\ConnectivityTest.cs" />
-    <Compile Include="SQL\ConnectivityTests\TcpDefaultForAzureTest.cs" />
-    <Compile Include="SQL\DataBaseSchemaTest\ConnectionSchemaTest.cs" />
-    <Compile Include="SQL\DataClassificationTest\DataClassificationTest.cs" />
-    <Compile Include="SQL\DataReaderTest\DataReaderCancellationTest.cs" />
-    <Compile Include="SQL\DataReaderTest\DataReaderStreamsTest.cs" />
-    <Compile Include="SQL\DataReaderTest\DataReaderTest.cs" />
-    <Compile Include="SQL\DataStreamTest\DataStreamTest.cs" />
-    <Compile Include="SQL\DateTimeTest\DateTimeTest.cs" />
-    <Compile Include="SQL\DNSCachingTest\DNSCachingTest.cs" />
-    <Compile Include="SQL\ExceptionTest\ConnectionExceptionTest.cs" />
-    <Compile Include="SQL\ExceptionTest\ExceptionTest.cs" />
-    <Compile Include="SQL\RandomStressTest\Randomizer.cs" />
-    <Compile Include="SQL\RandomStressTest\RandomizerPool.cs" />
-    <Compile Include="SQL\RandomStressTest\RandomStressTest.cs" />
-    <Compile Include="SQL\RandomStressTest\SqlRandomColumnOptions.cs" />
-    <Compile Include="SQL\RandomStressTest\SqlRandomizer.cs" />
-    <Compile Include="SQL\RandomStressTest\SqlRandomTable.cs" />
-    <Compile Include="SQL\RandomStressTest\SqlRandomTableColumn.cs" />
-    <Compile Include="SQL\RandomStressTest\SqlRandomTypeInfo.cs" />
-    <Compile Include="SQL\RandomStressTest\SqlRandomTypeInfoCollection.cs" />
-    <Compile Include="SQL\RandomStressTest\SqlRandomTypesForSqlServer.cs" />
-    <Compile Include="SQL\RetryLogic\RetryLogicConfigHelper.cs" />
-    <Compile Include="SQL\RetryLogic\RetryLogicCounterTest.cs" />
-    <Compile Include="SQL\RetryLogic\RetryLogicTestHelper.cs" />
-    <Compile Include="SQL\RetryLogic\SqlCommandReliabilityTest.cs" />
-    <Compile Include="SQL\RetryLogic\SqlConfigurationManagerReliabilityTest.cs" />
-    <Compile Include="SQL\RetryLogic\SqlConnectionReliabilityTest.cs" />
-    <Compile Include="BulkCopy\AdjustPrecScaleForBulkCopy.cs" />
-    <Compile Include="BulkCopy\AzureDistributedTransaction.cs" />
-    <Compile Include="BulkCopy\Bug84548.cs" />
-    <Compile Include="BulkCopy\Bug85007.cs" />
-    <Compile Include="BulkCopy\Bug903514.cs" />
-    <Compile Include="BulkCopy\Bug98182.cs" />
-    <Compile Include="BulkCopy\CacheMetadata.cs" />
-    <Compile Include="BulkCopy\CheckConstraints.cs" />
-    <Compile Include="BulkCopy\CopyWidenNullInexactNumerics.cs" />
-    <Compile Include="BulkCopy\DataConversionErrorMessageTest.cs" />
-    <Compile Include="BulkCopy\DestinationTableNameWithSpecialChar.cs" />
-    <Compile Include="BulkCopy\ErrorOnRowsMarkedAsDeleted.cs" />
-    <Compile Include="BulkCopy\ColumnCollation.cs" />
-    <Compile Include="BulkCopy\CopyAllFromReader.cs" />
-    <Compile Include="BulkCopy\CopyAllFromReader1.cs" />
-    <Compile Include="BulkCopy\CopyAllFromReaderAsync.cs" />
-    <Compile Include="BulkCopy\CopyAllFromReaderCancelAsync.cs" />
-    <Compile Include="BulkCopy\CopyAllFromReaderConnectionCloseAsync.cs" />
-    <Compile Include="BulkCopy\CopyAllFromReaderConnectionCloseOnEventAsync.cs" />
-    <Compile Include="BulkCopy\CopyMultipleReaders.cs" />
-    <Compile Include="BulkCopy\CopySomeFromDatatable.cs" />
-    <Compile Include="BulkCopy\CopySomeFromDatatableAsync.cs" />
-    <Compile Include="BulkCopy\CopySomeFromReader.cs" />
-    <Compile Include="BulkCopy\CopySomeFromRowArray.cs" />
-    <Compile Include="BulkCopy\CopySomeFromRowArrayAsync.cs" />
-    <Compile Include="BulkCopy\CopyVariants.cs" />
-    <Compile Include="BulkCopy\CopyWithEvent.cs" />
-    <Compile Include="BulkCopy\CopyWithEvent1.cs" />
-    <Compile Include="BulkCopy\CopyWithEventAsync.cs" />
-    <Compile Include="BulkCopy\FireTrigger.cs" />
-    <Compile Include="BulkCopy\Helpers.cs" />
-    <Compile Include="BulkCopy\HiddenTargetColumn.cs" />
-    <Compile Include="BulkCopy\InvalidAccessFromEvent.cs" />
-    <Compile Include="BulkCopy\KeepNulls.cs" />
-    <Compile Include="BulkCopy\MissingTargetColumn.cs" />
-    <Compile Include="BulkCopy\MissingTargetColumns.cs" />
-    <Compile Include="BulkCopy\MissingTargetTable.cs" />
-    <Compile Include="BulkCopy\OrderHint.cs" />
-    <Compile Include="BulkCopy\OrderHintAsync.cs" />
-    <Compile Include="BulkCopy\OrderHintDuplicateColumn.cs" />
-    <Compile Include="BulkCopy\OrderHintIdentityColumn.cs" />
-    <Compile Include="BulkCopy\OrderHintMissingTargetColumn.cs" />
-    <Compile Include="BulkCopy\OrderHintTransaction.cs" />
-    <Compile Include="BulkCopy\SpecialCharacterNames.cs" />
-    <Compile Include="BulkCopy\SqlGraphTables.cs" />
-    <Compile Include="BulkCopy\TableLock.cs" />
-    <Compile Include="BulkCopy\TestBulkCopyWithUTF8.cs" />
-    <Compile Include="BulkCopy\Transaction.cs" />
-    <Compile Include="BulkCopy\Transaction1.cs" />
-    <Compile Include="BulkCopy\Transaction2.cs" />
-    <Compile Include="BulkCopy\Transaction3.cs" />
-    <Compile Include="BulkCopy\Transaction4.cs" />
-    <Compile Include="BulkCopy\TransactionTestAsync.cs" />
-    <Compile Include="BulkCopy\WriteToServerTest.cs" />
-    <Compile Include="SQL\SqlDSEnumeratorTest\SqlDataSourceEnumeratorTest.cs" />
-  </ItemGroup>
-
-  <!-- Items to include in test set 3 -->
-  <ItemGroup Condition="$(NormalizedTestSet.Contains('3'))">
-    <Compile Include="DDBasics\DDAsyncTest\DDAsyncTest.cs" />
-    <Compile Include="DDBasics\DDDataTypesTest\DDDataTypesTest.cs" />
-    <Compile Include="DDBasics\DDMARSTest\DDMARSTest.cs" />
-    <Compile Include="ProviderAgnostic\MultipleResultsTest\MultipleResultsTest.cs" />
-    <Compile Include="ProviderAgnostic\ReaderTest\ReaderTest.cs" />
-    <Compile Include="SQL\AADFedAuthTokenRefreshTest\AADFedAuthTokenRefreshTest.cs" />
-    <Compile Include="SQL\Batch\BatchTests.cs" />
-    <Compile Include="SQL\ConnectionPoolTest\ConnectionPoolStressTest.cs" />
-    <Compile Include="SQL\ConnectionPoolTest\ConnectionPoolTest.cs" />
-    <Compile Include="SQL\ConnectionPoolTest\ConnectionPoolTest.Debug.cs" />
-    <Compile Include="SQL\ConnectionPoolTest\PoolBlockPeriodTest.cs" />
-    <Compile Include="SQL\ConnectionPoolTest\TransactionPoolTest.cs" />
-    <Compile Include="SQL\DataSourceParserTest\DataSourceParserTest.cs" />
-    <Compile Include="SQL\InstanceNameTest\InstanceNameTest.cs" />
-    <Compile Include="SQL\IntegratedAuthenticationTest\IntegratedAuthenticationTest.cs" />
-    <Compile Include="SQL\JsonTest\JsonBulkCopyTest.cs" />
-    <Compile Include="SQL\JsonTest\JsonStreamTest.cs" />
-    <Compile Include="SQL\JsonTest\JsonTest.cs" />
-    <Compile Include="SQL\KerberosTests\KerberosTest.cs" />
-    <Compile Include="SQL\KerberosTests\KerberosTicketManager\KerberosTicketManager.cs" />
-    <Compile Include="SQL\LocalDBTest\LocalDBTest.cs" />
-    <Compile Include="SQL\MARSSessionPoolingTest\MarsSessionPoolingTest.cs" />
-    <Compile Include="SQL\MARSTest\MARSTest.cs" />
-    <Compile Include="SQL\MirroringTest\ConnectionOnMirroringTest.cs" />
-    <Compile Include="SQL\ParallelTransactionsTest\ParallelTransactionsTest.cs" />
-    <Compile Include="SQL\ParameterTest\ParametersTest.cs" />
-    <Compile Include="SQL\ParameterTest\SqlAdapterUpdateBatch.cs" />
-    <Compile Include="SQL\ParameterTest\SteAttribute.cs" />
-    <Compile Include="SQL\ParameterTest\SteParam.cs" />
-    <Compile Include="SQL\ParameterTest\StePermutationSet.cs" />
-    <Compile Include="SQL\ParameterTest\SteTypeBoundaries.cs" />
-    <Compile Include="SQL\ParameterTest\StreamInputParam.cs" />
-    <Compile Include="SQL\ParameterTest\StreamInputParameterTests.cs" />
-    <Compile Include="SQL\ParameterTest\TvpColumnBoundariesTests.cs" />
-    <Compile Include="SQL\ParameterTest\TvpQueryHintsTests.cs" />
-    <Compile Include="SQL\ParameterTest\SqlVariantParameterTests.cs" />
-    <Compile Include="SQL\ParameterTest\DateTimeVariantTests.cs" />
-    <Compile Include="SQL\ParameterTest\OutputParameterTests.cs" />
-    <Compile Include="SQL\ParameterTest\TvpTest.cs" />
-    <Compile Include="SQL\SplitPacketTest\SplitPacketTest.cs" />
-    <Compile Include="SQL\SqlCommand\SqlCommandCancelTest.cs" />
-    <Compile Include="SQL\SqlCommand\SqlCommandCompletedTest.cs" />
-    <Compile Include="SQL\SqlCommand\SqlCommandExecuteScalarTest.cs" />
-    <Compile Include="SQL\SqlCommand\SqlCommandSetTest.cs" />
-    <Compile Include="SQL\SqlCredentialTest\SqlCredentialTest.cs" />
-    <Compile Include="SQL\SqlDependencyTest\SqlDependencyTest.cs" />
-    <Compile Include="SQL\SqlFileStreamTest\SqlFileStreamTest.cs" />
-    <Compile Include="SQL\SqlNamedPipesTest\SqlNamedPipesTest.cs" />
-    <Compile Include="SQL\SqlNotificationTest\SqlNotificationTest.cs" />
-    <Compile Include="SQL\SqlSchemaInfoTest\SqlSchemaInfoTest.cs" />
-    <Compile Include="SQL\SqlStatisticsTest\SqlStatisticsTest.cs" />
-    <Compile Include="SQL\TransactionTest\DistributedTransactionTest.cs" />
-    <Compile Include="SQL\TransactionTest\TransactionEnlistmentTest.cs" />
-    <Compile Include="SQL\TransactionTest\TransactionTest.cs" />
-    <Compile Include="SQL\UdtTest\SqlServerTypesTest.cs" />
-    <Compile Include="SQL\UdtTest\UdtBulkCopyTest.cs" />
-    <Compile Include="SQL\UdtTest\UdtDateTimeOffsetTest.cs" />
-    <Compile Include="SQL\UdtTest\UdtTest.cs" />
-    <Compile Include="SQL\UdtTest\UdtTest2.cs" />
-    <Compile Include="SQL\UdtTest\UdtTestHelpers.cs" />
-    <Compile Include="SQL\Utf8SupportTest\Utf8SupportTest.cs" />
-    <Compile Include="SQL\VectorTest\Float16VectorTypeBackwardCompatibilityTests.cs" />
-    <Compile Include="SQL\VectorTest\NativeVectorFloat32Tests.cs" />
-    <Compile Include="SQL\VectorTest\VectorAPIValidationTest.cs" />
-    <Compile Include="SQL\VectorTest\VectorBackwardCompatTestBase.cs" />
-    <Compile Include="SQL\VectorTest\VectorTypeBackwardCompatibilityTests.cs" />
-    <Compile Include="SQL\WeakRefTest\WeakRefTest.cs" />
-    <Compile Include="SQL\WeakRefTestYukonSpecific\WeakRefTestYukonSpecific.cs" />
-    <Compile Include="TracingTests\DiagnosticTest.cs" />
-    <Compile Include="TracingTests\EventSourceTest.cs" />
-    <Compile Include="TracingTests\FakeDiagnosticListenerObserver.cs" />
-    <Compile Include="TracingTests\MetricsTest.cs" />
-    <Compile Include="TracingTests\XEventsTracingTest.cs" />
-
-    <!-- Resource files -->
-    <!-- @TODO: Move these into some folder or a resx or something -->
-    <Content Include="DDDataTypesTest_Data.xml"
-             CopyToOutputDirectory="PreserveNewest" />
-
     <!-- Baseline files for individual test groups -->
     <Content Include="SQL\ParameterTest\StreamInputParameter_DebugMode.bsl">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -276,53 +36,28 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>TvpColumnBoundaries_Azure.bsl</Link>
     </Content>
-  </ItemGroup>
+    <Content Include="DDDataTypesTest_Data.xml"
+             CopyToOutputDirectory="PreserveNewest" />
 
-  <!-- Items to include in AE test set -->
-  <ItemGroup Condition="$(NormalizedTestSet.Contains('ae'))">
-    <Compile Include="AlwaysEncrypted\AKVTests.cs" />
-    <Compile Include="AlwaysEncrypted\AKVUnitTests.cs" />
-    <Compile Include="AlwaysEncrypted\ApiShould.cs" />
-    <Compile Include="AlwaysEncrypted\BulkCopyAE.cs" />
-    <Compile Include="AlwaysEncrypted\BulkCopyAEErrorMessage.cs" />
-    <Compile Include="AlwaysEncrypted\ColumnDecryptErrorTests.cs" />
-    <Compile Include="AlwaysEncrypted\ConversionTests.cs" />
-    <Compile Include="AlwaysEncrypted\CspProviderExt.cs" />
-    <Compile Include="AlwaysEncrypted\DateOnlyReadTests.netcore.cs" />
-    <Compile Include="AlwaysEncrypted\EnclaveAzureDatabaseTests.cs" />
-    <Compile Include="AlwaysEncrypted\End2EndSmokeTests.cs" />
-    <Compile Include="AlwaysEncrypted\ExceptionsGenericError.cs" />
-    <Compile Include="AlwaysEncrypted\ExceptionTestAKVStore.cs" />
-    <Compile Include="AlwaysEncrypted\SqlBulkCopyTruncation.cs" />
-    <Compile Include="AlwaysEncrypted\SqlNullValues.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\AzureKeyVaultKeyFixture.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\DatabaseHelper.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\AkvColumnMasterKey.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\AKVTestTable.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\ApiTestTable.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\BulkCopyAEErrorMessageTestTable.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\BulkCopyAETestTable.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\BulkCopyTruncationTables.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\CertificateUtility.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\ColumnDecryptErrorTestTable.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\ColumnEncryptionKey.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\ColumnMasterKey.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\CspColumnMasterKey.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\CspProviderColumnMasterKey.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\DateOnlyTestTable.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\DbObject.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\DummyKeyStoreProvider.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\DummyProviderMasterKey.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\ICreatable.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\IDroppable.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\SqlNullValuesTable.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\SqlParameterPropertiesTable.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\Setup\Table.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\SQLSetupStrategy.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\SQLSetupStrategyAzureKeyVault.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\SqlSetupStrategyCspProvider.cs" />
-    <Compile Include="AlwaysEncrypted\TestFixtures\SQLSetupStrategyCertStoreProvider.cs" />
-    <Compile Include="AlwaysEncrypted\TestTrustedMasterKeyPaths.cs" />
+    <!-- Certificate stuff for AE tests -->
+    <None Update="makepfxcert.ps1"
+          CopyToOutputDirectory="PreserveNewest" />
+    <None Update="mismatchedcert.cer"
+          CopyToOutputDirectory="PreserveNewest" />
+    <None Update="removecert.ps1"
+          CopyToOutputDirectory="PreserveNewest" />
+    <None Update="SQL\ConnectionTestWithSSLCert\GenerateSelfSignedCertificate.ps1"
+          CopyToOutputDirectory="Always" />
+
+    <!-- Runner/Code coverage settings from TestUtilities project -->
+    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>xunit.runner.json</Link>
+    </None>
+    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>CodeCoverage.runsettings</Link>
+    </None>
   </ItemGroup>
 
   <!-- References ====================================================== -->
@@ -370,12 +105,12 @@
     <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
     <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
 
-    <ProjectReference Include="SQL/UdtTest/UDTs/Address/Address.csproj" />
-    <ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
-    <ProjectReference Include="SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
-    <ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
@@ -397,11 +132,11 @@
     <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
     <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
 
-    <ProjectReference Include="SQL/UdtTest/UDTs/Address/Address.csproj" />
-    <ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
-    <ProjectReference Include="SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
-    <ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs
index bf1551373b..a04d8df76a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/MultipleResultsTest/MultipleResultsTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class MultipleResultsTest
     {
         private const string ResultSet1_Message = "0";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs
index 50e2b9253c..0743e8fad9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/ProviderAgnostic/ReaderTest/ReaderTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class ReaderTest
     {
         // TODO Synapse: Remove dependency from Northwind database
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AADFedAuthTokenRefreshTest/AADFedAuthTokenRefreshTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AADFedAuthTokenRefreshTest/AADFedAuthTokenRefreshTest.cs
index e99192732d..e5616776b1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AADFedAuthTokenRefreshTest/AADFedAuthTokenRefreshTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AADFedAuthTokenRefreshTest/AADFedAuthTokenRefreshTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class AADFedAuthTokenRefreshTest
     {
         private readonly ITestOutputHelper _testOutputHelper;
@@ -31,7 +32,7 @@ public void FedAuthTokenRefreshTest()
                 #pragma warning disable 0618 // Type or member is obsolete
                 SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, new UsernamePasswordProvider(DataTestUtility.ApplicationClientId));
                 #pragma warning restore 0618 // Type or member is obsolete
- 
+
                 string connectionString = DataTestUtility.AADPasswordConnectionString;
 
                 using SqlConnection connection = new SqlConnection(connectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
index 798890c3fa..960f3ee822 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -15,6 +15,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class AdapterTest
     {
         private char[] _appendNewLineIndentBuffer = new char[0];
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs
index 26f65b6fae..6fa45147da 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncCancelledConnectionsTest.cs
@@ -61,6 +61,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     /// pool-timeout failures on otherwise healthy runs.
     /// </para>
     /// </summary>
+    [Trait("Set", "1")]
     public class AsyncCancelledConnectionsTest
     {
         /// <summary>
@@ -330,7 +331,7 @@ private async Task TimeBombAsync(SqlCommand command)
                 delayMs = _random.Next(100, 3000);
             }
             await Task.Delay(delayMs);
-            
+
             // Cancel the command
             command.Cancel();
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs
index bc514dce92..1c0abdc5d7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs
@@ -13,6 +13,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "1")]
     public static class AsyncTimeoutTest
     {
         static string delayQuery2s = "WAITFOR DELAY '00:00:02'";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs
index cdf89fbac1..131d2f38f3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecAsyncTest.cs
@@ -7,6 +7,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "1")]
     public static class BeginExecAsyncTest
     {
         private static string GenerateCommandText()
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecReaderAsyncTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecReaderAsyncTest.cs
index daa58b1851..65eeec5229 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecReaderAsyncTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/BeginExecReaderAsyncTest.cs
@@ -7,6 +7,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "1")]
     public static class BeginExecReaderAsyncTest
     {
         private static string GenerateCommandText()
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs
index 8be5437b9f..780edfa8bf 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/XmlReaderAsyncTest.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "1")]
     public static class XmlReaderAsyncTest
     {
         private const string CommandText =
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
index 991d55cdeb..01d54f2462 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class BatchTests
     {
 
@@ -379,8 +380,8 @@ public static void ParameterInOutAndReturn()
         {
             string create =
                 @"
-CREATE PROCEDURE TestInAndOutParams 
-	@Input int, 
+CREATE PROCEDURE TestInAndOutParams
+	@Input int,
 	@InOut int OUTPUT,
 	@Output int = default OUTPUT
 AS
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConfigurableIpPreferenceTest/ConfigurableIpPreferenceTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConfigurableIpPreferenceTest/ConfigurableIpPreferenceTest.cs
index 160f7f550e..92db4f1101 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConfigurableIpPreferenceTest/ConfigurableIpPreferenceTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConfigurableIpPreferenceTest/ConfigurableIpPreferenceTest.cs
@@ -18,6 +18,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class ConfigurableIpPreferenceTest
     {
         private const string CnnPrefIPv6 = ";IPAddressPreference=IPv6First";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolStressTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolStressTest.cs
index d3d41d4c9a..e843e108be 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolStressTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolStressTest.cs
@@ -19,6 +19,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     /// <summary>
     /// Connection pool stress test to validate pool behavior under various concurrent load scenarios.
     /// </summary>
+    [Trait("Set", "3")]
     public class ConnectionPoolStressTest
     {
         #region Properties
@@ -111,7 +112,7 @@ private bool DoomMicrosoftDataConnection(SqlConnection connection)
         #region Configuration
 
         /// <summary>
-        /// Sets up connection string 
+        /// Sets up connection string
         /// </summary>
         /// <param name="connectionString">Connection string to be set.</param>
         internal void SetConnectionString(string connectionString)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.Debug.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.Debug.cs
index 130ef02934..b2ad4f6fd1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.Debug.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.Debug.cs
@@ -18,6 +18,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     // xUnit won't run tests in an abstract class.
     //
     // public static class ConnectionPoolTestDebug
+    [Trait("Set", "3")]
     public abstract class ConnectionPoolTestDebug
     {
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsUsingManagedSNI))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
index 0d9b076dd2..4b63ff655f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -15,7 +15,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     public class ConnectionPoolConnectionStringProvider : IEnumerable<object[]>
     {
         private static readonly string _TCPConnectionString = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) {
-            MultipleActiveResultSets = false, 
+            MultipleActiveResultSets = false,
             Pooling = true}.ConnectionString;
         private static readonly string _tcpMarsConnStr = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) {
             MultipleActiveResultSets = true,
@@ -57,6 +57,7 @@ public IEnumerator<object[]> GetEnumerator()
     }
 
     // TODO Synapse: Fix these tests for Azure Synapse.
+    [Trait("Set", "3")]
     public static class ConnectionPoolTest
     {
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
index 6d14f6fbd8..84f779cf96 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
@@ -7,6 +7,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class PoolBlockPeriodTest
     {
         private const string AzureEndpointSample = "nonexistent.database.windows.net";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs
index 6e358cc63a..96432c8bd6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs
@@ -8,11 +8,12 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp)]
     public static class TransactionPoolTest
     {
         /// <summary>
-        /// Tests if connections in a distributed transaction are put into a transaction pool. Also checks that clearallpools 
+        /// Tests if connections in a distributed transaction are put into a transaction pool. Also checks that clearallpools
         /// does not clear transaction connections and that the transaction root is put into "stasis" when closed
         /// Synapse: only supports local transaction request.
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs
index 32780dcfe6..36dda08cb2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTest.cs
@@ -18,6 +18,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "1")]
     [PlatformSpecific(TestPlatforms.Windows)]
     public class CertificateTest : IDisposable
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs
index bb1bb8b5f2..828a87d63e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs
@@ -19,6 +19,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "1")]
     public class CertificateTestWithTdsServer : IDisposable
     {
         private static readonly string s_fullPathToPowershellScript = Path.Combine(Directory.GetCurrentDirectory(), "makepfxcert.ps1");
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs
index 3c68e6dafd..b60b4a1e9e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class AADConnectionTest
     {
         private static void ConnectAndDisconnect(string connectionString, SqlCredential credential = null)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectionBehaviorTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectionBehaviorTest.cs
index 5b108400b0..2df2ddcd51 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectionBehaviorTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectionBehaviorTest.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class ConnectionBehaviorTest
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs
index 28955b39ff..fbbee8db26 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -12,6 +12,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public static class ConnectivityTest
     {
         private const string COL_SPID = "SPID";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/TcpDefaultForAzureTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/TcpDefaultForAzureTest.cs
index f8271dfdc4..1ee593279b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/TcpDefaultForAzureTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/TcpDefaultForAzureTest.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     [OuterLoop("Takes minutes on some networks")]
     public static class TcpDefaultForAzureTest
     {
@@ -35,7 +36,7 @@ static TcpDefaultForAzureTest()
 
         // Synapse: Named Pipes not supported for Azure Synapse
         //          Expected protocol TCP Provider in the error message, but received: A network-related or instance-specific error occurred while establishing a connection to SQL Server.
-        //          The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections. 
+        //          The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections.
         //          (provider: Named Pipes Provider, error: 40 - Could not open a connection to SQL Server)
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [PlatformSpecific(TestPlatforms.Windows)]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs
index a23efff073..555005618a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,14 +10,15 @@
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
 
+    [Trait("Set", "2")]
     public class DNSCachingTest
     {
         public static Assembly systemData = Assembly.GetAssembly(typeof(SqlConnection));
         public static Type SQLFallbackDNSCacheType = systemData.GetType("Microsoft.Data.SqlClient.SQLFallbackDNSCache");
         public static Type SQLDNSInfoType = systemData.GetType("Microsoft.Data.SqlClient.SQLDNSInfo");
         public static MethodInfo SQLFallbackDNSCacheGetDNSInfo = SQLFallbackDNSCacheType.GetMethod("GetDNSInfo", BindingFlags.Instance | BindingFlags.NonPublic);
-        
-        
+
+
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsDNSCachingSetup))]
         public void DNSCachingIsSupportedFlag()
         {
@@ -37,21 +38,21 @@ public void DNSCachingIsSupportedFlag()
                 Assert.Equal(expectedDNSCachingSupportedTR, isSupportedStateTR);
             }
         }
-        
+
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsDNSCachingSetup))]
         public void DNSCachingGetDNSInfo()
-        {            
+        {
             using(SqlConnection connection = new SqlConnection(DataTestUtility.DNSCachingConnString))
             {
                 connection.Open();
             }
 
             var SQLFallbackDNSCacheInstance = SQLFallbackDNSCacheType.GetProperty("Instance", BindingFlags.Static | BindingFlags.Public).GetValue(null);
-            
+
             var serverList = new List<KeyValuePair<string, bool>>();
             serverList.Add(new KeyValuePair<string, bool>(DataTestUtility.DNSCachingServerCR, DataTestUtility.IsDNSCachingSupportedCR));
             serverList.Add(new KeyValuePair<string, bool>(DataTestUtility.DNSCachingServerTR, DataTestUtility.IsDNSCachingSupportedTR));
-            
+
             foreach(var server in serverList)
             {
                 object[] parameters;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs
index 028447251c..0589cd8844 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataBaseSchemaTest/ConnectionSchemaTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public static class ConnectionSchemaTest
     {
         public static bool CanRunSchemaTests()
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs
index ce5174b6ca..b2322baa92 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataClassificationTest/DataClassificationTest.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public static class DataClassificationTest
     {
         private static string s_tableName;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderCancellationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderCancellationTest.cs
index 5199922174..4b0ef2e8a1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderCancellationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderCancellationTest.cs
@@ -9,12 +9,13 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class DataReaderCancellationTest
     {
         /// <summary>
         /// Test ensures cancellation token is registered before ReadAsync starts processing results from TDS Stream,
         /// such that when Cancel is triggered, the token is capable of canceling reading further results.
-        /// Synapse: Incompatible query. 
+        /// Synapse: Incompatible query.
         /// </summary>
         /// <returns>Async Task</returns>
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs
index 380978f049..cf85112559 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderStreamsTest.cs
@@ -14,6 +14,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public static class DataReaderStreamsTest
     {
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
index aad117b336..2a2132dbcb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -19,6 +19,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public static class DataReaderTest
     {
         private static readonly object s_rowVersionLock = new();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataSourceParserTest/DataSourceParserTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataSourceParserTest/DataSourceParserTest.cs
index 38d4685537..976260e98c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataSourceParserTest/DataSourceParserTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataSourceParserTest/DataSourceParserTest.cs
@@ -6,6 +6,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.DataSourceParserTest
 {
+    [Trait("Set", "3")]
     public class DataSourceParserTest
     {
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotAzureSynapse))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
index a49e14de6e..17c760ace9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -18,6 +18,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class DataStreamTest
     {
         private readonly string _testName;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DateTimeTest/DateTimeTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DateTimeTest/DateTimeTest.cs
index b313d89e24..0867164cff 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DateTimeTest/DateTimeTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DateTimeTest/DateTimeTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public static class DateTimeTest
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs
index c44ed97ed0..2d5162bcb2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ConnectionExceptionTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class ConnectionExceptionTest
     {
         // test connection string
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs
index 4179b7bf4b..81dbd0e35d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ExceptionTest/ExceptionTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -12,6 +12,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public static class ExceptionTest
     {
         // data value and server consts
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
index 4612145331..437e02c579 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -13,6 +13,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class InstanceNameTest
     {
         private const char SemicolonSeparator = ';';
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs
index 5342448af5..69acede640 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/IntegratedAuthenticationTest/IntegratedAuthenticationTest.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class IntegratedAuthenticationTest
     {
         private static bool IsIntegratedSecurityEnvironmentSet() => DataTestUtility.IsIntegratedSecuritySetup();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
index 06b76c7ed4..e9ad8be557 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
@@ -15,6 +15,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.JsonTest
 {
+    [Trait("Set", "3")]
     public class JsonBulkCopyTest
     {
         private readonly ITestOutputHelper _output;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
index 3cb0f1b534..eef2902932 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
@@ -18,6 +18,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class JsonRecord
     {
         public int Id { get; set; }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
index 2b2fd2c8db..887482ed95 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTest.cs
@@ -15,6 +15,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class JsonTest
     {
         private const string JsonDataString = "[{\"name\":\"Dave\",\"skills\":[\"Python\"]},{\"name\":\"Ron\",\"surname\":\"Peter\"}]";
@@ -96,7 +97,7 @@ public void TestJsonWrite()
             int rowsAffected = command.ExecuteNonQuery();
             ValidateRowsAffected(rowsAffected);
 
-            //Test 2 
+            //Test 2
             //Write a SqlString type as json
             parameter.Value = new SqlString(JsonDataString);
             int rowsAffected2 = command.ExecuteNonQuery();
@@ -141,7 +142,7 @@ public async Task TestJsonWriteAsync()
             int rowsAffected = await command.ExecuteNonQueryAsync();
             ValidateRowsAffected(rowsAffected);
 
-            //Test 2 
+            //Test 2
             //Write a SqlString type as json
             parameter.Value = new SqlString(JsonDataString);
             int rowsAffected2 = await command.ExecuteNonQueryAsync();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs
index c6026088f4..e7d22907e0 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class KerberosTests
     {
         [PlatformSpecific(TestPlatforms.AnyUnix)]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs
index c3aed471c0..f1fc1bb1a3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/LocalDBTest/LocalDBTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 using System;
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class LocalDBTest
     {
         private enum InfoType
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
index 14b5ab54c4..e84c9fabb6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -13,6 +13,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class MarsSessionPoolingTest
     {
         private const int ConcurrentCommands = 5;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs
index 1213c5bfa4..a067ad841a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSTest/MARSTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -12,6 +12,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class MARSTest
     {
         private static readonly string _connStr = (new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { MultipleActiveResultSets = true }).ConnectionString;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MirroringTest/ConnectionOnMirroringTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MirroringTest/ConnectionOnMirroringTest.cs
index 460d566a6d..15495d00b0 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MirroringTest/ConnectionOnMirroringTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MirroringTest/ConnectionOnMirroringTest.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class ConnectionOnMirroringTest
     {
         private static ManualResetEvent workerCompletedEvent = new ManualResetEvent(false);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs
index 73fbd8bdc6..6f3f74fe4e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -7,6 +7,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class ParallelTransactionsTest
     {
         #region <<Basic Parallel Test>>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
index ec9f516260..05a01788c3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -51,16 +51,17 @@ public TestResult(object value, string baseTypeName)
     /// <summary>
     /// Tests for DateTime variant parameters with different date/time types.
     /// </summary>
+    [Trait("Set", "3")]
     [Trait("Category", "flaky")]
     public class DateTimeVariantTests
     {
         private static void RunTest(
             TestVariations tag,
             Func<object, string, string, TestResult> action,
-            object paramValue, 
-            string expectedBaseTypeName, 
-            string connStr, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            string connStr,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -127,9 +128,9 @@ private static void xsql(SqlConnection conn, string sql)
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void TestSimpleParameter_Type(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -152,10 +153,10 @@ public void TestSimpleParameter_Type(
                         return new TestResult(dr[0], dr.GetString(1));
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -163,9 +164,9 @@ public void TestSimpleParameter_Type(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void TestSimpleParameter_Variant(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -188,10 +189,10 @@ public void TestSimpleParameter_Variant(
                         return new TestResult(dr[0], dr.GetString(1));
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -199,9 +200,9 @@ public void TestSimpleParameter_Variant(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void TestSqlDataRecordParameterToTVP_Type(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -231,10 +232,10 @@ public void TestSqlDataRecordParameterToTVP_Type(
                         return new TestResult(dr[0], dr.GetString(1));
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -242,9 +243,9 @@ public void TestSqlDataRecordParameterToTVP_Type(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void TestSqlDataRecordParameterToTVP_Variant(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -274,10 +275,10 @@ public void TestSqlDataRecordParameterToTVP_Variant(
                         return new TestResult(dr[0], dr.GetString(1));
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -285,9 +286,9 @@ public void TestSqlDataRecordParameterToTVP_Variant(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void TestSqlDataReaderParameterToTVP_Type(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -320,10 +321,10 @@ public void TestSqlDataReaderParameterToTVP_Type(
                         }
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -331,9 +332,9 @@ public void TestSqlDataReaderParameterToTVP_Type(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void TestSqlDataReaderParameterToTVP_Variant(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -368,10 +369,10 @@ public void TestSqlDataReaderParameterToTVP_Variant(
                         }
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -379,9 +380,9 @@ public void TestSqlDataReaderParameterToTVP_Variant(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void TestSqlDataReader_TVP_Type(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -437,10 +438,10 @@ public void TestSqlDataReader_TVP_Type(
                         }
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -448,9 +449,9 @@ public void TestSqlDataReader_TVP_Type(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void TestSqlDataReader_TVP_Variant(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -506,10 +507,10 @@ public void TestSqlDataReader_TVP_Variant(
                         }
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -517,9 +518,9 @@ public void TestSqlDataReader_TVP_Variant(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void TestSimpleDataReader_Type(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -557,10 +558,10 @@ public void TestSimpleDataReader_Type(
                         return new TestResult(dr[0], dr.GetString(1));
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -568,9 +569,9 @@ public void TestSimpleDataReader_Type(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void TestSimpleDataReader_Variant(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -608,10 +609,10 @@ public void TestSimpleDataReader_Variant(
                         return new TestResult(dr[0], dr.GetString(1));
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -619,9 +620,9 @@ public void TestSimpleDataReader_Variant(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void SqlBulkCopySqlDataReader_Type(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -675,10 +676,10 @@ public void SqlBulkCopySqlDataReader_Type(
                         }
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -686,9 +687,9 @@ public void SqlBulkCopySqlDataReader_Type(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void SqlBulkCopySqlDataReader_Variant(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -746,10 +747,10 @@ public void SqlBulkCopySqlDataReader_Variant(
                         }
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -757,9 +758,9 @@ public void SqlBulkCopySqlDataReader_Variant(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void SqlBulkCopyDataTable_Type(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -795,10 +796,10 @@ public void SqlBulkCopyDataTable_Type(
                         return new TestResult(drVerify[0], drVerify.GetString(1));
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -806,9 +807,9 @@ public void SqlBulkCopyDataTable_Type(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void SqlBulkCopyDataTable_Variant(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -844,10 +845,10 @@ public void SqlBulkCopyDataTable_Variant(
                         return new TestResult(drVerify[0], drVerify.GetString(1));
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -855,9 +856,9 @@ public void SqlBulkCopyDataTable_Variant(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void SqlBulkCopyDataRow_Type(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -888,10 +889,10 @@ public void SqlBulkCopyDataRow_Type(
                         return new TestResult(drVerify[0], drVerify.GetString(1));
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -899,9 +900,9 @@ public void SqlBulkCopyDataRow_Type(
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(GetParameterCombinations), DisableDiscoveryEnumeration = true)]
         public void SqlBulkCopyDataRow_Variant(
-            object paramValue, 
-            string expectedBaseTypeName, 
-            Dictionary<TestVariations, ExceptionChecker> expectedExceptions, 
+            object paramValue,
+            string expectedBaseTypeName,
+            Dictionary<TestVariations, ExceptionChecker> expectedExceptions,
             Dictionary<TestVariations, object> expectedValueOverrides,
             Dictionary<TestVariations, string> expectedBaseTypeOverrides)
         {
@@ -932,10 +933,10 @@ public void SqlBulkCopyDataRow_Variant(
                         return new TestResult(drVerify[0], drVerify.GetString(1));
                     }
                 },
-                paramValue, 
-                expectedBaseTypeName, 
-                DataTestUtility.TCPConnectionString, 
-                expectedExceptions, 
+                paramValue,
+                expectedBaseTypeName,
+                DataTestUtility.TCPConnectionString,
+                expectedExceptions,
                 expectedValueOverrides,
                 expectedBaseTypeOverrides);
         }
@@ -954,11 +955,11 @@ public static IEnumerable<object[]> GetParameterCombinations()
                     { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
                     { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
                     { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
-                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, 
-                new Dictionary<TestVariations, object>(), 
+                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }},
+                new Dictionary<TestVariations, object>(),
                 new Dictionary<TestVariations, string>()};
-            yield return new object[] { DateTime.MaxValue, "date", 
-                new Dictionary<TestVariations, ExceptionChecker>(), 
+            yield return new object[] { DateTime.MaxValue, "date",
+                new Dictionary<TestVariations, ExceptionChecker>(),
                 new Dictionary<TestVariations, object>
                 {
                     { TestVariations.TestSimpleParameter_Type, new DateTime(3155378112000000000) },
@@ -993,10 +994,10 @@ public static IEnumerable<object[]> GetParameterCombinations()
                     { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
                     { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
                     { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
-                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, 
+                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }},
                 new Dictionary<TestVariations, object>(),
                 new Dictionary<TestVariations, string>()};
-            yield return new object[] { DateTime.MaxValue, "datetime2", 
+            yield return new object[] { DateTime.MaxValue, "datetime2",
                 new Dictionary<TestVariations, ExceptionChecker>(),
                 new Dictionary<TestVariations, object> {
                     {TestVariations.TestSimpleParameter_Variant, new DateTime(3155378975999970000)},
@@ -1013,8 +1014,8 @@ public static IEnumerable<object[]> GetParameterCombinations()
                     {TestVariations.SqlBulkCopyDataTable_Variant, "datetime"},
                     {TestVariations.SqlBulkCopyDataRow_Variant, "datetime"}
                 }};
-            yield return new object[] { DateTime.MinValue, "datetime", 
-                new Dictionary<TestVariations, ExceptionChecker> { 
+            yield return new object[] { DateTime.MinValue, "datetime",
+                new Dictionary<TestVariations, ExceptionChecker> {
                     { TestVariations.TestSimpleParameter_Type, SqlDateTimeOverflow },
                     { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
                     { TestVariations.TestSqlDataRecordParameterToTVP_Type, SqlDateTimeOverflow },
@@ -1026,21 +1027,21 @@ public static IEnumerable<object[]> GetParameterCombinations()
                     { TestVariations.TestSimpleDataReader_Type, VarcharToDateTimeOutOfRange},
                     { TestVariations.TestSimpleDataReader_Variant, VarcharToDateTimeOutOfRange},
                     { TestVariations.SqlBulkCopySqlDataReader_Type, VarcharToDateTimeOutOfRange},
-                    { TestVariations.SqlBulkCopySqlDataReader_Variant, VarcharToDateTimeOutOfRange}, 
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, VarcharToDateTimeOutOfRange},
                     { TestVariations.SqlBulkCopyDataTable_Type, SqlDateTimeOverflow},
                     { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow},
                     { TestVariations.SqlBulkCopyDataRow_Type, SqlDateTimeOverflow},
                     { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow}},
                 new Dictionary<TestVariations, object>(),
                 new Dictionary<TestVariations, string>()};
-            yield return new object[] { DateTime.MaxValue, "datetime", 
-                new Dictionary<TestVariations, ExceptionChecker> { 
+            yield return new object[] { DateTime.MaxValue, "datetime",
+                new Dictionary<TestVariations, ExceptionChecker> {
                     { TestVariations.TestSqlDataReader_TVP_Type, CannotConvertCharacterStringToDateOrTime},
                     { TestVariations.TestSqlDataReader_TVP_Variant, CannotConvertCharacterStringToDateOrTime},
                     { TestVariations.TestSimpleDataReader_Type, CannotConvertCharacterStringToDateOrTime},
                     { TestVariations.TestSimpleDataReader_Variant, CannotConvertCharacterStringToDateOrTime},
                     { TestVariations.SqlBulkCopySqlDataReader_Type, CannotConvertCharacterStringToDateOrTime},
-                    { TestVariations.SqlBulkCopySqlDataReader_Variant, CannotConvertCharacterStringToDateOrTime}}, 
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, CannotConvertCharacterStringToDateOrTime}},
                 new Dictionary<TestVariations, object>
                 {
                     { TestVariations.TestSimpleParameter_Type, new DateTime(3155378975999970000) },
@@ -1123,7 +1124,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
                     { TestVariations.SqlBulkCopySqlDataReader_Type, ConversionFailedCharStringToSmallDateTime },
                     { TestVariations.SqlBulkCopySqlDataReader_Variant, ConversionFailedCharStringToSmallDateTime },
                     { TestVariations.SqlBulkCopyDataTable_Type, UnRepresentableDateTime },
-                    { TestVariations.SqlBulkCopyDataRow_Type, UnRepresentableDateTime }}, 
+                    { TestVariations.SqlBulkCopyDataRow_Type, UnRepresentableDateTime }},
                 new Dictionary<TestVariations, object> {
                     { TestVariations.TestSimpleParameter_Variant, new DateTime(3155378975999970000) },
                     { TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(3155378975999970000) },
@@ -1181,7 +1182,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
                 new Dictionary<TestVariations, object>(),
                 new Dictionary<TestVariations, string>()};
             yield return new object[] { DateTime.MinValue, "time",
-                new Dictionary<TestVariations, ExceptionChecker> { 
+                new Dictionary<TestVariations, ExceptionChecker> {
                     { TestVariations.SqlBulkCopyDataTable_Type, CannotConvertMinDateTimeToTime},
                     { TestVariations.SqlBulkCopyDataRow_Type, CannotConvertMinDateTimeToTime},
                     { TestVariations.TestSimpleParameter_Type, InvalidCastDateTimeToTimeSpan },
@@ -1197,7 +1198,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
                     { TestVariations.SqlBulkCopySqlDataReader_Type, InvalidCastNotValid },
                     { TestVariations.SqlBulkCopySqlDataReader_Variant, InvalidCastNotValid },
                     { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
-                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }}, 
+                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }},
                 new Dictionary<TestVariations, object> {
                     {TestVariations.SqlBulkCopySqlDataReader_Type, TimeSpan.Zero},
                     {TestVariations.SqlBulkCopySqlDataReader_Variant, TimeSpan.Zero},
@@ -1208,7 +1209,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
                 },
                 new Dictionary<TestVariations, string>()};
             yield return new object[] { DateTime.MaxValue, "time",
-                new Dictionary<TestVariations, ExceptionChecker> { 
+                new Dictionary<TestVariations, ExceptionChecker> {
                     { TestVariations.SqlBulkCopyDataTable_Type, CannotConvertMaxDateTimeToTime },
                     { TestVariations.SqlBulkCopyDataRow_Type, CannotConvertMaxDateTimeToTime },
                     { TestVariations.TestSimpleParameter_Type, InvalidCastDateTimeToTimeSpan },
@@ -1219,7 +1220,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
                     { TestVariations.TestSimpleDataReader_Type, InvalidCastNotValid },
                     { TestVariations.TestSimpleDataReader_Variant, InvalidCastNotValid },
                     { TestVariations.SqlBulkCopySqlDataReader_Type, InvalidCastNotValid },
-                    { TestVariations.SqlBulkCopySqlDataReader_Variant, InvalidCastNotValid }}, 
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, InvalidCastNotValid }},
                 new Dictionary<TestVariations, object> {
                     {TestVariations.TestSqlDataReader_TVP_Variant, TimeSpan.Parse("23:59:59.9999999")},
                     {TestVariations.SqlBulkCopySqlDataReader_Type, TimeSpan.Parse("23:59:59.9999999")},
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs
index 537313792e..8b0322b559 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     /// <summary>
     /// Tests for output parameters.
     /// </summary>
+    [Trait("Set", "3")]
     public class OutputParameterTests
     {
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
index 782ef68ca8..95d3736d9a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -23,6 +23,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class ParametersTest
     {
         private static readonly string s_connString = DataTestUtility.TCPConnectionString;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs
index aa59bc319c..67a9ddb92e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlAdapterUpdateBatch.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class SqlAdapterUpdateBatch
     {
         // TODO Synapse: Incorrect syntax near 'IF'.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
index 5f47576baa..0f81496d65 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -17,6 +17,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     /// Tests for SQL Variant parameters.
     /// Tests all SqlTypes inside sql_variant to server using sql_variant parameter, SqlBulkCopy, and TVP parameter.
     /// </summary>
+    [Trait("Set", "3")]
     public sealed class SqlVariantParameterTests : IDisposable
     {
         private readonly string _connStr;
@@ -31,7 +32,7 @@ public SqlVariantParameterTests()
             // which uses CultureInfo.CurrentCulture.LCID. On Linux, this LCID is 127
             // (InvariantCulture), which is not a valid SQL Server collation and causes
             // "invalid TDS collation" errors in the TVP code path.
-            // SqlClient doesn't support invariant mode: 
+            // SqlClient doesn't support invariant mode:
             // https://github.com/dotnet/SqlClient/issues/3742
             _previousCulture = Thread.CurrentThread.CurrentCulture;
             Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs
index e6d9284dff..5e8bfa5841 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -15,6 +15,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     /// Tests for stream input parameters (binary streams, text readers, XML).
     /// These tests run independently with their own baseline comparison.
     /// </summary>
+    [Trait("Set", "3")]
     [Collection("ParameterBaselineTests")]
     public class StreamInputParameterTests
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs
index e8396e2cf6..81851902a5 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -15,6 +15,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     /// Tests for TVP column boundaries with various data types.
     /// These tests run independently with their own baseline comparison.
     /// </summary>
+    [Trait("Set", "3")]
     [Collection("ParameterBaselineTests")]
     public class TvpColumnBoundariesTests
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs
index 62df3f2c27..545a19a165 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     /// <summary>
     /// Tests for TVP query hints (sort order, uniqueness, default columns).
     /// </summary>
+    [Trait("Set", "3")]
     public sealed class TvpQueryHintsTests : IDisposable
     {
         private readonly SqlConnection _conn;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs
index 5c0459b687..a8baee786c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -21,6 +21,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class TvpTest
     {
         private const string TvpName = "@tvp";
@@ -863,7 +864,7 @@ private void CreateServerObjects(StePermutation tvpPerm)
             SqlCommand cmd = new(tsql.ToString(), conn);
             cmd.ExecuteNonQuery();
 
-            // and create the proc that uses the type            
+            // and create the proc that uses the type
             cmd.CommandText = string.Format("CREATE PROC {0}(@tvp {1} READONLY) AS SELECT * FROM @tvp order by {2}",
                     GetProcName(tvpPerm), GetTypeName(tvpPerm), colOrdinal - 1);
             cmd.ExecuteNonQuery();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RandomStressTest/RandomStressTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RandomStressTest/RandomStressTest.cs
index 99d606322c..d04753ec1b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RandomStressTest/RandomStressTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RandomStressTest/RandomStressTest.cs
@@ -13,6 +13,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class RandomStressTest : IDisposable
     {
         private static readonly TimeSpan TimeLimitDefault = new TimeSpan(0, 0, 10);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicCounterTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicCounterTest.cs
index 4b1b7add4d..9d90459696 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicCounterTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicCounterTest.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class RetryLogicCounterTest
     {
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicTestHelper.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicTestHelper.cs
index 5c2aef92eb..225b1430b6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicTestHelper.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/RetryLogicTestHelper.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class RetryLogicTestHelper
     {
         private static readonly HashSet<int> s_defaultTransientErrors =
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs
index a0b00a9bee..911b90ec5b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs
@@ -12,6 +12,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class SqlCommandReliabilityTest : IDisposable
     {
         private const int ConcurrentParallelExecutions = 3;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConfigurationManagerReliabilityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConfigurationManagerReliabilityTest.cs
index bcb221ff30..8ffbbdb5bf 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConfigurationManagerReliabilityTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConfigurationManagerReliabilityTest.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class SqlConfigurationManagerReliabilityTest
     {
         private static readonly SqlConnectionReliabilityTest s_connectionCRLTest = new SqlConnectionReliabilityTest();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs
index d133d25e03..83feb0571a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlConnectionReliabilityTest.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     public class SqlConnectionReliabilityTest
     {
         internal const string InvalidInitialCatalog = "InvalidInitialCatalog_for_retry";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SplitPacketTest/SplitPacketTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SplitPacketTest/SplitPacketTest.cs
index beda53991a..433676875b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SplitPacketTest/SplitPacketTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SplitPacketTest/SplitPacketTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class SplitPacketTest : IDisposable
     {
         private int _port = -1;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
index 04b0de8072..dc97d98052 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class SqlCommandCancelTest
     {
         // Shrink the packet size - this should make timeouts more likely
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs
index 1176447204..9969ef17a8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCompletedTest.cs
@@ -7,6 +7,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class SqlCommandCompletedTest
     {
         private static readonly string s_connStr = (new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString) { PacketSize = 512 }).ConnectionString;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs
index 590657e5db..b618872772 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandExecuteScalarTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,6 +11,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     /// Tests for ExecuteScalar to verify proper exception handling.
     /// Regression tests for GitHub issue #3736: https://github.com/dotnet/SqlClient/issues/3736
     /// </summary>
+    [Trait("Set", "3")]
     public static class SqlCommandExecuteScalarTest
     {
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs
index b694bc6aee..4eb7e6779e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandSetTest.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class SqlCommandSetTest
     {
         private static Assembly mds = Assembly.GetAssembly(typeof(SqlConnection));
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandStoredProcTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandStoredProcTest.cs
index 1c26151d94..0767c26894 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandStoredProcTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandStoredProcTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "1")]
     public class SqlCommandStoredProcTest
     {
         private static readonly string s_tcp_connStr = DataTestUtility.TCPConnectionString;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs
index dd3132a41c..38295bd953 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class SqlCredentialTest
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs
index 62127bc9a8..4369d75ab0 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -11,6 +11,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "2")]
     [PlatformSpecific(TestPlatforms.Windows)]
     public class SqlDataSourceEnumeratorTest
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDependencyTest/SqlDependencyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDependencyTest/SqlDependencyTest.cs
index c2a4ab79e8..d9f3988e02 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDependencyTest/SqlDependencyTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDependencyTest/SqlDependencyTest.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class SqlDependencyTest
     {
         [Fact]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs
index ccf0a3a90c..bd36cc37a2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlFileStreamTest/SqlFileStreamTest.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class SqlFileStreamTest
     {
         private static bool IsFileStreamEnvironmentSet() => DataTestUtility.IsFileStreamSetup();
@@ -50,7 +51,7 @@ public static void ReadFilestream()
                             string path = reader.GetString(0);
                             byte[] transactionContext = reader.GetSqlBytes(1).Buffer;
 
-                            // Create the SqlFileStream  
+                            // Create the SqlFileStream
                             using (Stream fileStream = new SqlFileStream(path, transactionContext, FileAccess.Read, FileOptions.SequentialScan, allocationSize: 0))
                             {
                                 // Read the contents as bytes.
@@ -118,11 +119,11 @@ public static void OverwriteFilestream()
                     {
                         while (reader.Read())
                         {
-                            // Get the pointer for file   
+                            // Get the pointer for file
                             string path = reader.GetString(0);
                             byte[] transactionContext = reader.GetSqlBytes(1).Buffer;
 
-                            // Create the SqlFileStream  
+                            // Create the SqlFileStream
                             using Stream fileStream = new SqlFileStream(path, transactionContext, FileAccess.Write, FileOptions.SequentialScan, allocationSize: 0);
                             // Overwrite the first row in the table
                             fileStream.Write((insertedValue), 0, 4);
@@ -183,15 +184,15 @@ public static void AppendFilestream()
                     {
                         while (reader.Read())
                         {
-                            // Get the pointer for file  
+                            // Get the pointer for file
                             string path = reader.GetString(0);
                             byte[] transactionContext = reader.GetSqlBytes(1).Buffer;
 
                             using Stream fileStream = new SqlFileStream(path, transactionContext, FileAccess.ReadWrite, FileOptions.SequentialScan, allocationSize: 0);
-                            // Seek to the end of the file  
+                            // Seek to the end of the file
                             fileStream.Seek(0, SeekOrigin.End);
 
-                            // Append a single byte   
+                            // Append a single byte
                             fileStream.WriteByte(appendedByte);
                         }
                     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNamedPipesTest/SqlNamedPipesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNamedPipesTest/SqlNamedPipesTest.cs
index 497450f74e..9386b181ca 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNamedPipesTest/SqlNamedPipesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNamedPipesTest/SqlNamedPipesTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -7,6 +7,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class SqlNamedPipesTest
     {
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
index 24f34bbf12..3701b503a3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public sealed class SqlNotificationTest : IDisposable
     {
         // Misc constants
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs
index 6f4c602c27..a7ef4993bb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlSchemaInfoTest/SqlSchemaInfoTest.cs
@@ -13,6 +13,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class SqlSchemaInfoTest
     {
         #region TestMethods
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlStatisticsTest/SqlStatisticsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlStatisticsTest/SqlStatisticsTest.cs
index f04bc38a4d..32bb8ff919 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlStatisticsTest/SqlStatisticsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlStatisticsTest/SqlStatisticsTest.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class SqlStatisticsTest
     {
         private static DateTime startTime = new DateTime();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs
index 9ed25a6e74..7d1098ccad 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs
@@ -11,6 +11,7 @@
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
 
+    [Trait("Set", "3")]
     [PlatformSpecific(TestPlatforms.Windows)]
     public class DistributedTransactionTestWindows
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionEnlistmentTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionEnlistmentTest.cs
index b6b718e4dd..527665d2b1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionEnlistmentTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionEnlistmentTest.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class TransactionEnlistmentTest
     {
         // TODO Synapse: Cannot find data type 'text'.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs
index 0adff2c8ae..9aea760e56 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class TransactionTest
     {
         public static TheoryData<string> PoolEnabledConnectionStrings =>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
index b590a7c451..712d1ec2c6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -16,6 +16,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class SqlServerTypesTest
     {
         private const string BuiltInUdtSelectQuery =
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs
index 469c895a61..ed5dd7056b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtBulkCopyTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -7,6 +7,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class UdtBulkCopyTest
     {
         private string _connStr;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs
index 490bfe74b4..f5c2df4c09 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtDateTimeOffsetTest.cs
@@ -12,6 +12,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class DateTimeOffsetList : SqlDataRecord
     {
         public DateTimeOffsetList(DateTimeOffset dateTimeOffset)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest.cs
index 666b7bd258..12b92fa76d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class UdtTest
     {
         private readonly string _connStr;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
index 2159589f9c..c5c4955fee 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UdtTest2.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
     [ActiveIssue("5536")]
     // TODO Synapse: Remove dependency from UDTTest Database
+    [Trait("Set", "3")]
     public class UdtTest2
     {
         private string _connStr = null;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs
index 41f81b12e3..b20251ea69 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Utf8SupportTest/Utf8SupportTest.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class Utf8SupportTest
     {
         // Synapse: 'CONNECTIONPROPERTY' is not a recognized built-in function name.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
index 0a86534112..da55ceb1b3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -53,6 +53,7 @@ public static IEnumerable<object[]> GetVectorFloat32TestData()
         }
     }
 
+    [Trait("Set", "3")]
     public sealed class NativeVectorFloat32Tests : IDisposable
     {
         private readonly ITestOutputHelper _output;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorAPIValidationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorAPIValidationTest.cs
index a805cb4dc9..607f4ce01b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorAPIValidationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorAPIValidationTest.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.VectorTest
 {
+    [Trait("Set", "3")]
     public sealed class VectorAPIValidationTest
     {
         // We need these testcases to validate ref assembly for vector APIs
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs
index 9db91d767f..d50c0e00d6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorTypeBackwardCompatibilityTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -41,6 +41,7 @@ public static IEnumerable<object[]> GetVarcharVectorInsertTestData()
         }
     }
 
+    [Trait("Set", "3")]
     public sealed class VectorTypeBackwardCompatibilityTests : VectorBackwardCompatTestBase
     {
         public VectorTypeBackwardCompatibilityTests(ITestOutputHelper output)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs
index 8062df455a..7d270935d1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class WeakRefTest
     {
         private const string COMMAND_TEXT_1 = "SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country from Employees";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs
index 472392d47d..864d1a5447 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public static class WeakRefTestYukonSpecific
     {
         private const string COMMAND_TEXT_1 = "SELECT CustomerID, CompanyName, ContactName, ContactTitle, Address, City, Region, PostalCode, Country, Phone, Fax from Customers";
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs
index db49fc7c32..eb64eecce8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs
@@ -21,6 +21,9 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    // TODO(ADO-39873): Re-enable these tests after addressing their flakiness.
+    [Trait("Set", "3")]
+    [Trait("Category", "flaky")]
     // Serialized execution: DiagnosticListener is global state, so these tests
     // must not run in parallel with each other.
     [Collection("DiagnosticTests")]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventSourceTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventSourceTest.cs
index 4992c55974..df8229025b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventSourceTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/EventSourceTest.cs
@@ -7,6 +7,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class EventSourceTest
     {
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
@@ -24,7 +25,7 @@ public void EventSourceTestAll()
                 }
             }
 
-            // Need to investigate better way of validating traces in sequential runs, 
+            // Need to investigate better way of validating traces in sequential runs,
             // For now we're collecting all traces to improve code coverage.
 
             Assert.All(TraceListener.IDs, item => { Assert.Contains(item, Enumerable.Range(1, 21)); });
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
index 6f9abd12cb..6d37051821 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
@@ -9,6 +9,7 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    [Trait("Set", "3")]
     public class MetricsTest
     {
 #if NETFRAMEWORK
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs
index b03fc8b224..c1e4bad178 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs
@@ -10,7 +10,6 @@
 using Microsoft.Data.SqlClient.Tests.Common;
 using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
-using Xunit.Abstractions;
 
 #nullable enable
 
@@ -97,6 +96,7 @@ public class XEventCleanerCollection : ICollectionFixture<XEventCleaner>
     /// even in error scenarios. This is important to ensure that customers can rely on activity IDs being present in
     /// XEvent sessions for troubleshooting and correlation purposes.
     /// </summary>
+    [Trait("Set", "3")]
     [Collection("XEventCleaner")]
     public class XEventsTracingTest
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.cs
rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.cs
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.cs
rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.cs
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Point1.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Point1.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Point1.cs
rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Point1.cs
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Line.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Line.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Line.cs
rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Line.cs
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Point.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Point.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Point.cs
rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Point.cs
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.cs b/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.cs
rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.cs
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj
similarity index 100%
rename from src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
rename to src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj

From 2d8d7866fcdfd98dd559f41f43073da8d99586a5 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 8 Jun 2026 16:10:06 -0300
Subject: [PATCH 136/298] Add CI package pipeline for building and publishing
 NuGet packages (#4292)

---
 .../ci/package/sqlclient-package.yml          | 172 ++++++++++++++++++
 .../sqlclient-pr-package-ref-pipeline.yml     |   1 +
 .../sqlclient-pr-project-ref-pipeline.yml     |   1 +
 3 files changed, 174 insertions(+)
 create mode 100644 eng/pipelines/ci/package/sqlclient-package.yml

diff --git a/eng/pipelines/ci/package/sqlclient-package.yml b/eng/pipelines/ci/package/sqlclient-package.yml
new file mode 100644
index 0000000000..e194e2abef
--- /dev/null
+++ b/eng/pipelines/ci/package/sqlclient-package.yml
@@ -0,0 +1,172 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This pipeline builds all packages using the build.proj Pack target with ReferenceType=Package,
+# then publishes the resulting .nupkg and .snupkg files as a single pipeline artifact.
+#
+# It runs:
+#   - On pushes to GitHub main and ADO internal/main (batched)
+#   - Nightly at 00:00 UTC on both branches
+#
+# On internal/main the strong-name signing key is downloaded and used to sign assemblies during the
+# build.
+#
+# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI.  We distinguish the two via
+# branch filters:
+#
+#   - Only the GitHub repo has a 'main' branch.
+#   - Only the ADO repo has an 'internal/main' branch.
+
+name: $(DayOfYear)$(Rev:rr)
+
+# Do not trigger this pipeline for PRs.
+pr: none
+
+# Trigger on pushes to main and internal/main, batching concurrent commits.
+trigger:
+  batch: true
+  branches:
+    include:
+      - main
+      - internal/main
+
+# Nightly schedule at 00:00 UTC.
+schedules:
+  - cron: '0 0 * * *'
+    displayName: Nightly Build
+    branches:
+      include:
+        - main
+        - internal/main
+    always: true
+
+# Pipeline parameters visible in the Azure DevOps UI.
+parameters:
+
+  # The agent image to use for the build.  This must exist in both the ADO-1ES-Pool and
+  # ADO-CI-1ES-Pool agent pools.
+  - name: agentImage
+    displayName: Agent Image
+    type: string
+    default: ADO-UB24
+    values:
+      - ADO-UB24
+      - ADO-Win25
+
+  # The build configuration to use, either Debug or Release.
+  - name: buildConfiguration
+    displayName: Build Configuration
+    type: string
+    default: Release
+    values:
+      - Debug
+      - Release
+
+  # True to enable debug steps and output.
+  - name: debug
+    displayName: Enable debug output
+    type: boolean
+    default: false
+
+  # The verbosity level of dotnet CLI commands.
+  - name: dotnetVerbosity
+    displayName: dotnet CLI Verbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
+variables:
+  # Whether this is an internal (ADO.Net project) or public (Public project) build.
+  - name: isInternalBuild
+    value: ${{ eq(variables['System.TeamProject'], 'ADO.Net') }}
+
+  # Signing key argument passed to build.proj. On internal builds this references the secure file
+  # downloaded by DownloadSecureFile@1; on public builds it expands to empty.
+  - name: signingKeyArg
+    ${{ if eq(variables.isInternalBuild, true) }}:
+      value: '-p:SigningKeyPath="$(keyFile.secureFilePath)"'
+    ${{ else }}:
+      value: ''
+
+jobs:
+  - job: pack_all_packages
+    displayName: Pack All Packages
+
+    pool:
+      ${{ if eq(variables.isInternalBuild, true) }}:
+        name: ADO-1ES-Pool
+      ${{ else }}:
+        name: ADO-CI-1ES-Pool
+      demands:
+        - ImageOverride -equals ${{ parameters.agentImage }}
+
+    steps:
+
+      # Emit environment variables if debug is enabled.
+      - ${{ if eq(parameters.debug, true) }}:
+        - pwsh: |
+            Get-ChildItem Env: | Sort-Object Name | Format-Table -AutoSize -Wrap
+          displayName: '[Debug] Print Environment Variables'
+
+      # Install the .NET SDK from global.json.
+      - template: /eng/pipelines/steps/install-dotnet.yml@self
+        parameters:
+          debug: ${{ parameters.debug }}
+
+      # Restore dotnet local tools (pwsh, apicompat, etc.).
+      - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+
+      # Clean any pre-existing .nupkg / .snupkg files from the packages/ directory
+      # to ensure we only publish packages produced by this run.
+      - pwsh: |
+          Write-Host 'Cleaning packages/ directory...'
+          Remove-Item -Force "$(Build.SourcesDirectory)/packages/*.nupkg" -ErrorAction SilentlyContinue
+          Remove-Item -Force "$(Build.SourcesDirectory)/packages/*.snupkg" -ErrorAction SilentlyContinue
+          Write-Host 'Done.'
+        displayName: Clean packages/ directory
+
+      # On internal builds, download the strong-name signing key.
+      - ${{ if eq(variables.isInternalBuild, true) }}:
+        - task: DownloadSecureFile@1
+          displayName: Download Signing Key
+          inputs:
+            secureFile: netfxKeypair.snk
+          name: keyFile
+
+      # Run the Pack target via build.proj.
+      - task: DotNetCoreCLI@2
+        displayName: build.proj - Pack (ReferenceType=Package)
+        inputs:
+          command: build
+          projects: '$(Build.SourcesDirectory)/build.proj'
+          arguments: >-
+            -t:Pack
+            -p:Configuration=${{ parameters.buildConfiguration }}
+            -p:ReferenceType=Package
+            -p:BuildNumber="$(Build.BuildNumber)"
+            -p:BuildSuffix=ci
+            $(signingKeyArg)
+            --verbosity ${{ parameters.dotnetVerbosity }}
+
+      # List produced packages for diagnostics.
+      - pwsh: |
+          Write-Host 'Packages produced:'
+          Get-ChildItem "$(Build.SourcesDirectory)/packages/*.nupkg" -ErrorAction SilentlyContinue | Format-Table Name, Length -AutoSize -Wrap
+          Get-ChildItem "$(Build.SourcesDirectory)/packages/*.snupkg" -ErrorAction SilentlyContinue | Format-Table Name, Length -AutoSize -Wrap
+        displayName: List produced packages
+
+      # Publish all .nupkg and .snupkg files from packages/ as a pipeline artifact.
+      - task: PublishPipelineArtifact@1
+        displayName: Publish NuGet Packages
+        inputs:
+          targetPath: '$(Build.SourcesDirectory)/packages'
+          artifactName: Packages
+          publishLocation: pipeline
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index be7e2e9e3b..70a37e0fa7 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -51,6 +51,7 @@ pr:
       - global.json
       - NuGet.config
     exclude:
+      - eng/pipelines/ci/*
       - eng/pipelines/kerberos/*
       - eng/pipelines/onebranch/*
       - eng/pipelines/stress/*
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index 30950ec21c..f777626c90 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -51,6 +51,7 @@ pr:
       - global.json
       - NuGet.config
     exclude:
+      - eng/pipelines/ci/*
       - eng/pipelines/kerberos/*
       - eng/pipelines/onebranch/*
       - eng/pipelines/stress/*

From b5575bceeb5cda4e6c60c98b81a03a213564d70b Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 9 Jun 2026 14:35:55 -0700
Subject: [PATCH 137/298] Update tools to latest versions (#4345)

---
 dotnet-tools.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dotnet-tools.json b/dotnet-tools.json
index 11e3494512..5c185c01e9 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -3,21 +3,21 @@
   "isRoot": true,
   "tools": {
     "dotnet-coverage": {
-      "version": "18.3.2",
+      "version": "18.7.0",
       "commands": [
         "dotnet-coverage"
       ],
       "rollForward": false
     },
     "microsoft.dotnet.apicompat.tool": {
-      "version": "10.0.103",
+      "version": "10.0.300",
       "commands": [
         "apicompat"
       ],
       "rollForward": false
     },
     "powershell": {
-      "version": "7.6.0",
+      "version": "7.6.2",
       "commands": [
         "pwsh"
       ],

From f50d21ce320194ff94c7e396f479482fca65a4cc Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Tue, 9 Jun 2026 14:39:05 -0700
Subject: [PATCH 138/298] Escape prId variable in url. (#4350)

---
 eng/pipelines/scripts/Sync-GitHubToAdo.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/scripts/Sync-GitHubToAdo.ps1 b/eng/pipelines/scripts/Sync-GitHubToAdo.ps1
index e8b7738021..642ee8b125 100644
--- a/eng/pipelines/scripts/Sync-GitHubToAdo.ps1
+++ b/eng/pipelines/scripts/Sync-GitHubToAdo.ps1
@@ -250,7 +250,7 @@ if ($activePr) {
     Write-Host "Active PR #$prId found. Updating description and posting comment..."
 
     # 1. PATCH the PR description with the refreshed commit summary.
-    $patchUri = "$apiBase/pullrequests/$prId?api-version=7.1"
+    $patchUri = "$apiBase/pullrequests/${prId}?api-version=7.1"
     $patchBody = @{
         description = "## Automated GitHub Sync`n`nThis PR was updated automatically by the GitHub sync pipeline.`n`nSource: [dotnet/SqlClient@$GitHubBranch](https://github.com/dotnet/SqlClient/tree/$GitHubBranch)`nSync branch: ``$SyncBranchName```n`n### Latest Commits`n`n$commitSummary`n`n---`n_This PR requires manual review and merge. Auto-complete is not enabled._"
     }

From 6494816643c9e8c78197fe42b60c7ba4f89726f7 Mon Sep 17 00:00:00 2001
From: Jonas Nyrup <jnyrup@users.noreply.github.com>
Date: Wed, 10 Jun 2026 20:23:19 +0200
Subject: [PATCH 139/298] Improve `EnclaveDiffieHellmanInfo.Size` (#4346)

---
 .../Data/SqlClient/AlwaysEncryptedEnclaveProviderUtils.cs      | 2 +-
 .../Data/SqlClient/AzureAttestationBasedEnclaveProvider.cs     | 3 +--
 .../Data/SqlClient/VirtualSecureModeEnclaveProvider.cs         | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedEnclaveProviderUtils.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedEnclaveProviderUtils.cs
index ff84ab3310..391dcdfd35 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedEnclaveProviderUtils.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncryptedEnclaveProviderUtils.cs
@@ -18,7 +18,7 @@ public EnclavePublicKey(byte[] payload)
 
     internal class EnclaveDiffieHellmanInfo
     {
-        public int Size => sizeof(int) + sizeof(int) + PublicKey?.Length ?? 0 + PublicKeySignature?.Length ?? 0;
+        public int Size => sizeof(int) + sizeof(int) + (PublicKey?.Length ?? 0) + (PublicKeySignature?.Length ?? 0);
 
         public byte[] PublicKey { get; private set; }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AzureAttestationBasedEnclaveProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AzureAttestationBasedEnclaveProvider.cs
index 880ab081f0..6d26429122 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AzureAttestationBasedEnclaveProvider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AzureAttestationBasedEnclaveProvider.cs
@@ -208,8 +208,7 @@ public AzureAttestationInfo(byte[] attestationInfo)
                     EnclaveDHInfo = new EnclaveDiffieHellmanInfo(attestationInfo, offset);
                     offset += EnclaveDHInfo.Size;
 
-                    // TODO(GH-3604): Fix this failing assertion.
-                    // Debug.Assert(offset == attestationInfo.Length);
+                    Debug.Assert(offset == attestationInfo.Length);
                 }
                 catch (Exception exception)
                 {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProvider.cs
index dfd5fc65a4..aa7e17be03 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProvider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProvider.cs
@@ -153,8 +153,7 @@ public AttestationInfo(byte[] attestationInfo)
             EnclaveDHInfo = new EnclaveDiffieHellmanInfo(attestationInfo, offset);
             offset += Convert.ToInt32(EnclaveDHInfo.Size);
 
-            // TODO(GH-3604): Fix this failing assertion.
-            // Debug.Assert(offset == attestationInfo.Length, $"{offset} == {attestationInfo.Length}");
+            Debug.Assert(offset == attestationInfo.Length, $"{offset} == {attestationInfo.Length}");
         }
     }
 

From e46104d0e2053bb2eda778c3213761242e9b3d4f Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 10 Jun 2026 11:57:29 -0700
Subject: [PATCH 140/298] Tests | Add Flaky test details to
 ConnectionFailoverTests (#4341)

* Add Flaky test details to ConnectionFailoverTests

* comments
---
 .../ConnectionFailoverTests.cs                | 112 ++++++++++++++++--
 1 file changed, 101 insertions(+), 11 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index ea3e2d3da7..29bb6cb6e5 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -19,8 +19,8 @@ public class ConnectionFailoverTests
         [Trait("Category", "flaky")]
         [Theory]
         [InlineData(40613)]
-        [InlineData(42108)]
-        [InlineData(42109)]
+        [InlineData(42108)] // Flaky: [errorcode: 42108] Assert.Equal() Failure: Strings differ | Assert.Equal() Failure: Values differ
+        [InlineData(42109)] // Flaky: [errorcode: 42109] Assert.Equal() Failure: Strings differ
         public void TransientFault_NoFailover_DoesNotClearPool(uint errorCode)
         {
             // When connecting to a server with a configured failover partner,
@@ -67,16 +67,29 @@ public void TransientFault_NoFailover_DoesNotClearPool(uint errorCode)
             // Assert
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal(ConnectionState.Open, secondConnection.State);
+
+            /* TODO: Fix flaky Assert.Equal() in this test method;
+            Assert.Equal() Failure: Strings differ
+                                        ↓ (pos 14)
+                Expected: "localhost,51966"
+                Actual:   "localhost,51965"
+                                        ↑ (pos 14)
+            */
             Assert.Equal($"localhost,{initialServer.EndPoint.Port}", connection.DataSource);
             Assert.Equal($"localhost,{initialServer.EndPoint.Port}", secondConnection.DataSource);
 
             // 1 for the initial connection, 2 for the second connection
+            /* TODO: Fix flaky test failure for errorcode 42108:
+            Assert.Equal() Failure: Values differ
+                Expected: 3
+                Actual:   4
+            */
             Assert.Equal(3, initialServer.PreLoginCount - initialServer.AbandonedPreLoginCount);
             // A failover should not be triggered, so prelogin count to the failover server should be 0
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
+        [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ | System.ComponentModel.Win32Exception : The wait operation timed out.
         [Fact]
         public void NetworkError_TriggersFailover_ClearsPool()
         {
@@ -115,6 +128,13 @@ public void NetworkError_TriggersFailover_ClearsPool()
             // Open the initial connection to warm up the pool and populate failover partner information
             // for the pool group.
             using SqlConnection connection = new(builder.ConnectionString);
+
+            /* TODO: Fix flaky test failure:
+            Microsoft.Data.SqlClient.SqlException : A network-related or instance-specific error occurred while establishing a connection to SQL Server. 
+                The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured 
+                to allow remote connections. (provider: TCP Provider, error: 0 - The wait operation timed out.)
+                ---- System.ComponentModel.Win32Exception : The wait operation timed out.
+            */
             connection.Open();
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal($"localhost,{initialServer.EndPoint.Port}", connection.DataSource);
@@ -131,8 +151,13 @@ public void NetworkError_TriggersFailover_ClearsPool()
             Assert.Equal(ConnectionState.Open, secondConnection.State);
             Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", secondConnection.DataSource);
             Assert.Equal(1, initialServer.PreLoginCount);
-            Assert.Equal(1, failoverServer.PreLoginCount);
 
+            /* TODO: Fix flaky Assert.Equal() in this test method;
+             Assert.Equal() Failure: Values differ
+                Expected: 1
+                Actual:   2
+            */
+            Assert.Equal(1, failoverServer.PreLoginCount);
 
             // Act
             // Request a new connection, should initiate a fresh connection attempt if the pool was cleared.
@@ -242,7 +267,7 @@ public void NetworkDelay_ShouldConnectToPrimary()
         }
 
         [Fact]
-        [Trait("Category", "flaky")]
+        [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ | System.ComponentModel.Win32Exception : The wait operation timed out
         public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFailoverPartner()
         {
             using TdsServer failoverServer = new(
@@ -277,6 +302,15 @@ public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFa
             using SqlConnection connection = new(builder.ConnectionString);
 
             // Act
+            /* TODO: Fix flaky test failure:
+            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  
+                The connection could have timed out while waiting for server to complete the login process and respond; 
+                Or it could have timed out while attempting to create multiple active connections.  
+                This failure occurred while attempting to connect to the Principle server.  
+                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=6; handshake=80; 
+                [Login] initialization=0; authentication=0; [Post-Login] complete=5443;
+                ---- System.ComponentModel.Win32Exception : The wait operation timed out
+            */
             connection.Open();
 
 
@@ -285,12 +319,18 @@ public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFa
             // so the connection will retry on the failover server.
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", connection.DataSource);
+
+            /* TODO: Fix flaky Assert.Equal() in this test method;
+            Assert.Equal() Failure: Values differ
+                Expected: 1
+                Actual:   2
+            */
             Assert.Equal(1, failoverServer.PreLoginCount);
             Assert.Equal(1, server.PreLoginCount);
         }
 
         [Fact]
-        [Trait("Category", "flaky")]
+        [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ | System.ComponentModel.Win32Exception : The wait operation timed out
         public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFailoverPartner()
         {
             using TdsServer failoverServer = new(
@@ -325,6 +365,24 @@ public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFai
             };
             using SqlConnection connection = new(builder.ConnectionString);
             // Act
+            /* TODO: Fix flaky test failure:
+            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  
+                The timeout period elapsed during the post-login phase.  
+                The connection could have timed out while waiting for server to complete the login process and respond; 
+                Or it could have timed out while attempting to create multiple active connections.  
+                This failure occurred while attempting to connect to the Principle server.  
+                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=4; handshake=68; 
+                [Login] initialization=0; authentication=0; [Post-Login] complete=5443; 
+                ---- System.ComponentModel.Win32Exception : The wait operation timed out
+            */
+            /* TODO: Fix flaky test failure:
+            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  
+                The timeout period elapsed while attempting to consume the pre-login handshake acknowledgement.  
+                This could be because the pre-login handshake failed or the server was unable to respond back in time.  
+                This failure occurred while attempting to connect to the Principle server.  
+                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=0; handshake=5285; 
+                ---- System.ComponentModel.Win32Exception : The wait operation timed out.
+            */
             connection.Open();
 
             // Assert
@@ -332,6 +390,11 @@ public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFai
             // so the connection will retry on the failover server.
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", connection.DataSource);
+            /* TODO: Fix flaky Assert.Equal() in this test method;
+            Assert.Equal() Failure: Values differ
+                Expected: 1
+                Actual:   2
+            */
             Assert.Equal(1, server.PreLoginCount);
             Assert.Equal(0, server.Login7Count);
             Assert.Equal(1, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
@@ -448,7 +511,7 @@ public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
         [InlineData(40613)]
         [InlineData(42108)]
         [InlineData(42109)]
-        [Trait("Category", "flaky")]
+        [Trait("Category", "flaky")] // [errorcode: 40613] Assert.Equal() Failure: Values differ
         public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint errorCode)
         {
             // Arrange
@@ -490,17 +553,21 @@ public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint e
             Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
 
             // Failures should prompt the client to return to the original server, resulting in a login count of 2
+            /* TODO: Fix flaky Assert.Equal() in this test method;
+            Assert.Equal() Failure: Values differ
+                Expected: 2
+                Actual:   3
+            */
             Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
             // Login-phase errors must NOT trigger failover alternation
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
+        [Trait("Category", "flaky")] // [errorcode: 42109] Assert.Fail() Failure
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
         [InlineData(42109)]
-        [Trait("Category", "flaky")]
         public void TransientFault_WithUserProvidedPartner_RetryDisabled_ShouldFail(uint errorCode)
         {
             // Arrange
@@ -542,12 +609,13 @@ public void TransientFault_WithUserProvidedPartner_RetryDisabled_ShouldFail(uint
                 Assert.Equal((int)errorCode, e.Number);
                 return;
             }
-
+            // TODO: Fix flaky Assert.Fail() in this test method;
+            // [errorcode: 42109] Assert.Fail() Failure
             Assert.Fail();
         }
 
         [Fact]
-        [Trait("Category", "flaky")]
+        [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ | System.ComponentModel.Win32Exception : The wait operation timed out
         public void TransientFault_IgnoreServerProvidedFailoverPartner_ShouldConnectToUserProvidedPartner()
         {
             // Arrange
@@ -585,6 +653,12 @@ public void TransientFault_IgnoreServerProvidedFailoverPartner_ShouldConnectToUs
             SqlConnection connection = new(builder.ConnectionString);
 
             // Connect once to the primary to trigger it to send the failover partner
+            /* TODO: Fix flaky test failure:
+            Microsoft.Data.SqlClient.SqlException : A network-related or instance-specific error occurred while establishing a connection to SQL Server. 
+                The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections. 
+                (provider: TCP Provider, error: 0 - The wait operation timed out.)
+                ---- System.ComponentModel.Win32Exception : The wait operation timed out.
+            */
             connection.Open();
             Assert.Equal("invalidhost", (connection.InnerConnection as SqlConnectionInternal)!.ServerProvidedFailoverPartner);
 
@@ -606,8 +680,21 @@ public void TransientFault_IgnoreServerProvidedFailoverPartner_ShouldConnectToUs
 
             // Assert
             Assert.Equal(ConnectionState.Open, failoverConnection.State);
+
+            /* TODO: Fix flaky Assert.Equal() in this test method;
+            Assert.Equal() Failure: Strings differ
+                                        ↓ (pos 13)
+                Expected: "localhost,51479"
+                Actual:   "localhost,51480"
+                                        ↑ (pos 13)
+            */
             Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", failoverConnection.DataSource);
             // 1 for the initial connection
+            /* TODO: Fix flaky Assert.Equal() in this test method;
+            Assert.Equal() Failure: Values differ
+                Expected: 1
+                Actual:   2
+            */
             Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
             // 1 for the failover connection
             Assert.Equal(1, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
@@ -789,6 +876,7 @@ public void TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_No
         /// and never attempts failover alternation.
         /// </summary>
         [Theory]
+        [Trait("Category", "flaky")] // Assert.Throws() Failure: No exception was thrown
         [InlineData(40613)]
         [InlineData(42108)]
         [InlineData(42109)]
@@ -827,6 +915,8 @@ public void TransientFault_RetryDisabled_WithUserProvidedPartner_ShouldFail_NotF
             using SqlConnection connection = new(builder.ConnectionString);
 
             // No outer connect retry is allowed, so the first transient error should surface.
+            // TODO: Fix flakiness of Assert.Throws() in this test method; currently, if the exception is not thrown as expected,
+            // Assert.Throws will fail the test with an assertion failure ("No exception was thrown").
             SqlException ex = Assert.Throws<SqlException>(() => connection.Open());
 
             Assert.Equal((int)errorCode, ex.Number);

From ff57e19f78b4c67b678b3e3c1c0eb6194e25047f Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 10 Jun 2026 16:00:26 -0300
Subject: [PATCH 141/298] Fix stress pipeline: rename variables to avoid env
 var injection, simplify runner (#4329)

---
 .../ado-pipelines.instructions.md             |  14 +
 eng/pipelines/stress/stress-tests-job.yml     |  68 ++--
 .../stress/stress-tests-pipeline.yml          |  12 +-
 eng/pipelines/stress/stress-tests-stage.yml   |  36 +-
 .../StressTests/Directory.Packages.props      |   4 +
 .../IMonitorLoader/IMonitorLoader.cs          |   2 +-
 .../IMonitorLoader/MonitorMetrics.cs          |   2 +-
 .../GlobalExceptionHandlerAttribute.cs        |   2 +-
 .../Attributes/GlobalTestCleanupAttribute.cs  |   2 +-
 .../Attributes/GlobalTestSetupAttribute.cs    |   2 +-
 .../Attributes/TestAttribute.cs               |   2 +-
 .../Attributes/TestCleanupAttribute.cs        |   2 +-
 .../Attributes/TestSetupAttribute.cs          |   2 +-
 .../Attributes/TestVariationAttribute.cs      |   2 +-
 .../DeadlockDetection.cs                      |   2 +-
 .../DeadlockDetectionTaskScheduler.cs         |   2 +-
 .../SqlClient.Stress.Common/TestMetrics.cs    |   2 +-
 .../SqlClient.Stress.Common/VersionUtil.cs    |   2 +-
 .../SqlClient.Stress.Framework/AsyncUtils.cs  |   3 +-
 .../SqlClient.Stress.Framework/DataSource.cs  |   2 +-
 .../DataStressConnection.cs                   |   2 +-
 .../DataStressErrors.cs                       |   2 +-
 .../DataStressFactory.cs                      |   2 +-
 .../DataStressReader.cs                       |   2 +-
 .../DataStressSettings.cs                     |   2 +-
 .../DataTestGroup.cs                          |   3 +-
 .../SqlClient.Stress.Framework/Extensions.cs  |   2 +-
 .../StressConfigReader.cs                     |   4 +-
 .../TrackedRandom.cs                          |   2 +-
 .../SqlClient.Stress.Runner/Constants.cs      |   2 +-
 .../Ex API/MemApi.Windows.cs                  |   2 +-
 .../ITestAttributeFilter.cs                   |   2 +-
 .../SqlClient.Stress.Runner/LogManager.cs     |   2 +-
 .../Monitor/FakeConsole.cs                    |   2 +-
 .../SqlClient.Stress.Runner/Monitor/Logger.cs |   2 +-
 .../Monitor/MonitorLoadUtils.cs               |   7 +-
 .../Monitor/RecordedExceptions.cs             |   2 +-
 .../SqlClient.Stress.Runner/PerfCounters.cs   |   2 +-
 .../SqlClient.Stress.Runner/Program.cs        | 337 ++++++++----------
 .../SqlClient.Stress.Runner.csproj            |   4 +
 .../SqlClient.Stress.Runner/StressEngine.cs   |   3 +-
 .../SqlClient.Stress.Runner/TestFinder.cs     |   2 +-
 .../Tests/MultithreadedTest.cs                |   2 +-
 .../Tests/StressTest.cs                       |   2 +-
 .../SqlClient.Stress.Runner/Tests/Test.cs     |   2 +-
 .../SqlClient.Stress.Runner/Tests/TestBase.cs |   2 +-
 .../Tests/ThreadPoolTest.cs                   |   2 +-
 .../FilteredDefaultTraceListener.cs           |   2 +-
 .../HostsFileManager.cs                       |   2 +-
 .../MultiSubnetFailoverSetup.cs               |   3 +-
 .../SqlClient.Stress.Tests/NetUtils.cs        |   2 +-
 .../SqlClientStressFactory.cs                 |   3 +-
 .../SqlClientTestGroup.cs                     |   3 +-
 53 files changed, 295 insertions(+), 285 deletions(-)

diff --git a/.github/instructions/ado-pipelines.instructions.md b/.github/instructions/ado-pipelines.instructions.md
index 9260a78b3d..7e0d02e4e2 100644
--- a/.github/instructions/ado-pipelines.instructions.md
+++ b/.github/instructions/ado-pipelines.instructions.md
@@ -110,6 +110,20 @@ Test timeout — `--blame-hang-timeout 10m` (configured in `build.proj` and thre
 - `localFeedPath` = `$(Build.SourcesDirectory)/packages` — local NuGet feed for inter-package deps
 - `packagePath` = `$(Build.SourcesDirectory)/output` — NuGet pack output
 
+## Variable Naming — Avoid `{COMMAND}ARGUMENTS` Names
+
+The dotnet CLI (via System.CommandLine) reads environment variables named `{COMMAND}ARGUMENTS` and silently injects their content into the parsed arguments for that subcommand. Because Azure DevOps automatically exposes all pipeline variables as uppercased environment variables, a pipeline variable named `runArguments` becomes `RUNARGUMENTS`, which `dotnet run` reads and injects into the application's `args[]` — bypassing the `--` separator.
+
+**Forbidden variable names** (any casing):
+- `runArguments` — injected into `dotnet run`
+- `buildArguments` — injected into `dotnet build`
+- `testArguments` — injected into `dotnet test`
+- Any name matching `{dotnet-subcommand}Arguments`
+
+**Use instead**: `dotnetBuildOpts`, `dotnetRunOpts`, `stressTestArgs`, or other names that do not match the `{COMMAND}ARGUMENTS` pattern.
+
+This affects ALL .NET SDK versions (8.0+). The injection is invisible in `[command]` log lines, making it extremely hard to diagnose. The only symptom is the application receiving unexpected arguments.
+
 ## Conventions When Editing Pipelines
 
 - Always use templates for reusable logic — do not inline complex steps
diff --git a/eng/pipelines/stress/stress-tests-job.yml b/eng/pipelines/stress/stress-tests-job.yml
index 2633445214..a02a0a4f4b 100644
--- a/eng/pipelines/stress/stress-tests-job.yml
+++ b/eng/pipelines/stress/stress-tests-job.yml
@@ -24,7 +24,6 @@ parameters:
   # True to enable debugging steps.
   - name: debug
     type: boolean
-    default: false
 
   # The prefix to prepend to the job's display name:
   #
@@ -36,7 +35,6 @@ parameters:
   # The verbosity level for the dotnet CLI commands.
   - name: dotnetVerbosity
     type: string
-    default: normal
     values:
     - quiet
     - minimal
@@ -48,20 +46,18 @@ parameters:
   - name: jobNameSuffix
     type: string
 
-  # True to fail the job when stress tests fail.  When false, test failures produce warnings
-  # (SucceededWithIssues) but do not fail the job.
-  - name: failOnTestFailure
+  # When true, test failures produce warnings (SucceededWithIssues) but do not fail the job.
+  # When false, test failures fail the job.  All test steps always run regardless of this setting.
+  - name: warnOnTestFailure
     type: boolean
 
   # The list of .NET Framework runtimes to test against.
   - name: netFrameworkTestRuntimes
     type: object
-    default: []
 
   # The list of .NET runtimes to test against.
   - name: netTestRuntimes
     type: object
-    default: []
 
   # The name of the Azure Pipelines pool to use.
   - name: poolName
@@ -105,18 +101,6 @@ jobs:
       - name: project
         value: $(Build.SourcesDirectory)/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
 
-      # dotnet CLI arguments for build.
-      - name: buildArguments
-        value: >-
-          --verbosity ${{ parameters.dotnetVerbosity }}
-          -p:Configuration=${{ parameters.buildConfiguration }}
-
-      # dotnet CLI arguments for run.
-      - name: runArguments
-        value: >-
-          --verbosity ${{ parameters.dotnetVerbosity }}
-          --configuration ${{ parameters.buildConfiguration }}
-
       # The contents of the config file to use for all tests.  We will write this to a JSON file and
       # then point to it via the STRESS_CONFIG_FILE environment variable.
       - name: configContent
@@ -137,9 +121,29 @@ jobs:
             }
           ]
 
-      # Stress test command-line arguments.
-      - name: testArguments
-        value: -a SqlClient.Stress.Tests -console
+      # IMPORTANT: Do NOT name pipeline variables "runArguments", "buildArguments", or
+      # "testArguments".  ADO exposes all pipeline variables as environment variables (uppercased),
+      # and the dotnet CLI's System.CommandLine reads env vars matching {COMMAND}ARGUMENTS (e.g.
+      # RUNARGUMENTS, BUILDARGUMENTS) and silently injects their content into the parsed arguments —
+      # bypassing the "--" separator.  This causes app arguments to contain SDK options and triggers
+      # unintended behavior.
+
+      # dotnet CLI options for build.
+      - name: dotnetBuildOpts
+        value: >-
+          --verbosity ${{ parameters.dotnetVerbosity }}
+          -p:Configuration=${{ parameters.buildConfiguration }}
+
+      # dotnet run options shared by all test steps (framework is appended per-step).
+      - name: dotnetRunOpts
+        value: >-
+          --no-build
+          --verbosity ${{ parameters.dotnetVerbosity }}
+          --configuration ${{ parameters.buildConfiguration }}
+
+      # Stress test options passed after the "--" separator.
+      - name: stressTestOpts
+        value: --assembly SqlClient.Stress.Tests --console
 
     steps:
 
@@ -178,7 +182,7 @@ jobs:
         inputs:
           command: build
           projects: $(project)
-          arguments: $(buildArguments)
+          arguments: ${{ variables.dotnetBuildOpts }}
 
       # Set a flag so test steps can distinguish a build failure from a test failure.
       - pwsh: Write-Host "##vso[task.setvariable variable=buildSucceeded]true"
@@ -194,29 +198,33 @@ jobs:
       #     - eq(variables['buildSucceeded'], 'true') gates on the flag set above, so tests are
       #       skipped entirely if the build or any setup step failed (since there's nothing to run).
       #
-      #   continueOnError: ${{ not(parameters.failOnTestFailure) }}
-      #     - When failOnTestFailure is false, continueOnError is true: a test failure marks the
+      #   continueOnError: ${{ parameters.warnOnTestFailure }}
+      #     - When warnOnTestFailure is true, continueOnError is true: a test failure marks the
       #       step and job as SucceededWithIssues (orange warning) rather than Failed.
-      #     - When failOnTestFailure is true, continueOnError is false: a test failure fails the
+      #     - When warnOnTestFailure is false, continueOnError is false: a test failure fails the
       #       job (red), though subsequent runtimes still run due to the condition above.
       #
       - ${{ each runtime in parameters.netTestRuntimes }}:
         - task: DotNetCoreCLI@2
           displayName: Test [${{ runtime }}]
           condition: and(succeededOrFailed(), eq(variables['buildSucceeded'], 'true'))
-          continueOnError: ${{ not(parameters.failOnTestFailure) }}
+          continueOnError: ${{ parameters.warnOnTestFailure }}
+          env:
+            STRESS_CONFIG_FILE: config.json
           inputs:
             command: run
             projects: $(project)
-            arguments: $(runArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.jsonc -- $(testArguments)
+            arguments: ${{ variables.dotnetRunOpts }} -f ${{ runtime }} -- ${{ variables.stressTestOpts }}
 
       # Run the stress tests for each .NET Framework runtime.
       - ${{ each runtime in parameters.netFrameworkTestRuntimes }}:
         - task: DotNetCoreCLI@2
           displayName: Test [${{ runtime }}]
           condition: and(succeededOrFailed(), eq(variables['buildSucceeded'], 'true'))
-          continueOnError: ${{ not(parameters.failOnTestFailure) }}
+          continueOnError: ${{ parameters.warnOnTestFailure }}
+          env:
+            STRESS_CONFIG_FILE: config.json
           inputs:
             command: run
             projects: $(project)
-            arguments: $(runArguments) --no-build -f ${{ runtime }} -e STRESS_CONFIG_FILE=config.jsonc -- $(testArguments)
+            arguments: ${{ variables.dotnetRunOpts }} -f ${{ runtime }} -- ${{ variables.stressTestOpts }}
diff --git a/eng/pipelines/stress/stress-tests-pipeline.yml b/eng/pipelines/stress/stress-tests-pipeline.yml
index 1f2e356461..edd962b911 100644
--- a/eng/pipelines/stress/stress-tests-pipeline.yml
+++ b/eng/pipelines/stress/stress-tests-pipeline.yml
@@ -14,7 +14,7 @@
 # ADO.Net project:
 #   Triggering pipeline:  MDS Main CI (branch internal/main only)
 #   Pipeline name:        sqlclient-stress
-#   Pipeline URL:         TODO: add URL when pipeline is created
+#   Pipeline URL:         https://dev.azure.com/SqlClientDrivers/ADO.Net/_build?definitionId=2284
 
 # Set the pipeline run name to the day-of-year and the daily run counter.
 name: $(DayOfYear)$(Rev:rr)
@@ -73,10 +73,10 @@ parameters:
     type: boolean
     default: false
 
-  # True to fail the pipeline when stress tests fail.  When false (default), test failures produce
-  # warnings but do not fail the overall pipeline run.
-  - name: failOnTestFailure
-    displayName: Fail pipeline on test failure
+  # When true, test failures produce warnings (SucceededWithIssues) but do not fail the pipeline.
+  # When false (default), test failures fail the pipeline.
+  - name: warnOnTestFailure
+    displayName: Warn (not fail) on test failure
     type: boolean
     default: false
 
@@ -105,5 +105,5 @@ stages:
     parameters:
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
-      failOnTestFailure: ${{ parameters.failOnTestFailure }}
+      warnOnTestFailure: ${{ parameters.warnOnTestFailure }}
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/stress/stress-tests-stage.yml b/eng/pipelines/stress/stress-tests-stage.yml
index f641ea0e7e..0ac192a601 100644
--- a/eng/pipelines/stress/stress-tests-stage.yml
+++ b/eng/pipelines/stress/stress-tests-stage.yml
@@ -30,16 +30,15 @@ parameters:
   # True to enable debugging steps.
   - name: debug
     type: boolean
-    default: false
 
-  # True to fail the job when stress tests fail.  When false, test failures produce warnings.
-  - name: failOnTestFailure
+  # When true, test failures produce warnings (SucceededWithIssues) but do not fail the job.
+  # When false, test failures fail the job.  All test steps always run regardless of this setting.
+  - name: warnOnTestFailure
     type: boolean
 
   # The verbosity level for the dotnet CLI commands.
   - name: dotnetVerbosity
     type: string
-    default: normal
     values:
     - quiet
     - minimal
@@ -52,11 +51,11 @@ parameters:
     type: object
     default: [net462]
 
-  # The list of .NET runtimes to test against.  These must align with the TargetFrameworks defined
-  # in the stress test Directory.Build.props and the TFMs that SqlClient ships.
+  # The list of .NET runtimes to test against.  These should include the TFMs that SqlClient ships
+  # as well as any upcoming runtimes being validated (e.g. net10.0 is tested but not yet shipped).
   - name: netTestRuntimes
     type: object
-    default: [net8.0, net9.0]
+    default: [net8.0, net9.0, net10.0]
 
 stages:
   - stage: stress_tests_stage
@@ -69,6 +68,15 @@ stages:
       - name: saPassword
         value: $[stageDependencies.secrets_stage.secrets_job.outputs['SaPassword.Value']]
 
+      # The 1ES pool name, determined automatically by ADO project:
+      #   - ADO.Net  -> ADO-1ES-Pool
+      #   - public   -> ADO-CI-1ES-Pool
+      - name: poolName
+        ${{ if eq(variables['System.TeamProject'], 'ADO.Net') }}:
+          value: ADO-1ES-Pool
+        ${{ else }}:
+          value: ADO-CI-1ES-Pool
+
     jobs:
 
     # ----------------------------------------------------------------------------------------------
@@ -80,10 +88,12 @@ stages:
         debug: ${{ parameters.debug }}
         displayNamePrefix: Linux
         dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-        failOnTestFailure: ${{ parameters.failOnTestFailure }}
+        warnOnTestFailure: ${{ parameters.warnOnTestFailure }}
         jobNameSuffix: linux
+        # No .NET Framework runtimes on Linux.
+        netFrameworkTestRuntimes: []
         netTestRuntimes: ${{ parameters.netTestRuntimes }}
-        poolName: ADO-CI-1ES-Pool
+        poolName: ${{ variables.poolName }}
         saPassword: $(saPassword)
         sqlSetupStep:
           template: /eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml@self
@@ -100,12 +110,12 @@ stages:
         debug: ${{ parameters.debug }}
         displayNamePrefix: Win
         dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-        failOnTestFailure: ${{ parameters.failOnTestFailure }}
+        warnOnTestFailure: ${{ parameters.warnOnTestFailure }}
         jobNameSuffix: windows
         # Note that we include the .NET Framework runtimes for test runs on Windows.
         netFrameworkTestRuntimes: ${{ parameters.netFrameworkTestRuntimes }}
         netTestRuntimes: ${{ parameters.netTestRuntimes }}
-        poolName: ADO-CI-1ES-Pool
+        poolName: ${{ variables.poolName }}
         saPassword: $(saPassword)
         sqlSetupStep:
           template: /eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml@self
@@ -124,8 +134,10 @@ stages:
         debug: ${{ parameters.debug }}
         displayNamePrefix: macOS
         dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-        failOnTestFailure: ${{ parameters.failOnTestFailure }}
+        warnOnTestFailure: ${{ parameters.warnOnTestFailure }}
         jobNameSuffix: macos
+        # No .NET Framework runtimes on macOS.
+        netFrameworkTestRuntimes: []
         netTestRuntimes: ${{ parameters.netTestRuntimes }}
         # We don't have any 1ES Hosted Pool images for macOS, so we use a generic one from Azure
         # Pipelines.
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props
index 1d19b81910..addc60556f 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props
@@ -9,4 +9,8 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageVersion Include="System.CommandLine" Version="2.0.8" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.cs
index 1dcbde121f..a565889bd9 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.cs
@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 
-namespace Monitoring
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public interface IMonitorLoader
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/IMonitorLoader/MonitorMetrics.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/IMonitorLoader/MonitorMetrics.cs
index ed37544e4e..5da0395e20 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/IMonitorLoader/MonitorMetrics.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/IMonitorLoader/MonitorMetrics.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace Monitoring
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class MonitorMetrics
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalExceptionHandlerAttribute.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalExceptionHandlerAttribute.cs
index 810580d9f8..cc4e5f6cc9 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalExceptionHandlerAttribute.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalExceptionHandlerAttribute.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
     public class GlobalExceptionHandlerAttribute : Attribute
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalTestCleanupAttribute.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalTestCleanupAttribute.cs
index 2159d2630e..5a058fb23d 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalTestCleanupAttribute.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalTestCleanupAttribute.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
     public class GlobalTestCleanupAttribute : Attribute
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalTestSetupAttribute.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalTestSetupAttribute.cs
index 00ed3d5b05..98d1c3c560 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalTestSetupAttribute.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/GlobalTestSetupAttribute.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
     public class GlobalTestSetupAttribute : Attribute
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestAttribute.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestAttribute.cs
index 3146c2d808..a3af2de8a1 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestAttribute.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestAttribute.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public enum TestPriority
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestCleanupAttribute.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestCleanupAttribute.cs
index 32bc5ee6bc..9825f98ac7 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestCleanupAttribute.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestCleanupAttribute.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
     public class TestCleanupAttribute : Attribute
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestSetupAttribute.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestSetupAttribute.cs
index 5626032b69..b12254d75b 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestSetupAttribute.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestSetupAttribute.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
     public class TestSetupAttribute : Attribute
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestVariationAttribute.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestVariationAttribute.cs
index e54acfa969..3277811e27 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestVariationAttribute.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/Attributes/TestVariationAttribute.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     [AttributeUsage(AttributeTargets.Field, Inherited = true, AllowMultiple = true)]
     public class TestVariationAttribute : Attribute
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/DeadlockDetection.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/DeadlockDetection.cs
index 50fc6d3d7a..b749726149 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/DeadlockDetection.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/DeadlockDetection.cs
@@ -9,7 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class DeadlockDetection
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/DeadlockDetectionTaskScheduler.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/DeadlockDetectionTaskScheduler.cs
index 22a540def8..be5b44f0c9 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/DeadlockDetectionTaskScheduler.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/DeadlockDetectionTaskScheduler.cs
@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class DeadlockDetectionTaskScheduler : TaskScheduler
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/TestMetrics.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/TestMetrics.cs
index 054a822dc1..fbab0e4248 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/TestMetrics.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/TestMetrics.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public static class TestMetrics
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/VersionUtil.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/VersionUtil.cs
index 1778903834..ddcc24fb85 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/VersionUtil.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Common/VersionUtil.cs
@@ -8,7 +8,7 @@
 
 #pragma warning disable 618
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class VersionUtil
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/AsyncUtils.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/AsyncUtils.cs
index 84f0fba0de..3d2b0cdbb5 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/AsyncUtils.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/AsyncUtils.cs
@@ -8,9 +8,8 @@
 using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
 using System.Xml;
-using DPStressHarness;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public enum SyncAsyncMode
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataSource.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataSource.cs
index b61379aa0a..a83269e55e 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataSource.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataSource.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     /// <summary>
     /// supported source types - values for 'type' attribute for 'source' node in App.config
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressConnection.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressConnection.cs
index 46becd4897..cd47170ead 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressConnection.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressConnection.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class DataStressConnection : IDisposable
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressErrors.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressErrors.cs
index 46b7751d50..5cc12b0dd7 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressErrors.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressErrors.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Diagnostics;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public enum ErrorHandlingAction
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressFactory.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressFactory.cs
index 8e06a1de89..8d9ad88496 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressFactory.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressFactory.cs
@@ -11,7 +11,7 @@
 using System.Data.Common;
 using System.Diagnostics;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     /// <summary>
     /// Base class to generate utility objects required for stress tests to run. For example: connection strings, command texts, 
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressReader.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressReader.cs
index cad1bfa579..cee280fcf7 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressReader.cs
@@ -13,7 +13,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class DataStressReader : IDisposable
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressSettings.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressSettings.cs
index 8ddf737015..ddd498fde4 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressSettings.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataStressSettings.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     /// <summary>
     /// Loads dataStressSettings section from Stress.Data.Framework.dll.config (App.config in source tree)
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataTestGroup.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataTestGroup.cs
index ea2bfe6553..b033e664cd 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataTestGroup.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/DataTestGroup.cs
@@ -12,9 +12,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-using DPStressHarness;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     /// <summary>
     ///  basic set of tests to run on each managed provider
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/Extensions.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/Extensions.cs
index 2629bc20bb..ceccbabc94 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/Extensions.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/Extensions.cs
@@ -10,7 +10,7 @@
 using System.Threading.Tasks;
 using System.Xml;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public static class Extensions
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/StressConfigReader.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/StressConfigReader.cs
index 1b677f965a..db7f1957f6 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/StressConfigReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/StressConfigReader.cs
@@ -8,9 +8,9 @@
 using System.Text.Json;
 using System.Xml;
 using System.Xml.XPath;
-using static Stress.Data.DataStressSettings;
+using static Microsoft.Data.SqlClient.Test.Stress.DataStressSettings;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     /// <summary>
     /// Reads the configuration from a configuration file and provides the configuration
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/TrackedRandom.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/TrackedRandom.cs
index b42128fff5..3b2211e5cf 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/TrackedRandom.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/TrackedRandom.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Stress.Data
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     /// <summary>
     /// Random number generator that tracks information necessary to reproduce a sequence of random numbers.
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Constants.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Constants.cs
index 10f0ecb41b..8edd989cef 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Constants.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Constants.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public static class Constants
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Ex API/MemApi.Windows.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Ex API/MemApi.Windows.cs
index 053aea09a1..fd0205eabb 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Ex API/MemApi.Windows.cs	
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Ex API/MemApi.Windows.cs	
@@ -5,7 +5,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     static class MemApi
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/ITestAttributeFilter.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/ITestAttributeFilter.cs
index c3afa9251d..51e54d0163 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/ITestAttributeFilter.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/ITestAttributeFilter.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public interface ITestAttributeFilter
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/LogManager.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/LogManager.cs
index 9b534a24b5..96271891dd 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/LogManager.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/LogManager.cs
@@ -8,7 +8,7 @@
 using System.Linq;
 using System.Text;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class LogManager: IDisposable
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/FakeConsole.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/FakeConsole.cs
index f13949ae8e..b734c46d4d 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/FakeConsole.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/FakeConsole.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public static class FakeConsole
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/Logger.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/Logger.cs
index 9226c4b930..ff9244d8b2 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/Logger.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/Logger.cs
@@ -7,7 +7,7 @@
 using System.Xml;
 using System.Diagnostics;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class Logger
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/MonitorLoadUtils.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/MonitorLoadUtils.cs
index 80661566fa..268f9d7dbf 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/MonitorLoadUtils.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/MonitorLoadUtils.cs
@@ -3,19 +3,18 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Monitoring;
 using System.Reflection;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public static class MonitorLoader
     {
         public static IMonitorLoader LoadMonitorLoaderAssembly()
         {
             IMonitorLoader monitorloader = null;
-            const string classname = "Monitoring.MonitorLoader";
+            const string classname = "Microsoft.Data.SqlClient.Test.Stress.MonitorLoader";
             const string interfacename = "IMonitorLoader";
-            Assembly mainAssembly = typeof(Monitoring.IMonitorLoader).GetTypeInfo().Assembly;
+            Assembly mainAssembly = typeof(IMonitorLoader).GetTypeInfo().Assembly;
 
             Type t = mainAssembly.GetType(classname);
             //make sure the type is derived from IMonitorLoader
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/RecordedExceptions.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/RecordedExceptions.cs
index 72a10f4d30..36982ccde1 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/RecordedExceptions.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Monitor/RecordedExceptions.cs
@@ -8,7 +8,7 @@
 using System.Diagnostics;
 using System.Threading;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class RecordedExceptions
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/PerfCounters.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/PerfCounters.cs
index 84a3ccfba0..307de8e1e2 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/PerfCounters.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/PerfCounters.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class PerfCounters
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Program.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Program.cs
index 6b49692aa7..da1ce59316 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Program.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Program.cs
@@ -4,208 +4,195 @@
 
 using System;
 using System.Collections.Generic;
+using System.CommandLine;
+using System.CommandLine.Parsing;
 using System.IO;
 using System.Reflection;
 
 using Microsoft.Data.SqlClient;
 
-namespace DPStressHarness//Microsoft.Data.SqlClient.Stress
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     class Program
     {
         private static bool s_debugMode = false;
-        static int Main(string[] args)
-        {
-            Init(args);
-            return Run();
-        }
-
-        public enum RunMode
-        {
-            RunAll,
-            RunVerify,
-            Help,
-            ExitWithError
-        };
-
-        private static RunMode s_mode = RunMode.RunAll;
+        private static bool s_console = false;
         private static IEnumerable<TestBase> s_tests;
         private static StressEngine s_eng;
-        private static string s_error;
-        private static bool s_console = false;
 
-        public static void Init(string[] args)
+        static int Main(string[] args)
         {
-            for (int i = 0; i < args.Length; i++)
+            var assemblyOption = new Option<string>("--assembly")
+            {
+                Description = "The name of the assembly containing the tests (loaded via Assembly.Load).",
+                Required = true
+            };
+
+            var overrideOption = new Option<string[]>("--override")
+            {
+                Description = "Override a test property. Format: name=value",
+                AllowMultipleArgumentsPerToken = true
+            };
+
+            var variationOption = new Option<string[]>("--variation")
+            {
+                Description = "Add a test variation.",
+                AllowMultipleArgumentsPerToken = true
+            };
+
+            var testOption = new Option<string>("--test") { Description = "Run specific test(s), semicolon-separated." };
+            var durationOption = new Option<int?>("--duration") { Description = "Duration of the test in seconds." };
+            var threadsOption = new Option<int?>("--threads") { Description = "Number of threads to use." };
+            var consoleOption = new Option<bool>("--console") { Description = "Emit all output to the console." };
+            var debugOption = new Option<bool>("--debug") { Description = "Print process ID and wait for debugger attach." };
+            var exceptionThresholdOption = new Option<int?>("--exception-threshold") { Description = "Limit on exceptions before test halts." };
+            var monitorEnabledOption = new Option<bool?>("--monitor-enabled") { Description = "Enable monitoring." };
+            var randomSeedOption = new Option<int?>("--random-seed") { Description = "Seed for the random number generator." };
+            var filterOption = new Option<string>("--filter") { Description = "Run tests matching the given filter. Example: TestType=Query,Update;IsServerTest=True" };
+            var printMethodNameOption = new Option<bool>("--print-method-name") { Description = "Print test method names to console." };
+            var deadlockDetectionOption = new Option<bool>("--deadlock-detection") { Description = "Enable deadlock detection." };
+
+            var rootCommand = new RootCommand("SqlClient Stress Test Runner")
             {
-                switch (args[i])
+                assemblyOption,
+                overrideOption,
+                variationOption,
+                testOption,
+                durationOption,
+                threadsOption,
+                consoleOption,
+                debugOption,
+                exceptionThresholdOption,
+                monitorEnabledOption,
+                randomSeedOption,
+                filterOption,
+                printMethodNameOption,
+                deadlockDetectionOption
+            };
+
+            rootCommand.SetAction((ParseResult result) =>
+            {
+                // Assembly
+                TestFinder.AssemblyName = new AssemblyName(result.GetValue(assemblyOption));
+
+                // Overrides (format: name=value)
+                var overrides = result.GetValue(overrideOption);
+                if (overrides != null)
                 {
-                    case "-a":
-                        string assemblyName = args[++i];
-                        TestFinder.AssemblyName = new AssemblyName(assemblyName);
-                        break;
-
-                    case "-all":
-                        s_mode = RunMode.RunAll;
-                        break;
-
-                    case "-override":
-                        TestMetrics.Overrides.Add(args[++i], args[++i]);
-                        break;
-
-                    case "-variation":
-                        TestMetrics.Variations.Add(args[++i]);
-                        break;
-
-                    case "-test":
-                        TestMetrics.SelectedTests.AddRange(args[++i].Split(';'));
-                        break;
-
-                    case "-duration":
-                        TestMetrics.StressDuration = int.Parse(args[++i]);
-                        break;
-
-                    case "-threads":
-                        TestMetrics.StressThreads = int.Parse(args[++i]);
-                        break;
-
-                    case "-verify":
-                        s_mode = RunMode.RunVerify;
-                        break;
-
-                    case "-console":
-                        s_console = true;
-                        break;
-
-                    case "-debug":
-                        s_debugMode = true;
-                        if (System.Diagnostics.Debugger.IsAttached)
+                    foreach (var item in overrides)
+                    {
+                        var eqIndex = item.IndexOf('=');
+                        if (eqIndex <= 0)
                         {
-                            System.Diagnostics.Debugger.Break();
+                            Console.Error.WriteLine($"Error: --override value '{item}' must be in name=value format.");
+                            Environment.Exit(1);
                         }
-                        else
-                        {
-                            Console.WriteLine("Current PID: {0}, attach the debugger and press Enter to continue the execution...", System.Diagnostics.Process.GetCurrentProcess().Id);
-                            Console.ReadLine();
-                        }
-                        break;
+                        TestMetrics.Overrides.Add(item.Substring(0, eqIndex), item.Substring(eqIndex + 1));
+                    }
+                }
 
-                    case "-exceptionThreshold":
-                        TestMetrics.ExceptionThreshold = int.Parse(args[++i]);
-                        break;
+                // Variations
+                var variations = result.GetValue(variationOption);
+                if (variations != null)
+                {
+                    foreach (var v in variations)
+                    {
+                        TestMetrics.Variations.Add(v);
+                    }
+                }
 
-                    case "-monitorenabled":
-                        TestMetrics.MonitorEnabled = bool.Parse(args[++i]);
-                        break;
+                // Test
+                var test = result.GetValue(testOption);
+                if (test != null)
+                {
+                    TestMetrics.SelectedTests.AddRange(test.Split(';'));
+                }
 
-                    case "-randomSeed":
-                        TestMetrics.RandomSeed = int.Parse(args[++i]);
-                        break;
+                // Duration
+                var duration = result.GetValue(durationOption);
+                if (duration.HasValue)
+                {
+                    TestMetrics.StressDuration = duration.Value;
+                }
 
-                    case "-filter":
-                        TestMetrics.Filter = args[++i];
-                        break;
+                // Threads
+                var threads = result.GetValue(threadsOption);
+                if (threads.HasValue)
+                {
+                    TestMetrics.StressThreads = threads.Value;
+                }
 
-                    case "-printMethodName":
-                        TestMetrics.PrintMethodName = true;
-                        break;
+                // Console
+                s_console = result.GetValue(consoleOption);
 
-                    case "-deadlockdetection":
-                        if (bool.Parse(args[++i]))
-                        {
-                            DeadlockDetection.Enable();
-                        }
-                        break;
+                // Debug
+                s_debugMode = result.GetValue(debugOption);
+                if (s_debugMode)
+                {
+                    if (System.Diagnostics.Debugger.IsAttached)
+                    {
+                        System.Diagnostics.Debugger.Break();
+                    }
+                    else
+                    {
+                        Console.WriteLine("Current PID: {0}, attach the debugger and press Enter to continue the execution...", System.Diagnostics.Process.GetCurrentProcess().Id);
+                        Console.ReadLine();
+                    }
+                }
 
-                    default:
-                        s_mode = RunMode.Help;
-                        break;
+                // Exception threshold
+                var threshold = result.GetValue(exceptionThresholdOption);
+                if (threshold.HasValue)
+                {
+                    TestMetrics.ExceptionThreshold = threshold.Value;
                 }
-            }
 
-            PrintConfigSummary();
+                // Monitor enabled
+                var monitor = result.GetValue(monitorEnabledOption);
+                if (monitor.HasValue)
+                {
+                    TestMetrics.MonitorEnabled = monitor.Value;
+                }
 
-            if (TestFinder.AssemblyName != null)
-            {
-                Console.WriteLine("Assembly Found for the Assembly Name " + TestFinder.AssemblyName);
+                // Random seed
+                var seed = result.GetValue(randomSeedOption);
+                if (seed.HasValue)
+                {
+                    TestMetrics.RandomSeed = seed.Value;
+                }
 
-                // get and load all the tests
-                s_tests = TestFinder.GetTests(Assembly.Load(TestFinder.AssemblyName));
+                // Filter
+                var filter = result.GetValue(filterOption);
+                if (filter != null)
+                {
+                    TestMetrics.Filter = filter;
+                }
 
-                // instantiate the stress engine
-                s_eng = new StressEngine(TestMetrics.StressThreads, TestMetrics.StressDuration, s_tests, TestMetrics.RandomSeed);
-            }
-            else
-            {
-                Program.s_error = string.Format("Assembly {0} cannot be found.", TestFinder.AssemblyName);
-                s_mode = RunMode.ExitWithError;
-            }
-        }
+                // Print method name
+                TestMetrics.PrintMethodName = result.GetValue(printMethodNameOption);
 
-        public static int Run()
-        {
-            if (TestFinder.AssemblyName == null)
-            {
-                s_mode = RunMode.Help;
-            }
-            switch (s_mode)
-            {
-                case RunMode.RunAll:
-                    return RunStress();
+                // Deadlock detection
+                if (result.GetValue(deadlockDetectionOption))
+                {
+                    DeadlockDetection.Enable();
+                }
 
-                case RunMode.RunVerify:
-                    return RunVerify();
+                // Print config, load tests, and run
+                PrintConfigSummary();
 
-                case RunMode.ExitWithError:
-                    return ExitWithError();
+                Console.WriteLine("Assembly Found for the Assembly Name " + TestFinder.AssemblyName);
+                s_tests = TestFinder.GetTests(Assembly.Load(TestFinder.AssemblyName));
+                s_eng = new StressEngine(TestMetrics.StressThreads, TestMetrics.StressDuration, s_tests, TestMetrics.RandomSeed);
+            });
 
-                case RunMode.Help:
-                default:
-                    return PrintHelp();
+            var parseResult = rootCommand.Parse(args);
+            int exitCode = parseResult.Invoke();
+            if (exitCode != 0 || s_eng == null)
+            {
+                return exitCode;
             }
-        }
 
-        private static int PrintHelp()
-        {
-            Console.WriteLine("stresstest.exe [-a <module name>] <arguments>");
-            Console.WriteLine();
-            Console.WriteLine("   -a <module name> should specify path to the assembly containing the tests.");
-            Console.WriteLine();
-            Console.WriteLine("Supported options are:");
-            Console.WriteLine();
-            Console.WriteLine("   -all                        Run all tests - best for debugging, not perf measurements.");
-            Console.WriteLine();
-            Console.WriteLine("   -verify                     Run in functional verification mode.");
-            Console.WriteLine();
-            Console.WriteLine("   -duration <n>               Duration of the test in seconds.");
-            Console.WriteLine();
-            Console.WriteLine("   -threads <n>                Number of threads to use.");
-            Console.WriteLine();
-            Console.WriteLine("   -override <name> <value>    Override the value of a test property.");
-            Console.WriteLine();
-            Console.WriteLine("   -test <name1;name2>         Run specific test(s).");
-            Console.WriteLine();
-            Console.WriteLine("   -console                    Emit all output to the console.");
-            Console.WriteLine();
-            Console.WriteLine("   -debug                      Print process ID in the beginning and wait for Enter (to give your time to attach the debugger).");
-            Console.WriteLine();
-            Console.WriteLine("   -exceptionThreshold <n>     An optional limit on exceptions which will be caught. When reached, test will halt.");
-            Console.WriteLine();
-            Console.WriteLine("   -monitorenabled             True or False to enable monitoring. Default is false");
-            Console.WriteLine();
-            Console.WriteLine("   -randomSeed                 Enables setting of the random number generator used internally.  This serves both the purpose");
-            Console.WriteLine("                               of helping to improve reproducibility and making it deterministic from Chess's perspective");
-            Console.WriteLine("                               for a given schedule. Default is " + TestMetrics.RandomSeed + ".");
-            Console.WriteLine();
-            Console.WriteLine("   -filter                     Run tests whose stress test attributes match the given filter. Filter is not applied if attribute");
-            Console.WriteLine("                               does not implement ITestAttributeFilter. Example: -filter TestType=Query,Update;IsServerTest=True ");
-            Console.WriteLine();
-            Console.WriteLine("   -printMethodName            Print tests' title in console window");
-            Console.WriteLine();
-            Console.WriteLine("   -deadlockdetection          True or False to enable deadlock detection. Default is false");
-            Console.WriteLine();
-
-            return 1;
+            return Run();
         }
 
         private static void PrintConfigSummary()
@@ -215,7 +202,6 @@ private static void PrintConfigSummary()
             Console.WriteLine(border);
             Console.WriteLine($"MDS Version:         {GetMdsVersion()}");
             Console.WriteLine($"Test Assembly Name:  {TestFinder.AssemblyName}");
-            Console.WriteLine($"Run mode:            {Enum.GetName(typeof(RunMode), s_mode)}");
             foreach (var item in TestMetrics.Overrides)
             {
                 Console.WriteLine($"Override:            {item.Key} = {item.Value}");
@@ -235,18 +221,7 @@ private static void PrintConfigSummary()
             Console.WriteLine(border);
         }
 
-        private static int ExitWithError()
-        {
-            Environment.FailFast("Exit with error(s).");
-            return 1;
-        }
-
-        private static int RunVerify()
-        {
-            throw new NotImplementedException();
-        }
-
-        private static int RunStress()
+        private static int Run()
         {
             if (!s_console)
             {
@@ -275,7 +250,7 @@ private static string GetMdsVersion()
             // See:  tools/targets/GenerateThisAssemblyCs.targets
             //
             var assembly = typeof(SqlConnection).Assembly;
-            var type = assembly.GetType("System.ThisAssembly");
+            var type = assembly.GetType("Microsoft.Data.SqlClient.ThisAssembly");
             if (type is null)
             {
                 return "<unknown>";
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
index d0c325fcef..8a2bc08b4c 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
@@ -5,6 +5,10 @@
     <AssemblyName>stresstest</AssemblyName>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.CommandLine" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
 
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/StressEngine.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/StressEngine.cs
index 349b5c0539..f20b9104d1 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/StressEngine.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/StressEngine.cs
@@ -6,9 +6,8 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Diagnostics;
-using Monitoring;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class StressEngine
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/TestFinder.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/TestFinder.cs
index 3f18c6df43..498964c132 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/TestFinder.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/TestFinder.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     internal class TestFinder
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/MultithreadedTest.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/MultithreadedTest.cs
index 01ea961426..1fe985936b 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/MultithreadedTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/MultithreadedTest.cs
@@ -8,7 +8,7 @@
 using System.Diagnostics;
 using System.Threading;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     internal class MultiThreadedTest : TestBase
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/StressTest.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/StressTest.cs
index c2637d5e5d..a96838b4f5 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/StressTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/StressTest.cs
@@ -9,7 +9,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     internal class StressTest : TestBase
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/Test.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/Test.cs
index a73448a30b..35353ec7bf 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/Test.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/Test.cs
@@ -7,7 +7,7 @@
 using System.Reflection;
 
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     internal class Test : TestBase
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/TestBase.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/TestBase.cs
index 95546547da..3cc2dac8bf 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/TestBase.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/TestBase.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public abstract class TestBase
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/ThreadPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/ThreadPoolTest.cs
index f065c15312..c52125ea7e 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/ThreadPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Tests/ThreadPoolTest.cs
@@ -10,7 +10,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 
-namespace DPStressHarness
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     internal class ThreadPoolTest : TestBase
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/FilteredDefaultTraceListener.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/FilteredDefaultTraceListener.cs
index ce29f8ee29..0e102fedef 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/FilteredDefaultTraceListener.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/FilteredDefaultTraceListener.cs
@@ -7,7 +7,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 
-namespace Stress.Data.SqlClient
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     /// <summary>
     /// A DefaultTraceListener that can filter out given asserts
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/HostsFileManager.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/HostsFileManager.cs
index 6d44909ddb..7c665ee516 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/HostsFileManager.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/HostsFileManager.cs
@@ -12,7 +12,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.Test.Data.SqlClient
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     /// <summary>
     /// allows user to manipulate %windir%\system32\drivers\etc\hosts
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/MultiSubnetFailoverSetup.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/MultiSubnetFailoverSetup.cs
index 2a0719d201..9fb1f9b5bb 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/MultiSubnetFailoverSetup.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/MultiSubnetFailoverSetup.cs
@@ -2,14 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Test.Data.SqlClient;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 
-namespace Stress.Data.SqlClient
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     internal class MultiSubnetFailoverSetup
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/NetUtils.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/NetUtils.cs
index 0e756d1bf9..c3bac5b53d 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/NetUtils.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/NetUtils.cs
@@ -9,7 +9,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Microsoft.Test.Data.SqlClient
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public static class NetUtils
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientStressFactory.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientStressFactory.cs
index 7aec9d461a..32db797c97 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientStressFactory.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientStressFactory.cs
@@ -6,9 +6,8 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.Data.SqlClient;
-using Microsoft.Test.Data.SqlClient;
 
-namespace Stress.Data.SqlClient
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class SqlClientStressFactory : DataStressFactory
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientTestGroup.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientTestGroup.cs
index 7c7597ba8a..b524a15a14 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientTestGroup.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClientTestGroup.cs
@@ -11,10 +11,9 @@
 using Microsoft.Data.SqlClient;
 using System.Xml;
 
-using DPStressHarness;
 using System.IO;
 
-namespace Stress.Data.SqlClient
+namespace Microsoft.Data.SqlClient.Test.Stress
 {
     public class SqlClientTestGroup : DataTestGroup
     {

From fd8cb4b8242a1410f17a4965804c9ccd644e7c81 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 10 Jun 2026 16:05:37 -0300
Subject: [PATCH 142/298] Use upper-bound version ranges for sibling package
 dependencies (#4337)

* Use upper-bound version ranges for sibling package dependencies

Compute [floor, ceiling) ranges for sibling packages so NuGet cannot
resolve an incompatible newer minor/major version at restore time.

- Directory.Packages.props: derive *VersionCeiling from *PackageVersion;
  apply ranges to sibling PackageVersion items; add SniVersionRange
- SqlClient csproj: compute version range properties for nuspec expansion
- SqlClient nuspec: replace bare version tokens with range tokens

* CI: Pass ReferenceType and dependency versions to pack jobs

The CI/PR pack jobs for Abstractions and Azure extensions were not
passing ReferenceType=Package to dotnet pack, causing the projects to
use ProjectReference mode for sibling dependencies. NuGet converts
ProjectReferences to bare version dependencies (no ranges), which
defeats the upper-bound version ranges defined in Directory.Packages.props.

Fix:
- pack-abstractions-package-ci-job: Add referenceType, loggingArtifactsName,
  and loggingPackageVersion parameters. When referenceType=Package, download
  Logging artifacts and pass ReferenceType + LoggingPackageVersion to dotnet
  pack buildProperties.
- pack-azure-package-ci-job: Add loggingPackageVersion parameter. When
  referenceType=Package, pass ReferenceType + dependency versions to dotnet
  pack buildProperties.
- Wire the new parameters through build-abstractions-package-ci-stage.yml
  and dotnet-sqlclient-ci-core.yml.
---
 Directory.Packages.props                      | 41 +++++++++---
 eng/pipelines/dotnet-sqlclient-ci-core.yml    |  3 +
 .../jobs/pack-abstractions-package-ci-job.yml | 67 ++++++++++++++++---
 .../jobs/pack-azure-package-ci-job.yml        | 43 +++++++++---
 .../build-abstractions-package-ci-stage.yml   | 27 ++++++++
 .../stages/build-azure-package-ci-stage.yml   |  2 +
 .../src/Microsoft.Data.SqlClient.csproj       | 11 ++-
 .../src/Microsoft.Data.SqlClient.nuspec       | 30 ++++-----
 8 files changed, 180 insertions(+), 44 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index a74caf225a..c35ad35a59 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -40,6 +40,31 @@
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
 
+  <!--
+    Compute version ceilings for sibling packages. The ceiling is the next major version
+    (prerelease suffix stripped) derived from the *floor* (XxxPackageVersion), giving a range
+    like [1.1.0-preview1-ci123, 2.0.0).  This prevents NuGet from resolving an incompatible
+    newer major version while allowing minor/patch updates within the same major.
+
+    Because the ceiling is derived from the floor, no separate NextVersion lookup is needed
+    here — the range is self-contained regardless of what pipeline or developer scenario
+    computed the floor.
+  -->
+  <PropertyGroup>
+    <!-- SNI version (external package, version declared once here) -->
+    <SniVersion>6.0.2</SniVersion>
+    <SniVersionRange>[$(SniVersion), $([MSBuild]::Add($(SniVersion.Split('.')[0]), 1)).0.0)</SniVersionRange>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(ReferenceType)' == 'Package'">
+    <SqlServerVersionCeiling>$([MSBuild]::Add($(SqlServerPackageVersion.Trim().Split('.')[0]), 1)).0.0</SqlServerVersionCeiling>
+    <LoggingVersionCeiling>$([MSBuild]::Add($(LoggingPackageVersion.Trim().Split('.')[0]), 1)).0.0</LoggingVersionCeiling>
+    <AbstractionsVersionCeiling>$([MSBuild]::Add($(AbstractionsPackageVersion.Trim().Split('.')[0]), 1)).0.0</AbstractionsVersionCeiling>
+    <SqlClientVersionCeiling>$([MSBuild]::Add($(SqlClientPackageVersion.Trim().Split('.')[0]), 1)).0.0</SqlClientVersionCeiling>
+    <AzureVersionCeiling>$([MSBuild]::Add($(AzurePackageVersion.Trim().Split('.')[0]), 1)).0.0</AzureVersionCeiling>
+    <AkvProviderVersionCeiling>$([MSBuild]::Add($(AkvProviderPackageVersion.Trim().Split('.')[0]), 1)).0.0</AkvProviderVersionCeiling>
+  </PropertyGroup>
+
   <!-- ===================================================================== -->
   <!-- Driver Packages -->
 
@@ -47,22 +72,22 @@
   <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
     <PackageVersion
       Include="Microsoft.SqlServer.Server"
-      Version="$(SqlServerPackageVersion)" />
+      Version="[$(SqlServerPackageVersion), $(SqlServerVersionCeiling))" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Internal.Logging"
-      Version="$(LoggingPackageVersion)" />
+      Version="[$(LoggingPackageVersion), $(LoggingVersionCeiling))" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
-      Version="$(AbstractionsPackageVersion)" />
+      Version="[$(AbstractionsPackageVersion), $(AbstractionsVersionCeiling))" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient"
-      Version="$(SqlClientPackageVersion)" />
+      Version="[$(SqlClientPackageVersion), $(SqlClientVersionCeiling))" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Extensions.Azure"
-      Version="$(AzurePackageVersion)" />
+      Version="[$(AzurePackageVersion), $(AzureVersionCeiling))" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider"
-      Version="$(AkvProviderPackageVersion)" />
+      Version="[$(AkvProviderPackageVersion), $(AkvProviderVersionCeiling))" />
   </ItemGroup>
 
   <!-- ===================================================================== -->
@@ -108,8 +133,8 @@
   <!-- SqlClient Dependencies -->
 
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Data.SqlClient.SNI" Version="6.0.2" />
-    <PackageVersion Include="Microsoft.Data.SqlClient.SNI.runtime" Version="6.0.2" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.SNI" Version="$(SniVersionRange)" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(SniVersionRange)" />
     <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.16.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.16.0" />
     <PackageVersion Include="System.Buffers" Version="4.6.1" />
diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index 6c4399c9cb..9ee7c7132d 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -164,6 +164,9 @@ stages:
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+      loggingArtifactsName: $(loggingArtifactsName)
+      loggingPackageVersion: $(loggingPackageVersion)
+      referenceType: ${{ parameters.referenceType }}
       # When building Abstractions via packages, we must depend on the Logging
       # package.
       ${{ if eq(parameters.referenceType, 'Package') }}:
diff --git a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
index a9cb5b1043..d077aa2115 100644
--- a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
@@ -53,6 +53,30 @@ parameters:
     - detailed
     - diagnostic
 
+  # The name of the Logging pipeline artifacts to download.
+  #
+  # This is used when the referenceType is 'Package'.
+  - name: loggingArtifactsName
+    type: string
+    default: Logging.Artifacts
+
+  # The Logging package version to depend on.
+  #
+  # This is used when the referenceType is 'Package'.
+  - name: loggingPackageVersion
+    type: string
+    default: ''
+
+  # The C# project reference type to use when building and packing the packages.
+  - name: referenceType
+    type: string
+    default: Project
+    values:
+      # Reference sibling packages as NuGet packages.
+      - Package
+      # Reference sibling packages as C# projects.
+      - Project
+
 jobs:
 
   - job: pack_abstractions_package_job
@@ -102,21 +126,46 @@ jobs:
         - pwsh: 'Get-ChildItem Env: | Sort-Object Name'
           displayName: '[Debug] Print Environment Variables'
 
+      # For Package reference builds, we must first download the dependency
+      # package artifacts.
+      - ${{ if eq(parameters.referenceType, 'Package') }}:
+        - task: DownloadPipelineArtifact@2
+          displayName: Download Logging Package Artifacts
+          inputs:
+            artifactName: ${{ parameters.loggingArtifactsName }}
+            targetPath: $(Build.SourcesDirectory)/packages
+
       # Install the .NET SDK.
       - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}
 
       # Create the NuGet packages.
-      - task: DotNetCoreCLI@2
-        displayName: Create NuGet Package
-        inputs:
-          command: pack
-          packagesToPack: $(project)
-          configurationToPack: ${{ parameters.buildConfiguration }}
-          packDirectory: $(dotnetPackagesDir)
-          verbosityToPack: ${{ parameters.dotnetVerbosity }}
-          buildProperties: AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};AbstractionsAssemblyFileVersion=${{ parameters.abstractionsAssemblyFileVersion }}
+      #
+      # When referenceType is Package, we must pass ReferenceType and the
+      # dependency version so that Directory.Packages.props applies version
+      # ranges to sibling package dependencies.
+      - ${{ if eq(parameters.referenceType, 'Package') }}:
+        - task: DotNetCoreCLI@2
+          displayName: Create NuGet Package
+          inputs:
+            command: pack
+            packagesToPack: $(project)
+            configurationToPack: ${{ parameters.buildConfiguration }}
+            packDirectory: $(dotnetPackagesDir)
+            verbosityToPack: ${{ parameters.dotnetVerbosity }}
+            buildProperties: AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};AbstractionsAssemblyFileVersion=${{ parameters.abstractionsAssemblyFileVersion }};ReferenceType=Package;LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
+
+      - ${{ else }}:
+        - task: DotNetCoreCLI@2
+          displayName: Create NuGet Package
+          inputs:
+            command: pack
+            packagesToPack: $(project)
+            configurationToPack: ${{ parameters.buildConfiguration }}
+            packDirectory: $(dotnetPackagesDir)
+            verbosityToPack: ${{ parameters.dotnetVerbosity }}
+            buildProperties: AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};AbstractionsAssemblyFileVersion=${{ parameters.abstractionsAssemblyFileVersion }}
 
       # Publish the NuGet packages as a named pipeline artifact.
       - task: PublishPipelineArtifact@1
diff --git a/eng/pipelines/jobs/pack-azure-package-ci-job.yml b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
index eaf0e3c66f..12567fec14 100644
--- a/eng/pipelines/jobs/pack-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
@@ -26,12 +26,19 @@ parameters:
     type: string
     default: Logging.Artifacts
 
-  # The Abstractions package verion to depend on.
+  # The Abstractions package version to depend on.
   #
   # This is used when the referenceType is 'Package'.
   - name: abstractionsPackageVersion
     type: string
 
+  # The Logging package version to depend on.
+  #
+  # This is used when the referenceType is 'Package'.
+  - name: loggingPackageVersion
+    type: string
+    default: ''
+
   # The name of the pipeline artifacts to publish.
   - name: azureArtifactsName
     type: string
@@ -151,15 +158,31 @@ jobs:
           debug: ${{ parameters.debug }}
 
       # Create the NuGet packages.
-      - task: DotNetCoreCLI@2
-        displayName: Create NuGet Package
-        inputs:
-          command: pack
-          packagesToPack: $(project)
-          configurationToPack: ${{ parameters.buildConfiguration }}
-          packDirectory: $(dotnetPackagesDir)
-          verbosityToPack: ${{ parameters.dotnetVerbosity }}
-          buildProperties: AzurePackageVersion=${{ parameters.azurePackageVersion }};AzureAssemblyFileVersion=${{ parameters.azureAssemblyFileVersion }}
+      #
+      # When referenceType is Package, we must pass ReferenceType and the
+      # dependency versions so that Directory.Packages.props applies version
+      # ranges to sibling package dependencies.
+      - ${{ if eq(parameters.referenceType, 'Package') }}:
+        - task: DotNetCoreCLI@2
+          displayName: Create NuGet Package
+          inputs:
+            command: pack
+            packagesToPack: $(project)
+            configurationToPack: ${{ parameters.buildConfiguration }}
+            packDirectory: $(dotnetPackagesDir)
+            verbosityToPack: ${{ parameters.dotnetVerbosity }}
+            buildProperties: AzurePackageVersion=${{ parameters.azurePackageVersion }};AzureAssemblyFileVersion=${{ parameters.azureAssemblyFileVersion }};ReferenceType=Package;LoggingPackageVersion=${{ parameters.loggingPackageVersion }};AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
+
+      - ${{ else }}:
+        - task: DotNetCoreCLI@2
+          displayName: Create NuGet Package
+          inputs:
+            command: pack
+            packagesToPack: $(project)
+            configurationToPack: ${{ parameters.buildConfiguration }}
+            packDirectory: $(dotnetPackagesDir)
+            verbosityToPack: ${{ parameters.dotnetVerbosity }}
+            buildProperties: AzurePackageVersion=${{ parameters.azurePackageVersion }};AzureAssemblyFileVersion=${{ parameters.azureAssemblyFileVersion }}
 
       # Publish the NuGet packages as a named pipeline artifact.
       - task: PublishPipelineArtifact@1
diff --git a/eng/pipelines/stages/build-abstractions-package-ci-stage.yml b/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
index 6aae1703b8..8579b79caf 100644
--- a/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
@@ -67,6 +67,30 @@ parameters:
     - detailed
     - diagnostic
 
+  # The name of the Logging pipeline artifacts to download.
+  #
+  # This is used when the referenceType is 'Package'.
+  - name: loggingArtifactsName
+    type: string
+    default: Logging.Artifacts
+
+  # The Logging package version to depend on.
+  #
+  # This is used when the referenceType is 'Package'.
+  - name: loggingPackageVersion
+    type: string
+    default: ''
+
+  # The C# project reference type to use when building and packing the packages.
+  - name: referenceType
+    type: string
+    default: Project
+    values:
+      # Reference sibling packages as NuGet packages.
+      - Package
+      # Reference sibling packages as C# projects.
+      - Project
+
 stages:
 
   - stage: build_abstractions_package_stage
@@ -141,3 +165,6 @@ stages:
             - test_abstractions_package_job_windows
             - test_abstractions_package_job_macos
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+          loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
+          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
+          referenceType: ${{ parameters.referenceType }}
diff --git a/eng/pipelines/stages/build-azure-package-ci-stage.yml b/eng/pipelines/stages/build-azure-package-ci-stage.yml
index 1da56a18ef..b3cf9073d5 100644
--- a/eng/pipelines/stages/build-azure-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-azure-package-ci-stage.yml
@@ -331,4 +331,6 @@ stages:
             - test_azure_package_job_windows_integration
             - test_azure_package_job_macos
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+          loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
+          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           referenceType: ${{ parameters.referenceType }}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index e9b3ad2741..06eaf9e914 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -207,9 +207,16 @@
     <Error Condition="'$(_SqlServerPackageVersionTrimmed)' == ''"
       Text="SqlServerPackageVersion is required for SqlClient packaging. When packing via build.proj, set -p:PackageVersionSqlServer=&lt;version&gt;; when packing the project directly, set -p:SqlServerPackageVersion=&lt;version&gt;; otherwise ensure the SqlServer Versions.props import can resolve a value." />
 
-    <!-- Expand the SqlClientPackNuspec template with the computed package versions. -->
+    <!-- Expand the SqlClientPackNuspec template with computed version ranges. -->
     <PropertyGroup>
-      <_SqlClientPackNuspecExpandedText>$([System.IO.File]::ReadAllText('$(SqlClientPackNuspecTemplatePath)').Replace('$AbstractionsPackageVersion$','$(AbstractionsPackageVersion)').Replace('$LoggingPackageVersion$','$(LoggingPackageVersion)').Replace('$SqlServerPackageVersion$','$(SqlServerPackageVersion)'))</_SqlClientPackNuspecExpandedText>
+      <!-- Compute version ranges: [floor, (floor.Major+1).0.0) — ceiling derived from floor.
+           Use trimmed values to guard against whitespace passed via -p: arguments. -->
+      <_AbstractionsVersionRange>[$(_AbstractionsPackageVersionTrimmed), $([MSBuild]::Add($(_AbstractionsPackageVersionTrimmed.Split('.')[0]), 1)).0.0)</_AbstractionsVersionRange>
+      <_LoggingVersionRange>[$(_LoggingPackageVersionTrimmed), $([MSBuild]::Add($(_LoggingPackageVersionTrimmed.Split('.')[0]), 1)).0.0)</_LoggingVersionRange>
+      <_SqlServerVersionRange>[$(_SqlServerPackageVersionTrimmed), $([MSBuild]::Add($(_SqlServerPackageVersionTrimmed.Split('.')[0]), 1)).0.0)</_SqlServerVersionRange>
+    </PropertyGroup>
+    <PropertyGroup>
+      <_SqlClientPackNuspecExpandedText>$([System.IO.File]::ReadAllText('$(SqlClientPackNuspecTemplatePath)').Replace('$AbstractionsVersionRange$','$(_AbstractionsVersionRange)').Replace('$LoggingVersionRange$','$(_LoggingVersionRange)').Replace('$SqlServerVersionRange$','$(_SqlServerVersionRange)').Replace('$SniVersionRange$','$(SniVersionRange)'))</_SqlClientPackNuspecExpandedText>
     </PropertyGroup>
     <WriteLinesToFile File="$(SqlClientPackNuspecGeneratedPath)"
                       Lines="$(_SqlClientPackNuspecExpandedText)"
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
index a302359ea0..7d94bb7687 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
@@ -38,9 +38,9 @@
       <group targetFramework="net462">
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
         <dependency id="Microsoft.Bcl.TimeProvider" version="8.0.1" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.SNI" version="$SniVersionRange$" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
@@ -56,38 +56,38 @@
       </group>
       <group targetFramework="net8.0">
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="$SniVersionRange$" exclude="Compile" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
-        <dependency id="Microsoft.SqlServer.Server" version="$SqlServerPackageVersion$" />
+        <dependency id="Microsoft.SqlServer.Server" version="$SqlServerVersionRange$" />
         <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
       </group>
       <group targetFramework="net9.0">
         <dependency id="Microsoft.Bcl.Cryptography" version="9.0.13" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="$SniVersionRange$" exclude="Compile" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.13" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
-        <dependency id="Microsoft.SqlServer.Server" version="$SqlServerPackageVersion$" />
+        <dependency id="Microsoft.SqlServer.Server" version="$SqlServerVersionRange$" />
         <dependency id="System.Configuration.ConfigurationManager" version="9.0.13" exclude="Compile" />
         <dependency id="System.Security.Cryptography.Pkcs" version="9.0.13" />
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
         <dependency id="Microsoft.Bcl.TimeProvider" version="8.0.1" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingPackageVersion$" />
-        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="$SniVersionRange$" exclude="Compile" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
-        <dependency id="Microsoft.SqlServer.Server" version="$SqlServerPackageVersion$" />
+        <dependency id="Microsoft.SqlServer.Server" version="$SqlServerVersionRange$" />
         <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
         <dependency id="System.Text.Json" version="10.0.3" />

From 377f5bf0e197626e4dee637451017bf0704b184c Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Thu, 11 Jun 2026 13:23:35 +0530
Subject: [PATCH 143/298] Auto-triage: label-gated follow-up, partial-progress
 acknowledgement, and /triage on-demand command (#4324)

* Add one-time follow-up triage when author provides missing env info

Extends the issue auto-triage workflow so a second (and final) triage
summary is produced when:
  1. The first triage flagged missing environment fields, AND
  2. The original issue author responds with a follow-up comment.

No further triage runs after the second summary. Comments from other
users, bots, or on PRs do not trigger re-triage.

NOTE: Maintainers must run 'gh aw compile' to regenerate
.github/workflows/issue-triage.lock.yml from this .md source.

* Regenerate issue-triage.lock.yml (gh aw compile v0.72.1)

* Add label gate, /triage on-demand, and partial-progress follow-up routing

* Silence noop tracking issue (report-as-issue: false)

* Exclude /triage prefix from author follow-up branch

Prevents non-maintainer issue authors from invoking the on-demand /triage command via the author+label follow-up branch. Lock file regenerated with gh aw compile v0.72.1.

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Tighten /triage command matching to strict token

Replace startsWith(body, '/triage') with strict token match (body == '/triage' || startsWith(body, '/triage ')) in both maintainer and author branches of the workflow-level if: gate so /triage-foo, /triagery, etc. no longer falsely match. Lock file regenerated with gh aw compile v0.72.1.

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/issue-triage.lock.yml |  99 ++++++++++---
 .github/workflows/issue-triage.md       | 177 ++++++++++++++++++++++--
 2 files changed, 247 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/issue-triage.lock.yml b/.github/workflows/issue-triage.lock.yml
index 54d5661b0c..cc20a3b859 100644
--- a/.github/workflows/issue-triage.lock.yml
+++ b/.github/workflows/issue-triage.lock.yml
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"20b8fbbfaae4d08b3206fb6b2f4000e43b8915e37f5afc9a534056f8ce9a563b","compiler_version":"v0.72.1","strict":true,"agent_id":"copilot"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"3fbe69c77302fcde863ac1c3f9df536f89e6a71a6b141b505437f06ed45182bc","compiler_version":"v0.72.1","strict":true,"agent_id":"copilot"}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"bc56a0cad2f450c562810785ef38649c04db812a","version":"v0.72.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.41","digest":"sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41","digest":"sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.41","digest":"sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.6","digest":"sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.6@sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c"},{"image":"ghcr.io/github/github-mcp-server:v1.0.3","digest":"sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959","pinned_image":"ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959"},{"image":"node:lts-alpine","digest":"sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f","pinned_image":"node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f"}]}
 #    ___                   _   _      
 #   / _ \                 | | (_)     
@@ -47,6 +47,9 @@
 
 name: "SqlClient Issue Auto-Triage"
 "on":
+  issue_comment:
+    types:
+    - created
   issues:
     types:
     - opened
@@ -61,6 +64,20 @@ run-name: "SqlClient Issue Auto-Triage"
 
 jobs:
   activation:
+    if: >
+      github.event_name == 'issues' ||
+      (github.event_name == 'issue_comment'
+      && github.event.issue.pull_request == null
+      && !endsWith(github.event.comment.user.login, '[bot]')
+      && (
+      ((github.event.comment.body == '/triage' || startsWith(github.event.comment.body, '/triage '))
+      && contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.comment.author_association))
+      ||
+      (github.event.comment.body != '/triage'
+      && !startsWith(github.event.comment.body, '/triage ')
+      && github.event.comment.user.login == github.event.issue.user.login
+      && contains(github.event.issue.labels.*.name, 'Auto-Triage: Waiting for Author'))
+      ))
     runs-on: ubuntu-slim
     permissions:
       actions: read
@@ -185,24 +202,25 @@ jobs:
           GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
           GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
           GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
+          GH_AW_IS_PR_COMMENT: ${{ github.event.issue.pull_request && 'true' || '' }}
         # poutine:ignore untrusted_checkout_exec
         run: |
           bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
           {
-          cat << 'GH_AW_PROMPT_b5f7a25dd7272e5f_EOF'
+          cat << 'GH_AW_PROMPT_ab488ada0396c523_EOF'
           <system>
-          GH_AW_PROMPT_b5f7a25dd7272e5f_EOF
+          GH_AW_PROMPT_ab488ada0396c523_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_b5f7a25dd7272e5f_EOF'
+          cat << 'GH_AW_PROMPT_ab488ada0396c523_EOF'
           <safe-output-tools>
-          Tools: add_comment, missing_tool, missing_data, noop
+          Tools: add_comment, add_labels, remove_labels, missing_tool, missing_data, noop
           </safe-output-tools>
-          GH_AW_PROMPT_b5f7a25dd7272e5f_EOF
+          GH_AW_PROMPT_ab488ada0396c523_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          cat << 'GH_AW_PROMPT_b5f7a25dd7272e5f_EOF'
+          cat << 'GH_AW_PROMPT_ab488ada0396c523_EOF'
           <github-context>
           The following GitHub context information is available for this workflow:
           {{#if __GH_AW_GITHUB_ACTOR__ }}
@@ -231,12 +249,15 @@ jobs:
           {{/if}}
           </github-context>
           
-          GH_AW_PROMPT_b5f7a25dd7272e5f_EOF
+          GH_AW_PROMPT_ab488ada0396c523_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          cat << 'GH_AW_PROMPT_b5f7a25dd7272e5f_EOF'
+          if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
+          fi
+          cat << 'GH_AW_PROMPT_ab488ada0396c523_EOF'
           </system>
           {{#runtime-import .github/workflows/issue-triage.md}}
-          GH_AW_PROMPT_b5f7a25dd7272e5f_EOF
+          GH_AW_PROMPT_ab488ada0396c523_EOF
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -261,6 +282,7 @@ jobs:
           GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
           GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
           GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
+          GH_AW_IS_PR_COMMENT: ${{ github.event.issue.pull_request && 'true' || '' }}
           GH_AW_MCP_CLI_SERVERS_LIST: '- `safeoutputs` — run `safeoutputs --help` to see available tools'
         with:
           script: |
@@ -281,6 +303,7 @@ jobs:
                 GH_AW_GITHUB_REPOSITORY: process.env.GH_AW_GITHUB_REPOSITORY,
                 GH_AW_GITHUB_RUN_ID: process.env.GH_AW_GITHUB_RUN_ID,
                 GH_AW_GITHUB_WORKSPACE: process.env.GH_AW_GITHUB_WORKSPACE,
+                GH_AW_IS_PR_COMMENT: process.env.GH_AW_IS_PR_COMMENT,
                 GH_AW_MCP_CLI_SERVERS_LIST: process.env.GH_AW_MCP_CLI_SERVERS_LIST
               }
             });
@@ -430,15 +453,17 @@ jobs:
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_421fab10d521b1cd_EOF'
-          {"add_comment":{"hide_older_comments":true,"max":1},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_421fab10d521b1cd_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_a309dbbfe73b9ee4_EOF'
+          {"add_comment":{"hide_older_comments":true,"max":1},"add_labels":{"allowed":["Auto-Triage: Waiting for Author"],"max":1},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"false"},"remove_labels":{"allowed":["Auto-Triage: Waiting for Author"],"max":1},"report_incomplete":{}}
+          GH_AW_SAFE_OUTPUTS_CONFIG_a309dbbfe73b9ee4_EOF
       - name: Generate Safe Outputs Tools
         env:
           GH_AW_TOOLS_META_JSON: |
             {
               "description_suffixes": {
-                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added. Supports reply_to_id for discussion threading."
+                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added. Supports reply_to_id for discussion threading.",
+                "add_labels": " CONSTRAINTS: Maximum 1 label(s) can be added. Only these labels are allowed: [\"Auto-Triage: Waiting for Author\"].",
+                "remove_labels": " CONSTRAINTS: Maximum 1 label(s) can be removed. Only these labels can be removed: [Auto-Triage: Waiting for Author]."
               },
               "repo_params": {},
               "dynamic_tools": []
@@ -467,6 +492,25 @@ jobs:
                   }
                 }
               },
+              "add_labels": {
+                "defaultMax": 5,
+                "fields": {
+                  "item_number": {
+                    "issueNumberOrTemporaryId": true
+                  },
+                  "labels": {
+                    "required": true,
+                    "type": "array",
+                    "itemType": "string",
+                    "itemSanitize": true,
+                    "itemMaxLength": 128
+                  },
+                  "repo": {
+                    "type": "string",
+                    "maxLength": 256
+                  }
+                }
+              },
               "missing_data": {
                 "defaultMax": 20,
                 "fields": {
@@ -524,6 +568,25 @@ jobs:
                   }
                 }
               },
+              "remove_labels": {
+                "defaultMax": 5,
+                "fields": {
+                  "item_number": {
+                    "issueNumberOrTemporaryId": true
+                  },
+                  "labels": {
+                    "required": true,
+                    "type": "array",
+                    "itemType": "string",
+                    "itemSanitize": true,
+                    "itemMaxLength": 128
+                  },
+                  "repo": {
+                    "type": "string",
+                    "maxLength": 256
+                  }
+                }
+              },
               "report_incomplete": {
                 "defaultMax": 5,
                 "fields": {
@@ -619,7 +682,7 @@ jobs:
           
           mkdir -p /home/runner/.copilot
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_95017dc8ef4cee83_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_52e7f3ed4af388a8_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
               "github": {
@@ -663,7 +726,7 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_95017dc8ef4cee83_EOF
+          GH_AW_MCP_CONFIG_52e7f3ed4af388a8_EOF
       - name: Mount MCP servers as CLIs
         id: mount-mcp-clis
         continue-on-error: true
@@ -943,7 +1006,7 @@ jobs:
           GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
-          GH_AW_NOOP_REPORT_AS_ISSUE: "true"
+          GH_AW_NOOP_REPORT_AS_ISSUE: "false"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1294,7 +1357,7 @@ jobs:
           GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_API_URL: ${{ github.api_url }}
-          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"hide_older_comments\":true,\"max\":1},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"true\"},\"report_incomplete\":{}}"
+          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"hide_older_comments\":true,\"max\":1},\"add_labels\":{\"allowed\":[\"Auto-Triage: Waiting for Author\"],\"max\":1},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"false\"},\"remove_labels\":{\"allowed\":[\"Auto-Triage: Waiting for Author\"],\"max\":1},\"report_incomplete\":{}}"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
diff --git a/.github/workflows/issue-triage.md b/.github/workflows/issue-triage.md
index 793dfc81c3..4f0d391f41 100644
--- a/.github/workflows/issue-triage.md
+++ b/.github/workflows/issue-triage.md
@@ -2,8 +2,44 @@
 on:
   issues:
     types: [opened]
+  issue_comment:
+    types: [created]
   roles: all
 
+# Cheap gate evaluated BEFORE the agent boots. The activation job is skipped
+# (zero compute, $0) if this is false. Only events matching one of the
+# following three conditions cause the workflow to run:
+#
+#   1. issues.opened
+#        -> Initial triage. Always runs.
+#
+#   2. issue_comment.created from the issue's original author, on an issue
+#      (not a PR), not a bot, AND the issue currently has the label
+#      "Auto-Triage: Waiting for Author".
+#        -> Follow-up triage. The label is applied by the initial triage
+#           only when environment fields were missing, and removed by the
+#           follow-up triage once the author supplies them. Without the
+#           label, author comments do NOT boot the agent.
+#
+#   3. issue_comment.created whose body starts with "/triage", from a repo
+#      OWNER, MEMBER, or COLLABORATOR (maintainer-only on-demand override).
+#        -> On-demand triage. Bypasses the follow-up gate; produces a fresh
+#           triage summary regardless of label or prior summaries.
+if: |
+  github.event_name == 'issues' ||
+  (github.event_name == 'issue_comment'
+   && github.event.issue.pull_request == null
+   && !endsWith(github.event.comment.user.login, '[bot]')
+   && (
+     ((github.event.comment.body == '/triage' || startsWith(github.event.comment.body, '/triage '))
+      && contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.comment.author_association))
+     ||
+     (github.event.comment.body != '/triage'
+      && !startsWith(github.event.comment.body, '/triage ')
+      && github.event.comment.user.login == github.event.issue.user.login
+      && contains(github.event.issue.labels.*.name, 'Auto-Triage: Waiting for Author'))
+   ))
+
 engine: copilot
 
 permissions:
@@ -16,27 +52,88 @@ tools:
     min-integrity: none
 
 safe-outputs:
+  # One triage summary per run. `hide-older-comments` collapses previous
+  # summaries so only the latest is visible.
   add-comment:
     max: 1
     hide-older-comments: true
+  # Allow the workflow to apply/remove ONLY this one internal-state label.
+  # The label is the YAML-level flag that lets the cheap `if:` gate above
+  # decide whether an author comment should boot the agent at all.
+  add-labels:
+    allowed: ["Auto-Triage: Waiting for Author"]
+    max: 1
+  remove-labels:
+    allowed: ["Auto-Triage: Waiting for Author"]
+    max: 1
+  # Silently skip noop runs (e.g. random author comment with no new env info).
+  # Without this, gh-aw auto-creates a tracking issue "[aw] No-Op Runs" and
+  # appends a comment to it for every noop.
+  noop:
+    report-as-issue: false
 ---
 
 # SqlClient Issue Auto-Triage
 
 You are a triage specialist for **Microsoft.Data.SqlClient**.
-A new issue has just been opened. Your job is to:
-
-1. Read the issue silently using GitHub read tools
-2. Post **one** triage summary comment using `add_comment`
-
-That is the entire workflow. Do NOT call `add_comment` more than once.
-Do NOT call `add_labels`. Do NOT apply any labels.
+Your job is to post **at most one** triage summary comment per workflow run
+using `add_comment`.
+
+This workflow runs in three situations. Identify which one **before** doing
+any work, then follow the matching flow:
+
+1. **Initial triage** — `event_name == "issues"`. A new issue was just opened.
+   Always proceed to the triage instructions below.
+2. **Follow-up triage** — `event_name == "issue_comment"` and the comment body
+   does NOT start with `/triage`. The workflow-level `if:` has already verified
+   the issue currently carries the label `Auto-Triage: Waiting for Author`,
+   so a prior triage flagged missing env info and the author has now responded.
+   Treat later author comments as part of the issue body and re-validate the
+   environment. There are three sub-cases routed by "Follow-up routing" under
+   Instructions:
+   - **No progress** (comment supplied no new env field, e.g. "will share
+     soon") → silent `noop`, label stays, no comment posted.
+   - **Partial progress** (comment supplied at least one new env field but
+     others are still missing) → post a fresh summary acknowledging what
+     was provided and re-asking for the rest, KEEP the label.
+   - **Complete** (all required env fields are now present) → post a fresh
+     summary, REMOVE the label.
+3. **On-demand triage** — `event_name == "issue_comment"` and the comment body
+   starts with `/triage`. A maintainer is explicitly requesting a fresh triage.
+   Ignore label state and prior summary counts; proceed to the triage
+   instructions and produce a new summary. Do NOT change the label as part of
+   `/triage` runs (leave it as-is).
+
+Do NOT call `add_comment` more than once per run.
+Do NOT call `add_labels` or `remove_labels` for any label other than
+`Auto-Triage: Waiting for Author` — that single label is the only one this
+workflow is permitted to manage.
 Do NOT post intermediate findings. Do NOT post separate comments for
 area detection, duplicate checking, or environment validation.
 Everything goes into the single triage summary at the end.
 
 ---
 
+## Label-managed state
+
+The workflow uses one internal-state label to decide cheaply (at the YAML
+`if:` level) whether an author comment should boot the agent at all:
+
+- **`Auto-Triage: Waiting for Author`** — present iff the most recent
+  triage summary flagged `⚠️ Missing:` or `⚠️ Partial:` environment fields
+  and we are waiting for the issue author to supply them.
+
+The agent (you) is responsible for keeping this label accurate — see the
+"Actions" section below for exactly when to call `add_labels` /
+`remove_labels`.
+
+Only if the workflow-level `if:` gate above evaluated to true, proceed to the
+triage instructions below and produce a fresh summary. Treat the prior summary
+as **invalidated** — the new one supersedes it (the older one will be collapsed
+automatically by `hide-older-comments`).
+
+---
+
 ## Required Context
 
 Before analyzing the issue, you MUST read all project knowledge base files
@@ -52,8 +149,51 @@ environment validation, and analysis. Do not skip this step.
 
 ## Instructions
 
-Read the issue body. Then do ALL of the following analysis silently
-(using read tools and search only — no comments, no outputs):
+Read the issue body **and, for follow-up / on-demand runs, every subsequent
+comment**. Then do ALL of the following analysis silently (using read tools
+and search only — no comments, no outputs):
+
+### Follow-up routing (scenario 2 only)
+
+Before running the full analysis on a follow-up run, decide which of three
+sub-cases this comment falls into. Use the rules in step **B** below to
+determine which environment fields each source supplies.
+
+Compute two snapshots:
+
+- **BEFORE** = env fields supplied by the issue body + every author comment
+  EXCEPT the triggering comment.
+- **AFTER**  = env fields supplied by the issue body + every author comment
+  INCLUDING the triggering comment.
+
+Then route as follows:
+
+1. **No progress** — `AFTER == BEFORE` (the new comment did not supply any
+   new env field; e.g. "okay, will share details soon", a question, an
+   unrelated remark). → Call `noop` with a short reason like `"Author
+   commented but supplied no new env info"` and STOP. Do NOT call
+   `add_comment`. Do NOT change the label. The label stays so the next
+   author comment can re-trigger this workflow.
+
+2. **Partial progress** — `AFTER` adds at least one new env field but is
+   still incomplete (some required fields are still missing). → Proceed
+   to the full analysis below and post a fresh triage summary. The
+   `Environment` row MUST acknowledge what was just provided and list
+   only the fields that are STILL missing, e.g.
+   `⚠️ Partial: received SqlClient version and OS; still missing: .NET TFM, SQL Server version`.
+   Keep the label `Auto-Triage: Waiting for Author` on the issue (i.e. call
+   `add_labels` with that label — it is a no-op if already present).
+
+3. **Complete** — `AFTER` contains every required env field. → Proceed to
+   the full analysis below and post a fresh triage summary. The
+   `Environment` row says `All required environment details provided for
+   investigation`. Call `remove_labels` with the label.
+
+This routing does NOT apply to initial triage (scenario 1) or on-demand
+`/triage` (scenario 3) — those always produce a fresh summary using the
+standard label-management rules in the Actions section below.
+
+### Full analysis
 
 **A. Classify issue type**: Bug (reports unexpected behavior, crash, regression, or incorrect results), Feature (has proposal), Question, or Task.
 
@@ -61,6 +201,8 @@ Read the issue body. Then do ALL of the following analysis silently
 SqlClient version, .NET target framework, SQL Server version, OS,
 repro steps, expected vs actual behavior.
 If any are missing, list them explicitly in the triage summary (e.g. "Missing: SQL Server version, OS").
+For follow-up runs, treat information supplied in any later comment by the
+issue author as if it were part of the original issue body.
 Proceed with all remaining triage steps regardless of missing environment details.
 
 **C. Classify area**: Based on the issue content, pick the single best matching area label from this list:
@@ -90,7 +232,9 @@ Proceed with all remaining triage steps regardless of missing environment detail
 
 ## Actions
 
-Call `add_comment` exactly **once** with this markdown:
+Call `add_comment` exactly **once** with this markdown. For follow-up runs
+add "(updated after author response)" to the heading; for on-demand `/triage`
+runs add "(on-demand re-triage)" to the heading:
 
 ```
 ## 🔍 Triage Summary
@@ -98,7 +242,7 @@ Call `add_comment` exactly **once** with this markdown:
 | Check | Result |
 |-------|--------|
 | Issue type | <Bug / Feature / Question / Task> |
-| Environment | <All required environment details provided for investigation / ⚠️ Missing: list specific fields> |
+| Environment | <All required environment details provided for investigation / ⚠️ Partial: received <list>; still missing: <list> / ⚠️ Missing: list specific fields> |
 | Area | <Best matching area from classification table> |
 | Duplicates | <None found / Potentially related: #NNN, #NNN> |
 | Regression | <Not indicated / Likely regression from vX.Y.Z / Inconclusive> |
@@ -124,4 +268,15 @@ and severity assessment (P0-P3)>
 > **Note**: This triage summary is auto-generated by an AI agent. The analysis and suggestions above have not been verified by a human maintainer. Please treat as preliminary guidance only.
 ```
 
+**Then manage the label**:
+
+- For **on-demand `/triage` runs**, do NOT touch the label — preserve
+  whatever state existed before.
+- For **initial triage** and **follow-up triage**, base the decision on the
+  `Environment` row of the summary you just posted:
+  - If it contains `⚠️ Missing:` or `⚠️ Partial:` → call `add_labels` with
+    `["Auto-Triage: Waiting for Author"]` (no-op if already present).
+  - Otherwise (env complete) → call `remove_labels` with
+    `["Auto-Triage: Waiting for Author"]` (safe to call even if absent).
+
 If the issue is spam or no action is needed, call the `noop` tool instead.
\ No newline at end of file

From b6c05695a054d1cdd846dfc1774a6df17ea6656f Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 11 Jun 2026 15:48:33 -0300
Subject: [PATCH 144/298] Add TDS token data length bounds checks (#4340)

---
 .../Connection/SqlConnectionInternal.cs       |    7 +-
 .../src/Microsoft/Data/SqlClient/SqlUtil.cs   |    4 +
 .../src/Microsoft/Data/SqlClient/TdsEnums.cs  |   11 +
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |   57 +-
 .../ConnectionEnhancedRoutingTests.cs         |    2 +
 .../ConnectionFailoverTests.cs                |    2 +
 .../ConnectionReadOnlyRoutingTests.cs         |    8 +-
 .../ConnectionRoutingTests.cs                 |    4 +-
 .../ConnectionRoutingTestsAzure.cs            |    8 +-
 .../FeatureExtAckBoundsTests.cs               |  163 +++
 .../FeatureExtensionNegotiationTests.cs       |    2 +
 .../TdsTokenBoundsTests.cs                    | 1051 +++++++++++++++++
 .../tools/TDS/TDS.Servers/GenericTdsServer.cs |   10 +
 13 files changed, 1313 insertions(+), 16 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtAckBoundsTests.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/TdsTokenBoundsTests.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index 295286b1e5..3d67df236e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -400,7 +400,7 @@ internal SqlConnectionInternal(
 
             try
             {
-                // If we want to consider pool operations against the overall connect timeout, 
+                // If we want to consider pool operations against the overall connect timeout,
                 // use the provided timeout. Otherwise, start a fresh timeout to receive the full
                 // connect timeout.
                 _timeout = ResolveLoginTimeout(timeout, connectionOptions.ConnectTimeout);
@@ -1346,6 +1346,11 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                             len = bLen;
                         }
 
+                        if (len < 0 || len > data.Length - i)
+                        {
+                            throw SQL.ParsingErrorLength(ParsingErrorState.CorruptedTdsStream, len);
+                        }
+
                         byte[] stateData = new byte[len];
                         Buffer.BlockCopy(data, i, stateData, 0, len);
                         i += len;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
index 96312a491d..84667d99e7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
@@ -731,6 +731,10 @@ internal static Exception ParsingErrorLength(ParsingErrorState state, int length
         {
             return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorLength, ((int)state).ToString(CultureInfo.InvariantCulture), length));
         }
+        internal static Exception ParsingErrorLength(ParsingErrorState state, uint length)
+        {
+            return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorLength, ((int)state).ToString(CultureInfo.InvariantCulture), length));
+        }
         internal static Exception ParsingErrorStatus(ParsingErrorState state, int status)
         {
             return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ParsingErrorStatus, ((int)state).ToString(CultureInfo.InvariantCulture), status));
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
index 25a489d91d..9b71afc350 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
@@ -84,6 +84,17 @@ internal static class TdsEnums
         public const int MAX_PACKET_SIZE = 32768;
         public const int MAX_SERVER_USER_NAME = 256;  // obtained from luxor
 
+        // Maximum allowed data length for token payloads (feature ext ack,
+        // session state, fedauth info). Prevents a malicious server from causing
+        // unbounded memory allocation via spoofed token length fields.
+        internal const int MaxTokenDataLength = 1 << 20; // 1 MB
+
+        // Maximum allowed data length for a DTC promote transaction propagation token.
+        internal const int MaxPromoteTransactionLength = 1 << 16; // 64 KB
+
+        // Maximum valid wire size for datetime types (DateTimeOffset = 5 time + 3 date + 2 offset).
+        internal const int MaxDateTimeLength = 10;
+
         // Severity  0 - 10 indicates informational (non-error) messages
         // Severity 11 - 16 indicates errors that can be corrected by user (syntax errors, etc...)
         // Severity 17 - 19 indicates failure due to insufficient resources in the server
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index bb625d563d..79c725c074 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -3348,6 +3348,10 @@ private TdsOperationStatus TryProcessEnvChange(int tokenLength, TdsParserStateOb
                             // new value has 4 byte length
                             return result;
                         }
+                        if (env._newLength < 0 || env._newLength > TdsEnums.MaxPromoteTransactionLength)
+                        {
+                            throw SQL.ParsingErrorLength(ParsingErrorState.CorruptedTdsStream, env._newLength);
+                        }
                         // read new value with 4 byte length
                         env._newBinValue = new byte[env._newLength];
                         result = stateObj.TryReadByteArray(env._newBinValue, env._newLength);
@@ -3846,10 +3850,15 @@ private TdsOperationStatus TryProcessFeatureExtAck(TdsParserStateObject stateObj
                     {
                         return result;
                     }
-                    byte[] data = new byte[dataLen];
-                    if (dataLen > 0)
+                    if (dataLen > (uint)TdsEnums.MaxTokenDataLength)
+                    {
+                        throw SQL.ParsingErrorLength(ParsingErrorState.CorruptedTdsStream, dataLen);
+                    }
+                    int dataLength = (int)dataLen;
+                    byte[] data = new byte[dataLength];
+                    if (dataLength > 0)
                     {
-                        result = stateObj.TryReadByteArray(data, checked((int)dataLen));
+                        result = stateObj.TryReadByteArray(data, dataLength);
                         if (result != TdsOperationStatus.Done)
                         {
                             return result;
@@ -4169,6 +4178,10 @@ private TdsOperationStatus TryProcessSessionState(TdsParserStateObject stateObj,
             {
                 throw SQL.ParsingErrorLength(ParsingErrorState.SessionStateLengthTooShort, length);
             }
+            if (length > TdsEnums.MaxTokenDataLength)
+            {
+                throw SQL.ParsingErrorLength(ParsingErrorState.CorruptedTdsStream, length);
+            }
             uint seqNum;
             TdsOperationStatus result = stateObj.TryReadUInt32(out seqNum);
             if (result != TdsOperationStatus.Done)
@@ -4218,6 +4231,10 @@ private TdsOperationStatus TryProcessSessionState(TdsParserStateObject stateObj,
                         return result;
                     }
                 }
+                if (stateLen < 0 || stateLen > TdsEnums.MaxTokenDataLength)
+                {
+                    throw SQL.ParsingErrorLength(ParsingErrorState.CorruptedTdsStream, stateLen);
+                }
                 byte[] buffer = null;
                 lock (sdata._delta)
                 {
@@ -4435,6 +4452,10 @@ private TdsOperationStatus TryProcessFedAuthInfo(TdsParserStateObject stateObj,
                 SqlClientEventSource.Log.TryTraceEvent("<sc.TdsParser.TryProcessFedAuthInfo|ERR> FEDAUTHINFO token stream length too short for CountOfInfoIDs.");
                 throw SQL.ParsingErrorLength(ParsingErrorState.FedAuthInfoLengthTooShortForCountOfInfoIds, tokenLen);
             }
+            if (tokenLen > TdsEnums.MaxTokenDataLength)
+            {
+                throw SQL.ParsingErrorLength(ParsingErrorState.CorruptedTdsStream, tokenLen);
+            }
 
             // read how many FedAuthInfo options there are
             uint optionsCount;
@@ -4912,14 +4933,20 @@ internal TdsOperationStatus TryProcessReturnValue(int length,
             }
 
             // always read as sql types
-            Debug.Assert(valLen < (ulong)(int.MaxValue), "ProcessReturnValue received data size > 2Gb");
-
-            int intlen = valLen > (ulong)(int.MaxValue) ? int.MaxValue : (int)valLen;
+            int intlen;
 
             if (rec.metaType.IsPlp)
             {
                 intlen = int.MaxValue;    // If plp data, read it all
             }
+            else if (valLen > (ulong)int.MaxValue)
+            {
+                throw SQL.ParsingErrorLength(ParsingErrorState.CorruptedTdsStream, unchecked((int)valLen));
+            }
+            else
+            {
+                intlen = (int)valLen;
+            }
 
             if (rec.type == SqlDbTypeExtensions.Vector)
             {
@@ -7111,9 +7138,20 @@ internal TdsOperationStatus TryReadSqlValue(SqlBuffer value,
             return TdsOperationStatus.Done;
         }
 
+        // length originates as a single byte on the wire (nullable datetime length prefix),
+        // but is kept as int to match the TDS parsing API surface where all lengths are int.
+        // Using byte here would require casts at all call sites and silently truncate values
+        // from the sql_variant path where lenData is computed arithmetically.
         private TdsOperationStatus TryReadSqlDateTime(SqlBuffer value, byte tdsType, int length, byte scale, TdsParserStateObject stateObj)
         {
-            Span<byte> datetimeBuffer = ((uint)length <= 16) ? stackalloc byte[16] : new byte[length];
+            // DateTimeOffset is the largest datetime type at 10 bytes (5 time + 3 date + 2 offset).
+            // Reject anything larger to prevent heap allocation from spoofed metadata.
+            if (length < 0 || length > TdsEnums.MaxDateTimeLength)
+            {
+                throw SQL.ParsingErrorLength(ParsingErrorState.CorruptedTdsStream, length);
+            }
+
+            Span<byte> datetimeBuffer = stackalloc byte[TdsEnums.MaxDateTimeLength];
 
             TdsOperationStatus result = stateObj.TryReadByteArray(datetimeBuffer, length);
             if (result != TdsOperationStatus.Done)
@@ -7369,7 +7407,10 @@ internal TdsOperationStatus TryReadSqlValueInternal(SqlBuffer value, byte tdsTyp
                 case TdsEnums.SQLVECTOR:
                     {
                         // Note: Better not come here with plp data!!
-                        Debug.Assert(length <= TdsEnums.MAXSIZE);
+                        if (length < 0 || length > TdsEnums.MAXSIZE)
+                        {
+                            throw SQL.ParsingErrorLength(ParsingErrorState.CorruptedTdsStream, length);
+                        }
                         result = stateObj.TryReadByteArrayWithContinue(length, isPlp: false, out byte[] b);
                         if (result != TdsOperationStatus.Done)
                         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionEnhancedRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionEnhancedRoutingTests.cs
index 7d8941a07d..c85365d98e 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionEnhancedRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionEnhancedRoutingTests.cs
@@ -14,6 +14,8 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
 /// <summary>
 /// Tests connection routing using the enhanced routing feature extension and envchange token
 /// </summary>
+// TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
+// need since each test uses its own TDS Server with ephemeral listen port.
 [Collection("SimulatedServerTests")]
 public class ConnectionEnhancedRoutingTests
 {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index 29bb6cb6e5..566d3d0cef 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -12,6 +12,8 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
+    // TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
+    // need since each test uses its own TDS Server with ephemeral listen port.
     [Collection("SimulatedServerTests")]
     public class ConnectionFailoverTests
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs
index f0618ac269..8220871f22 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs
@@ -11,6 +11,8 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
+    // TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
+    // need since each test uses its own TDS Server with ephemeral listen port.
     [Collection("SimulatedServerTests")]
     public class ConnectionReadOnlyRoutingTests
     {
@@ -71,7 +73,7 @@ public void RecursivelyRoutedConnection(int layers)
                     router.Start();
                     routingLayers.Push(router);
                     lastEndpoint = router.EndPoint;
-                    lastConnectionString = (new SqlConnectionStringBuilder() { 
+                    lastConnectionString = (new SqlConnectionStringBuilder() {
                         DataSource = $"localhost,{lastEndpoint.Port}",
                         ApplicationIntent = ApplicationIntent.ReadOnly,
                         Encrypt = false
@@ -114,8 +116,8 @@ public async Task RecursivelyRoutedAsyncConnection(int layers)
                     router.Start();
                     routingLayers.Push(router);
                     lastEndpoint = router.EndPoint;
-                    lastConnectionString = (new SqlConnectionStringBuilder() { 
-                        DataSource = $"localhost,{lastEndpoint.Port}", 
+                    lastConnectionString = (new SqlConnectionStringBuilder() {
+                        DataSource = $"localhost,{lastEndpoint.Port}",
                         ApplicationIntent = ApplicationIntent.ReadOnly,
                         Encrypt = false
                     }).ConnectionString;
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
index 0eff08139f..3065f780bc 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
@@ -10,6 +10,8 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
+    // TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
+    // need since each test uses its own TDS Server with ephemeral listen port.
     [Collection("SimulatedServerTests")]
     public class ConnectionRoutingTests
     {
@@ -194,7 +196,7 @@ public void NetworkTimeoutAtRoutedLocation_RetryDisabled_ShouldFail()
             // Act
             var e = Assert.Throws<SqlException>(connection.Open);
 
-            // Assert 
+            // Assert
             Assert.Equal(ConnectionState.Closed, connection.State);
             Assert.Contains("Connection Timeout Expired", e.Message);
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
index 3cd2628300..642d54f5b2 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
@@ -10,6 +10,8 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
+    // TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
+    // need since each test uses its own TDS Server with ephemeral listen port.
     [Collection("SimulatedServerTests")]
     public class ConnectionRoutingTestsAzure : IDisposable
     {
@@ -21,8 +23,8 @@ public ConnectionRoutingTestsAzure()
             adpHelper.AddAzureSqlServerEndpoint("localhost");
         }
 
-        public void Dispose() 
-        { 
+        public void Dispose()
+        {
             adpHelper.Dispose();
         }
 
@@ -192,7 +194,7 @@ public void NetworkTimeoutAtRoutedLocation_RetryDisabled_ShouldFail()
             // Act
             var e = Assert.Throws<SqlException>(connection.Open);
 
-            // Assert 
+            // Assert
             Assert.Equal(ConnectionState.Closed, connection.State);
             Assert.Contains("Connection Timeout Expired", e.Message);
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtAckBoundsTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtAckBoundsTests.cs
new file mode 100644
index 0000000000..20c94c0361
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtAckBoundsTests.cs
@@ -0,0 +1,163 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.SqlServer.TDS;
+using Microsoft.SqlServer.TDS.FeatureExtAck;
+using Microsoft.SqlServer.TDS.Servers;
+using TDSDoneToken = global::Microsoft.SqlServer.TDS.Done.TDSDoneToken;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
+
+/// <summary>
+/// Tests that the TDS parser rejects feature extension acknowledgment tokens
+/// with data lengths exceeding protocol-reasonable bounds. This prevents a
+/// malicious server from causing unbounded memory allocation on the client.
+/// </summary>
+// TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
+// need since each test uses its own TDS Server with ephemeral listen port.
+[Collection("SimulatedServerTests")]
+public class FeatureExtAckBoundsTests : IDisposable
+{
+    private readonly TdsServerFixture _fixture;
+    private readonly TdsServer _server;
+    private readonly string _connectionString;
+
+    public FeatureExtAckBoundsTests()
+    {
+        _fixture = new TdsServerFixture();
+        _server = _fixture.TdsServer;
+        SqlConnectionStringBuilder builder = new()
+        {
+            DataSource = $"localhost,{_server.EndPoint.Port}",
+            Encrypt = SqlConnectionEncryptOption.Optional,
+            Pooling = false
+        };
+        _connectionString = builder.ConnectionString;
+    }
+
+    public void Dispose() => _fixture.Dispose();
+
+    /// <summary>
+    /// Verifies that the TDS parser rejects a FeatureExtAck token whose data length
+    /// field exceeds <see cref="TdsEnums.MaxTokenDataLength"/> (1 MB), throwing a
+    /// parsing error instead of attempting an unbounded heap allocation.
+    /// This guards against CVE denial-of-service via pre-auth memory exhaustion.
+    /// </summary>
+    [Fact]
+    public void FeatureExtAck_OversizedDataLength_ThrowsParsingError()
+    {
+        // Arrange: inject a malicious FeatureExtAck token with an absurdly large data length
+        _server.OnAuthenticationResponseCompleted = responseMessage =>
+        {
+            // Remove any existing FeatureExtAck token
+            var existing = responseMessage.OfType<TDSFeatureExtAckToken>().FirstOrDefault();
+            if (existing != null)
+            {
+                responseMessage.Remove(existing);
+            }
+
+            // Insert a malicious token with oversized data length before the DONE token
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            responseMessage.Insert(doneIndex, new MaliciousFeatureExtAckToken(
+                featureId: (TDSFeatureID)TdsEnums.FEATUREEXT_GLOBALTRANSACTIONS,
+                claimedDataLen: (uint)(TdsEnums.MaxTokenDataLength + 1)));
+        };
+
+        // Act & Assert: connection should fail with a parsing error, NOT an OutOfMemoryException
+        using SqlConnection connection = new(_connectionString);
+        Exception ex = Assert.ThrowsAny<InvalidOperationException>(connection.Open);
+
+        // The exception message should indicate a corrupted TDS stream
+        // with the oversized length value, not an OOM from attempting the allocation.
+        Assert.Contains("Error state: 18", ex.Message); // ParsingErrorState.CorruptedTdsStream = 18
+        Assert.Contains($"Length: {TdsEnums.MaxTokenDataLength + 1}", ex.Message);
+    }
+
+    /// <summary>
+    /// Verifies that a FeatureExtAck token with a data length at exactly the
+    /// allowed maximum is accepted without error, confirming there is no
+    /// off-by-one in the bounds check.
+    /// </summary>
+    [Fact]
+    public void FeatureExtAck_MaxAllowedDataLength_DoesNotThrow()
+    {
+        // Arrange: inject a FeatureExtAck token whose declared data length equals
+        // MaxTokenDataLength exactly. The bounds check should NOT fire for this
+        // value. The connection will fail for other reasons (not enough data on
+        // the wire), but the error must NOT be state 18 (CorruptedTdsStream).
+        _server.OnAuthenticationResponseCompleted = responseMessage =>
+        {
+            var existing = responseMessage.OfType<TDSFeatureExtAckToken>().FirstOrDefault();
+            if (existing != null)
+            {
+                responseMessage.Remove(existing);
+            }
+
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            // Insert token with dataLen = MaxTokenDataLength (at boundary, not over)
+            responseMessage.Insert(doneIndex, new MaliciousFeatureExtAckToken(
+                featureId: (TDSFeatureID)TdsEnums.FEATUREEXT_GLOBALTRANSACTIONS,
+                claimedDataLen: (uint)TdsEnums.MaxTokenDataLength));
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        // The connection will fail (insufficient data for the claimed length),
+        // but the failure must NOT be the bounds-check error.
+        Exception ex = Assert.ThrowsAny<Exception>(connection.Open);
+        Assert.DoesNotContain("Error state: 18", ex.Message);
+    }
+
+    /// <summary>
+    /// A custom TDS packet token that writes a FEATUREEXTACK token with a fraudulently
+    /// large data length field. This simulates a malicious server attempting to cause
+    /// the client to allocate an unbounded byte array.
+    /// </summary>
+    private sealed class MaliciousFeatureExtAckToken : TDSPacketToken
+    {
+        private readonly TDSFeatureID _featureId;
+        private readonly uint _claimedDataLen;
+
+        public MaliciousFeatureExtAckToken(TDSFeatureID featureId, uint claimedDataLen)
+        {
+            _featureId = featureId;
+            _claimedDataLen = claimedDataLen;
+        }
+
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // Write the FEATUREEXTACK token type (0xAE)
+            destination.WriteByte((byte)TDSTokenType.FeatureExtAck);
+
+            // Write the feature ID byte
+            destination.WriteByte((byte)_featureId);
+
+            // Write the claimed data length (uint32, little-endian) — this is the lie
+            byte[] lenBytes = BitConverter.GetBytes(_claimedDataLen);
+            destination.Write(lenBytes, 0, 4);
+
+            // Write only 1 byte of actual data (the client will try to read _claimedDataLen bytes
+            // but we only provide 1 — the bounds check should fire before the read attempt)
+            destination.WriteByte(0x01);
+
+            // Write terminator
+            destination.WriteByte((byte)TDSFeatureID.Terminator);
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtensionNegotiationTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtensionNegotiationTests.cs
index e6342c4fa8..0141d44000 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtensionNegotiationTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtensionNegotiationTests.cs
@@ -13,6 +13,8 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
 
+// Serializes execution with other SimulatedServerTests classes to avoid port/resource conflicts.
+// Required here because IClassFixture shares a single TdsServer instance across all tests in this class.
 [Collection("SimulatedServerTests")]
 public class FeatureExtensionNegotiationTests : IClassFixture<TdsServerFixture>
 {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/TdsTokenBoundsTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/TdsTokenBoundsTests.cs
new file mode 100644
index 0000000000..ef975dccb3
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/TdsTokenBoundsTests.cs
@@ -0,0 +1,1051 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.SqlServer.TDS;
+using Microsoft.SqlServer.TDS.ColMetadata;
+using Microsoft.SqlServer.TDS.Done;
+using Microsoft.SqlServer.TDS.FeatureExtAck;
+using Microsoft.SqlServer.TDS.Servers;
+using Microsoft.SqlServer.TDS.SessionState;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
+
+/// <summary>
+/// Tests that the TDS parser rejects various token types with data lengths
+/// exceeding protocol-reasonable bounds, preventing unbounded memory allocation
+/// from a malicious server.
+/// </summary>
+// Serializes execution with other SimulatedServerTests classes.  Required here because
+// DebugAssertSuppressor mutates the global Trace.Listeners collection, which is not
+// safe to do concurrently with other tests that may trigger Debug.Assert.
+[Collection("SimulatedServerTests")]
+public class TdsTokenBoundsTests : IDisposable
+{
+    private readonly TdsServerFixture _fixture;
+    private readonly TdsServer _server;
+    private readonly string _connectionString;
+
+    public TdsTokenBoundsTests()
+    {
+        _fixture = new TdsServerFixture();
+        _server = _fixture.TdsServer;
+        SqlConnectionStringBuilder builder = new()
+        {
+            DataSource = $"localhost,{_server.EndPoint.Port}",
+            Encrypt = SqlConnectionEncryptOption.Optional,
+            Pooling = false
+        };
+        _connectionString = builder.ConnectionString;
+    }
+
+    public void Dispose() => _fixture.Dispose();
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 1: SessionState token with oversized total length
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that <c>TryProcessSessionState</c> rejects a SessionState token (0xE4)
+    /// whose total length field exceeds <see cref="TdsEnums.MaxTokenDataLength"/> (1 MB),
+    /// preventing unbounded memory allocation from a spoofed token length.
+    /// </summary>
+    [Fact]
+    public void SessionState_OversizedTotalLength_ThrowsParsingError()
+    {
+        _server.OnAuthenticationResponseCompleted = responseMessage =>
+        {
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            // Inject a SessionState token claiming a total length exceeding MaxTokenDataLength
+            responseMessage.Insert(doneIndex, new MaliciousSessionStateToken(
+                claimedTotalLength: (uint)(TdsEnums.MaxTokenDataLength + 1)));
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        Exception ex = Assert.ThrowsAny<InvalidOperationException>(connection.Open);
+        Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+        Assert.Contains($"Length: {TdsEnums.MaxTokenDataLength + 1}", ex.Message);
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 2: SessionState token with oversized inner option length
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that <c>TryProcessSessionState</c> rejects an individual session state
+    /// option whose inner data length (encoded via the 0xFF + DWORD path) exceeds
+    /// <see cref="TdsEnums.MaxTokenDataLength"/>, even when the outer token length is valid.
+    /// </summary>
+    [Fact]
+    public void SessionState_OversizedInnerOptionLength_ThrowsParsingError()
+    {
+        _server.OnAuthenticationResponseCompleted = responseMessage =>
+        {
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            // Inject a SessionState token with a valid outer length but an inner
+            // state option claiming a huge data length
+            responseMessage.Insert(doneIndex, new MaliciousSessionStateInnerLenToken(
+                innerClaimedLength: TdsEnums.MaxTokenDataLength + 1));
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        Exception ex = Assert.ThrowsAny<InvalidOperationException>(connection.Open);
+        Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+        Assert.Contains($"Length: {TdsEnums.MaxTokenDataLength + 1}", ex.Message);
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 2b: SessionState token with negative inner option length
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that <c>TryProcessSessionState</c> rejects an individual session state
+    /// option whose inner data length (encoded via the 0xFF + DWORD path) is negative,
+    /// which would be interpreted as a huge unsigned value if not bounds-checked.
+    /// </summary>
+    [Fact]
+    public void SessionState_NegativeInnerOptionLength_ThrowsParsingError()
+    {
+        _server.OnAuthenticationResponseCompleted = responseMessage =>
+        {
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            // Inject a SessionState token with an inner state option claiming
+            // a negative data length (-1 = 0xFFFFFFFF as uint32)
+            responseMessage.Insert(doneIndex, new MaliciousSessionStateInnerLenToken(
+                innerClaimedLength: -1));
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        Exception ex = Assert.ThrowsAny<InvalidOperationException>(connection.Open);
+        Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+        Assert.Contains("Length: -1", ex.Message);
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 3: SRECOVERY feature ack with malformed inner state data
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that the secondary parse of FEATUREEXT_SRECOVERY data in
+    /// <c>SqlConnectionInternal.OnFeatureExtAck</c> rejects inner state options
+    /// whose claimed length exceeds the remaining buffer, preventing an
+    /// out-of-bounds read or over-allocation.
+    /// </summary>
+    [Fact]
+    public void SRecovery_MalformedInnerStateLength_ThrowsParsingError()
+    {
+        _server.OnAuthenticationResponseCompleted = responseMessage =>
+        {
+            // Remove existing FeatureExtAck if present
+            var existing = responseMessage.OfType<TDSFeatureExtAckToken>().FirstOrDefault();
+            if (existing != null)
+            {
+                responseMessage.Remove(existing);
+            }
+
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            // Inject a FeatureExtAck with SessionRecovery feature containing
+            // inner state data where a state option claims a length exceeding the buffer
+            responseMessage.Insert(doneIndex, new MaliciousSRecoveryFeatureExtAckToken());
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        Exception ex = Assert.ThrowsAny<InvalidOperationException>(connection.Open);
+        Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+        Assert.Contains("Length: 999", ex.Message);
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 4: FedAuthInfo token with oversized total length
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that <c>TryProcessFedAuthInfo</c> rejects a FedAuthInfo token (0xEE)
+    /// whose total length exceeds <see cref="TdsEnums.MaxTokenDataLength"/> (1 MB).
+    /// The token type is dispatched unconditionally by <c>TryRun</c>, so this check
+    /// fires regardless of whether federated authentication was negotiated.
+    /// </summary>
+    [Fact]
+    public void FedAuthInfo_OversizedTokenLength_ThrowsParsingError()
+    {
+        _server.OnAuthenticationResponseCompleted = responseMessage =>
+        {
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            // Inject a FedAuthInfo token with a total length exceeding MaxTokenDataLength.
+            // The parser dispatches on token type regardless of whether FedAuth was negotiated.
+            responseMessage.Insert(doneIndex, new MaliciousFedAuthInfoToken(
+                claimedLength: TdsEnums.MaxTokenDataLength + 1));
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        Exception ex = Assert.ThrowsAny<InvalidOperationException>(connection.Open);
+        Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+        Assert.Contains($"Length: {TdsEnums.MaxTokenDataLength + 1}", ex.Message);
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 5: ENV_PROMOTETRANSACTION with oversized newLength
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that <c>TryProcessEnvChange</c> rejects a PromoteTransaction
+    /// environment change token (type 15) whose inner <c>newLength</c> field exceeds
+    /// <see cref="TdsEnums.MaxPromoteTransactionLength"/> (64 KB). A malicious server
+    /// can set the outer uint16 token length to a small value while writing an
+    /// int32 inner length claiming gigabytes, causing unbounded allocation.
+    /// </summary>
+    [Fact]
+    public void EnvChange_PromoteTransaction_OversizedLength_ThrowsParsingError()
+    {
+        _server.OnAuthenticationResponseCompleted = responseMessage =>
+        {
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            // Inject a PromoteTransaction env change with a fraudulently large newLength
+            responseMessage.Insert(doneIndex, new MaliciousPromoteTransactionEnvChangeToken(
+                claimedNewLength: TdsEnums.MaxPromoteTransactionLength + 1));
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        Exception ex = Assert.ThrowsAny<InvalidOperationException>(connection.Open);
+        Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+        Assert.Contains($"Length: {TdsEnums.MaxPromoteTransactionLength + 1}", ex.Message);
+    }
+
+    // ══════════════════════════════════════════════════════════════════════════
+    // Malicious token helpers
+    // ══════════════════════════════════════════════════════════════════════════
+
+    /// <summary>
+    /// Writes a SessionState token (0xE4) with a fraudulently large total length.
+    /// Wire format: [0xE4][uint32 totalLen][uint32 seqNum][byte status][...]
+    /// The bounds check fires on the totalLen value before any data is read.
+    /// </summary>
+    private sealed class MaliciousSessionStateToken : TDSPacketToken
+    {
+        private readonly uint _claimedTotalLength;
+
+        public MaliciousSessionStateToken(uint claimedTotalLength)
+        {
+            _claimedTotalLength = claimedTotalLength;
+        }
+
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // Token type
+            destination.WriteByte((byte)TDSTokenType.SessionState); // 0xE4
+
+            // Total token length (uint32) — this is the fraudulent value
+            byte[] lenBytes = BitConverter.GetBytes(_claimedTotalLength);
+            destination.Write(lenBytes, 0, 4);
+
+            // Write minimal valid-looking data: seqNum (4 bytes) + status (1 byte)
+            // The bounds check should fire before trying to process option data.
+            destination.Write(new byte[] { 0x01, 0x00, 0x00, 0x00 }, 0, 4); // seqNum = 1
+            destination.WriteByte(0x01); // status = recoverable
+        }
+    }
+
+    /// <summary>
+    /// Writes a SessionState token (0xE4) with a valid outer length but an inner
+    /// state option that claims a huge data length (using the 0xFF + DWORD encoding).
+    /// Wire format: [0xE4][uint32 totalLen][uint32 seqNum][byte status]
+    ///              [byte stateId][0xFF][int32 innerLen][...data...]
+    /// The inner bounds check fires on the innerLen value.
+    /// </summary>
+    private sealed class MaliciousSessionStateInnerLenToken : TDSPacketToken
+    {
+        private readonly int _innerClaimedLength;
+
+        public MaliciousSessionStateInnerLenToken(int innerClaimedLength)
+        {
+            _innerClaimedLength = innerClaimedLength;
+        }
+
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // Token type
+            destination.WriteByte((byte)TDSTokenType.SessionState); // 0xE4
+
+            // Calculate total token length:
+            // seqNum(4) + status(1) + stateId(1) + lenMarker(1) + innerLen(4) + minimal data(1)
+            uint totalLength = 4 + 1 + 1 + 1 + 4 + 1;
+
+            byte[] lenBytes = BitConverter.GetBytes(totalLength);
+            destination.Write(lenBytes, 0, 4);
+
+            // Sequence number
+            destination.Write(new byte[] { 0x01, 0x00, 0x00, 0x00 }, 0, 4);
+
+            // Status (recoverable)
+            destination.WriteByte(0x01);
+
+            // State option: stateId
+            destination.WriteByte(0x00); // UserOptions state ID
+
+            // Length marker: 0xFF means next 4 bytes are the DWORD length
+            destination.WriteByte(0xFF);
+
+            // Inner claimed length — fraudulently large
+            byte[] innerLenBytes = BitConverter.GetBytes(_innerClaimedLength);
+            destination.Write(innerLenBytes, 0, 4);
+
+            // Write only 1 byte of actual data
+            destination.WriteByte(0x42);
+        }
+    }
+
+    /// <summary>
+    /// Writes a FeatureExtAck token (0xAE) with a SessionRecovery feature (ID=1)
+    /// that carries inner state data where a state option claims a length exceeding
+    /// the remaining buffer. This exercises the bounds check in
+    /// SqlConnectionInternal.OnFeatureExtAck for FEATUREEXT_SRECOVERY.
+    /// </summary>
+    private sealed class MaliciousSRecoveryFeatureExtAckToken : TDSPacketToken
+    {
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // Token type: FEATUREEXTACK
+            destination.WriteByte((byte)TDSTokenType.FeatureExtAck); // 0xAE
+
+            // Feature ID: SessionRecovery = 0x01
+            destination.WriteByte(0x01);
+
+            // The feature data for SRECOVERY is parsed by SqlConnectionInternal.OnFeatureExtAck:
+            // It reads pairs of [stateId(1)][lenByte(1)][data(len)] or [stateId(1)][0xFF][int32 len][data(len)]
+            // We'll craft inner data where one option claims length > remaining buffer.
+
+            // Inner data layout:
+            // stateId(1) + 0xFF marker(1) + int32 len(4) + 1 byte actual data
+            byte[] innerData;
+            using (var ms = new MemoryStream())
+            {
+                ms.WriteByte(0x00); // stateId = 0
+
+                // Use 0xFF marker to indicate DWORD length
+                ms.WriteByte(0xFF);
+
+                // Claim a length that exceeds the remaining buffer
+                // The remaining buffer after reading stateId + 0xFF + 4-byte-len will be 1 byte,
+                // but we claim 999 bytes
+                byte[] claimedLen = BitConverter.GetBytes(999);
+                ms.Write(claimedLen, 0, 4);
+
+                // Only provide 1 byte of actual data
+                ms.WriteByte(0x42);
+
+                innerData = ms.ToArray();
+            }
+
+            // Feature data length (uint32)
+            byte[] featureDataLen = BitConverter.GetBytes((uint)innerData.Length);
+            destination.Write(featureDataLen, 0, 4);
+
+            // Feature data
+            destination.Write(innerData, 0, innerData.Length);
+
+            // Terminator
+            destination.WriteByte((byte)TDSFeatureID.Terminator); // 0xFF
+        }
+    }
+
+    /// <summary>
+    /// Writes a FedAuthInfo token (0xEE) with a fraudulently large total length.
+    /// Wire format: [0xEE][int32 tokenLen][...data...]
+    /// The bounds check fires on tokenLen before any data is read.
+    /// </summary>
+    private sealed class MaliciousFedAuthInfoToken : TDSPacketToken
+    {
+        private readonly int _claimedLength;
+
+        public MaliciousFedAuthInfoToken(int claimedLength)
+        {
+            _claimedLength = claimedLength;
+        }
+
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // Token type
+            destination.WriteByte(0xEE); // SQLFEDAUTHINFO
+
+            // Token length (int32) — fraudulently large
+            byte[] lenBytes = BitConverter.GetBytes(_claimedLength);
+            destination.Write(lenBytes, 0, 4);
+
+            // Write minimal data (at least sizeof(uint) to pass the lower bound check,
+            // but the upper bound check should fire first)
+            destination.Write(new byte[] { 0x01, 0x00, 0x00, 0x00 }, 0, 4); // optionsCount = 1
+        }
+    }
+
+    /// <summary>
+    /// Writes an EnvChange token (0xE3) with type PromoteTransaction (15) whose
+    /// inner int32 newLength exceeds <see cref="TdsEnums.MaxPromoteTransactionLength"/>.
+    /// Wire format: [0xE3][uint16 tokenLen][byte type=15][int32 newLen][data...][byte oldLen=0]
+    /// The outer uint16 tokenLen is set to accommodate the header but the int32
+    /// newLength claims far more data than actually follows, triggering the bounds check.
+    /// </summary>
+    private sealed class MaliciousPromoteTransactionEnvChangeToken : TDSPacketToken
+    {
+        private readonly int _claimedNewLength;
+
+        public MaliciousPromoteTransactionEnvChangeToken(int claimedNewLength)
+        {
+            _claimedNewLength = claimedNewLength;
+        }
+
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // Token type: ENVCHANGE
+            destination.WriteByte((byte)TDSTokenType.EnvironmentChange); // 0xE3
+
+            // Outer token length (uint16): type(1) + newLength(4) + 1 byte data + oldLength(1)
+            // We write just enough to contain the header fields the parser reads before
+            // hitting the bounds check. The parser reads: type(1) + int32 newLen(4) = 5 bytes min.
+            ushort outerLength = 1 + 4 + 1 + 1; // type + newLen + 1 fake byte + oldLen
+            byte[] outerLenBytes = BitConverter.GetBytes(outerLength);
+            destination.Write(outerLenBytes, 0, 2);
+
+            // Env change type: PromoteTransaction = 15
+            destination.WriteByte(15);
+
+            // newLength (int32) — fraudulently large
+            byte[] newLenBytes = BitConverter.GetBytes(_claimedNewLength);
+            destination.Write(newLenBytes, 0, 4);
+
+            // Write 1 byte of fake data (the bounds check fires before attempting to read this much)
+            destination.WriteByte(0x00);
+
+            // Old value length (byte) = 0
+            destination.WriteByte(0x00);
+        }
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 6: Post-login batch response injection — PromoteTransaction
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that bounds checks fire during command execution (post-login)
+    /// by injecting a malicious PromoteTransaction env change token into the
+    /// SQL batch response. This exercises the <c>OnSQLBatchCompleted</c> hook
+    /// on the simulated server and proves the same bounds check fires regardless
+    /// of whether the token arrives during login or command execution.
+    /// </summary>
+    [Fact]
+    public void BatchResponse_PromoteTransaction_OversizedLength_ThrowsParsingError()
+    {
+        _server.OnSQLBatchCompleted = responseMessage =>
+        {
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            responseMessage.Insert(doneIndex, new MaliciousPromoteTransactionEnvChangeToken(
+                claimedNewLength: TdsEnums.MaxPromoteTransactionLength + 1));
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        connection.Open();
+
+        using SqlCommand command = connection.CreateCommand();
+        command.CommandText = "SELECT 1";
+
+        Exception ex = Assert.ThrowsAny<InvalidOperationException>(
+            () => command.ExecuteNonQuery());
+        Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+        Assert.Contains($"Length: {TdsEnums.MaxPromoteTransactionLength + 1}", ex.Message);
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 7: Post-login batch response — DateTime oversized length
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that <c>TryReadSqlDateTime</c> rejects a TIME column value whose
+    /// data length byte exceeds the maximum datetime wire size (10 bytes). A
+    /// malicious server could set this length to a large value, causing the
+    /// parser to attempt an unbounded heap allocation.
+    /// </summary>
+    [Fact]
+    public void BatchResponse_DateTime_OversizedLength_ThrowsParsingError()
+    {
+        _server.OnSQLBatchCompleted = responseMessage =>
+        {
+            // Replace the entire response with a crafted result set containing
+            // a TIME column whose ROW data length exceeds the maximum.
+            responseMessage.Clear();
+
+            // Use proper library tokens for COLMETADATA so framing is correct
+            var metadata = new TDSColMetadataToken();
+            var col = new TDSColumnData();
+            col.DataType = TDSDataType.TimeN;
+            col.DataTypeSpecific = (byte)7; // scale = 7
+            col.Flags.IsNullable = true;
+            col.Name = string.Empty;
+            metadata.Columns.Add(col);
+            responseMessage.Add(metadata);
+
+            // Add a malicious ROW token with oversized data length
+            responseMessage.Add(new MaliciousTimeRowToken());
+
+            // Add DONE token
+            responseMessage.Add(new TDSDoneToken(TDSDoneTokenStatusType.Final | TDSDoneTokenStatusType.Count, TDSDoneTokenCommandType.Select, 1));
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        connection.Open();
+
+        using SqlCommand command = connection.CreateCommand();
+        command.CommandText = "MALICIOUS_QUERY_NOT_RECOGNIZED";
+
+        SqlDataReader reader = command.ExecuteReader();
+        try
+        {
+            // Read() returns true (data is ready) but doesn't actually parse the
+            // column values — that happens on GetValue/GetTimeSpan. Force the read.
+            Assert.True(reader.Read());
+            Exception ex = Assert.ThrowsAny<InvalidOperationException>(
+                () => reader.GetValue(0));
+            Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+            Assert.Contains("Length: 11", ex.Message);
+        }
+        finally
+        {
+            // Disposing the reader after a corrupted stream causes the driver to
+            // attempt further TDS parsing during teardown, which can trip unrelated
+            // Debug.Assert calls in TdsParser.
+            using (new DebugAssertSuppressor())
+            {
+                try { reader.Dispose(); } catch { }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Writes a ROW token (0xD1) with a single TimeN column whose data length
+    /// byte is set to 11 (exceeding the maximum datetime wire size of 10 bytes).
+    /// </summary>
+    private sealed class MaliciousTimeRowToken : TDSPacketToken
+    {
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // ROW token type
+            destination.WriteByte(0xD1);
+
+            // TimeN data: length prefix (1 byte) = 11 (INVALID — max for time is 5, max datetime overall is 10)
+            destination.WriteByte(11);
+
+            // Write 11 bytes of dummy data
+            destination.Write(new byte[11], 0, 11);
+        }
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 8: Post-login batch response — ReturnValue with oversized data length
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that <c>TryProcessReturnValue</c> rejects a RETURNVALUE token (0xAC)
+    /// whose inner data length (for a non-PLP IMAGE type) exceeds int.MaxValue.
+    /// A malicious server can craft a TEXT/IMAGE return value with a spoofed int32
+    /// data length that becomes a huge value when cast to ulong, triggering unbounded
+    /// allocation.
+    /// </summary>
+    [Fact]
+    public void BatchResponse_ReturnValue_OversizedLength_ThrowsParsingError()
+    {
+        _server.OnSQLBatchCompleted = responseMessage =>
+        {
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            responseMessage.Insert(doneIndex, new MaliciousReturnValueToken());
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        connection.Open();
+
+        using SqlCommand command = connection.CreateCommand();
+        command.CommandText = "SELECT 1";
+
+        // The malicious RETURNVALUE token corrupts parser state before the
+        // exception propagates. Suppress Debug.Assert calls that fire in
+        // TdsParser during error handling and connection teardown.
+        using (new DebugAssertSuppressor())
+        {
+            Exception ex = Assert.ThrowsAny<InvalidOperationException>(
+                () => command.ExecuteNonQuery());
+            Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+            Assert.Contains("Length: -1", ex.Message);
+        }
+    }
+
+    /// <summary>
+    /// Writes a RETURNVALUE token (0xAC) with an IMAGE (0x22) type whose data
+    /// length field is set to -1 (0xFFFFFFFF). When cast to ulong this exceeds
+    /// int.MaxValue, triggering the bounds check in TryProcessReturnValue.
+    /// Wire layout:
+    ///   [0xAC] token
+    ///   [uint16] ordinal
+    ///   [byte] param name length (0)
+    ///   [byte] status
+    ///   [uint32] user type
+    ///   [byte] flags1
+    ///   [byte] flags2
+    ///   [byte] tds type = 0x22 (IMAGE)
+    ///   [int32] max length
+    ///   [byte] textPtrLen = 16
+    ///   [16 bytes] textPtr
+    ///   [8 bytes] timestamp
+    ///   [int32] data length = -1 (INVALID)
+    /// </summary>
+    private sealed class MaliciousReturnValueToken : TDSPacketToken
+    {
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // RETURNVALUE token
+            destination.WriteByte(0xAC);
+
+            // Ordinal (uint16 LE)
+            destination.WriteByte(0x00);
+            destination.WriteByte(0x00);
+
+            // Param name length (byte) = 0
+            destination.WriteByte(0x00);
+
+            // Status (byte) = 0x01 (output parameter)
+            destination.WriteByte(0x01);
+
+            // UserType (uint32 LE) = 0
+            destination.Write(new byte[4], 0, 4);
+
+            // Flags byte 1 (ignored)
+            destination.WriteByte(0x00);
+
+            // Flags byte 2
+            destination.WriteByte(0x00);
+
+            // TDS type = SQLIMAGE (0x22)
+            destination.WriteByte(0x22);
+
+            // MaxLen (int32 LE) — for IMAGE this is read via TryGetTokenLength
+            // which for 0x22 reads int32. Value doesn't matter much, just needs
+            // to be valid for MetaType lookup.
+            destination.Write(new byte[] { 0x10, 0x00, 0x00, 0x00 }, 0, 4); // 16
+
+            // -- TryProcessColumnHeaderNoNBC: IsLong && !IsPlp path --
+            // TextPtr length (byte) = 16
+            destination.WriteByte(0x10);
+
+            // TextPtr data (16 bytes)
+            destination.Write(new byte[16], 0, 16);
+
+            // Timestamp (8 bytes)
+            destination.Write(new byte[8], 0, 8);
+
+            // Data length (int32 LE) = -1 (0xFFFFFFFF)
+            // (ulong)(-1) = 0xFFFFFFFFFFFFFFFF > int.MaxValue → triggers bounds check
+            destination.WriteByte(0xFF);
+            destination.WriteByte(0xFF);
+            destination.WriteByte(0xFF);
+            destination.WriteByte(0xFF);
+        }
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 9: Post-login batch response — PLP ReturnValue (regression guard)
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that <c>TryProcessReturnValue</c> correctly handles PLP
+    /// (Partially Length-Prefixed) return values without triggering the bounds
+    /// check. PLP types use the unknown-length sentinel (0xFFFFFFFFFFFFFFFE)
+    /// which must NOT be rejected by the non-PLP bounds check.
+    /// </summary>
+    [Fact]
+    public void BatchResponse_ReturnValue_PlpUnknownLength_Succeeds()
+    {
+        _server.OnSQLBatchCompleted = responseMessage =>
+        {
+            int doneIndex = responseMessage.FindIndex(t => t is TDSDoneToken);
+            if (doneIndex < 0)
+            {
+                doneIndex = responseMessage.Count;
+            }
+
+            responseMessage.Insert(doneIndex, new ValidPlpReturnValueToken());
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        connection.Open();
+
+        using SqlCommand command = connection.CreateCommand();
+        command.CommandText = "SELECT 1";
+
+        // Should NOT throw — PLP unknown-length sentinel is valid
+        command.ExecuteNonQuery();
+    }
+
+    /// <summary>
+    /// Writes a valid RETURNVALUE token (0xAC) with a PLP VARBINARY(MAX) type
+    /// using the unknown-length sentinel (0xFFFFFFFFFFFFFFFE) followed by an
+    /// immediate PLP terminator (chunk length = 0). This exercises the IsPlp
+    /// branch in TryProcessReturnValue and must NOT trigger the bounds check.
+    /// Wire layout:
+    ///   [0xAC] token
+    ///   [uint16] ordinal
+    ///   [byte] param name length (0)
+    ///   [byte] status
+    ///   [uint32] user type
+    ///   [byte] flags1
+    ///   [byte] flags2
+    ///   [byte] tds type = 0xA5 (BIGVARBINARY)
+    ///   [uint16] max length = 0xFFFF (PLP marker)
+    ///   [uint64] PLP length = 0xFFFFFFFFFFFFFFFE (unknown)
+    ///   [uint32] chunk length = 0 (terminator)
+    /// </summary>
+    private sealed class ValidPlpReturnValueToken : TDSPacketToken
+    {
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // RETURNVALUE token
+            destination.WriteByte(0xAC);
+
+            // Ordinal (uint16 LE)
+            destination.WriteByte(0x00);
+            destination.WriteByte(0x00);
+
+            // Param name length (byte) = 0
+            destination.WriteByte(0x00);
+
+            // Status (byte) = 0x01 (output parameter)
+            destination.WriteByte(0x01);
+
+            // UserType (uint32 LE) = 0
+            destination.Write(new byte[4], 0, 4);
+
+            // Flags byte 1 (ignored)
+            destination.WriteByte(0x00);
+
+            // Flags byte 2
+            destination.WriteByte(0x00);
+
+            // TDS type = SQLBIGVARBINARY (0xA5)
+            destination.WriteByte(0xA5);
+
+            // MaxLen (uint16 LE) = 0xFFFF — PLP marker
+            destination.WriteByte(0xFF);
+            destination.WriteByte(0xFF);
+
+            // -- TryProcessColumnHeaderNoNBC: non-IsLong path --
+            // TryGetDataLength → TryReadPlpLength:
+            //   reads uint64 = 0xFFFFFFFFFFFFFFFE (unknown length sentinel)
+            destination.WriteByte(0xFE);
+            destination.WriteByte(0xFF);
+            destination.WriteByte(0xFF);
+            destination.WriteByte(0xFF);
+            destination.WriteByte(0xFF);
+            destination.WriteByte(0xFF);
+            destination.WriteByte(0xFF);
+            destination.WriteByte(0xFF);
+
+            // PLP chunk terminator (uint32 = 0) — empty data
+            destination.Write(new byte[4], 0, 4);
+        }
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 10: Post-login batch response — sql_variant with oversized binary
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that <c>TryReadSqlValueInternal</c> rejects a binary value inside
+    /// a sql_variant column whose inner data length exceeds
+    /// <see cref="TdsEnums.MAXSIZE"/> (8000 bytes). The bounds check in the
+    /// sql_variant deserialization path prevents unbounded heap allocation.
+    /// </summary>
+    [Fact]
+    public void BatchResponse_SqlVariantBinary_OversizedLength_ThrowsParsingError()
+    {
+        _server.OnSQLBatchCompleted = responseMessage =>
+        {
+            responseMessage.Clear();
+
+            // COLMETADATA: one SSVariant column
+            var metadata = new TDSColMetadataToken();
+            var col = new TDSColumnData();
+            col.DataType = TDSDataType.SSVariant;
+            col.DataTypeSpecific = (uint)8009; // max length for SSVariant
+            col.Flags.IsNullable = true;
+            col.Name = string.Empty;
+            metadata.Columns.Add(col);
+            responseMessage.Add(metadata);
+
+            // ROW with a sql_variant containing oversized binary data
+            responseMessage.Add(new MaliciousSqlVariantBinaryRowToken());
+
+            // DONE
+            responseMessage.Add(new TDSDoneToken(TDSDoneTokenStatusType.Final | TDSDoneTokenStatusType.Count, TDSDoneTokenCommandType.Select, 1));
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        connection.Open();
+
+        using SqlCommand command = connection.CreateCommand();
+        command.CommandText = "MALICIOUS_QUERY_NOT_RECOGNIZED";
+
+        SqlDataReader reader = command.ExecuteReader();
+        try
+        {
+            Assert.True(reader.Read());
+            Exception ex = Assert.ThrowsAny<InvalidOperationException>(
+                () => reader.GetValue(0));
+            Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+            Assert.Contains("Length: 8001", ex.Message);
+        }
+        finally
+        {
+            // Disposing the reader after a corrupted stream causes the driver to
+            // attempt further TDS parsing during teardown, which can trip unrelated
+            // Debug.Assert calls in TdsParser.
+            using (new DebugAssertSuppressor())
+            {
+                try { reader.Dispose(); } catch { }
+            }
+        }
+    }
+
+    // ──────────────────────────────────────────────────────────────────────────
+    // Test 11: Post-login batch response — sql_variant with negative inner length
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that <c>TryReadSqlValueInternal</c> rejects a sql_variant binary
+    /// value whose declared total length is too small for the type overhead,
+    /// causing the computed inner data length to be negative. The bounds check
+    /// <c>if (length &lt; 0 || length &gt; TdsEnums.MAXSIZE)</c> catches this.
+    /// </summary>
+    [Fact]
+    public void BatchResponse_SqlVariantBinary_NegativeLength_ThrowsParsingError()
+    {
+        _server.OnSQLBatchCompleted = responseMessage =>
+        {
+            responseMessage.Clear();
+
+            // COLMETADATA: one SSVariant column
+            var metadata = new TDSColMetadataToken();
+            var col = new TDSColumnData();
+            col.DataType = TDSDataType.SSVariant;
+            col.DataTypeSpecific = (uint)8009; // max length for SSVariant
+            col.Flags.IsNullable = true;
+            col.Name = string.Empty;
+            metadata.Columns.Add(col);
+            responseMessage.Add(metadata);
+
+            // ROW with a sql_variant claiming a total length too small for its overhead
+            responseMessage.Add(new NegativeLenSqlVariantBinaryRowToken());
+
+            // DONE
+            responseMessage.Add(new TDSDoneToken(TDSDoneTokenStatusType.Final | TDSDoneTokenStatusType.Count, TDSDoneTokenCommandType.Select, 1));
+        };
+
+        using SqlConnection connection = new(_connectionString);
+        connection.Open();
+
+        using SqlCommand command = connection.CreateCommand();
+        command.CommandText = "MALICIOUS_QUERY_NOT_RECOGNIZED";
+
+        SqlDataReader reader = command.ExecuteReader();
+        try
+        {
+            Assert.True(reader.Read());
+            Exception ex = Assert.ThrowsAny<InvalidOperationException>(
+                () => reader.GetValue(0));
+            Assert.Contains("Error state: 18", ex.Message); // CorruptedTdsStream
+            Assert.Contains("Length: -1", ex.Message);
+        }
+        finally
+        {
+            // Disposing the reader after a corrupted stream causes the driver to
+            // attempt further TDS parsing during teardown, which can trip unrelated
+            // Debug.Assert calls in TdsParser.
+            using (new DebugAssertSuppressor())
+            {
+                try { reader.Dispose(); } catch { }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Writes a ROW token (0xD1) with a single SSVariant column containing a
+    /// BigVarBinary variant whose inner data length exceeds MAXSIZE (8000).
+    /// Wire layout for the variant:
+    ///   [int32] total variant length = 8005
+    ///   [byte] inner type = 0xA5 (BigVarBinary)
+    ///   [byte] cbPropBytes = 2
+    ///   [ushort] maxLen (property) = 8001
+    ///   [8001 bytes would be data, but we only write 4 to trigger the check]
+    /// lenData = 8005 - 2(SQLVARIANT_SIZE) - 2(cbProps) = 8001 > MAXSIZE → throws
+    /// </summary>
+    private sealed class MaliciousSqlVariantBinaryRowToken : TDSPacketToken
+    {
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // ROW token type
+            destination.WriteByte(0xD1);
+
+            // SSVariant column data: total length (int32 LE)
+            // lenData = totalLength - SQLVARIANT_SIZE(2) - cbPropBytes(2) = totalLength - 4
+            // We want lenData = 8001, so totalLength = 8005
+            int totalLength = 8005;
+            byte[] lenBytes = BitConverter.GetBytes(totalLength);
+            destination.Write(lenBytes, 0, 4);
+
+            // Inner type: BigVarBinary = 0xA5
+            destination.WriteByte(0xA5);
+
+            // cbPropBytes = 2
+            destination.WriteByte(0x02);
+
+            // Properties: maxLen (ushort) = 8001
+            destination.WriteByte(0x41); // 8001 & 0xFF = 0x41
+            destination.WriteByte(0x1F); // 8001 >> 8 = 0x1F
+
+            // Write 4 bytes of dummy data (bounds check fires before trying to read 8001)
+            destination.Write(new byte[4], 0, 4);
+        }
+    }
+
+    /// <summary>
+    /// Writes a ROW token (0xD1) with a single SSVariant column containing a
+    /// BigVarBinary variant whose total length (3) is too small to cover the
+    /// type overhead (SQLVARIANT_SIZE=2 + cbPropBytes=2 = 4), producing a
+    /// negative computed inner data length: lenData = 3 - 4 = -1.
+    /// </summary>
+    private sealed class NegativeLenSqlVariantBinaryRowToken : TDSPacketToken
+    {
+        public override bool Inflate(Stream source) => throw new NotSupportedException();
+
+        public override void Deflate(Stream destination)
+        {
+            // ROW token type
+            destination.WriteByte(0xD1);
+
+            // SSVariant column data: total length (int32 LE)
+            // lenConsumed = SQLVARIANT_SIZE(2) + cbPropBytes(2) = 4
+            // lenData = totalLength - lenConsumed = 3 - 4 = -1 → triggers < 0 check
+            int totalLength = 3;
+            byte[] lenBytes = BitConverter.GetBytes(totalLength);
+            destination.Write(lenBytes, 0, 4);
+
+            // Inner type: BigVarBinary = 0xA5
+            destination.WriteByte(0xA5);
+
+            // cbPropBytes = 2
+            destination.WriteByte(0x02);
+
+            // Properties: maxLen (ushort) = 100 (arbitrary, just need 2 bytes)
+            destination.WriteByte(0x64); // 100 & 0xFF
+            destination.WriteByte(0x00); // 100 >> 8
+
+            // No data bytes — the bounds check fires before attempting to read
+        }
+    }
+
+    /// <summary>
+    /// Temporarily suppresses Debug.Assert failures by clearing trace listeners.  Used when
+    /// disposing resources after intentionally corrupting a TDS stream.  A static lock serializes
+    /// access for the lifetime of the instance because Trace.Listeners is a global collection.
+    /// </summary>
+    private sealed class DebugAssertSuppressor : IDisposable
+    {
+        private static readonly object s_listenerLock = new();
+        private readonly System.Diagnostics.TraceListener[] _listeners;
+
+        public DebugAssertSuppressor()
+        {
+            System.Threading.Monitor.Enter(s_listenerLock);
+            try
+            {
+                _listeners = new System.Diagnostics.TraceListener[System.Diagnostics.Trace.Listeners.Count];
+                System.Diagnostics.Trace.Listeners.CopyTo(_listeners, 0);
+                System.Diagnostics.Trace.Listeners.Clear();
+            }
+            catch
+            {
+                System.Threading.Monitor.Exit(s_listenerLock);
+                throw;
+            }
+        }
+
+        public void Dispose()
+        {
+            try
+            {
+                System.Diagnostics.Trace.Listeners.Clear();
+                System.Diagnostics.Trace.Listeners.AddRange(_listeners);
+            }
+            finally
+            {
+                System.Threading.Monitor.Exit(s_listenerLock);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTdsServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTdsServer.cs
index 1eb8bdf8c6..c3fadc3e0a 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTdsServer.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTdsServer.cs
@@ -156,6 +156,13 @@ public GenericTdsServer(T arguments, QueryEngine queryEngine)
 
         public OnAuthenticationCompletedDelegate OnAuthenticationResponseCompleted { private get; set; }
 
+        /// <summary>
+        /// Delegate invoked after a SQL batch response is prepared but before it is
+        /// sent to the client. Tests can use this to inject or replace tokens in the
+        /// response message.
+        /// </summary>
+        public Action<TDSMessage> OnSQLBatchCompleted { get; set; }
+
         public OnLogin7ValidatedDelegate OnLogin7Validated { private get; set; }
 
 
@@ -473,6 +480,9 @@ public virtual TDSMessageCollection OnSQLBatchRequest(ITDSServerSession session,
                 session.PacketSize = (uint)Arguments.PacketSize;
             }
 
+            // Allow tests to modify or inject tokens into the response
+            OnSQLBatchCompleted?.Invoke(responseMessage[0]);
+
             return responseMessage;
         }
 

From 348f00721c5f3103b6ba6957831d4d83ccac0c9f Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Thu, 11 Jun 2026 14:33:16 -0500
Subject: [PATCH 145/298] PR Pipeline - Azure + AE (#4338)

* Let's just enable azure stuff and see what breaks.

* config :hammer:

* this syntax is garbage

* Job names.

* :robot: Run AE in release mode separately, exlude AE from azure test runs.

* Decompose the single step test-buildproj-job.yml file

* platformDotnet

* Manual test name

* Disable sqlbulkcopy that fails on azure

# Conflicts:
#	src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlBulkCopyTest/SqlBulkCopyTest.cs

* Feedback from previous PR

* Flaky tests in azure.

* Another flaky test.

* :robot: Pipe dotnet verbosity through pipeline

* jsonc changes

* One more flaky test

* One more more flaky test

* Unflaky tests so I can hopefully get a reason why they failed.

* Wire in managed identity client ID to hopefully enable AKV tests.

* Use TCP connection strings on HGSVBS AKV tests

* Add traces for newly flaky tests
---
 eng/pipelines/pr/jobs/test-buildproj-job.yml  |  42 ++++--
 .../pr/jobs/test-sqlclientmanual-job.yml      | 100 ++++++++++----
 eng/pipelines/pr/pr-pipeline.yml              |  17 +++
 eng/pipelines/pr/stages/pack-stage.yml        |   7 +-
 eng/pipelines/pr/stages/test-stages.yml       | 123 +++++++++++++-----
 .../pr/steps/build-buildproj-step.yml         |  46 -------
 eng/pipelines/pr/steps/install-dotnet.yml     |  27 ----
 .../pr/steps/pack-buildproj-step.yml          |   2 +-
 .../pr/steps/test-buildproj-step.yml          |  59 ---------
 eng/pipelines/pr/variables/pr-variables.yml   |   1 +
 .../ManualTests/AlwaysEncrypted/AKVTests.cs   |  24 +++-
 .../ManualTests/AlwaysEncrypted/ApiShould.cs  |  12 ++
 ...llFromReaderConnectionCloseOnEventAsync.cs |   3 +-
 .../MarsSessionPoolingTest.cs                 |  14 ++
 .../ParameterTest/SqlVariantParameterTests.cs |   2 +
 15 files changed, 269 insertions(+), 210 deletions(-)
 delete mode 100644 eng/pipelines/pr/steps/build-buildproj-step.yml
 delete mode 100644 eng/pipelines/pr/steps/install-dotnet.yml
 delete mode 100644 eng/pipelines/pr/steps/test-buildproj-step.yml

diff --git a/eng/pipelines/pr/jobs/test-buildproj-job.yml b/eng/pipelines/pr/jobs/test-buildproj-job.yml
index 0b051bf50e..ec2d292ec8 100644
--- a/eng/pipelines/pr/jobs/test-buildproj-job.yml
+++ b/eng/pipelines/pr/jobs/test-buildproj-job.yml
@@ -18,6 +18,17 @@ parameters:
   - name: buildSuffix
     type: string
 
+  # Dotnet CLI verbosity level.
+  - name: dotnetVerbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
   # Platform Parameters ====================================================
 
   # Display name of the platform. This will be formatted into the job's official name as well as
@@ -73,17 +84,26 @@ jobs:
         - imageOverride -equals ${{ parameters.platformImage }}
 
     steps:
-      # Install the version of the dotnet runtime we will use to execute the test target.
-      - template: /eng/pipelines/pr/steps/install-dotnet.yml@self
+      # Install dotnet and the runtime that will run the tests (if it is not netframework)
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
-          runtimeVersion: ${{ parameters.platformDotnet }}
+          ${{ if not(contains(parameters.platformDotnet, 'net4')) }}:
+            runtimes:
+              - "${{ replace(parameters.platformDotnet, 'net', '') }}.x"
 
-      # Execute the test target
-      - template: /eng/pipelines/pr/steps/test-buildproj-step.yml
-        parameters:
-          buildConfiguration: ${{ parameters.buildConfiguration }}
-          buildSuffix: ${{ parameters.buildSuffix }}
+      # Restore dotnet tools
+      - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
-          packageShortName: ${{ parameters.packageShortName }}
-          testFramework: ${{ parameters.platformDotnet }}
-          testProject: ${{ parameters.testProject }}
+      # Execute the test target
+      - task: DotNetCoreCLI@2
+        displayName: 'Test: ${{ parameters.packageShortName }}${{ parameters.testProject }}'
+        inputs:
+          command: build
+          projects: build.proj
+          verbosity: ${{ parameters.dotnetVerbosity }}
+          arguments: >-
+            -t:Test${{ parameters.packageShortName }}${{ parameters.testProject }}
+            -p:Configuration=${{ parameters.buildConfiguration }}
+            -p:BuildNumber='$(Build.BuildNumber)'
+            -p:BuildSuffix='${{ parameters.buildSuffix }}'
+            -p:TestFramework=${{ parameters.platformDotnet }}
diff --git a/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml b/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
index ff81d983a3..9ca2c7c555 100644
--- a/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
+++ b/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
@@ -5,6 +5,8 @@
 #################################################################################
 
 parameters:
+  # General Parameters =====================================================
+
   # Configuration with which to build the packages and execute the tests.
   - name: buildConfiguration
     type: string
@@ -16,6 +18,17 @@ parameters:
   - name: buildSuffix
     type: string
 
+  # Dotnet CLI verbosity level.
+  - name: dotnetVerbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
   # Name of the stage that generated the SA password
   - name: stageNameSecrets
     type: string
@@ -51,39 +64,58 @@ parameters:
 
   # Test Configuration Parameters ==========================================
 
-  # Azure Key Vault tenant ID that will be set in the config.json file.
+  # Azure Key Vault tenant ID that will be set in the config.jsonc file.
   - name: azureKeyVaultTenantId
     type: string
 
-  # Azure Key Vault URL that will be set in the config.json file.
+  # Azure Key Vault URL that will be set in the config.jsonc file.
   - name: azureKeyVaultUrl
     type: string
 
-  # Connection string using named pipes that will be set in the config.json file.
+  # Display name for the config being used for this execution of the manual jobs. This will be used
+  # for the job name, so it may only contain alphanumeric and '_' characters.
+  - name: configDisplayName
+    type: string
+
+  # Connection string using named pipes that will be set in the config.jsonc file.
   - name: connectionStringNp
     type: string
 
-  # Connection string using TCP that will be set in the config.json file.
+  # Connection string using TCP that will be set in the config.jsonc file.
   - name: connectionStringTcp
     type: string
 
-  # Path to use for file stream tests, this value will be stored in the config.json file.
+  # Path to use for file stream tests, this value will be stored in the config.jsonc file.
   - name: fileStreamDirectory
     type: string
 
+  # Whether the server that tests will be executed against is local to the job agent. If `true`
+  # server configuration steps will be executed prior to running the tests.
+  - name: isLocalServer
+    type: boolean
+
   # Name of the local DB application name for localdb tests, this value will be stored in the
-  # config.json
+  # config.jsonc
   - name: localDbAppName
     type: string
 
   # Name of the local DB shared instance name for localdb tests, this value will be stored in the
-  # config.json
+  # config.jsonc
   - name: localDbSharedInstanceName
     type: string
 
+  # Manual test set to execute.
+  - name: testSet
+    type: string
+
+  # Name of the user managed identity client ID. This value will be stored in config.jsonc for use
+  # in AKV tests and substituted in for Azure connection string user IDs.
+  - name: userManagedIdentityClientId
+    type: string
+
 jobs:
-  - job: "test_${{ parameters.platformDisplayName }}_sqlclient_manual"
-    displayName: "sqlclient_manual_${{ parameters.platformDisplayName }}"
+  - job: "test_${{ parameters.platformDisplayName }}_${{ parameters.configDisplayName }}_${{ parameters.testSet }}_sqlclient_manual"
+    displayName: "sqlclient_manual_${{ parameters.configDisplayName}}_${{ parameters.testSet }}_${{ parameters.platformDisplayName }}"
 
     pool:
       name: ${{ parameters.poolName }}
@@ -97,17 +129,23 @@ jobs:
         value: $[stageDependencies.${{ parameters.stageNameSecrets }}.secrets_job.outputs['SaPassword.Value']]
 
     steps:
-      # Install the version of the dotnet runtime we will use to execute the test target.
-      - template: /eng/pipelines/pr/steps/install-dotnet.yml@self
+      # Install dotnet and the runtime that will run the tests (if it is not netframework)
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
-          runtimeVersion: ${{ parameters.platformDotnet }}
+          ${{ if not(contains(parameters.platformDotnet, 'net4')) }}:
+            runtimes:
+              - "${{ replace(parameters.platformDotnet, 'net', '') }}.x"
+
+      # Restore dotnet tools
+      - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
       # Configure the local SQL Server instance
-      - template: /eng/pipelines/pr/steps/configure-sqlserver-step.yml@self
-        parameters:
-          fileStreamDirectory: ${{ parameters.fileStreamDirectory }}
-          operatingSystem: ${{ parameters.platformOperatingSystem }}
-          saPassword: $(saPassword)
+      - ${{ if eq(parameters.isLocalServer, true) }}:
+        - template: /eng/pipelines/pr/steps/configure-sqlserver-step.yml@self
+          parameters:
+            fileStreamDirectory: ${{ parameters.fileStreamDirectory }}
+            operatingSystem: ${{ parameters.platformOperatingSystem }}
+            saPassword: $(saPassword)
 
       # Assign the generated SA password to the $Password field. This will allow $(Password) to be
       # be replaced in connection strings with whatever set in the secrets stage.
@@ -116,12 +154,12 @@ jobs:
           Write-Host "##vso[task.setvariable variable=Password;isSecret=true]$password"
         displayName: Set Connection String Password
 
-      # Write configuration information to the config.json file.
+      # Write configuration information to the config.jsonc file.
       - pwsh: |
           # Read existing default configuration from file
-          $defaultConfigPath = "$(REPO_ROOT)/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.json"
+          $defaultConfigPath = "$(REPO_ROOT)/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc"
           $configDirectory = "$(Agent.TempDirectory)/mds-config"
-          $configPath = Join-Path $configDirectory "config.json"
+          $configPath = Join-Path $configDirectory "config.jsonc"
           $config = Get-Content -Raw $defaultConfigPath | ConvertFrom-Json
 
           # Update the config values
@@ -133,6 +171,7 @@ jobs:
           $config.LocalDbSharedInstanceName = "${{ parameters.localDbSharedInstanceName }}"
           $config.ManagedIdentitySupported = $true
           $config.SupportsIntegratedSecurity = $false
+          $config.UserManagedIdentityClientId = "${{ parameters.userManagedIdentityClientId }}"
 
           if ("${{ parameters.platformOperatingSystem  }}" -eq "Windows") {
               $config.FileStreamDirectory = "${{ parameters.fileStreamDirectory }}"
@@ -149,12 +188,17 @@ jobs:
         displayName: 'Generate manual test config'
 
       # Execute TestSqlClientManual target from build.proj
-      - template: /eng/pipelines/pr/steps/test-buildproj-step.yml
-        parameters:
-          buildConfiguration: ${{ parameters.buildConfiguration }}
-          buildSuffix: ${{ parameters.buildSuffix }}
-
-          packageShortName: "SqlClient"
-          testFramework: ${{ parameters.platformDotnet }}
-          testProject: "Manual"
+      - task: DotNetCoreCLI@2
+        displayName: 'Test: SqlClientManual ${{ parameters.testSet }}'
+        inputs:
+          command: build
+          projects: build.proj
+          verbosity: ${{ parameters.dotnetVerbosity }}
+          arguments: >-
+            -t:TestSqlClientManual
+            -p:Configuration=${{ parameters.buildConfiguration }}
+            -p:BuildNumber='$(Build.BuildNumber)'
+            -p:BuildSuffix='${{ parameters.buildSuffix }}'
+            -p:TestFramework=${{ parameters.platformDotnet }}
+            -p:TestSet=${{ parameters.testSet }}
 
diff --git a/eng/pipelines/pr/pr-pipeline.yml b/eng/pipelines/pr/pr-pipeline.yml
index 9774ebdbfa..daf393e502 100644
--- a/eng/pipelines/pr/pr-pipeline.yml
+++ b/eng/pipelines/pr/pr-pipeline.yml
@@ -6,6 +6,21 @@
 
 name: $(DayOfYear)$(Rev:rr)
 
+parameters:
+  # General Parameters =====================================================
+
+  # Dotnet CLI verbosity level.
+  - name: dotnetVerbosity
+    displayName: dotnet CLI Verbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
 variables:
   - template: /eng/pipelines/common/variables/common-variables.yml@self
   - template: /eng/pipelines/pr/variables/pr-variables.yml@self
@@ -28,6 +43,7 @@ stages:
     parameters:
       buildConfiguration: Debug
       buildSuffix: pr
+      dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
       poolName: $(PoolNameDefault)
       stageNamePack: ${{ variables.stageNamePack }}
       stageNameSecrets: ${{ variables.stageNameSecrets }}
@@ -72,6 +88,7 @@ stages:
       manualTestFileStreamDirectory: "$(Pipeline.Workspace)/filestream"
       manualTestLocalDbAppName: $(LocalDbAppName)
       manualTestLocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
+      manualTestUserManagedIdentityClientId: $(UserManagedIdentityClientId)
 
   # Stage 3: Collect code coverage
   # @TODO:
diff --git a/eng/pipelines/pr/stages/pack-stage.yml b/eng/pipelines/pr/stages/pack-stage.yml
index c0a135e246..5473027731 100644
--- a/eng/pipelines/pr/stages/pack-stage.yml
+++ b/eng/pipelines/pr/stages/pack-stage.yml
@@ -50,8 +50,11 @@ stages:
           vmImage: 'ubuntu-latest'
 
         steps:
-          # Install dotnet SDK and restore tools
-          - template: /eng/pipelines/pr/steps/install-dotnet.yml@self
+          # Install dotnet
+          - template: /eng/pipelines/common/steps/install-dotnet.yml@self
+
+          # Restore dotnet tools
+          - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
           # ################################################################
           # Build/Pack Microsoft.Data.SqlClient
diff --git a/eng/pipelines/pr/stages/test-stages.yml b/eng/pipelines/pr/stages/test-stages.yml
index f2ffbc09cf..3a1e2c2011 100644
--- a/eng/pipelines/pr/stages/test-stages.yml
+++ b/eng/pipelines/pr/stages/test-stages.yml
@@ -9,6 +9,8 @@
 # confidence and expedience of validation.
 
 parameters:
+  # General Parameters =====================================================
+
   # Configuration with which to build the packages and execute the tests.
   - name: buildConfiguration
     type: string
@@ -20,6 +22,21 @@ parameters:
   - name: buildSuffix
     type: string
 
+  # Dotnet CLI verbosity level.
+  - name: dotnetVerbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
+  # Name of the pool to use for jobs that require customized VM images.
+  - name: poolName
+    type: string
+
   # Name of the build/pack stage that this stage will depend on.
   - name: stageNamePack
     type: string
@@ -28,55 +45,56 @@ parameters:
   - name: stageNameSecrets
     type: string
 
-  # Name of the pool to use for jobs that require customized VM images.
-  - name: poolName
-    type: string
-
   # Manual Test Configuration Parameters ==================================
 
-  # Azure Key Vault tenant ID that will be set in the config.json file for sqlclient manual tests.
+  # Azure Key Vault tenant ID that will be set in the config.jsonc file for sqlclient manual tests.
   - name: manualTestAzureKeyVaultTenantId
     type: string
 
-  # Azure Key Vault URL that will be set in the config.json file for sqlclient manual tests.
+  # Azure Key Vault URL that will be set in the config.jsonc file for sqlclient manual tests.
   - name: manualTestAzureKeyVaultUrl
     type: string
 
-  # Connection string to Azure SQL using named pipes that will be set in the config.json file for
+  # Connection string to Azure SQL using named pipes that will be set in the config.jsonc file for
   # sqlclient manual tests against Azure SQL.
   - name: manualTestConnectionStringNpAzure
     type: string
 
-  # Connection string to localhost using named pipes that will be set in the config.json file for
+  # Connection string to localhost using named pipes that will be set in the config.jsonc file for
   # sqlclient manual tests against a local box product.
   - name: manualTestConnectionStringNpLocalhost
     type: string
 
-  # Connection string to Azure SQL using TCP that will be set in the config.json file for sqlclient
+  # Connection string to Azure SQL using TCP that will be set in the config.jsonc file for sqlclient
   # manual tests against Azure SQL.
   - name: manualTestConnectionStringTcpAzure
     type: string
 
-  # Connection string to localhost using TCP that will be set in the config.json file for sqlclient
+  # Connection string to localhost using TCP that will be set in the config.jsonc file for sqlclient
   # manual tests against a local box product.
   - name: manualTestConnectionStringTcpLocalhost
     type: string
 
-  # Path to use for file stream tests, this value will be stored in the config.json for sqlclient
+  # Path to use for file stream tests, this value will be stored in the config.jsonc for sqlclient
   # manual tests.
   - name: manualTestFileStreamDirectory
     type: string
 
   # Name of the local DB application name for localdb tests, this value will be stored in the
-  # config.json for sqlclient manual tests.
+  # config.jsonc for sqlclient manual tests.
   - name: manualTestLocalDbAppName
     type: string
 
   # Name of the local DB shared instance name for localdb tests, this value will be stored in the
-  # config.json for sqlclient manual tests.
+  # config.jsonc for sqlclient manual tests.
   - name: manualTestLocalDbSharedInstanceName
     type: string
 
+  # Name of the managed identity client ID, this value will be stored in the config.jsonc for
+  # sqlclient manual tests.
+  - name: manualTestUserManagedIdentityClientId
+    type: string
+
   # This is an array of objects with the following fields:
   # - displayName     - Friendly name to use when displaying the stage name and job names. This
   #                     must only contain alphanumeric characters and '_'. It will be used for both
@@ -106,6 +124,7 @@ stages:
             parameters:
               buildConfiguration: ${{ parameters.buildConfiguration }}
               buildSuffix: ${{ parameters.buildSuffix }}
+              dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
               platformImage: ${{ platform.image }}
@@ -119,6 +138,7 @@ stages:
             parameters:
               buildConfiguration: ${{ parameters.buildConfiguration }}
               buildSuffix: ${{ parameters.buildSuffix }}
+              dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
               platformImage: ${{ platform.image }}
@@ -132,6 +152,7 @@ stages:
             parameters:
               buildConfiguration: ${{ parameters.buildConfiguration }}
               buildSuffix: ${{ parameters.buildSuffix }}
+              dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
               platformImage: ${{ platform.image }}
@@ -146,6 +167,7 @@ stages:
             parameters:
               buildConfiguration: ${{ parameters.buildConfiguration }}
               buildSuffix: ${{ parameters.buildSuffix }}
+              dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               stageNameSecrets: ${{ parameters.stageNameSecrets }}
 
               platformDisplayName: ${{ platform.displayName }}
@@ -156,37 +178,74 @@ stages:
 
               azureKeyVaultTenantId: ${{ parameters.manualTestAzureKeyVaultTenantId }}
               azureKeyVaultUrl: ${{ parameters.manualTestAzureKeyVaultUrl }}
+              configDisplayName: "localhost"
               connectionStringNp: ${{ parameters.manualTestConnectionStringNpLocalhost }}
               connectionStringTcp: ${{ parameters.manualTestConnectionStringTcpLocalhost }}
               fileStreamDirectory: ${{ parameters.manualTestFileStreamDirectory }}
+              isLocalServer: true
+              localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
+              localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
+              testSet: "123"
+              userManagedIdentityClientId: ${{ parameters.manualTestUserManagedIdentityClientId }}
+
+          # TestSqlClientManual - Azure
+          - template: /eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml@self
+            parameters:
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+              stageNameSecrets: ${{ parameters.stageNameSecrets }}
+
+              platformDisplayName: ${{ platform.displayName }}
+              platformDotnet: ${{ platform.dotnet }}
+              platformImage: ${{ platform.image }}
+              platformOperatingSystem: ${{ platform.operatingSystem }}
+              poolName: ${{ parameters.poolName }}
+
+              azureKeyVaultTenantId: ${{ parameters.manualTestAzureKeyVaultTenantId }}
+              azureKeyVaultUrl: ${{ parameters.manualTestAzureKeyVaultUrl }}
+              configDisplayName: "azure"
+              connectionStringNp: ${{ parameters.manualTestConnectionStringNpAzure }}
+              connectionStringTcp: ${{ parameters.manualTestConnectionStringTcpAzure }}
+              fileStreamDirectory: ${{ parameters.manualTestFileStreamDirectory }}
+              isLocalServer: false
               localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
               localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
+              testSet: "123"
+              userManagedIdentityClientId: ${{ parameters.manualTestUserManagedIdentityClientId }}
 
-           # @TODO:
-#          # TestSqlClientManual - Azure
-#          - template: /eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml@self
-#            parameters:
-#              buildConfiguration: ${{ parameters.buildConfiguration }}
-#              buildSuffix: ${{ parameters.buildSuffix }}
-#              platformDisplayName: ${{ platform.displayName }}
-#              platformDotnet: ${{ platform.dotnet }}
-#              platformImage: ${{ platform.image }}
-#              poolName: ${{ parameters.poolName }}
-#
-#              azureKeyVaultTenantId: ${{ parameters.manualTestAzureKeyVaultTenantId }}
-#              azureKeyVaultUrl: ${{ parameters.manualTestAzureKeyVaultUrl }}
-#              connectionStringNp: ${{ parameters.manualTestConnectionStringNpAzure }}
-#              connectionStringTcp: ${{ parameters.manualTestConnectionStringTcpAzure }}
-#              fileStreamDirectory: ${{ parameters.manualTestFileStreamDirectory }}
-#              localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
-#              localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
-#              saPassword: $(manualTestSaPassword)
+          # TestSqlClientManual - Localhost Always Encrypted
+          - template: /eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml@self
+            parameters:
+              buildConfiguration: "Release"      # AE tests are not stable enough to run in DEBUG mode (as of 5/29/26)
+              buildSuffix: ${{ parameters.buildSuffix }}
+              dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+              stageNameSecrets: ${{ parameters.stageNameSecrets }}
+
+              platformDisplayName: ${{ platform.displayName }}
+              platformDotnet: ${{ platform.dotnet }}
+              platformImage: ${{ platform.image }}
+              platformOperatingSystem: ${{ platform.operatingSystem }}
+              poolName: ${{ parameters.poolName }}
+
+              azureKeyVaultTenantId: ${{ parameters.manualTestAzureKeyVaultTenantId }}
+              azureKeyVaultUrl: ${{ parameters.manualTestAzureKeyVaultUrl }}
+              configDisplayName: "localhost_ae"
+              connectionStringNp: ${{ parameters.manualTestConnectionStringNpLocalhost }}
+              connectionStringTcp: ${{ parameters.manualTestConnectionStringTcpLocalhost }}
+              fileStreamDirectory: ${{ parameters.manualTestFileStreamDirectory }}
+              isLocalServer: true
+              localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
+              localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
+              testSet: "AE"
+              userManagedIdentityClientId: ${{ parameters.manualTestUserManagedIdentityClientId }}
 
           # TestSqlClientUnit
           - template: /eng/pipelines/pr/jobs/test-buildproj-job.yml@self
             parameters:
               buildConfiguration: ${{ parameters.buildConfiguration }}
               buildSuffix: ${{ parameters.buildSuffix }}
+              dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
               platformImage: ${{ platform.image }}
diff --git a/eng/pipelines/pr/steps/build-buildproj-step.yml b/eng/pipelines/pr/steps/build-buildproj-step.yml
deleted file mode 100644
index 3e81edfbf4..0000000000
--- a/eng/pipelines/pr/steps/build-buildproj-step.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# This collection of steps to build a project via the build.proj. This will execute the "Build*"
-# target in build.proj, where * is the packageShortName provided in the parameters.
-#
-# Note: This differs from the onebranch build-buildproj-step.yml in that it does *not* strong-name
-#    sign the assemblies, it only builds in project reference mode, and as such it does not allow
-#    version parameters or dependencies to be provided.
-
-parameters:
-  - name: buildConfiguration
-    type: string
-    values:
-      - Debug
-      - Release
-
-  - name: buildSuffix
-    type: string
-
-  - name: packageShortName
-    type: string
-    values:
-      - Azure
-      - AkvProvider
-      - Abstractions
-      - Logging
-      - SqlClient
-      - SqlServer
-
-steps:
-  - task: DotNetCoreCLI@2
-    displayName: 'build.proj - Build${{ parameters.packageShortName }}'
-    inputs:
-      command: build
-      projects: build.proj
-      arguments: >-
-        -t:Build${{ parameters.packageShortName }}
-        -p:Configuration=${{ parameters.buildConfiguration }}
-        -p:BuildNumber='$(Build.BuildNumber)'
-        -p:BuildSuffix='${{ parameters.buildSuffix }}'
-
-
diff --git a/eng/pipelines/pr/steps/install-dotnet.yml b/eng/pipelines/pr/steps/install-dotnet.yml
deleted file mode 100644
index fe1c8f7878..0000000000
--- a/eng/pipelines/pr/steps/install-dotnet.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# This is a step to wrap the install-dotnet step for use in the PR pipeline. It will always install
-# the SDK version specified in the global.json file, and if the runtime version specified does not
-# begin with "net4" (ie, indicating netfx runtime is being used), the version will be passed in as
-# part of the runtime parameters.
-#
-# This version chains into the common install-dotnet step to enable the pr pipeline to call a
-# single step template and get the desired behavior without complexity.
-
-parameters:
-  - name: runtimeVersion
-    type: string
-    default: ''
-
-steps:
-  - template: /eng/pipelines/common/steps/install-dotnet.yml@self
-    parameters:
-      ${{ if and( not(eq(parameters.runtimeVersion, '' )), not(contains(parameters.runtimeVersion, 'net4')) ) }}:
-        runtimes:
-          - "${{ replace(parameters.runtimeVersion, 'net', '') }}.x"
-
-  - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
diff --git a/eng/pipelines/pr/steps/pack-buildproj-step.yml b/eng/pipelines/pr/steps/pack-buildproj-step.yml
index 6b2980cbb4..f947bafb0e 100644
--- a/eng/pipelines/pr/steps/pack-buildproj-step.yml
+++ b/eng/pipelines/pr/steps/pack-buildproj-step.yml
@@ -46,7 +46,7 @@ parameters:
 
 steps:
   - task: DotNetCoreCLI@2
-    displayName: 'build.proj - Build${{ parameters.packageShortName }}'
+    displayName: 'Pack: ${{ parameters.packageShortName }}'
     condition: ${{ parameters.condition }}
     inputs:
       command: build
diff --git a/eng/pipelines/pr/steps/test-buildproj-step.yml b/eng/pipelines/pr/steps/test-buildproj-step.yml
deleted file mode 100644
index 5309e7ef96..0000000000
--- a/eng/pipelines/pr/steps/test-buildproj-step.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-parameters:
-  # General Parameters =======================================================
-
-  # Configuration to use to build the project.
-  - name: buildConfiguration
-    type: string
-    values:
-      - Debug
-      - Release
-
-  # Suffix to apply to the generated packages such that the package will be considered a prerelease
-  # version. The resulting package version will look like: `1.2.3-suffix888.1` where 1.2.3 is the
-  # default version specified in Versions.props, suffix is this parameter, and 888.1 is the build
-  # number for the currently executing build.
-  - name: buildSuffix
-    type: string
-
-  # Test Parameters ========================================================
-
-  # Package/project to test.
-  - name: packageShortName
-    type: string
-    values:
-      - Azure
-      - AkvProvider
-      - Abstractions
-      - Logging
-      - SqlClient
-      - SqlServer
-
-  - name: testFramework
-    type: string
-
-  # If the project to test has multiple projects supported by build.proj, use this optional
-  # parameter to specify the project to execute. This will be appended to Test{PackageShortName} to
-  # generate the target to execute. See build.proj for supported targets.
-  - name: testProject
-    type: string
-    default: ''
-
-steps:
-  - task: DotNetCoreCLI@2
-    displayName: 'build.proj - Test${{ parameters.packageShortName }}${{ parameters.testProject }}'
-    inputs:
-      command: build
-      projects: build.proj
-      verbosity: detailed
-      arguments: >-
-        -t:Test${{ parameters.packageShortName }}${{ parameters.testProject }}
-        -p:Configuration=${{ parameters.buildConfiguration }}
-        -p:BuildNumber='$(Build.BuildNumber)'
-        -p:BuildSuffix='${{ parameters.buildSuffix }}'
-        -p:TestFramework=${{ parameters.testFramework }}
diff --git a/eng/pipelines/pr/variables/pr-variables.yml b/eng/pipelines/pr/variables/pr-variables.yml
index 4a28253dc7..a9da73850e 100644
--- a/eng/pipelines/pr/variables/pr-variables.yml
+++ b/eng/pipelines/pr/variables/pr-variables.yml
@@ -20,6 +20,7 @@ variables:
   # LocalDbAppName
   # LocalDbSharedInstanceName
   # PoolNameDefault
+  # UserManagedIdentityClientId
   - group: sqlclient-testconfig-v1
 
   # General Variables ======================================================
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs
index 53232b1431..6c2db5dd6e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVTests.cs
@@ -30,7 +30,13 @@ public AKVTest(SQLSetupStrategyAzureKeyVault fixture)
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringSetupForAE), nameof(DataTestUtility.IsAKVSetupAvailable))]
         public void TestEncryptDecryptWithAKV()
         {
-            SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionStringHGSVBS)
+            // Select connection string - If an enclave connection string exists, use that, but for
+            // non-enclave test runs, use the standard TCP connection string.
+            string baseConnectionString = string.IsNullOrWhiteSpace(DataTestUtility.TCPConnectionStringHGSVBS)
+                ? DataTestUtility.TCPConnectionString
+                : DataTestUtility.TCPConnectionStringHGSVBS;
+
+            SqlConnectionStringBuilder builder = new(baseConnectionString)
             {
                 ColumnEncryptionSetting = SqlConnectionColumnEncryptionSetting.Enabled,
                 AttestationProtocol = SqlConnectionAttestationProtocol.NotSpecified,
@@ -71,7 +77,13 @@ It aims to confirm that three consecutive connections will consistently fail wit
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringSetupForAE), nameof(DataTestUtility.IsAKVSetupAvailable))]
         public void ForcedColumnDecryptErrorTestShouldFail()
         {
-            SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionStringHGSVBS)
+            // Select connection string - If an enclave connection string exists, use that, but for
+            // non-enclave test runs, use the standard TCP connection string.
+            string baseConnectionString = string.IsNullOrWhiteSpace(DataTestUtility.TCPConnectionStringHGSVBS)
+                ? DataTestUtility.TCPConnectionString
+                : DataTestUtility.TCPConnectionStringHGSVBS;
+
+            SqlConnectionStringBuilder builder = new(baseConnectionString)
             {
                 ColumnEncryptionSetting = SqlConnectionColumnEncryptionSetting.Enabled,
                 AttestationProtocol = SqlConnectionAttestationProtocol.NotSpecified,
@@ -148,7 +160,13 @@ public void TestRoundTripWithAKVAndCertStoreProvider()
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringSetupForAE), nameof(DataTestUtility.IsAKVSetupAvailable))]
         public void TestLocalCekCacheIsScopedToProvider()
         {
-            SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionStringHGSVBS)
+            // Select connection string - If an enclave connection string exists, use that, but for
+            // non-enclave test runs, use the standard TCP connection string.
+            string baseConnectionString = string.IsNullOrWhiteSpace(DataTestUtility.TCPConnectionStringHGSVBS)
+                ? DataTestUtility.TCPConnectionString
+                : DataTestUtility.TCPConnectionStringHGSVBS;
+
+            SqlConnectionStringBuilder builder = new(baseConnectionString)
             {
                 ColumnEncryptionSetting = SqlConnectionColumnEncryptionSetting.Enabled,
                 AttestationProtocol = SqlConnectionAttestationProtocol.NotSpecified,
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
index feefe77adb..6f564250ce 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
@@ -1999,6 +1999,8 @@ public void TestBeginAndEndExecuteReaderWithAsyncCallback(string connection, Com
             }
         }
 
+        [Trait("Category", "flaky")] // System.AggregateException : One or more errors occurred. (Assert.ThrowsAny() Failure: No exception was thrown
+                                     // Expected: typeof(System.Exception))
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsTargetReadyForAeWithKeyStore))]
         [ClassData(typeof(AEConnectionStringProviderWithExecutionMethod))]
         public void TestSqlCommandCancel(string connection, string value)
@@ -2184,6 +2186,16 @@ public void TestSqlCommandCancel(string connection, string value)
                     tasks[1].Start();
 
                     // Wait for the threads to finish.
+                    // Flaky Stack Trace --------------------------------------
+                    // Assert.ThrowsAny() Failure: No exception was thrown
+                    // Expected: typeof(System.Exception)
+                    // Stack Trace:
+                    //    at System.Threading.Tasks.Task.WaitAllCore(ReadOnlySpan`1 tasks, Int32 millisecondsTimeout, CancellationToken cancellationToken)
+                    //    at System.Threading.Tasks.Task.WaitAll(Task[] tasks)
+                    //    at Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted.ApiShould.TestSqlCommandCancel(String connection, String value) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\ManualTests\AlwaysEncrypted\ApiShould.cs:line 2187
+                    //    at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
+                    //    at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
+
                     Task.WaitAll(tasks);
 
                     CommandHelper.s_sleepAfterReadDescribeEncryptionParameterResults?.SetValue(null, false);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
index 4938014ca3..e48bf5906a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
@@ -13,7 +13,8 @@ namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
     [Trait("Set", "2")]
     public class CopyAllFromReaderConnectionClosedOnEventAsync
     {
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [Trait("Category", "flaky")] // Hangs and crashes on occasion
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
         public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
index e84c9fabb6..9f666fc45f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
@@ -228,6 +228,9 @@ public void ExecuteReader_GarbageCollectReader(CommandType commandType)
             }
         }
 
+        [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ
+                                     // Expected: 5
+                                     // Actual:   4
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
@@ -254,6 +257,17 @@ public void ExecuteReader_DisposeCommand(CommandType commandType)
                 //   Disposing of the command does *not* close the reader, meaning the MARS session
                 //   is left in an incomplete state. As such, with each command that's executed, a
                 //   new session is opened.
+
+                // Flaky stack trace ------------------
+                // Assert.Equal() Failure: Values differ
+                // Expected: 5
+                // Actual:   4
+                // Stack Trace:
+                //    at Microsoft.Data.SqlClient.ManualTesting.Tests.MarsSessionPoolingTest.AssertSessionsAndRequests(SqlConnection connection, Int32 openMarsSessions, Int32 openRequests) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\ManualTests\SQL\MARSSessionPoolingTest\MarsSessionPoolingTest.cs:line 368
+                //    at Microsoft.Data.SqlClient.ManualTesting.Tests.MarsSessionPoolingTest.ExecuteReader_DisposeCommand(CommandType commandType) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\ManualTests\SQL\MARSSessionPoolingTest\MarsSessionPoolingTest.cs:line 256
+                //    at InvokeStub_MarsSessionPoolingTest.ExecuteReader_DisposeCommand(Object, Span`1)
+                //    at System.Reflection.MethodBaseInvoker.InvokeWithOneArg(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
+
                 AssertSessionsAndRequests(connection, openMarsSessions: i + 1, openRequests: i + 1);
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
index 0f81496d65..a6d5b741ed 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
@@ -259,6 +259,7 @@ public void SqlType_BulkCopyFromDataRow_RoundTripsCorrectly(object paramValue, s
         /// <summary>
         /// Round trip sql_variant value using TVP with a SqlMetaData/SqlDataRecord source.
         /// </summary>
+        [Trait("Category", "flaky")] // Doesn't work well on Azure.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(SqlTypeTestData), DisableDiscoveryEnumeration = true)]
         public void SqlType_TvpFromSqlMetaData_RoundTripsCorrectly(object paramValue, string expectedTypeName, string expectedBaseTypeName)
@@ -305,6 +306,7 @@ public void SqlType_TvpFromSqlMetaData_RoundTripsCorrectly(object paramValue, st
         /// <summary>
         /// Round trip sql_variant value using TVP with a SqlDataReader source.
         /// </summary>
+        [Trait("Category", "flaky")] // Doesn't work well on Azure.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(SqlTypeTestData), DisableDiscoveryEnumeration = true)]
         public void SqlType_TvpFromSqlDataReader_RoundTripsCorrectly(object paramValue, string expectedTypeName, string expectedBaseTypeName)

From 1afe6118cee9b3fcde71121eeacf1aededfadf36 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 11 Jun 2026 16:26:06 -0700
Subject: [PATCH 146/298] Add `/ready` slash command and author notification
 for "Author attention needed" label (#4353)

* Introduces workflow to make PR ready to review again with addressed feedback

* Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* include label comment

* Update label

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* updates

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/notify-author-attention.yml | 35 ++++++++
 .../remove-author-attention-label.yml         | 83 +++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 .github/workflows/notify-author-attention.yml
 create mode 100644 .github/workflows/remove-author-attention-label.yml

diff --git a/.github/workflows/notify-author-attention.yml b/.github/workflows/notify-author-attention.yml
new file mode 100644
index 0000000000..4799e9efd1
--- /dev/null
+++ b/.github/workflows/notify-author-attention.yml
@@ -0,0 +1,35 @@
+name: Notify Author attention needed
+
+on:
+  pull_request_target:
+    types: [labeled]
+
+jobs:
+  notify-author:
+    # Only run when 'Author attention needed' label is added to a PR
+    if: >-
+      github.repository == 'dotnet/SqlClient' &&
+      github.event.label.name == 'Author attention needed'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Post comment to PR author
+        uses: actions/github-script@v9
+        with:
+          script: |
+            const issue_number = context.payload.pull_request.number;
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const author = context.payload.pull_request.user.login;
+
+            const body = `@${author} This pull request has been marked as **Author attention needed**.\n\nWhen you have addressed the reviewer feedback and are ready for another review, please post a comment with \`/ready\` to remove the label and re-engage reviewers.`;
+
+            await github.rest.issues.createComment({
+              owner,
+              repo,
+              issue_number,
+              body,
+            });
+            core.info(`Posted notification comment on PR #${issue_number}`);
diff --git a/.github/workflows/remove-author-attention-label.yml b/.github/workflows/remove-author-attention-label.yml
new file mode 100644
index 0000000000..808de9b9c2
--- /dev/null
+++ b/.github/workflows/remove-author-attention-label.yml
@@ -0,0 +1,83 @@
+name: Remove Author attention needed Label
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  remove-label:
+    # Only run on PR comments with '/ready' from the PR author
+    if: >-
+      github.repository == 'dotnet/SqlClient' &&
+      github.event.issue.pull_request != null &&
+      github.event.comment.user.login == github.event.issue.user.login &&
+      startsWith(github.event.comment.body, '/ready')
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Remove 'Author attention needed' label
+        uses: actions/github-script@v9
+        with:
+          script: |
+            const labelName = 'Author attention needed';
+            const issue_number = context.issue.number;
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+
+            // Check if the label exists on the PR
+            const labels = await github.paginate(github.rest.issues.listLabelsOnIssue, {
+              owner,
+              repo,
+              issue_number,
+              per_page: 100,
+            });
+
+            const hasLabel = labels.some(label => label.name === labelName);
+
+            if (!hasLabel) {
+              core.info(`PR #${issue_number} does not have the '${labelName}' label. No action taken.`);
+              return;
+            }
+
+            await github.rest.issues.removeLabel({
+              owner,
+              repo,
+              issue_number,
+              name: labelName,
+            });
+            core.info(`Removed '${labelName}' label from PR #${issue_number}`);
+
+            // Re-request reviews from existing reviewers (paginate to include all reviews)
+            const reviews = await github.paginate(github.rest.pulls.listReviews, {
+              owner,
+              repo,
+              pull_number: issue_number,
+              per_page: 100,
+            });
+
+            // Collect unique reviewers (exclude the PR author)
+            const author = context.payload.issue.user.login;
+            const reviewers = [...new Set(
+              reviews
+                .filter(r => r.user?.type === 'User')
+                .map(r => r.user?.login)
+                .filter(login => login && login !== author)
+            )];
+
+            if (reviewers.length > 0) {
+              try {
+                await github.rest.pulls.requestReviewers({
+                  owner,
+                  repo,
+                  pull_number: issue_number,
+                  reviewers: reviewers.slice(0, 15),
+                });
+                core.info(`Re-requested reviews from: ${reviewers.join(', ')}`);
+              } catch (err) {
+                core.warning(`Failed to re-request reviewers: ${err.message}`);
+              }
+            } else {
+              core.info('No previous reviewers to re-request.');
+            }

From e85a83fbee0623cc33ce56049209db405ee7a5d4 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 15 Jun 2026 10:21:09 -0700
Subject: [PATCH 147/298] Update issue-triage workflow with environment config
 (#4361)

---
 .github/workflows/issue-triage.lock.yml | 36 +++++++++++--------------
 .github/workflows/issue-triage.md       |  2 ++
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/issue-triage.lock.yml b/.github/workflows/issue-triage.lock.yml
index cc20a3b859..468ce93488 100644
--- a/.github/workflows/issue-triage.lock.yml
+++ b/.github/workflows/issue-triage.lock.yml
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"3fbe69c77302fcde863ac1c3f9df536f89e6a71a6b141b505437f06ed45182bc","compiler_version":"v0.72.1","strict":true,"agent_id":"copilot"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"c9a288bea873cc74dd33e81e0f5784e167d990ee0e2645c1722106b45ae1f77d","compiler_version":"v0.72.1","strict":true,"agent_id":"copilot"}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"bc56a0cad2f450c562810785ef38649c04db812a","version":"v0.72.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.41","digest":"sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41","digest":"sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.41","digest":"sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.6","digest":"sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.6@sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c"},{"image":"ghcr.io/github/github-mcp-server:v1.0.3","digest":"sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959","pinned_image":"ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959"},{"image":"node:lts-alpine","digest":"sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f","pinned_image":"node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f"}]}
 #    ___                   _   _      
 #   / _ \                 | | (_)     
@@ -89,7 +89,6 @@ jobs:
       engine_id: ${{ steps.generate_aw_info.outputs.engine_id }}
       lockdown_check_failed: ${{ steps.generate_aw_info.outputs.lockdown_check_failed == 'true' }}
       model: ${{ steps.generate_aw_info.outputs.model }}
-      secret_verification_result: ${{ steps.validate-secret.outputs.verification_result }}
       setup-trace-id: ${{ steps.setup.outputs.trace-id }}
       stale_lock_file_failed: ${{ steps.check-lock-file.outputs.stale_lock_file_failed == 'true' }}
       text: ${{ steps.sanitized.outputs.text }}
@@ -131,11 +130,6 @@ jobs:
             setupGlobals(core, github, context, exec, io, getOctokit);
             const { main } = require('${{ runner.temp }}/gh-aw/actions/generate_aw_info.cjs');
             await main(core, context);
-      - name: Validate COPILOT_GITHUB_TOKEN secret
-        id: validate-secret
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/validate_multi_secret.sh" COPILOT_GITHUB_TOKEN 'GitHub Copilot CLI' https://github.github.com/gh-aw/reference/engines/#github-copilot-default
-        env:
-          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
       - name: Checkout .github and .agents folders
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
@@ -207,20 +201,20 @@ jobs:
         run: |
           bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
           {
-          cat << 'GH_AW_PROMPT_ab488ada0396c523_EOF'
+          cat << 'GH_AW_PROMPT_671235e4d67f4971_EOF'
           <system>
-          GH_AW_PROMPT_ab488ada0396c523_EOF
+          GH_AW_PROMPT_671235e4d67f4971_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_ab488ada0396c523_EOF'
+          cat << 'GH_AW_PROMPT_671235e4d67f4971_EOF'
           <safe-output-tools>
           Tools: add_comment, add_labels, remove_labels, missing_tool, missing_data, noop
           </safe-output-tools>
-          GH_AW_PROMPT_ab488ada0396c523_EOF
+          GH_AW_PROMPT_671235e4d67f4971_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          cat << 'GH_AW_PROMPT_ab488ada0396c523_EOF'
+          cat << 'GH_AW_PROMPT_671235e4d67f4971_EOF'
           <github-context>
           The following GitHub context information is available for this workflow:
           {{#if __GH_AW_GITHUB_ACTOR__ }}
@@ -249,15 +243,15 @@ jobs:
           {{/if}}
           </github-context>
           
-          GH_AW_PROMPT_ab488ada0396c523_EOF
+          GH_AW_PROMPT_671235e4d67f4971_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          cat << 'GH_AW_PROMPT_ab488ada0396c523_EOF'
+          cat << 'GH_AW_PROMPT_671235e4d67f4971_EOF'
           </system>
           {{#runtime-import .github/workflows/issue-triage.md}}
-          GH_AW_PROMPT_ab488ada0396c523_EOF
+          GH_AW_PROMPT_671235e4d67f4971_EOF
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -337,6 +331,7 @@ jobs:
   agent:
     needs: activation
     runs-on: ubuntu-latest
+    environment: issue-triage
     permissions:
       contents: read
       issues: read
@@ -453,9 +448,9 @@ jobs:
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_a309dbbfe73b9ee4_EOF'
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_2171a9d22dc2eb73_EOF'
           {"add_comment":{"hide_older_comments":true,"max":1},"add_labels":{"allowed":["Auto-Triage: Waiting for Author"],"max":1},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"false"},"remove_labels":{"allowed":["Auto-Triage: Waiting for Author"],"max":1},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_a309dbbfe73b9ee4_EOF
+          GH_AW_SAFE_OUTPUTS_CONFIG_2171a9d22dc2eb73_EOF
       - name: Generate Safe Outputs Tools
         env:
           GH_AW_TOOLS_META_JSON: |
@@ -682,7 +677,7 @@ jobs:
           
           mkdir -p /home/runner/.copilot
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_52e7f3ed4af388a8_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_e021cf5fa19f3aa2_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
               "github": {
@@ -726,7 +721,7 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_52e7f3ed4af388a8_EOF
+          GH_AW_MCP_CONFIG_e021cf5fa19f3aa2_EOF
       - name: Mount MCP servers as CLIs
         id: mount-mcp-clis
         continue-on-error: true
@@ -958,6 +953,7 @@ jobs:
       always() && (needs.agent.result != 'skipped' || needs.activation.outputs.lockdown_check_failed == 'true' ||
       needs.activation.outputs.stale_lock_file_failed == 'true')
     runs-on: ubuntu-slim
+    environment: issue-triage
     permissions:
       contents: read
       discussions: write
@@ -1070,7 +1066,6 @@ jobs:
           GH_AW_WORKFLOW_ID: "issue-triage"
           GH_AW_ACTION_FAILURE_ISSUE_EXPIRES_HOURS: "168"
           GH_AW_ENGINE_ID: "copilot"
-          GH_AW_SECRET_VERIFICATION_RESULT: ${{ needs.activation.outputs.secret_verification_result }}
           GH_AW_CHECKOUT_PR_SUCCESS: ${{ needs.agent.outputs.checkout_pr_success }}
           GH_AW_INFERENCE_ACCESS_ERROR: ${{ needs.agent.outputs.inference_access_error }}
           GH_AW_MCP_POLICY_ERROR: ${{ needs.agent.outputs.mcp_policy_error }}
@@ -1289,6 +1284,7 @@ jobs:
       - detection
     if: (!cancelled()) && needs.agent.result != 'skipped' && needs.detection.result == 'success'
     runs-on: ubuntu-slim
+    environment: issue-triage
     permissions:
       contents: read
       discussions: write
diff --git a/.github/workflows/issue-triage.md b/.github/workflows/issue-triage.md
index 4f0d391f41..ef157d7f62 100644
--- a/.github/workflows/issue-triage.md
+++ b/.github/workflows/issue-triage.md
@@ -42,6 +42,8 @@ if: |
 
 engine: copilot
 
+environment: issue-triage
+
 permissions:
   contents: read
   issues: read

From ef601224fe725111150272391892481a593e555d Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 15 Jun 2026 11:00:15 -0700
Subject: [PATCH 148/298] Public Roadmap (#4331)

---
 CONTRIBUTING.md          | 40 +++++++++++++++++
 README.md                |  1 +
 contributing-workflow.md | 93 ++++++++++++++++++++++++++++++++++++--
 roadmap.md               | 96 +++++++++++++++++++++++++++++++++-------
 4 files changed, 210 insertions(+), 20 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8dca7be35c..13ee1ef83b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -129,6 +129,46 @@ To prevent closure, simply add comments, push commits, or respond to feedback.
 
 Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC) [secure@microsoft.com](mailto:secure@microsoft.com). You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the [MSRC FAQ](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue?rtc=1&oneroute=true).
 
+## Submitting Pull Requests
+
+- **New features from community PRs must be driven by creating a GitHub issue first.** Discuss the proposal in the issue before starting implementation. This helps avoid wasted effort and ensures alignment with project goals.
+- **Community contributions must not derail the project roadmap.** We prioritize features and fixes according to our published milestones. PRs that conflict with or distract from active roadmap items may be deferred.
+- **Our maintainers reserve the right to reject PRs** that do not meet the required criteria to qualify for review. This includes PRs that:
+  - Lack a corresponding approved issue (i.e., an issue that has been reviewed, acknowledged, and agreed upon by maintainers — typically indicated by the **`PM Approved`** field being set to **`Approved`** in the GitHub Project board)
+  - Introduce breaking changes without prior discussion
+  - Do not follow the project's coding standards and conventions
+  - Are missing adequate test coverage
+  - Conflict with work already in progress by the team
+- **Bug fixes and small improvements** are generally welcome without a prior issue, but a linked issue helps us triage and prioritize your contribution.
+
+### What Makes a Great Contribution
+
+1. **Start with an issue** — File a [feature request](https://github.com/dotnet/SqlClient/issues/new?template=feature_request.md) or [bug report](https://github.com/dotnet/SqlClient/issues/new?template=bug-report.md) and wait for maintainer feedback
+2. **Follow the conventions** — See [coding guidelines](policy/coding-style.md)
+3. **Include tests** — Both unit tests and integration tests where applicable
+4. **Keep scope focused** — One feature or fix per PR
+5. **Update documentation** — For any public API changes
+
+### Contribution Workflow
+
+See [contributing-workflow.md](contributing-workflow.md) for details on how PRs are tracked through our review process.
+
+## Feedback
+
+The best way to give feedback is to create issues in the [dotnet/SqlClient](https://github.com/dotnet/SqlClient) repo.
+
+Please give us feedback that will provide insight on the following:
+
+- Existing features that are missing some capability or otherwise don't work well enough.
+- Missing features that should be added to the product.
+- Design choices for a feature that is currently in-progress.
+
+Some important caveats:
+
+- It is best to give design feedback quickly for improvements that are in development. We're unlikely to hold a feature from a release on late feedback.
+- We are most likely to include improvements that either have a positive impact on a broad scenario or have very significant positive impact on a niche scenario. This means that we are unlikely to prioritize modest improvements to niche scenarios.
+- Compatibility will almost always be given a higher priority than improvements.
+
 ## Contribution Standards
 
 Project maintainers will merge changes that improve the product significantly and broadly and that align with the [Microsoft.Data.SqlClient roadmap](roadmap.md).
diff --git a/README.md b/README.md
index 1a066c52d4..07374c727b 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ When targeting .NET on Windows, a package reference to [Microsoft.Data.SqlClient
 | Coding Style | [coding-style.md](/policy/coding-style.md) |
 | Contributing | [CONTRIBUTING.md](CONTRIBUTING.md) |
 | Copyright Information | [COPYRIGHT.md](COPYRIGHT.md) |
+| Roadmap | [roadmap.md](roadmap.md) |
 | Review Process | [review-process.md](/policy/review-process.md) |
 | Support Policy | [SUPPORT.md](SUPPORT.md) |
 
diff --git a/contributing-workflow.md b/contributing-workflow.md
index 266c39c1a7..be7fffdbf2 100644
--- a/contributing-workflow.md
+++ b/contributing-workflow.md
@@ -7,7 +7,7 @@ You can contribute to Microsoft.Data.SqlClient with issues and PRs. Simply filin
 We use and recommend the following workflow:
 
 1. **Create an issue for your work.**
-    - You can skip this step for trivial changes.
+    - **For all significant changes you intend to make in this repository, an issue is required.** This gives maintainers a chance to review the proposal before implementation begins and prevents wasted effort. Bug fixes and small improvements are generally welcome without a prior issue, but a linked issue helps us triage and prioritize your contribution.
     - Reuse an existing issue on the topic, if there is one.
     - Get agreement from the team and the community that your proposed change is a good one.
     - Suggest [Labels](CONTRIBUTING.md#using-labels) to add for your issue.
@@ -39,11 +39,12 @@ We use and recommend the following workflow:
 - It is OK to create your PR as Draft on the upstream repo before the implementation is done.
 - This can be useful if you'd like to start the feedback process concurrent with your implementation.
 - State that this is the case in the initial PR comment.
+- **Keep your PR in Draft until CI validation passes.** The PR pipeline runs without maintainer intervention, so contributors should ensure all checks are green before marking the PR as ready for review. PRs appearing ready for review with failing checks will not be picked up by reviewers.
 
 ### Commit Guidelines
 
 - It is OK for your PR to include a large number of commits.
-- Once your change is accepted, you will be asked to squash your commits into one or some appropriately small number of commits before your PR is merged.
+- PRs are merged via the default "Squash and Merge" strategy (see [Merging Pull Requests](#merging-pull-requests)), so your commit history is automatically collapsed into a single commit at merge time.
 
 ## PR - CI Process
 
@@ -63,13 +64,98 @@ If the CI build fails for any reason, the PR issue will be updated with a link t
 
 - **Build failures**: Check the CI logs for specific error messages.
 - **Test failures**: Ensure all tests pass locally before pushing.
-- **Merge conflicts**: Rebase your branch against the latest main branch.
+- **Merge conflicts**:
+  - *Before review has started*: Rebase your branch against the latest `main` branch to keep history clean.
+  - *After a reviewer has started reviewing*: Do **not** rebase. Rebasing rewrites commit history and makes it impossible for reviewers to tell which commits they have already reviewed, forcing them to start over. Instead, resolve conflicts by merging the latest `main` into your branch (`git merge main`) so that previously reviewed commits remain intact and reviewers can pick up where they left off.
 
 ### Getting Help
 
 - Comment on your PR if you're stuck.
 - Reach out in [GitHub Discussions](https://github.com/dotnet/SqlClient/discussions) for broader questions.
 
+## Tracking PRs in the GitHub Project
+
+The [SqlClient Board](https://github.com/orgs/dotnet/projects/588) (dotnet org project #588) is the team's triage board for tracking issues and PRs. When a PR is linked to an issue, its progress is tracked through the project's fields described below.
+
+### Project Fields
+
+| Field | Type | Values | Purpose |
+|-------|------|--------|---------|
+| **Status** | Single select | `To triage`, `Waiting for customer`, `In progress`, `In review`, `In validation`, `Done` | Tracks the current workflow stage of the item |
+| **Priority** | Single select | `P0`, `P1`, `P2`, `P3` | Indicates urgency and scheduling priority |
+| **Size** | Single select | `XS`, `S`, `M`, `L`, `XL` | Estimates effort/complexity of the work |
+| **API Impact** | Single select | `Breaking Change`, `New API`, `None` | Flags whether the change affects public API surface |
+| **PM Approved** | Single select | `N/A`, `Pending`, `Approved` | Tracks product manager sign-off for API or behavioral changes |
+| **Assignees** | Field | *(GitHub users)* | Who is responsible for the work |
+| **Labels** | Field | *(GitHub labels)* | Categorization and area tags |
+| **Reviewers** | Field | *(GitHub users)* | Assigned code reviewers |
+| **Milestone** | Field | *(GitHub milestones)* | Target release version |
+| **Linked pull requests** | Field | *(PR references)* | PRs associated with the issue |
+| **Parent issue** | Field | *(issue reference)* | Epic or parent tracking issue |
+| **Sub-issues progress** | Field | *(auto-calculated)* | Completion progress of child issues |
+| **Comment** | Text | *(free text)* | Additional context or notes |
+| **AB-Link** | Text | *(URL)* | Link to Azure Boards work item (if applicable) |
+
+### Status Stages for PRs
+
+PRs (and their linked issues) move through the **Status** field to communicate reviewability and progress:
+
+| Status | What it means for a PR |
+|--------|------------------------|
+| **To triage** | PR just opened or linked issue is awaiting initial assessment. Maintainers will review scope, assign reviewers, and set priority. |
+| **In progress** | Author is actively developing the change. PR may be in Draft state. |
+| **In review** | PR is ready for code review. Reviewers are assigned and the author considers the implementation complete. |
+| **Waiting for customer** | Review feedback has been given; the PR author needs to respond or push changes. When a reviewer requests changes, they will also apply the **`Author attention needed`** label so the PR is easy to surface in queries and dashboards. Once the author addresses the feedback, they should remove the `Author attention needed` label if permissions allow or comment `/ready` on the PR to remove the label `Author attention needed` and re-engage the reviewers to move the PR back to `In review`. |
+| **In validation** | PR is approved and being validated (CI, manual testing, integration checks) before merge. |
+| **Done** | PR has been merged and the associated work is complete. |
+
+### Status Transitions
+
+When a reviewer leaves feedback that needs author action, they move the PR to `Waiting for customer` **and** apply the `Author attention needed` label. The author removes the label (and updates Status back to `In review`/`In progress`) once the feedback is addressed.
+
+```
++--------------+       +---------------+       +-------------------------+       +-----------------+       +--------+
+|  To triage   |------>|  In progress  |------>|        In review        |------>|  In validation  |------>|  Done  |
++--------------+       +---------------+       +------------+------------+       +-----------------+       +--------+
+                              ^                      |            ^
+                              |                      | changes    | author addresses
+                              |                      | requested  | feedback (minor) +
+                              |                      | + label    | removes label
+                              |                      v            |
+                              |          +------------------------+
+                              |          | Waiting for customer    |
+                              |          | + Author attention      |
+                              |          |   needed (label)        |
+                              |          +------------------------+
+                              |                      |
+                              |                      | major rework needed
+                              +----------------------+
+```
+
+### Additional Field Usage
+
+- **Priority**: `P0` items are critical fixes that should be reviewed and merged urgently. `P1` items are high priority for the current milestone. `P2`/`P3` items are scheduled as capacity allows.
+- **Size**: Helps reviewers estimate review effort. `XS`/`S` PRs should get faster turnaround. `L`/`XL` PRs may need multiple reviewers or phased review.
+- **API Impact**: PRs marked `Breaking Change` or `New API` require **PM Approved = Approved** before merge. `ref/` project updates must accompany these PRs.
+- **PM Approved**: Set to `Pending` when a PR introduces API changes. Must reach `Approved` before the PR can be merged. `N/A` for internal or non-API changes.
+
+### Guidelines for Contributors
+
+> **Note:** Setting labels and project board fields (Status, Priority, etc.) requires maintainer or triage access. External contributors cannot modify these directly. Instead, suggest labels in your PR description and the team will apply them. If review feedback asks you to "remove the label" or "update Status", a maintainer will handle it if you don't have access—just let the team know in a comment.
+
+1. **Link your PR to an issue** — This ensures the PR appears on the project board and is tracked through the workflow.
+2. **Keep Status current** — If you're the author, move your linked issue to `In review` when your PR is ready for feedback.
+3. **Respond promptly** — When status is `Waiting for customer` and the **`Author attention needed`** label is applied, the team is blocked on your response. Address the feedback, push the updates, **remove the `Author attention needed` label**, and move Status back to `In review` (or `In progress` for major rework) so reviewers know the PR is ready for another pass. If you are a community contributor, you may post a comment `/ready` on the PR to automate removing the label and re-engaging reviewers on the PR.
+4. **Flag API changes early** — Set **API Impact** appropriately so PM review can happen in parallel with code review.
+5. **Don't skip validation** — Even after approval, the PR stays in `In validation` until CI passes and any manual verification is complete.
+
+### Guidelines for Reviewers
+
+1. **Signal that author action is required** — When your review requests changes (whether via formal "Request changes" or a comment that requires author follow-up), apply the **`Author attention needed`** label to the PR and move its linked issue to `Waiting for customer`. This pair (label + status) is what the team uses to find PRs that are blocked on the author versus those still awaiting review.
+2. **Don't remove the label yourself** — Leave the `Author attention needed` label in place until the author pushes updates addressing the feedback; the author is responsible for removing it when they hand the PR back for review.
+3. **Re-review promptly** — Once the author removes the label, the PR status should be updated either by Author (if they have permissions) or the reviewer to `In review`, so it doesn't stall and is picked up for review on time.
+4. **Only reviewers resolve their own feedback threads** — A review comment thread should only be resolved by the reviewer who created it, once they are satisfied the feedback has been addressed. Authors should not resolve reviewer threads themselves.
+
 ## Stale PR Management
 
 The SqlClient repository uses automated workflows to manage inactive pull requests and maintain repository hygiene.
@@ -111,6 +197,7 @@ One or more Microsoft team members will review every PR prior to merge. They wil
 - Address all review comments before the PR can be merged.
 - Feel free to ask questions if feedback is unclear.
 - Push additional commits to address feedback (these will be squashed later).
+- When a reviewer leaves feedback that needs your action, they will set Status to `Waiting for customer` and apply the **`Author attention needed`** label. After you push updates, **remove the `Author attention needed` label** or post a comment `/ready` to do so, so the reviewers know the PR is ready for another pass.
 
 ## Merging Pull Requests
 
diff --git a/roadmap.md b/roadmap.md
index 4c080e7242..e41d19dc79 100644
--- a/roadmap.md
+++ b/roadmap.md
@@ -1,30 +1,92 @@
 # Microsoft.Data.SqlClient Roadmap
 
-The Microsoft.Data.SqlClient roadmap communicates project priorities for evolving and extending the scope of the product. We encourage the community to work with us to improve SqlClient driver for these scenarios and extend it for others.
+The Microsoft.Data.SqlClient roadmap communicates project priorities for evolving and extending the scope of the product. We encourage the community to work with us to improve the SqlClient driver for these scenarios and extend it for others.
 
-## Released Versions
+> **Last updated:** May 2026
+>
+> This roadmap is a living document. Priorities and timelines may shift based on community feedback, engineering constraints, and business needs. We update this page regularly to reflect the current state of development.
+
+---
+
+## Release Milestones
+
+For active release milestones, their target dates, and the changes included, see [SqlClient milestones](https://github.com/dotnet/SqlClient/milestones).
+
+---
+
+## Current Focus Areas
+
+Our team is actively working on the following high-level themes. Features are tracked via [GitHub issues](https://github.com/dotnet/SqlClient/issues) where applicable — see the linked milestones for associated issue details.
+
+- **Active** — Currently in development
+- **Planned** — Committed for a future milestone with estimated delivery
+- **Backlog** — On our radar for future months, not yet scheduled
+
+### Performance & Reliability
+
+| Work Item(s) | Feature | Status | ETA |
+| ------------ | ------- | ------ | --- |
+| [#3356](https://github.com/dotnet/SqlClient/issues/3356) | Connection pool performance improvements | Active | July 2026 |
+| N/A | Performance benchmarking suite | Active | July 2026 |
+| [#422](https://github.com/dotnet/SqlClient/issues/422) | Phase 1 - Unix async performance — thread starvation in parallel `ExecuteReaderAsync` | Active | September 2026 |
+| TBD | Phase 2 - Async usage analysis and optimization | Planned | — |
 
-- [Release Notes](release-notes/README.md) - For detailed release notes summarizing of all changes/features released.
-- [GitHub Releases](https://github.com/dotnet/sqlclient/releases) - For downloading NuGet Packages and identifying driver releases with changelog notes.
+### New Data Type Support
 
-## Upcoming Ship Dates
+| Work Item(s) | Feature | Status | ETA |
+| ------------ | ------- | ------ | --- |
+| TBD | Vector subtype support — `float16` (`Half`) | Active | August 2026 |
 
-For upcoming release dates, see [SqlClient milestones](https://github.com/dotnet/SqlClient/milestones).
+### Observability & Diagnostics
 
-[SqlClient Projects](https://github.com/dotnet/SqlClient/projects) are used by our development team to define roadmap of prioritized work. SqlClient Boards contain issues, pull requests, and other features, development activities that are categorized as cards. Our goal is to be transparent over priorities, work in progress and deliverables.
+| Work Item(s) | Feature | Status | ETA |
+| ------------ | ------- | ------ | --- |
+| [#2210](https://github.com/dotnet/SqlClient/issues/2210) [#2211](https://github.com/dotnet/SqlClient/issues/2211) | OpenTelemetry support | Planned | — |
+| N/A | Logging improvements | Planned | — |
+| TBD | Integrate with / expose MSAL logging | Planned | — |
 
-## Feedback
+### API Improvements
+
+| Work Item(s) | Feature | Status | ETA |
+| ------------ | ------- | ------ | --- |
+| [#2353](https://github.com/dotnet/SqlClient/issues/2353) | Expose connection encryption information to clients | Planned | September 2026 |
+| [#26](https://github.com/dotnet/SqlClient/issues/26) | Throw `TaskCanceledException` instead of `SqlException` for cancellations | Planned | September 2026 |
+| [#113](https://github.com/dotnet/SqlClient/issues/113) | `BeginTransactionAsync` API on `SqlConnection` | Planned | — |
+
+### Security & Architecture
+
+| Feature | Status | ETA |
+| ------- | ------ | --- |
+| Security hardening activities | Active | Ongoing internally |
+
+### AI & Developer Tooling
+
+| Feature | Status | ETA |
+| ------- | ------ | --- |
+| `System.Data.SqlClient` → `Microsoft.Data.SqlClient` migration via Modernize with Copilot | Active | September 2026 |
+| Modernize SqlClient repository with AI | Active | Ongoing |
+
+### Engineering & Infrastructure
+
+| Feature | Status | ETA |
+| ------- | ------ | --- |
+| CI/CD pipeline redesign | Active | August 2026 |
+| Add SQL Server 2025 to test matrix | Planned | August 2026 |
+| Add .NET 10 to test matrix | Planned | August 2026 |
+| Converting existing traditional pipelines to YAML | Active | August 2026 |
+| Performance benchmarking pipeline (Internal) | Planned | September 2026 |
+
+---
+
+## Released Versions
 
-The best way to give feedback is to create issues in the [dotnet/sqlclient](https://github.com/dotnet/sqlclient) repo.
+- [Release Notes](release-notes/README.md) — Detailed release notes summarizing all changes and features released.
+- [GitHub Releases](https://github.com/dotnet/SqlClient/releases) — NuGet packages and changelog notes for each release.
 
-Although mostly obvious, please give us feedback that will give us insight on the following points:
+---
 
-- Existing features are missing some capability or otherwise don't work well enough.
-- Missing features that should be added to the product.
-- Design choices for a feature that is currently in-progress.
+## Community Contributions & Feedback
 
-Some important caveats / notes:
+For information on how to contribute, see [CONTRIBUTING.md](CONTRIBUTING.md). For details on the PR tracking workflow, see [contributing-workflow.md](contributing-workflow.md).
 
-- It is best to give design feedback quickly for improvements that are in-development. We're unlikely to hold a feature being part of a release on late feedback.
-- We are most likely to include improvements that either have a positive impact on a broad scenario or have very significant positive impact on a niche scenario. This means that we are unlikely to prioritize modest improvements to niche scenarios.
-- Compatibility will almost always be given a higher priority than improvements.
+The best way to give feedback is to create issues in the [dotnet/SqlClient](https://github.com/dotnet/SqlClient) repo.

From 0764a5c0f4a372d5e6b7f5cda5a0b3452f1011c6 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:11:54 -0300
Subject: [PATCH 149/298] Fix macOS CI: trust microsoft/mssql-release tap for
 Homebrew 5.2+ (#4363)

* Fix macOS CI: trust microsoft/mssql-release tap for Homebrew 5.2+

Homebrew 5.2.0 made untrusted-tap enforcement the default. After
'brew update' pulls in the new version, 'brew install mssql-tools18'
is refused because the microsoft/mssql-release tap is untrusted.

This caused sqlcmd to never be installed (exit code 127), so the
SQL Server connectivity check looped for 72 attempts and failed.

Add 'brew trust microsoft/mssql-release' after tapping and before
'brew update' to explicitly trust the Microsoft tap.

* Address PR #4363 review feedback

- Move 'brew trust' after 'brew update' so it works even when the
  runner image starts with a Homebrew version older than 5.2.
- Add a fail-fast check after 'brew install mssql-tools18' to
  immediately abort with a clear error if sqlcmd is not on PATH,
  avoiding the 6-minute timeout loop.
---
 .../steps/configure-sql-server-macos-step.yml         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
index a989bf19bf..6e1541f939 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
@@ -34,8 +34,19 @@ steps:
       brew install docker
       brew tap microsoft/mssql-release https://github.com/Microsoft/homebrew-mssql-release
       brew update
+      # Homebrew 5.2+ requires explicit trust for third-party taps.  Run this
+      # after 'brew update' so the trust command is available even if the runner
+      # image shipped an older Homebrew version.
+      brew trust microsoft/mssql-release
       HOMEBREW_ACCEPT_EULA=Y brew install mssql-tools18
 
+      # Fail fast if sqlcmd was not installed (e.g. tap-trust or formula error).
+      # Without this check the script would loop for ~6 minutes trying to connect.
+      if ! command -v sqlcmd &>/dev/null; then
+        echo "ERROR: sqlcmd is not on PATH after brew install. Check the mssql-tools18 installation above."
+        exit 1
+      fi
+
       # Start Colima with Virtualization.framework for x86_64 binary translation
       # on Apple Silicon.  Rosetta/binfmt emulation is enabled by default in
       # Colima >= 0.8 when using --vm-type vz, which is dramatically faster than

From 47f4e52cc70f571a150a723a7a106dc6ec74e1a6 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 15 Jun 2026 21:05:40 -0300
Subject: [PATCH 150/298] Switch SDK rollForward from disable to patch for
 automatic servicing updates (#4364)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Switch SDK rollForward from disable to patch

Allow automatic roll-forward within the 10.0.3xx feature band so that
servicing patches (e.g. security fixes like 10.0.301) are picked up by
CI agents and developers without requiring a dedicated PR for each bump.

The base version remains 10.0.300 — this is the minimum required SDK.
Any installed 10.0.3xx patch will be used automatically.

Updated both global.json files:
- /global.json (repo root)
- /tools/PackageCompatibility/global.json

* Re-worded SDK comment.
---
 global.json                            | 5 +++--
 tools/PackageCompatibility/global.json | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/global.json b/global.json
index 5d6e4f2f39..650a5c0ddf 100644
--- a/global.json
+++ b/global.json
@@ -4,8 +4,9 @@
     // We currently require the .NET 10 SDK to build and test the project.
     "version": "10.0.300",
 
-    // Lock to the above version so that we can control when we take breaking sdk changes.
-    "rollForward": "disable",
+    // Allow roll-forward within the 10.0.3xx feature band so servicing patches
+    // are picked up automatically without requiring a PR for each bump.
+    "rollForward": "patch",
 
     // Do not allow pre-release versions.
     //
diff --git a/tools/PackageCompatibility/global.json b/tools/PackageCompatibility/global.json
index 7c7fca5caa..af3f080d1f 100644
--- a/tools/PackageCompatibility/global.json
+++ b/tools/PackageCompatibility/global.json
@@ -7,9 +7,9 @@
   "sdk": {
     // global.json lookup stops at the nearest file and does not merge with the repo-root file.
     // This subtree therefore needs to repeat the root SDK settings so commands run from
-    // tools/PackageCompatibility keep using the same pinned SDK behavior.
+    // tools/PackageCompatibility keep using the same SDK behavior.
     "version": "10.0.300",
-    "rollForward": "disable",
+    "rollForward": "patch",
     "allowPrerelease": false
   }
 }

From df09e3a9b9aa766ba211ab7e910822a4540add2d Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 17 Jun 2026 08:17:35 -0300
Subject: [PATCH 151/298] Replace Newtonsoft.Json with System.Text.Json in
 tests and samples (#4323)

---
 Directory.Packages.props                      |   1 -
 .../AzureKeyVaultProviderLegacyExample_2_0.cs | 380 ------------------
 .../Microsoft.Data.SqlClient.Samples.csproj   |   1 -
 ...soft.Data.SqlClient.FunctionalTests.csproj |   2 -
 .../tests/FunctionalTests/SqlExceptionTest.cs |  59 +--
 ...icrosoft.Data.SqlClient.ManualTests.csproj |   2 -
 .../SQL/JsonTest/JsonBulkCopyTest.cs          |  21 +-
 .../SQL/JsonTest/JsonStreamTest.cs            |  19 +-
 .../SQL/JsonTest/JsonTestHelper.cs            |  86 ++++
 9 files changed, 119 insertions(+), 452 deletions(-)
 delete mode 100644 doc/samples/AzureKeyVaultProviderLegacyExample_2_0.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTestHelper.cs

diff --git a/Directory.Packages.props b/Directory.Packages.props
index c35ad35a59..70a2c00ac6 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -96,7 +96,6 @@
   <ItemGroup>
     <PackageVersion Include="Azure.Core" Version="1.51.1" />
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.83.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
diff --git a/doc/samples/AzureKeyVaultProviderLegacyExample_2_0.cs b/doc/samples/AzureKeyVaultProviderLegacyExample_2_0.cs
deleted file mode 100644
index d397de6441..0000000000
--- a/doc/samples/AzureKeyVaultProviderLegacyExample_2_0.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-/**
- * TODO: This sample file should be deleted as the AKV Provider Ctor API is no longer supported with supported versions of AKV provider and MDS.
- * Depends on: Delete documentation and sample reference in MS Docs first: https://learn.microsoft.com/en-us/sql/connect/ado-net/sql/azure-key-vault-example?view=sql-server-ver17#legacy-callback-implementation-design-example-with-v20
- *
-
-//< Snippet1>
-using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
-using System.Net.Http;
-using System.Security.Cryptography;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Microsoft.Data.SqlClient.Samples
-{
-    public class AzureKeyVaultProviderLegacyExample_2_0
-    {
-        const string s_algorithm = "RSA_OAEP";
-
-        // ********* Provide details here ***********
-        static readonly string s_akvUrl = "https://{KeyVaultName}.vault.azure.net/keys/{Key}/{KeyIdentifier}";
-        static readonly string s_clientId = "{Application_Client_ID}";
-        static readonly string s_clientSecret = "{Application_Client_Secret}";
-        static readonly string s_connectionString = "Server={Server}; Database={database}; Integrated Security=true; Column Encryption Setting=Enabled;";
-        // ******************************************
-
-        public static void Main()
-        {
-            // Initialize AKV provider
-            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new SqlColumnEncryptionAzureKeyVaultProvider(new LegacyAuthCallbackTokenCredential());
-
-            // Register AKV provider
-            SqlConnection.RegisterColumnEncryptionKeyStoreProviders(customProviders: new Dictionary<string, SqlColumnEncryptionKeyStoreProvider>(capacity: 1, comparer: StringComparer.OrdinalIgnoreCase)
-                {
-                    { SqlColumnEncryptionAzureKeyVaultProvider.ProviderName, akvProvider}
-                });
-            Console.WriteLine("AKV provider Registered");
-
-            // Create connection to database
-            using (SqlConnection sqlConnection = new SqlConnection(s_connectionString))
-            {
-                string cmkName = "CMK_WITH_AKV";
-                string cekName = "CEK_WITH_AKV";
-                string tblName = "AKV_TEST_TABLE";
-
-                CustomerRecord customer = new CustomerRecord(1, @"Microsoft", @"Corporation");
-
-                try
-                {
-                    sqlConnection.Open();
-
-                    // Drop Objects if exists
-                    dropObjects(sqlConnection, cmkName, cekName, tblName);
-
-                    // Create Column Master Key with AKV Url
-                    createCMK(sqlConnection, cmkName);
-                    Console.WriteLine("Column Master Key created.");
-
-                    // Create Column Encryption Key
-                    createCEK(sqlConnection, cmkName, cekName, akvProvider);
-                    Console.WriteLine("Column Encryption Key created.");
-
-                    // Create Table with Encrypted Columns
-                    createTbl(sqlConnection, cekName, tblName);
-                    Console.WriteLine("Table created with Encrypted columns.");
-
-                    // Insert Customer Record in table
-                    insertData(sqlConnection, tblName, customer);
-                    Console.WriteLine("Encryted data inserted.");
-
-                    // Read data from table
-                    verifyData(sqlConnection, tblName, customer);
-                    Console.WriteLine("Data validated successfully.");
-                }
-                finally
-                {
-                    // Drop table and keys
-                    dropObjects(sqlConnection, cmkName, cekName, tblName);
-                    Console.WriteLine("Dropped Table, CEK and CMK");
-                }
-
-                Console.WriteLine("Completed AKV provider Sample.");
-            }
-        }
-
-        private static void createCMK(SqlConnection sqlConnection, string cmkName)
-        {
-            string KeyStoreProviderName = SqlColumnEncryptionAzureKeyVaultProvider.ProviderName;
-
-            string sql =
-                $@"CREATE COLUMN MASTER KEY [{cmkName}]
-                    WITH (
-                        KEY_STORE_PROVIDER_NAME = N'{KeyStoreProviderName}',
-                        KEY_PATH = N'{s_akvUrl}'
-                    );";
-
-            using (SqlCommand command = sqlConnection.CreateCommand())
-            {
-                command.CommandText = sql;
-                command.ExecuteNonQuery();
-            }
-        }
-
-        private static void createCEK(SqlConnection sqlConnection, string cmkName, string cekName, SqlColumnEncryptionAzureKeyVaultProvider sqlColumnEncryptionAzureKeyVaultProvider)
-        {
-            string sql =
-                $@"CREATE COLUMN ENCRYPTION KEY [{cekName}]
-                    WITH VALUES (
-                        COLUMN_MASTER_KEY = [{cmkName}],
-                        ALGORITHM = '{s_algorithm}',
-                        ENCRYPTED_VALUE = {GetEncryptedValue(sqlColumnEncryptionAzureKeyVaultProvider)}
-                    )";
-
-            using (SqlCommand command = sqlConnection.CreateCommand())
-            {
-                command.CommandText = sql;
-                command.ExecuteNonQuery();
-            }
-        }
-
-        private static string GetEncryptedValue(SqlColumnEncryptionAzureKeyVaultProvider sqlColumnEncryptionAzureKeyVaultProvider)
-        {
-            byte[] plainTextColumnEncryptionKey = new byte[32];
-            RandomNumberGenerator rng = RandomNumberGenerator.Create();
-            rng.GetBytes(plainTextColumnEncryptionKey);
-
-            byte[] encryptedColumnEncryptionKey = sqlColumnEncryptionAzureKeyVaultProvider.EncryptColumnEncryptionKey(s_akvUrl, s_algorithm, plainTextColumnEncryptionKey);
-            string EncryptedValue = string.Concat("0x", BitConverter.ToString(encryptedColumnEncryptionKey).Replace("-", string.Empty));
-            return EncryptedValue;
-        }
-
-        private static void createTbl(SqlConnection sqlConnection, string cekName, string tblName)
-        {
-            string ColumnEncryptionAlgorithmName = @"AEAD_AES_256_CBC_HMAC_SHA_256";
-
-            string sql =
-                    $@"CREATE TABLE [dbo].[{tblName}]
-                (
-                    [CustomerId] [int] ENCRYPTED WITH (COLUMN_ENCRYPTION_KEY = [{cekName}], ENCRYPTION_TYPE = DETERMINISTIC, ALGORITHM = '{ColumnEncryptionAlgorithmName}'),
-                    [FirstName] [nvarchar](50) COLLATE Latin1_General_BIN2 ENCRYPTED WITH (COLUMN_ENCRYPTION_KEY = [{cekName}], ENCRYPTION_TYPE = DETERMINISTIC, ALGORITHM = '{ColumnEncryptionAlgorithmName}'),
-                    [LastName] [nvarchar](50) COLLATE Latin1_General_BIN2 ENCRYPTED WITH (COLUMN_ENCRYPTION_KEY = [{cekName}], ENCRYPTION_TYPE = DETERMINISTIC, ALGORITHM = '{ColumnEncryptionAlgorithmName}')
-                )";
-
-            using (SqlCommand command = sqlConnection.CreateCommand())
-            {
-                command.CommandText = sql;
-                command.ExecuteNonQuery();
-            }
-        }
-
-        private static void insertData(SqlConnection sqlConnection, string tblName, CustomerRecord customer)
-        {
-            string insertSql = $"INSERT INTO [{tblName}] (CustomerId, FirstName, LastName) VALUES (@CustomerId, @FirstName, @LastName);";
-
-            using (SqlTransaction sqlTransaction = sqlConnection.BeginTransaction())
-            using (SqlCommand sqlCommand = new SqlCommand(insertSql,
-            connection: sqlConnection, transaction: sqlTransaction,
-            columnEncryptionSetting: SqlCommandColumnEncryptionSetting.Enabled))
-            {
-                sqlCommand.Parameters.AddWithValue(@"CustomerId", customer.Id);
-                sqlCommand.Parameters.AddWithValue(@"FirstName", customer.FirstName);
-                sqlCommand.Parameters.AddWithValue(@"LastName", customer.LastName);
-
-                sqlCommand.ExecuteNonQuery();
-                sqlTransaction.Commit();
-            }
-        }
-
-        private static void verifyData(SqlConnection sqlConnection, string tblName, CustomerRecord customer)
-        {
-            // Test INPUT parameter on an encrypted parameter
-            using (SqlCommand sqlCommand = new SqlCommand($"SELECT CustomerId, FirstName, LastName FROM [{tblName}] WHERE FirstName = @firstName",
-                                                            sqlConnection))
-            {
-                SqlParameter customerFirstParam = sqlCommand.Parameters.AddWithValue(@"firstName", @"Microsoft");
-                customerFirstParam.Direction = System.Data.ParameterDirection.Input;
-                customerFirstParam.ForceColumnEncryption = true;
-
-                using (SqlDataReader sqlDataReader = sqlCommand.ExecuteReader())
-                {
-                    ValidateResultSet(sqlDataReader);
-                }
-            }
-        }
-
-        private static void ValidateResultSet(SqlDataReader sqlDataReader)
-        {
-            Console.WriteLine(" * Row available: " + sqlDataReader.HasRows);
-
-            while (sqlDataReader.Read())
-            {
-                if (sqlDataReader.GetInt32(0) == 1)
-                {
-                    Console.WriteLine(" * Employee Id received as sent: " + sqlDataReader.GetInt32(0));
-                }
-                else
-                {
-                    Console.WriteLine("Employee Id didn't match");
-                }
-
-                if (sqlDataReader.GetString(1) == @"Microsoft")
-                {
-                    Console.WriteLine(" * Employee Firstname received as sent: " + sqlDataReader.GetString(1));
-                }
-                else
-                {
-                    Console.WriteLine("Employee FirstName didn't match.");
-                }
-
-                if (sqlDataReader.GetString(2) == @"Corporation")
-                {
-                    Console.WriteLine(" * Employee LastName received as sent: " + sqlDataReader.GetString(2));
-                }
-                else
-                {
-                    Console.WriteLine("Employee LastName didn't match.");
-                }
-            }
-        }
-
-        private static void dropObjects(SqlConnection sqlConnection, string cmkName, string cekName, string tblName)
-        {
-            using (SqlCommand cmd = sqlConnection.CreateCommand())
-            {
-                cmd.CommandText = $@"IF EXISTS (select * from sys.objects where name = '{tblName}') BEGIN DROP TABLE [{tblName}] END";
-                cmd.ExecuteNonQuery();
-                cmd.CommandText = $@"IF EXISTS (select * from sys.column_encryption_keys where name = '{cekName}') BEGIN DROP COLUMN ENCRYPTION KEY [{cekName}] END";
-                cmd.ExecuteNonQuery();
-                cmd.CommandText = $@"IF EXISTS (select * from sys.column_master_keys where name = '{cmkName}') BEGIN DROP COLUMN MASTER KEY [{cmkName}] END";
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        private class CustomerRecord
-        {
-            internal int Id { get; set; }
-            internal string FirstName { get; set; }
-            internal string LastName { get; set; }
-
-            public CustomerRecord(int id, string fName, string lName)
-            {
-                Id = id;
-                FirstName = fName;
-                LastName = lName;
-            }
-        }
-
-        private class LegacyAuthCallbackTokenCredential : TokenCredential
-        {
-            string _authority = "";
-            string _resource = "";
-            string _akvUrl = "";
-
-            public override AccessToken GetToken(TokenRequestContext requestContext, CancellationToken cancellationToken) =>
-                AcquireTokenAsync().GetAwaiter().GetResult();
-
-            public override async ValueTask<AccessToken> GetTokenAsync(TokenRequestContext requestContext, CancellationToken cancellationToken) =>
-                await AcquireTokenAsync();
-
-            private async Task<AccessToken> AcquireTokenAsync()
-            {
-                // Added to reduce HttpClient calls.
-                // For multi-user support, a better design can be implemented as needed.
-                if (_akvUrl != s_akvUrl)
-                {
-                    using (HttpClient httpClient = new HttpClient())
-                    {
-                        HttpResponseMessage response = await httpClient.GetAsync(s_akvUrl);
-                        string challenge = response?.Headers.WwwAuthenticate.FirstOrDefault()?.ToString();
-                        string trimmedChallenge = ValidateChallenge(challenge);
-                        string[] pairs = trimmedChallenge.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
-
-                        if (pairs != null && pairs.Length > 0)
-                        {
-                            for (int i = 0; i < pairs.Length; i++)
-                            {
-                                string[] pair = pairs[i]?.Split('=');
-
-                                if (pair.Length == 2)
-                                {
-                                    string key = pair[0]?.Trim().Trim(new char[] { '\"' });
-                                    string value = pair[1]?.Trim().Trim(new char[] { '\"' });
-
-                                    if (!string.IsNullOrEmpty(key))
-                                    {
-                                        if (key.Equals("authorization", StringComparison.InvariantCultureIgnoreCase))
-                                        {
-                                            _authority = value;
-                                        }
-                                        else if (key.Equals("resource", StringComparison.InvariantCultureIgnoreCase))
-                                        {
-                                            _resource = value;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    _akvUrl = s_akvUrl;
-                }
-
-                string strAccessToken = await AzureActiveDirectoryAuthenticationCallback(_authority, _resource);
-                DateTime expiryTime = InterceptAccessTokenForExpiry(strAccessToken);
-                return new AccessToken(strAccessToken, new DateTimeOffset(expiryTime));
-            }
-
-            private DateTime InterceptAccessTokenForExpiry(string accessToken)
-            {
-                if (null == accessToken)
-                {
-                    throw new ArgumentNullException(accessToken);
-                }
-
-                var jwtHandler = new JwtSecurityTokenHandler();
-                var jwtOutput = string.Empty;
-
-                // Check Token Format
-                if (!jwtHandler.CanReadToken(accessToken))
-                    throw new FormatException(accessToken);
-
-                JwtSecurityToken token = jwtHandler.ReadJwtToken(accessToken);
-
-                // Re-serialize the Token Headers to just Key and Values
-                var jwtHeader = JsonConvert.SerializeObject(token.Header.Select(h => new { h.Key, h.Value }));
-                jwtOutput = $"{{\r\n\"Header\":\r\n{JToken.Parse(jwtHeader)},";
-
-                // Re-serialize the Token Claims to just Type and Values
-                var jwtPayload = JsonConvert.SerializeObject(token.Claims.Select(c => new { c.Type, c.Value }));
-                jwtOutput += $"\r\n\"Payload\":\r\n{JToken.Parse(jwtPayload)}\r\n}}";
-
-                // Output the whole thing to pretty JSON object formatted.
-                string jToken = JToken.Parse(jwtOutput).ToString(Formatting.Indented);
-                JToken payload = JObject.Parse(jToken).GetValue("Payload");
-
-                return new DateTime(1970, 1, 1).AddSeconds((long)payload[4]["Value"]);
-            }
-
-            private static string ValidateChallenge(string challenge)
-            {
-                string Bearer = "Bearer ";
-                if (string.IsNullOrEmpty(challenge))
-                    throw new ArgumentNullException(nameof(challenge));
-
-                string trimmedChallenge = challenge.Trim();
-
-                if (!trimmedChallenge.StartsWith(Bearer))
-                    throw new ArgumentException("Challenge is not Bearer", nameof(challenge));
-
-                return trimmedChallenge.Substring(Bearer.Length);
-            }
-
-            /// <summary>
-            /// Legacy implementation of Authentication Callback, used by Azure Key Vault provider 1.0.
-            /// This can be leveraged to support multi-user authentication support in the same Azure Key Vault Provider.
-            /// </summary>
-            /// <param name="authority">Authorization URL</param>
-            /// <param name="resource">Resource</param>
-            /// <returns></returns>
-            public static async Task<string> AzureActiveDirectoryAuthenticationCallback(string authority, string resource)
-            {
-                var authContext = new AuthenticationContext(authority);
-                ClientCredential clientCred = new ClientCredential(s_clientId, s_clientSecret);
-                AuthenticationResult result = await authContext.AcquireTokenAsync(resource, clientCred);
-                if (result == null)
-                {
-                    throw new InvalidOperationException($"Failed to retrieve an access token for {resource}");
-                }
-                return result.AccessToken;
-            }
-        }
-    }
-}
-//</Snippet1>
-*/
diff --git a/doc/samples/Microsoft.Data.SqlClient.Samples.csproj b/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
index 44a153f6f2..1887c9b73e 100644
--- a/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
+++ b/doc/samples/Microsoft.Data.SqlClient.Samples.csproj
@@ -23,7 +23,6 @@
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Azure.Core" />
     <PackageReference Include="Microsoft.Identity.Client" />
-    <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
   </ItemGroup>
 
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
index 13673697db..9098091ad8 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -67,7 +67,6 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
-    <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.Buffers" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
@@ -92,7 +91,6 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
-    <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Data.Odbc" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlExceptionTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlExceptionTest.cs
index 2fe9e63aed..421bba1c71 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlExceptionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlExceptionTest.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using Newtonsoft.Json;
+using System.Text.Json;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.Tests
@@ -18,46 +16,27 @@ public class SqlExceptionTest
         public void SerializationTest()
         {
             SqlException e = CreateException();
-            string json = JsonConvert.SerializeObject(e);
 
-            var settings = new JsonSerializerSettings();
-            var sqlEx = JsonConvert.DeserializeObject<SqlException>(json, settings);
-
-            Assert.Equal(e.ClientConnectionId, sqlEx.ClientConnectionId);
-            Assert.Equal(e.StackTrace, sqlEx.StackTrace);
-        }
+            // Serialize the properties we want to validate round-trip through JSON.
+            // SqlException cannot be directly serialized by System.Text.Json because
+            // Exception.TargetSite (MethodBase) is not supported.
+            string json = JsonSerializer.Serialize(new
+            {
+                e.Message,
+                ClientConnectionId = e.ClientConnectionId.ToString(),
+                e.Number,
+                e.Class,
+                e.State,
+            });
 
-        [Fact]
-        public void JSONSerializationTest()
-        {
-            string clientConnectionId = "90cdab4d-2145-4c24-a354-c8ccff903542";
-            string json = @"{"
-                        + @"""ClassName"":""Microsoft.Data.SqlClient.SqlException"","
-                        + @"""Message"":""A network-related or instance-specific error occurred while establishing a connection to SQL Server. The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections. (provider: TCP Provider, error: 40 - Could not open a connection to SQL Server)"","
-                        + @"""Data"":{""HelpLink.ProdName"":""Microsoft SQL Server"","
-                        + @"""HelpLink.EvtSrc"":""MSSQLServer"","
-                        + @"""HelpLink.EvtID"":""0"","
-                        + @"""HelpLink.BaseHelpUrl"":""http://go.microsoft.com/fwlink"","
-                        + @"""HelpLink.LinkId"":""20476"","
-                        + @"""SqlError 1"":""Microsoft.Data.SqlClient.SqlError: A network-related or instance-specific error occurred while establishing a connection to SQL Server. The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections. (provider: TCP Provider, error: 40 - Could not open a connection to SQL Server)"","
-                        + @"""$type"":""System.Collections.ListDictionaryInternal, System.Private.CoreLib""},"
-                        + @"""InnerException"":null,"
-                        + @"""HelpURL"":null,"
-                        + @"""StackTraceString"":""   at Microsoft.Data.SqlClient.SqlInternalConnectionTds..ctor(DbConnectionPoolIdentity identity, SqlConnectionOptions connectionOptions, SqlCredential credential, Object providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions userConnectionOptions, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken)\\n   at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(SqlConnectionOptions options, DbConnectionPoolKey poolKey, Object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, SqlConnectionOptions userOptions)\\n   at System.Data.ProviderBase.DbConnectionFactory.CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, SqlConnectionOptions options, DbConnectionPoolKey poolKey, SqlConnectionOptions userOptions)\\n   at System.Data.ProviderBase.DbConnectionPool.CreateObject(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection)\\n   at System.Data.ProviderBase.DbConnectionPool.UserCreateRequest(DbConnection owningObject, SqlConnectionOptions userOptions, DbConnectionInternal oldConnection)\\n   at System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, SqlConnectionOptions userOptions, DbConnectionInternal& connection)\\n   at System.Data.ProviderBase.DbConnectionPool.WaitForPendingOpen()\\n"","
-                        + @"""RemoteStackTraceString"":null,"
-                        + @"""RemoteStackIndex"":0,"
-                        + @"""ExceptionMethod"":null,"
-                        + @"""HResult"":-2146232060,"
-                        + @"""Source"":""Core .Net SqlClient Data Provider"","
-                        + @"""WatsonBuckets"":null,"
-                        + @"""Errors"":null,"
-                        + @"""ClientConnectionId"":""90cdab4d-2145-4c24-a354-c8ccff903542"""
-                        + @"}";
+            using JsonDocument doc = JsonDocument.Parse(json);
+            JsonElement root = doc.RootElement;
 
-            var settings = new JsonSerializerSettings();
-            var sqlEx = JsonConvert.DeserializeObject<SqlException>(json, settings);
-            Assert.IsType<SqlException>(sqlEx);
-            Assert.Equal(clientConnectionId, sqlEx.ClientConnectionId.ToString());
+            Assert.Equal(e.Message, root.GetProperty("Message").GetString());
+            Assert.Equal(e.ClientConnectionId.ToString(), root.GetProperty("ClientConnectionId").GetString());
+            Assert.Equal(e.Number, root.GetProperty("Number").GetInt32());
+            Assert.Equal(e.Class, root.GetProperty("Class").GetByte());
+            Assert.Equal(e.State, root.GetProperty("State").GetByte());
         }
 
         private static SqlException CreateException()
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index ce159f7821..4b0dfb6ddd 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -96,7 +96,6 @@
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
-    <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
@@ -124,7 +123,6 @@
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
-    <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="System.ServiceProcess.ServiceController" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
index e9ad8be557..4e5fa29c7d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
@@ -6,12 +6,11 @@
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
+using System.Text.Encodings.Web;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
-using Xunit.Abstractions;
 using Xunit;
-using System.Collections;
+using Xunit.Abstractions;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.JsonTest
 {
@@ -68,7 +67,7 @@ private void GenerateJsonFile(int noOfRecords, string filename)
                 });
             }
 
-            string json = JsonConvert.SerializeObject(records, Formatting.Indented);
+            string json = JsonSerializer.Serialize(records, new JsonSerializerOptions { WriteIndented = true, Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
             File.WriteAllText(filename, json);
             Assert.True(File.Exists(filename));
             _output.WriteLine("Generated JSON file " + filename);
@@ -76,15 +75,9 @@ private void GenerateJsonFile(int noOfRecords, string filename)
 
         private void CompareJsonFiles()
         {
-            using (var stream1 = File.OpenText(_generatedJsonFile))
-            using (var stream2 = File.OpenText(_outputFile))
-            using (var reader1 = new JsonTextReader(stream1))
-            using (var reader2 = new JsonTextReader(stream2))
-            {
-                var jToken1 = JToken.ReadFrom(reader1);
-                var jToken2 = JToken.ReadFrom(reader2);
-                Assert.True(JToken.DeepEquals(jToken1, jToken2));
-            }
+            using JsonDocument doc1 = JsonDocument.Parse(File.ReadAllText(_generatedJsonFile));
+            using JsonDocument doc2 = JsonDocument.Parse(File.ReadAllText(_outputFile));
+            Assert.True(JsonTestHelper.JsonDeepEquals(doc1.RootElement, doc2.RootElement));
         }
 
         private void PrintJsonDataToFileAndCompare(SqlConnection connection)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
index eef2902932..4aa92e28ef 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonStreamTest.cs
@@ -8,11 +8,12 @@
 using System.Data;
 using System.Linq;
 using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using Xunit;
 using Xunit.Abstractions;
-using Newtonsoft.Json.Linq;
+using Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.JsonTest;
 using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 
 
@@ -52,7 +53,7 @@ private void GenerateJsonFile(int noOfRecords, string filename)
                 });
             }
 
-            string json = JsonConvert.SerializeObject(records, Formatting.Indented);
+            string json = JsonSerializer.Serialize(records, new JsonSerializerOptions { WriteIndented = true, Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
             File.WriteAllText(filename, json);
             Assert.True(File.Exists(filename));
             _output.WriteLine("Generated JSON file "+filename);
@@ -60,15 +61,9 @@ private void GenerateJsonFile(int noOfRecords, string filename)
 
         private void CompareJsonFiles()
         {
-            using (var stream1 = File.OpenText(_jsonFile))
-            using (var stream2 = File.OpenText(_outputFile))
-            using (var reader1 = new JsonTextReader(stream1))
-            using (var reader2 = new JsonTextReader(stream2))
-            {
-                var jToken1 = JToken.ReadFrom(reader1);
-                var jToken2 = JToken.ReadFrom(reader2);
-                Assert.True(JToken.DeepEquals(jToken1, jToken2));
-            }
+            using JsonDocument doc1 = JsonDocument.Parse(File.ReadAllText(_jsonFile));
+            using JsonDocument doc2 = JsonDocument.Parse(File.ReadAllText(_outputFile));
+            Assert.True(JsonTestHelper.JsonDeepEquals(doc1.RootElement, doc2.RootElement));
         }
 
         private void PrintJsonDataToFile(SqlConnection connection, string tableName)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTestHelper.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTestHelper.cs
new file mode 100644
index 0000000000..03d9841610
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonTestHelper.cs
@@ -0,0 +1,86 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Linq;
+using System.Text.Json;
+#if NET9_0_OR_GREATER
+using System.Text.Json.Nodes;
+#endif
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.JsonTest
+{
+    internal static class JsonTestHelper
+    {
+        // Test data is Array → Object → Value (3 levels). Use 64 as a safe ceiling.
+        private const int MaxDepth = 64;
+
+        /// <summary>
+        /// Performs a deep structural comparison of two <see cref="JsonElement"/> values.
+        /// On .NET 9+ this delegates to <see cref="JsonNode.DeepEquals"/>; on earlier
+        /// runtimes it uses a recursive comparison over the element trees.
+        /// </summary>
+        internal static bool JsonDeepEquals(JsonElement a, JsonElement b)
+        {
+#if NET9_0_OR_GREATER
+            return JsonNode.DeepEquals(
+                JsonNode.Parse(a.GetRawText()),
+                JsonNode.Parse(b.GetRawText()));
+#else
+            return DeepEqualsCore(a, b, depth: 0);
+#endif
+        }
+
+        private static bool DeepEqualsCore(JsonElement a, JsonElement b, int depth)
+        {
+            if (depth > MaxDepth)
+            {
+                throw new InvalidOperationException($"JSON comparison exceeded maximum depth of {MaxDepth}.");
+            }
+
+            if (a.ValueKind != b.ValueKind)
+            {
+                return false;
+            }
+
+            switch (a.ValueKind)
+            {
+                case JsonValueKind.Object:
+                    int countA = a.EnumerateObject().Count();
+                    int countB = b.EnumerateObject().Count();
+                    if (countA != countB)
+                    {
+                        return false;
+                    }
+                    foreach (JsonProperty prop in a.EnumerateObject())
+                    {
+                        if (!b.TryGetProperty(prop.Name, out JsonElement bValue) ||
+                            !DeepEqualsCore(prop.Value, bValue, depth + 1))
+                        {
+                            return false;
+                        }
+                    }
+                    return true;
+
+                case JsonValueKind.Array:
+                    JsonElement.ArrayEnumerator arrA = a.EnumerateArray();
+                    JsonElement.ArrayEnumerator arrB = b.EnumerateArray();
+                    while (arrA.MoveNext())
+                    {
+                        if (!arrB.MoveNext() || !DeepEqualsCore(arrA.Current, arrB.Current, depth + 1))
+                        {
+                            return false;
+                        }
+                    }
+                    return !arrB.MoveNext();
+
+                case JsonValueKind.String:
+                    return a.GetString() == b.GetString();
+
+                default:
+                    return a.GetRawText() == b.GetRawText();
+            }
+        }
+    }
+}

From 9deb1daf88205093126549b0a413c6fbd15fc72d Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 17 Jun 2026 08:57:50 -0300
Subject: [PATCH 152/298] Fix stress pipeline pool name detection and config
 file mismatch (#4368)

---
 eng/pipelines/stress/stress-tests-job.yml      |  4 ++--
 eng/pipelines/stress/stress-tests-pipeline.yml | 12 ++++++++++++
 eng/pipelines/stress/stress-tests-stage.yml    | 17 ++++++-----------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/eng/pipelines/stress/stress-tests-job.yml b/eng/pipelines/stress/stress-tests-job.yml
index a02a0a4f4b..dd75602d6f 100644
--- a/eng/pipelines/stress/stress-tests-job.yml
+++ b/eng/pipelines/stress/stress-tests-job.yml
@@ -210,7 +210,7 @@ jobs:
           condition: and(succeededOrFailed(), eq(variables['buildSucceeded'], 'true'))
           continueOnError: ${{ parameters.warnOnTestFailure }}
           env:
-            STRESS_CONFIG_FILE: config.json
+            STRESS_CONFIG_FILE: config.jsonc
           inputs:
             command: run
             projects: $(project)
@@ -223,7 +223,7 @@ jobs:
           condition: and(succeededOrFailed(), eq(variables['buildSucceeded'], 'true'))
           continueOnError: ${{ parameters.warnOnTestFailure }}
           env:
-            STRESS_CONFIG_FILE: config.json
+            STRESS_CONFIG_FILE: config.jsonc
           inputs:
             command: run
             projects: $(project)
diff --git a/eng/pipelines/stress/stress-tests-pipeline.yml b/eng/pipelines/stress/stress-tests-pipeline.yml
index edd962b911..c1eb87faab 100644
--- a/eng/pipelines/stress/stress-tests-pipeline.yml
+++ b/eng/pipelines/stress/stress-tests-pipeline.yml
@@ -92,6 +92,17 @@ parameters:
       - detailed
       - diagnostic
 
+# Pipeline-level variables evaluated at compile time.
+variables:
+  # The 1ES pool name, determined automatically by ADO project:
+  #   - ADO.Net  -> ADO-1ES-Pool
+  #   - public   -> ADO-CI-1ES-Pool
+  - name: poolName
+    ${{ if eq(variables['System.TeamProject'], 'ADO.Net') }}:
+      value: ADO-1ES-Pool
+    ${{ else }}:
+      value: ADO-CI-1ES-Pool
+
 # The stages to run.
 stages:
 
@@ -105,5 +116,6 @@ stages:
     parameters:
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
+      poolName: ${{ variables.poolName }}
       warnOnTestFailure: ${{ parameters.warnOnTestFailure }}
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/stress/stress-tests-stage.yml b/eng/pipelines/stress/stress-tests-stage.yml
index 0ac192a601..1f223c5142 100644
--- a/eng/pipelines/stress/stress-tests-stage.yml
+++ b/eng/pipelines/stress/stress-tests-stage.yml
@@ -57,6 +57,10 @@ parameters:
     type: object
     default: [net8.0, net9.0, net10.0]
 
+  # The 1ES pool name for Linux and Windows jobs.  macOS always uses 'Azure Pipelines'.
+  - name: poolName
+    type: string
+
 stages:
   - stage: stress_tests_stage
     displayName: Run Stress Tests
@@ -68,15 +72,6 @@ stages:
       - name: saPassword
         value: $[stageDependencies.secrets_stage.secrets_job.outputs['SaPassword.Value']]
 
-      # The 1ES pool name, determined automatically by ADO project:
-      #   - ADO.Net  -> ADO-1ES-Pool
-      #   - public   -> ADO-CI-1ES-Pool
-      - name: poolName
-        ${{ if eq(variables['System.TeamProject'], 'ADO.Net') }}:
-          value: ADO-1ES-Pool
-        ${{ else }}:
-          value: ADO-CI-1ES-Pool
-
     jobs:
 
     # ----------------------------------------------------------------------------------------------
@@ -93,7 +88,7 @@ stages:
         # No .NET Framework runtimes on Linux.
         netFrameworkTestRuntimes: []
         netTestRuntimes: ${{ parameters.netTestRuntimes }}
-        poolName: ${{ variables.poolName }}
+        poolName: ${{ parameters.poolName }}
         saPassword: $(saPassword)
         sqlSetupStep:
           template: /eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml@self
@@ -115,7 +110,7 @@ stages:
         # Note that we include the .NET Framework runtimes for test runs on Windows.
         netFrameworkTestRuntimes: ${{ parameters.netFrameworkTestRuntimes }}
         netTestRuntimes: ${{ parameters.netTestRuntimes }}
-        poolName: ${{ variables.poolName }}
+        poolName: ${{ parameters.poolName }}
         saPassword: $(saPassword)
         sqlSetupStep:
           template: /eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml@self

From 6a0153aa32b1689b78a8b8e3212b1515ad5bd516 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Thu, 18 Jun 2026 02:32:02 -0700
Subject: [PATCH 153/298] Fix SqlCommand.Cancell null ref exception (#4372)

---
 .../src/Microsoft/Data/SqlClient/SqlCommand.cs     |  2 +-
 .../tests/FunctionalTests/SqlCommandTest.cs        | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
index ec26b955e1..76399749a0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -1068,7 +1068,7 @@ public override void Cancel()
                 "SqlCommand.Cancel | API | Correlation | " +
                 $"Object Id {ObjectID}, " +
                 $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection.ClientConnectionId}, " +
+                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
                 $"Command Text '{CommandText}'");
 
             SqlStatistics statistics = null;
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlCommandTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlCommandTest.cs
index 80ceba25af..59f35b4941 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlCommandTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlCommandTest.cs
@@ -562,6 +562,20 @@ public void ParameterCollectionTest()
             }
         }
 
+        /// <summary>
+        /// Verifies that SqlCommand.Cancel() is a no-op when Connection is null,
+        /// rather than throwing a NullReferenceException. Regression test for #4327.
+        /// </summary>
+        [Fact]
+        public void Cancel_WithNullConnection_DoesNotThrow()
+        {
+            using SqlCommand cmd = new SqlCommand();
+            Assert.Null(cmd.Connection);
+
+            // Should be a no-op, not throw NullReferenceException
+            cmd.Cancel();
+        }
+
         private static SqlConnection GetNonConnectingConnection() =>
             new SqlConnection("Initial Catalog=a;Server=b;User ID=c;Password=d");
     }

From c0f341ad0020aa5e7d58958f8d7a4cc20e3553eb Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 18 Jun 2026 23:56:52 -0700
Subject: [PATCH 154/298] Enable WAM Broker support for Entra ID Auth modes
 (#4288)

---
 Directory.Packages.props                      |   3 +-
 .../AzureSqlConnector.csproj                  |  34 +
 doc/apps/AzureSqlConnector/IdentityQuery.cs   |  25 +
 .../AzureSqlConnector/MainForm.Designer.cs    | 394 ++++++++++++
 doc/apps/AzureSqlConnector/MainForm.cs        | 590 +++++++++++++++++
 .../MainFormWorker.Designer.cs                | 383 +++++++++++
 doc/apps/AzureSqlConnector/MainFormWorker.cs  | 598 ++++++++++++++++++
 .../AzureSqlConnector/ModeSelectorForm.cs     | 116 ++++
 doc/apps/AzureSqlConnector/Program.cs         |  39 ++
 doc/apps/AzureSqlConnector/README.md          | 137 ++++
 .../ActiveDirectoryAuthenticationProvider.xml |  14 +-
 .../src/SqlAuthenticationProvider.Internal.cs |   2 +-
 .../ActiveDirectoryAuthenticationProvider.xml |  49 +-
 ...DirectoryAuthenticationProviderOptions.xml |  34 +
 ...DirectoryAuthenticationProvider.Windows.cs | 108 ++++
 .../ActiveDirectoryAuthenticationProvider.cs  | 184 +++++-
 ...eDirectoryAuthenticationProviderOptions.cs |  21 +
 .../Azure/src/Azure.csproj                    |   1 +
 .../Azure/src/Interop/Interop.GetAncestor.cs  |  42 ++
 .../src/Interop/Interop.GetConsoleWindow.cs   |  27 +
 .../Azure/test/AADAuthenticationTests.cs      |   1 +
 .../Azure/test/AADConnectionTest.cs           | 114 ----
 .../Azure/test/Config.cs                      |   1 +
 .../Azure/test/DefaultAuthProviderTests.cs    |   1 +
 .../SqlAuthenticationProviderCollection.cs    |  14 +
 .../Azure/test/WamBrokerTests.cs              | 316 +++++++++
 src/Microsoft.Data.SqlClient.slnx             |   3 +
 .../Connection/SqlConnectionInternal.cs       |   9 +-
 .../SqlAuthenticationProviderManager.cs       | 147 ++++-
 .../src/Microsoft/Data/SqlClient/SqlUtil.cs   |   5 +
 .../src/Resources/Strings.Designer.cs         |   9 +
 .../src/Resources/Strings.resx                |   3 +
 .../SqlAuthenticationProviderManagerTests.cs  | 196 ++++++
 33 files changed, 3451 insertions(+), 169 deletions(-)
 create mode 100644 doc/apps/AzureSqlConnector/AzureSqlConnector.csproj
 create mode 100644 doc/apps/AzureSqlConnector/IdentityQuery.cs
 create mode 100644 doc/apps/AzureSqlConnector/MainForm.Designer.cs
 create mode 100644 doc/apps/AzureSqlConnector/MainForm.cs
 create mode 100644 doc/apps/AzureSqlConnector/MainFormWorker.Designer.cs
 create mode 100644 doc/apps/AzureSqlConnector/MainFormWorker.cs
 create mode 100644 doc/apps/AzureSqlConnector/ModeSelectorForm.cs
 create mode 100644 doc/apps/AzureSqlConnector/Program.cs
 create mode 100644 doc/apps/AzureSqlConnector/README.md
 create mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/doc/ActiveDirectoryAuthenticationProviderOptions.xml
 create mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.Windows.cs
 create mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProviderOptions.cs
 create mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/src/Interop/Interop.GetAncestor.cs
 create mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/src/Interop/Interop.GetConsoleWindow.cs
 create mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/test/SqlAuthenticationProviderCollection.cs
 create mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/test/WamBrokerTests.cs

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 70a2c00ac6..59839f2351 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -95,7 +95,7 @@
 
   <ItemGroup>
     <PackageVersion Include="Azure.Core" Version="1.51.1" />
-    <PackageVersion Include="Microsoft.Identity.Client" Version="4.83.0" />
+    <PackageVersion Include="Microsoft.Identity.Client" Version="4.84.2" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
@@ -126,6 +126,7 @@
 
   <ItemGroup>
     <PackageVersion Include="Azure.Identity" Version="1.18.0" />
+    <PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.84.2" />
   </ItemGroup>
 
   <!-- ===================================================================== -->
diff --git a/doc/apps/AzureSqlConnector/AzureSqlConnector.csproj b/doc/apps/AzureSqlConnector/AzureSqlConnector.csproj
new file mode 100644
index 0000000000..0ea12bd7d2
--- /dev/null
+++ b/doc/apps/AzureSqlConnector/AzureSqlConnector.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <!--
+    WinForms WAM-broker sample. Targets net481 (for callers still on .NET Framework)
+    plus net10.0-windows (for modern .NET) so the sample exercises both API
+    flavors: the legacy SetIWin32WindowFunc path on net481 and the modern
+    SetParentActivityOrWindowFunc path on net10. The net10.0-windows TFM
+    restores and builds cleanly on Linux/macOS hosts even though the resulting
+    binary only runs on Windows, so the sample no longer needs a separate
+    no-op cross-platform fallback.
+  -->
+  <PropertyGroup>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net481;net10.0-windows</TargetFrameworks>
+    <TargetFramework Condition="'$(OS)' != 'Windows_NT'">net10.0-windows</TargetFramework>
+    <!-- Required to build the net*-windows TFM on Linux/macOS (e.g. CodeQL); without
+         this, the SDK fails with NETSDK1100. The produced binary still only runs on Windows. -->
+    <EnableWindowsTargeting Condition="'$(OS)' != 'Windows_NT'">true</EnableWindowsTargeting>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Microsoft.Data.SqlClient.Samples.AzureSqlConnector</RootNamespace>
+    <AssemblyName>AzureSqlConnector</AssemblyName>
+    <UseWindowsForms>true</UseWindowsForms>
+    <LangVersion>latest</LangVersion>
+    <Nullable>disable</Nullable>
+    <Platforms>AnyCPU</Platforms>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Microsoft.Data.SqlClient.Extensions\Azure\src\Azure.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.Data.SqlClient\src\Microsoft.Data.SqlClient.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/doc/apps/AzureSqlConnector/IdentityQuery.cs b/doc/apps/AzureSqlConnector/IdentityQuery.cs
new file mode 100644
index 0000000000..6c6cff84a1
--- /dev/null
+++ b/doc/apps/AzureSqlConnector/IdentityQuery.cs
@@ -0,0 +1,25 @@
+namespace Microsoft.Data.SqlClient.Samples.AzureSqlConnector
+{
+    /// <summary>
+    /// Shared SQL text used by both <see cref="MainForm"/> (UI-thread variant) and
+    /// <see cref="MainFormWorker"/> (worker-thread variant). Keeping the literal in one place
+    /// avoids drift when one variant gains a new column.
+    /// </summary>
+    internal static class IdentityQuery
+    {
+        public const string CommandText =
+            "SELECT " +
+            "    SUSER_SNAME()        AS LoggedInUser, " +
+            "    ORIGINAL_LOGIN()     AS OriginalLogin, " +
+            "    USER_NAME()          AS DatabaseUser, " +
+            "    SUSER_ID()           AS LoginSid, " +
+            "    DB_NAME()            AS DatabaseName, " +
+            "    @@SERVERNAME         AS ServerName, " +
+            "    HOST_NAME()          AS ClientHost, " +
+            "    APP_NAME()           AS AppName, " +
+            "    SESSION_USER         AS SessionUser, " +
+            "    CURRENT_USER         AS CurrentUser, " +
+            "    @@SPID               AS SessionId, " +
+            "    @@VERSION            AS ServerVersion;";
+    }
+}
diff --git a/doc/apps/AzureSqlConnector/MainForm.Designer.cs b/doc/apps/AzureSqlConnector/MainForm.Designer.cs
new file mode 100644
index 0000000000..4dd6c5a047
--- /dev/null
+++ b/doc/apps/AzureSqlConnector/MainForm.Designer.cs
@@ -0,0 +1,394 @@
+namespace Microsoft.Data.SqlClient.Samples.AzureSqlConnector
+{
+    partial class MainForm
+    {
+        /// <summary>
+        ///  Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        ///  Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.lblServer = new System.Windows.Forms.Label();
+            this.txtServer = new System.Windows.Forms.TextBox();
+            this.lblDatabase = new System.Windows.Forms.Label();
+            this.txtDatabase = new System.Windows.Forms.TextBox();
+            this.lblAuthentication = new System.Windows.Forms.Label();
+            this.cmbAuthentication = new System.Windows.Forms.ComboBox();
+            this.lblUserId = new System.Windows.Forms.Label();
+            this.txtUserId = new System.Windows.Forms.TextBox();
+            this.lblPassword = new System.Windows.Forms.Label();
+            this.txtPassword = new System.Windows.Forms.TextBox();
+            this.lblEncrypt = new System.Windows.Forms.Label();
+            this.cmbEncrypt = new System.Windows.Forms.ComboBox();
+            this.chkTrustServerCertificate = new System.Windows.Forms.CheckBox();
+            this.lblTimeout = new System.Windows.Forms.Label();
+            this.numTimeout = new System.Windows.Forms.NumericUpDown();
+            this.lblOpenMode = new System.Windows.Forms.Label();
+            this.cmbOpenMode = new System.Windows.Forms.ComboBox();
+            this.lblConnectionString = new System.Windows.Forms.Label();
+            this.txtConnectionString = new System.Windows.Forms.TextBox();
+            this.btnBuild = new System.Windows.Forms.Button();
+            this.btnTest = new System.Windows.Forms.Button();
+            this.btnCopy = new System.Windows.Forms.Button();
+            this.btnClear = new System.Windows.Forms.Button();
+            this.btnWhoAmI = new System.Windows.Forms.Button();
+            this.lblStatus = new System.Windows.Forms.Label();
+            this.txtStatus = new System.Windows.Forms.TextBox();
+            this.statusStrip = new System.Windows.Forms.StatusStrip();
+            this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+            ((System.ComponentModel.ISupportInitialize)(this.numTimeout)).BeginInit();
+            this.statusStrip.SuspendLayout();
+            this.SuspendLayout();
+            //
+            // lblServer
+            //
+            this.lblServer.AutoSize = true;
+            this.lblServer.Location = new System.Drawing.Point(16, 18);
+            this.lblServer.Name = "lblServer";
+            this.lblServer.Size = new System.Drawing.Size(75, 13);
+            this.lblServer.TabIndex = 0;
+            this.lblServer.Text = "&Server name:";
+            //
+            // txtServer
+            //
+            this.txtServer.Location = new System.Drawing.Point(150, 15);
+            this.txtServer.Name = "txtServer";
+            this.txtServer.Size = new System.Drawing.Size(400, 20);
+            this.txtServer.TabIndex = 1;
+            //
+            // lblDatabase
+            //
+            this.lblDatabase.AutoSize = true;
+            this.lblDatabase.Location = new System.Drawing.Point(16, 48);
+            this.lblDatabase.Name = "lblDatabase";
+            this.lblDatabase.Size = new System.Drawing.Size(86, 13);
+            this.lblDatabase.TabIndex = 2;
+            this.lblDatabase.Text = "&Database name:";
+            //
+            // txtDatabase
+            //
+            this.txtDatabase.Location = new System.Drawing.Point(150, 45);
+            this.txtDatabase.Name = "txtDatabase";
+            this.txtDatabase.Size = new System.Drawing.Size(400, 20);
+            this.txtDatabase.TabIndex = 3;
+            //
+            // lblAuthentication
+            //
+            this.lblAuthentication.AutoSize = true;
+            this.lblAuthentication.Location = new System.Drawing.Point(16, 78);
+            this.lblAuthentication.Name = "lblAuthentication";
+            this.lblAuthentication.Size = new System.Drawing.Size(80, 13);
+            this.lblAuthentication.TabIndex = 4;
+            this.lblAuthentication.Text = "&Authentication:";
+            //
+            // cmbAuthentication
+            //
+            this.cmbAuthentication.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbAuthentication.FormattingEnabled = true;
+            this.cmbAuthentication.Location = new System.Drawing.Point(150, 75);
+            this.cmbAuthentication.Name = "cmbAuthentication";
+            this.cmbAuthentication.Size = new System.Drawing.Size(400, 21);
+            this.cmbAuthentication.TabIndex = 5;
+            this.cmbAuthentication.SelectedIndexChanged += new System.EventHandler(this.cmbAuthentication_SelectedIndexChanged);
+            //
+            // lblUserId
+            //
+            this.lblUserId.AutoSize = true;
+            this.lblUserId.Location = new System.Drawing.Point(16, 108);
+            this.lblUserId.Name = "lblUserId";
+            this.lblUserId.Size = new System.Drawing.Size(45, 13);
+            this.lblUserId.TabIndex = 6;
+            this.lblUserId.Text = "&User ID:";
+            //
+            // txtUserId
+            //
+            this.txtUserId.Location = new System.Drawing.Point(150, 105);
+            this.txtUserId.Name = "txtUserId";
+            this.txtUserId.Size = new System.Drawing.Size(400, 20);
+            this.txtUserId.TabIndex = 7;
+            //
+            // lblPassword
+            //
+            this.lblPassword.AutoSize = true;
+            this.lblPassword.Location = new System.Drawing.Point(16, 138);
+            this.lblPassword.Name = "lblPassword";
+            this.lblPassword.Size = new System.Drawing.Size(56, 13);
+            this.lblPassword.TabIndex = 8;
+            this.lblPassword.Text = "&Password:";
+            //
+            // txtPassword
+            //
+            this.txtPassword.Location = new System.Drawing.Point(150, 135);
+            this.txtPassword.Name = "txtPassword";
+            this.txtPassword.Size = new System.Drawing.Size(400, 20);
+            this.txtPassword.TabIndex = 9;
+            this.txtPassword.UseSystemPasswordChar = true;
+            //
+            // lblEncrypt
+            //
+            this.lblEncrypt.AutoSize = true;
+            this.lblEncrypt.Location = new System.Drawing.Point(16, 168);
+            this.lblEncrypt.Name = "lblEncrypt";
+            this.lblEncrypt.Size = new System.Drawing.Size(46, 13);
+            this.lblEncrypt.TabIndex = 10;
+            this.lblEncrypt.Text = "&Encrypt:";
+            //
+            // cmbEncrypt
+            //
+            this.cmbEncrypt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbEncrypt.FormattingEnabled = true;
+            this.cmbEncrypt.Location = new System.Drawing.Point(150, 165);
+            this.cmbEncrypt.Name = "cmbEncrypt";
+            this.cmbEncrypt.Size = new System.Drawing.Size(200, 21);
+            this.cmbEncrypt.TabIndex = 11;
+            //
+            // chkTrustServerCertificate
+            //
+            this.chkTrustServerCertificate.AutoSize = true;
+            this.chkTrustServerCertificate.Location = new System.Drawing.Point(370, 167);
+            this.chkTrustServerCertificate.Name = "chkTrustServerCertificate";
+            this.chkTrustServerCertificate.Size = new System.Drawing.Size(149, 17);
+            this.chkTrustServerCertificate.TabIndex = 12;
+            this.chkTrustServerCertificate.Text = "&Trust server certificate";
+            this.chkTrustServerCertificate.UseVisualStyleBackColor = true;
+            //
+            // lblTimeout
+            //
+            this.lblTimeout.AutoSize = true;
+            this.lblTimeout.Location = new System.Drawing.Point(16, 198);
+            this.lblTimeout.Name = "lblTimeout";
+            this.lblTimeout.Size = new System.Drawing.Size(101, 13);
+            this.lblTimeout.TabIndex = 13;
+            this.lblTimeout.Text = "Connect timeout (s):";
+            //
+            // numTimeout
+            //
+            this.numTimeout.Location = new System.Drawing.Point(150, 196);
+            this.numTimeout.Maximum = new decimal(new int[] { 600, 0, 0, 0 });
+            this.numTimeout.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
+            this.numTimeout.Name = "numTimeout";
+            this.numTimeout.Size = new System.Drawing.Size(80, 20);
+            this.numTimeout.TabIndex = 14;
+            this.numTimeout.Value = new decimal(new int[] { 30, 0, 0, 0 });
+            //
+            // lblOpenMode
+            //
+            this.lblOpenMode.AutoSize = true;
+            this.lblOpenMode.Location = new System.Drawing.Point(260, 198);
+            this.lblOpenMode.Name = "lblOpenMode";
+            this.lblOpenMode.Size = new System.Drawing.Size(67, 13);
+            this.lblOpenMode.TabIndex = 25;
+            this.lblOpenMode.Text = "&Open mode:";
+            //
+            // cmbOpenMode
+            //
+            this.cmbOpenMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbOpenMode.FormattingEnabled = true;
+            this.cmbOpenMode.Location = new System.Drawing.Point(350, 195);
+            this.cmbOpenMode.Name = "cmbOpenMode";
+            this.cmbOpenMode.Size = new System.Drawing.Size(200, 21);
+            this.cmbOpenMode.TabIndex = 26;
+            //
+            // lblConnectionString
+            //
+            this.lblConnectionString.AutoSize = true;
+            this.lblConnectionString.Location = new System.Drawing.Point(16, 230);
+            this.lblConnectionString.Name = "lblConnectionString";
+            this.lblConnectionString.Size = new System.Drawing.Size(94, 13);
+            this.lblConnectionString.TabIndex = 15;
+            this.lblConnectionString.Text = "Connection string:";
+            //
+            // txtConnectionString
+            //
+            this.txtConnectionString.Location = new System.Drawing.Point(16, 246);
+            this.txtConnectionString.Multiline = true;
+            this.txtConnectionString.Name = "txtConnectionString";
+            this.txtConnectionString.ReadOnly = true;
+            this.txtConnectionString.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.txtConnectionString.Size = new System.Drawing.Size(534, 60);
+            this.txtConnectionString.TabIndex = 16;
+            this.txtConnectionString.BackColor = System.Drawing.SystemColors.Info;
+            //
+            // btnBuild
+            //
+            this.btnBuild.Location = new System.Drawing.Point(16, 316);
+            this.btnBuild.Name = "btnBuild";
+            this.btnBuild.Size = new System.Drawing.Size(140, 26);
+            this.btnBuild.TabIndex = 17;
+            this.btnBuild.Text = "&Build Connection String";
+            this.btnBuild.UseVisualStyleBackColor = true;
+            this.btnBuild.Click += new System.EventHandler(this.btnBuild_Click);
+            //
+            // btnTest
+            //
+            this.btnTest.Location = new System.Drawing.Point(166, 316);
+            this.btnTest.Name = "btnTest";
+            this.btnTest.Size = new System.Drawing.Size(120, 26);
+            this.btnTest.TabIndex = 18;
+            this.btnTest.Text = "Te&st Connection";
+            this.btnTest.UseVisualStyleBackColor = true;
+            this.btnTest.Click += new System.EventHandler(this.btnTest_Click);
+            //
+            // btnCopy
+            //
+            this.btnCopy.Location = new System.Drawing.Point(296, 316);
+            this.btnCopy.Name = "btnCopy";
+            this.btnCopy.Size = new System.Drawing.Size(120, 26);
+            this.btnCopy.TabIndex = 19;
+            this.btnCopy.Text = "Cop&y to Clipboard";
+            this.btnCopy.UseVisualStyleBackColor = true;
+            this.btnCopy.Click += new System.EventHandler(this.btnCopy_Click);
+            //
+            // btnClear
+            //
+            this.btnClear.Location = new System.Drawing.Point(426, 316);
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Size = new System.Drawing.Size(124, 26);
+            this.btnClear.TabIndex = 20;
+            this.btnClear.Text = "Cl&ear All";
+            this.btnClear.UseVisualStyleBackColor = true;
+            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
+            //
+            // btnWhoAmI
+            //
+            this.btnWhoAmI.Location = new System.Drawing.Point(16, 348);
+            this.btnWhoAmI.Name = "btnWhoAmI";
+            this.btnWhoAmI.Size = new System.Drawing.Size(534, 26);
+            this.btnWhoAmI.TabIndex = 21;
+            this.btnWhoAmI.Text = "&Who Am I? (run identity query on the database)";
+            this.btnWhoAmI.UseVisualStyleBackColor = true;
+            this.btnWhoAmI.Click += new System.EventHandler(this.btnWhoAmI_Click);
+            //
+            // lblStatus
+            //
+            this.lblStatus.AutoSize = true;
+            this.lblStatus.Location = new System.Drawing.Point(16, 386);
+            this.lblStatus.Name = "lblStatus";
+            this.lblStatus.Size = new System.Drawing.Size(40, 13);
+            this.lblStatus.TabIndex = 22;
+            this.lblStatus.Text = "Result:";
+            //
+            // txtStatus
+            //
+            this.txtStatus.Location = new System.Drawing.Point(16, 402);
+            this.txtStatus.Multiline = true;
+            this.txtStatus.Name = "txtStatus";
+            this.txtStatus.ReadOnly = true;
+            this.txtStatus.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.txtStatus.Size = new System.Drawing.Size(534, 160);
+            this.txtStatus.TabIndex = 23;
+            this.txtStatus.WordWrap = false;
+            this.txtStatus.Font = new System.Drawing.Font("Consolas", 9F);
+            //
+            // statusStrip
+            //
+            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+                this.statusLabel});
+            this.statusStrip.Location = new System.Drawing.Point(0, 578);
+            this.statusStrip.Name = "statusStrip";
+            this.statusStrip.Size = new System.Drawing.Size(566, 22);
+            this.statusStrip.TabIndex = 24;
+            //
+            // statusLabel
+            //
+            this.statusLabel.Name = "statusLabel";
+            this.statusLabel.Size = new System.Drawing.Size(39, 17);
+            this.statusLabel.Text = "Ready";
+            //
+            // MainForm
+            //
+            this.AcceptButton = this.btnTest;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(566, 600);
+            this.Controls.Add(this.statusStrip);
+            this.Controls.Add(this.txtStatus);
+            this.Controls.Add(this.lblStatus);
+            this.Controls.Add(this.btnWhoAmI);
+            this.Controls.Add(this.btnClear);
+            this.Controls.Add(this.btnCopy);
+            this.Controls.Add(this.btnTest);
+            this.Controls.Add(this.btnBuild);
+            this.Controls.Add(this.txtConnectionString);
+            this.Controls.Add(this.lblConnectionString);
+            this.Controls.Add(this.cmbOpenMode);
+            this.Controls.Add(this.lblOpenMode);
+            this.Controls.Add(this.numTimeout);
+            this.Controls.Add(this.lblTimeout);
+            this.Controls.Add(this.chkTrustServerCertificate);
+            this.Controls.Add(this.cmbEncrypt);
+            this.Controls.Add(this.lblEncrypt);
+            this.Controls.Add(this.txtPassword);
+            this.Controls.Add(this.lblPassword);
+            this.Controls.Add(this.txtUserId);
+            this.Controls.Add(this.lblUserId);
+            this.Controls.Add(this.cmbAuthentication);
+            this.Controls.Add(this.lblAuthentication);
+            this.Controls.Add(this.txtDatabase);
+            this.Controls.Add(this.lblDatabase);
+            this.Controls.Add(this.txtServer);
+            this.Controls.Add(this.lblServer);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.Name = "MainForm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "Azure SQL Connector";
+            ((System.ComponentModel.ISupportInitialize)(this.numTimeout)).EndInit();
+            this.statusStrip.ResumeLayout(false);
+            this.statusStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label lblServer;
+        private System.Windows.Forms.TextBox txtServer;
+        private System.Windows.Forms.Label lblDatabase;
+        private System.Windows.Forms.TextBox txtDatabase;
+        private System.Windows.Forms.Label lblAuthentication;
+        private System.Windows.Forms.ComboBox cmbAuthentication;
+        private System.Windows.Forms.Label lblUserId;
+        private System.Windows.Forms.TextBox txtUserId;
+        private System.Windows.Forms.Label lblPassword;
+        private System.Windows.Forms.TextBox txtPassword;
+        private System.Windows.Forms.Label lblEncrypt;
+        private System.Windows.Forms.ComboBox cmbEncrypt;
+        private System.Windows.Forms.CheckBox chkTrustServerCertificate;
+        private System.Windows.Forms.Label lblTimeout;
+        private System.Windows.Forms.NumericUpDown numTimeout;
+        private System.Windows.Forms.Label lblOpenMode;
+        private System.Windows.Forms.ComboBox cmbOpenMode;
+        private System.Windows.Forms.Label lblConnectionString;
+        private System.Windows.Forms.TextBox txtConnectionString;
+        private System.Windows.Forms.Button btnBuild;
+        private System.Windows.Forms.Button btnTest;
+        private System.Windows.Forms.Button btnCopy;
+        private System.Windows.Forms.Button btnClear;
+        private System.Windows.Forms.Button btnWhoAmI;
+        private System.Windows.Forms.Label lblStatus;
+        private System.Windows.Forms.TextBox txtStatus;
+        private System.Windows.Forms.StatusStrip statusStrip;
+        private System.Windows.Forms.ToolStripStatusLabel statusLabel;
+    }
+}
diff --git a/doc/apps/AzureSqlConnector/MainForm.cs b/doc/apps/AzureSqlConnector/MainForm.cs
new file mode 100644
index 0000000000..9cc6d0648c
--- /dev/null
+++ b/doc/apps/AzureSqlConnector/MainForm.cs
@@ -0,0 +1,590 @@
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Microsoft.Data.SqlClient;
+using Microsoft.Identity.Client;
+
+namespace Microsoft.Data.SqlClient.Samples.AzureSqlConnector
+{
+    /// <summary>
+    /// "UI-thread" variant of the connector form. Opens the SQL connection via
+    /// <see cref="SqlConnection.OpenAsync()"/> on the UI thread; the WinForms
+    /// <see cref="System.Threading.SynchronizationContext"/> keeps the message pump alive while
+    /// the async I/O completes, so the form remains responsive and MSAL.NET's embedded sign-in
+    /// browser (for <c>ActiveDirectoryInteractive</c>) parents itself correctly.
+    /// </summary>
+    public partial class MainForm : Form
+    {
+        // ──────────────────────────────────────────────────────────────────
+        #region Construction
+
+        public MainForm()
+        {
+            InitializeComponent();
+            this.Text = "Azure SQL Connector — UI thread";
+            PopulateAuthenticationMethods();
+            PopulateEncryptOptions();
+            PopulateOpenModes();
+            UpdateCredentialFieldsAvailability();
+
+            // Force the underlying Win32 window to be created NOW (on the UI thread) so we can
+            // safely hand its HWND to MSAL later. Even in async mode, MSAL.NET may invoke the
+            // parent-window callback from a worker thread (e.g. when the driver blocks on a
+            // synchronous Open()), and touching Form.Handle from a non-UI thread throws
+            // InvalidOperationException ("Cross-thread operation not valid").
+            _ownerHwnd = this.Handle;
+
+            RegisterActiveDirectoryProvider();
+        }
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region UI Initialization
+
+        private void PopulateAuthenticationMethods()
+        {
+            foreach (SqlAuthenticationMethod method in Enum.GetValues(typeof(SqlAuthenticationMethod)))
+            {
+                cmbAuthentication.Items.Add(method);
+            }
+
+            cmbAuthentication.SelectedItem = SqlAuthenticationMethod.SqlPassword;
+        }
+
+        private void PopulateEncryptOptions()
+        {
+            cmbEncrypt.Items.Add(EncryptDisplay.Mandatory);
+            cmbEncrypt.Items.Add(EncryptDisplay.Optional);
+            cmbEncrypt.Items.Add(EncryptDisplay.Strict);
+            cmbEncrypt.SelectedIndex = 0;
+        }
+
+        private void PopulateOpenModes()
+        {
+            cmbOpenMode.Items.Add(OpenModeDisplay.Async);
+            cmbOpenMode.Items.Add(OpenModeDisplay.Sync);
+            cmbOpenMode.SelectedIndex = 0;
+        }
+
+        /// <summary>
+        /// Registers a single <see cref="ActiveDirectoryAuthenticationProvider"/> for every
+        /// Entra ID authentication method and gives it the form's captured HWND as the parent
+        /// window owner. Both callbacks intentionally use the HWND captured in the constructor
+        /// (<see cref="_ownerHwnd"/>) rather than <c>this.Handle</c>, because MSAL.NET can invoke
+        /// them from a worker thread (e.g. when the driver blocks on a synchronous <c>Open()</c>
+        /// or when its internal continuations resume off-UI).
+        /// </summary>
+        private void RegisterActiveDirectoryProvider()
+        {
+            ActiveDirectoryAuthenticationProvider provider = new ActiveDirectoryAuthenticationProvider();
+            IntPtr ownerHwnd = _ownerHwnd;
+
+#if NETFRAMEWORK
+            // .NET Framework: parent the embedded WebView via the legacy IWin32Window API.
+            provider.SetIWin32WindowFunc(() => new Win32WindowHandle(ownerHwnd));
+#endif
+
+            // Modern API: works on both .NET Framework and .NET 8+, and is the one MSAL's WAM
+            // broker consults on Windows.
+            provider.SetParentActivityOrWindowFunc(() => ownerHwnd);
+
+            // Without this, MSAL's default device-code callback writes the prompt to
+            // Console.WriteLine, which is invisible in a WinForms host — the connection
+            // appears to hang while MSAL polls for a code the user never sees.
+            provider.SetDeviceCodeFlowCallback(DeviceCodeFlowCallback);
+
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryIntegrated, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryInteractive, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryServicePrincipal, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryManagedIdentity, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryMSI, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDefault, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryWorkloadIdentity, provider);
+            #pragma warning disable CS0618 // Type or member is obsolete
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, provider);
+            #pragma warning restore CS0618 // Type or member is obsolete
+        }
+
+        /// <summary>
+        /// Device Code Flow callback. MSAL invokes this on a worker thread before it begins
+        /// polling the token endpoint. We surface the user code three ways so the user always
+        /// sees it: (1) appended to the log textbox via BeginInvoke (works whenever the UI
+        /// thread is pumping — async <c>OpenAsync</c>), (2) the verification URL launched in
+        /// the default browser, and (3) a modal owned by the MSAL worker thread (works even
+        /// when the UI thread is blocked by a synchronous <c>Open()</c>). MSAL polling waits
+        /// for the returned Task to complete, so dismissing the dialog also resumes polling.
+        /// </summary>
+        private Task DeviceCodeFlowCallback(DeviceCodeResult result)
+        {
+            string message = result.Message;
+            string url = result.VerificationUrl;
+            string code = result.UserCode;
+
+            if (IsHandleCreated)
+            {
+                try
+                {
+                    BeginInvoke((Action)(() =>
+                    {
+                        AppendStatus(string.Empty);
+                        AppendStatus("=== Device Code Flow ===");
+                        AppendStatus(message);
+                    }));
+                }
+                catch (InvalidOperationException)
+                {
+                    // Form is closing or handle was destroyed; fall through to the modal.
+                }
+            }
+
+            try
+            {
+                Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
+            }
+            catch
+            {
+                // Best-effort; the modal below still shows the URL and code.
+            }
+
+            MessageBox.Show(
+                "Sign in to complete Device Code Flow:" + Environment.NewLine + Environment.NewLine +
+                "  URL : " + url + Environment.NewLine +
+                "  Code: " + code + Environment.NewLine + Environment.NewLine +
+                "A browser window has been opened. Enter the code above, complete sign-in," +
+                Environment.NewLine + "then click OK to resume the connection.",
+                "Device Code Flow",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Information);
+
+            return Task.CompletedTask;
+        }
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region Event Handlers
+
+        private void cmbAuthentication_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            UpdateCredentialFieldsAvailability();
+        }
+
+        private void btnBuild_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                SqlConnectionStringBuilder builder = BuildConnectionString();
+                txtConnectionString.Text = MaskPassword(builder);
+                SetStatus("Connection string built successfully.", isError: false);
+                AppendStatus("Connection string built:\r\n" + MaskPassword(builder));
+            }
+            catch (Exception ex)
+            {
+                txtConnectionString.Text = string.Empty;
+                SetStatus("Failed to build connection string.", isError: true);
+                AppendStatus("ERROR: " + ex.Message);
+            }
+        }
+
+        private async void btnTest_Click(object sender, EventArgs e)
+        {
+            SqlConnectionStringBuilder builder;
+            try
+            {
+                builder = BuildConnectionString();
+                txtConnectionString.Text = MaskPassword(builder);
+            }
+            catch (Exception ex)
+            {
+                SetStatus("Failed to build connection string.", isError: true);
+                AppendStatus("ERROR: " + ex.Message);
+                return;
+            }
+
+            bool useAsync = IsAsyncOpenSelected();
+            SetBusy(true, useAsync ? "Testing connection (OpenAsync)..." : "Testing connection (Open)...");
+            AppendStatus(string.Empty);
+            AppendStatus("Testing connectivity to " + builder.DataSource + " ("
+                + (useAsync ? "OpenAsync" : "sync Open") + ") ...");
+
+            try
+            {
+                string serverVersion;
+                using (SqlConnection connection = new SqlConnection(builder.ConnectionString))
+                {
+                    await OpenConnectionAsync(connection, useAsync).ConfigureAwait(true);
+                    serverVersion = connection.ServerVersion;
+                }
+
+                SetStatus("Connected successfully.", isError: false);
+                AppendStatus("Connected successfully! Server version: " + serverVersion);
+            }
+            catch (SqlException ex)
+            {
+                SetStatus("Connection failed (SqlException).", isError: true);
+                AppendStatus("SqlException [" + ex.Number + "]: " + ex.Message + "\r\n" + ex.StackTrace);
+            }
+            catch (Exception ex)
+            {
+                SetStatus("Connection failed.", isError: true);
+                AppendStatus(ex.GetType().Name + ": " + ex.Message + "\r\n" + ex.StackTrace);
+            }
+            finally
+            {
+                SetBusy(false, null);
+            }
+        }
+
+        private async void btnWhoAmI_Click(object sender, EventArgs e)
+        {
+            SqlConnectionStringBuilder builder;
+            try
+            {
+                builder = BuildConnectionString();
+                txtConnectionString.Text = MaskPassword(builder);
+            }
+            catch (Exception ex)
+            {
+                SetStatus("Failed to build connection string.", isError: true);
+                AppendStatus("ERROR: " + ex.Message);
+                return;
+            }
+
+            bool useAsync = IsAsyncOpenSelected();
+            SetBusy(true, useAsync
+                ? "Querying logged-in identity (OpenAsync)..."
+                : "Querying logged-in identity (Open)...");
+            AppendStatus(string.Empty);
+            AppendStatus("Running identity query against " + builder.DataSource + " ("
+                + (useAsync ? "OpenAsync" : "sync Open") + ") ...");
+
+            try
+            {
+                // Same UI-thread reasoning as btnTest_Click — keep the message pump alive for any
+                // ActiveDirectoryInteractive sign-in that may be required.
+                using (SqlConnection connection = new SqlConnection(builder.ConnectionString))
+                {
+                    await OpenConnectionAsync(connection, useAsync).ConfigureAwait(true);
+
+                    using (SqlCommand command = connection.CreateCommand())
+                    {
+                        command.CommandText = IdentityQuery.CommandText;
+
+                        using (SqlDataReader reader = await command.ExecuteReaderAsync().ConfigureAwait(true))
+                        {
+                            if (await reader.ReadAsync().ConfigureAwait(true))
+                            {
+                                AppendStatus("Identity:");
+                                for (int i = 0; i < reader.FieldCount; i++)
+                                {
+                                    string name = reader.GetName(i);
+                                    object value = reader.IsDBNull(i) ? "(null)" : reader.GetValue(i);
+                                    AppendStatus("  " + name.PadRight(16) + ": " + value);
+                                }
+                                SetStatus("Identity query succeeded.", isError: false);
+                            }
+                            else
+                            {
+                                SetStatus("Identity query returned no rows.", isError: true);
+                                AppendStatus("(no rows returned)");
+                            }
+                        }
+                    }
+                }
+            }
+            catch (SqlException ex)
+            {
+                SetStatus("Identity query failed (SqlException).", isError: true);
+                AppendStatus("SqlException [" + ex.Number + "]: " + ex.Message);
+            }
+            catch (Exception ex)
+            {
+                SetStatus("Identity query failed.", isError: true);
+                AppendStatus(ex.GetType().Name + ": " + ex.Message);
+            }
+            finally
+            {
+                SetBusy(false, null);
+            }
+        }
+
+        private void btnCopy_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(txtConnectionString.Text))
+            {
+                SetStatus("Nothing to copy. Build the connection string first.", isError: true);
+                return;
+            }
+
+            try
+            {
+                Clipboard.SetText(BuildConnectionString().ConnectionString);
+                SetStatus("Connection string copied to clipboard.", isError: false);
+            }
+            catch (Exception ex)
+            {
+                SetStatus("Failed to copy to clipboard.", isError: true);
+                AppendStatus("ERROR: " + ex.Message);
+            }
+        }
+
+        private void btnClear_Click(object sender, EventArgs e)
+        {
+            txtServer.Clear();
+            txtDatabase.Clear();
+            txtUserId.Clear();
+            txtPassword.Clear();
+            txtConnectionString.Clear();
+            txtStatus.Clear();
+            cmbAuthentication.SelectedItem = SqlAuthenticationMethod.SqlPassword;
+            cmbEncrypt.SelectedIndex = 0;
+            cmbOpenMode.SelectedIndex = 0;
+            chkTrustServerCertificate.Checked = false;
+            numTimeout.Value = 30;
+            SetStatus("Ready", isError: false);
+        }
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region Connection String Construction
+
+        private SqlConnectionStringBuilder BuildConnectionString()
+        {
+            string server = (txtServer.Text ?? string.Empty).Trim();
+            if (string.IsNullOrEmpty(server))
+            {
+                throw new InvalidOperationException("Server name is required.");
+            }
+
+            SqlAuthenticationMethod authMethod = (SqlAuthenticationMethod)cmbAuthentication.SelectedItem;
+
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder
+            {
+                DataSource = server,
+                ConnectTimeout = (int)numTimeout.Value,
+            };
+
+            string database = (txtDatabase.Text ?? string.Empty).Trim();
+            if (!string.IsNullOrEmpty(database))
+            {
+                builder.InitialCatalog = database;
+            }
+
+            if (authMethod != SqlAuthenticationMethod.NotSpecified)
+            {
+                builder.Authentication = authMethod;
+            }
+
+            if (RequiresUserAndPassword(authMethod))
+            {
+                string userId = (txtUserId.Text ?? string.Empty).Trim();
+                if (string.IsNullOrEmpty(userId))
+                {
+                    throw new InvalidOperationException(
+                        "User ID is required for " + authMethod + " authentication.");
+                }
+
+                builder.UserID = userId;
+                builder.Password = txtPassword.Text ?? string.Empty;
+            }
+            else if (authMethod == SqlAuthenticationMethod.ActiveDirectoryServicePrincipal
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryManagedIdentity
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryMSI
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryInteractive
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryDefault
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryWorkloadIdentity)
+            {
+                string userId = (txtUserId.Text ?? string.Empty).Trim();
+                if (!string.IsNullOrEmpty(userId))
+                {
+                    builder.UserID = userId;
+                }
+
+                if (authMethod == SqlAuthenticationMethod.ActiveDirectoryServicePrincipal
+                    && !string.IsNullOrEmpty(txtPassword.Text))
+                {
+                    builder.Password = txtPassword.Text;
+                }
+            }
+
+            string encryptValue = cmbEncrypt.SelectedItem as string ?? EncryptDisplay.Mandatory;
+            switch (encryptValue)
+            {
+                case EncryptDisplay.Mandatory:
+                    builder.Encrypt = SqlConnectionEncryptOption.Mandatory;
+                    break;
+                case EncryptDisplay.Optional:
+                    builder.Encrypt = SqlConnectionEncryptOption.Optional;
+                    break;
+                case EncryptDisplay.Strict:
+                    builder.Encrypt = SqlConnectionEncryptOption.Strict;
+                    break;
+            }
+
+            builder.TrustServerCertificate = chkTrustServerCertificate.Checked;
+
+            return builder;
+        }
+
+        private static bool RequiresUserAndPassword(SqlAuthenticationMethod method)
+        {
+            switch (method)
+            {
+                case SqlAuthenticationMethod.SqlPassword:
+#pragma warning disable CS0618 // Type or member is obsolete
+                case SqlAuthenticationMethod.ActiveDirectoryPassword:
+#pragma warning restore CS0618
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        private static string MaskPassword(SqlConnectionStringBuilder builder)
+        {
+            if (string.IsNullOrEmpty(builder.Password))
+            {
+                return builder.ConnectionString;
+            }
+
+            SqlConnectionStringBuilder copy = new SqlConnectionStringBuilder(builder.ConnectionString)
+            {
+                Password = "********",
+            };
+            return copy.ConnectionString;
+        }
+
+        /// <summary>
+        /// Returns <see langword="true"/> when the user picked <c>Async (OpenAsync)</c> in the
+        /// open-mode selector. Defaults to async if the selector has not been initialized yet.
+        /// </summary>
+        private bool IsAsyncOpenSelected()
+        {
+            return cmbOpenMode.SelectedItem as string != OpenModeDisplay.Sync;
+        }
+
+        /// <summary>
+        /// Opens <paramref name="connection"/> on the calling thread using either
+        /// <see cref="SqlConnection.OpenAsync()"/> or the synchronous <see cref="SqlConnection.Open"/>
+        /// based on <paramref name="useAsync"/>. The method itself is always async-returning so
+        /// callers can <c>await</c> uniformly; for the sync case it runs <c>Open()</c> inline on
+        /// the UI thread (which is supported with WAM broker because the broker dialog is hosted
+        /// by a separate process and does not need this thread's message pump).
+        /// </summary>
+        private static Task OpenConnectionAsync(SqlConnection connection, bool useAsync)
+        {
+            if (useAsync)
+            {
+                return connection.OpenAsync();
+            }
+
+            connection.Open();
+            return Task.CompletedTask;
+        }
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region UI Helpers
+
+        private void UpdateCredentialFieldsAvailability()
+        {
+            if (cmbAuthentication.SelectedItem == null)
+            {
+                return;
+            }
+
+            SqlAuthenticationMethod method = (SqlAuthenticationMethod)cmbAuthentication.SelectedItem;
+
+            bool userEnabled = method != SqlAuthenticationMethod.ActiveDirectoryIntegrated;
+            bool passwordEnabled = RequiresUserAndPassword(method)
+                || method == SqlAuthenticationMethod.ActiveDirectoryServicePrincipal;
+
+            txtUserId.Enabled = userEnabled;
+            txtPassword.Enabled = passwordEnabled;
+
+            if (!passwordEnabled)
+            {
+                txtPassword.Clear();
+            }
+        }
+
+        private void SetStatus(string text, bool isError)
+        {
+            statusLabel.Text = text;
+            statusLabel.ForeColor = isError ? System.Drawing.Color.Firebrick : System.Drawing.Color.Black;
+        }
+
+        private void AppendStatus(string line)
+        {
+            if (txtStatus.TextLength > 0)
+            {
+                txtStatus.AppendText(Environment.NewLine);
+            }
+            txtStatus.AppendText(line ?? string.Empty);
+        }
+
+        private void SetBusy(bool busy, string statusText)
+        {
+            btnBuild.Enabled = !busy;
+            btnTest.Enabled = !busy;
+            btnCopy.Enabled = !busy;
+            btnClear.Enabled = !busy;
+            btnWhoAmI.Enabled = !busy;
+            cmbOpenMode.Enabled = !busy;
+            Cursor = busy ? Cursors.WaitCursor : Cursors.Default;
+
+            if (statusText != null)
+            {
+                SetStatus(statusText, isError: false);
+            }
+        }
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region Nested Types
+
+        private static class EncryptDisplay
+        {
+            public const string Mandatory = "Mandatory";
+            public const string Optional = "Optional";
+            public const string Strict = "Strict";
+        }
+
+        private static class OpenModeDisplay
+        {
+            public const string Async = "Async (OpenAsync)";
+            public const string Sync = "Sync (Open)";
+        }
+
+#if NETFRAMEWORK
+        // Tiny IWin32Window wrapper around a raw HWND captured on the UI thread so MSAL.NET's
+        // legacy IWin32WindowFunc callback can safely return a window owner from a worker thread
+        // without ever touching Control.Handle off-UI.
+        private sealed class Win32WindowHandle : IWin32Window
+        {
+            private readonly IntPtr _hwnd;
+            public Win32WindowHandle(IntPtr hwnd) => _hwnd = hwnd;
+            public IntPtr Handle => _hwnd;
+        }
+#endif
+
+        #endregion
+
+        // ───────────────────────────────────────────────────────────────
+        #region Private Fields
+
+        // The form's Win32 window handle, captured on the UI thread in the constructor.
+        // Read from worker threads by the Entra ID provider callbacks to parent MSAL's sign-in
+        // / WAM broker UI without illegally touching Control.Handle.
+        private readonly IntPtr _ownerHwnd;
+
+        #endregion
+    }
+}
diff --git a/doc/apps/AzureSqlConnector/MainFormWorker.Designer.cs b/doc/apps/AzureSqlConnector/MainFormWorker.Designer.cs
new file mode 100644
index 0000000000..c872ee38ab
--- /dev/null
+++ b/doc/apps/AzureSqlConnector/MainFormWorker.Designer.cs
@@ -0,0 +1,383 @@
+namespace Microsoft.Data.SqlClient.Samples.AzureSqlConnector
+{
+    partial class MainFormWorker
+    {
+        /// <summary>
+        ///  Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        ///  Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.lblServer = new System.Windows.Forms.Label();
+            this.txtServer = new System.Windows.Forms.TextBox();
+            this.lblDatabase = new System.Windows.Forms.Label();
+            this.txtDatabase = new System.Windows.Forms.TextBox();
+            this.lblAuthentication = new System.Windows.Forms.Label();
+            this.cmbAuthentication = new System.Windows.Forms.ComboBox();
+            this.lblUserId = new System.Windows.Forms.Label();
+            this.txtUserId = new System.Windows.Forms.TextBox();
+            this.lblPassword = new System.Windows.Forms.Label();
+            this.txtPassword = new System.Windows.Forms.TextBox();
+            this.lblEncrypt = new System.Windows.Forms.Label();
+            this.cmbEncrypt = new System.Windows.Forms.ComboBox();
+            this.chkTrustServerCertificate = new System.Windows.Forms.CheckBox();
+            this.lblTimeout = new System.Windows.Forms.Label();
+            this.numTimeout = new System.Windows.Forms.NumericUpDown();
+            this.chkClearTokenCache = new System.Windows.Forms.CheckBox();
+            this.lblConnectionString = new System.Windows.Forms.Label();
+            this.txtConnectionString = new System.Windows.Forms.TextBox();
+            this.btnBuild = new System.Windows.Forms.Button();
+            this.btnTest = new System.Windows.Forms.Button();
+            this.btnCopy = new System.Windows.Forms.Button();
+            this.btnClear = new System.Windows.Forms.Button();
+            this.btnWhoAmI = new System.Windows.Forms.Button();
+            this.lblStatus = new System.Windows.Forms.Label();
+            this.txtStatus = new System.Windows.Forms.TextBox();
+            this.statusStrip = new System.Windows.Forms.StatusStrip();
+            this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+            ((System.ComponentModel.ISupportInitialize)(this.numTimeout)).BeginInit();
+            this.statusStrip.SuspendLayout();
+            this.SuspendLayout();
+            //
+            // lblServer
+            //
+            this.lblServer.AutoSize = true;
+            this.lblServer.Location = new System.Drawing.Point(16, 18);
+            this.lblServer.Name = "lblServer";
+            this.lblServer.Size = new System.Drawing.Size(75, 13);
+            this.lblServer.TabIndex = 0;
+            this.lblServer.Text = "&Server name:";
+            //
+            // txtServer
+            //
+            this.txtServer.Location = new System.Drawing.Point(150, 15);
+            this.txtServer.Name = "txtServer";
+            this.txtServer.Size = new System.Drawing.Size(400, 20);
+            this.txtServer.TabIndex = 1;
+            //
+            // lblDatabase
+            //
+            this.lblDatabase.AutoSize = true;
+            this.lblDatabase.Location = new System.Drawing.Point(16, 48);
+            this.lblDatabase.Name = "lblDatabase";
+            this.lblDatabase.Size = new System.Drawing.Size(86, 13);
+            this.lblDatabase.TabIndex = 2;
+            this.lblDatabase.Text = "&Database name:";
+            //
+            // txtDatabase
+            //
+            this.txtDatabase.Location = new System.Drawing.Point(150, 45);
+            this.txtDatabase.Name = "txtDatabase";
+            this.txtDatabase.Size = new System.Drawing.Size(400, 20);
+            this.txtDatabase.TabIndex = 3;
+            //
+            // lblAuthentication
+            //
+            this.lblAuthentication.AutoSize = true;
+            this.lblAuthentication.Location = new System.Drawing.Point(16, 78);
+            this.lblAuthentication.Name = "lblAuthentication";
+            this.lblAuthentication.Size = new System.Drawing.Size(80, 13);
+            this.lblAuthentication.TabIndex = 4;
+            this.lblAuthentication.Text = "&Authentication:";
+            //
+            // cmbAuthentication
+            //
+            this.cmbAuthentication.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbAuthentication.FormattingEnabled = true;
+            this.cmbAuthentication.Location = new System.Drawing.Point(150, 75);
+            this.cmbAuthentication.Name = "cmbAuthentication";
+            this.cmbAuthentication.Size = new System.Drawing.Size(400, 21);
+            this.cmbAuthentication.TabIndex = 5;
+            this.cmbAuthentication.SelectedIndexChanged += new System.EventHandler(this.cmbAuthentication_SelectedIndexChanged);
+            //
+            // lblUserId
+            //
+            this.lblUserId.AutoSize = true;
+            this.lblUserId.Location = new System.Drawing.Point(16, 108);
+            this.lblUserId.Name = "lblUserId";
+            this.lblUserId.Size = new System.Drawing.Size(45, 13);
+            this.lblUserId.TabIndex = 6;
+            this.lblUserId.Text = "&User ID:";
+            //
+            // txtUserId
+            //
+            this.txtUserId.Location = new System.Drawing.Point(150, 105);
+            this.txtUserId.Name = "txtUserId";
+            this.txtUserId.Size = new System.Drawing.Size(400, 20);
+            this.txtUserId.TabIndex = 7;
+            //
+            // lblPassword
+            //
+            this.lblPassword.AutoSize = true;
+            this.lblPassword.Location = new System.Drawing.Point(16, 138);
+            this.lblPassword.Name = "lblPassword";
+            this.lblPassword.Size = new System.Drawing.Size(56, 13);
+            this.lblPassword.TabIndex = 8;
+            this.lblPassword.Text = "&Password:";
+            //
+            // txtPassword
+            //
+            this.txtPassword.Location = new System.Drawing.Point(150, 135);
+            this.txtPassword.Name = "txtPassword";
+            this.txtPassword.Size = new System.Drawing.Size(400, 20);
+            this.txtPassword.TabIndex = 9;
+            this.txtPassword.UseSystemPasswordChar = true;
+            //
+            // lblEncrypt
+            //
+            this.lblEncrypt.AutoSize = true;
+            this.lblEncrypt.Location = new System.Drawing.Point(16, 168);
+            this.lblEncrypt.Name = "lblEncrypt";
+            this.lblEncrypt.Size = new System.Drawing.Size(46, 13);
+            this.lblEncrypt.TabIndex = 10;
+            this.lblEncrypt.Text = "&Encrypt:";
+            //
+            // cmbEncrypt
+            //
+            this.cmbEncrypt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbEncrypt.FormattingEnabled = true;
+            this.cmbEncrypt.Location = new System.Drawing.Point(150, 165);
+            this.cmbEncrypt.Name = "cmbEncrypt";
+            this.cmbEncrypt.Size = new System.Drawing.Size(200, 21);
+            this.cmbEncrypt.TabIndex = 11;
+            //
+            // chkTrustServerCertificate
+            //
+            this.chkTrustServerCertificate.AutoSize = true;
+            this.chkTrustServerCertificate.Location = new System.Drawing.Point(370, 167);
+            this.chkTrustServerCertificate.Name = "chkTrustServerCertificate";
+            this.chkTrustServerCertificate.Size = new System.Drawing.Size(149, 17);
+            this.chkTrustServerCertificate.TabIndex = 12;
+            this.chkTrustServerCertificate.Text = "&Trust server certificate";
+            this.chkTrustServerCertificate.UseVisualStyleBackColor = true;
+            //
+            // lblTimeout
+            //
+            this.lblTimeout.AutoSize = true;
+            this.lblTimeout.Location = new System.Drawing.Point(16, 198);
+            this.lblTimeout.Name = "lblTimeout";
+            this.lblTimeout.Size = new System.Drawing.Size(101, 13);
+            this.lblTimeout.TabIndex = 13;
+            this.lblTimeout.Text = "Connect timeout (s):";
+            //
+            // numTimeout
+            //
+            this.numTimeout.Location = new System.Drawing.Point(150, 196);
+            this.numTimeout.Maximum = new decimal(new int[] { 600, 0, 0, 0 });
+            this.numTimeout.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
+            this.numTimeout.Name = "numTimeout";
+            this.numTimeout.Size = new System.Drawing.Size(80, 20);
+            this.numTimeout.TabIndex = 14;
+            this.numTimeout.Value = new decimal(new int[] { 30, 0, 0, 0 });
+            //
+            // chkClearTokenCache
+            //
+            this.chkClearTokenCache.AutoSize = true;
+            this.chkClearTokenCache.Location = new System.Drawing.Point(260, 198);
+            this.chkClearTokenCache.Name = "chkClearTokenCache";
+            this.chkClearTokenCache.Size = new System.Drawing.Size(290, 17);
+            this.chkClearTokenCache.TabIndex = 15;
+            this.chkClearTokenCache.Text = "Clear MSAL token &cache before connect (force prompt)";
+            this.chkClearTokenCache.UseVisualStyleBackColor = true;
+            //
+            // lblConnectionString
+            //
+            this.lblConnectionString.AutoSize = true;
+            this.lblConnectionString.Location = new System.Drawing.Point(16, 230);
+            this.lblConnectionString.Name = "lblConnectionString";
+            this.lblConnectionString.Size = new System.Drawing.Size(94, 13);
+            this.lblConnectionString.TabIndex = 15;
+            this.lblConnectionString.Text = "Connection string:";
+            //
+            // txtConnectionString
+            //
+            this.txtConnectionString.Location = new System.Drawing.Point(16, 246);
+            this.txtConnectionString.Multiline = true;
+            this.txtConnectionString.Name = "txtConnectionString";
+            this.txtConnectionString.ReadOnly = true;
+            this.txtConnectionString.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.txtConnectionString.Size = new System.Drawing.Size(534, 60);
+            this.txtConnectionString.TabIndex = 16;
+            this.txtConnectionString.BackColor = System.Drawing.SystemColors.Info;
+            //
+            // btnBuild
+            //
+            this.btnBuild.Location = new System.Drawing.Point(16, 316);
+            this.btnBuild.Name = "btnBuild";
+            this.btnBuild.Size = new System.Drawing.Size(140, 26);
+            this.btnBuild.TabIndex = 17;
+            this.btnBuild.Text = "&Build Connection String";
+            this.btnBuild.UseVisualStyleBackColor = true;
+            this.btnBuild.Click += new System.EventHandler(this.btnBuild_Click);
+            //
+            // btnTest
+            //
+            this.btnTest.Location = new System.Drawing.Point(166, 316);
+            this.btnTest.Name = "btnTest";
+            this.btnTest.Size = new System.Drawing.Size(120, 26);
+            this.btnTest.TabIndex = 18;
+            this.btnTest.Text = "Te&st Connection";
+            this.btnTest.UseVisualStyleBackColor = true;
+            this.btnTest.Click += new System.EventHandler(this.btnTest_Click);
+            //
+            // btnCopy
+            //
+            this.btnCopy.Location = new System.Drawing.Point(296, 316);
+            this.btnCopy.Name = "btnCopy";
+            this.btnCopy.Size = new System.Drawing.Size(120, 26);
+            this.btnCopy.TabIndex = 19;
+            this.btnCopy.Text = "Cop&y to Clipboard";
+            this.btnCopy.UseVisualStyleBackColor = true;
+            this.btnCopy.Click += new System.EventHandler(this.btnCopy_Click);
+            //
+            // btnClear
+            //
+            this.btnClear.Location = new System.Drawing.Point(426, 316);
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Size = new System.Drawing.Size(124, 26);
+            this.btnClear.TabIndex = 20;
+            this.btnClear.Text = "Cl&ear All";
+            this.btnClear.UseVisualStyleBackColor = true;
+            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
+            //
+            // btnWhoAmI
+            //
+            this.btnWhoAmI.Location = new System.Drawing.Point(16, 348);
+            this.btnWhoAmI.Name = "btnWhoAmI";
+            this.btnWhoAmI.Size = new System.Drawing.Size(534, 26);
+            this.btnWhoAmI.TabIndex = 21;
+            this.btnWhoAmI.Text = "&Who Am I? (run identity query on the database)";
+            this.btnWhoAmI.UseVisualStyleBackColor = true;
+            this.btnWhoAmI.Click += new System.EventHandler(this.btnWhoAmI_Click);
+            //
+            // lblStatus
+            //
+            this.lblStatus.AutoSize = true;
+            this.lblStatus.Location = new System.Drawing.Point(16, 386);
+            this.lblStatus.Name = "lblStatus";
+            this.lblStatus.Size = new System.Drawing.Size(40, 13);
+            this.lblStatus.TabIndex = 22;
+            this.lblStatus.Text = "Result:";
+            //
+            // txtStatus
+            //
+            this.txtStatus.Location = new System.Drawing.Point(16, 402);
+            this.txtStatus.Multiline = true;
+            this.txtStatus.Name = "txtStatus";
+            this.txtStatus.ReadOnly = true;
+            this.txtStatus.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.txtStatus.Size = new System.Drawing.Size(534, 160);
+            this.txtStatus.TabIndex = 23;
+            this.txtStatus.WordWrap = false;
+            this.txtStatus.Font = new System.Drawing.Font("Consolas", 9F);
+            //
+            // statusStrip
+            //
+            this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+                this.statusLabel});
+            this.statusStrip.Location = new System.Drawing.Point(0, 578);
+            this.statusStrip.Name = "statusStrip";
+            this.statusStrip.Size = new System.Drawing.Size(566, 22);
+            this.statusStrip.TabIndex = 24;
+            //
+            // statusLabel
+            //
+            this.statusLabel.Name = "statusLabel";
+            this.statusLabel.Size = new System.Drawing.Size(39, 17);
+            this.statusLabel.Text = "Ready";
+            //
+            // MainForm
+            //
+            this.AcceptButton = this.btnTest;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(566, 600);
+            this.Controls.Add(this.statusStrip);
+            this.Controls.Add(this.txtStatus);
+            this.Controls.Add(this.lblStatus);
+            this.Controls.Add(this.btnWhoAmI);
+            this.Controls.Add(this.btnClear);
+            this.Controls.Add(this.btnCopy);
+            this.Controls.Add(this.btnTest);
+            this.Controls.Add(this.btnBuild);
+            this.Controls.Add(this.txtConnectionString);
+            this.Controls.Add(this.lblConnectionString);
+            this.Controls.Add(this.numTimeout);
+            this.Controls.Add(this.lblTimeout);
+            this.Controls.Add(this.chkClearTokenCache);
+            this.Controls.Add(this.chkTrustServerCertificate);
+            this.Controls.Add(this.cmbEncrypt);
+            this.Controls.Add(this.lblEncrypt);
+            this.Controls.Add(this.txtPassword);
+            this.Controls.Add(this.lblPassword);
+            this.Controls.Add(this.txtUserId);
+            this.Controls.Add(this.lblUserId);
+            this.Controls.Add(this.cmbAuthentication);
+            this.Controls.Add(this.lblAuthentication);
+            this.Controls.Add(this.txtDatabase);
+            this.Controls.Add(this.lblDatabase);
+            this.Controls.Add(this.txtServer);
+            this.Controls.Add(this.lblServer);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.Name = "MainFormWorker";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "Azure SQL Connector — Worker thread (Task.Run + Open)";
+            ((System.ComponentModel.ISupportInitialize)(this.numTimeout)).EndInit();
+            this.statusStrip.ResumeLayout(false);
+            this.statusStrip.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label lblServer;
+        private System.Windows.Forms.TextBox txtServer;
+        private System.Windows.Forms.Label lblDatabase;
+        private System.Windows.Forms.TextBox txtDatabase;
+        private System.Windows.Forms.Label lblAuthentication;
+        private System.Windows.Forms.ComboBox cmbAuthentication;
+        private System.Windows.Forms.Label lblUserId;
+        private System.Windows.Forms.TextBox txtUserId;
+        private System.Windows.Forms.Label lblPassword;
+        private System.Windows.Forms.TextBox txtPassword;
+        private System.Windows.Forms.Label lblEncrypt;
+        private System.Windows.Forms.ComboBox cmbEncrypt;
+        private System.Windows.Forms.CheckBox chkTrustServerCertificate;
+        private System.Windows.Forms.Label lblTimeout;
+        private System.Windows.Forms.NumericUpDown numTimeout;
+        private System.Windows.Forms.CheckBox chkClearTokenCache;
+        private System.Windows.Forms.Label lblConnectionString;
+        private System.Windows.Forms.TextBox txtConnectionString;
+        private System.Windows.Forms.Button btnBuild;
+        private System.Windows.Forms.Button btnTest;
+        private System.Windows.Forms.Button btnCopy;
+        private System.Windows.Forms.Button btnClear;
+        private System.Windows.Forms.Button btnWhoAmI;
+        private System.Windows.Forms.Label lblStatus;
+        private System.Windows.Forms.TextBox txtStatus;
+        private System.Windows.Forms.StatusStrip statusStrip;
+        private System.Windows.Forms.ToolStripStatusLabel statusLabel;
+    }
+}
diff --git a/doc/apps/AzureSqlConnector/MainFormWorker.cs b/doc/apps/AzureSqlConnector/MainFormWorker.cs
new file mode 100644
index 0000000000..8d344cf6c4
--- /dev/null
+++ b/doc/apps/AzureSqlConnector/MainFormWorker.cs
@@ -0,0 +1,598 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Microsoft.Data.SqlClient;
+using Microsoft.Identity.Client;
+
+namespace Microsoft.Data.SqlClient.Samples.AzureSqlConnector
+{
+    /// <summary>
+    /// "Worker thread" variant of the connector form. Opens the SQL connection synchronously
+    /// inside a <see cref="Task.Run(System.Action)"/> call so the UI thread never blocks.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The form's HWND is captured on the UI thread in the constructor and stashed in
+    /// <see cref="_ownerHwnd"/>. Both Entra ID parent-window callbacks return that captured
+    /// handle, so they are safe to invoke from the worker thread (touching <c>Form.Handle</c>
+    /// from a non-UI thread is illegal).
+    /// </para>
+    /// <para>
+    /// Compare with <see cref="MainForm"/>, which keeps Open on the UI thread and relies on
+    /// <see cref="SqlConnection.OpenAsync()"/> for responsiveness.
+    /// </para>
+    /// </remarks>
+    public partial class MainFormWorker : Form
+    {
+        // ──────────────────────────────────────────────────────────────────
+        #region Construction
+
+        public MainFormWorker()
+        {
+            InitializeComponent();
+            PopulateAuthenticationMethods();
+            PopulateEncryptOptions();
+            UpdateCredentialFieldsAvailability();
+
+            // Force the underlying Win32 window to be created NOW (on the UI thread) so we can
+            // safely capture its HWND for MSAL to use later from a worker thread. Touching
+            // Form.Handle from a non-UI thread is illegal, so we read it here once and stash it.
+            _ownerHwnd = this.Handle;
+
+            RegisterActiveDirectoryProvider();
+        }
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region UI Initialization
+
+        private void PopulateAuthenticationMethods()
+        {
+            foreach (SqlAuthenticationMethod method in Enum.GetValues(typeof(SqlAuthenticationMethod)))
+            {
+                cmbAuthentication.Items.Add(method);
+            }
+
+            cmbAuthentication.SelectedItem = SqlAuthenticationMethod.SqlPassword;
+        }
+
+        private void PopulateEncryptOptions()
+        {
+            cmbEncrypt.Items.Add(EncryptDisplay.Mandatory);
+            cmbEncrypt.Items.Add(EncryptDisplay.Optional);
+            cmbEncrypt.Items.Add(EncryptDisplay.Strict);
+            cmbEncrypt.SelectedIndex = 0;
+        }
+
+        /// <summary>
+        /// Registers a single <see cref="ActiveDirectoryAuthenticationProvider"/> for every
+        /// Entra ID authentication method and gives it the form's captured HWND as the parent
+        /// window owner. Both callbacks intentionally use the HWND captured in the constructor
+        /// (<see cref="_ownerHwnd"/>) rather than <c>this.Handle</c>; they are invoked by MSAL on
+        /// the worker thread that called <see cref="SqlConnection.Open"/>.
+        /// </summary>
+        private void RegisterActiveDirectoryProvider()
+        {
+            ActiveDirectoryAuthenticationProvider provider = new ActiveDirectoryAuthenticationProvider();
+            IntPtr ownerHwnd = _ownerHwnd;
+
+#if NETFRAMEWORK
+            // .NET Framework: parent the embedded WebView via the legacy IWin32Window API.
+            provider.SetIWin32WindowFunc(() => new Win32WindowHandle(ownerHwnd));
+#endif
+
+            // Modern API: works on both .NET Framework and .NET 8+, and is the one MSAL's WAM
+            // broker consults on Windows.
+            provider.SetParentActivityOrWindowFunc(() => ownerHwnd);
+
+            // Without this, MSAL's default device-code callback writes the prompt to
+            // Console.WriteLine, which is invisible in a WinForms host — the connection
+            // appears to hang while MSAL polls for a code the user never sees.
+            provider.SetDeviceCodeFlowCallback(DeviceCodeFlowCallback);
+
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryIntegrated, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryInteractive, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryServicePrincipal, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryManagedIdentity, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryMSI, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryDefault, provider);
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryWorkloadIdentity, provider);
+            #pragma warning disable CS0618 // Type or member is obsolete
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryPassword, provider);
+            #pragma warning restore CS0618 // Type or member is obsolete
+        }
+
+        /// <summary>
+        /// Device Code Flow callback. MSAL invokes this on a worker thread before it begins
+        /// polling the token endpoint. We surface the user code three ways so the user always
+        /// sees it: (1) appended to the log textbox via BeginInvoke (the UI thread is free in
+        /// this variant because Open() runs on a Task.Run worker), (2) the verification URL
+        /// launched in the default browser, and (3) a modal owned by the MSAL worker thread.
+        /// MSAL polling waits for the returned Task to complete, so dismissing the dialog
+        /// also resumes polling.
+        /// </summary>
+        private Task DeviceCodeFlowCallback(DeviceCodeResult result)
+        {
+            string message = result.Message;
+            string url = result.VerificationUrl;
+            string code = result.UserCode;
+
+            if (IsHandleCreated)
+            {
+                try
+                {
+                    BeginInvoke((Action)(() =>
+                    {
+                        AppendStatus(string.Empty);
+                        AppendStatus("=== Device Code Flow ===");
+                        AppendStatus(message);
+                    }));
+                }
+                catch (InvalidOperationException)
+                {
+                    // Form is closing or handle was destroyed; fall through to the modal.
+                }
+            }
+
+            try
+            {
+                Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
+            }
+            catch
+            {
+                // Best-effort; the modal below still shows the URL and code.
+            }
+
+            MessageBox.Show(
+                "Sign in to complete Device Code Flow:" + Environment.NewLine + Environment.NewLine +
+                "  URL : " + url + Environment.NewLine +
+                "  Code: " + code + Environment.NewLine + Environment.NewLine +
+                "A browser window has been opened. Enter the code above, complete sign-in," +
+                Environment.NewLine + "then click OK to resume the connection.",
+                "Device Code Flow",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Information);
+
+            return Task.CompletedTask;
+        }
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region Event Handlers
+
+        private void cmbAuthentication_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            UpdateCredentialFieldsAvailability();
+        }
+
+        private void btnBuild_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                SqlConnectionStringBuilder builder = BuildConnectionString();
+                txtConnectionString.Text = MaskPassword(builder);
+                SetStatus("Connection string built successfully.", isError: false);
+                AppendStatus("Connection string built:\r\n" + MaskPassword(builder));
+            }
+            catch (Exception ex)
+            {
+                txtConnectionString.Text = string.Empty;
+                SetStatus("Failed to build connection string.", isError: true);
+                AppendStatus("ERROR: " + ex.Message);
+            }
+        }
+
+        private async void btnTest_Click(object sender, EventArgs e)
+        {
+            SqlConnectionStringBuilder builder;
+            try
+            {
+                builder = BuildConnectionString();
+                txtConnectionString.Text = MaskPassword(builder);
+            }
+            catch (Exception ex)
+            {
+                SetStatus("Failed to build connection string.", isError: true);
+                AppendStatus("ERROR: " + ex.Message);
+                return;
+            }
+
+            SetBusy(true, "Testing connection...");
+            AppendStatus(string.Empty);
+            AppendStatus("Testing connectivity to " + builder.DataSource + " ...");
+
+            MaybeClearTokenCache();
+
+            try
+            {
+                // Run Open() on a thread-pool worker so the UI thread never blocks. The await
+                // continuation hops back onto the UI thread automatically (the awaiter captures
+                // the current SynchronizationContext), so it is safe to touch the form's controls
+                // after the await.
+                //
+                // The Entra ID interactive / WAM flows still find a parent window because we
+                // captured the form's HWND on the UI thread in the constructor and the callbacks
+                // registered in RegisterActiveDirectoryProvider return that captured handle (no
+                // UI-thread-only Form.Handle access from the worker thread).
+                string connectionString = builder.ConnectionString;
+                string serverVersion = await Task.Run(() =>
+                {
+                    using (SqlConnection connection = new SqlConnection(connectionString))
+                    {
+                        connection.Open();
+                        return connection.ServerVersion;
+                    }
+                }).ConfigureAwait(true);
+
+                SetStatus("Connected successfully.", isError: false);
+                AppendStatus("Connected successfully! Server version: " + serverVersion);
+            }
+            catch (SqlException ex)
+            {
+                SetStatus("Connection failed (SqlException).", isError: true);
+                AppendStatus("SqlException [" + ex.Number + "]: " + ex.Message);
+            }
+            catch (Exception ex)
+            {
+                SetStatus("Connection failed.", isError: true);
+                AppendStatus(ex.GetType().Name + ": " + ex.Message);
+            }
+            finally
+            {
+                SetBusy(false, null);
+            }
+        }
+
+        private async void btnWhoAmI_Click(object sender, EventArgs e)
+        {
+            SqlConnectionStringBuilder builder;
+            try
+            {
+                builder = BuildConnectionString();
+                txtConnectionString.Text = MaskPassword(builder);
+            }
+            catch (Exception ex)
+            {
+                SetStatus("Failed to build connection string.", isError: true);
+                AppendStatus("ERROR: " + ex.Message);
+                return;
+            }
+
+            SetBusy(true, "Querying logged-in identity...");
+            AppendStatus(string.Empty);
+            AppendStatus("Running identity query against " + builder.DataSource + " ...");
+
+            MaybeClearTokenCache();
+
+            try
+            {
+                // Run the whole open + query + read on a worker thread so the UI never blocks.
+                // We materialize the single result row into a List<(name, value)> on the worker
+                // and then format it on the UI thread once the await returns.
+                string connectionString = builder.ConnectionString;
+                List<(string Name, object Value)> row = await Task.Run(() =>
+                {
+                    using (SqlConnection connection = new SqlConnection(connectionString))
+                    {
+                        connection.Open();
+
+                        using (SqlCommand command = connection.CreateCommand())
+                        {
+                            command.CommandText = IdentityQuery.CommandText;
+
+                            using (SqlDataReader reader = command.ExecuteReader())
+                            {
+                                if (!reader.Read())
+                                {
+                                    return null;
+                                }
+
+                                var fields = new List<(string, object)>(reader.FieldCount);
+                                for (int i = 0; i < reader.FieldCount; i++)
+                                {
+                                    object value = reader.IsDBNull(i) ? "(null)" : reader.GetValue(i);
+                                    fields.Add((reader.GetName(i), value));
+                                }
+                                return fields;
+                            }
+                        }
+                    }
+                }).ConfigureAwait(true);
+
+                if (row is null)
+                {
+                    SetStatus("Identity query returned no rows.", isError: true);
+                    AppendStatus("(no rows returned)");
+                }
+                else
+                {
+                    AppendStatus("Identity:");
+                    foreach (var (name, value) in row)
+                    {
+                        AppendStatus("  " + name.PadRight(16) + ": " + value);
+                    }
+                    SetStatus("Identity query succeeded.", isError: false);
+                }
+            }
+            catch (SqlException ex)
+            {
+                SetStatus("Identity query failed (SqlException).", isError: true);
+                AppendStatus("SqlException [" + ex.Number + "]: " + ex.Message);
+            }
+            catch (Exception ex)
+            {
+                SetStatus("Identity query failed.", isError: true);
+                AppendStatus(ex.GetType().Name + ": " + ex.Message);
+            }
+            finally
+            {
+                SetBusy(false, null);
+            }
+        }
+
+        private void btnCopy_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(txtConnectionString.Text))
+            {
+                SetStatus("Nothing to copy. Build the connection string first.", isError: true);
+                return;
+            }
+
+            try
+            {
+                Clipboard.SetText(BuildConnectionString().ConnectionString);
+                SetStatus("Connection string copied to clipboard.", isError: false);
+            }
+            catch (Exception ex)
+            {
+                SetStatus("Failed to copy to clipboard.", isError: true);
+                AppendStatus("ERROR: " + ex.Message);
+            }
+        }
+
+        private void btnClear_Click(object sender, EventArgs e)
+        {
+            txtServer.Clear();
+            txtDatabase.Clear();
+            txtUserId.Clear();
+            txtPassword.Clear();
+            txtConnectionString.Clear();
+            txtStatus.Clear();
+            cmbAuthentication.SelectedItem = SqlAuthenticationMethod.SqlPassword;
+            cmbEncrypt.SelectedIndex = 0;
+            chkTrustServerCertificate.Checked = false;
+            numTimeout.Value = 30;
+            SetStatus("Ready", isError: false);
+        }
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region Connection String Construction
+
+        private SqlConnectionStringBuilder BuildConnectionString()
+        {
+            string server = (txtServer.Text ?? string.Empty).Trim();
+            if (string.IsNullOrEmpty(server))
+            {
+                throw new InvalidOperationException("Server name is required.");
+            }
+
+            SqlAuthenticationMethod authMethod = (SqlAuthenticationMethod)cmbAuthentication.SelectedItem;
+
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder
+            {
+                DataSource = server,
+                ConnectTimeout = (int)numTimeout.Value,
+            };
+
+            string database = (txtDatabase.Text ?? string.Empty).Trim();
+            if (!string.IsNullOrEmpty(database))
+            {
+                builder.InitialCatalog = database;
+            }
+
+            if (authMethod != SqlAuthenticationMethod.NotSpecified)
+            {
+                builder.Authentication = authMethod;
+            }
+
+            if (RequiresUserAndPassword(authMethod))
+            {
+                string userId = (txtUserId.Text ?? string.Empty).Trim();
+                if (string.IsNullOrEmpty(userId))
+                {
+                    throw new InvalidOperationException(
+                        "User ID is required for " + authMethod + " authentication.");
+                }
+
+                builder.UserID = userId;
+                builder.Password = txtPassword.Text ?? string.Empty;
+            }
+            else if (authMethod == SqlAuthenticationMethod.ActiveDirectoryServicePrincipal
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryManagedIdentity
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryMSI
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryInteractive
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryDefault
+                  || authMethod == SqlAuthenticationMethod.ActiveDirectoryWorkloadIdentity)
+            {
+                string userId = (txtUserId.Text ?? string.Empty).Trim();
+                if (!string.IsNullOrEmpty(userId))
+                {
+                    builder.UserID = userId;
+                }
+
+                if (authMethod == SqlAuthenticationMethod.ActiveDirectoryServicePrincipal
+                    && !string.IsNullOrEmpty(txtPassword.Text))
+                {
+                    builder.Password = txtPassword.Text;
+                }
+            }
+
+            string encryptValue = cmbEncrypt.SelectedItem as string ?? EncryptDisplay.Mandatory;
+            switch (encryptValue)
+            {
+                case EncryptDisplay.Mandatory:
+                    builder.Encrypt = SqlConnectionEncryptOption.Mandatory;
+                    break;
+                case EncryptDisplay.Optional:
+                    builder.Encrypt = SqlConnectionEncryptOption.Optional;
+                    break;
+                case EncryptDisplay.Strict:
+                    builder.Encrypt = SqlConnectionEncryptOption.Strict;
+                    break;
+            }
+
+            builder.TrustServerCertificate = chkTrustServerCertificate.Checked;
+
+            return builder;
+        }
+
+        private static bool RequiresUserAndPassword(SqlAuthenticationMethod method)
+        {
+            switch (method)
+            {
+                case SqlAuthenticationMethod.SqlPassword:
+#pragma warning disable CS0618 // Type or member is obsolete
+                case SqlAuthenticationMethod.ActiveDirectoryPassword:
+#pragma warning restore CS0618
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        private static string MaskPassword(SqlConnectionStringBuilder builder)
+        {
+            if (string.IsNullOrEmpty(builder.Password))
+            {
+                return builder.ConnectionString;
+            }
+
+            SqlConnectionStringBuilder copy = new SqlConnectionStringBuilder(builder.ConnectionString)
+            {
+                Password = "********",
+            };
+            return copy.ConnectionString;
+        }
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region UI Helpers
+
+        private void UpdateCredentialFieldsAvailability()
+        {
+            if (cmbAuthentication.SelectedItem == null)
+            {
+                return;
+            }
+
+            SqlAuthenticationMethod method = (SqlAuthenticationMethod)cmbAuthentication.SelectedItem;
+
+            bool userEnabled = method != SqlAuthenticationMethod.ActiveDirectoryIntegrated;
+            bool passwordEnabled = RequiresUserAndPassword(method)
+                || method == SqlAuthenticationMethod.ActiveDirectoryServicePrincipal;
+
+            txtUserId.Enabled = userEnabled;
+            txtPassword.Enabled = passwordEnabled;
+
+            if (!passwordEnabled)
+            {
+                txtPassword.Clear();
+            }
+        }
+
+        private void SetStatus(string text, bool isError)
+        {
+            statusLabel.Text = text;
+            statusLabel.ForeColor = isError ? System.Drawing.Color.Firebrick : System.Drawing.Color.Black;
+        }
+
+        private void AppendStatus(string line)
+        {
+            if (txtStatus.TextLength > 0)
+            {
+                txtStatus.AppendText(Environment.NewLine);
+            }
+            txtStatus.AppendText(line ?? string.Empty);
+        }
+
+        private void SetBusy(bool busy, string statusText)
+        {
+            btnBuild.Enabled = !busy;
+            btnTest.Enabled = !busy;
+            btnCopy.Enabled = !busy;
+            btnClear.Enabled = !busy;
+            btnWhoAmI.Enabled = !busy;
+            Cursor = busy ? Cursors.WaitCursor : Cursors.Default;
+
+            if (statusText != null)
+            {
+                SetStatus(statusText, isError: false);
+            }
+        }
+
+        // Only drops the in-process PCA / TokenCredential maps; MSAL's persistent on-disk cache
+        // and WAM broker accounts are untouched. Sufficient to demo a worker-thread interactive
+        // prompt when the persistent cache has already been cleared (fresh run or no WAM account
+        // bound), and a useful reset between back-to-back connects within a single session.
+        private void MaybeClearTokenCache()
+        {
+            if (!chkClearTokenCache.Checked)
+            {
+                return;
+            }
+
+            ActiveDirectoryAuthenticationProvider.ClearUserTokenCache();
+            AppendStatus("Cleared in-process MSAL token cache.");
+        }
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region Nested Types
+
+        private static class EncryptDisplay
+        {
+            public const string Mandatory = "Mandatory";
+            public const string Optional = "Optional";
+            public const string Strict = "Strict";
+        }
+
+        /// <summary>
+        /// Tiny <see cref="IWin32Window"/> wrapper around a raw HWND captured on the UI thread.
+        /// Used so that MSAL.NET's <c>IWin32WindowFunc</c> callback can safely return a window
+        /// owner from a worker thread without ever touching <see cref="Control.Handle"/> off-UI.
+        /// Only needed on .NET Framework where the legacy <c>SetIWin32WindowFunc</c> API is used.
+        /// </summary>
+#if NETFRAMEWORK
+        private sealed class Win32WindowHandle : IWin32Window
+        {
+            private readonly IntPtr _hwnd;
+            public Win32WindowHandle(IntPtr hwnd) => _hwnd = hwnd;
+            public IntPtr Handle => _hwnd;
+        }
+#endif
+
+        #endregion
+
+        // ──────────────────────────────────────────────────────────────────
+        #region Private Fields
+
+        /// <summary>
+        /// The form's Win32 window handle, captured on the UI thread in the constructor.
+        /// Read from worker threads by the Entra ID provider callbacks to parent MSAL's
+        /// sign-in / WAM broker UI without illegally touching <see cref="Control.Handle"/>.
+        /// </summary>
+        private readonly IntPtr _ownerHwnd;
+
+        #endregion
+    }
+}
diff --git a/doc/apps/AzureSqlConnector/ModeSelectorForm.cs b/doc/apps/AzureSqlConnector/ModeSelectorForm.cs
new file mode 100644
index 0000000000..651412de32
--- /dev/null
+++ b/doc/apps/AzureSqlConnector/ModeSelectorForm.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Microsoft.Data.SqlClient.Samples.AzureSqlConnector
+{
+    /// <summary>
+    /// Choice exposed by <see cref="ModeSelectorForm"/>.
+    /// </summary>
+    internal enum ConnectionMode
+    {
+        /// <summary>
+        /// Use <see cref="MainForm"/>, which calls <c>SqlConnection.OpenAsync()</c> on the UI
+        /// thread. Relies on the WinForms SynchronizationContext to keep the message pump alive.
+        /// </summary>
+        UiThreadOpenAsync,
+
+        /// <summary>
+        /// Use <see cref="MainFormWorker"/>, which calls <c>SqlConnection.Open()</c> inside
+        /// <c>Task.Run</c> on a thread-pool worker. The captured form HWND is passed to MSAL.
+        /// </summary>
+        WorkerThreadOpen,
+    }
+
+    /// <summary>
+    /// Tiny modal dialog shown at startup that lets the user pick which connector form
+    /// (UI-thread async or worker-thread sync) to launch.
+    /// </summary>
+    internal sealed class ModeSelectorForm : Form
+    {
+        private readonly RadioButton _rdoUiThread;
+        private readonly RadioButton _rdoWorker;
+
+        internal ConnectionMode SelectedMode =>
+            _rdoWorker.Checked ? ConnectionMode.WorkerThreadOpen : ConnectionMode.UiThreadOpenAsync;
+
+        internal ModeSelectorForm()
+        {
+            Text = "Azure SQL Connector — Choose Mode";
+            FormBorderStyle = FormBorderStyle.FixedDialog;
+            StartPosition = FormStartPosition.CenterScreen;
+            MaximizeBox = false;
+            MinimizeBox = false;
+            ClientSize = new Size(460, 200);
+
+            Label lblHeader = new Label
+            {
+                AutoSize = false,
+                Text = "Select how SqlConnection.Open should be invoked:",
+                Location = new Point(16, 14),
+                Size = new Size(420, 20),
+                Font = new Font(Font, FontStyle.Bold),
+            };
+
+            _rdoUiThread = new RadioButton
+            {
+                Text = "&UI thread",
+                Location = new Point(20, 42),
+                Size = new Size(420, 20),
+                Checked = true,
+            };
+
+            Label lblUiHint = new Label
+            {
+                AutoSize = false,
+                Text = "    Async/Sync open on the UI thread; SynchronizationContext keeps the form responsive.",
+                Location = new Point(20, 62),
+                Size = new Size(420, 18),
+                ForeColor = SystemColors.GrayText,
+            };
+
+            _rdoWorker = new RadioButton
+            {
+                Text = "&Worker thread",
+                Location = new Point(20, 90),
+                Size = new Size(420, 20),
+            };
+
+            Label lblWorkerHint = new Label
+            {
+                AutoSize = false,
+                Text = "    Sync open on a thread-pool worker; HWND is captured up-front for MSAL.",
+                Location = new Point(20, 110),
+                Size = new Size(420, 18),
+                ForeColor = SystemColors.GrayText,
+            };
+
+            Button btnOk = new Button
+            {
+                Text = "&Launch",
+                DialogResult = DialogResult.OK,
+                Location = new Point(268, 152),
+                Size = new Size(82, 28),
+            };
+
+            Button btnCancel = new Button
+            {
+                Text = "Cancel",
+                DialogResult = DialogResult.Cancel,
+                Location = new Point(358, 152),
+                Size = new Size(82, 28),
+            };
+
+            AcceptButton = btnOk;
+            CancelButton = btnCancel;
+
+            Controls.AddRange(new Control[]
+            {
+                lblHeader,
+                _rdoUiThread, lblUiHint,
+                _rdoWorker,   lblWorkerHint,
+                btnOk, btnCancel,
+            });
+        }
+    }
+}
diff --git a/doc/apps/AzureSqlConnector/Program.cs b/doc/apps/AzureSqlConnector/Program.cs
new file mode 100644
index 0000000000..c4bfad836c
--- /dev/null
+++ b/doc/apps/AzureSqlConnector/Program.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Windows.Forms;
+
+namespace Microsoft.Data.SqlClient.Samples.AzureSqlConnector
+{
+    /// <summary>
+    /// Application entry point for the Azure SQL Connector WinForms test app.
+    /// </summary>
+    internal static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application. Shows a small chooser dialog at startup so
+        /// the user can pick between the UI-thread <see cref="MainForm"/> and the worker-thread
+        /// <see cref="MainFormWorker"/> variant of the connector.
+        /// </summary>
+        [STAThread]
+        private static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+
+            ConnectionMode mode;
+            using (ModeSelectorForm selector = new ModeSelectorForm())
+            {
+                if (selector.ShowDialog() != DialogResult.OK)
+                {
+                    return;
+                }
+                mode = selector.SelectedMode;
+            }
+
+            Form main = mode == ConnectionMode.WorkerThreadOpen
+                ? (Form)new MainFormWorker()
+                : new MainForm();
+
+            Application.Run(main);
+        }
+    }
+}
diff --git a/doc/apps/AzureSqlConnector/README.md b/doc/apps/AzureSqlConnector/README.md
new file mode 100644
index 0000000000..62f100e966
--- /dev/null
+++ b/doc/apps/AzureSqlConnector/README.md
@@ -0,0 +1,137 @@
+# Azure SQL Connector (WinForms)
+
+A small Windows Forms test application that lets a user fill in Azure SQL Database connection
+parameters in a UI, builds the corresponding ADO.NET connection string via
+`SqlConnectionStringBuilder`, and tests connectivity using `Microsoft.Data.SqlClient`.
+
+It is intended as a quick, repeatable scratch tool for manually validating connection-string
+combinations (server / database / authentication mode / encryption / etc.) against an Azure SQL DB
+or SQL Server instance, **and as a manual repro** for the WAM-broker behavior added in this
+branch's `ActiveDirectoryAuthenticationProvider`.
+
+The sample multi-targets:
+
+| TFM              | Purpose                                                                                          |
+| ---------------- | ------------------------------------------------------------------------------------------------ |
+| `net481`         | Exercises the legacy `SetIWin32WindowFunc` API used by .NET Framework callers with WinForms.     |
+| `net10.0-windows` | Exercises the modern `SetParentActivityOrWindowFunc` API used on .NET 8+.                       |
+
+`net10.0-windows` restores and builds cleanly on Linux/macOS hosts even though the resulting
+binary only runs on Windows, so the project no longer needs a separate no-op cross-platform
+fallback.
+
+> **Note:** `SetParentActivityOrWindowFunc` is also available on `net481` and is the
+> recommended API for new code on any framework. The sample wires `net481` up to
+> `SetIWin32WindowFunc` only to keep coverage of that legacy code path; replacing the
+> `SetIWin32WindowFunc(() => this)` call with `SetParentActivityOrWindowFunc(() => this.Handle)`
+> on `net481` works the same way.
+
+## Mode selector
+
+When the app launches it shows a small `ModeSelectorForm` that picks between two top-level forms:
+
+| Mode                               | Form              | What it exercises                                                                                                       |
+| ---------------------------------- | ----------------- | ----------------------------------------------------------------------------------------------------------------------- |
+| **UI thread (`OpenAsync`)**        | `MainForm`        | Calls `SqlConnection.OpenAsync()` on the UI thread so the Windows Forms message pump stays alive during MSAL sign-in.   |
+| **Worker thread (`Open`, sync)**   | `MainFormWorker`  | Calls `SqlConnection.Open()` on a background worker thread; the parent window handle is captured up-front on the UI thread. |
+
+Both forms demonstrate the supported patterns for parenting the WAM broker (or the legacy
+embedded WebView on .NET Framework).
+
+## Form inputs
+
+| Field                      | Maps to connection string keyword               |
+| -------------------------- | ----------------------------------------------- |
+| Server name                | `Data Source`                                   |
+| Database name              | `Initial Catalog` *(only added when non-empty)* |
+| Authentication             | `Authentication` *(SqlAuthenticationMethod)*    |
+| User ID                    | `User ID`                                       |
+| Password                   | `Password`                                      |
+| Encrypt                    | `Encrypt` *(Mandatory / Optional / Strict)*     |
+| Trust server certificate   | `TrustServerCertificate`                        |
+| Connect timeout (s)        | `Connect Timeout`                               |
+
+The **Authentication** dropdown is populated from every member of
+`Microsoft.Data.SqlClient.SqlAuthenticationMethod`. The User ID and Password fields are enabled /
+disabled automatically based on the selected method:
+
+- **SqlPassword** / **ActiveDirectoryPassword** — both User ID and Password are required.
+- **ActiveDirectoryServicePrincipal** — User ID = App (Client) ID, Password = client secret.
+- **ActiveDirectoryManagedIdentity / MSI / Default / Interactive / DeviceCodeFlow / WorkloadIdentity**
+  — User ID is optional (e.g. user-assigned MI client id), Password is disabled.
+- **ActiveDirectoryIntegrated** — credentials come from the OS, both fields disabled.
+
+## Buttons
+
+| Button                  | Action                                                                 |
+| ----------------------- | ---------------------------------------------------------------------- |
+| Build Connection String | Builds the connection string from the form values and displays it.    |
+| Test Connection         | Builds the connection string and opens the connection.                |
+| Copy to Clipboard       | Copies the currently-built connection string to the clipboard.        |
+| Clear All               | Resets every input field to its default state.                         |
+| Who Am I?               | Connects and runs an identity query (`SUSER_SNAME()`, `ORIGINAL_LOGIN()`, `USER_NAME()`, `DB_NAME()`, `@@SPID`, etc.) and prints the results. |
+
+The result pane shows the built connection string with the password masked, the test connection
+outcome (including SQL error number when applicable), and the server version on success.
+
+## Prerequisites
+
+- Visual Studio 2026 (or any IDE / SDK with .NET Framework **4.8.1** Developer Pack installed) for
+  the `net481` target. The `net10.0-windows` target only needs the .NET 10 SDK.
+- Network connectivity to your Azure SQL Database (server firewall must allow your client IP).
+- For Entra ID authentication modes, valid credentials available through Azure CLI / environment
+  variables / managed identity / the WAM broker, depending on the chosen method.
+
+## Build & run
+
+From the project folder:
+
+```pwsh
+dotnet build .\AzureSqlConnector.csproj
+dotnet run --project .\AzureSqlConnector.csproj -f net10.0-windows   # modern WAM API
+dotnet run --project .\AzureSqlConnector.csproj -f net481            # legacy IWin32Window API
+```
+
+Or load `src\Microsoft.Data.SqlClient.slnx` in Visual Studio, set **AzureSqlConnector** as the
+startup project, and press **F5**.
+
+## Example
+
+1. **Server name:** `myserver.database.windows.net`
+2. **Database name:** `MyDb`
+3. **Authentication:** `SqlPassword`
+4. **User ID:** `sqladmin`
+5. **Password:** *your password*
+6. **Encrypt:** `Mandatory`
+7. **Trust server certificate:** unchecked
+8. Click **Test Connection** — the result pane should display
+   `Connected successfully! Server version: 12.00.xxxx`.
+
+## Entra ID parent-window plumbing
+
+For any `ActiveDirectory*` authentication method (especially **ActiveDirectoryInteractive**) the
+app installs an `ActiveDirectoryAuthenticationProvider` and tells it which window should host the
+sign-in UI:
+
+- On **`net481`** the form calls `provider.SetIWin32WindowFunc(() => this)`. This is the legacy
+  API used by .NET Framework callers with the embedded WebView.
+- On **`net10.0-windows`** the form calls
+  `provider.SetParentActivityOrWindowFunc(() => this.Handle)`. This is the modern API that also
+  integrates with the WAM broker on Windows.
+
+The provider is registered for every `SqlAuthenticationMethod.ActiveDirectory*` value at startup.
+
+### Threading patterns
+
+| Form              | Open mode                | Parent window callback                                                                                                                          |
+| ----------------- | ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| `MainForm`        | `OpenAsync` on UI thread | Callback runs on the UI thread when MSAL invokes it, so `this`/`this.Handle` is naturally safe to access.                                       |
+| `MainFormWorker`  | `Open` (sync) on worker  | The form captures `this.Handle` into a field on the UI thread before kicking off the worker; the callback closes over that captured value so it never needs to marshal back. |
+
+Without one of these patterns the WAM broker (or the embedded WebView on .NET Framework) can fail
+to render or stay unresponsive while it waits for the user.
+
+## Notes
+
+- This is a sample / diagnostic tool, **not** a product. It does not persist credentials.
+- From the repo root: `dotnet run --project .\doc\apps\AzureSqlConnector\AzureSqlConnector.csproj`
diff --git a/doc/snippets/Microsoft.Data.SqlClient/ActiveDirectoryAuthenticationProvider.xml b/doc/snippets/Microsoft.Data.SqlClient/ActiveDirectoryAuthenticationProvider.xml
index 36f10a6aab..4dd9f61d5a 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/ActiveDirectoryAuthenticationProvider.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/ActiveDirectoryAuthenticationProvider.xml
@@ -1,4 +1,9 @@
-<docs>
+<!--
+Licensed to the .NET Foundation under one or more agreements.
+The .NET Foundation licenses this file to you under the MIT license.
+See the LICENSE file in the project root for more information.
+-->
+<docs>
   <members name="ActiveDirectoryAuthenticationProvider">
     <ActiveDirectoryAuthenticationProvider>
       <summary>
@@ -74,7 +79,12 @@
         Clears cached user tokens from the token provider.
       </summary>
       <remarks>
-        This will cause interactive authentication prompts to appear again if tokens were previously being obtained from the cache.
+        <para>
+          This will cause interactive authentication prompts to appear again if tokens were previously being obtained from the cache.
+        </para>
+        <para>
+          The driver's per-pool federated-authentication token cache is also cleared, so subsequent <see cref="SqlConnection.Open" /> calls will reacquire fed-auth tokens instead of reusing cached entries.
+        </para>
       </remarks>
     </ClearUserTokenCache>
     <SetDeviceCodeFlowCallback>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/SqlAuthenticationProvider.Internal.cs b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/SqlAuthenticationProvider.Internal.cs
index e0adf34e49..5007384465 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/SqlAuthenticationProvider.Internal.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/SqlAuthenticationProvider.Internal.cs
@@ -59,7 +59,7 @@ static Internal()
 
                 // Look for the manager class.
                 const string className = "Microsoft.Data.SqlClient.SqlAuthenticationProviderManager";
-                var manager = assembly.GetType(className);
+                Type? manager = assembly.GetType(className);
 
                 if (manager is null)
                 {
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/doc/ActiveDirectoryAuthenticationProvider.xml b/src/Microsoft.Data.SqlClient.Extensions/Azure/doc/ActiveDirectoryAuthenticationProvider.xml
index 84b6343497..2b58a8676f 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/doc/ActiveDirectoryAuthenticationProvider.xml
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/doc/ActiveDirectoryAuthenticationProvider.xml
@@ -1,4 +1,4 @@
-<!--
+<!--
 Licensed to the .NET Foundation under one or more agreements.
 The .NET Foundation licenses this file to you under the MIT license.
 See the LICENSE file in the project root for more information.
@@ -14,6 +14,10 @@ See the LICENSE file in the project root for more information.
       <summary>
         Initializes the <see cref="T:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProvider" /> class.
       </summary>
+      <remarks>
+        New code should prefer the <see cref="M:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProvider.#ctor(Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions)"/>
+        overload to avoid adding more constructor overloads as new options are introduced.
+      </remarks>
     </ctor>
     <ctor2>
       <param name="applicationClientId">
@@ -51,6 +55,10 @@ See the LICENSE file in the project root for more information.
           }
         </code>
       </example>
+      <remarks>
+        New code should prefer the <see cref="M:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProvider.#ctor(Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions)"/>
+        overload to avoid adding more constructor overloads as new options are introduced.
+      </remarks>
     </ctor2>
     <ctor3>
       <param name="deviceCodeFlowCallbackMethod">
@@ -62,7 +70,22 @@ See the LICENSE file in the project root for more information.
       <summary>
         Initializes the <see cref="T:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProvider" /> class with the provided device code flow callback method and application client id.
       </summary>
+      <remarks>
+        New code should prefer the <see cref="M:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProvider.#ctor(Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions)"/>
+        overload to avoid adding more constructor overloads as new options are introduced.
+      </remarks>
     </ctor3>
+    <ctorOptions>
+      <param name="options">
+        A <see cref="T:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions" /> instance whose properties initialize the provider. Must not be <see langword="null" />.
+      </param>
+      <summary>
+        Initializes the <see cref="T:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProvider" /> class from a <see cref="T:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions" /> bag. This is the recommended constructor for new code because new options can be added to <c>ActiveDirectoryAuthenticationProviderOptions</c> without forcing breaking changes on callers.
+      </summary>
+      <exception cref="T:System.ArgumentNullException">
+        Thrown when <paramref name="options" /> is <see langword="null" />.
+      </exception>
+    </ctorOptions>
     <AcquireTokenAsync>
       <param name="parameters">
         The Active Directory authentication parameters passed to authentication providers.
@@ -79,7 +102,12 @@ See the LICENSE file in the project root for more information.
         Clears cached user tokens from the token provider.
       </summary>
       <remarks>
-        This will cause interactive authentication prompts to appear again if tokens were previously being obtained from the cache.
+        <para>
+          This will cause interactive authentication prompts to appear again if tokens were previously being obtained from the cache.
+        </para>
+        <para>
+          The driver's per-pool federated-authentication token cache is also cleared, so subsequent <c>SqlConnection.Open</c> calls will reacquire fed-auth tokens instead of reusing cached entries.
+        </para>
       </remarks>
     </ClearUserTokenCache>
     <SetDeviceCodeFlowCallback>
@@ -126,13 +154,19 @@ See the LICENSE file in the project root for more information.
     </SetDeviceCodeFlowCallback>
     <SetParentActivityOrWindowFunc>
       <param name="parentActivityOrWindowFunc">
-        The parent as an object, in order to be used from shared .NET Standard assemblies.
+        A function that returns the parent window/activity object to be used by MSAL for interactive authentication UI.
+        On Windows, return an <see cref="T:System.IntPtr" /> window handle (or an <see cref="T:System.Windows.Forms.IWin32Window" /> on .NET Framework).
+        On Android, return an Activity; on iOS, return a UIViewController (or the platform equivalent).
+        Pass <see langword="null" /> to clear a previously installed callback and revert to the provider's default behavior.
       </param>
       <summary>
-        Sets a reference to the ViewController (if using Xamarin.iOS), Activity (if using Xamarin.Android) IWin32Window or IntPtr (if using .NET Framework). Used for invoking the browser for Active Directory Interactive authentication.
+        Sets a function to return the parent window handle to be used for WAM (Windows Account Manager) broker authentication prompts.
       </summary>
       <remarks>
-        Mandatory to be set only on Android. See https://aka.ms/msal-net-android-activity for further documentation and details.
+        On Windows, this handle is used to parent the WAM broker dialog. If not set, the provider will attempt to automatically detect the console window handle.
+        On non-Windows platforms, this callback is forwarded to MSAL so interactive flows can parent their UI to the host Activity / UIViewController (or platform equivalent).
+
+        Exceptions thrown by <paramref name="parentActivityOrWindowFunc" /> when it is invoked by MSAL are not caught by the provider; they propagate up to the caller of the originating <c>AcquireToken</c> request so that bugs in the callback surface where they are most diagnosable.
       </remarks>
     </SetParentActivityOrWindowFunc>
     <SetIWin32WindowFunc>
@@ -140,8 +174,11 @@ See the LICENSE file in the project root for more information.
         A function to return the current window.
       </param>
       <summary>
-        Sets a reference to the current <see cref="T:System.Windows.Forms.IWin32Window" /> that triggers the browser to be shown. Used to center the browser pop-up onto this window."
+        Sets a reference to the current <see cref="T:System.Windows.Forms.IWin32Window" /> that triggers the browser to be shown. Used to center the browser pop-up onto this window.
       </summary>
+      <remarks>
+        This API exists for .NET Framework callers using the embedded WebView. New code on any framework should prefer <see cref="M:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProvider.SetParentActivityOrWindowFunc(System.Func{System.Object})" />, which works on both .NET Framework and modern .NET and integrates with the WAM broker on Windows.
+      </remarks>
     </SetIWin32WindowFunc>
     <SetAcquireAuthorizationCodeAsyncCallback>
       <param name="acquireAuthorizationCodeAsyncCallback">
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/doc/ActiveDirectoryAuthenticationProviderOptions.xml b/src/Microsoft.Data.SqlClient.Extensions/Azure/doc/ActiveDirectoryAuthenticationProviderOptions.xml
new file mode 100644
index 0000000000..c290947adb
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/doc/ActiveDirectoryAuthenticationProviderOptions.xml
@@ -0,0 +1,34 @@
+<docs>
+    <members name="ActiveDirectoryAuthenticationProviderOptions">
+        <ActiveDirectoryAuthenticationProviderOptions>
+            <summary>
+                Property bag used by the <see cref="M:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProvider.#ctor(Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions)" /> constructor.
+            </summary>
+            <remarks>
+                Prefer this options-bag constructor over the positional-argument overloads in new code. Additional options can be added here in future versions without introducing new constructor overloads.
+                <para>
+                    <see cref="P:Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions.UseWamBroker" /> is a Windows-only setting: it has no effect on non-Windows platforms, where interactive Entra ID flows always use the system browser.
+                </para>
+            </remarks>
+        </ActiveDirectoryAuthenticationProviderOptions>
+        <DeviceCodeFlowCallback>
+            <summary>
+                Optional device-code-flow callback invoked for <c>SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow</c>. 
+                When <see langword="null"/>, the provider's default callback (which writes the device-code instructions to the console) 
+                is used.
+            </summary>
+        </DeviceCodeFlowCallback>
+        <ApplicationClientId>
+            <summary>
+                Optional Entra ID application (client) id. When <see langword="null"/>, the SqlClient first-party application id is used and WAM broker mode is forced on (regardless of <see cref="UseWamBroker"/>) when running on Windows.
+            </summary>
+        </ApplicationClientId>
+        <UseWamBroker>
+            <summary>
+                Windows-only setting to control whether the provider uses the WAM broker for interactive authentication. 
+                Defaults to <see langword="false"/> when you provide a custom <see cref="ApplicationClientId"/>.
+                Otherwise, WAM broker mode is used automatically on Windows.
+            </summary>
+        </UseWamBroker>
+    </members>
+</docs>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.Windows.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.Windows.cs
new file mode 100644
index 0000000000..29ca3e9acb
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.Windows.cs
@@ -0,0 +1,108 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Data.SqlClient;
+
+/// <summary>
+/// Windows-only portion of <see cref="ActiveDirectoryAuthenticationProvider"/>. Kept in a
+/// separate file so the Windows-specific P/Invoke helpers (console-window discovery, root-owner
+/// lookup) live next to the broker plumbing they support. The other half of the partial class
+/// lives in <c>ActiveDirectoryAuthenticationProvider.cs</c> and is fully cross-platform.
+/// </summary>
+/// <remarks>
+/// Responsibilities of this part:
+/// <list type="bullet">
+///   <item><description>
+///     Resolve the parent window handle handed to MSAL's WAM broker (and to the embedded WebView
+///     on .NET Framework) via <c>WithParentActivityOrWindow</c>.
+///   </description></item>
+///   <item><description>
+///     Honor the caller-supplied <c>SetParentActivityOrWindowFunc</c> callback when present, and
+///     fall back to the process console window (resolved via Win32 interop) otherwise.
+///   </description></item>
+/// </list>
+/// </remarks>
+public sealed partial class ActiveDirectoryAuthenticationProvider
+{
+    /// <summary>
+    /// Resolves the parent window handle used to parent MSAL UI (WAM broker dialog on Windows,
+    /// or the embedded WebView on .NET Framework). The boxed return type matches the signature
+    /// MSAL's <c>WithParentActivityOrWindow</c> overload expects.
+    /// </summary>
+    /// <returns>
+    /// The parent window handle, or <see cref="IntPtr.Zero"/> when we are not on Windows or
+    /// when neither a caller-supplied callback nor a discoverable console window is available.
+    /// </returns>
+    /// <remarks>
+    /// <para>
+    /// Exception behavior:
+    /// <list type="bullet">
+    ///   <item><description>
+    ///     Exceptions thrown by the caller-supplied callback installed via
+    ///     <c>SetParentActivityOrWindowFunc</c> are intentionally not caught here; they propagate
+    ///     up through MSAL into the caller of <c>AcquireTokenAsync</c> so that bugs in the
+    ///     callback surface where they are most diagnosable.
+    ///   </description></item>
+    ///   <item><description>
+    ///     The Win32 P/Invokes used to discover the console window (<c>GetConsoleWindow</c>,
+    ///     <c>GetAncestor</c>) are documented by Windows not to throw — they return
+    ///     <c>NULL</c>/<see cref="IntPtr.Zero"/> on failure, which this method treats as
+    ///     "no parent window available".
+    ///   </description></item>
+    /// </list>
+    /// </para>
+    /// </remarks>
+    private IntPtr GetParentWindow()
+    {
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            return IntPtr.Zero;
+        }
+
+        // If the user has provided a custom parent activity/window function, use it. Exceptions
+        // from the user-supplied callback escape to MSAL by design — see method remarks above.
+        if (_parentActivityOrWindowFunc is not null)
+        {
+            object parentWindow = _parentActivityOrWindowFunc();
+            if (parentWindow is IntPtr hwnd)
+            {
+                return hwnd;
+            }
+#if NETFRAMEWORK
+            if (parentWindow is System.Windows.Forms.IWin32Window win32Window)
+            {
+                return win32Window.Handle;
+            }
+#endif
+            if (parentWindow is not null)
+            {
+                throw new InvalidOperationException(
+                    $"{nameof(SetParentActivityOrWindowFunc)} expects the callback to return an " +
+                    "IntPtr window handle" +
+#if NETFRAMEWORK
+                    " (or an IWin32Window on .NET Framework)" +
+#endif
+                    $"; got {parentWindow.GetType().FullName}.");
+            }
+        }
+
+        // Fall back to finding the console window, then getting its root owner. The Win32 calls
+        // are documented to return NULL on failure rather than throwing, so we treat any
+        // IntPtr.Zero return as "no console window available".
+        IntPtr consoleHandle = Interop.Kernel32.GetConsoleWindow();
+        if (consoleHandle != IntPtr.Zero)
+        {
+            IntPtr rootOwner = Interop.User32.GetRootOwner(consoleHandle);
+            if (rootOwner != IntPtr.Zero)
+            {
+                return rootOwner;
+            }
+            return consoleHandle;
+        }
+
+        return IntPtr.Zero;
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
index dfc6199457..7a39bb808f 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
@@ -4,19 +4,21 @@
 
 using System.Collections.Concurrent;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 using Azure.Core;
 using Azure.Identity;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Identity.Client;
+using Microsoft.Identity.Client.Broker;
 using Microsoft.Identity.Client.Extensibility;
 using Microsoft.Data.SqlClient.Internal;
 
 namespace Microsoft.Data.SqlClient;
 
 /// <include file='../doc/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/ActiveDirectoryAuthenticationProvider/*'/>
-public sealed class ActiveDirectoryAuthenticationProvider : SqlAuthenticationProvider
+public sealed partial class ActiveDirectoryAuthenticationProvider : SqlAuthenticationProvider
 {
     /// <summary>
     /// This is a static cache instance meant to hold instances of "PublicClientApplication" mapping to information available in PublicClientAppKey.
@@ -29,12 +31,40 @@ public sealed class ActiveDirectoryAuthenticationProvider : SqlAuthenticationPro
     private static readonly SemaphoreSlim s_tokenCredentialMapModifierSemaphore = new(1, 1);
     private static readonly MemoryCache s_accountPwCache = new MemoryCache(new MemoryCacheOptions());
     private const int s_accountPwCacheTtlInHours = 2;
-    private const string s_nativeClientRedirectUri = "https://login.microsoftonline.com/common/oauth2/nativeclient";
+
+    // SqlClient's first-party Entra ID application id. When the provider is constructed without
+    // a caller-supplied application id (or with this id explicitly), WAM broker mode is forced on
+    // because the corresponding app registration is configured for the WAM broker redirect URI.
+    private const string s_sqlClientApplicationId = "2fd908ad-0664-4344-b9be-cd3e8b574c38";
+
+    // MSAL redirect URI used when WAM brokered authentication is in effect on Windows. MSAL
+    // expects the suffix to match the client id of the registered application.
+    private const string s_wamBrokerRedirectUriPrefix = "ms-appx-web://microsoft.aad.brokerplugin/";
+
+    // Non-broker redirect URI used on .NET Framework when WAM is not in use (legacy embedded
+    // WebView path).
+    private const string s_windowsNativeRedirectUri = "https://login.microsoftonline.com/common/oauth2/nativeclient";
+
+    // Loopback redirect URI used by MSAL's system browser flow on non-Windows platforms and on
+    // .NET (non-framework) Windows without WAM.
+    private const string s_systemBrowserRedirectUri = "http://localhost";
+
+    // Suffix MSAL requires on Entra ID resource scopes (e.g. "https://database.windows.net/.default").
     private const string s_defaultScopeSuffix = "/.default";
+
+    // The Entra ID application client id used by this provider instance. Defaults to the SqlClient
+    // first-party app id; a caller can override it via the Options-pattern constructor or the
+    // single-string overload.
+    private readonly string _applicationClientId = s_sqlClientApplicationId;
+
+    // True when this provider should enable the Windows Account Manager (WAM) broker for
+    // interactive Entra ID flows on Windows. Always true for the SqlClient first-party app id;
+    // for caller-supplied app ids, opt-in via the Options-pattern constructor.
+    private readonly bool _useWamBroker = false;
+
     private readonly string _type = typeof(ActiveDirectoryAuthenticationProvider).Name;
     private Func<DeviceCodeResult, Task> _deviceCodeFlowCallback;
     private ICustomWebUi? _customWebUI = null;
-    private readonly string _applicationClientId = "2fd908ad-0664-4344-b9be-cd3e8b574c38";
 
     // The MSAL error code that indicates the action should be retried.
     //
@@ -43,26 +73,58 @@ public sealed class ActiveDirectoryAuthenticationProvider : SqlAuthenticationPro
 
     /// <include file='../doc/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/ctor/*'/>
     public ActiveDirectoryAuthenticationProvider()
-        : this(DefaultDeviceFlowCallback)
+        : this(new ActiveDirectoryAuthenticationProviderOptions())
     {
     }
 
     /// <include file='../doc/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/ctor2/*'/>
     public ActiveDirectoryAuthenticationProvider(string applicationClientId)
-        : this(DefaultDeviceFlowCallback, applicationClientId)
+        : this(new ActiveDirectoryAuthenticationProviderOptions { ApplicationClientId = applicationClientId })
     {
     }
 
     /// <include file='../doc/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/ctor3/*'/>
     public ActiveDirectoryAuthenticationProvider(Func<DeviceCodeResult, Task> deviceCodeFlowCallbackMethod, string? applicationClientId = null)
+        : this(new ActiveDirectoryAuthenticationProviderOptions
+        {
+            DeviceCodeFlowCallback = deviceCodeFlowCallbackMethod,
+            ApplicationClientId = applicationClientId,
+        })
+    {
+    }
+
+    /// <include file='../doc/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/ctorOptions/*'/>
+    public ActiveDirectoryAuthenticationProvider(ActiveDirectoryAuthenticationProviderOptions options)
     {
-        _deviceCodeFlowCallback = deviceCodeFlowCallbackMethod;
-        if (applicationClientId is not null)
+        if (options is null)
         {
-            _applicationClientId = applicationClientId;
+            throw new ArgumentNullException(nameof(options));
         }
+
+        _deviceCodeFlowCallback = options.DeviceCodeFlowCallback ?? DefaultDeviceFlowCallback;
+        if (options.ApplicationClientId is not null)
+        {
+            _applicationClientId = options.ApplicationClientId;
+        }
+        // WAM broker mode is always enabled for the SqlClient first-party application id (its
+        // app registration is configured for the WAM broker redirect URI). For a caller-supplied
+        // application id, WAM is opt-in via ProviderOptions.UseWamBroker.
+        _useWamBroker = _applicationClientId == s_sqlClientApplicationId || options.UseWamBroker;
     }
 
+    /// <summary>
+    /// Indicates whether this provider instance has the Windows Account Manager (WAM) broker
+    /// enabled for interactive Entra ID flows on Windows. Exposed as <c>internal</c> for tests.
+    /// </summary>
+    internal bool UseWamBroker => _useWamBroker;
+
+    /// <summary>
+    /// The Entra ID application client id used by this provider instance. Exposed as <c>internal</c> for tests.
+    /// The client id is used in the redirect URI when WAM broker mode is enabled, so it must match the client id configured 
+    /// in the app registration for the Entra ID application to successfully broker with WAM on Windows.
+    /// </summary>
+    internal string ApplicationClientId => _applicationClientId;
+
     /// <include file='../doc/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/ClearUserTokenCache/*'/>
     public static void ClearUserTokenCache()
     {
@@ -114,10 +176,27 @@ public override void BeforeUnload(SqlAuthenticationMethod authentication)
     #if NETFRAMEWORK
     private Func<System.Windows.Forms.IWin32Window>? _iWin32WindowFunc = null;
 
+    // @TODO: deprecate SetIWin32WindowFunc. It is redundant with SetParentActivityOrWindowFunc:
+    // callers can return an IWin32Window from the Func<object> callback and GetParentWindow()
+    // already unwraps it to an HWND on .NET Framework. Keeping both APIs also splits the
+    // PublicClientAppKey cache (IWin32WindowFunc is part of its equality), so the same logical
+    // identity ends up with two IPublicClientApplication instances depending on which setter
+    // the caller used. Mark [Obsolete] in a future release once we have a migration window.
+    
     /// <include file='../doc/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/SetIWin32WindowFunc/*'/>
     public void SetIWin32WindowFunc(Func<System.Windows.Forms.IWin32Window> iWin32WindowFunc) => _iWin32WindowFunc = iWin32WindowFunc;
     #endif
 
+    private Func<object>? _parentActivityOrWindowFunc = null;
+
+    /// <include file='../doc/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/SetParentActivityOrWindowFunc/*'/>
+    public void SetParentActivityOrWindowFunc(Func<object>? parentActivityOrWindowFunc)
+    {
+        // Passing null clears a previously-installed callback (and reverts the provider to its
+        // automatic console-window fallback on Windows).
+        _parentActivityOrWindowFunc = parentActivityOrWindowFunc;
+    }
+
     /// <include file='../doc/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/AcquireTokenAsync/*'/>
     public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenticationParameters parameters)
     {
@@ -216,20 +295,24 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
             }
 
             /*
-                * Today, MSAL.NET uses another redirect URI by default in desktop applications that run on Windows
-                * (urn:ietf:wg:oauth:2.0:oob). In the future, we'll want to change this default, so we recommend
-                * that you use https://login.microsoftonline.com/common/oauth2/nativeclient.
+                * For the remaining Active Directory authentication methods, we use MSAL.NET to acquire tokens.
+                * To do that, we need to construct a PublicClientApplication instance.
                 *
-                * https://docs.microsoft.com/en-us/azure/active-directory/develop/scenario-desktop-app-registration#redirect-uris
-                */
-            string redirectUri = s_nativeClientRedirectUri;
-
-            #if NETSTANDARD
-            if (parameters.AuthenticationMethod != SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow)
-            {
-                redirectUri = "http://localhost";
-            }
-            #endif
+                * With WAM broker support in MSAL enabled, on Windows we use a fixed redirect URI in the format
+                * "ms-appx-web://microsoft.aad.brokerplugin/{clientId}" where {clientId} is the client ID configured for this provider
+                * (by default SqlClient's first-party app id, but it can be overridden via the constructor).
+                * This is required for MSAL to correctly route the authentication request to the WAM broker and for WAM to route the response back to MSAL.
+                *
+                * This means the Entra ID app registration for that client ID must include the above redirect URI to use WAM brokered authentication on Windows.
+            */
+            string redirectUri = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                ? (_useWamBroker ? s_wamBrokerRedirectUriPrefix + _applicationClientId
+                #if NETFRAMEWORK
+                    : s_windowsNativeRedirectUri)
+                #else
+                    : s_systemBrowserRedirectUri)
+                #endif
+                : s_systemBrowserRedirectUri;
 
             PublicClientAppKey pcaKey =
             #if NETFRAMEWORK
@@ -251,7 +334,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
                     // as obsolete in MSAL.NET but it is still a supported way
                     // to acquire tokens for Active Directory Integrated
                     // authentication.
-                    var builder =
+                    AcquireTokenByIntegratedWindowsAuthParameterBuilder builder =
                         #pragma warning disable CS0618 // Type or member is obsolete
                         app.AcquireTokenByIntegratedWindowsAuth(scopes)
                         #pragma warning restore CS0618 // Type or member is obsolete
@@ -505,7 +588,7 @@ private static async Task<AuthenticationResult> AcquireTokenInteractiveDeviceFlo
                 // separate process. MSAL does not have control over this
                 // browser, but once the user finishes authentication, the web
                 // page is redirected in such a way that MSAL can intercept the
-                // Uri.  MSAL cannot detect if the user navigates away or simply
+                // Uri. MSAL cannot detect if the user navigates away or simply
                 // closes the browser. Apps using this technique are encouraged
                 // to define a timeout (via CancellationToken). We recommend a
                 // timeout of at least a few minutes, to take into account cases
@@ -552,10 +635,19 @@ private static async Task<AuthenticationResult> AcquireTokenInteractiveDeviceFlo
             }
             else
             {
+                // Device Code Flow needs minutes for the user to navigate to the verification
+                // URL and enter the user code. The outer per-request CTS inherits the
+                // SqlConnection's Connect Timeout (default 15s) and would cancel MSAL long
+                // before the user can finish, surfacing as "The operation was canceled."
+                // Use a dedicated CTS with the typical AAD user-code lifetime as the cap,
+                // mirroring the pattern used for ActiveDirectoryInteractive above.
+                using CancellationTokenSource ctsDeviceFlow = new();
+                ctsDeviceFlow.CancelAfter(TimeSpan.FromMinutes(3)); // 3 minutes
+
                 return await app.AcquireTokenWithDeviceCode(scopes,
                     deviceCodeResult => deviceCodeFlowCallback(deviceCodeResult))
                     .WithCorrelationId(connectionId)
-                    .ExecuteAsync(cancellationToken: cts.Token)
+                    .ExecuteAsync(cancellationToken: ctsDeviceFlow.Token)
                     .ConfigureAwait(false);
             }
         }
@@ -724,12 +816,44 @@ private IPublicClientApplication CreateClientAppInstance(PublicClientAppKey publ
             //      tenant.
             .WithAuthority(publicClientAppKey.Authority);
 
-        #if NETFRAMEWORK
-        if (publicClientAppKey.IWin32WindowFunc is not null)
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            builder.WithParentActivityOrWindow(publicClientAppKey.IWin32WindowFunc);
+            if (_useWamBroker)
+            {
+                // Enable WAM broker on Windows for all supported authentication modes.
+                // The broker provides enhanced security by enabling device-based Conditional Access
+                // policies through the Windows Account Manager (WAM).
+                builder.WithBroker(new BrokerOptions(BrokerOptions.OperatingSystems.Windows));
+            }
+
+            // Set the parent window handle for broker UI.
+            // On .NET Framework, prefer the IWin32WindowFunc if provided by the caller.
+            #if NETFRAMEWORK
+            if (publicClientAppKey.IWin32WindowFunc is not null)
+            {
+                builder.WithParentActivityOrWindow(publicClientAppKey.IWin32WindowFunc);
+            }
+            else
+            {
+                builder.WithParentActivityOrWindow(() => (object)GetParentWindow());
+            }
+            #else
+            builder.WithParentActivityOrWindow(() => (object)GetParentWindow());
+            #endif
+        }
+        else
+        {
+            // Non-Windows (Android / iOS / MAUI on .NET). Forward the caller-supplied callback
+            // to MSAL so interactive flows can parent their UI to the host Activity /
+            // UIViewController. WAM broker remains Windows-only and is intentionally skipped.
+            // The callback is snapshotted at PCA build time; callers who update the callback
+            // after the PCA is cached must invoke ClearUserTokenCache() to pick up the change.
+            Func<object>? parentActivityOrWindowFunc = _parentActivityOrWindowFunc;
+            if (parentActivityOrWindowFunc is not null)
+            {
+                builder.WithParentActivityOrWindow(parentActivityOrWindowFunc);
+            }
         }
-        #endif
 
         return builder.Build();
     }
@@ -836,13 +960,13 @@ public override bool Equals(object? obj)
         {
             if (obj != null && obj is PublicClientAppKey pcaKey)
             {
-                return (string.CompareOrdinal(Authority, pcaKey.Authority) == 0
+                return string.CompareOrdinal(Authority, pcaKey.Authority) == 0
                     && string.CompareOrdinal(RedirectUri, pcaKey.RedirectUri) == 0
                     && string.CompareOrdinal(ApplicationClientId, pcaKey.ApplicationClientId) == 0
                     #if NETFRAMEWORK
                     && IWin32WindowFunc == pcaKey.IWin32WindowFunc
                     #endif
-                );
+                ;
             }
             return false;
         }
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProviderOptions.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProviderOptions.cs
new file mode 100644
index 0000000000..1573eb7f55
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProviderOptions.cs
@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Identity.Client;
+
+namespace Microsoft.Data.SqlClient
+{
+    /// <include file='../doc/ActiveDirectoryAuthenticationProviderOptions.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProviderOptions"]/*'/>
+    public sealed class ActiveDirectoryAuthenticationProviderOptions
+    {
+        /// <include file='../doc/ActiveDirectoryAuthenticationProviderOptions.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProviderOptions"]/DeviceCodeFlowCallback/*'/>
+        public Func<DeviceCodeResult, Task>? DeviceCodeFlowCallback { get; set; }
+
+        /// <include file='../doc/ActiveDirectoryAuthenticationProviderOptions.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProviderOptions"]/ApplicationClientId/*'/>
+        public string? ApplicationClientId { get; set; }
+        
+        /// <include file='../doc/ActiveDirectoryAuthenticationProviderOptions.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProviderOptions"]/UseWamBroker/*'/>
+        public bool UseWamBroker { get; set; }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
index dddf5673f9..b9a3b82c27 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
@@ -94,6 +94,7 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <!-- Explicitly depend on the same version of Microsoft.Identity.Client as SqlClient. -->
     <PackageReference Include="Microsoft.Identity.Client" />
+    <PackageReference Include="Microsoft.Identity.Client.Broker" />
   </ItemGroup>
 
   <!-- CodeGen Targets ================================================= -->
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Interop/Interop.GetAncestor.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Interop/Interop.GetAncestor.cs
new file mode 100644
index 0000000000..af255844fc
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Interop/Interop.GetAncestor.cs
@@ -0,0 +1,42 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Data.SqlClient;
+
+/// <summary>
+/// Win32 P/Invoke wrappers used by <see cref="ActiveDirectoryAuthenticationProvider" /> for
+/// console-window discovery. Follows the .NET runtime's <c>Interop</c> convention: one Win32
+/// import per file, grouped into a nested <c>Interop.&lt;module&gt;</c> static class that mirrors
+/// the Win32 DLL it targets. Only the <c>internal</c> helper is exposed; the raw
+/// <c>DllImport</c> stays private.
+/// </summary>
+internal static partial class Interop
+{
+    internal static partial class User32
+    {
+        /// <summary>
+        /// <c>GA_ROOTOWNER</c> flag value for <c>GetAncestor</c> — "Retrieves the owned root
+        /// window by walking the chain of parent and owner windows returned by <c>GetParent</c>."
+        /// </summary>
+        private const uint GA_ROOTOWNER = 3;
+
+        /// <summary>
+        /// Raw <c>user32!GetAncestor</c> P/Invoke. Documented by Windows to return
+        /// <see cref="IntPtr.Zero" /> rather than throw when the input handle is invalid.
+        /// </summary>
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetAncestor(IntPtr hwnd, uint gaFlags);
+
+        /// <summary>
+        /// Walks the parent/owner chain of <paramref name="hwnd" /> and returns the root owner
+        /// window, or <see cref="IntPtr.Zero" /> when none can be found.
+        /// </summary>
+        internal static IntPtr GetRootOwner(IntPtr hwnd)
+        {
+            return GetAncestor(hwnd, GA_ROOTOWNER);
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Interop/Interop.GetConsoleWindow.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Interop/Interop.GetConsoleWindow.cs
new file mode 100644
index 0000000000..4638e1458d
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Interop/Interop.GetConsoleWindow.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Data.SqlClient;
+
+/// <summary>
+/// Win32 P/Invoke wrappers used by <see cref="ActiveDirectoryAuthenticationProvider" /> for
+/// console-window discovery. Follows the .NET runtime's <c>Interop</c> convention: one Win32
+/// import per file, grouped into a nested <c>Interop.&lt;module&gt;</c> static class that mirrors
+/// the Win32 DLL it targets.
+/// </summary>
+internal static partial class Interop
+{
+    internal static partial class Kernel32
+    {
+        /// <summary>
+        /// Raw <c>kernel32!GetConsoleWindow</c> P/Invoke. Documented by Windows to return
+        /// <see cref="IntPtr.Zero" /> when the calling process is not attached to a console
+        /// (and to never throw).
+        /// </summary>
+        [DllImport("kernel32.dll")]
+        internal static extern IntPtr GetConsoleWindow();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADAuthenticationTests.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADAuthenticationTests.cs
index 5c7572ec84..e90dcce506 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADAuthenticationTests.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADAuthenticationTests.cs
@@ -10,6 +10,7 @@
 namespace Microsoft.Data.SqlClient.Extensions.Azure.Test;
 
 // These tests were moved from MDS FunctionalTests AADAuthenticationTests.cs.
+[Collection("SqlAuthenticationProvider")]
 public class AADAuthenticationTests
 {
     [Fact]
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs
index 8c4006c5b4..5dd3ac336e 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs
@@ -26,120 +26,6 @@ public static void KustoDatabaseTest()
         Assert.Equal(System.Data.ConnectionState.Open, connection.State);
     }
 
-    [ConditionalFact(
-        typeof(Config),
-        nameof(Config.HasPasswordConnectionString))]
-    public static void AADPasswordWithWrongPassword()
-    {
-        string[] credKeys = { "Password", "PWD" };
-        string connStr = RemoveKeysInConnStr(Config.PasswordConnectionString, credKeys) + "Password=TestPassword;";
-
-        Assert.Throws<SqlException>(() => ConnectAndDisconnect(connStr));
-
-        // We cannot verify error message with certainty as driver may cache token from other tests for current user
-        // and error message may change accordingly.
-    }
-
-    [ConditionalFact(
-        typeof(Config),
-        nameof(Config.HasPasswordConnectionString))]
-    public static void TestADPasswordAuthentication()
-    {
-        // Connect to Azure DB with password and retrieve user name.
-        using (SqlConnection conn = new SqlConnection(Config.PasswordConnectionString))
-        {
-            conn.Open();
-            using (SqlCommand sqlCommand = new SqlCommand
-            (
-                cmdText: $"SELECT SUSER_SNAME();",
-                connection: conn,
-                transaction: null
-            ))
-            {
-                string customerId = (string)sqlCommand.ExecuteScalar();
-                string expected = RetrieveValueFromConnStr(Config.PasswordConnectionString, new string[] { "User ID", "UID" });
-                Assert.Equal(expected, customerId);
-            }
-        }
-    }
-
-    [ConditionalFact(
-        typeof(Config),
-        nameof(Config.HasPasswordConnectionString))]
-    public static void EmptyPasswordInConnStrAADPassword()
-    {
-        // connection fails with expected error message.
-        string[] pwdKey = { "Password", "PWD" };
-        string connStr = RemoveKeysInConnStr(Config.PasswordConnectionString, pwdKey) + "Password=;";
-        SqlException e = Assert.Throws<SqlException>(() => ConnectAndDisconnect(connStr));
-
-        string? user = FetchKeyInConnStr(Config.PasswordConnectionString, new string[] { "User Id", "UID" });
-        string expectedMessage = string.Format("Failed to authenticate the user {0} in Active Directory (Authentication=ActiveDirectoryPassword).", user);
-        Assert.Contains(expectedMessage, e.Message);
-    }
-
-    [ConditionalFact(
-        typeof(Config),
-        nameof(Config.OnWindows),
-        nameof(Config.HasPasswordConnectionString))]
-    public static void EmptyCredInConnStrAADPassword()
-    {
-        // connection fails with expected error message.
-        string[] removeKeys = { "User ID", "Password", "UID", "PWD" };
-        string connStr = RemoveKeysInConnStr(Config.PasswordConnectionString, removeKeys) + "User ID=; Password=;";
-        SqlException e = Assert.Throws<SqlException>(() => ConnectAndDisconnect(connStr));
-
-        string expectedMessage = "Failed to authenticate the user  in Active Directory (Authentication=ActiveDirectoryPassword).";
-        Assert.Contains(expectedMessage, e.Message);
-    }
-
-    [ConditionalFact(
-        typeof(Config),
-        nameof(Config.OnUnix),
-        nameof(Config.HasPasswordConnectionString))]
-    public static void EmptyCredInConnStrAADPasswordAnyUnix()
-    {
-        // connection fails with expected error message.
-        string[] removeKeys = { "User ID", "Password", "UID", "PWD" };
-        string connStr = RemoveKeysInConnStr(Config.PasswordConnectionString, removeKeys) + "User ID=; Password=;";
-        SqlException e = Assert.Throws<SqlException>(() => ConnectAndDisconnect(connStr));
-
-        string expectedMessage = "MSAL cannot determine the username (UPN) of the currently logged in user.For Integrated Windows Authentication and Username/Password flows, please use .WithUsername() before calling ExecuteAsync().";
-        Assert.Contains(expectedMessage, e.Message);
-    }
-
-    [ConditionalFact(
-        typeof(Config),
-        nameof(Config.HasPasswordConnectionString))]
-    public static void AADPasswordWithInvalidUser()
-    {
-        // connection fails with expected error message.
-        string[] removeKeys = { "User ID", "UID" };
-        string user = "testdotnet@domain.com";
-        string connStr = RemoveKeysInConnStr(Config.PasswordConnectionString, removeKeys) + $"User ID={user}";
-        SqlException e = Assert.Throws<SqlException>(() => ConnectAndDisconnect(connStr));
-
-        string expectedMessage = string.Format("Failed to authenticate the user {0} in Active Directory (Authentication=ActiveDirectoryPassword).", user);
-        Assert.Contains(expectedMessage, e.Message);
-    }
-
-    [ConditionalFact(
-        typeof(Config),
-        nameof(Config.HasPasswordConnectionString))]
-    public static void NoCredentialsActiveDirectoryPassword()
-    {
-        // test Passes with correct connection string.
-        ConnectAndDisconnect(Config.PasswordConnectionString);
-
-        // connection fails with expected error message.
-        string[] credKeys = { "User ID", "Password", "UID", "PWD" };
-        string connStrWithNoCred = RemoveKeysInConnStr(Config.PasswordConnectionString, credKeys);
-        InvalidOperationException e = Assert.Throws<InvalidOperationException>(() => ConnectAndDisconnect(connStrWithNoCred));
-
-        string expectedMessage = "Either Credential or both 'User ID' and 'Password' (or 'UID' and 'PWD') connection string keywords must be specified, if 'Authentication=Active Directory Password'.";
-        Assert.Contains(expectedMessage, e.Message);
-    }
-
     [ConditionalFact(
         typeof(Config),
         nameof(Config.HasPasswordConnectionString),
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs
index cec4721b95..1f0587685e 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs
@@ -40,6 +40,7 @@ internal static class Config
     internal static bool DebugEmit { get; } = false;
     internal static bool IntegratedSecuritySupported { get; } = false;
     internal static bool ManagedIdentitySupported { get; } = false;
+    // @TODO Remove PasswordConnectionString from config; AAD Password auth is deprecated
     internal static string PasswordConnectionString { get; } = string.Empty;
     internal static string ServicePrincipalId { get; } = string.Empty;
     internal static string ServicePrincipalSecret { get; } = string.Empty;
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/DefaultAuthProviderTests.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/DefaultAuthProviderTests.cs
index 84d32651d5..fa426141c9 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/DefaultAuthProviderTests.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/DefaultAuthProviderTests.cs
@@ -4,6 +4,7 @@
 
 namespace Microsoft.Data.SqlClient.Extensions.Azure.Test;
 
+[Collection("SqlAuthenticationProvider")]
 public class DefaultAuthProviderTests
 {
     // Verify that our auth provider has been installed for all AAD/Entra
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/SqlAuthenticationProviderCollection.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/SqlAuthenticationProviderCollection.cs
new file mode 100644
index 0000000000..2bf23f7873
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/SqlAuthenticationProviderCollection.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Extensions.Azure.Test;
+
+/// <summary>
+/// Defines a test collection that serializes execution of test classes
+/// which mutate the global <see cref="SqlAuthenticationProvider"/> registry.
+/// </summary>
+[CollectionDefinition("SqlAuthenticationProvider")]
+public class SqlAuthenticationProviderCollection
+{
+}
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/WamBrokerTests.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/WamBrokerTests.cs
new file mode 100644
index 0000000000..9b2aa5dcf7
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/WamBrokerTests.cs
@@ -0,0 +1,316 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Reflection;
+
+namespace Microsoft.Data.SqlClient.Extensions.Azure.Test;
+
+[Collection("SqlAuthenticationProvider")]
+public class WamBrokerTests
+{
+    // The SqlClient first-party application client id that is hard-coded in the provider.
+    private const string SqlClientApplicationId = "2fd908ad-0664-4344-b9be-cd3e8b574c38";
+
+    // A fixed, deterministic stand-in for a caller-supplied application id. Hard-coded (instead
+    // of Guid.NewGuid()) so test outcomes don't depend on RNG and so a single point asserts
+    // that this value differs from the SqlClient first-party id.
+    private const string TestCustomAppId = "11111111-2222-3333-4444-555555555555";
+
+    // Reads the private _parentActivityOrWindowFunc field. Used to assert downstream effects
+    // of SetParentActivityOrWindowFunc without triggering a live MSAL flow.
+    private static Func<object>? GetParentActivityOrWindowFunc(ActiveDirectoryAuthenticationProvider provider)
+    {
+        FieldInfo? field = typeof(ActiveDirectoryAuthenticationProvider).GetField(
+            "_parentActivityOrWindowFunc",
+            BindingFlags.Instance | BindingFlags.NonPublic);
+        Assert.NotNull(field);
+        return (Func<object>?)field!.GetValue(provider);
+    }
+
+    /// <summary>
+    /// A <see langword="null"/> callback is treated as "clear any previously installed callback"
+    /// and must not throw. This is a deliberate API contract change from the original
+    /// <see cref="ArgumentNullException"/> behavior so callers can opt out without recreating
+    /// the provider. Asserts the underlying field is reset to <see langword="null"/> so the
+    /// provider's downstream consumer (MSAL parameters builder) sees the cleared state.
+    /// </summary>
+    [Fact]
+    public void SetParentActivityOrWindowFunc_Null_ClearsCallback()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider();
+        Func<object> first = () => IntPtr.Zero;
+        provider.SetParentActivityOrWindowFunc(first);
+        Assert.Same(first, GetParentActivityOrWindowFunc(provider));
+
+        provider.SetParentActivityOrWindowFunc(null);
+        Assert.Null(GetParentActivityOrWindowFunc(provider));
+    }
+
+    /// <summary>
+    /// The constructor uses the SqlClient first-party application id, which always
+    /// enables WAM broker mode regardless of any opt-in flag.
+    /// </summary>
+    [Fact]
+    public void Ctor_ApplicationClientId_EnablesWamBroker()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(SqlClientApplicationId);
+        Assert.Equal(SqlClientApplicationId, provider.ApplicationClientId);
+        Assert.True(provider.UseWamBroker,
+            "Constructor with SqlClient first-party application id must enable WAM broker.");
+    }
+
+    /// <summary>
+    /// The parameterless constructor uses the SqlClient first-party application id, which always
+    /// enables WAM broker mode regardless of any opt-in flag.
+    /// </summary>
+    [Fact]
+    public void Ctor_Default_EnablesWamBroker()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider();
+        Assert.Equal(SqlClientApplicationId, provider.ApplicationClientId);
+        Assert.True(provider.UseWamBroker,
+            "Default ctor must enable WAM broker (uses SqlClient first-party application id).");
+    }
+
+    /// <summary>A caller-supplied application id without explicit opt-in must NOT enable WAM broker.</summary>
+    [Fact]
+    public void Ctor_AppClientId_DefaultsUseWamBrokerToFalse()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(TestCustomAppId);
+
+        Assert.Equal(TestCustomAppId, provider.ApplicationClientId);
+        Assert.False(provider.UseWamBroker,
+            "Custom application id without useWamBroker=true must keep WAM broker disabled.");
+    }
+
+    /// <summary>
+    /// Mirrors the previous test for the <see cref="ActiveDirectoryAuthenticationProviderOptions"/>
+    /// constructor: a caller (or app.config) that sets only <c>ApplicationClientId</c> and skips
+    /// <c>UseWamBroker</c> must get the documented default of <see langword="false"/>. This is
+    /// the contract <c>SqlAuthenticationProviderManager</c> relies on when reflecting onto the
+    /// Options ctor and only forwarding the properties that were explicitly configured.
+    /// </summary>
+    [Fact]
+    public void Ctor_Options_AppClientIdOnly_DefaultsUseWamBrokerToFalse()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(
+            new ActiveDirectoryAuthenticationProviderOptions
+            {
+                ApplicationClientId = TestCustomAppId,
+                // UseWamBroker intentionally left at its default (false).
+            });
+
+        Assert.Equal(TestCustomAppId, provider.ApplicationClientId);
+        Assert.False(provider.UseWamBroker,
+            "Options ctor with ApplicationClientId set and UseWamBroker omitted must keep WAM broker disabled.");
+    }
+
+    /// <summary>
+    /// Passing the SqlClient first-party application id to the single-string constructor must
+    /// enable WAM broker. The first-party app id is hard-wired to the WAM broker redirect URI,
+    /// so callers that opt into it explicitly should get the same behavior as the parameterless
+    /// constructor.
+    /// </summary>
+    [Fact]
+    public void Ctor_AppClientId_SqlClientId_EnablesWamBroker()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(SqlClientApplicationId);
+
+        Assert.Equal(SqlClientApplicationId, provider.ApplicationClientId);
+        Assert.True(provider.UseWamBroker,
+            "Single-string ctor with the SqlClient first-party id must enable WAM broker.");
+    }
+
+    /// <summary>A caller-supplied application id with explicit opt-in must enable WAM broker.</summary>
+    [Fact]
+    public void Ctor_AppClientId_UseWamBrokerTrue_EnablesWamBroker()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(
+            new ActiveDirectoryAuthenticationProviderOptions
+            {
+                ApplicationClientId = TestCustomAppId,
+                UseWamBroker = true,
+            });
+
+        Assert.Equal(TestCustomAppId, provider.ApplicationClientId);
+        Assert.True(provider.UseWamBroker,
+            "Custom application id with UseWamBroker=true must enable WAM broker.");
+    }
+
+    /// <summary>A caller-supplied application id with explicit opt-out keeps WAM broker disabled.</summary>
+    [Fact]
+    public void Ctor_AppClientId_UseWamBrokerFalse_DisablesWamBroker()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(
+            new ActiveDirectoryAuthenticationProviderOptions
+            {
+                ApplicationClientId = TestCustomAppId,
+                UseWamBroker = false,
+            });
+
+        Assert.Equal(TestCustomAppId, provider.ApplicationClientId);
+        Assert.False(provider.UseWamBroker);
+    }
+
+    /// <summary>
+    /// Even when the SqlClient first-party application id is passed explicitly with
+    /// <c>UseWamBroker=false</c>, WAM broker mode must remain enabled because the first-party
+    /// app id is hard-wired to the WAM broker redirect URI. This guards the OR-condition in
+    /// the provider's constructor.
+    /// </summary>
+    [Fact]
+    public void Ctor_SqlClientAppIdExplicit_UseWamBrokerFalse_StillEnablesWamBroker()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(
+            new ActiveDirectoryAuthenticationProviderOptions
+            {
+                ApplicationClientId = SqlClientApplicationId,
+                UseWamBroker = false,
+            });
+
+        Assert.Equal(SqlClientApplicationId, provider.ApplicationClientId);
+        Assert.True(provider.UseWamBroker,
+            "SqlClient first-party application id must always enable WAM broker, regardless of the UseWamBroker option.");
+    }
+
+    /// <summary>
+    /// Passing a device-code callback together with a custom application id and
+    /// <c>UseWamBroker=true</c> via <see cref="ActiveDirectoryAuthenticationProvider.ProviderOptions"/>
+    /// must enable WAM broker mode.
+    /// </summary>
+    [Fact]
+    public void Ctor_WithDeviceCodeCallback_UseWamBrokerTrue_EnablesWamBroker()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(
+            new ActiveDirectoryAuthenticationProviderOptions
+            {
+                DeviceCodeFlowCallback = static _ => Task.CompletedTask,
+                ApplicationClientId = TestCustomAppId,
+                UseWamBroker = true,
+            });
+
+        Assert.Equal(TestCustomAppId, provider.ApplicationClientId);
+        Assert.True(provider.UseWamBroker);
+    }
+
+    /// <summary>
+    /// The two-arg device-code constructor (deviceCodeCallback, applicationClientId) must default
+    /// <c>useWamBroker</c> to <see langword="false"/> for caller-supplied application ids.
+    /// </summary>
+    [Fact]
+    public void Ctor_WithDeviceCodeCallback_AppClientIdOnly_DefaultsUseWamBrokerToFalse()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(
+            deviceCodeFlowCallbackMethod: static _ => Task.CompletedTask,
+            applicationClientId: TestCustomAppId);
+
+        Assert.False(provider.UseWamBroker);
+        Assert.NotEqual(SqlClientApplicationId, provider.ApplicationClientId);
+    }
+
+    /// <summary>
+    /// When the device-code callback constructor is invoked without an application id, the
+    /// provider falls back to the SqlClient first-party id and must enable WAM broker.
+    /// </summary>
+    [Fact]
+    public void Ctor_WithDeviceCodeCallback_NoAppClientId_EnablesWamBroker()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(
+            deviceCodeFlowCallbackMethod: static _ => Task.CompletedTask);
+
+        Assert.True(provider.UseWamBroker);
+        Assert.Equal(SqlClientApplicationId, provider.ApplicationClientId);
+    }
+
+    /// <summary>
+    /// The <see cref="ActiveDirectoryAuthenticationProvider.ProviderOptions"/>-based constructor
+    /// is the recommended overload for new code. It must honor <see cref="ActiveDirectoryAuthenticationProvider.ProviderOptions.UseWamBroker"/>
+    /// the same way the positional-argument overloads do.
+    /// </summary>
+    [Fact]
+    public void Ctor_Options_CustomAppId_UseWamBrokerTrue_EnablesWamBroker()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(
+            new ActiveDirectoryAuthenticationProviderOptions
+            {
+                ApplicationClientId = TestCustomAppId,
+                UseWamBroker = true,
+            });
+
+        Assert.Equal(TestCustomAppId, provider.ApplicationClientId);
+        Assert.True(provider.UseWamBroker);
+    }
+
+    /// <summary>
+    /// Options with <c>ApplicationClientId = null</c> falls back to the SqlClient first-party
+    /// id, which always enables WAM broker, regardless of <c>UseWamBroker</c>.
+    /// </summary>
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void Ctor_Options_NullAppId_AlwaysEnablesWamBroker(bool useWamBroker)
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(
+            new ActiveDirectoryAuthenticationProviderOptions
+            {
+                ApplicationClientId = null,
+                UseWamBroker = useWamBroker,
+            });
+
+        Assert.Equal(SqlClientApplicationId, provider.ApplicationClientId);
+        Assert.True(provider.UseWamBroker);
+    }
+
+    /// <summary>
+    /// The Options-based constructor must reject a <see langword="null"/> options instance with
+    /// <see cref="ArgumentNullException"/> so misuse fails fast at construction.
+    /// </summary>
+    [Fact]
+    public void Ctor_Options_Null_ThrowsArgumentNullException()
+    {
+        Assert.Throws<ArgumentNullException>(
+            () => new ActiveDirectoryAuthenticationProvider((ActiveDirectoryAuthenticationProviderOptions)null!));
+    }
+
+    /// <summary>
+    /// Registering an instance via <see cref="SqlAuthenticationProvider.SetProvider"/> must not
+    /// wrap or replace the instance, so its WAM broker setting survives registration.
+    /// </summary>
+    /// <remarks>
+    /// Provider registration mutates global state shared across this test class collection
+    /// (and any other test that depends on the default provider being installed). Save and
+    /// restore the original provider in a finally block to keep cross-test isolation.
+    /// </remarks>
+    [Fact]
+    public void Ctor_RegisteredAsProvider_PreservesUseWamBrokerSetting()
+    {
+        var provider = new ActiveDirectoryAuthenticationProvider(
+            new ActiveDirectoryAuthenticationProviderOptions
+            {
+                ApplicationClientId = TestCustomAppId,
+                UseWamBroker = true,
+            });
+
+        SqlAuthenticationProvider? original =
+            SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryInteractive);
+        try
+        {
+            SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryInteractive, provider);
+
+            var retrieved = SqlAuthenticationProvider.GetProvider(SqlAuthenticationMethod.ActiveDirectoryInteractive)
+                as ActiveDirectoryAuthenticationProvider;
+            Assert.NotNull(retrieved);
+            Assert.Same(provider, retrieved);
+            Assert.Equal(TestCustomAppId, retrieved!.ApplicationClientId);
+            Assert.True(retrieved.UseWamBroker);
+        }
+        finally
+        {
+            if (original is not null)
+            {
+                SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryInteractive, original);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
index a578a82db6..c0c12132e7 100644
--- a/src/Microsoft.Data.SqlClient.slnx
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -10,6 +10,9 @@
       <Platform Solution="*|x86" Project="x86" />
     </Project>
   </Folder>
+  <Folder Name="/doc/apps/">
+    <Project Path="../doc/apps/AzureSqlConnector/AzureSqlConnector.csproj" />
+  </Folder>
   <Folder Name="/doc/snippets/" />
   <Folder Name="/doc/snippets/Microsoft.Data.Sql/">
     <File Path="../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index 3d67df236e..d87333c05b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -2226,7 +2226,6 @@ private void AttemptOneLogin(
         // TODO: if this call timed out, what reason do we have to believe some other call succeeded? why not just fail?
         private bool AttemptRetryADAuthWithTimeoutError(
             SqlException sqlex,
-            SqlConnectionOptions connectionOptions, // @TODO: this is not used
             TimeoutTimer timeout)
         {
             if (!_activeDirectoryAuthTimeoutRetryHelper.CanRetryWithSqlException(sqlex))
@@ -2236,8 +2235,10 @@ private bool AttemptRetryADAuthWithTimeoutError(
             // Reset client-side timeout.
             timeout.Reset();
 
-            // When server timeout, the auth context key was already created. Clean it up here.
+            // Clear fed-auth state captured by the failed attempt so OnFedAuthInfo's cache-reuse branch starts from null on the retry.
             _dbConnectionPoolAuthenticationContextKey = null;
+            _fedAuthToken = null;
+            _newDbConnectionPoolAuthenticationContext = null;
 
             // When server timeouts, connection is doomed. Reset here to allow reconnection.
             UnDoomThisConnection();
@@ -3335,7 +3336,7 @@ private void LoginNoFailover(
                 }
                 catch (SqlException sqlex)
                 {
-                    if (AttemptRetryADAuthWithTimeoutError(sqlex, connectionOptions, timeout))
+                    if (AttemptRetryADAuthWithTimeoutError(sqlex, timeout))
                     {
                         continue;
                     }
@@ -3648,7 +3649,7 @@ private void LoginWithFailover(
                 }
                 catch (SqlException sqlex)
                 {
-                    if (AttemptRetryADAuthWithTimeoutError(sqlex, connectionOptions, timeout))
+                    if (AttemptRetryADAuthWithTimeoutError(sqlex, timeout))
                     {
                         continue;
                     }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
index 653063b68e..4c77fbe8df 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
@@ -32,7 +32,7 @@ internal sealed class SqlAuthenticationProviderManager
 
         // The public key token of our Azure extension assembly, used to avoid loading imposter
         // assemblies.
-        private static readonly byte[] azurePublicKeyToken = [ 0x23, 0xec, 0x7f, 0xc2, 0xd6, 0xea, 0xa4, 0xa5 ];
+        private static readonly byte[] s_azurePublicKeyToken = [ 0x23, 0xec, 0x7f, 0xc2, 0xd6, 0xea, 0xa4, 0xa5 ];
 
         static SqlAuthenticationProviderManager()
         {
@@ -70,10 +70,10 @@ static SqlAuthenticationProviderManager()
                     nameof(SqlAuthenticationProviderManager) +
                     $": Attempting to load Azure extension assembly={azureAssemblyName} with " +
                     "expected public key token=" +
-                    BitConverter.ToString(azurePublicKeyToken).Replace("-", ""));
+                    BitConverter.ToString(s_azurePublicKeyToken).Replace("-", ""));
 
                 var qualifiedName = new AssemblyName(azureAssemblyName);
-                qualifiedName.SetPublicKeyToken(azurePublicKeyToken);
+                qualifiedName.SetPublicKeyToken(s_azurePublicKeyToken);
 
                 // The .NET Framework runtime will enforce the token during binding, causing Load()
                 // to throw.  This prevents an untrusted assembly from being loaded and having its
@@ -92,7 +92,7 @@ static SqlAuthenticationProviderManager()
                 {
                     byte[]? actualToken = assembly.GetName().GetPublicKeyToken();
 
-                    if (actualToken is null || !actualToken.AsSpan().SequenceEqual(azurePublicKeyToken))
+                    if (actualToken is null || !actualToken.AsSpan().SequenceEqual(s_azurePublicKeyToken))
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
                             nameof(SqlAuthenticationProviderManager) +
@@ -132,7 +132,7 @@ static SqlAuthenticationProviderManager()
 
                 // Look for the authentication provider class.
                 const string className = "Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProvider";
-                var type = assembly.GetType(className);
+                Type? type = assembly.GetType(className);
 
                 if (type is null)
                 {
@@ -144,11 +144,28 @@ static SqlAuthenticationProviderManager()
                     return;
                 }
 
-                // Try to instantiate it.
-                var instance = Activator.CreateInstance(
+                // Try to instantiate it.  Behavior depends on what the app
+                // configured in <SqlClientAuthenticationProviders>:
+                //  * Neither applicationClientId nor useWamBroker -> use the
+                //    parameterless constructor (defaults to the SqlClient
+                //    first-party app id and enables WAM brokering on Windows).
+                //  * applicationClientId only -> prefer the
+                //    (ActiveDirectoryAuthenticationProviderOptions) constructor
+                //    when the Azure extension exposes it; otherwise fall back
+                //    to the legacy (string applicationClientId) constructor so
+                //    older Azure extension versions keep working.
+                //  * useWamBroker (with or without applicationClientId) ->
+                //    requires the (Options) constructor because there is no
+                //    positional analog. If the Azure extension is too old to
+                //    expose Options, throw to surface the misconfiguration.
+                const string optionsTypeName = "Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions";
+                Type? optionsType = assembly.GetType(optionsTypeName);
+
+                SqlAuthenticationProvider? instance = CreateAzureAuthenticationProvider(
                     type,
-                    [Instance._applicationClientId])
-                    as SqlAuthenticationProvider;
+                    optionsType,
+                    Instance._applicationClientId,
+                    Instance._useWamBroker);
 
                 if (instance is null)
                 {
@@ -189,6 +206,7 @@ static SqlAuthenticationProviderManager()
             // attempt to use Active Directory authentication.
             catch (Exception ex)
             when (ex is
+                      AmbiguousMatchException or
                       ArgumentException or
                       BadImageFormatException or
                       FileLoadException or
@@ -198,6 +216,7 @@ MethodAccessException or
                       MissingMethodException or
                       NotSupportedException or
                       TargetInvocationException or
+                      TypeInitializationException or
                       TypeLoadException)
             {
                 SqlClientEventSource.Log.TryTraceEvent(
@@ -216,6 +235,13 @@ TargetInvocationException or
         private readonly SqlClientLogger _sqlAuthLogger = new SqlClientLogger();
         private readonly string? _applicationClientId = null;
 
+        // Optional override for ActiveDirectoryAuthenticationProviderOptions.UseWamBroker
+        // read from the app.config <SqlClientAuthenticationProviders useWamBroker="..."/> attribute.
+        // null means the app did not configure the value, in which case we leave the
+        // provider's default behavior (WAM is implied by the SqlClient first-party app id and
+        // off otherwise) untouched.
+        private readonly bool? _useWamBroker = null;
+
         /// <summary>
         /// Constructor.
         /// </summary>
@@ -239,6 +265,23 @@ private SqlAuthenticationProviderManager(SqlAuthenticationProviderConfigurationS
                 _sqlAuthLogger.LogInfo(nameof(SqlAuthenticationProviderManager), methodName, "No user-defined Application Client Id found.");
             }
 
+            if (!string.IsNullOrEmpty(configSection.UseWamBroker))
+            {
+                if (bool.TryParse(configSection.UseWamBroker, out bool useWamBroker))
+                {
+                    _useWamBroker = useWamBroker;
+                    _sqlAuthLogger.LogInfo(nameof(SqlAuthenticationProviderManager), methodName, $"Received user-defined UseWamBroker={useWamBroker}.");
+                }
+                else
+                {
+                    _sqlAuthLogger.LogError(nameof(SqlAuthenticationProviderManager), methodName, $"Ignoring user-defined UseWamBroker='{configSection.UseWamBroker}': not a valid boolean.");
+                }
+            }
+            else
+            {
+                _sqlAuthLogger.LogInfo(nameof(SqlAuthenticationProviderManager), methodName, "No user-defined UseWamBroker found.");
+            }
+
             // Create user-defined auth initializer, if any.
             if (!string.IsNullOrEmpty(configSection.InitializerType))
             {
@@ -312,8 +355,81 @@ private SqlAuthenticationProviderManager(SqlAuthenticationProviderConfigurationS
         /// <returns>Authentication provider or null if not found.</returns>
         internal static SqlAuthenticationProvider? GetProvider(SqlAuthenticationMethod authenticationMethod)
         {
-            SqlAuthenticationProvider? value;
-            return Instance._providers.TryGetValue(authenticationMethod, out value) ? value : null;
+            return Instance._providers.TryGetValue(authenticationMethod, out SqlAuthenticationProvider? value) ? value : null;
+        }
+
+        // Reflectively constructs the Azure extension's ActiveDirectoryAuthenticationProvider,
+        // selecting the constructor that matches what the app configured. Extracted from the
+        // static initializer so it can be unit-tested with stub provider/options shapes.
+        //
+        // Returns null when no compatible constructor is available (e.g. a custom assembly
+        // that lacks both the (Options) and (string) ctors).
+        //
+        // Throws InvalidOperationException when useWamBroker is configured but the Azure
+        // extension is too old to expose ActiveDirectoryAuthenticationProviderOptions; that
+        // signals user-actionable misconfiguration and intentionally escapes the static ctor's
+        // catch-when filter so it surfaces as a TypeInitializationException.
+        internal static SqlAuthenticationProvider? CreateAzureAuthenticationProvider(
+            Type providerType,
+            Type? optionsType,
+            string? applicationClientId,
+            bool? useWamBroker)
+        {
+            if (applicationClientId is null && useWamBroker is null)
+            {
+                return Activator.CreateInstance(providerType) as SqlAuthenticationProvider;
+            }
+
+            ConstructorInfo? optionsCtor = optionsType is null
+                ? null
+                : providerType.GetConstructor([optionsType]);
+
+            if (useWamBroker is bool useWam)
+            {
+                if (optionsType is null || optionsCtor is null)
+                {
+                    throw SQL.UseWamBrokerRequiresAzureExtensionUpgrade();
+                }
+
+                var options = Activator.CreateInstance(optionsType);
+                if (options is null)
+                {
+                    return null;
+                }
+
+                if (applicationClientId is not null)
+                {
+                    optionsType.GetProperty("ApplicationClientId")
+                        ?.SetValue(options, applicationClientId);
+                }
+                optionsType.GetProperty("UseWamBroker")
+                    ?.SetValue(options, useWam);
+
+                return optionsCtor.Invoke([options]) as SqlAuthenticationProvider;
+            }
+
+            // applicationClientId-only: prefer Options when the extension exposes it,
+            // otherwise fall back to the legacy (string) ctor for backward compatibility
+            // with older Azure extension versions.
+            if (optionsType is not null && optionsCtor is not null)
+            {
+                var options = Activator.CreateInstance(optionsType);
+                if (options is null)
+                {
+                    return null;
+                }
+                optionsType.GetProperty("ApplicationClientId")
+                    ?.SetValue(options, applicationClientId);
+                return optionsCtor.Invoke([options]) as SqlAuthenticationProvider;
+            }
+
+            ConstructorInfo? legacyCtor = providerType.GetConstructor([typeof(string)]);
+            if (legacyCtor is not null)
+            {
+                return legacyCtor.Invoke([applicationClientId]) as SqlAuthenticationProvider;
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -448,6 +564,15 @@ internal class SqlAuthenticationProviderConfigurationSection : ConfigurationSect
         /// </summary>
         [ConfigurationProperty("applicationClientId", IsRequired = false)]
         public string ApplicationClientId => this["applicationClientId"] as string ?? string.Empty;
+
+        /// <summary>
+        /// Forwarded to <c>ActiveDirectoryAuthenticationProviderOptions.UseWamBroker</c>
+        /// when the Azure extension's default provider is auto-installed. Stored as a string so
+        /// that an unset attribute can be distinguished from <c>useWamBroker="false"</c>; the
+        /// runtime parses it with <see cref="bool.TryParse(string, out bool)"/>.
+        /// </summary>
+        [ConfigurationProperty("useWamBroker", IsRequired = false)]
+        public string UseWamBroker => this["useWamBroker"] as string ?? string.Empty;
     }
 
     /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
index 84667d99e7..049734993e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
@@ -511,6 +511,11 @@ internal static Exception UnsupportedAuthenticationByProvider(string authenticat
             return ADP.NotSupported(StringsHelper.GetString(Strings.SQL_UnsupportedAuthenticationByProvider, type, authentication));
         }
 
+        internal static Exception UseWamBrokerRequiresAzureExtensionUpgrade()
+        {
+            return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_UseWamBrokerRequiresAzureExtensionUpgrade));
+        }
+
         internal static Exception CannotFindAuthProvider(SqlAuthenticationMethod authentication)
         {
             string authName = authentication.ToString();
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index 041b9aa8aa..eed5c58a69 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -3048,6 +3048,15 @@ internal static string SQL_CannotFindActiveDirectoryAuthProvider {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Setting &apos;useWamBroker&apos; requires the &apos;Microsoft.Data.SqlClient.Extensions.Azure&apos; package to expose &apos;Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions&apos;. Upgrade the &apos;Microsoft.Data.SqlClient.Extensions.Azure&apos; package to a version that includes this type..
+        /// </summary>
+        internal static string SQL_UseWamBrokerRequiresAzureExtensionUpgrade {
+            get {
+                return ResourceManager.GetString("SQL_UseWamBrokerRequiresAzureExtensionUpgrade", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cannot find an authentication provider for &apos;{0}&apos;..
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
index ca9dcf0a93..0a65febfde 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Cannot find an authentication provider for '{0}'. Install the 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet package (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) to use Active Directory (Entra ID) authentication methods.</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Parameter '{0}' cannot be null or empty.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlAuthenticationProviderManagerTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlAuthenticationProviderManagerTests.cs
index 778d69991b..08089abe98 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlAuthenticationProviderManagerTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlAuthenticationProviderManagerTests.cs
@@ -73,4 +73,200 @@ public void Abstractions_And_Manager_GetSetProvider_Equivalent()
             SqlAuthenticationProvider.GetProvider(
                 SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow));
     }
+
+    // Regression: the manager's static initializer reflectively constructs the Azure extension's
+    // ActiveDirectoryAuthenticationProvider. That class has overlapping 1-arg constructors
+    // ((string) and (ProviderOptions)), so calling Activator.CreateInstance(type, [null]) used
+    // to throw AmbiguousMatchException -- which surfaced as TypeInitializationException from
+    // GetProvider and broke every AD-authenticated connection. Calling GetProvider for an AD
+    // method must succeed (returning either the registered provider or null) and must not throw.
+    [Fact]
+    public void GetProvider_ForActiveDirectoryMethod_DoesNotThrow()
+    {
+        foreach (SqlAuthenticationMethod method in new[]
+        {
+            SqlAuthenticationMethod.ActiveDirectoryIntegrated,
+            #pragma warning disable CS0618 // ActiveDirectoryPassword is obsolete.
+            SqlAuthenticationMethod.ActiveDirectoryPassword,
+            #pragma warning restore CS0618
+            SqlAuthenticationMethod.ActiveDirectoryInteractive,
+            SqlAuthenticationMethod.ActiveDirectoryServicePrincipal,
+            SqlAuthenticationMethod.ActiveDirectoryDeviceCodeFlow,
+            SqlAuthenticationMethod.ActiveDirectoryManagedIdentity,
+            SqlAuthenticationMethod.ActiveDirectoryMSI,
+            SqlAuthenticationMethod.ActiveDirectoryDefault,
+            SqlAuthenticationMethod.ActiveDirectoryWorkloadIdentity,
+        })
+        {
+            // No assertion on the value -- the provider may or may not be installed depending on
+            // whether the Azure extension is on disk. We only assert no throw (which is what a
+            // TypeInitializationException from the static initializer would do).
+            _ = SqlAuthenticationProviderManager.GetProvider(method);
+        }
+    }
+
+    // CreateAzureAuthenticationProvider tests ----------------------------------------------
+    //
+    // Each Stub* container mimics one shape the real Azure extension might expose:
+    //   * StubModern  - both a (string) ctor and an (Options) ctor.
+    //   * StubLegacy  - only the (string) ctor; no Options type at all.
+    //   * StubMinimal - only a parameterless ctor.
+    //
+    // The helper takes a Type directly, so these stubs do not need any particular full name.
+
+    public class StubProviderBase : SqlAuthenticationProvider
+    {
+        public string? CapturedApplicationClientId;
+        public bool? CapturedUseWamBroker;
+        public bool ParameterlessCtorUsed;
+        public bool StringCtorUsed;
+        public bool OptionsCtorUsed;
+
+        public override Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenticationParameters parameters)
+            => Task.FromResult(new SqlAuthenticationToken("stub", DateTimeOffset.UtcNow.AddMinutes(5)));
+
+        public override bool IsSupported(SqlAuthenticationMethod authenticationMethod) => true;
+    }
+
+    public static class StubModern
+    {
+        public sealed class ActiveDirectoryAuthenticationProviderOptions
+        {
+            public string? ApplicationClientId { get; set; }
+            public bool UseWamBroker { get; set; }
+        }
+
+        public sealed class ActiveDirectoryAuthenticationProvider : StubProviderBase
+        {
+            public ActiveDirectoryAuthenticationProvider() { ParameterlessCtorUsed = true; }
+
+            public ActiveDirectoryAuthenticationProvider(string applicationClientId)
+            {
+                StringCtorUsed = true;
+                CapturedApplicationClientId = applicationClientId;
+            }
+
+            public ActiveDirectoryAuthenticationProvider(ActiveDirectoryAuthenticationProviderOptions options)
+            {
+                OptionsCtorUsed = true;
+                CapturedApplicationClientId = options.ApplicationClientId;
+                CapturedUseWamBroker = options.UseWamBroker;
+            }
+        }
+    }
+
+    public static class StubLegacy
+    {
+        // No Options type defined -- mimics older Azure extension versions.
+        public sealed class ActiveDirectoryAuthenticationProvider : StubProviderBase
+        {
+            public ActiveDirectoryAuthenticationProvider() { ParameterlessCtorUsed = true; }
+
+            public ActiveDirectoryAuthenticationProvider(string applicationClientId)
+            {
+                StringCtorUsed = true;
+                CapturedApplicationClientId = applicationClientId;
+            }
+        }
+    }
+
+    public static class StubMinimal
+    {
+        // Parameterless only -- mimics a hypothetical extension with no 1-arg ctors at all.
+        public sealed class ActiveDirectoryAuthenticationProvider : StubProviderBase
+        {
+            public ActiveDirectoryAuthenticationProvider() { ParameterlessCtorUsed = true; }
+        }
+    }
+
+    [Fact]
+    public void CreateAzureAuthenticationProvider_NeitherConfigured_UsesParameterlessCtor()
+    {
+        var instance = SqlAuthenticationProviderManager.CreateAzureAuthenticationProvider(
+            typeof(StubModern.ActiveDirectoryAuthenticationProvider),
+            typeof(StubModern.ActiveDirectoryAuthenticationProviderOptions),
+            applicationClientId: null,
+            useWamBroker: null);
+
+        var stub = Assert.IsType<StubModern.ActiveDirectoryAuthenticationProvider>(instance);
+        Assert.True(stub.ParameterlessCtorUsed);
+        Assert.False(stub.StringCtorUsed);
+        Assert.False(stub.OptionsCtorUsed);
+        Assert.Null(stub.CapturedApplicationClientId);
+        Assert.Null(stub.CapturedUseWamBroker);
+    }
+
+    [Fact]
+    public void CreateAzureAuthenticationProvider_AppIdOnly_OptionsAvailable_UsesOptionsCtor()
+    {
+        var instance = SqlAuthenticationProviderManager.CreateAzureAuthenticationProvider(
+            typeof(StubModern.ActiveDirectoryAuthenticationProvider),
+            typeof(StubModern.ActiveDirectoryAuthenticationProviderOptions),
+            applicationClientId: "app-123",
+            useWamBroker: null);
+
+        var stub = Assert.IsType<StubModern.ActiveDirectoryAuthenticationProvider>(instance);
+        Assert.True(stub.OptionsCtorUsed);
+        Assert.False(stub.StringCtorUsed);
+        Assert.Equal("app-123", stub.CapturedApplicationClientId);
+        Assert.Equal(false, stub.CapturedUseWamBroker);
+    }
+
+    [Fact]
+    public void CreateAzureAuthenticationProvider_AppIdOnly_OptionsMissing_FallsBackToStringCtor()
+    {
+        var instance = SqlAuthenticationProviderManager.CreateAzureAuthenticationProvider(
+            typeof(StubLegacy.ActiveDirectoryAuthenticationProvider),
+            optionsType: null,
+            applicationClientId: "legacy-456",
+            useWamBroker: null);
+
+        var stub = Assert.IsType<StubLegacy.ActiveDirectoryAuthenticationProvider>(instance);
+        Assert.True(stub.StringCtorUsed);
+        Assert.False(stub.OptionsCtorUsed);
+        Assert.False(stub.ParameterlessCtorUsed);
+        Assert.Equal("legacy-456", stub.CapturedApplicationClientId);
+        Assert.Null(stub.CapturedUseWamBroker);
+    }
+
+    [Fact]
+    public void CreateAzureAuthenticationProvider_AppIdOnly_NoCompatibleCtor_ReturnsNull()
+    {
+        var instance = SqlAuthenticationProviderManager.CreateAzureAuthenticationProvider(
+            typeof(StubMinimal.ActiveDirectoryAuthenticationProvider),
+            optionsType: null,
+            applicationClientId: "no-ctor",
+            useWamBroker: null);
+
+        Assert.Null(instance);
+    }
+
+    [Fact]
+    public void CreateAzureAuthenticationProvider_UseWamBroker_OptionsMissing_Throws()
+    {
+        InvalidOperationException ex = Assert.Throws<InvalidOperationException>(() =>
+            SqlAuthenticationProviderManager.CreateAzureAuthenticationProvider(
+                typeof(StubLegacy.ActiveDirectoryAuthenticationProvider),
+                optionsType: null,
+                applicationClientId: null,
+                useWamBroker: true));
+
+        Assert.Contains("ActiveDirectoryAuthenticationProviderOptions", ex.Message);
+        Assert.Contains("Microsoft.Data.SqlClient.Extensions.Azure", ex.Message);
+    }
+
+    [Fact]
+    public void CreateAzureAuthenticationProvider_UseWamBroker_OptionsAvailable_UsesOptionsCtor()
+    {
+        var instance = SqlAuthenticationProviderManager.CreateAzureAuthenticationProvider(
+            typeof(StubModern.ActiveDirectoryAuthenticationProvider),
+            typeof(StubModern.ActiveDirectoryAuthenticationProviderOptions),
+            applicationClientId: "app-789",
+            useWamBroker: true);
+
+        var stub = Assert.IsType<StubModern.ActiveDirectoryAuthenticationProvider>(instance);
+        Assert.True(stub.OptionsCtorUsed);
+        Assert.Equal("app-789", stub.CapturedApplicationClientId);
+        Assert.Equal(true, stub.CapturedUseWamBroker);
+    }
 }

From 44e1b725a255cd39d2b95b3bc6a67131da4babb5 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Mon, 22 Jun 2026 11:50:13 -0500
Subject: [PATCH 155/298] PR Pipeline - Code Coverage and Triggers (#4360)

* First crack at adding test result publishing to non-manual test jobs.

# Conflicts:
#	eng/pipelines/pr/jobs/test-buildproj-job.yml
#	eng/pipelines/pr/stages/test-stages.yml

* If statement syntax?

* Ok forget the if statement.

* Version

* Unique job names... could be better, but let's start here.

* Tree in linux?

* Ok forget it, we don't need do emit the tree....

* Wire up test result uploading to sqlclient manual test jobs

* Give a test display name to sql manual tests

* First attempt at code coverage report publishing

* :robot: Code coverage takes a dynamic dependency on the platforms to ensure all tests are first.

* We only need *one* set of parameters

* We only need *one* pool name

* Add triggers and fix code coverage verbosity thingy

* :robot: fixes for codecov CLI

* :curly_haired_man: and :robot: comments

* :robot: Use dotnet-tools.json

* Comments for general variables
Rename testResultsArtifactsName to testResultsArtifactsBaseName
Remove codecov uploads
Ensure folder exists
---
 eng/pipelines/pr/jobs/test-buildproj-job.yml  |  18 +++
 .../pr/jobs/test-sqlclientmanual-job.yml      |  19 +++
 eng/pipelines/pr/pr-pipeline.yml              |  94 -----------
 eng/pipelines/pr/sqlclient-pr-pipeline.yml    | 147 ++++++++++++++++++
 .../pr/stages/collect-coverage-stage.yml      |  75 +++++++++
 eng/pipelines/pr/stages/test-stages.yml       |  13 ++
 .../pr/steps/publish-test-results-step.yml    |  63 ++++++++
 eng/pipelines/pr/variables/pr-variables.yml   |   9 ++
 8 files changed, 344 insertions(+), 94 deletions(-)
 delete mode 100644 eng/pipelines/pr/pr-pipeline.yml
 create mode 100644 eng/pipelines/pr/sqlclient-pr-pipeline.yml
 create mode 100644 eng/pipelines/pr/stages/collect-coverage-stage.yml
 create mode 100644 eng/pipelines/pr/steps/publish-test-results-step.yml

diff --git a/eng/pipelines/pr/jobs/test-buildproj-job.yml b/eng/pipelines/pr/jobs/test-buildproj-job.yml
index ec2d292ec8..c232513e1f 100644
--- a/eng/pipelines/pr/jobs/test-buildproj-job.yml
+++ b/eng/pipelines/pr/jobs/test-buildproj-job.yml
@@ -18,6 +18,10 @@ parameters:
   - name: buildSuffix
     type: string
 
+  # Name of the artifact to upload the test results (including code coverage) to.
+  - name: testResultsArtifactBaseName
+    type: string
+
   # Dotnet CLI verbosity level.
   - name: dotnetVerbosity
     type: string
@@ -78,6 +82,10 @@ jobs:
   - job: "test_${{ parameters.platformDisplayName }}_${{ parameters.testDisplayName }}"
     displayName: "${{ parameters.testDisplayName }}_${{ parameters.platformDisplayName }}"
 
+    variables:
+      - name: testResultsPath
+        value: "$(REPO_ROOT)/test_results/${{ parameters.platformDisplayName }}_${{ parameters.testDisplayName }}"
+
     pool:
       name: ${{ parameters.poolName }}
       demands:
@@ -107,3 +115,13 @@ jobs:
             -p:BuildNumber='$(Build.BuildNumber)'
             -p:BuildSuffix='${{ parameters.buildSuffix }}'
             -p:TestFramework=${{ parameters.platformDotnet }}
+            -p:TestResultsFolderPath=${{ variables.testResultsPath }}
+
+      # Publish test results
+      - template: /eng/pipelines/pr/steps/publish-test-results-step.yml@self
+        parameters:
+          buildConfiguration: ${{ parameters.buildConfiguration }}
+          platformDisplayName: ${{ parameters.platformDisplayName }}
+          testDisplayName: ${{ parameters.testDisplayName }}
+          testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
+          testResultsPath: ${{ variables.testResultsPath }}
diff --git a/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml b/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
index 9ca2c7c555..e1a5a4abd4 100644
--- a/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
+++ b/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
@@ -33,6 +33,10 @@ parameters:
   - name: stageNameSecrets
     type: string
 
+  # Name of the artifact to upload the test results (including code coverage) to.
+  - name: testResultsArtifactBaseName
+    type: string
+
   # Platform Parameters ====================================================
 
   # Display name of the platform. This will be formatted into the job's official name as well as
@@ -128,6 +132,12 @@ jobs:
       - name: saPassword
         value: $[stageDependencies.${{ parameters.stageNameSecrets }}.secrets_job.outputs['SaPassword.Value']]
 
+      - name: testDisplayName
+        value: "sqlclient_manual_${{ parameters.configDisplayName}}_${{ parameters.testSet }}"
+
+      - name: testResultsPath
+        value: "$(REPO_ROOT)/test_results/${{ parameters.platformDisplayName }}_$(testDisplayName)"
+
     steps:
       # Install dotnet and the runtime that will run the tests (if it is not netframework)
       - template: /eng/pipelines/common/steps/install-dotnet.yml@self
@@ -201,4 +211,13 @@ jobs:
             -p:BuildSuffix='${{ parameters.buildSuffix }}'
             -p:TestFramework=${{ parameters.platformDotnet }}
             -p:TestSet=${{ parameters.testSet }}
+            -p:TestResultsFolderPath=${{ variables.testResultsPath }}
 
+      # Publish test results
+      - template: /eng/pipelines/pr/steps/publish-test-results-step.yml@self
+        parameters:
+          buildConfiguration: ${{ parameters.buildConfiguration }}
+          platformDisplayName: ${{ parameters.platformDisplayName }}
+          testDisplayName: ${{ variables.testDisplayName }}
+          testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
+          testResultsPath: ${{ variables.testResultsPath }}
diff --git a/eng/pipelines/pr/pr-pipeline.yml b/eng/pipelines/pr/pr-pipeline.yml
deleted file mode 100644
index daf393e502..0000000000
--- a/eng/pipelines/pr/pr-pipeline.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-name: $(DayOfYear)$(Rev:rr)
-
-parameters:
-  # General Parameters =====================================================
-
-  # Dotnet CLI verbosity level.
-  - name: dotnetVerbosity
-    displayName: dotnet CLI Verbosity
-    type: string
-    default: normal
-    values:
-      - quiet
-      - minimal
-      - normal
-      - detailed
-      - diagnostic
-
-variables:
-  - template: /eng/pipelines/common/variables/common-variables.yml@self
-  - template: /eng/pipelines/pr/variables/pr-variables.yml@self
-
-stages:
-  # Stage 1a: Build and pack all projects in the repository
-  - template: /eng/pipelines/pr/stages/pack-stage.yml
-    parameters:
-      buildConfiguration: Debug
-      buildSuffix: pr
-      stageName: ${{ variables.stageNamePack }}
-
-  # Stage 1b: Generate secrets
-  - template: /eng/pipelines/pr/stages/generate-secrets-stage.yml
-    parameters:
-      stageName: ${{ variables.stageNameSecrets }}
-
-  # Stage 2: Execute tests and collect code coverage
-  - template: /eng/pipelines/pr/stages/test-stages.yml
-    parameters:
-      buildConfiguration: Debug
-      buildSuffix: pr
-      dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-      poolName: $(PoolNameDefault)
-      stageNamePack: ${{ variables.stageNamePack }}
-      stageNameSecrets: ${{ variables.stageNameSecrets }}
-
-      platforms:
-        - displayName: "windows_net462"
-          dotnet: "net462"
-          image: "ADO-MMS22-SQL22"
-          operatingSystem: "Windows"
-        - displayName: "windows_net8"
-          dotnet: "net8.0"
-          image: "ADO-MMS22-SQL22"
-          operatingSystem: "Windows"
-        - displayName: "windows_net9"
-          dotnet: "net9.0"
-          image: "ADO-MMS22-SQL22"
-          operatingSystem: "Windows"
-        - displayName: "windows_net10"
-          dotnet: "net10.0"
-          image: "ADO-MMS22-SQL22"
-          operatingSystem: "Windows"
-
-        - displayName: "linux_net8"
-          dotnet: "net8.0"
-          image: "ADO-UB22-SQL22"
-          operatingSystem: "Linux"
-        - displayName: "linux_net9"
-          dotnet: "net9.0"
-          image: "ADO-UB22-SQL22"
-          operatingSystem: "Linux"
-        - displayName: "linux_net10"
-          dotnet: "net10.0"
-          image: "ADO-UB22-SQL22"
-          operatingSystem: "Linux"
-
-      manualTestAzureKeyVaultUrl: $(AzureKeyVaultUrl)
-      manualTestAzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
-      manualTestConnectionStringNpLocalhost: $(ConnectionStringNp_LocalhostDefault_UsernamePassword)
-      manualTestConnectionStringTcpLocalhost: $(ConnectionStringTcp_LocalhostDefault_UsernamePassword)
-      manualTestConnectionStringNpAzure: $(ConnectionStringNp_Azure_ManagedIdentity)
-      manualTestConnectionStringTcpAzure: $(ConnectionStringTcp_Azure_ManagedIdentity)
-      manualTestFileStreamDirectory: "$(Pipeline.Workspace)/filestream"
-      manualTestLocalDbAppName: $(LocalDbAppName)
-      manualTestLocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
-      manualTestUserManagedIdentityClientId: $(UserManagedIdentityClientId)
-
-  # Stage 3: Collect code coverage
-  # @TODO:
diff --git a/eng/pipelines/pr/sqlclient-pr-pipeline.yml b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
new file mode 100644
index 0000000000..8df34ac600
--- /dev/null
+++ b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
@@ -0,0 +1,147 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# This pipeline builds and tests all products that we release. It is intended to run as validation
+# for every PR. The set of tests it executes is not exhaustive, as many tests require special
+# environments to provide complete coverage. Instead, this PR strikes a balance between complete
+# confidence and speed of PR validation.
+#
+# It is triggered by pushes to PRs that target the main, dev/*, feat/*, and release/* branches in
+# GitHub. The dev/* pattern includes dev/automation/* branches created by AI agents.
+#
+# It maps to the "sqlclient-pr" pipeline in the Public ADO project:
+#    https://sqlclientdrivers.visualstudio.com/public/_build?definitionId=2281
+# And the "sqlclient-pr" pipeline in the internal ADO project:
+#    https://dev.azure.com/SqlClientDrivers/ADO.Net/_build?definitionId=2271
+
+# Set the pipeline run name to the day-of-year and the daily run counter.
+name: $(DayOfYear)$(Rev:rr)
+
+# Trigger PR validation runs for all pushes to PRs that target the specified branches.
+# https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/github?view=azure-devops&tabs=yaml#pr-triggers
+pr:
+  branches:
+    include:
+      # GitHub repo branch targets that will trigger PR validation builds.
+      - dev/*
+      - feat/*
+      - main
+      - release/*
+
+  paths:
+    include:
+      - .azuredevops/*
+      - .config/*
+      - doc/*
+      - eng/pipelines/common/*
+      - eng/pipelines/pr/*
+      - src/*
+      - tools/*
+      - azurepipelines-coverage.yml
+      - build.proj
+      - Directory.Packages.props
+      - dotnet-tools.json
+      - global.json
+      - NuGet.config
+
+# Do not trigger commit or schedule runs for this pipeline.
+trigger: none
+
+parameters:
+  # General Parameters =====================================================
+
+  # Dotnet CLI verbosity level.
+  - name: dotnetVerbosity
+    displayName: dotnet CLI Verbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
+  - name: platforms
+    type: object
+    default:
+      - displayName: "windows_net462"
+        dotnet: "net462"
+        image: "ADO-MMS22-SQL22"
+        operatingSystem: "Windows"
+      - displayName: "windows_net8"
+        dotnet: "net8.0"
+        image: "ADO-MMS22-SQL22"
+        operatingSystem: "Windows"
+      - displayName: "windows_net9"
+        dotnet: "net9.0"
+        image: "ADO-MMS22-SQL22"
+        operatingSystem: "Windows"
+      - displayName: "windows_net10"
+        dotnet: "net10.0"
+        image: "ADO-MMS22-SQL22"
+        operatingSystem: "Windows"
+
+      - displayName: "linux_net8"
+        dotnet: "net8.0"
+        image: "ADO-UB22-SQL22"
+        operatingSystem: "Linux"
+      - displayName: "linux_net9"
+        dotnet: "net9.0"
+        image: "ADO-UB22-SQL22"
+        operatingSystem: "Linux"
+      - displayName: "linux_net10"
+        dotnet: "net10.0"
+        image: "ADO-UB22-SQL22"
+        operatingSystem: "Linux"
+
+variables:
+  - template: /eng/pipelines/common/variables/common-variables.yml@self
+  - template: /eng/pipelines/pr/variables/pr-variables.yml@self
+
+stages:
+  # Stage 1a: Build and pack all projects in the repository
+  - template: /eng/pipelines/pr/stages/pack-stage.yml@self
+    parameters:
+      buildConfiguration: Debug
+      buildSuffix: pr
+      stageName: ${{ variables.stageNamePack }}
+
+  # Stage 1b: Generate secrets
+  - template: /eng/pipelines/pr/stages/generate-secrets-stage.yml@self
+    parameters:
+      stageName: ${{ variables.stageNameSecrets }}
+
+  # Stage 2: Execute tests and collect code coverage
+  - template: /eng/pipelines/pr/stages/test-stages.yml@self
+    parameters:
+      buildConfiguration: Debug
+      buildSuffix: pr
+      dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+      poolName: $(PoolNameDefault)
+      stageNamePack: ${{ variables.stageNamePack }}
+      stageNameSecrets: ${{ variables.stageNameSecrets }}
+      testResultsArtifactBaseName: ${{ variables.testResultsArtifactBaseName }}
+
+      platforms: ${{ parameters.platforms }}
+
+      manualTestAzureKeyVaultUrl: $(AzureKeyVaultUrl)
+      manualTestAzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
+      manualTestConnectionStringNpLocalhost: $(ConnectionStringNp_LocalhostDefault_UsernamePassword)
+      manualTestConnectionStringTcpLocalhost: $(ConnectionStringTcp_LocalhostDefault_UsernamePassword)
+      manualTestConnectionStringNpAzure: $(ConnectionStringNp_Azure_ManagedIdentity)
+      manualTestConnectionStringTcpAzure: $(ConnectionStringTcp_Azure_ManagedIdentity)
+      manualTestFileStreamDirectory: "$(Pipeline.Workspace)/filestream"
+      manualTestLocalDbAppName: $(LocalDbAppName)
+      manualTestLocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
+      manualTestUserManagedIdentityClientId: $(UserManagedIdentityClientId)
+
+  # Stage 3: Collect code coverage
+  - template: /eng/pipelines/pr/stages/collect-coverage-stage.yml@self
+    parameters:
+      dependsOn:
+        - ${{ each platform in parameters.platforms }}:
+            - "test_${{ platform.displayName }}"
diff --git a/eng/pipelines/pr/stages/collect-coverage-stage.yml b/eng/pipelines/pr/stages/collect-coverage-stage.yml
new file mode 100644
index 0000000000..2d03bb064f
--- /dev/null
+++ b/eng/pipelines/pr/stages/collect-coverage-stage.yml
@@ -0,0 +1,75 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+parameters:
+
+  # Names of the test stages that must complete before collecting coverage.
+  - name: dependsOn
+    type: object
+    default: []
+
+stages:
+  - stage: collect_code_coverage
+    displayName: "Collect code coverage"
+    dependsOn: ${{ parameters.dependsOn }}
+
+    jobs:
+      - job: collect_code_coverage
+        displayName: "Collect Code Coverage"
+
+        pool:
+          vmImage: ubuntu-latest
+
+        variables:
+
+          # Set up a temporary directory that is cleaned up after each job run. This helps avoid
+          # disk space issues on pooled agents that may run many jobs before being retired.
+          - name: workingDir
+            value: "$(Agent.TempDirectory)/coverage"
+
+        steps:
+
+          # Part 1) Merge coverage reports =================================
+
+          # Install .NET SDK
+          - template: /eng/pipelines/common/steps/install-dotnet.yml@self
+
+          # Restore additional dotnet tools
+          - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
+
+          # Download coverage reports from the test jobs.
+          # NOTE: The artifact name is not specified, so *all* artifacts of the build will be
+          #    checked for the coverage reports.
+          - task: DownloadPipelineArtifact@2
+            displayName: Download coverage reports
+            inputs:
+              itemPattern: '**/*.coverage'
+              targetPath: "${{ variables.workingDir }}/originals"
+
+          # Merge original files into a single Cobertura XML file
+          - script: >-
+              dotnet tool run dotnet-coverage -- merge "${{ variables.workingDir }}/originals/**/*.coverage"
+              --output "${{ variables.workingDir }}/merge/cobertura.xml"
+              --output-format cobertura
+              --log-file "${{ variables.workingDir }}/merge/merge.log"
+              --log-level Verbose
+            displayName: Merge coverage files
+            workingDirectory: $(REPO_ROOT)
+
+          # Part 2) Publish merged results to the pipeline results/artifacts
+
+          # Publish the merged coverage file as a pipeline artifact
+          - task: PublishPipelineArtifact@1
+            displayName: Publish coverage artifact
+            inputs:
+              artifact: merged_coverage
+              targetPath: "${{ variables.workingDir }}/merge"
+
+          # Publish the merged coverage file as coverage results so they can be viewed in ADO UI.
+          - task: PublishCodeCoverageResults@2
+            displayName: Publish coverage results
+            inputs:
+              summaryFileLocation: "${{ variables.workingDir }}/merge/cobertura.xml"
diff --git a/eng/pipelines/pr/stages/test-stages.yml b/eng/pipelines/pr/stages/test-stages.yml
index 3a1e2c2011..f6023678b7 100644
--- a/eng/pipelines/pr/stages/test-stages.yml
+++ b/eng/pipelines/pr/stages/test-stages.yml
@@ -45,6 +45,12 @@ parameters:
   - name: stageNameSecrets
     type: string
 
+  # Name of the artifact to upload the test results (including code coverage) to.
+  # Note: This artifact will be used to store results from all jobs. Ensure that the folders used
+  #     to store the results is unique to the test run.
+  - name: testResultsArtifactBaseName
+    type: string
+
   # Manual Test Configuration Parameters ==================================
 
   # Azure Key Vault tenant ID that will be set in the config.jsonc file for sqlclient manual tests.
@@ -129,6 +135,7 @@ stages:
               platformDotnet: ${{ platform.dotnet }}
               platformImage: ${{ platform.image }}
               poolName: ${{ parameters.poolName }}
+              testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
               packageShortName: "Abstractions"
               testDisplayName: "abstractions"
@@ -143,6 +150,7 @@ stages:
               platformDotnet: ${{ platform.dotnet }}
               platformImage: ${{ platform.image }}
               poolName: ${{ parameters.poolName }}
+              testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
               packageShortName: "Azure"
               testDisplayName: "azure"
@@ -157,6 +165,7 @@ stages:
               platformDotnet: ${{ platform.dotnet }}
               platformImage: ${{ platform.image }}
               poolName: ${{ parameters.poolName }}
+              testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
               packageShortName: "SqlClient"
               testDisplayName: "sqlclient_functional"
@@ -169,6 +178,7 @@ stages:
               buildSuffix: ${{ parameters.buildSuffix }}
               dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               stageNameSecrets: ${{ parameters.stageNameSecrets }}
+              testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
@@ -195,6 +205,7 @@ stages:
               buildSuffix: ${{ parameters.buildSuffix }}
               dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               stageNameSecrets: ${{ parameters.stageNameSecrets }}
+              testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
@@ -221,6 +232,7 @@ stages:
               buildSuffix: ${{ parameters.buildSuffix }}
               dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               stageNameSecrets: ${{ parameters.stageNameSecrets }}
+              testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
@@ -250,6 +262,7 @@ stages:
               platformDotnet: ${{ platform.dotnet }}
               platformImage: ${{ platform.image }}
               poolName: ${{ parameters.poolName }}
+              testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
               packageShortName: "SqlClient"
               testDisplayName: "sqlclient_unit"
diff --git a/eng/pipelines/pr/steps/publish-test-results-step.yml b/eng/pipelines/pr/steps/publish-test-results-step.yml
new file mode 100644
index 0000000000..c64c3a974f
--- /dev/null
+++ b/eng/pipelines/pr/steps/publish-test-results-step.yml
@@ -0,0 +1,63 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Publishes the test result files from the job to the pipeline and uploads the test results
+# (including code coverage results) to a pipeline artifact.
+
+parameters:
+
+  # Configuration to use to build the project.
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # Display name of the platform. This will be formatted into the test result name. As such, only
+  # alphanumeric and _ characters are permitted.
+  - name: platformDisplayName
+    type: string
+
+  # Display name of the test target that is being executed. This will be formatted into the test
+  # result name. As such, only alphanumeric and _ characters are permitted.
+  - name: testDisplayName
+    type: string
+
+  # Name of the artifact to upload the test results (including code coverage) to.
+  - name: testResultsArtifactBaseName
+    type: string
+
+  # Absolute path to the test results folder. This folder will be published to the artifact defined
+  # by ${{ testResultsArtifactBaseName }}_$(System.JobId)
+  - name: testResultsPath
+    type: string
+
+steps:
+  - pwsh: New-Item -ItemType Directory -Force -Path "${{ parameters.testResultsPath }}"
+    displayName: Ensure test results directory exists
+    condition: succeededOrFailed()
+
+  # Publish the test results (trx files) to the pipeline
+  - task: PublishTestResults@2
+    displayName: 'Publish Test Results'
+    inputs:
+      buildConfiguration: ${{ parameters.buildConfiguration }}
+      mergeTestResults: true
+      testResultsFiles: |
+        ${{ parameters.testResultsPath }}/*.trx
+        ${{ parameters.testResultsPath }}/**/*.coverage
+      testResultsFormat: VSTest
+      testRunTitle: "${{ parameters.platformDisplayName }}_${{ parameters.testDisplayName }}"
+    condition: succeededOrFailed()
+
+  # Publish the test results as artifacts for the pipeline
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish Test Artifacts'
+    inputs:
+      artifact: ${{ parameters.testResultsArtifactBaseName }}_$(System.JobId)
+      targetPath: ${{ parameters.testResultsPath }}
+    condition: succeededOrFailed()
+
diff --git a/eng/pipelines/pr/variables/pr-variables.yml b/eng/pipelines/pr/variables/pr-variables.yml
index a9da73850e..cea536b0ba 100644
--- a/eng/pipelines/pr/variables/pr-variables.yml
+++ b/eng/pipelines/pr/variables/pr-variables.yml
@@ -24,8 +24,17 @@ variables:
   - group: sqlclient-testconfig-v1
 
   # General Variables ======================================================
+
+  # Name to use for the packaging stage. This is to ensure that the packaging stage and the test
+  # stages (that will depend on the packaging stage passing) use the same name.
   - name: stageNamePack
     value: "pack_stage"
 
+  # Name to use for the secret generation stage. This is to ensure that the secret generation stage
+  # and the test stages (that will depend on the generated secret) use the same name.
   - name: stageNameSecrets
     value: "secrets_stage"
+
+  # Base name of the test result artifacts. Job ID should be appended to this to prevent collision.
+  - name: testResultsArtifactBaseName
+    value: "test_results"

From e1a7a7fd9db8723c2aa377a91a3b1ece1834a3f2 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Tue, 23 Jun 2026 06:24:00 +0100
Subject: [PATCH 156/298] Fix | Reenable SqlBulkCopy in least-privilege
 environments (#4306)

---
 .../Microsoft/Data/SqlClient/SqlBulkCopy.cs   |  55 +++--
 .../DatabaseObjects/DatabaseObject.cs         |  25 ++-
 .../Fixtures/DatabaseObjects/DatabaseUser.cs  |  67 ++++++
 .../Fixtures/DatabaseObjects/ServerLogin.cs   |  99 +++++++++
 .../ManualTests/BulkCopy/CopyAllFromReader.cs |   8 +-
 .../ManualTests/BulkCopy/UnprivilegedLogin.cs | 208 ++++++++++++++++++
 .../ManualTests/DataCommon/DataTestUtility.cs |  42 ++++
 .../Extensions/CodeAnalysis.netfx.cs          |  25 +++
 .../TracingTests/XEventsTracingTest.cs        |   2 +-
 9 files changed, 503 insertions(+), 28 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/Extensions/CodeAnalysis.netfx.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
index af2091d7f6..af6b2524c2 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -477,11 +477,12 @@ private string CreateInitialQuery()
             }
             else if (!string.IsNullOrEmpty(CatalogName))
             {
-                CatalogName = SqlServerEscapeHelper.EscapeStringAsLiteral(SqlServerEscapeHelper.EscapeIdentifier(CatalogName));
+                CatalogName = SqlServerEscapeHelper.EscapeIdentifier(CatalogName);
             }
 
             string objectName = ADP.BuildMultiPartName(parts);
             string escapedObjectName = SqlServerEscapeHelper.EscapeStringAsLiteral(objectName);
+            string catalogNameStringLiteral = CatalogName is null ? null : SqlServerEscapeHelper.EscapeStringAsLiteral(CatalogName);
             // Specify the column names explicitly. This is to ensure that we can map to hidden
             // columns (e.g. columns in temporal tables.) If the target table doesn't exist,
             // OBJECT_ID will return NULL and @Column_Names will remain non-null. The subsequent
@@ -526,6 +527,11 @@ private string CreateInitialQuery()
             // we use STRING_AGG in that case and the COALESCE method otherwise.
             //
             // See: https://learn.microsoft.com/en-us/sql/t-sql/functions/serverproperty-transact-sql
+            //
+            // All of this is wrapped in an test against HAS_PERMS_BY_NAME. This test verifies that
+            // the user possesses the necessary permissions to access sys.all_columns. If they do not
+            // @Column_Names will remain NULL (and be coalesced to *) and SqlBulkCopy will degrade
+            // gracefully, silently dropping support for hidden columns and column aliases.
             return $"""
 SELECT @@TRANCOUNT;
 
@@ -535,6 +541,7 @@ private string CreateInitialQuery()
 DECLARE @Column_Name_Query_SORT NVARCHAR(MAX);
 DECLARE @Column_Name_Query NVARCHAR(MAX);
 DECLARE @Column_Names NVARCHAR(MAX) = NULL;
+DECLARE @Has_Sys_All_Columns_Permissions INT = HAS_PERMS_BY_NAME('{catalogNameStringLiteral}.[sys].[all_columns]', 'OBJECT', 'SELECT');
 
 CREATE TABLE #Column_Aliases
 (
@@ -554,28 +561,35 @@ IF CAST(SERVERPROPERTY('EngineEdition') AS INT) = 6
     SET @Column_Name_Query_SORT = N'ORDER BY [column_id] ASC';
 END
 
-IF EXISTS (SELECT TOP 1 * FROM sys.all_columns WHERE [object_id] = OBJECT_ID('sys.all_columns') AND [name] = 'graph_type')
-BEGIN
-    SET @Column_Name_Query_FILTER = N'WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) NOT IN (1, 3, 4, 6, 7)';
-
-    EXEC sp_executesql N'
-    INSERT INTO #Column_Aliases ([Canonical_Column_Name], [Canonical_Column_Id], [Aliased_Column_Name])
-        SELECT [name], [column_id], ''$to_id'' FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 8
-    UNION ALL
-        SELECT [name], [column_id], ''$from_id'' FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 5
-    UNION ALL
-        SELECT [name], [column_id], ''$edge_id'' FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 2 AND [name] LIKE ''$edge[_]id[_]%''
-    UNION ALL
-        SELECT [name], [column_id], ''$node_id'' FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 2 AND [name] LIKE ''$node[_]id[_]%''',
-    N'@Object_ID INT', @Object_ID = @Object_ID
-END
-ELSE
+IF @Has_Sys_All_Columns_Permissions = 1
 BEGIN
-    SET @Column_Name_Query_FILTER = N'WHERE [object_id] = @Object_ID';
+    IF EXISTS (SELECT TOP 1 * FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = OBJECT_ID('{catalogNameStringLiteral}.[sys].[all_columns]') AND [name] = 'graph_type')
+    BEGIN
+        SET @Column_Name_Query_FILTER = N'WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) NOT IN (1, 3, 4, 6, 7)';
+
+        EXEC sp_executesql N'
+        INSERT INTO #Column_Aliases ([Canonical_Column_Name], [Canonical_Column_Id], [Aliased_Column_Name])
+            SELECT [name], [column_id], ''$to_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 8
+        UNION ALL
+            SELECT [name], [column_id], ''$from_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 5
+        UNION ALL
+            SELECT [name], [column_id], ''$edge_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 2 AND [name] LIKE ''$edge[_]id[_]%''
+        UNION ALL
+            SELECT [name], [column_id], ''$node_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 2 AND [name] LIKE ''$node[_]id[_]%''',
+        N'@Object_ID INT', @Object_ID = @Object_ID
+    END
+    ELSE
+    BEGIN
+        SET @Column_Name_Query_FILTER = N'WHERE [object_id] = @Object_ID';
+    END
+    SET @Column_Name_Query = @Column_Name_Query_SELECT + ' FROM {catalogNameStringLiteral}.[sys].[all_columns] ' + @Column_Name_Query_FILTER + ' ' + @Column_Name_Query_SORT + ';'
+
+    EXEC sp_executesql @Column_Name_Query, N'@Object_ID INT, @Column_Names NVARCHAR(MAX) OUTPUT', @Object_ID = @Object_ID, @Column_Names = @Column_Names OUTPUT;
+
+    DELETE FROM #Column_Aliases
+    WHERE [Aliased_Column_Name] IN (SELECT [name] FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID)
 END
-SET @Column_Name_Query = @Column_Name_Query_SELECT + ' FROM {CatalogName}.[sys].[all_columns] ' + @Column_Name_Query_FILTER + ' ' + @Column_Name_Query_SORT + ';'
 
-EXEC sp_executesql @Column_Name_Query, N'@Object_ID INT, @Column_Names NVARCHAR(MAX) OUTPUT', @Object_ID = @Object_ID, @Column_Names = @Column_Names OUTPUT;
 SELECT @Column_Names = COALESCE(@Column_Names, '*');
 
 SET FMTONLY ON;
@@ -586,7 +600,6 @@ UNION ALL
 
 SELECT [Canonical_Column_Name], [Aliased_Column_Name]
 FROM #Column_Aliases
-WHERE [Aliased_Column_Name] NOT IN (SELECT [name] FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID)
 ORDER BY [Canonical_Column_Id] ASC
 
 DROP TABLE #Column_Aliases
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
index 78fa16080f..a74da79697 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
@@ -10,19 +10,28 @@ namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 /// Base class for a transient database object (such as a table, type or
 /// stored procedure.)
 /// </summary>
-public abstract class DatabaseObject : IDisposable
+/// <typeparam name="TState">
+/// The type of the internal state accessible to derived types at the point of object creation
+/// via the <see cref="State"/> property.
+/// </typeparam>
+public abstract class DatabaseObject<TState> : IDisposable
 {
     private readonly bool _shouldDrop;
 
     protected SqlConnection Connection { get; }
 
+    protected TState State { get; }
+
     public string Name { get; }
 
-    protected DatabaseObject(SqlConnection connection, string name, string definition, bool shouldCreate, bool shouldDrop)
+    public string UnescapedName => Name.Substring(1, Name.Length - 2).Replace("]]", "]");
+
+    protected DatabaseObject(SqlConnection connection, string name, string definition, TState state, bool shouldCreate, bool shouldDrop)
     {
         _shouldDrop = shouldDrop;
 
         Connection = connection;
+        State = state;
         Name = name;
 
         if (shouldCreate)
@@ -259,3 +268,15 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
 }
+
+/// <summary>
+/// Base class for a transient database object (such as a table, type or
+/// stored procedure.)
+/// </summary>
+public abstract class DatabaseObject : DatabaseObject<object?>
+{
+    protected DatabaseObject(SqlConnection connection, string name, string definition, bool shouldCreate, bool shouldDrop)
+        : base(connection, name, definition, state: null, shouldCreate, shouldDrop)
+    {
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs
new file mode 100644
index 0000000000..bc94bc78ef
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs
@@ -0,0 +1,67 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// A transient database user, created at the start of its scope and dropped when disposed.
+/// </summary>
+/// <remarks>
+/// This class assumes that the associated server login already exists.
+/// </remarks>
+public sealed class DatabaseUser : DatabaseObject<string>
+{
+    public string DatabaseName => State;
+
+    /// <summary>
+    /// Initializes a new instance of the DatabaseUser class using the specified SQL connection
+    /// and associated server login.
+    /// </summary>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="database">The name of the database where the user will be created.</param>
+    /// <param name="login">The server login which the database user will be associated with.</param>
+    public DatabaseUser(SqlConnection connection, string database, ServerLogin login)
+        : base(connection, login.Name, $"FOR LOGIN {login.Name}", state: database, shouldCreate: true, shouldDrop: true)
+    {
+    }
+
+    protected override void CreateObject(string definition)
+    {
+        using SqlCommand createCommand = new($"CREATE USER {Name} {definition}", Connection);
+
+        ExecuteCommandInDatabase(createCommand);
+    }
+
+    protected override void DropObject()
+    {
+        using SqlCommand dropCommand = new($"IF USER_ID('{UnescapedName}') IS NOT NULL DROP USER {Name}", Connection);
+
+        ExecuteCommandInDatabase(dropCommand);
+    }
+
+    private void ExecuteCommandInDatabase(SqlCommand command)
+    {
+        // In some cases, we want to manage a database user in a different database to the one that the connection
+        // currently has open. In such a case, we need to change the database context for the command execution
+        // and then restore it afterwards.
+        string? originalDatabase = DatabaseName == command.Connection.Database ? null : command.Connection.Database;
+
+        try
+        {
+            if (originalDatabase is not null)
+            {
+                command.Connection.ChangeDatabase(DatabaseName);
+            }
+
+            command.ExecuteNonQuery();
+        }
+        finally
+        {
+            if (originalDatabase is not null)
+            {
+                command.Connection.ChangeDatabase(originalDatabase);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs
new file mode 100644
index 0000000000..154899e9b3
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs
@@ -0,0 +1,99 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Security.Cryptography;
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// A transient server login, created at the start of its scope and dropped when disposed.
+/// </summary>
+public sealed class ServerLogin : DatabaseObject<string>
+{
+    public string Password => State;
+
+    /// <summary>
+    /// Initializes a new instance of the ServerLogin class using the specified SQL connection, login name prefix, and default database.
+    /// The login will be created with a randomly generated password that meets SQL Server's password complexity requirements.
+    /// </summary>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="namePrefix">The prefix for the login name.</param>
+    /// <param name="defaultDatabase">The default database for the login. If null, not set.</param>
+    public ServerLogin(SqlConnection connection, string namePrefix, string? defaultDatabase = null)
+        : this(connection, GenerateLongName(namePrefix), GeneratePassword(), defaultDatabase)
+    {
+    }
+
+    private ServerLogin(SqlConnection connection, string namePrefix, string password, string? defaultDatabase)
+        : base(connection, namePrefix, GenerateDefinition(password, defaultDatabase), state: password, shouldCreate: true, shouldDrop: true)
+    {
+    }
+
+    private static string GenerateDefinition(string password, string? defaultDatabase) =>
+        $"WITH PASSWORD='{password}'" +
+            (string.IsNullOrEmpty(defaultDatabase) ? string.Empty : $", DEFAULT_DATABASE=[{defaultDatabase}]");
+
+    /// <summary>
+    /// Generates a password which meets the SQL Server password complexity requirements, which are:
+    /// <list type="number">
+    /// <item>Minimum length of 8 characters</item>
+    /// <item>Must contain characters from three of the following four categories:</item>
+    /// <list type="number">
+    /// <item>Uppercase letters (A-Z)</item>
+    /// <item>Lowercase letters (a-z)</item>
+    /// <item>Digits (0-9)</item>
+    /// <item>Non-alphanumeric characters (e.g. !, $, #, %)</item>
+    /// </list>
+    /// </list>
+    /// </summary>
+    /// <returns>A compliant password.</returns>
+    private static string GeneratePassword()
+    {
+        const int PasswordLength = 16;
+        const char UpperCaseStart = 'A';
+        const char LowerCaseStart = 'a';
+        const char DigitsStart = '0';
+
+        // First 5 characters are uppercase letters, next 5 are lowercase letters, and the last 6 are digits
+        Span<char> passwordDigits = stackalloc char[PasswordLength];
+        byte[] randomBytes = new byte[PasswordLength];
+        using RandomNumberGenerator rndGen = RandomNumberGenerator.Create();
+
+        rndGen.GetBytes(randomBytes);
+        for(int i = 0; i < 5; i++)
+        {
+            passwordDigits[i] = (char)(UpperCaseStart + Scale(randomBytes[i], byte.MaxValue, 26));
+        }
+        for (int i = 5; i < 10; i++)
+        {
+            passwordDigits[i] = (char)(LowerCaseStart + Scale(randomBytes[i], byte.MaxValue, 26));
+        }
+        for (int i = 10; i < PasswordLength; i++)
+        {
+            passwordDigits[i] = (char)(DigitsStart + Scale(randomBytes[i], byte.MaxValue, 10));
+        }
+
+        return passwordDigits.ToString();
+
+        // Scales a byte value from the range [0, 255) to the range [0, newMaximum)
+        static int Scale(byte value, int existingMaximum, int newMaximum)
+        {
+            return (int)((double)value / (existingMaximum + 1) * newMaximum);
+        }
+    }
+
+    protected override void CreateObject(string definition)
+    {
+        using SqlCommand createCommand = new($"CREATE LOGIN {Name} {definition}", Connection);
+
+        createCommand.ExecuteNonQuery();
+    }
+
+    protected override void DropObject()
+    {
+        using SqlCommand dropCommand = new($"IF SUSER_ID('{UnescapedName}') IS NOT NULL DROP LOGIN {Name}", Connection);
+
+        dropCommand.ExecuteNonQuery();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
index 23ff5ed245..17a613294b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
@@ -45,10 +45,10 @@ public void Test()
                         using (DbDataReader reader = srcCmd.ExecuteReader())
                         {
                             IDictionary stats;
-                            long expectedIduCount = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 1 : 0;
-                            long expectedSelectCount = DataTestUtility.IsAzureSynapse ? 4 : 12;
-                            long expectedSelectRows = DataTestUtility.IsAzureSynapse ? 4 : 14;
-                            long expectedTransactions = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 1 : 0;
+                            long expectedIduCount = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 2 : 0;
+                            long expectedSelectCount = DataTestUtility.IsAzureSynapse ? 4 : 13;
+                            long expectedSelectRows = DataTestUtility.IsAzureSynapse ? 4 : 15;
+                            long expectedTransactions = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 2 : 0;
                             using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                             {
                                 bulkcopy.DestinationTableName = dstTable;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs
new file mode 100644
index 0000000000..08915e30ab
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs
@@ -0,0 +1,208 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SqlBulkCopyTests;
+
+#nullable enable
+
+/// <summary>
+/// Some unprivileged users may not have permissions to query sys.all_columns, which is used to
+/// handle column aliases. These tests verify that bulk copy operations can handle such situations
+/// gracefully, falling back and ignoring column aliases.
+/// </summary>
+[Trait("Set", "2")]
+public sealed class UnprivilegedLogin : IDisposable
+{
+    private readonly SqlConnection? _managementConnection;
+    private readonly ServerLogin? _unprivilegedLogin;
+    private readonly DatabaseUser? _unprivilegedMasterUser;
+    private readonly DatabaseUser? _unprivilegedAppUser;
+
+    private readonly string? _unprivilegedConnectionString;
+
+    public static bool CanRunTests =>
+        DataTestUtility.AreConnStringsSetup() && DataTestUtility.IsNotAzureServer()
+            && DataTestUtility.CanCreateLogins && DataTestUtility.CanUseSqlAuthentication;
+
+    public UnprivilegedLogin()
+    {
+        // xUnit will instantiate the class before evaluating the test condition - make sure that we don't
+        // attempt to make use of these capabilities if the server doesn't support them.
+        // This has the expected nullability implications, so AssertEnvironmentCreated needs to be called
+        // before any test logic. The compiler asserts these for us.
+        if (!CanRunTests)
+        {
+            return;
+        }
+
+        // We require two connections: a "management" connection which has permissions to create logins,
+        // create users and modify permissions; and an "unprivileged" connection, which is used to perform
+        // the actual tests. The user associated with the latter connection will be denied SELECT permissions
+        // over master.sys.all_columns.
+        _managementConnection = new SqlConnection(DataTestUtility.TCPConnectionString);
+        _managementConnection.Open();
+
+        _unprivilegedLogin = new ServerLogin(_managementConnection, nameof(UnprivilegedLogin), _managementConnection.Database);
+        _unprivilegedAppUser = new DatabaseUser(_managementConnection, _managementConnection.Database, _unprivilegedLogin);
+        _unprivilegedMasterUser = new DatabaseUser(_managementConnection, "master", _unprivilegedLogin);
+
+        using (SqlCommand permissionsModificationCommand = _managementConnection.CreateCommand())
+        {
+            permissionsModificationCommand.CommandText = $"DENY SELECT ON [master].[sys].[all_columns] TO {_unprivilegedMasterUser.Name}";
+            permissionsModificationCommand.ExecuteNonQuery();
+
+            permissionsModificationCommand.CommandText = $"DENY SELECT ON [{_managementConnection.Database}].[sys].[all_columns] TO {_unprivilegedAppUser.Name}";
+            permissionsModificationCommand.ExecuteNonQuery();
+        }
+
+        SqlConnectionStringBuilder tcpConnectionBuilder = new(DataTestUtility.TCPConnectionString)
+        {
+            IntegratedSecurity = false,
+            UserID = _unprivilegedLogin.UnescapedName,
+            Password = _unprivilegedLogin.Password,
+            // Disable connection pooling - we'll be dropping this login once the tests complete, and this can only happen once all connections
+            // using it are closed.
+            Pooling = false
+        };
+
+        _unprivilegedConnectionString = tcpConnectionBuilder.ConnectionString;
+    }
+
+    /// <summary>
+    /// This method enables nullability assertions to operate as expected. It'll always pass if CanRunTests is
+    /// true - the constructor will have initialized the relevant fields.
+    /// </summary>
+    [MemberNotNull(nameof(_managementConnection),
+        nameof(_unprivilegedLogin),
+        nameof(_unprivilegedMasterUser),
+        nameof(_unprivilegedAppUser),
+        nameof(_unprivilegedConnectionString))]
+    private void AssertEnvironmentCreated()
+    {
+        Assert.NotNull(_managementConnection);
+        Assert.NotNull(_unprivilegedLogin);
+        Assert.NotNull(_unprivilegedMasterUser);
+        Assert.NotNull(_unprivilegedAppUser);
+        Assert.NotNull(_unprivilegedConnectionString);
+    }
+
+    /// <summary>
+    /// Verifies that a bulk copy operation succeeds when performed by a user with only SELECT and INSERT permissions,
+    /// without requiring access to metadata views.
+    /// </summary>
+    [ConditionalFact(nameof(CanRunTests))]
+    public void BulkCopyWithoutMetadataPermission_Succeeds()
+    {
+        AssertEnvironmentCreated();
+
+        const int BulkCopyRowCount = 5;
+
+        using DataTable srcDataTable = new()
+        {
+            Columns = { new DataColumn("Description", typeof(string)) }
+        };
+        using Table dstTable = new(_managementConnection, nameof(BulkCopyWithoutMetadataPermission_Succeeds), "([Description] VARCHAR(100))");
+        using (SqlCommand permissionsConfigurationCommand = new($"GRANT SELECT, INSERT ON {dstTable.Name} TO {_unprivilegedAppUser.Name}", _managementConnection))
+        {
+            permissionsConfigurationCommand.ExecuteNonQuery();
+        }
+
+        using SqlBulkCopy nodeCopy = new(_unprivilegedConnectionString);
+
+        for (int i = 0; i < BulkCopyRowCount; i++)
+        {
+            srcDataTable.Rows.Add($"Description {i}");
+        }
+
+        nodeCopy.DestinationTableName = dstTable.Name;
+        nodeCopy.ColumnMappings.Add("Description", "Description");
+        nodeCopy.WriteToServer(srcDataTable);
+
+        int resultantRowCount;
+        using (SqlCommand rowCountQuery = new($"SELECT COUNT(*) FROM {dstTable.Name}", _managementConnection))
+        {
+            resultantRowCount = (int)rowCountQuery.ExecuteScalar();
+        }
+
+        Assert.Equal(BulkCopyRowCount, resultantRowCount);
+    }
+
+    [ConditionalFact(nameof(CanRunTests))]
+    public void BulkCopyWithoutMetadataPermission_FailsWhenUsingAliases()
+    {
+        AssertEnvironmentCreated();
+
+        using DataTable edges = new DataTable()
+        {
+            Columns = { new DataColumn("To_ID", typeof(string)), new DataColumn("From_ID", typeof(string)), new DataColumn("Description", typeof(string)) }
+        };
+
+        // Use the management connection to create the source and the destination tables, grant the
+        // unprivileged user permissions over them and insert some sample data into the source table.
+        using Table srcNodeTable = new(_managementConnection, nameof(BulkCopyWithoutMetadataPermission_FailsWhenUsingAliases), "([Name] VARCHAR(100)) AS NODE");
+        using Table dstEdgeTable = new(_managementConnection, nameof(BulkCopyWithoutMetadataPermission_FailsWhenUsingAliases), "([Description] VARCHAR(100)) AS EDGE");
+        using (SqlCommand permissionsConfigurationCommand = _managementConnection.CreateCommand())
+        {
+            permissionsConfigurationCommand.CommandText = $"GRANT SELECT, INSERT ON {srcNodeTable.Name} TO {_unprivilegedAppUser.Name}";
+            permissionsConfigurationCommand.ExecuteNonQuery();
+
+            permissionsConfigurationCommand.CommandText = $"GRANT SELECT, INSERT ON {dstEdgeTable.Name} TO {_unprivilegedAppUser.Name}";
+            permissionsConfigurationCommand.ExecuteNonQuery();
+        }
+
+        string sampleNodeDataCommand = @$"INSERT INTO {srcNodeTable.Name} ([Name]) SELECT LEFT([name], 100) FROM sys.sysobjects";
+        using (SqlCommand insertSampleNodes = new(sampleNodeDataCommand, _managementConnection))
+        {
+            insertSampleNodes.ExecuteNonQuery();
+        }
+
+        using (SqlCommand nodeQuery = new($"SELECT $node_id FROM {srcNodeTable.Name}", _managementConnection))
+        using (SqlDataReader reader = nodeQuery.ExecuteReader())
+        {
+            bool firstRead = reader.Read();
+            string toId;
+            string fromId;
+
+            Assert.True(firstRead);
+            toId = reader.GetString(0);
+
+            while (reader.Read())
+            {
+                fromId = reader.GetString(0);
+
+                edges.Rows.Add(toId, fromId, "Test Description");
+                toId = fromId;
+            }
+        }
+
+        // With all source data populated, try to use the unprivileged connection to perform a bulk copy
+        // using aliases in the column mappings. This should fail - the permissions error will be caught,
+        // and SqlBulkCopy should simply report that the destination column doesn't exist.
+        using SqlBulkCopy edgeCopy = new(_unprivilegedConnectionString);
+
+        edgeCopy.DestinationTableName = dstEdgeTable.Name;
+        edgeCopy.ColumnMappings.Add("To_ID", "$to_id");
+        edgeCopy.ColumnMappings.Add("From_ID", "$from_id");
+        edgeCopy.ColumnMappings.Add("Description", "Description");
+
+        Action failingEdgeCopy = () => edgeCopy.WriteToServer(edges);
+        InvalidOperationException missingColumnException = Assert.Throws<InvalidOperationException>(failingEdgeCopy);
+
+        Assert.Contains("'$to_id,$from_id'", missingColumnException.Message);
+    }
+
+    public void Dispose()
+    {
+        _unprivilegedAppUser?.Dispose();
+        _unprivilegedMasterUser?.Dispose();
+        _unprivilegedLogin?.Dispose();
+        _managementConnection?.Dispose();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index 9bf1c0f519..bd7f6eb262 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -98,6 +98,10 @@ public static class DataTestUtility
         private static bool? s_isVectorSupported;
         private static bool? s_isVectorFloat16Supported;
 
+        // Login permissions
+        private static bool? s_isSysAdmin;
+        private static bool? s_isSecurityAdmin;
+
         // Azure Synapse EngineEditionId == 6
         // More could be read at https://learn.microsoft.com/en-us/sql/t-sql/functions/serverproperty-transact-sql?view=sql-server-ver16#propertyname
         public static bool IsAzureSynapse
@@ -245,6 +249,20 @@ private static bool CheckVectorFloat16Supported()
             }
         }
 
+        public static bool IsSysAdmin =>
+            s_isSysAdmin ??= IsTCPConnStringSetup() &&
+                IsServerRoleMember("sysadmin");
+
+        public static bool IsSecurityAdmin =>
+            s_isSecurityAdmin ??= IsTCPConnStringSetup() &&
+                IsServerRoleMember("securityadmin");
+
+        public static bool CanCreateLogins =>
+            IsSysAdmin || IsSecurityAdmin;
+
+        public static bool CanUseSqlAuthentication =>
+            IsSysAdmin && GetAuthenticationMode() == 2;
+
         static DataTestUtility()
         {
             Config c = Config.Load();
@@ -547,6 +565,30 @@ public static bool IsTypePresent(string typeName)
             return (int)command.ExecuteScalar() > 0;
         }
 
+        public static bool IsServerRoleMember(string roleName)
+        {
+            using SqlConnection connection = new(TCPConnectionString);
+            using SqlCommand command = new("SELECT IS_SRVROLEMEMBER(@role)", connection);
+
+            connection.Open();
+            command.Parameters.AddWithValue("@role", roleName);
+
+            // IS_SRVROLEMEMBER returns 1 if the caller is a member of the specified server role, 0 if not, and DBNull.Value if the role is not valid.
+            return command.ExecuteScalar() is int result && result == 1;
+        }
+
+        public static int GetAuthenticationMode()
+        {
+            using SqlConnection connection = new(TCPConnectionString);
+
+            connection.Open();
+            using SqlCommand command = new("EXEC xp_instance_regread N'HKEY_LOCAL_MACHINE', N'Software\\Microsoft\\MSSQLServer\\MSSQLServer', N'LoginMode'", connection);
+            using SqlDataReader reader = command.ExecuteReader();
+
+            reader.Read();
+            return reader.GetInt32(1);
+        }
+
         public static bool IsAdmin
         {
             get
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Extensions/CodeAnalysis.netfx.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/Extensions/CodeAnalysis.netfx.cs
new file mode 100644
index 0000000000..da40f53141
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Extensions/CodeAnalysis.netfx.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NETFRAMEWORK
+
+namespace System.Diagnostics.CodeAnalysis;
+
+// These classes are provided to provide compile-time support for Microsoft.CodeAnalysis
+// attributes. These attributes are native to netcore and available for netfx as a nuget
+// package - but only for net472. As such, until net462 support is dropped, these placeholder
+// classes will need to exist if we want to use them for static analysis.
+
+#nullable enable
+
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+internal sealed class MemberNotNullAttribute : Attribute
+{
+    public MemberNotNullAttribute(string member) => Members = [member];
+
+    public MemberNotNullAttribute(params string[] members) => Members = members;
+
+    public string[] Members { get; }
+}
+#endif
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs
index c1e4bad178..aef5c1bc7e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/XEventsTracingTest.cs
@@ -120,7 +120,7 @@ public void XEventActivityIDConsistentWithTracing_RpcStarting()
 
             // Our stored procedure name is an escaped SQL Server object name. This will not match the object_name data
             // in the XEvent XML, which records it as an unescaped name.
-            string unescapedProcedureName = sp.Name.Substring(1, sp.Name.Length - 2).Replace("]]", "]");
+            string unescapedProcedureName = sp.UnescapedName;
 
             VerifyXEventActivityIDConsistentWithTracing(unescapedProcedureName, System.Data.CommandType.StoredProcedure, "rpc_starting");
         }

From bea6bd8e3235f0259e72c69cd4de9fd189a8cf02 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Tue, 23 Jun 2026 21:46:36 +0530
Subject: [PATCH 157/298] Add configurable idle connection timeout (ADO #39970)
 (#4295)

* Add configurable idle connection timeout (ADO #39970)

Implements spec User Stories 1, 2, 4 + FR-009 of US3 from specs/003-pool-idle-timeout/spec.md.

Adds 'Connection Idle Timeout' keyword (synonym: 'Pool Idle Timeout') exposed via SqlConnectionStringBuilder.IdleTimeout. When > 0, connections that have sat idle in the pool longer than the configured number of seconds are discarded on retrieval and a fresh connection is returned. Default 0 (disabled) matches the existing convention used by LoadBalanceTimeout and ConnectionLifetime.

Covers both pool designs (ChannelDbConnectionPool, WaitHandleDbConnectionPool).

Deferred to follow-up: proactive timer sweep (FR-008, FR-010) which the spec assumes is built on top of the pruning feature (#37338).

* Address Copilot review feedback on #4295

- Fix stale comment in ChannelDbConnectionPool.IsLiveConnection: IdleSinceUtc
  is initialized to CreateTime, not DateTime.MinValue.
- Add WaitHandleDbConnectionPoolIdleTimeoutTest mirroring the existing
  channel-pool idle-timeout coverage (stamp on return, zero disables expiry,
  expired connection is replaced, fresh connection is reused).

* Address PR #4295 inline review feedback

- Skip MarkPooledIdle on return when IdleTimeout == TimeSpan.Zero so the
  default config has no per-return DateTime.UtcNow on the hot path. Applies
  to ChannelDbConnectionPool.ReturnInternalConnection and
  WaitHandleDbConnectionPool.PutNewObject.
- Stamp IdleSinceUtc when returning a connection into the transacted pool
  (WaitHandleDbConnectionPool.DeactivateObject before
  TransactedConnectionPool.PutTransactedObject) so idle expiry on the next
  retrieval measures time spent parked in the transacted pool, not time
  since create-time / last general-pool return.
- Add 2 WaitHandle pool tests covering the new behavior:
  IdleTimeout_TransactedPool_StampsOnReturn and
  IdleTimeout_Zero_DoesNotStampOnReturn.

* Address PR review: default IdleTimeout=300, remove synonym, drop transacted idle handling

- Default Connection Idle Timeout 0 -> 300 (5 min, matches Npgsql); 0 disables.

- Remove 'Pool Idle Timeout' synonym; the canonical keyword is the only accepted form.

- Make idleTimeout a required parameter on DbConnectionPoolGroupOptions; defaults now live in DbConnectionStringDefaults.

- Use TimeSpan.FromSeconds for the ctor body conversion.

- WaitHandle pool: drop MarkPooledIdle() on transacted-pool return and remove the idle-expiry check on transacted-pool retrieval (transacting connections must never be proactively closed).

- WaitHandle pool: reorder general-pool retrieval to check idle expiry before the liveness probe; derive _cleanupWait from IdleTimeout when set.

- Channel pool: reorder IsLiveConnection so the idle check runs before IsConnectionAlive().

- Tests, doc snippet, and release notes updated accordingly.

* Address PR #4295 review feedback on idle timeout behavior

* Remove Pool Idle Timeout synonym; keep only canonical Connection Idle Timeout keyword

* Address review feedback for idle connection timeout

- Colocate idleTimeout < 0 validation with the _idleTimeout assignment in DbConnectionPoolOptions

- Clean up WaitHandle cleanup-wait conditional and halve the interval (two pruning cycles per eviction)

- Vague-up IdleTimeout doc/resx wording per reviewer (drop 'on the next retrieval attempt' / lifecycle commitments)

- Toggle UseLegacyIdleTimeoutBehavior in WaitHandle idle-timeout tests and replace reflection-based BackdateIdleSince with direct internal setter

* Address Paul's review feedback: rename and doc cleanup

- SqlConnectionStringBuilder.xml IdleTimeout doc: simplify <value>,
  move default into <summary>, "close" -> "discard",
  "recycled" -> "discarded".
- Rename DbConnectionInternal.IdleSinceUtc -> ReturnedTime
  (drop Utc suffix per Paul; align with sibling CreateTime which
  is also UTC but unsuffixed).
- Rename DbConnectionInternal.MarkPooledIdle() -> ReturnedToPool()
  and reword its XML doc to record a fact ("this connection was
  returned to the pool") rather than assert pool policy ("idle"),
  per Paul's policy/mechanism separation.
- Update call sites in ChannelDbConnectionPool and
  WaitHandleDbConnectionPool to the new names; update comments
  to match.
- Rename test helper BackdateIdleSince -> BackdateReturnedTime in
  both pool test files for consistency.

* Apply review feedback: drop guard, overflow-safe expiry, Yoda swap, 3-state ctor

- ChannelDbConnectionPool.ReturnInternalConnection / WaitHandleDbConnectionPool.PutNewObject:
  drop the (!UseLegacyIdleTimeoutBehavior && IdleTimeout != Zero) guard around
  ReturnedToPool(); always stamp. The read path short-circuits when expiry is
  disabled, so the stamp is harmless and the unconditional call removes the
  duplicated guard and its "must always be checked together" maintenance trap.
- ChannelDbConnectionPool.IsLiveConnection / WaitHandleDbConnectionPool.IsIdleExpired:
  rewrite expiry check from "UtcNow > ReturnedTime + idleTimeout" to
  "UtcNow - ReturnedTime > idleTimeout" so the comparison cannot throw when
  ReturnedTime is close to DateTime.MaxValue; negative TimeSpan on clock skew
  falls through as not-expired (fail safe).
- DbConnectionPoolOptions: swap Yoda-form "if (0 != idleTimeout)" to natural
  "if (idleTimeout != 0)". Pre-existing loadBalanceTimeout line left untouched.
- WaitHandleDbConnectionPool ctor: split the cleanup-wait initialization into
  three explicit branches (Legacy / New+enabled / New+disabled) so the state
  model is documented in the code structure. Same observable behavior as before.
- Tests: remove IdleTimeout_Zero_DoesNotStampOnReturn which pinned the now-
  removed optimization; the user-visible "IdleTimeout=0 -> never expires"
  invariant is still covered by IdleTimeout_Zero_DoesNotExpire.

* Re-add legacy-switch guard around ReturnedToPool stamp

Skip the per-return DateTime.UtcNow when UseLegacyIdleTimeoutBehavior is on or IdleTimeout == 0, matching the short-circuit in IsLiveConnection / IsIdleExpired. Addresses Copilot review feedback.

* Fix merge conflict damage in LocalAppContextSwitchesHelper

The 'accept both' merge resolution dropped a SetSwitchValue( token in Dispose()
and a closing brace plus /// <summary> between UseLegacyIdleTimeoutBehavior and
UseOverallConnectTimeoutForPoolWait, causing CS1002/CS1513 compile errors.

* Fix merge conflict damage in LocalAppContextSwitches

The 'accept both' merge dropped the opening /// <summary> line on three
UseOverallConnectTimeoutForPoolWait XML doc comments (const string,
cached SwitchValue field, and public property), leaving them malformed.

* Pass idleTimeout to DbConnectionPoolGroupOptions in budget test

WaitHandleDbConnectionPoolBudgetTest was added in main while this branch
was in flight; updating its DbConnectionPoolGroupOptions construction to
pass idleTimeout: 0 fixes the CS7036 net462 build error.

* Add TimeoutTimer arg to TryGetConnection / idleTimeout to DbConnectionPoolGroupOptions in new idle-timeout tests

Main added a TimeoutTimer parameter to ChannelDbConnectionPool.TryGetConnection
and WaitHandleDbConnectionPool.TryGetConnection while this branch was in flight.
The new idle-timeout tests still used the old 3-arg form, causing CS7036 on net9.0.
Also missed one DbConnectionPoolGroupOptions ctor call in ConcurrentCallers test.

* Address PR #4295 Copilot review: document UseLegacyIdleTimeoutBehavior switch and tighten idle-timeout test coverage

- Delete redundant IdleTimeout_DefaultIsZero_DisablesExpiry from ChannelDbConnectionPoolTest. The 'default' framing was misleading (the builder-layer default is 300, not 0) and the zero-as-argument path is already covered by IdleTimeout_PoolGroupOptions_ConvertsSecondsToTimeSpan and IdleTimeout_Zero_DoesNotExpire.

- Add IdleTimeout_LegacySwitch_SuppressesEviction to both ChannelDbConnectionPoolTest and WaitHandleDbConnectionPoolIdleTimeoutTest. Flips UseLegacyIdleTimeoutBehavior=true via LocalAppContextSwitchesHelper, back-dates ReturnedTime well past the 1-second timeout, and asserts the connection is still reused. Closes the coverage gap on switch gating in both pool implementations.

- Document the gating in the public surfaces: extend SqlConnectionStringBuilder.xml <remarks> with a paragraph describing the Switch.Microsoft.Data.SqlClient.UseLegacyIdleTimeoutBehavior AppContext switch (defaults to true), and the three opt-out mechanisms (AppContext.SetSwitch, <RuntimeHostConfigurationOption>, runtimeconfig.json). Mirror the gating note in DbConnectionString_IdleTimeout in Strings.resx and the auto-generated Strings.Designer.cs accessor so the [ResDescription] surfaced in property grids matches.

* Address PR 4295 review feedback: cleanup cadence, idle-eviction gate, and SetReturnedTime rename

- WaitHandleDbConnectionPool ctor: collapse the three _cleanupWait branches into
  two (legacy-switch OR IdleTimeout==Zero -> historical 2-4 min window; else use
  configured timeout/2) per Paul's suggestion, and floor the new-behavior period
  at 1000 ms so small IdleTimeout values don't schedule a sub-second timer.
- WaitHandleDbConnectionPool.CleanupCallback: gate both the destroy and the
  new->old age sweeps on a single `idleEvictionDisabled'' check
  (`!UseLegacyIdleTimeoutBehavior && IdleTimeout == Zero'') so the
  `OFF + 0 = disabled entirely'' case is honored. The MinPoolSize-floor
  re-queue below the gates still runs.
- Rename DbConnectionInternal.ReturnedToPool -> SetReturnedTime and update both
  call sites (WaitHandle, Channel) and the related comment. The name now
  describes the mechanism (the connection stamps its returned time) and reads
  cleanly when the pool decides to skip the call because nothing will read
  the stamp.
- Add WaitHandleDbConnectionPoolIdleTimeoutTest
  IdleTimeout_LegacyOff_Zero_CleanupCallbackDoesNotEvict covering the new
  CleanupCallback gate. Reaches the private method via reflection.

* Fix ChannelDbConnectionPoolPruningTest: pass idleTimeout: 0 to DbConnectionPoolGroupOptions ctor (required after PR 4295)

* Address PR 4295 review: gate WaitHandleDbConnectionPool destroy loop on IsIdleExpired

With _cleanupWait = IdleTimeout/2, the legacy two-stack generational sweep in CleanupCallback could destroy a connection from _stackOld after as little as ~IdleTimeout/2 of real idle time, violating the new contract that connections are only destroyed once their idle age exceeds IdleTimeout.

Add a per-connection IsIdleExpired check inside the destroy loop: when the new behaviour is enabled and the popped connection has not yet exceeded IdleTimeout, push it back onto _stackOld, release the semaphore count, and break out of the tick. The next cleanup tick reconsiders. Legacy behaviour (switch on or IdleTimeout = 0) is untouched and continues to destroy unconditionally as before.

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Address PR 4295 open reviews: revert CleanupCallback IsIdleExpired gate, clarify IdleTimeout doc, rename idleEvictionDisabled -> idleEvictionEnabled

- WaitHandleDbConnectionPool.CleanupCallback: revert the per-connection IsIdleExpired short-circuit added in e9993108 (mdaigle). _stackOld is LIFO and not age-ordered after a _stackNew promotion pass, so breaking on the first non-expired top could indefinitely hide older connections underneath under sustained traffic. Pruning is back to unconditional, matching the legacy 1-to-2-tick upper bound on idle lifetime.

- DbConnectionPoolOptions.IdleTimeout XML doc: state that eviction is best-effort, runs on retrieval and during periodic maintenance, and may occasionally fire earlier than the configured value (copilot).

- WaitHandleDbConnectionPool: flip the local bool from idleEvictionDisabled (only ever read negated) to idleEvictionEnabled for readability (paulmedynski).

* Clarify IdleTimeout doc: spell out the half-timeout early-eviction case

Addresses paulmedynski's non-gating doc suggestion on PR 4295. The previous
wording said connections 'may occasionally be evicted earlier than the
configured value' without explaining when or by how much. Updated to make
the scenario concrete: because maintenance runs on a fixed cadence shorter
than the timeout, a connection that becomes idle just before a maintenance
pass may be discarded after roughly half the configured timeout. Stays
implementation-agnostic so the shared DbConnectionPoolGroupOptions doc
applies to both pool variants.

* Address Copilot review on 72d241d7: trace reason, IsIdleExpired XML doc, resx period

* Distinguish 'idle-expired' vs 'found dead' in pool trace when a connection is destroyed on the SEMAPHORE_HANDLE path; behavior unchanged.
* Expand IsIdleExpired XML summary to mention the UseLegacyIdleTimeoutBehavior switch as a false-path.
* Drop trailing period from DbConnectionString_IdleTimeout resx so the generated designer summary no longer ends with '..'.

* Address Paul review on 3680ad36: capture IsIdleExpired once, plain dash in doc, restore resx period

* Add failing regression test for return-path idle eviction

Demonstrates the ordering bug in ChannelDbConnectionPool.ReturnInternalConnection: IsLiveConnection runs before SetReturnedTime, so a connection whose checkout exceeded IdleTimeout (e.g. a long-running query) is wrongly evicted as idle-expired on return even though it was actively in use on the wire. This test fails on the unpatched code (Expected: 1, Actual: 0) and will pass once the stamp is hoisted ahead of the liveness check.

* Stamp ReturnedTime before IsLiveConnection in ChannelDbConnectionPool.ReturnInternalConnection

ReturnInternalConnection called IsLiveConnection (which now contains an idle-expiry gate that reads connection.ReturnedTime) before SetReturnedTime refreshed the stamp on the keep branch. Because ReturnedTime is only ever written in this function, a checkout longer than IdleTimeout (long-running query, etc.) made the idle gate fire on return and destroy a healthy connection that was actively in use on the wire, not idle.

Hoist the SetReturnedTime block (with the same UseLegacyIdleTimeoutBehavior / IdleTimeout != Zero gating that the idle gate uses) ahead of IsLiveConnection so the stamp reflects the moment of return before the liveness check reads it. Drop the now-redundant call on the keep branch. The previous regression test (1435958c) passes after this change on net462, net8.0, net9.0, net10.0.

Flagged by Copilot review on PR #4295.

* Address Copilot review feedback: spelling and IdleTimeout doc

- WaitHandleDbConnectionPool.CleanupCallback: behaviour -> behavior.

- DbConnectionPoolOptions.IdleTimeout: reword XML doc to acknowledge that not all pool implementations perform periodic maintenance (Channel pool enforces idle timeout lazily on retrieval/return). Drop the prescriptive `half the configured timeout'' math, which was specific to the WaitHandle pool's generational sweep.

---------

Co-authored-by: Priyanka Tiwari <priyankatiwari08@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../SqlConnectionStringBuilder.xml            |  25 ++
 .../ref/Microsoft.Data.SqlClient.cs           |   4 +
 .../DbConnectionStringDefaults.cs             |   3 +
 .../DbConnectionStringKeywords.cs             |   1 +
 .../Data/ProviderBase/DbConnectionInternal.cs |  25 ++
 .../ConnectionPool/ChannelDbConnectionPool.cs |  28 ++
 .../ConnectionPool/DbConnectionPoolOptions.cs |  28 +-
 .../WaitHandleDbConnectionPool.cs             |  73 +++++-
 .../Data/SqlClient/LocalAppContextSwitches.cs |  22 ++
 .../Data/SqlClient/SqlConnectionFactory.cs    |   3 +-
 .../Data/SqlClient/SqlConnectionOptions.cs    |  12 +
 .../SqlClient/SqlConnectionStringBuilder.cs   |  31 +++
 .../src/Resources/Strings.Designer.cs         |   9 +
 .../src/Resources/Strings.resx                |   3 +
 .../Common/LocalAppContextSwitchesHelper.cs   |  15 ++
 .../SqlConnectionStringBuilderTest.cs         |  38 +++
 .../ChannelDbConnectionPoolPruningTest.cs     |   3 +-
 .../ChannelDbConnectionPoolTest.cs            | 243 +++++++++++++++++-
 .../WaitHandleDbConnectionPoolBudgetTest.cs   |   3 +-
 ...itHandleDbConnectionPoolIdleTimeoutTest.cs | 234 +++++++++++++++++
 ...itHandleDbConnectionPoolTransactionTest.cs |   3 +-
 .../SqlClient/LocalAppContextSwitchesTest.cs  |   1 +
 22 files changed, 786 insertions(+), 21 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolIdleTimeoutTest.cs

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
index a68c0a323b..98daa768b5 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
@@ -979,6 +979,31 @@ The following example converts an existing connection string from using SQL Serv
         </para>
       </remarks>
     </LoadBalanceTimeout>
+    <IdleTimeout>
+      <summary>
+        Gets or sets the maximum time, in seconds, that a connection can sit unused (idle) in the connection pool before it is discarded. The default is 300 (5 minutes).
+      </summary>
+      <value>
+        The idle timeout for pooled connections, in seconds.
+      </value>
+      <remarks>
+        <para>
+          This property corresponds to the "Connection Idle Timeout" key within the connection string.
+        </para>
+        <para>
+          In versions where the AppContext switch <c>Switch.Microsoft.Data.SqlClient.UseLegacyIdleTimeoutBehavior</c> is enabled (the default), the driver preserves historical pooling behavior and does not enforce this setting. Set the switch to <see langword="false" /> to enable idle-timeout enforcement.
+        </para>
+        <para>
+          The driver makes a best effort to discard connections that have remained idle in the pool for longer than this value. The exact point in the connection lifecycle at which the check occurs is an implementation detail and may change over time. This protects callers from receiving connections that may have been silently closed by firewalls, load balancers, or server-side inactivity thresholds.
+        </para>
+        <para>
+          A value of zero (0) disables idle expiration; connections are kept in the pool indefinitely (subject to other expiry rules such as <see cref="P:Microsoft.Data.SqlClient.SqlConnectionStringBuilder.LoadBalanceTimeout" />).
+        </para>
+        <para>
+          Idle timeout operates independently of <see cref="P:Microsoft.Data.SqlClient.SqlConnectionStringBuilder.LoadBalanceTimeout" />. Whichever threshold is exceeded first causes the connection to be discarded.
+        </para>
+      </remarks>
+    </IdleTimeout>
     <MaxPoolSize>
       <summary>
         Gets or sets the maximum number of connections allowed in the connection pool for this specific connection string.
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
index e52cbdc8d3..96ac073744 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
@@ -1368,6 +1368,10 @@ public SqlConnectionStringBuilder(string connectionString) { }
     [System.ComponentModel.DisplayNameAttribute("Load Balance Timeout")]
     [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
     public int LoadBalanceTimeout { get { throw null; } set { } }
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/IdleTimeout/*'/>
+    [System.ComponentModel.DisplayNameAttribute("Connection Idle Timeout")]
+    [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
+    public int IdleTimeout { get { throw null; } set { } }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/MaxPoolSize/*'/>
     [System.ComponentModel.DisplayNameAttribute("Max Pool Size")]
     [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringDefaults.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringDefaults.cs
index 460fa0c2cc..bf700c0b55 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringDefaults.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringDefaults.cs
@@ -36,6 +36,9 @@ internal static class DbConnectionStringDefaults
         internal const bool IntegratedSecurity = false;
         internal const SqlConnectionIPAddressPreference IpAddressPreference = SqlConnectionIPAddressPreference.IPv4First;
         internal const int LoadBalanceTimeout = 0; // default of 0 means don't use
+        // Default configured idle timeout is 5 minutes. Connection pool behavior is gated by
+        // LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior for compatibility.
+        internal const int IdleTimeout = 300;
         internal const int MaxPoolSize = 100;
         internal const int MinPoolSize = 0;
         internal const bool MultipleActiveResultSets = false;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringKeywords.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringKeywords.cs
index 5c902de2a8..b163ec2536 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringKeywords.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionStringKeywords.cs
@@ -31,6 +31,7 @@ internal static class DbConnectionStringKeywords
         internal const string IntegratedSecurity = "Integrated Security";
         internal const string IpAddressPreference = "IP Address Preference";
         internal const string LoadBalanceTimeout = "Load Balance Timeout";
+        internal const string IdleTimeout = "Connection Idle Timeout";
         internal const string MaxPoolSize = "Max Pool Size";
         internal const string MinPoolSize = "Min Pool Size";
         internal const string MultipleActiveResultSets = "Multiple Active Result Sets";
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
index b295f84b3d..539f79ff47 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -82,6 +82,11 @@ internal DbConnectionInternal(ConnectionState state, bool hidePassword, bool all
             ShouldHidePassword = hidePassword;
             State = state;
             CreateTime = DateTime.UtcNow;
+            // Initialize the returned-to-pool stamp to creation time so that a freshly built connection is treated
+            // as "just used" by the pool's idle-expiry checks until the pool's return path stamps it again on first return.
+            // Without this initialization, ReturnedTime would default to DateTime.MinValue, which would cause
+            // IsLiveConnection to immediately evict every new connection whenever IdleTimeout is configured.
+            ReturnedTime = CreateTime;
         }
 
         #region Properties
@@ -91,6 +96,15 @@ internal DbConnectionInternal(ConnectionState state, bool hidePassword, bool all
         /// </summary>
         internal DateTime CreateTime { get; }
 
+        /// <summary>
+        /// UTC timestamp of when this connection was last returned to the pool.
+        /// Stamped by <see cref="SetReturnedTime"/>. Initialized to <see cref="CreateTime"/> in the constructor
+        /// so a freshly built connection is treated as "just used" until its first return.
+        /// Internal setter exists to support deterministic unit tests without reflection.
+        /// The pool reads this value to decide whether the connection has sat idle longer than the configured idle timeout.
+        /// </summary>
+        internal DateTime ReturnedTime { get; set; }
+
         /// <summary>
         /// The pool generation at the time this connection was created or added to the pool.
         /// Used by <see cref="ChannelDbConnectionPool"/> to detect stale connections after a pool clear.
@@ -726,6 +740,17 @@ internal virtual void PrepareForReplaceConnection()
             // By default, there is no preparation required
         }
 
+        /// <summary>
+        /// Stamps <see cref="ReturnedTime"/> with the current UTC time. The pool calls this from its
+        /// return-to-pool path only when it intends the idle-timeout machinery to act on the value;
+        /// the connection owns the mechanism (recording the time) while the pool owns the policy
+        /// (deciding when a stamp is meaningful).
+        /// </summary>
+        internal void SetReturnedTime()
+        {
+            ReturnedTime = DateTime.UtcNow;
+        }
+
         internal void PrePush(DbConnection expectedOwner)
         {
             // Called by IDbConnectionPool when we're about to be put into it's pool, we take this
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 3218bf461b..9169e9717e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -244,6 +244,18 @@ public void ReturnInternalConnection(DbConnectionInternal connection, DbConnecti
         {
             ValidateOwnershipAndSetPoolingState(connection, owningObject);
 
+            // Stamp the return time before IsLiveConnection runs so the idle-expiry gate inside it
+            // measures time-in-pool, not time-since-last-return. Without this, a connection whose
+            // checkout exceeded IdleTimeout (e.g. a long-running query) would be wrongly evicted on
+            // return even though it was actively in use on the wire. The same gating conditions are
+            // applied here as in IsLiveConnection so we avoid the per-return DateTime.UtcNow when
+            // idle expiry is disabled or the legacy idle-timeout behavior is in effect.
+            if (!LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior &&
+                PoolGroupOptions.IdleTimeout != TimeSpan.Zero)
+            {
+                connection.SetReturnedTime();
+            }
+
             if (!IsLiveConnection(connection))
             {
                 RemoveConnection(connection);
@@ -453,6 +465,22 @@ public bool TryGetConnection(
         /// <returns>Returns true if the connection is live and unexpired, otherwise returns false.</returns>
         private bool IsLiveConnection(DbConnectionInternal connection)
         {
+            // Connection has been sitting idle longer than the configured idle timeout.
+            // Checked before the (potentially expensive) liveness probe so an idle-expired
+            // connection is discarded without an SNI round-trip.
+            // ReturnedTime is initialized to CreateTime so a freshly minted connection never trips this
+            // check on first retrieval, and is then stamped by ReturnInternalConnection on every return.
+            // Use subtraction rather than addition so the comparison cannot throw if ReturnedTime is
+            // ever close to DateTime.MaxValue. A clock skew that leaves ReturnedTime in the future
+            // produces a negative TimeSpan, which falls through as not-expired (fail safe).
+            TimeSpan idleTimeout = PoolGroupOptions.IdleTimeout;
+            if (!LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior &&
+                idleTimeout != TimeSpan.Zero &&
+                DateTime.UtcNow - connection.ReturnedTime > idleTimeout)
+            {
+                return false;
+            }
+
             // Broken physical connection
             if (!connection.IsConnectionAlive())
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolOptions.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolOptions.cs
index 5ac6f4d565..b1790948b2 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolOptions.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolOptions.cs
@@ -13,6 +13,7 @@ internal sealed class DbConnectionPoolGroupOptions
         private readonly int _maxPoolSize;
         private readonly int _creationTimeout;
         private readonly TimeSpan _loadBalanceTimeout;
+        private readonly TimeSpan _idleTimeout;
         private readonly bool _hasTransactionAffinity;
         private readonly bool _useLoadBalancing;
 
@@ -22,7 +23,8 @@ public DbConnectionPoolGroupOptions(
                                         int maxPoolSize,
                                         int creationTimeout,
                                         int loadBalanceTimeout,
-                                        bool hasTransactionAffinity
+                                        bool hasTransactionAffinity,
+                                        int idleTimeout
         )
         {
             _poolByIdentity = poolByIdentity;
@@ -36,6 +38,16 @@ bool hasTransactionAffinity
                 _useLoadBalancing = true;
             }
 
+            if (idleTimeout < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(idleTimeout), idleTimeout, "Idle timeout cannot be negative.");
+            }
+
+            if (idleTimeout != 0)
+            {
+                _idleTimeout = TimeSpan.FromSeconds(idleTimeout);
+            }
+
             _hasTransactionAffinity = hasTransactionAffinity;
         }
 
@@ -54,6 +66,20 @@ public TimeSpan LoadBalanceTimeout
         {
             get { return _loadBalanceTimeout; }
         }
+        /// <summary>
+        /// The maximum time a pooled connection can sit unused (idle) in the pool before it becomes
+        /// eligible for eviction. Eviction is best-effort: a connection that has been idle longer
+        /// than this value is discarded either on the next retrieval attempt or during a periodic
+        /// pool maintenance pass (in pool implementations that perform periodic maintenance),
+        /// whichever happens first. Implementations may check this threshold opportunistically, so
+        /// eviction may occur somewhat before or after the exact timeout depending on the pool
+        /// implementation and maintenance cadence.
+        /// <see cref="TimeSpan.Zero"/> disables idle expiration.
+        /// </summary>
+        public TimeSpan IdleTimeout
+        {
+            get { return _idleTimeout; }
+        }
         public int MaxPoolSize
         {
             get { return _maxPoolSize; }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index ecf8840ebb..d2c3b57323 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -223,8 +223,25 @@ internal WaitHandleDbConnectionPool(
 
             lock (s_random)
             {
-                // Random.Next is not thread-safe
-                _cleanupWait = s_random.Next(12, 24) * 10 * 1000; // 2-4 minutes in 10 sec intervals, WebData 103603
+                TimeSpan idleTimeout = connectionPoolGroup.PoolGroupOptions.IdleTimeout;
+                if (LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior || idleTimeout == TimeSpan.Zero)
+                {
+                    // Historical 2-4 minute random cleanup window. Used for the legacy switch and for
+                    // the "idle eviction disabled" state (IdleTimeout=0) where the timer still runs for
+                    // non-idle maintenance but CleanupCallback skips the generational sweep.
+                    _cleanupWait = s_random.Next(12, 24) * 10 * 1000; // 2-4 minutes in 10 sec intervals, WebData 103603
+                }
+                else
+                {
+                    // New idle-timeout behavior with a configured value: the WaitHandle pool takes two
+                    // pruning cycles to evict an idle connection (new->old generation, then old->closed),
+                    // so halve the configured timeout to approximate the requested idle lifetime. Floor
+                    // the period at 1 second so small IdleTimeout values (e.g. 1s) don't schedule a
+                    // sub-second timer that wakes the threadpool just to walk empty stacks.
+                    long cleanupWaitMilliseconds = (long)idleTimeout.TotalMilliseconds / 2;
+                    cleanupWaitMilliseconds = Math.Max(cleanupWaitMilliseconds, 1000);
+                    _cleanupWait = cleanupWaitMilliseconds >= int.MaxValue ? int.MaxValue : (int)cleanupWaitMilliseconds;
+                }
             }
 
             _connectionFactory = connectionFactory;
@@ -351,8 +368,16 @@ private void CleanupCallback(object state)
             // at least one period but not more than two periods.
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.CleanupCallback|RES|INFO|CPOOL> {0}", Id);
 
+            // Idle eviction (the generational destroy/age-into-old-stack sweep below) is enabled under
+            // the legacy switch, or when the new behavior is on with a non-zero IdleTimeout. When the
+            // new behavior is on and IdleTimeout is 0, eviction is disabled entirely: skip the sweep
+            // and only run the MinPoolSize floor maintenance.
+            bool idleEvictionEnabled =
+                LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior ||
+                PoolGroupOptions.IdleTimeout != TimeSpan.Zero;
+
             // Destroy free objects that put us above MinPoolSize from old stack.
-            while (Count > MinPoolSize)
+            while (idleEvictionEnabled && Count > MinPoolSize)
             {
                 // While above MinPoolSize...
                 if (_waitHandles.PoolSemaphore.WaitOne(0, false))
@@ -363,6 +388,7 @@ private void CleanupCallback(object state)
                     if (_stackOld.TryPop(out obj))
                     {
                         Debug.Assert(obj != null, "null connection is not expected");
+
                         // If we obtained one from the old stack, destroy it.
 
                         SqlClientDiagnostics.Metrics.ExitFreeConnection();
@@ -414,7 +440,7 @@ private void CleanupCallback(object state)
 
             // Push to the old-stack.  For each free object, move object from
             // new stack to old stack.
-            if (_waitHandles.PoolSemaphore.WaitOne(0, false))
+            if (idleEvictionEnabled && _waitHandles.PoolSemaphore.WaitOne(0, false))
             {
                 for (; ; )
                 {
@@ -667,6 +693,10 @@ private void DeactivateObject(DbConnectionInternal obj)
                                 //   DelegatedTransactionEnded event will clean up the
                                 //   connection appropriately regardless of the pool state.
                                 Debug.Assert(_transactedConnectionPool != null, "Transacted connection pool was not expected to be null.");
+                                // Transacting connections are held in their own store and are never
+                                // proactively closed (doing so would abort the transaction, which can be
+                                // distributed). Idle-timeout enforcement does not apply here, so we do
+                                // not call SetReturnedTime when parking the connection in the transacted pool.
                                 _transactedConnectionPool.PutTransactedObject(transaction, obj);
                                 rootTxn = true;
                             }
@@ -1061,9 +1091,11 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                                 Interlocked.Decrement(ref _waitCount);
                                 obj = GetFromGeneralPool();
 
-                                if ((obj != null) && (!obj.IsConnectionAlive()))
+                                bool isIdleExpired = obj != null && IsIdleExpired(obj);
+                                if ((obj != null) && (isIdleExpired || !obj.IsConnectionAlive()))
                                 {
-                                    SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, Connection {1}, found dead and removed.", Id, obj.ObjectID);
+                                    string reason = isIdleExpired ? "idle-expired" : "found dead";
+                                    SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, Connection {1}, {2} and removed.", Id, obj.ObjectID, reason);
                                     DestroyObject(obj);
                                     obj = null;     // Setting to null in case creating a new object fails
 
@@ -1243,6 +1275,8 @@ private DbConnectionInternal GetFromTransactedPool(out Transaction transaction)
                     }
                     else if (!obj.IsConnectionAlive())
                     {
+                        // Transacting connections are exempt from idle-timeout eviction (closing them
+                        // would abort the transaction, possibly distributed). Only liveness is checked here.
                         SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetFromTransactedPool|RES|CPOOL> {0}, Connection {1}, found dead and removed.", Id, obj.ObjectID);
                         DestroyObject(obj);
                         obj = null;
@@ -1363,6 +1397,16 @@ private void PutNewObject(DbConnectionInternal obj)
 
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.PutNewObject|RES|CPOOL> {0}, Connection {1}, Pushing to general pool.", Id, obj.ObjectID);
 
+            // Stamp the return time so IsIdleExpired can later decide whether the connection has sat
+            // unused too long. Skip the stamp when idle expiry is disabled or the legacy idle-timeout
+            // behavior is in effect to avoid the per-return DateTime.UtcNow on the hot return path;
+            // IsIdleExpired short-circuits on the same conditions so the value would be unread in
+            // those cases.
+            if (!LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior &&
+                PoolGroupOptions.IdleTimeout != TimeSpan.Zero)
+            {
+                obj.SetReturnedTime();
+            }
             _stackNew.Push(obj);
             _waitHandles.PoolSemaphore.Release(1);
 
@@ -1370,6 +1414,23 @@ private void PutNewObject(DbConnectionInternal obj)
 
         }
 
+        /// <summary>
+        /// Returns true when the supplied connection has been sitting idle in the pool longer than the
+        /// configured <see cref="DbConnectionPoolGroupOptions.IdleTimeout"/>. Returns false when idle
+        /// eviction is off - that is, when the <see cref="LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior"/>
+        /// switch is enabled or <see cref="DbConnectionPoolGroupOptions.IdleTimeout"/> is zero.
+        /// </summary>
+        private bool IsIdleExpired(DbConnectionInternal obj)
+        {
+            // Use subtraction rather than addition so the comparison cannot throw if ReturnedTime is
+            // ever close to DateTime.MaxValue. A clock skew that leaves ReturnedTime in the future
+            // produces a negative TimeSpan, which falls through as not-expired (fail safe).
+            TimeSpan idleTimeout = PoolGroupOptions.IdleTimeout;
+            return !LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior &&
+                   idleTimeout != TimeSpan.Zero &&
+                   DateTime.UtcNow - obj.ReturnedTime > idleTimeout;
+        }
+
         public void ReturnInternalConnection(DbConnectionInternal obj, DbConnection owningObject)
         {
             Debug.Assert(obj != null, "null obj?");
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
index df762ed7ae..d951bb5d30 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
@@ -125,6 +125,13 @@ internal static class LocalAppContextSwitches
     private const string UseConnectionPoolV2String =
         "Switch.Microsoft.Data.SqlClient.UseConnectionPoolV2";
 
+    /// <summary>
+    /// The name of the app context switch that controls whether to preserve
+    /// legacy idle-timeout behavior in connection pooling.
+    /// </summary>
+    private const string UseLegacyIdleTimeoutBehaviorString =
+        "Switch.Microsoft.Data.SqlClient.UseLegacyIdleTimeoutBehavior";
+
     /// <summary>
     /// The name of the app context switch that controls whether pool operations
     /// should count against the caller's overall ConnectTimeout budget.
@@ -241,6 +248,11 @@ private enum SwitchValue : byte
     /// </summary>
     private static SwitchValue s_useConnectionPoolV2 = SwitchValue.None;
 
+    /// <summary>
+    /// The cached value of the UseLegacyIdleTimeoutBehavior switch.
+    /// </summary>
+    private static SwitchValue s_useLegacyIdleTimeoutBehavior = SwitchValue.None;
+
     /// <summary>
     /// The cached value of the UseOverallConnectTimeoutForPoolWait switch.
     /// </summary>
@@ -576,6 +588,16 @@ public static bool UseCompatibilityAsyncBehaviour
             defaultValue: false,
             ref s_useConnectionPoolV2);
 
+    /// <summary>
+    /// When set to true (the default), pooling preserves historical idle-timeout behavior.
+    /// When set to false, configured Connection Idle Timeout is enforced by the pool.
+    /// </summary>
+    public static bool UseLegacyIdleTimeoutBehavior =>
+        AcquireAndReturn(
+            UseLegacyIdleTimeoutBehaviorString,
+            defaultValue: true,
+            ref s_useLegacyIdleTimeoutBehavior);
+
     /// <summary>
     /// When set to true, pool operations count against the
     /// caller's ConnectTimeout budget. This includes waits and async operations.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index 4cdee8bdc2..1f90eac202 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -740,7 +740,8 @@ private static DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(Sql
                     opt.MaxPoolSize,
                     connectionTimeout,
                     opt.LoadBalanceTimeout,
-                    opt.Enlist);
+                    opt.Enlist,
+                    opt.IdleTimeout);
             }
             return poolingOptions;
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
index 6eafb195c8..734ecc125f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
@@ -105,6 +105,7 @@ internal static class TRANSACTIONBINDING
         private readonly int _commandTimeout;
         private readonly int _connectTimeout;
         private readonly int _loadBalanceTimeout;
+        private readonly int _idleTimeout;
         private readonly int _maxPoolSize;
         private readonly int _minPoolSize;
         private readonly int _packetSize;
@@ -195,6 +196,7 @@ static SqlConnectionOptions()
                             DbConnectionStringSynonyms.IpAddressPreference);
             AddKeywordToMap(DbConnectionStringKeywords.LoadBalanceTimeout,
                             DbConnectionStringSynonyms.ConnectionLifetime);
+            AddKeywordToMap(DbConnectionStringKeywords.IdleTimeout);
             AddKeywordToMap(DbConnectionStringKeywords.MultipleActiveResultSets,
                             DbConnectionStringSynonyms.MultipleActiveResultSets);
             AddKeywordToMap(DbConnectionStringKeywords.MaxPoolSize);
@@ -274,6 +276,7 @@ internal SqlConnectionOptions(string connectionString)
             _commandTimeout = ConvertValueToInt32(DbConnectionStringKeywords.CommandTimeout, DbConnectionStringDefaults.CommandTimeout);
             _connectTimeout = ConvertValueToInt32(DbConnectionStringKeywords.ConnectTimeout, DbConnectionStringDefaults.ConnectTimeout);
             _loadBalanceTimeout = ConvertValueToInt32(DbConnectionStringKeywords.LoadBalanceTimeout, DbConnectionStringDefaults.LoadBalanceTimeout);
+            _idleTimeout = ConvertValueToInt32(DbConnectionStringKeywords.IdleTimeout, DbConnectionStringDefaults.IdleTimeout);
             _maxPoolSize = ConvertValueToInt32(DbConnectionStringKeywords.MaxPoolSize, DbConnectionStringDefaults.MaxPoolSize);
             _minPoolSize = ConvertValueToInt32(DbConnectionStringKeywords.MinPoolSize, DbConnectionStringDefaults.MinPoolSize);
             _packetSize = ConvertValueToInt32(DbConnectionStringKeywords.PacketSize, DbConnectionStringDefaults.PacketSize);
@@ -318,6 +321,11 @@ internal SqlConnectionOptions(string connectionString)
                 throw ADP.InvalidConnectionOptionValue(DbConnectionStringKeywords.LoadBalanceTimeout);
             }
 
+            if (_idleTimeout < 0)
+            {
+                throw ADP.InvalidConnectionOptionValue(DbConnectionStringKeywords.IdleTimeout);
+            }
+
             if (_connectTimeout < 0)
             {
                 throw ADP.InvalidConnectionOptionValue(DbConnectionStringKeywords.ConnectTimeout);
@@ -579,6 +587,7 @@ internal SqlConnectionOptions(SqlConnectionOptions connectionOptions, string dat
             _commandTimeout = connectionOptions._commandTimeout;
             _connectTimeout = connectionOptions._connectTimeout;
             _loadBalanceTimeout = connectionOptions._loadBalanceTimeout;
+            _idleTimeout = connectionOptions._idleTimeout;
             _poolBlockingPeriod = connectionOptions._poolBlockingPeriod;
             _maxPoolSize = connectionOptions._maxPoolSize;
             _minPoolSize = connectionOptions._minPoolSize;
@@ -650,6 +659,9 @@ internal SqlConnectionOptions(SqlConnectionOptions connectionOptions, string dat
         internal int CommandTimeout => _commandTimeout;
         internal int ConnectTimeout => _connectTimeout;
         internal int LoadBalanceTimeout => _loadBalanceTimeout;
+        // Maximum time (in seconds) a connection can sit idle in the pool before it is discarded.
+        // 0 disables idle expiration.
+        internal int IdleTimeout => _idleTimeout;
         internal int MaxPoolSize => _maxPoolSize;
         internal int MinPoolSize => _minPoolSize;
         internal int PacketSize => _packetSize;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
index 4e54a32c75..4038dbb295 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
@@ -50,6 +50,7 @@ private enum Keywords
             ServerCertificate,
             TrustServerCertificate,
             LoadBalanceTimeout,
+            IdleTimeout,
             PacketSize,
             TypeSystemVersion,
             Authentication,
@@ -101,6 +102,7 @@ private enum Keywords
         private int _commandTimeout = DbConnectionStringDefaults.CommandTimeout;
         private int _connectTimeout = DbConnectionStringDefaults.ConnectTimeout;
         private int _loadBalanceTimeout = DbConnectionStringDefaults.LoadBalanceTimeout;
+        private int _idleTimeout = DbConnectionStringDefaults.IdleTimeout;
         private int _maxPoolSize = DbConnectionStringDefaults.MaxPoolSize;
         private int _minPoolSize = DbConnectionStringDefaults.MinPoolSize;
         private int _packetSize = DbConnectionStringDefaults.PacketSize;
@@ -155,6 +157,7 @@ private static string[] CreateValidKeywords()
             validKeywords[(int)Keywords.InitialCatalog] = DbConnectionStringKeywords.InitialCatalog;
             validKeywords[(int)Keywords.IntegratedSecurity] = DbConnectionStringKeywords.IntegratedSecurity;
             validKeywords[(int)Keywords.LoadBalanceTimeout] = DbConnectionStringKeywords.LoadBalanceTimeout;
+            validKeywords[(int)Keywords.IdleTimeout] = DbConnectionStringKeywords.IdleTimeout;
             validKeywords[(int)Keywords.MaxPoolSize] = DbConnectionStringKeywords.MaxPoolSize;
             validKeywords[(int)Keywords.MinPoolSize] = DbConnectionStringKeywords.MinPoolSize;
             validKeywords[(int)Keywords.MultipleActiveResultSets] = DbConnectionStringKeywords.MultipleActiveResultSets;
@@ -212,6 +215,7 @@ private static Dictionary<string, Keywords> CreateKeywordsDictionary()
                 { DbConnectionStringKeywords.InitialCatalog, Keywords.InitialCatalog },
                 { DbConnectionStringKeywords.IntegratedSecurity, Keywords.IntegratedSecurity },
                 { DbConnectionStringKeywords.LoadBalanceTimeout, Keywords.LoadBalanceTimeout },
+                { DbConnectionStringKeywords.IdleTimeout, Keywords.IdleTimeout },
                 { DbConnectionStringKeywords.MultipleActiveResultSets, Keywords.MultipleActiveResultSets },
                 { DbConnectionStringKeywords.MaxPoolSize, Keywords.MaxPoolSize },
                 { DbConnectionStringKeywords.MinPoolSize, Keywords.MinPoolSize },
@@ -349,6 +353,8 @@ private object GetAt(Keywords index)
                     return IntegratedSecurity;
                 case Keywords.LoadBalanceTimeout:
                     return LoadBalanceTimeout;
+                case Keywords.IdleTimeout:
+                    return IdleTimeout;
                 case Keywords.MultipleActiveResultSets:
                     return MultipleActiveResultSets;
                 case Keywords.MaxPoolSize:
@@ -481,6 +487,9 @@ private void Reset(Keywords index)
                 case Keywords.LoadBalanceTimeout:
                     _loadBalanceTimeout = DbConnectionStringDefaults.LoadBalanceTimeout;
                     break;
+                case Keywords.IdleTimeout:
+                    _idleTimeout = DbConnectionStringDefaults.IdleTimeout;
+                    break;
                 case Keywords.MultipleActiveResultSets:
                     _multipleActiveResultSets = DbConnectionStringDefaults.MultipleActiveResultSets;
                     break;
@@ -979,6 +988,9 @@ public override object this[string keyword]
                         case Keywords.LoadBalanceTimeout:
                             LoadBalanceTimeout = ConvertToInt32(value);
                             break;
+                        case Keywords.IdleTimeout:
+                            IdleTimeout = ConvertToInt32(value);
+                            break;
                         case Keywords.MaxPoolSize:
                             MaxPoolSize = ConvertToInt32(value);
                             break;
@@ -1473,6 +1485,25 @@ public int LoadBalanceTimeout
             }
         }
 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/IdleTimeout/*' />
+        [DisplayName(DbConnectionStringKeywords.IdleTimeout)]
+        [ResCategory(nameof(Strings.DataCategory_Pooling))]
+        [ResDescription(nameof(Strings.DbConnectionString_IdleTimeout))]
+        [RefreshProperties(RefreshProperties.All)]
+        public int IdleTimeout
+        {
+            get => _idleTimeout;
+            set
+            {
+                if (value < 0)
+                {
+                    throw ADP.InvalidConnectionOptionValue(DbConnectionStringKeywords.IdleTimeout);
+                }
+                SetValue(DbConnectionStringKeywords.IdleTimeout, value);
+                _idleTimeout = value;
+            }
+        }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/MaxPoolSize/*' />
         [DisplayName(DbConnectionStringKeywords.MaxPoolSize)]
         [ResCategory(nameof(Strings.DataCategory_Pooling))]
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index eed5c58a69..7064a6c19c 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -1428,6 +1428,15 @@ internal static string DbConnectionString_LoadBalanceTimeout {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration..
+        /// </summary>
+        internal static string DbConnectionString_IdleTimeout {
+            get {
+                return ResourceManager.GetString("DbConnectionString_IdleTimeout", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The maximum number of connections allowed in the pool..
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
index 0a65febfde..e7f438873f 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
@@ -963,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>The minimum amount of time (in seconds) for this connection to live in the pool before being destroyed.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>The maximum number of connections allowed in the pool.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
index 430d6645a8..ce64aea779 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
@@ -54,6 +54,7 @@ public sealed class LocalAppContextSwitchesHelper : IDisposable
     private readonly bool? _useCompatibilityAsyncBehaviourOriginal;
     private readonly bool? _useCompatibilityProcessSniOriginal;
     private readonly bool? _useConnectionPoolV2Original;
+    private readonly bool? _useLegacyIdleTimeoutBehaviorOriginal;
     private readonly bool? _useOverallConnectTimeoutForPoolWaitOriginal;
     #if NET && _WINDOWS
     private readonly bool? _useManagedNetworkingOriginal;
@@ -116,6 +117,8 @@ public LocalAppContextSwitchesHelper()
                 GetSwitchValue("s_useCompatibilityProcessSni");
             _useConnectionPoolV2Original =
                 GetSwitchValue("s_useConnectionPoolV2");
+            _useLegacyIdleTimeoutBehaviorOriginal =
+                GetSwitchValue("s_useLegacyIdleTimeoutBehavior");
             _useOverallConnectTimeoutForPoolWaitOriginal =
                 GetSwitchValue("s_useOverallConnectTimeoutForPoolWait");
             #if NET && _WINDOWS
@@ -185,6 +188,9 @@ public void Dispose()
             SetSwitchValue(
                 "s_useConnectionPoolV2",
                 _useConnectionPoolV2Original);
+            SetSwitchValue(
+                "s_useLegacyIdleTimeoutBehavior",
+                _useLegacyIdleTimeoutBehaviorOriginal);
             SetSwitchValue(
                 "s_useOverallConnectTimeoutForPoolWait",
                 _useOverallConnectTimeoutForPoolWaitOriginal);
@@ -333,6 +339,15 @@ public bool? UseConnectionPoolV2
         set => SetSwitchValue("s_useConnectionPoolV2", value);
     }
 
+    /// <summary>
+    /// Get or set the UseLegacyIdleTimeoutBehavior switch value.
+    /// </summary>
+    public bool? UseLegacyIdleTimeoutBehavior
+    {
+        get => GetSwitchValue("s_useLegacyIdleTimeoutBehavior");
+        set => SetSwitchValue("s_useLegacyIdleTimeoutBehavior", value);
+    }
+
     /// <summary>
     /// Get or set the UseOverallConnectTimeoutForPoolWait switch value.
     /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs
index a24c330181..180fe07209 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionStringBuilderTest.cs
@@ -250,6 +250,44 @@ public void SetInvalidLoadBalanceTimeout_Throws()
             Assert.Contains("load balance timeout", ex.Message, StringComparison.OrdinalIgnoreCase);
         }
 
+        [Fact]
+        public void IdleTimeout_DefaultIs300()
+        {
+            // Default-constructed builder should have IdleTimeout == 300 (5 minutes), matching Npgsql.
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder();
+            Assert.Equal(300, builder.IdleTimeout);
+        }
+
+        [Fact]
+        public void IdleTimeout_RoundTripsThroughConnectionString()
+        {
+            // Set via property, observe in ConnectionString; parse back and observe via property.
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder
+            {
+                IdleTimeout = 45
+            };
+            Assert.Contains("Connection Idle Timeout=45", builder.ConnectionString, StringComparison.OrdinalIgnoreCase);
+
+            SqlConnectionStringBuilder parsed = new SqlConnectionStringBuilder(builder.ConnectionString);
+            Assert.Equal(45, parsed.IdleTimeout);
+        }
+
+        [Fact]
+        public void IdleTimeout_CanonicalKeyword_Parses()
+        {
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder("Connection Idle Timeout=120");
+            Assert.Equal(120, builder.IdleTimeout);
+        }
+
+        [Fact]
+        public void SetInvalidIdleTimeout_Throws()
+        {
+            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder();
+
+            ArgumentException ex = Assert.Throws<ArgumentException>(() => builder.IdleTimeout = -1);
+            Assert.Contains("idle", ex.Message, StringComparison.OrdinalIgnoreCase);
+        }
+
         [Fact]
         public void SetInvalidMaxPoolSize_Throws()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs
index 74d9758cde..3f7f3b0bc5 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs
@@ -35,7 +35,8 @@ private static ChannelDbConnectionPool ConstructPool(
                 maxPoolSize: maxPoolSize,
                 creationTimeout: 15,
                 loadBalanceTimeout: loadBalanceTimeout,
-                hasTransactionAffinity: true
+                hasTransactionAffinity: true,
+                idleTimeout: 0
             );
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
                 new SqlConnectionOptions("Data Source=localhost;"),
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 1fea8aede1..b79baefbd5 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -12,6 +12,7 @@
 using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Data.SqlClient.Tests.Common;
 using Microsoft.Extensions.Time.Testing;
 using Xunit;
 
@@ -34,7 +35,8 @@ private ChannelDbConnectionPool ConstructPool(SqlConnectionFactory connectionFac
                     maxPoolSize: 50,
                     creationTimeout: 15,
                     loadBalanceTimeout: 0,
-                    hasTransactionAffinity: true
+                    hasTransactionAffinity: true,
+                    idleTimeout: 0
             );
             dbConnectionPoolGroup ??= new DbConnectionPoolGroup(
                 new SqlConnectionOptions("Data Source=localhost;"),
@@ -611,7 +613,8 @@ public void TestLoadBalanceTimeout()
                     maxPoolSize: 50,
                     creationTimeout: 15,
                     loadBalanceTimeout: 500,
-                    hasTransactionAffinity: true
+                    hasTransactionAffinity: true,
+                    idleTimeout: 0
             );
             var pool = ConstructPool(SuccessfulConnectionFactory, poolGroupOptions: poolGroupOptions);
             Assert.Equal(poolGroupOptions.LoadBalanceTimeout, pool.LoadBalanceTimeout);
@@ -629,7 +632,8 @@ public void TestPoolGroup()
                     maxPoolSize: 50,
                     creationTimeout: 15,
                     loadBalanceTimeout: 500,
-                    hasTransactionAffinity: true));
+                    hasTransactionAffinity: true,
+                    idleTimeout: 0));
             var pool = ConstructPool(SuccessfulConnectionFactory, dbConnectionPoolGroup: dbConnectionPoolGroup);
             Assert.Equal(dbConnectionPoolGroup, pool.PoolGroup);
         }
@@ -643,7 +647,8 @@ public void TestPoolGroupOptions()
                 maxPoolSize: 50,
                 creationTimeout: 15,
                 loadBalanceTimeout: 500,
-                hasTransactionAffinity: true);
+                hasTransactionAffinity: true,
+                idleTimeout: 0);
             var pool = ConstructPool(SuccessfulConnectionFactory, poolGroupOptions: poolGroupOptions);
             Assert.Equal(poolGroupOptions, pool.PoolGroupOptions);
         }
@@ -679,7 +684,8 @@ public void TestUseLoadBalancing()
                 maxPoolSize: 50,
                 creationTimeout: 15,
                 loadBalanceTimeout: 500,
-                hasTransactionAffinity: true);
+                hasTransactionAffinity: true,
+                idleTimeout: 0);
             var pool = ConstructPool(SuccessfulConnectionFactory, poolGroupOptions: poolGroupOptions);
             Assert.Equal(poolGroupOptions.UseLoadBalancing, pool.UseLoadBalancing);
         }
@@ -938,6 +944,218 @@ out DbConnectionInternal? newConnection
 
         #endregion
 
+        #region Idle Timeout Tests
+
+        // Helper: build a pool whose IdleTimeout is the given number of seconds.
+        private ChannelDbConnectionPool ConstructPoolWithIdleTimeout(int idleTimeoutSeconds)
+        {
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: 50,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: idleTimeoutSeconds);
+            return ConstructPool(SuccessfulConnectionFactory, poolGroupOptions: poolGroupOptions);
+        }
+
+        [Fact]
+        public void IdleTimeout_PoolGroupOptions_ConvertsSecondsToTimeSpan()
+        {
+            // 30 seconds in -> TimeSpan(0, 0, 30) out.
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: 50,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 30);
+
+            Assert.Equal(TimeSpan.FromSeconds(30), poolGroupOptions.IdleTimeout);
+        }
+
+        [Fact]
+        public void IdleTimeout_StampedOnReturn()
+        {
+            using LocalAppContextSwitchesHelper switchesHelper = new();
+            switchesHelper.UseLegacyIdleTimeoutBehavior = false;
+
+            // Arrange - long idle timeout so the return path stamps (not evicts).
+            var pool = ConstructPoolWithIdleTimeout(idleTimeoutSeconds: 3600);
+            SqlConnection owningConnection = new();
+            pool.TryGetConnection(owningConnection, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? connection);
+            Assert.NotNull(connection);
+
+            // Backdate by a small amount that's still well inside the idle window so the return path
+            // doesn't decide to evict instead of stamp.
+            BackdateReturnedTime(connection, TimeSpan.FromSeconds(5));
+            DateTime stampedBack = connection.ReturnedTime;
+
+            // Act
+            DateTime before = DateTime.UtcNow;
+            pool.ReturnInternalConnection(connection, owningConnection);
+            DateTime after = DateTime.UtcNow;
+
+            // Assert: stamp falls within the return window and is strictly newer than the backdated value.
+            Assert.InRange(connection.ReturnedTime, before, after);
+            Assert.True(connection.ReturnedTime > stampedBack);
+        }
+
+        [Fact]
+        public void IdleTimeout_Zero_DoesNotExpire()
+        {
+            // Arrange - pool with idle expiry disabled
+            var pool = ConstructPoolWithIdleTimeout(idleTimeoutSeconds: 0);
+            SqlConnection owner = new();
+            pool.TryGetConnection(owner, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? first);
+            Assert.NotNull(first);
+
+            // Return + back-date ReturnedTime to simulate a long sit.
+            pool.ReturnInternalConnection(first, owner);
+            BackdateReturnedTime(first, TimeSpan.FromHours(1));
+
+            // Act
+            SqlConnection owner2 = new();
+            pool.TryGetConnection(owner2, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? second);
+
+            // Assert - same instance, idle expiry disabled
+            Assert.Same(first, second);
+            Assert.Equal(1, pool.Count);
+        }
+
+        [Fact]
+        public void IdleTimeout_Set_ExpiresOldConnection()
+        {
+            using LocalAppContextSwitchesHelper switchesHelper = new();
+            switchesHelper.UseLegacyIdleTimeoutBehavior = false;
+
+            // Arrange - pool with 1-second idle timeout
+            var pool = ConstructPoolWithIdleTimeout(idleTimeoutSeconds: 1);
+            SqlConnection owner = new();
+            pool.TryGetConnection(owner, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? first);
+            Assert.NotNull(first);
+
+            // Return + back-date ReturnedTime beyond the timeout.
+            pool.ReturnInternalConnection(first, owner);
+            BackdateReturnedTime(first, TimeSpan.FromSeconds(5));
+
+            // Act - request another connection
+            SqlConnection owner2 = new();
+            pool.TryGetConnection(owner2, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? second);
+
+            // Assert - the expired one is discarded; a new one is minted.
+            Assert.NotNull(second);
+            Assert.NotSame(first, second);
+            Assert.Equal(1, pool.Count);
+        }
+
+        [Fact]
+        public void IdleTimeout_Set_KeepsFreshConnection()
+        {
+            using LocalAppContextSwitchesHelper switchesHelper = new();
+            switchesHelper.UseLegacyIdleTimeoutBehavior = false;
+
+            // Arrange - 60-second idle timeout, connection just returned
+            var pool = ConstructPoolWithIdleTimeout(idleTimeoutSeconds: 60);
+            SqlConnection owner = new();
+            pool.TryGetConnection(owner, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? first);
+            Assert.NotNull(first);
+            pool.ReturnInternalConnection(first, owner);
+
+            // Act - immediately request another connection
+            SqlConnection owner2 = new();
+            pool.TryGetConnection(owner2, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? second);
+
+            // Assert - same instance reused, well within idle window
+            Assert.Same(first, second);
+        }
+
+        [Fact]
+        public void IdleTimeout_LegacySwitch_SuppressesEviction()
+        {
+            using LocalAppContextSwitchesHelper switchesHelper = new();
+            switchesHelper.UseLegacyIdleTimeoutBehavior = true;
+
+            // Arrange - 1-second idle timeout, but legacy switch suppresses the new eviction path.
+            var pool = ConstructPoolWithIdleTimeout(idleTimeoutSeconds: 1);
+            SqlConnection owner = new();
+            pool.TryGetConnection(owner, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? first);
+            Assert.NotNull(first);
+
+            // Return + back-date well past the configured timeout.
+            pool.ReturnInternalConnection(first, owner);
+            BackdateReturnedTime(first, TimeSpan.FromMinutes(5));
+
+            // Act - request another connection.
+            SqlConnection owner2 = new();
+            pool.TryGetConnection(owner2, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? second);
+
+            // Assert - with the legacy switch on, the stale connection is still reused.
+            Assert.Same(first, second);
+        }
+
+        [Fact]
+        public void IdleTimeout_LongCheckout_ReturnedConnectionIsPreserved()
+        {
+            using LocalAppContextSwitchesHelper switchesHelper = new();
+            switchesHelper.UseLegacyIdleTimeoutBehavior = false;
+
+            // 1-second idle timeout: tight enough that a 5-second "checkout" backdate exceeds it.
+            var pool = ConstructPoolWithIdleTimeout(idleTimeoutSeconds: 1);
+            SqlConnection owner = new();
+            pool.TryGetConnection(owner, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? connection);
+            Assert.NotNull(connection);
+
+            // Simulate a long-running query: ReturnedTime (initialised to CreateTime when minted) is
+            // backdated past the idle window while the connection is still checked out and busy on
+            // the wire.
+            BackdateReturnedTime(connection, TimeSpan.FromSeconds(5));
+
+            // Act - return the actively-used connection.
+            pool.ReturnInternalConnection(connection, owner);
+
+            // Assert - the connection must be re-stamped and preserved, not evicted as idle-expired.
+            // If IsLiveConnection runs before SetReturnedTime in ReturnInternalConnection, it sees
+            // the stale stamp and wrongly destroys a healthy in-use connection.
+            Assert.Equal(1, pool.Count);
+
+            SqlConnection owner2 = new();
+            pool.TryGetConnection(owner2, taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? reused);
+            Assert.Same(connection, reused);
+        }
+
+        // Forcibly rewinds a connection's ReturnedTime by the given amount so tests don't have to sleep.
+        private static void BackdateReturnedTime(DbConnectionInternal connection, TimeSpan delta)
+        {
+            connection.ReturnedTime = DateTime.UtcNow - delta;
+        }
+
+        #endregion
+
         #region Test classes
         internal class SuccessfulSqlConnectionFactory : SqlConnectionFactory
         {
@@ -1013,7 +1231,8 @@ public void Constructor_WithZeroMaxPoolSize_ThrowsArgumentOutOfRangeException()
                 maxPoolSize: 0, // This should cause an exception
                 creationTimeout: 15,
                 loadBalanceTimeout: 0,
-                hasTransactionAffinity: true
+                hasTransactionAffinity: true,
+                idleTimeout: 0
             );
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
                 new SqlConnectionOptions("Data Source=localhost;"),
@@ -1044,7 +1263,8 @@ public void Constructor_WithLargeMaxPoolSize()
                 maxPoolSize: 10000,
                 creationTimeout: 15,
                 loadBalanceTimeout: 0,
-                hasTransactionAffinity: true
+                hasTransactionAffinity: true,
+                idleTimeout: 0
             );
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
                 new SqlConnectionOptions("Data Source=localhost;"),
@@ -1085,7 +1305,8 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
                 maxPoolSize: 1,
                 creationTimeout: 15,
                 loadBalanceTimeout: 0,
-                hasTransactionAffinity: true
+                hasTransactionAffinity: true,
+                idleTimeout: 0
             );
             var dbConnectionPoolGroup1 = new DbConnectionPoolGroup(
                 new SqlConnectionOptions("Data Source=localhost;"),
@@ -1111,7 +1332,8 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
                 maxPoolSize: 2,
                 creationTimeout: 15,
                 loadBalanceTimeout: 0,
-                hasTransactionAffinity: true
+                hasTransactionAffinity: true,
+                idleTimeout: 0
             );
             var dbConnectionPoolGroup2 = new DbConnectionPoolGroup(
                 new SqlConnectionOptions("Data Source=localhost;"),
@@ -1154,7 +1376,8 @@ public async Task ConcurrentCallers_ShouldTimeoutIndependently()
                 maxPoolSize: 1,
                 creationTimeout: 15,
                 loadBalanceTimeout: 0,
-                hasTransactionAffinity: true
+                hasTransactionAffinity: true,
+                idleTimeout: 0
             );
             var pool = ConstructPool(SuccessfulConnectionFactory, poolGroupOptions: poolGroupOptions);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs
index 6c00f8e38e..3688c8d772 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs
@@ -47,7 +47,8 @@ private WaitHandleDbConnectionPool CreatePool(
             maxPoolSize: maxPoolSize,
             creationTimeout: creationTimeoutMs,
             loadBalanceTimeout: 0,
-            hasTransactionAffinity: true);
+            hasTransactionAffinity: true,
+            idleTimeout: 0);
 
         var dbConnectionPoolGroup = new DbConnectionPoolGroup(
             new SqlConnectionOptions("Data Source=localhost;"),
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolIdleTimeoutTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolIdleTimeoutTest.cs
new file mode 100644
index 0000000000..4cbc8db636
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolIdleTimeoutTest.cs
@@ -0,0 +1,234 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Reflection;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Data.SqlClient.Tests.Common;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool;
+
+/// <summary>
+/// Deterministic tests for WaitHandleDbConnectionPool idle-timeout enforcement.
+/// Mirrors the corresponding tests in <see cref="ChannelDbConnectionPoolTest"/> so that the
+/// retrieval-side idle-expiry behavior is covered for both pool implementations.
+/// </summary>
+public class WaitHandleDbConnectionPoolIdleTimeoutTest : IDisposable
+{
+    private const int DefaultMaxPoolSize = 50;
+    private const int DefaultMinPoolSize = 0;
+    private const int DefaultCreationTimeoutInMilliseconds = 15000;
+
+    private WaitHandleDbConnectionPool _pool = null!;
+
+    public void Dispose()
+    {
+        _pool?.Shutdown();
+        _pool?.Clear();
+    }
+
+    private WaitHandleDbConnectionPool CreatePool(int idleTimeoutSeconds)
+    {
+        var poolGroupOptions = new DbConnectionPoolGroupOptions(
+            poolByIdentity: false,
+            minPoolSize: DefaultMinPoolSize,
+            maxPoolSize: DefaultMaxPoolSize,
+            creationTimeout: DefaultCreationTimeoutInMilliseconds,
+            loadBalanceTimeout: 0,
+            hasTransactionAffinity: true,
+            idleTimeout: idleTimeoutSeconds);
+
+        var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+            new SqlConnectionOptions("Data Source=localhost;"),
+            new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+            poolGroupOptions);
+
+        var pool = new WaitHandleDbConnectionPool(
+            new WaitHandleDbConnectionPoolTransactionTest.MockSqlConnectionFactory(),
+            dbConnectionPoolGroup,
+            DbConnectionPoolIdentity.NoIdentity,
+            new DbConnectionPoolProviderInfo());
+
+        pool.Startup();
+        return pool;
+    }
+
+    private DbConnectionInternal GetConnection(SqlConnection owner)
+    {
+        _pool.TryGetConnection(
+            owner,
+            taskCompletionSource: null,
+            TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+            out DbConnectionInternal? connection);
+        Assert.NotNull(connection);
+        return connection!;
+    }
+
+    // Forcibly rewinds a connection's ReturnedTime by the given amount so tests don't have to sleep.
+    private static void BackdateReturnedTime(DbConnectionInternal connection, TimeSpan delta)
+    {
+        connection.ReturnedTime = DateTime.UtcNow - delta;
+    }
+
+    [Fact]
+    public void IdleTimeout_StampedOnReturn()
+    {
+        using LocalAppContextSwitchesHelper switchesHelper = new();
+        switchesHelper.UseLegacyIdleTimeoutBehavior = false;
+
+        // Arrange - long idle timeout so the return path stamps (not evicts).
+        _pool = CreatePool(idleTimeoutSeconds: 3600);
+        SqlConnection owner = new();
+        DbConnectionInternal connection = GetConnection(owner);
+
+        // Backdate by a small amount that's still well inside the idle window so the return path
+        // doesn't decide to evict instead of stamp.
+        BackdateReturnedTime(connection, TimeSpan.FromSeconds(5));
+        DateTime stampedBack = connection.ReturnedTime;
+
+        // Act
+        DateTime before = DateTime.UtcNow;
+        _pool.ReturnInternalConnection(connection, owner);
+        DateTime after = DateTime.UtcNow;
+
+        // Assert: stamp falls within the return window and is strictly newer than the backdated value.
+        Assert.InRange(connection.ReturnedTime, before, after);
+        Assert.True(connection.ReturnedTime > stampedBack);
+    }
+
+    [Fact]
+    public void IdleTimeout_Zero_DoesNotExpire()
+    {
+        // Arrange - pool with idle expiry disabled
+        _pool = CreatePool(idleTimeoutSeconds: 0);
+        SqlConnection owner = new();
+        DbConnectionInternal first = GetConnection(owner);
+
+        // Return + back-date ReturnedTime to simulate a long sit.
+        _pool.ReturnInternalConnection(first, owner);
+        BackdateReturnedTime(first, TimeSpan.FromHours(1));
+
+        // Act
+        SqlConnection owner2 = new();
+        DbConnectionInternal second = GetConnection(owner2);
+
+        // Assert - same instance, idle expiry disabled
+        Assert.Same(first, second);
+        Assert.Equal(1, _pool.Count);
+    }
+
+    [Fact]
+    public void IdleTimeout_Set_ExpiresOldConnection()
+    {
+        using LocalAppContextSwitchesHelper switchesHelper = new();
+        switchesHelper.UseLegacyIdleTimeoutBehavior = false;
+
+        // Arrange - pool with 1-second idle timeout
+        _pool = CreatePool(idleTimeoutSeconds: 1);
+        SqlConnection owner = new();
+        DbConnectionInternal first = GetConnection(owner);
+
+        // Return + back-date ReturnedTime beyond the timeout.
+        _pool.ReturnInternalConnection(first, owner);
+        BackdateReturnedTime(first, TimeSpan.FromSeconds(5));
+
+        // Act - request another connection
+        SqlConnection owner2 = new();
+        DbConnectionInternal second = GetConnection(owner2);
+
+        // Assert - the expired one is discarded; a new one is minted.
+        Assert.NotSame(first, second);
+    }
+
+    [Fact]
+    public void IdleTimeout_Set_KeepsFreshConnection()
+    {
+        using LocalAppContextSwitchesHelper switchesHelper = new();
+        switchesHelper.UseLegacyIdleTimeoutBehavior = false;
+
+        // Arrange - 60-second idle timeout, connection just returned
+        _pool = CreatePool(idleTimeoutSeconds: 60);
+        SqlConnection owner = new();
+        DbConnectionInternal first = GetConnection(owner);
+        _pool.ReturnInternalConnection(first, owner);
+
+        // Act - immediately request another connection
+        SqlConnection owner2 = new();
+        DbConnectionInternal second = GetConnection(owner2);
+
+        // Assert - same instance reused, well within idle window
+        Assert.Same(first, second);
+    }
+
+    [Fact]
+    public void IdleTimeout_LegacySwitch_SuppressesEviction()
+    {
+        using LocalAppContextSwitchesHelper switchesHelper = new();
+        switchesHelper.UseLegacyIdleTimeoutBehavior = true;
+
+        // Arrange - 1-second idle timeout, but legacy switch suppresses the new eviction path.
+        _pool = CreatePool(idleTimeoutSeconds: 1);
+        SqlConnection owner = new();
+        DbConnectionInternal first = GetConnection(owner);
+
+        // Return + back-date well past the configured timeout.
+        _pool.ReturnInternalConnection(first, owner);
+        BackdateReturnedTime(first, TimeSpan.FromMinutes(5));
+
+        // Act - request another connection.
+        SqlConnection owner2 = new();
+        DbConnectionInternal second = GetConnection(owner2);
+
+        // Assert - with the legacy switch on, the stale connection is still reused.
+        Assert.Same(first, second);
+    }
+
+    [Fact]
+    public void IdleTimeout_LegacyOff_Zero_CleanupCallbackDoesNotEvict()
+    {
+        using LocalAppContextSwitchesHelper switchesHelper = new();
+        switchesHelper.UseLegacyIdleTimeoutBehavior = false;
+
+        // Arrange - new idle-timeout behavior enabled with IdleTimeout=0 means "disabled entirely":
+        // the generational destroy/age-into-old-stack sweep in CleanupCallback must be a no-op so
+        // connections above MinPoolSize are not pruned on the cleanup tick.
+        _pool = CreatePool(idleTimeoutSeconds: 0);
+
+        // Vend, then return, several connections so they sit in _stackNew.
+        SqlConnection o1 = new();
+        SqlConnection o2 = new();
+        SqlConnection o3 = new();
+        DbConnectionInternal c1 = GetConnection(o1);
+        DbConnectionInternal c2 = GetConnection(o2);
+        DbConnectionInternal c3 = GetConnection(o3);
+        _pool.ReturnInternalConnection(c1, o1);
+        _pool.ReturnInternalConnection(c2, o2);
+        _pool.ReturnInternalConnection(c3, o3);
+
+        int countBefore = _pool.Count;
+        int idleBefore = _pool.IdleCount;
+        Assert.Equal(3, countBefore);
+        Assert.Equal(3, idleBefore);
+
+        // Act - two cleanup cycles. Pre-fix this would move new->old then destroy old above
+        // MinPoolSize (default 0), dropping Count and IdleCount to 0.
+        InvokeCleanupCallback(_pool);
+        InvokeCleanupCallback(_pool);
+
+        // Assert - cleanup loops short-circuited; all three connections still pooled.
+        Assert.Equal(countBefore, _pool.Count);
+        Assert.Equal(idleBefore, _pool.IdleCount);
+    }
+
+    private static void InvokeCleanupCallback(WaitHandleDbConnectionPool pool)
+    {
+        MethodInfo cleanup = typeof(WaitHandleDbConnectionPool).GetMethod(
+            "CleanupCallback",
+            BindingFlags.Instance | BindingFlags.NonPublic)!;
+        cleanup.Invoke(pool, new object?[] { null });
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
index 555de74b29..88af13922b 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
@@ -55,7 +55,8 @@ private WaitHandleDbConnectionPool CreatePool(
             maxPoolSize: maxPoolSize,
             creationTimeout: DefaultCreationTimeoutInMilliseconds,
             loadBalanceTimeout: 0,
-            hasTransactionAffinity: hasTransactionAffinity
+            hasTransactionAffinity: hasTransactionAffinity,
+            idleTimeout: 0
         );
 
         var dbConnectionPoolGroup = new DbConnectionPoolGroup(
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
index c5c6f7ec73..67837e10f2 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
@@ -56,6 +56,7 @@ public void TestDefaultAppContextSwitchValues()
         Assert.True(LocalAppContextSwitches.LegacyVarTimeZeroScaleBehaviour);
         Assert.True(LocalAppContextSwitches.UseCompatibilityProcessSni);
         Assert.True(LocalAppContextSwitches.UseCompatibilityAsyncBehaviour);
+        Assert.True(LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior);
         Assert.False(LocalAppContextSwitches.UseConnectionPoolV2);
         Assert.False(LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait);
         Assert.False(LocalAppContextSwitches.TruncateScaledDecimal);

From ff239c97ca1752007fd48b1dfb8ab8959aa90e05 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 23 Jun 2026 14:04:35 -0700
Subject: [PATCH 158/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4398)

Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com>
---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx  | 6 ++++++
 .../src/Resources/Strings.pt-BR.resx                        | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx  | 6 ++++++
 .../src/Resources/Strings.zh-Hans.resx                      | 6 ++++++
 .../src/Resources/Strings.zh-Hant.resx                      | 6 ++++++
 13 files changed, 78 insertions(+)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index 65914fdf4c..dc677ada6a 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Pro {0} nelze najít zprostředkovatele ověřování. Nainstalujte balíček NuGet Microsoft.Data.SqlClient.Extensions.Azure (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure), abyste mohli používat metody ověřování Active Directory (Entra ID).</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Parametr {0} nesmí obsahovat hodnotu Null ani nesmí být prázdný.</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>Minimální doba (v sekundách), po jakou má být toto připojení uchováváno ve fondu, než bude zrušeno.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Maximální počet připojení povolených ve fondu.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index fcbac77cb7..820d9f4568 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Für „{0}“ wurde kein Authentifizierungsanbieter gefunden. Installieren Sie das NuGet-Paket „Microsoft.Data.SqlClient.Extensions.Azure“ (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure), um Active Directory (Entra ID)-Authentifizierungsmethoden zu verwenden.</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Der Parameter "{0}" darf nicht NULL oder leer sein.</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>Die Mindestdauer (in Sekunden), die diese Verbindung im Pool verbleibt, bevor sie gelöscht wird.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Die maximal zulässige Anzahl von Verbindungen im Pool.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index e62177e353..2789788846 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>No se encuentra un proveedor de autenticación para ''{0}''. Instale el paquete NuGet "Microsoft.Data.SqlClient.Extensions.Azure" (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) para usar métodos de autenticación Active Directory (Id. de Entra).</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>El parámetro "{0}" no puede ser nulo ni estar vacío.</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>Periodo mínimo de tiempo (en segundos) que residirá esta conexión en el grupo antes de ser destruida.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Número máximo de conexiones permitidas en el grupo.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index f175dbf816..67815a7f9f 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Impossible de trouver un fournisseur d'authentification pour « {0} ». Installez le package NuGet « Microsoft.Data.SqlClient.Extensions.Azure » (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) pour utiliser les méthodes d'authentification Active Directory Domain Services (Entra ID).</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Le paramètre « {0} » ne peut pas être Null ou vide.</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>Durée minimale de conservation (en secondes) de cette connexion avant sa destruction.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Nombre maximal de connexions autorisé dans le pool.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 129310c5eb..16ef46bd2c 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Non è possibile trovare un provider di autenticazione per '{0}'. Installare il pacchetto NuGet 'Microsoft.Data.SqlClient.Extensions.Azure' (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) per usare i metodi di autenticazione di Active Directory (Entra ID).</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Il parametro '{0}' non può essere Null o vuoto.</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>Tempo minimo di attesa (in secondi) perché la connessione sia attiva nel pool prima di essere eliminata.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Numero massimo di connessioni consentite nel pool.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index f8b67f7cba..6fc0d5b867 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>'{0}' の認証プロバイダーが見つかりません。Active Directory (Entra ID) 認証方法を使用するには、'Microsoft.Data.SqlClient.Extensions.Azure' NuGet パッケージ (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) をインストールしてください。</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>パラメーター '{0}' を null や空にすることはできません。</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>この接続が破棄されるまでにプールに存在できる最低限の時間 (秒) です。</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>プールに保持できる最大接続数です。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index a3a6bc51e4..fc186e4188 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>'{0}'에 대한 인증 공급자를 찾을 수 없습니다. Active Directory(Entra ID) 인증 방법을 사용하려면 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet 패키지(https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure)를 설치하세요.</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>'{0}' 매개 변수는 null이거나 비워 둘 수 없습니다.</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>이 연결이 제거되기 전에 풀에서 활성화되어 있는 최소 시간(초)입니다.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>풀에서 허용되는 최대 연결 수입니다.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index eeb6d69665..ff7594a995 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Nie można odnaleźć dostawcy uwierzytelniania dla elementu „{0}”. Zainstaluj pakiet NuGet „Microsoft.Data.SqlClient.Extensions.Azure” (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure), aby korzystać z metod uwierzytelniania usługi Active Directory (Entra ID).</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Parametr „{0}” nie może mieć wartości null ani być pusty.</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>Minimalny czas (w sekundach) przechowywania tego połączenia w puli przed jego usunięciem.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Maksymalna liczba połączeń dozwolonych w puli.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 5873d61783..aceb8af554 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Não é possível localizar um provedor de autenticação para '{0}'. Instale o pacote NuGet 'Microsoft.Data.SqlClient.Extensions.Azure' (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) para usar métodos de autenticação do Active Directory (Entra ID).</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>O parâmetro '{0}' não pode ser nulo ou vazio.</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>O tempo mínimo (em segundos) para que essa conexão exista no pool antes de ser destruída.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>O número máximo de conexões permitidas no pool.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 9d1fcbc6f1..e6bd7e21ed 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>Не удается найти поставщик проверки подлинности для "{0}". Установите пакет NuGet "Microsoft.Data.SqlClient.Extensions.Azure" (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) для использования методов проверки подлинности Active Directory (Entra ID).</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Параметр «{0}» не может иметь значение NULL или быть пустым.</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>Минимальное время (в секундах), которое это подключение будет оставаться в пуле до уничтожения.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Максимально допустимое число подключений в пуле.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index 65a0046cfb..bee4c2db2d 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>'{0}' için kimlik doğrulaması sağlayıcısı bulunamıyor. Active Directory (Entra ID) kimlik doğrulaması yöntemlerini kullanmak için ‘Microsoft.Data.SqlClient.Extensions.Azure’ NuGet paketini (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) yükleyin.</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>'{0}' parametresi null veya boş olamaz.</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>Bu bağlantının, yok edilmeden önce havuzda en az ne süreyle (saniye olarak) etkin kalacağı.</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Havuzda izin verilen en çok bağlantı sayısı.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 8f881105c9..5fbca4eeb0 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>找不到 ‘{0}’ 的身份验证提供程序。安装 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet 包(https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure)以使用 Active Directory (Entra ID)身份验证方法。</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>参数“{0}”不能为 null 或为空。</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>此连接在池中存活直至被销毁的最短时间(以秒为单位)。</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>池中所允许连接的最大数目。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index 2081722fb7..aea00e873a 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -606,6 +606,9 @@
   <data name="SQL_CannotFindActiveDirectoryAuthProvider" xml:space="preserve">
     <value>找不到 '{0}' 的驗證提供者。請安裝 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet 套件 (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure)，以使用 Active Directory (Entra ID) 認證方法。</value>
   </data>
+  <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
+    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+  </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>參數 '{0}' 不能是 Null 或空白。</value>
   </data>
@@ -960,6 +963,9 @@
   <data name="DbConnectionString_LoadBalanceTimeout" xml:space="preserve">
     <value>集區中的連接在被終結前的存在時間下限 (單位為秒)。</value>
   </data>
+  <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
+    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+  </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>集區中允許的連接上限。</value>
   </data>

From 83412c7c5a57ff6eda801df1e59df5668cbe5fbd Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Tue, 23 Jun 2026 18:25:07 -0500
Subject: [PATCH 159/298] Async Generic Helpers (#4334)

* Extract AsyncHelper from SqlUtil.cs into the utilities namespace

# Conflicts:
#	src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
#	src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.netcore.cs
#	src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
#	src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
#	src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.netfx.cs
#	src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
#	src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
#	src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
#	src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
#	src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
#	src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
#	src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
#	src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs

* Implement AsyncHelpers with generic state, add unit tests

* Change existing async helper calls in SqlBulkCopy.cs

* Change existing async helper calls in TdsParser.cs

* Change existing async helper calls in TdsParser.cs

* Change existing async helper calls in SqlCommand

* Remove old tests

* Comments from copilot round 1

* Address feedback from wraith - including constraining state types to class types.

* Fix tests for last change
---
 .../Connection/SqlConnectionInternal.cs       |   10 +-
 .../Microsoft/Data/SqlClient/SqlBulkCopy.cs   |   62 +-
 .../Data/SqlClient/SqlCommand.Encryption.cs   |   24 +-
 .../Data/SqlClient/SqlCommand.NonQuery.cs     |   87 +-
 .../Data/SqlClient/SqlCommand.Reader.cs       |   39 +-
 .../Data/SqlClient/SqlCommand.Xml.cs          |   73 +-
 .../Microsoft/Data/SqlClient/SqlConnection.cs |    4 +-
 .../src/Microsoft/Data/SqlClient/SqlUtil.cs   |  244 ---
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |   20 +-
 .../Data/SqlClient/TdsParserStateObject.cs    |   48 +-
 .../Data/SqlClient/Utilities/AsyncHelper.cs   |  871 ++++++++
 .../tests/Directory.Packages.props            |    1 +
 .../tests/FunctionalTests/SqlHelperTest.cs    |   62 -
 .../Microsoft.Data.SqlClient.UnitTests.csproj |    2 +
 .../SqlClient/Utilities/AsyncHelperTest.cs    | 1814 +++++++++++++++++
 .../UnitTests/Utilities/MockExtensions.cs     |  120 ++
 16 files changed, 2995 insertions(+), 486 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Utilities/AsyncHelper.cs
 delete mode 100644 src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlHelperTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/Utilities/AsyncHelperTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Utilities/MockExtensions.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index d87333c05b..7c3e177520 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Security;
 using System.Text;
@@ -14,12 +13,15 @@
 using System.Threading.Tasks;
 using System.Transactions;
 using Microsoft.Data.Common;
-using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.ProviderBase;
-using Microsoft.Data.SqlClient.Connection;
 using Microsoft.Data.SqlClient.ConnectionPool;
-using IsolationLevel = System.Data.IsolationLevel;
 using Microsoft.Data.SqlClient.Internal;
+using Microsoft.Data.SqlClient.Utilities;
+using IsolationLevel = System.Data.IsolationLevel;
+
+#if NETFRAMEWORK
+using Microsoft.Data.Common.ConnectionString;
+#endif
 
 namespace Microsoft.Data.SqlClient.Connection
 {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
index af6b2524c2..55142268e9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -17,6 +17,7 @@
 using Microsoft.Data.Common;
 using Microsoft.Data.SqlClient.Connection;
 using Microsoft.Data.SqlClient.Internal;
+using Microsoft.Data.SqlClient.Utilities;
 
 namespace Microsoft.Data.SqlClient
 {
@@ -789,7 +790,7 @@ private string AnalyzeTargetAndCreateUpdateBulkCommand(BulkCopySimpleResultSet i
 
                     // Remove it from our unmatched set.
                     unmatchedColumns.Remove(localColumn.MappedDestinationColumn);
-                    
+
                     // Check for column types that we refuse to bulk load, even
                     // though we found a match.
                     //
@@ -2868,18 +2869,17 @@ private Task CopyBatchesAsyncContinued(BulkCopySimpleResultSet internalResults,
                         task,
                         source,
                         state: this,
-                        onSuccess: (object state) =>
+                        onSuccess: state =>
                         {
-                            SqlBulkCopy sqlBulkCopy = (SqlBulkCopy)state;
-                            Task continuedTask = sqlBulkCopy.CopyBatchesAsyncContinuedOnSuccess(internalResults, updateBulkCommandText, cts, source);
+                            Task continuedTask = state.CopyBatchesAsyncContinuedOnSuccess(internalResults, updateBulkCommandText, cts, source);
                             if (continuedTask == null)
                             {
                                 // Continuation finished sync, recall into CopyBatchesAsync to continue
-                                sqlBulkCopy.CopyBatchesAsync(internalResults, updateBulkCommandText, cts, source);
+                                state.CopyBatchesAsync(internalResults, updateBulkCommandText, cts, source);
                             }
                         },
-                        onFailure: static (Exception _, object state) => ((SqlBulkCopy)state).CopyBatchesAsyncContinuedOnError(cleanupParser: false),
-                        onCancellation: static (object state) => ((SqlBulkCopy)state).CopyBatchesAsyncContinuedOnError(cleanupParser: true));
+                        onFailure: static (state, _) => state.CopyBatchesAsyncContinuedOnError(cleanupParser: false),
+                        onCancellation: static state => state.CopyBatchesAsyncContinuedOnError(cleanupParser: true));
 
                     return source.Task;
                 }
@@ -2930,24 +2930,23 @@ private Task CopyBatchesAsyncContinuedOnSuccess(BulkCopySimpleResultSet internal
                         writeTask,
                         source,
                         state: this,
-                        onSuccess: (object state) =>
+                        onSuccess: state =>
                         {
-                            SqlBulkCopy sqlBulkCopy = (SqlBulkCopy)state;
                             try
                             {
-                                sqlBulkCopy.RunParser();
-                                sqlBulkCopy.CommitTransaction();
+                                state.RunParser();
+                                state.CommitTransaction();
                             }
                             catch (Exception)
                             {
-                                sqlBulkCopy.CopyBatchesAsyncContinuedOnError(cleanupParser: false);
+                                state.CopyBatchesAsyncContinuedOnError(cleanupParser: false);
                                 throw;
                             }
 
                             // Always call back into CopyBatchesAsync
-                            sqlBulkCopy.CopyBatchesAsync(internalResults, updateBulkCommandText, cts, source);
+                            state.CopyBatchesAsync(internalResults, updateBulkCommandText, cts, source);
                         },
-                        onFailure: static (Exception _, object state) => ((SqlBulkCopy)state).CopyBatchesAsyncContinuedOnError(cleanupParser: false));
+                        onFailure: static (state, _ ) => state.CopyBatchesAsyncContinuedOnError(cleanupParser: false));
                     return source.Task;
                 }
             }
@@ -3202,21 +3201,20 @@ private void WriteToServerInternalRestAsync(CancellationToken cts, TaskCompletio
 
                         // No need to cancel timer since SqlBulkCopy creates specific task source for reconnection.
                         AsyncHelper.SetTimeoutExceptionWithState(
-                            completion: cancellableReconnectTS,
-                            timeout: BulkCopyTimeout,
+                            taskCompletionSource: cancellableReconnectTS,
+                            timeoutInSeconds: BulkCopyTimeout,
                             state: _destinationTableName,
-                            onFailure: static state =>
-                                SQL.BulkLoadInvalidDestinationTable((string)state, SQL.CR_ReconnectTimeout()),
+                            onTimeout: static state => SQL.BulkLoadInvalidDestinationTable(state, SQL.CR_ReconnectTimeout()),
                             cancellationToken: CancellationToken.None
                         );
 
                         AsyncHelper.ContinueTaskWithState(
-                            task: cancellableReconnectTS.Task,
-                            completion: source,
+                            taskToContinue:cancellableReconnectTS.Task,
+                            taskCompletionSource: source,
                             state: regReconnectCancel,
-                            onSuccess: (object state) =>
+                            onSuccess: state =>
                             {
-                                ((StrongBox<CancellationTokenRegistration>)state).Value.Dispose();
+                                state.Value.Dispose();
                                 if (_parserLock != null)
                                 {
                                     _parserLock.Release();
@@ -3226,10 +3224,22 @@ private void WriteToServerInternalRestAsync(CancellationToken cts, TaskCompletio
                                 _parserLock.Wait(canReleaseFromAnyThread: true);
                                 WriteToServerInternalRestAsync(cts, source);
                             },
-                            onFailure: static (_, state) => ((StrongBox<CancellationTokenRegistration>)state).Value.Dispose(),
-                            onCancellation: static state => ((StrongBox<CancellationTokenRegistration>)state).Value.Dispose(),
-                            exceptionConverter: ex => SQL.BulkLoadInvalidDestinationTable(_destinationTableName, ex)
-                        );
+                            onFailure: (state, exception) =>
+                            {
+                                state.Value.Dispose();
+
+                                // Convert exception and set it on the source
+                                // Note: This is safe because the helper will only try to set the
+                                //    exception and b/c it is already set will pass without setting
+                                //    to the original exception.
+                                Exception convertedException = SQL.BulkLoadInvalidDestinationTable(
+                                    _destinationTableName,
+                                    exception);
+                                source.TrySetException(convertedException);
+                            },
+                            onCancellation: static regReconnectCancel2 =>
+                                regReconnectCancel2.Value.Dispose());
+
                         return;
                     }
                     else
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs
index fa5cfb5ab2..3b0fc6e93f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs
@@ -14,6 +14,7 @@
 using System.Threading.Tasks;
 using Microsoft.Data.Common;
 using Microsoft.Data.SqlClient.Connection;
+using Microsoft.Data.SqlClient.Utilities;
 
 namespace Microsoft.Data.SqlClient
 {
@@ -252,23 +253,22 @@ private SqlDataReader GetParameterEncryptionDataReader(
             bool isRetry)
         {
             returnTask = AsyncHelper.CreateContinuationTaskWithState(
-                task: fetchInputParameterEncryptionInfoTask,
+                taskToContinue: fetchInputParameterEncryptionInfoTask,
                 state: this,
-                onSuccess: state =>
+                onSuccess: sqlCommand =>
                 {
-                    SqlCommand command = (SqlCommand)state;
                     bool processFinallyBlockAsync = true;
                     bool decrementAsyncCountInFinallyBlockAsync = true;
 
                     try
                     {
                         // Check for any exceptions on network write, before reading.
-                        command.CheckThrowSNIException();
+                        sqlCommand.CheckThrowSNIException();
 
                         // If it is async, then TryFetchInputParameterEncryptionInfo ->
                         // RunExecuteReaderTds would have incremented the async count. Decrement it
                         // when we are about to complete async execute reader.
-                        SqlConnectionInternal internalConnectionTds = command._activeConnection.GetOpenTdsConnection();
+                        SqlConnectionInternal internalConnectionTds = sqlCommand._activeConnection.GetOpenTdsConnection();
                         if (internalConnectionTds is not null)
                         {
                             internalConnectionTds.DecrementAsyncCount();
@@ -277,13 +277,13 @@ private SqlDataReader GetParameterEncryptionDataReader(
 
                         // Complete executereader.
                         // @TODO: If we can remove this reference, this could be a static lambda
-                        describeParameterEncryptionDataReader = command.CompleteAsyncExecuteReader(
+                        describeParameterEncryptionDataReader = sqlCommand.CompleteAsyncExecuteReader(
                             isInternal: false,
                             forDescribeParameterEncryption: true);
-                        Debug.Assert(command._stateObj is null, "non-null state object in PrepareForTransparentEncryption.");
+                        Debug.Assert(sqlCommand._stateObj is null, "non-null state object in PrepareForTransparentEncryption.");
 
                         // Read the results of describe parameter encryption.
-                        command.ReadDescribeEncryptionParameterResults(
+                        sqlCommand.ReadDescribeEncryptionParameterResults(
                             describeParameterEncryptionDataReader,
                             describeParameterEncryptionRpcOriginalRpcMap,
                             isRetry);
@@ -303,7 +303,7 @@ private SqlDataReader GetParameterEncryptionDataReader(
                     }
                     finally
                     {
-                        command.PrepareTransparentEncryptionFinallyBlock(
+                        sqlCommand.PrepareTransparentEncryptionFinallyBlock(
                             closeDataReader: processFinallyBlockAsync,
                             decrementAsyncCount: decrementAsyncCountInFinallyBlockAsync,
                             clearDataStructures: processFinallyBlockAsync,
@@ -312,11 +312,9 @@ private SqlDataReader GetParameterEncryptionDataReader(
                             describeParameterEncryptionDataReader: describeParameterEncryptionDataReader);
                     }
                 },
-                onFailure: static (exception, state) =>
+                onFailure: static (sqlCommand, exception) =>
                 {
-                    SqlCommand command = (SqlCommand)state;
-                    command.CachedAsyncState?.ResetAsyncState();
-
+                    sqlCommand.CachedAsyncState?.ResetAsyncState();
                     if (exception is not null)
                     {
                         throw exception;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
index 141416537f..ac9ccbbc6b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
@@ -12,6 +12,7 @@
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.Connection;
 using Microsoft.Data.SqlClient.Internal;
+using Microsoft.Data.SqlClient.Utilities;
 
 #if NETFRAMEWORK
 using System.Security.Permissions;
@@ -82,11 +83,11 @@ public override int ExecuteNonQuery()
             #if NETFRAMEWORK
             SqlConnection.ExecutePermission.Demand();
             #endif
-            
+
             // Reset _pendingCancel upon entry into any Execute - used to synchronize state
             // between entry into Execute* API and the thread obtaining the stateObject.
             _pendingCancel = false;
-            
+
             using var diagnosticScope = s_diagnosticListener.CreateCommandScope(this, _transaction);
 
             using var eventScope = SqlClientEventScope.Create($"SqlCommand.ExecuteNonQuery | API | Object Id {ObjectID}");
@@ -150,9 +151,9 @@ public override Task<int> ExecuteNonQueryAsync(CancellationToken cancellationTok
             IsProviderRetriable
                 ? InternalExecuteNonQueryWithRetryAsync(cancellationToken)
                 : InternalExecuteNonQueryAsync(cancellationToken);
-        
+
         #endregion
-        
+
         #region Private Methods
 
         // @TODO: This can be inlined into InternalExecuteNonQueryAsync before restructuring into async pathway
@@ -164,7 +165,7 @@ private IAsyncResult BeginExecuteNonQueryAsync(AsyncCallback callback, object st
                 $"Activity Id {ActivityCorrelator.Current}, " +
                 $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
                 $"Command Text '{CommandText}'");
-            
+
             return BeginExecuteNonQueryInternal(
                 CommandBehavior.Default,
                 callback,
@@ -222,13 +223,13 @@ private IAsyncResult BeginExecuteNonQueryInternal(
                     if (execNonQuery is not null)
                     {
                         AsyncHelper.ContinueTaskWithState(
-                            task: execNonQuery,
-                            completion: localCompletion,
-                            state: Tuple.Create(this, localCompletion),
-                            onSuccess: static state =>
+                            taskToContinue: execNonQuery,
+                            taskCompletionSource: localCompletion,
+                            state1: this,
+                            state2: localCompletion,
+                            onSuccess: static (sqlCommand, localCompletion) =>
                             {
-                                var parameters = (Tuple<SqlCommand, TaskCompletionSource<object>>)state;
-                                parameters.Item1.BeginExecuteNonQueryInternalReadStage(parameters.Item2);
+                                sqlCommand.BeginExecuteNonQueryInternalReadStage(localCompletion);
                             });
                     }
                     else
@@ -247,7 +248,7 @@ private IAsyncResult BeginExecuteNonQueryInternal(
 
                 // When we use query caching for parameter encryption we need to retry on specific errors.
                 // In these cases finalize the call internally and trigger a retry when needed.
-                // @TODO: store this method call in a variable, it's faaaaar too big to be used in an if statement 
+                // @TODO: store this method call in a variable, it's faaaaar too big to be used in an if statement
                 if (
                     !TriggerInternalEndAndRetryIfNecessary(
                         behavior,
@@ -270,7 +271,7 @@ private IAsyncResult BeginExecuteNonQueryInternal(
                 {
                     globalCompletion = localCompletion;
                 }
-                
+
                 // Add callback after work is done to avoid overlapping Begin/End methods
                 if (callback is not null)
                 {
@@ -317,31 +318,31 @@ private void CleanupAfterExecuteNonQueryAsync(Task<int> task, TaskCompletionSour
             if (task.IsFaulted)
             {
                 Exception e = task.Exception?.InnerException;
-                
+
                 s_diagnosticListener.WriteCommandError(operationId, this, _transaction, e);
-                
+
                 source.SetException(e);
             }
             else if (task.IsCanceled)
             {
                 s_diagnosticListener.WriteCommandAfter(operationId, this, _transaction);
-                
+
                 source.SetCanceled();
             }
             else
             {
                 // Task successful
                 s_diagnosticListener.WriteCommandAfter(operationId, this, _transaction);
-                
+
                 source.SetResult(task.Result);
             }
         }
-        
+
         // @TODO: This can be inlined into InternalExecuteNonQueryAsync before restructuring into async pathway
         private int EndExecuteNonQueryAsync(IAsyncResult asyncResult)
         {
             Debug.Assert(!_internalEndExecuteInitiated || _stateObj == null);
-            
+
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.EndExecuteNonQueryAsync | Info | Correlation | " +
                 $"Object Id {ObjectID}, " +
@@ -357,7 +358,7 @@ private int EndExecuteNonQueryAsync(IAsyncResult asyncResult)
                 ReliablePutStateObject();
                 throw asyncException.InnerException;
             }
-            
+
             ThrowIfReconnectionHasBeenCanceled();
             // lock on _stateObj prevents races with close/cancel.
             // If we have already initiated the End call internally, we have already done that, so
@@ -369,7 +370,7 @@ private int EndExecuteNonQueryAsync(IAsyncResult asyncResult)
                     return EndExecuteNonQueryInternal(asyncResult);
                 }
             }
-            
+
             return EndExecuteNonQueryInternal(asyncResult);
         }
 
@@ -413,7 +414,7 @@ private int EndExecuteNonQueryInternal(IAsyncResult asyncResult)
                 WriteEndExecuteEvent(success, sqlExceptionNumber, isSynchronous: false);
             }
         }
-        
+
         // @TODO: Return int?
         private object InternalEndExecuteNonQuery(
             IAsyncResult asyncResult,
@@ -426,17 +427,17 @@ private object InternalEndExecuteNonQuery(
                 $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
                 $"MARS={_activeConnection?.Parser.MARSOn}, " +
                 $"AsyncCommandInProgress={_activeConnection?.AsyncCommandInProgress}");
-            
+
             VerifyEndExecuteState((Task)asyncResult, endMethod);
             WaitForAsyncResults(asyncResult, isInternal);
-            
+
             // If column encryption is enabled, also check the state after waiting for the task.
             // It would be better to do this for all cases, but avoiding for compatibility reasons.
             if (IsColumnEncryptionEnabled)
             {
                 VerifyEndExecuteState((Task)asyncResult, endMethod, fullCheckForColumnEncryption: true);
             }
-            
+
             bool processFinallyBlock = true;
             try
             {
@@ -508,13 +509,13 @@ private object InternalEndExecuteNonQuery(
                     PutStateObject();
                 }
             }
-            
+
             Debug.Assert(_stateObj == null, "non-null state object in EndExecuteNonQuery");
-            
+
             return _rowsAffected;
             // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
-        
+
         // @TODO: Restructure to make this a sync-only method
         private Task InternalExecuteNonQuery(
             TaskCompletionSource<object> completion,
@@ -536,7 +537,7 @@ private Task InternalExecuteNonQuery(
 
             SqlStatistics statistics = Statistics;
             _rowsAffected = -1;
-            
+
             // @TODO: Break into smaller methods ("full" and "simple")
 
             // This function may throw for an invalid connection
@@ -630,16 +631,16 @@ private Task<int> InternalExecuteNonQueryAsync(CancellationToken cancellationTok
             #if NETFRAMEWORK
             SqlConnection.ExecutePermission.Demand();
             #endif
-            
+
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.InternalExecuteNonQueryAsync | API | Correlation | " +
                 $"Object Id {ObjectID}, " +
                 $"Activity Id {ActivityCorrelator.Current}, " +
                 $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
                 $"Command Text '{CommandText}'");
-            
+
             Guid operationId = s_diagnosticListener.WriteCommandBefore(this, _transaction);
-            
+
             // Connection can be used as state in RegisterForConnectionCloseNotification continuation
             // to avoid an allocation so use it as the state value if possible but it can be changed if
             // you need it for a more important piece of data that justifies the tuple allocation later
@@ -698,14 +699,14 @@ private Task<int> InternalExecuteNonQueryAsync(CancellationToken cancellationTok
             catch (Exception e)
             {
                 s_diagnosticListener.WriteCommandError(operationId, this, _transaction, e);
-                
+
                 source.SetException(e);
                 context.Dispose();
             }
 
             return returnedTask;
         }
-        
+
         private Task InternalExecuteNonQueryWithRetry( // @TODO: Task is ignored
             bool sendToPipe,
             int timeout,
@@ -725,7 +726,7 @@ private Task InternalExecuteNonQueryWithRetry( // @TODO: Task is ignored
                     asyncWrite,
                     isRetry,
                     methodName));
-            
+
             usedCache = innerUsedCache;
             return result;
         }
@@ -735,7 +736,7 @@ private Task<int> InternalExecuteNonQueryWithRetryAsync(CancellationToken cancel
                 sender: this,
                 function: () => InternalExecuteNonQueryAsync(cancellationToken),
                 cancellationToken);
-        
+
         // @TODO: Sort args, drop TDS from name
         // @TODO: Restructure to make this the common method for sync and async methods (not InternalExecuteNonQuery)
         private Task RunExecuteNonQueryTds(string methodName, bool isAsync, int timeout, bool asyncWrite)
@@ -755,7 +756,7 @@ private Task RunExecuteNonQueryTds(string methodName, bool isAsync, int timeout,
                         TaskCompletionSource<object> completion = new TaskCompletionSource<object>();
                         _activeConnection.RegisterWaitingForReconnect(completion.Task);
                         _reconnectionCompletionSource = completion;
-                        
+
                         // Basically, this RunExecuteNonQueryTds onto the end of the reconnection
                         RunExecuteNonQueryTdsSetupReconnnectContinuation(
                             methodName,
@@ -842,12 +843,12 @@ private Task RunExecuteNonQueryTds(string methodName, bool isAsync, int timeout,
 
             return null;
         }
-        
+
         /// <remarks>
         /// Since we use CompareExchange, we cannot make the reconnect success continuation static.
         /// Thus, we cannot use the "WithState" continuation helper. If this was part of
         /// RunExecuteNonQueryTds, we would be allocating the lambda each time. So, we make this a
-        /// separate method. 
+        /// separate method.
         /// </remarks>
         // @TODO: Sort args, fix name
         private void RunExecuteNonQueryTdsSetupReconnnectContinuation(
@@ -865,7 +866,7 @@ private void RunExecuteNonQueryTdsSetupReconnnectContinuation(
                 timeout,
                 static () => SQL.CR_ReconnectTimeout(),
                 timeoutCts.Token);
-            
+
             AsyncHelper.ContinueTask(
                 reconnectTask,
                 completion,
@@ -875,7 +876,7 @@ private void RunExecuteNonQueryTdsSetupReconnnectContinuation(
                     {
                         return;
                     }
-                    
+
                     Interlocked.CompareExchange(ref _reconnectionCompletionSource, null, completion);
                     timeoutCts.Cancel();
 
@@ -899,14 +900,14 @@ private void RunExecuteNonQueryTdsSetupReconnnectContinuation(
                     }
                 });
         }
-        
+
         #endregion
 
         internal sealed class ExecuteNonQueryAsyncCallContext
             : AAsyncCallContext<SqlCommand, int, CancellationTokenRegistration>
         {
             public SqlCommand Command => _owner;
-            
+
             public Guid OperationId { get; set; }
 
             public TaskCompletionSource<int> TaskCompletionSource => _source;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
index a98d82118b..bfdbd40fd5 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
@@ -13,10 +13,10 @@
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.Connection;
 using Microsoft.Data.SqlClient.Internal;
+using Microsoft.Data.SqlClient.Utilities;
 
 #if NETFRAMEWORK
 using System.Security.Permissions;
-using Microsoft.Data.SqlClient.Utilities;
 #endif
 
 namespace Microsoft.Data.SqlClient
@@ -1599,18 +1599,18 @@ private Task RunExecuteReaderTdsSetupContinuation(
         {
             // @TODO: Why use the state version if we can't make this a static helper?
             return AsyncHelper.CreateContinuationTaskWithState(
-                task: writeTask,
+                taskToContinue: writeTask,
                 state: _activeConnection,
-                onSuccess: state =>
+                onSuccess: sqlConnection =>
                 {
                     // This will throw if the connection is closed.
                     // @TODO: So... can we have something that specifically does that?
-                    ((SqlConnection)state).GetOpenTdsConnection();
+                    sqlConnection.GetOpenTdsConnection();
                     CachedAsyncState.SetAsyncReaderState(ds, runBehavior, optionSettings);
                 },
-                onFailure: static (exception, state) =>
+                onFailure: static (sqlConnection, _) =>
                 {
-                    ((SqlConnection)state).GetOpenTdsConnection().DecrementAsyncCount();
+                    sqlConnection.GetOpenTdsConnection().DecrementAsyncCount();
                 });
         }
 
@@ -1632,7 +1632,7 @@ private void RunExecuteReaderTdsSetupReconnectContinuation(
             AsyncHelper.SetTimeoutException(
                 completion,
                 timeout,
-                onFailure: static () => SQL.CR_ReconnectTimeout(),
+                onTimeout: static () => SQL.CR_ReconnectTimeout(),
                 timeoutCts.Token);
 
             // @TODO: With an object to pass around we can use the state-based version
@@ -1703,14 +1703,13 @@ private SqlDataReader RunExecuteReaderTdsWithTransparentParameterEncryption(
                 // @TODO: This is a prime candidate for proper async-await execution
                 TaskCompletionSource<object> completion = new TaskCompletionSource<object>();
                 AsyncHelper.ContinueTaskWithState(
-                    task: describeParameterEncryptionTask,
-                    completion: completion,
+                    taskToContinue: describeParameterEncryptionTask,
+                    taskCompletionSource: completion,
                     state: this,
-                    onSuccess: state =>
+                    onSuccess: sqlCommand =>
                     {
-                        SqlCommand command = (SqlCommand)state;
-                        command.GenerateEnclavePackage();
-                        command.RunExecuteReaderTds(
+                        sqlCommand.GenerateEnclavePackage();
+                        sqlCommand.RunExecuteReaderTds(
                             cmdBehavior,
                             runBehavior,
                             returnStream,
@@ -1729,23 +1728,23 @@ private SqlDataReader RunExecuteReaderTdsWithTransparentParameterEncryption(
                         else
                         {
                             AsyncHelper.ContinueTaskWithState(
-                                task: subTask,
-                                completion: completion,
+                                taskToContinue: subTask,
+                                taskCompletionSource: completion,
                                 state: completion,
-                                onSuccess: static state => ((TaskCompletionSource<object>)state).SetResult(null));
+                                onSuccess: static state => state.SetResult(null));
                         }
                     },
-                    onFailure: static (exception, state) =>
+                    onFailure: static (sqlCommand, exception) =>
                     {
-                        ((SqlCommand)state).CachedAsyncState?.ResetAsyncState();
+                        sqlCommand.CachedAsyncState?.ResetAsyncState();
                         if (exception is not null)
                         {
                             throw exception;
                         }
                     },
-                    onCancellation: static state =>
+                    onCancellation: static sqlCommand =>
                     {
-                        ((SqlCommand)state).CachedAsyncState?.ResetAsyncState();
+                        sqlCommand.CachedAsyncState?.ResetAsyncState();
                     });
 
                 task = completion.Task;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
index 2be6166e8b..447627375e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
@@ -13,6 +13,7 @@
 using Microsoft.Data.SqlClient.Connection;
 using Microsoft.Data.SqlClient.Server;
 using Microsoft.Data.SqlClient.Internal;
+using Microsoft.Data.SqlClient.Utilities;
 
 #if NETFRAMEWORK
 using System.Security.Permissions;
@@ -43,7 +44,7 @@ public IAsyncResult BeginExecuteXmlReader(AsyncCallback callback, object stateOb
             #if NETFRAMEWORK
             SqlConnection.ExecutePermission.Demand();
             #endif
-            
+
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.BeginExecuteXmlReader | API | Correlation | " +
                 $"Object Id {ObjectID}, " +
@@ -77,18 +78,18 @@ public XmlReader EndExecuteXmlReader(IAsyncResult asyncResult)
                     $"Command Text '{CommandText}'");
             }
         }
-        
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/ExecuteXmlReader/*'/>
         public XmlReader ExecuteXmlReader()
         {
             #if NETFRAMEWORK
             SqlConnection.ExecutePermission.Demand();
             #endif
-            
+
             // Reset _pendingCancel upon entry into any Execute - used to synchronize state
             // between entry into Execute* API and the thread obtaining the stateObject.
             _pendingCancel = false;
-            
+
             using var diagnosticScope = s_diagnosticListener.CreateCommandScope(this, _transaction);
 
             using var eventScope = SqlClientEventScope.Create($"SqlCommand.ExecuteXmlReader | API | Object Id {ObjectID}");
@@ -142,11 +143,11 @@ public Task<XmlReader> ExecuteXmlReaderAsync(CancellationToken cancellationToken
             IsProviderRetriable
                 ? InternalExecuteXmlReaderWithRetryAsync(cancellationToken)
                 : InternalExecuteXmlReaderAsync(cancellationToken);
-        
+
         #endregion
-        
+
         #region Private Methods
-        
+
         private static XmlReader CompleteXmlReader(SqlDataReader dataReader, bool isAsync)
         {
             XmlReader xmlReader = null;
@@ -189,7 +190,7 @@ private IAsyncResult BeginExecuteXmlReaderAsync(AsyncCallback callback, object s
                 $"Activity Id {ActivityCorrelator.Current}, " +
                 $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
                 $"Command Text '{CommandText}'");
-            
+
             return BeginExecuteXmlReaderInternal(
                 CommandBehavior.SequentialAccess,
                 callback,
@@ -215,7 +216,7 @@ private IAsyncResult BeginExecuteXmlReaderInternal(
                 // Reset _pendingCancel upon entry into any Execute - used to synchronize state
                 // between entry into Execute* API and the thread obtaining the stateObject.
                 _pendingCancel = false;
-                
+
                 // Special case - done outside of try/catches to prevent putting a stateObj back
                 // into pool when we should not.
                 ValidateAsyncCommand();
@@ -247,7 +248,7 @@ private IAsyncResult BeginExecuteXmlReaderInternal(
                         asyncWrite,
                         isRetry);
 
-                    // @TODO: NonQuery pathway has the continueTaskWithState block inside this try. One or the other seems wrong 
+                    // @TODO: NonQuery pathway has the continueTaskWithState block inside this try. One or the other seems wrong
                 }
                 catch (Exception e) when (ADP.IsCatchableOrSecurityExceptionType(e))
                 {
@@ -261,13 +262,13 @@ private IAsyncResult BeginExecuteXmlReaderInternal(
                 if (writeTask is not null)
                 {
                     AsyncHelper.ContinueTaskWithState(
-                        task: writeTask,
-                        completion: localCompletion,
-                        state: Tuple.Create(this, localCompletion),
-                        onSuccess: static state =>
+                        taskToContinue: writeTask,
+                        taskCompletionSource: localCompletion,
+                        state1: this,
+                        state2: localCompletion,
+                        onSuccess: static (sqlCommand, localCompletion) =>
                         {
-                            var parameters = (Tuple<SqlCommand, TaskCompletionSource<object>>)state;
-                            parameters.Item1.BeginExecuteXmlReaderInternalReadStage(parameters.Item2);
+                            sqlCommand.BeginExecuteXmlReaderInternalReadStage(localCompletion);
                         });
                 }
                 else
@@ -352,21 +353,21 @@ private void CleanupAfterExecuteXmlReaderAsync(
             if (task.IsFaulted)
             {
                 Exception e = task.Exception?.InnerException;
-                
+
                 s_diagnosticListener.WriteCommandError(operationId, this, _transaction, e);
-                
+
                 source.SetException(e);
             }
             else if (task.IsCanceled)
             {
                 s_diagnosticListener.WriteCommandAfter(operationId, this, _transaction);
-                
+
                 source.SetCanceled();
             }
             else
             {
                 s_diagnosticListener.WriteCommandAfter(operationId, this, _transaction);
-                
+
                 source.SetResult(task.Result);
             }
         }
@@ -374,7 +375,7 @@ private void CleanupAfterExecuteXmlReaderAsync(
         private XmlReader EndExecuteXmlReaderAsync(IAsyncResult asyncResult)
         {
             Debug.Assert(!_internalEndExecuteInitiated || _stateObj is null);
-            
+
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.EndExecuteXmlReaderAsync | API | Correlation | " +
                 $"Object Id {ObjectID}, " +
@@ -389,9 +390,9 @@ private XmlReader EndExecuteXmlReaderAsync(IAsyncResult asyncResult)
                 ReliablePutStateObject();
                 throw asyncException.InnerException;
             }
-            
+
             ThrowIfReconnectionHasBeenCanceled();
-            
+
             // Locking _stateObj prevents races with close/cancel.
             // If we have already initiated the End call internally, we have already done that, so
             // no point doing it again.
@@ -405,7 +406,7 @@ private XmlReader EndExecuteXmlReaderAsync(IAsyncResult asyncResult)
 
             return EndExecuteXmlReaderInternal(asyncResult);
         }
-        
+
         private XmlReader EndExecuteXmlReaderInternal(IAsyncResult asyncResult)
         {
             bool success = false;
@@ -443,27 +444,27 @@ private XmlReader EndExecuteXmlReaderInternal(IAsyncResult asyncResult)
                 WriteEndExecuteEvent(success, sqlExceptionNumber, isSynchronous: false);
             }
         }
-        
+
         private Task<XmlReader> InternalExecuteXmlReaderAsync(CancellationToken cancellationToken)
         {
             #if NETFRAMEWORK
             SqlConnection.ExecutePermission.Demand();
             #endif
-            
+
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.InternalExecuteXmlReaderAsync | API | Correlation | " +
                 $"Object Id {ObjectID}, " +
                 $"Activity Id {ActivityCorrelator.Current}, " +
                 $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
                 $"Command Text '{CommandText}'");
-            
+
             Guid operationId = s_diagnosticListener.WriteCommandBefore(this, _transaction);
-            
+
             // Connection can be used as state in RegisterForConnectionCloseNotification continuation
             // to avoid an allocation so use it as the state value if possible but it can be changed if
             // you need it for a more important piece of data that justifies the tuple allocation later
             TaskCompletionSource<XmlReader> source = new TaskCompletionSource<XmlReader>(_activeConnection);
-            
+
             CancellationTokenRegistration registration = new CancellationTokenRegistration();
             if (cancellationToken.CanBeCanceled)
             {
@@ -476,7 +477,7 @@ private Task<XmlReader> InternalExecuteXmlReaderAsync(CancellationToken cancella
                 registration = cancellationToken.Register(callback: s_cancelIgnoreFailure, state: this);
             }
 
-            // @TODO: This can be cleaned up to lines if InnerConnection is always SqlInternalConnection 
+            // @TODO: This can be cleaned up to lines if InnerConnection is always SqlInternalConnection
             ExecuteXmlReaderAsyncCallContext context = null;
             if (_activeConnection?.InnerConnection is SqlConnectionInternal sqlInternalConnection)
             {
@@ -516,34 +517,34 @@ private Task<XmlReader> InternalExecuteXmlReaderAsync(CancellationToken cancella
                     TaskCompletionSource<XmlReader> source = context.TaskCompletionSource;
 
                     context.Dispose();
-                        
+
                     command.CleanupAfterExecuteXmlReaderAsync(task, source, operationId);
                 },
                 scheduler: TaskScheduler.Default);
             }
-            catch (Exception e) 
+            catch (Exception e)
             {
                 s_diagnosticListener.WriteCommandError(operationId, this, _transaction, e);
-                
+
                 source.SetException(e);
             }
 
             return returnedTask;
         }
-        
+
         private Task<XmlReader> InternalExecuteXmlReaderWithRetryAsync(CancellationToken cancellationToken) =>
             RetryLogicProvider.ExecuteAsync(
                 sender: this,
                 () => InternalExecuteXmlReaderAsync(cancellationToken),
                 cancellationToken);
-        
+
         #endregion
 
         internal sealed class ExecuteXmlReaderAsyncCallContext
             : AAsyncCallContext<SqlCommand, XmlReader, CancellationTokenRegistration>
         {
             public SqlCommand Command => _owner;
-            
+
             public Guid OperationId { get; set; }
 
             public TaskCompletionSource<XmlReader> TaskCompletionSource => _source;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index 6a4d7b8972..b27b7081c6 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -23,8 +23,10 @@
 using Microsoft.Data.SqlClient.Connection;
 using Microsoft.Data.SqlClient.ConnectionPool;
 using Microsoft.Data.SqlClient.Diagnostics;
-using Microsoft.SqlServer.Server;
 using Microsoft.Data.SqlClient.Internal;
+using Microsoft.Data.SqlClient.Utilities;
+using Microsoft.SqlServer.Server;
+
 #if NETFRAMEWORK
 using System.Runtime.CompilerServices;
 using System.Security.Permissions;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
index 049734993e..678697d221 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
@@ -46,250 +46,6 @@ internal static ArgumentOutOfRangeException InvalidMinAndMaxPair(string minParam
             => new ArgumentOutOfRangeException(minParamName, StringsHelper.GetString(Strings.SqlRetryLogic_InvalidMinMaxPair, minValue, maxValue, minParamName, maxParamName));
     }
 
-    internal static class AsyncHelper
-    {
-        internal static Task CreateContinuationTask(
-            Task task,
-            Action onSuccess,
-            Action<Exception> onFailure = null)
-        {
-            if (task == null)
-            {
-                onSuccess();
-                return null;
-            }
-            else
-            {
-                TaskCompletionSource<object> completion = new TaskCompletionSource<object>();
-                ContinueTaskWithState(
-                    task,
-                    completion,
-                    state: Tuple.Create(onSuccess, onFailure, completion),
-                    onSuccess: static (object state) =>
-                    {
-                        var parameters = (Tuple<Action, Action<Exception>, TaskCompletionSource<object>>)state;
-                        Action success = parameters.Item1;
-                        TaskCompletionSource<object> taskCompletionSource = parameters.Item3;
-                        success();
-                        taskCompletionSource.SetResult(null);
-                    },
-                    onFailure: static (Exception exception, object state) =>
-                    {
-                        var parameters = (Tuple<Action, Action<Exception>, TaskCompletionSource<object>>)state;
-                        Action<Exception> failure = parameters.Item2;
-                        failure?.Invoke(exception);
-                    }
-                );
-                return completion.Task;
-            }
-        }
-
-        internal static Task CreateContinuationTaskWithState(Task task, object state, Action<object> onSuccess, Action<Exception, object> onFailure = null)
-        {
-            if (task == null)
-            {
-                onSuccess(state);
-                return null;
-            }
-            else
-            {
-                var completion = new TaskCompletionSource<object>();
-                ContinueTaskWithState(task, completion, state,
-                    onSuccess: (object continueState) =>
-                    {
-                        onSuccess(continueState);
-                        completion.SetResult(null);
-                    },
-                    onFailure: onFailure
-                );
-                return completion.Task;
-            }
-        }
-
-        internal static Task CreateContinuationTask<T1, T2>(
-            Task task,
-            Action<T1, T2> onSuccess,
-            T1 arg1,
-            T2 arg2,
-            Action<Exception> onFailure = null)
-        {
-            return CreateContinuationTask(task, () => onSuccess(arg1, arg2), onFailure);
-        }
-
-        internal static void ContinueTask(Task task,
-            TaskCompletionSource<object> completion,
-            Action onSuccess,
-            Action<Exception> onFailure = null,
-            Action onCancellation = null,
-            Func<Exception, Exception> exceptionConverter = null)
-        {
-            task.ContinueWith(
-                tsk =>
-                {
-                    if (tsk.Exception != null)
-                    {
-                        Exception exc = tsk.Exception.InnerException;
-                        if (exceptionConverter != null)
-                        {
-                            exc = exceptionConverter(exc);
-                        }
-                        try
-                        {
-                            onFailure?.Invoke(exc);
-                        }
-                        finally
-                        {
-                            completion.TrySetException(exc);
-                        }
-                    }
-                    else if (tsk.IsCanceled)
-                    {
-                        try
-                        {
-                            onCancellation?.Invoke();
-                        }
-                        finally
-                        {
-                            completion.TrySetCanceled();
-                        }
-                    }
-                    else
-                    {
-                        try
-                        {
-                            onSuccess();
-                        }
-                        // @TODO: CER Exception Handling was removed here (see GH#3581)
-                        catch (Exception e)
-                        {
-                            completion.SetException(e);
-                        }
-                    }
-                }, TaskScheduler.Default
-            );
-        }
-
-        // the same logic as ContinueTask but with an added state parameter to allow the caller to avoid the use of a closure
-        // the parameter allocation cannot be avoided here and using closure names is clearer than Tuple numbered properties
-        internal static void ContinueTaskWithState(Task task,
-            TaskCompletionSource<object> completion,
-            object state,
-            Action<object> onSuccess,
-            Action<Exception, object> onFailure = null,
-            Action<object> onCancellation = null,
-            Func<Exception, Exception> exceptionConverter = null)
-        {
-            task.ContinueWith(
-                (Task tsk, object state2) =>
-                {
-                    if (tsk.Exception != null)
-                    {
-                        Exception exc = tsk.Exception.InnerException;
-                        if (exceptionConverter != null)
-                        {
-                            exc = exceptionConverter(exc);
-                        }
-
-                        try
-                        {
-                            onFailure?.Invoke(exc, state2);
-                        }
-                        finally
-                        {
-                            completion.TrySetException(exc);
-                        }
-                    }
-                    else if (tsk.IsCanceled)
-                    {
-                        try
-                        {
-                            onCancellation?.Invoke(state2);
-                        }
-                        finally
-                        {
-                            completion.TrySetCanceled();
-                        }
-                    }
-                    else
-                    {
-                        try
-                        {
-                            onSuccess(state2);
-                        }
-                        // @TODO: CER Exception Handling was removed here (see GH#3581)
-                        catch (Exception e)
-                        {
-                            completion.SetException(e);
-                        }
-                    }
-                },
-                state: state,
-                scheduler: TaskScheduler.Default
-            );
-        }
-
-        internal static void WaitForCompletion(Task task, int timeout, Action onTimeout = null, bool rethrowExceptions = true)
-        {
-            try
-            {
-                task.Wait(timeout > 0 ? (1000 * timeout) : Timeout.Infinite);
-            }
-            catch (AggregateException ae)
-            {
-                if (rethrowExceptions)
-                {
-                    Debug.Assert(ae.InnerExceptions.Count == 1, "There is more than one exception in AggregateException");
-                    ExceptionDispatchInfo.Capture(ae.InnerException).Throw();
-                }
-            }
-            if (!task.IsCompleted)
-            {
-                task.ContinueWith(static t => { var ignored = t.Exception; }); //Ensure the task does not leave an unobserved exception
-                onTimeout?.Invoke();
-            }
-        }
-
-        internal static void SetTimeoutException(TaskCompletionSource<object> completion, int timeout, Func<Exception> onFailure, CancellationToken ctoken)
-        {
-            if (timeout > 0)
-            {
-                Task.Delay(timeout * 1000, ctoken).ContinueWith(
-                    (Task task) =>
-                    {
-                        if (!task.IsCanceled && !completion.Task.IsCompleted)
-                        {
-                            completion.TrySetException(onFailure());
-                        }
-                    }
-                );
-            }
-        }
-        
-        internal static void SetTimeoutExceptionWithState(
-            TaskCompletionSource<object> completion,
-            int timeout,
-            object state,
-            Func<object, Exception> onFailure,
-            CancellationToken cancellationToken)
-        {
-            if (timeout <= 0)
-            {
-                return;
-            }
-
-            Task.Delay(timeout * 1000, cancellationToken).ContinueWith(
-                (task, innerState) =>
-                {
-                    if (!task.IsCanceled && !completion.Task.IsCompleted)
-                    {
-                        completion.TrySetException(onFailure(innerState));
-                    }
-                },
-                state: state,
-                cancellationToken: CancellationToken.None);
-        }
-    }
-
     internal static class SQL
     {
         // The class SQL defines the exceptions that are specific to the SQL Adapter.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 79c725c074..c3f96b077a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -25,15 +25,13 @@
 using Microsoft.Data.SqlClient.DataClassification;
 using Microsoft.Data.SqlClient.LocalDb;
 using Microsoft.Data.SqlClient.Server;
+using Microsoft.Data.SqlClient.Internal;
 using Microsoft.Data.SqlClient.Utilities;
 using Microsoft.SqlServer.Server;
-using Microsoft.Data.SqlClient.Internal;
 
 #if NETFRAMEWORK
 using System.Runtime.CompilerServices;
-#if _WINDOWS
 using Interop.Windows.Sni;
-#endif
 using Microsoft.Data.SqlTypes;
 #endif
 
@@ -12327,11 +12325,11 @@ private Task GetTerminationTask(Task unterminatedWriteTask, object value, MetaTy
                 }
                 else
                 {
-                    return AsyncHelper.CreateContinuationTask<int, TdsParserStateObject>(
+                    return AsyncHelper.CreateContinuationTaskWithState(
                         unterminatedWriteTask,
-                        onSuccess: WriteInt,
-                        arg1: 0,
-                        arg2: stateObj);
+                        state1: this,
+                        state2: stateObj,
+                        onSuccess: static (parser, state) => parser.WriteInt(0, state));
                 }
             }
             else
@@ -13288,11 +13286,11 @@ private Task WriteEncryptionMetadata(Task terminatedWriteTask, SqlColumnEncrypti
             else
             {
                 // Otherwise, create a continuation task to write the encryption metadata after the previous write completes.
-                return AsyncHelper.CreateContinuationTask<SqlColumnEncryptionInputParameterInfo, TdsParserStateObject>(
+                return AsyncHelper.CreateContinuationTaskWithState(
                     terminatedWriteTask,
-                    onSuccess: WriteEncryptionMetadata,
-                    arg1: columnEncryptionParameterInfo,
-                    arg2: stateObj);
+                    state1: columnEncryptionParameterInfo,
+                    state2: stateObj,
+                    onSuccess: WriteEncryptionMetadata);
             }
         }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
index 45ed29c2ce..921fb3f30b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
@@ -17,6 +17,7 @@
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.ManagedSni;
 using Microsoft.Data.SqlClient.Internal;
+using Microsoft.Data.SqlClient.Utilities;
 
 #if NETFRAMEWORK
 using System.Runtime.ConstrainedExecution;
@@ -24,10 +25,6 @@
 
 namespace Microsoft.Data.SqlClient
 {
-#if NETFRAMEWORK
-    using RuntimeHelpers = System.Runtime.CompilerServices.RuntimeHelpers;
-#endif
-    
     sealed internal class LastIOTimer
     {
         internal long _value;
@@ -189,8 +186,8 @@ private enum SnapshotStatus
         private readonly TimerCallback _onTimeoutAsync;
         private readonly WeakReference _cancellationOwner = new WeakReference(null);
 
-        // Below 2 properties are used to enforce timeout delays in code to 
-        // reproduce issues related to theadpool starvation and timeout delay.
+        // Below 2 properties are used to enforce timeout delays in code to
+        // reproduce issues related to threadpool starvation and timeout delay.
         // It should always be set to false by default, and only be enabled during testing.
         internal bool _enforceTimeoutDelay = false;
         internal int _enforcedTimeoutDelayInMilliSeconds = 5000;
@@ -1272,13 +1269,12 @@ internal Task ExecuteFlush()
                     else
                     {
                         return AsyncHelper.CreateContinuationTaskWithState(
-                            task: writePacketTask,
+                            taskToContinue: writePacketTask,
                             state: this,
-                            onSuccess: static (object state) =>
+                            onSuccess: static state =>
                             {
-                                TdsParserStateObject stateObject = (TdsParserStateObject)state;
-                                stateObject.HasPendingData = true;
-                                stateObject._messageStatus = 0;
+                                state.HasPendingData = true;
+                                state._messageStatus = 0;
                             }
                         );
                     }
@@ -2178,7 +2174,7 @@ internal TdsOperationStatus TryReadStringWithEncoding(int length, System.Text.En
                         buf = TryTakeSnapshotStorage() as byte[];
                         Debug.Assert(buf != null || !isContinuing, "if continuing stored buffer must be present to contain previous data to continue from");
                         Debug.Assert(buf == null || buf.Length == length, "stored buffer length must be null or must have been created with the correct length");
-                        
+
                         if (buf != null)
                         {
                             startOffset = GetSnapshotTotalSize();
@@ -2191,7 +2187,7 @@ internal TdsOperationStatus TryReadStringWithEncoding(int length, System.Text.En
                     }
 
                     TdsOperationStatus result = TryReadByteArray(buf, length, out _, startOffset, canContinue);
-                    
+
                     if (result != TdsOperationStatus.Done)
                     {
                         if (result == TdsOperationStatus.NeedMoreData)
@@ -3485,7 +3481,7 @@ internal TdsOperationStatus TryReadNetworkPacket()
                 while (_inBytesRead == 0)
                 {
                     // a partial packet must have taken the packet data so we
-                    // need to read more data to complete the packet, but we 
+                    // need to read more data to complete the packet, but we
                     // can't return NeedMoreData in sync mode so we have to
                     // spin fetching more data here until we have something
                     // that the caller can read
@@ -3772,7 +3768,7 @@ private void OnTimeoutAsync(object state)
             TimeoutState timeoutState = (TimeoutState)state;
             if (timeoutState.IdentityValue == _timeoutIdentityValue)
             {
-                // the return value is not useful here because no choice is going to be made using it 
+                // the return value is not useful here because no choice is going to be made using it
                 // we only want to make this call to set the state knowing that it will be seen later
                 OnTimeoutCore(TimeoutState.Running, TimeoutState.ExpiredAsync);
             }
@@ -3935,7 +3931,7 @@ internal void ReadSni(TaskCompletionSource<object> completion)
             {
                 Debug.Assert(completion != null, "Async on but null asyncResult passed");
 
-                // if the state is currently stopped then change it to running and allocate a new identity value from 
+                // if the state is currently stopped then change it to running and allocate a new identity value from
                 // the identity source. The identity value is used to correlate timer callback events to the currently
                 // running timeout and prevents a late timer callback affecting a result it does not relate to
                 int previousTimeoutState = Interlocked.CompareExchange(ref _timeoutState, TimeoutState.Running, TimeoutState.Stopped);
@@ -4372,7 +4368,7 @@ private void WriteBytesSetupContinuation(byte[] array, int len, TaskCompletionSo
         /// packet parsing.
         /// </summary>
         /// <returns></returns>
-        internal string DumpBuffer() 
+        internal string DumpBuffer()
         {
             StringBuilder buffer = new StringBuilder(128);
             buffer.AppendLine("dumping buffer");
@@ -4381,7 +4377,7 @@ internal string DumpBuffer()
             int cc = 0; // character counter
             int i;
             buffer.AppendLine("used buffer:");
-            for (i=0; i< _inBytesUsed; i++) 
+            for (i=0; i< _inBytesUsed; i++)
             {
                 if (cc==16) {
                     buffer.AppendLine();
@@ -4390,16 +4386,16 @@ internal string DumpBuffer()
                 buffer.AppendFormat("{0,-2:X2} ", _inBuff[i]);
                 cc++;
             }
-            if (cc>0) 
+            if (cc>0)
             {
                 buffer.AppendLine();
             }
 
             cc = 0;
             buffer.AppendLine("unused buffer:");
-            for (i=_inBytesUsed; i<_inBytesRead; i++) 
+            for (i=_inBytesUsed; i<_inBytesRead; i++)
             {
-                if (cc==16) 
+                if (cc==16)
                 {
                     buffer.AppendLine();
                     cc = 0;
@@ -4407,13 +4403,13 @@ internal string DumpBuffer()
                 buffer.AppendFormat("{0,-2:X2} ", _inBuff[i]);
                 cc++;
             }
-            if (cc>0) 
+            if (cc>0)
             {
                 buffer.AppendLine();
             }
             return buffer.ToString();
         }
-        
+
         internal void SetSnapshot()
         {
             StateSnapshot snapshot = _snapshot;
@@ -4444,7 +4440,7 @@ internal void ResetSnapshot()
         }
 
         /// <summary>
-        /// Returns true if the state object is in the state of continuing from a previously stored snapshot packet 
+        /// Returns true if the state object is in the state of continuing from a previously stored snapshot packet
         /// meaning that consumers should resume from the point where they last needed more data instead of beginning
         /// to process packets in the snapshot from the beginning again
         /// </summary>
@@ -4539,7 +4535,7 @@ internal int GetSnapshotPacketID()
         /// <summary>
         /// sets a value on the snapshot to allow the ContinueEnabled property to return true. <br />
         /// this function should be called only by functions that explicitly support the snapshot status
-        /// <see cref="SnapshotStatus.ContinueRunning"/> status 
+        /// <see cref="SnapshotStatus.ContinueRunning"/> status
         /// </summary>
         internal void RequestContinue(bool value)
         {
@@ -4862,7 +4858,7 @@ partial void SetDebugDataHashImpl()
                     {
                         Hash = null;
                     }
-                    
+
                 }
 
                 partial void CheckDebugDataHashImpl()
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Utilities/AsyncHelper.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Utilities/AsyncHelper.cs
new file mode 100644
index 0000000000..9ce1bf336f
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Utilities/AsyncHelper.cs
@@ -0,0 +1,871 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Runtime.ExceptionServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.Internal;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.Utilities
+{
+    /// <summary>
+    /// Provides helpers for interacting with asynchronous tasks.
+    /// </summary>
+    /// <remarks>
+    /// These helpers mainly provide continuation and timeout functionality. They utilize
+    /// <see cref="TaskCompletionSource{TResult}"/> at their core, and as such are fairly antiquated
+    /// implementations. If possible these methods should be utilized less and async/await native
+    /// constructs should be used.
+    /// </remarks>
+    internal static class AsyncHelper
+    {
+        /// <summary>
+        /// Continues a task and signals failure of the continuation via the provided
+        /// <paramref name="taskCompletionSource"/>.
+        /// </summary>
+        /// <remarks>
+        /// If the <paramref name="taskToContinue"/> completes in the following states, these
+        /// actions will be taken:
+        /// * With exception
+        ///   * <paramref name="onFailure"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onFailure"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * Will try to set exception on <paramref name="taskCompletionSource"/>
+        /// * Cancelled
+        ///   * <paramref name="onCancellation"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onCancellation"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * Will try to set cancelled on <paramref name="taskCompletionSource"/>
+        /// * Successfully
+        ///   * <paramref name="onSuccess"/> is called
+        ///   * IF an exception is thrown during execution of <paramref name="onSuccess"/>, the
+        ///     helper will try to set an exception on the <paramref name="taskCompletionSource"/>.
+        ///   * <paramref name="taskCompletionSource"/> is *not* completed with result on success.
+        ///     This is to allow the task completion source to be continued even more after this
+        ///     current continuation.
+        /// </remarks>
+        /// <param name="taskToContinue">Task to continue with provided callbacks</param>
+        /// <param name="taskCompletionSource">
+        /// Completion source used to track completion of the continuation, see remarks for details
+        /// </param>
+        /// <param name="onSuccess">Callback to execute on successful completion of the task</param>
+        /// <param name="onFailure">Callback to execute on failure of the task (optional)</param>
+        /// <param name="onCancellation">Callback to execute on cancellation of the task (optional)</param>
+        internal static void ContinueTask(
+            Task taskToContinue,
+            TaskCompletionSource<object?> taskCompletionSource,
+            Action onSuccess,
+            Action<Exception>? onFailure = null,
+            Action? onCancellation = null)
+        {
+            ContinuationState continuationState = new ContinuationState(
+                OnCancellation: onCancellation,
+                OnFailure: onFailure,
+                OnSuccess: onSuccess,
+                TaskCompletionSource: taskCompletionSource);
+
+            Task continuationTask = taskToContinue.ContinueWith(
+                static (tsk, continuationState2) =>
+                {
+                    ContinuationState typedState = (ContinuationState)continuationState2!;
+
+                    if (tsk.Exception != null)
+                    {
+                        Exception innerException = tsk.Exception.InnerException ?? tsk.Exception;
+                        try
+                        {
+                            typedState.OnFailure?.Invoke(innerException);
+                        }
+                        finally
+                        {
+                            typedState.TaskCompletionSource.TrySetException(innerException);
+                        }
+                    }
+                    else if (tsk.IsCanceled)
+                    {
+                        try
+                        {
+                            typedState.OnCancellation?.Invoke();
+                        }
+                        finally
+                        {
+                            typedState.TaskCompletionSource.TrySetCanceled();
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            typedState.OnSuccess();
+                        }
+                        // @TODO: CER Exception Handling was removed here (see GH#3581)
+                        catch (Exception e)
+                        {
+                            typedState.TaskCompletionSource.TrySetException(e);
+                        }
+                    }
+                },
+                state: continuationState,
+                scheduler: TaskScheduler.Default);
+
+            // Explicitly follow up by observing any exception thrown during continuation
+            ObserveContinuationException(continuationTask);
+        }
+
+        /// <summary>
+        /// Continues a task and signals failure of the continuation via the provided
+        /// <paramref name="taskCompletionSource"/>. This overload provides a single state object
+        /// to the callbacks.
+        /// </summary>
+        /// <remarks>
+        /// When possible, use static lambdas for callbacks.
+        ///
+        /// If the <paramref name="taskToContinue"/> completes in the following states, these
+        /// actions will be taken:
+        /// * With exception
+        ///   * <paramref name="onFailure"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onFailure"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * Will try to set exception on <paramref name="taskCompletionSource"/>
+        /// * Cancelled
+        ///   * <paramref name="onCancellation"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onCancellation"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * Will try to set cancelled on <paramref name="taskCompletionSource"/>
+        /// * Successfully
+        ///   * <paramref name="onSuccess"/> is called
+        ///   * IF an exception is thrown during execution of <paramref name="onSuccess"/>, the
+        ///     helper will try to set an exception on the <paramref name="taskCompletionSource"/>.
+        ///   * <paramref name="taskCompletionSource"/> is *not* completed with result on success.
+        ///     This is to allow the task completion source to be continued even more after this
+        ///     current continuation.
+        /// </remarks>
+        /// <typeparam name="TState">
+        /// Type of the state object to provide to the callbacks, constrained to class types to
+        /// prevent accidental modification of pass-by-value types.
+        /// </typeparam>
+        /// <param name="taskToContinue">Task to continue with provided callbacks</param>
+        /// <param name="taskCompletionSource">
+        /// Completion source used to track completion of the continuation, see remarks for details
+        /// </param>
+        /// <param name="state">State object to provide to callbacks</param>
+        /// <param name="onSuccess">Callback to execute on successful completion of the task</param>
+        /// <param name="onFailure">Callback to execute on failure of the task (optional)</param>
+        /// <param name="onCancellation">Callback to execute on cancellation of the task (optional)</param>
+        internal static void ContinueTaskWithState<TState>(
+            Task taskToContinue,
+            TaskCompletionSource<object?> taskCompletionSource,
+            TState state,
+            Action<TState> onSuccess,
+            Action<TState, Exception>? onFailure = null,
+            Action<TState>? onCancellation = null)
+            where TState : class
+        {
+            ContinuationState<TState> continuationState = new(
+                OnCancellation: onCancellation,
+                OnFailure: onFailure,
+                OnSuccess: onSuccess,
+                State: state,
+                TaskCompletionSource: taskCompletionSource);
+
+            Task continuationTask = taskToContinue.ContinueWith(
+                static (task, continuationState2) =>
+                {
+                    ContinuationState<TState> typedState2 = (ContinuationState<TState>)continuationState2!;
+
+                    if (task.Exception is not null)
+                    {
+                        Exception innerException = task.Exception.InnerException ?? task.Exception;
+                        try
+                        {
+                            typedState2.OnFailure?.Invoke(typedState2.State, innerException);
+                        }
+                        finally
+                        {
+                            typedState2.TaskCompletionSource.TrySetException(innerException);
+                        }
+                    }
+                    else if (task.IsCanceled)
+                    {
+                        try
+                        {
+                            typedState2.OnCancellation?.Invoke(typedState2.State);
+                        }
+                        finally
+                        {
+                            typedState2.TaskCompletionSource.TrySetCanceled();
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            typedState2.OnSuccess(typedState2.State);
+                            // @TODO: The one unpleasant thing with this code is that the TCS is not set completed and left to the caller to do or not do (which is more unpleasant)
+                        }
+                        catch (Exception e)
+                        {
+                            typedState2.TaskCompletionSource.TrySetException(e);
+                        }
+                    }
+                },
+                state: continuationState,
+                scheduler: TaskScheduler.Default);
+
+            // Explicitly follow up by observing any exception thrown during continuation
+            ObserveContinuationException(continuationTask);
+        }
+
+        /// <summary>
+        /// Continues a task and signals failure of the continuation via the provided
+        /// <paramref name="taskCompletionSource"/>. This overload provides two state objects to
+        /// the callbacks.
+        /// </summary>
+        /// <remarks>
+        /// When possible, use static lambdas for callbacks.
+        ///
+        /// If the <paramref name="taskToContinue"/> completes in the following states, these
+        /// actions will be taken:
+        /// * With exception
+        ///   * <paramref name="onFailure"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onFailure"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * Will try to set exception on <paramref name="taskCompletionSource"/>
+        /// * Cancelled
+        ///   * <paramref name="onCancellation"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onCancellation"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * Will try to set cancelled on <paramref name="taskCompletionSource"/>
+        /// * Successfully
+        ///   * <paramref name="onSuccess"/> is called
+        ///   * IF an exception is thrown during execution of <paramref name="onSuccess"/>, the
+        ///     helper will try to set an exception on the <paramref name="taskCompletionSource"/>.
+        ///   * <paramref name="taskCompletionSource"/> is *not* completed with result on success.
+        ///     This is to allow the task completion source to be continued even more after this
+        ///     current continuation.
+        /// </remarks>
+        /// <param name="taskToContinue">Task to continue with provided callbacks</param>
+        /// <param name="taskCompletionSource">
+        /// Completion source used to track completion of the continuation, see remarks for details
+        /// </param>
+        /// <typeparam name="TState1">
+        /// Type of the first state object to provide to the callbacks, constrained to class types
+        /// to prevent accidental modification of pass-by-value types.
+        /// </typeparam>
+        /// <typeparam name="TState2">
+        /// Type of the second state object to provide to the callbacks, constrained to class types
+        /// to prevent accidental modification of pass-by-value types.
+        /// </typeparam>
+        /// <param name="state1">First state object to provide to callbacks</param>
+        /// <param name="state2">Second state object to provide to callbacks</param>
+        /// <param name="onSuccess">Callback to execute on successful completion of the task</param>
+        /// <param name="onFailure">Callback to execute on failure of the task (optional)</param>
+        /// <param name="onCancellation">Callback to execute on cancellation of the task (optional)</param>
+        internal static void ContinueTaskWithState<TState1, TState2>(
+            Task taskToContinue,
+            TaskCompletionSource<object?> taskCompletionSource,
+            TState1 state1,
+            TState2 state2,
+            Action<TState1, TState2> onSuccess,
+            Action<TState1, TState2, Exception>? onFailure = null,
+            Action<TState1, TState2>? onCancellation = null)
+            where TState1 : class
+            where TState2 : class
+        {
+            ContinuationState<TState1, TState2> continuationState = new(
+                OnCancellation: onCancellation,
+                OnFailure: onFailure,
+                OnSuccess: onSuccess,
+                State1: state1,
+                State2: state2,
+                TaskCompletionSource: taskCompletionSource);
+
+            Task continuationTask = taskToContinue.ContinueWith(
+                static (task, continuationState2) =>
+                {
+                    ContinuationState<TState1, TState2> typedState2 =
+                        (ContinuationState<TState1, TState2>)continuationState2!;
+
+                    if (task.Exception is not null)
+                    {
+                        Exception innerException = task.Exception.InnerException ?? task.Exception;
+                        try
+                        {
+                            typedState2.OnFailure?.Invoke(typedState2.State1, typedState2.State2, innerException);
+                        }
+                        finally
+                        {
+                            typedState2.TaskCompletionSource.TrySetException(innerException);
+                        }
+                    }
+                    else if (task.IsCanceled)
+                    {
+                        try
+                        {
+                            typedState2.OnCancellation?.Invoke(typedState2.State1, typedState2.State2);
+                        }
+                        finally
+                        {
+                            typedState2.TaskCompletionSource.TrySetCanceled();
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            typedState2.OnSuccess(typedState2.State1, typedState2.State2);
+                        }
+                        catch (Exception e)
+                        {
+                            typedState2.TaskCompletionSource.TrySetException(e);
+                        }
+                    }
+                },
+                state: continuationState,
+                scheduler: TaskScheduler.Default);
+
+            // Explicitly follow up by observing any exception thrown during continuation
+            ObserveContinuationException(continuationTask);
+        }
+
+        /// <summary>
+        /// Continues a task and returns the continuation task.
+        /// </summary>
+        /// <remarks>
+        /// When possible, use static lambdas for callbacks.
+        ///
+        /// If the <paramref name="taskToContinue"/> completes in the following states, these
+        /// actions will be taken:
+        /// * With exception
+        ///   * <paramref name="onFailure"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onFailure"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * The task will be completed with an exception.
+        /// * Cancelled
+        ///   * <paramref name="onCancellation"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onCancellation"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * The task will be completed as cancelled.
+        /// * Successfully
+        ///   * <paramref name="onSuccess"/> is called
+        ///   * IF an exception is thrown during execution of <paramref name="onSuccess"/>, the
+        ///     task will be completed with the exception.
+        ///   * The task will be completed as successful.
+        /// </remarks>
+        /// <param name="taskToContinue">
+        /// Task to continue with provided callbacks, if <c>null</c>, <c>null</c> will be returned.
+        /// </param>
+        /// <param name="onSuccess">Callback to execute on successful completion of the task</param>
+        /// <param name="onFailure">Callback to execute on failure of the task (optional)</param>
+        /// <param name="onCancellation">Callback to execute on cancellation of the task (optional)</param>
+        internal static Task? CreateContinuationTask(
+            Task? taskToContinue,
+            Action onSuccess,
+            Action<Exception>? onFailure = null,
+            Action? onCancellation = null)
+        {
+            if (taskToContinue is null)
+            {
+                // This is a remnant of ye olde async/sync code that return null tasks when
+                // executing synchronously. It's still desirable that the onSuccess executes
+                // regardless of whether the preceding action was synchronous or asynchronous.
+                onSuccess();
+                return null;
+            }
+
+            // @TODO: Can totally use a non-generic TaskCompletionSource
+            TaskCompletionSource<object?> taskCompletionSource = new();
+            ContinuationState continuationState = new(
+                OnCancellation: onCancellation,
+                OnFailure: onFailure,
+                OnSuccess: onSuccess,
+                TaskCompletionSource: taskCompletionSource);
+
+            Task continuationTask = taskToContinue.ContinueWith(
+                static (task, continuationState2) =>
+                {
+                    ContinuationState typedState = (ContinuationState)continuationState2!;
+                    if (task.Exception is not null)
+                    {
+                        Exception innerException = task.Exception.InnerException ?? task.Exception;
+                        try
+                        {
+                            typedState.OnFailure?.Invoke(innerException);
+                        }
+                        finally
+                        {
+                            typedState.TaskCompletionSource.TrySetException(innerException);
+                        }
+                    }
+                    else if (task.IsCanceled)
+                    {
+                        try
+                        {
+                            typedState.OnCancellation?.Invoke();
+                        }
+                        finally
+                        {
+                            typedState.TaskCompletionSource.TrySetCanceled();
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            typedState.OnSuccess();
+                            typedState.TaskCompletionSource.TrySetResult(null);
+                        }
+                        catch (Exception e)
+                        {
+                            typedState.TaskCompletionSource.TrySetException(e);
+                        }
+                    }
+                },
+                state: continuationState,
+                scheduler: TaskScheduler.Default);
+
+            // Explicitly follow up by observing any exception thrown during continuation
+            ObserveContinuationException(continuationTask);
+
+            return taskCompletionSource.Task;
+        }
+
+        /// <summary>
+        /// Continues a task and returns the continuation task. This overload allows a state object
+        /// to be passed into the callbacks.
+        /// </summary>
+        /// <remarks>
+        /// When possible, use static lambdas for callbacks.
+        ///
+        /// If the <paramref name="taskToContinue"/> completes in the following states, these
+        /// actions will be taken:
+        /// * With exception
+        ///   * <paramref name="onFailure"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onFailure"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * The task will be completed with an exception.
+        /// * Cancelled
+        ///   * <paramref name="onCancellation"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onCancellation"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * The task will be completed as cancelled.
+        /// * Successfully
+        ///   * <paramref name="onSuccess"/> is called
+        ///   * IF an exception is thrown during execution of <paramref name="onSuccess"/>, the
+        ///     task will be completed with the exception.
+        ///   * The task will be completed as successful.
+        /// </remarks>
+        /// <typeparam name="TState">
+        /// Type of the state object to pass to callbacks, constrained to class types to prevent
+        /// accidental modification of pass-by-value types.
+        /// </typeparam>
+        /// <param name="taskToContinue">
+        /// Task to continue with provided callbacks, if <c>null</c>, <c>null</c> will be returned.
+        /// </param>
+        /// <param name="state">State object to pass to the callbacks</param>
+        /// <param name="onSuccess">Callback to execute on successful completion of the task</param>
+        /// <param name="onFailure">Callback to execute on failure of the task (optional)</param>
+        /// <param name="onCancellation">Callback to execute on cancellation of the task (optional)</param>
+        internal static Task? CreateContinuationTaskWithState<TState>(
+            Task? taskToContinue,
+            TState state,
+            Action<TState> onSuccess,
+            Action<TState, Exception>? onFailure = null,
+            Action<TState>? onCancellation = null)
+            where TState : class
+        {
+            if (taskToContinue is null)
+            {
+                // This is a remnant of ye olde async/sync code that return null tasks when
+                // executing synchronously. It's still desirable that the onSuccess executes
+                // regardless of whether the preceding action was synchronous or asynchronous.
+                onSuccess(state);
+                return null;
+            }
+
+            // @TODO: Can totally use a non-generic TaskCompletionSource
+            TaskCompletionSource<object?> taskCompletionSource = new();
+            ContinuationState<TState> continuationState = new(
+                OnCancellation: onCancellation,
+                OnFailure: onFailure,
+                OnSuccess: onSuccess,
+                State: state,
+                TaskCompletionSource: taskCompletionSource);
+
+            Task continuationTask = taskToContinue.ContinueWith(
+                static (task, continuationState2) =>
+                {
+                    ContinuationState<TState> typedState2 = (ContinuationState<TState>)continuationState2!;
+
+                    if (task.Exception is not null)
+                    {
+                        Exception innerException = task.Exception.InnerException ?? task.Exception;
+                        try
+                        {
+                            typedState2.OnFailure?.Invoke(typedState2.State, innerException);
+                        }
+                        finally
+                        {
+                            typedState2.TaskCompletionSource.TrySetException(innerException);
+                        }
+                    }
+                    else if (task.IsCanceled)
+                    {
+                        try
+                        {
+                            typedState2.OnCancellation?.Invoke(typedState2.State);
+                        }
+                        finally
+                        {
+                            typedState2.TaskCompletionSource.TrySetCanceled();
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            typedState2.OnSuccess(typedState2.State);
+                            typedState2.TaskCompletionSource.TrySetResult(null);
+                        }
+                        catch (Exception e)
+                        {
+                            typedState2.TaskCompletionSource.TrySetException(e);
+                        }
+                    }
+
+                },
+                state: continuationState,
+                scheduler: TaskScheduler.Default);
+
+            // Explicitly follow up by observing any exception thrown during continuation
+            ObserveContinuationException(continuationTask);
+
+            return taskCompletionSource.Task;
+        }
+
+        /// <summary>
+        /// Continues a task and returns the continuation task. This overload allows two state
+        /// objects to be passed into the callbacks.
+        /// </summary>
+        /// <remarks>
+        /// When possible, use static lambdas for callbacks.
+        ///
+        /// If the <paramref name="taskToContinue"/> completes in the following states, these
+        /// actions will be taken:
+        /// * With exception
+        ///   * <paramref name="onFailure"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onFailure"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * The task will be completed with an exception.
+        /// * Cancelled
+        ///   * <paramref name="onCancellation"/> is called (if provided)
+        ///   * Any exception thrown by <paramref name="onCancellation"/> will be logged and
+        ///     swallowed as unobserved.
+        ///   * The task will be completed as cancelled.
+        /// * Successfully
+        ///   * <paramref name="onSuccess"/> is called
+        ///   * IF an exception is thrown during execution of <paramref name="onSuccess"/>, the
+        ///     task will be completed with the exception.
+        ///   * The task will be completed as successful.
+        /// </remarks>
+        /// <typeparam name="TState1">
+        /// Type of the first state object to pass to callbacks, constrained to class types to
+        /// prevent accidental modification of pass-by-value types.
+        /// </typeparam>
+        /// <typeparam name="TState2">
+        /// Type of the second state object to pass to callbacks, constrained to class types to
+        /// prevent accidental modification of pass-by-value types.</typeparam>
+        /// <param name="taskToContinue">
+        /// Task to continue with provided callbacks, if <c>null</c>, <c>null</c> will be returned.
+        /// </param>
+        /// <param name="state1">First state object to pass to the callbacks</param>
+        /// <param name="state2">Second state object to pass to the callbacks</param>
+        /// <param name="onSuccess">Callback to execute on successful completion of the task</param>
+        /// <param name="onFailure">Callback to execute on failure of the task (optional)</param>
+        /// <param name="onCancellation">Callback to execute on cancellation of the task (optional)</param>
+        internal static Task? CreateContinuationTaskWithState<TState1, TState2>(
+            Task? taskToContinue,
+            TState1 state1,
+            TState2 state2,
+            Action<TState1, TState2> onSuccess,
+            Action<TState1, TState2, Exception>? onFailure = null,
+            Action<TState1, TState2>? onCancellation = null)
+            where TState1 : class
+            where TState2 : class
+        {
+            if (taskToContinue is null)
+            {
+                // This is a remnant of ye olde async/sync code that return null tasks when
+                // executing synchronously. It's still desirable that the onSuccess executes
+                // regardless of whether the preceding action was synchronous or asynchronous.
+                onSuccess(state1, state2);
+                return null;
+            }
+
+            // @TODO: Can totally use a non-generic TaskCompletionSource
+            TaskCompletionSource<object?> taskCompletionSource = new();
+            ContinuationState<TState1, TState2> continuationState = new(
+                OnCancellation: onCancellation,
+                OnFailure: onFailure,
+                OnSuccess: onSuccess,
+                State1: state1,
+                State2: state2,
+                TaskCompletionSource: taskCompletionSource);
+
+            Task continuationTask = taskToContinue.ContinueWith(
+                static (task, continuationState2) =>
+                {
+                    ContinuationState<TState1, TState2> typedState2 =
+                        (ContinuationState<TState1, TState2>)continuationState2!;
+
+                    if (task.Exception is not null)
+                    {
+                        Exception innerException = task.Exception.InnerException ?? task.Exception;
+                        try
+                        {
+                            typedState2.OnFailure?.Invoke(typedState2.State1, typedState2.State2, innerException);
+                        }
+                        finally
+                        {
+                            typedState2.TaskCompletionSource.TrySetException(innerException);
+                        }
+                    }
+                    else if (task.IsCanceled)
+                    {
+                        try
+                        {
+                            typedState2.OnCancellation?.Invoke(typedState2.State1, typedState2.State2);
+                        }
+                        finally
+                        {
+                            typedState2.TaskCompletionSource.TrySetCanceled();
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            typedState2.OnSuccess(typedState2.State1, typedState2.State2);
+                            typedState2.TaskCompletionSource.TrySetResult(null);
+                        }
+                        catch (Exception e)
+                        {
+                            typedState2.TaskCompletionSource.TrySetException(e);
+                        }
+                    }
+
+                },
+                state: continuationState,
+                scheduler: TaskScheduler.Default);
+
+            // Explicitly follow up by observing any exception thrown during continuation
+            ObserveContinuationException(continuationTask);
+
+            return taskCompletionSource.Task;
+        }
+
+        /// <summary>
+        /// Executes a timeout task in parallel with the provided
+        /// <paramref name="taskCompletionSource"/>. If the timeout completes before the task
+        /// completion source, the provided <paramref name="onTimeout"/> is executed and the
+        /// exception returned is set as the exception that completes the task completion source.
+        /// </summary>
+        /// <param name="taskCompletionSource">Task to execute with a timeout</param>
+        /// <param name="timeoutInSeconds">
+        /// Number of seconds to wait until timing out the task. If set to &lt;=0, the method will
+        /// immediately return without calling <paramref name="onTimeout"/> or setting any state on
+        /// the <paramref name="taskCompletionSource"/>.
+        /// </param>
+        /// <param name="onTimeout">
+        /// Callback to execute when the task does not complete within the allotted time. The
+        /// exception returned by the callback is set on the <paramref name="taskCompletionSource"/>.
+        /// </param>
+        /// <param name="cancellationToken">Cancellation token to prematurely cancel timeout</param>
+        internal static void SetTimeoutException(
+            TaskCompletionSource<object> taskCompletionSource,
+            int timeoutInSeconds,
+            Func<Exception> onTimeout,
+            CancellationToken cancellationToken)
+        {
+            if (timeoutInSeconds <= 0)
+            {
+                return;
+            }
+
+            Task.Delay(TimeSpan.FromSeconds(timeoutInSeconds), cancellationToken)
+                .ContinueWith(
+                    task =>
+                    {
+                        // If the timeout ran to completion AND the task to complete did not complete
+                        // then the timeout expired first, run the timeout handler
+                        if (!task.IsCanceled && !taskCompletionSource.Task.IsCompleted)
+                        {
+                            taskCompletionSource.TrySetException(onTimeout());
+                        }
+                    },
+                    cancellationToken: CancellationToken.None,
+                    continuationOptions: TaskContinuationOptions.ExecuteSynchronously,
+                    scheduler: TaskScheduler.Default);
+        }
+
+        /// <summary>
+        /// Executes a timeout task in parallel with the provided
+        /// <paramref name="taskCompletionSource"/>. If the timeout completes before the task
+        /// completion source, the provided <paramref name="onTimeout"/> is executed and the
+        /// exception returned is set as the exception that completes the task completion source.
+        /// This overload provides a state object to the timeout callback.
+        /// </summary>
+        /// <typeparam name="TState">
+        /// Type of the state object to pass to callbacks, constrained to class types to prevent
+        /// accidental modification of pass-by-value types.
+        /// </typeparam>
+        /// <param name="taskCompletionSource">Task to execute with a timeout</param>
+        /// <param name="timeoutInSeconds">
+        /// Number of seconds to wait until timing out the task. If set to &lt;=0, the method will
+        /// immediately return without calling <paramref name="onTimeout"/> or setting any state on
+        /// the <paramref name="taskCompletionSource"/>.
+        /// </param>
+        /// <param name="state">State object to pass to the callback</param>
+        /// <param name="onTimeout">
+        /// Callback to execute when the task does not complete within the allotted time. The
+        /// exception returned by the callback is set on the <paramref name="taskCompletionSource"/>.
+        /// </param>
+        /// <param name="cancellationToken">Cancellation token to prematurely cancel timeout</param>
+        internal static void SetTimeoutExceptionWithState<TState>(
+            TaskCompletionSource<object> taskCompletionSource,
+            int timeoutInSeconds,
+            TState state,
+            Func<TState, Exception> onTimeout,
+            CancellationToken cancellationToken)
+            where TState : class
+        {
+            if (timeoutInSeconds <= 0)
+            {
+                return;
+            }
+
+            Task.Delay(TimeSpan.FromSeconds(timeoutInSeconds), cancellationToken)
+                .ContinueWith(
+                    (task, state2) =>
+                    {
+                        // If the timeout ran to completion AND the task to complete did not
+                        // complete, then the timeout expired first, run the timeout handler.
+                        if (!task.IsCanceled && !taskCompletionSource.Task.IsCompleted)
+                        {
+                            taskCompletionSource.TrySetException(onTimeout((TState)state2!));
+                        }
+                    },
+                    state: state,
+                    cancellationToken: CancellationToken.None,
+                    continuationOptions: TaskContinuationOptions.ExecuteSynchronously,
+                    scheduler: TaskScheduler.Default);
+        }
+
+        /// <summary>
+        /// Waits for a maximum of <paramref name="timeoutInSeconds"/> seconds for completion of
+        /// the provided <paramref name="task"/>. If the task is not completed before the timeout
+        /// elapses, a continuation is added to the task that observes any throw exceptions. The
+        /// <paramref name="onTimeout" /> callback is called after attaching the exception
+        /// observing exception.
+        /// </summary>
+        /// <param name="task">Task to execute with a timeout</param>
+        /// <param name="timeoutInSeconds">
+        /// Number of seconds to wait until timing out the task. If &lt;= 0, the timeout will be
+        /// infinite.
+        /// </param>
+        /// <param name="onTimeout">
+        /// Callback to execute when the task does not complete within the allotted time.
+        /// </param>
+        /// <param name="rethrowExceptions">
+        /// If <c>true</c>, the inner exception of any <see cref="AggregateException"/> raised
+        /// during execution, including timeout of the task, will be rethrown.
+        /// </param>
+        internal static void WaitForCompletion(
+            Task task,
+            int timeoutInSeconds,
+            Action? onTimeout = null,
+            bool rethrowExceptions = true)
+        {
+            try
+            {
+                TimeSpan timeout = timeoutInSeconds > 0
+                    ? TimeSpan.FromSeconds(timeoutInSeconds)
+                    : Timeout.InfiniteTimeSpan;
+                task.Wait(timeout);
+            }
+            catch (AggregateException ae)
+            {
+                if (rethrowExceptions)
+                {
+                    Debug.Assert(ae.InnerException is not null, "Inner exception is null");
+                    Debug.Assert(ae.InnerExceptions.Count == 1, "There is more than one exception in AggregateException");
+                    ExceptionDispatchInfo.Capture(ae.InnerException).Throw();
+                }
+            }
+
+            if (!task.IsCompleted)
+            {
+                ObserveContinuationException(task);
+                onTimeout?.Invoke();
+            }
+        }
+
+        /// <remarks>
+        /// This method is intended to be used within the above helpers to ensure that any
+        /// exceptions thrown during callbacks do not go unobserved. If these exceptions were
+        /// to go unobserved, they will trigger events to be raised by the default task scheduler.
+        /// Neither situation is ideal:
+        /// * If an application assigns a listener to this event, it will generate events that
+        ///   should be reported to us. But, because it happens outside the stack that caused the
+        ///   exception, most of the context of the exception is lost. Furthermore, the event is
+        ///   triggered when the GC runs, so the event happens asynchronous to the action that
+        ///   caused it.
+        /// * Adding this forced observation of the exception prevents applications from receiving
+        ///   the event, effectively swallowing it.
+        /// * However, if we log the exception when we observe it, we can still log that the
+        ///   unobserved exception happened without causing undue disruption to the application
+        ///   or leaking resources and causing overhead by raising the event.
+        /// </remarks>
+        private static void ObserveContinuationException(Task continuationTask)
+        {
+            continuationTask.ContinueWith(
+                static task =>
+                {
+                    SqlClientEventSource.Log.TryTraceEvent($"Unobserved task exception: {task.Exception}");
+                    _ = task.Exception;
+                },
+                CancellationToken.None,
+                TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously,
+                TaskScheduler.Default);
+        }
+
+        private record ContinuationState(
+            Action? OnCancellation,
+            Action<Exception>? OnFailure,
+            Action OnSuccess,
+            TaskCompletionSource<object?> TaskCompletionSource);
+
+        private record ContinuationState<TState>(
+            Action<TState>? OnCancellation,
+            Action<TState, Exception>? OnFailure,
+            Action<TState> OnSuccess,
+            TState State,
+            TaskCompletionSource<object?> TaskCompletionSource)
+            where TState : class;
+
+        private record ContinuationState<TState1, TState2>(
+            Action<TState1, TState2>? OnCancellation,
+            Action<TState1, TState2, Exception>? OnFailure,
+            Action<TState1, TState2> OnSuccess,
+            TState1 State1,
+            TState2 State2,
+            TaskCompletionSource<object?> TaskCompletionSource)
+            where TState1 : class
+            where TState2 : class;
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props b/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
index 7925952d11..4f3dbacb21 100644
--- a/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
+++ b/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
@@ -6,6 +6,7 @@
     <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.25476.3" />
     <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.6.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="xunit.runner.console" Version="2.9.3" />
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlHelperTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlHelperTest.cs
deleted file mode 100644
index 44286b8c0e..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlHelperTest.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Microsoft.Data.SqlClient.Tests
-{
-    public class SqlHelperTest
-    {
-        private void TimeOutATask()
-        {
-            var sqlClientAssembly = Assembly.GetAssembly(typeof(SqlCommand));
-            //We're using reflection to avoid exposing the internals
-            MethodInfo waitForCompletion = sqlClientAssembly.GetType("Microsoft.Data.SqlClient.AsyncHelper")
-                ?.GetMethod("WaitForCompletion", BindingFlags.Static | BindingFlags.NonPublic);
-
-            Assert.False(waitForCompletion == null, "Running a test on SqlUtil.WaitForCompletion but could not find this method");
-            TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
-            waitForCompletion.Invoke(null, new object[] { tcs.Task, 1, null, true }); //Will time out as task uncompleted
-            tcs.SetException(new TimeoutException("Dummy timeout exception")); //Our task now completes with an error
-        }
-
-        private Exception UnwrapException(Exception e)
-        {
-            return e?.InnerException != null ? UnwrapException(e.InnerException) : e;
-        }
-
-        [Fact]
-        public void WaitForCompletion_DoesNotCreateUnobservedException()
-        {
-            var unobservedExceptionHappenedEvent = new AutoResetEvent(false);
-            Exception unhandledException = null;
-            void handleUnobservedException(object o, UnobservedTaskExceptionEventArgs a)
-            { unhandledException = a.Exception; unobservedExceptionHappenedEvent.Set(); }
-
-            TaskScheduler.UnobservedTaskException += handleUnobservedException;
-
-            try
-            {
-                TimeOutATask(); //Create the task in another function so the task has no reference remaining
-                GC.Collect(); //Force collection of unobserved task
-                GC.WaitForPendingFinalizers();
-
-                bool unobservedExceptionHappend = unobservedExceptionHappenedEvent.WaitOne(1);
-                if (unobservedExceptionHappend) //Save doing string interpolation in the happy case
-                {
-                    var e = UnwrapException(unhandledException);
-                    Assert.Fail($"Did not expect an unobserved exception, but found a {e?.GetType()} with message \"{e?.Message}\"");
-                }
-            }
-            finally
-            {
-                TaskScheduler.UnobservedTaskException -= handleUnobservedException;
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index e09e49c967..12ea9c52d3 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -98,6 +98,7 @@
     -->
     <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" ExcludeAssets="build;buildTransitive" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <PackageReference Include="xunit" />
@@ -115,6 +116,7 @@
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/Utilities/AsyncHelperTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/Utilities/AsyncHelperTest.cs
new file mode 100644
index 0000000000..8f1529f8ef
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/Utilities/AsyncHelperTest.cs
@@ -0,0 +1,1814 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.UnitTests.Utilities;
+using Microsoft.Data.SqlClient.Utilities;
+using Moq;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.Microsoft.Data.SqlClient.Utilities
+{
+    public class AsyncHelperTest
+    {
+        // This timeout is set fairly high. The tests are expected to complete quickly, but are
+        // dependent on congestion of the thread pool. If the thread pool is congested, like on a
+        // full CI run, short timeouts may elapse even if the code under test would behave as
+        // expected. As such, we set a long timeout to ride out reasonable congestion on the
+        // thread pool, but still trigger a failure if the code under test hangs.
+        // @TODO: If suite-level timeouts are added, these timeouts can likely be removed.
+        private static readonly TimeSpan RunTimeout = TimeSpan.FromSeconds(30);
+
+        #region ContinueTask
+
+        /// <summary>
+        /// Verifies that the asynchronous continuation process is correctly handled when the task
+        /// completes successfully. Ensures that the success handler is invoked exactly once, and
+        /// neither failure nor cancellation handlers are invoked.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTask_TaskCompletes()
+        {
+            // Arrange
+            // - Task to continue that completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            Mock<Action<Exception>> mockOnFailure = new();
+            Mock<Action> mockOnCancellation = new();
+
+            // Note: We have to set up mockOnSuccess to set a result on the task completion source,
+            //       since the AsyncHelper will not do it, and without that, we cannot reliably
+            //       know when the continuation completed. We will use SetResult b/c it will throw
+            //       if it has already been set.
+            Mock<Action> mockOnSuccess = new();
+            mockOnSuccess.Setup(action => action())
+                .Callback(() => taskCompletionSource.SetResult(0));
+
+            // Act
+            AsyncHelper.ContinueTask(
+                taskToContinue: taskToContinue,
+                taskCompletionSource: taskCompletionSource,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            mockOnSuccess.Verify(action => action(), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+
+        /// <summary>
+        /// Validates that the continuation process correctly handles cases when the success handler
+        /// throws an exception. Ensures the task is marked as faulted and the failure and
+        /// cancellation handlers are not invoked.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTask_TaskCompletesHandlerThrows()
+        {
+            // Arrange
+            // - Task to continue that completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+
+            // - mockOnSuccess handler throws
+            Mock<Action> mockOnSuccess = new();
+            mockOnSuccess.SetupThrows<Exception>();
+
+            Mock<Action<Exception>> mockOnFailure = new();
+            Mock<Action> mockOnCancellation = new();
+
+            // Act
+            AsyncHelper.ContinueTask(
+                taskToContinue,
+                taskCompletionSource,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Faulted, taskCompletionSource.Task.Status);
+            mockOnSuccess.Verify(action => action(), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+
+        /// <summary>
+        /// Verifies that the asynchronous continuation process is correctly handled when the task
+        /// is cancelled. Ensures the cancellation handler is invoked exactly once, while neither
+        /// the success nor failure handlers are invoked. Validates that the resulting task is
+        /// marked as cancelled.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// Indicates whether the cancellation handler should throw an exception during its
+        /// execution to validate that cancellation is properly reported, regardless of handler
+        /// failures.
+        /// </param>
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task ContinueTask_TaskCancels(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue that is cancelled
+            Task taskToContinue = GetCancelledTask();
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+
+            Mock<Action> mockOnCancellation = new();
+            if (handlerShouldThrow)
+            {
+                mockOnCancellation.SetupThrows<Exception>();
+            }
+
+            Mock<Action> mockOnSuccess = new();
+            Mock<Action<Exception>> mockOnFailure = new();
+
+            // Act
+            AsyncHelper.ContinueTask(
+                taskToContinue,
+                taskCompletionSource,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have been cancelled, regardless of mockOnCancellation throwing
+            Assert.Equal(TaskStatus.Canceled, taskCompletionSource.Task.Status);
+
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.Verify(action => action(), Times.Once);
+        }
+
+        /// <summary>
+        /// Verifies the behavior of the asynchronous continuation process when the task to continue
+        /// is cancelled, and no specific cancellation handler is provided. Ensures that the task is
+        /// marked as cancelled without invoking the success or failure handlers.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTask_TaskCancelsNoHandler()
+        {
+            // Arrange
+            // - Task to continue that is cancelled
+            Task taskToContinue = GetCancelledTask();
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            Mock<Action> mockOnSuccess = new();
+            Mock<Action<Exception>> mockOnFailure = new();
+
+            // Act
+            AsyncHelper.ContinueTask(
+                taskToContinue,
+                taskCompletionSource,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                onCancellation: null);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have been cancelled
+            Assert.Equal(TaskStatus.Canceled, taskCompletionSource.Task.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Tests the behavior of the asynchronous continuation process when the initial task is
+        /// faulted. Verifies that the fault handler is invoked exactly once and neither success nor
+        /// cancellation handlers are called. Ensures that the continuation task transitions to a
+        /// faulted state.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// Indicates whether the fault handler itself is expected to throw an exception during
+        /// execution.
+        /// </param>
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task ContinueTask_TaskFaults(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue that is faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+
+            Mock<Action<Exception>> mockOnFailure = new();
+            if (handlerShouldThrow)
+            {
+                mockOnFailure.SetupThrows<Exception, Exception>();
+            }
+
+            Mock<Action> mockOnSuccess = new();
+            Mock<Action> mockOnCancellation = new();
+
+            // Act
+            AsyncHelper.ContinueTask(
+                taskToContinue,
+                taskCompletionSource,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have faulted, regardless of mockOnFailure throwing
+            Assert.Equal(TaskStatus.Faulted, taskCompletionSource.Task.Status);
+
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.Verify(action => action(It.IsAny<Exception>()), Times.Once);
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies that when a task to continue faults and no fault handler is provided, the
+        /// proper behavior is executed. Ensures that the TaskCompletionSource transitions to a
+        /// faulted state and neither success nor cancellation handlers are invoked. Validates that
+        /// the absence of a fault handler does not disrupt the flow or produce unexpected side
+        /// effects.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTask_TaskFaultsNoHandler()
+        {
+            // Arrange
+            // - Task to continue that is faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            Mock<Action> mockOnSuccess = new();
+            Mock<Action> mockOnCancellation = new();
+
+            // Act
+            AsyncHelper.ContinueTask(
+                taskToContinue,
+                taskCompletionSource,
+                mockOnSuccess.Object,
+                onFailure: null,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have faulted
+            Assert.Equal(TaskStatus.Faulted, taskCompletionSource.Task.Status);
+
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies that an unobserved exception is not created when continuing a cancelled task
+        /// using the AsyncHelper. Ensures proper handling of task continuation in scenarios where
+        /// cancellation occurs and the provided cancellation handler is utilized correctly.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTask_DoesNotCreateUnobservedException()
+        {
+            await VerifyDoesNotCreateUnobservedException(async e =>
+            {
+                TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+
+                AsyncHelper.ContinueTask(
+                    GetCancelledTask(),
+                    taskCompletionSource,
+                    onSuccess: static () => { },
+                    onCancellation: () => throw e);
+                await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+            });
+        }
+
+        #endregion
+
+        #region ContinueTaskWithState<T1>
+
+        /// <summary>
+        /// Verifies that a continuation process is correctly executed when the associated task
+        /// completes successfully. Ensures that the success handler is invoked once, while failure
+        /// and cancellation handlers are not invoked. Also verifies synchronization and proper
+        /// state propagation between the task and continuation handlers.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTaskWithState_1Generic_TaskCompletes()
+        {
+            // Arrange
+            // - Task to continue that completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+
+            Mock<Action<object, Exception>> mockOnFailure = new();
+            Mock<Action<object>> mockOnCancellation = new();
+
+            // Note: We have to set up mockOnSuccess to set a result on the task completion source,
+            //       since the AsyncHelper will not do it, and without that, we cannot reliably
+            //       know when the continuation completed. We will use SetResult b/c it will throw
+            //       if it has already been set.
+            Mock<Action<object>> mockOnSuccess = new();
+            mockOnSuccess.Setup(action => action(state1))
+                .Callback<object>(_ => taskCompletionSource.SetResult(0));
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue: taskToContinue,
+                taskCompletionSource: taskCompletionSource,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            mockOnSuccess.Verify(action => action(state1), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Tests the behavior of the asynchronous continuation method when the task completes
+        /// successfully but the success handler throws an exception. Verifies that the
+        /// TaskCompletionSource is properly faulted, the success handler is invoked exactly once
+        /// with the provided state, and neither the failure nor cancellation handlers are invoked.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTaskWithState_1Generic_TaskCompletesHandlerThrows()
+        {
+            // Arrange
+            // - Task to continue that completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+
+            // - mockOnSuccess handler throws
+            Mock<Action<object>> mockOnSuccess = new();
+            mockOnSuccess.Setup(action => action(It.IsAny<object>())).Throws<Exception>();
+
+            Mock<Action<object, Exception>> mockOnFailure = new();
+            Mock<Action<object>> mockOnCancellation = new();
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue,
+                taskCompletionSource,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have faulted
+            Assert.Equal(TaskStatus.Faulted, taskCompletionSource.Task.Status);
+
+            mockOnSuccess.Verify(action => action(state1), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies the behavior of the asynchronous continuation process when a task is cancelled
+        /// and includes a state object. Ensures that the appropriate cancellation handler is
+        /// invoked exactly once, while success and failure handlers are not. Also validates that
+        /// the task completion source is correctly transitioned to the cancelled state, regardless
+        /// of whether the cancellation handler throws an exception or not.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// A boolean value indicating whether the cancellation handler is expected to throw an
+        /// exception.
+        /// </param>
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task ContinueTaskWithState_1Generic_TaskCancels(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue that was cancelled
+            Task taskToContinue = GetCancelledTask();
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+
+            Mock<Action<object>> mockOnCancellation = new();
+            if (handlerShouldThrow)
+            {
+                mockOnCancellation.SetupThrows<object, Exception>();
+            }
+
+            Mock<Action<object>> mockOnSuccess = new();
+            Mock<Action<object, Exception>> mockOnFailure = new();
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue,
+                taskCompletionSource,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have been cancelled, regardless of mockOnCancellation throwing
+            Assert.Equal(TaskStatus.Canceled, taskCompletionSource.Task.Status);
+
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.Verify(action => action(state1), Times.Once);
+        }
+
+        /// <summary>
+        /// Ensures that when a task with an attached state is cancelled, no success, failure, or
+        /// cancellation handlers are invoked. Verifies that the associated TaskCompletionSource is
+        /// properly cancelled to reflect the task's state. This test method checks behavior
+        /// specifically when no cancellation handler is provided.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTaskWithState_1Generic_TaskCancelsNoHandler()
+        {
+            // Arrange
+            // - Task to continue that was cancelled
+            Task taskToContinue = GetCancelledTask();
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+
+            Mock<Action<object>> mockOnSuccess = new();
+            Mock<Action<object, Exception>> mockOnFailure = new();
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue,
+                taskCompletionSource,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                onCancellation: null);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have been cancelled
+            Assert.Equal(TaskStatus.Canceled, taskCompletionSource.Task.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies that when a task with a generic state parameter faults, the fault handler is
+        /// invoked correctly. Validates that the state is passed to the handler and that other
+        /// handlers, such as success and cancellation handlers, are not triggered. Additionally,
+        /// ensures the final task transitions to a faulted state as expected.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// A boolean flag indicating whether the fault handler should throw an exception when
+        /// invoked.
+        /// </param>
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task ContinueTaskWithState_1Generic_TaskFaults(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue that faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+
+            Mock<Action<object, Exception>> mockOnFailure = new();
+            if (handlerShouldThrow)
+            {
+                mockOnFailure.SetupThrows<object, Exception, Exception>();
+            }
+
+            Mock<Action<object>> mockOnSuccess = new();
+            Mock<Action<object>> mockOnCancellation = new();
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue,
+                taskCompletionSource,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have faulted, regardless of mockOnFailure throwing
+            Assert.Equal(TaskStatus.Faulted, taskCompletionSource.Task.Status);
+
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.Verify(action => action(state1, It.IsAny<Exception>()), Times.Once);
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Ensures a faulted task is handled properly when no failure handler is provided.
+        /// Validates that the task's fault state is correctly passed to the continuation process,
+        /// and no unintended success or cancellation handlers are invoked. This test verifies that
+        /// the task completion source reflects the faulted status as expected, promoting reliable
+        /// behavior in fault scenarios.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTaskWithState_1Generic_TaskFaultsNoHandler()
+        {
+            // Arrange
+            // - Task to continue that faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+
+            Mock<Action<object>> mockOnSuccess = new();
+            Mock<Action<object>> mockOnCancellation = new();
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue,
+                taskCompletionSource,
+                state1,
+                mockOnSuccess.Object,
+                onFailure: null,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have faulted
+            Assert.Equal(TaskStatus.Faulted, taskCompletionSource.Task.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Confirms that the generic task continuation mechanism, with state, does not result in
+        /// any unobserved exceptions. Verifies that the continuation invocation handles all
+        /// outcomes, including cancellation, without allowing exceptions to remain unobserved or
+        /// propagate outside the test scope.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTaskWithState_1Generic_DoesNotCreateUnobservedException()
+        {
+            await VerifyDoesNotCreateUnobservedException(async e =>
+            {
+                TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+
+                AsyncHelper.ContinueTaskWithState(
+                    GetCancelledTask(),
+                    taskCompletionSource,
+                    new object(),
+                    onSuccess: static _ => { },
+                    onCancellation: _ => throw e);
+                await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+            });
+        }
+
+        #endregion
+
+        #region ContinueTaskWithState<T1, T2>
+
+        /// <summary>
+        /// Validates that the continuation of a task, which completed successfully, is handled
+        /// appropriately when state information and generic types are involved. Ensures that the
+        /// success delegate is triggered exactly once while both failure and cancellation handlers
+        /// are never invoked.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTaskWithState_2Generics_TaskCompletes()
+        {
+            // Arrange
+            // - Task to continue that completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+            Mock<Action<object, object>> mockOnCancellation = new();
+
+            // Note: We have to set up mockOnSuccess to set a result on the task completion source,
+            //       since the AsyncHelper will not do it, and without that, we cannot reliably
+            //       know when the continuation completed. We will use SetResult b/c it will throw
+            //       if it has already been set.
+            Mock<Action<object, object>> mockOnSuccess = new();
+            mockOnSuccess.Setup(action => action(state1, state2))
+                .Callback<object, object>((_, _) => taskCompletionSource.SetResult(0));
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue: taskToContinue,
+                taskCompletionSource: taskCompletionSource,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            mockOnSuccess.Verify(action => action(state1, state2), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies the behavior of the `ContinueTaskWithState` method when a task completes
+        /// successfully and the success handler throws an exception. Ensures the faulted status of
+        /// the task completion source and that the success handler is invoked exactly once with the
+        /// correct state objects. Also confirms that neither the failure handler nor the
+        /// cancellation handler are triggered.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTaskWithState_2Generics_TaskCompletesHandlerThrows()
+        {
+            // Arrange
+            // - Task to continue that completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+            object state2 = new object();
+
+            // - mockOnSuccess handler throws
+            Mock<Action<object, object>> mockOnSuccess = new();
+            mockOnSuccess.Setup(o => o(It.IsAny<object>(), It.IsAny<object>())).Throws<Exception>();
+
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+            Mock<Action<object, object>> mockOnCancellation = new();
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue,
+                taskCompletionSource,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have faulted
+            Assert.Equal(TaskStatus.Faulted, taskCompletionSource.Task.Status);
+
+            // - mockOnSuccess was called with state obj
+            mockOnSuccess.Verify(action => action(state1, state2), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies the behavior of the ContinueTaskWithState method when the task to continue is
+        /// canceled. Ensures that the cancellation handler is invoked exactly once with the
+        /// specified state parameters, while both success and failure handlers are not called.
+        /// Confirms that the task completion source reflects the canceled state properly,
+        /// regardless of whether the cancellation handler throws an exception.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// Indicates whether the cancellation handler should throw an exception during execution.
+        /// </param>
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task ContinueTaskWithState_2Generics_TaskCancels(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue that was cancelled
+            Task taskToContinue = GetCancelledTask();
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object>> mockOnCancellation = new();
+            if (handlerShouldThrow)
+            {
+                mockOnCancellation.SetupThrows<object, object, Exception>();
+            }
+
+            Mock<Action<object, object>> mockOnSuccess = new();
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue,
+                taskCompletionSource,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have been cancelled, regardless of mockOnCancellation throwing
+            Assert.Equal(TaskStatus.Canceled, taskCompletionSource.Task.Status);
+
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.Verify(action => action(state1, state2), Times.Once);
+        }
+
+        /// <summary>
+        /// Verifies that when a task to continue with two state objects is cancelled and no
+        /// cancellation handler is provided, the associated TaskCompletionSource transitions to a
+        /// cancelled state. Ensures that neither the success handler nor the failure handler is
+        /// invoked.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTaskWithState_2Generics_TaskCancelsNoHandler()
+        {
+            // Arrange
+            // - Task to continue that was cancelled
+            Task taskToContinue = GetCancelledTask();
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object>> mockOnSuccess = new();
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue,
+                taskCompletionSource,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                onCancellation: null);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have been cancelled
+            Assert.Equal(TaskStatus.Canceled, taskCompletionSource.Task.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Validates that when a faulted task continues in the presence of two state objects, the
+        /// failure handler is invoked exactly once for the provided state objects and exception.
+        /// Ensures no other handlers, such as the success or cancellation handlers, are called, and
+        /// the task completion source transitions to a faulted state as expected.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// A boolean indicating whether the failure handler should throw an exception when invoked.
+        /// If true, the failure handler will throw; otherwise, it will complete normally.
+        /// </param>
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task ContinueTaskWithState_2Generics_TaskFaults(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue that faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+            if (handlerShouldThrow)
+            {
+                mockOnFailure.SetupThrows<object, object, Exception, Exception>();
+            }
+
+            Mock<Action<object, object>> mockOnSuccess = new();
+            Mock<Action<object, object>> mockOnCancellation = new();
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue,
+                taskCompletionSource,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have faulted, regardless of mockOnFailure throwing
+            Assert.Equal(TaskStatus.Faulted, taskCompletionSource.Task.Status);
+
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+            mockOnFailure.Verify(action => action(state1, state2, It.IsAny<Exception>()), Times.Once);
+        }
+
+        /// <summary>
+        /// Verifies that when a task to continue faults and no failure handler is provided, the
+        /// resulting task faults as expected. Ensures that the success and cancellation handlers
+        /// are never invoked, and the task continuation completes with a faulted status.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTaskWithState_2Generics_TaskFaultsNoHandler()
+        {
+            // Arrange
+            // - Task to continue that faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object>> mockOnSuccess = new();
+            Mock<Action<object, object>> mockOnCancellation = new();
+
+            // Act
+            AsyncHelper.ContinueTaskWithState(
+                taskToContinue,
+                taskCompletionSource,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                onFailure: null,
+                mockOnCancellation.Object);
+            await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+
+            // Assert
+            // - taskCompletionSource should have faulted
+            Assert.Equal(TaskStatus.Faulted, taskCompletionSource.Task.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Ensures that a task with state and two generic parameters, when cancelled or failed,
+        /// does not create an unobserved exception. Verifies proper handling of unobserved task
+        /// exceptions through registration of cancellation or failure handlers in the continuation
+        /// process.
+        /// </summary>
+        [Fact]
+        public async Task ContinueTaskWithState_2Generics_DoesNotCreateUnobservedException()
+        {
+            await VerifyDoesNotCreateUnobservedException(async e =>
+            {
+                TaskCompletionSource<object?> taskCompletionSource = GetTaskCompletionSource();
+
+                AsyncHelper.ContinueTaskWithState(
+                    GetCancelledTask(),
+                    taskCompletionSource,
+                    new object(),
+                    new object(),
+                    onSuccess: static (_, _) => { },
+                    onCancellation: (_, _) => throw e);
+                await RunWithTimeout(taskCompletionSource.Task, RunTimeout);
+            });
+        }
+
+        #endregion
+
+        #region CreateContinuationTask
+
+        /// <summary>
+        /// Tests the behavior of the CreateContinuationTask method when the provided task to
+        /// continue is null. Ensures that the method returns null and invokes the onSuccess action
+        /// exactly once. Verifies that neither the onFailure nor the onCancellation actions are
+        /// called.
+        /// </summary>
+        [Fact]
+        public void CreateContinuationTask_NullTask()
+        {
+            // Arrange
+            Mock<Action> mockOnSuccess = new();
+            Mock<Action<Exception>> mockOnFailure = new();
+            Mock<Action> mockOnCancellation = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTask(
+                taskToContinue: null,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+
+            // Assert
+            Assert.Null(continuationTask);
+
+            mockOnSuccess.Verify(action => action(), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Validates that a continuation task is successfully created and completed when the
+        /// initial task finishes execution without any exceptions. Ensures the success handler is
+        /// invoked exactly once, while neither the failure handler nor the cancellation handler are
+        /// triggered during the process.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTask_TaskCompletes()
+        {
+            // Arrange
+            // - Task to continue completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            Mock<Action> mockOnSuccess = new();
+            Mock<Action<Exception>> mockOnFailure = new();
+            Mock<Action> mockOnCancellation = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTask(
+                taskToContinue,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.RanToCompletion, continuationTask.Status);
+
+            mockOnSuccess.Verify(action => action(), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Ensures that a continuation task invokes the appropriate handlers when the success
+        /// handler throws after the primary task completes successfully. Verifies that the
+        /// continuation task transitions to a faulted state and only the success handler is invoked
+        /// once, while the failure and cancellation handlers are never called.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTask_TaskCompletesHandlerThrows()
+        {
+            // Arrange
+            // - Task to continue completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            Mock<Action<Exception>> mockOnFailure = new();
+            Mock<Action> mockOnCancellation = new();
+
+            // - mockOnSuccess handler throws
+            Mock<Action> mockOnSuccess = new();
+            mockOnSuccess.SetupThrows<Exception>();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTask(
+                taskToContinue,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Faulted, continuationTask.Status);
+            mockOnSuccess.Verify(action => action(), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Tests that a continuation task correctly handles a cancellation of the original task.
+        /// Verifies that the cancellation handler is invoked exactly once while ensuring that
+        /// neither the success handler nor the failure handler is called. If the cancellation
+        /// handler is configured to throw, this behavior is also validated.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// Indicates whether the cancellation handler is expected to throw an exception during
+        /// execution.
+        /// </param>
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task CreateContinuationTask_TaskCancels(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue was cancelled
+            Task taskToContinue = GetCancelledTask();
+            Mock<Action<Exception>> mockOnFailure = new();
+            Mock<Action> mockOnSuccess = new();
+
+            Mock<Action> mockOnCancellation = new();
+            if (handlerShouldThrow)
+            {
+                mockOnCancellation.SetupThrows<Exception>();
+            }
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTask(
+                taskToContinue,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Canceled, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.Verify(action => action(), Times.Once);
+        }
+
+        /// <summary>
+        /// Verifies that a continuation task created with a null cancellation handler properly
+        /// handles task cancellation. Ensures that no success or failure handlers are invoked and
+        /// the resulting task is marked as canceled.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTask_TaskCancelsNoHandler()
+        {
+            // Arrange
+            // - Task to continue was cancelled
+            Task taskToContinue = GetCancelledTask();
+            Mock<Action<Exception>> mockOnFailure = new();
+            Mock<Action> mockOnSuccess = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTask(
+                taskToContinue,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                onCancellation: null);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Canceled, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Ensures that a continuation task is correctly created and handled when the original task
+        /// faults. Validates that the failure handler is invoked exactly once, while success and
+        /// cancellation handlers are never invoked.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// Indicates whether the failure handler should throw an exception when invoked, testing
+        /// edge cases in handling throwing failures.
+        /// </param>
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task CreateContinuationTask_TaskFaults(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            Mock<Action> mockOnSuccess = new();
+            Mock<Action> mockOnCancellation = new();
+
+            Mock<Action<Exception>> mockOnFailure = new();
+            if (handlerShouldThrow)
+            {
+                mockOnFailure.SetupThrows<Exception, Exception>();
+            }
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTask(
+                taskToContinue,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Faulted, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.Verify(action => action(It.IsAny<Exception>()), Times.Once);
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies that when a task faults and no failure or cancellation handlers are provided,
+        /// the continuation task is created in a faulted state. Ensures that success and
+        /// cancellation handlers are never invoked in this scenario.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTask_TaskFaultsNoHandler()
+        {
+            // Arrange
+            // - Task to continue completed successfully
+            Task taskToContinue = Task.FromException(new Exception());
+            Mock<Action> mockOnSuccess = new();
+            Mock<Action> mockOnCancellation = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTask(
+                taskToContinue,
+                mockOnSuccess.Object,
+                onFailure: null,
+                onCancellation: null);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Faulted, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Ensures that creating a continuation task does not result in an unobserved exception
+        /// being thrown, even when the preceding task is canceled. Verifies that the cancellation
+        /// handler, when provided, properly handles this scenario, avoiding unobserved exceptions
+        /// in all cases.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTask_DoesNotCreateUnobservedException()
+        {
+            await VerifyDoesNotCreateUnobservedException(async e =>
+            {
+                Task? continuationTask = AsyncHelper.CreateContinuationTask(
+                    GetCancelledTask(),
+                    onSuccess: static () => { },
+                    onCancellation: () => throw e);
+                await RunWithTimeout(continuationTask, RunTimeout);
+            });
+        }
+
+        #endregion
+
+        #region CreateContinuationTaskWithState<T1>
+
+        /// <summary>
+        /// Validates the behavior of the CreateContinuationTaskWithState method when provided with
+        /// a null task. Ensures that the continuation task is not created, the success handler is
+        /// invoked exactly once with the given state, and neither the failure nor the cancellation
+        /// handlers are invoked.
+        /// </summary>
+        [Fact]
+        public void CreateContinuationTaskWithState_1Generic_NullTask()
+        {
+            // Arrange
+            object state1 = new object();
+            Mock<Action<object>> mockOnSuccess = new();
+            Mock<Action<object, Exception>> mockOnFailure = new();
+            Mock<Action<object>> mockOnCancellation = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue: null,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+
+            // Assert
+            Assert.Null(continuationTask);
+
+            mockOnSuccess.Verify(action => action(state1), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies that the continuation task is correctly created and executed when the initial
+        /// task completes successfully. Ensures that the success handler is triggered exactly once,
+        /// while failure and cancellation handlers are not invoked, confirming their appropriate
+        /// exclusion in successful completion scenarios.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTaskWithState_1Generic_TaskCompletes()
+        {
+            // Arrange
+            // - Task to continue completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            object state1 = new object();
+
+            Mock<Action<object>> mockOnSuccess = new();
+            Mock<Action<object, Exception>> mockOnFailure = new();
+            Mock<Action<object>> mockOnCancellation = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.RanToCompletion, continuationTask.Status);
+            mockOnSuccess.Verify(action => action(state1), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies that a continuation task is correctly created with state when the preceding
+        /// task completes successfully but the success handler throws an exception. Ensures the
+        /// continuation task transitions to a faulted state, triggering the exception. Confirms
+        /// that the success handler is invoked exactly once, while neither the failure handler nor
+        /// the cancellation handler are invoked.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTaskWithState_1Generic_TaskCompletesHandlerThrows()
+        {
+            // Arrange
+            // - Task to continue completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            object state1 = new object();
+
+            Mock<Action<object, Exception>> mockOnFailure = new();
+            Mock<Action<object>> mockOnCancellation = new();
+
+            // - mockOnSuccess handler throws
+            Mock<Action<object>> mockOnSuccess = new();
+            mockOnSuccess.SetupThrows<object, Exception>();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Faulted, continuationTask.Status);
+            mockOnSuccess.Verify(action => action(state1), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Handles the creation of a continuation task with state when the task to continue is
+        /// canceled. Ensures the cancellation handler is invoked successfully, while success and
+        /// failure handlers remain uninvoked. Validates task status and the correct execution of
+        /// the cancellation handler.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// Determines whether the cancellation handler should throw an exception during execution.
+        /// </param>
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task CreateContinuationTaskWithState_1Generic_TaskCancels(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue was cancelled
+            Task taskToContinue = GetCancelledTask();
+            object state1 = new object();
+
+            Mock<Action<object, Exception>> mockOnFailure = new();
+            Mock<Action<object>> mockOnSuccess = new();
+
+            Mock<Action<object>> mockOnCancellation = new();
+            if (handlerShouldThrow)
+            {
+                mockOnCancellation.SetupThrows<object, Exception>();
+            }
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Canceled, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.Verify(action => action(state1), Times.Once);
+        }
+
+        /// <summary>
+        /// Validates that when a task is cancelled and no cancellation handler is provided, the
+        /// continuation task transitions to the cancelled state. Ensures that no success or failure
+        /// handlers are invoked in this scenario.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTaskWithState_1Generic_TaskCancelsNoHandler()
+        {
+            // Arrange
+            // - Task to continue was cancelled
+            Task taskToContinue = GetCancelledTask();
+            object state1 = new object();
+
+            Mock<Action<object, Exception>> mockOnFailure = new();
+            Mock<Action<object>> mockOnSuccess = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                onCancellation: null);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Canceled, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Tests the behavior of the CreateContinuationTaskWithState method when the task to
+        /// continue has faulted. Ensures that the failure handler is invoked exactly once with the
+        /// correct state and exception, while other handlers (success and cancellation) are not
+        /// invoked. Validates that the resulting continuation task ends with a faulted status.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// Indicates if the failure handler should throw an exception during execution. This is
+        /// used for testing resilience to handler exceptions. True to simulate a throwing handler;
+        /// otherwise, false.
+        /// </param>
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task CreateContinuationTaskWithState_1Generic_TaskFaults(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            object state1 = new object();
+
+            Mock<Action<object>> mockOnSuccess = new();
+            Mock<Action<object>> mockOnCancellation = new();
+
+            Mock<Action<object, Exception>> mockOnFailure = new();
+            if (handlerShouldThrow)
+            {
+                mockOnFailure.SetupThrows<object, Exception, Exception>();
+            }
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Faulted, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.Verify(action => action(state1, It.IsAny<Exception>()), Times.Once);
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Validates that a continuation task is correctly created when the preceding task faults
+        /// and no failure handler is provided. Ensures that the continuation task reflects the
+        /// faulted status of the original task, and that neither the success nor cancellation
+        /// handlers are invoked in this scenario.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTaskWithState_1Generic_TaskFaultsNoHandler()
+        {
+            // Arrange
+            // - Task to continue faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            object state1 = new object();
+
+            Mock<Action<object>> mockOnSuccess = new();
+            Mock<Action<object>> mockOnCancellation = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                mockOnSuccess.Object,
+                onFailure: null,
+                onCancellation: null);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Faulted, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Confirms that calling CreateContinuationTaskWithState with a generic state does not
+        /// result in an unobserved exception, even when the original task is canceled. Verifies
+        /// that the cancellation handler, if provided, correctly executes and that other handlers
+        /// are not triggered unexpectedly.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTaskWithState_1Generic_DoesNotCreateUnobservedException()
+        {
+            await VerifyDoesNotCreateUnobservedException(async e =>
+            {
+                Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                    GetCancelledTask(),
+                    new object(),
+                    onSuccess: static _ => { },
+                    onCancellation: _ => throw e);
+                await RunWithTimeout(continuationTask, RunTimeout);
+            });
+        }
+
+        #endregion
+
+        #region CreateContinuationTaskWithState<T1, T2>
+
+        /// <summary>
+        /// Tests the behavior of <see cref="AsyncHelper.CreateContinuationTaskWithState{TState1,
+        /// TState2}"/> when the input task is null. Validates that the method correctly returns
+        /// null and that the success handler is invoked with the provided state objects. Ensures
+        /// neither the failure handler nor the cancellation handler is invoked.
+        /// </summary>
+        [Fact]
+        public void CreateContinuationTaskWithState_2Generics_NullTask()
+        {
+            // Arrange
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object>> mockOnSuccess = new();
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+            Mock<Action<object, object>> mockOnCancellation = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue: null,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+
+            // Assert
+            Assert.Null(continuationTask);
+
+            mockOnSuccess.Verify(action => action(state1, state2), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Tests that the asynchronous continuation task correctly executes when the original task
+        /// completes successfully. Verifies that the success handler is triggered exactly once with
+        /// the provided state parameters, while the failure and cancellation handlers are not
+        /// invoked.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTaskWithState_2Generics_TaskCompletes()
+        {
+            // Arrange
+            // - Task to continue completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object>> mockOnSuccess = new();
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+            Mock<Action<object, object>> mockOnCancellation = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.RanToCompletion, continuationTask.Status);
+            mockOnSuccess.Verify(action => action(state1, state2), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Validates that a continuation task created with two states invokes the success handler
+        /// once when the original task completes successfully, even if the success handler throws
+        /// an exception. Ensures that no failure or cancellation handlers are invoked and that the
+        /// continuation task ends in a faulted state as a result of the thrown exception.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTaskWithState_2Generics_TaskCompletesHandlerThrows()
+        {
+            // Arrange
+            // - Task to continue completed successfully
+            Task taskToContinue = Task.CompletedTask;
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+            Mock<Action<object, object>> mockOnCancellation = new();
+
+            // - mockOnSuccess handler throws
+            Mock<Action<object, object>> mockOnSuccess = new();
+            mockOnSuccess.SetupThrows<object, object, Exception>();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Faulted, continuationTask.Status);
+            mockOnSuccess.Verify(action => action(state1, state2), Times.Once);
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies that the continuation task is correctly created and executed when the initial
+        /// task is canceled. Ensures that the cancellation handler is invoked exactly once, while
+        /// success and failure handlers are never called.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// A boolean parameter indicating whether the cancellation handler should throw an
+        /// exception when invoked.
+        /// </param>
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task CreateContinuationTaskWithState_2Generics_TaskCancels(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue was cancelled
+            Task taskToContinue = GetCancelledTask();
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+            Mock<Action<object, object>> mockOnSuccess = new();
+
+            Mock<Action<object, object>> mockOnCancellation = new();
+            if (handlerShouldThrow)
+            {
+                mockOnCancellation.SetupThrows<object, object, Exception>();
+            }
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Canceled, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+            mockOnCancellation.Verify(action => action(state1, state2), Times.Once);
+        }
+
+        /// <summary>
+        /// Validates that a continuation task created with two generic state parameters cancels
+        /// without invoking any success, failure, or cancellation handlers when the task being
+        /// continued was already cancelled. Ensures that the continuation task is in a cancelled
+        /// state and that none of the handlers are executed.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTaskWithState_2Generics_TaskCancelsNoHandler()
+        {
+            // Arrange
+            // - Task to continue was cancelled
+            Task taskToContinue = GetCancelledTask();
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+            Mock<Action<object, object>> mockOnSuccess = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                onCancellation: null);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Canceled, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Verifies that a continuation task created with two generic state parameters correctly
+        /// handles the scenario where the antecedent task faults. Ensures that the failure handler
+        /// is invoked exactly once with the provided state and exception, while neither the success
+        /// nor cancellation handlers are invoked.
+        /// </summary>
+        /// <param name="handlerShouldThrow">
+        /// A flag indicating whether the failure handler should throw an exception when invoked.
+        /// This parameter is used to test the behavior of the continuation task in the presence of
+        /// handler failures.
+        /// </param>
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task CreateContinuationTaskWithState_2Generics_TaskFaults(bool handlerShouldThrow)
+        {
+            // Arrange
+            // - Task to continue faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object>> mockOnSuccess = new();
+            Mock<Action<object, object>> mockOnCancellation = new();
+
+            Mock<Action<object, object, Exception>> mockOnFailure = new();
+            if (handlerShouldThrow)
+            {
+                mockOnFailure.SetupThrows<object, object, Exception, Exception>();
+            }
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                mockOnFailure.Object,
+                mockOnCancellation.Object);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Faulted, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnFailure.Verify(action => action(state1, state2, It.IsAny<Exception>()), Times.Once);
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Validates that a continuation task created for a faulted initial task does not invoke
+        /// the success or cancellation handlers. Ensures the resulting task properly transitions to
+        /// the Faulted state. The test confirms that the absence of a failure handler does not
+        /// create unintended behavior or exceptions.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTaskWithState_2Generics_TaskFaultsNoHandler()
+        {
+            // Arrange
+            // - Task to continue faulted
+            Task taskToContinue = Task.FromException(new Exception());
+            object state1 = new object();
+            object state2 = new object();
+
+            Mock<Action<object, object>> mockOnSuccess = new();
+            Mock<Action<object, object>> mockOnCancellation = new();
+
+            // Act
+            Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                taskToContinue,
+                state1,
+                state2,
+                mockOnSuccess.Object,
+                onFailure: null,
+                onCancellation: null);
+            await RunWithTimeout(continuationTask, RunTimeout);
+
+            // Assert
+            Assert.Equal(TaskStatus.Faulted, continuationTask.Status);
+            mockOnSuccess.VerifyNeverCalled();
+            mockOnCancellation.VerifyNeverCalled();
+        }
+
+        /// <summary>
+        /// Validates that creating a continuation task with two generic parameters does not result
+        /// in an unobserved exception. Ensures that the task handles cancellation scenarios without
+        /// leaking exceptions into the unobserved exception handler.
+        /// </summary>
+        [Fact]
+        public async Task CreateContinuationTaskWithState_2Generics_DoesNotCreateUnobservedException()
+        {
+            await VerifyDoesNotCreateUnobservedException(async e =>
+            {
+                Task? continuationTask = AsyncHelper.CreateContinuationTaskWithState(
+                    GetCancelledTask(),
+                    new object(),
+                    new object(),
+                    onSuccess: static (_, _) => { },
+                    onCancellation: (_, _) => throw e);
+                await RunWithTimeout(continuationTask, RunTimeout);
+            });
+        }
+
+        #endregion
+
+        #region WaitForCompletion
+
+        /// <summary>
+        /// Verifies that the WaitForCompletion method does not create unobserved exceptions when a
+        /// faulted task is garbage collected. Ensures that exceptions occurring after a task times
+        /// out are properly handled and do not propagate as unobserved task exceptions.
+        /// </summary>
+        [Fact]
+        public async Task WaitForCompletion_DoesNotCreateUnobservedException()
+        {
+            await VerifyDoesNotCreateUnobservedException(e =>
+            {
+                // - Run task that will always time out
+                TaskCompletionSource<object?>? tcs = new();
+                AsyncHelper.WaitForCompletion(
+                    tcs.Task,
+                    timeoutInSeconds: 1,
+                    onTimeout: null,
+                    rethrowExceptions: true);
+
+                // - Task has timed out, simulate faulting task completion source
+                tcs.SetException(e);
+
+                // - Drop the last strong reference to tcs so the faulting task can be finalized
+                tcs = null;
+
+                return Task.CompletedTask;
+            });
+        }
+
+        #endregion
+
+        private static Task GetCancelledTask()
+        {
+            using CancellationTokenSource cts = new();
+            cts.Cancel();
+
+            return Task.FromCanceled(cts.Token);
+        }
+
+        private static TaskCompletionSource<object?> GetTaskCompletionSource()
+            => new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        private static async Task VerifyDoesNotCreateUnobservedException(Func<ObservableException, Task> methodUnderTest)
+        {
+            // Arrange
+            // - Set up an unobserved exception handler that only captures the exception that will
+            //   be thrown by the continuation callback.
+            // NOTE: This only captures the exception thrown by the callback because unit tests run
+            //   in parallel. Thus, other tests may cause unobserved exceptions that would cause
+            //   false failures of this test.
+            Guid exceptionId = Guid.NewGuid();
+            Exception? unhandledException = null;
+            EventHandler<UnobservedTaskExceptionEventArgs> handleUnobservedException =
+                (_, args) =>
+                {
+                    // Filter inner exceptions on type and expected ID
+                    IEnumerable<ObservableException> observableInnerExceptions =
+                        args.Exception.InnerExceptions.OfType<ObservableException>();
+                    if (observableInnerExceptions.Any(oe => oe.Identifier == exceptionId))
+                    {
+                        unhandledException = args.Exception;
+                        args.SetObserved();
+                    }
+                };
+
+            // - Register the unobserved exception handler
+            // @TODO: Can we do this with a custom scheduler to avoid changing global state?
+            TaskScheduler.UnobservedTaskException += handleUnobservedException;
+
+            try
+            {
+                // Act
+                // - Run the test method
+                await methodUnderTest(new ObservableException(exceptionId));
+
+                // - Force GC collection to get any unobserved exception to raise an exception.
+                //   However, if the method under test is behaving correctly, this *should not*
+                //   raise any exception.
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
+                GC.Collect();
+
+                // Assert
+                // - The unobserved exception handler should not have captured any exception.
+                Assert.Null(unhandledException);
+            }
+            finally
+            {
+                // Cleanup
+                TaskScheduler.UnobservedTaskException -= handleUnobservedException;
+            }
+        }
+
+        private static async Task RunWithTimeout([NotNull] Task? taskToRun, TimeSpan timeout)
+        {
+            if (taskToRun is null)
+            {
+                Assert.Fail("Expected non-null task for timeout");
+            }
+
+            Task winner = await Task.WhenAny(taskToRun, Task.Delay(timeout));
+            if (winner != taskToRun)
+            {
+                Assert.Fail("Timeout elapsed.");
+            }
+
+            // Force observation of any exception
+            _ = taskToRun.Exception;
+        }
+
+        private class ObservableException : Exception
+        {
+            public ObservableException(Guid id)
+            {
+                Identifier = id;
+            }
+
+            public Guid Identifier { get; set; }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Utilities/MockExtensions.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Utilities/MockExtensions.cs
new file mode 100644
index 0000000000..d7b7e1818f
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Utilities/MockExtensions.cs
@@ -0,0 +1,120 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Moq;
+
+namespace Microsoft.Data.SqlClient.UnitTests.Utilities
+{
+    /// <summary>
+    /// Provides extension methods for working with mocked instances of Action delegates in unit tests.
+    /// </summary>
+    public static class MockExtensions
+    {
+        /// <summary>
+        /// Configures the specified mock to throw an exception of the specified type
+        /// when its associated action is invoked.
+        /// </summary>
+        /// <typeparam name="TException">The type of exception to throw.</typeparam>
+        /// <param name="mock">The mock object to configure.</param>
+        public static void SetupThrows<TException>(this Mock<Action> mock)
+            where TException : Exception, new()
+        {
+            mock.Setup(action => action())
+                .Throws<TException>();
+        }
+
+        /// <summary>
+        /// Configures the specified mock of an Action delegate with one parameter to throw
+        /// an exception of the specified type when it is invoked with any argument.
+        /// </summary>
+        /// <typeparam name="T1">The type of the parameter of the Action delegate.</typeparam>
+        /// <typeparam name="TException">The type of exception to throw.</typeparam>
+        /// <param name="mock">The mock object of the Action delegate to configure.</param>
+        public static void SetupThrows<T1, TException>(this Mock<Action<T1>> mock)
+            where TException : Exception, new()
+        {
+            mock.Setup(action => action(It.IsAny<T1>()))
+                .Throws<TException>();
+        }
+
+        /// <summary>
+        /// Configures the specified mock to throw an exception of the specified type
+        /// when the mocked Action with two parameters is invoked.
+        /// </summary>
+        /// <typeparam name="T1">The type of the first parameter of the mocked Action.</typeparam>
+        /// <typeparam name="T2">The type of the second parameter of the mocked Action.</typeparam>
+        /// <typeparam name="TException">The type of exception to throw.</typeparam>
+        /// <param name="mock">The mock object to configure.</param>
+        public static void SetupThrows<T1, T2, TException>(this Mock<Action<T1, T2>> mock)
+            where TException : Exception, new()
+        {
+            mock.Setup(action => action(It.IsAny<T1>(), It.IsAny<T2>()))
+                .Throws<TException>();
+        }
+
+        /// <summary>
+        /// Configures the specified mock to throw an exception of the specified type
+        /// when its associated action is invoked with three parameters of the specified types.
+        /// </summary>
+        /// <typeparam name="T1">The type of the first parameter of the action.</typeparam>
+        /// <typeparam name="T2">The type of the second parameter of the action.</typeparam>
+        /// <typeparam name="T3">The type of the third parameter of the action.</typeparam>
+        /// <typeparam name="TException">The type of exception to throw.</typeparam>
+        /// <param name="mock">The mock object to configure.</param>
+        public static void SetupThrows<T1, T2, T3, TException>(this Mock<Action<T1, T2, T3>> mock)
+            where TException : Exception, new()
+        {
+            mock.Setup(action => action(It.IsAny<T1>(), It.IsAny<T2>(), It.IsAny<T3>()))
+                .Throws<TException>();
+        }
+
+        /// <summary>
+        /// Verifies that the mocked action has never been invoked.
+        /// </summary>
+        /// <param name="mock">The mock object for which to verify that the action was never called.</param>
+        public static void VerifyNeverCalled(this Mock<Action> mock) =>
+            mock.Verify(action => action(), Times.Never);
+
+        /// <summary>
+        /// Verifies that the specified mock action was never invoked.
+        /// </summary>
+        /// <typeparam name="T1">The type of the parameter expected by the mocked action.</typeparam>
+        /// <param name="mock">The mocked action to verify.</param>
+        public static void VerifyNeverCalled<T1>(this Mock<Action<T1>> mock)
+        {
+            mock.Verify(
+                action => action(It.IsAny<T1>()),
+                Times.Never);
+        }
+
+        /// <summary>
+        /// Verifies that the specified mock action was never called during the test execution.
+        /// </summary>
+        /// <typeparam name="T1">The type of the first parameter of the action.</typeparam>
+        /// <typeparam name="T2">The type of the second parameter of the action.</typeparam>
+        /// <param name="mock">The mock object representing the action to verify.</param>
+        public static void VerifyNeverCalled<T1, T2>(this Mock<Action<T1, T2>> mock)
+        {
+            mock.Verify(
+                action => action(It.IsAny<T1>(), It.IsAny<T2>()),
+                Times.Never);
+        }
+
+        /// <summary>
+        /// Verifies that the specified mock of an <see cref="Action"/> was never called
+        /// with any arguments during the test execution.
+        /// </summary>
+        /// <typeparam name="T1">The type of the first parameter of the action.</typeparam>
+        /// <typeparam name="T2">The type of the second parameter of the action.</typeparam>
+        /// <typeparam name="T3">The type of the third parameter of the action.</typeparam>
+        /// <param name="mock">The mock object to verify.</param>
+        public static void VerifyNeverCalled<T1, T2, T3>(this Mock<Action<T1, T2, T3>> mock)
+        {
+            mock.Verify(
+                action => action(It.IsAny<T1>(), It.IsAny<T2>(), It.IsAny<T3>()),
+                Times.Never);
+        }
+    }
+}

From 145b28570a643596ce79a5369d540fbe2d96dc77 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Thu, 25 Jun 2026 04:35:14 +1000
Subject: [PATCH 160/298] missing cleanup of CancellationTokenSource (#4009)

Co-authored-by: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
---
 .../ManagedSni/SsrpClient.netcore.cs          |   2 +-
 .../Data/SqlClient/SqlCommand.NonQuery.cs     |  13 ++
 .../Data/SqlClient/SqlCommand.Reader.cs       |  13 ++
 .../Microsoft/Data/SqlClient/SqlConnection.cs |  18 ++-
 .../Microsoft/Data/SqlClient/SqlDataReader.cs |  14 +-
 .../Data/SqlClient/SqlSequentialStream.cs     |  20 ++-
 .../Data/SqlClient/SqlSequentialTextReader.cs |  20 ++-
 .../CancellationTokenSourceDisposalTest.cs    | 132 ++++++++++++++++++
 8 files changed, 221 insertions(+), 11 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/CancellationTokenSourceDisposalTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs
index 4544d1169f..0633dc2cce 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs
@@ -299,7 +299,7 @@ private static SsrpResult SendUDPRequest(IPAddress[] ipAddresses, int port, byte
             if (allIPsInParallel) // Used for MultiSubnetFailover
             {
                 List<Task<SsrpResult>> tasks = new(ipAddresses.Length);
-                CancellationTokenSource cts = new CancellationTokenSource();
+                using CancellationTokenSource cts = new CancellationTokenSource();
                 for (int i = 0; i < ipAddresses.Length; i++)
                 {
                     IPEndPoint endPoint = new IPEndPoint(ipAddresses[i], port);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
index ac9ccbbc6b..311c26b4e5 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
@@ -874,11 +874,14 @@ private void RunExecuteNonQueryTdsSetupReconnnectContinuation(
                 {
                     if (completion.Task.IsCompleted)
                     {
+                        timeoutCts.Cancel();
+                        timeoutCts.Dispose();
                         return;
                     }
 
                     Interlocked.CompareExchange(ref _reconnectionCompletionSource, null, completion);
                     timeoutCts.Cancel();
+                    timeoutCts.Dispose();
 
                     Task subTask = RunExecuteNonQueryTds(
                         methodName,
@@ -898,6 +901,16 @@ private void RunExecuteNonQueryTdsSetupReconnnectContinuation(
                             state: completion,
                             onSuccess: static state => ((TaskCompletionSource<object>)state).SetResult(null));
                     }
+                },
+                onFailure: _ =>
+                {
+                    timeoutCts.Cancel();
+                    timeoutCts.Dispose();
+                },
+                onCancellation: () =>
+                {
+                    timeoutCts.Cancel();
+                    timeoutCts.Dispose();
                 });
         }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
index bfdbd40fd5..1aca08c232 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
@@ -1643,11 +1643,14 @@ private void RunExecuteReaderTdsSetupReconnectContinuation(
                 {
                     if (completion.Task.IsCompleted)
                     {
+                        timeoutCts.Cancel();
+                        timeoutCts.Dispose();
                         return;
                     }
 
                     Interlocked.CompareExchange(ref _reconnectionCompletionSource, null, completion);
                     timeoutCts.Cancel();
+                    timeoutCts.Dispose();
 
                     RunExecuteReaderTds(
                         cmdBehavior,
@@ -1672,6 +1675,16 @@ private void RunExecuteReaderTdsSetupReconnectContinuation(
                             state: completion,
                             onSuccess: static state => ((TaskCompletionSource<object>)state).SetResult(null));
                     }
+                },
+                onFailure: _ =>
+                {
+                    timeoutCts.Cancel();
+                    timeoutCts.Dispose();
+                },
+                onCancellation: () =>
+                {
+                    timeoutCts.Cancel();
+                    timeoutCts.Dispose();
                 });
         }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index b27b7081c6..7b236afc2b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -1406,10 +1406,18 @@ public override void Close()
                     Task reconnectTask = _currentReconnectionTask;
                     if (reconnectTask != null && !reconnectTask.IsCompleted)
                     {
-                        CancellationTokenSource cts = _reconnectionCancellationSource;
-                        if (cts != null)
+                        // Only request cancellation here. ReconnectAsync still owns the
+                        // CancellationTokenSource and disposes it in its finally block once it
+                        // has stopped using the token; disposing it here while the reconnect
+                        // task is still running could surface ObjectDisposedException.
+                        try
+                        {
+                            _reconnectionCancellationSource?.Cancel();
+                        }
+                        catch (ObjectDisposedException)
                         {
-                            cts.Cancel();
+                            // ReconnectAsync's finally block disposed the source concurrently;
+                            // the reconnect is already completing, so there is nothing to cancel.
                         }
                         AsyncHelper.WaitForCompletion(reconnectTask, 0, null, rethrowExceptions: false); // we do not need to deal with possible exceptions in reconnection
                         if (State != ConnectionState.Open)
@@ -1651,6 +1659,7 @@ internal void RegisterWaitingForReconnect(Task waitingTask)
 
         private async Task ReconnectAsync(int timeout)
         {
+            CancellationTokenSource cts = new CancellationTokenSource();
             try
             {
                 long commandTimeoutExpiration = 0;
@@ -1658,7 +1667,6 @@ private async Task ReconnectAsync(int timeout)
                 {
                     commandTimeoutExpiration = ADP.TimerCurrent() + ADP.TimerFromSeconds(timeout);
                 }
-                CancellationTokenSource cts = new CancellationTokenSource();
                 _reconnectionCancellationSource = cts;
                 CancellationToken ctoken = cts.Token;
                 int retryCount = _connectRetryCount; // take a snapshot: could be changed by modifying the connection string
@@ -1719,6 +1727,8 @@ private async Task ReconnectAsync(int timeout)
             }
             finally
             {
+                _reconnectionCancellationSource = null;
+                cts.Dispose();
                 _recoverySessionData = null;
                 _suppressStateChangeForReconnection = false;
             }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index ca44267eb6..6b7b53688e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -881,7 +881,12 @@ public override void Close()
                     TdsParserStateObject stateObj = _stateObj;
 
                     // Request that the current task is stopped
-                    _cancelAsyncOnCloseTokenSource.Cancel();
+                    var cancelTokenSource = Interlocked.Exchange(ref _cancelAsyncOnCloseTokenSource, null);
+                    if (cancelTokenSource != null)
+                    {
+                        cancelTokenSource.Cancel();
+                        cancelTokenSource.Dispose();
+                    }
                     var currentTask = _currentTask;
                     if ((currentTask != null) && (!currentTask.IsCompleted))
                     {
@@ -1121,7 +1126,12 @@ virtual internal void CloseReaderFromConnection()
                 var stateObj = _stateObj;
                 _isClosed = true;
                 // Request that the current task is stopped
-                _cancelAsyncOnCloseTokenSource.Cancel();
+                var cancelTokenSource = Interlocked.Exchange(ref _cancelAsyncOnCloseTokenSource, null);
+                if (cancelTokenSource != null)
+                {
+                    cancelTokenSource.Cancel();
+                    cancelTokenSource.Dispose();
+                }
                 if (stateObj != null)
                 {
                     var networkPacketTaskSource = stateObj._networkPacketTaskSource;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialStream.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialStream.cs
index 52b965325d..bb3b8f9bf0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialStream.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialStream.cs
@@ -235,6 +235,15 @@ public override void Write(byte[] buffer, int offset, int count)
         /// </summary>
         internal void SetClosed()
         {
+            // Idempotent: once closed, _reader is null and _disposalTokenSource may already
+            // have been disposed by Dispose(). Calling Cancel() again would throw
+            // ObjectDisposedException, so bail out. SqlDataReader can invoke SetClosed()
+            // after the consumer has already disposed the stream.
+            if (_reader == null)
+            {
+                return;
+            }
+
             _disposalTokenSource.Cancel();
             _reader = null;
 
@@ -250,8 +259,15 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
-                // Set the stream as closed
-                SetClosed();
+                if (_reader != null)
+                {
+                    // Set the stream as closed
+                    SetClosed();
+                }
+                // Safe to call unconditionally: the _reader != null guard above ensures SetClosed()
+                // (and thus Cancel()) runs at most once, and CancellationTokenSource.Dispose()
+                // is idempotent, so repeated Dispose() calls do not throw.
+                _disposalTokenSource.Dispose();
             }
 
             base.Dispose(disposing);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs
index 3ae05e0386..b5a00cde4e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs
@@ -275,8 +275,15 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
-                // Set the textreader as closed
-                SetClosed();
+                if (!IsClosed)
+                {
+                    // Set the textreader as closed
+                    SetClosed();
+                }
+                // Safe to call unconditionally: the IsClosed guard above ensures SetClosed()
+                // (and thus Cancel()) runs at most once, and CancellationTokenSource.Dispose()
+                // is idempotent, so repeated Dispose() calls do not throw.
+                _disposalTokenSource.Dispose();
             }
 
             base.Dispose(disposing);
@@ -288,6 +295,15 @@ protected override void Dispose(bool disposing)
         /// </summary>
         internal void SetClosed()
         {
+            // Idempotent: once closed, _reader is null and _disposalTokenSource may already
+            // have been disposed by Dispose(). Calling Cancel() again would throw
+            // ObjectDisposedException, so bail out. SqlDataReader can invoke SetClosed()
+            // after the consumer has already disposed the text reader.
+            if (IsClosed)
+            {
+                return;
+            }
+
             _disposalTokenSource.Cancel();
             _reader = null;
             _peekedChar = -1;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/CancellationTokenSourceDisposalTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/CancellationTokenSourceDisposalTest.cs
new file mode 100644
index 0000000000..376a1df7e6
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/CancellationTokenSourceDisposalTest.cs
@@ -0,0 +1,132 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+{
+    /// <summary>
+    /// Regression tests for the CancellationTokenSource cleanup work (PR dotnet/SqlClient#4009).
+    /// Disposing a sequential <see cref="Stream"/>/<see cref="TextReader"/> now disposes its
+    /// internal disposal CancellationTokenSource. These tests ensure that the subsequent
+    /// (and unavoidable) call to SqlSequentialStream/SqlSequentialTextReader.SetClosed() made by
+    /// the owning SqlDataReader does not throw ObjectDisposedException, and that repeated
+    /// Close()/Dispose() calls remain safe.
+    /// </summary>
+    [Trait("Set", "2")]
+    public class CancellationTokenSourceDisposalTest
+    {
+        public static IEnumerable<object[]> ConnectionStrings
+        {
+            get
+            {
+                foreach (string connectionString in DataTestUtility.GetConnectionStrings(withEnclave: false))
+                {
+                    yield return new object[] { connectionString };
+                }
+            }
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [MemberData(nameof(ConnectionStrings))]
+        public static void SequentialStream_DisposedBeforeReaderClose_DoesNotThrow(string connectionString)
+        {
+            using SqlConnection connection = new SqlConnection(connectionString);
+            connection.Open();
+
+            using SqlCommand cmd = new SqlCommand(
+                "SELECT CAST(REPLICATE(CAST('a' AS VARCHAR(MAX)), 8000) AS VARBINARY(MAX))",
+                connection);
+            using SqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess);
+
+            Assert.True(reader.Read());
+
+            Stream stream = reader.GetStream(0);
+
+            // Disposing the stream disposes its internal disposal CancellationTokenSource.
+            stream.Dispose();
+            // Double-dispose of the stream must be safe.
+            stream.Dispose();
+
+            // The reader still references the stream and calls SetClosed() on it during Close().
+            // Before the fix this called Cancel() on the disposed CancellationTokenSource and
+            // threw ObjectDisposedException.
+            reader.Close();
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [MemberData(nameof(ConnectionStrings))]
+        public static void SequentialTextReader_DisposedBeforeReaderClose_DoesNotThrow(string connectionString)
+        {
+            using SqlConnection connection = new SqlConnection(connectionString);
+            connection.Open();
+
+            using SqlCommand cmd = new SqlCommand(
+                "SELECT CAST(REPLICATE(CAST('a' AS NVARCHAR(MAX)), 4000) AS NVARCHAR(MAX))",
+                connection);
+            using SqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess);
+
+            Assert.True(reader.Read());
+
+            TextReader textReader = reader.GetTextReader(0);
+
+            // Disposing the text reader disposes its internal disposal CancellationTokenSource.
+            textReader.Dispose();
+            // Double-dispose of the text reader must be safe.
+            textReader.Dispose();
+
+            // SetClosed() is invoked on the already-disposed text reader during Close();
+            // it must not throw ObjectDisposedException.
+            reader.Close();
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [MemberData(nameof(ConnectionStrings))]
+        public static void SequentialStream_DisposedThenReaderAdvanced_DoesNotThrow(string connectionString)
+        {
+            using SqlConnection connection = new SqlConnection(connectionString);
+            connection.Open();
+
+            // Two result sets so we can advance the reader (which closes the active stream) after disposal.
+            using SqlCommand cmd = new SqlCommand(
+                "SELECT CAST(REPLICATE(CAST('a' AS VARCHAR(MAX)), 8000) AS VARBINARY(MAX)); SELECT 1",
+                connection);
+            using SqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess);
+
+            Assert.True(reader.Read());
+
+            Stream stream = reader.GetStream(0);
+            stream.Dispose();
+
+            // Advancing past the result set triggers CloseActiveSequentialStreamAndTextReader(),
+            // which calls SetClosed() on the disposed stream. Must not throw.
+            Assert.True(reader.NextResult());
+            Assert.True(reader.Read());
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [MemberData(nameof(ConnectionStrings))]
+        public static void DataReader_MultipleCloseAndDispose_DoesNotThrow(string connectionString)
+        {
+            using SqlConnection connection = new SqlConnection(connectionString);
+            connection.Open();
+
+            using SqlCommand cmd = new SqlCommand("SELECT 1", connection);
+            SqlDataReader reader = cmd.ExecuteReader();
+
+            Assert.True(reader.Read());
+
+            // Close()/Dispose() dispose the close-cancellation CancellationTokenSource via an
+            // Interlocked swap; repeated calls must be safe (the swapped-out source is null on
+            // subsequent calls rather than a disposed instance).
+            reader.Close();
+            reader.Close();
+            reader.Dispose();
+            reader.Dispose();
+        }
+    }
+}

From b562c5b98a01d4e9825b4181843a645e531ceeb8 Mon Sep 17 00:00:00 2001
From: campersau <buchholz.bastian@googlemail.com>
Date: Wed, 24 Jun 2026 21:06:32 +0200
Subject: [PATCH 161/298] SqlBatchCommand support CommandBehavior (#4125)

* Support SqlBatchCommand.CommandBehavior

* Support SqlBatch ExecuteReader CommandBehavior

* Update tests

* add documentation to ValidateExecuteCommandBehavior

* support ExecuteReader(Async)(CommandBehavior) on .NET Framework

* reverset GetCommand unification and call GetOptionsResetString manually

* cleanup accidental whiltespace

* pass CommandBehavior.CloseConnection in example

* PR feedback

* update docs

* PR feedback
---
 .../Microsoft.Data.SqlClient/SqlBatch.xml     |  90 +++++++++++++-
 .../SqlBatchCommand.xml                       |   5 +-
 .../ref/Microsoft.Data.SqlClient.cs           |  16 ++-
 .../src/Microsoft/Data/SqlClient/SqlBatch.cs  |  88 +++++++++----
 .../Data/SqlClient/SqlCommand.Batch.cs        |   2 +-
 .../Data/SqlClient/SqlCommand.Reader.cs       |  11 +-
 .../tests/ManualTests/SQL/Batch/BatchTests.cs | 116 ++++++++++++++++++
 .../Microsoft/Data/SqlClient/SqlBatchTest.cs  |  35 ++++++
 8 files changed, 323 insertions(+), 40 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlBatchTest.cs

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml
index 40f34cba48..d2fdff51d2 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml
@@ -1,4 +1,4 @@
-<docs>
+<docs>
   <members name="SqlBatch">
     <SqlBatch>
       <example>
@@ -179,7 +179,7 @@
         The list of <see cref="T:Microsoft.Data.SqlClient.SqlBatchCommand" /> contained in the batch in a <see cref="T:System.Collections.Generic.List`1" />.
       </summary>
     </Commands>
-    <ExecuteReader>
+    <ExecuteReader name="NoParameter">
       <summary>
         Sends the <see cref="P:Microsoft.Data.SqlClient.SqlBatch.Commands" /> to the <see cref="P:Microsoft.Data.SqlClient.SqlCommand.Connection" /> and builds a <see cref="T:Microsoft.Data.SqlClient.SqlDataReader" />.
       </summary>
@@ -232,7 +232,85 @@
           </code>
       </example>
     </ExecuteReader>
-    <ExecuteReaderAsync>
+    <ExecuteReader name="BehaviorParameter">
+      <param name="behavior">
+        An instance of <see cref="T:System.Data.CommandBehavior" />, specifying options for batch execution and data retrieval.
+        Only <see cref="F:System.Data.CommandBehavior.SequentialAccess"/> and <see cref="F:System.Data.CommandBehavior.CloseConnection"/> are supported at the batch level.
+      </param>
+      <summary>
+        Sends the <see cref="P:Microsoft.Data.SqlClient.SqlBatch.Commands" /> to the <see cref="P:Microsoft.Data.SqlClient.SqlCommand.Connection" /> and builds a <see cref="T:Microsoft.Data.SqlClient.SqlDataReader" />.
+      </summary>
+      <example>
+        <para>
+          The following example creates a <see cref="T:Microsoft.Data.SqlClient.SqlConnection" /> and a <see cref="T:Microsoft.Data.SqlClient.SqlBatch" />, then adds multiple <see cref="T:Microsoft.Data.SqlClient.SqlBatchCommand" /> objects to the batch. It then executes the batch, creating a <see cref="T:Microsoft.Data.SqlClient.SqlDataReader" />. The example reads through the results of the batch commands, writing them to the console. Finally, the example closes the <see cref="T:Microsoft.Data.SqlClient.SqlDataReader" /> and then the <see cref="T:Microsoft.Data.SqlClient.SqlConnection" /> as the <c>using</c> blocks fall out of scope.
+        </para>
+        <code language="c#">
+          using Microsoft.Data.SqlClient;
+          
+          class Program
+          {
+              static void Main()
+              {
+                  string str = "Data Source=(local);Initial Catalog=Northwind;"
+                             + "Integrated Security=SSPI;Encrypt=False";
+                  RunBatch(str);
+              }
+          
+              static void RunBatch(string connString)
+              {
+                  using var connection = new SqlConnection(connString);
+                  connection.Open();
+          
+                  using var batch = new SqlBatch(connection);
+          
+                  const int count = 10;
+                  const string parameterName = "parameter";
+                  for (int i = 0; i &lt; count; i++)
+                  {
+                      var batchCommand = new SqlBatchCommand($"SELECT @{parameterName} as value");
+                      batchCommand.Parameters.Add(new SqlParameter(parameterName, i));
+                      batch.BatchCommands.Add(batchCommand);
+                  }
+          
+                  var results = new List&lt;int&gt;(count);
+                  using (SqlDataReader reader = batch.ExecuteReader(CommandBehavior.CloseConnection))
+                  {
+                      do
+                      {
+                          while (reader.Read())
+                          {
+                              results.Add(reader.GetFieldValue&lt;int&gt;(0));
+                          }
+                      } while (reader.NextResult());
+                  }
+                  Console.WriteLine(string.Join(", ", results));
+              }
+          }
+          </code>
+      </example>
+    </ExecuteReader>
+    <ExecuteReaderAsync name="NoParameter">
+      <param name="cancellationToken">A token to cancel the asynchronous operation.</param>
+      <summary>
+        An asynchronous version of <see cref="M:Microsoft.Data.SqlClient.SqlBatch.ExecuteReader" />, which sends the <see cref="P:Microsoft.Data.SqlClient.SqlBatch.Commands" /> to the <see cref="P:Microsoft.Data.SqlClient.SqlBatch.Connection" /> and builds a <see cref="T:Microsoft.Data.SqlClient.SqlDataReader" />.
+        Exceptions will be reported via the returned Task object.
+      </summary>
+      <returns>A task representing the asynchronous operation.</returns>
+      <exception cref="T:Microsoft.Data.SqlClient.SqlException">
+        An error occurred while executing the batch.
+      </exception>
+      <exception cref="T:System.ArgumentException">
+        The <see cref="T:System.Data.CommandBehavior" /> value is invalid.
+      </exception>
+      <exception cref="T:System.OperationCanceledException">
+        The cancellation token was canceled. This exception is stored into the returned task.
+      </exception>
+    </ExecuteReaderAsync>
+    <ExecuteReaderAsync name="BehaviorParameter">
+      <param name="behavior">
+        An instance of <see cref="T:System.Data.CommandBehavior" />, specifying options for batch execution and data retrieval.
+        Only <see cref="F:System.Data.CommandBehavior.SequentialAccess"/> and <see cref="F:System.Data.CommandBehavior.CloseConnection"/> are supported at the batch level.
+      </param>
       <param name="cancellationToken">A token to cancel the asynchronous operation.</param>
       <summary>
         An asynchronous version of <see cref="M:Microsoft.Data.SqlClient.SqlBatch.ExecuteReader" />, which sends the <see cref="P:Microsoft.Data.SqlClient.SqlBatch.Commands" /> to the <see cref="P:Microsoft.Data.SqlClient.SqlBatch.Connection" /> and builds a <see cref="T:Microsoft.Data.SqlClient.SqlDataReader" />.
@@ -303,6 +381,7 @@
     <ExecuteDbDataReader>
       <param name="behavior">
         An instance of <see cref="T:System.Data.CommandBehavior" />, specifying options for batch execution and data retrieval.
+        Only <see cref="F:System.Data.CommandBehavior.SequentialAccess"/> and <see cref="F:System.Data.CommandBehavior.CloseConnection"/> are supported at the batch level.
       </param>
       <summary>
         Executes the batch against its connection, returning a <see cref="T:Microsoft.Data.SqlClient.SqlDataReader" /> which can be used to access the results.
@@ -326,7 +405,10 @@ When the batch returns multiple result sets from different commands, <xref:Micro
       </exception>
     </ExecuteDbDataReader>
     <ExecuteDbDataReaderAsync>
-      <param name="behavior">One of the enumeration values that specifies options for batch execution and data retrieval.</param>
+      <param name="behavior">
+        An instance of <see cref="T:System.Data.CommandBehavior" />, specifying options for batch execution and data retrieval.
+        Only <see cref="F:System.Data.CommandBehavior.SequentialAccess"/> and <see cref="F:System.Data.CommandBehavior.CloseConnection"/> are supported at the batch level.
+      </param>
       <param name="cancellationToken">A token to cancel the asynchronous operation.</param>
       <summary>
         This implementation invokes the <see cref="M:Microsoft.Data.SqlClient.SqlCommand.ExecuteReaderAsync" /> method and returns a completed task. The default implementation will return a cancelled task if passed an already cancelled cancellation token. This method accepts a cancellation token that can be used to request the operation to be cancelled early.
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml
index 8f0be84d25..5145571840 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml
@@ -1,4 +1,4 @@
-<docs>
+<docs>
   <members name="SqlBatchCommand">
     <SqlBatchCommand>
       <summary>
@@ -87,7 +87,8 @@
     </Parameters>
     <CommandBehavior>
       <summary>
-        One of the <see cref="T:System.Data.CommandBehavior" /> values, indicating options for statement execution and data retrieval.
+        An instance of <see cref="T:System.Data.CommandBehavior" />, specifying options for statement execution and data retrieval.
+        Only <see cref="F:System.Data.CommandBehavior.SchemaOnly"/> and <see cref="F:System.Data.CommandBehavior.KeyInfo"/> are supported at the statement level.
       </summary>
     </CommandBehavior>
     <ColumnEncryptionSetting>
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
index 96ac073744..f0e785a36e 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
@@ -144,14 +144,26 @@ public class SqlBatch : System.IDisposable, System.IAsyncDisposable
     #else
     public System.Threading.Tasks.Task<int> ExecuteNonQueryAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
     #endif
-    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReader/*'/>
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReader[@name="NoParameter"]/*'/>
     public Microsoft.Data.SqlClient.SqlDataReader ExecuteReader() => throw null;
-    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReaderAsync/*'/>
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReader[@name="BehaviorParameter"]/*'/>
+    #if NET
+    public new Microsoft.Data.SqlClient.SqlDataReader ExecuteReader(System.Data.CommandBehavior behavior) => throw null;
+    #else
+    public Microsoft.Data.SqlClient.SqlDataReader ExecuteReader(System.Data.CommandBehavior behavior) => throw null;
+    #endif
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReaderAsync[@name="NoParameter"]/*'/>
     #if NET
     public new System.Threading.Tasks.Task<Microsoft.Data.SqlClient.SqlDataReader> ExecuteReaderAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
     #else
     public System.Threading.Tasks.Task<Microsoft.Data.SqlClient.SqlDataReader> ExecuteReaderAsync(System.Threading.CancellationToken cancellationToken = default) => throw null;
     #endif
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReaderAsync[@name="BehaviorParameter"]/*'/>
+    #if NET
+    public new System.Threading.Tasks.Task<Microsoft.Data.SqlClient.SqlDataReader> ExecuteReaderAsync(System.Data.CommandBehavior behavior, System.Threading.CancellationToken cancellationToken = default) => throw null;
+    #else
+    public System.Threading.Tasks.Task<Microsoft.Data.SqlClient.SqlDataReader> ExecuteReaderAsync(System.Data.CommandBehavior behavior, System.Threading.CancellationToken cancellationToken = default) => throw null;
+    #endif
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteScalar/*'/>
     #if NET
     public override object ExecuteScalar() => throw null;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatch.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatch.cs
index a1f79f6f15..d24b9724ac 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatch.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatch.cs
@@ -266,24 +266,54 @@ SqlTransaction Transaction
             }
         }
 
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReader/*'/>
-        public SqlDataReader ExecuteReader()
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReader[@name="NoParameter"]/*'/>
+        public SqlDataReader ExecuteReader() => ExecuteReader(CommandBehavior.Default);
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReader[@name="BehaviorParameter"]/*'/>
+        public
+        #if NET
+        new
+        #endif
+        SqlDataReader ExecuteReader(CommandBehavior behavior)
         {
+            ValidateExecuteCommandBehavior(nameof(ExecuteReader), behavior);
+
             CheckDisposed();
             SetupBatchCommandExecute();
-            return _batchCommand.ExecuteReader();
+            return _batchCommand.ExecuteReader(behavior);
         }
 
-        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReaderAsync/*'/>
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReaderAsync[@name="NoParameter"]/*'/>
         public
         #if NET
         new
         #endif
-        Task<SqlDataReader> ExecuteReaderAsync(CancellationToken cancellationToken = default)
+        Task<SqlDataReader> ExecuteReaderAsync(CancellationToken cancellationToken = default) => ExecuteReaderAsync(CommandBehavior.Default, cancellationToken);
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteReaderAsync[@name="BehaviorParameter"]/*'/>
+        public
+        #if NET
+        new
+        #endif
+        Task<SqlDataReader> ExecuteReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken = default)
         {
+            ValidateExecuteCommandBehavior(nameof(ExecuteReaderAsync), behavior);
+
             CheckDisposed();
             SetupBatchCommandExecute();
-            return _batchCommand.ExecuteReaderAsync(cancellationToken);
+            return _batchCommand.ExecuteReaderAsync(behavior, cancellationToken)
+                .ContinueWith(static (result) =>
+                {
+                    if (result.IsFaulted)
+                    {
+                        throw result.Exception.InnerException;
+                    }
+                    return result.Result;
+                },
+                CancellationToken.None,
+                TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.NotOnCanceled,
+                TaskScheduler.Default
+            );
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteDbDataReader/*'/>
@@ -293,7 +323,7 @@ Task<SqlDataReader> ExecuteReaderAsync(CancellationToken cancellationToken = def
         #else
         virtual
         #endif
-        DbDataReader ExecuteDbDataReader(CommandBehavior behavior) => ExecuteReader();
+        DbDataReader ExecuteDbDataReader(CommandBehavior behavior) => ExecuteReader(behavior);
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/ExecuteDbDataReaderAsync/*'/>
         protected
@@ -302,24 +332,7 @@ Task<SqlDataReader> ExecuteReaderAsync(CancellationToken cancellationToken = def
         #else
         virtual
         #endif
-        Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
-        {
-            CheckDisposed();
-            SetupBatchCommandExecute();
-            return _batchCommand.ExecuteReaderAsync(cancellationToken)
-                .ContinueWith<DbDataReader>((result) =>
-                {
-                    if (result.IsFaulted)
-                    {
-                        throw result.Exception.InnerException;
-                    }
-                    return result.Result;
-                }, 
-                CancellationToken.None, 
-                TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.NotOnCanceled, 
-                TaskScheduler.Default
-            );
-        }
+        async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken) => await ExecuteReaderAsync(behavior, cancellationToken);
 
         private void CheckDisposed()
         {
@@ -350,5 +363,30 @@ private void SetupBatchCommandExecute()
             }
             _batchCommand.SetBatchRPCModeReadyToExecute();
         }
+
+        /// <summary>
+        /// Validates that the provided <see cref="CommandBehavior"/> is compatible with <see cref="SqlBatch"/>.
+        /// </summary>
+        /// <param name="method">The name of the calling method for error reporting.</param>
+        /// <param name="behavior">The behavior flags to validate.</param>
+        /// <remarks>
+        /// <para>
+        /// Only <see cref="CommandBehavior.SequentialAccess"/> and <see cref="CommandBehavior.CloseConnection"/> 
+        /// are supported at the batch level.
+        /// </para>
+        /// <para>
+        /// To apply other behaviors (such as <see cref="CommandBehavior.SingleRow"/> or <see cref="CommandBehavior.SchemaOnly"/>), 
+        /// they must be set on individual <see cref="SqlBatchCommand"/> instances within the batch.
+        /// </para>
+        /// </remarks>
+        /// <exception cref="NotSupportedException">Thrown when unsupported behavior flags are detected.</exception>
+        internal static void ValidateExecuteCommandBehavior(string method, CommandBehavior behavior)
+        {
+            if (0 != (behavior & ~(CommandBehavior.SequentialAccess | CommandBehavior.CloseConnection)))
+            {
+                ADP.ValidateCommandBehavior(behavior);
+                throw ADP.NotSupportedCommandBehavior(behavior & ~(CommandBehavior.SequentialAccess | CommandBehavior.CloseConnection), method);
+            }
+        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Batch.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Batch.cs
index 7b6d16a420..da7d1e2ed7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Batch.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Batch.cs
@@ -37,7 +37,7 @@ internal void AddBatchCommand(SqlBatchCommand batchCommand)
             {
                 // All batch sql statements must be executed inside sp_executesql, including those
                 // without parameters
-                BuildExecuteSql(CommandBehavior.Default, commandText, batchCommand.Parameters, ref rpc);
+                BuildExecuteSql(batchCommand.CommandBehavior, batchCommand.Parameters, ref rpc);
             }
 
             _RPCList.Add(rpc);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
index 1aca08c232..bffe17baf9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
@@ -436,7 +436,6 @@ private _SqlRPC BuildExecute(bool inSchema)
         // @TODO: Can we return the RPC here like BuildExecute does?
         private void BuildExecuteSql(
             CommandBehavior behavior,
-            string commandText,
             SqlParameterCollection parameters,
             ref _SqlRPC rpc)
         {
@@ -457,13 +456,13 @@ private void BuildExecuteSql(
             SqlParameter sqlParam;
 
             // @batch_text
-            commandText ??= GetCommandText(behavior);
+            string text = GetCommandText(behavior);
             sqlParam = rpc.systemParams[0];
-            sqlParam.SqlDbType = (commandText.Length << 1) <= TdsEnums.TYPE_SIZE_LIMIT
+            sqlParam.SqlDbType = (text.Length << 1) <= TdsEnums.TYPE_SIZE_LIMIT
                 ? SqlDbType.NVarChar
                 : SqlDbType.NText;
-            sqlParam.Size = commandText.Length;
-            sqlParam.Value = commandText;
+            sqlParam.Size = text.Length;
+            sqlParam.Value = text;
             sqlParam.Direction = ParameterDirection.Input;
 
             // @batch_params
@@ -1446,7 +1445,7 @@ private SqlDataReader RunExecuteReaderTds(
                     else
                     {
                         Debug.Assert(_execType is EXECTYPE.UNPREPARED, "Invalid execType!");
-                        BuildExecuteSql(cmdBehavior, commandText: null, _parameters, ref rpc);
+                        BuildExecuteSql(cmdBehavior, _parameters, ref rpc);
                     }
 
                     rpc.options = TdsEnums.RPC_NOMETADATA;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
index 01d54f2462..91b57a46b4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
@@ -650,6 +650,122 @@ public static async Task ExecuteReaderAsyncMultiple()
             Assert.Equal(10, resultRowCount);
         }
 
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public static void ExecuteReaderCommandCommandBehaviorSchemaOnlyKeyInfo()
+        {
+            System.Collections.ObjectModel.ReadOnlyCollection<DbColumn> schema;
+
+            using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
+            using (SqlBatch batch = new SqlBatch(conn))
+            {
+                conn.Open();
+
+                var cmd = new SqlBatchCommand("SELECT * FROM Categories");
+                cmd.CommandBehavior = CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo;
+                batch.BatchCommands.Add(cmd);
+
+                using var reader = batch.ExecuteReader();
+
+                Assert.False(reader.Read());
+
+                schema = reader.GetColumnSchema();
+            }
+
+            Assert.Equal(4, schema.Count);
+            Assert.True(schema[0].IsKey);
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public static async Task ExecuteReaderAsyncCommandCommandBehaviorSchemaOnlyKeyInfo()
+        {
+            System.Collections.ObjectModel.ReadOnlyCollection<DbColumn> schema;
+
+            using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
+            await using (SqlBatch batch = new SqlBatch(conn))
+            {
+                await conn.OpenAsync();
+
+                var cmd = new SqlBatchCommand("SELECT * FROM Categories");
+                cmd.CommandBehavior = CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo;
+                batch.BatchCommands.Add(cmd);
+
+                using var reader = await batch.ExecuteReaderAsync();
+
+                Assert.False(await reader.ReadAsync());
+
+                schema = reader.GetColumnSchema();
+            }
+
+            Assert.Equal(4, schema.Count);
+            Assert.True(schema[0].IsKey);
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public static void ExecuteReaderCommandBehaviorCloseConnection()
+        {
+            int resultSetCount = 0;
+            int resultRowCount = 0;
+
+            using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
+            using (SqlBatch batch = new SqlBatch(conn))
+            {
+                conn.Open();
+
+                batch.BatchCommands.Add(new SqlBatchCommand("SELECT 1"));
+                batch.BatchCommands.Add(new SqlBatchCommand("SELECT 2"));
+
+                using (var reader = batch.ExecuteReader(CommandBehavior.CloseConnection))
+                {
+                    do
+                    {
+                        resultSetCount += 1;
+                        while (reader.Read())
+                        {
+                            resultRowCount += 1;
+                        }
+                    } while (reader.NextResult());
+                }
+
+                Assert.Equal(ConnectionState.Closed, conn.State);
+            }
+
+            Assert.Equal(2, resultSetCount);
+            Assert.Equal(2, resultRowCount);
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public static async Task ExecuteReaderAsyncCommandBehaviorCloseConnection()
+        {
+            int resultSetCount = 0;
+            int resultRowCount = 0;
+
+            using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
+            await using (SqlBatch batch = new SqlBatch(conn))
+            {
+                await conn.OpenAsync();
+
+                batch.BatchCommands.Add(new SqlBatchCommand("SELECT 1"));
+                batch.BatchCommands.Add(new SqlBatchCommand("SELECT 2"));
+
+                using (var reader = await batch.ExecuteReaderAsync(CommandBehavior.CloseConnection))
+                {
+                    do
+                    {
+                        resultSetCount += 1;
+                        while (await reader.ReadAsync())
+                        {
+                            resultRowCount += 1;
+                        }
+                    } while (await reader.NextResultAsync());
+                }
+
+                Assert.Equal(ConnectionState.Closed, conn.State);
+            }
+
+            Assert.Equal(2, resultSetCount);
+            Assert.Equal(2, resultRowCount);
+        }
+
         private static SqlParameter CreateParameter<T>(string name, SqlDbType type, T value, ParameterDirection direction = ParameterDirection.Input)
         {
             var parameter = new SqlParameter(name, type);
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlBatchTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlBatchTest.cs
new file mode 100644
index 0000000000..ebed579cd2
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlBatchTest.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests;
+
+/// <summary>
+/// Provides unit tests for verifying the behavior of the SqlBatch class.
+/// </summary>
+public class SqlBatchTest
+{
+    /// <summary>
+    /// Verifies that SqlBatch.ValidateExecuteCommandBehavior throws an ArgumentOutOfRangeException when an invalid CommandBehavior is specified.
+    /// </summary>
+    [Fact]
+    public void InvalidCommandBehaviorValidateExecuteCommandBehavior_Throws()
+    {
+        ArgumentOutOfRangeException ex = Assert.Throws<ArgumentOutOfRangeException>(() => SqlBatch.ValidateExecuteCommandBehavior("ExecuteNonQuery", (CommandBehavior)64));
+        Assert.Contains("CommandBehavior", ex.Message, StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Verifies that SqlBatch.ValidateExecuteCommandBehavior throws an ArgumentOutOfRangeException when a valid but unsupported CommandBehavior is specified.
+    /// </summary>
+    [Fact]
+    public void NotSupportedCommandBehaviorValidateExecuteCommandBehavior_Throws()
+    {
+        ArgumentOutOfRangeException ex = Assert.Throws<ArgumentOutOfRangeException>(() => SqlBatch.ValidateExecuteCommandBehavior("ExecuteNonQuery", CommandBehavior.KeyInfo));
+        Assert.Contains("not supported", ex.Message, StringComparison.OrdinalIgnoreCase);
+    }
+}

From 85b304d969e90b77ff0b1ef70a1ff118433568f7 Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Thu, 25 Jun 2026 18:01:40 +0530
Subject: [PATCH 162/298] Add release notes for 6.1.6 (#4404)

---
 CHANGELOG.md                |  31 ++++++++
 release-notes/6.1/6.1.6.md  | 146 ++++++++++++++++++++++++++++++++++++
 release-notes/6.1/README.md |   1 +
 3 files changed, 178 insertions(+)
 create mode 100644 release-notes/6.1/6.1.6.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5fd80d19e..eb1b0ee034 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,37 @@ 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.1.6] - 2026-06-24
+
+This update brings the following changes since the [6.1.5](release-notes/6.1/6.1.5.md) release.
+See the [full release notes](release-notes/6.1/6.1.6.md) for detailed descriptions.
+
+### Added
+
+- Added Web Account Manager (WAM) broker support for the supported Entra ID authentication modes (Windows only), including the new `ActiveDirectoryAuthenticationProviderOptions` type with a `UseWamBroker` property, an `ActiveDirectoryAuthenticationProvider(ActiveDirectoryAuthenticationProviderOptions options)` constructor overload, and a cross-platform `SetParentActivityOrWindowFunc(Func<object>)` method.
+  ([#4288](https://github.com/dotnet/SqlClient/pull/4288),
+   [#4387](https://github.com/dotnet/SqlClient/pull/4387))
+
+### Changed
+
+- Hardened TDS token parsing with data-length bounds checks to prevent unbounded memory allocation from a server spoofing length fields.
+  ([#4340](https://github.com/dotnet/SqlClient/pull/4340),
+   [#4359](https://github.com/dotnet/SqlClient/pull/4359))
+
+- Updated dependencies ([#4387](https://github.com/dotnet/SqlClient/pull/4387)):
+  - Updated `Microsoft.Identity.Client` to 4.84.2 (was 4.80.0)
+  - Added `Microsoft.Identity.Client.Broker` 4.84.2
+
+### Fixed
+
+- Fixed a `NullReferenceException` in `SqlDataReader.GetChars` on the PLP + `SequentialAccess` path when a `null` buffer was passed with a negative `bufferIndex`; it now throws `ArgumentOutOfRangeException`.
+  ([#4159](https://github.com/dotnet/SqlClient/pull/4159),
+   [#4205](https://github.com/dotnet/SqlClient/pull/4205))
+
+- Fixed column master key (CMK) signature verification caching where a cached verification failure could subsequently be reported as a valid signature.
+  ([#4339](https://github.com/dotnet/SqlClient/pull/4339),
+   [#4356](https://github.com/dotnet/SqlClient/pull/4356))
+
 ## [Preview Release 7.1.0-preview1] - 2026-04-29
 
 This update brings the following changes since the [7.0.0](release-notes/7.0/7.0.0.md) release.
diff --git a/release-notes/6.1/6.1.6.md b/release-notes/6.1/6.1.6.md
new file mode 100644
index 0000000000..c2119131a4
--- /dev/null
+++ b/release-notes/6.1/6.1.6.md
@@ -0,0 +1,146 @@
+# Release Notes
+
+## Stable Release 6.1.6 - 2026-06-24
+
+This update brings the following changes since the [6.1.5](6.1.5.md) release:
+
+### Added
+
+#### WAM broker support for the supported Entra ID authentication modes (Windows only)
+
+*What Changed:*
+
+- Added support for the [Web Account Manager (WAM)](https://learn.microsoft.com/entra/msal/dotnet/acquiring-tokens/desktop-mobile/wam) broker for the supported Microsoft Entra ID authentication modes. A new `ActiveDirectoryAuthenticationProviderOptions` options bag and a corresponding `ActiveDirectoryAuthenticationProvider(ActiveDirectoryAuthenticationProviderOptions options)` constructor were introduced, exposing a `UseWamBroker` property (alongside `ApplicationClientId` and `DeviceCodeFlowCallback`).
+  ([#4288](https://github.com/dotnet/SqlClient/pull/4288), [#4387](https://github.com/dotnet/SqlClient/pull/4387))
+- Added a cross-platform `SetParentActivityOrWindowFunc(Func<object> parentActivityOrWindowFunc)` method so callers can supply a parent window handle on Windows or a parent `Activity`/`UIViewController` on Android/iOS/MAUI.
+
+*Who Benefits:*
+
+- Applications using `ActiveDirectoryInteractive` and other supported Entra ID authentication modes on Windows benefit from the WAM broker's improved security (tokens are brokered by the OS), single sign-on with the logged-in Windows account, and support for Conditional Access and Windows Hello.
+
+*Impact:*
+
+- When you supply your `ApplicationClientId`, WAM is opt-in via `ActiveDirectoryAuthenticationProviderOptions.UseWamBroker`. Consider enabling it when you want OS-brokered tokens, single sign-on with the signed-in Windows account, Windows Hello, and Conditional Access support.
+- `UseWamBroker` is a **Windows-only** setting and has no effect on non-Windows platforms, where interactive Entra ID flows always use the system browser.
+- Prefer the new options-bag constructor over the positional-argument overloads in new code.
+
+```c#
+var options = new ActiveDirectoryAuthenticationProviderOptions
+{
+    ApplicationClientId = "<your-app-client-id>",
+    // Enable WAM (Windows only) for OS-brokered tokens, SSO, Windows Hello, and Conditional Access.
+    UseWamBroker = true,
+};
+var provider = new ActiveDirectoryAuthenticationProvider(options);
+// Supply the parent window/activity that owns the interactive sign-in prompt.
+provider.SetParentActivityOrWindowFunc(() => parentWindowHandle);
+SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryInteractive, provider);
+```
+
+
+### Changed
+
+#### Hardened TDS token parsing with data-length bounds checks
+
+*What Changed:*
+
+- Added bounds checking when parsing TDS token data lengths. The parser now validates the declared length of incoming token data against the available buffer before reading, rejecting malformed or out-of-range length values instead of reading past the intended boundary.
+  ([#4340](https://github.com/dotnet/SqlClient/pull/4340), [#4359](https://github.com/dotnet/SqlClient/pull/4359))
+
+*Who Benefits:*
+
+- All consumers benefit from improved resilience against malformed or hostile TDS responses. A server (or man-in-the-middle) sending an invalid token length can no longer drive the parser to read beyond the declared payload.
+
+*Impact:*
+
+- Connections that previously parsed malformed token streams loosely will now fail fast with a clear protocol error. Well-behaved SQL Server responses are unaffected.
+
+#### Other changes
+
+- Updated dependencies ([#4387](https://github.com/dotnet/SqlClient/pull/4387)):
+  - Updated `Microsoft.Identity.Client` to 4.84.2 (was 4.80.0)
+  - Added `Microsoft.Identity.Client.Broker` 4.84.2
+
+### Fixed
+
+- Fixed a `NullReferenceException` in `SqlDataReader.GetChars` on the PLP + `CommandBehavior.SequentialAccess` path when a `null` buffer was passed together with a negative `bufferIndex`. The call now correctly throws `ArgumentOutOfRangeException` for the `bufferIndex` parameter.
+  ([#4159](https://github.com/dotnet/SqlClient/pull/4159), [#4205](https://github.com/dotnet/SqlClient/pull/4205))
+
+- Fixed column master key (CMK) signature verification caching where `GetSignatureVerificationResult` returned whether the cache key existed rather than the cached value itself. Once a signature verification failure was cached as `false`, subsequent lookups incorrectly returned `true`, causing the caller to skip re-verification and treat the column master key as having a valid signature.
+  ([#4339](https://github.com/dotnet/SqlClient/pull/4339), [#4356](https://github.com/dotnet/SqlClient/pull/4356))
+
+## Target Platform Support
+
+- .NET Framework 4.6.2+ (Windows x86, Windows x64, Windows ARM64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM64, Linux, macOS)
+- .NET Standard 2.0+ (Windows x86, Windows x64, Windows ARM64, Linux, macOS)
+
+### Dependencies
+
+#### .NET Framework 4.6.2
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- System.Buffers 4.6.1
+- System.Data.Common 4.3.0
+- System.Diagnostics.DiagnosticSource 8.0.1
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Memory 4.6.3
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 8.0.6
+- System.Text.RegularExpressions 4.3.1
+
+#### .NET 8.0
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Diagnostics.DiagnosticSource 8.0.1
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Security.Cryptography.Pkcs 8.0.1
+
+#### .NET 9.0
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 9.0.11
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.11
+- System.Diagnostics.DiagnosticSource 9.0.11
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Security.Cryptography.Pkcs 9.0.11
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Diagnostics.DiagnosticSource 8.0.1
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 8.0.6
diff --git a/release-notes/6.1/README.md b/release-notes/6.1/README.md
index ed5770b672..e119d5baf1 100644
--- a/release-notes/6.1/README.md
+++ b/release-notes/6.1/README.md
@@ -4,6 +4,7 @@ The following Microsoft.Data.SqlClient 6.1 stable releases have been shipped:
 
 | Release Date | Version | Notes |
 | :-- | :-- | :--: |
+| 2026-06-24 | 6.1.6 | [Release Notes](6.1.6.md) |
 | 2026-04-27 | 6.1.5 | [Release Notes](6.1.5.md) |
 | 2026-01-15 | 6.1.4 | [Release Notes](6.1.4.md) |
 | 2025-11-12 | 6.1.3 | [Release Notes](6.1.3.md) |

From 08aa6489b6e63c850e8a423847e273b97bb647ec Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Thu, 25 Jun 2026 22:01:50 +0530
Subject: [PATCH 163/298] Add release notes for 7.0.2 (#4403)

---
 CHANGELOG.md                                  |  45 +++++++
 release-notes/7.0/7.0.2.md                    | 124 ++++++++++++++++++
 release-notes/7.0/README.md                   |   1 +
 .../Extensions/Abstractions/7.0/7.0.2.md      |  21 +++
 .../Extensions/Abstractions/7.0/README.md     |  10 ++
 release-notes/Extensions/Azure/7.0/7.0.2.md   |  76 +++++++++++
 release-notes/Extensions/Azure/7.0/README.md  |  10 ++
 release-notes/Internal/Logging/7.0/7.0.2.md   |  24 ++++
 release-notes/Internal/Logging/7.0/README.md  |  13 ++
 release-notes/README.md                       |   9 +-
 .../AzureKeyVaultProvider/7.0/7.0.2.md        |  23 ++++
 .../AzureKeyVaultProvider/7.0/README.md       |   1 +
 12 files changed, 354 insertions(+), 3 deletions(-)
 create mode 100644 release-notes/7.0/7.0.2.md
 create mode 100644 release-notes/Extensions/Abstractions/7.0/7.0.2.md
 create mode 100644 release-notes/Extensions/Abstractions/7.0/README.md
 create mode 100644 release-notes/Extensions/Azure/7.0/7.0.2.md
 create mode 100644 release-notes/Extensions/Azure/7.0/README.md
 create mode 100644 release-notes/Internal/Logging/7.0/7.0.2.md
 create mode 100644 release-notes/Internal/Logging/7.0/README.md
 create mode 100644 release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.2.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb1b0ee034..7725184521 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,51 @@ 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 7.0.2] - 2026-06-24
+
+This update brings the following changes since the [7.0.1](release-notes/7.0/7.0.1.md) release.
+See the [full release notes](release-notes/7.0/7.0.2.md) for detailed descriptions.
+
+> **Important — package version alignment:** Starting with 7.0.2, the `Microsoft.Data.SqlClient` driver and its companion packages share a single aligned version. The following packages now ship together as `7.0.2`:
+>
+> - `Microsoft.Data.SqlClient`
+> - `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
+> - `Microsoft.Data.SqlClient.Extensions.Azure`
+> - `Microsoft.Data.SqlClient.Extensions.Abstractions`
+> - `Microsoft.Data.SqlClient.Internal.Logging`
+>
+> (`Microsoft.SqlServer.Server` continues to version independently and remains at `1.0.0`.)
+>
+> Applications must reference the same versions of `Microsoft.Data.SqlClient` and its extensions for best compatibility. In particular, applications that reference `Microsoft.Data.SqlClient.Extensions.Azure` must upgrade it to `7.0.2` when upgrading `Microsoft.Data.SqlClient` to `7.0.2`.
+
+> **Breaking change (.NET Framework only):** As part of this alignment, the `AssemblyVersion` of `Microsoft.Data.SqlClient.Extensions.Azure`, `Microsoft.Data.SqlClient.Extensions.Abstractions`, and `Microsoft.Data.SqlClient.Internal.Logging` changed from `1.0.0.0` to `7.0.0.0`. On .NET Framework, `AssemblyVersion` is part of the strong-name identity, so applications that drop these assemblies into an existing deployment without rebuilding must rebuild against the 7.0.2 packages (or add binding redirects). Applications on .NET / .NET Core are not affected. `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` already used a `7.x` assembly version and is unaffected.
+
+### Fixed
+
+- Fixed a `NullReferenceException` in `SqlCommand.Cancel()` when the active connection has already been torn down.
+  ([#4372](https://github.com/dotnet/SqlClient/pull/4372),
+   [#4373](https://github.com/dotnet/SqlClient/pull/4373))
+
+- Fixed a `NullReferenceException` in `SqlDataReader.GetBytes`/`GetChars` when called with a `null` destination buffer.
+  ([#4159](https://github.com/dotnet/SqlClient/pull/4159),
+   [#4206](https://github.com/dotnet/SqlClient/pull/4206))
+
+- Fixed Always Encrypted column master key signature verification incorrectly reusing cached results.
+  ([#4339](https://github.com/dotnet/SqlClient/pull/4339),
+   [#4343](https://github.com/dotnet/SqlClient/pull/4343))
+
+### Changed
+
+- Hardened TDS token parsing by adding data-length bounds checks for token and feature-extension-acknowledgment data.
+  ([#4340](https://github.com/dotnet/SqlClient/pull/4340),
+   [#4358](https://github.com/dotnet/SqlClient/pull/4358))
+
+- Released `Microsoft.Data.SqlClient.Extensions.Azure 7.0.2`, adding WAM broker support for Entra ID authentication modes on Windows. See [release notes](release-notes/Extensions/Azure/7.0/7.0.2.md).
+  ([#4288](https://github.com/dotnet/SqlClient/pull/4288),
+   [#4388](https://github.com/dotnet/SqlClient/pull/4388))
+
+- Re-shipped `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`, `Microsoft.Data.SqlClient.Extensions.Abstractions`, and `Microsoft.Data.SqlClient.Internal.Logging` as `7.0.2` (version alignment only, no functional changes). See release notes for [AKV](release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.2.md), [Abstractions](release-notes/Extensions/Abstractions/7.0/7.0.2.md), and [Logging](release-notes/Internal/Logging/7.0/7.0.2.md).
+
 ## [Stable Release 6.1.6] - 2026-06-24
 
 This update brings the following changes since the [6.1.5](release-notes/6.1/6.1.5.md) release.
diff --git a/release-notes/7.0/7.0.2.md b/release-notes/7.0/7.0.2.md
new file mode 100644
index 0000000000..d1ea72a8db
--- /dev/null
+++ b/release-notes/7.0/7.0.2.md
@@ -0,0 +1,124 @@
+# Release Notes
+
+## Stable Release 7.0.2 - 2026-06-24
+
+This update brings the following changes since the [7.0.1](7.0.1.md) release:
+
+> **Important — package version alignment:** Starting with 7.0.2, the `Microsoft.Data.SqlClient` driver and its companion packages share a single aligned version. The following packages now ship together as `7.0.2`:
+>
+> - `Microsoft.Data.SqlClient`
+> - `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
+> - `Microsoft.Data.SqlClient.Extensions.Azure`
+> - `Microsoft.Data.SqlClient.Extensions.Abstractions`
+> - `Microsoft.Data.SqlClient.Internal.Logging`
+>
+> (`Microsoft.SqlServer.Server` continues to version independently and remains at `1.0.0`.)
+>
+> Applications must reference the same versions of `Microsoft.Data.SqlClient` and its extensions for best compatibility. In particular, applications that reference `Microsoft.Data.SqlClient.Extensions.Azure` must upgrade it to `7.0.2` when upgrading `Microsoft.Data.SqlClient` to `7.0.2`.
+
+> **Breaking change (.NET Framework only):** As part of this alignment, the `AssemblyVersion` of `Microsoft.Data.SqlClient.Extensions.Azure`, `Microsoft.Data.SqlClient.Extensions.Abstractions`, and `Microsoft.Data.SqlClient.Internal.Logging` changed from `1.0.0.0` to `7.0.0.0` (the `Microsoft.Data.SqlClient` and `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` assembly versions are unchanged). On .NET Framework, `AssemblyVersion` is part of the strong-name identity, so applications that drop these assemblies into an existing deployment without rebuilding must rebuild against the 7.0.2 packages (or add binding redirects). Applications on .NET / .NET Core are not affected.
+
+### Fixed
+
+- Fixed a `NullReferenceException` in `SqlCommand.Cancel()`. The diagnostic message built during cancellation dereferenced the active connection directly; it now uses a null-conditional access so cancellation no longer throws when the connection has already been torn down.
+  ([#4372](https://github.com/dotnet/SqlClient/pull/4372),
+   [#4373](https://github.com/dotnet/SqlClient/pull/4373))
+
+- Fixed a `NullReferenceException` in `SqlDataReader` when calling `GetBytes`/`GetChars` with a `null` destination buffer. The argument-validation path that constructs the `InvalidDestinationBufferIndex` exception now guards against the null buffer so the correct `ArgumentException` is surfaced instead of an NRE.
+  ([#4159](https://github.com/dotnet/SqlClient/pull/4159),
+   [#4206](https://github.com/dotnet/SqlClient/pull/4206))
+
+- Fixed Always Encrypted column master key signature verification incorrectly reusing cached results. The `SignatureVerificationCache` lookup logic was corrected so signature verification outcomes are cached and retrieved against the correct key, preventing stale or mismatched verification results.
+  ([#4339](https://github.com/dotnet/SqlClient/pull/4339),
+   [#4343](https://github.com/dotnet/SqlClient/pull/4343))
+
+### Changed
+
+#### Hardened TDS token parsing with data-length bounds checks
+
+*What Changed:*
+
+- Added bounds checking when parsing TDS token and feature-extension-acknowledgment data lengths. The parser now validates the declared length of incoming token data against the available buffer before reading, rejecting malformed or out-of-range length values instead of reading past the intended boundary.
+  ([#4340](https://github.com/dotnet/SqlClient/pull/4340),
+   [#4358](https://github.com/dotnet/SqlClient/pull/4358))
+
+*Who Benefits:*
+
+- All consumers benefit from improved resilience against malformed or hostile TDS responses. A server (or man-in-the-middle) sending an invalid token length can no longer drive the parser to read beyond the declared payload.
+
+*Impact:*
+
+- Connections that previously parsed malformed token streams loosely will now fail fast with a clear protocol error. Well-behaved SQL Server responses are unaffected.
+
+## Contributors
+
+We thank the following public contributors. Their efforts toward this project are very much appreciated.
+
+- [SimonCropp](https://github.com/SimonCropp)
+
+## Target Platform Support
+
+- .NET Framework 4.6.2+ (Windows x86, Windows x64, Windows ARM64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM, Windows ARM64, Linux, macOS)
+
+### Dependencies
+
+#### .NET 9.0
+
+- Microsoft.Bcl.Cryptography 9.0.13
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.2
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.2
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 9.0.13
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.13
+- System.Security.Cryptography.Pkcs 9.0.13
+
+#### .NET 8.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.2
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.2
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+
+#### .NET Standard 2.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.2
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.2
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+
+#### .NET Framework 4.6.2+
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.2
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.2
+- Microsoft.Data.SqlClient.SNI 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- System.Buffers 4.6.1
+- System.Data.Common 4.3.0
+- System.Diagnostics.DiagnosticSource 10.0.3
+- System.Memory 4.6.3
+- System.Runtime.InteropServices.RuntimeInformation 4.3.0
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+- System.ValueTuple 4.6.2
diff --git a/release-notes/7.0/README.md b/release-notes/7.0/README.md
index 5b37ec17d8..aad84057e1 100644
--- a/release-notes/7.0/README.md
+++ b/release-notes/7.0/README.md
@@ -4,6 +4,7 @@ The following Microsoft.Data.SqlClient 7.0 releases have been shipped:
 
 | Release Date | Version | Notes |
 | :-- | :-- | :--: |
+| 2026-06-24 | 7.0.2 | [Release Notes](7.0.2.md) |
 | 2026-04-23 | 7.0.1 | [Release Notes](7.0.1.md) |
 | 2026-03-17 | 7.0.0 | [Release Notes](7.0.0.md) |
 | 2026-03-05 | 7.0.0-preview4.26064.3 | [Release Notes](7.0.0-preview4.md) |
diff --git a/release-notes/Extensions/Abstractions/7.0/7.0.2.md b/release-notes/Extensions/Abstractions/7.0/7.0.2.md
new file mode 100644
index 0000000000..cf742d77dd
--- /dev/null
+++ b/release-notes/Extensions/Abstractions/7.0/7.0.2.md
@@ -0,0 +1,21 @@
+# Release Notes
+
+## Stable Release 7.0.2 - 2026-06-24
+
+This release version-aligns `Microsoft.Data.SqlClient.Extensions.Abstractions` with the core `Microsoft.Data.SqlClient` driver version (`7.0.2`). The previous release of this package was `1.0.0`.
+
+There are no functional or API changes in this release. See the core [Microsoft.Data.SqlClient 7.0.2](../../../7.0/7.0.2.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** Starting with this release, this package's version tracks the core `Microsoft.Data.SqlClient` driver version.
+
+> **Breaking change (.NET Framework only):** As part of this alignment, the assembly's `AssemblyVersion` changed from `1.0.0.0` to `7.0.0.0`. On .NET Framework, `AssemblyVersion` is part of the strong-name identity, so applications that replace this assembly in an existing deployment without rebuilding must rebuild against `7.0.2` (or add a binding redirect). Applications on .NET / .NET Core are not affected.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.2
diff --git a/release-notes/Extensions/Abstractions/7.0/README.md b/release-notes/Extensions/Abstractions/7.0/README.md
new file mode 100644
index 0000000000..24f9eff90a
--- /dev/null
+++ b/release-notes/Extensions/Abstractions/7.0/README.md
@@ -0,0 +1,10 @@
+# Microsoft.Data.SqlClient.Extensions.Abstractions 7.0 Releases
+
+The following `Microsoft.Data.SqlClient.Extensions.Abstractions`
+7.0 releases have been shipped:
+
+> **Breaking change (.NET Framework only):** Starting with 7.0.2, the assembly's `AssemblyVersion` is `7.0.0.0` (previously `1.0.0.0`). On .NET Framework this changes the strong-name identity, so applications that replace this assembly without rebuilding must rebuild against 7.0.2 or add a binding redirect. Applications on .NET / .NET Core are not affected.
+
+| Release Date | Description | Notes |
+| :-- | :-- | :--: |
+| 2026-06-24 | 7.0.2 | [Release Notes](7.0.2.md) |
diff --git a/release-notes/Extensions/Azure/7.0/7.0.2.md b/release-notes/Extensions/Azure/7.0/7.0.2.md
new file mode 100644
index 0000000000..c4945d83c8
--- /dev/null
+++ b/release-notes/Extensions/Azure/7.0/7.0.2.md
@@ -0,0 +1,76 @@
+# Release Notes
+
+## Stable Release 7.0.2 - 2026-06-24
+
+This update brings the following changes since the [1.0.0](../1.0/1.0.0.md) release of `Microsoft.Data.SqlClient.Extensions.Azure`.
+
+> **Version alignment:** Starting with this release, the package version is aligned with the core `Microsoft.Data.SqlClient` driver version (`7.0.2`). The previous release of this package was `1.0.0`.
+
+> **Breaking change (.NET Framework only):** As part of this alignment, the assembly's `AssemblyVersion` changed from `1.0.0.0` to `7.0.0.0`. On .NET Framework, `AssemblyVersion` is part of the strong-name identity, so applications that replace this assembly in an existing deployment without rebuilding must rebuild against `7.0.2` (or add a binding redirect). Applications on .NET / .NET Core are not affected.
+
+### Added
+
+#### WAM broker support for Entra ID authentication (Windows only)
+
+*What Changed:*
+
+- Added support for the [Web Account Manager (WAM)](https://learn.microsoft.com/entra/msal/dotnet/acquiring-tokens/desktop-mobile/wam) broker for Microsoft Entra ID authentication flows. A new `ActiveDirectoryAuthenticationProviderOptions` options bag and a corresponding `ActiveDirectoryAuthenticationProvider(ActiveDirectoryAuthenticationProviderOptions options)` constructor were introduced, exposing a `UseWamBroker` property (alongside `ApplicationClientId` and `DeviceCodeFlowCallback`).
+- Added a cross-platform `SetParentActivityOrWindowFunc(Func<object>?)` method so callers can supply the parent window/activity used for interactive authentication UI — a window handle on Windows (where it also integrates with the WAM broker), or an `Activity`/`UIViewController` on Android/iOS. This supersedes the .NET Framework-only `SetIWin32WindowFunc`.
+  ([#4288](https://github.com/dotnet/SqlClient/pull/4288),
+   [#4388](https://github.com/dotnet/SqlClient/pull/4388))
+
+*Who Benefits:*
+
+- Applications using `ActiveDirectoryInteractive` and other supported Entra ID authentication modes on Windows benefit from the WAM broker's improved security (tokens are brokered by the OS), single sign-on with the logged-in Windows account, and support for Conditional Access and Windows Hello.
+
+*Impact:*
+
+- Enable the WAM broker by setting `ActiveDirectoryAuthenticationProviderOptions.UseWamBroker` to `true` and passing the options to the new constructor. Consider enabling it when you want OS-brokered token security, single sign-on with the signed-in Windows account, or support for Conditional Access and Windows Hello.
+- `UseWamBroker` is a **Windows-only** setting and has no effect on non-Windows platforms, where interactive Entra ID flows always use the system browser.
+- Prefer the new options-bag constructor over the positional-argument overloads in new code.
+
+```c#
+var options = new ActiveDirectoryAuthenticationProviderOptions
+{
+    ApplicationClientId = "<your-app-client-id>",
+    UseWamBroker = true, // Windows only
+};
+var provider = new ActiveDirectoryAuthenticationProvider(options);
+SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryInteractive, provider);
+```
+
+- A new `AzureSqlConnector` sample demonstrating interactive Entra ID authentication with and without the WAM broker was added under [doc/apps/AzureSqlConnector](../../../../doc/apps/AzureSqlConnector/README.md).
+
+### Changed
+
+- Updated Dependencies
+  ([#4288](https://github.com/dotnet/SqlClient/pull/4288)):
+  - Added `Microsoft.Identity.Client.Broker` v4.84.2 (required for WAM broker support).
+  - Updated `Microsoft.Identity.Client` to v4.84.2.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+- .NET Framework 4.6.2+
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.51.1
+- Azure.Identity 1.18.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.2
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+
+#### .NET Framework 4.6.2+
+
+- Azure.Core 1.51.1
+- Azure.Identity 1.18.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.2
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
diff --git a/release-notes/Extensions/Azure/7.0/README.md b/release-notes/Extensions/Azure/7.0/README.md
new file mode 100644
index 0000000000..93b90c690d
--- /dev/null
+++ b/release-notes/Extensions/Azure/7.0/README.md
@@ -0,0 +1,10 @@
+# Microsoft.Data.SqlClient.Extensions.Azure 7.0 Releases
+
+The following `Microsoft.Data.SqlClient.Extensions.Azure`
+7.0 releases have been shipped:
+
+> **Breaking change (.NET Framework only):** Starting with 7.0.2, the assembly's `AssemblyVersion` is `7.0.0.0` (previously `1.0.0.0`). On .NET Framework this changes the strong-name identity, so applications that replace this assembly without rebuilding must rebuild against 7.0.2 or add a binding redirect. Applications on .NET / .NET Core are not affected.
+
+| Release Date | Description | Notes |
+| :-- | :-- | :--: |
+| 2026-06-24 | 7.0.2 | [Release Notes](7.0.2.md) |
diff --git a/release-notes/Internal/Logging/7.0/7.0.2.md b/release-notes/Internal/Logging/7.0/7.0.2.md
new file mode 100644
index 0000000000..5a1873006d
--- /dev/null
+++ b/release-notes/Internal/Logging/7.0/7.0.2.md
@@ -0,0 +1,24 @@
+# Release Notes
+
+## Stable Release 7.0.2 - 2026-06-24
+
+> **Note:** This package is for internal use by other Microsoft.Data.SqlClient packages only
+> and should not be referenced directly by application code.
+
+This release version-aligns `Microsoft.Data.SqlClient.Internal.Logging` with the core `Microsoft.Data.SqlClient` driver version (`7.0.2`). The previous release of this package was `1.0.0`.
+
+There are no functional or API changes in this release. See the core [Microsoft.Data.SqlClient 7.0.2](../../../7.0/7.0.2.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** Starting with this release, this package's version tracks the core `Microsoft.Data.SqlClient` driver version.
+
+> **Breaking change (.NET Framework only):** As part of this alignment, the assembly's `AssemblyVersion` changed from `1.0.0.0` to `7.0.0.0`. On .NET Framework, `AssemblyVersion` is part of the strong-name identity, so applications that replace this assembly in an existing deployment without rebuilding must rebuild against `7.0.2` (or add a binding redirect). Applications on .NET / .NET Core are not affected.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- None
diff --git a/release-notes/Internal/Logging/7.0/README.md b/release-notes/Internal/Logging/7.0/README.md
new file mode 100644
index 0000000000..403c61db07
--- /dev/null
+++ b/release-notes/Internal/Logging/7.0/README.md
@@ -0,0 +1,13 @@
+# Microsoft.Data.SqlClient.Internal.Logging 7.0 Releases
+
+> **Note:** This package is for internal use by other Microsoft.Data.SqlClient packages only
+> and should not be referenced directly by application code.
+
+The following `Microsoft.Data.SqlClient.Internal.Logging`
+7.0 releases have been shipped:
+
+> **Breaking change (.NET Framework only):** Starting with 7.0.2, the assembly's `AssemblyVersion` is `7.0.0.0` (previously `1.0.0.0`). On .NET Framework this changes the strong-name identity, so applications that replace this assembly without rebuilding must rebuild against 7.0.2 or add a binding redirect. Applications on .NET / .NET Core are not affected.
+
+| Release Date | Description | Notes |
+| :-- | :-- | :--: |
+| 2026-06-24 | 7.0.2 | [Release Notes](7.0.2.md) |
diff --git a/release-notes/README.md b/release-notes/README.md
index f75cc4dfb9..dc90822a2d 100644
--- a/release-notes/README.md
+++ b/release-notes/README.md
@@ -40,29 +40,32 @@ The latest stable release is
 # Microsoft.Data.SqlClient.Extensions.Abstractions Release Notes
 
 The latest release is
-[Microsoft.Data.SqlClient.Extensions.Abstractions 1.0](Extensions/Abstractions/1.0).
+[Microsoft.Data.SqlClient.Extensions.Abstractions 7.0](Extensions/Abstractions/7.0).
 
 ## Release Information
 
+- [Microsoft.Data.SqlClient.Extensions.Abstractions 7.0](Extensions/Abstractions/7.0)
 - [Microsoft.Data.SqlClient.Extensions.Abstractions 1.0](Extensions/Abstractions/1.0)
 
 # Microsoft.Data.SqlClient.Extensions.Azure Release Notes
 
 The latest release is
-[Microsoft.Data.SqlClient.Extensions.Azure 1.0](Extensions/Azure/1.0).
+[Microsoft.Data.SqlClient.Extensions.Azure 7.0](Extensions/Azure/7.0).
 
 ## Release Information
 
+- [Microsoft.Data.SqlClient.Extensions.Azure 7.0](Extensions/Azure/7.0)
 - [Microsoft.Data.SqlClient.Extensions.Azure 1.0](Extensions/Azure/1.0)
 
 
 # Microsoft.Data.SqlClient.Internal.Logging Release Notes
 
 The latest release is
-[Microsoft.Data.SqlClient.Internal.Logging 1.0](Internal/Logging/1.0).
+[Microsoft.Data.SqlClient.Internal.Logging 7.0](Internal/Logging/7.0).
 
 ## Release Information
 
+- [Microsoft.Data.SqlClient.Internal.Logging 7.0](Internal/Logging/7.0)
 - [Microsoft.Data.SqlClient.Internal.Logging 1.0](Internal/Logging/1.0)
 
 # Microsoft.SqlServer.Server Release Notes
diff --git a/release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.2.md b/release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.2.md
new file mode 100644
index 0000000000..0e3f0c43de
--- /dev/null
+++ b/release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.2.md
@@ -0,0 +1,23 @@
+# Release Notes
+
+## Stable Release 7.0.2 - 2026-06-24
+
+This release version-aligns `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` with the core `Microsoft.Data.SqlClient` driver version (`7.0.2`). The previous release of this package was [7.0.0](7.0.0.md); the package was not re-shipped for the `7.0.1` hotfix.
+
+There are no functional or API changes in this release. See the core [Microsoft.Data.SqlClient 7.0.2](../../../7.0/7.0.2.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** Starting with this release, this package's version tracks the core `Microsoft.Data.SqlClient` driver version.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.51.1
+- Azure.Security.KeyVault.Keys 4.9.0
+- Microsoft.Data.SqlClient 7.0.2
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
diff --git a/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md b/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md
index 22593ef05c..a51fe94635 100644
--- a/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md
+++ b/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md
@@ -5,5 +5,6 @@ The following `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
 
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
+| 2026-06-24 | 7.0.2 | [Release Notes](7.0.2.md) |
 | 2026-03-17 | 7.0.0 | [Release Notes](7.0.0.md) |
 | 2026-03-05 | 7.0.0-preview1.26064.3 | [Release Notes](7.0.0-preview1.md) |

From 56d2b5638e5057cf445ea9a6d356ddd34e1dc57c Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 25 Jun 2026 12:14:12 -0700
Subject: [PATCH 164/298] Upgrade gh aw workflows (#4406)

* Upgrade gh aw workflows

* Update verify action
---
 ...orkflows.agent.md => agentic-workflows.md} |  66 +-
 .github/aw/actions-lock.json                  |  23 +-
 .github/skills/agentic-workflows/SKILL.md     |  80 +++
 .github/workflows/copilot-setup-steps.yml     |   4 +-
 .github/workflows/issue-triage.lock.yml       | 607 ++++++++++++------
 .github/workflows/verify-aw-lock.yml          |   4 +-
 6 files changed, 562 insertions(+), 222 deletions(-)
 rename .github/agents/{agentic-workflows.agent.md => agentic-workflows.md} (69%)
 create mode 100644 .github/skills/agentic-workflows/SKILL.md

diff --git a/.github/agents/agentic-workflows.agent.md b/.github/agents/agentic-workflows.md
similarity index 69%
rename from .github/agents/agentic-workflows.agent.md
rename to .github/agents/agentic-workflows.md
index cd376c5b1b..b824e60580 100644
--- a/.github/agents/agentic-workflows.agent.md
+++ b/.github/agents/agentic-workflows.md
@@ -1,5 +1,6 @@
 ---
-description: GitHub Agentic Workflows (gh-aw) - Create, debug, and upgrade AI-powered workflows with intelligent prompt routing
+name: Agentic Workflows
+description: GitHub Agentic Workflows (gh-aw) - Create, debug, and upgrade AI-powered workflows with intelligent prompt routing.
 disable-model-invocation: true
 ---
 
@@ -13,13 +14,16 @@ This is a **dispatcher agent** that routes your request to the appropriate speci
 
 - **Creating new workflows**: Routes to `create` prompt
 - **Updating existing workflows**: Routes to `update` prompt
-- **Debugging workflows**: Routes to `debug` prompt  
+- **Debugging workflows**: Routes to `debug` prompt
 - **Upgrading workflows**: Routes to `upgrade-agentic-workflows` prompt
 - **Creating report-generating workflows**: Routes to `report` prompt — consult this whenever the workflow posts status updates, audits, analyses, or any structured output as issues, discussions, or comments
 - **Creating shared components**: Routes to `create-shared-agentic-workflow` prompt
 - **Fixing Dependabot PRs**: Routes to `dependabot` prompt — use this when Dependabot opens PRs that modify generated manifest files (`.github/workflows/package.json`, `.github/workflows/requirements.txt`, `.github/workflows/go.mod`). Never merge those PRs directly; instead update the source `.md` files and rerun `gh aw compile --dependabot` to bundle all fixes
 - **Analyzing test coverage**: Routes to `test-coverage` prompt — consult this whenever the workflow reads, analyzes, or reports on test coverage data from PRs or CI runs
+- **Rendering ASCII charts in markdown**: Routes to `asciicharts` guide — consult this whenever the workflow needs compact charts that render reliably in GitHub issues, comments, or discussions
 - **CLI commands and triggering workflows**: Routes to `cli-commands` guide — consult this whenever the user asks how to run, compile, debug, or manage workflows from the command line, or when they need the MCP tool equivalent of a `gh aw` command
+- **Reducing token consumption / cost optimization**: Routes to `token-optimization` guide — consult this whenever the user asks how to reduce token usage, lower costs, speed up workflows, or measure the impact of prompt changes with experiments
+- **Choosing workflow architectures and design patterns**: Routes to `patterns` guide — consult this whenever the user asks for strategy, architecture, operating models, or pattern selection for agentic workflows
 
 Workflows may optionally include:
 
@@ -31,7 +35,7 @@ Workflows may optionally include:
 - Workflow files: `.github/workflows/*.md` and `.github/workflows/**/*.md`
 - Workflow lock files: `.github/workflows/*.lock.yml`
 - Shared components: `.github/workflows/shared/*.md`
-- Configuration: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/github-agentic-workflows.md
+- Configuration: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/github-agentic-workflows.md`
 
 ## Problems This Solves
 
@@ -50,30 +54,32 @@ When you interact with this agent, it will:
 
 ## Available Prompts
 
+> **Note**: The prompt and reference files listed below are located in the [`github/gh-aw`](https://github.com/github/gh-aw) repository and are **not available locally** in this repository. Load them from their public URLs.
+
 ### Create New Workflow
 **Load when**: User wants to create a new workflow from scratch, add automation, or design a workflow that doesn't exist yet
 
-**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/create-agentic-workflow.md
+**Prompt file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/create-agentic-workflow.md`
 
 **Use cases**:
 - "Create a workflow that triages issues"
 - "I need a workflow to label pull requests"
 - "Design a weekly research automation"
 
-### Update Existing Workflow  
+### Update Existing Workflow
 **Load when**: User wants to modify, improve, or refactor an existing workflow
 
-**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/update-agentic-workflow.md
+**Prompt file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/update-agentic-workflow.md`
 
 **Use cases**:
 - "Add web-fetch tool to the issue-classifier workflow"
 - "Update the PR reviewer to use discussions instead of issues"
 - "Improve the prompt for the weekly-research workflow"
 
-### Debug Workflow  
+### Debug Workflow
 **Load when**: User needs to investigate, audit, debug, or understand a workflow, troubleshoot issues, analyze logs, or fix errors
 
-**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/debug-agentic-workflow.md
+**Prompt file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/debug-agentic-workflow.md`
 
 **Use cases**:
 - "Why is this workflow failing?"
@@ -83,7 +89,7 @@ When you interact with this agent, it will:
 ### Upgrade Agentic Workflows
 **Load when**: User wants to upgrade workflows to a new gh-aw version or fix deprecations
 
-**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/upgrade-agentic-workflows.md
+**Prompt file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/upgrade-agentic-workflows.md`
 
 **Use cases**:
 - "Upgrade all workflows to the latest version"
@@ -93,7 +99,7 @@ When you interact with this agent, it will:
 ### Create a Report-Generating Workflow
 **Load when**: The workflow being created or updated produces reports — recurring status updates, audit summaries, analyses, or any structured output posted as a GitHub issue, discussion, or comment
 
-**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/report.md
+**Prompt file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/report.md`
 
 **Use cases**:
 - "Create a weekly CI health report"
@@ -103,7 +109,7 @@ When you interact with this agent, it will:
 ### Create Shared Agentic Workflow
 **Load when**: User wants to create a reusable workflow component or wrap an MCP server
 
-**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/create-shared-agentic-workflow.md
+**Prompt file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/create-shared-agentic-workflow.md`
 
 **Use cases**:
 - "Create a shared component for Notion integration"
@@ -113,7 +119,7 @@ When you interact with this agent, it will:
 ### Fix Dependabot PRs
 **Load when**: User needs to close or fix open Dependabot PRs that update dependencies in generated manifest files (`.github/workflows/package.json`, `.github/workflows/requirements.txt`, `.github/workflows/go.mod`)
 
-**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/dependabot.md
+**Prompt file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/dependabot.md`
 
 **Use cases**:
 - "Fix the open Dependabot PRs for npm dependencies"
@@ -123,7 +129,7 @@ When you interact with this agent, it will:
 ### Analyze Test Coverage
 **Load when**: The workflow reads, analyzes, or reports test coverage — whether triggered by a PR, a schedule, or a slash command. Always consult this prompt before designing the coverage data strategy.
 
-**Prompt file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/test-coverage.md
+**Prompt file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/test-coverage.md`
 
 **Use cases**:
 - "Create a workflow that comments coverage on PRs"
@@ -133,7 +139,7 @@ When you interact with this agent, it will:
 ### CLI Commands Reference
 **Load when**: The user asks how to run, compile, debug, or manage workflows from the command line; needs the MCP tool equivalent of a `gh aw` command; or is in a restricted environment (e.g., Copilot Cloud) without direct CLI access.
 
-**Reference file**: https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/cli-commands.md
+**Reference file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/cli-commands.md`
 
 **Use cases**:
 - "How do I trigger workflow X on the main branch?"
@@ -141,12 +147,36 @@ When you interact with this agent, it will:
 - "I'm in Copilot Cloud — how do I compile a workflow?"
 - "Show me all available gh aw commands"
 
+### Token Consumption Optimization
+**Load when**: The user asks how to reduce token usage, lower workflow costs, make a workflow faster or cheaper, or measure the impact of prompt or configuration changes.
+
+**Reference file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/token-optimization.md`
+
+**Use cases**:
+- "How do I reduce the token cost of this workflow?"
+- "My workflow is too expensive — how do I optimize it?"
+- "How do I compare token usage between two runs?"
+- "Should I use gh-proxy or the MCP server?"
+- "How do I use sub-agents to reduce costs?"
+- "How do I measure the impact of a prompt change?"
+
+### Workflow Pattern Selection
+**Load when**: The user asks for architecture, strategy, operating model selection, or pattern recommendations for building agentic workflows.
+
+**Reference file**: `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/patterns.md`
+
+**Use cases**:
+- "Which pattern should I use for multi-repo rollout?"
+- "How should I structure this workflow architecture?"
+- "What pattern fits slash-command triage?"
+- "Should this be DispatchOps or DailyOps?"
+
 ## Instructions
 
 When a user interacts with you:
 
 1. **Identify the task type** from the user's request
-2. **Load the appropriate prompt** from the GitHub repository URLs listed above
+2. **Load the appropriate prompt** from the URLs listed above
 3. **Follow the loaded prompt's instructions** exactly
 4. **If uncertain**, ask clarifying questions to determine the right prompt
 
@@ -185,12 +215,12 @@ gh aw compile --validate
 
 ## Important Notes
 
-- Always reference the instructions file at https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/github-agentic-workflows.md for complete documentation
+- Always reference the instructions file at `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/github-agentic-workflows.md` for complete documentation
 - Use the MCP tool `agentic-workflows` when running in GitHub Copilot Cloud
 - Workflows must be compiled to `.lock.yml` files before running in GitHub Actions
 - **Bash tools are enabled by default** - Don't restrict bash commands unnecessarily since workflows are sandboxed by the AWF
 - Follow security best practices: minimal permissions, explicit network access, no template injection
-- **Network configuration**: Use ecosystem identifiers (`node`, `python`, `go`, etc.) or explicit FQDNs in `network.allowed`. Bare shorthands like `npm` or `pypi` are **not** valid. See https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/network.md for the full list of valid ecosystem identifiers and domain patterns.
+- **Network configuration**: Use ecosystem identifiers (`node`, `python`, `go`, etc.) or explicit FQDNs in `network.allowed`. Bare shorthands like `npm` or `pypi` are **not** valid. See `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/network.md` for the full list of valid ecosystem identifiers and domain patterns.
 - **Single-file output**: When creating a workflow, produce exactly **one** workflow `.md` file. Do not create separate documentation files (architecture docs, runbooks, usage guides, etc.). If documentation is needed, add a brief `## Usage` section inside the workflow file itself.
 - **Triggering runs**: Always use `gh aw run <workflow-name>` to trigger a workflow on demand — not `gh workflow run <file>.lock.yml`. `gh aw run` handles workflow resolution by short name, input parsing and validation, and correct run-tracking for agentic workflows. Use `--ref <branch>` to run on a specific branch.
-- **CLI commands reference**: For a complete guide on all `gh aw` commands and their MCP tool equivalents (for restricted environments), see https://github.com/github/gh-aw/blob/v0.72.1/.github/aw/cli-commands.md
+- **CLI commands reference**: For a complete guide on all `gh aw` commands and their MCP tool equivalents (for restricted environments), see `https://raw.githubusercontent.com/github/gh-aw/main/.github/aw/cli-commands.md`
diff --git a/.github/aw/actions-lock.json b/.github/aw/actions-lock.json
index 79ade5bd6f..64a0a0a93a 100644
--- a/.github/aw/actions-lock.json
+++ b/.github/aw/actions-lock.json
@@ -5,27 +5,10 @@
       "version": "v9.0.0",
       "sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
     },
-    "github/gh-aw-actions/setup@v0.72.1": {
+    "github/gh-aw-actions/setup@v0.80.9": {
       "repo": "github/gh-aw-actions/setup",
-      "version": "v0.72.1",
-      "sha": "bc56a0cad2f450c562810785ef38649c04db812a"
-    }
-  },
-  "containers": {
-    "ghcr.io/github/gh-aw-firewall/agent:0.25.41": {
-      "image": "ghcr.io/github/gh-aw-firewall/agent:0.25.41",
-      "digest": "sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770",
-      "pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770"
-    },
-    "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41": {
-      "image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41",
-      "digest": "sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0",
-      "pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0"
-    },
-    "ghcr.io/github/gh-aw-firewall/squid:0.25.41": {
-      "image": "ghcr.io/github/gh-aw-firewall/squid:0.25.41",
-      "digest": "sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4",
-      "pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4"
+      "version": "v0.80.9",
+      "sha": "8c7d04ebf1ece56cd381446125da3e0f6896294a"
     }
   }
 }
diff --git a/.github/skills/agentic-workflows/SKILL.md b/.github/skills/agentic-workflows/SKILL.md
new file mode 100644
index 0000000000..ee714d339d
--- /dev/null
+++ b/.github/skills/agentic-workflows/SKILL.md
@@ -0,0 +1,80 @@
+---
+name: agentic-workflows
+description: Route gh-aw workflow design/create/debug/upgrade requests to the right prompts.
+---
+
+# Agentic Workflows Router
+
+Use this skill when a user asks to design, create, update, debug, or upgrade GitHub Agentic Workflows in this repository.
+
+This skill is a dispatcher: identify the task type, load the matching workflow prompt/skill file, and follow it directly. Keep responses concise and ask a clarifying question if the correct prompt is unclear.
+
+Read only the files you need:
+Load these files from `github/gh-aw` (they are not available locally).
+- `.github/aw/agentic-chat.md`
+- `.github/aw/agentic-workflows-mcp.md`
+- `.github/aw/asciicharts.md`
+- `.github/aw/campaign.md`
+- `.github/aw/charts-trending.md`
+- `.github/aw/charts.md`
+- `.github/aw/cli-commands.md`
+- `.github/aw/context.md`
+- `.github/aw/create-agentic-workflow.md`
+- `.github/aw/create-shared-agentic-workflow.md`
+- `.github/aw/debug-agentic-workflow.md`
+- `.github/aw/dependabot.md`
+- `.github/aw/deployment-status.md`
+- `.github/aw/experiments.md`
+- `.github/aw/github-agentic-workflows.md`
+- `.github/aw/github-mcp-server.md`
+- `.github/aw/llms.md`
+- `.github/aw/mcp-clis.md`
+- `.github/aw/memory.md`
+- `.github/aw/messages.md`
+- `.github/aw/network.md`
+- `.github/aw/optimize-agentic-workflow.md`
+- `.github/aw/patterns.md`
+- `.github/aw/pr-reviewer.md`
+- `.github/aw/report.md`
+- `.github/aw/reuse.md`
+- `.github/aw/safe-outputs-automation.md`
+- `.github/aw/safe-outputs-content.md`
+- `.github/aw/safe-outputs-management.md`
+- `.github/aw/safe-outputs-runtime.md`
+- `.github/aw/safe-outputs.md`
+- `.github/aw/serena-tool.md`
+- `.github/aw/shared-safe-jobs.md`
+- `.github/aw/skills.md`
+- `.github/aw/subagents.md`
+- `.github/aw/syntax-agentic.md`
+- `.github/aw/syntax-core.md`
+- `.github/aw/syntax-tools-imports.md`
+- `.github/aw/syntax.md`
+- `.github/aw/test-coverage.md`
+- `.github/aw/test-expression.md`
+- `.github/aw/token-optimization.md`
+- `.github/aw/triggers.md`
+- `.github/aw/update-agentic-workflow.md`
+- `.github/aw/upgrade-agentic-workflows.md`
+- `.github/aw/visual-regression.md`
+- `.github/aw/workflow-constraints.md`
+- `.github/aw/workflow-editing.md`
+- `.github/aw/workflow-patterns.md`
+
+- `.github/skills/agentic-workflow-designer/SKILL.md`
+After loading the matching workflow prompt or skill, follow it directly:
+- Design workflows from scratch via interview: `skills/agentic-workflow-designer/SKILL.md`
+- Create new workflows: `.github/aw/create-agentic-workflow.md`
+- Update existing workflows: `.github/aw/update-agentic-workflow.md`
+- Debug, audit, or investigate workflows: `.github/aw/debug-agentic-workflow.md`
+- Upgrade workflows and fix deprecations: `.github/aw/upgrade-agentic-workflows.md`
+- Create shared components or MCP wrappers: `.github/aw/create-shared-agentic-workflow.md`
+- Create report-generating workflows: `.github/aw/report.md`
+- Fix Dependabot manifest PRs: `.github/aw/dependabot.md`
+- Analyze coverage workflows: `.github/aw/test-coverage.md`
+- Render compact markdown charts: `.github/aw/asciicharts.md`
+- Map CLI commands to MCP usage: `.github/aw/cli-commands.md`
+- Choose workflow architecture and patterns: `.github/aw/patterns.md`
+- Optimize token usage and cost: `.github/aw/token-optimization.md`
+
+When the task involves OTEL, OTLP, traces, observability backends, or telemetry-driven analysis, also read and follow `skills/otel-queries/SKILL.md` after loading the matching workflow prompt or skill.
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 0ae42f6f5c..90ca026d37 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -21,6 +21,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
       - name: Install gh-aw extension
-        uses: github/gh-aw-actions/setup-cli@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+        uses: github/gh-aw-actions/setup-cli@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
         with:
-          version: v0.72.1
+          version: v0.80.9
diff --git a/.github/workflows/issue-triage.lock.yml b/.github/workflows/issue-triage.lock.yml
index 468ce93488..886e8e2e63 100644
--- a/.github/workflows/issue-triage.lock.yml
+++ b/.github/workflows/issue-triage.lock.yml
@@ -1,5 +1,7 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"c9a288bea873cc74dd33e81e0f5784e167d990ee0e2645c1722106b45ae1f77d","compiler_version":"v0.72.1","strict":true,"agent_id":"copilot"}
-# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"bc56a0cad2f450c562810785ef38649c04db812a","version":"v0.72.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.41","digest":"sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41","digest":"sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.41","digest":"sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.6","digest":"sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.6@sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c"},{"image":"ghcr.io/github/github-mcp-server:v1.0.3","digest":"sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959","pinned_image":"ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959"},{"image":"node:lts-alpine","digest":"sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f","pinned_image":"node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f"}]}
+# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"c9a288bea873cc74dd33e81e0f5784e167d990ee0e2645c1722106b45ae1f77d","body_hash":"99b21e9ba167d3bfbcfaeb3b04c515fc42b56679f0ee175c119bc5843f034d31","compiler_version":"v0.80.9","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.63"}}
+# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/cache/restore","sha":"27d5ce7f107fe9357f9df03efb73ab90386fccae","version":"v5.0.5"},{"repo":"actions/cache/save","sha":"27d5ce7f107fe9357f9df03efb73ab90386fccae","version":"v5.0.5"},{"repo":"actions/checkout","sha":"9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0","version":"v7.0.0"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"8c7d04ebf1ece56cd381446125da3e0f6896294a","version":"v0.80.9"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.27.7","digest":"sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.27.7@sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.7","digest":"sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.7@sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.27.7","digest":"sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.27.7@sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.27","digest":"sha256:fe984bddde4ec05d756d9043edb0a32912e6b7b72f6a121b1082f29221421cc7","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.27@sha256:fe984bddde4ec05d756d9043edb0a32912e6b7b72f6a121b1082f29221421cc7"},{"image":"ghcr.io/github/gh-aw-node","digest":"sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b","pinned_image":"ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b"},{"image":"ghcr.io/github/github-mcp-server:v1.4.0","digest":"sha256:2afb26356481d1a350e14544a6e160f7f7ec1561a1ea309b823665abf0309036","pinned_image":"ghcr.io/github/github-mcp-server:v1.4.0@sha256:2afb26356481d1a350e14544a6e160f7f7ec1561a1ea309b823665abf0309036"}]}
+# This file was automatically generated by gh-aw (v0.80.9). DO NOT EDIT. To debug this workflow, load the skill at https://github.com/github/gh-aw/blob/main/debug.md
+#
 #    ___                   _   _      
 #   / _ \                 | | (_)     
 #  | |_| | __ _  ___ _ __ | |_ _  ___ 
@@ -14,7 +16,6 @@
 # \  /\  / (_) | | | | ( | | | | (_) \ V  V /\__ \
 #  \/  \/ \___/|_| |_|\_\|_| |_|\___/ \_/\_/ |___/
 #
-# This file was automatically generated by gh-aw (v0.72.1). DO NOT EDIT.
 #
 # To update this file, edit the corresponding .md file and run:
 #   gh aw compile
@@ -30,23 +31,25 @@
 #   - GITHUB_TOKEN
 #
 # Custom actions used:
-#   - actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+#   - actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+#   - actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+#   - actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 #   - actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
 #   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
 #   - actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
 #   - actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-#   - github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+#   - github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
 #
 # Container images used:
-#   - ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770
-#   - ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0
-#   - ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4
-#   - ghcr.io/github/gh-aw-mcpg:v0.3.6@sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c
-#   - ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959
-#   - node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f
+#   - ghcr.io/github/gh-aw-firewall/agent:0.27.7@sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c
+#   - ghcr.io/github/gh-aw-firewall/api-proxy:0.27.7@sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6
+#   - ghcr.io/github/gh-aw-firewall/squid:0.27.7@sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96
+#   - ghcr.io/github/gh-aw-mcpg:v0.3.27@sha256:fe984bddde4ec05d756d9043edb0a32912e6b7b72f6a121b1082f29221421cc7
+#   - ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b
+#   - ghcr.io/github/github-mcp-server:v1.4.0@sha256:2afb26356481d1a350e14544a6e160f7f7ec1561a1ea309b823665abf0309036
 
 name: "SqlClient Issue Auto-Triage"
-"on":
+on:
   issue_comment:
     types:
     - created
@@ -82,13 +85,20 @@ jobs:
     permissions:
       actions: read
       contents: read
+    env:
+      GH_AW_MAX_DAILY_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_DAILY_AI_CREDITS || '5000' }}
     outputs:
       body: ${{ steps.sanitized.outputs.body }}
       comment_id: ""
       comment_repo: ""
+      daily_ai_credits_exceeded: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_exceeded == 'true' }}
+      daily_ai_credits_threshold: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_threshold || '' }}
+      daily_ai_credits_total_effective_tokens: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_total_effective_tokens || '' }}
       engine_id: ${{ steps.generate_aw_info.outputs.engine_id }}
       lockdown_check_failed: ${{ steps.generate_aw_info.outputs.lockdown_check_failed == 'true' }}
       model: ${{ steps.generate_aw_info.outputs.model }}
+      setup-parent-span-id: ${{ steps.setup.outputs.parent-span-id || steps.setup.outputs.span-id }}
+      setup-span-id: ${{ steps.setup.outputs.span-id }}
       setup-trace-id: ${{ steps.setup.outputs.trace-id }}
       stale_lock_file_failed: ${{ steps.check-lock-file.outputs.stale_lock_file_failed == 'true' }}
       text: ${{ steps.sanitized.outputs.text }}
@@ -96,30 +106,33 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+        uses: github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
+          safe-output-artifact-client: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.40"
+          GH_AW_INFO_VERSION: "1.0.63"
+          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Generate agentic run info
         id: generate_aw_info
         env:
           GH_AW_INFO_ENGINE_ID: "copilot"
           GH_AW_INFO_ENGINE_NAME: "GitHub Copilot CLI"
-          GH_AW_INFO_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || 'claude-sonnet-4.6' }}
-          GH_AW_INFO_VERSION: "1.0.40"
-          GH_AW_INFO_AGENT_VERSION: "1.0.40"
-          GH_AW_INFO_CLI_VERSION: "v0.72.1"
+          GH_AW_INFO_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'claude-sonnet-4.6' }}
+          GH_AW_INFO_VERSION: "1.0.63"
+          GH_AW_INFO_AGENT_VERSION: "1.0.63"
+          GH_AW_INFO_CLI_VERSION: "v0.80.9"
           GH_AW_INFO_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_INFO_EXPERIMENTAL: "false"
           GH_AW_INFO_SUPPORTS_TOOLS_ALLOWLIST: "true"
           GH_AW_INFO_STAGED: "false"
           GH_AW_INFO_ALLOWED_DOMAINS: '["defaults"]'
           GH_AW_INFO_FIREWALL_ENABLED: "true"
-          GH_AW_INFO_AWF_VERSION: "v0.25.41"
+          GH_AW_INFO_AWF_VERSION: "v0.27.7"
           GH_AW_INFO_AWMG_VERSION: ""
           GH_AW_INFO_FIREWALL_TYPE: "squid"
           GH_AW_COMPILED_STRICT: "true"
@@ -130,13 +143,58 @@ jobs:
             setupGlobals(core, github, context, exec, io, getOctokit);
             const { main } = require('${{ runner.temp }}/gh-aw/actions/generate_aw_info.cjs');
             await main(core, context);
+      - name: Restore daily AIC usage cache
+        id: restore-daily-aic-cache
+        if: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
+        continue-on-error: true
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          key: agentic-workflow-usage-issuetriage-${{ github.run_id }}
+          restore-keys: agentic-workflow-usage-issuetriage-
+          path: /tmp/gh-aw/agentic-workflow-usage-cache.jsonl
+      - name: Restore daily AIC usage cache (artifact fallback)
+        id: restore-daily-aic-cache-fallback
+        if: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_RESTORE_DAILY_AIC_CACHE_HIT: ${{ steps.restore-daily-aic-cache.outputs.cache-hit }}
+          GH_AW_RESTORE_DAILY_AIC_CACHE_MATCHED_KEY: ${{ steps.restore-daily-aic-cache.outputs.cache-matched-key }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/restore_aic_usage_cache_fallback.cjs');
+            await main();
+      - name: Check daily workflow token guardrail
+        id: daily-effective-workflow-guardrail
+        if: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_WORKFLOW_ID: "issue-triage"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_WORKFLOW_DISPATCH_AW_CONTEXT: ${{ github.event.inputs.aw_context || '' }}
+          GH_AW_HAS_SLASH_COMMAND: "false"
+          GH_AW_HAS_LABEL_COMMAND: "false"
+          GH_AW_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_AW_MAX_DAILY_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_DAILY_AI_CREDITS || '5000' }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/check_daily_aic_workflow_guardrail.cjs');
+            await main();
       - name: Checkout .github and .agents folders
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
           sparse-checkout: |
             .github
             .agents
+            .antigravity
             .claude
             .codex
             .crush
@@ -147,8 +205,8 @@ jobs:
           fetch-depth: 1
       - name: Save agent config folders for base branch restoration
         env:
-          GH_AW_AGENT_FOLDERS: ".agents .claude .codex .crush .gemini .github .opencode .pi"
-          GH_AW_AGENT_FILES: ".crush.json AGENTS.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
+          GH_AW_AGENT_FOLDERS: ".agents .antigravity .claude .codex .crush .gemini .github .opencode .pi"
+          GH_AW_AGENT_FILES: ".crush.json AGENTS.md ANTIGRAVITY.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
         # poutine:ignore untrusted_checkout_exec
         run: bash "${RUNNER_TEMP}/gh-aw/actions/save_base_github_folders.sh"
       - name: Check workflow lock file
@@ -166,7 +224,7 @@ jobs:
       - name: Check compile-agentic version
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          GH_AW_COMPILED_VERSION: "v0.72.1"
+          GH_AW_COMPILED_VERSION: "v0.80.9"
         with:
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -188,11 +246,11 @@ jobs:
         env:
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
           GH_AW_SAFE_OUTPUTS: ${{ runner.temp }}/gh-aw/safeoutputs/outputs.jsonl
+          GH_AW_EXPR_1A3A194A: ${{ github.event.discussion.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'discussion' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_463A214A: ${{ github.event.pull_request.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'pull_request' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_802A9F6A: ${{ github.event.issue.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'issue' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_FF1D34CE: ${{ github.event.comment.id || fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').comment_id }}
           GH_AW_GITHUB_ACTOR: ${{ github.actor }}
-          GH_AW_GITHUB_EVENT_COMMENT_ID: ${{ github.event.comment.id }}
-          GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER: ${{ github.event.discussion.number }}
-          GH_AW_GITHUB_EVENT_ISSUE_NUMBER: ${{ github.event.issue.number }}
-          GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
           GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
           GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
           GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
@@ -201,57 +259,57 @@ jobs:
         run: |
           bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
           {
-          cat << 'GH_AW_PROMPT_671235e4d67f4971_EOF'
+          cat << 'GH_AW_PROMPT_09a4b5a8a8b33a81_EOF'
           <system>
-          GH_AW_PROMPT_671235e4d67f4971_EOF
+          GH_AW_PROMPT_09a4b5a8a8b33a81_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_671235e4d67f4971_EOF'
+          cat << 'GH_AW_PROMPT_09a4b5a8a8b33a81_EOF'
           <safe-output-tools>
           Tools: add_comment, add_labels, remove_labels, missing_tool, missing_data, noop
           </safe-output-tools>
-          GH_AW_PROMPT_671235e4d67f4971_EOF
+          GH_AW_PROMPT_09a4b5a8a8b33a81_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          cat << 'GH_AW_PROMPT_671235e4d67f4971_EOF'
+          cat << 'GH_AW_PROMPT_09a4b5a8a8b33a81_EOF'
           <github-context>
           The following GitHub context information is available for this workflow:
-          {{#if __GH_AW_GITHUB_ACTOR__ }}
+          {{#if github.actor}}
           - **actor**: __GH_AW_GITHUB_ACTOR__
           {{/if}}
-          {{#if __GH_AW_GITHUB_REPOSITORY__ }}
+          {{#if github.repository}}
           - **repository**: __GH_AW_GITHUB_REPOSITORY__
           {{/if}}
-          {{#if __GH_AW_GITHUB_WORKSPACE__ }}
+          {{#if github.workspace}}
           - **workspace**: __GH_AW_GITHUB_WORKSPACE__
           {{/if}}
-          {{#if __GH_AW_GITHUB_EVENT_ISSUE_NUMBER__ }}
-          - **issue-number**: #__GH_AW_GITHUB_EVENT_ISSUE_NUMBER__
+          {{#if github.event.issue.number || (github.aw.context.item_type == 'issue' && github.aw.context.item_number)}}
+          - **issue-number**: #__GH_AW_EXPR_802A9F6A__
           {{/if}}
-          {{#if __GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER__ }}
-          - **discussion-number**: #__GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER__
+          {{#if github.event.discussion.number || (github.aw.context.item_type == 'discussion' && github.aw.context.item_number)}}
+          - **discussion-number**: #__GH_AW_EXPR_1A3A194A__
           {{/if}}
-          {{#if __GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER__ }}
-          - **pull-request-number**: #__GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER__
+          {{#if github.event.pull_request.number || (github.aw.context.item_type == 'pull_request' && github.aw.context.item_number)}}
+          - **pull-request-number**: #__GH_AW_EXPR_463A214A__
           {{/if}}
-          {{#if __GH_AW_GITHUB_EVENT_COMMENT_ID__ }}
-          - **comment-id**: __GH_AW_GITHUB_EVENT_COMMENT_ID__
+          {{#if github.event.comment.id || github.aw.context.comment_id}}
+          - **comment-id**: __GH_AW_EXPR_FF1D34CE__
           {{/if}}
-          {{#if __GH_AW_GITHUB_RUN_ID__ }}
+          {{#if github.run_id}}
           - **workflow-run-id**: __GH_AW_GITHUB_RUN_ID__
           {{/if}}
           </github-context>
           
-          GH_AW_PROMPT_671235e4d67f4971_EOF
+          GH_AW_PROMPT_09a4b5a8a8b33a81_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          cat << 'GH_AW_PROMPT_671235e4d67f4971_EOF'
+          cat << 'GH_AW_PROMPT_09a4b5a8a8b33a81_EOF'
           </system>
           {{#runtime-import .github/workflows/issue-triage.md}}
-          GH_AW_PROMPT_671235e4d67f4971_EOF
+          GH_AW_PROMPT_09a4b5a8a8b33a81_EOF
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -268,11 +326,11 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_EXPR_1A3A194A: ${{ github.event.discussion.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'discussion' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_463A214A: ${{ github.event.pull_request.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'pull_request' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_802A9F6A: ${{ github.event.issue.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'issue' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
+          GH_AW_EXPR_FF1D34CE: ${{ github.event.comment.id || fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').comment_id }}
           GH_AW_GITHUB_ACTOR: ${{ github.actor }}
-          GH_AW_GITHUB_EVENT_COMMENT_ID: ${{ github.event.comment.id }}
-          GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER: ${{ github.event.discussion.number }}
-          GH_AW_GITHUB_EVENT_ISSUE_NUMBER: ${{ github.event.issue.number }}
-          GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
           GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
           GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
           GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
@@ -289,11 +347,11 @@ jobs:
             return await substitutePlaceholders({
               file: process.env.GH_AW_PROMPT,
               substitutions: {
+                GH_AW_EXPR_1A3A194A: process.env.GH_AW_EXPR_1A3A194A,
+                GH_AW_EXPR_463A214A: process.env.GH_AW_EXPR_463A214A,
+                GH_AW_EXPR_802A9F6A: process.env.GH_AW_EXPR_802A9F6A,
+                GH_AW_EXPR_FF1D34CE: process.env.GH_AW_EXPR_FF1D34CE,
                 GH_AW_GITHUB_ACTOR: process.env.GH_AW_GITHUB_ACTOR,
-                GH_AW_GITHUB_EVENT_COMMENT_ID: process.env.GH_AW_GITHUB_EVENT_COMMENT_ID,
-                GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER: process.env.GH_AW_GITHUB_EVENT_DISCUSSION_NUMBER,
-                GH_AW_GITHUB_EVENT_ISSUE_NUMBER: process.env.GH_AW_GITHUB_EVENT_ISSUE_NUMBER,
-                GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER: process.env.GH_AW_GITHUB_EVENT_PULL_REQUEST_NUMBER,
                 GH_AW_GITHUB_REPOSITORY: process.env.GH_AW_GITHUB_REPOSITORY,
                 GH_AW_GITHUB_RUN_ID: process.env.GH_AW_GITHUB_RUN_ID,
                 GH_AW_GITHUB_WORKSPACE: process.env.GH_AW_GITHUB_WORKSPACE,
@@ -319,17 +377,20 @@ jobs:
           include-hidden-files: true
           path: |
             /tmp/gh-aw/aw_info.json
+            /tmp/gh-aw/models.json
             /tmp/gh-aw/aw-prompts/prompt.txt
             /tmp/gh-aw/aw-prompts/prompt-template.txt
             /tmp/gh-aw/aw-prompts/prompt-import-tree.json
             /tmp/gh-aw/github_rate_limits.jsonl
             /tmp/gh-aw/base
             /tmp/gh-aw/.github/agents
+            /tmp/gh-aw/.github/skills
           if-no-files-found: ignore
           retention-days: 1
 
   agent:
     needs: activation
+    if: needs.activation.outputs.daily_ai_credits_exceeded != 'true'
     runs-on: ubuntu-latest
     environment: issue-triage
     permissions:
@@ -344,29 +405,38 @@ jobs:
       GH_AW_MCP_LOG_DIR: /tmp/gh-aw/mcp-logs/safeoutputs
       GH_AW_WORKFLOW_ID_SANITIZED: issuetriage
     outputs:
-      agentic_engine_timeout: ${{ steps.detect-copilot-errors.outputs.agentic_engine_timeout || 'false' }}
+      agentic_engine_timeout: ${{ steps.detect-agent-errors.outputs.agentic_engine_timeout || 'false' }}
+      ai_credits_rate_limit_error: ${{ steps.parse-mcp-gateway.outputs.ai_credits_rate_limit_error || 'false' }}
+      aic: ${{ steps.parse-mcp-gateway.outputs.aic }}
+      ambient_context: ${{ steps.parse-mcp-gateway.outputs.ambient_context }}
       checkout_pr_success: ${{ steps.checkout-pr.outputs.checkout_pr_success || 'true' }}
       effective_tokens: ${{ steps.parse-mcp-gateway.outputs.effective_tokens }}
       has_patch: ${{ steps.collect_output.outputs.has_patch }}
-      inference_access_error: ${{ steps.detect-copilot-errors.outputs.inference_access_error || 'false' }}
-      mcp_policy_error: ${{ steps.detect-copilot-errors.outputs.mcp_policy_error || 'false' }}
+      inference_access_error: ${{ steps.detect-agent-errors.outputs.inference_access_error || 'false' }}
+      mcp_policy_error: ${{ steps.detect-agent-errors.outputs.mcp_policy_error || 'false' }}
       model: ${{ needs.activation.outputs.model }}
-      model_not_supported_error: ${{ steps.detect-copilot-errors.outputs.model_not_supported_error || 'false' }}
+      model_not_supported_error: ${{ steps.detect-agent-errors.outputs.model_not_supported_error || 'false' }}
       output: ${{ steps.collect_output.outputs.output }}
       output_types: ${{ steps.collect_output.outputs.output_types }}
+      setup-parent-span-id: ${{ steps.setup.outputs.parent-span-id || steps.setup.outputs.span-id }}
+      setup-span-id: ${{ steps.setup.outputs.span-id }}
       setup-trace-id: ${{ steps.setup.outputs.trace-id }}
+      unknown_model_ai_credits: ${{ steps.parse-mcp-gateway.outputs.unknown_model_ai_credits || 'false' }}
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+        uses: github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+          parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.40"
+          GH_AW_INFO_VERSION: "1.0.63"
+          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Set runtime paths
         id: set-runtime-paths
         run: |
@@ -376,7 +446,7 @@ jobs:
             echo "GH_AW_SAFE_OUTPUTS_TOOLS_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/tools.json"
           } >> "$GITHUB_OUTPUT"
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Create gh-aw temp directory
@@ -387,21 +457,14 @@ jobs:
           GH_TOKEN: ${{ github.token }}
       - name: Configure Git credentials
         env:
-          REPO_NAME: ${{ github.repository }}
-          SERVER_URL: ${{ github.server_url }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "github-actions[bot]"
-          git config --global am.keepcr true
-          # Re-authenticate git with GitHub token
-          SERVER_URL_STRIPPED="${SERVER_URL#https://}"
-          git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@${SERVER_URL_STRIPPED}/${REPO_NAME}.git"
-          echo "Git configured with standard GitHub Actions identity"
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/configure_git_credentials.sh"
       - name: Checkout PR branch
         id: checkout-pr
         if: |
-          github.event.pull_request || github.event.issue.pull_request
+          github.event.pull_request || github.event.issue.pull_request || github.event_name == 'workflow_dispatch' && fromJSON(github.event.inputs.aw_context || '{}').item_type == 'pull_request'
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
@@ -413,11 +476,11 @@ jobs:
             const { main } = require('${{ runner.temp }}/gh-aw/actions/checkout_pr_branch.cjs');
             await main();
       - name: Install GitHub Copilot CLI
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.40
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.63
         env:
           GH_HOST: github.com
       - name: Install AWF binary
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.41
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.27.7
       - name: Parse integrity filter lists
         id: parse-guard-vars
         env:
@@ -433,24 +496,28 @@ jobs:
       - name: Restore agent config folders from base branch
         if: steps.checkout-pr.outcome == 'success'
         env:
-          GH_AW_AGENT_FOLDERS: ".agents .claude .codex .crush .gemini .github .opencode .pi"
-          GH_AW_AGENT_FILES: ".crush.json AGENTS.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
+          GH_AW_AGENT_FOLDERS: ".agents .antigravity .claude .codex .crush .gemini .github .opencode .pi"
+          GH_AW_AGENT_FILES: ".crush.json AGENTS.md ANTIGRAVITY.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
         run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_base_github_folders.sh"
       - name: Restore inline sub-agents from activation artifact
         env:
           GH_AW_SUB_AGENT_DIR: ".github/agents"
           GH_AW_SUB_AGENT_EXT: ".agent.md"
         run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_inline_sub_agents.sh"
+      - name: Restore inline skills from activation artifact
+        env:
+          GH_AW_SKILL_DIR: ".github/skills"
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_inline_skills.sh"
       - name: Download container images
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770 ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0 ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4 ghcr.io/github/gh-aw-mcpg:v0.3.6@sha256:2bb8eef86006a4c5963c55616a9c51c32f27bfdecb023b8aa6f91f6718d9171c ghcr.io/github/github-mcp-server:v1.0.3@sha256:2ac27ef03461ef2b877031b838a7d1fd7f12b12d4ace7796d8cad91446d55959 node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.27.7@sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c ghcr.io/github/gh-aw-firewall/api-proxy:0.27.7@sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6 ghcr.io/github/gh-aw-firewall/squid:0.27.7@sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96 ghcr.io/github/gh-aw-mcpg:v0.3.27@sha256:fe984bddde4ec05d756d9043edb0a32912e6b7b72f6a121b1082f29221421cc7 ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b ghcr.io/github/github-mcp-server:v1.4.0@sha256:2afb26356481d1a350e14544a6e160f7f7ec1561a1ea309b823665abf0309036
       - name: Generate Safe Outputs Config
         run: |
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_2171a9d22dc2eb73_EOF'
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_723da9f6aa534eb7_EOF'
           {"add_comment":{"hide_older_comments":true,"max":1},"add_labels":{"allowed":["Auto-Triage: Waiting for Author"],"max":1},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"false"},"remove_labels":{"allowed":["Auto-Triage: Waiting for Author"],"max":1},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_2171a9d22dc2eb73_EOF
+          GH_AW_SAFE_OUTPUTS_CONFIG_723da9f6aa534eb7_EOF
       - name: Generate Safe Outputs Tools
         env:
           GH_AW_TOOLS_META_JSON: |
@@ -606,53 +673,14 @@ jobs:
             setupGlobals(core, github, context, exec, io, getOctokit);
             const { main } = require('${{ runner.temp }}/gh-aw/actions/generate_safe_outputs_tools.cjs');
             await main();
-      - name: Generate Safe Outputs MCP Server Config
-        id: safe-outputs-config
-        run: |
-          # Generate a secure random API key (360 bits of entropy, 40+ chars)
-          # Mask immediately to prevent timing vulnerabilities
-          API_KEY=$(openssl rand -base64 45 | tr -d '/+=')
-          echo "::add-mask::${API_KEY}"
-          
-          PORT=3001
-          
-          # Set outputs for next steps
-          {
-            echo "safe_outputs_api_key=${API_KEY}"
-            echo "safe_outputs_port=${PORT}"
-          } >> "$GITHUB_OUTPUT"
-          
-          echo "Safe Outputs MCP server will run on port ${PORT}"
-          
-      - name: Start Safe Outputs MCP HTTP Server
-        id: safe-outputs-start
-        env:
-          DEBUG: '*'
-          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
-          GH_AW_SAFE_OUTPUTS_PORT: ${{ steps.safe-outputs-config.outputs.safe_outputs_port }}
-          GH_AW_SAFE_OUTPUTS_API_KEY: ${{ steps.safe-outputs-config.outputs.safe_outputs_api_key }}
-          GH_AW_SAFE_OUTPUTS_TOOLS_PATH: ${{ runner.temp }}/gh-aw/safeoutputs/tools.json
-          GH_AW_SAFE_OUTPUTS_CONFIG_PATH: ${{ runner.temp }}/gh-aw/safeoutputs/config.json
-          GH_AW_MCP_LOG_DIR: /tmp/gh-aw/mcp-logs/safeoutputs
-        run: |
-          # Environment variables are set above to prevent template injection
-          export DEBUG
-          export GH_AW_SAFE_OUTPUTS
-          export GH_AW_SAFE_OUTPUTS_PORT
-          export GH_AW_SAFE_OUTPUTS_API_KEY
-          export GH_AW_SAFE_OUTPUTS_TOOLS_PATH
-          export GH_AW_SAFE_OUTPUTS_CONFIG_PATH
-          export GH_AW_MCP_LOG_DIR
-          
-          bash "${RUNNER_TEMP}/gh-aw/actions/start_safe_outputs_server.sh"
-          
       - name: Start MCP Gateway
         id: start-mcp-gateway
         env:
           GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
-          GH_AW_SAFE_OUTPUTS_API_KEY: ${{ steps.safe-outputs-start.outputs.api_key }}
-          GH_AW_SAFE_OUTPUTS_PORT: ${{ steps.safe-outputs-start.outputs.port }}
+          GH_AW_SAFE_OUTPUTS_CONFIG_PATH: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS_CONFIG_PATH }}
+          GH_AW_SAFE_OUTPUTS_TOOLS_PATH: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS_TOOLS_PATH }}
           GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -eo pipefail
           mkdir -p "${RUNNER_TEMP}/gh-aw/mcp-config"
@@ -672,17 +700,22 @@ jobs:
           export GH_AW_ENGINE="copilot"
           MCP_GATEWAY_UID=$(id -u 2>/dev/null || echo '0')
           MCP_GATEWAY_GID=$(id -g 2>/dev/null || echo '0')
-          DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
-          export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GH_AW_SAFE_OUTPUTS_PORT -e GH_AW_SAFE_OUTPUTS_API_KEY -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.6'
+          case "${DOCKER_HOST:-}" in
+            unix://* ) DOCKER_SOCK_PATH="${DOCKER_HOST#unix://}" ;;
+            /* ) DOCKER_SOCK_PATH="$DOCKER_HOST" ;;
+            * ) DOCKER_SOCK_PATH=/var/run/docker.sock ;;
+          esac
+          DOCKER_SOCK_GID=$(stat -c '%g' "$DOCKER_SOCK_PATH" 2>/dev/null || echo '0')
+          export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --name awmg-mcpg --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v '"${DOCKER_SOCK_PATH}"':/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DOCKER_HOST=unix:///var/run/docker.sock -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e RUNNER_TEMP -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw -v '"${RUNNER_TEMP}"'/gh-aw/safeoutputs:'"${RUNNER_TEMP}"'/gh-aw/safeoutputs:rw ghcr.io/github/gh-aw-mcpg:v0.3.27'
           
-          mkdir -p /home/runner/.copilot
+          mkdir -p "$HOME/.copilot"
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_e021cf5fa19f3aa2_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_4b806ec8e0233008_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
               "github": {
                 "type": "stdio",
-                "container": "ghcr.io/github/github-mcp-server:v1.0.3",
+                "container": "ghcr.io/github/github-mcp-server:v1.4.0",
                 "env": {
                   "GITHUB_HOST": "\${GITHUB_SERVER_URL}",
                   "GITHUB_PERSONAL_ACCESS_TOKEN": "\${GITHUB_MCP_SERVER_TOKEN}",
@@ -700,10 +733,26 @@ jobs:
                 }
               },
               "safeoutputs": {
-                "type": "http",
-                "url": "http://host.docker.internal:$GH_AW_SAFE_OUTPUTS_PORT",
-                "headers": {
-                  "Authorization": "\${GH_AW_SAFE_OUTPUTS_API_KEY}"
+                "type": "stdio",
+                "container": "ghcr.io/github/gh-aw-node",
+                "mounts": ["\${GITHUB_WORKSPACE}:\${GITHUB_WORKSPACE}:rw", "${RUNNER_TEMP}/gh-aw/safeoutputs:${RUNNER_TEMP}/gh-aw/safeoutputs:rw", "/tmp/gh-aw:/tmp/gh-aw:rw"],
+                "args": ["-w", "\${GITHUB_WORKSPACE}"],
+                "entrypoint": "sh",
+                "entrypointArgs": ["-c", "sh ${RUNNER_TEMP}/gh-aw/safeoutputs/start_safe_outputs_mcp.sh"],
+                "env": {
+                  "DEBUG": "*",
+                  "DEFAULT_BRANCH": "\${DEFAULT_BRANCH}",
+                  "GH_AW_ASSETS_ALLOWED_EXTS": "\${GH_AW_ASSETS_ALLOWED_EXTS}",
+                  "GH_AW_ASSETS_BRANCH": "\${GH_AW_ASSETS_BRANCH}",
+                  "GH_AW_ASSETS_MAX_SIZE_KB": "\${GH_AW_ASSETS_MAX_SIZE_KB}",
+                  "GH_AW_MCP_LOG_DIR": "\${GH_AW_MCP_LOG_DIR}",
+                  "GH_AW_SAFE_OUTPUTS": "\${GH_AW_SAFE_OUTPUTS}",
+                  "GH_AW_SAFE_OUTPUTS_CONFIG_PATH": "\${GH_AW_SAFE_OUTPUTS_CONFIG_PATH}",
+                  "GH_AW_SAFE_OUTPUTS_TOOLS_PATH": "\${GH_AW_SAFE_OUTPUTS_TOOLS_PATH}",
+                  "GITHUB_REPOSITORY": "\${GITHUB_REPOSITORY}",
+                  "GITHUB_TOKEN": "\${GITHUB_TOKEN}",
+                  "GITHUB_WORKSPACE": "\${GITHUB_WORKSPACE}",
+                  "RUNNER_TEMP": "\${RUNNER_TEMP}"
                 },
                 "guard-policies": {
                   "write-sink": {
@@ -721,7 +770,7 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_e021cf5fa19f3aa2_EOF
+          GH_AW_MCP_CONFIG_4b806ec8e0233008_EOF
       - name: Mount MCP servers as CLIs
         id: mount-mcp-clis
         continue-on-error: true
@@ -749,25 +798,65 @@ jobs:
         timeout-minutes: 20
         run: |
           set -o pipefail
+          printf '%s' "$(date +%s%3N)" > /tmp/gh-aw/agent_cli_start_ms.txt
+          trap 'rm -f "$HOME/.copilot/settings.json"' EXIT
+          mkdir -p "$HOME/.copilot"
+          printf '%s' '{"builtInAgents":{"rubberDuck":false}}' > "$HOME/.copilot/settings.json"
+          export XDG_CONFIG_HOME="$HOME"
+          export GH_AW_MCP_CONFIG="$HOME/.copilot/mcp-config.json"
           touch /tmp/gh-aw/agent-step-summary.md
           GH_AW_NODE_BIN=$(command -v node 2>/dev/null || true)
           export GH_AW_NODE_BIN
+          export COPILOT_API_KEY="$COPILOT_DUMMY_BYOK"
           (umask 177 && touch /tmp/gh-aw/agent-stdio.log)
-          printf '%s\n' '{"$schema":"https://github.com/github/gh-aw-firewall/releases/download/v0.25.41/awf-config.schema.json","network":{"allowDomains":["api.business.githubcopilot.com","api.enterprise.githubcopilot.com","api.github.com","api.githubcopilot.com","api.individual.githubcopilot.com","api.snapcraft.io","archive.ubuntu.com","azure.archive.ubuntu.com","crl.geotrust.com","crl.globalsign.com","crl.identrust.com","crl.sectigo.com","crl.thawte.com","crl.usertrust.com","crl.verisign.com","crl3.digicert.com","crl4.digicert.com","crls.ssl.com","github.com","host.docker.internal","json-schema.org","json.schemastore.org","keyserver.ubuntu.com","ocsp.digicert.com","ocsp.geotrust.com","ocsp.globalsign.com","ocsp.identrust.com","ocsp.sectigo.com","ocsp.ssl.com","ocsp.thawte.com","ocsp.usertrust.com","ocsp.verisign.com","packagecloud.io","packages.cloud.google.com","packages.microsoft.com","ppa.launchpad.net","raw.githubusercontent.com","registry.npmjs.org","s.symcb.com","s.symcd.com","security.ubuntu.com","telemetry.enterprise.githubcopilot.com","ts-crl.ws.symantec.com","ts-ocsp.ws.symantec.com","www.googleapis.com"]},"apiProxy":{"enabled":true,"models":{"auto":["large"],"deep-research":["copilot/deep-research*","copilot/o3-deep-research*","copilot/o4-mini-deep-research*","google/deep-research*","openai/o3-deep-research*","openai/o4-mini-deep-research*"],"gemini-flash":["copilot/gemini-*flash*","google/gemini-*flash*"],"gemini-pro":["copilot/gemini-*pro*","google/gemini-*pro*"],"gpt-4.1":["copilot/gpt-4.1*","openai/gpt-4.1*"],"gpt-5":["copilot/gpt-5*","openai/gpt-5*"],"gpt-5-codex":["copilot/gpt-5*codex*","openai/gpt-5*codex*"],"gpt-5-mini":["copilot/gpt-5*mini*","openai/gpt-5*mini*"],"gpt-5-nano":["copilot/gpt-5*nano*","openai/gpt-5*nano*"],"gpt-5-pro":["copilot/gpt-5*pro*","openai/gpt-5*pro*"],"haiku":["copilot/*haiku*","anthropic/*haiku*"],"large":["sonnet","gpt-5-pro","gpt-5","gemini-pro"],"mini":["haiku","gpt-5-mini","gpt-5-nano","gemini-flash"],"opus":["copilot/*opus*","anthropic/*opus*"],"reasoning":["copilot/o1*","copilot/o3*","copilot/o4*","openai/o1*","openai/o3*","openai/o4*"],"small":["mini"],"sonnet":["copilot/*sonnet*","anthropic/*sonnet*"]}},"container":{"imageTag":"0.25.41,squid=sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4,agent=sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770,api-proxy=sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0"}}' > "${RUNNER_TEMP}/gh-aw/awf-config.json" && cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
-          # shellcheck disable=SC1003
-          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" --env-all --exclude-env COPILOT_GITHUB_TOKEN --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_API_KEY --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
-            -- /bin/bash -c 'export PATH="${RUNNER_TEMP}/gh-aw/mcp-cli/bin:$PATH" && export PATH="$(find /opt/hostedtoolcache /home/runner/work/_tool -maxdepth 4 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || echo node)"; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --allow-all-paths --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/agent-stdio.log
+          GH_AW_MAX_AI_CREDITS="${GH_AW_MAX_AI_CREDITS:-1000}"
+          printf '%s\n' "{\"\$schema\":\"https://github.com/github/gh-aw-firewall/releases/download/v0.27.7/awf-config.schema.json\",\"network\":{\"allowDomains\":[\"api.business.githubcopilot.com\",\"api.enterprise.githubcopilot.com\",\"api.github.com\",\"api.githubcopilot.com\",\"api.individual.githubcopilot.com\",\"api.snapcraft.io\",\"archive.ubuntu.com\",\"azure.archive.ubuntu.com\",\"crl.geotrust.com\",\"crl.globalsign.com\",\"crl.identrust.com\",\"crl.sectigo.com\",\"crl.thawte.com\",\"crl.usertrust.com\",\"crl.verisign.com\",\"crl3.digicert.com\",\"crl4.digicert.com\",\"crls.ssl.com\",\"github.com\",\"host.docker.internal\",\"json-schema.org\",\"json.schemastore.org\",\"keyserver.ubuntu.com\",\"ocsp.digicert.com\",\"ocsp.geotrust.com\",\"ocsp.globalsign.com\",\"ocsp.identrust.com\",\"ocsp.sectigo.com\",\"ocsp.ssl.com\",\"ocsp.thawte.com\",\"ocsp.usertrust.com\",\"ocsp.verisign.com\",\"packagecloud.io\",\"packages.cloud.google.com\",\"packages.microsoft.com\",\"ppa.launchpad.net\",\"raw.githubusercontent.com\",\"registry.npmjs.org\",\"s.symcb.com\",\"s.symcd.com\",\"security.ubuntu.com\",\"telemetry.enterprise.githubcopilot.com\",\"ts-crl.ws.symantec.com\",\"ts-ocsp.ws.symantec.com\",\"www.googleapis.com\"]},\"apiProxy\":{\"enabled\":true,\"enableTokenSteering\":true,\"maxRuns\":500,\"maxAiCredits\":${GH_AW_MAX_AI_CREDITS},\"maxCacheMisses\":5,\"models\":{\"agent\":[\"sonnet-6x\",\"gpt-5.5\",\"gpt-5.4\",\"gpt-5.3\",\"gemini-pro\",\"any\"],\"antigravity\":[\"copilot/antigravity*\",\"google/antigravity*\",\"gemini/antigravity*\"],\"any\":[\"copilot/*\",\"anthropic/*\",\"openai/*\",\"google/*\",\"gemini/*\"],\"claude\":[\"agent\"],\"codex\":[\"agent\"],\"coding\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\",\"gpt-5-codex\"],\"computer-use\":[\"copilot/*computer-use*\",\"google/*computer-use*\",\"gemini/*computer-use*\",\"openai/*computer-use*\"],\"copilot\":[\"agent\"],\"deep-research\":[\"copilot/deep-research*\",\"copilot/o3-deep-research*\",\"copilot/o4-mini-deep-research*\",\"google/deep-research*\",\"gemini/deep-research*\",\"openai/o3-deep-research*\",\"openai/o4-mini-deep-research*\"],\"gemini\":[\"agent\"],\"gemini-3-flash\":[\"copilot/gemini-3*flash*\",\"google/gemini-3*flash*\",\"gemini/gemini-3*flash*\"],\"gemini-3-pro\":[\"copilot/gemini-3*pro*\",\"google/gemini-3*pro*\",\"google/nano-banana*\",\"gemini/gemini-3*pro*\"],\"gemini-3.1-flash\":[\"copilot/gemini-3.1*flash*\",\"google/gemini-3.1*flash*\",\"gemini/gemini-3.1*flash*\"],\"gemini-3.1-pro\":[\"copilot/gemini-3.1*pro*\",\"google/gemini-3.1*pro*\",\"gemini/gemini-3.1*pro*\"],\"gemini-3.5-flash\":[\"copilot/gemini-3.5*flash*\",\"google/gemini-3.5*flash*\",\"gemini/gemini-3.5*flash*\"],\"gemini-flash\":[\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"],\"gemini-flash-lite\":[\"copilot/gemini-*flash*lite*\",\"google/gemini-*flash*lite*\",\"gemini/gemini-*flash*lite*\"],\"gemini-pro\":[\"copilot/gemini-*pro*\",\"google/gemini-*pro*\",\"gemini/gemini-*pro*\"],\"gemma\":[\"copilot/gemma*\",\"google/gemma*\",\"gemini/gemma*\"],\"gpt-5\":[\"copilot/gpt-5*\",\"openai/gpt-5*\"],\"gpt-5-codex\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\"],\"gpt-5-mini\":[\"copilot/gpt-5*mini*\",\"openai/gpt-5*mini*\"],\"gpt-5-nano\":[\"copilot/gpt-5*nano*\",\"openai/gpt-5*nano*\"],\"gpt-5-pro\":[\"copilot/gpt-5*pro*\",\"openai/gpt-5*pro*\"],\"gpt-5.1\":[\"copilot/gpt-5.1*\",\"openai/gpt-5.1*\"],\"gpt-5.2\":[\"copilot/gpt-5.2*\",\"openai/gpt-5.2*\"],\"gpt-5.3\":[\"copilot/gpt-5.3*\",\"openai/gpt-5.3*\"],\"gpt-5.4\":[\"copilot/gpt-5.4*\",\"openai/gpt-5.4*\"],\"gpt-5.5\":[\"copilot/gpt-5.5*\",\"openai/gpt-5.5*\"],\"haiku\":[\"copilot/*haiku*\",\"anthropic/*haiku*\"],\"image-generation\":[\"copilot/gpt-image*\",\"openai/gpt-image*\",\"openai/chatgpt-image*\",\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"google/imagen*\"],\"large\":[\"sonnet\",\"gpt-5-pro\",\"gpt-5\",\"gemini-pro\"],\"mai-code\":[\"copilot/MAI-Code*\",\"copilot/mai-code*\",\"openai/MAI-Code*\"],\"mini\":[\"haiku\",\"gpt-5-mini\",\"gpt-5-nano\",\"gemini-flash-lite\"],\"nano-banana\":[\"copilot/nano-banana*\",\"google/nano-banana*\",\"gemini/nano-banana*\"],\"opus\":[\"copilot/*opus*\",\"anthropic/*opus*\"],\"opusplan\":[\"opus?effort=high\"],\"reasoning\":[\"copilot/o1*\",\"copilot/o3*\",\"copilot/o4*\",\"openai/o1*\",\"openai/o3*\",\"openai/o4*\"],\"robotics\":[\"copilot/*robotics*\",\"google/*robotics*\",\"gemini/*robotics*\"],\"small\":[\"mini\"],\"small-agent\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash\"],\"sonnet\":[\"copilot/*sonnet*\",\"anthropic/*sonnet*\"],\"sonnet-6x\":[\"copilot/*sonnet-4.5*\",\"copilot/*sonnet-4.6*\",\"copilot/*sonnet-4-5-*\",\"anthropic/*sonnet-4-5-*\",\"copilot/*sonnet-4-6*\",\"anthropic/*sonnet-4-6*\"],\"summarization\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash-lite\",\"mini\"],\"vision\":[\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"]}},\"container\":{\"imageTag\":\"0.27.7,squid=sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96,agent=sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c,api-proxy=sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6,cli-proxy=sha256:4757f198a3fa20f88bdbe70be7ae1a05f127d9c0a9e96a5d6460ef40c08fc83d\"}}" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+          cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
+          export GH_AW_MODELS_JSON_PATH="/tmp/gh-aw/models.json"
+          GH_AW_DOCKER_HOST=""
+          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
+            GH_AW_DOCKER_HOST="${DOCKER_HOST}"
+          fi
+          GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS=""
+          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
+            GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS="--docker-host-path-prefix /tmp/gh-aw"
+            python3 - <<'PY'
+          import json,os,subprocess as sp
+          from pathlib import Path
+          try:
+           p=Path(os.environ["RUNNER_TEMP"])/"gh-aw"/"awf-config.json"
+           c=json.loads(p.read_text())
+           c["chroot"]={"binariesSourcePath":"/tmp/gh-aw","identity":{"user":sp.check_output(["id","-un"],text=True).strip(),"uid":int(sp.check_output(["id","-u"],text=True)),"gid":int(sp.check_output(["id","-g"],text=True)),"home":"/tmp/gh-aw/home"}}
+           out=json.dumps(c,separators=(",",":"),ensure_ascii=False)+"\n"
+           p.write_text(out)
+           Path("/tmp/gh-aw/awf-config.json").write_text(out)
+          except Exception as e:
+           raise SystemExit(f"chroot config patch failed: {e}") from e
+          PY
+          fi
+          GH_AW_TOOL_CACHE_MOUNT=""
+          GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"
+          if [ -d "$GH_AW_TOOL_CACHE" ]; then
+            if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then
+              GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"
+            fi
+          fi
+          # shellcheck disable=SC1003,SC2086
+          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"} ${GH_AW_DOCKER_HOST:+--docker-host "$GH_AW_DOCKER_HOST"} ${GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS} --env-all --exclude-env COPILOT_GITHUB_TOKEN --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_API_KEY --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
+            -- /bin/bash -c 'set +o histexpand; export PATH="${RUNNER_TEMP}/gh-aw/mcp-cli/bin:$PATH" && : "${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"; GH_AW_TOOL_CACHE="$RUNNER_TOOL_CACHE"; export PATH="$(find "$GH_AW_TOOL_CACHE" -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; GH_AW_NPM_GLOBAL_ROOT="$(npm root -g 2>/dev/null || true)"; if [ -n "$GH_AW_NPM_GLOBAL_ROOT" ]; then export NODE_PATH="${GH_AW_NPM_GLOBAL_ROOT}${NODE_PATH:+:${NODE_PATH}}"; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --allow-all-paths --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/agent-stdio.log
         env:
           AWF_REFLECT_ENABLED: 1
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
-          COPILOT_API_KEY: dummy-byok-key-for-offline-mode
+          COPILOT_DUMMY_BYOK: dummy-byok-key-for-offline-mode
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || 'claude-sonnet-4.6' }}
-          GH_AW_MCP_CONFIG: /home/runner/.copilot/mcp-config.json
+          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'claude-sonnet-4.6' }}
+          GH_AW_MAX_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_AI_CREDITS || '1000' }}
+          GH_AW_MAX_TURNS: ${{ vars.GH_AW_DEFAULT_MAX_TURNS || '' }}
           GH_AW_PHASE: agent
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
           GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
-          GH_AW_VERSION: v0.72.1
+          GH_AW_TIMEOUT_MINUTES: 20
+          GH_AW_VERSION: v0.80.9
           GITHUB_API_URL: ${{ github.api_url }}
           GITHUB_AW: true
           GITHUB_COPILOT_INTEGRATION_ID: agentic-workflows
@@ -781,25 +870,19 @@ jobs:
           GIT_AUTHOR_NAME: github-actions[bot]
           GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
           GIT_COMMITTER_NAME: github-actions[bot]
-          XDG_CONFIG_HOME: /home/runner
-      - name: Detect Copilot errors
-        id: detect-copilot-errors
+          RUNNER_TEMP: ${{ runner.temp }}
+          TRACEPARENT: ${{ env.GITHUB_AW_OTEL_TRACE_ID != '' && env.GITHUB_AW_OTEL_PARENT_SPAN_ID != '' && format('00-{0}-{1}-01', env.GITHUB_AW_OTEL_TRACE_ID, env.GITHUB_AW_OTEL_PARENT_SPAN_ID) || '' }}
+      - name: Detect agent errors
         if: always()
+        id: detect-agent-errors
         continue-on-error: true
-        run: node "${RUNNER_TEMP}/gh-aw/actions/detect_copilot_errors.cjs"
+        run: node "${RUNNER_TEMP}/gh-aw/actions/detect_agent_errors.cjs"
       - name: Configure Git credentials
         env:
-          REPO_NAME: ${{ github.repository }}
-          SERVER_URL: ${{ github.server_url }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "github-actions[bot]"
-          git config --global am.keepcr true
-          # Re-authenticate git with GitHub token
-          SERVER_URL_STRIPPED="${SERVER_URL#https://}"
-          git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@${SERVER_URL_STRIPPED}/${REPO_NAME}.git"
-          echo "Git configured with standard GitHub Actions identity"
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/configure_git_credentials.sh"
       - name: Copy Copilot session state files to logs
         if: always()
         continue-on-error: true
@@ -951,17 +1034,17 @@ jobs:
       - safe_outputs
     if: >
       always() && (needs.agent.result != 'skipped' || needs.activation.outputs.lockdown_check_failed == 'true' ||
-      needs.activation.outputs.stale_lock_file_failed == 'true')
+      needs.activation.outputs.stale_lock_file_failed == 'true' || needs.activation.outputs.daily_ai_credits_exceeded == 'true')
     runs-on: ubuntu-slim
     environment: issue-triage
     permissions:
       contents: read
-      discussions: write
       issues: write
       pull-requests: write
     concurrency:
       group: "gh-aw-conclusion-issue-triage"
       cancel-in-progress: false
+      queue: max
     outputs:
       incomplete_count: ${{ steps.report_incomplete.outputs.incomplete_count }}
       noop_message: ${{ steps.noop.outputs.noop_message }}
@@ -970,15 +1053,18 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+        uses: github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+          parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.40"
+          GH_AW_INFO_VERSION: "1.0.63"
+          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Download agent output artifact
         id: download-agent-output
         continue-on-error: true
@@ -993,6 +1079,86 @@ jobs:
           mkdir -p /tmp/gh-aw/
           find "/tmp/gh-aw/" -type f -print
           echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+      - name: Collect usage artifact files
+        if: always()
+        continue-on-error: true
+        run: |
+          mkdir -p /tmp/gh-aw/usage/agent /tmp/gh-aw/usage/detection
+          echo "Usage artifact source file status:"
+          for file in /tmp/gh-aw/aw_info.json /tmp/gh-aw/aw-info.jsonl /tmp/gh-aw/agent_usage.jsonl /tmp/gh-aw/detection_usage.jsonl /tmp/gh-aw/github_rate_limits.jsonl /tmp/gh-aw/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/threat-detection/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/threat-detection/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/threat-detection/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl; do
+            [ -f "$file" ] && echo "FOUND: $file" || echo "MISSING: $file"
+          done
+          [ -f /tmp/gh-aw/aw_info.json ] && cp /tmp/gh-aw/aw_info.json /tmp/gh-aw/usage/aw_info.json || true
+          [ -f /tmp/gh-aw/aw-info.jsonl ] && cp /tmp/gh-aw/aw-info.jsonl /tmp/gh-aw/usage/aw-info.jsonl || true
+          [ -f /tmp/gh-aw/agent_usage.jsonl ] && cp /tmp/gh-aw/agent_usage.jsonl /tmp/gh-aw/usage/agent_usage.jsonl || true
+          [ -f /tmp/gh-aw/detection_usage.jsonl ] && cp /tmp/gh-aw/detection_usage.jsonl /tmp/gh-aw/usage/detection_usage.jsonl || true
+          [ -f /tmp/gh-aw/github_rate_limits.jsonl ] && cp /tmp/gh-aw/github_rate_limits.jsonl /tmp/gh-aw/usage/github_rate_limits.jsonl || true
+          [ -f /tmp/gh-aw/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/agent/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/agent/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/agent/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/threat-detection/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/threat-detection/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/detection/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/threat-detection/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/threat-detection/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/detection/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/threat-detection/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/threat-detection/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/detection/token_usage.jsonl || true
+          [ -f /tmp/gh-aw/usage/agent/token_usage.jsonl ] || : > /tmp/gh-aw/usage/agent/token_usage.jsonl
+          [ -f /tmp/gh-aw/usage/detection/token_usage.jsonl ] || : > /tmp/gh-aw/usage/detection/token_usage.jsonl
+          mkdir -p /tmp/gh-aw/usage/activity
+          node ${{ runner.temp }}/gh-aw/actions/generate_usage_activity_summary.cjs
+          find /tmp/gh-aw/usage -type f -print | sort
+      - name: Upload usage artifact
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: usage
+          path: |
+            /tmp/gh-aw/usage/aw_info.json
+            /tmp/gh-aw/usage/aw-info.jsonl
+            /tmp/gh-aw/usage/agent_usage.jsonl
+            /tmp/gh-aw/usage/detection_usage.jsonl
+            /tmp/gh-aw/usage/github_rate_limits.jsonl
+            /tmp/gh-aw/usage/agent/token_usage.jsonl
+            /tmp/gh-aw/usage/detection/token_usage.jsonl
+            /tmp/gh-aw/usage/activity/summary.json
+          if-no-files-found: ignore
+      - name: Restore daily AIC usage cache
+        id: restore-daily-aic-cache-conclusion
+        if: always()
+        continue-on-error: true
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          key: agentic-workflow-usage-issuetriage-${{ github.run_id }}
+          restore-keys: agentic-workflow-usage-issuetriage-
+          path: /tmp/gh-aw/agentic-workflow-usage-cache.jsonl
+      - name: Write daily AIC usage cache entry
+        id: write-daily-aic-cache
+        if: always()
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          github-token: ${{ github.token }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/write_daily_aic_usage_cache.cjs');
+            await main();
+      - name: Save daily AIC usage cache
+        id: save-daily-aic-cache
+        if: always()
+        continue-on-error: true
+        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          key: agentic-workflow-usage-issuetriage-${{ github.run_id }}
+          path: /tmp/gh-aw/agentic-workflow-usage-cache.jsonl
+      - name: Upload daily AIC usage cache artifact
+        id: upload-daily-aic-cache
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: aic-usage-cache
+          path: /tmp/gh-aw/agentic-workflow-usage-cache.jsonl
+          if-no-files-found: ignore
+          retention-days: 7
       - name: Process no-op messages
         id: noop
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -1000,9 +1166,14 @@ jobs:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_NOOP_MAX: "1"
           GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/issue-triage.md"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
           GH_AW_NOOP_REPORT_AS_ISSUE: "false"
+          GH_AW_AIC: ${{ needs.agent.outputs.aic }}
+          GH_AW_THREAT_DETECTION_AIC: ${{ needs.detection.outputs.aic }}
+          GH_AW_AMBIENT_CONTEXT: ${{ needs.agent.outputs.ambient_context }}
+          GH_AW_WORKFLOW_ID: "issue-triage"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1016,6 +1187,7 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/issue-triage.md"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
           GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
@@ -1033,6 +1205,7 @@ jobs:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_MISSING_TOOL_CREATE_ISSUE: "true"
           GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/issue-triage.md"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1047,6 +1220,7 @@ jobs:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_REPORT_INCOMPLETE_CREATE_ISSUE: "true"
           GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/issue-triage.md"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1061,12 +1235,19 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/issue-triage.md"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
           GH_AW_WORKFLOW_ID: "issue-triage"
           GH_AW_ACTION_FAILURE_ISSUE_EXPIRES_HOURS: "168"
           GH_AW_ENGINE_ID: "copilot"
           GH_AW_CHECKOUT_PR_SUCCESS: ${{ needs.agent.outputs.checkout_pr_success }}
+          GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens || '' }}
+          GH_AW_AI_CREDITS_RATE_LIMIT_ERROR: ${{ needs.agent.outputs.ai_credits_rate_limit_error || 'false' }}
+          GH_AW_UNKNOWN_MODEL_AI_CREDITS: ${{ needs.agent.outputs.unknown_model_ai_credits || 'false' }}
+          GH_AW_AIC: ${{ needs.agent.outputs.aic }}
+          GH_AW_THREAT_DETECTION_AIC: ${{ needs.detection.outputs.aic }}
+          GH_AW_MAX_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_AI_CREDITS || '1000' }}
           GH_AW_INFERENCE_ACCESS_ERROR: ${{ needs.agent.outputs.inference_access_error }}
           GH_AW_MCP_POLICY_ERROR: ${{ needs.agent.outputs.mcp_policy_error }}
           GH_AW_AGENTIC_ENGINE_TIMEOUT: ${{ needs.agent.outputs.agentic_engine_timeout }}
@@ -1074,6 +1255,9 @@ jobs:
           GH_AW_ENGINE_API_HOSTS: "api.enterprise.githubcopilot.com,api.githubcopilot.com,api.business.githubcopilot.com,api.individual.githubcopilot.com"
           GH_AW_LOCKDOWN_CHECK_FAILED: ${{ needs.activation.outputs.lockdown_check_failed }}
           GH_AW_STALE_LOCK_FILE_FAILED: ${{ needs.activation.outputs.stale_lock_file_failed }}
+          GH_AW_DAILY_AI_CREDITS_EXCEEDED: ${{ needs.activation.outputs.daily_ai_credits_exceeded }}
+          GH_AW_DAILY_AI_CREDITS_TOTAL_EFFECTIVE_TOKENS: ${{ needs.activation.outputs.daily_ai_credits_total_effective_tokens }}
+          GH_AW_DAILY_AI_CREDITS_THRESHOLD: ${{ needs.activation.outputs.daily_ai_credits_threshold }}
           GH_AW_GROUP_REPORTS: "false"
           GH_AW_FAILURE_REPORT_AS_ISSUE: "true"
           GH_AW_MISSING_TOOL_REPORT_AS_FAILURE: "true"
@@ -1094,24 +1278,29 @@ jobs:
     if: >
       always() && needs.agent.result != 'skipped' && (needs.agent.outputs.output_types != '' || needs.agent.outputs.has_patch == 'true')
     runs-on: ubuntu-latest
+    environment: issue-triage
     permissions:
       contents: read
     outputs:
+      aic: ${{ steps.parse_detection_token_usage.outputs.aic }}
       detection_conclusion: ${{ steps.detection_conclusion.outputs.conclusion }}
       detection_reason: ${{ steps.detection_conclusion.outputs.reason }}
       detection_success: ${{ steps.detection_conclusion.outputs.success }}
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+        uses: github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+          parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.40"
+          GH_AW_INFO_VERSION: "1.0.63"
+          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Download agent output artifact
         id: download-agent-output
         continue-on-error: true
@@ -1128,7 +1317,7 @@ jobs:
           echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
       - name: Checkout repository for patch context
         if: needs.agent.outputs.has_patch == 'true'
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       # --- Threat Detection ---
@@ -1137,7 +1326,7 @@ jobs:
           rm -rf /tmp/gh-aw/sandbox/firewall/logs
           rm -rf /tmp/gh-aw/sandbox/firewall/audit
       - name: Download container images
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.25.41@sha256:cb2b565d070116d4b67e355775340528b5a2c3cb18b2c9049638bcc2df681770 ghcr.io/github/gh-aw-firewall/api-proxy:0.25.41@sha256:fadd0de387209f69a9a7a1b8722bb5e7fdfb80ba9749a5c60f0e4cd7582a74d0 ghcr.io/github/gh-aw-firewall/squid:0.25.41@sha256:1260445d25968dbf3ae70143964177a0e5914cf2ce07a6117f7d3caec6c3e3c4
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.27.7@sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c ghcr.io/github/gh-aw-firewall/api-proxy:0.27.7@sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6 ghcr.io/github/gh-aw-firewall/squid:0.27.7@sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96
       - name: Check if detection needed
         id: detection_guard
         if: always()
@@ -1156,13 +1345,17 @@ jobs:
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         run: |
           rm -f "${RUNNER_TEMP}/gh-aw/mcp-config/mcp-servers.json"
-          rm -f /home/runner/.copilot/mcp-config.json
+          rm -f "$HOME/.copilot/mcp-config.json"
           rm -f "$GITHUB_WORKSPACE/.gemini/settings.json"
       - name: Prepare threat detection files
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         run: |
           mkdir -p /tmp/gh-aw/threat-detection/aw-prompts
+          rm -f /tmp/gh-aw/agent_usage.json
           cp /tmp/gh-aw/aw-prompts/prompt.txt /tmp/gh-aw/threat-detection/aw-prompts/prompt.txt 2>/dev/null || true
+          if [ ! -s /tmp/gh-aw/threat-detection/aw-prompts/prompt.txt ]; then
+            echo "::warning::ERR_VALIDATION: Missing or empty detection context prompt at /tmp/gh-aw/threat-detection/aw-prompts/prompt.txt. Ensure the agent artifact includes /tmp/gh-aw/aw-prompts/prompt.txt. Detection will continue with fallback workflow context."
+          fi
           cp /tmp/gh-aw/agent_output.json /tmp/gh-aw/threat-detection/agent_output.json 2>/dev/null || true
           for f in /tmp/gh-aw/aw-*.patch; do
             [ -f "$f" ] && cp "$f" /tmp/gh-aw/threat-detection/ 2>/dev/null || true
@@ -1196,11 +1389,11 @@ jobs:
           node-version: '24'
           package-manager-cache: false
       - name: Install GitHub Copilot CLI
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.40
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.63
         env:
           GH_HOST: github.com
       - name: Install AWF binary
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.41
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.27.7
       - name: Execute GitHub Copilot CLI
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         continue-on-error: true
@@ -1209,23 +1402,53 @@ jobs:
         timeout-minutes: 20
         run: |
           set -o pipefail
+          printf '%s' "$(date +%s%3N)" > /tmp/gh-aw/agent_cli_start_ms.txt
+          trap 'rm -f "$HOME/.copilot/settings.json"' EXIT
+          mkdir -p "$HOME/.copilot"
+          printf '%s' '{"builtInAgents":{"rubberDuck":false}}' > "$HOME/.copilot/settings.json"
+          export XDG_CONFIG_HOME="$HOME"
           touch /tmp/gh-aw/agent-step-summary.md
           GH_AW_NODE_BIN=$(command -v node 2>/dev/null || true)
           export GH_AW_NODE_BIN
+          export COPILOT_API_KEY="$COPILOT_DUMMY_BYOK"
           (umask 177 && touch /tmp/gh-aw/threat-detection/detection.log)
-          printf '%s\n' '{"$schema":"https://github.com/github/gh-aw-firewall/releases/download/v0.25.41/awf-config.schema.json","network":{"allowDomains":["api.business.githubcopilot.com","api.enterprise.githubcopilot.com","api.github.com","api.githubcopilot.com","api.individual.githubcopilot.com","github.com","host.docker.internal","telemetry.enterprise.githubcopilot.com"]},"apiProxy":{"enabled":true},"container":{"imageTag":"0.25.41"}}' > "${RUNNER_TEMP}/gh-aw/awf-config.json" && cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
-          # shellcheck disable=SC1003
-          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" --env-all --exclude-env COPILOT_GITHUB_TOKEN --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
-            -- /bin/bash -c 'export PATH="$(find /opt/hostedtoolcache /home/runner/work/_tool -maxdepth 4 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || echo node)"; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/threat-detection/detection.log
+          GH_AW_MAX_AI_CREDITS="${GH_AW_MAX_AI_CREDITS:-400}"
+          printf '%s\n' "{\"\$schema\":\"https://github.com/github/gh-aw-firewall/releases/download/v0.27.7/awf-config.schema.json\",\"network\":{\"allowDomains\":[\"api.business.githubcopilot.com\",\"api.enterprise.githubcopilot.com\",\"api.github.com\",\"api.githubcopilot.com\",\"api.individual.githubcopilot.com\",\"github.com\",\"host.docker.internal\",\"registry.npmjs.org\",\"telemetry.enterprise.githubcopilot.com\"]},\"apiProxy\":{\"enabled\":true,\"enableTokenSteering\":true,\"maxRuns\":500,\"maxAiCredits\":${GH_AW_MAX_AI_CREDITS},\"maxCacheMisses\":5},\"container\":{\"imageTag\":\"0.27.7,squid=sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96,agent=sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c,api-proxy=sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6,cli-proxy=sha256:4757f198a3fa20f88bdbe70be7ae1a05f127d9c0a9e96a5d6460ef40c08fc83d\"}}" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+          cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
+          export GH_AW_MODELS_JSON_PATH="/tmp/gh-aw/models.json"
+          GH_AW_DOCKER_HOST=""
+          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
+            GH_AW_DOCKER_HOST="${DOCKER_HOST}"
+          fi
+          GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS=""
+          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
+            GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS="--docker-host-path-prefix /tmp/gh-aw"
+            _GH_AW_CHROOT_JSON=$(jq -c --arg src /tmp/gh-aw --arg user "$(id -un)" --argjson uid "$(id -u)" --argjson gid "$(id -g)" --arg home /tmp/gh-aw/home '.chroot={"binariesSourcePath":$src,"identity":{"user":$user,"uid":$uid,"gid":$gid,"home":$home}}' "${RUNNER_TEMP}/gh-aw/awf-config.json") || { echo "chroot config patch failed" >&2; exit 1; }
+            printf '%s\n' "$_GH_AW_CHROOT_JSON" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+            printf '%s\n' "$_GH_AW_CHROOT_JSON" > "/tmp/gh-aw/awf-config.json"
+          fi
+          GH_AW_TOOL_CACHE_MOUNT=""
+          GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"
+          if [ -d "$GH_AW_TOOL_CACHE" ]; then
+            if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then
+              GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"
+            fi
+          fi
+          # shellcheck disable=SC1003,SC2086
+          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"} ${GH_AW_DOCKER_HOST:+--docker-host "$GH_AW_DOCKER_HOST"} ${GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS} --env-all --exclude-env COPILOT_GITHUB_TOKEN --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
+            -- /bin/bash -c 'set +o histexpand; : "${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"; GH_AW_TOOL_CACHE="$RUNNER_TOOL_CACHE"; export PATH="$(find "$GH_AW_TOOL_CACHE" -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; GH_AW_NPM_GLOBAL_ROOT="$(npm root -g 2>/dev/null || true)"; if [ -n "$GH_AW_NPM_GLOBAL_ROOT" ]; then export NODE_PATH="${GH_AW_NPM_GLOBAL_ROOT}${NODE_PATH:+:${NODE_PATH}}"; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/threat-detection/detection.log
         env:
           AWF_REFLECT_ENABLED: 1
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
-          COPILOT_API_KEY: dummy-byok-key-for-offline-mode
+          COPILOT_DUMMY_BYOK: dummy-byok-key-for-offline-mode
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_DETECTION_COPILOT || 'claude-sonnet-4.6' }}
+          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_DETECTION_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'claude-sonnet-4.6' }}
+          GH_AW_MAX_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_DETECTION_MAX_AI_CREDITS || '400' }}
+          GH_AW_MAX_TURNS: ${{ vars.GH_AW_DEFAULT_MAX_TURNS || '' }}
           GH_AW_PHASE: detection
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
-          GH_AW_VERSION: v0.72.1
+          GH_AW_TIMEOUT_MINUTES: 20
+          GH_AW_VERSION: v0.80.9
           GITHUB_API_URL: ${{ github.api_url }}
           GITHUB_AW: true
           GITHUB_COPILOT_INTEGRATION_ID: agentic-workflows
@@ -1238,7 +1461,21 @@ jobs:
           GIT_AUTHOR_NAME: github-actions[bot]
           GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
           GIT_COMMITTER_NAME: github-actions[bot]
-          XDG_CONFIG_HOME: /home/runner
+          RUNNER_TEMP: ${{ runner.temp }}
+          TRACEPARENT: ${{ env.GITHUB_AW_OTEL_TRACE_ID != '' && env.GITHUB_AW_OTEL_PARENT_SPAN_ID != '' && format('00-{0}-{1}-01', env.GITHUB_AW_OTEL_TRACE_ID, env.GITHUB_AW_OTEL_PARENT_SPAN_ID) || '' }}
+      - name: Parse threat detection token usage for step summary
+        id: parse_detection_token_usage
+        if: always()
+        continue-on-error: true
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_TOKEN_USAGE_SUMMARY_TITLE: Threat Detection Token Usage
+        with:
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_token_usage.cjs');
+            await main();
       - name: Upload threat detection log
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -1253,6 +1490,7 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           RUN_DETECTION: ${{ steps.detection_guard.outputs.run_detection }}
+          DETECTION_AGENTIC_EXECUTION_OUTCOME: ${{ steps.detection_agentic_execution.outcome }}
           GH_AW_DETECTION_CONTINUE_ON_ERROR: "true"
         with:
           script: |
@@ -1263,10 +1501,11 @@ jobs:
               await main();
             } catch (loadErr) {
               const continueOnError = process.env.GH_AW_DETECTION_CONTINUE_ON_ERROR !== 'false';
+              const detectionExecutionFailed = process.env.DETECTION_AGENTIC_EXECUTION_OUTCOME === 'failure';
               const msg = 'ERR_SYSTEM: \u274C Unexpected error loading threat detection module: ' + (loadErr && loadErr.message ? loadErr.message : String(loadErr));
               core.error(msg);
               core.setOutput('reason', 'parse_error');
-              if (continueOnError) {
+              if (continueOnError && !detectionExecutionFailed) {
                 core.warning('\u26A0\uFE0F ' + msg);
                 core.setOutput('conclusion', 'warning');
                 core.setOutput('success', 'false');
@@ -1287,20 +1526,24 @@ jobs:
     environment: issue-triage
     permissions:
       contents: read
-      discussions: write
       issues: write
       pull-requests: write
-    timeout-minutes: 15
+    timeout-minutes: 45
     env:
+      GH_AW_AGENT_AIC: ${{ needs.agent.outputs.aic }}
+      GH_AW_AIC: ${{ needs.agent.outputs.aic }}
+      GH_AW_AMBIENT_CONTEXT: ${{ needs.agent.outputs.ambient_context }}
       GH_AW_CALLER_WORKFLOW_ID: "${{ github.repository }}/issue-triage"
       GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
       GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
       GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens }}
       GH_AW_ENGINE_ID: "copilot"
       GH_AW_ENGINE_MODEL: ${{ needs.agent.outputs.model }}
-      GH_AW_ENGINE_VERSION: "1.0.40"
+      GH_AW_ENGINE_VERSION: "1.0.63"
+      GH_AW_THREAT_DETECTION_AIC: ${{ needs.detection.outputs.aic }}
       GH_AW_WORKFLOW_ID: "issue-triage"
       GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+      GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/issue-triage.md"
     outputs:
       code_push_failure_count: ${{ steps.process_safe_outputs.outputs.code_push_failure_count }}
       code_push_failure_errors: ${{ steps.process_safe_outputs.outputs.code_push_failure_errors }}
@@ -1313,15 +1556,18 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+        uses: github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
+          parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.40"
+          GH_AW_INFO_VERSION: "1.0.63"
+          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Download agent output artifact
         id: download-agent-output
         continue-on-error: true
@@ -1339,7 +1585,7 @@ jobs:
       - name: Configure GH_HOST for enterprise compatibility
         id: ghes-host-config
         shell: bash
-        run: |
+        run: | # zizmor: ignore[github-env] - GITHUB_SERVER_URL is set by GitHub Actions, not user input.
           # Derive GH_HOST from GITHUB_SERVER_URL so the gh CLI targets the correct
           # GitHub instance (GHES/GHEC). On github.com this is a harmless no-op.
           GH_HOST="${GITHUB_SERVER_URL#https://}"
@@ -1350,6 +1596,7 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_COMMENT_ID: ${{ needs.activation.outputs.comment_id }}
           GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_API_URL: ${{ github.api_url }}
diff --git a/.github/workflows/verify-aw-lock.yml b/.github/workflows/verify-aw-lock.yml
index 1d37e610e8..1381792980 100644
--- a/.github/workflows/verify-aw-lock.yml
+++ b/.github/workflows/verify-aw-lock.yml
@@ -16,9 +16,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install gh-aw extension
-        uses: github/gh-aw-actions/setup-cli@bc56a0cad2f450c562810785ef38649c04db812a # v0.72.1
+        uses: github/gh-aw-actions/setup-cli@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
         with:
-          version: v0.72.1
+          version: v0.80.9
 
       - name: Recompile agentic workflows
         run: gh aw compile

From 3795144b1f96c7b8b7f39ec4f924412488f5dd61 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Thu, 25 Jun 2026 21:20:37 +0200
Subject: [PATCH 165/298] Tests | Address additional flaky tests (#4305)

* Update LocalAppContextSwitchesTest to use RAII helper

This prevents checks of the default AppContext switch values which would run in parallel to other tests which modify these values via the RAII helper.

* Address duplicate AKV key names

* Swap System.Random with the same RNG which SqlClient uses.
* Make a fixed number of attempts to reattempt key creation if a key with the generated name already exists.

* Remove hardcoded stored procedure name

* Accept either a SqlException or an InvalidOperationException to indicate operation cancellation

* Update assertion for UseLegacyFailoverAlternationOnLoginSqlErrors

* Correct test failures

LocalAppContextSwitchesHelper was returning the field values, skipping the default values exposed by LocalAppContextSwitches when the AppContext switch had not been set one way or another.

* Modify AppContext switch helper to include UseOverallConnectTimeoutForPoolWait

---------

Co-authored-by: Malcolm Daigle <mdaigle@microsoft.com>
Co-authored-by: Malcolm Daigle <daiglemalcolm@gmail.com>
---
 .../Fixtures/AzureKeyVaultKeyFixtureBase.cs   |  34 +++++-
 .../Common/LocalAppContextSwitchesHelper.cs   | 109 +++++++++++-------
 .../tests/ManualTests/SQL/Batch/BatchTests.cs |  56 ++-------
 .../SQL/SqlCommand/SqlCommandCancelTest.cs    |   8 +-
 .../SqlClient/LocalAppContextSwitchesTest.cs  |  37 +++---
 5 files changed, 130 insertions(+), 114 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs
index e6e3bf4996..b2232b3f69 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Security.Cryptography;
 using Azure.Core;
 using Azure.Security.KeyVault.Keys;
 
@@ -18,20 +19,41 @@ namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures;
 public abstract class AzureKeyVaultKeyFixtureBase : IDisposable
 {
     private readonly KeyClient _keyClient;
-    private readonly Random _randomGenerator;
+    private readonly RandomNumberGenerator _randomGenerator;
 
     private readonly List<KeyVaultKey> _createdKeys = new List<KeyVaultKey>();
 
     protected AzureKeyVaultKeyFixtureBase(Uri keyVaultUri, TokenCredential keyVaultToken)
     {
         _keyClient = new KeyClient(keyVaultUri, keyVaultToken);
-        _randomGenerator = new Random();
+        _randomGenerator = RandomNumberGenerator.Create();
     }
 
     protected Uri CreateKey(string name, int keySize)
     {
-        CreateRsaKeyOptions createOptions = new CreateRsaKeyOptions(GenerateUniqueName(name)) { KeySize = keySize };
-        KeyVaultKey created = _keyClient.CreateRsaKey(createOptions);
+        const int MaxConflictResolutions = 5;
+        KeyVaultKey created;
+        int i = 0;
+
+        while (true)
+        {
+            CreateRsaKeyOptions createOptions = new CreateRsaKeyOptions(GenerateUniqueName(name)) { KeySize = keySize };
+
+            try
+            {
+                created = _keyClient.CreateRsaKey(createOptions);
+                break;
+            }
+            // It's possible for a key to already exist with the same name, even in a deleted state. If so, CreateRsaKey
+            // will throw an exception with HTTP status code 409 (Conflict.)
+            // We can't assume we possess permissions to purge or to recover the key, so regenerate the name and try again.
+            // Only make MaxConflictResolutions attempts, to avoid possible infinite loops.
+            catch (Azure.RequestFailedException conflictException)
+                when (conflictException.Status == 409 && i < MaxConflictResolutions)
+            {
+                i++;
+            }
+        }
 
         _createdKeys.Add(created);
         return created.Id;
@@ -41,7 +63,7 @@ private string GenerateUniqueName(string name)
     {
         byte[] rndBytes = new byte[16];
 
-        _randomGenerator.NextBytes(rndBytes);
+        _randomGenerator.GetBytes(rndBytes);
         return name + "-" + BitConverter.ToString(rndBytes);
     }
 
@@ -64,5 +86,7 @@ protected virtual void Dispose(bool disposing)
                 continue;
             }
         }
+
+        _randomGenerator.Dispose();
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
index ce64aea779..5c07d37a32 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
@@ -214,7 +214,8 @@ public void Dispose()
 
     #region Switch Value Getters and Setters
 
-    // These properties get or set the like-named underlying switch field value.
+    // These properties get the like-named underlying switch *property* value and set the underlying
+    // switch *field* value. This allows tests to verify the default switch values.
     //
     // They all throw if the value cannot be retrieved or set.
 
@@ -224,7 +225,7 @@ public void Dispose()
     /// </summary>
     public bool? DisableTnirByDefault
     {
-        get => GetSwitchValue("s_disableTnirByDefault");
+        get => GetSwitchPropertyValue(nameof(DisableTnirByDefault));
         set => SetSwitchValue("s_disableTnirByDefault", value);
     }
     #endif
@@ -234,7 +235,7 @@ public bool? DisableTnirByDefault
     /// </summary>
     public bool? EnableMultiSubnetFailoverByDefault
     {
-        get => GetSwitchValue("s_enableMultiSubnetFailoverByDefault");
+        get => GetSwitchPropertyValue(nameof(EnableMultiSubnetFailoverByDefault));
         set => SetSwitchValue("s_enableMultiSubnetFailoverByDefault", value);
     }
 
@@ -244,7 +245,7 @@ public bool? EnableMultiSubnetFailoverByDefault
     /// </summary>
     public bool? GlobalizationInvariantMode
     {
-        get => GetSwitchValue("s_globalizationInvariantMode");
+        get => GetSwitchPropertyValue(nameof(GlobalizationInvariantMode));
         set => SetSwitchValue("s_globalizationInvariantMode", value);
     }
     #endif
@@ -254,7 +255,7 @@ public bool? GlobalizationInvariantMode
     /// </summary>
     public bool? IgnoreServerProvidedFailoverPartner
     {
-        get => GetSwitchValue("s_ignoreServerProvidedFailoverPartner");
+        get => GetSwitchPropertyValue(nameof(IgnoreServerProvidedFailoverPartner));
         set => SetSwitchValue("s_ignoreServerProvidedFailoverPartner", value);
     }
 
@@ -263,7 +264,7 @@ public bool? IgnoreServerProvidedFailoverPartner
     /// </summary>
     public bool? UseLegacyFailoverAlternationOnLoginSqlErrors
     {
-        get => GetSwitchValue("s_useLegacyFailoverAlternationOnLoginSqlErrors");
+        get => GetSwitchPropertyValue(nameof(UseLegacyFailoverAlternationOnLoginSqlErrors));
         set => SetSwitchValue("s_useLegacyFailoverAlternationOnLoginSqlErrors", value);
     }
 
@@ -272,7 +273,7 @@ public bool? UseLegacyFailoverAlternationOnLoginSqlErrors
     /// </summary>
     public bool? LegacyRowVersionNullBehavior
     {
-        get => GetSwitchValue("s_legacyRowVersionNullBehavior");
+        get => GetSwitchPropertyValue(nameof(LegacyRowVersionNullBehavior));
         set => SetSwitchValue("s_legacyRowVersionNullBehavior", value);
     }
 
@@ -281,7 +282,7 @@ public bool? LegacyRowVersionNullBehavior
     /// </summary>
     public bool? LegacyVarTimeZeroScaleBehaviour
     {
-        get => GetSwitchValue("s_legacyVarTimeZeroScaleBehaviour");
+        get => GetSwitchPropertyValue(nameof(LegacyVarTimeZeroScaleBehaviour));
         set => SetSwitchValue("s_legacyVarTimeZeroScaleBehaviour", value);
     }
 
@@ -290,7 +291,7 @@ public bool? LegacyVarTimeZeroScaleBehaviour
     /// </summary>
     public bool? MakeReadAsyncBlocking
     {
-        get => GetSwitchValue("s_makeReadAsyncBlocking");
+        get => GetSwitchPropertyValue(nameof(MakeReadAsyncBlocking));
         set => SetSwitchValue("s_makeReadAsyncBlocking", value);
     }
 
@@ -299,7 +300,7 @@ public bool? MakeReadAsyncBlocking
     /// </summary>
     public bool? SuppressInsecureTlsWarning
     {
-        get => GetSwitchValue("s_suppressInsecureTlsWarning");
+        get => GetSwitchPropertyValue(nameof(SuppressInsecureTlsWarning));
         set => SetSwitchValue("s_suppressInsecureTlsWarning", value);
     }
 
@@ -308,7 +309,7 @@ public bool? SuppressInsecureTlsWarning
     /// </summary>
     public bool? TruncateScaledDecimal
     {
-        get => GetSwitchValue("s_truncateScaledDecimal");
+        get => GetSwitchPropertyValue(nameof(TruncateScaledDecimal));
         set => SetSwitchValue("s_truncateScaledDecimal", value);
     }
 
@@ -317,7 +318,7 @@ public bool? TruncateScaledDecimal
     /// </summary>
     public bool? UseCompatibilityAsyncBehaviour
     {
-        get => GetSwitchValue("s_useCompatibilityAsyncBehaviour");
+        get => GetSwitchPropertyValue(nameof(UseCompatibilityAsyncBehaviour));
         set => SetSwitchValue("s_useCompatibilityAsyncBehaviour", value);
     }
 
@@ -326,7 +327,7 @@ public bool? UseCompatibilityAsyncBehaviour
     /// </summary>
     public bool? UseCompatibilityProcessSni
     {
-        get => GetSwitchValue("s_useCompatibilityProcessSni");
+        get => GetSwitchPropertyValue(nameof(UseCompatibilityProcessSni));
         set => SetSwitchValue("s_useCompatibilityProcessSni", value);
     }
 
@@ -335,7 +336,7 @@ public bool? UseCompatibilityProcessSni
     /// </summary>
     public bool? UseConnectionPoolV2
     {
-        get => GetSwitchValue("s_useConnectionPoolV2");
+        get => GetSwitchPropertyValue(nameof(UseConnectionPoolV2));
         set => SetSwitchValue("s_useConnectionPoolV2", value);
     }
 
@@ -344,7 +345,7 @@ public bool? UseConnectionPoolV2
     /// </summary>
     public bool? UseLegacyIdleTimeoutBehavior
     {
-        get => GetSwitchValue("s_useLegacyIdleTimeoutBehavior");
+        get => GetSwitchPropertyValue(nameof(UseLegacyIdleTimeoutBehavior));
         set => SetSwitchValue("s_useLegacyIdleTimeoutBehavior", value);
     }
 
@@ -353,7 +354,7 @@ public bool? UseLegacyIdleTimeoutBehavior
     /// </summary>
     public bool? UseOverallConnectTimeoutForPoolWait
     {
-        get => GetSwitchValue("s_useOverallConnectTimeoutForPoolWait");
+        get => GetSwitchPropertyValue(nameof(UseOverallConnectTimeoutForPoolWait));
         set => SetSwitchValue("s_useOverallConnectTimeoutForPoolWait", value);
     }
 
@@ -363,7 +364,7 @@ public bool? UseOverallConnectTimeoutForPoolWait
     /// </summary>
     public bool? UseManagedNetworking
     {
-        get => GetSwitchValue("s_useManagedNetworking");
+        get => GetSwitchPropertyValue(nameof(UseManagedNetworking));
         set => SetSwitchValue("s_useManagedNetworking", value);
     }
     #endif
@@ -373,7 +374,7 @@ public bool? UseManagedNetworking
     /// </summary>
     public bool? UseMinimumLoginTimeout
     {
-        get => GetSwitchValue("s_useMinimumLoginTimeout");
+        get => GetSwitchPropertyValue(nameof(UseMinimumLoginTimeout));
         set => SetSwitchValue("s_useMinimumLoginTimeout", value);
     }
 
@@ -386,19 +387,7 @@ public bool? UseMinimumLoginTimeout
     /// </summary>
     private static bool? GetSwitchValue(string fieldName)
     {
-        var assembly = Assembly.GetAssembly(typeof(SqlConnection));
-        if (assembly is null)
-        {
-            throw new InvalidOperationException(
-                "Could not get assembly for Microsoft.Data.SqlClient");
-        }
-        
-        var type = assembly.GetType("Microsoft.Data.SqlClient.LocalAppContextSwitches");
-        if (type is null)
-        {
-            throw new InvalidOperationException(
-                "Could not get type LocalAppContextSwitches");
-        }
+        var type = GetLocalAppContextSwitchesType();
 
         var field = type.GetField(
             fieldName,
@@ -433,19 +422,7 @@ public bool? UseMinimumLoginTimeout
     /// </summary>
     private static void SetSwitchValue(string fieldName, bool? value)
     {
-        var assembly = Assembly.GetAssembly(typeof(SqlConnection));
-        if (assembly is null)
-        {
-            throw new InvalidOperationException(
-                "Could not get assembly for Microsoft.Data.SqlClient");
-        }
-        
-        var type = assembly.GetType("Microsoft.Data.SqlClient.LocalAppContextSwitches");
-        if (type is null)
-        {
-            throw new InvalidOperationException(
-                "Could not get type LocalAppContextSwitches");
-        }
+        var type = GetLocalAppContextSwitchesType();
 
         var field = type.GetField(
             fieldName,
@@ -470,5 +447,49 @@ private static void SetSwitchValue(string fieldName, bool? value)
         field.SetValue(null, Enum.ToObject(field.FieldType, byteValue));
     }
 
+    /// <summary>
+    /// Use reflection to get a switch property value from LocalAppContextSwitches.
+    /// </summary>
+    /// <remarks>
+    /// Each property in LocalAppContextSwitchHelper corresponds to a like-named property in
+    /// LocalAppContextSwitches, which may return a different value when the AppContext switch
+    /// has not been set.
+    /// </remarks>
+    private static bool GetSwitchPropertyValue(string propertyName)
+    {
+        var type = GetLocalAppContextSwitchesType();
+        var property = type.GetProperty(
+            propertyName,
+            BindingFlags.Static | BindingFlags.Public);
+
+        if (property == null)
+        {
+            throw new InvalidOperationException(
+                $"Property '{propertyName}' not found in LocalAppContextSwitches");
+        }
+
+        object? value = property.GetValue(null);
+
+        return value is bool boolValue
+            ? boolValue
+            : throw new InvalidOperationException($"Property '{propertyName}' is not of type bool.");
+    }
+
+    private static Type GetLocalAppContextSwitchesType()
+    {
+        var assembly = Assembly.GetAssembly(typeof(SqlConnection));
+        if (assembly is null)
+        {
+            throw new InvalidOperationException("Could not get assembly for Microsoft.Data.SqlClient");
+        }
+
+        var type = assembly.GetType("Microsoft.Data.SqlClient.LocalAppContextSwitches");
+        if (type is null)
+        {
+            throw new InvalidOperationException("Could not get type LocalAppContextSwitches");
+        }
+        return type;
+    }
+
     #endregion
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
index 91b57a46b4..49674679b7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/Batch/BatchTests.cs
@@ -7,6 +7,7 @@
 using System.Data;
 using System.Data.Common;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
@@ -378,10 +379,14 @@ public static void ExceptionWithoutBatchContainsNoBatch()
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         public static void ParameterInOutAndReturn()
         {
-            string create =
-                @"
-CREATE PROCEDURE TestInAndOutParams
-	@Input int,
+            SqlParameter input = CreateParameter("@Input", SqlDbType.Int, 2);
+            SqlParameter inputOutput = CreateParameter("@InOut", SqlDbType.Int, 4, ParameterDirection.InputOutput);
+            SqlParameter output = CreateParameter("@Output", SqlDbType.Int, DBNull.Value, ParameterDirection.Output);
+            SqlParameter returned = CreateParameter("@RETURN_VALUE", SqlDbType.Int, DBNull.Value, ParameterDirection.ReturnValue);
+
+            using (SqlConnection conn = new(DataTestUtility.TCPConnectionString))
+            using (StoredProcedure spTestInAndOutParams = new(conn, "TestInAndOutParams", @"
+	@Input int, 
 	@InOut int OUTPUT,
 	@Output int = default OUTPUT
 AS
@@ -389,26 +394,14 @@ CREATE PROCEDURE TestInAndOutParams
 	SET NOCOUNT ON;
 	SELECT @InOut = 2 * @InOut, @Output = 2 * @Input
 	RETURN @Input
-END";
-            string drop = "DROP PROCEDURE TestInAndOutParams";
-
-            SqlParameter input = CreateParameter("@Input", SqlDbType.Int, 2);
-            SqlParameter inputOutput = CreateParameter("@InOut", SqlDbType.Int, 4, ParameterDirection.InputOutput);
-            SqlParameter output = CreateParameter("@Output", SqlDbType.Int, DBNull.Value, ParameterDirection.Output);
-            SqlParameter returned = CreateParameter("@RETURN_VALUE", SqlDbType.Int, DBNull.Value, ParameterDirection.ReturnValue);
-            try
+END"))
             {
-                TryExecuteNonQueryCommand(drop);
-                ExecuteNonQueryCommand(create);
-
-                using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
                 using (SqlBatch batch = new SqlBatch(conn))
                 {
-                    conn.Open();
                     batch.Commands.Add(new SqlBatchCommand("SELECT @@VERSION"));
                     batch.Commands.Add(
                         new SqlBatchCommand(
-                            "TestInAndOutParams",
+                            spTestInAndOutParams.Name,
                             CommandType.StoredProcedure,
                             new[] { input, inputOutput, output, returned }
                         )
@@ -417,10 +410,6 @@ RETURN @Input
                     batch.ExecuteNonQuery();
                 }
             }
-            finally
-            {
-                TryExecuteNonQueryCommand(drop);
-            }
 
             Assert.Equal(8, Convert.ToInt32(inputOutput.Value));
             Assert.Equal(4, Convert.ToInt32(output.Value));
@@ -773,28 +762,5 @@ private static SqlParameter CreateParameter<T>(string name, SqlDbType type, T va
             parameter.Value = value;
             return parameter;
         }
-
-        private static void ExecuteNonQueryCommand(string command)
-        {
-            using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString))
-            using (SqlCommand cmd = conn.CreateCommand())
-            {
-                conn.Open();
-                cmd.CommandText = command;
-                cmd.ExecuteNonQuery();
-            }
-        }
-        private static bool TryExecuteNonQueryCommand(string command)
-        {
-            try
-            {
-                ExecuteNonQueryCommand(command);
-                return true;
-            }
-            catch
-            {
-            }
-            return false;
-        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
index dc97d98052..830f1bb733 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
@@ -375,7 +375,9 @@ private static void ExecuteCommandCancelExpected(object state)
             string errorMessage = SystemDataResourceManager.Instance.SQL_OperationCancelled;
             string errorMessageSevereFailure = SystemDataResourceManager.Instance.SQL_SevereError;
 
-            DataTestUtility.ExpectFailure<SqlException>(() =>
+            // This could fail with either a SqlException or an InvalidOperationException depending on timing,
+            // so we will accept either but require the message to match expected cancellation messages
+            DataTestUtility.ExpectFailure<Exception>(() =>
             {
                 threadsReady.SignalAndWait();
                 using (SqlDataReader r = command.ExecuteReader())
@@ -387,7 +389,9 @@ private static void ExecuteCommandCancelExpected(object state)
                         }
                     } while (r.NextResult());
                 }
-            }, new string[] { errorMessage, errorMessageSevereFailure });
+            },
+            new string[] { errorMessage, errorMessageSevereFailure },
+            customExceptionVerifier: (ex) => ex is SqlException or InvalidOperationException);
 
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
index 67837e10f2..e2007280a9 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -38,6 +38,7 @@ public void TestDefaultAppContextSwitchValues()
         switchesHelper.UseCompatibilityAsyncBehaviour = null;
         switchesHelper.UseCompatibilityProcessSni = null;
         switchesHelper.UseConnectionPoolV2 = null;
+        switchesHelper.UseLegacyIdleTimeoutBehavior = null;
         switchesHelper.UseMinimumLoginTimeout = null;
         #if NET
         switchesHelper.GlobalizationInvariantMode = null;
@@ -49,28 +50,28 @@ public void TestDefaultAppContextSwitchValues()
         switchesHelper.DisableTnirByDefault = null;
         #endif
 
-        Assert.False(LocalAppContextSwitches.LegacyRowVersionNullBehavior);
-        Assert.False(LocalAppContextSwitches.SuppressInsecureTlsWarning);
-        Assert.False(LocalAppContextSwitches.MakeReadAsyncBlocking);
-        Assert.True(LocalAppContextSwitches.UseMinimumLoginTimeout);
-        Assert.True(LocalAppContextSwitches.LegacyVarTimeZeroScaleBehaviour);
-        Assert.True(LocalAppContextSwitches.UseCompatibilityProcessSni);
-        Assert.True(LocalAppContextSwitches.UseCompatibilityAsyncBehaviour);
-        Assert.True(LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior);
-        Assert.False(LocalAppContextSwitches.UseConnectionPoolV2);
-        Assert.False(LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait);
-        Assert.False(LocalAppContextSwitches.TruncateScaledDecimal);
-        Assert.False(LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner);
-        Assert.False(LocalAppContextSwitches.UseLegacyFailoverAlternationOnLoginSqlErrors);
-        Assert.False(LocalAppContextSwitches.EnableMultiSubnetFailoverByDefault);
+        Assert.False(switchesHelper.LegacyRowVersionNullBehavior);
+        Assert.False(switchesHelper.SuppressInsecureTlsWarning);
+        Assert.False(switchesHelper.MakeReadAsyncBlocking);
+        Assert.True(switchesHelper.UseMinimumLoginTimeout);
+        Assert.True(switchesHelper.LegacyVarTimeZeroScaleBehaviour);
+        Assert.True(switchesHelper.UseCompatibilityProcessSni);
+        Assert.True(switchesHelper.UseCompatibilityAsyncBehaviour);
+        Assert.True(switchesHelper.UseLegacyIdleTimeoutBehavior);
+        Assert.False(switchesHelper.UseConnectionPoolV2);
+        Assert.False(switchesHelper.UseOverallConnectTimeoutForPoolWait);
+        Assert.False(switchesHelper.TruncateScaledDecimal);
+        Assert.False(switchesHelper.IgnoreServerProvidedFailoverPartner);
+        Assert.False(switchesHelper.UseLegacyFailoverAlternationOnLoginSqlErrors);
+        Assert.False(switchesHelper.EnableMultiSubnetFailoverByDefault);
         #if NET
-        Assert.False(LocalAppContextSwitches.GlobalizationInvariantMode);
+        Assert.False(switchesHelper.GlobalizationInvariantMode);
         #endif
         #if NET && _WINDOWS
-        Assert.False(LocalAppContextSwitches.UseManagedNetworking);
+        Assert.False(switchesHelper.UseManagedNetworking);
         #endif
         #if NETFRAMEWORK
-        Assert.False(LocalAppContextSwitches.DisableTnirByDefault);
+        Assert.False(switchesHelper.DisableTnirByDefault);
         #endif
     }
 }

From bfd81b6ae1530f950e3cdd34206b8981ee77f0a2 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 26 Jun 2026 06:39:19 -0300
Subject: [PATCH 166/298] Add BuildAll target (#4290)

* Add BuildAll target, CodeQL update, and ref csproj cleanup

* Replace ancillary BuildTests with first-class per-project targets

* Use TargetOs instead of OS in test projects for TFM selection

Test projects previously used the built-in $(OS) property to gate
net462 inclusion. This meant passing -p:TargetOs=Windows_NT from
build.proj had no effect on test TFM selection.

Migrate all test csproj files and Directory.Build.props to define
TargetOs (defaulting to $(OS)) and condition on it, matching the
pattern already used by the driver project. This allows BuildAll to
build all TFMs regardless of host OS.
---
 .github/workflows/codeql.yml                  |   2 +-
 BUILDGUIDE.md                                 |  46 +-
 build.proj                                    | 429 ++++++++++++++++--
 .../Azure/test/Azure.Test.csproj              |  10 +-
 ...Microsoft.Data.SqlClient.TestCommon.csproj |  10 +-
 .../CustomRetryLogicProvider.csproj           |  10 +-
 ...soft.Data.SqlClient.FunctionalTests.csproj |  10 +-
 ...icrosoft.Data.SqlClient.ManualTests.csproj |  10 +-
 .../tests/StressTests/Directory.Build.props   |   7 +-
 .../tests/TestUdts/Address/Address.csproj     |  10 +-
 .../tests/TestUdts/Circle/Circle.csproj       |  10 +-
 .../tests/TestUdts/Shapes/Shapes.csproj       |  10 +-
 .../TestUdts/Utf8String/Utf8String.csproj     |  10 +-
 .../Microsoft.Data.SqlClient.UnitTests.csproj |  14 +-
 .../TDS/TDS.EndPoint/TDS.EndPoint.csproj      |   5 +-
 15 files changed, 490 insertions(+), 103 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 45890dfdf4..dc237459ee 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -99,7 +99,7 @@ jobs:
     - name: Run manual build steps
       if: matrix.build-mode == 'manual'
       shell: bash
-      run: dotnet build src/Microsoft.Data.SqlClient.slnx
+      run: dotnet build build.proj -t:BuildAll
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v4
diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 073f6afc68..5acf76cbd5 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -69,22 +69,31 @@ dotnet build -t:<build_target> [optional_parameters]
 The command-line examples below will assume that `build.proj` is selected by default and will omit
 it from the `dotnet build` command.
 
+If no target is specified, `build.proj` runs the `BuildAll` target by default, which builds all
+projects, tests, samples, and tools for all supported OS combinations. To build only the driver
+projects, specify `-t:BuildDriver` explicitly.
+
 The following build targets can be used to build the following projects. All targets will implicitly build any other
 projects they depend on.
 
-| `<build_target>`            | Description                                                                     |
-|-----------------------------|---------------------------------------------------------------------------------|
-| `Build`                     | Builds all projects for all platforms                                           |
-| `BuildAbstractions`         | Builds Microsoft.Data.SqlClient.Extensions.Abstractions                         |
-| `BuildAkvProvider`          | Builds Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider           |
-| `BuildAzure`                | Builds Microsoft.Data.SqlClient.Extensions.Azure                                |
-| `BuildLogging`              | Builds Microsoft.Data.SqlClient.Internal.Logging                                |
-| `BuildSqlClient`            | Builds all variants of Microsoft.Data.SqlClient, for all platforms              |
-| `BuildSqlClientRef`         | Builds the reference assemblies for Microsoft.Data.SqlClient                    |
-| `BuildSqlClientUnsupported` | Builds the "unsupported platform" assemblies for Microsoft.Data.SqlClient       |
-| `BuildSqlClientUnix`        | Builds the Unix-specific implementation binaries of Microsoft.Data.SqlClient    |
-| `BuildSqlClientWindows`     | Builds the Windows-specific implementation binaries of Microsoft.Data.SqlClient |
-| `BuildSqlServer`            | Builds Microsoft.SqlServer.Server                                               |
+| `<build_target>`              | Description                                                                     |
+|-------------------------------|---------------------------------------------------------------------------------|
+| `BuildAbstractions`           | Builds Microsoft.Data.SqlClient.Extensions.Abstractions                         |
+| `BuildAkvProvider`            | Builds Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider           |
+| `BuildAll`                    | Builds all projects, tests, samples, and tools for all supported OS combinations (default target) |
+| `BuildAzure`                  | Builds Microsoft.Data.SqlClient.Extensions.Azure                                |
+| `BuildDriver`                 | Builds all driver projects for all platforms                                    |
+| `BuildLogging`                | Builds Microsoft.Data.SqlClient.Internal.Logging                                |
+| `BuildSamples`                | Builds the sample projects under `doc/samples/`                                 |
+| `BuildSqlClient`              | Builds all variants of Microsoft.Data.SqlClient, for all platforms              |
+| `BuildSqlClientNotSupported`  | Builds the "unsupported platform" assemblies for Microsoft.Data.SqlClient       |
+| `BuildSqlClientRef`           | Builds the reference assemblies for Microsoft.Data.SqlClient                    |
+| `BuildSqlClientUnix`          | Builds the Unix-specific implementation binaries of Microsoft.Data.SqlClient    |
+| `BuildSqlClientWindows`       | Builds the Windows-specific implementation binaries of Microsoft.Data.SqlClient |
+| `BuildSqlServer`              | Builds Microsoft.SqlServer.Server                                               |
+| `BuildTests`                  | Builds all test projects for all supported OS combinations                      |
+| `BuildTools`                  | Builds auxiliary tool/app projects                                              |
+| `Clean`                       | Removes build and test output directories                                       |
 
 A selection of parameters for build targets in `build.proj` can be found below:
 
@@ -107,10 +116,16 @@ placed in `artifacts/Microsoft.Data.SqlClient.ref/Project-<configuration>/<tfm>`
 
 #### Examples
 
-Build all projects:
+Build everything (all projects, tests, samples, and tools) using the default target:
+
+```bash
+dotnet build
+```
+
+Build only the driver projects:
 
 ```bash
-dotnet build -t:Build
+dotnet build -t:BuildDriver
 ```
 
 Build Microsoft.Data.SqlClient in Release configuration:
@@ -139,6 +154,7 @@ dotnet build -t:<test_target> [optional_parameters]
 | `<test_target>`            | Description                                                                                                                                         |
 |----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------|
 | `Test`                     | Runs all tests in the repository for all platforms supported by the host OS. _This will take a considerable amount of time and is not recommended_. |
+| `TestAbstractions`         | Runs all tests for Microsoft.Data.SqlClient.Extensions.Abstractions                                                                                 |
 | `TestAzure`                | Runs all tests for Microsoft.Data.SqlClient.Extensions.Azure                                                                                        |
 | `TestSqlClient`            | Runs all tests for Microsoft.Data.SqlClient.                                                                                                        |
 | `TestSqlClientFunctional`  | Runs the "functional" test project for Microsoft.Data.SqlClient. These are a mix of unit and integration tests against live servers.                |
diff --git a/build.proj b/build.proj
index 4ff29a08df..f2ee21f77c 100644
--- a/build.proj
+++ b/build.proj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
+<Project DefaultTargets="BuildAll" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Imports ========================================================= -->
   <Import Project="src/Directory.Build.props" />
 
@@ -246,7 +245,7 @@
 
     <!--
       SigningKeyPath
-      Applies to:     Build*, Pack*
+      Applies to:     Build*, Pack* (driver targets only)
       Description:    Path to the key to use to strong name sign binaries. If omitted, binaries
                       will not be strong name signed.
                       For Pack* targets, this only applies to a build - ie, if PackBuild is set to
@@ -366,10 +365,16 @@
   <!-- Top Level/Miscellaneous Targets -->
 
   <!--
-    Build: Builds all packages
+    BuildAll: Build all projects in the repo, for all supported OS and TargetFramework combinations.
+    This is the default target.
+  -->
+  <Target Name="BuildAll" DependsOnTargets="BuildDriver;BuildTests;BuildSamples;BuildTools" />
+
+  <!--
+    BuildDriver: Builds all driver projects.
     Note: These have been ordered in a vague attempt to minimize multiple rebuilds of dependencies.
   -->
-  <Target Name="Build" DependsOnTargets="BuildLogging;BuildAbstractions;BuildSqlClient;BuildAzure;BuildAkvProvider;BuildSqlServer" />
+  <Target Name="BuildDriver" DependsOnTargets="BuildLogging;BuildAbstractions;BuildSqlClient;BuildAzure;BuildAkvProvider;BuildSqlServer" />
 
   <!-- Clean: Convenience target to remove build/test output -->
   <Target Name="Clean">
@@ -383,16 +388,18 @@
   </Target>
 
   <!--
-    Pack: Packages all packages
+    Pack: Packages all driver projects.
     Note: These have been ordered in a vague attempt to minimize multiple rebuilds of dependencies.
   -->
   <Target Name="Pack" DependsOnTargets="PackLogging;PackAbstractions;PackSqlClient;PackAzure;PackAkvProvider;PackSqlServer" />
 
   <!--
-    Test: Run all test targets for all packages.
-    Note: This will run for a *very* long time and it is not recommended, even in automated test
-      environments. Please consider running project specific test targets or specific test sets
-      within the project.
+    Test: Run all test targets for all driver projects.
+
+    Note: This requires local and remote SQL Server setups with corresponding JSON configuration
+    files. It will run for a *very* long time and it is not recommended, even in automated test
+    environments. Please consider running project specific test targets or specific test sets within
+    the project.
   -->
   <Target Name="Test" DependsOnTargets="TestAbstractions;TestAzure;TestSqlClient" />
 
@@ -441,7 +448,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building GenAPI project via command: '$(DotnetCommand)'"/>
+    <Message Importance="High" Text=">>> Building GenAPI project"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 
     <!-- Get the path to the GenAPI artifact -->
@@ -471,7 +479,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building not supported binaries project via command: '$(DotnetCommand)'"/>
+    <Message Importance="High" Text=">>> Building not supported binaries project"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -500,7 +509,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building SqlClient ref binaries via command: $(DotnetCommand)"/>
+    <Message Importance="High" Text=">>> Building SqlClient ref binaries"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -531,7 +541,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building SqlClient for Unix via command: $(DotnetCommand)"/>
+    <Message Importance="High" Text=">>> Building SqlClient for Unix"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -561,7 +572,8 @@
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Text=">>> Building SqlClient for Windows via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Building SqlClient for Windows"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -607,7 +619,8 @@
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Text=">>> Packing SqlClient via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Packing SqlClient"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 
     <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
@@ -653,7 +666,8 @@
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Text=">>> Running functional tests for SqlClient via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Running functional tests for SqlClient"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -698,7 +712,8 @@
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Text=">>> Running manual tests for SqlClient via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Running manual tests for SqlClient"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -726,7 +741,8 @@
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Text=">>> Running unit tests for SqlClient via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Running unit tests for SqlClient"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -765,7 +781,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Building AKV Provider"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -794,7 +811,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Packaging Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Packaging AKV Provider"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 
     <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
@@ -843,7 +861,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building Microsoft.Data.SqlClient.Extensions.Abstractions via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Building Abstractions"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -869,7 +888,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Packaging Microsoft.Data.SqlClient.Extensions.Abstractions via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Packaging Abstractions"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 
     <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
@@ -908,7 +928,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Running tests for Abstractions via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Running tests for Abstractions"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -945,7 +966,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building Microsoft.Data.SqlClient.Extensions.Azure via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Building Azure"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -971,7 +993,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Packaging Microsoft.Data.SqlClient.Extensions.Azure via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Packaging Azure"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 
     <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
@@ -1013,7 +1036,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Running tests for Azure via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Running tests for Azure"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -1042,7 +1066,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building Microsoft.Data.SqlClient.Internal.Logging via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Building Logging"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -1064,7 +1089,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Packaging Microsoft.Data.SqlClient.Internal.Logging via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Packaging Logging"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 
     <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
@@ -1104,7 +1130,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Building Microsoft.SqlServer.Server via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Building SqlServer"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
@@ -1126,7 +1153,8 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Text=">>> Packaging Microsoft.SqlServer.Server via command: $(DotnetCommand)" />
+    <Message Importance="High" Text=">>> Packaging SqlServer"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 
     <!-- In Package mode, mirror produced packages into local feed (packages/) for downstream restore. -->
@@ -1140,4 +1168,343 @@
       DestinationFolder="$(PackagesDir)"
       SkipUnchangedFiles="true" />
   </Target>
+
+  <!-- ================================================================= -->
+  <!-- Build Test Targets -->
+
+  <PropertyGroup>
+    <SqlClientPerformanceTestProjectPath>$(SqlClientSrcRoot)tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj</SqlClientPerformanceTestProjectPath>
+    <SqlClientStressTestProjectPath>$(SqlClientSrcRoot)tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj</SqlClientStressTestProjectPath>
+    <SamplesProjectPath>$(RepoRoot)doc/samples/Microsoft.Data.SqlClient.Samples.csproj</SamplesProjectPath>
+  </PropertyGroup>
+
+  <!-- BuildTests: Builds all test projects for all supported OS combinations. -->
+  <Target Name="BuildTests" DependsOnTargets="BuildAbstractionsTests;BuildSqlClientTestsUnit;BuildSqlClientTestsFunctional;BuildSqlClientTestsManual;BuildSqlClientTestsPerformance;BuildSqlClientTestsStress;BuildAzureTests" />
+
+  <!-- BuildAbstractionsTests: Builds the Abstractions test project (OS-agnostic). -->
+  <Target Name="BuildAbstractionsTests">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(AbstractionsTestProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building Abstractions Tests"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- BuildSqlClientTestsUnit ================================================= -->
+  <Target Name="BuildSqlClientTestsUnit" DependsOnTargets="BuildSqlClientTestsUnitUnix;BuildSqlClientTestsUnitWindows" />
+
+  <Target Name="BuildSqlClientTestsUnitUnix">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientUnitTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Unix
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(TestSigningKeyPathArgument)
+        $(PackageVersionSqlClientArgument)
+        $(PackageVersionSqlServerArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building SqlClient Unit Tests for Unix"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <Target Name="BuildSqlClientTestsUnitWindows">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientUnitTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Windows_NT
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(TestSigningKeyPathArgument)
+        $(PackageVersionSqlClientArgument)
+        $(PackageVersionSqlServerArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building SqlClient Unit Tests for Windows"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- BuildSqlClientTestsFunctional =========================================== -->
+  <Target Name="BuildSqlClientTestsFunctional" DependsOnTargets="BuildSqlClientTestsFunctionalUnix;BuildSqlClientTestsFunctionalWindows" />
+
+  <Target Name="BuildSqlClientTestsFunctionalUnix">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientFunctionalTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Unix
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building SqlClient Functional Tests for Unix"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <Target Name="BuildSqlClientTestsFunctionalWindows">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientFunctionalTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Windows_NT
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building SqlClient Functional Tests for Windows"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- BuildSqlClientTestsManual =============================================== -->
+  <Target Name="BuildSqlClientTestsManual" DependsOnTargets="BuildSqlClientTestsManualUnix;BuildSqlClientTestsManualWindows" />
+
+  <Target Name="BuildSqlClientTestsManualUnix">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientManualTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Unix
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+        $(PackageVersionSqlServerArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building SqlClient Manual Tests for Unix"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <Target Name="BuildSqlClientTestsManualWindows">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientManualTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Windows_NT
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+        $(PackageVersionSqlServerArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building SqlClient Manual Tests for Windows"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- BuildSqlClientTestsPerformance ========================================== -->
+  <Target Name="BuildSqlClientTestsPerformance" DependsOnTargets="BuildSqlClientTestsPerformanceUnix;BuildSqlClientTestsPerformanceWindows" />
+
+  <Target Name="BuildSqlClientTestsPerformanceUnix">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientPerformanceTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Unix
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building SqlClient Performance Tests for Unix"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <Target Name="BuildSqlClientTestsPerformanceWindows">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientPerformanceTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Windows_NT
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building SqlClient Performance Tests for Windows"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- BuildSqlClientTestsStress =============================================== -->
+  <Target Name="BuildSqlClientTestsStress" DependsOnTargets="BuildSqlClientTestsStressUnix;BuildSqlClientTestsStressWindows" />
+
+  <Target Name="BuildSqlClientTestsStressUnix">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientStressTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Unix
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building SqlClient Stress Tests for Unix"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <Target Name="BuildSqlClientTestsStressWindows">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SqlClientStressTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Windows_NT
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building SqlClient Stress Tests for Windows"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- BuildAzureTests ========================================================= -->
+  <Target Name="BuildAzureTests" DependsOnTargets="BuildAzureTestsUnix;BuildAzureTestsWindows" />
+
+  <Target Name="BuildAzureTestsUnix">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(AzureTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Unix
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building Azure Tests for Unix"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <Target Name="BuildAzureTestsWindows">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(AzureTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Windows_NT
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionSqlClientArgument)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building Azure Tests for Windows"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- ================================================================= -->
+  <!-- Build Samples Target -->
+
+  <!-- Build all sample projects. -->
+  <Target Name="BuildSamples">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(SamplesProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building Samples"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- ================================================================= -->
+  <!-- Build Tools Target -->
+
+  <PropertyGroup>
+    <AzureSqlConnectorProjectPath>$(RepoRoot)doc/apps/AzureSqlConnector/AzureSqlConnector.csproj</AzureSqlConnectorProjectPath>
+    <PackageCompatibilityProjectPath>$(RepoRoot)tools/PackageCompatibility/src/PackageCompatibility.csproj</PackageCompatibilityProjectPath>
+  </PropertyGroup>
+
+  <!-- BuildTools: Builds auxiliary tool/app projects. -->
+  <Target Name="BuildTools" DependsOnTargets="BuildAzureSqlConnector;BuildPackageCompatibility" />
+
+  <!-- BuildAzureSqlConnector: Builds the AzureSqlConnector sample app. -->
+  <Target Name="BuildAzureSqlConnector">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(AzureSqlConnectorProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building AzureSqlConnector"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- BuildPackageCompatibility: Builds the PackageCompatibility tool. -->
+  <Target Name="BuildPackageCompatibility">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(PackageCompatibilityProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building PackageCompatibility"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
 </Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
index 1c020c2ae4..5d6780414b 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
@@ -12,11 +12,11 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      MDS is not built for net462 unless it is built for Windows. Thus, we will not be able to
-      fulfill the MDS for net462 reference unless we are building on Windows.
-    -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Compiler Options ================================================ -->
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index 67c5250748..de44a0c64b 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -25,11 +25,11 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if we
-      are building for Windows.
-    -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <!-- References ====================================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
index bdbdeafe53..ca037a50bf 100644
--- a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
@@ -8,11 +8,11 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if we
-      are building for Windows.
-    -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <!-- References ====================================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
index 9098091ad8..c681d91dc7 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -10,11 +10,11 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if we
-      are building for Windows.
-    -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Links to internal project files ================================= -->
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 4b0dfb6ddd..f3e4b61b45 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -10,11 +10,11 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if we
-      are building for Windows.
-    -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Links to Resources/etc ========================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
index 910f8d53a0..93c1f10d93 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
@@ -13,8 +13,11 @@
     <!-- Target the same frameworks that the rest of the SqlClient tests do. -->
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!-- We can only run .NET Framework tests on Windows, so add net462 if that is the host OS. -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
 
     <!--
       Use the latest C# language version, regardless of what a particular target framework claims to
diff --git a/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj
index c98b9b3fae..03575285d9 100644
--- a/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj
@@ -8,11 +8,11 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if we
-      are building for Windows.
-    -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj
index db53171c6e..e19c8b40a5 100644
--- a/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj
@@ -8,11 +8,11 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if we
-      are building for Windows.
-    -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj
index e115355bfe..d8c2d66253 100644
--- a/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj
@@ -8,11 +8,11 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if we
-      are building for Windows.
-    -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj
index 02e0193f82..cc41b9fb47 100644
--- a/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj
@@ -8,11 +8,11 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if we
-      are building for Windows.
-    -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index 12ea9c52d3..d3405ed113 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -11,11 +11,11 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-    <!--
-      We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if we
-      are building for Windows.
-    -->
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
+
+    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
+    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Embedded resources and content files  =========================== -->
@@ -61,8 +61,8 @@
     as explained above.
   -->
   <PropertyGroup Condition="'$(ReferenceType)' == 'Package'">
-    <_SqlClientRid Condition="'$(OS)' != 'Windows_NT'">unix</_SqlClientRid>
-    <_SqlClientRid Condition="'$(OS)' == 'Windows_NT'">win</_SqlClientRid>
+    <_SqlClientRid Condition="'$(TargetOs)' != 'Windows_NT'">unix</_SqlClientRid>
+    <_SqlClientRid Condition="'$(TargetOs)' == 'Windows_NT'">win</_SqlClientRid>
     <!-- Map test TFM to the closest available package TFM (package ships net8.0/net9.0/net462) -->
     <_SqlClientPackageTfm Condition="'$(TargetFramework)' == 'net8.0'">net8.0</_SqlClientPackageTfm>
     <_SqlClientPackageTfm Condition="'$(TargetFramework)' == 'net462'">net462</_SqlClientPackageTfm>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
index c9dce97ddb..aaede5846b 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
@@ -3,6 +3,7 @@
     <RootNamespace>Microsoft.SqlServer.TDS.EndPoint</RootNamespace>
     <AssemblyName>Microsoft.SqlServer.TDS.EndPoint</AssemblyName>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
   </PropertyGroup>
 
   <!-- Sign when a test key is provided so signed test assemblies can reference this. -->
@@ -48,13 +49,13 @@
   </ItemGroup>
 
   <!-- Windows Only Files -->
-  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+  <ItemGroup Condition="'$(TargetOs)' == 'Windows_NT'">
     <Compile Include="SSPI\SSPIContext.Windows.cs" />
     <Compile Include="SSPI\SecurityWrapper.cs" />
   </ItemGroup>
 
   <!-- Unix Only Files -->
-  <ItemGroup Condition="'$(OS)' == 'Unix'">
+  <ItemGroup Condition="'$(TargetOs)' != 'Windows_NT'">
     <Compile Include="SSPI\SSPIContext.Unix.cs" />
   </ItemGroup>
 

From 8194f5fbb293ce7209a916efa3f606120f7f5421 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 26 Jun 2026 12:04:01 -0300
Subject: [PATCH 167/298] Fix SPN using instance name instead of resolved port
 for Protocol.None and Protocol.Admin (#4180)

---
 .../SqlClient/ManagedSni/SniProxy.netcore.cs  |  31 ++-
 .../ManualTests/DataCommon/DataTestUtility.cs |  45 +++-
 .../SQL/InstanceNameTest/InstanceNameTest.cs  |   2 +
 .../SQL/KerberosTests/KerberosTest.cs         | 204 ++++++++++++++++++
 .../RetryLogic/SqlCommandReliabilityTest.cs   |   2 +-
 .../SqlDataSourceEnumeratorTest.cs            |   2 +-
 .../SniProxyGetSqlServerSPNsTest.cs           | 160 ++++++++++++++
 .../SniProxyGetSqlServerSPNsWindowsTests.cs   |  84 ++++++++
 8 files changed, 514 insertions(+), 16 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniProxyGetSqlServerSPNsTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniProxyGetSqlServerSPNsWindowsTests.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniProxy.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniProxy.netcore.cs
index da6885062d..de40956784 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniProxy.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniProxy.netcore.cs
@@ -116,7 +116,7 @@ internal static SniHandle CreateConnectionHandle(
             return sniHandle;
         }
 
-        private static ResolvedServerSpn GetSqlServerSPNs(DataSource dataSource, string serverSPN)
+        internal static ResolvedServerSpn GetSqlServerSPNs(DataSource dataSource, string serverSPN)
         {
             Debug.Assert(!string.IsNullOrWhiteSpace(dataSource.ServerName));
             if (!string.IsNullOrWhiteSpace(serverSPN))
@@ -132,14 +132,29 @@ private static ResolvedServerSpn GetSqlServerSPNs(DataSource dataSource, string
             }
             else if (!string.IsNullOrWhiteSpace(dataSource.InstanceName))
             {
-                postfix = dataSource.ResolvedProtocol == DataSource.Protocol.TCP ? dataSource.ResolvedPort.ToString() : dataSource.InstanceName;
-            }
-
-            SqlClientEventSource.Log.TryTraceEvent("SNIProxy.GetSqlServerSPN | Info | ServerName {0}, InstanceName {1}, Port {2}, postfix {3}", dataSource?.ServerName, dataSource?.InstanceName, dataSource?.Port, postfix);
+                // Per SQL Server Kerberos/SPN guidance, TCP connections use
+                // MSSQLSvc/<FQDN>:<port> while named pipes use
+                // MSSQLSvc/<FQDN>:<instancename> for named instances. Both forms
+                // are valid — SQL Server registers both at startup — but the port
+                // form is canonical for TCP listeners and matches native SNI behavior.
+                //
+                // Protocol.None means no protocol was explicitly specified. In managed
+                // SNI, Protocol.None is treated as TCP (see CreateConnectionHandle),
+                // so the port-based SPN is appropriate for None/TCP/Admin.
+                //
+                // If SSRP resolution hasn't populated ResolvedPort yet (value <= 0),
+                // fall back to instance name since both SPN forms are valid.
+                // https://learn.microsoft.com/en-us/sql/database-engine/configure-windows/register-a-service-principal-name-for-kerberos-connections?view=sql-server-ver17#named-instance
+                postfix = (dataSource.ResolvedProtocol == DataSource.Protocol.NP || dataSource.ResolvedPort <= 0)
+                    ? dataSource.InstanceName
+                    : dataSource.ResolvedPort.ToString();
+            }
+
+            SqlClientEventSource.Log.TryTraceEvent("SNIProxy.GetSqlServerSPN | Info | ServerName {0}, InstanceName {1}, Port {2}, ResolvedPort {3}, ResolvedProtocol {4}, postfix {5}", dataSource?.ServerName, dataSource?.InstanceName, dataSource?.Port, dataSource?.ResolvedPort, dataSource?.ResolvedProtocol, postfix);
             return GetSqlServerSPNs(hostName, postfix, dataSource.ResolvedProtocol);
         }
 
-        private static ResolvedServerSpn GetSqlServerSPNs(string hostNameOrAddress, string portOrInstanceName, DataSource.Protocol protocol)
+        internal static ResolvedServerSpn GetSqlServerSPNs(string hostNameOrAddress, string portOrInstanceName, DataSource.Protocol protocol)
         {
             Debug.Assert(!string.IsNullOrWhiteSpace(hostNameOrAddress));
             IPHostEntry hostEntry = null;
@@ -607,8 +622,8 @@ private bool InferNamedPipesInformation()
                 // If the data source starts with "np:servername"
                 if (!_dataSourceAfterTrimmingProtocol.Contains(PipeBeginning))
                 {
-                    // Assuming that user did not change default NamedPipe name, if the datasource is in the format servername\instance, 
-                    // separate servername and instance and prepend instance with MSSQL$ and append default pipe path 
+                    // Assuming that user did not change default NamedPipe name, if the datasource is in the format servername\instance,
+                    // separate servername and instance and prepend instance with MSSQL$ and append default pipe path
                     // https://learn.microsoft.com/en-us/sql/tools/configuration-manager/named-pipes-properties?view=sql-server-ver16
                     if (_dataSourceAfterTrimmingProtocol.Contains(PathSeparator) && ResolvedProtocol == Protocol.NP)
                     {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index bd7f6eb262..c465235078 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -682,6 +682,22 @@ public static bool IsNotNamedInstance()
             return !AreConnStringsSetup() || !new SqlConnectionStringBuilder(TCPConnectionString).DataSource.Contains(@"\");
         }
 
+        public static bool IsNamedInstanceSetup()
+        {
+            return IsTCPConnStringSetup() &&
+                ParseDataSource(new SqlConnectionStringBuilder(TCPConnectionString).DataSource,
+                    out _, out _, out string instanceName) &&
+                !string.IsNullOrEmpty(instanceName);
+        }
+
+        public static bool HasExplicitPortInTCPConnString()
+        {
+            return IsTCPConnStringSetup() &&
+                ParseDataSource(new SqlConnectionStringBuilder(TCPConnectionString).DataSource,
+                    out _, out int port, out _) &&
+                port > 0;
+        }
+
         public static bool IsLocalHost()
         {
             SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString);
@@ -723,15 +739,32 @@ public static bool IsSupportingDistributedTransactions()
 #endif
         }
 
-        public static bool IsUsingManagedSNI() => UseManagedSNIOnWindows;
-
-        public static bool IsNotUsingManagedSNIOnWindows() => !UseManagedSNIOnWindows;
+        /// <summary>
+        /// Returns <see langword="true"/> when the managed SNI implementation is active.
+        /// On .NET (non-Framework), managed SNI is always used on non-Windows platforms
+        /// (native SNI does not exist there) and is used on Windows when the
+        /// <c>Switch.Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows</c> AppContext
+        /// switch is enabled (which is what the product code checks at runtime).
+        /// On .NET Framework, native SNI is always used.
+        /// </summary>
+        public static bool IsUsingManagedSNI() =>
+#if NETFRAMEWORK
+            false;
+#else
+            !OperatingSystem.IsWindows() || (AppContext.TryGetSwitch(ManagedNetworkingAppContextSwitch, out bool enabled) && enabled);
+#endif
 
+        /// <summary>
+        /// Returns <see langword="true"/> when the native SNI implementation is active.
+        /// Native SNI is only available on Windows: always on .NET Framework, and on .NET
+        /// only when the <c>Switch.Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows</c>
+        /// AppContext switch is not enabled.
+        /// </summary>
         public static bool IsUsingNativeSNI() =>
-#if !NETFRAMEWORK
-            IsNotUsingManagedSNIOnWindows();
-#else
+#if NETFRAMEWORK
             true;
+#else
+            OperatingSystem.IsWindows() && !(AppContext.TryGetSwitch(ManagedNetworkingAppContextSwitch, out bool enabled) && enabled);
 #endif
         // Synapse: UTF8 collations are not supported with Azure Synapse.
         //          Ref: https://feedback.azure.com/forums/307516-azure-synapse-analytics/suggestions/40103791-utf-8-collations-should-be-supported-in-azure-syna
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
index 437e02c579..c51e8fd892 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs
@@ -7,6 +7,7 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
@@ -227,6 +228,7 @@ private static bool IsSPNPortNumberTestForNP()
         {
             return (IsInstanceNameValid(DataTestUtility.NPConnectionString)
                  && DataTestUtility.IsUsingManagedSNI()
+                 && RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
                  && DataTestUtility.IsNotAzureServer()
                  && DataTestUtility.IsNotAzureSynapse());
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs
index e7d22907e0..5ff4aad8b4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/KerberosTests/KerberosTest.cs
@@ -8,9 +8,26 @@
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
+    /// <summary>
+    /// Integration tests for Kerberos authentication with protocol-specific SPN handling.
+    ///
+    /// These tests verify that the driver generates protocol-specific SPNs for Kerberos authentication
+    /// across different protocol types (TCP, None, Named Pipes, Admin). They complement unit tests
+    /// in SniProxyGetSqlServerSPNsTest by verifying end-to-end authentication behavior in a real
+    /// Kerberos domain environment.
+    ///
+    /// See: https://learn.microsoft.com/en-us/sql/database-engine/configure-windows/register-a-service-principal-name-for-kerberos-connections
+    /// </summary>
     [Trait("Set", "3")]
     public class KerberosTests
     {
+        /// <summary>
+        /// Baseline Kerberos connectivity test verifying that the Kerberos authentication mechanism works
+        /// with the configured connection strings.
+        ///
+        /// This test runs on Unix platforms with Kerberos credentials and verifies that connections
+        /// authenticate using the KERBEROS auth_scheme (confirmed via sys.dm_exec_connections).
+        /// </summary>
         [PlatformSpecific(TestPlatforms.AnyUnix)]
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsKerberosTest))]
         [ClassData(typeof(ConnectionStringsProvider))]
@@ -25,8 +42,195 @@ public void IsKerBerosSetupTestAsync(string connectionStr)
             Assert.True(reader.Read(), "Expected to receive one row data");
             Assert.Equal("KERBEROS", reader.GetString(0));
         }
+
+        /// <summary>
+        /// Tests Kerberos authentication with Protocol.None (default when no protocol prefix specified).
+        ///
+        /// This regression test for GitHub issue #3566 verifies that named instances accessed via
+        /// Protocol.None (e.g. "Data Source=hostname\instancename") use the correct SPN format:
+        /// - If SSRP resolves a port: MSSQLSvc/hostname:port (not instance name)
+        /// - Kerberos should authenticate successfully with the correct SPN
+        ///
+        /// Environment: Requires a named instance running on a domain-joined server with an SSRP-resolvable port.
+        /// </summary>
+        [PlatformSpecific(TestPlatforms.Linux)]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsKerberosTest), nameof(DataTestUtility.IsNamedInstanceSetup))]
+        public void KerberosTest_ProtocolNone_NamedInstanceWithSsrpResolution()
+        {
+            string tcpConnStr = DataTestUtility.TCPConnectionString;
+            DataTestUtility.ParseDataSource(new SqlConnectionStringBuilder(tcpConnStr).DataSource,
+                out string hostname, out int port, out string instanceName);
+
+            KerberosTicketManagemnt.Init(DataTestUtility.KerberosDomainUser, DataTestUtility.KerberosDomainPassword);
+
+            // Build from the base connection string to preserve environment settings (Encrypt,
+            // TrustServerCertificate, timeouts, etc.), overriding only DataSource and IntegratedSecurity.
+            // SSRP resolution should occur and populate the port in the SPN.
+            SqlConnectionStringBuilder protocolNoneBuilder = new(tcpConnStr)
+            {
+                DataSource = $"{hostname}\\{instanceName}",
+                IntegratedSecurity = true
+            };
+
+            using SqlConnection conn = new(protocolNoneBuilder.ConnectionString);
+            conn.Open(); // Connection should succeed with Kerberos using the SSRP-resolved port in SPN
+
+            // Verify authentication occurred with KERBEROS auth_scheme
+            using SqlCommand command = new("SELECT auth_scheme from sys.dm_exec_connections where session_id = @@spid", conn);
+            using SqlDataReader reader = command.ExecuteReader();
+            Assert.True(reader.Read(), "Expected to receive one row data");
+            Assert.Equal("KERBEROS", reader.GetString(0));
+        }
+
+        /// <summary>
+        /// Tests Kerberos authentication with explicit Protocol.TCP prefix on a named instance.
+        ///
+        /// Verifies that "tcp:hostname\instancename" uses the TCP-like SPN format with port:
+        /// MSSQLSvc/hostname:port (where port is from explicit connection string or SSRP resolution).
+        ///
+        /// Environment: Requires a named instance with an explicitly specified or SSRP-resolvable port.
+        /// </summary>
+        [PlatformSpecific(TestPlatforms.Linux)]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsKerberosTest), nameof(DataTestUtility.IsNamedInstanceSetup))]
+        public void KerberosTest_ProtocolTcp_NamedInstance()
+        {
+            string tcpConnStr = DataTestUtility.TCPConnectionString;
+            DataTestUtility.ParseDataSource(new SqlConnectionStringBuilder(tcpConnStr).DataSource,
+                out string hostname, out int port, out string instanceName);
+
+            KerberosTicketManagemnt.Init(DataTestUtility.KerberosDomainUser, DataTestUtility.KerberosDomainPassword);
+
+            // Build the tcp: data source. Include an explicit port only when the test connection string
+            // already has one; otherwise leave SSRP to resolve the port for the named instance.
+            // Do NOT fall back to port 1433: that disables SSRP and is unlikely to be correct for
+            // named instances, and produces an invalid "host\,1433" when instanceName is empty.
+            string newDataSource = port > 0
+                ? $"tcp:{hostname}\\{instanceName},{port}"
+                : $"tcp:{hostname}\\{instanceName}";
+
+            // Preserve the base connection string settings (Encrypt, TrustServerCertificate, etc.)
+            SqlConnectionStringBuilder builder = new(tcpConnStr)
+            {
+                DataSource = newDataSource,
+                IntegratedSecurity = true
+            };
+
+            using SqlConnection conn = new(builder.ConnectionString);
+            conn.Open();
+
+            using SqlCommand command = new("SELECT auth_scheme from sys.dm_exec_connections where session_id = @@spid", conn);
+            using SqlDataReader reader = command.ExecuteReader();
+            Assert.True(reader.Read(), "Expected to receive one row data");
+            Assert.Equal("KERBEROS", reader.GetString(0));
+        }
+
+        /// <summary>
+        /// Tests Kerberos authentication with a custom ServerSPN override.
+        ///
+        /// Verifies that explicitly setting ServerSPN in the connection string bypasses auto-generation
+        /// and uses the provided SPN for Kerberos authentication. This is critical for environments where:
+        /// - Kerberos SPNs are registered with specific hostnames/ports
+        /// - SQL Server is behind a proxy or alias
+        /// - Multi-instance environments with non-standard naming
+        ///
+        /// Environment: Requires ability to specify a valid SPN for the target instance.
+        /// </summary>
+        [PlatformSpecific(TestPlatforms.Linux)]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsKerberosTest), nameof(DataTestUtility.HasExplicitPortInTCPConnString))]
+        public void KerberosTest_CustomServerSPN_BypassesAutoGeneration()
+        {
+            string tcpConnStr = DataTestUtility.TCPConnectionString;
+            DataTestUtility.ParseDataSource(new SqlConnectionStringBuilder(tcpConnStr).DataSource,
+                out string hostname, out int port, out string instanceName);
+
+            KerberosTicketManagemnt.Init(DataTestUtility.KerberosDomainUser, DataTestUtility.KerberosDomainPassword);
+
+            // Build the TCP-format SPN that matches what the driver would auto-generate.
+            // TCP Kerberos connections use MSSQLSvc/fqdn:port regardless of instance name.
+            string fqdn = DataTestUtility.GetMachineFQDN(hostname);
+            string customSpn = $"MSSQLSvc/{fqdn}:{port}";
+
+            SqlConnectionStringBuilder builder = new(tcpConnStr);
+            builder.IntegratedSecurity = true;
+            builder.ServerSPN = customSpn;
+
+            using SqlConnection conn = new(builder.ConnectionString);
+            conn.Open();
+
+            using SqlCommand command = new("SELECT auth_scheme from sys.dm_exec_connections where session_id = @@spid", conn);
+            using SqlDataReader reader = command.ExecuteReader();
+            Assert.True(reader.Read(), "Expected to receive one row data");
+            Assert.Equal("KERBEROS", reader.GetString(0));
+        }
+
+        /// <summary>
+        /// Tests Kerberos authentication with Protocol.Admin (Dedicated Administrator Connection).
+        ///
+        /// Verifies that DAC connections (prefix "admin:") to named instances use the TCP-like SPN format:
+        /// MSSQLSvc/hostname:port (not instance name). DAC uses SSRP resolution similar to TCP.
+        ///
+        /// Environment: Requires DAC to be enabled on the target SQL Server instance and admin credentials.
+        /// Note: May be skipped if DAC is not enabled or not accessible via Kerberos.
+        /// </summary>
+        [PlatformSpecific(TestPlatforms.Linux)]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsKerberosTest), nameof(DataTestUtility.IsNamedInstanceSetup))]
+        public void KerberosTest_ProtocolAdmin_DedicatedAdminConnection()
+        {
+            string tcpConnStr = DataTestUtility.TCPConnectionString;
+            DataTestUtility.ParseDataSource(new SqlConnectionStringBuilder(tcpConnStr).DataSource,
+                out string hostname, out int port, out string instanceName);
+
+            KerberosTicketManagemnt.Init(DataTestUtility.KerberosDomainUser, DataTestUtility.KerberosDomainPassword);
+
+            // DAC can be unavailable in shared test environments. Skip this specific
+            // integration test when the target instance has remote admin connections disabled.
+            SqlConnectionStringBuilder preflightBuilder = new(tcpConnStr)
+            {
+                DataSource = $"{hostname}\\{instanceName}",
+                IntegratedSecurity = true
+            };
+
+            using (SqlConnection preflightConn = new(preflightBuilder.ConnectionString))
+            {
+                preflightConn.Open();
+                using SqlCommand preflightCommand = new("SELECT CAST(value_in_use AS bit) FROM sys.configurations WHERE name = 'remote admin connections'", preflightConn);
+                object preflightResult = preflightCommand.ExecuteScalar();
+                if (preflightResult is not bool remoteAdminEnabled || !remoteAdminEnabled)
+                {
+                    return; // Skip test; DAC is not enabled in this environment
+                }
+            }
+
+            // Build the admin: data source without appending the regular TCP port.
+            // The DAC port is separate from the regular SQL Server port and must be
+            // discovered via SSRP (GetDacPortByInstanceName). Appending the regular
+            // TCP port would bypass DAC port resolution and connect to the wrong endpoint.
+            string newDataSource = $"admin:{hostname}\\{instanceName}";
+
+            SqlConnectionStringBuilder adminBuilder = new(tcpConnStr)
+            {
+                DataSource = newDataSource,
+                IntegratedSecurity = true
+            };
+
+            // Note: this test requires DAC to be enabled on the target instance
+            // (sp_configure 'remote admin connections', 1).
+            using SqlConnection conn = new(adminBuilder.ConnectionString);
+            conn.Open();
+
+            using SqlCommand command = new("SELECT auth_scheme from sys.dm_exec_connections where session_id = @@spid", conn);
+            using SqlDataReader reader = command.ExecuteReader();
+            Assert.True(reader.Read(), "Expected to receive one row data");
+            Assert.Equal("KERBEROS", reader.GetString(0));
+        }
     }
 
+    /// <summary>
+    /// Provides connection strings from DataTestUtility for theory-based Kerberos tests.
+    ///
+    /// Each connection string is tested in a separate Kerberos context to ensure protocol-specific
+    /// SPN behavior works across all available SQL Server configurations in the test environment.
+    /// </summary>
     public class ConnectionStringsProvider : IEnumerable<object[]>
     {
         public IEnumerator<object[]> GetEnumerator()
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs
index 911b90ec5b..25e5675a09 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/RetryLogic/SqlCommandReliabilityTest.cs
@@ -370,7 +370,7 @@ public void DropDatabaseWithActiveConnection(string cnnString, SqlRetryLogicBase
         // In Managed SNI by Named pipe connection, SqlCommand doesn't respect timeout. "ActiveIssue 12167"
         // Synapse: Does not support WAITFOR DELAY.
         // Restricted to non azure: https://github.com/dotnet/SqlClient/issues/3821
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotUsingManagedSNIOnWindows), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsUsingNativeSNI), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
         [MemberData(nameof(UpdateLockedTable_Data), DisableDiscoveryEnumeration = true)]
         public void UpdateLockedTable(string cnnString, SqlRetryLogicBaseProvider provider)
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs
index 4369d75ab0..a89a728756 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs
@@ -20,7 +20,7 @@ private static bool IsEnvironmentAvailable()
             ServiceController[] services = ServiceController.GetServices(Environment.MachineName);
             ServiceController service = services.FirstOrDefault(s => s.ServiceName == "SQLBrowser");
 
-            return DataTestUtility.IsNotUsingManagedSNIOnWindows() &&
+            return DataTestUtility.IsUsingNativeSNI() &&
                 service != null &&
                 service.Status == ServiceControllerStatus.Running;
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniProxyGetSqlServerSPNsTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniProxyGetSqlServerSPNsTest.cs
new file mode 100644
index 0000000000..9e80e24e89
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniProxyGetSqlServerSPNsTest.cs
@@ -0,0 +1,160 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+
+using Microsoft.Data.SqlClient.ManagedSni;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ManagedSni
+{
+    /// <summary>
+    /// Regression tests for SPN (Service Principal Name) selection logic in <see cref="SniProxy"/>.
+    ///
+    /// These tests verify that the driver generates protocol-specific SPNs for Kerberos authentication:
+    /// - TCP-like protocols (TCP, None, Admin) use MSSQLSvc/hostname:port
+    /// - Named Pipes uses MSSQLSvc/hostname:instancename
+    /// - Custom ServerSPN overrides are always respected
+    ///
+    /// This addresses GitHub issue #3566: named instances connecting without a protocol prefix
+    /// (Protocol.None) should use the SSRP-resolved port in the SPN, not the instance name.
+    ///
+    /// See: https://learn.microsoft.com/en-us/sql/database-engine/configure-windows/register-a-service-principal-name-for-kerberos-connections
+    /// </summary>
+    public class SniProxyGetSqlServerSPNsTest
+    {
+        /// <summary>
+        /// Verifies that Protocol.None (default when no prefix specified, e.g. "server\instance")
+        /// uses the SSRP-resolved port in the SPN, not the instance name.
+        ///
+        /// This is a regression test for GitHub issue #3566. On Linux with SSRP, a named instance
+        /// connection string like "Data Source=server\instance" requires the resolved TCP port
+        /// from SSRP to be used in the SPN for Kerberos authentication to succeed.
+        /// </summary>
+        [Fact]
+        public void GetSqlServerSPNs_ProtocolNone_WithResolvedPort_UsesPortNotInstanceName()
+        {
+            // Arrange: parse "localhost\instance" which sets Protocol.None and IsSsrpRequired.
+            // Using "localhost" instead of an arbitrary hostname avoids real DNS lookups
+            // that would make the test flaky in environments with restricted DNS resolution.
+            DataSource dataSource = DataSource.ParseServerName(@"localhost\instance");
+            Assert.NotNull(dataSource);
+            Assert.Equal(DataSource.Protocol.None, dataSource.ResolvedProtocol);
+            Assert.Equal("instance", dataSource.InstanceName);
+            Assert.Equal(-1, dataSource.Port); // No explicit port in connection string
+
+            // Simulate SSRP resolution setting the port (as CreateTcpHandle would do)
+            dataSource.ResolvedPort = 12345;
+
+            // Act: generate SPN for this named instance with resolved port
+            ResolvedServerSpn spn = SniProxy.GetSqlServerSPNs(dataSource, serverSPN: string.Empty);
+
+            // Assert: SPN should contain the resolved port, NOT the instance name
+            Assert.Contains(":12345", spn.Primary);
+            Assert.DoesNotContain("instance", spn.Primary, System.StringComparison.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// Verifies that Protocol.TCP (explicit "tcp:" prefix) uses the resolved port in the SPN.
+        ///
+        /// This was the original fix for GitHub issue #2187 and ensures TCP protocol behavior
+        /// is consistent across all platforms.
+        /// </summary>
+        [Fact]
+        public void GetSqlServerSPNs_ProtocolTcp_WithResolvedPort_UsesPort()
+        {
+            // Arrange: parse "tcp:localhost\instance" which sets Protocol.TCP.
+            // Using "localhost" avoids real DNS lookups that would make the test flaky.
+            DataSource dataSource = DataSource.ParseServerName(@"tcp:localhost\instance");
+            Assert.NotNull(dataSource);
+            Assert.Equal(DataSource.Protocol.TCP, dataSource.ResolvedProtocol);
+
+            // Simulate SSRP resolution setting the port
+            dataSource.ResolvedPort = 54321;
+
+            // Act: generate SPN for this TCP named instance
+            ResolvedServerSpn spn = SniProxy.GetSqlServerSPNs(dataSource, serverSPN: string.Empty);
+
+            // Assert: SPN should use the resolved port
+            Assert.Contains(":54321", spn.Primary);
+            Assert.DoesNotContain("instance", spn.Primary, System.StringComparison.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// Verifies that Protocol.NP (Named Pipes) uses the instance name in the SPN,
+        /// not a port number.
+        ///
+        /// Named Pipes protocol requires instance-name-based SPNs per SQL Server guidelines.
+        /// This test ensures NP behavior is preserved when the general protocol logic is updated.
+        /// </summary>
+        [Fact]
+        public void GetSqlServerSPNs_ProtocolNp_WithInstanceName_UsesInstanceName()
+        {
+            // Arrange & Act: test the lower-level overload directly with NP protocol.
+            // Named Pipes data sources go through a different parsing path that doesn't
+            // populate InstanceName in the same way, so we call the helper directly.
+            // Using "localhost" avoids real DNS lookups that would make the test flaky.
+            ResolvedServerSpn spn = SniProxy.GetSqlServerSPNs("localhost", "myinstance", DataSource.Protocol.NP);
+
+            // Assert: SPN should use the instance name, not a port
+            Assert.Contains(":myinstance", spn.Primary);
+            Assert.Null(spn.Secondary); // NP does not generate a secondary SPN
+        }
+
+        /// <summary>
+        /// Verifies that explicit ServerSPN overrides (via connection string) are used as-is,
+        /// bypassing all auto-generation logic.
+        ///
+        /// This is critical for Kerberos environments where custom SPNs may be required
+        /// (e.g., non-standard ports, aliased hostnames, or specific service accounts).
+        /// </summary>
+        [Fact]
+        public void GetSqlServerSPNs_CustomSpnProvided_UsesCustomSpn()
+        {
+            // Arrange: parse a named instance, but provide a custom SPN override.
+            // Using "localhost" avoids real DNS lookups that would make the test flaky.
+            DataSource dataSource = DataSource.ParseServerName(@"localhost\instance");
+            Assert.NotNull(dataSource);
+            dataSource.ResolvedPort = 12345;
+
+            string customSpn = "MSSQLSvc/myserver.domain.com:1433";
+
+            // Act: generate SPN with explicit override
+            ResolvedServerSpn spn = SniProxy.GetSqlServerSPNs(dataSource, serverSPN: customSpn);
+
+            // Assert: custom SPN is used exactly as provided, without modification
+            Assert.Equal(customSpn, spn.Primary);
+            Assert.Null(spn.Secondary);
+        }
+
+        /// <summary>
+        /// Verifies that Protocol.Admin (Dedicated Administrator Connection, DAC)
+        /// uses the resolved port in the SPN, not the instance name.
+        ///
+        /// DAC also uses SSRP resolution and should follow the same protocol-based logic
+        /// as Protocol.TCP and Protocol.None for SPN generation.
+        /// </summary>
+        [Fact]
+        public void GetSqlServerSPNs_ProtocolAdmin_WithResolvedPort_UsesPort()
+        {
+            // Arrange: parse "admin:localhost\instance" which sets Protocol.Admin.
+            // Using "localhost" avoids real DNS lookups that would make the test flaky.
+            DataSource dataSource = DataSource.ParseServerName(@"admin:localhost\instance");
+            Assert.NotNull(dataSource);
+            Assert.Equal(DataSource.Protocol.Admin, dataSource.ResolvedProtocol);
+
+            // Simulate SSRP resolution setting the port
+            dataSource.ResolvedPort = 11111;
+
+            // Act: generate SPN for this DAC connection to a named instance
+            ResolvedServerSpn spn = SniProxy.GetSqlServerSPNs(dataSource, serverSPN: string.Empty);
+
+            // Assert: SPN should use the resolved port, not the instance name
+            Assert.Contains(":11111", spn.Primary);
+            Assert.DoesNotContain("instance", spn.Primary, System.StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
+
+#endif
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniProxyGetSqlServerSPNsWindowsTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniProxyGetSqlServerSPNsWindowsTests.cs
new file mode 100644
index 0000000000..c8c55ece62
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniProxyGetSqlServerSPNsWindowsTests.cs
@@ -0,0 +1,84 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+
+using System;
+using Microsoft.Data.SqlClient.ManagedSni;
+using Microsoft.Data.SqlClient.Tests.Common;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ManagedSni
+{
+    /// <summary>
+    /// Windows-focused unit tests for managed SNI SPN generation behavior.
+    /// </summary>
+    public sealed class SniProxyGetSqlServerSPNsWindowsTests
+    {
+        /// <summary>
+        /// Verifies Protocol.None uses the SSRP-resolved port in the generated SPN
+        /// for a named instance on Windows.
+        /// </summary>
+        [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)]
+        public void GetSqlServerSPNs_ProtocolNone_WithResolvedPort_UsesPort_OnWindows()
+        {
+            DataSource dataSource = DataSource.ParseServerName(@"localhost\instance");
+            Assert.NotNull(dataSource);
+
+            // Mirror post-SSRP state by injecting a resolved TCP port.
+            dataSource.ResolvedPort = 12345;
+
+            ResolvedServerSpn spn = SniProxy.GetSqlServerSPNs(dataSource, serverSPN: string.Empty);
+
+            // Protocol.None should resolve to a port-based SPN for named instances.
+            Assert.Contains(":12345", spn.Primary);
+            Assert.DoesNotContain("instance", spn.Primary, StringComparison.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// Verifies Protocol.TCP uses the resolved port in the generated SPN
+        /// for a named instance on Windows.
+        /// </summary>
+        [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)]
+        public void GetSqlServerSPNs_ProtocolTcp_WithResolvedPort_UsesPort_OnWindows()
+        {
+            DataSource dataSource = DataSource.ParseServerName(@"tcp:localhost\instance");
+            Assert.NotNull(dataSource);
+
+            // Mirror post-SSRP state by injecting a resolved TCP port.
+            dataSource.ResolvedPort = 54321;
+
+            ResolvedServerSpn spn = SniProxy.GetSqlServerSPNs(dataSource, serverSPN: string.Empty);
+
+            // TCP protocol should use a port postfix and not the instance name.
+            Assert.Contains(":54321", spn.Primary);
+            Assert.DoesNotContain("instance", spn.Primary, StringComparison.OrdinalIgnoreCase);
+        }
+
+        /// <summary>
+        /// Verifies Protocol.Admin (DAC) uses the resolved port in the generated SPN
+        /// for a named instance on Windows.
+        /// </summary>
+        [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)]
+        public void GetSqlServerSPNs_ProtocolAdmin_WithResolvedPort_UsesPort_OnWindows()
+        {
+            DataSource dataSource = DataSource.ParseServerName(@"admin:localhost\instance");
+            Assert.NotNull(dataSource);
+
+            // Mirror post-SSRP state by injecting a resolved DAC port.
+            dataSource.ResolvedPort = 11111;
+
+            ResolvedServerSpn spn = SniProxy.GetSqlServerSPNs(dataSource, serverSPN: string.Empty);
+
+            // Admin protocol follows TCP-like SPN formatting with a port postfix.
+            Assert.Contains(":11111", spn.Primary);
+            Assert.DoesNotContain("instance", spn.Primary, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
+
+#endif

From 297d421eda084ade2c047a589145aadf8649abb1 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sat, 27 Jun 2026 03:18:46 +1000
Subject: [PATCH 168/298] remove sqlserver 7 and 2000 support (#4015)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
---
 .../Azure/test/AADConnectionTest.cs           |   2 +-
 .../Connection/SqlConnectionInternal.cs       |  13 +-
 .../Data/SqlClient/SqlConnectionOptions.cs    |  22 +-
 .../Microsoft/Data/SqlClient/SqlDataReader.cs | 215 ++++--------------
 .../Data/SqlClient/SqlInternalTransaction.cs  |   6 +-
 .../Microsoft/Data/SqlClient/SqlParameter.cs  |   5 +-
 .../src/Microsoft/Data/SqlClient/TdsEnums.cs  |  10 +-
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |  12 +-
 .../ManualTests/BulkCopy/CopyAllFromReader.cs |   4 +-
 .../ManualTests/BulkCopy/UnprivilegedLogin.cs |   7 +-
 .../SimulatedServerTests/ConnectionTests.cs   |  16 +-
 .../tests/tools/TDS/TDS/TDSVersion.cs         |  12 +-
 12 files changed, 98 insertions(+), 226 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs
index 5dd3ac336e..a8060354d4 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs
@@ -97,7 +97,7 @@ public static void ActiveDirectoryDefaultMustPass()
     // ActiveIssue tests can be filtered out of test runs on the dotnet CLI
     // using the filter "category != failing".
     //
-    [ActiveIssue("https://sqlclientdrivers.visualstudio.com/ADO.Net/_workitems/edit/40107")]
+    [ActiveIssue("https://sqlclientdrivers.visualstudio.com/ADO.Net/_workitems/edit/45941")]
     [ConditionalFact(
         typeof(Config),
         nameof(Config.SupportsIntegratedSecurity),
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index 7c3e177520..8ff3d92428 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -830,8 +830,8 @@ public override void EnlistTransaction(Transaction transaction)
             ValidateConnectionForExecute(null);
 
             // If a connection has a local transaction outstanding, and you try to enlist in a DTC
-            // transaction, SQL Server will roll back the local transaction and then enlist (7.0 and
-            // 2000). So, if the user tries to do this, throw.
+            // transaction, SQL Server will roll back the local transaction and then enlist.
+            // So, if the user tries to do this, throw.
             if (HasLocalTransaction)
             {
                 throw ADP.LocalTransactionPresent();
@@ -843,12 +843,9 @@ public override void EnlistTransaction(Transaction transaction)
                 return;
             }
 
-            // If a connection is already enlisted in a DTC transaction, and you try to enlist in
-            // another one, in 7.0 the existing DTC transaction would roll back and then the
-            // connection would enlist in the new one. In SQL 2000 & 2005, when you enlist in a DTC
-            // transaction while the connection is already enlisted in a DTC transaction, the
-            // connection simply switches enlistments. Regardless, simply enlist in the user
-            // specified distributed transaction. This behavior matches OLEDB and ODBC.
+            // If a connection is already enlisted in a DTC transaction and you try to enlist in
+            // another one, the connection simply switches enlistments. This behavior matches
+            // OLEDB and ODBC.
 
             Enlist(transaction);
             // @TODO: CER Exception Handling was removed here (see GH#3581)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
index 734ecc125f..a90c760ebb 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
@@ -53,8 +53,6 @@ internal sealed partial class SqlConnectionOptions
 
         internal enum TypeSystem
         {
-            Latest = 2008,
-            SQLServer2000 = 2000,
             SQLServer2005 = 2005,
             SQLServer2008 = 2008,
             SQLServer2012 = 2012,
@@ -62,8 +60,15 @@ internal enum TypeSystem
 
         internal static class TYPESYSTEMVERSION
         {
+            // "Latest" is accepted as a connection string value so that applications can
+            // explicitly opt in to (and the driver can default to) a stable, well-known type
+            // system rather than having type behavior shift as new SQL Server versions appear.
+            //
+            // NOTE: The name "Latest" is misleading and has nothing to do with which type system
+            // it maps to - it is NOT the newest type system available. It is simply a badly named
+            // sentinel value that the connection string accepts for historical/compatibility
+            // reasons. The actual type system it resolves to is decided where "Latest" is parsed.
             internal const string Latest = "Latest";
-            internal const string SQL_Server_2000 = "SQL Server 2000";
             internal const string SQL_Server_2005 = "SQL Server 2005";
             internal const string SQL_Server_2008 = "SQL Server 2008";
             internal const string SQL_Server_2012 = "SQL Server 2012";
@@ -459,11 +464,12 @@ internal SqlConnectionOptions(string connectionString)
 
             if (typeSystemVersionString.Equals(TYPESYSTEMVERSION.Latest, StringComparison.OrdinalIgnoreCase))
             {
-                _typeSystemVersion = TypeSystem.Latest;
-            }
-            else if (typeSystemVersionString.Equals(TYPESYSTEMVERSION.SQL_Server_2000, StringComparison.OrdinalIgnoreCase))
-            {
-                _typeSystemVersion = TypeSystem.SQLServer2000;
+                // "Latest" (and the default when no version is specified) intentionally maps to
+                // SQL Server 2008 rather than the newest defined type system. Advancing it would
+                // alter type mappings (e.g. the Microsoft.SqlServer.Types assembly version and how
+                // down-level types are surfaced) for existing applications that rely on the default,
+                // which would be a breaking change. Newer type systems must be requested explicitly.
+                _typeSystemVersion = TypeSystem.SQLServer2008;
             }
             else if (typeSystemVersionString.Equals(TYPESYSTEMVERSION.SQL_Server_2005, StringComparison.OrdinalIgnoreCase))
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index 6b7b53688e..db21550aeb 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -594,19 +594,11 @@ internal DataTable BuildSchemaTable()
                             break;
                     }
                 }
-                else if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && col.IsLargeUdt)
+                else if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005 && col.IsLargeUdt)
                 {
-                    if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005)
-                    {
-                        schemaRow[providerType] = SqlDbType.VarBinary;
-                    }
-                    else
-                    {
-                        // TypeSystem.SQLServer2000
-                        schemaRow[providerType] = SqlDbType.Image;
-                    }
+                    schemaRow[providerType] = SqlDbType.VarBinary;
                 }
-                else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
+                else
                 {
                     // TypeSystem.SQLServer2005 and above
 
@@ -625,13 +617,6 @@ internal DataTable BuildSchemaTable()
                         schemaRow[xmlSchemaCollectionName] = col.xmlSchemaCollection?.Name;
                     }
                 }
-                else
-                {
-                    // TypeSystem.SQLServer2000
-
-                    // SqlDbType enum value - variable for certain types when SQLServer2000.
-                    schemaRow[providerType] = GetVersionedMetaType(col.metaType).SqlDbType;
-                }
 
                 if (col.cipherMD != null)
                 {
@@ -1208,19 +1193,11 @@ private string GetDataTypeNameInternal(_SqlMetaData metaData)
             {
                 dataTypeName = MetaType.MetaNVarChar.TypeName;
             }
-            else if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
+            else if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
             {
-                if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005)
-                {
-                    dataTypeName = MetaType.MetaMaxVarBinary.TypeName;
-                }
-                else
-                {
-                    // TypeSystem.SQLServer2000
-                    dataTypeName = MetaType.MetaImage.TypeName;
-                }
+                dataTypeName = MetaType.MetaMaxVarBinary.TypeName;
             }
-            else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
+            else
             {
                 // TypeSystem.SQLServer2005 and above
 
@@ -1241,12 +1218,6 @@ private string GetDataTypeNameInternal(_SqlMetaData metaData)
                     }
                 }
             }
-            else
-            {
-                // TypeSystem.SQLServer2000
-
-                dataTypeName = GetVersionedMetaType(metaData.metaType).TypeName;
-            }
 
             return dataTypeName;
         }
@@ -1297,19 +1268,11 @@ private Type GetFieldTypeInternal(_SqlMetaData metaData)
                 // Return 2008 types as string
                 fieldType = MetaType.MetaNVarChar.ClassType;
             }
-            else if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
+            else if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
             {
-                if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005)
-                {
-                    fieldType = MetaType.MetaMaxVarBinary.ClassType;
-                }
-                else
-                {
-                    // TypeSystem.SQLServer2000
-                    fieldType = MetaType.MetaImage.ClassType;
-                }
+                fieldType = MetaType.MetaMaxVarBinary.ClassType;
             }
-            else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
+            else
             {
                 // TypeSystem.SQLServer2005 and above
                 if (metaData.type == SqlDbType.Udt)
@@ -1334,11 +1297,6 @@ private Type GetFieldTypeInternal(_SqlMetaData metaData)
                     }
                 }
             }
-            else
-            {
-                // TypeSystem.SQLServer2000
-                fieldType = GetVersionedMetaType(metaData.metaType).ClassType; // Com+ type.
-            }
 
             return fieldType;
         }
@@ -1429,19 +1387,11 @@ private Type GetProviderSpecificFieldTypeInternal(_SqlMetaData metaData)
             {
                 providerSpecificFieldType = MetaType.MetaNVarChar.SqlType;
             }
-            else if (_typeSystem <= SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
+            else if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005 && metaData.IsLargeUdt)
             {
-                if (_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2005)
-                {
-                    providerSpecificFieldType = MetaType.MetaMaxVarBinary.SqlType;
-                }
-                else
-                {
-                    // TypeSystem.SQLServer2000
-                    providerSpecificFieldType = MetaType.MetaImage.SqlType;
-                }
+                providerSpecificFieldType = MetaType.MetaMaxVarBinary.SqlType;
             }
-            else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
+            else
             {
                 // TypeSystem.SQLServer2005 and above
                 if (metaData.type == SqlDbType.Udt)
@@ -1468,11 +1418,6 @@ private Type GetProviderSpecificFieldTypeInternal(_SqlMetaData metaData)
                     }
                 }
             }
-            else
-            {
-                // TypeSystem.SQLServer2000
-                providerSpecificFieldType = GetVersionedMetaType(metaData.metaType).SqlType; // SqlType type.
-            }
 
             return providerSpecificFieldType;
         }
@@ -2589,27 +2534,7 @@ virtual public SqlXml GetSqlXml(int i)
             ReadColumn(i);
             SqlXml sx = null;
 
-            if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
-            {
-                // TypeSystem.SQLServer2005
-
-                sx = _data[i].IsNull ? SqlXml.Null : _data[i].SqlCachedBuffer.ToSqlXml();
-            }
-            else
-            {
-                // TypeSystem.SQLServer2000
-
-                // First, attempt to obtain SqlXml value.  If not SqlXml, we will throw the appropriate
-                // cast exception.
-                sx = _data[i].IsNull ? SqlXml.Null : _data[i].SqlCachedBuffer.ToSqlXml();
-
-                // If the above succeeds, then we received a valid SqlXml instance, now we need to force
-                // an InvalidCastException since SqlXml is not exposed with the version knob in this setting.
-                // To do so, we simply force the exception by casting the string representation of the value
-                // To SqlXml.
-                object temp = (object)_data[i].String;
-                sx = (SqlXml)temp;
-            }
+            sx = _data[i].IsNull ? SqlXml.Null : _data[i].SqlCachedBuffer.ToSqlXml();
 
             return sx;
         }
@@ -2683,40 +2608,22 @@ private object GetSqlValueFromSqlBufferInternal(SqlBuffer data, _SqlMetaData met
             {
                 return data.SqlValue;
             }
-            else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
+            else if (metaData.type == SqlDbType.Udt)
             {
-                // TypeSystem.SQLServer2005 and above
-
-                if (metaData.type == SqlDbType.Udt)
+                SqlConnection connection = _connection;
+                if (connection != null)
                 {
-                    SqlConnection connection = _connection;
-                    if (connection != null)
-                    {
-                        connection.CheckGetExtendedUDTInfo(metaData, true);
-                        return connection.GetUdtValue(data.Value, metaData, false);
-                    }
-                    else
-                    {
-                        throw ADP.DataReaderClosed();
-                    }
+                    connection.CheckGetExtendedUDTInfo(metaData, true);
+                    return connection.GetUdtValue(data.Value, metaData, false);
                 }
                 else
                 {
-                    return data.SqlValue;
+                    throw ADP.DataReaderClosed();
                 }
             }
             else
             {
-                // TypeSystem.SQLServer2000
-
-                if (metaData.type == SqlDbType.Xml)
-                {
-                    return data.SqlString;
-                }
-                else
-                {
-                    return data.SqlValue;
-                }
+                return data.SqlValue;
             }
         }
 
@@ -2878,49 +2785,38 @@ private object GetValueFromSqlBufferInternal(SqlBuffer data, _SqlMetaData metaDa
             {
                 return data.Value;
             }
-            else if (_typeSystem != SqlConnectionOptions.TypeSystem.SQLServer2000)
+            else if (metaData.type == SqlDbTypeExtensions.Vector)
             {
-                // TypeSystem.SQLServer2005 and above
-
-                if (metaData.type == SqlDbTypeExtensions.Vector)
+                if (data.IsNull)
                 {
-                    if (data.IsNull)
-                    {
-                        return DBNull.Value;
-                    }
-                    else
+                    return DBNull.Value;
+                }
+                else
+                {
+                    switch (metaData.scale)
                     {
-                        switch (metaData.scale)
-                        {
-                            case (byte)MetaType.SqlVectorElementType.Float32:
-                                return data.GetSqlVector<float>();
-                            default:
-                                throw SQL.VectorTypeNotSupported(metaData.scale.ToString());
-                        }
+                        case (byte)MetaType.SqlVectorElementType.Float32:
+                            return data.GetSqlVector<float>();
+                        default:
+                            throw SQL.VectorTypeNotSupported(metaData.scale.ToString());
                     }
                 }
-
-                if (metaData.type != SqlDbType.Udt)
+            }
+            else if (metaData.type == SqlDbType.Udt)
+            {
+                SqlConnection connection = _connection;
+                if (connection != null)
                 {
-                    return data.Value;
+                    connection.CheckGetExtendedUDTInfo(metaData, true);
+                    return connection.GetUdtValue(data.Value, metaData, true);
                 }
                 else
                 {
-                    SqlConnection connection = _connection;
-                    if (connection != null)
-                    {
-                        connection.CheckGetExtendedUDTInfo(metaData, true);
-                        return connection.GetUdtValue(data.Value, metaData, true);
-                    }
-                    else
-                    {
-                        throw ADP.DataReaderClosed();
-                    }
+                    throw ADP.DataReaderClosed();
                 }
             }
             else
             {
-                // TypeSystem.SQLServer2000
                 return data.Value;
             }
         }
@@ -3237,39 +3133,6 @@ override public int GetValues(object[] values)
             }
         }
 
-        private MetaType GetVersionedMetaType(MetaType actualMetaType)
-        {
-            Debug.Assert(_typeSystem == SqlConnectionOptions.TypeSystem.SQLServer2000, "Should not be in this function under anything else but SQLServer2000");
-
-            MetaType metaType = null;
-
-            if (actualMetaType == MetaType.MetaUdt)
-            {
-                metaType = MetaType.MetaVarBinary;
-            }
-            else if (actualMetaType == MetaType.MetaXml)
-            {
-                metaType = MetaType.MetaNText;
-            }
-            else if (actualMetaType == MetaType.MetaMaxVarBinary)
-            {
-                metaType = MetaType.MetaImage;
-            }
-            else if (actualMetaType == MetaType.MetaMaxVarChar)
-            {
-                metaType = MetaType.MetaText;
-            }
-            else if (actualMetaType == MetaType.MetaMaxNVarChar)
-            {
-                metaType = MetaType.MetaNText;
-            }
-            else
-            {
-                metaType = actualMetaType;
-            }
-
-            return metaType;
-        }
 
         private TdsOperationStatus TryHasMoreResults(out bool moreResults)
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs
index ee6557e55b..69474315cd 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs
@@ -211,10 +211,8 @@ internal void CloseFromConnection()
             {
                 if (processFinallyBlock)
                 {
-                    // Always ensure we're zombied; 2005 will send an EnvChange that
-                    // will cause the zombie, but only if we actually go to the wire;
-                    // 7.0 and 2000 won't send the env change, so we have to handle
-                    // them ourselves.
+                    // Always ensure we're zombied; the server will send an EnvChange
+                    // that will cause the zombie, but only if we actually go to the wire.
                     Zombie();
                 }
             }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
index e030fb11f5..f9e342d4c6 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs
@@ -2129,9 +2129,8 @@ internal MetaType ValidateTypeLengths()
                 }
                 else
                 {
-                    // Notes:
-                    // Elevation from (n)(var)char (4001+) to (n)text succeeds without failure only with 2005 and greater.
-                    // it fails in sql server 2000
+                    // Non-NChar types are measured in bytes, so compare the size in characters
+                    // against the actual size in bytes and keep the larger of the two.
                     maxSizeInBytes = (sizeInCharacters > actualSizeInBytes) ? sizeInCharacters : actualSizeInBytes;
                 }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
index 9b71afc350..46f447d582 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
@@ -325,19 +325,13 @@ public enum ActiveDirectoryWorkflow : byte
 
             Client sends:
             0x70000000 -> 7.0
-            0x71000000 -> 2000 RTM
-            0x71000001 -> 2000 SP1
             0x72xx0002 -> 2005 RTM
 
             Server responds:
-            0x07000000 -> 7.0     // Notice server response format is different for bwd compat
-            0x07010000 -> 2000 RTM // Notice server response format is different for bwd compat
-            0x71000001 -> 2000 SP1
             0x72xx0002 -> 2005 RTM
         */
 
         // Majors:
-        // For 2000 SP1 and later the versioning schema changed and
         // the high-byte is sufficient to distinguish later versions
         public const int SQL2005_MAJOR = 0x72;
         public const int SQL2008_MAJOR = 0x73;
@@ -459,11 +453,9 @@ public enum ActiveDirectoryWorkflow : byte
         public const int MAX_NUMERIC_PRECISION = 0x26; // 38 is max numeric precision;
         public const byte UNKNOWN_PRECISION_SCALE = 0xff; // -1 is value for unknown precision or scale
 
-        // The following datatypes are specific to 2000 (version 8) and later.
+        // The following datatypes are specific to 2005 (version 9) or later
         public const int SQLINT8 = 0x7f;
         public const int SQLVARIANT = 0x62;
-
-        // The following datatypes are specific to 2005 (version 9) or later
         public const int SQLXMLTYPE = 0xf1;
         public const int XMLUNICODEBOM = 0xfeff;
         public static readonly byte[] XMLUNICODEBOMBYTES = { 0xff, 0xfe };
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index c3f96b077a..9f37d30015 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -640,8 +640,6 @@ bool withFailover
                     isTlsFirst,
                     serverCertificateFilename);
 
-                // Don't need to check for 7.0 failure, since we've already consumed
-                // one pre-login packet and know we are connecting to 2000.
                 if (status == PreLoginHandshakeStatus.InstanceFailure)
                 {
                     SqlClientEventSource.Log.TryTraceEvent("<sc.TdsParser.Connect|ERR|SEC> Prelogin handshake unsuccessful. Login failure");
@@ -2344,7 +2342,6 @@ internal void WriteDouble(double v, TdsParserStateObject stateObj)
 
         internal void PrepareResetConnection(bool preserveTransaction)
         {
-            // Set flag to reset connection upon next use - only for use on 2000!
             _fResetConnection = true;
             _fPreserveTransaction = preserveTransaction;
         }
@@ -4337,9 +4334,6 @@ private TdsOperationStatus TryProcessLoginAck(TdsParserStateObject stateObj, out
             uint increment = (a.tdsVersion >> 16) & 0xff;
 
             // Server responds:
-            // 0x07000000 -> 7.0         // Notice server response format is different for bwd compat
-            // 0x07010000 -> 2000 RTM     // Notice server response format is different for bwd compat
-            // 0x71000001 -> 2000 SP1
             // 0x72xx0002 -> 2005 RTM
             // information provided by S. Ashwin
             switch (majorMinor)
@@ -4769,8 +4763,8 @@ internal TdsOperationStatus TryProcessReturnValue(int length,
             rec.metaType = MetaType.GetSqlDataType(tdsType, userType, tdsLen);
             rec.type = rec.metaType.SqlDbType;
 
-            // always use the nullable type for parameters if 2000 or later
-            // 7.0 sometimes sends fixed length return values
+            // always use the nullable type for parameters if 2005 or later
+            // older servers sometimes send fixed length return values
             rec.tdsType = rec.metaType.NullableType;
             rec.IsNullable = true;
             if (tdsLen == TdsEnums.SQL_USHORTVARMAXLEN)
@@ -10178,7 +10172,7 @@ internal Task TdsExecuteRPC(SqlCommand cmd, IList<_SqlRPC> rpcArray, int timeout
                         {
                             if (rpcext.ProcID != 0)
                             {
-                                // Perf optimization for 2000 and later,
+                                // Perf optimization for 2005 and later,
                                 Debug.Assert(rpcext.ProcID < 255, "rpcExec:ProcID can't be larger than 255");
                                 WriteShort(0xffff, stateObj);
                                 WriteShort((short)(rpcext.ProcID), stateObj);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
index 17a613294b..fd6b06bafb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
@@ -45,10 +45,10 @@ public void Test()
                         using (DbDataReader reader = srcCmd.ExecuteReader())
                         {
                             IDictionary stats;
-                            long expectedIduCount = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 2 : 0;
+                            long expectedIduCount = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 2 : 1;
                             long expectedSelectCount = DataTestUtility.IsAzureSynapse ? 4 : 13;
                             long expectedSelectRows = DataTestUtility.IsAzureSynapse ? 4 : 15;
-                            long expectedTransactions = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 2 : 0;
+                            long expectedTransactions = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 2 : 1;
                             using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                             {
                                 bulkcopy.DestinationTableName = dstTable;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs
index 08915e30ab..7fd5b36237 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs
@@ -31,6 +31,11 @@ public sealed class UnprivilegedLogin : IDisposable
         DataTestUtility.AreConnStringsSetup() && DataTestUtility.IsNotAzureServer()
             && DataTestUtility.CanCreateLogins && DataTestUtility.CanUseSqlAuthentication;
 
+    // Graph tables (AS NODE / AS EDGE) were introduced in SQL Server 2017, so tests which rely on
+    // them must be skipped against older servers.
+    public static bool CanRunGraphTests =>
+        CanRunTests && DataTestUtility.IsAtLeastSQL2017();
+
     public UnprivilegedLogin()
     {
         // xUnit will instantiate the class before evaluating the test condition - make sure that we don't
@@ -134,7 +139,7 @@ public void BulkCopyWithoutMetadataPermission_Succeeds()
         Assert.Equal(BulkCopyRowCount, resultantRowCount);
     }
 
-    [ConditionalFact(nameof(CanRunTests))]
+    [ConditionalFact(nameof(CanRunGraphTests))]
     public void BulkCopyWithoutMetadataPermission_FailsWhenUsingAliases()
     {
         AssertEnvironmentCreated();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index 57e8d17632..ef058c881a 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -57,7 +57,7 @@ public void IntegratedAuthConnectionTest()
 
         /// <summary>
         /// Runs a test where TDS Server doesn't send encryption info during pre-login response.
-        /// The driver is expected to fail when that happens, and terminate the connection during pre-login phase 
+        /// The driver is expected to fail when that happens, and terminate the connection during pre-login phase
         /// when client enables encryption using Encrypt=true or uses default encryption setting.
         /// </summary>
         [Fact]
@@ -476,7 +476,7 @@ public void ConnectionTimeoutTest(int timeout)
             }.ConnectionString;
             using SqlConnection connection = new(connStr);
 
-            // Dispose the server to force connection timeout 
+            // Dispose the server to force connection timeout
             server.Dispose();
 
             // Measure the actual time it took to timeout and compare it with configured timeout
@@ -520,7 +520,7 @@ public async Task ConnectionTimeoutTestAsync(int timeout)
             }.ConnectionString;
             using SqlConnection connection = new(connStr);
 
-            // Dispose the server to force connection timeout 
+            // Dispose the server to force connection timeout
             server.Dispose();
 
             // Measure the actual time it took to timeout and compare it with configured timeout
@@ -711,11 +711,17 @@ public void ConnectionTestPermittedVersion(int major, int minor, int build)
             Assert.Equal(simulatedServerVersion, returnedServerVersion);
         }
 
+        // Verifies that the client refuses to connect to a SQL Server whose TDS
+        // protocol version predates the minimum supported version (2005). This is
+        // genuine client-side coverage: the simulated server emits a real legacy
+        // LOGINACK (TDS 7.0 for SQL Server 7.0, TDS 7.1 for SQL Server 2000), and
+        // the driver rejects the negotiated version in TryProcessLoginAck via
+        // SQL.InvalidTDSVersion(), which surfaces as an InvalidOperationException.
         [Theory]
         [InlineData(7, 0, 623)] // SQL Server 7.0
         [InlineData(8, 0, 194)] // SQL Server 2000 RTM
         [InlineData(8, 0, 384)] // SQL Server 2000 SP1
-        public void ConnectionTestDeniedVersion(int major, int minor, int build)
+        public void ConnectionRefusesUnsupportedServerTdsVersion(int major, int minor, int build)
         {
             Version simulatedServerVersion = new(major, minor, build);
             using TdsServer server = new(
@@ -731,6 +737,8 @@ public void ConnectionTestDeniedVersion(int major, int minor, int build)
             }.ConnectionString;
             using SqlConnection conn = new(connStr);
 
+            // The driver receives a LOGINACK advertising a pre-2005 TDS version and
+            // refuses it, throwing InvalidOperationException (SQL.InvalidTDSVersion).
             Assert.Throws<InvalidOperationException>(() => conn.Open());
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDSVersion.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDSVersion.cs
index d17d879ed4..bee5e0084c 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDSVersion.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDSVersion.cs
@@ -58,10 +58,16 @@ public static Version GetTDSVersion(Version buildVersion)
             }
             else if (buildVersion.Major == 8)
             {
+                // SQL Server 2000. This version is no longer supported by the
+                // client; the simulated server can still emit it so that the
+                // client's rejection of unsupported versions can be exercised.
                 return SqlServer2000;
             }
             else if (buildVersion.Major == 7)
             {
+                // SQL Server 7.0. This version is no longer supported by the
+                // client; the simulated server can still emit it so that the
+                // client's rejection of unsupported versions can be exercised.
                 return SqlServer7_0;
             }
             else
@@ -97,7 +103,11 @@ public static Version Resolve(Version tdsServer, Version tdsClient)
         /// </summary>
         public static bool IsSupported(Version tdsVersion)
         {
-            return tdsVersion >= SqlServer7_0 && tdsVersion <= SqlServer2012;
+            // The simulated server can speak any TDS version up to 2012,
+            // including the legacy 7.0/2000 versions. Emitting those legacy
+            // versions lets tests verify that the client rejects servers whose
+            // TDS version is no longer supported.
+            return tdsVersion <= SqlServer2012;
         }
     }
 }

From c7ee148cb9fa3cbc14c47ef781b03f5d31f7e6ae Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 26 Jun 2026 16:57:21 -0300
Subject: [PATCH 169/298] Harden SqlConnection state transitions with CAS
 guards (#4267)

---
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |   4 +
 .../Microsoft/Data/SqlClient/SqlConnection.cs |  64 +++-
 .../SqlConnectionConcurrentOpenTests.cs       |   6 +-
 .../SqlConnectionStateTransitionTests.cs      | 289 ++++++++++++++++++
 4 files changed, 356 insertions(+), 7 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStateTransitionTests.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index 568592072d..16b2689730 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -1106,6 +1106,10 @@ internal enum ConnectionError
             GetConnectionReturnsNull,
             ConnectionOptionsMissing,
             CouldNotSwitchToClosedPreviouslyOpenedState,
+            InvalidSourceStateForSetInnerConnectionTo,
+            FailedToCommitSetInnerConnectionTo,
+            InvalidSourceStateForSetInnerConnectionEvent,
+            FailedToCommitSetInnerConnectionEvent,
         }
 
         internal static Exception InternalConnectionError(ConnectionError internalError)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index 7b236afc2b..171bff0109 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -2236,7 +2236,16 @@ private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, SqlConnec
             return result;
         }
 
-        private bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry)
+        /// <summary>
+        /// Completes the inner open/replace operation and initializes parser state for the active inner connection.
+        /// </summary>
+        /// <param name="retry">Retry continuation used by async open paths.</param>
+        /// <returns><see langword="true"/> when open initialization completed synchronously; otherwise <see langword="false"/>.</returns>
+        /// <remarks>
+        /// The inner connection is snapshotted after the open call so downstream parser access uses a single observed
+        /// instance and does not rely on a second racy read of <see cref="InnerConnection"/>.
+        /// </remarks>
+        internal bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry)
         {
             // Create a single TimeoutTimer that represents the overall connection-open budget for this
             // attempt. The timer is threaded through every layer (inner connection state transitions,
@@ -2408,11 +2417,32 @@ internal void RemoveWeakReference(object value)
 
         // ClosedBusy->Closed (never opened)
         // Connecting->Closed (exception during open, return to previous closed state)
+        /// <summary>
+        /// Finalizes a non-evented transition from a transitional inner state to a stable closed state.
+        /// </summary>
+        /// <param name="to">The target inner connection state object.</param>
+        /// <remarks>
+        /// This path is restricted to transition sources that intentionally serialize external callers while state is
+        /// being updated. A compare-and-swap prevents stale writers from overwriting a newer inner connection state.
+        /// </remarks>
         internal void SetInnerConnectionTo(DbConnectionInternal to)
         {
             Debug.Assert(_innerConnection != null, "null InnerConnection");
             Debug.Assert(to != null, "to null InnerConnection");
-            _innerConnection = to;
+
+            DbConnectionInternal originalInnerConnection = _innerConnection;
+            if (originalInnerConnection != DbConnectionClosedBusy.SingletonInstance &&
+                originalInnerConnection != DbConnectionClosedConnecting.SingletonInstance)
+            {
+                // SetInnerConnectionTo is only valid while leaving a known transitional state.
+                throw ADP.InternalConnectionError(ADP.ConnectionError.InvalidSourceStateForSetInnerConnectionTo);
+            }
+
+            if (originalInnerConnection != Interlocked.CompareExchange(ref _innerConnection, to, originalInnerConnection))
+            {
+                // Reject stale writers when another thread already advanced the state machine.
+                throw ADP.InternalConnectionError(ADP.ConnectionError.FailedToCommitSetInnerConnectionTo);
+            }
         }
 
         // Closed->Connecting: prevent set_ConnectionString during Open
@@ -2430,14 +2460,37 @@ internal bool SetInnerConnectionFrom(DbConnectionInternal to, DbConnectionIntern
 
         // OpenBusy->Closed (previously opened)
         // Connecting->Open
+        /// <summary>
+        /// Finalizes an evented state transition from a transitional inner state to a stable target state.
+        /// </summary>
+        /// <param name="to">The target inner connection state object.</param>
+        /// <remarks>
+        /// This path is intentionally restricted to the expected transition sources (<see cref="DbConnectionOpenBusy"/>
+        /// and <see cref="DbConnectionClosedConnecting"/>). A compare-and-swap enforces that the transition commits only
+        /// if no concurrent writer has already changed <see cref="_innerConnection"/>.
+        /// </remarks>
         internal void SetInnerConnectionEvent(DbConnectionInternal to)
         {
             Debug.Assert(_innerConnection != null, "null InnerConnection");
             Debug.Assert(to != null, "to null InnerConnection");
 
-            ConnectionState originalState = _innerConnection.State & ConnectionState.Open;
+            DbConnectionInternal originalInnerConnection = _innerConnection;
+            if (originalInnerConnection != DbConnectionOpenBusy.SingletonInstance &&
+                originalInnerConnection != DbConnectionClosedConnecting.SingletonInstance)
+            {
+                // Evented transitions are valid only from the two expected transitional sources.
+                throw ADP.InternalConnectionError(ADP.ConnectionError.InvalidSourceStateForSetInnerConnectionEvent);
+            }
+
+            ConnectionState originalState = originalInnerConnection.State & ConnectionState.Open;
             ConnectionState currentState = to.State & ConnectionState.Open;
 
+            if (originalInnerConnection != Interlocked.CompareExchange(ref _innerConnection, to, originalInnerConnection))
+            {
+                // Ensure event and close-count side effects are tied to a committed transition only.
+                throw ADP.InternalConnectionError(ADP.ConnectionError.FailedToCommitSetInnerConnectionEvent);
+            }
+
             if ((originalState != currentState) && (ConnectionState.Closed == currentState))
             {
                 unchecked
@@ -2446,8 +2499,6 @@ internal void SetInnerConnectionEvent(DbConnectionInternal to)
                 }
             }
 
-            _innerConnection = to;
-
             if (ConnectionState.Closed == originalState && ConnectionState.Open == currentState)
             {
                 OnStateChange(DbConnectionInternal.StateChangeOpen);
@@ -2574,9 +2625,10 @@ private void ConnectionString_Set(ConnectionPoolKey key)
                 flag = SetInnerConnectionFrom(DbConnectionClosedBusy.SingletonInstance, connectionInternal);
                 if (flag)
                 {
+                    // Publish option/pool metadata before releasing the busy state back to a stable closed state.
                     _userConnectionOptions = connectionOptions;
                     _poolGroup = poolGroup;
-                    _innerConnection = DbConnectionClosedNeverOpened.SingletonInstance;
+                    SetInnerConnectionTo(DbConnectionClosedNeverOpened.SingletonInstance);
                 }
             }
             if (!flag)
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
index c38a30d317..8d151e61cd 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
@@ -36,7 +36,11 @@ private static DbConnectionInternal GetConnectingSingleton()
 
         private static void ForceInnerConnection(SqlConnection connection, DbConnectionInternal innerConnectionValue)
         {
-            connection.SetInnerConnectionTo(innerConnectionValue);
+            // Use SetInnerConnectionFrom to transition from the current state via CAS.
+            // SetInnerConnectionTo requires the connection to already be in a transitional state.
+            DbConnectionInternal current = connection.InnerConnection;
+            bool swapped = connection.SetInnerConnectionFrom(innerConnectionValue, current);
+            Assert.True(swapped, $"CAS failed: expected current state {current.GetType().Name} but it changed concurrently.");
         }
 
         private static bool InvokeTryOpenInner(SqlConnection connection, TaskCompletionSource<DbConnectionInternal> retry)
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStateTransitionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStateTransitionTests.cs
new file mode 100644
index 0000000000..b1decd2be0
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStateTransitionTests.cs
@@ -0,0 +1,289 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Threading.Tasks;
+using System.Transactions;
+using Microsoft.Data.ProviderBase;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests;
+
+/// <summary>
+/// Regression tests for connection state transitions that can be affected by concurrent state updates.
+/// </summary>
+public class SqlConnectionStateTransitionTests
+{
+    /// <summary>
+    /// Verifies TryOpenInner does not surface an invalid cast when the inner state changes after TryOpenConnection.
+    /// </summary>
+    [Fact]
+    public void TryOpenInner_WhenInnerConnectionChangesAfterTryOpen_ThrowsInvalidOperation()
+    {
+        using SqlConnection connection = new();
+        connection.ForceNewConnection = false;
+        bool initialized = connection.SetInnerConnectionFrom(new TestRaceDbConnectionInternal(), DbConnectionClosedNeverOpened.SingletonInstance);
+        Assert.True(initialized);
+
+        InvalidOperationException exception = Assert.Throws<InvalidOperationException>(() => connection.TryOpenInner(null));
+        Assert.NotNull(exception);
+        Assert.Same(DbConnectionClosedPreviouslyOpened.SingletonInstance, connection.InnerConnection);
+    }
+
+    /// <summary>
+    /// Verifies TryOpenInner does not surface an invalid cast when the inner state changes after TryReplaceConnection.
+    /// </summary>
+    [Fact]
+    public void TryOpenInner_WhenInnerConnectionChangesAfterTryReplace_ThrowsInvalidOperation()
+    {
+        using SqlConnection connection = new();
+        connection.ForceNewConnection = true;
+        bool initialized = connection.SetInnerConnectionFrom(new TestRaceDbConnectionInternal(), DbConnectionClosedNeverOpened.SingletonInstance);
+        Assert.True(initialized);
+
+        InvalidOperationException exception = Assert.Throws<InvalidOperationException>(() => connection.TryOpenInner(null));
+        Assert.NotNull(exception);
+        Assert.Same(DbConnectionClosedPreviouslyOpened.SingletonInstance, connection.InnerConnection);
+    }
+
+    /// <summary>
+    /// Verifies evented state transitions reject non-transitional source states.
+    /// </summary>
+    [Fact]
+    public void SetInnerConnectionEvent_WhenInnerConnectionIsNotTransitionState_ThrowsInvalidOperation()
+    {
+        using SqlConnection connection = new();
+        bool initialized = connection.SetInnerConnectionFrom(DbConnectionClosedPreviouslyOpened.SingletonInstance, DbConnectionClosedNeverOpened.SingletonInstance);
+        Assert.True(initialized);
+
+        int initialCloseCount = connection.CloseCount;
+        int eventCount = 0;
+        connection.StateChange += (_, _) => eventCount++;
+
+        InvalidOperationException exception = Assert.Throws<InvalidOperationException>(
+            () => connection.SetInnerConnectionEvent(new TestOpenDbConnectionInternal()));
+        Assert.NotNull(exception);
+        Assert.Equal(initialCloseCount, connection.CloseCount);
+        Assert.Equal(0, eventCount);
+    }
+
+    /// <summary>
+    /// Verifies direct transition-to-state writes reject non-transitional source states.
+    /// </summary>
+    [Fact]
+    public void SetInnerConnectionTo_WhenInnerConnectionIsNotTransitionState_ThrowsInvalidOperation()
+    {
+        using SqlConnection connection = new();
+        bool initialized = connection.SetInnerConnectionFrom(DbConnectionClosedPreviouslyOpened.SingletonInstance, DbConnectionClosedNeverOpened.SingletonInstance);
+        Assert.True(initialized);
+
+        InvalidOperationException exception = Assert.Throws<InvalidOperationException>(
+            () => connection.SetInnerConnectionTo(DbConnectionClosedNeverOpened.SingletonInstance));
+        Assert.NotNull(exception);
+    }
+
+    /// <summary>
+    /// Verifies Connecting-to-Open event transitions raise a single open state-change notification.
+    /// </summary>
+    [Fact]
+    public void SetInnerConnectionEvent_FromConnectingToOpen_RaisesOpenStateChange()
+    {
+        using SqlConnection connection = new();
+        bool enteredConnecting = connection.SetInnerConnectionFrom(DbConnectionClosedConnecting.SingletonInstance, DbConnectionClosedNeverOpened.SingletonInstance);
+        Assert.True(enteredConnecting);
+
+        int initialCloseCount = connection.CloseCount;
+        int eventCount = 0;
+        StateChangeEventArgs? stateChange = null;
+        connection.StateChange += (_, e) => { eventCount++; stateChange = e; };
+
+        connection.SetInnerConnectionEvent(new TestOpenDbConnectionInternal());
+
+        Assert.Equal(1, eventCount);
+        Assert.NotNull(stateChange);
+        Assert.Equal(ConnectionState.Closed, stateChange!.OriginalState);
+        Assert.Equal(ConnectionState.Open, stateChange.CurrentState);
+        Assert.Equal(initialCloseCount, connection.CloseCount);
+    }
+
+    /// <summary>
+    /// Verifies OpenBusy-to-Closed event transitions raise a single closed state-change notification and increment close count.
+    /// </summary>
+    [Fact]
+    public void SetInnerConnectionEvent_FromOpenBusyToClosed_RaisesClosedStateChangeAndIncrementsCloseCount()
+    {
+        using SqlConnection connection = new();
+        TestOpenDbConnectionInternal openConnection = new();
+
+        bool enteredOpen = connection.SetInnerConnectionFrom(openConnection, DbConnectionClosedNeverOpened.SingletonInstance);
+        Assert.True(enteredOpen);
+        bool enteredOpenBusy = connection.SetInnerConnectionFrom(DbConnectionOpenBusy.SingletonInstance, openConnection);
+        Assert.True(enteredOpenBusy);
+
+        int initialCloseCount = connection.CloseCount;
+        int eventCount = 0;
+        StateChangeEventArgs? stateChange = null;
+        connection.StateChange += (_, e) => { eventCount++; stateChange = e; };
+
+        connection.SetInnerConnectionEvent(DbConnectionClosedPreviouslyOpened.SingletonInstance);
+
+        Assert.Equal(1, eventCount);
+        Assert.NotNull(stateChange);
+        Assert.Equal(ConnectionState.Open, stateChange!.OriginalState);
+        Assert.Equal(ConnectionState.Closed, stateChange.CurrentState);
+        Assert.Equal(initialCloseCount + 1, connection.CloseCount);
+    }
+
+    /// <summary>
+    /// A test inner connection that forces a post-open state change to simulate race-sensitive transition windows.
+    /// </summary>
+    private sealed class TestRaceDbConnectionInternal : DbConnectionInternal
+    {
+        /// <summary>
+        /// Initializes a closed test connection that permits connection-string updates.
+        /// </summary>
+        internal TestRaceDbConnectionInternal() : base(ConnectionState.Closed, true, true)
+        {
+        }
+
+        /// <summary>
+        /// Gets a placeholder server version for abstract member satisfaction.
+        /// </summary>
+        public override string ServerVersion => "0";
+
+        /// <summary>
+        /// Not supported in this test double.
+        /// </summary>
+        /// <param name="il">Requested isolation level.</param>
+        /// <returns>Never returns; always throws.</returns>
+        public override DbTransaction BeginTransaction(System.Data.IsolationLevel il) => throw new NotSupportedException();
+
+        /// <summary>
+        /// No-op for this test double.
+        /// </summary>
+        /// <param name="transaction">Transaction to enlist.</param>
+        public override void EnlistTransaction(Transaction transaction)
+        {
+        }
+
+        /// <summary>
+        /// No-op reset for this test double.
+        /// </summary>
+        internal override void ResetConnection()
+        {
+        }
+
+        /// <summary>
+        /// No-op activation for this test double.
+        /// </summary>
+        /// <param name="transaction">Transaction supplied by the caller.</param>
+        protected override void Activate(Transaction transaction)
+        {
+        }
+
+        /// <summary>
+        /// No-op deactivation for this test double.
+        /// </summary>
+        protected override void Deactivate()
+        {
+        }
+
+        /// <summary>
+        /// Simulates a race by replacing the inner connection with a closed singleton after open succeeds.
+        /// </summary>
+        /// <param name="outerConnection">Owning outer connection.</param>
+        /// <param name="connectionFactory">Factory used to mutate inner state.</param>
+        /// <param name="retry">Retry continuation.</param>
+        /// <param name="timeout">Timeout timer (unused in test).</param>
+        /// <returns>Always <see langword="true"/>.</returns>
+        internal override bool TryOpenConnection(
+            DbConnection outerConnection,
+            SqlConnectionFactory connectionFactory,
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout)
+        {
+            // Mirror the real open path by committing through a valid transitional source state first.
+            connectionFactory.SetInnerConnectionFrom(outerConnection, DbConnectionClosedConnecting.SingletonInstance, this);
+            connectionFactory.SetInnerConnectionTo(outerConnection, DbConnectionClosedPreviouslyOpened.SingletonInstance);
+            return true;
+        }
+
+        /// <summary>
+        /// Simulates a race by replacing the inner connection with a closed singleton after replace succeeds.
+        /// </summary>
+        /// <param name="outerConnection">Owning outer connection.</param>
+        /// <param name="connectionFactory">Factory used to mutate inner state.</param>
+        /// <param name="retry">Retry continuation.</param>
+        /// <param name="timeout">Timeout timer (unused in test).</param>
+        /// <returns>Always <see langword="true"/>.</returns>
+        internal override bool TryReplaceConnection(
+            DbConnection outerConnection,
+            SqlConnectionFactory connectionFactory,
+            TaskCompletionSource<DbConnectionInternal> retry,
+            TimeoutTimer timeout)
+        {
+            // Mirror the real replace path by committing through a valid transitional source state first.
+            connectionFactory.SetInnerConnectionFrom(outerConnection, DbConnectionClosedBusy.SingletonInstance, this);
+            connectionFactory.SetInnerConnectionTo(outerConnection, DbConnectionClosedPreviouslyOpened.SingletonInstance);
+            return true;
+        }
+    }
+
+    /// <summary>
+    /// A minimal open-state inner connection used as a non-transitional target in transition validation tests.
+    /// </summary>
+    private sealed class TestOpenDbConnectionInternal : DbConnectionInternal
+    {
+        /// <summary>
+        /// Initializes an open test connection instance.
+        /// </summary>
+        internal TestOpenDbConnectionInternal() : base(ConnectionState.Open, true, false)
+        {
+        }
+
+        /// <summary>
+        /// Gets a placeholder server version for abstract member satisfaction.
+        /// </summary>
+        public override string ServerVersion => "0";
+
+        /// <summary>
+        /// Not supported in this test double.
+        /// </summary>
+        /// <param name="il">Requested isolation level.</param>
+        /// <returns>Never returns; always throws.</returns>
+        public override DbTransaction BeginTransaction(System.Data.IsolationLevel il) => throw new NotSupportedException();
+
+        /// <summary>
+        /// No-op for this test double.
+        /// </summary>
+        /// <param name="transaction">Transaction to enlist.</param>
+        public override void EnlistTransaction(Transaction transaction)
+        {
+        }
+
+        /// <summary>
+        /// No-op reset for this test double.
+        /// </summary>
+        internal override void ResetConnection()
+        {
+        }
+
+        /// <summary>
+        /// No-op activation for this test double.
+        /// </summary>
+        /// <param name="transaction">Transaction supplied by the caller.</param>
+        protected override void Activate(Transaction transaction)
+        {
+        }
+
+        /// <summary>
+        /// No-op deactivation for this test double.
+        /// </summary>
+        protected override void Deactivate()
+        {
+        }
+    }
+}

From c30bbbcc284fecc3219af30a6ddcff1f4aa08bc6 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Mon, 29 Jun 2026 17:56:43 -0500
Subject: [PATCH 170/298] Sort modifiers (#4412)

---
 .../Handles/SafeLibraryHandle.netcore.cs      |   4 +-
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |  14 +-
 .../IpAddressPreferenceUtilities.cs           |   4 +-
 .../Microsoft/Data/Common/NameValuePair.cs    |   6 +-
 .../ProviderBase/DbReferenceCollection.cs     |   6 +-
 .../DbConnectionPoolAuthenticationContext.cs  |   2 +-
 ...bConnectionPoolAuthenticationContextKey.cs |   2 +-
 .../ConnectionPool/DbConnectionPoolGroup.cs   |   2 +-
 .../SqlConfigurableRetryFactory.cs            |   8 +-
 .../Data/SqlClient/Server/SmiMetaData.cs      |   6 +-
 .../Data/SqlClient/SqlCachedBuffer.cs         |   6 +-
 .../Microsoft/Data/SqlClient/SqlConnection.cs |   8 +-
 .../Data/SqlClient/SqlConnectionOptions.cs    |   4 +-
 .../Data/SqlClient/SqlDataAdapter.cs          |  12 +-
 .../Microsoft/Data/SqlClient/SqlDataReader.cs | 132 +++++++++---------
 .../Microsoft/Data/SqlClient/SqlException.cs  |   2 +-
 .../Data/SqlClient/SqlInfoMessageEvent.cs     |   2 +-
 .../Data/SqlClient/SqlInternalTransaction.cs  |   4 +-
 .../Data/SqlClient/SqlQueryMetadataCache.cs   |   2 +-
 .../Data/SqlClient/SqlReferenceCollection.cs  |   4 +-
 .../Data/SqlClient/SqlRowUpdatedEvent.cs      |   2 +-
 .../Data/SqlClient/SqlRowUpdatingEvent.cs     |   4 +-
 .../Data/SqlClient/SqlSequentialTextReader.cs |   8 +-
 .../src/Microsoft/Data/SqlClient/SqlStream.cs |  12 +-
 .../Data/SqlClient/SqlSymmetricKeyCache.cs    |   2 +-
 .../src/Microsoft/Data/SqlClient/SqlUtil.cs   |  12 +-
 .../SqlClient/TdsParserSafeHandles.windows.cs |   6 +-
 .../Data/SqlClient/TdsParserStateObject.cs    |   2 +-
 .../Data/SqlClient/TdsParserStaticMethods.cs  |  14 +-
 29 files changed, 146 insertions(+), 146 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.netcore.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.netcore.cs
index 64bc92d6d4..54512985f1 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.netcore.cs
@@ -8,11 +8,11 @@
 
 namespace Interop.Windows.Handles
 {
-    sealed internal class SafeLibraryHandle : SafeHandleZeroOrMinusOneIsInvalid
+    internal sealed class SafeLibraryHandle : SafeHandleZeroOrMinusOneIsInvalid
     {
         internal SafeLibraryHandle() : base(true) { }
 
-        override protected bool ReleaseHandle()
+        protected override bool ReleaseHandle()
         {
             return Kernel32.Kernel32.FreeLibrary(handle);
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index 16b2689730..2eb9429675 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -105,7 +105,7 @@ internal static InvalidUdtException CreateInvalidUdtException(Type udtType, stri
 
         #endregion
 
-        static private void TraceException(string trace, Exception e)
+        private static void TraceException(string trace, Exception e)
         {
             Debug.Assert(e != null, "TraceException: null Exception");
             if (e is not null)
@@ -1030,7 +1030,7 @@ internal static NotImplementedException MethodNotImplemented([CallerMemberName]
 #region Stream
         internal static Exception StreamClosed([CallerMemberName] string method = "") => InvalidOperation(StringsHelper.GetString(Strings.ADP_StreamClosed, method));
 
-        static internal Exception InvalidSeekOrigin(string parameterName) => ArgumentOutOfRange(StringsHelper.GetString(Strings.ADP_InvalidSeekOrigin), parameterName);
+        internal static Exception InvalidSeekOrigin(string parameterName) => ArgumentOutOfRange(StringsHelper.GetString(Strings.ADP_InvalidSeekOrigin), parameterName);
 
         internal static IOException ErrorReadingFromStream(Exception internalException) => IO(StringsHelper.GetString(Strings.SqlMisc_StreamErrorMessage), internalException);
 #endregion
@@ -1157,7 +1157,7 @@ internal static Exception NonSeqByteAccess(long badIndex, long currIndex, string
 
 #region IDbCommand
         // IDbCommand.CommandType
-        static internal ArgumentOutOfRangeException InvalidCommandType(CommandType value)
+        internal static ArgumentOutOfRangeException InvalidCommandType(CommandType value)
         {
 #if DEBUG
             switch (value)
@@ -1442,16 +1442,16 @@ internal static ArgumentException InvalidMixedArgumentOfSecureCredentialAndInteg
         internal static InvalidOperationException InvalidMixedUsageOfAccessTokenAndIntegratedSecurity()
             => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndIntegratedSecurity));
 
-        static internal InvalidOperationException InvalidMixedUsageOfAccessTokenAndUserIDPassword()
+        internal static InvalidOperationException InvalidMixedUsageOfAccessTokenAndUserIDPassword()
             => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndUserIDPassword));
 
-        static internal InvalidOperationException InvalidMixedUsageOfAccessTokenAndAuthentication()
+        internal static InvalidOperationException InvalidMixedUsageOfAccessTokenAndAuthentication()
             => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndAuthentication));
 
-        static internal Exception InvalidMixedUsageOfCredentialAndAccessToken()
+        internal static Exception InvalidMixedUsageOfCredentialAndAccessToken()
             => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfCredentialAndAccessToken));
 
-        static internal Exception InvalidMixedUsageOfAccessTokenAndTokenCallback()
+        internal static Exception InvalidMixedUsageOfAccessTokenAndTokenCallback()
             => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndTokenCallback));
 
         internal static Exception InvalidMixedUsageOfAccessTokenCallbackAndAuthentication()
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/IpAddressPreferenceUtilities.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/IpAddressPreferenceUtilities.cs
index 747ae157e4..cbd07658f9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/IpAddressPreferenceUtilities.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/IpAddressPreferenceUtilities.cs
@@ -13,7 +13,7 @@ internal static class IpAddressPreferenceUtilities
         /// <summary>
         /// IP Address Preference.
         /// </summary>
-        private readonly static Dictionary<string, SqlConnectionIPAddressPreference> s_preferenceNames = new(StringComparer.InvariantCultureIgnoreCase);
+        private static readonly Dictionary<string, SqlConnectionIPAddressPreference> s_preferenceNames = new(StringComparer.InvariantCultureIgnoreCase);
 
         static IpAddressPreferenceUtilities()
         {
@@ -27,7 +27,7 @@ static IpAddressPreferenceUtilities()
         ///  Convert a string value to the corresponding IPAddressPreference.
         /// </summary>
         /// <param name="value">The string representation of the enumeration name to convert.</param>
-        /// <param name="result">When this method returns, `result` contains an object of type `SqlConnectionIPAddressPreference` whose value is represented by `value` if the operation succeeds. 
+        /// <param name="result">When this method returns, `result` contains an object of type `SqlConnectionIPAddressPreference` whose value is represented by `value` if the operation succeeds.
         /// If the parse operation fails, `result` contains the default value of the `SqlConnectionIPAddressPreference` type.</param>
         /// <returns>`true` if the value parameter was converted successfully; otherwise, `false`.</returns>
         internal static bool TryConvertToIPAddressPreference(string value, out SqlConnectionIPAddressPreference result)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/NameValuePair.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/NameValuePair.cs
index e3db46466a..7505780bb4 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/NameValuePair.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/NameValuePair.cs
@@ -11,10 +11,10 @@ namespace Microsoft.Data.Common
     [Serializable]
     internal sealed class NameValuePair
     {
-        readonly private string _name;
-        readonly private string _value;
+        private readonly string _name;
+        private readonly string _value;
         [OptionalField(VersionAdded = 2)]
-        readonly private int _length;
+        private readonly int _length;
         private NameValuePair _next;
 
         internal NameValuePair(string name, string value, int length)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbReferenceCollection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbReferenceCollection.cs
index 843f600b59..26db3b7ea7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbReferenceCollection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbReferenceCollection.cs
@@ -81,7 +81,7 @@ protected DbReferenceCollection()
             _lastItemIndex = 0;
         }
 
-        abstract public void Add(object value, int refInfo);
+        public abstract void Add(object value, int refInfo);
 
         protected void AddItem(object value, int refInfo)
         {
@@ -220,9 +220,9 @@ public void Deactivate()
             }
         }
 
-        abstract protected void NotifyItem(int refInfo, object value);
+        protected abstract void NotifyItem(int refInfo, object value);
 
-        abstract public void Remove(object value);
+        public abstract void Remove(object value);
 
         protected void RemoveItem(object value)
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolAuthenticationContext.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolAuthenticationContext.cs
index 2b487b5fb7..db70c57eaa 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolAuthenticationContext.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolAuthenticationContext.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     /// Represents the context of an authentication attempt when using the new active directory based authentication mechanisms.
     /// All data members, except_isUpdateInProgressCounter, should be immutable.
     /// </summary>
-    sealed internal class DbConnectionPoolAuthenticationContext
+    internal sealed class DbConnectionPoolAuthenticationContext
     {
         /// <summary>
         /// The value expected in _isUpdateInProgress if a thread has taken a lock on this context,
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolAuthenticationContextKey.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolAuthenticationContextKey.cs
index e12648b3d0..f1cc66601e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolAuthenticationContextKey.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolAuthenticationContextKey.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     /// Represents the key of dbConnectionPoolAuthenticationContext.
     /// All data members should be immutable and so, hashCode is pre-computed.
     /// </summary>
-    sealed internal class DbConnectionPoolAuthenticationContextKey
+    internal sealed class DbConnectionPoolAuthenticationContextKey
     {
         /// <summary>
         /// Security Token Service Authority.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
index 8f62787e30..a7e0d1c48b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
@@ -30,7 +30,7 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     // and once no pools remain, change state from Active->Idle->Disabled
     // Once Disabled, factory can remove its reference to the pool entry
 
-    sealed internal class DbConnectionPoolGroup
+    internal sealed class DbConnectionPoolGroup
     {
         private readonly SqlConnectionOptions _connectionOptions;
         private readonly ConnectionPoolKey _poolKey;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryFactory.cs
index 0bcebdad9a..fae822ac25 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryFactory.cs
@@ -37,7 +37,7 @@ public sealed class SqlRetryLogicOption
     /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConfigurableRetryFactory.xml' path='docs/members[@name="SqlConfigurableRetryFactory"]/SqlConfigurableRetryFactory/*' />
     public sealed class SqlConfigurableRetryFactory
     {
-        private readonly static object s_syncObject = new();
+        private static readonly object s_syncObject = new();
 
         /// Default known transient error numbers.
         // We use a HashSet internally for O(1) lookup performance in the hot path. The public API exposes a ReadOnlyCollection.
@@ -50,7 +50,7 @@ private static readonly HashSet<int> s_defaultTransientErrors
                     1222,   // Lock request time out period exceeded.
                     4060,   // Cannot open database "%.*ls" requested by the login. The login failed.
                     4221,   // Login to read-secondary failed due to long wait on 'HADR_DATABASE_WAIT_FOR_TRANSITION_TO_VERSIONING'. The replica is not available for login because row versions are missing for transactions that were in-flight when the replica was recycled. The issue can be resolved by rolling back or committing the active transactions on the primary replica. Occurrences of this condition can be minimized by avoiding long write transactions on the primary.
-                    10060,  // An error has occurred while establishing a connection to the server. When connecting to SQL Server, this failure may be caused by the fact that under the default settings SQL Server does not allow remote connections. (provider: TCP Provider, error: 0 - A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.) (Microsoft SQL Server, Error: 10060)    
+                    10060,  // An error has occurred while establishing a connection to the server. When connecting to SQL Server, this failure may be caused by the fact that under the default settings SQL Server does not allow remote connections. (provider: TCP Provider, error: 0 - A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.) (Microsoft SQL Server, Error: 10060)
                     10928,  // Resource ID: %d. The %s limit for the database is %d and has been reached. For more information, see http://go.microsoft.com/fwlink/?LinkId=267637.
                     10929,  // Resource ID: %d. The %s minimum guarantee is %d, maximum limit is %d and the current usage for the database is %d. However, the server is currently too busy to support requests greater than %d for this database. For more information, see http://go.microsoft.com/fwlink/?LinkId=267637. Otherwise, please try again later.
                     40143,  // The service has encountered an error processing your request. Please try again.
@@ -74,7 +74,7 @@ public static SqlRetryLogicBaseProvider CreateExponentialRetryProvider(SqlRetryL
                                            retryLogicOption != null ? new SqlExponentialIntervalEnumerator(retryLogicOption.DeltaTime, retryLogicOption.MaxTimeInterval, retryLogicOption.MinTimeInterval) : null);
 
         /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConfigurableRetryFactory.xml' path='docs/members[@name="SqlConfigurableRetryFactory"]/CreateIncrementalRetryProvider/*' />
-        public static SqlRetryLogicBaseProvider CreateIncrementalRetryProvider(SqlRetryLogicOption retryLogicOption) 
+        public static SqlRetryLogicBaseProvider CreateIncrementalRetryProvider(SqlRetryLogicOption retryLogicOption)
             => InternalCreateRetryProvider(retryLogicOption,
                                             retryLogicOption != null ? new SqlIncrementalIntervalEnumerator(retryLogicOption.DeltaTime, retryLogicOption.MaxTimeInterval, retryLogicOption.MinTimeInterval) : null);
 
@@ -109,7 +109,7 @@ public static SqlRetryLogicBaseProvider CreateNoneRetryProvider()
         /// <summary>
         /// Verifies the provider which is not null and doesn't include SqlNoneIntervalEnumerator enumerator object.
         /// </summary>
-        internal static bool IsRetriable(SqlRetryLogicBaseProvider provider) 
+        internal static bool IsRetriable(SqlRetryLogicBaseProvider provider)
             => provider is not null && (provider.RetryLogic is null || provider.RetryLogic.RetryIntervalEnumerator is not SqlNoneIntervalEnumerator);
 
         /// Return true if the exception is a transient fault.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiMetaData.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiMetaData.cs
index 220471394c..f2d430f2e2 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiMetaData.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiMetaData.cs
@@ -112,7 +112,7 @@ internal class SmiMetaData
         internal static readonly SmiMetaData DefaultDateTimeOffset = new SmiMetaData(SqlDbType.DateTimeOffset, 10, 0, 7, SqlCompareOptions.None);     // SqlDbType.DateTimeOffset
         // No default for generic UDT
 
-        internal static SmiMetaData DefaultNVarChar => 
+        internal static SmiMetaData DefaultNVarChar =>
             new SmiMetaData(
                 DefaultNVarChar_NoCollation.SqlDbType,
                 DefaultNVarChar_NoCollation.MaxLength,
@@ -530,7 +530,7 @@ private void SetDefaultsForType(SqlDbType dbType)
             _extendedProperties = smdDflt._extendedProperties;  // This is ok due to immutability
         }
 
-        virtual internal string TraceString(int indent)
+        internal virtual string TraceString(int indent)
         {
             string indentStr = new string(' ', indent);
             string fields = string.Empty;
@@ -847,7 +847,7 @@ internal override string TraceString(int indent)
 
     // SmiStorageMetaData
     //
-    //  This class represents the addition of storage-level attributes to the hierarchy (i.e. attributes from 
+    //  This class represents the addition of storage-level attributes to the hierarchy (i.e. attributes from
     //  underlying table, source variables, or whatever).
     //
     //  Most values use Null (either IsNullable == true or CLR null) to indicate "Not specified" state.  Selection
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs
index f0f7edf099..5810db6d5a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs
@@ -51,7 +51,7 @@ internal static TdsOperationStatus TryCreate(SqlMetaDataPriv metadata, TdsParser
                     cachedBytes = null;
                 }
             }
- 
+
             if (cachedBytes == null)
             {
                 cachedBytes = new List<byte[]>();
@@ -128,7 +128,7 @@ internal static TdsOperationStatus TryCreate(SqlMetaDataPriv metadata, TdsParser
 
         private static void AddByteOrderMark(byte[] byteArr, List<byte[]> cachedBytes)
         {
-            // Need to find out if we should add byte order mark or not. 
+            // Need to find out if we should add byte order mark or not.
             // We need to add this if we are getting ntext xml, not if we are getting binary xml
             // Binary Xml always begins with the bytes 0xDF and 0xFF
             // If we aren't getting these, then we are getting Unicode xml
@@ -144,7 +144,7 @@ internal Stream ToStream()
             return new SqlCachedStream(this);
         }
 
-        override public string ToString()
+        public override string ToString()
         {
             if (IsNull)
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index 171bff0109..bf99482d41 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -1240,14 +1240,14 @@ protected override void OnStateChange(StateChangeEventArgs stateChange)
         // PUBLIC METHODS
         //
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/BeginTransaction2/*' />
-        new public SqlTransaction BeginTransaction()
+        public new SqlTransaction BeginTransaction()
         {
             // this is just a delegate. The actual method tracks executiontime
             return BeginTransaction(IsolationLevel.Unspecified, null);
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/BeginTransactionIso/*' />
-        new public SqlTransaction BeginTransaction(IsolationLevel iso)
+        public new SqlTransaction BeginTransaction(IsolationLevel iso)
         {
             // this is just a delegate. The actual method tracks executiontime
             return BeginTransaction(iso, null);
@@ -1265,7 +1265,7 @@ public SqlTransaction BeginTransaction(string transactionName)
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/BeginDbTransaction/*' />
         [SuppressMessage("Microsoft.Reliability", "CA2004:RemoveCallsToGCKeepAlive")]
-        override protected DbTransaction BeginDbTransaction(IsolationLevel isolationLevel)
+        protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLevel)
         {
             using (SqlClientEventScope.Create("SqlConnection.BeginDbTransaction | API | Object Id {0}, Isolation Level {1}", ObjectID, (int)isolationLevel))
             {
@@ -1469,7 +1469,7 @@ public override void Close()
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/CreateCommand/*' />
-        new public SqlCommand CreateCommand()
+        public new SqlCommand CreateCommand()
         {
             return new SqlCommand(null, this);
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
index a90c760ebb..42c562a4d1 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs
@@ -984,7 +984,7 @@ internal SqlConnectionEncryptOption ConvertValueToSqlConnectionEncrypt()
             }
         }
 
-        static internal Dictionary<string, string> NetlibMapping()
+        internal static Dictionary<string, string> NetlibMapping()
         {
             const int NetLibCount = 8;
 
@@ -1007,7 +1007,7 @@ static internal Dictionary<string, string> NetlibMapping()
             }
             return hash;
         }
-        static internal bool ValidProtocol(string protocol)
+        internal static bool ValidProtocol(string protocol)
         {
             return protocol switch
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs
index 3b07ab0706..14d976803b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataAdapter.cs
@@ -68,7 +68,7 @@ private SqlDataAdapter(SqlDataAdapter from) : base(from)
         [DefaultValue(null)]
         [ResCategory(nameof(Strings.DataCategory_Update))]
         [ResDescription(nameof(Strings.DbDataAdapter_DeleteCommand))]
-        new public SqlCommand DeleteCommand
+        public new SqlCommand DeleteCommand
         {
             get { return _deleteCommand; }
             set { _deleteCommand = value; }
@@ -85,7 +85,7 @@ IDbCommand IDbDataAdapter.DeleteCommand
         [DefaultValue(null)]
         [ResCategory(nameof(Strings.DataCategory_Update))]
         [ResDescription(nameof(Strings.DbDataAdapter_InsertCommand))]
-        new public SqlCommand InsertCommand
+        public new SqlCommand InsertCommand
         {
             get { return _insertCommand; }
             set { _insertCommand = value; }
@@ -102,7 +102,7 @@ IDbCommand IDbDataAdapter.InsertCommand
         [DefaultValue(null)]
         [ResCategory(nameof(Strings.DataCategory_Fill))]
         [ResDescription(nameof(Strings.DbDataAdapter_SelectCommand))]
-        new public SqlCommand SelectCommand
+        public new SqlCommand SelectCommand
         {
             get { return _selectCommand; }
             set { _selectCommand = value; }
@@ -119,7 +119,7 @@ IDbCommand IDbDataAdapter.SelectCommand
         [DefaultValue(null)]
         [ResCategory(nameof(Strings.DataCategory_Update))]
         [ResDescription(nameof(Strings.DbDataAdapter_UpdateCommand))]
-        new public SqlCommand UpdateCommand
+        public new SqlCommand UpdateCommand
         {
             get { return _updateCommand; }
             set { _updateCommand = value; }
@@ -285,7 +285,7 @@ public event SqlRowUpdatingEventHandler RowUpdating
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/OnRowUpdated/*' />
-        override protected void OnRowUpdated(RowUpdatedEventArgs value)
+        protected override void OnRowUpdated(RowUpdatedEventArgs value)
         {
             SqlRowUpdatedEventHandler handler = (SqlRowUpdatedEventHandler)Events[s_eventRowUpdated];
             if (handler != null && value is SqlRowUpdatedEventArgs args)
@@ -296,7 +296,7 @@ override protected void OnRowUpdated(RowUpdatedEventArgs value)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataAdapter.xml' path='docs/members[@name="SqlDataAdapter"]/OnRowUpdating/*' />
-        override protected void OnRowUpdating(RowUpdatingEventArgs value)
+        protected override void OnRowUpdating(RowUpdatingEventArgs value)
         {
             SqlRowUpdatingEventHandler handler = (SqlRowUpdatingEventHandler)Events[s_eventRowUpdating];
             if (handler != null && value is SqlRowUpdatingEventArgs args)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index db21550aeb..14c8a51b4f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -159,7 +159,7 @@ protected SqlConnection Connection
         public SensitivityClassification SensitivityClassification { get; internal set; }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/Depth/*' />
-        override public int Depth
+        public override int Depth
         {
             get
             {
@@ -174,7 +174,7 @@ override public int Depth
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/FieldCount/*' />
         // fields/attributes collection
-        override public int FieldCount
+        public override int FieldCount
         {
             get
             {
@@ -197,7 +197,7 @@ override public int FieldCount
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/HasRows/*' />
-        override public bool HasRows
+        public override bool HasRows
         {
             get
             {
@@ -215,7 +215,7 @@ override public bool HasRows
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/IsClosed/*' />
-        override public bool IsClosed
+        public override bool IsClosed
         {
             get
             {
@@ -363,7 +363,7 @@ internal virtual SmiExtendedMetaData[] GetInternalSmiMetaData()
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/RecordsAffected/*' />
-        override public int RecordsAffected
+        public override int RecordsAffected
         {
             get
             {
@@ -406,7 +406,7 @@ internal MultiPartTableName[] TableNames
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/VisibleFieldCount/*' />
-        override public int VisibleFieldCount
+        public override int VisibleFieldCount
         {
             get
             {
@@ -425,7 +425,7 @@ override public int VisibleFieldCount
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/ItemI/*' />
         // this operator
-        override public object this[int i]
+        public override object this[int i]
         {
             get
             {
@@ -434,7 +434,7 @@ override public object this[int i]
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/ItemName/*' />
-        override public object this[string name]
+        public override object this[string name]
         {
             get
             {
@@ -1093,7 +1093,7 @@ private TdsOperationStatus TryCloseInternal(bool closeReader)
             }
         }
 
-        virtual internal void CloseReaderFromConnection()
+        internal virtual void CloseReaderFromConnection()
         {
             var parser = _parser;
             Debug.Assert(parser == null || parser.State != TdsParserState.OpenNotLoggedIn, "Reader on a connection that is not logged in");
@@ -1169,7 +1169,7 @@ private TdsOperationStatus TryConsumeMetaData()
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetDataTypeName/*' />
-        override public string GetDataTypeName(int i)
+        public override string GetDataTypeName(int i)
         {
             SqlStatistics statistics = null;
             try
@@ -1222,7 +1222,7 @@ private string GetDataTypeNameInternal(_SqlMetaData metaData)
             return dataTypeName;
         }
 
-        virtual internal SqlBuffer.StorageType GetVariantInternalStorageType(int i)
+        internal virtual SqlBuffer.StorageType GetVariantInternalStorageType(int i)
         {
             Debug.Assert(_data != null, "Attempting to get variant internal storage type");
             Debug.Assert(i < _data.Length, "Reading beyond data length?");
@@ -1231,7 +1231,7 @@ virtual internal SqlBuffer.StorageType GetVariantInternalStorageType(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetEnumerator/*' />
-        override public IEnumerator GetEnumerator()
+        public override IEnumerator GetEnumerator()
         {
             return new DbEnumerator(this, IsCommandBehavior(CommandBehavior.CloseConnection));
         }
@@ -1240,7 +1240,7 @@ override public IEnumerator GetEnumerator()
 #if !NETFRAMEWORK
         [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
-        override public Type GetFieldType(int i)
+        public override Type GetFieldType(int i)
         {
             SqlStatistics statistics = null;
             try
@@ -1314,7 +1314,7 @@ private static Type GetVectorFieldType(byte vectorElementType)
             };
         }
 
-        virtual internal int GetLocaleId(int i)
+        internal virtual int GetLocaleId(int i)
         {
             _SqlMetaData sqlMetaData = MetaData[i];
             int lcid;
@@ -1348,7 +1348,7 @@ virtual internal int GetLocaleId(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetName/*' />
-        override public string GetName(int i)
+        public override string GetName(int i)
         {
             CheckMetaDataIsReady(columnIndex: i);
 
@@ -1360,7 +1360,7 @@ override public string GetName(int i)
 #if NET
         [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
-        override public Type GetProviderSpecificFieldType(int i)
+        public override Type GetProviderSpecificFieldType(int i)
         {
             SqlStatistics statistics = null;
             try
@@ -1424,7 +1424,7 @@ private Type GetProviderSpecificFieldTypeInternal(_SqlMetaData metaData)
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetOrdinal/*' />
         // named field access
-        override public int GetOrdinal(string name)
+        public override int GetOrdinal(string name)
         {
             SqlStatistics statistics = null;
             try
@@ -1444,13 +1444,13 @@ override public int GetOrdinal(string name)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetProviderSpecificValue/*' />
-        override public object GetProviderSpecificValue(int i)
+        public override object GetProviderSpecificValue(int i)
         {
             return GetSqlValue(i);
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetProviderSpecificValues/*' />
-        override public int GetProviderSpecificValues(object[] values)
+        public override int GetProviderSpecificValues(object[] values)
         {
             return GetSqlValues(values);
         }
@@ -1482,14 +1482,14 @@ public override DataTable GetSchemaTable()
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetBoolean/*' />
-        override public bool GetBoolean(int i)
+        public override bool GetBoolean(int i)
         {
             ReadColumn(i);
             return _data[i].Boolean;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetXmlReader/*' />
-        virtual public XmlReader GetXmlReader(int i)
+        public virtual XmlReader GetXmlReader(int i)
         {
             // NOTE: sql_variant can not contain a XML data type: http://msdn.microsoft.com/en-us/library/ms173829.aspx
             // If this ever changes, the following code should be changed to be like GetStream/GetTextReader
@@ -1529,7 +1529,7 @@ virtual public XmlReader GetXmlReader(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetStream/*' />
-        override public Stream GetStream(int i)
+        public override Stream GetStream(int i)
         {
             CheckDataIsReady(columnIndex: i);
 
@@ -1577,14 +1577,14 @@ override public Stream GetStream(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetByte/*' />
-        override public byte GetByte(int i)
+        public override byte GetByte(int i)
         {
             ReadColumn(i);
             return _data[i].Byte;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetBytes/*' />
-        override public long GetBytes(int i, long dataIndex, byte[] buffer, int bufferIndex, int length)
+        public override long GetBytes(int i, long dataIndex, byte[] buffer, int bufferIndex, int length)
         {
             SqlStatistics statistics = null;
             long cbBytes = 0;
@@ -1613,7 +1613,7 @@ override public long GetBytes(int i, long dataIndex, byte[] buffer, int bufferIn
         }
 
         // Used (indirectly) by SqlCommand.CompleteXmlReader
-        virtual internal long GetBytesInternal(int i, long dataIndex, byte[] buffer, int bufferIndex, int length)
+        internal virtual long GetBytesInternal(int i, long dataIndex, byte[] buffer, int bufferIndex, int length)
         {
             if (_currentTask != null)
             {
@@ -1953,7 +1953,7 @@ internal TdsOperationStatus TryGetBytesInternalSequential(int i, byte[] buffer,
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetTextReader/*' />
-        override public TextReader GetTextReader(int i)
+        public override TextReader GetTextReader(int i)
         {
             CheckDataIsReady(columnIndex: i);
 
@@ -2027,13 +2027,13 @@ override public TextReader GetTextReader(int i)
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetChar/*' />
         [EditorBrowsable(EditorBrowsableState.Never)]
-        override public char GetChar(int i)
+        public override char GetChar(int i)
         {
             throw ADP.NotSupported();
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetChars/*' />
-        override public long GetChars(int i, long dataIndex, char[] buffer, int bufferIndex, int length)
+        public override long GetChars(int i, long dataIndex, char[] buffer, int bufferIndex, int length)
         {
             SqlStatistics statistics = null;
 
@@ -2336,7 +2336,7 @@ IDataReader IDataRecord.GetData(int i)
 #endif
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetDateTime/*' />
-        override public DateTime GetDateTime(int i)
+        public override DateTime GetDateTime(int i)
         {
             ReadColumn(i);
 
@@ -2358,77 +2358,77 @@ override public DateTime GetDateTime(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetDecimal/*' />
-        override public decimal GetDecimal(int i)
+        public override decimal GetDecimal(int i)
         {
             ReadColumn(i);
             return _data[i].Decimal;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetDouble/*' />
-        override public double GetDouble(int i)
+        public override double GetDouble(int i)
         {
             ReadColumn(i);
             return _data[i].Double;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetFloat/*' />
-        override public float GetFloat(int i)
+        public override float GetFloat(int i)
         {
             ReadColumn(i);
             return _data[i].Single;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetGuid/*' />
-        override public Guid GetGuid(int i)
+        public override Guid GetGuid(int i)
         {
             ReadColumn(i);
             return _data[i].Guid;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetInt16/*' />
-        override public short GetInt16(int i)
+        public override short GetInt16(int i)
         {
             ReadColumn(i);
             return _data[i].Int16;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetInt32/*' />
-        override public int GetInt32(int i)
+        public override int GetInt32(int i)
         {
             ReadColumn(i);
             return _data[i].Int32;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetInt64/*' />
-        override public long GetInt64(int i)
+        public override long GetInt64(int i)
         {
             ReadColumn(i);
             return _data[i].Int64;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlBoolean/*' />
-        virtual public SqlBoolean GetSqlBoolean(int i)
+        public virtual SqlBoolean GetSqlBoolean(int i)
         {
             ReadColumn(i);
             return _data[i].SqlBoolean;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlBinary/*' />
-        virtual public SqlBinary GetSqlBinary(int i)
+        public virtual SqlBinary GetSqlBinary(int i)
         {
             ReadColumn(i, setTimeout: true, allowPartiallyReadColumn: true);
             return _data[i].SqlBinary;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlByte/*' />
-        virtual public SqlByte GetSqlByte(int i)
+        public virtual SqlByte GetSqlByte(int i)
         {
             ReadColumn(i);
             return _data[i].SqlByte;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlBytes/*' />
-        virtual public SqlBytes GetSqlBytes(int i)
+        public virtual SqlBytes GetSqlBytes(int i)
         {
             ReadColumn(i);
             SqlBinary data = _data[i].SqlBinary;
@@ -2436,7 +2436,7 @@ virtual public SqlBytes GetSqlBytes(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlChars/*' />
-        virtual public SqlChars GetSqlChars(int i)
+        public virtual SqlChars GetSqlChars(int i)
         {
             ReadColumn(i);
             SqlString data;
@@ -2453,70 +2453,70 @@ virtual public SqlChars GetSqlChars(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlDateTime/*' />
-        virtual public SqlDateTime GetSqlDateTime(int i)
+        public virtual SqlDateTime GetSqlDateTime(int i)
         {
             ReadColumn(i);
             return _data[i].SqlDateTime;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlDecimal/*' />
-        virtual public SqlDecimal GetSqlDecimal(int i)
+        public virtual SqlDecimal GetSqlDecimal(int i)
         {
             ReadColumn(i);
             return _data[i].SqlDecimal;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlGuid/*' />
-        virtual public SqlGuid GetSqlGuid(int i)
+        public virtual SqlGuid GetSqlGuid(int i)
         {
             ReadColumn(i);
             return _data[i].SqlGuid;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlDouble/*' />
-        virtual public SqlDouble GetSqlDouble(int i)
+        public virtual SqlDouble GetSqlDouble(int i)
         {
             ReadColumn(i);
             return _data[i].SqlDouble;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlInt16/*' />
-        virtual public SqlInt16 GetSqlInt16(int i)
+        public virtual SqlInt16 GetSqlInt16(int i)
         {
             ReadColumn(i);
             return _data[i].SqlInt16;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlInt32/*' />
-        virtual public SqlInt32 GetSqlInt32(int i)
+        public virtual SqlInt32 GetSqlInt32(int i)
         {
             ReadColumn(i);
             return _data[i].SqlInt32;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlInt64/*' />
-        virtual public SqlInt64 GetSqlInt64(int i)
+        public virtual SqlInt64 GetSqlInt64(int i)
         {
             ReadColumn(i);
             return _data[i].SqlInt64;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlMoney/*' />
-        virtual public SqlMoney GetSqlMoney(int i)
+        public virtual SqlMoney GetSqlMoney(int i)
         {
             ReadColumn(i);
             return _data[i].SqlMoney;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlSingle/*' />
-        virtual public SqlSingle GetSqlSingle(int i)
+        public virtual SqlSingle GetSqlSingle(int i)
         {
             ReadColumn(i);
             return _data[i].SqlSingle;
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlString/*' />
-        virtual public SqlString GetSqlString(int i)
+        public virtual SqlString GetSqlString(int i)
         {
             ReadColumn(i);
 
@@ -2529,7 +2529,7 @@ virtual public SqlString GetSqlString(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlXml/*' />
-        virtual public SqlXml GetSqlXml(int i)
+        public virtual SqlXml GetSqlXml(int i)
         {
             ReadColumn(i);
             SqlXml sx = null;
@@ -2540,7 +2540,7 @@ virtual public SqlXml GetSqlXml(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlJson/*' />
-        virtual public SqlJson GetSqlJson(int i)
+        public virtual SqlJson GetSqlJson(int i)
         {
             ReadColumn(i);
             SqlJson json = _data[i].IsNull ? SqlJson.Null : _data[i].SqlJson;
@@ -2548,7 +2548,7 @@ virtual public SqlJson GetSqlJson(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlVector/*' />
-        virtual public SqlVector<T> GetSqlVector<T>(int i) where T : unmanaged
+        public virtual SqlVector<T> GetSqlVector<T>(int i) where T : unmanaged
         {
             if (typeof(T) != typeof(float))
             {
@@ -2560,7 +2560,7 @@ virtual public SqlVector<T> GetSqlVector<T>(int i) where T : unmanaged
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlValue/*' />
-        virtual public object GetSqlValue(int i)
+        public virtual object GetSqlValue(int i)
         {
             SqlStatistics statistics = null;
             try
@@ -2628,7 +2628,7 @@ private object GetSqlValueFromSqlBufferInternal(SqlBuffer data, _SqlMetaData met
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetSqlValues/*' />
-        virtual public int GetSqlValues(object[] values)
+        public virtual int GetSqlValues(object[] values)
         {
             SqlStatistics statistics = null;
             try
@@ -2657,7 +2657,7 @@ virtual public int GetSqlValues(object[] values)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetString/*' />
-        override public string GetString(int i)
+        public override string GetString(int i)
         {
             ReadColumn(i);
             // Convert 2008 value to string if type system knob is 2005 or earlier
@@ -2670,7 +2670,7 @@ override public string GetString(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetFieldValue/*' />
-        override public T GetFieldValue<T>(int i)
+        public override T GetFieldValue<T>(int i)
         {
             SqlStatistics statistics = null;
             try
@@ -2687,7 +2687,7 @@ override public T GetFieldValue<T>(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetValue/*' />
-        override public object GetValue(int i)
+        public override object GetValue(int i)
         {
             SqlStatistics statistics = null;
             try
@@ -2704,7 +2704,7 @@ override public object GetValue(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetTimeSpan/*' />
-        virtual public TimeSpan GetTimeSpan(int i)
+        public virtual TimeSpan GetTimeSpan(int i)
         {
             ReadColumn(i);
 
@@ -2726,7 +2726,7 @@ virtual public TimeSpan GetTimeSpan(int i)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetDateTimeOffset/*' />
-        virtual public DateTimeOffset GetDateTimeOffset(int i)
+        public virtual DateTimeOffset GetDateTimeOffset(int i)
         {
             ReadColumn(i);
 
@@ -3069,7 +3069,7 @@ private T GetFieldValueFromSqlBufferInternal<T>(SqlBuffer data, _SqlMetaData met
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetValues/*' />
-        override public int GetValues(object[] values)
+        public override int GetValues(object[] values)
         {
             SqlStatistics statistics = null;
             bool sequentialAccess = IsCommandBehavior(CommandBehavior.SequentialAccess);
@@ -3316,7 +3316,7 @@ private bool IsRowToken(byte token)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/IsDBNull/*' />
-        override public bool IsDBNull(int i)
+        public override bool IsDBNull(int i)
         {
 #if NETFRAMEWORK
             if ((IsCommandBehavior(CommandBehavior.SequentialAccess)) && ((_sharedState._nextColumnHeaderToRead > i + 1) || (_lastColumnWithDataChunkRead > i)))
@@ -3349,7 +3349,7 @@ protected internal bool IsCommandBehavior(CommandBehavior condition)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/NextResult/*' />
-        override public bool NextResult()
+        public override bool NextResult()
         {
             if (_currentTask != null)
             {
@@ -4994,7 +4994,7 @@ private static Task<bool> ReadAsyncExecute(Task task, object state)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/IsDBNullAsync/*' />
-        override public Task<bool> IsDBNullAsync(int i, CancellationToken cancellationToken)
+        public override Task<bool> IsDBNullAsync(int i, CancellationToken cancellationToken)
         {
             try
             {
@@ -5129,7 +5129,7 @@ private static Task<bool> IsDBNullAsyncExecute(Task task, object state)
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml' path='docs/members[@name="SqlDataReader"]/GetFieldValueAsync/*' />
-        override public Task<T> GetFieldValueAsync<T>(int i, CancellationToken cancellationToken)
+        public override Task<T> GetFieldValueAsync<T>(int i, CancellationToken cancellationToken)
         {
             try
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs
index d06a02413f..c1ef429204 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs
@@ -114,7 +114,7 @@ public override void GetObjectData(SerializationInfo si, StreamingContext contex
         public byte State => Errors.Count > 0 ? Errors[0].State : default;
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlException.xml' path='docs/members[@name="SqlException"]/Source/*' />
-        override public string Source => DbConnectionStringDefaults.ApplicationName;
+        public override string Source => DbConnectionStringDefaults.ApplicationName;
 
 
         #if NET
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInfoMessageEvent.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInfoMessageEvent.cs
index 5392419a05..745cddc67b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInfoMessageEvent.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInfoMessageEvent.cs
@@ -29,6 +29,6 @@ internal SqlInfoMessageEventArgs(SqlException exception)
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlInfoMessageEventArgs.xml' path='docs/members[@name="SqlInfoMessageEventArgs"]/ToString/*' />
         // MDAC 68482
-        override public string ToString() => Message;
+        public override string ToString() => Message;
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs
index 69474315cd..96ccc8a8af 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalTransaction.cs
@@ -30,7 +30,7 @@ internal enum TransactionType
         Context = 5,     // only valid in proc.
     }
 
-    sealed internal class SqlInternalTransaction
+    internal sealed class SqlInternalTransaction
     {
         internal const long NullTransactionId = 0;
 
@@ -456,7 +456,7 @@ private void ZombieParent()
             _parent = null;
         }
 
-        internal string TraceString() => string.Format(/*IFormatProvider*/ null, 
+        internal string TraceString() => string.Format(/*IFormatProvider*/ null,
             "(ObjId={0}, tranId={1}, state={2}, type={3}, open={4}, disp={5}",
             ObjectID, _transactionId, _transactionState, _transactionType, _openResultCount, _disposing);
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs
index 3fb1ec1db6..40618faf03 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlQueryMetadataCache.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Data.SqlClient
     /// <summary>
     /// <para> Implements a cache of query parameter metadata that is used to avoid the extra roundtrip to the server for every execution of the same query.</para>
     /// </summary>
-    sealed internal class SqlQueryMetadataCache
+    internal sealed class SqlQueryMetadataCache
     {
         private const int CacheSize = 2000; // Cache size in number of entries.
         private const int CacheTrimThreshold = 300; // Threshold above the cache size when we start trimming.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlReferenceCollection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlReferenceCollection.cs
index b0b5917551..a88485b034 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlReferenceCollection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlReferenceCollection.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.Data.SqlClient
 {
-    sealed internal class SqlReferenceCollection : DbReferenceCollection
+    internal sealed class SqlReferenceCollection : DbReferenceCollection
     {
         private sealed class FindLiveReaderContext
         {
@@ -30,7 +30,7 @@ private sealed class FindLiveReaderContext
         internal const int CommandTag = 2;
         internal const int BulkCopyTag = 3;
 
-        private readonly static Func<SqlDataReader, bool> s_hasOpenReaderFunc = HasOpenReaderPredicate;
+        private static readonly Func<SqlDataReader, bool> s_hasOpenReaderFunc = HasOpenReaderPredicate;
         private static FindLiveReaderContext s_cachedFindLiveReaderContext;
 
         public override void Add(object value, int tag)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlRowUpdatedEvent.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlRowUpdatedEvent.cs
index a09f06ad18..a9ba58d609 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlRowUpdatedEvent.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlRowUpdatedEvent.cs
@@ -17,7 +17,7 @@ public SqlRowUpdatedEventArgs(DataRow row, IDbCommand command, StatementType sta
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlRowUpdatedEventArgs.xml' path='docs/members[@name="SqlRowUpdatedEventArgs"]/Command/*' />
-        new public SqlCommand Command
+        public new SqlCommand Command
         {
             get
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlRowUpdatingEvent.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlRowUpdatingEvent.cs
index d0d3b58050..cff099953f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlRowUpdatingEvent.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlRowUpdatingEvent.cs
@@ -17,14 +17,14 @@ public SqlRowUpdatingEventArgs(DataRow row, IDbCommand command, StatementType st
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlRowUpdatingEventArgs.xml' path='docs/members[@name="SqlRowUpdatingEventArgs"]/Command/*' />
-        new public SqlCommand Command
+        public new SqlCommand Command
         {
             get { return (base.Command as SqlCommand); }
             set { base.Command = value; }
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlRowUpdatingEventArgs.xml' path='docs/members[@name="SqlRowUpdatingEventArgs"]/BaseCommand/*' />
-        override protected IDbCommand BaseCommand
+        protected override IDbCommand BaseCommand
         {
             get { return base.BaseCommand; }
             set { base.BaseCommand = (value as SqlCommand); }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs
index b5a00cde4e..4547743f2d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs
@@ -13,7 +13,7 @@
 
 namespace Microsoft.Data.SqlClient
 {
-    sealed internal class SqlSequentialTextReader : System.IO.TextReader
+    internal sealed class SqlSequentialTextReader : System.IO.TextReader
     {
         private SqlDataReader _reader;  // The SqlDataReader that we are reading data from
         private readonly int _columnIndex;       // The index of out column in the table
@@ -417,7 +417,7 @@ private int DecodeBytesToChars(byte[] inBuffer, int inBufferCount, char[] outBuf
             {
                 _leftOverByteBufferUsed = inBufferCount - bytesUsed;
                 _leftOverBytes = ArrayPool<byte>.Shared.Rent(_leftOverByteBufferUsed);
-                
+
                 Buffer.BlockCopy(inBuffer, bytesUsed, _leftOverBytes, 0, _leftOverByteBufferUsed);
             }
             else
@@ -494,7 +494,7 @@ internal static void ValidateReadParameters(char[] buffer, int index, int count)
         }
     }
 
-    sealed internal class SqlUnicodeEncoding : UnicodeEncoding
+    internal sealed class SqlUnicodeEncoding : UnicodeEncoding
     {
         private static readonly SqlUnicodeEncoding s_singletonEncoding = new();
 
@@ -517,7 +517,7 @@ public static Encoding SqlUnicodeEncodingInstance
             get { return s_singletonEncoding; }
         }
 
-        sealed private class SqlUnicodeDecoder : Decoder
+        private sealed class SqlUnicodeDecoder : Decoder
         {
             public override int GetCharCount(byte[] bytes, int index, int count)
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlStream.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlStream.cs
index 653faf7213..bd9f75f4a7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlStream.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlStream.cs
@@ -13,7 +13,7 @@
 
 namespace Microsoft.Data.SqlClient
 {
-    sealed internal class SqlStream : Stream
+    internal sealed class SqlStream : Stream
     {
         private SqlDataReader _reader; // reader we will stream off
         private readonly int _columnOrdinal;
@@ -93,7 +93,7 @@ public override int Read(byte[] buffer, int offset, int count)
                 throw ADP.ArgumentOutOfRange(nameof(count));
             }
 
-            // Need to find out if we should add byte order mark or not. 
+            // Need to find out if we should add byte order mark or not.
             // We need to add this if we are getting ntext xml, not if we are getting binary xml
             // Binary Xml always begins with the bytes 0xDF and 0xFF
             // If we aren't getting these, then we are getting unicode xml
@@ -265,9 +265,9 @@ internal XmlReader ToXmlReader(bool async = false)
 
     // XmlTextReader does not read all the bytes off the network buffers, so we have to cache it here in the random access
     // case. This causes double buffering and is a perf hit, but this is not the high perf way for accessing this type of data.
-    // In the case of sequential access, we do not have to do any buffering since the XmlTextReader we return can become 
+    // In the case of sequential access, we do not have to do any buffering since the XmlTextReader we return can become
     // invalid as soon as we move off the current column.
-    sealed internal class SqlCachedStream : Stream
+    internal sealed class SqlCachedStream : Stream
     {
         private int _currentPosition;   // Position within the current array byte
         private int _currentArrayIndex; // Index into the _cachedBytes List
@@ -475,7 +475,7 @@ private long TotalLength
         }
     }
 
-    sealed internal class SqlStreamingXml
+    internal sealed class SqlStreamingXml
     {
         private static readonly XmlWriterSettings s_writerSettings = new() { CloseOutput = true, ConformanceLevel = ConformanceLevel.Fragment };
 
@@ -580,7 +580,7 @@ public long GetChars(long dataIndex, char[] buffer, int bufferIndex, int length)
             return (long)cnt;
         }
 
-        // This method duplicates the work of XmlWriter.WriteNode except that it reads one element at a time 
+        // This method duplicates the work of XmlWriter.WriteNode except that it reads one element at a time
         // instead of reading the entire node like XmlWriter.
         private void WriteXmlElement()
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSymmetricKeyCache.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSymmetricKeyCache.cs
index d88833abed..6618288b32 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSymmetricKeyCache.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSymmetricKeyCache.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Data.SqlClient
     /// <summary>
     /// <para> Implements a cache of Symmetric Keys (once they are decrypted).Useful for rapidly decrypting multiple data values.</para>
     /// </summary>
-    sealed internal class SqlSymmetricKeyCache
+    internal sealed class SqlSymmetricKeyCache
     {
         private readonly MemoryCache _cache;
         private static readonly SqlSymmetricKeyCache _singletonInstance = new();
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
index 678697d221..e80387063b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
@@ -85,16 +85,16 @@ internal static Exception InvalidSSPIPacketSize()
         {
             return ADP.Argument(StringsHelper.GetString(Strings.SQL_InvalidSSPIPacketSize));
         }
-        static internal Exception NullEmptyTransactionName()
+        internal static Exception NullEmptyTransactionName()
         {
             return ADP.Argument(StringsHelper.GetString(Strings.SQL_NullEmptyTransactionName));
         }
 
-        static internal Exception UserInstanceFailoverNotCompatible()
+        internal static Exception UserInstanceFailoverNotCompatible()
         {
             return ADP.Argument(StringsHelper.GetString(Strings.SQL_UserInstanceFailoverNotCompatible));
         }
-        static internal Exception CredentialsNotProvided(SqlAuthenticationMethod auth)
+        internal static Exception CredentialsNotProvided(SqlAuthenticationMethod auth)
         {
             return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_CredentialsNotProvided, DbConnectionStringUtilities.AuthenticationTypeToString(auth)));
         }
@@ -636,7 +636,7 @@ internal static Exception SqlDependencyNoMatchingServerDatabaseStart()
         //
         // SQL.SqlDelegatedTransaction
         //
-        static internal Exception CannotCompleteDelegatedTransactionWithOpenResults(
+        internal static Exception CannotCompleteDelegatedTransactionWithOpenResults(
             SqlConnectionInternal internalConnection,
             bool marsOn)
         {
@@ -1860,7 +1860,7 @@ internal static Exception EmptyProviderName()
         // Merged Provider
         //
 
-        static internal Exception ContextConnectionIsUnsupported()
+        internal static Exception ContextConnectionIsUnsupported()
         {
             return ADP.InvalidOperation(StringsHelper.GetString(Strings.SQL_ContextConnectionIsUnsupported));
         }
@@ -1909,7 +1909,7 @@ internal static Exception SocketDidNotThrow()
 
     }
 
-    sealed internal class SQLMessage
+    internal sealed class SQLMessage
     {
         private SQLMessage() { /* prevent utility class from being instantiated*/ }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserSafeHandles.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserSafeHandles.windows.cs
index ed55a76fbb..8242dd997f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserSafeHandles.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserSafeHandles.windows.cs
@@ -74,7 +74,7 @@ public bool ClientOSEncryptionSupport
 
         public override bool IsInvalid => (IntPtr.Zero == base.handle);
 
-        override protected bool ReleaseHandle()
+        protected override bool ReleaseHandle()
         {
             if (base.handle != IntPtr.Zero)
             {
@@ -224,7 +224,7 @@ public override bool IsInvalid
             }
         }
 
-        override protected bool ReleaseHandle()
+        protected override bool ReleaseHandle()
         {
             // NOTE: The SafeHandle class guarantees this will be called exactly once.
             IntPtr ptr = base.handle;
@@ -267,7 +267,7 @@ public override bool IsInvalid
             }
         }
 
-        override protected bool ReleaseHandle()
+        protected override bool ReleaseHandle()
         {
             // NOTE: The SafeHandle class guarantees this will be called exactly once.
             IntPtr ptr = base.handle;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
index 921fb3f30b..b3b6becbdf 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
@@ -25,7 +25,7 @@
 
 namespace Microsoft.Data.SqlClient
 {
-    sealed internal class LastIOTimer
+    internal sealed class LastIOTimer
     {
         internal long _value;
     }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
index a384095254..fec2779f82 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
@@ -17,7 +17,7 @@ private TdsParserStaticMethods() { /* prevent utility class from being insantiat
         // Static methods
         //
 
-        static internal void AliasRegistryLookup(ref string host, ref string protocol)
+        internal static void AliasRegistryLookup(ref string host, ref string protocol)
         {
             if (!string.IsNullOrEmpty(host))
             {
@@ -86,12 +86,12 @@ static internal void AliasRegistryLookup(ref string host, ref string protocol)
 
         // Obfuscate password to be sent to SQL Server
         // Blurb from the TDS spec at https://msdn.microsoft.com/en-us/library/dd304523.aspx
-        // "Before submitting a password from the client to the server, for every byte in the password buffer 
-        // starting with the position pointed to by IbPassword, the client SHOULD first swap the four high bits 
-        // with the four low bits and then do a bit-XOR with 0xA5 (10100101). After reading a submitted password, 
-        // for every byte in the password buffer starting with the position pointed to by IbPassword, the server SHOULD 
+        // "Before submitting a password from the client to the server, for every byte in the password buffer
+        // starting with the position pointed to by IbPassword, the client SHOULD first swap the four high bits
+        // with the four low bits and then do a bit-XOR with 0xA5 (10100101). After reading a submitted password,
+        // for every byte in the password buffer starting with the position pointed to by IbPassword, the server SHOULD
         // first do a bit-XOR with 0xA5 (10100101) and then swap the four high bits with the four low bits."
-        // The password exchange during Login phase happens over a secure channel i.e. SSL/TLS 
+        // The password exchange during Login phase happens over a secure channel i.e. SSL/TLS
         // Note: The same logic is used in SNIPacketSetData (SniManagedWrapper) to encrypt passwords stored in SecureString
         //       If this logic changed, SNIPacketSetData needs to be changed as well
         internal static byte[] ObfuscatePassword(string password)
@@ -164,7 +164,7 @@ internal static int GetCurrentThreadIdForTdsLoginOnly()
 
         private static byte[] s_nicAddress = null;
 
-        static internal byte[] GetNetworkPhysicalAddressForTdsLoginOnly()
+        internal static byte[] GetNetworkPhysicalAddressForTdsLoginOnly()
         {
             if (s_nicAddress != null)
             {

From 3c522bccbe3491e465761aac0e6c169786e1546c Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 30 Jun 2026 11:55:50 -0700
Subject: [PATCH 171/298] Docs | Fix server certificate docs (#4408)

---
 .../Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
index 98daa768b5..4014bd1450 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
@@ -1330,10 +1330,7 @@ Database = AdventureWorks
       <remarks>
         <format type="text/markdown">
           <![CDATA[  
-This property corresponds to the "ServerSPN" and "Server SPN" keys within the connection string.  
-
-> [!NOTE]
-> This property only applies when using Integrated Security mode, otherwise it is ignored.
+This property corresponds to the "Server Certificate" and "ServerCertificate" keys within the connection string.  
 
 ]]>
         </format>

From c97dbce0faabab962f97c71de43c245f696d680c Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 2 Jul 2026 07:31:52 -0300
Subject: [PATCH 172/298] Consolidate OS detection to OsConstants (#4255)

* Consolidate OS detection to OsConstants

- Create new OsConstants class with IsWindows, IsLinux, IsMacOS, IsFreeBSD, and IsUnix fields
- Add comprehensive XML documentation and explain why static constructor is preferred over [ModuleInitializer] (CA2255 rule)
- Replace all RuntimeInformation.IsOSPlatform() calls with OsConstants fields in:
  - TdsParserStaticMethods.cs
  - UserAgent.cs
  - AdapterUtil.cs (now forwards to OsConstants)
- Replace Environment.OSVersion.Platform checks with OsConstants in:
  - SqlColumnEncryptionCertificateStoreProvider.cs (3 instances)
  - SqlUtil.cs (3 instances)
- Replace OperatingSystem static methods with OsConstants in:
  - LocalAppContextSwitches.cs (uses IsUnix for clearer semantics)
  - TdsParser.cs
- Replace all ADP.IsWindows usage with OsConstants in:
  - SqlFileStream.cs
  - SqlColumnEncryptionCngProvider.cs (4 instances)
  - SqlColumnEncryptionCspProvider.cs (4 instances)
- Remove unused AdapterUtil.IsWindows property

Benefits:
- Single point of control for OS detection
- Improved JIT optimization through static readonly cached flags
- Clearer semantics with IsUnix flag for Unix-like platforms
- Consistent API surface across the codebase

* Address Copilot OS guard feedback

- Remove OsConstants.IsUnix to avoid non-Windows ambiguity
- Update Windows-only guards in SqlFileStream, CNG, CSP, and switch logic
- Keep explicit OS flags (Windows/Linux/macOS/FreeBSD)

* Expose OsConstants flags as intrinsic properties for IL trimming

Replace the static readonly fields and static constructor in OsConstants
with properties that directly return RuntimeInformation.IsOSPlatform(...).
The IL trimmer cannot analyze a static constructor, so the cached-field
design left OS-specific code (including Windows-only native dependencies)
in apps published for other platforms. Returning the intrinsic directly
lets the trimmer fold each guard to a constant and drop the dead branch.

Also document why the type exists (brevity and encapsulation), the
inline-guard requirement for trimming, and reconcile the stale remark
about JIT branch elision.

Addresses PR #4255 review feedback from @edwardneal.

* Use OperatingSystem.Is*() on .NET for JIT-intrinsic OS checks

On modern .NET, OperatingSystem.IsWindows()/IsLinux()/IsMacOS()/IsFreeBSD()
are JIT intrinsics that get constant-folded (and are recognized by the IL
trimmer), so switch the OsConstants properties to them under #if NET.
.NET Framework keeps RuntimeInformation.IsOSPlatform(...) since the
OperatingSystem platform-check helpers do not exist there.

This addresses the automated reviewer feedback that RuntimeInformation
.IsOSPlatform(...) misses the JIT constant-folding optimization on
net8/net9, while preserving the trimming correctness from the prior change.

Addresses PR #4255 review feedback.
---
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |  18 +--
 .../Data/SqlClient/LocalAppContextSwitches.cs |   2 +-
 .../Microsoft/Data/SqlClient/OsConstants.cs   | 107 ++++++++++++++++++
 ...olumnEncryptionCertificateStoreProvider.cs |   7 +-
 .../SqlColumnEncryptionCngProvider.cs         |   8 +-
 .../SqlColumnEncryptionCspProvider.cs         |   8 +-
 .../src/Microsoft/Data/SqlClient/SqlUtil.cs   |   6 +-
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |   2 +-
 .../Data/SqlClient/TdsParserStaticMethods.cs  |   3 +-
 .../src/Microsoft/Data/SqlClient/UserAgent.cs |  13 +--
 .../Microsoft/Data/SqlTypes/SqlFileStream.cs  |   2 +-
 11 files changed, 132 insertions(+), 44 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/OsConstants.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index 2eb9429675..e8ec7c9e0e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -65,22 +65,6 @@ internal static partial class ADP
         /// </summary>
         internal const int MaxBufferAccessTokenExpiry = 600;
 
-        /// <summary>
-        /// This member returns true if the current OS platform is Windows.
-        /// </summary>
-        /// <remarks>
-        /// This is a const on .NET Framework, and a property on .NET Core, because of differing API availability and JIT requirements.
-        /// .NET Framework will perform basic dead branch elimination when a const value is encountered, while .NET Core can trim Windows-specific
-        /// code when published to non-Windows platforms.
-        /// .NET Core's trimming is very limited though, so this must be used inline within methods to throw PlatformNotSupportedException,
-        /// rather than in a throw helper.
-        /// </remarks>
-        #if NETFRAMEWORK
-        public const bool IsWindows = true;
-        #else
-        public static bool IsWindows => OperatingSystem.IsWindows();
-        #endif
-
         #region UDT
 
         #if NETFRAMEWORK
@@ -441,7 +425,7 @@ internal static ArgumentOutOfRangeException InvalidCommandBehavior(CommandBehavi
         internal static object LocalMachineRegistryValue(string subkey, string queryvalue)
         {
             #if NET
-            if (!IsWindows)
+            if (!OsConstants.IsWindows)
             {
                 // No registry in non-Windows environments
                 return null;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
index d951bb5d30..85f8c87937 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
@@ -635,7 +635,7 @@ public static bool UseManagedNetworking
                 return s_useManagedNetworking == SwitchValue.True;
             }
 
-            if (!OperatingSystem.IsWindows())
+            if (!OsConstants.IsWindows)
             {
                 s_useManagedNetworking = SwitchValue.True;
                 return true;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/OsConstants.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/OsConstants.cs
new file mode 100644
index 0000000000..b496141693
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/OsConstants.cs
@@ -0,0 +1,107 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Data.SqlClient;
+
+/// <summary>
+/// Provides platform detection flags for OS-specific code paths.
+/// </summary>
+/// <remarks>
+/// This type exists to keep OS detection terse and in one place: callers write
+/// <c>OsConstants.IsWindows</c> instead of repeating <c>RuntimeInformation.IsOSPlatform(...)</c>
+/// throughout the codebase.  Centralizing it also gives us a single seam to adjust if a specific
+/// OS needs special handling (for example, a different detection mechanism, a finer-grained
+/// flag, or an override for testing) without touching every call site.
+/// </remarks>
+/// <remarks>
+/// Each flag is exposed as a property that directly returns an OS check.  On .NET, that check is
+/// <c>OperatingSystem.Is*()</c>, which the JIT treats as an intrinsic and constant-folds (and which
+/// the IL trimmer also recognizes).  On .NET Framework — where the <see cref="System.OperatingSystem"/>
+/// platform-check helpers do not exist — the check falls back to
+/// <see cref="RuntimeInformation.IsOSPlatform"/>.  Either way, returning the check directly is
+/// deliberate: caching the results in static fields (for example, via a static constructor) would
+/// defeat both the JIT folding and the trimmer — the trimmer cannot analyze a static constructor,
+/// so it would be unable to prove which branches are dead and would keep OS-specific code (including
+/// Windows-only native dependencies) in apps published for other platforms.
+/// </remarks>
+/// <remarks>
+/// <para>
+/// IL trimming note: when a downstream app is published for a specific OS (a RID-specific publish),
+/// the IL trimmer substitutes the underlying <see cref="RuntimeInformation.IsOSPlatform"/> /
+/// <c>OperatingSystem.Is*</c> checks with constant <c>true</c>/<c>false</c> for the target OS and
+/// then removes the dead branch (along with everything it transitively references, such as
+/// Windows-only native entry points).  This is what lets a single cross-platform assembly trim
+/// away the OS-specific code that does not apply to the published target.
+/// </para>
+/// <para>
+/// For this to work, each guard must be used <b>inline</b> in the same method as the OS-specific
+/// code it gates.  The trimmer's constant folding is shallow: it reasons within the method that
+/// contains the guard, so a guard hidden behind a helper traps the constant inside that helper and
+/// leaves the protected code reachable (and therefore not trimmed).
+/// </para>
+/// <para>
+/// Do — guard inline, so the trimmer can drop the branch and its dependencies:
+/// <code>
+/// if (OsConstants.IsWindows)
+/// {
+///     WindowsOnlyNativeCall();   // becomes `if (false) { ... }` off-Windows, then removed
+/// }
+/// </code>
+/// </para>
+/// <para>
+/// Don't — hide the guard in a throw helper; the trimmer cannot prove the call below is dead:
+/// <code>
+/// static void ThrowIfNotWindows()
+/// {
+///     if (!OsConstants.IsWindows) throw new PlatformNotSupportedException();
+/// }
+/// // caller:
+/// ThrowIfNotWindows();
+/// WindowsOnlyNativeCall();   // still reachable to the trimmer; kept even off-Windows
+/// </code>
+/// </para>
+/// </remarks>
+internal static class OsConstants
+{
+    /// <summary>
+    /// Gets a value indicating whether the runtime is executing on Windows.
+    /// </summary>
+    #if NET
+    internal static bool IsWindows => OperatingSystem.IsWindows();
+    #else
+    internal static bool IsWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+    #endif
+
+    /// <summary>
+    /// Gets a value indicating whether the runtime is executing on Linux.
+    /// </summary>
+    #if NET
+    internal static bool IsLinux => OperatingSystem.IsLinux();
+    #else
+    internal static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+    #endif
+
+    /// <summary>
+    /// Gets a value indicating whether the runtime is executing on macOS.
+    /// </summary>
+    #if NET
+    internal static bool IsMacOS => OperatingSystem.IsMacOS();
+    #else
+    internal static bool IsMacOS => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+    #endif
+
+    #if NET
+    /// <summary>
+    /// Gets a value indicating whether the runtime is executing on FreeBSD.
+    /// </summary>
+    /// <remarks>
+    /// FreeBSD support is only available in .NET 5+ and later. This property will be
+    /// <c>false</c> on .NET Framework or if the runtime does not support FreeBSD detection.
+    /// </remarks>
+    internal static bool IsFreeBSD => OperatingSystem.IsFreeBSD();
+    #endif
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs
index b02dd24af1..f0438cd162 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs
@@ -57,7 +57,7 @@ public class SqlColumnEncryptionCertificateStoreProvider : SqlColumnEncryptionKe
         /// Gets a string array containing valid certificate locations.
         /// </summary>
         private static string[] ValidCertificateLocations =>
-            Environment.OSVersion.Platform == PlatformID.Win32NT
+            OsConstants.IsWindows
                 ? [CertLocationLocalMachine, CertLocationCurrentUser]
                 : [CertLocationCurrentUser];
 
@@ -158,14 +158,13 @@ private static RSA GetCertificatePrivateKeyByPath(string keyPath, bool isSystemO
             }
 
             // Extract the store location where the cert is stored
-            if (storeLocationSpan.IsEmpty
-                && Environment.OSVersion.Platform == PlatformID.Win32NT)
+            if (storeLocationSpan.IsEmpty && OsConstants.IsWindows)
             {
                 // Default to Local Machine on Windows. Non-Windows platforms only support CurrentUser
                 storeLocation = StoreLocation.LocalMachine;
             }
             else if (storeLocationSpan.Equals(CertLocationLocalMachine.AsSpan(), StringComparison.OrdinalIgnoreCase)
-                && Environment.OSVersion.Platform == PlatformID.Win32NT)
+                && OsConstants.IsWindows)
             {
                 storeLocation = StoreLocation.LocalMachine;
             }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs
index fc65808cf1..4d0d79b750 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCngProvider.cs
@@ -149,7 +149,7 @@ private static void GetCngProviderAndKeyId(string keyPath, bool isSystemOp, out
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/DecryptColumnEncryptionKey/*' />
         public override byte[] DecryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? encryptedColumnEncryptionKey)
         {
-            if (!ADP.IsWindows)
+            if (!OsConstants.IsWindows)
             {
                 throw new PlatformNotSupportedException();
             }
@@ -180,7 +180,7 @@ public override byte[] DecryptColumnEncryptionKey(string? masterKeyPath, string?
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/EncryptColumnEncryptionKey/*' />
         public override byte[] EncryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? columnEncryptionKey)
         {
-            if (!ADP.IsWindows)
+            if (!OsConstants.IsWindows)
             {
                 throw new PlatformNotSupportedException();
             }
@@ -211,7 +211,7 @@ public override byte[] EncryptColumnEncryptionKey(string? masterKeyPath, string?
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/SignColumnMasterKeyMetadata/*' />
         public override byte[] SignColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations)
         {
-            throw ADP.IsWindows
+            throw OsConstants.IsWindows
                 ? new NotSupportedException()
                 : new PlatformNotSupportedException();
         }
@@ -219,7 +219,7 @@ public override byte[] SignColumnMasterKeyMetadata(string? masterKeyPath, bool a
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCngProvider.xml' path='docs/members[@name="SqlColumnEncryptionCngProvider"]/VerifyColumnMasterKeyMetadata/*' />
         public override bool VerifyColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations, byte[]? signature)
         {
-            throw ADP.IsWindows
+            throw OsConstants.IsWindows
                 ? new NotSupportedException()
                 : new PlatformNotSupportedException();
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs
index 73ee585dfa..dc956d9c71 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCspProvider.cs
@@ -151,7 +151,7 @@ private static int GetProviderType(string providerName, string keyPath, bool isS
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/DecryptColumnEncryptionKey/*' />
         public override byte[] DecryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? encryptedColumnEncryptionKey)
         {
-            if (!ADP.IsWindows)
+            if (!OsConstants.IsWindows)
             {
                 throw new PlatformNotSupportedException();
             }
@@ -182,7 +182,7 @@ public override byte[] DecryptColumnEncryptionKey(string? masterKeyPath, string?
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/EncryptColumnEncryptionKey/*' />
         public override byte[] EncryptColumnEncryptionKey(string? masterKeyPath, string? encryptionAlgorithm, byte[]? columnEncryptionKey)
         {
-            if (!ADP.IsWindows)
+            if (!OsConstants.IsWindows)
             {
                 throw new PlatformNotSupportedException();
             }
@@ -213,7 +213,7 @@ public override byte[] EncryptColumnEncryptionKey(string? masterKeyPath, string?
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/SignColumnMasterKeyMetadata/*' />
         public override byte[] SignColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations)
         {
-            throw ADP.IsWindows
+            throw OsConstants.IsWindows
                 ? new NotSupportedException()
                 : new PlatformNotSupportedException();
         }
@@ -221,7 +221,7 @@ public override byte[] SignColumnMasterKeyMetadata(string? masterKeyPath, bool a
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionCspProvider.xml' path='docs/members[@name="SqlColumnEncryptionCspProvider"]/VerifyColumnMasterKeyMetadata/*' />
         public override bool VerifyColumnMasterKeyMetadata(string? masterKeyPath, bool allowEnclaveComputations, byte[]? signature)
         {
-            throw ADP.IsWindows
+            throw OsConstants.IsWindows
                 ? new NotSupportedException()
                 : new PlatformNotSupportedException();
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
index e80387063b..c9388a42f1 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs
@@ -1141,7 +1141,7 @@ internal static Exception LargeCertificatePathLength(int actualLength, int maxLe
 
         internal static Exception NullCertificatePath(string[] validLocations, bool isSystemOp)
         {
-            if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+            if (OsConstants.IsWindows)
             {
                 Debug.Assert(validLocations.Length == 2);
                 if (isSystemOp)
@@ -1193,7 +1193,7 @@ internal static Exception NullCngKeyPath(bool isSystemOp)
 
         internal static Exception InvalidCertificatePath(string actualCertificatePath, string[] validLocations, bool isSystemOp)
         {
-            if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+            if (OsConstants.IsWindows)
             {
                 Debug.Assert(validLocations.Length == 2);
                 if (isSystemOp)
@@ -1329,7 +1329,7 @@ internal static Exception InvalidCngKey(string masterKeyPath, string cngProvider
 
         internal static Exception InvalidCertificateLocation(string certificateLocation, string certificatePath, string[] validLocations, bool isSystemOp)
         {
-            if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+            if (OsConstants.IsWindows)
             {
                 Debug.Assert(validLocations.Length == 2);
                 if (isSystemOp)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 9f37d30015..d53bf6f827 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -977,7 +977,7 @@ private void EnableSsl(uint info, SqlConnectionEncryptOption encrypt, bool integ
             // Channel Bindings as part of the Windows Authentication context build (SSL handshake must complete
             // before calling SNISecGenClientContext).
 #if NET
-            if (OperatingSystem.IsWindows())
+            if (OsConstants.IsWindows)
 #endif
             {
                 error = _physicalStateObj.WaitForSSLHandShakeToComplete(out protocol);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
index fec2779f82..63ba1945cc 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStaticMethods.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Globalization;
-using System.Runtime.InteropServices;
 using Microsoft.Data.Common;
 
 namespace Microsoft.Data.SqlClient
@@ -173,7 +172,7 @@ internal static byte[] GetNetworkPhysicalAddressForTdsLoginOnly()
 
             byte[] nicAddress = null;
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (OsConstants.IsWindows)
             {
                 // NIC address is stored in NetworkAddress key.  However, if NetworkAddressLocal key
                 // has a value that is not zero, then we cannot use the NetworkAddress key and must
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
index a8fcf7ca88..63cd220d6c 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
@@ -120,25 +120,24 @@ static UserAgent()
         // specific values.
         //
         string osType = Unknown;
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        if (OsConstants.IsWindows)
         {
             osType = Windows;
         }
-        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        else if (OsConstants.IsLinux)
         {
             osType = Linux;
         }
-        else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        else if (OsConstants.IsMacOS)
         {
             osType = macOS;
         }
-        // The FreeBSD platform doesn't exist in .NET Framework at all.
-        #if NET
-        else if (RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD))
+#if NET
+        else if (OsConstants.IsFreeBSD)
         {
             osType = FreeBSD;
         }
-        #endif
+#endif
 
         // Build it!
         Value = Build(
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.cs
index 4c48890fc4..6059705910 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.cs
@@ -102,7 +102,7 @@ public SqlFileStream(
             FileOptions options,
             long allocationSize)
         {
-            if (!ADP.IsWindows)
+            if (!OsConstants.IsWindows)
             {
                 throw new PlatformNotSupportedException(Strings.SqlFileStream_NotSupported);
             }

From 36d2b9d864a7651e240ad52cbd68eec7b9e8eeec Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Thu, 2 Jul 2026 16:30:36 +0530
Subject: [PATCH 173/298] Implement pool shutdown for ChannelDbConnectionPool
 and harden WaitHandleDbConnectionPool shutdown (#4302)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Implement pool shutdown for ChannelDbConnectionPool and harden WaitHandleDbConnectionPool shutdown (AB#44828)

ChannelDbConnectionPool:
- Shutdown() now transitions State to ShuttingDown (FR-001), completes the idle
  channel writer to unblock async waiters (FR-002, FR-007), and drains and
  destroys buffered idle connections (FR-003). Implementation is idempotent via
  Interlocked.CompareExchange (FR-006).
- Startup() emits a trace and is a structural counterpart to Shutdown.
- ReturnInternalConnection no longer asserts on TryWrite; if the channel was
  completed by a concurrent shutdown, the returning connection is destroyed
  (FR-004 race-window guard).
- IdleConnectionChannel.Complete() exposes channel completion to the pool.

WaitHandleDbConnectionPool:
- Shutdown() is now idempotent (FR-006), disposes both _cleanupTimer and
  _errorTimer (FR-005), wakes threads parked in WaitHandle.WaitAny by releasing
  the pool semaphore (FR-007), and drains _stackNew/_stackOld (FR-003).
- CleanupCallback and ErrorCallback short-circuit when State == ShuttingDown so
  an in-flight callback racing with Shutdown does not re-arm work.
- The private TryGetConnection wait loop re-checks State after WaitHandle.WaitAny
  and bails out, so waiters cannot spin against a drained pool.

Tests:
- ChannelDbConnectionPoolShutdownTest (7 tests) covers state transition, drain,
  return-after-shutdown, idempotency, async waiter unblock, post-shutdown return,
  and Startup-after-Shutdown.
- WaitHandleDbConnectionPoolShutdownTest (9 tests) covers state transition,
  cleanup/error timer disposal, drain, idempotency, callback no-op after
  shutdown, sync TryGetConnection short-circuit, and sync waiter unblock.

Verified by running targeted suite: 340 tests passing across net8.0, net9.0,
net10.0, and net462.

Spec: specs/004-pool-shutdown.

*   Address PR #4302 review feedback and drop spec FR-00x labels

  Code review fixes (WaitHandleDbConnectionPool):
  - TryGetConnection shutdown short-circuit now releases the PoolSemaphore
    slot when WaitAny was woken by SEMAPHORE_HANDLE (or
    WAIT_ABANDONED+SEMAPHORE_HANDLE), preventing a semaphore-slot leak that
    would starve future waiters.
  - Shutdown() releases Volatile.Read(ref _waitCount) slots instead of
    MaxPoolSize, fixing ArgumentOutOfRangeException when MaxPoolSize == 0
    (unlimited pool) and ensuring every parked waiter is woken under high
    contention. Kept SemaphoreFullException guard.

  Test fix:
  - Shutdown_UnblocksSyncWaiter replaces Thread.Sleep(200) with a bounded
    poll on the private _waitCount field (via the existing reflection
    helper) so the test is deterministic on slow CI agents.

  Documentation cleanup:
  - Removed inline 'FR-00x' spec-traceability labels from comments and test
    section banners across both pool implementations and both shutdown
    test files. Explanatory text is preserved; the spec coverage will live
    in the PR description instead of the source.

* Address PR #4302 review: avoid reflection in WaitHandleDbConnectionPool shutdown tests

Replace reflection-based access of WaitHandleDbConnectionPool internals from the shutdown unit tests with direct field/method access. The pool's _waitCount, _errorTimer, _cleanupTimer, CleanupCallback, and ErrorCallback are now declared internal so the UnitTests assembly (covered by InternalsVisibleTo) can reach them without GetField/Invoke. The GetPrivateField<T> helper is removed.

Per @mdaigle review feedback on dotnet/SqlClient#4302.

* Address PR #4302 review: reuse Clear() from Shutdown() in both pools

Both pool implementations now delegate the connection drain in Shutdown() to the existing Clear() routine instead of duplicating the drain inline.

ChannelDbConnectionPool.Shutdown(): keeps the CompareExchange election, State transition and _idleChannel.Complete() call, then calls Clear() (which bumps _clearGeneration and best-effort drains the idle channel). A final unbounded drain loop is retained as a mop-up because Clear() may short-circuit when another Clear() is concurrently in flight; the final loop is safe because the channel is already completed and no new writes can succeed.

WaitHandleDbConnectionPool.Shutdown(): keeps the trace, idempotent State check, timer disposal and waiter wake-up, then replaces the inline _stackNew / _stackOld drain loops with a single Clear() call. Clear() additionally dooms every entry in _objectList, decrements the ExitFreeConnection metric per drained connection, and runs ReclaimEmancipatedObjects() — strictly more cleanup than the previous inline drain, with no behaviour change for normal Running-state operations.

Per @mdaigle review feedback on dotnet/SqlClient#4302.

* Fix PR #4302 CI: pass TimeoutTimer to ChannelDbConnectionPool.TryGetConnection in shutdown tests

PR 4295 (merged to main) added a required TimeoutTimer parameter to ChannelDbConnectionPool.TryGetConnection. The shutdown tests added in this PR still call the pre-4295 3-arg overload, which compiles locally against PoolShutdown's older base but fails in the CI pipeline because the pipeline merges this PR's head into the post-4295 main. Pass TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)) at all 5 call sites to match the new signature.

* Pass TimeoutTimer to WaitHandleDbConnectionPool.TryGetConnection in shutdown tests

The TryGetConnection method on main now requires a TimeoutTimer argument. Update all 5 call sites in WaitHandleDbConnectionPoolShutdownTest.cs to pass TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)) so the test project compiles against the current 4-arg signature.

* Address PR #4302 Copilot review: drop unused usings and use Volatile.Read for _waitCount

- WaitHandleDbConnectionPoolShutdownTest.cs: remove unused 'using System.Threading.Tasks;' and read pool._waitCount via Volatile.Read in both the poll-loop condition and the assertion so the test no longer relies on plain int reads observing another thread's Interlocked.Increment.\n- ChannelDbConnectionPoolShutdownTest.cs: remove unused 'using System.Data.Common;'.

* Address PR #4302 Copilot review: ChannelDbConnectionPool.TryGetConnection short-circuits when State != Running

Mirror WaitHandleDbConnectionPool.TryGetConnection: when the pool has been shut down (or is not yet Running), return (true, null) immediately instead of entering the channel-reader path. The previous behavior could reserve a connection slot via _connectionSlots.Add, open a fresh physical connection, hand it to the caller, and then immediately destroy it on return because ReturnInternalConnection checks State == ShuttingDown. The short-circuit avoids the unnecessary open/close round-trip for both sync and async paths. Adds two regression tests.

* Address PR #4302 Copilot review: make WaitHandleDbConnectionPool.Startup() a no-op when ShuttingDown

Guard Startup() against being called after Shutdown(). Without this, Startup() would create a fresh _cleanupTimer and queue a PoolCreateRequest against a pool that will never accept connections back, leaking the timer and scheduling background work that immediately short-circuits on State == ShuttingDown. Adds Startup_AfterShutdown_DoesNotResurrectPool regression test.

* Address PR #4302 Copilot review: drop unused 'using System.Diagnostics;' from ChannelDbConnectionPool

Commit 6431209a replaced the only Debug.Assert in ChannelDbConnectionPool.cs with a race-window-guarded RemoveConnection call but left the 'using System.Diagnostics;' directive in place. Drop the now-unused directive so CS8019 cannot surface where it is promoted to an error.

* Address PR review: harden shutdown drain, async-path short-circuit, style flips, channel Complete tests

- ChannelDbConnectionPool.Shutdown: wrap Pruner.Dispose, Clear, and per-connection RemoveConnection in try/catch so a single failure cannot leave the pool half-shut-down.

- WaitHandleDbConnectionPool.TryGetConnection: re-check State after inner TryGetConnection on the async path and short-circuit with (true, null) to avoid enqueueing PendingGetConnection work against a non-Running pool.

- WaitHandleDbConnectionPool: flip three positive-form shutdown guards (CleanupCallback, ErrorCallback, Startup) to 'State is not Running' for consistency with the rest of the file and to ease the planned bool-state migration. DeactivateObject's stasis-or-destroy branch and Shutdown's idempotency check intentionally left in positive form.

- IdleConnectionChannelTest: add 6 tests covering Complete() idempotency, post-complete TryWrite/TryRead behavior, ChannelClosedException after drain, and pending ReadAsync waiter faulting on Complete (FR-007).

* Pass idleTimeout to DbConnectionPoolGroupOptions in new shutdown tests

Merge of main brought in the 7-arg DbConnectionPoolGroupOptions constructor from #4295 (Add configurable idle connection timeout). Update the two new shutdown test fixtures to pass idleTimeout: 0 so the build succeeds against the merged base.

* Add async-overload shutdown short-circuit test (outer guard path)

Covers Copilot review feedback: the async TryGetConnection overload (taskCompletionSource != null) called after Shutdown must take the (true, null) short-circuit at the outer State guard, leave the TCS untouched, and not enqueue a PendingGetConnection. The post-inner race-window backstop is intentionally not tested here because the async caller does not park inside the inner TryGetConnection (waitForMultipleObjectsTimeout is 0); the window cannot be triggered deterministically without instrumenting production code.

* Fix stale Startup comment in ChannelDbConnectionPool

The previous comment claimed pruning was not implemented, but PR #4295 introduced PoolPruner which is constructed eagerly in the ctor (when MinPoolSize < MaxPoolSize) and arms/disarms its timer via UpdateTimer() calls from OpenNewInternalConnection and RemoveConnection. Update the comment so future maintainers see Startup correctly described as a no-op symmetrical counterpart of Shutdown, while accurately documenting that pruning's background timer is owned by PoolPruner and managed by the connection lifecycle paths, not by Startup.

* Use 'is not Running' consistently in WaitHandleDbConnectionPool

Two new shutdown-state checks I added (async-path short-circuit and post-WaitAny re-check) used 'State != Running' while the rest of the file consistently uses 'State is not Running'. Align them, plus the adjacent comments, with the prevailing style. Trace strings are left as '!=' since they are human-readable log output.

* Compensate CreationSemaphore in shutdown fast-path; fix Complete() comment

WaitHandleDbConnectionPool: when the shutdown fast-path after WaitAny returns early, the outer finally that normally releases CreationSemaphore on the CREATION_HANDLE path is bypassed. Mirror the existing PoolSemaphore compensation: on waitResult == CREATION_HANDLE (and the WAIT_ABANDONED variant), Release(1) on CreationSemaphore inside a try/catch SemaphoreFullException so accounting stays balanced.

ChannelDbConnectionPool: the comment on _idleChannel.Complete() referenced InvalidOperationException, but IdleConnectionChannel.Complete wraps ChannelWriter.TryComplete which is idempotent and never throws. Rewrite the comment to describe TryComplete's actual semantics so future maintainers aren't misled about why this call is safe.

* Revert CreationSemaphore compensation in shutdown fast-path (fixes CI)

Commit c5a55441 added a CreationSemaphore.Release(1) in the shutdown fast-path based on the premise that the early 'return false' bypassed the outer finally that normally releases CreationSemaphore on CREATION_HANDLE. That premise was wrong: C# try/finally executes the finally on return, so the outer finally at line ~1196 already handled the release. My extra Release therefore double-released, tripping SemaphoreFullException (CreationSemaphore max=1) whenever the fast-path was taken with waitResult == CREATION_HANDLE. CI's WaitHandleDbConnectionPoolShutdownTest.Shutdown_UnblocksSyncWaiter hit this reliably in Debug config.

Remove the CreationSemaphore else-if branch and rewrite the comment to explain why compensation is intentionally absent (outer finally handles it). Keep the PoolSemaphore compensation - that path has no outer finally, so the manual Release is genuinely required.

Verified locally: Shutdown_UnblocksSyncWaiter and 24 other Shutdown-related tests pass on net9.0; 20/20 stress iterations of the previously-failing test pass.
---
 .../ConnectionPool/ChannelDbConnectionPool.cs | 111 +++++++-
 .../ConnectionPool/IdleConnectionChannel.cs   |  11 +-
 .../WaitHandleDbConnectionPool.cs             | 117 +++++++-
 .../ChannelDbConnectionPoolShutdownTest.cs    | 232 +++++++++++++++
 .../IdleConnectionChannelTest.cs              |  86 ++++++
 .../WaitHandleDbConnectionPoolShutdownTest.cs | 265 ++++++++++++++++++
 6 files changed, 806 insertions(+), 16 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolShutdownTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 9169e9717e..f5d758ebb7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -5,7 +5,6 @@
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using System.Data.Common;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Channels;
@@ -92,6 +91,13 @@ internal sealed class ChannelDbConnectionPool : IDbConnectionPool, IDisposable
         /// Must be updated using <see cref="Interlocked"/> operations to ensure thread safety.
         /// </summary>
         private volatile int _isClearing;
+
+        /// <summary>
+        /// Tracks whether <see cref="Shutdown"/> has already initiated the shutdown sequence so that
+        /// repeated calls are observed as no-ops. Updated atomically via
+        /// <see cref="Interlocked.CompareExchange(ref int, int, int)"/>.
+        /// </summary>
+        private int _shutdownInitiated;
         #endregion
 
         /// <summary>
@@ -276,16 +282,91 @@ public void ReturnInternalConnection(DbConnectionInternal connection, DbConnecti
             }
             else
             {
-                var written = _idleChannel.TryWrite(connection);
-                Debug.Assert(written, "Failed to write returning connection to the idle channel.");
+                if (!_idleChannel.TryWrite(connection))
+                {
+                    // The channel has been completed (pool is shutting down). Race window
+                    // between the State check above and TryWrite: destroy instead of pooling.
+                    RemoveConnection(connection);
+                }
             }
         }
 
         /// <inheritdoc />
         public void Shutdown()
         {
+            // idempotent. Compare-and-exchange ensures only one caller performs shutdown work.
+            if (Interlocked.CompareExchange(ref _shutdownInitiated, 1, 0) != 0)
+            {
+                return;
+            }
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.Shutdown|RES|INFO|CPOOL> {0}", Id);
+
+            // Transition to ShuttingDown. After this point, ReturnInternalConnection
+            // routes returning connections to RemoveConnection.
             State = ShuttingDown;
-            Pruner?.Dispose();
+
+            // Each cleanup step is independent and best-effort. A failure in one step must not
+            // prevent later steps from running, otherwise the pool can be left half-shut-down
+            // (e.g. timer disposed but channel never completed -> waiters stuck forever).
+
+            // Stop the idle-pruning timer before draining so a tick cannot race with
+            // the final drain below. PoolPruner.Dispose is idempotent and non-throwing
+            // in normal use; the catch is defense-in-depth.
+            try
+            {
+                Pruner?.Dispose();
+            }
+            catch (Exception ex)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, Pruner.Dispose threw, continuing shutdown: {1}", Id, ex);
+            }
+
+            // Complete the channel writer so:
+            //  - no further idle connections can be enqueued (TryWrite returns false), and
+            //  - in-flight / future async waiters on ReadAsync fault with ChannelClosedException.
+            // IdleConnectionChannel.Complete wraps ChannelWriter.TryComplete and is idempotent
+            // (a second call returns false rather than throwing), so this is safe even if the
+            // shutdown sequence is ever refactored to invoke this step more than once.
+            _idleChannel.Complete();
+
+            // Reuse Clear() for the drain. Clear bumps _clearGeneration so any active
+            // checked-out connection fails IsLiveConnection on return and is removed, and it
+            // drains the idle channel up to its captured IdleCount.
+            try
+            {
+                Clear();
+            }
+            catch (Exception ex)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, Clear threw, continuing shutdown: {1}", Id, ex);
+            }
+
+            // Clear() may short-circuit if another caller is already draining. Because the
+            // channel is now completed, no new items can be enqueued, so it is safe to do a
+            // final unbounded drain to mop up anything Clear() may have skipped.
+            while (_idleChannel.TryRead(out DbConnectionInternal? connection))
+            {
+                if (connection is null)
+                {
+                    // null sentinels are wake-up signals only; nothing to destroy.
+                    continue;
+                }
+
+                // Isolate per-connection failure: one bad Dispose must not strand the rest.
+                try
+                {
+                    RemoveConnection(connection);
+                }
+                catch (Exception ex)
+                {
+                    SqlClientEventSource.Log.TryPoolerTraceEvent(
+                        "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, RemoveConnection threw during drain, continuing: {1}", Id, ex);
+                }
+            }
         }
 
         /// <summary>
@@ -296,7 +377,14 @@ public void Shutdown()
         /// <inheritdoc />
         public void Startup()
         {
-            // No-op for now, warmup will be implemented later.
+            // Startup is currently a no-op for this pool: State is set to Running in the
+            // constructor, and PoolPruner (when present, i.e. MinPoolSize < MaxPoolSize) is
+            // also constructed eagerly there; its timer arms/disarms via UpdateTimer() calls
+            // from OpenNewInternalConnection and RemoveConnection as the pool grows/shrinks.
+            // This method exists as the symmetrical counterpart of Shutdown and as a hook
+            // for future warmup behavior.
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.Startup|RES|INFO|CPOOL> {0}", Id);
         }
 
         /// <inheritdoc />
@@ -312,6 +400,19 @@ public bool TryGetConnection(
             TimeoutTimer timeout,
             out DbConnectionInternal? connection)
         {
+            // Short-circuit when the pool is not Running (i.e., shut down or never started).
+            // Returning (true, null) matches WaitHandleDbConnectionPool.TryGetConnection and tells
+            // the caller "completed; no connection available" without entering the channel path,
+            // which would otherwise reserve a slot, attempt to open a fresh physical connection,
+            // and then immediately destroy it on return because State == ShuttingDown.
+            if (State is not Running)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.TryGetConnection|RES|CPOOL> {0}, State != Running.", Id);
+                connection = null;
+                return true;
+            }
+
             // If taskCompletionSource is null, we are in a sync context.
             if (taskCompletionSource is null)
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs
index 00748ab184..348ad33d9e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs
@@ -26,10 +26,19 @@ internal IdleConnectionChannel()
         {
             var channel = Channel.CreateUnbounded<DbConnectionInternal?>();
             _reader = channel.Reader;
-            //TODO: the channel should be completed on pool shutdown
             _writer = channel.Writer;
         }
 
+        /// <summary>
+        /// Marks the channel writer as complete. After completion, <see cref="TryWrite"/>
+        /// returns <see langword="false"/> for any future writes, and any in-flight or future
+        /// <see cref="ReadAsync"/> waiters will fault with <see cref="System.Threading.Channels.ChannelClosedException"/>
+        /// once the channel is drained. Used by the connection pool to signal shutdown.
+        /// </summary>
+        /// <returns><see langword="true"/> if this call completed the channel; otherwise <see langword="false"/>
+        /// (channel was already completed).</returns>
+        internal bool Complete() => _writer.TryComplete();
+
         /// <summary>
         /// The number of non-null connections currently in the channel.
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index d2c3b57323..2aac0a6ce8 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -191,16 +191,16 @@ public void Dispose()
 
         private readonly WaitCallback _poolCreateRequest;
 
-        private int _waitCount;
+        internal int _waitCount;
         private readonly PoolWaitHandles _waitHandles;
 
         private Exception _resError;
         private volatile bool _errorOccurred;
 
         private int _errorWait;
-        private Timer _errorTimer;
+        internal Timer _errorTimer;
 
-        private Timer _cleanupTimer;
+        internal Timer _cleanupTimer;
 
         private readonly TransactedConnectionPool _transactedConnectionPool;
 
@@ -346,8 +346,16 @@ public bool IsRunning
 
         public TransactedConnectionPool TransactedConnectionPool => _transactedConnectionPool;
 
-        private void CleanupCallback(object state)
+        internal void CleanupCallback(object state)
         {
+            // If the pool is not Running, skip work. Shutdown disposes the timer, but
+            // a callback may already be in-flight when Shutdown runs; this guard ensures it does
+            // not perform pruning or re-arm pool create requests.
+            if (State is not Running)
+            {
+                return;
+            }
+
             // Called when the cleanup-timer ticks over.
 
             // This is the automatic pruning method.  Every period, we will
@@ -792,8 +800,15 @@ private void DestroyObject(DbConnectionInternal obj)
             }
         }
 
-        private void ErrorCallback(object state)
+        internal void ErrorCallback(object state)
         {
+            // Skip work if the pool is not Running. The shutdown path disposes the
+            // timer; this guard handles the in-flight-callback race.
+            if (State is not Running)
+            {
+                return;
+            }
+
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.ErrorCallback|RES|CPOOL> {0}, Resetting Error handling.", Id);
             _errorOccurred = false;
             _waitHandles.ErrorEvent.Reset();
@@ -953,6 +968,20 @@ public bool TryGetConnection(DbConnection owningObject, TaskCompletionSource<DbC
                 return true;
             }
 
+            // Shutdown short-circuit for the async path. The inner TryGetConnection returns false
+            // when it observes State is not Running mid-WaitAny. Without this re-check, we would
+            // enqueue a PendingGetConnection and spin up a WaitForPendingOpen background thread
+            // against an already-shut-down pool; the caller would eventually surface a misleading
+            // PooledOpenTimeout instead of a deterministic shutdown signal. Returning (true, null)
+            // matches the sync path and the channel pool's TryGetConnection convention.
+            if (State is not Running)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, Pool not Running after inner TryGetConnection; short-circuit async path.", Id);
+                connection = null;
+                return true;
+            }
+
             long dueTime;
             if (LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait)
             {
@@ -1019,6 +1048,34 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                     {
                         waitResult = WaitHandle.WaitAny(_waitHandles.GetHandles(allowCreate), unchecked((int)waitForMultipleObjectsTimeout));
 
+                        // After waking, observe shutdown state and bail out so waiters
+                        // do not spin against a drained pool. If WaitAny consumed a
+                        // PoolSemaphore slot, release it back so the accounting stays
+                        // balanced; otherwise the slot would leak and other waiters
+                        // (or callers that arrive after Shutdown completes its own
+                        // Release loop) would starve. CreationSemaphore does NOT need
+                        // compensation here because the outer finally below already
+                        // releases it whenever waitResult == CREATION_HANDLE, and
+                        // that finally runs even on this early return.
+                        if (State is not Running)
+                        {
+                            SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, Pool is shutting down; abandoning wait.", Id);
+                            if (waitResult == SEMAPHORE_HANDLE || waitResult == WAIT_ABANDONED + SEMAPHORE_HANDLE)
+                            {
+                                try
+                                {
+                                    _waitHandles.PoolSemaphore.Release(1);
+                                }
+                                catch (SemaphoreFullException)
+                                {
+                                    // Pool semaphore was already saturated by Shutdown's bulk release; safe to ignore.
+                                }
+                            }
+                            Interlocked.Decrement(ref _waitCount);
+                            connection = null;
+                            return false;
+                        }
+
                         // From the WaitAny docs: "If more than one object became signaled during
                         // the call, this is the array index of the signaled object with the
                         // smallest index value of all the signaled objects."  This is important
@@ -1565,6 +1622,16 @@ private bool ReclaimEmancipatedObjects()
         public void Startup()
         {
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.Startup|RES|INFO|CPOOL> {0}, CleanupWait={1}", Id, _cleanupWait);
+
+            // Do not resurrect a shut-down pool. Without this guard a Startup() call after
+            // Shutdown() would create a fresh _cleanupTimer and queue a PoolCreateRequest
+            // against a pool that will never accept connections back, leaking the timer
+            // and scheduling background work that immediately short-circuits.
+            if (State is not Running)
+            {
+                return;
+            }
+
             _cleanupTimer = CreateCleanupTimer();
 
             if (NeedToReplenish)
@@ -1576,15 +1643,45 @@ public void Startup()
         public void Shutdown()
         {
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.Shutdown|RES|INFO|CPOOL> {0}", Id);
+
+            // Idempotent: subsequent calls observe ShuttingDown and bail.
+            if (State == ShuttingDown)
+            {
+                return;
+            }
             State = ShuttingDown;
 
-            // deactivate timer callbacks
-            Timer t = _cleanupTimer;
-            _cleanupTimer = null;
-            if (t != null)
+            // Dispose all background timers so they no longer schedule new work.
+            // Note that any timer callback already in flight may still observe State == ShuttingDown
+            // and short-circuit (see CleanupCallback / ErrorCallback).
+            Timer cleanup = Interlocked.Exchange(ref _cleanupTimer, null);
+            cleanup?.Dispose();
+            Timer error = Interlocked.Exchange(ref _errorTimer, null);
+            error?.Dispose();
+
+            // Wake any threads parked in WaitHandle.WaitAny by releasing as many semaphore
+            // slots as there are recorded waiters. Using _waitCount (rather than MaxPoolSize)
+            // avoids ArgumentOutOfRangeException when MaxPoolSize == 0 (unlimited) and ensures
+            // we wake every parked waiter even when _waitCount exceeds MaxPoolSize. Waiters
+            // observe State is not Running after wake-up and bail.
+            int waitersToWake = Volatile.Read(ref _waitCount);
+            if (waitersToWake > 0)
             {
-                t.Dispose();
+                try
+                {
+                    _waitHandles.PoolSemaphore.Release(waitersToWake);
+                }
+                catch (SemaphoreFullException)
+                {
+                    // Semaphore already saturated; nothing to do.
+                }
             }
+
+            // Reuse Clear() to doom every connection (including active checked-out ones), drain
+            // both idle stacks, and reclaim emancipated objects. Active connections destroy
+            // themselves on return either via the doom flag or via DeactivateObject's
+            // State == ShuttingDown branch.
+            Clear();
         }
 
         // TransactionEnded merely provides the plumbing for DbConnectionInternal to access the transacted pool
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolShutdownTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolShutdownTest.cs
new file mode 100644
index 0000000000..7246a932ca
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolShutdownTest.cs
@@ -0,0 +1,232 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Deterministic tests for <see cref="ChannelDbConnectionPool"/> shutdown behavior.
+    /// </summary>
+    public class ChannelDbConnectionPoolShutdownTest
+    {
+        private static ChannelDbConnectionPool ConstructPool(int maxPoolSize = 5)
+        {
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: maxPoolSize,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 0);
+
+            var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+                new SqlConnectionOptions("Data Source=localhost;"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                poolGroupOptions);
+
+            return new ChannelDbConnectionPool(
+                new ChannelDbConnectionPoolTest.SuccessfulSqlConnectionFactory(),
+                dbConnectionPoolGroup,
+                DbConnectionPoolIdentity.NoIdentity,
+                new DbConnectionPoolProviderInfo());
+        }
+
+        // State transitions to ShuttingDown on Shutdown.
+        [Fact]
+        public void Shutdown_TransitionsState_ToShuttingDown()
+        {
+            var pool = ConstructPool();
+            Assert.True(pool.IsRunning);
+            Assert.Equal(DbConnectionPoolState.Running, pool.State);
+
+            pool.Shutdown();
+
+            Assert.False(pool.IsRunning);
+            Assert.Equal(DbConnectionPoolState.ShuttingDown, pool.State);
+        }
+
+        // Drains buffered idle connections.
+        [Fact]
+        public void Shutdown_DrainsIdleConnections()
+        {
+            var pool = ConstructPool();
+
+            // Vend and return three connections so they sit idle in the channel.
+            var owners = new List<SqlConnection>();
+            var conns = new List<DbConnectionInternal>();
+            for (int i = 0; i < 3; i++)
+            {
+                var owner = new SqlConnection();
+                owners.Add(owner);
+                Assert.True(pool.TryGetConnection(owner, taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? c));
+                Assert.NotNull(c);
+                conns.Add(c!);
+            }
+            for (int i = 0; i < conns.Count; i++)
+            {
+                pool.ReturnInternalConnection(conns[i], owners[i]);
+            }
+            Assert.Equal(3, pool.IdleCount);
+
+            pool.Shutdown();
+
+            Assert.Equal(0, pool.IdleCount);
+            Assert.Equal(0, pool.Count);
+        }
+
+        // Returned connection while shutting down is destroyed, not pooled.
+        [Fact]
+        public void Shutdown_ReturnedConnection_IsDestroyedNotPooled()
+        {
+            var pool = ConstructPool();
+            var owner = new SqlConnection();
+            Assert.True(pool.TryGetConnection(owner, taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn));
+            Assert.NotNull(conn);
+            Assert.Equal(1, pool.Count);
+            Assert.Equal(0, pool.IdleCount);
+
+            pool.Shutdown();
+
+            // Connection is still checked out; return it now.
+            pool.ReturnInternalConnection(conn!, owner);
+
+            Assert.Equal(0, pool.IdleCount);
+            Assert.Equal(0, pool.Count);
+        }
+
+        // Shutdown is idempotent.
+        [Fact]
+        public void Shutdown_IsIdempotent()
+        {
+            var pool = ConstructPool();
+            pool.Shutdown();
+            // Second call must not throw and must leave state intact.
+            pool.Shutdown();
+            pool.Shutdown();
+            Assert.Equal(DbConnectionPoolState.ShuttingDown, pool.State);
+        }
+
+        // Async waiter is unblocked when the pool shuts down.
+        [Fact]
+        public async Task Shutdown_UnblocksAsyncWaiter()
+        {
+            var pool = ConstructPool(maxPoolSize: 1);
+
+            // Saturate the pool.
+            Assert.True(pool.TryGetConnection(new SqlConnection(), taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? blocking));
+            Assert.NotNull(blocking);
+
+            // Park an async waiter.
+            var tcs = new TaskCompletionSource<DbConnectionInternal>();
+            bool completed = pool.TryGetConnection(new SqlConnection(), tcs, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? waiter);
+            Assert.False(completed);
+            Assert.Null(waiter);
+            Assert.False(tcs.Task.IsCompleted);
+
+            // Shut down the pool.
+            pool.Shutdown();
+
+            // Waiter must complete (faulted or with a null connection) within a bounded window.
+            var winner = await Task.WhenAny(tcs.Task, Task.Delay(TimeSpan.FromSeconds(5)));
+            Assert.Same(tcs.Task, winner);
+            // Either an exception was set (channel closed) or the result is null - both are acceptable
+            // shutdown signals. What matters is the waiter does NOT block forever.
+            if (tcs.Task.IsFaulted)
+            {
+                // Expected path: ChannelClosedException or a wrapped exception.
+                Assert.NotNull(tcs.Task.Exception);
+            }
+            else
+            {
+                // Permitted: completed with null result.
+                Assert.Null(tcs.Task.Result);
+            }
+        }
+
+        // Sync get fails fast after shutdown.
+        // The factory-level retry guard checks IsRunning, but the pool itself must not vend
+        // new connections after Shutdown. We verify by exhausting the pool first then
+        // checking that returned connections are destroyed (Count goes back to 0).
+        [Fact]
+        public void Shutdown_AfterShutdown_NewReturnsAreDestroyed()
+        {
+            var pool = ConstructPool();
+            var owner = new SqlConnection();
+            Assert.True(pool.TryGetConnection(owner, taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? c));
+            Assert.NotNull(c);
+
+            pool.Shutdown();
+            pool.ReturnInternalConnection(c!, owner);
+
+            Assert.False(pool.IsRunning);
+            Assert.Equal(0, pool.Count);
+            Assert.Equal(0, pool.IdleCount);
+        }
+
+        // Sanity: Startup is currently a no-op for this pool but must not throw or change
+        // shutdown state if invoked after Shutdown.
+        [Fact]
+        public void Startup_AfterShutdown_DoesNotResurrectPool()
+        {
+            var pool = ConstructPool();
+            pool.Shutdown();
+
+            pool.Startup();
+
+            Assert.Equal(DbConnectionPoolState.ShuttingDown, pool.State);
+            Assert.False(pool.IsRunning);
+        }
+
+        // After Shutdown, a synchronous TryGetConnection must short-circuit and return
+        // (true, null) rather than entering the channel path and opening a fresh physical
+        // connection that would be immediately destroyed on return.
+        [Fact]
+        public void TryGetConnection_AfterShutdown_Sync_ShortCircuits()
+        {
+            var pool = ConstructPool();
+            pool.Shutdown();
+
+            int countBefore = pool.Count;
+            bool completed = pool.TryGetConnection(
+                new SqlConnection(),
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(5)),
+                out DbConnectionInternal? conn);
+
+            Assert.True(completed, "Sync TryGetConnection on a shut-down pool should return true to signal completion.");
+            Assert.Null(conn);
+            Assert.Equal(countBefore, pool.Count);
+        }
+
+        // Same contract for the async (TaskCompletionSource) path: a TryGetConnection call
+        // issued after Shutdown must short-circuit without opening a new connection.
+        [Fact]
+        public void TryGetConnection_AfterShutdown_Async_ShortCircuits()
+        {
+            var pool = ConstructPool();
+            pool.Shutdown();
+
+            int countBefore = pool.Count;
+            var tcs = new TaskCompletionSource<DbConnectionInternal>();
+            bool completed = pool.TryGetConnection(
+                new SqlConnection(),
+                tcs,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(5)),
+                out DbConnectionInternal? conn);
+
+            // Match WaitHandleDbConnectionPool: short-circuit returns (true, null) regardless of TCS.
+            Assert.True(completed);
+            Assert.Null(conn);
+            Assert.Equal(countBefore, pool.Count);
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs
index 56aa9c234a..faa4073a7d 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Data.Common;
 using System.Threading;
+using System.Threading.Channels;
 using System.Threading.Tasks;
 using System.Transactions;
 using Microsoft.Data.ProviderBase;
@@ -160,6 +161,91 @@ await Assert.ThrowsAnyAsync<OperationCanceledException>(
 
         #endregion
 
+        #region Complete
+
+        [Fact]
+        public void Complete_FirstCall_ReturnsTrue()
+        {
+            var channel = new IdleConnectionChannel();
+
+            Assert.True(channel.Complete());
+        }
+
+        [Fact]
+        public void Complete_SecondCall_ReturnsFalse()
+        {
+            var channel = new IdleConnectionChannel();
+            Assert.True(channel.Complete());
+
+            // Idempotent: a second Complete is a safe no-op and must not throw.
+            Assert.False(channel.Complete());
+        }
+
+        [Fact]
+        public void TryWrite_AfterComplete_ReturnsFalseAndDoesNotIncrementCount()
+        {
+            var channel = new IdleConnectionChannel();
+            channel.Complete();
+
+            Assert.False(channel.TryWrite(new StubDbConnectionInternal()));
+            Assert.False(channel.TryWrite(null));
+            Assert.Equal(0, channel.Count);
+        }
+
+        [Fact]
+        public void TryRead_AfterComplete_DrainsBufferedItems()
+        {
+            var channel = new IdleConnectionChannel();
+            channel.TryWrite(new StubDbConnectionInternal());
+            channel.TryWrite(new StubDbConnectionInternal());
+            Assert.Equal(2, channel.Count);
+
+            channel.Complete();
+
+            // Completion only stops new writes; already-buffered items remain readable.
+            Assert.True(channel.TryRead(out var first));
+            Assert.NotNull(first);
+            Assert.True(channel.TryRead(out var second));
+            Assert.NotNull(second);
+            Assert.Equal(0, channel.Count);
+
+            // Once drained, further reads return false.
+            Assert.False(channel.TryRead(out _));
+        }
+
+        [Fact]
+        public async Task ReadAsync_AfterCompleteAndDrain_ThrowsChannelClosedException()
+        {
+            var channel = new IdleConnectionChannel();
+            channel.TryWrite(new StubDbConnectionInternal());
+            channel.Complete();
+
+            // Buffered item is still readable.
+            var buffered = await channel.ReadAsync(CancellationToken.None);
+            Assert.NotNull(buffered);
+
+            // After the channel is drained, ReadAsync faults with ChannelClosedException.
+            await Assert.ThrowsAsync<ChannelClosedException>(
+                () => channel.ReadAsync(CancellationToken.None).AsTask());
+        }
+
+        [Fact]
+        public async Task ReadAsync_PendingWaiter_FaultsOnComplete()
+        {
+            // FR-007: a caller already parked in ReadAsync when shutdown completes the
+            // channel must be unblocked (not wait until its connection timeout).
+            var channel = new IdleConnectionChannel();
+
+            var readTask = channel.ReadAsync(CancellationToken.None);
+            Assert.False(readTask.IsCompleted);
+
+            channel.Complete();
+
+            await Assert.ThrowsAsync<ChannelClosedException>(() => readTask.AsTask());
+        }
+
+        #endregion
+
         #region Mixed operations
 
         [Fact]
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
new file mode 100644
index 0000000000..52bf9ccb29
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
@@ -0,0 +1,265 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Deterministic tests for <see cref="WaitHandleDbConnectionPool"/> shutdown behavior.
+    /// </summary>
+    public class WaitHandleDbConnectionPoolShutdownTest
+    {
+        private static WaitHandleDbConnectionPool CreatePool(int maxPoolSize = 5)
+        {
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: maxPoolSize,
+                creationTimeout: 15000,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 0);
+
+            var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+                new SqlConnectionOptions("Data Source=localhost;"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                poolGroupOptions);
+
+            var pool = new WaitHandleDbConnectionPool(
+                new WaitHandleDbConnectionPoolTransactionTest.MockSqlConnectionFactory(),
+                dbConnectionPoolGroup,
+                DbConnectionPoolIdentity.NoIdentity,
+                new DbConnectionPoolProviderInfo());
+            pool.Startup();
+            return pool;
+        }
+
+        // State transitions to ShuttingDown on Shutdown.
+        [Fact]
+        public void Shutdown_TransitionsState_ToShuttingDown()
+        {
+            var pool = CreatePool();
+            Assert.True(pool.IsRunning);
+
+            pool.Shutdown();
+
+            Assert.False(pool.IsRunning);
+            Assert.Equal(DbConnectionPoolState.ShuttingDown, pool.State);
+        }
+
+        // Cleanup timer is disposed.
+        [Fact]
+        public void Shutdown_DisposesCleanupTimer()
+        {
+            var pool = CreatePool();
+            Assert.NotNull(pool._cleanupTimer);
+
+            pool.Shutdown();
+
+            Assert.Null(pool._cleanupTimer);
+        }
+
+        // Error timer is disposed when present.
+        [Fact]
+        public void Shutdown_DisposesErrorTimer_WhenPresent()
+        {
+            var pool = CreatePool();
+            // Inject a real Timer into _errorTimer to mimic an error-state pool.
+            pool._errorTimer = new Timer(_ => { }, null, Timeout.Infinite, Timeout.Infinite);
+
+            pool.Shutdown();
+
+            Assert.Null(pool._errorTimer);
+        }
+
+        // Drains idle stacks.
+        [Fact]
+        public void Shutdown_DrainsIdleStacks()
+        {
+            var pool = CreatePool();
+
+            // Vend a few connections then return them so they sit in _stackNew.
+            var owner1 = new SqlConnection();
+            var owner2 = new SqlConnection();
+            pool.TryGetConnection(owner1, taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? c1);
+            pool.TryGetConnection(owner2, taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? c2);
+            Assert.NotNull(c1);
+            Assert.NotNull(c2);
+            pool.ReturnInternalConnection(c1!, owner1);
+            pool.ReturnInternalConnection(c2!, owner2);
+
+            Assert.Equal(2, pool.IdleCount);
+            Assert.Equal(2, pool.Count);
+
+            pool.Shutdown();
+
+            Assert.Equal(0, pool.IdleCount);
+            Assert.Equal(0, pool.Count);
+        }
+
+        // Shutdown is idempotent.
+        [Fact]
+        public void Shutdown_IsIdempotent()
+        {
+            var pool = CreatePool();
+            pool.Shutdown();
+            pool.Shutdown();
+            pool.Shutdown();
+            Assert.Equal(DbConnectionPoolState.ShuttingDown, pool.State);
+        }
+
+        // Cleanup callback after shutdown is a no-op.
+        [Fact]
+        public void CleanupCallback_AfterShutdown_IsNoOp()
+        {
+            var pool = CreatePool();
+            pool.Shutdown();
+
+            // Invoke the callback directly. Must not throw and must not re-arm any pool
+            // create requests.
+            var ex = Record.Exception(() => pool.CleanupCallback(state: null));
+            Assert.Null(ex);
+            Assert.Equal(DbConnectionPoolState.ShuttingDown, pool.State);
+        }
+
+        // Error callback after shutdown is a no-op.
+        [Fact]
+        public void ErrorCallback_AfterShutdown_IsNoOp()
+        {
+            var pool = CreatePool();
+            pool.Shutdown();
+
+            var ex = Record.Exception(() => pool.ErrorCallback(state: null));
+            Assert.Null(ex);
+        }
+
+        // Sync caller arriving after shutdown gets a null connection (factory will
+        // see this and return up the retry chain). The pool's TryGetConnection short-circuits
+        // on State != Running.
+        [Fact]
+        public void TryGetConnection_AfterShutdown_ReturnsNullWithoutBlocking()
+        {
+            var pool = CreatePool();
+            pool.Shutdown();
+
+            bool completed = pool.TryGetConnection(
+                new SqlConnection(),
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? conn);
+
+            // TryGetConnection returns true with a null connection when State != Running.
+            Assert.True(completed);
+            Assert.Null(conn);
+        }
+
+        // Async overload (taskCompletionSource != null) called after Shutdown must take the
+        // (true, null) short-circuit instead of enqueueing a PendingGetConnection and spinning
+        // up a WaitForPendingOpen background loop. The TCS must be left untouched so the caller
+        // surfaces a deterministic shutdown signal rather than an eventual PooledOpenTimeout.
+        [Fact]
+        public void TryGetConnection_Async_AfterShutdown_ShortCircuits_NoPendingOpenScheduled()
+        {
+            var pool = CreatePool();
+            pool.Shutdown();
+
+            var tcs = new TaskCompletionSource<DbConnectionInternal>();
+            bool completed = pool.TryGetConnection(
+                new SqlConnection(),
+                tcs,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? conn);
+
+            Assert.True(completed);
+            Assert.Null(conn);
+            Assert.False(tcs.Task.IsCompleted);
+            Assert.Equal(0, Volatile.Read(ref pool._waitCount));
+        }
+
+        // Shutdown wakes up a thread parked in WaitHandle.WaitAny.
+        [Fact]
+        public void Shutdown_UnblocksSyncWaiter()
+        {
+            var pool = CreatePool(maxPoolSize: 1);
+
+            // Saturate the pool.
+            var owner = new SqlConnection();
+            Assert.True(pool.TryGetConnection(owner, taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? blocking));
+            Assert.NotNull(blocking);
+
+            // Park a sync waiter on a worker thread with a long creation timeout.
+            DbConnectionInternal? waiterResult = null;
+            bool waiterCompleted = false;
+            Exception? waiterEx = null;
+
+            var t = new Thread(() =>
+            {
+                try
+                {
+                    waiterCompleted = pool.TryGetConnection(
+                        new SqlConnection(),
+                        taskCompletionSource: null,
+                        TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                        out waiterResult);
+                }
+                catch (Exception ex)
+                {
+                    waiterEx = ex;
+                }
+            })
+            { IsBackground = true };
+            t.Start();
+
+            // Wait deterministically until the worker has incremented _waitCount, which
+            // happens immediately before it enters WaitHandle.WaitAny. Polling avoids the
+            // CI-flakiness of a fixed Thread.Sleep on slow agents. Volatile.Read ensures
+            // we see the worker's Interlocked.Increment without depending on CPU memory
+            // ordering of plain int reads.
+            var deadline = DateTime.UtcNow.AddSeconds(5);
+            while (DateTime.UtcNow < deadline && Volatile.Read(ref pool._waitCount) < 1)
+            {
+                Thread.Yield();
+            }
+            Assert.True(Volatile.Read(ref pool._waitCount) >= 1, "Waiter did not park within 5s.");
+            Assert.True(t.IsAlive, "Waiter should be parked, but thread already exited.");
+
+            pool.Shutdown();
+
+            Assert.True(t.Join(TimeSpan.FromSeconds(5)), "Waiter did not unblock within 5s of Shutdown.");
+            // Acceptable outcomes: either returned false/null (timed out / abandoned) or
+            // returned true/null (state-check short-circuit). Either way, it must NOT block
+            // forever, and it must NOT vend a real connection from a shut-down pool.
+            Assert.Null(waiterResult);
+            Assert.Null(waiterEx);
+            // Suppress unused warning - presence of waiterCompleted just documents the contract.
+            _ = waiterCompleted;
+        }
+
+        // Startup() must be a no-op when the pool has already been shut down. Without the
+        // guard it would create a fresh _cleanupTimer and queue a PoolCreateRequest against
+        // a pool that will never accept connections back.
+        [Fact]
+        public void Startup_AfterShutdown_DoesNotResurrectPool()
+        {
+            var pool = CreatePool();
+            pool.Shutdown();
+            Assert.Null(pool._cleanupTimer);
+            Assert.Equal(DbConnectionPoolState.ShuttingDown, pool.State);
+
+            pool.Startup();
+
+            Assert.Equal(DbConnectionPoolState.ShuttingDown, pool.State);
+            Assert.False(pool.IsRunning);
+            // No new cleanup timer must have been scheduled against a shut-down pool.
+            Assert.Null(pool._cleanupTimer);
+        }
+    }
+}

From 1ed86465959c6803dea5354c538ca22b2448f5fd Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Thu, 2 Jul 2026 10:20:48 -0700
Subject: [PATCH 174/298] Refactor ForceNewConnection (#4415)

* Remove unused method.

* Remove instance-level ForceNewConnection property. Replace with explicit method parameters.

* Fix initialization. Add doc comments.

* Remove unnecessary internal API surface.

* Expose param.

* Address broken test and copilot comments.

* Name arguments. Address copilot comments.
---
 .../Data/ProviderBase/DbConnectionClosed.cs   |  2 +-
 .../Data/ProviderBase/DbConnectionInternal.cs | 14 ++--
 .../Connection/SqlConnectionInternal.cs       |  2 +-
 .../WaitHandleDbConnectionPool.cs             |  1 -
 .../Microsoft/Data/SqlClient/SqlConnection.cs | 66 ++++++++++++-------
 .../Data/SqlClient/SqlConnectionFactory.cs    |  4 +-
 .../SqlConnectionConcurrentOpenTests.cs       | 18 +----
 .../SqlConnectionStateTransitionTests.cs      |  6 +-
 8 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
index f5ae12f5a1..37782dddf3 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
@@ -64,7 +64,7 @@ internal override bool TryOpenConnection(
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
             TimeoutTimer timeout) =>
-            TryOpenConnectionInternal(outerConnection, connectionFactory, retry, timeout);
+            TryOpenConnectionInternal(outerConnection, connectionFactory, retry, forceNewConnection: false, timeout);
 
         /// <inheritdoc/>
         internal override void ResetConnection() => throw ADP.ClosedConnectionError();
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
index 539f79ff47..907e491949 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -735,11 +735,6 @@ internal void PostPop(DbConnection newOwner)
             }
         }
 
-        internal virtual void PrepareForReplaceConnection()
-        {
-            // By default, there is no preparation required
-        }
-
         /// <summary>
         /// Stamps <see cref="ReturnedTime"/> with the current UTC time. The pool calls this from its
         /// return-to-pool path only when it intends the idle-timeout machinery to act on the value;
@@ -930,6 +925,7 @@ protected bool TryOpenConnectionInternal(
             DbConnection outerConnection,
             SqlConnectionFactory connectionFactory,
             TaskCompletionSource<DbConnectionInternal> retry,
+            bool forceNewConnection,
             TimeoutTimer timeout)
         {
             // ?->Connecting: prevent set_ConnectionString during Open
@@ -939,7 +935,13 @@ protected bool TryOpenConnectionInternal(
                 try
                 {
                     connectionFactory.PermissionDemand(outerConnection);
-                    if (!connectionFactory.TryGetConnection(outerConnection, retry, this, timeout, out openConnection))
+                    if (!connectionFactory.TryGetConnection(
+                            outerConnection, 
+                            retry, 
+                            this, 
+                            timeout, 
+                            forceNewConnection, 
+                            out openConnection))
                     {
                         return false;
                     }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index 8ff3d92428..a70ab35360 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -1969,7 +1969,7 @@ internal override bool TryReplaceConnection(
             TaskCompletionSource<DbConnectionInternal> retry,
             TimeoutTimer timeout)
         {
-            return TryOpenConnectionInternal(outerConnection, connectionFactory, retry, timeout);
+            return TryOpenConnectionInternal(outerConnection, connectionFactory, retry, forceNewConnection: true, timeout);
         }
 
         internal void ValidateConnectionForExecute(SqlCommand command)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index 2aac0a6ce8..e83fdcf7fa 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -1260,7 +1260,6 @@ public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConne
             {
                 SqlClientDiagnostics.Metrics.SoftConnectRequest();
                 PrepareConnection(owningObject, newConnection, oldConnection.EnlistedTransaction);
-                oldConnection.PrepareForReplaceConnection();
                 oldConnection.DeactivateConnection();
                 oldConnection.Dispose();
             }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index bf99482d41..d63571bd55 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -1223,8 +1223,6 @@ internal int ReconnectCount
             get => _reconnectCount;
         }
 
-        internal bool ForceNewConnection { get; set; }
-
 #if NET
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/OnStateChange/*' />
         protected override void OnStateChange(StateChangeEventArgs stateChange)
@@ -1597,8 +1595,8 @@ public override void EnlistTransaction(System.Transactions.Transaction transacti
         public override void Open() =>
             Open(SqlConnectionOverrides.None);
 
-        private bool TryOpenWithRetry(TaskCompletionSource<DbConnectionInternal> retry, SqlConnectionOverrides overrides)
-            => RetryLogicProvider.Execute(this, () => TryOpen(retry, overrides));
+        private bool TryOpenWithRetry(TaskCompletionSource<DbConnectionInternal> retry, bool forceNewConnection, SqlConnectionOverrides overrides)
+            => RetryLogicProvider.Execute(this, () => TryOpen(retry, forceNewConnection, overrides));
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/OpenWithOverrides/*' />
         public void Open(SqlConnectionOverrides overrides)
@@ -1618,7 +1616,7 @@ public void Open(SqlConnectionOverrides overrides)
                 {
                     statistics = SqlStatistics.StartTimer(Statistics);
 
-                    if (!(IsProviderRetriable ? TryOpenWithRetry(null, overrides) : TryOpen(null, overrides)))
+                    if (!(IsProviderRetriable ? TryOpenWithRetry(null, false, overrides) : TryOpen(null, false, overrides)))
                     {
                         throw ADP.InternalError(ADP.InternalErrorCode.SynchronousConnectReturnedPending);
                     }
@@ -1667,6 +1665,12 @@ private async Task ReconnectAsync(int timeout)
                 {
                     commandTimeoutExpiration = ADP.TimerCurrent() + ADP.TimerFromSeconds(timeout);
                 }
+
+                // Calling Close will request a cancellation on this token source, cancelling the reconnection.
+                // Ideally, however, the reconnect should be directly awaited, making it impossible to have a
+                // concurrent call to Close.
+                // TODO: Note that we do not respect the command timeout in this context. Instead, the reconnect gets
+                // a full connect timeout. Investigate if this should be changed.
                 _reconnectionCancellationSource = cts;
                 CancellationToken ctoken = cts.Token;
                 int retryCount = _connectRetryCount; // take a snapshot: could be changed by modifying the connection string
@@ -1684,8 +1688,15 @@ private async Task ReconnectAsync(int timeout)
 #endif
                         try
                         {
-                            ForceNewConnection = true;
-                            await OpenAsync(ctoken).ConfigureAwait(false);
+                            if (IsProviderRetriable)
+                            {
+                                await InternalOpenWithRetryAsync(SqlConnectionOverrides.None, forceNewConnection: true, ctoken).ConfigureAwait(false);
+                            }
+                            else
+                            {
+                                await InternalOpenAsync(SqlConnectionOverrides.None, forceNewConnection: true, ctoken).ConfigureAwait(false);
+                            }
+
                             // On success, increment the reconnect count - we don't really care if it rolls over since it is approx.
                             _reconnectCount = unchecked(_reconnectCount + 1);
 #if DEBUG
@@ -1697,7 +1708,6 @@ private async Task ReconnectAsync(int timeout)
 #if NETFRAMEWORK
                             _impersonateIdentity = null;
 #endif
-                            ForceNewConnection = false;
                         }
 
                         SqlClientEventSource.Log.TryTraceEvent("SqlConnection.ReconnectAsync | Info | Reconnection succeeded. Client Connection Id {0} -> {1}", _originalConnectionId, ClientConnectionId);
@@ -1907,13 +1917,13 @@ public override Task OpenAsync(CancellationToken cancellationToken)
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/OpenAsyncWithOverrides/*' />
         public Task OpenAsync(SqlConnectionOverrides overrides, CancellationToken cancellationToken)
             => IsProviderRetriable ?
-                InternalOpenWithRetryAsync(overrides, cancellationToken) :
-                InternalOpenAsync(overrides, cancellationToken);
+                InternalOpenWithRetryAsync(overrides, forceNewConnection: false, cancellationToken) :
+                InternalOpenAsync(overrides, forceNewConnection: false, cancellationToken);
 
-        private Task InternalOpenWithRetryAsync(SqlConnectionOverrides overrides, CancellationToken cancellationToken)
-            => RetryLogicProvider.ExecuteAsync(this, () => InternalOpenAsync(overrides, cancellationToken), cancellationToken);
+        private Task InternalOpenWithRetryAsync(SqlConnectionOverrides overrides, bool forceNewConnection, CancellationToken cancellationToken)
+            => RetryLogicProvider.ExecuteAsync(this, () => InternalOpenAsync(overrides, forceNewConnection, cancellationToken), cancellationToken);
 
-        private Task InternalOpenAsync(SqlConnectionOverrides overrides, CancellationToken cancellationToken)
+        private Task InternalOpenAsync(SqlConnectionOverrides overrides, bool forceNewConnection, CancellationToken cancellationToken)
         {
             long scopeID = SqlClientEventSource.Log.TryPoolerScopeEnterEvent("SqlConnection.InternalOpenAsync | API | Object Id {0}", ObjectID);
             SqlClientEventSource.Log.TryCorrelationTraceEvent("SqlConnection.InternalOpenAsync | API | Correlation | Object Id {0}, Activity Id {1}", ObjectID, ActivityCorrelator.Current);
@@ -1955,7 +1965,7 @@ private Task InternalOpenAsync(SqlConnectionOverrides overrides, CancellationTok
 
                     try
                     {
-                        completed = TryOpen(completion, overrides);
+                        completed = TryOpen(completion, forceNewConnection, overrides);
                     }
                     catch (Exception e)
                     {
@@ -1975,7 +1985,7 @@ private Task InternalOpenAsync(SqlConnectionOverrides overrides, CancellationTok
                         {
                             registration = cancellationToken.Register(s_openAsyncCancel, completion);
                         }
-                        OpenAsyncRetry retry = new OpenAsyncRetry(this, completion, result, overrides, registration);
+                        OpenAsyncRetry retry = new OpenAsyncRetry(this, completion, result, overrides, registration, forceNewConnection);
                         _currentCompletion = new Tuple<TaskCompletionSource<DbConnectionInternal>, Task>(completion, result.Task);
                         completion.Task.ContinueWith(retry.Retry, TaskScheduler.Default);
                         return result.Task;
@@ -2088,14 +2098,16 @@ private class OpenAsyncRetry
             private TaskCompletionSource<object> _result;
             private SqlConnectionOverrides _overrides;
             private CancellationTokenRegistration _registration;
+            private bool _forceNewConnection;
 
-            public OpenAsyncRetry(SqlConnection parent, TaskCompletionSource<DbConnectionInternal> retry, TaskCompletionSource<object> result, SqlConnectionOverrides overrides, CancellationTokenRegistration registration)
+            public OpenAsyncRetry(SqlConnection parent, TaskCompletionSource<DbConnectionInternal> retry, TaskCompletionSource<object> result, SqlConnectionOverrides overrides, CancellationTokenRegistration registration, bool forceNewConnection)
             {
                 _parent = parent;
                 _retry = retry;
                 _result = result;
                 _overrides = overrides;
                 _registration = registration;
+                _forceNewConnection = forceNewConnection;
                 SqlClientEventSource.Log.TryTraceEvent("SqlConnection.OpenAsyncRetry | Info | Object Id {0}", _parent?.ObjectID);
             }
 
@@ -2130,7 +2142,7 @@ internal void Retry(Task<DbConnectionInternal> retryTask)
                             // protect continuation from races with close and cancel
                             lock (_parent.InnerConnection)
                             {
-                                result = _parent.TryOpen(_retry, _overrides);
+                                result = _parent.TryOpen(_retry, _forceNewConnection, _overrides);
                             }
                             if (result)
                             {
@@ -2176,7 +2188,7 @@ private void PrepareStatisticsForNewConnection()
             }
         }
 
-        private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, SqlConnectionOverrides overrides = SqlConnectionOverrides.None)
+        private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, bool forceNewConnection, SqlConnectionOverrides overrides = SqlConnectionOverrides.None)
         {
             bool result = false;
 
@@ -2206,13 +2218,13 @@ private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, SqlConnec
                 {
                     if (_impersonateIdentity.User == identity.User)
                     {
-                        result = TryOpenInner(retry);
+                        result = TryOpenInner(retry, forceNewConnection);
                     }
                     else
                     {
                         using (WindowsImpersonationContext context = _impersonateIdentity.Impersonate())
                         {
-                            result = TryOpenInner(retry);
+                            result = TryOpenInner(retry, forceNewConnection);
                         }
                     }
                 }
@@ -2227,10 +2239,10 @@ private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, SqlConnec
                 {
                     _lastIdentity = null;
                 }
-                result = TryOpenInner(retry);
+                result = TryOpenInner(retry, forceNewConnection);
             }
 #else
-            result = TryOpenInner(retry);
+            result = TryOpenInner(retry, forceNewConnection);
 #endif
 
             return result;
@@ -2240,12 +2252,18 @@ private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, SqlConnec
         /// Completes the inner open/replace operation and initializes parser state for the active inner connection.
         /// </summary>
         /// <param name="retry">Retry continuation used by async open paths.</param>
+        /// <param name="forceNewConnection">Provide true to forcibly overwrite the existing connection. Provide false if connecting for the first time.</param>
         /// <returns><see langword="true"/> when open initialization completed synchronously; otherwise <see langword="false"/>.</returns>
         /// <remarks>
         /// The inner connection is snapshotted after the open call so downstream parser access uses a single observed
         /// instance and does not rely on a second racy read of <see cref="InnerConnection"/>.
+        /// 
+        /// forceNewConnection may only be true when the connection is already open (or was open) and needs to be replaced. If the connection has never
+        /// been opened, passing true will result in an exception. It may only be false when the connection has never been opened or is
+        /// currently disconnected. If the connection is currently open, passing false will result in an exception. See SqlConnection state
+        /// transitions and subclasses for more details.
         /// </remarks>
-        internal bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry)
+        internal bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry, bool forceNewConnection)
         {
             // Create a single TimeoutTimer that represents the overall connection-open budget for this
             // attempt. The timer is threaded through every layer (inner connection state transitions,
@@ -2257,7 +2275,7 @@ internal bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry)
             TimeoutTimer timeout = TimeoutTimer.StartNew(
                 TimeSpan.FromSeconds(ConnectionOptions?.ConnectTimeout ?? ADP.DefaultConnectionTimeout));
 
-            if (ForceNewConnection)
+            if (forceNewConnection)
             {
                 if (!InnerConnection.TryReplaceConnection(this, ConnectionFactory, retry, timeout))
                 {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index 1f90eac202..889a9c014c 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -318,6 +318,7 @@ internal bool TryGetConnection(
             TaskCompletionSource<DbConnectionInternal> retry,
             DbConnectionInternal oldConnection,
             TimeoutTimer timeout,
+            bool forceNewConnection,
             out DbConnectionInternal connection)
         {
             Debug.Assert(owningConnection is not null, "null owningConnection?");
@@ -419,7 +420,7 @@ internal bool TryGetConnection(
                 }
                 else
                 {
-                    if (((SqlConnection)owningConnection).ForceNewConnection)
+                    if (forceNewConnection)
                     {
                         Debug.Assert(oldConnection is not DbConnectionClosed, "Force new connection, but there is no old connection");
                         
@@ -777,7 +778,6 @@ private Task<DbConnectionInternal> CreateReplaceConnectionContinuation(
                         
                         if (oldConnection?.State == ConnectionState.Open)
                         {
-                            oldConnection.PrepareForReplaceConnection();
                             oldConnection.Dispose();
                         }
                         
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
index 8d151e61cd..17ac619a3e 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Data;
-using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.Connection;
@@ -26,9 +25,6 @@ namespace Microsoft.Data.SqlClient.UnitTests.Microsoft.Data.SqlClient
     /// </summary>
     public class SqlConnectionConcurrentOpenTests
     {
-        private static readonly MethodInfo s_tryOpenInner = typeof(SqlConnection)
-            .GetMethod("TryOpenInner", BindingFlags.Instance | BindingFlags.NonPublic)!;
-
         private static DbConnectionInternal GetConnectingSingleton()
         {
             return DbConnectionClosedConnecting.SingletonInstance;
@@ -43,18 +39,6 @@ private static void ForceInnerConnection(SqlConnection connection, DbConnectionI
             Assert.True(swapped, $"CAS failed: expected current state {current.GetType().Name} but it changed concurrently.");
         }
 
-        private static bool InvokeTryOpenInner(SqlConnection connection, TaskCompletionSource<DbConnectionInternal> retry)
-        {
-            try
-            {
-                return (bool)s_tryOpenInner.Invoke(connection, [retry])!;
-            }
-            catch (TargetInvocationException tie) when (tie.InnerException != null)
-            {
-                throw tie.InnerException;
-            }
-        }
-
         [Fact]
         public void InnerConnection_DbConnectionClosedConnecting_IsNotAssignableToSqlConnectionInternal()
         {
@@ -102,7 +86,7 @@ public void TryOpenInner_WhenInnerConnectionRacesToNonSqlConnectionInternalState
 
             Exception ex = Assert.ThrowsAny<Exception>(() =>
             {
-                InvokeTryOpenInner(connection, completedRetry);
+                connection.TryOpenInner(completedRetry, forceNewConnection: false);
             });
 
             Assert.True(
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStateTransitionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStateTransitionTests.cs
index b1decd2be0..2955a6825e 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStateTransitionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStateTransitionTests.cs
@@ -24,11 +24,10 @@ public class SqlConnectionStateTransitionTests
     public void TryOpenInner_WhenInnerConnectionChangesAfterTryOpen_ThrowsInvalidOperation()
     {
         using SqlConnection connection = new();
-        connection.ForceNewConnection = false;
         bool initialized = connection.SetInnerConnectionFrom(new TestRaceDbConnectionInternal(), DbConnectionClosedNeverOpened.SingletonInstance);
         Assert.True(initialized);
 
-        InvalidOperationException exception = Assert.Throws<InvalidOperationException>(() => connection.TryOpenInner(null));
+        InvalidOperationException exception = Assert.Throws<InvalidOperationException>(() => connection.TryOpenInner(null, forceNewConnection: false));
         Assert.NotNull(exception);
         Assert.Same(DbConnectionClosedPreviouslyOpened.SingletonInstance, connection.InnerConnection);
     }
@@ -40,11 +39,10 @@ public void TryOpenInner_WhenInnerConnectionChangesAfterTryOpen_ThrowsInvalidOpe
     public void TryOpenInner_WhenInnerConnectionChangesAfterTryReplace_ThrowsInvalidOperation()
     {
         using SqlConnection connection = new();
-        connection.ForceNewConnection = true;
         bool initialized = connection.SetInnerConnectionFrom(new TestRaceDbConnectionInternal(), DbConnectionClosedNeverOpened.SingletonInstance);
         Assert.True(initialized);
 
-        InvalidOperationException exception = Assert.Throws<InvalidOperationException>(() => connection.TryOpenInner(null));
+        InvalidOperationException exception = Assert.Throws<InvalidOperationException>(() => connection.TryOpenInner(null, forceNewConnection: true));
         Assert.NotNull(exception);
         Assert.Same(DbConnectionClosedPreviouslyOpened.SingletonInstance, connection.InnerConnection);
     }

From fdebcd22257207e50046ad78620580b027e0c783 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Tue, 7 Jul 2026 15:50:46 +0530
Subject: [PATCH 175/298] [v7.1.0-preview2] Release Notes and vBump (#4422)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [v7.1.0-preview2] Release Notes and vBump

* vBump in Versions.props, OneBranch pipelines, and CI/PR pipelines to v7.1.0-preview2

* Release notes for v7.1.0-preview2

* Docs: clarify FileVersion vs AssemblyVersion in per-package alignment note

Address Paul's PR feedback: the phrase 'unchanged from 7.0.2' attached to both FileVersion and AssemblyVersion, making it sound like FileVersion was also unchanged. Split into two sentences so only AssemblyVersion is described as unchanged from 7.0.2. Applied across all 4 per-package 7.1.0-preview2 release-notes files (AzureKeyVaultProvider, Extensions.Azure, Extensions.Abstractions, Internal.Logging).

* Docs: correct WAM broker attribution in 7.1.0-preview2 release notes

Address review feedback on PR #4422:

- Rewrite Extensions.Azure preview2 notes to document WAM broker support properly (removes false "no functional changes" claim and wrong "added in 7.0.2" pointer). WAM was added in 7.1.0-preview2 per PR #4288's milestone, not 7.0.2.
- Remove WAM Broker Support section from core preview2 notes; WAM lives only in the Extensions.Azure package.
- Drop Microsoft.Identity.Client / Microsoft.Identity.Client.Broker dependency-bump bullet from core preview2 notes and CHANGELOG; MSAL packages are referenced only by Extensions.Azure, not by core Microsoft.Data.SqlClient (which uses the Wilson IdentityModel stack). Keep the .NET 10 SDK bump (PR #4287) in the core notes.
- Split CHANGELOG "Re-shipped" bullet so Extensions.Azure gets its own callout for the WAM addition; AKV, Extensions.Abstractions, and Internal.Logging remain grouped as alignment-only.

* Docs: address Malcolm's review comments on pool timeout release notes

- Drop 'pool v2' framing from Configurable Idle Connection Timeout section; frame the new keyword/property as applying to the existing connection pool as well (channel pool changes will be announced in preview 3).

- Add Switch.Microsoft.Data.SqlClient.UseOverallConnectTimeoutForPoolWait AppContext switch details (default false, opt-in to true) to the Connection Timeout Now Propagates Through the Pool section, and reframe Who Benefits/Impact to lead with unchanged default behavior.

* Docs: drop channel-based pool pruning/shutdown section from preview2 notes

Per Malcolm's follow-up review, channel pool (pool v2) changes will be announced in preview 3. Removes:

- The 'Automatic Pool Pruning and Shutdown for the Channel-Based Pool' section (What Changed / Who Benefits / Impact) from release-notes/7.1/7.1.0-preview2.md.

- The matching 'Implemented pool shutdown for ChannelDbConnectionPool and added automatic pool size reduction (pruning) for the channel-based pool' bullet from CHANGELOG.md's Changed section.

PRs #4302 and #4304 are no longer referenced in the preview2 notes.
---
 CHANGELOG.md                                  | 111 +++++++++
 .../libraries/ci-build-variables.yml          |  16 +-
 .../onebranch/variables/package-variables.yml |  26 +--
 release-notes/7.1/7.1.0-preview2.md           | 210 ++++++++++++++++++
 release-notes/7.1/README.md                   |   1 +
 .../Abstractions/7.1/7.1.0-preview2.md        |  19 ++
 .../Extensions/Abstractions/7.1/README.md     |   8 +
 .../Extensions/Azure/7.1/7.1.0-preview2.md    |  73 ++++++
 release-notes/Extensions/Azure/7.1/README.md  |   8 +
 .../Internal/Logging/7.1/7.1.0-preview2.md    |  22 ++
 release-notes/Internal/Logging/7.1/README.md  |  11 +
 release-notes/README.md                       |   4 +
 .../7.1/7.1.0-preview2.md                     |  23 ++
 .../AzureKeyVaultProvider/7.1/README.md       |   8 +
 .../src/Versions.props                        |   2 +-
 .../Abstractions/src/Versions.props           |   2 +-
 .../Azure/src/Versions.props                  |   2 +-
 .../Logging/src/Versions.props                |   2 +-
 src/Microsoft.Data.SqlClient/Versions.props   |   2 +-
 19 files changed, 524 insertions(+), 26 deletions(-)
 create mode 100644 release-notes/7.1/7.1.0-preview2.md
 create mode 100644 release-notes/Extensions/Abstractions/7.1/7.1.0-preview2.md
 create mode 100644 release-notes/Extensions/Abstractions/7.1/README.md
 create mode 100644 release-notes/Extensions/Azure/7.1/7.1.0-preview2.md
 create mode 100644 release-notes/Extensions/Azure/7.1/README.md
 create mode 100644 release-notes/Internal/Logging/7.1/7.1.0-preview2.md
 create mode 100644 release-notes/Internal/Logging/7.1/README.md
 create mode 100644 release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview2.md
 create mode 100644 release-notes/add-ons/AzureKeyVaultProvider/7.1/README.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7725184521..4f15b44925 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,117 @@ 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).
 
+## [Preview Release 7.1.0-preview2] - 2026-07-09
+
+This update brings the following changes since the [7.1.0-preview1](release-notes/7.1/7.1.0-preview1.md) release.
+See the [full release notes](release-notes/7.1/7.1.0-preview2.md) for detailed descriptions.
+
+> **Important — package version alignment:** Starting with the [7.0.2](release-notes/7.0/7.0.2.md) release, the `Microsoft.Data.SqlClient` driver and its companion packages share a single aligned version. Preview 2 of the `7.1` line continues this alignment; the following packages now ship together as `7.1.0-preview2`:
+>
+> - `Microsoft.Data.SqlClient`
+> - `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
+> - `Microsoft.Data.SqlClient.Extensions.Azure`
+> - `Microsoft.Data.SqlClient.Extensions.Abstractions`
+> - `Microsoft.Data.SqlClient.Internal.Logging`
+>
+> (`Microsoft.SqlServer.Server` continues to version independently and remains at `1.0.0`.)
+>
+> Applications that reference `Microsoft.Data.SqlClient.Extensions.Azure` must upgrade it to `7.1.0-preview2` when upgrading `Microsoft.Data.SqlClient` to `7.1.0-preview2`.
+>
+> **Compatibility guarantee:** All aligned assemblies ship with `FileVersion 7.1.0.x` and `AssemblyVersion 7.0.0.0`. The `AssemblyVersion` is unchanged from [7.0.2](release-notes/7.0/7.0.2.md), so upgrading from `7.0.2` to `7.1.0-preview2` does **not** require any new .NET Framework strong-name binding redirects. See the 7.0.2 release notes for the original `AssemblyVersion` alignment (the one-time breaking change that raised `AssemblyVersion` from `1.0.0.0` to `7.0.0.0` for `Extensions.Azure`, `Extensions.Abstractions`, and `Internal.Logging`; `AzureKeyVaultProvider` was already on `7.x`).
+
+### Added
+
+- Added `SqlConnection.GetSchemaAsync` overloads mirroring the existing synchronous shapes.
+  ([#3005](https://github.com/dotnet/SqlClient/pull/3005))
+
+- Added SQL Graph column-alias support (`$node_id`, `$edge_id`, `$from_id`, `$to_id`) as destination columns in `SqlBulkCopy`.
+  ([#3677](https://github.com/dotnet/SqlClient/pull/3677))
+
+- `SqlBatchCommand.CommandBehavior` (a driver-specific property that existed since batching was introduced but was previously ignored) is now honored during `SqlBatch` execution, and `SqlBatch.ExecuteReader` now respects the `CommandBehavior` value passed to it.
+  ([#4125](https://github.com/dotnet/SqlClient/pull/4125))
+
+- Added a `Connection Idle Timeout` connection-string keyword and matching `SqlConnectionStringBuilder.IdleTimeout` property to evict idle pooled connections (default `300` seconds; `0` disables). Enforcement is opt-in via `Switch.Microsoft.Data.SqlClient.UseLegacyIdleTimeoutBehavior=false`; the default preserves the historical pooling behavior. When enabled, idle-timeout enforcement applies to the existing connection pool as well.
+  ([#4295](https://github.com/dotnet/SqlClient/pull/4295))
+
+### Changed
+
+- The `Connect Timeout` budget can now be propagated through pool acquisition via a shared `TimeoutTimer`, so time spent waiting in the pool is deducted from the overall timeout. Enforcement is opt-in via `Switch.Microsoft.Data.SqlClient.UseOverallConnectTimeoutForPoolWait=true`; the default (`false`) preserves the historical behavior where pool waits do not count against `Connect Timeout`. Adds a dependency on `Microsoft.Bcl.TimeProvider`.
+  ([#4270](https://github.com/dotnet/SqlClient/pull/4270))
+
+- Hardened `SqlConnection` internal state transitions with `Interlocked.CompareExchange` guards.
+  ([#4267](https://github.com/dotnet/SqlClient/pull/4267))
+
+- Removed legacy connection-options inheritance from internal APIs and simplified `TryOpenConnection` / `TryReplaceConnection` / pool interfaces.
+  ([#4235](https://github.com/dotnet/SqlClient/pull/4235),
+   [#4237](https://github.com/dotnet/SqlClient/pull/4237),
+   [#4261](https://github.com/dotnet/SqlClient/pull/4261),
+   [#4415](https://github.com/dotnet/SqlClient/pull/4415))
+
+- Added the SQL Server 2025 `json` data type to the `DataTypes` schema table returned by `SqlConnection.GetSchema`.
+  ([#3858](https://github.com/dotnet/SqlClient/pull/3858))
+
+- Added async generic helpers to reduce sync/async duplication.
+  ([#4334](https://github.com/dotnet/SqlClient/pull/4334))
+
+- Use hardcoded LCID mappings when decoding strings.
+  ([#4212](https://github.com/dotnet/SqlClient/pull/4212))
+
+- Reduced allocations by skipping lock acquisition on `SqlErrorCollection` counters when no errors exist, and by avoiding stack-trace materialization on expected `null`-return paths.
+  ([#4099](https://github.com/dotnet/SqlClient/pull/4099),
+   [#4102](https://github.com/dotnet/SqlClient/pull/4102),
+   [#4157](https://github.com/dotnet/SqlClient/pull/4157))
+
+- Improved accuracy of `EnclaveDiffieHellmanInfo.Size`.
+  ([#4346](https://github.com/dotnet/SqlClient/pull/4346))
+
+- `SqlVector<float>` now serializes and deserializes multibyte values as little-endian explicitly.
+  ([#3861](https://github.com/dotnet/SqlClient/pull/3861))
+
+- Updated the bundled .NET 10 SDK to `10.0.300`.
+  ([#4287](https://github.com/dotnet/SqlClient/pull/4287))
+
+- Re-shipped `Microsoft.Data.SqlClient.Extensions.Azure` as `7.1.0-preview2`, adding Windows Account Manager (WAM) broker support for Entra ID authentication on Windows. See [release notes](release-notes/Extensions/Azure/7.1/7.1.0-preview2.md).
+
+- Re-shipped `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`, `Microsoft.Data.SqlClient.Extensions.Abstractions`, and `Microsoft.Data.SqlClient.Internal.Logging` as `7.1.0-preview2` (version alignment only, no functional changes). See release notes for [AKV](release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview2.md), [Abstractions](release-notes/Extensions/Abstractions/7.1/7.1.0-preview2.md), and [Logging](release-notes/Internal/Logging/7.1/7.1.0-preview2.md).
+
+### Fixed
+
+- Fixed a `NullReferenceException` in `SqlCommand.Cancel()` when the active connection has already been torn down.
+  ([#4372](https://github.com/dotnet/SqlClient/pull/4372))
+
+- Fixed Always Encrypted column master key signature verification incorrectly reusing cached results after a prior verification failure.
+  ([#4339](https://github.com/dotnet/SqlClient/pull/4339))
+
+- Fixed missing bounds checks on TDS token and feature-extension-acknowledgment data lengths that could allow a spoofing server to trigger unbounded allocations.
+  ([#4340](https://github.com/dotnet/SqlClient/pull/4340))
+
+- Fixed `SqlBulkCopy` failing in least-privilege environments.
+  ([#4306](https://github.com/dotnet/SqlClient/pull/4306))
+
+- Fixed Always Encrypted reads of `CekMdVersion` and `EkValueCount` to align with the TDS specification.
+  ([#4240](https://github.com/dotnet/SqlClient/pull/4240))
+
+- Fixed `LoginWithFailover` to validate parser state before continuing.
+  ([#4140](https://github.com/dotnet/SqlClient/pull/4140))
+
+- Fixed the SPN used during login to use the resolved port instead of the instance name when `Protocol=None` or `Protocol=Admin`.
+  ([#4180](https://github.com/dotnet/SqlClient/pull/4180))
+
+- Fixed a race in `SqlConnection.TryOpenInner` that could surface as `InvalidCastException`; the same race now returns a deterministic `InvalidOperationException`.
+  ([#4179](https://github.com/dotnet/SqlClient/pull/4179))
+
+- Fixed several `CancellationTokenSource` leaks across `SqlDataReader`, `SqlConnection` reconnect, `SqlCommand` reconnect timeout, and sequential-stream helpers.
+  ([#4009](https://github.com/dotnet/SqlClient/pull/4009))
+
+- Fixed server certificate documentation.
+  ([#4408](https://github.com/dotnet/SqlClient/pull/4408))
+
+### Removed
+
+- **Breaking:** Removed SQL Server 7.0 and SQL Server 2000 support, along with the `TypeSystem.SQLServer2000` enum value and the `Type System Version=SQL Server 2000` connection-string value. Connection strings that specify this value now throw `ArgumentException` when the connection is opened. Supported values are `Latest`, `SQL Server 2005`, `SQL Server 2008`, and `SQL Server 2012`.
+  ([#4015](https://github.com/dotnet/SqlClient/pull/4015))
+
 ## [Stable Release 7.0.2] - 2026-06-24
 
 This update brings the following changes since the [7.0.1](release-notes/7.0/7.0.1.md) release.
diff --git a/eng/pipelines/libraries/ci-build-variables.yml b/eng/pipelines/libraries/ci-build-variables.yml
index 438b011fab..3cf0b6c01e 100644
--- a/eng/pipelines/libraries/ci-build-variables.yml
+++ b/eng/pipelines/libraries/ci-build-variables.yml
@@ -24,11 +24,11 @@ variables:
 
   # Abstractions library assembly file version
   - name: abstractionsAssemblyFileVersion
-    value: 1.1.0.$(assemblyBuildNumber)
+    value: 7.1.0.$(assemblyBuildNumber)
 
   # Abstractions library NuGet package version
   - name: abstractionsPackageVersion
-    value: 1.1.0-preview1ci$(Build.BuildNumber)
+    value: 7.1.0-preview2ci$(Build.BuildNumber)
 
   # AKV provider assembly file version
   - name: akvAssemblyFileVersion
@@ -36,30 +36,30 @@ variables:
 
   # AKV provider NuGet package version
   - name: akvPackageVersion
-    value: 7.1.0-preview1ci$(Build.BuildNumber)
+    value: 7.1.0-preview2ci$(Build.BuildNumber)
 
   # Azure library assembly file version
   - name: azureAssemblyFileVersion
-    value: 1.1.0.$(assemblyBuildNumber)
+    value: 7.1.0.$(assemblyBuildNumber)
 
   # Azure library NuGet package version
   - name: azurePackageVersion
-    value: 1.1.0-preview1ci$(Build.BuildNumber)
+    value: 7.1.0-preview2ci$(Build.BuildNumber)
 
   # Logging library assembly file version
   - name: loggingAssemblyFileVersion
-    value: 1.1.0.$(assemblyBuildNumber)
+    value: 7.1.0.$(assemblyBuildNumber)
 
   # Logging library NuGet package version
   - name: loggingPackageVersion
-    value: 1.1.0-preview1ci$(Build.BuildNumber)
+    value: 7.1.0-preview2ci$(Build.BuildNumber)
 
   # MDS library NuGet package version
   # NOTE: This differs from the other structures! MdsVersions.props will deconstruct a provided
   #    package version and build an assembly version from it. If the build number is included
   #    before the "-" the build number will be appended again, generating an invalid file version.
   - name: mdsPackageVersion
-    value: 7.1.0-preview1ci$(AssemblyBuildNumber)
+    value: 7.1.0-preview2ci$(AssemblyBuildNumber)
 
   # SqlServer library NuGet package version
   # NOTE: SqlServer's version props derive file version from the package version by appending the
diff --git a/eng/pipelines/onebranch/variables/package-variables.yml b/eng/pipelines/onebranch/variables/package-variables.yml
index 0a84bc3a70..5a7d456df8 100644
--- a/eng/pipelines/onebranch/variables/package-variables.yml
+++ b/eng/pipelines/onebranch/variables/package-variables.yml
@@ -53,13 +53,13 @@ variables:
     value: 'drop_build_abstractions_build_package_Abstractions'
 
   - name: abstractionsFileVersion
-    value: '1.0.0.$(_assemblyBuildNumber)'
+    value: '7.1.0.$(_assemblyBuildNumber)'
 
   - name: abstractionsPackageVersion
     ${{ if parameters.isPreview }}:
-      value: '1.0.0-preview1.$(Build.BuildNumber)'
+      value: '7.1.0-preview2.$(Build.BuildNumber)'
     ${{ else }}:
-      value: '1.0.0'
+      value: '7.1.0'
 
   # ------------------------------------------------------------------------
   # AKV Provider Package
@@ -68,13 +68,13 @@ variables:
     value: 'drop_build_addons_build_package_AkvProvider'
 
   - name: akvProviderFileVersion
-    value: '7.0.0.$(_assemblyBuildNumber)'
+    value: '7.1.0.$(_assemblyBuildNumber)'
 
   - name: akvProviderPackageVersion
     ${{ if parameters.isPreview }}:
-      value: '7.0.0-preview1.$(Build.BuildNumber)'
+      value: '7.1.0-preview2.$(Build.BuildNumber)'
     ${{ else }}:
-      value: '7.0.0'
+      value: '7.1.0'
 
   # ------------------------------------------------------------------------
   # Azure Package
@@ -83,13 +83,13 @@ variables:
     value: 'drop_build_dependent_build_package_Azure'
 
   - name: azureFileVersion
-    value: '1.0.0.$(_assemblyBuildNumber)'
+    value: '7.1.0.$(_assemblyBuildNumber)'
 
   - name: azurePackageVersion
     ${{ if parameters.isPreview }}:
-      value: '1.0.0-preview1.$(Build.BuildNumber)'
+      value: '7.1.0-preview2.$(Build.BuildNumber)'
     ${{ else }}:
-      value: '1.0.0'
+      value: '7.1.0'
 
   # ------------------------------------------------------------------------
   # Logging Package
@@ -98,13 +98,13 @@ variables:
     value: 'drop_build_independent_build_package_Logging'
 
   - name: loggingFileVersion
-    value: '1.0.0.$(_assemblyBuildNumber)'
+    value: '7.1.0.$(_assemblyBuildNumber)'
 
   - name: loggingPackageVersion
     ${{ if parameters.isPreview }}:
-      value: '1.0.0-preview1.$(Build.BuildNumber)'
+      value: '7.1.0-preview2.$(Build.BuildNumber)'
     ${{ else }}:
-      value: '1.0.0'
+      value: '7.1.0'
 
   # ------------------------------------------------------------------------
   # SqlClient Package
@@ -117,7 +117,7 @@ variables:
 
   - name: sqlClientPackageVersion
     ${{ if parameters.isPreview }}:
-      value: '7.1.0-preview1.$(Build.BuildNumber)'
+      value: '7.1.0-preview2.$(Build.BuildNumber)'
     ${{ else }}:
       value: '7.1.0'
 
diff --git a/release-notes/7.1/7.1.0-preview2.md b/release-notes/7.1/7.1.0-preview2.md
new file mode 100644
index 0000000000..5f4a65bb78
--- /dev/null
+++ b/release-notes/7.1/7.1.0-preview2.md
@@ -0,0 +1,210 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview2 - 2026-07-09
+
+This update brings the following changes since the [7.1.0-preview1](7.1.0-preview1.md) release:
+
+> **Important — package version alignment:** Starting with the [7.0.2](../7.0/7.0.2.md) release, the `Microsoft.Data.SqlClient` driver and its companion packages share a single aligned version. Preview 2 of the `7.1` line continues this alignment; the following packages ship together as `7.1.0-preview2`:
+>
+> - `Microsoft.Data.SqlClient`
+> - `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
+> - `Microsoft.Data.SqlClient.Extensions.Azure`
+> - `Microsoft.Data.SqlClient.Extensions.Abstractions`
+> - `Microsoft.Data.SqlClient.Internal.Logging`
+>
+> (`Microsoft.SqlServer.Server` continues to version independently and remains at `1.0.0`.)
+>
+> Applications must reference the same versions of `Microsoft.Data.SqlClient` and its extensions for best compatibility. In particular, applications that reference `Microsoft.Data.SqlClient.Extensions.Azure` must upgrade it to `7.1.0-preview2` when upgrading `Microsoft.Data.SqlClient` to `7.1.0-preview2`.
+>
+> **Compatibility guarantee:** All aligned assemblies ship with `FileVersion 7.1.0.x` and `AssemblyVersion 7.0.0.0`. The `AssemblyVersion` is unchanged from [7.0.2](../7.0/7.0.2.md), so upgrading from `7.0.2` to `7.1.0-preview2` does **not** require any new .NET Framework strong-name binding redirects. See the 7.0.2 release notes for the original `AssemblyVersion` alignment (the one-time breaking change that raised `AssemblyVersion` from `1.0.0.0` to `7.0.0.0` for `Extensions.Azure`, `Extensions.Abstractions`, and `Internal.Logging`; `AzureKeyVaultProvider` was already on `7.x`).
+
+### Added
+
+#### `SqlConnection.GetSchemaAsync`
+
+*What Changed:*
+
+- Added asynchronous overloads of `SqlConnection.GetSchema` that mirror the existing synchronous shapes and honor a supplied `CancellationToken`. The .NET Framework schema code paths were also unified with the .NET Core implementation.
+  ([#3005](https://github.com/dotnet/SqlClient/pull/3005))
+
+*Who Benefits:*
+
+- Applications that enumerate database metadata (databases, tables, columns, procedures, etc.) as part of a request pipeline can now do so without blocking a thread on synchronous I/O.
+
+*Impact:*
+
+- New `GetSchemaAsync(...)` overloads are additive; existing `GetSchema(...)` calls are unchanged.
+
+#### SQL Graph Column Aliases in `SqlBulkCopy`
+
+*What Changed:*
+
+- `SqlBulkCopy` column mappings now accept the SQL Graph pseudo-column aliases `$node_id`, `$edge_id`, `$from_id`, and `$to_id` as destination column names and transparently map them to the underlying physical columns.
+  ([#3677](https://github.com/dotnet/SqlClient/pull/3677))
+
+*Who Benefits:*
+
+- Applications that bulk-load SQL Graph node or edge tables can now map source fields directly to the friendly graph aliases instead of pre-computing the internal physical column names.
+
+*Impact:*
+
+- Existing mappings continue to work; if a physical column with the same name as an alias already exists, the physical column keeps priority.
+
+#### `SqlBatchCommand.CommandBehavior` Is Now Honored
+
+*What Changed:*
+
+- The `SqlBatchCommand.CommandBehavior` property (which existed since batching was introduced but was previously ignored) is now plumbed through the batch execution path so per-command behaviors are honored inside a `SqlBatch`. `SqlBatch.ExecuteReader` also now respects the `CommandBehavior` value passed to it.
+  ([#4125](https://github.com/dotnet/SqlClient/pull/4125))
+
+*Who Benefits:*
+
+- Applications composing heterogeneous batches (for example, mixing `SchemaOnly` metadata queries with data-returning statements) can now express per-command reader behavior without splitting the batch.
+
+*Impact:*
+
+- Batches that previously set `SqlBatchCommand.CommandBehavior` but relied on it being ignored will now see that value applied. Batches that left it at the default (`CommandBehavior.Default`) are unaffected.
+
+#### Configurable Idle Connection Timeout
+
+*What Changed:*
+
+- Added a `Connection Idle Timeout` connection-string keyword and matching `SqlConnectionStringBuilder.IdleTimeout` property that let the connection pool evict pooled connections whose idle time exceeds the configured value. The default is `300` seconds; setting `0` disables idle expiration, and negative values throw `ArgumentException`. Enforcement is gated on the new `Switch.Microsoft.Data.SqlClient.UseLegacyIdleTimeoutBehavior` AppContext switch, which defaults to `true` to preserve historical pooling behavior; set it to `false` to enable idle-timeout enforcement.
+  ([#4295](https://github.com/dotnet/SqlClient/pull/4295))
+
+*Who Benefits:*
+
+- Applications running against Azure SQL Database and other elastic backends can bound connection idle time to align with server-side session recycling and reduce stale-connection failures.
+
+*Impact:*
+
+- Default behavior is unchanged: the new keyword is parsed but not enforced until the legacy switch is turned off. When enabled, idle-timeout enforcement applies to the existing connection pool as well.
+
+### Changed
+
+#### Connection Timeout Now Propagates Through the Pool
+
+*What Changed:*
+
+- Replaced raw `TimeSpan` timeouts with a shared `TimeoutTimer` across `SqlConnection.Open[Async]`, pool acquisition, and physical connection creation, so the `Connect Timeout` budget can be deducted as a request waits in the pool. Introduces a dependency on `Microsoft.Bcl.TimeProvider`. Enforcement is gated on the new `Switch.Microsoft.Data.SqlClient.UseOverallConnectTimeoutForPoolWait` AppContext switch, which defaults to `false` to preserve historical behavior; set it to `true` to have pool waits count against the caller's `Connect Timeout` budget.
+  ([#4270](https://github.com/dotnet/SqlClient/pull/4270))
+
+*Who Benefits:*
+
+- Applications that observe pool contention can opt in via the new switch to have the configured `Connect Timeout` respected end-to-end instead of the budget effectively restarting when a physical connection is eventually opened.
+
+*Impact:*
+
+- Default behavior is unchanged: pool waits do not count against `Connect Timeout` unless the new switch is enabled. When enabled, `Open`/`OpenAsync` under heavy pool contention may surface timeouts sooner than before. Successful opens are unaffected.
+
+#### Other changes
+
+- Added the SQL Server 2025 `json` data type to the `DataTypes` collection returned by `SqlConnection.GetSchema`. ([#3858](https://github.com/dotnet/SqlClient/pull/3858))
+- Refactored `SqlConnection` internal state transitions to use `Interlocked.CompareExchange` guards, hardening the driver against races surfaced by concurrent open/close/reconnect. ([#4267](https://github.com/dotnet/SqlClient/pull/4267))
+- Removed legacy connection-options inheritance from internal APIs, simplifying `TryOpenConnection`, `TryReplaceConnection`, and the pool interfaces. ([#4237](https://github.com/dotnet/SqlClient/pull/4237), [#4261](https://github.com/dotnet/SqlClient/pull/4261), [#4235](https://github.com/dotnet/SqlClient/pull/4235))
+- Refactored `ForceNewConnection` handling. ([#4415](https://github.com/dotnet/SqlClient/pull/4415))
+- Added Async generic helpers to reduce duplication across sync/async code paths. ([#4334](https://github.com/dotnet/SqlClient/pull/4334))
+- Use hardcoded LCID mappings when decoding strings, avoiding repeated culture lookups. ([#4212](https://github.com/dotnet/SqlClient/pull/4212))
+- Reduced allocations by avoiding lock acquisition on `SqlErrorCollection` counters when no errors exist, and by avoiding stack-trace materialization for expected `null`-return paths. ([#4157](https://github.com/dotnet/SqlClient/pull/4157), [#4099](https://github.com/dotnet/SqlClient/pull/4099), [#4102](https://github.com/dotnet/SqlClient/pull/4102))
+- Improved `EnclaveDiffieHellmanInfo.Size` accuracy. ([#4346](https://github.com/dotnet/SqlClient/pull/4346))
+- `SqlVector<float>` now serializes and deserializes little-endian multibyte values explicitly for consistent behavior across architectures. ([#3861](https://github.com/dotnet/SqlClient/pull/3861))
+- Updated the bundled .NET 10 SDK to `10.0.300`. ([#4287](https://github.com/dotnet/SqlClient/pull/4287))
+
+### Fixed
+
+- Fixed a `NullReferenceException` in `SqlCommand.Cancel()` when the active connection has already been torn down. ([#4372](https://github.com/dotnet/SqlClient/pull/4372))
+- Fixed Always Encrypted column master key signature verification incorrectly reusing cached results after a prior verification failure. ([#4339](https://github.com/dotnet/SqlClient/pull/4339))
+- Fixed missing bounds checks on TDS token and feature-extension-acknowledgment data lengths that could allow a spoofing server to trigger unbounded allocations. ([#4340](https://github.com/dotnet/SqlClient/pull/4340))
+- Fixed `SqlBulkCopy` failing in least-privilege environments where the caller lacks permission to run the previous metadata query path. ([#4306](https://github.com/dotnet/SqlClient/pull/4306))
+- Fixed Always Encrypted reads of `CekMdVersion` and `EkValueCount` to align with the TDS specification. ([#4240](https://github.com/dotnet/SqlClient/pull/4240))
+- Fixed `LoginWithFailover` to validate parser state before continuing, preventing null-reference failures during failover login. ([#4140](https://github.com/dotnet/SqlClient/pull/4140))
+- Fixed the SPN used during login to use the resolved port instead of the instance name when `Protocol=None` or `Protocol=Admin` is specified. ([#4180](https://github.com/dotnet/SqlClient/pull/4180))
+- Fixed a race in `SqlConnection.TryOpenInner` that could surface as `InvalidCastException`; the same race now returns a deterministic `InvalidOperationException`. ([#4179](https://github.com/dotnet/SqlClient/pull/4179))
+- Fixed several `CancellationTokenSource` leaks in `SqlDataReader`, `SqlConnection`, `SqlCommand` reconnect paths, and the sequential-stream helpers. ([#4009](https://github.com/dotnet/SqlClient/pull/4009))
+- Documentation fix for server certificate configuration. ([#4408](https://github.com/dotnet/SqlClient/pull/4408))
+
+### Removed
+
+#### SQL Server 7.0 and 2000 Support
+
+*What Changed:*
+
+- Removed dead protocol-level code paths for SQL Server 7.0 and SQL Server 2000, along with the now-orphaned `SQL Server 2000` type-system compatibility option. The `TypeSystem.SQLServer2000` enum value and the `Type System Version=SQL Server 2000` connection-string branch are gone.
+  ([#4015](https://github.com/dotnet/SqlClient/pull/4015))
+
+*Who Benefits:*
+
+- The driver no longer carries dead legacy code, and the documented connection-string surface (`Latest`, `SQL Server 2005`, `SQL Server 2008`, `SQL Server 2012`) now matches the implementation exactly.
+
+*Impact:*
+
+- **Breaking:** A connection string that specifies `Type System Version=SQL Server 2000` now throws `ArgumentException` when the connection is opened, instead of being accepted. Applications currently using this value should switch to a supported value such as `Latest`. There is no change to which servers the driver will connect to — SQL Server 7.0 and 2000 were already rejected during login version negotiation.
+
+## Target Platform Support
+
+- .NET Framework 4.6.2+ (Windows x86, Windows x64, Windows ARM64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM, Windows ARM64, Linux, macOS)
+
+### Dependencies
+
+#### .NET 9.0
+
+- Microsoft.Bcl.Cryptography 9.0.13
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview2
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview2
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 9.0.13
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.13
+- System.Security.Cryptography.Pkcs 9.0.13
+
+#### .NET 8.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview2
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview2
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+
+#### .NET Standard 2.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Bcl.TimeProvider 8.0.1
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview2
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview2
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+
+#### .NET Framework 4.6.2+
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Bcl.TimeProvider 8.0.1
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview2
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview2
+- Microsoft.Data.SqlClient.SNI 6.0.2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- System.Buffers 4.6.1
+- System.Data.Common 4.3.0
+- System.Diagnostics.DiagnosticSource 10.0.3
+- System.Memory 4.6.3
+- System.Runtime.InteropServices.RuntimeInformation 4.3.0
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+- System.ValueTuple 4.6.2
diff --git a/release-notes/7.1/README.md b/release-notes/7.1/README.md
index 7bb05b1a70..843ba62b36 100644
--- a/release-notes/7.1/README.md
+++ b/release-notes/7.1/README.md
@@ -5,3 +5,4 @@ The following Microsoft.Data.SqlClient 7.1 releases have been shipped:
 | Release Date | Version        |               Notes                |
 |:-------------|:---------------|:----------------------------------:|
 | 2026-04-29   | 7.1.0-preview1 | [Release Notes](7.1.0-preview1.md) |
+| 2026-07-09   | 7.1.0-preview2 | [Release Notes](7.1.0-preview2.md) |
diff --git a/release-notes/Extensions/Abstractions/7.1/7.1.0-preview2.md b/release-notes/Extensions/Abstractions/7.1/7.1.0-preview2.md
new file mode 100644
index 0000000000..9c1f8b1b7b
--- /dev/null
+++ b/release-notes/Extensions/Abstractions/7.1/7.1.0-preview2.md
@@ -0,0 +1,19 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview2 - 2026-07-09
+
+This release continues version-alignment of `Microsoft.Data.SqlClient.Extensions.Abstractions` with the core `Microsoft.Data.SqlClient` driver version (`7.1.0-preview2`). The previous release of this package was [7.0.2](../7.0/7.0.2.md).
+
+There are no functional or API changes in this release. See the core [Microsoft.Data.SqlClient 7.1.0-preview2](../../../7.1/7.1.0-preview2.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** This package's version continues to track the core `Microsoft.Data.SqlClient` driver version. See the [7.0.2 release notes](../../../7.0/7.0.2.md) for the initial alignment announcement. This assembly ships with `FileVersion 7.1.0.x`. The `AssemblyVersion 7.0.0.0` remains unchanged from the `7.0.2` release.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview2
diff --git a/release-notes/Extensions/Abstractions/7.1/README.md b/release-notes/Extensions/Abstractions/7.1/README.md
new file mode 100644
index 0000000000..133eb71b32
--- /dev/null
+++ b/release-notes/Extensions/Abstractions/7.1/README.md
@@ -0,0 +1,8 @@
+# Microsoft.Data.SqlClient.Extensions.Abstractions 7.1 Releases
+
+The following `Microsoft.Data.SqlClient.Extensions.Abstractions`
+7.1 releases have been shipped:
+
+| Release Date | Description | Notes |
+| :-- | :-- | :--: |
+| 2026-07-09 | 7.1.0-preview2 | [Release Notes](7.1.0-preview2.md) |
diff --git a/release-notes/Extensions/Azure/7.1/7.1.0-preview2.md b/release-notes/Extensions/Azure/7.1/7.1.0-preview2.md
new file mode 100644
index 0000000000..d2803f02db
--- /dev/null
+++ b/release-notes/Extensions/Azure/7.1/7.1.0-preview2.md
@@ -0,0 +1,73 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview2 - 2026-07-09
+
+This release adds Windows Account Manager (WAM) broker support for Microsoft Entra ID authentication on Windows and continues version-alignment of `Microsoft.Data.SqlClient.Extensions.Azure` with the core `Microsoft.Data.SqlClient` driver version (`7.1.0-preview2`). The previous release of this package was [7.0.2](../7.0/7.0.2.md). See the core [Microsoft.Data.SqlClient 7.1.0-preview2](../../../7.1/7.1.0-preview2.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** This package's version continues to track the core `Microsoft.Data.SqlClient` driver version. See the [7.0.2 release notes](../../../7.0/7.0.2.md) for the initial alignment announcement. This assembly ships with `FileVersion 7.1.0.x`. The `AssemblyVersion 7.0.0.0` remains unchanged from the `7.0.2` release.
+
+### Added
+
+#### WAM Broker Support for Entra ID Authentication (Windows only)
+
+*What Changed:*
+
+- Added Windows Account Manager (WAM) broker support for the supported Entra ID authentication modes (`ActiveDirectoryIntegrated`, `ActiveDirectoryInteractive`, `ActiveDirectoryDeviceCodeFlow`, and the deprecated `ActiveDirectoryPassword`). Introduces a new `ActiveDirectoryAuthenticationProviderOptions` type (with `UseWamBroker`, `ApplicationClientId`, and `DeviceCodeFlowCallback`), a new `ActiveDirectoryAuthenticationProvider(ActiveDirectoryAuthenticationProviderOptions)` constructor overload, a cross-platform `SetParentActivityOrWindowFunc(Func<object>?)` method (superseding the .NET Framework-only `SetIWin32WindowFunc`), and a `useWamBroker` attribute on the `<SqlClientAuthenticationProviders>` configuration section.
+  ([#4288](https://github.com/dotnet/SqlClient/pull/4288),
+   [#4388](https://github.com/dotnet/SqlClient/pull/4388))
+
+*Who Benefits:*
+
+- Windows users get single sign-on with the signed-in Windows account, Windows Hello, and Conditional Access support through the OS broker. Device Code Flow now uses its own token-lifetime timeout instead of inheriting `Connect Timeout`, fixing spurious `"The operation was canceled."` failures when the user takes longer than a few seconds to enter the device code.
+
+*Impact:*
+
+- WAM is enabled by default when the driver's built-in client id is used. With a custom client id, WAM is opt-in via `ActiveDirectoryAuthenticationProviderOptions.UseWamBroker` or the `useWamBroker` config attribute. Non-Windows platforms never invoke the broker.
+- Existing `ActiveDirectoryAuthenticationProvider` constructors remain source- and binary-compatible.
+- Adding WAM broker support materially increases the on-disk footprint of `Microsoft.Data.SqlClient.Extensions.Azure` because it pulls in the `Microsoft.Identity.Client.Broker` package and its native OS-broker components. See [#4410](https://github.com/dotnet/SqlClient/issues/4410) for tracking.
+
+```c#
+var options = new ActiveDirectoryAuthenticationProviderOptions
+{
+    ApplicationClientId = "<your-app-client-id>",
+    UseWamBroker = true, // Windows only
+};
+var provider = new ActiveDirectoryAuthenticationProvider(options);
+SqlAuthenticationProvider.SetProvider(SqlAuthenticationMethod.ActiveDirectoryInteractive, provider);
+```
+
+- A new `AzureSqlConnector` sample demonstrating interactive Entra ID authentication with and without the WAM broker is available under [doc/apps/AzureSqlConnector](../../../../doc/apps/AzureSqlConnector/README.md).
+
+### Changed
+
+- Updated Dependencies
+  ([#4288](https://github.com/dotnet/SqlClient/pull/4288)):
+  - Added `Microsoft.Identity.Client.Broker` v4.84.2 (required for WAM broker support).
+  - Updated `Microsoft.Identity.Client` to v4.84.2.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+- .NET Framework 4.6.2+
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.51.1
+- Azure.Identity 1.18.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview2
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+
+#### .NET Framework 4.6.2+
+
+- Azure.Core 1.51.1
+- Azure.Identity 1.18.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview2
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview2
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
diff --git a/release-notes/Extensions/Azure/7.1/README.md b/release-notes/Extensions/Azure/7.1/README.md
new file mode 100644
index 0000000000..3acdf3d45c
--- /dev/null
+++ b/release-notes/Extensions/Azure/7.1/README.md
@@ -0,0 +1,8 @@
+# Microsoft.Data.SqlClient.Extensions.Azure 7.1 Releases
+
+The following `Microsoft.Data.SqlClient.Extensions.Azure`
+7.1 releases have been shipped:
+
+| Release Date | Description | Notes |
+| :-- | :-- | :--: |
+| 2026-07-09 | 7.1.0-preview2 | [Release Notes](7.1.0-preview2.md) |
diff --git a/release-notes/Internal/Logging/7.1/7.1.0-preview2.md b/release-notes/Internal/Logging/7.1/7.1.0-preview2.md
new file mode 100644
index 0000000000..a5987cdd0d
--- /dev/null
+++ b/release-notes/Internal/Logging/7.1/7.1.0-preview2.md
@@ -0,0 +1,22 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview2 - 2026-07-09
+
+> **Note:** This package is for internal use by other Microsoft.Data.SqlClient packages only
+> and should not be referenced directly by application code.
+
+This release continues version-alignment of `Microsoft.Data.SqlClient.Internal.Logging` with the core `Microsoft.Data.SqlClient` driver version (`7.1.0-preview2`). The previous release of this package was [7.0.2](../7.0/7.0.2.md).
+
+There are no functional or API changes in this release. See the core [Microsoft.Data.SqlClient 7.1.0-preview2](../../../7.1/7.1.0-preview2.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** This package's version continues to track the core `Microsoft.Data.SqlClient` driver version. See the [7.0.2 release notes](../../../7.0/7.0.2.md) for the initial alignment announcement. This assembly ships with `FileVersion 7.1.0.x`. The `AssemblyVersion 7.0.0.0` remains unchanged from the `7.0.2` release.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- None
diff --git a/release-notes/Internal/Logging/7.1/README.md b/release-notes/Internal/Logging/7.1/README.md
new file mode 100644
index 0000000000..f0c0f8c274
--- /dev/null
+++ b/release-notes/Internal/Logging/7.1/README.md
@@ -0,0 +1,11 @@
+# Microsoft.Data.SqlClient.Internal.Logging 7.1 Releases
+
+> **Note:** This package is for internal use by other Microsoft.Data.SqlClient packages only
+> and should not be referenced directly by application code.
+
+The following `Microsoft.Data.SqlClient.Internal.Logging`
+7.1 releases have been shipped:
+
+| Release Date | Description | Notes |
+| :-- | :-- | :--: |
+| 2026-07-09 | 7.1.0-preview2 | [Release Notes](7.1.0-preview2.md) |
diff --git a/release-notes/README.md b/release-notes/README.md
index dc90822a2d..c32e0bc2be 100644
--- a/release-notes/README.md
+++ b/release-notes/README.md
@@ -27,6 +27,7 @@ The latest stable release is
 
 ## Release Information
 
+- [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 7.1](add-ons/AzureKeyVaultProvider/7.1)
 - [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 7.0](add-ons/AzureKeyVaultProvider/7.0)
 - [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 6.1](add-ons/AzureKeyVaultProvider/6.1)
 - [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 6.0](add-ons/AzureKeyVaultProvider/6.0)
@@ -44,6 +45,7 @@ The latest release is
 
 ## Release Information
 
+- [Microsoft.Data.SqlClient.Extensions.Abstractions 7.1](Extensions/Abstractions/7.1)
 - [Microsoft.Data.SqlClient.Extensions.Abstractions 7.0](Extensions/Abstractions/7.0)
 - [Microsoft.Data.SqlClient.Extensions.Abstractions 1.0](Extensions/Abstractions/1.0)
 
@@ -54,6 +56,7 @@ The latest release is
 
 ## Release Information
 
+- [Microsoft.Data.SqlClient.Extensions.Azure 7.1](Extensions/Azure/7.1)
 - [Microsoft.Data.SqlClient.Extensions.Azure 7.0](Extensions/Azure/7.0)
 - [Microsoft.Data.SqlClient.Extensions.Azure 1.0](Extensions/Azure/1.0)
 
@@ -65,6 +68,7 @@ The latest release is
 
 ## Release Information
 
+- [Microsoft.Data.SqlClient.Internal.Logging 7.1](Internal/Logging/7.1)
 - [Microsoft.Data.SqlClient.Internal.Logging 7.0](Internal/Logging/7.0)
 - [Microsoft.Data.SqlClient.Internal.Logging 1.0](Internal/Logging/1.0)
 
diff --git a/release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview2.md b/release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview2.md
new file mode 100644
index 0000000000..e076bd52e6
--- /dev/null
+++ b/release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview2.md
@@ -0,0 +1,23 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview2 - 2026-07-09
+
+This release continues version-alignment of `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` with the core `Microsoft.Data.SqlClient` driver version (`7.1.0-preview2`). The previous release of this package was [7.0.2](../7.0/7.0.2.md).
+
+There are no functional or API changes in this release. See the core [Microsoft.Data.SqlClient 7.1.0-preview2](../../../7.1/7.1.0-preview2.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** This package's version continues to track the core `Microsoft.Data.SqlClient` driver version. See the [7.0.2 release notes](../../../7.0/7.0.2.md) for the initial alignment announcement. This assembly ships with `FileVersion 7.1.0.x`. The `AssemblyVersion 7.0.0.0` remains unchanged from the `7.0.2` release.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.51.1
+- Azure.Security.KeyVault.Keys 4.9.0
+- Microsoft.Data.SqlClient 7.1.0-preview2
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview2
+- Microsoft.Extensions.Caching.Memory 8.0.1
diff --git a/release-notes/add-ons/AzureKeyVaultProvider/7.1/README.md b/release-notes/add-ons/AzureKeyVaultProvider/7.1/README.md
new file mode 100644
index 0000000000..9fda87ae8f
--- /dev/null
+++ b/release-notes/add-ons/AzureKeyVaultProvider/7.1/README.md
@@ -0,0 +1,8 @@
+# Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 7.1 Releases
+
+The following `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
+7.1 releases have been shipped:
+
+| Release Date | Description | Notes |
+| :-- | :-- | :--: |
+| 2026-07-09 | 7.1.0-preview2 | [Release Notes](7.1.0-preview2.md) |
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
index dd9ddc03d5..8d939d6c86 100644
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
@@ -29,7 +29,7 @@
       This is the *next* version to release of AkvProvider. Update this after a version is released.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <AkvProviderVersionDefault>7.1.0-preview1</AkvProviderVersionDefault>
+    <AkvProviderVersionDefault>7.1.0-preview2</AkvProviderVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
index cc6d4ca14a..465620fe19 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
@@ -30,7 +30,7 @@
       decided.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <AbstractionsVersionDefault>1.1.0-preview1</AbstractionsVersionDefault>
+    <AbstractionsVersionDefault>7.1.0-preview2</AbstractionsVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
index 636face4e6..a7762cbbc0 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
@@ -29,7 +29,7 @@
       This is the *next* version to release of Azure. Update this when the next version is decided.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <AzureVersionDefault>1.1.0-preview1</AzureVersionDefault>
+    <AzureVersionDefault>7.1.0-preview2</AzureVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
index 9d031d21d0..3810bd91ae 100644
--- a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
+++ b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
@@ -30,7 +30,7 @@
       decided.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <LoggingVersionDefault>1.1.0-preview1</LoggingVersionDefault>
+    <LoggingVersionDefault>7.1.0-preview2</LoggingVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
diff --git a/src/Microsoft.Data.SqlClient/Versions.props b/src/Microsoft.Data.SqlClient/Versions.props
index 712263b73e..7c8dd25305 100644
--- a/src/Microsoft.Data.SqlClient/Versions.props
+++ b/src/Microsoft.Data.SqlClient/Versions.props
@@ -29,7 +29,7 @@
       This is the *next* version to release of SqlClient. Update this after a version is released.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <SqlClientVersionDefault>7.1.0-preview1</SqlClientVersionDefault>
+    <SqlClientVersionDefault>7.1.0-preview2</SqlClientVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->

From ba94b2b03d64dfc81b839fc5259671ced1fa0c18 Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Tue, 7 Jul 2026 22:31:55 +0530
Subject: [PATCH 176/298] Improve release-notes prompt for version-aligned
 companion packages (#4409)

---
 .github/prompts/release-notes.prompt.md | 48 +++++++++++++++++--------
 release-notes/7.0/7.0.2.md              |  9 +++++
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/.github/prompts/release-notes.prompt.md b/.github/prompts/release-notes.prompt.md
index 523fe3524c..b800dfe245 100644
--- a/.github/prompts/release-notes.prompt.md
+++ b/.github/prompts/release-notes.prompt.md
@@ -10,6 +10,14 @@ Generate release notes for the milestone "${input:milestone}" on the branch "${i
 
 This repository ships multiple packages. Only generate release notes for packages that have relevant PRs in the milestone. All packages use the same template: [release-notes/template/release-notes-template.md](release-notes/template/release-notes-template.md).
 
+## Branch Model
+
+The release notes content and the source code it describes live on different branches:
+
+- **Release notes files are maintained on `main`.** Every release's notes (for all branches/versions) are committed under `release-notes/` on `main`. Create and edit the release notes Markdown files on `main` (or a PR targeting `main`), not on the release branch.
+- **The source code for the release lives only on the target branch `${input:branch}`.** Version sources (`Versions.props`), project files (`*.csproj`), and dependency files (`Directory.Packages.props`) reflect the released bits *as they exist on `${input:branch}`*, which can differ from `main`. When you look up versions, dependencies, TFM/OS scope, or verify API names (Steps 2.1, 2.2, 4, and the Version and Dependency Lookup table), read those source files from `${input:branch}` — not from your current `main` checkout.
+- **Practical implication:** Do not assume a `...VersionDefault` or dependency version read from `main` matches what shipped on `${input:branch}`. Confirm against `${input:branch}` (e.g., `git show ${input:branch}:<path>`), or against the milestone/release artifacts.
+
 ## Package Registry
 
 | Package | Release Notes Directory | How to Identify PRs |
@@ -21,20 +29,28 @@ This repository ships multiple packages. Only generate release notes for package
 | `Microsoft.Data.SqlClient.Extensions.Azure` | `release-notes/Extensions/Azure/<Major.Minor>/` | PR titles/bodies/files referencing `Extensions.Azure` |
 | `Microsoft.Data.SqlClient.Internal.Logging` | `release-notes/Internal/Logging/<Major.Minor>/` | PR titles/bodies/files referencing `Internal.Logging` |
 
+> **Not all packages exist on every branch.** This table is the full, current package set. Older release branches ship a subset — for example, `release/6.1` and earlier have no extension packages (`Extensions.Abstractions`, `Extensions.Azure`) and no `Internal.Logging`; the companion-package set and even the `AzureKeyVaultProvider` source location vary by branch. Before generating notes for a package, confirm it actually exists on the target branch `${input:branch}` (e.g., `git ls-tree -r --name-only ${input:branch} | grep -i "<package path fragment>"`). Skip any package that does not exist on `${input:branch}`, even if the table lists it.
+
 ## Version and Dependency Lookup
 
-Each package has its own versioning and dependency sources. Use these to determine package versions and dependency lists:
+Each package's version and dependency information comes from MSBuild props/project files **on the target branch `${input:branch}`** (see Branch Model). The exact file paths, file names, and property names that hold versions **differ by branch**, because the versioning layout was refactored over time. Do not assume the layout of your current checkout — discover the version source on `${input:branch}`.
+
+Two known layouts:
 
-| Package | Version Source | Dependency Source |
-| ------- | -------------- | ----------------- |
-| `Microsoft.Data.SqlClient` | [tools/props/Versions.props](tools/props/Versions.props) (`MdsVersionDefault`) | [Directory.Packages.props](Directory.Packages.props) and the [project file](src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj) |
-| `AzureKeyVaultProvider` | [tools/props/Versions.props](tools/props/Versions.props) (`AkvVersionDefault`) | [AKV project file](src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj) and [Directory.Packages.props](Directory.Packages.props) |
-| `Microsoft.SqlServer.Server` | [tools/props/Versions.props](tools/props/Versions.props) (`SqlServerPackageVersion`) | [SqlServer project file](src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj) |
-| `Extensions.Abstractions` | [AbstractionsVersions.props](src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props) | [Abstractions.csproj](src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj) |
-| `Extensions.Azure` | [AzureVersions.props](src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props) | [Azure.csproj](src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj) |
-| `Internal.Logging` | [LoggingVersions.props](src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props) | [Logging.csproj](src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj) |
+| Layout | Branches | MDS version source | Companion/extension version sources |
+| ------ | -------- | ------------------ | ----------------------------------- |
+| **Centralized** | `release/7.0` (and earlier 7.0.x) | `tools/props/Versions.props` (`MdsVersionDefault`) | `tools/props/Versions.props` imports per-package props with the older names: `…/Extensions/Abstractions/src/AbstractionsVersions.props`, `…/Extensions/Azure/src/AzureVersions.props`, `…/Internal/Logging/src/LoggingVersions.props`, `…/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props` |
+| **Per-package** | `main`, `7.1+` | `src/Microsoft.Data.SqlClient/Versions.props` (`SqlClientVersionDefault`) | Each package has its own `Versions.props`: `…/Extensions/Abstractions/src/Versions.props` (`AbstractionsVersionDefault`), `…/Extensions/Azure/src/Versions.props` (`AzureVersionDefault`), `…/Internal/Logging/src/Versions.props` (`LoggingVersionDefault`), `…/AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props` (`AkvProviderVersionDefault`), `…/Microsoft.SqlServer.Server/Versions.props` (`SqlServerVersionDefault`) |
 
-Concrete dependency versions (e.g., `Azure.Core 1.49.0`) are centrally managed in [Directory.Packages.props](Directory.Packages.props). Framework-conditional versions (e.g., `net9.0` vs everything else) are handled by `Condition` attributes in the same file.
+Discovery approach (works regardless of layout):
+
+1. List the version props on the target branch, e.g. `git ls-tree -r --name-only ${input:branch} | grep -i "Versions.props$"`.
+2. Read the relevant file from the target branch, e.g. `git show ${input:branch}:<path>`, and find the package's default/`PackageVersion` property.
+3. Prefer the explicit shipped version: on a release branch the actual version may be supplied by the pipeline (`...PackageVersion`) rather than the `...VersionDefault` fallback, so confirm against the milestone/release artifacts rather than assuming the default.
+
+Dependency sources (read from `${input:branch}`): the per-package project file (`src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj`, the AKV `.csproj`, `Abstractions.csproj`, `Azure.csproj`, `Logging.csproj`, `Microsoft.SqlServer.Server.csproj`) plus the centrally-managed concrete versions in `Directory.Packages.props`. Framework-conditional versions (e.g., `net9.0` vs everything else) are handled by `Condition` attributes there.
+
+> **Companion package version alignment (7.0.2 and later):** Starting with 7.0.2, the companion packages (`AzureKeyVaultProvider`, `Extensions.Azure`, `Extensions.Abstractions`, `Internal.Logging`) ship version-aligned with the core `Microsoft.Data.SqlClient` driver. When generating notes for an aligned release, use the core MDS version (read from the target branch) for these companion packages — their per-package default version on `main` may point at a different next version and must not be assumed to be the shipped version. `Microsoft.SqlServer.Server` continues to version independently.
 
 ## Skills
 
@@ -122,7 +138,7 @@ When release notes reference a public API (property, method, class):
 
 ### 5. Generate Release Notes for Each Package
 
-For each package that has relevant PRs in the milestone:
+For each package that ships in this milestone — i.e., it has relevant PRs, **or** it is a version-aligned companion package (7.0.2+) bumping to match the core `Microsoft.Data.SqlClient` release even without its own changes (see item 2):
 
 1. **Determine the package version** using the Version Source from the lookup table above. Read the actual props/project file to find the version.
 
@@ -138,6 +154,7 @@ For each package that has relevant PRs in the milestone:
      1. **"Changes Since [last preview]"** — only the delta since the most recent preview of this package.
      2. **"Cumulative Changes Since [last stable]"** — all changes since the last stable release of this package, synthesized from all preview release notes plus the GA milestone. This applies to every package (MDS, AKV, Extensions.Azure, Abstractions, Internal.Logging, etc.), not just the core driver. Apply the cross-referencing from Step 3 to eliminate items already shipped in prior stable patch releases.
    - **Preview releases:** Only include the delta since the previous release (preview or stable). No cumulative section is needed.
+   - **Version-alignment-only releases (7.0.2+ companion packages):** Starting with 7.0.2, the companion packages (`AzureKeyVaultProvider`, `Extensions.Azure`, `Extensions.Abstractions`, `Internal.Logging`) ship a new version aligned with the core driver on every core release — **even when they have no functional or API changes**. In that case, still create the package's release notes file using a version-alignment-only style: state that there are no functional or API changes, note the version alignment with the core driver, link to the core `Microsoft.Data.SqlClient <Version>` notes, and (for .NET Framework) call out any `AssemblyVersion` strong-name change. Use the shipped 7.0.2 companion notes as the reference pattern (e.g., [release-notes/Extensions/Abstractions/7.0/7.0.2.md](release-notes/Extensions/Abstractions/7.0/7.0.2.md), [release-notes/Internal/Logging/7.0/7.0.2.md](release-notes/Internal/Logging/7.0/7.0.2.md), [release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.2.md](release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.2.md)). For the `Internal.Logging` package, retain its internal-use note. `Microsoft.SqlServer.Server` is **not** version-aligned and follows the normal skip rule.
 
 3. **Create or update the version README** at `<Directory>/README.md`. Follow the existing format — see [release-notes/add-ons/AzureKeyVaultProvider/6.1/README.md](release-notes/add-ons/AzureKeyVaultProvider/6.1/README.md) for reference:
 
@@ -152,7 +169,9 @@ For each package that has relevant PRs in the milestone:
    | <Date> | <Version> | [Release Notes](<Version>.md) |
    ```
 
-4. **Skip packages without changes.** If a package has no relevant PRs in the milestone, do not create release notes for it. Report which packages had changes and which did not.
+4. **Skip packages without changes (or that don't exist on the branch).** If a package has no relevant PRs in the milestone, or the package does not exist on the target branch `${input:branch}` (see the Package Registry note — older branches like `release/6.1` have no extension or `Internal.Logging` packages), do not create release notes for it. **Exception (7.0.2+):** version-aligned companion packages (`AzureKeyVaultProvider`, `Extensions.Azure`, `Extensions.Abstractions`, `Internal.Logging`) still get a release notes file when they bump to the aligned core version, even with no functional changes — use the version-alignment-only style from item 2. Report which packages had changes, which shipped alignment-only notes, which did not, and which are not present on the branch.
+
+5. **Cross-link companion packages from the core release notes.** When one or more companion packages (`AzureKeyVaultProvider`, `Extensions.Azure`, `Extensions.Abstractions`, `Internal.Logging`, `Microsoft.SqlServer.Server`) also ship in this milestone, add a `### Companion package release notes` section to the core `Microsoft.Data.SqlClient` release notes file that links to each companion package's release notes for the same version. This preserves context for the companion packages when the core release notes are used as the published GitHub release body. Use relative links (e.g., `../Extensions/Azure/<Major.Minor>/<Version>.md`). Only list packages that actually shipped release notes in this milestone.
 
 ### 6. Update CHANGELOG.md
 
@@ -177,6 +196,7 @@ For each package that has relevant PRs in the milestone:
 
 ## Notes
 
-- Packages may ship as preview or stable independently. Use the actual version from the project/spec files.
-- The directory structure mirrors existing conventions: `add-ons/AzureKeyVaultProvider/` for AKV, `MSqlServerServer/` for SqlServer, and `Extensions/<PackageName>/` for the new extension packages.
+- Release notes are maintained on `main` for all branches/releases, while the corresponding source code lives only on the target branch `${input:branch}` (see Branch Model above). Read version/dependency/source files from `${input:branch}`; write release notes files on `main`.
+- Packages may ship as preview or stable independently. Use the actual version from the project/spec files on the target branch.
+- The directory structure mirrors existing conventions: `add-ons/AzureKeyVaultProvider/` for AKV, `MSqlServerServer/` for SqlServer, `Extensions/<PackageName>/` for the extension packages (e.g., `Extensions/Abstractions/`, `Extensions/Azure/`), and `Internal/Logging/` for the internal logging package.
 - When referencing code samples, link to files in the `doc/samples/` directory if a relevant sample exists.
diff --git a/release-notes/7.0/7.0.2.md b/release-notes/7.0/7.0.2.md
index d1ea72a8db..c6eaf4cece 100644
--- a/release-notes/7.0/7.0.2.md
+++ b/release-notes/7.0/7.0.2.md
@@ -18,6 +18,15 @@ This update brings the following changes since the [7.0.1](7.0.1.md) release:
 
 > **Breaking change (.NET Framework only):** As part of this alignment, the `AssemblyVersion` of `Microsoft.Data.SqlClient.Extensions.Azure`, `Microsoft.Data.SqlClient.Extensions.Abstractions`, and `Microsoft.Data.SqlClient.Internal.Logging` changed from `1.0.0.0` to `7.0.0.0` (the `Microsoft.Data.SqlClient` and `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` assembly versions are unchanged). On .NET Framework, `AssemblyVersion` is part of the strong-name identity, so applications that drop these assemblies into an existing deployment without rebuilding must rebuild against the 7.0.2 packages (or add binding redirects). Applications on .NET / .NET Core are not affected.
 
+### Companion package release notes
+
+The following companion packages ship aligned as `7.0.2`. See their individual release notes for package-specific changes (including the `Microsoft.Data.SqlClient.Extensions.Azure` WAM broker support):
+
+- [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 7.0.2](../add-ons/AzureKeyVaultProvider/7.0/7.0.2.md)
+- [Microsoft.Data.SqlClient.Extensions.Azure 7.0.2](../Extensions/Azure/7.0/7.0.2.md)
+- [Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.2](../Extensions/Abstractions/7.0/7.0.2.md)
+- [Microsoft.Data.SqlClient.Internal.Logging 7.0.2](../Internal/Logging/7.0/7.0.2.md)
+
 ### Fixed
 
 - Fixed a `NullReferenceException` in `SqlCommand.Cancel()`. The diagnostic message built during cancellation dereferenced the active connection directly; it now uses a null-conditional access so cancellation no longer throws when the connection has already been torn down.

From 604b95a03bf46d73715d3751be4608b68fb341db Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Tue, 7 Jul 2026 16:05:55 -0500
Subject: [PATCH 177/298] PR Pipeline | Fix Test Result Publishing (#4428)

---
 eng/pipelines/pr/steps/publish-test-results-step.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/pr/steps/publish-test-results-step.yml b/eng/pipelines/pr/steps/publish-test-results-step.yml
index c64c3a974f..fa8e5839b7 100644
--- a/eng/pipelines/pr/steps/publish-test-results-step.yml
+++ b/eng/pipelines/pr/steps/publish-test-results-step.yml
@@ -45,10 +45,9 @@ steps:
     displayName: 'Publish Test Results'
     inputs:
       buildConfiguration: ${{ parameters.buildConfiguration }}
+      failTaskOnMissingResultsFile: true
       mergeTestResults: true
-      testResultsFiles: |
-        ${{ parameters.testResultsPath }}/*.trx
-        ${{ parameters.testResultsPath }}/**/*.coverage
+      testResultsFiles: ${{ parameters.testResultsPath }}/*.trx
       testResultsFormat: VSTest
       testRunTitle: "${{ parameters.platformDisplayName }}_${{ parameters.testDisplayName }}"
     condition: succeededOrFailed()

From 6c03ccbf5f25898762547d36aae13489b79ca021 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 8 Jul 2026 12:23:16 -0700
Subject: [PATCH 178/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4430)

---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx    | 4 ++--
 .../src/Resources/Strings.zh-Hans.resx                        | 4 ++--
 .../src/Resources/Strings.zh-Hant.resx                        | 4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index dc677ada6a..fa8320d327 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -607,7 +607,7 @@
     <value>Pro {0} nelze najít zprostředkovatele ověřování. Nainstalujte balíček NuGet Microsoft.Data.SqlClient.Extensions.Azure (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure), abyste mohli používat metody ověřování Active Directory (Entra ID).</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>Nastavení useWamBroker vyžaduje balíček Microsoft.Data.SqlClient.Extensions.Azure, aby se zpřístupnilo Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions. Upgradujte balíček Microsoft.Data.SqlClient.Extensions.Azure alespoň na verzi 1.1.0, která zahrnuje tento typ.</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Parametr {0} nesmí obsahovat hodnotu Null ani nesmí být prázdný.</value>
@@ -964,7 +964,7 @@
     <value>Minimální doba (v sekundách), po jakou má být toto připojení uchováváno ve fondu, než bude zrušeno.</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>Maximální doba (v sekundách), po kterou může být připojení ve fondu nevyužité (nečinné), než se zahodí, když je zakázané starší chování při vypršení časového limitu nečinnosti. Hodnota 0 zakáže vypršení platnosti při nečinnosti.</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Maximální počet připojení povolených ve fondu.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index 820d9f4568..ba72a1e54e 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -607,7 +607,7 @@
     <value>Für „{0}“ wurde kein Authentifizierungsanbieter gefunden. Installieren Sie das NuGet-Paket „Microsoft.Data.SqlClient.Extensions.Azure“ (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure), um Active Directory (Entra ID)-Authentifizierungsmethoden zu verwenden.</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>Die Einstellung „useWamBroker“ erfordert das Paket „Microsoft.Data.SqlClient.Extensions.Azure“, um „Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions“ bereitzustellen. Aktualisieren Sie das Paket „Microsoft.Data.SqlClient.Extensions.Azure“ auf mindestens Version 1.1.0, die diesen Typ enthält.</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Der Parameter "{0}" darf nicht NULL oder leer sein.</value>
@@ -964,7 +964,7 @@
     <value>Die Mindestdauer (in Sekunden), die diese Verbindung im Pool verbleibt, bevor sie gelöscht wird.</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>Die maximale Zeitspanne in Sekunden, die eine Verbindung im Pool ungenutzt bleiben kann, bevor sie verworfen wird, wenn das Verhalten des alten Leerlaufzeitlimits deaktiviert ist. Der Wert 0 deaktiviert den Ablauf des Leerlaufs.</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Die maximal zulässige Anzahl von Verbindungen im Pool.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index 2789788846..b55a28adec 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -607,7 +607,7 @@
     <value>No se encuentra un proveedor de autenticación para ''{0}''. Instale el paquete NuGet "Microsoft.Data.SqlClient.Extensions.Azure" (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) para usar métodos de autenticación Active Directory (Id. de Entra).</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>La configuración "useWamBroker" requiere que el paquete "Microsoft.Data.SqlClient.Extensions.Azure" exponga "Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions". Actualice el paquete "Microsoft.Data.SqlClient.Extensions.Azure" a, como mínimo, la versión 1.1.0, que incluye este tipo.</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>El parámetro "{0}" no puede ser nulo ni estar vacío.</value>
@@ -964,7 +964,7 @@
     <value>Periodo mínimo de tiempo (en segundos) que residirá esta conexión en el grupo antes de ser destruida.</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>La cantidad máxima de tiempo (en segundos) que una conexión puede permanecer sin usar (inactiva) en el grupo antes de descartarse cuando se deshabilita el comportamiento heredado de tiempo de espera de inactividad. Un valor de 0 deshabilita la expiración por inactividad.</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Número máximo de conexiones permitidas en el grupo.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index 67815a7f9f..d3bcada373 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -607,7 +607,7 @@
     <value>Impossible de trouver un fournisseur d'authentification pour « {0} ». Installez le package NuGet « Microsoft.Data.SqlClient.Extensions.Azure » (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) pour utiliser les méthodes d'authentification Active Directory Domain Services (Entra ID).</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>Le paramètre « useWamBroker » nécessite le package « Microsoft.Data.SqlClient.Extensions.Azure » pour exposer « Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions ». Mettez à niveau le package « Microsoft.Data.SqlClient.Extensions.Azure » vers la version 1.1.0 ou ultérieure, qui inclut ce type.</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Le paramètre « {0} » ne peut pas être Null ou vide.</value>
@@ -964,7 +964,7 @@
     <value>Durée minimale de conservation (en secondes) de cette connexion avant sa destruction.</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>Durée maximale (en secondes) pendant laquelle une connexion peut rester inutilisée (inactive) dans le pool avant d’être supprimée lorsque le comportement hérité du délai d’inactivité est désactivé. Une valeur de 0 désactive l’expiration d’inactivité.</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Nombre maximal de connexions autorisé dans le pool.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 16ef46bd2c..69bd41ed1e 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -607,7 +607,7 @@
     <value>Non è possibile trovare un provider di autenticazione per '{0}'. Installare il pacchetto NuGet 'Microsoft.Data.SqlClient.Extensions.Azure' (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) per usare i metodi di autenticazione di Active Directory (Entra ID).</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>L'impostazione ''useWamBroker'' richiede che il pacchetto ''Microsoft.Data.SqlClient.Extensions.Azure'' esponga ''Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions''. Aggiorna il pacchetto ''Microsoft.Data.SqlClient.Extensions.Azure'' almeno alla versione 1.1.0, che include questo tipo.</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Il parametro '{0}' non può essere Null o vuoto.</value>
@@ -964,7 +964,7 @@
     <value>Tempo minimo di attesa (in secondi) perché la connessione sia attiva nel pool prima di essere eliminata.</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>Il periodo massimo di tempo (in secondi) durante il quale una connessione può rimanere inutilizzata (inattiva) nel pool prima di essere eliminata quando il comportamento legacy del timeout di inattività è disabilitato. Un valore di 0 disabilita la scadenza per inattività.</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Numero massimo di connessioni consentite nel pool.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index 6fc0d5b867..cd3db1aa6e 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -607,7 +607,7 @@
     <value>'{0}' の認証プロバイダーが見つかりません。Active Directory (Entra ID) 認証方法を使用するには、'Microsoft.Data.SqlClient.Extensions.Azure' NuGet パッケージ (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) をインストールしてください。</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>'useWamBroker' を設定するには、'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions' を公開する 'Microsoft.Data.SqlClient.Extensions.Azure' パッケージが必要です。この型を含む v1.1.0 以降の 'Microsoft.Data.SqlClient.Extensions.Azure' パッケージにアップグレードしてください。</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>パラメーター '{0}' を null や空にすることはできません。</value>
@@ -964,7 +964,7 @@
     <value>この接続が破棄されるまでにプールに存在できる最低限の時間 (秒) です。</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>レガシのアイドル タイムアウト動作が無効になっている場合に、未使用 (アイドル) 状態の接続をプール内に保持できる最大時間 (秒単位) を指定します。値を 0 にすると、アイドルの有効期限が無効になります。</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>プールに保持できる最大接続数です。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index fc186e4188..2b7ea71615 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -607,7 +607,7 @@
     <value>'{0}'에 대한 인증 공급자를 찾을 수 없습니다. Active Directory(Entra ID) 인증 방법을 사용하려면 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet 패키지(https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure)를 설치하세요.</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>'useWamBroker'를 설정하려면 'Microsoft.Data.SqlClient.Extensions.Azure' 패키지가 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'를 노출해야 합니다. 이 형식을 포함하는 'Microsoft.Data.SqlClient.Extensions.Azure' 패키지를 v1.1.0 이상으로 업그레이드하세요.</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>'{0}' 매개 변수는 null이거나 비워 둘 수 없습니다.</value>
@@ -964,7 +964,7 @@
     <value>이 연결이 제거되기 전에 풀에서 활성화되어 있는 최소 시간(초)입니다.</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>레거시 유휴 시간 제한 동작을 사용하지 않도록 설정한 경우, 연결이 풀에서 사용되지 않은 상태로 유지될 수 있는 최대 시간(초)입니다. 이 시간이 지나면 연결이 삭제됩니다. 값이 0이면 유휴 만료가 사용되지 않습니다.</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>풀에서 허용되는 최대 연결 수입니다.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index ff7594a995..10b748e844 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -607,7 +607,7 @@
     <value>Nie można odnaleźć dostawcy uwierzytelniania dla elementu „{0}”. Zainstaluj pakiet NuGet „Microsoft.Data.SqlClient.Extensions.Azure” (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure), aby korzystać z metod uwierzytelniania usługi Active Directory (Entra ID).</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>Ustawienie „useWamBroker” wymaga pakietu „Microsoft.Data.SqlClient.Extensions.Azure”, aby uwidoczniono element „Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions”. Uaktualnij pakiet „Microsoft.Data.SqlClient.Extensions.Azure” do wersji co najmniej 1.1.0, która zawiera ten typ.</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Parametr „{0}” nie może mieć wartości null ani być pusty.</value>
@@ -964,7 +964,7 @@
     <value>Minimalny czas (w sekundach) przechowywania tego połączenia w puli przed jego usunięciem.</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>Maksymalny czas (w sekundach), przez jaki połączenie może znajdować się w stanie nieużywalnym (bezczynnym) w puli, zanim zostanie odrzucone po wyłączeniu starszego zachowania limitu czasu bezczynności. Wartość 0 powoduje wyłączenie bezczynności.</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Maksymalna liczba połączeń dozwolonych w puli.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index aceb8af554..5fdcafdde2 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -607,7 +607,7 @@
     <value>Não é possível localizar um provedor de autenticação para '{0}'. Instale o pacote NuGet 'Microsoft.Data.SqlClient.Extensions.Azure' (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) para usar métodos de autenticação do Active Directory (Entra ID).</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>A definição ''useWamBroker'' exige que o pacote ''Microsoft.Data.SqlClient.Extensions.Azure'' exponha ''Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions''. Atualize o pacote ''Microsoft.Data.SqlClient.Extensions.Azure'' para a versão v1.1.0 ou posterior, que inclui esse tipo.</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>O parâmetro '{0}' não pode ser nulo ou vazio.</value>
@@ -964,7 +964,7 @@
     <value>O tempo mínimo (em segundos) para que essa conexão exista no pool antes de ser destruída.</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>A quantidade máxima de tempo (em segundos) que uma conexão pode ficar sem uso (ociosa) no pool antes de ser descartada quando o comportamento herdado de tempo limite ocioso está desabilitado. Um valor de 0 desabilita a expiração por inatividade.</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>O número máximo de conexões permitidas no pool.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index e6bd7e21ed..33bcd135f4 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -607,7 +607,7 @@
     <value>Не удается найти поставщик проверки подлинности для "{0}". Установите пакет NuGet "Microsoft.Data.SqlClient.Extensions.Azure" (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) для использования методов проверки подлинности Active Directory (Entra ID).</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>Для установки параметра "useWamBroker" требуется, чтобы пакет "Microsoft.Data.SqlClient.Extensions.Azure" предоставлял доступ к "Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions". Обновите пакет "Microsoft.Data.SqlClient.Extensions.Azure" как минимум до версии v1.1.0, в которую входит этот тип.</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>Параметр «{0}» не может иметь значение NULL или быть пустым.</value>
@@ -964,7 +964,7 @@
     <value>Минимальное время (в секундах), которое это подключение будет оставаться в пуле до уничтожения.</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>Максимальное время (в секундах), в течение которого соединение может оставаться неактивным (в режиме ожидания) в пуле, прежде чем оно будет отклонено при отключенном устаревшем поведении времени ожидания. Значение "0" отключает окончание срока действия неактивности.</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Максимально допустимое число подключений в пуле.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index bee4c2db2d..e0ace1a9a2 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -607,7 +607,7 @@
     <value>'{0}' için kimlik doğrulaması sağlayıcısı bulunamıyor. Active Directory (Entra ID) kimlik doğrulaması yöntemlerini kullanmak için ‘Microsoft.Data.SqlClient.Extensions.Azure’ NuGet paketini (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure) yükleyin.</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>'useWamBroker' ayarı, 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions' türünü kullanıma sunmak için 'Microsoft.Data.SqlClient.Extensions.Azure' paketini gerektirir. Bu türü içeren en az v1.1.0 sürümüne ulaşmak için 'Microsoft.Data.SqlClient.Extensions.Azure' paketini yükseltin.</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>'{0}' parametresi null veya boş olamaz.</value>
@@ -964,7 +964,7 @@
     <value>Bu bağlantının, yok edilmeden önce havuzda en az ne süreyle (saniye olarak) etkin kalacağı.</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>Eski boşta kalma zaman aşımı davranışı devre dışı bırakıldığında, bir bağlantının havuzda kullanılmadan boşta kalabileceği ve atılmadan önce geçebileceği en fazla süreyi saniye cinsinden belirtir. 0 değeri, boşta kalma süresi sonunu devre dışı bırakır.</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>Havuzda izin verilen en çok bağlantı sayısı.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 5fbca4eeb0..7a3776e539 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -607,7 +607,7 @@
     <value>找不到 ‘{0}’ 的身份验证提供程序。安装 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet 包(https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure)以使用 Active Directory (Entra ID)身份验证方法。</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>要设置 "useWamBroker"，需要 "Microsoft.Data.SqlClient.Extensions.Azure" 包公开 "Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions"。将 "Microsoft.Data.SqlClient.Extensions.Azure" 包升级到至少 v1.1.0，该版本包含此类型。</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>参数“{0}”不能为 null 或为空。</value>
@@ -964,7 +964,7 @@
     <value>此连接在池中存活直至被销毁的最短时间(以秒为单位)。</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>在禁用传统空闲超时行为时，连接在池中保持未使用(空闲)状态的最长时间(以秒为单位)，之后将被丢弃。值为 0 表示禁用空闲过期。</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>池中所允许连接的最大数目。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index aea00e873a..454cc34d36 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -607,7 +607,7 @@
     <value>找不到 '{0}' 的驗證提供者。請安裝 'Microsoft.Data.SqlClient.Extensions.Azure' NuGet 套件 (https://www.nuget.org/packages/Microsoft.Data.SqlClient.Extensions.Azure)，以使用 Active Directory (Entra ID) 認證方法。</value>
   </data>
   <data name="SQL_UseWamBrokerRequiresAzureExtensionUpgrade" xml:space="preserve">
-    <value>Setting 'useWamBroker' requires the 'Microsoft.Data.SqlClient.Extensions.Azure' package to expose 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'. Upgrade the 'Microsoft.Data.SqlClient.Extensions.Azure' package to at least v1.1.0 that includes this type.</value>
+    <value>設定 'useWamBroker' 需要 'Microsoft.Data.SqlClient.Extensions.Azure' 套件以公開 'Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProviderOptions'。請將 'Microsoft.Data.SqlClient.Extensions.Azure' 套件升級至至少 v1.1.0，其中包含此類型。</value>
   </data>
   <data name="SQL_ParameterCannotBeEmpty" xml:space="preserve">
     <value>參數 '{0}' 不能是 Null 或空白。</value>
@@ -964,7 +964,7 @@
     <value>集區中的連接在被終結前的存在時間下限 (單位為秒)。</value>
   </data>
   <data name="DbConnectionString_IdleTimeout" xml:space="preserve">
-    <value>The maximum amount of time (in seconds) a connection can sit unused (idle) in the pool before it is discarded when legacy idle-timeout behavior is disabled. A value of 0 disables idle expiration.</value>
+    <value>停用舊版閒置逾時行為時，連線在集區中可處於未使用 (閒置) 狀態的最長時間 (以秒為單位)，超過後就會遭到捨棄。值為 0 時會停用閒置到期。</value>
   </data>
   <data name="DbConnectionString_MaxPoolSize" xml:space="preserve">
     <value>集區中允許的連接上限。</value>

From 90dda56c362dee1f3c091471c7d6199f3af80cba Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Thu, 9 Jul 2026 02:01:15 +0530
Subject: [PATCH 179/298] Pin Microsoft.SqlServer.Server package version to
 1.0.0 (#4434)

---
 eng/pipelines/onebranch/variables/package-variables.yml | 5 +----
 src/Microsoft.SqlServer.Server/Versions.props           | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/onebranch/variables/package-variables.yml b/eng/pipelines/onebranch/variables/package-variables.yml
index 5a7d456df8..7ddcb0ecc6 100644
--- a/eng/pipelines/onebranch/variables/package-variables.yml
+++ b/eng/pipelines/onebranch/variables/package-variables.yml
@@ -131,7 +131,4 @@ variables:
     value: '1.0.0.$(_assemblyBuildNumber)'
 
   - name: sqlServerPackageVersion
-    ${{ if parameters.isPreview }}:
-      value: '1.0.0-preview1.$(Build.BuildNumber)'
-    ${{ else }}:
-      value: '1.0.0'
+    value: '1.0.0'
diff --git a/src/Microsoft.SqlServer.Server/Versions.props b/src/Microsoft.SqlServer.Server/Versions.props
index 3615bd95a8..2a35868c7d 100644
--- a/src/Microsoft.SqlServer.Server/Versions.props
+++ b/src/Microsoft.SqlServer.Server/Versions.props
@@ -30,7 +30,7 @@
       decided.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <SqlServerVersionDefault>1.1.0-preview1</SqlServerVersionDefault>
+    <SqlServerVersionDefault>1.0.0</SqlServerVersionDefault>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->

From 52ed94b13600c0f71c5a2572107059d7fb2f81c1 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Thu, 9 Jul 2026 13:18:57 -0700
Subject: [PATCH 180/298] Fix paths. (#4436)

---
 eng/pipelines/onebranch/stages/release-stages.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/onebranch/stages/release-stages.yml b/eng/pipelines/onebranch/stages/release-stages.yml
index 45309a77c6..15d0cba8dd 100644
--- a/eng/pipelines/onebranch/stages/release-stages.yml
+++ b/eng/pipelines/onebranch/stages/release-stages.yml
@@ -193,7 +193,7 @@ stages:
             parameters:
               packageName: Microsoft.SqlServer.Server
               artifactName: '${{ parameters.sqlServerArtifactsName }}'
-              packagePath: 'Package-Release/Microsoft.SqlServer.Server.${{ parameters.sqlServerPackageVersion }}.nupkg'
+              packagePath: 'Release/Microsoft.SqlServer.Server.${{ parameters.sqlServerPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -203,7 +203,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.Internal.Logging
               artifactName: '${{ parameters.loggingArtifactsName }}'
-              packagePath: 'Package-Release/Microsoft.Data.SqlClient.Internal.Logging.${{ parameters.loggingPackageVersion }}.nupkg'
+              packagePath: 'Release/Microsoft.Data.SqlClient.Internal.Logging.${{ parameters.loggingPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -213,7 +213,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Abstractions
               artifactName: '${{ parameters.abstractionsArtifactsName }}'
-              packagePath: 'Package-Release/Microsoft.Data.SqlClient.Extensions.Abstractions.${{ parameters.abstractionsPackageVersion }}.nupkg'
+              packagePath: 'Release/Microsoft.Data.SqlClient.Extensions.Abstractions.${{ parameters.abstractionsPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -233,7 +233,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Azure
               artifactName: '${{ parameters.azureArtifactsName }}'
-              packagePath: 'Package-Release/Microsoft.Data.SqlClient.Extensions.Azure.${{ parameters.azurePackageVersion }}.nupkg'
+              packagePath: 'Release/Microsoft.Data.SqlClient.Extensions.Azure.${{ parameters.azurePackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
@@ -243,7 +243,7 @@ stages:
             parameters:
               packageName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
               artifactName: '${{ parameters.akvProviderArtifactsName }}'
-              packagePath: 'Package-Release/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.${{ parameters.akvProviderPackageVersion }}.nupkg'
+              packagePath: 'Release/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.${{ parameters.akvProviderPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}

From d0b276463bca93f9a0fce76f4df024b68f8379da Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Fri, 10 Jul 2026 19:36:05 +0100
Subject: [PATCH 181/298] Allow writing DateOnly instance as a Variant
 parameter (#4294)

---
 .../src/Microsoft/Data/SqlClient/TdsParser.cs | 18 ++++
 .../SQL/ParameterTest/DateTimeVariantTests.cs | 98 ++++++++++++++++++-
 2 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index d53bf6f827..8a00c41743 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -7801,6 +7801,12 @@ internal Task WriteSqlVariantValue(object value, int length, int offset, TdsPars
                     WriteDateTimeOffset((DateTimeOffset)value, mt.Scale, length, stateObj);
                     break;
 
+                #if NET
+                case TdsEnums.SQLDATE:
+                    WriteDate((DateOnly)value, stateObj);
+                    break;
+                #endif
+
                 default:
                     Debug.Fail("unknown tds type for sqlvariant!");
                     break;
@@ -7972,6 +7978,13 @@ internal Task WriteSqlVariantDataRowValue(object value, TdsParserStateObject sta
                     WriteDateTimeOffset((DateTimeOffset)value, metatype.Scale, 10, stateObj);
                     break;
 
+                #if NET
+                case TdsEnums.SQLDATE:
+                    WriteSqlVariantHeader(5, metatype.TDSType, metatype.PropBytes, stateObj);
+                    WriteDate((DateOnly)value, stateObj);
+                    break;
+                #endif
+
                 default:
                     Debug.Fail("unknown tds type for sqlvariant!");
                     break;
@@ -8145,6 +8158,11 @@ private void WriteDate(DateTime value, TdsParserStateObject stateObj)
             WritePartialLong(days, 3, stateObj);
         }
 
+#if NET
+        private void WriteDate(DateOnly value, TdsParserStateObject stateObj) =>
+            WritePartialLong(value.DayNumber, 3, stateObj);
+#endif
+
         private byte[] SerializeTime(TimeSpan value, byte scale, int length)
         {
             if (0 > value.Ticks || value.Ticks >= TimeSpan.TicksPerDay)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
index 05a01788c3..3d84e0ff2c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
@@ -407,6 +407,12 @@ public void TestSqlDataReader_TVP_Type(
                     {
                         value = ((TimeSpan)paramValue).ToString();
                     }
+                    #if NET
+                    else if (paramValue.GetType() == typeof(DateOnly))
+                    {
+                        value = ((DateOnly)paramValue).ToString();
+                    }
+                    #endif
                     else
                     {
                         value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
@@ -476,6 +482,12 @@ public void TestSqlDataReader_TVP_Variant(
                     {
                         value = ((TimeSpan)paramValue).ToString();
                     }
+                    #if NET
+                    else if (paramValue.GetType() == typeof(DateOnly))
+                    {
+                        value = ((DateOnly)paramValue).ToString();
+                    }
+                    #endif
                     else
                     {
                         value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
@@ -542,6 +554,12 @@ public void TestSimpleDataReader_Type(
                     {
                         value = ((TimeSpan)paramValue).ToString();
                     }
+                    #if NET
+                    else if (paramValue.GetType() == typeof(DateOnly))
+                    {
+                        value = ((DateOnly)paramValue).ToString();
+                    }
+                    #endif
                     else
                     {
                         value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
@@ -593,6 +611,12 @@ public void TestSimpleDataReader_Variant(
                     {
                         value = ((TimeSpan)paramValue).ToString();
                     }
+                    #if NET
+                    else if (paramValue.GetType() == typeof(DateOnly))
+                    {
+                        value = ((DateOnly)paramValue).ToString();
+                    }
+                    #endif
                     else
                     {
                         value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
@@ -645,6 +669,12 @@ public void SqlBulkCopySqlDataReader_Type(
                     {
                         value = ((TimeSpan)paramValue).ToString();
                     }
+                    #if NET
+                    else if (paramValue.GetType() == typeof(DateOnly))
+                    {
+                        value = ((DateOnly)paramValue).ToString();
+                    }
+                    #endif
                     else
                     {
                         value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
@@ -712,6 +742,12 @@ public void SqlBulkCopySqlDataReader_Variant(
                     {
                         value = ((TimeSpan)paramValue).ToString();
                     }
+                    #if NET
+                    else if (paramValue.GetType() == typeof(DateOnly))
+                    {
+                        value = ((DateOnly)paramValue).ToString();
+                    }
+                    #endif
                     else
                     {
                         value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
@@ -949,6 +985,66 @@ public void SqlBulkCopyDataRow_Variant(
         /// </summary>
         public static IEnumerable<object[]> GetParameterCombinations()
         {
+            #if NET
+            yield return new object[] { DateOnly.MinValue, "date",
+                new Dictionary<TestVariations, ExceptionChecker> {
+                    { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }},
+                new Dictionary<TestVariations, object>()
+                {
+                    { TestVariations.TestSimpleParameter_Type, new DateTime(0) },
+                    { TestVariations.TestSimpleParameter_Variant, new DateTime(0) },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, new DateTime(0) },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(0) },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, new DateTime(0) },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, new DateTime(0) },
+                    { TestVariations.TestSqlDataReader_TVP_Type, new DateTime(0) },
+                    { TestVariations.TestSqlDataReader_TVP_Variant, new DateTime(0) },
+                    { TestVariations.TestSimpleDataReader_Type, new DateTime(0) },
+                    { TestVariations.TestSimpleDataReader_Variant, new DateTime(0) },
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, new DateTime(0) },
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, new DateTime(0) },
+                    { TestVariations.SqlBulkCopyDataTable_Type, new DateTime(0) },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, new DateTime(0) },
+                    { TestVariations.SqlBulkCopyDataRow_Type, new DateTime(0) },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(0) }
+                },
+                new Dictionary<TestVariations, string>()};
+            yield return new object[] { DateOnly.MaxValue, "date",
+                new Dictionary<TestVariations, ExceptionChecker> {
+                    { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }},
+                new Dictionary<TestVariations, object>()
+                {
+                    { TestVariations.TestSimpleParameter_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSimpleParameter_Variant, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSqlDataReader_TVP_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSqlDataReader_TVP_Variant, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSimpleDataReader_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.TestSimpleDataReader_Variant, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopySqlDataReader_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopySqlDataReader_Variant, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopyDataTable_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopyDataTable_Variant, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopyDataRow_Type, new DateTime(3155378112000000000) },
+                    { TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(3155378112000000000) }
+                },
+                new Dictionary<TestVariations, string>()
+                {
+                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, "datetime"}
+                }
+            };
+            #endif
             yield return new object[] { DateTime.MinValue, "date",
                 new Dictionary<TestVariations, ExceptionChecker> {
                     { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
@@ -1070,7 +1166,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
                 new Dictionary<TestVariations, ExceptionChecker>(),
                 new Dictionary<TestVariations, object>(),
                 new Dictionary<TestVariations, string>()};
-            yield return new object[] { DateTimeOffset.Parse("12/31/1999 23:59:59.9999999 -08:30"), "datetimeoffset",
+            yield return new object[] { DateTimeOffset.Parse("1999-12-31 23:59:59.9999999 -08:30"), "datetimeoffset",
                 new Dictionary<TestVariations, ExceptionChecker>(),
                 new Dictionary<TestVariations, object>(),
                 new Dictionary<TestVariations, string>()};

From 6c1c8e05a87cb973ce1e12ee3f4d6e41b8c8d1b9 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 13 Jul 2026 07:56:36 -0300
Subject: [PATCH 182/298] Replace dead #if _WINDOWS test guards with runtime OS
 checks (#4423)

---
 .../Common/LocalAppContextSwitchesHelper.cs   | 42 ++++++++++++++-----
 .../SqlClient/LocalAppContextSwitchesTest.cs  | 23 +++++++---
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
index 5c07d37a32..49ad2712ec 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
@@ -3,6 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Reflection;
+#if NET
+using System.Runtime.InteropServices;
+#endif
 
 namespace Microsoft.Data.SqlClient.Tests.Common;
 
@@ -56,9 +59,12 @@ public sealed class LocalAppContextSwitchesHelper : IDisposable
     private readonly bool? _useConnectionPoolV2Original;
     private readonly bool? _useLegacyIdleTimeoutBehaviorOriginal;
     private readonly bool? _useOverallConnectTimeoutForPoolWaitOriginal;
-    #if NET && _WINDOWS
+    #if NET
+    // The s_useManagedNetworking field only exists in the SqlClient assembly
+    // when it is built for .NET on Windows, so it is captured/restored at
+    // runtime only when running on Windows. See UseManagedNetworking below.
     private readonly bool? _useManagedNetworkingOriginal;
-    #endif    
+    #endif
     private readonly bool? _useMinimumLoginTimeoutOriginal;
 
     #endregion
@@ -121,9 +127,12 @@ public LocalAppContextSwitchesHelper()
                 GetSwitchValue("s_useLegacyIdleTimeoutBehavior");
             _useOverallConnectTimeoutForPoolWaitOriginal =
                 GetSwitchValue("s_useOverallConnectTimeoutForPoolWait");
-            #if NET && _WINDOWS
-            _useManagedNetworkingOriginal =
-                GetSwitchValue("s_useManagedNetworking");
+            #if NET
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                _useManagedNetworkingOriginal =
+                    GetSwitchValue("s_useManagedNetworking");
+            }
             #endif
             _useMinimumLoginTimeoutOriginal =
                 GetSwitchValue("s_useMinimumLoginTimeout");
@@ -194,10 +203,13 @@ public void Dispose()
             SetSwitchValue(
                 "s_useOverallConnectTimeoutForPoolWait",
                 _useOverallConnectTimeoutForPoolWaitOriginal);
-            #if NET && _WINDOWS
-            SetSwitchValue(
-                "s_useManagedNetworking",
-                _useManagedNetworkingOriginal);
+            #if NET
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                SetSwitchValue(
+                    "s_useManagedNetworking",
+                    _useManagedNetworkingOriginal);
+            }
             #endif
             SetSwitchValue(
                 "s_useMinimumLoginTimeout",
@@ -358,10 +370,20 @@ public bool? UseOverallConnectTimeoutForPoolWait
         set => SetSwitchValue("s_useOverallConnectTimeoutForPoolWait", value);
     }
 
-    #if NET && _WINDOWS
+    #if NET
     /// <summary>
     /// Get or set the UseManagedNetworking switch value.
     /// </summary>
+    /// <remarks>
+    /// The underlying s_useManagedNetworking field only exists in the SqlClient
+    /// assembly when it is built for .NET on Windows. The getter reads the
+    /// public LocalAppContextSwitches.UseManagedNetworking property, which
+    /// exists on all platforms and is safe to read anywhere. Only the setter
+    /// relies on the s_useManagedNetworking field, so callers must set this
+    /// property only when running on Windows (see
+    /// RuntimeInformation.IsOSPlatform(OSPlatform.Windows)); otherwise the
+    /// reflection lookup of the field will fail.
+    /// </remarks>
     public bool? UseManagedNetworking
     {
         get => GetSwitchPropertyValue(nameof(UseManagedNetworking));
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
index e2007280a9..c159389bf7 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
@@ -3,6 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.Data.SqlClient.Tests.Common;
+#if NET
+using System.Runtime.InteropServices;
+#endif
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.UnitTests;
@@ -42,9 +45,10 @@ public void TestDefaultAppContextSwitchValues()
         switchesHelper.UseMinimumLoginTimeout = null;
         #if NET
         switchesHelper.GlobalizationInvariantMode = null;
-        #endif
-        #if NET && _WINDOWS
-        switchesHelper.UseManagedNetworking = null;
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            switchesHelper.UseManagedNetworking = null;
+        }
         #endif
         #if NETFRAMEWORK
         switchesHelper.DisableTnirByDefault = null;
@@ -66,9 +70,16 @@ public void TestDefaultAppContextSwitchValues()
         Assert.False(switchesHelper.EnableMultiSubnetFailoverByDefault);
         #if NET
         Assert.False(switchesHelper.GlobalizationInvariantMode);
-        #endif
-        #if NET && _WINDOWS
-        Assert.False(switchesHelper.UseManagedNetworking);
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            Assert.False(switchesHelper.UseManagedNetworking);
+        }
+        else
+        {
+            // On .NET Unix, native SNI is unavailable, so UseManagedNetworking
+            // is a constant true.
+            Assert.True(switchesHelper.UseManagedNetworking);
+        }
         #endif
         #if NETFRAMEWORK
         Assert.False(switchesHelper.DisableTnirByDefault);

From ca469d52ef965a0aa223706854f507a3fc20cd7e Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Mon, 13 Jul 2026 23:00:06 +0100
Subject: [PATCH 183/298] Cleanup | Consolidate connection capability metadata
 (#3862)

Co-authored-by: Malcolm Daigle <mdaigle@microsoft.com>
---
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |  11 +
 .../Data/ProviderBase/DbConnectionClosed.cs   |   2 +
 .../Data/ProviderBase/DbConnectionInternal.cs |   2 +
 .../Connection/ConnectionCapabilities.cs      | 221 ++++++++++++++++++
 .../Connection/SqlConnectionInternal.cs       | 142 ++++-------
 .../Data/SqlClient/SqlConnectionFactory.cs    |   4 +-
 .../Microsoft/Data/SqlClient/SqlDataReader.cs |   2 +-
 .../Data/SqlClient/SqlMetaDataFactory.cs      |   7 +-
 .../src/Microsoft/Data/SqlClient/TdsEnums.cs  |  55 +----
 .../src/Microsoft/Data/SqlClient/TdsParser.cs | 136 ++++-------
 .../Data/SqlClient/TdsParserHelperClasses.cs  |   8 -
 .../ChannelDbConnectionPoolTest.cs            |   2 +
 .../ConnectionPool/ConnectionPoolSlotsTest.cs |   4 +-
 .../IdleConnectionChannelTest.cs              |   3 +
 .../TransactedConnectionPoolTest.cs           |   2 +
 ...itHandleDbConnectionPoolTransactionTest.cs |   2 +
 .../Microsoft/Data/Common/AdapterUtilTest.cs  | 156 +++++++++++++
 17 files changed, 512 insertions(+), 247 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/ConnectionCapabilities.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Common/AdapterUtilTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index e8ec7c9e0e..6f1e31f47f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -466,6 +466,17 @@ internal static void ValidateCommandBehavior(CommandBehavior value)
             }
         }
 
+        internal static void ValidateTdsVersion(uint tdsVersion)
+        {
+            if (tdsVersion is not TdsEnums.SQL2005_VERSION
+                and not TdsEnums.SQL2008_VERSION
+                and not TdsEnums.TDS7X_VERSION
+                and not TdsEnums.TDS80_VERSION)
+            {
+                throw SQL.InvalidTDSVersion();
+            }
+        }
+
         internal static ArgumentOutOfRangeException InvalidUserDefinedTypeSerializationFormat(Format value)
         {
 #if DEBUG
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
index 37782dddf3..cc135a5714 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionClosed.cs
@@ -22,6 +22,8 @@ protected DbConnectionClosed(ConnectionState state, bool hidePassword, bool allo
 
         public override string ServerVersion => throw ADP.ClosedConnectionError();
 
+        public override ConnectionCapabilities Capabilities => throw ADP.ClosedConnectionError();
+
         protected override void Activate(System.Transactions.Transaction transaction) => throw ADP.ClosedConnectionError();
 
         public override DbTransaction BeginTransaction(IsolationLevel il) => throw ADP.ClosedConnectionError();
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
index 907e491949..7e0ef67b94 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -181,6 +181,8 @@ internal bool IsInPool
 
         public abstract string ServerVersion { get; }
 
+        public virtual ConnectionCapabilities Capabilities => null;
+
         // this should be abstract but until it is added to all the providers virtual will have to do RickFe
         public virtual string ServerVersionNormalized
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/ConnectionCapabilities.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/ConnectionCapabilities.cs
new file mode 100644
index 0000000000..ebc2ff6bbc
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/ConnectionCapabilities.cs
@@ -0,0 +1,221 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Data.SqlClient.Internal;
+using System;
+using System.Text;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient;
+
+/// <summary>
+/// Describes the capabilities and related information (such as the
+/// reported server version and TDS version) of the connection.
+/// </summary>
+internal sealed class ConnectionCapabilities
+{
+    /// <summary>
+    /// The TDS version reported by the LoginAck response
+    /// from the server.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="TdsEnums.SQL2005_VERSION"/> is negotiated for SQL Server 2005.
+    /// <see cref="TdsEnums.SQL2008_VERSION"/> is negotiated for SQL Server 2008.
+    /// <see cref="TdsEnums.TDS7X_VERSION"/> is negotiated for SQL Server 2012 and upwards using TDS 7.x.
+    /// <see cref="TdsEnums.TDS80_VERSION"/> is negotiated for the TDS 8.0 flow in SQL Server 2022 and upwards.
+    /// </remarks>
+    public uint TdsVersion { get; set; }
+
+    /// <summary>
+    /// The SQL Server major version reported by the LoginAck
+    /// response from the server.
+    /// </summary>
+    public byte ServerMajorVersion { get; set; }
+
+    /// <summary>
+    /// The SQL Server minor version reported by the LoginAck
+    /// response from the server.
+    /// </summary>
+    public byte ServerMinorVersion { get; set; }
+
+    /// <summary>
+    /// The SQL Server build number reported by the LoginAck
+    /// response from the server.
+    /// </summary>
+    public ushort ServerBuildNumber { get; set; }
+
+    /// <summary>
+    /// The user-friendly SQL Server version reported by the
+    /// LoginAck response from the server.
+    /// </summary>
+    public string ServerVersion =>
+        $"{ServerMajorVersion:00}.{ServerMinorVersion:00}.{ServerBuildNumber:0000}";
+
+    /// <summary>
+    /// If true (as determined by the value of <see cref="TdsVersion"/>)
+    /// then the connection is to SQL Server 2008 R2 or newer.
+    /// </summary>
+    public bool Is2008R2OrNewer =>
+        Is2012OrNewer || TdsVersion is TdsEnums.SQL2008_VERSION;
+
+    /// <summary>
+    /// If true (as determined by the value of <see cref="TdsVersion"/>)
+    /// then the connection is to SQL Server 2012 or newer.
+    /// </summary>
+    public bool Is2012OrNewer =>
+        TdsVersion is TdsEnums.TDS7X_VERSION or TdsEnums.TDS80_VERSION;
+
+    /// <summary>
+    /// If true, this connection is to an Azure SQL instance. This is determined
+    /// by the receipt of a FEATUREEXTACK token of value <c>0x08</c>.
+    /// </summary>
+    public bool IsAzureSql { get; set; }
+
+    /// <summary>
+    /// Indicates support for user-defined CLR types (up to a length of 8000
+    /// bytes.) This was introduced in SQL Server 2005.
+    /// </summary>
+    public bool UserDefinedTypes => true;
+
+    /// <summary>
+    /// Indicates support for the <c>xml</c> data type. This was introduced
+    /// in SQL Server 2005.
+    /// </summary>
+    public bool XmlDataType => true;
+
+    /// <summary>
+    /// Indicates support for the <c>date</c>, <c>time</c>, <c>datetime2</c>
+    /// and <c>datetimeoffset</c> data types. These were introduced in SQL
+    /// Server 2008.
+    /// </summary>
+    public bool ExpandedDateTimeDataTypes => Is2008R2OrNewer;
+
+    /// <summary>
+    /// Indicates support for user-defined CLR types of any length. This
+    /// was introduced in SQL Server 2008.
+    /// </summary>
+    public bool LargeUserDefinedTypes => Is2008R2OrNewer;
+
+    /// <summary>
+    /// Indicates support for the client to include a TDS trace header,
+    /// which is surfaced in XEvents traces to correlate events between
+    /// the client and the server. This was introduced in SQL Server 2012.
+    /// </summary>
+    public bool TraceHeader => Is2012OrNewer;
+
+    /// <summary>
+    /// Indicates support for UTF8 collations. This was introduced in SQL
+    /// Server 2019, and is only available if a FEATUREEXTACK token of value
+    /// <c>0x0A</c> is received.
+    /// </summary>
+    public bool Utf8 { get; set; }
+
+    /// <summary>
+    /// Indicates support for the client to cache DNS resolution responses for
+    /// the server. This is only supported by Azure SQL, and is only available
+    /// if a FEATUREEXTACK token of value <c>0x0B</c> is received.
+    /// </summary>
+    public bool DnsCaching { get; set; }
+
+    /// <summary>
+    /// Indicates support for Data Classification and specifies the version of
+    /// Data Classification which is supported. This was introduced in SQL
+    /// Server 2019, and is only available if a FEATUREEXTACK token of value
+    /// <c>0x09</c> is received.
+    /// </summary>
+    /// <remarks>
+    /// This should only be <c>1</c> or <c>2</c>.
+    /// </remarks>
+    public byte DataClassificationVersion { get; set; }
+
+    /// <summary>
+    /// Indicates that Global Transactions are available (even if not currently enabled.)
+    /// Global Transactions are only supported by Azure SQL, and are only available if a
+    /// FEATUREEXTACK token of value <c>0x05</c> is received.
+    /// </summary>
+    public bool GlobalTransactionsAvailable { get; set; }
+
+    /// <summary>
+    /// Indicates support for Global Transactions. This is only supported by
+    /// Azure SQL, and is only available if a FEATUREEXTACK token of value
+    /// <c>0x05</c> is received.
+    /// </summary>
+    public bool GlobalTransactionsSupported { get; set; }
+
+    /// <summary>
+    /// Indicates support for Enhanced Routing. This is only supported by
+    /// Azure SQL, and is only available if a FEATUREEXTACK token of value
+    /// <c>0x0F</c> is received.
+    /// </summary>
+    public bool EnhancedRouting { get; set; }
+
+    /// <summary>
+    /// Indicates support for connecting to the current connection's failover
+    /// partner with an Application Intent of ReadOnly. This is only supported
+    /// by Azure SQL, and is only available if a FEATUREEXTACK token of value
+    /// <c>0x08</c> is received, and if bit zero of this token's data is set.
+    /// </summary>
+    public bool ReadOnlyFailoverPartnerConnection { get; set; }
+
+    /// <summary>
+    /// Indicates support for the <c>vector</c> data type, with a backing type
+    /// of <c>float32</c>. This was introduced in SQL Server 2022, and is only
+    /// available if a FEATUREEXTACK token of value <c>0x0E</c> is received, and
+    /// if the version in this token's data is greater than or equal to <c>1</c>.
+    /// </summary>
+    public bool Float32VectorType { get; set; }
+
+    /// <summary>
+    /// Indicates support for the <c>json</c> data type. This was introduced in
+    /// SQL Server 2022, and is only available if a FEATUREEXTACK token of value
+    /// <c>0x0D</c> is received, and if the version in this token's data is
+    /// greater than or equal to <c>1</c>.
+    /// </summary>
+    public bool JsonType { get; set; }
+
+    /// <summary>
+    /// Indicates support for column encryption and specifies the version of column
+    /// encryption which is supported. This was introduced in SQL Server 2016, and is
+    /// only available if a FEATUREEXTACK token of value <c>0x04</c> is received.
+    /// </summary>
+    /// <remarks>
+    /// This should only be <c>1</c>, <c>2</c> or <c>3</c>. v1 is supported from SQL
+    /// Server 2016 upwards, v2 is supported from SQL Server 2019 upwards, v3 is supported
+    /// from SQL Server 2022 upwards.
+    /// </remarks>
+    public byte ColumnEncryptionVersion { get; set; }
+
+    /// <summary>
+    /// If column encryption is enabled, the type of enclave reported by the server. This
+    /// was introduced in SQL Server 2019, and is only available if a FEATUREEXTACK token
+    /// of value <c>0x04</c> is received, and the resultant <see cref="ColumnEncryptionVersion"/>
+    /// is <c>2</c> or <c>3</c>.
+    /// </summary>
+    public string? ColumnEncryptionEnclaveType { get; set; }
+
+    /// <summary>
+    /// Returns the capability records to unset values.
+    /// </summary>
+    public void Reset()
+    {
+        TdsVersion = 0;
+        ServerMajorVersion = 0;
+        ServerMinorVersion = 0;
+        ServerBuildNumber = 0;
+
+        IsAzureSql = false;
+        Utf8 = false;
+        DnsCaching = false;
+        DataClassificationVersion = TdsEnums.DATA_CLASSIFICATION_NOT_ENABLED;
+        GlobalTransactionsAvailable = false;
+        GlobalTransactionsSupported = false;
+        EnhancedRouting = false;
+        ReadOnlyFailoverPartnerConnection = false;
+        Float32VectorType = false;
+        JsonType = false;
+        ColumnEncryptionVersion = TdsEnums.TCE_NOT_ENABLED;
+        ColumnEncryptionEnclaveType = null;
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index a70ab35360..fd8817b9aa 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -179,23 +179,10 @@ internal class SqlConnectionInternal : DbConnectionInternal, IDisposable
         // @TODO: Should be private and accessed via internal property
         internal bool _federatedAuthenticationRequested;
 
-        /// <summary>
-        /// Flag indicating whether JSON objects are supported by the server.
-        /// </summary>
-        // @TODO: Should be private and accessed via internal property
-        internal bool IsJsonSupportEnabled = false;
-
-        /// <summary>
-        /// Flag indicating whether vector objects are supported by the server.
-        /// </summary>
-        // @TODO: Should be private and accessed via internal property
-        internal bool IsVectorSupportEnabled = false;
-
         /// <summary>
         /// Flag indicating whether enhanced routing is supported by the server.
         /// </summary>
-        // @TODO: Should be private and accessed via internal property
-        internal bool IsEnhancedRoutingSupportEnabled = false;
+        internal bool IsEnhancedRoutingSupportEnabled => Capabilities.EnhancedRouting;
 
         // @TODO: This should be private
         internal readonly SyncAsyncLock _parserLock = new SyncAsyncLock();
@@ -206,12 +193,6 @@ internal class SqlConnectionInternal : DbConnectionInternal, IDisposable
         // @TODO: Should be private and accessed via internal property
         internal readonly SspiContextProvider _sspiContextProvider;
 
-        /// <summary>
-        /// TCE flags supported by the server.
-        /// </summary>
-        // @TODO: Should be private and accessed via internal property
-        internal byte _tceVersionSupported;
-
         private readonly ActiveDirectoryAuthenticationTimeoutRetryHelper _activeDirectoryAuthTimeoutRetryHelper;
 
         /// <summary>
@@ -252,8 +233,6 @@ internal class SqlConnectionInternal : DbConnectionInternal, IDisposable
 
         private string _instanceName = string.Empty;
 
-        private SqlLoginAck _loginAck;
-
         /// <summary>
         /// This is used to preserve the authentication context object if we decide to cache it for
         /// subsequent connections in the same pool. This will finally end up in
@@ -288,9 +267,6 @@ internal class SqlConnectionInternal : DbConnectionInternal, IDisposable
         // @TODO: Rename to match naming conventions
         private bool _SQLDNSRetryEnabled = false;
 
-        // @TODO: Rename to match naming conventions
-        private bool _serverSupportsDNSCaching = false;
-
         private bool _sessionRecoveryRequested;
 
         private int _threadIdOwningParserLock = -1;
@@ -459,10 +435,11 @@ internal SqlConnectionInternal(
         #region Properties
 
         // @TODO: Make internal
-        public override string ServerVersion
-        {
-            get => $"{_loginAck.majorVersion:00}.{(short)_loginAck.minorVersion:00}.{_loginAck.buildNum:0000}";
-        }
+        public override string ServerVersion =>
+            Capabilities.ServerVersion;
+
+        public override ConnectionCapabilities Capabilities =>
+            _parser.Capabilities;
 
         /// <summary>
         /// Gets the collection of async call contexts that belong to this connection.
@@ -598,16 +575,15 @@ internal bool IsDNSCachingBeforeRedirectSupported
         internal bool IsEnlistedInTransaction { get; private set; }
 
         /// <summary>
-        /// Whether this is a Global Transaction (Non-MSDTC, Azure SQL DB Transaction)
-        /// TODO: overlaps with IsGlobalTransactionsEnabledForServer, need to consolidate to avoid bugs
+        /// Whether the server is capable of supporting a Global Transaction (Non-MSDTC, Azure SQL DB Transaction)
         /// </summary>
-        internal bool IsGlobalTransaction { get; private set; }
+        internal bool IsGlobalTransaction => Capabilities.GlobalTransactionsAvailable;
 
         /// <summary>
         /// Whether Global Transactions are enabled. Only supported by Azure SQL. False if disabled
         /// or connected to on-prem SQL Server.
         /// </summary>
-        internal bool IsGlobalTransactionsEnabledForServer { get; private set; }
+        internal bool IsGlobalTransactionsEnabledForServer => Capabilities.GlobalTransactionsSupported;
 
         /// <summary>
         /// Whether this connection is locked for bulk copy operations.
@@ -621,11 +597,7 @@ internal bool IsLockedForBulkCopy
         /// Get or set if SQLDNSCaching is supported by the server.
         /// </summary>
         // @TODO: Make auto-property
-        internal bool IsSQLDNSCachingSupported
-        {
-            get => _serverSupportsDNSCaching;
-            set => _serverSupportsDNSCaching = value;
-        }
+        internal bool IsSQLDNSCachingSupported => Capabilities.DnsCaching;
 
         /// <summary>
         /// Get or set if we need retrying with IP received from FeatureExtAck.
@@ -761,31 +733,8 @@ private SqlInternalTransaction AvailableInternalTransaction
             get => _parser._fResetConnection ? null : CurrentTransaction;
         }
 
-        /// <summary>
-        /// Whether this connection is to an Azure SQL Database.
-        /// </summary>
-        // @TODO: Make private field.
-        private bool IsAzureSqlConnection { get; set; }
-
         internal TimeoutTimer Timeout => _timeout;
 
-        /// <summary>
-        /// Selects the <see cref="TimeoutTimer"/> that governs the login phase based on
-        /// <see cref="LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait"/>.
-        /// </summary>
-        /// <remarks>
-        /// When the switch is enabled the caller-supplied <paramref name="callerTimeout"/>
-        /// is returned as-is so any time already consumed (e.g., waiting for the pool) counts
-        /// against the overall ConnectTimeout. When disabled, a fresh timer is started from
-        /// <paramref name="connectTimeoutSeconds"/>, preserving legacy behavior. Extracted so
-        /// this branch can be unit-tested without standing up a real connection.
-        /// </remarks>
-        internal static TimeoutTimer ResolveLoginTimeout(TimeoutTimer callerTimeout, int connectTimeoutSeconds)
-        {
-            return LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait
-                ? callerTimeout
-                : TimeoutTimer.StartNew(TimeSpan.FromSeconds(connectTimeoutSeconds));
-        }
         #endregion
 
         #region Public and Internal Methods
@@ -988,8 +937,6 @@ public override void Dispose()
             finally
             {
                 // Close will always close, even if exception is thrown.
-                // Remember to null out any object references.
-                _loginAck = null;
 
                 // Mark internal connection as closed
                 _fConnectionOpen = false;
@@ -1387,12 +1334,8 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                         throw SQL.ParsingError();
                     }
 
-                    IsGlobalTransaction = true;
-                    if (data[0] == 0x01)
-                    {
-                        IsGlobalTransactionsEnabledForServer = true;
-                    }
-
+                    Capabilities.GlobalTransactionsAvailable = true;
+                    Capabilities.GlobalTransactionsSupported = (data[0] == 0x01);
                     break;
                 }
 
@@ -1520,19 +1463,12 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                         throw SQL.ParsingErrorValue(ParsingErrorState.TceInvalidVersion, supportedTceVersion);
                     }
 
-                    _tceVersionSupported = supportedTceVersion;
-
-                    Debug.Assert(_tceVersionSupported <= TdsEnums.MAX_SUPPORTED_TCE_VERSION,
-                        "Client support TCE version 2");
-
-                    _parser.IsColumnEncryptionSupported = true;
-                    _parser.TceVersionSupported = _tceVersionSupported;
-                    _parser.AreEnclaveRetriesSupported = _tceVersionSupported == 3;
+                    Capabilities.ColumnEncryptionVersion = supportedTceVersion;
 
                     if (data.Length > 1)
                     {
                         // Extract the type of enclave being used by the server.
-                        _parser.EnclaveType = Encoding.Unicode.GetString(data, 2, data.Length - 2);
+                        Capabilities.ColumnEncryptionEnclaveType = Encoding.Unicode.GetString(data, 2, data.Length - 2);
                     }
                     break;
                 }
@@ -1548,11 +1484,11 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                         throw SQL.ParsingError(ParsingErrorState.CorruptedTdsStream);
                     }
 
-                    IsAzureSqlConnection = true;
-
+                    Capabilities.IsAzureSql = true;
                     // Bit 0 for RO/FP support
-                    // @TODO: Add a constant somewhere for that
-                    if ((data[0] & 1) == 1 && SqlClientEventSource.Log.IsTraceEnabled())
+                    Capabilities.ReadOnlyFailoverPartnerConnection = (data[0] & 0x01) == 0x01;
+
+                    if (Capabilities.ReadOnlyFailoverPartnerConnection && SqlClientEventSource.Log.IsTraceEnabled())
                     {
                         SqlClientEventSource.Log.TryAdvancedTraceEvent(
                             $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
@@ -1604,7 +1540,7 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                     }
 
                     byte enabled = data[1];
-                    _parser.DataClassificationVersion = enabled == 0
+                    Capabilities.DataClassificationVersion = enabled == 0
                         ? TdsEnums.DATA_CLASSIFICATION_NOT_ENABLED
                         : supportedDataClassificationVersion;
 
@@ -1627,6 +1563,9 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
 
                         throw SQL.ParsingError();
                     }
+                    // The server can send and receive UTF8-encoded data if bit 0 of the
+                    // feature data is set.
+                    Capabilities.Utf8 = (data[0] & 0x01) == 0x01;
                     break;
                 }
                 case TdsEnums.FEATUREEXT_SQLDNSCACHING:
@@ -1648,7 +1587,7 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
 
                     if (data[0] == 1)
                     {
-                        IsSQLDNSCachingSupported = true;
+                        Capabilities.DnsCaching = true;
                         _cleanSQLDNSCaching = false;
 
                         if (RoutingInfo != null)
@@ -1659,7 +1598,7 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                     else
                     {
                         // we receive the IsSupported whose value is 0
-                        IsSQLDNSCachingSupported = false;
+                        Capabilities.DnsCaching = false;
                         _cleanSQLDNSCaching = true;
                     }
 
@@ -1697,7 +1636,7 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                         throw SQL.ParsingError();
                     }
 
-                    IsJsonSupportEnabled = true;
+                    Capabilities.JsonType = true;
                     break;
                 }
                 case TdsEnums.FEATUREEXT_VECTORSUPPORT:
@@ -1729,7 +1668,7 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                         throw SQL.ParsingError();
                     }
 
-                    IsVectorSupportEnabled = true;
+                    Capabilities.Float32VectorType = true;
 
                     break;
                 }
@@ -1746,7 +1685,7 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                     }
 
                     // A value of 1 indicates that the server supports the feature.
-                    IsEnhancedRoutingSupportEnabled = data[0] == 1;
+                    Capabilities.EnhancedRouting = data[0] == 1;
 
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
                         $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
@@ -1946,12 +1885,11 @@ internal void OnFedAuthInfo(SqlFedAuthInfo fedAuthInfo)
             _parser.SendFedAuthToken(_fedAuthToken);
         }
 
-        internal void OnLoginAck(SqlLoginAck rec)
+        internal void OnLoginAck()
         {
-            _loginAck = rec;
             if (_recoverySessionData != null)
             {
-                if (_recoverySessionData._tdsVersion != rec.tdsVersion)
+                if (_recoverySessionData._tdsVersion != Capabilities.TdsVersion)
                 {
                     throw SQL.CR_TDSVersionNotPreserved(this);
                 }
@@ -1959,9 +1897,27 @@ internal void OnLoginAck(SqlLoginAck rec)
 
             if (_currentSessionData != null)
             {
-                _currentSessionData._tdsVersion = rec.tdsVersion;
+                _currentSessionData._tdsVersion = Capabilities.TdsVersion;
             }
         }
+        
+        /// <summary>
+        /// Selects the <see cref="TimeoutTimer"/> that governs the login phase based on
+        /// <see cref="LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait"/>.
+        /// </summary>
+        /// <remarks>
+        /// When the switch is enabled the caller-supplied <paramref name="callerTimeout"/>
+        /// is returned as-is so any time already consumed (e.g., waiting for the pool) counts
+        /// against the overall ConnectTimeout. When disabled, a fresh timer is started from
+        /// <paramref name="connectTimeoutSeconds"/>, preserving legacy behavior. Extracted so
+        /// this branch can be unit-tested without standing up a real connection.
+        /// </remarks>
+        internal static TimeoutTimer ResolveLoginTimeout(TimeoutTimer callerTimeout, int connectTimeoutSeconds)
+        {
+            return LocalAppContextSwitches.UseOverallConnectTimeoutForPoolWait
+                ? callerTimeout
+                : TimeoutTimer.StartNew(TimeSpan.FromSeconds(connectTimeoutSeconds));
+        }
 
         internal override bool TryReplaceConnection(
             DbConnection outerConnection,
@@ -3844,7 +3800,7 @@ private void OpenLoginEnlist(
                         timeout);
                 }
 
-                if (!IsAzureSqlConnection)
+                if (!Capabilities.IsAzureSql)
                 {
                     // If not a connection to Azure SQL, Readonly with FailoverPartner is not supported
                     if (ConnectionOptions.ApplicationIntent == ApplicationIntent.ReadOnly)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index 889a9c014c..3aa89f5332 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -753,8 +753,8 @@ private static SqlMetaDataFactory CreateMetaDataFactory(DbConnectionInternal int
 
             Stream xmlStream = Assembly.GetExecutingAssembly().GetManifestResourceStream("Microsoft.Data.SqlClient.SqlMetaData.xml");
             Debug.Assert(xmlStream is not null, $"{nameof(xmlStream)} may not be null.");
-            
-            return new SqlMetaDataFactory(xmlStream, internalConnection.ServerVersion);
+
+            return new SqlMetaDataFactory(xmlStream, internalConnection.Capabilities);
         }
         
         private Task<DbConnectionInternal> CreateReplaceConnectionContinuation(
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index 14c8a51b4f..6a0dc09765 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -607,7 +607,7 @@ internal DataTable BuildSchemaTable()
 
                     if (col.type == SqlDbType.Udt)
                     { // Additional metadata for UDTs.
-                        Debug.Assert(Connection.Is2008OrNewer, "Invalid Column type received from the server");
+                        Debug.Assert(Connection.Parser.Capabilities.UserDefinedTypes, "Invalid Column type received from the server");
                         schemaRow[udtAssemblyQualifiedName] = col.udt?.AssemblyQualifiedName;
                     }
                     else if (col.type == SqlDbType.Xml)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
index 841c71d410..bea2fa7e41 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
@@ -40,12 +40,13 @@ internal sealed partial class SqlMetaDataFactory : IDisposable
         private readonly DataSet _collectionDataSet;
         private readonly string _serverVersion;
 
-        public SqlMetaDataFactory(Stream xmlStream, string serverVersion)
+        public SqlMetaDataFactory(Stream xmlStream, ConnectionCapabilities connectionCapabilities)
         {
             ADP.CheckArgumentNull(xmlStream, nameof(xmlStream));
-            ADP.CheckArgumentNull(serverVersion, nameof(serverVersion));
+            ADP.CheckArgumentNull(connectionCapabilities, nameof(connectionCapabilities));
+            ADP.CheckArgumentNull(connectionCapabilities.ServerVersion, nameof(connectionCapabilities.ServerVersion));
 
-            _serverVersion = serverVersion;
+            _serverVersion = connectionCapabilities.ServerVersion;
 
             _collectionDataSet = LoadDataSetFromXml(xmlStream);
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
index 46f447d582..2590c28690 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs
@@ -301,56 +301,13 @@ public enum ActiveDirectoryWorkflow : byte
         public const int TEXT_TIME_STAMP_LEN = 8;
         public const int COLLATION_INFO_LEN = 4;
 
-        /*
-                public const byte INT4_LSB_HI   = 0;     // lsb is low byte (e.g. 68000)
-                //    public const byte INT4_LSB_LO   = 1;     // lsb is low byte (e.g. VAX)
-                public const byte INT2_LSB_HI   = 2;     // lsb is low byte (e.g. 68000)
-                //    public const byte INT2_LSB_LO   = 3;     // lsb is low byte (e.g. VAX)
-                public const byte FLT_IEEE_HI   = 4;     // lsb is low byte (e.g. 68000)
-                public const byte CHAR_ASCII    = 6;     // ASCII character set
-                public const byte TWO_I4_LSB_HI = 8;     // lsb is low byte (e.g. 68000
-                //    public const byte TWO_I4_LSB_LO = 9;     // lsb is low byte (e.g. VAX)
-                //    public const byte FLT_IEEE_LO   = 10;    // lsb is low byte (e.g. MSDOS)
-                public const byte FLT4_IEEE_HI  = 12;    // IEEE 4-byte floating point -lsb is high byte
-                //    public const byte FLT4_IEEE_LO  = 13;    // IEEE 4-byte floating point -lsb is low byte
-                public const byte TWO_I2_LSB_HI = 16;    // lsb is high byte
-                //    public const byte TWO_I2_LSB_LO = 17;    // lsb is low byte
-
-                public const byte LDEFSQL     = 0;    // server sends its default
-                public const byte LDEFUSER    = 0;    // regular old user
-                public const byte LINTEGRATED = 8;    // integrated security login
-        */
-
-        /* Versioning scheme table:
-
-            Client sends:
-            0x70000000 -> 7.0
-            0x72xx0002 -> 2005 RTM
-
-            Server responds:
-            0x72xx0002 -> 2005 RTM
-        */
-
-        // Majors:
-        // the high-byte is sufficient to distinguish later versions
-        public const int SQL2005_MAJOR = 0x72;
-        public const int SQL2008_MAJOR = 0x73;
-        public const int SQL2012_MAJOR = 0x74;
-        public const int TDS8_MAJOR = 0x08;          // TDS8 version to be used at login7
+        // Versions to be used on login for SQL Server 2005, SQL Server 2008 R2, TDS 7.x and TDS 8.0
+        public const uint SQL2005_VERSION = 0x72_09_0002;
+        public const uint SQL2008_VERSION = 0x73_0B_0003;
+        public const uint TDS7X_VERSION = 0x74_00_0004;
+        public const uint TDS80_VERSION = 0x08_00_0000;
         public const string TDS8_Protocol = "tds/8.0"; //TDS8
 
-        // Increments:
-        public const int SQL2005_INCREMENT = 0x09;
-        public const int SQL2008_INCREMENT = 0x0b;
-        public const int SQL2012_INCREMENT = 0x00;
-        public const int TDS8_INCREMENT = 0x00;
-
-        // Minors:
-        public const int SQL2005_RTM_MINOR = 0x0002;
-        public const int SQL2008_MINOR = 0x0003;
-        public const int SQL2012_MINOR = 0x0004;
-        public const int TDS8_MINOR = 0x00;
-
         public const int ORDER_68000 = 1;
         public const int USE_DB_ON = 1;
         public const int INIT_DB_FATAL = 1;
@@ -706,8 +663,10 @@ internal enum FedAuthInfoId : byte
         internal const int VECTOR_HEADER_SIZE = 8;
 
         // TCE Related constants
+        internal const byte TCE_NOT_ENABLED = 0x00;
         internal const byte MAX_SUPPORTED_TCE_VERSION = 0x03; // max version
         internal const byte MIN_TCE_VERSION_WITH_ENCLAVE_SUPPORT = 0x02; // min version with enclave support
+        internal const byte MIN_TCE_VERSION_WITH_ENCLAVE_RETRY_SUPPORT = 0x03;
         internal const ushort MAX_TCE_CIPHERINFO_SIZE = 2048; // max size of cipherinfo blob
         internal const long MAX_TCE_CIPHERTEXT_SIZE = 2147483648; // max size of encrypted blob- currently 2GB.
         internal const byte CustomCipherAlgorithmId = 0; // Id used for custom encryption algorithm.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 8a00c41743..1a42894779 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -117,14 +117,6 @@ internal sealed partial class TdsParser
 
         internal TdsParserSessionPool _sessionPool = null;  // initialized only when we're a MARS parser.
 
-        // Version variables
-
-        private bool _is2008 = false;
-
-        private bool _is2012 = false;
-
-        private bool _is2022 = false;
-
         // SqlStatistics
         private SqlStatistics _statistics = null;
 
@@ -165,25 +157,30 @@ internal sealed partial class TdsParser
         private static XmlWriterSettings SyncXmlWriterSettings =>
             s_syncXmlWriterSettings ??= new() { CloseOutput = false, ConformanceLevel = ConformanceLevel.Fragment };
 
+        // Capability records
+        internal ConnectionCapabilities Capabilities { get; }
+
         /// <summary>
         /// Get or set if column encryption is supported by the server.
         /// </summary>
-        internal bool IsColumnEncryptionSupported { get; set; } = false;
+        internal bool IsColumnEncryptionSupported =>
+            TceVersionSupported != TdsEnums.TCE_NOT_ENABLED;
 
         /// <summary>
         /// TCE version supported by the server
         /// </summary>
-        internal byte TceVersionSupported { get; set; }
+        internal byte TceVersionSupported => Capabilities.ColumnEncryptionVersion;
 
         /// <summary>
         /// Server supports retrying when the enclave CEKs sent by the client do not match what is needed for the query to run.
         /// </summary>
-        internal bool AreEnclaveRetriesSupported { get; set; }
+        internal bool AreEnclaveRetriesSupported =>
+            TceVersionSupported >= TdsEnums.MIN_TCE_VERSION_WITH_ENCLAVE_RETRY_SUPPORT;
 
         /// <summary>
         /// Type of enclave being used by the server
         /// </summary>
-        internal string EnclaveType { get; set; }
+        internal string EnclaveType => Capabilities.ColumnEncryptionEnclaveType;
 
         internal bool isTcpProtocol { get; set; }
         internal string FQDNforDNSCache { get; set; }
@@ -197,7 +194,7 @@ internal sealed partial class TdsParser
         /// <summary>
         /// Get or set data classification version.  A value of 0 means that sensitivity classification is not enabled.
         /// </summary>
-        internal int DataClassificationVersion { get; set; }
+        internal int DataClassificationVersion => Capabilities.DataClassificationVersion;
 
         private SqlCollation _cachedCollation;
 
@@ -216,8 +213,9 @@ internal TdsParser(bool MARS, bool fAsynchronous)
         {
             _fMARS = MARS; // may change during Connect to pre 2005 servers
 
+            Capabilities = new();
+
             _physicalStateObj = TdsParserStateObjectFactory.Singleton.CreateTdsParserStateObject(this);
-            DataClassificationVersion = TdsEnums.DATA_CLASSIFICATION_NOT_ENABLED;
         }
 
         internal SqlConnectionInternal Connection
@@ -273,13 +271,7 @@ internal EncryptionOptions EncryptionOptions
             }
         }
 
-        internal bool Is2008OrNewer
-        {
-            get
-            {
-                return _is2008;
-            }
-        }
+        internal bool Is2008OrNewer => Capabilities.Is2008R2OrNewer;
 
         internal bool MARSOn
         {
@@ -334,13 +326,7 @@ internal SqlStatistics Statistics
             }
         }
 
-        private bool IncludeTraceHeader
-        {
-            get
-            {
-                return (_is2012 && SqlClientEventSource.Log.IsEnabled());
-            }
-        }
+        private bool IncludeTraceHeader => Capabilities.TraceHeader && SqlClientEventSource.Log.IsEnabled();
 
         internal int IncrementNonTransactedOpenResultCount()
         {
@@ -402,8 +388,8 @@ bool withFailover
             _connHandler = connHandler;
             _loginWithFailover = withFailover;
 
-            // Clean up IsSQLDNSCachingSupported flag from previous status
-            _connHandler.IsSQLDNSCachingSupported = false;
+            // Clean up all server capabilities from previous status.
+            Capabilities.Reset();
 
             uint sniStatus = TdsParserStateObjectFactory.Singleton.SNIStatus;
 
@@ -2764,14 +2750,13 @@ internal TdsOperationStatus TryRun(RunBehavior runBehavior, SqlCommand cmdHandle
                     case TdsEnums.SQLLOGINACK:
                         {
                             SqlClientEventSource.Log.TryTraceEvent("<sc.TdsParser.TryRun|SEC> Received login acknowledgement token");
-                            SqlLoginAck ack;
-                            result = TryProcessLoginAck(stateObj, out ack);
+                            result = TryProcessLoginAck(stateObj);
                             if (result != TdsOperationStatus.Done)
                             {
                                 return result;
                             }
 
-                            _connHandler.OnLoginAck(ack);
+                            _connHandler.OnLoginAck();
                             break;
                         }
                     case TdsEnums.SQLFEATUREEXTACK:
@@ -3870,7 +3855,7 @@ private TdsOperationStatus TryProcessFeatureExtAck(TdsParserStateObject stateObj
                 ret = SQLFallbackDNSCache.Instance.DeleteDNSInfo(FQDNforDNSCache);
             }
 
-            if (_connHandler.IsSQLDNSCachingSupported && _connHandler.pendingSQLDNSObject != null
+            if (Capabilities.DnsCaching && _connHandler.pendingSQLDNSObject != null
                     && !SQLFallbackDNSCache.Instance.IsDuplicate(_connHandler.pendingSQLDNSObject))
             {
                 ret = SQLFallbackDNSCache.Instance.AddDNSInfo(_connHandler.pendingSQLDNSObject);
@@ -4310,12 +4295,8 @@ private TdsOperationStatus TryProcessSessionState(TdsParserStateObject stateObj,
             return TdsOperationStatus.Done;
         }
 
-        private TdsOperationStatus TryProcessLoginAck(TdsParserStateObject stateObj, out SqlLoginAck sqlLoginAck)
+        private TdsOperationStatus TryProcessLoginAck(TdsParserStateObject stateObj)
         {
-            SqlLoginAck a = new SqlLoginAck();
-
-            sqlLoginAck = null;
-
             // read past interface type and version
             TdsOperationStatus result = stateObj.TrySkipBytes(1);
             if (result != TdsOperationStatus.Done)
@@ -4329,47 +4310,17 @@ private TdsOperationStatus TryProcessLoginAck(TdsParserStateObject stateObj, out
             {
                 return result;
             }
-            a.tdsVersion = (uint)((((((b[0] << 8) | b[1]) << 8) | b[2]) << 8) | b[3]); // bytes are in motorola order (high byte first)
-            uint majorMinor = a.tdsVersion & 0xff00ffff;
-            uint increment = (a.tdsVersion >> 16) & 0xff;
+            // When connecting to SQL Server 2000, the TDS version sent
+            // by the client would be a completely different value to the
+            // TDS version received by the server.
+            // From SQL Server 2000 SP1, the TDS version is identical. As
+            // an artifact of this historical difference, the client sends
+            // its TDS version to the server in a little-endian layout, and
+            // receives the server's TDS version in a big-endian layout.
+            // Reference: MS-TDS, 2.2.7.14, footnote on TDSVersion field.
+            uint tdsVersion = BinaryPrimitives.ReadUInt32BigEndian(b);
 
-            // Server responds:
-            // 0x72xx0002 -> 2005 RTM
-            // information provided by S. Ashwin
-            switch (majorMinor)
-            {
-                case TdsEnums.SQL2005_MAJOR << 24 | TdsEnums.SQL2005_RTM_MINOR:     // 2005
-                    if (increment != TdsEnums.SQL2005_INCREMENT)
-                    {
-                        throw SQL.InvalidTDSVersion();
-                    }
-                    break;
-                case TdsEnums.SQL2008_MAJOR << 24 | TdsEnums.SQL2008_MINOR:
-                    if (increment != TdsEnums.SQL2008_INCREMENT)
-                    {
-                        throw SQL.InvalidTDSVersion();
-                    }
-                    _is2008 = true;
-                    break;
-                case TdsEnums.SQL2012_MAJOR << 24 | TdsEnums.SQL2012_MINOR:
-                    if (increment != TdsEnums.SQL2012_INCREMENT)
-                    {
-                        throw SQL.InvalidTDSVersion();
-                    }
-                    _is2012 = true;
-                    break;
-                case TdsEnums.TDS8_MAJOR << 24 | TdsEnums.TDS8_MINOR:
-                    if (increment != TdsEnums.TDS8_INCREMENT)
-                    {
-                        throw SQL.InvalidTDSVersion();
-                    }
-                    _is2022 = true;
-                    break;
-                default:
-                    throw SQL.InvalidTDSVersion();
-            }
-            _is2012 |= _is2022;
-            _is2008 |= _is2012;
+            ADP.ValidateTdsVersion(tdsVersion);
 
             stateObj._outBytesUsed = stateObj._outputHeaderLen;
             byte len;
@@ -4384,29 +4335,33 @@ private TdsOperationStatus TryProcessLoginAck(TdsParserStateObject stateObj, out
             {
                 return result;
             }
-            result = stateObj.TryReadByte(out a.majorVersion);
+            result = stateObj.TryReadByte(out byte majorVersion);
             if (result != TdsOperationStatus.Done)
             {
                 return result;
             }
-            result = stateObj.TryReadByte(out a.minorVersion);
+            result = stateObj.TryReadByte(out byte minorVersion);
             if (result != TdsOperationStatus.Done)
             {
                 return result;
             }
-            byte buildNumHi, buildNumLo;
-            result = stateObj.TryReadByte(out buildNumHi);
+            result = stateObj.TryReadByte(out byte buildNumHi);
             if (result != TdsOperationStatus.Done)
             {
                 return result;
             }
-            result = stateObj.TryReadByte(out buildNumLo);
+            result = stateObj.TryReadByte(out byte buildNumLo);
             if (result != TdsOperationStatus.Done)
             {
                 return result;
             }
 
-            a.buildNum = (short)((buildNumHi << 8) + buildNumLo);
+            ushort buildNumber = (ushort)((buildNumHi << 8) | buildNumLo);
+
+            Capabilities.ServerMajorVersion = majorVersion;
+            Capabilities.ServerMinorVersion = minorVersion;
+            Capabilities.ServerBuildNumber = buildNumber;
+            Capabilities.TdsVersion = tdsVersion;
 
             Debug.Assert(_state == TdsParserState.OpenNotLoggedIn, "ProcessLoginAck called with state not TdsParserState.OpenNotLoggedIn");
             _state = TdsParserState.OpenLoggedIn;
@@ -4426,7 +4381,6 @@ private TdsOperationStatus TryProcessLoginAck(TdsParserStateObject stateObj, out
                 ThrowExceptionAndWarning(stateObj);
             }
 
-            sqlLoginAck = a;
             return TdsOperationStatus.Done;
         }
 
@@ -9317,11 +9271,11 @@ private void WriteLoginData(SqlLogin rec,
                 {
                     if (encrypt == SqlConnectionEncryptOption.Strict)
                     {
-                        WriteInt((TdsEnums.TDS8_MAJOR << 24) | (TdsEnums.TDS8_INCREMENT << 16) | TdsEnums.TDS8_MINOR, _physicalStateObj);
+                        WriteUnsignedInt(TdsEnums.TDS80_VERSION, _physicalStateObj);
                     }
                     else
                     {
-                        WriteInt((TdsEnums.SQL2012_MAJOR << 24) | (TdsEnums.SQL2012_INCREMENT << 16) | TdsEnums.SQL2012_MINOR, _physicalStateObj);
+                        WriteUnsignedInt(TdsEnums.TDS7X_VERSION, _physicalStateObj);
                     }
                 }
                 else
@@ -10265,7 +10219,7 @@ internal Task TdsExecuteRPC(SqlCommand cmd, IList<_SqlRPC> rpcArray, int timeout
                                 continue;
                             }
 
-                            if (!_is2008 && !mt.Is90Supported)
+                            if (!Is2008OrNewer && !mt.Is90Supported)
                             {
                                 throw ADP.VersionDoesNotSupportDataType(mt.TypeName);
                             }
@@ -10644,7 +10598,7 @@ private Task TDSExecuteRPCAddParameter(TdsParserStateObject stateObj, SqlParamet
                 }
                 else if (mt.SqlDbType == SqlDbType.Udt)
                 {
-                    int maxSupportedSize = Is2008OrNewer ? int.MaxValue : short.MaxValue;
+                    int maxSupportedSize = Capabilities.LargeUserDefinedTypes ? int.MaxValue : short.MaxValue;
                     byte[] udtVal = null;
 
                     if (string.IsNullOrEmpty(param.UdtTypeName))
@@ -11019,7 +10973,7 @@ private void WriteSmiParameter(SqlParameter param, int paramIndex, bool sendDefa
             ParameterPeekAheadValue peekAhead;
             SmiParameterMetaData metaData = param.MetaDataForSmi(out peekAhead);
 
-            if (!_is2008)
+            if (!Is2008OrNewer)
             {
                 MetaType mt = MetaType.GetMetaTypeFromSqlDbType(metaData.SqlDbType, metaData.IsMultiValued);
                 throw ADP.VersionDoesNotSupportDataType(mt.TypeName);
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs
index 4445905533..6bcc3f2d41 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs
@@ -126,14 +126,6 @@ internal sealed class SqlLogin
         internal SecureString newSecurePassword;
     }
 
-    internal sealed class SqlLoginAck
-    {
-        internal byte majorVersion;
-        internal byte minorVersion;
-        internal short buildNum;
-        internal uint tdsVersion;
-    }
-
     #nullable enable
 
     internal sealed class SqlFedAuthInfo
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index b79baefbd5..914e63019a 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -1193,6 +1193,8 @@ internal class StubDbConnectionInternal : DbConnectionInternal
             #region Not Implemented Members
             public override string ServerVersion => throw new NotImplementedException();
 
+            public override ConnectionCapabilities Capabilities => throw new NotImplementedException();
+
             public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
             {
                 throw new NotImplementedException();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs
index c4f437d981..28e59e7a5d 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -24,6 +24,8 @@ public MockDbConnectionInternal() : base(ConnectionState.Open, true, false) { }
 
             public override string ServerVersion => "Mock Server 1.0";
 
+            public override ConnectionCapabilities Capabilities => new();
+
             public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
             {
                 throw new NotImplementedException();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs
index faa4073a7d..dacc266753 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/IdleConnectionChannelTest.cs
@@ -8,6 +8,7 @@
 using System.Threading.Channels;
 using System.Threading.Tasks;
 using System.Transactions;
+using Microsoft.Data.Common;
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.ConnectionPool;
 using Xunit;
@@ -316,6 +317,8 @@ private class StubDbConnectionInternal : DbConnectionInternal
         {
             public override string ServerVersion => throw new NotImplementedException();
 
+            public override ConnectionCapabilities Capabilities => throw new NotImplementedException();
+
             public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
                 => throw new NotImplementedException();
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
index a29abd6bbb..588418ac03 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
@@ -713,6 +713,8 @@ internal class MockDbConnectionInternal : DbConnectionInternal
 
         public override string ServerVersion => "Mock";
 
+        public override ConnectionCapabilities Capabilities => new();
+
         public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
         {
             throw new NotImplementedException();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
index 88af13922b..712708375a 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
@@ -919,6 +919,8 @@ internal class MockDbConnectionInternal : DbConnectionInternal
 
         public override string ServerVersion => "Mock";
 
+        public override ConnectionCapabilities Capabilities => new();
+
         public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
         {
             throw new NotImplementedException();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Common/AdapterUtilTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Common/AdapterUtilTest.cs
new file mode 100644
index 0000000000..9fac3cd339
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Common/AdapterUtilTest.cs
@@ -0,0 +1,156 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.Data.SqlClient;
+using Xunit;
+
+namespace Microsoft.Data.Common.UnitTests;
+
+/// <summary>
+/// Class containing tests of the various utility methods in <see cref="ADP"/>.
+/// </summary>
+public class AdapterUtilTest
+{
+    /// <summary>
+    /// Gets a collection of test data representing the list of server TDS versions
+    /// which are expected by the client.
+    /// </summary>
+    /// <see cref="ValidTdsVersion_ReturnsSuccessfully"/>
+    public static TheoryData<uint> ValidTdsVersions => [
+        // SQL Server 2005
+        TdsEnums.SQL2005_VERSION,
+        // SQL Server 2008 R2
+        TdsEnums.SQL2008_VERSION,
+        // SQL Server 2012+ (TDS 7.x)
+        TdsEnums.TDS7X_VERSION,
+        // SQL Server 2022+ (TDS 8.0)
+        TdsEnums.TDS80_VERSION
+        ];
+
+    /// <summary>
+    /// Gets a collection of test data representing the list of known server TDS versions
+    /// which the client does not expect to receive and should reject.
+    /// </summary>
+    /// <see cref="InvalidTdsVersion_ThrowsInvalidOperationException"/>
+    public static TheoryData<uint> InvalidTdsVersions => [
+        // Empty TDS version
+        0x00000000,
+        // SQL Server 7.0
+        0x07000000,
+        // SQL Server 2000
+        0x07010000,
+        // SQL Server 2000 SP1
+        0x71000001,
+        // SQL Server 2008
+        0x730A0003
+        ];
+
+    /// <summary>
+    /// Combines the test data sets in <see cref="ValidTdsVersions"/> and <see cref="InvalidTdsVersions"/>.
+    /// </summary>
+    /// <see cref="TdsVersionValidation_AlignsWithLegacyValidation"/>
+    public static TheoryData<uint> AllTdsVersions => [.. ValidTdsVersions, .. InvalidTdsVersions];
+
+    /// <summary>
+    /// Verifies that the client throws an InvalidOperationException in response to receiving an
+    /// unsupported TDS protocol version.
+    /// </summary>
+    /// <param name="tdsVersion">
+    /// The TDS protocol version to validate. Represents an unsupported or invalid version value.
+    /// </param>
+    [Theory]
+    [MemberData(nameof(InvalidTdsVersions))]
+    public void InvalidTdsVersion_ThrowsInvalidOperationException(uint tdsVersion)
+    {
+        Assert.Throws<InvalidOperationException>(() => ADP.ValidateTdsVersion(tdsVersion));
+    }
+
+    /// <summary>
+    /// Verifies that the client accepts one of the supported TDS protocol versions without throwing
+    /// an exception.
+    /// </summary>
+    /// <param name="tdsVersion">
+    /// The TDS protocol version to validate. Represents a supported version value.
+    /// </param>
+    [Theory]
+    [MemberData(nameof(ValidTdsVersions))]
+    public void ValidTdsVersion_ReturnsSuccessfully(uint tdsVersion) =>
+        ADP.ValidateTdsVersion(tdsVersion);
+
+    /// <summary>
+    /// Verifies that the SqlClient v7.1+ TDS version validation logic implemented in ADP.ValidateTdsVersion
+    /// is consistent with the legacy validation logic.
+    /// </summary>
+    /// <param name="tdsVersion">
+    /// The TDS protocol version to validate. Represents a version value to be checked against the legacy
+    /// validation logic.
+    /// </param>
+    [Theory]
+    [MemberData(nameof(AllTdsVersions))]
+    public void TdsVersionValidation_AlignsWithLegacyValidation(uint tdsVersion)
+    {
+        Action validation = () => ADP.ValidateTdsVersion(tdsVersion);
+
+        if (LegacyVersionValidation(tdsVersion))
+        {
+            validation();
+        }
+        else
+        {
+            Assert.Throws<InvalidOperationException>(validation);
+        }
+    }
+
+    private static bool LegacyVersionValidation(uint tdsVersion)
+    {
+        const int SQL2005_MAJOR = 0x72;
+        const int SQL2008_MAJOR = 0x73;
+        const int SQL2012_MAJOR = 0x74;
+        const int TDS8_MAJOR = 0x08;
+
+        const int SQL2005_INCREMENT = 0x09;
+        const int SQL2008_INCREMENT = 0x0b;
+        const int SQL2012_INCREMENT = 0x00;
+        const int TDS8_INCREMENT = 0x00;
+
+        const int SQL2005_RTM_MINOR = 0x0002;
+        const int SQL2008_MINOR = 0x0003;
+        const int SQL2012_MINOR = 0x0004;
+        const int TDS8_MINOR = 0x00;
+
+        uint majorMinor = tdsVersion & 0xff00ffff;
+        uint increment = (tdsVersion >> 16) & 0xff;
+
+        switch (majorMinor)
+        {
+            case SQL2005_MAJOR << 24 | SQL2005_RTM_MINOR:
+                if (increment != SQL2005_INCREMENT)
+                {
+                    return false;
+                }
+                return true;
+            case SQL2008_MAJOR << 24 | SQL2008_MINOR:
+                if (increment != SQL2008_INCREMENT)
+                {
+                    return false;
+                }
+                return true;
+            case SQL2012_MAJOR << 24 | SQL2012_MINOR:
+                if (increment != SQL2012_INCREMENT)
+                {
+                    return false;
+                }
+                return true;
+            case TDS8_MAJOR << 24 | TDS8_MINOR:
+                if (increment != TDS8_INCREMENT)
+                {
+                    return false;
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+}

From 73b9a96ffebbffa33f1b60d36b2a9f6bbfae2433 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Mon, 13 Jul 2026 16:12:10 -0700
Subject: [PATCH 184/298] Extract pool blocking-period error state into
 BlockingPeriodErrorState (#4395)

* Extract pool blocking-period error state into BlockingPeriodErrorState

Move the connection pool's blocking-period (error backoff) logic out of WaitHandleDbConnectionPool into a reusable, testable BlockingPeriodErrorState class with exponential backoff (5s..60s), cached-exception fast-fail, and an injectable TimeProvider for deterministic tests. Add DbConnectionPoolGroup.IsBlockingPeriodEnabled() and the ADP.UnsafeCreateTimer(TimeProvider,...) overload it depends on. Includes BlockingPeriodErrorStateTest.

* Add comments

* Improve locking

* First round of review changes.

* Require exhaustive switch statements.

* Add wait handle pool unit tests for blocking period.

* Remove rule.

* Improve tests. Add TODOs.

* Update test names and xml.

* Add documentation about callback idempotency.

* Fix xml docs

* Add default switch case.

* Swallow errors. Fix disposal.

* Fix test conflicts

* Simplify enter/exit API.

* Restore original behavior.

* Revert editorconfig changes.
---
 .editorconfig                                 |   2 +-
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |  40 +-
 .../BlockingPeriodErrorState.cs               | 269 ++++++++
 .../ConnectionPool/DbConnectionPoolGroup.cs   |  15 +
 .../ConnectionPool/IDbConnectionPool.cs       |   1 +
 .../WaitHandleDbConnectionPool.cs             | 160 ++---
 .../BlockingPeriodErrorStateTest.cs           | 634 ++++++++++++++++++
 ...andleDbConnectionPoolBlockingPeriodTest.cs | 403 +++++++++++
 .../WaitHandleDbConnectionPoolShutdownTest.cs |  24 -
 9 files changed, 1400 insertions(+), 148 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/BlockingPeriodErrorState.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/BlockingPeriodErrorStateTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs

diff --git a/.editorconfig b/.editorconfig
index 819a41fe1e..1864df162c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -197,4 +197,4 @@ dotnet_diagnostic.CA1416.severity = silent
 
 dotnet_code_quality.CA2100.excluded_type_names_with_derived_types = Microsoft.Data.SqlClient.ManualTesting.Tests.*
 dotnet_diagnostic.xUnit1031.severity=none
-dotnet_diagnostic.xUnit1030.severity=none
+dotnet_diagnostic.xUnit1030.severity=none
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index 6f1e31f47f..22aa0360ec 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -133,9 +133,10 @@ internal static Exception ExceptionWithStackTrace(Exception e)
             }
         }
 
+#nullable enable
         internal static Timer UnsafeCreateTimer(
             TimerCallback callback,
-            object state,
+            object? state,
             int dueTimeMilliseconds,
             int periodMilliseconds) =>
             UnsafeCreateTimer(
@@ -144,7 +145,7 @@ internal static Timer UnsafeCreateTimer(
                 TimeSpan.FromMilliseconds(dueTimeMilliseconds),
                 TimeSpan.FromMilliseconds(periodMilliseconds));
 
-        internal static Timer UnsafeCreateTimer(TimerCallback callback, object state, TimeSpan dueTime, TimeSpan period)
+        internal static Timer UnsafeCreateTimer(TimerCallback callback, object? state, TimeSpan dueTime, TimeSpan period)
         {
             // Don't capture the current ExecutionContext and its AsyncLocals onto
             // a global timer causing them to live forever
@@ -159,6 +160,41 @@ internal static Timer UnsafeCreateTimer(TimerCallback callback, object state, Ti
             }
         }
 
+        /// <summary>
+        /// Creates an <see cref="ITimer"/> using the supplied <see cref="TimeProvider"/> without
+        /// capturing the current <see cref="ExecutionContext"/>. This overload accepts a strongly
+        /// typed <see cref="Action{T}"/> callback that receives the supplied <paramref name="state"/>
+        /// when the timer fires.
+        /// </summary>
+        /// <typeparam name="T">The type of the state passed to the callback.</typeparam>
+        /// <param name="timeProvider">The time provider used to create the timer.</param>
+        /// <param name="callback">The delegate invoked with <paramref name="state"/> when the timer fires.</param>
+        /// <param name="state">The state object passed to <paramref name="callback"/> on each invocation.</param>
+        /// <param name="dueTime">The amount of time to wait before the first invocation, or
+        /// <see cref="Timeout.InfiniteTimeSpan"/> to create the timer disarmed.</param>
+        /// <param name="period">The interval between invocations, or
+        /// <see cref="Timeout.InfiniteTimeSpan"/> to disable periodic signaling.</param>
+        /// <returns>An <see cref="ITimer"/> created by <paramref name="timeProvider"/>.</returns>
+        internal static ITimer UnsafeCreateTimer<T>(
+            TimeProvider timeProvider,
+            Action<T> callback,
+            T state,
+            TimeSpan dueTime,
+            TimeSpan period)
+        {
+            if (ExecutionContext.IsFlowSuppressed())
+            {
+                return timeProvider.CreateTimer(s => callback((T)s!), state, dueTime, period);
+            }
+
+            using (ExecutionContext.SuppressFlow())
+            {
+                return timeProvider.CreateTimer(s => callback((T)s!), state, dueTime, period);
+            }
+        }
+
+
+#nullable restore
 
 #region COM+ exceptions
         internal static ArgumentException Argument(string error)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/BlockingPeriodErrorState.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/BlockingPeriodErrorState.cs
new file mode 100644
index 0000000000..796f0e16dd
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/BlockingPeriodErrorState.cs
@@ -0,0 +1,269 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using Microsoft.Data.Common;
+using Microsoft.Data.SqlClient.Internal;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.ConnectionPool
+{
+    /// <summary>
+    /// Encapsulates a connection pool's blocking-period error state: cached exception, exponential
+    /// backoff timer, and synchronization. Kept as a separate class so the pool's
+    /// connection-acquisition path remains focused on capacity/queue concerns and stays
+    /// decoupled from the (independent) rate limiting policy.
+    /// </summary>
+    internal sealed class BlockingPeriodErrorState : IDisposable
+    {
+        // Backoff interval used the first time the pool enters the blocking period, and the
+        // value the backoff resets to on a successful create or Clear().
+        private static readonly TimeSpan InitialWait = TimeSpan.FromSeconds(5);
+
+        // Upper bound the exponential backoff is capped at; further failures never wait longer.
+        private static readonly TimeSpan MaxWait = TimeSpan.FromSeconds(60);
+
+        // Identifier of the owning pool, included in trace events for diagnostics.
+        private readonly int _ownerPoolId;
+
+        // Optional error wait handle owned by the pool. Set() (under _lock) when the state
+        // enters the blocking period and Reset() (under _lock) when it leaves via the exit
+        // timer or Clear(). Set/Reset are inherently idempotent, so the repeated signalling
+        // that occurs across consecutive Enter() calls or an exit-timer/Clear() overlap is
+        // harmless. This instance does NOT own the handle and must never dispose it. If null,
+        // no signalling occurs.
+        private readonly ManualResetEvent? _errorEvent;
+
+        // Time source used to create the exit timer; overridable so tests can drive scheduling
+        // deterministically. Defaults to TimeProvider.System.
+        private readonly TimeProvider _timeProvider;
+
+        // Guards the mutable error state (_cachedException, _exitTimer, _nextWait, _disposed).
+        private readonly object _lock = new();
+
+        // Non-null while the pool is in the blocking period. Doubles as the "has error"
+        // flag, so callers don't need a separate bool. Volatile so other threads observe
+        // entry/exit transitions without acquiring _lock.
+        private volatile Exception? _cachedException;
+
+        // True from the moment Enter() activates the blocking period until Clear()/Dispose()
+        // fully resets it. The exit timer clears _cachedException but leaves this set so a
+        // later Clear() still resets the backoff. Volatile so Clear() can take a
+        // lock-free path when there is nothing to do. This allows Clear() to be called on hot paths.
+        private volatile bool _inElevatedState;
+
+        // The armed exit timer that ends the current blocking period; null when no period is
+        // active. Replaced (and the old one disposed) each time Enter() is called.
+        private ITimer? _exitTimer;
+
+        // The backoff interval to use for the next Enter(); doubles per failure up to MaxWait
+        // and resets to InitialWait on a successful create or Clear().
+        private TimeSpan _nextWait = InitialWait;
+
+        /// <summary>
+        /// Creates a new instance.
+        /// </summary>
+        /// <param name="ownerPoolId">Identifier of the owning pool, used in trace events.</param>
+        /// <param name="errorEvent">Optional error wait handle owned by the pool. It is
+        /// <see cref="EventWaitHandle.Set"/> (while holding the internal lock) when the state
+        /// enters the blocking period and <see cref="EventWaitHandle.Reset"/> when it leaves via
+        /// the exit timer or <see cref="Clear"/>, so a thread parked in <c>WaitHandle.WaitAny</c>
+        /// over the pool's handles wakes immediately on entry/exit. This instance does not own the
+        /// handle and never disposes it; the caller is responsible for its lifetime. Pass
+        /// <see langword="null"/> (the default) to disable signalling.</param>
+        /// <param name="timeProvider">The time provider used to create the exit timer. Defaults to
+        /// <see cref="TimeProvider.System"/>. Inject a test double (e.g.
+        /// <c>Microsoft.Extensions.Time.Testing.FakeTimeProvider</c>) in unit tests to
+        /// control timer scheduling deterministically.</param>
+        internal BlockingPeriodErrorState(int ownerPoolId, ManualResetEvent? errorEvent = null, TimeProvider? timeProvider = null)
+        {
+            _ownerPoolId = ownerPoolId;
+            _errorEvent = errorEvent;
+            _timeProvider = timeProvider ?? TimeProvider.System;
+        }
+
+        /// <summary>
+        /// True while the pool is in the blocking period. Subsequent acquisition attempts
+        /// should fast-fail with the cached exception.
+        /// </summary>
+        internal bool HasError => _cachedException is not null;
+
+        /// <summary>
+        /// Throws the cached error if the pool is currently in the blocking period.
+        /// </summary>
+        internal void ThrowIfActive()
+        {
+            Exception? cached = _cachedException;
+            if (cached is null)
+            {
+                return;
+            }
+
+            // Clone SqlExceptions so stack traces are not shared across callers; other
+            // exception types are rethrown as-is.
+            // TODO: Can we create a new exception to wrap the cached exception?
+            throw cached is SqlException sqlEx ? sqlEx.InternalClone() : cached;
+        }
+
+        /// <summary>
+        /// Enters the blocking period, caching the supplied exception and scheduling a timer
+        /// to exit the period after the current backoff interval. Subsequent failures double
+        /// the backoff up to <see cref="MaxWait"/>.
+        /// </summary>
+        internal void Enter(Exception ex)
+        {
+            TimeSpan wait;
+            ITimer? oldTimer;
+
+            // If we call this, we're already in an exception path. Prefer correctness over performance.
+            lock (_lock)
+            {
+                _inElevatedState = true;
+                _cachedException = ex;
+                wait = _nextWait;
+
+                ITimer newTimer = ADP.UnsafeCreateTimer(
+                    _timeProvider,
+                    ExitCallback,
+                    this,
+                    wait,
+                    wait);
+                oldTimer = _exitTimer;
+                _exitTimer = newTimer;
+
+                // Bump the backoff for the next failure, capped at MaxWait. FR-008.
+                TimeSpan doubled = _nextWait + _nextWait;
+                _nextWait = doubled > MaxWait ? MaxWait : doubled;
+
+                // Signal the error wait handle while still holding the lock so the external signal
+                // order (Set/Reset) can never diverge from the internal state transitions under
+                // concurrent Enter/Clear/exit-timer activity. Set() is idempotent, so re-entering
+                // the blocking period on consecutive failures is harmless. The handle is owned by
+                // the pool, not this instance, so treat signalling as best-effort: it may be
+                // disposed out from under us during teardown, which would throw
+                // ObjectDisposedException. Swallow it so it cannot mask the original
+                // connection-creation exception.
+                try
+                {
+                    _errorEvent?.Set();
+                }
+                catch
+                {
+                    // Ignore: the pool-owned handle may have been disposed during teardown.
+                }
+            }
+
+            oldTimer?.Dispose();
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.EnterErrorState|RES|CPOOL> {0}, Entering blocking period for {1}ms.",
+                _ownerPoolId,
+                (int)wait.TotalMilliseconds);
+        }
+
+        /// <summary>
+        /// Clears the cached error state, disposes the exit timer, and resets the backoff to
+        /// its initial value.
+        /// </summary>
+        internal void Clear()
+        {
+            // Fast path: the create flow calls Clear() after every successful create, so avoid
+            // taking the lock in the common (no-error) case where there is nothing to reset.
+            if (!_inElevatedState)
+            {
+                return;
+            }
+
+            ITimer? oldTimer;
+
+            lock (_lock)
+            {
+                _cachedException = null;
+                _nextWait = InitialWait;
+                _inElevatedState = false;
+                oldTimer = _exitTimer;
+                _exitTimer = null;
+
+                // Reset the error wait handle under the lock so the exit signal is ordered
+                // consistently with the state transition relative to concurrent Enter/exit-timer
+                // callbacks. Reset() is idempotent, so an overlapping exit-timer/Clear() is harmless.
+                // The handle is owned by the pool, not this instance, so treat signalling as
+                // best-effort: it may be disposed out from under us during teardown, which would
+                // throw ObjectDisposedException. Swallow it so it cannot surface on the successful
+                // connection-create path and break pool recovery.
+                try
+                {
+                    _errorEvent?.Reset();
+                }
+                catch
+                {
+                    // Ignore: the pool-owned handle may have been disposed during teardown.
+                }
+            }
+
+            oldTimer?.Dispose();
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.ClearErrorState|RES|CPOOL> {0}, Error state cleared.", _ownerPoolId);
+        }
+
+        /// <summary>
+        /// Timer callback that exits the blocking period by clearing the cached exception,
+        /// allowing the next caller to attempt a fresh connection creation. The current
+        /// backoff is left intact so that, if the next attempt fails, the backoff continues
+        /// to grow rather than resetting. The backoff is reset only on <see cref="Clear"/>.
+        /// </summary>
+        private static void ExitCallback(BlockingPeriodErrorState state)
+        {
+            ITimer? oldTimer;
+
+            lock (state._lock)
+            {
+                state._cachedException = null;
+                oldTimer = state._exitTimer;
+                state._exitTimer = null;
+
+                // Reset the error wait handle under the lock so the exit signal is ordered
+                // consistently with the state transition relative to concurrent Enter/Clear
+                // callbacks. Reset() is idempotent, so an overlapping Clear() is harmless.
+                // The handle is owned by the pool, not this instance, so treat signalling as
+                // best-effort: it may be disposed out from under us during teardown, which would
+                // throw ObjectDisposedException on this ThreadPool timer callback. Swallow it.
+                try
+                {
+                    state._errorEvent?.Reset();
+                }
+                catch
+                {
+                    // Ignore: the pool-owned handle may have been disposed during teardown.
+                }
+            }
+
+            oldTimer?.Dispose();
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.ExitErrorStateCallback|RES|CPOOL> {0}, Exiting blocking period.", state._ownerPoolId);
+        }
+
+        /// <summary>
+        /// Disposes the instance, releasing the exit timer if one is active. Clears the
+        /// error state so that any waiting callers do not observe a stale exception after
+        /// the owning pool is torn down.
+        /// </summary>
+        public void Dispose()
+        {
+            lock (_lock)
+            {
+                _cachedException = null;
+                _inElevatedState = false;
+                ITimer? timerToDispose = _exitTimer;
+                _exitTimer = null;
+                timerToDispose?.Dispose();
+            }
+
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
index a7e0d1c48b..a54be9a2b4 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
@@ -93,6 +93,21 @@ internal DbConnectionPoolGroupProviderInfo ProviderInfo
 
         internal SqlMetaDataFactory MetaDataFactory { get; set; }
 
+        /// <summary>
+        /// Determines whether the blocking period is enabled for this pool group based on the
+        /// configured <see cref="PoolBlockingPeriod"/> and the target data source.
+        /// </summary>
+        internal bool IsBlockingPeriodEnabled()
+        {
+            return _connectionOptions.PoolBlockingPeriod switch
+            {
+                PoolBlockingPeriod.Auto => !ADP.IsAzureSqlServerEndpoint(_connectionOptions.DataSource),
+                PoolBlockingPeriod.AlwaysBlock => true,
+                PoolBlockingPeriod.NeverBlock => false,
+                _ => true
+            };
+        }
+
         internal int Clear()
         {
             // must be multi-thread safe with competing calls by Clear and Prune via background thread
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
index 2ae8e8ea98..3799cf54ea 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
@@ -46,6 +46,7 @@ internal interface IDbConnectionPool
         /// Indicates whether an error has occurred in the pool.
         /// Primarily used to support the pool blocking period feature.
         /// </summary>
+        /// TODO: rename to indicate that this relates to the blocking period
         bool ErrorOccurred { get; }
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index e83fdcf7fa..00ddb01c26 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     ///   <item><description><b>Transaction-Aware Pooling:</b> Tracks connections enlisted in <see cref="System.Transactions.Transaction"/> using <c>TransactedConnectionPool</c> and <c>TransactedConnectionList</c>, ensuring proper context reuse.</description></item>
     ///   <item><description><b>Concurrency and Synchronization:</b> Uses wait handles and semaphores via <c>PoolWaitHandles</c> to coordinate safe multi-threaded access.</description></item>
     ///   <item><description><b>Connection Lifecycle Management:</b> Manages creation (<c>CreateObject</c>), deactivation (<c>DeactivateObject</c>), destruction (<c>DestroyObject</c>), and reclamation (<c>ReclaimEmancipatedObjects</c>) of internal connections.</description></item>
-    ///   <item><description><b>Error Handling and Resilience:</b> Implements retry and exponential backoff in <c>TryGetConnection</c> and handles transient errors using <c>_errorWait</c>.</description></item>
+    ///   <item><description><b>Error Handling and Resilience:</b> Implements retry and exponential backoff in <c>TryGetConnection</c> and delegates blocking-period bookkeeping (cached exception, exit timer) to <see cref="BlockingPeriodErrorState"/>.</description></item>
     ///   <item><description><b>Minimum Pool Size Enforcement:</b> Maintains the <c>MinPoolSize</c> by spawning background tasks to create new connections when needed.</description></item>
     ///   <item><description><b>Load Balancing Support:</b> Honors <c>LoadBalanceTimeout</c> to clean up idle connections and distribute load evenly.</description></item>
     ///   <item><description><b>Telemetry and Tracing:</b> Uses <c>SqlClientEventSource</c> for extensive diagnostic tracing of connection lifecycle events.</description></item>
@@ -165,8 +165,6 @@ public void Dispose()
 
         private const int WAIT_ABANDONED = 0x80;
 
-        private const int ERROR_WAIT_DEFAULT = 5 * 1000; // 5 seconds
-
         // we do want a testable, repeatable set of generated random numbers
         private static readonly Random s_random = new Random(5101977); // Value obtained from Dave Driver
 
@@ -194,11 +192,8 @@ public void Dispose()
         internal int _waitCount;
         private readonly PoolWaitHandles _waitHandles;
 
-        private Exception _resError;
-        private volatile bool _errorOccurred;
-
-        private int _errorWait;
-        internal Timer _errorTimer;
+        private readonly TimeProvider _timeProvider;
+        private readonly BlockingPeriodErrorState _errorState;
 
         internal Timer _cleanupTimer;
 
@@ -212,7 +207,8 @@ internal WaitHandleDbConnectionPool(
             SqlConnectionFactory connectionFactory,
             DbConnectionPoolGroup connectionPoolGroup,
             DbConnectionPoolIdentity identity,
-            DbConnectionPoolProviderInfo connectionPoolProviderInfo)
+            DbConnectionPoolProviderInfo connectionPoolProviderInfo,
+            TimeProvider timeProvider = null)
         {
             Debug.Assert(connectionPoolGroup != null, "null connectionPoolGroup");
 
@@ -249,11 +245,18 @@ internal WaitHandleDbConnectionPool(
             _connectionPoolGroupOptions = connectionPoolGroup.PoolGroupOptions;
             _connectionPoolProviderInfo = connectionPoolProviderInfo;
             _identity = identity;
+            _timeProvider = timeProvider ?? TimeProvider.System;
 
             _waitHandles = new PoolWaitHandles();
 
-            _errorWait = ERROR_WAIT_DEFAULT;
-            _errorTimer = null;  // No error yet.
+            // Hook the wait-handle event so any thread blocked in WaitAny over the pool's
+            // handles wakes up immediately when the blocking period is entered/exited.
+            // _timeProvider is the system clock in production; tests inject a fake clock to
+            // drive the exit timer deterministically.
+            _errorState = new BlockingPeriodErrorState(
+                Id,
+                errorEvent: _waitHandles.ErrorEvent,
+                timeProvider: _timeProvider);
 
             _objectList = new List<DbConnectionInternal>(MaxPoolSize);
 
@@ -283,7 +286,7 @@ private int CreationTimeout
 
         public SqlConnectionFactory ConnectionFactory => _connectionFactory;
 
-        public bool ErrorOccurred => _errorOccurred;
+        public bool ErrorOccurred => _errorState.HasError;
 
         private bool HasTransactionAffinity => PoolGroupOptions.HasTransactionAffinity;
 
@@ -523,39 +526,6 @@ private Timer CreateCleanupTimer() =>
                 _cleanupWait,
                 _cleanupWait);
 
-        private bool IsBlockingPeriodEnabled()
-        {
-            var poolGroupConnectionOptions = _connectionPoolGroup.ConnectionOptions;
-            if (poolGroupConnectionOptions == null)
-            {
-                return true;
-            }
-
-            var policy = poolGroupConnectionOptions.PoolBlockingPeriod;
-
-            switch (policy)
-            {
-                case PoolBlockingPeriod.Auto:
-                    {
-                        return !ADP.IsAzureSqlServerEndpoint(poolGroupConnectionOptions.DataSource);
-                    }
-                case PoolBlockingPeriod.AlwaysBlock:
-                    {
-                        return true; //Enabled
-                    }
-                case PoolBlockingPeriod.NeverBlock:
-                    {
-                        return false; //Disabled
-                    }
-                default:
-                    {
-                        //we should never get into this path.
-                        Debug.Fail("Unknown PoolBlockingPeriod. Please specify explicit results in above switch case statement.");
-                        return true;
-                    }
-            }
-        }
-
         private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectionInternal oldConnection, TimeoutTimer timeout)
         {
             DbConnectionInternal newObj = null;
@@ -581,14 +551,14 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
 
                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.CreateObject|RES|CPOOL> {0}, Connection {1}, Added to pool.", Id, newObj?.ObjectID);
 
-                // Reset the error wait:
-                _errorWait = ERROR_WAIT_DEFAULT;
+                // A successful creation clears any prior error state and resets backoff.
+                _errorState.Clear();
             }
             catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
                 ADP.TraceExceptionWithoutRethrow(e);
 
-                if (!IsBlockingPeriodEnabled())
+                if (!_connectionPoolGroup.IsBlockingPeriodEnabled())
                 {
                     throw;
                 }
@@ -601,33 +571,10 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
 
                 newObj = null; // set to null, so we do not return bad new object
 
-                // Failed to create instance
-                _resError = e;
-
-                // Make sure the timer starts even if ThreadAbort occurs after setting the ErrorEvent.
-                Timer t = new Timer(new TimerCallback(this.ErrorCallback), null, Timeout.Infinite, Timeout.Infinite);
+                // Enter the blocking period: caches the exception, schedules the exit timer,
+                // and signals the wait-handle error event via the onEnter callback.
+                _errorState.Enter(e);
 
-                bool timerIsNotDisposed;
-
-                _waitHandles.ErrorEvent.Set();
-                _errorOccurred = true;
-
-                // Enable the timer.
-                // Note that the timer is created to allow periodic invocation. If ThreadAbort occurs in the middle of ErrorCallback,
-                // the timer will restart. Otherwise, the timer callback (ErrorCallback) destroys the timer after resetting the error to avoid second callback.
-                _errorTimer = t;
-                timerIsNotDisposed = t.Change(_errorWait, _errorWait);
-
-                Debug.Assert(timerIsNotDisposed, "ErrorCallback timer has been disposed");
-
-                if (30000 < _errorWait)
-                {
-                    _errorWait = 60000;
-                }
-                else
-                {
-                    _errorWait *= 2;
-                }
                 throw;
             }
             return newObj;
@@ -800,35 +747,6 @@ private void DestroyObject(DbConnectionInternal obj)
             }
         }
 
-        internal void ErrorCallback(object state)
-        {
-            // Skip work if the pool is not Running. The shutdown path disposes the
-            // timer; this guard handles the in-flight-callback race.
-            if (State is not Running)
-            {
-                return;
-            }
-
-            SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.ErrorCallback|RES|CPOOL> {0}, Resetting Error handling.", Id);
-            _errorOccurred = false;
-            _waitHandles.ErrorEvent.Reset();
-
-            // the error state is cleaned, destroy the timer to avoid periodic invocation
-            Timer t = _errorTimer;
-            _errorTimer = null;
-            if (t != null)
-            {
-                t.Dispose(); // Cancel timer request.
-            }
-        }
-
-
-        private Exception TryCloneCachedException()
-        // Cached exception can be of any type, so is not always cloneable.
-        // This functions clones SqlException
-        // OleDb and Odbc connections are not passing throw this code
-            => _resError is SqlException sqlEx ? sqlEx.InternalClone() : _resError;
-
         private void WaitForPendingOpen()
         {
             Debug.Assert(!Thread.CurrentThread.IsThreadPoolThread, "This thread may block for a long time.  Threadpool threads should not be used.");
@@ -1094,7 +1012,12 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
                                 // Throw the error that PoolCreateRequest stashed.
                                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, Errors are set.", Id);
                                 Interlocked.Decrement(ref _waitCount);
-                                throw TryCloneCachedException();
+                                _errorState.ThrowIfActive();
+                                // Narrow race: error state cleared between WaitAny observing
+                                // the signal and this check. Re-balance _waitCount and let the
+                                // outer do/while loop retry.
+                                Interlocked.Increment(ref _waitCount);
+                                break;
 
                             case CREATION_HANDLE:
                                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetConnection|RES|CPOOL> {0}, Creating new connection.", Id);
@@ -1655,8 +1578,8 @@ public void Shutdown()
             // and short-circuit (see CleanupCallback / ErrorCallback).
             Timer cleanup = Interlocked.Exchange(ref _cleanupTimer, null);
             cleanup?.Dispose();
-            Timer error = Interlocked.Exchange(ref _errorTimer, null);
-            error?.Dispose();
+
+            _errorState.Dispose();
 
             // Wake any threads parked in WaitHandle.WaitAny by releasing as many semaphore
             // slots as there are recorded waiters. Using _waitCount (rather than MaxPoolSize)
@@ -1712,25 +1635,20 @@ private DbConnectionInternal UserCreateRequest(DbConnection owningObject, Timeou
             // instead obtained creation mutex
 
             DbConnectionInternal obj = null;
-            if (ErrorOccurred)
-            {
-                throw TryCloneCachedException();
-            }
-            else
+            _errorState.ThrowIfActive();
+
+            if ((oldConnection != null) || (Count < MaxPoolSize) || (0 == MaxPoolSize))
             {
-                if ((oldConnection != null) || (Count < MaxPoolSize) || (0 == MaxPoolSize))
-                {
-                    // If we have an odd number of total objects, reclaim any dead objects.
-                    // If we did not find any objects to reclaim, create a new one.
+                // If we have an odd number of total objects, reclaim any dead objects.
+                // If we did not find any objects to reclaim, create a new one.
 
-                    // TODO: Consider implement a control knob here; why do we only check for dead objects ever other time?  why not every 10th time or every time?
-                    if ((oldConnection != null) || (Count & 0x1) == 0x1 || !ReclaimEmancipatedObjects())
-                    {
-                        obj = CreateObject(owningObject, oldConnection, timeout);
-                    }
+                // TODO: Consider implement a control knob here; why do we only check for dead objects ever other time?  why not every 10th time or every time?
+                if ((oldConnection != null) || (Count & 0x1) == 0x1 || !ReclaimEmancipatedObjects())
+                {
+                    obj = CreateObject(owningObject, oldConnection, timeout);
                 }
-                return obj;
             }
+            return obj;
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/BlockingPeriodErrorStateTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/BlockingPeriodErrorStateTest.cs
new file mode 100644
index 0000000000..fce4b232b0
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/BlockingPeriodErrorStateTest.cs
@@ -0,0 +1,634 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using Microsoft.Extensions.Time.Testing;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Xunit;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Comprehensive unit tests for <see cref="BlockingPeriodErrorState"/> covering:
+    /// - Initial state and error caching
+    /// - <see cref="BlockingPeriodErrorState.Enter"/> and exception handling
+    /// - <see cref="BlockingPeriodErrorState.Clear"/> and state reset
+    /// - Exponential backoff progression (verified with <see cref="FakeTimeProvider"/>)
+    /// - Timer-driven exit behavior (verified with <see cref="FakeTimeProvider"/>)
+    /// - <see cref="IDisposable"/> implementation and timer cleanup
+    /// - Error wait-handle (<see cref="ManualResetEvent"/>) signalling on enter/exit
+    /// </summary>
+    public class BlockingPeriodErrorStateTest
+    {
+        #region HasError / initial state
+
+        /// <summary>
+        /// Verifies that a newly constructed <see cref="BlockingPeriodErrorState"/> has
+        /// <see cref="BlockingPeriodErrorState.HasError"/> set to false.
+        /// </summary>
+        [Fact]
+        public void HasError_InitialState_IsFalse()
+        {
+            // Arrange
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+
+            // Act & Assert
+            Assert.False(state.HasError);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.ThrowIfActive"/> does not throw
+        /// when called on a newly constructed instance with no cached error.
+        /// </summary>
+        [Fact]
+        public void ThrowIfActive_InitialState_DoesNotThrow()
+        {
+            // Arrange
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+
+            // Act & Assert
+            state.ThrowIfActive(); // Should complete without throwing
+        }
+
+        #endregion
+
+        #region Enter
+
+        /// <summary>
+        /// Verifies that calling <see cref="BlockingPeriodErrorState.Enter"/> sets
+        /// <see cref="BlockingPeriodErrorState.HasError"/> to true.
+        /// </summary>
+        [Fact]
+        public void Enter_SetsHasErrorToTrue()
+        {
+            // Arrange
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+
+            // Act
+            state.Enter(new InvalidOperationException("test"));
+
+            // Assert
+            Assert.True(state.HasError);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.ThrowIfActive"/> throws
+        /// the exact exception type that was cached by <see cref="BlockingPeriodErrorState.Enter"/>.
+        /// </summary>
+        [Fact]
+        public void Enter_ThrowIfActive_ThrowsCachedExceptionType()
+        {
+            // Arrange
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+            var exception = new InvalidOperationException("boom");
+
+            // Act
+            state.Enter(exception);
+
+            // Assert
+            var ex = Assert.Throws<InvalidOperationException>(() => state.ThrowIfActive());
+            Assert.Equal("boom", ex.Message);
+        }
+
+        /// <summary>
+        /// Verifies that when a <see cref="SqlException"/> is cached, <see cref="BlockingPeriodErrorState.ThrowIfActive"/>
+        /// throws a cloned instance rather than the original, to avoid sharing stack traces across callers.
+        /// </summary>
+        [Fact]
+        public void Enter_WithSqlException_ThrowsClonedInstance()
+        {
+            // Arrange
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+            var original = SqlExceptionHelper.CreateSqlException("connection failed");
+
+            // Act
+            state.Enter(original);
+            var thrown = Assert.Throws<SqlException>(() => state.ThrowIfActive());
+
+            // Assert
+            Assert.NotSame(original, thrown);
+            Assert.Equal(original.Message, thrown.Message);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.Enter"/> signals the error wait
+        /// handle after entering the blocking period.
+        /// </summary>
+        [Fact]
+        public void Enter_SignalsErrorEvent()
+        {
+            // Arrange
+            using var errorEvent = new ManualResetEvent(false);
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1, errorEvent: errorEvent);
+
+            // Act
+            state.Enter(new Exception());
+
+            // Assert
+            Assert.True(errorEvent.WaitOne(0));
+        }
+
+        /// <summary>
+        /// Verifies that calling <see cref="BlockingPeriodErrorState.Enter"/> a second time
+        /// replaces the cached exception, leaves the error wait handle signaled, and the new
+        /// exception is thrown.
+        /// </summary>
+        [Fact]
+        public void Enter_CalledTwice_ReplacesExceptionAndKeepsErrorEventSignaled()
+        {
+            // Arrange
+            using var errorEvent = new ManualResetEvent(false);
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1, errorEvent: errorEvent);
+
+            // Act
+            state.Enter(new InvalidOperationException("first"));
+            state.Enter(new ArgumentException("second"));
+
+            // Assert
+            Assert.True(errorEvent.WaitOne(0));
+            var ex = Assert.Throws<ArgumentException>(() => state.ThrowIfActive());
+            Assert.Equal("second", ex.Message);
+        }
+
+        #endregion
+
+        #region Clear
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.Clear"/> resets
+        /// <see cref="BlockingPeriodErrorState.HasError"/> to false.
+        /// </summary>
+        [Fact]
+        public void Clear_AfterEnter_ResetsHasError()
+        {
+            // Arrange
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+            state.Enter(new Exception());
+
+            // Act
+            state.Clear();
+
+            // Assert
+            Assert.False(state.HasError);
+        }
+
+        /// <summary>
+        /// Verifies that after <see cref="BlockingPeriodErrorState.Clear"/>, <see cref="BlockingPeriodErrorState.ThrowIfActive"/>
+        /// does not throw because the cached error has been cleared.
+        /// </summary>
+        [Fact]
+        public void Clear_AfterEnter_ThrowIfActiveDoesNotThrow()
+        {
+            // Arrange
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+            state.Enter(new Exception());
+
+            // Act
+            state.Clear();
+
+            // Assert
+            state.ThrowIfActive(); // Must not throw
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.Clear"/> resets the error wait
+        /// handle after clearing the error state.
+        /// </summary>
+        [Fact]
+        public void Clear_AfterEnter_ResetsErrorEvent()
+        {
+            // Arrange
+            using var errorEvent = new ManualResetEvent(false);
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1, errorEvent: errorEvent);
+            state.Enter(new Exception());
+            Assert.True(errorEvent.WaitOne(0));
+
+            // Act
+            state.Clear();
+
+            // Assert
+            Assert.False(errorEvent.WaitOne(0));
+        }
+
+        /// <summary>
+        /// Verifies that calling <see cref="BlockingPeriodErrorState.Clear"/> twice leaves the
+        /// error wait handle reset (Reset is idempotent).
+        /// </summary>
+        [Fact]
+        public void Clear_CalledTwice_LeavesErrorEventReset()
+        {
+            // Arrange
+            using var errorEvent = new ManualResetEvent(false);
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1, errorEvent: errorEvent);
+            state.Enter(new Exception());
+
+            // Act
+            state.Clear();
+            state.Clear();
+
+            // Assert
+            Assert.False(errorEvent.WaitOne(0));
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.Clear"/> resets the backoff
+        /// timeout to its initial value, so the next <see cref="BlockingPeriodErrorState.Enter"/>
+        /// uses the initial wait duration instead of the accumulated backoff.
+        /// </summary>
+        [Fact]
+        public void Clear_ResetsBackoffSoNextEnterUsesInitialWait()
+        {
+            // Arrange
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+            state.Enter(new Exception("first"));
+
+            // Act
+            state.Clear();
+            state.Enter(new Exception("second"));
+
+            // Assert
+            Assert.True(state.HasError);
+        }
+
+        #endregion
+
+        #region Backoff progression
+
+        /// <summary>
+        /// Verifies that the initial enter schedules the timer with the 5-second initial wait.
+        /// The error state should persist until the timer fires, after which it clears automatically.
+        /// </summary>
+        [Fact]
+        public void Enter_FirstEntry_SchedulesInitialWaitTimer()
+        {
+            // Arrange
+            var fakeTime = new FakeTimeProvider();
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1, timeProvider: fakeTime);
+            state.Enter(new Exception());
+
+            // Act: advance just under the initial 5s wait
+            fakeTime.Advance(TimeSpan.FromSeconds(4));
+
+            // Assert: timer has not fired yet
+            Assert.True(state.HasError);
+
+            // Act: advance past the due time
+            fakeTime.Advance(TimeSpan.FromSeconds(1));
+
+            // Assert: timer has fired, error cleared
+            Assert.False(state.HasError);
+        }
+
+        /// <summary>
+        /// Verifies that successive timer-driven exits double the backoff each time:
+        /// 5 s → 10 s → 20 s → 40 s → 60 s (capped at MaxWait).
+        /// Each Enter schedules the timer for the current accumulated wait and the error
+        /// persists until exactly that duration elapses.
+        /// </summary>
+        [Fact]
+        public void Enter_BackoffDoublesOnSuccessiveTimerFiredEntries()
+        {
+            // Arrange
+            var fakeTime = new FakeTimeProvider();
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1, timeProvider: fakeTime);
+
+            // (expectedWaitSeconds, _) — the wait used by Enter for that iteration
+            int[] expectedWaits = [5, 10, 20, 40, 60, 60];
+
+            // Act & Assert
+            foreach (int wait in expectedWaits)
+            {
+                state.Enter(new Exception($"attempt at wait={wait}s"));
+
+                // One second before due time: error still active
+                fakeTime.Advance(TimeSpan.FromSeconds(wait - 1));
+                Assert.True(state.HasError, $"HasError should be true after {wait - 1}s (scheduled wait={wait}s)");
+
+                // Final second: timer fires, error clears
+                fakeTime.Advance(TimeSpan.FromSeconds(1));
+                Assert.False(state.HasError, $"HasError should be false after {wait}s (scheduled wait={wait}s)");
+            }
+        }
+
+        /// <summary>
+        /// Verifies that a timer-driven exit does NOT reset the backoff. The accumulated
+        /// backoff is preserved so the next failure uses the doubled wait, reflecting
+        /// continued instability. Only <see cref="BlockingPeriodErrorState.Clear"/> resets
+        /// the backoff to the initial value. In this way, we only reset the backoff when
+        /// a connection is successfully established.
+        /// </summary>
+        [Fact]
+        public void Enter_WhenTimerFires_DoesNotResetBackoff()
+        {
+            // Arrange
+            var fakeTime = new FakeTimeProvider();
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1, timeProvider: fakeTime);
+
+            // First enter: uses 5s wait; _nextWait advances to 10s
+            state.Enter(new Exception("first"));
+            fakeTime.Advance(TimeSpan.FromSeconds(5)); // timer fires
+            Assert.False(state.HasError);
+
+            // Act: enter again — should use 10s, not the initial 5s
+            state.Enter(new Exception("second"));
+
+            // Assert: not cleared after 9s
+            fakeTime.Advance(TimeSpan.FromSeconds(9));
+            Assert.True(state.HasError);
+
+            // Assert: cleared after the full 10s
+            fakeTime.Advance(TimeSpan.FromSeconds(1));
+            Assert.False(state.HasError);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.Clear"/> resets the backoff
+        /// to the initial 5-second wait even after the timer has doubled it, so the next
+        /// enter cycle starts fresh.
+        /// </summary>
+        [Fact]
+        public void Clear_AfterTimerFiredEntry_ResetsBackoffToInitialWait()
+        {
+            // Arrange
+            var fakeTime = new FakeTimeProvider();
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1, timeProvider: fakeTime);
+
+            // First enter/timer-exit: _nextWait advances from 5s to 10s
+            state.Enter(new Exception("first"));
+            fakeTime.Advance(TimeSpan.FromSeconds(5));
+            Assert.False(state.HasError);
+
+            // Second enter to accumulate more backoff; then Clear resets it
+            state.Enter(new Exception("second")); // _nextWait advances to 20s
+            state.Clear();                        // _nextWait resets to 5s
+
+            // Act: enter again — should use the initial 5s wait
+            state.Enter(new Exception("third"));
+
+            // Assert: not cleared after 4s
+            fakeTime.Advance(TimeSpan.FromSeconds(4));
+            Assert.True(state.HasError);
+
+            // Assert: cleared after the initial 5s
+            fakeTime.Advance(TimeSpan.FromSeconds(1));
+            Assert.False(state.HasError);
+        }
+
+        #endregion
+
+        #region Timer behavior
+
+        /// <summary>
+        /// Verifies that the timer-driven exit resets the error wait handle, the same
+        /// signalling path used by <see cref="BlockingPeriodErrorState.Clear"/>.
+        /// </summary>
+        [Fact]
+        public void Enter_WhenTimerFires_ResetsErrorEvent()
+        {
+            // Arrange
+            var fakeTime = new FakeTimeProvider();
+            using var errorEvent = new ManualResetEvent(false);
+            using var state = new BlockingPeriodErrorState(
+                ownerPoolId: 1,
+                errorEvent: errorEvent,
+                timeProvider: fakeTime);
+            state.Enter(new Exception());
+            Assert.True(errorEvent.WaitOne(0));
+
+            // Act
+            fakeTime.Advance(TimeSpan.FromSeconds(5));
+
+            // Assert
+            Assert.False(errorEvent.WaitOne(0));
+            Assert.False(state.HasError);
+        }
+
+        /// <summary>
+        /// Verifies that the timer does not fire before its due time, confirming the
+        /// scheduled wait is respected and not fired early.
+        /// </summary>
+        [Fact]
+        public void Enter_TimerDoesNotFireBeforeDueTime()
+        {
+            // Arrange
+            var fakeTime = new FakeTimeProvider();
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1, timeProvider: fakeTime);
+            state.Enter(new Exception());
+
+            // Act: advance to 1ms before the 5s due time
+            fakeTime.Advance(TimeSpan.FromMilliseconds(4999));
+
+            // Assert
+            Assert.True(state.HasError);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.Dispose"/> on an initial state
+        /// does not throw and completes successfully.
+        /// </summary>
+        [Fact]
+        public void Dispose_OnInitialState_DoesNotThrow()
+        {
+            // Arrange & Act
+            var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+
+            // Assert
+            state.Dispose(); // Should not throw
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.Dispose"/> clears the cached
+        /// error state so <see cref="BlockingPeriodErrorState.HasError"/> is false after disposal.
+        /// </summary>
+        [Fact]
+        public void Dispose_AfterEnter_ClearsHasError()
+        {
+            // Arrange
+            var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+            state.Enter(new Exception());
+
+            // Act
+            state.Dispose();
+
+            // Assert
+            Assert.False(state.HasError);
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.Dispose"/> is idempotent:
+        /// calling it multiple times does not throw and completes successfully.
+        /// </summary>
+        [Fact]
+        public void Dispose_CalledMultipleTimes_DoesNotThrow()
+        {
+            // Arrange & Act
+            var state = new BlockingPeriodErrorState(ownerPoolId: 1);
+            state.Dispose();
+
+            // Assert
+            state.Dispose(); // Must be idempotent and not throw
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.Dispose"/> does not reset the
+        /// error wait handle because disposal is a resource-cleanup path, not a logical
+        /// "exit blocking period" event.
+        /// </summary>
+        [Fact]
+        public void Dispose_DoesNotResetErrorEvent()
+        {
+            // Arrange
+            using var errorEvent = new ManualResetEvent(false);
+            var state = new BlockingPeriodErrorState(ownerPoolId: 1, errorEvent: errorEvent);
+            state.Enter(new Exception());
+
+            // Act
+            state.Dispose();
+
+            // Assert
+            Assert.True(errorEvent.WaitOne(0));
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState.Dispose"/> properly releases
+        /// and cancels the internal exit timer, preventing stale callbacks from firing after disposal.
+        /// Uses <see cref="FakeTimeProvider"/> to advance time deterministically past the timer's due
+        /// time without relying on real-time sleeps.
+        /// </summary>
+        [Fact]
+        public void Dispose_ReleasesTimer_NoCallbackAfterDispose()
+        {
+            // Arrange
+            var fakeTime = new FakeTimeProvider();
+            using var errorEvent = new ManualResetEvent(false);
+            var state = new BlockingPeriodErrorState(
+                ownerPoolId: 1,
+                errorEvent: errorEvent,
+                timeProvider: fakeTime);
+            state.Enter(new Exception());
+
+            // Act: dispose cancels the pending timer
+            state.Dispose();
+
+            // Advance well past the 5s due time — the cancelled timer must not fire (which would
+            // reset the event).
+            fakeTime.Advance(TimeSpan.FromSeconds(60));
+
+            // Assert: the event remains in the state Enter left it (signaled); the timer never fired.
+            Assert.True(errorEvent.WaitOne(0));
+        }
+
+        /// <summary>
+        /// Verifies that <see cref="BlockingPeriodErrorState"/> works correctly in a standard
+        /// <c>using</c> statement, with no exceptions thrown during disposal.
+        /// </summary>
+        [Fact]
+        public void Dispose_WithUsingStatement_DoesNotThrow()
+        {
+            // Arrange & Act
+            using (var state = new BlockingPeriodErrorState(ownerPoolId: 1))
+            {
+                state.Enter(new Exception());
+                Assert.True(state.HasError);
+            }
+
+            // Assert
+            // No exception expected when the using block exits
+        }
+
+        #endregion
+
+        #region Error wait handle
+
+        /// <summary>
+        /// Verifies that the error wait handle is optional (nullable) and the instance works
+        /// correctly when none is provided.
+        /// </summary>
+        [Fact]
+        public void ErrorEvent_IsNotRequiredAndDefaultsToNull()
+        {
+            // Arrange & Act
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 42);
+            state.Enter(new Exception());
+
+            // Assert
+            state.Clear(); // Should work without an error wait handle
+        }
+
+        /// <summary>
+        /// Verifies that the error wait handle is set on <see cref="BlockingPeriodErrorState.Enter"/>
+        /// and reset on <see cref="BlockingPeriodErrorState.Clear"/>, and that the instance never
+        /// disposes the caller-owned handle (it remains usable after the state is disposed).
+        /// </summary>
+        [Fact]
+        public void ErrorEvent_IsSetOnEnterAndResetOnClear_AndNotDisposedByState()
+        {
+            // Arrange
+            using var errorEvent = new ManualResetEvent(false);
+            var state = new BlockingPeriodErrorState(ownerPoolId: 1, errorEvent: errorEvent);
+
+            // Act & Assert: set on enter
+            state.Enter(new Exception());
+            Assert.True(errorEvent.WaitOne(0));
+
+            // reset on clear
+            state.Clear();
+            Assert.False(errorEvent.WaitOne(0));
+
+            // The state does not own the handle, so disposing the state must leave it usable.
+            state.Dispose();
+            Assert.False(errorEvent.WaitOne(0)); // no ObjectDisposedException
+        }
+
+        /// <summary>
+        /// Verifies that signalling the error wait handle is best-effort: because the pool owns
+        /// the handle's lifecycle, it may be disposed out from under the state during teardown.
+        /// <see cref="BlockingPeriodErrorState.Enter"/> and <see cref="BlockingPeriodErrorState.Clear"/>
+        /// must swallow the resulting <see cref="ObjectDisposedException"/> rather than surfacing it.
+        /// </summary>
+        [Fact]
+        public void ErrorEvent_WhenDisposed_SignallingDoesNotThrow()
+        {
+            // Arrange: hand the state a handle and then dispose it out from under the state.
+            var errorEvent = new ManualResetEvent(false);
+            using var state = new BlockingPeriodErrorState(ownerPoolId: 1, errorEvent: errorEvent);
+            errorEvent.Dispose();
+
+            // Act & Assert: Enter (Set) and Clear (Reset) must not throw despite the disposed handle.
+            state.Enter(new Exception()); // best-effort Set() on disposed handle
+            Assert.True(state.HasError);
+
+            state.Clear(); // best-effort Reset() on disposed handle
+            Assert.False(state.HasError);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Test helper for creating <see cref="SqlException"/> instances. Since <see cref="SqlException"/> has
+    /// an internal constructor, instances must be created via the <see cref="SqlException.CreateException"/> factory method.
+    /// </summary>
+    internal static class SqlExceptionHelper
+    {
+        /// <summary>
+        /// Creates a <see cref="SqlException"/> with the specified message using the internal factory method.
+        /// </summary>
+        /// <param name="message">The error message for the exception.</param>
+        /// <returns>A new <see cref="SqlException"/> with the specified message.</returns>
+        internal static SqlException CreateSqlException(string message)
+        {
+            var collection = new SqlErrorCollection();
+            collection.Add(new SqlError(0, (byte)0, (byte)0, "TestServer", message, "", 0));
+            return SqlException.CreateException(collection, "");
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs
new file mode 100644
index 0000000000..e84f040caa
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs
@@ -0,0 +1,403 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data.Common;
+using System.Threading;
+using System.Transactions;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Extensions.Time.Testing;
+using Xunit;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool;
+
+/// <summary>
+/// End-to-end coverage of the <see cref="WaitHandleDbConnectionPool"/> blocking-period
+/// behavior, exercising the full connection-acquisition path rather than the
+/// <see cref="BlockingPeriodErrorState"/> state machine in isolation. Verifies the wiring
+/// between a failed physical connection create and the pool's error state:
+/// - A failed create enters the blocking period and surfaces the error (<c>CreateObject</c> → <c>Enter</c>).
+/// - Subsequent requests fast-fail with the cached (cloned) exception without re-invoking the
+///   connection factory (error wait-handle → <c>ThrowIfActive</c>).
+/// - A successful create does not trip the blocking period.
+/// - <see cref="PoolBlockingPeriod.NeverBlock"/> bypasses the blocking period entirely so each
+///   request retries the factory.
+/// - After the blocking-period exit timer fires, the next request retries the factory and a
+///   successful create recovers the pool and resets the backoff (driven deterministically by an
+///   injected <see cref="FakeTimeProvider"/>).
+/// </summary>
+public class WaitHandleDbConnectionPoolBlockingPeriodTest : IDisposable
+{
+    private const int DefaultMaxPoolSize = 50;
+    private const int DefaultMinPoolSize = 0;
+    private const int DefaultCreationTimeoutInMilliseconds = 15_000;
+
+    private WaitHandleDbConnectionPool? _pool;
+
+    public void Dispose()
+    {
+        _pool?.Shutdown();
+        _pool?.Clear();
+    }
+
+    /// <summary>
+    /// Builds a running <see cref="WaitHandleDbConnectionPool"/> backed by the supplied factory.
+    /// The <paramref name="connectionString"/> controls the data source and
+    /// <see cref="PoolBlockingPeriod"/> policy used to resolve whether blocking is enabled.
+    /// When <paramref name="timeProvider"/> is supplied, the pool's
+    /// <see cref="BlockingPeriodErrorState"/> uses it as its clock so the exit timer can be driven
+    /// deterministically; otherwise the system clock is used.
+    /// </summary>
+    private WaitHandleDbConnectionPool CreatePool(
+        SqlConnectionFactory connectionFactory,
+        string connectionString = "Data Source=localhost;",
+        TimeProvider? timeProvider = null)
+    {
+        var poolGroupOptions = new DbConnectionPoolGroupOptions(
+            poolByIdentity: false,
+            minPoolSize: DefaultMinPoolSize,
+            maxPoolSize: DefaultMaxPoolSize,
+            creationTimeout: DefaultCreationTimeoutInMilliseconds,
+            loadBalanceTimeout: 0,
+            hasTransactionAffinity: true,
+            idleTimeout: 0);
+
+        var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+            new SqlConnectionOptions(connectionString),
+            new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+            poolGroupOptions);
+
+        var pool = new WaitHandleDbConnectionPool(
+            connectionFactory,
+            dbConnectionPoolGroup,
+            DbConnectionPoolIdentity.NoIdentity,
+            new DbConnectionPoolProviderInfo(),
+            timeProvider);
+
+        pool.Startup();
+        _pool = pool;
+        return pool;
+    }
+
+    /// <summary>
+    /// Synchronously requests a connection from the pool, mirroring the sync acquisition path
+    /// (<c>taskCompletionSource == null</c>) used by callers of <c>SqlConnection.Open</c>.
+    /// </summary>
+    private static bool TryGetConnectionSync(
+        WaitHandleDbConnectionPool pool,
+        DbConnection owner,
+        out DbConnectionInternal? connection)
+    {
+        TimeoutTimer timer = TimeoutTimer.StartNew(TimeSpan.FromSeconds(15));
+        return pool.TryGetConnection(owner, taskCompletionSource: null, timer, out connection);
+    }
+
+    /// <summary>
+    /// Verifies that when the connection factory fails, the pool enters the blocking period:
+    /// the originating exception is surfaced to the caller and <see cref="WaitHandleDbConnectionPool.ErrorOccurred"/>
+    /// becomes true. Guards the <c>CreateObject</c> → <see cref="BlockingPeriodErrorState.Enter"/> wiring.
+    /// </summary>
+    [Fact]
+    public void TryGetConnection_WhenFactoryThrows_EntersBlockingPeriod()
+    {
+        // Arrange
+        SqlException failure = SqlExceptionHelper.CreateSqlException("server unreachable");
+        var factory = new ConfigurableSqlConnectionFactory(_ => throw failure);
+        var pool = CreatePool(factory);
+        using var owner = new SqlConnection();
+
+        // Act
+        SqlException thrown = Assert.Throws<SqlException>(
+            () => TryGetConnectionSync(pool, owner, out _));
+
+        // Assert
+        Assert.Equal(failure.Message, thrown.Message);
+        Assert.True(pool.ErrorOccurred);
+        Assert.Equal(1, factory.CreateConnectionCallCount);
+    }
+
+    /// <summary>
+    /// Verifies that once the pool is in the blocking period, a subsequent request fast-fails
+    /// with the cached exception without invoking the connection factory again. The first throw
+    /// rethrows the original instance; the fast-fail throw returns a clone (to avoid sharing stack
+    /// traces). Guards the error wait-handle → <see cref="BlockingPeriodErrorState.ThrowIfActive"/> path.
+    /// </summary>
+    [Fact]
+    public void TryGetConnection_WhileBlocked_FastFailsWithCachedExceptionWithoutInvokingFactory()
+    {
+        // Arrange
+        SqlException failure = SqlExceptionHelper.CreateSqlException("server unreachable");
+        var factory = new ConfigurableSqlConnectionFactory(_ => throw failure);
+        var pool = CreatePool(factory);
+        using var owner = new SqlConnection();
+
+        // Act: first request enters the blocking period and rethrows the original exception.
+        SqlException first = Assert.Throws<SqlException>(
+            () => TryGetConnectionSync(pool, owner, out _));
+
+        // Second request must fast-fail from the cached state without reaching the factory.
+        SqlException second = Assert.Throws<SqlException>(
+            () => TryGetConnectionSync(pool, owner, out _));
+
+        // Assert
+        Assert.Same(failure, first);          // original instance rethrown on entry
+        Assert.NotSame(failure, second);      // cloned on fast-fail
+        Assert.Equal(failure.Message, second.Message); // but message is preserved
+        Assert.Equal(1, factory.CreateConnectionCallCount); // factory not re-invoked while blocked
+        Assert.True(pool.ErrorOccurred);
+    }
+
+    /// <summary>
+    /// Verifies that with <see cref="PoolBlockingPeriod.NeverBlock"/>, a failed create does not
+    /// cache the error: <see cref="WaitHandleDbConnectionPool.ErrorOccurred"/> stays false and each
+    /// request retries the connection factory. Guards the
+    /// <c>IsBlockingPeriodEnabled() == false</c> bypass in <c>CreateObject</c>.
+    /// </summary>
+    [Fact]
+    public void TryGetConnection_WithNeverBlockPolicy_DoesNotCacheErrorAndRetriesFactory()
+    {
+        // Arrange
+        SqlException failure = SqlExceptionHelper.CreateSqlException("server unreachable");
+        var factory = new ConfigurableSqlConnectionFactory(_ => throw failure);
+        var pool = CreatePool(factory, "Data Source=localhost;PoolBlockingPeriod=NeverBlock");
+        using var owner = new SqlConnection();
+
+        // Act: two independent failures, neither of which should be cached.
+        SqlException first = Assert.Throws<SqlException>(() => TryGetConnectionSync(pool, owner, out _));
+        SqlException second = Assert.Throws<SqlException>(() => TryGetConnectionSync(pool, owner, out _));
+
+        // Assert
+        Assert.Same(failure, first);   // original instance rethrown, never cached/cloned
+        Assert.Same(failure, second);  // original instance rethrown again on retry
+        Assert.False(pool.ErrorOccurred);
+        Assert.Equal(2, factory.CreateConnectionCallCount);
+    }
+
+    /// <summary>
+    /// Verifies that a successful create returns a connection and does not trip the blocking
+    /// period, confirming the normal path leaves <see cref="WaitHandleDbConnectionPool.ErrorOccurred"/>
+    /// false (and exercises the <see cref="BlockingPeriodErrorState.Clear"/> fast no-op on success).
+    /// </summary>
+    [Fact]
+    public void TryGetConnection_WhenFactorySucceeds_DoesNotEnterBlockingPeriod()
+    {
+        // Arrange
+        var factory = new ConfigurableSqlConnectionFactory(_ => new MockDbConnectionInternal());
+        var pool = CreatePool(factory);
+        using var owner = new SqlConnection();
+
+        // Act
+        bool completed = TryGetConnectionSync(pool, owner, out DbConnectionInternal? connection);
+
+        // Assert
+        Assert.True(completed);
+        Assert.NotNull(connection);
+        Assert.False(pool.ErrorOccurred);
+        Assert.Equal(1, factory.CreateConnectionCallCount);
+    }
+
+    /// <summary>
+    /// Verifies that once the blocking period's exit timer fires, the next request retries the
+    /// factory and a successful create recovers the pool: <see cref="WaitHandleDbConnectionPool.ErrorOccurred"/>
+    /// returns to false and a connection is produced. Drives the exit timer deterministically with
+    /// an injected <see cref="FakeTimeProvider"/>, guarding the
+    /// <see cref="BlockingPeriodErrorState"/> timer-exit → retry → <c>Clear</c> path at the pool level.
+    /// </summary>
+    [Fact]
+    public void TryGetConnection_AfterBlockingPeriodExpires_RetriesFactoryAndRecovers()
+    {
+        // Arrange: first create fails, every later create succeeds.
+        SqlException failure = SqlExceptionHelper.CreateSqlException("server unreachable");
+        var factory = new ConfigurableSqlConnectionFactory(
+            call => call == 1 ? throw failure : new MockDbConnectionInternal());
+        var fakeTime = new FakeTimeProvider();
+        var pool = CreatePool(factory, timeProvider: fakeTime);
+        using var owner = new SqlConnection();
+
+        // Act: first request enters the blocking period.
+        Assert.Throws<SqlException>(() => TryGetConnectionSync(pool, owner, out _));
+        Assert.True(pool.ErrorOccurred);
+        Assert.Equal(1, factory.CreateConnectionCallCount);
+
+        // While blocked, a request fast-fails without reaching the factory.
+        Assert.Throws<SqlException>(() => TryGetConnectionSync(pool, owner, out _));
+        Assert.Equal(1, factory.CreateConnectionCallCount);
+
+        // Advance past the initial 5s blocking period so the exit timer fires.
+        fakeTime.Advance(TimeSpan.FromSeconds(5));
+
+        // Assert: the pool has recovered and a new request reaches the factory and succeeds.
+        Assert.False(pool.ErrorOccurred);
+        bool completed = TryGetConnectionSync(pool, owner, out DbConnectionInternal? connection);
+        Assert.True(completed);
+        Assert.NotNull(connection);
+        Assert.False(pool.ErrorOccurred);
+        Assert.Equal(2, factory.CreateConnectionCallCount);
+    }
+
+    /// <summary>
+    /// Verifies that a successful create resets the exponential backoff to the initial 5-second
+    /// wait. The backoff is first allowed to grow (fail → timer-exit → fail → timer-exit, observing
+    /// the doubled 10-second wait) so the reset is observable. A successful create then resets the
+    /// backoff via <see cref="BlockingPeriodErrorState.Clear"/>, and a subsequent failure blocks for
+    /// only the initial 5 seconds rather than the accumulated 20 seconds, confirming the success
+    /// reset is wired through the pool. Drives timing deterministically with an injected
+    /// <see cref="FakeTimeProvider"/>.
+    /// </summary>
+    [Fact]
+    public void TryGetConnection_SuccessfulCreate_ResetsBackoffToInitialWait()
+    {
+        // Arrange: creates #1, #2 and #4 fail; #3 succeeds (recovery) to reset the backoff.
+        SqlException failure = SqlExceptionHelper.CreateSqlException("server unreachable");
+        var factory = new ConfigurableSqlConnectionFactory(
+            call => call == 3 ? new MockDbConnectionInternal() : throw failure);
+        var fakeTime = new FakeTimeProvider();
+        var pool = CreatePool(factory, timeProvider: fakeTime);
+        using var owner = new SqlConnection();
+
+        // Act: first failure enters the blocking period with the initial 5s wait.
+        Assert.Throws<SqlException>(() => TryGetConnectionSync(pool, owner, out _));
+        Assert.Equal(1, factory.CreateConnectionCallCount);
+        Assert.True(pool.ErrorOccurred);
+        fakeTime.Advance(TimeSpan.FromSeconds(5)); // timer fires -> backoff doubles to 10s
+        Assert.False(pool.ErrorOccurred);
+
+        // Second failure enters with the doubled 10s wait; confirm it lasts the full 10s so the
+        // backoff has demonstrably grown before we reset it.
+        Assert.Throws<SqlException>(() => TryGetConnectionSync(pool, owner, out _)); // create #2 fails
+        Assert.Equal(2, factory.CreateConnectionCallCount);
+        fakeTime.Advance(TimeSpan.FromSeconds(9));
+        Assert.True(pool.ErrorOccurred);  // still blocked at 9s -> wait is 10s, not 5s
+        fakeTime.Advance(TimeSpan.FromSeconds(1)); // timer fires at 10s -> backoff would double to 20s
+        Assert.False(pool.ErrorOccurred);
+
+        // A successful create resets the backoff to the initial 5s.
+        Assert.True(TryGetConnectionSync(pool, owner, out _)); // create #3 succeeds -> Clear()
+        Assert.Equal(3, factory.CreateConnectionCallCount);
+        Assert.False(pool.ErrorOccurred);
+
+        // A new failure enters the blocking period again.
+        Assert.Throws<SqlException>(() => TryGetConnectionSync(pool, owner, out _)); // create #4 fails
+        Assert.Equal(4, factory.CreateConnectionCallCount);
+        Assert.True(pool.ErrorOccurred);
+
+        // Assert: the wait was reset to the initial 5s (not the accumulated 20s).
+        fakeTime.Advance(TimeSpan.FromSeconds(4));
+        Assert.True(pool.ErrorOccurred);  // still blocked just before the 5s mark
+        fakeTime.Advance(TimeSpan.FromSeconds(1));
+        Assert.False(pool.ErrorOccurred); // cleared exactly at 5s, proving the backoff reset
+    }
+
+    /// <summary>
+    /// Verifies that a timer-driven exit alone does NOT reset the backoff: when a failure recurs
+    /// after the exit timer fires (with no intervening successful create), the next blocking period
+    /// uses the doubled wait (10s, not the initial 5s). Confirms that only
+    /// <see cref="BlockingPeriodErrorState.Clear"/> — invoked on a successful create — resets the
+    /// backoff at the pool level. Drives timing deterministically with an injected
+    /// <see cref="FakeTimeProvider"/>.
+    /// </summary>
+    [Fact]
+    public void TryGetConnection_FailingAgainAfterExitTimer_StillDoublesBackoff()
+    {
+        // Arrange: every create fails, so the backoff is never reset by a success.
+        SqlException failure = SqlExceptionHelper.CreateSqlException("server unreachable");
+        var factory = new ConfigurableSqlConnectionFactory(_ => throw failure);
+        var fakeTime = new FakeTimeProvider();
+        var pool = CreatePool(factory, timeProvider: fakeTime);
+        using var owner = new SqlConnection();
+
+        // Act: first failure enters the blocking period (initial 5s wait).
+        Assert.Throws<SqlException>(() => TryGetConnectionSync(pool, owner, out _));
+        Assert.Equal(1, factory.CreateConnectionCallCount);
+
+        // Advance past the 5s wait so the exit timer fires (no success -> backoff not reset).
+        fakeTime.Advance(TimeSpan.FromSeconds(5));
+        Assert.False(pool.ErrorOccurred);
+
+        // A new failure re-enters the blocking period using the doubled 10s wait. The factory is
+        // invoked again, confirming the request reached creation rather than fast-failing.
+        Assert.Throws<SqlException>(() => TryGetConnectionSync(pool, owner, out _));
+        Assert.Equal(2, factory.CreateConnectionCallCount);
+        Assert.True(pool.ErrorOccurred);
+
+        // Assert: still blocked at the original 5s mark (proves the wait is not 5s)...
+        fakeTime.Advance(TimeSpan.FromSeconds(5));
+        Assert.True(pool.ErrorOccurred);
+
+        // ...and not cleared until the full doubled 10s elapses.
+        fakeTime.Advance(TimeSpan.FromSeconds(4));
+        Assert.True(pool.ErrorOccurred);
+        fakeTime.Advance(TimeSpan.FromSeconds(1));
+        Assert.False(pool.ErrorOccurred); // cleared exactly at 10s, proving the backoff doubled
+    }
+
+    /// <summary>
+    /// <see cref="SqlConnectionFactory"/> test double whose <c>CreateConnection</c> behavior is
+    /// supplied per-call (to throw or return a mock connection) and which records how many times
+    /// the factory was invoked so tests can assert fast-fail (no re-invocation) versus retry.
+    /// </summary>
+    internal sealed class ConfigurableSqlConnectionFactory : SqlConnectionFactory
+    {
+        private readonly Func<int, DbConnectionInternal> _createBehavior;
+        private int _callCount;
+
+        /// <summary>
+        /// The number of times <c>CreateConnection</c> has been invoked. The argument passed to
+        /// the behavior delegate is the 1-based invocation index.
+        /// </summary>
+        internal int CreateConnectionCallCount => Volatile.Read(ref _callCount);
+
+        internal ConfigurableSqlConnectionFactory(Func<int, DbConnectionInternal> createBehavior)
+            => _createBehavior = createBehavior;
+
+        protected override DbConnectionInternal CreateConnection(
+            SqlConnectionOptions options,
+            ConnectionPoolKey poolKey,
+            DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+            IDbConnectionPool pool,
+            DbConnection owningConnection,
+            TimeoutTimer timeout)
+        {
+            int call = Interlocked.Increment(ref _callCount);
+            return _createBehavior(call);
+        }
+    }
+
+    /// <summary>
+    /// Minimal <see cref="DbConnectionInternal"/> stub used as a successful create result.
+    /// Duplicated locally so this test file remains self-contained, mirroring the helpers in the
+    /// sibling <c>WaitHandleDbConnectionPool</c> test files.
+    /// </summary>
+    internal sealed class MockDbConnectionInternal : DbConnectionInternal
+    {
+        public override string ServerVersion => "Mock";
+
+        public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
+            => throw new NotImplementedException();
+
+        public override void EnlistTransaction(Transaction? transaction)
+        {
+            if (transaction != null)
+            {
+                EnlistedTransaction = transaction;
+            }
+        }
+
+        protected override void Activate(Transaction? transaction)
+        {
+            EnlistedTransaction = transaction;
+        }
+
+        protected override void Deactivate()
+        {
+        }
+
+        internal override void ResetConnection()
+        {
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
index 52bf9ccb29..7268728c8b 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
@@ -67,19 +67,6 @@ public void Shutdown_DisposesCleanupTimer()
             Assert.Null(pool._cleanupTimer);
         }
 
-        // Error timer is disposed when present.
-        [Fact]
-        public void Shutdown_DisposesErrorTimer_WhenPresent()
-        {
-            var pool = CreatePool();
-            // Inject a real Timer into _errorTimer to mimic an error-state pool.
-            pool._errorTimer = new Timer(_ => { }, null, Timeout.Infinite, Timeout.Infinite);
-
-            pool.Shutdown();
-
-            Assert.Null(pool._errorTimer);
-        }
-
         // Drains idle stacks.
         [Fact]
         public void Shutdown_DrainsIdleStacks()
@@ -130,17 +117,6 @@ public void CleanupCallback_AfterShutdown_IsNoOp()
             Assert.Equal(DbConnectionPoolState.ShuttingDown, pool.State);
         }
 
-        // Error callback after shutdown is a no-op.
-        [Fact]
-        public void ErrorCallback_AfterShutdown_IsNoOp()
-        {
-            var pool = CreatePool();
-            pool.Shutdown();
-
-            var ex = Record.Exception(() => pool.ErrorCallback(state: null));
-            Assert.Null(ex);
-        }
-
         // Sync caller arriving after shutdown gets a null connection (factory will
         // see this and return up the retry chain). The pool's TryGetConnection short-circuits
         // on State != Running.

From b23aabe0b6b090c2374bab0d12583bc1f3887818 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 14 Jul 2026 07:35:11 -0700
Subject: [PATCH 185/298] Introduce Async API counterparts for AE base class
 (#3673)

---
 .../SqlColumnEncryptionKeyStoreProvider.xml   | 273 ++++++++++++++--
 specs/002-async-always-encrypted/spec.md      | 292 ++++++++++++++++++
 .../ref/Microsoft.Data.SqlClient.cs           |   8 +
 .../SqlColumnEncryptionKeyStoreProvider.cs    |  75 +++++
 ...mnEncryptionKeyStoreProviderAsyncShould.cs | 289 +++++++++++++++++
 5 files changed, 914 insertions(+), 23 deletions(-)
 create mode 100644 specs/002-async-always-encrypted/spec.md
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/AlwaysEncrypted/SqlColumnEncryptionKeyStoreProviderAsyncShould.cs

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml
index 401258f9e5..c3990851c5 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml
@@ -11,51 +11,159 @@
       </summary>
     </ctor>
     <DecryptColumnEncryptionKey>
+      <summary>
+        Decrypts the specified encrypted value of a column encryption key.
+        The encrypted value is expected to be encrypted using the column
+        master key with the specified key path and using the specified
+        algorithm.
+      </summary>
       <param name="masterKeyPath">
-        The master key path.
+        The column master key path. The path format is specific to the key
+        store provider implementation (e.g. a thumbprint for the certificate
+        store, or a key identifier URL for Azure Key Vault).
       </param>
       <param name="encryptionAlgorithm">
-        The encryption algorithm.
+        The encryption algorithm name. For example,
+        <c>RSA_OAEP</c>.
       </param>
       <param name="encryptedColumnEncryptionKey">
         The encrypted column encryption key.
       </param>
+      <returns>
+        Returns a <see cref="T:System.Byte[]" /> representing the decrypted
+        column encryption key.
+      </returns>
+    </DecryptColumnEncryptionKey>
+    <DecryptColumnEncryptionKeyAsync>
       <summary>
-        Decrypts the specified encrypted value of a column encryption key. The encrypted value is expected to be encrypted using the column master key with the specified key path and using the specified algorithm.
+        Asynchronously decrypts the specified encrypted value of a column
+        encryption key. The encrypted value is expected to be encrypted using
+        the column master key with the specified key path and using the
+        specified algorithm.
       </summary>
+      <param name="masterKeyPath">
+        The column master key path. The path format is specific to the key
+        store provider implementation (e.g. a thumbprint for the certificate
+        store, or a key identifier URL for Azure Key Vault).
+      </param>
+      <param name="encryptionAlgorithm">
+        The encryption algorithm name. For example,
+        <c>RSA_OAEP</c>.
+      </param>
+      <param name="encryptedColumnEncryptionKey">
+        The encrypted column encryption key.
+      </param>
+      <param name="cancellationToken">
+        A token to cancel the asynchronous operation.
+      </param>
       <returns>
-        Returns <see cref="T:System.Byte" />. The decrypted column encryption key.
+        A task that returns a <see cref="T:System.Byte[]" /> representing
+        the decrypted column encryption key on completion.
       </returns>
-    </DecryptColumnEncryptionKey>
+      <remarks>
+        <para>
+          The default implementation first checks the
+          <paramref name="cancellationToken" /> and returns a canceled task
+          if cancellation has been requested. Otherwise, it calls the
+          synchronous
+          <see cref="M:Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider.DecryptColumnEncryptionKey(System.String,System.String,System.Byte[])" />
+          method and wraps the result in a completed task. If the synchronous
+          method throws, the exception is caught and a faulted task is
+          returned rather than throwing synchronously.
+        </para>
+        <para>
+          Derived classes that perform I/O (such as calls to Azure Key Vault)
+          should override this method with a truly asynchronous
+          implementation that honors the cancellation token.
+        </para>
+      </remarks>
+    </DecryptColumnEncryptionKeyAsync>
     <EncryptColumnEncryptionKey>
+      <summary>
+        Encrypts a column encryption key using the column master key with
+        the specified key path and using the specified algorithm.
+      </summary>
       <param name="masterKeyPath">
-        The master key path.
+        The column master key path. The path format is specific to the key
+        store provider implementation (e.g. a thumbprint for the certificate
+        store, or a key identifier URL for Azure Key Vault).
       </param>
       <param name="encryptionAlgorithm">
-        The encryption algorithm.
+        The encryption algorithm name. For example,
+        <c>RSA_OAEP</c>.
       </param>
       <param name="columnEncryptionKey">
-        The plaintext column encryption key.
+        The column encryption key to encrypt.
       </param>
+      <returns>
+        Returns a <see cref="T:System.Byte[]" /> representing the encrypted
+        column encryption key.
+      </returns>
+    </EncryptColumnEncryptionKey>
+    <EncryptColumnEncryptionKeyAsync>
       <summary>
-        Encrypts a column encryption key using the column master key with the specified key path and using the specified algorithm.
+        Asynchronously encrypts a column encryption key using the column
+        master key with the specified key path and using the specified
+        algorithm.
       </summary>
+      <param name="masterKeyPath">
+        The column master key path. The path format is specific to the key
+        store provider implementation (e.g. a thumbprint for the certificate
+        store, or a key identifier URL for Azure Key Vault).
+      </param>
+      <param name="encryptionAlgorithm">
+        The encryption algorithm name. For example,
+        <c>RSA_OAEP</c>.
+      </param>
+      <param name="columnEncryptionKey">
+        The column encryption key to encrypt.
+      </param>
+      <param name="cancellationToken">
+        A token to cancel the asynchronous operation.
+      </param>
       <returns>
-        Returns <see cref="T:System.Byte" />. The encrypted column encryption key.
+        A task that returns a <see cref="T:System.Byte[]" /> representing
+        the encrypted column encryption key on completion.
       </returns>
-    </EncryptColumnEncryptionKey>
+      <remarks>
+        <para>
+          The default implementation first checks the
+          <paramref name="cancellationToken" /> and returns a canceled task
+          if cancellation has been requested. Otherwise, it calls the
+          synchronous
+          <see cref="M:Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider.EncryptColumnEncryptionKey(System.String,System.String,System.Byte[])" />
+          method and wraps the result in a completed task. If the synchronous
+          method throws, the exception is caught and a faulted task is
+          returned rather than throwing synchronously.
+        </para>
+        <para>
+          Derived classes that perform I/O (such as calls to Azure Key Vault)
+          should override this method with a truly asynchronous
+          implementation that honors the cancellation token.
+        </para>
+      </remarks>
+    </EncryptColumnEncryptionKeyAsync>
     <SignColumnMasterKeyMetadata>
+      <summary>
+        When implemented in a derived class, signs the column master key
+        metadata with the column master key referenced by the
+        <paramref name="masterKeyPath" /> parameter.
+      </summary>
       <param name="masterKeyPath">
-        The column master key path.
+        The column master key path. The path format is specific to the key
+        store provider implementation (e.g. a thumbprint for the certificate
+        store, or a key identifier URL for Azure Key Vault).
       </param>
       <param name="allowEnclaveComputations">
-        <see langword="true" /> to indicate that the column master key supports enclave computations; otherwise, <see langword="false" />.
+        <see langword="true" /> to indicate that the column master key
+        supports enclave computations; otherwise,
+        <see langword="false" />. When <see langword="true" />, the
+        generated signature covers the enclave-enabled property so that
+        the metadata can later be verified for enclave use.
       </param>
-      <summary>
-        When implemented in a derived class, digitally signs the column master key metadata with the column master key referenced by the <paramref name="masterKeyPath" /> parameter. The input values used to generate the signature should be the specified values of the <paramref name="masterKeyPath" /> and <paramref name="allowEnclaveComputations" /> parameters.
-      </summary>
       <returns>
-        The signature of the column master key metadata.
+        Returns the signature of the column master key metadata. The format
+        is provider-specific.
       </returns>
       <remarks>
         <para>
@@ -69,23 +177,142 @@
         In all cases.
       </exception>
     </SignColumnMasterKeyMetadata>
+    <SignColumnMasterKeyMetadataAsync>
+      <summary>
+        When implemented in a derived class, asynchronously signs the column
+        master key metadata with the column master key referenced by the
+        <paramref name="masterKeyPath" /> parameter.
+      </summary>
+      <param name="masterKeyPath">
+        The column master key path. The path format is specific to the key
+        store provider implementation (e.g. a thumbprint for the certificate
+        store, or a key identifier URL for Azure Key Vault).
+      </param>
+      <param name="allowEnclaveComputations">
+        <see langword="true" /> to indicate that the column master key
+        supports enclave computations; otherwise,
+        <see langword="false" />. When <see langword="true" />, the
+        generated signature covers the enclave-enabled property so that
+        the metadata can later be verified for enclave use.
+      </param>
+      <param name="cancellationToken">
+        A token to cancel the asynchronous operation.
+      </param>
+      <returns>
+        A task that, when completed, returns a <see cref="T:System.Byte[]" />
+        representing the signature of the column master key metadata. The
+        signature format is provider-specific.
+      </returns>
+      <remarks>
+        <para>
+          The default implementation first checks the
+          <paramref name="cancellationToken" /> and returns a canceled task
+          if cancellation has been requested. Otherwise, it calls the
+          synchronous
+          <see cref="M:Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider.SignColumnMasterKeyMetadata(System.String,System.Boolean)" />
+          method, which throws a
+          <see cref="T:System.NotImplementedException" /> by default. In
+          this case, the returned task will be faulted with
+          <see cref="T:System.NotImplementedException" /> rather than
+          throwing synchronously.
+        </para>
+        <para>
+          Derived classes that perform I/O should override this method with
+          a truly asynchronous implementation that honors the cancellation
+          token.
+        </para>
+        <para>
+          Key store providers that wish to use enclaves with
+          <see href="https://learn.microsoft.com/sql/relational-databases/security/encryption/always-encrypted-database-engine">Always Encrypted</see>
+          should override this method with a truly asynchronous
+          implementation when the signing operation involves I/O.
+        </para>
+      </remarks>
+    </SignColumnMasterKeyMetadataAsync>
     <VerifyColumnMasterKeyMetadata>
+      <summary>
+        When implemented in a derived class, this method is expected to
+        verify the specified signature is valid for the column master key
+        with the specified key path and the specified enclave behavior. The
+        default implementation throws
+        <see cref="T:System.NotImplementedException" />.
+      </summary>
       <param name="masterKeyPath">
-        The column master key path.
+        The column master key path. The path format is specific to the key
+        store provider implementation (e.g. a thumbprint for the certificate
+        store, or a key identifier URL for Azure Key Vault).
       </param>
       <param name="allowEnclaveComputations">
-        Indicates whether the column master key supports enclave computations.
+        Indicates whether the column master key supports enclave
+        computations. This value must match what was passed to
+        <see cref="M:Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider.SignColumnMasterKeyMetadata(System.String,System.Boolean)" />
+        when the signature was generated.
       </param>
       <param name="signature">
-        The signature of the column master key metadata.
+        The signature to verify, as previously returned by
+        <see cref="M:Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider.SignColumnMasterKeyMetadata(System.String,System.Boolean)" />.
+        The format is provider-specific.
       </param>
+      <returns>
+        When implemented in a derived class, the method is expected to
+        return <see langword="true" /> if the specified signature is valid,
+        or <see langword="false" /> if the specified signature is not valid.
+        The default implementation throws
+        <see cref="T:System.NotImplementedException" />.
+      </returns>
+    </VerifyColumnMasterKeyMetadata>
+    <VerifyColumnMasterKeyMetadataAsync>
       <summary>
-        When implemented in a derived class, this method is expected to verify the specified signature is valid for the column master key with the specified key path and the specified enclave behavior. The default implementation throws `NotImplementedException`.
+        When implemented in a derived class, asynchronously verifies the
+        specified signature is valid for the column master key with the
+        specified key path and the specified enclave behavior. The default
+        implementation returns a faulted task with
+        <see cref="T:System.NotImplementedException" />.
       </summary>
+      <param name="masterKeyPath">
+        The column master key path. The path format is specific to the key
+        store provider implementation (e.g. a thumbprint for the certificate
+        store, or a key identifier URL for Azure Key Vault).
+      </param>
+      <param name="allowEnclaveComputations">
+        Indicates whether the column master key supports enclave
+        computations. This value must match what was passed to
+        <see cref="M:Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider.SignColumnMasterKeyMetadata(System.String,System.Boolean)" />
+        when the signature was generated.
+      </param>
+      <param name="signature">
+        The signature to verify, as previously returned by
+        <see cref="M:Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider.SignColumnMasterKeyMetadata(System.String,System.Boolean)" />.
+        The format is provider-specific.
+      </param>
+      <param name="cancellationToken">
+        A token to cancel the asynchronous operation.
+      </param>
       <returns>
-        When implemented in a derived class, the method is expected to return true if the specified signature is valid, or false if the specified signature is not valid. The default implementation throws `NotImplementedException`.
+        A task that, when completed, returns <see langword="true" /> if the
+        specified signature is valid, or <see langword="false" /> if it is
+        not valid.
       </returns>
-    </VerifyColumnMasterKeyMetadata>
+      <remarks>
+        <para>
+          The default implementation first checks the
+          <paramref name="cancellationToken" /> and returns a canceled task
+          if cancellation has been requested. Otherwise, it calls the
+          synchronous
+          <see cref="M:Microsoft.Data.SqlClient.SqlColumnEncryptionKeyStoreProvider.VerifyColumnMasterKeyMetadata(System.String,System.Boolean,System.Byte[])" />
+          method, which throws a
+          <see cref="T:System.NotImplementedException" /> by default. In
+          this case, the returned task will be faulted with
+          <see cref="T:System.NotImplementedException" /> rather than
+          throwing synchronously.
+        </para>
+        <para>
+          Derived classes that perform I/O should override this method with
+          a truly asynchronous implementation that honors the cancellation
+          token.
+        </para>
+      </remarks>
+    </VerifyColumnMasterKeyMetadataAsync>
     <ColumnEncryptionKeyCacheTtl>
       <summary>
         Gets or sets the lifespan of the decrypted column encryption key in the cache. Once the timespan has elapsed, the decrypted column encryption key is discarded and must be revalidated.
diff --git a/specs/002-async-always-encrypted/spec.md b/specs/002-async-always-encrypted/spec.md
new file mode 100644
index 0000000000..dea4d526f2
--- /dev/null
+++ b/specs/002-async-always-encrypted/spec.md
@@ -0,0 +1,292 @@
+# Feature Specification: Async-Friendly Always Encrypted Support
+
+**Issue**: [#3672](https://github.com/dotnet/SqlClient/issues/3672)  
+**Feature Branch**: `dev/cheena/async-ae`  
+**Created**: 2026-05-13  
+**Status**: Draft  
+**Milestone**: 7.1.0-preview2  
+
+## Summary
+
+Eliminate sync-over-async in Always Encrypted (AE) code paths by adding async counterparts to all provider base classes and implementations, then rewiring async execution paths in SqlCommand to use them. Currently, async operations like `ExecuteReaderAsync` block ThreadPool threads when AE is enabled because all key decryption, signature verification, and enclave attestation calls are synchronous — including HTTP calls to Azure Key Vault and attestation services.
+
+## User Scenarios & Testing
+
+### User Story 1 — Async Key Decryption with Azure Key Vault
+
+As an application developer using Always Encrypted with Azure Key Vault, I want `ExecuteReaderAsync` to perform column encryption key (CEK) decryption asynchronously via the Azure Key Vault SDK, so that my async code paths do not block ThreadPool threads waiting for HTTP responses from Azure Key Vault.
+
+**Acceptance Scenarios**:
+
+1. **Given** a table with AE-encrypted columns and AKV-stored CMK, **When** `ExecuteReaderAsync` is called, **Then** CEK decryption calls `CryptographyClient.UnwrapKeyAsync()` instead of the sync `UnwrapKey()`.
+2. **Given** a `CancellationToken` passed to `ExecuteReaderAsync`, **When** the token is cancelled during AKV key decryption, **Then** the operation is cancelled and a `TaskCanceledException` is thrown.
+3. **Given** a custom provider that does NOT override async methods, **When** `ExecuteReaderAsync` is called, **Then** the base class fallback wraps the sync method in `Task.FromResult` and completes successfully.
+
+### User Story 2 — Async Enclave Attestation
+
+As an application developer using Always Encrypted with secure enclaves, I want enclave attestation to be performed asynchronously, so that HTTP calls to attestation services do not block my async query execution path.
+
+**Acceptance Scenarios**:
+
+1. **Given** an enclave-enabled query using Azure Attestation, **When** `ExecuteReaderAsync` is called, **Then** `ConfigurationManager<OpenIdConnectConfiguration>.GetConfigurationAsync()` is used.
+2. **Given** an enclave-enabled query using HGS attestation, **When** `ExecuteReaderAsync` is called, **Then** the HTTP call uses `await HttpClient.GetStreamAsync()` instead of `.Result`.
+
+### User Story 3 — Sync Path Preservation
+
+All existing sync methods are preserved as-is. The `isAsync` flag in `SqlCommand` determines which path is taken. Zero behavioral change for sync callers.
+
+### User Story 4 — Custom Provider Backward Compatibility
+
+Custom providers that only implement sync `DecryptColumnEncryptionKey` continue to work. The base class default wraps the sync call in `Task.FromResult`. If the sync method throws, the returned Task is faulted (not a synchronous throw).
+
+### Edge Cases
+
+- **Cache hit for CEK**: Async path returns immediately from cache without invoking the provider.
+- **Mixed sync/async on `SemaphoreSlim`**: For sites still using `SemaphoreSlim` (non-`IMemoryCache` caches), mixing `.Wait()` and `.WaitAsync()` is safe per .NET docs. For `IMemoryCache`-backed caches, the async path uses `GetOrCreateAsync` and does not need `SemaphoreSlim`.
+- **CancellationToken in default fallback**: The base class wraps sync methods and checks the token before invocation; sync calls themselves are not cancellable.
+- **Concurrent cache misses**: Two threads may independently fetch the same key. Last write wins (idempotent). See FR-014 for optional deduplication.
+- **Enclave session cache hit**: Returns from cache without performing attestation.
+- **`ColumnEncryptionKeyCacheTtl` mutation**: Property mutation must remain inside the semaphore-held section in `SqlSymmetricKeyCache` to avoid races.
+
+## Design Decisions
+
+### 1. `Task<T>` for Public APIs
+
+Public virtual methods use `Task<T>`, not `ValueTask<T>`. The primary beneficiary (AKV) always allocates a Task due to HTTP I/O. `ValueTask<T>` has stricter usage rules that would be error-prone for third-party implementers.
+
+### 2. `CancellationToken` with Default Value
+
+Each async method accepts a `CancellationToken cancellationToken = default` parameter. This is a single `virtual` overload — callers can omit the token for convenience, and derived classes override a single method. The default implementation checks the token for cancellation before invoking the synchronous method.
+
+### 3. Certificate/CNG/CSP Providers Keep Default Fallback
+
+No async overrides — these perform local crypto (CPU-bound) that doesn't benefit from async. The base class `Task.FromResult` fallback is sufficient.
+
+### 4. Async Methods Return Tuples Instead of `out` Parameters
+
+C# async methods cannot have `out` parameters. Internal enclave methods return tuples (e.g., `Task<(SqlEnclaveSession, long, byte[], int)>`). `SqlSecurityUtility.DecryptSymmetricKeyAsync` returns `Task<(SqlClientSymmetricKey Key, SqlEncryptionKeyInfo KeyInfoChosen)>`.
+
+### 5. `ConfigureAwait(false)` on Every `await`
+
+Every `await` in library code MUST use `.ConfigureAwait(false)`. Omission causes deadlocks in ASP.NET Framework, WPF, and WinForms hosts. This is a hard correctness requirement enforced in CI.
+
+### 6. `MemoryCache.GetOrCreateAsync` for Async Cache Patterns
+
+**API**: [`CacheExtensions.GetOrCreateAsync<TItem>(IMemoryCache, Object, Func<ICacheEntry, Task<TItem>>)`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.caching.memory.cacheextensions.getorcreateasync?view=net-10.0-pp)
+
+For `IMemoryCache`-backed caches, use `GetOrCreateAsync` with an async factory delegate instead of `SemaphoreSlim` + manual `TryGetValue`/`Set`. This eliminates lock-during-I/O without requiring the check-release-fetch-relock pattern.
+
+```csharp
+var result = await _cache.GetOrCreateAsync(cacheKey, async entry =>
+{
+    entry.SlidingExpiration = _columnEncryptionKeyCacheTtl;
+    return await provider.DecryptColumnEncryptionKeyAsync(
+        masterKeyPath, algorithm, encryptedKey, ct)
+        .ConfigureAwait(false);
+}).ConfigureAwait(false);
+```
+
+**Affected**: `SqlColumnEncryptionAzureKeyVaultProvider._columnEncryptionKeyCache`
+
+For sites NOT using `IMemoryCache` (custom `Dictionary`/`ConcurrentDictionary` caches), use the check-release-fetch-relock pattern with `SemaphoreSlim`:
+
+```csharp
+await semaphore.WaitAsync(ct).ConfigureAwait(false);
+try
+{
+    if (cache.TryGetValue(key, out var cached))
+        return cached;
+}
+finally { semaphore.Release(); }  // release BEFORE I/O
+
+var value = await FetchAsync(key, ct).ConfigureAwait(false);
+
+await semaphore.WaitAsync(ct).ConfigureAwait(false);
+try { cache.Set(key, value); }
+finally { semaphore.Release(); }
+return value;
+```
+
+**Affected**: `SqlSymmetricKeyCache._cacheLock`, `AzureSqlKeyCryptographer._keyDictionarySemaphore`
+
+### 7. `GetParameterEncryptionDataReaderAsync` Must Be True `async Task`
+
+Remove the `Task.Run(() => { ... })` wrapper entirely. The method must `await` each I/O step directly using clean `async/await`, not the `AsyncHelper.ContinueTaskWithState` callback pattern.
+
+## Requirements
+
+### Functional Requirements
+
+| ID | Requirement |
+|----|-------------|
+| FR-001 | Add `virtual` async counterparts for `DecryptColumnEncryptionKey`, `EncryptColumnEncryptionKey`, `SignColumnMasterKeyMetadata`, and `VerifyColumnMasterKeyMetadata` to `SqlColumnEncryptionKeyStoreProvider`. |
+| FR-002 | Each async method accepts `CancellationToken cancellationToken = default` as a single virtual overload. Default checks token before sync fallback. |
+| FR-003 | Default async implementations wrap sync via `Task.FromResult`; return faulted Tasks (not synchronous throws) on exception. |
+| FR-004 | `SqlColumnEncryptionAzureKeyVaultProvider` overrides all 4 async methods with truly async Azure SDK calls. |
+| FR-005 | AKV provider propagates `CancellationToken` to all Azure SDK calls. |
+| FR-006 | Internal async counterparts added to enclave provider base class and all implementations. |
+| FR-007 | Enclave providers with HTTP I/O (Azure Attestation, HGS) implement truly async attestation. |
+| FR-008 | Async utility methods added: `SqlSecurityUtility.DecryptSymmetricKeyAsync` (returns tuple), `VerifyColumnMasterKeySignatureAsync`, `SqlSymmetricKeyCache.GetKeyAsync`. All propagate `CancellationToken`. |
+| FR-009 | `SqlCommand` async paths use async AE methods when `isAsync=true`. `GetParameterEncryptionDataReaderAsync` becomes true `async Task`. |
+| FR-010 | No changes to existing sync code paths or behavior. |
+| FR-011 | All new public APIs declared in `src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs`. |
+| FR-012 | Async caching: `IMemoryCache` sites use `GetOrCreateAsync`; custom-cache sites use check-release-fetch-relock with `SemaphoreSlim`. No lock held during I/O. |
+| FR-013 | Every `await` uses `.ConfigureAwait(false)`. Enforced in CI. |
+| FR-014 | Concurrent cache misses tolerated without deadlock. Last write wins. Optional deduplication via `ConcurrentDictionary<key, Task<value>>`. |
+| FR-015 | `lock(enclaveCacheLock)` replaced with `SemaphoreSlim` if async operations must run before session storage. Sync-only paths may retain `lock`. |
+
+### Key Entities
+
+| Entity | Scope | Changes |
+|--------|-------|---------|
+| `SqlColumnEncryptionKeyStoreProvider` | public abstract | +4 virtual async methods with `CancellationToken = default` |
+| `SqlColumnEncryptionAzureKeyVaultProvider` | public (separate package) | Overrides all 4 async methods with Azure SDK async calls |
+| `AzureSqlKeyCryptographer` | internal (AKV package) | +async counterparts for `AddKey`, `UnwrapKey`, `WrapKey`, `SignData`, `VerifyData` |
+| `SqlColumnEncryptionEnclaveProvider` | internal abstract | +4 abstract async methods with tuple returns |
+| `EnclaveDelegate` | internal sealed | +async dispatcher methods |
+| `SqlSecurityUtility` | internal static | +`DecryptSymmetricKeyAsync`, `VerifyColumnMasterKeySignatureAsync` |
+| `SqlSymmetricKeyCache` | internal sealed, singleton | +`GetKeyAsync` with check-release-fetch-relock |
+
+## Implementation Phases
+
+### Phase 1: Base Class API (PR #3673 — in progress)
+
+*Depends on: nothing*
+
+Add 4 virtual async methods + 4 convenience overloads to `SqlColumnEncryptionKeyStoreProvider`, update ref assemblies and XML docs.
+
+**Files**:
+- `src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionKeyStoreProvider.cs`
+- `src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs`
+- `doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml`
+
+### Phase 2: Key Store Provider Implementations
+
+*Depends on: Phase 1. Parallel with Phase 3.*
+
+#### 2A. AzureKeyVaultProvider (truly async)
+
+- `AzureSqlKeyCryptographer.cs` — Add async counterparts using Azure SDK. `AddKeyAsync` uses check-release-fetch-relock on `_keyDictionarySemaphore` (uses `Dictionary`, not `IMemoryCache`).
+- `SqlColumnEncryptionAzureKeyVaultProvider.cs` — Override 4 async methods. Use `GetOrCreateAsync` on `_columnEncryptionKeyCache`:
+
+**Async key-unwrap flow**:
+1. `await _columnEncryptionKeyCache.GetOrCreateAsync(cacheKey, async entry => { ... }).ConfigureAwait(false)`
+2. Inside factory: `await KeyCryptographer.UnwrapKeyAsync(..., ct).ConfigureAwait(false)` — I/O runs without user-managed locks
+3. Configure entry expiration via `ICacheEntry`
+4. `MemoryCache` handles cache insertion
+
+The sync path remains unchanged (`_cacheSemaphore.Wait()` + `GetOrCreate`). `GetOrCreateSignatureVerificationResult` stays sync (CPU-bound RSA).
+
+#### 2B–2D. CertificateStore, CNG, CSP Providers
+
+No changes — default base class fallback is sufficient.
+
+### Phase 3: Enclave Provider Async APIs
+
+*Depends on: nothing. Parallel with Phase 2.*
+
+- `SqlColumnEncryptionEnclaveProvider.cs` — 4 internal abstract async methods
+- `EnclaveProviderBase.cs` — `GetEnclaveSessionHelperAsync()`
+- `EnclaveSessionCache.cs` — Replace `lock` with `SemaphoreSlim` where async operations precede session storage (FR-015)
+- `NoneAttestationEnclaveProvider.cs` — Sync wrappers (no real I/O)
+- `AzureAttestationBasedEnclaveProvider.cs` — Truly async (`GetConfigurationAsync()`)
+- `VirtualSecureModeEnclaveProviderBase.cs` — Abstract `MakeRequestAsync`, `VerifyAttestationInfoAsync`
+- `VirtualSecureModeEnclaveProvider.cs` — Truly async (`HttpClient.GetStreamAsync`)
+- `EnclaveDelegate.Crypto.cs` — Async dispatcher methods
+
+### Phase 4: Async Utility Layer
+
+*Depends on: Phase 1.*
+
+- `SqlSecurityUtility.cs`:
+  - `DecryptSymmetricKeyAsync` → returns `Task<(SqlClientSymmetricKey Key, SqlEncryptionKeyInfo KeyInfoChosen)>`
+  - `GetKeyFromLocalProvidersAsync` — propagates `CancellationToken`
+  - `VerifyColumnMasterKeySignatureAsync` — propagates `CancellationToken`
+- `SqlSymmetricKeyCache.cs`:
+  - `GetKeyAsync` — check-release-fetch-relock on static `_cacheLock`; propagates `CancellationToken`
+
+> **Note**: Phases 1–4 deliver async infrastructure. End-to-end benefit requires Phase 5.
+
+### Phase 5: Async Call-Site Integration
+
+*Depends on: Phase 4.*
+
+- `SqlCommand.Encryption.cs`:
+  1. `ReadDescribeEncryptionParameterResultsKeysAsync` → `VerifyColumnMasterKeySignatureAsync()`
+  2. `ReadDescribeEncryptionParameterResultsMetadataAsync` → `DecryptSymmetricKeyAsync()` (**highest impact**)
+  3. `ReadDescribeEncryptionParameterResultsAsync` → orchestrates above
+  4. **Refactor `GetParameterEncryptionDataReaderAsync`** into true `async Task` — remove `Task.Run` wrapper
+  5. `TryFetchInputParameterEncryptionInfoAsync` → `EnclaveDelegate.GetEnclaveSessionAsync()`
+
+### Phase 6: Testing & Documentation
+
+*Spans all phases.*
+
+**Unit Tests** (`tests/UnitTests/`): Default fallback, cancellation, faulted Tasks  
+**Functional Tests** (`tests/FunctionalTests/`): `DummyKeyStoreProvider` async overrides  
+**Manual Tests** (`tests/ManualTests/`): AKV end-to-end, enclave attestation async, encrypted query async  
+**CI Gate**: Roslyn analyzer or grep check for `.ConfigureAwait(false)` on every `await`  
+**Documentation**: XML docs, `doc/samples/` async AE examples
+
+## New Public API Surface
+
+### SqlColumnEncryptionKeyStoreProvider
+
+```csharp
+public abstract class SqlColumnEncryptionKeyStoreProvider
+{
+    // Existing (unchanged)
+    public abstract byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey);
+    public abstract byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey);
+    public virtual byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations);
+    public virtual bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature);
+    public virtual TimeSpan? ColumnEncryptionKeyCacheTtl { get; set; }
+
+    // NEW: Async with optional CancellationToken (virtual, overridable)
+    public virtual Task<byte[]> DecryptColumnEncryptionKeyAsync(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey, CancellationToken cancellationToken = default);
+    public virtual Task<byte[]> EncryptColumnEncryptionKeyAsync(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey, CancellationToken cancellationToken = default);
+    public virtual Task<byte[]> SignColumnMasterKeyMetadataAsync(string masterKeyPath, bool allowEnclaveComputations, CancellationToken cancellationToken = default);
+    public virtual Task<bool> VerifyColumnMasterKeyMetadataAsync(string masterKeyPath, bool allowEnclaveComputations, byte[] signature, CancellationToken cancellationToken = default);
+}
+```
+
+### SqlColumnEncryptionAzureKeyVaultProvider
+
+```csharp
+public class SqlColumnEncryptionAzureKeyVaultProvider : SqlColumnEncryptionKeyStoreProvider
+{
+    // Overrides — truly async via Azure SDK
+    public override Task<byte[]> DecryptColumnEncryptionKeyAsync(..., CancellationToken cancellationToken = default);
+    public override Task<byte[]> EncryptColumnEncryptionKeyAsync(..., CancellationToken cancellationToken = default);
+    public override Task<byte[]> SignColumnMasterKeyMetadataAsync(..., CancellationToken cancellationToken = default);
+    public override Task<bool> VerifyColumnMasterKeyMetadataAsync(..., CancellationToken cancellationToken = default);
+}
+```
+
+## Success Criteria
+
+| ID | Criterion |
+|----|-----------|
+| SC-001 | `ExecuteReaderAsync` with AE + AKV does NOT block any ThreadPool thread on HTTP I/O. |
+| SC-002 | All existing AE tests pass unchanged — zero sync regressions. |
+| SC-003 | `Task.Run` is no longer used in `GetParameterEncryptionDataReaderAsync`. |
+| SC-004 | `CancellationToken` propagates from `SqlCommand` async methods through to Azure SDK calls. |
+| SC-005 | Custom providers with only sync implementations continue to work in async paths. |
+
+## Assumptions
+
+- Azure SDK async methods (`UnwrapKeyAsync`, `WrapKeyAsync`, etc.) are stable and production-ready.
+- `SemaphoreSlim` supports mixed `.Wait()` / `.WaitAsync()` on the same instance.
+- `SqlColumnEncryptionEnclaveProvider` is internal — API changes have no public impact.
+- The existing `isAsync` flag in `SqlCommand` determines sync vs async AE paths.
+- PR #3673 has not shipped — adding `CancellationToken` is non-breaking.
+- Certificate/CNG/CSP providers perform local crypto; `Task.FromResult` is sufficient.
+- `Microsoft.Extensions.Caching.Abstractions` (already referenced by AKV provider) provides `GetOrCreateAsync`.
+
+## Further Considerations
+
+1. **`ConfigureAwait(false)` CI enforcement**: Add a Roslyn analyzer or grep-based check to prevent regressions.
+2. **Third-party provider guidance**: Document how custom providers should override async methods, use `ConfigureAwait(false)`, support cancellation, and avoid lock-during-I/O.
+3. **Performance benchmarking**: After Phase 5, quantify ThreadPool savings and latency improvements under load.
+4. **In-flight request deduplication**: Optional `ConcurrentDictionary<string, Task<byte[]>>` for concurrent cold-cache AKV requests (FR-014).
+5. **`ValueTask<T>` for internal fast paths**: Internal methods like `SqlSymmetricKeyCache.GetKeyAsync` have high cache-hit rates — `ValueTask<T>` avoids Task allocations. P2 optimization with no API impact.
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
index f0e785a36e..a5e3f1a473 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
@@ -716,12 +716,20 @@ public abstract class SqlColumnEncryptionKeyStoreProvider
     protected SqlColumnEncryptionKeyStoreProvider() { }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/DecryptColumnEncryptionKey/*'/>
     public abstract byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey);
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/DecryptColumnEncryptionKeyAsync/*'/>
+    public virtual System.Threading.Tasks.Task<byte[]> DecryptColumnEncryptionKeyAsync(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey, System.Threading.CancellationToken cancellationToken = default) { throw null; }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/EncryptColumnEncryptionKey/*'/>
     public abstract byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey);
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/EncryptColumnEncryptionKeyAsync/*'/>
+    public virtual System.Threading.Tasks.Task<byte[]> EncryptColumnEncryptionKeyAsync(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey, System.Threading.CancellationToken cancellationToken = default) { throw null; }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/SignColumnMasterKeyMetadata/*'/>
     public virtual byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations) { throw null; }
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/SignColumnMasterKeyMetadataAsync/*'/>
+    public virtual System.Threading.Tasks.Task<byte[]> SignColumnMasterKeyMetadataAsync(string masterKeyPath, bool allowEnclaveComputations, System.Threading.CancellationToken cancellationToken = default) { throw null; }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/VerifyColumnMasterKeyMetadata/*'/>
     public virtual bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature) { throw null; }
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/VerifyColumnMasterKeyMetadataAsync/*'/>
+    public virtual System.Threading.Tasks.Task<bool> VerifyColumnMasterKeyMetadataAsync(string masterKeyPath, bool allowEnclaveComputations, byte[] signature, System.Threading.CancellationToken cancellationToken = default) { throw null; }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/ColumnEncryptionKeyCacheTtl/*'/>
     public virtual System.TimeSpan? ColumnEncryptionKeyCacheTtl { get { throw null; } set { } }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionKeyStoreProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionKeyStoreProvider.cs
index 641e09e8ba..2daa2dbab3 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionKeyStoreProvider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlColumnEncryptionKeyStoreProvider.cs
@@ -3,6 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Data.Common;
 
 namespace Microsoft.Data.SqlClient
 {
@@ -16,19 +19,91 @@ public abstract class SqlColumnEncryptionKeyStoreProvider
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/DecryptColumnEncryptionKey/*'/>
         public abstract byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey);
 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/DecryptColumnEncryptionKeyAsync/*'/>
+        public virtual Task<byte[]> DecryptColumnEncryptionKeyAsync(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey, CancellationToken cancellationToken = default)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromCanceled<byte[]>(cancellationToken);
+            }
+
+            try
+            {
+                return Task.FromResult(DecryptColumnEncryptionKey(masterKeyPath, encryptionAlgorithm, encryptedColumnEncryptionKey));
+            }
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
+            {
+                return Task.FromException<byte[]>(e);
+            }
+        }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/EncryptColumnEncryptionKey/*'/>
         public abstract byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey);
 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/EncryptColumnEncryptionKeyAsync/*'/>
+        public virtual Task<byte[]> EncryptColumnEncryptionKeyAsync(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey, CancellationToken cancellationToken = default)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromCanceled<byte[]>(cancellationToken);
+            }
+
+            try
+            {
+                return Task.FromResult(EncryptColumnEncryptionKey(masterKeyPath, encryptionAlgorithm, columnEncryptionKey));
+            }
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
+            {
+                return Task.FromException<byte[]>(e);
+            }
+        }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/SignColumnMasterKeyMetadata/*'/>
         public virtual byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations)
         {
             throw new NotImplementedException();
         }
 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/SignColumnMasterKeyMetadataAsync/*'/>
+        public virtual Task<byte[]> SignColumnMasterKeyMetadataAsync(string masterKeyPath, bool allowEnclaveComputations, CancellationToken cancellationToken = default)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromCanceled<byte[]>(cancellationToken);
+            }
+
+            try
+            {
+                return Task.FromResult(SignColumnMasterKeyMetadata(masterKeyPath, allowEnclaveComputations));
+            }
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
+            {
+                return Task.FromException<byte[]>(e);
+            }
+        }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/VerifyColumnMasterKeyMetadata/*'/>
         public virtual bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations, byte[] signature)
         {
             throw new NotImplementedException();
         }
+
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlColumnEncryptionKeyStoreProvider.xml' path='docs/members[@name="SqlColumnEncryptionKeyStoreProvider"]/VerifyColumnMasterKeyMetadataAsync/*'/>
+        public virtual Task<bool> VerifyColumnMasterKeyMetadataAsync(string masterKeyPath, bool allowEnclaveComputations, byte[] signature, CancellationToken cancellationToken = default)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromCanceled<bool>(cancellationToken);
+            }
+
+            try
+            {
+                return Task.FromResult(VerifyColumnMasterKeyMetadata(masterKeyPath, allowEnclaveComputations, signature));
+            }
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
+            {
+                return Task.FromException<bool>(e);
+            }
+        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/AlwaysEncrypted/SqlColumnEncryptionKeyStoreProviderAsyncShould.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/AlwaysEncrypted/SqlColumnEncryptionKeyStoreProviderAsyncShould.cs
new file mode 100644
index 0000000000..ae78544227
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/AlwaysEncrypted/SqlColumnEncryptionKeyStoreProviderAsyncShould.cs
@@ -0,0 +1,289 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.AlwaysEncrypted
+{
+    /// <summary>
+    /// Tests for the async virtual methods on <see cref="SqlColumnEncryptionKeyStoreProvider"/>,
+    /// verifying default fallback behavior, cancellation, faulted tasks, and convenience overloads.
+    /// </summary>
+    public class SqlColumnEncryptionKeyStoreProviderAsyncShould
+    {
+        #region Default fallback behavior
+
+        /// <summary>
+        /// Verifies that the default async decrypt implementation wraps the sync result via Task.FromResult.
+        /// </summary>
+        [Fact]
+        public async Task DecryptColumnEncryptionKeyAsync_DefaultFallback_ReturnsSameResultAsSyncMethod()
+        {
+            var provider = new TestKeyStoreProvider();
+            byte[] expected = provider.DecryptColumnEncryptionKey("path", "algo", new byte[] { 1, 2, 3 });
+            byte[] actual = await provider.DecryptColumnEncryptionKeyAsync("path", "algo", new byte[] { 1, 2, 3 }, CancellationToken.None);
+            Assert.Equal(expected, actual);
+        }
+
+        /// <summary>
+        /// Verifies that the default async encrypt implementation wraps the sync result via Task.FromResult.
+        /// </summary>
+        [Fact]
+        public async Task EncryptColumnEncryptionKeyAsync_DefaultFallback_ReturnsSameResultAsSyncMethod()
+        {
+            var provider = new TestKeyStoreProvider();
+            byte[] expected = provider.EncryptColumnEncryptionKey("path", "algo", new byte[] { 4, 5, 6 });
+            byte[] actual = await provider.EncryptColumnEncryptionKeyAsync("path", "algo", new byte[] { 4, 5, 6 }, CancellationToken.None);
+            Assert.Equal(expected, actual);
+        }
+
+        #endregion
+
+        #region Faulted task behavior
+
+        /// <summary>
+        /// Verifies that when the sync decrypt method throws, the async version returns a faulted Task
+        /// rather than throwing synchronously.
+        /// </summary>
+        [Fact]
+        public async Task DecryptColumnEncryptionKeyAsync_WhenSyncThrows_ReturnsFaultedTask()
+        {
+            var provider = new ThrowingKeyStoreProvider();
+            Task<byte[]> task = provider.DecryptColumnEncryptionKeyAsync("path", "algo", new byte[] { 1 }, CancellationToken.None);
+
+            Assert.True(task.IsFaulted);
+            await Assert.ThrowsAsync<InvalidOperationException>(() => task);
+        }
+
+        /// <summary>
+        /// Verifies that when the sync encrypt method throws, the async version returns a faulted Task
+        /// rather than throwing synchronously.
+        /// </summary>
+        [Fact]
+        public async Task EncryptColumnEncryptionKeyAsync_WhenSyncThrows_ReturnsFaultedTask()
+        {
+            var provider = new ThrowingKeyStoreProvider();
+            Task<byte[]> task = provider.EncryptColumnEncryptionKeyAsync("path", "algo", new byte[] { 1 }, CancellationToken.None);
+
+            Assert.True(task.IsFaulted);
+            await Assert.ThrowsAsync<InvalidOperationException>(() => task);
+        }
+
+        /// <summary>
+        /// Verifies that the base class SignColumnMasterKeyMetadata throws NotImplementedException,
+        /// and the async version surfaces this as a faulted Task.
+        /// </summary>
+        [Fact]
+        public async Task SignColumnMasterKeyMetadataAsync_DefaultImplementation_ReturnsFaultedTask()
+        {
+            var provider = new TestKeyStoreProvider();
+            Task<byte[]> task = provider.SignColumnMasterKeyMetadataAsync("path", true, CancellationToken.None);
+
+            Assert.True(task.IsFaulted);
+            await Assert.ThrowsAsync<NotImplementedException>(() => task);
+        }
+
+        /// <summary>
+        /// Verifies that the base class VerifyColumnMasterKeyMetadata throws NotImplementedException,
+        /// and the async version surfaces this as a faulted Task.
+        /// </summary>
+        [Fact]
+        public async Task VerifyColumnMasterKeyMetadataAsync_DefaultImplementation_ReturnsFaultedTask()
+        {
+            var provider = new TestKeyStoreProvider();
+            Task<bool> task = provider.VerifyColumnMasterKeyMetadataAsync("path", true, new byte[] { 1 }, CancellationToken.None);
+
+            Assert.True(task.IsFaulted);
+            await Assert.ThrowsAsync<NotImplementedException>(() => task);
+        }
+
+        #endregion
+
+        #region Cancellation behavior
+
+        /// <summary>
+        /// Verifies that passing an already-cancelled token returns a cancelled Task immediately.
+        /// </summary>
+        [Fact]
+        public void DecryptColumnEncryptionKeyAsync_CancelledToken_ReturnsCancelledTask()
+        {
+            var provider = new TestKeyStoreProvider();
+            using var cts = new CancellationTokenSource();
+            cts.Cancel();
+
+            Task<byte[]> task = provider.DecryptColumnEncryptionKeyAsync("path", "algo", new byte[] { 1, 2, 3 }, cts.Token);
+
+            Assert.True(task.IsCanceled);
+        }
+
+        /// <summary>
+        /// Verifies that passing an already-cancelled token returns a cancelled Task immediately.
+        /// </summary>
+        [Fact]
+        public void EncryptColumnEncryptionKeyAsync_CancelledToken_ReturnsCancelledTask()
+        {
+            var provider = new TestKeyStoreProvider();
+            using var cts = new CancellationTokenSource();
+            cts.Cancel();
+
+            Task<byte[]> task = provider.EncryptColumnEncryptionKeyAsync("path", "algo", new byte[] { 4, 5, 6 }, cts.Token);
+
+            Assert.True(task.IsCanceled);
+        }
+
+        /// <summary>
+        /// Verifies that passing an already-cancelled token returns a cancelled Task immediately.
+        /// </summary>
+        [Fact]
+        public void SignColumnMasterKeyMetadataAsync_CancelledToken_ReturnsCancelledTask()
+        {
+            var provider = new TestKeyStoreProvider();
+            using var cts = new CancellationTokenSource();
+            cts.Cancel();
+
+            Task<byte[]> task = provider.SignColumnMasterKeyMetadataAsync("path", true, cts.Token);
+
+            Assert.True(task.IsCanceled);
+        }
+
+        /// <summary>
+        /// Verifies that passing an already-cancelled token returns a cancelled Task immediately.
+        /// </summary>
+        [Fact]
+        public void VerifyColumnMasterKeyMetadataAsync_CancelledToken_ReturnsCancelledTask()
+        {
+            var provider = new TestKeyStoreProvider();
+            using var cts = new CancellationTokenSource();
+            cts.Cancel();
+
+            Task<bool> task = provider.VerifyColumnMasterKeyMetadataAsync("path", true, new byte[] { 1 }, cts.Token);
+
+            Assert.True(task.IsCanceled);
+        }
+
+        /// <summary>
+        /// Verifies that a non-cancelled (live) token does not interfere with successful decrypt.
+        /// </summary>
+        [Fact]
+        public async Task DecryptColumnEncryptionKeyAsync_LiveToken_CompletesSuccessfully()
+        {
+            var provider = new TestKeyStoreProvider();
+            using var cts = new CancellationTokenSource();
+
+            byte[] result = await provider.DecryptColumnEncryptionKeyAsync("path", "algo", new byte[] { 7, 8, 9 }, cts.Token);
+            Assert.Equal(new byte[] { 7, 8, 9 }, result);
+        }
+
+        /// <summary>
+        /// Verifies that a non-cancelled (live) token does not interfere with successful encrypt.
+        /// </summary>
+        [Fact]
+        public async Task EncryptColumnEncryptionKeyAsync_LiveToken_CompletesSuccessfully()
+        {
+            var provider = new TestKeyStoreProvider();
+            using var cts = new CancellationTokenSource();
+
+            byte[] result = await provider.EncryptColumnEncryptionKeyAsync("path", "algo", new byte[] { 7, 8, 9 }, cts.Token);
+            Assert.Equal(new byte[] { 7, 8, 9 }, result);
+        }
+
+        #endregion
+
+        #region Default CancellationToken parameter
+
+        /// <summary>
+        /// Verifies calling without CancellationToken (uses default) works for decrypt.
+        /// </summary>
+        [Fact]
+        public async Task DecryptColumnEncryptionKeyAsync_DefaultCancellationToken_Works()
+        {
+            var provider = new TestKeyStoreProvider();
+            byte[] result = await provider.DecryptColumnEncryptionKeyAsync("path", "algo", new byte[] { 1, 2, 3 });
+            Assert.NotNull(result);
+            Assert.Equal(new byte[] { 1, 2, 3 }, result);
+        }
+
+        /// <summary>
+        /// Verifies calling without CancellationToken (uses default) works for encrypt.
+        /// </summary>
+        [Fact]
+        public async Task EncryptColumnEncryptionKeyAsync_DefaultCancellationToken_Works()
+        {
+            var provider = new TestKeyStoreProvider();
+            byte[] result = await provider.EncryptColumnEncryptionKeyAsync("path", "algo", new byte[] { 4, 5, 6 });
+            Assert.NotNull(result);
+            Assert.Equal(new byte[] { 4, 5, 6 }, result);
+        }
+
+        /// <summary>
+        /// Verifies calling sign without CancellationToken returns a faulted Task
+        /// (base class throws NotImplementedException).
+        /// </summary>
+        [Fact]
+        public async Task SignColumnMasterKeyMetadataAsync_DefaultCancellationToken_ReturnsFaultedTask()
+        {
+            var provider = new TestKeyStoreProvider();
+            Task<byte[]> task = provider.SignColumnMasterKeyMetadataAsync("path", true);
+
+            Assert.True(task.IsFaulted);
+            await Assert.ThrowsAsync<NotImplementedException>(() => task);
+        }
+
+        /// <summary>
+        /// Verifies calling verify without CancellationToken returns a faulted Task
+        /// (base class throws NotImplementedException).
+        /// </summary>
+        [Fact]
+        public async Task VerifyColumnMasterKeyMetadataAsync_DefaultCancellationToken_ReturnsFaultedTask()
+        {
+            var provider = new TestKeyStoreProvider();
+            Task<bool> task = provider.VerifyColumnMasterKeyMetadataAsync("path", true, new byte[] { 1 });
+
+            Assert.True(task.IsFaulted);
+            await Assert.ThrowsAsync<NotImplementedException>(() => task);
+        }
+
+        #endregion
+
+        #region Test helpers
+
+        /// <summary>
+        /// A test provider that implements sync methods with pass-through behavior (returns input as-is).
+        /// </summary>
+        private class TestKeyStoreProvider : SqlColumnEncryptionKeyStoreProvider
+        {
+            public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey)
+            {
+                return encryptedColumnEncryptionKey;
+            }
+
+            public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey)
+            {
+                return columnEncryptionKey;
+            }
+        }
+
+        /// <summary>
+        /// A test provider whose sync methods always throw <see cref="InvalidOperationException"/>.
+        /// </summary>
+        private class ThrowingKeyStoreProvider : SqlColumnEncryptionKeyStoreProvider
+        {
+            public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey)
+            {
+                throw new InvalidOperationException("Decrypt failed");
+            }
+
+            public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey)
+            {
+                throw new InvalidOperationException("Encrypt failed");
+            }
+        }
+
+        #endregion
+    }
+}

From b0e988bfb7f866ac41c3be05ddd1c570cb0f3375 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:47:01 -0300
Subject: [PATCH 186/298] Remove ARM64 special handling from install-dotnet
 template (#4442)

UseDotNet@2 v271+ now correctly detects win-arm64 and installs the
matching SDK/runtime, fixing the long-standing bug that installed x86
on ARM64 hosts:

  https://github.com/microsoft/azure-pipelines-tasks/issues/20300

This removes our workaround:

- install-dotnet.yml: drop the ARM64 branch and the custom PowerShell
  installer step. Replace the architecture enum (x64/x86/arm64) with a
  forceX86 boolean, since forcing x86 was the only remaining behavior.
- Delete install-dotnet-arm64.ps1 (no longer referenced).
- ci-run-tests-job.yml: always pass runtimes in UseDotNet@2 format,
  remove the isArm64 parameter, and use forceX86 for the x86 install.
- ci-run-tests-stage.yml: drop the isArm64 passthroughs.
- dotnet-sqlclient-ci-core.yml: drop isArm64 from the arm64 matrix
  entry (the ARM64 agent is still selected via pool/images).
---
 .../common/steps/install-dotnet-arm64.ps1     | 282 ------------------
 eng/pipelines/common/steps/install-dotnet.yml | 124 ++------
 .../templates/jobs/ci-run-tests-job.yml       |  15 +-
 .../templates/stages/ci-run-tests-stage.yml   |   2 -
 eng/pipelines/dotnet-sqlclient-ci-core.yml    |   1 -
 5 files changed, 34 insertions(+), 390 deletions(-)
 delete mode 100644 eng/pipelines/common/steps/install-dotnet-arm64.ps1

diff --git a/eng/pipelines/common/steps/install-dotnet-arm64.ps1 b/eng/pipelines/common/steps/install-dotnet-arm64.ps1
deleted file mode 100644
index 95d580543b..0000000000
--- a/eng/pipelines/common/steps/install-dotnet-arm64.ps1
+++ /dev/null
@@ -1,282 +0,0 @@
-<#
-.SYNOPSIS
-  This script installs dotnet SDKs and Runtimes for ARM64.
-
-.DESCRIPTION
-  Special handling is required for ARM64 due to a bug in UseDotNet@2:
-
-  [BUG]: UseDotNet@2 task installs x86 build
-  https://github.com/microsoft/azure-pipelines-tasks/issues/20300
-
-  The downloaded dotnet-install.ps1 script is kept in the $InstallDir to avoid
-  downloading it multiple times during the pipeline job.
-
-  The following environment variables are set for subsequent steps in the pipeline:
-
-    DOTNET_ROOT: Set to $InstallDir.
-    PATH: $DOTNET_ROOT is prepended to the PATH environment variable.
-
-.PARAMETER Debug
-  True to emit debug messages.  Default is false.
-
-.PARAMETER DryRun
-  True to perform a dry run of the installation.  Default is false.
-
-.PARAMETER GlobalJson
-  The path to the global.json file that specifies the exact SDK version to
-  install.  Default is 'global.json'.
-
-.PARAMETER InstallDir
-  The directory to install the SDKs and Runtimes into, typically the
-  pipeline's $(Agent.ToolsDirectory)/dotnet directory.
-
-  The dotnet-install.ps1 script is downloaded into this directory if it is not
-  already present.
-
-  Default is '.'.
-
-.PARAMETER Runtimes
-  The versions of the .NET Runtimes to install.  These must be in the runtime
-  channel format of X.Y expected by the dotnet-install.ps1 script.  Default is
-  an empty array.
-
-.NOTES
-  Licensed to the .NET Foundation under one or more agreements.
-  The .NET Foundation licenses this file to you under the MIT license.
-  See the LICENSE file in the project root for more information.
-#>
-
-param
-(
-  [switch]$Debug,
-  [switch]$DryRun,
-  [string]$GlobalJson = "global.json",
-  [string]$InstallDir = '.',
-  [string[]]$Runtimes = @()
-)
-
-# Stop on all errors.
-$ErrorActionPreference = 'Stop'
-
-# Maximum number of retry attempts for transient install failures (e.g.
-# corrupt downloads, network timeouts).
-$maxAttempts = 3
-$retryDelaySec = 10
-
-#------------------------------------------------------------------------------
-# Invoke dotnet-install.ps1 with retry logic.  On each attempt the script is
-# called with the supplied $Params.  If a non-zero exit code is returned, or
-# if the optional $Verify script-block throws, the attempt is considered failed
-# and will be retried after a short delay.
-
-function Invoke-DotNetInstall
-{
-  param
-  (
-    [Parameter(Mandatory)]
-    [string]$Description,
-
-    [Parameter(Mandatory)]
-    [hashtable]$Params,
-
-    [scriptblock]$Verify = $null
-  )
-
-  for ($attempt = 1; $attempt -le $maxAttempts; $attempt++)
-  {
-    try
-    {
-      Write-Host "$Description (attempt $attempt of $maxAttempts)"
-
-      $global:LASTEXITCODE = 0
-      & "$InstallDir/dotnet-install.ps1" -Verbose:$Debug -DryRun:$DryRun @Params
-      $installSucceeded = $?
-
-      if (-not $installSucceeded)
-      {
-        throw "dotnet-install.ps1 failed."
-      }
-
-      if ($global:LASTEXITCODE -ne 0)
-      {
-        throw "dotnet-install.ps1 failed with exit code $global:LASTEXITCODE"
-      }
-
-      if ($Verify)
-      {
-        & $Verify
-      }
-
-      return
-    }
-    catch
-    {
-      Write-Warning "Attempt $attempt failed: $_"
-
-      if ($attempt -ge $maxAttempts)
-      {
-        throw "$Description failed after $maxAttempts attempts. Last error: $_"
-      }
-
-      Write-Host "Retrying in $retryDelaySec seconds..."
-      Start-Sleep -Seconds $retryDelaySec
-    }
-  }
-}
-
-#------------------------------------------------------------------------------
-# Emit our command-line arguments.
-
-if ($Debug)
-{
-  Write-Host "Command-line arguments:"
-  Write-Host ($PSBoundParameters | ConvertTo-Json -Depth 1)
-}
-
-#------------------------------------------------------------------------------
-# Download the dotnet-install.ps1 script if not already present.
-
-if (-not (Test-Path -Path "$InstallDir/dotnet-install.ps1" -PathType Leaf))
-{
-  if (-not (Test-Path -PathType Container -Path "$InstallDir"))
-  {
-    Write-Host "Creating install dir: $InstallDir ..."
-
-    New-Item -ItemType Directory -Force -Path "$InstallDir"
-  }
-
-  Write-Host "Downloading dotnet-install.ps1..."
-
-  $params =
-  @{
-    Uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"
-    OutFile = "$InstallDir/dotnet-install.ps1"
-  }
-
-  Invoke-WebRequest @params -Verbose:$Debug
-
-  if ($Debug)
-  {
-    Write-Host "Emitting dotnet-install.ps1 help:"
-    Get-Help "$InstallDir/dotnet-install.ps1"
-  }
-}
-
-#------------------------------------------------------------------------------
-# Read the SDK versions from global.json.
-
-$globalJsonContent = Get-Content -Raw -Path "$GlobalJson" | ConvertFrom-Json
-$sdkVersion = $globalJsonContent.sdk.version
-
-if ($Debug)
-{
-  Write-Host "global.json content:"
-  Write-Host ($globalJsonContent | ConvertTo-Json -Depth 1)
-
-  Write-Host "SDK version: $sdkVersion"
-}
-
-#------------------------------------------------------------------------------
-# Install the SDK.
-
-$installParams =
-@{
-  Architecture = "arm64"
-  Version =      "$sdkVersion"
-  InstallDir =   "$InstallDir"
-}
-
-if ($Debug)
-{
-  Write-Host "dotnet-install.ps1 parameters:"
-  Write-Host ($installParams | ConvertTo-Json -Depth 1)
-}
-
-# Verify the SDK was actually installed.  dotnet-install.ps1 can silently fail
-# with exit code 0 when the package download is corrupt or the size cannot be
-# measured.
-$verifySdk =
-  if (-not $DryRun)
-  {
-    {
-      $dotnetExe = Join-Path $InstallDir "dotnet"
-      $installedSdks = & $dotnetExe --list-sdks 2>&1
-      $installedSdksText = [string]::Join("`n", @($installedSdks))
-
-      Write-Host "Installed SDKs:`n$installedSdksText"
-
-      $sdkPattern = "(?m)^$([regex]::Escape($sdkVersion))\s+\["
-
-      if (-not [regex]::IsMatch($installedSdksText, $sdkPattern))
-      {
-        throw "SDK $sdkVersion is not present after installation."
-      }
-
-      Write-Host "Verified SDK $sdkVersion is installed."
-    }
-  }
-
-Invoke-DotNetInstall `
-  -Description "Installing .NET SDK version: $sdkVersion" `
-  -Params $installParams `
-  -Verify $verifySdk
-
-#------------------------------------------------------------------------------
-# Install the Runtimes, if any.
-
-foreach ($channel in $Runtimes)
-{
-  $installParams =
-  @{
-    Architecture = "arm64"
-    Channel =      "$channel"
-    InstallDir =   "$InstallDir"
-    Quality =      "GA"
-    Runtime =      "dotnet"
-  }
-
-  if ($Debug)
-  {
-    Write-Host "dotnet-install.ps1 parameters:"
-    Write-Host ($installParams | ConvertTo-Json -Depth 1)
-  }
-
-  # Verify the runtime was actually installed.  Use the same guard against
-  # silent corruption that we use for the SDK.
-  $verifyRuntime =
-    if (-not $DryRun)
-    {
-      # Capture $channel in a local variable so the script-block closure
-      # binds to the current iteration value.
-      $ch = $channel
-      {
-        $dotnetExe = Join-Path $InstallDir "dotnet"
-        $installedRuntimes = & $dotnetExe --list-runtimes 2>&1
-        $installedRuntimesText = [string]::Join("`n", @($installedRuntimes))
-
-        Write-Host "Installed runtimes:`n$installedRuntimesText"
-
-        $runtimePattern = "Microsoft\.NETCore\.App $([regex]::Escape($ch))\."
-
-        if (-not [regex]::IsMatch($installedRuntimesText, $runtimePattern))
-        {
-          throw "Runtime $ch is not present after installation."
-        }
-
-        Write-Host "Verified runtime $ch is installed."
-      }
-    }
-
-  Invoke-DotNetInstall `
-    -Description "Installing .NET Runtime GA channel: $channel" `
-    -Params $installParams `
-    -Verify $verifyRuntime
-}
-
-#------------------------------------------------------------------------------
-# Set the DOTNET_ROOT environment variable, and add the tools dir to the path.
-# These values propagate back out to the pipeline and are used by subsequent
-# steps.
-
-Write-Host "##vso[task.setvariable variable=DOTNET_ROOT]$InstallDir"
-Write-Host "##vso[task.prependpath]$InstallDir"
diff --git a/eng/pipelines/common/steps/install-dotnet.yml b/eng/pipelines/common/steps/install-dotnet.yml
index 6ce99316b2..70179279b3 100644
--- a/eng/pipelines/common/steps/install-dotnet.yml
+++ b/eng/pipelines/common/steps/install-dotnet.yml
@@ -8,21 +8,19 @@
 # SDK version is always read from the root global.json file.  The Runtimes to
 # install, if any, may be provided as an array of version strings.
 #
-# Special handling is required for ARM64 due to a bug in UseDotNet@2:
-#
-# [BUG]: UseDotNet@2 task installs x86 build
-# https://github.com/microsoft/azure-pipelines-tasks/issues/20300
+# The UseDotNet@2 task installs the SDK/Runtimes for the agent's native
+# architecture, including ARM64.  (The historical ARM64 workaround for
+# https://github.com/microsoft/azure-pipelines-tasks/issues/20300 is no longer
+# needed now that the task correctly detects win-arm64 in v271+.)
 
 parameters:
 
-  # The architecture to install for.
-  - name: architecture
-    type: string
-    values:
-      - x64
-      - x86
-      - arm64
-    default: x64
+  # True to force installation of the x86 build (e.g. for x86 test runs on an
+  # x64 host).  When false, UseDotNet@2 installs for the agent's native
+  # architecture.
+  - name: forceX86
+    type: boolean
+    default: false
 
   # True to emit debug information and steps.
   - name: debug
@@ -34,14 +32,8 @@ parameters:
     type: string
     default: $(Agent.ToolsDirectory)/dotnet
 
-  # The list of .NET Runtimes to install, if any.
-  #
-  # When architecture is arm64, these must adhere to the format expected by the
-  # dotnet-install.ps1 script's -Channel option:
-  #
-  # https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
-  #
-  # Otherwise, these must adhere to the format expected by the UseDotNet@2 task:
+  # The list of .NET Runtimes to install, if any.  These must adhere to the
+  # format expected by the UseDotNet@2 task:
   #
   # https://learn.microsoft.com/en-us/azure/devops/pipelines/tasks/reference/use-dotnet-v2
   #
@@ -51,86 +43,34 @@ parameters:
 
 steps:
 
-  # Use the UseDotNet@2 task for all architectures except ARM64.
-  - ${{ if ne(parameters.architecture, 'arm64') }}:
+  # Install the SDK listed in the global.json file.
+  #
+  # retryCountOnTaskFailure is set because UseDotNet@2 fails intermittently
+  # in CI due to transient network/CDN issues when downloading the SDK.
+  - task: UseDotNet@2
+    displayName: Install .NET SDK (global.json)
+    retryCountOnTaskFailure: 3
+    inputs:
+      installationPath: ${{ parameters.installDir }}
+      packageType: sdk
+      useGlobalJson: true
+    ${{ if parameters.forceX86 }}:
+      env:
+        PROCESSOR_ARCHITECTURE: x86
 
-    # Install the SDK listed in the global.json file.
-    #
-    # retryCountOnTaskFailure is set because UseDotNet@2 fails intermittently
-    # in CI due to transient network/CDN issues when downloading the SDK.
+  # Install the desired Runtimes, if any.
+  - ${{ each version in parameters.runtimes }}:
     - task: UseDotNet@2
-      displayName: Install .NET SDK (global.json)
+      displayName: Install .NET ${{ version }} Runtime
       retryCountOnTaskFailure: 3
       inputs:
         installationPath: ${{ parameters.installDir }}
-        packageType: sdk
-        useGlobalJson: true
-      ${{ if eq(parameters.architecture, 'x86') }}:
+        packageType: runtime
+        version: ${{ version }}
+      ${{ if parameters.forceX86 }}:
         env:
           PROCESSOR_ARCHITECTURE: x86
 
-
-    # Install the desired Runtimes, if any.
-    - ${{ each version in parameters.runtimes }}:
-      - task: UseDotNet@2
-        displayName: Install .NET ${{ version }} Runtime
-        retryCountOnTaskFailure: 3
-        inputs:
-          installationPath: ${{ parameters.installDir }}
-          packageType: runtime
-          version: ${{ version }}
-        ${{ if eq(parameters.architecture, 'x86') }}:
-          env:
-            PROCESSOR_ARCHITECTURE: x86
-
-  # Special handling for ARM64.
-  - ${{ else }}:
-
-    # Use the install script for ARM64.
-    #
-    # retryCountOnTaskFailure provides an outer retry around the script's
-    # internal retry loop, in case the script download itself or the entire
-    # step fails due to transient issues.
-    - task: PowerShell@2
-      displayName: Install .NET SDK and Runtimes for ARM64
-      retryCountOnTaskFailure: 3
-      inputs:
-        targetType: filePath
-        pwsh: true
-        filePath: $(Build.SourcesDirectory)/eng/pipelines/common/steps/install-dotnet-arm64.ps1
-        # Arguments:
-        #
-        # -Debug:
-        #    This must be a PowerShell $true/$false value.  The first '$' is not
-        #    expanded.  The ${{ }} evaluates to the string "true" or "false",
-        #    and the whole value then becomes either $true or $false.
-        #
-        # -GlobalJson:
-        #    The path to the global.json file to read the SDK version from.
-        #    Double-quoted in case there are spaces in the path.
-        #
-        # -InstallDir:
-        #    The directory to install to.  Double-quoted in case there are
-        #    spaces in the path.
-        #
-        # -Runtimes:
-        #    The list of runtimes to install.  This must be a single string with
-        #    each runtime quoted and separated by commas.  If the runtimes are
-        #    8.0 and 9.0, the ${{ join() }} function will result in:
-        #
-        #      8.0","9.0
-        #
-        #    We enclose the join() in double-quotes to get the exact string we
-        #    want:
-        #
-        #      "8.0","9.0"
-        #
-        arguments: >
-          -Debug:$${{ parameters.debug }}
-          -GlobalJson "$(Build.SourcesDirectory)/global.json"
-          -InstallDir "${{ parameters.installDir }}"
-          -Runtimes "${{ join('","', parameters.runtimes) }}"
-
   # Report what was installed.
   - pwsh: dotnet --info
     displayName: Report installed .NET SDK and Runtimes
diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
index 1b1ea7a2e7..50a2867984 100644
--- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
@@ -146,11 +146,6 @@ parameters:
   - name: timeout
     type: number
 
-  # True if this is an ARM64 job.
-  - name: isArm64
-    type: boolean
-    default: false
-
   # True to use managed SNI, where applicable.
   - name: usemanagedSNI
     type: boolean
@@ -212,13 +207,7 @@ jobs:
   - template: /eng/pipelines/common/steps/install-dotnet.yml@self
     parameters:
       debug: ${{ parameters.debug }}
-      ${{ if parameters.isArm64 }}:
-        architecture: arm64
-        # ARM64 needs to specify slightly different runtime version formats.
-        # See the install-dotnet template docs for more info.
-        runtimes: ['8.0', '9.0']
-      ${{ else }}:
-        runtimes: [8.x, 9.x]
+      runtimes: [8.x, 9.x]
 
   # Restore dotnet CLI tools (e.g. pwsh, apicompat) before building.
   - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
@@ -348,7 +337,7 @@ jobs:
       # Install the .NET SDK and Runtimes for x86.
       - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
-          architecture: x86
+          forceX86: true
           debug: ${{ parameters.debug }}
           installDir: $(dotnetx86RootPath)
           runtimes: [8.x, 9.x]
diff --git a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
index 86ddc0ca45..4f5fbfe730 100644
--- a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
+++ b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
@@ -132,7 +132,6 @@ stages:
                   testSet: ${{ testSet }}
                   configSqlFor: ${{ config.value.configSqlFor }}
                   operatingSystem: ${{ config.value.operatingSystem }}
-                  isArm64: ${{ eq(config.value.isArm64, 'true') }}
                   saPassword: $(saPassword)
                   ${{if ne(config.value.configProperties, '{}') }}:
                     ${{ each x86TF in config.value.configProperties.x86TestTargetFrameworks }}:
@@ -170,7 +169,6 @@ stages:
                     testSet: ${{ testSet }}
                     configSqlFor: ${{ config.value.configSqlFor }}
                     operatingSystem: ${{ config.value.operatingSystem }}
-                    isArm64: ${{ eq(config.value.isArm64, 'true') }}
                     saPassword: $(saPassword)
                     ${{if and(eq(usemanagedSNI, false), ne(config.value.configProperties, '{}')) }}:
                       ${{ each x86TF in config.value.configProperties.x86TestTargetFrameworks }}:
diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index 9ee7c7132d..a51bbee3f5 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -524,7 +524,6 @@ stages:
           pool: ADO-CI-PUBLIC-ARM64-1ES-EUS-POOL
           images:
             Win11_ARM64_Azure_Sql: ADO-WIN11-ARM64
-          isArm64: true
           TargetFrameworks: ${{parameters.targetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}

From 938d536f9a69494db81fd5b48fd47c7aadbe08f0 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 15 Jul 2026 12:28:47 -0700
Subject: [PATCH 187/298] Filter fatal exceptions from Task.FromException in
 async paths (#4437)

---
 .../Microsoft/Data/SqlClient/SqlBulkCopy.cs   | 27 +++++++------------
 .../Data/SqlClient/SqlCommand.Reader.cs       |  2 +-
 .../Data/SqlClient/SqlCommand.Xml.cs          |  2 +-
 .../Microsoft/Data/SqlClient/SqlDataReader.cs |  2 +-
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
index 55142268e9..44c74fc3f0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -1356,16 +1356,9 @@ private Task ReadFromRowSourceAsync(CancellationToken cts)
                 {
                     _hasMoreRowToCopy = ReadFromRowSource(); // Synchronous calls for DataRows and DataTable won't block. For IDataReader, it may block.
                 }
-                catch (Exception ex)
+                catch (Exception ex) when (_isAsyncBulkCopy && ADP.IsCatchableExceptionType(ex))
                 {
-                    if (_isAsyncBulkCopy)
-                    {
-                        return Task.FromException<bool>(ex);
-                    }
-                    else
-                    {
-                        throw;
-                    }
+                    return Task.FromException<bool>(ex);
                 }
                 finally
                 {
@@ -2530,7 +2523,7 @@ private Task CopyColumnsAsync(int col, TaskCompletionSource<object> source = nul
                     source.SetResult(null);
                 }
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
                 if (source != null)
                 {
@@ -2739,7 +2732,7 @@ private Task CopyRowsAsync(int rowsSoFar, int totalRows, CancellationToken cts,
                     source.TrySetResult(null); // This is set only on the last call of async copy. But may not be set if everything runs synchronously.
                 }
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
                 if (source != null)
                 {
@@ -2816,7 +2809,7 @@ private Task CopyBatchesAsync(BulkCopySimpleResultSet internalResults, string up
                     }
                 }
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
                 if (source != null)
                 {
@@ -2888,7 +2881,7 @@ private Task CopyBatchesAsyncContinued(BulkCopySimpleResultSet internalResults,
                     return CopyBatchesAsyncContinuedOnSuccess(internalResults, updateBulkCommandText, cts, source);
                 }
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
                 if (source != null)
                 {
@@ -2950,7 +2943,7 @@ private Task CopyBatchesAsyncContinuedOnSuccess(BulkCopySimpleResultSet internal
                     return source.Task;
                 }
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
                 if (source != null)
                 {
@@ -3122,7 +3115,7 @@ private void WriteToServerInternalRestContinuedAsync(BulkCopySimpleResultSet int
                     }
                 }
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
                 _localColumnMappings = null;
 
@@ -3299,7 +3292,7 @@ private void WriteToServerInternalRestAsync(CancellationToken cts, TaskCompletio
                     WriteToServerInternalRestContinuedAsync(internalResults, cts, source); // internalResults is valid here.
                 }
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
                 if (source != null)
                 {
@@ -3376,7 +3369,7 @@ private Task WriteToServerInternalAsync(CancellationToken ctoken)
                     return resultTask;
                 }
             }
-            catch (Exception ex)
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
                 if (source != null)
                 {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
index bffe17baf9..33af6073fb 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
@@ -381,7 +381,7 @@ private void BeginExecuteReaderInternalReadStage(TaskCompletionSource<object> co
                 _stateObj.ReadSni(completion);
             }
             // @TODO: CER Exception Handling was removed here (see GH#3581)
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
                 // Similarly, if an exception occurs put the stateObj back into the pool.
                 // and reset async cache information to allow a second async execute
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
index 447627375e..39d043df12 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
@@ -334,7 +334,7 @@ private void BeginExecuteXmlReaderInternalReadStage(TaskCompletionSource<object>
                 _stateObj.ReadSni(completion);
             }
             // @TODO: CER Exception Handling was removed here (see GH#3581)
-            catch (Exception e)
+            catch (Exception e) when (ADP.IsCatchableExceptionType(e))
             {
                 // Similarly, if an exception occurs put the stateObj back into the pool.
                 // and reset async cache information to allow a second async execute
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
index 6a0dc09765..cbc83b7406 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -5476,7 +5476,7 @@ private Task<T> InvokeAsyncCall<T>(SqlDataReaderBaseAsyncCallContext<T> context)
                 {
                     task = context.Execute(null, context);
                 }
-                catch (Exception ex)
+                catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
                 {
                     task = Task.FromException<T>(ex);
                 }

From f1b1d469f44b21b579b66e9904c491e92bd93eba Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 16 Jul 2026 07:53:00 -0300
Subject: [PATCH 188/298] Fix moved step template paths in
 sqlclient-package.yml pipeline (#4441)

---
 eng/pipelines/ci/package/sqlclient-package.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/ci/package/sqlclient-package.yml b/eng/pipelines/ci/package/sqlclient-package.yml
index e194e2abef..f1b6d13c17 100644
--- a/eng/pipelines/ci/package/sqlclient-package.yml
+++ b/eng/pipelines/ci/package/sqlclient-package.yml
@@ -117,12 +117,12 @@ jobs:
           displayName: '[Debug] Print Environment Variables'
 
       # Install the .NET SDK from global.json.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}
 
       # Restore dotnet local tools (pwsh, apicompat, etc.).
-      - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+      - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
       # Clean any pre-existing .nupkg / .snupkg files from the packages/ directory
       # to ensure we only publish packages produced by this run.

From e40ff48256895fb167a90f9bf5f50a52f80c6bc2 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 16 Jul 2026 08:19:49 -0300
Subject: [PATCH 189/298] APIScan remediation: remove obsolete
 SharedTokenCacheUsername, fix masked CS0618 pragma, migrate obsolete
 ManagedIdentityCredential ctor (#4421)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../ActiveDirectoryAuthenticationProvider.cs  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
index 7a39bb808f..52b1da7ba7 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
@@ -120,7 +120,7 @@ public ActiveDirectoryAuthenticationProvider(ActiveDirectoryAuthenticationProvid
 
     /// <summary>
     /// The Entra ID application client id used by this provider instance. Exposed as <c>internal</c> for tests.
-    /// The client id is used in the redirect URI when WAM broker mode is enabled, so it must match the client id configured 
+    /// The client id is used in the redirect URI when WAM broker mode is enabled, so it must match the client id configured
     /// in the app registration for the Entra ID application to successfully broker with WAM on Windows.
     /// </summary>
     internal string ApplicationClientId => _applicationClientId;
@@ -182,7 +182,7 @@ public override void BeforeUnload(SqlAuthenticationMethod authentication)
     // PublicClientAppKey cache (IWin32WindowFunc is part of its equality), so the same logical
     // identity ends up with two IPublicClientApplication instances depending on which setter
     // the caller used. Mark [Obsolete] in a future release once we have a migration window.
-    
+
     /// <include file='../doc/ActiveDirectoryAuthenticationProvider.xml' path='docs/members[@name="ActiveDirectoryAuthenticationProvider"]/SetIWin32WindowFunc/*'/>
     public void SetIWin32WindowFunc(Func<System.Windows.Forms.IWin32Window> iWin32WindowFunc) => _iWin32WindowFunc = iWin32WindowFunc;
     #endif
@@ -373,7 +373,7 @@ previousPw is byte[] previousPwBytes &&
                 {
                     #pragma warning disable CS0618 // Type or member is obsolete
                     result = await app.AcquireTokenByUsernamePassword(scopes, parameters.UserId, parameters.Password)
-                    #pragma warning disable CS0618 // Type or member is obsolete
+                    #pragma warning restore CS0618 // Type or member is obsolete
                         .WithCorrelationId(parameters.ConnectionId)
                         .ExecuteAsync(cancellationToken: cts.Token)
                         .ConfigureAwait(false);
@@ -873,7 +873,6 @@ private static TokenCredentialData CreateTokenCredentialInstance(TokenCredential
             if (tokenCredentialKey._clientId is not null)
             {
                 defaultAzureCredentialOptions.ManagedIdentityClientId = tokenCredentialKey._clientId;
-                defaultAzureCredentialOptions.SharedTokenCacheUsername = tokenCredentialKey._clientId;
                 defaultAzureCredentialOptions.WorkloadIdentityClientId = tokenCredentialKey._clientId;
             }
 
@@ -901,14 +900,24 @@ private static TokenCredentialData CreateTokenCredentialInstance(TokenCredential
             return new TokenCredentialData(cred, GetHash(secret));
         }
 
-        TokenCredentialOptions tokenCredentialOptions = new() { AuthorityHost = new Uri(tokenCredentialKey._authority) };
-
         if (tokenCredentialKey._tokenCredentialType == typeof(ManagedIdentityCredential))
         {
-            return new TokenCredentialData(new ManagedIdentityCredential(tokenCredentialKey._clientId, tokenCredentialOptions), GetHash(secret));
+            // A null or empty client id indicates a system-assigned managed identity; a
+            // non-empty client id selects a specific user-assigned managed identity.
+            ManagedIdentityId managedIdentityId = string.IsNullOrEmpty(tokenCredentialKey._clientId)
+                ? ManagedIdentityId.SystemAssigned
+                : ManagedIdentityId.FromUserAssignedClientId(tokenCredentialKey._clientId);
+            ManagedIdentityCredentialOptions managedIdentityCredentialOptions = new(managedIdentityId)
+            {
+                AuthorityHost = new Uri(tokenCredentialKey._authority)
+            };
+
+            return new TokenCredentialData(new ManagedIdentityCredential(managedIdentityCredentialOptions), GetHash(secret));
         }
         else if (tokenCredentialKey._tokenCredentialType == typeof(ClientSecretCredential))
         {
+            TokenCredentialOptions tokenCredentialOptions = new() { AuthorityHost = new Uri(tokenCredentialKey._authority) };
+
             return new TokenCredentialData(new ClientSecretCredential(tokenCredentialKey._audience, tokenCredentialKey._clientId, secret, tokenCredentialOptions), GetHash(secret));
         }
         else if (tokenCredentialKey._tokenCredentialType == typeof(WorkloadIdentityCredential))

From e8136dd2604a2578ddcb5b4308ea8326885522b3 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Thu, 16 Jul 2026 12:31:23 -0500
Subject: [PATCH 190/298] PR Pipeline | Enable LocalDB Tests (#4444)

* Can I just turn this on and it'll work?

* :robot: attempt

* Disable enumeration at discovery of connection string member data. :robot: suggestion says this should cause conditional theory to run before the memebr data.

* Add missing checks for connection strings being set up

* Patch up remaining tests that don't check for setup connections before using them

* Add comments as to why enumeration is disabled

* Add DisableDiscoveryEnumeration to another test it should've been on but it didn't matter b/c the test was marked as flaky.

* Add comment for localdb job
---
 .../pr/jobs/test-sqlclientmanual-job.yml      | 13 +++-
 eng/pipelines/pr/stages/test-stages.yml       | 41 ++++++++++
 .../pr/steps/configure-sqlserver-step.yml     | 12 +++
 .../configure-sqlserver-windows-step.yml      | 21 ++++++
 .../CancellationTokenSourceDisposalTest.cs    | 12 ++-
 .../SQL/DataStreamTest/DataStreamTest.cs      | 74 ++++++++++++-------
 .../MarsSessionPoolingTest.cs                 | 20 ++---
 .../SQL/ParameterTest/OutputParameterTests.cs |  2 +-
 .../SQL/ParameterTest/ParametersTest.cs       | 43 ++++++-----
 9 files changed, 178 insertions(+), 60 deletions(-)

diff --git a/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml b/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
index e1a5a4abd4..38b49695fe 100644
--- a/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
+++ b/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
@@ -98,6 +98,10 @@ parameters:
   - name: isLocalServer
     type: boolean
 
+  # Whether to enable LocalDB when configuring a local Windows SQL Server.
+  - name: enableLocalDB
+    type: boolean
+
   # Name of the local DB application name for localdb tests, this value will be stored in the
   # config.jsonc
   - name: localDbAppName
@@ -112,6 +116,10 @@ parameters:
   - name: testSet
     type: string
 
+  # Whether integrated security is supported by this test configuration.
+  - name: supportsIntegratedSecurity
+    type: boolean
+
   # Name of the user managed identity client ID. This value will be stored in config.jsonc for use
   # in AKV tests and substituted in for Azure connection string user IDs.
   - name: userManagedIdentityClientId
@@ -153,7 +161,10 @@ jobs:
       - ${{ if eq(parameters.isLocalServer, true) }}:
         - template: /eng/pipelines/pr/steps/configure-sqlserver-step.yml@self
           parameters:
+            enableLocalDB: ${{ parameters.enableLocalDB }}
             fileStreamDirectory: ${{ parameters.fileStreamDirectory }}
+            localDbAppName: ${{ parameters.localDbAppName }}
+            localDbSharedInstanceName: ${{ parameters.localDbSharedInstanceName }}
             operatingSystem: ${{ parameters.platformOperatingSystem }}
             saPassword: $(saPassword)
 
@@ -180,7 +191,7 @@ jobs:
           $config.LocalDbAppName = "${{ parameters.localDbAppName }}"
           $config.LocalDbSharedInstanceName = "${{ parameters.localDbSharedInstanceName }}"
           $config.ManagedIdentitySupported = $true
-          $config.SupportsIntegratedSecurity = $false
+          $config.SupportsIntegratedSecurity = [System.Convert]::ToBoolean("${{ parameters.supportsIntegratedSecurity }}")
           $config.UserManagedIdentityClientId = "${{ parameters.userManagedIdentityClientId }}"
 
           if ("${{ parameters.platformOperatingSystem  }}" -eq "Windows") {
diff --git a/eng/pipelines/pr/stages/test-stages.yml b/eng/pipelines/pr/stages/test-stages.yml
index f6023678b7..f28bf6b9e9 100644
--- a/eng/pipelines/pr/stages/test-stages.yml
+++ b/eng/pipelines/pr/stages/test-stages.yml
@@ -191,13 +191,50 @@ stages:
               configDisplayName: "localhost"
               connectionStringNp: ${{ parameters.manualTestConnectionStringNpLocalhost }}
               connectionStringTcp: ${{ parameters.manualTestConnectionStringTcpLocalhost }}
+              enableLocalDB: false
               fileStreamDirectory: ${{ parameters.manualTestFileStreamDirectory }}
               isLocalServer: true
               localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
               localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
+              supportsIntegratedSecurity: false
               testSet: "123"
               userManagedIdentityClientId: ${{ parameters.manualTestUserManagedIdentityClientId }}
 
+          # TestSqlClientManual - LocalDB
+          # Note: connection strings are explicitly set to empty to only allow the localDB tests to
+          # run. LocalDB tests require the localdb app name to be provided and supportsIntegratedSecurity
+          # to be true. If the connection strings (from the library, which as of 7/26 does not use
+          # integrated auth) are provided with supportsIntegratedSecurity set to true, other tests
+          # will fail.
+          - ${{ if eq(platform.operatingSystem, 'Windows') }}:
+            - template: /eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml@self
+              parameters:
+                buildConfiguration: ${{ parameters.buildConfiguration }}
+                buildSuffix: ${{ parameters.buildSuffix }}
+                dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+                stageNameSecrets: ${{ parameters.stageNameSecrets }}
+                testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
+
+                platformDisplayName: ${{ platform.displayName }}
+                platformDotnet: ${{ platform.dotnet }}
+                platformImage: ${{ platform.image }}
+                platformOperatingSystem: ${{ platform.operatingSystem }}
+                poolName: ${{ parameters.poolName }}
+
+                azureKeyVaultTenantId: ${{ parameters.manualTestAzureKeyVaultTenantId }}
+                azureKeyVaultUrl: ${{ parameters.manualTestAzureKeyVaultUrl }}
+                configDisplayName: "localdb"
+                connectionStringNp: ""
+                connectionStringTcp: ""
+                enableLocalDB: true
+                fileStreamDirectory: ${{ parameters.manualTestFileStreamDirectory }}
+                isLocalServer: true
+                localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
+                localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
+                supportsIntegratedSecurity: true
+                testSet: "123"
+                userManagedIdentityClientId: ${{ parameters.manualTestUserManagedIdentityClientId }}
+
           # TestSqlClientManual - Azure
           - template: /eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml@self
             parameters:
@@ -218,10 +255,12 @@ stages:
               configDisplayName: "azure"
               connectionStringNp: ${{ parameters.manualTestConnectionStringNpAzure }}
               connectionStringTcp: ${{ parameters.manualTestConnectionStringTcpAzure }}
+              enableLocalDB: false
               fileStreamDirectory: ${{ parameters.manualTestFileStreamDirectory }}
               isLocalServer: false
               localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
               localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
+              supportsIntegratedSecurity: false
               testSet: "123"
               userManagedIdentityClientId: ${{ parameters.manualTestUserManagedIdentityClientId }}
 
@@ -245,10 +284,12 @@ stages:
               configDisplayName: "localhost_ae"
               connectionStringNp: ${{ parameters.manualTestConnectionStringNpLocalhost }}
               connectionStringTcp: ${{ parameters.manualTestConnectionStringTcpLocalhost }}
+              enableLocalDB: false
               fileStreamDirectory: ${{ parameters.manualTestFileStreamDirectory }}
               isLocalServer: true
               localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
               localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
+              supportsIntegratedSecurity: false
               testSet: "AE"
               userManagedIdentityClientId: ${{ parameters.manualTestUserManagedIdentityClientId }}
 
diff --git a/eng/pipelines/pr/steps/configure-sqlserver-step.yml b/eng/pipelines/pr/steps/configure-sqlserver-step.yml
index ebae5390e4..dcedb7a427 100644
--- a/eng/pipelines/pr/steps/configure-sqlserver-step.yml
+++ b/eng/pipelines/pr/steps/configure-sqlserver-step.yml
@@ -6,10 +6,19 @@
 
 parameters:
 
+  - name: enableLocalDB
+    type: boolean
+
   # Path to use for file stream tests. This only applies to Windows test runs.
   - name: fileStreamDirectory
     type: string
 
+  - name: localDbAppName
+    type: string
+
+  - name: localDbSharedInstanceName
+    type: string
+
   - name: operatingSystem
     type: string
 
@@ -21,7 +30,10 @@ steps:
   - ${{ if eq(parameters.operatingSystem, 'Windows') }}:
       - template: /eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml@self
         parameters:
+          enableLocalDB: ${{ parameters.enableLocalDB }}
           fileStreamDirectory: ${{ parameters.fileStreamDirectory }}
+          localDbAppName: ${{ parameters.localDbAppName }}
+          localDbSharedInstanceName: ${{ parameters.localDbSharedInstanceName }}
           saPassword: ${{ parameters.saPassword }}
 
   - ${{ elseif eq(parameters.operatingSystem, 'Linux') }}:
diff --git a/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml b/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
index d1567beaee..8e07120b4b 100644
--- a/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
+++ b/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
@@ -10,10 +10,19 @@
 
 parameters:
 
+  - name: enableLocalDB
+    type: boolean
+
   # Path to use for file stream tests.
   - name: fileStreamDirectory
     type: string
 
+  - name: localDbAppName
+    type: string
+
+  - name: localDbSharedInstanceName
+    type: string
+
   # Password to use for the SA account. This should be generated from the generate-secrets-stage.
   - name: saPassword
     type: string
@@ -113,3 +122,15 @@ steps:
       Invoke-Sqlcmd -ServerInstance "$machineName" -Database "master" -InputFile $scriptPath
     displayName: 'Create Northwind Database [Win]'
     retryCountOnTaskFailure: 1
+
+  # Start and share the LocalDB instance.
+  - ${{ if eq(parameters.enableLocalDB, true) }}:
+    - powershell: |
+        SqlLocalDB info
+        SqlLocalDB info ${{ parameters.localDbAppName }}
+        SqlLocalDB share ${{ parameters.localDbAppName }} ${{ parameters.localDbSharedInstanceName }}
+        SqlLocalDB start ${{ parameters.localDbAppName }}
+        SqlLocalDB info ${{ parameters.localDbAppName }}
+
+        sqlcmd -S "(localdb)\.\${{ parameters.localDbSharedInstanceName }}" -q "SELECT @@VERSION"
+      displayName: 'Enable LocalDB [Win]'
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/CancellationTokenSourceDisposalTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/CancellationTokenSourceDisposalTest.cs
index 376a1df7e6..fd1bcced02 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/CancellationTokenSourceDisposalTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/CancellationTokenSourceDisposalTest.cs
@@ -31,8 +31,9 @@ public static IEnumerable<object[]> ConnectionStrings
             }
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void SequentialStream_DisposedBeforeReaderClose_DoesNotThrow(string connectionString)
         {
             using SqlConnection connection = new SqlConnection(connectionString);
@@ -58,8 +59,9 @@ public static void SequentialStream_DisposedBeforeReaderClose_DoesNotThrow(strin
             reader.Close();
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void SequentialTextReader_DisposedBeforeReaderClose_DoesNotThrow(string connectionString)
         {
             using SqlConnection connection = new SqlConnection(connectionString);
@@ -84,8 +86,9 @@ public static void SequentialTextReader_DisposedBeforeReaderClose_DoesNotThrow(s
             reader.Close();
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void SequentialStream_DisposedThenReaderAdvanced_DoesNotThrow(string connectionString)
         {
             using SqlConnection connection = new SqlConnection(connectionString);
@@ -108,8 +111,9 @@ public static void SequentialStream_DisposedThenReaderAdvanced_DoesNotThrow(stri
             Assert.True(reader.Read());
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void DataReader_MultipleCloseAndDispose_DoesNotThrow(string connectionString)
         {
             using SqlConnection connection = new SqlConnection(connectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
index 17c760ace9..a3330a371b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
@@ -39,177 +39,201 @@ public static IEnumerable<object[]> ConnectionStrings
             }
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void RowBuffer_ReadsBufferCorrectly(string connectionString)
         {
             RowBuffer(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void InvalidRead_ThrowsInvalidOperationException(string connectionString)
         {
             InvalidRead(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void VariantRead_ReadsVariantDataCorrectly(string connectionString)
         {
             VariantRead(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void TypeRead_ReadsTypedDataCorrectly(string connectionString)
         {
             TypeRead(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void SqlTypeRead_ReadsSqlTypesCorrectly(string connectionString)
         {
             SQLTypeRead(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void GetValueOfTRead_ReadsGenericTypesCorrectly(string connectionString)
         {
             GetValueOfTRead(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void MultipleResults_ReadsMultipleBatchesCorrectly(string connectionString)
         {
             MultipleResults(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void NumericRead_ReadsLargeNumericValues(string connectionString)
         {
             NumericRead(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void TimestampRead_ReadsBinaryTimestamp(string connectionString)
         {
             TimestampRead(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void OrphanReader_HandlesConnectionCloseCorrectly(string connectionString)
         {
             OrphanReader(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void BufferSize_HandlesVariableBufferSizes(string connectionString)
         {
             BufferSize(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void ExecuteXmlReader_ReadsXmlDataCorrectly(string connectionString)
         {
             ExecuteXmlReaderTest(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void SequentialAccess_ReadsDataSequentially(string connectionString)
         {
             SequentialAccess(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void HasRows_ReportsCorrectly(string connectionString)
         {
             HasRowsTest(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void CloseConnection_ClosesReaderWithConnection(string connectionString)
         {
             CloseConnection(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void OpenConnection_OpensSuccessfully(string connectionString)
         {
             OpenConnection(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void SqlCharsBytes_QueriesWithSqlTypes(string connectionString)
         {
             SqlCharsBytesTest(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void GetStream_ReturnsStreamCorrectly(string connectionString)
         {
             GetStream(connectionString);
         }
 
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void GetTextReader_ReturnsTextReaderCorrectly(string connectionString)
         {
             GetTextReader(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void GetXmlReader_ReturnsXmlReaderCorrectly(string connectionString)
         {
             GetXmlReader(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         [Trait("Category", "flaky")]
         public static void ReadStream_ReadsStreamDataCorrectly(string connectionString)
         {
             ReadStream(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void ReadTextReader_ReadsTextCorrectly(string connectionString)
         {
             ReadTextReader(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void StreamingBlobDataTypes_ReadsAllBlobTypes(string connectionString)
         {
             StreamingBlobDataTypes(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public static void OutOfOrderGetChars_ReadsColumnsOutOfOrder(string connectionString)
         {
             OutOfOrderGetChars(connectionString);
         }
 
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotNamedInstance))]
-        [MemberData(nameof(ConnectionStrings))]
+        [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
         public void TestXEventsStreaming_StreamsXEventsCorrectly(string connectionString)
         {
             TestXEventsStreaming(connectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
index 9f666fc45f..2fca930559 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
@@ -20,7 +20,7 @@ public class MarsSessionPoolingTest
 
         // Synapse: Catalog view 'dm_exec_connections' is not supported in this version.
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
         public void ExecuteScalar_DisposeCommand(CommandType commandType)
@@ -48,7 +48,7 @@ public void ExecuteScalar_DisposeCommand(CommandType commandType)
             }
         }
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
         public void ExecuteScalar_CloseConnection(CommandType commandType)
@@ -77,7 +77,7 @@ public void ExecuteScalar_CloseConnection(CommandType commandType)
             }
         }
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
         public void ExecuteNonQuery_DisposeCommand(CommandType commandType)
@@ -105,7 +105,7 @@ public void ExecuteNonQuery_DisposeCommand(CommandType commandType)
             }
         }
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
         public void ExecuteNonQuery_CloseConnection(CommandType commandType)
@@ -134,7 +134,7 @@ public void ExecuteNonQuery_CloseConnection(CommandType commandType)
             }
         }
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
         public void ExecuteReader_CloseReader(CommandType commandType)
@@ -163,7 +163,7 @@ public void ExecuteReader_CloseReader(CommandType commandType)
             }
         }
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
         public void ExecuteReader_DisposeReader(CommandType commandType)
@@ -193,7 +193,7 @@ public void ExecuteReader_DisposeReader(CommandType commandType)
         }
 
         [Trait("Category", "flaky")]
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
         public void ExecuteReader_GarbageCollectReader(CommandType commandType)
@@ -231,7 +231,7 @@ public void ExecuteReader_GarbageCollectReader(CommandType commandType)
         [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ
                                      // Expected: 5
                                      // Actual:   4
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
         public void ExecuteReader_DisposeCommand(CommandType commandType)
@@ -272,7 +272,7 @@ public void ExecuteReader_DisposeCommand(CommandType commandType)
             }
         }
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
         public void ExecuteReader_CloseConnection(CommandType commandType)
@@ -302,7 +302,7 @@ public void ExecuteReader_CloseConnection(CommandType commandType)
         }
 
         [Trait("Category", "flaky")]
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
         public void ExecuteReader_NoCloses(CommandType commandType)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs
index 8b0322b559..fc55584e36 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/OutputParameterTests.cs
@@ -66,7 +66,7 @@ public void InvalidValueInOutputParameter_ShouldSucceed()
         /// </summary>
         /// <param name="collation">Name of a SQL Server collation which encodes text in the given code page.</param>
         /// <param name="codePage">ID of the codepage which should be used by SQL Server and the driver to encode and decode text.</param>
-        [Theory]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         [MemberData(nameof(OutputParameterCodePages))]
         public void CollatedStringInOutputParameter_DecodesSuccessfully(string collation, int codePage)
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
index 95d3736d9a..d2cafd3c76 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
@@ -485,8 +485,24 @@ public static void SqlDecimalConvertToDecimal_TestOutOfRange(string sqlDecimalVa
             Assert.Throws<OverflowException>(() => rdr.GetDecimal(0));
         }
 
-        [Theory]
-        [ClassData(typeof(ConnectionStringsProvider))]
+        public static TheoryData<string, bool> TestScaledDecimalParameter_Data
+        {
+            get
+            {
+                TheoryData<string, bool> result = new();
+                foreach (string connectionString in DataTestUtility.ConnectionStrings)
+                {
+                    result.Add(connectionString, false); // Truncate scaled decimal disabled
+                    result.Add(connectionString, true);  // Truncate scaled decimal enabled
+                }
+
+                return result;
+            }
+        }
+
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [MemberData(nameof(TestScaledDecimalParameter_Data), DisableDiscoveryEnumeration = true)]
         public static void TestScaledDecimalParameter_CommandInsert(string connectionString, bool truncateScaledDecimal)
         {
             using LocalAppContextSwitchesHelper appContextSwitchesHelper = new();
@@ -516,8 +532,9 @@ public static void TestScaledDecimalParameter_CommandInsert(string connectionStr
             Assert.True(ValidateInsertedValues(connection, decimalTable.Name, truncateScaledDecimal), $"Invalid test happened with connection string [{connection.ConnectionString}]");
         }
 
-        [Theory]
-        [ClassData(typeof(ConnectionStringsProvider))]
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [MemberData(nameof(TestScaledDecimalParameter_Data), DisableDiscoveryEnumeration = true)]
         public static void TestScaledDecimalParameter_BulkCopy(string connectionString, bool truncateScaledDecimal)
         {
             using LocalAppContextSwitchesHelper appContextSwitchesHelper = new();
@@ -548,9 +565,10 @@ public static void TestScaledDecimalParameter_BulkCopy(string connectionString,
         }
 
         // Synapse: Parse error at line: 2, column: 8: Incorrect syntax near 'TYPE'.
+        // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [Trait("Category", "flaky")]
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsNotAzureSynapse))]
-        [ClassData(typeof(ConnectionStringsProvider))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [MemberData(nameof(TestScaledDecimalParameter_Data), DisableDiscoveryEnumeration = true)]
         public static void TestScaledDecimalTVP_CommandSP(string connectionString, bool truncateScaledDecimal)
         {
             using LocalAppContextSwitchesHelper appContextSwitchesHelper = new();
@@ -627,19 +645,6 @@ private static bool ValidateInsertedValues(SqlConnection connection, string tabl
             return !exceptionHit;
         }
 
-        public class ConnectionStringsProvider : IEnumerable<object[]>
-        {
-            public IEnumerator<object[]> GetEnumerator()
-            {
-                foreach (var cnnString in DataTestUtility.ConnectionStrings)
-                {
-                    yield return new object[] { cnnString, false };
-                    yield return new object[] { cnnString, true };
-                }
-            }
-
-            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-        }
         #endregion
         #endregion
 

From cabe2ddf07afe6da6e94571ed3c6dfff2346fcf0 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Fri, 17 Jul 2026 17:27:48 -0700
Subject: [PATCH 191/298] Add connection-creation rate limiting to
 ChannelDbConnectionPool (#4396)

---
 Directory.Packages.props                      |   2 +
 specs/006-pool-rate-limiting/diagrams.md      |  41 +
 specs/006-pool-rate-limiting/spec.md          | 152 +++
 .../src/Microsoft.Data.SqlClient.csproj       |   2 +
 .../ConnectionPool/ChannelDbConnectionPool.cs | 238 ++++-
 .../ConnectionPool/NoOpAcquiredLease.cs       |  50 +
 ...icrosoft.Data.SqlClient.ManualTests.csproj |   2 +
 .../ChannelDbConnectionPoolTest.cs            | 891 +++++++++++++++++-
 .../Microsoft.Data.SqlClient.UnitTests.csproj |   2 +
 9 files changed, 1315 insertions(+), 65 deletions(-)
 create mode 100644 specs/006-pool-rate-limiting/diagrams.md
 create mode 100644 specs/006-pool-rate-limiting/spec.md
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/NoOpAcquiredLease.cs

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 59839f2351..76142810ca 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -150,6 +150,7 @@
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.13" />
     <PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="9.0.16" />
+    <PackageVersion Include="System.Threading.RateLimiting" Version="9.0.13" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.13" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.13" />
   </ItemGroup>
@@ -157,6 +158,7 @@
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <PackageVersion Include="Microsoft.Bcl.Cryptography" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.1" />
+    <PackageVersion Include="System.Threading.RateLimiting" Version="8.0.0" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
   </ItemGroup>
diff --git a/specs/006-pool-rate-limiting/diagrams.md b/specs/006-pool-rate-limiting/diagrams.md
new file mode 100644
index 0000000000..f05951d61d
--- /dev/null
+++ b/specs/006-pool-rate-limiting/diagrams.md
@@ -0,0 +1,41 @@
+# Rate limiting comparison
+
+## Existing rate limiting
+
+```mermaid
+flowchart TD
+    Start([Open request]) --> WaitAny["WaitHandle.WaitAny<br/>(blocking, no queue)"]
+
+    WaitAny -->|idle available| S0["PoolSemaphore<br/>Semaphore 0..MAX"]
+    WaitAny -->|error state| S1["ErrorEvent<br/>ManualResetEvent"]
+    WaitAny -->|permit to open one conn| S2["CreationSemaphore<br/>Semaphore 1,1"]
+
+    S0 -->|got connection| Done([Return connection])
+    S2 --> Open["Open physical connection"]
+    Open --> Release["Semaphore.Release 1"]
+    Release -->|got connection| Done
+
+    classDef prim fill:#bfdbfe,stroke:#1e3a8a,color:#111
+    class WaitAny,S0,S1,S2,Open,Release prim
+```
+
+## New rate limiting
+
+```mermaid
+flowchart TD
+    Start([Open request]) --> Idle["Idle channel<br/>TryRead<br/>(non-blocking)"]
+
+    Idle -->|got connection| Done([Return connection])
+    Idle -->|empty| Limiter["ConcurrencyLimiter<br/>AttemptAcquire 1<br/>(non-blocking)"]
+
+    Limiter -->|acquired lease| Open["Open physical connection"]
+    Limiter -->|not acquired| Channel["Idle channel<br/>await ReadAsync <br/>(FIFO queued)"]
+
+    Open --> Lease["RateLimitLease.Dispose"]
+    Lease --> |got connection| Done
+    Channel -->|loop on wake signal| Idle
+    Channel --> |got connection| Done
+
+    classDef prim fill:#bfdbfe,stroke:#1e3a8a,color:#111
+    class Idle,Limiter,Open,Lease,Channel prim
+```
\ No newline at end of file
diff --git a/specs/006-pool-rate-limiting/spec.md b/specs/006-pool-rate-limiting/spec.md
new file mode 100644
index 0000000000..d373c7d681
--- /dev/null
+++ b/specs/006-pool-rate-limiting/spec.md
@@ -0,0 +1,152 @@
+# Feature Specification: Pool Rate Limiting and Blocking Period
+
+**Feature Branch**: `dev/mdaigle/pool-rate-limit`
+**Created**: 2026-05-19
+**Status**: Draft
+**Input**: ADO Work Item 37824 — "Implement connection open rate limiting"
+
+## Description
+
+Add rate limiting to `ChannelDbConnectionPool` to control how many physical connections can be
+created concurrently. Without throttling, a burst of concurrent requests can trigger a login
+storm against SQL Server. The implementation uses
+`System.Threading.RateLimiting.ConcurrencyLimiter` from the BCL — no custom rate limiting
+primitives are defined.
+
+This feature also adds the `PoolBlockingPeriod` error state (fast-fail after a connection
+creation failure) with exponential backoff recovery, matching the existing
+`WaitHandleDbConnectionPool` behavior.
+
+> Time spent waiting for the rate limiter counts against the caller's overall `ConnectTimeout`
+> budget. `ReplaceConnection` (when implemented) MUST bypass the rate limiter: it already holds
+> a pool slot and must not deadlock.
+
+## User Scenarios & Testing
+
+### User Story 1 — Throttled Connection Creation Under Burst Demand (P1)
+
+The pool limits the number of simultaneous physical connection creation attempts. Callers that
+cannot immediately create a connection do not queue on the limiter; they fall back to waiting on
+the idle channel, where they are satisfied either by a returned connection or by a best-effort
+wake when another caller releases its permit. The idle channel preserves FIFO order for returned
+connections, but rate-limit retries are best-effort rather than strictly ordered. All waiting is
+subject to the caller's `ConnectTimeout`.
+
+**Acceptance Scenarios**:
+
+1. **Given** the pool has no idle connections and many callers request connections simultaneously,
+   **When** the concurrency limit is reached, **Then** additional callers wait until an in-flight
+   creation completes before starting their own.
+2. **Given** a caller is waiting for the rate limiter, **When** its `ConnectTimeout` elapses,
+   **Then** the caller receives a timeout error without ever attempting to create a connection.
+3. **Given** the rate limiter has available capacity, **When** a caller requests a new connection,
+   **Then** the create proceeds immediately with no added latency.
+4. **Given** a connection creation completes (success or failure), **When** the `RateLimitLease`
+   is disposed, **Then** the next waiting caller is allowed to proceed.
+
+---
+
+### User Story 2 — Blocking Period Fast-Fail on Connection Failure (P1)
+
+When a connection creation attempt fails because the server is unreachable, the pool enters an
+error state and immediately fails subsequent requests for a limited period, returning the cached
+error. This prevents cascading timeouts when the server is down.
+
+**Acceptance Scenarios**:
+
+1. **Given** a creation failure has occurred and blocking period is enabled, **When** a new
+   connection is requested within the blocking window, **Then** the request fails immediately
+   with the cached error.
+2. **Given** a creation failure has occurred and blocking period is enabled, **When** the
+   blocking window expires, **Then** the next request attempts fresh connection creation.
+3. **Given** `PoolBlockingPeriod=NeverBlock`, **When** a creation failure occurs, **Then** each
+   subsequent request independently attempts creation (no fast-fail).
+4. **Given** `PoolBlockingPeriod=Auto` connecting to an Azure SQL endpoint and a failure occurs,
+   **Then** no blocking period is applied (same as `NeverBlock`).
+5. **Given** `PoolBlockingPeriod=Auto` connecting to an on-premises SQL Server and a failure
+   occurs, **Then** the blocking period is applied (same as `AlwaysBlock`).
+
+---
+
+### User Story 3 — Error State Recovery with Exponential Backoff (P2)
+
+While in the error state the pool waits using exponential backoff (5s → 10s → 20s → 30s → 60s
+cap) before allowing the next attempt. Once an attempt after the backoff succeeds, the error
+state clears and backoff resets.
+
+**Acceptance Scenarios**:
+
+1. **Given** the pool is in error state, **When** the backoff timer fires and the next caller's
+   attempt succeeds, **Then** the error state is cleared and subsequent requests attempt normal
+   creation.
+2. **Given** the pool is in error state, **When** the backoff timer fires and the next caller's
+   attempt fails, **Then** the backoff interval increases (up to the 60s cap) and the pool
+   re-enters the error state.
+3. **Given** the pool is in error state, **When** the error is cleared, **Then** the cached
+   exception, the error flag, and the backoff interval are all reset.
+
+---
+
+### User Story 4 — Rate Limiting Counts Against Connection Timeout (P2)
+
+Time spent waiting for rate limiter capacity counts against the caller's overall
+`ConnectTimeout` budget.
+
+**Acceptance Scenarios**:
+
+1. **Given** a caller's timeout is 15s and the caller waits 10s for rate limiting, **When** the
+   rate limiter releases, **Then** the remaining budget for connection creation is 5s.
+2. **Given** a caller's timeout expires while waiting for the rate limiter, **When** the timeout
+   fires, **Then** the caller receives a timeout error and is removed from the limiter queue.
+
+---
+
+### User Story 5 — Rate Limiting Built on a Concurrency Limiter (P3)
+
+The pool supports an optional `System.Threading.RateLimiting.ConcurrencyLimiter` to throttle
+concurrent physical connection creation. This is the only limiter type the pool currently needs
+(pooling against on-prem SQL Server), so the pool takes a concrete `ConcurrencyLimiter?` rather
+than the abstract `RateLimiter` base. Support for other limiter types can be added later if a
+concrete need arises. When no limiter is supplied (`null`), no rate limiting is applied.
+
+**Acceptance Scenarios**:
+
+1. **Given** the pool is configured with a `ConcurrencyLimiter`, **When** connections
+   are created, **Then** the limiter throttles concurrent creation to the configured maximum.
+2. **Given** no limiter is supplied (`null`), **When** connections are created, **Then** the
+   pool applies no rate limiting.
+
+---
+
+## Functional Requirements
+
+- **FR-001**: The pool MUST limit the number of concurrent physical connection creation attempts
+  to a configurable maximum.
+- **FR-002**: Callers that cannot immediately create a connection due to rate limiting MUST fall
+  back to waiting on the idle channel until capacity becomes available (via a returned connection
+  or a best-effort wake when a permit is released) or their timeout expires. Rate-limit retries are
+  best-effort and not strictly FIFO-ordered.
+- **FR-003**: Time spent waiting for rate limiter capacity MUST count against the caller's
+  overall connection timeout budget.
+- **FR-004**: When a connection creation attempt completes (success or failure), the
+  `RateLimitLease` MUST be disposed so the next waiting caller can proceed.
+- **FR-005**: The pool MUST support three `PoolBlockingPeriod` modes: `Auto`, `AlwaysBlock`, and
+  `NeverBlock`.
+- **FR-006**: When the blocking period is enabled, the pool MUST enter an error state after a
+  creation failure and immediately fail subsequent requests with the cached error.
+- **FR-007**: When the blocking period is disabled, the pool MUST NOT enter an error state;
+  each request MUST independently attempt creation.
+- **FR-008**: While in error state, the backoff MUST use exponential growth starting at 5s,
+  doubling each attempt, capped at 60s.
+- **FR-009**: When an attempt succeeds, the pool MUST clear the error state and reset the
+  backoff to its initial value.
+- **FR-010**: The `ErrorOccurred` property MUST return `true` when in the error state and
+  `false` otherwise.
+- **FR-011**: `ClearPool` MUST clear the error state in addition to invalidating pooled
+  connections.
+- **FR-012**: The rate limiter MUST be an optional `System.Threading.RateLimiting.ConcurrencyLimiter`.
+  When no limiter is supplied (`null`), the pool MUST apply no rate limiting. Support for other
+  `RateLimiter` types is intentionally out of scope for now and may be added later if needed.
+- **FR-013**: When a limiter is supplied, it MUST be a
+  `System.Threading.RateLimiting.ConcurrencyLimiter` configured with the desired maximum number
+  of concurrent connection creation attempts.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 06eaf9e914..92c648c283 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -309,6 +309,7 @@
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.Threading.Channels" />
+    <PackageReference Include="System.Threading.RateLimiting" />
     <PackageReference Include="System.ValueTuple" />
   </ItemGroup>
 
@@ -321,6 +322,7 @@
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
+    <PackageReference Include="System.Threading.RateLimiting" />
   </ItemGroup>
 
   <!-- CodeGen Targets ================================================= -->
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index f5d758ebb7..298c38b9db 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -8,6 +8,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Channels;
+using System.Threading.RateLimiting;
 using System.Threading.Tasks;
 using System.Transactions;
 using Microsoft.Data.Common;
@@ -47,6 +48,13 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     ///
     /// The trade-off is slightly higher memory overhead per pool instance due to the channel infrastructure,
     /// but this is generally offset by the performance benefits in async-heavy workloads.
+    ///
+    /// <para>
+    /// Comments in this file reference requirements by tag (e.g. <c>FR-001</c>). These tags are
+    /// defined in the feature spec at <c>specs/006-pool-rate-limiting/spec.md</c> (see the
+    /// "Functional Requirements" section); consult it for the authoritative description of each
+    /// requirement.
+    /// </para>
     /// </summary>
     internal sealed class ChannelDbConnectionPool : IDbConnectionPool, IDisposable
     {
@@ -98,6 +106,27 @@ internal sealed class ChannelDbConnectionPool : IDbConnectionPool, IDisposable
         /// <see cref="Interlocked.CompareExchange(ref int, int, int)"/>.
         /// </summary>
         private int _shutdownInitiated;
+
+        /// <summary>
+        /// Optional concurrency limiter that throttles the number of concurrent physical connection
+        /// creation attempts. When null, no rate limiting is applied. A non-null limiter is
+        /// supplied at pool construction time; there is no default. Callers fast-fail against
+        /// the limiter and fall back to the idle-channel wait when no permit is available.
+        /// Scope note: the permit-release wake is signaled on this pool's own idle channel, so a
+        /// limiter is expected to be scoped to a single pool. Sharing one limiter across multiple
+        /// pools is not supported, because a permit released by another pool would not wake waiters
+        /// parked here and they could stall until their timeout expires.
+        /// Lifetime note: the pool does not own this limiter and never disposes it; the caller that
+        /// constructs the limiter owns its lifetime (it may outlive the pool).
+        /// </summary>
+        private readonly ConcurrencyLimiter? _connectionCreationRateLimiter;
+
+        /// <summary>
+        /// Encapsulates the blocking-period error state for this pool: cached exception, exponential
+        /// backoff timer, and synchronization. Created only when blocking period is enabled for
+        /// this pool group. See <see cref="BlockingPeriodErrorState"/>.
+        /// </summary>
+        private readonly BlockingPeriodErrorState? _errorState;
         #endregion
 
         /// <summary>
@@ -107,7 +136,9 @@ internal ChannelDbConnectionPool(
             SqlConnectionFactory connectionFactory,
             DbConnectionPoolGroup connectionPoolGroup,
             DbConnectionPoolIdentity identity,
-            DbConnectionPoolProviderInfo connectionPoolProviderInfo)
+            DbConnectionPoolProviderInfo connectionPoolProviderInfo,
+            ConcurrencyLimiter? connectionCreationRateLimiter = null,
+            TimeProvider? timeProvider = null)
         {
             ConnectionFactory = connectionFactory;
             PoolGroup = connectionPoolGroup;
@@ -117,9 +148,17 @@ internal ChannelDbConnectionPool(
             AuthenticationContexts = new();
             MaxPoolSize = Convert.ToUInt32(PoolGroupOptions.MaxPoolSize);
             TransactedConnectionPool = new(this);
+            _connectionCreationRateLimiter = connectionCreationRateLimiter;
 
             _connectionSlots = new(MaxPoolSize);
             _idleChannel = new();
+            if (PoolGroup.IsBlockingPeriodEnabled())
+            {
+                // timeProvider is injected only by tests so the blocking-period exit timer can be
+                // driven deterministically; in production it is null and the error state falls back
+                // to TimeProvider.System.
+                _errorState = new BlockingPeriodErrorState(_instanceId, timeProvider: timeProvider);
+            }
 
             // Pruning is only useful when the pool can grow beyond MinPoolSize.
             // If min >= max, the pool is fixed-size and pruning would never activate.
@@ -147,8 +186,7 @@ public ConcurrentDictionary<
         public int IdleCount => _idleChannel.Count;
 
         /// <inheritdoc />
-        /// This will be implemented later when we add support for the pool blocking period after errors. For now, it always returns false.
-        public bool ErrorOccurred => false;
+        public bool ErrorOccurred => _errorState?.HasError ?? false;
 
         /// <inheritdoc />
         public int Id => _instanceId;
@@ -192,6 +230,10 @@ public void Clear()
             SqlClientEventSource.Log.TryPoolerTraceEvent(
                 "<prov.DbConnectionPool.Clear|RES|CPOOL> {0}, Clearing.", Id);
 
+            // Clearing the pool implies the caller wants a clean slate, so abandon any cached
+            // error state. FR-011.
+            _errorState?.Clear();
+
             Interlocked.Increment(ref _clearGeneration);
 
             // If another thread is already draining, skip the drain. The generation counter has
@@ -324,6 +366,19 @@ public void Shutdown()
                     "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, Pruner.Dispose threw, continuing shutdown: {1}", Id, ex);
             }
 
+            // Dispose the error state so its exit timer is released. Otherwise a timer scheduled
+            // during the blocking period would keep this pool reachable and continue firing
+            // callbacks/logging after shutdown.
+            try
+            {
+                _errorState?.Dispose();
+            }
+            catch (Exception ex)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, _errorState.Dispose threw, continuing shutdown: {1}", Id, ex);
+            }
+
             // Complete the channel writer so:
             //  - no further idle connections can be enqueued (TryWrite returns false), and
             //  - in-flight / future async waiters on ReadAsync fault with ChannelClosedException.
@@ -496,13 +551,16 @@ public bool TryGetConnection(
         }
 
         /// <summary>
-        /// Opens a new internal connection to the database.
+        /// Opens a new internal connection to the database, throttled by the pool's rate limiter.
         /// </summary>
         /// <param name="owningConnection">The owning connection.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         /// <param name="timeout">The overall timeout budget. Passed through to the physical connection
         /// so it uses the remaining budget rather than starting a fresh timeout.</param>
-        /// <returns>A task representing the asynchronous operation, with a result of the new internal connection.</returns>
+        /// <returns>The new internal connection, or null if the pool has no available slot or the
+        /// rate limiter is currently saturated. In the latter case the caller should fall back to
+        /// the idle-channel wait; the rate limiter will write a null to the idle channel when a
+        /// permit is released so the waiter can retry.</returns>
         /// <exception cref="OperationCanceledException">
         /// Thrown when the cancellation token is cancelled before the connection operation completes.
         /// </exception>
@@ -513,50 +571,142 @@ public bool TryGetConnection(
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            // Opening a connection can be a slow operation and we don't want to hold a lock for the duration.
-            // Instead, we reserve a connection slot prior to attempting to open a new connection and release the slot
-            // in case of an exception.
-
-            var result = _connectionSlots.Add(
-                createCallback: () =>
-                {
-                    // https://github.com/dotnet/SqlClient/issues/3459
-                    // TODO: This blocks the thread for several network calls!
-                    // When running async, the blocked thread is one allocated from the managed thread pool (due to
-                    // use of Task.Run in TryGetConnection). This is why it's critical for async callers to
-                    // pre-provision threads in the managed thread pool. Our options are limited because
-                    // DbConnectionInternal doesn't support an async open. It's better to block this thread and keep
-                    // throughput high than to queue all of our opens onto a single worker thread. Add an async path
-                    // when this support is added to DbConnectionInternal.
-                    // TODO: ultimately, the connection factory should also accept our cancellation token.
-                    var connection = ConnectionFactory.CreatePooledConnection(
-                        owningConnection,
-                        this,
-                        timeout);
+            // Fast-fail in the error state. FR-006.
+            _errorState?.ThrowIfActive();
 
-                    if (connection is not null)
+            try
+            {
+                // Reserve a pool slot up front so we don't pay the rate-limit cost only to
+                // discover the pool is full. Add() reserves synchronously and returns null
+                // immediately if no slot is available; the rate-limit check only happens inside
+                // the createCallback, which runs after the reservation succeeds.
+                DbConnectionInternal? connection = _connectionSlots.Add(
+                    createCallback: () =>
                     {
-                        connection.ClearGeneration = _clearGeneration;
-                    }
+                        // Fast-fail rate-limit attempt when a limiter is configured.
+                        // AttemptAcquire returns synchronously and does not queue: if no permit
+                        // is available right now, the lease comes back with IsAcquired == false.
+                        // We deliberately do not block here so the caller can fall back to
+                        // waiting on the idle channel, where it can be satisfied either by a
+                        // returning connection or by a null poke from another caller releasing
+                        // its rate-limit lease (see finally below). We prefer to recycle existing
+                        // connections rather than queue on the rate limit. When no limiter is
+                        // configured we substitute a no-op acquired lease.
+                        // FR-001, FR-002, FR-003.
+
+                        RateLimitLease lease = _connectionCreationRateLimiter?.AttemptAcquire(1) ?? NoOpAcquiredLease.Instance;
+
+                        // Tracks whether we are leaving this block via an exception rather than a
+                        // normal return. It is read in the finally below to decide whether to poke
+                        // the idle channel: every return path sets it to false first, so by the time
+                        // the finally runs it is true only when an exception is propagating. This
+                        // lets us skip the wake on exception paths, where cleanupCallback already
+                        // pokes, and avoid a redundant double wake.
+                        bool faulted = true;
+                        try
+                        {
+                            if (!lease.IsAcquired)
+                            {
+                                // TODO: When we fail to acquire a lease, surface the lease metadata
+                                // (e.g. RateLimitMetadataName.RetryAfter, ReasonPhrase) in the error
+                                // path so the user can identify why the lease was denied.
+                                faulted = false;
+                                return null;
+                            }
+
+                            cancellationToken.ThrowIfCancellationRequested();
+
+                            // https://github.com/dotnet/SqlClient/issues/3459
+                            // TODO: This blocks the thread for several network calls!
+                            // When running async, the blocked thread is one allocated from the managed thread pool (due to 
+                            // use of Task.Run in TryGetConnection). This is why it's critical for async callers to 
+                            // pre-provision threads in the managed thread pool. Our options are limited because 
+                            // DbConnectionInternal doesn't support an async open. It's better to block this thread and keep
+                            // throughput high than to queue all of our opens onto a single worker thread. Add an async path 
+                            // when this support is added to DbConnectionInternal.
+                            // TODO: ultimately, the connection factory should also accept our cancellation token.
+                            var newConnection = ConnectionFactory.CreatePooledConnection(
+                                owningConnection,
+                                this,
+                                timeout);
+
+                            if (newConnection is not null)
+                            {
+                                newConnection.ClearGeneration = _clearGeneration;
+                            }
+
+                            faulted = false;
+                            return newConnection;
+                        }
+                        finally
+                        {
+                            // Capture the acquired state before disposing: the poke condition below
+                            // reads it, and accessing a lease after Dispose is fragile even if the
+                            // current ConcurrencyLimiter lease happens to keep IsAcquired stable.
+                            bool leaseAcquired = lease.IsAcquired;
+
+                            // Release the permit back to the limiter (no-op for the default lease)
+                            // BEFORE signaling a waiter. Otherwise a woken waiter could consume the
+                            // null poke and retry its acquire before the permit is actually returned,
+                            // fail to acquire, and fall back to waiting with no subsequent signal -
+                            // stalling connection creation even though the limiter has capacity.
+                            // When no limiter is configured this is NoOpAcquiredLease.Instance, whose
+                            // Dispose is an idempotent no-op, so disposing the shared singleton here
+                            // is safe.
+                            lease.Dispose();
+
+                            // After releasing, signal a waiter on the idle channel that they may now
+                            // retry an open. We only poke on non-faulted completion: on exception paths
+                            // the cleanupCallback below already writes a wake, so poking here too would
+                            // produce a redundant double wake. We also only poke when a limiter is
+                            // configured (a waiter only falls back to the idle channel due to rate
+                            // limiting in that case) and the pool can still grow; if we're at
+                            // MaxPoolSize, only a connection return can satisfy a waiter. FR-004. This
+                            // is best-effort; releasing a lease doesn't guarantee the rate limiter
+                            // immediately has an available permit, but the waiter we wake will fall
+                            // back to waiting again if not.
+                            if (!faulted &&
+                                leaseAcquired &&
+                                _connectionCreationRateLimiter is not null &&
+                                _connectionSlots.ReservationCount < MaxPoolSize)
+                            {
+                                _idleChannel.TryWrite(null);
+                            }
+                        }
+                    },
+                    cleanupCallback: (newConnection) =>
+                    {
+                        // If we fail to open a connection, we need to write a null to the idle channel to
+                        // wake up any waiters
+                        _idleChannel.TryWrite(null);
+                        newConnection?.Dispose();
+                    });
 
-                    return connection;
-                },
-                cleanupCallback: (newConnection) =>
+                if (connection is not null)
                 {
-                    // If we fail to open a connection, we need to write a null to the idle channel to
-                    // wake up any waiters
-                    _idleChannel?.TryWrite(null);
-                    newConnection?.Dispose();
-                });
+                    // A new connection was added to the pool. If we've grown past MinPoolSize,
+                    // start the pruning timer so idle connections can be reclaimed.
+                    Pruner?.UpdateTimer();
 
-            if (result is not null)
-            {
-                // A new connection was added to the pool. If we've grown past MinPoolSize,
-                // start the pruning timer so idle connections can be reclaimed.
-                Pruner?.UpdateTimer();
+                    // A successful creation clears error/backoff state
+                    // FR-009.
+                    _errorState?.Clear();
+                }
+
+                return connection;
             }
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex) && ex is not OperationCanceledException)
+            {
+                // Enter the blocking period error state on creation failure if configured.
+                // We deliberately exclude OperationCanceledException: that is thrown when the
+                // caller's own timeout/cancellation budget expires while waiting, which is
+                // client-side contention rather than a physical connection creation failure and
+                // must not poison the pool into fast-fail/backoff for other callers.
+                // FR-006, FR-007.
+                _errorState?.Enter(ex);
 
-            return result;
+                throw;
+            }
         }
 
         /// <summary>
@@ -686,7 +836,9 @@ private async Task<DbConnectionInternal> GetInternalConnection(
                     connection ??= GetIdleConnection();
 
 
-                    // If we didn't find an idle connection, try to open a new one.
+                    // If we didn't find an idle connection, try to open a new one. This may
+                    // return null if the pool is full or the rate limiter is currently saturated;
+                    // in either case the caller falls through to the idle-channel wait below.
                     connection ??= OpenNewInternalConnection(
                         owningConnection,
                         cancellationToken,
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/NoOpAcquiredLease.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/NoOpAcquiredLease.cs
new file mode 100644
index 0000000000..079066b08a
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/NoOpAcquiredLease.cs
@@ -0,0 +1,50 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.RateLimiting;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.ConnectionPool
+{
+    /// <summary>
+    /// A no-op <see cref="RateLimitLease"/> that is always acquired and performs no work on
+    /// dispose. Used as a stand-in when no rate limiter is configured so the open path can
+    /// treat the lease as unconditional. Stateless and safe to share across all callers; access
+    /// the singleton via <see cref="Instance"/>.
+    /// </summary>
+    internal sealed class NoOpAcquiredLease : RateLimitLease
+    {
+        /// <summary>
+        /// The shared singleton instance. Because it is stateless and its <see cref="Dispose"/>
+        /// releases nothing, the same instance is handed to every caller that opens without a
+        /// configured limiter and may be disposed any number of times, on any thread, without
+        /// affecting other callers.
+        /// </summary>
+        public static readonly NoOpAcquiredLease Instance = new();
+
+        private NoOpAcquiredLease()
+        {
+        }
+
+        public override bool IsAcquired => true;
+
+        public override IEnumerable<string> MetadataNames => Array.Empty<string>();
+
+        public override bool TryGetMetadata(string metadataName, out object? metadata)
+        {
+            metadata = null;
+            return false;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            // No resources to release. This is intentionally idempotent: the shared Instance is
+            // handed to every no-limiter open, so Dispose may be called repeatedly and
+            // concurrently with no effect.
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index f3e4b61b45..be691606ce 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -98,6 +98,7 @@
     <PackageReference Include="Microsoft.SqlServer.Types" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
+    <PackageReference Include="System.Threading.RateLimiting" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="System.ServiceProcess.ServiceController" />
     <PackageReference Include="xunit" />
@@ -124,6 +125,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.SqlServer.Types" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
+    <PackageReference Include="System.Threading.RateLimiting" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="System.ServiceProcess.ServiceController" />
     <PackageReference Include="xunit" />
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 914e63019a..505d750b1a 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -6,6 +6,7 @@
 using System.Collections.Concurrent;
 using System.Data.Common;
 using System.Threading;
+using System.Threading.RateLimiting;
 using System.Threading.Tasks;
 using System.Transactions;
 using Microsoft.Data.Common;
@@ -18,16 +19,34 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
 {
+    /// <summary>
+    /// Unit tests for <see cref="ChannelDbConnectionPool"/> covering connection acquisition,
+    /// timeouts, reuse, pool clearing, blocking-period behavior, and timeout-budget propagation.
+    /// </summary>
     public class ChannelDbConnectionPoolTest
     {
         private static readonly SqlConnectionFactory SuccessfulConnectionFactory = new SuccessfulSqlConnectionFactory();
         private static readonly SqlConnectionFactory TimeoutConnectionFactory = new TimeoutSqlConnectionFactory();
 
+        /// <summary>
+        /// Creates a <see cref="ChannelDbConnectionPool"/> with configurable test dependencies so
+        /// individual tests can focus on the behavior under test without repeating setup logic.
+        /// </summary>
+        /// <param name="connectionFactory">The factory used to create physical connections.</param>
+        /// <param name="identity">Optional pool identity override.</param>
+        /// <param name="dbConnectionPoolGroup">Optional pool group override.</param>
+        /// <param name="poolGroupOptions">Optional pool options override.</param>
+        /// <param name="connectionPoolProviderInfo">Optional provider info override.</param>
+        /// <param name="connectionCreationRateLimiter">Optional concurrency limiter controlling physical connection creation.</param>
+        /// <param name="timeProvider">Optional time provider so tests can drive the blocking-period exit timer deterministically.</param>
+        /// <returns>A configured <see cref="ChannelDbConnectionPool"/> instance for testing.</returns>
         private ChannelDbConnectionPool ConstructPool(SqlConnectionFactory connectionFactory,
             DbConnectionPoolIdentity? identity = null,
             DbConnectionPoolGroup? dbConnectionPoolGroup = null,
             DbConnectionPoolGroupOptions? poolGroupOptions = null,
-            DbConnectionPoolProviderInfo? connectionPoolProviderInfo = null)
+            DbConnectionPoolProviderInfo? connectionPoolProviderInfo = null,
+            ConcurrencyLimiter? connectionCreationRateLimiter = null,
+            TimeProvider? timeProvider = null)
         {
             poolGroupOptions ??= new DbConnectionPoolGroupOptions(
                     poolByIdentity: false,
@@ -47,10 +66,16 @@ private ChannelDbConnectionPool ConstructPool(SqlConnectionFactory connectionFac
                 connectionFactory,
                 dbConnectionPoolGroup,
                 identity ?? DbConnectionPoolIdentity.NoIdentity,
-                connectionPoolProviderInfo ?? new DbConnectionPoolProviderInfo()
+                connectionPoolProviderInfo ?? new DbConnectionPoolProviderInfo(),
+                connectionCreationRateLimiter,
+                timeProvider
             );
         }
 
+        /// <summary>
+        /// Verifies that requesting connections from an empty pool causes the pool to create new
+        /// physical connections until the requested count is reached.
+        /// </summary>
         [Theory]
         [InlineData(1)]
         [InlineData(5)]
@@ -75,11 +100,14 @@ out DbConnectionInternal? internalConnection
                 Assert.NotNull(internalConnection);
             }
 
-
             // Assert
             Assert.Equal(numConnections, pool.Count);
         }
 
+        /// <summary>
+        /// Verifies that asynchronous requests against an empty pool create new physical
+        /// connections and complete through the provided task completion source.
+        /// </summary>
         [Theory]
         [InlineData(1)]
         [InlineData(5)]
@@ -106,11 +134,14 @@ out DbConnectionInternal? internalConnection
                 Assert.NotNull(await tcs.Task);
             }
 
-
             // Assert
             Assert.Equal(numConnections, pool.Count);
         }
 
+        /// <summary>
+        /// Verifies that a synchronous request against an exhausted pool fails with the pooled-open
+        /// timeout once the caller's timeout budget has already expired.
+        /// </summary>
         [Fact]
         public void GetConnectionMaxPoolSize_ShouldTimeoutAfterPeriod()
         {
@@ -126,6 +157,7 @@ public void GetConnectionMaxPoolSize_ShouldTimeoutAfterPeriod()
                     out DbConnectionInternal? internalConnection
                 );
 
+                // Assert
                 Assert.True(completed);
                 Assert.NotNull(internalConnection);
             }
@@ -154,6 +186,10 @@ out DbConnectionInternal? internalConnection
             Assert.Equal(pool.PoolGroupOptions.MaxPoolSize, pool.Count);
         }
 
+        /// <summary>
+        /// Verifies that an asynchronous request against an exhausted pool completes with the
+        /// pooled-open timeout once the caller's timeout budget has already expired.
+        /// </summary>
         [Fact]
         public async Task GetConnectionAsyncMaxPoolSize_ShouldTimeoutAfterPeriod()
         {
@@ -169,6 +205,7 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldTimeoutAfterPeriod()
                     out DbConnectionInternal? internalConnection
                 );
 
+                // Assert
                 Assert.True(completed);
                 Assert.NotNull(internalConnection);
             }
@@ -195,6 +232,10 @@ out DbConnectionInternal? internalConnection
             Assert.Equal(pool.PoolGroupOptions.MaxPoolSize, pool.Count);
         }
 
+        /// <summary>
+        /// Verifies that a waiting synchronous caller reuses a connection that is returned to an
+        /// exhausted pool instead of creating a new physical connection.
+        /// </summary>
         [Fact]
         public async Task GetConnectionMaxPoolSize_ShouldReuseAfterConnectionReleased()
         {
@@ -218,16 +259,15 @@ out DbConnectionInternal? firstConnection
                     out DbConnectionInternal? internalConnection
                 );
 
+                // Assert
                 Assert.True(completed);
                 Assert.NotNull(internalConnection);
             }
 
-            TaskCompletionSource<DbConnectionInternal> tcs = new();
-
             // Act
             var task = Task.Run(() =>
             {
-                var exceeded = pool.TryGetConnection(
+                pool.TryGetConnection(
                     new SqlConnection(""),
                     taskCompletionSource: null,
                     TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
@@ -242,6 +282,10 @@ out DbConnectionInternal? extraConnection
             Assert.Equal(firstConnection, extraConnection);
         }
 
+        /// <summary>
+        /// Verifies that a waiting asynchronous caller reuses a connection that is returned to an
+        /// exhausted pool instead of creating a new physical connection.
+        /// </summary>
         [Fact]
         public async Task GetConnectionAsyncMaxPoolSize_ShouldReuseAfterConnectionReleased()
         {
@@ -265,6 +309,7 @@ out DbConnectionInternal? firstConnection
                     out DbConnectionInternal? internalConnection
                 );
 
+                // Assert
                 Assert.True(completed);
                 Assert.NotNull(internalConnection);
             }
@@ -272,7 +317,7 @@ out DbConnectionInternal? internalConnection
             TaskCompletionSource<DbConnectionInternal> taskCompletionSource = new();
 
             // Act
-            var exceeded = pool.TryGetConnection(
+            pool.TryGetConnection(
                 new SqlConnection(""),
                 taskCompletionSource,
                 TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
@@ -285,6 +330,10 @@ out DbConnectionInternal? recycledConnection
             Assert.Equal(firstConnection, recycledConnection);
         }
 
+        /// <summary>
+        /// Verifies that synchronous waiters are served in request order when the pool is full,
+        /// ensuring the first queued request receives the next returned connection.
+        /// </summary>
         [Fact]
         [ActiveIssue("https://github.com/dotnet/SqlClient/issues/3730")]
         public async Task GetConnectionMaxPoolSize_ShouldRespectOrderOfRequest()
@@ -309,6 +358,7 @@ out DbConnectionInternal? firstConnection
                     out DbConnectionInternal? internalConnection
                 );
 
+                // Assert
                 Assert.True(completed);
                 Assert.NotNull(internalConnection);
             }
@@ -354,6 +404,10 @@ out DbConnectionInternal? failedConnection
             await Assert.ThrowsAsync<InvalidOperationException>(async () => await failedTask);
         }
 
+        /// <summary>
+        /// Verifies that asynchronous waiters are served in request order when the pool is full,
+        /// ensuring the first queued request receives the next returned connection.
+        /// </summary>
         [Fact]
         [ActiveIssue("https://github.com/dotnet/SqlClient/issues/3730")]
         public async Task GetConnectionAsyncMaxPoolSize_ShouldRespectOrderOfRequest()
@@ -378,6 +432,7 @@ out DbConnectionInternal? firstConnection
                     out DbConnectionInternal? internalConnection
                 );
 
+                // Assert
                 Assert.True(completed);
                 Assert.NotNull(internalConnection);
             }
@@ -386,7 +441,7 @@ out DbConnectionInternal? internalConnection
             TaskCompletionSource<DbConnectionInternal> failedCompletionSource = new();
 
             // Act
-            var exceeded = pool.TryGetConnection(
+            pool.TryGetConnection(
                 new SqlConnection(""),
                 recycledTaskCompletionSource,
                 TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
@@ -396,7 +451,7 @@ out DbConnectionInternal? recycledConnection
             // Gives time for the recycled connection to be queued before the failed request is initiated.
             await Task.Delay(1000);
 
-            var exceeded2 = pool.TryGetConnection(
+            pool.TryGetConnection(
                 new SqlConnection("Timeout=1"),
                 failedCompletionSource,
                 TimeoutTimer.StartNew(TimeSpan.FromSeconds(1)),
@@ -411,6 +466,10 @@ out DbConnectionInternal? failedConnection
             await Assert.ThrowsAsync<InvalidOperationException>(async () => failedConnection = await failedCompletionSource.Task);
         }
 
+        /// <summary>
+        /// Verifies that a connection returned to the idle channel is reused by a subsequent
+        /// request instead of allocating a new internal connection.
+        /// </summary>
         [Fact]
         public void ConnectionsAreReused()
         {
@@ -447,6 +506,10 @@ out DbConnectionInternal? internalConnection2
             Assert.Same(internalConnection1, internalConnection2);
         }
 
+        /// <summary>
+        /// Verifies that synchronous connection creation failures propagate the pooled-open timeout
+        /// exception from the connection factory.
+        /// </summary>
         [Fact]
         public void GetConnectionTimeout_ShouldThrowTimeoutException()
         {
@@ -469,6 +532,10 @@ out DbConnectionInternal? internalConnection
             Assert.Equal(ADP.PooledOpenTimeout().Message, ex.Message);
         }
 
+        /// <summary>
+        /// Verifies that asynchronous connection creation failures propagate the pooled-open timeout
+        /// exception through the caller's task completion source.
+        /// </summary>
         [Fact]
         public async Task GetConnectionAsyncTimeout_ShouldThrowTimeoutException()
         {
@@ -494,13 +561,18 @@ out DbConnectionInternal? internalConnection
             Assert.Equal(ADP.PooledOpenTimeout().Message, ex.Message);
         }
 
+        /// <summary>
+        /// Verifies under concurrent synchronous load that the pool never grows beyond its
+        /// configured maximum size and continues to serve requests safely.
+        /// </summary>
         [Fact]
         public void StressTest()
         {
-            //Arrange
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
             ConcurrentBag<Task> tasks = new();
 
+            // Act
             for (int i = 1; i < pool.PoolGroupOptions.MaxPoolSize * 3; i++)
             {
                 var t = Task.Run(() =>
@@ -524,16 +596,23 @@ out DbConnectionInternal? internalConnection
             }
 
             Task.WaitAll(tasks.ToArray());
+
+            // Assert
             Assert.True(pool.Count <= pool.PoolGroupOptions.MaxPoolSize, "Pool size exceeded max pool size after stress test.");
         }
 
+        /// <summary>
+        /// Verifies under concurrent asynchronous load that the pool never grows beyond its
+        /// configured maximum size and continues to serve requests safely.
+        /// </summary>
         [Fact]
         public void StressTestAsync()
         {
-            //Arrange
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
             ConcurrentBag<Task> tasks = new();
 
+            // Act
             for (int i = 1; i < pool.PoolGroupOptions.MaxPoolSize * 3; i++)
             {
                 var t = Task.Run(async () =>
@@ -555,58 +634,102 @@ out DbConnectionInternal? internalConnection
             }
 
             Task.WaitAll(tasks.ToArray());
+
+            // Assert
             Assert.True(pool.Count <= pool.PoolGroupOptions.MaxPoolSize, "Pool size exceeded max pool size after stress test.");
         }
 
 
         #region Property Tests
 
+        /// <summary>
+        /// Verifies that the pool exposes the <see cref="SqlConnectionFactory"/> instance it was
+        /// constructed with.
+        /// </summary>
         [Fact]
         public void TestConnectionFactory()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
+
+            // Act & Assert
             Assert.Equal(SuccessfulConnectionFactory, pool.ConnectionFactory);
         }
 
+        /// <summary>
+        /// Verifies that a newly constructed pool starts with zero tracked connections.
+        /// </summary>
         [Fact]
         public void TestCount()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
+
+            // Act & Assert
             Assert.Equal(0, pool.Count);
         }
 
+        /// <summary>
+        /// Verifies that a newly constructed pool reports no blocking-period error by default.
+        /// </summary>
         [Fact]
         public void TestErrorOccurred()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
+
+            // Act & Assert
             Assert.False(pool.ErrorOccurred);
         }
 
+        /// <summary>
+        /// Verifies that the pool assigns a positive instance identifier at construction time.
+        /// </summary>
         [Fact]
         public void TestId()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
+
+            // Act & Assert
             Assert.True(pool.Id >= 1);
         }
 
+        /// <summary>
+        /// Verifies that the pool exposes the identity object it was constructed with.
+        /// </summary>
         [Fact]
         public void TestIdentity()
         {
+            // Arrange
             var identity = DbConnectionPoolIdentity.GetCurrent();
             var pool = ConstructPool(SuccessfulConnectionFactory, identity);
+
+            // Act & Assert
             Assert.Equal(identity, pool.Identity);
         }
 
+        /// <summary>
+        /// Verifies that a newly constructed pool begins in the running state.
+        /// </summary>
         [Fact]
         public void TestIsRunning()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
+
+            // Act & Assert
             Assert.True(pool.IsRunning);
         }
 
+        /// <summary>
+        /// Verifies that the pool exposes the configured load-balance timeout from its pool group
+        /// options.
+        /// </summary>
         [Fact]
         public void TestLoadBalanceTimeout()
         {
+            // Arrange
             var poolGroupOptions = new DbConnectionPoolGroupOptions(
                     poolByIdentity: false,
                     minPoolSize: 0,
@@ -617,12 +740,19 @@ public void TestLoadBalanceTimeout()
                     idleTimeout: 0
             );
             var pool = ConstructPool(SuccessfulConnectionFactory, poolGroupOptions: poolGroupOptions);
+
+            // Act & Assert
             Assert.Equal(poolGroupOptions.LoadBalanceTimeout, pool.LoadBalanceTimeout);
         }
 
+        /// <summary>
+        /// Verifies that the pool exposes the exact <see cref="DbConnectionPoolGroup"/> instance it
+        /// was constructed with.
+        /// </summary>
         [Fact]
         public void TestPoolGroup()
         {
+            // Arrange
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
                 new SqlConnectionOptions("Data Source=localhost;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
@@ -635,12 +765,19 @@ public void TestPoolGroup()
                     hasTransactionAffinity: true,
                     idleTimeout: 0));
             var pool = ConstructPool(SuccessfulConnectionFactory, dbConnectionPoolGroup: dbConnectionPoolGroup);
+
+            // Act & Assert
             Assert.Equal(dbConnectionPoolGroup, pool.PoolGroup);
         }
 
+        /// <summary>
+        /// Verifies that the pool exposes the exact <see cref="DbConnectionPoolGroupOptions"/>
+        /// instance it was constructed with.
+        /// </summary>
         [Fact]
         public void TestPoolGroupOptions()
         {
+            // Arrange
             var poolGroupOptions = new DbConnectionPoolGroupOptions(
                 poolByIdentity: false,
                 minPoolSize: 0,
@@ -650,34 +787,61 @@ public void TestPoolGroupOptions()
                 hasTransactionAffinity: true,
                 idleTimeout: 0);
             var pool = ConstructPool(SuccessfulConnectionFactory, poolGroupOptions: poolGroupOptions);
+
+            // Act & Assert
             Assert.Equal(poolGroupOptions, pool.PoolGroupOptions);
         }
 
+        /// <summary>
+        /// Verifies that the pool exposes the provider info object it was constructed with.
+        /// </summary>
         [Fact]
         public void TestProviderInfo()
         {
+            // Arrange
             var connectionPoolProviderInfo = new DbConnectionPoolProviderInfo();
             var pool = ConstructPool(SuccessfulConnectionFactory, connectionPoolProviderInfo: connectionPoolProviderInfo);
+
+            // Act & Assert
             Assert.Equal(connectionPoolProviderInfo, pool.ProviderInfo);
         }
 
+        /// <summary>
+        /// Verifies that the pool state getter reports <see cref="DbConnectionPoolState.Running"/>
+        /// immediately after construction.
+        /// </summary>
         [Fact]
         public void TestStateGetter()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
+
+            // Act & Assert
             Assert.Equal(DbConnectionPoolState.Running, pool.State);
         }
 
+        /// <summary>
+        /// Verifies that the pool state remains <see cref="DbConnectionPoolState.Running"/> after
+        /// construction when no shutdown has been requested.
+        /// </summary>
         [Fact]
         public void TestStateSetter()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
+
+            // Act & Assert
             Assert.Equal(DbConnectionPoolState.Running, pool.State);
         }
 
+        /// <summary>
+        /// Verifies that the pool exposes whether load balancing is enabled based on its configured
+        /// pool group options.
+        /// </summary>
         [Fact]
         public void TestUseLoadBalancing()
         {
+            // Arrange
             var poolGroupOptions = new DbConnectionPoolGroupOptions(
                 poolByIdentity: false,
                 minPoolSize: 0,
@@ -687,6 +851,8 @@ public void TestUseLoadBalancing()
                 hasTransactionAffinity: true,
                 idleTimeout: 0);
             var pool = ConstructPool(SuccessfulConnectionFactory, poolGroupOptions: poolGroupOptions);
+
+            // Act & Assert
             Assert.Equal(poolGroupOptions.UseLoadBalancing, pool.UseLoadBalancing);
         }
 
@@ -694,41 +860,71 @@ public void TestUseLoadBalancing()
 
         #region Not Implemented Method Tests
 
+        /// <summary>
+        /// Verifies that <see cref="ChannelDbConnectionPool.PutObjectFromTransactedPool"/> remains
+        /// unimplemented and throws <see cref="NotImplementedException"/>.
+        /// </summary>
         [Fact]
         public void TestPutObjectFromTransactedPool()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
+
+            // Act & Assert
             Assert.Throws<NotImplementedException>(() => pool.PutObjectFromTransactedPool(null!));
         }
 
+        /// <summary>
+        /// Verifies that <see cref="ChannelDbConnectionPool.ReplaceConnection(System.Data.Common.DbConnection, Microsoft.Data.ProviderBase.DbConnectionInternal, Microsoft.Data.ProviderBase.TimeoutTimer)"/>
+        /// remains unimplemented and throws <see cref="NotImplementedException"/>.
+        /// </summary>
         [Fact]
         public void TestReplaceConnection()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
+
+            // Act & Assert
             Assert.Throws<NotImplementedException>(() => pool.ReplaceConnection(null!, null!, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
         }
 
+        /// <summary>
+        /// Verifies that <see cref="ChannelDbConnectionPool.TransactionEnded(System.Transactions.Transaction, Microsoft.Data.ProviderBase.DbConnectionInternal)"/>
+        /// remains unimplemented and throws <see cref="NotImplementedException"/>.
+        /// </summary>
         [Fact]
         public void TestTransactionEnded()
         {
+            // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
+
+            // Act & Assert
             Assert.Throws<NotImplementedException>(() => pool.TransactionEnded(null!, null!));
         }
         #endregion
 
         #region Pool Clear Tests
 
+        /// <summary>
+        /// Verifies that clearing an empty pool is a no-op and leaves the pool in a valid state.
+        /// </summary>
         [Fact]
         public void Clear_EmptyPool_DoesNotThrow()
         {
             // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
 
-            // Act & Assert - Should complete without error
+            // Act
             pool.Clear();
+
+            // Assert
             Assert.Equal(0, pool.Count);
         }
 
+        /// <summary>
+        /// Verifies that clearing a pool with only idle connections destroys them immediately and
+        /// leaves the pool empty.
+        /// </summary>
         [Fact]
         public void Clear_MultipleIdleConnections_AllAreDestroyed()
         {
@@ -763,6 +959,10 @@ out internalConnections[i]
             Assert.Equal(0, pool.Count);
         }
 
+        /// <summary>
+        /// Verifies that clearing the pool does not immediately destroy a connection that is still
+        /// checked out by a caller.
+        /// </summary>
         [Fact]
         public void Clear_BusyConnection_NotDestroyedImmediately()
         {
@@ -787,6 +987,10 @@ out DbConnectionInternal? busyConnection
             Assert.Equal(0, busyConnection.ClearGeneration);
         }
 
+        /// <summary>
+        /// Verifies that a busy connection checked out during <see cref="ChannelDbConnectionPool.Clear"/>
+        /// is destroyed when it is later returned because its generation is stale.
+        /// </summary>
         [Fact]
         public void Clear_BusyConnectionReturned_IsDestroyed()
         {
@@ -816,6 +1020,10 @@ out DbConnectionInternal? busyConnection
             Assert.Equal(0, pool.Count);
         }
 
+        /// <summary>
+        /// Verifies that clearing a pool with both busy and idle connections destroys only the idle
+        /// connections immediately and defers busy-connection cleanup until return.
+        /// </summary>
         [Fact]
         public void Clear_MixedBusyAndIdle_OnlyIdleDestroyedImmediately()
         {
@@ -856,6 +1064,10 @@ out DbConnectionInternal? idleConnection
             Assert.Equal(0, pool.Count);
         }
 
+        /// <summary>
+        /// Verifies that connections created after a clear are stamped with the new generation and
+        /// are pooled and reused normally.
+        /// </summary>
         [Fact]
         public void Clear_NewConnectionsAfterClear_ArePooledNormally()
         {
@@ -905,6 +1117,10 @@ out DbConnectionInternal? reusedConnection
             Assert.Equal(1, reusedConnection!.ClearGeneration);
         }
 
+        /// <summary>
+        /// Verifies that repeated clear operations do not corrupt pool state and that each clear
+        /// increments the pool generation as expected.
+        /// </summary>
         [Fact]
         public void Clear_MultipleClearCalls_DoNotCorruptState()
         {
@@ -1157,10 +1373,22 @@ private static void BackdateReturnedTime(DbConnectionInternal connection, TimeSp
         #endregion
 
         #region Test classes
+
+        /// <summary>
+        /// Test connection factory that always succeeds and captures the timeout budget passed in by
+        /// the pool so timeout propagation can be asserted.
+        /// </summary>
         internal class SuccessfulSqlConnectionFactory : SqlConnectionFactory
         {
+            /// <summary>
+            /// Gets the last timeout budget passed through by the pool to the factory.
+            /// </summary>
             internal TimeoutTimer? CapturedTimeout { get; private set; }
 
+            /// <summary>
+            /// Creates a successful stub internal connection and records the timeout budget used for
+            /// the creation attempt.
+            /// </summary>
             protected override DbConnectionInternal CreateConnection(
                 SqlConnectionOptions options,
                 ConnectionPoolKey poolKey,
@@ -1174,8 +1402,16 @@ protected override DbConnectionInternal CreateConnection(
             }
         }
 
+        /// <summary>
+        /// Test connection factory that always throws the pooled-open timeout to exercise failure
+        /// paths in the pool.
+        /// </summary>
         internal class TimeoutSqlConnectionFactory : SqlConnectionFactory
         {
+            /// <summary>
+            /// Throws the pooled-open timeout exception to simulate a failed physical connection
+            /// creation.
+            /// </summary>
             protected override DbConnectionInternal CreateConnection(
                 SqlConnectionOptions options,
                 ConnectionPoolKey poolKey,
@@ -1188,6 +1424,10 @@ protected override DbConnectionInternal CreateConnection(
             }
         }
 
+        /// <summary>
+        /// Minimal <see cref="DbConnectionInternal"/> test double used by the pool tests to avoid
+        /// involving a real provider-specific connection implementation.
+        /// </summary>
         internal class StubDbConnectionInternal : DbConnectionInternal
         {
             #region Not Implemented Members
@@ -1223,6 +1463,10 @@ internal override void ResetConnection()
         }
         #endregion
 
+        /// <summary>
+        /// Verifies that constructing the pool with a zero max pool size fails with the expected
+        /// capacity validation error.
+        /// </summary>
         [Fact]
         public void Constructor_WithZeroMaxPoolSize_ThrowsArgumentOutOfRangeException()
         {
@@ -1242,7 +1486,7 @@ public void Constructor_WithZeroMaxPoolSize_ThrowsArgumentOutOfRangeException()
                 poolGroupOptions
             );
 
-            // Act & Assert
+            // Act
             var exception = Assert.Throws<ArgumentOutOfRangeException>(() => 
                 new ChannelDbConnectionPool(
                     SuccessfulConnectionFactory,
@@ -1250,15 +1494,20 @@ public void Constructor_WithZeroMaxPoolSize_ThrowsArgumentOutOfRangeException()
                     DbConnectionPoolIdentity.NoIdentity,
                     new DbConnectionPoolProviderInfo()
                 ));
-            
+
+            // Assert
             Assert.Equal("fixedCapacity", exception.ParamName);
             Assert.Contains("Capacity must be greater than zero", exception.Message);
         }
 
+        /// <summary>
+        /// Verifies that large but valid max pool sizes pass capacity validation and either succeed
+        /// or fail only due to memory pressure rather than argument validation.
+        /// </summary>
         [Fact]
         public void Constructor_WithLargeMaxPoolSize()
         {
-            // Arrange - Test that Int32.MaxValue is accepted as a valid pool size
+            // Arrange
             var poolGroupOptions = new DbConnectionPoolGroupOptions(
                 poolByIdentity: false,
                 minPoolSize: 0,
@@ -1276,7 +1525,7 @@ public void Constructor_WithLargeMaxPoolSize()
 
             try
             {
-                // Act & Assert - This should not throw ArgumentOutOfRangeException, but may throw OutOfMemoryException
+                // Act
                 var pool = new ChannelDbConnectionPool(
                     SuccessfulConnectionFactory,
                     dbConnectionPoolGroup,
@@ -1284,6 +1533,7 @@ public void Constructor_WithLargeMaxPoolSize()
                     new DbConnectionPoolProviderInfo()
                 );
 
+                // Assert
                 Assert.NotNull(pool);
                 Assert.Equal(0, pool.Count);
             }
@@ -1295,12 +1545,14 @@ public void Constructor_WithLargeMaxPoolSize()
             }
         }
 
+        /// <summary>
+        /// Verifies that small valid max pool sizes construct successfully and produce usable pool
+        /// instances.
+        /// </summary>
         [Fact]
         public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
         {
-            // Arrange - Test various small pool sizes that should work correctly
-            
-            // Test with pool size of 1
+            // Arrange
             var poolGroupOptions1 = new DbConnectionPoolGroupOptions(
                 poolByIdentity: false,
                 minPoolSize: 0,
@@ -1316,7 +1568,7 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
                 poolGroupOptions1
             );
 
-            // Act & Assert - Pool size of 1 should work
+            // Act
             var pool1 = new ChannelDbConnectionPool(
                 SuccessfulConnectionFactory,
                 dbConnectionPoolGroup1,
@@ -1324,10 +1576,11 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
                 new DbConnectionPoolProviderInfo()
             );
 
+            // Assert
             Assert.NotNull(pool1);
             Assert.Equal(0, pool1.Count);
 
-            // Test with pool size of 2
+            // Arrange
             var poolGroupOptions2 = new DbConnectionPoolGroupOptions(
                 poolByIdentity: false,
                 minPoolSize: 0,
@@ -1343,6 +1596,7 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
                 poolGroupOptions2
             );
 
+            // Act
             var pool2 = new ChannelDbConnectionPool(
                 SuccessfulConnectionFactory,
                 dbConnectionPoolGroup2,
@@ -1350,10 +1604,602 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
                 new DbConnectionPoolProviderInfo()
             );
 
+            // Assert
             Assert.NotNull(pool2);
             Assert.Equal(0, pool2.Count);
         }
 
+        #region Rate Limiting And Blocking Period Tests
+
+        /// <summary>
+        /// Verifies that a connection creation failure enters the blocking-period error state when
+        /// blocking is enabled for the pool, and stays out of it when blocking is disabled. The
+        /// blocking policy is driven by the connection string's Pool Blocking Period:
+        /// Default/Auto enable blocking for a non-Azure host (localhost), AlwaysBlock forces it on,
+        /// and NeverBlock suppresses it. FR-006, FR-007.
+        /// </summary>
+        [Theory]
+        [InlineData("", true)]                                // Default (unspecified) => Auto => blocks for localhost
+        [InlineData("Pool Blocking Period=Auto;", true)]      // Auto => blocks for non-Azure host
+        [InlineData("Pool Blocking Period=NeverBlock;", false)]
+        [InlineData("Pool Blocking Period=AlwaysBlock;", true)]
+        public void ErrorOccurred_OnFailure_FollowsBlockingPeriod(string blockingPeriodClause, bool expectErrorOccurred)
+        {
+            // Arrange
+            var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+                new SqlConnectionOptions($"Data Source=localhost;{blockingPeriodClause}"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                new DbConnectionPoolGroupOptions(
+                    poolByIdentity: false,
+                    minPoolSize: 0,
+                    maxPoolSize: 4,
+                    creationTimeout: 15,
+                    loadBalanceTimeout: 0,
+                    hasTransactionAffinity: true,
+                    idleTimeout: 0));
+            var pool = ConstructPool(TimeoutConnectionFactory, dbConnectionPoolGroup: dbConnectionPoolGroup);
+
+            // Act
+            Assert.False(pool.ErrorOccurred);
+
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.TryGetConnection(new SqlConnection(), taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _));
+
+            // Assert
+            Assert.Equal(expectErrorOccurred, pool.ErrorOccurred);
+        }
+
+        /// <summary>
+        /// Verifies that once the pool enters the blocking period, subsequent synchronous requests
+        /// fail fast with the cached exception without attempting another physical open.
+        /// </summary>
+        [Fact]
+        public void ErrorOccurred_BlockingEnabled_SubsequentRequestFastFails()
+        {
+            // Arrange
+            var factory = new CountingTimeoutConnectionFactory();
+            var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+                new SqlConnectionOptions("Data Source=localhost;"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                new DbConnectionPoolGroupOptions(
+                    poolByIdentity: false,
+                    minPoolSize: 0,
+                    maxPoolSize: 4,
+                    creationTimeout: 15,
+                    loadBalanceTimeout: 0,
+                    hasTransactionAffinity: true,
+                    idleTimeout: 0));
+            var pool = ConstructPool(factory, dbConnectionPoolGroup: dbConnectionPoolGroup);
+
+            // Act
+            var first = Assert.Throws<InvalidOperationException>(() =>
+                pool.TryGetConnection(new SqlConnection(), taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _));
+            Assert.True(pool.ErrorOccurred);
+            Assert.Equal(1, factory.CreateCount);
+
+            // FR-006: subsequent requests inside the blocking window must fail fast with the
+            // cached exception without attempting another physical open.
+            var second = Assert.Throws<InvalidOperationException>(() =>
+                pool.TryGetConnection(new SqlConnection(), taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _));
+
+            // Assert - the second request reused the cached exception and did not invoke
+            // CreateConnection again while the pool remained in the error state.
+            Assert.Equal(first.Message, second.Message);
+            Assert.True(pool.ErrorOccurred);
+            Assert.Equal(1, factory.CreateCount);
+        }
+
+        /// <summary>
+        /// Verifies that clearing the pool while in the blocking-period error state resets the
+        /// externally visible error indicator.
+        /// </summary>
+        [Fact]
+        public void Clear_InErrorState_ResetsErrorOccurred()
+        {
+            // Arrange
+            var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+                new SqlConnectionOptions("Data Source=localhost;"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                new DbConnectionPoolGroupOptions(
+                    poolByIdentity: false,
+                    minPoolSize: 0,
+                    maxPoolSize: 4,
+                    creationTimeout: 15,
+                    loadBalanceTimeout: 0,
+                    hasTransactionAffinity: true,
+                    idleTimeout: 0));
+            var pool = ConstructPool(TimeoutConnectionFactory, dbConnectionPoolGroup: dbConnectionPoolGroup);
+
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.TryGetConnection(new SqlConnection(), taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _));
+            Assert.True(pool.ErrorOccurred);
+
+            // Act - FR-011: Clear must reset the error state.
+            pool.Clear();
+
+            // Assert
+            Assert.False(pool.ErrorOccurred);
+        }
+
+        /// <summary>
+        /// Verifies the pool's blocking-period recovery path end-to-end: a creation failure enters
+        /// the blocking period (fast-failing subsequent requests without touching the factory), and
+        /// once the backoff interval elapses the pool leaves the blocking period so a later create
+        /// succeeds and clears the error state. The blocking-period exit timer is driven with a
+        /// <see cref="FakeTimeProvider"/> so the test is deterministic and does not wait on
+        /// wall-clock time. FR-006, FR-009.
+        /// </summary>
+        [Fact]
+        public void Failure_ThenBlockingPeriodExpiry_AllowsSuccessfulCreate()
+        {
+            // Arrange
+            var factory = new ToggleFailureConnectionFactory();
+            var fakeTime = new FakeTimeProvider();
+            var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+                new SqlConnectionOptions("Data Source=localhost;"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                new DbConnectionPoolGroupOptions(
+                    poolByIdentity: false,
+                    minPoolSize: 0,
+                    maxPoolSize: 4,
+                    creationTimeout: 15,
+                    loadBalanceTimeout: 0,
+                    hasTransactionAffinity: true,
+                    idleTimeout: 0));
+            var pool = ConstructPool(factory, dbConnectionPoolGroup: dbConnectionPoolGroup, timeProvider: fakeTime);
+
+            // The first create fails and enters the blocking period.
+            factory.FailNextCreate = true;
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.TryGetConnection(new SqlConnection(), taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _));
+            Assert.True(pool.ErrorOccurred);
+
+            // Even though creates would now succeed, requests issued inside the blocking window
+            // still fast-fail with the cached exception without reaching the factory. Flipping the
+            // factory to succeed and still observing a throw proves the create path never ran.
+            factory.FailNextCreate = false;
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.TryGetConnection(new SqlConnection(), taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _));
+            Assert.True(pool.ErrorOccurred);
+
+            // Advancing past the initial backoff fires the exit timer, ending the blocking period.
+            // FakeTimeProvider invokes the timer callback synchronously, so the error state clears
+            // before the next line runs.
+            fakeTime.Advance(TimeSpan.FromSeconds(5));
+            Assert.False(pool.ErrorOccurred);
+
+            // Act - a create after the blocking period succeeds and leaves the pool healthy.
+            var completed = pool.TryGetConnection(new SqlConnection(), taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out var conn);
+
+            // Assert
+            Assert.True(completed);
+            Assert.NotNull(conn);
+            Assert.False(pool.ErrorOccurred);
+        }
+
+        /// <summary>
+        /// Verifies that an available rate-limiter permit allows the pool to create a physical
+        /// connection immediately and that the permit is released after the open completes.
+        /// </summary>
+        [Fact]
+        public void RateLimiter_PermitAvailable_CreatesPhysicalConnection()
+        {
+            // Arrange
+            var factory = new CountingSuccessfulConnectionFactory();
+            using var rateLimiter = new ConcurrencyLimiter(
+                new ConcurrencyLimiterOptions { PermitLimit = 1, QueueLimit = 0 });
+            var pool = ConstructPool(
+                factory,
+                connectionCreationRateLimiter: rateLimiter);
+
+            // Act
+            bool completed = pool.TryGetConnection(
+                new SqlConnection(),
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? connection);
+
+            // Assert
+            Assert.True(completed);
+            Assert.NotNull(connection);
+            Assert.Equal(1, factory.CreateCount);
+            // The single permit was acquired for the open and released afterwards, so it is
+            // available again once the connection has been handed back to the caller.
+            Assert.Equal(1, rateLimiter.GetStatistics()!.CurrentAvailablePermits);
+        }
+
+        /// <summary>
+        /// Verifies that a successful physical open releases its rate-limiter lease so that a
+        /// subsequent open can acquire the same permit. With a single-permit limiter, a leaked
+        /// lease would deny the second open and force connection reuse, leaving CreateCount at 1.
+        /// </summary>
+        [Fact]
+        public void RateLimiter_SuccessfulCreate_ReleasesLeaseForNextCreate()
+        {
+            // Arrange
+            var factory = new CountingSuccessfulConnectionFactory();
+            using var rateLimiter = new ConcurrencyLimiter(
+                new ConcurrencyLimiterOptions { PermitLimit = 1, QueueLimit = 0 });
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: 2,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 0);
+            var pool = ConstructPool(
+                factory,
+                poolGroupOptions: poolGroupOptions,
+                connectionCreationRateLimiter: rateLimiter);
+
+            // Act
+            // Two distinct owners so neither open can be satisfied by reusing the other's
+            // connection - each must acquire a fresh permit and create a physical connection.
+            bool firstCompleted = pool.TryGetConnection(
+                new SqlConnection(),
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? firstConnection);
+            bool secondCompleted = pool.TryGetConnection(
+                new SqlConnection(),
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? secondConnection);
+
+            // Assert
+            Assert.True(firstCompleted);
+            Assert.True(secondCompleted);
+            Assert.NotNull(firstConnection);
+            Assert.NotNull(secondConnection);
+            Assert.NotSame(firstConnection, secondConnection);
+            // The second create only succeeds if the first release returned the single permit.
+            Assert.Equal(2, factory.CreateCount);
+            Assert.Equal(1, rateLimiter.GetStatistics()!.CurrentAvailablePermits);
+        }
+
+        /// <summary>
+        /// Verifies the FR-004 wake path: a caller blocked purely because the rate limiter denied
+        /// its permit is woken when a different caller releases its lease, and then creates its own
+        /// physical connection (rather than reusing one, since the permit holder never returns its
+        /// connection). Exercises both the sync and async idle-channel wait mechanisms.
+        /// </summary>
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task RateLimiter_LeaseReleaseWakesRateLimitedWaiter_CreatesPhysicalConnection(bool async)
+        {
+            // Arrange
+            using var createGate = new ManualResetEventSlim(initialState: false);
+            var factory = new GatedSuccessfulConnectionFactory(createGate);
+            using var rateLimiter = new ConcurrencyLimiter(
+                new ConcurrencyLimiterOptions { PermitLimit = 1, QueueLimit = 0 });
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                // Room to grow so the release actually pokes a waiter (ReservationCount < MaxPoolSize).
+                maxPoolSize: 2,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 0);
+            var pool = ConstructPool(
+                factory,
+                poolGroupOptions: poolGroupOptions,
+                connectionCreationRateLimiter: rateLimiter);
+
+            Task<DbConnectionInternal?> Open(SqlConnection owner)
+            {
+                if (async)
+                {
+                    // The async path dispatches the open onto the thread pool and completes the TCS,
+                    // so this returns immediately while creation proceeds on another thread.
+                    var tcs = new TaskCompletionSource<DbConnectionInternal>();
+                    pool.TryGetConnection(owner, tcs, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _);
+                    return tcs.Task!;
+                }
+
+                return Task.Run(() =>
+                {
+                    pool.TryGetConnection(
+                        owner,
+                        taskCompletionSource: null,
+                        TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                        out DbConnectionInternal? c);
+                    return c;
+                });
+            }
+
+            // Act
+            // Caller A acquires the only permit and blocks inside creation, holding the permit.
+            SqlConnection ownerA = new();
+            Task<DbConnectionInternal?> requestA = Open(ownerA);
+            Assert.True(
+                factory.FirstCreateStarted.Wait(TimeSpan.FromSeconds(5)),
+                "Timed out waiting for the first open to begin physical creation.");
+
+            // Caller B is denied a permit (A holds it) and must fall back to the idle-channel wait.
+            // A denied AttemptAcquire increments the limiter's TotalFailedLeases, so watching that
+            // counter rise is how we confirm B was refused a permit and is now parked on the idle
+            // channel waiting for a wakeup (rather than still racing to acquire).
+            long failedLeasesBefore = rateLimiter.GetStatistics()!.TotalFailedLeases;
+            Task<DbConnectionInternal?> requestB = Open(new SqlConnection());
+            Assert.True(
+                SpinWait.SpinUntil(
+                    () => rateLimiter.GetStatistics()!.TotalFailedLeases > failedLeasesBefore,
+                    TimeSpan.FromSeconds(5)),
+                "Timed out waiting for the second request to be denied by the rate limiter.");
+
+            // Releasing A's create lets it finish and dispose its lease, which pokes the idle
+            // channel to wake B. B then finds the permit available and creates its own connection.
+            createGate.Set();
+
+            DbConnectionInternal? connectionA = await requestA;
+            DbConnectionInternal? connectionB = await requestB;
+
+            // Assert
+            Assert.NotNull(connectionA);
+            Assert.NotNull(connectionB);
+            // B was woken by the lease-release poke and created a fresh connection; A never returned
+            // its connection, so this cannot be reuse.
+            Assert.NotSame(connectionA, connectionB);
+            Assert.Equal(2, factory.CreateCount);
+            Assert.Equal(1, rateLimiter.GetStatistics()!.CurrentAvailablePermits);
+        }
+
+        /// <summary>
+        /// Verifies that when the rate limiter denies a new physical open, the caller falls back
+        /// to waiting for an existing connection to be returned instead of forcing a second create.
+        /// </summary>
+        [Fact]
+        public async Task RateLimiter_PermitDenied_ReusesReturnedConnection()
+        {
+            // Arrange
+            var factory = new CountingSuccessfulConnectionFactory();
+            using var rateLimiter = new ConcurrencyLimiter(
+                new ConcurrencyLimiterOptions { PermitLimit = 1, QueueLimit = 0 });
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: 2,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 0);
+            var pool = ConstructPool(
+                factory,
+                poolGroupOptions: poolGroupOptions,
+                connectionCreationRateLimiter: rateLimiter);
+            SqlConnection firstOwner = new();
+
+            // The first open acquires and releases the single permit, creating a physical
+            // connection that the second request can later reuse.
+            pool.TryGetConnection(
+                firstOwner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? firstConnection);
+            Assert.NotNull(firstConnection);
+            Assert.Equal(1, factory.CreateCount);
+
+            // Externally hold the only permit so the pool's next AttemptAcquire is denied and the
+            // waiting request must fall back to waiting for a returned connection.
+            using RateLimitLease heldLease = rateLimiter.AttemptAcquire(1);
+            Assert.True(heldLease.IsAcquired);
+            long failedLeasesBefore = rateLimiter.GetStatistics()!.TotalFailedLeases;
+
+            // Act
+            Task<DbConnectionInternal?> waitingRequest = Task.Run(() =>
+            {
+                pool.TryGetConnection(
+                    new SqlConnection(),
+                    taskCompletionSource: null,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                    out DbConnectionInternal? queuedConnection);
+                return queuedConnection;
+            });
+
+            Assert.True(
+                SpinWait.SpinUntil(
+                    () => rateLimiter.GetStatistics()!.TotalFailedLeases > failedLeasesBefore,
+                    TimeSpan.FromSeconds(5)),
+                "Timed out waiting for the second request to be denied by the rate limiter.");
+
+            pool.ReturnInternalConnection(firstConnection!, firstOwner);
+            DbConnectionInternal? reusedConnection = await waitingRequest;
+
+            // Assert
+            Assert.Same(firstConnection, reusedConnection);
+            Assert.Equal(1, factory.CreateCount);
+        }
+
+        /// <summary>
+        /// Verifies that failed connection attempts release any acquired rate-limiter lease so the
+        /// pool does not starve future callers after repeated failures.
+        /// </summary>
+        [Fact]
+        public async Task RateLimiter_LeaseDisposedOnFailure_DoesNotStarvePool()
+        {
+            // Arrange
+            // If the rate limiter lease were not disposed on failure, after N failures (where N is
+            // the limiter's permit count) every subsequent request would deadlock. Verify that we
+            // can keep getting failures back without ever blocking the thread pool.
+            using var rateLimiter = new ConcurrencyLimiter(
+                new ConcurrencyLimiterOptions { PermitLimit = 4, QueueLimit = 0 });
+            var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+                new SqlConnectionOptions("Data Source=localhost;Pool Blocking Period=NeverBlock;"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                new DbConnectionPoolGroupOptions(
+                    poolByIdentity: false,
+                    minPoolSize: 0,
+                    maxPoolSize: 4,
+                    creationTimeout: 15,
+                    loadBalanceTimeout: 0,
+                    hasTransactionAffinity: true,
+                    idleTimeout: 0));
+            var pool = ConstructPool(
+                TimeoutConnectionFactory,
+                dbConnectionPoolGroup: dbConnectionPoolGroup,
+                connectionCreationRateLimiter: rateLimiter);
+
+            // Act & Assert
+            for (int i = 0; i < 8; i++)
+            {
+                await Assert.ThrowsAsync<InvalidOperationException>(async () =>
+                {
+                    var tcs = new TaskCompletionSource<DbConnectionInternal>();
+                    pool.TryGetConnection(new SqlConnection(), tcs, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _);
+                    await tcs.Task;
+                });
+            }
+
+            // Every failed open must have released its permit; otherwise the pool would starve.
+            Assert.True(
+                SpinWait.SpinUntil(
+                    () => rateLimiter.GetStatistics()!.CurrentAvailablePermits == 4,
+                    TimeSpan.FromSeconds(5)),
+                "Rate limiter did not release all permits after failed opens.");
+        }
+
+        /// <summary>
+        /// Test connection factory that can be toggled between failure and success to exercise pool
+        /// recovery behavior after blocking-period entry.
+        /// </summary>
+        internal class ToggleFailureConnectionFactory : SqlConnectionFactory
+        {
+            /// <summary>
+            /// Gets or sets whether the next connection creation attempt should fail.
+            /// </summary>
+            public bool FailNextCreate { get; set; }
+
+            /// <summary>
+            /// Creates a stub connection or throws the pooled-open timeout based on
+            /// <see cref="FailNextCreate"/>.
+            /// </summary>
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+            {
+                if (FailNextCreate)
+                {
+                    throw ADP.PooledOpenTimeout();
+                }
+
+                return new StubDbConnectionInternal();
+            }
+        }
+
+        /// <summary>
+        /// Test connection factory that always throws the pooled-open timeout and records how many
+        /// physical connection creations the pool attempted, so blocking-period tests can assert
+        /// that subsequent requests fail fast without invoking another open.
+        /// </summary>
+        internal sealed class CountingTimeoutConnectionFactory : SqlConnectionFactory
+        {
+            /// <summary>
+            /// Gets the number of times the pool asked the factory to create a physical connection.
+            /// </summary>
+            internal int CreateCount { get; private set; }
+
+            /// <summary>
+            /// Increments the creation counter and throws the pooled-open timeout exception to
+            /// simulate a failed physical connection creation.
+            /// </summary>
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+            {
+                CreateCount++;
+                throw ADP.PooledOpenTimeout();
+            }
+        }
+
+        /// <summary>
+        /// Test connection factory that returns a successful stub connection each time and records
+        /// how many physical connection creations the pool attempted, so rate-limiting tests can
+        /// assert how often the pool actually opened a connection.
+        /// </summary>
+        internal sealed class CountingSuccessfulConnectionFactory : SqlConnectionFactory
+        {
+            /// <summary>
+            /// Gets the number of times the pool asked the factory to create a physical connection.
+            /// </summary>
+            internal int CreateCount { get; private set; }
+
+            /// <summary>
+            /// Creates a successful stub internal connection and increments the creation counter.
+            /// </summary>
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+            {
+                CreateCount++;
+                return new StubDbConnectionInternal();
+            }
+        }
+
+        /// <summary>
+        /// Test connection factory that blocks inside its first physical creation until an external
+        /// gate is released, so a test can hold a rate-limiter permit in-flight while orchestrating
+        /// a second caller. Counts creations and signals when the first creation begins.
+        /// </summary>
+        internal sealed class GatedSuccessfulConnectionFactory : SqlConnectionFactory
+        {
+            private readonly ManualResetEventSlim _createGate;
+            private int _createCount;
+
+            internal GatedSuccessfulConnectionFactory(ManualResetEventSlim createGate)
+            {
+                _createGate = createGate;
+            }
+
+            /// <summary>
+            /// Gets the number of times the pool asked the factory to create a physical connection.
+            /// </summary>
+            internal int CreateCount => Volatile.Read(ref _createCount);
+
+            /// <summary>
+            /// Signaled when the first physical creation begins, before it blocks on the gate.
+            /// </summary>
+            internal ManualResetEventSlim FirstCreateStarted { get; } = new(initialState: false);
+
+            /// <summary>
+            /// Creates a successful stub connection. The first creation signals that it has started
+            /// and then blocks on the gate, holding whatever rate-limiter permit it acquired until
+            /// the test releases it; subsequent creations complete immediately.
+            /// </summary>
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+            {
+                if (Interlocked.Increment(ref _createCount) == 1)
+                {
+                    FirstCreateStarted.Set();
+                    _createGate.Wait();
+                }
+
+                return new StubDbConnectionInternal();
+            }
+        }
+
+        #endregion
+
         #region Connection Timeout Awareness Tests
 
         /// <summary>
@@ -1482,3 +2328,4 @@ public void GetConnection_TimeoutTimerReflectsPoolWaitTime()
         #endregion
     }
 }
+
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index d3405ed113..04afcf3910 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -101,6 +101,7 @@
     <PackageReference Include="Moq" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
+    <PackageReference Include="System.Threading.RateLimiting" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
     <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
@@ -118,6 +119,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Moq" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
+    <PackageReference Include="System.Threading.RateLimiting" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.console" ExcludeAssets="compile" />
     <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />

From b7f6386c5447e5c5aeafe6d167de3eee3e646ae7 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 20 Jul 2026 10:35:17 -0300
Subject: [PATCH 192/298] - Renamed the top-level pipeline file to match our
 transition plan. (#4454)

- Other minor cleanup for consistent stage/job/step names.
---
 ....yml => sqlclient-ci-package-pipeline.yml} | 52 ++++++++-----------
 1 file changed, 22 insertions(+), 30 deletions(-)
 rename eng/pipelines/ci/package/{sqlclient-package.yml => sqlclient-ci-package-pipeline.yml} (82%)

diff --git a/eng/pipelines/ci/package/sqlclient-package.yml b/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
similarity index 82%
rename from eng/pipelines/ci/package/sqlclient-package.yml
rename to eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
index f1b6d13c17..ada32431b2 100644
--- a/eng/pipelines/ci/package/sqlclient-package.yml
+++ b/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
@@ -7,35 +7,27 @@
 # This pipeline builds all packages using the build.proj Pack target with ReferenceType=Package,
 # then publishes the resulting .nupkg and .snupkg files as a single pipeline artifact.
 #
-# It runs:
-#   - On pushes to GitHub main and ADO internal/main (batched)
-#   - Nightly at 00:00 UTC on both branches
+# It runs nightly at 00:20 UTC on GitHub dotnet/SqlClient main and ADO.Net dotnet-sqlclient
+# internal/main.
 #
 # On internal/main the strong-name signing key is downloaded and used to sign assemblies during the
 # build.
 #
-# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI.  We distinguish the two via
-# branch filters:
+# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO.NET CI.  We distinguish the two
+# via branch filters:
 #
 #   - Only the GitHub repo has a 'main' branch.
 #   - Only the ADO repo has an 'internal/main' branch.
 
 name: $(DayOfYear)$(Rev:rr)
 
-# Do not trigger this pipeline for PRs.
+# Do not trigger this pipeline for PRs or pushes.
 pr: none
+trigger: none
 
-# Trigger on pushes to main and internal/main, batching concurrent commits.
-trigger:
-  batch: true
-  branches:
-    include:
-      - main
-      - internal/main
-
-# Nightly schedule at 00:00 UTC.
+# Nightly schedule at 00:20 UTC.
 schedules:
-  - cron: '0 0 * * *'
+  - cron: '20 0 * * *'
     displayName: Nightly Build
     branches:
       include:
@@ -92,13 +84,13 @@ variables:
   # downloaded by DownloadSecureFile@1; on public builds it expands to empty.
   - name: signingKeyArg
     ${{ if eq(variables.isInternalBuild, true) }}:
-      value: '-p:SigningKeyPath="$(keyFile.secureFilePath)"'
+      value: -p:SigningKeyPath="$(driverKeyFile.secureFilePath)"
     ${{ else }}:
       value: ''
 
 jobs:
-  - job: pack_all_packages
-    displayName: Pack All Packages
+  - job: build_nuget_packages
+    displayName: Build NuGet Packages
 
     pool:
       ${{ if eq(variables.isInternalBuild, true) }}:
@@ -124,29 +116,29 @@ jobs:
       # Restore dotnet local tools (pwsh, apicompat, etc.).
       - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
-      # Clean any pre-existing .nupkg / .snupkg files from the packages/ directory
-      # to ensure we only publish packages produced by this run.
+      # Clean any pre-existing .nupkg / .snupkg files from the packages/ directory to ensure we only
+      # publish packages produced by this run.
       - pwsh: |
           Write-Host 'Cleaning packages/ directory...'
           Remove-Item -Force "$(Build.SourcesDirectory)/packages/*.nupkg" -ErrorAction SilentlyContinue
           Remove-Item -Force "$(Build.SourcesDirectory)/packages/*.snupkg" -ErrorAction SilentlyContinue
           Write-Host 'Done.'
-        displayName: Clean packages/ directory
+        displayName: Clean Packages Directory
 
       # On internal builds, download the strong-name signing key.
       - ${{ if eq(variables.isInternalBuild, true) }}:
         - task: DownloadSecureFile@1
-          displayName: Download Signing Key
+          displayName: Download Driver Signing Key
           inputs:
             secureFile: netfxKeypair.snk
-          name: keyFile
+          name: driverKeyFile
 
       # Run the Pack target via build.proj.
       - task: DotNetCoreCLI@2
-        displayName: build.proj - Pack (ReferenceType=Package)
+        displayName: Build & Pack
         inputs:
           command: build
-          projects: '$(Build.SourcesDirectory)/build.proj'
+          projects: $(Build.SourcesDirectory)/build.proj
           arguments: >-
             -t:Pack
             -p:Configuration=${{ parameters.buildConfiguration }}
@@ -161,12 +153,12 @@ jobs:
           Write-Host 'Packages produced:'
           Get-ChildItem "$(Build.SourcesDirectory)/packages/*.nupkg" -ErrorAction SilentlyContinue | Format-Table Name, Length -AutoSize -Wrap
           Get-ChildItem "$(Build.SourcesDirectory)/packages/*.snupkg" -ErrorAction SilentlyContinue | Format-Table Name, Length -AutoSize -Wrap
-        displayName: List produced packages
+        displayName: List Packages
 
       # Publish all .nupkg and .snupkg files from packages/ as a pipeline artifact.
       - task: PublishPipelineArtifact@1
-        displayName: Publish NuGet Packages
+        displayName: Publish Packages
         inputs:
-          targetPath: '$(Build.SourcesDirectory)/packages'
-          artifactName: Packages
+          targetPath: $(Build.SourcesDirectory)/packages
+          artifactName: SqlClient-Driver-Packages
           publishLocation: pipeline

From c736094beb62eff384b20f15b79b86bb641022bb Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 20 Jul 2026 11:58:38 -0300
Subject: [PATCH 193/298] Add PackageValidator tool for NuGet package
 inspection and validation (#4407)

---
 BUILDGUIDE.md                                 |   2 +-
 build.proj                                    |  89 +++-
 src/Microsoft.Data.SqlClient.slnx             |   8 +-
 tools/PackageValidator/Directory.Build.props  |  10 +
 .../PackageValidator/Directory.Packages.props |  11 +
 tools/PackageValidator/README.md              | 226 ++++++++++
 tools/PackageValidator/global.json            |  15 +
 .../PackageValidator/src/AssemblyInspector.cs | 309 ++++++++++++++
 .../PackageValidator/src/BinaryClassifier.cs  |  48 +++
 tools/PackageValidator/src/HumanReporter.cs   | 239 +++++++++++
 tools/PackageValidator/src/Json.cs            |  40 ++
 tools/PackageValidator/src/Models.Common.cs   | 139 +++++++
 tools/PackageValidator/src/Models.Report.cs   | 238 +++++++++++
 .../src/NativeVersionReader.cs                | 114 ++++++
 .../PackageValidator/src/PackageInspector.cs  | 160 ++++++++
 .../src/PackageValidator.csproj               |  22 +
 tools/PackageValidator/src/PortablePdb.cs     | 205 ++++++++++
 tools/PackageValidator/src/Program.cs         | 385 ++++++++++++++++++
 tools/PackageValidator/src/SymbolResolver.cs  | 270 ++++++++++++
 tools/PackageValidator/src/Validator.cs       | 350 ++++++++++++++++
 .../src/VersionExpectations.cs                |  92 +++++
 tools/PackageValidator/src/VersionRange.cs    | 299 ++++++++++++++
 .../test/AssemblyInspectorTests.cs            | 113 +++++
 .../test/BinaryClassifierTests.cs             |  48 +++
 .../test/PackageValidator.Test.csproj         |  23 ++
 tools/PackageValidator/test/ValidatorTests.cs | 365 +++++++++++++++++
 .../test/VersionExpectationsTests.cs          | 184 +++++++++
 .../test/VersionRangeTests.cs                 | 134 ++++++
 28 files changed, 4133 insertions(+), 5 deletions(-)
 create mode 100644 tools/PackageValidator/Directory.Build.props
 create mode 100644 tools/PackageValidator/Directory.Packages.props
 create mode 100644 tools/PackageValidator/README.md
 create mode 100644 tools/PackageValidator/global.json
 create mode 100644 tools/PackageValidator/src/AssemblyInspector.cs
 create mode 100644 tools/PackageValidator/src/BinaryClassifier.cs
 create mode 100644 tools/PackageValidator/src/HumanReporter.cs
 create mode 100644 tools/PackageValidator/src/Json.cs
 create mode 100644 tools/PackageValidator/src/Models.Common.cs
 create mode 100644 tools/PackageValidator/src/Models.Report.cs
 create mode 100644 tools/PackageValidator/src/NativeVersionReader.cs
 create mode 100644 tools/PackageValidator/src/PackageInspector.cs
 create mode 100644 tools/PackageValidator/src/PackageValidator.csproj
 create mode 100644 tools/PackageValidator/src/PortablePdb.cs
 create mode 100644 tools/PackageValidator/src/Program.cs
 create mode 100644 tools/PackageValidator/src/SymbolResolver.cs
 create mode 100644 tools/PackageValidator/src/Validator.cs
 create mode 100644 tools/PackageValidator/src/VersionExpectations.cs
 create mode 100644 tools/PackageValidator/src/VersionRange.cs
 create mode 100644 tools/PackageValidator/test/AssemblyInspectorTests.cs
 create mode 100644 tools/PackageValidator/test/BinaryClassifierTests.cs
 create mode 100644 tools/PackageValidator/test/PackageValidator.Test.csproj
 create mode 100644 tools/PackageValidator/test/ValidatorTests.cs
 create mode 100644 tools/PackageValidator/test/VersionExpectationsTests.cs
 create mode 100644 tools/PackageValidator/test/VersionRangeTests.cs

diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 5acf76cbd5..12a91935cc 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -92,7 +92,7 @@ projects they depend on.
 | `BuildSqlClientWindows`       | Builds the Windows-specific implementation binaries of Microsoft.Data.SqlClient |
 | `BuildSqlServer`              | Builds Microsoft.SqlServer.Server                                               |
 | `BuildTests`                  | Builds all test projects for all supported OS combinations                      |
-| `BuildTools`                  | Builds auxiliary tool/app projects                                              |
+| `BuildTools`                  | Builds auxiliary tool/app projects and their test projects                      |
 | `Clean`                       | Removes build and test output directories                                       |
 
 A selection of parameters for build targets in `build.proj` can be found below:
diff --git a/build.proj b/build.proj
index f2ee21f77c..7a8ce075a7 100644
--- a/build.proj
+++ b/build.proj
@@ -1474,10 +1474,15 @@
   <PropertyGroup>
     <AzureSqlConnectorProjectPath>$(RepoRoot)doc/apps/AzureSqlConnector/AzureSqlConnector.csproj</AzureSqlConnectorProjectPath>
     <PackageCompatibilityProjectPath>$(RepoRoot)tools/PackageCompatibility/src/PackageCompatibility.csproj</PackageCompatibilityProjectPath>
+    <PackageCompatibilityTestProjectPath>$(RepoRoot)tools/PackageCompatibility/test/PackageCompatibility.Test.csproj</PackageCompatibilityTestProjectPath>
+    <PackageCompatibilityDir>$(RepoRoot)tools/PackageCompatibility</PackageCompatibilityDir>
+    <PackageValidatorProjectPath>$(RepoRoot)tools/PackageValidator/src/PackageValidator.csproj</PackageValidatorProjectPath>
+    <PackageValidatorTestProjectPath>$(RepoRoot)tools/PackageValidator/test/PackageValidator.Test.csproj</PackageValidatorTestProjectPath>
+    <PackageValidatorDir>$(RepoRoot)tools/PackageValidator</PackageValidatorDir>
   </PropertyGroup>
 
-  <!-- BuildTools: Builds auxiliary tool/app projects. -->
-  <Target Name="BuildTools" DependsOnTargets="BuildAzureSqlConnector;BuildPackageCompatibility" />
+  <!-- BuildTools: Builds auxiliary tool/app projects (including their test projects). -->
+  <Target Name="BuildTools" DependsOnTargets="BuildAzureSqlConnector;BuildPackageCompatibility;BuildPackageCompatibilityTest;BuildPackageValidator;BuildPackageValidatorTest" />
 
   <!-- BuildAzureSqlConnector: Builds the AzureSqlConnector sample app. -->
   <Target Name="BuildAzureSqlConnector">
@@ -1507,4 +1512,84 @@
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
+  <!-- BuildPackageValidator: Builds the PackageValidator tool. -->
+  <Target Name="BuildPackageValidator">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(PackageValidatorProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building PackageValidator"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- BuildPackageCompatibilityTest: Builds the PackageCompatibility test project. -->
+  <Target Name="BuildPackageCompatibilityTest">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(PackageCompatibilityTestProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building PackageCompatibility tests"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- BuildPackageValidatorTest: Builds the PackageValidator test project. -->
+  <Target Name="BuildPackageValidatorTest">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(PackageValidatorTestProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building PackageValidator tests"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!--
+    TestPackageCompatibility: Runs the PackageCompatibility tests.
+
+    The Exec runs from the tool directory so the tool's global.json (which opts the xUnit v3
+    test project into the Microsoft.Testing.Platform runner) is discovered.
+  -->
+  <Target Name="TestPackageCompatibility">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(PackageCompatibilityTestProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Testing PackageCompatibility"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" WorkingDirectory="$(PackageCompatibilityDir)" />
+  </Target>
+
+  <!--
+    TestPackageValidator: Runs the PackageValidator tests.
+
+    The Exec runs from the tool directory so the tool's global.json (which opts the xUnit v3
+    test project into the Microsoft.Testing.Platform runner) is discovered.
+  -->
+  <Target Name="TestPackageValidator">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(PackageValidatorTestProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Testing PackageValidator"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" WorkingDirectory="$(PackageValidatorDir)" />
+  </Target>
+
 </Project>
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
index c0c12132e7..62e0612395 100644
--- a/src/Microsoft.Data.SqlClient.slnx
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -214,6 +214,10 @@
     <Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj" />
     <Project Path="Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj" />
   </Folder>
-  <Project Path="../tools/PackageCompatibility/src/PackageCompatibility.csproj" />
-  <Project Path="../tools/PackageCompatibility/test/PackageCompatibility.Test.csproj" />
+  <Folder Name="/tools/">
+    <Project Path="../tools/PackageCompatibility/src/PackageCompatibility.csproj" />
+    <Project Path="../tools/PackageCompatibility/test/PackageCompatibility.Test.csproj" />
+    <Project Path="../tools/PackageValidator/src/PackageValidator.csproj" />
+    <Project Path="../tools/PackageValidator/test/PackageValidator.Test.csproj" />
+  </Folder>
 </Solution>
diff --git a/tools/PackageValidator/Directory.Build.props b/tools/PackageValidator/Directory.Build.props
new file mode 100644
index 0000000000..425707ecad
--- /dev/null
+++ b/tools/PackageValidator/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- We purposely do not include any parent Directory.Build.props files. -->
+
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+</Project>
diff --git a/tools/PackageValidator/Directory.Packages.props b/tools/PackageValidator/Directory.Packages.props
new file mode 100644
index 0000000000..f3a6395bc4
--- /dev/null
+++ b/tools/PackageValidator/Directory.Packages.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- We purposely do not include any parent Directory.Packages.props files. -->
+
+  <ItemGroup>
+    <PackageVersion Include="System.CommandLine" Version="2.0.6" />
+    <PackageVersion Include="xunit.v3" Version="4.0.0-pre.81" />
+  </ItemGroup>
+
+</Project>
diff --git a/tools/PackageValidator/README.md b/tools/PackageValidator/README.md
new file mode 100644
index 0000000000..f09ded9db4
--- /dev/null
+++ b/tools/PackageValidator/README.md
@@ -0,0 +1,226 @@
+# PackageValidator
+
+A standalone .NET 10 command-line tool that inspects one or more NuGet packages (`.nupkg`) and
+validates their **versions, signing, and symbols**.
+
+PackageValidator is a first-class maintainer tool for the SqlClient family of packages. It reads
+assemblies purely through **metadata** — it never loads them into the runtime — which makes it:
+
+- **Cross-platform.** It runs on any OS that hosts .NET 10.
+- **Framework-agnostic.** It can read assemblies built for target frameworks the host does not run
+  (for example, inspecting `net462` binaries from a Linux host).
+- **Side-effect free.** No module initializers or assembly-load events are ever
+  executed.
+
+It is designed to be run both interactively (to inspect a package) and in CI (to **gate** a build
+with `--fail-on` and assert expected versions with `--expect-*`).
+
+## What it checks
+
+For every package it opens, PackageValidator reports and validates:
+
+- **Package identity** — id, version, dependency groups, and NuGet signature, read from the embedded
+  `.nuspec`.
+- **Per-assembly versions** — `AssemblyVersion`, `FileVersion`, `InformationalVersion`, culture,
+  public key token, strong-name signing status, and target framework.
+- **Native binaries** — Win32 version-resource information and architecture.
+- **Binary classification** — implementation / reference / satellite / native, so symbol coverage is
+  judged only over implementation assemblies.
+- **Symbols** — sibling `.snupkg` matching by debug GUID with portable-PDB checksum verification,
+  embedded-symbol detection, and orphan/mismatch reporting.
+- **Intrinsic rules** — severity-tagged findings for missing/mismatched symbols,
+  unsigned/delay-signed assemblies, dependency inconsistencies, and more.
+- **Expected versions** — optional `--expect-*` assertions for inter-package version-match
+  validation.
+
+## Building and running
+
+The tool lives under `tools/PackageValidator` with its own `global.json` and `Directory.*.props`,
+isolated from the main driver build.
+
+```bash
+# From tools/PackageValidator/src
+dotnet run -- <paths>... [options]
+
+# Or build once and invoke the produced binary
+dotnet build -c Release
+./bin/Release/net10.0/PackageValidator <paths>... [options]
+```
+
+It is also wired into the repository's `build.proj`:
+
+- `BuildPackageValidator` / `BuildPackageValidatorTest` — build the tool and tests.
+- `TestPackageValidator` — run the test suite.
+- `BuildTools` — builds the tools and their test projects.
+
+## Usage
+
+```bash
+PackageValidator <paths>... [options]
+```
+
+| Argument / option | Description |
+| --- | --- |
+| `<paths>...` | One or more `.nupkg` files, or directories scanned recursively for `.nupkg` files. |
+| `--json` | Emit machine-readable JSON instead of the human-readable layout. |
+| `--no-snupkg` | Do not look for or process sibling `.snupkg` symbol packages (embedded symbols are still evaluated). |
+| `--fail-on <value>` | Exit non-zero when a finding matches the given value. Repeatable. |
+| `--expect-package-version [id=]VALUE` | Confirm the package version equals `VALUE`. Repeatable. |
+| `--expect-file-version [id=]VALUE` | Confirm every assembly's file version equals `VALUE`. Repeatable. |
+| `--expect-assembly-version [id=]VALUE` | Confirm every assembly's assembly version equals `VALUE`. Repeatable. |
+
+### `--fail-on` values
+
+`--fail-on` accepts a **severity** (`error`, `warning`, `info`), the token `any`,
+or one of the following finding **categories**:
+
+- `version-inconsistency`
+- `missing-symbols`
+- `symbol-mismatch`
+- `symbol-checksum-mismatch`
+- `symbol-orphan`
+- `symbol-duplicate`
+- `delay-signed`
+- `unsigned`
+- `package-unsigned`
+- `dependency-inconsistency`
+- `unexpected-package-version`
+- `unexpected-file-version`
+- `unexpected-assembly-version`
+
+### `--expect-*` values
+
+Each `--expect-*` value is either `VALUE` (applies to every package in the run) or `id=VALUE`
+(applies only to the package whose id is `id`). A specific id overrides a bare `VALUE` (wildcard),
+and because the options repeat, a family-wide expectation can coexist with a per-package override —
+for example, assert one family file version while letting `Microsoft.SqlServer.Server` differ.  A
+missing version counts as a mismatch, so an assertion never silently passes.
+
+### Exit codes
+
+| Code | Meaning |
+| --- | --- |
+| `0` | Success; no gating findings. |
+| `1` | Runtime/inspection error. |
+| `2` | A `--fail-on` gate was tripped. |
+
+(Argument-parsing errors return a non-zero `System.CommandLine` code.)
+
+The same reference details are printed in a free-form **Notes** section appended to `--help`.
+
+## Examples
+
+Inspect a single package (human-readable):
+
+```bash
+PackageValidator Microsoft.Data.SqlClient.7.1.0-preview1.nupkg
+```
+
+Emit JSON for tooling:
+
+```bash
+PackageValidator Microsoft.Data.SqlClient.7.1.0-preview1.nupkg --json
+```
+
+Gate a directory of packages against an expected family file version, with a per-package override,
+and fail on any error:
+
+```bash
+PackageValidator <dir-of-nupkgs> \
+  --expect-file-version *=7.1.0.17604 \
+  --expect-file-version Microsoft.SqlServer.Server=1.1.0.17604 \
+  --fail-on error
+```
+
+> **Symbol packages from nuget.org:** the flat-container feed only serves `.nupkg` files. To
+> exercise the `.snupkg` path, download the symbol package from the gallery's symbol endpoint
+> (`https://www.nuget.org/api/v2/symbolpackage/{Id}/{Version}`) and save it beside the `.nupkg` with
+> the same base name (for example `microsoft.data.sqlclient.5.2.2.snupkg`).
+
+## Source layout
+
+```text
+tools/PackageValidator/
+├── global.json                 # Pins the .NET SDK used to build the tool
+├── Directory.Build.props       # Shared MSBuild properties for the tool + tests
+├── Directory.Packages.props    # Central package versions (CPM)
+├── src/
+│   ├── PackageValidator.csproj # The console app project (net10.0)
+│   ├── Program.cs              # Entry point: CLI parsing, orchestration, exit codes
+│   ├── PackageInspector.cs     # Opens a .nupkg and builds a PackageReport
+│   ├── AssemblyInspector.cs    # Metadata-only inspection of a single .dll entry
+│   ├── NativeVersionReader.cs  # Win32 version-resource + architecture for native DLLs
+│   ├── BinaryClassifier.cs     # Maps a DLL path to its role (impl/ref/satellite/native)
+│   ├── SymbolResolver.cs       # Cross-checks the sibling .snupkg against assemblies
+│   ├── PortablePdb.cs          # Low-level portable-PDB GUID + checksum reading
+│   ├── VersionExpectations.cs  # Parses/resolves --expect-* assertions by package id
+│   ├── VersionRange.cs         # SemVer 2.0-aware NuGet version-range evaluator
+│   ├── Validator.cs            # The intrinsic rules engine + finding categories
+│   ├── HumanReporter.cs        # Renders a run to human-readable text
+│   ├── Json.cs                 # Source-generated JSON serialization context
+│   ├── Models.Common.cs        # Shared enums + value types (BinaryKind, Severity, Finding, …)
+│   └── Models.Report.cs        # Report DTOs (ValidationRun, PackageReport, BinaryReport, …)
+└── test/
+    ├── PackageValidator.Test.csproj
+    ├── AssemblyInspectorTests.cs
+    ├── BinaryClassifierTests.cs
+    ├── ValidatorTests.cs
+    ├── VersionExpectationsTests.cs
+    └── VersionRangeTests.cs
+```
+
+### File responsibilities
+
+| File | Responsibility |
+| --- | --- |
+| `Program.cs` | Console entry point. Defines the `System.CommandLine` surface (arguments, options, and the `--help` Notes section), enumerates input paths, drives inspection and validation, selects the output renderer, and maps results to process exit codes. |
+| `PackageInspector.cs` | Opens a `.nupkg` (a zip archive), reads the `.nuspec` for id/version/dependencies, detects the `.signature.p7s` signature entry, inspects every `.dll` entry, and invokes the symbol resolver — producing a `PackageReport`. |
+| `AssemblyInspector.cs` | Inspects a single `.dll` archive entry via `PEReader`/`MetadataReader` without loading it. Extracts assembly name, versions, culture, public key token, strong-name status, target framework, and debug (CodeView) GUID/checksums. Falls back to native reporting for non-managed DLLs. |
+| `NativeVersionReader.cs` | Reads Win32 version-resource fields (file/product version, product name) and architecture from native binaries. Stages bytes to a temp file for `FileVersionInfo`, falling back to architecture-only when staging fails. |
+| `BinaryClassifier.cs` | Classifies a managed DLL's package path into a `BinaryKind` (implementation under `lib/` or `runtimes/<rid>/lib/`, reference under `ref/`, satellite `*.resources.dll`, or other). |
+| `SymbolResolver.cs` | Locates the sibling `.snupkg`, indexes its PDBs by debug GUID and path, matches each assembly (authoritative GUID match with checksum verification, or path-based mismatch detection), and reports orphaned/duplicate symbol files. Loads PDB bytes on demand to keep peak memory low. |
+| `PortablePdb.cs` | Low-level portable-PDB helpers: read the debug GUID, detect legacy Windows PDBs, and verify a PDB against an assembly's recorded checksum (locating the `#Pdb` stream and zeroing the PDB id before hashing). |
+| `VersionExpectations.cs` | Parses the `--expect-package/file/assembly-version` specs into per-id (and wildcard) expectations and resolves the applicable expected value for a given package, enabling inter-package version-match validation. |
+| `VersionRange.cs` | Evaluates whether a concrete version satisfies a NuGet dependency range, following SemVer 2.0 precedence (prerelease ordering; build metadata ignored). Used by dependency-consistency checks. |
+| `Validator.cs` | Defines the stable finding `Categories` and applies the intrinsic validation rules, producing per-package and cross-package `Finding` instances (symbols, signing, dependency and expected-version consistency). |
+| `HumanReporter.cs` | Renders a `ValidationRun` to standard output in the human-readable layout: per-package details and findings, cross-package findings, and the run summary. |
+| `Json.cs` | Source-generated `JsonSerializerContext` for trim/AOT-friendly, indented, camel-cased JSON output (nulls omitted, enums as strings). |
+| `Models.Common.cs` | Shared enums and value types used across the tool: `BinaryKind`, `SigningStatus`, `Severity`, `Finding`, `NativeVersionInfo`, `PdbChecksum`, and related value types. |
+| `Models.Report.cs` | The report DTO graph serialized to JSON and rendered as text: `ValidationRun`, `ValidationSummary`, `PackageReport`, `BinaryReport`, `SymbolPackageInfo`, and related types. |
+
+## Related public tools
+
+No single public tool combines everything PackageValidator does, but each area it covers has
+established, general-purpose analogs. This tool intentionally folds them into one dependency-light,
+cross-platform CLI tailored to the SqlClient package family.
+
+| Area | Public tools | Relationship |
+| --- | --- | --- |
+| Package inspection & health rules | [NuGet Package Explorer](https://github.com/NuGetPackageExplorer/NuGetPackageExplorer), [`dotnet validate`](https://github.com/meziantou/Meziantou.Framework) (Meziantou) | Closest all-round analogs: inspect `.nupkg` metadata, layout, symbols, and run package-hygiene rules. |
+| Package/assembly signatures | `dotnet nuget verify`, `signtool`, `sn.exe` | Verify NuGet, Authenticode, and strong-name signing state. PackageValidator reports the same strong-name/NuGet-signature state inline. |
+| API surface & compatibility | [`Microsoft.DotNet.ApiCompat`](https://github.com/dotnet/sdk), SDK `PackageValidation` (`<EnablePackageValidation>`), [`PublicApiAnalyzers`](https://github.com/dotnet/roslyn-analyzers) | Catch breaking API/TFM changes across versions — complementary to, not overlapping with, this tool's version checks. |
+| Assembly/metadata inspection | [ILSpy / `ilspycmd`](https://github.com/icsharpcode/ILSpy), `dotnet-ildasm`, [`AsmSpy`](https://github.com/mikehadlow/AsmSpy) | Metadata-only inspection (same `System.Reflection.Metadata` approach); AsmSpy specifically reports version conflicts across binaries. |
+| Symbols / Source Link | [`sourcelink`](https://github.com/dotnet/sourcelink), `Microsoft.SourceLink.*` | Verify portable-PDB checksums and Source Link — the same portable-PDB checksum verification this tool performs against the sibling `.snupkg`. |
+
+**What makes PackageValidator distinct:**
+
+- Metadata-only reading (like ILSpy) so it can inspect `net462` assemblies from a Linux host, with
+  no assembly loading.
+- Symbol matching by debug GUID **and** portable-PDB checksum (like sourcelink), including
+  orphan/mismatch detection against the sibling `.snupkg`.
+- Strong-name and NuGet signature state reported inline (like `sn` / `nuget verify`).
+- **Inter-package version-match assertions** (`--expect-*`) — asserting a whole *family* of packages
+  carries consistent versions, which the general-purpose tools above do not do out of the box.
+- CI gating via `--fail-on` severity/category selectors.
+
+## Tests
+
+The `test/` project is an xUnit v3 suite running on Microsoft.Testing.Platform.  It covers
+public-key-token computation, binary classification, SemVer 2.0 range evaluation (including
+prerelease ordering and malformed-input rejection), the rules engine, and expected-version
+assertions.
+
+```bash
+# From tools/PackageValidator/test
+dotnet test
+```
diff --git a/tools/PackageValidator/global.json b/tools/PackageValidator/global.json
new file mode 100644
index 0000000000..a4b67c1ed4
--- /dev/null
+++ b/tools/PackageValidator/global.json
@@ -0,0 +1,15 @@
+{
+  "test": {
+    // xUnit v3 runs on Microsoft.Testing.Platform rather than the older VSTest runner.
+    // On .NET 10, dotnet test must therefore be opted into MTP mode for this test project.
+    "runner": "Microsoft.Testing.Platform"
+  },
+  "sdk": {
+    // global.json lookup stops at the nearest file and does not merge with the repo-root file.
+    // This subtree therefore needs to repeat the root SDK settings so commands run from
+    // tools/PackageValidator keep using the same SDK behavior.
+    "version": "10.0.300",
+    "rollForward": "patch",
+    "allowPrerelease": false
+  }
+}
diff --git a/tools/PackageValidator/src/AssemblyInspector.cs b/tools/PackageValidator/src/AssemblyInspector.cs
new file mode 100644
index 0000000000..988e4dcceb
--- /dev/null
+++ b/tools/PackageValidator/src/AssemblyInspector.cs
@@ -0,0 +1,309 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.IO.Compression;
+using System.Reflection;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace PackageValidator;
+
+/// <summary>
+/// Inspects a single <c>.dll</c> archive entry and extracts its identity, version, signing, and
+/// debug information without loading the assembly into the runtime.
+/// </summary>
+internal static class AssemblyInspector
+{
+    /// <summary>
+    /// Inspects a single <c>.dll</c> archive entry.
+    /// </summary>
+    /// <param name="entry">The <c>.dll</c> entry within the package archive.</param>
+    /// <returns>
+    /// A <see cref="BinaryReport"/>. For native or non-assembly DLLs this is a lightweight report
+    /// with <see cref="BinaryReport.IsManagedAssembly"/> set to <see langword="false"/>.
+    /// </returns>
+    public static BinaryReport Inspect(ZipArchiveEntry entry)
+    {
+        // PEReader requires a seekable stream, but the zip entry stream is forward-only, so copy the
+        // bytes into a seekable buffer first.
+        byte[] bytes;
+        using (var buffer = new MemoryStream())
+        {
+            using (Stream stream = entry.Open())
+            {
+                stream.CopyTo(buffer);
+            }
+            bytes = buffer.ToArray();
+        }
+
+        try
+        {
+            using var pe = new PEReader(new MemoryStream(bytes, writable: false));
+
+            // Native DLLs (for example the SNI runtimes) have no CLI metadata at all; report their
+            // Win32 version-resource information instead of managed identity.
+            if (!pe.HasMetadata)
+            {
+                return BinaryReport.Native(entry.FullName, NativeVersionReader.Read(bytes));
+            }
+
+            MetadataReader reader = pe.GetMetadataReader();
+
+            // A managed module that is not itself an assembly (no manifest) carries no
+            // version/strong-name identity.
+            if (!reader.IsAssembly)
+            {
+                return new BinaryReport
+                {
+                    Path = entry.FullName,
+                    Kind = BinaryKind.Other,
+                    IsManagedAssembly = false,
+                };
+            }
+
+            AssemblyDefinition asm = reader.GetAssemblyDefinition();
+
+            // The assembly version and culture come straight from the assembly manifest row.
+            string name = reader.GetString(asm.Name);
+            string assemblyVersion = asm.Version.ToString();
+            string culture = asm.Culture.IsNil ? "neutral" : reader.GetString(asm.Culture);
+            if (string.IsNullOrEmpty(culture))
+            {
+                culture = "neutral";
+            }
+
+            // The public key (if the assembly is strong-name signed) yields the public key token.
+            byte[] publicKey = reader.GetBlobBytes(asm.PublicKey);
+            string? publicKeyToken = ComputePublicKeyToken(publicKey);
+
+            // The strong-name signed CorFlag distinguishes a fully signed assembly from a
+            // delay-signed one (which carries a public key but was never signed).
+            SigningStatus signing = DetermineSigningStatus(pe, publicKeyToken is not null);
+
+            // Read the debug directory to learn which PDB (by GUID) this assembly was built with,
+            // whether it already carries an embedded portable PDB, and any recorded PDB checksums.
+            (Guid? codeViewGuid, bool hasEmbeddedPdb, List<PdbChecksum>? checksums) = ReadDebugInfo(pe);
+
+            // File, informational, and target-framework versions are assembly-level custom
+            // attributes, so scan for them by attribute type name.
+            string? fileVersion = null;
+            string? informationalVersion = null;
+            string? targetFramework = null;
+            foreach (CustomAttributeHandle handle in asm.GetCustomAttributes())
+            {
+                CustomAttribute attribute = reader.GetCustomAttribute(handle);
+                switch (GetAttributeTypeName(reader, attribute))
+                {
+                    case "System.Reflection.AssemblyFileVersionAttribute":
+                        fileVersion = DecodeStringArgument(reader, attribute);
+                        break;
+                    case "System.Reflection.AssemblyInformationalVersionAttribute":
+                        informationalVersion = DecodeStringArgument(reader, attribute);
+                        break;
+                    case "System.Runtime.Versioning.TargetFrameworkAttribute":
+                        targetFramework = DecodeStringArgument(reader, attribute);
+                        break;
+                }
+            }
+
+            // Compose the canonical strong-name display name in the same shape AssemblyName.FullName
+            // would produce, using "null" when the assembly is not strong-name signed.
+            string strongName =
+                $"{name}, Version={assemblyVersion}, Culture={culture}, " +
+                $"PublicKeyToken={publicKeyToken ?? "null"}";
+
+            return new BinaryReport
+            {
+                Path = entry.FullName,
+                Kind = BinaryClassifier.Classify(entry.FullName),
+                IsManagedAssembly = true,
+                AssemblyName = name,
+                AssemblyVersion = assemblyVersion,
+                FileVersion = fileVersion,
+                InformationalVersion = informationalVersion,
+                TargetFramework = targetFramework,
+                Culture = culture,
+                PublicKeyToken = publicKeyToken,
+                SigningStatus = signing,
+                StrongName = strongName,
+                CodeViewGuid = codeViewGuid,
+                Checksums = checksums,
+                HasEmbeddedSymbols = hasEmbeddedPdb,
+            };
+        }
+        catch (BadImageFormatException)
+        {
+            // The entry was not a valid PE image (for example a renamed data file). Report it as
+            // native rather than failing the whole package inspection.
+            return BinaryReport.Native(entry.FullName);
+        }
+    }
+
+    /// <summary>
+    /// Determines the strong-name signing state of an assembly from its CLI header flags.
+    /// </summary>
+    /// <param name="pe">The PE reader positioned over the assembly.</param>
+    /// <param name="hasPublicKey">Whether the assembly manifest declares a public key.</param>
+    /// <returns>The inferred <see cref="SigningStatus"/>.</returns>
+    private static SigningStatus DetermineSigningStatus(PEReader pe, bool hasPublicKey)
+    {
+        if (!hasPublicKey)
+        {
+            return PackageValidator.SigningStatus.Unsigned;
+        }
+
+        CorHeader? cor = pe.PEHeaders.CorHeader;
+        bool strongNameSigned = cor is not null && (cor.Flags & CorFlags.StrongNameSigned) != 0;
+        return strongNameSigned
+            ? PackageValidator.SigningStatus.Signed
+            : PackageValidator.SigningStatus.DelaySigned;
+    }
+
+    /// <summary>
+    /// Reads an assembly's debug directory to determine the PDB it was built against, whether it
+    /// embeds a portable PDB, and any recorded PDB checksums.
+    /// </summary>
+    /// <param name="pe">The PE reader positioned over the assembly.</param>
+    /// <returns>The CodeView GUID, the embedded-PDB flag, and the recorded checksums (if any).</returns>
+    private static (Guid? CodeViewGuid, bool HasEmbeddedPdb, List<PdbChecksum>? Checksums) ReadDebugInfo(PEReader pe)
+    {
+        Guid? codeViewGuid = null;
+        bool hasEmbeddedPdb = false;
+        List<PdbChecksum>? checksums = null;
+
+        foreach (DebugDirectoryEntry entry in pe.ReadDebugDirectory())
+        {
+            switch (entry.Type)
+            {
+                case DebugDirectoryEntryType.CodeView:
+                    try
+                    {
+                        codeViewGuid = pe.ReadCodeViewDebugDirectoryData(entry).Guid;
+                    }
+                    catch (BadImageFormatException)
+                    {
+                        // Malformed CodeView record; leave the GUID unknown.
+                    }
+                    break;
+
+                case DebugDirectoryEntryType.EmbeddedPortablePdb:
+                    hasEmbeddedPdb = true;
+                    break;
+
+                case DebugDirectoryEntryType.PdbChecksum:
+                    try
+                    {
+                        PdbChecksumDebugDirectoryData data = pe.ReadPdbChecksumDebugDirectoryData(entry);
+                        (checksums ??= []).Add(new PdbChecksum
+                        {
+                            Algorithm = data.AlgorithmName,
+                            Hash = data.Checksum.ToArray(),
+                        });
+                    }
+                    catch (BadImageFormatException)
+                    {
+                        // Malformed checksum record; skip it.
+                    }
+                    break;
+            }
+        }
+
+        return (codeViewGuid, hasEmbeddedPdb, checksums);
+    }
+
+    /// <summary>
+    /// Computes the 8-byte public key token (as a lowercase hex string) from a strong-name public
+    /// key blob.
+    /// </summary>
+    /// <param name="publicKey">The raw public key bytes from the assembly manifest.</param>
+    /// <returns>
+    /// The 16-character hex public key token, or <see langword="null"/> when the assembly is not
+    /// strong-name signed (empty public key).
+    /// </returns>
+    public static string? ComputePublicKeyToken(byte[] publicKey)
+    {
+        if (publicKey is null || publicKey.Length == 0)
+        {
+            return null;
+        }
+
+        // The token is defined by the CLI spec as the low 8 bytes of the SHA-1 hash of the public
+        // key, emitted in reverse (little-endian) order.
+        byte[] hash = SHA1.HashData(publicKey);
+        var token = new byte[8];
+        for (int i = 0; i < 8; i++)
+        {
+            token[i] = hash[hash.Length - 1 - i];
+        }
+
+        var sb = new StringBuilder(16);
+        foreach (byte b in token)
+        {
+            sb.Append(b.ToString("x2"));
+        }
+        return sb.ToString();
+    }
+
+    /// <summary>
+    /// Resolves the full type name of the attribute that a custom attribute instance constructs.
+    /// </summary>
+    private static string? GetAttributeTypeName(MetadataReader reader, CustomAttribute attribute)
+    {
+        switch (attribute.Constructor.Kind)
+        {
+            case HandleKind.MemberReference:
+                MemberReference memberRef = reader.GetMemberReference((MemberReferenceHandle)attribute.Constructor);
+                return GetTypeName(reader, memberRef.Parent);
+
+            case HandleKind.MethodDefinition:
+                MethodDefinition methodDef = reader.GetMethodDefinition((MethodDefinitionHandle)attribute.Constructor);
+                return GetTypeName(reader, methodDef.GetDeclaringType());
+
+            default:
+                return null;
+        }
+    }
+
+    /// <summary>
+    /// Builds the fully qualified name of a type referenced by a type reference or definition handle.
+    /// </summary>
+    private static string? GetTypeName(MetadataReader reader, EntityHandle handle)
+    {
+        switch (handle.Kind)
+        {
+            case HandleKind.TypeReference:
+                TypeReference typeRef = reader.GetTypeReference((TypeReferenceHandle)handle);
+                return Combine(reader.GetString(typeRef.Namespace), reader.GetString(typeRef.Name));
+
+            case HandleKind.TypeDefinition:
+                TypeDefinition typeDef = reader.GetTypeDefinition((TypeDefinitionHandle)handle);
+                return Combine(reader.GetString(typeDef.Namespace), reader.GetString(typeDef.Name));
+
+            default:
+                return null;
+        }
+
+        static string Combine(string ns, string name) =>
+            string.IsNullOrEmpty(ns) ? name : $"{ns}.{name}";
+    }
+
+    /// <summary>
+    /// Decodes the value of a custom attribute whose constructor takes a single string argument.
+    /// </summary>
+    private static string? DecodeStringArgument(MetadataReader reader, CustomAttribute attribute)
+    {
+        BlobReader blob = reader.GetBlobReader(attribute.Value);
+
+        // Every custom attribute value blob begins with a fixed 0x0001 prolog; anything else means
+        // the blob is malformed or not the single-string shape expected here.
+        if (blob.RemainingBytes < 2 || blob.ReadUInt16() != 0x0001)
+        {
+            return null;
+        }
+
+        return blob.ReadSerializedString();
+    }
+}
diff --git a/tools/PackageValidator/src/BinaryClassifier.cs b/tools/PackageValidator/src/BinaryClassifier.cs
new file mode 100644
index 0000000000..3ff4151913
--- /dev/null
+++ b/tools/PackageValidator/src/BinaryClassifier.cs
@@ -0,0 +1,48 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace PackageValidator;
+
+/// <summary>
+/// Classifies a DLL path into the role it plays inside a NuGet package.
+/// </summary>
+internal static class BinaryClassifier
+{
+    /// <summary>
+    /// Classifies a managed DLL by its path within the package.
+    /// </summary>
+    /// <param name="path">The DLL path within the package archive (forward-slash separated).</param>
+    /// <returns>The inferred <see cref="BinaryKind"/> (never <see cref="BinaryKind.Native"/>).</returns>
+    public static BinaryKind Classify(string path)
+    {
+        string normalized = path.Replace('\\', '/');
+        string fileName = System.IO.Path.GetFileName(normalized);
+
+        // Satellite resource assemblies are named "<parent>.resources.dll" and live under a culture
+        // subfolder. The name suffix alone is a reliable discriminator.
+        if (fileName.EndsWith(".resources.dll", StringComparison.OrdinalIgnoreCase))
+        {
+            return BinaryKind.Satellite;
+        }
+
+        // Reference assemblies are shipped under ref/ and carry no executable IL.
+        if (normalized.StartsWith("ref/", StringComparison.OrdinalIgnoreCase)
+            || normalized.Contains("/ref/", StringComparison.OrdinalIgnoreCase))
+        {
+            return BinaryKind.Reference;
+        }
+
+        // Implementation assemblies live under lib/ or runtimes/<rid>/lib/. Restrict the nested
+        // match to runtimes/ paths so unrelated folders (for example build/lib/) are not treated
+        // as implementation assemblies.
+        if (normalized.StartsWith("lib/", StringComparison.OrdinalIgnoreCase)
+            || (normalized.StartsWith("runtimes/", StringComparison.OrdinalIgnoreCase)
+                && normalized.Contains("/lib/", StringComparison.OrdinalIgnoreCase)))
+        {
+            return BinaryKind.Implementation;
+        }
+
+        return BinaryKind.Other;
+    }
+}
diff --git a/tools/PackageValidator/src/HumanReporter.cs b/tools/PackageValidator/src/HumanReporter.cs
new file mode 100644
index 0000000000..f26295691b
--- /dev/null
+++ b/tools/PackageValidator/src/HumanReporter.cs
@@ -0,0 +1,239 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace PackageValidator;
+
+/// <summary>
+/// Renders a <see cref="ValidationRun"/> to standard output in a human-readable layout.
+/// </summary>
+internal static class HumanReporter
+{
+    /// <summary>
+    /// Writes the full run: each package's details and findings, then any cross-package findings and
+    /// the run summary.
+    /// </summary>
+    /// <param name="run">The validation run to render.</param>
+    public static void Print(ValidationRun run)
+    {
+        for (int i = 0; i < run.Packages.Count; i++)
+        {
+            if (i > 0)
+            {
+                Console.WriteLine(new string('=', 78));
+                Console.WriteLine();
+            }
+
+            PrintPackage(run.Packages[i]);
+        }
+
+        if (run.CrossPackageFindings is { Count: > 0 } cross)
+        {
+            Console.WriteLine(new string('=', 78));
+            Console.WriteLine();
+            Console.WriteLine("Cross-package findings:");
+            foreach (Finding finding in cross)
+            {
+                Console.WriteLine($"  {FormatFinding(finding)}");
+            }
+            Console.WriteLine();
+        }
+
+        PrintSummary(run.Summary);
+    }
+
+    /// <summary>
+    /// Writes a single package's details and findings.
+    /// </summary>
+    /// <param name="report">The package report to render.</param>
+    private static void PrintPackage(PackageReport report)
+    {
+        SymbolPackageInfo sym = report.SymbolPackage;
+
+        Console.WriteLine($"Package file:     {report.PackageFile}");
+        Console.WriteLine($"NuGet package id: {report.PackageId ?? "(unknown)"}");
+        Console.WriteLine($"NuGet version:    {report.PackageVersion ?? "(unknown)"}");
+        Console.WriteLine($"Package signed:   {(report.IsSigned ? "yes" : "no")}");
+        Console.WriteLine($"Symbol package:   {DescribeSymbolPackage(sym)}");
+
+        PrintDependencies(report.DependencyGroups);
+        Console.WriteLine();
+
+        if (report.Binaries.Count == 0)
+        {
+            Console.WriteLine("No .dll files found in package.");
+        }
+        else
+        {
+            foreach (BinaryReport asm in report.Binaries)
+            {
+                PrintBinary(asm, sym);
+            }
+
+            PrintSymbolSummary(sym);
+        }
+
+        PrintFindings(report.Findings);
+        Console.WriteLine();
+    }
+
+    /// <summary>Writes a package's declared dependencies.</summary>
+    private static void PrintDependencies(List<DependencyGroup>? groups)
+    {
+        if (groups is not { Count: > 0 })
+        {
+            return;
+        }
+
+        Console.WriteLine("Dependencies:");
+        foreach (DependencyGroup group in groups)
+        {
+            string tfm = group.TargetFramework ?? "(all frameworks)";
+            Console.WriteLine($"  [{tfm}]");
+            if (group.Dependencies.Count == 0)
+            {
+                Console.WriteLine("    (none)");
+                continue;
+            }
+            foreach (DependencyInfo dependency in group.Dependencies)
+            {
+                Console.WriteLine($"    {dependency.Id} {dependency.VersionRange ?? "(any)"}");
+            }
+        }
+    }
+
+    /// <summary>Writes a single binary's details.</summary>
+    private static void PrintBinary(BinaryReport asm, SymbolPackageInfo sym)
+    {
+        Console.WriteLine($"{asm.Path}  [{asm.Kind}]");
+
+        if (!asm.IsManagedAssembly)
+        {
+            Console.WriteLine("  (native / unmanaged DLL - no managed metadata)");
+            if (asm.NativeVersion is { } native)
+            {
+                Console.WriteLine($"  File version:           {native.FileVersion ?? "(none)"}");
+                Console.WriteLine($"  Product version:        {native.ProductVersion ?? "(none)"}");
+                Console.WriteLine($"  Product name:           {native.ProductName ?? "(none)"}");
+                Console.WriteLine($"  Architecture:           {native.Architecture ?? "(unknown)"}");
+            }
+            Console.WriteLine();
+            return;
+        }
+
+        Console.WriteLine($"  Assembly version:       {asm.AssemblyVersion}");
+        Console.WriteLine($"  File version:           {asm.FileVersion ?? "(none)"}");
+        Console.WriteLine($"  Informational version:  {asm.InformationalVersion ?? "(none)"}");
+        Console.WriteLine($"  Target framework:       {asm.TargetFramework ?? "(none)"}");
+        Console.WriteLine($"  Public key token:       {asm.PublicKeyToken ?? "(none)"}");
+        Console.WriteLine($"  Signing status:         {asm.SigningStatus?.ToString() ?? "(unknown)"}");
+        Console.WriteLine($"  Strong name:            {asm.StrongName}");
+        Console.WriteLine($"  Debug (PDB) id:         {asm.DebugId ?? "(none)"}");
+        Console.WriteLine($"  Embedded symbols:       {FormatTriState(asm.HasEmbeddedSymbols)}");
+
+        if (sym.Status == "present")
+        {
+            Console.WriteLine($"  Symbol package PDB:     {DescribeSymbolPackagePdb(asm)}");
+        }
+
+        Console.WriteLine();
+    }
+
+    /// <summary>Renders the package header's symbol-package line.</summary>
+    private static string DescribeSymbolPackage(SymbolPackageInfo sym) => sym.Status switch
+    {
+        "present" => sym.File!,
+        "missing" => "(no sibling .snupkg found beside the package)",
+        "skipped" => "(symbol package processing disabled via --no-snupkg)",
+        _ => sym.Status,
+    };
+
+    /// <summary>Describes whether the symbol package supplies a matching PDB for an assembly.</summary>
+    private static string DescribeSymbolPackagePdb(BinaryReport asm)
+    {
+        if (asm.HasSymbolPackageSymbols != true)
+        {
+            return "none";
+        }
+
+        if (asm.SymbolPackageSymbolsMatch != true)
+        {
+            return $"{asm.SymbolPackageFile} (MISMATCH - symbols are from a different build)";
+        }
+
+        string checksum = asm.SymbolPackageVerifiedByChecksum switch
+        {
+            true => "checksum verified",
+            false => "CHECKSUM MISMATCH",
+            null => "GUID match, checksum not verified",
+        };
+        return $"{asm.SymbolPackageFile} (matches assembly; {checksum})";
+    }
+
+    /// <summary>Writes the trailing symbol-coverage summary block.</summary>
+    private static void PrintSymbolSummary(SymbolPackageInfo sym)
+    {
+        Console.WriteLine("Symbol summary:");
+        Console.WriteLine($"  Implementation assemblies have symbols: {FormatTriState(sym.AllImplementationAssembliesHaveSymbols)}");
+
+        switch (sym.Status)
+        {
+            case "present":
+                Console.WriteLine($"  All symbol-package symbols match:       {FormatTriState(sym.AllSymbolsMatch)}");
+                if (sym.OrphanSymbolFiles is { Count: > 0 } orphans)
+                {
+                    Console.WriteLine("  Symbol files with no matching assembly:");
+                    foreach (string orphan in orphans)
+                    {
+                        Console.WriteLine($"    {orphan}");
+                    }
+                }
+                break;
+
+            case "missing":
+                Console.WriteLine("  Symbol package: none found beside the package (embedded symbols still evaluated).");
+                break;
+
+            case "skipped":
+                Console.WriteLine("  Symbol package: processing disabled via --no-snupkg (embedded symbols still evaluated).");
+                break;
+        }
+
+        Console.WriteLine();
+    }
+
+    /// <summary>Writes a package's findings, grouped under a heading.</summary>
+    private static void PrintFindings(List<Finding>? findings)
+    {
+        if (findings is not { Count: > 0 })
+        {
+            Console.WriteLine("Findings: none");
+            return;
+        }
+
+        Console.WriteLine("Findings:");
+        foreach (Finding finding in findings)
+        {
+            Console.WriteLine($"  {FormatFinding(finding)}");
+        }
+    }
+
+    /// <summary>Formats a single finding as a one-line entry.</summary>
+    private static string FormatFinding(Finding finding) =>
+        $"[{finding.Severity.ToString().ToUpperInvariant()}] {finding.Category}: {finding.Target} - {finding.Message}";
+
+    /// <summary>Writes the run-level summary.</summary>
+    private static void PrintSummary(ValidationSummary summary)
+    {
+        Console.WriteLine("Run summary:");
+        Console.WriteLine($"  Packages inspected: {summary.PackageCount}");
+        Console.WriteLine($"  Errors:             {summary.ErrorCount}");
+        Console.WriteLine($"  Warnings:           {summary.WarningCount}");
+        Console.WriteLine($"  Info:               {summary.InfoCount}");
+        Console.WriteLine($"  Gate:               {(summary.Failed ? "FAILED" : "passed")}");
+    }
+
+    /// <summary>Formats a nullable boolean as <c>yes</c>/<c>no</c>/<c>n/a</c>.</summary>
+    private static string FormatTriState(bool? value) =>
+        value switch { true => "yes", false => "no", null => "n/a" };
+}
diff --git a/tools/PackageValidator/src/Json.cs b/tools/PackageValidator/src/Json.cs
new file mode 100644
index 0000000000..959ca83cf1
--- /dev/null
+++ b/tools/PackageValidator/src/Json.cs
@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace PackageValidator;
+
+/// <summary>
+/// Source-generated <see cref="JsonSerializerContext"/> for the validation run output, providing
+/// trim- and AOT-friendly serialization with indented, camel-cased output that omits null members
+/// and writes enums as strings.
+/// </summary>
+[JsonSourceGenerationOptions(
+    WriteIndented = true,
+    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+    PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
+    UseStringEnumConverter = true)]
+[JsonSerializable(typeof(ValidationRun))]
+internal sealed partial class JsonContext : JsonSerializerContext
+{
+    private static JsonSerializerOptions? s_serializerOptions;
+
+    /// <summary>
+    /// Gets serializer options based on this context's generated metadata but with relaxed escaping,
+    /// so characters that are safe inside a JSON string (such as <c>+</c>) are emitted literally
+    /// rather than as <c>\uXXXX</c> escapes.
+    /// </summary>
+    /// <remarks>
+    /// Built lazily rather than in a field initializer to avoid a static-initialization ordering
+    /// dependency on the source-generated <see cref="JsonSerializerContext.Default"/> instance.
+    /// </remarks>
+    public static JsonSerializerOptions SerializerOptions =>
+        s_serializerOptions ??= new(Default.Options)
+        {
+            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        };
+}
diff --git a/tools/PackageValidator/src/Models.Common.cs b/tools/PackageValidator/src/Models.Common.cs
new file mode 100644
index 0000000000..317b579a55
--- /dev/null
+++ b/tools/PackageValidator/src/Models.Common.cs
@@ -0,0 +1,139 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Serialization;
+
+namespace PackageValidator;
+
+/// <summary>
+/// Classifies a DLL by the role it plays inside a NuGet package. Symbol-coverage expectations
+/// differ by kind: only <see cref="Implementation"/> assemblies are expected to ship symbols,
+/// while reference assemblies and satellite resource assemblies legitimately have none.
+/// </summary>
+internal enum BinaryKind
+{
+    /// <summary>An implementation assembly under <c>lib/</c> or <c>runtimes/.../lib/</c>.</summary>
+    Implementation,
+
+    /// <summary>A reference (compile-time) assembly under <c>ref/</c>.</summary>
+    Reference,
+
+    /// <summary>A satellite resource assembly (<c>*.resources.dll</c> in a culture subfolder).</summary>
+    Satellite,
+
+    /// <summary>A native (unmanaged) binary, such as an SNI runtime.</summary>
+    Native,
+
+    /// <summary>A managed DLL that does not fit any of the other categories.</summary>
+    Other,
+}
+
+/// <summary>
+/// The strong-name signing state of a managed assembly.
+/// </summary>
+internal enum SigningStatus
+{
+    /// <summary>The assembly has no public key and is not strong-name signed.</summary>
+    Unsigned,
+
+    /// <summary>
+    /// The assembly carries a public key but the strong-name signed flag is not set, meaning it was
+    /// delay-signed and never completed signing.
+    /// </summary>
+    DelaySigned,
+
+    /// <summary>The assembly carries a public key and the strong-name signed flag is set.</summary>
+    Signed,
+}
+
+/// <summary>
+/// The severity of a validation finding.
+/// </summary>
+internal enum Severity
+{
+    /// <summary>Informational; surfaced for visibility but not necessarily a problem.</summary>
+    Info,
+
+    /// <summary>A potential problem that may warrant attention.</summary>
+    Warning,
+
+    /// <summary>A definite problem.</summary>
+    Error,
+}
+
+/// <summary>
+/// A single validation result produced by the rules engine.
+/// </summary>
+internal sealed class Finding
+{
+    /// <summary>Gets the severity of the finding.</summary>
+    public required Severity Severity { get; init; }
+
+    /// <summary>Gets the stable category key (for example <c>"missing-symbols"</c>) used by <c>--fail-on</c>.</summary>
+    public required string Category { get; init; }
+
+    /// <summary>Gets the target the finding applies to (a package file, an assembly path, etc.).</summary>
+    public required string Target { get; init; }
+
+    /// <summary>Gets the human-readable explanation of the finding.</summary>
+    public required string Message { get; init; }
+}
+
+/// <summary>
+/// A NuGet package dependency declared in the <c>.nuspec</c>.
+/// </summary>
+internal sealed class DependencyInfo
+{
+    /// <summary>Gets the dependency package id.</summary>
+    public required string Id { get; init; }
+
+    /// <summary>Gets the declared version range, or <see langword="null"/> if none was specified.</summary>
+    public string? VersionRange { get; init; }
+}
+
+/// <summary>
+/// A group of dependencies, optionally scoped to a single target framework.
+/// </summary>
+internal sealed class DependencyGroup
+{
+    /// <summary>Gets the target framework moniker for this group, or <see langword="null"/> for the framework-agnostic group.</summary>
+    public string? TargetFramework { get; init; }
+
+    /// <summary>Gets the dependencies declared in this group.</summary>
+    public required List<DependencyInfo> Dependencies { get; init; }
+}
+
+/// <summary>
+/// Win32 version-resource information read from a native binary.
+/// </summary>
+internal sealed class NativeVersionInfo
+{
+    /// <summary>Gets the <c>FileVersion</c> string from the Win32 version resource, if present.</summary>
+    public string? FileVersion { get; init; }
+
+    /// <summary>Gets the <c>ProductVersion</c> string from the Win32 version resource, if present.</summary>
+    public string? ProductVersion { get; init; }
+
+    /// <summary>Gets the <c>ProductName</c> string from the Win32 version resource, if present.</summary>
+    public string? ProductName { get; init; }
+
+    /// <summary>Gets the processor architecture of the native image (for example <c>"x64"</c>), if known.</summary>
+    public string? Architecture { get; init; }
+}
+
+/// <summary>
+/// A PDB checksum recorded in an assembly's debug directory, used to verify a matched PDB byte-for-byte.
+/// </summary>
+internal sealed class PdbChecksum
+{
+    /// <summary>Gets the hash algorithm name (for example <c>"SHA256"</c>).</summary>
+    public required string Algorithm { get; init; }
+
+    /// <summary>Gets the checksum bytes, excluded from JSON output to keep it compact.</summary>
+    [JsonIgnore]
+    public required byte[] Hash { get; init; }
+
+    /// <summary>Gets the checksum as a lowercase hex string for display.</summary>
+    public string HashHex => Convert.ToHexStringLower(Hash);
+}
diff --git a/tools/PackageValidator/src/Models.Report.cs b/tools/PackageValidator/src/Models.Report.cs
new file mode 100644
index 0000000000..23979d551b
--- /dev/null
+++ b/tools/PackageValidator/src/Models.Report.cs
@@ -0,0 +1,238 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Serialization;
+
+namespace PackageValidator;
+
+/// <summary>
+/// The top-level result of a validation run over one or more NuGet packages.
+/// </summary>
+internal sealed class ValidationRun
+{
+    /// <summary>Gets the per-package reports, ordered by package file name.</summary>
+    public required List<PackageReport> Packages { get; init; }
+
+    /// <summary>
+    /// Gets findings that span multiple packages (for example dependency version inconsistencies
+    /// between packages in the same batch), or <see langword="null"/> when there are none.
+    /// </summary>
+    public List<Finding>? CrossPackageFindings { get; set; }
+
+    /// <summary>Gets the run-level summary counts.</summary>
+    public required ValidationSummary Summary { get; set; }
+}
+
+/// <summary>
+/// Aggregate counts describing the outcome of a validation run.
+/// </summary>
+internal sealed class ValidationSummary
+{
+    /// <summary>Gets the number of packages inspected.</summary>
+    public required int PackageCount { get; init; }
+
+    /// <summary>Gets the total number of <see cref="Severity.Error"/> findings across the run.</summary>
+    public required int ErrorCount { get; set; }
+
+    /// <summary>Gets the total number of <see cref="Severity.Warning"/> findings across the run.</summary>
+    public required int WarningCount { get; set; }
+
+    /// <summary>Gets the total number of <see cref="Severity.Info"/> findings across the run.</summary>
+    public required int InfoCount { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the run failed its configured <c>--fail-on</c> gate.
+    /// <see langword="false"/> when no gate was configured or nothing matched it.
+    /// </summary>
+    public bool Failed { get; set; }
+}
+
+/// <summary>
+/// The result of inspecting and validating a single NuGet package: its identity, dependencies,
+/// signature state, a report for each DLL it contains, the state of its sibling symbol package,
+/// and the findings produced by the rules engine.
+/// </summary>
+internal sealed class PackageReport
+{
+    /// <summary>Gets the file name of the inspected <c>.nupkg</c>.</summary>
+    public required string PackageFile { get; init; }
+
+    /// <summary>Gets the package id from the <c>.nuspec</c>, or <see langword="null"/> if unavailable.</summary>
+    public string? PackageId { get; init; }
+
+    /// <summary>Gets the package version from the <c>.nuspec</c>, or <see langword="null"/> if unavailable.</summary>
+    public string? PackageVersion { get; init; }
+
+    /// <summary>Gets a value indicating whether the package carries a NuGet author/repository signature.</summary>
+    public bool IsSigned { get; init; }
+
+    /// <summary>Gets the dependency groups declared in the <c>.nuspec</c>, or <see langword="null"/> if none.</summary>
+    public List<DependencyGroup>? DependencyGroups { get; init; }
+
+    /// <summary>Gets the per-DLL reports, ordered by their path within the package.</summary>
+    public required List<BinaryReport> Binaries { get; init; }
+
+    /// <summary>Gets the state and findings of the sibling <c>.snupkg</c> symbol package.</summary>
+    public required SymbolPackageInfo SymbolPackage { get; init; }
+
+    /// <summary>Gets the validation findings for this package, or <see langword="null"/> when there are none.</summary>
+    public List<Finding>? Findings { get; set; }
+}
+
+/// <summary>
+/// Package-level summary of the sibling <c>.snupkg</c> symbol package and how well its contents
+/// correspond to the assemblies in the main package.
+/// </summary>
+internal sealed class SymbolPackageInfo
+{
+    /// <summary>
+    /// Gets the processing state: <c>"present"</c> (a sibling symbol package was found and checked),
+    /// <c>"missing"</c> (no sibling symbol package exists), or <c>"skipped"</c> (processing was
+    /// disabled via <c>--no-snupkg</c>).
+    /// </summary>
+    public required string Status { get; init; }
+
+    /// <summary>Gets the symbol package file name, or <see langword="null"/> unless <see cref="Status"/> is <c>"present"</c>.</summary>
+    public string? File { get; init; }
+
+    /// <summary>
+    /// Gets whether every implementation assembly has usable symbols (embedded, or a matching
+    /// symbol-package PDB). <see langword="null"/> when there are no implementation assemblies.
+    /// </summary>
+    public bool? AllImplementationAssembliesHaveSymbols { get; init; }
+
+    /// <summary>
+    /// Gets whether every assembly with symbol-package symbols has symbols that match its build.
+    /// <see langword="null"/> when no symbol package was processed or none of its symbols apply.
+    /// </summary>
+    public bool? AllSymbolsMatch { get; init; }
+
+    /// <summary>
+    /// Gets the symbol package PDB paths that did not correspond to any assembly, or
+    /// <see langword="null"/> when there are none.
+    /// </summary>
+    public List<string>? OrphanSymbolFiles { get; init; }
+}
+
+/// <summary>
+/// Version, identity, signing, and symbol information for a single DLL found inside a NuGet
+/// package. For native or non-assembly DLLs, the managed fields are <see langword="null"/> and
+/// <see cref="NativeVersion"/> carries any Win32 version-resource data instead.
+/// </summary>
+internal sealed class BinaryReport
+{
+    /// <summary>Gets the path of the DLL within the package archive.</summary>
+    public required string Path { get; init; }
+
+    /// <summary>Gets the role this DLL plays inside the package.</summary>
+    public required BinaryKind Kind { get; init; }
+
+    /// <summary>
+    /// Gets a value indicating whether the DLL is a managed assembly with a manifest. When
+    /// <see langword="false"/>, the managed version fields are <see langword="null"/>.
+    /// </summary>
+    public bool IsManagedAssembly { get; init; }
+
+    /// <summary>Gets the simple assembly name from the manifest.</summary>
+    public string? AssemblyName { get; init; }
+
+    /// <summary>Gets the four-part assembly version (the .NET assembly version).</summary>
+    public string? AssemblyVersion { get; init; }
+
+    /// <summary>Gets the value of <see cref="System.Reflection.AssemblyFileVersionAttribute"/>, if present.</summary>
+    public string? FileVersion { get; init; }
+
+    /// <summary>Gets the value of <see cref="System.Reflection.AssemblyInformationalVersionAttribute"/>, if present.</summary>
+    public string? InformationalVersion { get; init; }
+
+    /// <summary>Gets the value of <see cref="System.Runtime.Versioning.TargetFrameworkAttribute"/>, if present.</summary>
+    public string? TargetFramework { get; init; }
+
+    /// <summary>Gets the assembly culture, or <c>"neutral"</c> for culture-independent assemblies.</summary>
+    public string? Culture { get; init; }
+
+    /// <summary>Gets the strong-name public key token, or <see langword="null"/> if unsigned.</summary>
+    public string? PublicKeyToken { get; init; }
+
+    /// <summary>Gets the strong-name signing state of the assembly.</summary>
+    public SigningStatus? SigningStatus { get; init; }
+
+    /// <summary>Gets the full strong-name display name (name, version, culture, public key token).</summary>
+    public string? StrongName { get; init; }
+
+    /// <summary>Gets the Win32 version-resource information for a native binary, if any.</summary>
+    public NativeVersionInfo? NativeVersion { get; init; }
+
+    /// <summary>
+    /// Gets the assembly's CodeView debug GUID used to match it to a PDB. Excluded from serialized
+    /// output; the formatted <see cref="DebugId"/> is emitted instead.
+    /// </summary>
+    [JsonIgnore]
+    public Guid? CodeViewGuid { get; init; }
+
+    /// <summary>Gets the assembly's debug (PDB) identity GUID as a string, or <see langword="null"/> if absent.</summary>
+    public string? DebugId => CodeViewGuid?.ToString();
+
+    /// <summary>
+    /// Gets the PDB checksums recorded in the assembly's debug directory, used to verify a matched
+    /// PDB. Excluded from JSON; <see cref="PdbChecksums"/> exposes a display-friendly view.
+    /// </summary>
+    [JsonIgnore]
+    public List<PdbChecksum>? Checksums { get; init; }
+
+    /// <summary>Gets the PDB checksum algorithms recorded for this assembly, for display, or <see langword="null"/> if none.</summary>
+    public List<string>? PdbChecksums =>
+        Checksums is { Count: > 0 } ? Checksums.Select(c => $"{c.Algorithm}:{c.HashHex}").ToList() : null;
+
+    /// <summary>
+    /// Gets a value indicating whether the assembly embeds its own portable PDB. Always evaluated,
+    /// independent of symbol-package processing.
+    /// </summary>
+    public bool? HasEmbeddedSymbols { get; init; }
+
+    /// <summary>
+    /// Gets a value indicating whether usable symbols are available for this assembly, either
+    /// embedded or via a matching symbol-package PDB.
+    /// </summary>
+    public bool? HasSymbols { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the symbol package contains a PDB for this assembly.
+    /// <see langword="null"/> when no symbol package was processed.
+    /// </summary>
+    public bool? HasSymbolPackageSymbols { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the symbol-package PDB matches this assembly's build (by
+    /// debug GUID). <see langword="null"/> when the symbol package has no PDB for this assembly or
+    /// was not processed.
+    /// </summary>
+    public bool? SymbolPackageSymbolsMatch { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the matched symbol-package PDB was verified byte-for-byte
+    /// against the assembly's recorded PDB checksum. <see langword="true"/> when a checksum matched,
+    /// <see langword="false"/> when a checksum was available but did not match, and
+    /// <see langword="null"/> when no checksum could be evaluated.
+    /// </summary>
+    public bool? SymbolPackageVerifiedByChecksum { get; set; }
+
+    /// <summary>Gets the matching PDB's path within the symbol package, if any.</summary>
+    public string? SymbolPackageFile { get; set; }
+
+    /// <summary>
+    /// Creates a report for a native or non-assembly DLL, recording its path, native version info,
+    /// and marking it as unmanaged.
+    /// </summary>
+    /// <param name="path">The DLL's path within the package archive.</param>
+    /// <param name="nativeVersion">Win32 version-resource information, if any was read.</param>
+    /// <returns>A <see cref="BinaryReport"/> with <see cref="IsManagedAssembly"/> set to <see langword="false"/>.</returns>
+    public static BinaryReport Native(string path, NativeVersionInfo? nativeVersion = null) => new()
+    {
+        Path = path,
+        Kind = BinaryKind.Native,
+        IsManagedAssembly = false,
+        NativeVersion = nativeVersion,
+    };
+}
diff --git a/tools/PackageValidator/src/NativeVersionReader.cs b/tools/PackageValidator/src/NativeVersionReader.cs
new file mode 100644
index 0000000000..8eeced4cb0
--- /dev/null
+++ b/tools/PackageValidator/src/NativeVersionReader.cs
@@ -0,0 +1,114 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics;
+using System.Reflection.PortableExecutable;
+
+namespace PackageValidator;
+
+/// <summary>
+/// Reads Win32 version-resource information from native (unmanaged) binaries.
+/// </summary>
+internal static class NativeVersionReader
+{
+    /// <summary>
+    /// Reads the Win32 version resource and architecture from a native binary's bytes.
+    /// </summary>
+    /// <param name="bytes">The full bytes of the native DLL.</param>
+    /// <returns>
+    /// A <see cref="NativeVersionInfo"/>, or <see langword="null"/> if no version-resource or
+    /// architecture data could be read.
+    /// </returns>
+    public static NativeVersionInfo? Read(byte[] bytes)
+    {
+        string? architecture = ReadArchitecture(bytes);
+
+        string? fileVersion = null;
+        string? productVersion = null;
+        string? productName = null;
+
+        // FileVersionInfo needs a real file path; it parses the PE version resource on all
+        // platforms, so write the bytes to a temp file, read, and clean up.
+        string tempPath = Path.Combine(Path.GetTempPath(), $"pkgval-{Guid.NewGuid():N}.dll");
+        try
+        {
+            File.WriteAllBytes(tempPath, bytes);
+            FileVersionInfo info = FileVersionInfo.GetVersionInfo(tempPath);
+            fileVersion = NullIfEmpty(info.FileVersion);
+            productVersion = NullIfEmpty(info.ProductVersion);
+            productName = NullIfEmpty(info.ProductName);
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or System.Security.SecurityException)
+        {
+            // Could not stage or read the temp file; fall back to architecture only.
+        }
+        finally
+        {
+            TryDelete(tempPath);
+        }
+
+        if (fileVersion is null && productVersion is null && productName is null && architecture is null)
+        {
+            return null;
+        }
+
+        return new NativeVersionInfo
+        {
+            FileVersion = fileVersion,
+            ProductVersion = productVersion,
+            ProductName = productName,
+            Architecture = architecture,
+        };
+    }
+
+    /// <summary>
+    /// Reads the processor architecture from a PE image's COFF header.
+    /// </summary>
+    /// <param name="bytes">The full bytes of the binary.</param>
+    /// <returns>A short architecture name, or <see langword="null"/> if it cannot be determined.</returns>
+    private static string? ReadArchitecture(byte[] bytes)
+    {
+        try
+        {
+            using var pe = new PEReader(new MemoryStream(bytes, writable: false));
+            return pe.PEHeaders.CoffHeader.Machine switch
+            {
+                Machine.Amd64 => "x64",
+                Machine.I386 => "x86",
+                Machine.Arm64 => "arm64",
+                Machine.Arm => "arm",
+                Machine.IA64 => "ia64",
+                Machine.Unknown => null,
+                var other => other.ToString().ToLowerInvariant(),
+            };
+        }
+        catch (BadImageFormatException)
+        {
+            return null;
+        }
+    }
+
+    /// <summary>Returns <see langword="null"/> for empty or whitespace strings, otherwise the trimmed value.</summary>
+    private static string? NullIfEmpty(string? value)
+    {
+        string? trimmed = value?.Trim();
+        return string.IsNullOrEmpty(trimmed) ? null : trimmed;
+    }
+
+    /// <summary>Deletes a file, ignoring any failure.</summary>
+    private static void TryDelete(string path)
+    {
+        try
+        {
+            if (File.Exists(path))
+            {
+                File.Delete(path);
+            }
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or System.Security.SecurityException)
+        {
+            // Best-effort cleanup.
+        }
+    }
+}
diff --git a/tools/PackageValidator/src/PackageInspector.cs b/tools/PackageValidator/src/PackageInspector.cs
new file mode 100644
index 0000000000..3fb0c86427
--- /dev/null
+++ b/tools/PackageValidator/src/PackageInspector.cs
@@ -0,0 +1,160 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.IO.Compression;
+using System.Xml.Linq;
+
+namespace PackageValidator;
+
+/// <summary>
+/// Opens a NuGet package and builds a <see cref="PackageReport"/> describing its metadata,
+/// dependencies, signature state, contained binaries, and symbol-package state.
+/// </summary>
+internal static class PackageInspector
+{
+    /// <summary>The archive entry name of a NuGet package signature.</summary>
+    private const string SignatureEntryName = ".signature.p7s";
+
+    /// <summary>
+    /// Inspects a NuGet package.
+    /// </summary>
+    /// <param name="packagePath">The path to the <c>.nupkg</c> file on disk.</param>
+    /// <param name="processSnupkg">
+    /// When <see langword="true"/>, a like-named <c>.snupkg</c> beside the package is located and
+    /// cross-checked against the assemblies; when <see langword="false"/>, symbol-package processing
+    /// is skipped (embedded symbols are still evaluated).
+    /// </param>
+    /// <returns>A populated <see cref="PackageReport"/>.</returns>
+    public static PackageReport Inspect(string packagePath, bool processSnupkg)
+    {
+        // A .nupkg is a zip archive; open it read-only and walk its entries.
+        using ZipArchive archive = ZipFile.OpenRead(packagePath);
+
+        // Package-level identity and dependencies come from the embedded .nuspec manifest.
+        (string? id, string? version, List<DependencyGroup>? dependencyGroups) = ReadNuspec(archive);
+
+        // A NuGet signature is stored as a top-level .signature.p7s archive entry.
+        bool isSigned = archive.Entries.Any(
+            e => e.FullName.Equals(SignatureEntryName, StringComparison.OrdinalIgnoreCase));
+
+        // Inspect every .dll entry regardless of where it sits in the package (lib/, ref/,
+        // runtimes/, etc.). Native DLLs are tolerated and reported as unmanaged.
+        var binaries = new List<BinaryReport>();
+        foreach (ZipArchiveEntry entry in archive.Entries)
+        {
+            if (!entry.FullName.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            binaries.Add(AssemblyInspector.Inspect(entry));
+        }
+
+        // Sort by archive path so output is deterministic across runs and platforms.
+        binaries.Sort((a, b) => string.CompareOrdinal(a.Path, b.Path));
+
+        // Cross-check the sibling symbol package (if any) against the binaries just discovered. This
+        // mutates the per-binary symbol fields in place.
+        SymbolPackageInfo symbolPackage = SymbolResolver.Resolve(packagePath, binaries, processSnupkg);
+
+        return new PackageReport
+        {
+            PackageFile = Path.GetFileName(packagePath),
+            PackageId = id,
+            PackageVersion = version,
+            IsSigned = isSigned,
+            DependencyGroups = dependencyGroups,
+            Binaries = binaries,
+            SymbolPackage = symbolPackage,
+        };
+    }
+
+    /// <summary>
+    /// Reads the package id, version, and dependencies from the <c>.nuspec</c> manifest.
+    /// </summary>
+    /// <param name="archive">The opened NuGet package archive.</param>
+    /// <returns>The package id, version, and dependency groups, each of which may be <see langword="null"/>.</returns>
+    private static (string? Id, string? Version, List<DependencyGroup>? Dependencies) ReadNuspec(ZipArchive archive)
+    {
+        // The canonical manifest sits at the archive root, so prefer a top-level .nuspec.
+        ZipArchiveEntry? nuspec = archive.Entries.FirstOrDefault(
+            e => e.FullName.EndsWith(".nuspec", StringComparison.OrdinalIgnoreCase)
+                 && !e.FullName.Contains('/'));
+
+        // Fall back to any .nuspec anywhere in the package for non-standard layouts.
+        nuspec ??= archive.Entries.FirstOrDefault(
+            e => e.FullName.EndsWith(".nuspec", StringComparison.OrdinalIgnoreCase));
+
+        if (nuspec is null)
+        {
+            return (null, null, null);
+        }
+
+        using Stream stream = nuspec.Open();
+        XDocument doc = XDocument.Load(stream);
+
+        // .nuspec files declare an XML namespace that varies by schema version. Matching on
+        // LocalName keeps this robust regardless of which namespace URI is in use.
+        XElement? metadata = doc.Root?.Elements()
+            .FirstOrDefault(e => e.Name.LocalName == "metadata");
+
+        string? id = metadata?.Elements().FirstOrDefault(e => e.Name.LocalName == "id")?.Value?.Trim();
+        string? version = metadata?.Elements().FirstOrDefault(e => e.Name.LocalName == "version")?.Value?.Trim();
+        List<DependencyGroup>? dependencies = ReadDependencies(metadata);
+
+        return (id, version, dependencies);
+    }
+
+    /// <summary>
+    /// Parses the <c>&lt;dependencies&gt;</c> element of a <c>.nuspec</c>, supporting both the flat
+    /// (ungrouped) and grouped-by-target-framework layouts.
+    /// </summary>
+    /// <param name="metadata">The <c>&lt;metadata&gt;</c> element, or <see langword="null"/>.</param>
+    /// <returns>The parsed dependency groups, or <see langword="null"/> if none are declared.</returns>
+    private static List<DependencyGroup>? ReadDependencies(XElement? metadata)
+    {
+        XElement? dependencies = metadata?.Elements()
+            .FirstOrDefault(e => e.Name.LocalName == "dependencies");
+        if (dependencies is null)
+        {
+            return null;
+        }
+
+        var groups = new List<DependencyGroup>();
+
+        // Flat dependencies (no <group>) apply to all target frameworks.
+        List<DependencyInfo> ungrouped = dependencies.Elements()
+            .Where(e => e.Name.LocalName == "dependency")
+            .Select(ReadDependency)
+            .ToList();
+        if (ungrouped.Count > 0)
+        {
+            groups.Add(new DependencyGroup { TargetFramework = null, Dependencies = ungrouped });
+        }
+
+        // Grouped dependencies are scoped to a target framework.
+        foreach (XElement group in dependencies.Elements().Where(e => e.Name.LocalName == "group"))
+        {
+            string? tfm = group.Attribute("targetFramework")?.Value?.Trim();
+            List<DependencyInfo> deps = group.Elements()
+                .Where(e => e.Name.LocalName == "dependency")
+                .Select(ReadDependency)
+                .ToList();
+            groups.Add(new DependencyGroup { TargetFramework = tfm, Dependencies = deps });
+        }
+
+        return groups.Count == 0 ? null : groups;
+    }
+
+    /// <summary>
+    /// Reads a single <c>&lt;dependency&gt;</c> element.
+    /// </summary>
+    /// <param name="element">The dependency element.</param>
+    /// <returns>The parsed <see cref="DependencyInfo"/>.</returns>
+    private static DependencyInfo ReadDependency(XElement element) => new()
+    {
+        Id = element.Attribute("id")?.Value?.Trim() ?? "(unknown)",
+        VersionRange = element.Attribute("version")?.Value?.Trim(),
+    };
+}
diff --git a/tools/PackageValidator/src/PackageValidator.csproj b/tools/PackageValidator/src/PackageValidator.csproj
new file mode 100644
index 0000000000..68c0a26b92
--- /dev/null
+++ b/tools/PackageValidator/src/PackageValidator.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
+    <RootNamespace>PackageValidator</RootNamespace>
+    <AssemblyName>PackageValidator</AssemblyName>
+    <InvariantGlobalization>true</InvariantGlobalization>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.CommandLine" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="PackageValidator.Test" />
+  </ItemGroup>
+
+</Project>
diff --git a/tools/PackageValidator/src/PortablePdb.cs b/tools/PackageValidator/src/PortablePdb.cs
new file mode 100644
index 0000000000..90a3a66a35
--- /dev/null
+++ b/tools/PackageValidator/src/PortablePdb.cs
@@ -0,0 +1,205 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Reflection.Metadata;
+using System.Security.Cryptography;
+
+namespace PackageValidator;
+
+/// <summary>
+/// Low-level helpers for reading identity and checksum information out of portable PDB byte
+/// streams, used to match a symbol-package PDB to the assembly it belongs to.
+/// </summary>
+internal static class PortablePdb
+{
+    /// <summary>The metadata header signature <c>BSJB</c>, marking the start of a portable PDB blob.</summary>
+    private const uint MetadataSignature = 0x424A5342;
+
+    /// <summary>The length in bytes of the PDB id (a 16-byte GUID followed by a 4-byte stamp).</summary>
+    private const int PdbIdLength = 20;
+
+    /// <summary>
+    /// Reads the debug GUID from a portable PDB.
+    /// </summary>
+    /// <param name="pdb">The full PDB byte content.</param>
+    /// <returns>The PDB's debug GUID, or <see langword="null"/> if the bytes are not a readable portable PDB.</returns>
+    public static Guid? TryReadGuid(byte[] pdb)
+    {
+        try
+        {
+            using var stream = new MemoryStream(pdb, writable: false);
+            using MetadataReaderProvider provider = MetadataReaderProvider.FromPortablePdbStream(stream);
+            MetadataReader reader = provider.GetMetadataReader();
+
+            // The PDB id begins with the 16-byte GUID that matches the assembly's CodeView GUID; the
+            // trailing bytes are a timestamp/stamp we do not need here.
+            DebugMetadataHeader? header = reader.DebugMetadataHeader;
+            if (header is not null && header.Id.Length >= 16)
+            {
+                return new Guid(header.Id.AsSpan(0, 16));
+            }
+        }
+        catch (BadImageFormatException)
+        {
+            // Not a portable PDB (for example a Windows PDB); it cannot be matched by GUID.
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Determines whether the given bytes look like a legacy Windows (MSF) PDB rather than a
+    /// portable PDB. Windows PDBs cannot be matched by the portable-PDB GUID scheme.
+    /// </summary>
+    /// <param name="pdb">The PDB byte content.</param>
+    /// <returns><see langword="true"/> if the bytes begin with the Windows PDB MSF signature.</returns>
+    public static bool IsWindowsPdb(byte[] pdb)
+    {
+        // Windows PDBs begin with the ASCII magic "Microsoft C/C++ MSF 7.00\r\n\x1aDS".
+        ReadOnlySpan<byte> magic = "Microsoft C/C++ MSF 7.00"u8;
+        return pdb.Length >= magic.Length && pdb.AsSpan(0, magic.Length).SequenceEqual(magic);
+    }
+
+    /// <summary>
+    /// Verifies a portable PDB against a checksum recorded in the owning assembly's debug directory.
+    /// </summary>
+    /// <param name="pdb">The full PDB byte content.</param>
+    /// <param name="checksum">The checksum (algorithm and expected hash) recorded by the assembly.</param>
+    /// <returns>
+    /// <see langword="true"/> when the computed hash matches the expected hash; <see langword="false"/>
+    /// when it does not; <see langword="null"/> when the checksum could not be evaluated (unknown
+    /// algorithm or an unparseable PDB layout).
+    /// </returns>
+    /// <remarks>
+    /// The recorded checksum is computed over the PDB content with its 20-byte PDB id zeroed, because
+    /// for deterministic builds the id is derived from the checksum and written afterward. This
+    /// method therefore locates the <c>#Pdb</c> stream, zeroes the id in a working copy, and hashes
+    /// that copy with the named algorithm.
+    /// </remarks>
+    public static bool? TryVerifyChecksum(byte[] pdb, PdbChecksum checksum)
+    {
+        int idOffset = FindPdbIdOffset(pdb);
+        if (idOffset < 0 || idOffset + PdbIdLength > pdb.Length)
+        {
+            return null;
+        }
+
+        using HashAlgorithm? algorithm = CreateHashAlgorithm(checksum.Algorithm);
+        if (algorithm is null)
+        {
+            return null;
+        }
+
+        // Hash a copy in which the PDB id bytes are zeroed, matching how the checksum was produced.
+        byte[] working = (byte[])pdb.Clone();
+        Array.Clear(working, idOffset, PdbIdLength);
+        byte[] computed = algorithm.ComputeHash(working);
+
+        return computed.AsSpan().SequenceEqual(checksum.Hash);
+    }
+
+    /// <summary>
+    /// Locates the byte offset of the PDB id (the start of the <c>#Pdb</c> metadata stream) within a
+    /// portable PDB.
+    /// </summary>
+    /// <param name="pdb">The PDB byte content.</param>
+    /// <returns>The offset of the <c>#Pdb</c> stream, or <c>-1</c> if it cannot be located.</returns>
+    private static int FindPdbIdOffset(byte[] pdb)
+    {
+        try
+        {
+            using var reader = new BinaryReader(new MemoryStream(pdb, writable: false));
+
+            if (reader.ReadUInt32() != MetadataSignature)
+            {
+                return -1;
+            }
+
+            reader.ReadUInt16(); // Major version.
+            reader.ReadUInt16(); // Minor version.
+            reader.ReadUInt32(); // Reserved.
+
+            int versionLength = reader.ReadInt32();
+
+            // A malformed or hostile PDB can encode a negative or oversized length; treat it as
+            // unparseable rather than letting the seek below throw and fail the whole run.
+            if (versionLength < 0 || versionLength > pdb.Length)
+            {
+                return -1;
+            }
+
+            reader.BaseStream.Position += versionLength; // Version string (padded to a 4-byte boundary).
+
+            // ECMA-335 rounds the recorded version length up to a multiple of four, so the position is
+            // normally already aligned; align defensively in case a producer records an unrounded
+            // length, otherwise the following flags/stream-header reads would be misaligned.
+            reader.BaseStream.Position = (reader.BaseStream.Position + 3) & ~3L;
+
+            reader.ReadUInt16(); // Flags.
+            ushort streamCount = reader.ReadUInt16();
+
+            for (int i = 0; i < streamCount; i++)
+            {
+                uint offset = reader.ReadUInt32();
+                reader.ReadUInt32(); // Stream size.
+                string name = ReadStreamName(reader);
+                if (name == "#Pdb")
+                {
+                    return (int)offset;
+                }
+            }
+        }
+        catch (Exception ex) when (ex is EndOfStreamException or IOException or ArgumentOutOfRangeException)
+        {
+            // Truncated, malformed, or hostile PDB; treat as unlocatable.
+        }
+
+        return -1;
+    }
+
+    /// <summary>
+    /// Reads a null-terminated, 4-byte-aligned ASCII metadata stream name from the current position.
+    /// </summary>
+    /// <param name="reader">The reader positioned at the start of a stream name.</param>
+    /// <returns>The decoded stream name.</returns>
+    private static string ReadStreamName(BinaryReader reader)
+    {
+        var bytes = new List<byte>(16);
+        int read = 0;
+        while (true)
+        {
+            byte b = reader.ReadByte();
+            read++;
+            if (b == 0)
+            {
+                break;
+            }
+            bytes.Add(b);
+        }
+
+        // Stream names are padded with additional null bytes to a 4-byte boundary.
+        while (read % 4 != 0)
+        {
+            reader.ReadByte();
+            read++;
+        }
+
+        return System.Text.Encoding.ASCII.GetString(bytes.ToArray());
+    }
+
+    /// <summary>
+    /// Creates a <see cref="HashAlgorithm"/> for a PDB checksum algorithm name.
+    /// </summary>
+    /// <param name="algorithm">The algorithm name as recorded in the debug directory (for example <c>"SHA256"</c>).</param>
+    /// <returns>A new hash algorithm instance, or <see langword="null"/> if the name is not recognized.</returns>
+    private static HashAlgorithm? CreateHashAlgorithm(string algorithm) =>
+        algorithm.ToUpperInvariant() switch
+        {
+            "SHA256" => SHA256.Create(),
+            "SHA384" => SHA384.Create(),
+            "SHA512" => SHA512.Create(),
+            "SHA1" => SHA1.Create(),
+            _ => null,
+        };
+}
diff --git a/tools/PackageValidator/src/Program.cs b/tools/PackageValidator/src/Program.cs
new file mode 100644
index 0000000000..d706b2aae3
--- /dev/null
+++ b/tools/PackageValidator/src/Program.cs
@@ -0,0 +1,385 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.CommandLine;
+using System.CommandLine.Help;
+using System.CommandLine.Invocation;
+using System.Text.Json;
+
+namespace PackageValidator;
+
+/// <summary>
+/// Console entry point for the PackageValidator tool, which inspects one or more NuGet packages
+/// (<c>.nupkg</c>), reports version, signing, and symbol information for every binary they contain,
+/// and applies a set of intrinsic validation rules that callers can use to gate pipelines.
+/// </summary>
+/// <remarks>
+/// <para>
+/// Assemblies are inspected purely through metadata without loading them into the runtime. This
+/// keeps the tool cross-platform, avoids executing any module initializers, and lets it read
+/// assemblies built for target frameworks the tool itself does not run on (for example, .NET
+/// Framework assemblies inspected from a .NET host).
+/// </para>
+/// <para>
+/// To exercise the symbol-package (<c>.snupkg</c>) code path with real packages from nuget.org,
+/// note that the flat-container feed only serves <c>.nupkg</c> files. The matching symbol package
+/// must be downloaded from the gallery's symbol-package endpoint and saved beside the
+/// <c>.nupkg</c> with the same base name:
+/// <code>
+/// # main package
+/// https://api.nuget.org/v3-flatcontainer/{idLower}/{version}/{idLower}.{version}.nupkg
+/// # sibling symbol package (note: original-cased id, no .snupkg suffix in the URL)
+/// https://www.nuget.org/api/v2/symbolpackage/{Id}/{Version}
+/// </code>
+/// For example, the symbol package for <c>Microsoft.Data.SqlClient</c> 5.2.2 is at
+/// <c>https://www.nuget.org/api/v2/symbolpackage/Microsoft.Data.SqlClient/5.2.2</c>; save it as
+/// <c>microsoft.data.sqlclient.5.2.2.snupkg</c> next to the <c>.nupkg</c> so the tool finds it.
+/// </para>
+/// </remarks>
+internal static class Program
+{
+    /// <summary>
+    /// Parses command-line arguments and dispatches to the inspection and validation logic.
+    /// </summary>
+    /// <param name="args">The raw command-line arguments.</param>
+    /// <returns>
+    /// A process exit code: <c>0</c> on success with no gating findings, <c>1</c> on a
+    /// runtime/inspection failure, <c>2</c> when the <c>--fail-on</c> gate is triggered, and a
+    /// non-zero System.CommandLine code for argument parsing errors.
+    /// </returns>
+    private static int Main(string[] args)
+    {
+        // One or more paths, each a .nupkg file or a directory to scan for .nupkg files.
+        var pathsArgument = new Argument<string[]>("paths")
+        {
+            Description = "One or more .nupkg files or directories to scan for .nupkg files.",
+            Arity = ArgumentArity.OneOrMore,
+        };
+
+        // Opt-in switch that selects machine-readable JSON over the default human-readable layout.
+        var jsonOption = new Option<bool>("--json")
+        {
+            Description = "Emit machine-readable JSON instead of human-readable text.",
+        };
+
+        // Switch that suppresses looking for and processing sibling .snupkg symbol packages.
+        var noSnupkgOption = new Option<bool>("--no-snupkg")
+        {
+            Description = "Do not look for or process sibling .snupkg symbol packages.",
+        };
+
+        // Repeatable gate: fail the run when a finding matches the given severity or category.
+        var failOnOption = new Option<string[]>("--fail-on")
+        {
+            Description = "Exit non-zero when a finding matches a severity or category (see Notes).",
+            Arity = ArgumentArity.ZeroOrMore,
+            AllowMultipleArgumentsPerToken = true,
+        };
+
+        // Repeatable expected-version assertions, each an optional 'id=' prefix plus a value.
+        var expectPackageVersionOption = new Option<string[]>("--expect-package-version")
+        {
+            Description = "Confirm the package version (VALUE or id=VALUE; see Notes).",
+            Arity = ArgumentArity.ZeroOrMore,
+            AllowMultipleArgumentsPerToken = true,
+        };
+        var expectFileVersionOption = new Option<string[]>("--expect-file-version")
+        {
+            Description = "Confirm each assembly's file version (VALUE or id=VALUE; see Notes).",
+            Arity = ArgumentArity.ZeroOrMore,
+            AllowMultipleArgumentsPerToken = true,
+        };
+        var expectAssemblyVersionOption = new Option<string[]>("--expect-assembly-version")
+        {
+            Description = "Confirm each assembly's assembly version (VALUE or id=VALUE; see Notes).",
+            Arity = ArgumentArity.ZeroOrMore,
+            AllowMultipleArgumentsPerToken = true,
+        };
+
+        var rootCommand = new RootCommand(
+            "Inspect and validate NuGet packages: report versions, signing, and symbols, and apply " +
+            "intrinsic validation rules.")
+        {
+            pathsArgument,
+            jsonOption,
+            noSnupkgOption,
+            failOnOption,
+            expectPackageVersionOption,
+            expectFileVersionOption,
+            expectAssemblyVersionOption,
+        };
+
+        // Append a free-form Notes section to the default --help output.
+        ConfigureHelp(rootCommand);
+
+        rootCommand.SetAction(parseResult =>
+        {
+            string[] paths = parseResult.GetValue(pathsArgument) ?? [];
+            bool json = parseResult.GetValue(jsonOption);
+            bool noSnupkg = parseResult.GetValue(noSnupkgOption);
+            string[] failOn = parseResult.GetValue(failOnOption) ?? [];
+            string[] expectPackage = parseResult.GetValue(expectPackageVersionOption) ?? [];
+            string[] expectFile = parseResult.GetValue(expectFileVersionOption) ?? [];
+            string[] expectAssembly = parseResult.GetValue(expectAssemblyVersionOption) ?? [];
+
+            VersionExpectations expectations;
+            try
+            {
+                expectations = VersionExpectations.Parse(expectPackage, expectFile, expectAssembly);
+            }
+            catch (FormatException ex)
+            {
+                Console.Error.WriteLine($"Error: {ex.Message}");
+                return 1;
+            }
+
+            return Run(paths, json, !noSnupkg, failOn, expectations);
+        });
+
+        return rootCommand.Parse(args).Invoke();
+    }
+
+    /// <summary>
+    /// Appends a free-form "Notes" section to the default <c>--help</c> output, documenting the
+    /// accepted <c>--fail-on</c> values and the <c>VALUE</c>/<c>id=VALUE</c> form of the
+    /// <c>--expect-*</c> options without crowding their one-line descriptions.
+    /// </summary>
+    /// <param name="rootCommand">The root command whose help is being customized.</param>
+    private static void ConfigureHelp(RootCommand rootCommand)
+    {
+        // HelpBuilder/HelpContext are not public in this System.CommandLine version, so the free-form
+        // section is appended by wrapping the help action: render the default help, then the Notes.
+        foreach (Option option in rootCommand.Options)
+        {
+            if (option is HelpOption helpOption
+                && helpOption.Action is SynchronousCommandLineAction inner)
+            {
+                helpOption.Action = new NotesHelpAction(inner);
+            }
+        }
+    }
+
+    /// <summary>
+    /// A help action that renders the default help and then writes a free-form Notes section.
+    /// </summary>
+    private sealed class NotesHelpAction(SynchronousCommandLineAction inner) : SynchronousCommandLineAction
+    {
+        /// <inheritdoc />
+        public override int Invoke(ParseResult parseResult)
+        {
+            int result = inner.Invoke(parseResult);
+            Console.Out.WriteLine();
+            WriteNotes(Console.Out);
+            return result;
+        }
+    }
+
+    /// <summary>
+    /// Writes the free-form Notes help section.
+    /// </summary>
+    /// <param name="w">The output writer to write the section to.</param>
+    private static void WriteNotes(TextWriter w)
+    {
+        w.WriteLine("Notes:");
+        w.WriteLine();
+        w.WriteLine("  --fail-on accepts a severity, the token 'any', or a finding category.");
+        w.WriteLine("  A finding trips the gate when its severity name or its category matches a");
+        w.WriteLine("  supplied token; 'any' matches every finding. Exit code is 2 when tripped.");
+        w.WriteLine("    severities:  error  warning  info");
+        w.WriteLine("    special:     any");
+        w.WriteLine("    categories:");
+        foreach (string category in Categories.All)
+        {
+            w.WriteLine($"                 {category}");
+        }
+        w.WriteLine();
+        w.WriteLine("  --expect-package-version / --expect-file-version / --expect-assembly-version");
+        w.WriteLine("  confirm versions against values the caller already computed. Each value is:");
+        w.WriteLine("    VALUE        apply the expectation to every package in the run");
+        w.WriteLine("    id=VALUE     apply only to the package whose id is 'id'");
+        w.WriteLine("  A specific id overrides a bare VALUE (wildcard), and each option may be");
+        w.WriteLine("  repeated, so a family-wide expectation can coexist with a per-package override:");
+        w.WriteLine("    --expect-file-version *=7.1.0.17604 \\");
+        w.WriteLine("    --expect-file-version Microsoft.SqlServer.Server=1.1.0.17604");
+        w.WriteLine("  Mismatches are reported as unexpected-package-version, unexpected-file-version,");
+        w.WriteLine("  or unexpected-assembly-version findings (Error severity).");
+    }
+
+    /// <summary>
+    /// Inspects and validates the resolved packages and renders the result.
+    /// </summary>
+    /// <param name="paths">The file and directory paths supplied on the command line.</param>
+    /// <param name="json">Whether to emit JSON instead of human-readable text.</param>
+    /// <param name="processSnupkg">Whether to process sibling symbol packages.</param>
+    /// <param name="failOn">The severity/category tokens that trigger a non-zero gate exit.</param>
+    /// <param name="expectations">The caller-supplied expected version values to confirm.</param>
+    /// <returns>The process exit code.</returns>
+    private static int Run(
+        string[] paths, bool json, bool processSnupkg, string[] failOn, VersionExpectations expectations)
+    {
+        List<string> packages;
+        try
+        {
+            packages = ResolvePackages(paths);
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+        {
+            Console.Error.WriteLine($"Error: {ex.Message}");
+            return 1;
+        }
+
+        if (packages.Count == 0)
+        {
+            Console.Error.WriteLine("Error: no .nupkg files found at the given path(s).");
+            return 1;
+        }
+
+        var reports = new List<PackageReport>();
+        try
+        {
+            foreach (string package in packages)
+            {
+                PackageReport report = PackageInspector.Inspect(package, processSnupkg);
+                Validator.Validate(report, expectations);
+                reports.Add(report);
+            }
+        }
+        catch (Exception ex)
+        {
+            // Surface a concise message rather than a stack trace; the tool is meant to be consumed
+            // by humans and scripts, not debugged by its callers.
+            Console.Error.WriteLine($"Error: {ex.Message}");
+            return 1;
+        }
+
+        List<Finding> crossPackage = Validator.ValidateBatch(reports);
+        ValidationRun run = BuildRun(reports, crossPackage, failOn);
+
+        if (json)
+        {
+            Console.WriteLine(JsonSerializer.Serialize(run, JsonContext.SerializerOptions));
+        }
+        else
+        {
+            HumanReporter.Print(run);
+        }
+
+        return run.Summary.Failed ? 2 : 0;
+    }
+
+    /// <summary>
+    /// Assembles a <see cref="ValidationRun"/> from inspected packages, computing summary counts and
+    /// evaluating the <c>--fail-on</c> gate.
+    /// </summary>
+    /// <param name="reports">The per-package reports.</param>
+    /// <param name="crossPackage">The cross-package findings.</param>
+    /// <param name="failOn">The severity/category tokens that trigger a non-zero gate exit.</param>
+    /// <returns>The assembled run.</returns>
+    private static ValidationRun BuildRun(
+        List<PackageReport> reports, List<Finding> crossPackage, string[] failOn)
+    {
+        IEnumerable<Finding> allFindings = reports
+            .SelectMany(r => r.Findings ?? Enumerable.Empty<Finding>())
+            .Concat(crossPackage);
+
+        int errors = 0, warnings = 0, infos = 0;
+        bool failed = false;
+        var gate = new HashSet<string>(failOn.Select(f => f.Trim().ToLowerInvariant()));
+
+        foreach (Finding finding in allFindings)
+        {
+            switch (finding.Severity)
+            {
+                case Severity.Error: errors++; break;
+                case Severity.Warning: warnings++; break;
+                case Severity.Info: infos++; break;
+            }
+
+            if (Matches(finding, gate))
+            {
+                failed = true;
+            }
+        }
+
+        return new ValidationRun
+        {
+            Packages = reports,
+            CrossPackageFindings = crossPackage.Count == 0 ? null : crossPackage,
+            Summary = new ValidationSummary
+            {
+                PackageCount = reports.Count,
+                ErrorCount = errors,
+                WarningCount = warnings,
+                InfoCount = infos,
+                Failed = failed,
+            },
+        };
+    }
+
+    /// <summary>
+    /// Determines whether a finding matches any of the configured <c>--fail-on</c> tokens. A token
+    /// matches when it equals the finding's severity name or its category key; the special token
+    /// <c>any</c> matches every finding.
+    /// </summary>
+    /// <param name="finding">The finding to test.</param>
+    /// <param name="gate">The lowercased set of configured tokens.</param>
+    /// <returns><see langword="true"/> if the finding should trip the gate.</returns>
+    private static bool Matches(Finding finding, HashSet<string> gate)
+    {
+        if (gate.Count == 0)
+        {
+            return false;
+        }
+
+        return gate.Contains("any")
+            || gate.Contains(finding.Severity.ToString().ToLowerInvariant())
+            || gate.Contains(finding.Category);
+    }
+
+    /// <summary>
+    /// Expands the supplied paths into a sorted, de-duplicated list of <c>.nupkg</c> files. Directory
+    /// paths are scanned recursively; <c>.snupkg</c> files are excluded.
+    /// </summary>
+    /// <param name="paths">The file and directory paths supplied on the command line.</param>
+    /// <returns>The resolved package file paths.</returns>
+    private static List<string> ResolvePackages(string[] paths)
+    {
+        var resolved = new SortedSet<string>(StringComparer.Ordinal);
+
+        // Skip directories the process cannot read rather than aborting the whole scan.
+        var enumeration = new EnumerationOptions
+        {
+            RecurseSubdirectories = true,
+            IgnoreInaccessible = true,
+        };
+
+        foreach (string path in paths)
+        {
+            if (Directory.Exists(path))
+            {
+                foreach (string file in Directory.EnumerateFiles(path, "*.nupkg", enumeration))
+                {
+                    resolved.Add(Path.GetFullPath(file));
+                }
+            }
+            else if (File.Exists(path))
+            {
+                if (path.EndsWith(".nupkg", StringComparison.OrdinalIgnoreCase))
+                {
+                    resolved.Add(Path.GetFullPath(path));
+                }
+                else
+                {
+                    Console.Error.WriteLine($"Warning: skipping non-.nupkg file: {path}");
+                }
+            }
+            else
+            {
+                Console.Error.WriteLine($"Warning: path not found: {path}");
+            }
+        }
+
+        return resolved.ToList();
+    }
+}
diff --git a/tools/PackageValidator/src/SymbolResolver.cs b/tools/PackageValidator/src/SymbolResolver.cs
new file mode 100644
index 0000000000..aa93a09d06
--- /dev/null
+++ b/tools/PackageValidator/src/SymbolResolver.cs
@@ -0,0 +1,270 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.IO.Compression;
+
+namespace PackageValidator;
+
+/// <summary>
+/// Cross-checks a package's sibling <c>.snupkg</c> symbol package against the assemblies in the
+/// main package, matching PDBs by debug GUID, verifying them by checksum where possible, and
+/// detecting orphaned or mismatched symbol files.
+/// </summary>
+internal static class SymbolResolver
+{
+    /// <summary>
+    /// Evaluates symbol coverage for the discovered binaries. Embedded symbols are always assessed;
+    /// the sibling <c>.snupkg</c> symbol package is additionally cross-checked unless disabled.
+    /// </summary>
+    /// <param name="packagePath">The path to the inspected <c>.nupkg</c>.</param>
+    /// <param name="binaries">The binaries discovered in the package (modified in place).</param>
+    /// <param name="processSnupkg">Whether to look for and process a separate symbol package.</param>
+    /// <returns>A <see cref="SymbolPackageInfo"/> describing the symbol state.</returns>
+    public static SymbolPackageInfo Resolve(
+        string packagePath, List<BinaryReport> binaries, bool processSnupkg)
+    {
+        // Symbols apply only to managed assemblies. Embedded-symbol state was already captured during
+        // inspection and is always honored, independent of the --no-snupkg switch.
+        List<BinaryReport> managed = binaries.Where(b => b.IsManagedAssembly).ToList();
+
+        string status;
+        string? file = null;
+        var matchedPdbs = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var allPdbPaths = new List<string>();
+
+        if (!processSnupkg)
+        {
+            // The separate symbol package is intentionally not consulted; embedded symbols below are
+            // still evaluated.
+            status = "skipped";
+        }
+        else
+        {
+            // The symbol package is, by NuGet convention, named identically but with a .snupkg
+            // extension sitting right beside the .nupkg.
+            string snupkgPath = Path.ChangeExtension(packagePath, ".snupkg");
+            if (!File.Exists(snupkgPath))
+            {
+                status = "missing";
+            }
+            else
+            {
+                status = "present";
+                file = Path.GetFileName(snupkgPath);
+                MatchSymbolPackage(snupkgPath, managed, matchedPdbs, allPdbPaths);
+            }
+        }
+
+        // Combine the two symbol sources per assembly.
+        foreach (BinaryReport asm in managed)
+        {
+            bool embedded = asm.HasEmbeddedSymbols == true;
+            bool packageMatches = asm.SymbolPackageSymbolsMatch == true;
+            asm.HasSymbols = embedded || packageMatches;
+        }
+
+        // Coverage and match quality are assessed only over implementation assemblies; reference
+        // assemblies and satellite resource assemblies legitimately ship without symbols.
+        List<BinaryReport> implementation = managed.Where(b => b.Kind == BinaryKind.Implementation).ToList();
+        bool? allHaveSymbols = implementation.Count == 0
+            ? null
+            : implementation.All(a => a.HasSymbols == true);
+
+        bool? allSymbolsMatch = null;
+        List<string>? orphans = null;
+        if (status == "present")
+        {
+            List<BinaryReport> withPackageSymbols =
+                managed.Where(a => a.HasSymbolPackageSymbols == true).ToList();
+            allSymbolsMatch = withPackageSymbols.Count == 0
+                ? null
+                : withPackageSymbols.All(a => a.SymbolPackageSymbolsMatch == true);
+
+            List<string> unmatched = allPdbPaths
+                .Where(p => !matchedPdbs.Contains(p))
+                .OrderBy(p => p, StringComparer.Ordinal)
+                .ToList();
+            orphans = unmatched.Count == 0 ? null : unmatched;
+        }
+
+        return new SymbolPackageInfo
+        {
+            Status = status,
+            File = file,
+            AllImplementationAssembliesHaveSymbols = allHaveSymbols,
+            AllSymbolsMatch = allSymbolsMatch,
+            OrphanSymbolFiles = orphans,
+        };
+    }
+
+    /// <summary>
+    /// Indexes the PDBs in a symbol package and resolves each managed assembly against them.
+    /// </summary>
+    /// <param name="snupkgPath">The path to the sibling symbol package.</param>
+    /// <param name="managed">The managed assemblies to resolve (modified in place).</param>
+    /// <param name="matchedPdbs">Receives the set of PDB paths that were matched to an assembly.</param>
+    /// <param name="allPdbPaths">Receives every PDB path found in the symbol package.</param>
+    private static void MatchSymbolPackage(
+        string snupkgPath,
+        List<BinaryReport> managed,
+        HashSet<string> matchedPdbs,
+        List<string> allPdbPaths)
+    {
+        using ZipArchive archive = ZipFile.OpenRead(snupkgPath);
+
+        // Index every PDB by its GUID (authoritative identity match) and by its path with the
+        // extension stripped (fallback to detect a present-but-mismatched symbol file). Each PDB is
+        // read only transiently to compute its GUID; the bytes are not retained, so only the small
+        // subset that matches an assembly by GUID is re-read on demand for checksum verification.
+        var pdbByGuid = new Dictionary<Guid, string>();
+        var pdbByPathKey = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        var pdbGuidByPath = new Dictionary<string, Guid>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (ZipArchiveEntry entry in archive.Entries)
+        {
+            if (!entry.FullName.EndsWith(".pdb", StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            allPdbPaths.Add(entry.FullName);
+            pdbByPathKey[StripExtension(entry.FullName)] = entry.FullName;
+
+            Guid? guid = PortablePdb.TryReadGuid(ReadEntry(entry));
+            if (guid is Guid value)
+            {
+                pdbGuidByPath[entry.FullName] = value;
+                if (!pdbByGuid.ContainsKey(value))
+                {
+                    pdbByGuid[value] = entry.FullName;
+                }
+            }
+        }
+
+        foreach (BinaryReport asm in managed)
+        {
+            if (asm.CodeViewGuid is Guid guid && pdbByGuid.TryGetValue(guid, out string? byGuid))
+            {
+                // A symbol-package PDB shares this assembly's debug GUID.
+                asm.HasSymbolPackageSymbols = true;
+                asm.SymbolPackageSymbolsMatch = true;
+                asm.SymbolPackageFile = byGuid;
+                asm.SymbolPackageVerifiedByChecksum = VerifyMatchedChecksum(archive, byGuid, asm);
+                matchedPdbs.Add(byGuid);
+            }
+            else if (pdbByPathKey.TryGetValue(StripExtension(asm.Path), out string? byPath))
+            {
+                // A PDB sits where this assembly's symbols should be, but its GUID does not match,
+                // meaning the symbols belong to a different build.
+                asm.HasSymbolPackageSymbols = true;
+                asm.SymbolPackageSymbolsMatch = false;
+                asm.SymbolPackageFile = byPath;
+                matchedPdbs.Add(byPath);
+            }
+            else
+            {
+                asm.HasSymbolPackageSymbols = false;
+            }
+        }
+
+        // A package may legitimately ship the same assembly (identical debug GUID) at more than one
+        // path — e.g. .NET Framework SqlClient appears in both lib/net462 and
+        // runtimes/win/lib/net462, and the symbol package mirrors it with an identical PDB in each
+        // spot. Only the first PDB per GUID is indexed above, so every co-located assembly resolves
+        // to that single PDB and the identical duplicate is never consumed, which would misreport it
+        // as an orphan. Re-associate any such unmatched duplicate whose co-located assembly is
+        // present in the package and shares the PDB's debug GUID.
+        var guidByAssemblyPathKey = new Dictionary<string, Guid>(StringComparer.OrdinalIgnoreCase);
+        foreach (BinaryReport asm in managed)
+        {
+            if (asm.CodeViewGuid is Guid guid)
+            {
+                guidByAssemblyPathKey[StripExtension(asm.Path)] = guid;
+            }
+        }
+
+        foreach (string pdbPath in allPdbPaths)
+        {
+            if (matchedPdbs.Contains(pdbPath))
+            {
+                continue;
+            }
+
+            if (pdbGuidByPath.TryGetValue(pdbPath, out Guid pdbGuid)
+                && guidByAssemblyPathKey.TryGetValue(StripExtension(pdbPath), out Guid asmGuid)
+                && pdbGuid == asmGuid)
+            {
+                matchedPdbs.Add(pdbPath);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Re-reads a GUID-matched PDB from the symbol package on demand and verifies it against the
+    /// assembly's recorded PDB checksums. Loading the bytes here (rather than retaining every PDB
+    /// during indexing) keeps peak memory to a single PDB.
+    /// </summary>
+    /// <param name="archive">The open symbol-package archive.</param>
+    /// <param name="pdbFullName">The full archive path of the matched PDB.</param>
+    /// <param name="asm">The assembly whose checksums drive verification.</param>
+    /// <returns>The checksum verification result, or <see langword="null"/> if the entry cannot be read.</returns>
+    private static bool? VerifyMatchedChecksum(ZipArchive archive, string pdbFullName, BinaryReport asm)
+    {
+        ZipArchiveEntry? entry = archive.GetEntry(pdbFullName);
+        return entry is null ? null : VerifyChecksum(asm, ReadEntry(entry));
+    }
+
+    /// <summary>
+    /// Verifies a matched PDB against the assembly's recorded PDB checksums.
+    /// </summary>
+    /// <param name="asm">The assembly whose checksums drive verification.</param>
+    /// <param name="pdb">The matched PDB bytes.</param>
+    /// <returns>
+    /// <see langword="true"/> if any recorded checksum matches, <see langword="false"/> if checksums
+    /// were available but none matched, and <see langword="null"/> if no checksum could be evaluated.
+    /// </returns>
+    private static bool? VerifyChecksum(BinaryReport asm, byte[] pdb)
+    {
+        if (asm.Checksums is not { Count: > 0 } checksums)
+        {
+            return null;
+        }
+
+        bool anyEvaluated = false;
+        foreach (PdbChecksum checksum in checksums)
+        {
+            bool? result = PortablePdb.TryVerifyChecksum(pdb, checksum);
+            if (result is true)
+            {
+                return true;
+            }
+            if (result is false)
+            {
+                anyEvaluated = true;
+            }
+        }
+
+        // If at least one checksum was evaluated and none matched, the PDB does not correspond to the
+        // assembly's build despite the GUID; otherwise verification was inconclusive.
+        return anyEvaluated ? false : null;
+    }
+
+    /// <summary>Reads all bytes of an archive entry into a buffer.</summary>
+    private static byte[] ReadEntry(ZipArchiveEntry entry)
+    {
+        using var buffer = new MemoryStream();
+        using (Stream stream = entry.Open())
+        {
+            stream.CopyTo(buffer);
+        }
+        return buffer.ToArray();
+    }
+
+    /// <summary>
+    /// Removes the final file extension from an archive path, yielding a key that aligns a DLL with
+    /// its co-located PDB.
+    /// </summary>
+    private static string StripExtension(string path) =>
+        path[..^Path.GetExtension(path).Length];
+}
diff --git a/tools/PackageValidator/src/Validator.cs b/tools/PackageValidator/src/Validator.cs
new file mode 100644
index 0000000000..6dd738fd42
--- /dev/null
+++ b/tools/PackageValidator/src/Validator.cs
@@ -0,0 +1,350 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace PackageValidator;
+
+/// <summary>
+/// Stable finding category keys. These are the values accepted by <c>--fail-on</c>.
+/// </summary>
+internal static class Categories
+{
+    public const string VersionInconsistency = "version-inconsistency";
+    public const string MissingSymbols = "missing-symbols";
+    public const string SymbolMismatch = "symbol-mismatch";
+    public const string SymbolChecksumMismatch = "symbol-checksum-mismatch";
+    public const string SymbolOrphan = "symbol-orphan";
+    public const string SymbolDuplicate = "symbol-duplicate";
+    public const string DelaySigned = "delay-signed";
+    public const string Unsigned = "unsigned";
+    public const string PackageUnsigned = "package-unsigned";
+    public const string DependencyInconsistency = "dependency-inconsistency";
+    public const string UnexpectedPackageVersion = "unexpected-package-version";
+    public const string UnexpectedFileVersion = "unexpected-file-version";
+    public const string UnexpectedAssemblyVersion = "unexpected-assembly-version";
+
+    /// <summary>Gets every known category key.</summary>
+    public static IReadOnlyList<string> All { get; } =
+    [
+        VersionInconsistency, MissingSymbols, SymbolMismatch, SymbolChecksumMismatch,
+        SymbolOrphan, SymbolDuplicate, DelaySigned, Unsigned, PackageUnsigned,
+        DependencyInconsistency, UnexpectedPackageVersion, UnexpectedFileVersion,
+        UnexpectedAssemblyVersion,
+    ];
+}
+
+/// <summary>
+/// Applies the intrinsic validation rules to inspected packages, producing per-package and
+/// cross-package <see cref="Finding"/> instances.
+/// </summary>
+internal static class Validator
+{
+    /// <summary>
+    /// Validates a single package, attaching its findings to <see cref="PackageReport.Findings"/>.
+    /// </summary>
+    /// <param name="report">The inspected package report (modified in place).</param>
+    /// <param name="expectations">
+    /// Optional caller-supplied expected version values to confirm against, or <see langword="null"/>
+    /// to skip expected-version checks.
+    /// </param>
+    public static void Validate(PackageReport report, VersionExpectations? expectations = null)
+    {
+        var findings = new List<Finding>();
+
+        CheckVersionConsistency(report, findings);
+        CheckExpectedVersions(report, expectations, findings);
+        CheckSymbols(report, findings);
+        CheckSigning(report, findings);
+        CheckPackageSignature(report, findings);
+
+        report.Findings = findings.Count == 0 ? null : findings;
+    }
+
+    /// <summary>
+    /// Confirms a package's version, and its assemblies' file and assembly versions, against the
+    /// caller-supplied expected values. Pointing every package at the same expected value provides
+    /// inter-package version-match validation and also catches an all-wrong-but-consistent build.
+    /// </summary>
+    private static void CheckExpectedVersions(
+        PackageReport report, VersionExpectations? expectations, List<Finding> findings)
+    {
+        if (expectations is null || expectations.IsEmpty)
+        {
+            return;
+        }
+
+        string? expectedPackage = expectations.PackageVersionFor(report.PackageId);
+        if (expectedPackage is not null
+            && !string.Equals(report.PackageVersion, expectedPackage, StringComparison.Ordinal))
+        {
+            findings.Add(new Finding
+            {
+                Severity = Severity.Error,
+                Category = Categories.UnexpectedPackageVersion,
+                Target = report.PackageFile,
+                Message =
+                    $"package version is '{report.PackageVersion ?? "(none)"}', expected '{expectedPackage}'.",
+            });
+        }
+
+        string? expectedFile = expectations.FileVersionFor(report.PackageId);
+        string? expectedAssembly = expectations.AssemblyVersionFor(report.PackageId);
+
+        // File and assembly versions are expected to be uniform across every managed assembly the
+        // package ships, so confirm each one. A missing version is also a mismatch when an
+        // expectation is supplied, so the assertion does not silently pass.
+        foreach (BinaryReport asm in report.Binaries.Where(b => b.IsManagedAssembly))
+        {
+            if (expectedFile is not null
+                && !string.Equals(asm.FileVersion, expectedFile, StringComparison.Ordinal))
+            {
+                findings.Add(new Finding
+                {
+                    Severity = Severity.Error,
+                    Category = Categories.UnexpectedFileVersion,
+                    Target = asm.Path,
+                    Message = $"file version is '{asm.FileVersion ?? "(none)"}', expected '{expectedFile}'.",
+                });
+            }
+
+            if (expectedAssembly is not null
+                && !string.Equals(asm.AssemblyVersion, expectedAssembly, StringComparison.Ordinal))
+            {
+                findings.Add(new Finding
+                {
+                    Severity = Severity.Error,
+                    Category = Categories.UnexpectedAssemblyVersion,
+                    Target = asm.Path,
+                    Message = $"assembly version is '{asm.AssemblyVersion ?? "(none)"}', expected '{expectedAssembly}'.",
+                });
+            }
+        }
+    }
+
+    /// <summary>
+    /// Validates relationships that span multiple packages in a single run.
+    /// </summary>
+    /// <param name="reports">All package reports in the run.</param>
+    /// <returns>The cross-package findings, or an empty list when there are none.</returns>
+    public static List<Finding> ValidateBatch(IReadOnlyList<PackageReport> reports)
+    {
+        var findings = new List<Finding>();
+
+        // Index packages by id so dependencies on in-batch packages can be checked for version
+        // consistency.
+        var byId = new Dictionary<string, PackageReport>(StringComparer.OrdinalIgnoreCase);
+        foreach (PackageReport report in reports)
+        {
+            if (report.PackageId is { Length: > 0 } id)
+            {
+                byId[id] = report;
+            }
+        }
+
+        foreach (PackageReport report in reports)
+        {
+            if (report.DependencyGroups is null)
+            {
+                continue;
+            }
+
+            foreach (DependencyGroup group in report.DependencyGroups)
+            {
+                foreach (DependencyInfo dependency in group.Dependencies)
+                {
+                    if (!byId.TryGetValue(dependency.Id, out PackageReport? target)
+                        || target.PackageVersion is not { Length: > 0 } targetVersion)
+                    {
+                        continue;
+                    }
+
+                    if (VersionRange.Satisfies(dependency.VersionRange, targetVersion) == false)
+                    {
+                        findings.Add(new Finding
+                        {
+                            Severity = Severity.Warning,
+                            Category = Categories.DependencyInconsistency,
+                            Target = report.PackageFile,
+                            Message =
+                                $"depends on {dependency.Id} {dependency.VersionRange}, but the {dependency.Id} " +
+                                $"package in this run is version {targetVersion}, which is outside that range.",
+                        });
+                    }
+                }
+            }
+        }
+
+        return findings;
+    }
+
+    /// <summary>
+    /// Flags assemblies of the same name that carry inconsistent assembly or file versions.
+    /// </summary>
+    private static void CheckVersionConsistency(PackageReport report, List<Finding> findings)
+    {
+        // Group by assembly name, excluding satellite resource assemblies (which mirror their
+        // parent and need no independent check).
+        IEnumerable<IGrouping<string, BinaryReport>> groups = report.Binaries
+            .Where(b => b.IsManagedAssembly && b.Kind != BinaryKind.Satellite && b.AssemblyName is not null)
+            .GroupBy(b => b.AssemblyName!);
+
+        foreach (IGrouping<string, BinaryReport> group in groups)
+        {
+            List<string> assemblyVersions = group
+                .Select(b => b.AssemblyVersion)
+                .Where(v => v is not null)
+                .Distinct(StringComparer.Ordinal)
+                .ToList()!;
+            if (assemblyVersions.Count > 1)
+            {
+                findings.Add(new Finding
+                {
+                    Severity = Severity.Error,
+                    Category = Categories.VersionInconsistency,
+                    Target = $"{report.PackageFile}:{group.Key}",
+                    Message =
+                        $"assembly '{group.Key}' ships with multiple assembly versions: " +
+                        $"{string.Join(", ", assemblyVersions)}.",
+                });
+            }
+
+            List<string> fileVersions = group
+                .Select(b => b.FileVersion)
+                .Where(v => v is not null)
+                .Distinct(StringComparer.Ordinal)
+                .ToList()!;
+            if (fileVersions.Count > 1)
+            {
+                findings.Add(new Finding
+                {
+                    Severity = Severity.Warning,
+                    Category = Categories.VersionInconsistency,
+                    Target = $"{report.PackageFile}:{group.Key}",
+                    Message =
+                        $"assembly '{group.Key}' ships with multiple file versions: " +
+                        $"{string.Join(", ", fileVersions)}.",
+                });
+            }
+        }
+    }
+
+    /// <summary>
+    /// Flags missing, mismatched, checksum-failed, duplicated, and orphaned symbols.
+    /// </summary>
+    private static void CheckSymbols(PackageReport report, List<Finding> findings)
+    {
+        foreach (BinaryReport asm in report.Binaries.Where(b => b.IsManagedAssembly))
+        {
+            // Only implementation assemblies are expected to ship symbols.
+            if (asm.Kind == BinaryKind.Implementation && asm.HasSymbols != true)
+            {
+                findings.Add(new Finding
+                {
+                    Severity = Severity.Warning,
+                    Category = Categories.MissingSymbols,
+                    Target = asm.Path,
+                    Message = "implementation assembly has no embedded or symbol-package symbols.",
+                });
+            }
+
+            if (asm.HasSymbolPackageSymbols == true && asm.SymbolPackageSymbolsMatch == false)
+            {
+                findings.Add(new Finding
+                {
+                    Severity = Severity.Error,
+                    Category = Categories.SymbolMismatch,
+                    Target = asm.Path,
+                    Message =
+                        $"symbol-package PDB '{asm.SymbolPackageFile}' does not match the assembly build (GUID differs).",
+                });
+            }
+
+            if (asm.SymbolPackageVerifiedByChecksum == false)
+            {
+                findings.Add(new Finding
+                {
+                    Severity = Severity.Error,
+                    Category = Categories.SymbolChecksumMismatch,
+                    Target = asm.Path,
+                    Message =
+                        $"symbol-package PDB '{asm.SymbolPackageFile}' matched by GUID but failed checksum verification.",
+                });
+            }
+
+            if (asm.HasEmbeddedSymbols == true && asm.HasSymbolPackageSymbols == true)
+            {
+                findings.Add(new Finding
+                {
+                    Severity = Severity.Info,
+                    Category = Categories.SymbolDuplicate,
+                    Target = asm.Path,
+                    Message = "symbols are present both embedded and in the symbol package.",
+                });
+            }
+        }
+
+        if (report.SymbolPackage.OrphanSymbolFiles is { Count: > 0 } orphans)
+        {
+            foreach (string orphan in orphans)
+            {
+                findings.Add(new Finding
+                {
+                    Severity = Severity.Warning,
+                    Category = Categories.SymbolOrphan,
+                    Target = orphan,
+                    Message = "symbol-package PDB does not correspond to any assembly in the package.",
+                });
+            }
+        }
+    }
+
+    /// <summary>
+    /// Flags delay-signed and unsigned implementation assemblies.
+    /// </summary>
+    private static void CheckSigning(PackageReport report, List<Finding> findings)
+    {
+        foreach (BinaryReport asm in report.Binaries.Where(
+            b => b.IsManagedAssembly && b.Kind == BinaryKind.Implementation))
+        {
+            switch (asm.SigningStatus)
+            {
+                case PackageValidator.SigningStatus.DelaySigned:
+                    findings.Add(new Finding
+                    {
+                        Severity = Severity.Warning,
+                        Category = Categories.DelaySigned,
+                        Target = asm.Path,
+                        Message = "assembly carries a public key but is delay-signed (strong-name flag not set).",
+                    });
+                    break;
+
+                case PackageValidator.SigningStatus.Unsigned:
+                    findings.Add(new Finding
+                    {
+                        Severity = Severity.Info,
+                        Category = Categories.Unsigned,
+                        Target = asm.Path,
+                        Message = "assembly is not strong-name signed.",
+                    });
+                    break;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Flags a package that carries no NuGet author/repository signature.
+    /// </summary>
+    private static void CheckPackageSignature(PackageReport report, List<Finding> findings)
+    {
+        if (!report.IsSigned)
+        {
+            findings.Add(new Finding
+            {
+                Severity = Severity.Info,
+                Category = Categories.PackageUnsigned,
+                Target = report.PackageFile,
+                Message = "package is not signed (no .signature.p7s entry).",
+            });
+        }
+    }
+}
diff --git a/tools/PackageValidator/src/VersionExpectations.cs b/tools/PackageValidator/src/VersionExpectations.cs
new file mode 100644
index 0000000000..6af7f39054
--- /dev/null
+++ b/tools/PackageValidator/src/VersionExpectations.cs
@@ -0,0 +1,92 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace PackageValidator;
+
+/// <summary>
+/// Caller-supplied expected version values, keyed by package id, used to confirm that inspected
+/// packages and their assemblies carry the versions the build was supposed to produce. This enables
+/// inter-package version-match validation: pointing every package at the same expected value proves
+/// they agree, and also catches the case where every package is consistently wrong.
+/// </summary>
+internal sealed class VersionExpectations
+{
+    /// <summary>The wildcard id that matches any package when no specific id is supplied.</summary>
+    public const string Wildcard = "*";
+
+    private readonly Dictionary<string, string> _package = new(StringComparer.OrdinalIgnoreCase);
+    private readonly Dictionary<string, string> _file = new(StringComparer.OrdinalIgnoreCase);
+    private readonly Dictionary<string, string> _assembly = new(StringComparer.OrdinalIgnoreCase);
+
+    /// <summary>Gets a value indicating whether any expectation was supplied.</summary>
+    public bool IsEmpty => _package.Count == 0 && _file.Count == 0 && _assembly.Count == 0;
+
+    /// <summary>
+    /// Parses the raw <c>--expect-*</c> option values into a <see cref="VersionExpectations"/>.
+    /// </summary>
+    /// <param name="packageVersion">The <c>--expect-package-version</c> specs.</param>
+    /// <param name="fileVersion">The <c>--expect-file-version</c> specs.</param>
+    /// <param name="assemblyVersion">The <c>--expect-assembly-version</c> specs.</param>
+    /// <returns>The parsed expectations.</returns>
+    /// <exception cref="FormatException">Thrown when a spec has an empty value.</exception>
+    public static VersionExpectations Parse(
+        string[] packageVersion, string[] fileVersion, string[] assemblyVersion)
+    {
+        var expectations = new VersionExpectations();
+        Fill(expectations._package, packageVersion, "--expect-package-version");
+        Fill(expectations._file, fileVersion, "--expect-file-version");
+        Fill(expectations._assembly, assemblyVersion, "--expect-assembly-version");
+        return expectations;
+    }
+
+    /// <summary>Gets the expected package version for an id, or <see langword="null"/> if none applies.</summary>
+    public string? PackageVersionFor(string? id) => Resolve(_package, id);
+
+    /// <summary>Gets the expected file version for an id, or <see langword="null"/> if none applies.</summary>
+    public string? FileVersionFor(string? id) => Resolve(_file, id);
+
+    /// <summary>Gets the expected assembly version for an id, or <see langword="null"/> if none applies.</summary>
+    public string? AssemblyVersionFor(string? id) => Resolve(_assembly, id);
+
+    /// <summary>
+    /// Parses each <c>[id=]value</c> spec into a map entry, defaulting a missing id to the wildcard.
+    /// </summary>
+    private static void Fill(Dictionary<string, string> map, string[] specs, string optionName)
+    {
+        foreach (string raw in specs)
+        {
+            string spec = raw.Trim();
+            if (spec.Length == 0)
+            {
+                continue;
+            }
+
+            // Package ids never contain '=' and version values never do either, so the first '='
+            // unambiguously separates an optional id from the value.
+            int eq = spec.IndexOf('=');
+            string id = eq < 0 ? Wildcard : spec[..eq].Trim();
+            string value = eq < 0 ? spec : spec[(eq + 1)..].Trim();
+
+            if (value.Length == 0)
+            {
+                throw new FormatException($"{optionName}: missing value in '{raw}'.");
+            }
+
+            map[id.Length == 0 ? Wildcard : id] = value;
+        }
+    }
+
+    /// <summary>
+    /// Resolves an expectation for a package id, preferring a specific id over the wildcard.
+    /// </summary>
+    private static string? Resolve(Dictionary<string, string> map, string? id)
+    {
+        if (id is not null && map.TryGetValue(id, out string? specific))
+        {
+            return specific;
+        }
+
+        return map.TryGetValue(Wildcard, out string? wildcard) ? wildcard : null;
+    }
+}
diff --git a/tools/PackageValidator/src/VersionRange.cs b/tools/PackageValidator/src/VersionRange.cs
new file mode 100644
index 0000000000..7bd619c828
--- /dev/null
+++ b/tools/PackageValidator/src/VersionRange.cs
@@ -0,0 +1,299 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Globalization;
+
+namespace PackageValidator;
+
+/// <summary>
+/// A minimal evaluator for NuGet dependency version ranges, sufficient to check whether a concrete
+/// package version falls inside a declared range. Comparison follows SemVer 2.0 precedence rules,
+/// including prerelease ordering; build metadata is ignored (it does not affect precedence).
+/// </summary>
+internal static class VersionRange
+{
+    /// <summary>
+    /// Determines whether a concrete version satisfies a NuGet version range.
+    /// </summary>
+    /// <param name="range">The declared version range (for example <c>"1.2.3"</c> or <c>"[1.0.0,2.0.0)"</c>).</param>
+    /// <param name="version">The concrete version to test.</param>
+    /// <returns>
+    /// <see langword="true"/> or <see langword="false"/> when the relationship can be evaluated, and
+    /// <see langword="null"/> when the range or version cannot be parsed (caller should not treat
+    /// this as a failure).
+    /// </returns>
+    public static bool? Satisfies(string? range, string version)
+    {
+        if (string.IsNullOrWhiteSpace(range))
+        {
+            return null;
+        }
+
+        SemanticVersion? target = Parse(version);
+        if (target is null)
+        {
+            return null;
+        }
+
+        range = range.Trim();
+
+        // A bare version (no brackets) is a minimum-inclusive bound in NuGet semantics.
+        if (range[0] != '[' && range[0] != '(')
+        {
+            SemanticVersion? min = Parse(range);
+            return min is null ? null : Compare(target, min) >= 0;
+        }
+
+        // A bracketed range must have a matching closing delimiter; otherwise it is unparseable.
+        char last = range[^1];
+        if (range.Length < 2 || (last != ']' && last != ')'))
+        {
+            return null;
+        }
+
+        bool minInclusive = range[0] == '[';
+        bool maxInclusive = last == ']';
+        string inner = range[1..^1];
+
+        int comma = inner.IndexOf(',');
+        if (comma < 0)
+        {
+            // Only "[1.0.0]" (both delimiters inclusive) is a valid exact pin; any other bracket
+            // combination such as "(1.0.0)" or "(1.0.0]" is malformed and unparseable.
+            if (!minInclusive || !maxInclusive)
+            {
+                return null;
+            }
+
+            SemanticVersion? exact = Parse(inner);
+            return exact is null ? null : Compare(target, exact) == 0;
+        }
+
+        string lower = inner[..comma].Trim();
+        string upper = inner[(comma + 1)..].Trim();
+
+        if (lower.Length > 0)
+        {
+            SemanticVersion? min = Parse(lower);
+            if (min is null)
+            {
+                return null;
+            }
+            int cmp = Compare(target, min);
+            if (cmp < 0 || (cmp == 0 && !minInclusive))
+            {
+                return false;
+            }
+        }
+
+        if (upper.Length > 0)
+        {
+            SemanticVersion? max = Parse(upper);
+            if (max is null)
+            {
+                return null;
+            }
+            int cmp = Compare(target, max);
+            if (cmp > 0 || (cmp == 0 && !maxInclusive))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Parses a version string into its numeric release components and optional prerelease
+    /// identifiers, discarding any build-metadata suffix.
+    /// </summary>
+    /// <param name="version">The version string.</param>
+    /// <returns>The parsed version, or <see langword="null"/> if the release portion is unparseable.</returns>
+    private static SemanticVersion? Parse(string version)
+    {
+        string text = version.Trim();
+
+        // Build metadata ("+...") does not affect precedence; drop it first.
+        int plus = text.IndexOf('+');
+        if (plus >= 0)
+        {
+            text = text[..plus];
+        }
+
+        // A prerelease ("-...") follows the release; split on the first hyphen.
+        string release;
+        string[]? prerelease = null;
+        int hyphen = text.IndexOf('-');
+        if (hyphen >= 0)
+        {
+            release = text[..hyphen];
+            string pre = text[(hyphen + 1)..];
+
+            // A hyphen introduces a prerelease, so a trailing hyphen (empty prerelease) is malformed
+            // per SemVer/NuGet rather than "no prerelease"; reject it.
+            if (pre.Length == 0)
+            {
+                return null;
+            }
+
+            prerelease = pre.Split('.');
+
+            // Every prerelease identifier must be non-empty (e.g. "alpha..1" is malformed).
+            foreach (string identifier in prerelease)
+            {
+                if (identifier.Length == 0)
+                {
+                    return null;
+                }
+            }
+        }
+        else
+        {
+            release = text;
+        }
+
+        // Keep empty components (do not use RemoveEmptyEntries) so malformed inputs such as "1..0"
+        // are rejected below by the numeric parse rather than silently collapsing to "1.0".
+        string[] parts = release.Split('.');
+        if (parts.Length == 0)
+        {
+            return null;
+        }
+
+        var numbers = new int[parts.Length];
+        for (int i = 0; i < parts.Length; i++)
+        {
+            if (!int.TryParse(parts[i], NumberStyles.None, CultureInfo.InvariantCulture, out numbers[i]))
+            {
+                return null;
+            }
+        }
+
+        return new SemanticVersion(numbers, prerelease);
+    }
+
+    /// <summary>
+    /// Compares two versions using SemVer 2.0 precedence: release components first (missing trailing
+    /// components treated as zero), then prerelease precedence (a prerelease version is lower than
+    /// the same release without one).
+    /// </summary>
+    /// <param name="a">The first version.</param>
+    /// <param name="b">The second version.</param>
+    /// <returns>A negative, zero, or positive value per standard comparison semantics.</returns>
+    private static int Compare(SemanticVersion a, SemanticVersion b)
+    {
+        int length = Math.Max(a.Release.Length, b.Release.Length);
+        for (int i = 0; i < length; i++)
+        {
+            int left = i < a.Release.Length ? a.Release[i] : 0;
+            int right = i < b.Release.Length ? b.Release[i] : 0;
+            int cmp = left.CompareTo(right);
+            if (cmp != 0)
+            {
+                return cmp;
+            }
+        }
+
+        return ComparePrerelease(a.Prerelease, b.Prerelease);
+    }
+
+    /// <summary>
+    /// Compares two prerelease identifier sets per SemVer 2.0 precedence rules.
+    /// </summary>
+    /// <param name="a">The first version's prerelease identifiers, or <see langword="null"/> if none.</param>
+    /// <param name="b">The second version's prerelease identifiers, or <see langword="null"/> if none.</param>
+    /// <returns>A negative, zero, or positive value per standard comparison semantics.</returns>
+    private static int ComparePrerelease(string[]? a, string[]? b)
+    {
+        // A version without a prerelease has higher precedence than one with a prerelease.
+        if (a is null && b is null)
+        {
+            return 0;
+        }
+        if (a is null)
+        {
+            return 1;
+        }
+        if (b is null)
+        {
+            return -1;
+        }
+
+        int shared = Math.Min(a.Length, b.Length);
+        for (int i = 0; i < shared; i++)
+        {
+            int cmp = CompareIdentifier(a[i], b[i]);
+            if (cmp != 0)
+            {
+                return cmp;
+            }
+        }
+
+        // When all shared identifiers are equal, the larger set has higher precedence.
+        return a.Length.CompareTo(b.Length);
+    }
+
+    /// <summary>
+    /// Compares two prerelease identifiers: numeric identifiers compare numerically and rank lower
+    /// than alphanumeric identifiers, which compare by ASCII order.
+    /// </summary>
+    private static int CompareIdentifier(string a, string b)
+    {
+        bool aNumeric = IsNumeric(a);
+        bool bNumeric = IsNumeric(b);
+
+        if (aNumeric && bNumeric)
+        {
+            if (long.TryParse(a, NumberStyles.None, CultureInfo.InvariantCulture, out long na)
+                && long.TryParse(b, NumberStyles.None, CultureInfo.InvariantCulture, out long nb))
+            {
+                return na.CompareTo(nb);
+            }
+
+            // Fall back for identifiers too large for long: compare by significant length, then text.
+            string ta = a.TrimStart('0');
+            string tb = b.TrimStart('0');
+            int byLength = ta.Length.CompareTo(tb.Length);
+            return byLength != 0 ? byLength : string.CompareOrdinal(ta, tb);
+        }
+
+        // Numeric identifiers always have lower precedence than alphanumeric ones.
+        if (aNumeric)
+        {
+            return -1;
+        }
+        if (bNumeric)
+        {
+            return 1;
+        }
+
+        return string.CompareOrdinal(a, b);
+    }
+
+    /// <summary>Determines whether an identifier consists solely of ASCII digits.</summary>
+    private static bool IsNumeric(string value)
+    {
+        if (value.Length == 0)
+        {
+            return false;
+        }
+
+        foreach (char c in value)
+        {
+            if (!char.IsAsciiDigit(c))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// A parsed semantic version: numeric release components plus optional prerelease identifiers.
+    /// </summary>
+    /// <param name="Release">The numeric release components (for example <c>1.2.3</c>).</param>
+    /// <param name="Prerelease">The dot-separated prerelease identifiers, or <see langword="null"/> for a release version.</param>
+    private sealed record SemanticVersion(int[] Release, string[]? Prerelease);
+}
diff --git a/tools/PackageValidator/test/AssemblyInspectorTests.cs b/tools/PackageValidator/test/AssemblyInspectorTests.cs
new file mode 100644
index 0000000000..45ff53b5a3
--- /dev/null
+++ b/tools/PackageValidator/test/AssemblyInspectorTests.cs
@@ -0,0 +1,113 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Security.Cryptography;
+using Xunit;
+
+namespace PackageValidator.Tests;
+
+/// <summary>
+/// Tests for <see cref="AssemblyInspector"/>, focused on the public-key-token derivation that turns
+/// a strong-name public key into its 8-byte token.
+/// </summary>
+public class AssemblyInspectorTests
+{
+    /// <summary>
+    /// Verifies that an assembly with no public key (empty or null blob) yields no token, since such
+    /// an assembly is not strong-name signed.
+    /// </summary>
+    [Fact]
+    public void ComputePublicKeyToken_returns_null_for_empty_key()
+    {
+        Assert.Null(AssemblyInspector.ComputePublicKeyToken([]));
+        Assert.Null(AssemblyInspector.ComputePublicKeyToken(null!));
+    }
+
+    /// <summary>
+    /// Verifies the token derivation contract: the low 8 bytes of <c>SHA-1(publicKey)</c>, emitted in
+    /// reverse (little-endian) order as lowercase hex.
+    /// </summary>
+    [Fact]
+    public void ComputePublicKeyToken_is_reversed_sha1_tail()
+    {
+        // Arrange: an arbitrary public-key blob plus the token computed independently from the
+        // documented contract (reversed last 8 bytes of its SHA-1).
+        byte[] key = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+        byte[] hash = SHA1.HashData(key);
+        var expected = new byte[8];
+        for (int i = 0; i < 8; i++)
+        {
+            expected[i] = hash[hash.Length - 1 - i];
+        }
+        string expectedHex = Convert.ToHexStringLower(expected);
+
+        // Act + Assert: the inspector must produce that same hex token.
+        Assert.Equal(expectedHex, AssemblyInspector.ComputePublicKeyToken(key));
+    }
+}
+
+/// <summary>
+/// Tests for <see cref="PortablePdb"/>, covering portable-PDB GUID reading and the detection of
+/// legacy Windows (MSF) PDBs that cannot be matched by GUID.
+/// </summary>
+public class PortablePdbTests
+{
+    /// <summary>
+    /// Verifies that the legacy Windows PDB magic ("Microsoft C/C++ MSF 7.00") is recognized so such
+    /// PDBs can be reported rather than silently treated as portable.
+    /// </summary>
+    [Fact]
+    public void IsWindowsPdb_detects_msf_signature()
+    {
+        // Arrange: bytes that begin with the Windows PDB MSF signature.
+        byte[] windows = System.Text.Encoding.ASCII.GetBytes("Microsoft C/C++ MSF 7.00\r\n");
+
+        // Act + Assert.
+        Assert.True(PortablePdb.IsWindowsPdb(windows));
+    }
+
+    /// <summary>
+    /// Verifies that non-Windows-PDB content (including the portable-PDB "BSJB" signature and empty
+    /// input) is not misidentified as a Windows PDB.
+    /// </summary>
+    [Fact]
+    public void IsWindowsPdb_rejects_other_content()
+    {
+        byte[] portableSignature = [0x42, 0x53, 0x4A, 0x42]; // "BSJB" - the portable PDB / metadata magic
+        Assert.False(PortablePdb.IsWindowsPdb(portableSignature));
+        Assert.False(PortablePdb.IsWindowsPdb([]));
+    }
+
+    /// <summary>
+    /// Verifies that bytes which are not a readable portable PDB yield no GUID rather than throwing.
+    /// </summary>
+    [Fact]
+    public void TryReadGuid_returns_null_for_non_pdb()
+    {
+        Assert.Null(PortablePdb.TryReadGuid([0, 1, 2, 3]));
+    }
+
+    /// <summary>
+    /// Verifies that a malformed portable-PDB header encoding a negative version length is treated as
+    /// unparseable (checksum verification returns <see langword="null"/>) rather than throwing and
+    /// failing the whole run.
+    /// </summary>
+    [Fact]
+    public void TryVerifyChecksum_returns_null_for_malformed_version_length()
+    {
+        // A metadata header ("BSJB" + major/minor/reserved) followed by a negative version length,
+        // which would otherwise make the seek throw.
+        byte[] malformed =
+        [
+            0x42, 0x53, 0x4A, 0x42, // signature "BSJB"
+            0x00, 0x00,             // major version
+            0x00, 0x00,             // minor version
+            0x00, 0x00, 0x00, 0x00, // reserved
+            0xFF, 0xFF, 0xFF, 0xFF, // version length = -1
+        ];
+        var checksum = new PdbChecksum { Algorithm = "SHA256", Hash = new byte[32] };
+
+        Assert.Null(PortablePdb.TryVerifyChecksum(malformed, checksum));
+    }
+}
diff --git a/tools/PackageValidator/test/BinaryClassifierTests.cs b/tools/PackageValidator/test/BinaryClassifierTests.cs
new file mode 100644
index 0000000000..82836036b3
--- /dev/null
+++ b/tools/PackageValidator/test/BinaryClassifierTests.cs
@@ -0,0 +1,48 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+namespace PackageValidator.Tests;
+
+/// <summary>
+/// Tests for <see cref="BinaryClassifier"/>, which maps a DLL's package path to the role it plays
+/// (implementation, reference, satellite, or other).
+/// </summary>
+public class BinaryClassifierTests
+{
+    /// <summary>
+    /// Verifies the path-to-kind mapping for the common NuGet layouts: <c>lib/</c> and
+    /// <c>runtimes/.../lib/</c> are implementation, <c>ref/</c> is reference, culture
+    /// <c>*.resources.dll</c> are satellite, and anything else is other.
+    /// </summary>
+    /// <param name="path">The DLL path within the package.</param>
+    /// <param name="expected">The expected <see cref="BinaryKind"/> name.</param>
+    [Theory]
+    [InlineData("lib/net8.0/Foo.dll", "Implementation")]
+    [InlineData("runtimes/win/lib/net462/Foo.dll", "Implementation")]
+    [InlineData("ref/net8.0/Foo.dll", "Reference")]
+    [InlineData("lib/net8.0/de/Foo.resources.dll", "Satellite")]
+    [InlineData("lib/net8.0/fr/Foo.resources.dll", "Satellite")]
+    [InlineData("build/Foo.dll", "Other")]
+    [InlineData("build/lib/Foo.dll", "Other")]     // nested lib/ outside runtimes/ is not implementation
+    [InlineData("tools/Foo.dll", "Other")]
+    public void Classify_maps_paths_to_kinds(string path, string expected)
+    {
+        // Compare by name (the enum is internal, so the public test signature cannot expose it).
+        Assert.Equal(expected, BinaryClassifier.Classify(path).ToString());
+    }
+
+    /// <summary>
+    /// Verifies that a satellite resource assembly is classified as <see cref="BinaryKind.Satellite"/>
+    /// even though it also lives under <c>lib/</c>, since the <c>.resources.dll</c> suffix is the
+    /// stronger signal.
+    /// </summary>
+    [Fact]
+    public void Classify_satellite_takes_precedence_over_lib()
+    {
+        // The path is under lib/ but the name ends in .resources.dll, which must win.
+        Assert.Equal("Satellite", BinaryClassifier.Classify("lib/net8.0/es/Foo.resources.dll").ToString());
+    }
+}
diff --git a/tools/PackageValidator/test/PackageValidator.Test.csproj b/tools/PackageValidator/test/PackageValidator.Test.csproj
new file mode 100644
index 0000000000..5d3d40056c
--- /dev/null
+++ b/tools/PackageValidator/test/PackageValidator.Test.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
+    <RootNamespace>PackageValidator.Test</RootNamespace>
+    <IsPackable>false</IsPackable>
+    <InvariantGlobalization>true</InvariantGlobalization>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="xunit.v3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../src/PackageValidator.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/tools/PackageValidator/test/ValidatorTests.cs b/tools/PackageValidator/test/ValidatorTests.cs
new file mode 100644
index 0000000000..38b21f7639
--- /dev/null
+++ b/tools/PackageValidator/test/ValidatorTests.cs
@@ -0,0 +1,365 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Linq;
+using Xunit;
+
+namespace PackageValidator.Tests;
+
+/// <summary>
+/// Tests for <see cref="Validator"/>, the intrinsic rules engine. Each test builds a synthetic
+/// <see cref="PackageReport"/> so a single rule can be exercised in isolation, then asserts on the
+/// findings the validator attaches.
+/// </summary>
+public class ValidatorTests
+{
+    /// <summary>
+    /// Creates a symbol-package descriptor in the "skipped" state, so symbol rules stay inert and a
+    /// test can focus on the rule under examination.
+    /// </summary>
+    /// <returns>A <see cref="SymbolPackageInfo"/> with status <c>"skipped"</c>.</returns>
+    private static SymbolPackageInfo SkippedSymbols() => new()
+    {
+        Status = "skipped",
+    };
+
+    /// <summary>
+    /// Builds a minimal, otherwise-valid signed package report wrapping the given binaries, so a
+    /// test only has to specify the binaries relevant to the rule it exercises.
+    /// </summary>
+    /// <param name="binaries">The binaries the package contains.</param>
+    /// <returns>A populated <see cref="PackageReport"/>.</returns>
+    private static PackageReport Package(params BinaryReport[] binaries) => new()
+    {
+        PackageFile = "Test.1.0.0.nupkg",
+        PackageId = "Test",
+        PackageVersion = "1.0.0",
+        IsSigned = true,
+        Binaries = binaries.ToList(),
+        SymbolPackage = SkippedSymbols(),
+    };
+
+    /// <summary>
+    /// Verifies that two assemblies of the same name carrying different assembly versions raise an
+    /// Error-severity version-inconsistency finding.
+    /// </summary>
+    [Fact]
+    public void Flags_inconsistent_assembly_versions_as_error()
+    {
+        // Arrange: the same assembly under two TFMs with conflicting assembly versions.
+        PackageReport report = Package(
+            new BinaryReport
+            {
+                Path = "lib/net8.0/Foo.dll",
+                Kind = BinaryKind.Implementation,
+                IsManagedAssembly = true,
+                AssemblyName = "Foo",
+                AssemblyVersion = "1.0.0.0",
+                FileVersion = "1.0.0.0",
+                HasSymbols = true,
+            },
+            new BinaryReport
+            {
+                Path = "lib/net462/Foo.dll",
+                Kind = BinaryKind.Implementation,
+                IsManagedAssembly = true,
+                AssemblyName = "Foo",
+                AssemblyVersion = "2.0.0.0",
+                FileVersion = "1.0.0.0",
+                HasSymbols = true,
+            });
+
+        // Act.
+        Validator.Validate(report);
+
+        // Assert: exactly one Error version-inconsistency finding with the expected target and message.
+        Finding finding = Assert.Single(
+            report.Findings!, f => f.Category == Categories.VersionInconsistency);
+        Assert.Equal(Severity.Error, finding.Severity);
+        Assert.Equal("Test.1.0.0.nupkg:Foo", finding.Target);
+        Assert.Equal(
+            "assembly 'Foo' ships with multiple assembly versions: 1.0.0.0, 2.0.0.0.",
+            finding.Message);
+    }
+
+    /// <summary>
+    /// Verifies that same-named assemblies with matching assembly versions but differing file
+    /// versions raise a Warning-severity version-inconsistency finding (a weaker signal than an
+    /// assembly-version conflict).
+    /// </summary>
+    [Fact]
+    public void Flags_inconsistent_file_versions_as_warning()
+    {
+        // Arrange: identical assembly versions, but the file-version revision differs between TFMs.
+        PackageReport report = Package(
+            new BinaryReport
+            {
+                Path = "lib/net8.0/Foo.dll",
+                Kind = BinaryKind.Implementation,
+                IsManagedAssembly = true,
+                AssemblyName = "Foo",
+                AssemblyVersion = "1.0.0.0",
+                FileVersion = "1.0.0.0",
+                HasSymbols = true,
+            },
+            new BinaryReport
+            {
+                Path = "lib/net462/Foo.dll",
+                Kind = BinaryKind.Implementation,
+                IsManagedAssembly = true,
+                AssemblyName = "Foo",
+                AssemblyVersion = "1.0.0.0",
+                FileVersion = "1.0.0.17603",
+                HasSymbols = true,
+            });
+
+        // Act.
+        Validator.Validate(report);
+
+        // Assert: the mismatch surfaces as a Warning rather than an Error.
+        //
+        // A differing file version alone is only an advisory signal: without an explicit
+        // expectation the validator cannot know which value is authoritative, so it warns instead of
+        // failing. When a caller supplies an expected file version via --expect,
+        // CheckExpectedVersions instead treats any mismatch as an Error (the UnexpectedFileVersion
+        // rule), so desired outcomes can still be enforced hard.
+        Finding finding = Assert.Single(
+            report.Findings!, f => f.Category == Categories.VersionInconsistency);
+        Assert.Equal(Severity.Warning, finding.Severity);
+        Assert.Equal("Test.1.0.0.nupkg:Foo", finding.Target);
+        Assert.Equal(
+            "assembly 'Foo' ships with multiple file versions: 1.0.0.0, 1.0.0.17603.",
+            finding.Message);
+    }
+
+    /// <summary>
+    /// Verifies that the missing-symbols rule applies only to implementation assemblies: a reference
+    /// assembly without symbols is exempt, so exactly one finding (for the implementation DLL) is
+    /// produced.
+    /// </summary>
+    [Fact]
+    public void Flags_missing_symbols_only_for_implementation_assemblies()
+    {
+        // Arrange: an implementation and a reference assembly, both lacking symbols.
+        PackageReport report = Package(
+            new BinaryReport
+            {
+                Path = "lib/net8.0/Foo.dll",
+                Kind = BinaryKind.Implementation,
+                IsManagedAssembly = true,
+                AssemblyName = "Foo",
+                AssemblyVersion = "1.0.0.0",
+                HasSymbols = false,
+            },
+            new BinaryReport
+            {
+                Path = "ref/net8.0/Foo.dll",
+                Kind = BinaryKind.Reference,
+                IsManagedAssembly = true,
+                AssemblyName = "Foo",
+                AssemblyVersion = "1.0.0.0",
+                HasSymbols = false,
+            });
+
+        // Act.
+        Validator.Validate(report);
+
+        // Assert: only the implementation assembly is flagged; the reference assembly is exempt.
+        Finding missing = Assert.Single(
+            report.Findings!, f => f.Category == Categories.MissingSymbols);
+        Assert.Equal(Severity.Warning, missing.Severity);
+        Assert.Equal("lib/net8.0/Foo.dll", missing.Target);
+        Assert.Equal(
+            "implementation assembly has no embedded or symbol-package symbols.",
+            missing.Message);
+    }
+
+    /// <summary>
+    /// Verifies that a delay-signed implementation assembly (public key present but the strong-name
+    /// flag unset) raises a Warning-severity delay-signed finding.
+    /// </summary>
+    [Fact]
+    public void Flags_delay_signed_assembly()
+    {
+        // Arrange: an assembly that carries a public key but reports DelaySigned.
+        //
+        // Delay-signed binaries only appear in local developer builds and non-official CI builds,
+        // where the real strong-name key is unavailable so the assembly is signed with its public
+        // key alone. Official release builds complete strong-name signing, so this state should never
+        // ship; flagging it guards against accidentally publishing a not-actually-signed DLL.
+        PackageReport report = Package(new BinaryReport
+        {
+            Path = "lib/net8.0/Foo.dll",
+            Kind = BinaryKind.Implementation,
+            IsManagedAssembly = true,
+            AssemblyName = "Foo",
+            AssemblyVersion = "1.0.0.0",
+            PublicKeyToken = "23ec7fc2d6eaa4a5",
+            SigningStatus = SigningStatus.DelaySigned,
+            HasSymbols = true,
+        });
+
+        // Act.
+        Validator.Validate(report);
+
+        // Assert.
+        Finding finding = Assert.Single(
+            report.Findings!, f => f.Category == Categories.DelaySigned);
+        Assert.Equal(Severity.Warning, finding.Severity);
+        Assert.Equal("lib/net8.0/Foo.dll", finding.Target);
+        Assert.Equal(
+            "assembly carries a public key but is delay-signed (strong-name flag not set).",
+            finding.Message);
+    }
+
+    /// <summary>
+    /// Verifies that a symbol-package PDB which matches by GUID but fails checksum verification raises
+    /// an Error-severity checksum-mismatch finding.
+    /// </summary>
+    [Fact]
+    public void Flags_symbol_checksum_mismatch_as_error()
+    {
+        // Arrange: a GUID-matched symbol whose checksum verification was evaluated and failed.
+        PackageReport report = Package(new BinaryReport
+        {
+            Path = "lib/net8.0/Foo.dll",
+            Kind = BinaryKind.Implementation,
+            IsManagedAssembly = true,
+            AssemblyName = "Foo",
+            AssemblyVersion = "1.0.0.0",
+            HasSymbols = true,
+            HasSymbolPackageSymbols = true,
+            SymbolPackageSymbolsMatch = true,
+            SymbolPackageVerifiedByChecksum = false,
+            SymbolPackageFile = "lib/net8.0/Foo.pdb",
+        });
+
+        // Act.
+        Validator.Validate(report);
+
+        // Assert.
+        Finding finding = Assert.Single(
+            report.Findings!, f => f.Category == Categories.SymbolChecksumMismatch);
+        Assert.Equal(Severity.Error, finding.Severity);
+        Assert.Equal("lib/net8.0/Foo.dll", finding.Target);
+        Assert.Equal(
+            "symbol-package PDB 'lib/net8.0/Foo.pdb' matched by GUID but failed checksum verification.",
+            finding.Message);
+    }
+
+    /// <summary>
+    /// Verifies that a package without a NuGet signature raises a package-unsigned finding.
+    /// </summary>
+    [Fact]
+    public void Flags_unsigned_package()
+    {
+        // Arrange: a valid package, then re-create it as unsigned (IsSigned is init-only).
+        PackageReport report = Package(new BinaryReport
+        {
+            Path = "lib/net8.0/Foo.dll",
+            Kind = BinaryKind.Implementation,
+            IsManagedAssembly = true,
+            AssemblyName = "Foo",
+            AssemblyVersion = "1.0.0.0",
+            HasSymbols = true,
+        });
+        report = new PackageReport
+        {
+            PackageFile = report.PackageFile,
+            PackageId = report.PackageId,
+            PackageVersion = report.PackageVersion,
+            IsSigned = false,
+            Binaries = report.Binaries,
+            SymbolPackage = report.SymbolPackage,
+        };
+
+        // Act.
+        Validator.Validate(report);
+
+        // Assert.
+        Finding finding = Assert.Single(
+            report.Findings!, f => f.Category == Categories.PackageUnsigned);
+        Assert.Equal(Severity.Info, finding.Severity);
+        Assert.Equal("Test.1.0.0.nupkg", finding.Target);
+        Assert.Equal("package is not signed (no .signature.p7s entry).", finding.Message);
+    }
+
+    /// <summary>
+    /// Verifies the cross-package rule: a dependency on an in-batch package whose actual version
+    /// falls outside the declared range raises a dependency-inconsistency finding.
+    /// </summary>
+    [Fact]
+    public void Batch_flags_dependency_version_inconsistency()
+    {
+        // Arrange: a consumer requiring Lib >= 2.0.0, but the Lib in the same batch is only 1.0.0.
+        var consumer = new PackageReport
+        {
+            PackageFile = "Consumer.1.0.0.nupkg",
+            PackageId = "Consumer",
+            PackageVersion = "1.0.0",
+            IsSigned = true,
+            Binaries = [],
+            SymbolPackage = SkippedSymbols(),
+            DependencyGroups =
+            [
+                new DependencyGroup
+                {
+                    TargetFramework = "net8.0",
+                    Dependencies = [new DependencyInfo { Id = "Lib", VersionRange = "[2.0.0,)" }],
+                },
+            ],
+        };
+        var lib = new PackageReport
+        {
+            PackageFile = "Lib.1.0.0.nupkg",
+            PackageId = "Lib",
+            PackageVersion = "1.0.0",
+            IsSigned = true,
+            Binaries = [],
+            SymbolPackage = SkippedSymbols(),
+        };
+
+        // Act: validate the two packages together so the cross-package rule can correlate them.
+        List<Finding> findings = Validator.ValidateBatch([consumer, lib]);
+
+        // Assert.
+        Finding finding = Assert.Single(
+            findings, f => f.Category == Categories.DependencyInconsistency);
+        Assert.Equal(Severity.Warning, finding.Severity);
+        Assert.Equal("Consumer.1.0.0.nupkg", finding.Target);
+        Assert.Equal(
+            "depends on Lib [2.0.0,), but the Lib " +
+            "package in this run is version 1.0.0, which is outside that range.",
+            finding.Message);
+    }
+
+    /// <summary>
+    /// Verifies that a consistent, signed package with matching versions and symbols produces no
+    /// Error-severity findings (the informational/clean baseline).
+    /// </summary>
+    [Fact]
+    public void Clean_package_produces_no_error_findings()
+    {
+        // Arrange: a signed, strong-named assembly with symbols and consistent versions.
+        PackageReport report = Package(new BinaryReport
+        {
+            Path = "lib/net8.0/Foo.dll",
+            Kind = BinaryKind.Implementation,
+            IsManagedAssembly = true,
+            AssemblyName = "Foo",
+            AssemblyVersion = "1.0.0.0",
+            FileVersion = "1.0.0.0",
+            PublicKeyToken = "23ec7fc2d6eaa4a5",
+            SigningStatus = SigningStatus.Signed,
+            HasSymbols = true,
+        });
+
+        // Act.
+        Validator.Validate(report);
+
+        // Assert: a fully consistent, signed, strong-named package with symbols produces no findings
+        // at all. Validator leaves Findings null when the finding list is empty.
+        Assert.Null(report.Findings);
+    }
+}
diff --git a/tools/PackageValidator/test/VersionExpectationsTests.cs b/tools/PackageValidator/test/VersionExpectationsTests.cs
new file mode 100644
index 0000000000..75ad781888
--- /dev/null
+++ b/tools/PackageValidator/test/VersionExpectationsTests.cs
@@ -0,0 +1,184 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+namespace PackageValidator.Tests;
+
+/// <summary>
+/// Tests for the <c>--expect-*</c> assertions wired through <see cref="VersionExpectations"/> and
+/// <see cref="Validator"/>: confirming package, file, and assembly versions against caller-supplied
+/// expected values, including wildcard/per-id precedence and missing-version handling.
+/// </summary>
+public class VersionExpectationsTests
+{
+    /// <summary>
+    /// Creates a symbol-package descriptor in the "skipped" state so symbol rules stay inert.
+    /// </summary>
+    /// <returns>A <see cref="SymbolPackageInfo"/> with status <c>"skipped"</c>.</returns>
+    private static SymbolPackageInfo SkippedSymbols() => new() { Status = "skipped" };
+
+    /// <summary>
+    /// Builds a single-assembly package report with the given identity and versions, used to model a
+    /// family member under expected-version assertions.
+    /// </summary>
+    /// <param name="id">The package id.</param>
+    /// <param name="pkgVer">The package version.</param>
+    /// <param name="fileVer">The contained assembly's file version.</param>
+    /// <param name="asmVer">The contained assembly's assembly version.</param>
+    /// <returns>A populated <see cref="PackageReport"/>.</returns>
+    private static PackageReport Family(string id, string pkgVer, string fileVer, string asmVer) => new()
+    {
+        PackageFile = $"{id}.{pkgVer}.nupkg",
+        PackageId = id,
+        PackageVersion = pkgVer,
+        IsSigned = true,
+        Binaries =
+        [
+            new BinaryReport
+            {
+                Path = "lib/net8.0/X.dll",
+                Kind = BinaryKind.Implementation,
+                IsManagedAssembly = true,
+                AssemblyName = "X",
+                AssemblyVersion = asmVer,
+                FileVersion = fileVer,
+                HasSymbols = true,
+            },
+        ],
+        SymbolPackage = SkippedSymbols(),
+    };
+
+    /// <summary>
+    /// Verifies a wildcard file-version expectation: the matching package passes while a package
+    /// whose file version differs is flagged with an Error-severity finding.
+    /// </summary>
+    [Fact]
+    public void Wildcard_file_version_flags_mismatch()
+    {
+        // Arrange: a wildcard expectation, one conforming package and one that does not.
+        VersionExpectations exp = VersionExpectations.Parse([], ["7.1.0.17604"], []);
+        PackageReport ok = Family("MDS", "7.1.0", "7.1.0.17604", "7.0.0.0");
+        PackageReport bad = Family("Ext", "7.1.0", "7.1.0.0", "7.0.0.0");
+
+        // Act.
+        Validator.Validate(ok, exp);
+        Validator.Validate(bad, exp);
+
+        // Assert: only the non-conforming package raises an unexpected-file-version finding.
+        Assert.DoesNotContain(ok.Findings ?? [], f => f.Category == Categories.UnexpectedFileVersion);
+        Assert.Contains(bad.Findings!, f =>
+            f.Category == Categories.UnexpectedFileVersion && f.Severity == Severity.Error);
+    }
+
+    /// <summary>
+    /// Verifies that a per-id expectation overrides the wildcard, so a package matching its specific
+    /// expected value is not flagged even though it differs from the wildcard value.
+    /// </summary>
+    [Fact]
+    public void Specific_id_overrides_wildcard()
+    {
+        // Arrange: the family expects .17604, but SqlServer is allowed its own value.
+        VersionExpectations exp = VersionExpectations.Parse(
+            [], ["*=7.1.0.17604", "Microsoft.SqlServer.Server=1.1.0.17604"], []);
+        PackageReport sqlServer = Family("Microsoft.SqlServer.Server", "1.1.0", "1.1.0.17604", "1.0.0.0");
+
+        // Act.
+        Validator.Validate(sqlServer, exp);
+
+        // Assert: the per-id expectation is honored, so no mismatch is reported.
+        Assert.DoesNotContain(sqlServer.Findings ?? [], f => f.Category == Categories.UnexpectedFileVersion);
+    }
+
+    /// <summary>
+    /// Verifies that an assembly with no <c>AssemblyFileVersion</c> is flagged (reported as
+    /// <c>(none)</c>) against a file-version expectation, so the assertion never silently passes when
+    /// the version attribute is absent.
+    /// </summary>
+    [Fact]
+    public void Missing_file_version_is_flagged_against_expectation()
+    {
+        // Arrange: an expectation plus an implementation assembly that carries no file version.
+        VersionExpectations exp = VersionExpectations.Parse([], ["7.1.0.17604"], []);
+        var report = new PackageReport
+        {
+            PackageFile = "MDS.7.1.0.nupkg",
+            PackageId = "MDS",
+            PackageVersion = "7.1.0",
+            IsSigned = true,
+            Binaries =
+            [
+                new BinaryReport
+                {
+                    Path = "lib/net8.0/X.dll",
+                    Kind = BinaryKind.Implementation,
+                    IsManagedAssembly = true,
+                    AssemblyName = "X",
+                    AssemblyVersion = "7.0.0.0",
+                    FileVersion = null,
+                    HasSymbols = true,
+                },
+            ],
+            SymbolPackage = SkippedSymbols(),
+        };
+
+        // Act.
+        Validator.Validate(report, exp);
+
+        // Assert: the missing version is reported as an Error mentioning "(none)".
+        Assert.Contains(report.Findings!, f =>
+            f.Category == Categories.UnexpectedFileVersion
+                && f.Severity == Severity.Error
+                && f.Message.Contains("(none)"));
+    }
+
+    /// <summary>
+    /// Verifies that a package whose version differs from the expected package version is flagged.
+    /// </summary>
+    [Fact]
+    public void Package_version_mismatch_is_flagged()
+    {
+        // Arrange: expect a -pr build, but the package is a -ci build.
+        VersionExpectations exp = VersionExpectations.Parse(["7.1.0-preview1-pr17604"], [], []);
+        PackageReport bad = Family("MDS", "7.1.0-preview1-ci17621", "7.1.0.17621", "7.0.0.0");
+
+        // Act.
+        Validator.Validate(bad, exp);
+
+        // Assert.
+        Assert.Contains(bad.Findings!, f => f.Category == Categories.UnexpectedPackageVersion);
+    }
+
+    /// <summary>
+    /// Verifies that when no expectations are supplied, the expected-version rules are inert: the
+    /// expectations are empty and no unexpected-version findings are produced.
+    /// </summary>
+    [Fact]
+    public void Empty_expectations_produce_no_expected_version_findings()
+    {
+        // Arrange: no expectations at all.
+        VersionExpectations exp = VersionExpectations.Parse([], [], []);
+        Assert.True(exp.IsEmpty);
+
+        // Act: validate a package whose versions would mismatch were any expectation set.
+        PackageReport p = Family("MDS", "7.1.0", "7.1.0.0", "7.0.0.0");
+        Validator.Validate(p, exp);
+
+        // Assert: none of the expected-version categories appear.
+        Assert.DoesNotContain(p.Findings ?? [], f =>
+            f.Category is Categories.UnexpectedFileVersion
+                or Categories.UnexpectedPackageVersion
+                or Categories.UnexpectedAssemblyVersion);
+    }
+
+    /// <summary>
+    /// Verifies that an <c>id=</c> spec with an empty value is rejected at parse time rather than
+    /// being interpreted as a real expectation.
+    /// </summary>
+    [Fact]
+    public void Parse_rejects_empty_value()
+    {
+        Assert.Throws<FormatException>(() => VersionExpectations.Parse([], ["MDS="], []));
+    }
+}
diff --git a/tools/PackageValidator/test/VersionRangeTests.cs b/tools/PackageValidator/test/VersionRangeTests.cs
new file mode 100644
index 0000000000..a1e0816779
--- /dev/null
+++ b/tools/PackageValidator/test/VersionRangeTests.cs
@@ -0,0 +1,134 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+namespace PackageValidator.Tests;
+
+/// <summary>
+/// Tests for <see cref="VersionRange"/>, the SemVer 2.0-aware evaluator that decides whether a
+/// concrete version falls inside a NuGet dependency version range.
+/// </summary>
+public class VersionRangeTests
+{
+    /// <summary>
+    /// Verifies the bracket/interval grammar for release-only versions: bare minimum bounds, exact
+    /// pins, and inclusive/exclusive interval endpoints.
+    /// </summary>
+    /// <param name="range">The declared version range.</param>
+    /// <param name="version">The concrete version under test.</param>
+    /// <param name="expected">Whether <paramref name="version"/> is expected to satisfy <paramref name="range"/>.</param>
+    [Theory]
+    [InlineData("1.0.0", "1.0.0", true)]   // bare version is a minimum-inclusive bound
+    [InlineData("1.0.0", "1.5.0", true)]
+    [InlineData("1.0.0", "0.9.0", false)]
+    [InlineData("[1.0.0]", "1.0.0", true)] // exact
+    [InlineData("[1.0.0]", "1.0.1", false)]
+    [InlineData("[1.0.0,2.0.0)", "1.5.0", true)]
+    [InlineData("[1.0.0,2.0.0)", "2.0.0", false)] // upper exclusive
+    [InlineData("[1.0.0,2.0.0]", "2.0.0", true)]  // upper inclusive
+    [InlineData("(1.0.0,)", "1.0.0", false)]      // lower exclusive
+    [InlineData("(1.0.0,)", "1.0.1", true)]
+    [InlineData("(,2.0.0]", "1.0.0", true)]
+    [InlineData("(,2.0.0]", "2.0.1", false)]
+    public void Satisfies_evaluates_ranges(string range, string version, bool expected)
+    {
+        // Each row supplies its own inputs (arrange) and expected outcome (assert); the call is the act.
+        Assert.Equal(expected, VersionRange.Satisfies(range, version));
+    }
+
+    /// <summary>
+    /// Verifies SemVer precedence between a release and its prerelease: a prerelease ranks below the
+    /// matching release.
+    /// </summary>
+    [Fact]
+    public void Satisfies_release_outranks_prerelease_of_same_version()
+    {
+        // A prerelease is lower precedence than its release, so it falls below a min-inclusive bound.
+        Assert.Equal(false, VersionRange.Satisfies("1.0.0", "1.0.0-alpha"));
+
+        // A release satisfies a prerelease lower bound (release > prerelease of the same version).
+        Assert.Equal(true, VersionRange.Satisfies("1.0.0-alpha", "1.0.0"));
+
+        // A higher release still satisfies even when it carries a prerelease tag, because its release
+        // components (1.2.3) already exceed the bound.
+        Assert.Equal(true, VersionRange.Satisfies("1.0.0", "1.2.3-preview.1"));
+    }
+
+    /// <summary>
+    /// Verifies prerelease-identifier precedence: numeric identifiers compare numerically and rank
+    /// below alphanumeric ones, and a larger identifier set outranks a smaller prefix.
+    /// </summary>
+    /// <param name="range">The declared version range.</param>
+    /// <param name="version">The concrete version under test.</param>
+    /// <param name="expected">Whether <paramref name="version"/> is expected to satisfy <paramref name="range"/>.</param>
+    [Theory]
+    [InlineData("[1.0.0-alpha,1.0.0]", "1.0.0-beta", true)]   // alpha < beta < release
+    [InlineData("[1.0.0-alpha.1,)", "1.0.0-alpha.2", true)]   // numeric identifier ordering
+    [InlineData("[1.0.0-alpha.2,)", "1.0.0-alpha.1", false)]
+    [InlineData("[1.0.0-alpha,)", "1.0.0-alpha.1", true)]     // larger identifier set ranks higher
+    [InlineData("[1.0.0-alpha,)", "1.0.0-1", false)]          // numeric ranks below alphanumeric
+    public void Satisfies_orders_prerelease_identifiers(string range, string version, bool expected)
+    {
+        Assert.Equal(expected, VersionRange.Satisfies(range, version));
+    }
+
+    /// <summary>
+    /// Verifies that build metadata (the <c>+</c> suffix) is ignored, matching SemVer/NuGet, so it
+    /// never changes whether a version satisfies a range.
+    /// </summary>
+    [Fact]
+    public void Satisfies_ignores_build_metadata()
+    {
+        // "+abc123" / "+build.5" must not affect precedence, so the version still matches an exact
+        // pin and a minimum bound respectively.
+        Assert.Equal(true, VersionRange.Satisfies("[1.0.0]", "1.0.0+abc123"));
+        Assert.Equal(true, VersionRange.Satisfies("1.0.0", "1.0.0+build.5"));
+    }
+
+    /// <summary>
+    /// Verifies that malformed or unparseable ranges/versions return <see langword="null"/> rather
+    /// than throwing, so callers can safely skip them.
+    /// </summary>
+    /// <param name="range">The declared version range.</param>
+    /// <param name="version">The concrete version under test.</param>
+    [Theory]
+    [InlineData("[", "1.0.0")]            // opening bracket with no closing delimiter
+    [InlineData("(", "1.0.0")]            // opening paren with no closing delimiter
+    [InlineData("[1.0.0", "1.0.0")]       // missing closing delimiter
+    [InlineData("(1.0.0", "1.0.0")]       // missing closing delimiter
+    [InlineData("[1..0]", "1.0.0")]       // empty release component in the range
+    [InlineData("1.0.0", "1..0")]         // empty release component in the version
+    [InlineData("1.0.0", "1.0.0-")]       // trailing hyphen: empty prerelease
+    [InlineData("1.0.0", "1.0.0-alpha..1")] // empty prerelease identifier
+    [InlineData("(1.0.0)", "1.0.0")]     // exact pin must be [..]; (..) is malformed
+    [InlineData("(1.0.0]", "1.0.0")]     // mismatched exact-pin delimiters
+    [InlineData("[1.0.0)", "1.0.0")]     // mismatched exact-pin delimiters
+    public void Satisfies_returns_null_for_malformed_input(string range, string version)
+    {
+        Assert.Null(VersionRange.Satisfies(range, version));
+    }
+
+    /// <summary>
+    /// Verifies that an absent range is treated as "no constraint" by returning <see langword="null"/>
+    /// (the caller must not treat this as a failure).
+    /// </summary>
+    [Fact]
+    public void Satisfies_returns_null_for_empty_range()
+    {
+        Assert.Null(VersionRange.Satisfies(null, "1.0.0"));
+        Assert.Null(VersionRange.Satisfies("", "1.0.0"));
+    }
+
+    /// <summary>
+    /// Verifies that versions with different component counts compare correctly, with missing
+    /// trailing components treated as zero (for example <c>1.0</c> equals <c>1.0.0.0</c>).
+    /// </summary>
+    [Fact]
+    public void Satisfies_treats_missing_components_as_zero()
+    {
+        Assert.Equal(true, VersionRange.Satisfies("1.0", "1.0.0.0"));
+        Assert.Equal(true, VersionRange.Satisfies("[1.0]", "1.0.0"));
+    }
+}

From 36f4f94e3de73849ff795fcb142f0d2d7a624334 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 20 Jul 2026 12:12:09 -0700
Subject: [PATCH 194/298] Introduce new performance benchmark runners (#4447)

---
 BUILDGUIDE.md                                 |  49 ++-
 .../tests/Directory.Packages.props            |   1 +
 .../AsyncLargeDataReadRunner.cs               | 119 ++++++++
 .../BeginTransactionRunner.cs                 |  86 ++++++
 .../CancellationTokenReadAsyncRunner.cs       | 119 ++++++++
 .../ConnectionPoolStressRunner.cs             | 282 ++++++++++++++++++
 .../JsonVsVarcharReadRunner.cs                | 150 ++++++++++
 .../BenchmarkRunners/MarsOverheadRunner.cs    |  74 +++++
 .../ParallelAsyncConnectionRunner.cs          |  54 ++++
 .../SequentialXmlReadRunner.cs                |  98 ++++++
 .../Config/BenchmarkConfig.cs                 |  58 +++-
 .../tests/PerformanceTests/Config/Config.cs   |  15 +-
 ...oft.Data.SqlClient.PerformanceTests.csproj |  10 +-
 .../tests/PerformanceTests/Program.cs         | 136 ++++++++-
 .../tests/PerformanceTests/runnerconfig.json  |  46 ---
 .../tests/PerformanceTests/runnerconfig.jsonc | 125 ++++++++
 16 files changed, 1330 insertions(+), 92 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/AsyncLargeDataReadRunner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/BeginTransactionRunner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/CancellationTokenReadAsyncRunner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolStressRunner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/JsonVsVarcharReadRunner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/MarsOverheadRunner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ParallelAsyncConnectionRunner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/SequentialXmlReadRunner.cs
 delete mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.json
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc

diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 12a91935cc..6298bbc9eb 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -451,13 +451,14 @@ $ sqlcmd -S localhost -U sa -P password
 1> quit
 ```
 
-The default `runnerconfig.json` expects a database named `sqlclient-perf-db`,
-but you may change the config to use any existing database.  All tables in
-the database will be dropped when running the benchmarks.
+The default `runnerconfig.jsonc` expects a database named `sqlclient-perf-db`,
+but you may change the config to use any existing database.  The benchmarks
+create and drop their own tables (typically prefixed with `perf_`) in this
+database; other existing tables are left untouched.
 
 ### Configure Runner
 
-Configure the benchmarks by editing the `runnerconfig.json` file directly in the
+Configure the benchmarks by editing the `runnerconfig.jsonc` file directly in the
 `PerformanceTests` directory with an appropriate connection string and benchmark
 settings:
 
@@ -465,6 +466,9 @@ settings:
 {
   "ConnectionString": "Server=tcp:localhost; Integrated Security=true; Initial Catalog=sqlclient-perf-db;",
   "UseManagedSniOnWindows": false,
+  "UseOptimizedAsyncBehaviour": true,
+  "WaitForProfiler": false,
+  "UseNativeMemoryAndETWProfiler": false,
   "Benchmarks":
   {
     "SqlConnectionRunnerConfig":
@@ -484,36 +488,51 @@ settings:
 Individual benchmarks may be enabled or disabled, and each has several
 benchmarking options for fine tuning.
 
-After making edits to `runnerconfig.json` you must perform a build which will
+The top-level flags control global runner behavior:
+
+| Flag | Description |
+| --- | --- |
+| `UseManagedSniOnWindows` | Enables the managed SNI implementation on Windows instead of native SNI. |
+| `UseOptimizedAsyncBehaviour` | Enables packet multiplexing and other async optimizations in SqlClient. |
+| `WaitForProfiler` | Pauses at startup and prints the process ID so you can attach an external profiler (e.g. `dotnet-trace`) before benchmarks run. |
+| `UseNativeMemoryAndETWProfiler` | Attaches the `NativeMemoryProfiler` and `EtwProfiler` BenchmarkDotNet diagnosers. Windows only; has no effect on other OSes. |
+
+Some benchmarks (e.g. `DataTypeReaderRunner`, `DataTypeReaderAsyncRunner`) also
+read per-type test values from `datatypes.json` in the `PerformanceTests`
+directory. Like `runnerconfig.jsonc`, this file's location can be overridden
+with the `DATATYPES_CONFIG` environment variable.
+
+After making edits to `runnerconfig.jsonc` you must perform a build which will
 copy the file into the `artifacts` directory alongside the benchmark DLL.  By
-default, the benchmarks look for `runnerconfig.json` in the same directory as
+default, the benchmarks look for `runnerconfig.jsonc` in the same directory as
 the DLL.
 
 Optionally, to avoid polluting your git workspace and requiring a build after
-each config change, copy `runnerconfig.json` to a new file, make your edits
+each config change, copy `runnerconfig.jsonc` to a new file, make your edits
 there, and then specify the new file with the RUNNER_CONFIG environment
-variable.
+variable. The same approach works for `datatypes.json` via the
+`DATATYPES_CONFIG` environment variable.
 
 PowerShell:
 
 ```pwsh
-> copy runnerconfig.json $HOME\.configs\runnerconfig.json
+> copy runnerconfig.jsonc $HOME\.configs\runnerconfig.jsonc
 
-# Make edits to $HOME\.configs\runnerconfig.json
+# Make edits to $HOME\.configs\runnerconfig.jsonc
 
 # You must set the RUNNER_CONFIG environment variable for the current shell.
-> $env:RUNNER_CONFIG="${HOME}\.configs\runnerconfig.json"
+> $env:RUNNER_CONFIG="${HOME}\.configs\runnerconfig.jsonc"
 ```
 
 Bash:
 
 ```bash
-$ cp runnerconfig.json ~/.configs/runnerconfig.json
+$ cp runnerconfig.jsonc ~/.configs/runnerconfig.jsonc
 
-# Make edits to ~/.configs/runnerconfig.json
+# Make edits to ~/.configs/runnerconfig.jsonc
 
 # Optionally export RUNNER_CONFIG.
-$ export RUNNER_CONFIG=~/.configs/runnerconfig.json
+$ export RUNNER_CONFIG=~/.configs/runnerconfig.jsonc
 ```
 
 ### Run Benchmarks
@@ -533,5 +552,5 @@ Bash:
 # copy prepared by the build.
 $ dotnet run -c Release -f net9.0
 
-$ RUNNER_CONFIG=~/.configs/runnerconfig.json dotnet run -c Release -f net9.0
+$ RUNNER_CONFIG=~/.configs/runnerconfig.jsonc dotnet run -c Release -f net9.0
 ```
diff --git a/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props b/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
index 4f3dbacb21..54596a729f 100644
--- a/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
+++ b/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
@@ -14,6 +14,7 @@
   <!-- SqlClient test dependencies. -->
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
+    <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.8" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.13" />
     <PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="181.15.0" />
     <PackageVersion Include="Microsoft.SqlServer.Types" Version="170.1000.7" />
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/AsyncLargeDataReadRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/AsyncLargeDataReadRunner.cs
new file mode 100644
index 0000000000..851b5b8d66
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/AsyncLargeDataReadRunner.cs
@@ -0,0 +1,119 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Benchmarks for sync vs async reading of large VARBINARY(MAX) values.
+    /// Reproduces issues #593 and #1562.
+    /// </summary>
+    public class AsyncLargeDataReadRunner : BaseRunner
+    {
+        private string _tableName;
+        private string _connectionString;
+
+        /// <summary>
+        /// Size of the data to read in bytes.
+        /// </summary>
+        [Params(1_048_576, 5_242_880, 10_485_760, 20_971_520)]
+        public int DataSizeBytes { get; set; }
+
+        /// <summary>
+        /// Size of the client-side read buffer used to drain the VARBINARY(MAX) column.
+        /// Kept small (8 KB) and large (1 MB) to observe whether buffer size relative to
+        /// the payload materially changes throughput.
+        /// </summary>
+        [Params(8_192, 1_048_576)]
+        public int ReadBufferBytes { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _connectionString = s_config.ConnectionString;
+            string machineHash = ((uint)Environment.MachineName.GetHashCode()).ToString("x8");
+            _tableName = $"[perf_AsyncLargeData_{machineHash}_{Guid.NewGuid():N}]";
+
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+
+            using var createCmd = new SqlCommand(
+                $"CREATE TABLE {_tableName} (Id INT IDENTITY PRIMARY KEY, Data VARBINARY(MAX))", conn);
+            createCmd.ExecuteNonQuery();
+
+            // Generate the payload entirely server-side via CRYPT_GEN_RANDOM so we don't
+            // allocate a multi-megabyte byte[] on the client and don't ship the payload
+            // over the wire just to seed the benchmark.
+            using var insertCmd = new SqlCommand(
+                $@"INSERT INTO {_tableName} (Data)
+                   SELECT SUBSTRING(
+                       CONVERT(
+                           varbinary(max),
+                           REPLICATE(
+                               CONVERT(varchar(max), CRYPT_GEN_RANDOM(8000), 2),
+                               (@dataSizeBytes + 7999) / 8000
+                           ),
+                           2
+                       ),
+                       1,
+                       @dataSizeBytes
+                   );", conn);
+            insertCmd.Parameters.Add("@dataSizeBytes", SqlDbType.Int).Value = DataSizeBytes;
+            insertCmd.ExecuteNonQuery();
+        }
+
+        [GlobalCleanup]
+        public void Cleanup()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+            using var cmd = new SqlCommand($"DROP TABLE IF EXISTS {_tableName}", conn);
+            cmd.ExecuteNonQuery();
+            SqlConnection.ClearAllPools();
+        }
+
+        [Benchmark]
+        public void ReadLargeDataSync()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+            using var cmd = new SqlCommand($"SELECT Data FROM {_tableName}", conn);
+            using var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess);
+            while (reader.Read())
+            {
+                byte[] buffer = new byte[ReadBufferBytes];
+                long offset = 0;
+                long bytesRead;
+                do
+                {
+                    bytesRead = reader.GetBytes(0, offset, buffer, 0, buffer.Length);
+                    offset += bytesRead;
+                } while (bytesRead > 0);
+            }
+        }
+
+        [Benchmark]
+        public async Task ReadLargeDataAsync()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            await conn.OpenAsync();
+            using var cmd = new SqlCommand($"SELECT Data FROM {_tableName}", conn);
+            using var reader = await cmd.ExecuteReaderAsync(CommandBehavior.SequentialAccess);
+            while (await reader.ReadAsync())
+            {
+                using var stream = reader.GetStream(0);
+                byte[] buffer = new byte[ReadBufferBytes];
+                int bytesRead;
+                do
+                {
+                    bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length);
+                } while (bytesRead > 0);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/BeginTransactionRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/BeginTransactionRunner.cs
new file mode 100644
index 0000000000..3a3bded24e
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/BeginTransactionRunner.cs
@@ -0,0 +1,86 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Benchmarks measuring BeginTransaction round-trip latency.
+    /// Reproduces issue #1554.
+    /// </summary>
+    public class BeginTransactionRunner : BaseRunner
+    {
+        private SqlConnection _connection;
+        private string _tableName;
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _connection = new SqlConnection(s_config.ConnectionString);
+            _connection.Open();
+
+            string machineHash = ((uint)Environment.MachineName.GetHashCode()).ToString("x8");
+            _tableName = $"[perf_TxnBench_{machineHash}_{Guid.NewGuid():N}]";
+            using var cmd = new SqlCommand(
+                $"CREATE TABLE {_tableName} (Id INT IDENTITY PRIMARY KEY, Value INT)", _connection);
+            cmd.ExecuteNonQuery();
+        }
+
+        [GlobalCleanup]
+        public void Cleanup()
+        {
+            using var cmd = new SqlCommand($"DROP TABLE IF EXISTS {_tableName}", _connection);
+            cmd.ExecuteNonQuery();
+            _connection.Close();
+            _connection.Dispose();
+            SqlConnection.ClearAllPools();
+        }
+
+        // Truncate the table between iterations so every iteration inserts into an empty
+        // table. Without this, the table grows across iterations (and across benchmarks,
+        // since they share the same connection/table), which would skew the measured
+        // BeginTransaction overhead as row count increases.
+        [IterationCleanup]
+        public void IterationCleanup()
+        {
+            using var cmd = new SqlCommand($"TRUNCATE TABLE {_tableName}", _connection);
+            cmd.ExecuteNonQuery();
+        }
+
+        [Benchmark]
+        public void WithTransaction()
+        {
+            using var txn = _connection.BeginTransaction();
+            using var cmd = new SqlCommand($"INSERT INTO {_tableName} (Value) VALUES (1)", _connection, txn);
+            cmd.ExecuteNonQuery();
+            txn.Commit();
+        }
+
+        [Benchmark]
+        public void WithoutTransaction()
+        {
+            using var cmd = new SqlCommand($"INSERT INTO {_tableName} (Value) VALUES (1)", _connection);
+            cmd.ExecuteNonQuery();
+        }
+
+        [Benchmark]
+        public async Task WithTransactionAsync()
+        {
+            using var txn = (SqlTransaction)await _connection.BeginTransactionAsync();
+            using var cmd = new SqlCommand($"INSERT INTO {_tableName} (Value) VALUES (1)", _connection, txn);
+            await cmd.ExecuteNonQueryAsync();
+            await txn.CommitAsync();
+        }
+
+        [Benchmark]
+        public async Task WithoutTransactionAsync()
+        {
+            using var cmd = new SqlCommand($"INSERT INTO {_tableName} (Value) VALUES (1)", _connection);
+            await cmd.ExecuteNonQueryAsync();
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/CancellationTokenReadAsyncRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/CancellationTokenReadAsyncRunner.cs
new file mode 100644
index 0000000000..aa632503fc
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/CancellationTokenReadAsyncRunner.cs
@@ -0,0 +1,119 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Benchmarks measuring CancellationToken overhead during ReadAsync iteration.
+    /// Reproduces issue #2408.
+    /// </summary>
+    public class CancellationTokenReadAsyncRunner : BaseRunner
+    {
+        private static long s_rowCount;
+        private string _tableName;
+        private string _connectionString;
+        private string _query;
+        private CancellationTokenSource _cts;
+        private CancellationToken _token;
+
+        /// <summary>
+        /// Whether to pass a CancellationToken to ReadAsync.
+        /// </summary>
+        [Params(true, false)]
+        public bool UseCancellationToken { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            s_rowCount = s_config.Benchmarks.CancellationTokenReadAsyncRunnerConfig.RowCount;
+            _connectionString = s_config.ConnectionString;
+            string machineHash = ((uint)Environment.MachineName.GetHashCode()).ToString("x8");
+            _tableName = $"[perf_CancelToken_{machineHash}_{Guid.NewGuid():N}]";
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+
+            using var createCmd = new SqlCommand(
+                $"CREATE TABLE {_tableName} (Id INT IDENTITY PRIMARY KEY, Value INT)", conn);
+            createCmd.ExecuteNonQuery();
+
+            // Bulk insert rows
+            using var bulkCopy = new SqlBulkCopy(conn)
+            {
+                DestinationTableName = _tableName,
+                BatchSize = 10000
+            };
+
+            var dt = new System.Data.DataTable();
+            dt.Columns.Add("Value", typeof(int));
+            for (int i = 0; i < s_rowCount; i++)
+            {
+                dt.Rows.Add(i * 2);
+            }
+            bulkCopy.ColumnMappings.Add("Value", "Value");
+            bulkCopy.WriteToServer(dt);
+
+            _query = $"SELECT Id, Value FROM {_tableName}";
+        }
+
+        [GlobalCleanup]
+        public void Cleanup()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+            using var cmd = new SqlCommand($"DROP TABLE IF EXISTS {_tableName}", conn);
+            cmd.ExecuteNonQuery();
+            SqlConnection.ClearAllPools();
+        }
+
+        // Allocate the CancellationTokenSource in [IterationSetup] / dispose it in
+        // [IterationCleanup] so the CTS alloc/dispose cost is excluded from the measurement
+        // and only the per-row ReadAsync(CancellationToken) overhead is captured.
+        [IterationSetup]
+        public void IterationSetup()
+        {
+            if (UseCancellationToken)
+            {
+                _cts = new CancellationTokenSource();
+                _token = _cts.Token;
+            }
+            else
+            {
+                _cts = null;
+                _token = CancellationToken.None;
+            }
+        }
+
+        [IterationCleanup]
+        public void IterationCleanup()
+        {
+            _cts?.Dispose();
+            _cts = null;
+        }
+
+        [Benchmark]
+        public async Task ReadAsyncWithOrWithoutToken()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            await conn.OpenAsync();
+            using var cmd = new SqlCommand(_query, conn);
+            using var reader = await cmd.ExecuteReaderAsync();
+
+            if (UseCancellationToken)
+            {
+                while (await reader.ReadAsync(_token))
+                { }
+            }
+            else
+            {
+                while (await reader.ReadAsync())
+                { }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolStressRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolStressRunner.cs
new file mode 100644
index 0000000000..9dad6f41d0
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolStressRunner.cs
@@ -0,0 +1,282 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Stress-tests the connection pool with randomized parallel access patterns:
+    /// - Massive concurrent open/close churn
+    /// - Randomized hold durations simulating real workloads
+    /// - Mixed sync/async callers competing for pooled connections
+    /// - Connection reuse with interleaved queries
+    /// - Pool exhaustion and recovery under pressure
+    ///
+    /// Related issues: #601, #979, #3356
+    /// </summary>
+    public class ConnectionPoolStressRunner : BaseRunner
+    {
+        private string _connectionString;
+        private string _tableName;
+
+        /// <summary>
+        /// Number of concurrent tasks hammering the pool.
+        /// </summary>
+        [Params(10, 20, 25)]
+        public int Parallelism { get; set; }
+
+        /// <summary>
+        /// Max pool size — controls how many physical connections the pool can hold.
+        /// When Parallelism exceeds this, tasks must wait for a free connection.
+        /// </summary>
+        [Params(50, 100)]
+        public int MaxPoolSize { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _connectionString = s_config.ConnectionString +
+                $";Pooling=True;Max Pool Size={MaxPoolSize};Min Pool Size=5;Connect Timeout=60";
+
+            // Create a small table for query workloads.
+            // Hash the machine name instead of using it verbatim: hostnames can be long enough
+            // to push the identifier past SQL Server's 128-character limit. Cast to uint rather
+            // than using Math.Abs, which throws OverflowException when the hash is int.MinValue.
+            string machineHash = ((uint)Environment.MachineName.GetHashCode()).ToString("x8");
+            _tableName = $"[perf_PoolStress_{machineHash}_{Guid.NewGuid():N}]";
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+            using var cmd = new SqlCommand(
+                $"CREATE TABLE {_tableName} (Id INT IDENTITY PRIMARY KEY, Val INT)", conn);
+            cmd.ExecuteNonQuery();
+
+            // Seed a few rows so SELECT queries return data
+            using var insert = new SqlCommand(
+                $"INSERT INTO {_tableName} (Val) VALUES (1),(2),(3),(4),(5)", conn);
+            insert.ExecuteNonQuery();
+        }
+
+        [IterationCleanup]
+        public void IterationCleanup()
+        {
+            SqlConnection.ClearAllPools();
+        }
+
+        [GlobalCleanup]
+        public void Cleanup()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+            using var cmd = new SqlCommand($"DROP TABLE IF EXISTS {_tableName}", conn);
+            cmd.ExecuteNonQuery();
+            conn.Close();
+            SqlConnection.ClearAllPools();
+        }
+
+        /// <summary>
+        /// Pure open/close churn — every task opens a pooled connection, immediately closes it,
+        /// and repeats. Measures raw pool checkout/return throughput under contention.
+        /// The per-task loop count scales with MaxPoolSize so total checkouts stay proportional
+        /// to pool capacity regardless of how the [Params] values change.
+        /// </summary>
+        [Benchmark]
+        public async Task RapidFireOpenClose()
+        {
+            int iterationsPerTask = Math.Max(20, MaxPoolSize / Math.Max(1, Parallelism) * 4);
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                tasks[i] = Task.Run(async () =>
+                {
+                    for (int j = 0; j < iterationsPerTask; j++)
+                    {
+                        using var conn = new SqlConnection(_connectionString);
+                        await conn.OpenAsync();
+                        // immediate return to pool
+                    }
+                });
+            }
+            await Task.WhenAll(tasks);
+        }
+
+        /// <summary>
+        /// Randomized hold — each task opens a connection, holds it for a random duration
+        /// (0-50ms), optionally runs a query, then returns it. Simulates realistic mixed
+        /// workloads where some connections are held briefly and others longer.
+        /// </summary>
+        [Benchmark]
+        public async Task RandomizedHoldAndQuery()
+        {
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                int seed = i;
+                tasks[i] = Task.Run(async () =>
+                {
+                    var rng = new Random(seed);
+                    for (int j = 0; j < 10; j++)
+                    {
+                        using var conn = new SqlConnection(_connectionString);
+                        await conn.OpenAsync();
+
+                        // ~50% of the time, execute a lightweight query while holding the connection
+                        if (rng.Next(2) == 0)
+                        {
+                            using var cmd = new SqlCommand($"SELECT TOP 1 Val FROM {_tableName}", conn);
+                            _ = await cmd.ExecuteScalarAsync();
+                        }
+
+                        // Random hold time: 0-50ms
+                        int holdMs = rng.Next(51);
+                        if (holdMs > 0)
+                        {
+                            await Task.Delay(holdMs);
+                        }
+                    }
+                });
+            }
+            await Task.WhenAll(tasks);
+        }
+
+        /// <summary>
+        /// Mixed sync and async — half the tasks use sync Open/ExecuteReader,
+        /// the other half use async. Stresses the pool lock paths that differ
+        /// between sync and async checkout.
+        /// </summary>
+        [Benchmark]
+        public async Task MixedSyncAsyncContention()
+        {
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                bool useAsync = i % 2 == 0;
+                tasks[i] = Task.Run(async () =>
+                {
+                    for (int j = 0; j < 10; j++)
+                    {
+                        using var conn = new SqlConnection(_connectionString);
+                        if (useAsync)
+                        {
+                            await conn.OpenAsync();
+                            using var cmd = new SqlCommand($"SELECT COUNT(*) FROM {_tableName}", conn);
+                            _ = await cmd.ExecuteScalarAsync();
+                        }
+                        else
+                        {
+                            conn.Open();
+                            using var cmd = new SqlCommand($"SELECT COUNT(*) FROM {_tableName}", conn);
+                            _ = cmd.ExecuteScalar();
+                        }
+                    }
+                });
+            }
+            await Task.WhenAll(tasks);
+        }
+
+        /// <summary>
+        /// Connection reuse with multiple commands — each task opens one connection and
+        /// executes many sequential queries before returning it. Measures pool efficiency
+        /// when connections are held for multi-step operations (like EF SaveChanges).
+        /// </summary>
+        [Benchmark]
+        public async Task MultiCommandReuse()
+        {
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                int seed = i;
+                tasks[i] = Task.Run(async () =>
+                {
+                    var rng = new Random(seed);
+                    using var conn = new SqlConnection(_connectionString);
+                    await conn.OpenAsync();
+
+                    // Execute a burst of 5-15 commands on the same connection
+                    int commandCount = rng.Next(5, 16);
+                    for (int c = 0; c < commandCount; c++)
+                    {
+                        using var cmd = new SqlCommand($"SELECT Val FROM {_tableName} WHERE Id = @id", conn);
+                        cmd.Parameters.AddWithValue("@id", rng.Next(1, 6));
+                        using var reader = await cmd.ExecuteReaderAsync();
+                        while (await reader.ReadAsync()) { }
+                    }
+                });
+            }
+            await Task.WhenAll(tasks);
+        }
+
+        /// <summary>
+        /// Pool exhaustion and recovery — spawns more tasks than MaxPoolSize so some must
+        /// wait. Measures how well the pool handles back-pressure when all connections are
+        /// checked out and callers are queued.
+        /// </summary>
+        [Benchmark]
+        public async Task PoolExhaustionRecovery()
+        {
+            // Ensure we exceed pool capacity
+            int taskCount = Math.Max(Parallelism, MaxPoolSize * 2);
+            var tasks = new Task[taskCount];
+            for (int i = 0; i < taskCount; i++)
+            {
+                int seed = i;
+                tasks[i] = Task.Run(async () =>
+                {
+                    var rng = new Random(seed);
+                    using var conn = new SqlConnection(_connectionString);
+                    await conn.OpenAsync();
+
+                    // Hold the connection for 10-100ms to create pool pressure
+                    using var cmd = new SqlCommand($"SELECT TOP 1 Val FROM {_tableName}", conn);
+                    _ = await cmd.ExecuteScalarAsync();
+
+                    await Task.Delay(rng.Next(10, 101));
+                });
+            }
+            await Task.WhenAll(tasks);
+        }
+
+        /// <summary>
+        /// Bursty traffic pattern — sends waves of connections with pauses between bursts,
+        /// simulating real web server traffic patterns where requests cluster. Each burst
+        /// spins up <see cref="Parallelism"/> concurrent tasks so the configured parallelism
+        /// level actually drives the observed concurrency.
+        /// </summary>
+        [Benchmark]
+        public async Task BurstyTrafficPattern()
+        {
+            const int burstCount = 5;
+
+            for (int burst = 0; burst < burstCount; burst++)
+            {
+                var tasks = new Task[Parallelism];
+                for (int i = 0; i < Parallelism; i++)
+                {
+                    int seed = burst * Parallelism + i;
+                    tasks[i] = Task.Run(async () =>
+                    {
+                        var rng = new Random(seed);
+                        using var conn = new SqlConnection(_connectionString);
+                        await conn.OpenAsync();
+
+                        // Each connection in the burst does 1-5 queries
+                        int queryCount = rng.Next(1, 6);
+                        for (int q = 0; q < queryCount; q++)
+                        {
+                            using var cmd = new SqlCommand($"SELECT Val FROM {_tableName}", conn);
+                            using var reader = await cmd.ExecuteReaderAsync();
+                            while (await reader.ReadAsync()) { }
+                        }
+                    });
+                }
+                await Task.WhenAll(tasks);
+
+                // Brief pause between bursts (simulates request clustering)
+                await Task.Delay(5);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/JsonVsVarcharReadRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/JsonVsVarcharReadRunner.cs
new file mode 100644
index 0000000000..7b9533386b
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/JsonVsVarcharReadRunner.cs
@@ -0,0 +1,150 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Benchmarks comparing read performance of JSON vs VARCHAR(MAX) columns.
+    /// Reproduces issue #3499.
+    /// Note: JSON column type requires SQL Server 2025+ or Azure SQL.
+    /// This runner is disabled by default in runnerconfig.jsonc.
+    /// </summary>
+    public class JsonVsVarcharReadRunner : BaseRunner
+    {
+        private static long s_rowCount;
+        private string _jsonTableName;
+        private string _varcharTableName;
+        private string _connectionString;
+
+        /// <summary>
+        /// Which column type to read from: "JSON" or "VARCHAR".
+        /// </summary>
+        [Params("JSON", "VARCHAR")]
+        public string ColumnType { get; set; }
+
+        private string ActiveTableName => ColumnType == "JSON" ? _jsonTableName : _varcharTableName;
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            s_rowCount = s_config.Benchmarks.JsonVsVarcharReadRunnerConfig.RowCount;
+            _connectionString = s_config.ConnectionString;
+
+            string machineHash = ((uint)Environment.MachineName.GetHashCode()).ToString("x8");
+            string suffix = $"{machineHash}_{Guid.NewGuid():N}";
+            _jsonTableName = $"[perf_Json_{suffix}]";
+            _varcharTableName = $"[perf_Varchar_{suffix}]";
+
+            string sampleJson = "{\"id\":1,\"name\":\"test\",\"values\":[1,2,3],\"nested\":{\"key\":\"value\"}}";
+
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+
+            // Create JSON table
+            using (var cmd = new SqlCommand(
+                $"CREATE TABLE {_jsonTableName} (Id INT IDENTITY PRIMARY KEY, Data JSON)", conn))
+            {
+                cmd.ExecuteNonQuery();
+            }
+
+            // Create VARCHAR(MAX) table
+            using (var cmd = new SqlCommand(
+                $"CREATE TABLE {_varcharTableName} (Id INT IDENTITY PRIMARY KEY, Data VARCHAR(MAX))", conn))
+            {
+                cmd.ExecuteNonQuery();
+            }
+
+            // Bulk insert identical data into both tables
+            var dt = new System.Data.DataTable();
+            dt.Columns.Add("Data", typeof(string));
+            for (int i = 0; i < s_rowCount; i++)
+            {
+                dt.Rows.Add(sampleJson);
+            }
+
+            using (var bulkCopy = new SqlBulkCopy(conn) { DestinationTableName = _jsonTableName, BatchSize = 10000 })
+            {
+                bulkCopy.ColumnMappings.Add("Data", "Data");
+                bulkCopy.WriteToServer(dt);
+            }
+
+            using (var bulkCopy = new SqlBulkCopy(conn) { DestinationTableName = _varcharTableName, BatchSize = 10000 })
+            {
+                bulkCopy.ColumnMappings.Add("Data", "Data");
+                bulkCopy.WriteToServer(dt);
+            }
+        }
+
+        [GlobalCleanup]
+        public void Cleanup()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+
+            using (var cmd = new SqlCommand($"DROP TABLE IF EXISTS {_jsonTableName}", conn))
+            {
+                cmd.ExecuteNonQuery();
+            }
+            
+            using (var cmd = new SqlCommand($"DROP TABLE IF EXISTS {_varcharTableName}", conn))
+            {
+                cmd.ExecuteNonQuery();
+            }
+            
+            SqlConnection.ClearAllPools();
+        }
+
+        [Benchmark]
+        public void ReadDataSync()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+            using var cmd = new SqlCommand($"SELECT Data FROM {ActiveTableName}", conn);
+            using var reader = cmd.ExecuteReader();
+            if (ColumnType == "JSON")
+            {
+                // Exercise the SqlJson accessor path so the JSON case captures
+                // JSON-type handling overhead rather than the shared string path.
+                while (reader.Read())
+                {
+                    _ = reader.GetSqlJson(0).Value;
+                }
+            }
+            else
+            {
+                while (reader.Read())
+                {
+                    _ = reader.GetString(0);
+                }
+            }
+        }
+
+        [Benchmark]
+        public async Task ReadDataAsync()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            await conn.OpenAsync();
+            using var cmd = new SqlCommand($"SELECT Data FROM {ActiveTableName}", conn);
+            using var reader = await cmd.ExecuteReaderAsync();
+            if (ColumnType == "JSON")
+            {
+                while (await reader.ReadAsync())
+                {
+                    _ = reader.GetSqlJson(0).Value;
+                }
+            }
+            else
+            {
+                while (await reader.ReadAsync())
+                {
+                    _ = await reader.GetFieldValueAsync<string>(0);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/MarsOverheadRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/MarsOverheadRunner.cs
new file mode 100644
index 0000000000..db0ea313a3
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/MarsOverheadRunner.cs
@@ -0,0 +1,74 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Benchmarks comparing query execution with MARS enabled vs disabled.
+    /// Reproduces issues #422 and #1283.
+    /// </summary>
+    public class MarsOverheadRunner : BaseRunner
+    {
+        private static long s_rowCount;
+        private Table _table;
+        private string _query;
+
+        /// <summary>
+        /// Whether MARS is enabled on the connection string.
+        /// </summary>
+        [Params(true, false)]
+        public bool MARS { get; set; }
+
+        private string ConnectionString => s_config.ConnectionString + $";MultipleActiveResultSets={MARS}";
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            s_rowCount = s_config.Benchmarks.MarsOverheadRunnerConfig.RowCount;
+
+            using var conn = new SqlConnection(s_config.ConnectionString);
+            conn.Open();
+
+            _table = TablePatterns.TableAll25Columns(s_datatypes, nameof(MarsOverheadRunner))
+                .CreateTable(conn)
+                .InsertBulkRows(s_rowCount, conn);
+
+            _query = $"SELECT * FROM {_table.Name}";
+        }
+
+        [GlobalCleanup]
+        public void Cleanup()
+        {
+            using var conn = new SqlConnection(s_config.ConnectionString);
+            conn.Open();
+            _table.DropTable(conn);
+            SqlConnection.ClearAllPools();
+        }
+
+        [Benchmark]
+        public void ExecuteReaderWithMars()
+        {
+            using var conn = new SqlConnection(ConnectionString);
+            conn.Open();
+            using var cmd = new SqlCommand(_query, conn);
+            using var reader = cmd.ExecuteReader();
+            while (reader.Read())
+            { }
+        }
+
+        [Benchmark]
+        public async Task ExecuteReaderAsyncWithMars()
+        {
+            using var conn = new SqlConnection(ConnectionString);
+            await conn.OpenAsync();
+            using var cmd = new SqlCommand(_query, conn);
+            using var reader = await cmd.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+            { }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ParallelAsyncConnectionRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ParallelAsyncConnectionRunner.cs
new file mode 100644
index 0000000000..32516bddad
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ParallelAsyncConnectionRunner.cs
@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Benchmarks for concurrent async connection opens to surface pool contention.
+    /// Reproduces issues #601 and #979.
+    /// </summary>
+    public class ParallelAsyncConnectionRunner : BaseRunner
+    {
+        /// <summary>
+        /// Number of concurrent connections to open.
+        /// </summary>
+        [Params(10, 50, 100)]
+        public int Concurrency { get; set; }
+
+        /// <summary>
+        /// Whether connection pooling is enabled.
+        /// </summary>
+        [Params(true, false)]
+        public bool Pooling { get; set; }
+
+        private string ConnectionString => s_config.ConnectionString + $";Pooling={Pooling};Max Pool Size=200";
+
+        [IterationCleanup]
+        public void IterationCleanup()
+        {
+            SqlConnection.ClearAllPools();
+        }
+
+        [Benchmark]
+        public async Task OpenConnectionsConcurrently()
+        {
+            var tasks = new Task[Concurrency];
+            for (int i = 0; i < Concurrency; i++)
+            {
+                tasks[i] = OpenAndCloseConnectionAsync();
+            }
+            await Task.WhenAll(tasks);
+        }
+
+        private async Task OpenAndCloseConnectionAsync()
+        {
+            using var conn = new SqlConnection(ConnectionString);
+            await conn.OpenAsync();
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/SequentialXmlReadRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/SequentialXmlReadRunner.cs
new file mode 100644
index 0000000000..4d7d15843e
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/SequentialXmlReadRunner.cs
@@ -0,0 +1,98 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data;
+using System.Text;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Benchmarks for XML column reads via SequentialAccess at increasing data sizes
+    /// to detect O(N²) scaling behavior.
+    /// Reproduces issue #1877.
+    /// </summary>
+    public class SequentialXmlReadRunner : BaseRunner
+    {
+        private string _tableName;
+        private string _connectionString;
+        private string _query;
+
+        /// <summary>
+        /// Size of the XML data in kilobytes.
+        /// </summary>
+        [Params(10, 100, 500, 1000)]
+        public int XmlSizeKB { get; set; }
+
+        /// <summary>
+        /// Whether to use CommandBehavior.SequentialAccess.
+        /// </summary>
+        [Params(true, false)]
+        public bool UseSequentialAccess { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _connectionString = s_config.ConnectionString;
+            string machineHash = ((uint)Environment.MachineName.GetHashCode()).ToString("x8");
+            _tableName = $"[perf_SeqXml_{machineHash}_{Guid.NewGuid():N}]";
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+
+            using var createCmd = new SqlCommand(
+                $"CREATE TABLE {_tableName} (Id INT IDENTITY PRIMARY KEY, Data XML)", conn);
+            createCmd.ExecuteNonQuery();
+
+            // Generate XML of approximately XmlSizeKB kilobytes
+            string xmlData = GenerateXml(XmlSizeKB * 1024);
+
+            using var insertCmd = new SqlCommand(
+                $"INSERT INTO {_tableName} (Data) VALUES (@data)", conn);
+            insertCmd.Parameters.Add("@data", SqlDbType.Xml).Value = xmlData;
+            insertCmd.ExecuteNonQuery();
+
+            _query = $"SELECT Data FROM {_tableName}";
+        }
+
+        [GlobalCleanup]
+        public void Cleanup()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+            using var cmd = new SqlCommand($"DROP TABLE IF EXISTS {_tableName}", conn);
+            cmd.ExecuteNonQuery();
+            SqlConnection.ClearAllPools();
+        }
+
+        [Benchmark]
+        public void ReadXml()
+        {
+            var behavior = UseSequentialAccess ? CommandBehavior.SequentialAccess : CommandBehavior.Default;
+
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+            using var cmd = new SqlCommand(_query, conn);
+            using var reader = cmd.ExecuteReader(behavior);
+            while (reader.Read())
+            {
+                _ = reader.GetString(0);
+            }
+        }
+
+        private static string GenerateXml(int targetBytes)
+        {
+            var sb = new StringBuilder(targetBytes + 256);
+            sb.Append("<root>");
+            int index = 0;
+            while (sb.Length < targetBytes)
+            {
+                sb.Append($"<item id=\"{index}\">This is element number {index} with some padding data to increase size.</item>");
+                index++;
+            }
+            sb.Append("</root>");
+            return sb.ToString();
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs
index 6c0bceb6ba..8cd26c8641 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs
@@ -7,25 +7,53 @@
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Toolchains.InProcess.Emit;
+#if WINDOWS
+using BenchmarkDotNet.Diagnostics.Windows.Configs;
+#endif
 
 namespace Microsoft.Data.SqlClient.PerformanceTests
 {
     public static class BenchmarkConfig
     {
-        public static ManualConfig s_instance(RunnerJob runnerJob) => 
-            DefaultConfig.Instance
-            .WithOption(ConfigOptions.DisableOptimizationsValidator, true)
-            .AddDiagnoser(MemoryDiagnoser.Default)
-            .AddDiagnoser(ThreadingDiagnoser.Default)
-            .AddExporter(MarkdownExporter.GitHub)
-            .AddJob(
-                Job.MediumRun.WithToolchain(InProcessEmitToolchain.Instance)
-                .WithLaunchCount(runnerJob.LaunchCount)
-                .WithInvocationCount(runnerJob.InvocationCount)
-                .WithIterationCount(runnerJob.IterationCount)
-                .WithWarmupCount(runnerJob.WarmupCount)
-                .WithUnrollFactor(1)
-                .WithStrategy(BenchmarkDotNet.Engines.RunStrategy.Throughput)
-            );
+        /// <summary>
+        /// When set to true, attaches the NativeMemoryProfiler and EtwProfiler diagnosers
+        /// so native memory allocations and ETW traces are captured for each benchmark run.
+        /// This is only supported on Windows; the value is ignored on other OSes since the
+        /// underlying diagnosers are compiled out (see the "WINDOWS" compile constant, which
+        /// is only set when building on Windows in the PerformanceTests.csproj file).
+        /// </summary>
+        public static bool UseNativeMemoryAndEtwProfiler { get; set; }
+
+        public static ManualConfig s_instance(RunnerJob runnerJob)
+        {
+            ManualConfig config = DefaultConfig.Instance
+                .WithOption(ConfigOptions.DisableOptimizationsValidator, true)
+                .WithOption(ConfigOptions.DontOverwriteResults, true)
+                .AddDiagnoser(MemoryDiagnoser.Default)
+                .AddDiagnoser(ThreadingDiagnoser.Default)
+                .AddExporter(MarkdownExporter.GitHub)
+                .AddJob(
+                    Job.MediumRun.WithToolchain(InProcessEmitToolchain.Instance)
+                    .WithLaunchCount(runnerJob.LaunchCount)
+                    .WithInvocationCount(runnerJob.InvocationCount)
+                    .WithIterationCount(runnerJob.IterationCount)
+                    .WithWarmupCount(runnerJob.WarmupCount)
+                    .WithUnrollFactor(1)
+                    .WithStrategy(BenchmarkDotNet.Engines.RunStrategy.Throughput)
+                    .WithEnvironmentVariable("COMPlus_gcServer", "1")
+                )
+                .WithOptions(ConfigOptions.JoinSummary);
+
+#if WINDOWS
+            if (UseNativeMemoryAndEtwProfiler)
+            {
+                config = config
+                    .AddDiagnoser(NativeMemoryProfiler.Default)
+                    .AddDiagnoser(new EtwProfiler());
+            }
+#endif
+
+            return config;
+        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
index f52fb1b554..7a93f65090 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
@@ -11,6 +11,9 @@ public class Config
     {
         public string ConnectionString;
         public bool UseManagedSniOnWindows;
+        public bool UseOptimizedAsyncBehaviour;
+        public bool WaitForProfiler;
+        public bool UseNativeMemoryAndETWProfiler;
         public Benchmarks Benchmarks;
 
         /// <summary>
@@ -18,7 +21,7 @@ public class Config
         ///
         /// If the environment variable "RUNNER_CONFIG" is set, it will be used
         /// as the path to the config file.  Otherwise, the file
-        /// "runnerconfig.json" in the current working directory will be used.
+        /// "runnerconfig.jsonc" in the current working directory will be used.
         /// </summary>
         ///
         /// <returns>
@@ -32,7 +35,7 @@ public class Config
         public static Config Load()
         {
             return Loader.FromJsonFile<Config>(
-                "runnerconfig.json", "RUNNER_CONFIG");
+                "runnerconfig.jsonc", "RUNNER_CONFIG");
         }
     }
 
@@ -43,6 +46,14 @@ public class Benchmarks
         public RunnerJob SqlBulkCopyRunnerConfig;
         public RunnerJob DataTypeReaderRunnerConfig;
         public RunnerJob DataTypeReaderAsyncRunnerConfig;
+        public RunnerJob AsyncLargeDataReadRunnerConfig;
+        public RunnerJob MarsOverheadRunnerConfig;
+        public RunnerJob ParallelAsyncConnectionRunnerConfig;
+        public RunnerJob CancellationTokenReadAsyncRunnerConfig;
+        public RunnerJob SequentialXmlReadRunnerConfig;
+        public RunnerJob JsonVsVarcharReadRunnerConfig;
+        public RunnerJob BeginTransactionRunnerConfig;
+        public RunnerJob ConnectionPoolStressRunnerConfig;
     }
 
     public class RunnerJob
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
index 2da560b6b7..1986ce68e1 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
@@ -17,7 +17,7 @@
   <!-- Content files to copy to output directory -->
   <ItemGroup>
     <None Include="datatypes.json" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="runnerconfig.json" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="runnerconfig.jsonc" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <!-- References ====================================================== -->
@@ -38,4 +38,12 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
   </ItemGroup>
+
+  <!-- NativeMemoryProfiler relies on ETW and is only supported on Windows. -->
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
+  </ItemGroup>
+  <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
+    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
+  </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
index 8df9d36a3e..8f64c7448a 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
@@ -11,30 +11,77 @@ public class Program
     {
         private readonly Config _config;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Program"/> class, 
+        /// which loads the benchmark configuration and runs the benchmarks.
+        /// </summary>
         public Program()
         {
-            // Load config file
             _config = Config.Load();
-            if (_config.UseManagedSniOnWindows)
-            {
-                AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows", true);
-            }
+            SetupConfigurations();
+            
             Run_SqlConnectionBenchmark();
             Run_SqlCommandBenchmark();
             Run_SqlBulkCopyBenchmark();
             Run_DataTypeReaderBenchmark();
             Run_DataTypeReaderAsyncBenchmark();
+            Run_AsyncLargeDataReadBenchmark();
+            Run_MarsOverheadBenchmark();
+            Run_ParallelAsyncConnectionBenchmark();
+            Run_CancellationTokenReadAsyncBenchmark();
+            Run_SequentialXmlReadBenchmark();
+            Run_JsonVsVarcharReadBenchmark();
+            Run_BeginTransactionBenchmark();
+            Run_ConnectionPoolStressBenchmark();
 
             // TODOs:
-            // Transactions
-            // Insert/Update queries (+CRUD)
             // Prepared/Regular Parameterized queries
-            // DataType Reader Max (large size / max columns / million row tables)
-            // DataType conversions (Implicit)
-            // MARS enabled
             // Always Encrypted
         }
 
+        private void SetupConfigurations()
+        {
+            // If the config file specifies to use managed SNI on Windows, 
+            // enable the appropriate AppContext switch to use the managed SNI implementation.
+            if (_config.UseManagedSniOnWindows)
+            {
+                AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows", true);
+            }
+
+            // If the config file specifies to use optimized async behavior, 
+            // enable packet multiplexing feature and other optimizations in SqlClient 
+            // by setting the appropriate AppContext switches.
+            if(_config.UseOptimizedAsyncBehaviour)
+            {
+                AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.UseCompatibilityAsyncBehaviour", false);
+                AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.UseCompatibilityProcessSni", false);
+            }
+
+            // If the config file specifies to use the NativeMemoryProfiler and ETW profiler,
+            // propagate the setting to BenchmarkConfig so it can attach these Windows-only
+            // diagnosers when building each benchmark's ManualConfig.
+            BenchmarkConfig.UseNativeMemoryAndEtwProfiler = _config.UseNativeMemoryAndETWProfiler;
+
+            // If the config file specifies to wait for a profiler, 
+            // display the process ID and wait for user input before starting the benchmarks.
+            if (_config.WaitForProfiler)
+            {
+                int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
+                Console.WriteLine();
+                Console.WriteLine("===========================================");
+                Console.WriteLine($"  Process ID: {pid}");
+                Console.WriteLine("===========================================");
+                Console.WriteLine();
+                Console.WriteLine("Attach your profiler now. Examples:");
+                Console.WriteLine($"  dotnet-counters monitor -p {pid}");
+                Console.WriteLine($"  dotnet-trace collect -p {pid}");
+                Console.WriteLine();
+                Console.WriteLine("Press any key to start benchmarks...");
+                Console.ReadKey(intercept: true);
+                Console.WriteLine();
+            }
+        }
+
         private void Run_SqlConnectionBenchmark()
         {
             if (_config.Benchmarks.SqlConnectionRunnerConfig?.Enabled == true)
@@ -75,10 +122,73 @@ private void Run_SqlBulkCopyBenchmark()
             }
         }
 
-        public static void Main()
+        private void Run_AsyncLargeDataReadBenchmark()
+        {
+            if (_config.Benchmarks.AsyncLargeDataReadRunnerConfig?.Enabled == true)
+            {
+                BenchmarkRunner.Run<AsyncLargeDataReadRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.AsyncLargeDataReadRunnerConfig));
+            }
+        }
+
+        private void Run_MarsOverheadBenchmark()
+        {
+            if (_config.Benchmarks.MarsOverheadRunnerConfig?.Enabled == true)
+            {
+                BenchmarkRunner.Run<MarsOverheadRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.MarsOverheadRunnerConfig));
+            }
+        }
+
+        private void Run_ParallelAsyncConnectionBenchmark()
         {
-            // Run the benchmarks.
-            new Program();
+            if (_config.Benchmarks.ParallelAsyncConnectionRunnerConfig?.Enabled == true)
+            {
+                BenchmarkRunner.Run<ParallelAsyncConnectionRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.ParallelAsyncConnectionRunnerConfig));
+            }
+        }
+
+        private void Run_CancellationTokenReadAsyncBenchmark()
+        {
+            if (_config.Benchmarks.CancellationTokenReadAsyncRunnerConfig?.Enabled == true)
+            {
+                BenchmarkRunner.Run<CancellationTokenReadAsyncRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.CancellationTokenReadAsyncRunnerConfig));
+            }
+        }
+
+        private void Run_SequentialXmlReadBenchmark()
+        {
+            if (_config.Benchmarks.SequentialXmlReadRunnerConfig?.Enabled == true)
+            {
+                BenchmarkRunner.Run<SequentialXmlReadRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.SequentialXmlReadRunnerConfig));
+            }
+        }
+
+        private void Run_JsonVsVarcharReadBenchmark()
+        {
+            if (_config.Benchmarks.JsonVsVarcharReadRunnerConfig?.Enabled == true)
+            {
+                BenchmarkRunner.Run<JsonVsVarcharReadRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.JsonVsVarcharReadRunnerConfig));
+            }
+        }
+
+        private void Run_BeginTransactionBenchmark()
+        {
+            if (_config.Benchmarks.BeginTransactionRunnerConfig?.Enabled == true)
+            {
+                BenchmarkRunner.Run<BeginTransactionRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.BeginTransactionRunnerConfig));
+            }
         }
+
+        private void Run_ConnectionPoolStressBenchmark()
+        {
+            if (_config.Benchmarks.ConnectionPoolStressRunnerConfig?.Enabled == true)
+            {
+                BenchmarkRunner.Run<ConnectionPoolStressRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.ConnectionPoolStressRunnerConfig));
+            }
+        }
+
+        /// <summary>
+        /// The main entry point for the performance tests program.
+        /// </summary>
+        public static void Main() => _ = new Program();
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.json b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.json
deleted file mode 100644
index 47d1736127..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "ConnectionString": "Server=tcp:localhost; Integrated Security=true; Initial Catalog=sqlclient-perf-db;",
-    "UseManagedSniOnWindows": false,
-    "Benchmarks": {
-        "SqlConnectionRunnerConfig": {
-            "Enabled": true,
-            "LaunchCount": 1,
-            "IterationCount": 50,
-            "InvocationCount":30,
-            "WarmupCount": 5,
-            "RowCount": 0
-        },
-        "SqlCommandRunnerConfig": {
-            "Enabled": true,
-            "LaunchCount": 1,
-            "IterationCount": 10,
-            "InvocationCount": 2,
-            "WarmupCount": 1,
-            "RowCount": 10000
-        },
-        "SqlBulkCopyRunnerConfig": {
-            "Enabled": true,
-            "LaunchCount": 1,
-            "IterationCount": 10,
-            "InvocationCount": 1,
-            "WarmupCount": 1,
-            "RowCount": 10000
-        },
-        "DataTypeReaderRunnerConfig": {
-            "Enabled": true,
-            "LaunchCount": 1,
-            "IterationCount": 20,
-            "InvocationCount": 2,
-            "WarmupCount": 1,
-            "RowCount": 1000
-        },
-        "DataTypeReaderAsyncRunnerConfig": {
-            "Enabled": true,
-            "LaunchCount": 1,
-            "IterationCount": 20,
-            "InvocationCount": 2,
-            "WarmupCount": 1,
-            "RowCount": 1000
-        }
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
new file mode 100644
index 0000000000..34d7a511aa
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
@@ -0,0 +1,125 @@
+{
+    "ConnectionString": "Server=tcp:localhost; Integrated Security=true; Initial Catalog=sqlclient-perf-db;",
+    // Enable this flag to enable managed SNI on Windows.
+    "UseManagedSniOnWindows": false,
+    // Enable this flag to enable optimized async behavior in SqlClient. 
+    // This is useful for benchmarking packet multiplexing and async performance improvements.
+    "UseOptimizedAsyncBehaviour": true,
+    // Enable this flag to get prompted to attach a profiler when running the performance tests.
+    // This is useful for capturing event source traces when running a performance test on any OS.
+    // On Windows, you can also set UseNativeMemoryAndETWProfiler=true to attach ETW diagnosers automatically.
+    "WaitForProfiler": false,
+    // Enable this flag to enable the NativeMemoryProfiler and ETW profiler on Windows (only).
+    // This is useful for capturing native memory allocation traces when running a performance test on Windows.
+    // Note: This flag cannot be enabled on non-Windows OSes as the NativeMemoryProfiler is not supported on non-Windows OSes.
+    "UseNativeMemoryAndETWProfiler": false,
+    // This section contains the configuration for each benchmark.
+    // You can enable/disable benchmarks and configure the number of iterations, invocations, 
+    // warmup runs, and row count for each benchmark.
+    "Benchmarks": {
+        "SqlConnectionRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 50,
+            "InvocationCount":30,
+            "WarmupCount": 5,
+            "RowCount": 0
+        },
+        "SqlCommandRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 2,
+            "WarmupCount": 1,
+            "RowCount": 10000
+        },
+        "SqlBulkCopyRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 10000
+        },
+        "DataTypeReaderRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 2,
+            "WarmupCount": 1,
+            "RowCount": 1000
+        },
+        "DataTypeReaderAsyncRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 2,
+            "WarmupCount": 1,
+            "RowCount": 1000
+        },
+        "AsyncLargeDataReadRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 0
+        },
+        "MarsOverheadRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 1000
+        },
+        "ParallelAsyncConnectionRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 0
+        },
+        "CancellationTokenReadAsyncRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 10000
+        },
+        "SequentialXmlReadRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 0
+        },
+        "JsonVsVarcharReadRunnerConfig": {
+            "Enabled": false,
+            "LaunchCount": 1,
+            "IterationCount": 100,
+            "InvocationCount": 1,
+            "WarmupCount": 5,
+            "RowCount": 10000
+        },
+        "BeginTransactionRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 2,
+            "WarmupCount": 1,
+            "RowCount": 0
+        },
+        "ConnectionPoolStressRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 20,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 0
+        }
+    }
+}

From 71086453e251f6abadca9d28d2081beee5f19ce3 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Mon, 20 Jul 2026 23:00:41 +0100
Subject: [PATCH 195/298] Feature | Add scaffolding for SSRP response parsing
 (#3741)

* Add scaffolding for SSRP response parsing

This consists of:
* ReadOnlySequenceSegment derivative,
* Utilities to read data from a ReadOnlySequence<byte>
* Test cases

* Replace ActiveIssue attributes with [Theory(Skip = "...")]

* Formatting changes

Lifted some constant string components to constants.
Newline formatting.
Where possible, used expression body.

* Naming convention changes

* Parameter line chopping

* Respond to code review

Correct screaming snake case method.
Correct ensure that test case provides a zero-length Version field (not an absent one.)

* Add SSRP parsing test cases

---------

Co-authored-by: Ben Russell <russellben@microsoft.com>
---
 .../src/Microsoft/Data/Common/PacketBuffer.cs |  31 +
 .../Data/Common/ReadOnlySequenceUtilities.cs  |  92 +++
 .../System/Diagnostics/CodeAnalysis.netfx.cs  |   8 +
 .../Data/Sql/DacResponseProcessorTest.cs      |  33 +
 .../Sql/SqlDataSourceResponseProcessorTest.cs |  56 ++
 .../Microsoft/Data/Sql/SsrpPacketTestData.cs  | 738 ++++++++++++++++++
 6 files changed, 958 insertions(+)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/PacketBuffer.cs
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ReadOnlySequenceUtilities.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/DacResponseProcessorTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/SqlDataSourceResponseProcessorTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/SsrpPacketTestData.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/PacketBuffer.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/PacketBuffer.cs
new file mode 100644
index 0000000000..079c2933a5
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/PacketBuffer.cs
@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Buffers;
+
+#nullable enable
+
+namespace Microsoft.Data.Common;
+
+/// <summary>
+/// One buffer, which may contain one unparsed packet from a single destination.
+/// </summary>
+internal sealed class PacketBuffer : ReadOnlySequenceSegment<byte>
+{
+    public PacketBuffer(ReadOnlyMemory<byte> buffer, PacketBuffer? previous)
+    {
+        Memory = buffer;
+
+        if (previous is not null)
+        {
+            previous.Next = this;
+            RunningIndex = previous.RunningIndex + previous.Memory.Length;
+        }
+        else
+        {
+            RunningIndex = 0;
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ReadOnlySequenceUtilities.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ReadOnlySequenceUtilities.cs
new file mode 100644
index 0000000000..792ca6ddfc
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ReadOnlySequenceUtilities.cs
@@ -0,0 +1,92 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Buffers;
+using System.Buffers.Binary;
+
+namespace Microsoft.Data.Common;
+
+internal static class ReadOnlySequenceUtilities
+{
+    /// <summary>
+    /// Reads the next byte from the sequence, advancing its position by one byte.
+    /// </summary>
+    /// <param name="sequence">The sequence to read and to advance from.</param>
+    /// <param name="currSpan">The first span in the sequence. Reassigned if the next byte can only be read from the next span.</param>
+    /// <param name="currPos">Current position in the sequence. Advanced by one byte following a successful read.</param>
+    /// <param name="value">The <see cref="byte"/> value read from <paramref name="sequence"/>.</param>
+    /// <returns><c>true</c> if <paramref name="sequence"/> was long enough to retrieve the next byte, <c>false</c> otherwise.</returns>
+    public static bool ReadByte(this ref ReadOnlySequence<byte> sequence, ref ReadOnlySpan<byte> currSpan, ref long currPos, out byte value)
+    {
+        if (sequence.Length < sizeof(byte))
+        {
+            value = default;
+            return false;
+        }
+
+        currPos += sizeof(byte);
+        if (currSpan.Length >= sizeof(byte))
+        {
+            value = currSpan[0];
+
+            sequence = sequence.Slice(sizeof(byte));
+            currSpan = currSpan.Slice(sizeof(byte));
+
+            return true;
+        }
+        else
+        {
+            Span<byte> buffer = stackalloc byte[sizeof(byte)];
+
+            sequence.Slice(0, sizeof(byte)).CopyTo(buffer);
+            value = buffer[0];
+
+            sequence = sequence.Slice(sizeof(byte));
+            currSpan = sequence.First.Span;
+
+            return true;
+        }
+    }
+
+    /// <summary>
+    /// Reads the next two bytes from the sequence as a <see cref="ushort"/>, advancing its position by two bytes.
+    /// </summary>
+    /// <param name="sequence">The sequence to read and to advance from.</param>
+    /// <param name="currSpan">The first span in the sequence. Reassigned if the next two bytes can only be read from the next span.</param>
+    /// <param name="currPos">Current position in the sequence. Advanced by two bytes following a successful read.</param>
+    /// <param name="value">The <see cref="ushort"/> value read from <paramref name="sequence"/></param>
+    /// <returns><c>true</c> if <paramref name="sequence"/> was long enough to retrieve the next two bytes, <c>false</c> otherwise.</returns>
+    public static bool ReadLittleEndian(this ref ReadOnlySequence<byte> sequence, ref ReadOnlySpan<byte> currSpan, ref long currPos, out ushort value)
+    {
+        if (sequence.Length < sizeof(ushort))
+        {
+            value = default;
+            return false;
+        }
+
+        currPos += sizeof(ushort);
+        if (currSpan.Length >= sizeof(ushort))
+        {
+            value = BinaryPrimitives.ReadUInt16LittleEndian(currSpan);
+
+            sequence = sequence.Slice(sizeof(ushort));
+            currSpan = currSpan.Slice(sizeof(ushort));
+
+            return true;
+        }
+        else
+        {
+            Span<byte> buffer = stackalloc byte[sizeof(ushort)];
+
+            sequence.Slice(0, sizeof(ushort)).CopyTo(buffer);
+            value = BinaryPrimitives.ReadUInt16LittleEndian(buffer);
+
+            sequence = sequence.Slice(sizeof(ushort));
+            currSpan = sequence.First.Span;
+
+            return true;
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/src/System/Diagnostics/CodeAnalysis.netfx.cs b/src/Microsoft.Data.SqlClient/src/System/Diagnostics/CodeAnalysis.netfx.cs
index 1bf90ad001..4ac00aae59 100644
--- a/src/Microsoft.Data.SqlClient/src/System/Diagnostics/CodeAnalysis.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/System/Diagnostics/CodeAnalysis.netfx.cs
@@ -15,6 +15,14 @@ namespace System.Diagnostics.CodeAnalysis
     internal sealed class NotNullAttribute : Attribute
     {
     }
+
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+    internal sealed class NotNullWhenAttribute : Attribute
+    {
+        public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+        public bool ReturnValue { get; }
+    }
 }
 
 #endif
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/DacResponseProcessorTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/DacResponseProcessorTest.cs
new file mode 100644
index 0000000000..fe56f8c5d5
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/DacResponseProcessorTest.cs
@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Buffers;
+using Xunit;
+
+namespace Microsoft.Data.Sql.UnitTests;
+
+public class DacResponseProcessorTest
+{
+    [Theory(Skip = "Implementation in progress, see GH #3700")]
+    [MemberData(nameof(SsrpPacketTestData.EmptyPacketBuffer), MemberType = typeof(SsrpPacketTestData), DisableDiscoveryEnumeration = true)]
+    public void Process_EmptyBuffer_ReturnsFalse(ReadOnlySequence<byte> packetBuffers)
+    {
+        _ = packetBuffers;
+    }
+
+    [Theory(Skip = "Implementation in progress, see GH #3700")]
+    [MemberData(nameof(SsrpPacketTestData.InvalidSvrRespDacPackets), MemberType = typeof(SsrpPacketTestData), DisableDiscoveryEnumeration = true)]
+    public void Process_InvalidDacResponse_ReturnsFalse(ReadOnlySequence<byte> packetBuffers)
+    {
+        _ = packetBuffers;
+    }
+
+    [Theory(Skip = "Implementation in progress, see GH #3700")]
+    [MemberData(nameof(SsrpPacketTestData.ValidSvrRespDacPacketBuffer), MemberType = typeof(SsrpPacketTestData), DisableDiscoveryEnumeration = true)]
+    public void Process_ValidDacResponse_ReturnsData(ReadOnlySequence<byte> packetBuffers, int expectedDacPort)
+    {
+        _ = packetBuffers;
+        _ = expectedDacPort;
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/SqlDataSourceResponseProcessorTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/SqlDataSourceResponseProcessorTest.cs
new file mode 100644
index 0000000000..695a8a5cbb
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/SqlDataSourceResponseProcessorTest.cs
@@ -0,0 +1,56 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Buffers;
+using Xunit;
+
+namespace Microsoft.Data.Sql.UnitTests;
+
+public class SqlDataSourceResponseProcessorTest
+{
+    [Theory(Skip = "Implementation in progress, see GH #3700")]
+    [MemberData(nameof(SsrpPacketTestData.EmptyPacketBuffer), MemberType = typeof(SsrpPacketTestData), DisableDiscoveryEnumeration = true)]
+    public void Process_EmptyBuffer_ReturnsFalse(ReadOnlySequence<byte> packetBuffers)
+    {
+        _ = packetBuffers;
+    }
+
+    [Theory(Skip = "Implementation in progress, see GH #3700")]
+    [MemberData(nameof(SsrpPacketTestData.InvalidSvrRespPackets), MemberType = typeof(SsrpPacketTestData), DisableDiscoveryEnumeration = true)]
+    public void Process_InvalidSqlDataSourceResponse_ReturnsFalse(ReadOnlySequence<byte> packetBuffers)
+    {
+        _ = packetBuffers;
+    }
+
+    [Theory(Skip = "Implementation in progress, see GH #3700")]
+    [MemberData(nameof(SsrpPacketTestData.InvalidRespDataPackets), MemberType = typeof(SsrpPacketTestData), DisableDiscoveryEnumeration = true)]
+    public void Process_InvalidSqlDataSourceResponse_RespData_ReturnsFalse(ReadOnlySequence<byte> packetBuffers)
+    {
+        _ = packetBuffers;
+    }
+
+    [Theory(Skip = "Implementation in progress, see GH #3700")]
+    [MemberData(nameof(SsrpPacketTestData.InvalidTcpInfoPackets), MemberType = typeof(SsrpPacketTestData), DisableDiscoveryEnumeration = true)]
+    public void Process_InvalidSqlDataSourceResponse_TcpInfo_ReturnsFalse(ReadOnlySequence<byte> packetBuffers)
+    {
+        _ = packetBuffers;
+    }
+
+    [Theory(Skip = "Implementation in progress, see GH #3700")]
+    [MemberData(nameof(SsrpPacketTestData.InvalidClntUcastInstSvrRespPackets), MemberType = typeof(SsrpPacketTestData), DisableDiscoveryEnumeration = true)]
+    public void Process_InvalidSqlDataSourceResponseToClntUcastInst_ReturnsFalse(ReadOnlySequence<byte> packetBuffers)
+    {
+        _ = packetBuffers;
+    }
+
+    [Theory(Skip = "Implementation in progress, see GH #3700")]
+    [MemberData(nameof(SsrpPacketTestData.ValidSvrRespPacketBuffer), MemberType = typeof(SsrpPacketTestData), DisableDiscoveryEnumeration = true)]
+    public void Process_ValidSqlDataSourceResponse_ReturnsData(ReadOnlySequence<byte> packetBuffers, string expectedVersion, int expectedTcpPort, string? expectedPipeName)
+    {
+        _ = packetBuffers;
+        _ = expectedVersion;
+        _ = expectedTcpPort;
+        _ = expectedPipeName;
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/SsrpPacketTestData.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/SsrpPacketTestData.cs
new file mode 100644
index 0000000000..9729c33949
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/Sql/SsrpPacketTestData.cs
@@ -0,0 +1,738 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Data.Common;
+using System;
+using System.Buffers;
+using System.Buffers.Binary;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+namespace Microsoft.Data.Sql.UnitTests;
+
+/// <summary>
+/// Test cases used to verify the successful processing of valid SSRP responses and the silent
+/// discarding of invalid SSRP responses.
+/// </summary>
+internal static class SsrpPacketTestData
+{
+    private const byte ValidSvrRespHeader = 0x05;
+    private const byte ValidRespDataDacProtocolVersion = 0x01;
+    private const byte ValidRespDataDacResponseSize = 0x06;
+
+    private const string ValidServerName = "srv1";
+    private const string ValidInstanceName = "MSSQLSERVER";
+    private const string ValidServerVersion = "14.0.0.0";
+    private const int ValidTcpPort1 = 1433;
+    private const int ValidTcpPort2 = 1434;
+    private const int ValidTcpPort3 = 1435;
+    private const int ValidTcpPort4 = 1436;
+    private const int ValidTcpPort5 = 1437;
+
+    /// <summary>
+    /// One empty packet buffer, which should be successfully processed and contain zero responses.
+    /// </summary>
+    /// <see cref="DacResponseProcessorTest.Process_EmptyBuffer_ReturnsFalse"/>
+    /// <see cref="SqlDataSourceResponseProcessorTest.Process_EmptyBuffer_ReturnsFalse"/>
+    public static TheoryData<ReadOnlySequence<byte>> EmptyPacketBuffer =>
+        new(GeneratePacketBuffers([]));
+
+    /// <summary>
+    /// Various combinations of packet buffers containing normal SVR_RESP responses, all of which
+    /// should be successfully processed.
+    /// </summary>
+    /// <see cref="SqlDataSourceResponseProcessorTest.Process_ValidSqlDataSourceResponse_ReturnsData"/>
+    public static TheoryData<ReadOnlySequence<byte>, string, int, string?> ValidSvrRespPacketBuffer
+    {
+        get
+        {
+            const string PipeName = $@"\\{ValidServerName}\pipe\SampléPipeName";
+
+            string complexProtocolParameters = CreateProtocolParameters(tcpInfo: $"tcp;{ValidTcpPort1}",
+                npInfo: $"np;{PipeName}",
+                viaInfo: $"via;{ValidServerName} 1:1433",
+                rpcInfo: $"rpc;{ValidServerName}",
+                spxInfo: $"spx;{ValidInstanceName}",
+                adspInfo: "adsp;SQL2000",
+                bvInfo: "bv;item;group;item;group;org");
+
+            byte[] complexValidPacket = FormatSvrRespMessage(ValidSvrRespHeader,
+                respData: CreateRespData(ValidServerName, ValidInstanceName, isClustered: true, ValidServerVersion, complexProtocolParameters));
+            byte[] validPacket1 = FormatSvrRespMessage(ValidSvrRespHeader,
+                respData: CreateRespData(ValidServerName, ValidInstanceName, isClustered: true, ValidServerVersion, CreateProtocolParameters(tcpInfo: $"tcp;{ValidTcpPort1}")));
+            byte[] validPacket2 = FormatSvrRespMessage(ValidSvrRespHeader,
+                respData: CreateRespData(ValidServerName, ValidInstanceName, isClustered: true, ValidServerVersion, CreateProtocolParameters(tcpInfo: $"tcp;{ValidTcpPort2}")));
+            byte[] validPacket3 = FormatSvrRespMessage(ValidSvrRespHeader,
+                respData: CreateRespData(ValidServerName, ValidInstanceName, isClustered: true, ValidServerVersion, CreateProtocolParameters(tcpInfo: $"tcp;{ValidTcpPort3}")));
+            byte[] validPacket4 = FormatSvrRespMessage(ValidSvrRespHeader,
+                respData: CreateRespData(ValidServerName, ValidInstanceName, isClustered: true, ValidServerVersion, CreateProtocolParameters(tcpInfo: $"tcp;{ValidTcpPort4}")));
+            byte[] invalidPacket1 = FormatSvrRespMessage(ValidSvrRespHeader,
+                respData: CreateRespData(ValidServerName, ValidInstanceName, isClustered: true, "v14", CreateProtocolParameters(tcpInfo: $"tcp;{ValidTcpPort1}")));
+
+            return new()
+            {
+                {
+                    // One buffer, one response
+                    GeneratePacketBuffers(complexValidPacket),
+                    ValidServerVersion,
+                    ValidTcpPort1,
+                    PipeName
+                },
+                {
+                    // One response, split into four buffers in the middle of a string
+                    GeneratePacketBuffers(
+                        complexValidPacket.AsSpan(0, 14).ToArray(),
+                        complexValidPacket.AsSpan(14, 22).ToArray(),
+                        complexValidPacket.AsSpan(36, 71).ToArray(),
+                        // Position 107 is the second byte of the é character when encoded to UTF8.
+                        complexValidPacket.AsSpan(107).ToArray()),
+                    ValidServerVersion,
+                    ValidTcpPort1,
+                    PipeName
+                },
+                {
+                    // Four responses, each with different methods
+                    GeneratePacketBuffers(
+                        validPacket1,
+                        validPacket2,
+                        validPacket3,
+                        validPacket4),
+                    ValidServerVersion,
+                    ValidTcpPort4,
+                    null
+                },
+                {
+                    // Five responses, with response three invalid
+                    GeneratePacketBuffers(
+                        complexValidPacket,
+                        validPacket2,
+                        invalidPacket1,
+                        validPacket3,
+                        validPacket4),
+                    ValidServerVersion,
+                    ValidTcpPort4,
+                    null
+                }
+            };
+        }
+    }
+
+    /// <summary>
+    /// Various combinations of packet buffers containing SVR_RESP (DAC) responses, all of which
+    /// should be successfully processed.
+    /// </summary>
+    /// <see cref="SqlDataSourceResponseProcessorTest.Process_ValidDacResponse_ReturnsData"/>
+    public static TheoryData<ReadOnlySequence<byte>, int> ValidSvrRespDacPacketBuffer
+    {
+        get
+        {
+            byte[] validPacket1 = FormatSvrRespMessage(ValidSvrRespHeader,
+                ValidRespDataDacResponseSize,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort2));
+            byte[] validPacket2 = FormatSvrRespMessage(ValidSvrRespHeader,
+                ValidRespDataDacResponseSize,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort3));
+            byte[] validPacket3 = FormatSvrRespMessage(ValidSvrRespHeader,
+                ValidRespDataDacResponseSize,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort4));
+            byte[] validPacket4 = FormatSvrRespMessage(ValidSvrRespHeader,
+                ValidRespDataDacResponseSize,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort5));
+            byte[] invalidPacket1 = FormatSvrRespMessage(ValidSvrRespHeader,
+                serializedResponseSize: 0x03,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort2));
+
+            return new()
+            {
+                {
+                    // One buffer, one response
+                    GeneratePacketBuffers(validPacket1),
+                    ValidTcpPort2
+                },
+                {
+                    // One response, split into three buffers.
+                    // Buffer 1: the header byte
+                    // Buffer 2: both bytes of RESP_SIZE and the first byte of RESP_DATA (protocol version).
+                    // Buffer 3: remainder.
+                    GeneratePacketBuffers(validPacket1.AsSpan(0, 1).ToArray(),
+                        validPacket1.AsSpan(1, 3).ToArray(),
+                        validPacket1.AsSpan(4).ToArray()),
+                    ValidTcpPort2
+                },
+                {
+                    // One response, split into three buffers.
+                    // Buffer 1: the header and first byte of RESP_SIZE.
+                    // Buffer 2: the second byte of RESP_SIZE and the first byte of RESP_DATA (protocol version).
+                    // Buffer 3: remainder.
+                    GeneratePacketBuffers(validPacket1.AsSpan(0, 2).ToArray(),
+                        validPacket1.AsSpan(2, 2).ToArray(),
+                        validPacket1.AsSpan(4).ToArray()),
+                    ValidTcpPort2
+                },
+                {
+                    // Two responses with trailing data
+                    GeneratePacketBuffers(validPacket1.AsSpan(0, 2).ToArray(),
+                        validPacket1.AsSpan(2, 2).ToArray(),
+                        [..validPacket1.AsSpan(4).ToArray(), 0x05],
+                        validPacket2.AsSpan(0, 2).ToArray(),
+                        validPacket2.AsSpan(2).ToArray(),
+                        [0x05]),
+                    ValidTcpPort3
+                },
+                {
+                    // Four responses, each with different DAC ports
+                    GeneratePacketBuffers(validPacket1,
+                        validPacket2,
+                        validPacket3,
+                        validPacket4),
+                    ValidTcpPort5
+                },
+                {
+                    // Five responses, with response three invalid
+                    GeneratePacketBuffers(validPacket1,
+                        validPacket2,
+                        invalidPacket1,
+                        validPacket3,
+                        validPacket4),
+                    ValidTcpPort5
+                },
+                {
+                    // Four responses, with three extraneous 0x05 bytes between responses 2 and 3
+                    GeneratePacketBuffers(validPacket1,
+                        [..validPacket2, 0x05],
+                        [0x05],
+                        [0x05, ..validPacket3],
+                        validPacket4),
+                    ValidTcpPort5
+                }
+            };
+        }
+    }
+
+    /// <summary>
+    /// Packet buffers containing nothing but invalid SVR_RESP (DAC) responses.
+    /// </summary>
+    /// <see cref="DacResponseProcessorTest.Process_InvalidDacResponse_ReturnsFalse"/>
+    public static TheoryData<ReadOnlySequence<byte>> InvalidSvrRespDacPackets =>
+        [
+            // Invalid header byte
+            GeneratePacketBuffers(FormatSvrRespMessage(header: 0x00,
+                ValidRespDataDacResponseSize,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort2))),
+
+            // Invalid size
+            GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                serializedResponseSize: 0x09,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort2))),
+
+            // Invalid protocol version
+            GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                ValidRespDataDacResponseSize,
+                CreateRespData(protocolVersion: 0x02, ValidTcpPort2))),
+                
+            // Invalid port
+            GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                ValidRespDataDacResponseSize,
+                CreateRespData(ValidRespDataDacProtocolVersion, 0)))
+        ];
+
+    /// <summary>
+    /// Packets containing an SVR_RESP response which is a valid response to a CLNT_[B|U]CAST_EX message
+    /// but not to a CLNT_UCAST_INST message.
+    /// </summary>
+    /// <see cref="SqlDataSourceResponseProcessorTest.Process_InvalidSqlDataSourceResponseToClntUcastInst_ReturnsFalse"/>
+    public static TheoryData<ReadOnlySequence<byte>> InvalidClntUcastInstSvrRespPackets
+    {
+        get
+        {
+            // The RESP_DATA section of the response to a CLNT_UCAST_INST message must be shorter than 1024 bytes.
+            byte[] longPacket = FormatSvrRespMessage(ValidSvrRespHeader,
+                CreateRespData(ValidServerName,
+                    ValidInstanceName,
+                    isClustered: true,
+                    ValidServerVersion,
+                    CreateProtocolParameters(tcpInfo: $"tcp;{ValidTcpPort1}", npInfo: @"np;" + new string('a', 1025))));
+
+            return [GeneratePacketBuffers(longPacket)];
+        }
+    }
+
+    /// <summary>
+    /// Packet buffers containing an SSRP message which is failing due to invalid data
+    /// in the top-level SVR_RESP message fields.
+    /// </summary>
+    /// <see cref="SqlDataSourceResponseProcessorTest.Process_InvalidSqlDataSourceResponse_ReturnsFalse"/>
+    public static TheoryData<ReadOnlySequence<byte>> InvalidSvrRespPackets =>
+        [
+            // Invalid SVR_RESP header field value
+            GeneratePacketBuffers(FormatSvrRespMessage(header: 0x04,
+                ValidRespDataDacResponseSize,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort2))),
+
+            // RESP_SIZE too small (DAC response)
+            GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                serializedResponseSize: 0x05,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort2))),
+
+            // RESP_SIZE too large (DAC response)
+            GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                serializedResponseSize : 0x07,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort2))),
+
+            // RESP_SIZE zero length (DAC response)
+            GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                serializedResponseSize: 0x00,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort2))),
+
+            // RESP_SIZE far beyond reasonable limits (normal response)
+            GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                serializedResponseSize: ushort.MaxValue,
+                CreateRespData(ValidRespDataDacProtocolVersion, ValidTcpPort2))),
+
+            // RESP_SIZE larger than the buffer (normal response)
+            GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                serializedResponseSize: 72,
+                CreateRespData(ValidServerName, ValidInstanceName, isClustered: true, ValidServerVersion))),
+
+            // RESP_SIZE zero length (normal response)
+            GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                serializedResponseSize: 0x00,
+                CreateRespData(ValidServerName, ValidInstanceName, isClustered: true, ValidServerVersion))),
+
+            // RESP_SIZE far beyond reasonable limits (normal response)
+            GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                serializedResponseSize: ushort.MaxValue,
+                CreateRespData(ValidServerName, ValidInstanceName, isClustered: true, ValidServerVersion)))
+        ];
+
+    /// <summary>
+    /// Packet buffers containing an SSRP message with valid top-level SVR_RESP message
+    /// fields but invalid components of the child RESP_DATA structure.
+    /// </summary>
+    /// <see cref="SqlDataSourceResponseProcessorTest.Process_InvalidSqlDataSourceResponse_RespData_ReturnsFalse"/>
+    public static TheoryData<ReadOnlySequence<byte>> InvalidRespDataPackets
+    {
+        get
+        {
+            const string InvalidServerName = "sr\u0008v\u00001";
+            string validTcpInfo = CreateProtocolParameters($"tcp;{ValidTcpPort1}");
+
+            return [
+                // All keys lowercase
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo,
+                        lowercaseKey: true))),
+
+                // Keys shuffled
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo,
+                        shuffleKeys: true))),
+
+                // Does not start with "ServerName" string
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo,
+                        omitServerName: true))),
+
+                // Server name longer than 255 bytes
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(serverName: new string('a', 256),
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo))),
+
+                // Server name contains invalid characters
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(serverName: InvalidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo))),
+
+                // Missing semicolons between keys and values
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo,
+                        omitKeyValueSeparators: true))),
+
+                // Missing terminating pair of semicolons
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo,
+                        omitTrailingSemicolons: true))),
+
+                // Missing "InstanceName"
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo,
+                        omitInstanceName: true))),
+
+                // Duplicate "InstanceName" key with different value
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        protocolParameters: "InstanceName;DUPLICATE"))),
+
+                // Instance name longer than 255 bytes
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        instanceName: new string('a', 256),
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo))),
+
+                // Missing "IsClustered"
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo,
+                        omitIsClustered: true))),
+
+                // Invalid IsClustered value - omit the IsClustered;Yes pair and supply an invalid one.
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        protocolParameters: "IsClustered;INVALID;" + validTcpInfo,
+                        omitIsClustered: true))),
+
+                // Duplicate "IsClustered" key with different value
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        protocolParameters: "IsClustered;DUPLICATE"))),
+
+                // Missing "Version"
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        validTcpInfo,
+                        omitVersion: true))),
+
+                // Empty version string
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        version: string.Empty,
+                        validTcpInfo))),
+
+                // Version string longer than 16 bytes
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        version: "65535.65535.65.53",
+                        validTcpInfo))),
+
+                // Version string not in the correct format: 1*[0-9"."]
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        version: "v14",
+                        validTcpInfo))),
+
+                // Duplicate "Version" key with different value
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        protocolParameters: "Version;DUPLICATE"))),
+
+                // Protocol components listed twice
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        CreateProtocolParameters(tcpInfo: $"tcp;{ValidTcpPort2}", otherParameters: $"tcp;{ValidTcpPort3}")))),
+
+                // Invalid protocol components appear
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        CreateProtocolParameters(tcpInfo: $"tcp;{ValidTcpPort2}", otherParameters: "invalid_protocol;value")))),
+
+                // Empty protocol components appear
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    CreateRespData(ValidServerName,
+                        ValidInstanceName,
+                        isClustered: true,
+                        ValidServerVersion,
+                        CreateProtocolParameters(otherParameters: ";value")))),
+
+                // Invalid PROTOCOLVERSION field value
+                GeneratePacketBuffers(FormatSvrRespMessage(ValidSvrRespHeader,
+                    ValidRespDataDacResponseSize,
+                    CreateRespData(protocolVersion: 0x02, ValidTcpPort2)))
+            ];
+        }
+    }
+
+    /// <summary>
+    /// Packet buffers containing an SSRP message with valid top-level SVR_RESP message
+    /// fields, a valid RESP_DATA child structure but an invalid TCP_INFO structure.
+    /// </summary>
+    /// <see cref="SqlDataSourceResponseProcessorTest.Process_InvalidSqlDataSourceResponse_TcpInfo_ReturnsFalse"/>
+    public static TheoryData<ReadOnlySequence<byte>> InvalidTcpInfoPackets
+    {
+        get
+        {
+            return [
+                // Port is absent
+                CreateSvrRespMessage("tcp"),
+
+                // Port is zero-length
+                CreateSvrRespMessage("tcp;"),
+
+                // Port is non-numeric
+                CreateSvrRespMessage("tcp;one"),
+
+                // Port is > ushort.MaxValue
+                CreateSvrRespMessage("tcp;65536"),
+
+                // Port is < 0
+                CreateSvrRespMessage("tcp;-1")
+            ];
+
+            static ReadOnlySequence<byte> CreateSvrRespMessage(string tcpInfo) =>
+                GeneratePacketBuffers(
+                    FormatSvrRespMessage(ValidSvrRespHeader,
+                        CreateRespData(ValidServerName,
+                            ValidInstanceName,
+                            isClustered: true,
+                            ValidServerVersion,
+                            CreateProtocolParameters(tcpInfo))));
+        }
+    }
+
+    private static ReadOnlySequence<byte> GeneratePacketBuffers(params byte[][] packetBuffers)
+    {
+        if (packetBuffers.Length == 0)
+        {
+            return ReadOnlySequence<byte>.Empty;
+        }
+
+        PacketBuffer first = new(packetBuffers[0], null);
+        PacketBuffer curr = first;
+        PacketBuffer last;
+
+        for (int i = 1; i < packetBuffers.Length; i++)
+        {
+            curr = new(packetBuffers[i], curr);
+        }
+        last = curr;
+
+        return new ReadOnlySequence<byte>(first, 0, last, last.Memory.Length);
+    }
+
+    /// <summary>
+    /// Generates an SVR_RESP message with a valid length.
+    /// </summary>
+    /// <param name="header">The SVR_RESP header value. Expected to be 0x05.</param>
+    /// <param name="respData">The serialized RESP_DATA section.</param>
+    /// <seealso cref="FormatSvrRespMessage(byte, ushort, ReadOnlySpan{byte}, int?)"/>
+    /// <returns>A byte representation of one SVR_RESP message.</returns>
+    private static byte[] FormatSvrRespMessage(byte header, ReadOnlySpan<byte> respData) =>
+        FormatSvrRespMessage(header, (ushort)respData.Length, respData);
+
+    /// <summary>
+    /// Generates an SVR_RESP message with specific characteristics.
+    /// </summary>
+    /// <param name="header">The SVR_RESP header value. Expected to be 0x05.</param>
+    /// <param name="serializedResponseSize">The RESP_SIZE field to be serialized to the header.</param>
+    /// <param name="respData">The serialized RESP_DATA section.</param>
+    /// <param name="realResponseSize">If specified, the number of bytes to actually write.</param>
+    /// <returns>A byte representation of one SVR_RESP message.</returns>
+    /// <seealso href="https://learn.microsoft.com/en-us/openspecs/windows_protocols/mc-sqlr/2e1560c9-5097-4023-9f5e-72b9ff1ec3b1"/>
+    /// <seealso href="https://learn.microsoft.com/en-us/openspecs/windows_protocols/mc-sqlr/45b52721-7a48-45cf-9c84-e6db905ad6df"/>
+    private static byte[] FormatSvrRespMessage(byte header,
+        ushort serializedResponseSize,
+        ReadOnlySpan<byte> respData,
+        int? realResponseSize = null)
+    {
+        byte[] realRespData = realResponseSize is null
+            ? new byte[sizeof(byte) + sizeof(ushort) + respData.Length]
+            : new byte[realResponseSize.Value];
+
+        // Pad any free space after RESP_DATA with 0x05
+        if (realRespData.Length > sizeof(byte) + sizeof(ushort) + respData.Length)
+        {
+            realRespData.AsSpan(sizeof(byte) + sizeof(ushort) + respData.Length).Fill(0x05);
+        }
+
+        // Write RESP_DATA
+        if (realRespData.Length > sizeof(byte) + sizeof(ushort))
+        {
+            int bytesToCopy = Math.Min(respData.Length, realRespData.Length - sizeof(byte) - sizeof(ushort));
+
+            respData.Slice(0, bytesToCopy).CopyTo(realRespData.AsSpan(sizeof(byte) + sizeof(ushort)));
+        }
+
+        // Write RESP_SIZE
+        if (realRespData.Length > sizeof(byte))
+        {
+            Span<byte> responseSizeBytes = stackalloc byte[sizeof(ushort)];
+            int bytesToCopy = Math.Min(responseSizeBytes.Length, realRespData.Length - sizeof(byte));
+
+            BinaryPrimitives.WriteUInt16LittleEndian(responseSizeBytes, serializedResponseSize);
+            responseSizeBytes.Slice(0, bytesToCopy).CopyTo(realRespData.AsSpan(sizeof(byte)));
+        }
+
+        // Write SVR_RESP
+        if (realRespData.Length > 0)
+        {
+            realRespData[0] = header;
+        }
+
+        return realRespData;
+    }
+
+    /// <summary>
+    /// Creates a new RESP_DATA section of an SVR_RESP message for the DAC request with a specified protocol version and TCP port number.
+    /// </summary>
+    /// <param name="protocolVersion">Protocol version. Expected to be 0x01.</param>
+    /// <param name="dacPort">TCP port number of the DAC.</param>
+    /// <returns>A byte representation of a RESP_DATA section.</returns>
+    /// <seealso href="https://learn.microsoft.com/en-us/openspecs/windows_protocols/mc-sqlr/45b52721-7a48-45cf-9c84-e6db905ad6df"/>
+    private static byte[] CreateRespData(byte protocolVersion, ushort dacPort)
+    {
+        byte[] data = new byte[sizeof(byte) + sizeof(ushort)];
+
+        data[0] = protocolVersion;
+        BinaryPrimitives.WriteUInt16LittleEndian(data.AsSpan(1), dacPort);
+        return data;
+    }
+
+    /// <summary>
+    /// Creates a RESP_DATA section of an SVR_RESP message with specific characteristics.
+    /// </summary>
+    /// <param name="serverName">ServerName parameter value.</param>
+    /// <param name="instanceName">InstanceName parameter value.</param>
+    /// <param name="isClustered">IsClustered parameter value.</param>
+    /// <param name="version">Version parameter value.</param>
+    /// <param name="protocolParameters">If specified, the protocol parameters. Generated by <see cref="CreateProtocolParameters"/>.</param>
+    /// <param name="lowercaseKey">If true, the ServerName, InstanceName, IsClustered and Version keys will be written in lowercase.</param>
+    /// <param name="omitTrailingSemicolons">If true, the return value will not include the trailing <c>;;</c>.</param>
+    /// <param name="omitKeyValueSeparators">If true, no separators between the keys and values will be written.</param>
+    /// <param name="omitServerName">If true, the mandatory ServerName parameter value will not be written.</param>
+    /// <param name="omitInstanceName">If true, the mandatory InstanceName parameter value will not be written.</param>
+    /// <param name="omitIsClustered">If true, the mandatory IsClustered parameter value will not be written.</param>
+    /// <param name="omitVersion">If true, the mandatory Version parameter value will not be written.</param>
+    /// <param name="shuffleKeys">If true, the key/value pairs will be written in a non-sequential order.</param>
+    /// <returns>A byte representation of a RESP_DATA section.</returns>
+    /// <seealso href="https://learn.microsoft.com/en-us/openspecs/windows_protocols/mc-sqlr/2e1560c9-5097-4023-9f5e-72b9ff1ec3b1"/>
+    private static byte[] CreateRespData(string serverName,
+        string instanceName,
+        bool isClustered,
+        string version,
+        string? protocolParameters = null,
+        bool lowercaseKey = false,
+        bool omitTrailingSemicolons = false,
+        bool omitKeyValueSeparators = false,
+        bool omitServerName = false,
+        bool omitInstanceName = false,
+        bool omitIsClustered = false,
+        bool omitVersion = false,
+        bool shuffleKeys = false)
+    {
+        string serverNameKey = GenerateKeyValuePair("ServerName", serverName, omitServerName);
+        string instanceNameKey = GenerateKeyValuePair("InstanceName", instanceName, omitInstanceName);
+        string isClusteredKey = GenerateKeyValuePair("IsClustered", isClustered ? "Yes" : "No", omitIsClustered);
+        string versionKey = GenerateKeyValuePair("Version", version, omitVersion);
+        string[] components =
+            shuffleKeys
+            ? [protocolParameters ?? string.Empty, versionKey, isClusteredKey, instanceNameKey, serverNameKey]
+            : [serverNameKey, instanceNameKey, isClusteredKey, versionKey, protocolParameters ?? string.Empty];
+        string outputString = string.Join(";", components)
+            + (omitTrailingSemicolons ? string.Empty : ";;");
+
+        return Encoding.UTF8.GetBytes(outputString);
+
+        string GenerateKeyValuePair(string key, string value, bool omitKey)
+        {
+            if (omitKey)
+            {
+                return string.Empty;
+            }
+
+            if (lowercaseKey)
+            {
+                key = key.ToLower();
+            }
+
+            return key + (omitKeyValueSeparators ? string.Empty : ";") + value;
+        }
+    }
+
+    /// <summary>
+    /// Creates the protocol parameters for a RESP_DATA section.
+    /// </summary>
+    /// <param name="tcpInfo">If non-null, the TCP_INFO data.</param>
+    /// <param name="npInfo">If non-null, the NP_INFO data.</param>
+    /// <param name="viaInfo">If non-null, the VIA_INFO data.</param>
+    /// <param name="rpcInfo">If non-null, the RPC_INFO data</param>
+    /// <param name="spxInfo">If non-null, the SPX_INFO data.</param>
+    /// <param name="adspInfo">If non-null, the ADSP_INFO data.</param>
+    /// <param name="bvInfo">If non-null, the BV_INFO data.</param>
+    /// <param name="otherParameters">Any additional protocol parameters to include.</param>
+    /// <returns>The collated protocol parameters for a RESP_DATA section.</returns>
+    private static string CreateProtocolParameters(string? tcpInfo = null,
+        string? npInfo = null,
+        string? viaInfo = null,
+        string? rpcInfo = null,
+        string? spxInfo = null,
+        string? adspInfo = null,
+        string? bvInfo = null,
+        string? otherParameters = null)
+    {
+        List<string> protocolParameters = [];
+        ReadOnlySpan<string?> allParams = [tcpInfo, npInfo, viaInfo, rpcInfo, spxInfo, adspInfo, bvInfo, otherParameters];
+
+        foreach (string? param in allParams)
+        {
+            if (param is not null)
+            {
+                protocolParameters.Add(param);
+            }
+        }
+
+        return string.Join(";", protocolParameters);
+    }
+}

From 8b90590c2cd0a98aeec6df053d7f9d95b678faa4 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Mon, 20 Jul 2026 23:01:37 +0100
Subject: [PATCH 196/298] Cleanup | OS-independent build of non-SNI types
 (#4207)

---
 .../Handles/SafeLibraryHandle.netcore.cs      |  2 +-
 .../src/Interop/Windows/Kernel32/Kernel32.cs  | 11 +++-----
 .../Windows/Kernel32/Kernel32Safe.netfx.cs    |  4 +--
 .../Interop/Windows/Sni/AuthProviderInfo.cs   |  4 ---
 .../src/Interop/Windows/Sni/ConsumerInfo.cs   |  4 ---
 .../src/Interop/Windows/Sni/ConsumerNumber.cs |  4 ---
 .../src/Interop/Windows/Sni/Delegates.cs      |  4 ---
 .../src/Interop/Windows/Sni/IoType.cs         |  4 ---
 .../src/Interop/Windows/Sni/Prefix.cs         |  4 ---
 .../src/Interop/Windows/Sni/Provider.cs       |  4 ---
 .../src/Interop/Windows/Sni/QueryType.cs      |  4 ---
 .../Windows/Sni/SniClientConsumerInfo.cs      |  4 ---
 .../Interop/Windows/Sni/SniConsumerInfo.cs    |  4 ---
 .../Interop/Windows/Sni/SniDnsCacheInfo.cs    |  4 ---
 .../src/Interop/Windows/Sni/SniError.cs       |  4 ---
 .../Interop/Windows/Sni/SniSslProtocols.cs    |  4 ---
 ...ependencyProcessDispatcherStorage.netfx.cs |  2 +-
 .../Sni/TransparentNetworkResolutionMode.cs   |  4 ---
 .../src/Microsoft.Data.SqlClient.csproj       |  4 ++-
 .../Data/Common/AdapterUtil.netfx.cs          |  2 --
 .../SqlClient/Diagnostics/SqlClientMetrics.cs |  4 +--
 .../Data/SqlClient/LocalAppContextSwitches.cs | 26 +++++++------------
 ....netcore.windows.cs => LocalDB.netcore.cs} | 17 +++++++++---
 .../ManagedSni/LocalDB.netcore.unix.cs        | 20 --------------
 .../Microsoft/Data/SqlClient/SqlDependency.cs |  4 +--
 25 files changed, 34 insertions(+), 118 deletions(-)
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/{LocalDB.netcore.windows.cs => LocalDB.netcore.cs} (96%)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/LocalDB.netcore.unix.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.netcore.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.netcore.cs
index 54512985f1..35142e1ee8 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.netcore.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NET && _WINDOWS
+#if NET
 
 using Microsoft.Win32.SafeHandles;
 
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32.cs
index 020726b104..5ff162d69e 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32.cs
@@ -8,7 +8,7 @@
 using Microsoft.Data.Common;
 using Microsoft.Win32.SafeHandles;
 
-#if !NETFRAMEWORK && _WINDOWS
+#if NET
 using Interop.Windows.Handles;
 #endif
 
@@ -19,11 +19,6 @@ internal static class Kernel32
         internal const ushort FILE_DEVICE_FILE_SYSTEM = 0x0009;
         internal const uint SEM_FAILCRITICALERRORS = 1;
 
-        #if _WINDOWS && !NETFRAMEWORK
-        internal const int LOAD_LIBRARY_AS_DATAFILE = 0x00000002;
-        internal const int LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800;
-        #endif
-
         private const string DllName = "kernel32.dll";
 
         /// <summary><a href="https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/defining-i-o-control-codes">CTL_CODE</a> method.</summary>
@@ -54,7 +49,7 @@ internal static extern bool DeviceIoControl(
             out uint cbBytesReturned,
             IntPtr overlapped);
 
-        #if NET && _WINDOWS
+        #if NET
         [DllImport(DllName, ExactSpelling = true, SetLastError = true)]
         public static extern bool FreeLibrary([In] IntPtr hModule);
         #endif
@@ -71,7 +66,7 @@ internal static extern int GetFullPathName(
             IntPtr lpFilePartOrNull);
         #endif
 
-        #if NET && _WINDOWS
+        #if NET
         [DllImport(DllName, CharSet = CharSet.Ansi, BestFitMapping = false)]
         public static extern IntPtr GetProcAddress(IntPtr hModule, string lpProcName);
 
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32Safe.netfx.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32Safe.netfx.cs
index 874614765f..95a5d81440 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32Safe.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32Safe.netfx.cs
@@ -1,8 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETFRAMEWORK && _WINDOWS
+#if NETFRAMEWORK
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/AuthProviderInfo.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/AuthProviderInfo.cs
index e273e5fc1b..7b0818b7c5 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/AuthProviderInfo.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/AuthProviderInfo.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System.Runtime.InteropServices;
 
 namespace Interop.Windows.Sni
@@ -25,5 +23,3 @@ internal struct AuthProviderInfo
         public string serverCertFileName;
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerInfo.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerInfo.cs
index fcb7b9a20d..358e35cda0 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerInfo.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerInfo.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Runtime.InteropServices;
 
@@ -18,5 +16,3 @@ internal struct ConsumerInfo
         internal IntPtr key;
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerNumber.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerNumber.cs
index f7b11801c9..a1d4fdf292 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerNumber.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerNumber.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.Sni
 {
     internal enum ConsumerNumber
@@ -14,5 +12,3 @@ internal enum ConsumerNumber
         SNI_Consumer_Invalid,
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Delegates.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Delegates.cs
index 720ad481e4..fd1f2d8e39 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Delegates.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Delegates.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Runtime.InteropServices;
 
@@ -14,5 +12,3 @@ namespace Interop.Windows.Sni
     
     internal delegate IntPtr SqlClientCertificateDelegate(IntPtr pCallbackContext);
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/IoType.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/IoType.cs
index ef02350e84..167a7a23b5 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/IoType.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/IoType.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.Sni
 {
     internal enum IoType
@@ -12,5 +10,3 @@ internal enum IoType
         WRITE,
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Prefix.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Prefix.cs
index 52c98bfde9..45ec71a2cf 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Prefix.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Prefix.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.Sni
 {
     internal enum Prefix
@@ -16,5 +14,3 @@ internal enum Prefix
         INVALID_PREFIX,
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Provider.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Provider.cs
index c9bf7a980c..61b33ebfc1 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Provider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Provider.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.Sni
 {
     internal enum Provider
@@ -26,5 +24,3 @@ internal enum Provider
         INVALID_PROV,
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/QueryType.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/QueryType.cs
index 14de40336f..5fca987240 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/QueryType.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/QueryType.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.Sni
 {
     internal enum QueryType
@@ -49,5 +47,3 @@ internal enum QueryType
         #endif
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniClientConsumerInfo.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniClientConsumerInfo.cs
index 89199e4417..062c36679f 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniClientConsumerInfo.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniClientConsumerInfo.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System.Runtime.InteropServices;
 using Microsoft.Data.SqlClient;
 
@@ -36,5 +34,3 @@ internal unsafe struct SniClientConsumerInfo
         public SniDnsCacheInfo DNSCacheInfo;
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniConsumerInfo.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniConsumerInfo.cs
index 8cb27dfb5f..2f084f228d 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniConsumerInfo.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniConsumerInfo.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Runtime.InteropServices;
 
@@ -23,5 +21,3 @@ internal struct SniConsumerInfo
         public IntPtr NodeAffinity;
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniDnsCacheInfo.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniDnsCacheInfo.cs
index 1d5600aec9..e0e3c91efe 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniDnsCacheInfo.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniDnsCacheInfo.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System.Runtime.InteropServices;
 
 namespace Interop.Windows.Sni
@@ -21,5 +19,3 @@ internal struct SniDnsCacheInfo
         public string wszCachedTcpPort;
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniError.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniError.cs
index 55f64a32d3..2e519c15ab 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniError.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniError.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System.Runtime.InteropServices;
 
 namespace Interop.Windows.Sni
@@ -23,5 +21,3 @@ internal struct SniError
         internal uint lineNumber;
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniSslProtocols.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniSslProtocols.cs
index f070082c16..cd9bf47ed3 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniSslProtocols.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniSslProtocols.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.Sni
 {
     internal enum SniSslProtocols : uint
@@ -32,5 +30,3 @@ internal enum SniSslProtocols : uint
         SP_PROT_TLS1_3 = SP_PROT_TLS1_3_SERVER | SP_PROT_TLS1_3_CLIENT,
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SqlDependencyProcessDispatcherStorage.netfx.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SqlDependencyProcessDispatcherStorage.netfx.cs
index dc5b5be57e..57481d18b3 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SqlDependencyProcessDispatcherStorage.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SqlDependencyProcessDispatcherStorage.netfx.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETFRAMEWORK && _WINDOWS
+#if NETFRAMEWORK
 
 using System;
 using System.Diagnostics;
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/TransparentNetworkResolutionMode.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/TransparentNetworkResolutionMode.cs
index 8d1ac82449..fe68cd420d 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/TransparentNetworkResolutionMode.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/TransparentNetworkResolutionMode.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 namespace Interop.Windows.Sni
 {
     internal enum TransparentNetworkResolutionMode : byte
@@ -13,5 +11,3 @@ internal enum TransparentNetworkResolutionMode : byte
         ParallelMode
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 92c648c283..dc327b024a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -235,7 +235,9 @@
     <!-- This file does not support pre-processor directives, so it must be conditionally         -->
     <!-- included into the build.                                                                 -->
     <EmbeddedResource Include="Resources\ILLink.Substitutions.xml"
-                      Condition="'$(NormalizedTargetOs)' == 'windows_nt' AND '$(TargetFramework)' != 'net462'" />
+                      Condition="'$(NormalizedTargetOs)' == 'windows_nt' AND '$(TargetFramework)' != 'net462'">
+      <LogicalName>ILLink.Substitutions.xml</LogicalName>
+    </EmbeddedResource>
 
     <!-- Used by SqlMetaDataFactory to construct its DataSet -->
     <EmbeddedResource Include="Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs
index 99f627d603..d1d001448e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs
@@ -13,9 +13,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-#if _WINDOWS
 using Interop.Windows.Kernel32;
-#endif
 
 namespace Microsoft.Data.Common
 {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.cs
index ed27a9591f..cb8c224440 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,9 +9,7 @@
 #if NET
 using System.Threading;
 #else
-#if _WINDOWS
 using Interop.Windows.Kernel32;
-#endif
 using Microsoft.Data.Common;
 
 using System.Diagnostics;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
index 85f8c87937..06bf6c4f0e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
@@ -139,7 +139,7 @@ internal static class LocalAppContextSwitches
     private const string UseOverallConnectTimeoutForPoolWaitString =
         "Switch.Microsoft.Data.SqlClient.UseOverallConnectTimeoutForPoolWait";
 
-    #if NET && _WINDOWS
+    #if NET
     /// <summary>
     /// The name of the app context switch that controls whether to use the
     /// managed SNI implementation instead of the native SNI implementation on
@@ -258,7 +258,7 @@ private enum SwitchValue : byte
     /// </summary>
     private static SwitchValue s_useOverallConnectTimeoutForPoolWait = SwitchValue.None;
 
-    #if NET && _WINDOWS
+    #if NET
     /// <summary>
     /// The cached value of the UseManagedNetworking switch.
     /// </summary>
@@ -612,7 +612,7 @@ public static bool UseCompatibilityAsyncBehaviour
             defaultValue: false,
             ref s_useOverallConnectTimeoutForPoolWait);
 
-    #if NET && _WINDOWS
+    #if NET
     /// <summary>
     /// When set to true, .NET on Windows will use the managed SNI
     /// implementation instead of the native SNI implementation.
@@ -621,24 +621,22 @@ public static bool UseCompatibilityAsyncBehaviour
     /// trimmed away when the corresponding AppContext switch is set at compile
     /// time. In such cases, this property will return a constant value, even if
     /// the AppContext switch is set or reset at runtime. See the
-    /// ILLink.Substitutions.Windows.xml and ILLink.Substitutions.Unix.xml
-    /// resource files for details.
+    /// ILLink.Substitutions.xml resource file for details.
     ///
-    /// The default value of this switch is false.
+    /// The default value of this switch is false on Windows and true on non-Windows platforms.
     /// </summary>
     public static bool UseManagedNetworking
     {
         get
         {
-            if (s_useManagedNetworking != SwitchValue.None)
+            if (!OsConstants.IsWindows)
             {
-                return s_useManagedNetworking == SwitchValue.True;
+                return true;
             }
 
-            if (!OsConstants.IsWindows)
+            if (s_useManagedNetworking != SwitchValue.None)
             {
-                s_useManagedNetworking = SwitchValue.True;
-                return true;
+                return s_useManagedNetworking == SwitchValue.True;
             }
 
             if (AppContext.TryGetSwitch(UseManagedNetworkingOnWindowsString, out bool returnedValue) && returnedValue)
@@ -651,12 +649,6 @@ public static bool UseManagedNetworking
             return false;
         }
     }
-    #elif NET
-    /// <summary>
-    /// .NET Core on Unix does not support native SNI, so this will always be
-    /// true.
-    /// </summary>
-    public static bool UseManagedNetworking => true;
     #else
     /// <summary>
     /// .NET Framework does not support the managed SNI, so this will always be
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/LocalDB.netcore.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/LocalDB.netcore.cs
similarity index 96%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/LocalDB.netcore.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/LocalDB.netcore.cs
index bd45d307a1..6dfa1c351f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/LocalDB.netcore.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/LocalDB.netcore.cs
@@ -1,8 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NET && _WINDOWS
+#if NET
 
 using System;
 using System.Runtime.InteropServices;
@@ -11,6 +11,7 @@
 using Interop.Windows.Kernel32;
 using Microsoft.Win32;
 using Microsoft.Data.SqlClient.Internal;
+using Microsoft.Data.Common;
 
 namespace Microsoft.Data.SqlClient.ManagedSni
 {
@@ -44,8 +45,16 @@ [Out] [MarshalAs(UnmanagedType.LPWStr)] StringBuilder sqlConnectionDataSource,
 
         private LocalDB() { }
 
-        internal static string GetLocalDBConnectionString(string localDbInstance) =>
-            Instance.LoadUserInstanceDll() ? Instance.GetConnectionString(localDbInstance) : null;
+        internal static string GetLocalDBConnectionString(string localDbInstance)
+        {
+            // LocalDB is not available for Unix and hence it cannot be supported.
+            if (!OsConstants.IsWindows)
+            {
+                throw new PlatformNotSupportedException(Strings.LocalDBNotSupported);
+            }
+
+            return Instance.LoadUserInstanceDll() ? Instance.GetConnectionString(localDbInstance) : null;
+        }
 
         internal static IntPtr GetProcAddress(string functionName) =>
             Instance.LoadUserInstanceDll() ? Kernel32.GetProcAddress(LocalDB.Instance._sqlUserInstanceLibraryHandle, functionName) : IntPtr.Zero;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/LocalDB.netcore.unix.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/LocalDB.netcore.unix.cs
deleted file mode 100644
index 64ba1da0f8..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/LocalDB.netcore.unix.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#if NET && _UNIX
-
-using System;
-
-namespace Microsoft.Data.SqlClient.ManagedSni
-{
-    internal class LocalDB
-    {
-        internal static string GetLocalDBConnectionString(string localDbInstance)
-        {
-            throw new PlatformNotSupportedException(Strings.LocalDBNotSupported); // LocalDB is not available for Unix and hence it cannot be supported.
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
index a101099dd8..0e9df041de 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -20,9 +20,7 @@
 using System.Runtime.Remoting;
 using System.Runtime.Serialization;
 using System.Security.Permissions;
-#if _WINDOWS
 using Interop.Windows.Sni;
-#endif
 using Microsoft.Data.SqlClient.LocalDb;
 #endif
 

From 45f000ab8ce30c31e50d3250d2238feea18cc27f Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 21 Jul 2026 07:39:26 -0300
Subject: [PATCH 197/298] Stress | Move to ci/stress and build against
 sqlclient-ci-package output (#4456)

---
 .../ado-pipelines.instructions.md             |   4 +-
 .../prompts/update-build-pipelines.prompt.md  |   4 +-
 .../stress/sqlclient-ci-stress-job.yml}       | 102 +++++++++++++++---
 .../stress/sqlclient-ci-stress-pipeline.yml}  |  65 ++++-------
 .../stress/sqlclient-ci-stress-stage.yml}     |  16 +--
 .../sqlclient-pr-package-ref-pipeline.yml     |   1 -
 .../sqlclient-pr-project-ref-pipeline.yml     |   1 -
 .../StressTests/Directory.Packages.props      |  12 +++
 .../SqlClient.Stress.Framework.csproj         |  15 ++-
 .../SqlClient.Stress.Runner.csproj            |   8 +-
 .../SqlClient.Stress.Tests.csproj             |   8 +-
 11 files changed, 156 insertions(+), 80 deletions(-)
 rename eng/pipelines/{stress/stress-tests-job.yml => ci/stress/sqlclient-ci-stress-job.yml} (64%)
 rename eng/pipelines/{stress/stress-tests-pipeline.yml => ci/stress/sqlclient-ci-stress-pipeline.yml} (59%)
 rename eng/pipelines/{stress/stress-tests-stage.yml => ci/stress/sqlclient-ci-stress-stage.yml} (89%)

diff --git a/.github/instructions/ado-pipelines.instructions.md b/.github/instructions/ado-pipelines.instructions.md
index 7e0d02e4e2..3e5a66af78 100644
--- a/.github/instructions/ado-pipelines.instructions.md
+++ b/.github/instructions/ado-pipelines.instructions.md
@@ -22,7 +22,7 @@ Top-level CI/PR pipeline files:
 - `dotnet-sqlclient-ci-project-reference-pipeline.yml` — CI with Project references (Release)
 - `sqlclient-pr-package-ref-pipeline.yml` — PR validation with Package references
 - `sqlclient-pr-project-ref-pipeline.yml` — PR validation with Project references
-- `stress/stress-tests-pipeline.yml` — Stress test pipeline and templates
+- `ci/stress/sqlclient-ci-stress-pipeline.yml` — Stress test pipeline and templates
 
 Reusable templates are organized under:
 - `common/templates/jobs/` — Job templates (`ci-build-nugets-job`, `ci-code-coverage-job`, `ci-run-tests-job`)
@@ -63,7 +63,7 @@ Stages execute in dependency order (Package reference mode requires artifacts fr
 7. `verify_nuget_packages_stage` — Verify NuGet package metadata
 8. `ci_run_tests_stage` — Run MDS and AKV test suites
 
-Stress testing is no longer a stage threaded through `dotnet-sqlclient-ci-core.yml`; it lives under `eng/pipelines/stress/` as a separate pipeline flow.
+Stress testing is no longer a stage threaded through `dotnet-sqlclient-ci-core.yml`; it lives under `eng/pipelines/ci/stress/` as a separate pipeline flow.
 
 When adding a new build stage, respect the dependency graph and pass artifact names/versions to downstream stages.
 
diff --git a/.github/prompts/update-build-pipelines.prompt.md b/.github/prompts/update-build-pipelines.prompt.md
index 63c87ea9c3..a652c9f82f 100644
--- a/.github/prompts/update-build-pipelines.prompt.md
+++ b/.github/prompts/update-build-pipelines.prompt.md
@@ -22,7 +22,7 @@ Follow this workflow step-by-step:
   - `sqlclient-pr-package-ref-pipeline.yml` — PR validation (package references)
   - `onebranch/sqlclient-official.yml` — official OneBranch build/release pipeline
   - `onebranch/sqlclient-non-official.yml` — non-official OneBranch build/release pipeline
-  - `stress/stress-tests-pipeline.yml` — stress test pipeline
+  - `ci/stress/sqlclient-ci-stress-pipeline.yml` — stress test pipeline
 - Shared templates live in `eng/pipelines/common/templates/` (jobs/, stages/, steps/).
 - CI variables are defined in `eng/pipelines/libraries/`; OneBranch variables are defined in `eng/pipelines/onebranch/variables/`.
 
@@ -57,7 +57,7 @@ Follow this workflow step-by-step:
 - Test filters by platform: `nonnetfxtests`, `nonnetcoreapptests`, `nonwindowstests`, `nonlinuxtests`.
 - SNI testing matrix: both Native (`useManagedSNI=false`) and Managed (`useManagedSNI=true`).
 - Always Encrypted tests controlled by `runAlwaysEncryptedTests` parameter.
-- Stress coverage is maintained under `eng/pipelines/stress/`, not as a stage inside `dotnet-sqlclient-ci-core.yml`.
+- Stress coverage is maintained under `eng/pipelines/ci/stress/`, not as a stage inside `dotnet-sqlclient-ci-core.yml`.
 
 ## 5. Validate
 - Verify YAML syntax is valid.
diff --git a/eng/pipelines/stress/stress-tests-job.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
similarity index 64%
rename from eng/pipelines/stress/stress-tests-job.yml
rename to eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
index dd75602d6f..f4d730c05b 100644
--- a/eng/pipelines/stress/stress-tests-job.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
@@ -3,7 +3,10 @@
 # file to you under the MIT license.  See the LICENSE file in the project root for more information.
 ####################################################################################################
 
-# This job builds and runs stress tests by compiling the SqlClient projects transitively.
+# This job builds and runs stress tests against the SqlClient NuGet packages produced by the
+# sqlclient-ci-package pipeline.  The package artifacts are downloaded into the local NuGet feed
+# (packages/) and the stress test projects are built in "Package" mode (ReferenceType=Package)
+# against the exact package versions produced by that pipeline.
 #
 # The stress tests are located here:
 #
@@ -59,10 +62,6 @@ parameters:
   - name: netTestRuntimes
     type: object
 
-  # The name of the Azure Pipelines pool to use.
-  - name: poolName
-    type: string
-
   # The local SQL Server instance's 'sa' password, for use in the config file.
   - name: saPassword
     type: string
@@ -72,23 +71,26 @@ parameters:
   - name: sqlSetupStep
     type: step
 
-  # The pool VM image to use.
+  # The pool VM image to use.  Both the internal (ADO-1ES-Pool) and public (ADO-CI-1ES-Pool) pools
+  # must provide an image with this name.
+  #
+  # NOTE: This value is evaluated at template-expansion (compile) time to select the pool, so it
+  # must be a literal and must not contain any runtime expressions (e.g. $(...) macros or
+  # $[...] runtime expressions).
   - name: vmImage
     type: string
 
 jobs:
   - job: stress_tests_job_${{ parameters.jobNameSuffix }}
     displayName: '[${{ parameters.displayNamePrefix }}] Run Stress Tests'
-    pool:
-      name: ${{ parameters.poolName }}
-      ${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
-        vmImage: ${{ parameters.vmImage }}
-      ${{ else }}:
-        demands:
-          - imageOverride -equals ${{ parameters.vmImage }}
 
     variables:
 
+      # Whether this is an internal (ADO.Net project) or public (Public project) build.  Evaluated
+      # at compile time so it can drive template expressions below.
+      - name: isInternalBuild
+        value: ${{ eq(variables['System.TeamProject'], 'ADO.Net') }}
+
       # Import the variable group that provides SQL Server build properties used by the
       # shared configure-sql-server-*-step.yml templates (e.g. x64AliasRegistryPath,
       # x86AliasRegistryPath, SQLAliasName, SQLAliasPort).
@@ -97,6 +99,11 @@ jobs:
       # Import the variable group that provides SQL Server test configuration variables.
       - group: ADO Test Configuration Properties
 
+      # The directory where the "- download:" step places the SqlClient-Driver-Packages artifact
+      # published by the triggering sqlclient-ci-package pipeline.
+      - name: packageArtifactDir
+        value: $(Pipeline.Workspace)/sqlclient-ci-package/SqlClient-Driver-Packages
+
       # The top-level project file to build and run.
       - name: project
         value: $(Build.SourcesDirectory)/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
@@ -128,11 +135,22 @@ jobs:
       # bypassing the "--" separator.  This causes app arguments to contain SDK options and triggers
       # unintended behavior.
 
+      # Reference-mode arguments shared by build and run.  The stress tests are built in "Package"
+      # mode against the SqlClient packages downloaded from the sqlclient-ci-package pipeline.  The
+      # exact versions are resolved at runtime from the downloaded .nupkg filenames (see the
+      # "Stage Packages and Resolve Versions" step).
+      - name: referenceArgs
+        value: >-
+          -p:ReferenceType=Package
+          -p:SqlClientPackageVersion=$(mdsPackageVersion)
+          -p:AzurePackageVersion=$(azurePackageVersion)
+
       # dotnet CLI options for build.
       - name: dotnetBuildOpts
         value: >-
           --verbosity ${{ parameters.dotnetVerbosity }}
           -p:Configuration=${{ parameters.buildConfiguration }}
+          $(referenceArgs)
 
       # dotnet run options shared by all test steps (framework is appended per-step).
       - name: dotnetRunOpts
@@ -140,11 +158,27 @@ jobs:
           --no-build
           --verbosity ${{ parameters.dotnetVerbosity }}
           --configuration ${{ parameters.buildConfiguration }}
+          $(referenceArgs)
 
       # Stress test options passed after the "--" separator.
       - name: stressTestOpts
         value: --assembly SqlClient.Stress.Tests --console
 
+    # Select the pool based on the requested image:
+    #   - macOS images run on the Microsoft-hosted 'Azure Pipelines' pool (no 1ES macOS images).
+    #   - All other images run on the 1ES pool for the current ADO project, matched via imageOverride.
+    pool:
+      ${{ if startsWith(parameters.vmImage, 'macos') }}:
+        name: 'Azure Pipelines'
+        vmImage: ${{ parameters.vmImage }}
+      ${{ else }}:
+        ${{ if eq(variables.isInternalBuild, true) }}:
+          name: ADO-1ES-Pool
+        ${{ else }}:
+          name: ADO-CI-1ES-Pool
+        demands:
+          - imageOverride -equals ${{ parameters.vmImage }}
+
     steps:
 
       # Install the .NET SDK and Runtimes.
@@ -170,9 +204,47 @@ jobs:
             # Write the JSON content to the config file.
             $content | Out-File -FilePath "config.jsonc"
 
+      # Download the SqlClient driver packages published by the triggering sqlclient-ci-package
+      # pipeline into the pipeline workspace.
+      - download: sqlclient-ci-package
+        artifact: SqlClient-Driver-Packages
+        displayName: Download SqlClient Driver Packages
+
+      # Copy the downloaded packages into the local NuGet feed (packages/) and resolve the exact
+      # Microsoft.Data.SqlClient and Microsoft.Data.SqlClient.Extensions.Azure versions from the
+      # .nupkg filenames.  These versions are passed to the build via the referenceArgs variable.
+      - task: PowerShell@2
+        displayName: Stage Packages and Resolve Versions
+        inputs:
+          pwsh: true
+          targetType: inline
+          script: |
+            $ErrorActionPreference = 'Stop'
+            $feed = "$(Build.SourcesDirectory)/packages"
+            New-Item -ItemType Directory -Force -Path $feed | Out-Null
+
+            Copy-Item "$(packageArtifactDir)/*.nupkg" $feed -Force
+            Copy-Item "$(packageArtifactDir)/*.snupkg" $feed -Force -ErrorAction SilentlyContinue
+
+            $mdsPattern = '^Microsoft\.Data\.SqlClient\.(\d[^\\/]*)\.nupkg$'
+            $azurePattern = '^Microsoft\.Data\.SqlClient\.Extensions\.Azure\.(\d[^\\/]*)\.nupkg$'
+
+            $mds = Get-ChildItem "$feed/*.nupkg" | Where-Object { $_.Name -match $mdsPattern } | Select-Object -First 1
+            $azure = Get-ChildItem "$feed/*.nupkg" | Where-Object { $_.Name -match $azurePattern } | Select-Object -First 1
+
+            if (-not $mds) { throw "Microsoft.Data.SqlClient package not found in $feed" }
+            if (-not $azure) { throw "Microsoft.Data.SqlClient.Extensions.Azure package not found in $feed" }
+
+            $mdsVersion = [regex]::Match($mds.Name, $mdsPattern).Groups[1].Value
+            $azureVersion = [regex]::Match($azure.Name, $azurePattern).Groups[1].Value
+
+            Write-Host "Resolved Microsoft.Data.SqlClient version: $mdsVersion"
+            Write-Host "Resolved Microsoft.Data.SqlClient.Extensions.Azure version: $azureVersion"
+            Write-Host "##vso[task.setvariable variable=mdsPackageVersion]$mdsVersion"
+            Write-Host "##vso[task.setvariable variable=azurePackageVersion]$azureVersion"
+
       # Authenticate with NuGet feeds so that upstream packages (e.g. runtime host packs) can be
-      # fetched through the ADO Artifacts feed.  This is required on hosted pool agents (macOS)
-      # that do not have pre-configured feed credentials.
+      # fetched through the ADO Artifacts feed.
       - task: NuGetAuthenticate@1
         displayName: Authenticate NuGet feeds
 
diff --git a/eng/pipelines/stress/stress-tests-pipeline.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
similarity index 59%
rename from eng/pipelines/stress/stress-tests-pipeline.yml
rename to eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
index c1eb87faab..74283a8128 100644
--- a/eng/pipelines/stress/stress-tests-pipeline.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
@@ -4,17 +4,15 @@
 ####################################################################################################
 
 # This pipeline runs the stress test suite against the SqlClient projects, building them
-# transitively as necessary, triggered by successful runs of the following pipelines:
+# transitively as necessary, triggered by successful runs of the sqlclient-ci-package pipeline:
 #
 # Public project:
-#   Triggering pipelines: PR-SqlClient-Project, CI-SqlClient (branch main only)
-#   Pipeline name:        sqlclient-stress
-#   Pipeline URL:         https://sqlclientdrivers.visualstudio.com/public/_build?definitionId=2250
+#   Triggering pipeline:  sqlclient-ci-package
+#   Pipeline name:        sqlclient-ci-stress
 #
 # ADO.Net project:
-#   Triggering pipeline:  MDS Main CI (branch internal/main only)
-#   Pipeline name:        sqlclient-stress
-#   Pipeline URL:         https://dev.azure.com/SqlClientDrivers/ADO.Net/_build?definitionId=2284
+#   Triggering pipeline:  sqlclient-ci-package
+#   Pipeline name:        sqlclient-ci-stress
 
 # Set the pipeline run name to the day-of-year and the daily run counter.
 name: $(DayOfYear)$(Rev:rr)
@@ -23,7 +21,7 @@ name: $(DayOfYear)$(Rev:rr)
 pr: none
 trigger: none
 
-# Trigger this pipeline after successful runs of the desired pipelines.
+# Trigger this pipeline after successful runs of the sqlclient-ci-package pipeline.
 #
 # The pipeline identifiers are displayed in the Azure DevOps UI, so it is helpful if they indicate
 # the project, folder, and pipeline name, hence the verbose values below.
@@ -31,30 +29,23 @@ trigger: none
 resources:
   pipelines:
 
-    # The PR-SqlClient-Project pipeline in the Public project.
-    - pipeline: Public-ADO-PR-SqlClient-Project
-      project: Public
-      source: /ADO/PR-SqlClient-Project
+    # Trigger this pipeline when the sqlclient-ci-package pipeline completes successfully.
+    #
+    # 'project' is omitted so the resource resolves to the sqlclient-ci-package pipeline in the
+    # *current* ADO project.  This scopes the trigger per project automatically: the Public
+    # registration is triggered only by Public's sqlclient-ci-package, and the ADO.Net registration
+    # only by ADO.Net's.
+    #
+    # IMPORTANT: 'source' is the bare pipeline name with no folder path.  This REQUIRES the
+    # sqlclient-ci-package name to be UNIQUE within BOTH the Public and ADO.Net projects.  Azure
+    # DevOps only allows omitting the folder when the name is unambiguous; if a second pipeline with
+    # this name is ever added to either project, this resource will fail to resolve and the folder
+    # path must be added back (which, because the folders differ per project, would then require a
+    # per-project approach instead of this single shared definition).
+    - pipeline: sqlclient-ci-package
+      source: sqlclient-ci-package
       trigger: true
 
-    # The CI-SqlClient pipeline in the Public project.
-    - pipeline: Public-ADO-CI-SqlClient
-      project: Public
-      source: /ADO/CI-SqlClient
-      trigger:
-        branches:
-          include:
-            - main
-
-    # The MDS Main CI pipeline in the ADO.Net project.
-    - pipeline: ADO-Net-Internal-CI-MDS-Main-CI
-      project: ADO.Net
-      source: /CI/MDS Main CI
-      trigger:
-        branches:
-          include:
-            - internal/main
-
 # Pipeline parameters, visible in the Azure DevOps UI.
 parameters:
 
@@ -92,17 +83,6 @@ parameters:
       - detailed
       - diagnostic
 
-# Pipeline-level variables evaluated at compile time.
-variables:
-  # The 1ES pool name, determined automatically by ADO project:
-  #   - ADO.Net  -> ADO-1ES-Pool
-  #   - public   -> ADO-CI-1ES-Pool
-  - name: poolName
-    ${{ if eq(variables['System.TeamProject'], 'ADO.Net') }}:
-      value: ADO-1ES-Pool
-    ${{ else }}:
-      value: ADO-CI-1ES-Pool
-
 # The stages to run.
 stages:
 
@@ -112,10 +92,9 @@ stages:
       debug: ${{ parameters.debug }}
 
   # Run the stress tests.
-  - template: /eng/pipelines/stress/stress-tests-stage.yml@self
+  - template: /eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml@self
     parameters:
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
-      poolName: ${{ variables.poolName }}
       warnOnTestFailure: ${{ parameters.warnOnTestFailure }}
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/stress/stress-tests-stage.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
similarity index 89%
rename from eng/pipelines/stress/stress-tests-stage.yml
rename to eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
index 1f223c5142..689d1a702b 100644
--- a/eng/pipelines/stress/stress-tests-stage.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
@@ -57,10 +57,6 @@ parameters:
     type: object
     default: [net8.0, net9.0, net10.0]
 
-  # The 1ES pool name for Linux and Windows jobs.  macOS always uses 'Azure Pipelines'.
-  - name: poolName
-    type: string
-
 stages:
   - stage: stress_tests_stage
     displayName: Run Stress Tests
@@ -77,7 +73,7 @@ stages:
     # ----------------------------------------------------------------------------------------------
     # Build and test on Linux.
 
-    - template: /eng/pipelines/stress/stress-tests-job.yml@self
+    - template: /eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml@self
       parameters:
         buildConfiguration: ${{ parameters.buildConfiguration }}
         debug: ${{ parameters.debug }}
@@ -88,7 +84,6 @@ stages:
         # No .NET Framework runtimes on Linux.
         netFrameworkTestRuntimes: []
         netTestRuntimes: ${{ parameters.netTestRuntimes }}
-        poolName: ${{ parameters.poolName }}
         saPassword: $(saPassword)
         sqlSetupStep:
           template: /eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml@self
@@ -99,7 +94,7 @@ stages:
     # ----------------------------------------------------------------------------------------------
     # Build and test on Windows
 
-    - template: /eng/pipelines/stress/stress-tests-job.yml@self
+    - template: /eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml@self
       parameters:
         buildConfiguration: ${{ parameters.buildConfiguration }}
         debug: ${{ parameters.debug }}
@@ -110,7 +105,6 @@ stages:
         # Note that we include the .NET Framework runtimes for test runs on Windows.
         netFrameworkTestRuntimes: ${{ parameters.netFrameworkTestRuntimes }}
         netTestRuntimes: ${{ parameters.netTestRuntimes }}
-        poolName: ${{ parameters.poolName }}
         saPassword: $(saPassword)
         sqlSetupStep:
           template: /eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml@self
@@ -123,7 +117,7 @@ stages:
     # ----------------------------------------------------------------------------------------------
     # Build and test on macOS.
 
-    - template: /eng/pipelines/stress/stress-tests-job.yml@self
+    - template: /eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml@self
       parameters:
         buildConfiguration: ${{ parameters.buildConfiguration }}
         debug: ${{ parameters.debug }}
@@ -134,12 +128,10 @@ stages:
         # No .NET Framework runtimes on macOS.
         netFrameworkTestRuntimes: []
         netTestRuntimes: ${{ parameters.netTestRuntimes }}
-        # We don't have any 1ES Hosted Pool images for macOS, so we use a generic one from Azure
-        # Pipelines.
-        poolName: Azure Pipelines
         saPassword: $(saPassword)
         sqlSetupStep:
           template: /eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml@self
           parameters:
             saPassword: $(saPassword)
+        # A macOS vmImage name routes this job to the Microsoft-hosted 'Azure Pipelines' pool.
         vmImage: macos-latest
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index 70a37e0fa7..695145e990 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -54,7 +54,6 @@ pr:
       - eng/pipelines/ci/*
       - eng/pipelines/kerberos/*
       - eng/pipelines/onebranch/*
-      - eng/pipelines/stress/*
 
 # Do not trigger commit or schedule runs for this pipeline.
 trigger: none
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index f777626c90..14c1af4e7f 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -54,7 +54,6 @@ pr:
       - eng/pipelines/ci/*
       - eng/pipelines/kerberos/*
       - eng/pipelines/onebranch/*
-      - eng/pipelines/stress/*
 
 # Do not trigger commit or schedule runs for this pipeline.
 trigger: none
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props
index addc60556f..4c180661aa 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Packages.props
@@ -7,10 +7,22 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <!-- We enable transitive pinning here because we are an application project. -->
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+
+    <!-- Default to referencing the SqlClient projects directly (e.g. for IDE/local development). -->
+    <!-- CI builds pass ReferenceType=Package to build against the produced NuGet packages instead. -->
+    <ReferenceType Condition="'$(ReferenceType)' == ''">Project</ReferenceType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageVersion Include="System.CommandLine" Version="2.0.8" />
   </ItemGroup>
 
+  <!-- In Package mode the driver references resolve to NuGet packages restored from the local feed  -->
+  <!-- (packages/). The exact versions are supplied by the pipeline via the SqlClientPackageVersion   -->
+  <!-- and AzurePackageVersion build parameters, derived from the downloaded package artifacts.       -->
+  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="$(SqlClientPackageVersion)" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="$(AzurePackageVersion)" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/SqlClient.Stress.Framework.csproj b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/SqlClient.Stress.Framework.csproj
index 6feb8f34d4..e02f3e79d2 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/SqlClient.Stress.Framework.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Framework/SqlClient.Stress.Framework.csproj
@@ -5,8 +5,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
+    <!-- In "Package" mode the references to MDS and the Azure extension resolve to their NuGet   -->
+    <!-- packages, so the stress tests build against a fully-packaged driver. Package mode is       -->
+    <!-- selected by setting the build parameter ReferenceType to "Package". Otherwise the build    -->
+    <!-- defaults to referencing the projects directly.                                            -->
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient"
+                      Condition="'$(ReferenceType)' == 'Package'" />
+
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Azure"
+                      Condition="'$(ReferenceType)' == 'Package'" />
 
     <ProjectReference Include="$(StressRoot)/SqlClient.Stress.Common/SqlClient.Stress.Common.csproj" />
   </ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
index 8a2bc08b4c..d6e81b457c 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
@@ -10,7 +10,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
+    <!-- In "Package" mode the reference to MDS resolves to its NuGet package, so the stress tests -->
+    <!-- build against a fully-packaged driver. Package mode is selected by setting the build      -->
+    <!-- parameter ReferenceType to "Package". Otherwise the build defaults to a project reference. -->
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient"
+                      Condition="'$(ReferenceType)' == 'Package'" />
 
     <ProjectReference Include="$(StressRoot)/IMonitorLoader/IMonitorLoader.csproj" />
     <ProjectReference Include="$(StressRoot)/SqlClient.Stress.Common/SqlClient.Stress.Common.csproj" />
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj
index 90cdaf6e2b..15eb436add 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj
@@ -5,7 +5,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
+    <!-- In "Package" mode the reference to MDS resolves to its NuGet package, so the stress tests -->
+    <!-- build against a fully-packaged driver. Package mode is selected by setting the build      -->
+    <!-- parameter ReferenceType to "Package". Otherwise the build defaults to a project reference. -->
+    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient"
+                      Condition="'$(ReferenceType)' == 'Package'" />
 
     <ProjectReference Include="$(StressRoot)/SqlClient.Stress.Framework/SqlClient.Stress.Framework.csproj" />
   </ItemGroup>

From 8e5bf0007e2454f4c388eee7944d4f00e0ceffcf Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 21 Jul 2026 17:13:13 -0300
Subject: [PATCH 198/298] Quarantine new flaky tests (#4453)

* Issue 46480: GitHub #4379: Tests | Failing tests that need to marked flaky

- Quarantining more flaky tests.

* Quarantining more new flaky tests.

* More new flaky tests.

* Yet another new flaky test.

* Another flaky test.

* Quarantine new flaky tests and tidy quarantine comment (PR #4453)

- Quarantine ConnectionFailoverTests.NetworkTimeout_ShouldFail (CI Assert.Equal timing flake).
- Quarantine ConnectionTests.NetworkError_RetryEnabled_ShouldSucceed_Async (post-login connection timeout flake).
- Remove unrelated ConnectionFailoverTests.TransientFault_ShouldConnectToPrimary failure line from the Shutdown_UnblocksSyncWaiter quarantine comment.

* Harden macOS/Windows SQL Server CI setup against transient failures (PR #4453)

- macOS: retry 'docker pull' of the mssql image (5x, 15s backoff) to tolerate mcr.microsoft.com DNS/registry timeouts, and verify 'docker run' launched the container.
- Windows: retry the FileStream sp_configure (10x, 5s sleep) to tolerate transient post-restart 'session is in the kill state' severe errors.

* Another flaky tests has been revealed!

* Another flaky test.

* Addressed review feedback.

* Fix Invoke-Sqlcmd retry loops to catch non-terminating errors (PR #4453)

Add -ErrorAction Stop to the Invoke-Sqlcmd calls inside the try/catch
retry loops in configure-sql-server-win-step.yml. Without it,
non-terminating errors bypass the catch block and defeat the retry
logic. Applied to all three retry loops (Create SQL user, Restart SQL
Server, Configure FileStream Access Level).

Addresses review feedback on PR #4453.

* Quarantine flaky NetworkDelay_RetryDisabled unit test

NetworkDelay_RetryDisabled is timing-sensitive: it uses a 1000ms
TransientDelayTdsServer with ConnectTimeout=5s and expects Open() to
succeed. Under CI load the post-login phase can exceed the 5s budget
(observed [Post-Login] complete=4004ms), causing a Connection Timeout
Expired SqlException. Mark it [Trait("Category", "flaky")] so the CI
category!=flaky filter excludes it, and record the observed failure
stack trace as a comment for follow-up.

Relates to PR #4453 (Quarantine new flaky tests).

* Fix macOS SQL Server setup: point docker CLI at Colima socket

The standalone docker CLI (brew install docker) defaulted to
unix:///var/run/docker.sock, which does not exist on macOS without
Docker Desktop, so every 'docker pull' failed instantly with 'failed
to connect to the docker API'. Export DOCKER_HOST to Colima's socket
(~/.colima/default/docker.sock), fail fast if 'colima start' fails,
and verify the daemon is reachable via 'docker info' before pulling.

Relates to PR #4453 (Quarantine new flaky tests).

* Quarantine flaky ConnectionTest unit test

ConnectionTest intermittently fails with InvalidOperationException
'The SQL Server instance returned an invalid or unsupported protocol
version during login negotiation', thrown from
BlockingPeriodErrorState.ThrowIfActive(). This is cross-test
contamination of the shared connection pool: a prior simulated-server
test's cached login error is re-thrown by this test's Open(). Mark it
[Trait("Category", "flaky")] and record the observed stack trace.

Relates to PR #4453 (Quarantine new flaky tests).

* Fix connection-pool poisoning in simulated-server tests; unquarantine ConnectionTest

Root-cause fix replacing the earlier ConnectionTest quarantine (3cebfbd8c).

A failing pooled Open() against a non-Azure endpoint (localhost) enters a
5-second BlockingPeriodErrorState that is keyed by connection string. When a
later test's ephemeral TdsServer reuses the same port, it inherits the cached
exception via ThrowIfActive() and fails without contacting the new server.
ConnectionTest was thus failing with a cached InvalidTDSVersion error seeded by
ConnectionRefusesUnsupportedServerTdsVersion.

Add Pooling=false to the failure-injecting tests so their expected failures do
not poison a shared pool:
  - ConnectionTests: RequestEncryption_ServerDoesNotSupportEncryption_ShouldFail,
    TransientFault_RetryDisabled_ShouldFail(+_Async), ConnectionTimeoutTest(+Async),
    ConnectionRefusesUnsupportedServerTdsVersion, TestConnWithVectorFeatExtVersionNegotiation
  - ConnectionRoutingTests / ConnectionRoutingTestsAzure: TransientFaultAtRoutedLocation_RetryDisabled_ShouldFail
  - ConnectionReadOnlyRoutingTests: RecursivelyRouted{,Async}Connection (ConnectionRoutingLimit)

Remove the [Trait("Category","flaky")] from ConnectionTest: it was a poisoning
victim, not a genuine flake, and is deterministic once the source is fixed.
Genuine timing-race quarantines are left in place.

Relates to PR #4453 (Quarantine new flaky tests).

* Retry Colima start on macOS SQL Server setup

The Lima hostagent that backs Colima intermittently fails to become ready
within its short startup window on the macOS CI runners ("hostagent did not
start up in 5s"), which is transient. Retry 'colima start' up to 3 times,
dumping ha.stderr.log and tearing down the half-created instance
(colima delete --force) between attempts before giving up.

Relates to PR #4453 (Quarantine new flaky tests).
---
 .../steps/configure-sql-server-macos-step.yml |  82 ++++++++-
 .../steps/configure-sql-server-win-step.yml   |  29 +++-
 .../WaitHandleDbConnectionPoolShutdownTest.cs |   7 +
 .../ConnectionFailoverTests.cs                | 156 +++++++++++++++---
 .../ConnectionReadOnlyRoutingTests.cs         |  19 ++-
 .../ConnectionRoutingTests.cs                 |  12 ++
 .../ConnectionRoutingTestsAzure.cs            |   1 +
 .../SimulatedServerTests/ConnectionTests.cs   | 131 ++++++++++++++-
 8 files changed, 398 insertions(+), 39 deletions(-)

diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
index 6e1541f939..89b5e9f738 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
@@ -52,14 +52,90 @@ steps:
       # Colima >= 0.8 when using --vm-type vz, which is dramatically faster than
       # --arch x86_64 (full QEMU VM emulation).
       # Requires macOS >= 13 (Ventura).
-      colima start --vm-type vz --cpu 4 --memory 4
+      #
+      # The Lima hostagent that backs Colima intermittently fails to become
+      # ready within its short startup window on the macOS CI runners
+      # ("hostagent did not start up in 5s"), which is transient. Retry a few
+      # times, tearing down the half-created instance between attempts and
+      # dumping the hostagent log for diagnostics, before giving up.
+      colimaAttempts=3
+      colimaStarted=0
+      for ((c=1; c<=colimaAttempts; c++))
+      do
+        echo "Starting Colima (attempt #$c of $colimaAttempts)..."
+        if colima start --vm-type vz --cpu 4 --memory 4; then
+          colimaStarted=1
+          break
+        fi
+        echo "colima start failed (attempt #$c of $colimaAttempts)."
+        echo "--- hostagent stderr (last 40 lines) ---"
+        tail -40 "$HOME/.colima/_lima/colima/ha.stderr.log" 2>/dev/null || true
+        echo "--- Tearing down half-created instance before retry ---"
+        colima delete --force || true
+        sleep 5
+      done
+
+      if [ $colimaStarted -ne 1 ]; then
+        echo "ERROR: colima failed to start after $colimaAttempts attempts."
+        colima status || true
+        exit 1
+      fi
+
+      # Point the docker CLI at Colima's daemon socket.  Colima normally sets an
+      # active docker context, but the standalone docker CLI (installed above via
+      # 'brew install docker') can default to unix:///var/run/docker.sock, which
+      # does not exist on macOS without Docker Desktop.  This caused every
+      # 'docker pull' to fail instantly with:
+      #   failed to connect to the docker API at unix:///var/run/docker.sock
+      # Export DOCKER_HOST explicitly so all docker commands reach Colima.
+      export DOCKER_HOST="unix://${HOME}/.colima/default/docker.sock"
       docker --version
-      docker pull --platform linux/amd64 mcr.microsoft.com/mssql/server:2025-latest
+
+      # Verify the docker daemon is actually reachable before attempting to pull.
+      # This fails fast with useful diagnostics instead of looping through the
+      # pull retries when the socket is misconfigured.
+      if ! docker info >/dev/null 2>&1; then
+        echo "ERROR: docker daemon is not reachable at $DOCKER_HOST."
+        echo "--- colima status ---"
+        colima status || true
+        echo "--- docker context ls ---"
+        docker context ls || true
+        exit 1
+      fi
+
+      # Pull the SQL Server image with retries.  The macOS agents intermittently
+      # fail to resolve or reach mcr.microsoft.com (DNS lookups or registry i/o
+      # time out), which previously failed the whole step on the first attempt.
+      # Retry a handful of times with a fixed delay before giving up.
+      pullAttempts=5
+      pullDelay=15
+      pulled=0
+      for ((p=1; p<=pullAttempts; p++))
+      do
+        echo "Pulling SQL Server image (attempt #$p of $pullAttempts)..."
+        if docker pull --platform linux/amd64 mcr.microsoft.com/mssql/server:2025-latest; then
+          pulled=1
+          break
+        fi
+        echo "docker pull failed (attempt #$p of $pullAttempts). Retrying in ${pullDelay}s..."
+        sleep $pullDelay
+      done
+
+      if [ $pulled -ne 1 ]; then
+        echo "ERROR: Unable to pull mcr.microsoft.com/mssql/server:2025-latest after $pullAttempts attempts (registry/DNS unreachable)."
+        exit 1
+      fi
 
       # Password for the SA user (required)
       MSSQL_SA_PW="${{ parameters.saPassword }}"
 
-      docker run --platform linux/amd64 -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$MSSQL_SA_PW" -p 1433:1433 -p 1434:1434 --name sql1 --hostname sql1 -d mcr.microsoft.com/mssql/server:2025-latest
+      # Start the container and fail fast (with diagnostics) if it does not launch,
+      # rather than silently falling through to the connection-wait loop.
+      if ! docker run --platform linux/amd64 -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$MSSQL_SA_PW" -p 1433:1433 -p 1434:1434 --name sql1 --hostname sql1 -d mcr.microsoft.com/mssql/server:2025-latest; then
+        echo "ERROR: Failed to start the sql1 container."
+        docker ps -a --filter "name=^/sql1$"
+        exit 1
+      fi
 
       sleep 10
 
diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
index 2e58e5013c..5659d45de2 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
@@ -147,7 +147,7 @@ steps:
       while ($true) {
           $tries++
           try {
-              Invoke-Sqlcmd -ServerInstance "$machineName" -ConnectionTimeout 5 @"
+              Invoke-Sqlcmd -ServerInstance "$machineName" -ConnectionTimeout 5 -ErrorAction Stop @"
                   CREATE LOGIN [${{parameters.user }}] WITH PASSWORD=N'$password',
                   DEFAULT_DATABASE=[master], DEFAULT_LANGUAGE=[us_english], CHECK_EXPIRATION=OFF, CHECK_POLICY=OFF;
                   CREATE USER [${{parameters.user }}] FROM LOGIN [${{parameters.user }}];
@@ -293,7 +293,7 @@ steps:
       while ($true) {
           $tries++
           try {
-              Invoke-Sqlcmd -ServerInstance "$machineName" -Query "SELECT @@VERSION" -ConnectionTimeout 5
+              Invoke-Sqlcmd -ServerInstance "$machineName" -Query "SELECT @@VERSION" -ConnectionTimeout 5 -ErrorAction Stop
               Write-Host "SQL Server is ready after restart (attempt $tries)."
               break
           } catch {
@@ -320,11 +320,26 @@ steps:
         Set-ExecutionPolicy Unrestricted
         Import-Module "sqlps"
 
-        Invoke-Sqlcmd -ServerInstance "$machineName" -ConnectionTimeout 5 @"
-            EXEC sp_configure filestream_access_level, 2;
-            RECONFIGURE;
-        "@
-        Write-Host "FileStream access level configured successfully."
+        # Immediately after the restart SQL Server can still be stabilizing, which
+        # can surface transient errors such as "the session is in the kill state"
+        # or other severe command errors.  Retry a few times before failing so a
+        # momentary hiccup does not fail the whole step.
+        $tries = 0
+        while ($true) {
+            $tries++
+            try {
+                Invoke-Sqlcmd -ServerInstance "$machineName" -ConnectionTimeout 5 -Query "EXEC sp_configure filestream_access_level, 2; RECONFIGURE;" -ErrorAction Stop
+                Write-Host "FileStream access level configured successfully (attempt $tries)."
+                break
+            } catch {
+                if ($tries -ge 10) {
+                    Write-Host "##[error]Failed to configure FileStream access level after $tries attempts."
+                    throw
+                }
+                Write-Host "FileStream configuration failed (attempt $tries/10): $($_.Exception.Message). Retrying..."
+                Start-Sleep -Seconds 5
+            }
+        }
       displayName: 'Configure FileStream Access Level [Win]'
 
   # Step 9: Start the SQL Server Browser service so that named instances can be
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
index 7268728c8b..4ec6370d88 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
@@ -161,6 +161,13 @@ public void TryGetConnection_Async_AfterShutdown_ShortCircuits_NoPendingOpenSche
         }
 
         // Shutdown wakes up a thread parked in WaitHandle.WaitAny.
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.ConnectionPool.WaitHandleDbConnectionPoolShutdownTest.Shutdown_UnblocksSyncWaiter [5 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Waiter did not park within 5s.
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.ConnectionPool.WaitHandleDbConnectionPoolShutdownTest.Shutdown_UnblocksSyncWaiter() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\ConnectionPool\WaitHandleDbConnectionPoolShutdownTest.cs:line 207
         [Fact]
         public void Shutdown_UnblocksSyncWaiter()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index 566d3d0cef..c86633c25e 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -132,8 +132,8 @@ public void NetworkError_TriggersFailover_ClearsPool()
             using SqlConnection connection = new(builder.ConnectionString);
 
             /* TODO: Fix flaky test failure:
-            Microsoft.Data.SqlClient.SqlException : A network-related or instance-specific error occurred while establishing a connection to SQL Server. 
-                The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured 
+            Microsoft.Data.SqlClient.SqlException : A network-related or instance-specific error occurred while establishing a connection to SQL Server.
+                The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured
                 to allow remote connections. (provider: TCP Provider, error: 0 - The wait operation timed out.)
                 ---- System.ComponentModel.Win32Exception : The wait operation timed out.
             */
@@ -173,6 +173,17 @@ to allow remote connections. (provider: TCP Provider, error: 0 - The wait operat
             Assert.Equal(2, failoverServer.PreLoginCount);
         }
 
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkTimeout_ShouldFail [1 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Assert.Equal() Failure: Values differ
+        //   Expected: 1
+        //   Actual:   0
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkTimeout_ShouldFail() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 220
+        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
+        //      at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
         [Fact]
         public void NetworkTimeout_ShouldFail()
         {
@@ -221,6 +232,42 @@ public void NetworkTimeout_ShouldFail()
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkDelay_ShouldConnectToPrimary [4 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections.  The duration spent while attempting to connect to this server was - [Pre-Login] initialization=0; handshake=17; [Login] initialization=0; authentication=0; [Post-Login] complete=3999;
+        //   ---- System.ComponentModel.Win32Exception : The wait operation timed out.
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 1241
+        //      at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 1721
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ThrowExceptionAndWarning(Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1243
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniError(TdsParserStateObject stateObj, UInt32 error) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 4168
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 3581
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 3480
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryPrepareBuffer() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1464
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1780
+        //      at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2456
+        //      at Microsoft.Data.SqlClient.TdsParser.Run(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2343
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2208
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.AttemptOneLogin(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, TimeoutTimer timeout, Boolean withFailover) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2170
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions connectionOptions, SqlCredential credential, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3214
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionOptions connectionOptions, SqlCredential credential, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3793
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal..ctor(DbConnectionPoolIdentity identity, SqlConnectionOptions connectionOptions, TimeoutTimer timeout, SqlCredential credential, DbConnectionPoolGroupProviderInfo providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken, IDbConnectionPool pool, Func`3 accessTokenCallback, SspiContextProvider sspiContextProvider) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 399
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(SqlConnectionOptions options, ConnectionPoolKey poolKey, DbConnectionPoolGroupProviderInfo poolGroupProviderInfo, IDbConnectionPool pool, DbConnection owningConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 687
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 124
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionInternal oldConnection, TimeoutTimer timeout, Boolean forceNewConnection, DbConnectionInternal& connection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 417
+        //      at Microsoft.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, SqlConnectionFactory connectionFactory, TaskCompletionSource`1 retry, Boolean forceNewConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\ProviderBase\DbConnectionInternal.cs:line 940
+        //      at Microsoft.Data.ProviderBase.DbConnectionClosed.TryOpenConnection(DbConnection outerConnection, SqlConnectionFactory connectionFactory, TaskCompletionSource`1 retry, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\ProviderBase\DbConnectionClosed.cs:line 69
+        //      at Microsoft.Data.SqlClient.SqlConnection.TryOpenInner(TaskCompletionSource`1 retry, Boolean forceNewConnection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 2287
+        //      at Microsoft.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry, Boolean forceNewConnection, SqlConnectionOverrides overrides) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 2245
+        //      at Microsoft.Data.SqlClient.SqlConnection.Open(SqlConnectionOverrides overrides) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 1619
+        //      at Microsoft.Data.SqlClient.SqlConnection.Open() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 1596
+        //      at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkDelay_ShouldConnectToPrimary() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 260
+        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
+        //      at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
+        //      at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
+        //   ----- Inner Stack Trace -----
         [Fact]
         public void NetworkDelay_ShouldConnectToPrimary()
         {
@@ -305,11 +352,11 @@ public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFa
 
             // Act
             /* TODO: Fix flaky test failure:
-            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  
-                The connection could have timed out while waiting for server to complete the login process and respond; 
-                Or it could have timed out while attempting to create multiple active connections.  
-                This failure occurred while attempting to connect to the Principle server.  
-                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=6; handshake=80; 
+            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.
+                The connection could have timed out while waiting for server to complete the login process and respond;
+                Or it could have timed out while attempting to create multiple active connections.
+                This failure occurred while attempting to connect to the Principle server.
+                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=6; handshake=80;
                 [Login] initialization=0; authentication=0; [Post-Login] complete=5443;
                 ---- System.ComponentModel.Win32Exception : The wait operation timed out
             */
@@ -368,21 +415,21 @@ public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFai
             using SqlConnection connection = new(builder.ConnectionString);
             // Act
             /* TODO: Fix flaky test failure:
-            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  
-                The timeout period elapsed during the post-login phase.  
-                The connection could have timed out while waiting for server to complete the login process and respond; 
-                Or it could have timed out while attempting to create multiple active connections.  
-                This failure occurred while attempting to connect to the Principle server.  
-                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=4; handshake=68; 
-                [Login] initialization=0; authentication=0; [Post-Login] complete=5443; 
+            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.
+                The timeout period elapsed during the post-login phase.
+                The connection could have timed out while waiting for server to complete the login process and respond;
+                Or it could have timed out while attempting to create multiple active connections.
+                This failure occurred while attempting to connect to the Principle server.
+                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=4; handshake=68;
+                [Login] initialization=0; authentication=0; [Post-Login] complete=5443;
                 ---- System.ComponentModel.Win32Exception : The wait operation timed out
             */
             /* TODO: Fix flaky test failure:
-            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  
-                The timeout period elapsed while attempting to consume the pre-login handshake acknowledgement.  
-                This could be because the pre-login handshake failed or the server was unable to respond back in time.  
-                This failure occurred while attempting to connect to the Principle server.  
-                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=0; handshake=5285; 
+            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.
+                The timeout period elapsed while attempting to consume the pre-login handshake acknowledgement.
+                This could be because the pre-login handshake failed or the server was unable to respond back in time.
+                This failure occurred while attempting to connect to the Principle server.
+                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=0; handshake=5285;
                 ---- System.ComponentModel.Win32Exception : The wait operation timed out.
             */
             connection.Open();
@@ -406,6 +453,15 @@ This could be because the pre-login handshake failed or the server was unable to
         /// Verifies login-phase transient SQL errors are retried on the primary endpoint and
         /// do not trigger failover-partner alternation.
         /// </summary>
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_ShouldConnectToPrimary(errorCode: 42109) [6 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Assert.Equal() Failure: Values differ
+        //   Expected: 2
+        //   Actual:   3
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_ShouldConnectToPrimary(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 451
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -565,7 +621,14 @@ public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint e
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
-        [Trait("Category", "flaky")] // [errorcode: 42109] Assert.Fail() Failure
+        [Trait("Category", "flaky")]
+        //              Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_RetryDisabled_ShouldFail(errorCode: 42109) [2 s]
+        // EXEC : error Message:  [/Users/runner/work/1/s/build2.proj]
+        //      Assert.Fail() Failure
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_RetryDisabled_ShouldFail(UInt32 errorCode) in /Users/runner/work/1/s/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs:line 526
+        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
+        //      at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -656,8 +719,8 @@ public void TransientFault_IgnoreServerProvidedFailoverPartner_ShouldConnectToUs
 
             // Connect once to the primary to trigger it to send the failover partner
             /* TODO: Fix flaky test failure:
-            Microsoft.Data.SqlClient.SqlException : A network-related or instance-specific error occurred while establishing a connection to SQL Server. 
-                The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections. 
+            Microsoft.Data.SqlClient.SqlException : A network-related or instance-specific error occurred while establishing a connection to SQL Server.
+                The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections.
                 (provider: TCP Provider, error: 0 - The wait operation timed out.)
                 ---- System.ComponentModel.Win32Exception : The wait operation timed out.
             */
@@ -756,6 +819,18 @@ public async Task TransientFault_Async_ShouldConnectToPrimary_NotFailover(uint e
         /// Async parity with user-provided partner: login-phase transient SQL errors should
         /// still retry on primary without failover alternation.
         /// </summary>
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Async_ShouldConnectToPrimary_NotFailover(errorCode: 42109) [4 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Assert.Equal() Failure: Strings differ
+        //                            Γåô (pos 14)
+        //   Expected: "localhost,60625"
+        //   Actual:   "localhost,60624"
+        //                            Γåæ (pos 14)
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Async_ShouldConnectToPrimary_NotFailover(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 816
+        //   --- End of stack trace from previous location ---
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -807,6 +882,19 @@ public async Task TransientFault_WithUserProvidedPartner_Async_ShouldConnectToPr
         /// Verifies pooled connections are not cleared and failover is not attempted when a
         /// login-phase transient SQL error occurs with a user-provided failover partner.
         /// </summary>
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(errorCode: 40613) [2 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Assert.Equal() Failure: Strings differ
+        //                            Γåô (pos 14)
+        //   Expected: "localhost,50152"
+        //   Actual:   "localhost,50151"
+        //                            Γåæ (pos 14)
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 920
+        //      at InvokeStub_ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(Object, Span`1)
+        //      at System.Reflection.MethodBaseInvoker.InvokeWithOneArg(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -932,6 +1020,17 @@ public void TransientFault_RetryDisabled_WithUserProvidedPartner_ShouldFail_NotF
         /// Isolates the parser-state guard by using a non-fatal login error token: without the
         /// guard, LoginWithFailover alternates to partner; with the guard, retry stays on primary.
         /// </summary>
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NonFatalTransientLoginError_WithUserProvidedPartner_ShouldRetryPrimary_NotFailover [1 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [/mnt/vss/_work/1/s/build.proj]
+        //      Assert.Equal() Failure: Values differ
+        //   Expected: 0
+        //   Actual:   1
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NonFatalTransientLoginError_WithUserProvidedPartner_ShouldRetryPrimary_NotFailover() in /mnt/vss/_work/1/s/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs:line 1006
+        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
+        //      at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
         [Fact]
         public void NonFatalTransientLoginError_WithUserProvidedPartner_ShouldRetryPrimary_NotFailover()
         {
@@ -982,6 +1081,19 @@ public void NonFatalTransientLoginError_WithUserProvidedPartner_ShouldRetryPrima
         /// Verifies opt-in legacy behavior: login-phase SQL errors can alternate to the
         /// failover partner when UseLegacyFailoverAlternationOnLoginSqlErrors is enabled.
         /// </summary>
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NonFatalTransientLoginError_WithLegacySwitch_ShouldAlternateToFailoverPartner [2 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Assert.Equal() Failure: Strings differ
+        //                            Γåô (pos 14)
+        //   Expected: "localhost,60991"
+        //   Actual:   "localhost,60992"
+        //                            Γåæ (pos 14)
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NonFatalTransientLoginError_WithLegacySwitch_ShouldAlternateToFailoverPartner() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 1114
+        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
+        //      at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
         [Fact]
         public void NonFatalTransientLoginError_WithLegacySwitch_ShouldAlternateToFailoverPartner()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs
index 8220871f22..4675066a12 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs
@@ -80,7 +80,15 @@ public void RecursivelyRoutedConnection(int layers)
                     }).ConnectionString;
                 }
 
-                SqlConnectionStringBuilder builder = new(lastConnectionString) { ApplicationIntent = ApplicationIntent.ReadOnly };
+                SqlConnectionStringBuilder builder = new(lastConnectionString)
+                {
+                    ApplicationIntent = ApplicationIntent.ReadOnly,
+                    Pooling = false,
+                    // The whole routing chain must complete within a single Connect Timeout
+                    // budget. Allow ample time so the many-hop chain rides out thread-pool
+                    // congestion under parallel CI runs instead of tripping a timeout.
+                    ConnectTimeout = 60
+                };
                 using SqlConnection connection = new(builder.ConnectionString);
                 connection.Open();
             }
@@ -125,7 +133,14 @@ public async Task RecursivelyRoutedAsyncConnection(int layers)
 
                 SqlConnectionStringBuilder builder = new(lastConnectionString) {
                     ApplicationIntent = ApplicationIntent.ReadOnly,
-                    Encrypt = false
+                    Encrypt = false,
+                    Pooling = false,
+                    // The async non-pooled open runs the entire routing chain in a single
+                    // thread-pool-scheduled continuation, so it must finish within one Connect
+                    // Timeout budget. The default 15s can be exceeded under CI thread-pool
+                    // congestion (12 in-process TdsServers contend for the same starved pool),
+                    // producing a flaky NonPooledOpenTimeout. Allow ample time to ride it out.
+                    ConnectTimeout = 60
                 };
                 using SqlConnection connection = new(builder.ConnectionString);
                 await connection.OpenAsync();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
index 3065f780bc..c5bd6edf57 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
@@ -96,6 +96,7 @@ public void TransientFaultAtRoutedLocation_RetryDisabled_ShouldFail(uint errorCo
                 ConnectRetryInterval = 1,
                 ConnectRetryCount = 0, // Disable retry
                 Encrypt = false,
+                Pooling = false, // Disable pooling so this expected failure does not poison a shared pool
             };
             using SqlConnection connection = new(builder.ConnectionString);
 
@@ -103,6 +104,17 @@ public void TransientFaultAtRoutedLocation_RetryDisabled_ShouldFail(uint errorCo
             Assert.Throws<SqlException>(() => connection.Open());
         }
 
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionRoutingTests.NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed(multiSubnetFailoverEnabled: True) [2 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build2.proj]
+        //      Assert.Equal() Failure: Values differ
+        //   Expected: 1
+        //   Actual:   2
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionRoutingTests.NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed(Boolean multiSubnetFailoverEnabled) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionRoutingTests.cs:line 147
+        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
+        //      at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
index 642d54f5b2..f75514dae2 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
@@ -113,6 +113,7 @@ public void TransientFaultAtRoutedLocation_RetryDisabled_ShouldFail(uint errorCo
                 ConnectRetryInterval = 1,
                 ConnectRetryCount = 0, // Disable retry
                 Encrypt = false,
+                Pooling = false, // Disable pooling so this expected failure does not poison a shared pool
             };
             using SqlConnection connection = new(builder.ConnectionString);
             Assert.Throws<SqlException>(() => connection.Open());
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index ef058c881a..10cd111a16 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -67,7 +67,8 @@ public async Task RequestEncryption_ServerDoesNotSupportEncryption_ShouldFail()
             server.Start();
             var connStr = new SqlConnectionStringBuilder()
             {
-                DataSource = $"localhost,{server.EndPoint.Port}"
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                Pooling = false, // Disable pooling so this expected failure does not poison a shared pool
             }.ConnectionString;
 
             using SqlConnection connection = new(connStr);
@@ -75,6 +76,31 @@ public async Task RequestEncryption_ServerDoesNotSupportEncryption_ShouldFail()
             Assert.Contains("The instance of SQL Server you attempted to connect to does not support encryption.", ex.Message, StringComparison.OrdinalIgnoreCase);
         }
 
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.TransientFault_RetryEnabled_ShouldSucceed_Async(errorCode: 40613) [6 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Microsoft.Data.SqlClient.SqlException :
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 1303
+        //      at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 1739
+        //      at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 3139
+        //      at Microsoft.Data.SqlClient.TdsParser.Run(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2362
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2259
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.AttemptOneLogin(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, TimeoutTimer timeout, Boolean withFailover) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2223
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString connectionOptions, SqlCredential credential, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3266
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionString connectionOptions, SqlCredential credential, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3836
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal..ctor(DbConnectionPoolIdentity identity, SqlConnectionString connectionOptions, SqlCredential credential, DbConnectionPoolGroupProviderInfo providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString userConnectionOptions, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken, IDbConnectionPool pool, Func`3 accessTokenCallback, SspiContextProvider sspiContextProvider) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 443
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionPoolGroupProviderInfo poolGroupProviderInfo, IDbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 697
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreatePooledConnection(DbConnection owningConnection, IDbConnectionPool pool, DbConnectionPoolKey poolKey, DbConnectionOptions options, DbConnectionOptions userOptions) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 150
+        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 528
+        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.UserCreateRequest(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 1544
+        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, DbConnectionOptions userOptions, DbConnectionInternal& connection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 987
+        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.WaitForPendingOpen() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 834
+        //   --- End of stack trace from previous location ---
+        //      at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.TransientFault_RetryEnabled_ShouldSucceed_Async(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionTests.cs:line 101
+        //   --- End of stack trace from previous location ---
+
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -104,6 +130,37 @@ public async Task TransientFault_RetryEnabled_ShouldSucceed_Async(uint errorCode
             Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.TransientFault_RetryEnabled_ShouldSucceed(errorCode: 40613) [5 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Microsoft.Data.SqlClient.SqlException :
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 1241
+        //      at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 1721
+        //      at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 3119
+        //      at Microsoft.Data.SqlClient.TdsParser.Run(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2343
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2208
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.AttemptOneLogin(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, TimeoutTimer timeout, Boolean withFailover) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2170
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions connectionOptions, SqlCredential credential, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3214
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionOptions connectionOptions, SqlCredential credential, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3793
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal..ctor(DbConnectionPoolIdentity identity, SqlConnectionOptions connectionOptions, TimeoutTimer timeout, SqlCredential credential, DbConnectionPoolGroupProviderInfo providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken, IDbConnectionPool pool, Func`3 accessTokenCallback, SspiContextProvider sspiContextProvider) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 399
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(SqlConnectionOptions options, ConnectionPoolKey poolKey, DbConnectionPoolGroupProviderInfo poolGroupProviderInfo, IDbConnectionPool pool, DbConnection owningConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 687
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreatePooledConnection(DbConnection owningConnection, IDbConnectionPool pool, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 148
+        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionInternal oldConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 535
+        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.UserCreateRequest(DbConnection owningObject, TimeoutTimer timeout, DbConnectionInternal oldConnection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 1648
+        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, TimeoutTimer timeout, DbConnectionInternal& connection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 1026
+        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.TryGetConnection(DbConnection owningObject, TaskCompletionSource`1 taskCompletionSource, TimeoutTimer timeout, DbConnectionInternal& connection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 879
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionInternal oldConnection, TimeoutTimer timeout, Boolean forceNewConnection, DbConnectionInternal& connection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 431
+        //      at Microsoft.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, SqlConnectionFactory connectionFactory, TaskCompletionSource`1 retry, Boolean forceNewConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\ProviderBase\DbConnectionInternal.cs:line 940
+        //      at Microsoft.Data.ProviderBase.DbConnectionClosed.TryOpenConnection(DbConnection outerConnection, SqlConnectionFactory connectionFactory, TaskCompletionSource`1 retry, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\ProviderBase\DbConnectionClosed.cs:line 69
+        //      at Microsoft.Data.SqlClient.SqlConnection.TryOpenInner(TaskCompletionSource`1 retry, Boolean forceNewConnection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 2287
+        //      at Microsoft.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry, Boolean forceNewConnection, SqlConnectionOverrides overrides) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 2245
+        //      at Microsoft.Data.SqlClient.SqlConnection.Open(SqlConnectionOverrides overrides) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 1619
+        //      at Microsoft.Data.SqlClient.SqlConnection.Open() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 1596
+        //      at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.TransientFault_RetryEnabled_ShouldSucceed(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionTests.cs:line 152
+        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
+        //      at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -147,7 +204,8 @@ public async Task TransientFault_RetryDisabled_ShouldFail_Async(uint errorCode)
             {
                 DataSource = "localhost," + server.EndPoint.Port,
                 ConnectRetryCount = 0,
-                Encrypt = SqlConnectionEncryptOption.Optional
+                Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false, // Disable pooling so this expected failure does not poison a shared pool
             };
 
             using SqlConnection connection = new(builder.ConnectionString);
@@ -174,7 +232,8 @@ public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
             {
                 DataSource = "localhost," + server.EndPoint.Port,
                 ConnectRetryCount = 0,
-                Encrypt = SqlConnectionEncryptOption.Optional
+                Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false, // Disable pooling so this expected failure does not poison a shared pool
             };
 
             using SqlConnection connection = new(builder.ConnectionString);
@@ -184,6 +243,40 @@ public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
             Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkError_RetryEnabled_ShouldSucceed_Async(multiSubnetFailoverEnabled: True) [4 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections.  The duration spent while attempting to connect to this server was - [Pre-Login] initialization=5; handshake=43; [Login] initialization=0; authentication=0; [Post-Login] complete=4838;
+        //   ---- System.ComponentModel.Win32Exception : The wait operation timed out.
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 1241
+        //      at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 1721
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ThrowExceptionAndWarning(Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1243
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniError(TdsParserStateObject stateObj, UInt32 error) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 4168
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 3581
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 3480
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryPrepareBuffer() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1464
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1780
+        //      at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2456
+        //      at Microsoft.Data.SqlClient.TdsParser.Run(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2343
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2208
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.AttemptOneLogin(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, TimeoutTimer timeout, Boolean withFailover) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2170
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions connectionOptions, SqlCredential credential, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3214
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionOptions connectionOptions, SqlCredential credential, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3793
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal..ctor(DbConnectionPoolIdentity identity, SqlConnectionOptions connectionOptions, TimeoutTimer timeout, SqlCredential credential, DbConnectionPoolGroupProviderInfo providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken, IDbConnectionPool pool, Func`3 accessTokenCallback, SspiContextProvider sspiContextProvider) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 399
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(SqlConnectionOptions options, ConnectionPoolKey poolKey, DbConnectionPoolGroupProviderInfo poolGroupProviderInfo, IDbConnectionPool pool, DbConnection owningConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 687
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 124
+        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.<>c__DisplayClass41_0.<CreateReplaceConnectionContinuation>b__0(Task`1 _) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 777
+        //      at System.Threading.Tasks.ContinuationResultTaskFromResultTask`2.InnerInvoke()
+        //      at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state)
+        //   --- End of stack trace from previous location ---
+        //      at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state)
+        //      at System.Threading.Tasks.Task.ExecuteWithThreadLocal(Task& currentTaskSlot, Thread threadPoolThread)
+        //   --- End of stack trace from previous location ---
+        //      at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkError_RetryEnabled_ShouldSucceed_Async(Boolean multiSubnetFailoverEnabled) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionTests.cs:line 237
+        //   --- End of stack trace from previous location ---
+        //   ----- Inner Stack Trace -----
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
@@ -266,6 +359,21 @@ public async Task NetworkDelay_RetryDisabled_Async(bool multiSubnetFailoverEnabl
             }
         }
 
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkDelay_RetryDisabled(multiSubnetFailoverEnabled: False) [4 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections.  The duration spent while attempting to connect to this server was - [Pre-Login] initialization=0; handshake=25; [Login] initialization=0; authentication=0; [Post-Login] complete=4004;
+        //   ---- System.ComponentModel.Win32Exception : The wait operation timed out.
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 1241
+        //      at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 1721
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniError(TdsParserStateObject stateObj, UInt32 error) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 4168
+        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 3581
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2208
+        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions connectionOptions, SqlCredential credential, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3214
+        //      at Microsoft.Data.SqlClient.SqlConnection.Open() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 1596
+        //      at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkDelay_RetryDisabled(Boolean multiSubnetFailoverEnabled) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionTests.cs:line 387
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
@@ -458,6 +566,15 @@ public void ConnectionTestValidCredentialCombination()
         }
 
 
+        [Trait("Category", "flaky")]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.ConnectionTimeoutTest(timeout: 60) [10 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [/mnt/vss/_work/1/s/build.proj]
+        //      Timer must be stopped.
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.ConnectionTimeoutTest(Int32 timeout) in /mnt/vss/_work/1/s/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs:line 523
+        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
+        //      at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
         [Theory]
         [InlineData(60)]
         [InlineData(10)]
@@ -472,7 +589,8 @@ public void ConnectionTimeoutTest(int timeout)
             {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 ConnectTimeout = timeout,
-                Encrypt = SqlConnectionEncryptOption.Optional
+                Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false, // Disable pooling so this expected timeout failure does not poison a shared pool
             }.ConnectionString;
             using SqlConnection connection = new(connStr);
 
@@ -516,7 +634,8 @@ public async Task ConnectionTimeoutTestAsync(int timeout)
             {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 ConnectTimeout = timeout,
-                Encrypt = SqlConnectionEncryptOption.Optional
+                Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false, // Disable pooling so this expected timeout failure does not poison a shared pool
             }.ConnectionString;
             using SqlConnection connection = new(connStr);
 
@@ -734,6 +853,7 @@ public void ConnectionRefusesUnsupportedServerTdsVersion(int major, int minor, i
             {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false, // Disable pooling so this expected failure does not poison a shared pool
             }.ConnectionString;
             using SqlConnection conn = new(connStr);
 
@@ -812,6 +932,7 @@ public void TestConnWithVectorFeatExtVersionNegotiation(bool expectedConnectionR
             {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false, // Disable pooling so an expected failure does not poison a shared pool
             }.ConnectionString;
             using var connection = new SqlConnection(connStr);
             if (expectedConnectionResult)

From a35f80f405bf54baaa0c15583d6b15caaf751a5b Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 22 Jul 2026 19:20:37 -0300
Subject: [PATCH 199/298] Run legacy CI pipelines daily instead of
 weekdays/Thursdays (#4469)

---
 ...t-sqlclient-ci-package-reference-pipeline.yml | 16 ++++++++--------
 ...t-sqlclient-ci-project-reference-pipeline.yml | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
index 98cac1bcdd..72bcf4a120 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
@@ -16,8 +16,8 @@
 #
 #   - Commits to GitHub main and release/* branches
 #   - Commits to ADO internal/main and internal/release/* branches
-#   - Weekdays at 03:00 UTC on GitHub main
-#   - Thursdays at 07:00 UTC on ADO internal/main
+#   - Daily at 03:00 UTC on GitHub main
+#   - Daily at 07:00 UTC on ADO internal/main
 #
 # GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI.  We are
 # able to define different triggers and schedules using branch filters:
@@ -66,17 +66,17 @@ trigger:
 # Trigger this pipeline on a schedule.
 schedules:
 
-  # GitHub main on weekdays
-  - cron: '0 3 * * Mon-Fri'
-    displayName: Weekday Run (Release Config)
+  # GitHub main daily.
+  - cron: '0 3 * * *'
+    displayName: Daily Run (Release Config)
     branches:
       include:
       - main
     always: true
 
-  # ADO internal/main on Thursdays.
-  - cron: '0 7 * * Thu'
-    displayName: Thursday Run (Release Config)
+  # ADO internal/main daily.
+  - cron: '0 7 * * *'
+    displayName: Daily Run (Release Config)
     branches:
       include:
       - internal/main
diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
index 7068c9693c..7b665d52c3 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
@@ -16,8 +16,8 @@
 #
 #   - Commits to GitHub main and release/* branches
 #   - Commits to ADO internal/main and internal/release/* branches
-#   - Weekdays at 01:00 UTC on GitHub main
-#   - Thursdays at 05:00 UTC on ADO internal/main
+#   - Daily at 01:00 UTC on GitHub main
+#   - Daily at 05:00 UTC on ADO internal/main
 #
 # GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI.  We are
 # able to define different triggers and schedules using branch filters:
@@ -66,17 +66,17 @@ trigger:
 # Trigger this pipeline on a schedule.
 schedules:
 
-  # GitHub main on weekdays
-  - cron: '0 1 * * Mon-Fri'
-    displayName: Weekday Run (Release Config)
+  # GitHub main daily.
+  - cron: '0 1 * * *'
+    displayName: Daily Run (Release Config)
     branches:
       include:
       - main
     always: true
 
-  # ADO internal/main on Thursdays.
-  - cron: '0 5 * * Thu'
-    displayName: Thursday Run (Release Config)
+  # ADO internal/main daily.
+  - cron: '0 5 * * *'
+    displayName: Daily Run (Release Config)
     branches:
       include:
       - internal/main

From 188c71ed0d4422ab4141f1079443fd909ebfcee7 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 22 Jul 2026 20:55:24 -0300
Subject: [PATCH 200/298] Move Kerberos pipeline to ci/ and rename to
 sqlclient-ci-kerberos-pipeline.yml (#4468)

---
 .../{ => ci}/kerberos/build-and-test-steps.yml         |  0
 eng/pipelines/{ => ci}/kerberos/linux-cleanup-step.yml |  0
 eng/pipelines/{ => ci}/kerberos/linux-init-step.yml    |  0
 .../kerberos/sqlclient-ci-kerberos-pipeline.yml}       | 10 +++++-----
 eng/pipelines/sqlclient-pr-package-ref-pipeline.yml    |  1 -
 eng/pipelines/sqlclient-pr-project-ref-pipeline.yml    |  1 -
 6 files changed, 5 insertions(+), 7 deletions(-)
 rename eng/pipelines/{ => ci}/kerberos/build-and-test-steps.yml (100%)
 rename eng/pipelines/{ => ci}/kerberos/linux-cleanup-step.yml (100%)
 rename eng/pipelines/{ => ci}/kerberos/linux-init-step.yml (100%)
 rename eng/pipelines/{kerberos/sqlclient-kerberos.yml => ci/kerberos/sqlclient-ci-kerberos-pipeline.yml} (97%)

diff --git a/eng/pipelines/kerberos/build-and-test-steps.yml b/eng/pipelines/ci/kerberos/build-and-test-steps.yml
similarity index 100%
rename from eng/pipelines/kerberos/build-and-test-steps.yml
rename to eng/pipelines/ci/kerberos/build-and-test-steps.yml
diff --git a/eng/pipelines/kerberos/linux-cleanup-step.yml b/eng/pipelines/ci/kerberos/linux-cleanup-step.yml
similarity index 100%
rename from eng/pipelines/kerberos/linux-cleanup-step.yml
rename to eng/pipelines/ci/kerberos/linux-cleanup-step.yml
diff --git a/eng/pipelines/kerberos/linux-init-step.yml b/eng/pipelines/ci/kerberos/linux-init-step.yml
similarity index 100%
rename from eng/pipelines/kerberos/linux-init-step.yml
rename to eng/pipelines/ci/kerberos/linux-init-step.yml
diff --git a/eng/pipelines/kerberos/sqlclient-kerberos.yml b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
similarity index 97%
rename from eng/pipelines/kerberos/sqlclient-kerberos.yml
rename to eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
index a8c4463c13..b8c28c604d 100644
--- a/eng/pipelines/kerberos/sqlclient-kerberos.yml
+++ b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
@@ -5,7 +5,7 @@
 #################################################################################
 
 # =============================================================================
-# sqlclient-kerberos
+# sqlclient-ci-kerberos-pipeline
 # =============================================================================
 # Daily Kerberos authentication test pipeline for Microsoft.Data.SqlClient.
 # Replaces the Classic "Test-SqlClient-Kerberos-Azure" pipeline.
@@ -180,7 +180,7 @@ stages:
             displayName: Enable Network DTC Access
 
           # --- Build and test ---
-          - template: /eng/pipelines/kerberos/build-and-test-steps.yml@self
+          - template: /eng/pipelines/ci/kerberos/build-and-test-steps.yml@self
             parameters:
               buildTarget: BuildSqlClientWindows
               testFramework: $(testFramework)
@@ -252,7 +252,7 @@ stages:
               KERBEROS_DOMAIN_PASSWORD: $(KerberosDomainPassword)
 
           # --- Kerberos domain join ---
-          - template: /eng/pipelines/kerberos/linux-init-step.yml@self
+          - template: /eng/pipelines/ci/kerberos/linux-init-step.yml@self
             parameters:
               kerberosDomain: $(KerberosDomain)
               kerberosDomainOU: $(KerberosDomainOU)
@@ -269,7 +269,7 @@ stages:
               REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
 
           # --- Build and test ---
-          - template: /eng/pipelines/kerberos/build-and-test-steps.yml@self
+          - template: /eng/pipelines/ci/kerberos/build-and-test-steps.yml@self
             parameters:
               buildTarget: BuildSqlClientUnix
               testFramework: $(testFramework)
@@ -277,7 +277,7 @@ stages:
               artifactName: $(testFramework)-linux-$(System.JobId)
 
           # --- Kerberos cleanup (always runs) ---
-          - template: /eng/pipelines/kerberos/linux-cleanup-step.yml@self
+          - template: /eng/pipelines/ci/kerberos/linux-cleanup-step.yml@self
             parameters:
               kerberosDomain: $(KerberosDomain)
               kerberosDomainUser: $(KerberosDomainUser)
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index 695145e990..1a58842305 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -52,7 +52,6 @@ pr:
       - NuGet.config
     exclude:
       - eng/pipelines/ci/*
-      - eng/pipelines/kerberos/*
       - eng/pipelines/onebranch/*
 
 # Do not trigger commit or schedule runs for this pipeline.
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index 14c1af4e7f..6e54d0eb32 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -52,7 +52,6 @@ pr:
       - NuGet.config
     exclude:
       - eng/pipelines/ci/*
-      - eng/pipelines/kerberos/*
       - eng/pipelines/onebranch/*
 
 # Do not trigger commit or schedule runs for this pipeline.

From d0407001a1f672d5352907de0b0dd15325076f25 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Thu, 23 Jul 2026 01:29:45 +0100
Subject: [PATCH 201/298] Remove platform-specific builds (#4465)

---
 .../Interop/Windows/Sni/ISniNativeMethods.cs  |  6 +-
 .../Windows/Sni/SniNativeMethods.netcore.cs   |  4 +-
 .../Sni/SniNativeMethodsArm64.netfx.cs        |  4 +-
 .../Sni/SniNativeMethodsNotSupported.netfx.cs |  2 +-
 .../Windows/Sni/SniNativeMethodsX64.netfx.cs  |  4 +-
 .../Windows/Sni/SniNativeMethodsX86.netfx.cs  |  4 +-
 .../Interop/Windows/Sni/SniNativeWrapper.cs   |  4 --
 .../src/Microsoft.Data.SqlClient.csproj       |  9 +--
 .../Data/Sql/SqlDataSourceEnumerator.cs       |  6 --
 ...=> SqlDataSourceEnumeratorNativeHelper.cs} |  4 --
 .../DbConnectionPoolIdentity.cs               | 12 ----
 .../{LocalDbApi.windows.cs => LocalDbApi.cs}  | 17 ++++--
 .../Data/SqlClient/LocalDb/LocalDbApi.unix.cs | 21 -------
 ...ore.windows.cs => PacketHandle.netcore.cs} |  3 +-
 .../SqlClient/PacketHandle.netcore.unix.cs    | 57 -------------------
 ...indows.cs => NativeSspiContextProvider.cs} |  6 +-
 ...re.windows.cs => SessionHandle.netcore.cs} |  3 +-
 .../SqlClient/SessionHandle.netcore.unix.cs   | 43 --------------
 ...les.windows.cs => TdsParserSafeHandles.cs} |  4 --
 ...dows.cs => TdsParserStateObjectFactory.cs} |  6 +-
 .../TdsParserStateObjectFactory.unix.cs       | 36 ------------
 ...ndows.cs => TdsParserStateObjectNative.cs} |  4 --
 22 files changed, 28 insertions(+), 231 deletions(-)
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/{SqlDataSourceEnumeratorNativeHelper.windows.cs => SqlDataSourceEnumeratorNativeHelper.cs} (99%)
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/{LocalDbApi.windows.cs => LocalDbApi.cs} (97%)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.unix.cs
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/{PacketHandle.netcore.windows.cs => PacketHandle.netcore.cs} (96%)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PacketHandle.netcore.unix.cs
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/{NativeSspiContextProvider.windows.cs => NativeSspiContextProvider.cs} (96%)
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/{SessionHandle.netcore.windows.cs => SessionHandle.netcore.cs} (94%)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SessionHandle.netcore.unix.cs
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/{TdsParserSafeHandles.windows.cs => TdsParserSafeHandles.cs} (99%)
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/{TdsParserStateObjectFactory.windows.cs => TdsParserStateObjectFactory.cs} (96%)
 delete mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.unix.cs
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/{TdsParserStateObjectNative.windows.cs => TdsParserStateObjectNative.cs} (99%)

diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ISniNativeMethods.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ISniNativeMethods.cs
index 194e61a4b6..7c4ee2486a 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ISniNativeMethods.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ISniNativeMethods.cs
@@ -1,9 +1,7 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -101,5 +99,3 @@ unsafe uint SniSecGenClientContextWrapper(
         uint SniWriteSyncOverAsync(SNIHandle pConn, SNIPacket pPacket);
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethods.netcore.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethods.netcore.cs
index 32109770e0..dc78405f41 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethods.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethods.netcore.cs
@@ -1,8 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NET && _WINDOWS
+#if NET
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsArm64.netfx.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsArm64.netfx.cs
index c39c1dbefa..a450e706ad 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsArm64.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsArm64.netfx.cs
@@ -1,8 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETFRAMEWORK && _WINDOWS
+#if NETFRAMEWORK
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsNotSupported.netfx.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsNotSupported.netfx.cs
index 0d8600f193..7139ee0b08 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsNotSupported.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsNotSupported.netfx.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETFRAMEWORK && _WINDOWS
+#if NETFRAMEWORK
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsX64.netfx.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsX64.netfx.cs
index 0849e1a22d..293e0432c5 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsX64.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsX64.netfx.cs
@@ -1,8 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETFRAMEWORK && _WINDOWS
+#if NETFRAMEWORK
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsX86.netfx.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsX86.netfx.cs
index 270a522aa6..187acb3fe7 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsX86.netfx.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeMethodsX86.netfx.cs
@@ -1,8 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETFRAMEWORK && _WINDOWS
+#if NETFRAMEWORK
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeWrapper.cs b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeWrapper.cs
index 62961901ff..5d4ba1e83a 100644
--- a/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeWrapper.cs
+++ b/src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniNativeWrapper.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
- #if _WINDOWS
-
 using System;
 using System.Buffers;
 using System.Diagnostics;
@@ -452,5 +450,3 @@ private static void MarshalConsumerInfo(ConsumerInfo consumerInfo, ref SniConsum
         #endregion
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index dc327b024a..7194f0e8db 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -19,11 +19,6 @@
     <!--<TargetOs>Windows_NT</TargetOs>-->
 
     <NormalizedTargetOs>$(TargetOs.ToLower())</NormalizedTargetOs>
-
-    <!-- NOTE: These constants are prefixed with _ to keep them separate from .NET 5+ precompiler -->
-    <!--     flags. Those only apply to OS-specific target frameworks, and would interfere here.  -->
-    <DefineConstants Condition="'$(NormalizedTargetOs)' == 'unix'">$(DefineConstants);_UNIX</DefineConstants>
-    <DefineConstants Condition="'$(NormalizedTargetOs)' == 'windows_nt'">$(DefineConstants);_WINDOWS</DefineConstants>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
@@ -231,11 +226,11 @@
   <!-- Embedded resources ============================================== -->
   <ItemGroup>
     <!-- Linker directives to replace UseManagedNetworking with a constant if consumer specifies  -->
-    <!-- the app context switch in their csproj. This file only applies to netcore on windows.    -->
+    <!-- the app context switch in their csproj. This file only applies to netcore.               -->
     <!-- This file does not support pre-processor directives, so it must be conditionally         -->
     <!-- included into the build.                                                                 -->
     <EmbeddedResource Include="Resources\ILLink.Substitutions.xml"
-                      Condition="'$(NormalizedTargetOs)' == 'windows_nt' AND '$(TargetFramework)' != 'net462'">
+                      Condition="'$(TargetFramework)' != 'net462'">
       <LogicalName>ILLink.Substitutions.xml</LogicalName>
     </EmbeddedResource>
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumerator.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumerator.cs
index 0356d7bcd3..7777e558b9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumerator.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumerator.cs
@@ -27,16 +27,10 @@ public override DataTable GetDataSources()
             #if NETFRAMEWORK
             return SqlDataSourceEnumeratorNativeHelper.GetDataSources();
             #else
-
-            #if _UNIX
-            return SqlDataSourceEnumeratorManagedHelper.GetDataSources();
-            #else
             return SqlClient.LocalAppContextSwitches.UseManagedNetworking
                 ? SqlDataSourceEnumeratorManagedHelper.GetDataSources()
                 : SqlDataSourceEnumeratorNativeHelper.GetDataSources();
             #endif
-
-            #endif
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.cs
similarity index 99%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.cs
index a6325d9990..d7a2a0f832 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Data;
 using System.Diagnostics;
@@ -175,5 +173,3 @@ private static DataTable ParseServerEnumString(string serverInstances)
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolIdentity.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolIdentity.cs
index 320e59fb48..940a10271f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolIdentity.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolIdentity.cs
@@ -54,19 +54,9 @@ public override int GetHashCode()
 
         internal static DbConnectionPoolIdentity GetCurrent()
         {
-            #if NETFRAMEWORK
-            return GetCurrentNative();
-            #else
-
-            #if _UNIX
-            return GetCurrentManaged();
-            #else
             return LocalAppContextSwitches.UseManagedNetworking
                 ? GetCurrentManaged()
                 : GetCurrentNative();
-            #endif
-
-            #endif
         }
 
         #if NETFRAMEWORK
@@ -94,7 +84,6 @@ private static DbConnectionPoolIdentity GetCurrentManaged()
             return current;
         }
 
-        #if _WINDOWS
         private static DbConnectionPoolIdentity GetCurrentNative()
         {
             DbConnectionPoolIdentity current;
@@ -124,7 +113,6 @@ private static DbConnectionPoolIdentity GetCurrentNative()
             s_lastIdentity = current;
             return current;
         }
-        #endif
     }
 }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.cs
similarity index 97%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.cs
index c0674ca6db..da1e613c44 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Diagnostics;
 using System.Globalization;
@@ -276,7 +274,12 @@ internal static void DemandLocalDbPermissions()
         // localDB can also have a format of np:\\.\pipe\LOCALDB#<some number>\tsql\query
         internal static string GetLocalDbInstanceNameFromServerName(string serverName)
         {
-            if (serverName is not null)
+            // LocalDB is only supported on Windows
+            if (!OsConstants.IsWindows)
+            {
+                return null;
+            }
+            else if (serverName is not null)
             {
                 // it can start with spaces if specified in quotes
                 // Memory allocation is reduced by using ReadOnlySpan
@@ -300,6 +303,12 @@ internal static string GetLocalDbInstanceNameFromServerName(string serverName)
 
         internal static string GetLocalDbMessage(int hrCode)
         {
+            if (!OsConstants.IsWindows)
+            {
+                // LocalDB is not available for Unix and hence it cannot be supported.
+                throw new PlatformNotSupportedException(Strings.LocalDBNotSupported);
+            }
+
             Debug.Assert(hrCode < 0, "HRCode does not indicate error");
             try
             {
@@ -422,5 +431,3 @@ internal InstanceInfo(string version)
         #endif
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.unix.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.unix.cs
deleted file mode 100644
index b016c7dc97..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalDb/LocalDbApi.unix.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#if _UNIX
-
-using System;
-
-namespace Microsoft.Data.SqlClient.LocalDb
-{
-    internal static class LocalDbApi
-    {
-        internal static string GetLocalDbInstanceNameFromServerName(string serverName) =>
-            null;
-
-        internal static string GetLocalDbMessage(int hrCode) =>
-            throw new PlatformNotSupportedException(Strings.LocalDBNotSupported); // LocalDB is not available for Unix and hence it cannot be supported.
-    }
-}
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PacketHandle.netcore.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PacketHandle.netcore.cs
similarity index 96%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PacketHandle.netcore.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PacketHandle.netcore.cs
index 4e675fc5b0..4bce65d8f3 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PacketHandle.netcore.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PacketHandle.netcore.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 // @TODO: Introduce polymorphism to remove need for this level of indirection
-#if NET && _WINDOWS
+#if NET
 
 using System;
 
@@ -18,7 +18,6 @@ namespace Microsoft.Data.SqlClient
     /// </summary>
     /// <remarks>
     /// It is a ref struct so that it can only be used to transport the handles and not store them.
-    /// If you change this type you must also change the version for the other platform.
     /// </remarks>
     internal readonly ref struct PacketHandle
     {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PacketHandle.netcore.unix.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PacketHandle.netcore.unix.cs
deleted file mode 100644
index 4060edfb38..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PacketHandle.netcore.unix.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-// @TODO: Introduce polymorphism to remove need for this level of indirection
-// @TODO: Also, why do we have any other type besides managed defined here?
-#if NET && _UNIX
-
-namespace Microsoft.Data.SqlClient
-{
-    /// <summary>
-    /// This structure is used for transporting packet handle references between the
-    /// TdsParserStateObject base class and Managed or Native implementations. It prevents the
-    /// native IntPtr type from being boxed and prevents the need to cast from object which loses
-    /// compile time type safety. It carries type information so that assertions about the type of
-    /// handle can be made in the implemented abstract methods.
-    /// </summary>
-    /// <remarks>
-    /// It is a ref struct so that it can only be used to transport the handles and not store them.
-    /// If you change this type you must also change the version for the other platform.
-    /// </remarks>
-    internal readonly ref struct PacketHandle
-    {
-        /// <summary>
-        /// PacketHandle is transporting a native pointer. The NativePointer field is valid.
-        /// A PacketHandle has this type when managed code is referencing a pointer to a
-        /// packet which has been read from the native SNI layer.
-        /// </summary>
-        public const int NativePointerType = 1;
-        /// <summary>
-        /// PacketHandle is transporting a native packet. The NativePacket field is valid.
-        /// A PacketHandle has this type when managed code is directly referencing a packet
-        /// which is due to be passed to the native SNI layer.
-        /// </summary>
-        public const int NativePacketType = 2;
-        /// <summary>
-        /// PacketHandle is transporting a managed packet. The ManagedPacket field is valid.
-        /// A PacketHandle used by the managed SNI layer will always have this type.
-        /// </summary>
-        public const int ManagedPacketType = 3;
-
-        // @TODO: To auto-properties
-        public readonly ManagedSni.SniPacket ManagedPacket;
-        public readonly int Type;
-
-        private PacketHandle(ManagedSni.SniPacket managedPacket, int type)
-        {
-            Type = type;
-            ManagedPacket = managedPacket;
-        }
-
-        public static PacketHandle FromManagedPacket(ManagedSni.SniPacket managedPacket) =>
-            new PacketHandle(managedPacket, ManagedPacketType);
-    }
-}
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NativeSspiContextProvider.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NativeSspiContextProvider.cs
similarity index 96%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NativeSspiContextProvider.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NativeSspiContextProvider.cs
index b6d65d4452..94e7652874 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NativeSspiContextProvider.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SSPI/NativeSspiContextProvider.cs
@@ -1,9 +1,7 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Buffers;
 using System.Diagnostics;
@@ -85,5 +83,3 @@ protected override bool GenerateContext(ReadOnlySpan<byte> incomingBlob, IBuffer
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SessionHandle.netcore.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SessionHandle.netcore.cs
similarity index 94%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SessionHandle.netcore.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SessionHandle.netcore.cs
index dcac01c534..019bed388b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SessionHandle.netcore.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SessionHandle.netcore.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 // @TODO: Merge with other implementations (and/or introduce polymorphism to handle this indirection)
-#if NET && _WINDOWS
+#if NET
 
 namespace Microsoft.Data.SqlClient
 {
@@ -15,7 +15,6 @@ namespace Microsoft.Data.SqlClient
     /// </summary>
     /// <remarks>
     /// It is a ref struct so that it can only be used to transport the handles and not store them.
-    /// If you change this type you must also change the version for the other platform.
     /// </remarks>
     internal readonly ref struct SessionHandle
     {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SessionHandle.netcore.unix.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SessionHandle.netcore.unix.cs
deleted file mode 100644
index 8f82506bc5..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SessionHandle.netcore.unix.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-// @TODO: Merge with SessionHandle.windows (and/or introduce polymorphism to handle this indirection)
-// @TODO: Also, why do we have native handle type defined in Unix which doesn't ever have a native handle type?
-#if NET && _UNIX
-
-namespace Microsoft.Data.SqlClient
-{
-    /// <summary>
-    /// This structure is used for transporting packet handle references between the
-    /// TdsParserStateObject base class and Managed or Native implementations. It carries type
-    /// information so that assertions about the type of handle can be made in the implemented
-    /// abstract methods.
-    /// </summary>
-    /// <remarks>
-    /// It is a ref struct so that it can only be used to transport the handles and not store them.
-    /// If you change this type you must also change the version for the other platform.
-    /// </remarks>
-    internal readonly ref struct SessionHandle
-    {
-        public const int NativeHandleType = 1;
-        public const int ManagedHandleType = 2;
-
-        // @TODO: Auto-properties
-        public readonly ManagedSni.SniHandle ManagedHandle;
-        public readonly int Type;
-
-        public SessionHandle(ManagedSni.SniHandle managedHandle, int type)
-        {
-            Type = type;
-            ManagedHandle = managedHandle;
-        }
-
-        public bool IsNull => ManagedHandle is null;
-
-        public static SessionHandle FromManagedSession(ManagedSni.SniHandle managedSessionHandle) =>
-            new SessionHandle(managedSessionHandle, ManagedHandleType);
-    }
-}
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserSafeHandles.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserSafeHandles.cs
similarity index 99%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserSafeHandles.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserSafeHandles.cs
index 8242dd997f..2f591294d4 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserSafeHandles.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserSafeHandles.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
@@ -280,5 +278,3 @@ protected override bool ReleaseHandle()
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.cs
similarity index 96%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.cs
index a54873cb21..abe66c38a5 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.cs
@@ -1,9 +1,7 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 #if NET
 using Microsoft.Data.SqlClient.ManagedSni;
 using Microsoft.Data.SqlClient.Internal;
@@ -72,5 +70,3 @@ internal TdsParserStateObject CreateSessionObject(TdsParser tdsParser, TdsParser
         }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.unix.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.unix.cs
deleted file mode 100644
index 61817eb0ed..0000000000
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.unix.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#if NET && _UNIX
-
-using Microsoft.Data.SqlClient.ManagedSni;
-
-namespace Microsoft.Data.SqlClient
-{
-    internal sealed class TdsParserStateObjectFactory
-    {
-        public static readonly TdsParserStateObjectFactory Singleton = new TdsParserStateObjectFactory();
-
-        public EncryptionOptions EncryptionOptions => ManagedSni.SniLoadHandle.Options;
-
-        public uint SNIStatus => ManagedSni.SniLoadHandle.Status;
-
-        /// <summary>
-        /// Verify client encryption possibility.
-        /// </summary>
-        public bool ClientOSEncryptionSupport => ManagedSni.SniLoadHandle.ClientOSEncryptionSupport;
-
-        public TdsParserStateObject CreateTdsParserStateObject(TdsParser parser)
-        {
-            return new TdsParserStateObjectManaged(parser);
-        }
-
-        internal TdsParserStateObject CreateSessionObject(TdsParser tdsParser, TdsParserStateObject _pMarsPhysicalConObj, bool v)
-        {
-            return new TdsParserStateObjectManaged(tdsParser, _pMarsPhysicalConObj, true);
-        }
-    }
-}
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.windows.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs
similarity index 99%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.windows.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs
index 7812860b5e..a57a46658f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.windows.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if _WINDOWS
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -532,5 +530,3 @@ public void Dispose()
         }
     }
 }
-
-#endif

From 9f33378cca7ab7c25ca5bea0f0f007c8d9633dd6 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Thu, 23 Jul 2026 14:38:11 -0500
Subject: [PATCH 202/298] Tests | Remove DataAttribute Subclasses (#4427)

* DataAttribute => TheoryData for SqlColumnEncryptionCspProviderShould.cs

* DataAttribute => TheoryData for SqlColumnEncryptionCertificateStoreProviderShould.cs

* Remove DataAttribute subclasses from SqlColumnEncryptionCertificateStoreProviderShould.cs and SqlColumnEncryptionCngProviderShould.cs

* Address copilot comments about unused usings.
---
 ...ncryptionCertificateStoreProviderShould.cs | 312 +++++++++---------
 .../SqlColumnEncryptionCngProviderShould.cs   | 148 +++++----
 .../SqlColumnEncryptionCspProviderShould.cs   | 163 ++++-----
 3 files changed, 323 insertions(+), 300 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCertificateStoreProviderShould.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCertificateStoreProviderShould.cs
index 8e835c14fb..66823fc892 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCertificateStoreProviderShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCertificateStoreProviderShould.cs
@@ -5,14 +5,11 @@
 using Microsoft.Data.SqlClient.Tests.Common.Fixtures;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
-using System.Security.Principal;
 using System.Text;
 using Xunit;
-using Xunit.Sdk;
 using static Microsoft.Data.SqlClient.Tests.AlwaysEncryptedTests.TestFixtures;
 
 namespace Microsoft.Data.SqlClient.Tests.AlwaysEncryptedTests
@@ -105,9 +102,68 @@ public SqlColumnEncryptionCertificateStoreProviderShould(ColumnEncryptionCertifi
             SqlConnection.ColumnEncryptionQueryMetadataCacheEnabled = false;
         }
 
+        public static TheoryData<string, Type, string, string, byte[]> InvalidDecryption_Data
+        {
+            get
+            {
+                const string TCE_NullCertificatePath_Windows = @"Internal error. Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_NullCertificatePath_Unix = @"Internal error. Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCertificatePath_Windows = @"Internal error. Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCertificatePath_Unix = @"Internal error. Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_NullEncryptedColumnEncryptionKey = @"Internal error. Encrypted column encryption key cannot be null.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_EmptyEncryptedColumnEncryptionKey = @"Internal error. Empty encrypted column encryption key specified.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_NullKeyEncryptionAlgorithm = @"Internal error. Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_InvalidKeyEncryptionAlgorithm = @"Internal error. Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_LargeCertificatePathLength = @"Internal error. Specified certificate path has 32768 bytes, which exceeds maximum length of 32767 bytes.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificatePath_Windows = @"Internal error. Invalid certificate path: 'CurrentUser/My/Thumbprint/extra'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificatePath_Unix = @"Internal error. Invalid certificate path: 'CurrentUser/My/Thumbprint/extra'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificateLocation_Windows = @"Internal error. Invalid certificate location 'Invalid' in certificate path 'Invalid/My/Thumbprint'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificateLocation_Unix = @"Internal error. Invalid certificate location 'Invalid' in certificate path 'Invalid/My/Thumbprint'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificateStore = @"Internal error. Invalid certificate store 'Invalid' specified in certificate path 'CurrentUser/Invalid/Thumbprint'. Expected value: 'My'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_CertificateNotFound = @"Certificate with thumbprint 'JunkThumbprint' not found in certificate store 'My' in certificate location 'CurrentUser'. Verify the certificate path in the column master key definition in the database is correct, and the certificate has been imported correctly into the certificate location/store.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_CertificateWithNoPrivateKey = @"Certificate specified in key path 'CurrentUser/My/{npk_thumbprint}' does not have a private key to decrypt a column encryption key. Verify the certificate is imported correctly.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificateSignature = @"Internal error. Empty certificate thumbprint specified in certificate path 'CurrentUser/My/'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidAlgorithmVersion = @"Specified encrypted column encryption key contains an invalid encryption algorithm version '02'. Expected version is '01'.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidCiphertextLengthInEncryptedCEK = @"The specified encrypted column encryption key's ciphertext length: 128 does not match the ciphertext length: 256 when using column master key \(certificate\) in 'CurrentUser/My/{primary_thumbprint}'. The encrypted column encryption key may be corrupt, or the specified certificate path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidSignatureInEncryptedCEK = @"The specified encrypted column encryption key's signature length: 128 does not match the signature length: 256 when using column master key \(certificate\) in 'CurrentUser/My/{primary_thumbprint}'. The encrypted column encryption key may be corrupt, or the specified certificate path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidSignature = @"The specified encrypted column encryption key signature does not match the signature computed with the column master key \(certificate\) in 'CurrentUser/My/{primary_thumbprint}'. The encrypted column encryption key may be corrupt, or the specified path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+
+                string TCE_NullCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_NullCertificatePath_Windows : TCE_NullCertificatePath_Unix;
+                string TCE_EmptyCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_EmptyCertificatePath_Windows : TCE_EmptyCertificatePath_Unix;
+                string TCE_InvalidCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_InvalidCertificatePath_Windows : TCE_InvalidCertificatePath_Unix;
+                string TCE_InvalidCertificateLocation = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_InvalidCertificateLocation_Windows : TCE_InvalidCertificateLocation_Unix;
+
+                TheoryData<string, Type, string, string, byte[]> result = new();
+                result.Add(TCE_NullCertificatePath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCertificatePath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, null);
+                result.Add(TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, []);
+                result.Add(TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), PRIMARY_CERTIFICATE_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_LargeCertificatePathLength, typeof(ArgumentException), GenerateString(Int16.MaxValue + 1), ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCertificatePath, typeof(ArgumentException), "CurrentUser/My/Thumbprint/extra", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCertificateLocation, typeof(ArgumentException), "Invalid/My/Thumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCertificateStore, typeof(ArgumentException), "CurrentUser/Invalid/Thumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_CertificateNotFound, typeof(ArgumentException), "CurrentUser/My/JunkThumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_CertificateWithNoPrivateKey, typeof(ArgumentException), "CurrentUser/My/{npk_thumbprint}", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCertificateSignature, typeof(ArgumentException), "CurrentUser/My/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidAlgorithmVersion, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(2, 0, 256, 256));
+                result.Add(TCE_InvalidCiphertextLengthInEncryptedCEK, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 128, 256));
+                result.Add(TCE_InvalidSignatureInEncryptedCEK, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 128));
+                result.Add(TCE_InvalidSignature, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+
+                return result;
+            }
+        }
+
         [Theory]
-        [InvalidDecryptionParameters]
-        public void ThrowExceptionWithInvalidParameterWhileDecryptingColumnEncryptionKey(string errorMsg, Type exceptionType, string masterKeyPath, string encryptionAlgorithm, byte[] bytes)
+        [MemberData(nameof(InvalidDecryption_Data))]
+        public void ThrowExceptionWithInvalidParameterWhileDecryptingColumnEncryptionKey(
+            string errorMsg,
+            Type exceptionType,
+            string masterKeyPath,
+            string encryptionAlgorithm,
+            byte[] bytes)
         {
             var provider = new SqlColumnEncryptionCertificateStoreProvider();
             Exception ex = Assert.Throws(exceptionType,
@@ -115,8 +171,54 @@ public void ThrowExceptionWithInvalidParameterWhileDecryptingColumnEncryptionKey
             Assert.Matches(ReplaceKeyTokens(errorMsg), ex.Message);
         }
 
+        public static TheoryData<string, Type, string, string, byte[]> InvalidEncryption_Data
+        {
+            get
+            {
+                const string TCE_NullCertificatePath_Windows = @"Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_NullCertificatePath_Unix = @"Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCertificatePath_Windows = @"Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCertificatePath_Unix = @"Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_NullEncryptedColumnEncryptionKey = @"Column encryption key cannot be null.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
+                const string TCE_EmptyEncryptedColumnEncryptionKey = @"Empty column encryption key specified.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
+                const string TCE_NullKeyEncryptionAlgorithm = @"Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_InvalidKeyEncryptionAlgorithm = @"Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_LargeCertificatePathLength = @"Specified certificate path has 32768 bytes, which exceeds maximum length of 32767 bytes.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificatePath_Windows = @"Invalid certificate path: 'CurrentUser/My/Thumbprint/extra'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificatePath_Unix = @"Invalid certificate path: 'CurrentUser/My/Thumbprint/extra'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificateLocation_Windows = @"Invalid certificate location 'Invalid' in certificate path 'Invalid/My/Thumbprint'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificateLocation_Unix = @"Invalid certificate location 'Invalid' in certificate path 'Invalid/My/Thumbprint'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificateStore = @"Invalid certificate store 'Invalid' specified in certificate path 'CurrentUser/Invalid/Thumbprint'. Expected value: 'My'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_CertificateNotFound = @"Certificate with thumbprint 'JunkThumbprint' not found in certificate store 'My' in certificate location 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_CertificateWithNoPrivateKey = @"Certificate specified in key path 'CurrentUser/My/{npk_thumbprint}' does not have a private key to encrypt a column encryption key. Verify the certificate is imported correctly.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCertificateSignature = @"Empty certificate thumbprint specified in certificate path 'CurrentUser/My/'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+
+                string TCE_NullCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_NullCertificatePath_Windows : TCE_NullCertificatePath_Unix;
+                string TCE_EmptyCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_EmptyCertificatePath_Windows : TCE_EmptyCertificatePath_Unix;
+                string TCE_InvalidCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_InvalidCertificatePath_Windows : TCE_InvalidCertificatePath_Unix;
+                string TCE_InvalidCertificateLocation = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_InvalidCertificateLocation_Windows : TCE_InvalidCertificateLocation_Unix;
+
+                TheoryData<string, Type, string, string, byte[]> result = new();
+                result.Add(TCE_NullCertificatePath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCertificatePath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, null);
+                result.Add(TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, []);
+                result.Add(TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), PRIMARY_CERTIFICATE_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_LargeCertificatePathLength, typeof(ArgumentException), GenerateString(short.MaxValue + 1), ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCertificatePath, typeof(ArgumentException), "CurrentUser/My/Thumbprint/extra", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCertificateLocation, typeof(ArgumentException), "Invalid/My/Thumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCertificateStore, typeof(ArgumentException), "CurrentUser/Invalid/Thumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_CertificateNotFound, typeof(ArgumentException), "CurrentUser/My/JunkThumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_CertificateWithNoPrivateKey, typeof(ArgumentException), "CurrentUser/My/{npk_thumbprint}", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCertificateSignature, typeof(ArgumentException), "CurrentUser/My/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+
+                return result;
+            }
+        }
+
         [Theory]
-        [InvalidEncryptionParameters]
+        [MemberData(nameof(InvalidEncryption_Data))]
         public void ThrowExceptionWithInvalidParameterWhileEncryptingColumnEncryptionKey(string errorMsg, Type exceptionType, string masterKeyPath, string encryptionAlgorithm, byte[] bytes)
         {
             var provider = new SqlColumnEncryptionCertificateStoreProvider();
@@ -124,8 +226,30 @@ public void ThrowExceptionWithInvalidParameterWhileEncryptingColumnEncryptionKey
             Assert.Matches(ReplaceKeyTokens(errorMsg), ex.Message);
         }
 
+        public static TheoryData<string, Type, string> InvalidSigning_Data
+        {
+            get
+            {
+                const string TCE_NullCertificatePath_Windows = @"Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_NullCertificatePath_Unix = @"Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCertificatePath_Windows = @"Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCertificatePath_Unix = @"Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_LargeCertificatePathLength = @"Specified certificate path has 32768 bytes, which exceeds maximum length of 32767 bytes.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+
+                string TCE_NullCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_NullCertificatePath_Windows : TCE_NullCertificatePath_Unix;
+                string TCE_EmptyCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_EmptyCertificatePath_Windows : TCE_EmptyCertificatePath_Unix;
+
+                TheoryData<string, Type, string> result = new();
+                result.Add(TCE_NullCertificatePath, typeof(ArgumentNullException), null);
+                result.Add(TCE_EmptyCertificatePath, typeof(ArgumentException), "");
+                result.Add(TCE_LargeCertificatePathLength, typeof(ArgumentException), GenerateString(Int16.MaxValue + 1));
+
+                return result;
+            }
+        }
+
         [Theory]
-        [InvalidSigningParameters]
+        [MemberData(nameof(InvalidSigning_Data))]
         public void ThrowExceptionWithInvalidParameterWhileSigningColumnMasterKeyMetadata(string errorMsg, Type exceptionType, string masterKeyPath)
         {
             var provider = new SqlColumnEncryptionCertificateStoreProvider();
@@ -292,10 +416,36 @@ private void TestEncryptionReversalUsingAead(byte[] plainTextInBytes, byte[] roo
             Assert.True(decryptedCellData.SequenceEqual(plainTextInBytes), "Reversal was not successful.");
         }
 
+
+        public static TheoryData<string, object, Utility.CColumnEncryptionType> TestAndEncryptionReversal_Data
+        {
+            get
+            {
+                TheoryData<string, object, Utility.CColumnEncryptionType> result = new();
+                result.Add(StringStr, @"", Utility.CColumnEncryptionType.Deterministic);
+                result.Add(StringStr, @"Transparent Column Encryption", Utility.CColumnEncryptionType.Deterministic);
+                result.Add(StringStr, @"ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1\""\", Utility.CColumnEncryptionType.Deterministic);
+                result.Add(IntStr, 0, Utility.CColumnEncryptionType.Deterministic);
+                result.Add(IntStr, 1234, Utility.CColumnEncryptionType.Deterministic);
+                result.Add(IntStr, int.MaxValue, Utility.CColumnEncryptionType.Deterministic);
+                result.Add(IntStr, int.MinValue, Utility.CColumnEncryptionType.Deterministic);
+                result.Add(StringStr, @"", Utility.CColumnEncryptionType.Randomized);
+                result.Add(StringStr, @"Transparent Column Encryption", Utility.CColumnEncryptionType.Randomized);
+                result.Add(StringStr, @"ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1\""\", Utility.CColumnEncryptionType.Randomized);
+                result.Add(IntStr, 0, Utility.CColumnEncryptionType.Randomized);
+                result.Add(IntStr, 1234, Utility.CColumnEncryptionType.Randomized);
+                result.Add(IntStr, int.MaxValue, Utility.CColumnEncryptionType.Randomized);
+                result.Add(IntStr, int.MinValue, Utility.CColumnEncryptionType.Randomized);
+
+                return result;
+            }
+        }
+
         [Theory]
-        [AeadEncryptionParameters]
+        [MemberData(nameof(TestAndEncryptionReversal_Data))]
         public void TestAeadEncryptionReversal(string dataType, object data, Utility.CColumnEncryptionType encType)
         {
+            // @TODO: Split into int test and string test.
             Assert.True(!string.IsNullOrWhiteSpace(dataType));
 
             byte[] plainText = null;
@@ -475,37 +625,6 @@ private string ReplaceKeyTokens(string keyPath)
                 ?.Replace("{npk_thumbprint}", _certFixture.CertificateWithoutPrivateKey.Thumbprint);
         }
 
-        public class AeadEncryptionParameters : DataAttribute
-        {
-            /// <summary>
-            /// Const to refer to a string.
-            /// </summary>
-            private const string StringStr = "string";
-
-            /// <summary>
-            /// Const to refer to an int.
-            /// </summary>
-            private const string IntStr = "int";
-
-            public override IEnumerable<Object[]> GetData(MethodInfo testMethod)
-            {
-                yield return new object[3] { StringStr, @"", Utility.CColumnEncryptionType.Deterministic };
-                yield return new object[3] { StringStr, @"Transparent Column Encryption", Utility.CColumnEncryptionType.Deterministic };
-                yield return new object[3] { StringStr, @"ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1\""\", Utility.CColumnEncryptionType.Deterministic };
-                yield return new object[3] { IntStr, 0, Utility.CColumnEncryptionType.Deterministic };
-                yield return new object[3] { IntStr, 1234, Utility.CColumnEncryptionType.Deterministic };
-                yield return new object[3] { IntStr, int.MaxValue, Utility.CColumnEncryptionType.Deterministic };
-                yield return new object[3] { IntStr, int.MinValue, Utility.CColumnEncryptionType.Deterministic };
-                yield return new object[3] { StringStr, @"", Utility.CColumnEncryptionType.Randomized };
-                yield return new object[3] { StringStr, @"Transparent Column Encryption", Utility.CColumnEncryptionType.Randomized };
-                yield return new object[3] { StringStr, @"ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1ABafd908`12`l2-0lkd as-3912-312-0 skfsla; i-09=-0 41]321`aksdlkf0ws--02iasfidl;sakfd 90-920-391`-0391- AW_!@*)_A:SKD:""sdfasdf90`-11`-=19=`1\""\", Utility.CColumnEncryptionType.Randomized };
-                yield return new object[3] { IntStr, 0, Utility.CColumnEncryptionType.Randomized };
-                yield return new object[3] { IntStr, 1234, Utility.CColumnEncryptionType.Randomized };
-                yield return new object[3] { IntStr, int.MaxValue, Utility.CColumnEncryptionType.Randomized };
-                yield return new object[3] { IntStr, int.MinValue, Utility.CColumnEncryptionType.Randomized };
-            }
-        }
-
         public static IEnumerable<object[]> CEKEncryptionReversalData()
         {
             yield return new object[2] { StoreLocation.CurrentUser, CurrentUserMyPathPrefix };
@@ -533,120 +652,7 @@ public static IEnumerable<object[]> ValidCertificatePathsData()
             }
         }
 
-        public class InvalidDecryptionParameters : DataAttribute
-        {
-            private const string TCE_NullCertificatePath_Windows = @"Internal error. Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_NullCertificatePath_Unix = @"Internal error. Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCertificatePath_Windows = @"Internal error. Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCertificatePath_Unix = @"Internal error. Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_NullEncryptedColumnEncryptionKey = @"Internal error. Encrypted column encryption key cannot be null.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_EmptyEncryptedColumnEncryptionKey = @"Internal error. Empty encrypted column encryption key specified.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_NullKeyEncryptionAlgorithm = @"Internal error. Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_InvalidKeyEncryptionAlgorithm = @"Internal error. Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_LargeCertificatePathLength = @"Internal error. Specified certificate path has 32768 bytes, which exceeds maximum length of 32767 bytes.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificatePath_Windows = @"Internal error. Invalid certificate path: 'CurrentUser/My/Thumbprint/extra'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificatePath_Unix = @"Internal error. Invalid certificate path: 'CurrentUser/My/Thumbprint/extra'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificateLocation_Windows = @"Internal error. Invalid certificate location 'Invalid' in certificate path 'Invalid/My/Thumbprint'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificateLocation_Unix = @"Internal error. Invalid certificate location 'Invalid' in certificate path 'Invalid/My/Thumbprint'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificateStore = @"Internal error. Invalid certificate store 'Invalid' specified in certificate path 'CurrentUser/Invalid/Thumbprint'. Expected value: 'My'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_CertificateNotFound = @"Certificate with thumbprint 'JunkThumbprint' not found in certificate store 'My' in certificate location 'CurrentUser'. Verify the certificate path in the column master key definition in the database is correct, and the certificate has been imported correctly into the certificate location/store.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_CertificateWithNoPrivateKey = @"Certificate specified in key path 'CurrentUser/My/{npk_thumbprint}' does not have a private key to decrypt a column encryption key. Verify the certificate is imported correctly.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificateSignature = @"Internal error. Empty certificate thumbprint specified in certificate path 'CurrentUser/My/'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidAlgorithmVersion = @"Specified encrypted column encryption key contains an invalid encryption algorithm version '02'. Expected version is '01'.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_InvalidCiphertextLengthInEncryptedCEK = @"The specified encrypted column encryption key's ciphertext length: 128 does not match the ciphertext length: 256 when using column master key \(certificate\) in 'CurrentUser/My/{primary_thumbprint}'. The encrypted column encryption key may be corrupt, or the specified certificate path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_InvalidSignatureInEncryptedCEK = @"The specified encrypted column encryption key's signature length: 128 does not match the signature length: 256 when using column master key \(certificate\) in 'CurrentUser/My/{primary_thumbprint}'. The encrypted column encryption key may be corrupt, or the specified certificate path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_InvalidSignature = @"The specified encrypted column encryption key signature does not match the signature computed with the column master key \(certificate\) in 'CurrentUser/My/{primary_thumbprint}'. The encrypted column encryption key may be corrupt, or the specified path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-
-            private static readonly string TCE_NullCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_NullCertificatePath_Windows : TCE_NullCertificatePath_Unix;
-            private static readonly string TCE_EmptyCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_EmptyCertificatePath_Windows : TCE_EmptyCertificatePath_Unix;
-            private static readonly string TCE_InvalidCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_InvalidCertificatePath_Windows : TCE_InvalidCertificatePath_Unix;
-            private static readonly string TCE_InvalidCertificateLocation = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_InvalidCertificateLocation_Windows : TCE_InvalidCertificateLocation_Unix;
-
-            public override IEnumerable<Object[]> GetData(MethodInfo testMethod)
-            {
-                yield return new Object[] { TCE_NullCertificatePath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCertificatePath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, null };
-                yield return new Object[] { TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, new byte[] { } };
-                yield return new Object[] { TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), PRIMARY_CERTIFICATE_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_LargeCertificatePathLength, typeof(ArgumentException), GenerateString(Int16.MaxValue + 1), ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCertificatePath, typeof(ArgumentException), "CurrentUser/My/Thumbprint/extra", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCertificateLocation, typeof(ArgumentException), "Invalid/My/Thumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCertificateStore, typeof(ArgumentException), "CurrentUser/Invalid/Thumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_CertificateNotFound, typeof(ArgumentException), "CurrentUser/My/JunkThumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_CertificateWithNoPrivateKey, typeof(ArgumentException), "CurrentUser/My/{npk_thumbprint}", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCertificateSignature, typeof(ArgumentException), "CurrentUser/My/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidAlgorithmVersion, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(2, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCiphertextLengthInEncryptedCEK, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 128, 256) };
-                yield return new Object[] { TCE_InvalidSignatureInEncryptedCEK, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 128) };
-                yield return new Object[] { TCE_InvalidSignature, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-            }
-        }
-
-        public class InvalidEncryptionParameters : DataAttribute
-        {
-            private const string TCE_NullCertificatePath_Windows = @"Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_NullCertificatePath_Unix = @"Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCertificatePath_Windows = @"Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCertificatePath_Unix = @"Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_NullEncryptedColumnEncryptionKey = @"Column encryption key cannot be null.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
-            private const string TCE_EmptyEncryptedColumnEncryptionKey = @"Empty column encryption key specified.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
-            private const string TCE_NullKeyEncryptionAlgorithm = @"Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_InvalidKeyEncryptionAlgorithm = @"Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_LargeCertificatePathLength = @"Specified certificate path has 32768 bytes, which exceeds maximum length of 32767 bytes.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificatePath_Windows = @"Invalid certificate path: 'CurrentUser/My/Thumbprint/extra'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificatePath_Unix = @"Invalid certificate path: 'CurrentUser/My/Thumbprint/extra'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificateLocation_Windows = @"Invalid certificate location 'Invalid' in certificate path 'Invalid/My/Thumbprint'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificateLocation_Unix = @"Invalid certificate location 'Invalid' in certificate path 'Invalid/My/Thumbprint'. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificateStore = @"Invalid certificate store 'Invalid' specified in certificate path 'CurrentUser/Invalid/Thumbprint'. Expected value: 'My'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_CertificateNotFound = @"Certificate with thumbprint 'JunkThumbprint' not found in certificate store 'My' in certificate location 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_CertificateWithNoPrivateKey = @"Certificate specified in key path 'CurrentUser/My/{npk_thumbprint}' does not have a private key to encrypt a column encryption key. Verify the certificate is imported correctly.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCertificateSignature = @"Empty certificate thumbprint specified in certificate path 'CurrentUser/My/'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-
-            private static readonly string TCE_NullCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_NullCertificatePath_Windows : TCE_NullCertificatePath_Unix;
-            private static readonly string TCE_EmptyCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_EmptyCertificatePath_Windows : TCE_EmptyCertificatePath_Unix;
-            private static readonly string TCE_InvalidCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_InvalidCertificatePath_Windows : TCE_InvalidCertificatePath_Unix;
-            private static readonly string TCE_InvalidCertificateLocation = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_InvalidCertificateLocation_Windows : TCE_InvalidCertificateLocation_Unix;
-
-            public override IEnumerable<Object[]> GetData(MethodInfo testMethod)
-            {
-                yield return new Object[] { TCE_NullCertificatePath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCertificatePath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, null };
-                yield return new Object[] { TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, ENCRYPTION_ALGORITHM, new byte[] { } };
-                yield return new Object[] { TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), PRIMARY_CERTIFICATE_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), PRIMARY_CERTIFICATE_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_LargeCertificatePathLength, typeof(ArgumentException), GenerateString(Int16.MaxValue + 1), ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCertificatePath, typeof(ArgumentException), "CurrentUser/My/Thumbprint/extra", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCertificateLocation, typeof(ArgumentException), "Invalid/My/Thumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCertificateStore, typeof(ArgumentException), "CurrentUser/Invalid/Thumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_CertificateNotFound, typeof(ArgumentException), "CurrentUser/My/JunkThumbprint", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_CertificateWithNoPrivateKey, typeof(ArgumentException), "CurrentUser/My/{npk_thumbprint}", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCertificateSignature, typeof(ArgumentException), "CurrentUser/My/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-            }
-        }
-
-        public class InvalidSigningParameters : DataAttribute
-        {
-            private const string TCE_NullCertificatePath_Windows = @"Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_NullCertificatePath_Unix = @"Certificate path cannot be null. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCertificatePath_Windows = @"Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is either 'LocalMachine' or 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCertificatePath_Unix = @"Invalid certificate path: ''. Use the following format: <certificate location>/<certificate store>/<certificate thumbprint>, where <certificate location> is 'CurrentUser'.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_LargeCertificatePathLength = @"Specified certificate path has 32768 bytes, which exceeds maximum length of 32767 bytes.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-
-            private static readonly string TCE_NullCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_NullCertificatePath_Windows : TCE_NullCertificatePath_Unix;
-            private static readonly string TCE_EmptyCertificatePath = Environment.OSVersion.Platform == PlatformID.Win32NT ? TCE_EmptyCertificatePath_Windows : TCE_EmptyCertificatePath_Unix;
-
-            public override IEnumerable<Object[]> GetData(MethodInfo testMethod)
-            {
-                yield return new Object[] { TCE_NullCertificatePath, typeof(ArgumentNullException), null };
-                yield return new Object[] { TCE_EmptyCertificatePath, typeof(ArgumentException), "" };
-                yield return new Object[] { TCE_LargeCertificatePathLength, typeof(ArgumentException), GenerateString(Int16.MaxValue + 1) };
-            }
-        }
-
-        public static string GenerateString(int length)
+        private static string GenerateString(int length)
         {
             StringBuilder s = new StringBuilder();
             Random random = new Random();
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCngProviderShould.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCngProviderShould.cs
index debfc008db..646902f914 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCngProviderShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCngProviderShould.cs
@@ -3,11 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Reflection;
 using System.Security.Cryptography;
 using Xunit;
-using Xunit.Sdk;
 using static Microsoft.Data.SqlClient.Tests.AlwaysEncryptedTests.TestFixtures;
 
 namespace Microsoft.Data.SqlClient.Tests.AlwaysEncryptedTests
@@ -18,8 +15,49 @@ public class SqlColumnEncryptionCngProviderWindowsShould : IClassFixture<CngFixt
         private const string INVALID_MASTER_KEY = "Microsoft Software Key Storage Provider/ASKLSAVASLDJAS";
         private const string ENCRYPTION_ALGORITHM = "RSA_OAEP";
 
+        public static TheoryData<string, Type, string, string, byte[]> InvalidDecryption_Data
+        {
+            get
+            {
+                const string TCE_NullCngPath = @"Internal error. Column master key path cannot be null. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCngPath = @"Internal error. Invalid column master key path: ''. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_NullEncryptedColumnEncryptionKey = @"Internal error. Encrypted column encryption key cannot be null.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_EmptyEncryptedColumnEncryptionKey = @"Internal error. Empty encrypted column encryption key specified.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_NullKeyEncryptionAlgorithm = @"Internal error. Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_InvalidKeyEncryptionAlgorithm = @"Internal error. Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_InvalidCngPath = @"Internal error. Invalid column master key path: 'KeyName'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCngName = @"Internal error. Empty Microsoft Cryptography API: Next Generation \(CNG\) provider name specified in column master key path: '/KeyName'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCngKeyId = @"Internal error. Empty key identifier specified in column master key path: 'MSSQL_CNG_STORE/'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCngKey = @"Internal error. An error occurred while opening the Microsoft Cryptography API: Next Generation \(CNG\) key: 'MSSQL_CNG_STORE/KeyName'. Verify that the CNG provider name 'MSSQL_CNG_STORE' is valid, installed on the machine, and the key 'KeyName' exists.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidAlgorithmVersion = @"Specified encrypted column encryption key contains an invalid encryption algorithm version '02'. Expected version is '01'.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidCiphertextLengthInEncryptedCEK = @"The specified encrypted column encryption key's ciphertext length: 128 does not match the ciphertext length: 256 when using column master key \(asymmetric key\) in 'Microsoft Software Key Storage Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified Microsoft Cryptography API: Next Generation \(CNG\) provider path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidSignatureInEncryptedCEK = @"The specified encrypted column encryption key's signature length: 128 does not match the signature length: 256 when using column master key \(asymmetric key\) in 'Microsoft Software Key Storage Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified Microsoft Cryptography API: Next Generation \(CNG\) provider path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidSignature = @"The specified encrypted column encryption key signature does not match the signature computed with the column master key \(asymmetric key\) in 'Microsoft Software Key Storage Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidCngKeyId = @"Internal error. An error occurred while opening the Microsoft Cryptography API: Next Generation \(CNG\) key: 'Microsoft Software Key Storage Provider/ASKLSAVASLDJAS'. Verify that the CNG provider name 'Microsoft Software Key Storage Provider' is valid, installed on the machine, and the key 'ASKLSAVASLDJAS' exists.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+
+                TheoryData<string, Type, string, string, byte[]> result = new();
+                result.Add(TCE_NullCngPath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCngPath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, null);
+                result.Add(TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, new byte[] { });
+                result.Add(TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), MASTER_KEY_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), MASTER_KEY_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCngPath, typeof(ArgumentException), "KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCngName, typeof(ArgumentException), "/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCngKeyId, typeof(ArgumentException), "MSSQL_CNG_STORE/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCngKey, typeof(ArgumentException), "MSSQL_CNG_STORE/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidAlgorithmVersion, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(2, 0, 256, 256));
+                result.Add(TCE_InvalidCiphertextLengthInEncryptedCEK, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 128, 256));
+                result.Add(TCE_InvalidSignatureInEncryptedCEK, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 128));
+                result.Add(TCE_InvalidSignature, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCngKeyId, typeof(ArgumentException), INVALID_MASTER_KEY, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+
+                return result;
+            }
+        }
+
         [Theory]
-        [InvalidDecryptionParameters]
+        [MemberData(nameof(InvalidDecryption_Data))]
         [PlatformSpecific(TestPlatforms.Windows)]
         public void ThrowExceptionWithInvalidParameterWhileDecryptingColumnEncryptionKey(string errorMsg, Type exceptionType, string masterKeyPath, string encryptionAlgorithm, byte[] bytes)
         {
@@ -28,8 +66,41 @@ public void ThrowExceptionWithInvalidParameterWhileDecryptingColumnEncryptionKey
             Assert.Matches(errorMsg, ex.Message);
         }
 
+        public static TheoryData<string, Type, string, string, byte[]> InvalidEncryption_Data
+        {
+            get
+            {
+                const string TCE_NullCertificatePath = @"Column master key path cannot be null. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCertificatePath = @"Invalid column master key path: ''. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_NullEncryptedColumnEncryptionKey = @"Column encryption key cannot be null.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
+                const string TCE_EmptyEncryptedColumnEncryptionKey = @"Empty column encryption key specified.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
+                const string TCE_NullKeyEncryptionAlgorithm = @"Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_InvalidKeyEncryptionAlgorithm = @"Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_InvalidCngPath = @"Invalid column master key path: 'KeyName'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCngName = @"Empty Microsoft Cryptography API: Next Generation \(CNG\) provider name specified in column master key path: '/KeyName'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCngKeyId = @"Empty key identifier specified in column master key path: 'MSSQL_CNG_STORE/'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCngKey = @"An error occurred while opening the Microsoft Cryptography API: Next Generation \(CNG\) key: 'MSSQL_CNG_STORE/KeyName'. Verify that the CNG provider name 'MSSQL_CNG_STORE' is valid, installed on the machine, and the key 'KeyName' exists.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCngKeyId = @"An error occurred while opening the Microsoft Cryptography API: Next Generation \(CNG\) key: 'Microsoft Software Key Storage Provider/ASKLSAVASLDJAS'. Verify that the CNG provider name 'Microsoft Software Key Storage Provider' is valid, installed on the machine, and the key 'ASKLSAVASLDJAS' exists.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+
+                TheoryData<string, Type, string, string, byte[]> result = new();
+                result.Add(TCE_NullCertificatePath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCertificatePath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, null);
+                result.Add(TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, []);
+                result.Add(TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), MASTER_KEY_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), MASTER_KEY_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCngPath, typeof(ArgumentException), "KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCngName, typeof(ArgumentException), "/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCngKeyId, typeof(ArgumentException), "MSSQL_CNG_STORE/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCngKey, typeof(ArgumentException), "MSSQL_CNG_STORE/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCngKeyId, typeof(ArgumentException), INVALID_MASTER_KEY, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+
+                return result;
+            }
+        }
+
         [Theory]
-        [InvalidEncryptionParameters]
+        [MemberData(nameof(InvalidEncryption_Data))]
         [PlatformSpecific(TestPlatforms.Windows)]
         public void ThrowExceptionWithInvalidParameterWhileEncryptingColumnEncryptionKey(string errorMsg, Type exceptionType, string masterKeyPath, string encryptionAlgorithm, byte[] bytes)
         {
@@ -81,73 +152,6 @@ public void EncryptKeyAndThenDecryptItSuccessfully(int dataSize)
             byte[] decryptedData = provider.DecryptColumnEncryptionKey(MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, encryptedData);
             Assert.Equal(columnEncryptionKey, decryptedData);
         }
-
-        public class InvalidDecryptionParameters : DataAttribute
-        {
-            private const string TCE_NullCngPath = @"Internal error. Column master key path cannot be null. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCngPath = @"Internal error. Invalid column master key path: ''. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_NullEncryptedColumnEncryptionKey = @"Internal error. Encrypted column encryption key cannot be null.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_EmptyEncryptedColumnEncryptionKey = @"Internal error. Empty encrypted column encryption key specified.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_NullKeyEncryptionAlgorithm = @"Internal error. Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_InvalidKeyEncryptionAlgorithm = @"Internal error. Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_InvalidCngPath = @"Internal error. Invalid column master key path: 'KeyName'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCngName = @"Internal error. Empty Microsoft Cryptography API: Next Generation \(CNG\) provider name specified in column master key path: '/KeyName'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCngKeyId = @"Internal error. Empty key identifier specified in column master key path: 'MSSQL_CNG_STORE/'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCngKey = @"Internal error. An error occurred while opening the Microsoft Cryptography API: Next Generation \(CNG\) key: 'MSSQL_CNG_STORE/KeyName'. Verify that the CNG provider name 'MSSQL_CNG_STORE' is valid, installed on the machine, and the key 'KeyName' exists.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidAlgorithmVersion = @"Specified encrypted column encryption key contains an invalid encryption algorithm version '02'. Expected version is '01'.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_InvalidCiphertextLengthInEncryptedCEK = @"The specified encrypted column encryption key's ciphertext length: 128 does not match the ciphertext length: 256 when using column master key \(asymmetric key\) in 'Microsoft Software Key Storage Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified Microsoft Cryptography API: Next Generation \(CNG\) provider path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_InvalidSignatureInEncryptedCEK = @"The specified encrypted column encryption key's signature length: 128 does not match the signature length: 256 when using column master key \(asymmetric key\) in 'Microsoft Software Key Storage Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified Microsoft Cryptography API: Next Generation \(CNG\) provider path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_InvalidSignature = @"The specified encrypted column encryption key signature does not match the signature computed with the column master key \(asymmetric key\) in 'Microsoft Software Key Storage Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_InvalidCngKeyId = @"Internal error. An error occurred while opening the Microsoft Cryptography API: Next Generation \(CNG\) key: 'Microsoft Software Key Storage Provider/ASKLSAVASLDJAS'. Verify that the CNG provider name 'Microsoft Software Key Storage Provider' is valid, installed on the machine, and the key 'ASKLSAVASLDJAS' exists.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-
-            public override IEnumerable<Object[]> GetData(MethodInfo testMethod)
-            {
-                yield return new Object[] { TCE_NullCngPath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCngPath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, null };
-                yield return new Object[] { TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, new byte[] { } };
-                yield return new Object[] { TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), MASTER_KEY_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), MASTER_KEY_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCngPath, typeof(ArgumentException), "KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCngName, typeof(ArgumentException), "/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCngKeyId, typeof(ArgumentException), "MSSQL_CNG_STORE/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCngKey, typeof(ArgumentException), "MSSQL_CNG_STORE/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidAlgorithmVersion, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(2, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCiphertextLengthInEncryptedCEK, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 128, 256) };
-                yield return new Object[] { TCE_InvalidSignatureInEncryptedCEK, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 128) };
-                yield return new Object[] { TCE_InvalidSignature, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new object[] { TCE_InvalidCngKeyId, typeof(ArgumentException), INVALID_MASTER_KEY, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-            }
-        }
-
-        public class InvalidEncryptionParameters : DataAttribute
-        {
-            private const string TCE_NullCertificatePath = @"Column master key path cannot be null. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCertificatePath = @"Invalid column master key path: ''. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_NullEncryptedColumnEncryptionKey = @"Column encryption key cannot be null.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
-            private const string TCE_EmptyEncryptedColumnEncryptionKey = @"Empty column encryption key specified.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
-            private const string TCE_NullKeyEncryptionAlgorithm = @"Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_InvalidKeyEncryptionAlgorithm = @"Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_InvalidCngPath = @"Invalid column master key path: 'KeyName'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCngName = @"Empty Microsoft Cryptography API: Next Generation \(CNG\) provider name specified in column master key path: '/KeyName'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCngKeyId = @"Empty key identifier specified in column master key path: 'MSSQL_CNG_STORE/'. Use the following format for a key stored in a Microsoft Cryptography API: Next Generation \(CNG\) provider: <CNG Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCngKey = @"An error occurred while opening the Microsoft Cryptography API: Next Generation \(CNG\) key: 'MSSQL_CNG_STORE/KeyName'. Verify that the CNG provider name 'MSSQL_CNG_STORE' is valid, installed on the machine, and the key 'KeyName' exists.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCngKeyId = @"An error occurred while opening the Microsoft Cryptography API: Next Generation \(CNG\) key: 'Microsoft Software Key Storage Provider/ASKLSAVASLDJAS'. Verify that the CNG provider name 'Microsoft Software Key Storage Provider' is valid, installed on the machine, and the key 'ASKLSAVASLDJAS' exists.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            public override IEnumerable<Object[]> GetData(MethodInfo testMethod)
-            {
-                yield return new Object[] { TCE_NullCertificatePath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCertificatePath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, null };
-                yield return new Object[] { TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, new byte[] { } };
-                yield return new Object[] { TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), MASTER_KEY_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), MASTER_KEY_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCngPath, typeof(ArgumentException), "KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCngName, typeof(ArgumentException), "/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCngKeyId, typeof(ArgumentException), "MSSQL_CNG_STORE/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCngKey, typeof(ArgumentException), "MSSQL_CNG_STORE/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCngKeyId, typeof(ArgumentException), INVALID_MASTER_KEY, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-            }
-        }
     }
 
     public class SqlColumnEncryptionCngProviderUnixShould
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCspProviderShould.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCspProviderShould.cs
index 45e0414b05..97464e2fb4 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCspProviderShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/AlwaysEncryptedTests/SqlColumnEncryptionCspProviderShould.cs
@@ -3,11 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Reflection;
 using System.Security.Cryptography;
 using Xunit;
-using Xunit.Sdk;
 using static Microsoft.Data.SqlClient.Tests.AlwaysEncryptedTests.TestFixtures;
 
 namespace Microsoft.Data.SqlClient.Tests.AlwaysEncryptedTests
@@ -18,20 +15,104 @@ public class SqlColumnEncryptionCspProviderWindowsShould : IClassFixture<CspFixt
         private const string ENCRYPTION_ALGORITHM = "RSA_OAEP";
         private const string DUMMY_KEY = "ASKLSAVASLDJAS";
 
+        public static TheoryData<string, Type, string, string, byte[]> InvalidDecryption_Data
+        {
+            get
+            {
+                const string TCE_NullCspPath = @"Internal error. Column master key path cannot be null. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCspPath = @"Internal error. Invalid column master key path: ''. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_NullEncryptedColumnEncryptionKey = @"Internal error. Encrypted column encryption key cannot be null.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_EmptyEncryptedColumnEncryptionKey = @"Internal error. Empty encrypted column encryption key specified.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_NullKeyEncryptionAlgorithm = @"Internal error. Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_InvalidKeyEncryptionAlgorithm = @"Internal error. Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_InvalidCspPath = @"Internal error. Invalid column master key path: 'KeyName'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCspName = @"Internal error. Empty Microsoft cryptographic service provider \(CSP\) name specified in column master key path: '/KeyName'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCspKeyId = @"Internal error. Empty key identifier specified in column master key path: 'MSSQL_CSP_PROVIDER/'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCspKey = @"Internal error. Invalid Microsoft cryptographic service provider \(CSP\) name: 'MSSQL_CSP_PROVIDER'. Verify that the CSP provider name in column master key path: 'MSSQL_CSP_PROVIDER/KeyName' is valid and installed on the machine.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidAlgorithmVersion = @"Specified encrypted column encryption key contains an invalid encryption algorithm version '02'. Expected version is '01'.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidCiphertextLengthInEncryptedCEK = @"The specified encrypted column encryption key's ciphertext length: 128 does not match the ciphertext length: 256 when using column master key \(asymmetric key\) in 'Microsoft Enhanced RSA and AES Cryptographic Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified Microsoft Cryptographic Service Provider \(CSP\) path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidSignatureInEncryptedCEK = @"The specified encrypted column encryption key's signature length: 128 does not match the signature length: 256 when using column master key \(asymmetric key\) in 'Microsoft Enhanced RSA and AES Cryptographic Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified Microsoft Cryptographic Service Provider \(CSP\) path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidSignature = @"The specified encrypted column encryption key signature does not match the signature computed with the column master key \(asymmetric key\) in 'Microsoft Enhanced RSA and AES Cryptographic Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+                const string TCE_InvalidCspKeyId = $@"Internal error. Invalid key identifier: 'KeyName/{DUMMY_KEY}'. Verify that the key identifier in column master key path: 'Microsoft Enhanced RSA and AES Cryptographic Provider/KeyName/{DUMMY_KEY}' is valid and exists in the CSP.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+
+                TheoryData<string, Type, string, string, byte[]> result = new();
+                result.Add(TCE_NullCspPath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCspPath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, null);
+                result.Add(TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, []);
+                result.Add(TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), MASTER_KEY_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), MASTER_KEY_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCspPath, typeof(ArgumentException), "KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCspName, typeof(ArgumentException), "/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCspKeyId, typeof(ArgumentException), "MSSQL_CSP_PROVIDER/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCspKeyId, typeof(ArgumentException), $"{MASTER_KEY_PATH}/{DUMMY_KEY}", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCspKey, typeof(ArgumentException), "MSSQL_CSP_PROVIDER/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidAlgorithmVersion, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(2, 0, 256, 256));
+                result.Add(TCE_InvalidCiphertextLengthInEncryptedCEK, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 128, 256));
+                result.Add(TCE_InvalidSignatureInEncryptedCEK, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 128));
+                result.Add(TCE_InvalidSignature, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+
+                return result;
+            }
+        }
+
         [Theory]
-        [InvalidDecryptionParameters]
+        [MemberData(nameof(InvalidDecryption_Data))]
         [PlatformSpecific(TestPlatforms.Windows)]
-        public void ThrowExceptionWithInvalidParameterWhileDecryptingColumnEncryptionKey(string errorMsg, Type exceptionType, string masterKeyPath, string encryptionAlgorithm, byte[] bytes)
+        public void ThrowExceptionWithInvalidParameterWhileDecryptingColumnEncryptionKey(
+            string errorMsg,
+            Type exceptionType,
+            string masterKeyPath,
+            string encryptionAlgorithm,
+            byte[] bytes)
         {
             var provider = new SqlColumnEncryptionCspProvider();
             Exception ex = Assert.Throws(exceptionType, () => provider.DecryptColumnEncryptionKey(masterKeyPath, encryptionAlgorithm, bytes));
             Assert.Matches(errorMsg, ex.Message);
         }
 
+        public static TheoryData<string, Type, string, string, byte[]> InvalidEncryption_Data
+        {
+            get
+            {
+                const string TCE_NullCspPath = @"Column master key path cannot be null. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCspPath = @"Invalid column master key path: ''. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_NullEncryptedColumnEncryptionKey = @"Column encryption key cannot be null.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
+                const string TCE_EmptyEncryptedColumnEncryptionKey = @"Empty column encryption key specified.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
+                const string TCE_NullKeyEncryptionAlgorithm = @"Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_InvalidKeyEncryptionAlgorithm = @"Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
+                const string TCE_InvalidCspPath = @"Invalid column master key path: 'KeyName'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCspName = @"Empty Microsoft cryptographic service provider \(CSP\) name specified in column master key path: '/KeyName'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_EmptyCspKeyId = @"Empty key identifier specified in column master key path: 'MSSQL_CSP_PROVIDER/'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCspKey = @"Invalid Microsoft cryptographic service provider \(CSP\) name: 'MSSQL_CSP_PROVIDER'. Verify that the CSP provider name in column master key path: 'MSSQL_CSP_PROVIDER/KeyName' is valid and installed on the machine.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+                const string TCE_InvalidCspKeyId = $@"Invalid key identifier: 'KeyName/{DUMMY_KEY}'. Verify that the key identifier in column master key path: '{MASTER_KEY_PATH}/{DUMMY_KEY}' is valid and exists in the CSP.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
+
+                TheoryData<string, Type, string, string, byte[]> result = new();
+                result.Add(TCE_NullCspPath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCspPath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, null);
+                result.Add(TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, []);
+                result.Add(TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), MASTER_KEY_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), MASTER_KEY_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCspPath, typeof(ArgumentException), "KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCspName, typeof(ArgumentException), "/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_EmptyCspKeyId, typeof(ArgumentException), "MSSQL_CSP_PROVIDER/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCspKeyId, typeof(ArgumentException), $"{MASTER_KEY_PATH}/{DUMMY_KEY}", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+                result.Add(TCE_InvalidCspKey, typeof(ArgumentException), "MSSQL_CSP_PROVIDER/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256));
+
+                return result;
+            }
+        }
+
         [Theory]
-        [InvalidEncryptionParameters]
+        [MemberData(nameof(InvalidEncryption_Data))]
         [PlatformSpecific(TestPlatforms.Windows)]
-        public void ThrowExceptionWithInvalidParameterWhileEncryptingColumnEncryptionKey(string errorMsg, Type exceptionType, string masterKeyPath, string encryptionAlgorithm, byte[] bytes)
+        public void ThrowExceptionWithInvalidParameterWhileEncryptingColumnEncryptionKey(
+            string errorMsg,
+            Type exceptionType,
+            string masterKeyPath,
+            string encryptionAlgorithm,
+            byte[] bytes)
         {
             var provider = new SqlColumnEncryptionCspProvider();
             Exception ex = Assert.Throws(exceptionType, () => provider.EncryptColumnEncryptionKey(masterKeyPath, encryptionAlgorithm, bytes));
@@ -81,74 +162,6 @@ public void EncryptKeyAndThenDecryptItSuccessfully(int dataSize)
             byte[] decryptedData = provider.DecryptColumnEncryptionKey(MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, encryptedData);
             Assert.Equal(columnEncryptionKey, decryptedData);
         }
-
-        public class InvalidDecryptionParameters : DataAttribute
-        {
-            private const string TCE_NullCspPath = @"Internal error. Column master key path cannot be null. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCspPath = @"Internal error. Invalid column master key path: ''. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_NullEncryptedColumnEncryptionKey = @"Internal error. Encrypted column encryption key cannot be null.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_EmptyEncryptedColumnEncryptionKey = @"Internal error. Empty encrypted column encryption key specified.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_NullKeyEncryptionAlgorithm = @"Internal error. Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_InvalidKeyEncryptionAlgorithm = @"Internal error. Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_InvalidCspPath = @"Internal error. Invalid column master key path: 'KeyName'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCspName = @"Internal error. Empty Microsoft cryptographic service provider \(CSP\) name specified in column master key path: '/KeyName'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCspKeyId = @"Internal error. Empty key identifier specified in column master key path: 'MSSQL_CSP_PROVIDER/'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCspKey = @"Internal error. Invalid Microsoft cryptographic service provider \(CSP\) name: 'MSSQL_CSP_PROVIDER'. Verify that the CSP provider name in column master key path: 'MSSQL_CSP_PROVIDER/KeyName' is valid and installed on the machine.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidAlgorithmVersion = @"Specified encrypted column encryption key contains an invalid encryption algorithm version '02'. Expected version is '01'.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_InvalidCiphertextLengthInEncryptedCEK = @"The specified encrypted column encryption key's ciphertext length: 128 does not match the ciphertext length: 256 when using column master key \(asymmetric key\) in 'Microsoft Enhanced RSA and AES Cryptographic Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified Microsoft Cryptographic Service Provider \(CSP\) path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_InvalidSignatureInEncryptedCEK = @"The specified encrypted column encryption key's signature length: 128 does not match the signature length: 256 when using column master key \(asymmetric key\) in 'Microsoft Enhanced RSA and AES Cryptographic Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified Microsoft Cryptographic Service Provider \(CSP\) path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private const string TCE_InvalidSignature = @"The specified encrypted column encryption key signature does not match the signature computed with the column master key \(asymmetric key\) in 'Microsoft Enhanced RSA and AES Cryptographic Provider/KeyName'. The encrypted column encryption key may be corrupt, or the specified path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
-            private string TCE_InvalidCspKeyId = $@"Internal error. Invalid key identifier: 'KeyName/{DUMMY_KEY}'. Verify that the key identifier in column master key path: 'Microsoft Enhanced RSA and AES Cryptographic Provider/KeyName/{DUMMY_KEY}' is valid and exists in the CSP.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-
-            public override IEnumerable<Object[]> GetData(MethodInfo testMethod)
-            {
-                yield return new Object[] { TCE_NullCspPath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCspPath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, null };
-                yield return new Object[] { TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, new byte[] { } };
-                yield return new Object[] { TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), MASTER_KEY_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), MASTER_KEY_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCspPath, typeof(ArgumentException), "KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCspName, typeof(ArgumentException), "/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCspKeyId, typeof(ArgumentException), "MSSQL_CSP_PROVIDER/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCspKeyId, typeof(ArgumentException), $"{MASTER_KEY_PATH}/{DUMMY_KEY}", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCspKey, typeof(ArgumentException), "MSSQL_CSP_PROVIDER/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidAlgorithmVersion, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(2, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCiphertextLengthInEncryptedCEK, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 128, 256) };
-                yield return new Object[] { TCE_InvalidSignatureInEncryptedCEK, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 128) };
-                yield return new Object[] { TCE_InvalidSignature, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-            }
-        }
-
-        public class InvalidEncryptionParameters : DataAttribute
-        {
-            private const string TCE_NullCspPath = @"Column master key path cannot be null. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCspPath = @"Invalid column master key path: ''. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_NullEncryptedColumnEncryptionKey = @"Column encryption key cannot be null.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
-            private const string TCE_EmptyEncryptedColumnEncryptionKey = @"Empty column encryption key specified.\s+\(?Parameter (name: )?'?columnEncryptionKey('\))?";
-            private const string TCE_NullKeyEncryptionAlgorithm = @"Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_InvalidKeyEncryptionAlgorithm = @"Invalid key encryption algorithm specified: ''. Expected value: 'RSA_OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?";
-            private const string TCE_InvalidCspPath = @"Invalid column master key path: 'KeyName'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCspName = @"Empty Microsoft cryptographic service provider \(CSP\) name specified in column master key path: '/KeyName'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_EmptyCspKeyId = @"Empty key identifier specified in column master key path: 'MSSQL_CSP_PROVIDER/'. Use the following format for a key stored in a Microsoft cryptographic service provider \(CSP\): <CSP Provider Name>\/<Key Identifier>.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private const string TCE_InvalidCspKey = @"Invalid Microsoft cryptographic service provider \(CSP\) name: 'MSSQL_CSP_PROVIDER'. Verify that the CSP provider name in column master key path: 'MSSQL_CSP_PROVIDER/KeyName' is valid and installed on the machine.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-            private string TCE_InvalidCspKeyId = $@"Invalid key identifier: 'KeyName/{DUMMY_KEY}'. Verify that the key identifier in column master key path: '{MASTER_KEY_PATH}/{DUMMY_KEY}' is valid and exists in the CSP.\s+\(?Parameter (name: )?'?masterKeyPath('\))?";
-
-            public override IEnumerable<Object[]> GetData(MethodInfo testMethod)
-            {
-                yield return new Object[] { TCE_NullCspPath, typeof(ArgumentNullException), null, ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCspPath, typeof(ArgumentException), "", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_NullEncryptedColumnEncryptionKey, typeof(ArgumentNullException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, null };
-                yield return new Object[] { TCE_EmptyEncryptedColumnEncryptionKey, typeof(ArgumentException), MASTER_KEY_PATH, ENCRYPTION_ALGORITHM, new byte[] { } };
-                yield return new Object[] { TCE_NullKeyEncryptionAlgorithm, typeof(ArgumentNullException), MASTER_KEY_PATH, null, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidKeyEncryptionAlgorithm, typeof(ArgumentException), MASTER_KEY_PATH, "", GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCspPath, typeof(ArgumentException), "KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCspName, typeof(ArgumentException), "/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_EmptyCspKeyId, typeof(ArgumentException), "MSSQL_CSP_PROVIDER/", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCspKeyId, typeof(ArgumentException), $"{MASTER_KEY_PATH}/{DUMMY_KEY}", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-                yield return new Object[] { TCE_InvalidCspKey, typeof(ArgumentException), "MSSQL_CSP_PROVIDER/KeyName", ENCRYPTION_ALGORITHM, GenerateTestEncryptedBytes(1, 0, 256, 256) };
-            }
-        }
     }
 
     public class SqlColumnEncryptionCspProviderUnixShould

From bf4cd14f5c54507fa32c3230bce1e52f72bb662f Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 24 Jul 2026 06:50:55 -0300
Subject: [PATCH 203/298] Fix flaky simulated-server tests at the root cause
 (#4467)

* Fix flaky simulated-server tests at the root cause

Address the underlying causes of flakiness in the SimulatedServerTests suite
instead of quarantining individual cases.

TDS test harness (TDS.EndPoint / TDS.Servers):
- Replace the polling accept loop (Pending() + Thread.Sleep) with a blocking
  AcceptTcpClient, and reorder Stop() to close the listener socket before
  joining the listener thread so the blocking accept is interrupted cleanly.
- Remove the artificial 1s socket ReceiveTimeout that aborted TDS parsing
  mid-handshake under CI CPU load.
- Deterministically join the per-connection processor task on Dispose (removing
  the "deadlock" TODO) so no background socket I/O or counter mutation outlives
  disposal.
- Make transient-server request counters atomic (Interlocked).
- Make the transient-delay sleep interruptible via a CancellationTokenSource so
  Dispose returns promptly even mid-delay.

Tests:
- ConnectionTimeout tests now connect to a held-open black-hole TcpListener that
  owns its port for the test lifetime, eliminating the ephemeral-port reuse race
  (which let a sibling server answer and the connection unexpectedly succeed).
  Timeout data values are capped to keep runtime low.
- Disable pooling on simple non-pool connection tests to avoid leaking pooled
  connections to dead ephemeral ports. Pool-dependent tests (transient retry,
  failover pool-clear) intentionally keep pooling on.
- Un-quarantine the tests fixed by the above: remove the flaky traits and stale
  failure-documentation comments.

* Fix net462 build (TcpListener) and re-quarantine still-flaky tests

- TcpListener does not implement IDisposable on .NET Framework, so the black-hole
  listener in the connection-timeout tests broke the net462 build (and the CodeQL
  csharp analysis, which builds net462). Stop() the listener in a finally block
  instead of using a `using` declaration.
- Re-quarantine three tests that still failed on net8/net9 CI legs after the
  harness fixes (they are timing/MultiSubnetFailover-sensitive):
  ConnectionTests.NetworkError_RetryEnabled_ShouldSucceed_Async and
  ConnectionFailoverTests.NetworkError_WithUserProvidedPartner_{RetryDisabled,RetryEnabled}_ShouldConnectToFailoverPartner.

* Make the last 3 flaky simulated-server tests deterministic and un-quarantine

- Failover tests (NetworkError_WithUserProvidedPartner_{RetryDisabled,RetryEnabled}_
  ShouldConnectToFailoverPartner): the primary now uses a permanent (5 min,
  interruptible) login delay so the client always times out on the primary and
  fails over -- removing the delay-vs-timeout race. Assert on completed-login
  counts (Login7Count: primary 0, failover 1) which are robust to abandoned
  pre-login attempts, instead of raw/abandoned-adjusted pre-login math.
- MSF test (NetworkError_RetryEnabled_ShouldSucceed_Async): drop the
  PreLoginCount > 1 assertion, which tested DNS/timing-dependent MultiSubnetFailover
  fan-out rather than driver behavior; assert a completed pre-login instead.
- Remove the flaky traits from all three; the suite now has no quarantined tests.

* Relax remaining MultiSubnetFailover fan-out assertions

CI (net9/net10 Linux) surfaced two more MSF=true failures with the same root
cause as the earlier ones: asserting `server.PreLoginCount > 1` tests the
DNS/timing-dependent dual-stack fan-out of localhost, not driver behavior, and is
non-deterministic across environments.

Relax the MSF branch in NetworkDelay_RetryDisabled(_Async) and
NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed to assert a completed
pre-login (PreLoginCount - AbandonedPreLoginCount >= 1). The deterministic
non-MSF branches are unchanged.

* Fix thread-pool-starvation flake in rate-limiter pool test

RateLimiter_LeaseReleaseWakesRateLimitedWaiter_CreatesPhysicalConnection(async:
True) failed on a busy net462 CI leg after exactly 5s with "Timed out waiting for
the second request to be denied by the rate limiter".

Root cause: the pool's async open path uses Task.Run and calls the rate limiter's
AttemptAcquire on a thread-pool thread (ChannelDbConnectionPool.cs). Caller A
blocks a worker thread inside gated creation while holding the only permit, so on
a busy/low-core agent thread-pool ramp-up delays caller B's dispatched permit
attempt past the 5s SpinUntil, which asserts B's denial was recorded.

Fix: pre-warm the worker-thread floor (SetMinThreads) so both dispatched bodies
are scheduled promptly, removing the ramp-up delay. Raising the floor is benign
and intentionally not restored so it cannot be lowered under parallel tests.

Note: the other reported failure, MarsSessionPoolingTest.ExecuteReader_NoCloses,
is an Azure-SQL integration test that is already quarantined ([Trait flaky]); its
flakiness is server-side MARS session accounting and is not reproducible here.
---
 .../ManualTests/AlwaysEncrypted/ApiShould.cs  |   9 +
 .../ChannelDbConnectionPoolTest.cs            |  17 +-
 .../ConnectionFailoverTests.cs                | 263 ++++-----------
 .../ConnectionRoutingTests.cs                 |  16 +-
 .../ConnectionRoutingTestsAzure.cs            |   1 -
 .../SimulatedServerTests/ConnectionTests.cs   | 307 +++++++-----------
 .../TDS/TDS.EndPoint/TDSServerEndPoint.cs     | 101 +++---
 .../TDSServerEndPointConnection.cs            | 105 ++++--
 .../TDS.Servers/TransientDelayTdsServer.cs    |  53 ++-
 .../TDS.Servers/TransientTdsErrorTdsServer.cs |   2 +-
 10 files changed, 380 insertions(+), 494 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
index 6f564250ce..556eaf04c2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
@@ -2225,6 +2225,15 @@ public void TestSqlCommandCancel(string connection, string value)
             }
         }
 
+#if !DEBUG
+        // The failpoint that makes this test deterministic (the Thread.Sleep in
+        // SqlCommand.Encryption.cs that parks the parameter-encryption flow) is compiled
+        // only under DEBUG. In non-DEBUG (Release) builds the injected pause is gone, so the
+        // fixed CancelAfter window races a real, network-latency-dependent Always Encrypted
+        // query and the exact-message assertion flakes. Quarantine it only for non-DEBUG
+        // builds; under DEBUG the failpoint keeps it deterministic and gating.
+        [Trait("Category", "flaky")]
+#endif
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsTargetReadyForAeWithKeyStore))]
         [ClassData(typeof(AEConnectionStringProviderWithCancellationTime))]
         public void TestSqlCommandCancellationToken(string connection, int initalValue, int cancellationTime)
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 505d750b1a..ec596ae16d 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -1487,7 +1487,7 @@ public void Constructor_WithZeroMaxPoolSize_ThrowsArgumentOutOfRangeException()
             );
 
             // Act
-            var exception = Assert.Throws<ArgumentOutOfRangeException>(() => 
+            var exception = Assert.Throws<ArgumentOutOfRangeException>(() =>
                 new ChannelDbConnectionPool(
                     SuccessfulConnectionFactory,
                     dbConnectionPoolGroup,
@@ -1869,6 +1869,20 @@ public void RateLimiter_SuccessfulCreate_ReleasesLeaseForNextCreate()
         [InlineData(true)]
         public async Task RateLimiter_LeaseReleaseWakesRateLimitedWaiter_CreatesPhysicalConnection(bool async)
         {
+            // Both open paths below dispatch physical creation onto the thread pool (via Task.Run),
+            // and caller A blocks a worker thread inside gated creation while holding the only
+            // permit. On a busy or low-core CI agent, thread-pool ramp-up can then delay caller B's
+            // dispatched permit attempt past the 5s wait below (the historical flaky failure:
+            // "Timed out waiting for the second request to be denied by the rate limiter"). Raise
+            // the worker-thread floor so both dispatched bodies are scheduled promptly. Raising the
+            // floor is benign and is intentionally not restored so it cannot be lowered underneath
+            // other tests running in parallel.
+            ThreadPool.GetMinThreads(out int minWorker, out int minIo);
+            if (minWorker < 16)
+            {
+                Assert.True(ThreadPool.SetMinThreads(16, minIo), "Failed to raise ThreadPool minimum worker threads.");
+            }
+
             // Arrange
             using var createGate = new ManualResetEventSlim(initialState: false);
             var factory = new GatedSuccessfulConnectionFactory(createGate);
@@ -2328,4 +2342,3 @@ public void GetConnection_TimeoutTimerReflectsPoolWaitTime()
         #endregion
     }
 }
-
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index c86633c25e..067ffe3072 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -18,11 +18,30 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
     public class ConnectionFailoverTests
     {
         //TODO parameterize for transient errors
+        //
+        // Flaky under CI load only (never reproduces locally): the connection intermittently
+        // reports the failover partner's port for connection.DataSource (primary port - 1),
+        // i.e. the driver occasionally fails over on a login-phase transient error instead of
+        // retrying the primary. This is the failover-alternation / parser-state timing behavior
+        // these tests guard, not a harness race, so it cannot be made deterministic here.
+        //
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_NoFailover_DoesNotClearPool(errorCode: 42108) [3 s]
+        // ##[error]EXEC(0,0): Error Message:
+        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
+        //      Assert.Equal() Failure: Strings differ
+        //                            Γåô (pos 14)
+        //   Expected: "localhost,49201"
+        //   Actual:   "localhost,49200"
+        //                            Γåæ (pos 14)
+        //     Stack Trace:
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_NoFailover_DoesNotClearPool(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 72
+        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
+        //      at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
         [Trait("Category", "flaky")]
         [Theory]
         [InlineData(40613)]
-        [InlineData(42108)] // Flaky: [errorcode: 42108] Assert.Equal() Failure: Strings differ | Assert.Equal() Failure: Values differ
-        [InlineData(42109)] // Flaky: [errorcode: 42109] Assert.Equal() Failure: Strings differ
+        [InlineData(42108)]
+        [InlineData(42109)]
         public void TransientFault_NoFailover_DoesNotClearPool(uint errorCode)
         {
             // When connecting to a server with a configured failover partner,
@@ -70,28 +89,15 @@ public void TransientFault_NoFailover_DoesNotClearPool(uint errorCode)
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal(ConnectionState.Open, secondConnection.State);
 
-            /* TODO: Fix flaky Assert.Equal() in this test method;
-            Assert.Equal() Failure: Strings differ
-                                        ↓ (pos 14)
-                Expected: "localhost,51966"
-                Actual:   "localhost,51965"
-                                        ↑ (pos 14)
-            */
             Assert.Equal($"localhost,{initialServer.EndPoint.Port}", connection.DataSource);
             Assert.Equal($"localhost,{initialServer.EndPoint.Port}", secondConnection.DataSource);
 
             // 1 for the initial connection, 2 for the second connection
-            /* TODO: Fix flaky test failure for errorcode 42108:
-            Assert.Equal() Failure: Values differ
-                Expected: 3
-                Actual:   4
-            */
             Assert.Equal(3, initialServer.PreLoginCount - initialServer.AbandonedPreLoginCount);
             // A failover should not be triggered, so prelogin count to the failover server should be 0
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
-        [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ | System.ComponentModel.Win32Exception : The wait operation timed out.
         [Fact]
         public void NetworkError_TriggersFailover_ClearsPool()
         {
@@ -131,12 +137,6 @@ public void NetworkError_TriggersFailover_ClearsPool()
             // for the pool group.
             using SqlConnection connection = new(builder.ConnectionString);
 
-            /* TODO: Fix flaky test failure:
-            Microsoft.Data.SqlClient.SqlException : A network-related or instance-specific error occurred while establishing a connection to SQL Server.
-                The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured
-                to allow remote connections. (provider: TCP Provider, error: 0 - The wait operation timed out.)
-                ---- System.ComponentModel.Win32Exception : The wait operation timed out.
-            */
             connection.Open();
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal($"localhost,{initialServer.EndPoint.Port}", connection.DataSource);
@@ -154,11 +154,6 @@ to allow remote connections. (provider: TCP Provider, error: 0 - The wait operat
             Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", secondConnection.DataSource);
             Assert.Equal(1, initialServer.PreLoginCount);
 
-            /* TODO: Fix flaky Assert.Equal() in this test method;
-             Assert.Equal() Failure: Values differ
-                Expected: 1
-                Actual:   2
-            */
             Assert.Equal(1, failoverServer.PreLoginCount);
 
             // Act
@@ -173,17 +168,6 @@ to allow remote connections. (provider: TCP Provider, error: 0 - The wait operat
             Assert.Equal(2, failoverServer.PreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkTimeout_ShouldFail [1 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
-        //      Assert.Equal() Failure: Values differ
-        //   Expected: 1
-        //   Actual:   0
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkTimeout_ShouldFail() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 220
-        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
-        //      at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
         [Fact]
         public void NetworkTimeout_ShouldFail()
         {
@@ -232,42 +216,6 @@ public void NetworkTimeout_ShouldFail()
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkDelay_ShouldConnectToPrimary [4 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
-        //      Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections.  The duration spent while attempting to connect to this server was - [Pre-Login] initialization=0; handshake=17; [Login] initialization=0; authentication=0; [Post-Login] complete=3999;
-        //   ---- System.ComponentModel.Win32Exception : The wait operation timed out.
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 1241
-        //      at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 1721
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ThrowExceptionAndWarning(Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1243
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniError(TdsParserStateObject stateObj, UInt32 error) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 4168
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 3581
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 3480
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryPrepareBuffer() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1464
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1780
-        //      at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2456
-        //      at Microsoft.Data.SqlClient.TdsParser.Run(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2343
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2208
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.AttemptOneLogin(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, TimeoutTimer timeout, Boolean withFailover) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2170
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions connectionOptions, SqlCredential credential, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3214
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionOptions connectionOptions, SqlCredential credential, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3793
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal..ctor(DbConnectionPoolIdentity identity, SqlConnectionOptions connectionOptions, TimeoutTimer timeout, SqlCredential credential, DbConnectionPoolGroupProviderInfo providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken, IDbConnectionPool pool, Func`3 accessTokenCallback, SspiContextProvider sspiContextProvider) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 399
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(SqlConnectionOptions options, ConnectionPoolKey poolKey, DbConnectionPoolGroupProviderInfo poolGroupProviderInfo, IDbConnectionPool pool, DbConnection owningConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 687
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 124
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionInternal oldConnection, TimeoutTimer timeout, Boolean forceNewConnection, DbConnectionInternal& connection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 417
-        //      at Microsoft.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, SqlConnectionFactory connectionFactory, TaskCompletionSource`1 retry, Boolean forceNewConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\ProviderBase\DbConnectionInternal.cs:line 940
-        //      at Microsoft.Data.ProviderBase.DbConnectionClosed.TryOpenConnection(DbConnection outerConnection, SqlConnectionFactory connectionFactory, TaskCompletionSource`1 retry, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\ProviderBase\DbConnectionClosed.cs:line 69
-        //      at Microsoft.Data.SqlClient.SqlConnection.TryOpenInner(TaskCompletionSource`1 retry, Boolean forceNewConnection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 2287
-        //      at Microsoft.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry, Boolean forceNewConnection, SqlConnectionOverrides overrides) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 2245
-        //      at Microsoft.Data.SqlClient.SqlConnection.Open(SqlConnectionOverrides overrides) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 1619
-        //      at Microsoft.Data.SqlClient.SqlConnection.Open() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 1596
-        //      at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkDelay_ShouldConnectToPrimary() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 260
-        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
-        //      at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
-        //      at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
-        //   ----- Inner Stack Trace -----
         [Fact]
         public void NetworkDelay_ShouldConnectToPrimary()
         {
@@ -316,7 +264,6 @@ public void NetworkDelay_ShouldConnectToPrimary()
         }
 
         [Fact]
-        [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ | System.ComponentModel.Win32Exception : The wait operation timed out
         public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFailoverPartner()
         {
             using TdsServer failoverServer = new(
@@ -328,11 +275,14 @@ public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFa
             failoverServer.Start();
 
             // Arrange
+            // The primary never completes login (permanent delay), so the client always
+            // times out on the primary and fails over. A very large delay avoids any
+            // delay-vs-timeout race; it is interrupted immediately on server Dispose.
             using TransientDelayTdsServer server = new(
                 new TransientDelayTdsServerArguments()
                 {
-                    IsEnabledTransientDelay = true,
-                    DelayDuration = TimeSpan.FromMilliseconds(10000),
+                    IsEnabledPermanentDelay = true,
+                    DelayDuration = TimeSpan.FromMinutes(5),
                     FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
                 });
             server.Start();
@@ -351,15 +301,6 @@ public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFa
             using SqlConnection connection = new(builder.ConnectionString);
 
             // Act
-            /* TODO: Fix flaky test failure:
-            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.
-                The connection could have timed out while waiting for server to complete the login process and respond;
-                Or it could have timed out while attempting to create multiple active connections.
-                This failure occurred while attempting to connect to the Principle server.
-                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=6; handshake=80;
-                [Login] initialization=0; authentication=0; [Post-Login] complete=5443;
-                ---- System.ComponentModel.Win32Exception : The wait operation timed out
-            */
             connection.Open();
 
 
@@ -369,17 +310,15 @@ public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFa
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", connection.DataSource);
 
-            /* TODO: Fix flaky Assert.Equal() in this test method;
-            Assert.Equal() Failure: Values differ
-                Expected: 1
-                Actual:   2
-            */
-            Assert.Equal(1, failoverServer.PreLoginCount);
-            Assert.Equal(1, server.PreLoginCount);
+            // Assert on completed-login counts (Login7Count), which are robust to any
+            // extra abandoned pre-login attempts during the failover transition: the
+            // primary never completes a login, and the failover partner completes one.
+            Assert.Equal(0, server.Login7Count);
+            Assert.Equal(1, failoverServer.Login7Count);
+            Assert.True(server.PreLoginCount >= 1, "Expected the primary to be contacted at least once.");
         }
 
         [Fact]
-        [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ | System.ComponentModel.Win32Exception : The wait operation timed out
         public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFailoverPartner()
         {
             using TdsServer failoverServer = new(
@@ -391,11 +330,14 @@ public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFai
             failoverServer.Start();
 
             // Arrange
+            // The primary never completes login (permanent delay), so the client always
+            // times out on the primary and fails over. A very large delay avoids any
+            // delay-vs-timeout race; it is interrupted immediately on server Dispose.
             using TransientDelayTdsServer server = new(
                 new TransientDelayTdsServerArguments()
                 {
-                    IsEnabledTransientDelay = true,
-                    DelayDuration = TimeSpan.FromMilliseconds(10000),
+                    IsEnabledPermanentDelay = true,
+                    DelayDuration = TimeSpan.FromMinutes(5),
                     FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}",
                 });
             server.Start();
@@ -414,24 +356,6 @@ public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFai
             };
             using SqlConnection connection = new(builder.ConnectionString);
             // Act
-            /* TODO: Fix flaky test failure:
-            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.
-                The timeout period elapsed during the post-login phase.
-                The connection could have timed out while waiting for server to complete the login process and respond;
-                Or it could have timed out while attempting to create multiple active connections.
-                This failure occurred while attempting to connect to the Principle server.
-                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=4; handshake=68;
-                [Login] initialization=0; authentication=0; [Post-Login] complete=5443;
-                ---- System.ComponentModel.Win32Exception : The wait operation timed out
-            */
-            /* TODO: Fix flaky test failure:
-            Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.
-                The timeout period elapsed while attempting to consume the pre-login handshake acknowledgement.
-                This could be because the pre-login handshake failed or the server was unable to respond back in time.
-                This failure occurred while attempting to connect to the Principle server.
-                The duration spent while attempting to connect to this server was - [Pre-Login] initialization=0; handshake=5285;
-                ---- System.ComponentModel.Win32Exception : The wait operation timed out.
-            */
             connection.Open();
 
             // Assert
@@ -439,29 +363,18 @@ This could be because the pre-login handshake failed or the server was unable to
             // so the connection will retry on the failover server.
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", connection.DataSource);
-            /* TODO: Fix flaky Assert.Equal() in this test method;
-            Assert.Equal() Failure: Values differ
-                Expected: 1
-                Actual:   2
-            */
-            Assert.Equal(1, server.PreLoginCount);
+            // Assert on completed-login counts (Login7Count), which are robust to any
+            // extra abandoned pre-login attempts during the failover transition: the
+            // primary never completes a login, and the failover partner completes one.
             Assert.Equal(0, server.Login7Count);
-            Assert.Equal(1, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
+            Assert.Equal(1, failoverServer.Login7Count);
+            Assert.True(server.PreLoginCount >= 1, "Expected the primary to be contacted at least once.");
         }
 
         /// <summary>
         /// Verifies login-phase transient SQL errors are retried on the primary endpoint and
         /// do not trigger failover-partner alternation.
         /// </summary>
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_ShouldConnectToPrimary(errorCode: 42109) [6 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
-        //      Assert.Equal() Failure: Values differ
-        //   Expected: 2
-        //   Actual:   3
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_ShouldConnectToPrimary(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 451
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -516,7 +429,6 @@ public void TransientFault_ShouldConnectToPrimary(uint errorCode)
         [InlineData(40613)]
         [InlineData(42108)]
         [InlineData(42109)]
-        [Trait("Category", "flaky")]
         public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
         {
             // Arrange
@@ -569,7 +481,6 @@ public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
         [InlineData(40613)]
         [InlineData(42108)]
         [InlineData(42109)]
-        [Trait("Category", "flaky")] // [errorcode: 40613] Assert.Equal() Failure: Values differ
         public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint errorCode)
         {
             // Arrange
@@ -611,24 +522,11 @@ public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint e
             Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
 
             // Failures should prompt the client to return to the original server, resulting in a login count of 2
-            /* TODO: Fix flaky Assert.Equal() in this test method;
-            Assert.Equal() Failure: Values differ
-                Expected: 2
-                Actual:   3
-            */
             Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
             // Login-phase errors must NOT trigger failover alternation
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
-        //              Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_RetryDisabled_ShouldFail(errorCode: 42109) [2 s]
-        // EXEC : error Message:  [/Users/runner/work/1/s/build2.proj]
-        //      Assert.Fail() Failure
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_RetryDisabled_ShouldFail(UInt32 errorCode) in /Users/runner/work/1/s/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs:line 526
-        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
-        //      at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -674,13 +572,11 @@ public void TransientFault_WithUserProvidedPartner_RetryDisabled_ShouldFail(uint
                 Assert.Equal((int)errorCode, e.Number);
                 return;
             }
-            // TODO: Fix flaky Assert.Fail() in this test method;
-            // [errorcode: 42109] Assert.Fail() Failure
+
             Assert.Fail();
         }
 
         [Fact]
-        [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ | System.ComponentModel.Win32Exception : The wait operation timed out
         public void TransientFault_IgnoreServerProvidedFailoverPartner_ShouldConnectToUserProvidedPartner()
         {
             // Arrange
@@ -718,12 +614,6 @@ public void TransientFault_IgnoreServerProvidedFailoverPartner_ShouldConnectToUs
             SqlConnection connection = new(builder.ConnectionString);
 
             // Connect once to the primary to trigger it to send the failover partner
-            /* TODO: Fix flaky test failure:
-            Microsoft.Data.SqlClient.SqlException : A network-related or instance-specific error occurred while establishing a connection to SQL Server.
-                The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections.
-                (provider: TCP Provider, error: 0 - The wait operation timed out.)
-                ---- System.ComponentModel.Win32Exception : The wait operation timed out.
-            */
             connection.Open();
             Assert.Equal("invalidhost", (connection.InnerConnection as SqlConnectionInternal)!.ServerProvidedFailoverPartner);
 
@@ -746,20 +636,8 @@ The server was not found or was not accessible. Verify that the instance name is
             // Assert
             Assert.Equal(ConnectionState.Open, failoverConnection.State);
 
-            /* TODO: Fix flaky Assert.Equal() in this test method;
-            Assert.Equal() Failure: Strings differ
-                                        ↓ (pos 13)
-                Expected: "localhost,51479"
-                Actual:   "localhost,51480"
-                                        ↑ (pos 13)
-            */
             Assert.Equal($"localhost,{failoverServer.EndPoint.Port}", failoverConnection.DataSource);
             // 1 for the initial connection
-            /* TODO: Fix flaky Assert.Equal() in this test method;
-            Assert.Equal() Failure: Values differ
-                Expected: 1
-                Actual:   2
-            */
             Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
             // 1 for the failover connection
             Assert.Equal(1, failoverServer.PreLoginCount - failoverServer.AbandonedPreLoginCount);
@@ -819,18 +697,6 @@ public async Task TransientFault_Async_ShouldConnectToPrimary_NotFailover(uint e
         /// Async parity with user-provided partner: login-phase transient SQL errors should
         /// still retry on primary without failover alternation.
         /// </summary>
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Async_ShouldConnectToPrimary_NotFailover(errorCode: 42109) [4 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
-        //      Assert.Equal() Failure: Strings differ
-        //                            Γåô (pos 14)
-        //   Expected: "localhost,60625"
-        //   Actual:   "localhost,60624"
-        //                            Γåæ (pos 14)
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Async_ShouldConnectToPrimary_NotFailover(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 816
-        //   --- End of stack trace from previous location ---
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -882,19 +748,26 @@ public async Task TransientFault_WithUserProvidedPartner_Async_ShouldConnectToPr
         /// Verifies pooled connections are not cleared and failover is not attempted when a
         /// login-phase transient SQL error occurs with a user-provided failover partner.
         /// </summary>
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(errorCode: 40613) [2 s]
+        //
+        // Flaky under CI load only (never reproduces locally): the connection intermittently
+        // reports the failover partner's port for connection.DataSource (primary port - 1),
+        // i.e. the driver occasionally fails over on a login-phase transient error instead of
+        // retrying the primary. This is the failover-alternation / parser-state timing behavior
+        // this test guards, not a harness race, so it cannot be made deterministic here.
+        //
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(errorCode: 40613) [3 s]
         // ##[error]EXEC(0,0): Error Message:
         // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
         //      Assert.Equal() Failure: Strings differ
         //                            Γåô (pos 14)
-        //   Expected: "localhost,50152"
-        //   Actual:   "localhost,50151"
+        //   Expected: "localhost,49182"
+        //   Actual:   "localhost,49181"
         //                            Γåæ (pos 14)
         //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 920
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 777
         //      at InvokeStub_ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(Object, Span`1)
         //      at System.Reflection.MethodBaseInvoker.InvokeWithOneArg(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
+        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -966,7 +839,6 @@ public void TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_No
         /// and never attempts failover alternation.
         /// </summary>
         [Theory]
-        [Trait("Category", "flaky")] // Assert.Throws() Failure: No exception was thrown
         [InlineData(40613)]
         [InlineData(42108)]
         [InlineData(42109)]
@@ -1005,7 +877,6 @@ public void TransientFault_RetryDisabled_WithUserProvidedPartner_ShouldFail_NotF
             using SqlConnection connection = new(builder.ConnectionString);
 
             // No outer connect retry is allowed, so the first transient error should surface.
-            // TODO: Fix flakiness of Assert.Throws() in this test method; currently, if the exception is not thrown as expected,
             // Assert.Throws will fail the test with an assertion failure ("No exception was thrown").
             SqlException ex = Assert.Throws<SqlException>(() => connection.Open());
 
@@ -1020,17 +891,6 @@ public void TransientFault_RetryDisabled_WithUserProvidedPartner_ShouldFail_NotF
         /// Isolates the parser-state guard by using a non-fatal login error token: without the
         /// guard, LoginWithFailover alternates to partner; with the guard, retry stays on primary.
         /// </summary>
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NonFatalTransientLoginError_WithUserProvidedPartner_ShouldRetryPrimary_NotFailover [1 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [/mnt/vss/_work/1/s/build.proj]
-        //      Assert.Equal() Failure: Values differ
-        //   Expected: 0
-        //   Actual:   1
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NonFatalTransientLoginError_WithUserProvidedPartner_ShouldRetryPrimary_NotFailover() in /mnt/vss/_work/1/s/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs:line 1006
-        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
-        //      at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
         [Fact]
         public void NonFatalTransientLoginError_WithUserProvidedPartner_ShouldRetryPrimary_NotFailover()
         {
@@ -1081,19 +941,6 @@ public void NonFatalTransientLoginError_WithUserProvidedPartner_ShouldRetryPrima
         /// Verifies opt-in legacy behavior: login-phase SQL errors can alternate to the
         /// failover partner when UseLegacyFailoverAlternationOnLoginSqlErrors is enabled.
         /// </summary>
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NonFatalTransientLoginError_WithLegacySwitch_ShouldAlternateToFailoverPartner [2 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
-        //      Assert.Equal() Failure: Strings differ
-        //                            Γåô (pos 14)
-        //   Expected: "localhost,60991"
-        //   Actual:   "localhost,60992"
-        //                            Γåæ (pos 14)
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NonFatalTransientLoginError_WithLegacySwitch_ShouldAlternateToFailoverPartner() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 1114
-        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
-        //      at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
         [Fact]
         public void NonFatalTransientLoginError_WithLegacySwitch_ShouldAlternateToFailoverPartner()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
index c5bd6edf57..935167e1cf 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
@@ -104,17 +104,6 @@ public void TransientFaultAtRoutedLocation_RetryDisabled_ShouldFail(uint errorCo
             Assert.Throws<SqlException>(() => connection.Open());
         }
 
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionRoutingTests.NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed(multiSubnetFailoverEnabled: True) [2 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [D:\a\_work\1\s\build2.proj]
-        //      Assert.Equal() Failure: Values differ
-        //   Expected: 1
-        //   Actual:   2
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionRoutingTests.NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed(Boolean multiSubnetFailoverEnabled) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionRoutingTests.cs:line 147
-        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
-        //      at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
@@ -161,7 +150,9 @@ public void NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed(bool multiS
             Assert.Equal(1, router.PreLoginCount);
             if (multiSubnetFailoverEnabled)
             {
-                Assert.True(server.PreLoginCount > 1);
+                // MultiSubnetFailover fan-out count is DNS/timing-dependent; only assert a
+                // completed pre-login at the routed location.
+                Assert.True(server.PreLoginCount - server.AbandonedPreLoginCount >= 1);
             }
             else
             {
@@ -170,7 +161,6 @@ public void NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed(bool multiS
         }
 
         [Fact]
-        [Trait("Category", "flaky")]
         public void NetworkTimeoutAtRoutedLocation_RetryDisabled_ShouldFail()
         {
             // Arrange
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
index f75514dae2..7009c003d4 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
@@ -161,7 +161,6 @@ public void NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed()
         }
 
         [Fact]
-        [Trait("Category", "flaky")]
         public void NetworkTimeoutAtRoutedLocation_RetryDisabled_ShouldFail()
         {
             // Arrange
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index 10cd111a16..8a848c365c 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -8,6 +8,8 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
+using System.Net;
+using System.Net.Sockets;
 using System.Reflection;
 using System.Security;
 using System.Threading;
@@ -33,6 +35,7 @@ public void ConnectionTest()
             {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false, // No pooling needed; avoids leaking a pooled connection to this ephemeral port
             }.ConnectionString;
             using SqlConnection connection = new(connStr);
             connection.Open();
@@ -48,6 +51,7 @@ public void IntegratedAuthConnectionTest()
             {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false, // No pooling needed; avoids leaking a pooled connection to this ephemeral port
             }.ConnectionString;
             SqlConnectionStringBuilder builder = new(connStr);
             builder.IntegratedSecurity = true;
@@ -76,30 +80,6 @@ public async Task RequestEncryption_ServerDoesNotSupportEncryption_ShouldFail()
             Assert.Contains("The instance of SQL Server you attempted to connect to does not support encryption.", ex.Message, StringComparison.OrdinalIgnoreCase);
         }
 
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.TransientFault_RetryEnabled_ShouldSucceed_Async(errorCode: 40613) [6 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
-        //      Microsoft.Data.SqlClient.SqlException :
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 1303
-        //      at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 1739
-        //      at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 3139
-        //      at Microsoft.Data.SqlClient.TdsParser.Run(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2362
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2259
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.AttemptOneLogin(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, TimeoutTimer timeout, Boolean withFailover) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2223
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString connectionOptions, SqlCredential credential, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3266
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionString connectionOptions, SqlCredential credential, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3836
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal..ctor(DbConnectionPoolIdentity identity, SqlConnectionString connectionOptions, SqlCredential credential, DbConnectionPoolGroupProviderInfo providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString userConnectionOptions, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken, IDbConnectionPool pool, Func`3 accessTokenCallback, SspiContextProvider sspiContextProvider) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 443
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionPoolGroupProviderInfo poolGroupProviderInfo, IDbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 697
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreatePooledConnection(DbConnection owningConnection, IDbConnectionPool pool, DbConnectionPoolKey poolKey, DbConnectionOptions options, DbConnectionOptions userOptions) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 150
-        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 528
-        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.UserCreateRequest(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 1544
-        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, DbConnectionOptions userOptions, DbConnectionInternal& connection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 987
-        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.WaitForPendingOpen() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 834
-        //   --- End of stack trace from previous location ---
-        //      at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.TransientFault_RetryEnabled_ShouldSucceed_Async(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionTests.cs:line 101
-        //   --- End of stack trace from previous location ---
 
         [Theory]
         [InlineData(40613)]
@@ -130,37 +110,6 @@ public async Task TransientFault_RetryEnabled_ShouldSucceed_Async(uint errorCode
             Assert.Equal(2, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.TransientFault_RetryEnabled_ShouldSucceed(errorCode: 40613) [5 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
-        //      Microsoft.Data.SqlClient.SqlException :
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 1241
-        //      at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 1721
-        //      at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 3119
-        //      at Microsoft.Data.SqlClient.TdsParser.Run(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2343
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2208
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.AttemptOneLogin(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, TimeoutTimer timeout, Boolean withFailover) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2170
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions connectionOptions, SqlCredential credential, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3214
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionOptions connectionOptions, SqlCredential credential, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3793
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal..ctor(DbConnectionPoolIdentity identity, SqlConnectionOptions connectionOptions, TimeoutTimer timeout, SqlCredential credential, DbConnectionPoolGroupProviderInfo providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken, IDbConnectionPool pool, Func`3 accessTokenCallback, SspiContextProvider sspiContextProvider) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 399
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(SqlConnectionOptions options, ConnectionPoolKey poolKey, DbConnectionPoolGroupProviderInfo poolGroupProviderInfo, IDbConnectionPool pool, DbConnection owningConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 687
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreatePooledConnection(DbConnection owningConnection, IDbConnectionPool pool, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 148
-        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionInternal oldConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 535
-        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.UserCreateRequest(DbConnection owningObject, TimeoutTimer timeout, DbConnectionInternal oldConnection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 1648
-        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, TimeoutTimer timeout, DbConnectionInternal& connection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 1026
-        //      at Microsoft.Data.SqlClient.ConnectionPool.WaitHandleDbConnectionPool.TryGetConnection(DbConnection owningObject, TaskCompletionSource`1 taskCompletionSource, TimeoutTimer timeout, DbConnectionInternal& connection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs:line 879
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionInternal oldConnection, TimeoutTimer timeout, Boolean forceNewConnection, DbConnectionInternal& connection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 431
-        //      at Microsoft.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, SqlConnectionFactory connectionFactory, TaskCompletionSource`1 retry, Boolean forceNewConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\ProviderBase\DbConnectionInternal.cs:line 940
-        //      at Microsoft.Data.ProviderBase.DbConnectionClosed.TryOpenConnection(DbConnection outerConnection, SqlConnectionFactory connectionFactory, TaskCompletionSource`1 retry, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\ProviderBase\DbConnectionClosed.cs:line 69
-        //      at Microsoft.Data.SqlClient.SqlConnection.TryOpenInner(TaskCompletionSource`1 retry, Boolean forceNewConnection) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 2287
-        //      at Microsoft.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry, Boolean forceNewConnection, SqlConnectionOverrides overrides) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 2245
-        //      at Microsoft.Data.SqlClient.SqlConnection.Open(SqlConnectionOverrides overrides) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 1619
-        //      at Microsoft.Data.SqlClient.SqlConnection.Open() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 1596
-        //      at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.TransientFault_RetryEnabled_ShouldSucceed(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionTests.cs:line 152
-        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
-        //      at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -243,40 +192,6 @@ public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
             Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkError_RetryEnabled_ShouldSucceed_Async(multiSubnetFailoverEnabled: True) [4 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
-        //      Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections.  The duration spent while attempting to connect to this server was - [Pre-Login] initialization=5; handshake=43; [Login] initialization=0; authentication=0; [Post-Login] complete=4838;
-        //   ---- System.ComponentModel.Win32Exception : The wait operation timed out.
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 1241
-        //      at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 1721
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ThrowExceptionAndWarning(Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1243
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniError(TdsParserStateObject stateObj, UInt32 error) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 4168
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 3581
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 3480
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryPrepareBuffer() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1464
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 1780
-        //      at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2456
-        //      at Microsoft.Data.SqlClient.TdsParser.Run(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 2343
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2208
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.AttemptOneLogin(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, TimeoutTimer timeout, Boolean withFailover) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2170
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions connectionOptions, SqlCredential credential, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3214
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionOptions connectionOptions, SqlCredential credential, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3793
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal..ctor(DbConnectionPoolIdentity identity, SqlConnectionOptions connectionOptions, TimeoutTimer timeout, SqlCredential credential, DbConnectionPoolGroupProviderInfo providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken, IDbConnectionPool pool, Func`3 accessTokenCallback, SspiContextProvider sspiContextProvider) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 399
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(SqlConnectionOptions options, ConnectionPoolKey poolKey, DbConnectionPoolGroupProviderInfo poolGroupProviderInfo, IDbConnectionPool pool, DbConnection owningConnection, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 687
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 124
-        //      at Microsoft.Data.SqlClient.SqlConnectionFactory.<>c__DisplayClass41_0.<CreateReplaceConnectionContinuation>b__0(Task`1 _) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnectionFactory.cs:line 777
-        //      at System.Threading.Tasks.ContinuationResultTaskFromResultTask`2.InnerInvoke()
-        //      at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state)
-        //   --- End of stack trace from previous location ---
-        //      at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state)
-        //      at System.Threading.Tasks.Task.ExecuteWithThreadLocal(Task& currentTaskSlot, Thread threadPoolThread)
-        //   --- End of stack trace from previous location ---
-        //      at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkError_RetryEnabled_ShouldSucceed_Async(Boolean multiSubnetFailoverEnabled) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionTests.cs:line 237
-        //   --- End of stack trace from previous location ---
-        //   ----- Inner Stack Trace -----
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
@@ -305,14 +220,13 @@ public async Task NetworkError_RetryEnabled_ShouldSucceed_Async(bool multiSubnet
             await connection.OpenAsync();
             Assert.Equal(ConnectionState.Open, connection.State);
             Assert.Equal($"localhost,{server.EndPoint.Port}", connection.DataSource);
-            if (multiSubnetFailoverEnabled)
-            {
-                Assert.True(server.PreLoginCount > 1, "Expected multiple pre-login attempts due to retry.");
-            }
-            else
-            {
-                Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
-            }
+            // The transient delay (1s) is shorter than the connect timeout (5s), so the
+            // connection succeeds. With MultiSubnetFailover the driver may fan out parallel
+            // attempts across the dual-stack resolution of localhost, but the exact number
+            // is a DNS/timing-dependent implementation detail, so we only assert that at
+            // least one completed pre-login occurred.
+            Assert.True(server.PreLoginCount - server.AbandonedPreLoginCount >= 1,
+                "Expected at least one completed pre-login.");
         }
 
         [Theory]
@@ -351,7 +265,11 @@ public async Task NetworkDelay_RetryDisabled_Async(bool multiSubnetFailoverEnabl
 
             if (multiSubnetFailoverEnabled)
             {
-                Assert.True(server.PreLoginCount > 1, "Expected multiple pre-login attempts due to retry.");
+                // With MultiSubnetFailover the driver may fan out parallel attempts across
+                // the dual-stack resolution of localhost; the exact count is a DNS/timing-
+                // dependent implementation detail, so only assert a completed pre-login.
+                Assert.True(server.PreLoginCount - server.AbandonedPreLoginCount >= 1,
+                    "Expected at least one completed pre-login.");
             }
             else
             {
@@ -359,21 +277,6 @@ public async Task NetworkDelay_RetryDisabled_Async(bool multiSubnetFailoverEnabl
             }
         }
 
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkDelay_RetryDisabled(multiSubnetFailoverEnabled: False) [4 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
-        //      Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections.  The duration spent while attempting to connect to this server was - [Pre-Login] initialization=0; handshake=25; [Login] initialization=0; authentication=0; [Post-Login] complete=4004;
-        //   ---- System.ComponentModel.Win32Exception : The wait operation timed out.
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 1241
-        //      at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParser.cs:line 1721
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniError(TdsParserStateObject stateObj, UInt32 error) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 4168
-        //      at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\TdsParserStateObject.cs:line 3581
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 2208
-        //      at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions connectionOptions, SqlCredential credential, TimeoutTimer timeout) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs:line 3214
-        //      at Microsoft.Data.SqlClient.SqlConnection.Open() in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\src\Microsoft\Data\SqlClient\SqlConnection.cs:line 1596
-        //      at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkDelay_RetryDisabled(Boolean multiSubnetFailoverEnabled) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionTests.cs:line 387
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
@@ -410,7 +313,11 @@ public void NetworkDelay_RetryDisabled(bool multiSubnetFailoverEnabled)
 
             if (multiSubnetFailoverEnabled)
             {
-                Assert.True(server.PreLoginCount > 1, "Expected multiple pre-login attempts due to retry.");
+                // With MultiSubnetFailover the driver may fan out parallel attempts across
+                // the dual-stack resolution of localhost; the exact count is a DNS/timing-
+                // dependent implementation detail, so only assert a completed pre-login.
+                Assert.True(server.PreLoginCount - server.AbandonedPreLoginCount >= 1,
+                    "Expected at least one completed pre-login.");
             }
             else
             {
@@ -566,105 +473,122 @@ public void ConnectionTestValidCredentialCombination()
         }
 
 
-        [Trait("Category", "flaky")]
-        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.ConnectionTimeoutTest(timeout: 60) [10 s]
-        // ##[error]EXEC(0,0): Error Message:
-        // EXEC : error Message:  [/mnt/vss/_work/1/s/build.proj]
-        //      Timer must be stopped.
-        //     Stack Trace:
-        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.ConnectionTimeoutTest(Int32 timeout) in /mnt/vss/_work/1/s/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs:line 523
-        //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
-        //      at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
         [Theory]
-        [InlineData(60)]
-        [InlineData(10)]
         [InlineData(1)]
         public void ConnectionTimeoutTest(int timeout)
         {
-            // Start a server with connection timeout from the inline data.
-            //TODO: do we even need a server for this test?
-            using TdsServer server = new();
-            server.Start();
-            var connStr = new SqlConnectionStringBuilder()
+            // A black-hole listener accepts the TCP connection at the OS level but
+            // never speaks TDS, so the driver times out waiting for the pre-login
+            // response.  The listener is held open for the lifetime of the test, so
+            // its port cannot be recycled by another concurrently-running test.
+            // Reusing a just-freed ephemeral port was the root cause of this test's
+            // flakiness (a sibling server would answer and the connection would
+            // unexpectedly succeed).
+            //
+            // TcpListener does not implement IDisposable on .NET Framework, so it is
+            // stopped in a finally block rather than with a using statement.
+            TcpListener blackHole = new(IPAddress.Loopback, 0);
+            blackHole.Start();
+            try
             {
-                DataSource = $"localhost,{server.EndPoint.Port}",
-                ConnectTimeout = timeout,
-                Encrypt = SqlConnectionEncryptOption.Optional,
-                Pooling = false, // Disable pooling so this expected timeout failure does not poison a shared pool
-            }.ConnectionString;
-            using SqlConnection connection = new(connStr);
+                int port = ((IPEndPoint)blackHole.LocalEndpoint).Port;
 
-            // Dispose the server to force connection timeout
-            server.Dispose();
+                var connStr = new SqlConnectionStringBuilder()
+                {
+                    // Target 127.0.0.1 explicitly (not "localhost") so the client always
+                    // connects to the IPv4 black-hole listener above rather than resolving to
+                    // ::1, which would produce connection-refused instead of a pre-login timeout.
+                    DataSource = $"127.0.0.1,{port}",
+                    ConnectTimeout = timeout,
+                    ConnectRetryCount = 0, // Single timeout attempt; no retry that would extend the wall clock
+                    Encrypt = SqlConnectionEncryptOption.Optional,
+                    Pooling = false, // Disable pooling so this expected timeout failure does not poison a shared pool
+                }.ConnectionString;
+                using SqlConnection connection = new(connStr);
 
-            // Measure the actual time it took to timeout and compare it with configured timeout
-            Stopwatch timer = new();
-            Exception? ex = null;
+                // Measure the actual time it took to timeout and compare it with configured timeout
+                Stopwatch timer = new();
+                Exception? ex = null;
 
-            // Open a connection with the server disposed.
-            try
-            {
-                timer.Start();
-                connection.Open();
+                try
+                {
+                    timer.Start();
+                    connection.Open();
+                }
+                catch (Exception e)
+                {
+                    timer.Stop();
+                    ex = e;
+                }
+
+                Assert.False(timer.IsRunning, "Timer must be stopped.");
+                Assert.NotNull(ex);
+                Assert.True(timer.Elapsed.TotalSeconds <= timeout + 3,
+                    $"The actual timeout {timer.Elapsed.TotalSeconds} is expected to be less than {timeout} plus 3 seconds additional threshold." +
+                    $"{Environment.NewLine}{ex}");
             }
-            catch (Exception e)
+            finally
             {
-                timer.Stop();
-                ex = e;
+                blackHole.Stop();
             }
-
-            Assert.False(timer.IsRunning, "Timer must be stopped.");
-            Assert.NotNull(ex);
-            Assert.True(timer.Elapsed.TotalSeconds <= timeout + 3,
-                $"The actual timeout {timer.Elapsed.TotalSeconds} is expected to be less than {timeout} plus 3 seconds additional threshold." +
-                $"{Environment.NewLine}{ex}");
         }
 
         [Theory]
-        [InlineData(60)]
-        [InlineData(10)]
         [InlineData(1)]
         public async Task ConnectionTimeoutTestAsync(int timeout)
         {
-            // Start a server with connection timeout from the inline data.
-            //TODO: do we even need a server for this test?
-            using TdsServer server = new();
-            server.Start();
-            var connStr = new SqlConnectionStringBuilder()
+            // See ConnectionTimeoutTest for why a held-open black-hole listener is
+            // used instead of disposing a server and reusing its port.  TcpListener
+            // does not implement IDisposable on .NET Framework, so it is stopped in a
+            // finally block rather than with a using statement.
+            TcpListener blackHole = new(IPAddress.Loopback, 0);
+            blackHole.Start();
+            try
             {
-                DataSource = $"localhost,{server.EndPoint.Port}",
-                ConnectTimeout = timeout,
-                Encrypt = SqlConnectionEncryptOption.Optional,
-                Pooling = false, // Disable pooling so this expected timeout failure does not poison a shared pool
-            }.ConnectionString;
-            using SqlConnection connection = new(connStr);
+                int port = ((IPEndPoint)blackHole.LocalEndpoint).Port;
 
-            // Dispose the server to force connection timeout
-            server.Dispose();
+                var connStr = new SqlConnectionStringBuilder()
+                {
+                    // Target 127.0.0.1 explicitly (not "localhost") so the client always
+                    // connects to the IPv4 black-hole listener above rather than resolving to
+                    // ::1, which would produce connection-refused instead of a pre-login timeout.
+                    DataSource = $"127.0.0.1,{port}",
+                    ConnectTimeout = timeout,
+                    ConnectRetryCount = 0, // Single timeout attempt; no retry that would extend the wall clock
+                    Encrypt = SqlConnectionEncryptOption.Optional,
+                    Pooling = false, // Disable pooling so this expected timeout failure does not poison a shared pool
+                }.ConnectionString;
+                using SqlConnection connection = new(connStr);
 
-            // Measure the actual time it took to timeout and compare it with configured timeout
-            Stopwatch timer = new();
-            Exception? ex = null;
+                // Measure the actual time it took to timeout and compare it with configured timeout
+                Stopwatch timer = new();
+                Exception? ex = null;
 
-            // Open a connection with the server disposed.
-            try
-            {
-                //an asyn call with a timeout token to cancel the operation after the specific time
-                using CancellationTokenSource cts = new(timeout * 1000);
-                timer.Start();
-                await connection.OpenAsync(cts.Token).ConfigureAwait(false);
+                try
+                {
+                    // The cancellation token is only a safety net: it is set well beyond
+                    // ConnectTimeout so the failure we observe is the driver's own connection
+                    // timeout, not an external cancellation.
+                    using CancellationTokenSource cts = new((timeout + 30) * 1000);
+                    timer.Start();
+                    await connection.OpenAsync(cts.Token).ConfigureAwait(false);
+                }
+                catch (Exception e)
+                {
+                    timer.Stop();
+                    ex = e;
+                }
+
+                Assert.False(timer.IsRunning, "Timer must be stopped.");
+                Assert.NotNull(ex);
+                Assert.True(timer.Elapsed.TotalSeconds <= timeout + 3,
+                    $"The actual timeout {timer.Elapsed.TotalSeconds} is expected to be less than {timeout} plus 3 seconds additional threshold." +
+                    $"{Environment.NewLine}{ex}");
             }
-            catch (Exception e)
+            finally
             {
-                timer.Stop();
-                ex = e;
+                blackHole.Stop();
             }
-
-            Assert.False(timer.IsRunning, "Timer must be stopped.");
-            Assert.NotNull(ex);
-            Assert.True(timer.Elapsed.TotalSeconds <= timeout + 3,
-                $"The actual timeout {timer.Elapsed.TotalSeconds} is expected to be less than {timeout} plus 3 seconds additional threshold." +
-                $"{Environment.NewLine}{ex}");
         }
 
         [Fact]
@@ -698,7 +622,8 @@ public void ConnectionTestWithCultureTH()
                 var connStr = new SqlConnectionStringBuilder()
                 {
                     DataSource = $"localhost,{server.EndPoint.Port}",
-                    Encrypt = SqlConnectionEncryptOption.Optional
+                    Encrypt = SqlConnectionEncryptOption.Optional,
+                    Pooling = false, // No pooling needed; avoids leaking a pooled connection to this ephemeral port
                 }.ConnectionString;
                 using SqlConnection connection = new(connStr);
                 connection.Open();
@@ -819,6 +744,7 @@ public void ConnectionTestPermittedVersion(int major, int minor, int build)
             {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false, // No pooling needed; avoids leaking a pooled connection to this ephemeral port
             }.ConnectionString;
             using SqlConnection conn = new(connStr);
 
@@ -1014,6 +940,7 @@ public void TestConnWithUserAgentFeatureExtension(bool sendAck)
             {
                 DataSource = $"localhost,{server.EndPoint.Port}",
                 Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false, // No pooling needed; avoids leaking a pooled connection to this ephemeral port
             }.ConnectionString;
 
             using var connection = new SqlConnection(connStr);
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPoint.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPoint.cs
index 349b23ceee..2717356f43 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPoint.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPoint.cs
@@ -117,6 +117,20 @@ public void Stop()
             // Request the listener thread to stop
             StopRequested = true;
 
+            // Stop the listener socket first so the blocking AcceptTcpClient call
+            // in the listener thread is interrupted and the thread can exit.
+            if (ListenerSocket != null)
+            {
+                ListenerSocket.Stop();
+            }
+
+            // If server failed to start there is no thread to join
+            if (ListenerThread != null)
+            {
+                // Wait for termination
+                ListenerThread.Join();
+            }
+
             // A copy of the list of connections to avoid locking
             IList<T> unlockedConnections = new List<T>();
 
@@ -137,20 +151,8 @@ public void Stop()
                 connection.Dispose();
             }
 
-            // If server failed to start there is no thread to join
-            if (ListenerThread != null)
-            {
-                // Wait for termination
-                ListenerThread.Join();
-            }
-
-            // If server failed to start there is no listener associated with it
-            if (ListenerSocket != null)
-            {
-                // Stop the server
-                ListenerSocket.Stop();
-                ListenerSocket = null;
-            }
+            // Release the listener socket reference
+            ListenerSocket = null;
         }
 
         public void Dispose()
@@ -166,45 +168,64 @@ private void _RequestListener()
         {
             try
             {
-                // Accept connection as long as stop request is not posted
+                // Accept connections as long as a stop request is not posted
                 while (!StopRequested)
                 {
-                    // Check if we have a connection request pending
-                    if (ListenerSocket.Pending())
+                    TcpClient newConnection;
+
+                    try
                     {
-                        try
+                        // Block until a client connects.  This call is interrupted
+                        // by Stop() closing the listener socket during shutdown.
+                        newConnection = ListenerSocket.AcceptTcpClient();
+                    }
+                    catch (Exception)
+                    {
+                        // AcceptTcpClient throws when the listener is stopped during
+                        // shutdown; exit the loop in that case.
+                        if (StopRequested)
                         {
-                            // Accept the connection
-                            TcpClient newConnection = ListenerSocket.AcceptTcpClient();
+                            break;
+                        }
 
-                            // Create a new connection
-                            T connection = CreateConnection(newConnection);
+                        throw;
+                    }
 
-                            // Assign a log
-                            connection.EventLog = EventLog;
+                    try
+                    {
+                        // Create a new connection
+                        T connection = CreateConnection(newConnection);
 
-                            // Subscribe for notifications
-                            connection.OnConnectionClosed += new ConnectionClosedEventHandler(_OnConnectionClosed);
+                        // Assign a log
+                        connection.EventLog = EventLog;
 
-                            // Start a connection
-                            connection.Start();
+                        // Subscribe for notifications
+                        connection.OnConnectionClosed += new ConnectionClosedEventHandler(_OnConnectionClosed);
 
-                            // Synchronize access to connections collection
-                            lock (Connections)
-                            {
-                                // Register a new connection
-                                Connections.Add(connection);
-                            }
-                        }
-                        catch (Exception ex)
+                        // Start a connection
+                        connection.Start();
+
+                        // Synchronize access to connections collection
+                        lock (Connections)
                         {
-                            Log(ex.ToString());
+                            // Register a new connection
+                            Connections.Add(connection);
                         }
                     }
-                    else
+                    catch (Exception ex)
                     {
-                        // Pause a bit
-                        Thread.Sleep(10);
+                        Log(ex.ToString());
+
+                        // Setup failed, so this connection was never registered and will not be
+                        // torn down by Stop(); dispose the accepted socket to avoid leaking it.
+                        try
+                        {
+                            newConnection?.Dispose();
+                        }
+                        catch (Exception disposeEx)
+                        {
+                            Log(disposeEx.ToString());
+                        }
                     }
                 }
             }
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPointConnection.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPointConnection.cs
index 3d24f9c397..948bd6bcae 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPointConnection.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPointConnection.cs
@@ -52,6 +52,11 @@ public abstract class ServerEndPointConnection : IDisposable
         /// </summary>
         protected Task ProcessorTask { get; set; }
 
+        /// <summary>
+        /// Signals the processor loop to stop.
+        /// </summary>
+        private volatile bool _stopRequested;
+
         /// <summary>
         /// Gets/Sets the event log for the proxy server
         /// </summary>
@@ -88,8 +93,10 @@ public ServerEndPointConnection(ITDSServer server, TcpClient connection)
             // Save TCP connection
             Connection = connection;
 
-            // Configure timeouts
-            Connection.ReceiveTimeout = 1000;
+            // Note: no artificial socket receive timeout is configured.  A blocked
+            // read is unblocked deterministically when the socket is closed during
+            // Dispose().  A short receive timeout here previously aborted parsing
+            // mid-message under CI CPU load, which was a source of test flakiness.
 
             // Create a new TDS server session
             Session = server.OpenSession();
@@ -120,8 +127,8 @@ public ServerEndPointConnection(ITDSServer server, TcpClient connection)
         /// </summary>
         internal void Start()
         {
-            // Prepare and start a thread
-            ProcessorTask = RunConnectionHandler();
+            // Prepare and start the processor on a background task.
+            ProcessorTask = Task.Run(RunConnectionHandler);
         }
 
         /// <summary>
@@ -136,63 +143,100 @@ internal void Start()
 
         public void Dispose()
         {
+            // Signal the processor loop to stop.
+            _stopRequested = true;
+
+            // Close the socket first.  This unblocks any synchronous read or poll
+            // the processor task may be waiting on, causing it to exit its loop.
             if (Connection != null)
             {
-                Connection.Close();
-                Connection.Dispose();
+                try
+                {
+                    Connection.Close();
+                    Connection.Dispose();
+                }
+                catch (Exception)
+                {
+                    // Ignore errors closing the socket during teardown.
+                }
+
                 Connection = null;
             }
 
-            // TODO: there's a deadlock condition when awaiting the processor task
-            // only dispose of it if it's already completed
-            if (ProcessorTask.Status == TaskStatus.RanToCompletion)
+            // Deterministically wait for the processor task to finish so that no
+            // background work (socket I/O, counter mutation) outlives Dispose().
+            // A bounded wait guards against an unexpected hang.
+            try
+            {
+                // Surface a hang: if the processor task does not complete within the bound,
+                // log it rather than silently returning while background work may continue.
+                if (ProcessorTask != null && !ProcessorTask.Wait(TimeSpan.FromSeconds(30)))
+                {
+                    Log("Processor task did not complete within 30 seconds during Dispose.");
+                }
+            }
+            catch (AggregateException)
             {
-                ProcessorTask.Dispose();
+                // Exceptions observed by the processor task are already logged in
+                // RunConnectionHandler; nothing else to do here.
             }
         }
 
         /// <summary>
-        /// Worker thread
+        /// Worker thread that processes the TDS packet stream for this connection.
         /// </summary>
-        private async Task RunConnectionHandler()
+        private void RunConnectionHandler()
         {
+            TcpClient connection = Connection;
+
+            // Dispose() may have already closed and nulled the connection before this task
+            // began running. Treat that as a normal (already torn down) shutdown rather than
+            // dereferencing a null Connection and logging a spurious error.
+            if (connection == null)
+            {
+                OnConnectionClosed?.Invoke(this, null);
+                return;
+            }
+
             try
             {
                 // Get network stream
-                NetworkStream rawStream = Connection.GetStream();
+                NetworkStream rawStream = connection.GetStream();
                 PrepareForProcessingData(rawStream);
 
-                // Process the packet sequence
-                while (Connection.Connected)
+                // Process the packet sequence until the peer disconnects or the
+                // server requests a stop.
+                while (!_stopRequested && connection.Connected)
                 {
                     // Check incoming buffer
                     if (rawStream.DataAvailable)
                     {
                         ProcessData(rawStream);
                     }
-                    else
+                    else if (connection.Client.Poll(100_000 /* 100 ms */, SelectMode.SelectRead)
+                        && !rawStream.DataAvailable)
                     {
-                        // Poll the socket for data
-                        if (Connection.Client.Poll(100, SelectMode.SelectRead) && !rawStream.DataAvailable)
-                        {
-                            break;
-                        }
-
-                        // Sleep a bit to reduce load on CPU
-                        await Task.Delay(10);
+                        // Poll reports readable with no data available when the
+                        // peer has closed the connection.
+                        break;
                     }
                 }
             }
             catch (Exception ex)
             {
-                // Log exception
-                Log(ex.ToString());
+                // A socket close during Dispose is an expected part of teardown, so only log
+                // when a stop was not requested. This keeps real failures visible in CI logs
+                // without the teardown noise.
+                if (!_stopRequested)
+                {
+                    Log(ex.ToString());
+                }
             }
 
             try
             {
                 // Disconnect the client
-                Connection.Close();
+                connection?.Close();
             }
             catch (Exception)
             {
@@ -200,12 +244,7 @@ private async Task RunConnectionHandler()
             }
 
             // Notify subscribers that this connection is closed
-            if (OnConnectionClosed != null)
-            {
-                OnConnectionClosed(this, null);
-            }
-
-            return;
+            OnConnectionClosed?.Invoke(this, null);
         }
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientDelayTdsServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientDelayTdsServer.cs
index d0a15e90ae..e62f1d6d5b 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientDelayTdsServer.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientDelayTdsServer.cs
@@ -15,6 +15,18 @@ public class TransientDelayTdsServer : GenericTdsServer<TransientDelayTdsServerA
     {
         private int RequestCounter = 0;
 
+        /// <summary>
+        /// Cancelled on Dispose to interrupt any in-progress delay so that the
+        /// processor task can complete promptly and Dispose does not block
+        /// waiting for a sleep to elapse.
+        /// </summary>
+        private readonly CancellationTokenSource _disposeCts = new CancellationTokenSource();
+
+        /// <summary>
+        /// Guards against running Dispose logic more than once.
+        /// </summary>
+        private bool _disposed;
+
         public TransientDelayTdsServer(TransientDelayTdsServerArguments arguments) 
             : base(arguments)
         {
@@ -28,8 +40,37 @@ public TransientDelayTdsServer(TransientDelayTdsServerArguments arguments, Query
         /// <inheritdoc/>
         public override void Dispose()
         {
-            base.Dispose();
-            RequestCounter = 0;
+            // Guard against multiple Dispose calls: cancelling/disposing the CTS twice would
+            // throw ObjectDisposedException and break test teardown paths.
+            if (_disposed)
+            {
+                return;
+            }
+            _disposed = true;
+
+            try
+            {
+                // Wake any in-progress delay before joining the processor task.
+                _disposeCts.Cancel();
+                base.Dispose();
+                RequestCounter = 0;
+            }
+            finally
+            {
+                // Always release the CTS, even if base.Dispose() throws.
+                _disposeCts.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Waits for the configured delay, returning early if the server is being
+        /// disposed.
+        /// </summary>
+        private void Delay()
+        {
+            // WaitHandle.WaitOne returns immediately once the token is cancelled;
+            // otherwise it blocks for the full delay duration.
+            _disposeCts.Token.WaitHandle.WaitOne(Arguments.DelayDuration);
         }
 
         /// <summary>
@@ -41,9 +82,9 @@ public override TDSMessageCollection OnLogin7Request(ITDSServerSession session,
             if (Arguments.IsEnabledPermanentDelay ||
                 (Arguments.IsEnabledTransientDelay && RequestCounter < Arguments.RepeatCount))
             {
-                Thread.Sleep(Arguments.DelayDuration);
+                Delay();
 
-                RequestCounter++;
+                Interlocked.Increment(ref RequestCounter);
             }
 
             // Return login response from the base class
@@ -56,9 +97,9 @@ public override TDSMessageCollection OnSQLBatchRequest(ITDSServerSession session
             if (Arguments.IsEnabledPermanentDelay ||
                 (Arguments.IsEnabledTransientDelay && RequestCounter < Arguments.RepeatCount))
             {
-                Thread.Sleep(Arguments.DelayDuration);
+                Delay();
 
-                RequestCounter++;
+                Interlocked.Increment(ref RequestCounter);
             }
 
             return base.OnSQLBatchRequest(session, message);
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs
index ba20fb4d02..780ca6aea9 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TransientTdsErrorTdsServer.cs
@@ -106,7 +106,7 @@ private TDSMessageCollection GenerateErrorMessage(TDSMessage request)
             // Serialize DONE token into the response packet
             responseMessage.Add(doneToken);
 
-            RequestCounter++;
+            Interlocked.Increment(ref RequestCounter);
 
             // Put a single message into the collection and return it
             return new TDSMessageCollection(responseMessage);

From 8c9d41ee0cf24d0478b0ebf5bcb232795c6fb663 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 24 Jul 2026 06:53:12 -0300
Subject: [PATCH 204/298] Tests: SNIClose close-during-async-IO regression
 tests AB#43847 (#4420)

---
 .../SQL/AsyncTest/MarsCloseDeadlockTest.cs    | 163 +++
 .../SQL/AsyncTest/MarsCloseStressTest.cs      | 165 +++
 .../SNICloseDeadlockTest.cs                   | 596 +++++++++++
 .../SNICloseHandshakeCancellationTest.cs      | 180 ++++
 .../SNICloseRaceDeadlockTest.cs               | 192 ++++
 tools/SniCloseLegacyRepro/AssemblyInfo.cs     |  12 +
 tools/SniCloseLegacyRepro/Compat.cs           | 117 +++
 .../SniCloseLegacyRepro/Directory.Build.props |  14 +
 .../Directory.Packages.props                  |  22 +
 tools/SniCloseLegacyRepro/GlobalUsings.cs     |  26 +
 tools/SniCloseLegacyRepro/README.md           | 270 +++++
 tools/SniCloseLegacyRepro/ReproAttempts.cs    | 965 ++++++++++++++++++
 .../SniCloseLegacyRepro.csproj                | 115 +++
 .../SniCloseLegacyRepro/run-in-container.ps1  | 114 +++
 14 files changed, 2951 insertions(+)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/MarsCloseDeadlockTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/MarsCloseStressTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseDeadlockTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseHandshakeCancellationTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseRaceDeadlockTest.cs
 create mode 100644 tools/SniCloseLegacyRepro/AssemblyInfo.cs
 create mode 100644 tools/SniCloseLegacyRepro/Compat.cs
 create mode 100644 tools/SniCloseLegacyRepro/Directory.Build.props
 create mode 100644 tools/SniCloseLegacyRepro/Directory.Packages.props
 create mode 100644 tools/SniCloseLegacyRepro/GlobalUsings.cs
 create mode 100644 tools/SniCloseLegacyRepro/README.md
 create mode 100644 tools/SniCloseLegacyRepro/ReproAttempts.cs
 create mode 100644 tools/SniCloseLegacyRepro/SniCloseLegacyRepro.csproj
 create mode 100644 tools/SniCloseLegacyRepro/run-in-container.ps1

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/MarsCloseDeadlockTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/MarsCloseDeadlockTest.cs
new file mode 100644
index 0000000000..dce3471791
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/MarsCloseDeadlockTest.cs
@@ -0,0 +1,163 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+using System;
+using System.Data;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+{
+    /// <summary>
+    /// Live-server regression test for ADO.Net work item 43847 / ICM 775308542:
+    /// "SNIClose can deadlock with in-flight async I/O during connection close".
+    ///
+    /// <para>
+    /// This is the MARS-enabled counterpart to the in-process
+    /// <c>SNICloseDeadlockTest</c> unit tests. The native <c>Dispose()</c> path
+    /// in <c>TdsParserStateObjectNative</c> carries a long-standing "UNDONE"
+    /// note about needing to block for pending callbacks on <b>logical</b>
+    /// (MARS) connections during close. The in-process TDS test server does not
+    /// support MARS, so exercising the SMUX logical-session close path requires
+    /// a real SQL Server.
+    /// </para>
+    ///
+    /// <para>
+    /// The test enables MARS and starts an asynchronous read of a batch that the
+    /// server deliberately withholds (<c>WAITFOR DELAY</c>). This guarantees the
+    /// client's async read is genuinely in flight on a MARS logical session at
+    /// the moment the connection is closed. The close is performed on a worker
+    /// thread under a bounded wait: a deadlock manifests as the wait timing out,
+    /// which fails the test. A healthy close aborts the in-flight command and
+    /// returns promptly.
+    /// </para>
+    /// </summary>
+    [Trait("Set", "1")]
+    public class MarsCloseDeadlockTest
+    {
+        /// <summary>
+        /// How long the server withholds the response. Must comfortably exceed
+        /// <see cref="CloseBudget"/> so that a prompt close is attributable to
+        /// the close path aborting the command, not to the query completing on
+        /// its own.
+        /// </summary>
+        private const string StallDelay = "00:00:30";
+
+        /// <summary>
+        /// Upper bound for how long a non-deadlocked close should take. Close of
+        /// a connection with an in-flight command is effectively instantaneous;
+        /// this budget only distinguishes "completed" from "deadlocked" without
+        /// hanging the run on a slow agent.
+        /// </summary>
+        private static readonly TimeSpan CloseBudget = TimeSpan.FromSeconds(15);
+
+        /// <summary>
+        /// How long to wait to confirm the async read is genuinely pending (not
+        /// completed) before closing. Small relative to <see cref="StallDelay"/>.
+        /// </summary>
+        private static readonly TimeSpan PendingConfirmDelay = TimeSpan.FromSeconds(3);
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void CloseOrDispose_WithPendingMarsAsyncRead_DoesNotDeadlock(bool disposeInsteadOfClose)
+        {
+            // Enable MARS so the async read runs over a SMUX logical session, and
+            // disable pooling so Close()/Dispose() tears down the physical
+            // connection (reaching SNIClose) instead of returning it to the pool.
+            string connectionString =
+                new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString)
+                {
+                    MultipleActiveResultSets = true,
+                    Pooling = false,
+                }.ConnectionString;
+
+            SqlConnection connection = new(connectionString);
+            SqlCommand? command = null;
+            Task<SqlDataReader>? readTask = null;
+            bool closeAttempted = false;
+            bool closedInTime = false;
+            try
+            {
+                connection.Open();
+
+                command = new($"WAITFOR DELAY '{StallDelay}'; SELECT 1;", connection);
+
+                // Start an async read that will pend: the server withholds the
+                // response for StallDelay, so this Task will not complete until
+                // we either wait out the delay or tear down the connection.
+                readTask = command.ExecuteReaderAsync();
+
+                // Confirm the read is genuinely in flight before we close: it
+                // must not have completed and the connection must still be open.
+                Assert.False(
+                    readTask.Wait(PendingConfirmDelay),
+                    "The async read completed before the server released the " +
+                    "response; the read was not in flight at close time.");
+                Assert.Equal(ConnectionState.Open, connection.State);
+
+                // Close/dispose the connection on a dedicated, long-running
+                // thread while the MARS async read is in flight. This is the
+                // operation that can deadlock in SNIClose. A dedicated thread
+                // (rather than a thread-pool thread via Task.Run) ensures a
+                // hypothetical regression parks this one thread instead of
+                // starving the shared thread pool.
+                closeAttempted = true;
+                Task closeTask = Task.Factory.StartNew(
+                    () =>
+                    {
+                        if (disposeInsteadOfClose)
+                        {
+                            connection.Dispose();
+                        }
+                        else
+                        {
+                            connection.Close();
+                        }
+                    },
+                    TaskCreationOptions.LongRunning);
+
+                closedInTime = closeTask.Wait(CloseBudget);
+
+                Assert.True(
+                    closedInTime,
+                    $"{(disposeInsteadOfClose ? "Dispose()" : "Close()")} did not " +
+                    $"complete within {CloseBudget.TotalSeconds:N0}s while a MARS " +
+                    "async read was in flight. This indicates the SNIClose deadlock " +
+                    "(ADO.Net #43847 / ICM 775308542).");
+            }
+            finally
+            {
+                // Observe the pending read so its (expected) fault is not
+                // unobserved, even if a precondition assert above threw.
+                if (readTask != null)
+                {
+                    try
+                    {
+                        readTask.Wait(CloseBudget);
+                    }
+                    catch
+                    {
+                        // The pending read is expected to fault or cancel once
+                        // the connection is torn down. That is not what this
+                        // test asserts.
+                    }
+                }
+
+                command?.Dispose();
+
+                // Dispose the connection unless a close deadlock was actually
+                // detected (in which case Dispose() could also block). Disposing
+                // is safe when the close worker never started or when it
+                // completed.
+                if (!closeAttempted || closedInTime)
+                {
+                    connection.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/MarsCloseStressTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/MarsCloseStressTest.cs
new file mode 100644
index 0000000000..763ee12690
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/MarsCloseStressTest.cs
@@ -0,0 +1,165 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+{
+    /// <summary>
+    /// Concurrency-stress companion to <see cref="MarsCloseDeadlockTest"/> for
+    /// ADO.Net #43847 / ICM 775308542.
+    ///
+    /// <para>
+    /// Where <c>MarsCloseDeadlockTest</c> closes a single connection with one
+    /// in-flight MARS async read, this test opens <b>many</b> MARS connections -
+    /// each with an in-flight read - and closes them all <b>simultaneously</b>
+    /// (rendezvous on a <see cref="Barrier"/>), repeated over several iterations.
+    /// Piling concurrent closes onto the SMUX logical-session teardown path
+    /// widens the window for the close race called out by the long-standing
+    /// "Comment CloseMARSSession / UNDONE" note in the native <c>Dispose()</c>.
+    /// </para>
+    ///
+    /// <para>
+    /// Each batch of closes is awaited under a bounded wait: a deadlock manifests
+    /// as the wait timing out, which fails the test. A healthy close aborts the
+    /// in-flight commands and returns promptly.
+    /// </para>
+    /// </summary>
+    [Trait("Set", "1")]
+    public class MarsCloseStressTest
+    {
+        /// <summary>
+        /// How long each server-side batch withholds its response. Must comfortably
+        /// exceed <see cref="CloseBudget"/> so a prompt close is attributable to the
+        /// close path aborting the command, not the query completing on its own.
+        /// Kept at 4x <see cref="CloseBudget"/> so the boundary is unambiguous.
+        /// </summary>
+        private const string StallDelay = "00:02:00";
+
+        /// <summary>
+        /// Upper bound for how long a batch of concurrent, non-deadlocked closes
+        /// should take. Generous only to avoid false positives on slow agents.
+        /// </summary>
+        private static readonly TimeSpan CloseBudget = TimeSpan.FromSeconds(30);
+
+        /// <summary>Number of close-storm iterations.</summary>
+        private const int Iterations = 8;
+
+        /// <summary>MARS connections opened and closed together per iteration.</summary>
+        private const int ConnectionsPerIteration = 16;
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void MarsConcurrentCloseStress_DoesNotDeadlock(bool disposeInsteadOfClose)
+        {
+            // Enable MARS so each async read runs over a SMUX logical session, and
+            // disable pooling so Close()/Dispose() tears down the physical
+            // connection (reaching SNIClose) instead of returning it to the pool.
+            string connectionString =
+                new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString)
+                {
+                    MultipleActiveResultSets = true,
+                    Pooling = false,
+                }.ConnectionString;
+
+            for (int iter = 0; iter < Iterations; iter++)
+            {
+                SqlConnection[] connections = new SqlConnection[ConnectionsPerIteration];
+                SqlCommand?[] commands = new SqlCommand?[ConnectionsPerIteration];
+                Task<SqlDataReader>?[] readTasks = new Task<SqlDataReader>?[ConnectionsPerIteration];
+                bool allClosed = false;
+                try
+                {
+                    for (int k = 0; k < ConnectionsPerIteration; k++)
+                    {
+                        connections[k] = new SqlConnection(connectionString);
+                        connections[k].Open();
+                        commands[k] = new SqlCommand($"WAITFOR DELAY '{StallDelay}'; SELECT 1;", connections[k]);
+                        readTasks[k] = commands[k]!.ExecuteReaderAsync();
+                    }
+
+                    // Confirm every read is genuinely in flight before closing.
+                    for (int k = 0; k < ConnectionsPerIteration; k++)
+                    {
+                        Assert.False(
+                            readTasks[k]!.Wait(TimeSpan.FromMilliseconds(50)),
+                            $"iteration {iter}, connection {k}: the async read completed before " +
+                            "close; it was not in flight.");
+                    }
+
+                    // Fire all closes at once through a barrier so they pile up on
+                    // the close path concurrently.
+                    using Barrier gate = new(ConnectionsPerIteration);
+                    Task[] closeTasks = new Task[ConnectionsPerIteration];
+                    for (int k = 0; k < ConnectionsPerIteration; k++)
+                    {
+                        int idx = k;
+                        closeTasks[k] = Task.Factory.StartNew(
+                            () =>
+                            {
+                                gate.SignalAndWait();
+                                if (disposeInsteadOfClose)
+                                {
+                                    connections[idx].Dispose();
+                                }
+                                else
+                                {
+                                    connections[idx].Close();
+                                }
+                            },
+                            TaskCreationOptions.LongRunning);
+                    }
+
+                    allClosed = Task.WaitAll(closeTasks, CloseBudget);
+
+                    Assert.True(
+                        allClosed,
+                        $"iteration {iter}: {ConnectionsPerIteration} concurrent MARS " +
+                        $"{(disposeInsteadOfClose ? "Dispose()" : "Close()")} calls did not all " +
+                        $"complete within {CloseBudget.TotalSeconds:N0}s. This indicates the " +
+                        "SNIClose deadlock (ADO.Net #43847 / ICM 775308542).");
+                }
+                finally
+                {
+                    for (int k = 0; k < ConnectionsPerIteration; k++)
+                    {
+                        if (readTasks[k] != null)
+                        {
+                            try
+                            {
+                                readTasks[k]!.Wait(TimeSpan.FromSeconds(5));
+                            }
+                            catch
+                            {
+                                // Reads are expected to fault or cancel on teardown.
+                            }
+                        }
+
+                        commands[k]?.Dispose();
+
+                        // Only dispose connections if the closes completed; a
+                        // deadlocked connection's Dispose() could also block.
+                        if (allClosed)
+                        {
+                            try
+                            {
+                                connections[k]?.Dispose();
+                            }
+                            catch
+                            {
+                                // Ignore teardown faults.
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseDeadlockTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseDeadlockTest.cs
new file mode 100644
index 0000000000..465e284b6d
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseDeadlockTest.cs
@@ -0,0 +1,596 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.SqlServer.TDS;
+using Microsoft.SqlServer.TDS.EndPoint;
+using Microsoft.SqlServer.TDS.Servers;
+using Microsoft.SqlServer.TDS.SQLBatch;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
+
+/// <summary>
+/// Regression tests for ADO.Net work item 43847 / ICM 775308542:
+/// "SNIClose can deadlock with in-flight async I/O during connection close".
+///
+/// <para>
+/// These tests reproduce the ordering hazard where a connection is closed or
+/// disposed while an asynchronous network read is still pending. The close
+/// path must drain (or cancel) the in-flight async I/O before releasing the
+/// SNI handle; if it releases the handle first, the closing thread and the
+/// pending completion callback can wait on each other and deadlock.
+/// </para>
+///
+/// <para>
+/// Each test uses an in-process TDS server whose query engine deliberately
+/// stalls after receiving the client's SQL batch. This guarantees that the
+/// client's async read for the response is genuinely in flight at the moment
+/// the connection is closed. The close is performed on a worker thread and
+/// wrapped in a bounded wait: a healthy close completes promptly, whereas a
+/// deadlock manifests as the wait timing out, which fails the test.
+/// </para>
+///
+/// <para>
+/// <b>Expected state:</b> these tests PASS against the current code base.
+/// Microsoft.Data.SqlClient does not suffer from this deadlock: the close path
+/// drains (or cancels) the in-flight async I/O and completes well within the
+/// bounded wait. They therefore serve as regression guards - if a future change
+/// reintroduced the SNIClose deadlock, the bounded wait would time out and the
+/// tests would fail.
+/// </para>
+/// </summary>
+public class SNICloseDeadlockTest
+{
+    /// <summary>
+    /// Upper bound for how long a non-deadlocked close should take. Close of a
+    /// healthy connection is effectively instantaneous; this generous budget
+    /// exists only to distinguish "completed" from "deadlocked" on slow CI
+    /// agents without hanging the whole test run.
+    /// </summary>
+    private static readonly TimeSpan CloseBudget = TimeSpan.FromSeconds(30);
+
+    /// <summary>
+    /// Upper bound for waiting on the server to receive the client's batch,
+    /// i.e. for the client's async read to become pending.
+    /// </summary>
+    private static readonly TimeSpan HandshakeBudget = TimeSpan.FromSeconds(30);
+
+    /// <summary>
+    /// A query engine that signals when a SQL batch has arrived and then blocks
+    /// (withholding the response) until the test releases it. While it is
+    /// blocked, the client's async read for the response remains in flight.
+    /// </summary>
+    private sealed class StallingQueryEngine : QueryEngine
+    {
+        private readonly ManualResetEventSlim _batchReceived;
+        private readonly ManualResetEventSlim _releaseResponse;
+
+        public StallingQueryEngine(
+            TdsServerArguments arguments,
+            ManualResetEventSlim batchReceived,
+            ManualResetEventSlim releaseResponse)
+            : base(arguments)
+        {
+            _batchReceived = batchReceived;
+            _releaseResponse = releaseResponse;
+        }
+
+        protected override TDSMessageCollection CreateQueryResponse(
+            ITDSServerSession session,
+            TDSSQLBatchToken batchRequest)
+        {
+            // The client has sent the batch and posted an async receive for the
+            // response by the time we get here. Signal the test, then stall so
+            // the client's read stays in flight while the connection is closed.
+            _batchReceived.Set();
+            _releaseResponse.Wait();
+            return base.CreateQueryResponse(session, batchRequest);
+        }
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void CloseOrDispose_WithPendingAsyncRead_DoesNotDeadlock(bool disposeInsteadOfClose)
+    {
+        using ManualResetEventSlim batchReceived = new(false);
+        using ManualResetEventSlim releaseResponse = new(false);
+
+        TdsServerArguments arguments = new();
+        using TdsServer server = new(
+            new StallingQueryEngine(arguments, batchReceived, releaseResponse),
+            arguments);
+        server.Start();
+
+        SqlConnectionStringBuilder builder = new()
+        {
+            DataSource = $"localhost,{server.EndPoint.Port}",
+            Encrypt = SqlConnectionEncryptOption.Optional,
+            // Disable pooling so Close()/Dispose() tears down the physical
+            // connection (and reaches SNIClose) instead of returning it to the
+            // pool.
+            Pooling = false,
+#if NETFRAMEWORK
+            TransparentNetworkIPResolution = false,
+#endif
+        };
+
+        SqlConnection connection = new(builder.ConnectionString);
+        SqlCommand? command = null;
+        Task<SqlDataReader>? readTask = null;
+        bool closeAttempted = false;
+        bool closedInTime = false;
+        try
+        {
+            connection.Open();
+
+            command = new("SELECT 1", connection);
+
+            // Start an async read that will pend: the server stalls in
+            // CreateQueryResponse, so this Task will not complete until we
+            // either release the server or tear down the connection.
+            readTask = command.ExecuteReaderAsync();
+
+            // Ensure the async read is genuinely in flight before we close.
+            Assert.True(
+                batchReceived.Wait(HandshakeBudget),
+                "The server never received the SQL batch, so the async read was " +
+                "not in flight; the test cannot exercise the close-with-pending-IO path.");
+
+            // The server is stalled withholding the response, so the client's
+            // async read must still be pending: the Task cannot have completed
+            // and the connection must still be open. If either of these is
+            // false, the read is not actually in flight and the test is not
+            // exercising the close-with-pending-IO path.
+            Assert.False(
+                readTask.IsCompleted,
+                "The async read completed before the server released the response; " +
+                "the read was not in flight at close time.");
+            Assert.Equal(System.Data.ConnectionState.Open, connection.State);
+
+            // Close/dispose the connection on a dedicated, long-running thread
+            // while the async read is in flight. This is the operation that can
+            // deadlock in SNIClose. A dedicated thread (rather than a
+            // thread-pool thread via Task.Run) ensures a hypothetical regression
+            // parks this one thread instead of starving the shared thread pool.
+            closeAttempted = true;
+            Task closeTask = Task.Factory.StartNew(
+                () =>
+                {
+                    if (disposeInsteadOfClose)
+                    {
+                        connection.Dispose();
+                    }
+                    else
+                    {
+                        connection.Close();
+                    }
+                },
+                TaskCreationOptions.LongRunning);
+
+            closedInTime = closeTask.Wait(CloseBudget);
+
+            Assert.True(
+                closedInTime,
+                $"{(disposeInsteadOfClose ? "Dispose()" : "Close()")} did not complete " +
+                $"within {CloseBudget.TotalSeconds:N0}s while an async read was in flight. " +
+                "This indicates the SNIClose deadlock (ADO.Net #43847 / ICM 775308542).");
+        }
+        finally
+        {
+            // Always release the stalled server thread, even if a precondition
+            // assert above threw, so the using-scoped server can be disposed
+            // without blocking on the query engine.
+            releaseResponse.Set();
+
+            // Observe the pending read so its (expected) fault is not unobserved.
+            if (readTask != null)
+            {
+                try
+                {
+                    readTask.Wait(CloseBudget);
+                }
+                catch
+                {
+                    // The pending read is expected to fault or cancel once the
+                    // connection is torn down. That is not what this test asserts.
+                }
+            }
+
+            command?.Dispose();
+
+            // Dispose the connection unless a close deadlock was actually
+            // detected (in which case Dispose() could also block indefinitely
+            // and defeat the bounded-wait regression signal). Disposing is safe
+            // when the close worker never started or when it completed.
+            if (!closeAttempted || closedInTime)
+            {
+                connection.Dispose();
+            }
+        }
+    }
+
+    /// <summary>
+    /// Reproduces the ICM scenario more faithfully: the connection is torn down
+    /// while it is still in the middle of connection establishment (the
+    /// pre-login / TLS handshake), rather than after a successful login.
+    ///
+    /// <para>
+    /// A bare TCP listener accepts the socket and reads the client's pre-login
+    /// packet but deliberately never sends a response. This leaves the client's
+    /// async read for the pre-login/handshake response in flight. The close is
+    /// performed on a worker thread under a bounded wait; a deadlock in the
+    /// handshake-phase close path manifests as the wait timing out.
+    /// </para>
+    /// </summary>
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void CloseOrDispose_DuringPreLoginHandshake_DoesNotDeadlock(bool disposeInsteadOfClose)
+    {
+        using ManualResetEventSlim clientConnected = new(false);
+        using ManualResetEventSlim releaseServer = new(false);
+
+        TcpListener listener = new(IPAddress.Loopback, 0);
+        listener.Start();
+        int port = ((IPEndPoint)listener.LocalEndpoint).Port;
+
+        // Server: accept the socket, read the client's pre-login bytes, then
+        // withhold any response so the client's handshake read stays pending.
+        Task serverTask = Task.Run(() =>
+        {
+            using TcpClient acceptedClient = listener.AcceptTcpClient();
+            using NetworkStream stream = acceptedClient.GetStream();
+
+            try
+            {
+                // Read one byte of the client's pre-login packet. A byte here
+                // proves the client actually sent its pre-login and posted its
+                // async read for the response; we only need to know data
+                // arrived, so a single byte is sufficient.
+                if (stream.ReadByte() < 0)
+                {
+                    // Client tore down without sending pre-login bytes: the
+                    // handshake read was never actually in flight. Leave
+                    // clientConnected unset so the test's precondition wait
+                    // fails instead of producing a false positive.
+                    return;
+                }
+
+                clientConnected.Set();
+
+                // Hold the socket open (withholding the response) until the test
+                // releases us, so the client's read cannot complete naturally.
+                releaseServer.Wait();
+            }
+            catch
+            {
+                // The client may tear down the socket; ignore. clientConnected
+                // stays unset unless a pre-login byte was actually observed
+                // above, so a failed read cannot masquerade as a pending one.
+            }
+        });
+
+        SqlConnectionStringBuilder builder = new()
+        {
+            DataSource = $"127.0.0.1,{port}",
+            // Force TLS negotiation intent during the handshake, matching the
+            // ICM scenario.
+            Encrypt = SqlConnectionEncryptOption.Mandatory,
+            TrustServerCertificate = true,
+            // Long timeout so the connect attempt does not abort on its own
+            // before we get a chance to close it.
+            ConnectTimeout = 60,
+            ConnectRetryCount = 0,
+            Pooling = false,
+#if NETFRAMEWORK
+            TransparentNetworkIPResolution = false,
+#endif
+        };
+
+        SqlConnection connection = new(builder.ConnectionString);
+        Task? openTask = null;
+        bool closeAttempted = false;
+        bool closedInTime = false;
+        try
+        {
+            // Begin connection establishment. This will not complete because
+            // the server never answers the pre-login handshake.
+            openTask = connection.OpenAsync();
+
+            // Wait until the server has received the client's pre-login, i.e.
+            // the client's handshake read is in flight.
+            Assert.True(
+                clientConnected.Wait(HandshakeBudget),
+                "The server never received the client's pre-login packet, so the " +
+                "handshake read was not in flight; the test cannot exercise the " +
+                "close-during-handshake path.");
+
+            // Close/dispose the connection on a dedicated, long-running thread
+            // while the handshake read is in flight. This is the operation that
+            // can deadlock. A dedicated thread (rather than a thread-pool thread
+            // via Task.Run) ensures a hypothetical regression parks this one
+            // thread instead of starving the shared thread pool.
+            closeAttempted = true;
+            Task closeTask = Task.Factory.StartNew(
+                () =>
+                {
+                    if (disposeInsteadOfClose)
+                    {
+                        connection.Dispose();
+                    }
+                    else
+                    {
+                        connection.Close();
+                    }
+                },
+                TaskCreationOptions.LongRunning);
+
+            closedInTime = closeTask.Wait(CloseBudget);
+
+            Assert.True(
+                closedInTime,
+                $"{(disposeInsteadOfClose ? "Dispose()" : "Close()")} did not complete " +
+                $"within {CloseBudget.TotalSeconds:N0}s while a pre-login response " +
+                "read was in flight. This indicates the SNIClose deadlock " +
+                "(ADO.Net #43847 / ICM 775308542).");
+        }
+        finally
+        {
+            // Always release the server loop and stop the listener, even if a
+            // precondition assert above threw, so the background server task
+            // cannot stay blocked and the listening socket is not leaked into
+            // subsequent tests.
+            releaseServer.Set();
+            listener.Stop();
+
+            // Observe the open task so its (expected) failure is not unobserved.
+            if (openTask != null)
+            {
+                try
+                {
+                    openTask.Wait(CloseBudget);
+                }
+                catch
+                {
+                    // OpenAsync is expected to fault or cancel once the
+                    // connection is torn down. That is not what this test asserts.
+                }
+            }
+
+            // Dispose the connection unless a close deadlock was actually
+            // detected (in which case Dispose() could also block). Disposing is
+            // safe when the close worker never started or when it completed.
+            if (!closeAttempted || closedInTime)
+            {
+                connection.Dispose();
+            }
+
+            try
+            {
+                serverTask.Wait(CloseBudget);
+            }
+            catch
+            {
+                // Ignore server teardown faults.
+            }
+        }
+    }
+
+    /// <summary>
+    /// A minimal, protocol-valid TDS PRELOGIN response advertising ENCRYPT_ON
+    /// so that a client which requested encryption proceeds into the TLS
+    /// handshake. Offsets are relative to the start of the payload (immediately
+    /// after the 8-byte TDS packet header):
+    ///
+    /// <code>
+    ///   Option table:
+    ///     VERSION     token 0x00, offset 11 (0x000B), length 6
+    ///     ENCRYPTION  token 0x01, offset 17 (0x0011), length 1
+    ///     TERMINATOR  0xFF
+    ///   Data:
+    ///     VERSION     6 bytes (17.0.0.0)
+    ///     ENCRYPTION  1 byte  (0x01 = ENCRYPT_ON)
+    /// </code>
+    /// </summary>
+    private static readonly byte[] s_preLoginEncryptOnResponse =
+    {
+        // ---- TDS packet header (8 bytes) ----
+        0x12,       // Type: PRELOGIN
+        0x01,       // Status: EOM
+        0x00, 0x1A, // Length: 26 (8 header + 18 payload), big-endian
+        0x00, 0x00, // SPID
+        0x01,       // PacketID
+        0x00,       // Window
+        // ---- PRELOGIN option table ----
+        0x00, 0x00, 0x0B, 0x00, 0x06, // VERSION: offset 11, length 6
+        0x01, 0x00, 0x11, 0x00, 0x01, // ENCRYPTION: offset 17, length 1
+        0xFF,                         // TERMINATOR
+        // ---- Option data ----
+        0x11, 0x00, 0x00, 0x00, 0x00, 0x00, // VERSION 17.0.0.0
+        0x01,                               // ENCRYPTION = ENCRYPT_ON
+    };
+
+    /// <summary>
+    /// Reproduces the ICM scenario faithfully: the connection is torn down while
+    /// the client is inside the TLS handshake over TDS, with an SNI read pending
+    /// for the server's handshake response.
+    ///
+    /// <para>
+    /// A bare TCP listener speaks just enough of the TDS pre-login exchange to
+    /// drive the client into the TLS handshake: it reads the client's PRELOGIN
+    /// packet, replies with a PRELOGIN response advertising ENCRYPT_ON, then
+    /// reads the client's TLS ClientHello (delivered as a TDS pre-login packet)
+    /// and deliberately never sends a ServerHello. At that point the client is
+    /// blocked inside <c>SslStream.AuthenticateAsClient</c> with an SNI read in
+    /// flight on the SSL-over-TDS transport. The close is performed on a worker
+    /// thread under a bounded wait; a deadlock in the handshake-phase close path
+    /// manifests as the wait timing out.
+    /// </para>
+    /// </summary>
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void CloseOrDispose_DuringTlsHandshake_DoesNotDeadlock(bool disposeInsteadOfClose)
+    {
+        using ManualResetEventSlim handshakeInFlight = new(false);
+        using ManualResetEventSlim releaseServer = new(false);
+
+        TcpListener listener = new(IPAddress.Loopback, 0);
+        listener.Start();
+        int port = ((IPEndPoint)listener.LocalEndpoint).Port;
+
+        // Server: complete the pre-login exchange advertising encryption, read
+        // the client's TLS ClientHello, then withhold the ServerHello so the
+        // client's handshake read stays pending.
+        Task serverTask = Task.Run(() =>
+        {
+            using TcpClient acceptedClient = listener.AcceptTcpClient();
+            using NetworkStream stream = acceptedClient.GetStream();
+
+            byte[] buffer = new byte[4096];
+            try
+            {
+                // Read the client's PRELOGIN packet.
+                int read = stream.Read(buffer, 0, buffer.Length);
+                if (read <= 0)
+                {
+                    return;
+                }
+
+                // Advertise ENCRYPT_ON so the client begins the TLS handshake.
+                stream.Write(s_preLoginEncryptOnResponse, 0, s_preLoginEncryptOnResponse.Length);
+                stream.Flush();
+
+                // Read the first byte of the client's TLS ClientHello (wrapped
+                // in a TDS pre-login packet). A byte here proves the client
+                // accepted the pre-login response and entered the TLS handshake;
+                // it is now awaiting the ServerHello with its SNI read pending.
+                if (stream.ReadByte() < 0)
+                {
+                    // Client tore down without sending a ClientHello: the
+                    // handshake was never actually in flight.
+                    return;
+                }
+
+                handshakeInFlight.Set();
+
+                // Withhold the ServerHello until the test releases us.
+                releaseServer.Wait();
+            }
+            catch
+            {
+                // The client may tear down the socket mid-handshake; ignore.
+            }
+        });
+
+        SqlConnectionStringBuilder builder = new()
+        {
+            DataSource = $"127.0.0.1,{port}",
+            // Require encryption so the client performs the TLS handshake.
+            Encrypt = SqlConnectionEncryptOption.Mandatory,
+            TrustServerCertificate = true,
+            ConnectTimeout = 60,
+            ConnectRetryCount = 0,
+            Pooling = false,
+#if NETFRAMEWORK
+            TransparentNetworkIPResolution = false,
+#endif
+        };
+
+        SqlConnection connection = new(builder.ConnectionString);
+        Task? openTask = null;
+        bool closeAttempted = false;
+        bool closedInTime = false;
+        try
+        {
+            // Begin connection establishment. This will not complete because
+            // the server never finishes the TLS handshake.
+            openTask = connection.OpenAsync();
+
+            // Wait until the client is inside the TLS handshake with a pending
+            // read.
+            Assert.True(
+                handshakeInFlight.Wait(HandshakeBudget),
+                "The client never reached the TLS handshake, so no SNI read was in " +
+                "flight; the test cannot exercise the close-during-TLS-handshake path.");
+
+            // Close/dispose the connection on a dedicated, long-running thread
+            // while the TLS handshake read is in flight. This is the operation
+            // that can deadlock. A dedicated thread (rather than a thread-pool
+            // thread via Task.Run) ensures a hypothetical regression parks this
+            // one thread instead of starving the shared thread pool.
+            closeAttempted = true;
+            Task closeTask = Task.Factory.StartNew(
+                () =>
+                {
+                    if (disposeInsteadOfClose)
+                    {
+                        connection.Dispose();
+                    }
+                    else
+                    {
+                        connection.Close();
+                    }
+                },
+                TaskCreationOptions.LongRunning);
+
+            closedInTime = closeTask.Wait(CloseBudget);
+
+            Assert.True(
+                closedInTime,
+                $"{(disposeInsteadOfClose ? "Dispose()" : "Close()")} did not complete " +
+                $"within {CloseBudget.TotalSeconds:N0}s while a TLS handshake read was " +
+                "in flight. This indicates the SNIClose deadlock " +
+                "(ADO.Net #43847 / ICM 775308542).");
+        }
+        finally
+        {
+            // Always release the server loop and stop the listener, even if a
+            // precondition assert above threw, so the background server task
+            // cannot stay blocked and the listening socket is not leaked into
+            // subsequent tests.
+            releaseServer.Set();
+            listener.Stop();
+
+            // Observe the open task so its (expected) failure is not unobserved.
+            if (openTask != null)
+            {
+                try
+                {
+                    openTask.Wait(CloseBudget);
+                }
+                catch
+                {
+                    // OpenAsync is expected to fault or cancel once the
+                    // connection is torn down. That is not what this test asserts.
+                }
+            }
+
+            // Dispose the connection unless a close deadlock was actually
+            // detected (in which case Dispose() could also block). Disposing is
+            // safe when the close worker never started or when it completed.
+            if (!closeAttempted || closedInTime)
+            {
+                connection.Dispose();
+            }
+
+            try
+            {
+                serverTask.Wait(CloseBudget);
+            }
+            catch
+            {
+                // Ignore server teardown faults.
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseHandshakeCancellationTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseHandshakeCancellationTest.cs
new file mode 100644
index 0000000000..9a41c2f3c7
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseHandshakeCancellationTest.cs
@@ -0,0 +1,180 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
+
+/// <summary>
+/// Regression test for the connection-teardown paths related to ADO.Net #43847 /
+/// ICM 775308542. Where <see cref="SNICloseDeadlockTest"/> tears the connection
+/// down with an <b>external</b> <c>Close()</c>/<c>Dispose()</c>, this drives the
+/// driver's <b>internal</b> abort/close path by cancelling <c>OpenAsync</c> while
+/// the TLS handshake read is in flight.
+///
+/// <para>
+/// A bare TCP listener completes just enough of the pre-login exchange to push
+/// the client into the TLS handshake (it advertises ENCRYPT_ON, reads the
+/// client's ClientHello, then withholds the ServerHello). The client's
+/// <c>OpenAsync</c> is then cancelled while that handshake read is pending. The
+/// cancellation must abort the in-flight I/O and complete the operation promptly;
+/// a deadlock in the internal close path manifests as the bounded wait timing
+/// out, which fails the test.
+/// </para>
+/// </summary>
+public class SNICloseHandshakeCancellationTest
+{
+    /// <summary>
+    /// Upper bound for how long the cancelled OpenAsync should take to settle.
+    /// Generous so it only distinguishes "completed" from "deadlocked".
+    /// </summary>
+    private static readonly TimeSpan CloseBudget = TimeSpan.FromSeconds(30);
+
+    /// <summary>
+    /// Upper bound for waiting until the client's TLS handshake read is pending.
+    /// </summary>
+    private static readonly TimeSpan HandshakeBudget = TimeSpan.FromSeconds(30);
+
+    /// <summary>
+    /// A minimal, protocol-valid TDS PRELOGIN response advertising ENCRYPT_ON so
+    /// a client that requested encryption proceeds into the TLS handshake.
+    /// </summary>
+    private static readonly byte[] s_preLoginEncryptOnResponse =
+    {
+        // ---- TDS packet header (8 bytes) ----
+        0x12,       // Type: PRELOGIN
+        0x01,       // Status: EOM
+        0x00, 0x1A, // Length: 26 (8 header + 18 payload), big-endian
+        0x00, 0x00, // SPID
+        0x01,       // PacketID
+        0x00,       // Window
+        // ---- PRELOGIN option table ----
+        0x00, 0x00, 0x0B, 0x00, 0x06, // VERSION: offset 11, length 6
+        0x01, 0x00, 0x11, 0x00, 0x01, // ENCRYPTION: offset 17, length 1
+        0xFF,                         // TERMINATOR
+        // ---- Option data ----
+        0x11, 0x00, 0x00, 0x00, 0x00, 0x00, // VERSION 17.0.0.0
+        0x01,                               // ENCRYPTION = ENCRYPT_ON
+    };
+
+    [Fact]
+    public void CancelOpenAsyncDuringTlsHandshake_DoesNotDeadlock()
+    {
+        using ManualResetEventSlim handshakeInFlight = new(false);
+        using ManualResetEventSlim releaseServer = new(false);
+
+        TcpListener listener = new(IPAddress.Loopback, 0);
+        listener.Start();
+        int port = ((IPEndPoint)listener.LocalEndpoint).Port;
+
+        // Server: complete the pre-login exchange advertising encryption, read the
+        // client's TLS ClientHello, then withhold the ServerHello so the client's
+        // handshake read stays pending.
+        Task serverTask = Task.Run(() =>
+        {
+            using TcpClient acceptedClient = listener.AcceptTcpClient();
+            using NetworkStream stream = acceptedClient.GetStream();
+            byte[] buffer = new byte[4096];
+            try
+            {
+                int read = stream.Read(buffer, 0, buffer.Length);
+                if (read <= 0)
+                {
+                    return;
+                }
+
+                stream.Write(s_preLoginEncryptOnResponse, 0, s_preLoginEncryptOnResponse.Length);
+                stream.Flush();
+
+                // A byte here proves the client entered the TLS handshake and is
+                // awaiting the ServerHello with its read pending.
+                if (stream.ReadByte() < 0)
+                {
+                    return;
+                }
+
+                handshakeInFlight.Set();
+                releaseServer.Wait();
+            }
+            catch
+            {
+                // The client may tear down the socket mid-handshake; ignore.
+            }
+        });
+
+        SqlConnectionStringBuilder builder = new()
+        {
+            DataSource = $"127.0.0.1,{port}",
+            Encrypt = SqlConnectionEncryptOption.Mandatory,
+            TrustServerCertificate = true,
+            ConnectTimeout = 60,
+            ConnectRetryCount = 0,
+            Pooling = false,
+#if NETFRAMEWORK
+            TransparentNetworkIPResolution = false,
+#endif
+        };
+
+        SqlConnection connection = new(builder.ConnectionString);
+        using CancellationTokenSource cts = new();
+        Task? openTask = null;
+        bool cancelAttempted = false;
+        bool settledInTime = false;
+        try
+        {
+            openTask = connection.OpenAsync(cts.Token);
+
+            Assert.True(
+                handshakeInFlight.Wait(HandshakeBudget),
+                "The client never reached the TLS handshake; no read was in flight to cancel.");
+
+            // Cancel while the handshake read is pending: this drives the driver's
+            // internal abort/close path against the in-flight I/O.
+            cancelAttempted = true;
+            cts.Cancel();
+
+            try
+            {
+                settledInTime = openTask.Wait(CloseBudget);
+            }
+            catch (AggregateException)
+            {
+                // OpenAsync faulting/cancelling is the expected outcome; what
+                // matters is that it *settled* rather than hanging.
+                settledInTime = true;
+            }
+
+            Assert.True(
+                settledInTime,
+                $"OpenAsync did not settle within {CloseBudget.TotalSeconds:N0}s after cancellation while a " +
+                "TLS handshake read was in flight. This indicates a deadlock in the internal close path " +
+                "(ADO.Net #43847 / ICM 775308542).");
+        }
+        finally
+        {
+            releaseServer.Set();
+            listener.Stop();
+
+            if (openTask != null)
+            {
+                try { openTask.Wait(CloseBudget); } catch { /* expected fault/cancel */ }
+            }
+
+            // Dispose unless a deadlock was detected (Dispose could also block).
+            if (!cancelAttempted || settledInTime)
+            {
+                connection.Dispose();
+            }
+
+            try { serverTask.Wait(CloseBudget); } catch { /* ignore */ }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseRaceDeadlockTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseRaceDeadlockTest.cs
new file mode 100644
index 0000000000..27ab3a7516
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseRaceDeadlockTest.cs
@@ -0,0 +1,192 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.SqlServer.TDS;
+using Microsoft.SqlServer.TDS.EndPoint;
+using Microsoft.SqlServer.TDS.Servers;
+using Microsoft.SqlServer.TDS.SQLBatch;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
+
+/// <summary>
+/// Race variant of the SNIClose close-during-I/O regression tests
+/// (ADO.Net #43847 / ICM 775308542).
+///
+/// <para>
+/// The sibling <c>SNICloseDeadlockTest</c> closes over a <b>quiescent</b>
+/// pending read: the server stays silent, so the close path simply cancels the
+/// in-flight read and no completion callback is executing at close time. This
+/// test instead <b>releases the server's response at the same instant the
+/// connection is closed</b> (rendezvous on a <see cref="Barrier"/>), so the
+/// read's completion callback fires concurrently with <c>SNIClose</c> - the
+/// exact ordering hazard the deadlock is about. It repeats many iterations to
+/// widen the race window.
+/// </para>
+///
+/// <para>
+/// The close runs on a dedicated long-running thread under a bounded wait: a
+/// deadlock manifests as the wait timing out, which fails the test. A healthy
+/// close completes promptly.
+/// </para>
+/// </summary>
+public class SNICloseRaceDeadlockTest
+{
+    /// <summary>
+    /// Upper bound for how long a non-deadlocked close should take. Generous so
+    /// it only distinguishes "completed" from "deadlocked" on slow CI agents.
+    /// </summary>
+    private static readonly TimeSpan CloseBudget = TimeSpan.FromSeconds(30);
+
+    /// <summary>
+    /// Upper bound for waiting on the server to receive the client's batch, i.e.
+    /// for the client's async read to become pending.
+    /// </summary>
+    private static readonly TimeSpan HandshakeBudget = TimeSpan.FromSeconds(30);
+
+    /// <summary>
+    /// A query engine that signals when a SQL batch arrives and then withholds
+    /// the response until released, so the test controls exactly when the
+    /// client's read completion fires.
+    /// </summary>
+    private sealed class ReleasableQueryEngine : QueryEngine
+    {
+        private readonly ManualResetEventSlim _batchReceived;
+        private readonly ManualResetEventSlim _releaseResponse;
+
+        public ReleasableQueryEngine(
+            TdsServerArguments arguments,
+            ManualResetEventSlim batchReceived,
+            ManualResetEventSlim releaseResponse)
+            : base(arguments)
+        {
+            _batchReceived = batchReceived;
+            _releaseResponse = releaseResponse;
+        }
+
+        protected override TDSMessageCollection CreateQueryResponse(
+            ITDSServerSession session,
+            TDSSQLBatchToken batchRequest)
+        {
+            _batchReceived.Set();
+            _releaseResponse.Wait();
+            return base.CreateQueryResponse(session, batchRequest);
+        }
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void ResponseCompletionRacesClose_DoesNotDeadlock(bool disposeInsteadOfClose)
+    {
+        const int iterations = 100;
+
+        for (int i = 0; i < iterations; i++)
+        {
+            using ManualResetEventSlim batchReceived = new(false);
+            using ManualResetEventSlim releaseResponse = new(false);
+
+            TdsServerArguments arguments = new();
+            using TdsServer server = new(
+                new ReleasableQueryEngine(arguments, batchReceived, releaseResponse),
+                arguments);
+            server.Start();
+
+            SqlConnectionStringBuilder builder = new()
+            {
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                Encrypt = SqlConnectionEncryptOption.Optional,
+                // Disable pooling so Close()/Dispose() tears down the physical
+                // connection (reaching SNIClose) instead of returning it to the pool.
+                Pooling = false,
+#if NETFRAMEWORK
+                TransparentNetworkIPResolution = false,
+#endif
+            };
+
+            SqlConnection connection = new(builder.ConnectionString);
+            SqlCommand? command = null;
+            Task<SqlDataReader>? readTask = null;
+            bool closeAttempted = false;
+            bool closedInTime = false;
+            try
+            {
+                connection.Open();
+
+                command = new("SELECT 1", connection);
+                readTask = command.ExecuteReaderAsync();
+
+                Assert.True(
+                    batchReceived.Wait(HandshakeBudget),
+                    $"iteration {i}: the server never received the SQL batch, so the " +
+                    "async read was not in flight.");
+
+                // Close on a dedicated, long-running thread, gated on a barrier;
+                // release the server response at the same instant so the read's
+                // completion callback fires concurrently with SNIClose.
+                using Barrier gate = new(2);
+
+                closeAttempted = true;
+                Task closeTask = Task.Factory.StartNew(
+                    () =>
+                    {
+                        gate.SignalAndWait();
+                        if (disposeInsteadOfClose)
+                        {
+                            connection.Dispose();
+                        }
+                        else
+                        {
+                            connection.Close();
+                        }
+                    },
+                    TaskCreationOptions.LongRunning);
+
+                gate.SignalAndWait();
+                releaseResponse.Set();
+
+                closedInTime = closeTask.Wait(CloseBudget);
+
+                Assert.True(
+                    closedInTime,
+                    $"iteration {i}: {(disposeInsteadOfClose ? "Dispose()" : "Close()")} did not " +
+                    $"complete within {CloseBudget.TotalSeconds:N0}s while a response completion " +
+                    "raced close. This indicates the SNIClose deadlock (ADO.Net #43847 / ICM 775308542).");
+            }
+            finally
+            {
+                // Always release the (possibly still-stalled) server thread so
+                // the using-scoped server can be disposed without blocking.
+                releaseResponse.Set();
+
+                if (readTask != null)
+                {
+                    try
+                    {
+                        readTask.Wait(CloseBudget);
+                    }
+                    catch
+                    {
+                        // The pending read is expected to fault or cancel once the
+                        // connection is torn down. That is not what this test asserts.
+                    }
+                }
+
+                command?.Dispose();
+
+                // Dispose unless a close deadlock was actually detected (in which
+                // case Dispose() could also block and defeat the regression signal).
+                if (!closeAttempted || closedInTime)
+                {
+                    connection.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/tools/SniCloseLegacyRepro/AssemblyInfo.cs b/tools/SniCloseLegacyRepro/AssemblyInfo.cs
new file mode 100644
index 0000000000..a243838e3d
--- /dev/null
+++ b/tools/SniCloseLegacyRepro/AssemblyInfo.cs
@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+// This diagnostic harness includes tests that mutate PROCESS-GLOBAL state (e.g.
+// ThreadPool.SetMin/MaxThreads in the starvation experiments) and heavy soak
+// tests. Running collections in parallel lets those perturb unrelated tests
+// (starving their connections), so we run serially - matching the container
+// runner, which uses `xunit.console.exe -parallel none`.
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/tools/SniCloseLegacyRepro/Compat.cs b/tools/SniCloseLegacyRepro/Compat.cs
new file mode 100644
index 0000000000..82e6d5f94c
--- /dev/null
+++ b/tools/SniCloseLegacyRepro/Compat.cs
@@ -0,0 +1,117 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using LegacyBuilder = System.Data.SqlClient.SqlConnectionStringBuilder;
+
+namespace SniCloseLegacyRepro.Compat
+{
+    /// <summary>
+    /// Minimal stand-in for Microsoft.Data.SqlClient's SqlConnectionEncryptOption
+    /// enum, which does not exist in the legacy System.Data.SqlClient driver.
+    /// </summary>
+    public enum SqlConnectionEncryptOption
+    {
+        Optional,
+        Mandatory,
+        Strict,
+    }
+
+    /// <summary>
+    /// A connection-string builder facade over the LEGACY driver's (sealed)
+    /// SqlConnectionStringBuilder. It exposes only the keywords the linked test
+    /// files use, and accepts the Microsoft.Data-style
+    /// <see cref="SqlConnectionEncryptOption"/> enum for <c>Encrypt</c> so those
+    /// files compile unchanged. The legacy builder is sealed, so this uses
+    /// composition rather than inheritance.
+    /// </summary>
+    public sealed class ShimSqlConnectionStringBuilder
+    {
+        private readonly LegacyBuilder _inner;
+
+        public ShimSqlConnectionStringBuilder() => _inner = new LegacyBuilder();
+
+        public ShimSqlConnectionStringBuilder(string connectionString) =>
+            _inner = new LegacyBuilder(connectionString);
+
+        public string ConnectionString => _inner.ConnectionString;
+
+        public string DataSource
+        {
+            get => _inner.DataSource;
+            set => _inner.DataSource = value;
+        }
+
+        public bool Pooling
+        {
+            get => _inner.Pooling;
+            set => _inner.Pooling = value;
+        }
+
+        public bool TrustServerCertificate
+        {
+            get => _inner.TrustServerCertificate;
+            set => _inner.TrustServerCertificate = value;
+        }
+
+        public int ConnectTimeout
+        {
+            get => _inner.ConnectTimeout;
+            set => _inner.ConnectTimeout = value;
+        }
+
+        public int ConnectRetryCount
+        {
+            get => _inner.ConnectRetryCount;
+            set => _inner.ConnectRetryCount = value;
+        }
+
+        public bool MultipleActiveResultSets
+        {
+            get => _inner.MultipleActiveResultSets;
+            set => _inner.MultipleActiveResultSets = value;
+        }
+
+#if NETFRAMEWORK
+        // Only present on the in-box (netfx) legacy builder; the tests guard its
+        // use with #if NETFRAMEWORK, so this facade matches that guard.
+        public bool TransparentNetworkIPResolution
+        {
+            get => _inner.TransparentNetworkIPResolution;
+            set => _inner.TransparentNetworkIPResolution = value;
+        }
+#endif
+
+        /// <summary>
+        /// Maps the Microsoft.Data encryption enum onto the legacy boolean
+        /// <c>Encrypt</c> keyword: Optional =&gt; false; Mandatory/Strict =&gt; true.
+        /// </summary>
+        public SqlConnectionEncryptOption Encrypt
+        {
+            get => _inner.Encrypt
+                ? SqlConnectionEncryptOption.Mandatory
+                : SqlConnectionEncryptOption.Optional;
+            set => _inner.Encrypt = value != SqlConnectionEncryptOption.Optional;
+        }
+    }
+}
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+{
+    /// <summary>
+    /// Stand-in for the real test-infrastructure DataTestUtility, providing just
+    /// the members the linked MARS test and the stress tests reference. The live
+    /// connection string is taken from the SNICLOSE_CONNSTR environment variable.
+    /// </summary>
+    public static class DataTestUtility
+    {
+        public static string TCPConnectionString =>
+            Environment.GetEnvironmentVariable("SNICLOSE_CONNSTR") ?? string.Empty;
+
+        public static bool AreConnStringsSetup() =>
+            !string.IsNullOrWhiteSpace(TCPConnectionString);
+
+        public static bool IsNotAzureSynapse() => true;
+    }
+}
diff --git a/tools/SniCloseLegacyRepro/Directory.Build.props b/tools/SniCloseLegacyRepro/Directory.Build.props
new file mode 100644
index 0000000000..cd6b5c8b61
--- /dev/null
+++ b/tools/SniCloseLegacyRepro/Directory.Build.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <!--
+    Standalone diagnostic tool. Like the sibling apps, it purposely does NOT
+    import any parent Directory.Build.props, insulating it from the repo's
+    src/test build conventions. Package versions are centrally managed via the
+    sibling Directory.Packages.props.
+  -->
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+</Project>
diff --git a/tools/SniCloseLegacyRepro/Directory.Packages.props b/tools/SniCloseLegacyRepro/Directory.Packages.props
new file mode 100644
index 0000000000..23d7f8278f
--- /dev/null
+++ b/tools/SniCloseLegacyRepro/Directory.Packages.props
@@ -0,0 +1,22 @@
+<Project>
+
+  <!--
+    Central Package Management for this standalone tool.
+
+    Import the shared SqlClient tests package versions (xunit,
+    Microsoft.NET.Test.Sdk, Microsoft.DotNet.XUnitExtensions,
+    xunit.runner.console, ...); that file transitively imports the repo-root
+    production versions. This mirrors how the sibling Extensions test apps pull
+    in the shared test dependency versions.
+
+    The legacy System.Data.SqlClient package is not part of the shared set, so it
+    is pinned here. The .NET (Core) target can still sweep older builds per-run
+    via the SqlClientLegacyVersion property (applied with VersionOverride).
+  -->
+  <Import Project="../../src/Microsoft.Data.SqlClient/tests/Directory.Packages.props" />
+
+  <ItemGroup>
+    <PackageVersion Include="System.Data.SqlClient" Version="4.9.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/tools/SniCloseLegacyRepro/GlobalUsings.cs b/tools/SniCloseLegacyRepro/GlobalUsings.cs
new file mode 100644
index 0000000000..806fa4fb37
--- /dev/null
+++ b/tools/SniCloseLegacyRepro/GlobalUsings.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// -----------------------------------------------------------------------------
+// Global using aliases that let the linked test files (which use bare
+// Microsoft.Data.SqlClient type names) bind to the LEGACY System.Data.SqlClient
+// driver instead.
+//
+// How this works: the linked files live in namespaces under
+// Microsoft.Data.SqlClient.*, so an unqualified name like "SqlConnection" is
+// resolved by walking the enclosing namespaces. Because this assembly does NOT
+// reference Microsoft.Data.SqlClient, none of those namespaces define these
+// types, so name resolution falls through to these global aliases.
+//
+// SqlConnectionStringBuilder and SqlConnectionEncryptOption are aliased to shim
+// types (see Compat.cs) because the legacy builder's Encrypt property is a bool,
+// whereas the tests assign the Microsoft.Data-only SqlConnectionEncryptOption
+// enum. The shim reconciles that difference.
+// -----------------------------------------------------------------------------
+
+global using SqlConnection = System.Data.SqlClient.SqlConnection;
+global using SqlCommand = System.Data.SqlClient.SqlCommand;
+global using SqlDataReader = System.Data.SqlClient.SqlDataReader;
+global using SqlConnectionStringBuilder = SniCloseLegacyRepro.Compat.ShimSqlConnectionStringBuilder;
+global using SqlConnectionEncryptOption = SniCloseLegacyRepro.Compat.SqlConnectionEncryptOption;
diff --git a/tools/SniCloseLegacyRepro/README.md b/tools/SniCloseLegacyRepro/README.md
new file mode 100644
index 0000000000..441e5b836b
--- /dev/null
+++ b/tools/SniCloseLegacyRepro/README.md
@@ -0,0 +1,270 @@
+# SniCloseLegacyRepro
+
+Diagnostic harness that runs **SNIClose / MARS close-during-I/O deadlock tests** against the
+**legacy `System.Data.SqlClient`** driver, to see whether the deadlock from **ICM 775308542 /
+ADO.Net #43847** ("SNIClose can deadlock with in-flight async I/O during connection close")
+reproduces there.
+
+---
+
+## Background
+
+ICM 775308542 / ADO.Net #43847 concern a potential SNIClose deadlock with
+in-flight async I/O during connection close in the **retired, in-box
+`System.Data.SqlClient`**. The environment reported in the ICM:
+
+| | Reported environment (ICM) |
+|---|---|
+| OS | Windows Server 2016 (10.0.14393) |
+| Runtime | .NET Framework 4.7 (CLR 4.0.30319) |
+| Driver | in-box `System.Data.dll` **4.7.4081.0** |
+| CPUs | 4 |
+
+`System.Data.SqlClient` is retired, so the fix (if any) is being investigated in
+`Microsoft.Data.SqlClient` via #43847. The branch adds regression tests on the
+MDS side; this harness points those same tests at the legacy driver.
+
+---
+
+## How it works
+
+Rather than re-implementing the tests, the project **links the real test source
+files** and swaps only the driver reference:
+
+- **Linked tests** (compiled verbatim, not copied):
+  - `SNICloseDeadlockTest.cs` (from `tests/UnitTests/SimulatedServerTests`) —
+    3 in-process tests: pending async read (via the in-repo TDS test server),
+    pre-login handshake, and TLS handshake (both via raw `TcpListener`).
+  - `SNICloseRaceDeadlockTest.cs` (same folder) — releases the server response
+    at the same instant as close so the read completion races `SNIClose`
+    (×100 iterations).
+  - `MarsCloseDeadlockTest.cs` (from `tests/ManualTests/SQL/AsyncTest`) —
+    live-server MARS pending-read test.
+  - `MarsCloseStressTest.cs` (same folder) — many MARS connections with
+    in-flight reads, all closed simultaneously over several iterations
+    (live server).
+- **Compat shim** makes the legacy driver satisfy the linked files' bare
+  `Microsoft.Data.SqlClient` type names:
+  - `GlobalUsings.cs` — global `using` aliases mapping `SqlConnection`,
+    `SqlCommand`, `SqlDataReader` to `System.Data.SqlClient`, and
+    `SqlConnectionStringBuilder` / `SqlConnectionEncryptOption` to the shims.
+  - `Compat.cs` — a `SqlConnectionEncryptOption` enum stand-in, a
+    `SqlConnectionStringBuilder` facade over the (sealed) legacy builder that
+    accepts the enum-typed `Encrypt`, and a `DataTestUtility` stand-in that
+    reads the connection string from `SNICLOSE_CONNSTR`.
+
+All four test files are the **real driver tests**; this project only links them
+and swaps the driver reference. (The race/stress tests were originally prototyped
+here and have since been promoted into the driver test projects.)
+
+The bare-name binding trick: the linked files sit in `Microsoft.Data.SqlClient.*`
+namespaces, and because this project does **not** reference MDS, unqualified
+names like `SqlConnection` fall through to the global aliases in `GlobalUsings.cs`.
+
+### Why `xunit.runner.json` (shadowCopy: false) matters
+
+`Microsoft.DotNet.XUnitExtensions` (which provides `[ConditionalTheory]`) ships a
+**delay-signed** beta assembly. On .NET Framework, xUnit's default shadow copy
+re-verifies the strong name from the shadow-copy directory and fails with
+`FileLoadException: strong name could not be verified`. The real test projects
+ship `xunit.runner.json` with `shadowCopy: false`; this harness **links that same
+file** so the delay-signed assembly loads from its build-output location (where
+.NET Framework's strong-name bypass applies).
+
+---
+
+## Target frameworks
+
+`net462;net47;net472;net481;net10.0`
+
+- **.NET Framework targets** use the **in-box** `System.Data.dll`.
+- **.NET (Core) target** (`net10.0`) uses the **`System.Data.SqlClient` NuGet
+  package** (version parametrized — see below).
+
+> **Important:** the in-box `System.Data.dll` is *machine-global* for the whole
+> 4.x line — only one physical DLL exists per machine. On this dev box that is
+> 4.8.1, so every netfx target binds 4.8.1 at runtime; the older TFMs only change
+> compile-time references and framework "quirk" behaviors, **not** the DLL bits.
+> To run the exact reported 4.7.4081.0 bits you need an environment isolated to
+> .NET 4.7.2 (see [Testing older in-box DLLs](#testing-older-in-box-dlls-containers)).
+
+---
+
+## Running
+
+From the repo root.
+
+### In-process tests only (no SQL Server)
+
+```powershell
+dotnet test .\tools\SniCloseLegacyRepro
+# or a single framework:
+dotnet test .\tools\SniCloseLegacyRepro -f net481
+```
+
+The live MARS test and the MARS stress test are skipped when no connection
+string is set.
+
+### With a live SQL Server (enables MARS + stress tests)
+
+Set `SNICLOSE_CONNSTR` yourself so the password is not routed through tooling:
+
+```powershell
+$env:SNICLOSE_CONNSTR = "Server=127.0.0.1,1434;Database=master;User ID=<user>;Password=<pwd>;TrustServerCertificate=true;Connect Timeout=15"
+dotnet test .\tools\SniCloseLegacyRepro -f net481
+Remove-Item Env:\SNICLOSE_CONNSTR   # clear when done
+```
+
+### Sweeping legacy NuGet versions (net10.0 only)
+
+The `.NET (Core)` target's package version is parametrized via
+`$(SqlClientLegacyVersion)` (default `4.9.1`). The versions must exist on a
+restore feed.
+
+```powershell
+foreach ($v in '4.5.3','4.6.1','4.7.0','4.8.6','4.9.1') {
+  dotnet test .\tools\SniCloseLegacyRepro -f net10.0 -p:SqlClientLegacyVersion=$v
+}
+```
+
+### Emulating the reported 4-CPU box
+
+Pin the test process (and its child `testhost`) to 4 cores:
+
+```powershell
+$p = Start-Process dotnet -ArgumentList 'test','.\tools\SniCloseLegacyRepro','-f','net47','--no-build' -PassThru -NoNewWindow
+$p.ProcessorAffinity = [IntPtr]0xF   # cores 0-3
+$p.WaitForExit()
+```
+
+---
+
+## Testing older in-box DLLs (containers)
+
+Because the in-box `System.Data.dll` is machine-global, the faithful way to test
+older bits is an isolated environment. Use the official .NET Framework images —
+the **framework version tag controls `System.Data.dll`**; the **Windows base tag
+controls the OS + native `sni.dll`**.
+
+```
+mcr.microsoft.com/dotnet/framework/runtime:<fwver>-windowsservercore-<base>
+```
+
+| Image tag | `System.Data.dll` ≈ | Role |
+|---|---|---|
+| `4.6.2-windowsservercore-ltsc2016` | 4.7.4081.0 (see note) | — |
+| `4.7-windowsservercore-ltsc2016` | **4.7.4081.0** | **ICM match** |
+| `4.7.2-windowsservercore-ltsc2016` | 4.7.4081.0 | ICM match |
+| `4.8-windowsservercore-ltsc2019` | 4.8.4690.0 | newer |
+| `4.8.1-windowsservercore-ltsc2022` | 4.8.9xxx | this dev box |
+
+> **.NET Framework 4.x is a single, in-place, monotonic runtime.** The `ltsc2016`
+> base OS is already serviced to 4.7.2, so its in-box `System.Data.dll` is
+> **4.7.4081.0** — and a lower framework tag (e.g. `4.6.2`) cannot downgrade it.
+> On this base, every tag at or below 4.7.2 resolves to the same 4.7.4081.0 DLL,
+> which happens to be the reported version (the practical floor). Getting
+> a genuinely older DLL (e.g. 4.6.x) would require an *unserviced* older base OS
+> image, which MCR does not publish.
+
+Verify the DLL version inside a container:
+
+```powershell
+(Get-Item C:\Windows\Microsoft.NET\Framework64\v4.0.30319\System.Data.dll).VersionInfo.FileVersion
+```
+
+### `run-in-container.ps1`
+
+The framework `runtime` images have **no `dotnet` CLI**, so `dotnet test` will not
+work there. The `run-in-container.ps1` helper handles this: it builds `-f net47`
+on the host, stages `xunit.console.exe` (from `xunit.runner.console`) next to the
+build output, and runs the tests in the container so they bind the container's
+old in-box `System.Data.dll`.
+
+```powershell
+# in-process tests only (no SQL Server):
+.\run-in-container.ps1
+
+# faithful ICM match: 4.7.4081.0 + 4 processors, live MARS + stress:
+$env:SNICLOSE_CONNSTR = "Server=127.0.0.1,1434;Database=master;User ID=sa;Password=***;TrustServerCertificate=true"
+.\run-in-container.ps1 -Cpus 4
+
+# a different framework image:
+.\run-in-container.ps1 -Image mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019
+```
+
+**Networking:** a Windows container cannot reach the host's loopback, and
+`host.docker.internal` is not injected for hyperv-isolated Windows containers.
+The script targets the Docker NAT gateway (the host's `vEthernet (nat)` IP, e.g.
+`172.17.224.1`) and rewrites the connection string to it. Because the SQL Server
+(a Linux container published to host loopback) does not listen on that IP, add a
+one-time **elevated** host bridge:
+
+```powershell
+netsh interface portproxy add v4tov4 listenaddress=172.17.224.1 listenport=1434 connectaddress=127.0.0.1 connectport=1434
+New-NetFirewallRule -DisplayName "SQL 1434 from Windows containers" -Direction Inbound -LocalAddress 172.17.224.1 -LocalPort 1434 -Protocol TCP -Action Allow
+# teardown:
+#   netsh interface portproxy delete v4tov4 listenaddress=172.17.224.1 listenport=1434
+#   Remove-NetFirewallRule -DisplayName "SQL 1434 from Windows containers"
+```
+
+---
+
+## Findings
+
+Across every configuration tested, the deadlock **does not reproduce** (all
+tests pass), including:
+
+- in-box `System.Data.dll` 4.8.1 on `net462` / `net47` / `net472` / `net481`
+  (host dev box)
+- 4-CPU-pinned runs
+- the completion-races-close and MARS concurrency stress variants
+- the full `System.Data.SqlClient` NuGet lineage on `net10.0`
+  (4.5.3, 4.6.1, 4.7.0, 4.8.6, 4.9.1)
+- **the reported (ICM) environment**, reproduced faithfully in a container:
+  Windows Server 2016 base (`ltsc2016`) · .NET Framework 4.7 · in-box
+  `System.Data.dll` **4.7.4081.0** · **4 processors** (`--cpu-count 4`) · live
+  MARS + concurrency stress against SQL Server 2025 → **12/12 pass**.
+- container `ltsc2019` · .NET Framework 4.8 · `System.Data.dll` 4.8.4690.0 ·
+  4 processors · live MARS + stress → **12/12 pass**.
+
+So the SNIClose close-during-I/O deadlock does not reproduce even in a
+bit-for-bit reconstruction of the reported ICM environment. Because that
+*exact* `System.Data.dll` (4.7.4081.0) also passes, there is no
+version boundary / "fixed in a later servicing build" explanation: the synthetic
+tests simply do not trigger whatever the original incident hit. That points away
+from a plain client-side ordering bug reachable from managed timing alone, and
+toward something more environment-specific in the original incident (e.g. exact
+network/timing conditions, or a native-layer interaction not exercised here).
+
+### Additional reproduction attempts (`ReproAttempts.cs`)
+
+Harness-only, exploratory variants targeting conditions the shared tests do not
+create. On the exact 4.7.4081.0 bits at 4 CPUs, **none reproduces the issue**:
+
+- **Close under thread-pool starvation** → no deadlock.
+- **Sync-over-async on a single-threaded `SynchronizationContext`** (classic
+  ASP.NET shape) → no captured-context deadlock.
+- **Cancel `OpenAsync` during the TLS handshake** (internal abort/close path)
+  → settles promptly, no deadlock.
+- **`Open()` under client thread-pool starvation** (real, out-of-process server;
+  plain and TLS) → **`Open()` succeeds**. Starvation is *not* the reproduction.
+
+> A note on a false lead: an *in-process* TDS test server shares the client's
+> thread pool, so saturating the pool starves the **server** and makes `Open()`
+> time out - a test artifact. Against a real out-of-process server the driver's
+> `Open()` is robust under the same starvation, so the timeout does not indicate
+> a driver defect.
+
+---
+
+## Isolation notes
+
+- Uses Central Package Management via its own `Directory.Build.props`
+  (`ManagePackageVersionsCentrally=true`) and `Directory.Packages.props`, which
+  imports the shared SqlClient tests package versions. The legacy
+  `System.Data.SqlClient` package is pinned there; the net10.0 target overrides
+  it per-run via `VersionOverride` / `-p:SqlClientLegacyVersion=…`.
+- Legacy `System.Data.SqlClient` versions are served from the repo's governed
+  feed (no extra `NuGet.config`).
+- References the driver-agnostic in-repo TDS test-server projects
+  (`tests/tools/TDS/*`).
diff --git a/tools/SniCloseLegacyRepro/ReproAttempts.cs b/tools/SniCloseLegacyRepro/ReproAttempts.cs
new file mode 100644
index 0000000000..e2107616d5
--- /dev/null
+++ b/tools/SniCloseLegacyRepro/ReproAttempts.cs
@@ -0,0 +1,965 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+// -----------------------------------------------------------------------------
+// Tier-2 reproduction ATTEMPTS for ICM 775308542 / ADO.Net #43847 (harness-only,
+// exploratory - not promoted to the driver test suite unless one reproduces).
+//
+// The shared SNIClose/MARS tests conclusively show that a single connection
+// closed while one async I/O is in flight does NOT deadlock, even on the
+// customer's exact in-box System.Data.dll (4.7.4081.0) at 4 CPUs. These variants
+// target conditions those tests do not create, which better match the reported
+// symptom ("initial TLS handshake failure" under a 4-proc production load):
+//
+//   1. ThreadPoolStarvation  - the worker pool is saturated (as on a small,
+//      busy box) when the connection is closed, so an async completion callback
+//      cannot obtain a thread while the close path runs.
+//   2. SyncOverAsyncContext  - a single-threaded SynchronizationContext (as in
+//      classic ASP.NET) is blocked on an async SqlClient operation via .Result;
+//      if the driver captures the context for a continuation, it deadlocks.
+//   3. CancelOpenDuringTls   - OpenAsync is cancelled while the TLS handshake
+//      read is in flight, driving the driver's INTERNAL abort/close path
+//      (rather than an external Close on another thread). PROMOTED to the driver
+//      test suite as SNICloseHandshakeCancellationTest (linked in via the
+//      harness csproj), so it also runs against the legacy driver here.
+//   4. OpenUnderStarvation   - does client thread-pool starvation cause a
+//      connection/handshake failure? Against a REAL server it does NOT: the
+//      driver's Open() is robust. (An in-process test server shares the pool
+//      and would be co-starved - a test artifact, not driver behavior.)
+//
+// After the ICM dump was obtained, the real mechanism was identified: a
+// RE-ENTRANT SNIClose (Close() called synchronously from within
+// ReadAsyncCallback via the command-timeout -> failed-attention-write path, so
+// SNIClose spins in WaitForActiveCallbacks waiting for the callback it runs in).
+// Two further attempts target that mechanism:
+//
+//   5. CallbackReentrancy    - async read + short command timeout + a proxy that
+//      breaks the client's write. A regression guard for the MDS asyncClose fix;
+//      does not deterministically force the legacy re-entrancy (see its notes).
+//   6. ReentrantSNICloseSoak - many concurrent workers RST connections at ~the
+//      command-timeout instant, hunting the race probabilistically. OPT-IN
+//      (set SNICLOSE_SOAK_ENABLE) because it is heavy and, when it fires, poisons
+//      the process. It fired ONCE in a full-suite run on the legacy in-box driver
+//      (net462/47x/48x) but NOT on the Core NuGet lineage (net10.0) - a clean
+//      driver-lineage split consistent with the real bug - yet it did not recur
+//      in subsequent runs. So it confirms the mechanism is reachable but is not a
+//      reliable reproduction (matching the SQL EE's "very difficult to capture").
+//      The definitive evidence remains the dump + the asyncClose code review.
+//
+// All waits are bounded, so a genuine deadlock is reported as a failed
+// bounded-wait rather than hanging the run.
+// -----------------------------------------------------------------------------
+
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.SqlServer.TDS;
+using Microsoft.SqlServer.TDS.EndPoint;
+using Microsoft.SqlServer.TDS.Servers;
+using Microsoft.SqlServer.TDS.SQLBatch;
+using Microsoft.Data.SqlClient.ManualTesting.Tests; // DataTestUtility shim (live connection string)
+using Xunit;
+
+namespace SniCloseLegacyRepro
+{
+    /// <summary>Shared helpers for the reproduction attempts.</summary>
+    internal static class ReproSupport
+    {
+        public static readonly TimeSpan CloseBudget = TimeSpan.FromSeconds(30);
+        public static readonly TimeSpan HandshakeBudget = TimeSpan.FromSeconds(30);
+
+        /// <summary>
+        /// A query engine that signals when a SQL batch arrives and then withholds
+        /// the response until released.
+        /// </summary>
+        public sealed class StallingQueryEngine : QueryEngine
+        {
+            private readonly ManualResetEventSlim _batchReceived;
+            private readonly ManualResetEventSlim _release;
+
+            public StallingQueryEngine(
+                TdsServerArguments arguments,
+                ManualResetEventSlim batchReceived,
+                ManualResetEventSlim release)
+                : base(arguments)
+            {
+                _batchReceived = batchReceived;
+                _release = release;
+            }
+
+            protected override TDSMessageCollection CreateQueryResponse(
+                ITDSServerSession session,
+                TDSSQLBatchToken batchRequest)
+            {
+                _batchReceived.Set();
+                _release.Wait();
+                return base.CreateQueryResponse(session, batchRequest);
+            }
+        }
+    }
+
+    /// <summary>
+    /// A single-threaded synchronization context that pumps posted callbacks on
+    /// one dedicated (background) thread - the shape that makes classic ASP.NET
+    /// sync-over-async deadlock.
+    /// </summary>
+    internal sealed class SingleThreadedSynchronizationContext : SynchronizationContext, IDisposable
+    {
+        private readonly BlockingCollection<(SendOrPostCallback callback, object? state)> _queue = new();
+        private readonly Thread _thread;
+
+        public SingleThreadedSynchronizationContext()
+        {
+            _thread = new Thread(Pump) { IsBackground = true, Name = "SingleThreadedSyncCtx" };
+            _thread.Start();
+        }
+
+        private void Pump()
+        {
+            SetSynchronizationContext(this);
+            try
+            {
+                foreach ((SendOrPostCallback callback, object? state) in _queue.GetConsumingEnumerable())
+                {
+                    callback(state);
+                }
+            }
+            catch (InvalidOperationException)
+            {
+                // Queue completed while blocked; normal shutdown.
+            }
+        }
+
+        public override void Post(SendOrPostCallback d, object? state) => _queue.Add((d, state));
+
+        public override void Send(SendOrPostCallback d, object? state) =>
+            throw new NotSupportedException();
+
+        /// <summary>Queue an action to run on the context thread.</summary>
+        public void Run(Action action) => Post(_ => action(), null);
+
+        public void Dispose()
+        {
+            try
+            {
+                _queue.CompleteAdding();
+            }
+            catch
+            {
+                // Ignore.
+            }
+        }
+    }
+
+    /// <summary>
+    /// Attempt 1: close a connection with an in-flight async read while the
+    /// worker thread pool is fully saturated, so an async completion callback
+    /// cannot obtain a thread while the close path runs.
+    /// </summary>
+    public class ThreadPoolStarvationReproTests
+    {
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void CloseWithPendingReadUnderThreadPoolStarvation_DoesNotDeadlock(bool disposeInsteadOfClose)
+        {
+            ThreadPool.GetMinThreads(out int minW, out int minIo);
+            ThreadPool.GetMaxThreads(out int maxW, out int maxIo);
+
+            using ManualResetEventSlim releaseWorkers = new(false);
+            using ManualResetEventSlim batchReceived = new(false);
+            using ManualResetEventSlim releaseResponse = new(false);
+            int busy = 0;
+            bool poolConstrained = false;
+            try
+            {
+                TdsServerArguments arguments = new();
+                using TdsServer server = new(
+                    new ReproSupport.StallingQueryEngine(arguments, batchReceived, releaseResponse),
+                    arguments);
+                server.Start();
+
+                SqlConnectionStringBuilder builder = new()
+                {
+                    DataSource = $"localhost,{server.EndPoint.Port}",
+                    Encrypt = SqlConnectionEncryptOption.Optional,
+                    Pooling = false,
+#if NETFRAMEWORK
+                    TransparentNetworkIPResolution = false,
+#endif
+                };
+
+                SqlConnection connection = new(builder.ConnectionString);
+                SqlCommand? command = null;
+                Task<SqlDataReader>? readTask = null;
+                bool closeAttempted = false;
+                bool closedInTime = false;
+                try
+                {
+                    // Open and start the read while the pool is healthy, so the
+                    // starvation below isolates the CLOSE path (not connection
+                    // establishment, which is starvation-sensitive on its own).
+                    connection.Open();
+                    command = new("SELECT 1", connection);
+                    readTask = command.ExecuteReaderAsync();
+
+                    Assert.True(
+                        batchReceived.Wait(ReproSupport.HandshakeBudget),
+                        "The server never received the batch; the async read was not in flight.");
+
+                    // Now saturate a small, busy-box worker pool so any async
+                    // completion the close path depends on cannot obtain a thread.
+                    int poolSize = Math.Max(2, Math.Min(4, Environment.ProcessorCount));
+                    ThreadPool.SetMinThreads(poolSize, poolSize);
+                    ThreadPool.SetMaxThreads(poolSize, poolSize);
+                    poolConstrained = true;
+                    for (int i = 0; i < poolSize; i++)
+                    {
+                        ThreadPool.QueueUserWorkItem(_ =>
+                        {
+                            Interlocked.Increment(ref busy);
+                            releaseWorkers.Wait();
+                        });
+                    }
+                    SpinWait.SpinUntil(() => Volatile.Read(ref busy) >= poolSize, TimeSpan.FromSeconds(10));
+
+                    closeAttempted = true;
+                    Task closeTask = Task.Factory.StartNew(
+                        () =>
+                        {
+                            if (disposeInsteadOfClose)
+                            {
+                                connection.Dispose();
+                            }
+                            else
+                            {
+                                connection.Close();
+                            }
+                        },
+                        TaskCreationOptions.LongRunning);
+
+                    closedInTime = closeTask.Wait(ReproSupport.CloseBudget);
+
+                    Assert.True(
+                        closedInTime,
+                        $"{(disposeInsteadOfClose ? "Dispose()" : "Close()")} did not complete within " +
+                        $"{ReproSupport.CloseBudget.TotalSeconds:N0}s while the thread pool was saturated " +
+                        "(possible SNIClose deadlock / thread-starvation).");
+                }
+                finally
+                {
+                    // Free the pool first so the pending read and any close-path
+                    // continuations can drain, then release the server.
+                    releaseWorkers.Set();
+                    if (poolConstrained)
+                    {
+                        ThreadPool.SetMinThreads(minW, minIo);
+                        ThreadPool.SetMaxThreads(maxW, maxIo);
+                    }
+                    releaseResponse.Set();
+
+                    if (readTask != null)
+                    {
+                        try { readTask.Wait(ReproSupport.CloseBudget); } catch { /* expected */ }
+                    }
+                    command?.Dispose();
+                    if (!closeAttempted || closedInTime)
+                    {
+                        connection.Dispose();
+                    }
+                }
+            }
+            finally
+            {
+                releaseWorkers.Set();
+                ThreadPool.SetMinThreads(minW, minIo);
+                ThreadPool.SetMaxThreads(maxW, maxIo);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Attempt 2: block a single-threaded synchronization context on an async
+    /// SqlClient read via <c>.Result</c>. If any driver continuation captures the
+    /// context, the post-back cannot run and the operation deadlocks.
+    /// </summary>
+    public class SyncOverAsyncContextReproTests
+    {
+        [Fact]
+        public void SyncOverAsyncOnSingleThreadedContext_DoesNotDeadlock()
+        {
+            using ManualResetEventSlim batchReceived = new(false);
+            using ManualResetEventSlim releaseResponse = new(false);
+            using ManualResetEventSlim scenarioDone = new(false);
+            Exception? scenarioError = null;
+
+            TdsServerArguments arguments = new();
+            using TdsServer server = new(
+                new ReproSupport.StallingQueryEngine(arguments, batchReceived, releaseResponse),
+                arguments);
+            server.Start();
+
+            SqlConnectionStringBuilder builder = new()
+            {
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false,
+#if NETFRAMEWORK
+                TransparentNetworkIPResolution = false,
+#endif
+            };
+
+            // Once the read is in flight, release the server so its completion
+            // fires and the continuation must post back to the (blocked) context.
+            Task releaser = Task.Run(() =>
+            {
+                if (batchReceived.Wait(ReproSupport.HandshakeBudget))
+                {
+                    releaseResponse.Set();
+                }
+            });
+
+            using SingleThreadedSynchronizationContext context = new();
+            SqlConnection? connection = null;
+            context.Run(() =>
+            {
+                try
+                {
+                    connection = new SqlConnection(builder.ConnectionString);
+                    connection.Open();
+                    using SqlCommand command = new("SELECT 1", connection);
+
+                    // Sync-over-async on the single-threaded context: blocks the
+                    // pump thread. Deadlocks iff a continuation captured the context.
+                    using SqlDataReader reader = command.ExecuteReaderAsync().GetAwaiter().GetResult();
+                    while (reader.Read())
+                    {
+                        // Drain.
+                    }
+                }
+                catch (Exception ex)
+                {
+                    scenarioError = ex;
+                }
+                finally
+                {
+                    scenarioDone.Set();
+                }
+            });
+
+            bool completed = scenarioDone.Wait(ReproSupport.CloseBudget);
+
+            // Best-effort cleanup; if we deadlocked, the context thread is parked
+            // (background) and the connection is stuck - do not block on it.
+            try { releaser.Wait(TimeSpan.FromSeconds(5)); } catch { /* ignore */ }
+            if (completed)
+            {
+                try { connection?.Dispose(); } catch { /* ignore */ }
+            }
+
+            Assert.True(
+                completed,
+                $"Sync-over-async on a single-threaded SynchronizationContext did not complete within " +
+                $"{ReproSupport.CloseBudget.TotalSeconds:N0}s. This indicates a captured-context deadlock in " +
+                "the driver's async read path (ADO.Net #43847 / ICM 775308542).");
+
+            // If it completed, it should have completed cleanly (or with an
+            // expected SqlException), not via some other failure mode.
+            Assert.True(
+                scenarioError is null or System.Data.SqlClient.SqlException,
+                $"Unexpected error on the context thread: {scenarioError}");
+        }
+    }
+
+    /// <summary>
+    /// Attempt 4: does client-side thread-pool starvation cause a CONNECTION
+    /// failure? This checks the hypothesis that the reported "connection/
+    /// handshake failure under load" is thread starvation rather than an
+    /// SNIClose deadlock.
+    ///
+    /// <para>
+    /// IMPORTANT: an in-process TDS test server shares the client's thread pool,
+    /// so saturating the pool starves the SERVER and makes Open() time out - a
+    /// test artifact, not driver behavior. These tests therefore require a real,
+    /// out-of-process SQL Server (SNICLOSE_CONNSTR). The observed result is that
+    /// Open() SUCCEEDS under client thread-pool starvation, i.e. starvation is
+    /// NOT the reproduction.
+    /// </para>
+    /// </summary>
+    public class OpenUnderThreadPoolStarvationReproTests
+    {
+        private static readonly TimeSpan HardBudget = TimeSpan.FromSeconds(60);
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [InlineData(false)] // Encrypt = Optional
+        [InlineData(true)]  // Encrypt = Mandatory (drives the TLS handshake)
+        public void SyncOpenAgainstRealServerUnderThreadPoolStarvation_Succeeds(bool encrypt)
+        {
+            string cs = new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString)
+            {
+                Encrypt = encrypt ? SqlConnectionEncryptOption.Mandatory : SqlConnectionEncryptOption.Optional,
+                TrustServerCertificate = true,
+                Pooling = false,
+                ConnectTimeout = 30,
+            }.ConnectionString;
+
+            RunStarvedOpen(cs, out bool settled, out bool timedOut, out Exception? error);
+
+            Assert.True(
+                settled,
+                $"Open() did not settle within {HardBudget.TotalSeconds:N0}s under thread-pool starvation " +
+                "(it hung).");
+            Assert.True(
+                error is null,
+                $"Open() against a real server failed under client thread-pool starvation: {error}");
+            Assert.False(
+                timedOut,
+                "Open() timed out under client thread-pool starvation against a real server.");
+        }
+
+        private static void RunStarvedOpen(string connectionString, out bool settled, out bool timedOut, out Exception? error)
+        {
+            ThreadPool.GetMinThreads(out int minW, out int minIo);
+            ThreadPool.GetMaxThreads(out int maxW, out int maxIo);
+            // Not disposed: saturating workers may still be parked on it when the
+            // method returns; disposing would race them into ObjectDisposedException.
+            ManualResetEventSlim releaseWorkers = new(false);
+            int busy = 0;
+            settled = false;
+            timedOut = false;
+            error = null;
+            try
+            {
+                // Constrain the pool to a small, busy-box size and occupy every
+                // worker thread so any continuation the driver needs is starved.
+                int poolSize = Math.Max(2, Math.Min(4, Environment.ProcessorCount));
+                ThreadPool.SetMinThreads(poolSize, poolSize);
+                ThreadPool.SetMaxThreads(poolSize, poolSize);
+                for (int i = 0; i < poolSize; i++)
+                {
+                    ThreadPool.QueueUserWorkItem(_ =>
+                    {
+                        Interlocked.Increment(ref busy);
+                        releaseWorkers.Wait();
+                    });
+                }
+                SpinWait.SpinUntil(() => Volatile.Read(ref busy) >= poolSize, TimeSpan.FromSeconds(10));
+
+                Exception? captured = null;
+                Thread openThread = new(() =>
+                {
+                    try
+                    {
+                        using SqlConnection conn = new(connectionString);
+                        conn.Open();
+                        conn.Close();
+                    }
+                    catch (Exception ex)
+                    {
+                        captured = ex;
+                    }
+                })
+                { IsBackground = true, Name = "StarvedOpen" };
+
+                openThread.Start();
+                settled = openThread.Join(HardBudget);
+                error = captured;
+                timedOut = captured is System.Data.SqlClient.SqlException sqlEx
+                    && (sqlEx.Number == -2
+                        || sqlEx.Message.IndexOf("timeout", StringComparison.OrdinalIgnoreCase) >= 0
+                        || sqlEx.Message.IndexOf("timed out", StringComparison.OrdinalIgnoreCase) >= 0);
+            }
+            finally
+            {
+                releaseWorkers.Set();
+                ThreadPool.SetMinThreads(minW, minIo);
+                ThreadPool.SetMaxThreads(maxW, maxIo);
+            }
+        }
+    }
+
+    /// <summary>
+    /// A transparent TCP proxy that forwards bytes between a client and a backend
+    /// TDS server, and can - on demand - break the CLIENT's write path while
+    /// leaving its pending read outstanding. It does this via
+    /// <c>Shutdown(SocketShutdown.Receive)</c> on the client-facing socket: the
+    /// client's next write (the timeout attention) then arrives at a
+    /// receive-shutdown socket and is answered with a TCP RST, so the client's
+    /// <c>SNIWritePacket</c> fails - the exact condition from the ICM dump.
+    /// </summary>
+    internal sealed class AttentionBreakingProxy : IDisposable
+    {
+        private readonly TcpListener _listener;
+        private readonly IPEndPoint _backend;
+        private Socket? _clientSocket;
+        private Socket? _backendSocket;
+        private volatile bool _broken;
+
+        public int Port { get; }
+
+        public AttentionBreakingProxy(IPEndPoint backend)
+        {
+            _backend = backend;
+            _listener = new TcpListener(IPAddress.Loopback, 0);
+            _listener.Start();
+            Port = ((IPEndPoint)_listener.LocalEndpoint).Port;
+            Task.Run(AcceptAndPump);
+        }
+
+        /// <summary>
+        /// Break the client's write direction: subsequent client writes RST while
+        /// its pending read stays outstanding (the backend sends nothing).
+        /// </summary>
+        public void BreakClientWrites()
+        {
+            _broken = true;
+            try
+            {
+                // SD_RECEIVE: data the client sends afterwards (the attention) is
+                // answered with a TCP RST, failing the client's write, while the
+                // client's pending read remains outstanding.
+                _clientSocket?.Shutdown(SocketShutdown.Receive);
+            }
+            catch
+            {
+                // best effort
+            }
+        }
+
+        private void AcceptAndPump()
+        {
+            try
+            {
+                _clientSocket = _listener.AcceptSocket();
+                _backendSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                _backendSocket.Connect(_backend);
+
+                // client -> backend on a worker; backend -> client on this thread.
+                Task.Run(() => Pump(_clientSocket, _backendSocket, clientToBackend: true));
+                Pump(_backendSocket, _clientSocket, clientToBackend: false);
+            }
+            catch
+            {
+                // Teardown races are expected; ignore.
+            }
+        }
+
+        private void Pump(Socket from, Socket to, bool clientToBackend)
+        {
+            byte[] buffer = new byte[8192];
+            try
+            {
+                while (true)
+                {
+                    int n = from.Receive(buffer);
+                    if (n <= 0)
+                    {
+                        break;
+                    }
+
+                    // Once broken, stop forwarding client bytes to the backend; the
+                    // client's write will RST on its receive-shutdown socket.
+                    if (clientToBackend && _broken)
+                    {
+                        break;
+                    }
+
+                    to.Send(buffer, 0, n, SocketFlags.None);
+                }
+            }
+            catch
+            {
+                // Expected on RST / teardown.
+            }
+        }
+
+        public void Dispose()
+        {
+            try { _listener.Stop(); } catch { /* ignore */ }
+            try { _clientSocket?.Dispose(); } catch { /* ignore */ }
+            try { _backendSocket?.Dispose(); } catch { /* ignore */ }
+        }
+    }
+
+    /// <summary>
+    /// Attempt 5 (matches the ICM dump's mechanism): the reported deadlock is a
+    /// RE-ENTRANT SNIClose. An async read times out; the driver sends an
+    /// attention from within <c>ReadAsyncCallback</c>; the attention
+    /// <c>SNIWritePacket</c> fails; the legacy driver then calls
+    /// <c>SqlConnection.Close()</c> SYNCHRONOUSLY on the callback thread, so
+    /// <c>SNIClose</c> spins in <c>SNI_Conn::WaitForActiveCallbacks()</c> waiting
+    /// for the very callback it is running within - a self-deadlock.
+    ///
+    /// <para>
+    /// Microsoft.Data.SqlClient defers the close off the callback thread via its
+    /// <c>asyncClose</c> path (ThrowExceptionAndWarning wraps the close in
+    /// <c>Task.Factory.StartNew</c>), so the read settles promptly and this test
+    /// passes - a regression guard for that fix.
+    /// </para>
+    ///
+    /// <para>
+    /// NOTE: this exercises the async-read-timeout + broken-write path and asserts
+    /// no deadlock, but it does NOT deterministically force the re-entrant close
+    /// on the legacy driver: that requires the exact TCP state from the dump
+    /// (the attention write fails while the read stays pending - a half-broken
+    /// connection), which is very hard to synthesize (a RST kills both
+    /// directions; the SQL EE analysis likewise noted it is "very difficult to
+    /// capture"). The definitive evidence is the dump plus the code review of the
+    /// <c>asyncClose</c> deferral in Microsoft.Data.SqlClient.
+    /// </para>
+    /// </summary>
+    public class SNICloseCallbackReentrancyReproTests
+    {
+        private static readonly TimeSpan SettleBudget = TimeSpan.FromSeconds(45);
+        private static readonly TimeSpan BatchBudget = TimeSpan.FromSeconds(30);
+
+        [Fact]
+        public void CloseFromReadCallbackOnAttentionFailure_DoesNotDeadlock()
+        {
+            using ManualResetEventSlim batchReceived = new(false);
+            using ManualResetEventSlim releaseResponse = new(false);
+
+            TdsServerArguments arguments = new();
+            using TdsServer server = new(
+                new ReproSupport.StallingQueryEngine(arguments, batchReceived, releaseResponse),
+                arguments);
+            server.Start();
+
+            using AttentionBreakingProxy proxy = new(new IPEndPoint(IPAddress.Loopback, server.EndPoint.Port));
+
+            SqlConnectionStringBuilder builder = new()
+            {
+                DataSource = $"127.0.0.1,{proxy.Port}",
+                Encrypt = SqlConnectionEncryptOption.Optional,
+                // MARS off and pooling off, matching the reported configuration and
+                // ensuring Close() tears down the physical connection (reaching SNIClose).
+                Pooling = false,
+#if NETFRAMEWORK
+                TransparentNetworkIPResolution = false,
+#endif
+            };
+
+            SqlConnection connection = new(builder.ConnectionString);
+            SqlCommand? command = null;
+            Task<SqlDataReader>? readTask = null;
+            bool settledInTime = false;
+            try
+            {
+                connection.Open();
+
+                // Short command timeout so the pending async read times out, which
+                // drives OnTimeoutCore -> SendAttention from within ReadAsyncCallback.
+                command = new("SELECT 1", connection) { CommandTimeout = 2 };
+                readTask = command.ExecuteReaderAsync();
+
+                Assert.True(
+                    batchReceived.Wait(BatchBudget),
+                    "The server never received the batch; the async read was not in flight.");
+
+                // Break the client's write path so the timeout attention's
+                // SNIWritePacket fails, forcing Close() from within ReadAsyncCallback.
+                proxy.BreakClientWrites();
+
+                try
+                {
+                    settledInTime = readTask.Wait(SettleBudget);
+                }
+                catch (AggregateException)
+                {
+                    // Faulting/cancelling is the healthy outcome; what matters is it settled.
+                    settledInTime = true;
+                }
+
+                Assert.True(
+                    settledInTime,
+                    $"ExecuteReaderAsync did not settle within {SettleBudget.TotalSeconds:N0}s after the " +
+                    "command-timeout attention write failed. This indicates the re-entrant SNIClose " +
+                    "deadlock: Close() called from within ReadAsyncCallback -> SNIClose -> " +
+                    "WaitForActiveCallbacks (ADO.Net #43847 / ICM 775308542).");
+            }
+            finally
+            {
+                releaseResponse.Set();
+                command?.Dispose();
+                // Only dispose the connection if we did NOT deadlock; a deadlocked
+                // connection's Dispose() would also hang in SNIClose.
+                if (settledInTime)
+                {
+                    try { connection.Dispose(); } catch { /* ignore */ }
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// A transparent TCP proxy that relays bytes between a client and a backend
+    /// TDS server and can hard-RST the client connection on demand
+    /// (LingerState 0 + Close), used by the soak to break the connection at a
+    /// timed offset relative to the async read's command timeout.
+    /// </summary>
+    internal sealed class RstProxy : IDisposable
+    {
+        private readonly TcpListener _listener;
+        private readonly IPEndPoint _backend;
+        private Socket? _clientSocket;
+        private Socket? _backendSocket;
+
+        public int Port { get; }
+
+        public RstProxy(IPEndPoint backend)
+        {
+            _backend = backend;
+            _listener = new TcpListener(IPAddress.Loopback, 0);
+            _listener.Start();
+            Port = ((IPEndPoint)_listener.LocalEndpoint).Port;
+            Task.Run(AcceptAndPump);
+        }
+
+        /// <summary>Hard-reset the client connection (sends a TCP RST).</summary>
+        public void Rst()
+        {
+            try
+            {
+                Socket? s = _clientSocket;
+                if (s != null)
+                {
+                    s.LingerState = new LingerOption(true, 0);
+                    s.Close();
+                }
+            }
+            catch
+            {
+                // best effort
+            }
+        }
+
+        private void AcceptAndPump()
+        {
+            try
+            {
+                _clientSocket = _listener.AcceptSocket();
+                _backendSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                _backendSocket.Connect(_backend);
+                Task.Run(() => Pump(_clientSocket, _backendSocket));
+                Pump(_backendSocket, _clientSocket);
+            }
+            catch
+            {
+                // Teardown races are expected; ignore.
+            }
+        }
+
+        private static void Pump(Socket from, Socket to)
+        {
+            byte[] buffer = new byte[8192];
+            try
+            {
+                while (true)
+                {
+                    int n = from.Receive(buffer);
+                    if (n <= 0)
+                    {
+                        break;
+                    }
+                    to.Send(buffer, 0, n, SocketFlags.None);
+                }
+            }
+            catch
+            {
+                // Expected on RST / teardown.
+            }
+        }
+
+        public void Dispose()
+        {
+            try { _listener.Stop(); } catch { /* ignore */ }
+            try { _clientSocket?.Dispose(); } catch { /* ignore */ }
+            try { _backendSocket?.Dispose(); } catch { /* ignore */ }
+        }
+    }
+
+    /// <summary>
+    /// Soak that hunts for the re-entrant SNIClose deadlock probabilistically.
+    /// Many concurrent workers repeatedly open a connection, start an async read
+    /// that the server stalls, and RST the connection at ~the command-timeout
+    /// instant (with jitter), trying to land in the tiny window where the SNI
+    /// read timeout has fired but the timeout attention has not yet been written -
+    /// so the attention <c>SNIWritePacket</c> fails and the legacy driver closes
+    /// synchronously from within <c>ReadAsyncCallback</c>. A hang (a read that
+    /// never settles) means the re-entrant <c>SNIClose</c> was hit.
+    ///
+    /// <para>
+    /// Tunable via environment variables:
+    ///   SNICLOSE_SOAK_WORKERS (default 16; the ICM saw a "~36-thread" condition),
+    ///   SNICLOSE_SOAK_SECONDS (default 60).
+    /// The test fails if it reproduces (green = did not reproduce this run).
+    /// </para>
+    /// </summary>
+    public class ReentrantSNICloseSoakTests
+    {
+        private sealed class BoundedStallQueryEngine : QueryEngine
+        {
+            private readonly int _stallMs;
+
+            public BoundedStallQueryEngine(TdsServerArguments arguments, int stallMs)
+                : base(arguments)
+            {
+                _stallMs = stallMs;
+            }
+
+            protected override TDSMessageCollection CreateQueryResponse(
+                ITDSServerSession session,
+                TDSSQLBatchToken batchRequest)
+            {
+                // Stall every query long enough that the client's short command
+                // timeout fires first; the (eventual) response goes to an already
+                // RST-torn-down connection and the handler thread unwinds.
+                Thread.Sleep(_stallMs);
+                return base.CreateQueryResponse(session, batchRequest);
+            }
+        }
+
+        private static int EnvInt(string name, int fallback) =>
+            int.TryParse(Environment.GetEnvironmentVariable(name), out int v) && v > 0 ? v : fallback;
+
+        /// <summary>
+        /// Gate: the soak is opt-in (set SNICLOSE_SOAK_ENABLE) because it is
+        /// heavy, rarely fires, and - when it DOES reproduce - poisons the
+        /// process (hung SNIClose threads cascade into later tests). Skipped by
+        /// default so normal harness runs stay clean and deterministic.
+        /// </summary>
+        public static bool SoakEnabled() =>
+            !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("SNICLOSE_SOAK_ENABLE"));
+
+        [ConditionalFact(typeof(ReentrantSNICloseSoakTests), nameof(SoakEnabled))]
+        public void ConcurrentTimeoutWithRstNearTimeout_DoesNotReentrantlyDeadlock()
+        {
+            int workers = EnvInt("SNICLOSE_SOAK_WORKERS", 16);
+            TimeSpan soak = TimeSpan.FromSeconds(EnvInt("SNICLOSE_SOAK_SECONDS", 60));
+            const int commandTimeoutSec = 1;
+            const int stallMs = 6000;
+            TimeSpan perOpBudget = TimeSpan.FromSeconds(20);
+
+            TdsServerArguments arguments = new();
+            using TdsServer server = new(new BoundedStallQueryEngine(arguments, stallMs), arguments);
+            server.Start();
+            IPEndPoint backend = new(IPAddress.Loopback, server.EndPoint.Port);
+
+            using CancellationTokenSource cts = new(soak);
+            long attempts = 0;
+            string? hangInfo = null;
+            object gate = new();
+
+            void Worker(int id)
+            {
+                Random rng = new(unchecked(id * 397 ^ Environment.TickCount));
+                while (!cts.IsCancellationRequested && Volatile.Read(ref hangInfo) is null)
+                {
+                    RstProxy? proxy = null;
+                    SqlConnection? conn = null;
+                    SqlCommand? cmd = null;
+                    Task<SqlDataReader>? readTask = null;
+                    bool settled = false;
+                    try
+                    {
+                        proxy = new RstProxy(backend);
+                        string cs = new SqlConnectionStringBuilder
+                        {
+                            DataSource = $"127.0.0.1,{proxy.Port}",
+                            Encrypt = SqlConnectionEncryptOption.Optional,
+                            Pooling = false,
+                            ConnectTimeout = 15,
+#if NETFRAMEWORK
+                            TransparentNetworkIPResolution = false,
+#endif
+                        }.ConnectionString;
+
+                        conn = new SqlConnection(cs);
+                        conn.Open();
+                        cmd = new SqlCommand("SELECT 1", conn) { CommandTimeout = commandTimeoutSec };
+                        readTask = cmd.ExecuteReaderAsync();
+                        Interlocked.Increment(ref attempts);
+
+                        // Fire the RST at ~the command-timeout instant, with jitter,
+                        // trying to land just after the SNI read timeout but before
+                        // (or during) the attention write.
+                        int rstDelayMs = commandTimeoutSec * 1000 + rng.Next(-40, 100);
+                        RstProxy captured = proxy;
+                        _ = Task.Delay(rstDelayMs).ContinueWith(_ =>
+                        {
+                            try { captured.Rst(); } catch { /* ignore */ }
+                        });
+
+                        try
+                        {
+                            settled = readTask.Wait(perOpBudget);
+                        }
+                        catch (AggregateException)
+                        {
+                            settled = true; // faulted/cancelled = healthy
+                        }
+
+                        if (!settled)
+                        {
+                            lock (gate)
+                            {
+                                hangInfo ??= $"worker {id}: ExecuteReaderAsync did not settle within " +
+                                    $"{perOpBudget.TotalSeconds:N0}s (attempt #{Interlocked.Read(ref attempts)})";
+                            }
+                        }
+                    }
+                    catch
+                    {
+                        // Per-iteration connect/read failures under the RST storm are expected.
+                    }
+                    finally
+                    {
+                        cmd?.Dispose();
+                        // Only tear down if this iteration settled; a hung connection's
+                        // Dispose() would also block in SNIClose.
+                        if (settled)
+                        {
+                            try { conn?.Dispose(); } catch { /* ignore */ }
+                            try { proxy?.Dispose(); } catch { /* ignore */ }
+                        }
+                    }
+                }
+            }
+
+            Thread[] threads = new Thread[workers];
+            for (int i = 0; i < workers; i++)
+            {
+                int id = i;
+                threads[i] = new Thread(() => Worker(id)) { IsBackground = true, Name = $"SoakWorker{id}" };
+                threads[i].Start();
+            }
+
+            // Wait until the soak window elapses or a hang is detected, then give
+            // workers a moment to unwind.
+            DateTime deadline = DateTime.UtcNow + soak + perOpBudget + TimeSpan.FromSeconds(10);
+            while (DateTime.UtcNow < deadline
+                   && Volatile.Read(ref hangInfo) is null
+                   && threads.Any(t => t.IsAlive))
+            {
+                Thread.Sleep(500);
+            }
+            foreach (Thread t in threads)
+            {
+                t.Join(TimeSpan.FromSeconds(2));
+            }
+
+            Assert.True(
+                Volatile.Read(ref hangInfo) is null,
+                $"Reproduced the re-entrant SNIClose deadlock: {hangInfo}. Total attempts: " +
+                $"{Interlocked.Read(ref attempts)}. (close from within ReadAsyncCallback -> SNIClose -> " +
+                "WaitForActiveCallbacks; ADO.Net #43847 / ICM 775308542).");
+        }
+    }
+}
diff --git a/tools/SniCloseLegacyRepro/SniCloseLegacyRepro.csproj b/tools/SniCloseLegacyRepro/SniCloseLegacyRepro.csproj
new file mode 100644
index 0000000000..7c7f5507de
--- /dev/null
+++ b/tools/SniCloseLegacyRepro/SniCloseLegacyRepro.csproj
@@ -0,0 +1,115 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <!--
+    Diagnostic xUnit harness that runs SNIClose / MARS close-during-IO deadlock tests against the
+    LEGACY System.Data.SqlClient driver, to observe whether the deadlock (ICM 775308542 / ADO.Net
+    #43847) reproduces there.
+
+      * net462/net47/net472/net481 -> in-box System.Data.SqlClient (System.Data.dll)
+      * net10.0                     -> System.Data.SqlClient NuGet package
+
+    Rather than re-implementing the tests, this project LINKS the real test source files directly
+    (see the <Compile Include Link=...> items below) and supplies a small compatibility shim
+    (Compat.cs + GlobalUsings.cs) so the bare Microsoft.Data.SqlClient type names in those files
+    bind to the legacy driver.  See README.md for full usage, including running inside .NET
+    Framework Windows containers to bind older in-box System.Data.dll versions.
+
+    Run: dotnet test tools/SniCloseLegacyRepro                        (in-process tests only)
+      $env:SNICLOSE_CONNSTR="Server=...;User ID=...;Password=..."  (enables live MARS + stress)
+      dotnet test tools/SniCloseLegacyRepro
+
+    This project uses Central Package Management via the sibling
+    Directory.Packages.props (which imports the shared SqlClient tests versions) and
+    Directory.Build.props. The legacy System.Data.SqlClient package versions are served from the
+    repo's governed feed, so no extra NuGet.config is needed.
+  -->
+
+  <PropertyGroup>
+    <!-- .NET Framework targets exercise the in-box System.Data.dll (the driver
+         the ICM was reported against). NOTE: the in-box System.Data.dll is
+         machine-global for the whole 4.x line - only ONE physical DLL exists per
+         machine (here 4.8.1). Multi-targeting older netfx TFMs changes the
+         compile-time reference set and the runtime framework "quirk" behaviors
+         keyed off the app's TargetFrameworkAttribute, but does NOT swap in an
+         older System.Data.dll. Reproducing the exact reported older DLL bits
+         requires a machine/VM with only that older .NET Framework installed. -->
+    <TargetFrameworks>net462;net47;net472;net481;net10.0</TargetFrameworks>
+    <!-- Legacy System.Data.SqlClient NuGet version used by the .NET (Core)
+         target; override to sweep older builds, e.g.
+           dotnet test -f net10.0 -p:SqlClientLegacyVersion=4.6.1 -->
+    <SqlClientLegacyVersion Condition="'$(SqlClientLegacyVersion)' == ''">4.9.1</SqlClientLegacyVersion>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <IsTestProject>true</IsTestProject>
+    <IsPackable>false</IsPackable>
+    <!-- This is a diagnostic scratch tool; do not gate it on repo-wide analyzers/warnings. -->
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <RunAnalyzers>false</RunAnalyzers>
+    <!-- CS0618: the legacy System.Data.SqlClient package types are [Obsolete] -
+         that deprecated driver is exactly what is under test here. -->
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
+  </PropertyGroup>
+
+  <!-- Test SDK + xUnit. Versions come from the sibling Directory.Packages.props
+       (which imports the shared SqlClient tests versions).
+       Microsoft.DotNet.XUnitExtensions provides [ConditionalTheory]. Its beta
+       build is delay-signed, so on .NET Framework it must NOT be shadow-copied
+       (shadow copying re-verifies the strong name, which fails). We ship the
+       same xunit.runner.json the real tests use (shadowCopy: false) to avoid
+       that, exactly like the real UnitTests/ManualTests projects. -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" ExcludeAssets="compile" />
+    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
+    <!-- Console runner (xunit.console.exe) so the net47 build can run inside a
+         .NET Framework-only Windows container, which has no dotnet CLI. Only
+         provides tools/, so it has no compile impact. -->
+    <PackageReference Include="xunit.runner.console" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <!-- Link the SAME xunit.runner.json the real test projects ship, rather than
+       maintaining a copy. Its shadowCopy:false setting is what lets the
+       delay-signed XUnitExtensions load on .NET Framework (net481). -->
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)../../src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
+      <Link>xunit.runner.json</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <!-- .NET Framework targets: use the in-box legacy driver (System.Data.dll). -->
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <Reference Include="System.Data" />
+  </ItemGroup>
+
+  <!-- .NET (Core) target: use the legacy driver from its deprecated NuGet
+       package. The base version is centrally managed; $(SqlClientLegacyVersion)
+       overrides it per-run to sweep older builds. -->
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
+    <PackageReference Include="System.Data.SqlClient" VersionOverride="$(SqlClientLegacyVersion)" />
+  </ItemGroup>
+
+  <!-- Driver-agnostic in-process TDS test server used by the pending-read tests. -->
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)../../src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)../../src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)../../src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
+  </ItemGroup>
+
+  <!-- Link the REAL test files verbatim (shared, not copied). -->
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)../../src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseDeadlockTest.cs"
+             Link="Shared/SNICloseDeadlockTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseRaceDeadlockTest.cs"
+             Link="Shared/SNICloseRaceDeadlockTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseHandshakeCancellationTest.cs"
+             Link="Shared/SNICloseHandshakeCancellationTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/MarsCloseDeadlockTest.cs"
+             Link="Shared/MarsCloseDeadlockTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/MarsCloseStressTest.cs"
+             Link="Shared/MarsCloseStressTest.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/tools/SniCloseLegacyRepro/run-in-container.ps1 b/tools/SniCloseLegacyRepro/run-in-container.ps1
new file mode 100644
index 0000000000..02d1901b45
--- /dev/null
+++ b/tools/SniCloseLegacyRepro/run-in-container.ps1
@@ -0,0 +1,114 @@
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the MIT license.
+# See the LICENSE file in the project root for more information.
+
+# Runs the net47 build of this harness inside a .NET Framework Windows container,
+# so the tests bind the container's OLD in-box System.Data.dll (e.g. 4.7.4081.0)
+# instead of the host's. The framework container has no dotnet CLI, so we run the
+# tests with xunit.console.exe.
+#
+# Examples:
+#   # in-process tests only (no SQL Server needed):
+#   .\run-in-container.ps1
+#
+#   # include the live MARS + stress tests against a host SQL Server:
+#   $env:SNICLOSE_CONNSTR = "Server=127.0.0.1,1434;Database=master;User ID=sa;Password=***;TrustServerCertificate=true"
+#   .\run-in-container.ps1
+#
+#   # a different framework image / version:
+#   .\run-in-container.ps1 -Image mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019
+
+[CmdletBinding()]
+param(
+    [string]$Framework = 'net47',
+    [string]$Image = 'mcr.microsoft.com/dotnet/framework/runtime:4.7-windowsservercore-ltsc2016',
+    [string]$ConnectionString = $env:SNICLOSE_CONNSTR,
+    # Container-reachable host IP that the loopback SQL Server is bridged to.
+    # Defaults to the Docker NAT gateway (the host's 'vEthernet (nat)' adapter).
+    [string]$SqlHost,
+    [string]$RunnerVersion = '2.9.3',
+    # Constrain the hyperv container VM to this many processors (0 = unconstrained).
+    # The ICM environment had 4 procs; races can be CPU-count sensitive.
+    [int]$Cpus = 0,
+    [switch]$SkipBuild
+)
+
+$ErrorActionPreference = 'Stop'
+$projDir = $PSScriptRoot
+$proj = Join-Path $projDir 'SniCloseLegacyRepro.csproj'
+
+# --- Build the net47 output (host-side; independent of the docker engine) ------
+if (-not $SkipBuild) {
+    Write-Host "Building $Framework ..." -ForegroundColor Cyan
+    dotnet build $proj -c Debug -f $Framework | Out-Host
+    if ($LASTEXITCODE -ne 0) { throw "Build failed." }
+}
+
+$outDir = Join-Path $projDir "bin\Debug\$Framework"
+if (-not (Test-Path (Join-Path $outDir 'SniCloseLegacyRepro.dll'))) {
+    throw "Build output not found: $outDir (build first, or omit -SkipBuild)."
+}
+
+# --- Stage xunit.console.exe next to the test assembly -------------------------
+# The framework container has no dotnet CLI, so run tests with the console runner.
+$gp = (dotnet nuget locals global-packages --list) -replace '^.*?:\s*', ''
+$runnerTools = Join-Path $gp "xunit.runner.console\$RunnerVersion\tools\$Framework"
+if (-not (Test-Path $runnerTools)) {
+    $runnerTools = Join-Path $gp "xunit.runner.console\$RunnerVersion\tools\net472"
+}
+if (-not (Test-Path (Join-Path $runnerTools 'xunit.console.exe'))) {
+    throw "xunit.console.exe not found under $runnerTools. Is xunit.runner.console $RunnerVersion restored?"
+}
+Copy-Item (Join-Path $runnerTools '*') $outDir -Force
+
+# --- Ensure Docker is on the Windows engine -----------------------------------
+$null = docker context use desktop-windows 2>$null
+$serverOs = docker version --format '{{.Server.Os}}' 2>$null
+if ($serverOs -ne 'windows') {
+    throw "Docker is not on the Windows engine (Server OS='$serverOs'). Switch with: & 'C:\Program Files\Docker\Docker\DockerCli.exe' -SwitchWindowsEngine"
+}
+
+# --- Build the container args --------------------------------------------------
+# A Windows container cannot reach the host's loopback SQL Server directly, and
+# host.docker.internal is not injected for hyperv-isolated Windows containers.
+# Instead we target the Docker NAT gateway IP (the host's 'vEthernet (nat)'
+# adapter); a one-time elevated host portproxy must bridge that IP to loopback:
+#   netsh interface portproxy add v4tov4 listenaddress=<natIP> listenport=1434 `
+#     connectaddress=127.0.0.1 connectport=1434
+$envArgs = @()
+if ($ConnectionString) {
+    if (-not $SqlHost) {
+        $SqlHost = Get-NetIPAddress -InterfaceAlias 'vEthernet (nat)' -AddressFamily IPv4 -ErrorAction SilentlyContinue |
+            Select-Object -First 1 -ExpandProperty IPAddress
+    }
+    if (-not $SqlHost) {
+        throw "Could not determine a container-reachable host IP; pass -SqlHost explicitly."
+    }
+    $cs = $ConnectionString `
+        -replace '127\.0\.0\.1', $SqlHost `
+        -replace '(?i)(?<=[=;\s])localhost(?=[,;]|$)', $SqlHost
+    $envArgs = @('-e', "SNICLOSE_CONNSTR=$cs")
+    Write-Host "Live tests enabled (SQL Server via $SqlHost; requires a host portproxy to 127.0.0.1)." -ForegroundColor Cyan
+}
+else {
+    Write-Host "No connection string: live MARS + stress tests will be skipped." -ForegroundColor Yellow
+}
+
+# Forward soak tuning knobs if set on the host.
+foreach ($name in 'SNICLOSE_SOAK_WORKERS', 'SNICLOSE_SOAK_SECONDS') {
+    $val = [Environment]::GetEnvironmentVariable($name)
+    if ($val) { $envArgs += @('-e', "$name=$val") }
+}
+
+Write-Host "Running tests in $Image (isolation=hyperv) ..." -ForegroundColor Cyan
+$cpuArgs = @()
+if ($Cpus -gt 0) {
+    $cpuArgs = @('--cpu-count', "$Cpus")
+    Write-Host "Container VM constrained to $Cpus processor(s)." -ForegroundColor Cyan
+}
+docker run --rm --isolation=hyperv @cpuArgs @envArgs -v "${outDir}:C:\app" -w 'C:\app' $Image `
+    C:\app\xunit.console.exe C:\app\SniCloseLegacyRepro.dll -parallel none
+
+$code = $LASTEXITCODE
+Write-Host "xunit.console.exe exit code: $code" -ForegroundColor $(if ($code -eq 0) { 'Green' } else { 'Red' })
+exit $code

From 3d18ee0847882c6ccb31bcda06c711626ed522be Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Fri, 24 Jul 2026 10:38:03 -0700
Subject: [PATCH 205/298] Background pool warmup and replenishment for
 ChannelDbConnectionPool (#4452)

* Add background pool warmup spec

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Implement background pool warmup and replenishment for ChannelDbConnectionPool

Adds serial, rate-limited background warmup that pre-creates connections up
to Min Pool Size on Startup and replenishes whenever the pool drops below the
minimum (destroy-on-return, idle-timeout eviction, pruning). Warmup failures
are absorbed without triggering the pool error state, warmup is coalesced to a
single loop, cancels promptly on shutdown, and stops on generation change.

Implements specs/003-pool-warmup/spec.md.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review: cheap warmup fast-path and distinguish rate-limit from failure

- RequestWarmup() now returns early when Count >= MinPoolSize, so hot-path
  callers (e.g. every RemoveConnection) don't schedule a thread-pool work item
  just to run a pass that immediately exits.
- OpenNewInternalConnection(isWarmup: true) now rethrows genuine creation
  failures (still without entering the blocking-period error state) instead of
  absorbing them as null. A null return now unambiguously means the rate limiter
  is saturated. WarmupPassAsync catches real failures, traces, and stops the
  pass rather than retrying on a 50ms cadence, avoiding a noisy spin when opens
  persistently fail.
- Strengthen the failure test to assert warmup does not spin on persistent
  creation failures.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review: quiet expected disposal in Shutdown, assert async request contract

- Shutdown now treats ObjectDisposedException from _warmupCts.Cancel()/Dispose()
  as an expected no-op instead of tracing it as a failure, so it never emits
  misleading trace noise. (Shutdown is already guarded idempotent via the
  _shutdownInitiated CAS, but this hardens the per-step cleanup.)
- Warmup_RateLimiterSaturated_UserSharesSameLimiter now asserts the queued async
  TryGetConnection call returns false with no inline connection, making the
  async-request contract explicit.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review: null-safe owning connection in factory, fix warmup cancellation docs

- SqlConnectionFactory.CreateConnection: guard the User Instance path's write to
  sqlOwningConnection._applyTransientFaultHandling with a null check. Warmup
  creates connections with a null owning connection, which would otherwise
  NullReferenceException for 'User Instance=true' connection strings. Matches the
  null-safe reads already present earlier in the method.
- Correct the _warmupCts field and Shutdown comments: the token stops the warmup
  loop at its await points / pre-create checks, but does not abort an in-progress
  synchronous physical open (the factory does not yet accept a cancellation
  token), so the docs no longer claim behavior the implementation doesn't provide.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review: align spec async wording with implementation

Warmup runs on a background task (never blocking callers, no sync-over-async in
the loop), but the physical connection open is still synchronous because the
factory does not yet expose an async open. Reword the implementation note and
acceptance criterion so the spec no longer claims 'async I/O throughout'.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Make warmup handshake tests deterministic via a scheduler seam

Startup_UserRequestDuringWarmup_ServedImmediately flaked on CI, timing out
while waiting for warmup's first background creation. Root cause is thread-pool
scheduling latency: warmup runs on a queued work item whose first physical
create blocks a worker on the test gate, and under xUnit parallel execution the
shared pool can be momentarily starved, delaying the work item past the wait.

Rather than mutating global ThreadPool.SetMinThreads (which would perturb the
environment other parallel tests share), add a narrow, opt-in test seam: the
pool constructor now accepts an optional warmupLoopScheduler that controls how
the warmup loop is launched. Production is unchanged (defaults to Task.Run); the
warmup tests inject a scheduler that runs the loop on a dedicated thread, so
warmup's gated first create can never be delayed by thread-pool starvation. This
mirrors the existing timeProvider test-injection precedent on the constructor.

Also replace the 5s handshake waits with a generous 30s upper bound (only fires
on a genuine hang) and run the user request on a dedicated thread so the
CreateCount==2 seriality assertion is deterministic. Applied to the three gated
tests that share the handshake primitive.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review: warmup respects error state, condense loop, harden scheduling

- Warmup now respects the pool's blocking-period error state (mirroring the
  WaitHandle pool): the loop stands down while ErrorOccurred is set, though it
  still never enters or clears that state. Added CanWarmup(token) capturing the
  running/cancellation/error-state guard, plus a unit test that drives the pool
  into the error state while warmup is parked mid-create and asserts warmup
  stops instead of replenishing. Updated the spec (Story 3 scenario 4).
- Condensed the warmup region: merged RunWarmupLoopAsync and WarmupPassAsync
  into a single method and factored the repeated loop guard into CanWarmup,
  reducing fragmentation.
- Removed the explicit stale-generation check in the warmup pass; a Clear that
  races an in-flight create is handled by the existing lazy liveness/generation
  check on retrieval. Updated the spec note accordingly.
- Hardened TryStartWarmupLoop: if scheduling the loop throws (injected scheduler
  or Task.Run), release the single-loop guard and trace so warmup isn't pinned
  off for the life of the pool.
- Converted test-method comments to XML <summary> docs.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review: full error-state parity, simpler coalescing, harden warmup loop

- Warmup now fully mirrors the WaitHandle pool's replenishment: it goes through
  the same OpenNewInternalConnection path as user requests, so a genuine open
  failure enters the blocking-period error state and a successful open clears
  it. Removed the isWarmup parameter and all its error-state special-casing;
  warmup-specific behavior (absorbing the rethrow, standing down while blocking)
  now lives entirely in the warmup loop and CanWarmup. Updated Story 3 and the
  two affected tests (a user request during the blocking window now fast-fails).
- Dropped the _warmupRequested counter: coalescing relies solely on the
  _warmupLoopRunning guard, and the single-pass loop re-reads Count each
  iteration to absorb below-minimum drops that happen while it runs. Requests
  arriving while the guard is set are simply dropped.
- Defaulted _warmupLoopScheduler to Task.Run so TryStartWarmupLoop no longer
  needs a null-check conditional.
- RunWarmupLoopAsync now releases the single-loop guard in a finally covering
  every exit path (including the ObjectDisposedException early return), so the
  flag can't be leaked. Documented why the loop is resilient to _warmupCts being
  disposed mid-run (token is read once under a guard; Cancel always precedes
  Dispose, so post-capture reads observe cancellation, not disposal).
- Redesigned the stand-down test to gate the warmup loop's start (its own
  successful create would now clear the error state), and bounded a previously
  unbounded await in the rate-limiter test with a timeout.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Inline single-use warmup helpers; reconcile spec/comments

Merge TryStartWarmupLoop into RequestWarmup and inline the CanWarmup
guard into the warmup loop condition, since each was used from only one
call site. Soften residual CanWarmup references in test comments and the
spec now that the method no longer exists.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Expose warmup task and remove test scheduler seam

Expose the warmup loop as an internal WarmupLoopTask property so tests can
await a pass to deterministic completion instead of polling. Remove the
test-only warmup loop scheduler seam (always use Task.Run) and make
RequestWarmup internal so tests can invoke it directly.

Remove the rate-limit retry loop in RunWarmupLoopAsync: on limiter
saturation the pass now ends, relying on concurrent user creations plus
re-triggering via RemoveConnection to converge to MinPoolSize.

Rewrite the warmup unit tests to await WarmupLoopTask rather than spin-poll,
and drive the error-state stand-down test via a failing user request plus a
direct RequestWarmup invocation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review comments on warmup task exposure

- Make WarmupLoopTask a plain auto-property (test-only, internal) instead of a
  Volatile.Read backing field, and move it into the properties region.
- Release the single-loop guard with Interlocked.Exchange at both reset sites,
  symmetric with the Interlocked.CompareExchange acquire.
- Rewrite Warmup_RateLimiterSaturated to await the deferred user request and
  assert the shared-limiter denial after the pool settles, removing the
  spin-based WaitFor poll.
- Remove the WaitFor and CheckOut test helpers (inlined at their call sites).

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Reconcile warmup spec with implementation

The implementation is the source of truth. Correct drifted claims:
- Pruning respects the Min Pool Size floor and never itself reduces the pool
  below the minimum; reword the Description and Story 5 accordingly.
- Idle-timeout eviction is lazy (on retrieval), not a background sweep.
- Replenishment restores to minimum in a single pass only when not racing a
  concurrent drain (Clear) or a saturated rate limiter; otherwise convergence
  completes across re-triggered passes.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Fix flaky rate-limiter warmup test and guard error state after shutdown

- Fix CI failure in Warmup_RateLimiterSaturated_UserSharesSameLimiter: the
  post-settle TotalFailedLeases assertion raced the permit being released, so
  the deferred user request could acquire the freed permit and never record a
  denial. Prove shared-limiter saturation deterministically instead, by
  attempting to acquire the limiter's only permit from the test thread while
  warmup still holds it (a no-op denied lease), with no spin.
- Bound AwaitWarmupToMinimum with HandshakeTimeout so a regression that never
  reaches the minimum surfaces as a deterministic timeout instead of hanging
  the test run.
- Only enter the blocking-period error state while the pool is Running: an
  in-flight synchronous open can fail after Shutdown has disposed _errorState,
  and entering then would re-arm its exit timer past teardown.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review: add idle-timeout eviction replenishment test; add CreateCount to DoomableConnectionFactory

- Add Replenish_AfterIdleTimeoutEviction_RefillsToMinimum test (Story 5): covers the
  case where an idle connection is evicted by IsLiveConnection due to idle-timeout,
  dropping the pool below MinPoolSize and triggering replenishment via
  RemoveConnection -> RequestWarmup. The test backdates ReturnedTime to simulate
  expiry, verifies TryGetConnection evicts the stale connection and returns the
  fresh one, then awaits WarmupLoopTask and asserts CreateCount increased by 1 and
  pool.Count returns to MinPoolSize.
- Add CreateCount tracking to DoomableConnectionFactory so replenishment tests can
  assert exactly how many physical connections were created.
- Add using Microsoft.Data.SqlClient.Tests.Common for LocalAppContextSwitchesHelper.
- Update PR description: remove stale 'test seam' mention; RequestWarmup now always
  uses Task.Run directly.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Make rate-limiter pool tests deterministic without spin/timing

Replace the flaky SpinWait polling in three ChannelDbConnectionPool
rate-limiter tests with deterministic invariants, eliminating the CI
timeouts (e.g. 'Timed out waiting for the second request to be denied
by the rate limiter'). No production code changes.

- RateLimiter_PermitDenied_ReusesReturnedConnection: rely on the held
  permit - while it is held every AttemptAcquire is denied, so the
  waiting request can never create and must reuse the returned
  connection. Drop the SpinWait on TotalFailedLeases.

- RateLimiter_LeaseReleaseWakesRateLimitedWaiter_CreatesPhysicalConnection:
  bump maxPoolSize 2->3 so the lease-release poke (gated on
  ReservationCount < MaxPoolSize) always fires even while the denied
  waiter still holds its transient slot reservation; the unbounded idle
  channel buffers the poke so it is never lost. Drop the SpinWait.

- RateLimiter_LeaseDisposedOnFailure_DoesNotStarvePool: the lease is
  disposed in the createCallback finally before the failure completes
  the awaited request, so after all opens throw the permits are already
  back. Replace the SpinWait with a direct assert.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Align rate-limiter test names/descriptions with deterministic behavior

The deterministic rewrites weakened some guarantees these tests' names
and summaries claimed, so update them to match what is now verified.

- Rename RateLimiter_LeaseReleaseWakesRateLimitedWaiter_CreatesPhysicalConnection
  to RateLimiter_LeaseReleaseAllowsRateLimitedWaiterToCreatePhysicalConnection:
  the parked-and-woken path is no longer guaranteed every run, so drop the
  'Wakes' claim and rewrite the summary to describe the interleaving-robust
  invariant (the single permit serializes the opens; B creates its own
  connection once A releases its lease).

- RateLimiter_PermitDenied_ReusesReturnedConnection: reword the summary to
  drop 'falls back to waiting' (a park is no longer guaranteed) and state the
  held-permit invariant that makes reuse the only possible outcome.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address Copilot review comments on warmup path

- ChannelDbConnectionPool: filter both warmup catch-all blocks with
  ADP.IsCatchableExceptionType so non-catchable exceptions (e.g.
  OutOfMemoryException) propagate instead of being absorbed into a pool
  that keeps running in a corrupted state; the single-loop guard is still
  released on every path.
- WarmupTest.AwaitWarmupToMinimum: wait briefly instead of re-requesting in
  a tight loop when no warmup task is published yet, so the bounded wait
  never busy-spins a CPU core on loaded CI.
- WarmupTest: wrap the three gated tests in try/finally so createGate is
  always released even if an assertion throws, so warmup's parked creation
  in the gated factory never strands a thread-pool thread.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Make idle-timeout eviction test deterministic via injected TimeProvider

Route the ChannelDbConnectionPool idle-timeout stamp (ReturnInternalConnection)
and expiry check (IsLiveConnection) through a single injected TimeProvider,
defaulting to TimeProvider.System so production behavior is unchanged. Add a
SetReturnedTime(DateTime) overload on DbConnectionInternal so the pool can
source the return stamp from that provider.

Rewrite Replenish_AfterIdleTimeoutEviction_RefillsToMinimum to inject a
FakeTimeProvider and Advance() the clock past the timeout between returning the
two connections, so exactly one connection expires. This removes the wall-clock
race that could evict both connections under a slow agent/CI and produce an
extra create, making the create-count assertion deterministic.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 specs/003-pool-warmup/spec.md                 |  95 +++
 .../Data/ProviderBase/DbConnectionInternal.cs |  15 +-
 .../ConnectionPool/ChannelDbConnectionPool.cs | 332 +++++++-
 .../Data/SqlClient/SqlConnectionFactory.cs    |  10 +-
 .../ChannelDbConnectionPoolTest.cs            |  83 +-
 .../ChannelDbConnectionPoolWarmupTest.cs      | 728 ++++++++++++++++++
 6 files changed, 1205 insertions(+), 58 deletions(-)
 create mode 100644 specs/003-pool-warmup/spec.md
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs

diff --git a/specs/003-pool-warmup/spec.md b/specs/003-pool-warmup/spec.md
new file mode 100644
index 0000000000..8c41b88470
--- /dev/null
+++ b/specs/003-pool-warmup/spec.md
@@ -0,0 +1,95 @@
+# Feature Specification: Background Pool Warmup
+
+**Feature Branch**: `dev/mdaigle/pool-warmup` (branched from `dev/mdaigle/pool-channel-rate-limiting`)  
+**Created**: 2026-07-16  
+**Status**: Draft  
+
+## Description
+
+Implement background pool warmup for `ChannelDbConnectionPool`. When the pool starts, it asynchronously pre-creates connections up to Min Pool Size in the background, serially (one at a time), through the shared rate-limiting mechanism used by user-initiated requests.
+
+Whenever the pool count drops below Min Pool Size for any reason (a connection destroyed on return, idle-timeout eviction, or any other removal that crosses the floor), the pool automatically triggers replenishment using the same serial, rate-limited creation path. Pruning itself respects the Min Pool Size floor and never reduces the pool below the minimum; it is only mentioned here because it shares the same removal choke point that triggers replenishment.
+
+## User Scenarios & Testing
+
+### User Story 1 — Background Warmup on Pool Creation (P1)
+
+When a pool is created with Min Pool Size > 0, it pre-creates connections in the background so early application requests find ready-to-use connections.
+
+**Acceptance Scenarios**:
+
+1. **Given** a pool is created with minimum pool size of N, **When** startup completes, **Then** the pool begins creating connections in the background up to N.
+2. **Given** a pool is warming up, **When** a user opens a connection before warmup finishes, **Then** the user request is served immediately without waiting for warmup to complete.
+3. **Given** a pool is warming up, **When** warmup creates each connection, **Then** each connection is created one at a time (serially), not in parallel.
+
+---
+
+### User Story 2 — Warmup Through Shared Rate Limiter (P1)
+
+Warmup creates connections through the same rate-limiting mechanism as user-initiated requests, preventing warmup from overwhelming the server.
+
+**Acceptance Scenarios**:
+
+1. **Given** warmup is creating connections, **When** a user request also needs a new connection, **Then** both warmup and user requests compete fairly through the shared rate limiter.
+2. **Given** the rate limiter is at capacity, **When** warmup attempts to create the next connection, **Then** warmup does not bypass the limiter: it ends the current pass without creating (rather than spinning or waiting on a permit). Saturation only occurs while user requests are actively creating connections, which fill the pool themselves; any later drop below the minimum re-triggers warmup once capacity has freed up.
+
+---
+
+### User Story 3 — Warmup Failure Resilience (P1)
+
+If a connection fails to open during warmup, the failure is silently absorbed on the warmup loop — it is never propagated to the caller as an unhandled exception. Warmup participates in the pool's blocking-period error state exactly like an on-demand creation (mirroring the legacy WaitHandle pool): a genuine open failure enters the error state, and a successful open clears it. The pool remains operational — once the blocking period expires, user requests create connections on demand as needed.
+
+**Acceptance Scenarios**:
+
+1. **Given** warmup is in progress, **When** a connection fails to open, **Then** the failure is traced/logged and absorbed by the warmup loop rather than surfacing as an unhandled exception.
+2. **Given** warmup fails and has entered the blocking-period error state, **When** a user opens a connection during the blocking window, **Then** the user request fast-fails with the cached exception (matching the WaitHandle pool); once the blocking period expires it creates a connection on demand and succeeds normally.
+3. **Given** warmup's open fails, **When** the pool's error state is checked, **Then** the pool IS in the blocking-period error state — warmup uses the same shared creation path as user requests and enters/clears that state identically.
+4. **Given** the pool is already in the blocking-period error state (driven there by a failing request), **When** warmup would otherwise replenish, **Then** warmup stands down while the error state is active rather than piling more doomed opens onto a struggling server (the warmup loop skips replenishment while `ErrorOccurred`, mirroring the WaitHandle pool).
+
+---
+
+### User Story 4 — Warmup Cancellation on Shutdown (P2)
+
+When a pool is shut down while warmup is still in progress, warmup stops promptly. No new connections are created after shutdown begins.
+
+**Acceptance Scenarios**:
+
+1. **Given** warmup is in progress, **When** the pool is shut down, **Then** warmup stops and no further connections are created.
+2. **Given** warmup is in progress, **When** the pool is shut down, **Then** any connections already created by warmup are cleaned up as part of normal shutdown.
+
+---
+
+### User Story 5 — Replenishment on Any Below-Minimum Event (P2)
+
+Whenever the pool count drops below Min Pool Size, the pool automatically triggers warmup-style replenishment to restore to the minimum. Every connection removal funnels through a single choke point (`RemoveConnection`), which triggers replenishment when the removal leaves the pool below the minimum.
+
+**Acceptance Scenarios**:
+
+1. **Given** a pruning cycle runs, **When** it removes idle connections, **Then** it stops at the Min Pool Size floor and does not reduce the pool below the minimum (pruning shares the removal choke point but does not itself cause a below-minimum replenishment).
+2. **Given** a connection is destroyed on return to the pool (broken, lifetime expired), **When** the pool count drops below the minimum, **Then** the pool queues a replenishment request.
+3. **Given** idle-timeout eviction removes an expired connection on retrieval, **When** the pool count drops below minimum, **Then** the pool queues a replenishment request.
+4. **Given** replenishment is triggered, **When** connections are created, **Then** they are created serially through the shared rate limiter, identical to initial warmup.
+5. **Given** the pool is at or above the minimum pool size, **When** a connection is destroyed, **Then** no replenishment is triggered.
+
+## Implementation Notes
+
+- Warmup starts automatically when the pool's `Startup()` is called.
+- Warmup runs on a background task, so it never blocks the caller (`Startup`/connection return) and uses no sync-over-async in the loop. The physical connection open itself is currently synchronous (executed on the background task); the connection factory does not yet expose an async open.
+- Creates connections serially (one at a time) through the shared rate limiter. If the limiter is saturated (no permit available), warmup ends the pass rather than bypassing or spinning on the limiter; convergence to the minimum is handled by the concurrent user creations that saturated it and by re-triggering on the next below-minimum event.
+- Warmup failures are traced/logged and absorbed by the warmup loop (never surfaced as an unhandled exception). Warmup goes through the same shared creation path as user requests, so a genuine open failure enters the blocking-period error state and a successful open clears it (mirroring the WaitHandle pool). While the error state is active, the warmup loop stands down rather than replenishing.
+- If a `Clear` races with an in-flight warmup creation, the freshly created (now stale-generation) connection is not special-cased by warmup; it is harmlessly discarded by the liveness/generation check on its next retrieval. After a `Clear`, replenishment refills the pool to the minimum with fresh-generation connections.
+- Idle-timeout eviction is lazy: an idle connection past its timeout is removed when it is next retrieved (via the liveness check), not by a background sweep. Pruning is separate and always respects the Min Pool Size floor.
+- Concurrent warmup/replenishment requests are coalesced — a single `_warmupLoopRunning` guard ensures only one warmup loop executes at a time, and requests that arrive while it is running are dropped (the running loop re-reads the pool count each iteration and drives to the minimum on its own).
+- Warmup is a no-op when Min Pool Size = 0.
+
+## Acceptance Criteria
+
+- When a pool starts with Min Pool Size > 0, background warmup begins immediately.
+- After warmup completes, the pool contains Min Pool Size idle connections.
+- Warmup runs on a background task without blocking callers and without sync-over-async in the loop (the physical open is currently synchronous, executed on the background task, pending async-open support in the factory).
+- Warmup connections are created serially through the shared rate limiter.
+- Warmup errors are traced/logged and never crash the application. Because warmup shares the on-demand creation path, a genuine open failure enters the pool's blocking-period error state (as it would for a user request) and a successful open clears it.
+- If the pool is shut down or cleared during warmup, warmup stops gracefully.
+- After any event that reduces the pool below Min Pool Size, the pool restores to the minimum through replenishment: a single warmup pass suffices when it is not racing a concurrent drain (e.g. `Clear`) or a saturated rate limiter; otherwise convergence completes across subsequent re-triggered passes.
+- Concurrent warmup/replenishment requests are coalesced so only one warmup loop executes at a time.
+- Unit tests validate warmup behavior for various Min Pool Size values (0, 1, N) and all replenishment triggers.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
index 7e0ef67b94..00df93f788 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -98,7 +98,7 @@ internal DbConnectionInternal(ConnectionState state, bool hidePassword, bool all
 
         /// <summary>
         /// UTC timestamp of when this connection was last returned to the pool.
-        /// Stamped by <see cref="SetReturnedTime"/>. Initialized to <see cref="CreateTime"/> in the constructor
+        /// Stamped by <see cref="SetReturnedTime()"/>. Initialized to <see cref="CreateTime"/> in the constructor
         /// so a freshly built connection is treated as "just used" until its first return.
         /// Internal setter exists to support deterministic unit tests without reflection.
         /// The pool reads this value to decide whether the connection has sat idle longer than the configured idle timeout.
@@ -745,7 +745,18 @@ internal void PostPop(DbConnection newOwner)
         /// </summary>
         internal void SetReturnedTime()
         {
-            ReturnedTime = DateTime.UtcNow;
+            SetReturnedTime(DateTime.UtcNow);
+        }
+
+        /// <summary>
+        /// Stamps <see cref="ReturnedTime"/> with the supplied UTC time. Lets the pool source the
+        /// timestamp from its configured <see cref="System.TimeProvider"/> so the return stamp and the
+        /// idle-timeout expiry check read the same clock, which tests use to drive idle expiry
+        /// deterministically. Callers must pass a UTC value.
+        /// </summary>
+        internal void SetReturnedTime(DateTime utcNow)
+        {
+            ReturnedTime = utcNow;
         }
 
         internal void PrePush(DbConnection expectedOwner)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 298c38b9db..63910c331e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -121,12 +121,36 @@ internal sealed class ChannelDbConnectionPool : IDbConnectionPool, IDisposable
         /// </summary>
         private readonly ConcurrencyLimiter? _connectionCreationRateLimiter;
 
+        /// <summary>
+        /// Time source for idle-timeout expiry and the blocking-period exit timer. Defaults to
+        /// <see cref="TimeProvider.System"/> in production; tests inject a fake provider so idle
+        /// expiry and the blocking period can be driven deterministically without real waits.
+        /// </summary>
+        private readonly TimeProvider _timeProvider;
+
         /// <summary>
         /// Encapsulates the blocking-period error state for this pool: cached exception, exponential
         /// backoff timer, and synchronization. Created only when blocking period is enabled for
         /// this pool group. See <see cref="BlockingPeriodErrorState"/>.
         /// </summary>
         private readonly BlockingPeriodErrorState? _errorState;
+
+        /// <summary>
+        /// Cancels in-flight background warmup/replenishment when the pool shuts down so no new
+        /// connections are created after shutdown begins (Story 4). The token is observed at the
+        /// warmup loop's await points and before each creation attempt, so it stops the loop and
+        /// prevents further attempts promptly. It cannot abort an already in-progress physical open:
+        /// that path is synchronous and the connection factory does not yet accept a cancellation
+        /// token (see the TODO in <see cref="OpenNewInternalConnection"/>).
+        /// </summary>
+        private readonly CancellationTokenSource _warmupCts = new();
+
+        /// <summary>
+        /// Coalescing guard ensuring only one warmup loop executes at a time. Transitioned
+        /// 0 -> 1 via <see cref="Interlocked.CompareExchange(ref int, int, int)"/> by the first
+        /// requester to start the loop, and reset to 0 by the loop when it drains.
+        /// </summary>
+        private int _warmupLoopRunning;
         #endregion
 
         /// <summary>
@@ -149,15 +173,16 @@ internal ChannelDbConnectionPool(
             MaxPoolSize = Convert.ToUInt32(PoolGroupOptions.MaxPoolSize);
             TransactedConnectionPool = new(this);
             _connectionCreationRateLimiter = connectionCreationRateLimiter;
+            // timeProvider is injected only by tests so idle-timeout expiry and the blocking-period
+            // exit timer can be driven deterministically; in production it is null and falls back to
+            // TimeProvider.System, whose UTC time equals DateTime.UtcNow.
+            _timeProvider = timeProvider ?? TimeProvider.System;
 
             _connectionSlots = new(MaxPoolSize);
             _idleChannel = new();
             if (PoolGroup.IsBlockingPeriodEnabled())
             {
-                // timeProvider is injected only by tests so the blocking-period exit timer can be
-                // driven deterministically; in production it is null and the error state falls back
-                // to TimeProvider.System.
-                _errorState = new BlockingPeriodErrorState(_instanceId, timeProvider: timeProvider);
+                _errorState = new BlockingPeriodErrorState(_instanceId, timeProvider: _timeProvider);
             }
 
             // Pruning is only useful when the pool can grow beyond MinPoolSize.
@@ -221,6 +246,16 @@ public ConcurrentDictionary<
         private uint MaxPoolSize { get; }
 
         private int MinPoolSize => PoolGroupOptions.MinPoolSize;
+
+        /// <summary>
+        /// The most recently launched warmup/replenishment loop task, exposed so tests can await a
+        /// warmup pass to a deterministic completion instead of polling pool counters. May be null
+        /// (warmup never requested) or reference an already-completed pass (requests are coalesced);
+        /// a caller that only needs "some warmup pass has finished" can await it regardless. Only
+        /// consumed by unit tests, which read it after synchronously triggering warmup on their own
+        /// thread, so a plain auto-property is sufficient.
+        /// </summary>
+        internal Task? WarmupLoopTask { get; private set; }
         #endregion
 
         #region Methods
@@ -296,12 +331,12 @@ public void ReturnInternalConnection(DbConnectionInternal connection, DbConnecti
             // measures time-in-pool, not time-since-last-return. Without this, a connection whose
             // checkout exceeded IdleTimeout (e.g. a long-running query) would be wrongly evicted on
             // return even though it was actively in use on the wire. The same gating conditions are
-            // applied here as in IsLiveConnection so we avoid the per-return DateTime.UtcNow when
+            // applied here as in IsLiveConnection so we avoid the per-return timestamp read when
             // idle expiry is disabled or the legacy idle-timeout behavior is in effect.
             if (!LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior &&
                 PoolGroupOptions.IdleTimeout != TimeSpan.Zero)
             {
-                connection.SetReturnedTime();
+                connection.SetReturnedTime(_timeProvider.GetUtcNow().UtcDateTime);
             }
 
             if (!IsLiveConnection(connection))
@@ -349,6 +384,26 @@ public void Shutdown()
             // routes returning connections to RemoveConnection.
             State = ShuttingDown;
 
+            // Cancel any in-flight background warmup/replenishment so no new connections are
+            // created after shutdown begins (Story 4). The warmup loop also observes the
+            // State transition above; cancelling here stops the loop promptly by tripping its
+            // await points and pre-create checks. It does not abort an already in-progress
+            // synchronous physical open (see _warmupCts field docs). Cancel is idempotent.
+            try
+            {
+                _warmupCts.Cancel();
+            }
+            catch (ObjectDisposedException)
+            {
+                // Expected no-op: the cancellation source is already disposed, so there is nothing
+                // left to cancel. This is not a failure, so it is not traced.
+            }
+            catch (Exception ex)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, _warmupCts.Cancel threw, continuing shutdown: {1}", Id, ex);
+            }
+
             // Each cleanup step is independent and best-effort. A failure in one step must not
             // prevent later steps from running, otherwise the pool can be left half-shut-down
             // (e.g. timer disposed but channel never completed -> waiters stuck forever).
@@ -422,6 +477,23 @@ public void Shutdown()
                         "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, RemoveConnection threw during drain, continuing: {1}", Id, ex);
                 }
             }
+
+            // Release the warmup cancellation source now that the loop has been signalled to stop
+            // and no further connections will be created. Dispose is best-effort and idempotent.
+            try
+            {
+                _warmupCts.Dispose();
+            }
+            catch (ObjectDisposedException)
+            {
+                // Expected no-op: the cancellation source is already disposed. Dispose is documented
+                // as safe to call repeatedly, so this is not a failure and is not traced.
+            }
+            catch (Exception ex)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, _warmupCts.Dispose threw, continuing shutdown: {1}", Id, ex);
+            }
         }
 
         /// <summary>
@@ -432,14 +504,16 @@ public void Shutdown()
         /// <inheritdoc />
         public void Startup()
         {
-            // Startup is currently a no-op for this pool: State is set to Running in the
-            // constructor, and PoolPruner (when present, i.e. MinPoolSize < MaxPoolSize) is
-            // also constructed eagerly there; its timer arms/disarms via UpdateTimer() calls
-            // from OpenNewInternalConnection and RemoveConnection as the pool grows/shrinks.
-            // This method exists as the symmetrical counterpart of Shutdown and as a hook
-            // for future warmup behavior.
+            // State is set to Running in the constructor, and PoolPruner (when present, i.e.
+            // MinPoolSize < MaxPoolSize) is also constructed eagerly there; its timer arms/disarms
+            // via UpdateTimer() calls from OpenNewInternalConnection and RemoveConnection as the
+            // pool grows/shrinks.
             SqlClientEventSource.Log.TryPoolerTraceEvent(
                 "<prov.DbConnectionPool.Startup|RES|INFO|CPOOL> {0}", Id);
+
+            // Kick off background warmup so the pool pre-creates connections up to MinPoolSize
+            // without blocking the caller (Story 1). No-op when MinPoolSize == 0.
+            RequestWarmup();
         }
 
         /// <inheritdoc />
@@ -571,7 +645,11 @@ public bool TryGetConnection(
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            // Fast-fail in the error state. FR-006.
+            // Fast-fail if the pool is in the blocking-period error state. FR-006. Warmup goes
+            // through this same path (it has no isWarmup exemption): it mirrors the legacy WaitHandle
+            // pool, whose replenishment enters/clears the same error state as user requests. In
+            // practice the warmup loop already stands down before reaching here (its loop condition
+            // checks ErrorOccurred); this covers the narrow race where the state flips in between.
             _errorState?.ThrowIfActive();
 
             try
@@ -688,8 +766,9 @@ _connectionCreationRateLimiter is not null &&
                     // start the pruning timer so idle connections can be reclaimed.
                     Pruner?.UpdateTimer();
 
-                    // A successful creation clears error/backoff state
-                    // FR-009.
+                    // A successful creation clears error/backoff state (FR-009). Warmup goes through
+                    // this same path and clears the state on success too, mirroring the legacy
+                    // WaitHandle pool: a connection that opens proves the server is reachable.
                     _errorState?.Clear();
                 }
 
@@ -697,13 +776,27 @@ _connectionCreationRateLimiter is not null &&
             }
             catch (Exception ex) when (ADP.IsCatchableExceptionType(ex) && ex is not OperationCanceledException)
             {
-                // Enter the blocking period error state on creation failure if configured.
+                // Enter the blocking period error state on creation failure if configured. Warmup
+                // goes through this same path (the warmup loop absorbs the rethrow in its own catch),
+                // mirroring the legacy WaitHandle pool, whose replenishment failures also enter the
+                // error state.
+                //
                 // We deliberately exclude OperationCanceledException: that is thrown when the
                 // caller's own timeout/cancellation budget expires while waiting, which is
                 // client-side contention rather than a physical connection creation failure and
                 // must not poison the pool into fast-fail/backoff for other callers.
                 // FR-006, FR-007.
-                _errorState?.Enter(ex);
+                //
+                // Only enter the error state while the pool is still Running. A synchronous physical
+                // open cannot be cancelled once it is in progress (see _warmupCts field docs), so a
+                // warmup/user open that began before Shutdown can complete with a failure after
+                // Shutdown has already disposed _errorState. Entering here would re-arm the exit
+                // timer and keep callbacks/logging alive past teardown, so we skip it once shutdown
+                // has begun; the throw below still propagates the failure to the caller/warmup loop.
+                if (State == Running)
+                {
+                    _errorState?.Enter(ex);
+                }
 
                 throw;
             }
@@ -721,13 +814,15 @@ private bool IsLiveConnection(DbConnectionInternal connection)
             // connection is discarded without an SNI round-trip.
             // ReturnedTime is initialized to CreateTime so a freshly minted connection never trips this
             // check on first retrieval, and is then stamped by ReturnInternalConnection on every return.
+            // Uses the pool's TimeProvider (TimeProvider.System in production) so the return stamp and
+            // this expiry check read the same clock, letting tests drive idle expiry deterministically.
             // Use subtraction rather than addition so the comparison cannot throw if ReturnedTime is
             // ever close to DateTime.MaxValue. A clock skew that leaves ReturnedTime in the future
             // produces a negative TimeSpan, which falls through as not-expired (fail safe).
             TimeSpan idleTimeout = PoolGroupOptions.IdleTimeout;
             if (!LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior &&
                 idleTimeout != TimeSpan.Zero &&
-                DateTime.UtcNow - connection.ReturnedTime > idleTimeout)
+                _timeProvider.GetUtcNow().UtcDateTime - connection.ReturnedTime > idleTimeout)
             {
                 return false;
             }
@@ -770,6 +865,14 @@ private void RemoveConnection(DbConnectionInternal connection)
 
             // If this removal brought us back to MinPoolSize, disable the pruning timer.
             Pruner?.UpdateTimer();
+
+            // Any removal that drops the pool below MinPoolSize triggers replenishment through the
+            // shared serial, rate-limited warmup path (Story 5). This is the single choke point for
+            // every below-minimum event: connections destroyed on return (broken/lifetime), idle
+            // timeout eviction, and pruning all funnel through RemoveConnection. RequestWarmup is a
+            // no-op when MinPoolSize == 0, the pool is not Running, or a warmup loop is already
+            // running/queued, so calling it unconditionally here is cheap.
+            RequestWarmup();
         }
 
         /// <summary>
@@ -962,6 +1065,199 @@ private void ValidateOwnershipAndSetPoolingState(DbConnectionInternal connection
         }
         #endregion
 
+        #region Warmup
+        /// <summary>
+        /// Requests background warmup/replenishment: the pool asynchronously pre-creates connections
+        /// up to <see cref="MinPoolSize"/>, serially and through the shared rate limiter. Safe to
+        /// call from any thread and from hot paths; it is cheap and non-blocking.
+        ///
+        /// This is the single entry point for every warmup trigger: pool startup and any event that
+        /// drops the pool below <see cref="MinPoolSize"/> (connection destruction on return, idle
+        /// timeout eviction, pruning). It is also invoked directly by tests to exercise the loop
+        /// deterministically. Concurrent requests are coalesced by the
+        /// <see cref="_warmupLoopRunning"/> guard so that only one warmup loop ever runs at a time: a
+        /// request that arrives while a loop is already running is simply dropped, because that loop
+        /// re-reads <see cref="Count"/> on every iteration and will drive the pool to
+        /// <see cref="MinPoolSize"/> regardless.
+        /// </summary>
+        internal void RequestWarmup()
+        {
+            // No-op when there is nothing to pre-create (MinPoolSize == 0), the pool is not running,
+            // or shutdown has cancelled background activity.
+            if (MinPoolSize == 0 || State != Running || _warmupCts.IsCancellationRequested)
+            {
+                return;
+            }
+
+            // Fast path: the pool is already at or above the minimum, so there is nothing to warm
+            // up. Return before scheduling a thread-pool work item. This keeps hot-path callers
+            // (e.g. RemoveConnection on every return) cheap. The check is best-effort under
+            // concurrency; a below-minimum condition missed here is still observed by the running
+            // loop, which re-reads Count on every iteration.
+            if (Count >= MinPoolSize)
+            {
+                return;
+            }
+
+            // Coalesce: only start a loop if one is not already running.
+            if (Interlocked.CompareExchange(ref _warmupLoopRunning, 1, 0) != 0)
+            {
+                return;
+            }
+
+            try
+            {
+                // Fire-and-forget on the thread pool so warmup never blocks the caller. The loop
+                // absorbs its own exceptions and always releases the single-loop guard on exit. The
+                // task is published so tests can await a warmup pass to a deterministic completion.
+                WarmupLoopTask = Task.Run(RunWarmupLoopAsync);
+            }
+            catch (Exception ex)
+            {
+                // Scheduling the loop failed (e.g. the thread pool refused the work item). Release the
+                // guard so warmup isn't permanently pinned off for the life of the pool; the next
+                // below-minimum trigger will try again. Release the guard for every exception, but
+                // only absorb catchable ones - a non-catchable exception (e.g. OutOfMemoryException)
+                // must not be swallowed into a pool that keeps running in a potentially corrupted state.
+                Interlocked.Exchange(ref _warmupLoopRunning, 0);
+                if (!ADP.IsCatchableExceptionType(ex))
+                {
+                    throw;
+                }
+
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.RequestWarmup|RES|CPOOL> {0}, Failed to schedule warmup loop, absorbing: {1}", Id, ex);
+            }
+        }
+
+        /// <summary>
+        /// The coalesced warmup loop: creates connections one at a time (serially) up to
+        /// <see cref="MinPoolSize"/>, then releases the single-loop guard. Each creation goes through
+        /// the same slot-reservation and rate-limited path as user requests
+        /// (<see cref="OpenNewInternalConnection"/>), and freshly created connections are published
+        /// to the idle channel for waiting or future user requests. All failures are absorbed so
+        /// warmup can never surface an unhandled exception (Story 3); a genuine open failure still
+        /// enters the pool's blocking-period error state via the shared creation path, mirroring the
+        /// legacy WaitHandle pool.
+        /// </summary>
+        private async Task RunWarmupLoopAsync()
+        {
+            try
+            {
+                CancellationToken token;
+                try
+                {
+                    token = _warmupCts.Token;
+                }
+                catch (ObjectDisposedException)
+                {
+                    // The pool shut down and disposed the cancellation source before this loop
+                    // started. There is nothing to warm up; the finally releases the guard.
+                    return;
+                }
+
+                // Single pass: re-reads Count each iteration, so any below-minimum drop that happens
+                // while the loop is running is picked up here without a separate request flag.
+                //
+                // The loop keeps creating while the pool is running, shutdown has not cancelled
+                // background work, and the pool is not in the blocking-period error state. While user
+                // requests are failing and the pool is blocking (ErrorOccurred), warmup stands down
+                // rather than piling more doomed opens onto a struggling server - mirroring the legacy
+                // WaitHandle pool, which skips replenishment while blocking. (Warmup still
+                // participates in the error state on its own creations - entering it on failure and
+                // clearing it on success - via OpenNewInternalConnection.)
+                while (State == Running
+                    && !token.IsCancellationRequested
+                    && !ErrorOccurred
+                    && Count < MinPoolSize)
+                {
+                    // Fresh per-attempt timeout budget based on the pool's CreationTimeout, since
+                    // warmup has no owning Open() call to inherit a budget from. Matches the
+                    // replenishment behavior of the legacy WaitHandle pool.
+                    TimeoutTimer timeout = TimeoutTimer.StartNew(
+                        TimeSpan.FromMilliseconds(PoolGroupOptions.CreationTimeout));
+
+                    DbConnectionInternal? connection;
+                    try
+                    {
+                        // owningConnection is null: warmup connections are created unattached and
+                        // enter the pool as idle. A null return means the shared rate limiter was
+                        // saturated; a thrown exception means the physical open genuinely failed.
+                        connection = OpenNewInternalConnection(
+                            owningConnection: null,
+                            cancellationToken: token,
+                            timeout: timeout);
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        // Shutdown/cancellation unwound the in-flight create. Stop warming up.
+                        break;
+                    }
+                    catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
+                    {
+                        // A genuine connection-open failure (not rate limiting). It has already
+                        // entered the pool's blocking-period error state (see OpenNewInternalConnection);
+                        // trace and absorb the rethrow here, then stop this pass rather than retrying
+                        // on a tight cadence. The pool stays operational: user requests fast-fail
+                        // during the blocking window and resume creating on demand once it expires,
+                        // and the next below-minimum trigger re-requests warmup (Story 3).
+                        SqlClientEventSource.Log.TryPoolerTraceEvent(
+                            "<prov.DbConnectionPool.RunWarmupLoopAsync|RES|CPOOL> {0}, Warmup connection creation failed, stopping pass: {1}", Id, ex);
+                        break;
+                    }
+
+                    if (connection is null)
+                    {
+                        // A slot is guaranteed available here (Count < MinPoolSize <= MaxPoolSize),
+                        // and creation failures throw rather than return null, so a null return means
+                        // the shared rate limiter is currently saturated. Rather than bypassing the
+                        // limiter or spinning on it (Story 2), end this warmup pass. Saturation only
+                        // happens while user requests are actively creating connections - those very
+                        // creations fill the pool toward MinPoolSize, and any later drop below the
+                        // minimum re-triggers warmup through RemoveConnection - so warmup does not need
+                        // to compete for a permit here.
+                        break;
+                    }
+
+                    // Publish the freshly created connection as idle. It was PrePush'd at creation
+                    // (CreatePooledConnection) and never activated, so it is in the correct state
+                    // to enter the idle channel directly. If a Clear raced and bumped the
+                    // generation, the stale connection is harmlessly removed by IsLiveConnection
+                    // on its next retrieval, so we don't check the generation here.
+                    if (!_idleChannel.TryWrite(connection))
+                    {
+                        // Channel completed (pool shutting down). Destroy instead of pooling.
+                        RemoveConnection(connection);
+                        break;
+                    }
+
+                    // OpenNewInternalConnection is synchronous and blocks the loop's thread for
+                    // the duration of the physical open. Yield between creations so a multi-
+                    // connection warmup returns its thread-pool worker to the scheduler between
+                    // opens (rather than monopolizing one worker for the whole sequence) and stays
+                    // responsive to cancellation. There is no sync-over-async anywhere in this path.
+                    await Task.Yield();
+                }
+            }
+            catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
+            {
+                // Defense in depth: the loop must never throw a catchable exception onto the thread
+                // pool. A non-catchable exception (e.g. OutOfMemoryException) is left to propagate
+                // rather than absorbed into a pool that keeps running in a potentially corrupted
+                // state; the finally below still releases the single-loop guard on that path.
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.RunWarmupLoopAsync|RES|CPOOL> {0}, Warmup loop failed, absorbing: {1}", Id, ex);
+            }
+            finally
+            {
+                // Always release the single-loop guard, whatever exit path we took, so a future
+                // below-minimum trigger can start a new loop. Interlocked.Exchange mirrors the
+                // Interlocked.CompareExchange acquire in RequestWarmup.
+                Interlocked.Exchange(ref _warmupLoopRunning, 0);
+            }
+        }
+        #endregion
+
         #region Pruning
         /// <summary>
         /// Manages idle connection pruning. Null when the pool is fixed-size (MinPoolSize >= MaxPoolSize)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index 3aa89f5332..8840864958 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -650,8 +650,14 @@ protected virtual DbConnectionInternal CreateConnection(
                         //     used below to connect to the SQL Express User Instance.
                         instanceName = sseConnection.InstanceName;
 
-                        // Set future transient fault handling based on connection options
-                        sqlOwningConnection._applyTransientFaultHandling = opt != null && opt.ConnectRetryCount > 0;
+                        // Set future transient fault handling based on connection options.
+                        // sqlOwningConnection is null for background warmup/replenishment creations,
+                        // which have no owning connection to carry this state forward; only propagate
+                        // it when an owning connection is present (matches the null-safe reads above).
+                        if (sqlOwningConnection != null)
+                        {
+                            sqlOwningConnection._applyTransientFaultHandling = opt != null && opt.ConnectRetryCount > 0;
+                        }
 
                         if (!instanceName.StartsWith(@"\\.\", StringComparison.Ordinal))
                         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index ec596ae16d..9d24200b17 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -1859,15 +1859,17 @@ public void RateLimiter_SuccessfulCreate_ReleasesLeaseForNextCreate()
         }
 
         /// <summary>
-        /// Verifies the FR-004 wake path: a caller blocked purely because the rate limiter denied
-        /// its permit is woken when a different caller releases its lease, and then creates its own
-        /// physical connection (rather than reusing one, since the permit holder never returns its
-        /// connection). Exercises both the sync and async idle-channel wait mechanisms.
+        /// Verifies the FR-004 behavior that releasing a rate-limiter lease lets a caller which
+        /// could not obtain a permit go on to create its own physical connection. Caller A holds the
+        /// single permit while it creates, so caller B cannot create until A releases its lease;
+        /// because A never returns its connection, B cannot reuse one and must open its own. When B
+        /// has already parked on the idle channel this covers the lease-release wake poke, but the
+        /// assertions hold in every interleaving. Runs both the sync and async open paths.
         /// </summary>
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
-        public async Task RateLimiter_LeaseReleaseWakesRateLimitedWaiter_CreatesPhysicalConnection(bool async)
+        public async Task RateLimiter_LeaseReleaseAllowsRateLimitedWaiterToCreatePhysicalConnection(bool async)
         {
             // Both open paths below dispatch physical creation onto the thread pool (via Task.Run),
             // and caller A blocks a worker thread inside gated creation while holding the only
@@ -1891,8 +1893,14 @@ public async Task RateLimiter_LeaseReleaseWakesRateLimitedWaiter_CreatesPhysical
             var poolGroupOptions = new DbConnectionPoolGroupOptions(
                 poolByIdentity: false,
                 minPoolSize: 0,
-                // Room to grow so the release actually pokes a waiter (ReservationCount < MaxPoolSize).
-                maxPoolSize: 2,
+                // Headroom so the lease-release poke fires deterministically. That poke is gated on
+                // ReservationCount < MaxPoolSize, and a denied waiter (B) still holds a transient
+                // slot reservation while it unwinds (ConnectionPoolSlots.Add only releases it when
+                // the createCallback returns null). When A releases, the count can momentarily be
+                // A's own in-flight reservation plus B's (2), so MaxPoolSize must exceed 2 for the
+                // poke to fire regardless of how far B has unwound. The idle channel is unbounded, so
+                // once fired the poke is buffered and never lost even if B parks just after it.
+                maxPoolSize: 3,
                 creationTimeout: 15,
                 loadBalanceTimeout: 0,
                 hasTransactionAffinity: true,
@@ -1932,20 +1940,15 @@ public async Task RateLimiter_LeaseReleaseWakesRateLimitedWaiter_CreatesPhysical
                 factory.FirstCreateStarted.Wait(TimeSpan.FromSeconds(5)),
                 "Timed out waiting for the first open to begin physical creation.");
 
-            // Caller B is denied a permit (A holds it) and must fall back to the idle-channel wait.
-            // A denied AttemptAcquire increments the limiter's TotalFailedLeases, so watching that
-            // counter rise is how we confirm B was refused a permit and is now parked on the idle
-            // channel waiting for a wakeup (rather than still racing to acquire).
-            long failedLeasesBefore = rateLimiter.GetStatistics()!.TotalFailedLeases;
+            // Caller B is denied a permit (A holds it) and falls back to the idle-channel wait.
             Task<DbConnectionInternal?> requestB = Open(new SqlConnection());
-            Assert.True(
-                SpinWait.SpinUntil(
-                    () => rateLimiter.GetStatistics()!.TotalFailedLeases > failedLeasesBefore,
-                    TimeSpan.FromSeconds(5)),
-                "Timed out waiting for the second request to be denied by the rate limiter.");
 
-            // Releasing A's create lets it finish and dispose its lease, which pokes the idle
-            // channel to wake B. B then finds the permit available and creates its own connection.
+            // Release A's create. A finishes, disposes its lease (returning the permit) and then
+            // pokes the idle channel. Because the permit is released before the poke and the channel
+            // is unbounded, B is guaranteed to observe the wake - whether it already parked or reads
+            // the buffered poke afterward - and then acquires the now-free permit. B has no idle
+            // connection to reuse (A never returns its connection), so this deterministically forces
+            // B to create its own physical connection with no reliance on spin/sleep timing.
             createGate.Set();
 
             DbConnectionInternal? connectionA = await requestA;
@@ -1962,8 +1965,10 @@ public async Task RateLimiter_LeaseReleaseWakesRateLimitedWaiter_CreatesPhysical
         }
 
         /// <summary>
-        /// Verifies that when the rate limiter denies a new physical open, the caller falls back
-        /// to waiting for an existing connection to be returned instead of forcing a second create.
+        /// Verifies that when the rate limiter denies a new physical open, the caller reuses a
+        /// connection returned to the pool instead of forcing a second create. The single permit is
+        /// held for the whole test, so the pool can never open a second connection; the waiting
+        /// request can only complete by reusing the returned connection.
         /// </summary>
         [Fact]
         public async Task RateLimiter_PermitDenied_ReusesReturnedConnection()
@@ -1975,6 +1980,9 @@ public async Task RateLimiter_PermitDenied_ReusesReturnedConnection()
             var poolGroupOptions = new DbConnectionPoolGroupOptions(
                 poolByIdentity: false,
                 minPoolSize: 0,
+                // Room to grow: a free slot remains after the first connection is checked out, so
+                // the only thing that can stop the second request from opening a new physical
+                // connection is the rate limiter - not pool exhaustion.
                 maxPoolSize: 2,
                 creationTimeout: 15,
                 loadBalanceTimeout: 0,
@@ -1996,13 +2004,18 @@ public async Task RateLimiter_PermitDenied_ReusesReturnedConnection()
             Assert.NotNull(firstConnection);
             Assert.Equal(1, factory.CreateCount);
 
-            // Externally hold the only permit so the pool's next AttemptAcquire is denied and the
-            // waiting request must fall back to waiting for a returned connection.
+            // Hold the single permit for the remainder of the test. This is the invariant the
+            // assertions rely on: while the permit is held, every AttemptAcquire the pool makes is
+            // denied, so the second request can never create a physical connection. Its only path
+            // to a connection is to reuse one returned to the pool. That makes the outcome
+            // independent of thread scheduling - no polling for the denial, no spin, no sleep.
             using RateLimitLease heldLease = rateLimiter.AttemptAcquire(1);
             Assert.True(heldLease.IsAcquired);
-            long failedLeasesBefore = rateLimiter.GetStatistics()!.TotalFailedLeases;
 
             // Act
+            // The second request finds no idle connection and is denied a permit, so it parks on
+            // the idle channel waiting for a returned connection. It runs on a background thread
+            // because the sync pool path blocks the caller until a connection becomes available.
             Task<DbConnectionInternal?> waitingRequest = Task.Run(() =>
             {
                 pool.TryGetConnection(
@@ -2013,16 +2026,15 @@ public async Task RateLimiter_PermitDenied_ReusesReturnedConnection()
                 return queuedConnection;
             });
 
-            Assert.True(
-                SpinWait.SpinUntil(
-                    () => rateLimiter.GetStatistics()!.TotalFailedLeases > failedLeasesBefore,
-                    TimeSpan.FromSeconds(5)),
-                "Timed out waiting for the second request to be denied by the rate limiter.");
-
+            // Return the first connection. With the permit held, this is the only connection the
+            // waiting request can obtain, so it deterministically completes by reusing it -
+            // whether it grabs it from the idle channel directly or is woken from its parked wait.
             pool.ReturnInternalConnection(firstConnection!, firstOwner);
             DbConnectionInternal? reusedConnection = await waitingRequest;
 
             // Assert
+            // Same instance reused, and the factory was never asked to create a second connection:
+            // proof the held permit blocked a new open despite the free pool slot, forcing reuse.
             Assert.Same(firstConnection, reusedConnection);
             Assert.Equal(1, factory.CreateCount);
         }
@@ -2067,12 +2079,11 @@ await Assert.ThrowsAsync<InvalidOperationException>(async () =>
                 });
             }
 
-            // Every failed open must have released its permit; otherwise the pool would starve.
-            Assert.True(
-                SpinWait.SpinUntil(
-                    () => rateLimiter.GetStatistics()!.CurrentAvailablePermits == 4,
-                    TimeSpan.FromSeconds(5)),
-                "Rate limiter did not release all permits after failed opens.");
+            // Every failed open disposes its rate-limiter lease in the createCallback's finally as
+            // the failure unwinds - which happens before that failure propagates to complete the
+            // awaited request. So once all opens above have thrown, all four permits are already
+            // back in the limiter; there is nothing to wait for and no need to poll.
+            Assert.Equal(4, rateLimiter.GetStatistics()!.CurrentAvailablePermits);
         }
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
new file mode 100644
index 0000000000..d4c29d0459
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
@@ -0,0 +1,728 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data.Common;
+using System.Threading;
+using System.Threading.RateLimiting;
+using System.Threading.Tasks;
+using System.Transactions;
+using Microsoft.Data.Common;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Data.SqlClient.Tests.Common;
+using Microsoft.Extensions.Time.Testing;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Unit tests for background pool warmup and replenishment in
+    /// <see cref="ChannelDbConnectionPool"/>. See <c>specs/003-pool-warmup/spec.md</c>.
+    /// </summary>
+    public class ChannelDbConnectionPoolWarmupTest
+    {
+        #region Helpers
+
+        private static ChannelDbConnectionPool ConstructPool(
+            SqlConnectionFactory connectionFactory,
+            int minPoolSize = 0,
+            int maxPoolSize = 50,
+            int idleTimeout = 0,
+            int loadBalanceTimeout = 0,
+            ConcurrencyLimiter? connectionCreationRateLimiter = null,
+            TimeProvider? timeProvider = null)
+        {
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: minPoolSize,
+                maxPoolSize: maxPoolSize,
+                creationTimeout: 15,
+                loadBalanceTimeout: loadBalanceTimeout,
+                hasTransactionAffinity: true,
+                idleTimeout: idleTimeout);
+
+            var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+                new SqlConnectionOptions("Data Source=localhost;"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                poolGroupOptions);
+
+            return new ChannelDbConnectionPool(
+                connectionFactory,
+                dbConnectionPoolGroup,
+                DbConnectionPoolIdentity.NoIdentity,
+                new DbConnectionPoolProviderInfo(),
+                connectionCreationRateLimiter,
+                timeProvider);
+        }
+
+        /// <summary>
+        /// Generous upper bound for waits that guard a background handshake which, in correct code,
+        /// completes in milliseconds. It is only ever hit on a genuine failure/hang, so it does not
+        /// make passing runs slow or introduce timing races.
+        /// </summary>
+        private static readonly TimeSpan HandshakeTimeout = TimeSpan.FromSeconds(30);
+
+        /// <summary>
+        /// Awaits background warmup passes until the pool settles at <paramref name="minPoolSize"/>.
+        /// A single coalesced pass can race with concurrent removals - for example a
+        /// <see cref="ChannelDbConnectionPool.Clear"/> draining the pool while replenishment refills
+        /// it - so this re-requests warmup until the pool is full. Only safe with a factory whose
+        /// warmup creations succeed and where the pool is not in the error state, so every pass makes
+        /// forward progress and the loop terminates. Bounded by <see cref="HandshakeTimeout"/> so a
+        /// regression that prevents the pool from ever reaching the minimum surfaces as a
+        /// deterministic timeout instead of hanging the whole test run.
+        /// </summary>
+        private static async Task AwaitWarmupToMinimum(ChannelDbConnectionPool pool, int minPoolSize)
+        {
+            DateTime deadline = DateTime.UtcNow + HandshakeTimeout;
+            while (pool.Count < minPoolSize)
+            {
+                Assert.True(
+                    DateTime.UtcNow < deadline,
+                    $"Pool did not reach MinPoolSize {minPoolSize} within {HandshakeTimeout}; Count={pool.Count}.");
+
+                pool.RequestWarmup();
+                Task? warmup = pool.WarmupLoopTask;
+                if (warmup is not null)
+                {
+                    await warmup;
+                }
+                else
+                {
+                    // No loop is published yet (e.g. one is mid-teardown between passes). Wait briefly
+                    // instead of re-requesting in a tight loop, so this bounded wait never busy-spins a
+                    // CPU core and starves other test work on a loaded CI machine.
+                    await Task.Delay(TimeSpan.FromMilliseconds(10));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Story 1 - Background warmup on pool creation
+
+        /// <summary>
+        /// Warmup is a no-op when MinPoolSize == 0: no connections are ever created in the background.
+        /// </summary>
+        [Fact]
+        public void Startup_MinPoolSizeZero_DoesNotWarmUp()
+        {
+            var factory = new ChannelDbConnectionPoolTest.CountingSuccessfulConnectionFactory();
+            using var pool = ConstructPool(factory, minPoolSize: 0, maxPoolSize: 10);
+
+            pool.Startup();
+
+            // MinPoolSize == 0, so warmup is a no-op: no loop is ever launched (WarmupLoopTask stays
+            // null) and nothing is created in the background.
+            Assert.Null(pool.WarmupLoopTask);
+            Assert.Equal(0, factory.CreateCount);
+            Assert.Equal(0, pool.Count);
+        }
+
+        /// <summary>
+        /// Warmup pre-creates connections up to MinPoolSize for various sizes (1 and N).
+        /// </summary>
+        [Theory]
+        [InlineData(1)]
+        [InlineData(3)]
+        [InlineData(10)]
+        public async Task Startup_WithMinPoolSize_WarmsUpToMinimum(int minPoolSize)
+        {
+            var factory = new ChannelDbConnectionPoolTest.CountingSuccessfulConnectionFactory();
+            using var pool = ConstructPool(factory, minPoolSize: minPoolSize, maxPoolSize: minPoolSize + 10);
+
+            pool.Startup();
+
+            // Awaiting the warmup loop to completion is deterministic: the single serial pass runs
+            // with no competing removals, so when it finishes the pool is exactly at MinPoolSize.
+            await pool.WarmupLoopTask!;
+
+            // Warmup reaches exactly MinPoolSize (no overshoot) and pools each created connection.
+            Assert.Equal(minPoolSize, pool.Count);
+            Assert.Equal(minPoolSize, pool.IdleCount);
+            Assert.Equal(minPoolSize, factory.CreateCount);
+        }
+
+        /// <summary>
+        /// A user request during warmup is served immediately and does not wait for warmup to finish.
+        /// The gated factory blocks warmup's first (serial) creation, yet a user open still completes
+        /// by creating its own connection, proving warmup does not block user requests and does not
+        /// create connections in parallel.
+        /// </summary>
+        [Fact]
+        public async Task Startup_UserRequestDuringWarmup_ServedImmediately()
+        {
+            using var createGate = new ManualResetEventSlim(initialState: false);
+            var factory = new ChannelDbConnectionPoolTest.GatedSuccessfulConnectionFactory(createGate);
+            using var pool = ConstructPool(factory, minPoolSize: 3, maxPoolSize: 10);
+
+            try
+            {
+                // Warmup begins and its single, serial creation blocks on the gate. Waiting on this
+                // explicit signal (not a sleep) establishes a deterministic happens-before: warmup is now
+                // parked inside its first create.
+                pool.Startup();
+                Assert.True(
+                    factory.FirstCreateStarted.Wait(HandshakeTimeout),
+                    "Timed out waiting for warmup to begin its first creation.");
+
+                // Exactly one creation - warmup's - is in flight and parked on the closed gate. The
+                // warmup loop is serial, so it cannot advance to a second create until the gate opens.
+                Assert.Equal(1, factory.CreateCount);
+
+                // Issue a user request while warmup is parked. Run it on a dedicated (LongRunning) thread
+                // so it never competes with warmup for the same pool worker. Because warmup does not block
+                // user requests, it must complete promptly by creating its own connection. A generous
+                // upper bound converts a hypothetical "user blocked behind warmup" regression into a clean
+                // failure instead of an indefinite hang; correct code completes in milliseconds.
+                Task<DbConnectionInternal> userOpen = Task.Factory.StartNew(
+                    () =>
+                    {
+                        bool completed = pool.TryGetConnection(
+                            new SqlConnection(),
+                            taskCompletionSource: null,
+                            TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                            out DbConnectionInternal? connection);
+                        Assert.True(completed);
+                        Assert.NotNull(connection);
+                        return connection!;
+                    },
+                    CancellationToken.None,
+                    TaskCreationOptions.LongRunning,
+                    TaskScheduler.Default);
+
+                Task completed = await Task.WhenAny(userOpen, Task.Delay(HandshakeTimeout));
+                Assert.True(completed == userOpen, "User request was blocked behind warmup.");
+                Assert.NotNull(await userOpen);
+
+                // Seriality: warmup is still parked on its single in-flight create (the gate is closed),
+                // so the only additional creation is the user's. CreateCount == 2 proves warmup did not
+                // create connections in parallel. This is deterministic: nothing can advance warmup's
+                // loop until the gate is set below.
+                Assert.Equal(2, factory.CreateCount);
+            }
+            finally
+            {
+                // Guarantee the gate is released even if an assertion above throws, so warmup's parked
+                // creation in the gated factory never strands a thread-pool thread for the rest of the run.
+                createGate.Set();
+            }
+        }
+
+        #endregion
+
+        #region Story 2 - Warmup through the shared rate limiter
+
+        /// <summary>
+        /// Warmup creates connections through the shared rate limiter and still reaches MinPoolSize.
+        /// </summary>
+        [Fact]
+        public async Task Warmup_ThroughSharedRateLimiter_ReachesMinimum()
+        {
+            using var rateLimiter = new ConcurrencyLimiter(
+                new ConcurrencyLimiterOptions { PermitLimit = 1, QueueLimit = 0 });
+            var factory = new ChannelDbConnectionPoolTest.CountingSuccessfulConnectionFactory();
+            using var pool = ConstructPool(
+                factory,
+                minPoolSize: 3,
+                maxPoolSize: 10,
+                connectionCreationRateLimiter: rateLimiter);
+
+            pool.Startup();
+
+            // Warmup is the only actor here, so each serial create acquires and releases the single
+            // permit in turn; the pass never sees a saturated limiter and reaches MinPoolSize.
+            await pool.WarmupLoopTask!;
+
+            Assert.Equal(3, pool.Count);
+            // Every warmup creation acquired (and released) a permit from the shared limiter.
+            Assert.True(rateLimiter.GetStatistics()!.TotalSuccessfulLeases >= 3);
+        }
+
+        /// <summary>
+        /// When the shared rate limiter is saturated by a user request, warmup waits its turn rather
+        /// than bypassing the limiter: the user request that arrives while warmup holds the only
+        /// permit is denied by the same limiter.
+        /// </summary>
+        [Fact]
+        public async Task Warmup_RateLimiterSaturated_UserSharesSameLimiter()
+        {
+            using var createGate = new ManualResetEventSlim(initialState: false);
+            var factory = new ChannelDbConnectionPoolTest.GatedSuccessfulConnectionFactory(createGate);
+            using var rateLimiter = new ConcurrencyLimiter(
+                new ConcurrencyLimiterOptions { PermitLimit = 1, QueueLimit = 0 });
+            using var pool = ConstructPool(
+                factory,
+                minPoolSize: 2,
+                maxPoolSize: 5,
+                connectionCreationRateLimiter: rateLimiter);
+
+            try
+            {
+                // Warmup begins, acquires the only permit, and blocks in creation while holding it.
+                pool.Startup();
+                Assert.True(
+                    factory.FirstCreateStarted.Wait(HandshakeTimeout),
+                    "Timed out waiting for warmup to begin its first creation.");
+
+                // A concurrent user request competes for the same limiter. There is no idle connection
+                // and warmup holds the only permit, so the request cannot be satisfied inline: it is
+                // deferred to the TaskCompletionSource, proving warmup did not bypass the limiter.
+                var tcs = new TaskCompletionSource<DbConnectionInternal>();
+                bool completedSynchronously = pool.TryGetConnection(
+                    new SqlConnection(), tcs, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? immediateConnection);
+                Assert.False(completedSynchronously, "Async request unexpectedly completed synchronously.");
+                Assert.Null(immediateConnection);
+
+                // Deterministically prove the shared limiter is saturated by warmup: while warmup holds
+                // its only permit (guaranteed by FirstCreateStarted above and the still-closed gate),
+                // attempting to acquire that same limiter from the test thread is denied. This is the
+                // shared-limiter proof without any spin - the denial is observed synchronously here
+                // rather than by polling for the deferred user request's transient failed-lease, which
+                // races the permit being released below. The denied attempt is a no-op lease.
+                long failedBefore = rateLimiter.GetStatistics()!.TotalFailedLeases;
+                using (RateLimitLease probe = rateLimiter.AttemptAcquire(1))
+                {
+                    Assert.False(
+                        probe.IsAcquired,
+                        "Shared rate limiter was not saturated while warmup held its permit.");
+                }
+                Assert.True(
+                    rateLimiter.GetStatistics()!.TotalFailedLeases > failedBefore,
+                    "Denied acquire was not recorded by the shared rate limiter.");
+
+                // Release warmup. With rate-limit retry removed, warmup's pass may end early if the
+                // user request grabs the freed permit first - but the pool must still converge to
+                // MinPoolSize: whichever creations win the permit (warmup's or the user's) fill it.
+                createGate.Set();
+
+                // Await the deferred user request directly rather than spin-polling limiter statistics.
+                // Bound the wait so a regression that never completes the async request fails fast
+                // instead of hanging the whole test run.
+                Task<DbConnectionInternal> userRequest = tcs.Task;
+                Assert.True(
+                    userRequest == await Task.WhenAny(userRequest, Task.Delay(HandshakeTimeout)),
+                    "Timed out waiting for the deferred user request to complete.");
+                DbConnectionInternal? userConnection = await userRequest;
+                Assert.NotNull(userConnection);
+
+                // Once both the warmup pass and the deferred user request have settled, the pool holds
+                // exactly MinPoolSize connections (a warmup idle connection plus the user's, or two
+                // warmup connections one of which the user took).
+                await AwaitWarmupToMinimum(pool, 2);
+                Assert.Equal(2, pool.Count);
+            }
+            finally
+            {
+                // Guarantee the gate is released even if an assertion above throws before the explicit
+                // release, so warmup's parked creation never strands a thread-pool thread. Setting an
+                // already-set gate is a harmless no-op on the success path.
+                createGate.Set();
+            }
+        }
+
+        #endregion
+
+        #region Story 3 - Warmup failure resilience
+
+        /// <summary>
+        /// Warmup creation failures are absorbed - no exception surfaces onto the thread pool and no
+        /// connections are pooled - but, mirroring the legacy WaitHandle pool, a genuine open failure
+        /// does enter the pool's blocking-period error state. Warmup then stops the pass rather than
+        /// spinning on the persistent failure.
+        /// </summary>
+        [Fact]
+        public async Task Warmup_AllCreationsFail_AbsorbedAndEntersErrorState()
+        {
+            var factory = new WarmupFailingConnectionFactory();
+            using var pool = ConstructPool(factory, minPoolSize: 3, maxPoolSize: 10);
+
+            pool.Startup();
+
+            // Await the warmup pass. The first open fails: OpenNewInternalConnection enters the
+            // blocking-period error state and rethrows, the warmup loop absorbs the rethrow and ends
+            // the pass. Awaiting is deterministic - no exception surfaces onto the thread pool.
+            await pool.WarmupLoopTask!;
+
+            // Exactly one attempt was made: a genuine failure ends the pass rather than spinning on
+            // the persistent failure, and nothing is pooled.
+            Assert.Equal(1, factory.WarmupAttemptCount);
+            Assert.Equal(0, pool.IdleCount);
+
+            // Mirroring the legacy WaitHandle pool, the failed open entered the blocking-period error
+            // state, exactly as an on-demand creation failure would.
+            Assert.True(
+                pool.ErrorOccurred,
+                "Warmup failure did not enter the pool error state as the WaitHandle pool does.");
+        }
+
+        /// <summary>
+        /// After warmup fails, the pool enters its blocking-period error state (mirroring the
+        /// WaitHandle pool), so a user request during the blocking window fast-fails with the cached
+        /// exception rather than attempting a fresh on-demand open. The pool remains operational and
+        /// resumes creating on demand once the blocking period expires.
+        /// </summary>
+        [Fact]
+        public async Task Warmup_Fails_UserRequestFastFailsDuringBlockingPeriod()
+        {
+            var factory = new WarmupFailingConnectionFactory();
+            using var pool = ConstructPool(factory, minPoolSize: 2, maxPoolSize: 10);
+
+            pool.Startup();
+
+            // Warmup's failure drives the pool into the blocking-period error state.
+            await pool.WarmupLoopTask!;
+            Assert.True(pool.ErrorOccurred, "Warmup failure did not enter the pool error state.");
+
+            // A user request while the pool is blocking fast-fails with the cached exception.
+            Assert.ThrowsAny<Exception>(() => pool.TryGetConnection(
+                new SqlConnection(), taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _));
+        }
+
+        /// <summary>
+        /// Warmup respects the pool's blocking-period error state: once a failing user request has
+        /// driven the pool into the error state, invoking warmup must make it stand down (its loop
+        /// condition sees ErrorOccurred) and create nothing, mirroring the legacy WaitHandle pool,
+        /// which skips replenishment while the pool is blocking. Driving the error state with a user
+        /// request (rather than warmup itself) keeps the two behaviors independent, and awaiting the
+        /// warmup task makes the stand-down deterministic.
+        /// </summary>
+        [Fact]
+        public async Task Warmup_RespectsErrorState_StandsDownWhileBlocking()
+        {
+            var factory = new UserFailingWarmupCountingConnectionFactory();
+            using var pool = ConstructPool(factory, minPoolSize: 3, maxPoolSize: 10);
+
+            // Drive the pool into the blocking-period error state with a failing user request. We do
+            // NOT call Startup here: that would kick off a *successful* warmup and fill the pool,
+            // which is not the behavior under test.
+            Assert.ThrowsAny<Exception>(() => pool.TryGetConnection(
+                new SqlConnection(), taskCompletionSource: null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _));
+            Assert.True(pool.ErrorOccurred, "Failing user request did not enter the pool error state.");
+
+            // Now request warmup directly. Because the pool is blocking, the loop's error-state guard
+            // makes it stand down immediately: it creates nothing rather than piling doomed opens
+            // onto a struggling server.
+            pool.RequestWarmup();
+            await pool.WarmupLoopTask!;
+
+            Assert.Equal(0, factory.WarmupCreateCount);
+            Assert.Equal(0, pool.IdleCount);
+            Assert.True(pool.ErrorOccurred, "Warmup must not clear the error state it stood down for.");
+        }
+
+        #endregion
+
+        #region Story 4 - Warmup cancellation on shutdown
+
+        /// <summary>
+        /// When the pool is shut down mid-warmup, warmup stops promptly: no connections created after
+        /// shutdown begins, and any in-flight connection is cleaned up.
+        /// </summary>
+        [Fact]
+        public async Task Shutdown_DuringWarmup_StopsAndCleansUp()
+        {
+            using var createGate = new ManualResetEventSlim(initialState: false);
+            var factory = new ChannelDbConnectionPoolTest.GatedSuccessfulConnectionFactory(createGate);
+            using var pool = ConstructPool(factory, minPoolSize: 3, maxPoolSize: 10);
+
+            try
+            {
+                // Warmup begins and blocks on its first serial creation.
+                pool.Startup();
+                Assert.True(
+                    factory.FirstCreateStarted.Wait(HandshakeTimeout),
+                    "Timed out waiting for warmup to begin its first creation.");
+
+                // Shut down while warmup is parked. This cancels warmup and completes the idle channel.
+                pool.Shutdown();
+
+                // Release the in-flight creation and await the loop to completion. The freshly created
+                // connection cannot be published to the completed idle channel, so it is destroyed, and
+                // the loop stops without creating anything further.
+                createGate.Set();
+                await pool.WarmupLoopTask!;
+
+                Assert.Equal(0, pool.Count);
+                Assert.Equal(1, factory.CreateCount);
+            }
+            finally
+            {
+                // Guarantee the gate is released even if an assertion above throws before the explicit
+                // release, so warmup's parked creation never strands a thread-pool thread. Setting an
+                // already-set gate is a harmless no-op on the success path.
+                createGate.Set();
+            }
+        }
+
+        #endregion
+
+        #region Story 5 - Replenishment on any below-minimum event
+
+        /// <summary>
+        /// Destroying a connection on return (non-poolable/broken) drops the pool below MinPoolSize and
+        /// triggers replenishment back to the minimum.
+        /// </summary>
+        [Fact]
+        public async Task Replenish_AfterDoomedReturn_RefillsToMinimum()
+        {
+            var factory = new DoomableConnectionFactory();
+            using var pool = ConstructPool(factory, minPoolSize: 2, maxPoolSize: 10);
+
+            pool.Startup();
+            await pool.WarmupLoopTask!;
+            Assert.Equal(2, pool.Count);
+
+            // Check out a connection, mark it non-poolable, and return it: it is destroyed on return,
+            // dropping the pool to 1 and triggering replenishment through RemoveConnection.
+            var owner = new SqlConnection();
+            pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection);
+            Assert.NotNull(connection);
+            ((DoomableStubConnection)connection!).MarkDoNotPool();
+            pool.ReturnInternalConnection(connection, owner);
+
+            // The doomed return re-triggered warmup synchronously; awaiting the replenishment pass
+            // (a single serial create with no competing removal) restores the pool to MinPoolSize.
+            await pool.WarmupLoopTask!;
+            Assert.Equal(2, pool.Count);
+        }
+
+        /// <summary>
+        /// Clearing the pool drops it to zero (below MinPoolSize) and triggers replenishment back to
+        /// the minimum with fresh-generation connections.
+        /// </summary>
+        [Fact]
+        public async Task Replenish_AfterClear_RefillsToMinimum()
+        {
+            var factory = new ChannelDbConnectionPoolTest.CountingSuccessfulConnectionFactory();
+            using var pool = ConstructPool(factory, minPoolSize: 3, maxPoolSize: 10);
+
+            pool.Startup();
+            await pool.WarmupLoopTask!;
+            Assert.Equal(3, pool.Count);
+
+            pool.Clear();
+
+            // Clear drains the pool concurrently with replenishment, so a single warmup pass can race
+            // with the drain; await passes until the pool settles at MinPoolSize.
+            await AwaitWarmupToMinimum(pool, 3);
+            Assert.Equal(3, pool.Count);
+        }
+
+        /// <summary>
+        /// Destroying a connection while still at/above the minimum does NOT trigger replenishment
+        /// beyond the minimum: the pool stays at MinPoolSize.
+        /// </summary>
+        [Fact]
+        public async Task Replenish_DestroyWhileAtMinimum_NoOvershoot()
+        {
+            var factory = new DoomableConnectionFactory();
+            using var pool = ConstructPool(factory, minPoolSize: 2, maxPoolSize: 10);
+
+            pool.Startup();
+            await pool.WarmupLoopTask!;
+            Assert.Equal(2, pool.Count);
+
+            // Grow above the minimum. Two checkouts reuse the two idle warmup connections; a third
+            // finds no idle connection and creates a new one synchronously, bringing the total to 3.
+            var owner1 = new SqlConnection();
+            var owner2 = new SqlConnection();
+            var owner3 = new SqlConnection();
+            pool.TryGetConnection(owner1, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? c1);
+            pool.TryGetConnection(owner2, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? c2);
+            pool.TryGetConnection(owner3, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? c3);
+            Assert.NotNull(c1);
+            Assert.NotNull(c2);
+            Assert.NotNull(c3);
+            Assert.Equal(3, pool.Count);
+
+            // Destroy the third on return. Dropping from 3 to 2 stays at the minimum, so RequestWarmup
+            // hits its fast path and launches no new pass.
+            Task? warmupBeforeReturn = pool.WarmupLoopTask;
+            ((DoomableStubConnection)c3!).MarkDoNotPool();
+            pool.ReturnInternalConnection(c3, owner3);
+
+            // No replenishment was triggered: the exposed warmup task is unchanged (no new pass) and
+            // the pool settled at MinPoolSize without overshooting.
+            Assert.Same(warmupBeforeReturn, pool.WarmupLoopTask);
+            Assert.Equal(2, pool.Count);
+        }
+
+        /// <summary>
+        /// An idle connection evicted by the idle-timeout check (IsLiveConnection) drops the pool
+        /// below MinPoolSize and triggers replenishment via RemoveConnection → RequestWarmup,
+        /// restoring the pool to the minimum. A <see cref="FakeTimeProvider"/> drives the idle-timeout
+        /// clock so exactly one connection crosses the timeout, making the create-count assertion
+        /// deterministic regardless of host scheduling or GC pauses.
+        /// </summary>
+        [Fact]
+        public async Task Replenish_AfterIdleTimeoutEviction_RefillsToMinimum()
+        {
+            using LocalAppContextSwitchesHelper switchesHelper = new();
+            switchesHelper.UseLegacyIdleTimeoutBehavior = false;
+
+            // Pool with a 1-second idle timeout and MinPoolSize=2 so an evicted connection
+            // triggers replenishment. The fake clock lets the test decide exactly which connection
+            // ages past the idle timeout, rather than racing the wall clock.
+            var fakeTime = new FakeTimeProvider();
+            var factory = new DoomableConnectionFactory();
+            using var pool = ConstructPool(factory, minPoolSize: 2, maxPoolSize: 10, idleTimeout: 1, timeProvider: fakeTime);
+
+            pool.Startup();
+            await pool.WarmupLoopTask!;
+            Assert.Equal(2, pool.Count);
+            int createCountAfterWarmup = factory.CreateCount;
+
+            // Check out both warm-up connections.
+            var owner1 = new SqlConnection();
+            var owner2 = new SqlConnection();
+            pool.TryGetConnection(owner1, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn1);
+            pool.TryGetConnection(owner2, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn2);
+            Assert.NotNull(conn1);
+            Assert.NotNull(conn2);
+
+            // Return conn1, then advance the fake clock past the 1s idle timeout. conn1's return stamp
+            // is now 2s old while conn2, returned after the advance, is fresh (0s), so only conn1 expires.
+            pool.ReturnInternalConnection(conn1!, owner1);
+            fakeTime.Advance(TimeSpan.FromSeconds(2));
+            pool.ReturnInternalConnection(conn2!, owner2);
+
+            // TryGetConnection pops conn1 (head of channel), finds it idle-expired, calls
+            // RemoveConnection (which triggers RequestWarmup), then pops conn2 and returns it.
+            var owner3 = new SqlConnection();
+            pool.TryGetConnection(owner3, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn3);
+            Assert.NotNull(conn3);
+            Assert.Same(conn2, conn3);
+
+            // The eviction triggered replenishment; await the pass and verify the pool refilled to MinPoolSize.
+            await pool.WarmupLoopTask!;
+            Assert.Equal(2, pool.Count);
+            Assert.Equal(createCountAfterWarmup + 1, factory.CreateCount);
+        }
+
+        #endregion
+
+        #region Test doubles
+
+        /// <summary>
+        /// A stub internal connection that can be marked non-poolable so a return destroys it.
+        /// </summary>
+        private sealed class DoomableStubConnection : DbConnectionInternal
+        {
+            internal void MarkDoNotPool() => DoNotPoolThisConnection();
+
+            public override string ServerVersion => throw new NotImplementedException();
+
+            public override ConnectionCapabilities Capabilities => throw new NotImplementedException();
+
+            public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
+                => throw new NotImplementedException();
+
+            public override void EnlistTransaction(Transaction transaction)
+            {
+            }
+
+            protected override void Activate(Transaction transaction)
+            {
+            }
+
+            protected override void Deactivate()
+            {
+            }
+
+            internal override void ResetConnection()
+            {
+            }
+        }
+
+        /// <summary>
+        /// Produces <see cref="DoomableStubConnection"/> instances so replenishment tests can force a
+        /// connection to be destroyed on return.
+        /// </summary>
+        private sealed class DoomableConnectionFactory : SqlConnectionFactory
+        {
+            private int _createCount;
+
+            internal int CreateCount => Volatile.Read(ref _createCount);
+
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+            {
+                Interlocked.Increment(ref _createCount);
+                return new DoomableStubConnection();
+            }
+        }
+
+        /// <summary>
+        /// Fails only warmup creations (identified by a null owning connection) and succeeds for real
+        /// user requests. Lets tests assert that warmup failures are absorbed while on-demand user
+        /// creation still works.
+        /// </summary>
+        private sealed class WarmupFailingConnectionFactory : SqlConnectionFactory
+        {
+            private int _warmupAttemptCount;
+
+            internal int WarmupAttemptCount => Volatile.Read(ref _warmupAttemptCount);
+
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+            {
+                if (owningConnection is null)
+                {
+                    Interlocked.Increment(ref _warmupAttemptCount);
+                    throw ADP.PooledOpenTimeout();
+                }
+
+                return new DoomableStubConnection();
+            }
+        }
+
+        /// <summary>
+        /// Fails user requests (non-null owning connection) so the pool enters its blocking-period
+        /// error state, while succeeding for and counting warmup creations (null owning connection).
+        /// Lets a test drive the pool into the error state and then verify warmup stands down
+        /// (creates nothing) rather than continuing to replenish.
+        /// </summary>
+        private sealed class UserFailingWarmupCountingConnectionFactory : SqlConnectionFactory
+        {
+            private int _warmupCreateCount;
+
+            internal int WarmupCreateCount => Volatile.Read(ref _warmupCreateCount);
+
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+            {
+                if (owningConnection is not null)
+                {
+                    // User request: fail so the pool enters the blocking-period error state.
+                    throw ADP.PooledOpenTimeout();
+                }
+
+                // Warmup creation: count it. In the stand-down test this must never be reached while
+                // the pool is blocking.
+                Interlocked.Increment(ref _warmupCreateCount);
+                return new DoomableStubConnection();
+            }
+        }
+
+        #endregion
+    }
+}

From a684c99b261d44649946f9b232b5e043d46c0e74 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 24 Jul 2026 20:14:52 -0300
Subject: [PATCH 206/298] Reword SqlLegacyRepro placeholder connection string;
 add secrets instructions (#4475)

---
 .github/instructions/secrets.instructions.md  | 112 ++++++++++++++++++
 .../SniCloseLegacyRepro.csproj                |   2 +-
 2 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 .github/instructions/secrets.instructions.md

diff --git a/.github/instructions/secrets.instructions.md b/.github/instructions/secrets.instructions.md
new file mode 100644
index 0000000000..77af612bee
--- /dev/null
+++ b/.github/instructions/secrets.instructions.md
@@ -0,0 +1,112 @@
+---
+applyTo: "**"
+---
+# Secrets and Credential Handling
+
+This guide describes how to avoid committing secrets, how to write credential
+placeholders that do **not** trip secret scanners (e.g. GitHub Advanced Security
+/ 1ES push protection), and what to do when a push is blocked.
+
+## Golden Rules
+
+1. **Never commit a real secret** — passwords, connection strings with live
+   credentials, access keys, SAS tokens, client secrets, certificates/PFX
+   files, or bearer tokens. This applies to source, tests, docs, samples,
+   scripts, pipeline YAML, and config files.
+2. **Never route a secret through tooling or the model.** When a value is truly
+   secret, have the user type it directly into their terminal or set it as an
+   environment variable. Do not paste it into files, prompts, or chat.
+3. **Prefer indirection over literals.** Read credentials from environment
+   variables, a secret store (Azure Key Vault), user secrets, or CI secret
+   variables — not from committed text.
+4. **Assume public.** This repository mirrors to public GitHub via autosync.
+   Anything committed is effectively public and permanent in history.
+
+## Approved Placeholder Formats
+
+When you need to show the *shape* of a connection string or credential in code,
+docs, comments, or samples, use one of these placeholder styles. These are
+recognized as non-secrets by the scanner:
+
+| Style | Example | Use for |
+|-------|---------|---------|
+| Angle brackets | `User ID=<user>;Password=<pwd>` | Docs, READMEs, comments, samples |
+| Descriptive angle brackets | `Password=<myPassword>`, `User Id=<AppId>` | Samples that name the value |
+| Masked | `Password=********` or `Password=***` | Illustrative output / redaction |
+| Env var expansion | `Password=${SA_PASSWORD}` (bash), `Password=$(SqlPwd)` (ADO) | Scripts and pipelines |
+| Named token (docs prose) | `Password=<Secret>` | Narrative documentation |
+
+### Do NOT use these placeholder styles
+
+- **Ellipsis values** — a `Password` (or `Pwd`) key whose value is a literal
+  ellipsis, especially when paired with a `User ID` key in the same connection
+  string. The ellipsis is treated as a credential value and **will** trip
+  `SEC101/037 SqlLegacyCredentials`. Use `<pwd>` instead.
+- **Realistic-looking fake secrets** — a `Password` key set to a value that
+  looks like a real password (mixed letters, digits, and symbols). Even fake
+  values that resemble real passwords can be flagged and set a bad example.
+- **Bare word secrets** — a `Password` key set to a plain dictionary word
+  inside a connection-string literal. Prefer `<pwd>`.
+
+> **NOTE**: Ironically, this document cannot show verbatim examples of the
+> disallowed styles above — spelling out a `Password` key followed by an
+> ellipsis or realistic-looking value would itself trip `SEC101/037` and block
+> commits to this very file. That is exactly why the "don't" cases are described
+> in prose rather than shown literally.
+
+### Full connection-string placeholder examples
+
+```text
+Server=<server>;Database=<db>;User ID=<user>;Password=<pwd>;TrustServerCertificate=true
+Server=tcp:<servername>.database.windows.net;Database=<dbname>;Authentication=Active Directory Service Principal;User Id=<AppId>;Password=<Secret>
+```
+
+```bash
+# Have the user set the value directly; never write the real value into a file:
+export SNICLOSE_CONNSTR="Server=<server>;User ID=<user>;Password=<pwd>"
+```
+
+## Reading Secrets at Runtime (preferred patterns)
+
+- **Environment variables**: read connection strings from an env var
+  (e.g. `SNICLOSE_CONNSTR`) so the password never lands in a committed file.
+- **SecureString / SqlCredential**: use `SqlCredential` and `SecureString`
+  rather than embedding a password in the connection string.
+- **Integrated auth**: prefer `Integrated Security=true` or an
+  `Authentication=ActiveDirectory*` mode where no password is stored.
+- **CI/CD**: reference pipeline secret variables (`$(mySecret)`), never inline
+  literals in YAML.
+
+## When a Push Is Blocked by Secret Scanning
+
+Error shape: `VS403654:BypassableBlock ... push was rejected because it contains
+one or more secrets` with a `SEC101/...` rule id and `commit`/`paths` details.
+
+1. **Locate it.** Inspect the exact committed blob:
+   `git show <commit>:<path>` and go to the reported line/columns.
+2. **Determine real vs. false positive.**
+   - *Real secret*: rotate/revoke it immediately, then remove it from the file.
+     If it is in the tip commit only, amend; if it is deeper in **unshared**
+     history, rewrite that history. Never rewrite commits already public.
+   - *False positive* (an ellipsis or other non-credential placeholder value):
+     reword to an approved placeholder (`Password=<pwd>`) so future commits
+     don't recur.
+3. **Already-public / mirrored commits.** If the flagged content lives in a
+   commit that is already on public GitHub (e.g. an autosync mirror replaying
+   `github/main`), you cannot scrub that specific commit without rewriting
+   shared/public history. For a confirmed false positive, **bypass** the block
+   via the 1ES/Advanced Security push-protection flow
+   (https://aka.ms/1esSecretScanning/PushProtectionBypassableBlock) with a clear
+   reason, or dismiss the alert as *False positive*. Then land the placeholder
+   reword going forward so new files don't trip the rule again.
+4. **Never** disable secret scanning or use `--no-verify`-style bypasses to work
+   around a *real* secret.
+
+## Common Scanner Rules to Watch
+
+| Rule | Triggers on |
+|------|-------------|
+| `SEC101/037 SqlLegacyCredentials` | Connection strings pairing a `User ID` key with a `Password`/`Pwd` value |
+| `SEC101/*` (general) | Cloud keys, SAS tokens, client secrets, PATs, bearer tokens |
+
+If in doubt, use an approved placeholder from the table above.
diff --git a/tools/SniCloseLegacyRepro/SniCloseLegacyRepro.csproj b/tools/SniCloseLegacyRepro/SniCloseLegacyRepro.csproj
index 7c7f5507de..19351e09cc 100644
--- a/tools/SniCloseLegacyRepro/SniCloseLegacyRepro.csproj
+++ b/tools/SniCloseLegacyRepro/SniCloseLegacyRepro.csproj
@@ -15,7 +15,7 @@
     Framework Windows containers to bind older in-box System.Data.dll versions.
 
     Run: dotnet test tools/SniCloseLegacyRepro                        (in-process tests only)
-      $env:SNICLOSE_CONNSTR="Server=...;User ID=...;Password=..."  (enables live MARS + stress)
+      $env:SNICLOSE_CONNSTR="Server=<server>;User ID=<user>;Password=<pwd>"  (enables live MARS + stress)
       dotnet test tools/SniCloseLegacyRepro
 
     This project uses Central Package Management via the sibling

From e0b5c4af07cd9dae205919d55a4af38b6334ba42 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 27 Jul 2026 07:32:02 -0300
Subject: [PATCH 207/298] Standardize APIScan registration and SDL break policy
 in OneBranch pipelines (#4462)

* Standardize APIScan registration and SDL break policy in OneBranch pipelines

- Configure APIScan registration (softwareName, softwareVersion, modeType,
  verbosityLevel) inline in both official and non-official globalSdl blocks
  instead of per-job ob_sdl_apiscan_* variables; keep only DLL/PDB folders
  per-job in build-buildproj-job.
- Register the actual SqlClient APIScan software version (6.10).
- Enable break: true for apiscan, armory, binskim, policheck, and roslyn in
  the official pipeline; make the non-official pipeline non-breaking and
  disable its TSA publishing.
- Drop redundant ob_sdl_binskim_break in onebranch-variables and
  publish-symbols-job (BinSkim disabled there).

* Address PR #4462 review feedback: APIScan comment fixes

- Fix typo in the APIScan enable comment: ob_sdl_apiscan_enable ->
  ob_sdl_apiscan_enabled (the actual per-job variable name), in both the
  official and non-official pipelines.
- Drop "and version" from the non-official softwareName comment so it
  matches the official wording (the version has its own comment below).
---
 .config/guardian/.gdnbaselines                | 124 ++++++++++++++++
 .../onebranch-pipeline-design.instructions.md |   2 +-
 .../onebranch/jobs/build-buildproj-job.yml    |   5 +-
 .../onebranch/jobs/publish-symbols-job.yml    |   1 -
 .../onebranch/sqlclient-non-official.yml      | 107 ++++++++++++--
 .../onebranch/sqlclient-official.yml          | 132 ++++++++++++++----
 .../variables/onebranch-variables.yml         |   4 -
 7 files changed, 328 insertions(+), 47 deletions(-)
 create mode 100644 .config/guardian/.gdnbaselines

diff --git a/.config/guardian/.gdnbaselines b/.config/guardian/.gdnbaselines
new file mode 100644
index 0000000000..10698219a1
--- /dev/null
+++ b/.config/guardian/.gdnbaselines
@@ -0,0 +1,124 @@
+{
+  "hydrated": false,
+  "properties": {
+    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
+  },
+  "version": "1.0.0",
+  "baselines": {
+    "default": {
+      "name": "default",
+      "createdDate": "2026-07-23 11:29:23Z",
+      "lastUpdatedDate": "2026-07-23 11:29:23Z"
+    }
+  },
+  "results": {
+    "40b23e076c5c65b58c7da0889f0bf58e271b1637f662060bbc7aadd5c62a7126": {
+      "signature": "40b23e076c5c65b58c7da0889f0bf58e271b1637f662060bbc7aadd5c62a7126",
+      "alternativeSignatures": [
+        "4113c2e383bc4d7206cc94ba3e16dcdaef105762c7e22060d8e7964407e048ab",
+        "41bc93496e4ace0362f89323cc166b46e7448108052b75f7dd3ae5f4d48b5ad8",
+        "357246d2ddf96dbab309e392e49d088dc5c15ec9343553876173296f02eef94c"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2026-07-23 11:29:23Z"
+    },
+    "6e0dddb2d631181c20dbbf2892aceea3fbb157b3c293a147b70f49fc4a17765b": {
+      "signature": "6e0dddb2d631181c20dbbf2892aceea3fbb157b3c293a147b70f49fc4a17765b",
+      "alternativeSignatures": [
+        "2a9d1465faa5347c1f77eb856eb21074dc1dfcca4963991fb918fa61c1c29b02",
+        "9f71983dfef73a0b5fa1ecd3d1f14b3af9067aed39c5eb8619ecd0a0f4ee33f6",
+        "bd1475a089ab85c698803c80d71e73148edfc9db706bafe3789509ea32f917f2"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2026-07-23 11:29:23Z"
+    },
+    "28f157377f5600a0ce77a1a2193653ca71c8de4cca5d24166e1363cfc1f53782": {
+      "signature": "28f157377f5600a0ce77a1a2193653ca71c8de4cca5d24166e1363cfc1f53782",
+      "alternativeSignatures": [
+        "ff91ec920d3ed908c7fdc8419f4e767216c312a3907419b65e8e11e611be0db6",
+        "cc5e7e0d3670c5b2738f2b9194d50de2b123bdae5e906729f3a9c7baa980477d",
+        "8641e063e4aff04c260660c01c71ee18d32bdb7788357eaecc420a64cb279b2d"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2026-07-23 11:29:23Z"
+    },
+    "253df4b6cde68fb64c0376d3fa5351a49ccd9136e987129a6686f003303902bb": {
+      "signature": "253df4b6cde68fb64c0376d3fa5351a49ccd9136e987129a6686f003303902bb",
+      "alternativeSignatures": [
+        "e98757960f13dfe3c2c4ef2acbbdbd782cf26a7635caae25b7fd9e9230f863f6",
+        "df606344d52fe66ab4fa386e5cc50b6ced2c8d711aa7bc5a14db61f1fad7b70f",
+        "61239d49bfbe4702066454a51c302633291f61542011ee755420f4f556ede2d6"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2026-07-23 11:29:23Z"
+    },
+    "40b7b29173191dd629e8921c99d8718cad7ebf4d6acd83d8719e2e15db3d89a3": {
+      "signature": "40b7b29173191dd629e8921c99d8718cad7ebf4d6acd83d8719e2e15db3d89a3",
+      "alternativeSignatures": [
+        "870b4398ab01cdfaa4be8605e03eaa7377a5079b79573d3290248f5d5fd6fd6c",
+        "6b690695e0e41aa7a7c79394fa5d9f6a08e6e06cffc326b7fae4a8883ff42ac6",
+        "514ed34ad14af5b3739b2804e791b1b63d88be42e658238794f467c4bf2ff140"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2026-07-23 11:29:23Z"
+    },
+    "fb0afe300269068323c4e3fab292104aa30201c545156ffee1ccf6109df3bd59": {
+      "signature": "fb0afe300269068323c4e3fab292104aa30201c545156ffee1ccf6109df3bd59",
+      "alternativeSignatures": [
+        "7bdac882cf7914eb42130101ca921f1e4c5654cc55916daf1c2b9bc51c439dfa",
+        "6e99b53e08dcbad4533fbd8a101b881fba112f31483c7e9b7b14aaa709f3cee8",
+        "fc771d2d8a5bd2dfa72695e42516ff6c504e18fd714a1462d911539ea69fe710"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2026-07-23 11:29:23Z"
+    },
+    "e3ec17e281386f24ee7650c502b034993dcfd9a5ad19089c9af3edde8321fbb9": {
+      "signature": "e3ec17e281386f24ee7650c502b034993dcfd9a5ad19089c9af3edde8321fbb9",
+      "alternativeSignatures": [
+        "0910ddd1f1c9f37b764457a39d0dd543f25fce6e5e8694f066d0092e99784b4d",
+        "ee166a838d6e6b4aa08218eb89b001689bc3ec8fb6343fdfee89834847a294d5",
+        "7beed57053ec779f46498ff84c41a9400761001ea494237fe32cfab1c829454a"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2026-07-23 11:29:23Z"
+    },
+    "0ef75f3e883bfae828f2b15b4a41963e6ea3a61306fc19767586044309bc739f": {
+      "signature": "0ef75f3e883bfae828f2b15b4a41963e6ea3a61306fc19767586044309bc739f",
+      "alternativeSignatures": [
+        "7e71c00bf08e29508821cc200dcc41556ecc570c205f8833a5a704466e80baa5",
+        "0d5b851e97bdb0eb8931e6f326718a657f9cd46092eb8a2a2d414be2147a797c",
+        "e6c0cd6ef2433a42c95a2939cce740019ecda3fcfde64a3a0f21661e6ff27f71"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2026-07-23 11:29:23Z"
+    },
+    "27cf35f7df3f630fab489573ec19318f563e042424ca30625e9fe08407d74bdf": {
+      "signature": "27cf35f7df3f630fab489573ec19318f563e042424ca30625e9fe08407d74bdf",
+      "alternativeSignatures": [
+        "55e9029f79f883ee7e23a98ee6aad0c3713e02dd67cd7a7158875cdee4c86806",
+        "a443d3867a75710110ddf675eb639080559e694d4331fd89bc1589b1a60b8777",
+        "ff040e311fa90fc602c647b539f52148605321c178fc731f30395a8a9ef3f7a9"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "createdDate": "2026-07-23 11:29:23Z"
+    }
+  }
+}
\ No newline at end of file
diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index 2421674eef..35f522dadc 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -9,7 +9,7 @@ Rules and conventions for editing the OneBranch Azure DevOps YAML pipelines that
 
 ## Pipeline Variants
 
-- `sqlclient-official.yml` — Official pipeline; uses `OneBranch.Official.CrossPlat.yml`; CI trigger on `internal/main` + daily schedule at 04:30 UTC
+- `sqlclient-official.yml` — Official pipeline; uses `OneBranch.Official.CrossPlat.yml`; runs on a daily schedule at 04:30 UTC on `internal/main`, with no activity-based trigger (`pr: none`, `trigger: none`)
 - `sqlclient-non-official.yml` — Non-Official pipeline; uses `OneBranch.NonOfficial.CrossPlat.yml`; manual only (`pr: none`, `trigger: none`)
 - Both live under `eng/pipelines/onebranch/` and extend OneBranch governed templates
 - Never parameterize the OneBranch template name — hardcode it per pipeline for PRC compliance
diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index 51c70e8c64..2f5238dd38 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -102,12 +102,9 @@ jobs:
 
       ob_outputDirectory: '$(JOB_OUTPUT)'
 
-      # APIScan configuration for the package being built by this job.
-      ob_sdl_apiscan_enabled: true
+      # APIScan per-job configuration for the DLL and PDB folders.
       ob_sdl_apiscan_softwareFolder: ${{ parameters.apiScanDllPath }}
       ob_sdl_apiscan_symbolsFolder: ${{ parameters.apiScanPdbPath }}
-      ob_sdl_apiscan_softwarename: ${{ parameters.packageFullName }}
-      ob_sdl_apiscan_versionNumber: ${{ parameters.fileVersion }}
 
     steps:
       - template: /eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self
diff --git a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
index 8ee37ad7d7..b3ada2a6f0 100644
--- a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
+++ b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
@@ -61,7 +61,6 @@ jobs:
       # Disable SDL scanning — this job only uploads/publishes PDBs and produces no
       # assemblies to scan. APIScan and BinSkim are handled by the build jobs.
       ob_sdl_apiscan_enabled: false
-      ob_sdl_binskim_break: false
       ob_sdl_binskim_enabled: false
 
       # Path where the downloaded artifact will be placed.
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index abf9b6dcbe..51fd924ac7 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -6,12 +6,21 @@
 
 name: $(Year:YY)$(DayOfYear)$(Rev:.r)
 
-# No automated triggers; this pipeline must be run manually.
+# No activity- or schedule-based triggers.  This pipeline is run manually only.
 pr: none
 trigger: none
 
 # These parameters are visible in the Azure DevOps pipeline UI when a new run is queued.
 parameters:
+
+  # When true, any SDL errors will break the build.  When false, SDL errors will be logged but
+  # will not break the build.  TSA bug filing is always disabled in the non-official pipeline
+  # (see the tsa block in globalSdl).
+  - name: breakOnSdlError
+    displayName: Break on SDL error
+    type: boolean
+    default: true
+
   # True to enable debug information and steps.
   - name: debug
     displayName: Enable debug output
@@ -126,15 +135,64 @@ extends:
       category: NonAzure
 
     # See: https://aka.ms/obpipelines/sdl
+    #
+    # The following SDL tasks are auto-injected by the OneBranch / 1ES Pipeline Templates and run
+    # WITHOUT any explicit globalSdl configuration.  They were verified as running in recent
+    # pipeline runs, so we intentionally do not redeclare them here:
+    #
+    #   - Component Governance / Component Detection / Secure Supply Chain
+    #     Analysis (dependency vulnerability scanning)
+    #   - AntiMalware Scanner (Binary + Source)
+    #   - 1ES Secret Scanning (SPMI)
+    #   - Generate SBoM Manifest
+    #   - CodeQL 3000 (only run when it is explicitly opted in via codeql.compiled.enabled, and
+    #     even then only on its ~72h cadence and on supported (non-PR/non-tag)
+    #     branches.)
+    #
     globalSdl:
+
+      # Snapshot of the SDL analyzer findings that pre-existed the breakOnSdlError rollout, so
+      # builds only break on NEW findings.  Generated from the SDL analysis artifacts of a full
+      # non-official run and kept under .config/ alongside the other SDL tool configs
+      # (CredScan/PoliCheck/TSA).
+      baseline:
+        baselineFile: $(Build.SourcesDirectory)/.config/guardian/.gdnbaselines
+
+      # Configure APIScan behaviour:
+      #
+      # https://eng.ms/docs/products/onebranch/securitycompliancegovernanceandpolicies/sdlforcontainerizedworkflows/customizesdlforcontainerbuilds#apiscan
+      #
+      # https://eng.ms/docs/coreai/devdiv/one-engineering-system-1es/1es-mohanb/security-integration/guardian-wiki/sdl-azdo-extension/apiscan-build-task#v2
+      #
       apiscan:
-        # APIScan "software name" and version parameters are set on a per-job basis with via
-        # ob_sdl_apiscan_* variables.
+        # We want APIScan enabled by default for our jobs.  However, some jobs don't produce any
+        # artifacts, and they will disable APIScan via the OneBranch per-job ob_sdl_apiscan_enabled
+        # variable.
         enabled: true
-        break: false
+
+        # APIScan errors break the build when breakOnSdlError is set.
+        break: ${{ parameters.breakOnSdlError }}
+
+        # Use pre-release mode for non-official pipelines.
+        modeType: prerelease
+
+        # We have a single "name" registered with APIScan for all of our packages.
+        #
+        # https://eng.ms/docs/products/apiscan/onboard/requirements/registersoftware
+        #
+        softwareName: Microsoft.Data.SqlClient
+
+        # Similar to the software name, we have a single version registered as well.  This has
+        # nothing to do with the NuGet package version.  It is purely an APIScan registration
+        # value that points to our backend configuration.
+        softwareVersion: '6.10'
+
+        # We want the standard level of logging.
+        verbosityLevel: standard
 
       armory:
         enabled: true
+        break: ${{ parameters.breakOnSdlError }}
 
       asyncSdl:
         # Disabling this as it complicates the build process with minimal gain
@@ -142,10 +200,14 @@ extends:
 
       binskim:
         enabled: true
+        break: ${{ parameters.breakOnSdlError }}
 
       codeql:
-        enabled: true
+        # CodeQL 3000 is configured under the `compiled` key; `enabled` is a sub-property of
+        # `compiled` (not of `codeql`).  CodeQL runs asynchronously on its own platform and cannot
+        # break the build by design, so it has no `break` value.
         compiled:
+          enabled: true
 
       credscan:
         enabled: true
@@ -154,14 +216,23 @@ extends:
       eslint:
         # Only useful for repos with ECMAscript - which we do not have.
         enabled: false
+        # Break value is wired preemptively so it takes effect if eslint is ever enabled.
+        break: ${{ parameters.breakOnSdlError }}
 
       policheck:
         enabled: true
+        break: ${{ parameters.breakOnSdlError }}
         exclusionsFile: '$(REPO_ROOT)\.config\PolicheckExclusions.xml'
 
+      psscriptanalyzer:
+        # Static analysis of the repository's PowerShell scripts (e.g. under eng/).
+        enabled: true
+        break: ${{ parameters.breakOnSdlError }}
+
       roslyn:
         # Note, requires RoslynAnalyzers task to be added as a separate step
         enabled: true
+        break: ${{ parameters.breakOnSdlError }}
 
       publishLogs:
         enabled: true
@@ -172,9 +243,29 @@ extends:
         packageVersion: '$(Build.BuildNumber)'
 
       tsa:
-        # We disable TSA for non-official pipelines. This inhibits spurious TSA alerts and ADO task
-        # creation, since non-official builds are often done against development branches. This also
-        # forces all SDL tasks into "break" build mode.
+        # TSA (Trust Services Automation) files SDL analysis findings as Azure DevOps bug work
+        # items.  It is hardcoded DISABLED in the non-official pipeline.
+        #
+        # Why disabled here:
+        #   The non-official pipeline is a manual-only, developer-helper build used to validate
+        #   SDL scans and iterate on fixes before they land.  We do not want it filing (or
+        #   updating) bug work items -- that would create churn and duplicate the bugs owned by
+        #   the official pipeline, where TSA is hardcoded enabled.  Here, findings surface
+        #   directly in the build instead, gated by breakOnSdlError.
+        #
+        # Interaction with other SDL tool defaults:
+        #   OneBranch derives each SDL tool's DEFAULT `break` value from whether TSA is enabled --
+        #   per the OneBranch "Customize SDL" docs, most tools default to `break: false` when TSA
+        #   is enabled and `break: true` when it is disabled.  We do NOT rely on that implicit
+        #   coupling: every tool above sets `break: ${{ parameters.breakOnSdlError }}` explicitly,
+        #   which overrides the TSA-derived default.  We have hit bugs in OneBranch's implicit
+        #   break-altering logic in the past, so both `tsa.enabled` and each tool's `break` are
+        #   set explicitly to keep the behaviour deterministic.
+        #
+        # Otherwise independent of breakOnSdlError:
+        #   Aside from that default-flipping, TSA and breakOnSdlError are orthogonal.  Disabling
+        #   TSA here does not by itself force breaking -- breakOnSdlError is what controls whether
+        #   findings fail the build.
         enabled: false
         configFile: '$(REPO_ROOT)/.config/tsaoptions.json'
 
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 8ea429bb00..69aeea72fb 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -6,15 +6,9 @@
 
 name: $(Year:YY)$(DayOfYear)$(Rev:.r)
 
-# No PR-based triggers.
+# No activity-based triggers.
 pr: none
-
-# We trigger runs on activity on the internal/main branch, but not on any other branches.  This
-# pipeline is intended to only run against the ADO.Net dotnet-sqlclient repo.
-trigger:
-  branches:
-    include:
-      - internal/main
+trigger: none
 
 # We run this pipeline on a daily schedule.
 schedules:
@@ -27,19 +21,21 @@ schedules:
 
 # These parameters are visible in the Azure DevOps pipeline UI when a new run is queued.
 parameters:
+
+  # When true, any SDL errors will break the build.  When false, SDL errors will be logged but
+  # will not break the build.  TSA bug filing is always enabled in the official pipeline and is
+  # independent of this parameter (see the tsa block in globalSdl).
+  - name: breakOnSdlError
+    displayName: Break on SDL error
+    type: boolean
+    default: true
+
   # True to enable debug information and steps.
   - name: debug
     displayName: Enable debug output
     type: boolean
     default: false
 
-  # When true, publish symbols and push NuGet packages to Production environments.  When false,
-  # symbols use PPE and NuGet packages use QA/Test.
-  - name: releaseToProduction
-    displayName: Publish Symbols and NuGet Packages to Production
-    type: boolean
-    default: false
-
   # True if this is a preview build.
   - name: isPreview
     displayName: Is this a preview build?
@@ -52,6 +48,13 @@ parameters:
     type: boolean
     default: false
 
+  # When true, publish symbols and push NuGet packages to Production environments.  When false,
+  # symbols use PPE and NuGet packages use QA/Test.
+  - name: releaseToProduction
+    displayName: Publish Symbols and NuGet Packages to Production
+    type: boolean
+    default: false
+
   # Build parameters — select which packages to build.
 
   # Build the Microsoft.SqlServer.Server package.
@@ -147,20 +150,64 @@ extends:
       category: NonAzure
 
     # See: https://aka.ms/obpipelines/sdl
+    #
+    # The following SDL tasks are auto-injected by the OneBranch / 1ES Pipeline Templates and run
+    # WITHOUT any explicit globalSdl configuration.  They were verified as running in recent
+    # pipeline runs, so we intentionally do not redeclare them here:
+    #
+    #   - Component Governance / Component Detection / Secure Supply Chain
+    #     Analysis (dependency vulnerability scanning)
+    #   - AntiMalware Scanner (Binary + Source)
+    #   - 1ES Secret Scanning (SPMI)
+    #   - Generate SBoM Manifest
+    #   - CodeSign Validation (runs on the signing path; nothing is signed in non-official runs)
+    #   - CodeQL 3000 (ALWAYS enabled via the 1ESPT (Official.CrossPlat) entry point, regardless of
+    #     the codeql config below.)
+    #
     globalSdl:
+
+      # Snapshot of the SDL analyzer findings that pre-existed the breakOnSdlError rollout, so
+      # builds only break on NEW findings.  Generated from the SDL analysis artifacts of a full
+      # non-official run and kept under .config/ alongside the other SDL tool configs
+      # (CredScan/PoliCheck/TSA).
+      baseline:
+        baselineFile: $(Build.SourcesDirectory)/.config/guardian/.gdnbaselines
+
+      # Configure APIScan behaviour:
+      #
+      # https://eng.ms/docs/products/onebranch/securitycompliancegovernanceandpolicies/sdlforcontainerizedworkflows/customizesdlforcontainerbuilds#apiscan
+      #
+      # https://eng.ms/docs/coreai/devdiv/one-engineering-system-1es/1es-mohanb/security-integration/guardian-wiki/sdl-azdo-extension/apiscan-build-task#v2
+      #
       apiscan:
-        # APIScan "software name" and version parameters are set on a per-job basis with via
-        # ob_sdl_apiscan_* variables.
+        # We want APIScan enabled by default for our jobs.  However, some jobs don't produce any
+        # artifacts, and they will disable APIScan via the OneBranch per-job ob_sdl_apiscan_enabled
+        # variable.
         enabled: true
-        # TODO(https://sqlclientdrivers.visualstudio.com/ADO.Net/_workitems/edit/42858):
-        # We have temporarily disabled breaking the build on ApiScan results until we can:
-        #   - Register our new packages with API Scan, and/or
-        #   - Publish MSDN/Learn/etc documentation for the new packages.
-        break: false
+
+        # APIScan errors break the build when breakOnSdlError is set.
+        break: ${{ parameters.breakOnSdlError }}
+
+        # Use release mode for official pipelines.
+        modeType: release
+
+        # We have a single "name" registered with APIScan for all of our packages.
+        #
+        # https://eng.ms/docs/products/apiscan/onboard/requirements/registersoftware
+        #
+        softwareName: Microsoft.Data.SqlClient
+
+        # Similar to the software name, we have a single version registered as well.  This has
+        # nothing to do with the NuGet package version.  It is purely an APIScan registration
+        # value that points to our backend configuration.
+        softwareVersion: '6.10'
+
+        # We want the standard level of logging.
+        verbosityLevel: standard
 
       armory:
         enabled: true
-        break: true
+        break: ${{ parameters.breakOnSdlError }}
 
       asyncSdl:
         # Disabling this as it complicates the build process with minimal gain
@@ -168,11 +215,14 @@ extends:
 
       binskim:
         enabled: true
-        break: true
+        break: ${{ parameters.breakOnSdlError }}
 
       codeql:
-        enabled: true
+        # CodeQL 3000 is configured under the `compiled` key; `enabled` is a sub-property of
+        # `compiled` (not of `codeql`).  CodeQL runs asynchronously on its own platform and cannot
+        # break the build by design, so it has no `break` value.
         compiled:
+          enabled: true
 
       credscan:
         enabled: true
@@ -181,16 +231,23 @@ extends:
       eslint:
         # Only useful for repos with ECMAscript - which we do not have.
         enabled: false
+        # Break value is wired preemptively so it takes effect if eslint is ever enabled.
+        break: ${{ parameters.breakOnSdlError }}
 
       policheck:
         enabled: true
-        break: true
+        break: ${{ parameters.breakOnSdlError }}
         exclusionsFile: '$(REPO_ROOT)\.config\PolicheckExclusions.xml'
 
+      psscriptanalyzer:
+        # Static analysis of the repository's PowerShell scripts (e.g. under eng/).
+        enabled: true
+        break: ${{ parameters.breakOnSdlError }}
+
       roslyn:
         # Note, requires RoslynAnalyzers task to be added as a separate step
         enabled: true
-        break: true
+        break: ${{ parameters.breakOnSdlError }}
 
       publishLogs:
         enabled: true
@@ -201,8 +258,25 @@ extends:
         packageVersion: '$(Build.BuildNumber)'
 
       tsa:
-        # OneBranch publishes all sdl results to TSA. If TSA is disabled, all SDL tools will be
-        # forced into 'break' build mode.
+        # TSA (Trust Services Automation) files SDL analysis findings as Azure DevOps bug work
+        # items.  It is hardcoded enabled in the official pipeline so that every SDL finding is
+        # always tracked as a bug, regardless of how any individual run terminates.
+        #
+        # Interaction with other SDL tool defaults:
+        #   OneBranch derives each SDL tool's DEFAULT `break` value from whether TSA is enabled --
+        #   per the OneBranch "Customize SDL" docs, most tools default to `break: false` when TSA
+        #   is enabled and `break: true` when it is disabled.  We do NOT rely on that implicit
+        #   coupling: every tool above sets `break: ${{ parameters.breakOnSdlError }}` explicitly,
+        #   which overrides the TSA-derived default.  We have hit bugs in OneBranch's implicit
+        #   break-altering logic in the past, so both `tsa.enabled` and each tool's `break` are
+        #   set explicitly to keep the behaviour deterministic.
+        #
+        # Otherwise independent of breakOnSdlError:
+        #   Aside from that default-flipping, TSA and breakOnSdlError are orthogonal.  TSA files
+        #   bugs from the complete finding set (the TSAUpload step runs after all analyzers have
+        #   produced results), while breakOnSdlError separately controls whether those same
+        #   findings also fail the build.  Enabling TSA here does not suppress breaking, and
+        #   breaking does not prevent bug filing within a job.
         enabled: true
         configFile: '$(REPO_ROOT)/.config/tsaoptions.json'
 
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index 7d940c1cb7..d56d95044e 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -51,10 +51,6 @@ variables:
   - name: CommitHead
     value: '' # the value will be extracted from the repo's head
 
-  # https://aka.ms/obpipelines/sdl
-  - name: ob_sdl_binskim_break
-    value: true
-
   - name: Packaging.EnableSBOMSigning
     value: true
 

From 80d9ee2a96165a91a6da7503b76cedea34b34e9b Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Mon, 27 Jul 2026 11:22:26 -0700
Subject: [PATCH 208/298] Expand connection pool benchmark coverage for pool
 implementation A/B testing (#4459)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Expand connection pool benchmark coverage for pool implementation A/B testing

Adds tooling and benchmarks to evaluate the new ChannelDbConnectionPool
(UseConnectionPoolV2) against the legacy WaitHandleDbConnectionPool, aligned
with the design goals in issue #3356 (parallel connection opening, async best
practices / low threadpool pressure, minimal lock contention).

- Add a process-level `UseConnectionPoolV2` config flag (runnerconfig.jsonc ->
  Config -> Program) that sets the AppContext switch once at startup. The pool
  implementation switch is read and cached when the first pool is created, so it
  cannot be toggled per iteration; comparing the two pools requires two runs
  (flag false, then true). This applies to every pool benchmark in the suite.
- Add ConnectionPoolChurnRunner: single-threaded, no-contention open/close on a
  warm pool. Isolates raw per-checkout CPU and allocation cost (the low-noise
  counterpart to the parallel/contention runners).
- Add ConnectionPoolContentionRunner: steady-state open/query/close with pure
  sync vs pure async workers and a large (no-wait) vs small (back-pressure) pool
  axis, focused on the waiter wake path and threadpool pressure.

Leaves the existing ConnectionPoolStressRunner and ParallelAsyncConnectionRunner
untouched; the new flag lets them all be run against either pool implementation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address Copilot review comments on ConnectionPoolContentionRunner

- Split SteadyStateOpenQueryClose into separate async/sync Task.Run paths
  (Task.Run(Func<Task>) vs Task.Run(Action)) so the sync branch does not create
  an async state machine, removing overhead unrelated to pool behavior.
- Wrap WarmPool connections in try/finally and dispose each SqlConnection after
  closing to prevent retaining objects until GC each iteration, which would add
  allocation noise to the benchmark measurements.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Split sync/async pool benchmarks into separate methods

Address review feedback: remove the AsyncBehavior param from the churn and
contention runners and expose dedicated sync and async benchmarks. The
previous single async-signed method forced the sync path to pay async
state-machine overhead, distorting per-operation allocation measurements.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Clarify UseConnectionPoolV2 switch comment in perf test setup

Address review feedback: the switch is always set from config (true or
false), not only when the flag is enabled. Reword the comment accordingly.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Add over-provisioned pool case to contention benchmark

Address review feedback: add a MaxPoolSize (100) greater than Parallelism
(50) so the contention runner covers all three regimes — pool larger than,
equal to, and smaller than the worker count.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Return Task.WhenAll directly from contention benchmarks

Address review feedback: the contention benchmark methods only build a task
array and await Task.WhenAll, so they don't need an async state machine.
Return the Task directly to avoid an extra allocation per invocation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../ConnectionPoolChurnRunner.cs              |  95 ++++++++++
 .../ConnectionPoolContentionRunner.cs         | 163 ++++++++++++++++++
 .../tests/PerformanceTests/Config/Config.cs   |  16 ++
 .../tests/PerformanceTests/Program.cs         |  26 +++
 .../tests/PerformanceTests/runnerconfig.jsonc |  22 +++
 5 files changed, 322 insertions(+)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolChurnRunner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolContentionRunner.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolChurnRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolChurnRunner.cs
new file mode 100644
index 0000000000..ca1930e451
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolChurnRunner.cs
@@ -0,0 +1,95 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Measures the raw per-checkout overhead of the connection pool: a single thread
+    /// repeatedly opens and closes a connection against a warm pool, with no contention.
+    ///
+    /// With only one caller and a pre-warmed pool, every open is a pure pool checkout
+    /// (no physical connect, no waiting), so this benchmark isolates the CPU and
+    /// allocation cost of the pool's acquire/return path itself. It is the low-noise
+    /// counterpart to the parallel and contention runners and is the most sensitive
+    /// measure of per-operation allocations (watch the Allocated / Gen0 columns) — a key
+    /// concern for the new ChannelDbConnectionPool, which aims to avoid extra allocations
+    /// on the hot path (issue #3356).
+    ///
+    /// The pool implementation (legacy vs V2) is a process-level choice — see the remarks
+    /// on <see cref="ConnectionPoolStressRunner"/>. Run twice (UseConnectionPoolV2 false
+    /// then true) to compare.
+    ///
+    /// Related issue: #3356
+    /// </summary>
+    public class ConnectionPoolChurnRunner : BaseRunner
+    {
+        /// <summary>
+        /// Number of sequential open/close operations performed per invocation. Kept high
+        /// so each measured invocation captures many pool checkouts, yielding a stable
+        /// per-operation cost.
+        /// </summary>
+        [Params(1000)]
+        public int OpsPerInvocation { get; set; }
+
+        private string _connectionString;
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            Console.WriteLine(
+                "[ConnectionPoolChurnRunner] Pool implementation: " +
+                (s_config.UseConnectionPoolV2
+                    ? "ChannelDbConnectionPool (V2)"
+                    : "WaitHandleDbConnectionPool (legacy)"));
+
+            var builder = new SqlConnectionStringBuilder(s_config.ConnectionString)
+            {
+                Pooling = true,
+                MaxPoolSize = 100,
+                // Pre-warm a single connection so the very first checkout is served from
+                // the pool rather than establishing a physical connection.
+                MinPoolSize = 1
+            };
+            _connectionString = builder.ConnectionString;
+
+            // Force the pool to exist and hold at least one idle connection.
+            using var warm = new SqlConnection(_connectionString);
+            warm.Open();
+            warm.Close();
+        }
+
+        [GlobalCleanup]
+        public void Cleanup()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            SqlConnection.ClearPool(conn);
+        }
+
+        [Benchmark]
+        public void RapidOpenCloseSingleThread()
+        {
+            for (int i = 0; i < OpsPerInvocation; i++)
+            {
+                using var conn = new SqlConnection(_connectionString);
+                conn.Open();
+                // Dispose returns the connection to the pool.
+            }
+        }
+
+        [Benchmark]
+        public async Task RapidOpenCloseSingleThreadAsync()
+        {
+            for (int i = 0; i < OpsPerInvocation; i++)
+            {
+                using var conn = new SqlConnection(_connectionString);
+                await conn.OpenAsync();
+                // Dispose returns the connection to the pool.
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolContentionRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolContentionRunner.cs
new file mode 100644
index 0000000000..899d25f64c
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolContentionRunner.cs
@@ -0,0 +1,163 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Measures steady-state pool throughput under concurrent load — the hot path for
+    /// real applications such as web servers, where many workers repeatedly check a
+    /// connection out of a warm pool, do a small unit of work, and return it.
+    ///
+    /// This is where the legacy WaitHandleDbConnectionPool and the new
+    /// ChannelDbConnectionPool differ most (issue #3356):
+    ///
+    /// - When the pool is large enough to serve every worker, the benchmark isolates
+    ///   checkout/return overhead and lock contention on the hot path.
+    /// - When the pool is smaller than the worker count (<see cref="MaxPoolSize"/> less
+    ///   than <see cref="Parallelism"/>), workers must wait for a connection to be
+    ///   returned. This exercises the waiter wake path: the legacy pool parks on
+    ///   WaitHandle.WaitAny (a blocking wait that consumes a threadpool thread for async
+    ///   callers), while the new pool awaits the idle channel asynchronously. The
+    ///   ThreadingDiagnoser's "Completed Work Items" and "Lock Contentions" columns make
+    ///   the difference visible.
+    ///
+    /// The pool implementation (legacy vs V2) and SNI are process-level choices — see the
+    /// remarks on <see cref="ConnectionPoolStressRunner"/>. Run twice (UseConnectionPoolV2
+    /// false then true) to compare.
+    ///
+    /// Related issues: #601, #979, #3356
+    /// </summary>
+    public class ConnectionPoolContentionRunner : BaseRunner
+    {
+        /// <summary>
+        /// Number of concurrent workers competing for pooled connections.
+        /// </summary>
+        [Params(50)]
+        public int Parallelism { get; set; }
+
+        /// <summary>
+        /// Maximum pool size, exercised across three regimes relative to
+        /// <see cref="Parallelism"/>: larger than the worker count (idle spare
+        /// connections, no contention), equal to it (fully subscribed, no contention), and
+        /// smaller than it (pool exhaustion forces workers to wait for a connection to be
+        /// returned — back-pressure).
+        /// </summary>
+        [Params(100, 50, 10)]
+        public int MaxPoolSize { get; set; }
+
+        /// <summary>
+        /// Number of open/query/close operations each worker performs per invocation.
+        /// </summary>
+        [Params(20)]
+        public int OpsPerWorker { get; set; }
+
+        private string _connectionString;
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            Console.WriteLine(
+                "[ConnectionPoolContentionRunner] Pool implementation: " +
+                (s_config.UseConnectionPoolV2
+                    ? "ChannelDbConnectionPool (V2)"
+                    : "WaitHandleDbConnectionPool (legacy)"));
+
+            var builder = new SqlConnectionStringBuilder(s_config.ConnectionString)
+            {
+                Pooling = true,
+                MaxPoolSize = MaxPoolSize,
+                MinPoolSize = 0
+            };
+            _connectionString = builder.ConnectionString;
+        }
+
+        [IterationSetup]
+        public void IterationSetup()
+        {
+            // Warm the pool up to MaxPoolSize so the measured run reflects steady-state
+            // checkout/return rather than first-time physical connection establishment.
+            WarmPool(MaxPoolSize);
+        }
+
+        [IterationCleanup]
+        public void IterationCleanup()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            SqlConnection.ClearPool(conn);
+        }
+
+        [Benchmark]
+        public Task SteadyStateOpenQueryClose()
+        {
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                tasks[i] = Task.Run(() =>
+                {
+                    for (int op = 0; op < OpsPerWorker; op++)
+                    {
+                        using var conn = new SqlConnection(_connectionString);
+                        conn.Open();
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = "SELECT 1";
+                        _ = cmd.ExecuteScalar();
+                        // Dispose returns the connection to the pool.
+                    }
+                });
+            }
+
+            return Task.WhenAll(tasks);
+        }
+
+        [Benchmark]
+        public Task SteadyStateOpenQueryCloseAsync()
+        {
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                tasks[i] = Task.Run(async () =>
+                {
+                    for (int op = 0; op < OpsPerWorker; op++)
+                    {
+                        using var conn = new SqlConnection(_connectionString);
+                        await conn.OpenAsync();
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = "SELECT 1";
+                        _ = await cmd.ExecuteScalarAsync();
+                        // Dispose returns the connection to the pool.
+                    }
+                });
+            }
+
+            return Task.WhenAll(tasks);
+        }
+
+        private void WarmPool(int count)
+        {
+            var conns = new SqlConnection[count];
+            try
+            {
+                for (int i = 0; i < count; i++)
+                {
+                    conns[i] = new SqlConnection(_connectionString);
+                    conns[i].Open();
+                }
+            }
+            finally
+            {
+                // Close and dispose every connection so they return to the pool and
+                // are not retained until GC (which would add allocation/GC noise).
+                for (int i = 0; i < count; i++)
+                {
+                    conns[i]?.Close();
+                    conns[i]?.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
index 7a93f65090..2bbd1f1c23 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
@@ -12,6 +12,20 @@ public class Config
         public string ConnectionString;
         public bool UseManagedSniOnWindows;
         public bool UseOptimizedAsyncBehaviour;
+
+        /// <summary>
+        /// When true, selects the new channel-based connection pool
+        /// (<c>ChannelDbConnectionPool</c>) by enabling the
+        /// <c>Switch.Microsoft.Data.SqlClient.UseConnectionPoolV2</c> AppContext switch.
+        /// When false (the default), the legacy <c>WaitHandleDbConnectionPool</c> is used.
+        ///
+        /// This is a process-level setting: the switch is read and cached the first time
+        /// a pool is created, so it cannot be toggled per benchmark iteration. To compare
+        /// the two implementations, run the benchmark once with this flag false and once
+        /// with it true.
+        /// </summary>
+        public bool UseConnectionPoolV2;
+
         public bool WaitForProfiler;
         public bool UseNativeMemoryAndETWProfiler;
         public Benchmarks Benchmarks;
@@ -54,6 +68,8 @@ public class Benchmarks
         public RunnerJob JsonVsVarcharReadRunnerConfig;
         public RunnerJob BeginTransactionRunnerConfig;
         public RunnerJob ConnectionPoolStressRunnerConfig;
+        public RunnerJob ConnectionPoolContentionRunnerConfig;
+        public RunnerJob ConnectionPoolChurnRunnerConfig;
     }
 
     public class RunnerJob
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
index 8f64c7448a..c23ffc8412 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
@@ -33,6 +33,8 @@ public Program()
             Run_JsonVsVarcharReadBenchmark();
             Run_BeginTransactionBenchmark();
             Run_ConnectionPoolStressBenchmark();
+            Run_ConnectionPoolContentionBenchmark();
+            Run_ConnectionPoolChurnBenchmark();
 
             // TODOs:
             // Prepared/Regular Parameterized queries
@@ -48,6 +50,14 @@ private void SetupConfigurations()
                 AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows", true);
             }
 
+            // Set the UseConnectionPoolV2 AppContext switch from config (true or false).
+            // This must be set before any connection is opened because the switch is read
+            // and cached when a pool is first created; it cannot be changed later in the
+            // process lifetime.
+            AppContext.SetSwitch(
+                "Switch.Microsoft.Data.SqlClient.UseConnectionPoolV2",
+                _config.UseConnectionPoolV2);
+
             // If the config file specifies to use optimized async behavior, 
             // enable packet multiplexing feature and other optimizations in SqlClient 
             // by setting the appropriate AppContext switches.
@@ -186,6 +196,22 @@ private void Run_ConnectionPoolStressBenchmark()
             }
         }
 
+        private void Run_ConnectionPoolContentionBenchmark()
+        {
+            if (_config.Benchmarks.ConnectionPoolContentionRunnerConfig?.Enabled == true)
+            {
+                BenchmarkRunner.Run<ConnectionPoolContentionRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.ConnectionPoolContentionRunnerConfig));
+            }
+        }
+
+        private void Run_ConnectionPoolChurnBenchmark()
+        {
+            if (_config.Benchmarks.ConnectionPoolChurnRunnerConfig?.Enabled == true)
+            {
+                BenchmarkRunner.Run<ConnectionPoolChurnRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.ConnectionPoolChurnRunnerConfig));
+            }
+        }
+
         /// <summary>
         /// The main entry point for the performance tests program.
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
index 34d7a511aa..5777db9652 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
@@ -2,6 +2,12 @@
     "ConnectionString": "Server=tcp:localhost; Integrated Security=true; Initial Catalog=sqlclient-perf-db;",
     // Enable this flag to enable managed SNI on Windows.
     "UseManagedSniOnWindows": false,
+    // Enable this flag to select the new channel-based connection pool
+    // (ChannelDbConnectionPool) instead of the legacy WaitHandleDbConnectionPool.
+    // This is a process-level setting (the pool implementation switch is cached the
+    // first time a pool is created), so comparing the two pools requires two runs:
+    // once with this flag false (legacy) and once true (new). See issue #3356.
+    "UseConnectionPoolV2": false,
     // Enable this flag to enable optimized async behavior in SqlClient. 
     // This is useful for benchmarking packet multiplexing and async performance improvements.
     "UseOptimizedAsyncBehaviour": true,
@@ -120,6 +126,22 @@
             "InvocationCount": 1,
             "WarmupCount": 1,
             "RowCount": 0
+        },
+        "ConnectionPoolContentionRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 15,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 0
+        },
+        "ConnectionPoolChurnRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 15,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 0
         }
     }
 }

From b298eb316d546f91c79a56c671c3384bd2bca271 Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Tue, 28 Jul 2026 00:44:53 +0530
Subject: [PATCH 209/298] Complete connection pool pruning (Story 2/3/4)
 (#4463)

---
 .../ConnectionPool/ChannelDbConnectionPool.cs |  11 +-
 .../SqlClient/ConnectionPool/PoolPruner.cs    |  86 +++++---
 .../ChannelDbConnectionPoolPruningTest.cs     | 184 +++++++++++++++---
 3 files changed, 227 insertions(+), 54 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 63910c331e..0b5becc0fa 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -185,11 +185,14 @@ internal ChannelDbConnectionPool(
                 _errorState = new BlockingPeriodErrorState(_instanceId, timeProvider: _timeProvider);
             }
 
-            // Pruning is only useful when the pool can grow beyond MinPoolSize.
-            // If min >= max, the pool is fixed-size and pruning would never activate.
-            if (MinPoolSize < MaxPoolSize)
+            // Pruning is only useful when the pool can grow beyond MinPoolSize and idle
+            // connections are subject to reclamation. If min >= max the pool is fixed-size so
+            // pruning would never activate; if Connection Idle Timeout is zero, idle connections
+            // are never reclaimed and there is nothing to prune. The pruning window (and thus how
+            // many samples are collected) is derived from IdleTimeout.
+            if (MinPoolSize < MaxPoolSize && PoolGroupOptions.IdleTimeout != TimeSpan.Zero)
             {
-                Pruner = new PoolPruner(this, PoolGroupOptions.LoadBalanceTimeout);
+                Pruner = new PoolPruner(this, PoolGroupOptions.IdleTimeout);
             }
 
             State = Running;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs
index 07899d26e3..9c6621f5f0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Threading;
 using Microsoft.Data.Common;
+using Microsoft.Data.SqlClient.Internal;
 
 #nullable enable
 
@@ -14,29 +15,41 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     /// Periodically samples the idle connection count and, once enough samples are collected,
     /// computes the median and prunes that many idle connections from the pool.
     /// <para>
-    /// This type is only instantiated when the pool can shrink (MinPoolSize &lt; MaxPoolSize).
-    /// When the pool is fixed-size, the pool holds no <see cref="PoolPruner"/> instance.
+    /// This type is only instantiated when the pool can shrink (MinPoolSize &lt; MaxPoolSize) and
+    /// idle-timeout based reclamation is enabled (Connection Idle Timeout &gt; 0). When the pool is
+    /// fixed-size or idle reclamation is disabled, the pool holds no <see cref="PoolPruner"/> instance.
     /// </para>
     /// </summary>
     internal sealed class PoolPruner : IDisposable
     {
         /// <summary>
-        /// Maximum allowed sample buffer size to prevent excessive memory allocation
-        /// from very large lifetime values. With a 10-second interval this supports
-        /// idle lifetimes up to 3000 seconds (50 minutes).
+        /// Maximum number of idle-count samples collected per pruning window. Bounds the sample
+        /// buffer size and the per-window sort cost regardless of how large the configured idle
+        /// timeout is. Once a window would need more than this many samples at
+        /// <see cref="MinIntervalSeconds"/>, the sampling interval is stretched instead of growing
+        /// the buffer, keeping the sample count bounded (the interval itself is separately capped by
+        /// <see cref="MaxIntervalSeconds"/>, so for very large idle timeouts the effective window can
+        /// be shorter than the configured timeout).
+        /// At the <see cref="MinIntervalSeconds"/> floor this supports idle timeouts up to
+        /// <c>MaxSampleSize * MinIntervalSeconds</c> = 3000 seconds (50 minutes) before stretching.
         /// </summary>
         internal const int MaxSampleSize = 300;
 
         /// <summary>
-        /// Default sampling interval.
+        /// Minimum (default) sampling interval, in seconds. Acts as a floor so the pruning timer
+        /// never fires more often than this and preserves the Story 1 cadence for short/typical
+        /// idle timeouts (e.g. the default 300s idle timeout yields a 10s interval and 30 samples).
         /// </summary>
-        private static readonly TimeSpan DefaultSamplingInterval = TimeSpan.FromSeconds(10);
+        internal const int MinIntervalSeconds = 10;
 
         /// <summary>
-        /// Default lifetime window used for sample size calculation when
-        /// LoadBalanceTimeout (Connection Lifetime) is zero.
+        /// Maximum sampling interval, in seconds (1 day). Purely a defensive guard so the derived
+        /// interval handed to <see cref="Timer.Change(TimeSpan, TimeSpan)"/> stays well under its
+        /// ~49.7-day limit for pathological idle timeouts (the <c>Connection Idle Timeout</c> keyword
+        /// accepts up to <see cref="int.MaxValue"/> seconds). It only engages above ~300-day idle
+        /// timeouts, so it never affects any realistic configuration.
         /// </summary>
-        private static readonly TimeSpan DefaultLifetimeWindow = TimeSpan.FromSeconds(300);
+        internal const int MaxIntervalSeconds = 24 * 60 * 60;
 
         /// <summary>
         /// The owning connection pool whose idle connections are pruned.
@@ -56,7 +69,8 @@ internal sealed class PoolPruner : IDisposable
 
         /// <summary>
         /// Number of idle count samples to collect before computing the median and pruning.
-        /// Equals lifetime / interval (rounded up), clamped to <see cref="MaxSampleSize"/>.
+        /// Equals <c>ceil(idleTimeout / samplingInterval)</c>, bounded by <see cref="MaxSampleSize"/>
+        /// (the interval is stretched rather than exceeding the sample cap for large idle timeouts).
         /// </summary>
         private readonly int _sampleSize;
 
@@ -88,25 +102,46 @@ internal sealed class PoolPruner : IDisposable
         /// Creates a new pruner for the given pool.
         /// </summary>
         /// <param name="pool">The owning connection pool.</param>
-        /// <param name="lifetimeWindow">
-        /// The connection lifetime window used to compute sample count.
-        /// When zero or negative, <see cref="DefaultLifetimeWindow"/> is used.
+        /// <param name="idleTimeout">
+        /// The configured Connection Idle Timeout, used as the pruning window. The sampling interval
+        /// and sample count are derived from it so the window covers the idle timeout for typical
+        /// values, while the interval stays bounded by <see cref="MaxIntervalSeconds"/> and the sample
+        /// count by <see cref="MaxSampleSize"/> (see the constructor body for the exact formula). For
+        /// very large idle timeouts both are capped, so the effective window can be shorter than the
+        /// configured timeout. The pool only constructs a pruner when idle-timeout based reclamation is
+        /// enabled (idleTimeout &gt; 0); a defensive floor keeps the sizing math valid.
         /// </param>
-        internal PoolPruner(ChannelDbConnectionPool pool, TimeSpan lifetimeWindow)
+        internal PoolPruner(ChannelDbConnectionPool pool, TimeSpan idleTimeout)
         {
             _pool = pool;
-            _samplingInterval = DefaultSamplingInterval;
 
-            int lifetimeSeconds = (int)lifetimeWindow.TotalSeconds;
-            if (lifetimeSeconds <= 0)
+            // The pool only constructs a pruner when IdleTimeout > 0, but floor at one second so
+            // the sizing math below always sees a positive window even under unexpected inputs.
+            int idleTimeoutSeconds = Math.Max(1, (int)idleTimeout.TotalSeconds);
+
+            // Derive the interval so the window covers the idle timeout with at most MaxSampleSize
+            // samples. Short/typical timeouts keep the MinIntervalSeconds cadence (e.g. 300s -> 10s,
+            // 30 samples); large timeouts stretch the interval and pin the count at MaxSampleSize. The
+            // MaxIntervalSeconds cap is a defensive Timer.Change overflow guard (engages >~300 days).
+            // Math.Clamp is unavailable on net462, so clamp explicitly with Min/Max.
+            int intervalForMaxSamples = DivideRoundingUp(idleTimeoutSeconds, MaxSampleSize);
+            int flooredInterval = Math.Max(intervalForMaxSamples, MinIntervalSeconds);
+            int intervalSeconds = Math.Min(flooredInterval, MaxIntervalSeconds);
+
+            int sampleSize = Math.Min(MaxSampleSize, DivideRoundingUp(idleTimeoutSeconds, intervalSeconds));
+
+            if (intervalSeconds != MinIntervalSeconds)
             {
-                lifetimeSeconds = (int)DefaultLifetimeWindow.TotalSeconds;
+                // The interval was stretched (or clamped) away from the default. Surface the derived
+                // cadence so operators can tell why a very large Connection Idle Timeout samples less
+                // frequently than the default 10-second interval.
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.PoolPruner|RES|INFO|CPOOL> Idle timeout {0}s derived a pruning interval of {1}s with {2} samples (max {3}).",
+                    idleTimeoutSeconds, intervalSeconds, sampleSize, MaxSampleSize);
             }
 
-            int intervalSeconds = (int)_samplingInterval.TotalSeconds;
-            _sampleSize = Math.Min(
-                DivideRoundingUp(lifetimeSeconds, intervalSeconds),
-                MaxSampleSize);
+            _samplingInterval = TimeSpan.FromSeconds(intervalSeconds);
+            _sampleSize = sampleSize;
 
             // Subtract 1 to convert from length to 0-based index. Safe because
             // DivideRoundingUp always returns >= 1, so _sampleSize >= 1.
@@ -127,6 +162,9 @@ internal PoolPruner(ChannelDbConnectionPool pool, TimeSpan lifetimeWindow)
         /// <summary>Total number of samples collected per pruning window. Exposed for unit tests.</summary>
         internal int SampleSize => _sampleSize;
 
+        /// <summary>The derived interval between pruning samples/evaluations. Exposed for unit tests.</summary>
+        internal TimeSpan SamplingInterval => _samplingInterval;
+
         /// <summary>Read-only view of the sample buffer contents. Exposed for unit tests.</summary>
         internal ReadOnlySpan<int> Samples => _samples;
 
@@ -162,7 +200,7 @@ internal void UpdateTimer()
                 else if (numConnections <= _pool.PoolGroupOptions.MinPoolSize && _timerEnabled)
                 {
                     // Pool shrunk back to min — stop pruning, reset sample buffer.
-                    _timer.Change(Timeout.Infinite, Timeout.Infinite);
+                    _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
                     _sampleIndex = 0;
                     _timerEnabled = false;
                 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs
index 3f7f3b0bc5..fad16cf230 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolPruningTest.cs
@@ -27,7 +27,8 @@ public class ChannelDbConnectionPoolPruningTest
         private static ChannelDbConnectionPool ConstructPool(
             int minPoolSize = 0,
             int maxPoolSize = 50,
-            int loadBalanceTimeout = 0)
+            int loadBalanceTimeout = 0,
+            int idleTimeout = 300)
         {
             var poolGroupOptions = new DbConnectionPoolGroupOptions(
                 poolByIdentity: false,
@@ -36,7 +37,7 @@ private static ChannelDbConnectionPool ConstructPool(
                 creationTimeout: 15,
                 loadBalanceTimeout: loadBalanceTimeout,
                 hasTransactionAffinity: true,
-                idleTimeout: 0
+                idleTimeout: idleTimeout
             );
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
                 new SqlConnectionOptions("Data Source=localhost;"),
@@ -160,6 +161,15 @@ public void Constructor_MinPoolSizeEqualsMax_DoesNotCreatePruningTimer()
             Assert.Null(pool.Pruner);
         }
 
+        [Fact]
+        public void Constructor_IdleTimeoutZero_DoesNotCreatePruningTimer()
+        {
+            // Connection Idle Timeout = 0 disables idle reclamation, so there is nothing to prune.
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10, idleTimeout: 0);
+
+            Assert.Null(pool.Pruner);
+        }
+
         [Fact]
         public void Constructor_PruningTimerStartsDisabled()
         {
@@ -171,19 +181,28 @@ public void Constructor_PruningTimerStartsDisabled()
         }
 
         [Theory]
-        [InlineData(100, 10)]   // 100 / 10 = 10 samples
-        [InlineData(300, 30)]   // 300 / 10 = 30 samples
-        [InlineData(60, 6)]     // 60 / 10 = 6 samples
-        [InlineData(15, 2)]     // 15 / 10 = 2 samples (rounds up)
-        [InlineData(0, 30)]     // 0 falls back to DefaultLifetimeWindow (300) / 10 = 30 samples
-        [InlineData(10000, 300)] // 10000 / 10 = 1000, clamped to MaxPruningSampleSize (300)
-        public void Constructor_CalculatesSampleSizeFromLoadBalanceTimeout(
-            int loadBalanceTimeout, int expectedSampleSize)
+        // Short/typical idle timeouts keep the 10s floor and grow the sample count (Story 1 parity).
+        [InlineData(100, 10, 10)]      // interval 10s, ceil(100/10) = 10 samples
+        [InlineData(300, 10, 30)]      // default idle timeout: 10s, 30 samples
+        [InlineData(60, 10, 6)]        // 10s, 6 samples
+        [InlineData(15, 10, 2)]        // 10s, ceil(15/10) = 2 samples
+        [InlineData(5, 10, 1)]         // sub-interval idle timeout: floored to 10s, 1 sample
+        [InlineData(3000, 10, 300)]    // boundary: MaxSampleSize * 10s, still 10s cadence
+        // Large idle timeouts pin the sample count at MaxSampleSize and stretch the interval so the
+        // window still spans the full idle timeout.
+        [InlineData(6000, 20, 300)]    // ceil(6000/300) = 20s interval, 300 samples
+        [InlineData(10000, 34, 295)]   // ceil(10000/300) = 34s interval, ceil(10000/34) = 295 samples
+        [InlineData(86400, 288, 300)]  // 1-day idle timeout: 288s interval, 300 samples
+        // Pathological idle timeout hits the 1-day interval overflow clamp without throwing.
+        [InlineData(int.MaxValue, 86400, 300)]
+        public void Constructor_CalculatesIntervalAndSampleSizeFromIdleTimeout(
+            int idleTimeout, int expectedIntervalSeconds, int expectedSampleSize)
         {
-            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10, loadBalanceTimeout: loadBalanceTimeout);
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10, idleTimeout: idleTimeout);
             var pruner = GetPruner(pool);
 
             Assert.Equal(expectedSampleSize, pruner.SampleSize);
+            Assert.Equal(TimeSpan.FromSeconds(expectedIntervalSeconds), pruner.SamplingInterval);
         }
 
         #endregion
@@ -262,9 +281,9 @@ public void UpdatePruningTimer_PoolShrinksBackToMin_DisablesTimerAndResetsSample
         [Fact]
         public void PruneIdleConnections_BufferNotFull_CollectsSampleWithoutPruning()
         {
-            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10, loadBalanceTimeout: 30);
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10, idleTimeout: 30);
             var pruner = GetPruner(pool);
-            // loadBalanceTimeout=30 → sample size = 30/10 = 3
+            // idleTimeout=30 → sample size = 30/10 = 3
 
             // Fill the pool so pruning timer is active
             FillPoolWithIdleConnections(pool, 5);
@@ -281,8 +300,8 @@ public void PruneIdleConnections_BufferNotFull_CollectsSampleWithoutPruning()
         [Fact]
         public void PruneIdleConnections_RespectsMinPoolSizeFloor()
         {
-            // loadBalanceTimeout=20 → 2 samples
-            using var pool = ConstructPool(minPoolSize: 5, maxPoolSize: 20, loadBalanceTimeout: 20);
+            // idleTimeout=20 → 2 samples
+            using var pool = ConstructPool(minPoolSize: 5, maxPoolSize: 20, idleTimeout: 20);
             var pruner = GetPruner(pool);
 
             // Fill pool with 10 idle connections
@@ -305,7 +324,7 @@ public void PruneIdleConnections_RespectsMinPoolSizeFloor()
         [Fact]
         public void PruneIdleConnections_TimerDisabled_ReturnsEarlyWithoutPruning()
         {
-            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10, loadBalanceTimeout: 20);
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 10, idleTimeout: 20);
             var pruner = GetPruner(pool);
 
             // Pool starts empty, timer is disabled. Calling prune should be a no-op.
@@ -318,8 +337,8 @@ public void PruneIdleConnections_TimerDisabled_ReturnsEarlyWithoutPruning()
         [Fact]
         public void PruneIdleConnections_DoesNotRemoveInUseConnections()
         {
-            // loadBalanceTimeout=20 → 2 samples
-            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 20, loadBalanceTimeout: 20);
+            // idleTimeout=20 → 2 samples
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 20, idleTimeout: 20);
             var pruner = GetPruner(pool);
 
             // Get 5 connections and KEEP them checked out (in use)
@@ -428,8 +447,8 @@ public void PruneIdleConnections_AllIdleWithZeroMinPoolSize_PrunesEntirePool()
             // When: The pruning interval elapses (sample buffer fills).
             // Then: The pool closes excess idle connections.
 
-            // Use loadBalanceTimeout=20 for 2 samples (fast buffer fill)
-            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 50, loadBalanceTimeout: 20);
+            // Use idleTimeout=20 for 2 samples (fast buffer fill)
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 50, idleTimeout: 20);
             var pruner = GetPruner(pool);
 
             // Simulate high load: open 20 connections
@@ -456,8 +475,8 @@ public void PruneIdleConnections_VariedSamples_UsesMedianNotCurrentIdleCount()
             // When: The pruning interval elapses.
             // Then: Pruning uses sampled usage data (median) to avoid being too aggressive.
 
-            // Use 3 samples (loadBalanceTimeout=30)
-            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 50, loadBalanceTimeout: 30);
+            // Use 3 samples (idleTimeout=30)
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 50, idleTimeout: 30);
             var pruner = GetPruner(pool);
 
             // Simulate varied usage:
@@ -498,8 +517,8 @@ public void PruneIdleConnections_EvenSampleCountWithDistinctValues_UsesLowerMidd
             // Using distinct sample values proves the lower-middle is chosen rather than the
             // upper-middle or an average.
 
-            // loadBalanceTimeout=20 → 2 samples
-            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 20, loadBalanceTimeout: 20);
+            // idleTimeout=20 → 2 samples
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 20, idleTimeout: 20);
             var pruner = GetPruner(pool);
 
             // Start with 8 idle connections.
@@ -535,8 +554,8 @@ public void PruneIdleConnections_SecondWindowAfterPrune_RecomputesMedianFromFres
             // the first: it computes its own median from newly recorded samples and prunes the
             // correct amount, confirming the collect → prune → reset → collect cycle is repeatable.
 
-            // loadBalanceTimeout=20 → 2 samples per window
-            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 20, loadBalanceTimeout: 20);
+            // idleTimeout=20 → 2 samples per window
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 20, idleTimeout: 20);
             var pruner = GetPruner(pool);
 
             // --- Window 1: produces a median of 4 ---
@@ -570,6 +589,119 @@ public void PruneIdleConnections_SecondWindowAfterPrune_RecomputesMedianFromFres
             Assert.Equal(0, pool.Count);
         }
 
+        [Fact]
+        public void PruneIdleConnections_TransientDemandSpikeWithinWindow_DoesNotUnderPrune()
+        {
+            // Complements VariedSamples (which proves a brief lull doesn't over-prune):
+            // here a brief demand spike (a single low idle sample) must not drag the median down
+            // and cause the pruner to under-prune. The sustained idle level should still be reclaimed.
+
+            // idleTimeout=30 → 3 samples
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 50, idleTimeout: 30);
+            var pruner = GetPruner(pool);
+
+            FillPoolWithIdleConnections(pool, 10);
+
+            // Sample 1: 10 idle (steady state).
+            pruner.OnPruningCallback(null);
+            AssertPrunerState(pruner, true, 1, 10);
+            Assert.Equal(10, pool.Count);
+
+            // Demand spike: check out 8, leaving only 2 idle for the middle sample.
+            var busyConnections = CheckOutConnections(pool, 8);
+
+            // Sample 2: 2 idle (transient spike).
+            pruner.OnPruningCallback(null);
+            AssertPrunerState(pruner, true, 2, 10, 2);
+            Assert.Equal(10, pool.Count);
+
+            // Spike subsides — all connections idle again.
+            ReturnConnections(pool, busyConnections);
+
+            // Sample 3: 10 idle. Buffer full → sorted=[2,10,10], median at index 1 = 10.
+            int countBefore = pool.Count;
+            pruner.OnPruningCallback(null);
+            // Median prunes all 10 idle down to MinPoolSize (0), so the timer disables.
+            AssertPrunerState(pruner, false, 0);
+
+            // The transient spike (sample of 2) is ignored; the sustained level (10) is pruned.
+            int pruned = countBefore - pool.Count;
+            Assert.Equal(10, pruned);
+            Assert.Equal(0, pool.Count);
+        }
+
+        [Fact]
+        public void Pruning_PruneToMinThenRegrow_ReArmsAndPrunesAgain()
+        {
+            // Exercises the full prune → disable → regrow → re-arm → prune cycle. After a window
+            // prunes the pool down to MinPoolSize the timer disables; opening new connections must
+            // re-arm it, and the next window must sample and prune independently.
+
+            // idleTimeout=20 → 2 samples
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 50, idleTimeout: 20);
+            var pruner = GetPruner(pool);
+
+            // --- Window 1: prune 6 idle down to min (0), disabling the timer ---
+            FillPoolWithIdleConnections(pool, 6);
+
+            pruner.OnPruningCallback(null); // sample[0] = 6
+            AssertPrunerState(pruner, true, 1, 6);
+
+            pruner.OnPruningCallback(null); // buffer full [6,6], median 6, prune 6 → Count 0
+            AssertPrunerState(pruner, false, 0);
+            Assert.Equal(0, pool.Count);
+
+            // --- Regrow: opening connections must re-arm the disabled timer ---
+            FillPoolWithIdleConnections(pool, 12);
+            AssertPrunerState(pruner, true, 0);
+            Assert.Equal(12, pool.Count);
+
+            // --- Window 2: samples freshly and prunes 12 ---
+            pruner.OnPruningCallback(null); // sample[0] = 12
+            AssertPrunerState(pruner, true, 1, 12);
+
+            int countBefore = pool.Count;
+            pruner.OnPruningCallback(null); // buffer full [12,12], median 12, prune 12 → Count 0
+            AssertPrunerState(pruner, false, 0);
+
+            Assert.Equal(12, countBefore - pool.Count);
+            Assert.Equal(0, pool.Count);
+        }
+
+        [Fact]
+        public void OnPruningCallback_AfterShutdown_IsNoOp()
+        {
+            // A pruning timer callback can race with pool shutdown. Once Shutdown() has disposed the
+            // pruner, a stray callback must be an inert no-op: it must not throw, re-enable the timer,
+            // mutate the sample index, or resurrect connections.
+
+            // idleTimeout=30 → 3 samples
+            using var pool = ConstructPool(minPoolSize: 0, maxPoolSize: 50, idleTimeout: 30);
+            var pruner = GetPruner(pool);
+
+            FillPoolWithIdleConnections(pool, 6);
+
+            // Advance one sample so SampleIndex is non-zero before shutdown.
+            pruner.OnPruningCallback(null);
+            AssertPrunerState(pruner, true, 1, 6);
+
+            pool.Shutdown();
+
+            // Shutdown disposes the pruner (timer disabled) and drains all idle connections.
+            // Dispose intentionally does NOT reset the sample index.
+            Assert.False(pruner.IsTimerEnabled);
+            Assert.Equal(0, pool.Count);
+            int sampleIndexAfterShutdown = pruner.SampleIndex;
+
+            // A stray timer callback after shutdown must be a no-op.
+            Exception recorded = Record.Exception(() => pruner.OnPruningCallback(null));
+
+            Assert.Null(recorded);
+            Assert.False(pruner.IsTimerEnabled);
+            Assert.Equal(sampleIndexAfterShutdown, pruner.SampleIndex);
+            Assert.Equal(0, pool.Count);
+        }
+
         #endregion
 
         #region Test classes

From c9d6efe07465367125663fe5edf3b8881b8272fe Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Mon, 27 Jul 2026 20:19:23 +0100
Subject: [PATCH 210/298] Tests | Refactor NativeVectorFloat32Tests for future
 Half support (#4347)

---
 .../VectorTest/NativeVectorFloat32Tests.cs    | 626 +---------------
 .../SQL/VectorTest/NativeVectorTestsBase.cs   | 678 ++++++++++++++++++
 2 files changed, 700 insertions(+), 604 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorTestsBase.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
index da55ceb1b3..5dd71c0f3f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorFloat32Tests.cs
@@ -1,627 +1,45 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlTypes;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Microsoft.Data.SqlTypes;
 using Xunit;
-using Xunit.Abstractions;
 
-namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.VectorTest
-{
-    public static class VectorFloat32TestData
-    {
-        public const int VectorHeaderSize = 8;
-        public static float[] testData = new float[] { 1.1f, 2.2f, 3.3f, 1.01f, float.MinValue, -0.0f };
-        public static int vectorColumnLength = testData.Length;
-        // Incorrect size for SqlParameter.Size
-        public static int IncorrectParamSize = 3234;
-        public static IEnumerable<object[]> GetVectorFloat32TestData()
-        {
-            // Pattern 1-4 with SqlVector<float>(values: testData)
-            yield return new object[] { 1, new SqlVector<float>(testData), testData, vectorColumnLength };
-            yield return new object[] { 2, new SqlVector<float>(testData), testData, vectorColumnLength };
-            yield return new object[] { 3, new SqlVector<float>(testData), testData, vectorColumnLength };
-            yield return new object[] { 4, new SqlVector<float>(testData), testData, vectorColumnLength };
-
-            // Pattern 1-4 with SqlVector<float>(n)
-            yield return new object[] { 1, SqlVector<float>.CreateNull(vectorColumnLength), Array.Empty<float>(), vectorColumnLength };
-            yield return new object[] { 2, SqlVector<float>.CreateNull(vectorColumnLength), Array.Empty<float>(), vectorColumnLength };
-            yield return new object[] { 3, SqlVector<float>.CreateNull(vectorColumnLength), Array.Empty<float>(), vectorColumnLength };
-            yield return new object[] { 4, SqlVector<float>.CreateNull(vectorColumnLength), Array.Empty<float>(), vectorColumnLength };
-
-            // Pattern 1-4 with DBNull
-            yield return new object[] { 1, DBNull.Value, Array.Empty<float>(), vectorColumnLength };
-            yield return new object[] { 2, DBNull.Value, Array.Empty<float>(), vectorColumnLength };
-            yield return new object[] { 3, DBNull.Value, Array.Empty<float>(), vectorColumnLength };
-            yield return new object[] { 4, DBNull.Value, Array.Empty<float>(), vectorColumnLength };
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.VectorTest;
 
-            // Pattern 1-4 with SqlVector<float>.Null
-            yield return new object[] { 1, SqlVector<float>.Null, Array.Empty<float>(), vectorColumnLength };
+#nullable enable
 
-            // Following scenario is not supported in SqlClient.
-            // This can only be fixed with a behavior change that SqlParameter.Value is internally set to DBNull.Value if it is set to null.
-            //yield return new object[] { 2, SqlVector<float>.Null, Array.Empty<float>(), vectorColumnLength };
-
-            yield return new object[] { 3, SqlVector<float>.Null, Array.Empty<float>(), vectorColumnLength };
-            yield return new object[] { 4, SqlVector<float>.Null, Array.Empty<float>(), vectorColumnLength };
-        }
-    }
+public sealed class VectorFloat32TestData : NativeVectorTestDataBase<float>
+{
+    public override float[] SampleScalarData => [1.1f, 2.2f, 3.3f, 1.01f, float.MinValue, -0.0f];
 
-    [Trait("Set", "3")]
-    public sealed class NativeVectorFloat32Tests : IDisposable
+    public override float[,] SampleDataSet
     {
-        private readonly ITestOutputHelper _output;
-        private static readonly string s_connectionString = ManualTesting.Tests.DataTestUtility.TCPConnectionString;
-        private static readonly string s_tableName = DataTestUtility.GetShortName("VectorTestTable");
-        private static readonly string s_bulkCopySrcTableName = DataTestUtility.GetShortName("VectorBulkCopyTestTable");
-        private static readonly int s_vectorDimensions = VectorFloat32TestData.vectorColumnLength;
-        private static readonly string s_bulkCopySrcTableDef = $@"(Id INT PRIMARY KEY IDENTITY, VectorData vector({s_vectorDimensions}) NULL)";
-        private static readonly string s_tableDefinition = $@"(Id INT PRIMARY KEY IDENTITY, VectorData vector({s_vectorDimensions}) NULL)";
-        private static readonly string s_selectCmdString = $"SELECT VectorData FROM {s_tableName} ORDER BY Id DESC";
-        private static readonly string s_insertCmdString = $"INSERT INTO {s_tableName} (VectorData) VALUES (@VectorData)";
-        private static readonly string s_vectorParamName = $"@VectorData";
-        private static readonly string s_outputVectorParamName = $"@OutputVectorData";
-        private static readonly string s_storedProcName = DataTestUtility.GetShortName("VectorsAsVarcharSp");
-        private static readonly string s_storedProcBody = $@"
-                {s_vectorParamName} vector({s_vectorDimensions}),   -- Input: Serialized float[] as JSON string
-                {s_outputVectorParamName} vector({s_vectorDimensions}) OUTPUT  -- Output: Echoed back from latest inserted row
-                AS
-                BEGIN
-                SET NOCOUNT ON;
-
-                -- Insert into vector table
-                INSERT INTO {s_tableName} (VectorData)
-                VALUES ({s_vectorParamName});
-
-                -- Retrieve latest entry (assumes auto-incrementing ID)
-                SELECT TOP 1 {s_outputVectorParamName} = VectorData
-                FROM {s_tableName}
-                ORDER BY Id DESC;
-                END;";
-
-        public NativeVectorFloat32Tests(ITestOutputHelper output)
-        {
-            _output = output;
-            using var connection = new SqlConnection(s_connectionString);
-            connection.Open();
-            DataTestUtility.CreateTable(connection, s_tableName, s_tableDefinition);
-            DataTestUtility.CreateTable(connection, s_bulkCopySrcTableName, s_bulkCopySrcTableDef);
-            DataTestUtility.CreateSP(connection, s_storedProcName, s_storedProcBody);
-        }
-
-        public void Dispose()
-        {
-            using var connection = new SqlConnection(s_connectionString);
-            connection.Open();
-            DataTestUtility.DropTable(connection, s_tableName);
-            DataTestUtility.DropTable(connection, s_bulkCopySrcTableName);
-            DataTestUtility.DropStoredProcedure(connection, s_storedProcName);
-        }
-
-        private void ValidateSqlVectorFloat32Object(bool isNull, SqlVector<float> sqlVectorFloat32, float[] expectedData, int expectedLength)
-        {
-            Assert.Equal(expectedData, sqlVectorFloat32.Memory.ToArray());
-            Assert.Equal(expectedLength, sqlVectorFloat32.Length);
-            if (!isNull)
-            {
-                Assert.False(sqlVectorFloat32.IsNull, "IsNull set to true for a non-null value");
-            }
-            else
-            {
-                Assert.True(sqlVectorFloat32.IsNull, "IsNull set to false for a null value");
-            }
-        }
-
-        private void ValidateInsertedData(SqlConnection connection, float[] expectedData, int expectedLength)
-        {
-            using var selectCmd = new SqlCommand(s_selectCmdString, connection);
-            using var reader = selectCmd.ExecuteReader();
-            Assert.True(reader.Read(), "No data found in the table.");
-
-            //For both null and non-null cases, validate the SqlVector<float> object
-            ValidateSqlVectorFloat32Object(reader.IsDBNull(0), (SqlVector<float>)reader.GetSqlVector<float>(0), expectedData, expectedLength);
-            ValidateSqlVectorFloat32Object(reader.IsDBNull(0), reader.GetFieldValue<SqlVector<float>>(0), expectedData, expectedLength);
-            ValidateSqlVectorFloat32Object(reader.IsDBNull(0), (SqlVector<float>)reader.GetSqlValue(0), expectedData, expectedLength);
-
-            if (!reader.IsDBNull(0))
-            {
-                ValidateSqlVectorFloat32Object(reader.IsDBNull(0), (SqlVector<float>)reader.GetValue(0), expectedData, expectedLength);
-                ValidateSqlVectorFloat32Object(reader.IsDBNull(0), (SqlVector<float>)reader[0], expectedData, expectedLength);
-                ValidateSqlVectorFloat32Object(reader.IsDBNull(0), (SqlVector<float>)reader["VectorData"], expectedData, expectedLength);
-                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(reader.GetString(0)));
-                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(reader.GetSqlString(0).Value));
-                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(reader.GetFieldValue<string>(0)));
-            }
-            else
-            {
-                Assert.Equal(DBNull.Value, reader.GetValue(0));
-                Assert.Equal(DBNull.Value, reader[0]);
-                Assert.Equal(DBNull.Value, reader["VectorData"]);
-                Assert.Throws<SqlNullValueException>(() => reader.GetString(0));
-                Assert.Throws<SqlNullValueException>(() => reader.GetSqlString(0).Value);
-                Assert.Throws<SqlNullValueException>(() => reader.GetFieldValue<string>(0));
-            }
-        }
-
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsSqlVectorSupported))]
-        [MemberData(nameof(VectorFloat32TestData.GetVectorFloat32TestData), MemberType = typeof(VectorFloat32TestData), DisableDiscoveryEnumeration = true)]
-        public void TestSqlVectorFloat32ParameterInsertionAndReads(
-        int pattern,
-        object value,
-        float[] expectedValues,
-        int expectedLength)
-        {
-            using var conn = new SqlConnection(s_connectionString);
-            conn.Open();
-
-            using var insertCmd = new SqlCommand(s_insertCmdString, conn);
-
-            SqlParameter param = pattern switch
-            {
-                1 => new SqlParameter
-                {
-                    ParameterName = s_vectorParamName,
-                    SqlDbType = SqlDbTypeExtensions.Vector,
-                    Value = value
-                },
-                2 => new SqlParameter(s_vectorParamName, value),
-                3 => new SqlParameter(s_vectorParamName, SqlDbTypeExtensions.Vector) { Value = value },
-                // Even if size is specified, the actual size is determined by the value passed and specified size is ignored.
-                4 => new SqlParameter(s_vectorParamName, SqlDbTypeExtensions.Vector, VectorFloat32TestData.IncorrectParamSize) { Value = value },
-                _ => throw new ArgumentOutOfRangeException(nameof(pattern), $"Unsupported pattern: {pattern}")
-            };
-
-            insertCmd.Parameters.Add(param);
-            Assert.Equal(1, insertCmd.ExecuteNonQuery());
-            insertCmd.Parameters.Clear();
-
-            ValidateInsertedData(conn, expectedValues, expectedLength);
-        }
-
-        private async Task ValidateInsertedDataAsync(SqlConnection connection, float[] expectedData, int expectedLength)
-        {
-            using var selectCmd = new SqlCommand(s_selectCmdString, connection);
-            using var reader = await selectCmd.ExecuteReaderAsync();
-            Assert.True(await reader.ReadAsync(), "No data found in the table.");
-
-            //For both null and non-null cases, validate the SqlVector<float> object
-            ValidateSqlVectorFloat32Object(await reader.IsDBNullAsync(0), (SqlVector<float>)reader.GetSqlVector<float>(0), expectedData, expectedLength);
-            ValidateSqlVectorFloat32Object(await reader.IsDBNullAsync(0), await reader.GetFieldValueAsync<SqlVector<float>>(0), expectedData, expectedLength);
-            ValidateSqlVectorFloat32Object(await reader.IsDBNullAsync(0), (SqlVector<float>)reader.GetSqlValue(0), expectedData, expectedLength);
-
-            if (!await reader.IsDBNullAsync(0))
-            {
-                ValidateSqlVectorFloat32Object(await reader.IsDBNullAsync(0), (SqlVector<float>)reader.GetValue(0), expectedData, expectedLength);
-                ValidateSqlVectorFloat32Object(await reader.IsDBNullAsync(0), (SqlVector<float>)reader[0], expectedData, expectedLength);
-                ValidateSqlVectorFloat32Object(await reader.IsDBNullAsync(0), (SqlVector<float>)reader["VectorData"], expectedData, expectedLength);
-                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(reader.GetString(0)));
-                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(reader.GetSqlString(0).Value));
-                Assert.Equal(expectedData, JsonSerializer.Deserialize<float[]>(await reader.GetFieldValueAsync<string>(0)));
-            }
-            else
-            {
-                Assert.Equal(DBNull.Value, reader.GetValue(0));
-                Assert.Equal(DBNull.Value, reader[0]);
-                Assert.Equal(DBNull.Value, reader["VectorData"]);
-                Assert.Throws<SqlNullValueException>(() => reader.GetString(0));
-                Assert.Throws<SqlNullValueException>(() => reader.GetSqlString(0).Value);
-                await Assert.ThrowsAsync<SqlNullValueException>(async () => await reader.GetFieldValueAsync<string>(0));
-            }
-        }
-
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsSqlVectorSupported))]
-        [MemberData(nameof(VectorFloat32TestData.GetVectorFloat32TestData), MemberType = typeof(VectorFloat32TestData), DisableDiscoveryEnumeration = true)]
-        public async Task TestSqlVectorFloat32ParameterInsertionAndReadsAsync(
-        int pattern,
-        object value,
-        float[] expectedValues,
-        int expectedLength)
+        get
         {
-            using var conn = new SqlConnection(s_connectionString);
-            await conn.OpenAsync();
-
-            using var insertCmd = new SqlCommand(s_insertCmdString, conn);
-
-            SqlParameter param = pattern switch
-            {
-                1 => new SqlParameter
-                {
-                    ParameterName = s_vectorParamName,
-                    SqlDbType = (SqlDbType)36, // SqlDbTypeExtension.Vector
-                    Value = value
-                },
-                2 => new SqlParameter(s_vectorParamName, value),
-                3 => new SqlParameter(s_vectorParamName, SqlDbTypeExtensions.Vector) { Value = value },
-                4 => new SqlParameter(s_vectorParamName, SqlDbTypeExtensions.Vector, VectorFloat32TestData.IncorrectParamSize) { Value = value },
-                _ => throw new ArgumentOutOfRangeException(nameof(pattern), $"Unsupported pattern: {pattern}")
-            };
-
-            insertCmd.Parameters.Add(param);
-            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-            insertCmd.Parameters.Clear();
-
-            await ValidateInsertedDataAsync(conn, expectedValues, expectedLength);
-        }
+            float[,] sampleData = new float[10, ValidSampleScalarDataLength];
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsSqlVectorSupported))]
-        [MemberData(nameof(VectorFloat32TestData.GetVectorFloat32TestData), MemberType = typeof(VectorFloat32TestData), DisableDiscoveryEnumeration = true)]
-        public void TestStoredProcParamsForVectorFloat32(
-        int pattern,
-        object value,
-        float[] expectedValues,
-        int expectedLength)
-        {
-            //Create SP for test
-            using var conn = new SqlConnection(s_connectionString);
-            conn.Open();
-            DataTestUtility.CreateSP(conn, s_storedProcName, s_storedProcBody);
-            using var command = new SqlCommand(s_storedProcName, conn)
+            for (int i = 0; i < sampleData.GetLength(0); i++)
             {
-                CommandType = CommandType.StoredProcedure
-            };
+                float baseValue = i * 10;
 
-            // Set input and output parameters
-            SqlParameter inputParam = pattern switch
-            {
-                1 => new SqlParameter
+                for (int j = 0; j < sampleData.GetLength(1); j++)
                 {
-                    ParameterName = s_vectorParamName,
-                    SqlDbType = SqlDbTypeExtensions.Vector, // SqlDbTypeExtension.Vector
-                    Value = value
-                },
-                2 => new SqlParameter(s_vectorParamName, value),
-                3 => new SqlParameter(s_vectorParamName, SqlDbTypeExtensions.Vector) { Value = value },
-                4 => new SqlParameter(s_vectorParamName, SqlDbTypeExtensions.Vector, VectorFloat32TestData.IncorrectParamSize) { Value = value },
-                _ => throw new ArgumentOutOfRangeException(nameof(pattern), $"Unsupported pattern: {pattern}")
-            };
-            command.Parameters.Add(inputParam);
-
-            var outputParam = new SqlParameter
-            {
-                ParameterName = s_outputVectorParamName,
-                SqlDbType = SqlDbTypeExtensions.Vector,
-                Direction = ParameterDirection.Output,
-                Value = SqlVector<float>.CreateNull(VectorFloat32TestData.vectorColumnLength)
-            };
-            command.Parameters.Add(outputParam);
-
-            // Execute the stored procedure
-            command.ExecuteNonQuery();
-
-            // Validate the output parameter
-            var vector = (SqlVector<float>)outputParam.Value;
-            ValidateSqlVectorFloat32Object(vector.IsNull, vector, expectedValues, expectedLength);
-
-            // Validate error for conventional way of setting output parameters
-            command.Parameters.Clear();
-            command.Parameters.Add(inputParam);
-            var outputParamWithoutVal = new SqlParameter(s_outputVectorParamName, SqlDbTypeExtensions.Vector, VectorFloat32TestData.IncorrectParamSize) { Direction = ParameterDirection.Output };
-            command.Parameters.Add(outputParamWithoutVal);
-            Assert.Throws<InvalidOperationException>(() => command.ExecuteNonQuery());
-        }
-
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsSqlVectorSupported))]
-        [MemberData(nameof(VectorFloat32TestData.GetVectorFloat32TestData), MemberType = typeof(VectorFloat32TestData), DisableDiscoveryEnumeration = true)]
-        public async Task TestStoredProcParamsForVectorFloat32Async(
-        int pattern,
-        object value,
-        float[] expectedValues,
-        int expectedLength)
-        {
-            //Create SP for test
-            using var conn = new SqlConnection(s_connectionString);
-            await conn.OpenAsync();
-            DataTestUtility.CreateSP(conn, s_storedProcName, s_storedProcBody);
-            using var command = new SqlCommand(s_storedProcName, conn)
-            {
-                CommandType = CommandType.StoredProcedure
-            };
-
-            // Set input and output parameters
-            SqlParameter inputParam = pattern switch
-            {
-                1 => new SqlParameter
-                {
-                    ParameterName = s_vectorParamName,
-                    SqlDbType = SqlDbTypeExtensions.Vector, // SqlDbTypeExtension.Vector
-                    Value = value
-                },
-                2 => new SqlParameter(s_vectorParamName, value),
-                3 => new SqlParameter(s_vectorParamName, SqlDbTypeExtensions.Vector) { Value = value },
-                4 => new SqlParameter(s_vectorParamName, SqlDbTypeExtensions.Vector, VectorFloat32TestData.IncorrectParamSize) { Value = value },
-                _ => throw new ArgumentOutOfRangeException(nameof(pattern), $"Unsupported pattern: {pattern}")
-            };
-            command.Parameters.Add(inputParam);
-
-            var outputParam = new SqlParameter
-            {
-                ParameterName = s_outputVectorParamName,
-                SqlDbType = SqlDbTypeExtensions.Vector,
-                Direction = ParameterDirection.Output,
-                Value = SqlVector<float>.CreateNull(VectorFloat32TestData.vectorColumnLength)
-            };
-            command.Parameters.Add(outputParam);
-
-            // Execute the stored procedure
-            await command.ExecuteNonQueryAsync();
-
-            // Validate the output parameter
-            var vector = (SqlVector<float>)outputParam.Value;
-            ValidateSqlVectorFloat32Object(vector.IsNull, vector, expectedValues, expectedLength);
-
-            // Validate error for conventional way of setting output parameters
-            command.Parameters.Clear();
-            command.Parameters.Add(inputParam);
-            var outputParamWithoutVal = new SqlParameter(s_outputVectorParamName, SqlDbTypeExtensions.Vector, VectorFloat32TestData.IncorrectParamSize) { Direction = ParameterDirection.Output };
-            command.Parameters.Add(outputParamWithoutVal);
-            await Assert.ThrowsAsync<InvalidOperationException>(async () => await command.ExecuteNonQueryAsync());
-        }
-
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsSqlVectorSupported))]
-        [InlineData(1)]
-        [InlineData(2)]
-        public void TestBulkCopyFromSqlTable(int bulkCopySourceMode)
-        {
-            //Setup source with test data and create destination table for bulkcopy.
-            SqlConnection sourceConnection = new SqlConnection(s_connectionString);
-            sourceConnection.Open();
-            SqlConnection destinationConnection = new SqlConnection(s_connectionString);
-            destinationConnection.Open();
-            DataTable table = null;
-            switch (bulkCopySourceMode)
-            {
-
-                case 1:
-                    // Use SqlServer table as source
-                    var insertCmd = new SqlCommand($"insert into {s_bulkCopySrcTableName} values (@VectorData)", sourceConnection);
-                    var vectorParam = new SqlParameter(s_vectorParamName, new SqlVector<float>(VectorFloat32TestData.testData));
-
-                    // Insert 2 rows with one non-null and null value
-                    insertCmd.Parameters.Add(vectorParam);
-                    Assert.Equal(1, insertCmd.ExecuteNonQuery());
-                    insertCmd.Parameters.Clear();
-                    vectorParam.Value = DBNull.Value;
-                    insertCmd.Parameters.Add(vectorParam);
-                    Assert.Equal(1, insertCmd.ExecuteNonQuery());
-                    insertCmd.Parameters.Clear();
-                    break;
-                case 2:
-                    table = new DataTable(s_bulkCopySrcTableName);
-                    table.Columns.Add("Id", typeof(int));
-                    table.Columns.Add("VectorData", typeof(SqlVector<float>));
-                    table.Rows.Add(1, new SqlVector<float>(VectorFloat32TestData.testData));
-                    table.Rows.Add(2, DBNull.Value);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(bulkCopySourceMode), $"Unsupported bulk copy source mode: {bulkCopySourceMode}");
-            }
-
-
-
-            //Bulkcopy from sql server table to destination table
-            using SqlCommand sourceDataCommand = new SqlCommand($"SELECT Id, VectorData FROM {s_bulkCopySrcTableName}", sourceConnection);
-            using SqlDataReader reader = sourceDataCommand.ExecuteReader();
-
-            // Verify that the destination table is empty before bulk copy
-            using SqlCommand countCommand = new SqlCommand($"SELECT COUNT(*) FROM {s_tableName}", destinationConnection);
-            Assert.Equal(0, Convert.ToInt16(countCommand.ExecuteScalar()));
-
-            // Initialize bulk copy configuration
-            using SqlBulkCopy bulkCopy = new SqlBulkCopy(destinationConnection)
-            {
-                DestinationTableName = s_tableName,
-            };
-
-            try
-            {
-                switch (bulkCopySourceMode)
-                {
-                    case 1:
-                        bulkCopy.WriteToServer(reader);
-                        break;
-                    case 2:
-                        bulkCopy.WriteToServer(table);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(bulkCopySourceMode), $"Unsupported bulk copy source mode: {bulkCopySourceMode}");
+                    sampleData[i, j] = baseValue + (j * 0.1f);
                 }
             }
-            catch (Exception ex)
-            {
-                // If bulk copy fails, fail the test with the exception message
-                Assert.Fail($"Bulk copy failed: {ex.Message}");
-            }
-
-            // Verify that the 2 rows from the source table have been copied into the destination table.
-            Assert.Equal(2, Convert.ToInt16(countCommand.ExecuteScalar()));
-
-            // Read the data from destination table as varbinary to verify the UTF-8 byte sequence
-            using SqlCommand verifyCommand = new SqlCommand($"SELECT VectorData from {s_tableName}", destinationConnection);
-            using SqlDataReader verifyReader = verifyCommand.ExecuteReader();
-
-            // Verify that we have data in the destination table
-            Assert.True(verifyReader.Read(), "No data found in destination table after bulk copy.");
 
-            // Validate first non-null value.
-            Assert.True(!verifyReader.IsDBNull(0), "First row in the table is null.");
-            Assert.Equal(VectorFloat32TestData.testData, ((SqlVector<float>)verifyReader.GetSqlVector<float>(0)).Memory.ToArray());
-            Assert.Equal(VectorFloat32TestData.testData.Length, ((SqlVector<float>)verifyReader.GetSqlVector<float>(0)).Length);
-
-            // Verify that we have another row
-            Assert.True(verifyReader.Read(), "Second row not found in the table");
-
-            // Verify that we have encountered null.
-            Assert.True(verifyReader.IsDBNull(0));
-            Assert.Equal(Array.Empty<float>(), ((SqlVector<float>)verifyReader.GetSqlVector<float>(0)).Memory.ToArray());
-            Assert.Equal(VectorFloat32TestData.testData.Length, ((SqlVector<float>)verifyReader.GetSqlVector<float>(0)).Length);
+            return sampleData;
         }
+    }
 
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsSqlVectorSupported))]
-        [InlineData(1)]
-        [InlineData(2)]
-        public async Task TestBulkCopyFromSqlTableAsync(int bulkCopySourceMode)
-        {
-            //Setup source with test data and create destination table for bulkcopy.
-            SqlConnection sourceConnection = new SqlConnection(s_connectionString);
-            await sourceConnection.OpenAsync();
-            SqlConnection destinationConnection = new SqlConnection(s_connectionString);
-            await destinationConnection.OpenAsync();
-
-            DataTable table = null;
-            switch (bulkCopySourceMode)
-            {
-
-                case 1:
-                    // Use SqlServer table as source
-                    var insertCmd = new SqlCommand($"insert into {s_bulkCopySrcTableName} values (@VectorData)", sourceConnection);
-                    var vectorParam = new SqlParameter(s_vectorParamName, new SqlVector<float>(VectorFloat32TestData.testData));
-
-                    // Insert 2 rows with one non-null and null value
-                    insertCmd.Parameters.Add(vectorParam);
-                    Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-                    insertCmd.Parameters.Clear();
-                    vectorParam.Value = DBNull.Value;
-                    insertCmd.Parameters.Add(vectorParam);
-                    Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
-                    insertCmd.Parameters.Clear();
-                    break;
-                case 2:
-                    table = new DataTable(s_bulkCopySrcTableName);
-                    table.Columns.Add("Id", typeof(int));
-                    table.Columns.Add("VectorData", typeof(SqlVector<float>));
-                    table.Rows.Add(1, new SqlVector<float>(VectorFloat32TestData.testData));
-                    table.Rows.Add(2, DBNull.Value);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(bulkCopySourceMode), $"Unsupported bulk copy source mode: {bulkCopySourceMode}");
-            }
-
-            //Bulkcopy from sql server table to destination table
-            using SqlCommand sourceDataCommand = new SqlCommand($"SELECT Id, VectorData FROM {s_bulkCopySrcTableName}", sourceConnection);
-            using SqlDataReader reader = await sourceDataCommand.ExecuteReaderAsync();
-
-            // Verify that the destination table is empty before bulk copy
-            using SqlCommand countCommand = new SqlCommand($"SELECT COUNT(*) FROM {s_tableName}", destinationConnection);
-            Assert.Equal(0, Convert.ToInt16(await countCommand.ExecuteScalarAsync()));
-
-            // Initialize bulk copy configuration
-            using SqlBulkCopy bulkCopy = new SqlBulkCopy(destinationConnection)
-            {
-                DestinationTableName = s_tableName,
-            };
-
-            try
-            {   // Perform bulkcopy
-                switch (bulkCopySourceMode)
-                {
-                    case 1:
-                        await bulkCopy.WriteToServerAsync(reader);
-                        break;
-                    case 2:
-                        await bulkCopy.WriteToServerAsync(table);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(bulkCopySourceMode), $"Unsupported bulk copy source mode: {bulkCopySourceMode}");
-                }
-            }
-            catch (Exception ex)
-            {
-                // If bulk copy fails, fail the test with the exception message
-                Assert.Fail($"Bulk copy failed: {ex.Message}");
-            }
-
-            // Verify that the 2 rows from the source table have been copied into the destination table.
-            Assert.Equal(2, Convert.ToInt16(await countCommand.ExecuteScalarAsync()));
-
-            // Read the data from destination table as varbinary to verify the UTF-8 byte sequence
-            using SqlCommand verifyCommand = new SqlCommand($"SELECT VectorData from {s_tableName}", destinationConnection);
-            using SqlDataReader verifyReader = await verifyCommand.ExecuteReaderAsync();
-
-            // Verify that we have data in the destination table
-            Assert.True(await verifyReader.ReadAsync(), "No data found in destination table after bulk copy.");
-
-            // Validate first non-null value.
-            Assert.True(!await verifyReader.IsDBNullAsync(0), "First row in the table is null.");
-            var vector = await verifyReader.GetFieldValueAsync<SqlVector<float>>(0);
-            Assert.Equal(VectorFloat32TestData.testData, vector.Memory.ToArray());
-            Assert.Equal(VectorFloat32TestData.testData.Length, vector.Length);
-
-            // Verify that we have another row
-            Assert.True(await verifyReader.ReadAsync(), "Second row not found in the table");
-
-            // Verify that we have encountered null.
-            Assert.True(await verifyReader.IsDBNullAsync(0));
-            vector = await verifyReader.GetFieldValueAsync<SqlVector<float>>(0);
-            Assert.Equal(Array.Empty<float>(), vector.Memory.ToArray());
-            Assert.Equal(VectorFloat32TestData.testData.Length, vector.Length);
-        }
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsSqlVectorSupported))]
-        public void TestGetFieldTypeReturnsSqlVectorForVectorColumn()
-        {
-            using var connection = new SqlConnection(s_connectionString);
-            connection.Open();
-
-            // Insert a row so we can query it
-            using (var insertCmd = new SqlCommand(s_insertCmdString, connection))
-            {
-                var param = insertCmd.Parameters.Add(s_vectorParamName, SqlDbTypeExtensions.Vector);
-                param.Value = new SqlVector<float>(VectorFloat32TestData.testData);
-                insertCmd.ExecuteNonQuery();
-            }
-
-            using var selectCmd = new SqlCommand(s_selectCmdString, connection);
-            using var reader = selectCmd.ExecuteReader();
-
-            // Verify GetFieldType returns SqlVector<float> for the vector column
-            Assert.Equal(typeof(SqlVector<float>), reader.GetFieldType(0));
-
-            // Verify GetProviderSpecificFieldType also returns SqlVector<float>
-            Assert.Equal(typeof(SqlVector<float>), reader.GetProviderSpecificFieldType(0));
+    public override int IncorrectScalarDataParameterSize => 3234;
 
-            // Verify that GetValue returns an instance consistent with GetFieldType
-            Assert.True(reader.Read(), "No data found in the table.");
-            object value = reader.GetValue(0);
-            Assert.IsType<SqlVector<float>>(value);
-            Assert.Equal(VectorFloat32TestData.testData, ((SqlVector<float>)value).Memory.ToArray());
+    public override bool IsSupported => DataTestUtility.IsSqlVectorSupported;
 
-            // Verify GetFieldValue<SqlVector<float>> returns the correct typed value
-            SqlVector<float> typedValue = reader.GetFieldValue<SqlVector<float>>(0);
-            Assert.IsType<SqlVector<float>>(typedValue);
-            Assert.Equal(VectorFloat32TestData.testData, typedValue.Memory.ToArray());
-        }
+    public override string SqlServerTypeName => "float32";
+}
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsSqlVectorSupported))]
-        public void TestInsertVectorsFloat32WithPrepare()
-        {
-            SqlConnection conn = new SqlConnection(s_connectionString);
-            conn.Open();
-            SqlCommand command = new SqlCommand(s_insertCmdString, conn);
-            SqlParameter vectorParam = new SqlParameter("@VectorData", SqlDbTypeExtensions.Vector);
-            command.Parameters.Add(vectorParam);
-            command.Prepare();
-            for (int i = 0; i < 10; i++)
-            {
-                vectorParam.Value = new SqlVector<float>(new float[] { i + 0.1f, i + 0.2f, i + 0.3f, i + 0.4f, i + 0.5f, i + 0.6f });
-                command.ExecuteNonQuery();
-            }
-            SqlCommand validateCommand = new SqlCommand($"SELECT VectorData FROM {s_tableName}", conn);
-            using SqlDataReader reader = validateCommand.ExecuteReader();
-            int rowcnt = 0;
-            while (reader.Read())
-            {
-                float[] expectedData = new float[] { rowcnt + 0.1f, rowcnt + 0.2f, rowcnt + 0.3f, rowcnt + 0.4f, rowcnt + 0.5f, rowcnt + 0.6f };
-                float[] dbData = reader.GetSqlVector<float>(0).Memory.ToArray();
-                Assert.Equal(expectedData, dbData);
-                rowcnt++;
-            }
-            Assert.Equal(10, rowcnt);
-        }
-    }
+[Trait("Set", "3")]
+public sealed class NativeVectorFloat32Tests : NativeVectorTestsBase<float, VectorFloat32TestData>
+{
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorTestsBase.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorTestsBase.cs
new file mode 100644
index 0000000000..5c9970f6ed
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorTestsBase.cs
@@ -0,0 +1,678 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlTypes;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+using Microsoft.Data.SqlTypes;
+using Xunit;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.VectorTest
+{
+    /// <summary>
+    /// Base class for all data passed to a type derived from <see cref="NativeVectorTestsBase{TElement, TTestData}"/>.
+    /// </summary>
+    /// <typeparam name="TElement">The element type of the <see cref="SqlVector{T}"/>.</typeparam>
+    public abstract class NativeVectorTestDataBase<TElement>
+        where TElement : unmanaged
+    {
+        public abstract TElement[] SampleScalarData { get; }
+
+        public abstract TElement[,] SampleDataSet { get; }
+
+        // Incorrect size for SqlParameter.Size
+        public abstract int IncorrectScalarDataParameterSize { get; }
+
+        public abstract bool IsSupported { get; }
+
+        public abstract string SqlServerTypeName { get; }
+
+        public int ValidSampleScalarDataLength => SampleScalarData.Length;
+
+        public IEnumerable<object?[]> TestData =>
+        [
+            // Pattern 1-4 with SqlVector<TElement>(values: SampleScalarData)
+            [ 1, new SqlVector<TElement>(SampleScalarData), SampleScalarData, ValidSampleScalarDataLength ],
+            [ 2, new SqlVector<TElement>(SampleScalarData), SampleScalarData, ValidSampleScalarDataLength ],
+            [ 3, new SqlVector<TElement>(SampleScalarData), SampleScalarData, ValidSampleScalarDataLength ],
+            [ 4, new SqlVector<TElement>(SampleScalarData), SampleScalarData, ValidSampleScalarDataLength ],
+
+            // Pattern 1-4 with SqlVector<TElement>(n)
+            [ 1, SqlVector<TElement>.CreateNull(ValidSampleScalarDataLength), Array.Empty<TElement>(), ValidSampleScalarDataLength ],
+            [ 2, SqlVector<TElement>.CreateNull(ValidSampleScalarDataLength), Array.Empty<TElement>(), ValidSampleScalarDataLength ],
+            [ 3, SqlVector<TElement>.CreateNull(ValidSampleScalarDataLength), Array.Empty<TElement>(), ValidSampleScalarDataLength ],
+            [ 4, SqlVector<TElement>.CreateNull(ValidSampleScalarDataLength), Array.Empty<TElement>(), ValidSampleScalarDataLength ],
+
+            // Pattern 1-4 with DBNull
+            [ 1, DBNull.Value, Array.Empty<TElement>(), ValidSampleScalarDataLength ],
+            [ 2, DBNull.Value, Array.Empty<TElement>(), ValidSampleScalarDataLength ],
+            [ 3, DBNull.Value, Array.Empty<TElement>(), ValidSampleScalarDataLength ],
+            [ 4, DBNull.Value, Array.Empty<TElement>(), ValidSampleScalarDataLength ],
+
+            // Pattern 1-4 with SqlVector<TElement>.Null
+            [ 1, SqlVector<TElement>.Null, Array.Empty<TElement>(), ValidSampleScalarDataLength ],
+
+            // Following scenario is not supported in SqlClient.
+            // This can only be fixed with a behavior change that SqlParameter.Value is internally set to DBNull.Value if it is set to null.
+            // [ 2, SqlVector<TElement>.Null, Array.Empty<TElement>(), vectorColumnLength ],
+
+            [ 3, SqlVector<TElement>.Null, Array.Empty<TElement>(), ValidSampleScalarDataLength ],
+            [ 4, SqlVector<TElement>.Null, Array.Empty<TElement>(), ValidSampleScalarDataLength ]
+        ];
+    }
+
+    /// <summary>
+    /// Base class for all strongly-typed manual tests for <see cref="SqlVector{T}"/>.
+    /// </summary>
+    /// <typeparam name="TElement">The element type of the <see cref="SqlVector{T}"/>.</typeparam>
+    /// <typeparam name="TTestData">The type containing the sample data.</typeparam>
+    public abstract class NativeVectorTestsBase<TElement, TTestData> : IDisposable
+        where TElement : unmanaged
+        where TTestData : NativeVectorTestDataBase<TElement>, new()
+    {
+        private const string VectorColumnName = "VectorData";
+        private const string VectorParameterName = "@VectorData";
+        private const string VectorOutputParameterName = "@OutputVectorData";
+
+        private readonly string _connectionString;
+        private readonly SqlConnection _managementConnection;
+        private readonly Table _vectorTable;
+        private readonly Table _bulkCopySourceTable;
+        private readonly StoredProcedure _vectorProcedure;
+
+        private readonly string _selectCommand;
+        private readonly string _insertCommand;
+
+        private bool _disposed;
+
+        // xUnit only allows MemberData for a test to point to static methods, properties and variables.
+        // This presents a problem when the sample data needs to change based upon the element type of
+        // the SqlVector, so this compromises: it instantiates a class derived from NativeVectorTestDataBase,
+        // then projects the relevant fields from it as static properties in this base class.
+        private static TTestData TestDataInstance =>
+            field ??= new();
+
+        public static bool IsSupported => TestDataInstance.IsSupported;
+
+        public static IEnumerable<object?[]> TestData => TestDataInstance.TestData;
+
+        public NativeVectorTestsBase()
+        {
+            int vectorDimensions = TestDataInstance.ValidSampleScalarDataLength;
+            string tableDefinition = $@"(Id INT PRIMARY KEY IDENTITY, {VectorColumnName} vector({vectorDimensions}, {TestDataInstance.SqlServerTypeName}) NULL)";
+
+            _connectionString = DataTestUtility.TCPConnectionString;
+            _managementConnection = new SqlConnection(_connectionString);
+            _vectorTable = new Table(_managementConnection, "VectorTestTable", tableDefinition);
+            _bulkCopySourceTable = new Table(_managementConnection, "VectorBulkCopyTestTable", tableDefinition);
+            _vectorProcedure = new StoredProcedure(_managementConnection,
+                prefix: "VectorsAsVarcharSp",
+                definition: $@"
+                {VectorParameterName} vector({vectorDimensions}, {TestDataInstance.SqlServerTypeName}),   -- Input: Serialized TElement[] as JSON string
+                {VectorOutputParameterName} vector({vectorDimensions}, {TestDataInstance.SqlServerTypeName}) OUTPUT  -- Output: Echoed back from latest inserted row
+                AS
+                BEGIN
+                SET NOCOUNT ON;
+
+                -- Insert into vector table
+                INSERT INTO {_vectorTable.Name} ({VectorColumnName})
+                VALUES ({VectorParameterName});
+
+                -- Retrieve latest entry (assumes auto-incrementing ID)
+                SELECT TOP 1 {VectorOutputParameterName} = {VectorColumnName}
+                FROM {_vectorTable.Name}
+                ORDER BY Id DESC;
+                END;");
+
+            _selectCommand = $"SELECT {VectorColumnName} FROM {_vectorTable.Name} ORDER BY Id DESC";
+            _insertCommand = $"INSERT INTO {_vectorTable.Name} ({VectorColumnName}) VALUES ({VectorParameterName})";
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                _vectorProcedure?.Dispose();
+                _bulkCopySourceTable?.Dispose();
+                _vectorTable?.Dispose();
+                _managementConnection?.Dispose();
+            }
+
+            _disposed = true;
+        }
+
+        ~NativeVectorTestsBase() =>
+            Dispose(false);
+
+        /// <summary>
+        /// Wraps an inbound <see cref="SqlVector{T}"/> in a <see cref="SqlParameter"/> according to
+        /// the specified pattern.
+        /// </summary>
+        /// <param name="pattern">Pattern number.</param>
+        /// <param name="value"><see cref="SqlVector{T}"/> to wrap.</param>
+        /// <returns>A <see cref="SqlParameter"/> instance wrapping the <see cref="SqlVector{T}"/>.</returns>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="pattern"/> is not a valid pattern.</exception>
+        /// <remarks>
+        /// <paramref name="pattern"/> can be a number from 1 to 4, inclusive, with the following meaning:
+        /// <list type="number">
+        ///   <item>Parameterless constructor, manually setting ParameterName, SqlDbType and Value.</item>
+        ///   <item>Specify the parameter name and value directly, relying upon type inference.</item>
+        ///   <item>Specify the parameter name and SqlDbType, manually setting the Value property.</item>
+        ///   <item>Identical to pattern 3, but with a known-invalid parameter size.</item>
+        /// </list>
+        /// </remarks>
+        /// <seealso cref="TestSqlVectorParameterInsertionAndReads"/>
+        /// <seealso cref="TestSqlVectorParameterInsertionAndReadsAsync"/>
+        /// <seealso cref="TestStoredProcParamsForVector"/>
+        /// <seealso cref="TestStoredProcParamsForVectorAsync"/>
+        private static SqlParameter GetParameterByPattern(int pattern, object? value) =>
+            pattern switch
+            {
+                1 => new SqlParameter
+                {
+                    ParameterName = VectorParameterName,
+                    SqlDbType = SqlDbTypeExtensions.Vector,
+                    Value = value
+                },
+                2 => new SqlParameter(VectorParameterName, value),
+                3 => new SqlParameter(VectorParameterName, SqlDbTypeExtensions.Vector) { Value = value },
+                // Even if size is specified, the actual size is determined by the value passed and specified size is ignored.
+                4 => new SqlParameter(VectorParameterName, SqlDbTypeExtensions.Vector, TestDataInstance.IncorrectScalarDataParameterSize) { Value = value },
+                _ => throw new ArgumentOutOfRangeException(nameof(pattern), $"Unsupported pattern: {pattern}")
+            };
+
+        private static void ValidateSqlVectorObject(bool isNull, SqlVector<TElement> sqlVector, TElement[] expectedData, int expectedLength)
+        {
+            Assert.Equal(expectedData, sqlVector.Memory.ToArray());
+            Assert.Equal(expectedLength, sqlVector.Length);
+            if (!isNull)
+            {
+                Assert.False(sqlVector.IsNull, "IsNull set to true for a non-null value");
+            }
+            else
+            {
+                Assert.True(sqlVector.IsNull, "IsNull set to false for a null value");
+            }
+        }
+
+        private void ValidateInsertedData(SqlConnection connection, TElement[] expectedData, int expectedLength)
+        {
+            using SqlCommand selectCmd = new(_selectCommand, connection);
+            using SqlDataReader reader = selectCmd.ExecuteReader();
+            Assert.True(reader.Read(), "No data found in the table.");
+
+            // For both null and non-null cases, validate the SqlVector<TElement> object
+            ValidateSqlVectorObject(reader.IsDBNull(0), (SqlVector<TElement>)reader.GetSqlVector<TElement>(0), expectedData, expectedLength);
+            ValidateSqlVectorObject(reader.IsDBNull(0), reader.GetFieldValue<SqlVector<TElement>>(0), expectedData, expectedLength);
+            ValidateSqlVectorObject(reader.IsDBNull(0), (SqlVector<TElement>)reader.GetSqlValue(0), expectedData, expectedLength);
+
+            if (!reader.IsDBNull(0))
+            {
+                ValidateSqlVectorObject(reader.IsDBNull(0), (SqlVector<TElement>)reader.GetValue(0), expectedData, expectedLength);
+                ValidateSqlVectorObject(reader.IsDBNull(0), (SqlVector<TElement>)reader[0], expectedData, expectedLength);
+                ValidateSqlVectorObject(reader.IsDBNull(0), (SqlVector<TElement>)reader[VectorColumnName], expectedData, expectedLength);
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<TElement[]>(reader.GetString(0)));
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<TElement[]>(reader.GetSqlString(0).Value));
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<TElement[]>(reader.GetFieldValue<string>(0)));
+            }
+            else
+            {
+                Assert.Equal(DBNull.Value, reader.GetValue(0));
+                Assert.Equal(DBNull.Value, reader[0]);
+                Assert.Equal(DBNull.Value, reader[VectorColumnName]);
+                Assert.Throws<SqlNullValueException>(() => reader.GetString(0));
+                Assert.Throws<SqlNullValueException>(() => reader.GetSqlString(0).Value);
+                Assert.Throws<SqlNullValueException>(() => reader.GetFieldValue<string>(0));
+            }
+        }
+
+        [ConditionalTheory(nameof(IsSupported))]
+        [MemberData(nameof(TestData), DisableDiscoveryEnumeration = true)]
+        public void TestSqlVectorParameterInsertionAndReads(
+            int pattern,
+            object? value,
+            TElement[] expectedValues,
+            int expectedLength)
+        {
+            using SqlConnection conn = new(_connectionString);
+            conn.Open();
+
+            using SqlCommand insertCmd = new(_insertCommand, conn);
+            SqlParameter param = GetParameterByPattern(pattern, value);
+
+            insertCmd.Parameters.Add(param);
+            Assert.Equal(1, insertCmd.ExecuteNonQuery());
+            insertCmd.Parameters.Clear();
+
+            ValidateInsertedData(conn, expectedValues, expectedLength);
+        }
+
+        private async Task ValidateInsertedDataAsync(SqlConnection connection, TElement[] expectedData, int expectedLength)
+        {
+            using SqlCommand selectCmd = new(_selectCommand, connection);
+            using SqlDataReader reader = await selectCmd.ExecuteReaderAsync();
+            Assert.True(await reader.ReadAsync(), "No data found in the table.");
+
+            // For both null and non-null cases, validate the SqlVector<TElement> object
+            ValidateSqlVectorObject(await reader.IsDBNullAsync(0), (SqlVector<TElement>)reader.GetSqlVector<TElement>(0), expectedData, expectedLength);
+            ValidateSqlVectorObject(await reader.IsDBNullAsync(0), await reader.GetFieldValueAsync<SqlVector<TElement>>(0), expectedData, expectedLength);
+            ValidateSqlVectorObject(await reader.IsDBNullAsync(0), (SqlVector<TElement>)reader.GetSqlValue(0), expectedData, expectedLength);
+
+            if (!await reader.IsDBNullAsync(0))
+            {
+                ValidateSqlVectorObject(await reader.IsDBNullAsync(0), (SqlVector<TElement>)reader.GetValue(0), expectedData, expectedLength);
+                ValidateSqlVectorObject(await reader.IsDBNullAsync(0), (SqlVector<TElement>)reader[0], expectedData, expectedLength);
+                ValidateSqlVectorObject(await reader.IsDBNullAsync(0), (SqlVector<TElement>)reader[VectorColumnName], expectedData, expectedLength);
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<TElement[]>(reader.GetString(0)));
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<TElement[]>(reader.GetSqlString(0).Value));
+                Assert.Equal(expectedData, JsonSerializer.Deserialize<TElement[]>(await reader.GetFieldValueAsync<string>(0)));
+            }
+            else
+            {
+                Assert.Equal(DBNull.Value, reader.GetValue(0));
+                Assert.Equal(DBNull.Value, reader[0]);
+                Assert.Equal(DBNull.Value, reader[VectorColumnName]);
+                Assert.Throws<SqlNullValueException>(() => reader.GetString(0));
+                Assert.Throws<SqlNullValueException>(() => reader.GetSqlString(0).Value);
+                await Assert.ThrowsAsync<SqlNullValueException>(async () => await reader.GetFieldValueAsync<string>(0));
+            }
+        }
+
+        [ConditionalTheory(nameof(IsSupported))]
+        [MemberData(nameof(TestData), DisableDiscoveryEnumeration = true)]
+        public async Task TestSqlVectorParameterInsertionAndReadsAsync(
+            int pattern,
+            object? value,
+            TElement[] expectedValues,
+            int expectedLength)
+        {
+            using SqlConnection conn = new(_connectionString);
+            await conn.OpenAsync();
+
+            using SqlCommand insertCmd = new(_insertCommand, conn);
+            SqlParameter param = GetParameterByPattern(pattern, value);
+
+            insertCmd.Parameters.Add(param);
+            Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
+            insertCmd.Parameters.Clear();
+
+            await ValidateInsertedDataAsync(conn, expectedValues, expectedLength);
+        }
+
+        [ConditionalTheory(nameof(IsSupported))]
+        [MemberData(nameof(TestData), DisableDiscoveryEnumeration = true)]
+        public void TestStoredProcParamsForVector(
+            int pattern,
+            object? value,
+            TElement[] expectedValues,
+            int expectedLength)
+        {
+            using SqlConnection conn = new(_connectionString);
+            conn.Open();
+            using SqlCommand command = new(_vectorProcedure.Name, conn)
+            {
+                CommandType = CommandType.StoredProcedure
+            };
+
+            // Set input and output parameters
+            SqlParameter inputParam = GetParameterByPattern(pattern, value);
+            command.Parameters.Add(inputParam);
+
+            SqlParameter outputParam = new()
+            {
+                ParameterName = VectorOutputParameterName,
+                SqlDbType = SqlDbTypeExtensions.Vector,
+                Direction = ParameterDirection.Output,
+                Value = SqlVector<TElement>.CreateNull(TestDataInstance.ValidSampleScalarDataLength)
+            };
+            command.Parameters.Add(outputParam);
+
+            // Execute the stored procedure
+            command.ExecuteNonQuery();
+
+            // Validate the output parameter
+            SqlVector<TElement> vector = (SqlVector<TElement>)outputParam.Value;
+            ValidateSqlVectorObject(vector.IsNull, vector, expectedValues, expectedLength);
+
+            // Validate error for conventional way of setting output parameters
+            command.Parameters.Clear();
+            command.Parameters.Add(inputParam);
+            SqlParameter outputParamWithoutVal = new(VectorOutputParameterName, SqlDbTypeExtensions.Vector, TestDataInstance.IncorrectScalarDataParameterSize) { Direction = ParameterDirection.Output };
+            command.Parameters.Add(outputParamWithoutVal);
+            Assert.Throws<InvalidOperationException>(() => command.ExecuteNonQuery());
+        }
+
+        [ConditionalTheory(nameof(IsSupported))]
+        [MemberData(nameof(TestData), DisableDiscoveryEnumeration = true)]
+        public async Task TestStoredProcParamsForVectorAsync(
+            int pattern,
+            object? value,
+            TElement[] expectedValues,
+            int expectedLength)
+        {
+            using SqlConnection conn = new(_connectionString);
+            await conn.OpenAsync();
+            using SqlCommand command = new(_vectorProcedure.Name, conn)
+            {
+                CommandType = CommandType.StoredProcedure
+            };
+
+            // Set input and output parameters
+            SqlParameter inputParam = GetParameterByPattern(pattern, value);
+            command.Parameters.Add(inputParam);
+
+            SqlParameter outputParam = new()
+            {
+                ParameterName = VectorOutputParameterName,
+                SqlDbType = SqlDbTypeExtensions.Vector,
+                Direction = ParameterDirection.Output,
+                Value = SqlVector<TElement>.CreateNull(TestDataInstance.ValidSampleScalarDataLength)
+            };
+            command.Parameters.Add(outputParam);
+
+            // Execute the stored procedure
+            await command.ExecuteNonQueryAsync();
+
+            // Validate the output parameter
+            SqlVector<TElement> vector = (SqlVector<TElement>)outputParam.Value;
+            ValidateSqlVectorObject(vector.IsNull, vector, expectedValues, expectedLength);
+
+            // Validate error for conventional way of setting output parameters
+            command.Parameters.Clear();
+            command.Parameters.Add(inputParam);
+            SqlParameter outputParamWithoutVal = new(VectorOutputParameterName, SqlDbTypeExtensions.Vector, TestDataInstance.IncorrectScalarDataParameterSize) { Direction = ParameterDirection.Output };
+            command.Parameters.Add(outputParamWithoutVal);
+            await Assert.ThrowsAsync<InvalidOperationException>(async () => await command.ExecuteNonQueryAsync());
+        }
+
+        [ConditionalTheory(nameof(IsSupported))]
+        [InlineData(1)]
+        [InlineData(2)]
+        public void TestBulkCopyFromSqlTable(int bulkCopySourceMode)
+        {
+            // Setup source with test data and create destination table for bulkcopy.
+            using SqlConnection sourceConnection = new(_connectionString);
+            sourceConnection.Open();
+            using SqlConnection destinationConnection = new(_connectionString);
+            destinationConnection.Open();
+
+            using DataTable table = new(_bulkCopySourceTable.Name)
+            {
+                Columns =
+                {
+                    new DataColumn("Id", typeof(int)),
+                    new DataColumn(VectorColumnName, typeof(SqlVector<TElement>))
+                }
+            };
+            switch (bulkCopySourceMode)
+            {
+
+                case 1:
+                    {
+                        // Use SQL Server table as source
+                        using SqlCommand insertCmd = new($"insert into {_bulkCopySourceTable.Name} values ({VectorParameterName})", sourceConnection);
+                        SqlParameter vectorParam = new(VectorParameterName, new SqlVector<TElement>(TestDataInstance.SampleScalarData));
+
+                        // Insert 2 rows with one non-null and null value
+                        insertCmd.Parameters.Add(vectorParam);
+                        Assert.Equal(1, insertCmd.ExecuteNonQuery());
+                        insertCmd.Parameters.Clear();
+                        vectorParam.Value = DBNull.Value;
+                        insertCmd.Parameters.Add(vectorParam);
+                        Assert.Equal(1, insertCmd.ExecuteNonQuery());
+                        insertCmd.Parameters.Clear();
+                        break;
+                    }
+                case 2:
+                    table.Rows.Add(1, new SqlVector<TElement>(TestDataInstance.SampleScalarData));
+                    table.Rows.Add(2, DBNull.Value);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(bulkCopySourceMode), $"Unsupported bulk copy source mode: {bulkCopySourceMode}");
+            }
+
+            // Bulk copy from SQL Server table to destination table
+            using SqlCommand sourceDataCommand = new($"SELECT Id, {VectorColumnName} FROM {_bulkCopySourceTable.Name}", sourceConnection);
+            using SqlDataReader reader = sourceDataCommand.ExecuteReader();
+
+            // Verify that the destination table is empty before bulk copy
+            using SqlCommand countCommand = new($"SELECT COUNT(*) FROM {_vectorTable.Name}", destinationConnection);
+            Assert.Equal(0, Convert.ToInt16(countCommand.ExecuteScalar()));
+
+            // Initialize bulk copy configuration
+            using SqlBulkCopy bulkCopy = new(destinationConnection)
+            {
+                DestinationTableName = _vectorTable.Name,
+            };
+
+            switch (bulkCopySourceMode)
+            {
+                case 1:
+                    bulkCopy.WriteToServer(reader);
+                    break;
+                case 2:
+                    bulkCopy.WriteToServer(table);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(bulkCopySourceMode), $"Unsupported bulk copy source mode: {bulkCopySourceMode}");
+            }
+
+            // Verify that the 2 rows from the source table have been copied into the destination table.
+            Assert.Equal(2, Convert.ToInt16(countCommand.ExecuteScalar()));
+
+            // Read the data from destination table as varbinary to verify the UTF-8 byte sequence
+            using SqlCommand verifyCommand = new($"SELECT {VectorColumnName} from {_vectorTable.Name}", destinationConnection);
+            using SqlDataReader verifyReader = verifyCommand.ExecuteReader();
+
+            // Verify that we have data in the destination table
+            Assert.True(verifyReader.Read(), "No data found in destination table after bulk copy.");
+
+            // Validate first non-null value.
+            Assert.False(verifyReader.IsDBNull(0), "First row in the table is null.");
+            Assert.Equal(TestDataInstance.SampleScalarData, ((SqlVector<TElement>)verifyReader.GetSqlVector<TElement>(0)).Memory.ToArray());
+            Assert.Equal(TestDataInstance.SampleScalarData.Length, ((SqlVector<TElement>)verifyReader.GetSqlVector<TElement>(0)).Length);
+
+            // Verify that we have another row
+            Assert.True(verifyReader.Read(), "Second row not found in the table");
+
+            // Verify that we have encountered null.
+            Assert.True(verifyReader.IsDBNull(0));
+            Assert.Equal([], ((SqlVector<TElement>)verifyReader.GetSqlVector<TElement>(0)).Memory.ToArray());
+            Assert.Equal(TestDataInstance.SampleScalarData.Length, ((SqlVector<TElement>)verifyReader.GetSqlVector<TElement>(0)).Length);
+        }
+
+        [ConditionalTheory(nameof(IsSupported))]
+        [InlineData(1)]
+        [InlineData(2)]
+        public async Task TestBulkCopyFromSqlTableAsync(int bulkCopySourceMode)
+        {
+            // Setup source with test data and create destination table for bulk copy.
+            using SqlConnection sourceConnection = new(_connectionString);
+            await sourceConnection.OpenAsync();
+            using SqlConnection destinationConnection = new(_connectionString);
+            await destinationConnection.OpenAsync();
+
+            using DataTable table = new(_bulkCopySourceTable.Name)
+            {
+                Columns =
+                {
+                    new DataColumn("Id", typeof(int)),
+                    new DataColumn(VectorColumnName, typeof(SqlVector<TElement>))
+                }
+            };
+            switch (bulkCopySourceMode)
+            {
+
+                case 1:
+                    {
+                        // Use SQL Server table as source
+                        using SqlCommand insertCmd = new($"insert into {_bulkCopySourceTable.Name} values ({VectorParameterName})", sourceConnection);
+                        SqlParameter vectorParam = new(VectorParameterName, new SqlVector<TElement>(TestDataInstance.SampleScalarData));
+
+                        // Insert 2 rows with one non-null and null value
+                        insertCmd.Parameters.Add(vectorParam);
+                        Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
+                        insertCmd.Parameters.Clear();
+                        vectorParam.Value = DBNull.Value;
+                        insertCmd.Parameters.Add(vectorParam);
+                        Assert.Equal(1, await insertCmd.ExecuteNonQueryAsync());
+                        insertCmd.Parameters.Clear();
+                        break;
+                    }
+                case 2:
+                    table.Rows.Add(1, new SqlVector<TElement>(TestDataInstance.SampleScalarData));
+                    table.Rows.Add(2, DBNull.Value);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(bulkCopySourceMode), $"Unsupported bulk copy source mode: {bulkCopySourceMode}");
+            }
+
+            // Bulk copy from SQL Server table to destination table
+            using SqlCommand sourceDataCommand = new($"SELECT Id, {VectorColumnName} FROM {_bulkCopySourceTable.Name}", sourceConnection);
+            using SqlDataReader reader = await sourceDataCommand.ExecuteReaderAsync();
+
+            // Verify that the destination table is empty before bulk copy
+            using SqlCommand countCommand = new($"SELECT COUNT(*) FROM {_vectorTable.Name}", destinationConnection);
+            Assert.Equal(0, Convert.ToInt16(await countCommand.ExecuteScalarAsync()));
+
+            // Initialize bulk copy configuration
+            using SqlBulkCopy bulkCopy = new(destinationConnection)
+            {
+                DestinationTableName = _vectorTable.Name,
+            };
+
+            // Perform bulk copy
+            switch (bulkCopySourceMode)
+            {
+                case 1:
+                    await bulkCopy.WriteToServerAsync(reader);
+                    break;
+                case 2:
+                    await bulkCopy.WriteToServerAsync(table);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(bulkCopySourceMode), $"Unsupported bulk copy source mode: {bulkCopySourceMode}");
+            }
+
+            // Verify that the 2 rows from the source table have been copied into the destination table.
+            Assert.Equal(2, Convert.ToInt16(await countCommand.ExecuteScalarAsync()));
+
+            // Read the data from destination table as varbinary to verify the UTF-8 byte sequence
+            using SqlCommand verifyCommand = new($"SELECT {VectorColumnName} from {_vectorTable.Name}", destinationConnection);
+            using SqlDataReader verifyReader = await verifyCommand.ExecuteReaderAsync();
+
+            // Verify that we have data in the destination table
+            Assert.True(await verifyReader.ReadAsync(), "No data found in destination table after bulk copy.");
+
+            // Validate first non-null value.
+            Assert.False(await verifyReader.IsDBNullAsync(0), "First row in the table is null.");
+            SqlVector<TElement> vector = await verifyReader.GetFieldValueAsync<SqlVector<TElement>>(0);
+            Assert.Equal(TestDataInstance.SampleScalarData, vector.Memory.ToArray());
+            Assert.Equal(TestDataInstance.SampleScalarData.Length, vector.Length);
+
+            // Verify that we have another row
+            Assert.True(await verifyReader.ReadAsync(), "Second row not found in the table");
+
+            // Verify that we have encountered null.
+            Assert.True(await verifyReader.IsDBNullAsync(0));
+            vector = await verifyReader.GetFieldValueAsync<SqlVector<TElement>>(0);
+            Assert.Equal([], vector.Memory.ToArray());
+            Assert.Equal(TestDataInstance.SampleScalarData.Length, vector.Length);
+        }
+
+        [ConditionalFact(nameof(IsSupported))]
+        public void TestGetFieldTypeReturnsSqlVectorForVectorColumn()
+        {
+            using SqlConnection connection = new(_connectionString);
+            connection.Open();
+
+            // Insert a row so we can query it
+            using (SqlCommand insertCmd = new(_insertCommand, connection))
+            {
+                SqlParameter param = insertCmd.Parameters.Add(VectorParameterName, SqlDbTypeExtensions.Vector);
+                param.Value = new SqlVector<TElement>(TestDataInstance.SampleScalarData);
+                insertCmd.ExecuteNonQuery();
+            }
+
+            using SqlCommand selectCmd = new(_selectCommand, connection);
+            using SqlDataReader reader = selectCmd.ExecuteReader();
+
+            // Verify GetFieldType returns SqlVector<TElement> for the vector column
+            Assert.Equal(typeof(SqlVector<TElement>), reader.GetFieldType(0));
+
+            // Verify GetProviderSpecificFieldType also returns SqlVector<TElement>
+            Assert.Equal(typeof(SqlVector<TElement>), reader.GetProviderSpecificFieldType(0));
+
+            // Verify that GetValue returns an instance consistent with GetFieldType
+            Assert.True(reader.Read(), "No data found in the table.");
+            object value = reader.GetValue(0);
+            Assert.IsType<SqlVector<TElement>>(value);
+            Assert.Equal(TestDataInstance.SampleScalarData, ((SqlVector<TElement>)value).Memory.ToArray());
+
+            // Verify GetFieldValue<SqlVector<TElement>> returns the correct typed value
+            SqlVector<TElement> typedValue = reader.GetFieldValue<SqlVector<TElement>>(0);
+            Assert.IsType<SqlVector<TElement>>(typedValue);
+            Assert.Equal(TestDataInstance.SampleScalarData, typedValue.Memory.ToArray());
+        }
+
+        [ConditionalFact(nameof(IsSupported))]
+        public void TestInsertVectorsWithPrepare()
+        {
+            using SqlConnection conn = new(_connectionString);
+            conn.Open();
+            using SqlCommand command = new(_insertCommand, conn);
+            SqlParameter vectorParam = new(VectorParameterName, SqlDbTypeExtensions.Vector);
+            command.Parameters.Add(vectorParam);
+            command.Prepare();
+
+            TElement[,] sampleDataSet = TestDataInstance.SampleDataSet;
+            for (int i = 0; i < sampleDataSet.GetLength(0); i++)
+            {
+                TElement[] rowData = GetMultidimensionalArraySlice(sampleDataSet, i);
+                vectorParam.Value = new SqlVector<TElement>(rowData);
+                command.ExecuteNonQuery();
+            }
+
+            using SqlCommand validateCommand = new($"SELECT {VectorColumnName} FROM {_vectorTable.Name}", conn);
+            using SqlDataReader reader = validateCommand.ExecuteReader();
+            int rowcnt = 0;
+            while (reader.Read())
+            {
+                TElement[] expectedData = GetMultidimensionalArraySlice(sampleDataSet, rowcnt);
+                TElement[] dbData = reader.GetSqlVector<TElement>(0).Memory.ToArray();
+                Assert.Equal(expectedData, dbData);
+                rowcnt++;
+            }
+            Assert.Equal(sampleDataSet.GetLength(0), rowcnt);
+
+            static TElement[] GetMultidimensionalArraySlice(TElement[,] sourceArray, int dimension)
+            {
+                TElement[] dst = new TElement[sourceArray.GetLength(1)];
+
+                for (int i = 0; i < dst.Length; i++)
+                {
+                    dst[i] = sourceArray[dimension, i];
+                }
+                return dst;
+            }
+        }
+    }
+}

From f5be62bc78c4cda67a6f76b2f06eed3889f2d443 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Tue, 28 Jul 2026 15:57:40 -0500
Subject: [PATCH 211/298] Repro Test for #3720 (Unobserved Exception) (#4460)

* wip

* Finish up repro test

* Fixing :robot: comments and fixing *all* race conditions in the test.

* Create a observable exception helper

* :robot: comments

* :robot: comments
---
 .../SqlClient/ManagedSni/SniPacketTests.cs    | 146 ++++++++++++++++++
 .../SqlClient/Utilities/AsyncHelperTest.cs    |  78 ++--------
 .../Utilities/ObservableExceptionHelper.cs    | 117 ++++++++++++++
 3 files changed, 280 insertions(+), 61 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniPacketTests.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Utilities/ObservableExceptionHelper.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniPacketTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniPacketTests.cs
new file mode 100644
index 0000000000..89923c5813
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniPacketTests.cs
@@ -0,0 +1,146 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+
+using System;
+using System.IO;
+using System.Security.Authentication;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.ManagedSni;
+using Microsoft.Data.SqlClient.UnitTests.Utilities;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ManagedSni
+{
+    /// <summary>
+    /// Unit tests for the <see cref="SniPacket"/> class.
+    /// </summary>
+    public sealed class SniPacketTests
+    {
+        /// <summary>
+        /// Tests the behavior of the <see cref="SniPacket"/> ReadFromStreamAsync method when the
+        /// asynchronous IO callback throws an exception. Ensures that such exceptions result in an
+        /// unobserved task exception being captured by the event handler for unobserved task
+        /// exceptions.
+        /// </summary>
+        // @TODO: This test is a repro scenario for GH#3720, its assertions should be inverted
+        //    when the broken scenario has been fixed.
+        [Fact]
+        public async Task ReadFromStreamAsync_WhenAsyncIoCallbackThrows_CreatesUnobservedTaskException()
+        {
+            // Arrange
+            // - Set up for unobserved exception handling
+            using ObservableExceptionHelper exceptionHelper = new ObservableExceptionHelper();
+
+            // - Set up task completion source to signal end of async IO completion callback
+            TaskCompletionSource callbackStarted = new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+            // - Set up packet around the test handle, wire up callback
+            TestSniHandle testHandle = new TestSniHandle();
+            SniPacket testPacket = new SniPacket(testHandle, id: 1);
+
+            testPacket.Allocate(headerLength: 0, dataLength: 1);
+            testPacket.SetAsyncIOCompletionCallback((_, _) =>
+            {
+                // Throw our special test exception, then before finishing complete the TCS so
+                // we know the exception was thrown.
+                try
+                {
+                    throw exceptionHelper.TestException;
+                }
+                finally
+                {
+                    callbackStarted.TrySetResult();
+                }
+            });
+
+            // Act
+            // - Read some bytes from the test asynchronously. This will cause the async IO
+            //   completion callback to fire, which will throw our test exception.
+            using MemoryStream emptyStream = new();
+            testPacket.ReadFromStreamAsync(emptyStream);
+
+            // - Wait for async IO to complete (should be more or less instantaneous)
+            await callbackStarted.Task.WaitAsync(TimeSpan.FromSeconds(5));
+
+            // - Force GC and wait for unhandled exception to be raised
+            testHandle.ReturnPacket(testPacket);
+            Exception? unobservedException = await exceptionHelper.Wait(TimeSpan.FromSeconds(5));
+
+            // Assert
+            Assert.NotNull(unobservedException);
+        }
+
+        private sealed class TestSniHandle : SniHandle
+        {
+            public override Guid ConnectionId { get; } = Guid.NewGuid();
+
+            public override uint Status => TdsEnums.SNI_SUCCESS;
+
+            public override SslProtocols ProtocolVersion => SslProtocols.None;
+
+            public override uint CheckConnection() => TdsEnums.SNI_SUCCESS;
+
+            public override void DisableSsl()
+            {
+            }
+
+            public override void Dispose()
+            {
+            }
+
+            public override uint EnableSsl(uint options) => TdsEnums.SNI_SUCCESS;
+
+            public override SniPacket RentPacket(int headerSize, int dataSize)
+            {
+                SniPacket packet = new(this, id: 1);
+                packet.Allocate(headerSize, dataSize);
+                return packet;
+            }
+
+            public override uint Receive(out SniPacket packet, int timeoutInMilliseconds)
+            {
+                throw new NotSupportedException();
+            }
+
+            public override uint ReceiveAsync(ref SniPacket packet)
+            {
+                throw new NotSupportedException();
+            }
+
+            public override void ReturnPacket(SniPacket packet)
+            {
+                packet.Release();
+                GC.SuppressFinalize(packet);
+            }
+
+            public override uint Send(SniPacket packet)
+            {
+                throw new NotSupportedException();
+            }
+
+            public override uint SendAsync(SniPacket packet)
+            {
+                throw new NotSupportedException();
+            }
+
+            public override void SetAsyncCallbacks(SniAsyncCallback receiveCallback, SniAsyncCallback sendCallback)
+            {
+            }
+
+            public override void SetBufferSize(int bufferSize)
+            {
+            }
+
+            #if DEBUG
+            public override void KillConnection()
+            {
+            }
+            #endif
+        }
+    }
+}
+
+#endif
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/Utilities/AsyncHelperTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/Utilities/AsyncHelperTest.cs
index 8f1529f8ef..a719bc9ca9 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/Utilities/AsyncHelperTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/Utilities/AsyncHelperTest.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.UnitTests.Utilities;
@@ -1730,58 +1728,26 @@ private static Task GetCancelledTask()
             return Task.FromCanceled(cts.Token);
         }
 
-        private static TaskCompletionSource<object?> GetTaskCompletionSource()
-            => new(TaskCreationOptions.RunContinuationsAsynchronously);
+        private static TaskCompletionSource<object?> GetTaskCompletionSource() =>
+            new(TaskCreationOptions.RunContinuationsAsynchronously);
 
-        private static async Task VerifyDoesNotCreateUnobservedException(Func<ObservableException, Task> methodUnderTest)
+        private static async Task VerifyDoesNotCreateUnobservedException(Func<Exception, Task> methodUnderTest)
         {
             // Arrange
-            // - Set up an unobserved exception handler that only captures the exception that will
-            //   be thrown by the continuation callback.
-            // NOTE: This only captures the exception thrown by the callback because unit tests run
-            //   in parallel. Thus, other tests may cause unobserved exceptions that would cause
-            //   false failures of this test.
-            Guid exceptionId = Guid.NewGuid();
-            Exception? unhandledException = null;
-            EventHandler<UnobservedTaskExceptionEventArgs> handleUnobservedException =
-                (_, args) =>
-                {
-                    // Filter inner exceptions on type and expected ID
-                    IEnumerable<ObservableException> observableInnerExceptions =
-                        args.Exception.InnerExceptions.OfType<ObservableException>();
-                    if (observableInnerExceptions.Any(oe => oe.Identifier == exceptionId))
-                    {
-                        unhandledException = args.Exception;
-                        args.SetObserved();
-                    }
-                };
-
-            // - Register the unobserved exception handler
-            // @TODO: Can we do this with a custom scheduler to avoid changing global state?
-            TaskScheduler.UnobservedTaskException += handleUnobservedException;
-
-            try
-            {
-                // Act
-                // - Run the test method
-                await methodUnderTest(new ObservableException(exceptionId));
-
-                // - Force GC collection to get any unobserved exception to raise an exception.
-                //   However, if the method under test is behaving correctly, this *should not*
-                //   raise any exception.
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
-                GC.Collect();
-
-                // Assert
-                // - The unobserved exception handler should not have captured any exception.
-                Assert.Null(unhandledException);
-            }
-            finally
-            {
-                // Cleanup
-                TaskScheduler.UnobservedTaskException -= handleUnobservedException;
-            }
+            // - Generate test exception and register unobserved exception handler that observes
+            //   the test exception.
+            using ObservableExceptionHelper exceptionHelper = new ObservableExceptionHelper();
+
+            // Act
+            // - Run the test method
+            await methodUnderTest(exceptionHelper.TestException);
+
+            // - Force GC and wait for unobserved exceptions to be processed.
+            Exception? unobservedException = await exceptionHelper.Wait(TimeSpan.FromSeconds(0.5));
+
+            // Assert
+            // - The unobserved handler should not have captured our test exception
+            Assert.Null(unobservedException);
         }
 
         private static async Task RunWithTimeout([NotNull] Task? taskToRun, TimeSpan timeout)
@@ -1800,15 +1766,5 @@ private static async Task RunWithTimeout([NotNull] Task? taskToRun, TimeSpan tim
             // Force observation of any exception
             _ = taskToRun.Exception;
         }
-
-        private class ObservableException : Exception
-        {
-            public ObservableException(Guid id)
-            {
-                Identifier = id;
-            }
-
-            public Guid Identifier { get; set; }
-        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Utilities/ObservableExceptionHelper.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Utilities/ObservableExceptionHelper.cs
new file mode 100644
index 0000000000..1518803390
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Utilities/ObservableExceptionHelper.cs
@@ -0,0 +1,117 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.Data.SqlClient.UnitTests.Utilities;
+
+/// <summary>
+/// Provides a mechanism to observe unhandled exceptions thrown by asynchronous tasks. This helper
+/// is specifically designed for cases where tasks may throw unobserved exceptions, allowing
+/// these exceptions to be handled and inspected during unit tests or runtime debugging.
+/// </summary>
+/// <remarks>
+/// Usage should follow a pattern similar to the following:
+/// * Construct a new instance in the "arrange" section of the test, with `using`.
+/// * Set up the method under test such that it throws <see cref="TestException"/>
+/// * In "act" section of test, call and await the method under test
+/// * Call and await <see cref="Wait"/> and supply with suitable timeout, capturing the returned
+///   exception, if any.
+/// * Assert that the expected outcome occurred (in the "assert" section of the test). If exception
+///   was expected, ensure the returned exception is not <see langword="null"/>. Otherwise, ensure
+///   the returned exception is <see langword="null"/>.
+/// </remarks>
+public class ObservableExceptionHelper : IDisposable
+{
+    private readonly EventHandler<UnobservedTaskExceptionEventArgs> _handler;
+    private readonly TaskCompletionSource<Exception> _unobservedExceptionRaised;
+
+    /// <summary>
+    /// Constructs a new instance by initializing a test exception, creating an unobserved
+    /// exception handler that observes the test exception, and registering that handler on
+    /// the TaskScheduler.
+    /// </summary>
+    public ObservableExceptionHelper()
+    {
+        // Create special test exception
+        TestException = new ObservableException();
+
+        // Set up unobserved exception handler that only observes our special test exception
+        _unobservedExceptionRaised = new(TaskCreationOptions.RunContinuationsAsynchronously);
+        _handler = (_, args) =>
+        {
+            if (args.Exception.InnerExceptions.Contains(TestException))
+            {
+                args.SetObserved();
+                _unobservedExceptionRaised.TrySetResult(args.Exception);
+            }
+        };
+        TaskScheduler.UnobservedTaskException += _handler;
+    }
+
+    /// <summary>
+    /// Exception that method under test should throw. This exception is checked for in the
+    /// unobserved exception handler registered at construction.
+    /// </summary>
+    public ObservableException TestException { get; }
+
+    /// <inheritdoc/>
+    /// <remarks>Unregisters unobserved exception handler.</remarks>
+    public void Dispose()
+    {
+        // Unregister unobserved exception handler
+        TaskScheduler.UnobservedTaskException -= _handler;
+    }
+
+    /// <summary>
+    /// Performs a garbage collection, which should trigger the unobserved exception handler that was
+    /// registered during construction. Waits for up to 50ms for the unobserved exception handler
+    /// to handle the test exception, then loops again, until <paramref name="timeout"/> has been
+    /// exceeded. At least one loop will be attempted.
+    /// </summary>
+    /// <param name="timeout">
+    /// Amount of time to wait for our test unobserved exception handler to complete. Use
+    /// <see cref="TimeSpan.Zero"/> to only perform one loop.
+    /// </param>
+    /// <returns>
+    /// Exception raised that included the unobserved task, if handler was invoked before the
+    /// <paramref name="timeout"/> elapsed. If handler was not invoked before
+    /// <paramref name="timeout"/> elapsed, <see langword="null"/> will be returned.
+    /// </returns>
+    public async Task<Exception?> Wait(TimeSpan timeout)
+    {
+        DateTime deadline = DateTime.UtcNow + timeout;
+        do
+        {
+            // Force GC collection
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+            GC.Collect();
+
+            // Effectively wait up to 50ms before looping and trying to garbage collect again
+            Task delayTask = Task.Delay(TimeSpan.FromMilliseconds(50));
+            Task completedTask = await Task.WhenAny(_unobservedExceptionRaised.Task, delayTask);
+            if (completedTask == _unobservedExceptionRaised.Task)
+            {
+                // Unobserved exception completed before we gave up
+                return await _unobservedExceptionRaised.Task;
+            }
+        } while (DateTime.UtcNow < deadline);
+
+        // Unobserved exception did not complete, so we give up and return null
+        return null;
+    }
+
+    /// <summary>
+    /// Test exception type for unique identification of unobserved exceptions.
+    /// </summary>
+    public class ObservableException : Exception
+    {
+        /// <summary>
+        /// Identifier for uniquely identifying the current instance.
+        /// </summary>
+        public Guid Identifier { get; } = Guid.NewGuid();
+    }
+}

From 9abbd97727980ae727c80a491048c2f6251e5666 Mon Sep 17 00:00:00 2001
From: Apoorv Deshmukh <apdeshmukh@microsoft.com>
Date: Wed, 29 Jul 2026 08:04:15 +0530
Subject: [PATCH 212/298] Fix #1881 | Make the connection factory pruning timer
 demand-driven (#4479)

---
 .../Data/SqlClient/SqlConnectionFactory.cs    | 157 +++++++++++++++-
 .../SqlConnectionFactoryPruningTimerTest.cs   | 169 ++++++++++++++++++
 2 files changed, 321 insertions(+), 5 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/SqlConnectionFactoryPruningTimerTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index 8840864958..db7c6302c7 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -45,6 +45,19 @@ internal class SqlConnectionFactory
         private readonly List<DbConnectionPoolGroup> _poolGroupsToRelease;
         private readonly List<IDbConnectionPool> _poolsToRelease;
         private readonly Timer _pruningTimer;
+        private readonly TimeSpan _pruningDueTime;
+        private readonly TimeSpan _pruningPeriod;
+
+        // Guards every state transition of _pruningTimer.
+        //
+        // Lock ordering: _pruningTimerLock is outermost. StopPruningTimerIfIdle takes it and then
+        // the release-list locks, so neither may be held when arming. It deliberately reads
+        // _connectionPoolGroups without taking "this" (the dictionary is swapped wholesale, so
+        // reading the reference is safe), which keeps the lock graph acyclic.
+        private readonly object _pruningTimerLock = new object();
+        private bool _pruningTimerEnabled;
+        private bool _pruningTimerDisposed;
+
         private Dictionary<ConnectionPoolKey, DbConnectionPoolGroup> _connectionPoolGroups;
 
         #endregion
@@ -52,18 +65,36 @@ internal class SqlConnectionFactory
         #region Constructors
         
         protected SqlConnectionFactory()
+            : this(PruningDueTime, PruningPeriod)
+        {
+        }
+
+        /// <summary>
+        /// Constructs a factory with a custom pruning cadence. Intended for tests, which would
+        /// otherwise have to wait minutes for the default schedule to produce an observable
+        /// result.
+        /// </summary>
+        protected SqlConnectionFactory(TimeSpan pruningDueTime, TimeSpan pruningPeriod)
         {
+            _pruningDueTime = pruningDueTime;
+            _pruningPeriod = pruningPeriod;
             _connectionPoolGroups = new Dictionary<ConnectionPoolKey, DbConnectionPoolGroup>();
             _poolsToRelease = new List<IDbConnectionPool>();
             _poolGroupsToRelease = new List<DbConnectionPoolGroup>();
+
+            // The timer is created disarmed. It is armed on demand whenever there is something to
+            // prune and disarmed again by the callback once everything has drained, so that an
+            // idle process is not woken every pruning period for the life of the process.
             _pruningTimer = ADP.UnsafeCreateTimer(
                 PruneConnectionPoolGroups,
                 state: null,
-                PruningDueTime,
-                PruningPeriod);
+                Timeout.InfiniteTimeSpan,
+                Timeout.InfiniteTimeSpan);
             
             #if NET
             SubscribeToAssemblyLoadContextUnload();
+            #else
+            SubscribeToAppDomainUnload();
             #endif
         }
         
@@ -74,6 +105,20 @@ protected SqlConnectionFactory()
         internal static SqlConnectionFactory Instance { get; } = new SqlConnectionFactory(); 
         
         internal int ObjectId { get; } = Interlocked.Increment(ref s_objectTypeCount);
+
+        /// <summary>
+        /// Whether the pruning timer is currently armed. Test hook.
+        /// </summary>
+        internal bool IsPruningTimerActive
+        {
+            get
+            {
+                lock (_pruningTimerLock)
+                {
+                    return _pruningTimerEnabled;
+                }
+            }
+        }
         
         #endregion
 
@@ -255,6 +300,12 @@ internal DbConnectionPoolGroup GetConnectionPoolGroup(
                 
                 Debug.Assert(connectionPoolGroup != null, "how did we not create a pool entry?");
                 Debug.Assert(userConnectionOptions != null, "how did we not have user connection options?");
+
+                // Registering a pool group is the only way pruning work enters the factory: pools
+                // and pool groups are only ever queued for release while a group is still
+                // registered, and the timer cannot disarm until every collection is empty. Armed
+                // outside lock(this) to keep _pruningTimerLock outermost.
+                EnsurePruningTimerRunning();
             }
             else if (userConnectionOptions is null)
             {
@@ -294,7 +345,7 @@ internal void QueuePoolForRelease(IDbConnectionPool pool, bool clearing)
                 }
                 _poolsToRelease.Add(pool);
             }
-            
+
             SqlClientDiagnostics.Metrics.EnterInactiveConnectionPool();
             SqlClientDiagnostics.Metrics.ExitActiveConnectionPool();
         }
@@ -922,7 +973,88 @@ private void PruneConnectionPoolGroups(object state)
                 }
                 _connectionPoolGroups = newConnectionPoolGroups;
             }
+
+            // Everything above may have drained the last of the pending work. If so, park the
+            // timer rather than waking the process every pruning period forever.
+            StopPruningTimerIfIdle();
+        }
+
+        /// <summary>
+        /// Arms the pruning timer if it is not already running.
+        /// </summary>
+        /// <remarks>
+        /// The caller must publish the new pool group before calling this, and must not hold
+        /// lock(this). <see cref="StopPruningTimerIfIdle"/> re-reads all three collections under
+        /// <see cref="_pruningTimerLock"/>, so it can never disarm on behalf of work that has
+        /// already been published.
+        /// </remarks>
+        private void EnsurePruningTimerRunning()
+        {
+            lock (_pruningTimerLock)
+            {
+                if (_pruningTimerEnabled || _pruningTimerDisposed)
+                {
+                    return;
+                }
+
+                _pruningTimerEnabled = true;
+                _pruningTimer.Change(_pruningDueTime, _pruningPeriod);
+
+                SqlClientEventSource.Log.TryAdvancedTraceEvent("<prov.SqlConnectionFactory.EnsurePruningTimerRunning|RES|INFO|CPOOL> {0}, pruning timer started", ObjectId);
+            }
         }
+
+        /// <summary>
+        /// Disarms the pruning timer if there is nothing left to prune. Called at the tail of
+        /// <see cref="PruneConnectionPoolGroups"/>.
+        /// </summary>
+        private void StopPruningTimerIfIdle()
+        {
+            lock (_pruningTimerLock)
+            {
+                if (!_pruningTimerEnabled || _pruningTimerDisposed || HasPruningWork())
+                {
+                    return;
+                }
+
+                _pruningTimerEnabled = false;
+                _pruningTimer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
+
+                SqlClientEventSource.Log.TryAdvancedTraceEvent("<prov.SqlConnectionFactory.StopPruningTimerIfIdle|RES|INFO|CPOOL> {0}, pruning timer stopped, nothing left to prune", ObjectId);
+            }
+        }
+
+        /// <summary>
+        /// Whether any of the three collections walked by <see cref="PruneConnectionPoolGroups"/>
+        /// still hold work. Must be called while holding <see cref="_pruningTimerLock"/>.
+        /// </summary>
+        private bool HasPruningWork()
+        {
+            // _connectionPoolGroups is replaced wholesale rather than mutated in place, so reading
+            // the reference without lock(this) is safe and avoids a lock-ordering inversion.
+            if (_connectionPoolGroups.Count != 0)
+            {
+                return true;
+            }
+
+            lock (_poolsToRelease)
+            {
+                if (_poolsToRelease.Count != 0)
+                {
+                    return true;
+                }
+            }
+
+            lock (_poolGroupsToRelease)
+            {
+                return _poolGroupsToRelease.Count != 0;
+            }
+        }
+
+        /// <summary>
+        /// Runs a single pruning pass synchronously on the calling thread. Test hook.
+        /// </summary>
+        internal void RunPruningPass() => PruneConnectionPoolGroups(state: null);
         
         private void TryGetConnectionCompletedContinuation(Task<DbConnectionInternal> task, object state)
         {
@@ -957,12 +1089,20 @@ private void TryGetConnectionCompletedContinuation(Task<DbConnectionInternal> ta
             }
         }
         
-        #if NET
+        /// <summary>
+        /// Disposes the pruning timer and drains the pools when the hosting assembly load context
+        /// (.NET) or app domain (.NET Framework) is going away.
+        /// </summary>
         private void Unload(object sender, EventArgs e)
         {
             try
             {
-                _pruningTimer.Dispose();
+                lock (_pruningTimerLock)
+                {
+                    _pruningTimerDisposed = true;
+                    _pruningTimerEnabled = false;
+                    _pruningTimer.Dispose();
+                }
             }
             finally
             {
@@ -970,6 +1110,7 @@ private void Unload(object sender, EventArgs e)
             }
         }
 
+        #if NET
         private void SqlConnectionFactoryAssemblyLoadContext_Unloading(AssemblyLoadContext obj)
         {
             Unload(obj, EventArgs.Empty);
@@ -980,6 +1121,12 @@ private void SubscribeToAssemblyLoadContextUnload()
             AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()).Unloading += 
                 SqlConnectionFactoryAssemblyLoadContext_Unloading;
         }
+        #else
+        private void SubscribeToAppDomainUnload()
+        {
+            AppDomain.CurrentDomain.DomainUnload += Unload;
+            AppDomain.CurrentDomain.ProcessExit += Unload;
+        }
         #endif
         
         #endregion
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SqlConnectionFactoryPruningTimerTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SqlConnectionFactoryPruningTimerTest.cs
new file mode 100644
index 0000000000..87427e7ed6
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SqlConnectionFactoryPruningTimerTest.cs
@@ -0,0 +1,169 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data.Common;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests
+{
+    /// <summary>
+    /// Unit tests for the demand-driven pruning timer in <see cref="SqlConnectionFactory"/>.
+    ///
+    /// The factory is a process-wide singleton, so before
+    /// https://github.com/dotnet/SqlClient/issues/1881 its pruning timer was armed in the
+    /// constructor and never stopped, waking the process every 30 seconds for the lifetime of the
+    /// process even when there was nothing left to prune. These tests pin the arm/disarm state
+    /// machine that replaced it.
+    /// </summary>
+    public class SqlConnectionFactoryPruningTimerTest
+    {
+        /// <summary>
+        /// Passes needed to drain a pool group that never had a pool created in it (no test here
+        /// opens a connection): 1) Active -> Idle, 2) Idle -> Disabled, which returns true in the
+        /// same pass and queues the group for release, 3) released from _poolGroupsToRelease.
+        ///
+        /// Three rather than four because Disabled and queued happen together, and the release
+        /// loop runs before the pool-group loop within a pass. Deterministic: tests drive
+        /// <see cref="SqlConnectionFactory.RunPruningPass"/> synchronously.
+        /// </summary>
+        private const int ExpectedDrainPasses = 3;
+
+        /// <summary>
+        /// Hang guard, not an expectation: a regression that leaves the timer armed should fail an
+        /// assertion rather than loop forever.
+        /// </summary>
+        private const int MaxPruningPasses = 10;
+
+        #region Helpers
+
+        /// <summary>
+        /// A factory whose timer never actually fires on its own, so tests drive pruning
+        /// deterministically through <see cref="SqlConnectionFactory.RunPruningPass"/> instead of
+        /// racing a background thread.
+        /// </summary>
+        private sealed class TestSqlConnectionFactory : SqlConnectionFactory
+        {
+            internal TestSqlConnectionFactory()
+                : base(TimeSpan.FromDays(1), TimeSpan.FromDays(1))
+            {
+            }
+
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+                => throw new NotSupportedException("These tests never open a connection.");
+        }
+
+        private static DbConnectionPoolGroup AddPoolGroup(
+            SqlConnectionFactory factory,
+            string connectionString)
+        {
+            SqlConnectionOptions userOptions = null!;
+            var key = new ConnectionPoolKey(
+                connectionString,
+                credential: null,
+                accessToken: null,
+                accessTokenCallback: null,
+                sspiContextProvider: null);
+
+            return factory.GetConnectionPoolGroup(key, poolOptions: null, ref userOptions);
+        }
+
+        /// <summary>
+        /// Runs pruning passes until the timer disarms itself, or until
+        /// <see cref="MaxPruningPasses"/> is exhausted.
+        /// </summary>
+        /// <returns>The number of passes executed.</returns>
+        private static int DrainPruningWork(SqlConnectionFactory factory)
+        {
+            int passes = 0;
+            while (factory.IsPruningTimerActive && passes < MaxPruningPasses)
+            {
+                factory.RunPruningPass();
+                passes++;
+            }
+
+            return passes;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// The timer must start disarmed. A process that creates the factory but never opens a
+        /// connection should not be woken at all.
+        /// </summary>
+        [Fact]
+        public void PruningTimer_IsDisarmed_WhenFactoryIsConstructed()
+        {
+            var factory = new TestSqlConnectionFactory();
+
+            Assert.False(factory.IsPruningTimerActive);
+        }
+
+        /// <summary>
+        /// Registering a pool group creates work for the pruner, so the timer must arm.
+        /// </summary>
+        [Fact]
+        public void PruningTimer_IsArmed_WhenPoolGroupIsRegistered()
+        {
+            var factory = new TestSqlConnectionFactory();
+
+            Assert.NotNull(AddPoolGroup(factory, "Data Source=localhost;"));
+
+            Assert.True(factory.IsPruningTimerActive);
+        }
+
+        /// <summary>
+        /// The regression test for #1881: the timer must stay armed for every pass of the drain so
+        /// pruning cannot stall half-drained, then disarm once there is nothing left to prune
+        /// instead of firing forever with nothing to do.
+        /// </summary>
+        [Fact]
+        public void PruningTimer_StaysArmedUntilAllWorkDrains()
+        {
+            var factory = new TestSqlConnectionFactory();
+            AddPoolGroup(factory, "Data Source=localhost;");
+            Assert.True(factory.IsPruningTimerActive);
+
+            for (int pass = 1; pass < ExpectedDrainPasses; pass++)
+            {
+                factory.RunPruningPass();
+
+                Assert.True(
+                    factory.IsPruningTimerActive,
+                    $"Timer disarmed after pass {pass}, but the pool group had not drained yet.");
+            }
+
+            factory.RunPruningPass();
+
+            Assert.False(factory.IsPruningTimerActive);
+        }
+
+        /// <summary>
+        /// Disarming must not be a one-way door: new connection activity has to bring pruning
+        /// back, otherwise the fix would simply have disabled pruning.
+        /// </summary>
+        [Fact]
+        public void PruningTimer_IsRearmed_WhenNewPoolGroupIsRegisteredAfterDraining()
+        {
+            var factory = new TestSqlConnectionFactory();
+            AddPoolGroup(factory, "Data Source=localhost;");
+            int passes = DrainPruningWork(factory);
+            Assert.False(factory.IsPruningTimerActive);
+            Assert.Equal(ExpectedDrainPasses, passes);
+
+            AddPoolGroup(factory, "Data Source=otherhost;");
+
+            Assert.True(factory.IsPruningTimerActive);
+        }
+    }
+}

From bf3bd941e88ed9cfda3155bb1ed76201ce7eb7f5 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 29 Jul 2026 09:16:41 -0300
Subject: [PATCH 213/298] Quarantine flaky pipeline tests; add triage prompt
 (#4476)

Signed-off-by: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
---
 .../triage-pipeline-failures.prompt.md        | 185 ++++++++++++++++++
 .../ConnectionPoolTest/TransactionPoolTest.cs |  13 ++
 .../ChannelDbConnectionPoolTest.cs            |  33 ++++
 .../ChannelDbConnectionPoolWarmupTest.cs      |  15 ++
 ...andleDbConnectionPoolBlockingPeriodTest.cs |  25 +++
 ...itHandleDbConnectionPoolTransactionTest.cs |  19 ++
 .../ConnectionFailoverTests.cs                |  37 ++++
 .../SimulatedServerTests/ConnectionTests.cs   |  39 ++++
 8 files changed, 366 insertions(+)
 create mode 100644 .github/prompts/triage-pipeline-failures.prompt.md

diff --git a/.github/prompts/triage-pipeline-failures.prompt.md b/.github/prompts/triage-pipeline-failures.prompt.md
new file mode 100644
index 0000000000..c4ff676d17
--- /dev/null
+++ b/.github/prompts/triage-pipeline-failures.prompt.md
@@ -0,0 +1,185 @@
+---
+name: triage-pipeline-failures
+description: Find and classify failing tests in the CI/CD pipelines at or after a given commit, then fix or quarantine them.
+argument-hint: <target commit SHA> [optional scope, e.g. specific pipelines/branches]
+agent: agent
+# No `tools:` scoping on purpose: this prompt is access-agnostic and must be able
+# to call whatever Azure DevOps MCP server is connected (e.g. `ado/*`) in addition
+# to the built-in terminal/read/search/edit tools. Declaring a scoped `tools:` list
+# would strip out MCP/extension tools and break the preferred ADO MCP access path.
+---
+
+Triage failing tests in the CI/CD pipelines for commit
+`${input:commit}` and later. Treat only the **first whitespace-delimited token** of
+`${input:commit}` as the target commit SHA — that token is what every git ancestry
+check (`git merge-base --is-ancestor <target> ...`) uses. Any remaining text is
+**optional scope** (e.g. a pipeline name or branch): honor it when present, otherwise
+use the defaults below.
+
+## Azure DevOps access is agnostic
+
+Every data-retrieval step below is described as an **operation**, not a command.
+Perform each operation with whatever Azure DevOps access is available, in this order
+of preference:
+
+1. An **Azure DevOps MCP server**, if one is connected (preferred — no shell needed).
+2. The **`az` CLI** (`az rest --resource <ADO resource ID> ...`,
+   `az pipelines ...`, `az boards ...`).
+3. **Direct ADO REST** calls over HTTPS with a bearer token.
+
+Do not assume a specific mechanism. If the first choice is unavailable or errors,
+fall back to the next. Keep read operations read-only; only edits to test source
+files (quarantine/fix) modify state, and those happen in the repo, not in ADO.
+
+## Environment
+
+- **ADO organization**: `<ADO org>`.
+- **Projects**:
+  - `<CI project>` — CI/PR pipelines target the upstream GitHub repo.
+  - `<mirror project>` — CI/OneBranch pipelines target the ADO mirror repo.
+- The ADO mirror repo preserves the **same commit SHAs** as GitHub, so git
+  ancestry against a GitHub SHA works. It **lags** GitHub because synchronization is
+  gated by PRs: a commit only appears in the mirror once its sync PR completes, so a
+  target commit may not be present in the mirror yet even though it is on GitHub.
+
+## Step 1 — Scope to the right pipelines
+
+**Operation:** list build definitions in both `public` and `ADO.Net`, with each
+definition's folder path, `queueStatus`, and `repository.type` / `repository.name`.
+
+Ignore any definition that is **not currently enabled** (`queueStatus != enabled`,
+i.e. disabled or paused) — also skip names flagged `[Disabled]`, `[Retired]`, or under
+`\Retired\` folders. Then keep only definitions whose repo is the upstream GitHub repo
+or the ADO mirror repo. Exclude legacy driver repos and native SNI repos unless the
+user asks for SNI.
+
+Because this triage targets **non-PR commit runs** (see Step 2), prefer CI/branch
+definitions over PR-validation ones. Prefer CI, package, stress, Kerberos,
+Managed-Instance, and OneBranch official/non-official definitions across both projects.
+PR-triggered definitions are in scope only for the CI/branch runs they may also host —
+their PR-ref runs are excluded in Step 2 unless the user asks to include PR runs.
+
+## Step 2 — Find runs at/after the target commit
+
+**Operation:** for each in-scope definition, list recent runs (filter to
+`failed`, `partiallySucceeded`, `canceled`) with their `sourceBranch`,
+`sourceVersion`, `result`, and `finishTime`.
+
+**Limit to non-PR commit runs.** Only consider runs triggered by real commits on
+tracked branches (e.g. `refs/heads/main`, `refs/heads/release/*`); **exclude PR
+validation runs**. A run is a PR run — and therefore out of scope — when any of these
+hold:
+
+- Its `sourceBranch` is an ephemeral merge ref such as `refs/pull/N/merge` or
+  `refs/pull/N/head`.
+- Its build `reason` is `pullRequest`.
+- It is a PR-triggered definition running against a PR ref.
+
+Keep only runs whose `sourceVersion` is a committed SHA on a tracked branch. If the
+user explicitly asks to include PR runs, honor that override.
+
+Resolve **"at or after `${input:commit}`" by commit graph, not timestamp**:
+
+- `git merge-base --is-ancestor <target> <sourceVersion>` → true means the run's
+  commit is the target or a descendant (in scope).
+- `sourceVersion == <target>` → the target itself (in scope).
+- Divergent `release/*` or `dev/*` commits do **not** descend from a `main` target —
+  exclude them.
+
+Mirror runs use the **same SHAs** as GitHub, so apply the same
+ancestry checks. Because mirror sync is PR-gated, the target commit may not have
+reached the mirror yet — in that window there simply are no in-scope mirror runs, so
+do not infer a run is out of scope from a SHA mismatch (there is none); it is only a
+timing lag.
+
+## Step 3 — Enumerate failing test runs per build
+
+**Operation:** for each in-scope build, list its test runs.
+
+Compute real failures as `totalTests - passedTests - notApplicableTests`. Do **not**
+treat `unanalyzedTests`/`notApplicableTests` as failures. Keep runs with failures > 0.
+
+## Step 4 — Get failing test names and errors
+
+**Operation:** for each failing test run, fetch the `Failed` results with their
+`automatedTestName`, `errorMessage`, and `stackTrace`.
+
+**You must capture the actual xUnit output and full stack trace for every failed
+test — do not classify a failure without it.** The one-line `errorMessage` is not
+enough; get the complete assertion text (e.g. `Assert.Equal() Failure: Values differ /
+Expected / Actual`) and the full stack frames (the test method and the failing product
+frames). If any source truncates it, cross-check another until you have the whole thing:
+
+- The result's `errorMessage` + `stackTrace` fields (expand sub-results — see below).
+- The test run's **attachments** (TRX / `*.trx`, console logs) when the API truncates
+  long stacks.
+- The **job log** for the test step (Step 5) — the raw `dotnet test` / xUnit output
+  always contains the assertion and stack, even when the results API does not.
+
+**CRITICAL — data-driven (Theory) results hide the error on a child:** xUnit
+`[Theory]`/`[ClassData]`/`[InlineData]` tests publish as a parent result with
+`resultGroupType == "dataDriven"` whose own `errorMessage`/`stackTrace` are **null**.
+The real assertion lives on the failing **sub-result**. When a `Failed` result has a
+null error, re-fetch that result **including sub-results** and read the child. A null
+parent error means "look at the children", not "the test aborted". Only treat it as an
+abort when the build log also shows no assertion and the process was terminated
+(e.g. a `--blame-hang` dump).
+
+## Step 5 — Locate each failure's job (for logs/links)
+
+**Operation:** for a failing run, read its `pipelineReference` (stage/phase/job), then
+read the build's timeline and walk Stage → Phase → Job by `parentId` to get the job
+record id. Build deep links:
+
+- Tests tab: `.../_build/results?buildId=<id>&view=ms.vss-test-web.build-test-results-tab`
+- A specific result: append `&runId=<runId>&resultId=<resultId>&paneView=debug`
+- Job logs: `.../_build/results?buildId=<id>&view=logs&j=<jobRecordId>`
+
+## Step 6 — Classify every failure
+
+| Class | Signals | Action |
+|-------|---------|--------|
+| **True positive** (broken driver) | Deterministic; fails on every leg for the commit; assertion tied to changed code; absent on the parent commit | Fix the bug; keep/add a failing test |
+| **Test-isolation / concurrency** | Off-by-a-small-count on a process-global resource (e.g. pool `ConnectionCount` Expected 2 Actual 3); some data rows pass, others fail; depends on parallel tests | Isolate the resource (unique connection string, `[Collection]`); else quarantine |
+| **Flaky (timing/GC/load)** | Intermittent; only under CI load; GC-finalizer or retry/failover timing; "connection is broken" under contention | Deterministic fix (poll not sleep, set retry interval/timeouts); else quarantine |
+| **Environmental / infra** | Empty error AND no assertion in the log; host/agent crash; blame-hang dump; network/DTC outage; many unrelated tests fail at once | Re-run to confirm; report infra; don't quarantine on a single infra hit |
+
+Determine **regression vs pre-existing** by repeating Steps 3–4 on the
+immediately-preceding in-scope build (the parent commit). A failure present before
+`${input:commit}` was not introduced by it.
+
+## Step 7 — Check quarantine status before acting
+
+A test is already quarantined if it carries `[Trait("Category", "flaky")]`; those run
+in a separate, non-blocking quarantine step (`TestFilters="category=flaky"`) while the
+regular step excludes `category!=failing&category!=flaky&category!=interactive`.
+
+- Already-quarantined failure = expected quarantine noise, not a blocker. Only escalate
+  with a real fix.
+- Non-quarantined failure in a regular step = a real blocker.
+
+## Step 8 — Present findings and STOP (checkpoint)
+
+Steps 1–7 are **read-only investigation**. Before changing anything, present your
+findings and wait for the user's explicit go-ahead. Do **not** edit any files or take
+any action until the user approves.
+
+Present a per-failure table: test name, in-scope build(s), full xUnit assertion +
+key stack frames, classification, whether it is a regression, current quarantine
+status, and the **proposed** action (fix / quarantine / already quarantined /
+re-run to confirm). Link each failure to its build/result and job. Then explicitly ask
+the user which items to act on.
+
+## Step 9 — Act (only after approval)
+
+For each item the user approves:
+
+1. Prefer a **deterministic fix** that removes the race/isolation/timing dependency.
+2. Otherwise **quarantine**: add `[Trait("Category", "flaky")]` plus a comment holding
+   the observed failure signature (test name, assertion, key stack frames) and the
+   root-cause reasoning. Mirror the style of existing quarantine comments in the test suite.
+3. Cover both sync and async variants when the API has both.
+4. Un-quarantine once fixed and consistently green.
+
+Make only the source edits needed to fix or quarantine; do not modify pipeline YAML or
+ADO state. After editing, report what changed.
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs
index 96432c8bd6..381d35bf02 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs
@@ -74,6 +74,19 @@ public static void BasicTransactionPoolTest(string connectionString)
         /// Synapse: only supports local transaction request.
         /// </summary>
         /// <param name="connectionString"></param>
+        //
+        // Flaky under CI load only: the connection pool intermittently reports one more
+        // connection than expected because the process-global pool (keyed by connection string)
+        // is contaminated by a connection opened elsewhere while this test runs, i.e. it is a
+        // test-isolation / pool-count race, not a product defect. It cannot be made deterministic
+        // without isolating the shared pool, so it is quarantined until that isolation is added.
+        //
+        //     Failed Microsoft.Data.SqlClient.ManualTesting.Tests.TransactionPoolTest.TransactionCleanupTest(connectionString: "Data Source=tcp:localhost;Initial Catalog=Northwin"...) [2 s]
+        //   Assert.Equal() Failure: Values differ
+        //     Expected: 2
+        //     Actual:   3
+        //     at Microsoft.Data.SqlClient.ManualTesting.Tests.TransactionPoolTest.TransactionCleanupTest(String connectionString) in TransactionPoolTest.cs:line 101
+        [Trait("Category", "flaky")]
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [ClassData(typeof(ConnectionPoolConnectionStringProvider))]
         public static void TransactionCleanupTest(string connectionString)
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 9d24200b17..3592a3e54b 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -1618,6 +1618,11 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
         /// Default/Auto enable blocking for a non-Azure host (localhost), AlwaysBlock forces it on,
         /// and NeverBlock suppresses it. FR-006, FR-007.
         /// </summary>
+        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
+        // builds across multiple jobs with Assert Expected:True/Actual:False in <2ms): the
+        // assertion races the background warmup/replenishment work added in #4452 before the
+        // pool's error-state transition is observable. Not a defect in this PR.
+        [Trait("Category", "flaky")]
         [Theory]
         [InlineData("", true)]                                // Default (unspecified) => Auto => blocks for localhost
         [InlineData("Pool Blocking Period=Auto;", true)]      // Auto => blocks for non-Azure host
@@ -1653,6 +1658,10 @@ public void ErrorOccurred_OnFailure_FollowsBlockingPeriod(string blockingPeriodC
         /// Verifies that once the pool enters the blocking period, subsequent synchronous requests
         /// fail fast with the cached exception without attempting another physical open.
         /// </summary>
+        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
+        // builds): races the background warmup/replenishment work added in #4452 before the
+        // pool's error-state transition is observable. Not a defect in this PR.
+        [Trait("Category", "flaky")]
         [Fact]
         public void ErrorOccurred_BlockingEnabled_SubsequentRequestFastFails()
         {
@@ -1693,6 +1702,10 @@ public void ErrorOccurred_BlockingEnabled_SubsequentRequestFastFails()
         /// Verifies that clearing the pool while in the blocking-period error state resets the
         /// externally visible error indicator.
         /// </summary>
+        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
+        // builds): races the background warmup/replenishment work added in #4452 before the
+        // pool's error-state transition is observable. Not a defect in this PR.
+        [Trait("Category", "flaky")]
         [Fact]
         public void Clear_InErrorState_ResetsErrorOccurred()
         {
@@ -1729,6 +1742,10 @@ public void Clear_InErrorState_ResetsErrorOccurred()
         /// <see cref="FakeTimeProvider"/> so the test is deterministic and does not wait on
         /// wall-clock time. FR-006, FR-009.
         /// </summary>
+        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
+        // builds): races the background warmup/replenishment work added in #4452 before the
+        // pool's error-state transition is observable. Not a defect in this PR.
+        [Trait("Category", "flaky")]
         [Fact]
         public void Failure_ThenBlockingPeriodExpiry_AllowsSuccessfulCreate()
         {
@@ -2239,6 +2256,22 @@ protected override DbConnectionInternal CreateConnection(
         /// advancing virtual time deterministically expires only the short-timeout
         /// caller's CTS without consuming any wall-clock time.
         /// </remarks>
+        //
+        // Flaky/hang-prone under CI load: caller A runs TryGetConnection on a background
+        // task that blocks on the pool's channel wait. The test then calls
+        // fakeTime.Advance(2s) to fire A's timeout CTS. If Advance runs before A has
+        // subscribed its wait to the fake time provider, A's cancellation is missed and A
+        // blocks forever, so `await callerATask` never returns — the testhost sits idle
+        // until the 10-minute --blame-hang timeout aborts the whole run. This is a
+        // virtual-time-vs-subscription race in the test, not a pool defect; it cannot be
+        // made deterministic without a barrier guaranteeing A is parked before Advance.
+        //
+        //     The active test run was aborted. Reason: Test host process crashed
+        //     Data collector 'Blame' message: The specified inactivity time of 10 minutes has elapsed. Collecting hang dumps from testhost and its child processes.
+        //     The test running when the crash occurred:
+        //     Microsoft.Data.SqlClient.UnitTests.ConnectionPool.ChannelDbConnectionPoolTest.ConcurrentCallers_ShouldTimeoutIndependently
+        //     testhost_7576_20260724T235829_hangdump.dmp
+        [Trait("Category", "flaky")]
         [Fact]
         public async Task ConcurrentCallers_ShouldTimeoutIndependently()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
index d4c29d0459..7d2ad7347a 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
@@ -334,6 +334,11 @@ public async Task Warmup_RateLimiterSaturated_UserSharesSameLimiter()
         /// does enter the pool's blocking-period error state. Warmup then stops the pass rather than
         /// spinning on the persistent failure.
         /// </summary>
+        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
+        // builds): the background warmup thread added in #4452 races the assertion so the
+        // pool's error-state transition is observed late (Assert Expected:True/Actual:False).
+        // Not a defect in this PR.
+        [Trait("Category", "flaky")]
         [Fact]
         public async Task Warmup_AllCreationsFail_AbsorbedAndEntersErrorState()
         {
@@ -365,6 +370,11 @@ public async Task Warmup_AllCreationsFail_AbsorbedAndEntersErrorState()
         /// exception rather than attempting a fresh on-demand open. The pool remains operational and
         /// resumes creating on demand once the blocking period expires.
         /// </summary>
+        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
+        // builds): the background warmup thread added in #4452 races the assertion so the
+        // pool's error-state transition is observed late (Assert Expected:True/Actual:False).
+        // Not a defect in this PR.
+        [Trait("Category", "flaky")]
         [Fact]
         public async Task Warmup_Fails_UserRequestFastFailsDuringBlockingPeriod()
         {
@@ -390,6 +400,11 @@ public async Task Warmup_Fails_UserRequestFastFailsDuringBlockingPeriod()
         /// request (rather than warmup itself) keeps the two behaviors independent, and awaiting the
         /// warmup task makes the stand-down deterministic.
         /// </summary>
+        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
+        // builds): the background warmup thread added in #4452 races the assertion so the
+        // pool's error-state transition is observed late (Assert Expected:True/Actual:False).
+        // Not a defect in this PR.
+        [Trait("Category", "flaky")]
         [Fact]
         public async Task Warmup_RespectsErrorState_StandsDownWhileBlocking()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs
index e84f040caa..0197d62292 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs
@@ -101,6 +101,11 @@ private static bool TryGetConnectionSync(
     /// the originating exception is surfaced to the caller and <see cref="WaitHandleDbConnectionPool.ErrorOccurred"/>
     /// becomes true. Guards the <c>CreateObject</c> → <see cref="BlockingPeriodErrorState.Enter"/> wiring.
     /// </summary>
+    // Flaky under CI load only (passes locally 3/3 and on main CI; failed on a PR merge
+    // build): the WaitHandle pool's background create/prune thread races the ErrorOccurred
+    // assertion under load, and this file shares the DbConnectionInternal/SqlConnectionFactory
+    // changes from #4452. Not a defect in this PR.
+    [Trait("Category", "flaky")]
     [Fact]
     public void TryGetConnection_WhenFactoryThrows_EntersBlockingPeriod()
     {
@@ -126,6 +131,11 @@ public void TryGetConnection_WhenFactoryThrows_EntersBlockingPeriod()
     /// rethrows the original instance; the fast-fail throw returns a clone (to avoid sharing stack
     /// traces). Guards the error wait-handle → <see cref="BlockingPeriodErrorState.ThrowIfActive"/> path.
     /// </summary>
+    // Flaky under CI load only (passes locally 3/3 and on main CI; failed on a PR merge
+    // build): the WaitHandle pool's background create/prune thread races the assertion under
+    // load, and this file shares the DbConnectionInternal/SqlConnectionFactory changes from
+    // #4452. Not a defect in this PR.
+    [Trait("Category", "flaky")]
     [Fact]
     public void TryGetConnection_WhileBlocked_FastFailsWithCachedExceptionWithoutInvokingFactory()
     {
@@ -207,6 +217,11 @@ public void TryGetConnection_WhenFactorySucceeds_DoesNotEnterBlockingPeriod()
     /// an injected <see cref="FakeTimeProvider"/>, guarding the
     /// <see cref="BlockingPeriodErrorState"/> timer-exit → retry → <c>Clear</c> path at the pool level.
     /// </summary>
+    // Flaky under CI load only (passes locally 3/3 and on main CI; failed on a PR merge
+    // build): the WaitHandle pool's background create/prune thread races the ErrorOccurred/timer
+    // assertions under load, and this file shares the DbConnectionInternal/SqlConnectionFactory
+    // changes from #4452. Not a defect in this PR.
+    [Trait("Category", "flaky")]
     [Fact]
     public void TryGetConnection_AfterBlockingPeriodExpires_RetriesFactoryAndRecovers()
     {
@@ -248,6 +263,11 @@ public void TryGetConnection_AfterBlockingPeriodExpires_RetriesFactoryAndRecover
     /// reset is wired through the pool. Drives timing deterministically with an injected
     /// <see cref="FakeTimeProvider"/>.
     /// </summary>
+    // Flaky under CI load only (passes locally 3/3 and on main CI; failed on a PR merge
+    // build): the WaitHandle pool's background create/prune thread races the ErrorOccurred/timer
+    // assertions under load, and this file shares the DbConnectionInternal/SqlConnectionFactory
+    // changes from #4452. Not a defect in this PR.
+    [Trait("Category", "flaky")]
     [Fact]
     public void TryGetConnection_SuccessfulCreate_ResetsBackoffToInitialWait()
     {
@@ -300,6 +320,11 @@ public void TryGetConnection_SuccessfulCreate_ResetsBackoffToInitialWait()
     /// backoff at the pool level. Drives timing deterministically with an injected
     /// <see cref="FakeTimeProvider"/>.
     /// </summary>
+    // Flaky under CI load only (passes locally 3/3 and on main CI; failed on a PR merge
+    // build): the WaitHandle pool's background create/prune thread races the ErrorOccurred/timer
+    // assertions under load, and this file shares the DbConnectionInternal/SqlConnectionFactory
+    // changes from #4452. Not a defect in this PR.
+    [Trait("Category", "flaky")]
     [Fact]
     public void TryGetConnection_FailingAgainAfterExitTimer_StillDoublesBackoff()
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
index 712708375a..5230f9e22e 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
@@ -633,6 +633,25 @@ public void PoolSaturation_BlocksUntilConnectionAvailable()
 
     #region Controlled Concurrency Tests
 
+    // Flaky under CI load only (never reproduces locally): the two worker tasks are
+    // scheduled via Task.Run on the thread pool. On a loaded x86 agent the pool can be
+    // slow to spin up a worker, so task1 starts late and fails to signal task1Returned
+    // within task2's 10s wait, producing a WaitAll timeout. task1 itself throws no
+    // assertion (none appears in the AggregateException) — this is thread-pool
+    // starvation, not a pool/transaction defect.
+    //
+    //     [xUnit.net 00:00:14.24]     Microsoft.Data.SqlClient.UnitTests.ConnectionPool.WaitHandleDbConnectionPoolTransactionTest.TwoThreads_SharedTransaction_AccessSameTransactedEntry [FAIL]
+    //     Failed Microsoft.Data.SqlClient.UnitTests.ConnectionPool.WaitHandleDbConnectionPoolTransactionTest.TwoThreads_SharedTransaction_AccessSameTransactedEntry [10 s]
+    //     System.AggregateException : One or more errors occurred. (Timed out waiting for task1 to return its connection.)
+    //       ---- Timed out waiting for task1 to return its connection.
+    //     Stack Trace:
+    //          at System.Threading.Tasks.Task.WaitAllCore(Task[] tasks, Int32 millisecondsTimeout, CancellationToken cancellationToken)
+    //        at System.Threading.Tasks.Task.WaitAll(Task[] tasks)
+    //        at Microsoft.Data.SqlClient.UnitTests.ConnectionPool.WaitHandleDbConnectionPoolTransactionTest.TwoThreads_SharedTransaction_AccessSameTransactedEntry() in WaitHandleDbConnectionPoolTransactionTest.cs:line 681
+    //       ----- Inner Stack Trace -----
+    //        at Microsoft.Data.SqlClient.UnitTests.ConnectionPool.WaitHandleDbConnectionPoolTransactionTest.<>c__DisplayClass29_0.<TwoThreads_SharedTransaction_AccessSameTransactedEntry>b__1() in WaitHandleDbConnectionPoolTransactionTest.cs:line 670
+    //        at System.Threading.Tasks.Task.InnerInvoke()
+    [Trait("Category", "flaky")]
     [Fact]
     public void TwoThreads_SharedTransaction_AccessSameTransactedEntry()
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index 067ffe3072..23a77ef45d 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -263,6 +263,43 @@ public void NetworkDelay_ShouldConnectToPrimary()
             Assert.Equal(0, failoverServer.PreLoginCount);
         }
 
+        // Flaky under CI load only (never reproduces locally): the tight 5-second
+        // ConnectTimeout can be exhausted by the legitimate failover connection itself
+        // when the agent is slow (observed pre-login handshake ~3.4s + post-login ~5.4s),
+        // producing a Connection Timeout on the failover attempt rather than a clean
+        // failover. This is agent-timing sensitivity, not a driver defect.
+        //
+        //     [xUnit.net 00:00:16.50]     Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFailoverPartner [FAIL]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFailoverPartner [5 s]
+        //     Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections.  This failure occurred while attempting to connect to the Principle server.  The duration spent while attempting to connect to this server was - [Pre-Login] initialization=5; handshake=3398; [Login] initialization=0; authentication=0; [Post-Login] complete=5385;
+        //       ---- System.ComponentModel.Win32Exception : The wait operation timed out.
+        //     Stack Trace:
+        //          at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+        //        at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose)
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.ThrowExceptionAndWarning(Boolean callerHasConnectionLock, Boolean asyncClose)
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniError(TdsParserStateObject stateObj, UInt32 error)
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync()
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket()
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.TryPrepareBuffer()
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value)
+        //        at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+        //        at Microsoft.Data.SqlClient.TdsParser.Run(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj)
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK)
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.AttemptOneLogin(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, TimeoutTimer timeout, Boolean withFailover)
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginWithFailover(Boolean useFailoverHost, ServerInfo primaryServerInfo, String failoverHost, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions connectionOptions, SqlCredential credential, TimeoutTimer timeout)
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionOptions connectionOptions, SqlCredential credential, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance)
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal..ctor(...)
+        //        at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateConnection(SqlConnectionOptions options, ConnectionPoolKey poolKey, DbConnectionPoolGroupProviderInfo poolGroupProviderInfo, IDbConnectionPool pool, DbConnection owningConnection, TimeoutTimer timeout)
+        //        at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, TimeoutTimer timeout)
+        //        at Microsoft.Data.SqlClient.SqlConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionInternal oldConnection, TimeoutTimer timeout, Boolean forceNewConnection, DbConnectionInternal& connection)
+        //        at Microsoft.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, SqlConnectionFactory connectionFactory, TaskCompletionSource`1 retry, Boolean forceNewConnection, TimeoutTimer timeout)
+        //        at Microsoft.Data.ProviderBase.DbConnectionClosed.TryOpenConnection(DbConnection outerConnection, SqlConnectionFactory connectionFactory, TaskCompletionSource`1 retry, TimeoutTimer timeout)
+        //        at Microsoft.Data.SqlClient.SqlConnection.TryOpenInner(TaskCompletionSource`1 retry, Boolean forceNewConnection)
+        //        at Microsoft.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry, Boolean forceNewConnection, SqlConnectionOverrides overrides)
+        //        at Microsoft.Data.SqlClient.SqlConnection.Open(SqlConnectionOverrides overrides)
+        //        at Microsoft.Data.SqlClient.SqlConnection.Open()
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFailoverPartner() in ConnectionFailoverTests.cs:line 304
+        [Trait("Category", "flaky")]
         [Fact]
         public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFailoverPartner()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index 8a848c365c..a082c8c7e6 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -81,6 +81,17 @@ public async Task RequestEncryption_ServerDoesNotSupportEncryption_ShouldFail()
         }
 
 
+        // Flaky under CI load only (never reproduces locally): the simulated transient error
+        // occasionally surfaces on the retry login as well, so the async open propagates the
+        // SqlException instead of succeeding. This is the transient-fault retry timing behavior
+        // this test guards, not a harness race, so it cannot be made deterministic here.
+        //
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.TransientFault_RetryEnabled_ShouldSucceed_Async(errorCode: 40613)
+        //   Microsoft.Data.SqlClient.SqlException :
+        //     at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(...)
+        //     at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK)
+        //     at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(...)
+        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -192,6 +203,34 @@ public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
             Assert.Equal(1, server.PreLoginCount - server.AbandonedPreLoginCount);
         }
 
+        // Flaky under CI load only (never reproduces locally): the retry login can exhaust
+        // the connect-timeout budget on a slow agent and surface a post-login Connection
+        // Timeout (observed pre-login handshake ~4.4s), so the async open propagates a
+        // SqlException instead of succeeding. Same CI-load post-login timing family as the
+        // already-quarantined sibling TransientFault_RetryEnabled_ShouldSucceed_Async; not a
+        // driver defect.
+        //
+        //     [xUnit.net 00:00:11.76]     Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkError_RetryEnabled_ShouldSucceed_Async(multiSubnetFailoverEnabled: True) [FAIL]
+        //     Failed Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkError_RetryEnabled_ShouldSucceed_Async(multiSubnetFailoverEnabled: True) [5 s]
+        //     Microsoft.Data.SqlClient.SqlException : Connection Timeout Expired.  The timeout period elapsed during the post-login phase.  ... The duration spent while attempting to connect to this server was - [Pre-Login] initialization=5; handshake=4393; [Login] initialization=0; authentication=0; [Post-Login] complete=1014;
+        //       ---- System.ComponentModel.Win32Exception : The wait operation timed out.
+        //     Stack Trace:
+        //          at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+        //        at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, SqlCommand command, Boolean callerHasConnectionLock, Boolean asyncClose)
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.ThrowExceptionAndWarning(Boolean callerHasConnectionLock, Boolean asyncClose)
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniError(TdsParserStateObject stateObj, UInt32 error)
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync()
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket()
+        //        at Microsoft.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value)
+        //        at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK)
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.AttemptOneLogin(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, TimeoutTimer timeout, Boolean withFailover)
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(ServerInfo serverInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionOptions connectionOptions, SqlCredential credential, TimeoutTimer timeout)
+        //        at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OpenLoginEnlist(TimeoutTimer timeout, SqlConnectionOptions connectionOptions, SqlCredential credential, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance)
+        //        at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, TimeoutTimer timeout)
+        //        at Microsoft.Data.SqlClient.SqlConnectionFactory.<>c__DisplayClass41_0.<CreateReplaceConnectionContinuation>b__0(Task`1 _)
+        //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkError_RetryEnabled_ShouldSucceed_Async(Boolean multiSubnetFailoverEnabled)
+        [Trait("Category", "flaky")]
         [Theory]
         [InlineData(false)]
         [InlineData(true)]

From 45f47599cd3a5ec268dcb264fcc590a00888bf65 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Wed, 29 Jul 2026 15:06:17 +0100
Subject: [PATCH 214/298] Fix | Enable transport of large decimal values with
 explicit Precision and Scale (#4443)

---
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |  3 --
 .../src/Microsoft/Data/SqlClient/TdsParser.cs | 42 +++++++++----------
 .../ManualTests/AlwaysEncrypted/ApiShould.cs  |  4 +-
 .../Setup/SqlParameterPropertiesTable.cs      |  4 +-
 .../SQL/ParameterTest/ParametersTest.cs       | 32 +++++++++++++-
 5 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index 22aa0360ec..b4a7eb54df 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -1396,9 +1396,6 @@ internal static ArgumentOutOfRangeException InvalidParameterDirection(ParameterD
         internal static ArgumentException InvalidSizeValue(int value)
             => Argument(StringsHelper.GetString(Strings.ADP_InvalidSizeValue, value.ToString(CultureInfo.InvariantCulture)));
 
-        internal static ArgumentException ParameterValueOutOfRange(decimal value)
-            => ADP.Argument(StringsHelper.GetString(Strings.ADP_ParameterValueOutOfRange, value.ToString((IFormatProvider)null)));
-
         internal static ArgumentException ParameterValueOutOfRange(SqlDecimal value) => ADP.Argument(StringsHelper.GetString(Strings.ADP_ParameterValueOutOfRange, value.ToString()));
 
         internal static ArgumentException ParameterValueOutOfRange(string value) => ADP.Argument(StringsHelper.GetString(Strings.ADP_ParameterValueOutOfRange, value));
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 1a42894779..8a4186e299 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -8260,7 +8260,7 @@ internal static SqlDecimal AdjustSqlDecimalScale(SqlDecimal d, int newScale)
             return d;
         }
 
-        internal static decimal AdjustDecimalScale(decimal value, int newScale)
+        internal static SqlDecimal AdjustDecimalScale(decimal value, int newScale)
         {
 #if NET
             Span<int> decimalBits = stackalloc int[4];
@@ -8269,16 +8269,15 @@ internal static decimal AdjustDecimalScale(decimal value, int newScale)
             int[] decimalBits = decimal.GetBits(value);
 #endif
             int oldScale = (decimalBits[3] & 0x00ff0000) >> 0x10;
+            SqlDecimal num = new SqlDecimal(value);
 
             if (newScale != oldScale)
             {
                 bool round = !LocalAppContextSwitches.TruncateScaledDecimal;
-                SqlDecimal num = new SqlDecimal(value);
                 num = SqlDecimal.AdjustScale(num, newScale - oldScale, round);
-                return num.Value;
             }
 
-            return value;
+            return num;
         }
 
         internal byte[] SerializeSqlDecimal(SqlDecimal d, TdsParserStateObject stateObj)
@@ -10411,34 +10410,31 @@ private Task TDSExecuteRPCAddParameter(TdsParserStateObject stateObj, SqlParamet
                 // bug 49512, make sure the value matches the scale the user enters
                 if (!isNull)
                 {
+                    SqlDecimal adjustedValue;
+
                     if (isSqlVal)
                     {
-                        value = AdjustSqlDecimalScale((SqlDecimal)value, scale);
-
-                        // If Precision is specified, verify value precision vs param precision
-                        if (precision != 0)
-                        {
-                            if (precision < ((SqlDecimal)value).Precision)
-                            {
-                                throw ADP.ParameterValueOutOfRange((SqlDecimal)value);
-                            }
-                        }
+                        adjustedValue = AdjustSqlDecimalScale((SqlDecimal)value, scale);
                     }
                     else
                     {
-                        value = AdjustDecimalScale((Decimal)value, scale);
-
-                        SqlDecimal sqlValue = new SqlDecimal((Decimal)value);
+                        // If we encounter a System.Decimal at this point, we always convert it to
+                        // a SqlDecimal. It's necessary in order to adjust the scale and to be able
+                        // to transport the full range of numeric(38,X) values without overflowing.
+                        adjustedValue = AdjustDecimalScale((decimal)value, scale);
+                        isSqlVal = true;
+                    }
 
-                        // If Precision is specified, verify value precision vs param precision
-                        if (precision != 0)
+                    // If Precision is specified, verify value precision vs param precision
+                    if (precision != 0)
+                    {
+                        if (precision < adjustedValue.Precision)
                         {
-                            if (precision < sqlValue.Precision)
-                            {
-                                throw ADP.ParameterValueOutOfRange((Decimal)value);
-                            }
+                            throw ADP.ParameterValueOutOfRange(adjustedValue);
                         }
                     }
+
+                    value = adjustedValue;
                 }
             }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
index 556eaf04c2..8ecb3c840c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -175,7 +175,7 @@ public void SqlParameterProperties(string connection)
             string inputProcedureName = DataTestUtility.GetShortName("InputProc").ToString();
             string outputProcedureName = DataTestUtility.GetShortName("OutputProc").ToString();
             const int charColumnSize = 100;
-            const int decimalColumnPrecision = 10;
+            const int decimalColumnPrecision = 38;
             const int decimalColumnScale = 4;
             const int timeColumnScale = 5;
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/SqlParameterPropertiesTable.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/SqlParameterPropertiesTable.cs
index 90e5371cd0..dd2c44d5e8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/SqlParameterPropertiesTable.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/SqlParameterPropertiesTable.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -16,7 +16,7 @@ public override void Create(SqlConnection sqlConnection)
                 $@"CREATE TABLE [dbo].[{Name}]
                 (
                     [firstColumn] [nchar](100) NULL,
-                    [secondColumn] [decimal](10, 4) NULL,
+                    [secondColumn] [decimal](38, 4) NULL,
                     [thirdColumn] [time](5) NULL
                 )";
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
index d2cafd3c76..01bbf586fc 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -532,6 +532,36 @@ public static void TestScaledDecimalParameter_CommandInsert(string connectionStr
             Assert.True(ValidateInsertedValues(connection, decimalTable.Name, truncateScaledDecimal), $"Invalid test happened with connection string [{connection.ConnectionString}]");
         }
 
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public static void TestOutOfRangeDecimalParameter_CommandSelect()
+        {
+            using SqlConnection connection = new(DataTestUtility.TCPConnectionString);
+            connection.Open();
+
+            using SqlCommand cmd = new("SELECT @Value", connection);
+            // A System.Decimal value has a maximum precision of 29 digits. We specify a Precision of 38 and a Scale of 2 in order
+            // to prove that the client can change the scale and precision of the decimal value in ways which System.Decimal doesn't
+            // intrinsically support.
+            SqlParameter p = new("@Value", decimal.MaxValue)
+            {
+                Precision = 38,
+                Scale = 2
+            };
+
+            cmd.Parameters.Add(p);
+
+            using SqlDataReader reader = cmd.ExecuteReader();
+
+            reader.Read();
+            // Read the original value back as a SqlDecimal, with matching scale and precision.
+            SqlDecimal roundtrippedDecimal = reader.GetSqlDecimal(0);
+
+            Assert.Equal(38, roundtrippedDecimal.Precision);
+            Assert.Equal(2, roundtrippedDecimal.Scale);
+            Assert.Throws<OverflowException>(() => roundtrippedDecimal.Value);
+            Assert.Equal($"{decimal.MaxValue}.00", roundtrippedDecimal.ToString());
+        }
+
         // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         [MemberData(nameof(TestScaledDecimalParameter_Data), DisableDiscoveryEnumeration = true)]

From 25dba6ba7ed7a8cdda68820bf57712267428f97c Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 29 Jul 2026 13:21:56 -0300
Subject: [PATCH 215/298] AE tests: create ConversionTests keys once per class
 to slow error 3807 identifier exhaustion (#4478)

---
 .../AlwaysEncrypted/ConversionTests.cs        | 42 ++------
 .../TestFixtures/ConversionTestFixture.cs     | 95 +++++++++++++++++++
 2 files changed, 103 insertions(+), 34 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/ConversionTestFixture.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs
index 5574b83c45..5e122b1ab7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ConversionTests.cs
@@ -11,15 +11,13 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Security.Cryptography.X509Certificates;
 using Xunit;
 using Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted.Setup;
-using Microsoft.Data.SqlClient.Tests.Common.Fixtures;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
     [Trait("Set", "AE")]
-    public sealed class ConversionTests : IDisposable, IClassFixture<ColumnMasterKeyCertificateFixture>
+    public sealed class ConversionTests : IDisposable, IClassFixture<ConversionTestFixture>
     {
 
         private const string IdentityColumnName = "IdentityColumn";
@@ -30,9 +28,7 @@ public sealed class ConversionTests : IDisposable, IClassFixture<ColumnMasterKey
         private const decimal SmallMoneyMinValue = -214748.3648M;
         private const int MaxLength = 10000;
         private int NumberOfRows = DataTestUtility.EnclaveEnabled ? 10 : 100;
-        private ColumnEncryptionKey columnEncryptionKey;
-        private SqlColumnEncryptionCertificateStoreProvider certStoreProvider = new SqlColumnEncryptionCertificateStoreProvider();
-        private List<DbObject> _databaseObjects = new List<DbObject>();
+        private readonly ColumnEncryptionKey columnEncryptionKey;
         private List<string> _tables = new();
 
         private class ColumnMetaData
@@ -53,33 +49,12 @@ public ColumnMetaData(SqlDbType columnType, int columnSize, int precision, int s
             public bool UseMax { get; set; }
         }
 
-        public ConversionTests(ColumnMasterKeyCertificateFixture fixture)
+        public ConversionTests(ConversionTestFixture fixture)
         {
-            X509Certificate2 certificate = fixture.ColumnMasterKeyCertificate;
-            ColumnMasterKey columnMasterKey1 = new CspColumnMasterKey(
-                DatabaseHelper.GenerateUniqueName("CMK"),
-                certificate.Thumbprint,
-                certStoreProvider,
-                DataTestUtility.EnclaveEnabled);
-            _databaseObjects.Add(columnMasterKey1);
-
-            columnEncryptionKey = new ColumnEncryptionKey(
-                DatabaseHelper.GenerateUniqueName("CEK"),
-                columnMasterKey1,
-                certStoreProvider);
-            _databaseObjects.Add(columnEncryptionKey);
-
-            foreach (string connectionStr in DataTestUtility.AEConnStringsSetup)
-            {
-                var connectionString = new SqlConnectionStringBuilder(connectionStr);
-                connectionString.ConnectTimeout = Math.Max(connectionString.ConnectTimeout, 30); // The AE tests often fail with a connect timeout in this constructor. Making sure we have a reasonable timeout.
-
-                using (SqlConnection sqlConnection = new SqlConnection(connectionString.ConnectionString))
-                {
-                    sqlConnection.Open();
-                    _databaseObjects.ForEach(o => o.Create(sqlConnection));
-                }
-            }
+            // The Column Master Key and Column Encryption Key are created once per test class by
+            // the fixture, rather than once per test case, to avoid rapidly exhausting SQL Server's
+            // per-database identifier allocator (error 3807) on long-lived shared databases.
+            columnEncryptionKey = fixture.ColumnEncryptionKey;
         }
 
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringSetupForAE))]
@@ -1355,7 +1330,7 @@ private void SetParamSizeScalePrecision(ref SqlParameter param, ColumnMetaData c
 
         public void Dispose()
         {
-            _databaseObjects.Reverse();
+            // Only the per-test tables are dropped here; the CMK/CEK are owned by the class fixture.
             foreach (string connectionStr in DataTestUtility.AEConnStringsSetup)
             {
                 using (SqlConnection sqlConnection = new SqlConnection(connectionStr))
@@ -1365,7 +1340,6 @@ public void Dispose()
                     {
                         DropTableIfExists(sqlConnection, table);
                     }
-                    _databaseObjects.ForEach(o => o.Drop(sqlConnection));
                 }
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/ConversionTestFixture.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/ConversionTestFixture.cs
new file mode 100644
index 0000000000..abae589981
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/ConversionTestFixture.cs
@@ -0,0 +1,95 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted.Setup;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures;
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
+{
+    /// <summary>
+    /// Class fixture for <see cref="ConversionTests"/>. Creates a single Column Master Key (CMK) and
+    /// Column Encryption Key (CEK) once for the whole test class instead of once per test case.
+    /// </summary>
+    /// <remarks>
+    /// xUnit constructs a test class instance for every test case, so creating the keys in the
+    /// <see cref="ConversionTests"/> constructor issued a <c>CREATE COLUMN MASTER KEY</c> and
+    /// <c>CREATE COLUMN ENCRYPTION KEY</c> for each of the dozens of cases in the class. On a
+    /// long-lived shared database that rapidly advances SQL Server's internal per-database
+    /// identifier allocator, which is never reclaimed on <c>DROP</c>, eventually causing error 3807
+    /// ("Create failed because all available identifiers have been exhausted"). Creating the keys
+    /// once per class via <see cref="Xunit.IClassFixture{TFixture}"/> reduces that churn by roughly
+    /// two orders of magnitude.
+    /// </remarks>
+    public sealed class ConversionTestFixture : ColumnMasterKeyCertificateFixture
+    {
+        private readonly ColumnMasterKey _columnMasterKey;
+        private readonly SqlColumnEncryptionCertificateStoreProvider _certStoreProvider =
+            new SqlColumnEncryptionCertificateStoreProvider();
+
+        /// <summary>
+        /// The single Column Encryption Key shared by all cases in <see cref="ConversionTests"/>.
+        /// </summary>
+        public ColumnEncryptionKey ColumnEncryptionKey { get; }
+
+        public ConversionTestFixture()
+        {
+            _columnMasterKey = new CspColumnMasterKey(
+                DatabaseHelper.GenerateUniqueName("CMK"),
+                ColumnMasterKeyCertificate.Thumbprint,
+                _certStoreProvider,
+                DataTestUtility.EnclaveEnabled);
+
+            ColumnEncryptionKey = new ColumnEncryptionKey(
+                DatabaseHelper.GenerateUniqueName("CEK"),
+                _columnMasterKey,
+                _certStoreProvider);
+
+            foreach (string connectionStr in DataTestUtility.AEConnStringsSetup)
+            {
+                SqlConnectionStringBuilder connectionString = new SqlConnectionStringBuilder(connectionStr);
+                // The AE setup often fails with a connect timeout here; ensure a reasonable minimum.
+                connectionString.ConnectTimeout = Math.Max(connectionString.ConnectTimeout, 30);
+
+                using SqlConnection sqlConnection = new SqlConnection(connectionString.ConnectionString);
+                sqlConnection.Open();
+                _columnMasterKey.Create(sqlConnection);
+                ColumnEncryptionKey.Create(sqlConnection);
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            try
+            {
+                foreach (string connectionStr in DataTestUtility.AEConnStringsSetup)
+                {
+                    SqlConnectionStringBuilder connectionString = new SqlConnectionStringBuilder(connectionStr);
+                    // Match the constructor's minimum timeout; AE teardown is prone to connect timeouts,
+                    // and skipping cleanup would leave the shared CMK/CEK behind.
+                    connectionString.ConnectTimeout = Math.Max(connectionString.ConnectTimeout, 30);
+
+                    // Key drops are best-effort: a failure here must not prevent the base fixture
+                    // from removing the test certificate from the certificate store (see finally).
+                    try
+                    {
+                        using SqlConnection sqlConnection = new SqlConnection(connectionString.ConnectionString);
+                        sqlConnection.Open();
+                        ColumnEncryptionKey.Drop(sqlConnection);
+                        _columnMasterKey.Drop(sqlConnection);
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine(
+                            $"ConversionTestFixture: failed to drop keys on '{connectionString.DataSource}': {ex.Message}");
+                    }
+                }
+            }
+            finally
+            {
+                base.Dispose(disposing);
+            }
+        }
+    }
+}

From f3db5d4bb44f24ddbd16436ba33579fe88f78723 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 3 Aug 2026 10:44:30 -0700
Subject: [PATCH 216/298] Add SqlClient performance test pipeline with baseline
 comparison, noise reduction, and ADX ingestion (#4473)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add SqlClient performance test pipeline for internal Perf Test Lab

Adds a new Azure DevOps pipeline that runs the Microsoft.Data.SqlClient
BenchmarkDotNet performance tests on the internal "Perf Test Lab" by
consuming the reusable extends template v1/Perf.Test.Job.yml from the
InternalDriverTools/PerfTest repository (per wiki page 284).

Files:
- eng/pipelines/perf/sqlclient-perf-pipeline.yml: extends the perf template.
- eng/pipelines/perf/scripts/run-perf-tests.sh: Linux on-VM entry point.
- eng/pipelines/perf/scripts/run-perf-tests.ps1: Windows on-VM entry point.

The on-VM scripts install the pinned .NET SDK (global.json), create the
perf database, inject the VM SQL Server connection string into the benchmark
runner config, pin the client to the reserved CPU set, run the benchmarks,
and collect BenchmarkDotNet artifacts for the template to publish.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Add baseline-vs-current perf comparison and Kusto ingestion

Extend the SqlClient performance pipeline to:
- Run benchmarks against a released NuGet baseline (default 7.0.2,
  overridable at queue time) and against the branch under test built
  from source, both CPU-pinned, in two passes on the VM.
- Compare the two passes and emit a per-benchmark delta (markdown +
  json) surfaced as the run summary.
- Translate BenchmarkDotNet "full" JSON into the perf-results Kusto
  schema (PerfRun + PerfBenchmarkResult, wiki 270) and optionally ingest
  via an ADO service connection (AzureCLI@2 + queued ingestion).

Enables JsonExporter.Full and adds a CPM VersionOverride switch
(MdsPackageVersion) so the baseline pass can pin a released MDS version
restored from NuGet.org through a dedicated single-source config.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Set default Kusto ingestion settings for perf pipeline

Pre-fill the Kusto parameters so ingestion runs without queue-time input:
- kustoClusterUri: https://sqldrivers.westus2.kusto.windows.net
- kustoDatabase: PerfResultsTestDB
- kustoServiceConnection: PerfLab Infra Deployments

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Fix Kusto ingest step: use virtualenv for PEP 668 externally-managed Python

The 'Ingest results into Kusto' step ran a system-wide pip install, which
Ubuntu agents (Python 3.12, PEP 668) reject with 'externally-managed-environment',
failing the step. Install azure-kusto-data/azure-kusto-ingest into an isolated
virtualenv under Agent.TempDirectory and run ingest_kusto.py with the venv
interpreter instead.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Fix Kusto ingest: use pip --user --break-system-packages (no venv)

The agent lacks python3-venv/ensurepip, so 'python3 -m venv' fails too. pip
itself is present, so install azure-kusto-data/azure-kusto-ingest into the
per-user site and bypass the PEP 668 externally-managed marker with
--break-system-packages, then run ingest_kusto.py with python3.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Fix perf run: set DATATYPES_CONFIG so datatypes.json resolves

Each benchmark pass runs from an empty perf-run-<label> working directory. The
perf app loads datatypes.json from DATATYPES_CONFIG (falling back to the CWD),
but the scripts only exported RUNNER_CONFIG, so datatypes.json was looked up in
the empty run dir and threw FileNotFoundException. Export DATATYPES_CONFIG
pointing at the checked-in file in the PerformanceTests project (needs no
per-run modification), matching the RUNNER_CONFIG pattern, in both the bash and
PowerShell VM runners.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Harden Kusto ingest: flush immediately + verify rows landed

The ingest step used fire-and-forget queued ingestion, which reports success at
queue time. When the JSON mappings were missing from the database, every
ingestion failed asynchronously (BadRequest_MappingReferenceWasNotFound) yet the
pipeline step stayed green and the DB stayed empty, with no error in the log.

- Set IngestionProperties.flush_immediately so tiny perf payloads seal at once
  instead of waiting out the ~5 min batching window.
- After queuing, poll PerfRun/PerfBenchmarkResult for the current PipelineRunId
  until the expected row counts appear (configurable --verify-timeout, default
  300s). On timeout, dump '.show ingestion failures' to the build log and fail
  the step so real errors are visible. Verification is best-effort when the
  principal lacks query rights (warns, does not fail).

Verified end-to-end against the live cluster: rows landed in ~40s and the
verifier confirmed success.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: reduce benchmark noise per wiki 339 learnings

Apply the harness-owned noise-reduction controls from InternalDriverTools
wiki 339 (Reducing Noise in Performance Tests):

- Fail loud (2.10): preflight SELECT 1 before passes, plus a post-pass guard
  that fails the run when a pass produced zero benchmark results, so an empty
  comparison can never be reported green.
- Warm-up (2.5): touch the target DB in preflight to prime buffer pool/plan cache.
- Allocator tuning (2.8, Linux): export MALLOC_MMAP_THRESHOLD_ / MALLOC_TRIM_THRESHOLD_.
- Network tuning (2.9, Linux): best-effort sysctl for ephemeral ports + tcp_tw_reuse.
- Diagnostics (2.11): capture SQL instance config, CPU topology, and per-pass
  CPU-clock/thermal telemetry into results/diagnostics/.
- Regression gate (3): add failOnRegression pipeline param (default false) that
  threads --fail-on-regression to compare_perf.py.

Mirrored across run-perf-tests.sh and run-perf-tests.ps1; documented in README
(including the proposed larger follow-ups: interleaving, small bench binaries,
best-of-N confirmation).

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: interleaved + best-of-N benchmark run model (wiki 339 §2.2/§2.3/§2.6)

Replace the two-full-sequential-pass model with per-unit interleaving plus
best-of-N regression confirmation, the noise-reduction controls from
InternalDriverTools wiki 339 that require a structural change.

- Program.cs: add a BenchmarkUnit registry and env-driven modes
  PERF_LIST_BENCHMARKS (enumerate enabled units) and PERF_BENCHMARK=<unit>
  (run a single unit). No env still runs all enabled units, so the default
  behaviour is unchanged.
- interleave_perf.py: new orchestrator. Builds both variants once into
  distinct output dirs, runs each unit baseline-then-candidate back-to-back,
  re-runs only flagged units N times, and confirms a regression only on a
  strict majority. Emits the same results/{baseline,current,comparison}
  + summary.md layout as the sequential path (Kusto ingest unchanged); the
  gate fails only on CONFIRMED regressions.
- run-perf-tests.sh/.ps1: add --run-mode/-RunMode (interleaved default) and
  --confirmation-runs/-ConfirmationRuns (3); build each variant to
  perf-build-{baseline,current} and dispatch to the orchestrator, keeping the
  legacy sequential compare path as a fallback.
- pipeline yml: add benchmarkRunMode + confirmationRuns params, threaded to
  the VM script args.
- README: document the interleaving/best-of-N run model and the new params;
  move §2.2/§2.3/§2.6 from proposed to implemented.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: fix ADO template expression error in testScriptArgs

Inline '${{ if }}' directives are not allowed inside a quoted string value.
Append the --fail-on-regression flag via a key-level if/else conditional
(the same pattern already used for testScript) so the whole value is a
plain string with only simple parameter substitutions.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: remove Kusto table creation scripts

Drop the kusto/ table-creation KQL scripts (PerfRun.kql,
PerfBenchmarkResult.kql) from the perf folder.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: scrub internal references from perf README for public PR

Genericize the perf pipeline README ahead of a public repo PR:
remove internal wiki page/section citations, the concrete Kusto
cluster URI / database / service-connection names, internal lab
naming, the ADO pipeline name, and the now-removed kusto/*.kql
file references. Kusto (Azure Data Explorer) documentation is kept
generic since the ingestion scripts remain.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: source ADX/Kusto ingestion coordinates from a variable group

Remove the hard-coded Kusto cluster URI, database, and ARM service
connection from the perf pipeline. These now come from a pipeline
library variable group 'ADX Cluster Variables' (KustoClusterUri,
KustoDatabase, KustoServiceConnection), so no infrastructure
identifiers are committed to the public repo.

The compile-time ingestion gate is converted to a runtime condition
on KustoClusterUri/KustoServiceConnection, and the README is updated
to document the variable group instead of the removed parameters.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: make buildConfiguration, sourcesSubDir, driverName fixed constants

Remove Build Configuration, Self checkout folder name, and Driver Name
as queue-time parameters. They are invariant for the SqlClient perf
pipeline, so inline them as fixed constants (Release, dotnet-sqlclient,
Microsoft.Data.SqlClient) instead of exposing them as parameters or
variables. README parameter table updated accordingly.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: populate new PerfRun columns OperatingSystem, Architecture, RunType

The PerfRun schema added three required columns. Emit them from
perf_to_kusto.py:

  * OperatingSystem - Windows/Linux (from the pipeline platform, with a
    fallback to the benchmark host OsVersion).
  * Architecture    - x64/x86 (from the benchmark host Architecture,
    overridable via --architecture).
  * RunType         - Sequential/Interweaved (from the harness run mode).

Adds --operating-system/--architecture/--run-type args with schema-value
normalization, wires platform + benchmarkRunMode into both translation
invocations, and documents the new columns in the README.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Address PR review comments on perf pipeline

- Pipeline: omit --baseline-version entirely when no baseline is requested,
  via nested key-level conditionals, so an empty value can't be consumed as
  the --regression-threshold argument and corrupt arg parsing.
- run-perf-tests.sh: gate SDK reuse on `dotnet --version` from the repo root
  (honours global.json rollForward) instead of a hard-coded 10.0.* match; and
  resolve the dotnet symlink so DOTNET_ROOT points at the real install root.
- run-perf-tests.sh: export DB_NAME so the inline Python config-rewrite reads
  the intended database name instead of its own default.
- run-perf-tests.ps1: gate SDK reuse on `dotnet --version` from the repo root;
  correct the DB-create comment to match the sqlcmd-required (throw) behavior.
- compare_perf.py: compute allocation delta with `is not None` checks so a
  valid 0-byte baseline is not skipped; keep the percentage undefined for a
  0 baseline but surface the raw 0 -> X byte transition in the report.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: make Kusto ingestion-verification failures actionable

The verify step queries the ingested rows back, which requires the
'Database Viewer' role, whereas queued ingestion only needs 'Database
Ingestor'. When the service principal has Ingestor-only rights the data
lands but every verify query is denied, and the step logged a generic
"query endpoint unreachable or insufficient rights" warning that hid the
real cause (made worse by Python's block-buffered stdout reordering the
retry lines after the flushed stderr warning in the ADO log).

- ingest_kusto.py: capture the last verification exception, classify
  authorization/permission denials, and emit a specific warning telling
  the operator to grant 'Database Viewer' (still exit 0 since ingestion
  was queued). Include the concrete error detail in both warning paths.
- pipeline: run ingest_kusto.py with 'python3 -u' so verification
  diagnostics appear in order in the build log.
- README: document that the SP needs both Database Ingestor and Database
  Viewer, add a troubleshooting row for the queued-but-unverified
  warning, and align the ingestion-gating text with the KustoDatabase
  condition.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: add enableKustoIngestion parameter (on by default)

Add an 'Ingest results into Kusto' boolean pipeline parameter (default
true) so a run can opt out of ingesting its results into the perf
database while still benchmarking and comparing.

- The compile-time parameter is ANDed into the ingestion task's runtime
  condition, so ingestion runs only when the toggle is on AND the ADX
  Cluster Variables coordinates are all populated.
- README: document the new parameter, the combined gating, and how to
  skip ingestion for a single run.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: ingest with self-contained inline JSON mapping (fix empty PerfRun/PerfBenchmarkResult)

Queued Kusto ingestion referenced pre-created server-side named mappings
(PerfRun_json_mapping / PerfBenchmarkResult_json_mapping) that do not exist on
the target cluster, so the data-management service silently retried the
ingestion for ~2 days without landing any rows and without recording a failure.
The pipeline's verify step then timed out at PerfRun=0/N with no ingestion
failure to point at.

Send a self-contained inline JSON column mapping built from each payload's own
property names (which match the table column names 1:1) instead, removing the
dependency on any server-side named mapping. Validated end-to-end against the
live cluster for string, real, bool, datetime and dynamic columns.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: tag the build with "Baseline: <version>"

Add a post-test pipeline step that applies an ADO build tag of
"Baseline: <baselineVersion>" so each perf run shows, at a glance in the build
list, which released NuGet baseline it was compared against. The step runs first
(so the tag is applied even if a later step fails) and is omitted entirely when
no baseline pass is requested (empty baselineVersion).

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: drop ':' from baseline build tag (ADO rejects colon in Request.Path)

The build tag value is placed in the tagging endpoint's URL path, and a colon
trips ADO's "potentially dangerous Request.Path value was detected (:)" filter,
failing the tag step. Use "Baseline <version>" (no colon) instead.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: address PR review comments (arg validation, sudo -n, conn-string escaping, unused param)

Resolve the open Copilot review threads on PR #4473:

- interleave_perf.py: parse_cpus() now treats a malformed CPU spec as non-fatal
  (warns and disables pinning) instead of raising and failing the whole run.
- interleave_perf.py: drop the unused fail_on_regression parameter from
  orchestrate(); the gate is already applied in main() from the confirmed set.
- run-perf-tests.sh: validate --run-mode and --confirmation-runs right after
  parsing so bad queue-time inputs fail fast instead of silently falling back.
- run-perf-tests.sh: use 'sudo -n' for the best-effort sysctl network tuning so
  a VM without passwordless sudo fails immediately instead of blocking on a prompt.
- run-perf-tests.sh / run-perf-tests.ps1: wrap the SQL password in double quotes
  (doubling embedded quotes) when building the connection string so a password
  containing ';', '=', spaces or quotes can no longer corrupt it.
- sqlclient-perf-pipeline.yml: gate the ingestion task on the enableKustoIngestion
  boolean at compile time (${{ if eq(..., true) }}) instead of a fragile
  stringified 'True' comparison inside the runtime condition.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Fix perf pipeline arg style: pass PowerShell-style args to run-perf-tests.ps1

The Windows perf VM runs run-perf-tests.ps1, which binds -PascalCase named
parameters, but testScriptArgs always emitted bash-style --kebab-case flags.
PowerShell could not bind '--results-subdir', so 'perf-results' fell through
positionally onto -RunMode and tripped its ValidateSet("interleaved","sequential"),
aborting the script before any results were written. The template's result copy
then failed with 'C:/perf-tests/perf-results/.: No such file or directory'.

Make testScriptArgs platform-aware: emit '-PascalCase' args for the Windows
PowerShell entry point and keep '--kebab-case' args for the Linux bash entry
point. This is a bug in the pipeline YAML, not the extends template.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Fix perf VM run: don't let native stderr abort under PowerShell 5.1

The Windows perf VM runs Windows PowerShell 5.1, where $ErrorActionPreference =
'Stop' promotes ANY native-command stderr write into a terminating error even
on a zero exit code. When the pinned .NET SDK was not yet present, 'dotnet'
wrote SDK-resolution diagnostics ("The command could not be loaded ... No .NET
SDKs were found") to stderr, so run-perf-tests.ps1 aborted in ~1s at the first
unguarded dotnet call - before it could install the SDK - and the template's
result copy then failed with 'perf-results: No such file or directory'.

Add an Invoke-Native helper that runs native tools (dotnet/python) with the
preference relaxed and judges success solely by the process exit code, and set
$PSNativeCommandUseErrorActionPreference = $false on PowerShell 7.3+. Route all
native invocations through it (dotnet build x2, interleave/compare python), make
'dotnet --info' informational/non-fatal, and relax the preference inline around
the calls that intentionally tolerate a non-zero exit (SDK detection, benchmark
result count) or need a bespoke failure message (sqlcmd db-create, preflight).

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Capture runner config flags in PerfRun.Config

Record the benchmark runner's top-level boolean feature flags (currently
UseManagedSniOnWindows, UseOptimizedAsyncBehaviour, WaitForProfiler,
UseNativeMemoryAndETWProfiler) into the new PerfRun.Config dynamic column so
each run's SqlClient behaviour is queryable alongside its results.

- perf_to_kusto.py: add _load_runner_config() that reads runnerconfig.jsonc,
  strips // comments, and returns all top-level bool flags except
  ConnectionString and Benchmarks; new --runner-config arg wires it into the
  PerfRun row as "Config". Extraction is dynamic, so future bool flags are
  picked up automatically.
- sqlclient-perf-pipeline.yml: pass --runner-config (PerformanceTests/
  runnerconfig.jsonc) to both the current and baseline translation calls.

The inline JSON ingestion mapping is built from the payload's own keys, so the
new dynamic column ingests without any ingest_kusto.py changes.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Fix Windows perf build: correct BenchmarkDotNet.Diagnostics.Windows usage

The baseline variant build failed on the Windows perf VM (exit 1) in the
#if WINDOWS block of BenchmarkConfig.cs, which had never been compiled off-VM:

  * CS0103/CS0246: NativeMemoryProfiler / EtwProfiler were imported from the
    ...Diagnostics.Windows.Configs namespace (which holds the *attributes*),
    but the diagnoser types live in BenchmarkDotNet.Diagnostics.Windows.
  * CS0117: NativeMemoryProfiler has no static .Default; it must be constructed
    with new NativeMemoryProfiler().

The real errors were hidden because Build-Variant let the dotnet build output
flow onto its success stream, so '$dir = Build-Variant ...' swallowed the whole
build log into the return value (also corrupting the exe-dir path handed to the
interleaved orchestrator). Route build output through Out-Host so failures are
visible in the transcript and only the path is returned.

Verified by compiling the PerformanceTests project with the Windows code path
forced on (-p:OS=Windows_NT) against the 7.0.2 baseline package: builds clean;
the default non-Windows build is unaffected.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Pin MDS extension packages for 7.1.0-preview1 perf baseline

Microsoft.Data.SqlClient 7.1.0-preview1.26124.5 declares transitive
dependencies on Microsoft.Data.SqlClient.Extensions.Abstractions and
Microsoft.Data.SqlClient.Internal.Logging at 1.0.0-preview1.26124.5, which were
never published to NuGet.org. Restoring that exact baseline in Package mode
fails with NU1603 (the prerelease dependency is not found; NuGet substitutes the
released 1.0.0, and warning-as-error turns it into a build failure).

Add direct PackageReferences (VersionOverride 1.0.0) to both extension packages,
gated to MdsPackageVersion == 7.1.0-preview1.26124.5 only, so the released 1.0.0
packages satisfy the constraint without warnings. All other baselines and the
default project-reference build are unaffected.

Verified by building the PerformanceTests project against 7.1.0-preview1.26124.5
(now succeeds, extensions resolve to 1.0.0), 7.0.2, and the default source build.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* Perf: don't fail Kusto ingestion step on slow async flush

Queued Kusto ingestion is asynchronous and reliable: small perf payloads
(the 2-row PerfRun files especially) routinely take longer than the verify
polling window to become queryable even though they ingest successfully
(observed to land anywhere from ~30s to several minutes later). The verify
step was hard-failing (exit 1) whenever rows weren't queryable by the
deadline, producing random false failures even though the data was ingested
and available.

Now, on verify timeout the step consults `.show ingestion failures` and only
fails when Kusto actually reports ingestion failures. When no failures are
reported (data still flushing) or the failure query can't run, it logs a
warning and passes. Also raise the default verify timeout 300s -> 600s so the
common case still verifies before falling through to the soft-pass.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: allow setting UseManagedSniOnWindows, UseOptimizedAsyncBehaviour, UseConnectionPoolV2 via pipeline params

Wire three SqlClient config flags through the perf pipeline as boolean
parameters. On the VM, run-perf-tests.sh/.ps1 patch the runner config so
both the baseline and candidate passes run with the requested values. On
the agent, perf_to_kusto.py gains --config-override NAME=BOOL so PerfRun.Config
records exactly what ran. Defaults match runnerconfig.jsonc, preserving
current behaviour.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: address PR review comments (validation, portability, readability)

- run-perf-tests.ps1: validate ConfirmationRuns >= 1 (ValidateRange) for
  fast queue-time failure; guard Get-AffinityMask against CPU indices >= 64
  (single-word ProcessorAffinity mask can't address processor groups); use
  ProcessStartInfo.Arguments instead of ArgumentList (absent on Windows
  PowerShell 5.1 / .NET Framework).
- interleave_perf.py: skip Windows CPU pinning with a warning when any CPU
  index >= 64 rather than building an invalid SetProcessAffinityMask mask.
- run-perf-tests.sh: export SQL_SERVER after defaulting it so the inline
  Python config rewrite doesn't KeyError when the template didn't inject it.
- Program.cs: skip the WaitForProfiler Console.ReadKey prompt under
  harness-controlled runs (PERF_LIST_BENCHMARKS / PERF_BENCHMARK) so
  unattended automation can't hang.
- sqlclient-perf-pipeline.yml: strip trailing CR from a Windows VM's
  MACHINE_NAME; collapse the duplicated testScriptArgs matrix into
  pre-computed PerfArgsCommon/Baseline/Fail variables; extract the large
  inline Show-results and Kusto-translate bash blocks into
  show_perf_results.sh and translate_results_to_kusto.sh.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: apply CPU-affinity mask when high bit (CPU 63) is set

The ProcessorAffinity guard used '$mask -gt 0', which skips a mask whose
high bit is set: pinning CPU 63 makes the [long] mask negative even though
it is a valid affinity value. Use a non-zero check so those masks still
apply; CPUs >= 64 are already filtered out earlier in Get-AffinityMask.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

* perf: extract MACHINE_NAME from runinfo.env as data instead of sourcing it

Sourcing runinfo.env executes its contents as shell code. Even though the
VM only ever writes a single MACHINE_NAME=... line, extract that value
with grep/cut instead so unexpected or corrupted file content from the
VM-collected results directory can never be executed.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 4a21e2a3-6efa-45c7-9bfd-81e7f3d24a89
---
 eng/pipelines/perf/README.md                  | 242 +++++++
 eng/pipelines/perf/scripts/compare_perf.py    | 253 ++++++++
 eng/pipelines/perf/scripts/ingest_kusto.py    | 361 +++++++++++
 eng/pipelines/perf/scripts/interleave_perf.py | 421 +++++++++++++
 eng/pipelines/perf/scripts/perf_to_kusto.py   | 374 +++++++++++
 eng/pipelines/perf/scripts/run-perf-tests.ps1 | 577 +++++++++++++++++
 eng/pipelines/perf/scripts/run-perf-tests.sh  | 593 ++++++++++++++++++
 .../perf/scripts/show_perf_results.sh         |  35 ++
 .../scripts/translate_results_to_kusto.sh     | 111 ++++
 .../perf/sqlclient-perf-pipeline.yml          | 359 +++++++++++
 .../Config/BenchmarkConfig.cs                 |   8 +-
 ...oft.Data.SqlClient.PerformanceTests.csproj |  22 +-
 .../tests/PerformanceTests/Program.cs         | 245 ++++----
 13 files changed, 3460 insertions(+), 141 deletions(-)
 create mode 100644 eng/pipelines/perf/README.md
 create mode 100644 eng/pipelines/perf/scripts/compare_perf.py
 create mode 100644 eng/pipelines/perf/scripts/ingest_kusto.py
 create mode 100644 eng/pipelines/perf/scripts/interleave_perf.py
 create mode 100644 eng/pipelines/perf/scripts/perf_to_kusto.py
 create mode 100644 eng/pipelines/perf/scripts/run-perf-tests.ps1
 create mode 100755 eng/pipelines/perf/scripts/run-perf-tests.sh
 create mode 100755 eng/pipelines/perf/scripts/show_perf_results.sh
 create mode 100755 eng/pipelines/perf/scripts/translate_results_to_kusto.sh
 create mode 100644 eng/pipelines/perf/sqlclient-perf-pipeline.yml

diff --git a/eng/pipelines/perf/README.md b/eng/pipelines/perf/README.md
new file mode 100644
index 0000000000..244a9b705b
--- /dev/null
+++ b/eng/pipelines/perf/README.md
@@ -0,0 +1,242 @@
+# SqlClient Performance Test Pipeline
+
+This directory contains the Azure DevOps pipeline and supporting scripts that run the
+Microsoft.Data.SqlClient [BenchmarkDotNet](https://benchmarkdotnet.org/) performance tests on a
+dedicated performance test lab (Azure Dedicated Hosts), compare the branch under test against a
+released NuGet baseline, and optionally ingest the results into an Azure Data Explorer (Kusto)
+database.
+
+## Contents
+
+| Path | Purpose |
+| ---- | ------- |
+| `sqlclient-perf-pipeline.yml` | The pipeline. Extends `v1/Perf.Test.Job.yml@PerfTemplates`. |
+| `scripts/run-perf-tests.sh` | Linux on-VM entry point: install SDK, create DB, run benchmarks (interleaved or sequential), compare. |
+| `scripts/run-perf-tests.ps1` | Windows equivalent (ProcessorAffinity instead of `taskset`). |
+| `scripts/interleave_perf.py` | Interleaved + best-of-N orchestrator: runs each unit baseline↔candidate back-to-back and confirms regressions across N passes. |
+| `scripts/compare_perf.py` | Compares baseline vs current BenchmarkDotNet JSON → delta (md + json). Reused by the orchestrator. |
+| `scripts/perf_to_kusto.py` | Translates BenchmarkDotNet "full" JSON → Kusto `PerfRun` + `PerfBenchmarkResult` NDJSON. |
+| `scripts/ingest_kusto.py` | Queued Kusto ingestion (az CLI auth, runs on the agent). |
+
+## Architecture
+
+```
+Queue pipeline (ADO)
+      │
+      ▼
+extends: v1/Perf.Test.Job.yml@PerfTemplates
+      │  (provisions a dedicated-host VM, SCPs the repo, runs the script over SSH,
+      │   SCPs <testResultsSubDir> back, publishes it, tears the VM down)
+      ▼
+ON THE VM  ── run-perf-tests.{sh,ps1}
+      1. Install the .NET SDK pinned by global.json (+ runtimes).
+      2. Create the perf database on the VM's SQL Server.
+      3. Inject the VM SQL connection string into runnerconfig.
+      4. Baseline pass  → MDS <baselineVersion> from NuGet.org (Package mode)   → results/baseline/
+      5. Current  pass  → MDS built from source (ProjectReference)              → results/current/
+         (both pinned to PERF_CLIENT_CPUS; interleaved per-unit by default, or two full
+          sequential passes when benchmarkRunMode=sequential)
+      6. interleave_perf.py / compare_perf.py → results/comparison/ + results/summary.md
+      ▼
+ON THE AGENT  ── pipeline post-test steps
+      • Show the BenchmarkDotNet markdown reports in the log.
+      • perf_to_kusto.py → NDJSON for both passes (published as 'perf-kusto-payloads').
+      • (optional) AzureCLI@2 + ingest_kusto.py → Kusto database.
+```
+
+The extends template only exposes **post-test** steps to consumers (no pre-build hook), so **both
+benchmark passes run inside the on-VM script**. Translation and ingestion run on the **agent**
+because that is where the pipeline's AAD identity / service connection and the native pipeline
+context variables are available (the VM is behind NAT and lacks the pipeline identity).
+
+## Parameters
+
+| Parameter | Default | Description |
+| --------- | ------- | ----------- |
+| `platform` | `linux` | `linux` or `windows` VM + client. |
+| `dotnetFramework` | `net9.0` | TFM the benchmarks run against (`net8.0`/`net9.0`/`net10.0`). |
+| `testTimeoutMinutes` | `180` | Template timeout waiting for the VM run. |
+| `baselineVersion` | `7.0.2` | **Baseline Version** — released MDS the branch is compared against. Empty = current-only (no baseline pass / comparison). |
+| `regressionThreshold` | `10` | Percent slowdown (current vs baseline mean) flagged as a regression. |
+| `failOnRegression` | `false` | When `true`, a candidate-slower regression **fails** the run (gate). In interleaved mode only **confirmed** regressions (best-of-N majority) fail. Default off. |
+| `benchmarkRunMode` | `interleaved` | `interleaved` (per-unit baseline↔candidate + best-of-N confirmation) or `sequential` (legacy two full passes). |
+| `confirmationRuns` | `3` | Best-of-N: interleaved passes for a flagged unit before a regression is confirmed. `1` disables confirmation. Interleaved mode only. |
+| `useManagedSniOnWindows` | `false` | SqlClient `UseManagedSniOnWindows` flag. Applied to the runner config for **both** passes on the VM and recorded in `PerfRun.Config`. Default matches the checked-in `runnerconfig.jsonc`. |
+| `useOptimizedAsyncBehaviour` | `true` | SqlClient `UseOptimizedAsyncBehaviour` flag. Applied to both passes and recorded in `PerfRun.Config`. Default matches `runnerconfig.jsonc`. |
+| `useConnectionPoolV2` | `false` | SqlClient `UseConnectionPoolV2` flag. Applied to both passes and recorded in `PerfRun.Config`. Default matches `runnerconfig.jsonc`. |
+| `enableKustoIngestion` | `true` | **Ingest results into Kusto** — when `false`, the run still benchmarks + compares but skips ingesting into the perf database. When `true`, ingestion additionally requires the `ADX Cluster Variables` group to be populated. |
+
+The following values are **fixed constants** in the pipeline (not parameters or variables), since they
+are invariant for this pipeline: `buildConfiguration = Release`, `sourcesSubDir = dotnet-sqlclient`
+(the multi-repo checkout folder for `self`, which must match the ADO repository name), and
+`driverName = Microsoft.Data.SqlClient` (recorded on every row as `DriverName` / `DerivedRunId`).
+
+### Kusto (Azure Data Explorer) ingestion variables
+
+The ADX ingestion coordinates are **not** pipeline parameters — they come from a pipeline library
+variable group named **`ADX Cluster Variables`** so no infrastructure identifiers are hard-coded in
+the pipeline. The group must define:
+
+| Variable | Description |
+| -------- | ----------- |
+| `KustoClusterUri` | ADX cluster URI, e.g. `https://<cluster>.<region>.kusto.windows.net`. Empty ⇒ ingestion skipped. |
+| `KustoDatabase` | Target Kusto database. Empty ⇒ ingestion skipped. |
+| `KustoServiceConnection` | Azure DevOps ARM service connection whose SP has ingest rights. Empty ⇒ ingestion skipped. |
+
+Ingestion is gated at runtime: it only runs when `KustoClusterUri`, `KustoDatabase` and
+`KustoServiceConnection` are all non-empty, so the pipeline still runs + compares before the
+cluster/service connection exist.
+
+### Managing the baseline version
+
+`baselineVersion` is **manually managed**. After each stable release is published to NuGet.org,
+bump the `default` in `sqlclient-perf-pipeline.yml` (e.g. `7.0.2` → the next stable). It can also be
+overridden at queue time without editing the pipeline.
+
+## Two-pass build model
+
+The `PerformanceTests` project references Microsoft.Data.SqlClient two ways, selected by MSBuild:
+
+- **Current** (default): `ProjectReference` to the in-repo source — the branch under test.
+- **Baseline**: `ReferenceType=Package` turns the reference into a `PackageReference`. Because the
+  repo uses **Central Package Management (CPM)**, the version is pinned with `VersionOverride` via
+  `-p:MdsPackageVersion=<version>` (a plain `Version` is ignored under CPM).
+
+The VM's `NuGet.config` exposes only the governed feed, and CPM rejects multiple unmapped sources
+(`NU1507`). The baseline pass therefore restores through a **dedicated single-source config**
+(`perf-baseline-nuget.config`, generated at runtime) pointing only at `https://api.nuget.org/v3/index.json`.
+
+## Comparison output
+
+`compare_perf.py` matches benchmarks by `(Type, Method, Parameters)` and reports, per benchmark, the
+baseline/current mean (ms), mean %Δ, allocation %Δ, and a status (`regression` / `improvement` /
+`unchanged` / `new` / `removed`). Outputs:
+
+- `results/comparison/comparison.md` (also copied to `results/summary.md`, which the template
+  attaches as the run summary),
+- `results/comparison/comparison.json` (structured, for tooling).
+
+## Reducing noise
+
+The harness applies a set of harness-owned controls to reduce measurement noise. The lab already
+supplies the isolated dedicated host, the tuned SQL instance, and the disjoint client CPU set
+(`PERF_CLIENT_CPUS`); the run scripts add:
+
+| Control | What the harness does |
+| ------- | --------------------- |
+| Client CPU pin | Pins the benchmark process to `PERF_CLIENT_CPUS` (`taskset` on Linux, `ProcessorAffinity` on Windows). |
+| Fail loud | Preflight `SELECT 1` before any pass, **and** a post-pass guard that fails the run if a pass produced **zero** benchmark results — so an empty comparison can never be reported green. |
+| Warm-up | Touches the target DB in the preflight to warm the buffer pool / plan cache before the first measured benchmark. |
+| Allocator tuning (Linux) | Exports `MALLOC_MMAP_THRESHOLD_=128MiB` and `MALLOC_TRIM_THRESHOLD_=-1` so large-buffer benches (`AsyncLargeDataRead`, `SqlBulkCopy`) stop re-`mmap`ing per iteration. |
+| Network tuning (Linux) | Best-effort `sysctl` to widen the ephemeral port range and enable `tcp_tw_reuse` for churn benches (`ConnectionPoolStress`, `ParallelAsyncConnection`). Never fails the run. |
+| Diagnostics | Writes `results/diagnostics/`: SQL instance config (MAXDOP, memory, affinity, tempdb files, `@@VERSION`), host CPU topology, and per-pass CPU-clock/thermal telemetry (before/after each pass). |
+| Regression gate | `failOnRegression` threads `--fail-on-regression`; only a **candidate-slower** delta past the threshold fails, and in interleaved mode only after best-of-N confirmation. Default off. |
+| Interleaving | In `interleaved` mode the harness runs **one benchmark unit at a time, baseline then candidate back-to-back**, so both sides see the same host state (see below). |
+| Best-of-N confirmation | A unit flagged in the first interleaved pass is re-run `confirmationRuns` times; a regression is **confirmed** only on a strict majority. Unconfirmed flags are reported but never fail the gate. |
+
+### Interleaving + best-of-N (run model)
+
+`benchmarkRunMode` selects how the two variants are measured:
+
+- **`interleaved`** (default) — `interleave_perf.py` orchestrates the run. Both variants are built
+  **once** into separate output dirs (`perf-build-baseline`, `perf-build-current`), then for each
+  benchmark unit the baseline and candidate builds run **back-to-back** before moving to the next
+  unit. Because the same benchmark is measured on both sides within seconds, slow host drift affects
+  both roughly equally and cancels out of the delta. This relies on the `PerformanceTests` runner
+  supporting `PERF_LIST_BENCHMARKS` (enumerate enabled units) and `PERF_BENCHMARK=<unit>` (run a
+  single unit) — see `Program.cs`.
+
+  After the first interleaved pass, only the units containing a flagged regression are re-run
+  `confirmationRuns` times (best-of-N). A regression is **confirmed** only when a strict majority of
+  the N passes agree `(count * 2 > N)`; otherwise it is reported as `regression (unconfirmed)` and
+  does **not** fail the `failOnRegression` gate. `confirmationRuns = 1` disables confirmation.
+
+- **`sequential`** — legacy model: the whole baseline suite runs, then the whole candidate suite,
+  then `compare_perf.py` diffs them. Kept as a fallback; produces the same `results/baseline`,
+  `results/current`, and `results/comparison/` layout so Kusto ingestion is identical.
+
+Both modes emit `results/comparison/comparison.md` + `comparison.json` and copy the markdown to
+`results/summary.md`; interleaved mode adds a **Confirm** column and a confirmed/unconfirmed summary.
+
+### Further tuning (not yet implemented)
+
+- **Release-grade sampling / relaxed thresholds** — tune BenchmarkDotNet job counts and
+  significance thresholds in `runnerconfig.jsonc` / `BenchmarkConfig.cs` now that interleaving and
+  best-of-N are in place.
+
+## Kusto schema & ingestion
+
+Two tables:
+
+- **`PerfRun`** — one row per run (baseline OR current): `DerivedRunId` (PK =
+  `DriverName|CommitHash|PipelineRunId`), driver/machine/agent, `OperatingSystem` (`Windows`/`Linux`),
+  `Architecture` (`x64`/`x86`), `RunType` (`Sequential`/`Interweaved`), pipeline id + build URL,
+  branch + `BranchCategory`, `VersionString`, commit hash/date, `IsComparableBase`, `IngestedAt`.
+- **`PerfBenchmarkResult`** — one row per benchmark: `BenchmarkId` (PK =
+  `DerivedRunId|BenchmarkName|MethodName|ParameterSignature`), timings in **milliseconds**
+  (BenchmarkDotNet reports nanoseconds; values are divided by 1,000,000), percentiles, throughput,
+  allocation, runtime/platform, and `DriverSpecificMetrics` (GC collections, lock contentions, …).
+
+The baseline and current passes share the pipeline run id and (for the current pass) the commit, so
+to keep their `DerivedRunId`s distinct the baseline row uses `CommitHash = v<baselineVersion>` and
+`IsComparableBase = true`; the current row uses the real commit and `IsComparableBase = false` with
+the triggering branch name.
+
+Source = BenchmarkDotNet **JSON "full"** exporter files (`*-report-full.json`). The exporter is
+enabled in `Config/BenchmarkConfig.cs` (`JsonExporter.Full`).
+
+### One-time database setup
+
+Before ingestion can run, create the two tables (`PerfRun`, `PerfBenchmarkResult`) in the target
+database, with columns matching the schema summarized above. No server-side ingestion mappings need
+to be created: `ingest_kusto.py` sends a **self-contained inline JSON column mapping** built from
+each payload's own property names (which are identical to the table's column names), so ingestion
+does not depend on any pre-created named mapping existing on the cluster.
+
+### Authentication
+
+Ingestion runs in an `AzureCLI@2` task using the ADO **ARM service connection**
+(`KustoServiceConnection` from the `ADX Cluster Variables` group). That connection's **service
+principal** must be granted, on the target database:
+
+- **Database Ingestor** — required to queue the ingestion, and
+- **Database Viewer** — required for the post-ingestion verification queries. With Ingestor-only
+  rights the data still lands, but the verify step cannot read it back and logs a warning naming
+  this missing role.
+
+`ingest_kusto.py` authenticates to Kusto with `with_az_cli_authentication` (the service connection
+is already `az login`'d inside the task) and performs a **queued** ingestion against the
+data-management (`ingest-`) endpoint.
+
+### Running before the cluster exists
+
+Ingestion is **conditional**: it only runs when the `enableKustoIngestion` parameter is `true` (the
+default) **and** `KustoClusterUri`, `KustoDatabase` and `KustoServiceConnection` (from the `ADX
+Cluster Variables` group) are all non-empty. Set `enableKustoIngestion` to `false` to opt a run out
+of ingestion explicitly. Until a cluster and service connection are
+configured, the pipeline still runs both passes, produces the comparison, and publishes the
+translated NDJSON as the `perf-kusto-payloads` artifact for manual/backfill ingestion.
+
+## Running the pipeline
+
+1. Open the performance test pipeline in Azure DevOps and select **Run pipeline**.
+2. Choose the branch to benchmark; override `baselineVersion` only if needed. Ingestion is on by
+   default (`enableKustoIngestion`) and uses the `ADX Cluster Variables` group — populate
+   `KustoClusterUri` / `KustoDatabase` / `KustoServiceConnection` there to enable it, leave them empty
+   to skip ingestion, or untick **Ingest results into Kusto** to skip it for a single run.
+3. After the run, review the **run summary** (comparison) and the `perf-results` /
+   `perf-kusto-payloads` artifacts. When a baseline pass ran, the build is tagged
+   **`Baseline <version>`** so the baseline used is visible at a glance in the ADO build list.
+
+## Troubleshooting
+
+| Symptom | Likely cause / fix |
+| ------- | ------------------ |
+| `NU1507` during the baseline pass | Multiple NuGet sources under CPM. The baseline uses a single-source config; ensure `perf-baseline-nuget.config` is being passed via `-p:RestoreConfigFile`. |
+| Baseline restore fails to find MDS | `baselineVersion` isn't a published NuGet.org version, or the VM has no outbound access to `api.nuget.org`. |
+| No comparison / summary | The baseline pass was skipped (empty `baselineVersion`) or one pass produced no `*-report-full.json`. |
+| Ingestion step skipped | `enableKustoIngestion` is `false`, or `KustoClusterUri`, `KustoDatabase` or `KustoServiceConnection` (from `ADX Cluster Variables`) is empty (expected until the cluster is provisioned). |
+| Ingestion auth error | The service connection's SP lacks **Database Ingestor** on the target database. |
+| "Kusto ingestion was queued, but the ingestion principal is not authorized to query the database" | The SP has **Database Ingestor** but not **Database Viewer**. Ingestion succeeded; grant **Database Viewer** so the verify step can confirm the rows landed. |
+| `Kusto ingestion not yet queryable after Ns ... no ingestion failures were reported` (warning, step passes) | Expected, harmless: queued ingestion is asynchronous and small perf payloads can take longer than the verify window to become queryable. The step **warns and passes** because `.show ingestion failures` is clean, so the rows will land shortly. The step only **fails** when `.show ingestion failures` actually reports failures — in that case confirm the `PerfRun` / `PerfBenchmarkResult` tables exist with columns matching the schema above (a schema/column-name mismatch is the usual cause; the self-contained inline JSON mapping rules out a missing server-side named mapping). |
+| Benchmarks not CPU-pinned | `PERF_CLIENT_CPUS` was not injected, or `taskset` is unavailable on the VM. |
diff --git a/eng/pipelines/perf/scripts/compare_perf.py b/eng/pipelines/perf/scripts/compare_perf.py
new file mode 100644
index 0000000000..609af7e8bd
--- /dev/null
+++ b/eng/pipelines/perf/scripts/compare_perf.py
@@ -0,0 +1,253 @@
+#!/usr/bin/env python3
+"""Compare two sets of BenchmarkDotNet "full" JSON reports and emit a delta.
+
+Reads every ``*-report-full.json`` under a baseline directory and a current
+directory, matches benchmarks by (Type, Method, Parameters), and computes the
+per-benchmark delta in mean execution time and allocated memory.
+
+Outputs:
+  * a GitHub-flavoured markdown table (``--out-md``), and
+  * a structured JSON document (``--out-json``)
+
+The script only uses the Python standard library so it can run on the perf VM
+without installing any packages.
+"""
+
+import argparse
+import glob
+import json
+import os
+import sys
+
+
+NS_PER_MS = 1_000_000.0
+
+
+def _load_benchmarks(directory):
+    """Return {key: record} for every benchmark found under *directory*.
+
+    key = "Type.Method(Parameters)".  record carries the mean (ns), the
+    allocated bytes/op, and the display fields used for reporting.
+    """
+    records = {}
+    pattern = os.path.join(directory, "**", "*-report-full.json")
+    for path in sorted(glob.glob(pattern, recursive=True)):
+        try:
+            with open(path, "r", encoding="utf-8-sig") as handle:
+                data = json.load(handle)
+        except (OSError, ValueError) as exc:
+            print(f"WARNING: could not parse {path}: {exc}", file=sys.stderr)
+            continue
+
+        for bench in data.get("Benchmarks", []):
+            btype = bench.get("Type", "")
+            method = bench.get("Method", "")
+            params = bench.get("Parameters", "") or ""
+            stats = bench.get("Statistics") or {}
+            mean_ns = stats.get("Mean")
+            if mean_ns is None:
+                continue
+            memory = bench.get("Memory") or {}
+            alloc = memory.get("BytesAllocatedPerOperation")
+
+            key = f"{btype}.{method}({params})"
+            records[key] = {
+                "benchmarkName": btype,
+                "methodName": method,
+                "parameterSignature": params,
+                "meanNs": float(mean_ns),
+                "allocatedBytes": float(alloc) if alloc is not None else None,
+            }
+    return records
+
+
+def _pct(baseline, current):
+    if baseline is None or current is None:
+        return None
+    if baseline == 0:
+        # A percentage change from a zero baseline is undefined (0 -> 0 is no change; 0 -> X is an
+        # infinite increase).  Return 0.0 only for the genuine no-change case; otherwise None, and let
+        # callers surface the raw before/after values so a 0 -> X regression is still visible.
+        return 0.0 if current == 0 else None
+    return (current - baseline) / baseline * 100.0
+
+
+def build_comparison(baseline_dir, current_dir, threshold_pct):
+    baseline = _load_benchmarks(baseline_dir)
+    current = _load_benchmarks(current_dir)
+
+    entries = []
+    for key in sorted(set(baseline) | set(current)):
+        b = baseline.get(key)
+        c = current.get(key)
+        ref = c or b
+        entry = {
+            "key": key,
+            "benchmarkName": ref["benchmarkName"],
+            "methodName": ref["methodName"],
+            "parameterSignature": ref["parameterSignature"],
+            "baselineMeanMs": (b["meanNs"] / NS_PER_MS) if b else None,
+            "currentMeanMs": (c["meanNs"] / NS_PER_MS) if c else None,
+            "baselineAllocBytes": b["allocatedBytes"] if b else None,
+            "currentAllocBytes": c["allocatedBytes"] if c else None,
+        }
+
+        if b and c:
+            entry["meanDeltaPct"] = _pct(b["meanNs"], c["meanNs"])
+            entry["meanRatio"] = (c["meanNs"] / b["meanNs"]) if b["meanNs"] else None
+            # Compute the allocation delta whenever both sides report a value.  A 0-byte baseline is
+            # valid, so gate on 'is not None' rather than truthiness -- gating on truthiness would drop
+            # a real 0 -> X allocation regression.  The percentage itself is undefined for a 0 baseline
+            # (see _pct); the raw baseline/current byte counts on the entry keep 0 -> X visible.
+            if b["allocatedBytes"] is not None and c["allocatedBytes"] is not None:
+                entry["allocDeltaPct"] = _pct(b["allocatedBytes"], c["allocatedBytes"])
+            else:
+                entry["allocDeltaPct"] = None
+            delta = entry["meanDeltaPct"]
+            if delta is None:
+                entry["status"] = "unknown"
+            elif delta > threshold_pct:
+                entry["status"] = "regression"
+            elif delta < -threshold_pct:
+                entry["status"] = "improvement"
+            else:
+                entry["status"] = "unchanged"
+        elif c and not b:
+            entry["meanDeltaPct"] = None
+            entry["meanRatio"] = None
+            entry["allocDeltaPct"] = None
+            entry["status"] = "current-only"
+        else:
+            entry["meanDeltaPct"] = None
+            entry["meanRatio"] = None
+            entry["allocDeltaPct"] = None
+            entry["status"] = "baseline-only"
+
+        entries.append(entry)
+
+    # Sort worst-regression first, then by name for stability.
+    def _sort_key(e):
+        d = e["meanDeltaPct"]
+        return (-(d if d is not None else -1e18), e["key"])
+
+    entries.sort(key=_sort_key)
+    return entries
+
+
+def _fmt_ms(value):
+    return f"{value:.4f}" if value is not None else "-"
+
+
+def _fmt_pct(value):
+    if value is None:
+        return "-"
+    return f"{value:+.2f}%"
+
+
+def _fmt_bytes(value):
+    return f"{int(value)}" if value is not None else "-"
+
+
+def _fmt_alloc(entry):
+    """Alloc column: a percentage when it is defined, otherwise the raw byte transition so a
+    0 -> X regression (undefined as a percentage) is still shown rather than collapsing to '-'."""
+    pct = entry.get("allocDeltaPct")
+    if pct is not None:
+        return f"{pct:+.2f}%"
+    base = entry.get("baselineAllocBytes")
+    cur = entry.get("currentAllocBytes")
+    if base is not None and cur is not None and base != cur:
+        return f"{int(base)} → {int(cur)} B"
+    return "-"
+
+
+def render_markdown(entries, baseline_version, threshold_pct):
+    regressions = [e for e in entries if e["status"] == "regression"]
+    improvements = [e for e in entries if e["status"] == "improvement"]
+
+    lines = []
+    lines.append("# SqlClient Performance Comparison")
+    lines.append("")
+    lines.append(f"Baseline: **{baseline_version}** &nbsp;|&nbsp; "
+                 f"Regression threshold: **{threshold_pct:.0f}%**")
+    lines.append("")
+    lines.append(f"- Benchmarks compared: **{len(entries)}**")
+    lines.append(f"- Regressions (slower > {threshold_pct:.0f}%): **{len(regressions)}**")
+    lines.append(f"- Improvements (faster > {threshold_pct:.0f}%): **{len(improvements)}**")
+    lines.append("")
+    lines.append("| Status | Benchmark | Method | Params | Baseline (ms) | "
+                 "Current (ms) | Mean Δ | Alloc Δ |")
+    lines.append("| ------ | --------- | ------ | ------ | ------------- | "
+                 "------------ | ------ | ------- |")
+
+    icon = {
+        "regression": "🔴 regression",
+        "improvement": "🟢 improvement",
+        "unchanged": "⚪ unchanged",
+        "current-only": "🆕 new",
+        "baseline-only": "➖ removed",
+        "unknown": "❔",
+    }
+    for e in entries:
+        lines.append(
+            "| {status} | {name} | {method} | {params} | {base} | {cur} | "
+            "{delta} | {alloc} |".format(
+                status=icon.get(e["status"], e["status"]),
+                name=e["benchmarkName"],
+                method=e["methodName"],
+                params=e["parameterSignature"] or "-",
+                base=_fmt_ms(e["baselineMeanMs"]),
+                cur=_fmt_ms(e["currentMeanMs"]),
+                delta=_fmt_pct(e["meanDeltaPct"]),
+                alloc=_fmt_alloc(e),
+            )
+        )
+    lines.append("")
+    return "\n".join(lines)
+
+
+def main(argv=None):
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--baseline-dir", required=True)
+    parser.add_argument("--current-dir", required=True)
+    parser.add_argument("--out-md", required=True)
+    parser.add_argument("--out-json", required=True)
+    parser.add_argument("--baseline-version", default="baseline")
+    parser.add_argument("--threshold", type=float, default=10.0,
+                        help="Percent slowdown that counts as a regression.")
+    parser.add_argument("--fail-on-regression", action="store_true",
+                        help="Exit non-zero if any regression is detected.")
+    args = parser.parse_args(argv)
+
+    entries = build_comparison(args.baseline_dir, args.current_dir, args.threshold)
+
+    os.makedirs(os.path.dirname(os.path.abspath(args.out_md)), exist_ok=True)
+    os.makedirs(os.path.dirname(os.path.abspath(args.out_json)), exist_ok=True)
+
+    markdown = render_markdown(entries, args.baseline_version, args.threshold)
+    with open(args.out_md, "w", encoding="utf-8") as handle:
+        handle.write(markdown + "\n")
+
+    with open(args.out_json, "w", encoding="utf-8") as handle:
+        json.dump(
+            {
+                "baselineVersion": args.baseline_version,
+                "thresholdPct": args.threshold,
+                "entries": entries,
+            },
+            handle,
+            indent=2,
+        )
+
+    regressions = [e for e in entries if e["status"] == "regression"]
+    print(f"Compared {len(entries)} benchmarks; {len(regressions)} regression(s).")
+    print(f"Wrote {args.out_md} and {args.out_json}.")
+
+    if args.fail_on_regression and regressions:
+        print("Regressions detected; failing as requested.", file=sys.stderr)
+        return 1
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/eng/pipelines/perf/scripts/ingest_kusto.py b/eng/pipelines/perf/scripts/ingest_kusto.py
new file mode 100644
index 0000000000..fb0b9d96d0
--- /dev/null
+++ b/eng/pipelines/perf/scripts/ingest_kusto.py
@@ -0,0 +1,361 @@
+#!/usr/bin/env python3
+"""Ingest translated perf-results NDJSON files into Azure Data Explorer (Kusto).
+
+Runs on the pipeline agent inside an ``AzureCLI@2`` task so that the Azure DevOps
+service connection's service principal is already logged in via ``az``.  The
+script therefore authenticates to Kusto with *az CLI* credentials and performs a
+queued ingestion of the PerfRun and PerfBenchmarkResult NDJSON files produced by
+``perf_to_kusto.py``.
+
+Queued ingestion is asynchronous: ``ingest_from_file`` only *enqueues* the data
+and returns success even when the data later fails to land (e.g. a schema
+mismatch, or a *missing* server-side ingestion mapping - which the data-management
+service silently retries for ~2 days before recording a failure).  Those failures
+surface only in Kusto's ingestion failure system, so the pipeline step used to go
+green (or hang) while the database stayed empty.  To avoid that this script:
+
+  * sends a **self-contained inline JSON column mapping** (built from the payload's
+    own property names, which match the target table's columns) instead of
+    referencing a named server-side mapping that must be pre-created on the cluster,
+  * sets ``flush_immediately`` so the data-management service seals the batch
+    right away instead of waiting out the (default 5 minute) batching window, and
+  * verifies, after queuing, that the expected rows actually became queryable --
+    polling the target tables and, on timeout, printing ``.show ingestion
+    failures`` so the real error is visible in the build log (and failing the
+    step).
+
+Requires the ``azure-kusto-ingest`` package (``pip install azure-kusto-data
+azure-kusto-ingest``); the pipeline step installs it before invoking this script.
+"""
+
+import argparse
+import json
+import os
+import sys
+import time
+
+
+def _engine_uri(cluster):
+    """Return the engine (query) endpoint, stripping any 'ingest-' prefix."""
+    if "://" in cluster:
+        scheme, rest = cluster.split("://", 1)
+        if rest.startswith("ingest-"):
+            rest = rest[len("ingest-"):]
+        return f"{scheme}://{rest}"
+    return cluster
+
+
+def _ingest_uri(cluster):
+    """Return the data-management (ingest) endpoint used by queued ingestion."""
+    if "://" in cluster:
+        scheme, rest = cluster.split("://", 1)
+        if not rest.startswith("ingest-"):
+            return f"{scheme}://ingest-{rest}"
+    return cluster
+
+
+def _ndjson_columns(data_file):
+    """Ordered union of the JSON property names across every record in an NDJSON file.
+
+    The translated payload uses property names that are identical to the target table's
+    column names, so this doubles as the set of columns to map."""
+    columns = []
+    seen = set()
+    with open(data_file, "r", encoding="utf-8") as fh:
+        for line in fh:
+            line = line.strip()
+            if not line:
+                continue
+            try:
+                obj = json.loads(line)
+            except ValueError:
+                continue
+            for key in obj:
+                if key not in seen:
+                    seen.add(key)
+                    columns.append(key)
+    return columns
+
+
+def _inline_json_mapping(data_file):
+    """Build an inline JSON column mapping (column -> $.column) from the payload's own keys.
+
+    Ingestion deliberately does NOT reference a pre-created server-side named mapping: relying on
+    one silently breaks ingestion whenever the mapping is missing from the cluster (the queued
+    request is retried for ~2 days before a failure is even recorded).  Because the NDJSON property
+    names match the table column names 1:1, a self-contained inline mapping removes that external
+    dependency entirely."""
+    from azure.kusto.ingest import ColumnMapping
+
+    # An empty column_type lets Kusto use each table column's declared type (works for string,
+    # numeric, datetime, bool and dynamic columns alike).
+    return [ColumnMapping(column_name=col, column_type="", path=f"$.{col}")
+            for col in _ndjson_columns(data_file)]
+
+
+def _ingest(cluster, database, table, data_file):
+    from azure.kusto.data import KustoConnectionStringBuilder
+    from azure.kusto.ingest import (
+        QueuedIngestClient,
+        IngestionProperties,
+        FileDescriptor,
+    )
+    from azure.kusto.data.data_format import DataFormat, IngestionMappingKind
+    from azure.kusto.ingest import ReportLevel
+
+    if not os.path.exists(data_file) or os.path.getsize(data_file) == 0:
+        print(f"Skipping {table}: '{data_file}' is missing or empty.")
+        return 0
+
+    column_mappings = _inline_json_mapping(data_file)
+    if not column_mappings:
+        print(f"Skipping {table}: '{data_file}' has no recognizable JSON records.")
+        return 0
+
+    kcsb = KustoConnectionStringBuilder.with_az_cli_authentication(_ingest_uri(cluster))
+    client = QueuedIngestClient(kcsb)
+
+    props = IngestionProperties(
+        database=database,
+        table=table,
+        data_format=DataFormat.MULTIJSON,
+        column_mappings=column_mappings,
+        ingestion_mapping_kind=IngestionMappingKind.JSON,
+        report_level=ReportLevel.FailuresAndSuccesses,
+        # Seal the batch immediately: perf payloads are tiny and we want the rows
+        # queryable in seconds (and any verification to run promptly), not after
+        # the default multi-minute batching window.
+        flush_immediately=True,
+    )
+
+    descriptor = FileDescriptor(data_file, os.path.getsize(data_file))
+    client.ingest_from_file(descriptor, ingestion_properties=props)
+    print(f"Queued ingestion of '{data_file}' -> {database}.{table} "
+          f"(inline JSON mapping, {len(column_mappings)} columns).")
+    return 0
+
+
+def _count_rows(path):
+    """Number of non-empty NDJSON lines in a file (0 when missing)."""
+    if not os.path.exists(path):
+        return 0
+    with open(path, "r", encoding="utf-8") as fh:
+        return sum(1 for line in fh if line.strip())
+
+
+def _pipeline_ids(paths):
+    """Collect the distinct PipelineRunId values from PerfRun NDJSON files."""
+    ids = set()
+    for path in paths:
+        if not os.path.exists(path):
+            continue
+        with open(path, "r", encoding="utf-8") as fh:
+            for line in fh:
+                line = line.strip()
+                if not line:
+                    continue
+                try:
+                    pid = json.loads(line).get("PipelineRunId")
+                except ValueError:
+                    pid = None
+                if pid:
+                    ids.add(str(pid))
+    return ids
+
+
+def _scalar(client, database, query):
+    resp = client.execute(database, query)
+    return int(resp.primary_results[0].rows[0][0])
+
+
+def _is_authorization_error(exc):
+    """True when an exception looks like a Kusto authorization/permission denial
+    (as opposed to a transient network error), so the operator can be told to
+    grant the querying role rather than chase a connectivity problem."""
+    if exc is None:
+        return False
+    text = str(exc).lower()
+    needles = (
+        "forbidden", "unauthorized", "not authorized", "does not have permission",
+        "principal", "403", "e_access", "access denied",
+    )
+    return any(n in text for n in needles)
+
+
+def _dump_failures(client, database):
+    """Print any recent ingestion failures for the perf tables.
+
+    Returns the number of failures found, or ``None`` when the failure query
+    itself could not run (e.g. the principal lacks the monitoring role). The
+    caller uses this to distinguish a genuine ingestion failure (fail the step)
+    from data that is merely still flushing (do not fail the step)."""
+    cmd = (".show ingestion failures "
+           "| where Table in ('PerfRun', 'PerfBenchmarkResult') "
+           "| where FailedOn > ago(2h) "
+           "| project FailedOn, Table, ErrorCode, FailureKind, Details, OperationId "
+           "| order by FailedOn desc | take 25")
+    try:
+        resp = client.execute_mgmt(database, cmd)
+        rows = resp.primary_results[0].rows
+        if not rows:
+            print("No recent ingestion failures reported by Kusto "
+                  "(data is still flushing and will land asynchronously).",
+                  file=sys.stderr)
+            return 0
+        print("Recent Kusto ingestion failures:", file=sys.stderr)
+        for r in rows:
+            print(f"  {r[0]} {r[1]} [{r[2]}/{r[3]}] {r[4]} (op {r[5]})",
+                  file=sys.stderr)
+        return len(rows)
+    except Exception as exc:  # noqa: BLE001 - diagnostics best-effort
+        print(f"  (could not query ingestion failures: {exc})", file=sys.stderr)
+        return None
+
+
+def _verify(cluster, database, run_table, results_table, pipeline_ids,
+            expected_run, expected_results, timeout_s, interval_s):
+    """Poll the target tables until the expected rows appear.
+
+    Returns 0 on success, 1 when rows are provably missing after the timeout.
+    When verification queries cannot run at all (e.g. the ingestion principal
+    lacks query rights) this is best-effort: it warns and returns 0 so the step
+    is not failed on a permission gap, since the ingestion itself was queued.
+    """
+    if not pipeline_ids or (expected_run == 0 and expected_results == 0):
+        print("Nothing to verify (no rows were queued).")
+        return 0
+
+    from azure.kusto.data import KustoClient, KustoConnectionStringBuilder
+
+    client = KustoClient(
+        KustoConnectionStringBuilder.with_az_cli_authentication(_engine_uri(cluster)))
+
+    id_list = ", ".join(f'"{i}"' for i in sorted(pipeline_ids))
+    run_query = f"{run_table} | where PipelineRunId in ({id_list}) | count"
+    # PerfBenchmarkResult has no PipelineRunId column, but DerivedRunId embeds it
+    # as the trailing '|<PipelineRunId>' segment.
+    res_conds = " or ".join(f'DerivedRunId endswith "|{i}"' for i in sorted(pipeline_ids))
+    res_query = f"{results_table} | where {res_conds} | count"
+
+    print(f"Verifying ingestion for PipelineRunId in [{id_list}] "
+          f"(expecting {run_table}>={expected_run}, {results_table}>={expected_results}); "
+          f"timeout {timeout_s}s ...")
+
+    deadline = time.time() + timeout_s
+    query_ever_ok = False
+    last_exc = None
+    run_have = res_have = -1
+    while True:
+        try:
+            run_have = _scalar(client, database, run_query)
+            res_have = _scalar(client, database, res_query)
+            query_ever_ok = True
+        except Exception as exc:  # noqa: BLE001 - transient/permission, retried
+            last_exc = exc
+            print(f"  (verification query failed, will retry: {exc})")
+
+        if query_ever_ok:
+            print(f"  {run_table}={run_have}/{expected_run}, "
+                  f"{results_table}={res_have}/{expected_results}")
+            if run_have >= expected_run and res_have >= expected_results:
+                print("Verified: all expected rows are queryable in Kusto.")
+                return 0
+
+        if time.time() >= deadline:
+            break
+        time.sleep(interval_s)
+
+    if not query_ever_ok:
+        detail = str(last_exc) if last_exc is not None else "no further detail"
+        if _is_authorization_error(last_exc):
+            # Queued ingestion only needs the 'Database Ingestor' role; verification *queries* the
+            # data back and additionally needs 'Database Viewer'.  A principal with Ingestor-only
+            # rights ingests fine but cannot verify, so name the missing role instead of blaming the
+            # network.  The ingestion itself was queued, so this stays a warning (exit 0).
+            print("##vso[task.logissue type=warning]Kusto ingestion was queued, but the ingestion "
+                  "principal is not authorized to query the database, so ingestion could not be "
+                  "verified. Grant the service connection's service principal the 'Database Viewer' "
+                  "role on this database (in addition to 'Database Ingestor'). "
+                  f"Details: {detail}", file=sys.stderr)
+        else:
+            print("##vso[task.logissue type=warning]Could not verify Kusto ingestion "
+                  "(query endpoint unreachable or the verification query failed). Data was queued; "
+                  f"check the database manually. Details: {detail}", file=sys.stderr)
+        return 0
+
+    # The verification loop timed out with rows still missing. Queued ingestion is
+    # asynchronous: small perf payloads routinely take longer than the polling window
+    # to become queryable even though they ingest successfully (observed to land
+    # anywhere from ~30s to several minutes later). Only fail the step when Kusto
+    # actually reports ingestion failures; otherwise the data is still flushing and
+    # failing here would be a false negative.
+    failures = _dump_failures(client, database)
+    if failures:
+        print(f"##vso[task.logissue type=error]Kusto ingestion failed: "
+              f"{run_table}={run_have}/{expected_run}, "
+              f"{results_table}={res_have}/{expected_results} after {timeout_s}s; "
+              f"{failures} ingestion failure(s) reported (see above).",
+              file=sys.stderr)
+        return 1
+
+    print(f"##vso[task.logissue type=warning]Kusto ingestion not yet queryable after "
+          f"{timeout_s}s ({run_table}={run_have}/{expected_run}, "
+          f"{results_table}={res_have}/{expected_results}), but no ingestion failures were "
+          f"reported. Queued ingestion completes asynchronously, so the rows will land "
+          f"shortly; not failing the step.", file=sys.stderr)
+    return 0
+
+
+def main(argv=None):
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--cluster", required=True,
+                        help="Kusto cluster URI, e.g. https://<name>.<region>.kusto.windows.net")
+    parser.add_argument("--database", required=True)
+    parser.add_argument("--run-file", required=True,
+                        help="PerfRun NDJSON file(s), comma-separated.")
+    parser.add_argument("--results-file", required=True,
+                        help="PerfBenchmarkResult NDJSON file(s), comma-separated.")
+    parser.add_argument("--run-table", default="PerfRun")
+    parser.add_argument("--results-table", default="PerfBenchmarkResult")
+    parser.add_argument("--verify-timeout", type=int,
+                        default=int(os.environ.get("KUSTO_VERIFY_TIMEOUT", "600")),
+                        help="Seconds to wait for ingested rows to become queryable "
+                             "(0 disables verification).")
+    parser.add_argument("--verify-interval", type=int,
+                        default=int(os.environ.get("KUSTO_VERIFY_INTERVAL", "15")),
+                        help="Polling interval in seconds for verification.")
+    args = parser.parse_args(argv)
+
+    try:
+        import azure.kusto.ingest  # noqa: F401
+    except ImportError:
+        print("ERROR: azure-kusto-ingest is not installed. "
+              "Run 'pip install azure-kusto-data azure-kusto-ingest'.",
+              file=sys.stderr)
+        return 2
+
+    run_files = [f.strip() for f in args.run_file.split(",") if f.strip()]
+    results_files = [f.strip() for f in args.results_file.split(",") if f.strip()]
+
+    expected_run = sum(_count_rows(f) for f in run_files)
+    expected_results = sum(_count_rows(f) for f in results_files)
+    pipeline_ids = _pipeline_ids(run_files)
+
+    for data_file in run_files:
+        _ingest(args.cluster, args.database, args.run_table, data_file)
+    for data_file in results_files:
+        _ingest(args.cluster, args.database, args.results_table, data_file)
+
+    print("Ingestion requests submitted (queued).")
+
+    if args.verify_timeout <= 0:
+        print("Verification disabled (--verify-timeout <= 0).")
+        return 0
+
+    return _verify(args.cluster, args.database, args.run_table, args.results_table,
+                   pipeline_ids, expected_run, expected_results,
+                   args.verify_timeout, args.verify_interval)
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/eng/pipelines/perf/scripts/interleave_perf.py b/eng/pipelines/perf/scripts/interleave_perf.py
new file mode 100644
index 0000000000..167002fb8f
--- /dev/null
+++ b/eng/pipelines/perf/scripts/interleave_perf.py
@@ -0,0 +1,421 @@
+#!/usr/bin/env python3
+"""Interleaved, best-of-N benchmark orchestrator for the SqlClient perf pipeline.
+
+Implements the two structural noise-reduction controls from InternalDriverTools
+wiki 339 ("Reducing Noise in Performance Tests"):
+
+* **Interleaving (§2.2 / §2.3)** — instead of running the whole baseline suite and
+  then the whole candidate suite (so a given benchmark is measured tens of minutes
+  apart), this runs *one benchmark unit at a time*, executing the baseline build and
+  the candidate build back-to-back for that unit before moving on.  Any slow host
+  drift then affects both sides of each comparison roughly equally.
+
+* **Best-of-N confirmation (§2.6)** — a single measurement can flag a regression
+  purely from noise.  After the first interleaved pass, only the units that showed a
+  regression are re-run N-1 more times (still interleaved); a regression is
+  *confirmed* only when a strict majority of the N passes agree.  This is what makes
+  the ``--fail-on-regression`` gate trustworthy.
+
+The benchmark executable is the ``PerformanceTests`` app built two ways (same test
+sources, different Microsoft.Data.SqlClient reference).  It understands two env vars
+added for this orchestrator:
+
+* ``PERF_LIST_BENCHMARKS`` — print the enabled unit names and exit.
+* ``PERF_BENCHMARK=<Name>`` — run only that unit.
+
+Only the Python standard library is used so it runs on the perf VM unchanged.
+"""
+
+import argparse
+import glob
+import json
+import os
+import shutil
+import subprocess
+import sys
+
+
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+sys.path.insert(0, SCRIPT_DIR)
+import compare_perf  # noqa: E402  (local module, sits next to this script)
+
+
+# --------------------------------------------------------------------------------------------------
+# CPU affinity (client pinning, wiki §2.4) — best effort, cross platform.
+# --------------------------------------------------------------------------------------------------
+def parse_cpus(spec):
+    """Parse a CPU spec like "16-31" or "0,2,4" or "0-3,8" into a sorted int list.
+
+    CPU pinning is a best-effort optimisation, never a gate, so a malformed spec must not
+    fail the run: on any unparseable segment this warns and returns [] (i.e. no pinning)."""
+    if not spec:
+        return []
+    cpus = set()
+    try:
+        for part in spec.split(","):
+            part = part.strip()
+            if not part:
+                continue
+            if "-" in part:
+                lo, hi = part.split("-", 1)
+                cpus.update(range(int(lo), int(hi) + 1))
+            else:
+                cpus.add(int(part))
+    except ValueError:
+        print(f"WARNING: could not parse CPU spec {spec!r}; running without CPU pinning.",
+              file=sys.stderr)
+        return []
+    return sorted(cpus)
+
+
+def apply_affinity(proc, cpus):
+    """Pin *proc* to *cpus*.  Never raises — pinning is an optimisation, not a gate."""
+    if not cpus:
+        return
+    try:
+        if hasattr(os, "sched_setaffinity"):  # Linux
+            os.sched_setaffinity(proc.pid, set(cpus))
+            return
+        if os.name == "nt":  # Windows
+            import ctypes
+
+            # SetProcessAffinityMask takes a single-word mask that only addresses CPUs 0-63;
+            # higher indices require processor-group APIs.  Rather than set a mask that would
+            # silently pin to the wrong CPUs, skip pinning with a warning.
+            if any(c >= 64 for c in cpus):
+                print(f"WARNING: CPU index >= 64 in {cpus}; SetProcessAffinityMask cannot address "
+                      f"processor groups, so pid {proc.pid} runs without CPU pinning.",
+                      file=sys.stderr)
+                return
+            mask = 0
+            for c in cpus:
+                mask |= (1 << c)
+            handle = int(proc._handle)  # noqa: SLF001  (Popen exposes the OS handle here)
+            if ctypes.windll.kernel32.SetProcessAffinityMask(handle, ctypes.c_size_t(mask)) == 0:
+                print(f"WARNING: SetProcessAffinityMask failed for pid {proc.pid}.", file=sys.stderr)
+    except Exception as exc:  # noqa: BLE001
+        print(f"WARNING: could not pin pid {getattr(proc, 'pid', '?')} to CPUs {cpus}: {exc}",
+              file=sys.stderr)
+
+
+# --------------------------------------------------------------------------------------------------
+# Running one unit and collecting its artifacts.
+# --------------------------------------------------------------------------------------------------
+def run_unit_process(exe_dir, assembly, unit, cwd, cpus, log_path):
+    """Run one benchmark *unit* from the build at *exe_dir* in *cwd*.
+
+    Returns the subprocess return code.  Kept as a small seam so tests can substitute
+    a fake runner.
+    """
+    os.makedirs(cwd, exist_ok=True)
+    cmd = ["dotnet", os.path.join(exe_dir, assembly)]
+    env = dict(os.environ)
+    env["PERF_BENCHMARK"] = unit
+    env.pop("PERF_LIST_BENCHMARKS", None)
+
+    with open(log_path, "w", encoding="utf-8") as log:
+        proc = subprocess.Popen(cmd, cwd=cwd, env=env, stdout=log,
+                                stderr=subprocess.STDOUT)
+        apply_affinity(proc, cpus)
+        return proc.wait()
+
+
+def _report_files(root):
+    return sorted(glob.glob(os.path.join(root, "**", "*-report-full.json"), recursive=True))
+
+
+def collect_results(cwd, dest):
+    """Copy the BenchmarkDotNet reports produced under *cwd* into *dest*.
+
+    Returns the set of benchmark ``Type`` names found (used to map a unit to the
+    report rows it produced, so best-of-N can re-run the right unit for a flagged key).
+    """
+    os.makedirs(dest, exist_ok=True)
+    types = set()
+    artifacts = os.path.join(cwd, "BenchmarkDotNet.Artifacts")
+    for path in _report_files(artifacts):
+        shutil.copy2(path, os.path.join(dest, os.path.basename(path)))
+        try:
+            with open(path, "r", encoding="utf-8-sig") as fh:
+                for bench in json.load(fh).get("Benchmarks", []):
+                    if bench.get("Type"):
+                        types.add(bench["Type"])
+        except (OSError, ValueError):
+            pass
+    # Also keep the human-readable GitHub markdown reports alongside, best effort.
+    for md in glob.glob(os.path.join(artifacts, "**", "*-report-github.md"), recursive=True):
+        shutil.copy2(md, os.path.join(dest, os.path.basename(md)))
+    return types
+
+
+# --------------------------------------------------------------------------------------------------
+# Interleaved passes.
+# --------------------------------------------------------------------------------------------------
+class Runner:
+    """Holds the invariant run parameters and performs interleaved unit passes."""
+
+    def __init__(self, baseline_dir, current_dir, assembly, work_dir, cpus):
+        self.baseline_dir = baseline_dir
+        self.current_dir = current_dir
+        self.assembly = assembly
+        self.work_dir = work_dir
+        self.cpus = cpus
+
+    def list_units(self):
+        cmd = ["dotnet", os.path.join(self.current_dir, self.assembly)]
+        env = dict(os.environ)
+        env["PERF_LIST_BENCHMARKS"] = "1"
+        env.pop("PERF_BENCHMARK", None)
+        out = subprocess.check_output(cmd, cwd=self.work_dir, env=env, text=True)
+        return [line.strip() for line in out.splitlines() if line.strip()]
+
+    def _run_one(self, variant, exe_dir, unit, rep, agg_dir):
+        cwd = os.path.join(self.work_dir, f"rep{rep}", variant, unit)
+        if os.path.isdir(cwd):
+            shutil.rmtree(cwd)
+        os.makedirs(cwd, exist_ok=True)
+        log_path = os.path.join(cwd, "run.log")
+        rc = run_unit_process(exe_dir, self.assembly, unit, cwd, self.cpus, log_path)
+        if rc != 0:
+            _tail(log_path)
+            raise RuntimeError(f"benchmark unit '{unit}' ({variant}, rep {rep}) failed (exit {rc}).")
+        types = collect_results(cwd, agg_dir)
+        if not types:
+            _tail(log_path)
+            raise RuntimeError(
+                f"benchmark unit '{unit}' ({variant}, rep {rep}) produced no results "
+                f"(a broken benchmark must not be reported as a pass).")
+        return types
+
+    def interleave(self, units, rep, baseline_agg, current_agg):
+        """Run each unit baseline-then-candidate; aggregate reports per variant.
+
+        Returns a dict mapping unit name -> set of report Type names it produced.
+        """
+        unit_types = {}
+        for unit in units:
+            print(f"[rep {rep}] {unit}: baseline -> candidate", flush=True)
+            # Interleaved: measure baseline and candidate for this unit back-to-back.
+            self._run_one("baseline", self.baseline_dir, unit, rep, baseline_agg)
+            types = self._run_one("current", self.current_dir, unit, rep, current_agg)
+            unit_types[unit] = types
+        return unit_types
+
+
+def _tail(path, n=40):
+    try:
+        with open(path, "r", encoding="utf-8", errors="replace") as fh:
+            lines = fh.readlines()
+        sys.stderr.write("".join(lines[-n:]))
+    except OSError:
+        pass
+
+
+# --------------------------------------------------------------------------------------------------
+# Comparison + confirmation.
+# --------------------------------------------------------------------------------------------------
+def _regression_keys(baseline_dir, current_dir, threshold):
+    entries = compare_perf.build_comparison(baseline_dir, current_dir, threshold)
+    return entries, {e["key"] for e in entries if e["status"] == "regression"}
+
+
+def orchestrate(runner, units, results_dir, threshold, reps):
+    baseline_agg = os.path.join(results_dir, "baseline")
+    current_agg = os.path.join(results_dir, "current")
+    comparison_dir = os.path.join(results_dir, "comparison")
+    os.makedirs(comparison_dir, exist_ok=True)
+
+    # --- Pass 1: interleave every enabled unit -----------------------------------------------------
+    unit_types = runner.interleave(units, 1, baseline_agg, current_agg)
+    type_to_unit = {}
+    for unit, types in unit_types.items():
+        for t in types:
+            type_to_unit[t] = unit
+
+    entries, reg_keys_1 = _regression_keys(baseline_agg, current_agg, threshold)
+
+    # Which units contain a rep-1 regression?  Those are the best-of-N candidates.
+    candidate_units = []
+    for e in entries:
+        if e["status"] == "regression":
+            unit = type_to_unit.get(e["benchmarkName"])
+            if unit and unit not in candidate_units:
+                candidate_units.append(unit)
+
+    # Per-key regression tally across reps (rep 1 counts once).
+    reg_counts = {k: 1 for k in reg_keys_1}
+
+    # --- Passes 2..N: re-run only the candidate units, still interleaved ---------------------------
+    if reps > 1 and candidate_units:
+        print(f"Best-of-{reps}: confirming {len(candidate_units)} candidate unit(s): "
+              f"{', '.join(candidate_units)}", flush=True)
+        for rep in range(2, reps + 1):
+            b_dir = os.path.join(results_dir, "reps", f"rep{rep}", "baseline")
+            c_dir = os.path.join(results_dir, "reps", f"rep{rep}", "current")
+            runner.interleave(candidate_units, rep, b_dir, c_dir)
+            _, reg_keys_r = _regression_keys(b_dir, c_dir, threshold)
+            for k in reg_keys_1:
+                if k in reg_keys_r:
+                    reg_counts[k] = reg_counts.get(k, 0) + 1
+
+    # --- Confirmation verdict (strict majority of N) -----------------------------------------------
+    total_reps = reps
+    for e in entries:
+        key = e["key"]
+        if e["status"] == "regression":
+            count = reg_counts.get(key, 0)
+            confirmed = (count * 2) > total_reps
+            e["regressionReps"] = count
+            e["totalReps"] = total_reps
+            e["confirmedRegression"] = confirmed
+            if not confirmed:
+                e["status"] = "regression-unconfirmed"
+        else:
+            e["regressionReps"] = 0
+            e["totalReps"] = total_reps
+            e["confirmedRegression"] = False
+
+    confirmed = [e for e in entries if e.get("confirmedRegression")]
+    unconfirmed = [e for e in entries if e["status"] == "regression-unconfirmed"]
+    return entries, confirmed, unconfirmed
+
+
+# --------------------------------------------------------------------------------------------------
+# Rendering.
+# --------------------------------------------------------------------------------------------------
+_ICON = {
+    "regression": "🔴 regression",
+    "regression-unconfirmed": "🟠 regression (unconfirmed)",
+    "improvement": "🟢 improvement",
+    "unchanged": "⚪ unchanged",
+    "current-only": "🆕 new",
+    "baseline-only": "➖ removed",
+    "unknown": "❔",
+}
+
+
+def render_markdown(entries, confirmed, unconfirmed, baseline_version, threshold, reps):
+    improvements = [e for e in entries if e["status"] == "improvement"]
+    lines = []
+    lines.append("# SqlClient Performance Comparison (interleaved, best-of-N)")
+    lines.append("")
+    lines.append(f"Baseline: **{baseline_version}** &nbsp;|&nbsp; "
+                 f"Regression threshold: **{threshold:.0f}%** &nbsp;|&nbsp; "
+                 f"Confirmation runs: **N = {reps}**")
+    lines.append("")
+    lines.append(f"- Benchmarks compared: **{len(entries)}**")
+    lines.append(f"- **Confirmed** regressions (majority of {reps}): **{len(confirmed)}**")
+    lines.append(f"- Unconfirmed (flagged once, not reproduced): **{len(unconfirmed)}**")
+    lines.append(f"- Improvements (faster > {threshold:.0f}%): **{len(improvements)}**")
+    lines.append("")
+    lines.append("| Status | Benchmark | Method | Params | Baseline (ms) | "
+                 "Current (ms) | Mean Δ | Alloc Δ | Confirm |")
+    lines.append("| ------ | --------- | ------ | ------ | ------------- | "
+                 "------------ | ------ | ------- | ------- |")
+    for e in entries:
+        if e["totalReps"] > 1 and (e["confirmedRegression"] or e["status"] == "regression-unconfirmed"):
+            confirm = f"{e['regressionReps']}/{e['totalReps']}"
+        else:
+            confirm = "-"
+        lines.append(
+            "| {status} | {name} | {method} | {params} | {base} | {cur} | "
+            "{delta} | {alloc} | {confirm} |".format(
+                status=_ICON.get(e["status"], e["status"]),
+                name=e["benchmarkName"],
+                method=e["methodName"],
+                params=e["parameterSignature"] or "-",
+                base=compare_perf._fmt_ms(e["baselineMeanMs"]),
+                cur=compare_perf._fmt_ms(e["currentMeanMs"]),
+                delta=compare_perf._fmt_pct(e["meanDeltaPct"]),
+                alloc=compare_perf._fmt_pct(e["allocDeltaPct"]),
+                confirm=confirm,
+            )
+        )
+    lines.append("")
+    return "\n".join(lines)
+
+
+# --------------------------------------------------------------------------------------------------
+# Entry point.
+# --------------------------------------------------------------------------------------------------
+def main(argv=None):
+    parser = argparse.ArgumentParser(description=__doc__,
+                                     formatter_class=argparse.RawDescriptionHelpFormatter)
+    parser.add_argument("--baseline-exe-dir", required=True,
+                        help="Directory of the baseline (released package) build.")
+    parser.add_argument("--current-exe-dir", required=True,
+                        help="Directory of the candidate (from-source) build.")
+    parser.add_argument("--assembly", default="PerformanceTests.dll")
+    parser.add_argument("--results-dir", required=True)
+    parser.add_argument("--work-dir", default=None,
+                        help="Scratch directory for per-unit run dirs (default: <results>/../perf-interleave-work).")
+    parser.add_argument("--threshold", type=float, default=10.0)
+    parser.add_argument("--reps", type=int, default=3,
+                        help="Total interleaved passes for a flagged unit (best-of-N). 1 disables confirmation.")
+    parser.add_argument("--baseline-version", default="baseline")
+    parser.add_argument("--client-cpus", default=os.environ.get("PERF_CLIENT_CPUS", ""),
+                        help="CPU set to pin the benchmark client to, e.g. '16-31'.")
+    parser.add_argument("--fail-on-regression", action="store_true",
+                        help="Exit non-zero if any CONFIRMED regression is detected.")
+    args = parser.parse_args(argv)
+
+    if args.reps < 1:
+        parser.error("--reps must be >= 1")
+
+    results_dir = os.path.abspath(args.results_dir)
+    work_dir = os.path.abspath(args.work_dir) if args.work_dir \
+        else os.path.join(os.path.dirname(results_dir), "perf-interleave-work")
+    os.makedirs(work_dir, exist_ok=True)
+    os.makedirs(results_dir, exist_ok=True)
+
+    cpus = parse_cpus(args.client_cpus)
+    if cpus:
+        print(f"Pinning benchmark client to CPUs {args.client_cpus} ({len(cpus)} core(s)).")
+    else:
+        print("PERF_CLIENT_CPUS not set; running without CPU pinning.", file=sys.stderr)
+
+    runner = Runner(os.path.abspath(args.baseline_exe_dir),
+                    os.path.abspath(args.current_exe_dir),
+                    args.assembly, work_dir, cpus)
+
+    units = runner.list_units()
+    if not units:
+        print("ERROR: no enabled benchmark units were reported by the current build.", file=sys.stderr)
+        return 1
+    print(f"Enabled units ({len(units)}): {', '.join(units)}")
+
+    entries, confirmed, unconfirmed = orchestrate(
+        runner, units, results_dir, args.threshold, args.reps)
+
+    # Outputs.
+    comparison_dir = os.path.join(results_dir, "comparison")
+    md = render_markdown(entries, confirmed, unconfirmed, args.baseline_version, args.threshold, args.reps)
+    with open(os.path.join(comparison_dir, "comparison.md"), "w", encoding="utf-8") as fh:
+        fh.write(md + "\n")
+    with open(os.path.join(comparison_dir, "comparison.json"), "w", encoding="utf-8") as fh:
+        json.dump({
+            "baselineVersion": args.baseline_version,
+            "thresholdPct": args.threshold,
+            "confirmationRuns": args.reps,
+            "confirmedRegressions": len(confirmed),
+            "unconfirmedRegressions": len(unconfirmed),
+            "entries": entries,
+        }, fh, indent=2)
+    # Surface the comparison as the top-level run summary (collect-results attaches results/*.md).
+    shutil.copyfile(os.path.join(comparison_dir, "comparison.md"),
+                    os.path.join(results_dir, "summary.md"))
+
+    print(f"Interleaved comparison complete: {len(confirmed)} confirmed regression(s), "
+          f"{len(unconfirmed)} unconfirmed.")
+
+    if args.fail_on_regression and confirmed:
+        print("Confirmed regressions detected; failing as requested.", file=sys.stderr)
+        for e in confirmed:
+            print(f"  {e['key']}: {compare_perf._fmt_pct(e['meanDeltaPct'])} "
+                  f"({e['regressionReps']}/{e['totalReps']} reps)", file=sys.stderr)
+        return 1
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/eng/pipelines/perf/scripts/perf_to_kusto.py b/eng/pipelines/perf/scripts/perf_to_kusto.py
new file mode 100644
index 0000000000..c902d2cbdc
--- /dev/null
+++ b/eng/pipelines/perf/scripts/perf_to_kusto.py
@@ -0,0 +1,374 @@
+#!/usr/bin/env python3
+"""Translate BenchmarkDotNet "full" JSON reports into Kusto perf-results rows.
+
+Implements the mapping documented on the InternalDriverTools wiki, page 270
+("Performance Results Database Specification") and the SqlClient conversion
+subpage.  Produces two newline-delimited JSON (NDJSON) files ready for Kusto
+ingestion:
+
+  * PerfRun            - one row describing this run (baseline OR current).
+  * PerfBenchmarkResult - one row per benchmark method/parameter combination.
+
+All benchmark timings in BenchmarkDotNet are expressed in NANOSECONDS; the
+schema stores milliseconds, so every time value is divided by 1,000,000.
+
+Only the Python standard library is required.
+"""
+
+import argparse
+import datetime
+import glob
+import json
+import os
+import re
+import sys
+
+
+NS_PER_MS = 1_000_000.0
+
+
+def _utcnow_iso():
+    return datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%fZ")
+
+
+# Top-level runner-config keys that must never be captured into PerfRun.Config:
+#   * ConnectionString - contains server/credential details (secret; not a comparable knob).
+#   * Benchmarks       - per-runner tuning object, not a boolean feature flag.
+_CONFIG_EXCLUDED_KEYS = frozenset(("ConnectionString", "Benchmarks"))
+
+
+def _load_runner_config(path):
+    """Return the runner's boolean feature flags as a dict for the PerfRun.Config column.
+
+    The benchmark runner is driven by a .jsonc config (see PerformanceTests/runnerconfig.jsonc).
+    Only its top-level *boolean* flags describe the SqlClient behaviour a run exercised
+    (e.g. UseManagedSniOnWindows, UseOptimizedAsyncBehaviour), so those are the values worth
+    recording alongside the results.  ConnectionString and Benchmarks are excluded, and any
+    non-boolean top-level entry is ignored so the shape stays a flat {flag: bool} map.
+
+    Returns an empty dict (and warns) when the file is missing or unparseable, so a config
+    problem degrades to an empty Config rather than failing the whole translation.
+    """
+    if not path:
+        return {}
+    try:
+        with open(path, "r", encoding="utf-8-sig") as handle:
+            raw = handle.read()
+    except OSError as exc:
+        print(f"WARNING: could not read runner config {path}: {exc}", file=sys.stderr)
+        return {}
+    # Strip //-style line comments so the .jsonc content parses as plain JSON.  The config uses
+    # only whole-line comments, so a leading-whitespace match is sufficient and never touches a
+    # '//' embedded in a string value.
+    no_comments = re.sub(r"(?m)^\s*//.*$", "", raw)
+    try:
+        cfg = json.loads(no_comments)
+    except ValueError as exc:
+        print(f"WARNING: could not parse runner config {path}: {exc}", file=sys.stderr)
+        return {}
+    if not isinstance(cfg, dict):
+        print(f"WARNING: runner config {path} is not a JSON object; ignoring.", file=sys.stderr)
+        return {}
+    return {key: value for key, value in cfg.items()
+            if key not in _CONFIG_EXCLUDED_KEYS and isinstance(value, bool)}
+
+
+def _parse_config_overrides(pairs):
+    """Parse repeated ``--config-override NAME=VALUE`` items into a ``{flag: bool}`` dict.
+
+    The perf pipeline can set a handful of SqlClient behaviour flags (e.g. UseConnectionPoolV2)
+    at queue time. Those values are applied to the runner config the benchmarks actually run
+    against, but the checked-in ``runnerconfig.jsonc`` this script reads still holds the defaults,
+    so the queue-time values are threaded in here to keep ``PerfRun.Config`` faithful to the run.
+
+    Only boolean values are accepted (Config is a flat ``{flag: bool}`` map); a non-boolean value
+    is warned about and skipped so a typo never injects a non-bool. Later duplicates win."""
+    overrides = {}
+    for item in pairs or []:
+        name, sep, value = item.partition("=")
+        name = name.strip()
+        token = value.strip().lower()
+        if not sep or not name:
+            print(f"WARNING: ignoring --config-override '{item}' (expected NAME=VALUE).",
+                  file=sys.stderr)
+            continue
+        if token in ("true", "1", "yes"):
+            overrides[name] = True
+        elif token in ("false", "0", "no"):
+            overrides[name] = False
+        else:
+            print(f"WARNING: ignoring --config-override '{item}' "
+                  f"(value '{value}' is not a boolean).", file=sys.stderr)
+    return overrides
+
+
+def _normalize_os(value):
+    """Map an OS descriptor to the schema's canonical 'Windows' or 'Linux'."""
+    if not value:
+        return ""
+    v = value.strip().lower()
+    if "win" in v:
+        return "Windows"
+    if any(tok in v for tok in ("linux", "unix", "ubuntu", "debian", "centos", "alpine")):
+        return "Linux"
+    return value
+
+
+def _normalize_arch(value):
+    """Map a process-architecture descriptor to the schema's lowercase form (e.g. X64 -> x64)."""
+    if not value:
+        return ""
+    return value.strip().lower()
+
+
+def _normalize_run_type(value):
+    """Map the harness run mode to the schema's 'Sequential' or 'Interweaved'."""
+    if not value:
+        return ""
+    v = value.strip().lower()
+    if v.startswith("seq"):
+        return "Sequential"
+    if v.startswith("inter"):  # interleaved (harness) -> Interweaved (schema spelling)
+        return "Interweaved"
+    return value
+
+
+def _branch_category(branch_name):
+    """Map a git ref to one of the schema's BranchCategory buckets."""
+    if not branch_name:
+        return "other"
+    name = branch_name
+    for prefix in ("refs/heads/", "refs/"):
+        if name.startswith(prefix):
+            name = name[len(prefix):]
+            break
+    if name.startswith("pull/") or branch_name.startswith("refs/pull/"):
+        return "pull_request"
+    if name == "main" or name == "master":
+        return "main"
+    if name.startswith("release/"):
+        return "release"
+    if name.startswith("dev/"):
+        return "dev"
+    if name.startswith("feat/") or name.startswith("feature/"):
+        return "feature"
+    return "other"
+
+
+def _parse_parameters(parameters):
+    """Parse BenchmarkDotNet's 'Parameters' string into a structured bag.
+
+    Example input: "RowCount=1000, UseAsync=True"
+    """
+    bag = {}
+    if not parameters:
+        return bag
+    for part in parameters.split(","):
+        part = part.strip()
+        if not part or "=" not in part:
+            continue
+        key, _, value = part.partition("=")
+        bag[key.strip()] = value.strip()
+    return bag
+
+
+def _driver_specific_metrics(bench):
+    metrics = {}
+    memory = bench.get("Memory") or {}
+    for field in ("Gen0Collections", "Gen1Collections", "Gen2Collections",
+                  "TotalOperations", "BytesAllocatedPerOperation"):
+        if field in memory and memory[field] is not None:
+            metrics[field] = memory[field]
+    for metric in bench.get("Metrics", []) or []:
+        descriptor = metric.get("Descriptor") or {}
+        legend = descriptor.get("Legend") or descriptor.get("Id")
+        if legend is not None and metric.get("Value") is not None:
+            metrics[legend] = metric["Value"]
+    return metrics
+
+
+def _percentile(stats, name):
+    pct = stats.get("Percentiles") or {}
+    value = pct.get(name)
+    return (value / NS_PER_MS) if value is not None else None
+
+
+def translate(input_dir, ctx):
+    """Return (run_row, [result_rows]) for every full-report JSON in input_dir."""
+    derived_run_id = "{driver}|{commit}|{pipeline}".format(
+        driver=ctx["driver_name"],
+        commit=ctx["commit_hash"],
+        pipeline=ctx["pipeline_run_id"],
+    )
+    now = _utcnow_iso()
+
+    run_row = {
+        "DerivedRunId": derived_run_id,
+        "DriverName": ctx["driver_name"],
+        "MachineName": ctx["machine_name"],
+        "AgentName": ctx["agent_name"],
+        "OperatingSystem": _normalize_os(ctx.get("operating_system")),
+        "Architecture": _normalize_arch(ctx.get("architecture")),
+        "RunType": _normalize_run_type(ctx.get("run_type")),
+        "PipelineRunId": ctx["pipeline_run_id"],
+        "BuildUrl": ctx["build_url"],
+        "RunDate": ctx["run_date"] or now,
+        "BranchName": ctx["branch_name"],
+        "BranchCategory": _branch_category(ctx["branch_name"]),
+        "VersionString": ctx["version_string"],
+        "CommitHash": ctx["commit_hash"],
+        "CommitDate": ctx["commit_date"] or None,
+        "IsComparableBase": bool(ctx["is_comparable_base"]),
+        "Config": ctx.get("config") or {},
+        "IngestedAt": now,
+    }
+
+    result_rows = []
+    runtime_seen = None
+    platform_seen = None
+    os_seen = None
+
+    pattern = os.path.join(input_dir, "**", "*-report-full.json")
+    for path in sorted(glob.glob(pattern, recursive=True)):
+        try:
+            with open(path, "r", encoding="utf-8-sig") as handle:
+                data = json.load(handle)
+        except (OSError, ValueError) as exc:
+            print(f"WARNING: could not parse {path}: {exc}", file=sys.stderr)
+            continue
+
+        host = data.get("HostEnvironmentInfo") or {}
+        runtime = host.get("RuntimeVersion")
+        architecture = host.get("Architecture")
+        runtime_seen = runtime_seen or runtime
+        platform_seen = platform_seen or architecture
+        os_seen = os_seen or host.get("OsVersion")
+
+        for bench in data.get("Benchmarks", []):
+            stats = bench.get("Statistics") or {}
+            mean_ns = stats.get("Mean")
+            if mean_ns is None:
+                continue
+            mean_ms = mean_ns / NS_PER_MS
+
+            btype = bench.get("Type", "")
+            method = bench.get("Method", "")
+            params = bench.get("Parameters", "") or ""
+            memory = bench.get("Memory") or {}
+
+            benchmark_id = "{run}|{name}|{method}|{sig}".format(
+                run=derived_run_id, name=btype, method=method, sig=params)
+
+            result_rows.append({
+                "BenchmarkId": benchmark_id,
+                "DerivedRunId": derived_run_id,
+                "BenchmarkName": btype,
+                "MethodName": method,
+                "ParameterSignature": params,
+                "ParameterBag": _parse_parameters(params),
+                "JobName": (bench.get("Job") or bench.get("JobConfig") or ""),
+                "MeanMs": mean_ms,
+                "P50Ms": _percentile(stats, "P50"),
+                "P95Ms": _percentile(stats, "P95"),
+                "P99Ms": _percentile(stats, "P99"),
+                "ThroughputOpsPerSec": (1000.0 / mean_ms) if mean_ms else None,
+                "ErrorMs": (stats.get("StandardError") / NS_PER_MS)
+                           if stats.get("StandardError") is not None else None,
+                "StdDevMs": (stats.get("StandardDeviation") / NS_PER_MS)
+                            if stats.get("StandardDeviation") is not None else None,
+                "MemoryAllocatedBytes": memory.get("BytesAllocatedPerOperation"),
+                "Runtime": runtime,
+                "Platform": architecture,
+                "DriverSpecificMetrics": _driver_specific_metrics(bench),
+                "IngestedAt": now,
+            })
+
+    # Fill OperatingSystem / Architecture from the benchmark host environment when the pipeline did
+    # not supply explicit overrides, normalizing to the schema's canonical values.
+    if not run_row["OperatingSystem"]:
+        run_row["OperatingSystem"] = _normalize_os(os_seen)
+    if not run_row["Architecture"]:
+        run_row["Architecture"] = _normalize_arch(platform_seen)
+
+    return run_row, result_rows
+
+
+def _write_ndjson(path, rows):
+    os.makedirs(os.path.dirname(os.path.abspath(path)), exist_ok=True)
+    with open(path, "w", encoding="utf-8") as handle:
+        for row in rows:
+            handle.write(json.dumps(row, separators=(",", ":")) + "\n")
+
+
+def main(argv=None):
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--input-dir", required=True,
+                        help="Directory containing *-report-full.json for one pass.")
+    parser.add_argument("--out-run", required=True, help="PerfRun NDJSON output path.")
+    parser.add_argument("--out-results", required=True,
+                        help="PerfBenchmarkResult NDJSON output path.")
+    parser.add_argument("--driver-name", default="Microsoft.Data.SqlClient")
+    parser.add_argument("--machine-name", default="")
+    parser.add_argument("--agent-name", default="")
+    parser.add_argument("--operating-system", default="",
+                        help="OS the run executed on (Windows/Linux). "
+                             "Derived from the benchmark host env when omitted.")
+    parser.add_argument("--architecture", default="",
+                        help="Process architecture the run executed on (x64/x86). "
+                             "Derived from the benchmark host env when omitted.")
+    parser.add_argument("--run-type", default="",
+                        help="Benchmark execution ordering (Sequential/Interweaved).")
+    parser.add_argument("--pipeline-run-id", required=True)
+    parser.add_argument("--build-url", default="")
+    parser.add_argument("--run-date", default="")
+    parser.add_argument("--branch-name", default="")
+    parser.add_argument("--version-string", default="")
+    parser.add_argument("--commit-hash", required=True)
+    parser.add_argument("--commit-date", default="")
+    parser.add_argument("--is-comparable-base", default="false")
+    parser.add_argument("--runner-config", default="",
+                        help="Path to the benchmark runner's .jsonc config. Its top-level boolean "
+                             "flags (excluding ConnectionString and Benchmarks) are recorded in "
+                             "PerfRun.Config.")
+    parser.add_argument("--config-override", action="append", default=[],
+                        metavar="NAME=BOOL",
+                        help="Override or add a PerfRun.Config boolean flag (repeatable). Values "
+                             "supplied here win over those read from --runner-config, so the pipeline "
+                             "records the flags it actually set (e.g. UseConnectionPoolV2=true) "
+                             "regardless of the checked-in runnerconfig.jsonc defaults.")
+    args = parser.parse_args(argv)
+
+    config = _load_runner_config(args.runner_config)
+    config.update(_parse_config_overrides(args.config_override))
+
+    ctx = {
+        "driver_name": args.driver_name,
+        "machine_name": args.machine_name,
+        "agent_name": args.agent_name,
+        "operating_system": args.operating_system,
+        "architecture": args.architecture,
+        "run_type": args.run_type,
+        "pipeline_run_id": args.pipeline_run_id,
+        "build_url": args.build_url,
+        "run_date": args.run_date,
+        "branch_name": args.branch_name,
+        "version_string": args.version_string,
+        "commit_hash": args.commit_hash,
+        "commit_date": args.commit_date,
+        "is_comparable_base": str(args.is_comparable_base).lower() in ("1", "true", "yes"),
+        "config": config,
+    }
+
+    run_row, result_rows = translate(args.input_dir, ctx)
+    _write_ndjson(args.out_run, [run_row])
+    _write_ndjson(args.out_results, result_rows)
+
+    print(f"Wrote 1 PerfRun row -> {args.out_run}")
+    print(f"Wrote {len(result_rows)} PerfBenchmarkResult row(s) -> {args.out_results}")
+    if not result_rows:
+        print("WARNING: no benchmark results were translated.", file=sys.stderr)
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/eng/pipelines/perf/scripts/run-perf-tests.ps1 b/eng/pipelines/perf/scripts/run-perf-tests.ps1
new file mode 100644
index 0000000000..9c13e45353
--- /dev/null
+++ b/eng/pipelines/perf/scripts/run-perf-tests.ps1
@@ -0,0 +1,577 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+#
+# run-perf-tests.ps1
+#
+# Entry point executed ON the Perf Test Lab Windows VM by the InternalDriverTools/PerfTest extends
+# template (v1/Perf.Test.Job.yml).  The template SCPs the driver source tree to the VM, runs this
+# script over SSH, then SCPs the results sub-directory back and publishes it as a pipeline artifact.
+#
+# This is the Windows counterpart of run-perf-tests.sh.  See that file for the full description of
+# responsibilities.  On Windows the benchmark client is pinned to the reserved CPU set via the
+# process ProcessorAffinity mask (derived from PERF_CLIENT_CPUS) instead of taskset.
+#
+# Environment variables injected by the template (see wiki "Performance Test Automation"):
+#   SQL_SERVER         Host/IP of the SQL Server on the perf VM (e.g. localhost).
+#   SQL_PASSWORD       SQL Server 'sa' password.
+#   PERF_CLIENT_CPUS   Core range reserved for the test client, e.g. "16-31".
+#   PERF_SQL_CPUS      Core range SQL Server is pinned to, e.g. "0-15" (informational).
+#
+[CmdletBinding()]
+param(
+    [string]$Configuration = "Release",
+    [string]$Framework = "net9.0",
+    [string]$ResultsSubdir = "perf-results",
+    [string]$BaselineVersion = "",
+    [string]$RegressionThreshold = "10",
+    # When set, a candidate-slower-than-baseline regression fails the run (wiki 339 §3 gate).
+    # Off by default so deltas are reported without blocking until the gate is trusted.
+    [switch]$FailOnRegression,
+    # Benchmark run model (wiki 339 §2.2/§2.3/§2.6):
+    #   interleaved -> run one unit at a time, baseline and candidate back-to-back, with best-of-N
+    #                  confirmation of flagged regressions (the noise-resistant default).
+    #   sequential  -> legacy: run the whole baseline suite, then the whole candidate suite, compare.
+    [ValidateSet("interleaved", "sequential")]
+    [string]$RunMode = "interleaved",
+    # Best-of-N: total interleaved passes for a flagged unit before a regression is confirmed.
+    [ValidateRange(1, [int]::MaxValue)]
+    [int]$ConfirmationRuns = 3,
+    # Optional SqlClient behaviour flags (true/false, or empty to leave the checked-in
+    # runnerconfig.jsonc default untouched).  Written into the runner config the benchmarks run
+    # against and, via the pipeline's Kusto translation, recorded in PerfRun.Config.
+    [ValidateSet("", "true", "false")]
+    [string]$UseManagedSniOnWindows = "",
+    [ValidateSet("", "true", "false")]
+    [string]$UseOptimizedAsyncBehaviour = "",
+    [ValidateSet("", "true", "false")]
+    [string]$UseConnectionPoolV2 = ""
+)
+
+$ErrorActionPreference = "Stop"
+Set-StrictMode -Version Latest
+
+####################################################################################################
+# Native-command error handling
+#
+# The perf VM runs Windows PowerShell 5.1.  There, with $ErrorActionPreference = 'Stop', ANY write
+# to stderr by a native command (dotnet, python) is promoted to a TERMINATING error - even when the
+# command's exit code is 0.  The .NET CLI and Python routinely emit non-fatal diagnostics (SDK
+# resolution notes, restore/build warnings, progress) to stderr, so an unguarded 'dotnet ...' or
+# 'python3 ...' aborts the whole run and surfaces the tool's stderr text as the failure.
+#
+# PowerShell 7.3+ exposes $PSNativeCommandUseErrorActionPreference to opt out; set it where present.
+# On 5.1 there is no such switch, so native tools are invoked through Invoke-Native, which relaxes
+# the preference for the duration of the call and judges success solely by the process exit code.
+####################################################################################################
+
+if (Test-Path Variable:\PSNativeCommandUseErrorActionPreference) {
+    $PSNativeCommandUseErrorActionPreference = $false
+}
+
+# Run a native command (in a scriptblock) with stderr-as-terminating-error suppressed, then throw
+# $FailureMessage if it exited non-zero.  Use for native calls whose non-zero exit must fail the run.
+function Invoke-Native {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory, Position = 0)][scriptblock] $Command,
+        [Parameter(Position = 1)][string] $FailureMessage = "Native command failed"
+    )
+    $previousPreference = $ErrorActionPreference
+    $ErrorActionPreference = 'Continue'
+    try {
+        & $Command
+    } finally {
+        $ErrorActionPreference = $previousPreference
+    }
+    if ($LASTEXITCODE -ne 0) {
+        throw "$FailureMessage (exit $LASTEXITCODE)."
+    }
+}
+
+####################################################################################################
+# Resolve paths
+####################################################################################################
+
+# This script lives at <repo>/eng/pipelines/perf/scripts/run-perf-tests.ps1, so the repo root is
+# four levels up.
+$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+$RepoRoot = (Resolve-Path (Join-Path $ScriptDir "..\..\..\..")).Path
+$PerfProject = Join-Path $RepoRoot "src\Microsoft.Data.SqlClient\tests\PerformanceTests\Microsoft.Data.SqlClient.PerformanceTests.csproj"
+$PerfDir = Split-Path -Parent $PerfProject
+$ResultsDir = Join-Path $RepoRoot $ResultsSubdir
+
+$SqlServer = if ($env:SQL_SERVER) { $env:SQL_SERVER } else { "localhost" }
+$SqlPassword = $env:SQL_PASSWORD
+$DbName = "sqlclient-perf-db"
+
+Write-Host "=================================================================="
+Write-Host " SqlClient Performance Tests"
+Write-Host "=================================================================="
+Write-Host "  Repo root       : $RepoRoot"
+Write-Host "  Perf project    : $PerfProject"
+Write-Host "  Configuration   : $Configuration"
+Write-Host "  Framework       : $Framework"
+Write-Host "  Results dir     : $ResultsDir"
+Write-Host "  Run mode        : $RunMode (confirmation runs: $ConfirmationRuns)"
+Write-Host "  Baseline ver    : $(if ($BaselineVersion) { $BaselineVersion } else { '<none, current-only>' })"
+Write-Host "  SQL_SERVER      : $SqlServer"
+Write-Host "  PERF_CLIENT_CPUS: $($env:PERF_CLIENT_CPUS)"
+Write-Host "  PERF_SQL_CPUS   : $($env:PERF_SQL_CPUS)"
+Write-Host "=================================================================="
+
+if (-not (Test-Path $PerfProject)) {
+    throw "Performance test project not found at $PerfProject"
+}
+if ([string]::IsNullOrEmpty($SqlPassword)) {
+    throw "SQL_PASSWORD environment variable is not set (expected from the perf template)."
+}
+
+New-Item -ItemType Directory -Force -Path $ResultsDir | Out-Null
+
+# Record VM-side run metadata (e.g. the perf VM hostname) for the agent-side Kusto translation.
+"MACHINE_NAME=$env:COMPUTERNAME" | Set-Content -Path (Join-Path $ResultsDir "runinfo.env") -Encoding ASCII
+
+$env:DOTNET_NOLOGO = "1"
+$env:DOTNET_CLI_TELEMETRY_OPTOUT = "1"
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = "1"
+
+####################################################################################################
+# 1. Install the .NET SDK (pinned by global.json) and the runtimes for the target frameworks.
+####################################################################################################
+
+function Install-DotNet {
+    $globalJson = Get-Content (Join-Path $RepoRoot "global.json") -Raw
+    # Strip // comments so ConvertFrom-Json accepts the file.
+    $globalJson = ($globalJson -split "`n" | ForEach-Object { $_ -replace '//.*$', '' }) -join "`n"
+    $sdkVersion = (ConvertFrom-Json $globalJson).sdk.version
+    if ([string]::IsNullOrEmpty($sdkVersion)) {
+        throw "Could not determine SDK version from global.json"
+    }
+
+    $dotnetRoot = Join-Path $env:USERPROFILE ".dotnet"
+    $env:DOTNET_ROOT = $dotnetRoot
+    $env:PATH = "$dotnetRoot;$dotnetRoot\tools;$env:PATH"
+
+    Write-Host "Installing .NET SDK $sdkVersion into $dotnetRoot ..."
+    $installScript = Join-Path $env:TEMP "dotnet-install.ps1"
+    Invoke-WebRequest -UseBasicParsing "https://dot.net/v1/dotnet-install.ps1" -OutFile $installScript
+
+    & $installScript -Version $sdkVersion -InstallDir $dotnetRoot
+    foreach ($channel in @("8.0", "9.0", "10.0")) {
+        & $installScript -Channel $channel -Runtime dotnet -InstallDir $dotnetRoot
+    }
+}
+
+$hasNet10Sdk = $false
+if (Get-Command dotnet -ErrorAction SilentlyContinue) {
+    # 'dotnet --version' evaluated from the repo root honours global.json (including rollForward), so
+    # it succeeds only when the pinned SDK is actually installed.  A bare '10.0.*' match would accept
+    # the wrong SDK band and skip installing the pinned one.
+    Push-Location $RepoRoot
+    try {
+        # Relax Stop here: a missing/mismatched pinned SDK makes 'dotnet --version' write to stderr
+        # and exit non-zero, which under Stop would abort before we can fall through to Install-DotNet.
+        $previousPreference = $ErrorActionPreference
+        $ErrorActionPreference = 'Continue'
+        try {
+            dotnet --version *> $null
+            if ($LASTEXITCODE -eq 0) { $hasNet10Sdk = $true }
+        } finally {
+            $ErrorActionPreference = $previousPreference
+        }
+    } finally {
+        Pop-Location
+    }
+}
+if ($hasNet10Sdk) {
+    Write-Host "Using pre-installed dotnet: $((Get-Command dotnet).Source)"
+} else {
+    Install-DotNet
+}
+
+# Informational only: never let 'dotnet --info' (or its stderr) fail the run.
+try { Invoke-Native { dotnet --info } "dotnet --info failed" } catch { Write-Warning $_.Exception.Message }
+
+####################################################################################################
+# 2. Create the perf database on the VM's SQL Server.
+#
+# The benchmark runners create their own tables but not the database, so create it here
+# (idempotently) using sqlcmd.  sqlcmd is required on the VM; if it is not present the script fails
+# fast (throws below) rather than continuing on to run benchmarks against a missing database.
+####################################################################################################
+
+Write-Host "Ensuring database [$DbName] exists on $SqlServer ..."
+
+$sqlcmd = Get-Command sqlcmd -ErrorAction SilentlyContinue
+if ($sqlcmd) {
+    # Relax Stop around the native sqlcmd call so a benign stderr write cannot abort the run before
+    # the explicit exit-code check below (Windows PowerShell 5.1 promotes native stderr under Stop).
+    $previousPreference = $ErrorActionPreference
+    $ErrorActionPreference = 'Continue'
+    try {
+        & $sqlcmd.Source -S $SqlServer -U sa -P $SqlPassword -C -b -l 30 `
+            -Q "IF DB_ID('$DbName') IS NULL CREATE DATABASE [$DbName];"
+    } finally {
+        $ErrorActionPreference = $previousPreference
+    }
+    if ($LASTEXITCODE -ne 0) { throw "sqlcmd failed to create database [$DbName] (exit $LASTEXITCODE)." }
+    Write-Host "Database [$DbName] is ready."
+} else {
+    throw "sqlcmd was not found on the VM; cannot create the perf database [$DbName]."
+}
+
+####################################################################################################
+# Noise-reduction controls (InternalDriverTools wiki 339, "Reducing Noise in Performance Tests").
+#
+# The Perf Test Lab already provides the isolated dedicated host, the tuned SQL instance and the
+# disjoint client CPU set (PERF_CLIENT_CPUS, pinned per pass below).  These are the remaining
+# harness-owned controls: per-run diagnostics, a fail-loud preflight and a warm-up, so a run's
+# mean/variance is steadier and a broken run cannot masquerade as a pass.  (The glibc allocator and
+# sysctl tuning from the Linux harness are Linux-only and intentionally omitted here.)
+####################################################################################################
+
+$DiagDir = Join-Path $ResultsDir "diagnostics"
+New-Item -ItemType Directory -Force -Path $DiagDir | Out-Null
+
+# --- §2.11 Capture host CPU topology (static, once per run) ---------------------------------------
+try {
+    Get-CimInstance Win32_Processor |
+        Select-Object Name, NumberOfCores, NumberOfLogicalProcessors, MaxClockSpeed, CurrentClockSpeed |
+        Format-List | Out-File -FilePath (Join-Path $DiagDir "cpu-info.txt") -Encoding UTF8
+} catch { Write-Warning "Could not capture CPU info: $_" }
+
+# --- §2.11 Capture the SQL instance configuration (confirm the lab tuning actually took effect) ---
+try {
+    & $sqlcmd.Source -S $SqlServer -U sa -P $SqlPassword -C -b -l 30 -h -1 -W `
+        -Q "SET NOCOUNT ON;
+            SELECT name, value_in_use FROM sys.configurations
+              WHERE name IN ('max degree of parallelism','cost threshold for parallelism',
+                             'max server memory (MB)','min server memory (MB)','affinity mask',
+                             'affinity I/O mask');
+            SELECT 'tempdb_data_files' AS setting, COUNT(*) AS value FROM tempdb.sys.database_files WHERE type = 0;
+            SELECT @@VERSION;" `
+        *> (Join-Path $DiagDir "sql-config.txt")
+    Write-Host "Captured SQL instance config -> $(Join-Path $DiagDir 'sql-config.txt')"
+} catch { Write-Warning "Could not capture SQL instance config: $_" }
+
+# --- §2.10 / §2.5 Fail loud on an unreachable server, and warm the buffer pool / plan cache -------
+# A benchmark suite that "skips" when the server is down produces an empty comparison that reads
+# green; verify connectivity up front and touch the target DB before the first measured benchmark.
+$previousPreference = $ErrorActionPreference
+$ErrorActionPreference = 'Continue'
+try {
+    & $sqlcmd.Source -S $SqlServer -U sa -P $SqlPassword -C -b -l 15 `
+        -Q "SET NOCOUNT ON; USE [$DbName]; SELECT 1;" *> $null
+} finally {
+    $ErrorActionPreference = $previousPreference
+}
+if ($LASTEXITCODE -ne 0) {
+    throw "SQL Server $SqlServer (db $DbName) is unreachable; refusing to run so an empty perf comparison cannot be reported as a pass."
+}
+Write-Host "Preflight: SQL Server $SqlServer (db $DbName) is reachable and warmed."
+
+####################################################################################################
+# 3. Inject the VM's SQL Server connection string into the benchmark runner config.
+####################################################################################################
+
+$RunnerConfig = Join-Path $RepoRoot "perf-runnerconfig.json"
+$env:RUNNER_CONFIG = $RunnerConfig
+
+# The perf app also loads datatypes.json via the DATATYPES_CONFIG env var, falling back to
+# "datatypes.json" in the working directory.  Each pass runs from an otherwise-empty
+# perf-run-<label> dir, so without this the app throws FileNotFoundException for datatypes.json.
+# It needs no per-run modification, so point the env var at the checked-in file directly.
+$env:DATATYPES_CONFIG = Join-Path $PerfDir "datatypes.json"
+
+$srcConfig = Join-Path $PerfDir "runnerconfig.jsonc"
+$rawConfig = Get-Content $srcConfig -Raw
+# Strip // line comments so ConvertFrom-Json accepts the .jsonc content.
+$rawConfig = ($rawConfig -split "`n" | ForEach-Object { $_ -replace '(?m)^\s*//.*$', '' }) -join "`n"
+$cfg = ConvertFrom-Json $rawConfig
+
+# SqlClient connection-string values may be wrapped in double quotes; doubling any embedded double
+# quote lets a password containing ';', '=', spaces or single quotes be parsed as a single literal
+# value instead of corrupting the connection string.
+$escapedPassword = '"' + ($SqlPassword -replace '"', '""') + '"'
+$cfg.ConnectionString = "Server=tcp:$SqlServer,1433;User ID=sa;Password=$escapedPassword;Initial Catalog=$DbName;TrustServerCertificate=True;Encrypt=False;"
+# Apply the optional SqlClient behaviour overrides supplied by the pipeline.  An empty value leaves
+# the checked-in default untouched; otherwise the flag is forced to the requested boolean so the
+# benchmarks run with (and PerfRun.Config records) exactly the requested behaviour.
+function Set-CfgBool {
+    param($Config, [string]$Name, [string]$Value)
+    if (-not [string]::IsNullOrEmpty($Value)) {
+        $b = [System.Boolean]::Parse($Value)
+        if ($Config.PSObject.Properties.Name -contains $Name) { $Config.$Name = $b }
+        else { $Config | Add-Member -NotePropertyName $Name -NotePropertyValue $b }
+    }
+}
+Set-CfgBool $cfg "UseManagedSniOnWindows" $UseManagedSniOnWindows
+Set-CfgBool $cfg "UseOptimizedAsyncBehaviour" $UseOptimizedAsyncBehaviour
+Set-CfgBool $cfg "UseConnectionPoolV2" $UseConnectionPoolV2
+$cfg | ConvertTo-Json -Depth 10 | Set-Content -Path $RunnerConfig -Encoding UTF8
+Write-Host "Wrote runner config to $RunnerConfig (Server=tcp:$SqlServer,1433; Initial Catalog=$DbName)"
+
+####################################################################################################
+# 4 & 5. Run the benchmarks, pinned to the reserved client CPU set.
+#
+# Two passes are executed so the pipeline can compare the branch under test against a released
+# baseline:
+#   * baseline  -> Microsoft.Data.SqlClient restored from NuGet.org at $BaselineVersion
+#                  (ReferenceType=Package + CPM VersionOverride).  Skipped when no baseline is given.
+#   * current   -> Microsoft.Data.SqlClient built from the source tree in this repo (ProjectReference).
+#
+# Each pass runs from its own directory; its BenchmarkDotNet artifacts are collected into
+# results\<label>\.
+####################################################################################################
+
+# NuGet.config on the VM exposes only the governed feed; the baseline package (and its public deps)
+# live on NuGet.org.  Central Package Management rejects multiple unmapped sources (NU1507), so the
+# baseline restore uses a dedicated single-source config pointing only at NuGet.org.
+$BaselineNuGetConfig = Join-Path $RepoRoot "perf-baseline-nuget.config"
+function Write-BaselineNuGetConfig {
+    @'
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>
+'@ | Set-Content -Path $BaselineNuGetConfig -Encoding UTF8
+}
+
+# Convert a CPU range like "16-31" (or a comma list "16,17,18") into an affinity bitmask.
+function Get-AffinityMask([string]$cpuSpec) {
+    if ([string]::IsNullOrEmpty($cpuSpec)) { return $null }
+    # Expand the spec ("16-31", "0,2,4", "0-3,8", ...) into individual CPU indices.
+    $cpus = New-Object System.Collections.Generic.List[int]
+    foreach ($part in $cpuSpec.Split(",")) {
+        if ($part -match '^\s*(\d+)\s*-\s*(\d+)\s*$') {
+            for ($c = [int]$Matches[1]; $c -le [int]$Matches[2]; $c++) { $cpus.Add($c) }
+        } elseif ($part -match '^\s*(\d+)\s*$') {
+            $cpus.Add([int]$Matches[1])
+        }
+    }
+    if ($cpus.Count -eq 0) { return $null }
+    # A single-word ProcessorAffinity mask only addresses CPUs 0-63; higher indices require
+    # processor-group APIs, so skip pinning rather than build a mask that silently targets the
+    # wrong CPUs.
+    if (($cpus | Where-Object { $_ -ge 64 }).Count -gt 0) {
+        Write-Warning "PERF_CLIENT_CPUS contains a CPU index >= 64; ProcessorAffinity cannot address processor groups, so running without CPU pinning."
+        return $null
+    }
+    [long]$mask = 0
+    foreach ($c in $cpus) { $mask = $mask -bor ([long]1 -shl $c) }
+    return $mask
+}
+
+# Save-CpuTelemetry <label> <before|after>
+# §2.11 telemetry snapshot: per-core current clock speed around each measured pass, so a
+# drifting/throttling result can be explained after the fact.  Best-effort; never fails the run.
+function Save-CpuTelemetry([string]$Label, [string]$When) {
+    try {
+        $stamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
+        $speeds = Get-CimInstance Win32_Processor |
+            Select-Object DeviceID, CurrentClockSpeed, MaxClockSpeed | Format-Table -AutoSize | Out-String
+        "$stamp`n$speeds" | Out-File -FilePath (Join-Path $DiagDir "cpu-$Label-$When.txt") -Encoding UTF8
+    } catch { }
+}
+
+# Get-BenchmarkResultCount <dir>
+# Counts the BenchmarkDotNet results recorded under <dir> (the "Benchmarks" array of every
+# *-report-full.json).  Used to fail loud when a pass produced nothing.
+function Get-BenchmarkResultCount([string]$Root) {
+    $py = @'
+import glob, json, os, sys
+root = sys.argv[1]
+total = 0
+for f in glob.glob(os.path.join(root, "**", "*-report-full.json"), recursive=True):
+    try:
+        with open(f, encoding="utf-8-sig") as fh:
+            total += len(json.load(fh).get("Benchmarks", []))
+    except Exception:
+        pass
+print(total)
+'@
+    # Relax Stop: this native python call tolerates failure (returns 0 below); its stderr must not
+    # promote to a terminating error under Windows PowerShell 5.1.
+    $previousPreference = $ErrorActionPreference
+    $ErrorActionPreference = 'Continue'
+    try {
+        $out = $py | python3 - $Root
+    } finally {
+        $ErrorActionPreference = $previousPreference
+    }
+    if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($out)) { return 0 }
+    return [int]($out.Trim())
+}
+
+# Runs one benchmark pass (build + run pinned to PERF_CLIENT_CPUS) and collects its artifacts into
+# results\<label>. $ExtraArgs are appended to both the build and run invocations.
+function Invoke-PerfPass([string]$Label, [string[]]$ExtraArgs) {
+    $runDir = Join-Path $RepoRoot "perf-run-$Label"
+    if (Test-Path $runDir) { Remove-Item -Recurse -Force $runDir }
+    New-Item -ItemType Directory -Force -Path $runDir | Out-Null
+
+    Write-Host "------------------------------------------------------------------"
+    Write-Host " Pass: $Label"
+    Write-Host "   Extra args: $($ExtraArgs -join ' ')"
+    Write-Host "------------------------------------------------------------------"
+
+    Write-Host "Building performance tests ($Configuration, $Framework) for '$Label' ..."
+    Invoke-Native { dotnet build $PerfProject -c $Configuration -f $Framework --nologo -v minimal @ExtraArgs } "Build failed for '$Label'"
+
+    Push-Location $runDir
+    try {
+        $runArgs = @("run", "--project", $PerfProject, "-c", $Configuration, "-f", $Framework, "--no-build") + $ExtraArgs
+        Write-Host "Starting benchmarks ($Label): dotnet $($runArgs -join ' ')"
+        $psi = New-Object System.Diagnostics.ProcessStartInfo
+        $psi.FileName = "dotnet"
+        # Windows PowerShell 5.1 / .NET Framework has no ProcessStartInfo.ArgumentList, so build a
+        # quoted argument string for .Arguments (quoting any arg that contains whitespace).
+        $psi.Arguments = ($runArgs | ForEach-Object {
+            if ($_ -match '\s') { '"' + $_ + '"' } else { $_ }
+        }) -join ' '
+        $psi.UseShellExecute = $false
+        $psi.WorkingDirectory = $runDir
+
+        $proc = [System.Diagnostics.Process]::Start($psi)
+
+        $mask = Get-AffinityMask $env:PERF_CLIENT_CPUS
+        # Use a non-zero check, not '-gt 0': a mask that pins CPU 63 sets the [long] sign bit and
+        # is therefore negative, yet is still a valid ProcessorAffinity value.
+        if ($null -ne $mask -and $mask -ne 0) {
+            try {
+                $proc.ProcessorAffinity = [System.IntPtr]$mask
+                Write-Host "Pinned benchmark client (PID $($proc.Id)) to CPUs $($env:PERF_CLIENT_CPUS) (mask 0x$($mask.ToString('X')))."
+            } catch {
+                Write-Warning "Failed to set ProcessorAffinity: $_"
+            }
+        } else {
+            Write-Warning "PERF_CLIENT_CPUS unset; running without CPU pinning."
+        }
+
+        Save-CpuTelemetry $Label "before"
+        $proc.WaitForExit()
+        Save-CpuTelemetry $Label "after"
+        if ($proc.ExitCode -ne 0) { throw "Benchmark run '$Label' failed (exit $($proc.ExitCode))." }
+    } finally {
+        Pop-Location
+    }
+
+    $artifactsDir = Join-Path $runDir "BenchmarkDotNet.Artifacts"
+    $dest = Join-Path $ResultsDir $Label
+    New-Item -ItemType Directory -Force -Path $dest | Out-Null
+    if (Test-Path $artifactsDir) {
+        Write-Host "Collecting '$Label' BenchmarkDotNet artifacts into $dest ..."
+        Copy-Item -Recurse -Force $artifactsDir (Join-Path $dest "BenchmarkDotNet.Artifacts")
+        $reportsDir = Join-Path $artifactsDir "results"
+        if (Test-Path $reportsDir) {
+            Copy-Item -Recurse -Force (Join-Path $reportsDir "*") $dest
+        }
+    } else {
+        Write-Warning "No BenchmarkDotNet.Artifacts directory was produced for '$Label' at $artifactsDir."
+    }
+
+    # §2.10 Fail loud: a pass that produced zero benchmark results (server dropped, all benches
+    # errored, exporter disabled) must not flow through to an empty comparison that reads green.
+    $nresults = Get-BenchmarkResultCount $dest
+    Write-Host "Pass '$Label' produced $nresults benchmark result(s)."
+    if ($nresults -eq 0) {
+        throw "Pass '$Label' produced no benchmark results; failing the run (a broken benchmark pass must not be reported as a pass)."
+    }
+}
+
+# Build-Variant <label> <extra build args...>
+# Builds the PerformanceTests app once into perf-build-<label> so the interleaved orchestrator can
+# invoke it repeatedly without rebuilding.  Distinct output dirs are mandatory (both variants share
+# the project's default bin path).
+function Build-Variant {
+    param([string]$Label, [string[]]$ExtraArgs = @())
+    $outDir = Join-Path $RepoRoot "perf-build-$Label"
+    if (Test-Path $outDir) { Remove-Item -Recurse -Force $outDir }
+    New-Item -ItemType Directory -Force -Path $outDir | Out-Null
+    Write-Host "Building '$Label' variant ($Configuration, $Framework) into $outDir ..."
+    $buildArgs = @("build", $PerfProject, "-c", $Configuration, "-f", $Framework, "--nologo", "-v", "minimal", "-o", $outDir) + $ExtraArgs
+    # Route the build output to the host/transcript (Out-Host) so it is visible AND does not land on
+    # this function's success stream: '$dir = Build-Variant ...' otherwise captures the entire build
+    # log into the return value, hiding build errors and corrupting the returned exe-dir path.
+    Invoke-Native { dotnet @buildArgs } "Build failed for '$Label' variant" | Out-Host
+    return $outDir
+}
+
+if ((-not [string]::IsNullOrEmpty($BaselineVersion)) -and ($RunMode -eq "interleaved")) {
+    ####################################################################################################
+    # Interleaved + best-of-N (wiki 339 §2.2/§2.3/§2.6).  Build both variants once, then let the
+    # orchestrator run one unit at a time (baseline then candidate) and confirm any flagged
+    # regression across N passes before it counts toward the gate.
+    ####################################################################################################
+    Write-BaselineNuGetConfig
+    $baselineExeDir = Build-Variant "baseline" @(
+        "-p:ReferenceType=Package",
+        "-p:MdsPackageVersion=$BaselineVersion",
+        "-p:RestoreConfigFile=$BaselineNuGetConfig"
+    )
+    $currentExeDir = Build-Variant "current" @()
+
+    $interleaveArgs = @(
+        "--baseline-exe-dir", $baselineExeDir,
+        "--current-exe-dir", $currentExeDir,
+        "--assembly", "PerformanceTests.dll",
+        "--results-dir", $ResultsDir,
+        "--threshold", $RegressionThreshold,
+        "--reps", $ConfirmationRuns,
+        "--baseline-version", $BaselineVersion,
+        "--client-cpus", "$($env:PERF_CLIENT_CPUS)"
+    )
+    if ($FailOnRegression) {
+        Write-Host "Regression gate ENABLED: a CONFIRMED candidate-slower regression (> $RegressionThreshold%) will fail the run."
+        $interleaveArgs += "--fail-on-regression"
+    }
+    Write-Host "Running interleaved benchmarks (best-of-$ConfirmationRuns) ..."
+    Invoke-Native { python3 (Join-Path $ScriptDir "interleave_perf.py") @interleaveArgs } "Interleaved run failed"
+
+} elseif (-not [string]::IsNullOrEmpty($BaselineVersion)) {
+    # --- Legacy sequential path: full baseline pass, then full candidate pass, then compare -------
+    Write-BaselineNuGetConfig
+    Invoke-PerfPass "baseline" @(
+        "-p:ReferenceType=Package",
+        "-p:MdsPackageVersion=$BaselineVersion",
+        "-p:RestoreConfigFile=$BaselineNuGetConfig"
+    )
+    Invoke-PerfPass "current" @()
+
+    Write-Host "Comparing current branch against baseline $BaselineVersion ..."
+    $comparisonDir = Join-Path $ResultsDir "comparison"
+    New-Item -ItemType Directory -Force -Path $comparisonDir | Out-Null
+    $compareArgs = @(
+        "--baseline-dir", (Join-Path $ResultsDir "baseline"),
+        "--current-dir", (Join-Path $ResultsDir "current"),
+        "--baseline-version", $BaselineVersion,
+        "--threshold", $RegressionThreshold,
+        "--out-md", (Join-Path $comparisonDir "comparison.md"),
+        "--out-json", (Join-Path $comparisonDir "comparison.json")
+    )
+    # §3 gate: only a candidate-slower regression fails, and only when explicitly enabled.
+    if ($FailOnRegression) {
+        Write-Host "Regression gate ENABLED: a candidate-slower regression (> $RegressionThreshold%) will fail the run."
+        $compareArgs += "--fail-on-regression"
+    }
+    Invoke-Native { python3 (Join-Path $ScriptDir "compare_perf.py") @compareArgs } "Comparison failed"
+    # Surface the comparison as the top-level run summary (collect-results.yml attaches results\*.md).
+    Copy-Item -Force (Join-Path $comparisonDir "comparison.md") (Join-Path $ResultsDir "summary.md")
+
+} else {
+    # --- No baseline: current-only run (no comparison) --------------------------------------------
+    Write-Host "No -BaselineVersion supplied; running current only (no comparison)."
+    Invoke-PerfPass "current" @()
+}
+
+Write-Host "Collected results:"
+Get-ChildItem -Recurse -File $ResultsDir | ForEach-Object { $_.FullName } | Sort-Object
+
+Write-Host "=================================================================="
+Write-Host " Performance run complete."
+Write-Host "=================================================================="
diff --git a/eng/pipelines/perf/scripts/run-perf-tests.sh b/eng/pipelines/perf/scripts/run-perf-tests.sh
new file mode 100755
index 0000000000..1fa0423f4e
--- /dev/null
+++ b/eng/pipelines/perf/scripts/run-perf-tests.sh
@@ -0,0 +1,593 @@
+#!/usr/bin/env bash
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+#
+# run-perf-tests.sh
+#
+# Entry point executed ON the Perf Test Lab Linux VM by the InternalDriverTools/PerfTest extends
+# template (v1/Perf.Test.Job.yml).  The template SCPs the driver source tree to the VM, runs this
+# script over SSH, then SCPs the results sub-directory back and publishes it as a pipeline artifact.
+#
+# Responsibilities:
+#   1. Install the .NET SDK pinned by the repo's global.json (plus the runtime for the target TFM).
+#   2. Create the perf database on the VM's SQL Server (the benchmark runners create tables but not
+#      the database).
+#   3. Inject the VM's SQL Server connection string into the benchmark runner config.
+#   4. Pin the benchmark client to the reserved CPU set (PERF_CLIENT_CPUS) so it does not contend
+#      with SQL Server (which is pinned to the disjoint PERF_SQL_CPUS set).
+#   5. Run the BenchmarkDotNet performance tests.
+#   6. Collect the BenchmarkDotNet artifacts into the results sub-directory.
+#
+# Environment variables injected by the template (see wiki "Performance Test Automation"):
+#   SQL_SERVER         Host/IP of the SQL Server on the perf VM (e.g. localhost).
+#   SQL_PASSWORD       SQL Server 'sa' password.
+#   PERF_CLIENT_CPUS   Core range reserved for the test client, e.g. "16-31".
+#   PERF_SQL_CPUS      Core range SQL Server is pinned to, e.g. "0-15" (informational).
+#
+set -euo pipefail
+
+####################################################################################################
+# Argument parsing
+####################################################################################################
+
+configuration="Release"
+framework="net9.0"
+resultsSubDir="perf-results"
+baselineVersion=""
+regressionThreshold="10"
+# When true, a candidate-slower-than-baseline regression fails the run (wiki 339 §3 gate).
+# Default off so the pipeline reports deltas without blocking until the gate is trusted.
+failOnRegression="false"
+# Benchmark run model (wiki 339 §2.2/§2.3/§2.6):
+#   interleaved -> run one unit at a time, baseline and candidate back-to-back, with best-of-N
+#                  confirmation of flagged regressions (the noise-resistant default).
+#   sequential  -> legacy: run the whole baseline suite, then the whole candidate suite, then compare.
+runMode="interleaved"
+# Best-of-N: total interleaved passes for a flagged unit before a regression is confirmed (1 disables).
+confirmationRuns="3"
+# Optional SqlClient behaviour flags (true/false).  Empty means "leave the checked-in runnerconfig
+# default untouched".  These are written into the runner config the benchmarks run against AND, via
+# the pipeline's Kusto translation (--config-override), recorded in PerfRun.Config so a run's
+# settings are queryable/filterable in the dashboard.
+useManagedSniOnWindows=""
+useOptimizedAsyncBehaviour=""
+useConnectionPoolV2=""
+
+usage() {
+    echo "Usage: $0 [--configuration <cfg>] [--framework <tfm>] [--results-subdir <dir>]" \
+         "[--baseline-version <ver>] [--regression-threshold <pct>] [--fail-on-regression]" \
+         "[--run-mode interleaved|sequential] [--confirmation-runs <N>]" \
+         "[--use-managed-sni-on-windows true|false] [--use-optimized-async-behaviour true|false]" \
+         "[--use-connection-pool-v2 true|false]" >&2
+}
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --configuration) configuration="$2"; shift 2 ;;
+        --framework)     framework="$2";     shift 2 ;;
+        --results-subdir) resultsSubDir="$2"; shift 2 ;;
+        --baseline-version) baselineVersion="$2"; shift 2 ;;
+        --regression-threshold) regressionThreshold="$2"; shift 2 ;;
+        --fail-on-regression) failOnRegression="true"; shift 1 ;;
+        --run-mode) runMode="$2"; shift 2 ;;
+        --confirmation-runs) confirmationRuns="$2"; shift 2 ;;
+        --use-managed-sni-on-windows) useManagedSniOnWindows="$2"; shift 2 ;;
+        --use-optimized-async-behaviour) useOptimizedAsyncBehaviour="$2"; shift 2 ;;
+        --use-connection-pool-v2) useConnectionPoolV2="$2"; shift 2 ;;
+        -h|--help)       usage; exit 0 ;;
+        *) echo "Unknown argument: $1" >&2; usage; exit 2 ;;
+    esac
+done
+
+# Validate queue-time inputs up front so a typo fails fast with a clear message instead of silently
+# falling back to a different code path (e.g. '--run-mode interleave' would otherwise run sequentially)
+# or erroring out obscurely much later.
+case "${runMode}" in
+    interleaved|sequential) ;;
+    *) echo "ERROR: --run-mode must be 'interleaved' or 'sequential' (got '${runMode}')." >&2
+       usage; exit 2 ;;
+esac
+if ! [[ "${confirmationRuns}" =~ ^[0-9]+$ ]] || [[ "${confirmationRuns}" -lt 1 ]]; then
+    echo "ERROR: --confirmation-runs must be a positive integer (got '${confirmationRuns}')." >&2
+    usage; exit 2
+fi
+# Each behaviour flag must be empty (leave as-is) or a lowercase boolean.
+validate_bool() {  # $1 = flag name (for the message), $2 = value
+    case "$2" in
+        ""|true|false) ;;
+        *) echo "ERROR: --$1 must be 'true' or 'false' (got '$2')." >&2; usage; exit 2 ;;
+    esac
+}
+validate_bool use-managed-sni-on-windows "${useManagedSniOnWindows}"
+validate_bool use-optimized-async-behaviour "${useOptimizedAsyncBehaviour}"
+validate_bool use-connection-pool-v2 "${useConnectionPoolV2}"
+
+####################################################################################################
+# Resolve paths
+####################################################################################################
+
+# This script lives at <repo>/eng/pipelines/perf/scripts/run-perf-tests.sh, so the repo root is four
+# levels up.  Deriving it from the script location keeps us independent of the working directory the
+# template runs us from.
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+REPO_ROOT="$(cd -- "${SCRIPT_DIR}/../../../.." >/dev/null 2>&1 && pwd)"
+
+PERF_PROJECT="${REPO_ROOT}/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj"
+PERF_DIR="$(dirname -- "${PERF_PROJECT}")"
+RESULTS_DIR="${REPO_ROOT}/${resultsSubDir}"
+
+echo "=================================================================="
+echo " SqlClient Performance Tests"
+echo "=================================================================="
+echo "  Repo root      : ${REPO_ROOT}"
+echo "  Perf project   : ${PERF_PROJECT}"
+echo "  Configuration  : ${configuration}"
+echo "  Framework      : ${framework}"
+echo "  Results dir    : ${RESULTS_DIR}"
+echo "  Baseline ver   : ${baselineVersion:-<none, current-only>}"
+echo "  Run mode       : ${runMode} (confirmation runs: ${confirmationRuns})"
+echo "  SQL_SERVER     : ${SQL_SERVER:-<unset, will default to localhost>}"
+echo "  PERF_CLIENT_CPUS: ${PERF_CLIENT_CPUS:-<unset>}"
+echo "  PERF_SQL_CPUS  : ${PERF_SQL_CPUS:-<unset>}"
+echo "=================================================================="
+
+if [[ ! -f "${PERF_PROJECT}" ]]; then
+    echo "ERROR: Performance test project not found at ${PERF_PROJECT}" >&2
+    exit 1
+fi
+
+# Export the (possibly defaulted) server so the inline Python config-rewrite below, which reads
+# os.environ["SQL_SERVER"], sees it even when the template didn't inject SQL_SERVER.
+export SQL_SERVER="${SQL_SERVER:-localhost}"
+if [[ -z "${SQL_PASSWORD:-}" ]]; then
+    echo "ERROR: SQL_PASSWORD environment variable is not set (expected from the perf template)." >&2
+    exit 1
+fi
+
+mkdir -p "${RESULTS_DIR}"
+
+# Record VM-side run metadata (e.g. the perf VM hostname) for the agent-side Kusto translation.
+{
+    echo "MACHINE_NAME=$(hostname)"
+} > "${RESULTS_DIR}/runinfo.env"
+
+export DOTNET_NOLOGO=1
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+
+####################################################################################################
+# 1. Install the .NET SDK (pinned by global.json) and the runtime for the target framework.
+####################################################################################################
+
+install_dotnet() {
+    local sdkVersion
+    # Extract the SDK version from global.json (strip // comments, then read "version").
+    sdkVersion="$(sed 's://.*::' "${REPO_ROOT}/global.json" \
+        | tr -d '\r' \
+        | grep -oE '"version"[[:space:]]*:[[:space:]]*"[^"]+"' \
+        | head -n1 \
+        | sed -E 's/.*"version"[[:space:]]*:[[:space:]]*"([^"]+)".*/\1/')"
+
+    if [[ -z "${sdkVersion}" ]]; then
+        echo "ERROR: Could not determine SDK version from ${REPO_ROOT}/global.json" >&2
+        exit 1
+    fi
+
+    export DOTNET_ROOT="${HOME}/.dotnet"
+    export PATH="${DOTNET_ROOT}:${DOTNET_ROOT}/tools:${PATH}"
+
+    echo "Installing .NET SDK ${sdkVersion} into ${DOTNET_ROOT} ..."
+    local installScript
+    installScript="$(mktemp)"
+    curl -fsSL https://dot.net/v1/dotnet-install.sh -o "${installScript}"
+    chmod +x "${installScript}"
+
+    # SDK pinned by global.json (used to build MDS + the perf project).
+    "${installScript}" --version "${sdkVersion}" --install-dir "${DOTNET_ROOT}" --no-path
+
+    # Shared runtimes for the frameworks the benchmarks may run against.  Installing all three keeps
+    # the script robust regardless of the --framework selected by the pipeline.
+    local channel
+    for channel in 8.0 9.0 10.0; do
+        "${installScript}" --channel "${channel}" --runtime dotnet --install-dir "${DOTNET_ROOT}" --no-path
+    done
+
+    rm -f "${installScript}"
+}
+
+# Reuse a pre-installed SDK only if it already satisfies global.json; otherwise install locally.
+# 'dotnet --version' evaluated from the repo root honours global.json (including its rollForward
+# policy), so it succeeds only when the pinned SDK is actually available -- a hard-coded '10.0.*'
+# match would accept the wrong SDK band and skip installing the pinned one.
+if command -v dotnet >/dev/null 2>&1 && ( cd "${REPO_ROOT}" && dotnet --version >/dev/null 2>&1 ); then
+    dotnetPath="$(command -v dotnet)"
+    # 'dotnet' on PATH is frequently a symlink (e.g. /usr/bin/dotnet -> /usr/share/dotnet/dotnet);
+    # resolve it so DOTNET_ROOT points at the real install root, not the symlink's directory.
+    resolvedDotnet="$(readlink -f "${dotnetPath}" 2>/dev/null || echo "${dotnetPath}")"
+    export DOTNET_ROOT="$(dirname -- "${resolvedDotnet}")"
+    export PATH="${DOTNET_ROOT}:${DOTNET_ROOT}/tools:${PATH}"
+    echo "Using pre-installed dotnet: ${dotnetPath} (DOTNET_ROOT=${DOTNET_ROOT})"
+else
+    install_dotnet
+fi
+
+dotnet --info
+
+####################################################################################################
+# 2. Create the perf database on the VM's SQL Server.
+#
+# The benchmark runners connect to Initial Catalog=sqlclient-perf-db and create their own tables,
+# but they do NOT create the database itself, so we create it here (idempotently).
+####################################################################################################
+
+# Exported so the inline Python config-rewrite below (which reads os.environ["DB_NAME"]) sees the
+# same database name instead of silently falling back to its own default.
+export DB_NAME="sqlclient-perf-db"
+
+find_sqlcmd() {
+    if command -v sqlcmd >/dev/null 2>&1; then
+        command -v sqlcmd
+        return 0
+    fi
+    # mssql-tools default install locations.
+    local candidate
+    for candidate in /opt/mssql-tools18/bin/sqlcmd /opt/mssql-tools/bin/sqlcmd; do
+        if [[ -x "${candidate}" ]]; then
+            echo "${candidate}"
+            return 0
+        fi
+    done
+    return 1
+}
+
+echo "Ensuring database [${DB_NAME}] exists on ${SQL_SERVER} ..."
+if SQLCMD="$(find_sqlcmd)"; then
+    # -C trusts the server certificate (mssql-tools18 requires encryption by default).
+    "${SQLCMD}" -S "${SQL_SERVER}" -U sa -P "${SQL_PASSWORD}" -C -b -l 30 \
+        -Q "IF DB_ID('${DB_NAME}') IS NULL CREATE DATABASE [${DB_NAME}];"
+    echo "Database [${DB_NAME}] is ready."
+else
+    echo "ERROR: sqlcmd was not found on the VM; cannot create the perf database [${DB_NAME}]." >&2
+    echo "       Looked for 'sqlcmd' on PATH and in /opt/mssql-tools18/bin and /opt/mssql-tools/bin." >&2
+    exit 1
+fi
+
+####################################################################################################
+# Noise-reduction controls (InternalDriverTools wiki 339, "Reducing Noise in Performance Tests").
+#
+# The Perf Test Lab already provides the isolated dedicated host, the tuned SQL instance and the
+# disjoint client CPU set (PERF_CLIENT_CPUS, pinned per pass below).  These are the remaining
+# harness-owned controls: allocator/network tuning, per-run diagnostics, a fail-loud preflight and
+# a warm-up, so a run's mean/variance is steadier and a broken run cannot masquerade as a pass.
+####################################################################################################
+
+DIAG_DIR="${RESULTS_DIR}/diagnostics"
+mkdir -p "${DIAG_DIR}"
+
+# --- §2.8 Allocator tuning (exported so the 'dotnet run' children inherit it) ---------------------
+# Large-buffer benches (AsyncLargeDataRead, SqlBulkCopy) re-mmap a big buffer every iteration under
+# glibc malloc; keep those allocations on the heap and stop trimming freed pages so they are reused,
+# which removes a major source of per-iteration variance.
+export MALLOC_MMAP_THRESHOLD_="${MALLOC_MMAP_THRESHOLD_:-134217728}"   # 128 MiB
+export MALLOC_TRIM_THRESHOLD_="${MALLOC_TRIM_THRESHOLD_:--1}"          # never trim
+
+# --- §2.9 Network tuning (best-effort; needs privilege, so it must never fail the run) ------------
+# Connection-churn benches (ConnectionPoolStress, ParallelAsyncConnection) exhaust ephemeral ports;
+# widen the range and allow TIME_WAIT reuse so socket setup latency stays stable.  'sudo -n' keeps
+# this non-interactive: on a VM without passwordless sudo it fails immediately instead of blocking
+# on a password prompt, then we fall back to a non-sudo sysctl (and finally give up quietly).
+if command -v sysctl >/dev/null 2>&1; then
+    for kv in "net.ipv4.ip_local_port_range=1024 65535" "net.ipv4.tcp_tw_reuse=1"; do
+        sudo -n sysctl -w "${kv}" >/dev/null 2>&1 || sysctl -w "${kv}" >/dev/null 2>&1 || true
+    done
+fi
+
+# --- §2.11 Capture host CPU topology (static, once per run) ---------------------------------------
+{ command -v lscpu >/dev/null 2>&1 && lscpu; } > "${DIAG_DIR}/cpu-info.txt" 2>&1 || true
+
+# --- §2.11 Capture the SQL instance configuration (confirm the lab tuning actually took effect) ---
+"${SQLCMD}" -S "${SQL_SERVER}" -U sa -P "${SQL_PASSWORD}" -C -b -l 30 -h -1 -W \
+    -Q "SET NOCOUNT ON;
+        SELECT name, value_in_use FROM sys.configurations
+          WHERE name IN ('max degree of parallelism','cost threshold for parallelism',
+                         'max server memory (MB)','min server memory (MB)','affinity mask',
+                         'affinity I/O mask');
+        SELECT 'tempdb_data_files' AS setting, COUNT(*) AS value FROM tempdb.sys.database_files WHERE type = 0;
+        SELECT @@VERSION;" \
+    > "${DIAG_DIR}/sql-config.txt" 2>&1 \
+    && echo "Captured SQL instance config -> ${DIAG_DIR}/sql-config.txt" \
+    || echo "WARNING: could not capture SQL instance config (continuing)." >&2
+
+# --- §2.10 / §2.5 Fail loud on an unreachable server, and warm the buffer pool / plan cache -------
+# A benchmark suite that "skips" when the server is down produces an empty comparison that reads
+# green; verify connectivity up front and touch the target DB so the first measured benchmark is not
+# paying cold-cache costs.
+if ! "${SQLCMD}" -S "${SQL_SERVER}" -U sa -P "${SQL_PASSWORD}" -C -b -l 15 \
+        -Q "SET NOCOUNT ON; USE [${DB_NAME}]; SELECT 1;" >/dev/null 2>&1; then
+    echo "ERROR: SQL Server ${SQL_SERVER} (db ${DB_NAME}) is unreachable; refusing to run so an empty perf comparison cannot be reported as a pass." >&2
+    exit 1
+fi
+echo "Preflight: SQL Server ${SQL_SERVER} (db ${DB_NAME}) is reachable and warmed."
+
+####################################################################################################
+# 3. Inject the VM's SQL Server connection string into the benchmark runner config.
+#
+# The perf app reads its config from the file named by RUNNER_CONFIG (falling back to
+# runnerconfig.jsonc in the working directory).  We copy the checked-in config and replace only the
+# ConnectionString value so all benchmark tuning (iterations, row counts, enabled flags) is
+# preserved.  python3 is used to JSON-escape the (potentially special-character) password safely.
+####################################################################################################
+
+RUNNER_CONFIG="${REPO_ROOT}/perf-runnerconfig.json"
+export RUNNER_CONFIG
+
+# The perf app also loads datatypes.json via the DATATYPES_CONFIG env var, falling back to
+# "datatypes.json" in the working directory.  Each pass runs from an otherwise-empty
+# perf-run-<label> dir, so without this the app throws FileNotFoundException for datatypes.json.
+# It needs no per-run modification, so point the env var at the checked-in file directly.
+DATATYPES_CONFIG="${PERF_DIR}/datatypes.json"
+export DATATYPES_CONFIG
+
+# Optional SqlClient behaviour flag overrides applied to the runner config (empty = leave as-is).
+# Exported so the JSON-patching python below can read them (its heredoc is single-quoted, so it does
+# not expand shell variables directly).
+export PERF_CFG_USE_MANAGED_SNI="${useManagedSniOnWindows}"
+export PERF_CFG_USE_OPTIMIZED_ASYNC="${useOptimizedAsyncBehaviour}"
+export PERF_CFG_USE_CONNECTION_POOL_V2="${useConnectionPoolV2}"
+
+python3 - "$PERF_DIR/runnerconfig.jsonc" "$RUNNER_CONFIG" <<'PY'
+import json, os, re, sys
+
+src, dst = sys.argv[1], sys.argv[2]
+
+with open(src, "r", encoding="utf-8-sig") as fh:
+    text = fh.read()
+
+# Strip // line comments so the .jsonc content parses as JSON.  The checked-in config has no "//"
+# inside string values, so a simple line-comment strip is safe here.
+text = re.sub(r'(?m)^\s*//.*$', '', text)
+cfg = json.loads(text)
+
+server = os.environ["SQL_SERVER"]
+password = os.environ["SQL_PASSWORD"]
+db = os.environ.get("DB_NAME", "sqlclient-perf-db")
+
+# SqlClient connection-string values may be wrapped in double quotes; doubling any embedded double
+# quote lets a password containing ';', '=', spaces or single quotes be parsed as a single literal
+# value instead of corrupting the connection string.
+password_value = '"' + password.replace('"', '""') + '"'
+
+cfg["ConnectionString"] = (
+    f"Server=tcp:{server},1433;User ID=sa;Password={password_value};"
+    f"Initial Catalog={db};TrustServerCertificate=True;Encrypt=False;"
+)
+
+# Apply the optional SqlClient behaviour overrides supplied by the pipeline.  An empty value leaves
+# the checked-in default untouched; otherwise the flag is forced to the requested boolean so the
+# benchmarks run with (and PerfRun.Config records) exactly the requested behaviour.
+for env_name, cfg_key in (
+    ("PERF_CFG_USE_MANAGED_SNI", "UseManagedSniOnWindows"),
+    ("PERF_CFG_USE_OPTIMIZED_ASYNC", "UseOptimizedAsyncBehaviour"),
+    ("PERF_CFG_USE_CONNECTION_POOL_V2", "UseConnectionPoolV2"),
+):
+    val = os.environ.get(env_name, "")
+    if val != "":
+        cfg[cfg_key] = (val.lower() == "true")
+
+with open(dst, "w", encoding="utf-8") as fh:
+    json.dump(cfg, fh, indent=2)
+
+print(f"Wrote runner config to {dst} (Server=tcp:{server},1433; Initial Catalog={db})")
+PY
+
+####################################################################################################
+# 4 & 5. Run the benchmarks, pinned to the reserved client CPU set.
+#
+# Two passes are executed so the pipeline can compare the branch under test against a released
+# baseline:
+#   * baseline  -> Microsoft.Data.SqlClient restored from NuGet.org at ${baselineVersion}
+#                  (ReferenceType=Package + CPM VersionOverride).  Skipped when no baseline is given.
+#   * current   -> Microsoft.Data.SqlClient built from the source tree in this repo (ProjectReference).
+#
+# BenchmarkDotNet writes its artifacts to ./BenchmarkDotNet.Artifacts relative to the working
+# directory, so each pass runs from its own directory and its artifacts are collected into
+# results/<label>/.
+####################################################################################################
+
+# NuGet.config on the VM exposes only the governed feed; the baseline package (and its public deps)
+# live on NuGet.org.  Central Package Management rejects multiple unmapped sources (NU1507), so the
+# baseline restore uses a dedicated single-source config pointing only at NuGet.org.
+BASELINE_NUGET_CONFIG="${REPO_ROOT}/perf-baseline-nuget.config"
+write_baseline_nuget_config() {
+    cat > "${BASELINE_NUGET_CONFIG}" <<'XML'
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>
+XML
+}
+
+# capture_cpu_telemetry <label> <before|after>
+# §2.11 telemetry snapshot: per-core frequency and thermal state around each measured pass, so a
+# drifting/throttling result can be explained after the fact.  Best-effort; never fails the run.
+capture_cpu_telemetry() {
+    local label="$1" when="$2"
+    {
+        date -u +"%Y-%m-%dT%H:%M:%SZ"
+        grep -E "^cpu MHz" /proc/cpuinfo 2>/dev/null || true
+        for z in /sys/class/thermal/thermal_zone*/temp; do
+            [[ -r "${z}" ]] && echo "thermal ${z}=$(cat "${z}" 2>/dev/null)"
+        done
+    } > "${DIAG_DIR}/cpu-${label}-${when}.txt" 2>&1 || true
+}
+
+# count_benchmark_results <dir>
+# Counts the BenchmarkDotNet results recorded under <dir> (the "Benchmarks" array of every
+# *-report-full.json).  Used to fail loud when a pass produced nothing.
+count_benchmark_results() {
+    python3 - "$1" <<'PY'
+import glob, json, os, sys
+root = sys.argv[1]
+total = 0
+for f in glob.glob(os.path.join(root, "**", "*-report-full.json"), recursive=True):
+    try:
+        with open(f, encoding="utf-8-sig") as fh:
+            total += len(json.load(fh).get("Benchmarks", []))
+    except Exception:
+        pass
+print(total)
+PY
+}
+
+# run_pass <label> <extra dotnet build/run args...>
+# Builds and runs one benchmark pass, pinned to PERF_CLIENT_CPUS, collecting artifacts into
+# ${RESULTS_DIR}/<label>.
+run_pass() {
+    local label="$1"; shift
+    local extra_args=("$@")
+
+    local run_dir="${REPO_ROOT}/perf-run-${label}"
+    rm -rf "${run_dir}"
+    mkdir -p "${run_dir}"
+
+    echo "------------------------------------------------------------------"
+    echo " Pass: ${label}"
+    echo "   Extra args: ${extra_args[*]:-<none>}"
+    echo "------------------------------------------------------------------"
+
+    echo "Building performance tests (${configuration}, ${framework}) for '${label}' ..."
+    dotnet build "${PERF_PROJECT}" -c "${configuration}" -f "${framework}" --nologo -v minimal \
+        "${extra_args[@]}"
+
+    local run_cmd=(dotnet run --project "${PERF_PROJECT}" -c "${configuration}" -f "${framework}" \
+        --no-build "${extra_args[@]}")
+
+    if [[ -n "${PERF_CLIENT_CPUS:-}" ]] && command -v taskset >/dev/null 2>&1; then
+        echo "Pinning benchmark client to CPUs ${PERF_CLIENT_CPUS} via taskset."
+        run_cmd=(taskset -c "${PERF_CLIENT_CPUS}" "${run_cmd[@]}")
+    else
+        echo "WARNING: PERF_CLIENT_CPUS unset or taskset unavailable; running without CPU pinning." >&2
+    fi
+
+    echo "Running (${label}): ${run_cmd[*]}"
+    capture_cpu_telemetry "${label}" "before"
+    (
+        cd "${run_dir}"
+        "${run_cmd[@]}"
+    )
+    capture_cpu_telemetry "${label}" "after"
+
+    local artifacts_dir="${run_dir}/BenchmarkDotNet.Artifacts"
+    local dest="${RESULTS_DIR}/${label}"
+    mkdir -p "${dest}"
+    if [[ -d "${artifacts_dir}" ]]; then
+        echo "Collecting '${label}' BenchmarkDotNet artifacts into ${dest} ..."
+        cp -R "${artifacts_dir}" "${dest}/BenchmarkDotNet.Artifacts"
+        if [[ -d "${artifacts_dir}/results" ]]; then
+            cp -R "${artifacts_dir}/results/." "${dest}/"
+        fi
+    else
+        echo "WARNING: No BenchmarkDotNet.Artifacts directory was produced for '${label}' at ${artifacts_dir}." >&2
+    fi
+
+    # §2.10 Fail loud: a pass that produced zero benchmark results (server dropped, all benches
+    # errored, exporter disabled) must not flow through to an empty comparison that reads green.
+    local nresults
+    nresults="$(count_benchmark_results "${dest}")"
+    echo "Pass '${label}' produced ${nresults} benchmark result(s)."
+    if [[ "${nresults}" -eq 0 ]]; then
+        echo "ERROR: pass '${label}' produced no benchmark results; failing the run (a broken benchmark pass must not be reported as a pass)." >&2
+        exit 1
+    fi
+}
+
+# build_variant <label> <extra dotnet build args...>
+# Builds the PerformanceTests app once into its own output directory (perf-build-<label>) so the
+# interleaved orchestrator can invoke it repeatedly without rebuilding.  The two variants (baseline
+# package vs candidate source) must go to distinct dirs because they share the project's bin path.
+build_variant() {
+    local label="$1"; shift
+    local out_dir="${REPO_ROOT}/perf-build-${label}"
+    rm -rf "${out_dir}"
+    mkdir -p "${out_dir}"
+    echo "Building '${label}' variant (${configuration}, ${framework}) into ${out_dir} ..."
+    dotnet build "${PERF_PROJECT}" -c "${configuration}" -f "${framework}" --nologo -v minimal \
+        -o "${out_dir}" "$@"
+}
+
+# --- Baseline pass (released NuGet package) -------------------------------------------------------
+if [[ -n "${baselineVersion}" && "${runMode}" == "interleaved" ]]; then
+    ################################################################################################
+    # Interleaved + best-of-N (wiki 339 §2.2/§2.3/§2.6).  Build both variants once, then let the
+    # orchestrator run one unit at a time (baseline then candidate) and confirm any flagged
+    # regression across N passes before it counts toward the gate.
+    ################################################################################################
+    write_baseline_nuget_config
+    build_variant "baseline" \
+        -p:ReferenceType=Package \
+        -p:MdsPackageVersion="${baselineVersion}" \
+        -p:RestoreConfigFile="${BASELINE_NUGET_CONFIG}"
+    build_variant "current"
+
+    interleave_args=(
+        --baseline-exe-dir "${REPO_ROOT}/perf-build-baseline"
+        --current-exe-dir "${REPO_ROOT}/perf-build-current"
+        --assembly "PerformanceTests.dll"
+        --results-dir "${RESULTS_DIR}"
+        --threshold "${regressionThreshold}"
+        --reps "${confirmationRuns}"
+        --baseline-version "${baselineVersion}"
+        --client-cpus "${PERF_CLIENT_CPUS:-}"
+    )
+    if [[ "${failOnRegression}" == "true" ]]; then
+        echo "Regression gate ENABLED: a CONFIRMED candidate-slower regression (> ${regressionThreshold}%) will fail the run."
+        interleave_args+=(--fail-on-regression)
+    fi
+    echo "Running interleaved benchmarks (best-of-${confirmationRuns}) ..."
+    python3 "${SCRIPT_DIR}/interleave_perf.py" "${interleave_args[@]}"
+
+elif [[ -n "${baselineVersion}" ]]; then
+    # --- Legacy sequential path: full baseline pass, then full candidate pass, then compare -------
+    write_baseline_nuget_config
+    run_pass "baseline" \
+        -p:ReferenceType=Package \
+        -p:MdsPackageVersion="${baselineVersion}" \
+        -p:RestoreConfigFile="${BASELINE_NUGET_CONFIG}"
+    run_pass "current"
+
+    echo "Comparing current branch against baseline ${baselineVersion} ..."
+    mkdir -p "${RESULTS_DIR}/comparison"
+    compare_args=(
+        --baseline-dir "${RESULTS_DIR}/baseline"
+        --current-dir "${RESULTS_DIR}/current"
+        --baseline-version "${baselineVersion}"
+        --threshold "${regressionThreshold}"
+        --out-md "${RESULTS_DIR}/comparison/comparison.md"
+        --out-json "${RESULTS_DIR}/comparison/comparison.json"
+    )
+    # §3 gate: only a candidate-slower regression fails, and only when explicitly enabled.
+    if [[ "${failOnRegression}" == "true" ]]; then
+        echo "Regression gate ENABLED: a candidate-slower regression (> ${regressionThreshold}%) will fail the run."
+        compare_args+=(--fail-on-regression)
+    fi
+    python3 "${SCRIPT_DIR}/compare_perf.py" "${compare_args[@]}"
+    # Surface the comparison as the top-level run summary (collect-results.yml attaches results/*.md).
+    cp "${RESULTS_DIR}/comparison/comparison.md" "${RESULTS_DIR}/summary.md"
+
+else
+    # --- No baseline: current-only run (no comparison) --------------------------------------------
+    echo "No --baseline-version supplied; running current only (no comparison)."
+    run_pass "current"
+fi
+
+echo "Collected results:"
+find "${RESULTS_DIR}" -type f | sort
+
+echo "=================================================================="
+echo " Performance run complete."
+echo "=================================================================="
diff --git a/eng/pipelines/perf/scripts/show_perf_results.sh b/eng/pipelines/perf/scripts/show_perf_results.sh
new file mode 100755
index 0000000000..75807f5e98
--- /dev/null
+++ b/eng/pipelines/perf/scripts/show_perf_results.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+#
+# show_perf_results.sh
+#
+# Agent-side post-test step for sqlclient-perf-pipeline.yml: lists the collected performance results
+# and prints every BenchmarkDotNet GitHub-markdown report to the build log.  Kept in its own file
+# (rather than inline in the pipeline YAML) for readability.
+#
+# Environment (set by the pipeline step's 'env' mapping):
+#   RESULTS_DIR   Directory the VM results were copied back to on the agent.
+#
+####################################################################################################
+set -euo pipefail
+
+resultsDir="${RESULTS_DIR:?RESULTS_DIR must be set}"
+
+echo "=== Performance results ($resultsDir) ==="
+if [ ! -d "$resultsDir" ]; then
+    echo "##vso[task.logissue type=warning]No results directory was collected from the VM."
+    exit 0
+fi
+find "$resultsDir" -type f | sort
+echo
+# Print every BenchmarkDotNet GitHub-markdown report that was produced.
+while IFS= read -r report; do
+    echo "----------------------------------------------------------------"
+    echo "### $report"
+    echo "----------------------------------------------------------------"
+    cat "$report"
+    echo
+done < <(find "$resultsDir" -type f -name '*-report-github.md' | sort)
diff --git a/eng/pipelines/perf/scripts/translate_results_to_kusto.sh b/eng/pipelines/perf/scripts/translate_results_to_kusto.sh
new file mode 100755
index 0000000000..5d26a77300
--- /dev/null
+++ b/eng/pipelines/perf/scripts/translate_results_to_kusto.sh
@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+#
+# translate_results_to_kusto.sh
+#
+# Agent-side post-test step for sqlclient-perf-pipeline.yml.  Translates the BenchmarkDotNet "full"
+# JSON from the current (and optional baseline) pass into the Kusto perf-results schema (wiki 270):
+# one PerfRun row + N PerfBenchmarkResult rows per pass, written as NDJSON.  Kept in its own file
+# (rather than inline in the pipeline YAML) for readability; all pipeline context is passed in via
+# environment variables so this script stays free of ADO macro/expression syntax.
+#
+# Environment (set by the pipeline step's 'env' mapping):
+#   REPO_DIR                    Checkout root of the driver repo on the agent.
+#   RESULTS_DIR                 Directory holding the collected 'current'/'baseline' results.
+#   KUSTO_OUT                   Output directory for the translated NDJSON payloads.
+#   COLLECTION_URI, TEAM_PROJECT, BUILD_ID   Used to build the pipeline-run URL recorded on each row.
+#   AGENT_MACHINE_NAME          Fallback machine name when the VM didn't report its hostname.
+#   SOURCE_VERSION, SOURCE_BRANCH   Commit + branch under test.
+#   PLATFORM, RUN_MODE          Operating system + benchmark run mode recorded on each row.
+#   BASELINE_VERSION            Released package version for the baseline pass (empty when none ran).
+#   CFG_USE_MANAGED_SNI, CFG_USE_OPTIMIZED_ASYNC, CFG_USE_CONNECTION_POOL_V2
+#                               SqlClient behaviour flags recorded in PerfRun.Config for both passes.
+#
+####################################################################################################
+set -euo pipefail
+
+repoDir="${REPO_DIR:?REPO_DIR must be set}"
+resultsDir="${RESULTS_DIR:?RESULTS_DIR must be set}"
+kustoOut="${KUSTO_OUT:?KUSTO_OUT must be set}"
+scriptsDir="$repoDir/eng/pipelines/perf/scripts"
+mkdir -p "$kustoOut"
+
+if [ ! -d "$resultsDir/current" ]; then
+    echo "##vso[task.logissue type=warning]No 'current' results found; skipping Kusto translation."
+    exit 0
+fi
+
+buildUrl="${COLLECTION_URI}${TEAM_PROJECT}/_build/results?buildId=${BUILD_ID}"
+
+machineName="${AGENT_MACHINE_NAME}"
+# The VM writes its hostname into runinfo.env; prefer it when present.  Extract the value as data
+# (grep/cut) instead of sourcing the file, so unexpected/corrupted file content can never execute
+# as shell code.
+if [ -f "$resultsDir/runinfo.env" ]; then
+    envMachineName="$(grep -m1 '^MACHINE_NAME=' "$resultsDir/runinfo.env" 2>/dev/null | cut -d= -f2- || true)"
+    # A Windows VM writes runinfo.env with CRLF endings; strip any trailing CR so the hostname
+    # doesn't leak a '\r' into PerfRun.MachineName.
+    envMachineName="${envMachineName%$'\r'}"
+    machineName="${envMachineName:-$machineName}"
+fi
+
+commitHash="${SOURCE_VERSION}"
+commitDate="$(git -C "$repoDir" show -s --format=%cI "$commitHash" 2>/dev/null || true)"
+shortSha="$(git -C "$repoDir" rev-parse --short "$commitHash" 2>/dev/null || echo "$commitHash")"
+
+# The benchmark runner's config governs which SqlClient behaviours a run exercised; its top-level
+# boolean flags are recorded in PerfRun.Config for both passes.
+runnerConfig="$repoDir/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc"
+configOverrides=(
+    --config-override "UseManagedSniOnWindows=${CFG_USE_MANAGED_SNI}"
+    --config-override "UseOptimizedAsyncBehaviour=${CFG_USE_OPTIMIZED_ASYNC}"
+    --config-override "UseConnectionPoolV2=${CFG_USE_CONNECTION_POOL_V2}"
+)
+
+# --- current (branch under test) ---
+python3 "$scriptsDir/perf_to_kusto.py" \
+    --input-dir "$resultsDir/current" \
+    --out-run "$kustoOut/current.PerfRun.ndjson" \
+    --out-results "$kustoOut/current.PerfBenchmarkResult.ndjson" \
+    --driver-name "Microsoft.Data.SqlClient" \
+    --machine-name "$machineName" \
+    --agent-name "$AGENT_MACHINE_NAME" \
+    --operating-system "$PLATFORM" \
+    --run-type "$RUN_MODE" \
+    --pipeline-run-id "$BUILD_ID" \
+    --build-url "$buildUrl" \
+    --branch-name "$SOURCE_BRANCH" \
+    --version-string "$shortSha" \
+    --commit-hash "$commitHash" \
+    --commit-date "$commitDate" \
+    --runner-config "$runnerConfig" \
+    "${configOverrides[@]}" \
+    --is-comparable-base false
+
+# --- baseline (released NuGet package), when a baseline pass ran ---
+if [ -d "$resultsDir/baseline" ]; then
+    baseVer="${BASELINE_VERSION}"
+    python3 "$scriptsDir/perf_to_kusto.py" \
+        --input-dir "$resultsDir/baseline" \
+        --out-run "$kustoOut/baseline.PerfRun.ndjson" \
+        --out-results "$kustoOut/baseline.PerfBenchmarkResult.ndjson" \
+        --driver-name "Microsoft.Data.SqlClient" \
+        --machine-name "$machineName" \
+        --agent-name "$AGENT_MACHINE_NAME" \
+        --operating-system "$PLATFORM" \
+        --run-type "$RUN_MODE" \
+        --pipeline-run-id "$BUILD_ID" \
+        --build-url "$buildUrl" \
+        --branch-name "refs/tags/v$baseVer" \
+        --version-string "$baseVer" \
+        --commit-hash "v$baseVer" \
+        --runner-config "$runnerConfig" \
+        "${configOverrides[@]}" \
+        --is-comparable-base true
+fi
+
+echo "Translated Kusto payloads:"
+find "$kustoOut" -type f | sort
diff --git a/eng/pipelines/perf/sqlclient-perf-pipeline.yml b/eng/pipelines/perf/sqlclient-perf-pipeline.yml
new file mode 100644
index 0000000000..08384796ca
--- /dev/null
+++ b/eng/pipelines/perf/sqlclient-perf-pipeline.yml
@@ -0,0 +1,359 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# SqlClient Performance Test pipeline.
+#
+# This pipeline runs the Microsoft.Data.SqlClient BenchmarkDotNet performance tests on the internal
+# "Perf Test Lab" (Azure Dedicated Hosts).  It does so by consuming the reusable extends template
+# published by the InternalDriverTools/PerfTest repository:
+#
+#   v1/Perf.Test.Job.yml@PerfTemplates
+#
+# See the design/usage guidance on the wiki:
+#   InternalDriverTools.wiki - "Performance Test Automation" (page 284)
+#
+# The template owns the full run lifecycle (SSH key generation, dedicated-host VM provisioning, test
+# execution over SSH, result collection, and teardown).  All this pipeline supplies is:
+#
+#   * the source directory to copy to the VM (testRootDir),
+#   * the entry-point script to execute on the VM (testScript + testScriptArgs),
+#   * the results subfolder to copy back (testResultsSubDir), and
+#   * optional post-test steps to surface the results.
+#
+# The on-VM script (eng/pipelines/perf/scripts/run-perf-tests.*) installs the .NET SDK, creates the
+# perf database, injects the VM's SQL Server connection string into the benchmark runner config,
+# pins the client to the reserved CPU set, runs the benchmarks, and collects the BenchmarkDotNet
+# artifacts into the results subfolder.
+
+# Set the pipeline run name to the day-of-year and the daily run counter.
+name: $(DayOfYear)$(Rev:rr)
+
+# This pipeline is manual/scheduled only; never trigger on PRs or commits.
+pr: none
+trigger: none
+
+# Uncomment to run nightly.  Times are UTC.
+# schedules:
+#   - cron: "0 6 * * *"
+#     displayName: Nightly performance run
+#     branches:
+#       include:
+#         - main
+#     always: true
+
+parameters:
+
+  # Target OS for the perf VM and the benchmark client.
+  - name: platform
+    displayName: Platform
+    type: string
+    default: linux
+    values:
+      - linux
+      - windows
+
+  # The .NET runtime the benchmarks are executed against.  Must be one of the target frameworks of
+  # the PerformanceTests project (net8.0/net9.0/net10.0).
+  - name: dotnetFramework
+    displayName: .NET Framework (TFM)
+    type: string
+    default: net9.0
+    values:
+      - net8.0
+      - net9.0
+      - net10.0
+
+  # Maximum time (minutes) the template waits for the benchmark run on the VM before timing out.
+  - name: testTimeoutMinutes
+    displayName: Test Timeout (minutes)
+    type: number
+    default: 180
+
+  # The released Microsoft.Data.SqlClient version the branch under test is benchmarked against.
+  # Manually managed: bump this after each stable release (e.g. to the latest 7.0.x).  Overridable
+  # at queue time.  Set to an empty string to skip the baseline pass and run current-only.
+  - name: baselineVersion
+    displayName: Baseline Version
+    type: string
+    default: 7.0.2
+
+  # Percent slowdown (current vs baseline mean) that the comparison flags as a regression.
+  - name: regressionThreshold
+    displayName: Regression Threshold (%)
+    type: number
+    default: 10
+
+  # When true, a candidate-slower-than-baseline regression FAILS the run (wiki 339 §3 gate).
+  # Default false: the run still reports deltas but does not block, until the gate is trusted
+  # (best paired with the best-of-N confirmation described in eng/pipelines/perf/README.md).
+  - name: failOnRegression
+    displayName: Fail run on regression
+    type: boolean
+    default: false
+
+  # Benchmark run model (wiki 339 §2.2/§2.3/§2.6):
+  #   interleaved -> run one benchmark unit at a time, baseline and candidate back-to-back, and
+  #                  confirm any flagged regression across N passes (best-of-N).  Noise-resistant
+  #                  default; required before trusting the failOnRegression gate.
+  #   sequential  -> legacy: run the whole baseline suite, then the whole candidate suite, compare.
+  - name: benchmarkRunMode
+    displayName: Benchmark run mode
+    type: string
+    default: interleaved
+    values:
+      - interleaved
+      - sequential
+
+  # Best-of-N: total interleaved passes for a flagged unit before a regression is confirmed
+  # (1 disables confirmation).  Only used when benchmarkRunMode = interleaved.
+  - name: confirmationRuns
+    displayName: Confirmation runs (best-of-N)
+    type: number
+    default: 3
+
+  # Optional SqlClient behaviour flags. These are applied to the benchmark runner config used by
+  # BOTH the baseline and candidate passes on the VM, and are also recorded in PerfRun.Config so a
+  # run's settings are queryable/filterable on the dashboard. Defaults match the checked-in
+  # runnerconfig.jsonc, so leaving them untouched preserves today's behaviour.
+  - name: useManagedSniOnWindows
+    displayName: UseManagedSniOnWindows
+    type: boolean
+    default: false
+
+  - name: useOptimizedAsyncBehaviour
+    displayName: UseOptimizedAsyncBehaviour
+    type: boolean
+    default: true
+
+  - name: useConnectionPoolV2
+    displayName: UseConnectionPoolV2
+    type: boolean
+    default: false
+
+  # Whether to ingest the run's results into Kusto (Azure Data Explorer).  Enabled by default; set to
+  # false at queue time to run + compare only and skip ingestion (e.g. for a throwaway/experimental
+  # run you do not want recorded in the perf database).  Even when true, ingestion still requires the
+  # 'ADX Cluster Variables' group to be populated (see below); an empty coordinate skips it anyway.
+  - name: enableKustoIngestion
+    displayName: Ingest results into Kusto
+    type: boolean
+    default: true
+
+  # NOTE: The Kusto (Azure Data Explorer) ingestion coordinates - cluster URI, database, and the
+  # Azure DevOps ARM service connection - are NOT parameters.  They are sourced from the pipeline
+  # library variable group 'ADX Cluster Variables' (see the 'variables' section below), so no
+  # infrastructure identifiers are hard-coded in this file.
+
+# Fixed (non-configurable) constants for this pipeline.  These are intentionally NOT parameters or
+# library variables: they are invariant for the SqlClient perf pipeline.
+#   * buildConfiguration = Release            - perf numbers are only meaningful in Release.
+#   * sourcesSubDir       = dotnet-sqlclient  - folder 'self' checks out into under the template's
+#                                               MULTI-REPO checkout ($(Build.SourcesDirectory)/<repo>);
+#                                               must match the ADO repository name.
+#   * driverName          = Microsoft.Data.SqlClient - recorded on every row (DriverName / DerivedRunId).
+
+# Kusto (Azure Data Explorer) ingestion coordinates come from a pipeline library variable group so
+# that no cluster URI, database name, or service-connection name is hard-coded in this pipeline.
+# The 'ADX Cluster Variables' group must define:
+#   * KustoClusterUri        - ADX cluster URI (e.g. https://<cluster>.<region>.kusto.windows.net)
+#   * KustoDatabase          - target database name
+#   * KustoServiceConnection - Azure DevOps ARM service connection whose service principal has
+#                              'Database Ingestor' (and ideally 'Database Viewer') rights.
+# Ingestion is skipped automatically when any of KustoClusterUri, KustoDatabase or
+# KustoServiceConnection is empty, so the pipeline still runs + compares before the cluster/database/
+# service connection are provisioned.
+variables:
+  - group: ADX Cluster Variables
+
+  # Pre-computed testScriptArgs chunks (paulmedynski's review suggestion).  The Windows entry point
+  # is PowerShell and binds '-PascalCase' params, while the Linux one is bash and parses
+  # '--kebab-case' flags, so the argument STYLE differs by platform.  Assembling the final args from
+  # these per-platform chunks keeps the single testScriptArgs below readable instead of duplicating
+  # a full arg string across the whole platform x baseline x fail-gate matrix.  Config flags are
+  # always passed (their defaults match runnerconfig.jsonc), so they live in the common chunk.
+  - ${{ if eq(parameters.platform, 'windows') }}:
+    - name: PerfArgsCommon
+      value: '-Configuration Release -Framework ${{ parameters.dotnetFramework }} -ResultsSubdir perf-results -RegressionThreshold ${{ parameters.regressionThreshold }} -RunMode ${{ parameters.benchmarkRunMode }} -ConfirmationRuns ${{ parameters.confirmationRuns }} -UseManagedSniOnWindows ${{ lower(parameters.useManagedSniOnWindows) }} -UseOptimizedAsyncBehaviour ${{ lower(parameters.useOptimizedAsyncBehaviour) }} -UseConnectionPoolV2 ${{ lower(parameters.useConnectionPoolV2) }}'
+  - ${{ else }}:
+    - name: PerfArgsCommon
+      value: '--configuration Release --framework ${{ parameters.dotnetFramework }} --results-subdir perf-results --regression-threshold ${{ parameters.regressionThreshold }} --run-mode ${{ parameters.benchmarkRunMode }} --confirmation-runs ${{ parameters.confirmationRuns }} --use-managed-sni-on-windows ${{ lower(parameters.useManagedSniOnWindows) }} --use-optimized-async-behaviour ${{ lower(parameters.useOptimizedAsyncBehaviour) }} --use-connection-pool-v2 ${{ lower(parameters.useConnectionPoolV2) }}'
+
+  # Baseline-version flag, omitted entirely when no baseline is requested: on bash an empty value
+  # would let arg parsing consume the following flag as the baseline version and corrupt every
+  # subsequent argument, so both platforms omit it symmetrically.
+  - ${{ if and(eq(parameters.platform, 'windows'), ne(parameters.baselineVersion, '')) }}:
+    - name: PerfArgsBaseline
+      value: '-BaselineVersion ${{ parameters.baselineVersion }}'
+  - ${{ elseif ne(parameters.baselineVersion, '') }}:
+    - name: PerfArgsBaseline
+      value: '--baseline-version ${{ parameters.baselineVersion }}'
+  - ${{ else }}:
+    - name: PerfArgsBaseline
+      value: ''
+
+  # Regression gate, only when failOnRegression is requested.
+  - ${{ if and(eq(parameters.platform, 'windows'), eq(parameters.failOnRegression, true)) }}:
+    - name: PerfArgsFail
+      value: '-FailOnRegression'
+  - ${{ elseif eq(parameters.failOnRegression, true) }}:
+    - name: PerfArgsFail
+      value: '--fail-on-regression'
+  - ${{ else }}:
+    - name: PerfArgsFail
+      value: ''
+
+# Reference the PerfTest repository that hosts the reusable extends template.  Driver-team projects
+# have been onboarded with the Agent Pools and Service Connections required to consume it.
+resources:
+  repositories:
+    - repository: PerfTemplates
+      type: git
+      name: InternalDriverTools/PerfTest
+      ref: refs/heads/main
+
+# Consume the Perf Test Lab template.  The template defines the whole job/stage structure; we only
+# pass parameters into it.
+extends:
+  template: v1/Perf.Test.Job.yml@PerfTemplates
+  parameters:
+    platform: ${{ parameters.platform }}
+
+    # The entire driver source tree is copied to the VM so the benchmarks (which reference
+    # Microsoft.Data.SqlClient as a project) can be built from source against the current commit.
+    # Under the template's multi-repo checkout, 'self' lands in a repo-named subfolder.
+    testRootDir: $(Build.SourcesDirectory)/dotnet-sqlclient
+
+    # Entry-point script (relative to testRootDir), selected by platform.  Linux uses bash, Windows
+    # uses PowerShell, per the template's .sh/.ps1 convention.
+    ${{ if eq(parameters.platform, 'windows') }}:
+      testScript: eng/pipelines/perf/scripts/run-perf-tests.ps1
+    ${{ else }}:
+      testScript: eng/pipelines/perf/scripts/run-perf-tests.sh
+
+    # Arguments forwarded to the script.  The script also reads SQL_SERVER, SQL_PASSWORD and
+    # PERF_CLIENT_CPUS directly from the VM session environment (injected by the template).  The
+    # per-platform / baseline / fail-gate argument chunks are pre-computed in the 'variables' block
+    # above (PerfArgsCommon / PerfArgsBaseline / PerfArgsFail); assemble them here.  Empty chunks
+    # collapse to harmless extra spaces that both PowerShell and bash arg parsing ignore.
+    testScriptArgs: '$(PerfArgsCommon) $(PerfArgsBaseline) $(PerfArgsFail)'
+
+    # Subfolder (relative to testRootDir on the VM) the script writes results into.  The template
+    # copies this VM folder back to the agent, but always lands it at a fixed location:
+    # $(Build.ArtifactStagingDirectory)/results (and publishes it as the 'perf-results' artifact).
+    testResultsSubDir: perf-results
+
+    testTimeoutMinutes: ${{ parameters.testTimeoutMinutes }}
+    jobName: SqlClientPerf
+
+    # Post-test steps run on the agent after results have been copied back.  The template already
+    # publishes the results artifact and attaches any top-level results/*.md as run summaries; this
+    # step additionally surfaces the BenchmarkDotNet markdown reports in the build log.
+    steps:
+      # Tag the build with the baseline version used for the comparison so runs are
+      # identifiable at a glance in the ADO build list.  Runs first so the tag is applied
+      # even if a later step fails; omitted entirely when no baseline pass is requested.
+      # NOTE: the tag intentionally has no ':' - build tags are placed in the request URL
+      # path and a colon trips ADO's "potentially dangerous Request.Path" filter.
+      - ${{ if ne(parameters.baselineVersion, '') }}:
+        - bash: |
+            echo "##vso[build.addbuildtag]Baseline ${{ parameters.baselineVersion }}"
+          displayName: 'Tag build with baseline version'
+          condition: succeededOrFailed()
+
+      - task: Bash@3
+        displayName: 'Show performance results'
+        condition: succeededOrFailed()
+        inputs:
+          targetType: filePath
+          filePath: $(Build.SourcesDirectory)/dotnet-sqlclient/eng/pipelines/perf/scripts/show_perf_results.sh
+        env:
+          RESULTS_DIR: $(Build.ArtifactStagingDirectory)/results
+
+      # Translate the BenchmarkDotNet "full" JSON from both passes into the Kusto perf-results
+      # schema (wiki 270): one PerfRun row + N PerfBenchmarkResult rows per pass, as NDJSON.  This
+      # runs on the AGENT (which has native pipeline-context variables and the collected results)
+      # and always executes so the NDJSON is published even when ingestion is skipped.  The script
+      # is kept in its own file for readability; pipeline context is handed to it via 'env'.
+      - task: Bash@3
+        displayName: 'Translate results to Kusto schema'
+        condition: succeededOrFailed()
+        inputs:
+          targetType: filePath
+          filePath: $(Build.SourcesDirectory)/dotnet-sqlclient/eng/pipelines/perf/scripts/translate_results_to_kusto.sh
+        env:
+          REPO_DIR: $(Build.SourcesDirectory)/dotnet-sqlclient
+          RESULTS_DIR: $(Build.ArtifactStagingDirectory)/results
+          KUSTO_OUT: $(Build.ArtifactStagingDirectory)/kusto
+          COLLECTION_URI: $(System.CollectionUri)
+          TEAM_PROJECT: $(System.TeamProject)
+          BUILD_ID: $(Build.BuildId)
+          AGENT_MACHINE_NAME: $(Agent.MachineName)
+          SOURCE_VERSION: $(Build.SourceVersion)
+          SOURCE_BRANCH: $(Build.SourceBranch)
+          PLATFORM: ${{ parameters.platform }}
+          RUN_MODE: ${{ parameters.benchmarkRunMode }}
+          BASELINE_VERSION: ${{ parameters.baselineVersion }}
+          CFG_USE_MANAGED_SNI: ${{ lower(parameters.useManagedSniOnWindows) }}
+          CFG_USE_OPTIMIZED_ASYNC: ${{ lower(parameters.useOptimizedAsyncBehaviour) }}
+          CFG_USE_CONNECTION_POOL_V2: ${{ lower(parameters.useConnectionPoolV2) }}
+
+      # Publish the translated NDJSON alongside the raw results for traceability / manual ingestion.
+      - task: PublishPipelineArtifact@1
+        displayName: 'Publish Kusto payloads'
+        condition: succeededOrFailed()
+        inputs:
+          targetPath: $(Build.ArtifactStagingDirectory)/kusto
+          artifact: perf-kusto-payloads
+
+      # Ingest both result sets into the Kusto perf-results database using the ARM service
+      # connection's service principal (az CLI auth).  Cluster/database/service-connection come from
+      # the 'ADX Cluster Variables' group.  The task is skipped when the 'Ingest results into Kusto'
+      # parameter is disabled, or (runtime) when the cluster URI, database or service connection is
+      # empty - so the pipeline still runs+compares before the cluster is provisioned or when a run is
+      # explicitly opted out of ingestion.
+      - task: AzureCLI@2
+        displayName: 'Ingest results into Kusto'
+        # Gate on the boolean parameter at compile time (a reliable boolean comparison), then only the
+        # runtime variable presence is left to the 'condition'.  Comparing the stringified parameter to
+        # 'True' inside 'condition' is fragile across template expansion, so it is avoided.
+        ${{ if eq(parameters.enableKustoIngestion, true) }}:
+          condition: and(succeededOrFailed(), ne(variables['KustoClusterUri'], ''), ne(variables['KustoDatabase'], ''), ne(variables['KustoServiceConnection'], ''))
+        ${{ else }}:
+          condition: false
+        inputs:
+          azureSubscription: $(KustoServiceConnection)
+          scriptType: bash
+          scriptLocation: inlineScript
+          inlineScript: |
+            set -euo pipefail
+            scriptsDir="$(Build.SourcesDirectory)/dotnet-sqlclient/eng/pipelines/perf/scripts"
+            kustoOut="$(Build.ArtifactStagingDirectory)/kusto"
+
+            # PEP 668: Ubuntu agents ship an "externally managed" Python and lack the
+            # python3-venv package (no ensurepip), so both a plain 'pip install' and
+            # 'python3 -m venv' fail. pip itself is available, so install the Kusto SDKs
+            # into the per-user site and bypass the PEP 668 marker.
+            python3 -m pip install --quiet --upgrade --user --break-system-packages \
+              azure-kusto-data azure-kusto-ingest
+
+            runFiles=""
+            resFiles=""
+            for f in "$kustoOut/baseline.PerfRun.ndjson" "$kustoOut/current.PerfRun.ndjson"; do
+              [ -f "$f" ] && runFiles="${runFiles:+$runFiles,}$f"
+            done
+            for f in "$kustoOut/baseline.PerfBenchmarkResult.ndjson" "$kustoOut/current.PerfBenchmarkResult.ndjson"; do
+              [ -f "$f" ] && resFiles="${resFiles:+$resFiles,}$f"
+            done
+
+            if [ -z "$runFiles" ]; then
+              echo "##vso[task.logissue type=warning]No Kusto payloads to ingest."
+              exit 0
+            fi
+
+            python3 -u "$scriptsDir/ingest_kusto.py" \
+              --cluster "$(KustoClusterUri)" \
+              --database "$(KustoDatabase)" \
+              --run-file "$runFiles" \
+              --results-file "$resFiles"
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs
index 8cd26c8641..9a53f97651 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs
@@ -5,10 +5,11 @@
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
 using BenchmarkDotNet.Exporters;
+using BenchmarkDotNet.Exporters.Json;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Toolchains.InProcess.Emit;
 #if WINDOWS
-using BenchmarkDotNet.Diagnostics.Windows.Configs;
+using BenchmarkDotNet.Diagnostics.Windows;
 #endif
 
 namespace Microsoft.Data.SqlClient.PerformanceTests
@@ -32,6 +33,9 @@ public static ManualConfig s_instance(RunnerJob runnerJob)
                 .AddDiagnoser(MemoryDiagnoser.Default)
                 .AddDiagnoser(ThreadingDiagnoser.Default)
                 .AddExporter(MarkdownExporter.GitHub)
+                // Emit the BenchmarkDotNet "full" JSON report (*-report-full.json) so the perf
+                // pipeline can translate results into the Kusto performance-results schema.
+                .AddExporter(JsonExporter.Full)
                 .AddJob(
                     Job.MediumRun.WithToolchain(InProcessEmitToolchain.Instance)
                     .WithLaunchCount(runnerJob.LaunchCount)
@@ -48,7 +52,7 @@ public static ManualConfig s_instance(RunnerJob runnerJob)
             if (UseNativeMemoryAndEtwProfiler)
             {
                 config = config
-                    .AddDiagnoser(NativeMemoryProfiler.Default)
+                    .AddDiagnoser(new NativeMemoryProfiler())
                     .AddDiagnoser(new EtwProfiler());
             }
 #endif
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
index 1986ce68e1..a7f3c2d8f7 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
@@ -30,8 +30,28 @@
     <!-- referencing MDS via the project.                                                         -->
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\src\Microsoft.Data.SqlClient.csproj"
                       Condition="'$(ReferenceType)' != 'Package'"  />
+    <!-- In Package mode the perf pipeline can pin a specific released MDS version (e.g. a    -->
+    <!-- performance baseline) by passing -p:MdsPackageVersion=<version>. Under Central       -->
+    <!-- Package Management a plain Version is ignored, so VersionOverride is used; when       -->
+    <!-- MdsPackageVersion is empty the CPM-managed version applies. The two Includes are      -->
+    <!-- mutually exclusive on whether MdsPackageVersion was provided.                         -->
     <PackageReference Include="Microsoft.Data.SqlClient"
-                      Condition="'$(ReferenceType)' == 'Package'" />
+                      Condition="'$(ReferenceType)' == 'Package' and '$(MdsPackageVersion)' == ''" />
+    <PackageReference Include="Microsoft.Data.SqlClient"
+                      Condition="'$(ReferenceType)' == 'Package' and '$(MdsPackageVersion)' != ''"
+                      VersionOverride="$(MdsPackageVersion)" />
+  </ItemGroup>
+
+  <!-- Microsoft.Data.SqlClient 7.1.0-preview1.26124.5 declares transitive dependencies on the      -->
+  <!-- prerelease Microsoft.Data.SqlClient.Extensions.Abstractions and                              -->
+  <!-- Microsoft.Data.SqlClient.Internal.Logging 1.0.0-preview1.26124.5 packages, which were never  -->
+  <!-- published to NuGet.org.  Restoring that exact baseline therefore fails with NU1603 (the      -->
+  <!-- prerelease dependency is not found and the released 1.0.0 is substituted).  Pin explicit     -->
+  <!-- direct references to the released 1.0.0 packages - which satisfy the (>= prerelease)          -->
+  <!-- constraint - but only for that specific baseline version so other builds are unaffected.     -->
+  <ItemGroup Condition="'$(ReferenceType)' == 'Package' and '$(MdsPackageVersion)' == '7.1.0-preview1.26124.5'">
+    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" VersionOverride="1.0.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" VersionOverride="1.0.0" />
   </ItemGroup>
 
   <!-- Other references -->
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
index c23ffc8412..bf42ebaf75 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using BenchmarkDotNet.Running;
 
 namespace Microsoft.Data.SqlClient.PerformanceTests
@@ -12,35 +14,120 @@ public class Program
         private readonly Config _config;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Program"/> class, 
+        /// A single benchmark "unit": the stable selector name used by the perf pipeline, the
+        /// accessor for its per-benchmark <see cref="RunnerJob"/> in the runner config, and the
+        /// BenchmarkDotNet runner type to execute.
+        /// </summary>
+        private sealed class BenchmarkUnit
+        {
+            public string Name { get; }
+            public Func<Benchmarks, RunnerJob> Selector { get; }
+            public Type RunnerType { get; }
+
+            public BenchmarkUnit(string name, Func<Benchmarks, RunnerJob> selector, Type runnerType)
+            {
+                Name = name;
+                Selector = selector;
+                RunnerType = runnerType;
+            }
+        }
+
+        /// <summary>
+        /// The ordered registry of benchmark units.  The <c>Name</c> is the stable identifier the
+        /// perf pipeline uses to enumerate and select benchmarks (see <c>PERF_BENCHMARK</c> /
+        /// <c>PERF_LIST_BENCHMARKS</c>), so it must not change casually.
+        /// </summary>
+        private static readonly BenchmarkUnit[] s_units = new[]
+        {
+            new BenchmarkUnit("SqlConnection", b => b.SqlConnectionRunnerConfig, typeof(SqlConnectionRunner)),
+            new BenchmarkUnit("SqlCommand", b => b.SqlCommandRunnerConfig, typeof(SqlCommandRunner)),
+            new BenchmarkUnit("SqlBulkCopy", b => b.SqlBulkCopyRunnerConfig, typeof(SqlBulkCopyRunner)),
+            new BenchmarkUnit("DataTypeReader", b => b.DataTypeReaderRunnerConfig, typeof(DataTypeReaderRunner)),
+            new BenchmarkUnit("DataTypeReaderAsync", b => b.DataTypeReaderAsyncRunnerConfig, typeof(DataTypeReaderAsyncRunner)),
+            new BenchmarkUnit("AsyncLargeDataRead", b => b.AsyncLargeDataReadRunnerConfig, typeof(AsyncLargeDataReadRunner)),
+            new BenchmarkUnit("MarsOverhead", b => b.MarsOverheadRunnerConfig, typeof(MarsOverheadRunner)),
+            new BenchmarkUnit("ParallelAsyncConnection", b => b.ParallelAsyncConnectionRunnerConfig, typeof(ParallelAsyncConnectionRunner)),
+            new BenchmarkUnit("CancellationTokenReadAsync", b => b.CancellationTokenReadAsyncRunnerConfig, typeof(CancellationTokenReadAsyncRunner)),
+            new BenchmarkUnit("SequentialXmlRead", b => b.SequentialXmlReadRunnerConfig, typeof(SequentialXmlReadRunner)),
+            new BenchmarkUnit("JsonVsVarcharRead", b => b.JsonVsVarcharReadRunnerConfig, typeof(JsonVsVarcharReadRunner)),
+            new BenchmarkUnit("BeginTransaction", b => b.BeginTransactionRunnerConfig, typeof(BeginTransactionRunner)),
+            new BenchmarkUnit("ConnectionPoolStress", b => b.ConnectionPoolStressRunnerConfig, typeof(ConnectionPoolStressRunner)),
+            new BenchmarkUnit("ConnectionPoolContention", b => b.ConnectionPoolContentionRunnerConfig, typeof(ConnectionPoolContentionRunner)),
+            new BenchmarkUnit("ConnectionPoolChurn", b => b.ConnectionPoolChurnRunnerConfig, typeof(ConnectionPoolChurnRunner)),
+        };
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Program"/> class,
         /// which loads the benchmark configuration and runs the benchmarks.
         /// </summary>
         public Program()
         {
             _config = Config.Load();
             SetupConfigurations();
-            
-            Run_SqlConnectionBenchmark();
-            Run_SqlCommandBenchmark();
-            Run_SqlBulkCopyBenchmark();
-            Run_DataTypeReaderBenchmark();
-            Run_DataTypeReaderAsyncBenchmark();
-            Run_AsyncLargeDataReadBenchmark();
-            Run_MarsOverheadBenchmark();
-            Run_ParallelAsyncConnectionBenchmark();
-            Run_CancellationTokenReadAsyncBenchmark();
-            Run_SequentialXmlReadBenchmark();
-            Run_JsonVsVarcharReadBenchmark();
-            Run_BeginTransactionBenchmark();
-            Run_ConnectionPoolStressBenchmark();
-            Run_ConnectionPoolContentionBenchmark();
-            Run_ConnectionPoolChurnBenchmark();
+
+            // Interleaving support for the perf pipeline (InternalDriverTools wiki 339 §2.2/§2.3):
+            // the harness can enumerate the enabled units and run one at a time, so a candidate and
+            // baseline build are measured back-to-back instead of tens of minutes apart.
+            //
+            //   PERF_LIST_BENCHMARKS set -> print the enabled unit names (one per line) and exit.
+            //   PERF_BENCHMARK=<Name>    -> run only that unit (if enabled).
+            //   neither                  -> run every enabled unit (default; unchanged behaviour).
+            List<BenchmarkUnit> enabled = s_units.Where(IsEnabled).ToList();
+
+            if (Environment.GetEnvironmentVariable("PERF_LIST_BENCHMARKS") != null)
+            {
+                foreach (BenchmarkUnit unit in enabled)
+                {
+                    Console.WriteLine(unit.Name);
+                }
+                return;
+            }
+
+            string only = Environment.GetEnvironmentVariable("PERF_BENCHMARK");
+            IEnumerable<BenchmarkUnit> toRun = enabled;
+            if (!string.IsNullOrWhiteSpace(only))
+            {
+                toRun = enabled
+                    .Where(u => string.Equals(u.Name, only, StringComparison.OrdinalIgnoreCase))
+                    .ToList();
+                if (!toRun.Any())
+                {
+                    Console.Error.WriteLine(
+                        $"No enabled benchmark named '{only}'. Enabled units: " +
+                        string.Join(", ", enabled.Select(u => u.Name)));
+                    Environment.ExitCode = 2;
+                    return;
+                }
+            }
+
+            foreach (BenchmarkUnit unit in toRun)
+            {
+                BenchmarkRunner.Run(unit.RunnerType, BenchmarkConfig.s_instance(unit.Selector(_config.Benchmarks)));
+            }
 
             // TODOs:
             // Prepared/Regular Parameterized queries
             // Always Encrypted
         }
 
+        /// <summary>
+        /// Returns true when the unit has a config entry that is marked Enabled.
+        /// </summary>
+        private bool IsEnabled(BenchmarkUnit unit)
+        {
+            RunnerJob job = unit.Selector(_config.Benchmarks);
+            return job != null && job.Enabled;
+        }
+
+        /// <summary>
+        /// Returns true when the harness is driving execution via the perf pipeline's env vars
+        /// (<c>PERF_LIST_BENCHMARKS</c> to enumerate units, or <c>PERF_BENCHMARK</c> to run one).
+        /// These modes run unattended, so interactive prompts (e.g. WaitForProfiler) must be skipped.
+        /// </summary>
+        private static bool IsHarnessControlled() =>
+            Environment.GetEnvironmentVariable("PERF_LIST_BENCHMARKS") != null ||
+            !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("PERF_BENCHMARK"));
+
         private void SetupConfigurations()
         {
             // If the config file specifies to use managed SNI on Windows, 
@@ -74,7 +161,9 @@ private void SetupConfigurations()
 
             // If the config file specifies to wait for a profiler, 
             // display the process ID and wait for user input before starting the benchmarks.
-            if (_config.WaitForProfiler)
+            // Skipped under harness-controlled execution (PERF_LIST_BENCHMARKS / PERF_BENCHMARK):
+            // those modes run unattended, so blocking on Console.ReadKey() would hang automation.
+            if (_config.WaitForProfiler && !IsHarnessControlled())
             {
                 int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
                 Console.WriteLine();
@@ -92,126 +181,6 @@ private void SetupConfigurations()
             }
         }
 
-        private void Run_SqlConnectionBenchmark()
-        {
-            if (_config.Benchmarks.SqlConnectionRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<SqlConnectionRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.SqlConnectionRunnerConfig));
-            }
-        }
-
-        private void Run_SqlCommandBenchmark()
-        {
-            if (_config.Benchmarks.SqlCommandRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<SqlCommandRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.SqlCommandRunnerConfig));
-            }
-        }
-
-        private void Run_DataTypeReaderBenchmark()
-        {
-            if (_config.Benchmarks.DataTypeReaderRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<DataTypeReaderRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.DataTypeReaderRunnerConfig));
-            }
-        }
-
-        private void Run_DataTypeReaderAsyncBenchmark()
-        {
-            if (_config.Benchmarks.DataTypeReaderAsyncRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<DataTypeReaderAsyncRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.DataTypeReaderAsyncRunnerConfig));
-            }
-        }
-
-        private void Run_SqlBulkCopyBenchmark()
-        {
-            if (_config.Benchmarks.SqlBulkCopyRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<SqlBulkCopyRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.SqlBulkCopyRunnerConfig));
-            }
-        }
-
-        private void Run_AsyncLargeDataReadBenchmark()
-        {
-            if (_config.Benchmarks.AsyncLargeDataReadRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<AsyncLargeDataReadRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.AsyncLargeDataReadRunnerConfig));
-            }
-        }
-
-        private void Run_MarsOverheadBenchmark()
-        {
-            if (_config.Benchmarks.MarsOverheadRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<MarsOverheadRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.MarsOverheadRunnerConfig));
-            }
-        }
-
-        private void Run_ParallelAsyncConnectionBenchmark()
-        {
-            if (_config.Benchmarks.ParallelAsyncConnectionRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<ParallelAsyncConnectionRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.ParallelAsyncConnectionRunnerConfig));
-            }
-        }
-
-        private void Run_CancellationTokenReadAsyncBenchmark()
-        {
-            if (_config.Benchmarks.CancellationTokenReadAsyncRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<CancellationTokenReadAsyncRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.CancellationTokenReadAsyncRunnerConfig));
-            }
-        }
-
-        private void Run_SequentialXmlReadBenchmark()
-        {
-            if (_config.Benchmarks.SequentialXmlReadRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<SequentialXmlReadRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.SequentialXmlReadRunnerConfig));
-            }
-        }
-
-        private void Run_JsonVsVarcharReadBenchmark()
-        {
-            if (_config.Benchmarks.JsonVsVarcharReadRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<JsonVsVarcharReadRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.JsonVsVarcharReadRunnerConfig));
-            }
-        }
-
-        private void Run_BeginTransactionBenchmark()
-        {
-            if (_config.Benchmarks.BeginTransactionRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<BeginTransactionRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.BeginTransactionRunnerConfig));
-            }
-        }
-
-        private void Run_ConnectionPoolStressBenchmark()
-        {
-            if (_config.Benchmarks.ConnectionPoolStressRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<ConnectionPoolStressRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.ConnectionPoolStressRunnerConfig));
-            }
-        }
-
-        private void Run_ConnectionPoolContentionBenchmark()
-        {
-            if (_config.Benchmarks.ConnectionPoolContentionRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<ConnectionPoolContentionRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.ConnectionPoolContentionRunnerConfig));
-            }
-        }
-
-        private void Run_ConnectionPoolChurnBenchmark()
-        {
-            if (_config.Benchmarks.ConnectionPoolChurnRunnerConfig?.Enabled == true)
-            {
-                BenchmarkRunner.Run<ConnectionPoolChurnRunner>(BenchmarkConfig.s_instance(_config.Benchmarks.ConnectionPoolChurnRunnerConfig));
-            }
-        }
-
         /// <summary>
         /// The main entry point for the performance tests program.
         /// </summary>

From 2bc207ee1dbf3dfe45aa6327e0354937ce8d1704 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 4 Aug 2026 12:48:45 -0300
Subject: [PATCH 217/298] Fix AppContext switch race in unit tests (#4495)

---
 .../ChannelDbConnectionPoolTest.cs            |  1 +
 .../ChannelDbConnectionPoolWarmupTest.cs      |  1 +
 .../WaitHandleDbConnectionPoolBudgetTest.cs   |  1 +
 ...itHandleDbConnectionPoolIdleTimeoutTest.cs |  1 +
 .../SqlClient/LocalAppContextSwitchesTest.cs  |  1 +
 .../SqlConnectionInternalTimeoutTests.cs      |  1 +
 .../SqlClient/SqlConnectionOptionsTest.cs     |  1 +
 .../ConnectionEnhancedRoutingTests.cs         |  2 +-
 .../ConnectionFailoverTests.cs                |  3 ++-
 .../ConnectionReadOnlyRoutingTests.cs         |  2 +-
 .../ConnectionRoutingTests.cs                 |  2 +-
 .../ConnectionRoutingTestsAzure.cs            |  2 +-
 .../FeatureExtAckBoundsTests.cs               |  2 +-
 .../FeatureExtensionNegotiationTests.cs       |  2 +-
 .../TdsTokenBoundsTests.cs                    |  2 +-
 .../UnitTests/TestIsolationCollections.cs     | 27 +++++++++++++++++++
 16 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/TestIsolationCollections.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 3592a3e54b..0b136fabfd 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -23,6 +23,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
     /// Unit tests for <see cref="ChannelDbConnectionPool"/> covering connection acquisition,
     /// timeouts, reuse, pool clearing, blocking-period behavior, and timeout-budget propagation.
     /// </summary>
+    [Collection(AppContextSwitchTestCollection.Name)]
     public class ChannelDbConnectionPoolTest
     {
         private static readonly SqlConnectionFactory SuccessfulConnectionFactory = new SuccessfulSqlConnectionFactory();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
index 7d2ad7347a..06a5bb16d7 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
@@ -22,6 +22,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
     /// Unit tests for background pool warmup and replenishment in
     /// <see cref="ChannelDbConnectionPool"/>. See <c>specs/003-pool-warmup/spec.md</c>.
     /// </summary>
+    [Collection(AppContextSwitchTestCollection.Name)]
     public class ChannelDbConnectionPoolWarmupTest
     {
         #region Helpers
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs
index 3688c8d772..e762c34f3f 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBudgetTest.cs
@@ -22,6 +22,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool;
 /// budget-propagation coverage already in place for
 /// <c>ChannelDbConnectionPool</c>.
 /// </summary>
+[Collection(AppContextSwitchTestCollection.Name)]
 public class WaitHandleDbConnectionPoolBudgetTest : IDisposable
 {
     private const int DefaultMaxPoolSize = 50;
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolIdleTimeoutTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolIdleTimeoutTest.cs
index 4cbc8db636..1dd20ec317 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolIdleTimeoutTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolIdleTimeoutTest.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool;
 /// Mirrors the corresponding tests in <see cref="ChannelDbConnectionPoolTest"/> so that the
 /// retrieval-side idle-expiry behavior is covered for both pool implementations.
 /// </summary>
+[Collection(AppContextSwitchTestCollection.Name)]
 public class WaitHandleDbConnectionPoolIdleTimeoutTest : IDisposable
 {
     private const int DefaultMaxPoolSize = 50;
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
index c159389bf7..ff70c17f4b 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/LocalAppContextSwitchesTest.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Data.SqlClient.UnitTests;
 /// <summary>
 /// Provides unit tests for verifying the default values of all SqlClient-specific AppContext switches.
 /// </summary>
+[Collection(AppContextSwitchTestCollection.Name)]
 public class LocalAppContextSwitchesTest
 {
     /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalTimeoutTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalTimeoutTests.cs
index acf6e27622..e39423fb56 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalTimeoutTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalTimeoutTests.cs
@@ -23,6 +23,7 @@ namespace Microsoft.Data.SqlClient.UnitTests;
 /// <see cref="SqlConnectionInternal.ResolveLoginTimeout"/> helper keeps this
 /// branch coverage free of any real network connection.
 /// </summary>
+[Collection(AppContextSwitchTestCollection.Name)]
 public class SqlConnectionInternalTimeoutTests
 {
     /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
index fb2e969dec..8b0dddae45 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
@@ -8,6 +8,7 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.Microsoft.Data.SqlClient
 {
+    [Collection(AppContextSwitchTestCollection.Name)]
     public class SqlConnectionOptionsTest : IDisposable
     {
         // Ensure we restore the original app context switch values after each
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionEnhancedRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionEnhancedRoutingTests.cs
index c85365d98e..00fabd343e 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionEnhancedRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionEnhancedRoutingTests.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
 /// </summary>
 // TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
 // need since each test uses its own TDS Server with ephemeral listen port.
-[Collection("SimulatedServerTests")]
+[Collection(SimulatedServerTestCollection.Name)]
 public class ConnectionEnhancedRoutingTests
 {
     /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index 23a77ef45d..ba1a852626 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
     // TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
     // need since each test uses its own TDS Server with ephemeral listen port.
-    [Collection("SimulatedServerTests")]
+    [Collection(SimulatedServerTestCollection.Name)]
     public class ConnectionFailoverTests
     {
         //TODO parameterize for transient errors
@@ -443,6 +443,7 @@ public void TransientFault_ShouldConnectToPrimary(uint errorCode)
                 ConnectTimeout = 30,
                 ConnectRetryInterval = 1,
                 Encrypt = false,
+                MultiSubnetFailover = false,
                 Pooling = false, // Disable pooling to ensure a fresh connection attempt is made
             };
             using SqlConnection connection = new(builder.ConnectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs
index 4675066a12..c659345fe5 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
     // TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
     // need since each test uses its own TDS Server with ephemeral listen port.
-    [Collection("SimulatedServerTests")]
+    [Collection(SimulatedServerTestCollection.Name)]
     public class ConnectionReadOnlyRoutingTests
     {
         [Fact]
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
index 935167e1cf..262770f563 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
     // TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
     // need since each test uses its own TDS Server with ephemeral listen port.
-    [Collection("SimulatedServerTests")]
+    [Collection(SimulatedServerTestCollection.Name)]
     public class ConnectionRoutingTests
     {
         [Theory]
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
index 7009c003d4..854e025b3d 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
     // TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
     // need since each test uses its own TDS Server with ephemeral listen port.
-    [Collection("SimulatedServerTests")]
+    [Collection(SimulatedServerTestCollection.Name)]
     public class ConnectionRoutingTestsAzure : IDisposable
     {
         private ADPHelper adpHelper;
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtAckBoundsTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtAckBoundsTests.cs
index 20c94c0361..4753717c98 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtAckBoundsTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtAckBoundsTests.cs
@@ -20,7 +20,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
 /// </summary>
 // TODO: Do we need this collection?  It serializes all tests within it, which we probably don't
 // need since each test uses its own TDS Server with ephemeral listen port.
-[Collection("SimulatedServerTests")]
+[Collection(SimulatedServerTestCollection.Name)]
 public class FeatureExtAckBoundsTests : IDisposable
 {
     private readonly TdsServerFixture _fixture;
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtensionNegotiationTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtensionNegotiationTests.cs
index 0141d44000..e0fb55d8c9 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtensionNegotiationTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/FeatureExtensionNegotiationTests.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
 
 // Serializes execution with other SimulatedServerTests classes to avoid port/resource conflicts.
 // Required here because IClassFixture shares a single TdsServer instance across all tests in this class.
-[Collection("SimulatedServerTests")]
+[Collection(SimulatedServerTestCollection.Name)]
 public class FeatureExtensionNegotiationTests : IClassFixture<TdsServerFixture>
 {
     private TdsServer _server;
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/TdsTokenBoundsTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/TdsTokenBoundsTests.cs
index ef975dccb3..cab3ca83db 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/TdsTokenBoundsTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/TdsTokenBoundsTests.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
 // Serializes execution with other SimulatedServerTests classes.  Required here because
 // DebugAssertSuppressor mutates the global Trace.Listeners collection, which is not
 // safe to do concurrently with other tests that may trigger Debug.Assert.
-[Collection("SimulatedServerTests")]
+[Collection(SimulatedServerTestCollection.Name)]
 public class TdsTokenBoundsTests : IDisposable
 {
     private readonly TdsServerFixture _fixture;
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/TestIsolationCollections.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/TestIsolationCollections.cs
new file mode 100644
index 0000000000..8af887ec3d
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/TestIsolationCollections.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests;
+
+/// <summary>
+/// Serializes tests that mutate process-wide cached AppContext switch values so other test
+/// collections cannot observe temporary settings.
+/// </summary>
+[CollectionDefinition(Name, DisableParallelization = true)]
+public sealed class AppContextSwitchTestCollection
+{
+    public const string Name = "AppContextSwitchTests";
+}
+
+/// <summary>
+/// Serializes simulated-server tests with all other collections because some scenarios mutate
+/// process-wide cached AppContext switch values while exercising connections.
+/// </summary>
+[CollectionDefinition(Name, DisableParallelization = true)]
+public sealed class SimulatedServerTestCollection
+{
+    public const string Name = "SimulatedServerTests";
+}

From 1faf935cf12f40dff244614da706f16f84aea80b Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 4 Aug 2026 15:57:02 -0300
Subject: [PATCH 218/298] Fix APIScan pipeline token and registered version
 (#4498)

---
 eng/pipelines/onebranch/sqlclient-non-official.yml        | 2 +-
 eng/pipelines/onebranch/sqlclient-official.yml            | 2 +-
 eng/pipelines/onebranch/variables/onebranch-variables.yml | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index 51fd924ac7..f7b9381000 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -185,7 +185,7 @@ extends:
         # Similar to the software name, we have a single version registered as well.  This has
         # nothing to do with the NuGet package version.  It is purely an APIScan registration
         # value that points to our backend configuration.
-        softwareVersion: '6.10'
+        versionNumber: $(ApiScanSoftwareVersion)
 
         # We want the standard level of logging.
         verbosityLevel: standard
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 69aeea72fb..36cafbd5f3 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -200,7 +200,7 @@ extends:
         # Similar to the software name, we have a single version registered as well.  This has
         # nothing to do with the NuGet package version.  It is purely an APIScan registration
         # value that points to our backend configuration.
-        softwareVersion: '6.10'
+        versionNumber: $(ApiScanSoftwareVersion)
 
         # We want the standard level of logging.
         verbosityLevel: standard
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index d56d95044e..fb671961cc 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -54,6 +54,11 @@ variables:
   - name: Packaging.EnableSBOMSigning
     value: true
 
+  # Keep this as a runtime variable reference in globalSdl.apiscan.versionNumber. Passing the
+  # quoted value directly through an Azure template expression perturbs '6.10' to the number 6.1.
+  - name: ApiScanSoftwareVersion
+    value: '6.10'
+
   # OneBranch supplies a variety of container images we must use for our jobs.
 
   # Windows jobs use this image.

From deabcc29ec66a78f427363fa2e61451bfc92fe8a Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Tue, 4 Aug 2026 12:09:32 -0700
Subject: [PATCH 219/298] ChannelDbConnectionPool replace connection (#4429)

* Add connection-creation rate limiting to ChannelDbConnectionPool

Introduce an optional System.Threading.RateLimiting policy that throttles new physical connection opens in the channel pool: when a permit is denied the caller waits for a returned connection instead of forcing a create, and leases are always released (including on failure) to avoid starvation. Adds NoOpAcquiredLease, wires the RateLimiting package into the product and test projects, and includes the 006-pool-rate-limiting spec. Also repairs two pre-existing build breaks in ChannelDbConnectionPoolTest (a dropped CountingSuccessfulConnectionFactory declaration and DbConnectionPoolGroupOptions calls missing the new idleTimeout argument).

* Narrow pool rate limiter to ConcurrencyLimiter

The connection pool only needs a concurrency limiter (pooling against
on-prem SQL Server), so change ChannelDbConnectionPool to take a concrete
System.Threading.RateLimiting.ConcurrencyLimiter? instead of the abstract
RateLimiter base. The limiter remains optional (null = no limiting), and
AttemptAcquire(1)/RateLimitLease usage is unchanged (both inherited).

Rework the three rate-limiter unit tests to use real ConcurrencyLimiter
instances and assert via GetStatistics() (CurrentAvailablePermits,
TotalFailedLeases) instead of the now-removed TestRateLimiter double.

Update the spec and diagram to describe a concurrency limiter specifically,
noting other limiter types can be added later if needed.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Replace rate-limit TODOs with rationale comment

Remove the two "options to consider" TODOs above the AttemptAcquire call and
replace them with a comment explaining why non-blocking fast-fail was chosen
over failing immediately or blocking on the limiter.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Remove rate-limit TODOs from AttemptAcquire call

Drop the two "options to consider" TODOs above the AttemptAcquire call. The
rationale for choosing non-blocking fast-fail lives in the PR discussion
rather than in code.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Inline leaseAcquired into lease.IsAcquired checks

Remove the redundant leaseAcquired local; read lease.IsAcquired directly in
the early-return guard and the finally-block poke condition.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Add test that successful create releases its rate-limiter lease

RateLimiter_SuccessfulCreate_ReleasesLeaseForNextCreate exercises a
single-permit ConcurrencyLimiter with two sequential opens against distinct
owners. A leaked lease on the success path would deny the second open, so
asserting both create physical connections (CreateCount == 2) guards the
release-on-success behavior at the behavioral level rather than only via the
permit counter.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Add test for lease-release wake path (FR-004)

Cover the previously untested concurrency behavior where a caller blocked
purely by rate limiting is woken by another caller's lease release (the
finally-block null poke) and then creates its own physical connection.

RateLimiter_LeaseReleaseWakesRateLimitedWaiter_CreatesPhysicalConnection is a
[Theory] over the sync and async idle-channel wait mechanisms. It uses a new
GatedSuccessfulConnectionFactory that blocks the first physical create so the
permit is held in-flight while a second caller is denied and parks on the idle
channel; releasing the gate triggers the release poke that must wake and
satisfy the waiter. Verified the test fails (waiter times out) when the poke
is disabled.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address Copilot review: OCE handling, redundant wake, docs, test disposal

- Exclude OperationCanceledException from the creation-failure catch so a
  caller's own timeout/cancellation no longer poisons the pool blocking period.
- Gate the finally idle-channel poke to non-faulted completion via a faulted
  flag, avoiding a redundant double wake on exception paths (cleanupCallback
  already writes a wake).
- Document that the pool does not own the injected ConcurrencyLimiter and never
  disposes it (caller owns its lifetime).
- Fix comment typo (rather then -> rather than) and trailing whitespace.
- Reword spec User Story 1 / FR-002 from strict FIFO to best-effort idle-channel
  wait, matching the non-blocking AttemptAcquire implementation.
- Dispose ConcurrencyLimiter instances in tests (using var) and drop the unused
  System.Collections.Generic using.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Remove instance-level ForceNewConnection property. Replace with explicit method parameters.

* Fix initialization. Add doc comments.

* Remove unnecessary internal API surface.

* Expose param.

* Address broken test and copilot comments.

* WIP

* Add unit tests.

* Wording

* improve error handling

* Address copilot comments.

* Fix malformed XML doc comment in TryOpenInner remarks

A blank line inside the <remarks> block was missing its '///' prefix,
causing CS1570 and breaking the build.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Prefer reusing an idle connection in ChannelDbConnectionPool.ReplaceConnection

ReplaceConnection now tries GetIdleConnection() before establishing a new
physical connection. When a live idle connection is available it is checked
out and activated under the old connection's ambient transaction, then the
replaced connection's slot is freed and it is disposed. This avoids an
unnecessary physical connect and keeps the reserved slot count strictly
decreasing, so the pool never exceeds MaxPoolSize.

When no idle connection is available the previous create-and-swap path is
used unchanged. In both paths the old connection is left untouched until the
replacement is activated, so a failure leaves it reusable by the caller's
reconnect retry loop.

Adds ReplaceConnection_PrefersIdleOverNewConnection and
ReplaceConnection_IdleReuse_AtMaxCapacity_FreesOldSlot unit tests.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Use named forceNewConnection arguments at literal call sites

Passing the boolean forceNewConnection flag positionally as a bare true/false
obscures intent at the call site. Name the argument at every literal call site
so the open/reconnect paths read clearly.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Return reused connection to the pool on activation failure via PrepareConnection

The idle-reuse branch of ReplaceConnection previously deactivated and removed
the reused connection if activation failed, unconditionally discarding a
connection that was healthy moments earlier. Route the failure through
ReturnInternalConnection instead so a still-healthy connection is re-pooled
and only a genuinely dead one is removed, matching the normal get path.

Since the reuse branch's check-out + activate + return-on-failure is now
identical to PrepareConnection, call PrepareConnection directly to remove the
duplication.

Adds ReplaceConnection_IdleReuse_ActivationFails_ReturnedToPool.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Condense block comments in ReplaceConnection

Trim the large explanatory comments in ReplaceConnection so they no longer
dominate the method, keeping the non-obvious rationale (slot accounting,
reuse-on-failure, never over MaxPoolSize) in a couple of lines each.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Document ReplaceConnection design rationale in one header block

Consolidate the scattered per-branch rationale in ReplaceConnection into a
single header comment explaining the two invariants that shape the method
(forward progress under pool saturation via atomic reservation handoff, and
oldConnection as the failure anchor) and why the create branch cannot delegate
to PrepareConnection. Slim the inline branch comments to short pointers so the
control flow reads cleanly.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Restore named forceNewConnection arguments at test call sites

Revert the named-to-positional reversions that crept into the TryOpenInner
call sites in SqlConnectionConcurrentOpenTests and SqlConnectionStateTransitionTests,
restoring the readable forceNewConnection: false/true form to match the rest of
the branch and the call sites on main. Also restore the accidental missing space
after the comma in the TryOpenWithRetry parameter list.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* clean up comments

* Address Copilot review: fix doc comments for ReplaceConnection

- Remove stray blank doc line that split the forceNewConnection <remarks>
  sentence into two paragraphs in generated docs.
- Correct the TestReplaceConnection summary (it no longer asserts
  NotImplementedException) and move it out of the 'Not Implemented Method
  Tests' region into a dedicated 'Replace Connection Tests' region.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address Copilot review: test summary + explicit Assert.Throws

- Add a class-level XML summary to ChannelDbConnectionPoolReplaceConnectionTest
  describing the behavior under test.
- Replace the try/catch that swallowed the expected InvalidOperationException in
  ReplaceConnection_ActivationFails_NewConnectionReturnedToPool with an explicit
  Assert.Throws, matching the sibling failure-path tests and making the intent
  fail-safe.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Respect blocking period in ReplaceConnection new-physical-connection path

The create branch of ReplaceConnection now honors the pool's blocking-period
error state (ThrowIfActive) before opening a new physical connection and clears
the backoff ramp on a successful open, mirroring OpenNewInternalConnection. Idle
reuse stays exempt, and a reconnect failure still does not enter the error state
by design, so a targeted reconnect cannot poison the pool.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Condense blocking-period comments in ReplaceConnection

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address Copilot review feedback on ReplaceConnection

- Localize the "slot could not be replaced" guard in
  ChannelDbConnectionPool.ReplaceConnection: replace the hard-coded
  InvalidOperationException with ADP.InternalError using a new
  InternalErrorCode.ConnectionSlotReplacementFailed (still an
  InvalidOperationException, so behavior is unchanged).
- Correct the TryOpenInner forceNewConnection XML remarks: the flag is
  also valid when the connection was previously opened and is now
  disconnected (the reconnect path via DbConnectionClosedPreviouslyOpened /
  DbConnectionClosedConnecting), not only when already open. Also removes a
  stray blank doc line by using <para> blocks.
- Fix the activation-failure test so its name, summary, and inline comment
  match the implementation: the new connection is disposed (never slotted)
  and the old connection is left intact, so pool count is unchanged.
- Remove unused usings (Microsoft.Data.Common,
  Microsoft.Data.Common.ConnectionString) from the ReplaceConnection tests.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Throw localized message when pool connection replacement fails

Replace the opaque ADP.InternalError(ConnectionSlotReplacementFailed) at the
ReplaceConnection !replaced guard with a localized InvalidOperationException
(SQL_ConnectionPoolReplaceConnectionFailed). Removes the now-unused
InternalErrorCode.ConnectionSlotReplacementFailed enum value.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Explain why replacement bypasses the connection-creation rate limiter

Document that the ReplaceConnection create branch intentionally skips
_connectionCreationRateLimiter: a replacement is a 1-for-1 swap (not pool
growth) and must make forward progress for an already checked-out caller's
reconnect, so the limiter's fast-fail-then-wait-for-idle contract does not apply.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Inject FakeTimeProvider in new pool tests to prevent background races

The new ReplaceConnection tests built pools on TimeProvider.System, letting
time-driven background maintenance (idle-timeout pruning, warmup/replenishment,
blocking-period expiry) advance in real time and potentially race the
assertions. Thread a frozen FakeTimeProvider through the replacement test
helper (default) and the TestReplaceConnection case so the pool clock only
moves when a test drives it.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Enter blocking-period error state on replacement open failure

Mirror WaitHandleDbConnectionPool: when the physical open of a
replacement connection fails, enter the blocking-period error state so
subsequent opens fast-fail until it expires. Activation failures are
excluded (the server proved reachable), matching the WaitHandle pool
where PrepareConnection runs outside CreateObject's error-state catch.

Adds two tests and updates the creation-failure retry test to reflect
that the failed open now enters the blocking period.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Address Paul's review feedback

- ConnectionPoolSlotsTest: move null-forgiveness to the Add() assignment
  instead of every use site; confirm the untouched occupant survives a
  failed TryReplace; add a self-replace test (benign no-op).
- SqlConnection: name all args in the Open overrides ternary; drop a
  stray blank line.
- ReplaceConnection tests: assert the replacement is not the old
  connection; assert the blocking-period throw is the same cached
  exception instance (with the factory flipped back to succeeding to
  prove the create path never ran).
- Collapse the three test factories into one TunableSqlConnectionFactory
  (FailOnCreate/FailOnActivate) and fold ActivationFailDbConnectionInternal
  into StubDbConnectionInternal, which now reads the factory's flag live
  so idle-reuse tests can toggle it after creation.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Use a single tunable factory instance member in the replace tests

xUnit constructs a fresh test-class instance per test, so the tunable
factory can be an instance field rather than being newed up in every
test.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Fix flaky blocking-period assertions in replace tests

The replace tests built pools from 'Data Source=localhost;' and relied on
the default Pool Blocking Period (Auto). Auto derives the policy from
ADP.IsAzureSqlServerEndpoint(), which reads the process-wide mutable
ADP.s_azureSqlServerEndpoints list. ConnectionRoutingTestsAzure registers
'localhost' as an Azure endpoint in its constructor and only restores the
list on dispose, and xUnit runs separate collections in parallel. A pool
constructed inside that window is treated as Azure, so the blocking-period
error state is never created and every assertion expecting ErrorOccurred
to become true fails.

Pin Pool Blocking Period=AlwaysBlock so the tests no longer depend on that
global state. This also stops the ErrorOccurred=false assertions from
passing vacuously when the error state was simply absent.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Harden remaining blocking-period tests against Azure endpoint poisoning

The simulated-server Azure routing tests register "localhost" as an Azure
endpoint in the process-wide ADP.s_azureSqlServerEndpoints list for the
duration of their class. A pool resolves whether the blocking period is
enabled exactly once, in its constructor, so any pool built inside that
window classifies localhost as Azure and silently never blocks. Tests
asserting ErrorOccurred == true therefore flake under parallel collection
execution.

Pin Pool Blocking Period=AlwaysBlock where the test needs blocking enabled
but is not testing endpoint classification, and switch the one theory that
genuinely exercises the Auto => non-Azure mapping to a data source that
cannot be poisoned.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../ConnectionPool/ChannelDbConnectionPool.cs | 100 ++-
 .../ConnectionPool/ConnectionPoolSlots.cs     |  20 +
 .../Microsoft/Data/SqlClient/SqlConnection.cs |  22 +-
 .../src/Resources/Strings.Designer.cs         |   9 +
 .../src/Resources/Strings.resx                |   3 +
 ...elDbConnectionPoolReplaceConnectionTest.cs | 736 ++++++++++++++++++
 .../ChannelDbConnectionPoolTest.cs            |  91 ++-
 .../ChannelDbConnectionPoolWarmupTest.cs      |  25 +-
 .../ConnectionPool/ConnectionPoolSlotsTest.cs | 176 +++++
 ...andleDbConnectionPoolBlockingPeriodTest.cs |  37 +-
 10 files changed, 1132 insertions(+), 87 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolReplaceConnectionTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 0b5becc0fa..3c6347da54 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -322,7 +322,99 @@ public DbConnectionInternal ReplaceConnection(
             DbConnectionInternal oldConnection,
             TimeoutTimer timeout)
         {
-            throw new NotImplementedException();
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.ReplaceConnection|RES|CPOOL> {0}, replacing connection.", Id);
+
+            // First, prefer to get an idle connection from the pool. 
+            // If one is available, we can avoid the cost of creating a new connection.
+            DbConnectionInternal? newConnection = GetIdleConnection();
+
+            if (newConnection is not null)
+            {
+                // TODO: Full transaction enlistment support (Story 2).
+                PrepareConnection(owningObject, newConnection, oldConnection.EnlistedTransaction);
+                oldConnection.DeactivateConnection();
+                RemoveConnection(oldConnection);
+            }
+            else
+            {
+                _errorState?.ThrowIfActive();
+
+                // Unlike OpenNewInternalConnection, this direct create intentionally bypasses
+                // _connectionCreationRateLimiter. This mirrors the behavior in WaitHandleDbConnectionPool.ReplaceConnection.
+                try
+                {
+                    newConnection = ConnectionFactory.CreatePooledConnection(owningObject, this, timeout);
+                }
+                catch (Exception ex) when (ADP.IsCatchableExceptionType(ex) && ex is not OperationCanceledException)
+                {
+                    // A failed physical open means the server is unreachable, so enter the blocking
+                    // period exactly as OpenNewInternalConnection and WaitHandleDbConnectionPool.CreateObject
+                    // do: subsequent opens fast-fail until the period expires. Activation failures in the
+                    // try below are intentionally excluded -- the server proved reachable -- matching the
+                    // WaitHandle pool, where PrepareConnection runs outside CreateObject's error-state catch.
+                    // We exclude OperationCanceledException (caller-side timeout/cancellation, not a physical
+                    // failure) and only enter while Running, mirroring OpenNewInternalConnection.
+                    if (State == Running)
+                    {
+                        _errorState?.Enter(ex);
+                    }
+
+                    throw;
+                }
+
+                try
+                {
+                    newConnection.ClearGeneration = _clearGeneration;
+
+                    lock (newConnection)
+                    {
+                        // PostPop requires a lock on the connection.
+                        newConnection.PostPop(owningObject);
+                    }
+
+                    // TODO: Full transaction enlistment support (Story 2).
+                    newConnection.ActivateConnection(oldConnection.EnlistedTransaction);
+
+                    // Place new into old's slot
+                    bool replaced = _connectionSlots.TryReplace(oldConnection, newConnection);
+
+                    if (!replaced)
+                    {
+                        // Should never happen (oldConnection is checked out, so its slot is stable),
+                        // but guard against vending a connection the pool isn't tracking.
+                        throw new InvalidOperationException(StringsHelper.GetString(Strings.SQL_ConnectionPoolReplaceConnectionFailed));
+                    }
+                }
+                catch
+                {
+                    try
+                    {
+                        newConnection.DeactivateConnection();
+                    }
+                    catch
+                    {
+                        // Preserve the original failure; best-effort cleanup only.
+                    }
+
+                    newConnection.Dispose();
+                    throw;
+                }
+
+                // A successful open clears the blocking period, mirroring OpenNewInternalConnection.
+                _errorState?.Clear();
+
+                // Only retire the old connection after the replacement is fully activated and we know we won't fail.
+                oldConnection.DeactivateConnection();
+                oldConnection.Dispose();
+            }
+
+            SqlClientDiagnostics.Metrics.SoftConnectRequest();
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.ReplaceConnection|RES|CPOOL> {0}, connection replaced successfully.", Id);
+
+            return newConnection;
         }
 
         /// <inheritdoc />
@@ -1023,10 +1115,11 @@ private async Task<DbConnectionInternal> GetInternalConnection(
         /// </summary>
         /// <param name="owningObject">The owning DbConnection instance.</param>
         /// <param name="connection">The DbConnectionInternal to be activated.</param>
+        /// <param name="transaction">The transaction to enlist the connection in, or null to activate cleanly.</param>
         /// <exception cref="Exception">
         /// Thrown when any exception occurs during connection activation.
         /// </exception>
-        private void PrepareConnection(DbConnection owningObject, DbConnectionInternal connection)
+        private void PrepareConnection(DbConnection owningObject, DbConnectionInternal connection, Transaction? transaction = null)
         {
             lock (connection)
             {
@@ -1036,8 +1129,7 @@ private void PrepareConnection(DbConnection owningObject, DbConnectionInternal c
 
             try
             {
-                //TODO: pass through transaction
-                connection.ActivateConnection(null);
+                connection.ActivateConnection(transaction);
             }
             catch
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs
index 55eb88f02c..c9d268fd29 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs
@@ -170,6 +170,26 @@ internal bool TryRemove(DbConnectionInternal connection)
             return false;
         }
 
+        /// <summary>
+        /// Atomically replaces an existing connection with a new one in the same slot.
+        /// The reservation count is unchanged because the slot is reused.
+        /// </summary>
+        /// <param name="oldConnection">The connection currently occupying the slot.</param>
+        /// <param name="newConnection">The connection to place into the slot.</param>
+        /// <returns>True if the old connection was found and replaced; otherwise, false.</returns>
+        internal bool TryReplace(DbConnectionInternal oldConnection, DbConnectionInternal newConnection)
+        {
+            for (int i = 0; i < _connections.Length; i++)
+            {
+                if (Interlocked.CompareExchange(ref _connections[i], newConnection, oldConnection) == oldConnection)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Attempts to reserve a spot in the collection.
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index d63571bd55..c86b30525a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -1616,7 +1616,9 @@ public void Open(SqlConnectionOverrides overrides)
                 {
                     statistics = SqlStatistics.StartTimer(Statistics);
 
-                    if (!(IsProviderRetriable ? TryOpenWithRetry(null, false, overrides) : TryOpen(null, false, overrides)))
+                    if (!(IsProviderRetriable ?
+                            TryOpenWithRetry(retry: null, forceNewConnection: false, overrides: overrides) :
+                            TryOpen(retry: null, forceNewConnection: false, overrides: overrides)))
                     {
                         throw ADP.InternalError(ADP.InternalErrorCode.SynchronousConnectReturnedPending);
                     }
@@ -2252,16 +2254,22 @@ private bool TryOpen(TaskCompletionSource<DbConnectionInternal> retry, bool forc
         /// Completes the inner open/replace operation and initializes parser state for the active inner connection.
         /// </summary>
         /// <param name="retry">Retry continuation used by async open paths.</param>
-        /// <param name="forceNewConnection">Provide true to forcibly overwrite the existing connection. Provide false if connecting for the first time.</param>
+        /// <param name="forceNewConnection">Provide <see langword="true"/> to replace the existing inner connection with a freshly established one (for example, during reconnect after a transient fault); provide <see langword="false"/> when opening for the first time.</param>
         /// <returns><see langword="true"/> when open initialization completed synchronously; otherwise <see langword="false"/>.</returns>
         /// <remarks>
         /// The inner connection is snapshotted after the open call so downstream parser access uses a single observed
         /// instance and does not rely on a second racy read of <see cref="InnerConnection"/>.
-        /// 
-        /// forceNewConnection may only be true when the connection is already open (or was open) and needs to be replaced. If the connection has never
-        /// been opened, passing true will result in an exception. It may only be false when the connection has never been opened or is
-        /// currently disconnected. If the connection is currently open, passing false will result in an exception. See SqlConnection state
-        /// transitions and subclasses for more details.
+        /// <para>
+        /// <paramref name="forceNewConnection"/> may be <see langword="true"/> when the connection is currently open, or when
+        /// it was previously opened and is now disconnected (the reconnect case handled by
+        /// <c>DbConnectionClosedPreviouslyOpened</c> and <c>DbConnectionClosedConnecting</c>). Passing <see langword="true"/>
+        /// on a connection that has never been opened will result in an exception.
+        /// </para>
+        /// <para>
+        /// <paramref name="forceNewConnection"/> may be <see langword="false"/> when the connection has never been opened or is
+        /// currently disconnected. Passing <see langword="false"/> on a connection that is already open will result in an
+        /// exception.
+        /// </para>
         /// </remarks>
         internal bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry, bool forceNewConnection)
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index 7064a6c19c..75ee7d7b82 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -3147,6 +3147,15 @@ internal static string SQL_ConnectionPoolNoEmptySlot {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Could not replace the connection because it is no longer in the connection pool..
+        /// </summary>
+        internal static string SQL_ConnectionPoolReplaceConnectionFailed {
+            get {
+                return ResourceManager.GetString("SQL_ConnectionPoolReplaceConnectionFailed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The connection pool has been shut down..
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
index e7f438873f..4d65d00a71 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>Could not find an empty slot in the connection pool.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>The connection pool has been shut down.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolReplaceConnectionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolReplaceConnectionTest.cs
new file mode 100644
index 0000000000..6df01bc1d9
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolReplaceConnectionTest.cs
@@ -0,0 +1,736 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data.Common;
+using System.Transactions;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Extensions.Time.Testing;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Unit tests for <see cref="ChannelDbConnectionPool.ReplaceConnection(System.Data.Common.DbConnection, Microsoft.Data.ProviderBase.DbConnectionInternal, Microsoft.Data.ProviderBase.TimeoutTimer)"/>,
+    /// covering idle reuse, new-connection creation, pool-slot accounting at and below capacity, and the
+    /// failure paths that keep the old connection available for the caller's reconnect retry loop.
+    /// </summary>
+    public class ChannelDbConnectionPoolReplaceConnectionTest
+    {
+        /// <summary>
+        /// The factory backing every pool built by these tests. xUnit constructs a fresh instance of
+        /// the test class for each test, so this is not shared state across tests and each test is
+        /// free to toggle its tunable flags.
+        /// </summary>
+        private readonly TunableSqlConnectionFactory _factory = new();
+
+        /// <summary>
+        /// Builds a <see cref="ChannelDbConnectionPool"/> for the replacement tests. A frozen
+        /// <see cref="FakeTimeProvider"/> is injected by default so time-driven background
+        /// maintenance (idle-timeout pruning, warmup/replenishment, blocking-period expiry)
+        /// cannot advance and race the assertions. Pass an explicit <paramref name="timeProvider"/>
+        /// only when a test needs to drive time forward deterministically.
+        /// </summary>
+        /// <remarks>
+        /// The connection string pins Pool Blocking Period to AlwaysBlock rather than relying on
+        /// the default (Auto). Auto derives the policy from ADP.IsAzureSqlServerEndpoint(DataSource),
+        /// which reads the process-wide mutable ADP.s_azureSqlServerEndpoints list. Other tests in
+        /// this assembly (e.g. ConnectionRoutingTestsAzure) register "localhost" as an Azure endpoint
+        /// for the duration of their run, and xUnit executes separate collections in parallel. Under
+        /// Auto that would classify our localhost pool as Azure, skip creating the blocking-period
+        /// error state entirely, and make every blocking-period assertion below flaky. Pinning the
+        /// policy makes these tests independent of that global state.
+        /// </remarks>
+        private ChannelDbConnectionPool ConstructPool(
+            SqlConnectionFactory connectionFactory,
+            DbConnectionPoolGroupOptions? poolGroupOptions = null,
+            TimeProvider? timeProvider = null)
+        {
+            poolGroupOptions ??= new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: 50,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 0
+            );
+            var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+                new SqlConnectionOptions("Data Source=localhost;Pool Blocking Period=AlwaysBlock;"),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                poolGroupOptions
+            );
+            return new ChannelDbConnectionPool(
+                connectionFactory,
+                dbConnectionPoolGroup,
+                DbConnectionPoolIdentity.NoIdentity,
+                new DbConnectionPoolProviderInfo(),
+                timeProvider: timeProvider ?? new FakeTimeProvider()
+            );
+        }
+
+        #region Story 1 — Transparent Replacement
+
+        /// <summary>
+        /// Verifies that <see cref="ChannelDbConnectionPool.ReplaceConnection"/> returns a
+        /// non-null connection that is a different instance from the one being replaced.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_ReturnsNewConnection()
+        {
+            // Arrange
+            var pool = ConstructPool(_factory);
+            SqlConnection owner = new();
+
+            pool.TryGetConnection(
+                owner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? oldConnection);
+
+            Assert.NotNull(oldConnection);
+
+            // Act
+            var newConnection = pool.ReplaceConnection(
+                owner,
+                oldConnection,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+
+            // Assert
+            Assert.NotNull(newConnection);
+            Assert.NotSame(oldConnection, newConnection);
+        }
+
+        /// <summary>
+        /// Verifies that after a replacement the old connection is disposed and can no longer
+        /// be pooled.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_OldConnectionIsDisposed()
+        {
+            // Arrange
+            var pool = ConstructPool(_factory);
+            SqlConnection owner = new();
+
+            pool.TryGetConnection(
+                owner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? oldConnection);
+
+            Assert.NotNull(oldConnection);
+
+            // Act
+            pool.ReplaceConnection(
+                owner,
+                oldConnection,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+
+            // Assert — the old connection should be disposed (not poolable)
+            Assert.False(oldConnection.CanBePooled);
+        }
+
+        #endregion
+
+        #region Story 3 — Pool Capacity Preservation (new physical connection path)
+
+        /// <summary>
+        /// Verifies that replacing a connection when no idle connections are available reuses
+        /// the old connection's slot so the pool's total count remains unchanged.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_NewPhysicalConnection_PoolCountUnchanged()
+        {
+            // Arrange — single connection, no idle connections available
+            var pool = ConstructPool(_factory);
+            SqlConnection owner = new();
+
+            pool.TryGetConnection(
+                owner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? oldConnection);
+
+            Assert.NotNull(oldConnection);
+            Assert.Equal(0, pool.IdleCount);
+            int countBefore = pool.Count;
+
+            // Act
+            pool.ReplaceConnection(
+                owner,
+                oldConnection,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+
+            // Assert — slot was reused, count unchanged
+            Assert.Equal(countBefore, pool.Count);
+        }
+
+        /// <summary>
+        /// Verifies that replacing a connection in a pool that is already filled to its maximum
+        /// capacity succeeds without exceeding the maximum pool size.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_AtMaxCapacity_PoolCountUnchanged()
+        {
+            // Arrange — fill pool to max capacity, no idle connections
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: 3,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 0
+            );
+            var pool = ConstructPool(_factory, poolGroupOptions);
+
+            SqlConnection owner1 = new();
+            SqlConnection owner2 = new();
+            SqlConnection owner3 = new();
+
+            pool.TryGetConnection(owner1, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn1);
+            pool.TryGetConnection(owner2, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn2);
+            pool.TryGetConnection(owner3, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn3);
+
+            Assert.Equal(3, pool.Count);
+
+            // Act — replace connection in a full pool
+            var newConnection = pool.ReplaceConnection(
+                owner1,
+                conn1!,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+
+            // Assert — pool count must not exceed max
+            Assert.NotNull(newConnection);
+            Assert.NotSame(conn1, newConnection);
+            Assert.Equal(3, pool.Count);
+        }
+
+        #endregion
+
+        #region Story 4 — Replacement Failure Propagation
+
+        /// <summary>
+        /// Verifies that when creating the replacement connection fails, the exception thrown by
+        /// the connection factory is propagated to the caller.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_CreationFails_ExceptionPropagated()
+        {
+            // Arrange — use a factory that succeeds initially then fails
+            var pool = ConstructPool(_factory);
+            SqlConnection owner = new();
+
+            pool.TryGetConnection(
+                owner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? oldConnection);
+
+            Assert.NotNull(oldConnection);
+
+            // Switch to failing mode
+            _factory.FailOnCreate = true;
+
+            // Act & Assert — exception from factory is propagated
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.ReplaceConnection(
+                    owner,
+                    oldConnection,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
+        }
+
+        /// <summary>
+        /// Verifies that when creating the replacement connection fails, the old connection is left fully
+        /// intact - it keeps its pool slot and stays poolable - so the caller's reconnect retry loop can reuse
+        /// it on a subsequent attempt. The pool count is unchanged. The failed physical open enters the
+        /// blocking-period error state (mirroring the normal acquire path and the WaitHandle pool), so the
+        /// caller's retry succeeds only once that period expires.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_CreationFails_OldConnectionRetainedForRetry()
+        {
+            // Arrange — fill the pool to capacity so a leaked or prematurely released slot would be observable.
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: 2,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 0
+            );
+            var fakeTime = new FakeTimeProvider();
+            var pool = ConstructPool(_factory, poolGroupOptions, timeProvider: fakeTime);
+
+            SqlConnection owner1 = new();
+            SqlConnection owner2 = new();
+            pool.TryGetConnection(owner1, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? oldConnection);
+            pool.TryGetConnection(owner2, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? otherConnection);
+
+            Assert.NotNull(oldConnection);
+            Assert.Equal(2, pool.Count);
+
+            // Switch to failing mode so the replacement creation throws.
+            _factory.FailOnCreate = true;
+
+            // Act — replacement fails
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.ReplaceConnection(
+                    owner1,
+                    oldConnection!,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
+
+            // Assert — the old connection is left intact so the caller can retry with it: its slot is retained
+            // (no premature release) ...
+            Assert.Equal(2, pool.Count);
+            // ... it is not doomed, so it remains usable for the retry ...
+            Assert.False(oldConnection!.IsConnectionDoomed);
+            // ... it is still owned by the same caller (not released back to the pool) ...
+            Assert.Same(owner1, oldConnection!.Owner);
+            // ... it keeps its reference to the pool, which is what enables the caller's retry ...
+            Assert.Same(pool, oldConnection!.Pool);
+            // ... and the failed physical open entered the blocking period, mirroring the normal
+            // acquire path and the WaitHandle pool, so subsequent opens fast-fail until it expires.
+            Assert.True(pool.ErrorOccurred);
+
+            // The reconnect retry loop reuses the SAME old connection. Advancing past the blocking
+            // period fires the exit timer (FakeTimeProvider invokes it synchronously), after which a
+            // subsequent successful replacement reuses the retained slot and keeps the count unchanged.
+            _factory.FailOnCreate = false;
+            fakeTime.Advance(TimeSpan.FromSeconds(5));
+            Assert.False(pool.ErrorOccurred);
+            var newConnection = pool.ReplaceConnection(
+                owner1,
+                oldConnection!,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+            Assert.NotNull(newConnection);
+            Assert.NotSame(oldConnection, newConnection);
+            Assert.Equal(2, pool.Count);
+        }
+
+        #endregion
+
+        #region Story 5 — Activation Failure Rollback
+
+        /// <summary>
+        /// Verifies that when activating the replacement connection fails, the exception is
+        /// propagated to the caller.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_ActivationFails_ExceptionPropagated()
+        {
+            // Arrange
+            var pool = ConstructPool(_factory);
+            SqlConnection owner = new();
+
+            _factory.FailOnActivate = false;
+            pool.TryGetConnection(
+                owner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? oldConnection);
+
+            Assert.NotNull(oldConnection);
+
+            // Now make activation fail for the replacement
+            _factory.FailOnActivate = true;
+
+            // Act & Assert
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.ReplaceConnection(
+                    owner,
+                    oldConnection,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
+        }
+
+        /// <summary>
+        /// Verifies that when activating the replacement connection fails, the newly created
+        /// connection is disposed (never taking a pool slot) and the old connection is left intact,
+        /// so the pool's physical connection count is unchanged and nothing is leaked.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_ActivationFails_NewConnectionDisposed_PoolCountStable()
+        {
+            // Arrange
+            var pool = ConstructPool(_factory);
+            SqlConnection owner = new();
+
+            _factory.FailOnActivate = false;
+            pool.TryGetConnection(
+                owner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? oldConnection);
+
+            Assert.NotNull(oldConnection);
+            int countBefore = pool.Count;
+
+            // Make activation fail
+            _factory.FailOnActivate = true;
+
+            // Act
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.ReplaceConnection(
+                    owner,
+                    oldConnection,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
+
+            // Assert — the new connection never took a slot and is disposed on the failure path,
+            // while the old connection is left in place for the caller's reconnect retry loop, so
+            // the pool's physical connection count is unchanged (nothing leaked).
+            Assert.Equal(countBefore, pool.Count);
+        }
+
+        #endregion
+
+        #region Story 6 — Prefer Idle Connection Reuse
+
+        /// <summary>
+        /// Verifies that when a live idle connection is available, replacement reuses it instead of
+        /// establishing a new physical connection. The reused connection keeps its own pool slot and
+        /// the replaced connection's slot is freed, so the pool's physical connection count drops by
+        /// one and never exceeds the maximum.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_PrefersIdleOverNewConnection()
+        {
+            // Arrange — open two connections, then return one so it becomes an idle connection.
+            var pool = ConstructPool(_factory);
+            SqlConnection owner1 = new();
+            SqlConnection owner2 = new();
+
+            pool.TryGetConnection(owner1, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn1);
+            pool.TryGetConnection(owner2, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn2);
+            Assert.NotNull(conn1);
+            Assert.NotNull(conn2);
+
+            pool.ReturnInternalConnection(conn2!, owner2);
+            Assert.Equal(1, pool.IdleCount);
+            Assert.Equal(2, pool.Count);
+
+            // Act — replace conn1. The idle conn2 should be reused rather than creating a new connection.
+            var newConnection = pool.ReplaceConnection(
+                owner1,
+                conn1!,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+
+            // Assert — the replacement is the previously idle connection ...
+            Assert.Same(conn2, newConnection);
+            // ... the idle channel was drained ...
+            Assert.Equal(0, pool.IdleCount);
+            // ... the replaced connection was disposed ...
+            Assert.False(conn1!.CanBePooled);
+            // ... and its slot was freed, so the pool now holds a single physical connection.
+            Assert.Equal(1, pool.Count);
+        }
+
+        /// <summary>
+        /// Verifies that reusing an idle connection while the pool is at maximum capacity succeeds and
+        /// frees the replaced connection's slot, so the pool count never exceeds the maximum.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_IdleReuse_AtMaxCapacity_FreesOldSlot()
+        {
+            // Arrange — fill the pool to max capacity, then return one connection so it is idle.
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: 3,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 0
+            );
+            var pool = ConstructPool(_factory, poolGroupOptions);
+
+            SqlConnection owner1 = new();
+            SqlConnection owner2 = new();
+            SqlConnection owner3 = new();
+
+            pool.TryGetConnection(owner1, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn1);
+            pool.TryGetConnection(owner2, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn2);
+            pool.TryGetConnection(owner3, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn3);
+            Assert.Equal(3, pool.Count);
+
+            pool.ReturnInternalConnection(conn3!, owner3);
+            Assert.Equal(1, pool.IdleCount);
+            Assert.Equal(3, pool.Count);
+
+            // Act — replace conn1 while at max capacity; the idle conn3 should be reused.
+            var newConnection = pool.ReplaceConnection(
+                owner1,
+                conn1!,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+
+            // Assert — the idle connection was reused and conn1's slot was freed, dropping below max.
+            Assert.Same(conn3, newConnection);
+            Assert.Equal(0, pool.IdleCount);
+            Assert.Equal(2, pool.Count);
+        }
+
+        /// <summary>
+        /// Verifies that when activating a reused idle connection fails, the connection is returned to
+        /// the pool (not leaked or discarded) and the connection being replaced is left untouched, so
+        /// the caller's reconnect retry loop can try again.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_IdleReuse_ActivationFails_ReturnedToPool()
+        {
+            // Arrange — open two connections, then return one so it becomes an idle connection.
+            var pool = ConstructPool(_factory);
+            SqlConnection owner1 = new();
+            SqlConnection owner2 = new();
+
+            _factory.FailOnActivate = false;
+            pool.TryGetConnection(owner1, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn1);
+            pool.TryGetConnection(owner2, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn2);
+            Assert.NotNull(conn1);
+            Assert.NotNull(conn2);
+
+            pool.ReturnInternalConnection(conn2!, owner2);
+            Assert.Equal(1, pool.IdleCount);
+            Assert.Equal(2, pool.Count);
+
+            // Make the idle-reuse activation fail.
+            _factory.FailOnActivate = true;
+
+            // Act — ReplaceConnection pulls the idle conn2 and fails to activate it.
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.ReplaceConnection(
+                    owner1,
+                    conn1!,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
+
+            // Assert — the reused connection was returned to the idle pool (not leaked or discarded) ...
+            Assert.Equal(1, pool.IdleCount);
+            // ... nothing was removed, so both connections still hold their slots ...
+            Assert.Equal(2, pool.Count);
+            // ... and the connection being replaced was left untouched and still healthy.
+            Assert.False(conn1!.IsConnectionDoomed);
+        }
+
+        #endregion
+
+        #region Story 7 — New Physical Connection Fallback
+
+        /// <summary>
+        /// Verifies that when no idle connection is available, replacement creates a new
+        /// physical connection distinct from the one being replaced.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_NoIdleConnection_CreatesNew()
+        {
+            // Arrange
+            var pool = ConstructPool(_factory);
+            SqlConnection owner = new();
+
+            pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? conn1);
+            Assert.NotNull(conn1);
+            Assert.Equal(0, pool.IdleCount);
+
+            // Act — no idle connections available, should create new
+            var newConnection = pool.ReplaceConnection(
+                owner,
+                conn1,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+
+            // Assert
+            Assert.NotNull(newConnection);
+            Assert.NotSame(conn1, newConnection);
+            Assert.Equal(1, pool.Count);
+        }
+
+        #endregion
+
+        #region Blocking Period
+
+        /// <summary>
+        /// Verifies that the new-physical-connection branch of
+        /// <see cref="ChannelDbConnectionPool.ReplaceConnection"/> respects the pool's blocking period:
+        /// while the pool is in the blocking-period error state it fast-fails with the cached exception
+        /// instead of opening another physical connection, and it leaves the old connection intact for
+        /// the caller's reconnect retry. Idle reuse is intentionally exempt, matching the normal acquire path.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_NewPhysicalConnection_RespectsBlockingPeriod()
+        {
+            // Arrange — ConstructPool pins Pool Blocking Period=AlwaysBlock, so the blocking period is enabled.
+            var pool = ConstructPool(_factory);
+            SqlConnection owner = new();
+
+            // Check out a connection to later replace (creation succeeds).
+            _factory.FailOnCreate = false;
+            pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? oldConnection);
+            Assert.NotNull(oldConnection);
+
+            // Drive the pool into the blocking-period error state with a failed physical create.
+            _factory.FailOnCreate = true;
+            var originalException = Assert.Throws<InvalidOperationException>(() =>
+                pool.TryGetConnection(new SqlConnection(), null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _));
+            Assert.True(pool.ErrorOccurred);
+
+            // Act & Assert — a replacement that must open a new physical connection (no idle available)
+            // fast-fails during the blocking period rather than hammering the unhealthy server.
+            // Flipping the factory back to succeeding proves the create path was never reached: the
+            // throw can only be the cached exception, which ThrowIfActive rethrows as-is for
+            // non-SqlException types, so it is the very same instance captured above.
+            _factory.FailOnCreate = false;
+            var replaceException = Assert.Throws<InvalidOperationException>(() =>
+                pool.ReplaceConnection(owner, oldConnection!, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
+            Assert.Same(originalException, replaceException);
+
+            // The pool is still blocking and the old connection is untouched, so the caller can retry with it.
+            Assert.True(pool.ErrorOccurred);
+            Assert.False(oldConnection!.IsConnectionDoomed);
+            Assert.Same(pool, oldConnection!.Pool);
+        }
+
+        /// <summary>
+        /// Verifies that when the new-physical-connection branch of
+        /// <see cref="ChannelDbConnectionPool.ReplaceConnection"/> fails to open (server unreachable),
+        /// the pool enters the blocking-period error state, mirroring the normal acquire path
+        /// (OpenNewInternalConnection) and the legacy WaitHandle pool's CreateObject. This lets
+        /// subsequent opens fast-fail instead of hammering the unhealthy server, while the old
+        /// connection is left intact for the caller's reconnect retry loop.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_NewPhysicalConnectionFails_EntersBlockingPeriod()
+        {
+            // Arrange — ConstructPool pins Pool Blocking Period=AlwaysBlock, so the blocking period is enabled.
+            var pool = ConstructPool(_factory);
+            SqlConnection owner = new();
+
+            // Check out a connection to later replace (creation succeeds), leaving no idle connection
+            // so the replacement is forced down the new-physical-connection branch.
+            _factory.FailOnCreate = false;
+            pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? oldConnection);
+            Assert.NotNull(oldConnection);
+            Assert.False(pool.ErrorOccurred);
+
+            // Act — the replacement's physical open fails.
+            _factory.FailOnCreate = true;
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.ReplaceConnection(owner, oldConnection!, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
+
+            // Assert — the failed open poisoned the pool into the blocking period, and the old
+            // connection is left intact so the caller can retry with it.
+            Assert.True(pool.ErrorOccurred);
+            Assert.False(oldConnection!.IsConnectionDoomed);
+            Assert.Same(pool, oldConnection!.Pool);
+        }
+
+        /// <summary>
+        /// Verifies that when a replacement's physical open succeeds but activation fails, the pool
+        /// does NOT enter the blocking-period error state. A reachable server that fails activation
+        /// is not a connectivity failure, so poisoning the pool would be wrong. This mirrors the
+        /// legacy WaitHandle pool, where PrepareConnection (activation) runs outside CreateObject's
+        /// error-state catch.
+        /// </summary>
+        [Fact]
+        public void ReplaceConnection_ActivationFails_DoesNotEnterBlockingPeriod()
+        {
+            // Arrange
+            var pool = ConstructPool(_factory);
+            SqlConnection owner = new();
+
+            _factory.FailOnActivate = false;
+            pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? oldConnection);
+            Assert.NotNull(oldConnection);
+            Assert.False(pool.ErrorOccurred);
+
+            // Act — the replacement opens successfully but fails during activation.
+            _factory.FailOnActivate = true;
+            Assert.Throws<InvalidOperationException>(() =>
+                pool.ReplaceConnection(owner, oldConnection!, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
+
+            // Assert — activation failure does not poison the pool: the server proved reachable.
+            Assert.False(pool.ErrorOccurred);
+        }
+
+        #endregion
+
+        #region Test Helper Classes
+
+        /// <summary>
+        /// A single tunable connection factory used by all tests in this class. Set
+        /// <see cref="FailOnCreate"/> to simulate a failed physical open, and
+        /// <see cref="FailOnActivate"/> to simulate a connection that opens but fails activation.
+        /// Connections read <see cref="FailOnActivate"/> live at activation time, so it can be
+        /// toggled after a connection has been created (as idle-reuse tests require).
+        /// </summary>
+        internal class TunableSqlConnectionFactory : SqlConnectionFactory
+        {
+            /// <summary>When true, <see cref="CreateConnection"/> throws instead of returning a connection.</summary>
+            internal bool FailOnCreate { get; set; }
+
+            /// <summary>When true, activating any connection from this factory throws.</summary>
+            internal bool FailOnActivate { get; set; }
+
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+            {
+                if (FailOnCreate)
+                {
+                    throw new InvalidOperationException("Simulated connection failure");
+                }
+
+                return new StubDbConnectionInternal(this);
+            }
+        }
+
+        /// <summary>
+        /// A minimal <see cref="DbConnectionInternal"/> stub whose activation behaviour is driven by
+        /// the <see cref="TunableSqlConnectionFactory"/> that created it. The flag is read live so a
+        /// test can make activation fail on a connection that was created earlier.
+        /// </summary>
+        internal class StubDbConnectionInternal : DbConnectionInternal
+        {
+            private readonly TunableSqlConnectionFactory? _factory;
+
+            internal StubDbConnectionInternal(TunableSqlConnectionFactory? factory = null)
+            {
+                _factory = factory;
+            }
+
+            public override string ServerVersion => throw new NotImplementedException();
+
+            public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
+            {
+                throw new NotImplementedException();
+            }
+
+            public override void EnlistTransaction(Transaction transaction)
+            {
+                return;
+            }
+
+            protected override void Activate(Transaction transaction)
+            {
+                if (_factory?.FailOnActivate == true)
+                {
+                    throw new InvalidOperationException("Simulated activation failure");
+                }
+            }
+
+            protected override void Deactivate()
+            {
+                return;
+            }
+
+            internal override void ResetConnection()
+            {
+                return;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 0b136fabfd..b3c9815eb8 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -859,34 +859,49 @@ public void TestUseLoadBalancing()
 
         #endregion
 
-        #region Not Implemented Method Tests
+        #region Replace Connection Tests
 
         /// <summary>
-        /// Verifies that <see cref="ChannelDbConnectionPool.PutObjectFromTransactedPool"/> remains
-        /// unimplemented and throws <see cref="NotImplementedException"/>.
+        /// Verifies that <see cref="ChannelDbConnectionPool.ReplaceConnection(System.Data.Common.DbConnection, Microsoft.Data.ProviderBase.DbConnectionInternal, Microsoft.Data.ProviderBase.TimeoutTimer)"/>
+        /// replaces a checked-out connection with a new, distinct connection instance.
         /// </summary>
         [Fact]
-        public void TestPutObjectFromTransactedPool()
+        public void TestReplaceConnection()
         {
             // Arrange
-            var pool = ConstructPool(SuccessfulConnectionFactory);
+            var fakeTime = new FakeTimeProvider();
+            var pool = ConstructPool(SuccessfulConnectionFactory, timeProvider: fakeTime);
+            SqlConnection owner = new();
 
-            // Act & Assert
-            Assert.Throws<NotImplementedException>(() => pool.PutObjectFromTransactedPool(null!));
+            pool.TryGetConnection(
+                owner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? oldConnection);
+
+            Assert.NotNull(oldConnection);
+
+            var newConnection = pool.ReplaceConnection(owner, oldConnection, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+            Assert.NotNull(newConnection);
+            Assert.NotSame(oldConnection, newConnection);
         }
 
+        #endregion
+
+        #region Not Implemented Method Tests
+
         /// <summary>
-        /// Verifies that <see cref="ChannelDbConnectionPool.ReplaceConnection(System.Data.Common.DbConnection, Microsoft.Data.ProviderBase.DbConnectionInternal, Microsoft.Data.ProviderBase.TimeoutTimer)"/>
-        /// remains unimplemented and throws <see cref="NotImplementedException"/>.
+        /// Verifies that <see cref="ChannelDbConnectionPool.PutObjectFromTransactedPool"/> remains
+        /// unimplemented and throws <see cref="NotImplementedException"/>.
         /// </summary>
         [Fact]
-        public void TestReplaceConnection()
+        public void TestPutObjectFromTransactedPool()
         {
             // Arrange
             var pool = ConstructPool(SuccessfulConnectionFactory);
 
             // Act & Assert
-            Assert.Throws<NotImplementedException>(() => pool.ReplaceConnection(null!, null!, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15))));
+            Assert.Throws<NotImplementedException>(() => pool.PutObjectFromTransactedPool(null!));
         }
 
         /// <summary>
@@ -1616,16 +1631,21 @@ public void Constructor_WithValidSmallPoolSizes_WorksCorrectly()
         /// Verifies that a connection creation failure enters the blocking-period error state when
         /// blocking is enabled for the pool, and stays out of it when blocking is disabled. The
         /// blocking policy is driven by the connection string's Pool Blocking Period:
-        /// Default/Auto enable blocking for a non-Azure host (localhost), AlwaysBlock forces it on,
+        /// Default/Auto enable blocking for a non-Azure host, AlwaysBlock forces it on,
         /// and NeverBlock suppresses it. FR-006, FR-007.
         /// </summary>
-        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
-        // builds across multiple jobs with Assert Expected:True/Actual:False in <2ms): the
-        // assertion races the background warmup/replenishment work added in #4452 before the
-        // pool's error-state transition is observable. Not a defect in this PR.
-        [Trait("Category", "flaky")]
+        /// <remarks>
+        /// The Auto cases here assert the real Auto => "not an Azure endpoint" => blocking mapping,
+        /// so they cannot pin Pool Blocking Period to sidestep endpoint classification. They
+        /// deliberately avoid the data source "localhost": ADPHelper (used by the simulated-server
+        /// Azure routing tests) temporarily registers "localhost" as an Azure endpoint in the
+        /// process-wide ADP.s_azureSqlServerEndpoints list. Because a pool decides whether blocking
+        /// is enabled exactly once, in its constructor, a pool built inside that window would
+        /// classify localhost as Azure and never block, making these assertions flaky under
+        /// parallel collection execution.
+        /// </remarks>
         [Theory]
-        [InlineData("", true)]                                // Default (unspecified) => Auto => blocks for localhost
+        [InlineData("", true)]                                // Default (unspecified) => Auto => blocks for non-Azure host
         [InlineData("Pool Blocking Period=Auto;", true)]      // Auto => blocks for non-Azure host
         [InlineData("Pool Blocking Period=NeverBlock;", false)]
         [InlineData("Pool Blocking Period=AlwaysBlock;", true)]
@@ -1633,7 +1653,7 @@ public void ErrorOccurred_OnFailure_FollowsBlockingPeriod(string blockingPeriodC
         {
             // Arrange
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
-                new SqlConnectionOptions($"Data Source=localhost;{blockingPeriodClause}"),
+                new SqlConnectionOptions($"Data Source=non-azure-test-host;{blockingPeriodClause}"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 new DbConnectionPoolGroupOptions(
                     poolByIdentity: false,
@@ -1659,17 +1679,19 @@ public void ErrorOccurred_OnFailure_FollowsBlockingPeriod(string blockingPeriodC
         /// Verifies that once the pool enters the blocking period, subsequent synchronous requests
         /// fail fast with the cached exception without attempting another physical open.
         /// </summary>
-        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
-        // builds): races the background warmup/replenishment work added in #4452 before the
-        // pool's error-state transition is observable. Not a defect in this PR.
-        [Trait("Category", "flaky")]
+        /// <remarks>
+        /// Pins Pool Blocking Period to AlwaysBlock: this test needs blocking enabled but is not
+        /// testing endpoint classification, and leaving it on Auto would make it depend on
+        /// "localhost" not being registered as an Azure endpoint by a concurrently running test
+        /// (see ErrorOccurred_OnFailure_FollowsBlockingPeriod for the full explanation).
+        /// </remarks>
         [Fact]
         public void ErrorOccurred_BlockingEnabled_SubsequentRequestFastFails()
         {
             // Arrange
             var factory = new CountingTimeoutConnectionFactory();
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
-                new SqlConnectionOptions("Data Source=localhost;"),
+                new SqlConnectionOptions("Data Source=localhost;Pool Blocking Period=AlwaysBlock;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 new DbConnectionPoolGroupOptions(
                     poolByIdentity: false,
@@ -1703,16 +1725,16 @@ public void ErrorOccurred_BlockingEnabled_SubsequentRequestFastFails()
         /// Verifies that clearing the pool while in the blocking-period error state resets the
         /// externally visible error indicator.
         /// </summary>
-        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
-        // builds): races the background warmup/replenishment work added in #4452 before the
-        // pool's error-state transition is observable. Not a defect in this PR.
-        [Trait("Category", "flaky")]
+        /// <remarks>
+        /// Pins Pool Blocking Period to AlwaysBlock so entering the error state does not depend on
+        /// endpoint classification. See ErrorOccurred_OnFailure_FollowsBlockingPeriod.
+        /// </remarks>
         [Fact]
         public void Clear_InErrorState_ResetsErrorOccurred()
         {
             // Arrange
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
-                new SqlConnectionOptions("Data Source=localhost;"),
+                new SqlConnectionOptions("Data Source=localhost;Pool Blocking Period=AlwaysBlock;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 new DbConnectionPoolGroupOptions(
                     poolByIdentity: false,
@@ -1743,10 +1765,10 @@ public void Clear_InErrorState_ResetsErrorOccurred()
         /// <see cref="FakeTimeProvider"/> so the test is deterministic and does not wait on
         /// wall-clock time. FR-006, FR-009.
         /// </summary>
-        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
-        // builds): races the background warmup/replenishment work added in #4452 before the
-        // pool's error-state transition is observable. Not a defect in this PR.
-        [Trait("Category", "flaky")]
+        /// <remarks>
+        /// Pins Pool Blocking Period to AlwaysBlock so entering the error state does not depend on
+        /// endpoint classification. See ErrorOccurred_OnFailure_FollowsBlockingPeriod.
+        /// </remarks>
         [Fact]
         public void Failure_ThenBlockingPeriodExpiry_AllowsSuccessfulCreate()
         {
@@ -1754,7 +1776,7 @@ public void Failure_ThenBlockingPeriodExpiry_AllowsSuccessfulCreate()
             var factory = new ToggleFailureConnectionFactory();
             var fakeTime = new FakeTimeProvider();
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
-                new SqlConnectionOptions("Data Source=localhost;"),
+                new SqlConnectionOptions("Data Source=localhost;Pool Blocking Period=AlwaysBlock;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 new DbConnectionPoolGroupOptions(
                     poolByIdentity: false,
@@ -2387,3 +2409,4 @@ public void GetConnection_TimeoutTimerReflectsPoolWaitTime()
         #endregion
     }
 }
+
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
index 06a5bb16d7..8def579790 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolWarmupTest.cs
@@ -46,7 +46,15 @@ private static ChannelDbConnectionPool ConstructPool(
                 idleTimeout: idleTimeout);
 
             var dbConnectionPoolGroup = new DbConnectionPoolGroup(
-                new SqlConnectionOptions("Data Source=localhost;"),
+                // Pool Blocking Period is pinned to AlwaysBlock so the tests that assert the pool
+                // enters its blocking-period error state do not depend on endpoint classification.
+                // Under Auto, blocking is enabled only when the data source is not an Azure
+                // endpoint, and ADPHelper (used by the simulated-server Azure routing tests)
+                // temporarily registers "localhost" as an Azure endpoint in the process-wide
+                // ADP.s_azureSqlServerEndpoints list. A pool evaluates blocking exactly once, in its
+                // constructor, so a pool built inside that window would never block - making those
+                // assertions flaky under parallel collection execution.
+                new SqlConnectionOptions("Data Source=localhost;Pool Blocking Period=AlwaysBlock;"),
                 new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
                 poolGroupOptions);
 
@@ -335,11 +343,6 @@ public async Task Warmup_RateLimiterSaturated_UserSharesSameLimiter()
         /// does enter the pool's blocking-period error state. Warmup then stops the pass rather than
         /// spinning on the persistent failure.
         /// </summary>
-        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
-        // builds): the background warmup thread added in #4452 races the assertion so the
-        // pool's error-state transition is observed late (Assert Expected:True/Actual:False).
-        // Not a defect in this PR.
-        [Trait("Category", "flaky")]
         [Fact]
         public async Task Warmup_AllCreationsFail_AbsorbedAndEntersErrorState()
         {
@@ -371,11 +374,6 @@ public async Task Warmup_AllCreationsFail_AbsorbedAndEntersErrorState()
         /// exception rather than attempting a fresh on-demand open. The pool remains operational and
         /// resumes creating on demand once the blocking period expires.
         /// </summary>
-        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
-        // builds): the background warmup thread added in #4452 races the assertion so the
-        // pool's error-state transition is observed late (Assert Expected:True/Actual:False).
-        // Not a defect in this PR.
-        [Trait("Category", "flaky")]
         [Fact]
         public async Task Warmup_Fails_UserRequestFastFailsDuringBlockingPeriod()
         {
@@ -401,11 +399,6 @@ public async Task Warmup_Fails_UserRequestFastFailsDuringBlockingPeriod()
         /// request (rather than warmup itself) keeps the two behaviors independent, and awaiting the
         /// warmup task makes the stand-down deterministic.
         /// </summary>
-        // Flaky under CI load only (passes locally 3/3 and on main CI; fails on PR merge
-        // builds): the background warmup thread added in #4452 races the assertion so the
-        // pool's error-state transition is observed late (Assert Expected:True/Actual:False).
-        // Not a defect in this PR.
-        [Trait("Category", "flaky")]
         [Fact]
         public async Task Warmup_RespectsErrorState_StandsDownWhileBlocking()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs
index 28e59e7a5d..53390068fb 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs
@@ -483,5 +483,181 @@ public void Constructor_EdgeCase_CapacityOfOne_WorksCorrectly()
             Assert.Null(connection2);
             Assert.Equal(1, poolSlots.ReservationCount);
         }
+
+        /// <summary>
+        /// Verifies that replacing an existing connection returns <see langword="true"/> and leaves
+        /// the reservation count unchanged, since the replacement reuses the same slot.
+        /// </summary>
+        [Fact]
+        public void TryReplace_ExistingConnection_ReturnsTrueAndKeepsReservationCount()
+        {
+            // Arrange
+            var poolSlots = new ConnectionPoolSlots(5);
+            var oldConnection = poolSlots.Add(
+                createCallback: () => new MockDbConnectionInternal(),
+                cleanupCallback: (conn) => { })!;
+            var newConnection = new MockDbConnectionInternal();
+            var reservationCountBeforeReplace = poolSlots.ReservationCount;
+
+            // Act
+            var replaced = poolSlots.TryReplace(oldConnection, newConnection);
+
+            // Assert - the slot is reused, so the reservation count is unchanged
+            Assert.True(replaced);
+            Assert.Equal(1, reservationCountBeforeReplace);
+            Assert.Equal(1, poolSlots.ReservationCount);
+        }
+
+        /// <summary>
+        /// Verifies that after a successful replace, the new connection occupies the slot (and can
+        /// be removed) while the old connection is no longer present in the collection.
+        /// </summary>
+        [Fact]
+        public void TryReplace_ExistingConnection_NewConnectionOccupiesSlot()
+        {
+            // Arrange
+            var poolSlots = new ConnectionPoolSlots(5);
+            var oldConnection = poolSlots.Add(
+                createCallback: () => new MockDbConnectionInternal(),
+                cleanupCallback: (conn) => { })!;
+            var newConnection = new MockDbConnectionInternal();
+
+            // Act
+            poolSlots.TryReplace(oldConnection, newConnection);
+
+            // Assert - the new connection now occupies the slot and can be removed,
+            // while the old connection is no longer present.
+            Assert.False(poolSlots.TryRemove(oldConnection));
+            Assert.True(poolSlots.TryRemove(newConnection));
+            Assert.Equal(0, poolSlots.ReservationCount);
+        }
+
+        /// <summary>
+        /// Verifies that attempting to replace a connection that is not in the collection returns
+        /// <see langword="false"/>, does not change the reservation count, and does not insert the
+        /// new connection.
+        /// </summary>
+        [Fact]
+        public void TryReplace_NonExistentConnection_ReturnsFalseAndDoesNotAddNewConnection()
+        {
+            // Arrange
+            var poolSlots = new ConnectionPoolSlots(5);
+            var existingConnection = poolSlots.Add(
+                createCallback: () => new MockDbConnectionInternal(),
+                cleanupCallback: (conn) => { })!;
+            var missingConnection = new MockDbConnectionInternal();
+            var newConnection = new MockDbConnectionInternal();
+            var reservationCountBeforeReplace = poolSlots.ReservationCount;
+
+            // Act
+            var replaced = poolSlots.TryReplace(missingConnection, newConnection);
+
+            // Assert - nothing was replaced and the new connection was not inserted
+            Assert.False(replaced);
+            Assert.Equal(1, reservationCountBeforeReplace);
+            Assert.Equal(1, poolSlots.ReservationCount);
+            Assert.False(poolSlots.TryRemove(newConnection));
+            // The occupant of the slot was left untouched, so it is still removable.
+            Assert.True(poolSlots.TryRemove(existingConnection));
+        }
+
+        /// <summary>
+        /// Verifies that replacing a connection with itself is a benign no-op: it reports success,
+        /// leaves the connection in its slot, and does not change the reservation count.
+        /// </summary>
+        [Fact]
+        public void TryReplace_SameConnection_ReturnsTrueAndLeavesConnectionInSlot()
+        {
+            // Arrange
+            var poolSlots = new ConnectionPoolSlots(5);
+            var connection = poolSlots.Add(
+                createCallback: () => new MockDbConnectionInternal(),
+                cleanupCallback: (conn) => { })!;
+
+            // Act - replace the connection with itself
+            var replaced = poolSlots.TryReplace(connection, connection);
+
+            // Assert - the slot still holds the same connection and the count is unchanged
+            Assert.True(replaced);
+            Assert.Equal(1, poolSlots.ReservationCount);
+            Assert.True(poolSlots.TryRemove(connection));
+            Assert.Equal(0, poolSlots.ReservationCount);
+        }
+
+        /// <summary>
+        /// Verifies that replacing a connection in an empty collection returns <see langword="false"/>
+        /// and leaves the reservation count at zero.
+        /// </summary>
+        [Fact]
+        public void TryReplace_EmptyCollection_ReturnsFalse()
+        {
+            // Arrange
+            var poolSlots = new ConnectionPoolSlots(5);
+            var oldConnection = new MockDbConnectionInternal();
+            var newConnection = new MockDbConnectionInternal();
+
+            // Act
+            var replaced = poolSlots.TryReplace(oldConnection, newConnection);
+
+            // Assert
+            Assert.False(replaced);
+            Assert.Equal(0, poolSlots.ReservationCount);
+        }
+
+        /// <summary>
+        /// Verifies that when multiple connections are present, replace swaps only the targeted
+        /// connection and leaves the others untouched.
+        /// </summary>
+        [Fact]
+        public void TryReplace_MultipleConnections_ReplacesOnlyTargetConnection()
+        {
+            // Arrange
+            var poolSlots = new ConnectionPoolSlots(5);
+            var connection1 = poolSlots.Add(
+                createCallback: () => new MockDbConnectionInternal(),
+                cleanupCallback: (conn) => { });
+            var connection2 = poolSlots.Add(
+                createCallback: () => new MockDbConnectionInternal(),
+                cleanupCallback: (conn) => { });
+            var newConnection = new MockDbConnectionInternal();
+
+            // Act - replace only connection2
+            var replaced = poolSlots.TryReplace(connection2!, newConnection);
+
+            // Assert - the untouched connection remains, the target was swapped out
+            Assert.True(replaced);
+            Assert.Equal(2, poolSlots.ReservationCount);
+            Assert.True(poolSlots.TryRemove(connection1!));
+            Assert.False(poolSlots.TryRemove(connection2!));
+            Assert.True(poolSlots.TryRemove(newConnection));
+            Assert.Equal(0, poolSlots.ReservationCount);
+        }
+
+        /// <summary>
+        /// Verifies that replacing the same connection twice succeeds on the first attempt but
+        /// fails on the second, because the original connection is no longer in the slot.
+        /// </summary>
+        [Fact]
+        public void TryReplace_SameConnectionTwice_ReturnsFalseOnSecondAttempt()
+        {
+            // Arrange
+            var poolSlots = new ConnectionPoolSlots(5);
+            var oldConnection = poolSlots.Add(
+                createCallback: () => new MockDbConnectionInternal(),
+                cleanupCallback: (conn) => { });
+            var newConnection = new MockDbConnectionInternal();
+            var newerConnection = new MockDbConnectionInternal();
+
+            // Act
+            var firstReplace = poolSlots.TryReplace(oldConnection!, newConnection);
+            var secondReplace = poolSlots.TryReplace(oldConnection!, newerConnection);
+
+            // Assert - the old connection is gone after the first replace, so the second fails
+            Assert.True(firstReplace);
+            Assert.False(secondReplace);
+            Assert.Equal(1, poolSlots.ReservationCount);
+            Assert.True(poolSlots.TryRemove(newConnection));
+            Assert.False(poolSlots.TryRemove(newerConnection));
+        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs
index 0197d62292..c5d628c618 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolBlockingPeriodTest.cs
@@ -52,9 +52,19 @@ public void Dispose()
     /// <see cref="BlockingPeriodErrorState"/> uses it as its clock so the exit timer can be driven
     /// deterministically; otherwise the system clock is used.
     /// </summary>
+    /// <remarks>
+    /// The default connection string pins Pool Blocking Period to AlwaysBlock so the tests that
+    /// assert the pool enters its blocking-period error state do not depend on endpoint
+    /// classification. Under Auto, blocking is enabled only when the data source is not an Azure
+    /// endpoint, and ADPHelper (used by the simulated-server Azure routing tests) temporarily
+    /// registers "localhost" as an Azure endpoint in the process-wide
+    /// ADP.s_azureSqlServerEndpoints list. A pool resolves whether blocking is enabled exactly
+    /// once, at construction, so a pool built inside that window would never block - making those
+    /// assertions flaky under parallel collection execution.
+    /// </remarks>
     private WaitHandleDbConnectionPool CreatePool(
         SqlConnectionFactory connectionFactory,
-        string connectionString = "Data Source=localhost;",
+        string connectionString = "Data Source=localhost;Pool Blocking Period=AlwaysBlock;",
         TimeProvider? timeProvider = null)
     {
         var poolGroupOptions = new DbConnectionPoolGroupOptions(
@@ -101,11 +111,6 @@ private static bool TryGetConnectionSync(
     /// the originating exception is surfaced to the caller and <see cref="WaitHandleDbConnectionPool.ErrorOccurred"/>
     /// becomes true. Guards the <c>CreateObject</c> → <see cref="BlockingPeriodErrorState.Enter"/> wiring.
     /// </summary>
-    // Flaky under CI load only (passes locally 3/3 and on main CI; failed on a PR merge
-    // build): the WaitHandle pool's background create/prune thread races the ErrorOccurred
-    // assertion under load, and this file shares the DbConnectionInternal/SqlConnectionFactory
-    // changes from #4452. Not a defect in this PR.
-    [Trait("Category", "flaky")]
     [Fact]
     public void TryGetConnection_WhenFactoryThrows_EntersBlockingPeriod()
     {
@@ -131,11 +136,6 @@ public void TryGetConnection_WhenFactoryThrows_EntersBlockingPeriod()
     /// rethrows the original instance; the fast-fail throw returns a clone (to avoid sharing stack
     /// traces). Guards the error wait-handle → <see cref="BlockingPeriodErrorState.ThrowIfActive"/> path.
     /// </summary>
-    // Flaky under CI load only (passes locally 3/3 and on main CI; failed on a PR merge
-    // build): the WaitHandle pool's background create/prune thread races the assertion under
-    // load, and this file shares the DbConnectionInternal/SqlConnectionFactory changes from
-    // #4452. Not a defect in this PR.
-    [Trait("Category", "flaky")]
     [Fact]
     public void TryGetConnection_WhileBlocked_FastFailsWithCachedExceptionWithoutInvokingFactory()
     {
@@ -217,11 +217,6 @@ public void TryGetConnection_WhenFactorySucceeds_DoesNotEnterBlockingPeriod()
     /// an injected <see cref="FakeTimeProvider"/>, guarding the
     /// <see cref="BlockingPeriodErrorState"/> timer-exit → retry → <c>Clear</c> path at the pool level.
     /// </summary>
-    // Flaky under CI load only (passes locally 3/3 and on main CI; failed on a PR merge
-    // build): the WaitHandle pool's background create/prune thread races the ErrorOccurred/timer
-    // assertions under load, and this file shares the DbConnectionInternal/SqlConnectionFactory
-    // changes from #4452. Not a defect in this PR.
-    [Trait("Category", "flaky")]
     [Fact]
     public void TryGetConnection_AfterBlockingPeriodExpires_RetriesFactoryAndRecovers()
     {
@@ -263,11 +258,6 @@ public void TryGetConnection_AfterBlockingPeriodExpires_RetriesFactoryAndRecover
     /// reset is wired through the pool. Drives timing deterministically with an injected
     /// <see cref="FakeTimeProvider"/>.
     /// </summary>
-    // Flaky under CI load only (passes locally 3/3 and on main CI; failed on a PR merge
-    // build): the WaitHandle pool's background create/prune thread races the ErrorOccurred/timer
-    // assertions under load, and this file shares the DbConnectionInternal/SqlConnectionFactory
-    // changes from #4452. Not a defect in this PR.
-    [Trait("Category", "flaky")]
     [Fact]
     public void TryGetConnection_SuccessfulCreate_ResetsBackoffToInitialWait()
     {
@@ -320,11 +310,6 @@ public void TryGetConnection_SuccessfulCreate_ResetsBackoffToInitialWait()
     /// backoff at the pool level. Drives timing deterministically with an injected
     /// <see cref="FakeTimeProvider"/>.
     /// </summary>
-    // Flaky under CI load only (passes locally 3/3 and on main CI; failed on a PR merge
-    // build): the WaitHandle pool's background create/prune thread races the ErrorOccurred/timer
-    // assertions under load, and this file shares the DbConnectionInternal/SqlConnectionFactory
-    // changes from #4452. Not a defect in this PR.
-    [Trait("Category", "flaky")]
     [Fact]
     public void TryGetConnection_FailingAgainAfterExitTimer_StillDoublesBackoff()
     {

From fcada7a57c687dcb0dc91fb4952866a30e28d3a4 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 6 Aug 2026 08:19:15 -0300
Subject: [PATCH 220/298] Add sqlclient-ci-managed-instance CI pipeline (#4482)

* Add sqlclient-ci-managed-instance CI pipeline

Add a package-triggered CI pipeline that runs the SqlClient Unit,
Functional, and Manual test suites against an Azure SQL Managed Instance
in Package reference mode, based on the exported Classic
Test-SqlClient-Managed-Instance pipeline.

- New pipeline trio under eng/pipelines/ci/managed-instance/ (pipeline,
  stage, job).  Triggered by successful sqlclient-ci-package runs (like
  sqlclient-ci-stress) and registered in the ADO.Net project only, since
  it depends on the Managed-Instance-pool and the "ADO Test Configuration
  Properties" variable group.  Runs on Windows (native + managed SNI) and
  Linux, letting build.proj default to all host-OS TFMs and all manual
  test sets.
- Extract the driver-package download + version resolution into a shared
  eng/pipelines/common/steps/download-driver-packages-step.yml and
  refactor the stress job to use it.
- Add an IsManagedInstance parameter to update-config-file-step.yml.

* Default useManagedSNI to false in MI job

The Linux job in the stage does not pass useManagedSNI (it is only
relevant to UseManagedSNIOnWindows), so the job parameter needs a
default to satisfy pipeline validation.

* Sign MI test assemblies with the test signing key

The signed sqlclient-ci-package driver assemblies grant InternalsVisibleTo
to test assemblies signed with the dedicated test key's public key. Download
the sqlclient-test-key.snk secure file and expose it as TestSigningKeyPath so
build.proj signs the unit-test assemblies accordingly.

* Align MI test source with the consumed package commit

Check out full history and reset the working tree to the sqlclient-ci-package
run's sourceCommit so the test projects compile against the matching internal
API surface of the downloaded package.  This only repoints the built/tested
source; the compiled pipeline definition and @self templates (from the queued
branch tip) are unaffected.  Guarded to no-op when the resource commit is
unavailable.

* Extract upstream source-alignment into a shared step template

Move the checkout + git-checkout-of-upstream-sourceCommit logic into
eng/pipelines/common/steps/align-source-with-upstream-step.yml and use it from
both the managed-instance and stress jobs, which resource-trigger off
sqlclient-ci-package.  This keeps each pipeline's built/tested source in lockstep
with the upstream package artifacts it consumes.

* MI: one job per OS+runtime; pin SqlServer.Server to 1.0.0

Promote the target-framework loop from the managed-instance job up into the
stage, so each OS/SNI x runtime combination runs as its own parallel job with a
single Unit/Functional/Manual test pass (job/display names now include the TFM).

Add a sqlServerVersionOverride parameter to the shared download-driver-packages
step and pass 1.0.0 from the managed-instance and stress jobs, so restore uses
the released stable Microsoft.SqlServer.Server instead of the -ci prerelease and
avoids the NU1605 downgrade against Microsoft.SqlServer.Types' >= 1.0.0
dependency.  Overall package versioning is being addressed separately.

* Address PR #4482 review feedback

* Skip flaky tests in managed instance pipeline

* Refactor managed instance package setup steps

* Preserve pipeline files during source alignment

* Use complete managed instance job display names

* Address PR #4482 managed instance pipeline feedback

* Limit managed instance pipeline to relevant manual tests

* Document managed instance test exclusions
---
 .../sqlclient-ci-managed-instance-job.yml     | 185 ++++++++++++++++++
 ...sqlclient-ci-managed-instance-pipeline.yml |  85 ++++++++
 .../sqlclient-ci-managed-instance-stage.yml   | 111 +++++++++++
 .../ci/stress/sqlclient-ci-stress-job.yml     |  61 ++----
 .../steps/align-source-with-upstream-step.yml |  55 ++++++
 .../steps/download-driver-packages-step.yml   |  74 +++++++
 .../common/steps/download-driver-packages.ps1 | 140 +++++++++++++
 .../steps/update-config-file-step.yml         |   5 +
 .../ManualTests/DataCommon/DataTestUtility.cs |   8 +-
 .../ConnectionPoolTest/PoolBlockPeriodTest.cs |  12 +-
 .../SQL/DNSCachingTest/DNSCachingTest.cs      |  10 +-
 .../SqlDataSourceEnumeratorTest.cs            |  10 +-
 12 files changed, 703 insertions(+), 53 deletions(-)
 create mode 100644 eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml
 create mode 100644 eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml
 create mode 100644 eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml
 create mode 100644 eng/pipelines/common/steps/align-source-with-upstream-step.yml
 create mode 100644 eng/pipelines/common/steps/download-driver-packages-step.yml
 create mode 100644 eng/pipelines/common/steps/download-driver-packages.ps1

diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml
new file mode 100644
index 0000000000..68f59f00c1
--- /dev/null
+++ b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml
@@ -0,0 +1,185 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# This job builds and runs the SqlClient Manual test suite against an Azure SQL Managed Instance.
+# The SqlClient NuGet packages produced by the sqlclient-ci-package pipeline are downloaded into the
+# local NuGet feed (packages/) and the test project is built in "Package" mode
+# (ReferenceType=Package) against the exact package versions produced by that pipeline.
+#
+# The Managed Instance TCP connection string is provided by the "ADO Test Configuration Properties"
+# variable group (SQL_MI_TCP_CONN_STRING).  This job runs on the Managed-Instance-pool, whose agents
+# have network line-of-sight to the Managed Instance.
+#
+# This template defines a job named 'managed_instance_tests_job_<suffix>' that can be depended on by
+# downstream jobs.
+
+parameters:
+
+  # The type of build to produce (Debug or Release).
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # True to enable debugging steps.
+  - name: debug
+    type: boolean
+
+  # The job's display name.
+  - name: displayName
+    type: string
+
+  # The verbosity level for the dotnet CLI commands.
+  - name: dotnetVerbosity
+    type: string
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
+  # The suffix to append to the job name.
+  - name: jobNameSuffix
+    type: string
+
+  # The OS to build and run the tests for.
+  - name: operatingSystem
+    type: string
+    values:
+      - Linux
+      - Windows
+
+  # The .NET runtime (TFM) to build and run the tests for.
+  - name: runtime
+    type: string
+
+  # The timeout, in minutes, for this job.
+  - name: timeout
+    type: number
+    default: 90
+
+  # True to use managed SNI on Windows.  Ignored on non-Windows, where managed SNI is always used.
+  - name: useManagedSNI
+    type: boolean
+    default: false
+
+  # The pool VM image to use.  The Managed-Instance-pool must provide an image with this name.
+  #
+  # NOTE: This value is evaluated at template-expansion (compile) time to select the pool image, so
+  # it must be a literal and must not contain any runtime expressions (e.g. $(...) macros or
+  # $[...] runtime expressions).
+  - name: vmImage
+    type: string
+
+jobs:
+  - job: managed_instance_tests_job_${{ parameters.jobNameSuffix }}
+    displayName: ${{ parameters.displayName }}
+    timeoutInMinutes: ${{ parameters.timeout }}
+
+    workspace:
+      clean: all
+
+    variables:
+
+      # Import the variable group that provides the Managed Instance TCP connection string
+      # (SQL_MI_TCP_CONN_STRING) and other test configuration.
+      - group: ADO Test Configuration Properties
+
+    # The Managed-Instance-pool agents have network line-of-sight to the Managed Instance.
+    pool:
+      name: Managed-Instance-pool
+      demands:
+        - imageOverride -equals ${{ parameters.vmImage }}
+
+    steps:
+
+      # Check out the repo and align the working-tree source with the commit that built the upstream
+      # sqlclient-ci-package artifacts, so the test projects compile against the matching API surface.
+      - template: /eng/pipelines/common/steps/align-source-with-upstream-step.yml@self
+
+      # Download the SqlClient driver packages published by the triggering sqlclient-ci-package
+      # pipeline, stage them into the local NuGet feed, and resolve their exact versions into the
+      # sqlClient/sqlServer/abstractions/logging/azure PackageVersion variables.
+      #
+      # sqlServerVersionOverride pins Microsoft.SqlServer.Server to the released stable 1.0.0 to
+      # avoid an NU1605 downgrade against the >= 1.0.0 dependency from Microsoft.SqlServer.Types.
+      - template: /eng/pipelines/common/steps/download-driver-packages-step.yml@self
+        parameters:
+          sqlServerVersionOverride: 1.0.0
+
+      # Install the .NET SDK and the runtimes needed to execute the test frameworks.
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
+        parameters:
+          debug: ${{ parameters.debug }}
+          runtimes: [8.x, 9.x, 10.x]
+
+      # Restore dotnet CLI tools (e.g. pwsh, apicompat) before building.
+      - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
+
+      # Authenticate with NuGet feeds so that upstream packages (e.g. runtime host packs) can be
+      # fetched through the ADO Artifacts feed.
+      - task: NuGetAuthenticate@1
+        displayName: Authenticate NuGet feeds
+
+      # Write the config.jsonc file pointing the tests at the Managed Instance.  Integrated security
+      # and managed identity are not supported against the Managed Instance, and IsManagedInstance
+      # opts the test suite into Managed-Instance-specific behavior.
+      - template: /eng/pipelines/common/templates/steps/update-config-file-step.yml@self
+        parameters:
+          debug: ${{ parameters.debug }}
+          # The Managed Instance connection strings carry their own credentials, so no local SA
+          # password is used here; pass an empty string for the required saPassword parameter.
+          saPassword: ''
+          TCPConnectionString: $(SQL_MI_TCP_CONN_STRING)
+          # Azure SQL Managed Instance exposes TDS over TCP and does not support Named Pipes.
+          NPConnectionString: ''
+          SupportsIntegratedSecurity: false
+          ManagedIdentitySupported: false
+          IsManagedInstance: true
+          UseManagedSNIOnWindows: ${{ parameters.useManagedSNI }}
+
+      # Ensure the TestResults directory exists so publish steps don't fail when tests are skipped
+      # due to a setup failure.
+      - pwsh: New-Item -ItemType Directory -Path TestResults -Force | Out-Null
+        displayName: Create TestResults Directory
+
+      # Gate: record that all setup steps completed successfully.  Test steps condition on this
+      # variable so they are skipped when setup fails, yet remain independent of each other's
+      # results.
+      - pwsh: Write-Host '##vso[task.setvariable variable=setupSucceeded]true'
+        displayName: 'Gate: Mark Setup Succeeded'
+
+      # Run ManualTests sets 1, 2, and 3 against the Managed Instance using the exact upstream
+      # package versions.  UnitTests and FunctionalTests do not exercise the configured instance.
+      # Set AE is omitted because this pipeline does not provision its separate AE, enclave, and AKV
+      # resources.  build.proj's default filter also excludes failing, flaky, and interactive tests.
+      - task: DotNetCoreCLI@2
+        displayName: Run Managed Instance Tests
+        condition: and(eq(variables['setupSucceeded'], 'true'), succeededOrFailed())
+        inputs:
+          command: build
+          projects: build.proj
+          arguments: >-
+            --verbosity ${{ parameters.dotnetVerbosity }}
+            -t:TestSqlClientManual
+            -p:TestFramework=${{ parameters.runtime }}
+            -p:TestSet=123
+            -p:ReferenceType=Package
+            -p:Configuration=${{ parameters.buildConfiguration }}
+            -p:PackageVersionAbstractions=$(abstractionsPackageVersion)
+            -p:PackageVersionLogging=$(loggingPackageVersion)
+            -p:PackageVersionSqlClient=$(sqlClientPackageVersion)
+            -p:PackageVersionSqlServer=$(sqlServerPackageVersion)
+            -p:TestResultsFolderPath=TestResults
+        retryCountOnTaskFailure: 2
+
+      - template: /eng/pipelines/common/templates/steps/publish-test-results-step.yml@self
+        parameters:
+          debug: ${{ parameters.debug }}
+          targetFramework: ${{ parameters.runtime }}
+          operatingSystem: ${{ parameters.operatingSystem }}
+          buildConfiguration: ${{ parameters.buildConfiguration }}
diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml
new file mode 100644
index 0000000000..d579d11994
--- /dev/null
+++ b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml
@@ -0,0 +1,85 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# This pipeline runs the SqlClient Unit, Functional, and Manual test suites against an Azure SQL
+# Managed Instance, building the test projects in "Package" mode against the NuGet packages produced
+# by the sqlclient-ci-package pipeline.  It is triggered by successful runs of that pipeline:
+#
+# ADO.Net project:
+#   Triggering pipeline:  sqlclient-ci-package
+#   Pipeline name:        sqlclient-ci-managed-instance
+#
+# This pipeline is registered in the ADO.Net (internal) project ONLY, because it depends on the
+# Managed Instance connection strings provided by the "ADO Test Configuration Properties" variable
+# group and on the Managed-Instance-pool agents, neither of which exist in the Public project.
+
+# Set the pipeline run name to the day-of-year and the daily run counter.
+name: $(DayOfYear)$(Rev:rr)
+
+# Do not trigger this pipeline for PRs, commits, or schedules.
+pr: none
+trigger: none
+
+# Trigger this pipeline after successful runs of the sqlclient-ci-package pipeline.
+resources:
+  pipelines:
+
+    # Trigger this pipeline when the sqlclient-ci-package pipeline completes successfully.
+    #
+    # 'project' is omitted so the resource resolves to the sqlclient-ci-package pipeline in the
+    # *current* ADO project (ADO.Net), where this pipeline is registered.
+    #
+    # IMPORTANT: 'source' is the bare pipeline name with no folder path.  This REQUIRES the
+    # sqlclient-ci-package name to be UNIQUE within the ADO.Net project.  Azure DevOps only allows
+    # omitting the folder when the name is unambiguous; if a second pipeline with this name is ever
+    # added to the project, this resource will fail to resolve and the folder path must be added.
+    - pipeline: sqlclient-ci-package
+      source: sqlclient-ci-package
+      trigger: true
+
+# Pipeline parameters, visible in the Azure DevOps UI.
+parameters:
+
+  # The build configuration to use when building the test projects; defaults to Release.
+  #
+  # This should match the mode the driver packages we consume were built in - typically Release -
+  # but may vary if we are triggered due to a manual build of sqlclient-ci-package.
+  #
+  - name: buildConfiguration
+    displayName: Test Build Configuration
+    type: string
+    default: Release
+    values:
+      - Debug
+      - Release
+
+  # True to emit debug information and steps.
+  - name: debug
+    displayName: Enable debug output
+    type: boolean
+    default: false
+
+  # Dotnet CLI verbosity level.
+  - name: dotnetVerbosity
+    displayName: dotnet CLI Verbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
+# The stages to run.
+stages:
+
+  # Run the Managed Instance tests. The .NET and .NET Framework runtimes are defaulted by the stage
+  # template, which runs both native and managed SNI for .NET on Windows.
+  - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml@self
+    parameters:
+      buildConfiguration: ${{ parameters.buildConfiguration }}
+      debug: ${{ parameters.debug }}
+      dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml
new file mode 100644
index 0000000000..114fef0061
--- /dev/null
+++ b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml
@@ -0,0 +1,111 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# This stage builds and runs the SqlClient Unit, Functional, and Manual test suites against an Azure
+# SQL Managed Instance, building the test projects in "Package" mode against the NuGet packages
+# produced by the sqlclient-ci-package pipeline.
+#
+# It fans out to one job per OS:
+#
+#   - Windows: one native-SNI job per .NET Framework runtime, plus native- and managed-SNI jobs per
+#     .NET runtime.
+#   - Linux: one job per .NET runtime (managed SNI is always used on non-Windows).
+#
+# This template defines a stage named 'managed_instance_tests_stage'.
+
+parameters:
+
+  # The type of build to produce (Debug or Release).
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  # True to enable debugging steps.
+  - name: debug
+    type: boolean
+
+  # The verbosity level for the dotnet CLI commands.
+  - name: dotnetVerbosity
+    type: string
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
+  # The list of .NET (core) runtimes to test against.  The same set is used on every OS.
+  - name: netTestRuntimes
+    type: object
+    default: [net8.0, net9.0, net10.0]
+
+  # The list of .NET Framework runtimes to test against on Windows.
+  - name: netFrameworkTestRuntimes
+    type: object
+    default: [net462]
+
+stages:
+  - stage: managed_instance_tests_stage
+    displayName: Run Managed Instance Tests
+
+    jobs:
+
+    # ----------------------------------------------------------------------------------------------
+    # Windows: .NET Framework uses native SNI; .NET runs with both native and managed SNI.
+
+    - ${{ each runtime in parameters.netFrameworkTestRuntimes }}:
+      - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
+        parameters:
+          buildConfiguration: ${{ parameters.buildConfiguration }}
+          debug: ${{ parameters.debug }}
+          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+          displayName: 'Win : Native SNI : ${{ runtime }}'
+          jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
+          operatingSystem: Windows
+          runtime: ${{ runtime }}
+          useManagedSNI: false
+          vmImage: ADO-MMS22-SQL22
+
+    - ${{ each runtime in parameters.netTestRuntimes }}:
+      - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
+        parameters:
+          buildConfiguration: ${{ parameters.buildConfiguration }}
+          debug: ${{ parameters.debug }}
+          displayName: 'Win : Native SNI : ${{ runtime }}'
+          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+          jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
+          operatingSystem: Windows
+          runtime: ${{ runtime }}
+          useManagedSNI: false
+          vmImage: ADO-MMS22-SQL22
+
+      - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
+        parameters:
+          buildConfiguration: ${{ parameters.buildConfiguration }}
+          debug: ${{ parameters.debug }}
+          displayName: 'Win : Managed SNI : ${{ runtime }}'
+          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+          jobNameSuffix: windows_managed_sni_${{ replace(runtime, '.', '_') }}
+          operatingSystem: Windows
+          runtime: ${{ runtime }}
+          useManagedSNI: true
+          vmImage: ADO-MMS22-SQL22
+
+    # ----------------------------------------------------------------------------------------------
+    # Linux: one job per .NET runtime (managed SNI is always used on non-Windows).
+
+    - ${{ each runtime in parameters.netTestRuntimes }}:
+      - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
+        parameters:
+          buildConfiguration: ${{ parameters.buildConfiguration }}
+          debug: ${{ parameters.debug }}
+          displayName: 'Linux : ${{ runtime }}'
+          jobNameSuffix: linux_${{ replace(runtime, '.', '_') }}
+          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+          operatingSystem: Linux
+          runtime: ${{ runtime }}
+          vmImage: ADO-UB22-SQL22
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
index f4d730c05b..efd4f233cf 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
@@ -84,6 +84,9 @@ jobs:
   - job: stress_tests_job_${{ parameters.jobNameSuffix }}
     displayName: '[${{ parameters.displayNamePrefix }}] Run Stress Tests'
 
+    workspace:
+      clean: all
+
     variables:
 
       # Whether this is an internal (ADO.Net project) or public (Public project) build.  Evaluated
@@ -99,11 +102,6 @@ jobs:
       # Import the variable group that provides SQL Server test configuration variables.
       - group: ADO Test Configuration Properties
 
-      # The directory where the "- download:" step places the SqlClient-Driver-Packages artifact
-      # published by the triggering sqlclient-ci-package pipeline.
-      - name: packageArtifactDir
-        value: $(Pipeline.Workspace)/sqlclient-ci-package/SqlClient-Driver-Packages
-
       # The top-level project file to build and run.
       - name: project
         value: $(Build.SourcesDirectory)/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/SqlClient.Stress.Runner.csproj
@@ -142,7 +140,7 @@ jobs:
       - name: referenceArgs
         value: >-
           -p:ReferenceType=Package
-          -p:SqlClientPackageVersion=$(mdsPackageVersion)
+          -p:SqlClientPackageVersion=$(sqlClientPackageVersion)
           -p:AzurePackageVersion=$(azurePackageVersion)
 
       # dotnet CLI options for build.
@@ -181,6 +179,11 @@ jobs:
 
     steps:
 
+      # Check out the repo and align the working-tree source with the commit that built the upstream
+      # sqlclient-ci-package artifacts, so the stress projects compile against the matching API
+      # surface.
+      - template: /eng/pipelines/common/steps/align-source-with-upstream-step.yml@self
+
       # Install the .NET SDK and Runtimes.
       - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
@@ -205,43 +208,15 @@ jobs:
             $content | Out-File -FilePath "config.jsonc"
 
       # Download the SqlClient driver packages published by the triggering sqlclient-ci-package
-      # pipeline into the pipeline workspace.
-      - download: sqlclient-ci-package
-        artifact: SqlClient-Driver-Packages
-        displayName: Download SqlClient Driver Packages
-
-      # Copy the downloaded packages into the local NuGet feed (packages/) and resolve the exact
-      # Microsoft.Data.SqlClient and Microsoft.Data.SqlClient.Extensions.Azure versions from the
-      # .nupkg filenames.  These versions are passed to the build via the referenceArgs variable.
-      - task: PowerShell@2
-        displayName: Stage Packages and Resolve Versions
-        inputs:
-          pwsh: true
-          targetType: inline
-          script: |
-            $ErrorActionPreference = 'Stop'
-            $feed = "$(Build.SourcesDirectory)/packages"
-            New-Item -ItemType Directory -Force -Path $feed | Out-Null
-
-            Copy-Item "$(packageArtifactDir)/*.nupkg" $feed -Force
-            Copy-Item "$(packageArtifactDir)/*.snupkg" $feed -Force -ErrorAction SilentlyContinue
-
-            $mdsPattern = '^Microsoft\.Data\.SqlClient\.(\d[^\\/]*)\.nupkg$'
-            $azurePattern = '^Microsoft\.Data\.SqlClient\.Extensions\.Azure\.(\d[^\\/]*)\.nupkg$'
-
-            $mds = Get-ChildItem "$feed/*.nupkg" | Where-Object { $_.Name -match $mdsPattern } | Select-Object -First 1
-            $azure = Get-ChildItem "$feed/*.nupkg" | Where-Object { $_.Name -match $azurePattern } | Select-Object -First 1
-
-            if (-not $mds) { throw "Microsoft.Data.SqlClient package not found in $feed" }
-            if (-not $azure) { throw "Microsoft.Data.SqlClient.Extensions.Azure package not found in $feed" }
-
-            $mdsVersion = [regex]::Match($mds.Name, $mdsPattern).Groups[1].Value
-            $azureVersion = [regex]::Match($azure.Name, $azurePattern).Groups[1].Value
-
-            Write-Host "Resolved Microsoft.Data.SqlClient version: $mdsVersion"
-            Write-Host "Resolved Microsoft.Data.SqlClient.Extensions.Azure version: $azureVersion"
-            Write-Host "##vso[task.setvariable variable=mdsPackageVersion]$mdsVersion"
-            Write-Host "##vso[task.setvariable variable=azurePackageVersion]$azureVersion"
+      # pipeline, stage them into the local NuGet feed, and resolve their exact versions.  The
+      # sqlClientPackageVersion and azurePackageVersion variables are consumed by the referenceArgs
+      # variable above.
+      #
+      # sqlServerVersionOverride pins Microsoft.SqlServer.Server to the released stable 1.0.0 to
+      # avoid an NU1605 downgrade against the >= 1.0.0 dependency from Microsoft.SqlServer.Types.
+      - template: /eng/pipelines/common/steps/download-driver-packages-step.yml@self
+        parameters:
+          sqlServerVersionOverride: 1.0.0
 
       # Authenticate with NuGet feeds so that upstream packages (e.g. runtime host packs) can be
       # fetched through the ADO Artifacts feed.
diff --git a/eng/pipelines/common/steps/align-source-with-upstream-step.yml b/eng/pipelines/common/steps/align-source-with-upstream-step.yml
new file mode 100644
index 0000000000..11ad2742b7
--- /dev/null
+++ b/eng/pipelines/common/steps/align-source-with-upstream-step.yml
@@ -0,0 +1,55 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# This template checks out the repository and aligns the working-tree source with the exact commit
+# that produced the artifacts consumed from an upstream (triggering) pipeline resource (e.g.
+# sqlclient-ci-package).  This keeps the source that gets built and tested in lockstep with the
+# upstream artifacts' API surface.
+#
+# IMPORTANT: Pipeline definitions and @self templates are compiled from the triggered branch tip at
+# queue time, but file-based tasks still read scripts from the runtime working tree.  After aligning
+# the source, this template restores eng/pipelines from the queued commit so compiled pipeline steps
+# and their scripts remain in lockstep.
+#
+# The consuming pipeline MUST declare the upstream pipeline as a resource whose alias matches the
+# upstreamPipeline parameter, e.g.:
+#
+#   resources:
+#     pipelines:
+#       - pipeline: sqlclient-ci-package
+#         source: sqlclient-ci-package
+#         trigger: true
+
+parameters:
+
+  # The upstream pipeline resource alias whose source commit the working tree should be aligned to.
+  # This must match a resource declared under resources.pipelines in the consuming pipeline.
+  - name: upstreamPipeline
+    type: string
+    default: sqlclient-ci-package
+
+steps:
+
+  # Check out the repo with full history so the working tree can be reset to an arbitrary commit.
+  - checkout: self
+    clean: true
+    fetchDepth: 0
+
+  # Align the working-tree source with the commit that built the upstream artifacts, so the projects
+  # compile against the matching (internal) API surface.  When the upstream commit is unavailable
+  # (e.g. some manual runs), skip this step and use the checked-out source as-is.
+  - pwsh: |
+      $ErrorActionPreference = 'Stop'
+      $sha = "$(resources.pipeline.${{ parameters.upstreamPipeline }}.sourceCommit)"
+      $pipelineSourceSha = git rev-parse HEAD
+      if ($LASTEXITCODE -ne 0) { throw "Failed to resolve the queued pipeline commit." }
+      Write-Host "Aligning source to ${{ parameters.upstreamPipeline }} commit $sha"
+      git checkout --force $sha
+      if ($LASTEXITCODE -ne 0) { throw "Failed to check out upstream commit $sha." }
+      Write-Host "Restoring eng/pipelines from queued pipeline commit $pipelineSourceSha"
+      git checkout --force $pipelineSourceSha -- eng/pipelines
+      if ($LASTEXITCODE -ne 0) { throw "Failed to restore eng/pipelines from $pipelineSourceSha." }
+    displayName: Align Source With Upstream Commit
+    condition: ne(variables['resources.pipeline.${{ parameters.upstreamPipeline }}.sourceCommit'], '')
diff --git a/eng/pipelines/common/steps/download-driver-packages-step.yml b/eng/pipelines/common/steps/download-driver-packages-step.yml
new file mode 100644
index 0000000000..aed4456d31
--- /dev/null
+++ b/eng/pipelines/common/steps/download-driver-packages-step.yml
@@ -0,0 +1,74 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# This template downloads the SqlClient driver packages published by the sqlclient-ci-package
+# pipeline, copies them into the local NuGet feed (packages/), and resolves the exact package
+# versions from the .nupkg filenames.  The resolved versions are exposed as job-scoped pipeline
+# variables for use by downstream build/test steps:
+#
+#   sqlClientPackageVersion     Microsoft.Data.SqlClient
+#   sqlServerPackageVersion     Microsoft.SqlServer.Server
+#   abstractionsPackageVersion  Microsoft.Data.SqlClient.Extensions.Abstractions
+#   loggingPackageVersion       Microsoft.Data.SqlClient.Internal.Logging
+#   azurePackageVersion         Microsoft.Data.SqlClient.Extensions.Azure
+#
+# The consuming pipeline MUST declare the triggering pipeline as a resource whose alias matches the
+# pipelineResource parameter, e.g.:
+#
+#   resources:
+#     pipelines:
+#       - pipeline: sqlclient-ci-package
+#         source: sqlclient-ci-package
+#         trigger: true
+
+parameters:
+
+  # The pipeline resource alias to download the packages from.  This must match a resource declared
+  # under resources.pipelines in the consuming pipeline.
+  - name: pipelineResource
+    type: string
+    default: sqlclient-ci-package
+
+  # The name of the artifact published by the triggering pipeline that contains the .nupkg/.snupkg
+  # files.
+  - name: artifactName
+    type: string
+    default: SqlClient-Driver-Packages
+
+  # The local NuGet feed directory to copy the downloaded packages into.
+  - name: feedPath
+    type: string
+    default: $(Build.SourcesDirectory)/packages
+
+  # Optional override for the Microsoft.SqlServer.Server version.  When set, this value is used for
+  # the sqlServerPackageVersion variable instead of the version resolved from the artifact .nupkg
+  # filename.  Temporary workaround: the CI 'X.Y.Z-ci' prerelease of Microsoft.SqlServer.Server is
+  # treated as a downgrade of the '>= X.Y.Z' stable dependency that Microsoft.SqlServer.Types pulls
+  # in (NU1605); passing the released stable version avoids the downgrade.  Overall package
+  # versioning is being addressed separately.
+  - name: sqlServerVersionOverride
+    type: string
+    default: ''
+
+steps:
+
+  # Download the SqlClient driver packages published by the triggering pipeline into the pipeline
+  # workspace.
+  - download: ${{ parameters.pipelineResource }}
+    artifact: ${{ parameters.artifactName }}
+    displayName: Download SqlClient Driver Packages
+
+  # Copy the downloaded packages into the local NuGet feed and resolve the exact package versions
+  # from the .nupkg filenames, exposing each as a pipeline variable.
+  - task: PowerShell@2
+    displayName: Stage Packages and Resolve Versions
+    inputs:
+      pwsh: true
+      targetType: filePath
+      filePath: $(Build.SourcesDirectory)/eng/pipelines/common/steps/download-driver-packages.ps1
+      arguments: >-
+        -FeedPath "${{ parameters.feedPath }}"
+        -ArtifactDirectory "$(Pipeline.Workspace)/${{ parameters.pipelineResource }}/${{ parameters.artifactName }}"
+        -SqlServerVersionOverride "${{ parameters.sqlServerVersionOverride }}"
diff --git a/eng/pipelines/common/steps/download-driver-packages.ps1 b/eng/pipelines/common/steps/download-driver-packages.ps1
new file mode 100644
index 0000000000..39f7a38493
--- /dev/null
+++ b/eng/pipelines/common/steps/download-driver-packages.ps1
@@ -0,0 +1,140 @@
+<#
+.SYNOPSIS
+    Stages SqlClient driver packages and exposes their exact versions to Azure Pipelines.
+
+.DESCRIPTION
+    Copies the .nupkg and .snupkg files downloaded from an upstream SqlClient package artifact into
+    a local NuGet feed. It then resolves package versions from the .nupkg filenames and emits Azure
+    Pipelines logging commands that create these job-scoped variables for downstream tasks:
+
+      sqlClientPackageVersion     Microsoft.Data.SqlClient
+      sqlServerPackageVersion     Microsoft.SqlServer.Server
+      abstractionsPackageVersion  Microsoft.Data.SqlClient.Extensions.Abstractions
+      loggingPackageVersion       Microsoft.Data.SqlClient.Internal.Logging
+      azurePackageVersion         Microsoft.Data.SqlClient.Extensions.Azure
+
+    Every required .nupkg must be present in ArtifactDirectory. Symbol packages are optional. The
+    script stops on missing required packages, copy failures, and ambiguous filesystem errors.
+
+.PARAMETER FeedPath
+    Directory used as the local NuGet feed. The script creates it when it does not exist and
+    overwrites packages with matching filenames.
+
+.PARAMETER ArtifactDirectory
+    Directory containing the .nupkg files downloaded from the upstream pipeline artifact. Optional
+    .snupkg files in this directory are copied when present.
+
+.PARAMETER SqlServerVersionOverride
+    Optional version to expose as sqlServerPackageVersion instead of resolving the version from the
+    Microsoft.SqlServer.Server .nupkg filename. The package itself is still required and staged.
+
+.EXAMPLE
+    ./download-driver-packages.ps1 `
+        -FeedPath 'C:\agent\_work\1\s\packages' `
+        -ArtifactDirectory 'C:\agent\_work\1\sqlclient-ci-package\SqlClient-Driver-Packages'
+
+    Stages all driver packages and resolves every version from its package filename.
+
+.EXAMPLE
+    ./download-driver-packages.ps1 `
+        -FeedPath '/agent/_work/1/s/packages' `
+        -ArtifactDirectory '/agent/_work/1/sqlclient-ci-package/SqlClient-Driver-Packages' `
+        -SqlServerVersionOverride '1.0.0'
+
+    Stages all packages but exposes 1.0.0 as sqlServerPackageVersion.
+
+.OUTPUTS
+    None. Results are emitted as Azure Pipelines task.setvariable logging commands.
+
+.NOTES
+    This script is designed for PowerShell Core in Azure Pipelines. Package filenames must use the
+    conventional <package-id>.<version>.nupkg format, and versions must begin with a digit.
+#>
+
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the MIT license.
+# See the LICENSE file in the project root for more information.
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory)]
+    [string]$FeedPath,
+
+    [Parameter(Mandatory)]
+    [string]$ArtifactDirectory,
+
+    [string]$SqlServerVersionOverride = ''
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+New-Item -ItemType Directory -Force -Path $FeedPath | Out-Null
+
+Copy-Item "$ArtifactDirectory/*.nupkg" $FeedPath -Force
+Copy-Item "$ArtifactDirectory/*.snupkg" $FeedPath -Force -ErrorAction SilentlyContinue
+
+function Resolve-PackageVersion {
+    <#
+    .SYNOPSIS
+        Resolves a package version from a matching .nupkg filename.
+    #>
+    param(
+        [Parameter(Mandatory)][string]$Path,
+        [Parameter(Mandatory)][string]$Pattern,
+        [Parameter(Mandatory)][string]$PackageName
+    )
+
+    $packages = @(Get-ChildItem "$Path/*.nupkg" | Where-Object { $_.Name -match $Pattern })
+
+    if ($packages.Count -ne 1) {
+        throw "Expected exactly one $PackageName package in $Path, found $($packages.Count)"
+    }
+
+    return [regex]::Match($packages[0].Name, $Pattern).Groups[1].Value
+}
+
+# Patterns are anchored so the Microsoft.Data.SqlClient package does not also match extension
+# packages whose IDs begin with Microsoft.Data.SqlClient.
+$packages = @(
+    @{
+        Variable = 'sqlClientPackageVersion'
+        Name = 'Microsoft.Data.SqlClient'
+        Pattern = '^Microsoft\.Data\.SqlClient\.(\d[^\/]*)\.nupkg$'
+    },
+    @{
+        Variable = 'sqlServerPackageVersion'
+        Name = 'Microsoft.SqlServer.Server'
+        Pattern = '^Microsoft\.SqlServer\.Server\.(\d[^\/]*)\.nupkg$'
+    },
+    @{
+        Variable = 'abstractionsPackageVersion'
+        Name = 'Microsoft.Data.SqlClient.Extensions.Abstractions'
+        Pattern = '^Microsoft\.Data\.SqlClient\.Extensions\.Abstractions\.(\d[^\/]*)\.nupkg$'
+    },
+    @{
+        Variable = 'loggingPackageVersion'
+        Name = 'Microsoft.Data.SqlClient.Internal.Logging'
+        Pattern = '^Microsoft\.Data\.SqlClient\.Internal\.Logging\.(\d[^\/]*)\.nupkg$'
+    },
+    @{
+        Variable = 'azurePackageVersion'
+        Name = 'Microsoft.Data.SqlClient.Extensions.Azure'
+        Pattern = '^Microsoft\.Data\.SqlClient\.Extensions\.Azure\.(\d[^\/]*)\.nupkg$'
+    }
+)
+
+foreach ($package in $packages) {
+    $artifactVersion = Resolve-PackageVersion $ArtifactDirectory $package.Pattern $package.Name
+
+    if ($package.Variable -eq 'sqlServerPackageVersion' -and
+        -not [string]::IsNullOrWhiteSpace($SqlServerVersionOverride)) {
+        $version = $SqlServerVersionOverride
+        Write-Host "Overriding $($package.Name) version from $artifactVersion to $version"
+    } else {
+        $version = $artifactVersion
+        Write-Host "Resolved $($package.Name) version: $version"
+    }
+
+    Write-Host "##vso[task.setvariable variable=$($package.Variable)]$version"
+}
diff --git a/eng/pipelines/common/templates/steps/update-config-file-step.yml b/eng/pipelines/common/templates/steps/update-config-file-step.yml
index fd57828df0..99835f9b1c 100644
--- a/eng/pipelines/common/templates/steps/update-config-file-step.yml
+++ b/eng/pipelines/common/templates/steps/update-config-file-step.yml
@@ -121,6 +121,10 @@ parameters:
     type: boolean
     default: true
 
+  - name: IsManagedInstance
+    type: boolean
+    default: false
+
   - name: WorkloadIdentityFederationServiceConnectionId
     type: string
     default: ''
@@ -191,6 +195,7 @@ steps:
           $p.UseManagedSNIOnWindows=[System.Convert]::ToBoolean("${{parameters.UseManagedSNIOnWindows }}")
           $p.SupportsIntegratedSecurity=[System.Convert]::ToBoolean("${{parameters.SupportsIntegratedSecurity }}")
           $p.ManagedIdentitySupported=[System.Convert]::ToBoolean("${{parameters.ManagedIdentitySupported }}")
+          $p.IsManagedInstance=[System.Convert]::ToBoolean("${{parameters.IsManagedInstance }}")
           $p.IsDNSCachingSupportedTR=[System.Convert]::ToBoolean("${{parameters.IsDNSCachingSupportedTR }}")
           $p.IsDNSCachingSupportedCR=[System.Convert]::ToBoolean("${{parameters.IsDNSCachingSupportedCR }}")
           $p.TracingEnabled=[System.Convert]::ToBoolean("${{parameters.TracingEnabled }}")
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index c465235078..99d48b11c8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -616,9 +616,15 @@ public static bool IsEnclaveAzureDatabaseSetup()
         // Synapse: UDT Test Database not compatible with Azure Synapse.
         public static bool IsUdtTestDatabasePresent() => IsDatabasePresent(UdtTestDbName) && IsNotAzureSynapse();
 
+        /// <summary>
+        /// Returns whether the primary connection strings required by the ManualTests configuration
+        /// are available. Most environments provide both TCP and Named Pipes connection strings.
+        /// Managed Instance requires only TCP because it does not support Named Pipes.
+        /// </summary>
         public static bool AreConnStringsSetup()
         {
-            return !string.IsNullOrEmpty(NPConnectionString) && !string.IsNullOrEmpty(TCPConnectionString);
+            return !string.IsNullOrEmpty(TCPConnectionString) &&
+                (IsManagedInstance || !string.IsNullOrEmpty(NPConnectionString));
         }
 
         public static bool IsSQL2022() => string.Equals("16", SQLServerVersion.Trim());
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
index 84f779cf96..4b6dbc5780 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/PoolBlockPeriodTest.cs
@@ -24,8 +24,10 @@ public class PoolBlockPeriodTest
         private const int CompareMargin = 2;
         private static bool AreConnectionStringsSetup() => DataTestUtility.AreConnStringsSetup();
 
+        // This uses deliberately nonexistent Azure hostnames to test client-side pool blocking; it
+        // never connects to the configured Managed Instance.
         [OuterLoop()]
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData("Azure with Default Policy must Disable blocking (*.database.windows.net)", new object[] { AzureEndpointSample })]
         [InlineData("Azure with Default Policy must Disable blocking (*.database.chinacloudapi.cn)", new object[] { AzureChinaEnpointSample })]
         [InlineData("Azure with Default Policy must Disable blocking (*.database.usgovcloudapi.net)", new object[] { AzureUSGovernmentEndpointSample })]
@@ -50,8 +52,10 @@ public void TestAzureBlockingPeriod(string description, object[] Params)
             PoolBlockingPeriodAzureTest(connString, policy);
         }
 
+        // This uses deliberately nonexistent non-Azure hostnames to test client-side pool blocking;
+        // it never connects to the configured Managed Instance.
         [OuterLoop()]
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData("NonAzure with Default Policy must Enable blocking", new object[] { NonExistentServer })]
         [InlineData("NonAzure with Auto Policy must Enable Blocking", new object[] { NonExistentServer, PoolBlockingPeriod.Auto })]
         [InlineData("NonAzure with Always Policy must Enable Blocking", new object[] { NonExistentServer, PoolBlockingPeriod.AlwaysBlock })]
@@ -73,8 +77,10 @@ public void TestNonAzureBlockingPeriod(string description, object[] Params)
             PoolBlockingPeriodNonAzureTest(connString, policy);
         }
 
+        // This validates connection-string policy parsing against a nonexistent Azure hostname; it
+        // never connects to the configured Managed Instance.
         [OuterLoop()]
-        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData("Test policy with Auto (lowercase)", "auto")]
         [InlineData("Test policy with Auto (PascalCase)", "Auto")]
         [InlineData("Test policy with Always (lowercase)", "alwaysblock")]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs
index 555005618a..ce045d8892 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DNSCachingTest/DNSCachingTest.cs
@@ -17,9 +17,9 @@ public class DNSCachingTest
         public static Type SQLFallbackDNSCacheType = systemData.GetType("Microsoft.Data.SqlClient.SQLFallbackDNSCache");
         public static Type SQLDNSInfoType = systemData.GetType("Microsoft.Data.SqlClient.SQLDNSInfo");
         public static MethodInfo SQLFallbackDNSCacheGetDNSInfo = SQLFallbackDNSCacheType.GetMethod("GetDNSInfo", BindingFlags.Instance | BindingFlags.NonPublic);
-
-
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsDNSCachingSetup))]
+        // This uses the separately configured DNS-caching endpoint rather than the Managed Instance
+        // connection string, so it does not provide Managed Instance coverage.
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsDNSCachingSetup), nameof(DataTestUtility.IsNotManagedInstance))]
         public void DNSCachingIsSupportedFlag()
         {
             string expectedDNSCachingSupportedCR = DataTestUtility.IsDNSCachingSupportedCR ? "true" : "false";
@@ -39,7 +39,9 @@ public void DNSCachingIsSupportedFlag()
             }
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsDNSCachingSetup))]
+        // This populates the cache from the separately configured DNS-caching endpoint rather than
+        // the Managed Instance connection string.
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsDNSCachingSetup), nameof(DataTestUtility.IsNotManagedInstance))]
         public void DNSCachingGetDNSInfo()
         {
             using(SqlConnection connection = new SqlConnection(DataTestUtility.DNSCachingConnString))
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs
index a89a728756..7b96370794 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlDSEnumeratorTest/SqlDataSourceEnumeratorTest.cs
@@ -20,11 +20,14 @@ private static bool IsEnvironmentAvailable()
             ServiceController[] services = ServiceController.GetServices(Environment.MachineName);
             ServiceController service = services.FirstOrDefault(s => s.ServiceName == "SQLBrowser");
 
-            return DataTestUtility.IsUsingNativeSNI() &&
+            return DataTestUtility.IsNotManagedInstance() &&
+                DataTestUtility.IsUsingNativeSNI() &&
                 service != null &&
                 service.Status == ServiceControllerStatus.Running;
         }
 
+        // Managed Instance endpoints are resolved directly through DNS and cannot be discovered
+        // through the SQL Browser service running on the test agent.
         [ConditionalFact(nameof(IsEnvironmentAvailable))]
         [PlatformSpecific(TestPlatforms.Windows)]
         public void SqlDataSourceEnumerator_NativeSNI()
@@ -35,7 +38,9 @@ public void SqlDataSourceEnumerator_NativeSNI()
         }
 
         [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsUsingManagedSNI))]
+        // This validates client-side managed-SNI enumeration behavior and the agent's SQL Browser
+        // environment; it does not connect to or discover the configured Managed Instance.
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsUsingManagedSNI), nameof(DataTestUtility.IsNotManagedInstance))]
         [PlatformSpecific(TestPlatforms.Windows)]
         public void SqlDataSourceEnumerator_ManagedSNI()
         {
@@ -45,6 +50,7 @@ public void SqlDataSourceEnumerator_ManagedSNI()
 
         // This test validates behavior of SqlDataSourceConverter used to present instance names in PropertyGrid
         // with the SqlConnectionStringBuilder object presented in the control underneath.
+        // Managed Instance endpoints are not enumerated through the test agent's SQL Browser service.
         [ConditionalFact(nameof(IsEnvironmentAvailable))]
         [PlatformSpecific(TestPlatforms.Windows)]
         public void TestDataSourceConverterGetStandardValues()

From 4e5be1919f8fbdd7f94b1eb78310737c985441b4 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 7 Aug 2026 11:47:15 -0700
Subject: [PATCH 221/298] Update central package versions (#4507)

* Update central package versions

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 3e8abd55-1508-4987-86d8-fd2401099e4c

* Update Hosting and TimeProvider package versions

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 3e8abd55-1508-4987-86d8-fd2401099e4c

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 3e8abd55-1508-4987-86d8-fd2401099e4c
---
 Directory.Packages.props                             | 12 ++++++------
 .../src/Microsoft.Data.SqlClient.nuspec              | 12 ++++++++----
 .../tests/Directory.Packages.props                   |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 76142810ca..7de533aa0d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -99,7 +99,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.18" />
   </ItemGroup>
 
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
@@ -148,11 +148,11 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
-    <PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.13" />
-    <PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="9.0.16" />
-    <PackageVersion Include="System.Threading.RateLimiting" Version="9.0.13" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.13" />
-    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.18" />
+    <PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="9.0.18" />
+    <PackageVersion Include="System.Threading.RateLimiting" Version="9.0.18" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.18" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.18" />
   </ItemGroup>
 
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
index 7d94bb7687..676f86f3bd 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
@@ -52,6 +52,7 @@
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
         <dependency id="System.Text.Json" version="10.0.3" />
         <dependency id="System.Threading.Channels" version="10.0.3" />
+        <dependency id="System.Threading.RateLimiting" version="8.0.0" />
         <dependency id="System.ValueTuple" version="4.6.2" />
       </group>
       <group targetFramework="net8.0">
@@ -65,18 +66,20 @@
         <dependency id="Microsoft.SqlServer.Server" version="$SqlServerVersionRange$" />
         <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
+        <dependency id="System.Threading.RateLimiting" version="8.0.0" />
       </group>
       <group targetFramework="net9.0">
-        <dependency id="Microsoft.Bcl.Cryptography" version="9.0.13" />
+        <dependency id="Microsoft.Bcl.Cryptography" version="9.0.18" />
         <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsVersionRange$" />
         <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingVersionRange$" />
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="$SniVersionRange$" exclude="Compile" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.13" exclude="Compile" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.18" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
         <dependency id="Microsoft.SqlServer.Server" version="$SqlServerVersionRange$" />
-        <dependency id="System.Configuration.ConfigurationManager" version="9.0.13" exclude="Compile" />
-        <dependency id="System.Security.Cryptography.Pkcs" version="9.0.13" />
+        <dependency id="System.Configuration.ConfigurationManager" version="9.0.18" exclude="Compile" />
+        <dependency id="System.Security.Cryptography.Pkcs" version="9.0.18" />
+        <dependency id="System.Threading.RateLimiting" version="9.0.18" />
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
@@ -92,6 +95,7 @@
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
         <dependency id="System.Text.Json" version="10.0.3" />
         <dependency id="System.Threading.Channels" version="10.0.3" />
+        <dependency id="System.Threading.RateLimiting" version="8.0.0" />
       </group>
     </dependencies>
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props b/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
index 54596a729f..3dcd238a8d 100644
--- a/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
+++ b/src/Microsoft.Data.SqlClient/tests/Directory.Packages.props
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.18" />
     <PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="181.15.0" />
     <PackageVersion Include="Microsoft.SqlServer.Types" Version="170.1000.7" />
     <PackageVersion Include="System.Formats.Asn1" Version="10.0.3" />

From c6f668987ee631d7256794f453b5ee81e3bfa1f8 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 7 Aug 2026 14:20:45 -0700
Subject: [PATCH 222/298] Fix duplicate artifact error on PR pipeline job
 re-runs (#4508)

* Make PR pipeline artifact names unique per job attempt

Pipeline artifact names must be unique within a build, so re-running a
failed job in the sqlclient-pr pipeline failed with "Artifact
build_and_pack_projects already exists for build <id>."

Suffix the published artifact names with $(System.JobAttempt) in the pack,
coverage, and test-results publish steps. System.JobId is stable across
attempts of the same job, so the test-results artifact had the same latent
collision.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8612610a-cd1b-4668-b818-ce555b5ffd14

* Centralize PR pipeline artifact base names

Address review feedback by moving the artifact base names into
pr-variables.yml and passing them into the pack and coverage stage
templates, matching the existing testResultsArtifactBaseName pattern. This
keeps producers and any future consumers in sync via a single definition.

Also correct a doc comment to reference parameters.testResultsArtifactBaseName.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8612610a-cd1b-4668-b818-ce555b5ffd14

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8612610a-cd1b-4668-b818-ce555b5ffd14
---
 eng/pipelines/pr/sqlclient-pr-pipeline.yml     |  2 ++
 .../pr/stages/collect-coverage-stage.yml       | 12 ++++++++++--
 eng/pipelines/pr/stages/pack-stage.yml         | 15 +++++++++++++--
 .../pr/steps/publish-test-results-step.yml     | 10 +++++++---
 eng/pipelines/pr/variables/pr-variables.yml    | 18 ++++++++++++++++++
 5 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/eng/pipelines/pr/sqlclient-pr-pipeline.yml b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
index 8df34ac600..b72e15ef53 100644
--- a/eng/pipelines/pr/sqlclient-pr-pipeline.yml
+++ b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
@@ -109,6 +109,7 @@ stages:
       buildConfiguration: Debug
       buildSuffix: pr
       stageName: ${{ variables.stageNamePack }}
+      packArtifactBaseName: ${{ variables.packArtifactBaseName }}
 
   # Stage 1b: Generate secrets
   - template: /eng/pipelines/pr/stages/generate-secrets-stage.yml@self
@@ -142,6 +143,7 @@ stages:
   # Stage 3: Collect code coverage
   - template: /eng/pipelines/pr/stages/collect-coverage-stage.yml@self
     parameters:
+      coverageArtifactBaseName: ${{ variables.coverageArtifactBaseName }}
       dependsOn:
         - ${{ each platform in parameters.platforms }}:
             - "test_${{ platform.displayName }}"
diff --git a/eng/pipelines/pr/stages/collect-coverage-stage.yml b/eng/pipelines/pr/stages/collect-coverage-stage.yml
index 2d03bb064f..9a0328ec50 100644
--- a/eng/pipelines/pr/stages/collect-coverage-stage.yml
+++ b/eng/pipelines/pr/stages/collect-coverage-stage.yml
@@ -11,6 +11,11 @@ parameters:
     type: object
     default: []
 
+  # Base name of the artifact to publish the merged coverage report to. The job attempt number is
+  # appended to this to prevent collision across re-runs of the job.
+  - name: coverageArtifactBaseName
+    type: string
+
 stages:
   - stage: collect_code_coverage
     displayName: "Collect code coverage"
@@ -61,11 +66,14 @@ stages:
 
           # Part 2) Publish merged results to the pipeline results/artifacts
 
-          # Publish the merged coverage file as a pipeline artifact
+          # Publish the merged coverage file as a pipeline artifact.
+          #
+          # The artifact name includes the job attempt number so that re-running a failed job does
+          # not collide with the artifact published by a previous attempt.
           - task: PublishPipelineArtifact@1
             displayName: Publish coverage artifact
             inputs:
-              artifact: merged_coverage
+              artifact: ${{ parameters.coverageArtifactBaseName }}_attempt$(System.JobAttempt)
               targetPath: "${{ variables.workingDir }}/merge"
 
           # Publish the merged coverage file as coverage results so they can be viewed in ADO UI.
diff --git a/eng/pipelines/pr/stages/pack-stage.yml b/eng/pipelines/pr/stages/pack-stage.yml
index 5473027731..2b43c8632a 100644
--- a/eng/pipelines/pr/stages/pack-stage.yml
+++ b/eng/pipelines/pr/stages/pack-stage.yml
@@ -37,6 +37,11 @@ parameters:
   - name: stageName
     type: string
 
+  # Base name of the artifact to publish the build output to. The job attempt number is appended
+  # to this to prevent collision across re-runs of the job.
+  - name: packArtifactBaseName
+    type: string
+
 stages:
   - stage: ${{ parameters.stageName }}
     displayName: Build and Pack Projects
@@ -121,9 +126,15 @@ stages:
             displayName: Output Build Output Tree
             condition: succeededOrFailed()
 
-          # Upload the build output as the artifact of the job
+          # Upload the build output as the artifact of the job.
+          #
+          # The artifact name includes the job attempt number because pipeline artifact names must
+          # be unique within a build. Re-running a failed job would otherwise attempt to publish
+          # an artifact that already exists and fail with:
+          #   "Artifact build_and_pack_projects already exists for build <id>."
           - publish: $(BUILD_OUTPUT)
-            artifact: build_and_pack_projects
+            artifact: ${{ parameters.packArtifactBaseName }}_attempt$(System.JobAttempt)
+            displayName: Publish Build Output
             condition: succeededOrFailed()
 
 
diff --git a/eng/pipelines/pr/steps/publish-test-results-step.yml b/eng/pipelines/pr/steps/publish-test-results-step.yml
index fa8e5839b7..b3b11cf5e1 100644
--- a/eng/pipelines/pr/steps/publish-test-results-step.yml
+++ b/eng/pipelines/pr/steps/publish-test-results-step.yml
@@ -31,7 +31,7 @@ parameters:
     type: string
 
   # Absolute path to the test results folder. This folder will be published to the artifact defined
-  # by ${{ testResultsArtifactBaseName }}_$(System.JobId)
+  # by ${{ parameters.testResultsArtifactBaseName }}_$(System.JobId)_attempt$(System.JobAttempt)
   - name: testResultsPath
     type: string
 
@@ -52,11 +52,15 @@ steps:
       testRunTitle: "${{ parameters.platformDisplayName }}_${{ parameters.testDisplayName }}"
     condition: succeededOrFailed()
 
-  # Publish the test results as artifacts for the pipeline
+  # Publish the test results as artifacts for the pipeline.
+  #
+  # The artifact name includes the job attempt number because System.JobId is stable across
+  # attempts of the same job. Without it, re-running a failed test job would fail with
+  # "Artifact ... already exists for build <id>."
   - task: PublishPipelineArtifact@1
     displayName: 'Publish Test Artifacts'
     inputs:
-      artifact: ${{ parameters.testResultsArtifactBaseName }}_$(System.JobId)
+      artifact: ${{ parameters.testResultsArtifactBaseName }}_$(System.JobId)_attempt$(System.JobAttempt)
       targetPath: ${{ parameters.testResultsPath }}
     condition: succeededOrFailed()
 
diff --git a/eng/pipelines/pr/variables/pr-variables.yml b/eng/pipelines/pr/variables/pr-variables.yml
index cea536b0ba..5d856c4859 100644
--- a/eng/pipelines/pr/variables/pr-variables.yml
+++ b/eng/pipelines/pr/variables/pr-variables.yml
@@ -35,6 +35,24 @@ variables:
   - name: stageNameSecrets
     value: "secrets_stage"
 
+  # Base names of the artifacts published by this pipeline.
+  #
+  # Pipeline artifact names must be unique within a build, and neither the job ID nor the stage
+  # name changes when a job is re-run. Every publish step therefore appends
+  # $(System.JobAttempt) (and, where relevant, $(System.JobId)) to these base names so that
+  # re-running a failed job does not collide with the artifact published by a previous attempt.
+  #
+  # These are defined here, rather than inline at the publish step, so that producers and any
+  # future consumers of the artifacts stay in sync through a single definition.
+
+  # Base name of the build output artifact published by the pack stage.
+  - name: packArtifactBaseName
+    value: "build_and_pack_projects"
+
+  # Base name of the merged code coverage artifact published by the coverage stage.
+  - name: coverageArtifactBaseName
+    value: "merged_coverage"
+
   # Base name of the test result artifacts. Job ID should be appended to this to prevent collision.
   - name: testResultsArtifactBaseName
     value: "test_results"

From 9b20e5ec3dfc14c2d0b4b4c0a75c508d8638dbd1 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 7 Aug 2026 16:57:21 -0700
Subject: [PATCH 223/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4511)

Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com>
---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx  | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx     | 3 +++
 .../src/Resources/Strings.zh-Hans.resx                         | 3 +++
 .../src/Resources/Strings.zh-Hant.resx                         | 3 +++
 13 files changed, 39 insertions(+)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index fa8320d327..f7f4bfa4c8 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>Ve fondu připojení se nepovedlo najít prázdný slot.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Fond připojení byl vypnut.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index ba72a1e54e..5a29461c67 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>Im Verbindungspool wurde kein freier Slot gefunden.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Der Verbindungspool wurde heruntergefahren.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index b55a28adec..d109f8b906 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>No se pudo encontrar una ranura vacía en el grupo de conexiones.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>El grupo de conexiones se ha cerrado.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index d3bcada373..e8884f5040 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>Impossible de trouver un emplacement libre dans le pool de connexions.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Le pool de connexions a été arrêté.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 69bd41ed1e..cf9cdc45d5 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>Non è possibile trovare uno slot vuoto nel pool di connessioni.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Il pool di connessioni è stato chiuso.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index cd3db1aa6e..245a1c1b68 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>接続プールに空きスロットが見つかりませんでした。</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>接続プールはシャットダウンされています。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index 2b7ea71615..5d3e45c876 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>연결 풀에서 빈 슬롯을 찾을 수 없습니다.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>연결 풀이 종료되었습니다.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index 10b748e844..41993d7f23 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>Nie znaleziono wolnego miejsca w puli połączeń.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Pula połączeń została zamknięta.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 5fdcafdde2..897ce6a385 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>Não foi possível localizar um slot vazio no pool de conexões.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>O pool de conexões foi desligado.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 33bcd135f4..0136ed4b66 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>Не удалось найти пустой слот в пуле подключений.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Пул подключений отключен.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index e0ace1a9a2..c720f2ca7b 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>Bağlantı havuzunda boş bir yuva bulunamadı.</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Bağlantı havuzu kapatıldı.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 7a3776e539..49e1e10a8f 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>在连接池中找不到空槽。</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>连接池已关闭。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index 454cc34d36..58c0049003 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -2157,6 +2157,9 @@
   <data name="SQL_ConnectionPoolNoEmptySlot" xml:space="preserve">
     <value>連線集區中找不到空白插槽。</value>
   </data>
+  <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
+    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+  </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>連線集區已關閉。</value>
   </data>

From c64219683c7156a91231411c9587cdf00f27850b Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 10 Aug 2026 12:06:43 -0700
Subject: [PATCH 224/298] Address CodeQL findings: PKCS#1 padding (SM03799) and
 weak hash (SM02196) (#4517)

* Suppress CodeQL SM03799 for Always Encrypted PKCS#1 signatures

Always Encrypted requires RSA PKCS#1 v1.5 signature padding for both the
encrypted CEK blob and the column master key metadata. These formats are
fixed by the Always Encrypted specification and are produced/consumed by
SQL Server tooling and other drivers, so switching to PSS would break
interoperability.

Annotate the sign/verify call sites in EncryptedColumnEncryptionKeyParameters
and ColumnMasterKeyMetadata with CodeQL [SM03799] suppression comments,
matching the existing SM03796 suppressions for RSA-OAEP(SHA1).

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 31c7a5d9-05c5-4a0c-bf1b-9bad1fc87d12

* Address CodeQL SM02196 weak hash findings in PackageValidator

Drop SHA1 from the portable PDB checksum algorithm map. Modern compilers
record SHA-2 checksums, and an unrecognized algorithm already degrades to
an inconclusive result rather than a failure, so this is a no-op in
practice while removing an SDL-banned hash.

Suppress the finding on ComputePublicKeyToken, where SHA-1 is mandated by
ECMA-335 for strong-name public key tokens and is used purely as an
identity computation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 31c7a5d9-05c5-4a0c-bf1b-9bad1fc87d12

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Copilot-Session: 31c7a5d9-05c5-4a0c-bf1b-9bad1fc87d12
---
 .../SqlClient/AlwaysEncrypted/ColumnMasterKeyMetadata.cs    | 4 +++-
 .../EncryptedColumnEncryptionKeyParameters.cs               | 6 ++++++
 tools/PackageValidator/src/AssemblyInspector.cs             | 1 +
 tools/PackageValidator/src/PortablePdb.cs                   | 5 ++++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/ColumnMasterKeyMetadata.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/ColumnMasterKeyMetadata.cs
index 3f9e7fad2d..7df55e1716 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/ColumnMasterKeyMetadata.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/ColumnMasterKeyMetadata.cs
@@ -137,6 +137,7 @@ public ColumnMasterKeyMetadata(RSA rsa, string masterKeyPath, string providerNam
     /// </returns>
     /// <exception cref="CryptographicException">Thrown when the signing operation fails.</exception>
     public byte[] Sign() =>
+        // CodeQL [SM03799] Required for an external standard: Always Encrypted signs column master key metadata with RSA PKCS#1 v1.5 (https://learn.microsoft.com/en-us/sql/t-sql/statements/create-column-master-key-transact-sql?view=sql-server-ver16)
         _rsa.SignHash(_hash, s_hashAlgorithm, RSASignaturePadding.Pkcs1);
 
     /// <summary>
@@ -146,8 +147,9 @@ public byte[] Sign() =>
     /// <returns>
     /// <see langword="true"/> if the signature is valid and matches the computed hash; otherwise, <see langword="false"/>.
     /// </returns>
-    /// <exception cref="ArgumentNullException">Thrown when <paramref name="signature"/> is <see langword="null"/>.</exception>"
+    /// <exception cref="ArgumentNullException">Thrown when <paramref name="signature"/> is <see langword="null"/>.</exception>
     public bool Verify(byte[] signature) =>
+        // CodeQL [SM03799] Required for an external standard: Always Encrypted signs column master key metadata with RSA PKCS#1 v1.5 (https://learn.microsoft.com/en-us/sql/t-sql/statements/create-column-master-key-transact-sql?view=sql-server-ver16)
         _rsa.VerifyHash(_hash, signature, s_hashAlgorithm, RSASignaturePadding.Pkcs1);
 
     /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptedColumnEncryptionKeyParameters.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptedColumnEncryptionKeyParameters.cs
index d1310e7b07..603fb5cbf2 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptedColumnEncryptionKeyParameters.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AlwaysEncrypted/EncryptedColumnEncryptionKeyParameters.cs
@@ -151,7 +151,9 @@ public byte[] Encrypt(byte[] columnEncryptionKey)
         Debug.Assert(bytesWritten == HashSize, @"Hash size does not match the expected size.");
 
         bytesWritten = _keyType == SqlColumnEncryptionCertificateStoreProvider.MasterKeyType
+            // CodeQL [SM03799] Required for an external standard: Always Encrypted signs encrypted column encryption keys with RSA PKCS#1 v1.5 (https://learn.microsoft.com/en-us/sql/t-sql/statements/create-column-encryption-key-transact-sql?view=sql-server-ver16)
             ? _rsa.SignHash(hash, encryptedColumnEncryptionKey.AsSpan(signatureOffset), s_hashAlgorithm, RSASignaturePadding.Pkcs1)
+            // CodeQL [SM03799] Required for an external standard: Always Encrypted signs encrypted column encryption keys with RSA PKCS#1 v1.5 (https://learn.microsoft.com/en-us/sql/t-sql/statements/create-column-encryption-key-transact-sql?view=sql-server-ver16)
             : _rsa.SignData(hash, encryptedColumnEncryptionKey.AsSpan(signatureOffset), s_hashAlgorithm, RSASignaturePadding.Pkcs1);
         Debug.Assert(bytesWritten == _rsaKeySize, @"Signature length does not match the RSA key size.");
 
@@ -166,7 +168,9 @@ public byte[] Encrypt(byte[] columnEncryptionKey)
         Debug.Assert(bytesWritten == HashSize, @"Hash size does not match the expected size.");
 
         byte[] signedHash = _keyType == SqlColumnEncryptionCertificateStoreProvider.MasterKeyType
+            // CodeQL [SM03799] Required for an external standard: Always Encrypted signs encrypted column encryption keys with RSA PKCS#1 v1.5 (https://learn.microsoft.com/en-us/sql/t-sql/statements/create-column-encryption-key-transact-sql?view=sql-server-ver16)
             ? _rsa.SignHash(hash, s_hashAlgorithm, RSASignaturePadding.Pkcs1)
+            // CodeQL [SM03799] Required for an external standard: Always Encrypted signs encrypted column encryption keys with RSA PKCS#1 v1.5 (https://learn.microsoft.com/en-us/sql/t-sql/statements/create-column-encryption-key-transact-sql?view=sql-server-ver16)
             : _rsa.SignData(hash, s_hashAlgorithm, RSASignaturePadding.Pkcs1);
         bytesWritten = signedHash.Length;
         Debug.Assert(bytesWritten == _rsaKeySize, @"Signature length does not match the RSA key size.");
@@ -246,7 +250,9 @@ public byte[] Decrypt(byte[] encryptedCek)
 #endif
 
         bool dataVerified = _keyType == SqlColumnEncryptionCertificateStoreProvider.MasterKeyType
+            // CodeQL [SM03799] Required for an external standard: Always Encrypted signs encrypted column encryption keys with RSA PKCS#1 v1.5 (https://learn.microsoft.com/en-us/sql/t-sql/statements/create-column-encryption-key-transact-sql?view=sql-server-ver16)
             ? _rsa.VerifyHash(hash, signature, s_hashAlgorithm, RSASignaturePadding.Pkcs1)
+            // CodeQL [SM03799] Required for an external standard: Always Encrypted signs encrypted column encryption keys with RSA PKCS#1 v1.5 (https://learn.microsoft.com/en-us/sql/t-sql/statements/create-column-encryption-key-transact-sql?view=sql-server-ver16)
             : _rsa.VerifyData(hash, signature, s_hashAlgorithm, RSASignaturePadding.Pkcs1);
 
         // Validate the signature
diff --git a/tools/PackageValidator/src/AssemblyInspector.cs b/tools/PackageValidator/src/AssemblyInspector.cs
index 988e4dcceb..35a16fcc0a 100644
--- a/tools/PackageValidator/src/AssemblyInspector.cs
+++ b/tools/PackageValidator/src/AssemblyInspector.cs
@@ -232,6 +232,7 @@ private static (Guid? CodeViewGuid, bool HasEmbeddedPdb, List<PdbChecksum>? Chec
 
         // The token is defined by the CLI spec as the low 8 bytes of the SHA-1 hash of the public
         // key, emitted in reverse (little-endian) order.
+        // CodeQL [SM02196] Required for an external standard: ECMA-335 defines the strong-name public key token as a SHA-1 hash; this is an identity computation, not a security boundary.
         byte[] hash = SHA1.HashData(publicKey);
         var token = new byte[8];
         for (int i = 0; i < 8; i++)
diff --git a/tools/PackageValidator/src/PortablePdb.cs b/tools/PackageValidator/src/PortablePdb.cs
index 90a3a66a35..8c71c99a0b 100644
--- a/tools/PackageValidator/src/PortablePdb.cs
+++ b/tools/PackageValidator/src/PortablePdb.cs
@@ -191,6 +191,10 @@ private static string ReadStreamName(BinaryReader reader)
     /// <summary>
     /// Creates a <see cref="HashAlgorithm"/> for a PDB checksum algorithm name.
     /// </summary>
+    /// <remarks>
+    /// Only SHA-2 family algorithms are supported; weak hashes such as SHA-1 are deliberately not
+    /// recognized, so a PDB recording one is reported as inconclusive rather than verified.
+    /// </remarks>
     /// <param name="algorithm">The algorithm name as recorded in the debug directory (for example <c>"SHA256"</c>).</param>
     /// <returns>A new hash algorithm instance, or <see langword="null"/> if the name is not recognized.</returns>
     private static HashAlgorithm? CreateHashAlgorithm(string algorithm) =>
@@ -199,7 +203,6 @@ private static string ReadStreamName(BinaryReader reader)
             "SHA256" => SHA256.Create(),
             "SHA384" => SHA384.Create(),
             "SHA512" => SHA512.Create(),
-            "SHA1" => SHA1.Create(),
             _ => null,
         };
 }

From 5749c3d84207c4ccff2cee633fc30c2d74d1fb9c Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Tue, 11 Aug 2026 08:31:14 -0700
Subject: [PATCH 225/298] ChannelDbConnectionPool transaction support (#4487)

* Implement transaction support in ChannelDbConnectionPool

Ports the transacted-pool state machine from WaitHandleDbConnectionPool so
the channel pool honors ambient System.Transactions enlistment:

- Implement PutObjectFromTransactedPool and TransactionEnded (previously
  NotImplementedException).
- Rewrite ReturnInternalConnection to mirror DeactivateObject: deactivate
  first, then route the connection to the transacted pool, stasis, the idle
  channel, or destruction under the connection lock.
- Vend connections already enlisted in the ambient transaction via a new
  GetFromTransactedPool helper, and pass the transaction through to
  PrepareConnection/ActivateConnection.
- Set the ambient transaction on the async acquisition path from the
  TaskCompletionSource's AsyncState.
- Guard RemoveConnection against disposing a transaction root that is still
  waiting for its delegated transaction to end.

Adds ChannelDbConnectionPoolTransactionTest mirroring the WaitHandle pool's
transaction test suite, and drops the stale NotImplementedException tests.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Flow the ambient transaction explicitly on the async open path

The async open path ran GetInternalConnection inside a Task.Run and restored
the ambient transaction by assigning Transaction.Current on that thread pool
thread. That assignment writes to thread-static storage which ExecutionContext
does not unwind, so the transaction outlived the open and was observable by
unrelated work later scheduled onto the same thread -- including the login-time
auto-enlistment that non-pooled connections perform against Transaction.Current.
A try/finally restore is not sufficient either, because the continuation may
resume on a different thread than the one that was polluted.

Instead, capture the ambient transaction on the caller's thread (from the
TaskCompletionSource's AsyncState, which is where SqlConnection.OpenAsync puts
it) and thread it explicitly through GetInternalConnection into
GetFromTransactedPool and PrepareConnection. The sync path passes
ADP.GetCurrentTransaction() directly since it runs on the caller's thread.

Also gate the transaction on HasTransactionAffinity in one place so a pool
without automatic enlistment neither reads from nor writes to the transacted
store.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review feedback

Source:
- Flesh out the PutObjectFromTransactedPool asserts to say what invariant is
  being violated and why it matters.
- Replace the five-way nested branch and three bool flags in
  ReturnInternalConnection with a ReturnDisposition enum and a single
  DecideReturnDisposition helper. The "shutting down", "transaction root with no
  pool" and "no longer poolable" cases all collapse into one reusability test
  followed by "stasis if it's a transaction root, otherwise destroy", which
  removes the need for the postcondition assert entirely.
- Move the transacted-store lookup inside the acquisition loop so a connection
  returned to the store while we were looping is preferred over opening a fresh
  one. It breaks out of the loop to keep skipping the idle/generation gate,
  which must not apply to a transacted connection.
- Document why a parked transacted connection is exempt from idle timeout and
  when its idle clock actually starts.

Tests:
- Rewrite the suite around specific behaviors: 16 focused tests replacing 33.
  Dropped the loop-driven stress tests (alternating commit/rollback, mixed
  workloads, deeply nested scopes, pool saturation, the flaky two-thread test)
  and the granular cases that were covered by a round trip.
- Name the tests after the operation whose behavior they pin down, and document
  what invariant each one protects.
- Assert full pool accounting (Count / IdleCount / transacted connections) at
  every step via AssertPoolState rather than spot-checking one collection.
- Inject a frozen FakeTimeProvider so background maintenance cannot race the
  assertions.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Inline the return disposition decision and unify the transacted liveness probe

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Honor a flowed ambient transaction on the async open path

The async path only read the transaction out of the TaskCompletionSource's
AsyncState, so a caller whose ambient transaction did flow (a TransactionScope
created with TransactionScopeAsyncFlowOption.Enabled) but who supplied no
AsyncState got no enlistment at all, while the same caller on the sync path did.
Fall back to ADP.GetCurrentTransaction(), still read on the caller's thread
before the open is scheduled, so both paths agree on the caller's transaction.
AsyncState keeps priority because SqlConnection.OpenAsync captures it at the
point of the call, which stays correct when a retry re-enters from a
continuation on another thread.

Test the ambient-transaction leak directly instead of inferring it from thread
pool reuse: the mock connection factory runs on exactly the thread the pool does
its open work on, so it now records that thread's id and ambient transaction.
The test asserts the open really happened off the calling thread and that the
pool left that thread's Transaction.Current null while still enlisting the
connection. Both this and the new async ambient test were verified to fail when
the corresponding defect is reintroduced.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Take the async transaction only from AsyncState

Reverts the ADP.GetCurrentTransaction() fallback added in 41a689d9. It was
both unreachable and unsafe:

- SqlConnection.InternalOpenAsync is the only site repo-wide that constructs
  a TaskCompletionSource<DbConnectionInternal>, and it always captures the
  ambient transaction into AsyncState. OpenAsyncRetry.Retry re-enters TryOpen
  with that same TCS, so AsyncState survives retries. The fallback could never
  fire in production.
- Reading Transaction.Current here is thread-sensitive in exactly the way the
  rest of this change set set out to eliminate: on a retry we are re-entered
  from a continuation on an arbitrary thread, so we could enlist in an
  unrelated ambient transaction.

The async equivalent of the sync ambient-transaction test now exercises the
real mechanism instead: the GetConnectionAsync helper mirrors
InternalOpenAsync by capturing the caller's ambient transaction into
AsyncState, and the test asserts enlistment from inside a TransactionScope.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Cover the suppressed-async-flow ambient transaction case

Adds GetConnectionAsync_WithAsyncFlowDisabled_StillEnlistsInAmbientTransaction:
a TransactionScope created with the default TransactionScopeAsyncFlowOption
.Suppress keeps its transaction in thread-static storage, so it is ambient on
the caller's thread but does not flow to the thread pool thread the pool opens
on. The connection must still enlist. The open is started inside the scope and
awaited outside it, because a suppressed scope must be disposed on the thread
that created it; an explicit CommittableTransaction keeps the transaction alive
past the scope so the pool is still enlisting in a live transaction.

Also restores the retry-path coverage as
GetConnectionAsync_EnteredFromThreadWithoutAmbientTransaction_EnlistsFromAsyncState.
This is not redundant: TryGetConnection reads AsyncState while still on the
caller's thread, so in the scope-based tests Transaction.Current happens to
agree with AsyncState. Only entering the pool from a thread with no ambient
transaction -- as OpenAsyncRetry.Retry does -- distinguishes the two.

Verified by mutation: replacing the AsyncState read with null fails 5 tests,
and replacing it with ADP.GetCurrentTransaction() fails only the retry-path
and no-leak tests.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Fix CS8602 nullability errors under net462

The net462 build failed with three CS8602 errors. Debug.Assert's condition
parameter carries [DoesNotReturnIf(false)] on net8.0/net9.0, so the compiler
treats the null branch as unreachable, but the net462 reference assembly has no
such annotation. There, null-testing an already non-nullable parameter downgrades
it to maybe-null for the rest of the method, so the following dereference warns.

ChannelDbConnectionPool.cs is #nullable enable and both parameters are declared
non-nullable, so these asserts were redundant -- the compiler already enforces
the contract at every call site. WaitHandleDbConnectionPool keeps its equivalent
asserts because that file is nullable-oblivious. The substantive assert, that a
connection returning from the transacted pool is no longer enlisted, is retained.

Verified by reproducing the failure locally with
-p:TargetOs=Windows_NT -f net462, then confirming net462 builds clean in both
Debug and Release, and all three Windows TFMs build via the CI command.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Fix two net462-only transaction test failures

GetConnectionAsync_WithAsyncFlowDisabled_StillEnlistsInAmbientTransaction
asserted that the ambient transaction does not flow into Task.Run. .NET
Framework flows it through ExecutionContext regardless of the async flow
option, so that sanity check only holds on .NET. It is not the behavior under
test, so guard it.

GetConnectionAsync_DoesNotSetAmbientTransactionOnPoolWorkerThread compared the
thread id after the await against the factory's thread. The continuation can
resume on the pool's own worker thread, and xunit runs tests on thread pool
threads, so the two can legitimately match. Assert that the open ran on a
thread pool thread instead, which is the property that makes assigning
Transaction.Current there unsafe.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Probe ambient transaction confinement on a dedicated thread

The previous commit blamed the net462 failure on ExecutionContext flowing the
ambient transaction. That is wrong: with the default async flow option the
transaction lives in [ThreadStatic] storage, which ExecutionContext does not
carry, so it cannot flow into Task.Run on either runtime.

The real cause is task inlining. Task.InternalWait attempts to inline on an
infinite, non-cancelable wait, and ThreadPoolTaskScheduler.TryExecuteTaskInline
pops the queued work item and runs it on the waiting thread. The blocking
GetAwaiter().GetResult() therefore ran the probe on the transaction-owning
thread, whose thread-local storage of course still held the transaction. Both
runtimes have that path, so the check was a scheduling race, not a .NET-only
invariant.

Probe on a dedicated thread instead. It cannot be inlined, so the assertion is
deterministic and meaningful on every target framework.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Drop the ambient transaction confinement probe

The probe asserted that a suppressed-flow TransactionScope does not make its
transaction visible on another thread. That is System.Transactions' documented
contract for the option, not pool behavior, so the suite gains nothing by
re-verifying it.

It also implied a discrimination this test does not make. The pool reads
AsyncState on the caller's thread, where the ambient transaction agrees with it,
so this test passes either way. The test that separates the two channels is
GetConnectionAsync_EnteredFromThreadWithoutAmbientTransaction_EnlistsFromAsyncState.
Point the comment at it rather than overclaiming.

Also record why the open is awaited outside the scope: awaiting inside resumes
on a thread pool thread and disposing the scope there throws.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Record why the async open captures the transaction on the caller's thread

With TransactionScopeAsyncFlowOption.Enabled the ambient transaction rides an
AsyncLocal and is live on the pool's worker thread, so reading
Transaction.Current inside the Task.Run would appear to work. Enabled is not the
default, though: a plain TransactionScope keeps the transaction in thread-static
storage, which does not flow, and the worker would silently fail to enlist. The
WaitHandle pool enlists correctly there, so capturing on the caller's thread is
a compatibility requirement as well as a safety net for apps that forget the
option. It keeps the connection in the intended transaction rather than letting
it run outside one; it does not make the suppressed-flow pattern otherwise work.

Verified by mutation: switching the worker to Transaction.Current fails exactly
three tests, which the test comment now names.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Drop thread inspection from the ambient transaction leak test

The thread assertion was not load-bearing. Mutation testing confirms the leak is
caught by the ambient transaction assertion alone: reinstating
ADP.SetCurrentTransaction on the pool's worker fails this test at that assert,
and nothing else in the class notices.

Observing the transaction the factory sees is an observation of the code under
test, not of whichever thread happened to run it, so it does not depend on
thread identity or scheduling the way an id comparison or an IsThreadPoolThread
check does.

Also restore the summary opening on this test's doc comment, which had been
truncated.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Drop the redundant thread hop from the AsyncState enlistment test

The test opens no TransactionScope, so its own thread already has no ambient
transaction. Wrapping the open in Task.Run added a thread hop without changing
what the test discriminates. Verified: mutating the pool to read
Transaction.Current on the worker still fails this test.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review feedback on transaction logging and docs

- Move the PutObjectFromTransactedPool trace into the return/destroy branches
  so each logs what actually happened.
- Include the transaction identifier in the GetFromTransactedPool trace.
- Explain why TransactionEnded does not call PutObjectFromTransactedPool
  itself: the callback is conditional on the connection having been parked.
- Narrow the HasTransactionAffinity doc to ambient enlistment. Explicitly
  enlisted connections are parked on return regardless of the flag.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review feedback on pool comments and transaction assertions

Correct the ReturnInternalConnection comment: deactivation does not detach a
completed transaction, that happens in CloseConnection before the pool is
called. The real constraint is that DeactivateConnection mutates both gates the
return path branches on.

Explain why ReplaceConnection releases the old connection's slot in the idle
branch but not in the create-new branch, and note that the V1 stasis case for a
null pool is unreachable and redundant.

Assert EnlistedTransaction alongside the pool-state assertions so the tests
confirm what a connection is bound to, not just where it was filed. Add
transacted store counts for the inner transaction at vend and after completion.

Cover a transaction completing while its connection is still checked out, and
strengthen the bare TransactionEnded test to use an enlisted connection.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review feedback on transacted release path and pool coverage

Skip the liveness probe when releasing a connection from the transacted
store. That path runs on the System.Transactions completion callback
thread, under DelegatedTransactionEnded's requirement that the caller
holds a lock on the connection, and IsConnectionAlive polls the socket.
WaitHandleDbConnectionPool does not probe there either. The idle-expiry,
load-balance and clear-generation checks still run, so only the socket
poll is suppressed and a connection that died during the transaction is
still caught when it is vended.

Document why ReplaceConnection's RemoveConnection call always frees the
slot: stasis is only ever entered from ReturnInternalConnection, and the
old connection is still checked out there, so the double reservation
cannot occur. Note that transaction end would reclaim the slot anyway.

Caveat RemoveConnection's summary, which everywhere else means the slot
is now free, and record that no current caller reaches its transaction
root early return.

Add coverage for the paths this feedback exercised:
- stasis entry via both triggers, and slot reclamation on transaction end
- returning a doomed connection that is still enlisted
- a waiter on an exhausted pool woken when a transaction ends
- Clear while a connection is parked, retired rather than re-pooled
- liveness probe suppressed on release but applied on ordinary return

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Fix net462 build break in the transaction pool tests

Task.WaitAsync(TimeSpan) is .NET 6+, so the unit test project failed to
compile for net462 with CS1501. Replace it with a Task.WhenAny-based
WithTimeout helper that works on both target frameworks.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../ConnectionPool/ChannelDbConnectionPool.cs |  422 +++++-
 .../ChannelDbConnectionPoolTest.cs            |   31 -
 .../ChannelDbConnectionPoolTransactionTest.cs | 1269 +++++++++++++++++
 3 files changed, 1653 insertions(+), 69 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTransactionTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 3c6347da54..9f75c50c1a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -5,6 +5,7 @@
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using System.Data.Common;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Channels;
@@ -250,6 +251,17 @@ public ConcurrentDictionary<
 
         private int MinPoolSize => PoolGroupOptions.MinPoolSize;
 
+        /// <summary>
+        /// Indicates whether the pool automatically enlists connections in the ambient transaction.
+        /// When disabled, the ambient transaction is neither used to consult the
+        /// <see cref="TransactedConnectionPool"/> nor handed to activation.
+        ///
+        /// This governs the ambient transaction only. A caller may still enlist explicitly via
+        /// SqlConnection.EnlistTransaction, and such a connection is parked in the transacted store
+        /// on return regardless of this flag, since it is bound to a transaction either way.
+        /// </summary>
+        private bool HasTransactionAffinity => PoolGroupOptions.HasTransactionAffinity;
+
         /// <summary>
         /// The most recently launched warmup/replenishment loop task, exposed so tests can await a
         /// warmup pass to a deterministic completion instead of polling pool counters. May be null
@@ -313,7 +325,49 @@ public void Clear()
         /// <inheritdoc />
         public void PutObjectFromTransactedPool(DbConnectionInternal connection)
         {
-            throw new NotImplementedException();
+            Debug.Assert(connection.EnlistedTransaction is null,
+                "PutObjectFromTransactedPool was called with a connection that is still enlisted. " +
+                "The transaction must have ended and been detached before the connection returns to " +
+                "general circulation, otherwise it could be vended to a caller in a different transaction.");
+
+            // Called by the transacted connection pool once it has removed the connection from its
+            // list. We put the connection back into general circulation.
+            //
+            // NOTE: no locking is required here because if we're in this method we can safely
+            // presume that the caller is the only one using the connection, that all pre-push logic
+            // has been done, and that all transactions have ended.
+            if (State is Running && connection.CanBePooled)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.PutObjectFromTransactedPool|RES|CPOOL> {0}, Connection {1}, Transaction has ended; returning connection to pool.",
+                    Id,
+                    connection.ObjectID);
+
+                connection.ResetConnection();
+
+                // probeLiveness: false because we are running on the System.Transactions
+                // transaction-completion callback thread (see DbConnectionInternal
+                // .DelegatedTransactionEnded, whose contract requires the caller to hold a lock on
+                // the connection). DbConnectionInternal.IsConnectionAlive polls the socket, and we
+                // do not want to do socket work while holding that lock on a thread we do not own.
+                // WaitHandleDbConnectionPool does not probe here either; it simply calls
+                // ResetConnection followed by PutNewObject. The connection is still validated on
+                // its way back out of the idle channel, so a connection that died during the
+                // transaction is detected before it is vended. The idle-expiry, load-balance and
+                // clear-generation checks all still run below; only the socket poll is skipped.
+                PutConnectionInIdleChannel(connection, probeLiveness: false);
+            }
+            else
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.PutObjectFromTransactedPool|RES|CPOOL> {0}, Connection {1}, Transaction has ended; destroying unpoolable connection.",
+                    Id,
+                    connection.ObjectID);
+
+                // RemoveConnection triggers replenishment, which is the channel pool's equivalent
+                // of the wait handle pool's QueuePoolCreateRequest.
+                RemoveConnection(connection);
+            }
         }
 
         /// <inheritdoc />
@@ -331,9 +385,30 @@ public DbConnectionInternal ReplaceConnection(
 
             if (newConnection is not null)
             {
-                // TODO: Full transaction enlistment support (Story 2).
+                // Carry the old connection's enlistment over to the replacement so that a connection
+                // replaced mid-transaction stays bound to the same transaction.
                 PrepareConnection(owningObject, newConnection, oldConnection.EnlistedTransaction);
+
+                // newConnection came from the idle channel, so it already holds a slot of its own.
+                // Releasing oldConnection's slot here keeps the pool's count accurate. This is
+                // deliberately different from the create-new branch below, which hands oldConnection's
+                // slot to the replacement via _connectionSlots.TryReplace and therefore only disposes
+                // it -- calling RemoveConnection there would signal a free slot that does not exist.
                 oldConnection.DeactivateConnection();
+
+                // RemoveConnection early-returns without freeing the slot when the connection is a
+                // transaction root awaiting its transaction's end, which would leave the pool
+                // holding two reservations for one logical connection. That cannot happen here:
+                // IsTxRootWaitingForTxEnd is set only by SetInStasis, and the only path that puts a
+                // pooled connection in stasis is ReturnInternalConnection. oldConnection is checked
+                // out by owningObject at this point, so it has not been returned and cannot be in
+                // stasis. Being a transaction root is not sufficient; the connection must also have
+                // been returned. The slot is therefore always released here.
+                //
+                // If that ever changes, the outcome is a transient over-reservation rather than a
+                // leak: the connection comes back through PutObjectFromTransactedPool when its
+                // transaction ends, which calls RemoveConnection again once stasis has been
+                // terminated, and the slot is reclaimed then.
                 RemoveConnection(oldConnection);
             }
             else
@@ -373,7 +448,8 @@ public DbConnectionInternal ReplaceConnection(
                         newConnection.PostPop(owningObject);
                     }
 
-                    // TODO: Full transaction enlistment support (Story 2).
+                    // Carry the old connection's enlistment over to the replacement so that a
+                    // connection replaced mid-transaction stays bound to the same transaction.
                     newConnection.ActivateConnection(oldConnection.EnlistedTransaction);
 
                     // Place new into old's slot
@@ -422,45 +498,159 @@ public void ReturnInternalConnection(DbConnectionInternal connection, DbConnecti
         {
             ValidateOwnershipAndSetPoolingState(connection, owningObject);
 
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.DeactivateObject|RES|CPOOL> {0}, Connection {1}, Deactivating.",
+                Id,
+                connection.ObjectID);
+
+            // Deactivate before inspecting the connection, because DeactivateConnection mutates both
+            // of the gates we branch on below:
+            //  - Deactivate() dooms the connection when async commands are still outstanding, which
+            //    the IsConnectionDoomed check must observe.
+            //  - DeactivateConnection dooms it via DoNotPoolThisConnection when the load-balance
+            //    timeout has elapsed, which the CanBePooled check must observe.
+            // WaitHandleDbConnectionPool.DeactivateObject orders it the same way.
+            connection.DeactivateConnection();
+
+            if (connection.IsConnectionDoomed)
+            {
+                // The connection is not fit for reuse -- just dispose of it.
+                RemoveConnection(connection);
+                return;
+            }
+
+            // Note: this logic mirrors WaitHandleDbConnectionPool.ReturnObject, minus one dead
+            // branch. Its Running path also checks IsTransactionRoot && Pool == null -> SetInStasis,
+            // under its own "how did we get here if the pool is null?" TODO. A connection cannot
+            // arrive here without a pool, because this method is called through the connection's own
+            // Pool reference. The branch is redundant in any case: putting a transaction root in
+            // stasis is exactly what the first case below does when the connection cannot be pooled.
+            ReturnDisposition disposition;
+            lock (connection)
+            {
+                if (State is not Running || !connection.CanBePooled)
+                {
+                    // A transaction root that cannot be pooled must be put in stasis rather than
+                    // closed. Closing it would orphan the root transaction with no means to promote
+                    // itself to a full delegated transaction, or to commit or roll back.
+                    // System.Transactions keeps the connection owned (not lost) and is certain to
+                    // call the appropriate callback when the transaction ends.
+                    if (connection.IsTransactionRoot)
+                    {
+                        connection.SetInStasis();
+                        disposition = ReturnDisposition.HeldByTransaction;
+                    }
+                    else
+                    {
+                        disposition = ReturnDisposition.Destroy;
+                    }
+                }
+                else if (connection.EnlistedTransaction is { } transaction)
+                {
+                    // A connection that is still enlisted cannot be handed to a different customer
+                    // until its transaction actually completes, so it is parked in the transacted
+                    // store keyed by that transaction and comes back via
+                    // PutObjectFromTransactedPool when it ends.
+                    //
+                    // Transacted connections are deliberately not stamped with a returned time:
+                    // they are never proactively closed (doing so would abort a possibly
+                    // distributed transaction), so idle-timeout enforcement does not apply while
+                    // they are parked. They are stamped when they rejoin the idle channel in
+                    // PutObjectFromTransactedPool.
+                    TransactedConnectionPool.PutTransactedObject(transaction, connection);
+                    disposition = ReturnDisposition.HeldByTransaction;
+                }
+                else
+                {
+                    disposition = ReturnDisposition.Reuse;
+                }
+            }
+
+            switch (disposition)
+            {
+                case ReturnDisposition.Reuse:
+                    PutConnectionInIdleChannel(connection);
+                    break;
+
+                case ReturnDisposition.Destroy:
+                    RemoveConnection(connection);
+                    break;
+
+                case ReturnDisposition.HeldByTransaction:
+                    // Nothing further to do. The connection is parked in the transacted store or
+                    // in stasis, and comes back through PutObjectFromTransactedPool once its
+                    // transaction ends.
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// The outcome of evaluating a connection that is being returned to the pool.
+        /// </summary>
+        private enum ReturnDisposition
+        {
+            /// <summary>
+            /// The connection is fit for general reuse and belongs in the idle channel.
+            /// </summary>
+            Reuse,
+
+            /// <summary>
+            /// The connection cannot be reused and must be closed.
+            /// </summary>
+            Destroy,
+
+            /// <summary>
+            /// The connection is owned by a live transaction, either parked in the transacted
+            /// store or held in stasis, and must not be touched by the pool until that
+            /// transaction ends.
+            /// </summary>
+            HeldByTransaction,
+        }
+
+        /// <summary>
+        /// Places a connection that is fit for general reuse into the idle channel, stamping its
+        /// idle-return time and dropping it if it is no longer live.
+        /// </summary>
+        /// <param name="connection">The connection to make available to other callers.</param>
+        /// <param name="probeLiveness">
+        /// Whether to poll the physical connection to confirm it is still alive. Pass false when
+        /// running on a thread that must not block, such as a System.Transactions completion
+        /// callback. The idle-expiry, load-balance timeout and clear-generation checks run
+        /// regardless; only the socket poll is suppressed.
+        /// </param>
+        private void PutConnectionInIdleChannel(DbConnectionInternal connection, bool probeLiveness = true)
+        {
             // Stamp the return time before IsLiveConnection runs so the idle-expiry gate inside it
             // measures time-in-pool, not time-since-last-return. Without this, a connection whose
             // checkout exceeded IdleTimeout (e.g. a long-running query) would be wrongly evicted on
             // return even though it was actively in use on the wire. The same gating conditions are
             // applied here as in IsLiveConnection so we avoid the per-return timestamp read when
             // idle expiry is disabled or the legacy idle-timeout behavior is in effect.
+            //
+            // A connection parked in the transacted store does not pass through here, so it is not
+            // subject to idle timeout for as long as its transaction is live. That is intentional
+            // and matches WaitHandleDbConnectionPool: closing it would abort a possibly distributed
+            // transaction. It is stamped here when the transaction ends and
+            // PutObjectFromTransactedPool returns it to general circulation, so the idle clock
+            // starts from the moment it actually becomes available to other callers.
             if (!LocalAppContextSwitches.UseLegacyIdleTimeoutBehavior &&
                 PoolGroupOptions.IdleTimeout != TimeSpan.Zero)
             {
                 connection.SetReturnedTime(_timeProvider.GetUtcNow().UtcDateTime);
             }
 
-            if (!IsLiveConnection(connection))
+            if (!IsLiveConnection(connection, probeLiveness))
             {
                 RemoveConnection(connection);
                 return;
             }
 
-            SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.DeactivateObject|RES|CPOOL> {0}, Connection {1}, Deactivating.",
-                Id,
-                connection.ObjectID);
-            connection.DeactivateConnection();
-
-            if (connection.IsConnectionDoomed ||
-                !connection.CanBePooled ||
-                State == ShuttingDown)
+            if (!_idleChannel.TryWrite(connection))
             {
+                // The channel has been completed (pool is shutting down). Race window
+                // between the State check by the caller and TryWrite: destroy instead of pooling.
                 RemoveConnection(connection);
             }
-            else
-            {
-                if (!_idleChannel.TryWrite(connection))
-                {
-                    // The channel has been completed (pool is shutting down). Race window
-                    // between the State check above and TryWrite: destroy instead of pooling.
-                    RemoveConnection(connection);
-                }
-            }
         }
 
         /// <inheritdoc />
@@ -614,7 +804,26 @@ public void Startup()
         /// <inheritdoc />
         public void TransactionEnded(Transaction transaction, DbConnectionInternal transactedObject)
         {
-            throw new NotImplementedException();
+            // Note: the connection may still be associated with the transaction due to the explicit
+            // unbinding requirement.
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.TransactionEnded|RES|CPOOL> {0}, Transaction {1}, Connection {2}, Transaction Completed",
+                Id,
+                transaction.GetHashCode(),
+                transactedObject.ObjectID);
+
+            // Removal from the transacted list happens synchronously inside this call, and
+            // TransactedConnectionPool.TransactionEnded calls back into PutObjectFromTransactedPool
+            // itself to return the connection to general circulation.
+            //
+            // We deliberately do not call PutObjectFromTransactedPool ourselves afterwards: that
+            // callback is conditional on the connection actually having been found in the list.
+            // A transaction can complete while the application still holds the connection, in which
+            // case the connection was never parked, and returning it here would hand a connection
+            // that is still in use to another caller. In that case the connection instead reaches
+            // the pool through the normal ReturnInternalConnection path when it is closed.
+            // This mirrors WaitHandleDbConnectionPool.TransactionEnded.
+            TransactedConnectionPool.TransactionEnded(transaction, transactedObject);
         }
 
         /// <inheritdoc />
@@ -640,10 +849,12 @@ public bool TryGetConnection(
             // If taskCompletionSource is null, we are in a sync context.
             if (taskCompletionSource is null)
             {
+                // We're on the caller's thread, so the ambient transaction is directly observable.
                 var task = GetInternalConnection(
                         owningObject,
                         async: false,
-                        timeout);
+                        timeout,
+                        ADP.GetCurrentTransaction());
 
                 // When running synchronously, we are guaranteed that the task is already completed.
                 // We don't need to guard the managed threadpool at this spot because we pass the async flag as false
@@ -672,6 +883,32 @@ public bool TryGetConnection(
             // OpenAsync call. This means that we cannot cancel the connection open operation if the caller's token
             // is cancelled. We can only cancel based on our own timeout, which is set to the owningObject's
             // ConnectionTimeout.
+            //
+            // The ambient transaction is captured by the caller, on the caller's thread, and handed
+            // to us in the TaskCompletionSource's AsyncState (see SqlConnection.InternalOpenAsync).
+            //
+            // We must not read Transaction.Current inside the Task.Run below. A
+            // TransactionScope created with TransactionScopeAsyncFlowOption.Enabled stores the
+            // transaction in an AsyncLocal, which does flow onto the pool's worker thread, so that
+            // would appear to work. But Enabled is not the default: a plain TransactionScope keeps
+            // the transaction in thread-static storage, which does not flow, and reading
+            // Transaction.Current on the worker would silently fail to enlist. The WaitHandle pool
+            // enlists correctly in that case, so this is also a compatibility requirement.
+            // AsyncState is correct under both options.
+            //
+            // This does not make the suppressed-flow pattern work -- the caller's own scope is
+            // still broken past the first await -- but it keeps the connection in the transaction
+            // the caller intended rather than silently running outside it.
+            //
+            // Note that we deliberately do not assign Transaction.Current on the thread pool
+            // thread either. That assignment writes to thread-static storage which is *not* unwound
+            // when the ExecutionContext is restored, so it would outlive this open and be observed
+            // by unrelated work later scheduled onto the same thread pool thread -- including the
+            // login-time auto-enlistment that non-pooled connections perform against
+            // Transaction.Current. The WaitHandle pool can get away with assigning it because it
+            // processes pending opens on a dedicated non-thread-pool thread.
+            Transaction? ambientTransaction = taskCompletionSource.Task.AsyncState as Transaction;
+
             Task.Run(async () =>
             {
                 if (taskCompletionSource.Task.IsCompleted)
@@ -679,10 +916,6 @@ public bool TryGetConnection(
                     return;
                 }
 
-                // We're potentially on a new thread, so we need to properly set the ambient transaction.
-                // We rely on the caller to capture the ambient transaction in the TaskCompletionSource's AsyncState
-                // so that we can access it here. Read: area for improvement.
-                // TODO: ADP.SetCurrentTransaction(taskCompletionSource.Task.AsyncState as Transaction);
                 DbConnectionInternal? connection = null;
 
                 try
@@ -690,7 +923,8 @@ public bool TryGetConnection(
                     connection = await GetInternalConnection(
                         owningObject,
                         async: true,
-                        timeout
+                        timeout,
+                        ambientTransaction
                     ).ConfigureAwait(false);
 
                     if (!taskCompletionSource.TrySetResult(connection))
@@ -901,8 +1135,12 @@ _connectionCreationRateLimiter is not null &&
         /// Checks that the provided connection is live and unexpired and closes it if needed.
         /// </summary>
         /// <param name="connection"></param>
+        /// <param name="probeLiveness">
+        /// Whether to poll the physical connection to confirm it is still alive. Pass false when
+        /// running on a thread that must not block; the remaining checks are all cheap and local.
+        /// </param>
         /// <returns>Returns true if the connection is live and unexpired, otherwise returns false.</returns>
-        private bool IsLiveConnection(DbConnectionInternal connection)
+        private bool IsLiveConnection(DbConnectionInternal connection, bool probeLiveness = true)
         {
             // Connection has been sitting idle longer than the configured idle timeout.
             // Checked before the (potentially expensive) liveness probe so an idle-expired
@@ -922,8 +1160,9 @@ private bool IsLiveConnection(DbConnectionInternal connection)
                 return false;
             }
 
-            // Broken physical connection
-            if (!connection.IsConnectionAlive())
+            // Broken physical connection. Skipped when the caller cannot afford to block: this
+            // polls the socket, so it must not run on a thread we do not own.
+            if (probeLiveness && !connection.IsConnectionAlive())
             {
                 return false;
             }
@@ -944,11 +1183,40 @@ private bool IsLiveConnection(DbConnectionInternal connection)
         }
 
         /// <summary>
-        /// Closes the provided connection and removes it from the pool.
+        /// Closes the provided connection and removes it from the pool, freeing its slot.
         /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Not guaranteed: a connection that is a transaction root awaiting its transaction's end
+        /// is left alone and its slot stays reserved, because disposing it would abort a possibly
+        /// distributed transaction. Callers that treat this method as "the slot is now free" must
+        /// tolerate that, including <see cref="Clear"/> and the <see cref="Shutdown"/> drain, which
+        /// can therefore complete while the pool still owns a connection.
+        /// </para>
+        /// <para>
+        /// In practice no current caller reaches that early return, because a connection in stasis
+        /// is filed in neither the idle channel nor the transacted store, and every caller sources
+        /// its connection from one of those or from a connection that is still checked out. The
+        /// guard is retained to match WaitHandleDbConnectionPool.DestroyObject and to keep the
+        /// invariant enforced if a future caller does reach it.
+        /// </para>
+        /// </remarks>
         /// <param name="connection">The connection to be closed.</param>
         private void RemoveConnection(DbConnectionInternal connection)
         {
+            // A connection with a delegated transaction cannot be disposed of until the delegated
+            // transaction has actually completed; disposing it would abort the (possibly
+            // distributed) transaction. Leave it alone: when the transaction completes it comes
+            // back through PutObjectFromTransactedPool, which calls us again.
+            if (connection.IsTxRootWaitingForTxEnd)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "<prov.DbConnectionPool.DestroyObject|RES|CPOOL> {0}, Connection {1}, Has Delegated Transaction, waiting to Dispose.",
+                    Id,
+                    connection.ObjectID);
+                return;
+            }
+
             _connectionSlots.TryRemove(connection);
 
             // Removing a connection from the pool opens a free slot.
@@ -1003,6 +1271,10 @@ private void RemoveConnection(DbConnectionInternal connection)
         /// <param name="async">A boolean indicating whether the operation should be asynchronous.</param>
         /// <param name="timeout">The overall timeout budget for this connection request. Time spent waiting
         /// in the pool is deducted from the budget available for physical connection creation.</param>
+        /// <param name="ambientTransaction">The ambient transaction captured on the caller's thread, or
+        /// null when the caller is not inside a transaction. It is passed explicitly rather than read
+        /// from <see cref="Transaction.Current"/> because this method may run on a thread pool thread
+        /// that the ambient transaction does not flow to.</param>
         /// <returns>Returns a DbConnectionInternal that is retrieved from the pool.</returns>
         /// <exception cref="InvalidOperationException">
         /// Thrown when an OperationCanceledException is caught, indicating that the timeout period
@@ -1015,20 +1287,46 @@ private void RemoveConnection(DbConnectionInternal connection)
         private async Task<DbConnectionInternal> GetInternalConnection(
             DbConnection owningConnection,
             bool async,
-            TimeoutTimer timeout)
+            TimeoutTimer timeout,
+            Transaction? ambientTransaction)
         {
             DbConnectionInternal? connection = null;
 
+            // When automatic enlistment is disabled, the connection must never be bound to the
+            // ambient transaction, so we neither consult the transacted store nor hand the
+            // transaction to activation. HasTransactionAffinity is derived from the connection
+            // string's Enlist keyword.
+            Transaction? transaction = HasTransactionAffinity ? ambientTransaction : null;
+
             // Derive a CancellationTokenSource from the TimeoutTimer so pool-internal wait operations
             // (channel reads, semaphore waits) are cancelled when the overall budget expires.
             using CancellationTokenSource cancellationTokenSource = timeout.CreateCancellationTokenSource();
             CancellationToken cancellationToken = cancellationTokenSource.Token;
 
-            // Continue looping until we create or retrieve a connection
-            do
+            // Continue looping until we create or retrieve a connection.
+            while (connection is null)
             {
                 try
                 {
+                    // A connection already enlisted in our transaction is always preferred, since
+                    // reusing it avoids promoting the transaction to a distributed one. This is
+                    // re-checked on every iteration so that a connection returned to the transacted
+                    // store while we were looping is picked up rather than being passed over in
+                    // favor of a fresh connection.
+                    if (transaction is not null)
+                    {
+                        connection = GetFromTransactedPool(transaction);
+                        if (connection is not null)
+                        {
+                            // Skip the liveness/idle/generation gate at the bottom of the loop:
+                            // GetFromTransactedPool has already probed liveness, and a transacted
+                            // connection is exempt from idle-timeout, load-balance and
+                            // clear-generation eviction because closing it would abort its
+                            // (possibly distributed) transaction.
+                            break;
+                        }
+                    }
+
                     // Optimistically try to get an idle connection from the channel
                     // Doesn't wait if the channel is empty, just returns null.
                     connection ??= GetIdleConnection();
@@ -1070,9 +1368,8 @@ private async Task<DbConnectionInternal> GetInternalConnection(
                     connection = null;
                 }
             }
-            while (connection is null);
 
-            PrepareConnection(owningConnection, connection);
+            PrepareConnection(owningConnection, connection, transaction);
             return connection;
         }
 
@@ -1141,6 +1438,55 @@ private void PrepareConnection(DbConnection owningObject, DbConnectionInternal c
             }
         }
 
+        /// <summary>
+        /// Attempts to retrieve a connection that is already enlisted in the given transaction.
+        /// </summary>
+        /// <param name="transaction">The transaction the connection must already be enlisted in.</param>
+        /// <returns>A live connection already enlisted in the transaction, or null.</returns>
+        private DbConnectionInternal? GetFromTransactedPool(Transaction transaction)
+        {
+            DbConnectionInternal? connection = TransactedConnectionPool.GetTransactedObject(transaction);
+            if (connection is null)
+            {
+                return null;
+            }
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "<prov.DbConnectionPool.GetFromTransactedPool|RES|CPOOL> {0}, Transaction {1}, Connection {2}, Popped from transacted pool.",
+                Id,
+                transaction.GetHashCode(),
+                connection.ObjectID);
+
+            SqlClientDiagnostics.Metrics.ExitFreeConnection();
+
+            // Transacting connections are exempt from idle-timeout and clear-generation eviction
+            // (closing them would abort the transaction, which may be distributed), so only
+            // liveness is checked here rather than the full IsLiveConnection gate.
+            bool isAlive = false;
+            try
+            {
+                // A dead transaction root must surface the underlying failure to the caller, since
+                // there is no way to recover the delegated transaction on another connection. Any
+                // other dead connection is simply reported so the caller can pick up or open a
+                // different one. Either way the connection is dropped in the finally below.
+                isAlive = connection.IsConnectionAlive(throwOnException: connection.IsTransactionRoot);
+            }
+            finally
+            {
+                if (!isAlive)
+                {
+                    SqlClientEventSource.Log.TryPoolerTraceEvent(
+                        "<prov.DbConnectionPool.GetFromTransactedPool|RES|CPOOL> {0}, Connection {1}, found dead and removed.",
+                        Id,
+                        connection.ObjectID);
+                    RemoveConnection(connection);
+                    connection = null;
+                }
+            }
+
+            return connection;
+        }
+
         /// <summary>
         /// Validates that the connection is owned by the provided DbConnection and that it is in a valid state to be returned to the pool.
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index b3c9815eb8..228e949cd0 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -888,37 +888,6 @@ public void TestReplaceConnection()
 
         #endregion
 
-        #region Not Implemented Method Tests
-
-        /// <summary>
-        /// Verifies that <see cref="ChannelDbConnectionPool.PutObjectFromTransactedPool"/> remains
-        /// unimplemented and throws <see cref="NotImplementedException"/>.
-        /// </summary>
-        [Fact]
-        public void TestPutObjectFromTransactedPool()
-        {
-            // Arrange
-            var pool = ConstructPool(SuccessfulConnectionFactory);
-
-            // Act & Assert
-            Assert.Throws<NotImplementedException>(() => pool.PutObjectFromTransactedPool(null!));
-        }
-
-        /// <summary>
-        /// Verifies that <see cref="ChannelDbConnectionPool.TransactionEnded(System.Transactions.Transaction, Microsoft.Data.ProviderBase.DbConnectionInternal)"/>
-        /// remains unimplemented and throws <see cref="NotImplementedException"/>.
-        /// </summary>
-        [Fact]
-        public void TestTransactionEnded()
-        {
-            // Arrange
-            var pool = ConstructPool(SuccessfulConnectionFactory);
-
-            // Act & Assert
-            Assert.Throws<NotImplementedException>(() => pool.TransactionEnded(null!, null!));
-        }
-        #endregion
-
         #region Pool Clear Tests
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTransactionTest.cs
new file mode 100644
index 0000000000..84f581ea2a
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTransactionTest.cs
@@ -0,0 +1,1269 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data.Common;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Transactions;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Extensions.Time.Testing;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool;
+
+/// <summary>
+/// Tests for <see cref="ChannelDbConnectionPool"/> transaction affinity: routing a returning
+/// connection to the transacted store instead of the idle channel, vending an already-enlisted
+/// connection back to the same transaction, releasing the connection when the transaction ends,
+/// and flowing the ambient transaction on the asynchronous open path.
+/// </summary>
+public class ChannelDbConnectionPoolTransactionTest : IDisposable
+{
+    private const int DefaultMaxPoolSize = 50;
+    private const int DefaultMinPoolSize = 0;
+    private const int DefaultCreationTimeoutInMilliseconds = 15000;
+
+    private IDbConnectionPool _pool;
+    private MockSqlConnectionFactory _connectionFactory = null!;
+
+    public ChannelDbConnectionPoolTransactionTest()
+    {
+        _pool = CreatePool();
+    }
+
+    public void Dispose()
+    {
+        // A transaction entry that outlives its transaction is a leak: the connections it holds
+        // are never returned to general circulation.
+        Assert.Empty(_pool.TransactedConnectionPool.TransactedConnections);
+
+        _pool.Shutdown();
+        _pool.Clear();
+    }
+
+    #region Helper Methods
+
+    /// <summary>
+    /// Builds a pool for these tests. A frozen <see cref="FakeTimeProvider"/> is injected so that
+    /// time-driven background maintenance (idle-timeout pruning, warmup and replenishment,
+    /// blocking-period expiry) cannot advance and race the assertions about pool contents.
+    /// </summary>
+    private ChannelDbConnectionPool CreatePool(
+        int maxPoolSize = DefaultMaxPoolSize,
+        int minPoolSize = DefaultMinPoolSize,
+        bool hasTransactionAffinity = true)
+    {
+        var poolGroupOptions = new DbConnectionPoolGroupOptions(
+            poolByIdentity: false,
+            minPoolSize: minPoolSize,
+            maxPoolSize: maxPoolSize,
+            creationTimeout: DefaultCreationTimeoutInMilliseconds,
+            loadBalanceTimeout: 0,
+            hasTransactionAffinity: hasTransactionAffinity,
+            idleTimeout: 0
+        );
+
+        var dbConnectionPoolGroup = new DbConnectionPoolGroup(
+            new SqlConnectionOptions("Data Source=localhost;"),
+            new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+            poolGroupOptions
+        );
+
+        _connectionFactory = new MockSqlConnectionFactory();
+
+        var pool = new ChannelDbConnectionPool(
+            _connectionFactory,
+            dbConnectionPoolGroup,
+            DbConnectionPoolIdentity.NoIdentity,
+            new DbConnectionPoolProviderInfo(),
+            timeProvider: new FakeTimeProvider()
+        );
+
+        pool.Startup();
+        return pool;
+    }
+
+    /// <summary>
+    /// Tears down the pool built by the constructor and replaces it with one configured
+    /// differently, for the few tests that need non-default pool options.
+    /// </summary>
+    private void ReplaceFixturePool(bool hasTransactionAffinity)
+    {
+        _pool.Shutdown();
+        _pool.Clear();
+        _pool = CreatePool(hasTransactionAffinity: hasTransactionAffinity);
+    }
+
+    /// <summary>
+    /// Replaces the fixture's pool with one capped at <paramref name="maxPoolSize"/>, so a test can
+    /// exhaust it and observe what happens to a caller that has to wait.
+    /// </summary>
+    private void ReplaceFixturePool(int maxPoolSize)
+    {
+        _pool.Shutdown();
+        _pool.Clear();
+        _pool = CreatePool(maxPoolSize: maxPoolSize);
+    }
+
+    /// <summary>
+    /// Opens a connection synchronously. The pool reads the ambient transaction off the calling
+    /// thread on this path.
+    /// </summary>
+    private DbConnectionInternal GetConnection(SqlConnection owner)
+    {
+        _pool.TryGetConnection(
+            owner,
+            taskCompletionSource: null,
+            TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+            out DbConnectionInternal? connection);
+        return connection!;
+    }
+
+    /// <summary>
+    /// Opens a connection asynchronously the way SqlConnection.InternalOpenAsync does: the ambient
+    /// transaction is captured here, on the caller's thread, and handed to the pool in the
+    /// <see cref="TaskCompletionSource{TResult}"/>'s AsyncState. The pool must take it from there,
+    /// because the open itself runs on a thread pool thread the ambient transaction may not flow
+    /// to, and on a retry the pool is re-entered from a continuation on an arbitrary thread.
+    /// </summary>
+    /// <param name="owner">The owning connection.</param>
+    /// <param name="transaction">The transaction to hand to the pool. Defaults to the caller's
+    /// ambient transaction, matching what InternalOpenAsync captures.</param>
+    private async Task<DbConnectionInternal> GetConnectionAsync(
+        SqlConnection owner,
+        Transaction? transaction = null)
+    {
+        var tcs = new TaskCompletionSource<DbConnectionInternal>(transaction ?? Transaction.Current);
+        _pool.TryGetConnection(
+            owner,
+            taskCompletionSource: tcs,
+            TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+            out DbConnectionInternal? connection);
+        return connection ?? await tcs.Task;
+    }
+
+    private void ReturnConnection(DbConnectionInternal connection, SqlConnection owner) =>
+        _pool.ReturnInternalConnection(connection, owner);
+
+    /// <summary>
+    /// Awaits a task with a timeout so a test that expects a waiter to be served fails with a clear
+    /// message instead of hanging. Written against <see cref="Task.WhenAny(Task[])"/> because
+    /// Task.WaitAsync does not exist on .NET Framework.
+    /// </summary>
+    private static async Task<T> WithTimeout<T>(Task<T> task, TimeSpan timeout)
+    {
+        Task completed = await Task.WhenAny(task, Task.Delay(timeout)).ConfigureAwait(false);
+        Assert.True(
+            ReferenceEquals(completed, task),
+            $"Timed out after {timeout.TotalSeconds:0.#}s waiting for the task to complete.");
+        return await task.ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Asserts the pool's accounting after a step.
+    /// </summary>
+    /// <param name="count">Total connections owned by the pool, checked out or not. A connection
+    /// parked in the transacted store still holds its pool slot and so is counted here.</param>
+    /// <param name="idleCount">Connections sitting in the idle channel, available to any caller.</param>
+    /// <param name="transactedCount">Connections parked in the transacted store across all
+    /// transactions. These hold a pool slot but are not available to other callers.</param>
+    private void AssertPoolState(int count, int idleCount, int transactedCount)
+    {
+        Assert.Equal(count, _pool.Count);
+        Assert.Equal(idleCount, _pool.IdleCount);
+        Assert.Equal(transactedCount, TotalTransactedConnections());
+    }
+
+    private int TotalTransactedConnections()
+    {
+        int total = 0;
+        foreach (var entry in _pool.TransactedConnectionPool.TransactedConnections)
+        {
+            total += entry.Value.Count;
+        }
+        return total;
+    }
+
+    private int TransactedConnectionsFor(Transaction transaction) =>
+        _pool.TransactedConnectionPool.TransactedConnections.TryGetValue(transaction, out var connections)
+            ? connections.Count
+            : 0;
+
+    /// <summary>
+    /// Asserts which transaction a connection is bound to, complementing the pool-state assertions:
+    /// AssertPoolState says where the connection was filed, this says what it is actually enlisted
+    /// in. Pass null to assert the connection is not enlisted at all.
+    /// </summary>
+    /// <remarks>
+    /// Compared by equality rather than reference because the EnlistedTransaction setter stores a
+    /// clone, so that the connection does not hold the caller's transaction past the end of its
+    /// using block.
+    /// </remarks>
+    private static void AssertEnlistedIn(Transaction? expected, DbConnectionInternal connection) =>
+        Assert.Equal(expected, connection.EnlistedTransaction);
+
+    #endregion
+
+    #region Connection Return Routing
+
+    /// <summary>
+    /// A connection returned while still enlisted must be parked in the transacted store rather
+    /// than the idle channel, so it cannot be vended to a caller in a different transaction. It
+    /// keeps its pool slot while parked.
+    /// </summary>
+    [Fact]
+    public void ReturnConnection_WhileEnlisted_ParksInTransactedStoreNotIdleChannel()
+    {
+        // Arrange
+        using var scope = new TransactionScope();
+        Transaction? transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        var owner = new SqlConnection();
+        var connection = GetConnection(owner);
+        Assert.NotNull(connection);
+        AssertEnlistedIn(transaction, connection);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        // Act
+        ReturnConnection(connection, owner);
+
+        // Assert
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+        Assert.Equal(1, TransactedConnectionsFor(transaction!));
+
+        // The connection stays bound to the transaction while parked, which is what makes it
+        // ineligible for a caller in any other transaction.
+        AssertEnlistedIn(transaction, connection);
+
+        scope.Complete();
+    }
+
+    /// <summary>
+    /// Without an ambient transaction there is nothing to enlist in, so a returning connection
+    /// goes straight back into the idle channel.
+    /// </summary>
+    [Fact]
+    public void ReturnConnection_WithoutTransaction_ReturnsToIdleChannel()
+    {
+        // Arrange
+        var owner = new SqlConnection();
+        var connection = GetConnection(owner);
+        Assert.NotNull(connection);
+        AssertEnlistedIn(null, connection);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        // Act
+        ReturnConnection(connection, owner);
+
+        // Assert
+        AssertEnlistedIn(null, connection);
+        AssertPoolState(count: 1, idleCount: 1, transactedCount: 0);
+    }
+
+    /// <summary>
+    /// A connection whose transaction has already ended must land in the idle channel, not be
+    /// parked under a dead transaction where nothing would ever release it. The enlistment is
+    /// dropped when the transaction completes, so by the time the connection is returned there is
+    /// nothing left to park it under.
+    /// </summary>
+    [Fact]
+    public void ReturnConnection_AfterTransactionCompleted_ReturnsToIdleChannel()
+    {
+        // Arrange
+        var owner = new SqlConnection();
+        DbConnectionInternal connection;
+        using (var scope = new TransactionScope())
+        {
+            connection = GetConnection(owner);
+            Assert.NotNull(connection);
+            AssertEnlistedIn(Transaction.Current, connection);
+            scope.Complete();
+        }
+
+        // The completed transaction detached itself from the connection.
+        AssertEnlistedIn(null, connection);
+
+        // Act - the transaction is fully disposed by this point.
+        ReturnConnection(connection, owner);
+
+        // Assert
+        AssertPoolState(count: 1, idleCount: 1, transactedCount: 0);
+    }
+
+    /// <summary>
+    /// A pool with automatic enlistment disabled must never bind a connection to the ambient
+    /// transaction, so the transacted store stays out of the picture entirely.
+    /// </summary>
+    [Fact]
+    public void ReturnConnection_WithTransactionAffinityDisabled_ReturnsToIdleChannel()
+    {
+        // Arrange
+        ReplaceFixturePool(hasTransactionAffinity: false);
+
+        using var scope = new TransactionScope();
+        var owner = new SqlConnection();
+        var connection = GetConnection(owner);
+        Assert.NotNull(connection);
+
+        // The ambient transaction exists but must not reach the connection.
+        Assert.NotNull(Transaction.Current);
+        AssertEnlistedIn(null, connection);
+
+        // Act
+        ReturnConnection(connection, owner);
+
+        // Assert
+        AssertEnlistedIn(null, connection);
+        AssertPoolState(count: 1, idleCount: 1, transactedCount: 0);
+
+        scope.Complete();
+    }
+
+    /// <summary>
+    /// Returning to a pool that has already shut down destroys the connection instead of pooling
+    /// it, and must not throw.
+    /// </summary>
+    [Fact]
+    public void ReturnConnection_ToShutDownPool_DestroysConnection()
+    {
+        // Arrange
+        using var scope = new TransactionScope();
+        var owner = new SqlConnection();
+        var connection = GetConnection(owner);
+        Assert.NotNull(connection);
+
+        _pool.Shutdown();
+
+        // Act
+        ReturnConnection(connection, owner);
+
+        // Assert - Dispose() dooms the connection and clears its pool back-reference.
+        Assert.True(connection.IsConnectionDoomed,
+            "A connection returned to a shut-down pool should be destroyed, not pooled.");
+        Assert.Null(connection.Pool);
+        AssertPoolState(count: 0, idleCount: 0, transactedCount: 0);
+    }
+
+    /// <summary>
+    /// A doomed connection is destroyed even when it is still enlisted. The doomed check runs
+    /// before the transacted decision precisely so that a connection unfit for reuse is never
+    /// parked in the transacted store, where it would be handed to the next caller in that same
+    /// transaction.
+    /// </summary>
+    [Fact]
+    public void ReturnConnection_WhenDoomedWhileEnlisted_DestroysWithoutParking()
+    {
+        // Arrange
+        using var scope = new TransactionScope();
+        Transaction? transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        var owner = new SqlConnection();
+        var connection = GetConnection(owner);
+        Assert.NotNull(connection);
+        AssertEnlistedIn(transaction, connection);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        // The connection breaks while it is enlisted and checked out.
+        ((MockDbConnectionInternal)connection).Doom();
+        Assert.True(connection.IsConnectionDoomed);
+
+        // Act
+        ReturnConnection(connection, owner);
+
+        // Assert - destroyed rather than parked under its transaction, and its slot is released.
+        Assert.Equal(0, TransactedConnectionsFor(transaction!));
+        AssertPoolState(count: 0, idleCount: 0, transactedCount: 0);
+        Assert.Null(connection.Pool);
+
+        scope.Complete();
+    }
+
+    #endregion
+
+    #region Vending From The Transacted Store
+
+    /// <summary>
+    /// Round trip: a second request inside the same transaction must be served the connection that
+    /// is already enlisted in it, rather than a fresh connection. Reusing it is what keeps the
+    /// transaction from being promoted to a distributed one.
+    /// </summary>
+    [Fact]
+    public void GetConnection_UnderSameTransaction_VendsTheAlreadyEnlistedConnection()
+    {
+        // Arrange
+        using var scope = new TransactionScope();
+        Transaction? transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        var owner1 = new SqlConnection();
+        var connection1 = GetConnection(owner1);
+        Assert.NotNull(connection1);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        ReturnConnection(connection1, owner1);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+        // Act
+        var owner2 = new SqlConnection();
+        var connection2 = GetConnection(owner2);
+
+        // Assert
+        Assert.Same(connection1, connection2);
+        AssertEnlistedIn(transaction, connection2);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        ReturnConnection(connection2, owner2);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+        Assert.Equal(1, TransactedConnectionsFor(transaction!));
+
+        scope.Complete();
+    }
+
+    /// <summary>
+    /// The asynchronous path must reuse the enlisted connection exactly as the synchronous path
+    /// does, even though it runs the open on a thread pool thread.
+    /// </summary>
+    [Fact]
+    public async Task GetConnectionAsync_UnderSameTransaction_VendsTheAlreadyEnlistedConnection()
+    {
+        // Arrange
+        using var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
+        Transaction? transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        var owner1 = new SqlConnection();
+        var connection1 = await GetConnectionAsync(owner1, transaction);
+        Assert.NotNull(connection1);
+        AssertEnlistedIn(transaction, connection1);
+        ReturnConnection(connection1, owner1);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+        // Act
+        var owner2 = new SqlConnection();
+        var connection2 = await GetConnectionAsync(owner2, transaction);
+
+        // Assert
+        Assert.Same(connection1, connection2);
+        AssertEnlistedIn(transaction, connection2);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        ReturnConnection(connection2, owner2);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+        scope.Complete();
+    }
+
+    /// <summary>
+    /// A connection enlisted in one transaction must never be handed to a caller in a different
+    /// transaction; each transaction gets its own entry in the transacted store.
+    /// </summary>
+    [Fact]
+    public void GetConnection_UnderDifferentTransaction_DoesNotVendTheEnlistedConnection()
+    {
+        // Arrange
+        using var outerScope = new TransactionScope();
+        Transaction? outerTransaction = Transaction.Current;
+        Assert.NotNull(outerTransaction);
+
+        var owner1 = new SqlConnection();
+        var connection1 = GetConnection(owner1);
+        AssertEnlistedIn(outerTransaction, connection1);
+        ReturnConnection(connection1, owner1);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+        // Act - RequiresNew starts an unrelated transaction.
+        Transaction? innerTransaction;
+        using (var innerScope = new TransactionScope(TransactionScopeOption.RequiresNew))
+        {
+            innerTransaction = Transaction.Current;
+            Assert.NotEqual(outerTransaction, innerTransaction);
+
+            var owner2 = new SqlConnection();
+            var connection2 = GetConnection(owner2);
+
+            // Assert - a fresh connection, because connection1 belongs to the outer transaction.
+            Assert.NotSame(connection1, connection2);
+            AssertEnlistedIn(innerTransaction, connection2);
+            AssertEnlistedIn(outerTransaction, connection1);
+            AssertPoolState(count: 2, idleCount: 0, transactedCount: 1);
+
+            // The store holds only the outer transaction's connection, so connection2 was newly
+            // created rather than taken from the store.
+            Assert.Equal(1, TransactedConnectionsFor(outerTransaction!));
+            Assert.Equal(0, TransactedConnectionsFor(innerTransaction!));
+
+            ReturnConnection(connection2, owner2);
+            AssertPoolState(count: 2, idleCount: 0, transactedCount: 2);
+            Assert.Equal(1, TransactedConnectionsFor(outerTransaction!));
+            Assert.Equal(1, TransactedConnectionsFor(innerTransaction!));
+
+            innerScope.Complete();
+        }
+
+        // Completing the inner transaction releases only its connection; the outer transaction's
+        // connection stays parked.
+        AssertPoolState(count: 2, idleCount: 1, transactedCount: 1);
+        Assert.Equal(1, TransactedConnectionsFor(outerTransaction!));
+        Assert.Equal(0, TransactedConnectionsFor(innerTransaction!));
+
+        outerScope.Complete();
+    }
+
+    #endregion
+
+    #region Transaction Completion
+
+    /// <summary>
+    /// Committing releases the parked connection back into the idle channel, where it becomes
+    /// available to any caller.
+    /// </summary>
+    [Fact]
+    public void TransactionCommit_ReturnsParkedConnectionToIdleChannel()
+    {
+        // Arrange
+        DbConnectionInternal connection;
+        using (var scope = new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            connection = GetConnection(owner);
+            ReturnConnection(connection, owner);
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+            // Act
+            scope.Complete();
+        }
+
+        // Assert
+        AssertPoolState(count: 1, idleCount: 1, transactedCount: 0);
+
+        // The transaction released it, so it carries no enlistment into general circulation.
+        AssertEnlistedIn(null, connection);
+
+        // The released connection is reusable by a caller with no ambient transaction.
+        var owner2 = new SqlConnection();
+        var connection2 = GetConnection(owner2);
+        Assert.Same(connection, connection2);
+        AssertEnlistedIn(null, connection2);
+        ReturnConnection(connection2, owner2);
+    }
+
+    /// <summary>
+    /// Rolling back must release the parked connection just as committing does; otherwise an
+    /// aborted transaction would strand its connection in the transacted store forever.
+    /// </summary>
+    [Fact]
+    public void TransactionRollback_ReturnsParkedConnectionToIdleChannel()
+    {
+        // Arrange
+        DbConnectionInternal connection;
+        using (new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            connection = GetConnection(owner);
+            ReturnConnection(connection, owner);
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+            // Act - leaving the scope without calling Complete rolls the transaction back.
+        }
+
+        // Assert
+        AssertPoolState(count: 1, idleCount: 1, transactedCount: 0);
+        AssertEnlistedIn(null, connection);
+    }
+
+    /// <summary>
+    /// A connection parked in the transacted store survives pool shutdown, because closing it
+    /// would abort a possibly distributed transaction. Once that transaction ends, the shut-down
+    /// pool must destroy the connection rather than return it to circulation.
+    /// </summary>
+    [Fact]
+    public void TransactionCompletion_AfterShutdown_DestroysConnection()
+    {
+        // Arrange
+        DbConnectionInternal connection;
+        using (var scope = new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            connection = GetConnection(owner);
+            ReturnConnection(connection, owner);
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+            // Act - the shutdown drain must leave the transacted connection alone.
+            _pool.Shutdown();
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+            scope.Complete();
+        }
+
+        // Assert
+        AssertPoolState(count: 0, idleCount: 0, transactedCount: 0);
+        Assert.True(connection.IsConnectionDoomed,
+            "A shut-down pool must destroy a connection released by its transaction.");
+    }
+
+    /// <summary>
+    /// TransactionEnded on its own, with none of the surrounding lifecycle events, must be a no-op
+    /// for a connection that was never parked. Only parking hands the connection to the pool, so
+    /// even an enlisted connection is still checked out here, and pushing it into the idle channel
+    /// would let a second caller pick it up while the first is still using it.
+    /// </summary>
+    [Fact]
+    public void TransactionEnded_ForEnlistedConnectionThatWasNeverParked_LeavesItCheckedOut()
+    {
+        // Arrange
+        using var scope = new TransactionScope();
+        Transaction? transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        var owner = new SqlConnection();
+        var connection = GetConnection(owner);
+        Assert.NotNull(connection);
+
+        // The connection is enlisted, but checked out rather than parked.
+        AssertEnlistedIn(transaction, connection);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        // Act - the completion notification arrives on its own, with no detach and no return.
+        _pool.TransactionEnded(transaction!, connection);
+
+        // Assert - nothing to release, and the enlistment is untouched.
+        AssertEnlistedIn(transaction, connection);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        // It still reaches the pool through the normal return path.
+        ReturnConnection(connection, owner);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+        scope.Complete();
+    }
+
+    /// <summary>
+    /// A transaction can complete while the application still holds its connection. The connection
+    /// was never parked, so there is nothing for the completion to release, and pushing it into the
+    /// idle channel would hand a connection that is still in use to a second caller.
+    /// </summary>
+    [Fact]
+    public void TransactionCompletes_WhileConnectionStillCheckedOut_LeavesItCheckedOut()
+    {
+        // Arrange
+        var owner = new SqlConnection();
+        DbConnectionInternal connection;
+        using (var scope = new TransactionScope())
+        {
+            connection = GetConnection(owner);
+            Assert.NotNull(connection);
+            AssertEnlistedIn(Transaction.Current, connection);
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+            // Act - the transaction completes with the connection still checked out.
+            scope.Complete();
+        }
+
+        // Assert
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        // It reaches the pool only when its owner returns it.
+        ReturnConnection(connection, owner);
+        AssertPoolState(count: 1, idleCount: 1, transactedCount: 0);
+    }
+
+    /// <summary>
+    /// Releasing a parked connection runs on the System.Transactions transaction-completion
+    /// callback thread, under DbConnectionInternal.DelegatedTransactionEnded's requirement that the
+    /// caller holds a lock on the connection. The pool must not poll the socket there, so the
+    /// liveness probe is suppressed on that path and the connection is pooled without it.
+    /// WaitHandleDbConnectionPool likewise does not probe when returning a connection from the
+    /// transacted store. A connection that died during the transaction is still caught, just later:
+    /// it is validated on its way back out of the idle channel, before it can be vended.
+    /// </summary>
+    [Fact]
+    public void TransactionCommit_ReturningParkedConnection_DoesNotProbeLiveness()
+    {
+        // Arrange
+        MockDbConnectionInternal connection;
+        using (var scope = new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            connection = Assert.IsType<MockDbConnectionInternal>(GetConnection(owner));
+            ReturnConnection(connection, owner);
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+            // Report the connection as dead and ignore any probes made while arranging, so the
+            // assertions below describe only what the completion path itself did.
+            connection.IsDead = true;
+            connection.LivenessProbeCount = 0;
+
+            // Act
+            scope.Complete();
+        }
+
+        // Assert - the completion path pooled it without asking whether it was alive.
+        Assert.Equal(0, connection.LivenessProbeCount);
+        AssertPoolState(count: 1, idleCount: 1, transactedCount: 0);
+
+        // The deferred check still catches it: vending probes the connection, finds it dead, and
+        // discards it rather than handing a broken connection to the caller.
+        var owner2 = new SqlConnection();
+        var connection2 = GetConnection(owner2);
+        Assert.NotSame(connection, connection2);
+        Assert.True(connection.LivenessProbeCount > 0);
+        ReturnConnection(connection2, owner2);
+    }
+
+    /// <summary>
+    /// The counterpart to <see cref="TransactionCommit_ReturningParkedConnection_DoesNotProbeLiveness"/>:
+    /// suppressing the probe is specific to the transaction-completion path. An ordinary return
+    /// runs on the caller's own thread, where blocking is acceptable, so it still probes and drops
+    /// a dead connection immediately instead of leaving it to be discovered later.
+    /// </summary>
+    [Fact]
+    public void ReturnConnection_WhenDeadAndNotEnlisted_ProbesLivenessAndDestroysIt()
+    {
+        // Arrange
+        var owner = new SqlConnection();
+        var connection = Assert.IsType<MockDbConnectionInternal>(GetConnection(owner));
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        connection.IsDead = true;
+        connection.LivenessProbeCount = 0;
+
+        // Act
+        ReturnConnection(connection, owner);
+
+        // Assert
+        Assert.True(connection.LivenessProbeCount > 0);
+        AssertPoolState(count: 0, idleCount: 0, transactedCount: 0);
+    }
+
+    /// <summary>
+    /// A connection parked in the transacted store still holds its pool slot, so with MaxPoolSize
+    /// reached and everything parked, a caller outside the transaction cannot be served and must
+    /// wait. Ending the transaction has to wake it: the release path writes the connection into the
+    /// idle channel, which completes the waiter. If it did not, the caller would block until its
+    /// own timeout even though a connection had become available.
+    /// </summary>
+    [Fact]
+    public async Task TransactionEnd_WithPoolExhaustedByParkedConnection_WakesWaitingCaller()
+    {
+        // Arrange - a pool of exactly one connection, parked under a transaction.
+        ReplaceFixturePool(maxPoolSize: 1);
+
+        DbConnectionInternal parkedConnection;
+        var waiter = new TaskCompletionSource<DbConnectionInternal>(state: null);
+
+        using (var scope = new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            parkedConnection = GetConnection(owner);
+            ReturnConnection(parkedConnection, owner);
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+            // A second caller with no ambient transaction. The pool is at MaxPoolSize and the idle
+            // channel is empty, and the parked connection belongs to a transaction this caller is
+            // not in, so it cannot be served now. Suppress the ambient transaction so the request
+            // is genuinely unrelated rather than being handed the parked connection by affinity.
+            using (new TransactionScope(TransactionScopeOption.Suppress))
+            {
+                bool completedSynchronously = _pool.TryGetConnection(
+                    new SqlConnection(),
+                    waiter,
+                    TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                    out DbConnectionInternal? immediateConnection);
+
+                Assert.False(completedSynchronously);
+                Assert.Null(immediateConnection);
+            }
+
+            Assert.False(waiter.Task.IsCompleted, "The caller must wait while the only connection is parked.");
+
+            // Act
+            scope.Complete();
+        }
+
+        // Assert - the waiter was handed the released connection rather than timing out.
+        DbConnectionInternal servedConnection = await WithTimeout(waiter.Task, TimeSpan.FromSeconds(15));
+        Assert.Same(parkedConnection, servedConnection);
+        AssertEnlistedIn(null, servedConnection);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+    }
+
+    /// <summary>
+    /// Clear cannot destroy a connection parked in the transacted store, because doing so would
+    /// abort a possibly distributed transaction, and the parked connection is not in the idle
+    /// channel that Clear drains. It is instead retired lazily: Clear bumps the generation counter,
+    /// and when the transaction ends the release path sees the stale generation and destroys the
+    /// connection rather than returning it to circulation. This is the channel pool's substitute
+    /// for WaitHandleDbConnectionPool's eager DoNotPoolThisConnection sweep, so the lag between
+    /// Clear returning and the connection actually going away is expected.
+    /// </summary>
+    [Fact]
+    public void Clear_WhileConnectionIsParked_RetiresItOnTransactionEndInsteadOfRepooling()
+    {
+        // Arrange
+        DbConnectionInternal connection;
+        using (var scope = new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            connection = GetConnection(owner);
+            ReturnConnection(connection, owner);
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+            // Act - Clear runs while the connection is parked and its transaction is live.
+            _pool.Clear();
+
+            // Assert - it survives Clear, still parked and still holding its slot.
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+            Assert.False(connection.IsConnectionDoomed);
+
+            scope.Complete();
+        }
+
+        // Assert - on release the stale generation is detected, so the connection is destroyed
+        // instead of being handed to the next caller.
+        Assert.True(connection.IsConnectionDoomed);
+        Assert.Null(connection.Pool);
+        AssertPoolState(count: 0, idleCount: 0, transactedCount: 0);
+
+        // The next caller therefore gets a freshly created connection, not the cleared one.
+        var owner2 = new SqlConnection();
+        var connection2 = GetConnection(owner2);
+        Assert.NotSame(connection, connection2);
+        ReturnConnection(connection2, owner2);
+    }
+
+    #endregion
+
+    #region Stasis
+    /// <summary>
+    /// A transaction root that cannot be pooled is put in stasis rather than destroyed: closing it
+    /// would orphan the root transaction with no way to commit or roll back. Stasis is not the
+    /// transacted store. The connection is filed nowhere, so it is invisible to the idle channel,
+    /// to <see cref="ChannelDbConnectionPool.Clear"/> and to pruning, but it still holds its pool
+    /// slot. The slot comes back when the transaction ends and the connection unwinds through
+    /// PutObjectFromTransactedPool.
+    /// </summary>
+    [Fact]
+    public void ReturnConnection_NonPoolableTransactionRoot_EntersStasisThenReleasesSlotOnTransactionEnd()
+    {
+        // Arrange
+        MockDbConnectionInternal connection;
+        using (var scope = new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            connection = Assert.IsType<MockDbConnectionInternal>(GetConnection(owner));
+
+            // A root that cannot be pooled. Deliberately not doomed: IsConnectionDoomed would
+            // short-circuit the return path before the stasis decision is ever reached.
+            connection.IsRoot = true;
+            connection.MarkDoNotPool();
+            Assert.False(connection.CanBePooled);
+            Assert.False(connection.IsConnectionDoomed);
+
+            // Act
+            ReturnConnection(connection, owner);
+
+            // Assert - in stasis: holding its slot, but filed in neither the idle channel nor the
+            // transacted store, so no other caller can reach it.
+            Assert.True(connection.IsTxRootWaitingForTxEnd);
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+            // It survives a Clear that would have destroyed any pooled connection, because Clear
+            // drains the idle channel and a connection in stasis is not in it.
+            _pool.Clear();
+            Assert.True(connection.IsTxRootWaitingForTxEnd);
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+            scope.Complete();
+        }
+
+        // Assert - the transaction ended, stasis terminated, and because the connection still
+        // cannot be pooled it was destroyed rather than returned to circulation. Its slot is free.
+        Assert.False(connection.IsTxRootWaitingForTxEnd);
+        Assert.Null(connection.Pool);
+        AssertPoolState(count: 0, idleCount: 0, transactedCount: 0);
+    }
+
+    /// <summary>
+    /// The transaction-root counterpart to
+    /// <see cref="ReturnConnection_ToShutDownPool_DestroysConnection"/>. A shut-down pool destroys
+    /// an ordinary connection on return, but a transaction root must still go to stasis instead, or
+    /// shutting down a pool would abort a live transaction. The slot stays outstanding until the
+    /// transaction ends, which is why a completed Shutdown does not imply the pool owns nothing.
+    /// </summary>
+    [Fact]
+    public void ReturnConnection_TransactionRootToShutDownPool_EntersStasisRatherThanBeingDestroyed()
+    {
+        // Arrange
+        MockDbConnectionInternal connection;
+        using (var scope = new TransactionScope())
+        {
+            var owner = new SqlConnection();
+            connection = Assert.IsType<MockDbConnectionInternal>(GetConnection(owner));
+            connection.IsRoot = true;
+
+            _pool.Shutdown();
+
+            // Act
+            ReturnConnection(connection, owner);
+
+            // Assert - not destroyed, unlike the non-root case.
+            Assert.True(connection.IsTxRootWaitingForTxEnd);
+            Assert.False(connection.IsConnectionDoomed);
+            Assert.NotNull(connection.Pool);
+            AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+            scope.Complete();
+        }
+
+        // Assert - the pool is not Running, so the connection is destroyed on the way out of
+        // stasis rather than pooled, and only now does the pool's count reach zero.
+        Assert.False(connection.IsTxRootWaitingForTxEnd);
+        Assert.True(connection.IsConnectionDoomed);
+        Assert.Null(connection.Pool);
+        AssertPoolState(count: 0, idleCount: 0, transactedCount: 0);
+    }
+
+    #endregion
+
+    #region Connection Replacement
+
+    /// <summary>
+    /// Replacing a connection mid-transaction must carry the enlistment across, so the replacement
+    /// is the one that parks in the transacted store when it is returned.
+    /// </summary>
+    [Fact]
+    public void ReplaceConnection_CarriesEnlistedTransactionToNewConnection()
+    {
+        // Arrange
+        using var scope = new TransactionScope();
+        Transaction? transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        var owner = new SqlConnection();
+        var oldConnection = GetConnection(owner);
+        Assert.NotNull(oldConnection);
+        AssertEnlistedIn(transaction, oldConnection);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        // Act
+        var newConnection = _pool.ReplaceConnection(
+            owner,
+            oldConnection,
+            TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+
+        // Assert - a distinct connection took over the old connection's slot, carrying the
+        // enlistment with it.
+        Assert.NotNull(newConnection);
+        Assert.NotSame(oldConnection, newConnection);
+        AssertEnlistedIn(transaction, newConnection);
+        Assert.True(oldConnection.IsConnectionDoomed);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 0);
+
+        ReturnConnection(newConnection, owner);
+
+        // The replacement inherited the transaction, so it parks in the transacted store.
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+        Assert.Equal(1, TransactedConnectionsFor(transaction!));
+
+        scope.Complete();
+    }
+
+    #endregion
+
+    #region Async Ambient Transaction Flow
+
+    /// <summary>
+    /// A <see cref="TransactionScope"/> created without
+    /// <see cref="TransactionScopeAsyncFlowOption.Enabled"/> -- the default -- keeps its ambient
+    /// transaction in thread-static storage, so it does not flow onto the thread pool thread the
+    /// pool opens on. The connection must still enlist, because the transaction is captured on the
+    /// caller's thread before the open is scheduled (see SqlConnection.InternalOpenAsync).
+    ///
+    /// This is one of three guards on that capture. With Enabled the transaction rides an
+    /// AsyncLocal and is live on the pool's worker thread, so reading Transaction.Current there
+    /// would pass every other test in this class -- and silently stop enlisting for the default
+    /// option, which the WaitHandle pool handles correctly. This case is the realistic shape of
+    /// that regression; see also
+    /// <see cref="GetConnectionAsync_EnteredFromThreadWithoutAmbientTransaction_EnlistsFromAsyncState"/>
+    /// and <see cref="GetConnectionAsync_DoesNotSetAmbientTransactionOnPoolWorkerThread"/>.
+    ///
+    /// The open is started inside the scope but awaited outside it. That is not incidental:
+    /// awaiting inside resumes the continuation on a thread pool thread, and disposing the scope
+    /// there throws "A TransactionScope must be disposed on the same thread that it was created."
+    /// That is the very limitation TransactionScopeAsyncFlowOption.Enabled exists to remove, so a
+    /// test of the suppressed case cannot avoid it. The scope is given an explicit
+    /// <see cref="CommittableTransaction"/> so that leaving the scope ends the scope without
+    /// ending the transaction the pool is still enlisting in.
+    /// </summary>
+    [Fact]
+    public async Task GetConnectionAsync_WithAsyncFlowDisabled_StillEnlistsInAmbientTransaction()
+    {
+        // Arrange
+        using var transaction = new CommittableTransaction();
+        var owner = new SqlConnection();
+        Task<DbConnectionInternal> openTask;
+
+        using (var scope = new TransactionScope(transaction))
+        {
+            Assert.Equal(transaction, Transaction.Current);
+
+            // Act - starting the open captures the ambient transaction synchronously, here, and
+            // hands the rest of the work to a thread pool thread.
+            openTask = GetConnectionAsync(owner);
+            scope.Complete();
+        }
+
+        var connection = await openTask;
+
+        // Assert
+        Assert.NotNull(connection);
+        Assert.Equal(transaction, connection.EnlistedTransaction);
+
+        ReturnConnection(connection, owner);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+        Assert.Equal(1, TransactedConnectionsFor(transaction));
+
+        transaction.Rollback();
+    }
+
+    /// <summary>
+    /// The pool must take the transaction from AsyncState rather than from whatever is ambient on
+    /// the thread that happens to enter it. TryGetConnection is normally called synchronously from
+    /// the caller's thread, where the two agree -- but on the retry path
+    /// (SqlConnection.OpenAsyncRetry.Retry) the pool is re-entered from a continuation running on
+    /// an arbitrary thread, which has no ambient transaction. Reading Transaction.Current there
+    /// would silently drop the enlistment, or worse, pick up an unrelated transaction.
+    ///
+    /// No TransactionScope is opened here, so this thread already stands in for that continuation:
+    /// the transaction exists but is not ambient anywhere, and AsyncState is the only channel
+    /// carrying it.
+    /// </summary>
+    [Fact]
+    public async Task GetConnectionAsync_EnteredFromThreadWithoutAmbientTransaction_EnlistsFromAsyncState()
+    {
+        // Arrange
+        using var transaction = new CommittableTransaction();
+        var owner = new SqlConnection();
+        Assert.Null(Transaction.Current);
+
+        // Act - carry the transaction only in AsyncState, the way a retry continuation does.
+        var connection = await GetConnectionAsync(owner, transaction);
+
+        // Assert
+        Assert.NotNull(connection);
+        Assert.Equal(transaction, connection.EnlistedTransaction);
+
+        ReturnConnection(connection, owner);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+        Assert.Equal(1, TransactedConnectionsFor(transaction));
+
+        transaction.Rollback();
+    }
+
+    /// <summary>
+    /// The pool must enlist the connection in the caller's transaction without making that
+    /// transaction ambient on the thread it opens on. Assigning Transaction.Current writes to
+    /// thread-static storage that ExecutionContext does not unwind, so doing it on a thread pool
+    /// thread would leave a stale transaction behind for unrelated work later scheduled onto that
+    /// same thread -- including the login-time auto-enlistment that non-pooled connections perform
+    /// against the ambient transaction. The pool must pass the transaction explicitly instead of
+    /// assigning it.
+    ///
+    /// The connection factory runs inside the pool's own open work, so it observes what the pool
+    /// made ambient there. That is an observation of the code under test rather than of whichever
+    /// thread happened to run it, so it does not depend on thread identity or scheduling.
+    /// </summary>
+    [Fact]
+    public async Task GetConnectionAsync_DoesNotSetAmbientTransactionOnPoolWorkerThread()
+    {
+        // Arrange - a transaction the pool must enlist in but must not make ambient.
+        using var transaction = new CommittableTransaction();
+        Assert.Null(Transaction.Current);
+
+        // Act
+        var owner = new SqlConnection();
+        var connection = await GetConnectionAsync(owner, transaction);
+
+        // Assert - the pool left the worker's ambient transaction alone while still enlisting the
+        // connection.
+        Assert.Equal(1, _connectionFactory.CreateCount);
+        Assert.Null(_connectionFactory.AmbientTransactionAtCreate);
+        Assert.Equal(transaction, connection.EnlistedTransaction);
+
+        ReturnConnection(connection, owner);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+        transaction.Rollback();
+    }
+
+    /// <summary>
+    /// The synchronous path runs on the caller's thread, where the ambient transaction set by a
+    /// TransactionScope is directly observable and must still be honored even though no
+    /// transaction is handed to the pool explicitly.
+    /// </summary>
+    [Fact]
+    public void GetConnection_Sync_UsesAmbientTransactionFromCallersThread()
+    {
+        // Arrange
+        using var scope = new TransactionScope();
+        Transaction? transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        // Act
+        var owner = new SqlConnection();
+        var connection = GetConnection(owner);
+
+        // Assert
+        Assert.NotNull(connection);
+        Assert.Equal(transaction, connection.EnlistedTransaction);
+
+        ReturnConnection(connection, owner);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+
+        scope.Complete();
+    }
+
+    /// <summary>
+    /// The asynchronous equivalent of the case above. The pool cannot read the caller's ambient
+    /// transaction itself, because the open runs on a thread pool thread it does not flow to, so
+    /// the caller captures it and passes it in AsyncState. Even with a scope created with
+    /// <see cref="TransactionScopeAsyncFlowOption.Enabled"/>, where the transaction is genuinely
+    /// ambient on the calling thread, that capture is what has to carry it through.
+    /// </summary>
+    [Fact]
+    public async Task GetConnectionAsync_UsesAmbientTransactionCapturedOnCallersThread()
+    {
+        // Arrange
+        using var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
+        Transaction? transaction = Transaction.Current;
+        Assert.NotNull(transaction);
+
+        // Act - no transaction is passed explicitly, so the helper captures the ambient one on
+        // this thread exactly as SqlConnection.InternalOpenAsync does.
+        var owner = new SqlConnection();
+        var connection = await GetConnectionAsync(owner);
+
+        // Assert
+        Assert.NotNull(connection);
+        Assert.Equal(transaction, connection.EnlistedTransaction);
+
+        ReturnConnection(connection, owner);
+        AssertPoolState(count: 1, idleCount: 0, transactedCount: 1);
+        Assert.Equal(1, TransactedConnectionsFor(transaction!));
+
+        scope.Complete();
+    }
+
+    #endregion
+
+    #region Mock Classes
+
+    internal class MockSqlConnectionFactory : SqlConnectionFactory
+    {
+        /// <summary>
+        /// The value of <see cref="Transaction.Current"/> observed on the thread the pool used to
+        /// create the connection. On the asynchronous path that is the thread pool thread the pool
+        /// runs its open work on, so this is a direct observation of whether the pool assigned the
+        /// ambient transaction there.
+        /// </summary>
+        public Transaction? AmbientTransactionAtCreate { get; private set; }
+
+        public int CreateCount { get; private set; }
+
+        protected override DbConnectionInternal CreateConnection(
+            SqlConnectionOptions options,
+            ConnectionPoolKey poolKey,
+            DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+            IDbConnectionPool pool,
+            DbConnection owningConnection,
+            TimeoutTimer timeout)
+        {
+            AmbientTransactionAtCreate = Transaction.Current;
+            CreateCount++;
+            return new MockDbConnectionInternal();
+        }
+    }
+
+    internal class MockDbConnectionInternal : DbConnectionInternal
+    {
+        private static int s_nextId = 1;
+        public int MockId { get; } = Interlocked.Increment(ref s_nextId);
+
+        public override string ServerVersion => "Mock";
+
+        public override ConnectionCapabilities Capabilities => new();
+
+        public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void EnlistTransaction(Transaction? transaction)
+        {
+            if (transaction != null)
+            {
+                EnlistedTransaction = transaction;
+            }
+        }
+
+        protected override void Activate(Transaction? transaction)
+        {
+            EnlistedTransaction = transaction;
+        }
+
+        protected override void Deactivate()
+        {
+        }
+
+        internal void Doom() => DoomThisConnection();
+
+        /// <summary>
+        /// Marks the connection unfit for pooling without dooming it. This is the distinction the
+        /// pool cares about: <see cref="DbConnectionInternal.IsConnectionDoomed"/> short-circuits
+        /// the return path before the transacted decision, whereas a merely non-poolable connection
+        /// still reaches it and can be put in stasis.
+        /// </summary>
+        internal void MarkDoNotPool() => DoNotPoolThisConnection();
+
+        /// <summary>
+        /// When true, the connection reports itself as the root of a delegated transaction, which
+        /// is what makes the pool put it in stasis rather than destroy it.
+        /// </summary>
+        internal bool IsRoot { get; set; }
+
+        internal override bool IsTransactionRoot => IsRoot;
+
+        /// <summary>
+        /// When true, the connection reports itself as dead from
+        /// <see cref="IsConnectionAlive"/>, simulating a physical connection that died while the
+        /// pool was not looking.
+        /// </summary>
+        internal bool IsDead { get; set; }
+
+        /// <summary>
+        /// Counts calls to <see cref="IsConnectionAlive"/>. Settable so a test can zero it after
+        /// arranging and observe only the probes made by the operation under test.
+        /// </summary>
+        internal int LivenessProbeCount { get; set; }
+
+        internal override bool IsConnectionAlive(bool throwOnException = false)
+        {
+            LivenessProbeCount++;
+            return !IsDead;
+        }
+
+        public override string ToString() => $"MockConnection_{MockId}";
+
+        internal override void ResetConnection()
+        {
+        }
+    }
+
+    #endregion
+}

From 1cbb68d1ebeb489e6ec94aa93004d60c76527a09 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Tue, 11 Aug 2026 09:45:56 -0700
Subject: [PATCH 226/298] Use parameterized trace calls instead of eager
 interpolated strings (#4528)

* Avoid eager string interpolation at guarded trace call sites

Interpolated strings passed to SqlClientEventSource.Try*Event are built
unconditionally at the call site, so the overload's internal
IsTraceEnabled/IsAdvancedTraceOn check no longer avoids the cost. This
allocates on every call even with tracing off.

SqlConnectionInternal.Deactivate runs on every pooled connection return and
accounted for ~200 bytes per open/close cycle, which is most of the +264
bytes/op regression the connection pool benchmarks show against 6.1.6.

Wrap the affected call sites in the matching enablement check so the string
is only built when the event will be written. The guards mirror the checks
already inside each overload, so behavior is unchanged.

Measured on a pooled open/close loop against the in-proc TDS server:
sync 688.5 -> 488.5 bytes/op, async 880.5 -> 680.5 bytes/op.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Fix trace message artifacts from the interpolated-string conversion

Three call sites were mis-converted when they moved to interpolated strings:

- OnFeatureExtAck logged "Object ID {0}", which in an interpolated string is
  the expression 0, so it always reported an object ID of 0 instead of the
  actual one.
- Two sites kept a trailing format argument after interpolation. These bind to
  the generic overload, which runs string.Format over already-formatted text.
  The argument is redundant, and a value containing a brace (a routed server
  name, for instance) would raise a FormatException from inside tracing.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Guard remaining eager trace strings on the command execution path

The earlier sweep only matched calls whose first argument began with an
interpolated string, so it missed the "literal " + $"..." form. That form
allocates the same way.

The remaining 41 sites include the correlation traces in ExecuteReader,
ExecuteNonQuery, ExecuteScalar and ExecuteXmlReader, which interpolate
CommandText and ClientConnectionId on every execution. In 6.1.6 these passed
a constant format string with arguments, so nothing was built unless the
event was enabled.

Measured on a repeated ExecuteReader loop: 3199.4 -> 1027.5 bytes/op.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Use parameterized trace calls instead of eager interpolated strings

The Try*Event overloads check whether the event is enabled before doing
any formatting work. Passing an interpolated string defeats that, because
the string is built at the call site before the call is made, so every
traced operation allocated even with tracing switched off.

Converts the 119 interpolated call sites introduced since 6.1.6 back to
a composite format string plus arguments, which is what the overloads are
designed for. Trace output is unchanged.

Also corrects two artifacts of the original conversion:
- OnFeatureExtAck logged "Object ID {0}", which inside an interpolated
  string is the expression 0, so it always reported 0.
- Two calls kept a trailing argument that duplicated an interpolated
  expression; the argument is now the format argument.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Preserve time-only formatting in fed auth trace messages

The generic Try*Event overloads call ToString() on each argument before
string.Format, so a {1:T} specifier in the composite format string is
never applied. Three fed auth trace sites relied on :T and would have
logged full date and time instead of time only.

Guard these three sites on the matching enablement check and pass
pre-formatted time strings, which keeps the output identical to the
interpolated version and still allocates nothing when tracing is off.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Michael Daigle <13396919+cheenamalhotra@users.noreply.github.com>
---
 .../Connection/SqlConnectionInternal.cs       | 488 +++++++++++-------
 .../SqlAuthenticationProviderManager.cs       |  47 +-
 .../Data/SqlClient/SqlCommand.NonQuery.cs     | 129 +++--
 .../Data/SqlClient/SqlCommand.Reader.cs       | 150 ++++--
 .../Data/SqlClient/SqlCommand.Scalar.cs       |  33 +-
 .../Data/SqlClient/SqlCommand.Xml.cs          |  72 ++-
 .../Microsoft/Data/SqlClient/SqlCommand.cs    | 137 +++--
 .../Data/SqlClient/Utilities/AsyncHelper.cs   |   2 +-
 8 files changed, 665 insertions(+), 393 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index fd8817b9aa..408564f855 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -425,9 +425,10 @@ internal SqlConnectionInternal(
             }
 
             SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                $"SqlInternalConnectionTds.ctor | ADV | " +
-                $"Object ID {ObjectID}, " +
-                $"constructed new TDS internal connection");
+                "SqlInternalConnectionTds.ctor | ADV | " +
+                "Object ID {0}, " +
+                "constructed new TDS internal connection",
+                ObjectID);
         }
 
         #endregion
@@ -843,9 +844,10 @@ internal SqlTransaction BeginSqlTransaction(
         internal void BreakConnection()
         {
             SqlClientEventSource.Log.TryTraceEvent(
-                $"SqlInternalConnectionTds.BreakConnection | RES | CPOOL " +
-                $"Object ID {ObjectID}, " +
-                $"Breaking connection.");
+                "SqlInternalConnectionTds.BreakConnection | RES | CPOOL " +
+                "Object ID {0}, " +
+                "Breaking connection.",
+                ObjectID);
 
             DoomThisConnection();   // Mark connection as unusable, so it will be destroyed
             Connection?.Close();
@@ -920,8 +922,9 @@ internal void DisconnectTransaction(SqlInternalTransaction internalTransaction)
         public override void Dispose()
         {
             SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                $"SqlInternalConnectionTds.Dispose | ADV | " +
-                $"Object ID {ObjectID} disposing");
+                "SqlInternalConnectionTds.Dispose | ADV | " +
+                "Object ID {0} disposing",
+                ObjectID);
 
             try
             {
@@ -950,9 +953,10 @@ public override void Dispose()
         internal void EnlistNull()
         {
             SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                $"SqlInternalConnection.EnlistNull | ADV | " +
-                $"Object ID {ObjectID}, " +
-                $"unenlisting.");
+                "SqlInternalConnection.EnlistNull | ADV | " +
+                "Object ID {0}, " +
+                "unenlisting.",
+                ObjectID);
 
             // We were in a transaction, but now we are not - so send message to server with empty
             // transaction - confirmed proper behavior from Sameet Agarwal.
@@ -970,9 +974,10 @@ internal void EnlistNull()
             EnlistedTransaction = null;
 
             SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                $"SqlInternalConnection.EnlistNull | ADV | " +
-                $"Object ID {ObjectID}, " +
-                $"unenlisted.");
+                "SqlInternalConnection.EnlistNull | ADV | " +
+                "Object ID {0}, " +
+                "unenlisted.",
+                ObjectID);
 
             // The EnlistTransaction above will return an TransactionEnded event, which causes the
             // TdsParser to clear the current transaction. In either case, when we're working with
@@ -1180,9 +1185,10 @@ internal void OnEnvChange(SqlEnvChange rec)
 
                 case TdsEnums.ENV_ROUTING:
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnEnvChange | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received routing info");
+                        "SqlInternalConnectionTds.OnEnvChange | ADV | " +
+                        "Object ID {0}, " +
+                        "Received routing info",
+                        ObjectID);
 
                     if (string.IsNullOrEmpty(rec._newRoutingInfo.ServerName) ||
                         rec._newRoutingInfo.Protocol != 0 ||
@@ -1196,9 +1202,10 @@ internal void OnEnvChange(SqlEnvChange rec)
 
                 case TdsEnums.ENV_ENHANCEDROUTING:
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnEnvChange | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received enhanced routing info");
+                        "SqlInternalConnectionTds.OnEnvChange | ADV | " +
+                        "Object ID {0}, " +
+                        "Received enhanced routing info",
+                        ObjectID);
 
                     if (string.IsNullOrEmpty(rec._newRoutingInfo.ServerName) ||
                         string.IsNullOrEmpty(rec._newRoutingInfo.DatabaseName) ||
@@ -1320,16 +1327,18 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                 case TdsEnums.FEATUREEXT_GLOBALTRANSACTIONS:
                 {
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received feature extension acknowledgement for GlobalTransactions");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for GlobalTransactions",
+                        ObjectID);
 
                     if (data.Length < 1)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Unknown version number for GlobalTransactions");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Unknown version number for GlobalTransactions",
+                            ObjectID);
 
                         throw SQL.ParsingError();
                     }
@@ -1342,16 +1351,18 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                 case TdsEnums.FEATUREEXT_FEDAUTH:
                 {
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {0}, " +
-                        $"Received feature extension acknowledgement for federated authentication");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for federated authentication",
+                        ObjectID);
 
                     if (!_federatedAuthenticationRequested)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Did not request federated authentication");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Did not request federated authentication",
+                            ObjectID);
 
                         throw SQL.ParsingErrorFeatureId(ParsingErrorState.UnrequestedFeatureAckReceived, featureId);
                     }
@@ -1367,9 +1378,10 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                             if (data.Length != 0)
                             {
                                 SqlClientEventSource.Log.TryTraceEvent(
-                                    $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                                    $"Object ID {ObjectID}, " +
-                                    $"Federated authentication feature extension ack for MSAL and Security Token includes extra data");
+                                    "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                                    "Object ID {0}, " +
+                                    "Federated authentication feature extension ack for MSAL and Security Token includes extra data",
+                                    ObjectID);
 
                                 throw SQL.ParsingError(ParsingErrorState.FedAuthFeatureAckContainsExtraData);
                             }
@@ -1378,9 +1390,10 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
 
                         default:
                             SqlClientEventSource.Log.TryTraceEvent(
-                                $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                                $"Object ID {ObjectID}, " +
-                                $"Attempting to use unknown federated authentication library");
+                                "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                                "Object ID {0}, " +
+                                "Attempting to use unknown federated authentication library",
+                                ObjectID);
 
                             Debug.Fail("Unknown _fedAuthLibrary type");
                             throw SQL.ParsingErrorLibraryType(
@@ -1418,17 +1431,19 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                         if (newAuthenticationContextInCacheAfterAddOrUpdate == _newDbConnectionPoolAuthenticationContext)
                         {
                             SqlClientEventSource.Log.TryTraceEvent(
-                                $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                                $"Object ID {ObjectID}, " +
-                                $"Updated the new dbAuthenticationContext in the _dbConnectionPool.AuthenticationContexts.");
+                                "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                                "Object ID {0}, " +
+                                "Updated the new dbAuthenticationContext in the _dbConnectionPool.AuthenticationContexts.",
+                                ObjectID);
                         }
                         else
                         {
                             SqlClientEventSource.Log.TryTraceEvent(
-                                $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                                $"Object ID {ObjectID }, " +
-                                $"AddOrUpdate attempted on _dbConnectionPool.AuthenticationContexts, " +
-                                $"but it did not update the new value.");
+                                "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                                "Object ID {0}, " +
+                                "AddOrUpdate attempted on _dbConnectionPool.AuthenticationContexts, " +
+                                "but it did not update the new value.",
+                                ObjectID);
                         }
                         #endif
                     }
@@ -1438,16 +1453,18 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                 case TdsEnums.FEATUREEXT_TCE:
                 {
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received feature extension acknowledgement for TCE");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for TCE",
+                        ObjectID);
 
                     if (data.Length < 1)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Unknown version number for TCE");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Unknown version number for TCE",
+                            ObjectID);
 
                         throw SQL.ParsingError(ParsingErrorState.TceUnknownVersion);
                     }
@@ -1456,9 +1473,10 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                     if (supportedTceVersion == 0 || supportedTceVersion > TdsEnums.MAX_SUPPORTED_TCE_VERSION)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Invalid version number for TCE");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Invalid version number for TCE",
+                            ObjectID);
 
                         throw SQL.ParsingErrorValue(ParsingErrorState.TceInvalidVersion, supportedTceVersion);
                     }
@@ -1475,9 +1493,10 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                 case TdsEnums.FEATUREEXT_AZURESQLSUPPORT:
                 {
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received feature extension acknowledgement for AzureSQLSupport");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for AzureSQLSupport",
+                        ObjectID);
 
                     if (data.Length < 1)
                     {
@@ -1491,9 +1510,10 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                     if (Capabilities.ReadOnlyFailoverPartnerConnection && SqlClientEventSource.Log.IsTraceEnabled())
                     {
                         SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                            $"Object ID {ObjectID}, " +
-                            $"FailoverPartner enabled with Readonly intent for AzureSQL DB");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                            "Object ID {0}, " +
+                            "FailoverPartner enabled with Readonly intent for AzureSQL DB",
+                            ObjectID);
                     }
 
                     break;
@@ -1501,16 +1521,18 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                 case TdsEnums.FEATUREEXT_DATACLASSIFICATION:
                 {
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received feature extension acknowledgement for DATACLASSIFICATION");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for DATACLASSIFICATION",
+                        ObjectID);
 
                     if (data.Length < 1)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Unknown token for DATACLASSIFICATION");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Unknown token for DATACLASSIFICATION",
+                            ObjectID);
 
                         throw SQL.ParsingError(ParsingErrorState.CorruptedTdsStream);
                     }
@@ -1520,9 +1542,10 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                         supportedDataClassificationVersion > TdsEnums.DATA_CLASSIFICATION_VERSION_MAX_SUPPORTED)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Invalid version number for DATACLASSIFICATION");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Invalid version number for DATACLASSIFICATION",
+                            ObjectID);
 
                         throw SQL.ParsingErrorValue(
                             ParsingErrorState.DataClassificationInvalidVersion,
@@ -1532,9 +1555,10 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                     if (data.Length != 2)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Unknown token for DATACLASSIFICATION");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Unknown token for DATACLASSIFICATION",
+                            ObjectID);
 
                         throw SQL.ParsingError(ParsingErrorState.CorruptedTdsStream);
                     }
@@ -1550,16 +1574,18 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                 case TdsEnums.FEATUREEXT_UTF8SUPPORT:
                 {
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received feature extension acknowledgement for UTF8 support");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for UTF8 support",
+                        ObjectID);
 
                     if (data.Length < 1)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Unknown value for UTF8 support", ObjectID);
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Unknown value for UTF8 support",
+                            ObjectID);
 
                         throw SQL.ParsingError();
                     }
@@ -1571,16 +1597,18 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                 case TdsEnums.FEATUREEXT_SQLDNSCACHING:
                 {
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received feature extension acknowledgement for SQLDNSCACHING");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for SQLDNSCACHING",
+                        ObjectID);
 
                     if (data.Length < 1)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Unknown token for SQLDNSCACHING");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Unknown token for SQLDNSCACHING",
+                            ObjectID);
 
                         throw SQL.ParsingError(ParsingErrorState.CorruptedTdsStream);
                     }
@@ -1611,16 +1639,18 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                 case TdsEnums.FEATUREEXT_JSONSUPPORT:
                 {
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received feature extension acknowledgement for JSONSUPPORT");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for JSONSUPPORT",
+                        ObjectID);
 
                     if (data.Length != 1)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Unknown token for JSONSUPPORT");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Unknown token for JSONSUPPORT",
+                            ObjectID);
 
                         throw SQL.ParsingError(ParsingErrorState.CorruptedTdsStream);
                     }
@@ -1629,9 +1659,10 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                     if (jsonSupportVersion == 0 || jsonSupportVersion > TdsEnums.MAX_SUPPORTED_JSON_VERSION)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Invalid version number for JSONSUPPORT");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Invalid version number for JSONSUPPORT",
+                            ObjectID);
 
                         throw SQL.ParsingError();
                     }
@@ -1642,16 +1673,18 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                 case TdsEnums.FEATUREEXT_VECTORSUPPORT:
                 {
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received feature extension acknowledgement for VECTORSUPPORT");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for VECTORSUPPORT",
+                        ObjectID);
 
                     if (data.Length != 1)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Unknown token for VECTORSUPPORT");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Unknown token for VECTORSUPPORT",
+                            ObjectID);
 
                         throw SQL.ParsingError(ParsingErrorState.CorruptedTdsStream);
                     }
@@ -1660,10 +1693,13 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                     if (vectorSupportVersion == 0 || vectorSupportVersion > TdsEnums.MAX_SUPPORTED_VECTOR_VERSION)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Invalid version number {vectorSupportVersion} for VECTORSUPPORT, " +
-                            $"Max supported version is {TdsEnums.MAX_SUPPORTED_VECTOR_VERSION}");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Invalid version number {1} for VECTORSUPPORT, " +
+                            "Max supported version is {2}",
+                            ObjectID,
+                            vectorSupportVersion,
+                            TdsEnums.MAX_SUPPORTED_VECTOR_VERSION);
 
                         throw SQL.ParsingError();
                     }
@@ -1677,9 +1713,10 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                     if (data.Length != 1)
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
-                            $"Object ID {ObjectID}, " +
-                            $"Unknown token for ENHANCEDROUTINGSUPPORT");
+                            "SqlInternalConnectionTds.OnFeatureExtAck | ERR | " +
+                            "Object ID {0}, " +
+                            "Unknown token for ENHANCEDROUTINGSUPPORT",
+                            ObjectID);
 
                         throw SQL.ParsingError(ParsingErrorState.CorruptedTdsStream);
                     }
@@ -1688,19 +1725,22 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                     Capabilities.EnhancedRouting = data[0] == 1;
 
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received feature extension acknowledgement for " +
-                        $"ENHANCEDROUTINGSUPPORT = {IsEnhancedRoutingSupportEnabled}");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for " +
+                        "ENHANCEDROUTINGSUPPORT = {1}",
+                        ObjectID,
+                        IsEnhancedRoutingSupportEnabled);
                     break;
                 }
                 case TdsEnums.FEATUREEXT_USERAGENT:
                 {
                     // Unexpected ack from server but we ignore it entirely
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Received feature extension acknowledgement for USERAGENTSUPPORT (ignored)");
+                        "SqlInternalConnectionTds.OnFeatureExtAck | ADV | " +
+                        "Object ID {0}, " +
+                        "Received feature extension acknowledgement for USERAGENTSUPPORT (ignored)",
+                        ObjectID);
 
                     break;
                 }
@@ -1772,13 +1812,19 @@ internal void OnFedAuthInfo(SqlFedAuthInfo fedAuthInfo)
                         // If the authentication context is expiring within next 10 minutes, lets
                         // just re-create a token for this connection attempt. And on successful
                         // login, try to update the cache with the new token.
-                        SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.OnFedAuthInfo | " +
-                            $"Object ID {ObjectID}, " +
-                            $"The expiration time is less than 10 mins, trying to get new access " +
-                            $"token regardless of if an other thread is also trying to update it. " +
-                            $"The expiration time is {dbConnectionPoolAuthenticationContext.ExpirationTime:T}. " +
-                            $"Current Time is {DateTime.UtcNow:T}.");
+                        if (SqlClientEventSource.Log.IsTraceEnabled())
+                        {
+                            SqlClientEventSource.Log.TryTraceEvent(
+                                "SqlInternalConnectionTds.OnFedAuthInfo | " +
+                                "Object ID {0}, " +
+                                "The expiration time is less than 10 mins, trying to get new access " +
+                                "token regardless of if an other thread is also trying to update it. " +
+                                "The expiration time is {1}. " +
+                                "Current Time is {2}.",
+                                ObjectID,
+                                dbConnectionPoolAuthenticationContext.ExpirationTime.ToString("T"),
+                                DateTime.UtcNow.ToString("T"));
+                        }
                         attemptRefreshTokenUnLocked = true;
                     }
                     #if DEBUG
@@ -1800,12 +1846,18 @@ internal void OnFedAuthInfo(SqlFedAuthInfo fedAuthInfo)
                         // If the token is expiring within the next 45 mins, try to fetch a new
                         // token, if there is no thread already doing it. If a thread is already
                         // doing the refresh, just use the existing token in the cache and proceed.
-                        SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                            $"SqlInternalConnectionTds.OnFedAuthInfo | ADV | " +
-                            $"Object ID {ObjectID}, " +
-                            $"The authentication context needs a refresh. " +
-                            $"The expiration time is {dbConnectionPoolAuthenticationContext.ExpirationTime:T}. " +
-                            $"Current Time is {DateTime.UtcNow:T}.");
+                        if (SqlClientEventSource.Log.IsAdvancedTraceOn())
+                        {
+                            SqlClientEventSource.Log.TryAdvancedTraceEvent(
+                                "SqlInternalConnectionTds.OnFedAuthInfo | ADV | " +
+                                "Object ID {0}, " +
+                                "The authentication context needs a refresh. " +
+                                "The expiration time is {1}. " +
+                                "Current Time is {2}.",
+                                ObjectID,
+                                dbConnectionPoolAuthenticationContext.ExpirationTime.ToString("T"),
+                                DateTime.UtcNow.ToString("T"));
+                        }
 
                         // Call the function which tries to acquire a lock over the authentication
                         // context before trying to update. If the lock could not be obtained, it
@@ -1828,17 +1880,19 @@ internal void OnFedAuthInfo(SqlFedAuthInfo fedAuthInfo)
                         if (attemptRefreshTokenLocked)
                         {
                             SqlClientEventSource.Log.TryTraceEvent(
-                                $"SqlInternalConnectionTds.OnFedAuthInfo | " +
-                                $"Object ID {ObjectID}, " +
-                                $"The attempt to get a new access token succeeded under the locked mode.");
+                                "SqlInternalConnectionTds.OnFedAuthInfo | " +
+                                "Object ID {0}, " +
+                                "The attempt to get a new access token succeeded under the locked mode.",
+                                ObjectID);
                         }
                     }
 
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.OnFedAuthInfo | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Found an authentication context in the cache that does not need a refresh at this time. " +
-                        $"Re-using the cached token.");
+                        "SqlInternalConnectionTds.OnFedAuthInfo | " +
+                        "Object ID {0}, " +
+                        "Found an authentication context in the cache that does not need a refresh at this time. " +
+                        "Re-using the cached token.",
+                        ObjectID);
                 }
             }
 
@@ -2017,9 +2071,11 @@ protected override void Deactivate()
             try
             {
                 SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                    $"SqlInternalConnection.Deactivate | ADV | " +
-                    $"Object ID {ObjectID} deactivating, " +
-                    $"Client Connection Id {Connection?.ClientConnectionId}");
+                    "SqlInternalConnection.Deactivate | ADV | " +
+                    "Object ID {0} deactivating, " +
+                    "Client Connection Id {1}",
+                    ObjectID,
+                    Connection?.ClientConnectionId);
 
                 SqlReferenceCollection referenceCollection = (SqlReferenceCollection)ReferenceCollection;
                 referenceCollection?.Deactivate();
@@ -2218,18 +2274,20 @@ private void CompleteLogin(bool enlistOK) // @TODO: Rename as per guidelines
                 if (_federatedAuthenticationRequested && !_federatedAuthenticationAcknowledged)
                 {
                     SqlClientEventSource.Log.TryTraceEvent(
-                        $"SqlInternalConnectionTds.CompleteLogin | ERR | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Server did not acknowledge the federated authentication request");
+                        "SqlInternalConnectionTds.CompleteLogin | ERR | " +
+                        "Object ID {0}, " +
+                        "Server did not acknowledge the federated authentication request",
+                        ObjectID);
                     throw SQL.ParsingError(ParsingErrorState.FedAuthNotAcknowledged);
                 }
 
                 if (_federatedAuthenticationInfoRequested && !_federatedAuthenticationInfoReceived)
                 {
                     SqlClientEventSource.Log.TryTraceEvent(
-                        $"SqlInternalConnectionTds.CompleteLogin | ERR | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Server never sent the requested federated authentication info");
+                        "SqlInternalConnectionTds.CompleteLogin | ERR | " +
+                        "Object ID {0}, " +
+                        "Server never sent the requested federated authentication info",
+                        ObjectID);
                     throw SQL.ParsingError(ParsingErrorState.FedAuthInfoNotReceived);
                 }
 
@@ -2346,10 +2404,12 @@ private void EnlistNonNull(Transaction transaction)
             Debug.Assert(transaction != null, "null transaction?");
 
             SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                $"SqlInternalConnection.EnlistNonNull | ADV | " +
-                $"Object ID {ObjectID}, " +
-                $"Transaction Id {transaction?.TransactionInformation?.LocalIdentifier}, " +
-                $"attempting to delegate.");
+                "SqlInternalConnection.EnlistNonNull | ADV | " +
+                "Object ID {0}, " +
+                "Transaction Id {1}, " +
+                "attempting to delegate.",
+                ObjectID,
+                transaction?.TransactionInformation?.LocalIdentifier);
 
             bool hasDelegatedTransaction = false;
             SqlDelegatedTransaction delegatedTransaction = new(this, transaction);
@@ -2408,11 +2468,15 @@ private void EnlistNonNull(Transaction transaction)
                 {
                     DelegatedTransaction = delegatedTransaction;
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnection.EnlistNonNull | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Client Connection Id {Connection?.ClientConnectionId} " +
-                        $"delegated to transaction {delegatedTransaction?.ObjectID} " +
-                        $"with transactionId {delegatedTransaction?.Transaction?.TransactionInformation?.LocalIdentifier}");
+                        "SqlInternalConnection.EnlistNonNull | ADV | " +
+                        "Object ID {0}, " +
+                        "Client Connection Id {1} " +
+                        "delegated to transaction {2} " +
+                        "with transactionId {3}",
+                        ObjectID,
+                        Connection?.ClientConnectionId,
+                        delegatedTransaction?.ObjectID,
+                        delegatedTransaction?.Transaction?.TransactionInformation?.LocalIdentifier);
                 }
             }
             catch (SqlException e)
@@ -2442,9 +2506,10 @@ private void EnlistNonNull(Transaction transaction)
             if (!hasDelegatedTransaction)
             {
                 SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                    $"SqlInternalConnection.EnlistNonNull | ADV | " +
-                    $"Object ID {ObjectID}, " +
-                    $"delegation not possible, enlisting.");
+                    "SqlInternalConnection.EnlistNonNull | ADV | " +
+                    "Object ID {0}, " +
+                    "delegation not possible, enlisting.",
+                    ObjectID);
 
                 byte[] cookie = null;
 
@@ -2473,10 +2538,13 @@ private void EnlistNonNull(Transaction transaction)
 
                 IsEnlistedInTransaction = true;
                 SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                    $"SqlInternalConnection.EnlistNonNull | ADV | " +
-                    $"Object ID {ObjectID}, " +
-                    $"Client Connection Id {Connection?.ClientConnectionId}, " +
-                    $"Enlisted in transaction with transactionId {transaction?.TransactionInformation?.LocalIdentifier}");
+                    "SqlInternalConnection.EnlistNonNull | ADV | " +
+                    "Object ID {0}, " +
+                    "Client Connection Id {1}, " +
+                    "Enlisted in transaction with transactionId {2}",
+                    ObjectID,
+                    Connection?.ClientConnectionId,
+                    transaction?.TransactionInformation?.LocalIdentifier);
             }
 
             // Tell the base class about our enlistment
@@ -3063,8 +3131,9 @@ private void Login(
         private void LoginFailure()
         {
             SqlClientEventSource.Log.TryTraceEvent(
-                $"SqlInternalConnectionTds.LoginFailure | RES | CPOOL | " +
-                $"Object ID {ObjectID}");
+                "SqlInternalConnectionTds.LoginFailure | RES | CPOOL | " +
+                "Object ID {0}",
+                ObjectID);
 
             // If the parser was allocated, and we failed, then we must have failed on either the
             // Connect or Login, either way we should call Disconnect. Disconnect can be called if
@@ -3103,9 +3172,11 @@ private void LoginNoFailover(
             ServerInfo originalServerInfo = serverInfo;
 
             SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                $"SqlInternalConnectionTds.LoginNoFailover | ADV | " +
-                $"Object ID {ObjectID}, " +
-                $"Host={serverInfo.UserServerName}");
+                "SqlInternalConnectionTds.LoginNoFailover | ADV | " +
+                "Object ID {0}, " +
+                "Host={1}",
+                ObjectID,
+                serverInfo.UserServerName);
 
             // Milliseconds to sleep (back off) between attempts.
             int sleepInterval = 100;
@@ -3242,15 +3313,16 @@ private void LoginNoFailover(
                         if (!string.IsNullOrEmpty(RoutingInfo.DatabaseName) && !IsEnhancedRoutingSupportEnabled)
                         {
                             SqlClientEventSource.Log.TryTraceEvent(
-                                $"SqlInternalConnectionTds.LoginNoFailover | " +
-                                $"Ignoring enhanced routing info because the server did not acknowledge the feature.");
+                                "SqlInternalConnectionTds.LoginNoFailover | " +
+                                "Ignoring enhanced routing info because the server did not acknowledge the feature.");
                             RoutingInfo = null;
                             break;
                         }
 
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.LoginNoFailover | " +
-                            $"Routed to {serverInfo.ExtendedServerName}");
+                            "SqlInternalConnectionTds.LoginNoFailover | " +
+                            "Routed to {0}",
+                            serverInfo.ExtendedServerName);
 
                         if (routingAttempts > MaxNumberOfRedirectRoute)
                         {
@@ -3355,9 +3427,11 @@ private void LoginNoFailover(
                 // Sleep for a bit to prevent clogging the network with requests, then update sleep
                 // interval for next iteration (max 1 second interval)
                 SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                    $"SqlInternalConnectionTds.LoginNoFailover | ADV " +
-                    $"Object ID {ObjectID}, " +
-                    $"Sleeping {sleepInterval}ms");
+                    "SqlInternalConnectionTds.LoginNoFailover | ADV " +
+                    "Object ID {0}, " +
+                    "Sleeping {1}ms",
+                    ObjectID,
+                    sleepInterval);
 
                 Thread.Sleep(sleepInterval);
 
@@ -3420,11 +3494,15 @@ private void LoginWithFailover(
                 "MultiSubnetFailover should not be set if failover partner is used");
 
             SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                $"SqlInternalConnectionTds.LoginWithFailover | ADV | " +
-                $"Object ID {ObjectID}, " +
-                $"useFailover={useFailoverHost}, " +
-                $"primary={primaryServerInfo.UserServerName}, " +
-                $"failover={failoverHost}");
+                "SqlInternalConnectionTds.LoginWithFailover | ADV | " +
+                "Object ID {0}, " +
+                "useFailover={1}, " +
+                "primary={2}, " +
+                "failover={3}",
+                ObjectID,
+                useFailoverHost,
+                primaryServerInfo.UserServerName,
+                failoverHost);
 
             #if NETFRAMEWORK
             string protocol = ConnectionOptions.NetworkLibrary;
@@ -3505,17 +3583,21 @@ private void LoginWithFailover(
                         if (LocalAppContextSwitches.IgnoreServerProvidedFailoverPartner)
                         {
                             SqlClientEventSource.Log.TryTraceEvent(
-                                $"SqlInternalConnectionTds.LoginWithFailover | ADV | " +
-                                $"Object ID {ObjectID}, " +
-                                $"Ignoring server provided failover partner '{ServerProvidedFailoverPartner}' " +
-                                $"due to IgnoreServerProvidedFailoverPartner AppContext switch.");
+                                "SqlInternalConnectionTds.LoginWithFailover | ADV | " +
+                                "Object ID {0}, " +
+                                "Ignoring server provided failover partner '{1}' " +
+                                "due to IgnoreServerProvidedFailoverPartner AppContext switch.",
+                                ObjectID,
+                                ServerProvidedFailoverPartner);
                         }
                         else
                         {
                             SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                                $"SqlInternalConnectionTds.LoginWithFailover | ADV | " +
-                                $"Object ID {ObjectID}, " +
-                                $"new failover partner={ServerProvidedFailoverPartner}");
+                                "SqlInternalConnectionTds.LoginWithFailover | ADV | " +
+                                "Object ID {0}, " +
+                                "new failover partner={1}",
+                                ObjectID,
+                                ServerProvidedFailoverPartner);
 
                             #if NET
                             failoverServerInfo.SetDerivedNames(string.Empty, ServerProvidedFailoverPartner);
@@ -3553,8 +3635,8 @@ private void LoginWithFailover(
                         if (!string.IsNullOrEmpty(RoutingInfo.DatabaseName) && !IsEnhancedRoutingSupportEnabled)
                         {
                             SqlClientEventSource.Log.TryTraceEvent(
-                                $"SqlInternalConnectionTds.LoginWithFailover | " +
-                                $"Ignoring enhanced routing info because the server did not acknowledge the feature.");
+                                "SqlInternalConnectionTds.LoginWithFailover | " +
+                                "Ignoring enhanced routing info because the server did not acknowledge the feature.");
                             RoutingInfo = null;
                             continue;
                         }
@@ -3566,8 +3648,9 @@ private void LoginWithFailover(
                         routingAttempts++;
 
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlInternalConnectionTds.LoginWithFailover | " +
-                            $"Routed to {RoutingInfo.ServerName}", RoutingInfo.ServerName);
+                            "SqlInternalConnectionTds.LoginWithFailover | " +
+                            "Routed to {0}",
+                            RoutingInfo.ServerName);
 
                         _parser?.Disconnect();
                         _parser = new TdsParser(ConnectionOptions.MARS, connectionOptions.Asynchronous);
@@ -3653,9 +3736,11 @@ private void LoginWithFailover(
                 if (attemptNumber % 2 == 1)
                 {
                     SqlClientEventSource.Log.TryAdvancedTraceEvent(
-                        $"SqlInternalConnectionTds.LoginWithFailover | ADV | " +
-                        $"Object ID {ObjectID}, " +
-                        $"sleeping {sleepInterval}ms");
+                        "SqlInternalConnectionTds.LoginWithFailover | ADV | " +
+                        "Object ID {0}, " +
+                        "sleeping {1}ms",
+                        ObjectID,
+                        sleepInterval);
 
                     Thread.Sleep(sleepInterval);
 
@@ -3973,21 +4058,28 @@ private bool TryGetFedAuthTokenLocked(
                 // proceed forward with the existing token in the cache.
                 if (dbConnectionPoolAuthenticationContext.LockToUpdate())
                 {
-                    SqlClientEventSource.Log.TryTraceEvent(
-                        $"SqlInternalConnectionTds.TryGetFedAuthTokenLocked | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Acquired the lock to update the authentication context. " +
-                        $"The expiration time is {dbConnectionPoolAuthenticationContext.ExpirationTime:T}. " +
-                        $"Current Time is {DateTime.UtcNow:T}.");
+                    if (SqlClientEventSource.Log.IsTraceEnabled())
+                    {
+                        SqlClientEventSource.Log.TryTraceEvent(
+                            "SqlInternalConnectionTds.TryGetFedAuthTokenLocked | " +
+                            "Object ID {0}, " +
+                            "Acquired the lock to update the authentication context. " +
+                            "The expiration time is {1}. " +
+                            "Current Time is {2}.",
+                            ObjectID,
+                            dbConnectionPoolAuthenticationContext.ExpirationTime.ToString("T"),
+                            DateTime.UtcNow.ToString("T"));
+                    }
 
                     authenticationContextLocked = true;
                 }
                 else
                 {
                     SqlClientEventSource.Log.TryTraceEvent(
-                        $"SqlInternalConnectionTds.TryGetFedAuthTokenLocked | " +
-                        $"Object ID {ObjectID}, " +
-                        $"Refreshing the context is already in progress by another thread.");
+                        "SqlInternalConnectionTds.TryGetFedAuthTokenLocked | " +
+                        "Object ID {0}, " +
+                        "Refreshing the context is already in progress by another thread.",
+                        ObjectID);
                 }
 
                 if (authenticationContextLocked)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
index 4c77fbe8df..082a5599ce 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
@@ -68,8 +68,9 @@ static SqlAuthenticationProviderManager()
 
                 SqlClientEventSource.Log.TryTraceEvent(
                     nameof(SqlAuthenticationProviderManager) +
-                    $": Attempting to load Azure extension assembly={azureAssemblyName} with " +
-                    "expected public key token=" +
+                    ": Attempting to load Azure extension assembly={0} with " +
+                    "expected public key token={1}",
+                    azureAssemblyName,
                     BitConverter.ToString(s_azurePublicKeyToken).Replace("-", ""));
 
                 var qualifiedName = new AssemblyName(azureAssemblyName);
@@ -96,9 +97,10 @@ static SqlAuthenticationProviderManager()
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
                             nameof(SqlAuthenticationProviderManager) +
-                            $": Azure extension assembly={assembly.GetName()} has an " +
+                            ": Azure extension assembly={0} has an " +
                             "unexpected public key token; " +
-                            "no default Active Directory provider installed");
+                            "no default Active Directory provider installed",
+                            assembly.GetName());
                         return;
                     }
                 }
@@ -108,8 +110,9 @@ static SqlAuthenticationProviderManager()
 
                 SqlClientEventSource.Log.TryTraceEvent(
                     nameof(SqlAuthenticationProviderManager) +
-                    $": Attempting to load Azure extension assembly={azureAssemblyName} without " +
-                    "strong name verification; ensure this assembly is from a trusted source");
+                    ": Attempting to load Azure extension assembly={0} without " +
+                    "strong name verification; ensure this assembly is from a trusted source",
+                    azureAssemblyName);
 
                 var assembly = Assembly.Load(azureAssemblyName);
 
@@ -119,16 +122,18 @@ static SqlAuthenticationProviderManager()
                 {
                     SqlClientEventSource.Log.TryTraceEvent(
                         nameof(SqlAuthenticationProviderManager) +
-                        $": Azure extension assembly={azureAssemblyName} not found; " +
-                        "no default Active Directory provider installed");
+                        ": Azure extension assembly={0} not found; " +
+                        "no default Active Directory provider installed",
+                        azureAssemblyName);
                     return;
                 }
 
                 SqlClientEventSource.Log.TryTraceEvent(
                     nameof(SqlAuthenticationProviderManager) +
-                    $": Azure extension assembly={assembly.GetName()} found; " +
+                    ": Azure extension assembly={0} found; " +
                     "attempting to set as default provider for all Active " +
-                    "Directory authentication methods");
+                    "Directory authentication methods",
+                    assembly.GetName());
 
                 // Look for the authentication provider class.
                 const string className = "Microsoft.Data.SqlClient.ActiveDirectoryAuthenticationProvider";
@@ -138,8 +143,9 @@ static SqlAuthenticationProviderManager()
                 {
                     SqlClientEventSource.Log.TryTraceEvent(
                         nameof(SqlAuthenticationProviderManager) +
-                        $": Azure extension does not contain class={className}; " +
-                        "no default Active Directory provider installed");
+                        ": Azure extension does not contain class={0}; " +
+                        "no default Active Directory provider installed",
+                        className);
 
                     return;
                 }
@@ -171,8 +177,9 @@ static SqlAuthenticationProviderManager()
                 {
                     SqlClientEventSource.Log.TryTraceEvent(
                         nameof(SqlAuthenticationProviderManager) +
-                        $": Failed to instantiate Azure extension class={className}; " +
-                        "no default Active Directory provider installed");
+                        ": Failed to instantiate Azure extension class={0}; " +
+                        "no default Active Directory provider installed",
+                        className);
 
                     return;
                 }
@@ -197,8 +204,9 @@ static SqlAuthenticationProviderManager()
 
                 SqlClientEventSource.Log.TryTraceEvent(
                     nameof(SqlAuthenticationProviderManager) +
-                    $": Azure extension class={className} installed as " +
-                    "provider for all Active Directory authentication methods");
+                    ": Azure extension class={0} installed as " +
+                    "provider for all Active Directory authentication methods",
+                    className);
             }
             // All of these exceptions mean we couldn't find or instantiate the
             // Azure extension's authentication provider, in which case we
@@ -221,9 +229,12 @@ TypeInitializationException or
             {
                 SqlClientEventSource.Log.TryTraceEvent(
                     nameof(SqlAuthenticationProviderManager) +
-                    $": Azure extension assembly={azureAssemblyName} not found or " +
+                    ": Azure extension assembly={0} not found or " +
                     "not usable; no default provider installed; " +
-                    $"{ex.GetType().Name}: {ex.Message}");
+                    "{1}: {2}",
+                    azureAssemblyName,
+                    ex.GetType().Name,
+                    ex.Message);
             }
             // Any other exceptions are fatal.
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
index 311c26b4e5..ef3e8afe25 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.NonQuery.cs
@@ -46,10 +46,14 @@ public IAsyncResult BeginExecuteNonQuery(AsyncCallback callback, object stateObj
 
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.BeginExecuteNonQuery | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             return BeginExecuteNonQueryInternal(
                 CommandBehavior.Default,
@@ -70,10 +74,14 @@ public int EndExecuteNonQuery(IAsyncResult asyncResult)
             {
                 SqlClientEventSource.Log.TryCorrelationTraceEvent(
                     "SqlCommand.EndExecuteNonQuery | API | Correlation | " +
-                    $"Object Id {ObjectID}, " +
-                    $"Activity Id {ActivityCorrelator.Current}, " +
-                    $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                    $"Command Text '{CommandText}'");
+                    "Object Id {0}, " +
+                    "Activity Id {1}, " +
+                    "Client Connection Id {2}, " +
+                    "Command Text '{3}'",
+                    ObjectID,
+                    ActivityCorrelator.Current,
+                    _activeConnection?.ClientConnectionId,
+                    CommandText);
             }
         }
 
@@ -93,10 +101,14 @@ public override int ExecuteNonQuery()
             using var eventScope = SqlClientEventScope.Create($"SqlCommand.ExecuteNonQuery | API | Object Id {ObjectID}");
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.ExecuteNonQuery | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             SqlStatistics statistics = null;
             bool success = false;
@@ -161,10 +173,14 @@ private IAsyncResult BeginExecuteNonQueryAsync(AsyncCallback callback, object st
         {
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.BeginExecuteNonQueryAsync | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             return BeginExecuteNonQueryInternal(
                 CommandBehavior.Default,
@@ -345,10 +361,14 @@ private int EndExecuteNonQueryAsync(IAsyncResult asyncResult)
 
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.EndExecuteNonQueryAsync | Info | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             Exception asyncException = ((Task)asyncResult).Exception;
             if (asyncException is not null)
@@ -423,10 +443,14 @@ private object InternalEndExecuteNonQuery(
         {
             SqlClientEventSource.Log.TryTraceEvent(
                 "SqlCommand.InternalEndExecuteNonQuery | INFO | " +
-                $"Object Id {ObjectID}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"MARS={_activeConnection?.Parser.MARSOn}, " +
-                $"AsyncCommandInProgress={_activeConnection?.AsyncCommandInProgress}");
+                "Object Id {0}, " +
+                "Client Connection Id {1}, " +
+                "MARS={2}, " +
+                "AsyncCommandInProgress={3}",
+                ObjectID,
+                _activeConnection?.ClientConnectionId,
+                _activeConnection?.Parser.MARSOn,
+                _activeConnection?.AsyncCommandInProgress);
 
             VerifyEndExecuteState((Task)asyncResult, endMethod);
             WaitForAsyncResults(asyncResult, isInternal);
@@ -528,9 +552,12 @@ private Task InternalExecuteNonQuery(
         {
             SqlClientEventSource.Log.TryTraceEvent(
                 "SqlCommand.InternalExecuteNonQuery | INFO | " +
-                $"Object Id {ObjectID}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"AsyncCommandInProgress={_activeConnection?.AsyncCommandInProgress}");
+                "Object Id {0}, " +
+                "Client Connection Id {1}, " +
+                "AsyncCommandInProgress={2}",
+                ObjectID,
+                _activeConnection?.ClientConnectionId,
+                _activeConnection?.AsyncCommandInProgress);
 
             bool isAsync = completion is not null;
             usedCache = false;
@@ -577,10 +604,14 @@ private Task InternalExecuteNonQuery(
                 Debug.Assert(!isRetry);
                 SqlClientEventSource.Log.TryTraceEvent(
                     "SqlCommand.InternalExecuteNonQuery | INFO | " +
-                    $"Object Id {ObjectID}," +
-                    $" RPC execute method name {methodName}, " +
-                    $"isAsync {isAsync}, " +
-                    $"isRetry {isRetry}");
+                    "Object Id {0}," +
+                    " RPC execute method name {1}, " +
+                    "isAsync {2}, " +
+                    "isRetry {3}",
+                    ObjectID,
+                    methodName,
+                    isAsync,
+                    isRetry);
 
                 task = RunExecuteNonQueryTds(methodName, isAsync, timeout, asyncWrite);
             }
@@ -589,10 +620,14 @@ private Task InternalExecuteNonQuery(
                 // Otherwise, use a full-fledged execute that can handle parameters and sprocs
                 SqlClientEventSource.Log.TryTraceEvent(
                     "SqlCommand.InternalExecuteNonQuery | INFO | " +
-                    $"Object Id {ObjectID}, " +
-                    $"RPC execute method name {methodName}, " +
-                    $"isAsync {isAsync}, " +
-                    $"isRetry {isRetry}");
+                    "Object Id {0}, " +
+                    "RPC execute method name {1}, " +
+                    "isAsync {2}, " +
+                    "isRetry {3}",
+                    ObjectID,
+                    methodName,
+                    isAsync,
+                    isRetry);
 
                 SqlDataReader reader = RunExecuteReader(
                     CommandBehavior.Default,
@@ -634,10 +669,14 @@ private Task<int> InternalExecuteNonQueryAsync(CancellationToken cancellationTok
 
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.InternalExecuteNonQueryAsync | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             Guid operationId = s_diagnosticListener.WriteCommandBefore(this, _transaction);
 
@@ -792,10 +831,14 @@ private Task RunExecuteNonQueryTds(string methodName, bool isAsync, int timeout,
                 // no data reader is returned.
                 SqlClientEventSource.Log.TryTraceEvent(
                     "SqlCommand.RunExecuteNonQueryTds | Info | " +
-                    $"Object Id {ObjectID}, " +
-                    $"Activity Id {ActivityCorrelator.Current}, " +
-                    $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                    $"Command executed as SQLBATCH, Command Text '{CommandText}'");
+                    "Object Id {0}, " +
+                    "Activity Id {1}, " +
+                    "Client Connection Id {2}, " +
+                    "Command executed as SQLBATCH, Command Text '{3}'",
+                    ObjectID,
+                    ActivityCorrelator.Current,
+                    _activeConnection?.ClientConnectionId,
+                    CommandText);
 
                 Task executeTask = _stateObj.Parser.TdsExecuteSQLBatch(
                     CommandText,
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
index 33af6073fb..ec4d7709da 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Reader.cs
@@ -71,10 +71,14 @@ public SqlDataReader EndExecuteReader(IAsyncResult asyncResult)
             {
                 SqlClientEventSource.Log.TryCorrelationTraceEvent(
                     "SqlCommand.EndExecuteReader | API | Correlation | " +
-                    $"Object Id {ObjectID}, " +
-                    $"Activity Id {ActivityCorrelator.Current}, " +
-                    $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                    $"Command Text '{CommandText}'");
+                    "Object Id {0}, " +
+                    "Activity Id {1}, " +
+                    "Client Connection Id {2}, " +
+                    "Command Text '{3}'",
+                    ObjectID,
+                    ActivityCorrelator.Current,
+                    _activeConnection?.ClientConnectionId,
+                    CommandText);
             }
         }
 
@@ -83,10 +87,14 @@ public SqlDataReader EndExecuteReader(IAsyncResult asyncResult)
         {
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.ExecuteReader | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             SqlStatistics statistics = null;
             try
@@ -212,10 +220,14 @@ protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
             // @TODO: Yknow, we use this all over the place. It could be factored out.
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.ExecuteDbDataReader | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             return ExecuteReader(behavior);
         }
@@ -367,10 +379,14 @@ private void BeginExecuteReaderInternalReadStage(TaskCompletionSource<object> co
 
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.BeginExecuteReaderInternalReadStage | INFO | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             // Read SNI does not have catches for async exceptions, handle here.
             try
@@ -655,10 +671,14 @@ private SqlDataReader EndExecuteReaderAsync(IAsyncResult asyncResult)
 
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.EndExecuteReaderAsync | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             Exception asyncException = ((Task)asyncResult).Exception;
             if (asyncException is not null)
@@ -687,10 +707,14 @@ private SqlDataReader EndExecuteReaderInternal(IAsyncResult asyncResult)
         {
             SqlClientEventSource.Log.TryTraceEvent(
                 "SqlCommand.EndExecuteReaderInternal | API | " +
-                $"Object Id {ObjectID}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"MARS={_activeConnection?.Parser?.MARSOn}, " +
-                $"AsyncCommandInProgress={_activeConnection?.AsyncCommandInProgress}");
+                "Object Id {0}, " +
+                "Client Connection Id {1}, " +
+                "MARS={2}, " +
+                "AsyncCommandInProgress={3}",
+                ObjectID,
+                _activeConnection?.ClientConnectionId,
+                _activeConnection?.Parser?.MARSOn,
+                _activeConnection?.AsyncCommandInProgress);
 
             SqlStatistics statistics = null;
             bool success = false;
@@ -935,16 +959,24 @@ private Task<SqlDataReader> InternalExecuteReaderAsync(
         {
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.InternalExecuteReaderAsync | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Behavior {(int)commandBehavior}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Behavior {1}, " +
+                "Activity Id {2}, " +
+                "Client Connection Id {3}, " +
+                "Command Text '{4}'",
+                ObjectID,
+                (int)commandBehavior,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
             SqlClientEventSource.Log.TryTraceEvent(
                 "SqlCommand.InternalExecuteReaderAsync | INFO | " +
-                $"Object Id {ObjectID}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Client Connection Id {1}, " +
+                "Command Text '{2}'",
+                ObjectID,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             Guid operationId = !_parentOperationStarted ? s_diagnosticListener.WriteCommandBefore(this, _transaction) : Guid.Empty;
 
@@ -1039,10 +1071,14 @@ private SqlDataReader InternalEndExecuteReader(IAsyncResult asyncResult, bool is
         {
             SqlClientEventSource.Log.TryTraceEvent(
                 "SqlCommand.InternalEndExecuteReader | INFO | " +
-                $"Object Id {ObjectID}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"MARS={_activeConnection?.Parser?.MARSOn}, " +
-                $"AsyncCommandInProgress={_activeConnection?.AsyncCommandInProgress}");
+                "Object Id {0}, " +
+                "Client Connection Id {1}, " +
+                "MARS={2}, " +
+                "AsyncCommandInProgress={3}",
+                ObjectID,
+                _activeConnection?.ClientConnectionId,
+                _activeConnection?.Parser?.MARSOn,
+                _activeConnection?.AsyncCommandInProgress);
 
             VerifyEndExecuteState((Task)asyncResult, endMethod);
             WaitForAsyncResults(asyncResult, isInternal);
@@ -1366,11 +1402,15 @@ private SqlDataReader RunExecuteReaderTds(
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
                             "SqlCommand.RunExecuteReaderTds | Info | " +
-                            $"Object Id {ObjectID}, " +
-                            $"Activity Id {ActivityCorrelator.Current}, " +
-                            $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                            $"Command executed as SQLBATCH, " +
-                            $"Command Text '{CommandText}'");
+                            "Object Id {0}, " +
+                            "Activity Id {1}, " +
+                            "Client Connection Id {2}, " +
+                            "Command executed as SQLBATCH, " +
+                            "Command Text '{3}'",
+                            ObjectID,
+                            ActivityCorrelator.Current,
+                            _activeConnection?.ClientConnectionId,
+                            CommandText);
                     }
 
                     string text = GetCommandText(cmdBehavior) + GetOptionsResetString(cmdBehavior);
@@ -1453,11 +1493,15 @@ private SqlDataReader RunExecuteReaderTds(
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
                             "SqlCommand.RunExecuteReaderTds | Info | " +
-                            $"Object Id {ObjectID}, " +
-                            $"Activity Id {ActivityCorrelator.Current}, " +
-                            $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                            $"Command executed as RPC, " +
-                            $"RPC Name '{rpc.rpcName}'");
+                            "Object Id {0}, " +
+                            "Activity Id {1}, " +
+                            "Client Connection Id {2}, " +
+                            "Command executed as RPC, " +
+                            "RPC Name '{3}'",
+                            ObjectID,
+                            ActivityCorrelator.Current,
+                            _activeConnection?.ClientConnectionId,
+                            rpc.rpcName);
                     }
 
                     Debug.Assert(_rpcArrayOf1[0] == rpc);
@@ -1487,11 +1531,15 @@ private SqlDataReader RunExecuteReaderTds(
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
                             "SqlCommand.RunExecuteReaderTds | Info | " +
-                            $"Object Id {ObjectID}, " +
-                            $"Activity Id {ActivityCorrelator.Current}, " +
-                            $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                            $"Command executed as RPC, " +
-                            $"RPC Name '{CommandText}'");
+                            "Object Id {0}, " +
+                            "Activity Id {1}, " +
+                            "Client Connection Id {2}, " +
+                            "Command executed as RPC, " +
+                            "RPC Name '{3}'",
+                            ObjectID,
+                            ActivityCorrelator.Current,
+                            _activeConnection?.ClientConnectionId,
+                            CommandText);
                     }
 
                     // Turn set options ON
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Scalar.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Scalar.cs
index 0582d23d98..fa53eb14ee 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Scalar.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Scalar.cs
@@ -34,10 +34,14 @@ public override object ExecuteScalar()
             using var eventScope = SqlClientEventScope.Create($"SqlCommand.ExecuteScalar | API | Object Id {ObjectID}");
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.ExecuteScalar | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
             
             SqlStatistics statistics = null;
             bool success = false;
@@ -223,15 +227,22 @@ private Task<object> ExecuteScalarAsyncInternal(CancellationToken cancellationTo
         {
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.InternalExecuteScalarAsync | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
             SqlClientEventSource.Log.TryTraceEvent(
                 "SqlCommand.ExecuteScalarAsyncInternal | API " +
-                $"Object Id {ObjectID}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Client Connection Id {1}, " +
+                "Command Text '{2}'",
+                ObjectID,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             Guid operationId = s_diagnosticListener.WriteCommandBefore(this, _transaction);
             _parentOperationStarted = true;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
index 39d043df12..d74bda54d6 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Xml.cs
@@ -47,10 +47,14 @@ public IAsyncResult BeginExecuteXmlReader(AsyncCallback callback, object stateOb
 
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.BeginExecuteXmlReader | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             return BeginExecuteXmlReaderInternal(
                 CommandBehavior.SequentialAccess,
@@ -72,10 +76,14 @@ public XmlReader EndExecuteXmlReader(IAsyncResult asyncResult)
             {
                 SqlClientEventSource.Log.TryCorrelationTraceEvent(
                     "SqlCommand.EndExecuteXmlReader | API | Correlation | " +
-                    $"Object Id {ObjectID}, " +
-                    $"Activity Id {ActivityCorrelator.Current}, " +
-                    $"Client Connection Id {_activeConnection.ClientConnectionId}, " +
-                    $"Command Text '{CommandText}'");
+                    "Object Id {0}, " +
+                    "Activity Id {1}, " +
+                    "Client Connection Id {2}, " +
+                    "Command Text '{3}'",
+                    ObjectID,
+                    ActivityCorrelator.Current,
+                    _activeConnection.ClientConnectionId,
+                    CommandText);
             }
         }
 
@@ -95,10 +103,14 @@ public XmlReader ExecuteXmlReader()
             using var eventScope = SqlClientEventScope.Create($"SqlCommand.ExecuteXmlReader | API | Object Id {ObjectID}");
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.ExecuteXmlReader | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             SqlStatistics statistics = null;
             bool success = false;
@@ -186,10 +198,14 @@ private IAsyncResult BeginExecuteXmlReaderAsync(AsyncCallback callback, object s
         {
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.BeginExecuteXmlReaderAsync | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             return BeginExecuteXmlReaderInternal(
                 CommandBehavior.SequentialAccess,
@@ -378,10 +394,14 @@ private XmlReader EndExecuteXmlReaderAsync(IAsyncResult asyncResult)
 
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.EndExecuteXmlReaderAsync | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             Exception asyncException = ((Task)asyncResult).Exception;
             if (asyncException is not null)
@@ -453,10 +473,14 @@ private Task<XmlReader> InternalExecuteXmlReaderAsync(CancellationToken cancella
 
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.InternalExecuteXmlReaderAsync | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             Guid operationId = s_diagnosticListener.WriteCommandBefore(this, _transaction);
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
index 76399749a0..294310a08f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -552,9 +552,12 @@ public override int CommandTimeout
 
                 SqlClientEventSource.Log.TryTraceEvent(
                     "SqlCommand.Set_CommandTimeout | API | " +
-                    $"Object Id {ObjectID}, " +
-                    $"Command Timeout value {value}, " +
-                    $"Client Connection Id {Connection?.ClientConnectionId}");
+                    "Object Id {0}, " +
+                    "Command Timeout value {1}, " +
+                    "Client Connection Id {2}",
+                    ObjectID,
+                    value,
+                    Connection?.ClientConnectionId);
             }
         }
 
@@ -576,9 +579,12 @@ public override string CommandText
 
                 SqlClientEventSource.Log.TryTraceEvent(
                     "SqlCommand.Set_CommandText | API | " +
-                    $"Object Id {ObjectID}, " +
-                    $"String Value = '{value}', " +
-                    $"Client Connection Id {Connection?.ClientConnectionId}");
+                    "Object Id {0}, " +
+                    "String Value = '{1}', " +
+                    "Client Connection Id {2}",
+                    ObjectID,
+                    value,
+                    Connection?.ClientConnectionId);
             }
         }
 
@@ -610,9 +616,12 @@ public override CommandType CommandType
                     // @TODO: Either move this outside the if block or move all the other instances inside the if block.
                     SqlClientEventSource.Log.TryTraceEvent(
                         "SqlCommand.Set_CommandType | API | " +
-                        $"Object Id {ObjectID}, " +
-                        $"Command Type value {(int)value}, " +
-                        $"Client Connection Id {Connection?.ClientConnectionId}");
+                        "Object Id {0}, " +
+                        "Command Type value {1}, " +
+                        "Client Connection Id {2}",
+                        ObjectID,
+                        (int)value,
+                        Connection?.ClientConnectionId);
                 }
             }
         }
@@ -673,8 +682,10 @@ public override CommandType CommandType
 
                 SqlClientEventSource.Log.TryTraceEvent(
                     "SqlCommand.Set_Connection | API | " +
-                    $"Object Id {ObjectID}, " +
-                    $"Client Connection Id {value?.ClientConnectionId}");
+                    "Object Id {0}, " +
+                    "Client Connection Id {1}",
+                    ObjectID,
+                    value?.ClientConnectionId);
             }
         }
 
@@ -713,7 +724,8 @@ public SqlNotificationRequest Notification
                 _notification = value;
                 SqlClientEventSource.Log.TryTraceEvent(
                     "SqlCommand.Set_Notification | API | " +
-                    $"Object Id {ObjectID}");
+                    "Object Id {0}",
+                    ObjectID);
             }
         }
 
@@ -790,9 +802,12 @@ public SqlRetryLogicBaseProvider RetryLogicProvider
 
                 SqlClientEventSource.Log.TryTraceEvent(
                     "SqlCommand.Set_Transaction | API | " +
-                    $"Object Id {ObjectID}, " +
-                    $"Internal Transaction Id {value?.InternalTransaction?.TransactionId}, " +
-                    $"Client Connection Id {Connection?.ClientConnectionId}");
+                    "Object Id {0}, " +
+                    "Internal Transaction Id {1}, " +
+                    "Client Connection Id {2}",
+                    ObjectID,
+                    value?.InternalTransaction?.TransactionId,
+                    Connection?.ClientConnectionId);
             }
         }
 
@@ -819,9 +834,12 @@ public override UpdateRowSource UpdatedRowSource
 
                 SqlClientEventSource.Log.TryTraceEvent(
                     "SqlCommand.UpdatedRowSource | API | " +
-                    $"Object Id {ObjectID}, " +
-                    $"Updated Row Source value {(int)value}, " +
-                    $"Client Connection Id {Connection?.ClientConnectionId}");
+                    "Object Id {0}, " +
+                    "Updated Row Source value {1}, " +
+                    "Client Connection Id {2}",
+                    ObjectID,
+                    (int)value,
+                    Connection?.ClientConnectionId);
             }
         }
 
@@ -942,8 +960,10 @@ protected override DbTransaction DbTransaction
                 Transaction = (SqlTransaction)value;
                 SqlClientEventSource.Log.TryTraceEvent(
                     "SqlCommand.Set_DbTransaction | API | " +
-                    $"Object Id {ObjectID}, " +
-                    $"Client Connection Id {Connection?.ClientConnectionId}");
+                    "Object Id {0}, " +
+                    "Client Connection Id {1}",
+                    ObjectID,
+                    Connection?.ClientConnectionId);
             }
         }
 
@@ -1066,10 +1086,14 @@ public override void Cancel()
             using var eventScope = SqlClientEventScope.Create($"SqlCommand.Cancel | API | Object Id {ObjectID}");
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.Cancel | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"Activity Id {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"Command Text '{CommandText}'");
+                "Object Id {0}, " +
+                "Activity Id {1}, " +
+                "Client Connection Id {2}, " +
+                "Command Text '{3}'",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId,
+                CommandText);
 
             SqlStatistics statistics = null;
             try
@@ -1157,9 +1181,12 @@ public SqlCommand Clone()
             SqlCommand clone = new SqlCommand(this);
             SqlClientEventSource.Log.TryTraceEvent(
                 "SqlCommand.Clone | API | " +
-                $"Object Id {ObjectID}, " +
-                $"Clone Object Id {clone.ObjectID}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}");
+                "Object Id {0}, " +
+                "Clone Object Id {1}, " +
+                "Client Connection Id {2}",
+                ObjectID,
+                clone.ObjectID,
+                _activeConnection?.ClientConnectionId);
 
             return clone;
         }
@@ -1178,9 +1205,12 @@ public override void Prepare()
             using var eventScope = SqlClientEventScope.Create($"SqlCommand.Prepare | API | Object Id {ObjectID}");
             SqlClientEventSource.Log.TryCorrelationTraceEvent(
                 "SqlCommand.Prepare | API | Correlation | " +
-                $"Object Id {ObjectID}, " +
-                $"ActivityID {ActivityCorrelator.Current}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}");
+                "Object Id {0}, " +
+                "ActivityID {1}, " +
+                "Client Connection Id {2}",
+                ObjectID,
+                ActivityCorrelator.Current,
+                _activeConnection?.ClientConnectionId);
 
             // Reset _pendingCancel upon entry into any Execute - used to synchronize state
             // between entry into Execute* API and the thread obtaining the stateObject.
@@ -1822,10 +1852,13 @@ internal void OnStatementCompleted(int recordCount)
                     try
                     {
                         SqlClientEventSource.Log.TryTraceEvent(
-                            $"SqlCommand.OnStatementCompleted | Info | " +
-                            $"Object Id {ObjectID}, " +
-                            $"Record Count {recordCount}, " +
-                            $"Client Connection Id {_activeConnection?.ClientConnectionId}");
+                            "SqlCommand.OnStatementCompleted | Info | " +
+                            "Object Id {0}, " +
+                            "Record Count {1}, " +
+                            "Client Connection Id {2}",
+                            ObjectID,
+                            recordCount,
+                            _activeConnection?.ClientConnectionId);
 
                         handler(this, new StatementCompletedEventArgs(recordCount));
                     }
@@ -2903,8 +2936,10 @@ private void Unprepare()
 
             SqlClientEventSource.Log.TryTraceEvent(
                 "SqlCommand.UnPrepare | Info | " +
-                $"Object Id {ObjectID}, " +
-                $"Current Prepared Handle {_prepareHandle}");
+                "Object Id {0}, " +
+                "Current Prepared Handle {1}",
+                ObjectID,
+                _prepareHandle);
 
             _execType = EXECTYPE.PREPAREPENDING;
 
@@ -2920,8 +2955,9 @@ private void Unprepare()
             _cachedMetaData = null;
 
             SqlClientEventSource.Log.TryTraceEvent(
-                $"SqlCommand.UnPrepare | Info | " +
-                $"Object Id {ObjectID}, Command unprepared.");
+                "SqlCommand.UnPrepare | Info | " +
+                "Object Id {0}, Command unprepared.",
+                ObjectID);
         }
 
         private void ValidateAsyncCommand()
@@ -3027,11 +3063,15 @@ private void VerifyEndExecuteState(
             Debug.Assert(completionTask is not null);
 
             SqlClientEventSource.Log.TryTraceEvent(
-                $"SqlCommand.VerifyEndExecuteState | API | " +
-                $"Object Id {ObjectID}, " +
-                $"Client Connection Id {_activeConnection?.ClientConnectionId}, " +
-                $"MARS={_activeConnection?.Parser?.MARSOn}, " +
-                $"AsyncCommandInProgress={_activeConnection?.AsyncCommandInProgress}");
+                "SqlCommand.VerifyEndExecuteState | API | " +
+                "Object Id {0}, " +
+                "Client Connection Id {1}, " +
+                "MARS={2}, " +
+                "AsyncCommandInProgress={3}",
+                ObjectID,
+                _activeConnection?.ClientConnectionId,
+                _activeConnection?.Parser?.MARSOn,
+                _activeConnection?.AsyncCommandInProgress);
 
             if (completionTask.IsCanceled)
             {
@@ -3227,10 +3267,13 @@ internal void SetActiveConnectionAndResult(TaskCompletionSource<object> completi
                 TdsParser parser = activeConnection?.Parser;
 
                 SqlClientEventSource.Log.TryTraceEvent(
-                    $"SqlCommand.SetActiveConnectionAndResult | API | " +
-                    $"Object ID {activeConnection.ObjectID}, " +
-                    $"Client Connection ID {activeConnection.ClientConnectionId}, " +
-                    $"MARS={parser?.MARSOn}");
+                    "SqlCommand.SetActiveConnectionAndResult | API | " +
+                    "Object ID {0}, " +
+                    "Client Connection ID {1}, " +
+                    "MARS={2}",
+                    activeConnection.ObjectID,
+                    activeConnection.ClientConnectionId,
+                    parser?.MARSOn);
 
                 if (parser == null || parser.State == TdsParserState.Closed || parser.State == TdsParserState.Broken)
                 {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Utilities/AsyncHelper.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Utilities/AsyncHelper.cs
index 9ce1bf336f..05a296bec0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Utilities/AsyncHelper.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Utilities/AsyncHelper.cs
@@ -836,7 +836,7 @@ private static void ObserveContinuationException(Task continuationTask)
             continuationTask.ContinueWith(
                 static task =>
                 {
-                    SqlClientEventSource.Log.TryTraceEvent($"Unobserved task exception: {task.Exception}");
+                    SqlClientEventSource.Log.TryTraceEvent("Unobserved task exception: {0}", task.Exception);
                     _ = task.Exception;
                 },
                 CancellationToken.None,

From ee529d444b378e94e98e60ac04b14f86801fc003 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 11 Aug 2026 11:42:11 -0700
Subject: [PATCH 227/298] Fix perf test build against pre-6.0 MDS baselines
 (#4509)

* Fix perf test build against pre-6.0 MDS baselines

JsonVsVarcharReadRunner used SqlDataReader.GetSqlJson, which was
introduced in MDS 6.0. When the perf pipeline builds the test project in
Package mode against an older pinned baseline (e.g.
-p:MdsPackageVersion=5.2.3), compilation failed with CS1061.

Define MDS_SQLJSON_SUPPORTED in the perf test project unless a pre-6.0
baseline package is pinned, and fall back to the string accessor in the
JSON benchmarks when it is not defined.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 773aff6a-7a03-477e-8229-705eb9bc2f13

* Explain async GetFieldValueAsync fallback in JSON benchmark

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 773aff6a-7a03-477e-8229-705eb9bc2f13

* Generalize perf baseline API gating and document it

Follow-up to the GetSqlJson build break:

* Replace the one-off MDS_SQLJSON_SUPPORTED constant with cumulative
  MDS_GE_<major> constants derived from MdsPackageVersion, so future
  benchmarks can guard any post-baseline API without new plumbing.
  Unparsable/absent versions fail toward "current" (all constants set).
* Warn loudly from JsonVsVarcharReadRunner's GlobalSetup when the JSON
  fallback is compiled in, since the baseline pass then measures a
  different code path and its delta is not comparable.
* Fail with an actionable message when the server has no native JSON
  column type instead of a raw SqlException.
* Document the "benchmarks must compile against the oldest baseline"
  constraint and add a CS1061 troubleshooting row in the perf README.
* Minor: make the row count a non-static instance field and drop
  trailing whitespace.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 773aff6a-7a03-477e-8229-705eb9bc2f13

* Harden perf baseline gating and JSON runner setup/cleanup

Edge cases surfaced while reviewing the baseline API gating:

* Tolerate leading whitespace and a "v" prefix in MdsPackageVersion when
  deriving the baseline major version.
* Validate RowCount and the configured connection string in GlobalSetup
  instead of failing later with an opaque error.
* Drop any tables created by a partially-failed GlobalSetup, since
  GlobalCleanup is not guaranteed to run when setup throws.
* Attempt both drops in GlobalCleanup even if one fails, skip tables that
  were never created, still clear pools on failure, and aggregate the
  failures rather than leaking a table silently.
* Only emit the pre-6.0 fallback warning for the JSON parameterization.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 773aff6a-7a03-477e-8229-705eb9bc2f13

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 773aff6a-7a03-477e-8229-705eb9bc2f13
---
 eng/pipelines/perf/README.md                  |  22 +++
 .../JsonVsVarcharReadRunner.cs                | 171 ++++++++++++++----
 ...oft.Data.SqlClient.PerformanceTests.csproj |  17 ++
 3 files changed, 176 insertions(+), 34 deletions(-)

diff --git a/eng/pipelines/perf/README.md b/eng/pipelines/perf/README.md
index 244a9b705b..f9dbefbb08 100644
--- a/eng/pipelines/perf/README.md
+++ b/eng/pipelines/perf/README.md
@@ -106,6 +106,27 @@ The VM's `NuGet.config` exposes only the governed feed, and CPM rejects multiple
 (`NU1507`). The baseline pass therefore restores through a **dedicated single-source config**
 (`perf-baseline-nuget.config`, generated at runtime) pointing only at `https://api.nuget.org/v3/index.json`.
 
+### Benchmarks must compile against the oldest baseline
+
+The baseline pass compiles the **same** `PerformanceTests` sources against the *released* MDS
+package, so a benchmark that calls an API introduced after `baselineVersion` fails that pass with
+`CS1061`. The project defines cumulative `MDS_GE_<major>` constants from `MdsPackageVersion` (see
+`Microsoft.Data.SqlClient.PerformanceTests.csproj`); guard such calls and provide an older
+fallback:
+
+```csharp
+#if MDS_GE_6
+    _ = reader.GetSqlJson(0).Value;   // GetSqlJson was added in MDS 6.0
+#else
+    _ = reader.GetString(0);
+#endif
+```
+
+Project mode, Package mode with no pinned version, and unparsable version strings define every
+constant, since those builds reference a current MDS. Note that a fallback makes the baseline
+measure a **different code path** than the current pass — the affected benchmark's delta is not
+meaningful, so the runner should say so loudly at setup (see `JsonVsVarcharReadRunner`).
+
 ## Comparison output
 
 `compare_perf.py` matches benchmarks by `(Type, Method, Parameters)` and reports, per benchmark, the
@@ -234,6 +255,7 @@ translated NDJSON as the `perf-kusto-payloads` artifact for manual/backfill inge
 | ------- | ------------------ |
 | `NU1507` during the baseline pass | Multiple NuGet sources under CPM. The baseline uses a single-source config; ensure `perf-baseline-nuget.config` is being passed via `-p:RestoreConfigFile`. |
 | Baseline restore fails to find MDS | `baselineVersion` isn't a published NuGet.org version, or the VM has no outbound access to `api.nuget.org`. |
+| Baseline pass fails to compile: `CS1061 ... does not contain a definition for <member>` | A benchmark calls an MDS API newer than `baselineVersion`. Guard it with the `MDS_GE_<major>` constants and add an older fallback — see [Benchmarks must compile against the oldest baseline](#benchmarks-must-compile-against-the-oldest-baseline). |
 | No comparison / summary | The baseline pass was skipped (empty `baselineVersion`) or one pass produced no `*-report-full.json`. |
 | Ingestion step skipped | `enableKustoIngestion` is `false`, or `KustoClusterUri`, `KustoDatabase` or `KustoServiceConnection` (from `ADX Cluster Variables`) is empty (expected until the cluster is provisioned). |
 | Ingestion auth error | The service connection's SP lacks **Database Ingestor** on the target database. |
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/JsonVsVarcharReadRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/JsonVsVarcharReadRunner.cs
index 7b9533386b..366315bde4 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/JsonVsVarcharReadRunner.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/JsonVsVarcharReadRunner.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 
@@ -16,7 +17,7 @@ namespace Microsoft.Data.SqlClient.PerformanceTests
     /// </summary>
     public class JsonVsVarcharReadRunner : BaseRunner
     {
-        private static long s_rowCount;
+        private long _rowCount;
         private string _jsonTableName;
         private string _varcharTableName;
         private string _connectionString;
@@ -32,8 +33,34 @@ public class JsonVsVarcharReadRunner : BaseRunner
         [GlobalSetup]
         public void Setup()
         {
-            s_rowCount = s_config.Benchmarks.JsonVsVarcharReadRunnerConfig.RowCount;
+#if !MDS_GE_6
+            // This build targets a pre-6.0 MDS baseline that has no GetSqlJson, so the JSON
+            // benchmarks below read through the string accessor instead. Results for
+            // ColumnType=JSON therefore measure a DIFFERENT code path than a current-MDS build
+            // and must not be compared against one. GlobalSetup runs once per parameter
+            // combination, so only the affected one warns.
+            if (ColumnType == "JSON")
+            {
+                Console.Error.WriteLine(
+                    "WARNING: JsonVsVarcharReadRunner was built against a pre-6.0 Microsoft.Data.SqlClient " +
+                    "baseline. The ColumnType=JSON benchmarks fall back to the string accessor and are " +
+                    "NOT comparable with results from a current-MDS build.");
+            }
+#endif
+            _rowCount = s_config.Benchmarks.JsonVsVarcharReadRunnerConfig.RowCount;
+            if (_rowCount <= 0)
+            {
+                throw new InvalidOperationException(
+                    "JsonVsVarcharReadRunnerConfig.RowCount must be greater than zero; " +
+                    "the benchmarks would otherwise read from empty tables.");
+            }
+
             _connectionString = s_config.ConnectionString;
+            if (string.IsNullOrWhiteSpace(_connectionString))
+            {
+                throw new InvalidOperationException(
+                    "No connection string was configured; set ConnectionString in runnerconfig.jsonc.");
+            }
 
             string machineHash = ((uint)Environment.MachineName.GetHashCode()).ToString("x8");
             string suffix = $"{machineHash}_{Guid.NewGuid():N}";
@@ -45,58 +72,119 @@ public void Setup()
             using var conn = new SqlConnection(_connectionString);
             conn.Open();
 
-            // Create JSON table
-            using (var cmd = new SqlCommand(
-                $"CREATE TABLE {_jsonTableName} (Id INT IDENTITY PRIMARY KEY, Data JSON)", conn))
+            try
             {
-                cmd.ExecuteNonQuery();
-            }
+                // Create JSON table. The native JSON column type requires SQL Server 2025+ or
+                // Azure SQL; on older servers this fails with a parse/type error, so surface why.
+                using (var cmd = new SqlCommand(
+                    $"CREATE TABLE {_jsonTableName} (Id INT IDENTITY PRIMARY KEY, Data JSON)", conn))
+                {
+                    try
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                    catch (SqlException ex)
+                    {
+                        throw new InvalidOperationException(
+                            "JsonVsVarcharReadRunner requires a server with native JSON column support " +
+                            "(SQL Server 2025+ or Azure SQL). Disable this runner in runnerconfig.jsonc " +
+                            "when targeting an older server.", ex);
+                    }
+                }
+
+                // Create VARCHAR(MAX) table
+                using (var cmd = new SqlCommand(
+                    $"CREATE TABLE {_varcharTableName} (Id INT IDENTITY PRIMARY KEY, Data VARCHAR(MAX))", conn))
+                {
+                    cmd.ExecuteNonQuery();
+                }
+
+                // Bulk insert identical data into both tables
+                var dt = new System.Data.DataTable();
+                dt.Columns.Add("Data", typeof(string));
+                for (long i = 0; i < _rowCount; i++)
+                {
+                    dt.Rows.Add(sampleJson);
+                }
+
+                using (var bulkCopy = new SqlBulkCopy(conn) { DestinationTableName = _jsonTableName, BatchSize = 10000 })
+                {
+                    bulkCopy.ColumnMappings.Add("Data", "Data");
+                    bulkCopy.WriteToServer(dt);
+                }
 
-            // Create VARCHAR(MAX) table
-            using (var cmd = new SqlCommand(
-                $"CREATE TABLE {_varcharTableName} (Id INT IDENTITY PRIMARY KEY, Data VARCHAR(MAX))", conn))
+                using (var bulkCopy = new SqlBulkCopy(conn) { DestinationTableName = _varcharTableName, BatchSize = 10000 })
+                {
+                    bulkCopy.ColumnMappings.Add("Data", "Data");
+                    bulkCopy.WriteToServer(dt);
+                }
+            }
+            catch
             {
-                cmd.ExecuteNonQuery();
+                // GlobalCleanup is not guaranteed to run when GlobalSetup throws, so drop whatever
+                // was created here before surfacing the original failure. Table names are unique
+                // per run, so a leak would otherwise accumulate on the perf server.
+                DropTables(conn, bestEffort: true);
+                throw;
             }
+        }
 
-            // Bulk insert identical data into both tables
-            var dt = new System.Data.DataTable();
-            dt.Columns.Add("Data", typeof(string));
-            for (int i = 0; i < s_rowCount; i++)
+        [GlobalCleanup]
+        public void Cleanup()
+        {
+            // Setup can fail before it captures the connection string (e.g. a missing runner
+            // config), in which case there is nothing to clean up.
+            if (string.IsNullOrEmpty(_connectionString))
             {
-                dt.Rows.Add(sampleJson);
+                return;
             }
 
-            using (var bulkCopy = new SqlBulkCopy(conn) { DestinationTableName = _jsonTableName, BatchSize = 10000 })
+            using var conn = new SqlConnection(_connectionString);
+            conn.Open();
+
+            try
             {
-                bulkCopy.ColumnMappings.Add("Data", "Data");
-                bulkCopy.WriteToServer(dt);
+                DropTables(conn, bestEffort: false);
             }
-
-            using (var bulkCopy = new SqlBulkCopy(conn) { DestinationTableName = _varcharTableName, BatchSize = 10000 })
+            finally
             {
-                bulkCopy.ColumnMappings.Add("Data", "Data");
-                bulkCopy.WriteToServer(dt);
+                SqlConnection.ClearAllPools();
             }
         }
 
-        [GlobalCleanup]
-        public void Cleanup()
+        /// <summary>
+        /// Drops both benchmark tables, skipping any that were never created. Each drop is
+        /// attempted even when an earlier one fails, so a single failure cannot leak the other
+        /// table. When <paramref name="bestEffort"/> is false, the collected failures are thrown.
+        /// </summary>
+        private void DropTables(SqlConnection conn, bool bestEffort)
         {
-            using var conn = new SqlConnection(_connectionString);
-            conn.Open();
+            List<Exception> failures = null;
 
-            using (var cmd = new SqlCommand($"DROP TABLE IF EXISTS {_jsonTableName}", conn))
+            foreach (string tableName in new[] { _jsonTableName, _varcharTableName })
             {
-                cmd.ExecuteNonQuery();
+                if (string.IsNullOrEmpty(tableName))
+                {
+                    continue;
+                }
+
+                try
+                {
+                    using var cmd = new SqlCommand($"DROP TABLE IF EXISTS {tableName}", conn);
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception ex)
+                {
+                    (failures ??= new List<Exception>()).Add(
+                        new InvalidOperationException($"Failed to drop {tableName}.", ex));
+                }
             }
-            
-            using (var cmd = new SqlCommand($"DROP TABLE IF EXISTS {_varcharTableName}", conn))
+
+            if (failures is not null && !bestEffort)
             {
-                cmd.ExecuteNonQuery();
+                throw new AggregateException(
+                    "JsonVsVarcharReadRunner could not drop one or more of its tables.", failures);
             }
-            
-            SqlConnection.ClearAllPools();
         }
 
         [Benchmark]
@@ -110,9 +198,15 @@ public void ReadDataSync()
             {
                 // Exercise the SqlJson accessor path so the JSON case captures
                 // JSON-type handling overhead rather than the shared string path.
+                // Older baseline packages (pre-6.0) have no GetSqlJson, so they
+                // fall back to the string accessor.
                 while (reader.Read())
                 {
+#if MDS_GE_6
                     _ = reader.GetSqlJson(0).Value;
+#else
+                    _ = reader.GetString(0);
+#endif
                 }
             }
             else
@@ -135,7 +229,16 @@ public async Task ReadDataAsync()
             {
                 while (await reader.ReadAsync())
                 {
+#if MDS_GE_6
                     _ = reader.GetSqlJson(0).Value;
+#else
+                    // Older baseline packages (pre-6.0) have no GetSqlJson, and
+                    // there is no async SqlJson accessor to fall back to. Use the
+                    // same GetFieldValueAsync<string> call the VARCHAR case uses so
+                    // the async benchmark keeps measuring an async read path rather
+                    // than a synchronous accessor over already-buffered data.
+                    _ = await reader.GetFieldValueAsync<string>(0);
+#endif
                 }
             }
             else
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
index a7f3c2d8f7..77fb6130dc 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
@@ -54,6 +54,23 @@
     <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" VersionOverride="1.0.0" />
   </ItemGroup>
 
+  <!-- Baseline API availability =========================================== -->
+  <!-- In Package mode the perf pipeline can pin an older released MDS as the baseline, so this      -->
+  <!-- project must compile against the OLDEST baseline anyone may queue - a benchmark that calls an -->
+  <!-- API introduced after that baseline breaks the baseline pass with CS1061.  MdsBaselineMajor-   -->
+  <!-- Version is the major version of the pinned baseline; the cumulative MDS_GE_<n> constants let  -->
+  <!-- individual benchmarks guard a call and fall back to an older equivalent.  Leading whitespace  -->
+  <!-- and a "v" prefix are tolerated.  Project mode, Package mode without an explicit version, and  -->
+  <!-- any version string whose major cannot be parsed all fail toward "current" (sentinel 99999, so -->
+  <!-- every constant is defined), because those builds reference a current MDS.  Add a new          -->
+  <!-- MDS_GE_<n> line here as newer baselines start being used.                                     -->
+  <PropertyGroup>
+    <MdsBaselineMajorVersion Condition="'$(ReferenceType)' == 'Package' and '$(MdsPackageVersion)' != ''">$([System.Text.RegularExpressions.Regex]::Match('$(MdsPackageVersion)', '^\s*[vV]?([0-9]+)').Groups[1].Value)</MdsBaselineMajorVersion>
+    <MdsBaselineMajorVersion Condition="'$(MdsBaselineMajorVersion)' == ''">99999</MdsBaselineMajorVersion>
+    <DefineConstants Condition="'$(MdsBaselineMajorVersion)' &gt;= '6'">$(DefineConstants);MDS_GE_6</DefineConstants>
+    <DefineConstants Condition="'$(MdsBaselineMajorVersion)' &gt;= '7'">$(DefineConstants);MDS_GE_7</DefineConstants>
+  </PropertyGroup>
+
   <!-- Other references -->
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />

From 73249e80942832dc6580e764a4c9669f92e0702f Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 12 Aug 2026 09:44:35 -0700
Subject: [PATCH 228/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4530)

---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx   | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index f7f4bfa4c8..d1ef4e9294 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -2158,7 +2158,7 @@
     <value>Ve fondu připojení se nepovedlo najít prázdný slot.</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>Připojení se nepodařilo nahradit, protože už není ve fondu připojení.</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Fond připojení byl vypnut.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index 5a29461c67..0e537db191 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -2158,7 +2158,7 @@
     <value>Im Verbindungspool wurde kein freier Slot gefunden.</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>Die Verbindung konnte nicht ersetzt werden, da sie nicht mehr im Verbindungspool vorhanden ist.</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Der Verbindungspool wurde heruntergefahren.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index d109f8b906..0fec878a2d 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -2158,7 +2158,7 @@
     <value>No se pudo encontrar una ranura vacía en el grupo de conexiones.</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>No se pudo reemplazar la conexión porque ya no está en el grupo de conexiones.</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>El grupo de conexiones se ha cerrado.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index e8884f5040..696399ef5b 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -2158,7 +2158,7 @@
     <value>Impossible de trouver un emplacement libre dans le pool de connexions.</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>Impossible de remplacer la connexion, car elle n’est plus dans le pool de connexions.</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Le pool de connexions a été arrêté.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index cf9cdc45d5..25f2a7701e 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -2158,7 +2158,7 @@
     <value>Non è possibile trovare uno slot vuoto nel pool di connessioni.</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>Non è possibile sostituire la connessione perché non è più presente nel pool di connessioni.</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Il pool di connessioni è stato chiuso.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index 245a1c1b68..fb05f0b8a7 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -2158,7 +2158,7 @@
     <value>接続プールに空きスロットが見つかりませんでした。</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>接続プールに存在しなくなったため、接続を置き換えることができませんでした。</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>接続プールはシャットダウンされています。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index 5d3e45c876..ffeb4e23ae 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -2158,7 +2158,7 @@
     <value>연결 풀에서 빈 슬롯을 찾을 수 없습니다.</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>연결이 더 이상 연결 풀에 없으므로 연결을 바꿀 수 없습니다.</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>연결 풀이 종료되었습니다.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index 41993d7f23..560a35849a 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -2158,7 +2158,7 @@
     <value>Nie znaleziono wolnego miejsca w puli połączeń.</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>Nie można zamienić połączenia, ponieważ nie znajduje się ono już w puli połączeń.</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Pula połączeń została zamknięta.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 897ce6a385..3eeb3cefbe 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -2158,7 +2158,7 @@
     <value>Não foi possível localizar um slot vazio no pool de conexões.</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>Não foi possível substituir a conexão porque ela não está mais no pool de conexões.</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>O pool de conexões foi desligado.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 0136ed4b66..1c307da3df 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -2158,7 +2158,7 @@
     <value>Не удалось найти пустой слот в пуле подключений.</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>Не удалось заменить соединение, поскольку оно больше не находится в пуле соединений.</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Пул подключений отключен.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index c720f2ca7b..c0cbc0f800 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -2158,7 +2158,7 @@
     <value>Bağlantı havuzunda boş bir yuva bulunamadı.</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>Bağlantı artık bağlantı havuzunda yer almadığı için değiştirilemedi.</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>Bağlantı havuzu kapatıldı.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 49e1e10a8f..e615033f84 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -2158,7 +2158,7 @@
     <value>在连接池中找不到空槽。</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>无法替换连接，因为它不再位于连接池中。</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>连接池已关闭。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index 58c0049003..91e1acec6d 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -2158,7 +2158,7 @@
     <value>連線集區中找不到空白插槽。</value>
   </data>
   <data name="SQL_ConnectionPoolReplaceConnectionFailed" xml:space="preserve">
-    <value>Could not replace the connection because it is no longer in the connection pool.</value>
+    <value>無法取代此連線，因為它不再位於連線集區。</value>
   </data>
   <data name="SQL_ConnectionPoolShutDown" xml:space="preserve">
     <value>連線集區已關閉。</value>

From 4be0e05eccd973d0fb63ef5e8f710bed4c296b66 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 13 Aug 2026 12:23:58 -0700
Subject: [PATCH 229/298] Add sqlclient-perf-pr pipeline comparing against main
 branch source (#4519)

* Add sqlclient-perf-pr pipeline comparing against main branch source

Introduces eng/pipelines/perf/sqlclient-perf-pr-pipeline.yml, a PR-oriented
variant of the perf pipeline. It extends the same Perf.Test.Job.yml template and
exposes the same configuration options, but:

* runs against the branch the run is queued on (manual/queue-time only),
* uses the 'main' branch SOURCE as the baseline instead of a released package,
* does not ingest results into Kusto (no ADX variable group, no translate/
  publish/ingest steps).

To support this, the on-VM run scripts gain a second baseline selector:

* run-perf-tests.sh: --baseline-source-ref / --baseline-repo-url
* run-perf-tests.ps1: -BaselineSourceRef / -BaselineRepoUrl

The selector is mutually exclusive with the existing package baseline. The
baseline ref is materialised outside the checkout (git worktree from the
checkout's origin, falling back to a shallow clone) and that ref's own
PerformanceTests project is built, so the measured driver is the baseline
source. The comparison is labelled '<ref>@<sha>' so the exact baseline commit
is recorded.

README documents both pipelines, the source-baseline mechanism, the PR-only
parameters, and new troubleshooting entries.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 08b18803-3735-44b6-8afc-1996ef05fe15

* Address PR feedback: tag build with baseline SHA; fix internal/* branch category

* Build tag now records the baseline COMMIT, not just the ref. The pipeline
  cannot know the resolved SHA at compile time, so the run scripts write the
  resolved '<ref>@<sha>' label to <results>/baseline-label.txt and the post-test
  step reads it after the results are copied back. Falls back to the requested
  ref (with a warning) if the run never got as far as resolving the baseline.

* _branch_category() in perf_to_kusto.py now strips the internal ADO mirror's
  'internal/' prefix, so 'internal/main' maps to 'main' and
  'internal/release/*' maps to 'release' instead of falling through to 'other'.

Reviewer feedback on baselineRepoUrl (allowlist) and on consolidating the two
perf pipelines was discussed and resolved as no-change: the pipeline is
internal-only, and the shared logic already lives in the perf runner scripts.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 08b18803-3735-44b6-8afc-1996ef05fe15

* Fix perf PR pipeline hanging on baseline git fetch

The 'Run tests on perf VM' step hung for 1h22m with 'Fetching baseline ref
'main' from the checkout's origin ...' as the last log line.

Root cause: the checkout is copied to the perf VM WITHOUT credentials (ADO's
checkout task defaults to persistCredentials:false), so a fetch from the
authenticated ADO origin can never succeed. git fell back to prompting
'Username for https://sqlclientdrivers.visualstudio.com:' and blocked forever.
Three defects combined to make it fatal and invisible:

  1. no GIT_TERMINAL_PROMPT=0, so git prompted instead of failing;
  2. no timeout on any git network call, so the stall consumed the whole job
     (the clone fallback had the same exposure);
  3. output was redirected to /dev/null, so the prompt never reached the log.

All network git calls now go through git_net()/Invoke-GitNetwork, which run git
with GIT_TERMINAL_PROMPT=0, no credential helper, stdin closed, and a hard
GIT_NET_TIMEOUT_SECS (default 300s) timeout, capturing output to
<results>/diagnostics/git-*.log. Failures are echoed to the build log, and a
failed clone now aborts with a clear error instead of continuing.

On ADO the origin fetch is expected to fail; the run falls back to cloning
baselineRepoUrl, which is the normal path there.

Verified on ubuntu:22.04 against the real scenario (uncredentialed ADO origin):
fetch now fails in <1s with 'terminal prompts disabled', falls back to the
GitHub clone, and resolves main@73249e8 - 1s total instead of hanging. The
timeout backstop was verified separately against a server that accepts but
never responds (exit 124 at the configured deadline).

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 08b18803-3735-44b6-8afc-1996ef05fe15

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 08b18803-3735-44b6-8afc-1996ef05fe15
---
 eng/pipelines/perf/README.md                  |  84 +++++-
 .../__pycache__/perf_to_kusto.cpython-314.pyc | Bin 0 -> 20571 bytes
 eng/pipelines/perf/scripts/perf_to_kusto.py   |   5 +
 eng/pipelines/perf/scripts/run-perf-tests.ps1 | 255 ++++++++++++++---
 eng/pipelines/perf/scripts/run-perf-tests.sh  | 232 +++++++++++++---
 .../perf/sqlclient-perf-pr-pipeline.yml       | 259 ++++++++++++++++++
 6 files changed, 761 insertions(+), 74 deletions(-)
 create mode 100644 eng/pipelines/perf/scripts/__pycache__/perf_to_kusto.cpython-314.pyc
 create mode 100644 eng/pipelines/perf/sqlclient-perf-pr-pipeline.yml

diff --git a/eng/pipelines/perf/README.md b/eng/pipelines/perf/README.md
index f9dbefbb08..09ad48788f 100644
--- a/eng/pipelines/perf/README.md
+++ b/eng/pipelines/perf/README.md
@@ -10,8 +10,9 @@ database.
 
 | Path | Purpose |
 | ---- | ------- |
-| `sqlclient-perf-pipeline.yml` | The pipeline. Extends `v1/Perf.Test.Job.yml@PerfTemplates`. |
-| `scripts/run-perf-tests.sh` | Linux on-VM entry point: install SDK, create DB, run benchmarks (interleaved or sequential), compare. |
+| `sqlclient-perf-pipeline.yml` | The main (manual/nightly) pipeline. Extends `v1/Perf.Test.Job.yml@PerfTemplates`. Baseline = released NuGet package; ingests into Kusto. |
+| `sqlclient-perf-pr-pipeline.yml` | PR pipeline. Same template, same scripts, same options; baseline = **`main` branch source**; **no Kusto ingestion**. |
+| `scripts/run-perf-tests.sh` | Linux on-VM entry point: install SDK, create DB, run benchmarks (interleaved or sequential), compare. Baseline is either a released package (`--baseline-version`) or another git ref's source (`--baseline-source-ref`). |
 | `scripts/run-perf-tests.ps1` | Windows equivalent (ProcessorAffinity instead of `taskset`). |
 | `scripts/interleave_perf.py` | Interleaved + best-of-N orchestrator: runs each unit baseline↔candidate back-to-back and confirms regressions across N passes. |
 | `scripts/compare_perf.py` | Compares baseline vs current BenchmarkDotNet JSON → delta (md + json). Reused by the orchestrator. |
@@ -33,6 +34,7 @@ ON THE VM  ── run-perf-tests.{sh,ps1}
       2. Create the perf database on the VM's SQL Server.
       3. Inject the VM SQL connection string into runnerconfig.
       4. Baseline pass  → MDS <baselineVersion> from NuGet.org (Package mode)   → results/baseline/
+         (PR pipeline: MDS built from the <baselineSourceRef> source tree)
       5. Current  pass  → MDS built from source (ProjectReference)              → results/current/
          (both pinned to PERF_CLIENT_CPUS; interleaved per-unit by default, or two full
           sequential passes when benchmarkRunMode=sequential)
@@ -42,6 +44,7 @@ ON THE AGENT  ── pipeline post-test steps
       • Show the BenchmarkDotNet markdown reports in the log.
       • perf_to_kusto.py → NDJSON for both passes (published as 'perf-kusto-payloads').
       • (optional) AzureCLI@2 + ingest_kusto.py → Kusto database.
+      (both Kusto steps are omitted entirely in the PR pipeline)
 ```
 
 The extends template only exposes **post-test** steps to consumers (no pre-build hook), so **both
@@ -93,14 +96,72 @@ cluster/service connection exist.
 bump the `default` in `sqlclient-perf-pipeline.yml` (e.g. `7.0.2` → the next stable). It can also be
 overridden at queue time without editing the pipeline.
 
+## PR pipeline (`sqlclient-perf-pr-pipeline.yml`)
+
+`sqlclient-perf-pr-pipeline.yml` answers the question a PR author actually has — *does my branch
+regress the branch I am merging into?* — by running the **same** benchmarks, on the **same** extends
+template, through the **same** on-VM scripts, with the **same** configuration options as the main
+pipeline. It differs in exactly two ways:
+
+| | `sqlclient-perf-pipeline.yml` | `sqlclient-perf-pr-pipeline.yml` |
+| --- | --- | --- |
+| Candidate | branch the run is queued on | branch the run is queued on (unchanged) |
+| Baseline | released NuGet package (`baselineVersion`, default `7.0.2`) | **source of another git ref** (`baselineSourceRef`, default `main`) |
+| Kusto | translates + (optionally) ingests | **never** — no ADX variable group, no translate/ingest steps |
+
+Both pipelines are **manual / queue-time only** (`pr: none`, `trigger: none`): a run occupies a
+dedicated host for hours, so a PR opts into it explicitly.
+
+PR-only parameters (everything else is identical to the table above):
+
+| Parameter | Default | Description |
+| --------- | ------- | ----------- |
+| `baselineSourceRef` | `main` | Git ref of this repo whose **source** is the baseline. Empty = current-only (no baseline pass / comparison). |
+| `baselineRepoUrl` | `https://github.com/dotnet/SqlClient.git` | Fallback remote used to obtain the baseline ref when the VM copy of the checkout cannot fetch it from its own `origin`. |
+| `testTimeoutMinutes` | `210` | Higher than the main pipeline's `180` because **both** sides are built from source. |
+
+### Source baseline (`--baseline-source-ref` / `-BaselineSourceRef`)
+
+The run scripts accept the source baseline as an alternative to `--baseline-version` (the two are
+mutually exclusive and the script fails fast if both are supplied). On the VM the script:
+
+1. Materialises the baseline ref next to the checkout, in `../sqlclient-perf-baseline-src` — outside
+   the checkout so it can never be picked up by the candidate build or the results copy. It first
+   tries the copied checkout's own `origin` (`git fetch --depth 1` into a private
+   `refs/remotes/perfbaseline/*` namespace, then `git worktree add --detach`), and falls back to a
+   shallow `git clone` of `baselineRepoUrl` when the tree arrived without `.git` or `origin` needs
+   credentials. On ADO the origin fetch is *expected* to fail — the checkout is copied to the VM
+   without credentials — so the clone fallback is the normal path there. Every network git call runs
+   non-interactively (`GIT_TERMINAL_PROMPT=0`, no credential helper, stdin closed) under a
+   `GIT_NET_TIMEOUT_SECS` timeout (default 300s), and its output is kept in
+   `<results>/diagnostics/git-*.log`, so a missing credential fails in under a second instead of
+   blocking the job on a prompt.
+2. Builds **that ref's own `PerformanceTests` project** as the `baseline` variant, so the driver
+   under measurement is the baseline ref's source via `ProjectReference` — mirroring how the
+   `current` variant is built from this branch. No NuGet baseline config is involved.
+3. Labels the comparison `"<ref>@<short-sha>"` (e.g. `main@a1b2c3d`) so a run states exactly which
+   baseline commit it was measured against, and writes that label to
+   `<results>/baseline-label.txt`. The PR pipeline reads that file after the results are copied
+   back and tags the build `Baseline <ref>@<short-sha>`, so the exact baseline commit is visible in
+   the ADO build list. (The pipeline cannot produce this tag on its own — at compile time it only
+   knows the ref name, which would tag every run identically.)
+
+Because each side builds its own harness, a benchmark added by the PR simply shows up as `new` in
+the comparison (and one removed by the PR as `removed`) instead of failing the run. Both passes
+share the single generated runner config (`RUNNER_CONFIG` / `DATATYPES_CONFIG` env vars), so
+connection string and behaviour flags are identical on both sides.
+
 ## Two-pass build model
 
 The `PerformanceTests` project references Microsoft.Data.SqlClient two ways, selected by MSBuild:
 
 - **Current** (default): `ProjectReference` to the in-repo source — the branch under test.
-- **Baseline**: `ReferenceType=Package` turns the reference into a `PackageReference`. Because the
+- **Baseline (package)**: `ReferenceType=Package` turns the reference into a `PackageReference`. Because the
   repo uses **Central Package Management (CPM)**, the version is pinned with `VersionOverride` via
   `-p:MdsPackageVersion=<version>` (a plain `Version` is ignored under CPM).
+- **Baseline (source)**: no reference switching at all — the baseline ref's own copy of the perf
+  project is built from `../sqlclient-perf-baseline-src`, keeping its default `ProjectReference` to
+  that ref's driver source. Used by the PR pipeline.
 
 The VM's `NuGet.config` exposes only the governed feed, and CPM rejects multiple unmapped sources
 (`NU1507`). The baseline pass therefore restores through a **dedicated single-source config**
@@ -193,6 +254,9 @@ Two tables:
   `DriverName|CommitHash|PipelineRunId`), driver/machine/agent, `OperatingSystem` (`Windows`/`Linux`),
   `Architecture` (`x64`/`x86`), `RunType` (`Sequential`/`Interweaved`), pipeline id + build URL,
   branch + `BranchCategory`, `VersionString`, commit hash/date, `IsComparableBase`, `IngestedAt`.
+  `BranchCategory` buckets the ref as `main`, `release`, `dev`, `feature`, `pull_request` or
+  `other`. The internal ADO mirror's `internal/` prefix is stripped first, so `internal/main` and
+  `internal/release/*` land in the same buckets as their public counterparts.
 - **`PerfBenchmarkResult`** — one row per benchmark: `BenchmarkId` (PK =
   `DerivedRunId|BenchmarkName|MethodName|ParameterSignature`), timings in **milliseconds**
   (BenchmarkDotNet reports nanoseconds; values are divided by 1,000,000), percentiles, throughput,
@@ -249,6 +313,16 @@ translated NDJSON as the `perf-kusto-payloads` artifact for manual/backfill inge
    `perf-kusto-payloads` artifacts. When a baseline pass ran, the build is tagged
    **`Baseline <version>`** so the baseline used is visible at a glance in the ADO build list.
 
+### Running the PR pipeline
+
+1. Open the **PR** performance test pipeline (`sqlclient-perf-pr-pipeline.yml`) in Azure DevOps and
+   select **Run pipeline**.
+2. Choose the PR's branch to benchmark. Leave `baselineSourceRef` at `main` unless the PR targets a
+   different branch (e.g. a release branch). No Kusto configuration is involved — PR results are
+   never ingested.
+3. After the run, review the **run summary** (comparison, labelled `<ref>@<short-sha>`) and the
+   `perf-results` artifact. The build is tagged **`Baseline <ref>`**.
+
 ## Troubleshooting
 
 | Symptom | Likely cause / fix |
@@ -256,7 +330,9 @@ translated NDJSON as the `perf-kusto-payloads` artifact for manual/backfill inge
 | `NU1507` during the baseline pass | Multiple NuGet sources under CPM. The baseline uses a single-source config; ensure `perf-baseline-nuget.config` is being passed via `-p:RestoreConfigFile`. |
 | Baseline restore fails to find MDS | `baselineVersion` isn't a published NuGet.org version, or the VM has no outbound access to `api.nuget.org`. |
 | Baseline pass fails to compile: `CS1061 ... does not contain a definition for <member>` | A benchmark calls an MDS API newer than `baselineVersion`. Guard it with the `MDS_GE_<major>` constants and add an older fallback — see [Benchmarks must compile against the oldest baseline](#benchmarks-must-compile-against-the-oldest-baseline). |
-| No comparison / summary | The baseline pass was skipped (empty `baselineVersion`) or one pass produced no `*-report-full.json`. |
+| No comparison / summary | The baseline pass was skipped (empty `baselineVersion` / `baselineSourceRef`) or one pass produced no `*-report-full.json`. |
+| Baseline source ref not found (PR pipeline) | `baselineSourceRef` is not a branch on `origin`, and the fallback `git clone --branch <ref>` of `baselineRepoUrl` also failed (ref does not exist there, or the VM has no outbound access to the remote). The reason git gave is echoed into the build log and saved to `<results>/diagnostics/git-*.log`. |
+| `Fetching baseline ref ... from the checkout's origin` is the last line, then the job stalls | Should no longer happen. The checkout is copied to the VM without credentials (ADO's checkout task defaults to `persistCredentials: false`), so a fetch from an authenticated `origin` used to sit on a `Username for ...` prompt forever. All network git calls now run with `GIT_TERMINAL_PROMPT=0`, no credential helper, stdin closed, and a `GIT_NET_TIMEOUT_SECS` (default 300s) hard timeout, so this fails in under a second and falls back to cloning `baselineRepoUrl`. A fetch failure here is expected and harmless on ADO. |
 | Ingestion step skipped | `enableKustoIngestion` is `false`, or `KustoClusterUri`, `KustoDatabase` or `KustoServiceConnection` (from `ADX Cluster Variables`) is empty (expected until the cluster is provisioned). |
 | Ingestion auth error | The service connection's SP lacks **Database Ingestor** on the target database. |
 | "Kusto ingestion was queued, but the ingestion principal is not authorized to query the database" | The SP has **Database Ingestor** but not **Database Viewer**. Ingestion succeeded; grant **Database Viewer** so the verify step can confirm the rows landed. |
diff --git a/eng/pipelines/perf/scripts/__pycache__/perf_to_kusto.cpython-314.pyc b/eng/pipelines/perf/scripts/__pycache__/perf_to_kusto.cpython-314.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0dd9bd9d8106117d4dda6c5ec09a47a2910cf0e8
GIT binary patch
literal 20571
zcmcJ1d2kz9dSBzd2@t&R77vl21X7}IX>^j5Mk7(;HX%wHbB6;GO$sw0fb9l!U}n5r
z+o`2?;uU4DBaV00!--ur9G5H0B(AcOIOSRI`l@o3K|xwTy-Idc*{W3jND4EW)Hu7T
zB){)98i06cl{je$uU~)fd)N1l?|9$ijtZBZ!_yLc>y0mta@>EU5A87)B2UwZ%yR;l
z;9lbd-C12i$KLvcp1lnT1A7}2M)o!(Ozdq=nAzKsun78uRWQ_X3ENlg+c=?euTCvH
z;Sh{~It3F#mtaO%Ay^Q)1uH_2U_)3b*b#aK2f`}BiLhF5A*>N95Y`G_!Cl8ibcwpJ
z)(f74S2!+I!Ew#pR~xo*U#;85?JaaetMi&p&~<RWs^I&2jtfY^s2m9<ME;Z*oxU~~
zl-?YQB`$~wzI`SciL~>tj9t9IOJY1GC1gGvO~m+fNf}{WlxF;rC?_L;OR*brpWS|T
zE*=r*#3&$%Ya%}vjK{;#Sw0k-P7+iM@v$gNIg1Y|8jK7{;p?Ilh{Yl@e<S>6cqbnZ
z&WilNfnD~V_EFRjljefaX^|HS6%7Rw!Kt7u@?&vvIy@7e4kp5}XuFROMnkORv9Co2
zBVkm=PsgGtTSl^7PEJv|eLO!Z#X`wx5$(GX<D=q@NH{9`Lt-R67pCU1&h}gwqPLHq
z2}gh_iNVk<9xYKjZby$qnQA?3xAS~2Pt6pPQNHZ)qn{!Xg%64Hv=p8qDkQFjQ5X<=
zr~_0ne^KD4lahqi`ud7x6~{sCGhZqUB<H8JQR3&s#I;zcKOU5Vh$3k^HiwEBK`<64
zBat%X1UeX<r2*V9&Ou4!#hY;qr3?xH;ljxa7srMNFJ2fLJ3=(I%hT7yxgd{G2NFLQ
zjzq$;2=a#HoxB|5MUeRxj~Yb&dN7g{dGs?Bz8(&txT#zG?wz}K?V=wVbuk(NCZ@*d
zEi^ugA~9}3Da1#@Q&JG65Q)UECBu>!>a$;%rI|bb8+|9I3sacA3<&A>^xFvLxd{fO
zV6+%3MMep8-BXrBTjFIHqvo=YLR4EiqqdD{0;i>7QRz}OU03~GbN;SSpzGzsT_cCP
z#`?NuUiFz2YY3~1sH7O8u^Wn&qAAQ1#gI%)D^@un%@F8g?kUxwyw!h6#`Nt6?Zs$t
zE*QBMOGv@~!B|M_pN_@DkyyfiBPP9>kVH}LFHZaZka*p%=J6+z(p1d<Ml2~s#asPi
zbhbYpj<cC3_tWz2r@0wVs2`Jw*yNkEvist<6vrgmgjP<5<(T9^b6W9}cO#hRo;a$q
zj^;H-bJoGHIru-Q&u$x7+cuEhwtsEg{*2>5)^TFZaUy;4O2%<DZM-TG$)*e29ikj(
z#Sf!meEK=|pLuSa>t<k%n+3F)>*qSSCT^mbV;ozqpcf1W3L|+$H>peNlZMIS#unF&
z>oyx_ZR3mU1tb02TPUH8n{XDY<VLYou79vWTLs${y@nq*qCFlBYt*a7O7Cr4z^KiF
zxM`wJO9_}J>b3Y@^p>7tZ`-N26BZT9ae^bjIXS^OV3;5Zv1gPqC+$mp3zh?glG+%p
z0;bWXXEEqY>$``$WWHoc8v41U{`5|cyMesYY`{FxtmQcbN~@GVhn|(S-7-O=&Ylfz
zXCrm4m*cL^PU+9}ahwfPBx#6S;^q#H=XR8OiTawku)d9J;o8{0^M7{4(87gvJU3BX
zeP%9%GMc%#p^P3TMh|nq;N%93|0gs_>RUL$7&ja@bQIoUU6?D@T3zTAw`r~R{~xs`
z(SMaXVb13Yu7W6nh~=qrLokJ?D0R#H6d0ixjPf&L5Q!o`6A5C^4&pyH)ae9cLTvX`
zSx(<zEIJdO#l{~=&PB1k2C%c17=&6Z+l`6MMrkt+@_lc}vFJ2$N6OkGi`a}yj5Yw)
zCikm3RTLE;{E6+|VPfsExIcnTKf?DG8r)lGX@T2`>p1b0crAE6jBN<j69W`)iqbS#
zNXXtJ_RaS3*yu)rQ84JxSTuYwdN~{oL7v!2@QZQmiQ$wOIw{|ZPM^{W@-fB(76M6t
z_!kj{@g9f~5LB+&CGaOHL~J)0iGlHf88IX<FcMfG34nG{ahmw}SVCfmkRXb@7bItF
zaXOL&8{5gmi(vGYJsOMpwNWb30SsK_UE$d%cw~sUA~i|A7K|fI1aHw0Vl)%{TQsJJ
z*+{=b0un||oe97IW#;0ETk2T%kVJDMC`Dx-f8!cPj|wD-ga&jjEX&kp2qnoVBmh|q
zPDMmUlwe_K?Qtmv*c?QVSt*E-!MK&GD9juwh*BjKO_MGdhEPIsiiip^5qa<%CL4lA
zeRf4B{oIyJ%=i!b<?!ssI>ib}Bt|5@klKFvq;TQvg)@gycQO*<qp<`Nn`pE#v$e_g
zbNyi+8I9D7l&k0XobR;>xwpT+ueVd-Qr(*r!n(GulvG_2@!8^2JduX#4yuA&Z0Ze+
z@DZMk3L4ty^C-qxT#PD466zES#2iVANs1|s8IVv6@-100%ZZRENs3+qXNKUY7-_*M
zrbsLpk`?<nNjPdQdl+Lt63n!y7-@YfCJ2#pvQje%;pz0*Gn2zt2G3s_8XlTFH+*$W
zG1A2GSrua(R9DQPc_@N9q~Hz3Al{r-9MRY$WH=^2D~9QrS;g?CcuO&<6PtL#_JWKl
z5nE8ICaF!6DiM&A7PRC?N)LYWact}J+?Vy7)01;oF4*#VlgazURk_%?WLSPP>l%3E
z8d#mldF$`(xVz)G{R@L%8n}u*UwF8xntR)SYkRuEw=%FIXS{pn&*k+-WUcVtdE;Ae
zEHz~+x)uyySUG3y;`IA_Ap|^d@K3C+w5NN;xO_eBA4ykSczEeb_R{3qrO8Lu*IDg3
z-_GwheBAIyO<!<2=ZNm(ruPmn?a8^l4;%Z}-2Gn|I9J`1y~pk+e-z5@J;y#52EX;n
z$4#Fz^gO3Cjp)AYKm*b6U;NDB{esh@NmT3p)x_$|{Zsel`(nCc=x_J@-QmAE{Kz_v
zT7T2_i@XVFzxcw7#+Gs%xNls&eqZ>+a6g%@82;PAzkB6xUU_7_T$ba1Jatkl<uC~O
zk81~ya{sh)u-Ei2t%&`gx_0Ow_vd@v!+Xp>v{q5bn<?yd3?8=qaGw!4KRj%p@Tg;G
zpW#Q=_Mu&dANA@ezRN`6LC5ee!(SNMhj$qMqDx2d9VUdE%Shj5!`RQobph^(t|&Vg
zh+DRCeVm6o{VzB!t{>Nr0(1Q%=rpP1269My<EC-Lb0sCixaoQ6qo(yWlq8L~dEBVA
zF9e~lnHx7~-?Q!XUB=tdUdTFzUn=VuOR~<n>l`<37Ho&mgb<{rW==3&uG)^TbHC0~
z>}4tDLdqf}8sMsrpw?;`H=%Cpfa#aW6y<gQu`1z=lj7_Mz6Jh0O1my8#^BZ1@n3)4
z?^l<gKL&kBB8GF}<jC;R@ssB-4Zr?6&$b3tfer$@oDU$CwvPe>C&`@G1a*EIJF^UJ
zJjm020hOGO&G1EOAKYGJt*We0WT++fHi}(me86W1^Z8m*gnC9=Mjszw%(K8WiP=F}
zhvEz^TIF5O?ybZWijoCb)pQ~mj6jzImOVHdq<wHFKb1@{?g8~<`b{z9hc5a0>uNbF
zX;fJP-DSG4s(mm<A%jUmt>nRWLaOZ`B+dkhQ}47FcqwbUpW3c*dX@3hPL5WiE^sn*
zF2=tpig8p-QjL&|7K9{J3I><BMieadP*X`YmR?Sd>1i=eBijQ~lBfjUQsChmMh|@4
zcLb^B(g7<9EQ0ZH6ce0^fjq?2<u}9eI3Va)kWbu-lOY0A23;U_MYU+<^zr90xg<W6
z#L&Rh0VaMU9PLwdM^jxzCa7^Ye&Yn}PStnwJy7mZE-Ea|M_->rT1?<{$_@n9RK7b^
z-Cbg!1&a9kd<MmskdmUJ+pQRGi88)TGr@=qz%E4}jrq)q4Qx6QCQ(W;L5&T^iCf;l
zA|TyIYM`JIfzJX)8w^XbV$+t0tQcusC`M?w#BRm71RaG_Oo`Z=VpOJ;Ti|&r%d4AY
z5<!94O%{uhjsx>Ne)10y%yao_uCi+WY|c}2&#~xO^8S`%!I*1m`{3An$5uKrO?_+D
z`UT_SzMQ-2PU?2*-M5iSsCON|?aF#O);t{<PuGI!r*7{Doll&V>FPuGJMY(~k6%uE
zuRN)1yqCJ0`fmoEtK&a7t8)%dy1M6~qbJwezHs*4i#eA!UEBN6)thVWpzog*vxAA9
z(6!`R+Lz9xI}YRxx~fA@j-UFo)W1r7iL%b=K5ODCoAa%lvnFk<-l#Q`u4Evs`M)9(
z)NRz8$*4EZZN>#OUGRB3dki}En2znBs0Di~bf=Pjc0~6T<11XKjZ)gUaorvrnJpt$
z!Rje$nx~;t7x#Ns#yMCHTCq!yRFifnm`6O@w#ch-DJ_3UZG(k+gdNwG8X5`4NqW6F
zRxqi>VT{rivTC1#{)Ejk7R5q|@ZAL^qMJnI?(^Yj@@99RM4F#sz!Fj{h4kririn_q
zJ@`GPIrx&U9bKL00^DgZv#(W->4`Wuxp`9?M;&8bLgV%s!n%)j7bKF;ur~C4yA%Uv
zucEsyQ+eC@d3EaAUYZr7WM@03@RQIIV9|kIGZ~ZnUW&xfWcgTM5hIR_at(sN|IcVa
z+J1Gd?aGp2aoe{KX4<a&cbTTbuUA&<0;d%d>l)Ue39@_greaJ+!#5Rkaw-{3Bo%W=
zoC*h{ig_9uN({1XFam?D=rc$MP=s_4fntDK^Rb>SJLwDnGI$%e{e;?R*E21Z#*joZ
zkt`ti`+4p^IXsWul{u^Hj^noDU02rHv}SF}SX<^#<}A)d-EX8GyX${yvH!aKkaZzr
zzxqx2oAR%fKC_mq4=h(7yKAwG=Fe}O^wbtm(fE`q{C_>=F|qWi%WPutP?lg7mi<9#
z`Wkj5us84$Rh`{*rm_8PnheooqQ)LedhC_`dwKsc{^tI@*k5U``Sc}1`*e)PGEKPc
zDs|mu)TN50OGr!NC$}IdlGow6bL94scaLTrt!s|fjDt@b`HiHa$;L?auUX#pR<(cF
z?!YW;o5+5Gev6fh-2*nc&2kj&Wb4+tsj$|~sWUVrBye1V_KQIwA%mZT-E+fw?;eA#
z7*jhOjHnBpoh#fBgV)7Sak<Ol*A#mR5lR{zJ}8bd+-DYq9V#8pI&MH%kZ9Ve3xZdN
ztg39t(5y+YZ&4z9^4o+t%t-&dRbl<++uwM5aX4#fd|+vO>~6|gRLGgErTKxS`LVls
zi<Lm6WW(#kn%I0L1fV1c9w-Db%RwQ~ZN>`5Hw;+8^apd`xNd?b5qnB_f?kJm+qe-u
z?RcA)Dj3#JgITbCC;*$XBN$=}yY41aVAEC$<_$UAto*VTmvGb;kLv^rorTR}V@6AK
zf|Z?&p@(2@#8@`3$+n>;HHUr69F8q=IJeB<TA!mpt<76hu^zj?9NjQ(g5~=vQ!lA|
z*ld`rE;F=B==ceG0xhB<b36rW&h)iGNRhKKSgWRzkkMfYQ%o_SNf%P4IL`a}Q!t&)
z;6#Apij!WGbRYw>V9Lf84o>a*72_O4e#JZ&l(CdjR!M}}QWpCaOCgpr;uxY|F(6Et
z$eP)ovKEY*Kq|zr`#M-<*C4{n{V5asz@GUln1YHSB1XYa9XJ<4vnNSFlwP6)Gmffe
z!Z!=twXiNdlLb7IlBs{vHQ+AbC+85*URul8Ozr&8PrSVg=A6TQ=lJd8OZ&5q_J@x4
zTvgrshNaWrbu2m4Rb2~1kDZmDS-7elc`Ijie)H?!`1<0FtflRNrEU30w&T!R$D#W>
zvmIw1bewtYZYklsm9=y{uyjDI{LbK#BU9a(uI@^^w?n$LI2Nw|#;-0_FV{b8@I7|d
z0KiI3Wi9OwEbZWv8svJ`()z&C`q*8qLA09pesui9<Ew|W9mgJY97B%B4(~=bP~0c}
zo^_iH2kTh@DY09u%%Zsfy9m|}Gb<GL1Qb|!G=Y-Ri))yzGg7hXKtY|O=Q^>g=r?5p
z#eJw~n0T(?;d0gUgjZ$+c(qJLH>4z0KQ9_|)kAH_h}}p~4@~85Xr0XTi-}FT7`~E>
z^W)qyI1Aly_-2q!w4s^BlZnH8yAZoE7=vVWbT=Jol6{()rH=-nAGO0mx>M>0g-An^
zp|B-X=D(jnX2lN8rBJV8K=EV-loHYoq$;{eRW_iLM^)cZxlLt3-6>_2NHqL?{Ny(f
zK+&;t4%htPPaQQdrY+cWp2n<)U-R(GRX>IXV=Pl}e(J7Tl$Sfd^YzD2TI!oWsCchp
zS<ck&xb0dnEShpn{0B$gJM!J53x+#qZ=ZelT*g}enS-m`o_BIi_xvjxCz=uU)6{tS
zhZyd8oJ7$?+l=Lu&PO-euaHYGm@(P5VX_%650HpmU`P<LFL&%Dy|M7jptff29M0CB
zg%>P69fjfFybZcOPCLWe*a~Jvi=qX_apR^vC{EUmdC>zCY-R<9rnQycC8k)G3tBhR
zpf=A@WQ?$-nG5~BfF-nft4tbWC}2(#reG?k+2vZcG%#sY<_&gXQOqOa9Ck>>G9qI7
zPs6A^#Jm(p&{fRmMd&FZMSnJ=n8wN2jiYP#88NzRFcyhGFou>dGr;ckfPrTKfmk9K
zxd`cqIV8wR<EdM)U%)E?$_|VXu+9_{eLBT3D<;T3z-&y41r80YW#&1xsiv8*7zu&l
zFt}nbN#=?<!Wz8MR!~0~V%{Z_a=}$(vQVn@k1#rajGz2(5zKSB3eWr*=<Ro|-oCnc
zGvng3uI*{p_T^Lar=RL|-a*}h=~IX2+sBu#fA5`#Z3lBL9pC%v!kKq3d}g6U?EY2t
z_k4GKOJ|p*jJG%I-Iez4TA6y_-32aF({%6EyRR-gGd2Ef&7O44o>f|<l}-0r@3t;m
zGnKw<<;isA$(2{X|Jui|-5<*MPZDdYeCTLd-u_YVhrKJ8Gwu5xwx7(kb}nE3UJTV<
z{LIEx?Z&!yR?S~fmnCUQ+Cxi{eoyBS%x|^N7hM+0rY3UH)TAZ3xiNXX$Q|N_af4Vv
z_~V9&V(mMzWVNRto9Gn>2AZ@_a;3Qd-u@0S6x)Td$<bk9a%9YBB$H7vA*;OI5T8z{
zTOn;P+p!m_8=+$o6RA*)^e&Qqh@X5I0fx`+zT>;?TO7&Q+q3qbw7q9}YJM>1bl*91
z`^@6dyCd_%x%Tb{?Ryr6zjOAHvn6djdcPXMM%vM-3aDUw`fX_Z@b}tO9)l#QFJEH#
zHmv(LmVXN-&2b^FFUi+M4r=I!VPsrC1!;AC$$(h_vz3<ym>n?3I+$~U_&$3e*IKlA
z=`9pxPHodbNfi_5r}}J>%dKH+Z{+e!6vugsTt)A;vRq!Y`Wd>Qq$<Fw*Y%_Zu-bCi
z#u*wgAa5P;>dWx}YnX7A`txjRSxXv`vuRz<X26~qMU>V8SZg`n#+C?ez~d*Ni)d67
zww327tF?U#T6JhR8%yu!P<rRMp<g$siyQmEXoR-789xht*5^B<jFR<e-2+FOE@6Ao
zsl`@u^(Z;1jMlHqgijdlY(lrtqaDR)E%tE3`qRG$wrPiZOwk2p+%EWpUSWqe>o;-N
zag>}-MvE>crFv0cQKyPKg*N)9wYrVF;@ot8_iL@%jE?b&K*grHc4@id?kzBi+E?5Y
zFmEh7;EtOEmQCQExFujMgBKY87Pagyw!<3Oynh2F0S0u}o&I;Adu5<<(_Zb-N-L|s
zw7Yu)-c57u)pEtF0#yZ(0<vqMY6A8I^(o)s<JDW#zE9Y%iCXcREpQH$;nZ${bFhT7
zu^+<zc-<EH4r%?^m<znEUO2p&uoln<Y67)^I^oCx;yifb4REZY)AV%@_Uo4d4Op4x
z0PWgG12qVb1!@r<57Z$%F+oZIdjfS@TL3?~MSD+aIA!gHHHLWc7C8nt$x#?zVLxgb
z3REK;o*;icwH;pJv^FM4IrB`)%VjBNpGkS8EahCFx~S=aPr`<BK2TjgA4YU+Hyqhw
zc3sfgEW)<g%>6Q~&F5U9j*DC59(|!YidfIB<12ysO;?Ga)d4z=1>6V&0T04U6LfN*
zQoG3igwBAWUq4uso7%8)&wZ*2<HP!M9~Q)Nqu?y(8XBEvnT@NAvs<;gA?7<tu*bXN
zIXO$*-BOmbf^uFS-lOl}p6{qPtUv!JMW;C)nb<SYuEqA~iw<<Ii7pK)><rj(yzURU
znA;vz#-7n0EmnF9eHu?8_dswp*Kyad;T%?-8ZWu+`NmT(7d+;A$nFZ?>Ye<rsNP)k
zA%7L_+BoV_eUZs?9lq)0v#xpq;dGek@ROmi)R$_0OVteCdHXH$w+SZ@(GJ|-Q5*%e
zfgMRYRD{WELHU~E){w~OW-=UtqHk7_al*n1Qmh(^;v5o5{Rj!kC{!u?5Yt62&@rcD
zB#1+XsK`E?bLs~(a4EKvP`(l@0mtfys$h3PRf^7z-Gaq!PVvBti4?2o>?C}a2;w|h
zc5<OO%g-?s3)&EXp<1z0yUAp&xJC<}z-sfXr;_1F=#mssY*Q4QOd?9z;BQ~ZM&8Sc
zT{R+71Em>^qf+s#RZ($`t1kDdPn}YMb8Yg#pHvMkihYog>1Cp3A<k;h$V`=7P&{X4
z;E~Y-4s54jSX8`WnOvg^ph<F|SIp|UJdvKx=N0=|=9mvx!9+^m+ne(C7N&rorUP?5
z2td=c!8I_6MxkXSElN;hIEf^<R73Gdz2wD)8p+F}l90f{;dJ$KOim0(uZN{rlsvW0
zMrUG51t>+H35Cupwu`bBwHGZ=(6h&&>4f3w0G-=70!L59NW-EYOF}Cre}2V2TC@{M
z5;d#oEsPpwXcR=p3rZ}|5P=uoJ5ZktNG%vf)g&CFgBp%vy_kKj;)go5)T&tATdZyj
zjs(o@RB;wzr(mbDyb_yYs0Kt78v>2+)P)gQF^%rqg_i*@#1HLb@k9G4en^cUQmO*i
zq*!wH8tiBn<1%!@F>!hpz2mqOcTOl4=1>P*7bwIo1gIW%*0DrrNW6}ON-Y7OVP;WK
zs#P;a(W1cY3lg2fu$fEap;$-Zb4e$3N{zYzwQD1w02vs3jf$C)g9+y4&JH-4ipq}S
z*uf4nBukxCtUe}7w9mmMFh=HY_{PJMp%`Z)u_=iJZV9{%spOU?kq@|p19NVj7lcGc
zX`IBu1tc0`<~*j*GNS~V10y?VMEew6024Qr3OFOuHd5GfB$7^GW>>dB1@?3DXJtE}
z;slg>Jqe%QsN#wjx~_g&Vsaq@??V{vqpT+qZO?FC#H|{M_GiTiub>1gpGuP62Tb}^
z3T{&>>@vaVB<w$GWDa9L#ZJKf4W*i~Sb}r1G*2H+X33%JMA#^0GUJgpzxku;_%_Ym
zRFwV;(EkQM`3%(BdG6DiJ=vPWYc+>q<6J!Y$i1!juB=YiY=2bQowsncN1k%VTJ!vc
zFJKa_eb+xfm^W6r%{goBQbpc?*r(R&#pxygquQRl37>g0XRBS5mySKE>&;sTVC8Jp
zi(^a8k7~B(Z3M7$w#N65u2g-$?&G@j?!k<2DAP2YcTkd(v(>%tUNL;%^08&LBGYp`
zQ-31wqLd2G=6zVTeOdnK#)mgnQkm|<nW`gsHzj#ETm4d1x~1<?Lw~-KAYRT^wTPpF
zN7bGADgsm^_u`(#)bAY6R{7FZzUAqB4Z&+UTaDKGIs(*lwuXm|y(@cG-g&g+Xr}R4
zzJb7vg)01y8v6201ZghI*+PKU5+GZ<D_y&5Whmc92|Q<OdVgrSD&2MH(YC{x<|FxS
z1a9YSm5Uwsy6<)`^<=yqS+6hc^({;J4od7~g?-kA`23lCFPul`&*3a({(P>wetslZ
z;hjJ8vkK3h+1s;sBDW(;hn7R>ohLFCC+E*R@zj1Naqre|-CC|&9eP-IDC;@AV1$#Z
zt>#H(&0=V2aAilfa{r^s{r9&&scT}0wVAq}MdOzS&U*j@;HkcI^Y+bjy+7mb%ewcb
z-FsKtVe$6X-s`#BlWy9P@$Ou(<dF5|-J8o5nY#W3XRfXzTi2Ja>s!8okNU1`{l0Yl
zzLn+$SI*mz^$w)H151GquDo|;`OQqrz=Gw|nudE<?p|4ntenc$^e+tOsvGW|y?b^k
zlBwR2t=^rk-n}9LTHACld^fyo&eV1<oXNRszxDOUp88yE%OBVt)%q6Bd|Jpgvpkil
z_5r`9@!r+DSC?+Ccr!IS7fx&6Z?6cMnqAqN{pp(htEWovo0*!PY)xOfrf&t%Pn!;A
zn~twF9nV#_uhgtw|73sOz%`%HJ>_)G=X49_F|S?qS!e5-vo+7v@)bEx%hKC<17e?g
zT9+&GCd7bK$uHOBEflwMl`Ts%c^k#;TxHktOx{6pCs*0_kl($!J;NW$y9iRjRW>dS
ze{lA_v&&+pd1toye7gDks_9Q`|J-(eM`qV)74X;Xc{gEuxXOm5?tCT1y<BDe`%TN2
zR)#YT1NkZf!9%MIR70TJXFzoXs>cz;pIu%tuh#vz=ipy=<{Jpuh<3oe>Vxom;T3nL
z_27fnA<&?uowY2MY2N>*4L@!^m3!qvzJ<_Rxyq(oTjvM2-n*6dy_9J?`k?JB@KM0k
z_pYX~K3k6bY52!2XL1+E^4lmwJ6GAgV*bAUV|#kf#Z1p=zJs8h)cXVZE{bnQkxS?E
z-4yTPDtjLKPJYsr@x7e$G%rnmwgccVxmuU|i#D!y*Jo{9<&k_`2ZL?8sx#~8dg$nS
z(lxMpAk%eZ!IJiDTeG(39Nxua>Ph62_T8)gO#6ui%VNcvwe3@fH|=Ok8{59Tp~Jk#
zl1NwX|HaQdb?-N(-JNi1#(E(aGyh6xWqfsDb$azu+I!?j9e>sPgWgBZk$>;3CMRfH
z&Cg{zhx*I9TEVRUOMl&01}uMNv?9JX;1CRswWCJF9~cZ2nk&bQrU!M~gyW_M$4!V&
z7frk<qF^NDp8hJ%Jf69ISB?cldbX9{&Lh^f?%7PmnkeFoZkD5{)D+QR<kr+1?JdA~
zTT(5`43-?-BomC!F;2m80_RasonhqGkCKSE?wKHokv*dxEmnHNcxAxtF_TuiU?yiW
z?a|r?7c!`e%!SM%;9tqSMXm|YSIY=PRm*%f5@@aBO~{m!<Z^Z+Wnwopm^_OlI~*#(
zlX0#iD>^%w-`_w>6y0H;P5Lp#taCv)>cS;cm1``Bl9;Jjf>ScxQeaYzV!9#0CrTA=
zOrhjlT=p3Yf)J@*st{qIC=FQ2YVVq487HG5x<VoS0*QW18kx>8agWew{^q$~JNF&^
zJ<DCoJ@;MrALu`_d}#T|{h@o+nBn(jJo`VXeq=oT#O7KEEe<YsXKlTYY`rTpKdGu)
zfPLS4=lt#S?^l1&_`8kEgR8GRY&iZ&=c9(xKX#t^%)nLGgH70XAPfFKu=W02hIb<O
z1K+_@J4}DR!*S{*+cTbjWQBwUg?suf^9xPt;=~lV1LzSw%tdN5%R9TgSekO=KDpVn
z7fhI%<`=-jU2;sY;uPMpJeyz_9NIM863Z#LUI44&g|OVf@(7jM;@YxKFYu~f01vm^
zg_;+@s|7{serZqZU#JfaFND?jLRd{Ngw^~)t#5guvRYv)|K(%OqpWQ&K-YGmqmL6h
z>D1sr;e3gW>2tSWoN|@UhxDVg?AATnCP=4<qs6n664C@|+w8#xOiK5<N6W9h+c=>c
znB;J|?h$$buU!Ykr{Dv8lamgi7w|Hd11+bp18~@6*FVBez&AO;5d47i>#<R9AK*p%
zSt(uU2fVZNt;K|0fEO)j8WiR127EJn+5q6aB|I%A>;b%-4;2!Gy(L>UFm`G9rME`o
z(V}&;EKMur2)S(t`*2d_jvFWTX&5MxWR7*uxKXnz-+;g%jZaW!_5hzwbk{xOraqmP
z0~fc;v0qw;iqCO#87^H4V2`kW^Ri)~EV_1}>=OQgiIZAhlvvo|Vbwf{ayF@zES(w_
zR*1Q1!Nr`xwWm_KhbB&G<&F+%vC>;OT-wE6Bgglbz{DMzvjgmCDTg1oYG5GngHs1m
z`-bp`5~ji4Z_yRY1bp&f5#%@8y_ji~d;;S^S?=@cVF)bzkp(FHVkDlj`Te+^;)ekt
z)db@V`+FAZU%}u3M}5edxYn0)74Xzsw5e{wE!vg@2IaTNry5HABwnQIN5a!mOpeVY
z`e6PG_7(3lp}UsC&7V|--(RqevP{fMmU8<2%r2^y<3)4g1w*J`HH4<F;)($IJ)$pk
z(ReyZH(&6lCVC1U|NW}Rd>>!1&+;=;Y>wq9S}br4Nlx%$^tyWSHU<kZ3IW|D4pTw;
zUl=fIUAc`lCE_oOkOw*L4VQV4Z`u&}hxgw+xZn4G(S(%UPlMzqqf2Ukk@AI(VuIkh
z0~w4k3wlZ}&;8}D&V8v$zhARbv%+A=)=B@9I)&NA%)fq^f3>Q}BunG2`d6xS_xSw<
z!>(U7>=J@%0r!)oyzG-@ug0vE34x?h*mV75z?EoANx4~va7nmudoJ}mqnK%$r*~;c
z&};RM{4@90`}niZTu9gMacP&~Zqog2q6SQs&%5o7zaImCfA!KhrVEY>3ag-SdyElH
zwKEs5_enpY_S@K{s#6y)o)4NaIWB@O?Cu}VB7z~@`dU{|>54zDf%84;^+6&DW&`uK
z!cDkj;UXTp&xXq?JY93b45iENblXjxvFqqoxDbyeUNGzzdZXT^Q|ST!;NrzSx>LC2
zWx=C#;md~-X7RUK;J71e&ctOm`_utZX;K&y?ap2w%+hAmg!#x;4D;s-UJpua=}5l`
zx=H_pf+Y%mmxA{x_&o~lQ1BrIzfS?3GDsg$@NEkIkb*y=;GZGDRd6YWKV7t2qcZ!O
zJGg?8GOG!xHkMLcD1|Kws!9*8)e~Z0(dZwIm2Nnq>*^mi!Y#JaJ$UQ^><|Fg1)v{t
z67frE0D-SVu?D4C%x;`ZRGgG%*`GTarB6w*OitntAWcr<P$m?b1R6_Z{-Cl*-!i+j
zt+-T*7Vfs;4o{rc4!hZ=xK%nAFTDMOX^2CDgrpMkAoYSQuF?|<NJ~>J*!9WctT<Ri
zC5CFq773|=0uq$qvu8vXt~28=^_IS5HaHSo6gcUp6nu(cgM*&*Iwes+tWzF@{spDb
zRg-mfK5%vZaot1Lq50D}qdjY^TQk-zxmJz2mH_NFrh42VH;wB)EhafuLg_=}X=B|(
z<K<EY_iAUZ<#aK_%Vind>D}iT`uQSyy1r+%ox%1MVM`UOdIs841f}bDu1@9ky4J7g
z3MK1Jf)4gHlS6GME9ZF#OU{+4T+5|myDpd7m9F2h8e$b5DOR}TT9FuNpaen*479rh
za<6(BXm1geuJ2tv#b5`DuqDuBBWPpJzWWx2cA}UwUGG~R$m{j3{e^}bOuJw?EcJTF
z>dT)@<@g<Wy`lB0E^lJPWHP;~gB{W7RsUenQXu1KpC9^}i(jtJZriiAZBNFvmyPi^
zN4_!g(Cb_2%=R8z>phn79)D;&p<3t@*}Cqvx^A-L8?*JkwR&F;hWyaI*xgvp+PE~7
zZQi}sy!)AC@8ZzCk-H-~Ys1psY*YVQQ-97{wHUbf+TGW3)?#AKVzKD@rOs@lf34A<
zvz9^2qRsD5FL!3!53RKy%CsKNww_pPJ&|cWl|KFITI;Jht7mb0zRlw>&kugl$u)N^
z2R?f3!`D{FGEIlpjP)>e8}U~c?(Mw0bGdHW_R!eNzO&x;HE;X!xrfGGKQr3W&W`1w
zkIsL1e)(A1KJd`E=ZVp_aQZuY7T?NLb)>zW>CVAVhO$F}wV^<I@KV}7j;a1rM=kvY
zgo<N78vCnPfAH!f>*!;LlX*2N*2zh_p)olLS<kbc_etdYDv|i<Ym`hR(HK}j(8m<e
zDHgL2Nlg@Ei=9rb*cq8(gTR!+<y@Sgbr8@`0g1Tk>DeWUO;B)+0<!h6vn}<Mi|sSC
z#ju4>?IeK^o1<Ml*&e<Lw|Oh2lai?(3|U{o<*#H!JSNqmo%qkm-$j5Mv^w2q#tNPB
zDbMLVKjGXz;T-J0?I#@m+nFVN-uAg!r+ZcRSq0b7o^Bt?)DNe*n$OMKbR)XYU)DA1
zYCb<~(^Y<6Z`5u3yn@B*byc75uh6+aZ+9ZrYS10~+!@sA_|IQ97<Dh}zNi?~>0J5q
gdd}!vNIf((JhoTg4gB_a#@?JZHpBL0Y-El9-#mkL2LJ#7

literal 0
HcmV?d00001

diff --git a/eng/pipelines/perf/scripts/perf_to_kusto.py b/eng/pipelines/perf/scripts/perf_to_kusto.py
index c902d2cbdc..15a9790902 100644
--- a/eng/pipelines/perf/scripts/perf_to_kusto.py
+++ b/eng/pipelines/perf/scripts/perf_to_kusto.py
@@ -144,6 +144,11 @@ def _branch_category(branch_name):
             break
     if name.startswith("pull/") or branch_name.startswith("refs/pull/"):
         return "pull_request"
+    # The internal ADO mirror prefixes its branches with 'internal/', so 'internal/main' and
+    # 'internal/release/*' are the same branches as their public counterparts and must land in the
+    # same buckets - otherwise mirrored runs would all be categorised as 'other'.
+    if name.startswith("internal/"):
+        name = name[len("internal/"):]
     if name == "main" or name == "master":
         return "main"
     if name.startswith("release/"):
diff --git a/eng/pipelines/perf/scripts/run-perf-tests.ps1 b/eng/pipelines/perf/scripts/run-perf-tests.ps1
index 9c13e45353..7ea2bfdffe 100644
--- a/eng/pipelines/perf/scripts/run-perf-tests.ps1
+++ b/eng/pipelines/perf/scripts/run-perf-tests.ps1
@@ -25,6 +25,14 @@ param(
     [string]$Framework = "net9.0",
     [string]$ResultsSubdir = "perf-results",
     [string]$BaselineVersion = "",
+    # Alternative to -BaselineVersion: benchmark against Microsoft.Data.SqlClient built from ANOTHER
+    # git ref of this repository (e.g. 'main') instead of a released NuGet package.  Used by the PR
+    # perf pipeline, which compares the branch under test against the source it would merge into.
+    # The two baseline selectors are mutually exclusive.
+    [string]$BaselineSourceRef = "",
+    # Remote used to obtain the baseline ref when it cannot be fetched from the copied checkout's own
+    # 'origin' (e.g. the source tree reached the VM without its .git directory, or origin needs auth).
+    [string]$BaselineRepoUrl = "https://github.com/dotnet/SqlClient.git",
     [string]$RegressionThreshold = "10",
     # When set, a candidate-slower-than-baseline regression fails the run (wiki 339 §3 gate).
     # Off by default so deltas are reported without blocking until the gate is trusted.
@@ -116,6 +124,7 @@ Write-Host "  Framework       : $Framework"
 Write-Host "  Results dir     : $ResultsDir"
 Write-Host "  Run mode        : $RunMode (confirmation runs: $ConfirmationRuns)"
 Write-Host "  Baseline ver    : $(if ($BaselineVersion) { $BaselineVersion } else { '<none, current-only>' })"
+Write-Host "  Baseline ref    : $(if ($BaselineSourceRef) { $BaselineSourceRef } else { '<none>' })"
 Write-Host "  SQL_SERVER      : $SqlServer"
 Write-Host "  PERF_CLIENT_CPUS: $($env:PERF_CLIENT_CPUS)"
 Write-Host "  PERF_SQL_CPUS   : $($env:PERF_SQL_CPUS)"
@@ -124,6 +133,11 @@ Write-Host "=================================================================="
 if (-not (Test-Path $PerfProject)) {
     throw "Performance test project not found at $PerfProject"
 }
+# The two baseline selectors describe different builds of the same "baseline" pass, so requesting
+# both is always a mistake; fail fast rather than silently honouring one of them.
+if ((-not [string]::IsNullOrEmpty($BaselineVersion)) -and (-not [string]::IsNullOrEmpty($BaselineSourceRef))) {
+    throw "-BaselineVersion and -BaselineSourceRef are mutually exclusive."
+}
 if ([string]::IsNullOrEmpty($SqlPassword)) {
     throw "SQL_PASSWORD environment variable is not set (expected from the perf template)."
 }
@@ -316,10 +330,11 @@ Write-Host "Wrote runner config to $RunnerConfig (Server=tcp:$SqlServer,1433; In
 ####################################################################################################
 # 4 & 5. Run the benchmarks, pinned to the reserved client CPU set.
 #
-# Two passes are executed so the pipeline can compare the branch under test against a released
-# baseline:
-#   * baseline  -> Microsoft.Data.SqlClient restored from NuGet.org at $BaselineVersion
-#                  (ReferenceType=Package + CPM VersionOverride).  Skipped when no baseline is given.
+# Two passes are executed so the pipeline can compare the branch under test against a baseline:
+#   * baseline  -> either Microsoft.Data.SqlClient restored from NuGet.org at $BaselineVersion
+#                  (ReferenceType=Package + CPM VersionOverride), or - when $BaselineSourceRef is
+#                  given instead - the driver built from another git ref of this repository (e.g.
+#                  'main', used by the PR perf pipeline).  Skipped when neither is given.
 #   * current   -> Microsoft.Data.SqlClient built from the source tree in this repo (ProjectReference).
 #
 # Each pass runs from its own directory; its BenchmarkDotNet artifacts are collected into
@@ -342,6 +357,149 @@ function Write-BaselineNuGetConfig {
 '@ | Set-Content -Path $BaselineNuGetConfig -Encoding UTF8
 }
 
+# --- Source baseline (-BaselineSourceRef) ---------------------------------------------------------
+# Materialises another git ref of THIS repository (e.g. 'main') next to the checkout so the baseline
+# pass can build the driver from that source instead of restoring a released package.  The tree is
+# placed OUTSIDE the checkout so it is never picked up by the candidate build, by the results copy,
+# or by a repo-root glob.
+$BaselineSrcDir = Join-Path (Split-Path -Parent $RepoRoot) "sqlclient-perf-baseline-src"
+
+# Prefers the copied checkout's own 'origin' (no extra network round-trip, and it resolves the ref
+# exactly as the pipeline's repository does); falls back to a shallow clone of -BaselineRepoUrl when
+# the source tree arrived without .git, or when origin is unreachable/needs credentials.
+# Returns a hashtable with the baseline perf project path and the '<ref>@<sha>' label.
+# --- Non-interactive, time-bounded git ------------------------------------------------------------
+# The checkout is copied to the VM WITHOUT credentials (ADO's checkout task defaults to
+# persistCredentials:false), so a fetch from an authenticated origin has no way to succeed.  Every
+# git command that may touch the network goes through Invoke-GitNetwork so it fails fast and loudly
+# instead of blocking the job on a credential prompt.
+$GitNetTimeoutSecs = if ($env:GIT_NET_TIMEOUT_SECS) { [int]$env:GIT_NET_TIMEOUT_SECS } else { 300 }
+
+# Invoke-GitNetwork <log-name> <git args>
+# Runs git non-interactively under a hard timeout, capturing all output to
+# <DiagDir>/git-<log-name>.log.  Returns the exit code (124 if the timeout fired, matching the
+# convention GNU timeout uses in the bash script).
+#
+#   * GIT_TERMINAL_PROMPT=0 turns "needs credentials" into an immediate error rather than a
+#     'Username for ...' prompt that waits forever with nothing on the console.
+#   * '-c credential.helper=' clears any configured helper (Git Credential Manager is the default on
+#     Windows), which would otherwise pop its own prompt and hang in exactly the same way.
+#   * The hard kill is a last-resort backstop for any OTHER network stall (DNS, proxy blackhole,
+#     ...) so a single git call can never again burn the entire job.
+function Invoke-GitNetwork {
+    param(
+        [Parameter(Mandatory)][string]$LogName,
+        [Parameter(Mandatory)][string[]]$GitArgs
+    )
+
+    $log = Join-Path $DiagDir "git-$LogName.log"
+    $errLog = "$log.err"
+    $arguments = @("-c", "credential.helper=") + $GitArgs
+
+    $previousPrompt = $env:GIT_TERMINAL_PROMPT
+    $env:GIT_TERMINAL_PROMPT = "0"
+    try {
+        $proc = Start-Process -FilePath "git" -ArgumentList $arguments -NoNewWindow -PassThru `
+            -RedirectStandardOutput $log -RedirectStandardError $errLog
+        if (-not $proc.WaitForExit($GitNetTimeoutSecs * 1000)) {
+            try { $proc.Kill() } catch { }
+            # Give the kill a moment so the redirected handles are released before the log is read.
+            [void]$proc.WaitForExit(30 * 1000)
+            return 124
+        }
+        return $proc.ExitCode
+    } finally {
+        $env:GIT_TERMINAL_PROMPT = $previousPrompt
+        # Fold stderr into the single log so callers have one file to report.
+        if (Test-Path $errLog) {
+            Get-Content $errLog -ErrorAction SilentlyContinue | Add-Content -Path $log
+            Remove-Item $errLog -Force -ErrorAction SilentlyContinue
+        }
+    }
+}
+
+# Echo the tail of an Invoke-GitNetwork log so a failure is explained in the build log.
+function Write-GitFailure {
+    param([Parameter(Mandatory)][string]$LogName, [Parameter(Mandatory)][int]$ExitCode)
+
+    if ($ExitCode -eq 124) {
+        Write-Host "  (git $LogName timed out after ${GitNetTimeoutSecs}s)"
+    } else {
+        Write-Host "  (git $LogName exited $ExitCode)"
+    }
+    $log = Join-Path $DiagDir "git-$LogName.log"
+    if (Test-Path $log) {
+        Get-Content $log -ErrorAction SilentlyContinue | ForEach-Object { Write-Host "  | $_" }
+    }
+}
+
+function Initialize-BaselineSource {
+    param([Parameter(Mandatory)][string]$Ref)
+
+    if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
+        throw "git is required for -BaselineSourceRef but was not found on the VM."
+    }
+
+    if (Test-Path $BaselineSrcDir) { Remove-Item -Recurse -Force $BaselineSrcDir }
+
+    $acquired = $false
+    # git writes progress/diagnostics to stderr, which Windows PowerShell 5.1 promotes to a
+    # TERMINATING error under $ErrorActionPreference='Stop' even on success (see Invoke-Native
+    # above).  These probes are allowed to fail - that is what the clone fallback is for - so relax
+    # the preference and judge them solely by the exit code.
+    $previousPreference = $ErrorActionPreference
+    $ErrorActionPreference = 'Continue'
+    try {
+        # '.git' is a directory in a normal clone but a FILE in a git worktree, so Test-Path (which
+        # matches either) is what is wanted here.
+        if (Test-Path (Join-Path $RepoRoot ".git")) {
+            Write-Host "Fetching baseline ref '$Ref' from the checkout's origin ..."
+            # Fetch into a private remote-tracking namespace so an existing local branch of the same
+            # name (the checkout may itself be on 'main') is never used in place of the fetched ref.
+            $exit = Invoke-GitNetwork "fetch" @(
+                "-C", $RepoRoot, "fetch", "--no-tags", "--depth", "1", "origin",
+                "+refs/heads/${Ref}:refs/remotes/perfbaseline/$Ref")
+            if ($exit -eq 0) {
+                & git -C $RepoRoot worktree prune 2>&1 | Out-Null
+                & git -C $RepoRoot worktree add --detach $BaselineSrcDir "refs/remotes/perfbaseline/$Ref" 2>&1 | Out-Null
+                if ($LASTEXITCODE -eq 0) { $acquired = $true }
+            } else {
+                Write-GitFailure "fetch" $exit
+            }
+            if (-not $acquired) {
+                Write-Warning "Could not materialise '$Ref' from the checkout's origin; falling back to $BaselineRepoUrl."
+            }
+        }
+
+        if (-not $acquired) {
+            Write-Host "Cloning baseline ref '$Ref' from $BaselineRepoUrl ..."
+            if (Test-Path $BaselineSrcDir) { Remove-Item -Recurse -Force $BaselineSrcDir }
+            $exit = Invoke-GitNetwork "clone" @(
+                "clone", "--quiet", "--depth", "1", "--branch", $Ref, $BaselineRepoUrl, $BaselineSrcDir)
+            if ($exit -ne 0) {
+                Write-GitFailure "clone" $exit
+                throw "Could not obtain baseline ref '$Ref' from either the checkout's origin or $BaselineRepoUrl."
+            }
+        }
+
+        $sha = & git -C $BaselineSrcDir rev-parse --short HEAD 2>$null
+        if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($sha)) { $sha = "unknown" }
+    } finally {
+        $ErrorActionPreference = $previousPreference
+    }
+
+    $baselineProject = Join-Path $BaselineSrcDir "src\Microsoft.Data.SqlClient\tests\PerformanceTests\Microsoft.Data.SqlClient.PerformanceTests.csproj"
+    if (-not (Test-Path $baselineProject)) {
+        throw "Baseline source tree at $BaselineSrcDir has no performance test project ($baselineProject)."
+    }
+
+    # Label recorded in the comparison output so a run states exactly which baseline commit it used.
+    $label = "$Ref@$($sha.Trim())"
+    Write-Host "Baseline source ready: $BaselineSrcDir ($label)"
+
+    return @{ Project = $baselineProject; Label = $label }
+}
+
 # Convert a CPU range like "16-31" (or a comma list "16,17,18") into an affinity bitmask.
 function Get-AffinityMask([string]$cpuSpec) {
     if ([string]::IsNullOrEmpty($cpuSpec)) { return $null }
@@ -408,24 +566,27 @@ print(total)
     return [int]($out.Trim())
 }
 
-# Runs one benchmark pass (build + run pinned to PERF_CLIENT_CPUS) and collects its artifacts into
-# results\<label>. $ExtraArgs are appended to both the build and run invocations.
-function Invoke-PerfPass([string]$Label, [string[]]$ExtraArgs) {
+# Runs one benchmark pass (build + run pinned to PERF_CLIENT_CPUS) from $Project and collects its
+# artifacts into results\<label>. $ExtraArgs are appended to both the build and run invocations.
+# $Project is the candidate's perf project for every pass except a source-baseline pass, which
+# builds the baseline ref's own perf project.
+function Invoke-PerfPass([string]$Label, [string]$Project, [string[]]$ExtraArgs) {
     $runDir = Join-Path $RepoRoot "perf-run-$Label"
     if (Test-Path $runDir) { Remove-Item -Recurse -Force $runDir }
     New-Item -ItemType Directory -Force -Path $runDir | Out-Null
 
     Write-Host "------------------------------------------------------------------"
     Write-Host " Pass: $Label"
+    Write-Host "   Project   : $Project"
     Write-Host "   Extra args: $($ExtraArgs -join ' ')"
     Write-Host "------------------------------------------------------------------"
 
     Write-Host "Building performance tests ($Configuration, $Framework) for '$Label' ..."
-    Invoke-Native { dotnet build $PerfProject -c $Configuration -f $Framework --nologo -v minimal @ExtraArgs } "Build failed for '$Label'"
+    Invoke-Native { dotnet build $Project -c $Configuration -f $Framework --nologo -v minimal @ExtraArgs } "Build failed for '$Label'"
 
     Push-Location $runDir
     try {
-        $runArgs = @("run", "--project", $PerfProject, "-c", $Configuration, "-f", $Framework, "--no-build") + $ExtraArgs
+        $runArgs = @("run", "--project", $Project, "-c", $Configuration, "-f", $Framework, "--no-build") + $ExtraArgs
         Write-Host "Starting benchmarks ($Label): dotnet $($runArgs -join ' ')"
         $psi = New-Object System.Diagnostics.ProcessStartInfo
         $psi.FileName = "dotnet"
@@ -484,17 +645,17 @@ function Invoke-PerfPass([string]$Label, [string[]]$ExtraArgs) {
     }
 }
 
-# Build-Variant <label> <extra build args...>
+# Build-Variant <label> <project> <extra build args...>
 # Builds the PerformanceTests app once into perf-build-<label> so the interleaved orchestrator can
-# invoke it repeatedly without rebuilding.  Distinct output dirs are mandatory (both variants share
-# the project's default bin path).
+# invoke it repeatedly without rebuilding.  Distinct output dirs are mandatory (both variants would
+# otherwise share the project's default bin path).
 function Build-Variant {
-    param([string]$Label, [string[]]$ExtraArgs = @())
+    param([string]$Label, [string]$Project, [string[]]$ExtraArgs = @())
     $outDir = Join-Path $RepoRoot "perf-build-$Label"
     if (Test-Path $outDir) { Remove-Item -Recurse -Force $outDir }
     New-Item -ItemType Directory -Force -Path $outDir | Out-Null
-    Write-Host "Building '$Label' variant ($Configuration, $Framework) into $outDir ..."
-    $buildArgs = @("build", $PerfProject, "-c", $Configuration, "-f", $Framework, "--nologo", "-v", "minimal", "-o", $outDir) + $ExtraArgs
+    Write-Host "Building '$Label' variant ($Configuration, $Framework) from $Project into $outDir ..."
+    $buildArgs = @("build", $Project, "-c", $Configuration, "-f", $Framework, "--nologo", "-v", "minimal", "-o", $outDir) + $ExtraArgs
     # Route the build output to the host/transcript (Out-Host) so it is visible AND does not land on
     # this function's success stream: '$dir = Build-Variant ...' otherwise captures the entire build
     # log into the return value, hiding build errors and corrupting the returned exe-dir path.
@@ -502,19 +663,46 @@ function Build-Variant {
     return $outDir
 }
 
-if ((-not [string]::IsNullOrEmpty($BaselineVersion)) -and ($RunMode -eq "interleaved")) {
-    ####################################################################################################
-    # Interleaved + best-of-N (wiki 339 §2.2/§2.3/§2.6).  Build both variants once, then let the
-    # orchestrator run one unit at a time (baseline then candidate) and confirm any flagged
-    # regression across N passes before it counts toward the gate.
-    ####################################################################################################
+# --- Resolve how the baseline pass is produced ----------------------------------------------------
+# Both baseline flavours end up as "a perf project plus build args"; resolving them once here keeps
+# the interleaved and sequential paths below identical for the package and source baselines.
+$BaselineLabel = ""
+$BaselineProject = $PerfProject
+$BaselineBuildArgs = @()
+
+if (-not [string]::IsNullOrEmpty($BaselineVersion)) {
+    # Released package baseline: candidate's perf project, MDS swapped to a NuGet package reference.
     Write-BaselineNuGetConfig
-    $baselineExeDir = Build-Variant "baseline" @(
+    $BaselineLabel = $BaselineVersion
+    $BaselineBuildArgs = @(
         "-p:ReferenceType=Package",
         "-p:MdsPackageVersion=$BaselineVersion",
         "-p:RestoreConfigFile=$BaselineNuGetConfig"
     )
-    $currentExeDir = Build-Variant "current" @()
+} elseif (-not [string]::IsNullOrEmpty($BaselineSourceRef)) {
+    # Source baseline: build the baseline ref's OWN perf project so the driver under measurement is
+    # that ref's source (ProjectReference), exactly as the candidate pass builds this branch's.
+    $baselineSource = Initialize-BaselineSource -Ref $BaselineSourceRef
+    $BaselineLabel = $baselineSource.Label
+    $BaselineProject = $baselineSource.Project
+}
+
+# Record the resolved baseline label (for a source baseline this is '<ref>@<sha>') in the results
+# tree.  The results directory is copied back to the agent, so a post-test step can read this and
+# tag the build with the exact baseline that was measured - something the pipeline itself cannot do,
+# since the SHA is only known once the ref has been resolved here on the VM.
+if (-not [string]::IsNullOrEmpty($BaselineLabel)) {
+    Set-Content -Path (Join-Path $ResultsDir "baseline-label.txt") -Value $BaselineLabel -Encoding ascii
+}
+
+if ((-not [string]::IsNullOrEmpty($BaselineLabel)) -and ($RunMode -eq "interleaved")) {
+    ####################################################################################################
+    # Interleaved + best-of-N (wiki 339 §2.2/§2.3/§2.6).  Build both variants once, then let the
+    # orchestrator run one unit at a time (baseline then candidate) and confirm any flagged
+    # regression across N passes before it counts toward the gate.
+    ####################################################################################################
+    $baselineExeDir = Build-Variant "baseline" $BaselineProject $BaselineBuildArgs
+    $currentExeDir = Build-Variant "current" $PerfProject @()
 
     $interleaveArgs = @(
         "--baseline-exe-dir", $baselineExeDir,
@@ -523,7 +711,7 @@ if ((-not [string]::IsNullOrEmpty($BaselineVersion)) -and ($RunMode -eq "interle
         "--results-dir", $ResultsDir,
         "--threshold", $RegressionThreshold,
         "--reps", $ConfirmationRuns,
-        "--baseline-version", $BaselineVersion,
+        "--baseline-version", $BaselineLabel,
         "--client-cpus", "$($env:PERF_CLIENT_CPUS)"
     )
     if ($FailOnRegression) {
@@ -533,23 +721,18 @@ if ((-not [string]::IsNullOrEmpty($BaselineVersion)) -and ($RunMode -eq "interle
     Write-Host "Running interleaved benchmarks (best-of-$ConfirmationRuns) ..."
     Invoke-Native { python3 (Join-Path $ScriptDir "interleave_perf.py") @interleaveArgs } "Interleaved run failed"
 
-} elseif (-not [string]::IsNullOrEmpty($BaselineVersion)) {
+} elseif (-not [string]::IsNullOrEmpty($BaselineLabel)) {
     # --- Legacy sequential path: full baseline pass, then full candidate pass, then compare -------
-    Write-BaselineNuGetConfig
-    Invoke-PerfPass "baseline" @(
-        "-p:ReferenceType=Package",
-        "-p:MdsPackageVersion=$BaselineVersion",
-        "-p:RestoreConfigFile=$BaselineNuGetConfig"
-    )
-    Invoke-PerfPass "current" @()
+    Invoke-PerfPass "baseline" $BaselineProject $BaselineBuildArgs
+    Invoke-PerfPass "current" $PerfProject @()
 
-    Write-Host "Comparing current branch against baseline $BaselineVersion ..."
+    Write-Host "Comparing current branch against baseline $BaselineLabel ..."
     $comparisonDir = Join-Path $ResultsDir "comparison"
     New-Item -ItemType Directory -Force -Path $comparisonDir | Out-Null
     $compareArgs = @(
         "--baseline-dir", (Join-Path $ResultsDir "baseline"),
         "--current-dir", (Join-Path $ResultsDir "current"),
-        "--baseline-version", $BaselineVersion,
+        "--baseline-version", $BaselineLabel,
         "--threshold", $RegressionThreshold,
         "--out-md", (Join-Path $comparisonDir "comparison.md"),
         "--out-json", (Join-Path $comparisonDir "comparison.json")
@@ -565,8 +748,8 @@ if ((-not [string]::IsNullOrEmpty($BaselineVersion)) -and ($RunMode -eq "interle
 
 } else {
     # --- No baseline: current-only run (no comparison) --------------------------------------------
-    Write-Host "No -BaselineVersion supplied; running current only (no comparison)."
-    Invoke-PerfPass "current" @()
+    Write-Host "Neither -BaselineVersion nor -BaselineSourceRef supplied; running current only (no comparison)."
+    Invoke-PerfPass "current" $PerfProject @()
 }
 
 Write-Host "Collected results:"
diff --git a/eng/pipelines/perf/scripts/run-perf-tests.sh b/eng/pipelines/perf/scripts/run-perf-tests.sh
index 1fa0423f4e..4df2eec8e3 100755
--- a/eng/pipelines/perf/scripts/run-perf-tests.sh
+++ b/eng/pipelines/perf/scripts/run-perf-tests.sh
@@ -36,6 +36,14 @@ configuration="Release"
 framework="net9.0"
 resultsSubDir="perf-results"
 baselineVersion=""
+# Alternative to --baseline-version: benchmark against Microsoft.Data.SqlClient built from ANOTHER
+# git ref of this repository (e.g. 'main') instead of a released NuGet package.  Used by the PR perf
+# pipeline, which compares the branch under test against the source it would merge into.  The two
+# baseline selectors are mutually exclusive.
+baselineSourceRef=""
+# Remote used to obtain the baseline ref when it cannot be fetched from the copied checkout's own
+# 'origin' (e.g. the source tree reached the VM without its .git directory, or origin needs auth).
+baselineRepoUrl="https://github.com/dotnet/SqlClient.git"
 regressionThreshold="10"
 # When true, a candidate-slower-than-baseline regression fails the run (wiki 339 §3 gate).
 # Default off so the pipeline reports deltas without blocking until the gate is trusted.
@@ -57,7 +65,8 @@ useConnectionPoolV2=""
 
 usage() {
     echo "Usage: $0 [--configuration <cfg>] [--framework <tfm>] [--results-subdir <dir>]" \
-         "[--baseline-version <ver>] [--regression-threshold <pct>] [--fail-on-regression]" \
+         "[--baseline-version <ver> | --baseline-source-ref <ref> [--baseline-repo-url <url>]]" \
+         "[--regression-threshold <pct>] [--fail-on-regression]" \
          "[--run-mode interleaved|sequential] [--confirmation-runs <N>]" \
          "[--use-managed-sni-on-windows true|false] [--use-optimized-async-behaviour true|false]" \
          "[--use-connection-pool-v2 true|false]" >&2
@@ -69,6 +78,8 @@ while [[ $# -gt 0 ]]; do
         --framework)     framework="$2";     shift 2 ;;
         --results-subdir) resultsSubDir="$2"; shift 2 ;;
         --baseline-version) baselineVersion="$2"; shift 2 ;;
+        --baseline-source-ref) baselineSourceRef="$2"; shift 2 ;;
+        --baseline-repo-url) baselineRepoUrl="$2"; shift 2 ;;
         --regression-threshold) regressionThreshold="$2"; shift 2 ;;
         --fail-on-regression) failOnRegression="true"; shift 1 ;;
         --run-mode) runMode="$2"; shift 2 ;;
@@ -89,6 +100,12 @@ case "${runMode}" in
     *) echo "ERROR: --run-mode must be 'interleaved' or 'sequential' (got '${runMode}')." >&2
        usage; exit 2 ;;
 esac
+# The two baseline selectors describe different builds of the same "baseline" pass, so requesting
+# both is always a mistake; fail fast rather than silently honouring one of them.
+if [[ -n "${baselineVersion}" && -n "${baselineSourceRef}" ]]; then
+    echo "ERROR: --baseline-version and --baseline-source-ref are mutually exclusive." >&2
+    usage; exit 2
+fi
 if ! [[ "${confirmationRuns}" =~ ^[0-9]+$ ]] || [[ "${confirmationRuns}" -lt 1 ]]; then
     echo "ERROR: --confirmation-runs must be a positive integer (got '${confirmationRuns}')." >&2
     usage; exit 2
@@ -127,6 +144,7 @@ echo "  Configuration  : ${configuration}"
 echo "  Framework      : ${framework}"
 echo "  Results dir    : ${RESULTS_DIR}"
 echo "  Baseline ver   : ${baselineVersion:-<none, current-only>}"
+echo "  Baseline ref   : ${baselineSourceRef:-<none>}"
 echo "  Run mode       : ${runMode} (confirmation runs: ${confirmationRuns})"
 echo "  SQL_SERVER     : ${SQL_SERVER:-<unset, will default to localhost>}"
 echo "  PERF_CLIENT_CPUS: ${PERF_CLIENT_CPUS:-<unset>}"
@@ -385,10 +403,11 @@ PY
 ####################################################################################################
 # 4 & 5. Run the benchmarks, pinned to the reserved client CPU set.
 #
-# Two passes are executed so the pipeline can compare the branch under test against a released
-# baseline:
-#   * baseline  -> Microsoft.Data.SqlClient restored from NuGet.org at ${baselineVersion}
-#                  (ReferenceType=Package + CPM VersionOverride).  Skipped when no baseline is given.
+# Two passes are executed so the pipeline can compare the branch under test against a baseline:
+#   * baseline  -> either Microsoft.Data.SqlClient restored from NuGet.org at ${baselineVersion}
+#                  (ReferenceType=Package + CPM VersionOverride), or - when ${baselineSourceRef} is
+#                  given instead - the driver built from another git ref of this repository (e.g.
+#                  'main', used by the PR perf pipeline).  Skipped when neither is given.
 #   * current   -> Microsoft.Data.SqlClient built from the source tree in this repo (ProjectReference).
 #
 # BenchmarkDotNet writes its artifacts to ./BenchmarkDotNet.Artifacts relative to the working
@@ -412,6 +431,123 @@ write_baseline_nuget_config() {
 XML
 }
 
+# --- Source baseline (--baseline-source-ref) ------------------------------------------------------
+# Materialises another git ref of THIS repository (e.g. 'main') next to the checkout so the baseline
+# pass can build the driver from that source instead of restoring a released package.  The tree is
+# placed OUTSIDE the checkout so it is never picked up by the candidate build, by the results copy,
+# or by a repo-root glob.
+BASELINE_SRC_DIR="$(dirname -- "${REPO_ROOT}")/sqlclient-perf-baseline-src"
+BASELINE_SRC_LABEL=""
+
+# prepare_baseline_source <ref>
+# Prefers the copied checkout's own 'origin' (no extra network round-trip, and it resolves the ref
+# exactly as the pipeline's repository does); falls back to a shallow clone of --baseline-repo-url
+# when the source tree arrived without .git, or when origin is unreachable/needs credentials.
+#
+# The checkout is copied to the VM WITHOUT credentials (ADO's checkout task defaults to
+# persistCredentials:false), so a fetch from an authenticated origin has no way to succeed.  Every
+# git command that may touch the network is therefore run through git_net(), which guarantees it
+# fails fast and loudly instead of blocking the job on a credential prompt.
+GIT_NET_TIMEOUT_SECS="${GIT_NET_TIMEOUT_SECS:-300}"
+
+# git_net <log-name> <git args...>
+# Runs a network-facing git command non-interactively, under a hard timeout, capturing all output to
+# ${DIAG_DIR}/git-<log-name>.log.  Returns git's exit status (124 if the timeout fired).
+#
+#   * GIT_TERMINAL_PROMPT=0 turns "needs credentials" into an immediate error rather than a
+#     'Username for ...' prompt that waits forever with nothing on the console.
+#   * '-c credential.helper=' clears any configured helper (e.g. Git Credential Manager), which
+#     would otherwise try to prompt through its own UI/stdin and hang in the same way.
+#   * </dev/null stops git from consuming this script's stdin if it prompts anyway.
+#   * timeout is a last-resort backstop for any OTHER network stall (DNS, proxy blackhole, ...) so a
+#     single git call can never again burn the entire job.
+git_net() {
+    local logName="$1"; shift
+    local log="${DIAG_DIR}/git-${logName}.log"
+    local -a cmd=(git -c credential.helper= "$@")
+
+    if command -v timeout >/dev/null 2>&1; then
+        cmd=(timeout --signal=TERM --kill-after=30 "${GIT_NET_TIMEOUT_SECS}" "${cmd[@]}")
+    fi
+
+    GIT_TERMINAL_PROMPT=0 "${cmd[@]}" </dev/null >"${log}" 2>&1
+}
+
+# Echo the tail of a git_net log so a failure is explained in the build log instead of vanishing.
+report_git_failure() {
+    local logName="$1" status="$2"
+    local log="${DIAG_DIR}/git-${logName}.log"
+    if [[ "${status}" -eq 124 ]]; then
+        echo "  (git ${logName} timed out after ${GIT_NET_TIMEOUT_SECS}s)" >&2
+    else
+        echo "  (git ${logName} exited ${status})" >&2
+    fi
+    [[ -s "${log}" ]] && sed 's/^/  | /' "${log}" >&2
+    return 0
+}
+
+prepare_baseline_source() {
+    local ref="$1"
+
+    if ! command -v git >/dev/null 2>&1; then
+        echo "ERROR: git is required for --baseline-source-ref but was not found on the VM." >&2
+        exit 1
+    fi
+
+    rm -rf "${BASELINE_SRC_DIR}"
+
+    local acquired="false"
+    local status=0
+    # '.git' is a directory in a normal clone but a FILE in a git worktree, so test for existence
+    # rather than for a directory.
+    if [[ -e "${REPO_ROOT}/.git" ]]; then
+        echo "Fetching baseline ref '${ref}' from the checkout's origin ..."
+        # Fetch into a private remote-tracking namespace so an existing local branch of the same name
+        # (the checkout may itself be on 'main') is never used in place of the fetched ref.
+        if git_net fetch -C "${REPO_ROOT}" fetch --no-tags --depth 1 origin \
+                "+refs/heads/${ref}:refs/remotes/perfbaseline/${ref}"; then
+            git -C "${REPO_ROOT}" worktree prune >/dev/null 2>&1 || true
+            if git -C "${REPO_ROOT}" worktree add --detach "${BASELINE_SRC_DIR}" \
+                    "refs/remotes/perfbaseline/${ref}" >"${DIAG_DIR}/git-worktree.log" 2>&1; then
+                acquired="true"
+            else
+                report_git_failure worktree "$?"
+            fi
+        else
+            report_git_failure fetch "$?"
+        fi
+        [[ "${acquired}" == "true" ]] \
+            || echo "WARNING: could not materialise '${ref}' from the checkout's origin; falling back to ${baselineRepoUrl}." >&2
+    fi
+
+    if [[ "${acquired}" != "true" ]]; then
+        echo "Cloning baseline ref '${ref}' from ${baselineRepoUrl} ..."
+        rm -rf "${BASELINE_SRC_DIR}"
+        # NOTE: '|| status=$?' rather than 'if ! git_net ...' - the '!' would reset $? to 0 and the
+        # reported exit code would always be a misleading 0.
+        status=0
+        git_net clone clone --quiet --depth 1 --branch "${ref}" \
+            "${baselineRepoUrl}" "${BASELINE_SRC_DIR}" || status=$?
+        if [[ "${status}" -ne 0 ]]; then
+            report_git_failure clone "${status}"
+            echo "ERROR: could not obtain baseline ref '${ref}' from either the checkout's origin or ${baselineRepoUrl}." >&2
+            exit 1
+        fi
+    fi
+
+    BASELINE_PERF_PROJECT="${BASELINE_SRC_DIR}/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj"
+    if [[ ! -f "${BASELINE_PERF_PROJECT}" ]]; then
+        echo "ERROR: baseline source tree at ${BASELINE_SRC_DIR} has no performance test project (${BASELINE_PERF_PROJECT})." >&2
+        exit 1
+    fi
+
+    local sha
+    sha="$(git -C "${BASELINE_SRC_DIR}" rev-parse --short HEAD 2>/dev/null || echo unknown)"
+    # Label recorded in the comparison output so a run states exactly which baseline commit it used.
+    BASELINE_SRC_LABEL="${ref}@${sha}"
+    echo "Baseline source ready: ${BASELINE_SRC_DIR} (${BASELINE_SRC_LABEL})"
+}
+
 # capture_cpu_telemetry <label> <before|after>
 # §2.11 telemetry snapshot: per-core frequency and thermal state around each measured pass, so a
 # drifting/throttling result can be explained after the fact.  Best-effort; never fails the run.
@@ -444,11 +580,13 @@ print(total)
 PY
 }
 
-# run_pass <label> <extra dotnet build/run args...>
-# Builds and runs one benchmark pass, pinned to PERF_CLIENT_CPUS, collecting artifacts into
-# ${RESULTS_DIR}/<label>.
+# run_pass <label> <project> <extra dotnet build/run args...>
+# Builds and runs one benchmark pass from <project>, pinned to PERF_CLIENT_CPUS, collecting artifacts
+# into ${RESULTS_DIR}/<label>.  <project> is the candidate's perf project for every pass except a
+# source-baseline pass, which builds the baseline ref's own perf project.
 run_pass() {
     local label="$1"; shift
+    local project="$1"; shift
     local extra_args=("$@")
 
     local run_dir="${REPO_ROOT}/perf-run-${label}"
@@ -457,14 +595,15 @@ run_pass() {
 
     echo "------------------------------------------------------------------"
     echo " Pass: ${label}"
+    echo "   Project   : ${project}"
     echo "   Extra args: ${extra_args[*]:-<none>}"
     echo "------------------------------------------------------------------"
 
     echo "Building performance tests (${configuration}, ${framework}) for '${label}' ..."
-    dotnet build "${PERF_PROJECT}" -c "${configuration}" -f "${framework}" --nologo -v minimal \
+    dotnet build "${project}" -c "${configuration}" -f "${framework}" --nologo -v minimal \
         "${extra_args[@]}"
 
-    local run_cmd=(dotnet run --project "${PERF_PROJECT}" -c "${configuration}" -f "${framework}" \
+    local run_cmd=(dotnet run --project "${project}" -c "${configuration}" -f "${framework}" \
         --no-build "${extra_args[@]}")
 
     if [[ -n "${PERF_CLIENT_CPUS:-}" ]] && command -v taskset >/dev/null 2>&1; then
@@ -506,33 +645,62 @@ run_pass() {
     fi
 }
 
-# build_variant <label> <extra dotnet build args...>
+# build_variant <label> <project> <extra dotnet build args...>
 # Builds the PerformanceTests app once into its own output directory (perf-build-<label>) so the
 # interleaved orchestrator can invoke it repeatedly without rebuilding.  The two variants (baseline
-# package vs candidate source) must go to distinct dirs because they share the project's bin path.
+# package or baseline source vs candidate source) must go to distinct dirs because they would
+# otherwise share the project's bin path.
 build_variant() {
     local label="$1"; shift
+    local project="$1"; shift
     local out_dir="${REPO_ROOT}/perf-build-${label}"
     rm -rf "${out_dir}"
     mkdir -p "${out_dir}"
-    echo "Building '${label}' variant (${configuration}, ${framework}) into ${out_dir} ..."
-    dotnet build "${PERF_PROJECT}" -c "${configuration}" -f "${framework}" --nologo -v minimal \
+    echo "Building '${label}' variant (${configuration}, ${framework}) from ${project} into ${out_dir} ..."
+    dotnet build "${project}" -c "${configuration}" -f "${framework}" --nologo -v minimal \
         -o "${out_dir}" "$@"
 }
 
-# --- Baseline pass (released NuGet package) -------------------------------------------------------
-if [[ -n "${baselineVersion}" && "${runMode}" == "interleaved" ]]; then
+# --- Resolve how the baseline pass is produced ----------------------------------------------------
+# Both baseline flavours end up as "a perf project plus build args"; resolving them once here keeps
+# the interleaved and sequential paths below identical for the package and source baselines.
+baselineLabel=""
+baselineProject="${PERF_PROJECT}"
+baselineBuildArgs=()
+
+if [[ -n "${baselineVersion}" ]]; then
+    # Released package baseline: candidate's perf project, MDS swapped to a NuGet package reference.
+    write_baseline_nuget_config
+    baselineLabel="${baselineVersion}"
+    baselineBuildArgs=(
+        -p:ReferenceType=Package
+        -p:MdsPackageVersion="${baselineVersion}"
+        -p:RestoreConfigFile="${BASELINE_NUGET_CONFIG}"
+    )
+elif [[ -n "${baselineSourceRef}" ]]; then
+    # Source baseline: build the baseline ref's OWN perf project so the driver under measurement is
+    # that ref's source (ProjectReference), exactly as the candidate pass builds this branch's.
+    prepare_baseline_source "${baselineSourceRef}"
+    baselineLabel="${BASELINE_SRC_LABEL}"
+    baselineProject="${BASELINE_PERF_PROJECT}"
+fi
+
+# Record the resolved baseline label (for a source baseline this is '<ref>@<sha>') in the results
+# tree.  The results directory is copied back to the agent, so a post-test step can read this and
+# tag the build with the exact baseline that was measured - something the pipeline itself cannot do,
+# since the SHA is only known once the ref has been resolved here on the VM.
+if [[ -n "${baselineLabel}" ]]; then
+    printf '%s\n' "${baselineLabel}" > "${RESULTS_DIR}/baseline-label.txt"
+fi
+
+if [[ -n "${baselineLabel}" && "${runMode}" == "interleaved" ]]; then
     ################################################################################################
     # Interleaved + best-of-N (wiki 339 §2.2/§2.3/§2.6).  Build both variants once, then let the
     # orchestrator run one unit at a time (baseline then candidate) and confirm any flagged
     # regression across N passes before it counts toward the gate.
     ################################################################################################
-    write_baseline_nuget_config
-    build_variant "baseline" \
-        -p:ReferenceType=Package \
-        -p:MdsPackageVersion="${baselineVersion}" \
-        -p:RestoreConfigFile="${BASELINE_NUGET_CONFIG}"
-    build_variant "current"
+    build_variant "baseline" "${baselineProject}" ${baselineBuildArgs[@]+"${baselineBuildArgs[@]}"}
+    build_variant "current" "${PERF_PROJECT}"
 
     interleave_args=(
         --baseline-exe-dir "${REPO_ROOT}/perf-build-baseline"
@@ -541,7 +709,7 @@ if [[ -n "${baselineVersion}" && "${runMode}" == "interleaved" ]]; then
         --results-dir "${RESULTS_DIR}"
         --threshold "${regressionThreshold}"
         --reps "${confirmationRuns}"
-        --baseline-version "${baselineVersion}"
+        --baseline-version "${baselineLabel}"
         --client-cpus "${PERF_CLIENT_CPUS:-}"
     )
     if [[ "${failOnRegression}" == "true" ]]; then
@@ -551,21 +719,17 @@ if [[ -n "${baselineVersion}" && "${runMode}" == "interleaved" ]]; then
     echo "Running interleaved benchmarks (best-of-${confirmationRuns}) ..."
     python3 "${SCRIPT_DIR}/interleave_perf.py" "${interleave_args[@]}"
 
-elif [[ -n "${baselineVersion}" ]]; then
+elif [[ -n "${baselineLabel}" ]]; then
     # --- Legacy sequential path: full baseline pass, then full candidate pass, then compare -------
-    write_baseline_nuget_config
-    run_pass "baseline" \
-        -p:ReferenceType=Package \
-        -p:MdsPackageVersion="${baselineVersion}" \
-        -p:RestoreConfigFile="${BASELINE_NUGET_CONFIG}"
-    run_pass "current"
+    run_pass "baseline" "${baselineProject}" ${baselineBuildArgs[@]+"${baselineBuildArgs[@]}"}
+    run_pass "current" "${PERF_PROJECT}"
 
-    echo "Comparing current branch against baseline ${baselineVersion} ..."
+    echo "Comparing current branch against baseline ${baselineLabel} ..."
     mkdir -p "${RESULTS_DIR}/comparison"
     compare_args=(
         --baseline-dir "${RESULTS_DIR}/baseline"
         --current-dir "${RESULTS_DIR}/current"
-        --baseline-version "${baselineVersion}"
+        --baseline-version "${baselineLabel}"
         --threshold "${regressionThreshold}"
         --out-md "${RESULTS_DIR}/comparison/comparison.md"
         --out-json "${RESULTS_DIR}/comparison/comparison.json"
@@ -581,8 +745,8 @@ elif [[ -n "${baselineVersion}" ]]; then
 
 else
     # --- No baseline: current-only run (no comparison) --------------------------------------------
-    echo "No --baseline-version supplied; running current only (no comparison)."
-    run_pass "current"
+    echo "Neither --baseline-version nor --baseline-source-ref supplied; running current only (no comparison)."
+    run_pass "current" "${PERF_PROJECT}"
 fi
 
 echo "Collected results:"
diff --git a/eng/pipelines/perf/sqlclient-perf-pr-pipeline.yml b/eng/pipelines/perf/sqlclient-perf-pr-pipeline.yml
new file mode 100644
index 0000000000..c155c1acc3
--- /dev/null
+++ b/eng/pipelines/perf/sqlclient-perf-pr-pipeline.yml
@@ -0,0 +1,259 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# SqlClient PR Performance Test pipeline.
+#
+# Sibling of sqlclient-perf-pipeline.yml: it runs the SAME benchmarks, on the SAME Perf Test Lab
+# extends template (v1/Perf.Test.Job.yml@PerfTemplates), with the SAME configuration options.  The
+# only differences are what it compares against and what it does with the results:
+#
+#   * Baseline    - the branch the run is queued on ("current") is compared against the SOURCE of
+#                   another ref of this repository (by default 'main'), NOT a released NuGet package.
+#                   Both sides are therefore built from source, which is what a PR author wants to
+#                   know: "does my change regress the branch I am merging into?"
+#   * No Kusto    - results are never ingested into the perf database (a PR run measures an unmerged
+#                   branch, so its numbers must not pollute the historical trend).  The comparison
+#                   and the raw BenchmarkDotNet artifacts are still published as pipeline artifacts.
+#
+# Everything else - platform/VM provisioning, benchmark run model, noise controls, regression gate -
+# is identical to the nightly/manual perf pipeline; see eng/pipelines/perf/README.md.
+
+# Set the pipeline run name to the day-of-year and the daily run counter.
+name: $(DayOfYear)$(Rev:rr)
+
+# Manual/queue-time only.  A full perf run occupies a dedicated host for hours, so it is opted into
+# per PR rather than triggered automatically on every push or pull request.
+pr: none
+trigger: none
+
+parameters:
+
+  # Target OS for the perf VM and the benchmark client.
+  - name: platform
+    displayName: Platform
+    type: string
+    default: linux
+    values:
+      - linux
+      - windows
+
+  # The .NET runtime the benchmarks are executed against.  Must be one of the target frameworks of
+  # the PerformanceTests project (net8.0/net9.0/net10.0).
+  - name: dotnetFramework
+    displayName: .NET Framework (TFM)
+    type: string
+    default: net9.0
+    values:
+      - net8.0
+      - net9.0
+      - net10.0
+
+  # Maximum time (minutes) the template waits for the benchmark run on the VM before timing out.
+  # Slightly higher than the nightly pipeline's default because the baseline side is BUILT FROM
+  # SOURCE here (two full driver builds) instead of restored as a package.
+  - name: testTimeoutMinutes
+    displayName: Test Timeout (minutes)
+    type: number
+    default: 210
+
+  # The git ref of THIS repository whose source is used as the baseline.  Defaults to the branch a
+  # PR normally targets; override at queue time to compare against a release branch instead.  Set to
+  # an empty string to skip the baseline pass and run current-only.
+  - name: baselineSourceRef
+    displayName: Baseline Source Ref (branch)
+    type: string
+    default: main
+
+  # Remote used to obtain the baseline ref when it cannot be fetched from the VM copy of the
+  # checkout's own 'origin' (e.g. the source tree reached the VM without its .git directory, or
+  # origin requires credentials the VM does not have).
+  - name: baselineRepoUrl
+    displayName: Baseline Repository URL (fallback)
+    type: string
+    default: https://github.com/dotnet/SqlClient.git
+
+  # Percent slowdown (current vs baseline mean) that the comparison flags as a regression.
+  - name: regressionThreshold
+    displayName: Regression Threshold (%)
+    type: number
+    default: 10
+
+  # When true, a candidate-slower-than-baseline regression FAILS the run (wiki 339 §3 gate).
+  # Default false: the run still reports deltas but does not block, until the gate is trusted
+  # (best paired with the best-of-N confirmation described in eng/pipelines/perf/README.md).
+  - name: failOnRegression
+    displayName: Fail run on regression
+    type: boolean
+    default: false
+
+  # Benchmark run model (wiki 339 §2.2/§2.3/§2.6):
+  #   interleaved -> run one benchmark unit at a time, baseline and candidate back-to-back, and
+  #                  confirm any flagged regression across N passes (best-of-N).  Noise-resistant
+  #                  default; required before trusting the failOnRegression gate.
+  #   sequential  -> legacy: run the whole baseline suite, then the whole candidate suite, compare.
+  - name: benchmarkRunMode
+    displayName: Benchmark run mode
+    type: string
+    default: interleaved
+    values:
+      - interleaved
+      - sequential
+
+  # Best-of-N: total interleaved passes for a flagged unit before a regression is confirmed
+  # (1 disables confirmation).  Only used when benchmarkRunMode = interleaved.
+  - name: confirmationRuns
+    displayName: Confirmation runs (best-of-N)
+    type: number
+    default: 3
+
+  # Optional SqlClient behaviour flags. These are applied to the benchmark runner config used by
+  # BOTH the baseline and candidate passes on the VM.  Defaults match the checked-in
+  # runnerconfig.jsonc, so leaving them untouched preserves the default behaviour.
+  - name: useManagedSniOnWindows
+    displayName: UseManagedSniOnWindows
+    type: boolean
+    default: false
+
+  - name: useOptimizedAsyncBehaviour
+    displayName: UseOptimizedAsyncBehaviour
+    type: boolean
+    default: true
+
+  - name: useConnectionPoolV2
+    displayName: UseConnectionPoolV2
+    type: boolean
+    default: false
+
+# Fixed (non-configurable) constants for this pipeline.  These are intentionally NOT parameters or
+# library variables: they are invariant for the SqlClient perf pipelines.
+#   * buildConfiguration = Release            - perf numbers are only meaningful in Release.
+#   * sourcesSubDir       = dotnet-sqlclient  - folder 'self' checks out into under the template's
+#                                               MULTI-REPO checkout ($(Build.SourcesDirectory)/<repo>);
+#                                               must match the ADO repository name.
+#
+# NOTE: unlike sqlclient-perf-pipeline.yml, this pipeline does NOT reference the 'ADX Cluster
+# Variables' group and has no translate/ingest steps: PR results are never written to Kusto.
+variables:
+
+  # Pre-computed testScriptArgs chunks.  The Windows entry point is PowerShell and binds
+  # '-PascalCase' params, while the Linux one is bash and parses '--kebab-case' flags, so the
+  # argument STYLE differs by platform.  Assembling the final args from these per-platform chunks
+  # keeps the single testScriptArgs below readable instead of duplicating a full arg string across
+  # the whole platform x baseline x fail-gate matrix.  Config flags are always passed (their
+  # defaults match runnerconfig.jsonc), so they live in the common chunk.
+  - ${{ if eq(parameters.platform, 'windows') }}:
+    - name: PerfArgsCommon
+      value: '-Configuration Release -Framework ${{ parameters.dotnetFramework }} -ResultsSubdir perf-results -RegressionThreshold ${{ parameters.regressionThreshold }} -RunMode ${{ parameters.benchmarkRunMode }} -ConfirmationRuns ${{ parameters.confirmationRuns }} -UseManagedSniOnWindows ${{ lower(parameters.useManagedSniOnWindows) }} -UseOptimizedAsyncBehaviour ${{ lower(parameters.useOptimizedAsyncBehaviour) }} -UseConnectionPoolV2 ${{ lower(parameters.useConnectionPoolV2) }}'
+  - ${{ else }}:
+    - name: PerfArgsCommon
+      value: '--configuration Release --framework ${{ parameters.dotnetFramework }} --results-subdir perf-results --regression-threshold ${{ parameters.regressionThreshold }} --run-mode ${{ parameters.benchmarkRunMode }} --confirmation-runs ${{ parameters.confirmationRuns }} --use-managed-sni-on-windows ${{ lower(parameters.useManagedSniOnWindows) }} --use-optimized-async-behaviour ${{ lower(parameters.useOptimizedAsyncBehaviour) }} --use-connection-pool-v2 ${{ lower(parameters.useConnectionPoolV2) }}'
+
+  # Source-baseline flags, omitted entirely when no baseline is requested: on bash an empty value
+  # would let arg parsing consume the following flag as the baseline ref and corrupt every
+  # subsequent argument, so both platforms omit them symmetrically.
+  - ${{ if and(eq(parameters.platform, 'windows'), ne(parameters.baselineSourceRef, '')) }}:
+    - name: PerfArgsBaseline
+      value: '-BaselineSourceRef ${{ parameters.baselineSourceRef }} -BaselineRepoUrl ${{ parameters.baselineRepoUrl }}'
+  - ${{ elseif ne(parameters.baselineSourceRef, '') }}:
+    - name: PerfArgsBaseline
+      value: '--baseline-source-ref ${{ parameters.baselineSourceRef }} --baseline-repo-url ${{ parameters.baselineRepoUrl }}'
+  - ${{ else }}:
+    - name: PerfArgsBaseline
+      value: ''
+
+  # Regression gate, only when failOnRegression is requested.
+  - ${{ if and(eq(parameters.platform, 'windows'), eq(parameters.failOnRegression, true)) }}:
+    - name: PerfArgsFail
+      value: '-FailOnRegression'
+  - ${{ elseif eq(parameters.failOnRegression, true) }}:
+    - name: PerfArgsFail
+      value: '--fail-on-regression'
+  - ${{ else }}:
+    - name: PerfArgsFail
+      value: ''
+
+# Reference the PerfTest repository that hosts the reusable extends template.  Driver-team projects
+# have been onboarded with the Agent Pools and Service Connections required to consume it.
+resources:
+  repositories:
+    - repository: PerfTemplates
+      type: git
+      name: InternalDriverTools/PerfTest
+      ref: refs/heads/main
+
+# Consume the Perf Test Lab template.  The template defines the whole job/stage structure; we only
+# pass parameters into it.
+extends:
+  template: v1/Perf.Test.Job.yml@PerfTemplates
+  parameters:
+    platform: ${{ parameters.platform }}
+
+    # The entire driver source tree is copied to the VM so the benchmarks (which reference
+    # Microsoft.Data.SqlClient as a project) can be built from source against the current commit.
+    # Under the template's multi-repo checkout, 'self' lands in a repo-named subfolder.
+    testRootDir: $(Build.SourcesDirectory)/dotnet-sqlclient
+
+    # Entry-point script (relative to testRootDir), selected by platform.  Linux uses bash, Windows
+    # uses PowerShell, per the template's .sh/.ps1 convention.  Same scripts as the nightly perf
+    # pipeline: the source baseline is just a different baseline selector.
+    ${{ if eq(parameters.platform, 'windows') }}:
+      testScript: eng/pipelines/perf/scripts/run-perf-tests.ps1
+    ${{ else }}:
+      testScript: eng/pipelines/perf/scripts/run-perf-tests.sh
+
+    # Arguments forwarded to the script.  The script also reads SQL_SERVER, SQL_PASSWORD and
+    # PERF_CLIENT_CPUS directly from the VM session environment (injected by the template).  The
+    # per-platform / baseline / fail-gate argument chunks are pre-computed in the 'variables' block
+    # above (PerfArgsCommon / PerfArgsBaseline / PerfArgsFail); assemble them here.  Empty chunks
+    # collapse to harmless extra spaces that both PowerShell and bash arg parsing ignore.
+    testScriptArgs: '$(PerfArgsCommon) $(PerfArgsBaseline) $(PerfArgsFail)'
+
+    # Subfolder (relative to testRootDir on the VM) the script writes results into.  The template
+    # copies this VM folder back to the agent, but always lands it at a fixed location:
+    # $(Build.ArtifactStagingDirectory)/results (and publishes it as the 'perf-results' artifact).
+    testResultsSubDir: perf-results
+
+    testTimeoutMinutes: ${{ parameters.testTimeoutMinutes }}
+    jobName: SqlClientPerfPR
+
+    # Post-test steps run on the agent after results have been copied back.  The template already
+    # publishes the results artifact and attaches any top-level results/*.md as run summaries; this
+    # step additionally surfaces the BenchmarkDotNet markdown reports in the build log.  There is no
+    # Kusto translation/ingestion here by design.
+    steps:
+      # Tag the build with the baseline that was actually measured.  The label is produced on the VM
+      # by the run script (as '<ref>@<sha>') and copied back with the results, because the resolved
+      # commit is not knowable at compile time - the pipeline only has the ref name, which would tag
+      # every run identically.
+      # NOTE: the tag intentionally has no ':' - build tags are placed in the request URL path and a
+      # colon trips ADO's "potentially dangerous Request.Path" filter.
+      - ${{ if ne(parameters.baselineSourceRef, '') }}:
+        - bash: |
+            set -euo pipefail
+            labelFile="$RESULTS_DIR/baseline-label.txt"
+            if [ -f "$labelFile" ]; then
+                label="$(tr -d '\r\n' < "$labelFile")"
+            else
+                # The run script never got as far as resolving the baseline (e.g. the build failed
+                # before the baseline pass); fall back to the requested ref so the run is still
+                # identifiable.
+                echo "##vso[task.logissue type=warning]No baseline-label.txt in results; tagging with the requested ref only."
+                label="${BASELINE_REF}"
+            fi
+            echo "##vso[build.addbuildtag]Baseline ${label}"
+          displayName: 'Tag build with baseline commit'
+          condition: succeededOrFailed()
+          env:
+            RESULTS_DIR: $(Build.ArtifactStagingDirectory)/results
+            BASELINE_REF: ${{ parameters.baselineSourceRef }}
+
+      - task: Bash@3
+        displayName: 'Show performance results'
+        condition: succeededOrFailed()
+        inputs:
+          targetType: filePath
+          filePath: $(Build.SourcesDirectory)/dotnet-sqlclient/eng/pipelines/perf/scripts/show_perf_results.sh
+        env:
+          RESULTS_DIR: $(Build.ArtifactStagingDirectory)/results

From bd36b43870b8e3eab474ba869dbb7fbb40e0b316 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Fri, 14 Aug 2026 18:13:11 -0500
Subject: [PATCH 230/298] :robot: `async void` to `Task` (#4524)

---
 .../DataTypeReaderAsyncRunner.cs              | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderAsyncRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderAsyncRunner.cs
index 84e9046cda..b74a277258 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderAsyncRunner.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderAsyncRunner.cs
@@ -53,78 +53,78 @@ private static async Task RunBenchmarkAsync(DataType type)
         }
 
         [Benchmark]
-        public static async void BitAsync() => await RunBenchmarkAsync(s_datatypes.Numerics[n_bit]);
+        public static Task BitAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_bit]);
 
         [Benchmark]
-        public static async void IntAsync() => await RunBenchmarkAsync(s_datatypes.Numerics[n_int]);
+        public static Task IntAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_int]);
 
         [Benchmark]
-        public static async void TinyIntAsync() => await RunBenchmarkAsync(s_datatypes.Numerics[n_tinyint]);
+        public static Task TinyIntAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_tinyint]);
 
         [Benchmark]
-        public static async void SmallIntAsync() => await RunBenchmarkAsync(s_datatypes.Numerics[n_smallint]);
+        public static Task SmallIntAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_smallint]);
 
         [Benchmark]
-        public static async void BigIntAsync() => await RunBenchmarkAsync(s_datatypes.Numerics[n_bigint]);
+        public static Task BigIntAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_bigint]);
 
         [Benchmark]
-        public static async void MoneyAsync() => await RunBenchmarkAsync(s_datatypes.Numerics[n_money]);
+        public static Task MoneyAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_money]);
 
         [Benchmark]
-        public static async void SmallMoneyAsync() => await RunBenchmarkAsync(s_datatypes.Numerics[n_smallmoney]);
+        public static Task SmallMoneyAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_smallmoney]);
 
         [Benchmark]
-        public static async void DecimalAsync() => await RunBenchmarkAsync(s_datatypes.Decimals[d_decimal]);
+        public static Task DecimalAsync() => RunBenchmarkAsync(s_datatypes.Decimals[d_decimal]);
 
         [Benchmark]
-        public static async void NumericAsync() => await RunBenchmarkAsync(s_datatypes.Decimals[d_numeric]);
+        public static Task NumericAsync() => RunBenchmarkAsync(s_datatypes.Decimals[d_numeric]);
 
         [Benchmark]
-        public static async void FloatAsync() => await RunBenchmarkAsync(s_datatypes.Decimals[d_float]);
+        public static Task FloatAsync() => RunBenchmarkAsync(s_datatypes.Decimals[d_float]);
 
         [Benchmark]
-        public static async void RealAsync() => await RunBenchmarkAsync(s_datatypes.Decimals[d_real]);
+        public static Task RealAsync() => RunBenchmarkAsync(s_datatypes.Decimals[d_real]);
 
         [Benchmark]
-        public static async void DateAsync() => await RunBenchmarkAsync(s_datatypes.DateTimes[t_date]);
+        public static Task DateAsync() => RunBenchmarkAsync(s_datatypes.DateTimes[t_date]);
 
         [Benchmark]
-        public static async void DatetimeAsync() => await RunBenchmarkAsync(s_datatypes.DateTimes[t_datetime]);
+        public static Task DatetimeAsync() => RunBenchmarkAsync(s_datatypes.DateTimes[t_datetime]);
 
         [Benchmark]
-        public static async void Datetime2Async() => await RunBenchmarkAsync(s_datatypes.DateTimes[t_datetime2]);
+        public static Task Datetime2Async() => RunBenchmarkAsync(s_datatypes.DateTimes[t_datetime2]);
 
         [Benchmark]
-        public static async void TimeAsync() => await RunBenchmarkAsync(s_datatypes.DateTimes[t_time]);
+        public static Task TimeAsync() => RunBenchmarkAsync(s_datatypes.DateTimes[t_time]);
 
         [Benchmark]
-        public static async void SmallDateTimeAsync() => await RunBenchmarkAsync(s_datatypes.DateTimes[t_smalldatetime]);
+        public static Task SmallDateTimeAsync() => RunBenchmarkAsync(s_datatypes.DateTimes[t_smalldatetime]);
 
         [Benchmark]
-        public static async void DateTimeOffsetAsync() => await RunBenchmarkAsync(s_datatypes.DateTimes[t_datetimeoffset]);
+        public static Task DateTimeOffsetAsync() => RunBenchmarkAsync(s_datatypes.DateTimes[t_datetimeoffset]);
 
         [Benchmark]
-        public static async void CharAsync() => await RunBenchmarkAsync(s_datatypes.Characters[c_char]);
+        public static Task CharAsync() => RunBenchmarkAsync(s_datatypes.Characters[c_char]);
 
         [Benchmark]
-        public static async void NCharAsync() => await RunBenchmarkAsync(s_datatypes.Characters[c_nchar]);
+        public static Task NCharAsync() => RunBenchmarkAsync(s_datatypes.Characters[c_nchar]);
 
         [Benchmark]
-        public static async void BinaryAsync() => await RunBenchmarkAsync(s_datatypes.Binary[b_binary]);
+        public static Task BinaryAsync() => RunBenchmarkAsync(s_datatypes.Binary[b_binary]);
 
         [Benchmark]
-        public static async void VarCharAsync() => await RunBenchmarkAsync(s_datatypes.MaxTypes[m_varchar]);
+        public static Task VarCharAsync() => RunBenchmarkAsync(s_datatypes.MaxTypes[m_varchar]);
 
         [Benchmark]
-        public static async void NVarCharAsync() => await RunBenchmarkAsync(s_datatypes.MaxTypes[m_nvarchar]);
+        public static Task NVarCharAsync() => RunBenchmarkAsync(s_datatypes.MaxTypes[m_nvarchar]);
 
         [Benchmark]
-        public static async void VarBinaryAsync() => await RunBenchmarkAsync(s_datatypes.MaxTypes[m_varbinary]);
+        public static Task VarBinaryAsync() => RunBenchmarkAsync(s_datatypes.MaxTypes[m_varbinary]);
 
         [Benchmark]
-        public static async void UniqueIdentifierAsync() => await RunBenchmarkAsync(s_datatypes.Others[o_uniqueidentifier]);
+        public static Task UniqueIdentifierAsync() => RunBenchmarkAsync(s_datatypes.Others[o_uniqueidentifier]);
 
         [Benchmark]
-        public static async void XmlAsync() => await RunBenchmarkAsync(s_datatypes.Others[o_xml]);
+        public static Task XmlAsync() => RunBenchmarkAsync(s_datatypes.Others[o_xml]);
     }
 }

From 8483db6a17b5ec40aecb2ec3a79d1a2f92d614ed Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 18 Aug 2026 12:37:54 -0700
Subject: [PATCH 231/298] Remove committed Python bytecode cache from perf
 scripts (#4550)

The perf pipeline scripts directory contained a checked-in
__pycache__/perf_to_kusto.cpython-314.pyc artifact that nothing referenced;
the pipeline invokes perf_to_kusto.py directly via python3.

Delete the artifact, add __pycache__/ and *.py[cod] to .gitignore, and export
PYTHONDONTWRITEBYTECODE=1 from the perf entry points so bytecode caches are
never written back into the checkout.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 2fd9c200-e580-4516-bbd8-09ede1f8d789
---
 .gitignore                                      |   4 ++++
 .../__pycache__/perf_to_kusto.cpython-314.pyc   | Bin 20571 -> 0 bytes
 eng/pipelines/perf/scripts/run-perf-tests.ps1   |   3 +++
 eng/pipelines/perf/scripts/run-perf-tests.sh    |   3 +++
 .../perf/scripts/translate_results_to_kusto.sh  |   3 +++
 eng/pipelines/perf/sqlclient-perf-pipeline.yml  |   3 +++
 6 files changed, 16 insertions(+)
 delete mode 100644 eng/pipelines/perf/scripts/__pycache__/perf_to_kusto.cpython-314.pyc

diff --git a/.gitignore b/.gitignore
index 06d3a36078..9289d0ab5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,3 +146,7 @@ node_modules/
 
 # C# language server cache
 *.lscache
+
+# Python bytecode caches
+__pycache__/
+*.py[cod]
diff --git a/eng/pipelines/perf/scripts/__pycache__/perf_to_kusto.cpython-314.pyc b/eng/pipelines/perf/scripts/__pycache__/perf_to_kusto.cpython-314.pyc
deleted file mode 100644
index 0dd9bd9d8106117d4dda6c5ec09a47a2910cf0e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20571
zcmcJ1d2kz9dSBzd2@t&R77vl21X7}IX>^j5Mk7(;HX%wHbB6;GO$sw0fb9l!U}n5r
z+o`2?;uU4DBaV00!--ur9G5H0B(AcOIOSRI`l@o3K|xwTy-Idc*{W3jND4EW)Hu7T
zB){)98i06cl{je$uU~)fd)N1l?|9$ijtZBZ!_yLc>y0mta@>EU5A87)B2UwZ%yR;l
z;9lbd-C12i$KLvcp1lnT1A7}2M)o!(Ozdq=nAzKsun78uRWQ_X3ENlg+c=?euTCvH
z;Sh{~It3F#mtaO%Ay^Q)1uH_2U_)3b*b#aK2f`}BiLhF5A*>N95Y`G_!Cl8ibcwpJ
z)(f74S2!+I!Ew#pR~xo*U#;85?JaaetMi&p&~<RWs^I&2jtfY^s2m9<ME;Z*oxU~~
zl-?YQB`$~wzI`SciL~>tj9t9IOJY1GC1gGvO~m+fNf}{WlxF;rC?_L;OR*brpWS|T
zE*=r*#3&$%Ya%}vjK{;#Sw0k-P7+iM@v$gNIg1Y|8jK7{;p?Ilh{Yl@e<S>6cqbnZ
z&WilNfnD~V_EFRjljefaX^|HS6%7Rw!Kt7u@?&vvIy@7e4kp5}XuFROMnkORv9Co2
zBVkm=PsgGtTSl^7PEJv|eLO!Z#X`wx5$(GX<D=q@NH{9`Lt-R67pCU1&h}gwqPLHq
z2}gh_iNVk<9xYKjZby$qnQA?3xAS~2Pt6pPQNHZ)qn{!Xg%64Hv=p8qDkQFjQ5X<=
zr~_0ne^KD4lahqi`ud7x6~{sCGhZqUB<H8JQR3&s#I;zcKOU5Vh$3k^HiwEBK`<64
zBat%X1UeX<r2*V9&Ou4!#hY;qr3?xH;ljxa7srMNFJ2fLJ3=(I%hT7yxgd{G2NFLQ
zjzq$;2=a#HoxB|5MUeRxj~Yb&dN7g{dGs?Bz8(&txT#zG?wz}K?V=wVbuk(NCZ@*d
zEi^ugA~9}3Da1#@Q&JG65Q)UECBu>!>a$;%rI|bb8+|9I3sacA3<&A>^xFvLxd{fO
zV6+%3MMep8-BXrBTjFIHqvo=YLR4EiqqdD{0;i>7QRz}OU03~GbN;SSpzGzsT_cCP
z#`?NuUiFz2YY3~1sH7O8u^Wn&qAAQ1#gI%)D^@un%@F8g?kUxwyw!h6#`Nt6?Zs$t
zE*QBMOGv@~!B|M_pN_@DkyyfiBPP9>kVH}LFHZaZka*p%=J6+z(p1d<Ml2~s#asPi
zbhbYpj<cC3_tWz2r@0wVs2`Jw*yNkEvist<6vrgmgjP<5<(T9^b6W9}cO#hRo;a$q
zj^;H-bJoGHIru-Q&u$x7+cuEhwtsEg{*2>5)^TFZaUy;4O2%<DZM-TG$)*e29ikj(
z#Sf!meEK=|pLuSa>t<k%n+3F)>*qSSCT^mbV;ozqpcf1W3L|+$H>peNlZMIS#unF&
z>oyx_ZR3mU1tb02TPUH8n{XDY<VLYou79vWTLs${y@nq*qCFlBYt*a7O7Cr4z^KiF
zxM`wJO9_}J>b3Y@^p>7tZ`-N26BZT9ae^bjIXS^OV3;5Zv1gPqC+$mp3zh?glG+%p
z0;bWXXEEqY>$``$WWHoc8v41U{`5|cyMesYY`{FxtmQcbN~@GVhn|(S-7-O=&Ylfz
zXCrm4m*cL^PU+9}ahwfPBx#6S;^q#H=XR8OiTawku)d9J;o8{0^M7{4(87gvJU3BX
zeP%9%GMc%#p^P3TMh|nq;N%93|0gs_>RUL$7&ja@bQIoUU6?D@T3zTAw`r~R{~xs`
z(SMaXVb13Yu7W6nh~=qrLokJ?D0R#H6d0ixjPf&L5Q!o`6A5C^4&pyH)ae9cLTvX`
zSx(<zEIJdO#l{~=&PB1k2C%c17=&6Z+l`6MMrkt+@_lc}vFJ2$N6OkGi`a}yj5Yw)
zCikm3RTLE;{E6+|VPfsExIcnTKf?DG8r)lGX@T2`>p1b0crAE6jBN<j69W`)iqbS#
zNXXtJ_RaS3*yu)rQ84JxSTuYwdN~{oL7v!2@QZQmiQ$wOIw{|ZPM^{W@-fB(76M6t
z_!kj{@g9f~5LB+&CGaOHL~J)0iGlHf88IX<FcMfG34nG{ahmw}SVCfmkRXb@7bItF
zaXOL&8{5gmi(vGYJsOMpwNWb30SsK_UE$d%cw~sUA~i|A7K|fI1aHw0Vl)%{TQsJJ
z*+{=b0un||oe97IW#;0ETk2T%kVJDMC`Dx-f8!cPj|wD-ga&jjEX&kp2qnoVBmh|q
zPDMmUlwe_K?Qtmv*c?QVSt*E-!MK&GD9juwh*BjKO_MGdhEPIsiiip^5qa<%CL4lA
zeRf4B{oIyJ%=i!b<?!ssI>ib}Bt|5@klKFvq;TQvg)@gycQO*<qp<`Nn`pE#v$e_g
zbNyi+8I9D7l&k0XobR;>xwpT+ueVd-Qr(*r!n(GulvG_2@!8^2JduX#4yuA&Z0Ze+
z@DZMk3L4ty^C-qxT#PD466zES#2iVANs1|s8IVv6@-100%ZZRENs3+qXNKUY7-_*M
zrbsLpk`?<nNjPdQdl+Lt63n!y7-@YfCJ2#pvQje%;pz0*Gn2zt2G3s_8XlTFH+*$W
zG1A2GSrua(R9DQPc_@N9q~Hz3Al{r-9MRY$WH=^2D~9QrS;g?CcuO&<6PtL#_JWKl
z5nE8ICaF!6DiM&A7PRC?N)LYWact}J+?Vy7)01;oF4*#VlgazURk_%?WLSPP>l%3E
z8d#mldF$`(xVz)G{R@L%8n}u*UwF8xntR)SYkRuEw=%FIXS{pn&*k+-WUcVtdE;Ae
zEHz~+x)uyySUG3y;`IA_Ap|^d@K3C+w5NN;xO_eBA4ykSczEeb_R{3qrO8Lu*IDg3
z-_GwheBAIyO<!<2=ZNm(ruPmn?a8^l4;%Z}-2Gn|I9J`1y~pk+e-z5@J;y#52EX;n
z$4#Fz^gO3Cjp)AYKm*b6U;NDB{esh@NmT3p)x_$|{Zsel`(nCc=x_J@-QmAE{Kz_v
zT7T2_i@XVFzxcw7#+Gs%xNls&eqZ>+a6g%@82;PAzkB6xUU_7_T$ba1Jatkl<uC~O
zk81~ya{sh)u-Ei2t%&`gx_0Ow_vd@v!+Xp>v{q5bn<?yd3?8=qaGw!4KRj%p@Tg;G
zpW#Q=_Mu&dANA@ezRN`6LC5ee!(SNMhj$qMqDx2d9VUdE%Shj5!`RQobph^(t|&Vg
zh+DRCeVm6o{VzB!t{>Nr0(1Q%=rpP1269My<EC-Lb0sCixaoQ6qo(yWlq8L~dEBVA
zF9e~lnHx7~-?Q!XUB=tdUdTFzUn=VuOR~<n>l`<37Ho&mgb<{rW==3&uG)^TbHC0~
z>}4tDLdqf}8sMsrpw?;`H=%Cpfa#aW6y<gQu`1z=lj7_Mz6Jh0O1my8#^BZ1@n3)4
z?^l<gKL&kBB8GF}<jC;R@ssB-4Zr?6&$b3tfer$@oDU$CwvPe>C&`@G1a*EIJF^UJ
zJjm020hOGO&G1EOAKYGJt*We0WT++fHi}(me86W1^Z8m*gnC9=Mjszw%(K8WiP=F}
zhvEz^TIF5O?ybZWijoCb)pQ~mj6jzImOVHdq<wHFKb1@{?g8~<`b{z9hc5a0>uNbF
zX;fJP-DSG4s(mm<A%jUmt>nRWLaOZ`B+dkhQ}47FcqwbUpW3c*dX@3hPL5WiE^sn*
zF2=tpig8p-QjL&|7K9{J3I><BMieadP*X`YmR?Sd>1i=eBijQ~lBfjUQsChmMh|@4
zcLb^B(g7<9EQ0ZH6ce0^fjq?2<u}9eI3Va)kWbu-lOY0A23;U_MYU+<^zr90xg<W6
z#L&Rh0VaMU9PLwdM^jxzCa7^Ye&Yn}PStnwJy7mZE-Ea|M_->rT1?<{$_@n9RK7b^
z-Cbg!1&a9kd<MmskdmUJ+pQRGi88)TGr@=qz%E4}jrq)q4Qx6QCQ(W;L5&T^iCf;l
zA|TyIYM`JIfzJX)8w^XbV$+t0tQcusC`M?w#BRm71RaG_Oo`Z=VpOJ;Ti|&r%d4AY
z5<!94O%{uhjsx>Ne)10y%yao_uCi+WY|c}2&#~xO^8S`%!I*1m`{3An$5uKrO?_+D
z`UT_SzMQ-2PU?2*-M5iSsCON|?aF#O);t{<PuGI!r*7{Doll&V>FPuGJMY(~k6%uE
zuRN)1yqCJ0`fmoEtK&a7t8)%dy1M6~qbJwezHs*4i#eA!UEBN6)thVWpzog*vxAA9
z(6!`R+Lz9xI}YRxx~fA@j-UFo)W1r7iL%b=K5ODCoAa%lvnFk<-l#Q`u4Evs`M)9(
z)NRz8$*4EZZN>#OUGRB3dki}En2znBs0Di~bf=Pjc0~6T<11XKjZ)gUaorvrnJpt$
z!Rje$nx~;t7x#Ns#yMCHTCq!yRFifnm`6O@w#ch-DJ_3UZG(k+gdNwG8X5`4NqW6F
zRxqi>VT{rivTC1#{)Ejk7R5q|@ZAL^qMJnI?(^Yj@@99RM4F#sz!Fj{h4kririn_q
zJ@`GPIrx&U9bKL00^DgZv#(W->4`Wuxp`9?M;&8bLgV%s!n%)j7bKF;ur~C4yA%Uv
zucEsyQ+eC@d3EaAUYZr7WM@03@RQIIV9|kIGZ~ZnUW&xfWcgTM5hIR_at(sN|IcVa
z+J1Gd?aGp2aoe{KX4<a&cbTTbuUA&<0;d%d>l)Ue39@_greaJ+!#5Rkaw-{3Bo%W=
zoC*h{ig_9uN({1XFam?D=rc$MP=s_4fntDK^Rb>SJLwDnGI$%e{e;?R*E21Z#*joZ
zkt`ti`+4p^IXsWul{u^Hj^noDU02rHv}SF}SX<^#<}A)d-EX8GyX${yvH!aKkaZzr
zzxqx2oAR%fKC_mq4=h(7yKAwG=Fe}O^wbtm(fE`q{C_>=F|qWi%WPutP?lg7mi<9#
z`Wkj5us84$Rh`{*rm_8PnheooqQ)LedhC_`dwKsc{^tI@*k5U``Sc}1`*e)PGEKPc
zDs|mu)TN50OGr!NC$}IdlGow6bL94scaLTrt!s|fjDt@b`HiHa$;L?auUX#pR<(cF
z?!YW;o5+5Gev6fh-2*nc&2kj&Wb4+tsj$|~sWUVrBye1V_KQIwA%mZT-E+fw?;eA#
z7*jhOjHnBpoh#fBgV)7Sak<Ol*A#mR5lR{zJ}8bd+-DYq9V#8pI&MH%kZ9Ve3xZdN
ztg39t(5y+YZ&4z9^4o+t%t-&dRbl<++uwM5aX4#fd|+vO>~6|gRLGgErTKxS`LVls
zi<Lm6WW(#kn%I0L1fV1c9w-Db%RwQ~ZN>`5Hw;+8^apd`xNd?b5qnB_f?kJm+qe-u
z?RcA)Dj3#JgITbCC;*$XBN$=}yY41aVAEC$<_$UAto*VTmvGb;kLv^rorTR}V@6AK
zf|Z?&p@(2@#8@`3$+n>;HHUr69F8q=IJeB<TA!mpt<76hu^zj?9NjQ(g5~=vQ!lA|
z*ld`rE;F=B==ceG0xhB<b36rW&h)iGNRhKKSgWRzkkMfYQ%o_SNf%P4IL`a}Q!t&)
z;6#Apij!WGbRYw>V9Lf84o>a*72_O4e#JZ&l(CdjR!M}}QWpCaOCgpr;uxY|F(6Et
z$eP)ovKEY*Kq|zr`#M-<*C4{n{V5asz@GUln1YHSB1XYa9XJ<4vnNSFlwP6)Gmffe
z!Z!=twXiNdlLb7IlBs{vHQ+AbC+85*URul8Ozr&8PrSVg=A6TQ=lJd8OZ&5q_J@x4
zTvgrshNaWrbu2m4Rb2~1kDZmDS-7elc`Ijie)H?!`1<0FtflRNrEU30w&T!R$D#W>
zvmIw1bewtYZYklsm9=y{uyjDI{LbK#BU9a(uI@^^w?n$LI2Nw|#;-0_FV{b8@I7|d
z0KiI3Wi9OwEbZWv8svJ`()z&C`q*8qLA09pesui9<Ew|W9mgJY97B%B4(~=bP~0c}
zo^_iH2kTh@DY09u%%Zsfy9m|}Gb<GL1Qb|!G=Y-Ri))yzGg7hXKtY|O=Q^>g=r?5p
z#eJw~n0T(?;d0gUgjZ$+c(qJLH>4z0KQ9_|)kAH_h}}p~4@~85Xr0XTi-}FT7`~E>
z^W)qyI1Aly_-2q!w4s^BlZnH8yAZoE7=vVWbT=Jol6{()rH=-nAGO0mx>M>0g-An^
zp|B-X=D(jnX2lN8rBJV8K=EV-loHYoq$;{eRW_iLM^)cZxlLt3-6>_2NHqL?{Ny(f
zK+&;t4%htPPaQQdrY+cWp2n<)U-R(GRX>IXV=Pl}e(J7Tl$Sfd^YzD2TI!oWsCchp
zS<ck&xb0dnEShpn{0B$gJM!J53x+#qZ=ZelT*g}enS-m`o_BIi_xvjxCz=uU)6{tS
zhZyd8oJ7$?+l=Lu&PO-euaHYGm@(P5VX_%650HpmU`P<LFL&%Dy|M7jptff29M0CB
zg%>P69fjfFybZcOPCLWe*a~Jvi=qX_apR^vC{EUmdC>zCY-R<9rnQycC8k)G3tBhR
zpf=A@WQ?$-nG5~BfF-nft4tbWC}2(#reG?k+2vZcG%#sY<_&gXQOqOa9Ck>>G9qI7
zPs6A^#Jm(p&{fRmMd&FZMSnJ=n8wN2jiYP#88NzRFcyhGFou>dGr;ckfPrTKfmk9K
zxd`cqIV8wR<EdM)U%)E?$_|VXu+9_{eLBT3D<;T3z-&y41r80YW#&1xsiv8*7zu&l
zFt}nbN#=?<!Wz8MR!~0~V%{Z_a=}$(vQVn@k1#rajGz2(5zKSB3eWr*=<Ro|-oCnc
zGvng3uI*{p_T^Lar=RL|-a*}h=~IX2+sBu#fA5`#Z3lBL9pC%v!kKq3d}g6U?EY2t
z_k4GKOJ|p*jJG%I-Iez4TA6y_-32aF({%6EyRR-gGd2Ef&7O44o>f|<l}-0r@3t;m
zGnKw<<;isA$(2{X|Jui|-5<*MPZDdYeCTLd-u_YVhrKJ8Gwu5xwx7(kb}nE3UJTV<
z{LIEx?Z&!yR?S~fmnCUQ+Cxi{eoyBS%x|^N7hM+0rY3UH)TAZ3xiNXX$Q|N_af4Vv
z_~V9&V(mMzWVNRto9Gn>2AZ@_a;3Qd-u@0S6x)Td$<bk9a%9YBB$H7vA*;OI5T8z{
zTOn;P+p!m_8=+$o6RA*)^e&Qqh@X5I0fx`+zT>;?TO7&Q+q3qbw7q9}YJM>1bl*91
z`^@6dyCd_%x%Tb{?Ryr6zjOAHvn6djdcPXMM%vM-3aDUw`fX_Z@b}tO9)l#QFJEH#
zHmv(LmVXN-&2b^FFUi+M4r=I!VPsrC1!;AC$$(h_vz3<ym>n?3I+$~U_&$3e*IKlA
z=`9pxPHodbNfi_5r}}J>%dKH+Z{+e!6vugsTt)A;vRq!Y`Wd>Qq$<Fw*Y%_Zu-bCi
z#u*wgAa5P;>dWx}YnX7A`txjRSxXv`vuRz<X26~qMU>V8SZg`n#+C?ez~d*Ni)d67
zww327tF?U#T6JhR8%yu!P<rRMp<g$siyQmEXoR-789xht*5^B<jFR<e-2+FOE@6Ao
zsl`@u^(Z;1jMlHqgijdlY(lrtqaDR)E%tE3`qRG$wrPiZOwk2p+%EWpUSWqe>o;-N
zag>}-MvE>crFv0cQKyPKg*N)9wYrVF;@ot8_iL@%jE?b&K*grHc4@id?kzBi+E?5Y
zFmEh7;EtOEmQCQExFujMgBKY87Pagyw!<3Oynh2F0S0u}o&I;Adu5<<(_Zb-N-L|s
zw7Yu)-c57u)pEtF0#yZ(0<vqMY6A8I^(o)s<JDW#zE9Y%iCXcREpQH$;nZ${bFhT7
zu^+<zc-<EH4r%?^m<znEUO2p&uoln<Y67)^I^oCx;yifb4REZY)AV%@_Uo4d4Op4x
z0PWgG12qVb1!@r<57Z$%F+oZIdjfS@TL3?~MSD+aIA!gHHHLWc7C8nt$x#?zVLxgb
z3REK;o*;icwH;pJv^FM4IrB`)%VjBNpGkS8EahCFx~S=aPr`<BK2TjgA4YU+Hyqhw
zc3sfgEW)<g%>6Q~&F5U9j*DC59(|!YidfIB<12ysO;?Ga)d4z=1>6V&0T04U6LfN*
zQoG3igwBAWUq4uso7%8)&wZ*2<HP!M9~Q)Nqu?y(8XBEvnT@NAvs<;gA?7<tu*bXN
zIXO$*-BOmbf^uFS-lOl}p6{qPtUv!JMW;C)nb<SYuEqA~iw<<Ii7pK)><rj(yzURU
znA;vz#-7n0EmnF9eHu?8_dswp*Kyad;T%?-8ZWu+`NmT(7d+;A$nFZ?>Ye<rsNP)k
zA%7L_+BoV_eUZs?9lq)0v#xpq;dGek@ROmi)R$_0OVteCdHXH$w+SZ@(GJ|-Q5*%e
zfgMRYRD{WELHU~E){w~OW-=UtqHk7_al*n1Qmh(^;v5o5{Rj!kC{!u?5Yt62&@rcD
zB#1+XsK`E?bLs~(a4EKvP`(l@0mtfys$h3PRf^7z-Gaq!PVvBti4?2o>?C}a2;w|h
zc5<OO%g-?s3)&EXp<1z0yUAp&xJC<}z-sfXr;_1F=#mssY*Q4QOd?9z;BQ~ZM&8Sc
zT{R+71Em>^qf+s#RZ($`t1kDdPn}YMb8Yg#pHvMkihYog>1Cp3A<k;h$V`=7P&{X4
z;E~Y-4s54jSX8`WnOvg^ph<F|SIp|UJdvKx=N0=|=9mvx!9+^m+ne(C7N&rorUP?5
z2td=c!8I_6MxkXSElN;hIEf^<R73Gdz2wD)8p+F}l90f{;dJ$KOim0(uZN{rlsvW0
zMrUG51t>+H35Cupwu`bBwHGZ=(6h&&>4f3w0G-=70!L59NW-EYOF}Cre}2V2TC@{M
z5;d#oEsPpwXcR=p3rZ}|5P=uoJ5ZktNG%vf)g&CFgBp%vy_kKj;)go5)T&tATdZyj
zjs(o@RB;wzr(mbDyb_yYs0Kt78v>2+)P)gQF^%rqg_i*@#1HLb@k9G4en^cUQmO*i
zq*!wH8tiBn<1%!@F>!hpz2mqOcTOl4=1>P*7bwIo1gIW%*0DrrNW6}ON-Y7OVP;WK
zs#P;a(W1cY3lg2fu$fEap;$-Zb4e$3N{zYzwQD1w02vs3jf$C)g9+y4&JH-4ipq}S
z*uf4nBukxCtUe}7w9mmMFh=HY_{PJMp%`Z)u_=iJZV9{%spOU?kq@|p19NVj7lcGc
zX`IBu1tc0`<~*j*GNS~V10y?VMEew6024Qr3OFOuHd5GfB$7^GW>>dB1@?3DXJtE}
z;slg>Jqe%QsN#wjx~_g&Vsaq@??V{vqpT+qZO?FC#H|{M_GiTiub>1gpGuP62Tb}^
z3T{&>>@vaVB<w$GWDa9L#ZJKf4W*i~Sb}r1G*2H+X33%JMA#^0GUJgpzxku;_%_Ym
zRFwV;(EkQM`3%(BdG6DiJ=vPWYc+>q<6J!Y$i1!juB=YiY=2bQowsncN1k%VTJ!vc
zFJKa_eb+xfm^W6r%{goBQbpc?*r(R&#pxygquQRl37>g0XRBS5mySKE>&;sTVC8Jp
zi(^a8k7~B(Z3M7$w#N65u2g-$?&G@j?!k<2DAP2YcTkd(v(>%tUNL;%^08&LBGYp`
zQ-31wqLd2G=6zVTeOdnK#)mgnQkm|<nW`gsHzj#ETm4d1x~1<?Lw~-KAYRT^wTPpF
zN7bGADgsm^_u`(#)bAY6R{7FZzUAqB4Z&+UTaDKGIs(*lwuXm|y(@cG-g&g+Xr}R4
zzJb7vg)01y8v6201ZghI*+PKU5+GZ<D_y&5Whmc92|Q<OdVgrSD&2MH(YC{x<|FxS
z1a9YSm5Uwsy6<)`^<=yqS+6hc^({;J4od7~g?-kA`23lCFPul`&*3a({(P>wetslZ
z;hjJ8vkK3h+1s;sBDW(;hn7R>ohLFCC+E*R@zj1Naqre|-CC|&9eP-IDC;@AV1$#Z
zt>#H(&0=V2aAilfa{r^s{r9&&scT}0wVAq}MdOzS&U*j@;HkcI^Y+bjy+7mb%ewcb
z-FsKtVe$6X-s`#BlWy9P@$Ou(<dF5|-J8o5nY#W3XRfXzTi2Ja>s!8okNU1`{l0Yl
zzLn+$SI*mz^$w)H151GquDo|;`OQqrz=Gw|nudE<?p|4ntenc$^e+tOsvGW|y?b^k
zlBwR2t=^rk-n}9LTHACld^fyo&eV1<oXNRszxDOUp88yE%OBVt)%q6Bd|Jpgvpkil
z_5r`9@!r+DSC?+Ccr!IS7fx&6Z?6cMnqAqN{pp(htEWovo0*!PY)xOfrf&t%Pn!;A
zn~twF9nV#_uhgtw|73sOz%`%HJ>_)G=X49_F|S?qS!e5-vo+7v@)bEx%hKC<17e?g
zT9+&GCd7bK$uHOBEflwMl`Ts%c^k#;TxHktOx{6pCs*0_kl($!J;NW$y9iRjRW>dS
ze{lA_v&&+pd1toye7gDks_9Q`|J-(eM`qV)74X;Xc{gEuxXOm5?tCT1y<BDe`%TN2
zR)#YT1NkZf!9%MIR70TJXFzoXs>cz;pIu%tuh#vz=ipy=<{Jpuh<3oe>Vxom;T3nL
z_27fnA<&?uowY2MY2N>*4L@!^m3!qvzJ<_Rxyq(oTjvM2-n*6dy_9J?`k?JB@KM0k
z_pYX~K3k6bY52!2XL1+E^4lmwJ6GAgV*bAUV|#kf#Z1p=zJs8h)cXVZE{bnQkxS?E
z-4yTPDtjLKPJYsr@x7e$G%rnmwgccVxmuU|i#D!y*Jo{9<&k_`2ZL?8sx#~8dg$nS
z(lxMpAk%eZ!IJiDTeG(39Nxua>Ph62_T8)gO#6ui%VNcvwe3@fH|=Ok8{59Tp~Jk#
zl1NwX|HaQdb?-N(-JNi1#(E(aGyh6xWqfsDb$azu+I!?j9e>sPgWgBZk$>;3CMRfH
z&Cg{zhx*I9TEVRUOMl&01}uMNv?9JX;1CRswWCJF9~cZ2nk&bQrU!M~gyW_M$4!V&
z7frk<qF^NDp8hJ%Jf69ISB?cldbX9{&Lh^f?%7PmnkeFoZkD5{)D+QR<kr+1?JdA~
zTT(5`43-?-BomC!F;2m80_RasonhqGkCKSE?wKHokv*dxEmnHNcxAxtF_TuiU?yiW
z?a|r?7c!`e%!SM%;9tqSMXm|YSIY=PRm*%f5@@aBO~{m!<Z^Z+Wnwopm^_OlI~*#(
zlX0#iD>^%w-`_w>6y0H;P5Lp#taCv)>cS;cm1``Bl9;Jjf>ScxQeaYzV!9#0CrTA=
zOrhjlT=p3Yf)J@*st{qIC=FQ2YVVq487HG5x<VoS0*QW18kx>8agWew{^q$~JNF&^
zJ<DCoJ@;MrALu`_d}#T|{h@o+nBn(jJo`VXeq=oT#O7KEEe<YsXKlTYY`rTpKdGu)
zfPLS4=lt#S?^l1&_`8kEgR8GRY&iZ&=c9(xKX#t^%)nLGgH70XAPfFKu=W02hIb<O
z1K+_@J4}DR!*S{*+cTbjWQBwUg?suf^9xPt;=~lV1LzSw%tdN5%R9TgSekO=KDpVn
z7fhI%<`=-jU2;sY;uPMpJeyz_9NIM863Z#LUI44&g|OVf@(7jM;@YxKFYu~f01vm^
zg_;+@s|7{serZqZU#JfaFND?jLRd{Ngw^~)t#5guvRYv)|K(%OqpWQ&K-YGmqmL6h
z>D1sr;e3gW>2tSWoN|@UhxDVg?AATnCP=4<qs6n664C@|+w8#xOiK5<N6W9h+c=>c
znB;J|?h$$buU!Ykr{Dv8lamgi7w|Hd11+bp18~@6*FVBez&AO;5d47i>#<R9AK*p%
zSt(uU2fVZNt;K|0fEO)j8WiR127EJn+5q6aB|I%A>;b%-4;2!Gy(L>UFm`G9rME`o
z(V}&;EKMur2)S(t`*2d_jvFWTX&5MxWR7*uxKXnz-+;g%jZaW!_5hzwbk{xOraqmP
z0~fc;v0qw;iqCO#87^H4V2`kW^Ri)~EV_1}>=OQgiIZAhlvvo|Vbwf{ayF@zES(w_
zR*1Q1!Nr`xwWm_KhbB&G<&F+%vC>;OT-wE6Bgglbz{DMzvjgmCDTg1oYG5GngHs1m
z`-bp`5~ji4Z_yRY1bp&f5#%@8y_ji~d;;S^S?=@cVF)bzkp(FHVkDlj`Te+^;)ekt
z)db@V`+FAZU%}u3M}5edxYn0)74Xzsw5e{wE!vg@2IaTNry5HABwnQIN5a!mOpeVY
z`e6PG_7(3lp}UsC&7V|--(RqevP{fMmU8<2%r2^y<3)4g1w*J`HH4<F;)($IJ)$pk
z(ReyZH(&6lCVC1U|NW}Rd>>!1&+;=;Y>wq9S}br4Nlx%$^tyWSHU<kZ3IW|D4pTw;
zUl=fIUAc`lCE_oOkOw*L4VQV4Z`u&}hxgw+xZn4G(S(%UPlMzqqf2Ukk@AI(VuIkh
z0~w4k3wlZ}&;8}D&V8v$zhARbv%+A=)=B@9I)&NA%)fq^f3>Q}BunG2`d6xS_xSw<
z!>(U7>=J@%0r!)oyzG-@ug0vE34x?h*mV75z?EoANx4~va7nmudoJ}mqnK%$r*~;c
z&};RM{4@90`}niZTu9gMacP&~Zqog2q6SQs&%5o7zaImCfA!KhrVEY>3ag-SdyElH
zwKEs5_enpY_S@K{s#6y)o)4NaIWB@O?Cu}VB7z~@`dU{|>54zDf%84;^+6&DW&`uK
z!cDkj;UXTp&xXq?JY93b45iENblXjxvFqqoxDbyeUNGzzdZXT^Q|ST!;NrzSx>LC2
zWx=C#;md~-X7RUK;J71e&ctOm`_utZX;K&y?ap2w%+hAmg!#x;4D;s-UJpua=}5l`
zx=H_pf+Y%mmxA{x_&o~lQ1BrIzfS?3GDsg$@NEkIkb*y=;GZGDRd6YWKV7t2qcZ!O
zJGg?8GOG!xHkMLcD1|Kws!9*8)e~Z0(dZwIm2Nnq>*^mi!Y#JaJ$UQ^><|Fg1)v{t
z67frE0D-SVu?D4C%x;`ZRGgG%*`GTarB6w*OitntAWcr<P$m?b1R6_Z{-Cl*-!i+j
zt+-T*7Vfs;4o{rc4!hZ=xK%nAFTDMOX^2CDgrpMkAoYSQuF?|<NJ~>J*!9WctT<Ri
zC5CFq773|=0uq$qvu8vXt~28=^_IS5HaHSo6gcUp6nu(cgM*&*Iwes+tWzF@{spDb
zRg-mfK5%vZaot1Lq50D}qdjY^TQk-zxmJz2mH_NFrh42VH;wB)EhafuLg_=}X=B|(
z<K<EY_iAUZ<#aK_%Vind>D}iT`uQSyy1r+%ox%1MVM`UOdIs841f}bDu1@9ky4J7g
z3MK1Jf)4gHlS6GME9ZF#OU{+4T+5|myDpd7m9F2h8e$b5DOR}TT9FuNpaen*479rh
za<6(BXm1geuJ2tv#b5`DuqDuBBWPpJzWWx2cA}UwUGG~R$m{j3{e^}bOuJw?EcJTF
z>dT)@<@g<Wy`lB0E^lJPWHP;~gB{W7RsUenQXu1KpC9^}i(jtJZriiAZBNFvmyPi^
zN4_!g(Cb_2%=R8z>phn79)D;&p<3t@*}Cqvx^A-L8?*JkwR&F;hWyaI*xgvp+PE~7
zZQi}sy!)AC@8ZzCk-H-~Ys1psY*YVQQ-97{wHUbf+TGW3)?#AKVzKD@rOs@lf34A<
zvz9^2qRsD5FL!3!53RKy%CsKNww_pPJ&|cWl|KFITI;Jht7mb0zRlw>&kugl$u)N^
z2R?f3!`D{FGEIlpjP)>e8}U~c?(Mw0bGdHW_R!eNzO&x;HE;X!xrfGGKQr3W&W`1w
zkIsL1e)(A1KJd`E=ZVp_aQZuY7T?NLb)>zW>CVAVhO$F}wV^<I@KV}7j;a1rM=kvY
zgo<N78vCnPfAH!f>*!;LlX*2N*2zh_p)olLS<kbc_etdYDv|i<Ym`hR(HK}j(8m<e
zDHgL2Nlg@Ei=9rb*cq8(gTR!+<y@Sgbr8@`0g1Tk>DeWUO;B)+0<!h6vn}<Mi|sSC
z#ju4>?IeK^o1<Ml*&e<Lw|Oh2lai?(3|U{o<*#H!JSNqmo%qkm-$j5Mv^w2q#tNPB
zDbMLVKjGXz;T-J0?I#@m+nFVN-uAg!r+ZcRSq0b7o^Bt?)DNe*n$OMKbR)XYU)DA1
zYCb<~(^Y<6Z`5u3yn@B*byc75uh6+aZ+9ZrYS10~+!@sA_|IQ97<Dh}zNi?~>0J5q
gdd}!vNIf((JhoTg4gB_a#@?JZHpBL0Y-El9-#mkL2LJ#7

diff --git a/eng/pipelines/perf/scripts/run-perf-tests.ps1 b/eng/pipelines/perf/scripts/run-perf-tests.ps1
index 7ea2bfdffe..c91239eb80 100644
--- a/eng/pipelines/perf/scripts/run-perf-tests.ps1
+++ b/eng/pipelines/perf/scripts/run-perf-tests.ps1
@@ -78,6 +78,9 @@ if (Test-Path Variable:\PSNativeCommandUseErrorActionPreference) {
     $PSNativeCommandUseErrorActionPreference = $false
 }
 
+# Keep the checkout clean: never let the helper scripts drop __pycache__/*.pyc into eng/.
+$env:PYTHONDONTWRITEBYTECODE = "1"
+
 # Run a native command (in a scriptblock) with stderr-as-terminating-error suppressed, then throw
 # $FailureMessage if it exited non-zero.  Use for native calls whose non-zero exit must fail the run.
 function Invoke-Native {
diff --git a/eng/pipelines/perf/scripts/run-perf-tests.sh b/eng/pipelines/perf/scripts/run-perf-tests.sh
index 4df2eec8e3..ee9961fd09 100755
--- a/eng/pipelines/perf/scripts/run-perf-tests.sh
+++ b/eng/pipelines/perf/scripts/run-perf-tests.sh
@@ -28,6 +28,9 @@
 #
 set -euo pipefail
 
+# Keep the checkout clean: never let the helper scripts drop __pycache__/*.pyc into eng/.
+export PYTHONDONTWRITEBYTECODE=1
+
 ####################################################################################################
 # Argument parsing
 ####################################################################################################
diff --git a/eng/pipelines/perf/scripts/translate_results_to_kusto.sh b/eng/pipelines/perf/scripts/translate_results_to_kusto.sh
index 5d26a77300..29169ff8b4 100755
--- a/eng/pipelines/perf/scripts/translate_results_to_kusto.sh
+++ b/eng/pipelines/perf/scripts/translate_results_to_kusto.sh
@@ -27,6 +27,9 @@
 ####################################################################################################
 set -euo pipefail
 
+# Keep the checkout clean: never let the helper scripts drop __pycache__/*.pyc into eng/.
+export PYTHONDONTWRITEBYTECODE=1
+
 repoDir="${REPO_DIR:?REPO_DIR must be set}"
 resultsDir="${RESULTS_DIR:?RESULTS_DIR must be set}"
 kustoOut="${KUSTO_OUT:?KUSTO_OUT must be set}"
diff --git a/eng/pipelines/perf/sqlclient-perf-pipeline.yml b/eng/pipelines/perf/sqlclient-perf-pipeline.yml
index 08384796ca..c2e18fd445 100644
--- a/eng/pipelines/perf/sqlclient-perf-pipeline.yml
+++ b/eng/pipelines/perf/sqlclient-perf-pipeline.yml
@@ -331,6 +331,9 @@ extends:
             scriptsDir="$(Build.SourcesDirectory)/dotnet-sqlclient/eng/pipelines/perf/scripts"
             kustoOut="$(Build.ArtifactStagingDirectory)/kusto"
 
+            # Keep the checkout clean: no __pycache__/*.pyc written into eng/.
+            export PYTHONDONTWRITEBYTECODE=1
+
             # PEP 668: Ubuntu agents ship an "externally managed" Python and lack the
             # python3-venv package (no ensurepip), so both a plain 'pip install' and
             # 'python3 -m venv' fail. pip itself is available, so install the Kusto SDKs

From 368e5acc06cf7a995209afe67fb9200b037a4980 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Wed, 19 Aug 2026 10:56:05 +0530
Subject: [PATCH 232/298] Perf | Reduce async read memory allocations by
 recycling StateSnapshot packet nodes (#4536)

* Recycle StateSnapshot packet nodes to fix async read allocation regression

StateSnapshot allocates a PacketData node for every packet appended during an
async read. A prior refactor made PacketData immutable, so ResetSnapshot and
ClearPackets dropped every node and each subsequent async read re-allocated the
whole chain. This showed up as a large allocation regression against 6.1.6.

Restore node reuse by making the buffer/read fields mutable again and keeping a
bounded (16 entry) free list on StateSnapshot. Nodes never own the packet
buffers, so Reset only drops this node's references to them.

Measured with the perf suite at UseOptimizedAsyncBehaviour: false, against the
6.1.6 baseline:

  SqlCommand/ExecuteReaderAsync             +121.7% -> -0.1%
  MarsOverhead/ExecuteReaderAsyncWithMars   +120.6% -> -0.1%
  DataTypeReaderAsync/NVarCharAsync          +20.9% -> +2.3%
  DataTypeReaderAsync/VarCharAsync           +19.2% -> +0.5%
  DataTypeReaderAsync/XmlAsync               +16.5% -> +1.4%
  SqlCommand/ExecuteScalarAsync              +11.5% -> +1.2%

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 106641f4-0370-4a71-a4ca-41f366556fae

* Address review feedback on packet node recycling

- PacketData(byte[], int) now delegates to Initialize so a new node and a
  recycled one share a single initialization path. Keeping them separate is
  how the RunningDataSize reset was missed before.
- Extract ReturnPacket(PacketData) to mirror RentPacket, and document that
  Reset must run before the node is linked because NextPacket doubles as the
  free list link.
- Document MaxSparePacketCount: the value is empirical, bounded at roughly
  900 bytes retained per state object.
- Note in CaptureAsStart that routing through ClearPackets also clears
  _continuePacket, which the assignments it replaced did not.
- Add StateSnapshotPacketRecyclingTests covering the free list: the #3519
  RunningDataSize guard, full state release on parked nodes, the bound and
  its tracked count, that no node is shared between the live chain and the
  free list, and that the rebuilt chain keeps its links intact.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 106641f4-0370-4a71-a4ca-41f366556fae

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 106641f4-0370-4a71-a4ca-41f366556fae
---
 .../Data/SqlClient/TdsParserStateObject.cs    | 128 +++++-
 .../StateSnapshotPacketRecyclingTests.cs      | 366 ++++++++++++++++++
 2 files changed, 488 insertions(+), 6 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/StateSnapshotPacketRecyclingTests.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
index b3b6becbdf..6d82040ca6 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
@@ -4653,8 +4653,10 @@ internal sealed partial class StateSnapshot
         {
             private sealed partial class PacketData
             {
-                public readonly byte[] Buffer;
-                public readonly int Read;
+                // These are mutable so that instances can be recycled through the snapshot's
+                // free list instead of allocating a new node for every packet that is appended.
+                public byte[] Buffer;
+                public int Read;
 
                 public PacketData NextPacket;
                 public PacketData PrevPacket;
@@ -4666,9 +4668,38 @@ private sealed partial class PacketData
                 public int RunningDataSize;
 
                 public PacketData(byte[] buffer, int read)
+                {
+                    // Delegate so that a freshly allocated node and a recycled one are initialized
+                    // by exactly one piece of code. Keeping these paths separate is how the
+                    // RunningDataSize reset was missed previously.
+                    Initialize(buffer, read);
+                }
+
+                /// <summary>
+                /// Re-initializes an instance taken from the free list so that it describes a new packet.
+                /// </summary>
+                public void Initialize(byte[] buffer, int read)
                 {
                     Buffer = buffer;
                     Read = read;
+                    NextPacket = null;
+                    PrevPacket = null;
+                    RunningDataSize = 0;
+                    ResetDebugState();
+                }
+
+                /// <summary>
+                /// Releases all references held by this instance before it is placed on the free list
+                /// so that recycling a node cannot keep a packet buffer alive.
+                /// </summary>
+                public void Reset()
+                {
+                    Buffer = null;
+                    Read = 0;
+                    NextPacket = null;
+                    PrevPacket = null;
+                    RunningDataSize = 0;
+                    ResetDebugState();
                 }
 
                 public int PacketID => Packet.GetIDFromHeader(Buffer.AsSpan(0, TdsEnums.HEADER_LEN));
@@ -4698,10 +4729,13 @@ internal int GetPacketDataSize()
 
                 internal void CheckDebugDataHash() => CheckDebugDataHashImpl();
 
+                internal void ResetDebugState() => ResetDebugStateImpl();
+
                 partial void SetDebugStackImpl(string value);
                 partial void SetDebugPacketIdImpl(int value);
                 partial void SetDebugDataHashImpl();
                 partial void CheckDebugDataHashImpl();
+                partial void ResetDebugStateImpl();
             }
 
 #if DEBUG
@@ -4845,6 +4879,13 @@ public string Status
 
                 partial void SetDebugPacketIdImpl(int value) => DebugPacketId = value;
 
+                partial void ResetDebugStateImpl()
+                {
+                    DebugPacketId = 0;
+                    Stack = null;
+                    Hash = null;
+                }
+
                 partial void SetDebugDataHashImpl()
                 {
                     if (Buffer != null)
@@ -4990,6 +5031,25 @@ internal void Restore(TdsParserStateObject stateObj)
             private PacketData _current;
             private PacketData _continuePacket;
 
+            /// <summary>
+            /// Head of a free list of <see cref="PacketData"/> instances, linked through
+            /// <see cref="PacketData.NextPacket"/>. A snapshot is taken and released for every async
+            /// continuation, so recycling these nodes avoids allocating one per packet per replay.
+            /// The list is bounded so that an unusually long replay cannot retain nodes indefinitely.
+            /// </summary>
+            private PacketData _sparePackets;
+            private int _sparePacketCount;
+
+            /// <summary>
+            /// Upper bound on the free list. The value is empirical rather than derived: most
+            /// snapshots hold a single packet, so even a one entry list removes the bulk of the
+            /// allocations, and a larger bound only helps reads that span several packets such as
+            /// large rows or XML and binary columns. 16 was the point past which the read
+            /// benchmarks stopped improving. The cost is bounded at roughly 900 bytes retained per
+            /// state object, and the parked nodes hold no buffer references.
+            /// </summary>
+            private const int MaxSparePacketCount = 16;
+
 #if DEBUG
             private int _packetCounter;
             private int _rollingPend = 0;
@@ -5069,7 +5129,7 @@ internal void AppendPacketData(byte[] buffer, int read)
                     }
                 }
 #endif
-                PacketData packetData = new PacketData(buffer, read);
+                PacketData packetData = RentPacket(buffer, read);
 #if DEBUG
                 packetData.SetDebugStack(_stateObj._lastStack);
                 packetData.SetDebugPacketId(Interlocked.Increment(ref _packetCounter));
@@ -5145,9 +5205,11 @@ internal bool MoveToContinue()
 
             internal void CaptureAsStart(TdsParserStateObject stateObj)
             {
-                _firstPacket = null;
-                _lastPacket = null;
-                _current = null;
+                // Note this also clears _continuePacket, which the assignments this replaced did
+                // not. Every path into here runs Clear() first so the chain is already empty in
+                // practice, but routing through ClearPackets keeps the invariant that no field can
+                // still reference a node once one has been parked on the free list.
+                ClearPackets();
 
                 _stateObj = stateObj;
                 _replayStateData ??= new StateObjectData();
@@ -5257,10 +5319,64 @@ internal void Clear()
 
             private void ClearPackets()
             {
+                PacketData current = _firstPacket;
+
                 _firstPacket = null;
                 _lastPacket = null;
                 _continuePacket = null;
                 _current = null;
+
+                // Every field that can reference a node is cleared above before any node is parked,
+                // so nothing on the free list can also be reachable from the live chain.
+                while (current != null)
+                {
+                    PacketData next = current.NextPacket;
+                    if (!ReturnPacket(current))
+                    {
+                        break;
+                    }
+                    current = next;
+                }
+            }
+
+            /// <summary>
+            /// Places a <see cref="PacketData"/> on the free list when there is room for it, clearing
+            /// every field first so a recycled node cannot carry stale state, or a reference to a
+            /// packet buffer, into its next use. Returns false once the list is full, in which case
+            /// the node is left to the garbage collector.
+            /// </summary>
+            private bool ReturnPacket(PacketData packet)
+            {
+                if (_sparePacketCount >= MaxSparePacketCount)
+                {
+                    return false;
+                }
+
+                // Reset must run before the node is linked in: NextPacket is reused as the free
+                // list link, so clearing it afterwards would truncate the list.
+                packet.Reset();
+                packet.NextPacket = _sparePackets;
+                _sparePackets = packet;
+                _sparePacketCount++;
+                return true;
+            }
+
+            /// <summary>
+            /// Takes a <see cref="PacketData"/> from the free list, or allocates one when the list is empty.
+            /// </summary>
+            private PacketData RentPacket(byte[] buffer, int read)
+            {
+                PacketData packetData = _sparePackets;
+                if (packetData == null)
+                {
+                    return new PacketData(buffer, read);
+                }
+
+                // Read the link before Initialize clears NextPacket.
+                _sparePackets = packetData.NextPacket;
+                _sparePacketCount--;
+                packetData.Initialize(buffer, read);
+                return packetData;
             }
 
             private void ClearState()
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/StateSnapshotPacketRecyclingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/StateSnapshotPacketRecyclingTests.cs
new file mode 100644
index 0000000000..54169dce1e
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/StateSnapshotPacketRecyclingTests.cs
@@ -0,0 +1,366 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests
+{
+    /// <summary>
+    /// Covers the <see cref="TdsParserStateObject.StateSnapshot"/> packet node free list.
+    ///
+    /// A snapshot is taken and released for every async continuation, so the nodes describing the
+    /// captured packets are recycled rather than reallocated. Recycling is only safe if a node
+    /// carries nothing from its previous use; an incomplete reset of <c>RunningDataSize</c> is what
+    /// produced the incorrect offset/length calculations in dotnet/SqlClient#3519.
+    ///
+    /// The nodes and the list are private by design, so these tests reach them by reflection.
+    /// </summary>
+    public sealed class StateSnapshotPacketRecyclingTests
+    {
+        // Must exceed StateSnapshot.MaxSparePacketCount so the bound itself is exercised.
+        private const int MaxSparePacketCount = 16;
+        private const int PacketsPerSnapshot = 20;
+
+        private const int HeaderLength = 8;
+        private const int HeaderLengthFieldOffset = 2;
+
+        #region Tests
+
+        /// <summary>
+        /// Regression guard for dotnet/SqlClient#3519. A node returning from the free list must have
+        /// <c>RunningDataSize</c> cleared, otherwise the first packet of a new snapshot reports a
+        /// running total inherited from the previous snapshot and every offset derived from it is
+        /// wrong.
+        /// </summary>
+        [Fact]
+        public void RecycledNodes_DoNotCarryRunningDataSizeFromPreviousSnapshot()
+        {
+            SnapshotAccessor snapshot = SnapshotAccessor.Create();
+            int[] sizes = { 40, 55, 70, 25 };
+
+            // First snapshot: append packets and accumulate a running total on each node.
+            AppendPackets(snapshot, sizes);
+            AssignRunningDataSizes(snapshot, sizes);
+
+            List<object> firstRound = snapshot.LivePackets();
+            Assert.Equal(sizes.Length, firstRound.Count);
+            // Sanity check that the running totals really were populated, so that finding zeroes
+            // after recycling is meaningful.
+            Assert.Equal(sizes.Sum(), SnapshotAccessor.GetRunningDataSize(firstRound[firstRound.Count - 1]));
+
+            snapshot.ClearPackets();
+
+            // Second snapshot: the nodes are served from the free list.
+            AppendPackets(snapshot, sizes);
+            List<object> secondRound = snapshot.LivePackets();
+
+            Assert.Equal(sizes.Length, secondRound.Count);
+            Assert.NotEmpty(secondRound.Intersect(firstRound, ReferenceComparer.Instance));
+
+            // The defect behind #3519: a recycled node kept its running total, so a freshly
+            // appended packet claimed data that belonged to the previous snapshot.
+            foreach (object packet in secondRound)
+            {
+                Assert.Equal(0, SnapshotAccessor.GetRunningDataSize(packet));
+            }
+
+            // With the totals cleared, the derived offsets and lengths are correct again.
+            AssignRunningDataSizes(snapshot, sizes);
+
+            int expectedOffset = 0;
+            for (int i = 0; i < sizes.Length; i++)
+            {
+                Assert.Equal(expectedOffset, SnapshotAccessor.GetPacketDataOffset(secondRound[i]));
+                Assert.Equal(sizes[i], SnapshotAccessor.GetPacketDataSize(secondRound[i]));
+                expectedOffset += sizes[i];
+            }
+        }
+
+        /// <summary>
+        /// A parked node must hold no packet state at all, in particular no reference to the packet
+        /// buffer, which the snapshot does not own.
+        /// </summary>
+        [Fact]
+        public void ParkedNodes_ReleaseAllPacketState()
+        {
+            SnapshotAccessor snapshot = SnapshotAccessor.Create();
+
+            AppendPackets(snapshot, UniformSizes(PacketsPerSnapshot, 64));
+            AssignRunningDataSizes(snapshot, UniformSizes(PacketsPerSnapshot, 64));
+            snapshot.ClearPackets();
+
+            List<object> spares = snapshot.SparePackets();
+            Assert.NotEmpty(spares);
+
+            foreach (object packet in spares)
+            {
+                Assert.Null(SnapshotAccessor.GetBuffer(packet));
+                Assert.Equal(0, SnapshotAccessor.GetRead(packet));
+                Assert.Equal(0, SnapshotAccessor.GetRunningDataSize(packet));
+                Assert.Null(SnapshotAccessor.GetPrevPacket(packet));
+            }
+        }
+
+        /// <summary>
+        /// The free list is bounded, and its tracked count must stay in step with its real length.
+        /// If the two drift, the list either stops recycling or grows without limit.
+        /// </summary>
+        [Fact]
+        public void FreeList_RespectsBoundAndTracksItsOwnCount()
+        {
+            SnapshotAccessor snapshot = SnapshotAccessor.Create();
+
+            for (int round = 0; round < 5; round++)
+            {
+                AppendPackets(snapshot, UniformSizes(PacketsPerSnapshot, 32));
+                Assert.Equal(0, snapshot.SpareCount);
+
+                snapshot.ClearPackets();
+
+                List<object> spares = snapshot.SparePackets();
+                Assert.Equal(MaxSparePacketCount, spares.Count);
+                Assert.Equal(spares.Count, snapshot.SpareCount);
+                Assert.Equal(spares.Count, spares.Distinct(ReferenceComparer.Instance).Count());
+            }
+        }
+
+        /// <summary>
+        /// The most dangerous failure mode for a free list: a node reachable from both the live
+        /// chain and the free list. Two snapshots would then share a node and silently overwrite
+        /// each other's packet descriptions.
+        /// </summary>
+        [Fact]
+        public void LiveChainAndFreeList_NeverShareANode()
+        {
+            SnapshotAccessor snapshot = SnapshotAccessor.Create();
+
+            for (int round = 0; round < 5; round++)
+            {
+                // Alternate between more and fewer packets than the bound so the list is both
+                // saturated and partially drained across rounds.
+                int count = round % 2 == 0 ? PacketsPerSnapshot : MaxSparePacketCount / 2;
+                AppendPackets(snapshot, UniformSizes(count, 48));
+
+                List<object> live = snapshot.LivePackets();
+                List<object> spares = snapshot.SparePackets();
+
+                Assert.Equal(count, live.Count);
+                Assert.Empty(live.Intersect(spares, ReferenceComparer.Instance));
+                Assert.Equal(live.Count, live.Distinct(ReferenceComparer.Instance).Count());
+
+                snapshot.ClearPackets();
+                Assert.Empty(snapshot.LivePackets());
+            }
+        }
+
+        /// <summary>
+        /// Recycling must not damage the doubly linked chain: replay walks it forwards through
+        /// <c>NextPacket</c> and the offset maths walks it backwards through <c>PrevPacket</c>.
+        /// </summary>
+        [Fact]
+        public void RebuiltChain_HasIntactLinksAfterRecycling()
+        {
+            SnapshotAccessor snapshot = SnapshotAccessor.Create();
+
+            AppendPackets(snapshot, UniformSizes(PacketsPerSnapshot, 16));
+            snapshot.ClearPackets();
+            AppendPackets(snapshot, UniformSizes(PacketsPerSnapshot, 16));
+
+            List<object> live = snapshot.LivePackets();
+            Assert.Equal(PacketsPerSnapshot, live.Count);
+
+            Assert.Null(SnapshotAccessor.GetPrevPacket(live[0]));
+            Assert.Null(SnapshotAccessor.GetNextPacket(live[live.Count - 1]));
+            Assert.Same(live[live.Count - 1], snapshot.LastPacket);
+
+            for (int i = 0; i < live.Count - 1; i++)
+            {
+                Assert.Same(live[i + 1], SnapshotAccessor.GetNextPacket(live[i]));
+                Assert.Same(live[i], SnapshotAccessor.GetPrevPacket(live[i + 1]));
+            }
+        }
+
+        #endregion
+
+        #region Helpers
+
+        private static int[] UniformSizes(int count, int dataLength) =>
+            Enumerable.Repeat(dataLength, count).ToArray();
+
+        private static void AppendPackets(SnapshotAccessor snapshot, int[] dataLengths)
+        {
+            for (int i = 0; i < dataLengths.Length; i++)
+            {
+                // Each packet gets its own buffer: the snapshot permits several packets to share a
+                // buffer only for partial reads, which is not what these tests cover.
+                snapshot.AppendPacketData(CreatePacket(dataLengths[i], (byte)(i + 1)), HeaderLength + dataLengths[i]);
+            }
+        }
+
+        /// <summary>
+        /// Walks the live chain and populates the running totals the way the parser does while
+        /// reading columns, so the offset calculations have real data to work from.
+        /// </summary>
+        private static void AssignRunningDataSizes(SnapshotAccessor snapshot, int[] sizes)
+        {
+            List<object> live = snapshot.LivePackets();
+            for (int i = 0; i < sizes.Length && i < live.Count; i++)
+            {
+                snapshot.SetCurrent(live[i]);
+                snapshot.SetPacketDataSize(sizes[i]);
+            }
+            snapshot.SetCurrent(null);
+        }
+
+        /// <summary>
+        /// Builds a well formed TDS packet. The snapshot asserts in DEBUG that the length in the
+        /// header matches the number of bytes read, so the header cannot be left blank.
+        /// </summary>
+        private static byte[] CreatePacket(int dataLength, byte packetId)
+        {
+            int total = HeaderLength + dataLength;
+            byte[] buffer = new byte[total];
+
+            buffer[0] = 4;                                              // MT_TOKENS
+            buffer[1] = 1;                                              // ST_EOM
+            buffer[HeaderLengthFieldOffset] = (byte)(total >> 8);       // length is big endian and
+            buffer[HeaderLengthFieldOffset + 1] = (byte)(total & 0xFF); // includes the header
+            buffer[6] = packetId;
+
+            for (int i = HeaderLength; i < total; i++)
+            {
+                buffer[i] = (byte)(packetId + i);
+            }
+
+            return buffer;
+        }
+
+        private sealed class ReferenceComparer : IEqualityComparer<object>
+        {
+            internal static readonly ReferenceComparer Instance = new();
+
+            public new bool Equals(object? x, object? y) => ReferenceEquals(x, y);
+
+            public int GetHashCode(object obj) =>
+                System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(obj);
+        }
+
+        /// <summary>
+        /// Reflection wrapper over the private members of <see cref="TdsParserStateObject.StateSnapshot"/>
+        /// and its nested packet node type.
+        /// </summary>
+        private sealed class SnapshotAccessor
+        {
+            private const BindingFlags Instance = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public;
+
+            private static readonly Type s_snapshotType = typeof(TdsParserStateObject.StateSnapshot);
+            private static readonly Type s_packetType = NestedType(s_snapshotType, "PacketData");
+
+            private static readonly FieldInfo s_firstPacket = Field(s_snapshotType, "_firstPacket");
+            private static readonly FieldInfo s_lastPacket = Field(s_snapshotType, "_lastPacket");
+            private static readonly FieldInfo s_current = Field(s_snapshotType, "_current");
+            private static readonly FieldInfo s_sparePackets = Field(s_snapshotType, "_sparePackets");
+            private static readonly FieldInfo s_spareCount = Field(s_snapshotType, "_sparePacketCount");
+            private static readonly FieldInfo s_stateObj = Field(s_snapshotType, "_stateObj");
+            private static readonly MethodInfo s_clearPackets = Method(s_snapshotType, "ClearPackets");
+
+            private static readonly FieldInfo s_buffer = Field(s_packetType, "Buffer");
+            private static readonly FieldInfo s_read = Field(s_packetType, "Read");
+            private static readonly FieldInfo s_next = Field(s_packetType, "NextPacket");
+            private static readonly FieldInfo s_prev = Field(s_packetType, "PrevPacket");
+            private static readonly FieldInfo s_runningDataSize = Field(s_packetType, "RunningDataSize");
+            private static readonly MethodInfo s_getOffset = Method(s_packetType, "GetPacketDataOffset");
+            private static readonly MethodInfo s_getSize = Method(s_packetType, "GetPacketDataSize");
+
+            // These members are private implementation detail, so a rename would silently turn the
+            // tests into no-ops. Fail loudly instead of returning null.
+            private static Type NestedType(Type owner, string name) =>
+                owner.GetNestedType(name, BindingFlags.NonPublic)
+                ?? throw new InvalidOperationException($"{owner.Name} no longer declares a nested type '{name}'.");
+
+            private static FieldInfo Field(Type owner, string name) =>
+                owner.GetField(name, Instance)
+                ?? throw new InvalidOperationException($"{owner.Name} no longer declares a field '{name}'.");
+
+            private static MethodInfo Method(Type owner, string name) =>
+                owner.GetMethod(name, Instance)
+                ?? throw new InvalidOperationException($"{owner.Name} no longer declares a method '{name}'.");
+
+            private readonly TdsParserStateObject.StateSnapshot _snapshot;
+
+            private SnapshotAccessor(TdsParserStateObject.StateSnapshot snapshot) => _snapshot = snapshot;
+
+            internal static SnapshotAccessor Create()
+            {
+                TdsParserStateObject.StateSnapshot snapshot = new();
+
+                // In DEBUG the snapshot records the owning state object's last stack trace on each
+                // appended packet. A real state object needs a live connection, so supply an
+                // allocated but unconstructed instance: only the null valued _lastStack is read.
+                Type concrete = typeof(TdsParserStateObject).Assembly
+                    .GetTypes()
+                    .First(t => !t.IsAbstract && typeof(TdsParserStateObject).IsAssignableFrom(t));
+#if NETFRAMEWORK
+                object stateObj = System.Runtime.Serialization.FormatterServices.GetUninitializedObject(concrete);
+#else
+                object stateObj = System.Runtime.CompilerServices.RuntimeHelpers.GetUninitializedObject(concrete);
+#endif
+                s_stateObj.SetValue(snapshot, stateObj);
+
+                return new SnapshotAccessor(snapshot);
+            }
+
+            internal int SpareCount => (int)s_spareCount.GetValue(_snapshot)!;
+
+            internal object? LastPacket => s_lastPacket.GetValue(_snapshot);
+
+            internal void AppendPacketData(byte[] buffer, int read) => _snapshot.AppendPacketData(buffer, read);
+
+            internal void SetPacketDataSize(int size) => _snapshot.SetPacketDataSize(size);
+
+            internal void SetCurrent(object? packet) => s_current.SetValue(_snapshot, packet);
+
+            internal void ClearPackets() => s_clearPackets.Invoke(_snapshot, null);
+
+            internal List<object> LivePackets() => Walk(s_firstPacket.GetValue(_snapshot));
+
+            internal List<object> SparePackets() => Walk(s_sparePackets.GetValue(_snapshot));
+
+            private static List<object> Walk(object? head)
+            {
+                List<object> packets = new();
+                object? current = head;
+                while (current != null)
+                {
+                    packets.Add(current);
+                    current = GetNextPacket(current);
+
+                    // A cycle would otherwise hang the test run rather than fail it.
+                    Assert.True(packets.Count <= 1024, "packet chain does not terminate");
+                }
+                return packets;
+            }
+
+            internal static byte[]? GetBuffer(object packet) => (byte[]?)s_buffer.GetValue(packet);
+
+            internal static int GetRead(object packet) => (int)s_read.GetValue(packet)!;
+
+            internal static object? GetNextPacket(object packet) => s_next.GetValue(packet);
+
+            internal static object? GetPrevPacket(object packet) => s_prev.GetValue(packet);
+
+            internal static int GetRunningDataSize(object packet) => (int)s_runningDataSize.GetValue(packet)!;
+
+            internal static int GetPacketDataOffset(object packet) => (int)s_getOffset.Invoke(packet, null)!;
+
+            internal static int GetPacketDataSize(object packet) => (int)s_getSize.Invoke(packet, null)!;
+        }
+
+        #endregion
+    }
+}

From b4fe302dd7921abfc2b91b2a11387aa789cbde97 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Wed, 19 Aug 2026 07:55:23 -0700
Subject: [PATCH 233/298] Emit pool metrics and traces, and fix Count semantics
 in ChannelDbConnectionPool (#4504)

* Emit pool metrics and fix Count semantics in ChannelDbConnectionPool

ChannelDbConnectionPool did not emit any of the connection pool counters that
WaitHandleDbConnectionPool emits, and reported Count as the reservation count,
which includes connections that are still being opened.

- Wire the pooled/free connection and soft/hard connect/disconnect counters
  through ChannelDbConnectionPool and IdleConnectionChannel, at the call sites
  matching WaitHandleDbConnectionPool.
- Add ConnectionPoolSlots.ConnectionCount and point Count at it, so Count
  reflects connections that actually belong to the pool. This matches
  WaitHandleDbConnectionPool and fixes the SQL Express user instance path,
  which branches on pool.Count <= 0.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Add pool tracing parity for ChannelDbConnectionPool

Bring ChannelDbConnectionPool's pooler tracing up to parity with
WaitHandleDbConnectionPool: emit a per-reason trace for connections rejected
by the liveness gate, and trace connections held by a transaction, which
otherwise vanish from the trace stream after deactivation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Give connection pools an injectable metrics sink

The pool metric counters lived on a single process-wide SqlClientMetrics
instance, so a unit test could only assert that a counter had advanced by at
least some amount. Unrelated connection activity elsewhere in the process
could always inflate it.

Add a Metrics property to IDbConnectionPool, supplied by an optional
constructor parameter that defaults to the process-wide instance. Route the
counters a pool owns through it: both pool implementations, IdleConnectionChannel,
TransactedConnectionPool, and the pooled-connection branch of
SqlConnectionFactory. Production behavior is unchanged, since every caller
still resolves to the same singleton.

Counters emitted outside the pool stay global. DbConnectionInternal reports
active-connection and stasis counts, and the factory reports non-pooled and
pool-group counts, none of which are attributable to a single pool.

The metric parity tests now give each pool its own counters and assert exact
values instead of lower bounds, which additionally covers the free- and
pooled-connection gauges.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Define the pool metrics seam as an interface

The metric parity tests were gated to .NET because they read the counter
fields reflectively, and those fields are performance counters rather than
longs on .NET Framework. Give SqlClientMetrics an interface and let the tests
supply a recording implementation, so the tests run on every target framework
and the set of counters cannot drift between the two.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Remove trace-message parity tests

These duplicated the metric-parity tests' coverage of pool lifecycle
events without adding an assertable contract; the counters are the
signal we actually want to keep exact.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Fix trace-message class/method references in pool V2

Trace strings in ChannelDbConnectionPool.cs, TransactedConnectionPool.cs,
and PoolPruner.cs were copy-pasted from WaitHandleDbConnectionPool.cs and
referenced the wrong class name (DbConnectionPool) and, in many cases, a
stale method name (e.g. CreateObject, DeactivateObject, DestroyObject,
GetConnection, PutNewObject) left over from the method they were ported
from rather than the method they now live in.

Corrected every TryPoolerTraceEvent call site so its <prov.Class.Method|...>
prefix names the actual enclosing class and method, and gave the one
PoolPruner trace (previously missing a method segment) a proper
PoolPruner.PoolPruner reference since it's emitted from the constructor.

WaitHandleDbConnectionPool.cs's own trace strings are unchanged: they were
not modified by this branch and remain historically correct for that
class's traces.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Adopt new trace message format in pool V2

Convert pool V2's trace strings from the legacy
<prov.Class.Method|TAG|TAG> wrapper to the plain "Class.Method | SEV | "
format used elsewhere in the codebase (e.g. SqlCommand.InternalExecuteNonQuery
| INFO | ...), per the formatting introduced as part of the project merge.
Drops the RES/CPOOL resource-category tags entirely in favor of a single
severity marker (INFO), since none of these traces are errors.

Affects ChannelDbConnectionPool.cs, TransactedConnectionPool.cs, and
PoolPruner.cs. Message text and arguments are unchanged, only the
class/method/severity prefix syntax.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Simplify pool V2 trace call sites

Inline the TraceNotLive helper directly into each IsLiveConnection
rejection branch. The indirection obscured which specific check failed
at the call site and added an extra frame for no real benefit over four
short, self-contained trace calls.

Also fix stack-flavored wording ("Popped"/"Pushing... to general pool")
left over from the wait-handle pool's stack-based implementation.
ChannelDbConnectionPool uses a Channel<T>, not a stack, so
GetIdleConnection/PutConnectionInIdleChannel now read "Read from idle
channel"/"Writing to idle channel" instead.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Add missing coverage traces for warmup and connection retrieval

RequestWarmup only traced the failure-to-schedule path; add a trace on
successful scheduling so a warmup pass is visible from start to finish.

RunWarmupLoopAsync had no start-of-loop trace and no summary of how many
connections it actually warmed up; add both, including the count on the
absorbed-exception path.

GetInternalConnection traced entry, timeout, and shutdown, but never a
success line; add one once a connection is obtained and prepared.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Feed connection metrics through DbConnectionInternal's constructor

Decouple the metrics sink DbConnectionInternal reports to from Pool: it
is not inherently tied to a pool instance, and a connection need not be
pooled at all. Metrics is now a readonly property set via a new
constructor overload, defaulting to the process-wide instance when
none is supplied. SqlConnectionInternal threads its own metrics
parameter down to the base constructor, and SqlConnectionFactory passes
its injected Metrics instance at both construction sites instead of
assigning the property after construction.

Rename ChannelDbConnectionPoolInstrumentationTest ->
DbConnectionPoolInstrumentationTest since it already covers both
ChannelDbConnectionPool and WaitHandleDbConnectionPool, parameterized
over PoolImplementation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Avoid duplicating base constructor defaults; drop dead pool helper

Add a metrics-only DbConnectionInternal(ISqlClientMetrics) constructor
that delegates to the existing this(ConnectionState.Open, true, false,
metrics) constructor, so SqlConnectionInternal and StubDbConnectionInternal
call base(metrics) instead of re-stating the ConnectionState.Open, true,
false defaults inline.

Remove the unused ChannelDbConnectionPool-only ConstructPool overload
and its ConcurrencyLimiter/RateLimiting using from
DbConnectionPoolInstrumentationTest.cs: every test call site already
uses the PoolImplementation-parameterized overload added when
WaitHandle coverage was introduced.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Clean up test file structure.

* Balance soft and hard disconnects when replacing a connection

ReplaceConnection vends a new connection to the caller and destroys the one it
displaced. Both pools counted the soft connect for the replacement but nothing
for the retirement, so active-soft-connects drifted up by one per replacement
and never came back down. The wait handle pool also disposed the old connection
directly rather than through its destroy path, leaking active-hard-connections
the same way.

Emit a soft disconnect and a hard disconnect for the retired connection in both
pools, and parameterize the instrumentation test over both implementations. The
pooled-connection gauge still differs: the channel pool reuses the old slot,
while the wait handle pool never emits the matching decrement.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Balance the pooled-connection gauge when replacing a connection

CreateObject swaps the replacement into the old connection's place in the pool's
object list, but only incremented the pooled-connection gauge. The removal had no
matching decrement, so number-of-pooled-connections drifted up by one per
replacement. ReplaceConnection is the only caller that passes an old connection,
so this is scoped to replacement.

Both pools now report the same counters for a replacement, so the instrumentation
test no longer needs a per-implementation expectation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review feedback on metrics routing, sizing, and shared traces

- Route the remaining DbConnectionInternal counters (hard disconnect, non-pooled
  exit, stasis enter/exit) through the instance metrics sink instead of the
  global one. This is a no-op in production, where the factory hands every
  connection the process-wide instance, but it lets a test observe them.
- Emit a hard disconnect when ConnectionPoolSlots.Add fails after opening a
  connection. The connection was counted as a hard connect and then disposed
  without a matching decrement.
- Stop marking the slot counters volatile and read them through Volatile.Read
  instead. They are only mutated through Interlocked, but they are also read
  outside it, including in the TryReserve spin loop.
- Gate warmup on ReservationCount rather than Count, matching the max-pool-size
  gate and the pruner. Count excludes in-flight creations, so warmup created
  duplicates for connections other threads were already opening.
- Restore the original trace format in TransactedConnectionPool and PoolPruner.
  Both are shared with the wait handle pool, so reformatting them would change
  v1's trace stream. PoolPruner is now unchanged from main.
- Document why pools take a metrics sink independently of the connection
  factory, and note the Count vs ReservationCount convention.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Balance connection counters when activation fails

Both pools activated a connection before counting the checkout, and
DbConnectionInternal counted the active connection after calling Activate while
DeactivateConnection counts before calling Deactivate. When activation failed,
the pool returned the connection and deactivated it, emitting a soft disconnect
and an active-connection exit with nothing to pair against. Both gauges went
negative.

Count the checkout before activating in both pools, and make ActivateConnection
symmetric with DeactivateConnection. The wait handle pool also counted a soft
connect when it vended no connection at all; that is now scoped to the branch
that actually hands one out.

Adds two tests, both parameterized over the two pools:
- a failed activation leaves every counter balanced
- concurrent checkout and return settles all gauges to a consistent resting
  state, with nothing outstanding and no connection leaked or double counted

The failed-activation test is what surfaced the negative gauges. Replaces the
dead FailingSqlConnectionFactory with a fake that opens successfully and fails
to activate.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Add coverage for the counters emitted when idle connections are pruned

Pruning destroys a connection that no caller holds, so it must record a hard
disconnect and decrement the pooled and free gauges while leaving the soft
counters alone. Channel pool only: the wait handle pool reclaims idle
connections through a different mechanism.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Keep the new trace format in PoolPruner

PoolPruner is constructed only by ChannelDbConnectionPool and its constructor is
typed to it, so it is not shared with the wait handle pool and reformatting its
trace does not change v1's trace stream.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Add unit coverage for the stasis connection counter

The stasis gauge had no unit coverage. FakeSqlClientMetrics exposed it, but
AssertCounters only ever asserted zero, and the existing stasis tests assert pool
state rather than metrics. The only test asserting a non-zero value was
MetricsTest.StasisCounters_Functional, which needs a live server and covers just
the non-pooled CloseConnection path.

Promotes stasisConnections to an AssertCounters parameter and covers all three
ways a pool puts a connection in stasis, plus both ways it leaves:

- a non-poolable transaction root on return, both pools
- a transaction root returned to a shut down pool, both pools
- the wait handle idle sweep aging out a free transaction root, which is the
  only case that exits stasis back into general circulation rather than being
  destroyed

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Data/ProviderBase/DbConnectionInternal.cs |  44 +-
 .../Connection/SqlConnectionInternal.cs       |   5 +-
 .../ConnectionPool/ChannelDbConnectionPool.cs | 259 +++++-
 .../ConnectionPool/ConnectionPoolSlots.cs     |  24 +-
 .../ConnectionPool/IDbConnectionPool.cs       |  17 +
 .../ConnectionPool/IdleConnectionChannel.cs   |  12 +-
 .../SqlClient/ConnectionPool/PoolPruner.cs    |   2 +-
 .../TransactedConnectionPool.cs               |  10 +-
 .../WaitHandleDbConnectionPool.cs             |  58 +-
 .../Diagnostics/ISqlClientMetrics.cs          | 135 +++
 .../SqlClient/Diagnostics/SqlClientMetrics.cs | 140 +--
 .../Data/SqlClient/SqlConnectionFactory.cs    |  33 +-
 .../ChannelDbConnectionPoolTest.cs            |  29 +-
 .../DbConnectionPoolInstrumentationTest.cs    | 830 ++++++++++++++++++
 .../ConnectionPool/FakeSqlClientMetrics.cs    | 132 +++
 .../TransactedConnectionPoolTest.cs           |  63 +-
 16 files changed, 1592 insertions(+), 201 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/ISqlClientMetrics.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolInstrumentationTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/FakeSqlClientMetrics.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
index 00df93f788..338f0e65e9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
@@ -12,6 +12,7 @@
 using Microsoft.Data.Common;
 using Microsoft.Data.SqlClient;
 using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Data.SqlClient.Diagnostics;
 using Microsoft.Data.SqlClient.Internal;
 
 #if NETFRAMEWORK
@@ -75,8 +76,20 @@ protected DbConnectionInternal() : this(ConnectionState.Open, true, false)
         {
         }
 
+        // Constructor for internal connections that report to a specific metrics sink, reusing
+        // the same defaults as the parameterless constructor above.
+        protected DbConnectionInternal(ISqlClientMetrics metrics) : this(ConnectionState.Open, true, false, metrics)
+        {
+        }
+
         // Constructor for internal connections
         internal DbConnectionInternal(ConnectionState state, bool hidePassword, bool allowSetConnectionString)
+            : this(state, hidePassword, allowSetConnectionString, metrics: null)
+        {
+        }
+
+        // Constructor for internal connections
+        internal DbConnectionInternal(ConnectionState state, bool hidePassword, bool allowSetConnectionString, ISqlClientMetrics metrics)
         {
             AllowSetConnectionString = allowSetConnectionString;
             ShouldHidePassword = hidePassword;
@@ -87,6 +100,7 @@ internal DbConnectionInternal(ConnectionState state, bool hidePassword, bool all
             // Without this initialization, ReturnedTime would default to DateTime.MinValue, which would cause
             // IsLiveConnection to immediately evict every new connection whenever IdleTimeout is configured.
             ReturnedTime = CreateTime;
+            Metrics = metrics ?? SqlClientDiagnostics.Metrics;
         }
 
         #region Properties
@@ -179,6 +193,16 @@ internal bool IsInPool
         /// </summary>
         internal IDbConnectionPool Pool { get; private set; }
 
+        /// <summary>
+        /// The metrics sink this connection reports its activation state to. Supplied by the
+        /// <see cref="SqlConnectionFactory"/> that created this connection, from its own injected
+        /// instance, rather than derived from <see cref="Pool"/>: the metrics sink is not
+        /// inherently tied to a pool, and a connection is not necessarily pooled at all. Defaults
+        /// to the process-wide instance when no metrics sink is supplied to the constructor (e.g.
+        /// a test double constructed directly), so it still reports somewhere.
+        /// </summary>
+        internal ISqlClientMetrics Metrics { get; }
+
         public abstract string ServerVersion { get; }
 
         public virtual ConnectionCapabilities Capabilities => null;
@@ -366,9 +390,13 @@ internal void ActivateConnection(Transaction transaction)
             // the Activate method publicly.
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionInternal.ActivateConnection|RES|INFO|CPOOL> {0}, Activating", ObjectID);
 
-            Activate(transaction);
+            // Counted before Activate, mirroring DeactivateConnection, which counts before
+            // Deactivate. If Activate throws, the pool returns the connection and deactivates it,
+            // so counting afterwards would leave that exit unpaired and drive the
+            // active-connections gauge negative.
+            Metrics.EnterActiveConnection();
 
-            SqlClientDiagnostics.Metrics.EnterActiveConnection();
+            Activate(transaction);
         }
 
         internal void AddWeakReference(object value, int tag)
@@ -481,7 +509,7 @@ internal virtual void CloseConnection(DbConnection owningObject, SqlConnectionFa
                             // and transactions may not get cleaned up...
                             Deactivate();
 
-                            SqlClientDiagnostics.Metrics.HardDisconnectRequest();
+                            Metrics.HardDisconnectRequest();
 
                             // To prevent an endless recursion, we need to clear the owning object
                             // before we call dispose so that we can't get here a second time...
@@ -496,7 +524,7 @@ internal virtual void CloseConnection(DbConnection owningObject, SqlConnectionFa
                             }
                             else
                             {
-                                SqlClientDiagnostics.Metrics.ExitNonPooledConnection();
+                                Metrics.ExitNonPooledConnection();
                                 Dispose();
                             }
                         }
@@ -522,7 +550,7 @@ internal void DeactivateConnection()
             // the Deactivate method publicly.
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionInternal.DeactivateConnection|RES|INFO|CPOOL> {0}, Deactivating", ObjectID);
 
-            SqlClientDiagnostics.Metrics.ExitActiveConnection();
+            Metrics.ExitActiveConnection();
 
             if (!IsConnectionDoomed && Pool.UseLoadBalancing)
             {
@@ -582,7 +610,7 @@ internal virtual void DelegatedTransactionEnded()
                 // once and for all, or the server will have fits about us
                 // leaving connections open until the client-side GC kicks
                 // in.
-                SqlClientDiagnostics.Metrics.ExitNonPooledConnection();
+                Metrics.ExitNonPooledConnection();
 
                 Dispose();
             }
@@ -812,7 +840,7 @@ internal void SetInStasis()
             IsTxRootWaitingForTxEnd = true;
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionInternal.SetInStasis|RES|CPOOL> {0}, Non-Pooled Connection has Delegated Transaction, waiting to Dispose.", ObjectID);
 
-            SqlClientDiagnostics.Metrics.EnterStasisConnection();
+            Metrics.EnterStasisConnection();
         }
 
         /// <remarks>
@@ -998,7 +1026,7 @@ private void TerminateStasis(bool returningToPool)
                 : "Delegated Transaction has ended, connection is closed/leaked.  Disposing.";
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionInternal.TerminateStasis|RES|CPOOL> {0}, {1}", ObjectID, message);
 
-            SqlClientDiagnostics.Metrics.ExitStasisConnection();
+            Metrics.ExitStasisConnection();
 
             IsTxRootWaitingForTxEnd = false;
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index 408564f855..e43c3ecebe 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -15,6 +15,7 @@
 using Microsoft.Data.Common;
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Data.SqlClient.Diagnostics;
 using Microsoft.Data.SqlClient.Internal;
 using Microsoft.Data.SqlClient.Utilities;
 using IsolationLevel = System.Data.IsolationLevel;
@@ -306,7 +307,9 @@ internal SqlConnectionInternal(
             string accessToken = null,
             IDbConnectionPool pool = null,
             Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> accessTokenCallback = null,
-            SspiContextProvider sspiContextProvider = null)
+            SspiContextProvider sspiContextProvider = null,
+            ISqlClientMetrics metrics = null)
+            : base(metrics)
         {
             Debug.Assert(connectionOptions is not null, "null connectionOptions");
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 9f75c50c1a..09fe3a1c2d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -14,6 +14,7 @@
 using System.Transactions;
 using Microsoft.Data.Common;
 using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.Diagnostics;
 using static Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolState;
 using Microsoft.Data.SqlClient.Internal;
 
@@ -163,16 +164,20 @@ internal ChannelDbConnectionPool(
             DbConnectionPoolIdentity identity,
             DbConnectionPoolProviderInfo connectionPoolProviderInfo,
             ConcurrencyLimiter? connectionCreationRateLimiter = null,
-            TimeProvider? timeProvider = null)
+            TimeProvider? timeProvider = null,
+            ISqlClientMetrics? metrics = null)
         {
             ConnectionFactory = connectionFactory;
+            // metrics is injected only by tests, so a pool's counters can be asserted without
+            // interference from unrelated connection activity elsewhere in the process.
+            Metrics = metrics ?? SqlClientDiagnostics.Metrics;
             PoolGroup = connectionPoolGroup;
             PoolGroupOptions = connectionPoolGroup.PoolGroupOptions;
             ProviderInfo = connectionPoolProviderInfo;
             Identity = identity;
             AuthenticationContexts = new();
             MaxPoolSize = Convert.ToUInt32(PoolGroupOptions.MaxPoolSize);
-            TransactedConnectionPool = new(this);
+            TransactedConnectionPool = new(this, Metrics);
             _connectionCreationRateLimiter = connectionCreationRateLimiter;
             // timeProvider is injected only by tests so idle-timeout expiry and the blocking-period
             // exit timer can be driven deterministically; in production it is null and falls back to
@@ -180,7 +185,7 @@ internal ChannelDbConnectionPool(
             _timeProvider = timeProvider ?? TimeProvider.System;
 
             _connectionSlots = new(MaxPoolSize);
-            _idleChannel = new();
+            _idleChannel = new(Metrics);
             if (PoolGroup.IsBlockingPeriodEnabled())
             {
                 _errorState = new BlockingPeriodErrorState(_instanceId, timeProvider: _timeProvider);
@@ -197,6 +202,12 @@ internal ChannelDbConnectionPool(
             }
 
             State = Running;
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "ChannelDbConnectionPool.ChannelDbConnectionPool | INFO | {0}, Constructed. MinPoolSize={1}, MaxPoolSize={2}",
+                Id,
+                MinPoolSize,
+                MaxPoolSize);
         }
 
         #region Properties
@@ -209,7 +220,24 @@ public ConcurrentDictionary<
         public SqlConnectionFactory ConnectionFactory { get; }
 
         /// <inheritdoc />
-        public int Count => _connectionSlots.ReservationCount;
+        public ISqlClientMetrics Metrics { get; }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// Reports connections that actually belong to the pool, not
+        /// <see cref="ConnectionPoolSlots.ReservationCount"/>, which also counts reservations held
+        /// for connections that are still being opened. The distinction matters to the SQL Express
+        /// user instance path in <see cref="SqlConnectionFactory.CreateConnection"/>: it treats
+        /// <c>Count &lt;= 0</c> as "nothing in the pool yet", opens a probe connection, and caches the
+        /// resolved instance name on the pool's provider info. Counting an in-flight open here sends
+        /// the first caller down the cached branch instead, where it reads an instance name that
+        /// nothing has set yet.
+        ///
+        /// Internal sizing decisions (the max-pool-size gate, warmup, and pruning) all use
+        /// <see cref="ConnectionPoolSlots.ReservationCount"/> instead, so that connections another
+        /// thread is currently opening count toward the pool's size.
+        /// </remarks>
+        public int Count => _connectionSlots.ConnectionCount;
 
         /// <inheritdoc />
         public int IdleCount => _idleChannel.Count;
@@ -278,7 +306,7 @@ public ConcurrentDictionary<
         public void Clear()
         {
             SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.Clear|RES|CPOOL> {0}, Clearing.", Id);
+                "ChannelDbConnectionPool.Clear | INFO | {0}, Clearing.", Id);
 
             // Clearing the pool implies the caller wants a clean slate, so abandon any cached
             // error state. FR-011.
@@ -292,7 +320,7 @@ public void Clear()
             if (Interlocked.CompareExchange(ref _isClearing, 1, 0) == 1)
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.Clear|RES|CPOOL> {0}, Skip drain, already clearing.", Id);
+                    "ChannelDbConnectionPool.Clear | INFO | {0}, Skip drain, already clearing.", Id);
                 return;
             }
 
@@ -319,7 +347,7 @@ public void Clear()
             }
 
             SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.Clear|RES|CPOOL> {0}, Cleared.", Id);
+                "ChannelDbConnectionPool.Clear | INFO | {0}, Cleared.", Id);
         }
 
         /// <inheritdoc />
@@ -339,7 +367,7 @@ public void PutObjectFromTransactedPool(DbConnectionInternal connection)
             if (State is Running && connection.CanBePooled)
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.PutObjectFromTransactedPool|RES|CPOOL> {0}, Connection {1}, Transaction has ended; returning connection to pool.",
+                    "ChannelDbConnectionPool.PutObjectFromTransactedPool | INFO | {0}, Connection {1}, Transaction has ended; returning connection to pool.",
                     Id,
                     connection.ObjectID);
 
@@ -360,7 +388,7 @@ public void PutObjectFromTransactedPool(DbConnectionInternal connection)
             else
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.PutObjectFromTransactedPool|RES|CPOOL> {0}, Connection {1}, Transaction has ended; destroying unpoolable connection.",
+                    "ChannelDbConnectionPool.PutObjectFromTransactedPool | INFO | {0}, Connection {1}, Transaction has ended; destroying unpoolable connection.",
                     Id,
                     connection.ObjectID);
 
@@ -377,7 +405,7 @@ public DbConnectionInternal ReplaceConnection(
             TimeoutTimer timeout)
         {
             SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.ReplaceConnection|RES|CPOOL> {0}, replacing connection.", Id);
+                "ChannelDbConnectionPool.ReplaceConnection | INFO | {0}, replacing connection.", Id);
 
             // First, prefer to get an idle connection from the pool. 
             // If one is available, we can avoid the cost of creating a new connection.
@@ -474,6 +502,11 @@ public DbConnectionInternal ReplaceConnection(
                     }
 
                     newConnection.Dispose();
+
+                    // The physical connection was opened (and counted by HardConnectRequest in the
+                    // factory) before activation failed, so balance the counter here. The
+                    // connection never occupied a slot, so the pooled gauge is untouched.
+                    Metrics.HardDisconnectRequest();
                     throw;
                 }
 
@@ -483,12 +516,25 @@ public DbConnectionInternal ReplaceConnection(
                 // Only retire the old connection after the replacement is fully activated and we know we won't fail.
                 oldConnection.DeactivateConnection();
                 oldConnection.Dispose();
+
+                // The replacement took over the old connection's slot, so the pooled gauge is
+                // already correct. The old connection was vended to the caller and is now destroyed
+                // rather than returned, so balance both the soft gauge (it was counted as a
+                // checkout) and the hard gauge (its physical connection is going away). Traced as a
+                // destroy so the connection's exit is visible in the pooler trace stream.
+                Metrics.SoftDisconnectRequest();
+                Metrics.HardDisconnectRequest();
+
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.ReplaceConnection | INFO | {0}, Connection {1}, Disposed.",
+                    Id,
+                    oldConnection.ObjectID);
             }
 
-            SqlClientDiagnostics.Metrics.SoftConnectRequest();
+            Metrics.SoftConnectRequest();
 
             SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.ReplaceConnection|RES|CPOOL> {0}, connection replaced successfully.", Id);
+                "ChannelDbConnectionPool.ReplaceConnection | INFO | {0}, connection replaced successfully.", Id);
 
             return newConnection;
         }
@@ -496,10 +542,12 @@ public DbConnectionInternal ReplaceConnection(
         /// <inheritdoc />
         public void ReturnInternalConnection(DbConnectionInternal connection, DbConnection owningObject)
         {
+            Metrics.SoftDisconnectRequest();
+
             ValidateOwnershipAndSetPoolingState(connection, owningObject);
 
             SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.DeactivateObject|RES|CPOOL> {0}, Connection {1}, Deactivating.",
+                "ChannelDbConnectionPool.ReturnInternalConnection | INFO | {0}, Connection {1}, Deactivating.",
                 Id,
                 connection.ObjectID);
 
@@ -579,7 +627,13 @@ public void ReturnInternalConnection(DbConnectionInternal connection, DbConnecti
                 case ReturnDisposition.HeldByTransaction:
                     // Nothing further to do. The connection is parked in the transacted store or
                     // in stasis, and comes back through PutObjectFromTransactedPool once its
-                    // transaction ends.
+                    // transaction ends. Neither path returns it to the idle channel, so without
+                    // this trace the connection simply disappears from the pool's trace stream
+                    // after deactivation.
+                    SqlClientEventSource.Log.TryPoolerTraceEvent(
+                        "ChannelDbConnectionPool.ReturnInternalConnection | INFO | {0}, Connection {1}, Held by a transaction; not returned to the general pool.",
+                        Id,
+                        connection.ObjectID);
                     break;
             }
         }
@@ -645,6 +699,11 @@ private void PutConnectionInIdleChannel(DbConnectionInternal connection, bool pr
                 return;
             }
 
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "ChannelDbConnectionPool.PutConnectionInIdleChannel | INFO | {0}, Connection {1}, Writing to idle channel.",
+                Id,
+                connection.ObjectID);
+
             if (!_idleChannel.TryWrite(connection))
             {
                 // The channel has been completed (pool is shutting down). Race window
@@ -663,7 +722,7 @@ public void Shutdown()
             }
 
             SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.Shutdown|RES|INFO|CPOOL> {0}", Id);
+                "ChannelDbConnectionPool.Shutdown | INFO | {0}", Id);
 
             // Transition to ShuttingDown. After this point, ReturnInternalConnection
             // routes returning connections to RemoveConnection.
@@ -686,7 +745,7 @@ public void Shutdown()
             catch (Exception ex)
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, _warmupCts.Cancel threw, continuing shutdown: {1}", Id, ex);
+                    "ChannelDbConnectionPool.Shutdown | INFO | {0}, _warmupCts.Cancel threw, continuing shutdown: {1}", Id, ex);
             }
 
             // Each cleanup step is independent and best-effort. A failure in one step must not
@@ -703,7 +762,7 @@ public void Shutdown()
             catch (Exception ex)
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, Pruner.Dispose threw, continuing shutdown: {1}", Id, ex);
+                    "ChannelDbConnectionPool.Shutdown | INFO | {0}, Pruner.Dispose threw, continuing shutdown: {1}", Id, ex);
             }
 
             // Dispose the error state so its exit timer is released. Otherwise a timer scheduled
@@ -716,7 +775,7 @@ public void Shutdown()
             catch (Exception ex)
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, _errorState.Dispose threw, continuing shutdown: {1}", Id, ex);
+                    "ChannelDbConnectionPool.Shutdown | INFO | {0}, _errorState.Dispose threw, continuing shutdown: {1}", Id, ex);
             }
 
             // Complete the channel writer so:
@@ -737,7 +796,7 @@ public void Shutdown()
             catch (Exception ex)
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, Clear threw, continuing shutdown: {1}", Id, ex);
+                    "ChannelDbConnectionPool.Shutdown | INFO | {0}, Clear threw, continuing shutdown: {1}", Id, ex);
             }
 
             // Clear() may short-circuit if another caller is already draining. Because the
@@ -759,7 +818,7 @@ public void Shutdown()
                 catch (Exception ex)
                 {
                     SqlClientEventSource.Log.TryPoolerTraceEvent(
-                        "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, RemoveConnection threw during drain, continuing: {1}", Id, ex);
+                        "ChannelDbConnectionPool.Shutdown | INFO | {0}, RemoveConnection threw during drain, continuing: {1}", Id, ex);
                 }
             }
 
@@ -777,7 +836,7 @@ public void Shutdown()
             catch (Exception ex)
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.Shutdown|RES|CPOOL> {0}, _warmupCts.Dispose threw, continuing shutdown: {1}", Id, ex);
+                    "ChannelDbConnectionPool.Shutdown | INFO | {0}, _warmupCts.Dispose threw, continuing shutdown: {1}", Id, ex);
             }
         }
 
@@ -794,7 +853,7 @@ public void Startup()
             // via UpdateTimer() calls from OpenNewInternalConnection and RemoveConnection as the
             // pool grows/shrinks.
             SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.Startup|RES|INFO|CPOOL> {0}", Id);
+                "ChannelDbConnectionPool.Startup | INFO | {0}", Id);
 
             // Kick off background warmup so the pool pre-creates connections up to MinPoolSize
             // without blocking the caller (Story 1). No-op when MinPoolSize == 0.
@@ -807,7 +866,7 @@ public void TransactionEnded(Transaction transaction, DbConnectionInternal trans
             // Note: the connection may still be associated with the transaction due to the explicit
             // unbinding requirement.
             SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.TransactionEnded|RES|CPOOL> {0}, Transaction {1}, Connection {2}, Transaction Completed",
+                "ChannelDbConnectionPool.TransactionEnded | INFO | {0}, Transaction {1}, Connection {2}, Transaction Completed",
                 Id,
                 transaction.GetHashCode(),
                 transactedObject.ObjectID);
@@ -841,7 +900,7 @@ public bool TryGetConnection(
             if (State is not Running)
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.TryGetConnection|RES|CPOOL> {0}, State != Running.", Id);
+                    "ChannelDbConnectionPool.TryGetConnection | INFO | {0}, State != Running.", Id);
                 connection = null;
                 return true;
             }
@@ -979,8 +1038,17 @@ public bool TryGetConnection(
             // pool, whose replenishment enters/clears the same error state as user requests. In
             // practice the warmup loop already stands down before reaching here (its loop condition
             // checks ErrorOccurred); this covers the narrow race where the state flips in between.
+            if (ErrorOccurred)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.OpenNewInternalConnection | INFO | {0}, Errors are set.", Id);
+            }
+
             _errorState?.ThrowIfActive();
 
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "ChannelDbConnectionPool.OpenNewInternalConnection | INFO | {0}, Creating new connection.", Id);
+
             try
             {
                 // Reserve a pool slot up front so we don't pay the rate-limit cost only to
@@ -1017,6 +1085,9 @@ public bool TryGetConnection(
                                 // TODO: When we fail to acquire a lease, surface the lease metadata
                                 // (e.g. RateLimitMetadataName.RetryAfter, ReasonPhrase) in the error
                                 // path so the user can identify why the lease was denied.
+                                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                                    "ChannelDbConnectionPool.OpenNewInternalConnection | INFO | {0}, Rate limiter saturated; deferring creation to the idle wait.",
+                                    Id);
                                 faulted = false;
                                 return null;
                             }
@@ -1086,11 +1157,26 @@ _connectionCreationRateLimiter is not null &&
                         // If we fail to open a connection, we need to write a null to the idle channel to
                         // wake up any waiters
                         _idleChannel.TryWrite(null);
-                        newConnection?.Dispose();
+
+                        if (newConnection is not null)
+                        {
+                            // The connection opened, so a hard connect was counted for it. It never
+                            // reached the pool, so balance the hard-connection gauge here rather
+                            // than leaving it inflated for the lifetime of the pool.
+                            newConnection.Dispose();
+                            Metrics.HardDisconnectRequest();
+                        }
                     });
 
                 if (connection is not null)
                 {
+                    SqlClientEventSource.Log.TryPoolerTraceEvent(
+                        "ChannelDbConnectionPool.OpenNewInternalConnection | INFO | {0}, Connection {1}, Added to pool.",
+                        Id,
+                        connection.ObjectID);
+
+                    Metrics.EnterPooledConnection();
+
                     // A new connection was added to the pool. If we've grown past MinPoolSize,
                     // start the pruning timer so idle connections can be reclaimed.
                     Pruner?.UpdateTimer();
@@ -1100,11 +1186,22 @@ _connectionCreationRateLimiter is not null &&
                     // WaitHandle pool: a connection that opens proves the server is reachable.
                     _errorState?.Clear();
                 }
+                else
+                {
+                    SqlClientEventSource.Log.TryPoolerTraceEvent(
+                        "ChannelDbConnectionPool.OpenNewInternalConnection | INFO | {0}, No connection created; pool is full or creation is rate limited.",
+                        Id);
+                }
 
                 return connection;
             }
             catch (Exception ex) when (ADP.IsCatchableExceptionType(ex) && ex is not OperationCanceledException)
             {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.OpenNewInternalConnection | INFO | {0}, PoolCreateRequest called CreateConnection which threw an exception: {1}",
+                    Id,
+                    ex);
+
                 // Enter the blocking period error state on creation failure if configured. Warmup
                 // goes through this same path (the warmup loop absorbs the rethrow in its own catch),
                 // mirroring the legacy WaitHandle pool, whose replenishment failures also enter the
@@ -1157,6 +1254,10 @@ private bool IsLiveConnection(DbConnectionInternal connection, bool probeLivenes
                 idleTimeout != TimeSpan.Zero &&
                 _timeProvider.GetUtcNow().UtcDateTime - connection.ReturnedTime > idleTimeout)
             {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.IsLiveConnection | INFO | {0}, Connection {1}, exceeded the connection idle timeout and removed.",
+                    Id,
+                    connection.ObjectID);
                 return false;
             }
 
@@ -1164,18 +1265,30 @@ private bool IsLiveConnection(DbConnectionInternal connection, bool probeLivenes
             // polls the socket, so it must not run on a thread we do not own.
             if (probeLiveness && !connection.IsConnectionAlive())
             {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.IsLiveConnection | INFO | {0}, Connection {1}, found dead and removed.",
+                    Id,
+                    connection.ObjectID);
                 return false;
             }
 
             // Connection has been alive longer than the load balance timeout
             if (LoadBalanceTimeout != TimeSpan.Zero && DateTime.UtcNow > connection.CreateTime + LoadBalanceTimeout)
             {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.IsLiveConnection | INFO | {0}, Connection {1}, exceeded the load balance timeout and removed.",
+                    Id,
+                    connection.ObjectID);
                 return false;
             }
 
             // Connection was created before the last Clear, so it's stale.
             if (connection.ClearGeneration != _clearGeneration)
             {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.IsLiveConnection | INFO | {0}, Connection {1}, was created before the last Clear and removed.",
+                    Id,
+                    connection.ObjectID);
                 return false;
             }
 
@@ -1204,6 +1317,11 @@ private bool IsLiveConnection(DbConnectionInternal connection, bool probeLivenes
         /// <param name="connection">The connection to be closed.</param>
         private void RemoveConnection(DbConnectionInternal connection)
         {
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "ChannelDbConnectionPool.RemoveConnection | INFO | {0}, Connection {1}, Removing from pool.",
+                Id,
+                connection.ObjectID);
+
             // A connection with a delegated transaction cannot be disposed of until the delegated
             // transaction has actually completed; disposing it would abort the (possibly
             // distributed) transaction. Leave it alone: when the transaction completes it comes
@@ -1211,13 +1329,21 @@ private void RemoveConnection(DbConnectionInternal connection)
             if (connection.IsTxRootWaitingForTxEnd)
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.DestroyObject|RES|CPOOL> {0}, Connection {1}, Has Delegated Transaction, waiting to Dispose.",
+                    "ChannelDbConnectionPool.RemoveConnection | INFO | {0}, Connection {1}, Has Delegated Transaction, waiting to Dispose.",
                     Id,
                     connection.ObjectID);
                 return;
             }
 
-            _connectionSlots.TryRemove(connection);
+            if (_connectionSlots.TryRemove(connection))
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.RemoveConnection | INFO | {0}, Connection {1}, Removed from pool.",
+                    Id,
+                    connection.ObjectID);
+
+                Metrics.ExitPooledConnection();
+            }
 
             // Removing a connection from the pool opens a free slot.
             // Write a null to the idle connection channel to wake up a waiter, who can now open a new
@@ -1225,6 +1351,12 @@ private void RemoveConnection(DbConnectionInternal connection)
             _idleChannel.TryWrite(null);
 
             connection.Dispose();
+            Metrics.HardDisconnectRequest();
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "ChannelDbConnectionPool.RemoveConnection | INFO | {0}, Connection {1}, Disposed.",
+                Id,
+                connection.ObjectID);
 
             // If this removal brought us back to MinPoolSize, disable the pruning timer.
             Pruner?.UpdateTimer();
@@ -1258,6 +1390,11 @@ private void RemoveConnection(DbConnectionInternal connection)
                     continue;
                 }
 
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.GetIdleConnection | INFO | {0}, Connection {1}, Read from idle channel.",
+                    Id,
+                    connection.ObjectID);
+
                 return connection;
             }
 
@@ -1292,6 +1429,9 @@ private async Task<DbConnectionInternal> GetInternalConnection(
         {
             DbConnectionInternal? connection = null;
 
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "ChannelDbConnectionPool.GetInternalConnection | INFO | {0}, Getting connection.", Id);
+
             // When automatic enlistment is disabled, the connection must never be bound to the
             // ambient transaction, so we neither consult the transacted store nor hand the
             // transaction to activation. HasTransactionAffinity is derived from the connection
@@ -1354,10 +1494,15 @@ private async Task<DbConnectionInternal> GetInternalConnection(
                 }
                 catch (OperationCanceledException)
                 {
+                    SqlClientEventSource.Log.TryPoolerTraceEvent(
+                        "ChannelDbConnectionPool.GetInternalConnection | INFO | {0}, Wait timed out.", Id);
+
                     throw ADP.PooledOpenTimeout();
                 }
                 catch (ChannelClosedException)
                 {
+                    SqlClientEventSource.Log.TryPoolerTraceEvent(
+                        "ChannelDbConnectionPool.GetInternalConnection | INFO | {0}, Pool is shutting down; abandoning wait.", Id);
                     throw new InvalidOperationException(StringsHelper.GetString(Strings.SQL_ConnectionPoolShutDown));
                 }
 
@@ -1369,7 +1514,15 @@ private async Task<DbConnectionInternal> GetInternalConnection(
                 }
             }
 
+            // Counted before activation: if PrepareConnection fails it returns the connection to
+            // the pool, which emits the matching soft disconnect. Counting after would leave that
+            // disconnect unpaired and drive the active-soft-connects gauge negative.
+            Metrics.SoftConnectRequest();
             PrepareConnection(owningConnection, connection, transaction);
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "ChannelDbConnectionPool.GetInternalConnection | INFO | {0}, Connection {1}, Obtained.", Id, connection.ObjectID);
+
             return connection;
         }
 
@@ -1452,12 +1605,12 @@ private void PrepareConnection(DbConnection owningObject, DbConnectionInternal c
             }
 
             SqlClientEventSource.Log.TryPoolerTraceEvent(
-                "<prov.DbConnectionPool.GetFromTransactedPool|RES|CPOOL> {0}, Transaction {1}, Connection {2}, Popped from transacted pool.",
+                "ChannelDbConnectionPool.GetFromTransactedPool | INFO | {0}, Transaction {1}, Connection {2}, Popped from transacted pool.",
                 Id,
                 transaction.GetHashCode(),
                 connection.ObjectID);
 
-            SqlClientDiagnostics.Metrics.ExitFreeConnection();
+            Metrics.ExitFreeConnection();
 
             // Transacting connections are exempt from idle-timeout and clear-generation eviction
             // (closing them would abort the transaction, which may be distributed), so only
@@ -1476,7 +1629,7 @@ private void PrepareConnection(DbConnection owningObject, DbConnectionInternal c
                 if (!isAlive)
                 {
                     SqlClientEventSource.Log.TryPoolerTraceEvent(
-                        "<prov.DbConnectionPool.GetFromTransactedPool|RES|CPOOL> {0}, Connection {1}, found dead and removed.",
+                        "ChannelDbConnectionPool.GetFromTransactedPool | INFO | {0}, Connection {1}, found dead and removed.",
                         Id,
                         connection.ObjectID);
                     RemoveConnection(connection);
@@ -1534,8 +1687,12 @@ internal void RequestWarmup()
             // up. Return before scheduling a thread-pool work item. This keeps hot-path callers
             // (e.g. RemoveConnection on every return) cheap. The check is best-effort under
             // concurrency; a below-minimum condition missed here is still observed by the running
-            // loop, which re-reads Count on every iteration.
-            if (Count >= MinPoolSize)
+            // loop, which re-reads the count on every iteration.
+            //
+            // This gates on ReservationCount rather than Count so that connections another thread
+            // is currently opening count toward the minimum. Gating on Count would make warmup
+            // create duplicates for every creation already in flight.
+            if (_connectionSlots.ReservationCount >= MinPoolSize)
             {
                 return;
             }
@@ -1552,6 +1709,9 @@ internal void RequestWarmup()
                 // absorbs its own exceptions and always releases the single-loop guard on exit. The
                 // task is published so tests can await a warmup pass to a deterministic completion.
                 WarmupLoopTask = Task.Run(RunWarmupLoopAsync);
+
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.RequestWarmup | INFO | {0}, Scheduled warmup loop. Count={1}, MinPoolSize={2}", Id, Count, MinPoolSize);
             }
             catch (Exception ex)
             {
@@ -1567,7 +1727,7 @@ internal void RequestWarmup()
                 }
 
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.RequestWarmup|RES|CPOOL> {0}, Failed to schedule warmup loop, absorbing: {1}", Id, ex);
+                    "ChannelDbConnectionPool.RequestWarmup | INFO | {0}, Failed to schedule warmup loop, absorbing: {1}", Id, ex);
             }
         }
 
@@ -1583,6 +1743,11 @@ internal void RequestWarmup()
         /// </summary>
         private async Task RunWarmupLoopAsync()
         {
+            int warmedUp = 0;
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "ChannelDbConnectionPool.RunWarmupLoopAsync | INFO | {0}, Warmup loop starting. Count={1}, MinPoolSize={2}", Id, Count, MinPoolSize);
+
             try
             {
                 CancellationToken token;
@@ -1610,7 +1775,7 @@ private async Task RunWarmupLoopAsync()
                 while (State == Running
                     && !token.IsCancellationRequested
                     && !ErrorOccurred
-                    && Count < MinPoolSize)
+                    && _connectionSlots.ReservationCount < MinPoolSize)
                 {
                     // Fresh per-attempt timeout budget based on the pool's CreationTimeout, since
                     // warmup has no owning Open() call to inherit a budget from. Matches the
@@ -1643,13 +1808,13 @@ private async Task RunWarmupLoopAsync()
                         // during the blocking window and resume creating on demand once it expires,
                         // and the next below-minimum trigger re-requests warmup (Story 3).
                         SqlClientEventSource.Log.TryPoolerTraceEvent(
-                            "<prov.DbConnectionPool.RunWarmupLoopAsync|RES|CPOOL> {0}, Warmup connection creation failed, stopping pass: {1}", Id, ex);
+                            "ChannelDbConnectionPool.RunWarmupLoopAsync | INFO | {0}, Warmup connection creation failed, stopping pass: {1}", Id, ex);
                         break;
                     }
 
                     if (connection is null)
                     {
-                        // A slot is guaranteed available here (Count < MinPoolSize <= MaxPoolSize),
+                        // A slot is guaranteed available here (ReservationCount < MinPoolSize <= MaxPoolSize),
                         // and creation failures throw rather than return null, so a null return means
                         // the shared rate limiter is currently saturated. Rather than bypassing the
                         // limiter or spinning on it (Story 2), end this warmup pass. Saturation only
@@ -1672,6 +1837,8 @@ private async Task RunWarmupLoopAsync()
                         break;
                     }
 
+                    warmedUp++;
+
                     // OpenNewInternalConnection is synchronous and blocks the loop's thread for
                     // the duration of the physical open. Yield between creations so a multi-
                     // connection warmup returns its thread-pool worker to the scheduler between
@@ -1679,6 +1846,9 @@ private async Task RunWarmupLoopAsync()
                     // responsive to cancellation. There is no sync-over-async anywhere in this path.
                     await Task.Yield();
                 }
+
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.RunWarmupLoopAsync | INFO | {0}, Warmup loop finished. Warmed up {1} connections. Count={2}", Id, warmedUp, Count);
             }
             catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
@@ -1687,7 +1857,7 @@ private async Task RunWarmupLoopAsync()
                 // rather than absorbed into a pool that keeps running in a potentially corrupted
                 // state; the finally below still releases the single-loop guard on that path.
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.DbConnectionPool.RunWarmupLoopAsync|RES|CPOOL> {0}, Warmup loop failed, absorbing: {1}", Id, ex);
+                    "ChannelDbConnectionPool.RunWarmupLoopAsync | INFO | {0}, Warmup loop failed, absorbing. Warmed up {1} connections: {2}", Id, warmedUp, ex);
             }
             finally
             {
@@ -1713,6 +1883,15 @@ private async Task RunWarmupLoopAsync()
         /// </summary>
         internal void PruneConnections(int count)
         {
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "ChannelDbConnectionPool.PruneConnections | INFO | {0}, Pruning up to {1} idle connections. IdleCount={2}, Count={3}",
+                Id,
+                count,
+                IdleCount,
+                Count);
+
+            int pruned = 0;
+
             while (count > 0
                 && IsRunning
                 && _connectionSlots.ReservationCount > MinPoolSize
@@ -1725,7 +1904,13 @@ internal void PruneConnections(int count)
 
                 RemoveConnection(connection);
                 count--;
+                pruned++;
             }
+
+            SqlClientEventSource.Log.TryPoolerTraceEvent(
+                "ChannelDbConnectionPool.PruneConnections | INFO | {0}, Pruned {1} idle connections.",
+                Id,
+                pruned);
         }
         #endregion
     }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs
index c9d268fd29..b9465ec93c 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs
@@ -59,7 +59,10 @@ internal void Keep()
 
         private readonly DbConnectionInternal?[] _connections;
         private readonly uint _capacity;
-        private volatile int _reservations;
+        // Mutated only through Interlocked and read only through Volatile.Read, so the fields
+        // themselves do not need to be volatile.
+        private int _reservations;
+        private int _connectionCount;
 
         /// <summary>
         /// Constructs a ConnectionPoolSlots instance with the given fixed capacity.
@@ -82,13 +85,22 @@ internal ConnectionPoolSlots(uint fixedCapacity)
 
             _capacity = fixedCapacity;
             _reservations = 0;
+            _connectionCount = 0;
             _connections = new DbConnectionInternal?[fixedCapacity];
         }
 
         /// <summary>
-        /// Gets the total number of reservations currently held.
+        /// Gets the total number of reservations currently held. This includes reservations held on
+        /// behalf of connections that are still being opened and are therefore not yet tracked.
         /// </summary>
-        internal int ReservationCount => _reservations;
+        internal int ReservationCount => Volatile.Read(ref _reservations);
+
+        /// <summary>
+        /// Gets the number of connections currently tracked by this collection. Unlike
+        /// <see cref="ReservationCount"/>, this excludes reservations held for connections that are
+        /// still being opened, so it reports connections that actually belong to the pool.
+        /// </summary>
+        internal int ConnectionCount => Volatile.Read(ref _connectionCount);
 
         /// <summary>
         /// Adds a connection to the collection.
@@ -127,6 +139,7 @@ internal ConnectionPoolSlots(uint fixedCapacity)
                 {
                     if (Interlocked.CompareExchange(ref _connections[i], connection, null) == null)
                     {
+                        Interlocked.Increment(ref _connectionCount);
                         reservation.Keep();
                         return connection;
                     }
@@ -148,7 +161,7 @@ internal ConnectionPoolSlots(uint fixedCapacity)
         private void ReleaseReservation()
         {
             Interlocked.Decrement(ref _reservations);
-            Debug.Assert(_reservations >= 0, "Released a reservation that wasn't held");
+            Debug.Assert(Volatile.Read(ref _reservations) >= 0, "Released a reservation that wasn't held");
         }
 
         /// <summary>
@@ -162,6 +175,7 @@ internal bool TryRemove(DbConnectionInternal connection)
             {
                 if (Interlocked.CompareExchange(ref _connections[i], null, connection) == connection)
                 {
+                    Interlocked.Decrement(ref _connectionCount);
                     ReleaseReservation();
                     return true;
                 }
@@ -196,7 +210,7 @@ internal bool TryReplace(DbConnectionInternal oldConnection, DbConnectionInterna
         /// <returns>A Reservation if successful, otherwise returns null.</returns>
         private Reservation<ConnectionPoolSlots>? TryReserve()
         {
-            for (var expected = _reservations; expected < _capacity; expected = _reservations)
+            for (var expected = Volatile.Read(ref _reservations); expected < _capacity; expected = Volatile.Read(ref _reservations))
             {
                 // Try to reserve a spot in the collection by incrementing _reservations.
                 // If _reservations changed underneath us, then another thread already reserved the spot we were trying to take.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
index 3799cf54ea..ec30b4efa6 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using System.Transactions;
 using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.Diagnostics;
 
 #nullable enable
 
@@ -31,6 +32,22 @@ internal interface IDbConnectionPool
         /// </summary>
         SqlConnectionFactory ConnectionFactory { get; }
 
+        /// <summary>
+        /// Gets the metrics sink that the pool and the objects it owns report to.
+        /// </summary>
+        /// <remarks>
+        /// In production this is the process-wide <see cref="SqlClientDiagnostics.Metrics"/>
+        /// instance. Making it a pool property lets a test give a pool its own counters so
+        /// assertions are not perturbed by unrelated connection activity elsewhere in the process.
+        ///
+        /// The pool takes its sink independently of <see cref="SqlConnectionFactory.Metrics"/>
+        /// rather than reading it from the factory, so that a pool can be constructed and asserted
+        /// on without standing up a factory. Both default to the same process-wide instance, so
+        /// they agree in production; a test that asserts across both must pass the same instance to
+        /// the pool and to the factory it is given.
+        /// </remarks>
+        ISqlClientMetrics Metrics { get; }
+
         /// <summary>
         /// The number of connections currently managed by the pool.
         /// May be larger than the number of connections currently sitting idle in the pool.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs
index 348ad33d9e..801c0e7c2f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IdleConnectionChannel.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using System.Threading.Channels;
 using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.Diagnostics;
 
 #nullable enable
 
@@ -20,13 +21,19 @@ internal sealed class IdleConnectionChannel
     {
         private readonly ChannelReader<DbConnectionInternal?> _reader;
         private readonly ChannelWriter<DbConnectionInternal?> _writer;
+        private readonly ISqlClientMetrics _metrics;
         private volatile int _count;
 
-        internal IdleConnectionChannel()
+        /// <param name="metrics">
+        /// The metrics sink of the pool that owns this channel. Defaults to the process-wide
+        /// instance so tests can construct a channel without a pool.
+        /// </param>
+        internal IdleConnectionChannel(ISqlClientMetrics? metrics = null)
         {
             var channel = Channel.CreateUnbounded<DbConnectionInternal?>();
             _reader = channel.Reader;
             _writer = channel.Writer;
+            _metrics = metrics ?? SqlClientDiagnostics.Metrics;
         }
 
         /// <summary>
@@ -56,6 +63,7 @@ internal bool TryWrite(DbConnectionInternal? connection)
                 if (connection is not null)
                 {
                     Interlocked.Increment(ref _count);
+                    _metrics.EnterFreeConnection();
                 }
                 return true;
             }
@@ -74,6 +82,7 @@ internal bool TryRead(out DbConnectionInternal? connection)
                 if (connection is not null)
                 {
                     Interlocked.Decrement(ref _count);
+                    _metrics.ExitFreeConnection();
                 }
 
                 return true;
@@ -93,6 +102,7 @@ internal bool TryRead(out DbConnectionInternal? connection)
             if (connection is not null)
             {
                 Interlocked.Decrement(ref _count);
+                _metrics.ExitFreeConnection();
             }
 
             return connection;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs
index 9c6621f5f0..3611afda5e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolPruner.cs
@@ -136,7 +136,7 @@ internal PoolPruner(ChannelDbConnectionPool pool, TimeSpan idleTimeout)
                 // cadence so operators can tell why a very large Connection Idle Timeout samples less
                 // frequently than the default 10-second interval.
                 SqlClientEventSource.Log.TryPoolerTraceEvent(
-                    "<prov.PoolPruner|RES|INFO|CPOOL> Idle timeout {0}s derived a pruning interval of {1}s with {2} samples (max {3}).",
+                    "PoolPruner.PoolPruner | INFO | Idle timeout {0}s derived a pruning interval of {1}s with {2} samples (max {3}).",
                     idleTimeoutSeconds, intervalSeconds, sampleSize, MaxSampleSize);
             }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/TransactedConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/TransactedConnectionPool.cs
index 3ce203c071..32e6865efb 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/TransactedConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/TransactedConnectionPool.cs
@@ -6,6 +6,7 @@
 using System.Diagnostics;
 using System.Transactions;
 using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.Diagnostics;
 using Microsoft.Data.SqlClient.Internal;
 
 #nullable enable
@@ -62,6 +63,7 @@ internal void Dispose()
     #region Fields
     private static int _objectTypeCount;
     internal readonly int _objectID = System.Threading.Interlocked.Increment(ref _objectTypeCount);
+    private readonly ISqlClientMetrics _metrics;
 
     #endregion
 
@@ -69,14 +71,16 @@ internal void Dispose()
     /// Initializes a new instance of the TransactedConnectionPool class for the specified connection pool.
     /// </summary>
     /// <param name="pool">The main connection pool that this transacted pool is associated with.</param>
+    /// <param name="metrics">The metrics instance to report counters to.</param>
     /// <remarks>
     /// The transacted connection pool works as a companion to the main connection pool,
     /// temporarily holding connections that are enlisted in transactions until those
     /// transactions complete.
     /// </remarks>
-    internal TransactedConnectionPool(IDbConnectionPool pool)
+    internal TransactedConnectionPool(IDbConnectionPool pool, ISqlClientMetrics metrics)
     {
         Pool = pool;
+        _metrics = metrics;
         TransactedConnections = new Dictionary<Transaction, TransactedConnectionList>();
         SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.TransactedConnectionPool.TransactedConnectionPool|RES|CPOOL> {0}, Constructed for connection pool {1}", Id, Pool.Id);
     }
@@ -263,7 +267,7 @@ internal void PutTransactedObject(Transaction transaction, DbConnectionInternal
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.TransactedConnectionPool.PutTransactedObject|RES|CPOOL> {0}, Transaction {1}, Connection {2}, Added.", Id, transaction.GetHashCode(), transactedObject.ObjectID);
         }
 
-        SqlClientDiagnostics.Metrics.EnterFreeConnection();
+        _metrics.EnterFreeConnection();
     }
 
     /// <summary>
@@ -344,7 +348,7 @@ internal void TransactionEnded(Transaction transaction, DbConnectionInternal tra
             // TODO: can we give this responsibility to the main pool?
             // The bi-directional dependency between the main pool and this pool
             // is messy and hard to understand.
-            SqlClientDiagnostics.Metrics.ExitFreeConnection();
+            _metrics.ExitFreeConnection();
             Pool.PutObjectFromTransactedPool(transactedObject);
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
index 00ddb01c26..afaa827fce 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -14,6 +14,7 @@
 using System.Transactions;
 using Microsoft.Data.Common;
 using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.Diagnostics;
 using static Microsoft.Data.SqlClient.ConnectionPool.DbConnectionPoolState;
 using Microsoft.Data.SqlClient.Internal;
 
@@ -208,7 +209,8 @@ internal WaitHandleDbConnectionPool(
             DbConnectionPoolGroup connectionPoolGroup,
             DbConnectionPoolIdentity identity,
             DbConnectionPoolProviderInfo connectionPoolProviderInfo,
-            TimeProvider timeProvider = null)
+            TimeProvider timeProvider = null,
+            ISqlClientMetrics metrics = null)
         {
             Debug.Assert(connectionPoolGroup != null, "null connectionPoolGroup");
 
@@ -241,6 +243,9 @@ internal WaitHandleDbConnectionPool(
             }
 
             _connectionFactory = connectionFactory;
+            // metrics is injected only by tests, so a pool's counters can be asserted without
+            // interference from unrelated connection activity elsewhere in the process.
+            Metrics = metrics ?? SqlClientDiagnostics.Metrics;
             _connectionPoolGroup = connectionPoolGroup;
             _connectionPoolGroupOptions = connectionPoolGroup.PoolGroupOptions;
             _connectionPoolProviderInfo = connectionPoolProviderInfo;
@@ -263,7 +268,7 @@ internal WaitHandleDbConnectionPool(
             _pooledDbAuthenticationContexts = new ConcurrentDictionary<DbConnectionPoolAuthenticationContextKey, DbConnectionPoolAuthenticationContext>(concurrencyLevel: 4 * Environment.ProcessorCount /* default value in ConcurrentDictionary*/,
                                                                                                                                                         capacity: 2);
 
-            _transactedConnectionPool = new TransactedConnectionPool(this);
+            _transactedConnectionPool = new TransactedConnectionPool(this, Metrics);
 
             _poolCreateRequest = new WaitCallback(PoolCreateRequest); // used by CleanupCallback
             State = Running;
@@ -286,6 +291,9 @@ private int CreationTimeout
 
         public SqlConnectionFactory ConnectionFactory => _connectionFactory;
 
+        /// <inheritdoc/>
+        public ISqlClientMetrics Metrics { get; }
+
         public bool ErrorOccurred => _errorState.HasError;
 
         private bool HasTransactionAffinity => PoolGroupOptions.HasTransactionAffinity;
@@ -402,7 +410,7 @@ internal void CleanupCallback(object state)
 
                         // If we obtained one from the old stack, destroy it.
 
-                        SqlClientDiagnostics.Metrics.ExitFreeConnection();
+                        Metrics.ExitFreeConnection();
 
                         // Transaction roots must survive even aging out (TxEnd event will clean them up).
                         bool shouldDestroy = true;
@@ -502,14 +510,14 @@ public void Clear()
             {
                 Debug.Assert(obj != null, "null connection is not expected");
 
-                SqlClientDiagnostics.Metrics.ExitFreeConnection();
+                Metrics.ExitFreeConnection();
                 DestroyObject(obj);
             }
             while (_stackOld.TryPop(out obj))
             {
                 Debug.Assert(obj != null, "null connection is not expected");
 
-                SqlClientDiagnostics.Metrics.ExitFreeConnection();
+                Metrics.ExitFreeConnection();
                 DestroyObject(obj);
             }
 
@@ -541,12 +549,18 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
                 {
                     if ((oldConnection != null) && (oldConnection.Pool == this))
                     {
-                        _objectList.Remove(oldConnection);
+                        // The replacement takes over the old connection's place in the pool. The
+                        // caller disposes the old connection once the replacement is in place, so
+                        // account for its departure here rather than leaving the gauge inflated.
+                        if (_objectList.Remove(oldConnection))
+                        {
+                            Metrics.ExitPooledConnection();
+                        }
                     }
                     _objectList.Add(newObj);
                     _totalObjects = _objectList.Count;
 
-                    SqlClientDiagnostics.Metrics.EnterPooledConnection();
+                    Metrics.EnterPooledConnection();
                 }
 
                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.CreateObject|RES|CPOOL> {0}, Connection {1}, Added to pool.", Id, newObj?.ObjectID);
@@ -738,12 +752,12 @@ private void DestroyObject(DbConnectionInternal obj)
                 {
                     SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.DestroyObject|RES|CPOOL> {0}, Connection {1}, Removed from pool.", Id, obj.ObjectID);
 
-                    SqlClientDiagnostics.Metrics.ExitPooledConnection();
+                    Metrics.ExitPooledConnection();
                 }
                 obj.Dispose();
                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.DestroyObject|RES|CPOOL> {0}, Connection {1}, Disposed.", Id, obj.ObjectID);
 
-                SqlClientDiagnostics.Metrics.HardDisconnectRequest();
+                Metrics.HardDisconnectRequest();
             }
         }
 
@@ -1138,13 +1152,16 @@ private bool TryGetConnection(DbConnection owningObject, uint waitForMultipleObj
 
             if (obj != null)
             {
+                // Counted before activation: if PrepareConnection fails it returns the connection
+                // to the pool, which emits the matching soft disconnect. Counting after would leave
+                // that disconnect unpaired and drive the active-soft-connects gauge negative.
+                // Counted inside this branch so that no connection vended means no soft connect.
+                Metrics.SoftConnectRequest();
                 PrepareConnection(owningObject, obj, transaction);
             }
 
             connection = obj;
 
-            SqlClientDiagnostics.Metrics.SoftConnectRequest();
-
             return true;
         }
 
@@ -1181,10 +1198,17 @@ public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConne
 
             if (newConnection != null)
             {
-                SqlClientDiagnostics.Metrics.SoftConnectRequest();
+                Metrics.SoftConnectRequest();
                 PrepareConnection(owningObject, newConnection, oldConnection.EnlistedTransaction);
                 oldConnection.DeactivateConnection();
                 oldConnection.Dispose();
+
+                // The old connection was vended to the caller and is now destroyed rather than
+                // returned to the pool, so balance both the soft gauge (it was counted as a
+                // checkout) and the hard gauge (its physical connection is going away). The pooled
+                // gauge is settled in CreateObject, which removed it from the pool's object list.
+                Metrics.SoftDisconnectRequest();
+                Metrics.HardDisconnectRequest();
             }
 
             return newConnection;
@@ -1219,7 +1243,7 @@ private DbConnectionInternal GetFromGeneralPool()
             {
                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetFromGeneralPool|RES|CPOOL> {0}, Connection {1}, Popped from general pool.", Id, obj.ObjectID);
 
-                SqlClientDiagnostics.Metrics.ExitFreeConnection();
+                Metrics.ExitFreeConnection();
             }
             return obj;
         }
@@ -1237,7 +1261,7 @@ private DbConnectionInternal GetFromTransactedPool(out Transaction transaction)
                 {
                     SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.GetFromTransactedPool|RES|CPOOL> {0}, Connection {1}, Popped from transacted pool.", Id, obj.ObjectID);
 
-                    SqlClientDiagnostics.Metrics.ExitFreeConnection();
+                    Metrics.ExitFreeConnection();
 
                     if (obj.IsTransactionRoot)
                     {
@@ -1389,7 +1413,7 @@ private void PutNewObject(DbConnectionInternal obj)
             _stackNew.Push(obj);
             _waitHandles.PoolSemaphore.Release(1);
 
-            SqlClientDiagnostics.Metrics.EnterFreeConnection();
+            Metrics.EnterFreeConnection();
 
         }
 
@@ -1414,7 +1438,7 @@ public void ReturnInternalConnection(DbConnectionInternal obj, DbConnection owni
         {
             Debug.Assert(obj != null, "null obj?");
 
-            SqlClientDiagnostics.Metrics.SoftDisconnectRequest();
+            Metrics.SoftDisconnectRequest();
 
             // Once a connection is closing (which is the state that we're in at
             // this point in time) you cannot delegate a transaction to or enlist
@@ -1531,7 +1555,7 @@ private bool ReclaimEmancipatedObjects()
                 DbConnectionInternal obj = reclaimedObjects[i];
                 SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.ReclaimEmancipatedObjects|RES|CPOOL> {0}, Connection {1}, Reclaiming.", Id, obj.ObjectID);
 
-                SqlClientDiagnostics.Metrics.ReclaimedConnectionRequest();
+                Metrics.ReclaimedConnectionRequest();
 
                 emancipatedObjectFound = true;
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/ISqlClientMetrics.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/ISqlClientMetrics.cs
new file mode 100644
index 0000000000..c74e60dfab
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/ISqlClientMetrics.cs
@@ -0,0 +1,135 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Diagnostics
+{
+    /// <summary>
+    /// The connection pool counters, as reported by <see cref="SqlClientMetrics"/>.
+    /// </summary>
+    /// <remarks>
+    /// Components that report counters depend on this rather than on <see cref="SqlClientMetrics"/>
+    /// so that tests can substitute a recording implementation. The production counters are not
+    /// usable for assertions: on .NET they are only observable through an EventCounter listener,
+    /// whose polling interval would make such tests slow and timing dependent, and on .NET
+    /// Framework they are performance counters whose instance name is derived from the assembly
+    /// name and process id, so every instance in the process shares one counter.
+    /// </remarks>
+    internal interface ISqlClientMetrics
+    {
+        /// <summary>
+        /// The number of actual connections that are being made to servers
+        /// </summary>
+        void HardConnectRequest();
+
+        /// <summary>
+        /// The number of actual disconnects that are being made to servers
+        /// </summary>
+        void HardDisconnectRequest();
+
+        /// <summary>
+        /// The number of connections we get from the pool
+        /// </summary>
+        void SoftConnectRequest();
+
+        /// <summary>
+        /// The number of connections we return to the pool
+        /// </summary>
+        void SoftDisconnectRequest();
+
+        /// <summary>
+        /// The number of connections that are not using connection pooling
+        /// </summary>
+        void EnterNonPooledConnection();
+
+        /// <summary>
+        /// The number of connections that are not using connection pooling
+        /// </summary>
+        void ExitNonPooledConnection();
+
+        /// <summary>
+        /// The number of connections that are managed by the connection pool
+        /// </summary>
+        void EnterPooledConnection();
+
+        /// <summary>
+        /// The number of connections that are managed by the connection pool
+        /// </summary>
+        void ExitPooledConnection();
+
+        /// <summary>
+        /// The number of unique connection strings
+        /// </summary>
+        void EnterActiveConnectionPoolGroup();
+
+        /// <summary>
+        /// The number of unique connection strings
+        /// </summary>
+        void ExitActiveConnectionPoolGroup();
+
+        /// <summary>
+        /// The number of unique connection strings waiting for pruning
+        /// </summary>
+        void EnterInactiveConnectionPoolGroup();
+
+        /// <summary>
+        /// The number of unique connection strings waiting for pruning
+        /// </summary>
+        void ExitInactiveConnectionPoolGroup();
+
+        /// <summary>
+        /// The number of connection pools
+        /// </summary>
+        void EnterActiveConnectionPool();
+
+        /// <summary>
+        /// The number of connection pools
+        /// </summary>
+        void ExitActiveConnectionPool();
+
+        /// <summary>
+        /// The number of connection pools
+        /// </summary>
+        void EnterInactiveConnectionPool();
+
+        /// <summary>
+        /// The number of connection pools
+        /// </summary>
+        void ExitInactiveConnectionPool();
+
+        /// <summary>
+        /// The number of connections currently in-use
+        /// </summary>
+        void EnterActiveConnection();
+
+        /// <summary>
+        /// The number of connections currently in-use
+        /// </summary>
+        void ExitActiveConnection();
+
+        /// <summary>
+        /// The number of connections currently available for use
+        /// </summary>
+        void EnterFreeConnection();
+
+        /// <summary>
+        /// The number of connections currently available for use
+        /// </summary>
+        void ExitFreeConnection();
+
+        /// <summary>
+        /// The number of connections currently waiting to be made ready for use
+        /// </summary>
+        void EnterStasisConnection();
+
+        /// <summary>
+        /// The number of connections currently waiting to be made ready for use
+        /// </summary>
+        void ExitStasisConnection();
+
+        /// <summary>
+        /// The number of connections we reclaim from GC'd external connections
+        /// </summary>
+        void ReclaimedConnectionRequest();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.cs
index cb8c224440..e1eb814bbd 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.cs
@@ -24,7 +24,7 @@ namespace Microsoft.Data.SqlClient.Diagnostics
 #if NETFRAMEWORK
     [PermissionSet(SecurityAction.LinkDemand, Name = "FullTrust")]
 #endif
-    internal sealed partial class SqlClientMetrics
+    internal sealed partial class SqlClientMetrics : ISqlClientMetrics
     {
 #if NETFRAMEWORK
         private const string PerformanceCounterCategoryName = ".NET Data Provider for SqlServer";
@@ -124,10 +124,8 @@ private static void DecrementPlatformSpecificCounter(ref PerformanceCounter? cou
             => counter?.Decrement();
 #endif
 
-        /// <summary>
-        /// The number of actual connections that are being made to servers
-        /// </summary>
-        internal void HardConnectRequest()
+        /// <inheritdoc />
+        public void HardConnectRequest()
         {
 #if NET
             IncrementPlatformSpecificCounter(ref _activeHardConnections);
@@ -135,10 +133,8 @@ internal void HardConnectRequest()
             IncrementPlatformSpecificCounter(ref _hardConnectsRate);
         }
 
-        /// <summary>
-        /// The number of actual disconnects that are being made to servers
-        /// </summary>
-        internal void HardDisconnectRequest()
+        /// <inheritdoc />
+        public void HardDisconnectRequest()
         {
 #if NET
             DecrementPlatformSpecificCounter(ref _activeHardConnections);
@@ -146,10 +142,8 @@ internal void HardDisconnectRequest()
             IncrementPlatformSpecificCounter(ref _hardDisconnectsRate);
         }
 
-        /// <summary>
-        /// The number of connections we get from the pool
-        /// </summary>
-        internal void SoftConnectRequest()
+        /// <inheritdoc />
+        public void SoftConnectRequest()
         {
 #if NET
             IncrementPlatformSpecificCounter(ref _activeSoftConnections);
@@ -157,10 +151,8 @@ internal void SoftConnectRequest()
             IncrementPlatformSpecificCounter(ref _softConnectsRate);
         }
 
-        /// <summary>
-        /// The number of connections we return to the pool
-        /// </summary>
-        internal void SoftDisconnectRequest()
+        /// <inheritdoc />
+        public void SoftDisconnectRequest()
         {
 #if NET
             DecrementPlatformSpecificCounter(ref _activeSoftConnections);
@@ -168,154 +160,116 @@ internal void SoftDisconnectRequest()
             IncrementPlatformSpecificCounter(ref _softDisconnectsRate);
         }
 
-        /// <summary>
-        /// The number of connections that are not using connection pooling
-        /// </summary>
-        internal void EnterNonPooledConnection()
+        /// <inheritdoc />
+        public void EnterNonPooledConnection()
         {
             IncrementPlatformSpecificCounter(ref _nonPooledConnections);
         }
 
-        /// <summary>
-        /// The number of connections that are not using connection pooling
-        /// </summary>
-        internal void ExitNonPooledConnection()
+        /// <inheritdoc />
+        public void ExitNonPooledConnection()
         {
             DecrementPlatformSpecificCounter(ref _nonPooledConnections);
         }
 
-        /// <summary>
-        /// The number of connections that are managed by the connection pool
-        /// </summary>
-        internal void EnterPooledConnection()
+        /// <inheritdoc />
+        public void EnterPooledConnection()
         {
             IncrementPlatformSpecificCounter(ref _pooledConnections);
         }
 
-        /// <summary>
-        /// The number of connections that are managed by the connection pool
-        /// </summary>
-        internal void ExitPooledConnection()
+        /// <inheritdoc />
+        public void ExitPooledConnection()
         {
             DecrementPlatformSpecificCounter(ref _pooledConnections);
         }
 
-        /// <summary>
-        /// The number of unique connection strings
-        /// </summary>
-        internal void EnterActiveConnectionPoolGroup()
+        /// <inheritdoc />
+        public void EnterActiveConnectionPoolGroup()
         {
             IncrementPlatformSpecificCounter(ref _activeConnectionPoolGroups);
         }
 
-        /// <summary>
-        /// The number of unique connection strings
-        /// </summary>
-        internal void ExitActiveConnectionPoolGroup()
+        /// <inheritdoc />
+        public void ExitActiveConnectionPoolGroup()
         {
             DecrementPlatformSpecificCounter(ref _activeConnectionPoolGroups);
         }
 
-        /// <summary>
-        /// The number of unique connection strings waiting for pruning
-        /// </summary>
-        internal void EnterInactiveConnectionPoolGroup()
+        /// <inheritdoc />
+        public void EnterInactiveConnectionPoolGroup()
         {
             IncrementPlatformSpecificCounter(ref _inactiveConnectionPoolGroups);
         }
 
-        /// <summary>
-        /// The number of unique connection strings waiting for pruning
-        /// </summary>
-        internal void ExitInactiveConnectionPoolGroup()
+        /// <inheritdoc />
+        public void ExitInactiveConnectionPoolGroup()
         {
             DecrementPlatformSpecificCounter(ref _inactiveConnectionPoolGroups);
         }
 
-        /// <summary>
-        /// The number of connection pools
-        /// </summary>
-        internal void EnterActiveConnectionPool()
+        /// <inheritdoc />
+        public void EnterActiveConnectionPool()
         {
             IncrementPlatformSpecificCounter(ref _activeConnectionPools);
         }
 
-        /// <summary>
-        /// The number of connection pools
-        /// </summary>
-        internal void ExitActiveConnectionPool()
+        /// <inheritdoc />
+        public void ExitActiveConnectionPool()
         {
             DecrementPlatformSpecificCounter(ref _activeConnectionPools);
         }
 
-        /// <summary>
-        /// The number of connection pools
-        /// </summary>
-        internal void EnterInactiveConnectionPool()
+        /// <inheritdoc />
+        public void EnterInactiveConnectionPool()
         {
             IncrementPlatformSpecificCounter(ref _inactiveConnectionPools);
         }
 
-        /// <summary>
-        /// The number of connection pools
-        /// </summary>
-        internal void ExitInactiveConnectionPool()
+        /// <inheritdoc />
+        public void ExitInactiveConnectionPool()
         {
             DecrementPlatformSpecificCounter(ref _inactiveConnectionPools);
         }
 
-        /// <summary>
-        /// The number of connections currently in-use
-        /// </summary>
-        internal void EnterActiveConnection()
+        /// <inheritdoc />
+        public void EnterActiveConnection()
         {
             IncrementPlatformSpecificCounter(ref _activeConnections);
         }
 
-        /// <summary>
-        /// The number of connections currently in-use
-        /// </summary>
-        internal void ExitActiveConnection()
+        /// <inheritdoc />
+        public void ExitActiveConnection()
         {
             DecrementPlatformSpecificCounter(ref _activeConnections);
         }
 
-        /// <summary>
-        /// The number of connections currently available for use
-        /// </summary>
-        internal void EnterFreeConnection()
+        /// <inheritdoc />
+        public void EnterFreeConnection()
         {
             IncrementPlatformSpecificCounter(ref _freeConnections);
         }
 
-        /// <summary>
-        /// The number of connections currently available for use
-        /// </summary>
-        internal void ExitFreeConnection()
+        /// <inheritdoc />
+        public void ExitFreeConnection()
         {
             DecrementPlatformSpecificCounter(ref _freeConnections);
         }
 
-        /// <summary>
-        /// The number of connections currently waiting to be made ready for use
-        /// </summary>
-        internal void EnterStasisConnection()
+        /// <inheritdoc />
+        public void EnterStasisConnection()
         {
             IncrementPlatformSpecificCounter(ref _stasisConnections);
         }
 
-        /// <summary>
-        /// The number of connections currently waiting to be made ready for use
-        /// </summary>
-        internal void ExitStasisConnection()
+        /// <inheritdoc />
+        public void ExitStasisConnection()
         {
             DecrementPlatformSpecificCounter(ref _stasisConnections);
         }
 
-        /// <summary>
-        ///  The number of connections we reclaim from GC'd external connections
-        /// </summary>
-        internal void ReclaimedConnectionRequest()
+        /// <inheritdoc />
+        public void ReclaimedConnectionRequest()
         {
             IncrementPlatformSpecificCounter(ref _reclaimedConnections);
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index db7c6302c7..c3b7bfd13b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -16,6 +16,7 @@
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.Connection;
 using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Data.SqlClient.Diagnostics;
 using Microsoft.Data.SqlClient.Internal;
 
 #if NET
@@ -64,8 +65,8 @@ internal class SqlConnectionFactory
         
         #region Constructors
         
-        protected SqlConnectionFactory()
-            : this(PruningDueTime, PruningPeriod)
+        protected SqlConnectionFactory(ISqlClientMetrics metrics = null)
+            : this(PruningDueTime, PruningPeriod, metrics)
         {
         }
 
@@ -74,10 +75,21 @@ protected SqlConnectionFactory()
         /// otherwise have to wait minutes for the default schedule to produce an observable
         /// result.
         /// </summary>
-        protected SqlConnectionFactory(TimeSpan pruningDueTime, TimeSpan pruningPeriod)
+        /// <param name="pruningDueTime">Delay before the first pruning pass.</param>
+        /// <param name="pruningPeriod">Interval between subsequent pruning passes.</param>
+        /// <param name="metrics">
+        /// Metrics sink for counters recorded by the factory itself (e.g. hard connect requests).
+        /// Tests construct their own <see cref="SqlConnectionFactory"/> subclass, so they can pass
+        /// the same metrics instance used by the pool under test instead of relying on the
+        /// process-wide default. Defaults to <see cref="SqlClientDiagnostics.Metrics"/> in
+        /// production, where a single factory instance (<see cref="Instance"/>) is shared by every
+        /// pool.
+        /// </param>
+        protected SqlConnectionFactory(TimeSpan pruningDueTime, TimeSpan pruningPeriod, ISqlClientMetrics metrics = null)
         {
             _pruningDueTime = pruningDueTime;
             _pruningPeriod = pruningPeriod;
+            Metrics = metrics ?? SqlClientDiagnostics.Metrics;
             _connectionPoolGroups = new Dictionary<ConnectionPoolKey, DbConnectionPoolGroup>();
             _poolsToRelease = new List<IDbConnectionPool>();
             _poolGroupsToRelease = new List<DbConnectionPoolGroup>();
@@ -106,6 +118,11 @@ protected SqlConnectionFactory(TimeSpan pruningDueTime, TimeSpan pruningPeriod)
         
         internal int ObjectId { get; } = Interlocked.Increment(ref s_objectTypeCount);
 
+        /// <summary>
+        /// The metrics sink this factory reports its own counters (e.g. hard connect requests) to.
+        /// </summary>
+        protected ISqlClientMetrics Metrics { get; }
+
         /// <summary>
         /// Whether the pruning timer is currently armed. Test hook.
         /// </summary>
@@ -175,7 +192,7 @@ internal DbConnectionInternal CreateNonPooledConnection(
                 timeout);
             if (newConnection is not null)
             {
-                SqlClientDiagnostics.Metrics.HardConnectRequest();
+                Metrics.HardConnectRequest();
                 newConnection.MakeNonPooledObject(owningConnection);
             }
             
@@ -208,7 +225,7 @@ internal DbConnectionInternal CreatePooledConnection(
                 throw ADP.InternalError(ADP.InternalErrorCode.NewObjectCannotBePooled);        // CreateObject succeeded, but non-poolable object
             }
 
-            SqlClientDiagnostics.Metrics.HardConnectRequest();
+            Metrics.HardConnectRequest();
             newConnection.MakePooledConnection(pool);
 
             SqlClientEventSource.Log.TryTraceEvent("<prov.SqlConnectionFactory.CreatePooledConnection|RES|CPOOL> {0}, Pooled database connection created.", ObjectId);
@@ -694,7 +711,8 @@ protected virtual DbConnectionInternal CreateConnection(
                         newSecurePassword: null,
                         redirectedUserInstance: false,
                         applyTransientFaultHandling: applyTransientFaultHandling,
-                        sspiContextProvider: key.SspiContextProvider);
+                        sspiContextProvider: key.SspiContextProvider,
+                        metrics: Metrics);
                     using (sseConnection)
                     {
                         // NOTE: Retrieve <UserInstanceName> here. This user instance name will be
@@ -755,7 +773,8 @@ protected virtual DbConnectionInternal CreateConnection(
                 key.AccessToken,
                 pool,
                 key.AccessTokenCallback,
-                key.SspiContextProvider);
+                key.SspiContextProvider,
+                metrics: Metrics);
         }
 
         private static DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(SqlConnectionOptions connectionOptions)
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 228e949cd0..c545685c9e 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -13,6 +13,7 @@
 using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.ProviderBase;
 using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Data.SqlClient.Diagnostics;
 using Microsoft.Data.SqlClient.Tests.Common;
 using Microsoft.Extensions.Time.Testing;
 using Xunit;
@@ -1365,6 +1366,20 @@ private static void BackdateReturnedTime(DbConnectionInternal connection, TimeSp
         /// </summary>
         internal class SuccessfulSqlConnectionFactory : SqlConnectionFactory
         {
+            internal SuccessfulSqlConnectionFactory()
+            {
+            }
+
+            /// <summary>
+            /// Constructs a factory reporting to <paramref name="metrics"/> instead of the
+            /// process-wide default, so a test can assert exact counters on the same instance
+            /// used by the pool under test.
+            /// </summary>
+            internal SuccessfulSqlConnectionFactory(ISqlClientMetrics metrics)
+                : base(metrics)
+            {
+            }
+
             /// <summary>
             /// Gets the last timeout budget passed through by the pool to the factory.
             /// </summary>
@@ -1383,7 +1398,7 @@ protected override DbConnectionInternal CreateConnection(
                 TimeoutTimer timeout)
             {
                 CapturedTimeout = timeout;
-                return new StubDbConnectionInternal();
+                return new StubDbConnectionInternal(Metrics);
             }
         }
 
@@ -1415,6 +1430,11 @@ protected override DbConnectionInternal CreateConnection(
         /// </summary>
         internal class StubDbConnectionInternal : DbConnectionInternal
         {
+            internal StubDbConnectionInternal(ISqlClientMetrics? metrics = null)
+                : base(metrics)
+            {
+            }
+
             #region Not Implemented Members
             public override string ServerVersion => throw new NotImplementedException();
 
@@ -1427,12 +1447,15 @@ public override DbTransaction BeginTransaction(System.Data.IsolationLevel il)
 
             public override void EnlistTransaction(Transaction transaction)
             {
-                return;
+                if (transaction != null)
+                {
+                    EnlistedTransaction = transaction;
+                }
             }
 
             protected override void Activate(Transaction transaction)
             {
-                return;
+                EnlistedTransaction = transaction;
             }
 
             protected override void Deactivate()
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolInstrumentationTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolInstrumentationTest.cs
new file mode 100644
index 0000000000..25d98b351e
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolInstrumentationTest.cs
@@ -0,0 +1,830 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Transactions;
+using Microsoft.Data.Common;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Data.SqlClient.Diagnostics;
+using Microsoft.Data.SqlClient.Tests.Common;
+using Microsoft.Extensions.Time.Testing;
+using Xunit;
+
+using static Microsoft.Data.SqlClient.UnitTests.ConnectionPool.ChannelDbConnectionPoolTest;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Verifies the diagnostic instrumentation shared by <see cref="ChannelDbConnectionPool"/> and
+    /// <see cref="WaitHandleDbConnectionPool"/>: the pool metrics counters emitted across the
+    /// connection lifecycle, parameterized over both pool implementations via
+    /// <see cref="PoolImplementation"/> wherever their behavior is expected to match.
+    /// </summary>
+    public class DbConnectionPoolInstrumentationTest
+    {
+        /// <summary>
+        /// Identifies which pool implementation a parameterized metric test exercises.
+        /// </summary>
+        public enum PoolImplementation
+        {
+            /// <summary>The legacy <see cref="WaitHandleDbConnectionPool"/>.</summary>
+            WaitHandle,
+
+            /// <summary>The <see cref="ChannelDbConnectionPool"/>.</summary>
+            Channel,
+        }
+
+        /// <summary>
+        /// Builds the pool group shared by both pool implementations.
+        /// </summary>
+        private static DbConnectionPoolGroup ConstructPoolGroup(
+            string connectionString,
+            int maxPoolSize,
+            int minPoolSize,
+            int idleTimeout)
+        {
+            DbConnectionPoolGroupOptions poolGroupOptions = new(
+                poolByIdentity: false,
+                minPoolSize: minPoolSize,
+                maxPoolSize: maxPoolSize,
+                creationTimeout: 15,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: idleTimeout);
+
+            return new DbConnectionPoolGroup(
+                new SqlConnectionOptions(connectionString),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                poolGroupOptions);
+        }
+
+        /// <summary>
+        /// Builds the requested pool implementation behind the shared pool interface, reporting to
+        /// the supplied metrics instance.
+        /// </summary>
+        private static IDbConnectionPool ConstructPool(
+            PoolImplementation implementation,
+            ISqlClientMetrics metrics,
+            SqlConnectionFactory connectionFactory,
+            string connectionString = "Data Source=localhost;",
+            int maxPoolSize = 50,
+            int minPoolSize = 0,
+            int idleTimeout = 0)
+        {
+            DbConnectionPoolGroup poolGroup = ConstructPoolGroup(connectionString, maxPoolSize, minPoolSize, idleTimeout);
+
+            return implementation switch
+            {
+                PoolImplementation.WaitHandle => new WaitHandleDbConnectionPool(
+                    connectionFactory,
+                    poolGroup,
+                    DbConnectionPoolIdentity.NoIdentity,
+                    new DbConnectionPoolProviderInfo(),
+                    timeProvider: new FakeTimeProvider(),
+                    metrics: metrics),
+
+                PoolImplementation.Channel => new ChannelDbConnectionPool(
+                    connectionFactory,
+                    poolGroup,
+                    DbConnectionPoolIdentity.NoIdentity,
+                    new DbConnectionPoolProviderInfo(),
+                    connectionCreationRateLimiter: null,
+                    timeProvider: new FakeTimeProvider(),
+                    metrics: metrics),
+
+                _ => throw new ArgumentOutOfRangeException(nameof(implementation)),
+            };
+        }
+
+        /// <summary>
+        /// Asserts the exact value of every counter a pool is responsible for. Any counter not named
+        /// by the caller is expected to be zero, so an unexpected emission fails the test.
+        /// </summary>
+        /// <remarks>
+        /// <paramref name="activeConnections"/> is a parameter, not derived from the soft-connect
+        /// counters, precisely because it is not guaranteed to move in lockstep with them: this is
+        /// the counter https://github.com/dotnet/SqlClient/issues/3640 broke by deactivating a
+        /// transacted connection twice on its way back to general circulation, which decremented
+        /// activeConnections an extra time without touching softConnects/softDisconnects at all.
+        /// </remarks>
+        private static void AssertCounters(
+            FakeSqlClientMetrics metrics,
+            long hardConnects = 0,
+            long hardDisconnects = 0,
+            long softConnects = 0,
+            long softDisconnects = 0,
+            long pooledConnections = 0,
+            long freeConnections = 0,
+            long reclaimedConnections = 0,
+            long activeConnections = 0,
+            long stasisConnections = 0)
+        {
+            (string Name, long Expected, long Actual)[] counters =
+            {
+                ("hardConnects", hardConnects, metrics.HardConnects),
+                ("hardDisconnects", hardDisconnects, metrics.HardDisconnects),
+                ("activeHardConnections", hardConnects - hardDisconnects, metrics.ActiveHardConnections),
+                ("softConnects", softConnects, metrics.SoftConnects),
+                ("softDisconnects", softDisconnects, metrics.SoftDisconnects),
+                ("activeSoftConnections", softConnects - softDisconnects, metrics.ActiveSoftConnections),
+                ("pooledConnections", pooledConnections, metrics.PooledConnections),
+                ("freeConnections", freeConnections, metrics.FreeConnections),
+                ("reclaimedConnections", reclaimedConnections, metrics.ReclaimedConnections),
+                ("activeConnections", activeConnections, metrics.ActiveConnections),
+                ("stasisConnections", stasisConnections, metrics.StasisConnections),
+
+                // Not emitted through a pool's metrics instance, so any non-zero value here means a
+                // counter has moved to the pool that the tests have not accounted for.
+                ("nonPooledConnections", 0, metrics.NonPooledConnections),
+                ("activeConnectionPoolGroups", 0, metrics.ActiveConnectionPoolGroups),
+                ("inactiveConnectionPoolGroups", 0, metrics.InactiveConnectionPoolGroups),
+                ("activeConnectionPools", 0, metrics.ActiveConnectionPools),
+                ("inactiveConnectionPools", 0, metrics.InactiveConnectionPools),
+            };
+
+            // Reported as a single message listing only the counters that differ. Asserting on a
+            // collection instead would be truncated by the assertion formatter, which hides the one
+            // counter the test is about.
+            List<string> mismatches = new();
+            foreach ((string name, long expected, long actual) in counters)
+            {
+                if (actual != expected)
+                {
+                    mismatches.Add($"{name}: expected {expected}, actual {actual}");
+                }
+            }
+
+            Assert.True(mismatches.Count == 0, string.Join(Environment.NewLine, mismatches));
+        }
+
+        /// <summary>
+        /// Verifies the counters emitted when the pool creates a physical connection to satisfy a
+        /// request, covering Story 2 scenario 1.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void NewConnection_CountsHardConnectAndPooledConnection(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(implementation, metrics, new SuccessfulSqlConnectionFactory(metrics));
+            SqlConnection owner = new();
+
+            // Act
+            Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection));
+
+            // Assert - the connection was handed straight to the caller, so it never became free.
+            Assert.NotNull(connection);
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 1,
+                pooledConnections: 1,
+                activeConnections: 1);
+        }
+
+        /// <summary>
+        /// Verifies the counters emitted when a request is satisfied from the idle pool rather than
+        /// by creating a connection, covering Story 2 scenario 3.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void IdleConnectionReuse_CountsSoftConnect(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(implementation, metrics, new SuccessfulSqlConnectionFactory(metrics));
+            SqlConnection owner = new();
+            Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection));
+            Assert.NotNull(connection);
+            pool.ReturnInternalConnection(connection!, owner);
+
+            // Act
+            Assert.True(pool.TryGetConnection(new SqlConnection(), null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? reused));
+
+            // Assert - the second request was served without a second physical connect.
+            Assert.Same(connection, reused);
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 2,
+                softDisconnects: 1,
+                pooledConnections: 1,
+                activeConnections: 1);
+        }
+
+        /// <summary>
+        /// Verifies the counters emitted when a connection is returned to the idle pool, covering
+        /// Story 2 scenario 4.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void Return_CountsSoftDisconnect(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(implementation, metrics, new SuccessfulSqlConnectionFactory(metrics));
+            SqlConnection owner = new();
+            Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection));
+            Assert.NotNull(connection);
+
+            // Act
+            pool.ReturnInternalConnection(connection!, owner);
+
+            // Assert - the connection is still pooled, and is now also free.
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 1,
+                softDisconnects: 1,
+                pooledConnections: 1,
+                freeConnections: 1);
+        }
+
+        /// <summary>
+        /// Verifies the counters emitted when a physical connection is destroyed, covering Story 2
+        /// scenario 2.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void Destroy_CountsHardDisconnect(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(implementation, metrics, new SuccessfulSqlConnectionFactory(metrics));
+            SqlConnection owner = new();
+            Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection));
+            Assert.NotNull(connection);
+            pool.ReturnInternalConnection(connection!, owner);
+
+            // Act
+            pool.Clear();
+
+            // Assert - every gauge the connection contributed to is back to zero.
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                hardDisconnects: 1,
+                softConnects: 1,
+                softDisconnects: 1);
+        }
+
+        /// <summary>
+        /// Verifies the counters emitted when a checked-out connection is replaced. Both pools swap
+        /// the new connection in for the old one, so the caller's checkout is unchanged: the
+        /// replacement is a soft connect and retiring the old connection is a soft disconnect plus
+        /// a hard disconnect.
+        /// </summary>
+        /// <remarks>
+        /// Neither pool changes the pooled-connection gauge: the channel pool reuses the old
+        /// connection's slot, and the wait handle pool swaps the replacement into the old
+        /// connection's place in its object list.
+        /// </remarks>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void ReplaceConnection_CountsDisconnectsForDiscardedConnection(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(implementation, metrics, new SuccessfulSqlConnectionFactory(metrics));
+            SqlConnection owner = new();
+            Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? oldConnection));
+            Assert.NotNull(oldConnection);
+
+            // Act
+            DbConnectionInternal newConnection = pool.ReplaceConnection(owner, oldConnection!, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)));
+
+            // Assert - two physical connections were opened and one was retired. The caller still
+            // holds exactly one connection, so the soft connect for the replacement is balanced by
+            // a soft disconnect for the connection it displaced.
+            Assert.NotSame(oldConnection, newConnection);
+            AssertCounters(
+                metrics,
+                hardConnects: 2,
+                hardDisconnects: 1,
+                softConnects: 2,
+                softDisconnects: 1,
+                pooledConnections: 1,
+                activeConnections: 1);
+        }
+
+        /// <summary>
+        /// Regression test for https://github.com/dotnet/SqlClient/issues/3640. Returning a
+        /// connection while it is still enlisted in a transaction parks it in the transacted
+        /// store rather than handing it back for reuse, but the connection is still deactivated
+        /// exactly once. When the transaction later ends and the connection rejoins the idle
+        /// pool, that hand-off must not deactivate it a second time, or activeConnections is
+        /// decremented twice for a single logical checkout.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void TransactionCommit_ReleasingParkedConnection_KeepsActiveConnectionCountBalanced(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(implementation, metrics, new SuccessfulSqlConnectionFactory(metrics));
+
+            using (TransactionScope scope = new())
+            {
+                SqlConnection owner = new();
+                Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection));
+                Assert.NotNull(connection);
+
+                // Act - the connection is still enlisted, so it is parked rather than reused.
+                pool.ReturnInternalConnection(connection!, owner);
+
+                // Assert - the park deactivates the connection exactly once.
+                AssertCounters(
+                    metrics,
+                    hardConnects: 1,
+                    softConnects: 1,
+                    softDisconnects: 1,
+                    pooledConnections: 1,
+                    freeConnections: 1,
+                    activeConnections: 0);
+
+                scope.Complete();
+            }
+
+            // Assert - once the transaction commits and the connection rejoins the idle pool, the
+            // counters must be unchanged from the park above. If the #3640 bug pattern were
+            // reintroduced (deactivating on the way out of the transacted store, rather than
+            // resetting), activeConnections would go negative here.
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 1,
+                softDisconnects: 1,
+                pooledConnections: 1,
+                freeConnections: 1,
+                activeConnections: 0);
+        }
+
+        /// <summary>
+        /// Same regression as <see cref="TransactionCommit_ReleasingParkedConnection_KeepsActiveConnectionCountBalanced"/>,
+        /// but the transaction is rolled back rather than committed. Rollback and commit both end
+        /// the transaction through the same completion callback, so this covers that the fix does
+        /// not depend on the outcome of the transaction.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void TransactionRollback_ReleasingParkedConnection_KeepsActiveConnectionCountBalanced(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(implementation, metrics, new SuccessfulSqlConnectionFactory(metrics));
+
+            using (TransactionScope scope = new())
+            {
+                SqlConnection owner = new();
+                Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection));
+                Assert.NotNull(connection);
+
+                pool.ReturnInternalConnection(connection!, owner);
+
+                AssertCounters(
+                    metrics,
+                    hardConnects: 1,
+                    softConnects: 1,
+                    softDisconnects: 1,
+                    pooledConnections: 1,
+                    freeConnections: 1,
+                    activeConnections: 0);
+
+                // Act - scope disposed without Complete(), rolling the transaction back.
+            }
+
+            // Assert - same expectation as the commit case: no extra deactivation on rollback.
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 1,
+                softDisconnects: 1,
+                pooledConnections: 1,
+                freeConnections: 1,
+                activeConnections: 0);
+        }
+
+        /// <summary>
+        /// Verifies that a connection which opens successfully but fails to activate leaves the
+        /// counters balanced. The pool counts the checkout before activating, so the soft
+        /// disconnect emitted when the failed connection is returned has a matching soft connect
+        /// and the active-soft-connects gauge does not go negative.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void FailedActivation_LeavesCountersBalanced(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(implementation, metrics, new ActivationFailingConnectionFactory(metrics));
+            SqlConnection owner = new();
+
+            // Act
+            Assert.Throws<TestConnectionCreateException>(() =>
+                pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out _));
+
+            // Assert - the physical connection was opened and stays in the pool, and the checkout
+            // that failed is balanced by the return.
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 1,
+                softDisconnects: 1,
+                pooledConnections: 1,
+                freeConnections: 1,
+                activeConnections: 0);
+        }
+
+        /// <summary>
+        /// Drives concurrent checkouts and returns through the pool and verifies that every gauge
+        /// settles back to a consistent resting state. This is the broad safety net for the
+        /// counters: it does not assert a specific interleaving, only that nothing is leaked or
+        /// double-counted once all activity has stopped.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void ConcurrentCheckoutAndReturn_SettlesAllGaugesToZero(PoolImplementation implementation)
+        {
+            // Arrange
+            const int Threads = 8;
+            const int IterationsPerThread = 50;
+            const int MaxPoolSize = 4;
+
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(
+                implementation,
+                metrics,
+                new SuccessfulSqlConnectionFactory(metrics),
+                maxPoolSize: MaxPoolSize);
+
+            // Act
+            Task[] workers = Enumerable.Range(0, Threads).Select(_ => Task.Run(() =>
+            {
+                for (int i = 0; i < IterationsPerThread; i++)
+                {
+                    SqlConnection owner = new();
+                    Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(30)), out DbConnectionInternal? connection));
+                    Assert.NotNull(connection);
+                    pool.ReturnInternalConnection(connection!, owner);
+                }
+            })).ToArray();
+
+            Assert.True(Task.WaitAll(workers, TimeSpan.FromSeconds(60)), "Concurrent checkout workers did not finish in time.");
+
+            // Assert - every connection handed out came back, so no checkout is still outstanding.
+            long expectedCheckouts = Threads * IterationsPerThread;
+            Assert.Equal(expectedCheckouts, metrics.SoftConnects);
+            Assert.Equal(expectedCheckouts, metrics.SoftDisconnects);
+            Assert.Equal(0, metrics.ActiveConnections);
+
+            // Every physical connection that was opened is either still pooled or was destroyed.
+            Assert.Equal(metrics.PooledConnections, metrics.HardConnects - metrics.HardDisconnects);
+
+            // Nothing is checked out, so every pooled connection is sitting idle.
+            Assert.Equal(metrics.PooledConnections, metrics.FreeConnections);
+
+            // The pool never grew past its configured ceiling.
+            Assert.InRange(metrics.PooledConnections, 0, MaxPoolSize);
+        }
+
+        /// <summary>
+        /// Verifies the counters emitted when idle connections are pruned out of the pool. Pruning
+        /// destroys the physical connection, so it must decrement both the pooled and free gauges
+        /// and record a hard disconnect, without touching the soft counters: pruning removes an
+        /// idle connection that no caller holds.
+        /// </summary>
+        [Fact]
+        public void PruneConnections_CountsHardDisconnectForEachEvictedConnection()
+        {
+            // Arrange - check out three connections so they are all open at once, then return them
+            // so they sit idle and are eligible for pruning.
+            FakeSqlClientMetrics metrics = new();
+            ChannelDbConnectionPool pool = (ChannelDbConnectionPool)ConstructPool(
+                PoolImplementation.Channel,
+                metrics,
+                new SuccessfulSqlConnectionFactory(metrics));
+
+            List<(SqlConnection Owner, DbConnectionInternal Connection)> checkedOut = new();
+            for (int i = 0; i < 3; i++)
+            {
+                SqlConnection owner = new();
+                Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection));
+                checkedOut.Add((owner, connection!));
+            }
+
+            foreach ((SqlConnection owner, DbConnectionInternal connection) in checkedOut)
+            {
+                pool.ReturnInternalConnection(connection, owner);
+            }
+
+            AssertCounters(
+                metrics,
+                hardConnects: 3,
+                softConnects: 3,
+                softDisconnects: 3,
+                pooledConnections: 3,
+                freeConnections: 3,
+                activeConnections: 0);
+
+            // Act - prune two of the three idle connections.
+            pool.PruneConnections(2);
+
+            // Assert - the two evicted connections were destroyed, and pruning did not disturb the
+            // soft counters because nothing was checked out or returned.
+            Assert.Equal(1, pool.Count);
+            AssertCounters(
+                metrics,
+                hardConnects: 3,
+                hardDisconnects: 2,
+                softConnects: 3,
+                softDisconnects: 3,
+                pooledConnections: 1,
+                freeConnections: 1,
+                activeConnections: 0);
+        }
+
+        /// <summary>
+        /// Verifies the counters emitted when a transaction root that cannot be pooled is returned:
+        /// the pool puts it in stasis rather than destroying it, because closing it would orphan the
+        /// root transaction with no way to commit or roll back. The stasis gauge must come back down
+        /// when the transaction ends, or every delegated transaction leaks a count.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void NonPoolableTransactionRoot_CountsStasisEnterAndExit(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(implementation, metrics, new TransactionRootConnectionFactory(metrics));
+
+            using (TransactionScope scope = new())
+            {
+                SqlConnection owner = new();
+                Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection));
+                Assert.NotNull(connection);
+
+                TransactionRootConnection root = Assert.IsType<TransactionRootConnection>(connection);
+                root.MarkDoNotPool();
+                Assert.False(root.CanBePooled);
+                Assert.False(root.IsConnectionDoomed);
+
+                // Act
+                pool.ReturnInternalConnection(connection!, owner);
+
+                // Assert - in stasis, not pooled and not destroyed.
+                Assert.True(root.IsTxRootWaitingForTxEnd);
+                AssertCounters(
+                    metrics,
+                    hardConnects: 1,
+                    softConnects: 1,
+                    softDisconnects: 1,
+                    pooledConnections: 1,
+                    stasisConnections: 1);
+
+                scope.Complete();
+            }
+
+            // Assert - the transaction ended, so stasis terminated and the connection, still
+            // unpoolable, was destroyed on the way out.
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                hardDisconnects: 1,
+                softConnects: 1,
+                softDisconnects: 1,
+                pooledConnections: 0,
+                stasisConnections: 0);
+        }
+
+        /// <summary>
+        /// A shut-down pool destroys an ordinary connection on return, but a transaction root must
+        /// still go to stasis instead, or shutting a pool down would abort a live transaction. This
+        /// is the second way into stasis, and it must be counted and uncounted the same way.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void TransactionRootReturnedToShutDownPool_CountsStasisEnterAndExit(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            IDbConnectionPool pool = ConstructPool(implementation, metrics, new TransactionRootConnectionFactory(metrics));
+
+            using (TransactionScope scope = new())
+            {
+                SqlConnection owner = new();
+                Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection));
+                Assert.NotNull(connection);
+
+                pool.Shutdown();
+
+                // Act
+                pool.ReturnInternalConnection(connection!, owner);
+
+                // Assert
+                Assert.True(connection!.IsTxRootWaitingForTxEnd);
+                AssertCounters(
+                    metrics,
+                    hardConnects: 1,
+                    softConnects: 1,
+                    softDisconnects: 1,
+                    pooledConnections: 1,
+                    stasisConnections: 1);
+
+                scope.Complete();
+            }
+
+            // Assert - the pool is not running, so the connection is destroyed on the way out of
+            // stasis rather than pooled, and the gauge returns to zero either way.
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                hardDisconnects: 1,
+                softConnects: 1,
+                softDisconnects: 1,
+                pooledConnections: 0,
+                stasisConnections: 0);
+        }
+
+        /// <summary>
+        /// The third way into stasis, and the only one that leaves by the other exit. When the idle
+        /// sweep ages out a free connection that happens to be a transaction root, it puts it in
+        /// stasis rather than destroying it. The connection is still pooled at that point, so when
+        /// the transaction ends it returns to general circulation instead of being disposed. This is
+        /// specific to <see cref="WaitHandleDbConnectionPool"/>; the channel pool has no generational
+        /// sweep.
+        /// </summary>
+        [Fact]
+        public void IdleSweepOfTransactionRoot_CountsStasisExitOnReturnToPool()
+        {
+            // Arrange - checked out and returned with no ambient transaction, so the connection is
+            // filed in the general free pool rather than the transacted store, while still
+            // reporting itself as a transaction root.
+            FakeSqlClientMetrics metrics = new();
+            WaitHandleDbConnectionPool pool = Assert.IsType<WaitHandleDbConnectionPool>(
+                ConstructPool(
+                    PoolImplementation.WaitHandle,
+                    metrics,
+                    new TransactionRootConnectionFactory(metrics),
+                    idleTimeout: 1));
+
+            SqlConnection owner = new();
+            Assert.True(pool.TryGetConnection(owner, null, TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)), out DbConnectionInternal? connection));
+            Assert.NotNull(connection);
+            pool.ReturnInternalConnection(connection!, owner);
+
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 1,
+                softDisconnects: 1,
+                pooledConnections: 1,
+                freeConnections: 1);
+
+            // Act - the first sweep ages the connection from the new stack to the old stack, the
+            // second pops it off the old stack and finds it is a transaction root.
+            pool.CleanupCallback(null);
+            pool.CleanupCallback(null);
+
+            // Assert - in stasis rather than destroyed, and no longer counted as free.
+            Assert.True(connection!.IsTxRootWaitingForTxEnd);
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 1,
+                softDisconnects: 1,
+                pooledConnections: 1,
+                freeConnections: 0,
+                stasisConnections: 1);
+
+            // Act - the delegated transaction ends. Normally raised by System.Transactions through
+            // the connection's TransactionCompleted handler.
+            connection!.DelegatedTransactionEnded();
+
+            // Assert - the connection was still pooled, so it rejoins general circulation rather
+            // than being disposed, and the stasis gauge comes back down.
+            Assert.False(connection!.IsTxRootWaitingForTxEnd);
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 1,
+                softDisconnects: 1,
+                pooledConnections: 1,
+                freeConnections: 1,
+                stasisConnections: 0);
+        }
+
+        #region Test classes
+
+        /// <summary>
+        /// Distinctive exception type used to prove that the exact failure recorded by the pool is
+        /// the one raised by the connection under test.
+        /// </summary>
+        internal sealed class TestConnectionCreateException : Exception
+        {
+            internal TestConnectionCreateException()
+                : base("Simulated connection activation failure.")
+            {
+            }
+        }
+
+        /// <summary>
+        /// Stub connection whose activation always fails, so a test can exercise the pool's
+        /// behavior when a connection is successfully opened but cannot be handed to the caller.
+        /// </summary>
+        private sealed class ActivationFailingConnection : StubDbConnectionInternal
+        {
+            internal ActivationFailingConnection(ISqlClientMetrics metrics)
+                : base(metrics)
+            {
+            }
+
+            protected override void Activate(Transaction transaction)
+                => throw new TestConnectionCreateException();
+        }
+
+        /// <summary>
+        /// Connection factory whose connections open successfully but always fail to activate.
+        /// </summary>
+        private sealed class ActivationFailingConnectionFactory : SqlConnectionFactory
+        {
+            internal ActivationFailingConnectionFactory(ISqlClientMetrics metrics)
+                : base(metrics)
+            {
+            }
+
+            /// <inheritdoc />
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+                => new ActivationFailingConnection(Metrics);
+        }
+
+        /// <summary>
+        /// Stub connection that reports itself as the root of a delegated transaction, which is what
+        /// makes a pool put it in stasis on return rather than pooling or destroying it.
+        /// </summary>
+        private sealed class TransactionRootConnection : StubDbConnectionInternal
+        {
+            internal TransactionRootConnection(ISqlClientMetrics metrics)
+                : base(metrics)
+            {
+            }
+
+            internal override bool IsTransactionRoot => true;
+
+            /// <summary>
+            /// Marks the connection unfit for pooling without dooming it. A doomed connection
+            /// short-circuits the return path before the stasis decision is ever reached, so a test
+            /// that wants stasis must use this instead.
+            /// </summary>
+            internal void MarkDoNotPool() => DoNotPoolThisConnection();
+        }
+
+        /// <summary>
+        /// Connection factory whose connections are all transaction roots.
+        /// </summary>
+        private sealed class TransactionRootConnectionFactory : SqlConnectionFactory
+        {
+            internal TransactionRootConnectionFactory(ISqlClientMetrics metrics)
+                : base(metrics)
+            {
+            }
+
+            /// <inheritdoc />
+            protected override DbConnectionInternal CreateConnection(
+                SqlConnectionOptions options,
+                ConnectionPoolKey poolKey,
+                DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
+                IDbConnectionPool pool,
+                DbConnection owningConnection,
+                TimeoutTimer timeout)
+                => new TransactionRootConnection(Metrics);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/FakeSqlClientMetrics.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/FakeSqlClientMetrics.cs
new file mode 100644
index 0000000000..b39aaa78cd
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/FakeSqlClientMetrics.cs
@@ -0,0 +1,132 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading;
+using Microsoft.Data.SqlClient.Diagnostics;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Records every counter <see cref="ISqlClientMetrics"/> exposes, into fields the tests can
+    /// read directly.
+    /// </summary>
+    /// <remarks>
+    /// The production counters are not usable for assertions. On .NET they are only observable
+    /// through an EventCounter listener, whose polling interval would make these tests slow and
+    /// timing dependent. On .NET Framework they are performance counters whose instance name is
+    /// derived from the assembly name and process id, so every instance in the process shares one
+    /// counter, and constructing one resets it.
+    /// </remarks>
+    internal sealed class FakeSqlClientMetrics : ISqlClientMetrics
+    {
+        private long _hardConnects;
+        private long _hardDisconnects;
+        private long _softConnects;
+        private long _softDisconnects;
+        private long _nonPooledConnections;
+        private long _pooledConnections;
+        private long _activeConnectionPoolGroups;
+        private long _inactiveConnectionPoolGroups;
+        private long _activeConnectionPools;
+        private long _inactiveConnectionPools;
+        private long _activeConnections;
+        private long _freeConnections;
+        private long _stasisConnections;
+        private long _reclaimedConnections;
+
+        /// <summary>Physical connections opened.</summary>
+        internal long HardConnects => Interlocked.Read(ref _hardConnects);
+
+        /// <summary>Physical connections closed.</summary>
+        internal long HardDisconnects => Interlocked.Read(ref _hardDisconnects);
+
+        /// <summary>Physical connections currently open.</summary>
+        internal long ActiveHardConnections => HardConnects - HardDisconnects;
+
+        /// <summary>Connections handed out from the pool.</summary>
+        internal long SoftConnects => Interlocked.Read(ref _softConnects);
+
+        /// <summary>Connections returned to the pool.</summary>
+        internal long SoftDisconnects => Interlocked.Read(ref _softDisconnects);
+
+        /// <summary>Connections currently handed out.</summary>
+        internal long ActiveSoftConnections => SoftConnects - SoftDisconnects;
+
+        /// <summary>Connections currently bypassing the pool.</summary>
+        internal long NonPooledConnections => Interlocked.Read(ref _nonPooledConnections);
+
+        /// <summary>Connections currently owned by a pool.</summary>
+        internal long PooledConnections => Interlocked.Read(ref _pooledConnections);
+
+        /// <summary>Connection pool groups currently active.</summary>
+        internal long ActiveConnectionPoolGroups => Interlocked.Read(ref _activeConnectionPoolGroups);
+
+        /// <summary>Connection pool groups currently awaiting pruning.</summary>
+        internal long InactiveConnectionPoolGroups => Interlocked.Read(ref _inactiveConnectionPoolGroups);
+
+        /// <summary>Connection pools currently active.</summary>
+        internal long ActiveConnectionPools => Interlocked.Read(ref _activeConnectionPools);
+
+        /// <summary>Connection pools currently awaiting pruning.</summary>
+        internal long InactiveConnectionPools => Interlocked.Read(ref _inactiveConnectionPools);
+
+        /// <summary>Connections currently in use by the application.</summary>
+        internal long ActiveConnections => Interlocked.Read(ref _activeConnections);
+
+        /// <summary>Connections currently idle in a pool.</summary>
+        internal long FreeConnections => Interlocked.Read(ref _freeConnections);
+
+        /// <summary>Connections currently awaiting cleanup.</summary>
+        internal long StasisConnections => Interlocked.Read(ref _stasisConnections);
+
+        /// <summary>Connections reclaimed after being abandoned without being closed.</summary>
+        internal long ReclaimedConnections => Interlocked.Read(ref _reclaimedConnections);
+
+        public void HardConnectRequest() => Interlocked.Increment(ref _hardConnects);
+
+        public void HardDisconnectRequest() => Interlocked.Increment(ref _hardDisconnects);
+
+        public void SoftConnectRequest() => Interlocked.Increment(ref _softConnects);
+
+        public void SoftDisconnectRequest() => Interlocked.Increment(ref _softDisconnects);
+
+        public void EnterNonPooledConnection() => Interlocked.Increment(ref _nonPooledConnections);
+
+        public void ExitNonPooledConnection() => Interlocked.Decrement(ref _nonPooledConnections);
+
+        public void EnterPooledConnection() => Interlocked.Increment(ref _pooledConnections);
+
+        public void ExitPooledConnection() => Interlocked.Decrement(ref _pooledConnections);
+
+        public void EnterActiveConnectionPoolGroup() => Interlocked.Increment(ref _activeConnectionPoolGroups);
+
+        public void ExitActiveConnectionPoolGroup() => Interlocked.Decrement(ref _activeConnectionPoolGroups);
+
+        public void EnterInactiveConnectionPoolGroup() => Interlocked.Increment(ref _inactiveConnectionPoolGroups);
+
+        public void ExitInactiveConnectionPoolGroup() => Interlocked.Decrement(ref _inactiveConnectionPoolGroups);
+
+        public void EnterActiveConnectionPool() => Interlocked.Increment(ref _activeConnectionPools);
+
+        public void ExitActiveConnectionPool() => Interlocked.Decrement(ref _activeConnectionPools);
+
+        public void EnterInactiveConnectionPool() => Interlocked.Increment(ref _inactiveConnectionPools);
+
+        public void ExitInactiveConnectionPool() => Interlocked.Decrement(ref _inactiveConnectionPools);
+
+        public void EnterActiveConnection() => Interlocked.Increment(ref _activeConnections);
+
+        public void ExitActiveConnection() => Interlocked.Decrement(ref _activeConnections);
+
+        public void EnterFreeConnection() => Interlocked.Increment(ref _freeConnections);
+
+        public void ExitFreeConnection() => Interlocked.Decrement(ref _freeConnections);
+
+        public void EnterStasisConnection() => Interlocked.Increment(ref _stasisConnections);
+
+        public void ExitStasisConnection() => Interlocked.Decrement(ref _stasisConnections);
+
+        public void ReclaimedConnectionRequest() => Interlocked.Increment(ref _reclaimedConnections);
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
index 588418ac03..6866fb1fa2 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.ConnectionPool;
 using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.Diagnostics;
 using Xunit;
 using System.Data;
 using System.Data.Common;
@@ -22,6 +23,14 @@ namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool;
 
 public class TransactedConnectionPoolTest
 {
+    /// <summary>
+    /// Constructs a <see cref="TransactedConnectionPool"/> reporting to <paramref name="pool"/>'s
+    /// own metrics instance, matching how <see cref="WaitHandleDbConnectionPool"/> constructs one
+    /// in production.
+    /// </summary>
+    private static TransactedConnectionPool NewTransactedPool(MockDbConnectionPool pool) =>
+        new(pool, pool.Metrics);
+
     #region Constructor Tests
 
     [Fact]
@@ -31,7 +40,7 @@ public void Constructor_WithValidPool_SetsPoolProperty()
         var mockPool = new MockDbConnectionPool();
 
         // Act
-        var transactedPool = new TransactedConnectionPool(mockPool);
+        var transactedPool = NewTransactedPool(mockPool);
 
         // Assert
         Assert.Same(mockPool, transactedPool.Pool);
@@ -42,8 +51,8 @@ public void Constructor_WithValidPool_SetsPoolProperty()
     public void Constructor_UniqueIds()
     {
         // Arrange
-        var pool1 = new TransactedConnectionPool(new MockDbConnectionPool());
-        var pool2 = new TransactedConnectionPool(new MockDbConnectionPool());
+        var pool1 = NewTransactedPool(new MockDbConnectionPool());
+        var pool2 = NewTransactedPool(new MockDbConnectionPool());
 
         // Act & Assert
         Assert.NotEqual(pool1.Id, pool2.Id);
@@ -59,7 +68,7 @@ public void Constructor_UniqueIds()
     public void GetTransactedObject_WithNonExistentTransaction_ReturnsNull()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         using var transactionScope = new TransactionScope();
         var transaction = Transaction.Current!;
 
@@ -74,7 +83,7 @@ public void GetTransactedObject_WithNonExistentTransaction_ReturnsNull()
     public void GetTransactedObject_WithExistingTransaction_ReturnsAndRemovesConnection()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connection = new MockDbConnectionInternal();
         
         using var transactionScope = new TransactionScope();
@@ -98,7 +107,7 @@ public void GetTransactedObject_WithExistingTransaction_ReturnsAndRemovesConnect
     public void GetTransactedObject_WithMultipleConnections_ReturnsLastAdded()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connection1 = new MockDbConnectionInternal();
         var connection2 = new MockDbConnectionInternal();
         
@@ -120,7 +129,7 @@ public void GetTransactedObject_WithMultipleConnections_ReturnsLastAdded()
     public void GetTransactedObject_ConcurrentAccess_ThreadSafe()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connections = new DbConnectionInternal[10];
         for (int i = 0; i < connections.Length; i++)
         {
@@ -165,7 +174,7 @@ public void GetTransactedObject_ConcurrentAccess_ThreadSafe()
     public void PutTransactedObject_WithNullConnection_ThrowsArgumentNullException()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         
         using var transactionScope = new TransactionScope();
         var transaction = Transaction.Current!;
@@ -179,7 +188,7 @@ public void PutTransactedObject_WithNullConnection_ThrowsArgumentNullException()
     public void PutTransactedObject_WithNewTransaction_CreatesNewConnectionList()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connection = new MockDbConnectionInternal();
         
         using var transactionScope = new TransactionScope();
@@ -197,7 +206,7 @@ public void PutTransactedObject_WithNewTransaction_CreatesNewConnectionList()
     public void PutTransactedObject_WithExistingTransaction_AddsToExistingConnectionList()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connection1 = new MockDbConnectionInternal();
         var connection2 = new MockDbConnectionInternal();
         
@@ -220,7 +229,7 @@ public void PutTransactedObject_WithExistingTransaction_AddsToExistingConnection
     public void PutTransactedObject_ConcurrentAccess_ThreadSafe()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connections = new DbConnectionInternal[10];
         for (int i = 0; i < connections.Length; i++)
         {
@@ -259,7 +268,7 @@ public void PutTransactedObject_SameConnectionTwice_AddsToPoolTwice()
         // TODO: this behavior is suspicious should we prevent this?
 
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connection = new MockDbConnectionInternal();
 
         using var transactionScope = new TransactionScope();
@@ -285,7 +294,7 @@ public void PutTransactedObject_SameConnectionTwice_AddsToPoolTwice()
     public void TransactionEnded_WithNullConnection_ThrowsNullReferenceException()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         
         using var transactionScope = new TransactionScope();
         var transaction = Transaction.Current!;
@@ -299,7 +308,7 @@ public void TransactionEnded_WithNullConnection_ThrowsNullReferenceException()
     public void TransactionEnded_WithNonExistentTransaction_DoesNotThrow()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connection = new MockDbConnectionInternal();
         
         using var transactionScope = new TransactionScope();
@@ -315,7 +324,7 @@ public void TransactionEnded_WithExistingConnection_RemovesConnectionAndReturnsT
     {
         // Arrange
         var mockPool = new MockDbConnectionPool();
-        var transactedPool = new TransactedConnectionPool(mockPool);
+        var transactedPool = NewTransactedPool(mockPool);
         var connection = new MockDbConnectionInternal();
         
         using var transactionScope = new TransactionScope();
@@ -340,7 +349,7 @@ public void TransactionEnded_WithMultipleConnections_RemovesOnlySpecifiedConnect
     {
         // Arrange
         var mockPool = new MockDbConnectionPool();
-        var transactedPool = new TransactedConnectionPool(mockPool);
+        var transactedPool = NewTransactedPool(mockPool);
         var connection1 = new MockDbConnectionInternal();
         var connection2 = new MockDbConnectionInternal();
         
@@ -370,7 +379,7 @@ public void TransactionEnded_WithConnectionNotInPool_DoesNotReturnToMainPool()
     {
         // Arrange
         var mockPool = new MockDbConnectionPool();
-        var transactedPool = new TransactedConnectionPool(mockPool);
+        var transactedPool = NewTransactedPool(mockPool);
         var connection = new MockDbConnectionInternal();
         
         using var transactionScope = new TransactionScope();
@@ -390,7 +399,7 @@ public void TransactionEnded_ConcurrentAccess_ThreadSafe()
     {
         // Arrange
         var mockPool = new MockDbConnectionPool();
-        var transactedPool = new TransactedConnectionPool(mockPool);
+        var transactedPool = NewTransactedPool(mockPool);
         var connections = new DbConnectionInternal[10];
         for (int i = 0; i < connections.Length; i++)
         {
@@ -427,7 +436,7 @@ public void TransactionEnded_MultipleCallsWithSameConnection_OnlyReturnsOnce()
     {
         // Arrange
         var mockPool = new MockDbConnectionPool();
-        var transactedPool = new TransactedConnectionPool(mockPool);
+        var transactedPool = NewTransactedPool(mockPool);
         var connection = new MockDbConnectionInternal();
 
         using var transactionScope = new TransactionScope();
@@ -454,7 +463,7 @@ public void TransactionEnded_CalledBeforePut_HandlesRaceCondition()
 
         // Arrange
         var mockPool = new MockDbConnectionPool();
-        var transactedPool = new TransactedConnectionPool(mockPool);
+        var transactedPool = NewTransactedPool(mockPool);
         var connection = new MockDbConnectionInternal();
 
         using var transactionScope = new TransactionScope();
@@ -478,7 +487,7 @@ public void FullLifecycle_PutGetEnd_WorksCorrectly()
     {
         // Arrange
         var mockPool = new MockDbConnectionPool();
-        var transactedPool = new TransactedConnectionPool(mockPool);
+        var transactedPool = NewTransactedPool(mockPool);
         var connection = new MockDbConnectionInternal();
         
         using var transactionScope = new TransactionScope();
@@ -510,7 +519,7 @@ public void FullLifecycle_PutGetEnd_WorksCorrectly()
     public void MultipleTransactions_IsolatedCorrectly()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connection1 = new MockDbConnectionInternal();
         var connection2 = new MockDbConnectionInternal();
 
@@ -541,7 +550,7 @@ public void MultipleTransactions_IsolatedCorrectly()
     public void ConcurrentPutAndGet_DifferentTransactions_Isolated()
     {
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var numberOfTransactions = 5;
         var connectionsPerTransaction = 3;
         var results = new ConcurrentDictionary<int, List<DbConnectionInternal>>();
@@ -604,7 +613,7 @@ public void TransactionScope_CompleteAndDispose_HandledCorrectly()
         // the pool state will match the transaction state.
 
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connection = new MockDbConnectionInternal();
         Transaction? capturedTransaction = null;
 
@@ -627,7 +636,7 @@ public void PutTransactedObject_WithDisposedTransaction_HandlesGracefully()
         //TODO: this test should not pass! why would we store connections from a disposed transaction?
 
         // Arrange
-        var transactedPool = new TransactedConnectionPool(new MockDbConnectionPool());
+        var transactedPool = NewTransactedPool(new MockDbConnectionPool());
         var connection = new MockDbConnectionInternal();
         Transaction? disposedTransaction = null;
 
@@ -658,6 +667,10 @@ internal class MockDbConnectionPool : IDbConnectionPool
     {
         public ConcurrentDictionary<DbConnectionPoolAuthenticationContextKey, DbConnectionPoolAuthenticationContext> AuthenticationContexts { get; } = new();
         public SqlConnectionFactory ConnectionFactory => throw new NotImplementedException();
+        // TransactedConnectionPool reports free-connection counts through its owning pool, so this
+        // has to be a real sink rather than a throwing stub. A fake rather than the global
+        // instance, so these tests do not perturb process-wide counters.
+        public ISqlClientMetrics Metrics { get; } = new FakeSqlClientMetrics();
         public int Count => throw new NotImplementedException();
         public bool ErrorOccurred => throw new NotImplementedException();
         public int Id { get; } = 1;

From ee6fabd6b0ff7654ee8bcc0a2ac04c718758fa99 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Wed, 19 Aug 2026 12:38:32 -0500
Subject: [PATCH 234/298] Enhance VSM/HGS enclave session key binding
 validation (#4532)

* Enhance Always Encrypted VSM/HGS enclave attestation to validate enclave public key binding

* Address review feedback on VSM/HGS enclave key binding check

* Arrange/Act/Assert

* Check for empty public key in validation

:robot:

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Remove reflection from unit tests by making method internal and static

---------

Co-authored-by: Ananya Garg <ananya20.garg@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../VirtualSecureModeEnclaveProviderBase.cs   | 87 +++++++++++++++-
 .../src/Resources/Strings.Designer.cs         |  9 ++
 .../src/Resources/Strings.resx                |  3 +
 .../VirtualSecureModeEnclaveProviderTest.cs   | 99 +++++++++++++++++++
 4 files changed, 197 insertions(+), 1 deletion(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProviderTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProviderBase.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProviderBase.cs
index a3b4545d03..46a8e28cf8 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProviderBase.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProviderBase.cs
@@ -122,6 +122,9 @@ internal override void CreateEnclaveSession(byte[] attestationInfo, ECDiffieHell
                         // Perform Attestation per VSM protocol
                         VerifyAttestationInfo(enclaveSessionParameters.AttestationUrl, info.HealthReport, info.EnclaveReportPackage);
 
+                        // Verify the enclave public key is bound to the signed report, before it is used for key exchange
+                        VerifyEnclavePublicKeyBinding(info.EnclaveReportPackage, info.Identity);
+
                         // Set up shared secret and validate signature
                         byte[] sharedSecret = GetSharedSecret(info.Identity, info.EnclaveDHInfo, clientDHKey);
 
@@ -150,6 +153,68 @@ internal override void InvalidateEnclaveSession(EnclaveSessionParameters enclave
 
         #region Private helpers
 
+        /// <summary>
+        /// Verifies that the enclave's Diffie-Hellman public key is the one committed to by the signed
+        /// attestation report. A genuine VBS enclave writes SHA-256(public key) into the first 32 bytes of the
+        /// report's EnclaveData, and that EnclaveData is covered by the report signature that
+        /// <see cref="VerifyAttestationInfo"/> has already validated. Confirming this binding ensures the key used
+        /// to derive the session secret is the exact key the attested enclave committed to. This mirrors the
+        /// aas-ehd key binding performed on the AAS attestation path.
+        /// </summary>
+        /// <param name="enclaveReportPackage">
+        /// The signature-verified enclave report package. Its <c>Report.EnclaveData</c> supplies the committed
+        /// key hash.
+        /// </param>
+        /// <param name="enclavePublicKey">
+        /// The enclave public key that will be used to derive the session secret.
+        /// </param>
+        /// <exception cref="ArgumentException">
+        /// Thrown when the report's EnclaveData does not match SHA-256 of <paramref name="enclavePublicKey"/>, or
+        /// when the required report or key data is missing. In either case attestation is rejected.
+        /// </exception>
+        /// <remarks>
+        /// This is internal to allow for targeted unit testing without resorting to reflection.
+        /// </remarks>
+        internal static void VerifyEnclavePublicKeyBinding(EnclaveReportPackage enclaveReportPackage, EnclavePublicKey enclavePublicKey)
+        {
+            const int ReportDataLength = 32; // SHA-256 digest length
+
+            // The first 32 bytes of EnclaveData must equal SHA-256 of the key we will use to derive the session
+            // secret. Read both inputs defensively so missing data results in a clean rejection rather than a
+            // NullReferenceException (SHA256 hashing also throws on a null input).
+            byte[] reportData = enclaveReportPackage?.Report?.EnclaveData;
+            byte[] publicKey = enclavePublicKey?.PublicKey;
+
+            if (reportData == null || reportData.Length < ReportDataLength || publicKey == null || publicKey.Length == 0)
+            {
+                throw new ArgumentException(Strings.VerifyEnclaveKeyBindingFailed);
+            }
+
+#if NET
+            // Hash directly into a stack buffer to avoid a heap allocation for the digest.
+            Span<byte> expectedBinding = stackalloc byte[ReportDataLength];
+            SHA256.HashData(publicKey, expectedBinding);
+
+            // Use a fixed-time comparison in this security-sensitive path so the check does not leak a timing
+            // signal about how many leading bytes matched.
+            bool bound = CryptographicOperations.FixedTimeEquals(
+                reportData.AsSpan(0, ReportDataLength), expectedBinding);
+#else
+            byte[] expectedBinding;
+            using (SHA256 sha256 = SHA256.Create())
+            {
+                expectedBinding = sha256.ComputeHash(publicKey);
+            }
+
+            bool bound = FixedTimeEquals(reportData, expectedBinding, ReportDataLength);
+#endif
+
+            if (!bound)
+            {
+                throw new ArgumentException(Strings.VerifyEnclaveKeyBindingFailed);
+            }
+        }
+
         // Performs Attestation per the protocol used by Virtual Secure Modules.
         private void VerifyAttestationInfo(string attestationUrl, HealthReport healthReport, EnclaveReportPackage enclaveReportPackage)
         {
@@ -241,7 +306,7 @@ private bool AnyCertificatesExpired(X509Certificate2Collection certificates)
         /// <summary>
         /// Verifies that a chain of trust can be built from the health report provided
         /// by SQL Server and the attestation service's root signing certificate(s).
-        /// 
+        ///
         /// If the method returns false, the value of chainStatus doesn't matter. The chain could not be validated.
         /// </summary>
         /// <param name="signingCerts"></param>
@@ -340,6 +405,26 @@ private void VerifyEnclaveReportSignature(EnclaveReportPackage enclaveReportPack
             }
         }
 
+#if !NET
+        // CryptographicOperations.FixedTimeEquals is unavailable on .NET Framework, so hand-roll an equivalent
+        // constant-time comparison of the first <paramref name="length"/> bytes for the key-binding check above.
+        private static bool FixedTimeEquals(byte[] left, byte[] right, int length)
+        {
+            if (left == null || right == null || left.Length < length || right.Length < length)
+            {
+                return false;
+            }
+
+            int accumulator = 0;
+            for (int index = 0; index < length; index++)
+            {
+                accumulator |= left[index] ^ right[index];
+            }
+
+            return accumulator == 0;
+        }
+#endif
+
         // Verifies the enclave policy matches expected policy.
         private void VerifyEnclavePolicy(EnclaveReportPackage enclaveReportPackage)
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index 75ee7d7b82..1fadc67306 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -6342,6 +6342,15 @@ internal static string VerifyEnclaveReportFailed {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services..
+        /// </summary>
+        internal static string VerifyEnclaveKeyBindingFailed {
+            get {
+                return ResourceManager.GetString("VerifyEnclaveKeyBindingFailed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The enclave report received from SQL Server is not in the correct format. Contact Customer Support Services..
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
index 4d65d00a71..bd30563594 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>Signature verification of the enclave report failed. The report signature does not match the signature computed using the HGS root certificate. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>The enclave report received from SQL Server is not in the correct format. Contact Customer Support Services.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProviderTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProviderTest.cs
new file mode 100644
index 0000000000..08de59fd91
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProviderTest.cs
@@ -0,0 +1,99 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Security.Cryptography;
+using System.Text;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests;
+
+/// <summary>
+/// Tests the enclave public key binding check on the VSM/HGS attestation path. A genuine VBS enclave
+/// commits to its public key by placing SHA-256(public key) in the first 32 bytes of the report's
+/// signature-covered EnclaveData, so the binding must accept a matching key and reject any other.
+/// </summary>
+public class VirtualSecureModeEnclaveProviderTest
+{
+    private const int EnclaveReportPackageHeaderSize = 6 * sizeof(uint); // 24
+    private const int EnclaveReportSize = (sizeof(uint) * 2) + 64 + 152;  // ReportSize + ReportVersion + EnclaveData + EnclaveIdentity = 224
+
+    /// <summary>
+    /// A report whose EnclaveData commits to the key used for the session passes the binding check.
+    /// </summary>
+    [Fact]
+    public void VerifyEnclavePublicKeyBinding_GenuineKey_Succeeds()
+    {
+        // Arrange
+        byte[] enclaveKey = Encoding.UTF8.GetBytes("genuine-enclave-public-key-blob");
+        EnclaveReportPackage testPackage = BuildReportPackage(Sha256(enclaveKey));
+        EnclavePublicKey testKey = new EnclavePublicKey(enclaveKey);
+
+        // Act / Assert
+        // Report commits to enclaveKey and the session uses enclaveKey: the binding holds, so no exception.
+        VirtualizationBasedSecurityEnclaveProviderBase.VerifyEnclavePublicKeyBinding(testPackage, testKey);
+    }
+
+    /// <summary>
+    /// A report whose committed data does not match the session's enclave public key is rejected.
+    /// </summary>
+    [Fact]
+    public void VerifyEnclavePublicKeyBinding_SwappedKey_Throws()
+    {
+        // Arrange
+        byte[] committedKeyBytes = Encoding.UTF8.GetBytes("committed-enclave-public-key-blob");
+
+        // The signed report commits to committedKey...
+        EnclaveReportPackage testPackage = BuildReportPackage(Sha256(committedKeyBytes));
+
+        // ...but a different enclave public key is offered for the session.
+        byte[] substitutedKeyBytes = Encoding.UTF8.GetBytes("substituted-enclave-public-key");
+        EnclavePublicKey substitutedKey = new EnclavePublicKey(substitutedKeyBytes);
+
+
+        // Act
+        Action action = () => VirtualizationBasedSecurityEnclaveProviderBase.VerifyEnclavePublicKeyBinding(
+            testPackage,
+            substitutedKey);
+
+        // Assert
+        ArgumentException ex = Assert.Throws<ArgumentException>(action);
+        Assert.Equal(Strings.VerifyEnclaveKeyBindingFailed, ex.Message);
+    }
+
+    // Builds a minimal EnclaveReportPackage whose report EnclaveData begins with the given 32-byte
+    // binding value. The signature is empty because this targets the binding, not the report signature.
+    private static EnclaveReportPackage BuildReportPackage(byte[] enclaveDataFirst32)
+    {
+        byte[] payload = new byte[EnclaveReportPackageHeaderSize + EnclaveReportSize];
+        int offset = 0;
+
+        void WriteUInt(uint value)
+        {
+            BitConverter.GetBytes(value).CopyTo(payload, offset);
+            offset += sizeof(uint);
+        }
+
+        // EnclaveReportPackageHeader
+        WriteUInt((uint)payload.Length);      // PackageSize
+        WriteUInt(1);                         // Version
+        WriteUInt(1);                         // SignatureScheme
+        WriteUInt(EnclaveReportSize);         // SignedStatementSize
+        WriteUInt(0);                         // SignatureSize
+        WriteUInt(0);                         // Reserved
+
+        // EnclaveReport
+        WriteUInt(EnclaveReportSize);         // ReportSize
+        WriteUInt(1);                         // ReportVersion
+        Array.Copy(enclaveDataFirst32, 0, payload, offset, 32); // EnclaveData: first 32 bytes = SHA-256(public key)
+
+        return new EnclaveReportPackage(payload);
+    }
+
+    private static byte[] Sha256(byte[] data)
+    {
+        using SHA256 sha256 = SHA256.Create();
+        return sha256.ComputeHash(data);
+    }
+}

From 77af6f13c3fd856eecfbbcb2df969d3919311f84 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 20 Aug 2026 15:51:42 -0300
Subject: [PATCH 235/298] Consolidate and align SqlClient versioning (#4336)

---
 ...rd-party-package-versions.instructions.md} |   6 +-
 .../onebranch-pipeline-design.instructions.md |  22 +-
 ...sqlclient-package-versions.instructions.md | 193 ++++++++
 BUILDGUIDE.md                                 |  82 ++--
 Directory.Packages.props                      |  58 +--
 build.proj                                    | 219 ++++------
 .../templates/jobs/ci-build-nugets-job.yml    |  34 +-
 .../templates/jobs/ci-run-tests-job.yml       |  21 +-
 .../templates/stages/ci-run-tests-stage.yml   |  38 +-
 .../build-and-run-tests-netcore-step.yml      |  22 +-
 .../steps/build-and-run-tests-netfx-step.yml  |  22 +-
 .../templates/steps/ci-project-build-step.yml |  34 +-
 .../templates/steps/run-all-tests-step.yml    |  70 +--
 eng/pipelines/dotnet-sqlclient-ci-core.yml    |  33 +-
 ...qlclient-ci-package-reference-pipeline.yml |   4 +
 ...qlclient-ci-project-reference-pipeline.yml |   4 +
 .../jobs/pack-abstractions-package-ci-job.yml |  26 +-
 .../jobs/pack-azure-package-ci-job.yml        |  32 +-
 .../jobs/pack-logging-package-ci-job.yml      |  15 +-
 .../jobs/pack-sqlserver-package-ci-job.yml    |   5 +-
 .../jobs/test-azure-package-ci-job.yml        |  24 +-
 .../libraries/ci-build-variables.yml          |  62 +--
 .../onebranch/jobs/build-buildproj-job.yml    |  72 ++-
 .../jobs/publish-nuget-package-job.yml        |  16 +-
 .../onebranch/jobs/publish-symbols-job.yml    |  21 +-
 .../onebranch/scripts/compute-versions.ps1    | 254 +++++++++++
 .../onebranch/scripts/tests/README.md         |   8 +-
 .../scripts/tests/compute-versions.Tests.ps1  | 135 ++++++
 .../onebranch/sqlclient-non-official.yml      | 112 ++---
 .../onebranch/sqlclient-official.yml          | 113 ++---
 .../onebranch/stages/build-stages.yml         | 412 +++++++++---------
 .../stages/compute-versions-stage.yml         |  82 ++++
 .../stages/publish-symbols-stage.yml          | 196 ++++-----
 .../onebranch/stages/release-stages.yml       |  59 +--
 .../onebranch/steps/build-buildproj-step.yml  |  25 +-
 .../onebranch/steps/pack-buildproj-step.yml   |  25 +-
 .../steps/roslyn-analyzers-buildproj-step.yml |  27 +-
 .../onebranch/variables/package-variables.yml | 122 +-----
 .../sqlclient-pr-package-ref-pipeline.yml     |   4 +
 .../sqlclient-pr-project-ref-pipeline.yml     |   4 +
 .../build-abstractions-package-ci-stage.yml   |  27 +-
 .../stages/build-azure-package-ci-stage.yml   |  77 +---
 .../stages/build-logging-package-ci-stage.yml |  19 +-
 .../build-sqlclient-package-ci-stage.yml      |  36 +-
 .../build-sqlserver-package-ci-stage.yml      |  12 +-
 .../stages/compute-versions-ci-stage.yml      |  81 ++++
 .../stages/generate-secrets-ci-stage.yml      |   4 +
 src/Directory.Build.props                     |  14 +
 ...waysEncrypted.AzureKeyVaultProvider.csproj |  13 +-
 .../src/Versions.props                        |  94 ----
 .../Abstractions/src/Abstractions.csproj      |  13 +-
 .../Abstractions/src/Versions.props           |  95 ----
 .../ActiveDirectoryAuthenticationProvider.cs  |   2 +-
 .../Azure/src/Azure.csproj                    |  13 +-
 .../Azure/src/Versions.props                  |  94 ----
 .../Logging/src/Logging.csproj                |  13 +-
 .../Logging/src/Versions.props                |  95 ----
 src/Microsoft.Data.SqlClient/Versions.props   |  44 +-
 .../src/Microsoft.Data.SqlClient.csproj       |  28 +-
 .../src/Microsoft.Data.SqlClient.nuspec       |  16 +-
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |   2 +-
 .../Diagnostics/SqlDiagnosticListener.cs      |   6 +-
 .../src/Microsoft/Data/SqlClient/UserAgent.cs |   2 +-
 .../SqlClient.Stress.Runner/Program.cs        |  17 +-
 .../tests/UnitTests/UserAgentTests.cs         |   2 +-
 src/Microsoft.SqlServer.Server/Versions.props |  46 +-
 tools/targets/GenerateThisAssemblyCs.targets  |   7 +-
 67 files changed, 1769 insertions(+), 1816 deletions(-)
 rename .github/instructions/{package-versions.instructions.md => 3rd-party-package-versions.instructions.md} (96%)
 create mode 100644 .github/instructions/sqlclient-package-versions.instructions.md
 create mode 100644 eng/pipelines/onebranch/scripts/compute-versions.ps1
 create mode 100644 eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
 create mode 100644 eng/pipelines/onebranch/stages/compute-versions-stage.yml
 create mode 100644 eng/pipelines/stages/compute-versions-ci-stage.yml
 delete mode 100644 src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
 delete mode 100644 src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
 delete mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
 delete mode 100644 src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props

diff --git a/.github/instructions/package-versions.instructions.md b/.github/instructions/3rd-party-package-versions.instructions.md
similarity index 96%
rename from .github/instructions/package-versions.instructions.md
rename to .github/instructions/3rd-party-package-versions.instructions.md
index 9dba7acb8e..1de7df26bf 100644
--- a/.github/instructions/package-versions.instructions.md
+++ b/.github/instructions/3rd-party-package-versions.instructions.md
@@ -1,9 +1,11 @@
 ---
 applyTo: "**/Directory.Packages.props,**/*.csproj,**/Directory.Build.props,**/*.nuspec"
 ---
-# Choosing Package Versions in Multi-Targeted Projects
+# Choosing Third-Party Package Dependency Versions
 
-Guidance for choosing NuGet package versions in multi-targeted projects (e.g. `net462;net8.0;net9.0`).
+Guidance for choosing versions of **external (third-party) NuGet package dependencies** in multi-targeted projects (e.g. `net462;net8.0;net9.0`).
+
+> **Scope:** This document covers dependencies consumed from NuGet — packages the SqlClient repo does NOT own. For versioning of SqlClient's own inter-sibling packages (Logging, Abstractions, SqlClient, Azure, AKV Provider, SqlServer.Server), see `sqlclient-package-versions.instructions.md`.
 
 ## Rule
 For runtime-aligned packages, **the package major must match the target runtime major**: 8.x on `net8.0`, 9.x on `net9.0`, 10.x on `net10.0`, and so on. TFMs that aren't tied to a specific runtime major (`net462`, `netstandard2.0`) get the major of the floor LTS. Other categories are versioned as described below.
diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index 35f522dadc..0b647b6be0 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -39,11 +39,9 @@ Defined in `stages/build-stages.yml`. Four build stages plus validation, ordered
 Each build job copies PDB files into `$(JOB_OUTPUT)/symbols/` so they are included in the auto-published pipeline artifact alongside the NuGet packages in `$(JOB_OUTPUT)/packages/`.
 
 Stage conditional rules:
-- Wrap stages/jobs in `${{ if }}` compile-time conditionals based on build parameters
-- `buildSqlClient` controls Stages 2, 3, validation, and Logging (when AKV is disabled)
-- `buildAKVProvider AND buildSqlClient` controls Stage 4
-- `buildSqlServerServer` controls SqlServer.Server job in Stage 1
-- Logging builds when `buildAKVProvider OR buildSqlClient` is true
+- The SqlClient family (Logging, Abstractions, SqlClient, Azure, AKV Provider) is **always built** — Stages 2, 3, and 4 and the Logging job in Stage 1 are unconditional. There is no `buildSqlClient`/`buildAKVProvider` toggle.
+- `buildSqlServer` is the only build toggle; it controls just the SqlServer.Server job in Stage 1.
+- When `buildSqlServer` is true, SqlClient/AKV depend on the freshly-built SqlServer artifact (downloaded into the local feed). When false, they depend on the most recently published SqlServer package — a version-only dependency (no artifact download) restored from NuGet.
 
 ## Job Templates
 
@@ -62,7 +60,8 @@ When adding a new package to the OneBranch flow:
 
 - Defined in `stages/publish-symbols-stage.yml`; produces stage `publish_symbols`
 - Entire stage excluded at compile time when `publishSymbols` is false
-- `dependsOn` is conditional based on which `build*` parameters are set, mirroring the build stage dependency graph
+- The SqlClient family symbols are always published; the SqlServer.Server symbols job is conditional on `buildSqlServer`
+- `dependsOn` covers all family build stages (always present), plus `build_independent` for SqlServer
 - One job per package (`publish-symbols-job.yml`), each downloading its build artifact and publishing PDBs from `symbols/`
 - Each package's PDBs are published separately with unique artifact names and version information
 - Build jobs copy PDBs into `$(JOB_OUTPUT)/symbols/` so they are included in the auto-published artifact
@@ -88,16 +87,15 @@ When adding a new package to the OneBranch flow:
 
 ## Parameters
 
-Build parameters (all boolean, default `true`):
+Build parameters:
 - `debug` — enable debug output (default `false`)
 - `isPreview` — use preview version numbers (default `false`)
 - `publishSymbols` — publish symbols to servers (default `false`)
-- `buildSqlServerServer` — build SqlServer.Server package
-- `buildSqlClient` — build SqlClient, Extensions.Azure, Abstractions, and Logging
-- `buildAKVProvider` — build AKV Provider (requires `buildSqlClient`)
+- `buildSqlServer` — build the Microsoft.SqlServer.Server package (default `true` in the non-official/nightly pipeline, `false` in the official pipeline). The SqlClient family is always built, so this is the only build toggle. It also drives the SqlServer dependency version the family uses (built/next vs published). Requesting `releaseSqlServer` without `buildSqlServer` fails template expansion.
 
-Release parameters (all boolean, default `false`):
-- `releaseSqlServerServer`, `releaseLogging`, `releaseAbstractions`, `releaseSqlClient`, `releaseAzure`, `releaseAKVProvider`
+Release parameters (boolean, default `false`):
+- `releaseSqlClient` — release the entire SqlClient family together (Logging, Abstractions, SqlClient, Azure, AKV Provider) at the shared version
+- `releaseSqlServer` — release Microsoft.SqlServer.Server (versioned separately)
 
 Official-only parameter:
 - `releaseToProduction` — controls both NuGet target feed and symbol server destination (default `false`):
diff --git a/.github/instructions/sqlclient-package-versions.instructions.md b/.github/instructions/sqlclient-package-versions.instructions.md
new file mode 100644
index 0000000000..5aebcc6eb9
--- /dev/null
+++ b/.github/instructions/sqlclient-package-versions.instructions.md
@@ -0,0 +1,193 @@
+---
+applyTo: "**/Versions.props,build.proj,eng/pipelines/**/*.yml"
+---
+# SqlClient Package Version Resolution
+
+How package versions are determined across different build scenarios for the packages in this repository.
+
+## Package families
+
+The repository ships two independently-versioned units:
+
+- **The SqlClient family** — `Microsoft.Data.SqlClient` plus the packages that version in lockstep with
+  it: `Microsoft.Data.SqlClient.Internal.Logging`, `Microsoft.Data.SqlClient.Extensions.Abstractions`,
+  `Microsoft.Data.SqlClient.Extensions.Azure`, and
+  `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`.  **All family packages use the
+  SqlClient version numbers** — the same NuGet package version, file version, and assembly version —
+  and are always built and released together.
+- **`Microsoft.SqlServer.Server`** — versioned and released on its own cadence.
+
+## Version Properties
+
+The SqlClient family version lives in `src/Microsoft.Data.SqlClient/Versions.props`, which is imported
+for every project by `src/Directory.Build.props` (so the `SqlClient*` version properties are always
+available).  `Microsoft.SqlServer.Server` declares its own version in its own `Versions.props`.
+
+| Property | Applies to | Purpose | Example |
+|----------|-----------|---------|---------|
+| `SqlClientNextVersion` | SqlClient family | Version being developed; used for the next release | `7.1.0-preview1` |
+| `SqlServerNextVersion` | SqlServer | Version being developed for SqlServer | `1.1.0-preview1` |
+| `SqlServerPublishedVersion` | SqlServer | Last SqlServer version shipped to NuGet | `1.0.0` |
+
+The SqlClient family always ships its next version, so there is **no** family `PublishedVersion`.  Only
+`Microsoft.SqlServer.Server` keeps a published version (used when it is built as a SqlClient dependency
+but not itself released).
+
+## Resolution Logic
+
+Each `Versions.props` uses a 3-tier `<Choose>` block:
+
+| Priority | Condition | PackageVersion | FileVersion |
+|----------|-----------|----------------|-------------|
+| 1 | `<Pkg>PackageVersion` explicitly provided | Used as-is | Strip prerelease + append BuildNumber |
+| 2 | `BuildNumber` provided (non-zero) | `NextVersion[-BuildSuffix+BuildNumber]` | `NextVersion.Split('-')[0].BuildNumber` |
+| 3 | Nothing provided | `NextVersion-dev` | `NextVersion.Split('-')[0].0` |
+
+For every family package, `<Pkg>` is `SqlClient` (e.g. `-p:SqlClientPackageVersion=...`); for
+Microsoft.SqlServer.Server it is `SqlServer`.
+
+> **Two equivalent names for the same value.** `SqlClientPackageVersion` / `SqlServerPackageVersion`
+> are the underlying project properties (read by `Versions.props`, `Directory.Packages.props`, the
+> csproj files, and the nuspec). When building through `build.proj` — which the CI and OneBranch
+> pipelines always do — pass the wrapper argument `-p:PackageVersionSqlClient=...` /
+> `-p:PackageVersionSqlServer=...`; `build.proj` forwards it to the underlying
+> `-p:SqlClientPackageVersion=...` / `-p:SqlServerPackageVersion=...`. Both set the same value —
+> pipeline logs show `PackageVersion<Pkg>`, while project builds and props show `<Pkg>PackageVersion`.
+
+### Developer (local `dotnet build`)
+
+**Mode:** Project (default `ReferenceType=Project`)
+
+- No `BuildNumber`, no `BuildSuffix`, no `PackageVersion*` passed.
+- Falls into Priority 3 (the `<Otherwise>` branch).
+- **Result:** `7.1.0-preview1-dev` / FileVersion `7.1.0.0`
+- Dependencies are project references — no package versions needed for siblings.
+
+**Mode:** Package (`-p:ReferenceType=Package`)
+
+- Same version resolution for the package being built.
+- Sibling dependencies are restored from local `packages/` feed (previously packed with `-dev` suffix).
+- A developer would first `dotnet build build.proj -t:Pack` to produce local packages, then consume them.
+
+### PR Pipeline (non-official CI)
+
+**`buildSuffix`** set via core template parameter:
+- `buildSuffix: 'pr'` (passed explicitly from PR pipeline)
+- `BuildNumber` = `$(DayOfYear)$(Rev:rr)` (e.g. `15401` for day-of-year 154, run 01)
+
+**Mode:** Project (typical PR validation)
+
+- Versions computed in `compute-versions-ci-stage.yml` (runs `GetVersions*` targets with `-p:BuildSuffix=pr -p:BuildNumber=...`)
+- Falls into Priority 2 with BuildSuffix present.
+- **Result:** `7.1.0-preview1-pr15401` / FileVersion `7.1.0.15401`
+- Dependencies are project references — all packages built together in-tree.
+
+**Mode:** Package (PR package-ref validation)
+
+- Same version computation via compute-versions stage.
+- Downstream stages define stage-level variables from compute-versions output using `$[ stageDependencies... ]`.
+- Each build step passes the family wrapper argument `-p:PackageVersionSqlClient=<value>` (and `-p:PackageVersionSqlServer=` where needed) to `build.proj`, which forwards it to the underlying `-p:SqlClientPackageVersion=` / `-p:SqlServerPackageVersion=` project property, hitting Priority 1.
+- Sibling dependencies consumed from pipeline artifacts published by upstream stages.
+
+### CI Pipeline (non-official, triggered on merge)
+
+Same structure as PR but passes `buildSuffix: 'ci'` explicitly.
+
+- **Result:** `7.1.0-preview1-ci15401` / FileVersion `7.1.0.15401`
+
+### OneBranch Pipeline (official)
+
+**Mode:** Always Package (`ReferenceType=Package`)
+
+Uses the full `compute-versions-stage.yml` machinery:
+
+#### Step A: Compute Versions (dedicated early stage)
+
+1. Runs the `GetVersionsSqlClient` and `GetVersionsSqlServer` MSBuild targets against `build.proj`.
+2. Each target calls `dotnet build <project> -getProperty:<Pkg>PackageVersion` with `BuildNumber` but **no BuildSuffix**.
+3. Falls into Priority 2 without BuildSuffix → `PackageVersion = NextVersion` as-is (e.g. `7.1.0-preview1`).
+4. `GetVersionsSqlServer` also extracts `SqlServerPublishedVersion` (the SqlClient family has no published version).
+
+#### Step B: Resolve Effective Versions
+
+- The **SqlClient family** always uses `SqlClientNextVersion`.
+- **`Microsoft.SqlServer.Server`** uses its next or published version based on the
+  `buildSqlServer` boolean:
+
+| `buildSqlServer` | Effective SqlServer Version | Meaning |
+|--------------------------|-----------------------------|---------|
+| `True` | `SqlServerNextVersion` (e.g. `1.1.0-preview1`) | SqlServer is being released |
+| `False` | `SqlServerPublishedVersion` (e.g. `1.0.0`) | Only built as a SqlClient dependency; use last-shipped |
+
+> **The default differs by pipeline.** The non-official (nightly) pipeline defaults `buildSqlServer:
+> true`, exercising the "build SqlServer + local-feed dependency" flow; the official pipeline defaults
+> `buildSqlServer: false`, exercising the "depend on the published SqlServer package" flow that
+> matches actual release intent. Either can be overridden at queue time. Requesting `releaseSqlServer`
+> without `buildSqlServer` fails template expansion up front.
+
+These are published as ADO output variables: `versions.SqlClientPackageVersion`,
+`versions.SqlServerPackageVersion`, and their `*FileVersion` counterparts.
+
+#### Step C: Build Stages Consume Pre-computed Versions
+
+Each downstream build job receives:
+- `packageVersion` parameter → passed as `-p:SqlClientPackageVersion=<value>` (or `-p:SqlServerPackageVersion=` for SqlServer)
+- Dependency versions → family dependencies use the shared `SqlClientPackageVersion`; the SqlServer dependency uses `SqlServerPackageVersion`
+
+Since an explicit `<Pkg>PackageVersion` is provided, Versions.props hits Priority 1 — uses the value verbatim.
+
+#### Non-Official Test Publication Revisions
+
+Both OneBranch pipelines expose `addRevision` (default `false`). Their human-readable run name
+remains `$(Year:YY)$(DayOfYear)$(Rev:.r)`, while version revisions come from globally unique
+`Build.BuildId`. The compute stage always maps `Build.BuildId` into the unsigned 16-bit file-version
+range before evaluating canonical file versions:
+
+```text
+revision = ((Build.BuildId - 1) % 65535) + 1
+```
+
+Build IDs `1` through `65535` therefore map directly; subsequent IDs wrap back through that range.
+The compute stage logs the mapping whenever wrapping occurs because the revision can then collide
+with an earlier run. When `addRevision` is enabled, the mapped value is inserted before any package
+prerelease suffix so package and file versions use the same revision:
+
+- `1.2.3` becomes `1.2.3.<revision>`
+- `1.2.3-preview1` becomes `1.2.3.<revision>-preview1`
+- The matching file version is `1.2.3.<revision>`
+
+Only packages built in the current run are revised. When `buildSqlServer` is `false`, the effective
+SqlServer version remains `SqlServerPublishedVersion` so dependency restore continues to request the
+package that actually exists on NuGet.
+
+An explicit four-part package version is also treated as the complete file version base by both
+canonical Versions.props files; they do not append `FileVersionBuildNumber` as a fifth component.
+
+#### Summary
+
+| Package | Version Source | Example |
+|---------|----------------|---------|
+| SqlClient family (always released together) | `SqlClientNextVersion` | `7.1.0-preview1` |
+| SqlServer, being released | `SqlServerNextVersion` | `1.1.0-preview1` |
+| SqlServer, dependency only | `SqlServerPublishedVersion` | `1.0.0` |
+
+## Key Architectural Difference
+
+| Scenario | Who computes versions | How dependencies get versions |
+|----------|----------------------|-------------------------------|
+| Developer | Versions.props inline (Priority 3) | Project references (no version needed) |
+| PR/CI (Project) | `compute-versions-ci-stage` up-front | Project references (no version needed) |
+| PR/CI (Package) | `compute-versions-ci-stage` up-front | Stage variables via `$[ stageDependencies... ]` → `-p:SqlClientPackageVersion=` / `-p:SqlServerPackageVersion=` |
+| OneBranch | `compute-versions-stage` up-front | Explicit `-p:SqlClientPackageVersion=` / `-p:SqlServerPackageVersion=` from stage outputs |
+
+## Updating Versions
+
+After releasing the **SqlClient family**:
+1. Update `SqlClientNextVersion` in `src/Microsoft.Data.SqlClient/Versions.props` to the next planned
+   version.  (There is no family published version to update.)
+
+After releasing **`Microsoft.SqlServer.Server`**:
+1. Update `SqlServerPublishedVersion` to the version just shipped.
+2. Update `SqlServerNextVersion` to the next planned version.
+
+The SqlServer properties live in `src/Microsoft.SqlServer.Server/Versions.props`.
diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 6298bbc9eb..11787304b5 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -102,7 +102,8 @@ A selection of parameters for build targets in `build.proj` can be found below:
 | `[optional_parameter]`            | Allowed Values                   | Default   | Description                                                                                                                                   |
 |-----------------------------------|----------------------------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------|
 | `-p:Configuration=`               | `Debug`, `Release`               | `Debug`   | Build configuration                                                                                                                           |
-| `-p:PackageVersion<TargetPackage>=` | `major.minor.patch[-prerelease]` | `[blank]` | Version to assign to the target package, where `<TargetPackage>` can be one of: `['Abstractions', 'Azure', 'AkvProvider', 'Logging', 'SqlClient', 'SqlServer']`. Assembly and file versions are derived from this, if it is provided. See Versioning for more details |
+| `-p:PackageVersionSqlClient=`     | `major.minor.patch[-prerelease]` | `[blank]` | Version to assign to the SqlClient family (`Microsoft.Data.SqlClient`, `Internal.Logging`, `Extensions.Abstractions`, `Extensions.Azure`, and the AKV Provider all share it). Assembly and file versions are derived from this, if it is provided. See Versioning for more details |
+| `-p:PackageVersionSqlServer=`     | `major.minor.patch[-prerelease]` | `[blank]` | Version to assign to `Microsoft.SqlServer.Server`, which is versioned separately from the SqlClient family. |
 
 <!-- markdownlint-enable MD060 -->
 
@@ -134,10 +135,11 @@ Build Microsoft.Data.SqlClient in Release configuration:
 dotnet build -t:BuildSqlClient -p:Configuration=Release
 ```
 
-Build v1.2.3 of Microsoft.Data.SqlClient.Extensions.Abstractions:
+Build a specific version of Microsoft.Data.SqlClient.Extensions.Abstractions (Abstractions is part of the
+SqlClient family, so its version is set via the family parameter `PackageVersionSqlClient`):
 
 ```bash
-dotnet build -t:BuildAbstractions -p:PackageVersionAbstractions=1.2.3
+dotnet build -t:BuildAbstractions -p:PackageVersionSqlClient=7.1.0
 ```
 
 ### Testing Projects
@@ -243,16 +245,14 @@ A selection of parameters for pack targets in `build.proj` relevant to common de
 |------------------------------------|---------------|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `-p:Configuration=`                | `Debug`       | `Debug`, `Release`    | Build configuration. Only applies if project and dependencies are being built.                                                                                 |
 | `-p:PackBuild=`                    | `true`        | `true`, `false`       | Whether or not to build the project before packing. If `false`, project must be built using the same parameters.                                               |
-| `-p:PackageVersion<TargetPackage>=` | `[blank]`     | eg. `1.2.3-dev123`    | Version to assign to the package, where `<TargetPackage>` can be one of: `['Abstractions', 'Azure', 'AkvProvider', 'Logging', 'SqlClient', 'SqlServer']`. If `PackBuild` is `true`, the assembly and file versions will be derived from this version. See Versioning for more details. |
+| `-p:PackageVersionSqlClient=`       | `[blank]`     | eg. `7.1.0-dev123`    | Version to assign to the entire SqlClient family (`Microsoft.Data.SqlClient`, `Internal.Logging`, `Extensions.Abstractions`, `Extensions.Azure`, and the AKV Provider — they all share the SqlClient version). If `PackBuild` is `true`, the assembly and file versions are derived from this version. See Versioning for more details. |
+| `-p:PackageVersionSqlServer=`       | `[blank]`     | eg. `1.1.0-dev123`    | Version to assign to `Microsoft.SqlServer.Server`, which is versioned separately from the SqlClient family. |
 
 <!-- markdownlint-enable MD060 -->
 
-For `PackSqlClient`, these additional parameters are optional overrides for dependency versions injected into the SqlClient nuspec during pack:
+For `PackSqlClient`, the SqlClient nuspec pins its family dependencies (Abstractions and Logging) to the same `SqlClientPackageVersion` value, so a single `-p:PackageVersionSqlClient=<version>` controls both the SqlClient package version and those dependency ranges. `Microsoft.SqlServer.Server` is pinned separately via `-p:PackageVersionSqlServer=<version>`.
 
-- `-p:PackageVersionAbstractions=<version>`
-- `-p:PackageVersionLogging=<version>`
-
-If omitted, `PackSqlClient` computes `AbstractionsPackageVersion` and `LoggingPackageVersion` from sibling projects using the current `BuildNumber` and `BuildSuffix` context.
+If omitted, `PackSqlClient` computes these versions from `Versions.props` using the current `BuildNumber` and `BuildSuffix` context.
 
 #### Examples
 
@@ -268,10 +268,11 @@ Package Microsoft.Data.SqlClient:
 dotnet build -t:PackSqlClient
 ```
 
-Package version 1.2.3 of Microsoft.Data.SqlClient.Extensions.Abstractions:
+Package a specific version of Microsoft.Data.SqlClient.Extensions.Abstractions (set via the family parameter
+`PackageVersionSqlClient`):
 
 ```bash
-dotnet build -t:PackAbstractions -p:PackageVersionAbstractions=1.2.3
+dotnet build -t:PackAbstractions -p:PackageVersionSqlClient=7.1.0
 ```
 
 Package Microsoft.Data.SqlClient.Extensions.Azure without building it beforehand:
@@ -283,17 +284,19 @@ dotnet build -t:PackAzure -p:PackBuild=false
 ## Versioning
 
 Versioning can be accomplished by using a mix of different parameters to the `build.proj` targets:
-`PackageVersion<TargetProject>`, `BuildNumber`, and `BuildSuffix`. Using these in different combinations, can generate
-appropriate package, assembly, and file versions for different scenarios. For most developer workflows, it is not
-necessary to specify any of these parameters - appropriate versions based on the latest release will be generated
-automatically. This section primarily exists to document the various parameters, their effects, and the scenarios they
-can be useful for.
+`PackageVersionSqlClient` (or `PackageVersionSqlServer`), `BuildNumber`, and `BuildSuffix`. Using these in different
+combinations can generate appropriate package, assembly, and file versions for different scenarios. For most developer
+workflows, it is not necessary to specify any of these parameters - appropriate versions based on the latest release
+will be generated automatically. This section primarily exists to document the various parameters, their effects, and
+the scenarios they can be useful for.
 
-`PackageVersion<TargetProject>` applies to whatever package is being built. For example, if you are building the
-Microsoft.Data.SqlClient package, the appropriate parameter is `-p:PackageVersionSqlClient`.
+All packages in the **SqlClient family** (`Microsoft.Data.SqlClient`, `Internal.Logging`, `Extensions.Abstractions`,
+`Extensions.Azure`, and the AKV Provider) share a single version, set via `-p:PackageVersionSqlClient`.
+`Microsoft.SqlServer.Server` is versioned separately via `-p:PackageVersionSqlServer`.
 
-Each package has a `Versions.props` file in its root directory that defines a "default" version. This should be defined
-as the latest released version of the package. For the table below, we assume this is "1.2.3".
+The SqlClient family version is defined in `src/Microsoft.Data.SqlClient/Versions.props` (and SqlServer's in its own
+`Versions.props`), which declares a "default" version — the next version to release. For the table below, we assume this
+is "1.2.3".
 
 | `PackageVersion` | `BuildNumber` | `BuildSuffix` | Package Version  | Assembly Version | File Version  | Scenario                                                   |
 |------------------|---------------|---------------|------------------|------------------|---------------|------------------------------------------------------------|
@@ -313,18 +316,15 @@ depend on NuGet packages. This mode is useful for verifying that packages work w
 build scenarios. For completeness, and debugging of automated builds, this section documents behavior of "package mode".
 
 To switch to "package mode", set the `ReferenceType` parameter in `build.proj` to `Package`. And, optionally, include
-one or more of the following parameters:
+one or both of the following parameters:
 
-- `PackageVersionAbstractions`
-- `PackageVersionAkvProvider`
-- `PackageVersionAzure`
-- `PackageVersionLogging`
-- `PackageVersionSqlClient`
-- `PackageVersionSqlServer`
+- `PackageVersionSqlClient` — the version for the entire SqlClient family.
+- `PackageVersionSqlServer` — the version for `Microsoft.SqlServer.Server`.
 
-These parameters pull double duty. In targets where the package is being built, the parameter sets the version of the
-package. In targets where the package is being referenced, the parameter sets the version of the package that is being
-referenced.
+These parameters pull double duty. In targets where a package is being built, the parameter sets the version of the
+package. In targets where a package is being referenced, the parameter sets the version of the referenced package.
+Because the SqlClient family shares one version, `PackageVersionSqlClient` covers every family package, whether it is
+being built or referenced.
 
 If these parameters are not specified, the latest version, as defined in the `Versions.props` file, will be used.
 
@@ -334,23 +334,23 @@ run subsequent `build.proj` targets against them.
 
 ### Examples
 
-Build Microsoft.Data.SqlClient version 7.1.1 that references Microsoft.Data.SqlClient.Extensions.Abstractions v1.0.1
-and Microsoft.Data.SqlClient.Internal.Logging v2.2.2.
+Build Microsoft.Data.SqlClient version 7.1.1 in package mode.  Because all SqlClient family packages share the same
+version, a single `-p:PackageVersionSqlClient=7.1.1` applies to SqlClient and its family dependencies (Abstractions and
+Logging).
 
-Build v2.2.2 of Logging and copy to packages:
+Build v7.1.1 of Logging and copy to packages:
 
 ```bash
-dotnet build -t:PackLogging -p:ReferenceType=Package -p:PackageVersionLogging=2.2.2
+dotnet build -t:PackLogging -p:ReferenceType=Package -p:PackageVersionSqlClient=7.1.1
 cp artifacts/Microsoft.Data.SqlClient.Internal.Logging/Debug/*.*pkg packages/
 ```
 
-Build v1.0.1 of Abstractions that depends on v2.2.2 of Logging:
+Build v7.1.1 of Abstractions (which depends on v7.1.1 of Logging):
 
 ```bash
 dotnet build -t:PackAbstractions \
   -p:ReferenceType=Package \
-  -p:PackageVersionAbstractions=1.0.1 \
-  -p:PackageVersionLogging=2.2.2
+  -p:PackageVersionSqlClient=7.1.1
 cp artifacts/Microsoft.Data.SqlClient.Extensions.Abstractions/Package-Debug/*.*pkg packages/
 ```
 
@@ -359,9 +359,7 @@ Build SqlClient:
 ```bash
 dotnet build -t:PackSqlClient \
   -p:ReferenceType=Package \
-  -p:PackageVersionSqlClient=7.1.1 \
-  -p:PackageVersionAbstractions=1.0.1 \
-  -p:PackageVersionLogging=2.2.2
+  -p:PackageVersionSqlClient=7.1.1
 cp artifacts/Microsoft.Data.SqlClient/Package-Debug/*.*pkg packages/
 ```
 
@@ -370,9 +368,7 @@ Run Microsoft.Data.SqlClient functional tests against the versions built above:
 ```bash
 dotnet build -t:TestSqlClientFunctional \
   -p:ReferenceType=Package \
-  -p:PackageVersionSqlClient=7.1.1 \
-  -p:PackageVersionAbstractions=1.0.1 \
-  -p:PackageVersionLogging=2.2.2
+  -p:PackageVersionSqlClient=7.1.1
 ```
 
 Manual test prerequisites and configuration are covered in [TESTGUIDE.md](TESTGUIDE.md#manual-test-prerequisites).
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 7de533aa0d..e9be34705f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,28 +4,28 @@
   <!--
     Versions.props import strategy:
 
-    Each product has a Versions.props that computes its version properties (e.g.
-    SqlClientPackageVersion).  These files can be imported from two places:
-
-      1. Here, in Directory.Packages.props (Package mode only) — imports ALL
-         Versions.props early so that centrally-managed PackageVersion items can
-         reference the computed version values for sibling package pinning.
-
-      2. In each product's own csproj (conditional) — imports the product's own
-         Versions.props so standalone / Project-mode builds still get versions.
-
-    To prevent double-evaluation when both paths fire, every Versions.props sets
-    an import-guard property (e.g. SqlClientVersionsImported=true) on first load.
-    The csproj-level import checks that guard and becomes a no-op if the file was
-    already imported here.
+    The SqlClient family shares a single version, defined in
+    src/Microsoft.Data.SqlClient/Versions.props (SqlClientPackageVersion, etc.).
+    src/Directory.Build.props imports that file for every project, so the SqlClient* version
+    properties are always available.
+
+    Microsoft.SqlServer.Server is versioned separately in its own Versions.props.  In Package mode
+    we import that SqlServer canonical file here so that centrally-managed PackageVersion items
+    below can reference its computed version values for sibling package pinning.
+
+    Each Versions.props sets an import-guard property (SqlClientVersionsImported /
+    SqlServerVersionsImported) on first load. This skips later conditional imports and avoids
+    MSB4011 warnings; MSBuild would otherwise ignore the duplicate import.
+  -->
+  <!--
+    The SqlClient family version (src/Microsoft.Data.SqlClient/Versions.props) is imported for
+    every project by src/Directory.Build.props, which evaluates before this file, so
+    SqlClientPackageVersion is already available below.  We only need to import the separately
+    versioned Microsoft.SqlServer.Server here so its SqlServerPackageVersion is available for
+    sibling package pinning in Package mode.
   -->
   <ImportGroup Condition="'$(ReferenceType)' == 'Package'">
-    <Import Project="src/Microsoft.Data.SqlClient/Versions.props" />
     <Import Project="src/Microsoft.SqlServer.Server/Versions.props" />
-    <Import Project="src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props" />
-    <Import Project="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props" />
-    <Import Project="src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props" />
-    <Import Project="src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props" />
   </ImportGroup>
 
   <PropertyGroup>
@@ -58,36 +58,38 @@
 
   <PropertyGroup Condition="'$(ReferenceType)' == 'Package'">
     <SqlServerVersionCeiling>$([MSBuild]::Add($(SqlServerPackageVersion.Trim().Split('.')[0]), 1)).0.0</SqlServerVersionCeiling>
-    <LoggingVersionCeiling>$([MSBuild]::Add($(LoggingPackageVersion.Trim().Split('.')[0]), 1)).0.0</LoggingVersionCeiling>
-    <AbstractionsVersionCeiling>$([MSBuild]::Add($(AbstractionsPackageVersion.Trim().Split('.')[0]), 1)).0.0</AbstractionsVersionCeiling>
     <SqlClientVersionCeiling>$([MSBuild]::Add($(SqlClientPackageVersion.Trim().Split('.')[0]), 1)).0.0</SqlClientVersionCeiling>
-    <AzureVersionCeiling>$([MSBuild]::Add($(AzurePackageVersion.Trim().Split('.')[0]), 1)).0.0</AzureVersionCeiling>
-    <AkvProviderVersionCeiling>$([MSBuild]::Add($(AkvProviderPackageVersion.Trim().Split('.')[0]), 1)).0.0</AkvProviderVersionCeiling>
   </PropertyGroup>
 
   <!-- ===================================================================== -->
   <!-- Driver Packages -->
 
-  <!-- The driver packages need version numbers when we build via Package references. -->
+  <!--
+    The driver packages need version numbers when we build via Package references.
+
+    All packages in the SqlClient family share the SqlClient version, so they all use
+    SqlClientPackageVersion / SqlClientVersionCeiling.  Microsoft.SqlServer.Server is versioned
+    separately and uses its own SqlServerPackageVersion.
+  -->
   <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
     <PackageVersion
       Include="Microsoft.SqlServer.Server"
       Version="[$(SqlServerPackageVersion), $(SqlServerVersionCeiling))" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Internal.Logging"
-      Version="[$(LoggingPackageVersion), $(LoggingVersionCeiling))" />
+      Version="[$(SqlClientPackageVersion), $(SqlClientVersionCeiling))" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
-      Version="[$(AbstractionsPackageVersion), $(AbstractionsVersionCeiling))" />
+      Version="[$(SqlClientPackageVersion), $(SqlClientVersionCeiling))" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient"
       Version="[$(SqlClientPackageVersion), $(SqlClientVersionCeiling))" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Extensions.Azure"
-      Version="[$(AzurePackageVersion), $(AzureVersionCeiling))" />
+      Version="[$(SqlClientPackageVersion), $(SqlClientVersionCeiling))" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider"
-      Version="[$(AkvProviderPackageVersion), $(AkvProviderVersionCeiling))" />
+      Version="[$(SqlClientPackageVersion), $(SqlClientVersionCeiling))" />
   </ItemGroup>
 
   <!-- ===================================================================== -->
diff --git a/build.proj b/build.proj
index 7a8ce075a7..9883656f50 100644
--- a/build.proj
+++ b/build.proj
@@ -88,99 +88,29 @@
     </PackBuildArgument>
 
     <!--
-      PackageVersionAbstractions
-      Applies to:     BuildAbstractions, PackAbstractions
-      Description:    Specifies what version to assign to the Microsoft.Data.SqlClient.Extensions.Abstractions
-                      package. If this is omitted, the assigned version will default to the version
-                      calculated by Versions.props. If this is provided, it will override the
-                      package version and assembly versions will be calculated based on it.
-
-      Applies to:     BuildSqlClient*, PackSqlClient, TestSqlClient, TestSqlClientFunctional, TestSqlClientManual
-                      BuildAkvProvider, PackAkvProvider
-                      (with -p:ReferenceType=Package)
-      Description:    Specifies what version of Microsoft.Data.SqlClient.Extensions.Abstractions
-                      to use when compiling/packaging/testing the specified package.
-
-      Default value:  [blank]
-      Example:        1.0.1-dev2345
+      SqlClient family package versions
+      =================================
+      The Internal.Logging, Extensions.Abstractions, Extensions.Azure, and
+      AlwaysEncrypted.AzureKeyVaultProvider packages are all part of the SqlClient family and share
+      the SqlClient version.  There are no longer separate per-package version parameters for these
+      packages — use PackageVersionSqlClient (below) to set the version for the entire family.
     -->
-    <PackageVersionAbstractions Condition="'$(PackageVersionAbstractions)' == ''" />
-    <PackageVersionAbstractionsArgument Condition="'$(PackageVersionAbstractions)' != ''">
-      -p:AbstractionsPackageVersion=$(PackageVersionAbstractions)
-    </PackageVersionAbstractionsArgument>
-
-    <!--
-      PackageVersionAkvProvider
-      Applies to:     BuildAkvProvider, PackAkvProvider
-      Description:    Specifies what version to assign to Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
-                      when building/packing the AKV provider. If this is omitted, the assigned
-                      version will default to the version calculated by Versions.props. If this is
-                      provided, it will override the package version and assembly version will be
-                      calculated based on it.
-      Default value:  [blank]
-      Example:        1.0.1-dev2345
-    -->
-    <PackageVersionAkvProvider Condition="'$(PackageVersionAkvProvider)' == ''" />
-    <PackageVersionAkvProviderArgument Condition="'$(PackageVersionAkvProvider)' != ''">
-      -p:AkvProviderPackageVersion=$(PackageVersionAkvProvider)
-    </PackageVersionAkvProviderArgument>
-
-    <!--
-      PackageVersionAzure
-      Applies to:     BuildAzure, PackAzure
-      Description:    Specifies what version to assign to Microsoft.Data.SqlClient.Extensions.Azure
-                      when building/packing the Azure package. If this is omitted, the assigned
-                      version will default to the version calculated by Versions.props. If this is
-                      provided, it will override the package version and assembly version will be
-                      calculated based on it.
-      Default value:  [blank]
-      Example:        1.0.1-dev2345
-    -->
-    <PackageVersionAzure Condition="'$(PackageVersionAzure)' == ''" />
-    <PackageVersionAzureArgument Condition="'$(PackageVersionAzure)' != ''">
-      -p:AzurePackageVersion=$(PackageVersionAzure)
-    </PackageVersionAzureArgument>
-
-    <!--
-      PackageVersionLogging
-      Applies to:     BuildLogging, PackLogging
-      Description:    Specifies what version to assign to Microsoft.Data.SqlClient.Internal.Logging
-                      when building/packing the Logging package. If this is omitted, the assigned
-                      version will default to the version calculated by Versions.props. If this is
-                      provided, it will override the package version and assembly version will be
-                      calculated based on it.
-
-      Applies to:     BuildSqlClient*, PackSqlClient, TestSqlClient, TestSqlClientFunctional, TestSqlClientManual
-                      BuildAkvProvider, PackAkvProvider
-                      BuildAbstractions, PackAbstractions
-                      BuildAzure, PackAzure,
-                      (with -p:ReferenceType=Package)
-      Description:    Specifies what version of Microsoft.Data.SqlClient.Internal.Logging
-                      to use when compiling/packaging/testing the specified package.
-
-      Default value:  [blank]
-      Example:        1.0.1-dev2345
-    -->
-    <PackageVersionLogging Condition="'$(PackageVersionLogging)' == ''" />
-    <PackageVersionLoggingArgument Condition="'$(PackageVersionLogging)' != ''">
-      -p:LoggingPackageVersion=$(PackageVersionLogging)
-    </PackageVersionLoggingArgument>
 
     <!--
       PackageVersionSqlClient
-      Applies to:     TestSqlClient, TestSqlClientFunctional, TestSqlClientManual
-                      BuildAkvProvider, PackAkvProvider
-                      TestAzure
-                      (with -p:ReferenceType=Package)
-      Description     Specifies what version of Microsoft.Data.SqlClient to use when compiling
-                      to use when compiling/packaging/testing the specified package.
-
-      Applies to:     BuildSqlClient*, PackSqlClient
-      Description:    Specifies what version to assign to Microsoft.Data.SqlClient when building/
-                      packing the SqlClient package. If this is omitted, the assigned
-                      version will default to the version calculated by Versions.props. If this is
-                      provided, it will override the package version and assembly version will be
-                      calculated based on it.
+      Applies to:
+        Build:        BuildSqlClient*, BuildLogging, BuildAbstractions, BuildAzure, BuildAkvProvider
+        Pack:         PackSqlClient, PackLogging, PackAbstractions, PackAzure, PackAkvProvider
+        Test:         TestSqlClient, TestSqlClientFunctional, TestSqlClientManual, TestAzure
+                      (Package reference mode only)
+      Description:    Specifies the version of the SqlClient *family*.  All family packages
+                      (Microsoft.Data.SqlClient, Internal.Logging, Extensions.Abstractions,
+                      Extensions.Azure, and the AlwaysEncrypted.AzureKeyVaultProvider) share this
+                      single version, which is used both as the assigned package/assembly version
+                      when building/packing a family package and as the dependency version when a
+                      family package references another. Build and Pack targets use it in both
+                      reference modes; Test targets consume it only in Package reference mode. If
+                      omitted, the version defaults to the value calculated by Versions.props.
 
       Default value:  [blank]
       Example:        7.0.0-preview4
@@ -192,7 +122,10 @@
 
     <!--
       PackageVersionSqlServer
-      Applies to:     BuildSqlServer
+      Applies to:
+        Build:        BuildSqlServer and BuildSqlClient* in Package reference mode
+        Pack:         PackSqlServer and PackSqlClient in Package reference mode
+        Test:         TestSqlClientUnit and TestSqlClientManual in Package reference mode
       Description:    Specifies the package version to use for Microsoft.SqlServer.Server. If this
                       is specified, it will be used preferentially: assembly version and file
                       version will be derived from the specified package version.
@@ -393,6 +326,71 @@
   -->
   <Target Name="Pack" DependsOnTargets="PackLogging;PackAbstractions;PackSqlClient;PackAzure;PackAkvProvider;PackSqlServer" />
 
+  <!-- ================================================================= -->
+  <!-- Version Extraction Targets
+       =========================
+       The SqlClient family shares one version, so there are two extraction targets:
+
+         GetVersionsSqlClient  — the SqlClient family version (Internal.Logging,
+                                 Extensions.Abstractions, Microsoft.Data.SqlClient,
+                                 Extensions.Azure, and the AKV Provider all share this).
+         GetVersionsSqlServer  — the independently-versioned Microsoft.SqlServer.Server.
+
+       Each emits labeled messages at High importance that pipelines capture by grepping stdout:
+         PackageVersion: <value>
+         FileVersion: <value>
+       GetVersionsSqlServer additionally emits its last-shipped version:
+         PublishedVersion: <value>
+
+       Usage:
+         dotnet build build.proj -t:GetVersionsSqlClient -v:m -nologo -p:BuildNumber=1234
+         # stdout contains:
+         #   PackageVersion: 7.1.0-preview1
+         #   FileVersion: 7.1.0.1234
+  -->
+
+  <Target Name="GetVersionsSqlClient">
+    <PropertyGroup>
+      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlClientProjectPath)" -getProperty:SqlClientPackageVersion $(BuildNumberArgument) $(BuildSuffixArgument)</_Cmd>
+      <_Cmd>$([System.Text.RegularExpressions.Regex]::Replace($(_Cmd), "\s+", " "))</_Cmd>
+    </PropertyGroup>
+    <Exec Command="$(_Cmd)" ConsoleToMsBuild="true" StandardOutputImportance="High">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_PackageVersion" />
+    </Exec>
+    <PropertyGroup>
+      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlClientProjectPath)" -getProperty:SqlClientFileVersion $(BuildNumberArgument) $(BuildSuffixArgument)</_Cmd>
+      <_Cmd>$([System.Text.RegularExpressions.Regex]::Replace($(_Cmd), "\s+", " "))</_Cmd>
+    </PropertyGroup>
+    <Exec Command="$(_Cmd)" ConsoleToMsBuild="true" StandardOutputImportance="High">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_FileVersion" />
+    </Exec>
+    <Message Text="PackageVersion: $(_PackageVersion)" Importance="High" />
+    <Message Text="FileVersion: $(_FileVersion)" Importance="High" />
+  </Target>
+
+  <Target Name="GetVersionsSqlServer">
+    <PropertyGroup>
+      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlServerProjectPath)" -getProperty:SqlServerPackageVersion $(BuildNumberArgument) $(BuildSuffixArgument)</_Cmd>
+      <_Cmd>$([System.Text.RegularExpressions.Regex]::Replace($(_Cmd), "\s+", " "))</_Cmd>
+    </PropertyGroup>
+    <Exec Command="$(_Cmd)" ConsoleToMsBuild="true" StandardOutputImportance="High">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_PackageVersion" />
+    </Exec>
+    <Exec Command="&quot;$(DotnetPath)dotnet&quot; build &quot;$(SqlServerProjectPath)&quot; -getProperty:SqlServerPublishedVersion" ConsoleToMsBuild="true" StandardOutputImportance="High">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_PublishedVersion" />
+    </Exec>
+    <PropertyGroup>
+      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlServerProjectPath)" -getProperty:SqlServerFileVersion $(BuildNumberArgument) $(BuildSuffixArgument)</_Cmd>
+      <_Cmd>$([System.Text.RegularExpressions.Regex]::Replace($(_Cmd), "\s+", " "))</_Cmd>
+    </PropertyGroup>
+    <Exec Command="$(_Cmd)" ConsoleToMsBuild="true" StandardOutputImportance="High">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_FileVersion" />
+    </Exec>
+    <Message Text="PackageVersion: $(_PackageVersion)" Importance="High" />
+    <Message Text="PublishedVersion: $(_PublishedVersion)" Importance="High" />
+    <Message Text="FileVersion: $(_FileVersion)" Importance="High" />
+  </Target>
+
   <!--
     Test: Run all test targets for all driver projects.
 
@@ -471,8 +469,6 @@
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
         $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
@@ -502,7 +498,6 @@
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
         $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
@@ -533,8 +528,6 @@
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
         $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
@@ -565,8 +558,6 @@
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
         $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
@@ -609,8 +600,6 @@
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
         $(PackageVersionSqlServerArgument)
 
         <!-- Pack settings are defined in Microsoft.Data.SqlClient.csproj -->
@@ -658,8 +647,6 @@
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
         $(PackageVersionSqlClientArgument)
         $(PackageVersionSqlServerArgument)
       </DotnetCommand>
@@ -704,8 +691,6 @@
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
         $(PackageVersionSqlClientArgument)
         $(PackageVersionSqlServerArgument)
       </DotnetCommand>
@@ -768,13 +753,10 @@
         <!--Versioning arguments -->
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
-        $(PackageVersionAkvProviderArgument)
+        $(PackageVersionSqlClientArgument)
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-        $(PackageVersionSqlClientArgument)
         $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
@@ -798,13 +780,10 @@
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
-        $(PackageVersionAkvProviderArgument)
+        $(PackageVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-        $(PackageVersionSqlClientArgument)
         $(PackageVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
@@ -851,11 +830,10 @@
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
-        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionLoggingArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -878,11 +856,10 @@
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
-        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionLoggingArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -956,11 +933,10 @@
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
-        $(PackageVersionAzureArgument)
+        $(PackageVersionSqlClientArgument)
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionLoggingArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -983,11 +959,10 @@
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
-        $(PackageVersionAzureArgument)
+        $(PackageVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionLoggingArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -1027,8 +1002,6 @@
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
         $(PackageVersionSqlClientArgument)
         $(PackageVersionSqlServerArgument)
       </DotnetCommand>
@@ -1060,7 +1033,7 @@
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
-        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -1083,7 +1056,7 @@
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
-        $(PackageVersionLoggingArgument)
+        $(PackageVersionSqlClientArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
diff --git a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
index aa6a1c50c5..95d5d0b7d0 100644
--- a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
@@ -61,20 +61,9 @@ parameters:
     type: stepList
     default: []
 
-  # The version of the Abstractions package to depend on when referenceType is 'Package'.
-  - name: abstractionsPackageVersion
-    type: string
-
-  # The version of the Logging package to depend on when referenceType is 'Package'.
-  - name: loggingPackageVersion
-    type: string
-
-  # The version to apply to the SqlClient package.
-  - name: mdsPackageVersion
-    type: string
-
-  # The version to apply to the AKV Provider package.
-  - name: akvPackageVersion
+  # The version to apply to the SqlClient family packages (SqlClient, Abstractions, Logging, and the
+  # AKV Provider).  They all share this version.
+  - name: packageVersion
     type: string
 
   # The version of the SqlServer package to depend on when referenceType is 'Package'.
@@ -156,8 +145,7 @@ jobs:
       referenceType: ${{ parameters.referenceType }}
       operatingSystem: Windows
       build: MDS
-      abstractionsPackageVersion: ${{parameters.abstractionsPackageVersion}}
-      loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
+      packageVersion: ${{ parameters.packageVersion }}
       sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
 
   - task: DotNetCoreCLI@2
@@ -170,9 +158,7 @@ jobs:
         -p:PackBuild=false
         -p:Configuration=${{ parameters.buildConfiguration }}
         -p:ReferenceType=${{ parameters.referenceType }}
-        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
-        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
         -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
 
   # PackSqlClient outputs to artifacts/Microsoft.Data.SqlClient/<ReferenceType>-<Configuration>/.
@@ -201,10 +187,7 @@ jobs:
       buildConfiguration: ${{ parameters.buildConfiguration }}
       referenceType: ${{ parameters.referenceType }}
       build: AkvProvider
-      abstractionsPackageVersion: ${{parameters.abstractionsPackageVersion}}
-      loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
-      mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
-      akvPackageVersion: ${{ parameters.akvPackageVersion }}
+      packageVersion: ${{ parameters.packageVersion }}
       sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
 
   - task: DotNetCoreCLI@2
@@ -218,11 +201,8 @@ jobs:
         -p:PackBuild=false
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:BuildNumber=$(Build.BuildNumber)
-        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
         -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
-        -p:PackageVersionAkvProvider=${{ parameters.akvPackageVersion }}
 
   - task: CopyFiles@2
     displayName: Copy AKV Package to Output Folder
diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
index 50a2867984..4752e09e43 100644
--- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
@@ -8,19 +8,11 @@ parameters:
   - name: abstractionsArtifactsName
     type: string
 
-  # The version of the Abstractions package to depend on when referenceType is 'Package'.
-  - name: abstractionsPackageVersion
-    type: string
-
   # The name of the Logging pipeline artifact to download when referenceType is 'Package'.
   - name: loggingArtifactsName
     type: string
     default: Logging.Artifacts
 
-  # The version of the Logging package to depend on when referenceType is 'Package'.
-  - name: loggingPackageVersion
-    type: string
-
   # The configuration properties to set in the config file.
   #
   # GOTCHA: The following keys are used in template expressions and must be
@@ -82,8 +74,9 @@ parameters:
   - name: mdsArtifactsName
     type: string
 
-  # The version of the SqlClient package to depend on when referenceType is 'Package'.
-  - name: mdsPackageVersion
+  # The version to apply to the SqlClient family packages (SqlClient, Abstractions, Logging).  They
+  # all share this version.
+  - name: packageVersion
     type: string
 
   # The name of the SqlServer pipeline artifact to download when referenceType is 'Package'.
@@ -363,9 +356,7 @@ jobs:
         referenceType: ${{ parameters.referenceType }}
         testSet: ${{ parameters.testSet }}
         operatingSystem: ${{ parameters.operatingSystem }}
-        abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
-        loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
-        mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+        packageVersion: ${{ parameters.packageVersion }}
         sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
 
   - ${{ if and(eq(parameters.enableX86Test, true), eq(parameters.operatingSystem, 'Windows')) }}:
@@ -379,9 +370,7 @@ jobs:
         msbuildArchitecture: x86
         dotnetx86RootPath: $(dotnetx86RootPath)
         operatingSystem: ${{ parameters.operatingSystem }}
-        abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
-        loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
-        mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
+        packageVersion: ${{ parameters.packageVersion }}
         sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
 
   - template: /eng/pipelines/common/templates/steps/publish-test-results-step.yml@self
diff --git a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
index 4f5fbfe730..7ed67c1af9 100644
--- a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
+++ b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
@@ -11,10 +11,6 @@ parameters:
   - name: abstractionsArtifactsName
     type: string
 
-  # The version of the Abstractions package to depend on when referenceType is 'Package'.
-  - name: abstractionsPackageVersion
-    type: string
-
   # Additional stages we depend on, if any.
   - name: additionalDependsOn
     type: object
@@ -37,29 +33,16 @@ parameters:
     type: string
     default: Logging.Artifacts
 
-  # The version of the Logging package to depend on when referenceType is 'Package'.
-  - name: loggingPackageVersion
-    type: string
-
   # The name of the SqlClient pipeline artifacts to download.
   - name: mdsArtifactsName
     type: string
     default: MDS.Artifacts
 
-  # The version of the SqlClient package to depend on when referenceType is 'Package'.
-  - name: mdsPackageVersion
-    type: string
-
   # The name of the SqlServer pipeline artifacts to download.
   - name: sqlServerArtifactsName
     type: string
     default: SqlServer.Artifacts
 
-  # The version of the SqlServer package to depend on when referenceType is 'Package'.
-  - name: sqlServerPackageVersion
-    type: string
-    default: $(sqlServerPackageVersion)
-
   # Jobs to run after the test jobs complete, if any.
   - name: postTestJobs
     type: jobList
@@ -94,6 +77,7 @@ stages:
     - stage: ${{ image.key }}
       dependsOn:
         - secrets_stage
+        - compute_versions_ci
         - ${{ each dep in parameters.additionalDependsOn }}:
           - ${{ dep }}
 
@@ -102,6 +86,14 @@ stages:
         - name: saPassword
           value: $[stageDependencies.secrets_stage.secrets_job.outputs['SaPassword.Value']]
 
+        # Bring the computed versions into scope so the $(packageVersion) and
+        # $(sqlServerPackageVersion) macros passed to the test jobs resolve when
+        # building/restoring in Package mode.  These mirror the build stages.
+        - name: packageVersion
+          value: $[ stageDependencies.compute_versions_ci.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+        - name: sqlServerPackageVersion
+          value: $[ stageDependencies.compute_versions_ci.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
+
       jobs:
       - ${{ each targetFramework in config.value.TargetFrameworks }}:
         - ${{ each platform in config.value.buildPlatforms }}:
@@ -119,13 +111,11 @@ stages:
                   jobDisplayName: ${{ format('{0}_{1}_{2}', replace(targetFramework, '.', '_'), platform, testSet) }}
                   configProperties: ${{ config.value.configProperties }}
                   abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-                  abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
+                  packageVersion: $(packageVersion)
                   loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-                  loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
                   mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-                  mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
                   sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-                  sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
+                  sqlServerPackageVersion: $(sqlServerPackageVersion)
                   prebuildSteps: ${{ parameters.prebuildSteps }}
                   targetFramework: ${{ targetFramework }}
                   netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
@@ -156,13 +146,11 @@ stages:
                     configProperties: ${{ config.value.configProperties }}
                     useManagedSNI: ${{ useManagedSNI }}
                     abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-                    abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
+                    packageVersion: $(packageVersion)
                     loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-                    loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
                     mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-                    mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
                     sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-                    sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
+                    sqlServerPackageVersion: $(sqlServerPackageVersion)
                     prebuildSteps: ${{ parameters.prebuildSteps }}
                     targetFramework: ${{ targetFramework }}
                     netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
diff --git a/eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml b/eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml
index 2fe5cb5fe8..89ffb43e6c 100644
--- a/eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml
+++ b/eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml
@@ -4,13 +4,11 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 parameters:
-  - name: abstractionsPackageVersion
+  # The version to apply to the SqlClient family packages (SqlClient, Abstractions, Logging).  They
+  # all share this version.
+  - name: packageVersion
     type: string
-    default: $(abstractionsPackageVersion)
-
-  - name: mdsPackageVersion
-    type: string
-    default: $(mdsPackageVersion)
+    default: $(packageVersion)
 
   - name: platform
     type: string
@@ -48,8 +46,7 @@ steps:
       -p:TargetNetCoreVersion=${{ parameters.TargetNetCoreVersion }}
       -p:ReferenceType=Package
       -p:Configuration=Release
-      -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.packageVersion }}
       --no-build
       -v n
       --filter "category!=failing&category!=flaky&category!=interactive"
@@ -69,8 +66,7 @@ steps:
       -p:TargetNetCoreVersion=${{ parameters.TargetNetCoreVersion }}
       -p:ReferenceType=Package
       -p:Configuration=Release
-      -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.packageVersion }}
       --no-build
       -v n
       --filter "category=flaky"
@@ -91,8 +87,7 @@ steps:
       -p:TargetNetCoreVersion=${{ parameters.TargetNetCoreVersion }}
       -p:ReferenceType=Package
       -p:Configuration=Release
-      -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.packageVersion }}
       --no-build
       -v n
       --filter "category!=failing&category!=flaky&category!=interactive"
@@ -113,8 +108,7 @@ steps:
       -p:TargetNetCoreVersion=${{ parameters.TargetNetCoreVersion }}
       -p:ReferenceType=Package
       -p:Configuration=Release
-      -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.packageVersion }}
       --no-build
       -v n
       --filter "category=flaky"
diff --git a/eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml b/eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml
index 2783094ce7..0fe2bd024a 100644
--- a/eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml
+++ b/eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml
@@ -4,13 +4,11 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 parameters:
-  - name: abstractionsPackageVersion
+  # The version to apply to the SqlClient family packages (SqlClient, Abstractions, Logging).  They
+  # all share this version.
+  - name: packageVersion
     type: string
-    default: $(abstractionsPackageVersion)
-
-  - name: mdsPackageVersion
-    type: string
-    default: $(mdsPackageVersion)
+    default: $(packageVersion)
 
   - name: platform
     type: string
@@ -48,8 +46,7 @@ steps:
       -p:TargetNetFxVersion=${{ parameters.TargetNetFxVersion }}
       -p:ReferenceType=Package
       -p:Configuration=Release
-      -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.packageVersion }}
       --no-build
       -v n
       --filter "category!=failing&category!=flaky&category!=interactive"
@@ -69,8 +66,7 @@ steps:
       -p:TargetNetFxVersion=${{ parameters.TargetNetFxVersion }}
       -p:ReferenceType=Package
       -p:Configuration=Release
-      -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.packageVersion }}
       --no-build
       -v n
       --filter "category=flaky"
@@ -91,8 +87,7 @@ steps:
       -p:TargetNetFxVersion=${{ parameters.TargetNetFxVersion }}
       -p:ReferenceType=Package
       -p:Configuration=Release
-      -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.packageVersion }}
       --no-build
       -v n
       --filter "category!=failing&category!=flaky&category!=interactive"
@@ -113,8 +108,7 @@ steps:
       -p:TargetNetFxVersion=${{ parameters.TargetNetFxVersion }}
       -p:ReferenceType=Package
       -p:Configuration=Release
-      -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-      -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
+      -p:SqlClientPackageVersion=${{ parameters.packageVersion }}
       --no-build
       -v n
       --filter "category=flaky"
diff --git a/eng/pipelines/common/templates/steps/ci-project-build-step.yml b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
index e5fa6d4424..c80de64fd4 100644
--- a/eng/pipelines/common/templates/steps/ci-project-build-step.yml
+++ b/eng/pipelines/common/templates/steps/ci-project-build-step.yml
@@ -46,27 +46,12 @@ parameters:
       - all
       - allNoDocs
 
-  # Necessary to build MDS when referenceType is Package.  Ignored when referenceType is Project.
-  - name: abstractionsPackageVersion
+  # The version to apply to the SqlClient family packages (SqlClient, Abstractions, Logging, and the
+  # AKV Provider).  They all share this version.  Used when referenceType is Package; ignored for
+  # Project.
+  - name: packageVersion
     type: string
-    default: $(abstractionsPackageVersion)
-
-  # Necessary to build MDS when referenceType is Package.  Ignored when referenceType is Project.
-  - name: loggingPackageVersion
-    type: string
-    default: $(loggingPackageVersion)
-
-  # Package version to use for MDS package. Because we explicitly provide this version, the
-  # assembly version will be generated based on this package version and the build number.
-  # See MdsVersions.props for details on how this works.
-  - name: mdsPackageVersion
-    type: string
-    default: $(mdsPackageVersion)
-
-  # Necessary to build AKV Provider when referenceType is Package.  Ignored when referenceType is Project.
-  - name: akvPackageVersion
-    type: string
-    default: $(akvPackageVersion)
+    default: $(packageVersion)
 
   # Necessary when referenceType is Package.  Ignored when referenceType is Project.
   - name: sqlServerPackageVersion
@@ -87,9 +72,7 @@ steps:
           -p:Configuration=${{ parameters.buildConfiguration }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:BuildNumber=${{ parameters.buildNumber }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
 
   # Build AKV Provider
@@ -105,8 +88,5 @@ steps:
           -p:Configuration=${{ parameters.buildConfiguration }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:BuildNumber=${{ parameters.buildNumber }}
-          -p:PackageVersionAkvProvider=${{ parameters.akvPackageVersion }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
diff --git a/eng/pipelines/common/templates/steps/run-all-tests-step.yml b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
index e41c7d22b2..928c2e3abc 100644
--- a/eng/pipelines/common/templates/steps/run-all-tests-step.yml
+++ b/eng/pipelines/common/templates/steps/run-all-tests-step.yml
@@ -5,10 +5,9 @@
 #################################################################################
 parameters:
 
-  - name: abstractionsPackageVersion
-    type: string
-
-  - name: loggingPackageVersion
+  # The version to apply to the SqlClient family packages (SqlClient, Abstractions, Logging).  They
+  # all share this version.
+  - name: packageVersion
     type: string
 
   # True to emit debug information and steps.
@@ -19,9 +18,6 @@ parameters:
   - name: targetFramework
     type: string
 
-  - name: mdsPackageVersion
-    type: string
-
   - name: sqlServerPackageVersion
     type: string
 
@@ -91,7 +87,7 @@ steps:
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
@@ -100,7 +96,7 @@ steps:
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestResultsFolderPath=TestResults
@@ -117,7 +113,7 @@ steps:
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
@@ -128,7 +124,7 @@ steps:
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestFilters="category=flaky"
@@ -148,9 +144,7 @@ steps:
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
@@ -159,9 +153,7 @@ steps:
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestResultsFolderPath=TestResults
@@ -178,9 +170,7 @@ steps:
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
@@ -191,9 +181,7 @@ steps:
           -p:TestFramework=${{ parameters.targetFramework }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestFilters="category=flaky"
@@ -214,9 +202,7 @@ steps:
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:TestResultsFolderPath=TestResults
       ${{ else }}: # x86
@@ -226,9 +212,7 @@ steps:
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestResultsFolderPath=TestResults
@@ -247,9 +231,7 @@ steps:
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:TestFilters="category=flaky"
           -p:TestResultsFolderPath=TestResults
@@ -261,9 +243,7 @@ steps:
           -p:TestSet=${{ parameters.testSet }}
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:Configuration=${{ parameters.buildConfiguration }}
-          -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-          -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-          -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+          -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
           -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
           -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
           -p:TestFilters="category=flaky"
@@ -283,7 +263,7 @@ steps:
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:Configuration=${{ parameters.buildConfiguration }}
-        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
         -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:TestResultsFolderPath=TestResults
 
@@ -298,7 +278,7 @@ steps:
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:Configuration=${{ parameters.buildConfiguration }}
-        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
         -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:TestFilters="category=flaky"
         -p:TestResultsFolderPath=TestResults
@@ -316,9 +296,7 @@ steps:
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:Configuration=${{ parameters.buildConfiguration }}
-        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
         -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:TestResultsFolderPath=TestResults
 
@@ -333,9 +311,7 @@ steps:
         -p:TestFramework=${{ parameters.targetFramework }}
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:Configuration=${{ parameters.buildConfiguration }}
-        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
         -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:TestFilters="category=flaky"
         -p:TestResultsFolderPath=TestResults
@@ -353,9 +329,7 @@ steps:
         -p:TestSet=${{ parameters.testSet }}
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:Configuration=${{ parameters.buildConfiguration }}
-        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
         -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:TestResultsFolderPath=TestResults
     retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
@@ -372,9 +346,7 @@ steps:
         -p:TestSet=${{ parameters.testSet }}
         -p:ReferenceType=${{ parameters.referenceType }}
         -p:Configuration=${{ parameters.buildConfiguration }}
-        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
-        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-        -p:PackageVersionSqlClient=${{ parameters.mdsPackageVersion }}
+        -p:PackageVersionSqlClient=${{ parameters.packageVersion }}
         -p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
         -p:TestFilters="category=flaky"
         -p:TestResultsFolderPath=TestResults
diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index a51bbee3f5..3e68e93325 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -94,6 +94,11 @@ parameters:
     type: boolean
     default: true
 
+  # Build suffix appended to the prerelease tag. PR pipelines pass 'pr',
+  # CI pipelines pass 'ci'. Official builds leave this empty.
+  - name: buildSuffix
+    type: string
+
   - name: dotnetVerbosity
     type: string
     default: normal
@@ -123,6 +128,13 @@ variables:
     value: SqlServer.Artifacts
 
 stages:
+  # Compute all package versions up-front. Downstream stages consume these via
+  # Each build/test stage computes the versions it needs directly from the
+  # compute_versions_ci stage outputs, so no version parameters are passed here.
+  - template: /eng/pipelines/stages/compute-versions-ci-stage.yml@self
+    parameters:
+      buildSuffix: ${{ parameters.buildSuffix }}
+
   # Generate secrets used throughout the pipeline.
   - template: /eng/pipelines/stages/generate-secrets-ci-stage.yml@self
     parameters:
@@ -134,7 +146,6 @@ stages:
   - template: /eng/pipelines/stages/build-sqlserver-package-ci-stage.yml@self
     parameters:
       sqlServerArtifactsName: $(sqlServerArtifactsName)
-      sqlServerPackageVersion: $(sqlServerPackageVersion)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
@@ -145,8 +156,6 @@ stages:
   - template: /eng/pipelines/stages/build-logging-package-ci-stage.yml@self
     parameters:
       loggingArtifactsName: $(loggingArtifactsName)
-      loggingAssemblyFileVersion: $(loggingAssemblyFileVersion)
-      loggingPackageVersion: $(loggingPackageVersion)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
@@ -159,13 +168,10 @@ stages:
   - template: /eng/pipelines/stages/build-abstractions-package-ci-stage.yml@self
     parameters:
       abstractionsArtifactsName: $(abstractionsArtifactsName)
-      abstractionsAssemblyFileVersion: $(abstractionsAssemblyFileVersion)
-      abstractionsPackageVersion: $(abstractionsPackageVersion)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
       loggingArtifactsName: $(loggingArtifactsName)
-      loggingPackageVersion: $(loggingPackageVersion)
       referenceType: ${{ parameters.referenceType }}
       # When building Abstractions via packages, we must depend on the Logging
       # package.
@@ -180,16 +186,11 @@ stages:
   - template: /eng/pipelines/stages/build-sqlclient-package-ci-stage.yml@self
     parameters:
       abstractionsArtifactsName: $(abstractionsArtifactsName)
-      abstractionsPackageVersion: $(abstractionsPackageVersion)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       loggingArtifactsName: $(loggingArtifactsName)
-      loggingPackageVersion: $(loggingPackageVersion)
       mdsArtifactsName: $(mdsArtifactsName)
-      mdsPackageVersion: $(mdsPackageVersion)
-      akvPackageVersion: $(akvPackageVersion)
       referenceType: ${{ parameters.referenceType }}
       sqlServerArtifactsName: $(sqlServerArtifactsName)
-      sqlServerPackageVersion: $(sqlServerPackageVersion)
       SNIVersion: ${{ parameters.SNIVersion }}
       SNIValidationFeed: ${{ parameters.SNIValidationFeed }}
       # When building SqlClient via packages, we must depend on the Abstractions, Logging,
@@ -205,10 +206,7 @@ stages:
   - template: /eng/pipelines/stages/build-azure-package-ci-stage.yml@self
     parameters:
       abstractionsArtifactsName: $(abstractionsArtifactsName)
-      abstractionsPackageVersion: $(abstractionsPackageVersion)
       azureArtifactsName: $(azureArtifactsName)
-      azureAssemblyFileVersion: $(azureAssemblyFileVersion)
-      azurePackageVersion: $(azurePackageVersion)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
       # When building via packages, we must depend on the Abstractions, Logging,
@@ -221,12 +219,9 @@ stages:
           - build_sqlclient_package_stage
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
       loggingArtifactsName: $(loggingArtifactsName)
-      loggingPackageVersion: $(loggingPackageVersion)
       mdsArtifactsName: $(mdsArtifactsName)
-      mdsPackageVersion: $(mdsPackageVersion)
       referenceType: ${{ parameters.referenceType }}
       sqlServerArtifactsName: $(sqlServerArtifactsName)
-      sqlServerPackageVersion: $(sqlServerPackageVersion)
 
   # Verify that all NuGet packages comply with Microsoft metadata requirements.
   # This runs on a Windows agent after all packages have been built and
@@ -246,13 +241,9 @@ stages:
       buildConfiguration: ${{ parameters.buildConfiguration }}
       referenceType: ${{ parameters.referenceType }}
       abstractionsArtifactsName: $(abstractionsArtifactsName)
-      abstractionsPackageVersion: $(abstractionsPackageVersion)
       loggingArtifactsName: $(loggingArtifactsName)
-      loggingPackageVersion: $(loggingPackageVersion)
       mdsArtifactsName: $(mdsArtifactsName)
-      mdsPackageVersion: $(mdsPackageVersion)
       sqlServerArtifactsName: $(sqlServerArtifactsName)
-      sqlServerPackageVersion: $(sqlServerPackageVersion)
       testJobTimeout: ${{ parameters.testJobTimeout }}
 
       # When testing MDS via packages, we must depend on the Abstractions,
diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
index 72bcf4a120..c7fa90860f 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
@@ -41,6 +41,9 @@
 #   https://sqlclientdrivers.visualstudio.com/ADO.Net/_build?definitionId=1933
 
 # Set the pipeline run name to the day-of-year and the daily run counter.
+# This becomes BuildNumber, used as the revision component of FileVersion
+# (Major.Minor.Patch.Revision). Revision must fit in a 16-bit unsigned int (max 65535).
+# Format $(DayOfYear)$(Rev:rr) yields e.g. 15401 (day 154, run 01) — always < 65535.
 name: $(DayOfYear)$(Rev:rr)
 
 # Do not trigger this pipeline for PRs.
@@ -166,6 +169,7 @@ extends:
   parameters:
     buildConfiguration: ${{ parameters.buildConfiguration }}
     buildPlatforms: ${{ parameters.buildPlatforms }}
+    buildSuffix: 'ci'
     referenceType: Package
     debug: ${{ parameters.debug }}
     dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
index 7b665d52c3..54a1b0e639 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
@@ -41,6 +41,9 @@
 #   https://sqlclientdrivers.visualstudio.com/ADO.Net/_build?definitionId=1825
 
 # Set the pipeline run name to the day-of-year and the daily run counter.
+# This becomes BuildNumber, used as the revision component of FileVersion
+# (Major.Minor.Patch.Revision). Revision must fit in a 16-bit unsigned int (max 65535).
+# Format $(DayOfYear)$(Rev:rr) yields e.g. 15401 (day 154, run 01) — always < 65535.
 name: $(DayOfYear)$(Rev:rr)
 
 # Do not trigger this pipeline for PRs.
@@ -166,6 +169,7 @@ extends:
   parameters:
     buildConfiguration: ${{ parameters.buildConfiguration }}
     buildPlatforms: ${{ parameters.buildPlatforms }}
+    buildSuffix: 'ci'
     referenceType: Project
     debug: ${{ parameters.debug }}
     dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
index d077aa2115..8bf43bd997 100644
--- a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
@@ -17,12 +17,9 @@ parameters:
     type: string
     default: Abstractions.Artifact
 
-  # The assembly file version to stamp into the Abstractions DLLs.
-  - name: abstractionsAssemblyFileVersion
-    type: string
-
-  # The version to apply to the Abstractions NuGet package and its assemblies.
-  - name: abstractionsPackageVersion
+  # The version to apply to the Abstractions NuGet package and its assemblies.  Every package in the
+  # SqlClient family shares this version.
+  - name: packageVersion
     type: string
 
   # The type of build to test (Release or Debug)
@@ -60,13 +57,6 @@ parameters:
     type: string
     default: Logging.Artifacts
 
-  # The Logging package version to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: loggingPackageVersion
-    type: string
-    default: ''
-
   # The C# project reference type to use when building and packing the packages.
   - name: referenceType
     type: string
@@ -154,7 +144,9 @@ jobs:
             configurationToPack: ${{ parameters.buildConfiguration }}
             packDirectory: $(dotnetPackagesDir)
             verbosityToPack: ${{ parameters.dotnetVerbosity }}
-            buildProperties: AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};AbstractionsAssemblyFileVersion=${{ parameters.abstractionsAssemblyFileVersion }};ReferenceType=Package;LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
+            # BuildNumber supplies the revision component of FileVersion; without
+            # it the assembly is stamped Major.Minor.Patch.0 (see Project branch).
+            buildProperties: SqlClientPackageVersion=${{ parameters.packageVersion }};ReferenceType=Package;BuildNumber=$(Build.BuildNumber)
 
       - ${{ else }}:
         - task: DotNetCoreCLI@2
@@ -165,7 +157,11 @@ jobs:
             configurationToPack: ${{ parameters.buildConfiguration }}
             packDirectory: $(dotnetPackagesDir)
             verbosityToPack: ${{ parameters.dotnetVerbosity }}
-            buildProperties: AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }};AbstractionsAssemblyFileVersion=${{ parameters.abstractionsAssemblyFileVersion }}
+            # BuildNumber supplies the revision component of FileVersion
+            # (Major.Minor.Patch.Revision).  Without it, FileVersionBuildNumber
+            # defaults to 0 and the assembly is stamped Major.Minor.Patch.0,
+            # inconsistent with the MDS/AKV packages that pass it.
+            buildProperties: SqlClientPackageVersion=${{ parameters.packageVersion }};BuildNumber=$(Build.BuildNumber)
 
       # Publish the NuGet packages as a named pipeline artifact.
       - task: PublishPipelineArtifact@1
diff --git a/eng/pipelines/jobs/pack-azure-package-ci-job.yml b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
index 12567fec14..38eaf58fe9 100644
--- a/eng/pipelines/jobs/pack-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
@@ -26,30 +26,14 @@ parameters:
     type: string
     default: Logging.Artifacts
 
-  # The Abstractions package version to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: abstractionsPackageVersion
-    type: string
-
-  # The Logging package version to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: loggingPackageVersion
-    type: string
-    default: ''
-
   # The name of the pipeline artifacts to publish.
   - name: azureArtifactsName
     type: string
     default: Azure.Artifacts
 
-  # The assembly file version to stamp into the Azure DLLs.
-  - name: azureAssemblyFileVersion
-    type: string
-
-  # The version to apply to the NuGet package and DLLs.
-  - name: azurePackageVersion
+  # The version to apply to the SqlClient family packages (SqlClient, Abstractions, Logging).  They
+  # all share this version.
+  - name: packageVersion
     type: string
 
   # The type of build to test (Release or Debug)
@@ -171,7 +155,9 @@ jobs:
             configurationToPack: ${{ parameters.buildConfiguration }}
             packDirectory: $(dotnetPackagesDir)
             verbosityToPack: ${{ parameters.dotnetVerbosity }}
-            buildProperties: AzurePackageVersion=${{ parameters.azurePackageVersion }};AzureAssemblyFileVersion=${{ parameters.azureAssemblyFileVersion }};ReferenceType=Package;LoggingPackageVersion=${{ parameters.loggingPackageVersion }};AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
+            # BuildNumber supplies the revision component of FileVersion; without
+            # it the assembly is stamped Major.Minor.Patch.0 (see Project branch).
+            buildProperties: SqlClientPackageVersion=${{ parameters.packageVersion }};ReferenceType=Package;BuildNumber=$(Build.BuildNumber)
 
       - ${{ else }}:
         - task: DotNetCoreCLI@2
@@ -182,7 +168,11 @@ jobs:
             configurationToPack: ${{ parameters.buildConfiguration }}
             packDirectory: $(dotnetPackagesDir)
             verbosityToPack: ${{ parameters.dotnetVerbosity }}
-            buildProperties: AzurePackageVersion=${{ parameters.azurePackageVersion }};AzureAssemblyFileVersion=${{ parameters.azureAssemblyFileVersion }}
+            # BuildNumber supplies the revision component of FileVersion
+            # (Major.Minor.Patch.Revision).  Without it, FileVersionBuildNumber
+            # defaults to 0 and the assembly is stamped Major.Minor.Patch.0,
+            # inconsistent with the MDS/AKV packages that pass it.
+            buildProperties: SqlClientPackageVersion=${{ parameters.packageVersion }};BuildNumber=$(Build.BuildNumber)
 
       # Publish the NuGet packages as a named pipeline artifact.
       - task: PublishPipelineArtifact@1
diff --git a/eng/pipelines/jobs/pack-logging-package-ci-job.yml b/eng/pipelines/jobs/pack-logging-package-ci-job.yml
index f2a42699e0..0f0faa1859 100644
--- a/eng/pipelines/jobs/pack-logging-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-logging-package-ci-job.yml
@@ -17,12 +17,9 @@ parameters:
     type: string
     default: Logging.Artifacts
 
-  # The assembly file version to stamp into the Logging DLLs.
-  - name: loggingAssemblyFileVersion
-    type: string
-
-  # The version to apply to the Logging NuGet package and its assemblies.
-  - name: loggingPackageVersion
+  # The version to apply to the Logging NuGet package and its assemblies.  Every package in the
+  # SqlClient family shares this version.
+  - name: packageVersion
     type: string
 
   # The type of build to test (Release or Debug)
@@ -107,7 +104,11 @@ jobs:
           configurationToPack: ${{ parameters.buildConfiguration }}
           packDirectory: $(dotnetPackagesDir)
           verbosityToPack: ${{ parameters.dotnetVerbosity }}
-          buildProperties: LoggingPackageVersion=${{ parameters.loggingPackageVersion }};LoggingAssemblyFileVersion=${{ parameters.loggingAssemblyFileVersion }}
+          # BuildNumber supplies the revision component of FileVersion
+          # (Major.Minor.Patch.Revision).  Without it, FileVersionBuildNumber
+          # defaults to 0 and the assembly is stamped Major.Minor.Patch.0,
+          # inconsistent with the MDS/AKV packages that pass it.
+          buildProperties: SqlClientPackageVersion=${{ parameters.packageVersion }};BuildNumber=$(Build.BuildNumber)
 
       # Publish the NuGet packages as a named pipeline artifact.
       - task: PublishPipelineArtifact@1
diff --git a/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml b/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
index 6b19e8c154..4f619b3f1b 100644
--- a/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
@@ -103,7 +103,10 @@ jobs:
           configurationToPack: ${{ parameters.buildConfiguration }}
           packDirectory: $(dotnetPackagesDir)
           verbosityToPack: ${{ parameters.dotnetVerbosity }}
-          buildProperties: SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }}
+          # BuildNumber supplies the revision component of FileVersion
+          # (Major.Minor.Patch.Revision).  Without it, FileVersionBuildNumber
+          # defaults to 0 and the assembly is stamped Major.Minor.Patch.0.
+          buildProperties: SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }};BuildNumber=$(Build.BuildNumber)
 
       - task: PublishPipelineArtifact@1
         displayName: Publish Pipeline Artifact
diff --git a/eng/pipelines/jobs/test-azure-package-ci-job.yml b/eng/pipelines/jobs/test-azure-package-ci-job.yml
index eb9e36152a..104401b585 100644
--- a/eng/pipelines/jobs/test-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-azure-package-ci-job.yml
@@ -26,17 +26,9 @@ parameters:
     type: string
     default: Logging.Artifacts
 
-  # The Logging package version to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: loggingPackageVersion
-    type: string
-    default: ''
-
-  # The Abstractions package verion to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: abstractionsPackageVersion
+  # The version to apply to the SqlClient family packages (SqlClient, Abstractions, Logging).  They
+  # all share this version.  Used when referenceType is 'Package'.
+  - name: packageVersion
     type: string
 
   # The type of build to test (Release or Debug)
@@ -80,12 +72,6 @@ parameters:
     type: string
     default: MDS.Artifacts
 
-  # The MDS package verion to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: mdsPackageVersion
-    type: string
-
   # The name of the SqlServer pipeline artifacts to download.
   #
   # This is used when the referenceType is 'Package'.  MDS depends on
@@ -174,9 +160,7 @@ jobs:
           -p:Configuration=${{ parameters.buildConfiguration }}
           --verbosity ${{ parameters.dotnetVerbosity }}
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-          -p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-          -p:SqlClientPackageVersion=${{ parameters.mdsPackageVersion }}
+          -p:SqlClientPackageVersion=${{ parameters.packageVersion }}
           -p:SqlServerPackageVersion=${{ parameters.sqlServerPackageVersion }}
 
       # Explicitly unset the $PLATFORM environment variable that is set by the
diff --git a/eng/pipelines/libraries/ci-build-variables.yml b/eng/pipelines/libraries/ci-build-variables.yml
index 3cf0b6c01e..5486fa9da5 100644
--- a/eng/pipelines/libraries/ci-build-variables.yml
+++ b/eng/pipelines/libraries/ci-build-variables.yml
@@ -4,70 +4,14 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# This file is only included in PR and CI pipelines for the Abstractions, AKV,
-# Azure, Logging, and MDS projects.
+# Variables for PR and CI pipelines. Package versions are computed by each project's
+# Versions.props using BuildNumber + buildSuffix. No per-package version variables are needed.
+# The buildSuffix itself is set by each pipeline via the core template parameter.
 
 variables:
   - group: ADO Build properties
   - group: ADO Test Configuration Properties
 
-  # C# assembly versions must be in the format: Major.Minor.Build.Revision, but
-  # $(Build.BuildNumber) has the format XXX.YY.  Additionally, each version part
-  # must be a positive 16-bit integer less than 65535.  Simply concatenating
-  # both parts of $(Build.BuildNumber) could produce values larger than 65534,
-  # so we must omit the second part entirely.  Unfortunately, this may result
-  # in multiple subsequent pipline builds using the same C# assembly versions.
-  # The package versions will not be affected and will show the complete
-  # $(Build.BuildNumber) values.
-  - name: assemblyBuildNumber
-    value: $[ split(variables['Build.BuildNumber'], '.')[0] ]
-
-  # Abstractions library assembly file version
-  - name: abstractionsAssemblyFileVersion
-    value: 7.1.0.$(assemblyBuildNumber)
-
-  # Abstractions library NuGet package version
-  - name: abstractionsPackageVersion
-    value: 7.1.0-preview2ci$(Build.BuildNumber)
-
-  # AKV provider assembly file version
-  - name: akvAssemblyFileVersion
-    value: 7.1.0.$(assemblyBuildNumber)
-
-  # AKV provider NuGet package version
-  - name: akvPackageVersion
-    value: 7.1.0-preview2ci$(Build.BuildNumber)
-
-  # Azure library assembly file version
-  - name: azureAssemblyFileVersion
-    value: 7.1.0.$(assemblyBuildNumber)
-
-  # Azure library NuGet package version
-  - name: azurePackageVersion
-    value: 7.1.0-preview2ci$(Build.BuildNumber)
-
-  # Logging library assembly file version
-  - name: loggingAssemblyFileVersion
-    value: 7.1.0.$(assemblyBuildNumber)
-
-  # Logging library NuGet package version
-  - name: loggingPackageVersion
-    value: 7.1.0-preview2ci$(Build.BuildNumber)
-
-  # MDS library NuGet package version
-  # NOTE: This differs from the other structures! MdsVersions.props will deconstruct a provided
-  #    package version and build an assembly version from it. If the build number is included
-  #    before the "-" the build number will be appended again, generating an invalid file version.
-  - name: mdsPackageVersion
-    value: 7.1.0-preview2ci$(AssemblyBuildNumber)
-
-  # SqlServer library NuGet package version
-  # NOTE: SqlServer's version props derive file version from the package version by appending the
-  #    assembly build number, so this must remain a three-part SemVer base with a prerelease
-  #    suffix, not a four-part numeric version.
-  - name: sqlServerPackageVersion
-    value: 1.1.0-preview1ci$(AssemblyBuildNumber)
-
   # Local NuGet feed directory where downloaded pipeline artifacts are placed.
   # NuGet.config references this as a local package source for restore.
   - name: localFeedPath
diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index 2f5238dd38..f773ec5e7e 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -49,16 +49,19 @@ parameters:
   # A list of packages that the package being built with this job depends on. Each entry in the
   # object should have the fields:
   # * artifactName - Name of the artifact published in a previous job that contains the desired
-  #   version of the dependency.
+  #   version of the dependency. Set to an empty string to reference a package that is NOT built in
+  #   this run (e.g. a previously published SqlServer package): the version argument is still
+  #   applied, but no artifact is downloaded, so the dependency is restored from NuGet instead of
+  #   the local feed.
   # * shortName - Short name of the dependency. This name should correspond to the short name used
   #   when building the package via build.proj
-  # * version - the version of the dependency that this package depends on
+  # * version - Pre-computed version of the dependency (from compute-versions stage).
   - name: dependencies
     type: object
     default: []
 
-  # Assembly file version for APIScan (e.g. 1.0.0.12345).
-  - name: fileVersion
+  # Positive unsigned 16-bit revision used by build.proj to derive assembly file versions.
+  - name: revision
     type: string
 
   # The full name of the package. This is used in the job name, and to form DLL and PDB filenames
@@ -85,7 +88,14 @@ parameters:
       - 'SqlClient'
       - 'SqlServer'
 
-  # The version of the package.
+  # Suffix appended to PackageVersion to select the canonical build.proj version property.
+  - name: versionPropertySuffix
+    type: string
+    values:
+      - SqlClient
+      - SqlServer
+
+  # Package version (required). Pre-computed by compute-versions stage.
   - name: packageVersion
     type: string
 
@@ -96,9 +106,9 @@ jobs:
       type: windows
 
     variables:
-      # Placeholder for dependency package arguments. This will be constructed later as it depends
-      # on scripting to decompose parameters.dependencies.
-      dependencyPackageArguments: ''
+      # Placeholder for the Microsoft.SqlServer.Server package-version argument (empty unless this
+      # package depends on SqlServer). Constructed below from parameters.dependencies.
+      sqlServerVersionArgument: ''
 
       ob_outputDirectory: '$(JOB_OUTPUT)'
 
@@ -109,20 +119,28 @@ jobs:
     steps:
       - template: /eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self
 
-      # Constructs the dependency package version parameters to pass to the build steps. Generates
-      # a string of the form (eg) "-p:PackageVersionAzure=1.2.3"
       - ${{ each package in parameters.dependencies }}:
-          # Append the dependency to the package dependency arguments argument in the form of, eg:
-          # -p:PackageVersionAzure=1.2.3
-          - script: echo "##vso[task.setvariable variable=dependencyPackageArguments]$(dependencyPackageArguments) -p:PackageVersion${{ package.shortName }}=${{ package.version }}
-            displayName: "Append Package Version Argument - ${{ package.shortName }}"
-
-          # Download the pipeline artifact for this dependency package
-          - task: DownloadPipelineArtifact@2
-            displayName: "Download Artifact - ${{ package.shortName }}"
-            inputs:
-              artifactName: ${{ package.artifactName }}
-              targetPath: $(REPO_ROOT)/packages
+          # Build the dependency version arguments passed to the build/pack/analysis steps.  The
+          # SqlClient family shares a single version via Central Package Management, and those steps
+          # already pass -p:PackageVersionSqlClient (the package's own version), which pins both the
+          # package being built and every family dependency reference.  Family dependencies
+          # therefore need no extra version argument here -- only a Microsoft.SqlServer.Server
+          # dependency, which is versioned separately, must be pinned explicitly via
+          # -p:PackageVersionSqlServer (this applies whether SqlServer is freshly built this run or
+          # restored from its published NuGet package).
+          - ${{ if eq(package.shortName, 'SqlServer') }}:
+            - pwsh: |
+                Write-Host "##vso[task.setvariable variable=sqlServerVersionArgument]$(sqlServerVersionArgument) -p:PackageVersionSqlServer=${{ package.version }}"
+              displayName: "Append SqlServer Version Argument - ${{ package.shortName }}"
+
+          # Download the pipeline artifact for this dependency package when it was built in this
+          # run. An explicitly empty artifactName restores the dependency from NuGet instead.
+          - ${{ if ne(package.artifactName, '') }}:
+            - task: DownloadPipelineArtifact@2
+              displayName: "Download Artifact - ${{ package.shortName }}"
+              inputs:
+                artifactName: ${{ package.artifactName }}
+                targetPath: $(REPO_ROOT)/packages
 
       # Install the .NET SDK.
       - template: /eng/pipelines/common/steps/install-dotnet.yml@self
@@ -134,16 +152,20 @@ jobs:
       # Perform Roslyn analysis before building, since this step will clobber build output.
       - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml@self
         parameters:
-          dependencyArguments: $(dependencyPackageArguments)
+          dependencyArguments: $(sqlServerVersionArgument)
           packageShortName: ${{ parameters.packageShortName }}
+          revision: ${{ parameters.revision }}
+          versionPropertySuffix: ${{ parameters.versionPropertySuffix }}
           packageVersion: ${{ parameters.packageVersion }}
 
       # Build the package, producing DLLs only (no NuGet package yet).
       - template: /eng/pipelines/onebranch/steps/build-buildproj-step.yml@self
         parameters:
           buildConfiguration: Release
-          dependencyArguments: $(dependencyPackageArguments)
+          dependencyArguments: $(sqlServerVersionArgument)
           packageShortName: ${{ parameters.packageShortName }}
+          revision: ${{ parameters.revision }}
+          versionPropertySuffix: ${{ parameters.versionPropertySuffix }}
           packageVersion: ${{ parameters.packageVersion }}
 
       - ${{ if eq(parameters.shouldSignPackage, true) }}:
@@ -187,9 +209,11 @@ jobs:
       - template: /eng/pipelines/onebranch/steps/pack-buildproj-step.yml@self
         parameters:
           buildConfiguration: Release
-          dependencyArguments: $(dependencyPackageArguments)
+          dependencyArguments: $(sqlServerVersionArgument)
           packageFullName: ${{ parameters.packageFullName }}
           packageShortName: ${{ parameters.packageShortName }}
+          revision: ${{ parameters.revision }}
+          versionPropertySuffix: ${{ parameters.versionPropertySuffix }}
           packageVersion: ${{ parameters.packageVersion }}
 
       - ${{ if eq(parameters.shouldSignPackage, true) }}:
diff --git a/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml b/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
index 25f1586f09..cf7dd6a56b 100644
--- a/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
@@ -39,17 +39,21 @@ parameters:
   # pipeline artifact with the following structure:
   #
   #   drop_build_independent_build_logging/
-  #   ├── packages/
+  #   ├── Package-Release/
   #   │   ├── Microsoft.Data.SqlClient.5.0.0.nupkg
   #   │   └── Microsoft.Data.SqlClient.5.0.0.snupkg
   #   └── symbols/
   #       └── ...
   #
-  # Then the packagePath should be 'packages/Microsoft.Data.SqlClient.5.0.0.nupkg'.
+  # Then the packagePath should be 'Package-Release/Microsoft.Data.SqlClient.5.0.0.nupkg'.
   #
-  # Defaults to 'packages/${{ parameters.packageName }}.*.nupkg' to match any version of the
-  # package. Only .nupkg files are pushed; .snupkg files are included automatically by NuGet
-  # when they exist alongside the .nupkg in the same directory.
+  # When left empty, it defaults to '*/${{ parameters.packageName }}.*.nupkg' to match any version of
+  # the package (see the packageToPush variable; ADO's coalesce() skips the empty default and falls
+  # back to that glob).  The leading '*/' matches whatever single configuration folder the build
+  # produced: the SqlClient package is packed into 'Package-Release/' (PackSqlClient sets
+  # PackageOutputPath), while the other packages are packed by 'dotnet pack' into a plain 'Release/'
+  # folder.  Only .nupkg files are pushed; .snupkg files are included automatically by NuGet when
+  # they exist alongside the .nupkg in the same directory.
   #
   - name: packagePath
     type: string
@@ -74,7 +78,7 @@ jobs:
         value: $(Pipeline.Workspace)/${{ parameters.artifactName }}
 
       - name: packageToPush
-        value: $(artifactPath)/${{ coalesce(parameters.packagePath, format('Package-Release/{0}.*.nupkg', parameters.packageName)) }}
+        value: $(artifactPath)/${{ coalesce(parameters.packagePath, format('*/{0}.*.nupkg', parameters.packageName)) }}
 
     # Template context inputs are used to pass parameters to the deployment job since it doesn't
     # automatically download pipeline artifacts.
diff --git a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
index b3ada2a6f0..af59e54fc2 100644
--- a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
+++ b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
@@ -25,7 +25,7 @@ parameters:
   - name: packageShortName
     type: string
 
-  # The package version, used for symbol versioning.
+  # The package version, used for symbol versioning (required, pre-computed by compute-versions stage).
   - name: packageVersion
     type: string
 
@@ -56,16 +56,17 @@ jobs:
       # OneBranch requires ob_outputDirectory to be set. Pipeline Artifacts are always on and
       # cannot be disabled. To prevent this job from publishing artifacts, a .artifactignore
       # that excludes all files is written into ob_outputDirectory before the auto-publish step.
-      ob_outputDirectory: $(Build.SourcesDirectory)/no_publish
-
+      - name: ob_outputDirectory
+        value: $(Build.SourcesDirectory)/no_publish
       # Disable SDL scanning — this job only uploads/publishes PDBs and produces no
       # assemblies to scan. APIScan and BinSkim are handled by the build jobs.
-      ob_sdl_apiscan_enabled: false
-      ob_sdl_binskim_enabled: false
-
+      - name: ob_sdl_apiscan_enabled
+        value: false
+      - name: ob_sdl_binskim_enabled
+        value: false
       # Path where the downloaded artifact will be placed.
-      artifactPath: '$(Pipeline.Workspace)/${{ parameters.packageFullName }}'
-
+      - name: artifactPath
+        value: '$(Pipeline.Workspace)/${{ parameters.packageFullName }}'
       # PublishSymbols@2 runs on the OneBranch host agent (outside the build container) due to 1ES
       # Pipeline Template credential isolation. On Linux, the host resolves to the Microsoft org by
       # default. Setting this variable at job level ensures the task sees it and connects to the
@@ -73,8 +74,8 @@ jobs:
       #
       # Reference:
       # https://www.osgwiki.com/wiki/Symbols_Publishing_Pipeline_to_SymWeb_and_MSDL#Option_B:_OneBranch
-      #
-      ArtifactServices.Symbol.AccountName: ${{ parameters.symbolsUploadAccount }}
+      - name: ArtifactServices.Symbol.AccountName
+        value: ${{ parameters.symbolsUploadAccount }}
 
     steps:
       # Create ob_outputDirectory with a .artifactignore that excludes everything,
diff --git a/eng/pipelines/onebranch/scripts/compute-versions.ps1 b/eng/pipelines/onebranch/scripts/compute-versions.ps1
new file mode 100644
index 0000000000..76568788a5
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/compute-versions.ps1
@@ -0,0 +1,254 @@
+<#
+.SYNOPSIS
+    Computes effective SqlClient and SqlServer package and file versions for OneBranch builds.
+
+.DESCRIPTION
+    Evaluates the canonical version properties through the GetVersionsSqlClient and
+    GetVersionsSqlServer targets in build.proj, selects the versions that the current pipeline run
+    should consume, and publishes those values as Azure DevOps job output variables.
+
+    The SqlClient family always uses SqlClientNextVersion. Microsoft.SqlServer.Server uses
+    SqlServerNextVersion when BuildSqlServer is true and SqlServerPublishedVersion when it is false.
+    The published SqlServer version is needed when SqlServer is not built because downstream
+    SqlClient projects restore that existing package from NuGet.
+
+    The supplied revision is mapped to the range 1 through 65535 before canonical versions
+    are evaluated so every file version has a valid fourth component. When AddRevision is true, that
+    same mapped value is inserted as the fourth numeric component of package versions built during
+    this run. Any prerelease suffix remains after the revision. For example, 1.2.3-preview1 with
+    revision 165500 becomes package version 1.2.3.34430-preview1 and file version 1.2.3.34430.
+
+    Revisions above 65535 wrap through the valid unsigned 16-bit file-version range. The script logs
+    the mapping because the revision may then collide with an earlier run. An unbuilt SqlServer
+    package is never revised because its effective version must continue to identify the package
+    that already exists on NuGet.
+
+    The script emits these output variables for downstream stages:
+      - VersionRevision
+      - SqlClientPackageVersion
+      - SqlServerPackageVersion
+
+.PARAMETER ProjectPath
+    Absolute or relative path to the repository build.proj file.
+
+.PARAMETER Revision
+    Positive integer used to distinguish versions. Values above 65535 are wrapped into the unsigned
+    16-bit revision range.
+
+.PARAMETER BuildSqlServer
+    Whether this run builds Microsoft.SqlServer.Server. When false, the effective SqlServer package
+    version is its last published version and its file version is not consumed downstream.
+
+.PARAMETER AddRevision
+    Whether to insert the revision into package versions built during this run.
+    Defaults to false in both top-level OneBranch pipelines.
+
+.PARAMETER DotnetPath
+    dotnet executable to invoke. Defaults to the dotnet command resolved from PATH. This parameter
+    primarily supports isolated testing and specialized agent configurations.
+
+.EXAMPLE
+    ./compute-versions.ps1 `
+        -ProjectPath ./build.proj `
+        -Revision 165500 `
+        -BuildSqlServer $true `
+        -AddRevision $true
+
+    Computes versions for a run that builds SqlServer and appends mapped revision 34430 to both
+    package families and their file versions.
+
+.EXAMPLE
+    ./compute-versions.ps1 `
+        -ProjectPath ./build.proj `
+        -Revision 165500 `
+        -BuildSqlServer $false `
+        -AddRevision $true
+
+    Revises the SqlClient family versions while retaining SqlServerPublishedVersion for dependency
+    restore because SqlServer is not built in this run.
+
+.NOTES
+    File Name : compute-versions.ps1
+    Requires  : PowerShell 7+ and the repository-pinned .NET SDK.
+    Called by : compute-versions-stage.yml
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true, HelpMessage = "Path to the repository build.proj file.")]
+    [ValidateScript({ Test-Path -LiteralPath $_ -PathType Leaf })]
+    [string]$ProjectPath,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Positive integer version revision.")]
+    [ValidateRange(1, [long]::MaxValue)]
+    [long]$Revision,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Whether Microsoft.SqlServer.Server is built in this run.")]
+    [bool]$BuildSqlServer,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Whether to append the revision to built package versions.")]
+    [bool]$AddRevision,
+
+    [Parameter(HelpMessage = "dotnet executable to invoke.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$DotnetPath = "dotnet"
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = "Stop"
+
+$wrappedRevision = (($Revision - 1) % 65535) + 1
+if ($Revision -gt 65535) {
+    Write-Host "Revision $Revision exceeds the unsigned 16-bit limit and wrapped to $wrappedRevision; this revision may collide with an earlier run."
+}
+
+<#
+.SYNOPSIS
+    Extracts the first value associated with a labeled GetVersions target output line.
+
+.PARAMETER Output
+    Output lines captured from dotnet build.
+
+.PARAMETER Label
+    Label prefix to find, such as PackageVersion or PublishedVersion.
+
+.OUTPUTS
+    The trimmed label value, or an empty string when the label is absent.
+#>
+function Get-LabeledValue {
+    param(
+        [string[]]$Output,
+        [string]$Label
+    )
+
+    $match = $Output | Select-String -Pattern "^\s*${Label}:\s*(.*?)\s*$" | Select-Object -First 1
+    if ($null -eq $match) {
+        return ""
+    }
+
+    return $match.Matches[0].Groups[1].Value.Trim()
+}
+
+<#
+.SYNOPSIS
+    Evaluates one canonical package family's versions through build.proj.
+
+.PARAMETER Label
+    GetVersions target suffix: SqlClient or SqlServer.
+
+.OUTPUTS
+    An object containing PackageVersion and PublishedVersion.
+#>
+function Get-CanonicalVersions {
+    param(
+        [ValidateSet("SqlClient", "SqlServer")]
+        [string]$Label
+    )
+
+    $output = & $DotnetPath build $ProjectPath `
+        -t:"GetVersions${Label}" -v:m -nologo -p:BuildNumber=$wrappedRevision 2>&1
+    if ($LASTEXITCODE -ne 0) {
+        throw ($output -join [Environment]::NewLine)
+    }
+
+    $packageVersion = Get-LabeledValue -Output $output -Label "PackageVersion"
+    $publishedVersion = Get-LabeledValue -Output $output -Label "PublishedVersion"
+    if ([string]::IsNullOrWhiteSpace($packageVersion)) {
+        throw "Failed to extract PackageVersion for ${Label}.`n$($output -join [Environment]::NewLine)"
+    }
+
+    [pscustomobject]@{
+        PackageVersion = $packageVersion
+        PublishedVersion = $publishedVersion
+    }
+}
+
+<#
+.SYNOPSIS
+    Inserts a numeric revision before a package version's prerelease suffix.
+
+.PARAMETER Version
+    Package version with a three-part numeric base and optional prerelease suffix.
+
+.PARAMETER Revision
+    Revision in the unsigned 16-bit file-version range.
+
+.OUTPUTS
+    A four-part package version preserving the original prerelease suffix.
+#>
+function Add-VersionRevision {
+    param(
+        [string]$Version,
+        [ValidateRange(1, 65535)]
+        [int]$Revision
+    )
+
+    $parts = $Version -split "-", 2
+    if ($parts[0] -notmatch "^\d+\.\d+\.\d+$") {
+        throw "Expected a three-part numeric version base, but received '$Version'."
+    }
+
+    $versionWithRevision = "$($parts[0]).$Revision"
+    if ($parts.Count -eq 2) {
+        return "$versionWithRevision-$($parts[1])"
+    }
+
+    return $versionWithRevision
+}
+
+<#
+.SYNOPSIS
+    Emits an Azure DevOps job output variable for consumption by downstream stages.
+
+.PARAMETER Name
+    Output variable name.
+
+.PARAMETER Value
+    Output variable value.
+#>
+function Set-PipelineOutputVariable {
+    param(
+        [string]$Name,
+        [string]$Value
+    )
+
+    Write-Host "##vso[task.setvariable variable=${Name};isOutput=true]$Value"
+}
+
+Write-Host "Extracting versions with revision=$Revision (wrapped=$wrappedRevision)..."
+$sqlClientVersions = Get-CanonicalVersions -Label "SqlClient"
+$sqlServerVersions = Get-CanonicalVersions -Label "SqlServer"
+
+Write-Host "  SqlClient: pkg=$($sqlClientVersions.PackageVersion)"
+Write-Host "  SqlServer: pkg=$($sqlServerVersions.PackageVersion) pub=$($sqlServerVersions.PublishedVersion)"
+
+$sqlClientPackageVersion = $sqlClientVersions.PackageVersion
+$sqlServerPackageVersion = if ($BuildSqlServer) {
+    $sqlServerVersions.PackageVersion
+} else {
+    if ([string]::IsNullOrWhiteSpace($sqlServerVersions.PublishedVersion)) {
+        throw "GetVersionsSqlServer did not emit PublishedVersion for an unbuilt SqlServer dependency."
+    }
+    $sqlServerVersions.PublishedVersion
+}
+
+if ($AddRevision) {
+    $sqlClientPackageVersion = Add-VersionRevision `
+        -Version $sqlClientPackageVersion `
+        -Revision $wrappedRevision
+    if ($BuildSqlServer) {
+        $sqlServerPackageVersion = Add-VersionRevision `
+            -Version $sqlServerPackageVersion `
+            -Revision $wrappedRevision
+    }
+
+    Write-Host "Version revision: $wrappedRevision (input=$Revision)"
+}
+
+Write-Host "Effective versions:"
+Write-Host "  SqlClient (family): $sqlClientPackageVersion"
+Write-Host "  SqlServer:          $sqlServerPackageVersion"
+
+Set-PipelineOutputVariable -Name "SqlClientPackageVersion" -Value $sqlClientPackageVersion
+Set-PipelineOutputVariable -Name "SqlServerPackageVersion" -Value $sqlServerPackageVersion
+Set-PipelineOutputVariable -Name "VersionRevision" -Value $wrappedRevision
diff --git a/eng/pipelines/onebranch/scripts/tests/README.md b/eng/pipelines/onebranch/scripts/tests/README.md
index 447dda5d32..bda88d58a1 100644
--- a/eng/pipelines/onebranch/scripts/tests/README.md
+++ b/eng/pipelines/onebranch/scripts/tests/README.md
@@ -1,6 +1,6 @@
-# Publish-Symbols Tests
+# OneBranch PowerShell Tests
 
-Pester tests for the `publish-symbols.ps1` script used by the symbol publishing pipeline step.
+Pester tests for PowerShell scripts used by OneBranch pipeline steps.
 
 ## Prerequisites
 
@@ -31,6 +31,7 @@ Invoke-Pester ./publish-symbols.Tests.ps1 -Output Detailed
 
 | Area                  | What's tested                                                    |
 | --------------------- | ---------------------------------------------------------------- |
+| Version computation   | Canonical output parsing, revisions, wrapping, effective package selection, and failures |
 | Parameter validation  | Empty strings rejected for all mandatory parameters              |
 | URL construction      | Base URL, register URL, request URL built from parameters        |
 | Request bodies        | Registration body, default publish flags, flag overrides         |
@@ -40,4 +41,5 @@ Invoke-Pester ./publish-symbols.Tests.ps1 -Output Detailed
 ## Notes
 
 - All external calls (`az`, `Invoke-RestMethod`) are mocked — no network access or Azure credentials are required.
-- Tests validate the script at `../publish-symbols.ps1` relative to this directory.
+- Version tests mock `dotnet`, so they do not invoke MSBuild or require a restored repository.
+- Tests validate scripts in the parent directory relative to this directory.
diff --git a/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1 b/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
new file mode 100644
index 0000000000..4e8a2f375a
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
@@ -0,0 +1,135 @@
+<#
+.SYNOPSIS
+    Pester tests for compute-versions.ps1.
+#>
+
+BeforeAll {
+    $scriptPath = Join-Path $PSScriptRoot '..' 'compute-versions.ps1'
+    $projectPath = Join-Path $TestDrive 'build.proj'
+    Set-Content -LiteralPath $projectPath -Value '<Project />'
+
+    function Invoke-ComputeVersions {
+        param(
+            [long]$Revision = 42,
+            [bool]$BuildSqlServer = $true,
+            [bool]$AddRevision = $true
+        )
+
+        & $scriptPath `
+            -ProjectPath $projectPath `
+            -Revision $Revision `
+            -BuildSqlServer $BuildSqlServer `
+            -AddRevision $AddRevision *>&1 | Out-String
+    }
+
+    function Set-SuccessfulDotnetMock {
+        $global:computeVersionsDotnetCallCount = 0
+        Mock -CommandName 'dotnet' -MockWith {
+            $global:LASTEXITCODE = 0
+            $global:computeVersionsDotnetCallCount++
+            if ($global:computeVersionsDotnetCallCount % 2 -eq 1) {
+                return @(
+                    '  PackageVersion: 7.1.0-preview3'
+                    '  PublishedVersion: 7.0.0'
+                )
+            }
+
+            return @(
+                '  PackageVersion: 1.1.0-preview1'
+                '  PublishedVersion: 1.0.0'
+            )
+        }
+    }
+}
+
+AfterAll {
+    Remove-Variable -Name 'computeVersionsDotnetCallCount' -Scope Global -ErrorAction SilentlyContinue
+}
+
+Describe 'compute-versions.ps1 Effective Versions' {
+    BeforeEach {
+        Set-SuccessfulDotnetMock
+    }
+
+    It 'emits canonical package versions and the revision when package revisioning is disabled' {
+        $output = Invoke-ComputeVersions -AddRevision $false
+
+        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3'
+        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0-preview1'
+        $output | Should -Match 'VersionRevision;isOutput=true]42'
+    }
+
+    It 'inserts the revision before prerelease suffixes for built packages' {
+        $output = Invoke-ComputeVersions
+
+        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0\.42-preview3'
+        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0\.42-preview1'
+    }
+
+    It 'retains the published SqlServer package when SqlServer is not built' {
+        $output = Invoke-ComputeVersions -BuildSqlServer $false
+
+        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0\.42-preview3'
+        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.0\.0'
+        $output | Should -Not -Match 'SqlServerPackageVersion;isOutput=true]1\.0\.0\.42'
+    }
+
+    It 'wraps revisions above 65535 and logs the mapping as information' {
+        $output = Invoke-ComputeVersions -Revision 65536
+
+        $output | Should -Match 'Revision 65536.*wrapped to 1'
+        $output | Should -Not -Match 'task\.logissue type=warning'
+        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0\.1-preview3'
+        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0\.1-preview1'
+        $output | Should -Match 'VersionRevision;isOutput=true]1'
+    }
+
+    It 'emits the wrapped revision when package revisioning is disabled' {
+        $output = Invoke-ComputeVersions -Revision 65536 -AddRevision $false
+
+        $output | Should -Match 'Revision 65536.*wrapped to 1'
+        $output | Should -Not -Match 'task\.logissue type=warning'
+        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3'
+        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0-preview1'
+        $output | Should -Match 'VersionRevision;isOutput=true]1'
+    }
+}
+
+Describe 'compute-versions.ps1 Error Handling' {
+    It 'rejects a non-positive revision' {
+        { Invoke-ComputeVersions -Revision 0 } | Should -Throw
+    }
+
+    It 'throws when a GetVersions target fails' {
+        Mock -CommandName 'dotnet' -MockWith {
+            $global:LASTEXITCODE = 1
+            return 'simulated target failure'
+        }
+
+        { Invoke-ComputeVersions } | Should -Throw '*simulated target failure*'
+    }
+
+    It 'throws when required version labels are absent' {
+        Mock -CommandName 'dotnet' -MockWith {
+            $global:LASTEXITCODE = 0
+            return 'Build succeeded without version labels'
+        }
+
+        { Invoke-ComputeVersions } | Should -Throw '*Failed to extract PackageVersion*'
+    }
+
+    It 'throws when a revised package does not have a three-part numeric base' {
+        $global:computeVersionsDotnetCallCount = 0
+        Mock -CommandName 'dotnet' -MockWith {
+            $global:LASTEXITCODE = 0
+            $global:computeVersionsDotnetCallCount++
+            if ($global:computeVersionsDotnetCallCount -eq 1) {
+                return @('PackageVersion: 7.1-preview3')
+            }
+
+            return @('PackageVersion: 1.1.0-preview1', 'PublishedVersion: 1.0.0')
+        }
+
+        { Invoke-ComputeVersions } | Should -Throw "*Expected a three-part numeric version base*"
+    }
+}
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index f7b9381000..7eb7bfc6cc 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -4,6 +4,7 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
+# The human-readable name applied to each run of this pipeline.
 name: $(Year:YY)$(DayOfYear)$(Rev:.r)
 
 # No activity- or schedule-based triggers.  This pipeline is run manually only.
@@ -27,9 +28,10 @@ parameters:
     type: boolean
     default: false
 
-  # True if this is a preview build.
-  - name: isPreview
-    displayName: Is this a preview build?
+  # Append the Build.BuildId revision to package and file versions to reduce collisions when
+  # repeatedly publishing tests to symbol servers or the NuGet test feed.
+  - name: addRevision
+    displayName: Use the build ID as the revision version
     type: boolean
     default: false
 
@@ -41,60 +43,28 @@ parameters:
 
   # Build parameters — select which packages to build.
 
-  # Build the Microsoft.SqlServer.Server package.
-  - name: buildSqlServerServer
+  # Build the Microsoft.SqlServer.Server package.  The SqlClient family is always built; SqlServer
+  # is optional.  When built, the SqlClient family depends on the freshly-built SqlServer package;
+  # when not built, the family depends on the most recently published SqlServer package.
+  - name: buildSqlServer
     displayName: Build Microsoft.SqlServer.Server
     type: boolean
     default: true
 
-  # Build Microsoft.Data.SqlClient and Extensions packages.
-  - name: buildSqlClient
-    displayName: Build Microsoft.Data.SqlClient and Extensions
-    type: boolean
-    default: true
-
-  # Build the Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider package.
-  - name: buildAkvProvider
-    displayName: Build Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
-    type: boolean
-    default: true
-
   # Release parameters — select which packages to publish to NuGet.
   # All default to false; toggle at queue time for on-demand selective release.
 
-  # Release the Microsoft.SqlServer.Server package.
-  - name: releaseSqlServerServer
+  # Release the Microsoft.SqlServer.Server package (versioned separately).
+  - name: releaseSqlServer
     displayName: Release Microsoft.SqlServer.Server
     type: boolean
     default: false
 
-  # Release the Microsoft.Data.SqlClient.Internal.Logging package.
-  - name: releaseLogging
-    displayName: Release Microsoft.Data.SqlClient.Internal.Logging
-    type: boolean
-    default: false
-
-  # Release the Microsoft.Data.SqlClient.Extensions.Abstractions package.
-  - name: releaseAbstractions
-    displayName: Release Microsoft.Data.SqlClient.Extensions.Abstractions
-    type: boolean
-    default: false
-
-  # Release the Microsoft.Data.SqlClient package.
+  # Release the SqlClient family (Internal.Logging, Extensions.Abstractions,
+  # Microsoft.Data.SqlClient, Extensions.Azure, and the AlwaysEncrypted AzureKeyVaultProvider).
+  # The family is always released together at the shared SqlClient version.
   - name: releaseSqlClient
-    displayName: Release Microsoft.Data.SqlClient
-    type: boolean
-    default: false
-
-  # Release the Microsoft.Data.SqlClient.Extensions.Azure package.
-  - name: releaseAzure
-    displayName: Release Microsoft.Data.SqlClient.Extensions.Azure
-    type: boolean
-    default: false
-
-  # Release the Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider package.
-  - name: releaseAkvProvider
-    displayName: Release Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
+    displayName: Release SqlClient family
     type: boolean
     default: false
 
@@ -102,8 +72,6 @@ variables:
   - template: /eng/pipelines/common/variables/common-variables.yml@self
   - template: /eng/pipelines/onebranch/variables/onebranch-variables.yml@self
   - template: /eng/pipelines/onebranch/variables/package-variables.yml@self
-    parameters:
-      isPreview: ${{ parameters.isPreview }}
 
   # Drives ContinuousIntegrationBuild=true in src/Directory.Build.props so this
   # pipeline produces deterministic packages identical (modulo signing) to the
@@ -270,31 +238,29 @@ extends:
         configFile: '$(REPO_ROOT)/.config/tsaoptions.json'
 
     stages:
+      # Compile-time guard (1ES/OneBranch ': error' idiom): releasing Microsoft.SqlServer.Server
+      # requires building it this run, otherwise there is no package to release.  The invalid item
+      # is only emitted for the bad parameter combination and fails template expansion with the
+      # message below.
+      - ${{ if and(eq(parameters.releaseSqlServer, true), eq(parameters.buildSqlServer, false)) }}:
+        - 'Invalid parameters: releaseSqlServer=true requires buildSqlServer=true. There is no freshly-built Microsoft.SqlServer.Server package to release when buildSqlServer is false.': error
+
+      - template: /eng/pipelines/onebranch/stages/compute-versions-stage.yml@self
+        parameters:
+          addRevision: ${{ parameters.addRevision }}
+          buildSqlServer: ${{ parameters.buildSqlServer }}
+
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
         parameters:
           isOfficial: false # This is a non-official pipeline.
-          buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
-          buildSqlClient: ${{ parameters.buildSqlClient }}
-          buildAkvProvider: ${{ parameters.buildAkvProvider }}
+          buildSqlServer: ${{ parameters.buildSqlServer }}
 
           abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
-          abstractionsFileVersion: '${{ variables.abstractionsFileVersion }}'
-          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
           akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
-          akvProviderFileVersion: '${{ variables.akvProviderFileVersion }}'
-          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
           azureArtifactsName: '${{ variables.azureArtifactsName }}'
-          azureFileVersion: '${{ variables.azureFileVersion }}'
-          azurePackageVersion: '${{ variables.azurePackageVersion }}'
           loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
-          loggingFileVersion: '${{ variables.loggingFileVersion }}'
-          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
           sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
-          sqlClientFileVersion: '${{ variables.sqlClientFileVersion }}'
-          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
           sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
-          sqlServerFileVersion: '${{ variables.sqlServerFileVersion }}'
-          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
 
           signingAppRegistrationClientId: '$(SigningAppRegistrationClientId)'
           signingAppRegistrationTenantId: '$(SigningAppRegistrationTenantId)'
@@ -306,22 +272,14 @@ extends:
       - template: /eng/pipelines/onebranch/stages/publish-symbols-stage.yml@self
         parameters:
           publishSymbols: ${{ parameters.publishSymbols }}
-          buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
-          buildSqlClient: ${{ parameters.buildSqlClient }}
-          buildAkvProvider: ${{ parameters.buildAkvProvider }}
+          buildSqlServer: ${{ parameters.buildSqlServer }}
 
           abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
-          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
           akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
-          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
           azureArtifactsName: '${{ variables.azureArtifactsName }}'
-          azurePackageVersion: '${{ variables.azurePackageVersion }}'
           loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
-          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
           sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
-          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
           sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
-          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
 
           symbolsAzureSubscription: '$(SymbolsAzureSubscription)'
           symbolsPublishProjectName: '$(SymbolsPublishProjectNameSqlClient)'
@@ -342,21 +300,11 @@ extends:
           publishSymbols: ${{ parameters.publishSymbols }}
 
           abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
-          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
           akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
-          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
           azureArtifactsName: '${{ variables.azureArtifactsName }}'
-          azurePackageVersion: '${{ variables.azurePackageVersion }}'
           loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
-          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
           sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
-          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
           sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
-          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
 
-          releaseSqlServerServer: ${{ parameters.releaseSqlServerServer }}
-          releaseLogging: ${{ parameters.releaseLogging }}
-          releaseAbstractions: ${{ parameters.releaseAbstractions }}
+          releaseSqlServer: ${{ parameters.releaseSqlServer }}
           releaseSqlClient: ${{ parameters.releaseSqlClient }}
-          releaseAzure: ${{ parameters.releaseAzure }}
-          releaseAkvProvider: ${{ parameters.releaseAkvProvider }}
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 36cafbd5f3..38a8a75496 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -4,6 +4,7 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
+# The human-readable name applied to each run of this pipeline.
 name: $(Year:YY)$(DayOfYear)$(Rev:.r)
 
 # No activity-based triggers.
@@ -36,9 +37,9 @@ parameters:
     type: boolean
     default: false
 
-  # True if this is a preview build.
-  - name: isPreview
-    displayName: Is this a preview build?
+  # Append the Build.BuildId revision to package and file versions.
+  - name: addRevision
+    displayName: Use the build ID as the revision version
     type: boolean
     default: false
 
@@ -57,60 +58,28 @@ parameters:
 
   # Build parameters — select which packages to build.
 
-  # Build the Microsoft.SqlServer.Server package.
-  - name: buildSqlServerServer
+  # Build the Microsoft.SqlServer.Server package.  The SqlClient family is always built; SqlServer
+  # is optional.  When built, the SqlClient family depends on the freshly-built SqlServer package;
+  # when not built, the family depends on the most recently published SqlServer package.
+  - name: buildSqlServer
     displayName: Build Microsoft.SqlServer.Server
     type: boolean
-    default: true
-
-  # Build Microsoft.Data.SqlClient and Extensions packages.
-  - name: buildSqlClient
-    displayName: Build Microsoft.Data.SqlClient and Extensions
-    type: boolean
-    default: true
-
-  # Build the Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider package.
-  - name: buildAkvProvider
-    displayName: Build Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
-    type: boolean
-    default: true
+    default: false
 
   # Release parameters — select which packages to publish to NuGet.
   # All default to false; toggle at queue time for on-demand selective release.
 
-  # Release the Microsoft.SqlServer.Server package.
-  - name: releaseSqlServerServer
+  # Release the Microsoft.SqlServer.Server package (versioned separately).
+  - name: releaseSqlServer
     displayName: Release Microsoft.SqlServer.Server
     type: boolean
     default: false
 
-  # Release the Microsoft.Data.SqlClient.Internal.Logging package.
-  - name: releaseLogging
-    displayName: Release Microsoft.Data.SqlClient.Internal.Logging
-    type: boolean
-    default: false
-
-  # Release the Microsoft.Data.SqlClient.Extensions.Abstractions package.
-  - name: releaseAbstractions
-    displayName: Release Microsoft.Data.SqlClient.Extensions.Abstractions
-    type: boolean
-    default: false
-
-  # Release the Microsoft.Data.SqlClient package.
+  # Release the SqlClient family (Internal.Logging, Extensions.Abstractions,
+  # Microsoft.Data.SqlClient, Extensions.Azure, and the AlwaysEncrypted AzureKeyVaultProvider).
+  # The family is always released together at the shared SqlClient version.
   - name: releaseSqlClient
-    displayName: Release Microsoft.Data.SqlClient
-    type: boolean
-    default: false
-
-  # Release the Microsoft.Data.SqlClient.Extensions.Azure package.
-  - name: releaseAzure
-    displayName: Release Microsoft.Data.SqlClient.Extensions.Azure
-    type: boolean
-    default: false
-
-  # Release the Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider package.
-  - name: releaseAkvProvider
-    displayName: Release Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
+    displayName: Release SqlClient family
     type: boolean
     default: false
 
@@ -118,8 +87,6 @@ variables:
   - template: /eng/pipelines/common/variables/common-variables.yml@self
   - template: /eng/pipelines/onebranch/variables/onebranch-variables.yml@self
   - template: /eng/pipelines/onebranch/variables/package-variables.yml@self
-    parameters:
-      isPreview: ${{ parameters.isPreview }}
 
   # Drives ContinuousIntegrationBuild=true in src/Directory.Build.props so the shipped
   # DLLs/PDBs embed portable /_/... source paths and the produced NuGet packages pass
@@ -281,31 +248,29 @@ extends:
         configFile: '$(REPO_ROOT)/.config/tsaoptions.json'
 
     stages:
+      # Compile-time guard (1ES/OneBranch ': error' idiom): releasing Microsoft.SqlServer.Server
+      # requires building it this run, otherwise there is no package to release.  The invalid item
+      # is only emitted for the bad parameter combination and fails template expansion with the
+      # message below.
+      - ${{ if and(eq(parameters.releaseSqlServer, true), eq(parameters.buildSqlServer, false)) }}:
+        - 'Invalid parameters: releaseSqlServer=true requires buildSqlServer=true. There is no freshly-built Microsoft.SqlServer.Server package to release when buildSqlServer is false.': error
+
+      - template: /eng/pipelines/onebranch/stages/compute-versions-stage.yml@self
+        parameters:
+          addRevision: ${{ parameters.addRevision }}
+          buildSqlServer: ${{ parameters.buildSqlServer }}
+
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
         parameters:
           isOfficial: true # This is an official pipeline.
-          buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
-          buildSqlClient: ${{ parameters.buildSqlClient }}
-          buildAkvProvider: ${{ parameters.buildAkvProvider }}
+          buildSqlServer: ${{ parameters.buildSqlServer }}
 
           abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
-          abstractionsFileVersion: '${{ variables.abstractionsFileVersion }}'
-          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
           akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
-          akvProviderFileVersion: '${{ variables.akvProviderFileVersion }}'
-          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
           azureArtifactsName: '${{ variables.azureArtifactsName }}'
-          azureFileVersion: '${{ variables.azureFileVersion }}'
-          azurePackageVersion: '${{ variables.azurePackageVersion }}'
           loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
-          loggingFileVersion: '${{ variables.loggingFileVersion }}'
-          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
           sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
-          sqlClientFileVersion: '${{ variables.sqlClientFileVersion }}'
-          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
           sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
-          sqlServerFileVersion: '${{ variables.sqlServerFileVersion }}'
-          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
 
           signingAppRegistrationClientId: '$(SigningAppRegistrationClientId)'
           signingAppRegistrationTenantId: '$(SigningAppRegistrationTenantId)'
@@ -317,22 +282,14 @@ extends:
       - template: /eng/pipelines/onebranch/stages/publish-symbols-stage.yml@self
         parameters:
           publishSymbols: ${{ parameters.publishSymbols }}
-          buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
-          buildSqlClient: ${{ parameters.buildSqlClient }}
-          buildAkvProvider: ${{ parameters.buildAkvProvider }}
+          buildSqlServer: ${{ parameters.buildSqlServer }}
 
           abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
-          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
           akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
-          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
           azureArtifactsName: '${{ variables.azureArtifactsName }}'
-          azurePackageVersion: '${{ variables.azurePackageVersion }}'
           loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
-          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
           sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
-          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
           sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
-          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
 
           symbolsAzureSubscription: '$(SymbolsAzureSubscription)'
           symbolsPublishProjectName: '$(SymbolsPublishProjectNameSqlClient)'
@@ -357,21 +314,11 @@ extends:
           publishSymbols: ${{ parameters.publishSymbols }}
 
           abstractionsArtifactsName: '${{ variables.abstractionsArtifactsName }}'
-          abstractionsPackageVersion: '${{ variables.abstractionsPackageVersion }}'
           akvProviderArtifactsName: '${{ variables.akvProviderArtifactsName }}'
-          akvProviderPackageVersion: '${{ variables.akvProviderPackageVersion }}'
           azureArtifactsName: '${{ variables.azureArtifactsName }}'
-          azurePackageVersion: '${{ variables.azurePackageVersion }}'
           loggingArtifactsName: '${{ variables.loggingArtifactsName }}'
-          loggingPackageVersion: '${{ variables.loggingPackageVersion }}'
           sqlClientArtifactsName: '${{ variables.sqlClientArtifactsName }}'
-          sqlClientPackageVersion: '${{ variables.sqlClientPackageVersion }}'
           sqlServerArtifactsName: '${{ variables.sqlServerArtifactsName }}'
-          sqlServerPackageVersion: '${{ variables.sqlServerPackageVersion }}'
 
-          releaseSqlServerServer: ${{ parameters.releaseSqlServerServer }}
-          releaseLogging: ${{ parameters.releaseLogging }}
-          releaseAbstractions: ${{ parameters.releaseAbstractions }}
+          releaseSqlServer: ${{ parameters.releaseSqlServer }}
           releaseSqlClient: ${{ parameters.releaseSqlClient }}
-          releaseAzure: ${{ parameters.releaseAzure }}
-          releaseAkvProvider: ${{ parameters.releaseAkvProvider }}
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index 62f26b7aa3..49c6616b85 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -24,13 +24,10 @@ parameters:
 
   # ── Build parameters ───────────────────────────────────────────────────
 
-  - name: buildSqlServerServer
-    type: boolean
-
-  - name: buildSqlClient
-    type: boolean
-
-  - name: buildAkvProvider
+  # Whether to build Microsoft.SqlServer.Server.  The SqlClient family is always built; SqlServer
+  # is optional.  When built, the SqlClient family depends on the freshly-built SqlServer package;
+  # when not built, the family depends on the most recently published SqlServer package.
+  - name: buildSqlServer
     type: boolean
 
   # Package Parameters -----------------------------------------------------
@@ -38,57 +35,21 @@ parameters:
   - name: abstractionsArtifactsName
     type: string
 
-  - name: abstractionsFileVersion
-    type: string
-
-  - name: abstractionsPackageVersion
-    type: string
-
   - name: akvProviderArtifactsName
     type: string
 
-  - name: akvProviderFileVersion
-    type: string
-
-  - name: akvProviderPackageVersion
-    type: string
-
   - name: azureArtifactsName
     type: string
 
-  - name: azureFileVersion
-    type: string
-
-  - name: azurePackageVersion
-    type: string
-
   - name: loggingArtifactsName
     type: string
 
-  - name: loggingFileVersion
-    type: string
-
-  - name: loggingPackageVersion
-    type: string
-
   - name: sqlClientArtifactsName
     type: string
 
-  - name: sqlClientFileVersion
-    type: string
-
-  - name: sqlClientPackageVersion
-    type: string
-
   - name: sqlServerArtifactsName
     type: string
 
-  - name: sqlServerFileVersion
-    type: string
-
-  - name: sqlServerPackageVersion
-    type: string
-
   # Signing Parameters -----------------------------------------------------
 
   - name: signingAppRegistrationClientId
@@ -116,30 +77,39 @@ stages:
   # ====================================================================
   - stage: build_independent
     displayName: "Build Independent Packages"
+    dependsOn: compute_versions
 
-    jobs:
-      - ${{ if or(eq(parameters.buildAkvProvider, true), eq(parameters.buildSqlClient, true)) }}:
-        # Build Microsoft.Data.SqlClient.Internal.Logging
-        - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
-          parameters:
-            apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Internal.Logging/dlls'
-            apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Internal.Logging/pdbs'
-            shouldSignPackage: ${{ parameters.isOfficial }}
-            signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
-            signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
-            signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
-            signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
-            signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
-            signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-
-            dependencies: []
-            fileVersion: '${{ parameters.loggingFileVersion }}'
-            packageFullName: 'Microsoft.Data.SqlClient.Internal.Logging'
-            packageShortName: 'Logging'
-            packageVersion: '${{ parameters.loggingPackageVersion }}'
-
+    variables:
+      - name: versionRevision
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.VersionRevision'] ]
+      - name: sqlClientPackageVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+      - name: sqlServerPackageVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
 
-      - ${{ if eq(parameters.buildSqlServerServer, true) }}:
+    jobs:
+      # Build Microsoft.Data.SqlClient.Internal.Logging
+      - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
+        parameters:
+          apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Internal.Logging/dlls'
+          apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Internal.Logging/pdbs'
+          shouldSignPackage: ${{ parameters.isOfficial }}
+          signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+          signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+          signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+          signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+          signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+          signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+
+          dependencies: []
+          revision: '$(versionRevision)'
+          packageFullName: 'Microsoft.Data.SqlClient.Internal.Logging'
+          packageShortName: 'Logging'
+          versionPropertySuffix: 'SqlClient'
+          packageVersion: '$(sqlClientPackageVersion)'
+
+
+      - ${{ if eq(parameters.buildSqlServer, true) }}:
         # Build Microsoft.SqlServer.Server
         - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
           parameters:
@@ -154,158 +124,206 @@ stages:
             signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
 
             dependencies: []
-            fileVersion: '${{ parameters.sqlServerFileVersion }}'
+            revision: '$(versionRevision)'
             packageFullName: 'Microsoft.SqlServer.Server'
             packageShortName: 'SqlServer'
-            packageVersion: '${{ parameters.sqlServerPackageVersion }}'
+            versionPropertySuffix: 'SqlServer'
+            packageVersion: '$(sqlServerPackageVersion)'
 
   # ====================================================================
   # Stage 2: Abstractions package (depends on Logging from Stage 1)
   # Abstractions must build after Logging since it has a package
   # dependency on Internal.Logging.
   # ====================================================================
-  - ${{ if eq(parameters.buildSqlClient, true) }}:
-      - stage: build_abstractions
-        displayName: "Build Abstractions Package"
-        dependsOn: build_independent
-
-        jobs:
-          # Build Microsoft.Data.SqlClient.Extensions.Abstractions
-          - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
-            parameters:
-              apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Abstractions/dlls'
-              apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Abstractions/pdbs'
-              shouldSignPackage: ${{ parameters.isOfficial }}
-              signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
-              signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
-              signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
-              signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
-              signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
-              signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-
-              dependencies:
-                - artifactName: '${{ parameters.loggingArtifactsName }}'
-                  shortName: 'Logging'
-                  version: '${{ parameters.loggingPackageVersion }}'
-              fileVersion: '${{ parameters.abstractionsFileVersion }}'
-              packageFullName: 'Microsoft.Data.SqlClient.Extensions.Abstractions'
-              packageShortName: 'Abstractions'
-              packageVersion: '${{ parameters.abstractionsPackageVersion }}'
+  - stage: build_abstractions
+    displayName: "Build Abstractions Package"
+    dependsOn:
+      - compute_versions
+      - build_independent
+
+    variables:
+      - name: versionRevision
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.VersionRevision'] ]
+      - name: sqlClientPackageVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+
+    jobs:
+      # Build Microsoft.Data.SqlClient.Extensions.Abstractions
+      - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
+        parameters:
+          apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Abstractions/dlls'
+          apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Abstractions/pdbs'
+          shouldSignPackage: ${{ parameters.isOfficial }}
+          signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+          signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+          signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+          signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+          signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+          signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+
+          dependencies:
+            - artifactName: '${{ parameters.loggingArtifactsName }}'
+              shortName: 'Logging'
+              version: '$(sqlClientPackageVersion)'
+          revision: '$(versionRevision)'
+          packageFullName: 'Microsoft.Data.SqlClient.Extensions.Abstractions'
+          packageShortName: 'Abstractions'
+          versionPropertySuffix: 'SqlClient'
+          packageVersion: '$(sqlClientPackageVersion)'
 
   # ====================================================================
   # Stage 3: Core packages (depend on Abstractions)
   # SqlClient and Extensions.Azure build in parallel after Abstractions.
   # Stage name kept as 'build_dependent' for validate job compatibility.
   # ====================================================================
-  - ${{ if eq(parameters.buildSqlClient, true) }}:
-      - stage: build_dependent
-        displayName: "Build Core Packages"
-        dependsOn: build_abstractions
-
-        jobs:
-          - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
-            parameters:
-              apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/dlls'
-              apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/pdbs'
-              shouldSignPackage: ${{ parameters.isOfficial }}
-              signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
-              signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
-              signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
-              signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
-              signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
-              signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-
-              dependencies:
-                - artifactName: '${{ parameters.abstractionsArtifactsName }}'
-                  shortName: 'Abstractions'
-                  version: '${{ parameters.abstractionsPackageVersion }}'
-                - artifactName: '${{ parameters.loggingArtifactsName }}'
-                  shortName: 'Logging'
-                  version: '${{ parameters.loggingPackageVersion }}'
-                - artifactName: '${{ parameters.sqlServerArtifactsName }}'
-                  shortName: 'SqlServer'
-                  version: '${{ parameters.sqlServerPackageVersion }}'
-              fileVersion: '${{ parameters.sqlClientFileVersion }}'
-              packageFullName: 'Microsoft.Data.SqlClient'
-              packageShortName: 'SqlClient'
-              packageVersion: '${{ parameters.sqlClientPackageVersion }}'
-
-          # Build Microsoft.Data.SqlClient.Extensions.Azure
-          - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
-            parameters:
-              apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Azure/dlls'
-              apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Azure/pdbs'
-              shouldSignPackage: ${{ parameters.isOfficial }}
-              signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
-              signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
-              signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
-              signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
-              signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
-              signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-
-              dependencies:
-                - artifactName: '${{ parameters.abstractionsArtifactsName }}'
-                  shortName: 'Abstractions'
-                  version: '${{ parameters.abstractionsPackageVersion }}'
-                - artifactName: '${{ parameters.loggingArtifactsName }}'
-                  shortName: 'Logging'
-                  version: '${{ parameters.loggingPackageVersion }}'
-              fileVersion: '${{ parameters.azureFileVersion }}'
-              packageFullName: 'Microsoft.Data.SqlClient.Extensions.Azure'
-              packageShortName: 'Azure'
-              packageVersion: '${{ parameters.azurePackageVersion }}'
+  - stage: build_dependent
+    displayName: "Build Core Packages"
+    dependsOn:
+      - compute_versions
+      - build_abstractions
+
+    variables:
+      - name: versionRevision
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.VersionRevision'] ]
+      - name: sqlClientPackageVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+      - name: sqlServerPackageVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
+
+    jobs:
+      # Build Microsoft.Data.SqlClient
+      - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
+        parameters:
+          apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/dlls'
+          apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/pdbs'
+          shouldSignPackage: ${{ parameters.isOfficial }}
+          signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+          signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+          signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+          signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+          signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+          signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+
+          dependencies:
+            - artifactName: '${{ parameters.abstractionsArtifactsName }}'
+              shortName: 'Abstractions'
+              version: '$(sqlClientPackageVersion)'
+            - artifactName: '${{ parameters.loggingArtifactsName }}'
+              shortName: 'Logging'
+              version: '$(sqlClientPackageVersion)'
+            # When SqlServer is built this run, depend on the freshly-built artifact; otherwise
+            # depend on the most recently published SqlServer package (restored from NuGet, so no
+            # artifact download).
+            - ${{ if eq(parameters.buildSqlServer, true) }}:
+              - artifactName: '${{ parameters.sqlServerArtifactsName }}'
+                shortName: 'SqlServer'
+                version: '$(sqlServerPackageVersion)'
+            - ${{ else }}:
+              - artifactName: ''
+                shortName: 'SqlServer'
+                version: '$(sqlServerPackageVersion)'
+          revision: '$(versionRevision)'
+          packageFullName: 'Microsoft.Data.SqlClient'
+          packageShortName: 'SqlClient'
+          versionPropertySuffix: 'SqlClient'
+          packageVersion: '$(sqlClientPackageVersion)'
+
+      # Build Microsoft.Data.SqlClient.Extensions.Azure
+      - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
+        parameters:
+          apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Azure/dlls'
+          apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Azure/pdbs'
+          shouldSignPackage: ${{ parameters.isOfficial }}
+          signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+          signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+          signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+          signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+          signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+          signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+
+          dependencies:
+            - artifactName: '${{ parameters.abstractionsArtifactsName }}'
+              shortName: 'Abstractions'
+              version: '$(sqlClientPackageVersion)'
+            - artifactName: '${{ parameters.loggingArtifactsName }}'
+              shortName: 'Logging'
+              version: '$(sqlClientPackageVersion)'
+          revision: '$(versionRevision)'
+          packageFullName: 'Microsoft.Data.SqlClient.Extensions.Azure'
+          packageShortName: 'Azure'
+          versionPropertySuffix: 'SqlClient'
+          packageVersion: '$(sqlClientPackageVersion)'
 
   # ====================================================================
   # Stage 4: Add-on packages (depend on core packages)
   # Akv Provider builds after SqlClient completes.
   # ====================================================================
-  - ${{ if and(eq(parameters.buildAkvProvider, true), eq(parameters.buildSqlClient, true)) }}:
-      - stage: build_addons
-        displayName: "Build Add-on Packages"
-        dependsOn: build_dependent
-
-        jobs:
-          - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
-            parameters:
-              apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/dlls'
-              apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/pdbs'
-              shouldSignPackage: ${{ parameters.isOfficial }}
-              signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
-              signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
-              signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
-              signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
-              signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
-              signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
-
-              dependencies:
-                - artifactName: '${{ parameters.abstractionsArtifactsName }}'
-                  shortName: 'Abstractions'
-                  version: '${{ parameters.abstractionsPackageVersion }}'
-                - artifactName: '${{ parameters.loggingArtifactsName }}'
-                  shortName: 'Logging'
-                  version: '${{ parameters.loggingPackageVersion }}'
-                - artifactName: '${{ parameters.sqlClientArtifactsName }}'
-                  shortName: 'SqlClient'
-                  version: '${{ parameters.sqlClientPackageVersion }}'
-                - artifactName: '${{ parameters.sqlServerArtifactsName }}'
-                  shortName: 'SqlServer'
-                  version: '${{ parameters.sqlServerPackageVersion }}'
-              fileVersion: '${{ parameters.akvProviderFileVersion }}'
-              packageFullName: 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
-              packageShortName: 'AkvProvider'
-              packageVersion: '${{ parameters.akvProviderPackageVersion }}'
+  - stage: build_addons
+    displayName: "Build Add-on Packages"
+    dependsOn:
+      - compute_versions
+      - build_dependent
+
+    variables:
+      - name: versionRevision
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.VersionRevision'] ]
+      - name: sqlClientPackageVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+      - name: sqlServerPackageVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
+
+    jobs:
+      - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
+        parameters:
+          apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/dlls'
+          apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/pdbs'
+          shouldSignPackage: ${{ parameters.isOfficial }}
+          signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
+          signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
+          signingAuthAkvName: '${{ parameters.signingAuthAkvName }}'
+          signingAuthSignCertName: '${{ parameters.signingAuthSignCertName }}'
+          signingEsrpClientId: '${{ parameters.signingEsrpClientId }}'
+          signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
+
+          dependencies:
+            - artifactName: '${{ parameters.abstractionsArtifactsName }}'
+              shortName: 'Abstractions'
+              version: '$(sqlClientPackageVersion)'
+            - artifactName: '${{ parameters.loggingArtifactsName }}'
+              shortName: 'Logging'
+              version: '$(sqlClientPackageVersion)'
+            - artifactName: '${{ parameters.sqlClientArtifactsName }}'
+              shortName: 'SqlClient'
+              version: '$(sqlClientPackageVersion)'
+            # When SqlServer is built this run, depend on the freshly-built artifact; otherwise
+            # depend on the most recently published SqlServer package (restored from NuGet, so no
+            # artifact download).
+            - ${{ if eq(parameters.buildSqlServer, true) }}:
+              - artifactName: '${{ parameters.sqlServerArtifactsName }}'
+                shortName: 'SqlServer'
+                version: '$(sqlServerPackageVersion)'
+            - ${{ else }}:
+              - artifactName: ''
+                shortName: 'SqlServer'
+                version: '$(sqlServerPackageVersion)'
+          revision: '$(versionRevision)'
+          packageFullName: 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
+          packageShortName: 'AkvProvider'
+          versionPropertySuffix: 'SqlClient'
+          packageVersion: '$(sqlClientPackageVersion)'
 
   # ====================================================================
   # Validation
+  # @TODO: Update validate-signed-package-job to compute expected versions from
+  # Versions.props (same as build jobs) instead of receiving them as parameters.
   # ====================================================================
-  - ${{ if eq(parameters.buildSqlClient, true) }}:
-      - stage: sqlclient_package_validation
-        displayName: "SqlClient Package Validation"
-        dependsOn: build_dependent
-        jobs:
-          - template: /eng/pipelines/onebranch/jobs/validate-signed-package-job.yml@self
-            parameters:
-              artifactName: '${{ parameters.sqlClientArtifactsName }}'
-              expectedFileVersion: '${{ parameters.sqlClientFileVersion }}'
-              expectedPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
-              isOfficial: ${{ parameters.isOfficial }}
+  # - stage: sqlclient_package_validation
+  #     displayName: "SqlClient Package Validation"
+  #     dependsOn: build_dependent
+  #     jobs:
+  #       - template: /eng/pipelines/onebranch/jobs/validate-signed-package-job.yml@self
+  #         parameters:
+  #           artifactName: '${{ parameters.sqlClientArtifactsName }}'
+  #           expectedFileVersion: <computed>
+  #           expectedPackageVersion: <computed>
+  #           isOfficial: ${{ parameters.isOfficial }}
diff --git a/eng/pipelines/onebranch/stages/compute-versions-stage.yml b/eng/pipelines/onebranch/stages/compute-versions-stage.yml
new file mode 100644
index 0000000000..5017d17a54
--- /dev/null
+++ b/eng/pipelines/onebranch/stages/compute-versions-stage.yml
@@ -0,0 +1,82 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Compute Versions Stage
+# ======================
+# Computes package versions up-front in a single fast job.  Downstream stages
+# consume these via stage/job output variables, e.g.:
+#
+#   stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion']
+#
+# Design:
+#   - The SqlClient family (Logging, Abstractions, SqlClient, Azure, AKV Provider) shares a single
+#     version and always uses its "next" version (from Versions.props + BuildNumber).
+#   - Microsoft.SqlServer.Server is versioned separately: it uses its "next" version when it is
+#     being built this run, or its "published" (last shipped to NuGet) version when it is not built
+#     (so the SqlClient family depends on the most recently published SqlServer package).
+#   - Runs can append the Build.BuildId revision to packages built in that run, reducing
+#     collisions when repeatedly publishing the same base version for testing.
+#   - Versions are extracted via build.proj GetVersions* targets by parsing stdout.
+#
+# This stage MUST run before all build stages so they can consume computed versions.
+
+parameters:
+  # Whether to append the Build.BuildId revision to package and file versions.
+  - name: addRevision
+    type: boolean
+
+  # Whether Microsoft.SqlServer.Server is being built this run.  This drives the SqlServer version
+  # selection (next when built, published when not); the SqlClient family always uses its next
+  # version.  When SqlServer is not built, the SqlClient family depends on the published SqlServer
+  # package restored from NuGet.
+  - name: buildSqlServer
+    type: boolean
+
+stages:
+  - stage: compute_versions
+    displayName: "Compute Package Versions"
+
+    jobs:
+      - job: compute_versions_job
+        displayName: "Extract versions from Versions.props"
+        pool:
+          type: linux
+
+        variables:
+          ob_outputDirectory: $(Build.SourcesDirectory)/no_publish
+          # Disable all SDL scanning — this job only evaluates MSBuild properties.
+          ob_sdl_apiscan_enabled: false
+          ob_sdl_binskim_break: false
+          ob_sdl_binskim_enabled: false
+
+        steps:
+          - pwsh: |
+              New-Item -Path "$(ob_outputDirectory)" -ItemType Directory -Force
+              "**" | Out-File -FilePath "$(ob_outputDirectory)/.artifactignore" -Encoding ascii
+            displayName: 'Suppress artifact publishing'
+
+          # Install the global.json-pinned .NET SDK before running any dotnet build, so this stage
+          # does not rely on whatever SDK happens to be on the agent image.
+          - template: /eng/pipelines/common/steps/install-dotnet.yml@self
+
+          # Restore dotnet local tools (pwsh, apicompat, etc.) required by build.proj targets that
+          # may run during the GetVersions* evaluation.
+          - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
+
+          # Extract canonical versions, resolve the effective built/published values, optionally
+          # add the run revision, and publish the downstream stage output variables.
+          - task: PowerShell@2
+            displayName: "Compute Effective Versions"
+            name: "versions"
+            inputs:
+              targetType: filePath
+              pwsh: true
+              filePath: $(Build.SourcesDirectory)/eng/pipelines/onebranch/scripts/compute-versions.ps1
+              arguments: >-
+                -ProjectPath "$(Build.SourcesDirectory)/build.proj"
+                -Revision "$(Build.BuildId)"
+                -BuildSqlServer $${{ parameters.buildSqlServer }}
+                -AddRevision $${{ parameters.addRevision }}
diff --git a/eng/pipelines/onebranch/stages/publish-symbols-stage.yml b/eng/pipelines/onebranch/stages/publish-symbols-stage.yml
index 56e8f827b8..9dd6a5757a 100644
--- a/eng/pipelines/onebranch/stages/publish-symbols-stage.yml
+++ b/eng/pipelines/onebranch/stages/publish-symbols-stage.yml
@@ -29,13 +29,9 @@ parameters:
 
   # ── Build parameters (used to conditionally include per-package jobs) ───
 
-  - name: buildSqlServerServer
-    type: boolean
-
-  - name: buildSqlClient
-    type: boolean
-
-  - name: buildAkvProvider
+  # Whether Microsoft.SqlServer.Server was built this run (its symbols are only published when it
+  # was built).  The SqlClient family is always built, so its symbols are always published.
+  - name: buildSqlServer
     type: boolean
 
   # ── Package Parameters ─────────────────────────────────────────────────
@@ -43,39 +39,21 @@ parameters:
   - name: abstractionsArtifactsName
     type: string
 
-  - name: abstractionsPackageVersion
-    type: string
-
   - name: akvProviderArtifactsName
     type: string
 
-  - name: akvProviderPackageVersion
-    type: string
-
   - name: azureArtifactsName
     type: string
 
-  - name: azurePackageVersion
-    type: string
-
   - name: loggingArtifactsName
     type: string
 
-  - name: loggingPackageVersion
-    type: string
-
   - name: sqlClientArtifactsName
     type: string
 
-  - name: sqlClientPackageVersion
-    type: string
-
   - name: sqlServerArtifactsName
     type: string
 
-  - name: sqlServerPackageVersion
-    type: string
-
   # ── Symbols Publishing Parameters ──────────────────────────────────────
 
   - name: symbolsAzureSubscription
@@ -93,53 +71,57 @@ parameters:
   - name: symbolsUploadAccount
     type: string
 
+  # ── Pre-computed versions (from compute-versions stage) ─────────────────
+  # These default to $(variableName) tokens that resolve at runtime from
+  # stage-level variables populated via stageDependencies.compute_versions outputs.
+  # The SqlClient family shares the SqlClient version; SqlServer is separate.
+
+  - name: sqlClientPackageVersion
+    type: string
+    default: $(sqlClientPackageVersion)
+
+  - name: sqlServerPackageVersion
+    type: string
+    default: $(sqlServerPackageVersion)
+
 stages:
-  # Stage is emitted whenever publishSymbols is true.  If no packages were
-  # built, only the no-op placeholder job runs and the stage succeeds
-  # immediately — keeping the dependency graph simple for downstream stages.
+  # Stage is emitted whenever publishSymbols is true.  The SqlClient family is always built, so its
+  # symbols are always published; SqlServer symbols are published only when it was built.
   - ${{ if eq(parameters.publishSymbols, true) }}:
     - stage: publish_symbols
       displayName: "Publish Symbols"
 
-      # Depend on whichever build stages produced artifacts we need to publish.
+      # The SqlClient family always builds, so depend on all of its build stages.  SqlServer is
+      # built within build_independent, which we always depend on as well.
       dependsOn:
-        - ${{ if or(parameters.buildSqlServerServer, parameters.buildSqlClient, parameters.buildAkvProvider) }}:
-          - build_independent
-        - ${{ if parameters.buildSqlClient }}:
-          - build_abstractions
-          - build_dependent
-        - ${{ if and(parameters.buildAkvProvider, parameters.buildSqlClient) }}:
-          - build_addons
+        - compute_versions
+        - build_independent
+        - build_abstractions
+        - build_dependent
+        - build_addons
+
+      variables:
+        - name: sqlClientPackageVersion
+          value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+        - name: sqlServerPackageVersion
+          value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
 
       jobs:
-        # ── No-op placeholder ──────────────────────────────────────────
-        # When no packages were built, this job keeps the stage valid
-        # (ADO requires at least one job per stage) and succeeds instantly.
-        - ${{ if not(or(parameters.buildSqlServerServer, parameters.buildSqlClient, parameters.buildAkvProvider)) }}:
-          - job: publish_symbols_noop
-            displayName: "No symbols to publish"
-            pool:
-              type: linux
-            steps:
-              - script: echo "No packages were built — nothing to publish."
-                displayName: Skip
-
         # ── Logging ────────────────────────────────────────────────────
-        - ${{ if or(parameters.buildAkvProvider, parameters.buildSqlClient) }}:
-          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
-            parameters:
-              artifactName: '${{ parameters.loggingArtifactsName }}'
-              packageFullName: Microsoft.Data.SqlClient.Internal.Logging
-              packageShortName: Logging
-              packageVersion: '${{ parameters.loggingPackageVersion }}'
-              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+        - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+          parameters:
+            artifactName: '${{ parameters.loggingArtifactsName }}'
+            packageFullName: Microsoft.Data.SqlClient.Internal.Logging
+            packageShortName: Logging
+            packageVersion: '${{ parameters.sqlClientPackageVersion }}'
+            symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+            symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+            symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+            symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+            symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
         # ── SqlServer.Server ───────────────────────────────────────────
-        - ${{ if eq(parameters.buildSqlServerServer, true) }}:
+        - ${{ if eq(parameters.buildSqlServer, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
             parameters:
               artifactName: '${{ parameters.sqlServerArtifactsName }}'
@@ -153,57 +135,53 @@ stages:
               symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
         # ── Abstractions ───────────────────────────────────────────────
-        - ${{ if eq(parameters.buildSqlClient, true) }}:
-          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
-            parameters:
-              artifactName: '${{ parameters.abstractionsArtifactsName }}'
-              packageFullName: Microsoft.Data.SqlClient.Extensions.Abstractions
-              packageShortName: Abstractions
-              packageVersion: '${{ parameters.abstractionsPackageVersion }}'
-              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+        - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+          parameters:
+            artifactName: '${{ parameters.abstractionsArtifactsName }}'
+            packageFullName: Microsoft.Data.SqlClient.Extensions.Abstractions
+            packageShortName: Abstractions
+            packageVersion: '${{ parameters.sqlClientPackageVersion }}'
+            symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+            symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+            symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+            symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+            symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
         # ── SqlClient ──────────────────────────────────────────────────
-        - ${{ if eq(parameters.buildSqlClient, true) }}:
-          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
-            parameters:
-              artifactName: '${{ parameters.sqlClientArtifactsName }}'
-              packageFullName: Microsoft.Data.SqlClient
-              packageShortName: SqlClient
-              packageVersion: '${{ parameters.sqlClientPackageVersion }}'
-              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+        - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+          parameters:
+            artifactName: '${{ parameters.sqlClientArtifactsName }}'
+            packageFullName: Microsoft.Data.SqlClient
+            packageShortName: SqlClient
+            packageVersion: '${{ parameters.sqlClientPackageVersion }}'
+            symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+            symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+            symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+            symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+            symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
         # ── Azure ──────────────────────────────────────────────────────
-        - ${{ if eq(parameters.buildSqlClient, true) }}:
-          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
-            parameters:
-              artifactName: '${{ parameters.azureArtifactsName }}'
-              packageFullName: Microsoft.Data.SqlClient.Extensions.Azure
-              packageShortName: Azure
-              packageVersion: '${{ parameters.azurePackageVersion }}'
-              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+        - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+          parameters:
+            artifactName: '${{ parameters.azureArtifactsName }}'
+            packageFullName: Microsoft.Data.SqlClient.Extensions.Azure
+            packageShortName: Azure
+            packageVersion: '${{ parameters.sqlClientPackageVersion }}'
+            symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+            symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+            symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+            symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+            symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
 
         # ── AKV Provider ───────────────────────────────────────────────
-        - ${{ if and(eq(parameters.buildAkvProvider, true), eq(parameters.buildSqlClient, true)) }}:
-          - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
-            parameters:
-              artifactName: '${{ parameters.akvProviderArtifactsName }}'
-              packageFullName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
-              packageShortName: AkvProvider
-              packageVersion: '${{ parameters.akvProviderPackageVersion }}'
-              symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
-              symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
-              symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
-              symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
-              symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
+        - template: /eng/pipelines/onebranch/jobs/publish-symbols-job.yml@self
+          parameters:
+            artifactName: '${{ parameters.akvProviderArtifactsName }}'
+            packageFullName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
+            packageShortName: AkvProvider
+            packageVersion: '${{ parameters.sqlClientPackageVersion }}'
+            symbolsAzureSubscription: '${{ parameters.symbolsAzureSubscription }}'
+            symbolsPublishProjectName: '${{ parameters.symbolsPublishProjectName }}'
+            symbolsPublishServer: '${{ parameters.symbolsPublishServer }}'
+            symbolsPublishTokenUri: '${{ parameters.symbolsPublishTokenUri }}'
+            symbolsUploadAccount: '${{ parameters.symbolsUploadAccount }}'
diff --git a/eng/pipelines/onebranch/stages/release-stages.yml b/eng/pipelines/onebranch/stages/release-stages.yml
index 15d0cba8dd..d160c8906f 100644
--- a/eng/pipelines/onebranch/stages/release-stages.yml
+++ b/eng/pipelines/onebranch/stages/release-stages.yml
@@ -56,39 +56,21 @@ parameters:
   - name: abstractionsArtifactsName
     type: string
 
-  - name: abstractionsPackageVersion
-    type: string
-
   - name: akvProviderArtifactsName
     type: string
 
-  - name: akvProviderPackageVersion
-    type: string
-
   - name: azureArtifactsName
     type: string
 
-  - name: azurePackageVersion
-    type: string
-
   - name: loggingArtifactsName
     type: string
 
-  - name: loggingPackageVersion
-    type: string
-
   - name: sqlClientArtifactsName
     type: string
 
-  - name: sqlClientPackageVersion
-    type: string
-
   - name: sqlServerArtifactsName
     type: string
 
-  - name: sqlServerPackageVersion
-    type: string
-
   # ── Symbols publishing parameter ───────────────────────────────────────
   # When true, the release stage will depend on publish_symbols so that
   # symbol publishing completes before packages are released.
@@ -99,24 +81,16 @@ parameters:
 
   # ── Release parameters ─────────────────────────────────────────────────
 
-  - name: releaseSqlServerServer
-    type: boolean
-
-  - name: releaseLogging
-    type: boolean
-
-  - name: releaseAbstractions
+  # Whether to publish the Microsoft.SqlServer.Server package (versioned separately).
+  - name: releaseSqlServer
     type: boolean
 
+  # Whether to publish the SqlClient family.  The family (Internal.Logging,
+  # Extensions.Abstractions, Microsoft.Data.SqlClient, Extensions.Azure, and the
+  # AlwaysEncrypted.AzureKeyVaultProvider) is always released together at the shared version.
   - name: releaseSqlClient
     type: boolean
 
-  - name: releaseAzure
-    type: boolean
-
-  - name: releaseAkvProvider
-    type: boolean
-
 stages:
   # ====================================================================
   # Release Stage — on-demand selective publish to NuGet
@@ -131,21 +105,18 @@ stages:
   #   true  → NuGet Production feed.
   #   false → NuGet Test feed.
   # ====================================================================
-  - ${{ if or(parameters.releaseSqlServerServer, parameters.releaseLogging, parameters.releaseAbstractions, parameters.releaseSqlClient, parameters.releaseAzure, parameters.releaseAkvProvider) }}:
+  - ${{ if or(parameters.releaseSqlServer, parameters.releaseSqlClient) }}:
     - stage: release_${{ parameters.stageNameSuffix }}
       ${{ if eq(parameters.releaseToProduction, true) }}:
         displayName: Release to NuGet Production
       ${{ else }}:
         displayName: Release to NuGet Test
       dependsOn:
-        - ${{ if or(parameters.releaseSqlServerServer, parameters.releaseLogging) }}:
+        - ${{ if or(parameters.releaseSqlServer, parameters.releaseSqlClient) }}:
           - build_independent
-        - ${{ if parameters.releaseAbstractions }}:
+        - ${{ if parameters.releaseSqlClient }}:
           - build_abstractions
-        - ${{ if or(parameters.releaseSqlClient, parameters.releaseAzure) }}:
           - build_dependent
-          - sqlclient_package_validation
-        - ${{ if parameters.releaseAkvProvider }}:
           - build_addons
         - ${{ if parameters.publishSymbols }}:
           - publish_symbols
@@ -188,62 +159,52 @@ stages:
             value: ' (NuGet Test)'
 
       jobs:
-        - ${{ if eq(parameters.releaseSqlServerServer, true) }}:
+        - ${{ if eq(parameters.releaseSqlServer, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.SqlServer.Server
               artifactName: '${{ parameters.sqlServerArtifactsName }}'
-              packagePath: 'Release/Microsoft.SqlServer.Server.${{ parameters.sqlServerPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
 
-        - ${{ if eq(parameters.releaseLogging, true) }}:
+        - ${{ if eq(parameters.releaseSqlClient, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Internal.Logging
               artifactName: '${{ parameters.loggingArtifactsName }}'
-              packagePath: 'Release/Microsoft.Data.SqlClient.Internal.Logging.${{ parameters.loggingPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
 
-        - ${{ if eq(parameters.releaseAbstractions, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Abstractions
               artifactName: '${{ parameters.abstractionsArtifactsName }}'
-              packagePath: 'Release/Microsoft.Data.SqlClient.Extensions.Abstractions.${{ parameters.abstractionsPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
 
-        - ${{ if eq(parameters.releaseSqlClient, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient
               artifactName: '${{ parameters.sqlClientArtifactsName }}'
-              packagePath: 'Package-Release/Microsoft.Data.SqlClient.${{ parameters.sqlClientPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
 
-        - ${{ if eq(parameters.releaseAzure, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.Extensions.Azure
               artifactName: '${{ parameters.azureArtifactsName }}'
-              packagePath: 'Release/Microsoft.Data.SqlClient.Extensions.Azure.${{ parameters.azurePackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
 
-        - ${{ if eq(parameters.releaseAkvProvider, true) }}:
           - template: /eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml@self
             parameters:
               packageName: Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
               artifactName: '${{ parameters.akvProviderArtifactsName }}'
-              packagePath: 'Release/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.${{ parameters.akvProviderPackageVersion }}.nupkg'
               nugetServiceConnection: ${{ variables.nugetServiceConnection }}
               isProduction: ${{ parameters.isOfficial }}
               displaySuffix: ${{ variables.nugetTargetSuffix }}
diff --git a/eng/pipelines/onebranch/steps/build-buildproj-step.yml b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
index 2a5730c848..5cfc809772 100644
--- a/eng/pipelines/onebranch/steps/build-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
@@ -20,7 +20,7 @@ parameters:
       - Release
 
   # Optional arguments to pass to msbuild to indicate what version of dependencies should be used.
-  # They should be in the form of "-p:PackageVersionFooBar=1.2.3 ..."
+  # They should be in the form of "-p:PackageVersionFooBar=1.2.3 ...".
   - name: dependencyArguments
     type: string
     default: ''
@@ -37,9 +37,22 @@ parameters:
       - SqlClient
       - SqlServer
 
-  #  Version to assign to the project to build. This will be passed into msbuild as
-  #  "-p:PackageVersion(packageShortName)".
-  # @TODO: Make this optional to enable progressively migrating to single-source versioning.
+  # Version revision translated to build.proj's BuildNumber property at this boundary.
+  - name: revision
+    type: string
+
+  #  Suffix appended to "PackageVersion" to form the build.proj msbuild property that stamps this
+  #  package's version.  build.proj recognizes only two such properties: PackageVersionSqlClient
+  #  (shared by the entire SqlClient family: Logging, Abstractions, SqlClient, Azure, and the AKV
+  #  Provider) and PackageVersionSqlServer (Microsoft.SqlServer.Server).  Provided by the caller.
+  #  Examples:  'SqlClient' -> -p:PackageVersionSqlClient=7.1.0-preview3
+  #             'SqlServer' -> -p:PackageVersionSqlServer=1.0.0
+  - name: versionPropertySuffix
+    type: string
+
+  #  Version to stamp on the package.  Combined with versionPropertySuffix to form the msbuild
+  #  argument, e.g. -p:PackageVersionSqlClient=7.1.0-preview3.
+  #  Always required — compute up-front via the compute-versions stage.
   - name: packageVersion
     type: string
 
@@ -62,8 +75,8 @@ steps:
         -p:ReferenceType=Package
         -p:SkipDependencyPack=true
         -p:SigningKeyPath="$(keyFile.secureFilePath)"
-        -p:BuildNumber="$(Build.BuildNumber)"
-        -p:PackageVersion${{ parameters.packageShortName }}="${{ parameters.packageVersion }}"
+        -p:BuildNumber="${{ parameters.revision }}"
+        -p:PackageVersion${{ parameters.versionPropertySuffix }}="${{ parameters.packageVersion }}"
         ${{ parameters.dependencyArguments }}
 
   - script: tree /a /f $(BUILD_OUTPUT)
diff --git a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
index 7a97c260d1..4960872d7b 100644
--- a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
@@ -20,7 +20,7 @@ parameters:
       - Release
 
   # Optional arguments to pass to msbuild to indicate what version of dependencies should be used.
-  # They should be in the form of "-p:PackageVersionFooBar=1.2.3 ..."
+  # They should be in the form of "-p:PackageVersionFooBar=1.2.3 ...".
   - name: dependencyArguments
     type: string
     default: ''
@@ -49,9 +49,22 @@ parameters:
       - SqlClient
       - SqlServer
 
-  #  Version to assign to the project to build. This will be passed into msbuild as
-  #  "-p:PackageVersion(packageShortName)".
-  # @TODO: Make this optional to enable progressively migrating to single-source versioning.
+  # Version revision translated to build.proj's BuildNumber property at this boundary.
+  - name: revision
+    type: string
+
+  #  Suffix appended to "PackageVersion" to form the build.proj msbuild property that stamps this
+  #  package's version.  build.proj recognizes only two such properties: PackageVersionSqlClient
+  #  (shared by the entire SqlClient family: Logging, Abstractions, SqlClient, Azure, and the AKV
+  #  Provider) and PackageVersionSqlServer (Microsoft.SqlServer.Server).  Provided by the caller.
+  #  Examples:  'SqlClient' -> -p:PackageVersionSqlClient=7.1.0-preview3
+  #             'SqlServer' -> -p:PackageVersionSqlServer=1.0.0
+  - name: versionPropertySuffix
+    type: string
+
+  #  Version to stamp on the package.  Combined with versionPropertySuffix to form the msbuild
+  #  argument, e.g. -p:PackageVersionSqlClient=7.1.0-preview3.
+  #  Always required — compute up-front via the compute-versions stage.
   - name: packageVersion
     type: string
 
@@ -66,8 +79,8 @@ steps:
         -p:Configuration=${{ parameters.buildConfiguration }}
         -p:PackBuild=false
         -p:ReferenceType=Package
-        -p:BuildNumber="$(Build.BuildNumber)"
-        -p:PackageVersion${{ parameters.packageShortName }}="${{ parameters.packageVersion }}"
+        -p:BuildNumber="${{ parameters.revision }}"
+        -p:PackageVersion${{ parameters.versionPropertySuffix }}="${{ parameters.packageVersion }}"
         ${{ parameters.dependencyArguments }}
 
   - script: tree /a /f $(BUILD_OUTPUT)
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
index 89177f1d88..9e640b00df 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
@@ -13,8 +13,8 @@
 # steps that perform versioning or signing.
 
 parameters:
-  # Optional arguments to pass to dotnet build to indicate what version of dependencies should be
-  # used.
+  # Optional arguments to pass to msbuild to indicate what version of dependencies should be used.
+  # They should be of the form "-p:PackageVersionFooBar=1.2.3 ...".
   - name: dependencyArguments
     type: string
     default: ''
@@ -31,9 +31,22 @@ parameters:
       - SqlClient
       - SqlServer
 
-  #  Version to assign to the project to build. This will be passed into dotnet build as
-  #  "-p:PackageVersion(packageShortName)".
-  # @TODO: Make this optional to enable progressively migrating to single-source versioning.
+  # Version revision translated to build.proj's BuildNumber property at this boundary.
+  - name: revision
+    type: string
+
+  #  Suffix appended to "PackageVersion" to form the build.proj msbuild property that stamps this
+  #  package's version.  build.proj recognizes only two such properties: PackageVersionSqlClient
+  #  (shared by the entire SqlClient family: Logging, Abstractions, SqlClient, Azure, and the AKV
+  #  Provider) and PackageVersionSqlServer (Microsoft.SqlServer.Server).  Provided by the caller.
+  #  Examples:  'SqlClient' -> -p:PackageVersionSqlClient=7.1.0-preview3
+  #             'SqlServer' -> -p:PackageVersionSqlServer=1.0.0
+  - name: versionPropertySuffix
+    type: string
+
+  #  Version to stamp on the package.  Combined with versionPropertySuffix to form the msbuild
+  #  argument, e.g. -p:PackageVersionSqlClient=7.1.0-preview3.
+  #  Always required — compute up-front via the compute-versions stage.
   - name: packageVersion
     type: string
 
@@ -51,8 +64,8 @@ steps:
         -p:Configuration=Release
         -p:ReferenceType=Package
         -p:SkipDependencyPack=true
-        -p:BuildNumber="$(Build.BuildNumber)"
-        -p:PackageVersion${{ parameters.packageShortName }}="${{ parameters.packageVersion }}"
+        -p:BuildNumber=${{ parameters.revision }}
+        -p:PackageVersion${{ parameters.versionPropertySuffix }}=${{ parameters.packageVersion }}
         ${{ parameters.dependencyArguments }}
       msBuildVersion: 17.0
       setupCommandLinePicker: vs2022
diff --git a/eng/pipelines/onebranch/variables/package-variables.yml b/eng/pipelines/onebranch/variables/package-variables.yml
index 7ddcb0ecc6..62afca6605 100644
--- a/eng/pipelines/onebranch/variables/package-variables.yml
+++ b/eng/pipelines/onebranch/variables/package-variables.yml
@@ -7,128 +7,50 @@
 # This file contains variables that relate to the various packages that are produced via the
 # OneBranch official/non-official pipelines. They are grouped by the packages they represent.
 #
-# The variables are defined as the following main types:
-# - *ArtifactsName
-#   What the artifacts drop for the various stages of the pipeline will be named.
+# VERSION STRATEGY
+# ================
+# Package versions are computed by Versions.props using one input:
+#   - BuildNumber   ($(Build.BuildNumber), provided by ADO)
 #
-#   OneBranch automatically publishes pipeline artifacts from all jobs. Use of the
-#   PublishPipelineArtifacts task is prohibited. All content in the ob_outputDirectory is
-#   automatically published. The artifacts are named according to this pattern:
+# The SqlClient *family* (Internal.Logging, Extensions.Abstractions, Microsoft.Data.SqlClient,
+# Extensions.Azure, and the AlwaysEncrypted.AzureKeyVaultProvider) shares a single version defined
+# by SqlClientNextVersion in src/Microsoft.Data.SqlClient/Versions.props.  Microsoft.SqlServer.Server
+# is versioned separately by SqlServerNextVersion.
 #
-#   drop_<stageName>_<jobName>
+# The *NextVersion properties define the base version:
+#   - On main:           X.Y.Z-preview1  → official produces "X.Y.Z-preview1"
+#   - On release/X.Y:    X.Y.Z           → official produces "X.Y.Z"
 #
-#   Downstream stages and jobs may download these artifacts via the DownloadPipelineArtifact task,
-#   but they must know the artifact name.
+# No per-package version variables are needed here — Versions.props is the single source.
+# Downstream stages obtain the computed versions via the compute-versions stage.
 #
-# - *FileVersion
-#   Version to use for the FileVersion field in the assembly.
+# ARTIFACT NAMING
+# ===============
+# OneBranch automatically publishes pipeline artifacts from all jobs named as:
 #
-# - *PackageVersion
-#   NuGet package versions releases. This is switched based on the isPreview parameter.
-
-# @TODO: Although defining the versions in source is a major improvement over depending on versions
-#  coming from variable libraries, this is not the final form. Ideally, we want a single point for
-#  versions to be defined and are moving towards doing so via the [PackageName]Versions.props
-#  files. In the meantime, when doing a version bump (after a release), versions will need to be
-# updated here and in their corresponding *Versions.props file.
-
-parameters:
-  - name: isPreview
-    type: boolean
+#   drop_<stageName>_<jobName>
+#
+# Downstream stages download these via DownloadPipelineArtifact and must know the name.
 
 variables:
-  # C# assembly versions must be in the format: Major.Minor.Build.Revision, but
-  # $(Build.BuildNumber) has the format XXX.YY. Additionally, each version part must be a positive
-  # 16-bit integer less than 65535. Simply concatenating both parts of $(Build.BuildNumber) could
-  # produce values larger than 65534, so we must omit the second part entirely. Unfortunately, this
-  # may result in multiple subsequent pipeline builds using the same C# assembly versions. The
-  # package versions will not be affected and will show the complete $(Build.BuildNumber) values.
-  - name: _assemblyBuildNumber
-    value: $[ split(variables['Build.BuildNumber'], '.')[0] ]
-
   # ------------------------------------------------------------------------
-  # Abstractions Package
-  # Microsoft.Data.SqlClient.Extensions.Abstractions
+  # Artifact Names
+  # These identify the published pipeline artifacts for inter-stage consumption.
+
   - name: abstractionsArtifactsName
     value: 'drop_build_abstractions_build_package_Abstractions'
 
-  - name: abstractionsFileVersion
-    value: '7.1.0.$(_assemblyBuildNumber)'
-
-  - name: abstractionsPackageVersion
-    ${{ if parameters.isPreview }}:
-      value: '7.1.0-preview2.$(Build.BuildNumber)'
-    ${{ else }}:
-      value: '7.1.0'
-
-  # ------------------------------------------------------------------------
-  # AKV Provider Package
-  # Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVault
   - name: akvProviderArtifactsName
     value: 'drop_build_addons_build_package_AkvProvider'
 
-  - name: akvProviderFileVersion
-    value: '7.1.0.$(_assemblyBuildNumber)'
-
-  - name: akvProviderPackageVersion
-    ${{ if parameters.isPreview }}:
-      value: '7.1.0-preview2.$(Build.BuildNumber)'
-    ${{ else }}:
-      value: '7.1.0'
-
-  # ------------------------------------------------------------------------
-  # Azure Package
-  # Microsoft.Data.SqlClient.Extensions.Azure
   - name: azureArtifactsName
     value: 'drop_build_dependent_build_package_Azure'
 
-  - name: azureFileVersion
-    value: '7.1.0.$(_assemblyBuildNumber)'
-
-  - name: azurePackageVersion
-    ${{ if parameters.isPreview }}:
-      value: '7.1.0-preview2.$(Build.BuildNumber)'
-    ${{ else }}:
-      value: '7.1.0'
-
-  # ------------------------------------------------------------------------
-  # Logging Package
-  # Microsoft.Data.SqlClient.Internal.Logging
   - name: loggingArtifactsName
     value: 'drop_build_independent_build_package_Logging'
 
-  - name: loggingFileVersion
-    value: '7.1.0.$(_assemblyBuildNumber)'
-
-  - name: loggingPackageVersion
-    ${{ if parameters.isPreview }}:
-      value: '7.1.0-preview2.$(Build.BuildNumber)'
-    ${{ else }}:
-      value: '7.1.0'
-
-  # ------------------------------------------------------------------------
-  # SqlClient Package
-  # Microsoft.Data.SqlClient
   - name: sqlClientArtifactsName
     value: 'drop_build_dependent_build_package_SqlClient'
 
-  - name: sqlClientFileVersion
-    value: '7.1.0.$(_assemblyBuildNumber)'
-
-  - name: sqlClientPackageVersion
-    ${{ if parameters.isPreview }}:
-      value: '7.1.0-preview2.$(Build.BuildNumber)'
-    ${{ else }}:
-      value: '7.1.0'
-
-  # ------------------------------------------------------------------------
-  # SqlServer Package
-  # Microsoft.SqlServer.Server
   - name: sqlServerArtifactsName
     value: 'drop_build_independent_build_package_SqlServer'
-
-  - name: sqlServerFileVersion
-    value: '1.0.0.$(_assemblyBuildNumber)'
-
-  - name: sqlServerPackageVersion
-    value: '1.0.0'
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index 1a58842305..cb25fe1f4e 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -20,6 +20,9 @@
 # https://dev.azure.com/SqlClientDrivers/public/_build?definitionId=2198
 
 # Set the pipeline run name to the day-of-year and the daily run counter.
+# This becomes BuildNumber, used as the revision component of FileVersion
+# (Major.Minor.Patch.Revision). Revision must fit in a 16-bit unsigned int (max 65535).
+# Format $(DayOfYear)$(Rev:rr) yields e.g. 15401 (day 154, run 01) — always < 65535.
 name: $(DayOfYear)$(Rev:rr)
 
 # Trigger PR validation runs for all pushes to PRs that target the specified
@@ -127,6 +130,7 @@ extends:
   parameters:
     buildConfiguration: ${{ parameters.buildConfiguration }}
     buildPlatforms: ${{ parameters.buildPlatforms }}
+    buildSuffix: 'pr'
     referenceType: Package
     debug: ${{ parameters.debug }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index 6e54d0eb32..b2a5edf4e4 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -20,6 +20,9 @@
 # https://dev.azure.com/SqlClientDrivers/public/_build?definitionId=2197
 
 # Set the pipeline run name to the day-of-year and the daily run counter.
+# This becomes BuildNumber, used as the revision component of FileVersion
+# (Major.Minor.Patch.Revision). Revision must fit in a 16-bit unsigned int (max 65535).
+# Format $(DayOfYear)$(Rev:rr) yields e.g. 15401 (day 154, run 01) — always < 65535.
 name: $(DayOfYear)$(Rev:rr)
 
 # Trigger PR validation runs for all pushes to PRs that target the specified
@@ -127,6 +130,7 @@ extends:
   parameters:
     buildConfiguration: ${{ parameters.buildConfiguration }}
     buildPlatforms: ${{ parameters.buildPlatforms }}
+    buildSuffix: 'pr'
     referenceType: Project
     debug: ${{ parameters.debug }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
diff --git a/eng/pipelines/stages/build-abstractions-package-ci-stage.yml b/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
index 8579b79caf..3df0ef9843 100644
--- a/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
@@ -10,7 +10,7 @@
 # The NuGet packages have the following properties:
 #
 #   Name:     Microsoft.Data.SqlClient.Extensions.Abstractions
-#   Version:  <abstractionsPackageVersion> (from parameter)
+#   Version:  <packageVersion> (from parameter)
 #
 # The following NuGet packages are published:
 #
@@ -30,14 +30,6 @@ parameters:
     type: string
     default: Abstractions.Artifacts
 
-  # The assembly file version to stamp into the DLLs.
-  - name: abstractionsAssemblyFileVersion
-    type: string
-
-  # The version to apply to the NuGet package and DLLs.
-  - name: abstractionsPackageVersion
-    type: string
-
   # Additional stages we depend on, if any.
   - name: additionalDependsOn
     type: object
@@ -74,13 +66,6 @@ parameters:
     type: string
     default: Logging.Artifacts
 
-  # The Logging package version to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: loggingPackageVersion
-    type: string
-    default: ''
-
   # The C# project reference type to use when building and packing the packages.
   - name: referenceType
     type: string
@@ -98,9 +83,14 @@ stages:
 
     dependsOn:
       - secrets_stage
+      - compute_versions_ci
       - ${{ each dep in parameters.additionalDependsOn }}:
         - ${{ dep }}
 
+    variables:
+      - name: packageVersion
+        value: $[ stageDependencies.compute_versions_ci.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+
     jobs:
 
       # ------------------------------------------------------------------------
@@ -154,8 +144,8 @@ stages:
       - template: /eng/pipelines/jobs/pack-abstractions-package-ci-job.yml@self
         parameters:
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-          abstractionsAssemblyFileVersion: ${{ parameters.abstractionsAssemblyFileVersion }}
-          abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
+          # The version is computed by this stage (see the packageVersion variable above).
+          packageVersion: $(packageVersion)
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           dependsOn:
@@ -166,5 +156,4 @@ stages:
             - test_abstractions_package_job_macos
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           referenceType: ${{ parameters.referenceType }}
diff --git a/eng/pipelines/stages/build-azure-package-ci-stage.yml b/eng/pipelines/stages/build-azure-package-ci-stage.yml
index b3cf9073d5..0713030b76 100644
--- a/eng/pipelines/stages/build-azure-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-azure-package-ci-stage.yml
@@ -10,7 +10,7 @@
 # The NuGet packages have the following properties:
 #
 #   Name:     Microsoft.Data.SqlClient.Extensions.Azure
-#   Version:  <azurePackageVersion> (from parameters)
+#   Version:  <packageVersion> (from the shared SqlClient family version)
 #
 # The following NuGet packages are published:
 #
@@ -34,12 +34,6 @@ parameters:
     type: string
     default: Abstractions.Artifacts
 
-  # The Abstractions package verion to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: abstractionsPackageVersion
-    type: string
-
   # Additional stages we depend on, if any.
   - name: additionalDependsOn
     type: object
@@ -63,14 +57,6 @@ parameters:
     type: string
     default: Azure.Artifacts
 
-  # The assembly file version to stamp into the DLLs.
-  - name: azureAssemblyFileVersion
-    type: string
-
-  # The version to apply to the NuGet package and DLLs.
-  - name: azurePackageVersion
-    type: string
-
   # The name of the general Azure pool to use for jobs that don't require
   # customized VM images.
   - name: azurePoolName
@@ -108,13 +94,6 @@ parameters:
     type: string
     default: Logging.Artifacts
 
-  # The Logging package version to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: loggingPackageVersion
-    type: string
-    default: ''
-
   # The name of the MDS pipeline artifacts to download.
   #
   # This is used when the referenceType is 'Package'.
@@ -122,12 +101,6 @@ parameters:
     type: string
     default: MDS.Artifacts
 
-  # The MDS package verion to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: mdsPackageVersion
-    type: string
-
   # The name of the SqlServer pipeline artifacts to download.
   #
   # This is used when the referenceType is 'Package'.  MDS depends on
@@ -136,13 +109,6 @@ parameters:
     type: string
     default: SqlServer.Artifacts
 
-  # The SqlServer package version to depend on.
-  #
-  # This is used when the referenceType is 'Package'.
-  - name: sqlServerPackageVersion
-    type: string
-    default: ''
-
   # The C# project reference type to use when building and packing the packages.
   - name: referenceType
     type: string
@@ -159,6 +125,7 @@ stages:
 
     dependsOn:
       - secrets_stage
+      - compute_versions_ci
       - ${{ each dep in parameters.additionalDependsOn }}:
         - ${{ dep }}
 
@@ -166,6 +133,11 @@ stages:
       # Bring the SA password from the secrets_stage into scope here.
       - name: saPassword
         value: $[stageDependencies.secrets_stage.secrets_job.outputs['SaPassword.Value']]
+      # Package versions from compute-versions stage.
+      - name: packageVersion
+        value: $[ stageDependencies.compute_versions_ci.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+      - name: sqlServerPackageVersion
+        value: $[ stageDependencies.compute_versions_ci.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
 
     jobs:
 
@@ -175,18 +147,16 @@ stages:
       - template: /eng/pipelines/jobs/test-azure-package-ci-job.yml@self
         parameters:
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-          abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
+          packageVersion: $(packageVersion)
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           displayNamePrefix: Linux
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           jobNameSuffix: linux
           loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-          mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
           sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
+          sqlServerPackageVersion: $(sqlServerPackageVersion)
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.azurePoolName }}
@@ -197,18 +167,16 @@ stages:
       - template: /eng/pipelines/jobs/test-azure-package-ci-job.yml@self
         parameters:
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-          abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
+          packageVersion: $(packageVersion)
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           displayNamePrefix: Linux Integration
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           jobNameSuffix: linux_integration
           loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-          mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
           sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
+          sqlServerPackageVersion: $(sqlServerPackageVersion)
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.adoPoolName }}
@@ -228,18 +196,16 @@ stages:
       - template: /eng/pipelines/jobs/test-azure-package-ci-job.yml@self
         parameters:
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-          abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
+          packageVersion: $(packageVersion)
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           displayNamePrefix: Win
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           jobNameSuffix: windows
           loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-          mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
           sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
+          sqlServerPackageVersion: $(sqlServerPackageVersion)
           netFrameworkRuntimes: [net462]
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.azurePoolName }}
@@ -250,18 +216,16 @@ stages:
       - template: /eng/pipelines/jobs/test-azure-package-ci-job.yml@self
         parameters:
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-          abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
+          packageVersion: $(packageVersion)
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           displayNamePrefix: Win Integration
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           jobNameSuffix: windows_integration
           loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-          mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
           sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
+          sqlServerPackageVersion: $(sqlServerPackageVersion)
           netFrameworkRuntimes: [net462]
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.adoPoolName }}
@@ -290,18 +254,16 @@ stages:
       - template: /eng/pipelines/jobs/test-azure-package-ci-job.yml@self
         parameters:
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-          abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
+          packageVersion: $(packageVersion)
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           displayNamePrefix: macOS
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           jobNameSuffix: macos
           loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-          mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
           sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
+          sqlServerPackageVersion: $(sqlServerPackageVersion)
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.azurePoolName }}
@@ -316,10 +278,8 @@ stages:
       - template: /eng/pipelines/jobs/pack-azure-package-ci-job.yml@self
         parameters:
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-          abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
+          packageVersion: $(packageVersion)
           azureArtifactsName: ${{ parameters.azureArtifactsName }}
-          azureAssemblyFileVersion: ${{ parameters.azureAssemblyFileVersion }}
-          azurePackageVersion: ${{ parameters.azurePackageVersion }}
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           dependsOn:
@@ -332,5 +292,4 @@ stages:
             - test_azure_package_job_macos
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
           referenceType: ${{ parameters.referenceType }}
diff --git a/eng/pipelines/stages/build-logging-package-ci-stage.yml b/eng/pipelines/stages/build-logging-package-ci-stage.yml
index 6b5f22feeb..b9d5feb082 100644
--- a/eng/pipelines/stages/build-logging-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-logging-package-ci-stage.yml
@@ -10,7 +10,7 @@
 # The NuGet packages have the following properties:
 #
 #   Name:     Microsoft.Data.SqlClient.Internal.Logging
-#   Version:  <loggingPackageVersion> (from parameter)
+#   Version:  <packageVersion> (from parameter)
 #
 # The following NuGet packages are published:
 #
@@ -35,14 +35,6 @@ parameters:
     type: string
     default: Logging.Artifacts
 
-  # The assembly file version to stamp into the DLLs.
-  - name: loggingAssemblyFileVersion
-    type: string
-
-  # The version to apply to the NuGet package and DLLs.
-  - name: loggingPackageVersion
-    type: string
-
   # The type of build to produce (Release or Debug)
   - name: buildConfiguration
     type: string
@@ -74,9 +66,14 @@ stages:
 
     dependsOn:
       - secrets_stage
+      - compute_versions_ci
       - ${{ each dep in parameters.additionalDependsOn }}:
         - ${{ dep }}
 
+    variables:
+      - name: packageVersion
+        value: $[ stageDependencies.compute_versions_ci.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+
     jobs:
 
       # Create and publish the NuGet package.
@@ -88,8 +85,8 @@ stages:
       - template: /eng/pipelines/jobs/pack-logging-package-ci-job.yml@self
         parameters:
           loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-          loggingAssemblyFileVersion: ${{ parameters.loggingAssemblyFileVersion }}
-          loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
+          # The version is computed by this stage (see the packageVersion variable above).
+          packageVersion: $(packageVersion)
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml b/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
index 858f1c8500..70fa122d5f 100644
--- a/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
@@ -18,10 +18,6 @@ parameters:
     type: string
     default: Abstractions.Artifacts
 
-  # The Abstractions package version.
-  - name: abstractionsPackageVersion
-    type: string
-
   # Additional stages we depend on, if any.
   - name: additionalDependsOn
     type: object
@@ -39,33 +35,16 @@ parameters:
     type: string
     default: Logging.Artifacts
 
-  # The Logging package version.
-  - name: loggingPackageVersion
-    type: string
-
   # The name of the MDS pipeline artifacts to publish.
   - name: mdsArtifactsName
     type: string
     default: MDS.Artifacts
 
-  # The MDS package version.
-  - name: mdsPackageVersion
-    type: string
-
-  # The AKV Provider package version.
-  - name: akvPackageVersion
-    type: string
-
   # The name of the SqlServer pipeline artifacts to download.
   - name: sqlServerArtifactsName
     type: string
     default: SqlServer.Artifacts
 
-  # The SqlServer package version.
-  - name: sqlServerPackageVersion
-    type: string
-    default: $(sqlServerPackageVersion)
-
   # The C# project reference type to use when building and packing the packages.
   - name: referenceType
     type: string
@@ -92,23 +71,28 @@ stages:
 
     dependsOn:
       - secrets_stage
+      - compute_versions_ci
       - ${{ each dep in parameters.additionalDependsOn }}:
         - ${{ dep }}
 
+    variables:
+      - name: packageVersion
+        value: $[ stageDependencies.compute_versions_ci.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+      - name: sqlServerPackageVersion
+        value: $[ stageDependencies.compute_versions_ci.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
+
     jobs:
     - template: /eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml@self
       parameters:
         buildConfiguration: ${{ parameters.buildConfiguration }}
         referenceType: ${{ parameters.referenceType }}
-        abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
         abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-        loggingPackageVersion: ${{ parameters.loggingPackageVersion }}
         loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-        mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
         mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-        akvPackageVersion: ${{ parameters.akvPackageVersion }}
+        # The family version is computed by this stage (see the packageVersion variable above).
+        packageVersion: $(packageVersion)
         sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-        sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
+        sqlServerPackageVersion: $(sqlServerPackageVersion)
         ${{ if ne(parameters.SNIVersion, '') }}:
           prebuildSteps:
             - template: /eng/pipelines/common/templates/steps/override-sni-version.yml@self
diff --git a/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml b/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
index 1711725373..3a1417185d 100644
--- a/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
@@ -48,10 +48,6 @@ parameters:
     type: string
     default: SqlServer.Artifacts
 
-  # The version to apply to the SqlServer NuGet package and DLLs.
-  - name: sqlServerPackageVersion
-    type: string
-
   # The verbosity level for the dotnet CLI commands.
   - name: dotnetVerbosity
     type: string
@@ -70,14 +66,20 @@ stages:
 
     dependsOn:
       - secrets_stage
+      - compute_versions_ci
       - ${{ each dep in parameters.additionalDependsOn }}:
         - ${{ dep }}
 
+    variables:
+      - name: sqlServerPackageVersion
+        value: $[ stageDependencies.compute_versions_ci.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
+
     jobs:
       - template: /eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml@self
         parameters:
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-          sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
+          # The version is computed by this stage (see the sqlServerPackageVersion variable above).
+          sqlServerPackageVersion: $(sqlServerPackageVersion)
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/stages/compute-versions-ci-stage.yml b/eng/pipelines/stages/compute-versions-ci-stage.yml
new file mode 100644
index 0000000000..9171582cd2
--- /dev/null
+++ b/eng/pipelines/stages/compute-versions-ci-stage.yml
@@ -0,0 +1,81 @@
+################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET
+# Foundation licenses this file to you under the MIT license.  See the LICENSE
+# file in the project root for more information.
+################################################################################
+
+# Compute Versions Stage (CI/PR)
+# ===============================
+# Extracts package/file versions up-front in a single fast job.
+# Downstream stages consume these via stage dependency output variables:
+#
+#   stageDependencies.compute_versions_ci.compute_versions_job.outputs['versions.SqlClientPackageVersion']
+#
+# The SqlClient family (Logging, Abstractions, SqlClient, Azure, AKV Provider) shares one version;
+# Microsoft.SqlServer.Server is versioned separately.  In CI/PR mode, all packages always use their
+# "next" version (with BuildSuffix appended). There is no released-vs-dependency distinction as in
+# the OneBranch official pipeline.
+#
+# This stage MUST run before all build stages so they can consume computed versions.
+
+parameters:
+  # Build suffix appended to prerelease tag (e.g. 'ci' or 'pr').
+  - name: buildSuffix
+    type: string
+
+stages:
+  - stage: compute_versions_ci
+    displayName: "Compute Package Versions"
+    dependsOn: []
+
+    jobs:
+      - job: compute_versions_job
+        displayName: "Extract versions from Versions.props"
+        pool:
+          vmImage: ubuntu-latest
+
+        steps:
+          # Install the global.json-pinned .NET SDK before running any dotnet build, so this stage
+          # does not rely on whatever SDK happens to be on the agent image.
+          - template: /eng/pipelines/common/steps/install-dotnet.yml@self
+
+          # Restore dotnet local tools (pwsh, apicompat, etc.) required by build.proj targets that
+          # may run during the GetVersions* evaluation.
+          - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
+
+          # Extract package + file versions for the SqlClient family
+          # (GetVersionsSqlClient) and Microsoft.SqlServer.Server (GetVersionsSqlServer).
+          # Each target emits labeled stdout lines.
+          - script: |
+              set -euo pipefail
+              echo "Extracting versions with BuildNumber=$(Build.BuildNumber) BuildSuffix=${{ parameters.buildSuffix }}..."
+
+              extract() {
+                local label="$1"
+                local output
+                output=$(dotnet build "$(Build.SourcesDirectory)/build.proj" \
+                  -t:"GetVersions${label}" -v:m -nologo \
+                  -p:BuildNumber=$(Build.BuildNumber) \
+                  -p:BuildSuffix=${{ parameters.buildSuffix }})
+                local pkg file
+                # Trim trailing whitespace and any CR so versions never carry stray characters
+                # into downstream package/file versions or command-line arguments.
+                pkg=$(echo "$output" | sed -n 's/^ *PackageVersion: //p' | tr -d '\r' | sed 's/[[:space:]]*$//')
+                file=$(echo "$output" | sed -n 's/^ *FileVersion: //p' | tr -d '\r' | sed 's/[[:space:]]*$//')
+                # Fail fast if the expected labels were not found, rather than silently propagating
+                # empty versions to downstream stages.
+                if [ -z "$pkg" ] || [ -z "$file" ]; then
+                  echo "ERROR: failed to extract PackageVersion/FileVersion for ${label}." >&2
+                  echo "$output" >&2
+                  exit 1
+                fi
+                echo "  ${label}: pkg=$pkg  file=$file"
+                echo "##vso[task.setvariable variable=${label}PackageVersion;isOutput=true]$pkg"
+                echo "##vso[task.setvariable variable=${label}FileVersion;isOutput=true]$file"
+              }
+
+              # The SqlClient family shares one version; SqlServer is separate.
+              extract SqlClient
+              extract SqlServer
+            displayName: "Extract All Versions"
+            name: "versions"
diff --git a/eng/pipelines/stages/generate-secrets-ci-stage.yml b/eng/pipelines/stages/generate-secrets-ci-stage.yml
index 26d7d3b925..eaf61e1f60 100644
--- a/eng/pipelines/stages/generate-secrets-ci-stage.yml
+++ b/eng/pipelines/stages/generate-secrets-ci-stage.yml
@@ -37,6 +37,10 @@ stages:
   # used.
   - stage: secrets_stage
     displayName: Generate Secrets
+    # No dependencies: secret generation needs nothing from the computed versions, so run it
+    # immediately and in parallel with the compute_versions_ci stage.  Without this, ADO would
+    # default the stage to depend on the preceding stage (compute_versions_ci) and serialize them.
+    dependsOn: []
     jobs:
 
       # The job that generates the secrets.  Each secret is emitted as an output variable of a
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b3e0663fd3..2c4b54b5d0 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -61,6 +61,20 @@
     <FileVersionBuildNumber>$(BuildNumber.Split('.')[0])</FileVersionBuildNumber>
   </PropertyGroup>
 
+  <!--
+    Import the canonical SqlClient version for every project.  All packages in the SqlClient
+    *family* (Internal.Logging, Extensions.Abstractions, Microsoft.Data.SqlClient,
+    Extensions.Azure, and the AlwaysEncrypted.AzureKeyVaultProvider) share the SqlClient version
+    numbers (package, file, and assembly).  Microsoft.SqlServer.Server is versioned separately and
+    imports its own Versions.props.
+
+    This import runs after BuildNumber/FileVersionBuildNumber are set above, and before
+    Directory.Packages.props (which consumes SqlClientPackageVersion in Package mode).  The
+    import guard inside Versions.props makes any later import a no-op.
+  -->
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.Data.SqlClient/Versions.props"
+          Condition="'$(SqlClientVersionsImported)' != 'true'" />
+
   <ItemGroup Condition="$(BuildForRelease) == 'true'">
     <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
     <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
index 203aabd1f5..e2636ac11e 100644
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
@@ -12,14 +12,13 @@
   </PropertyGroup>
 
   <!-- Versioning ====================================================== -->
-  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
-       in Package mode).  The guard property inside Versions.props makes this a no-op on the
-       second import. -->
-  <Import Project="Versions.props" Condition="'$(AkvProviderVersionsImported)' != 'true'" />
+  <!-- This package is part of the SqlClient family and shares the SqlClient version.  The
+       SqlClient* version properties are provided by src/Directory.Build.props, which imports the
+       canonical Microsoft.Data.SqlClient/Versions.props for every project. -->
   <PropertyGroup>
-    <AssemblyVersion>$(AkvProviderAssemblyVersion)</AssemblyVersion>
-    <FileVersion>$(AkvProviderFileVersion)</FileVersion>
-    <Version>$(AkvProviderPackageVersion)</Version>
+    <AssemblyVersion>$(SqlClientAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(SqlClientFileVersion)</FileVersion>
+    <Version>$(SqlClientPackageVersion)</Version>
   </PropertyGroup>
 
   <!-- Strong name signing ============================================= -->
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
deleted file mode 100644
index 8d939d6c86..0000000000
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props
+++ /dev/null
@@ -1,94 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    This file contains versioning information for the Microsoft.Data.SqlClient package.
-    We will calculate three different version variables, used for different purposes:
-
-    * AkvProviderAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the
-      version reported to user if they open the assembly properties. It *must not* change within
-      major versions in order for minor versions to be considered backwards compatible via strong
-      naming. It must be in the form: (Major).0.0.0
-    * AkvProviderFileVersion - this will be used as the <FileVersion> property. It should be in the
-      form: (Major).(Minor).(Patch).(BuildNumber)
-    * AkvProviderPackageVersion - this will be used as the <Version> property, the version of the
-      NuGet package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
-  -->
-
-  <!--
-    Import guard: set on first import so that subsequent imports of this file are skipped.
-    Directory.Packages.props imports all Versions.props early in Package mode; the guard
-    prevents each csproj's own conditional import from re-importing and re-evaluating
-    version properties.
-  -->
-  <PropertyGroup>
-    <AkvProviderVersionsImported>true</AkvProviderVersionsImported>
-  </PropertyGroup>
-
-  <!-- Set up the default version for fallback if a version is not provided -->
-  <PropertyGroup>
-    <!--
-      This is the *next* version to release of AkvProvider. Update this after a version is released.
-      @TODO: Determine how versions should be updated in release branches vs main
-    -->
-    <AkvProviderVersionDefault>7.1.0-preview2</AkvProviderVersionDefault>
-  </PropertyGroup>
-
-  <!-- Determine file version and package version based on what was provided. -->
-  <Choose>
-    <When Condition="'$(AkvProviderPackageVersion)' != ''">
-      <!--
-        When a package version is provided, it supercedes all other choices. It will be used as the
-        package version and the file version will be based on it. This situation is used for
-        local developer scenarios and (@TODO:) old build pipelines that stored their version
-        information in the pipeline yaml.
-      -->
-      <PropertyGroup>
-        <AkvProviderFileVersion>$(AkvProviderPackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</AkvProviderFileVersion>
-      </PropertyGroup>
-    </When>
-
-    <When Condition="'$(BuildNumber)' != '' AND '$(BuildNumber)' != '0'">
-      <!--
-        When a build number is provided, the default version is used as the base of the package and
-        file versions.
-
-        If a build suffix is provided, this is appended to the package version. This is meant to be
-        used by automated pre-release systems to indicate the source of the build.
-
-        If a build suffix is not provided, no pre-release tag will be added to package version. If
-        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
-        will be retained for the package version, but will be stripped off for the file version
-        (letters are not allowed in file/assembly versions). This is meant to be used by official
-        build pipelines to generate production-ready builds.
-      -->
-      <PropertyGroup>
-        <AkvProviderPackageVersion Condition="'$(BuildSuffix)' != ''">$(AkvProviderVersionDefault)-$(BuildSuffix)$(BuildNumber)</AkvProviderPackageVersion>
-        <AkvProviderPackageVersion Condition="'$(BuildSuffix)' == ''">$(AkvProviderVersionDefault)</AkvProviderPackageVersion>
-
-        <AkvProviderFileVersion>$(AkvProviderVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AkvProviderFileVersion>
-      </PropertyGroup>
-    </When>
-
-    <Otherwise>
-      <!--
-        When a build number or package number are not provided, the build is expected to be a pre-
-        release version. In this case, a suffix is appended to the default version, and 0 is used
-        for the build number in the file version. This is meant to be used by developers that
-        want a quick build without supplying any parameters.
-      -->
-      <PropertyGroup>
-        <AkvProviderPackageVersion>$(AkvProviderVersionDefault)-dev</AkvProviderPackageVersion>
-        <AkvProviderFileVersion>$(AkvProviderVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AkvProviderFileVersion>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <!--
-    Finally, we take the file version and break off the major version to determine the assembly
-    version.
-
-    IMPORTANT: This must always be major.0.0.0 for assembly-level backwards compatibility.
-  -->
-  <PropertyGroup>
-    <AkvProviderAssemblyVersion>$(AkvProviderFileVersion.Split('.')[0]).0.0.0</AkvProviderAssemblyVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
index 0a9d29aa1e..e8b3c55ba0 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
@@ -22,14 +22,13 @@
   </ItemGroup>
 
   <!-- Versioning ====================================================== -->
-  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
-       in Package mode).  The guard property inside Versions.props makes this a no-op on the
-       second import. -->
-  <Import Project="Versions.props" Condition="'$(AbstractionsVersionsImported)' != 'true'" />
+  <!-- This package is part of the SqlClient family and shares the SqlClient version.  The
+       SqlClient* version properties are provided by src/Directory.Build.props, which imports the
+       canonical Microsoft.Data.SqlClient/Versions.props for every project. -->
   <PropertyGroup>
-    <AssemblyVersion>$(AbstractionsAssemblyVersion)</AssemblyVersion>
-    <FileVersion>$(AbstractionsFileVersion)</FileVersion>
-    <Version>$(AbstractionsPackageVersion)</Version>
+    <AssemblyVersion>$(SqlClientAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(SqlClientFileVersion)</FileVersion>
+    <Version>$(SqlClientPackageVersion)</Version>
   </PropertyGroup>
 
   <!-- Strong name signing ============================================= -->
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
deleted file mode 100644
index 465620fe19..0000000000
--- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props
+++ /dev/null
@@ -1,95 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    This file contains versioning information for the Microsoft.Data.SqlClient.Extensions.Abstractions package.
-    We will calculate three different version variables, used for different purposes:
-
-    * AbstractionsPackageVersion - this will be used as the <Version> property, the version of the
-      NuGet package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
-    * AbstractionsFileVersion - this will be used as the <FileVersion> property. It should be in the
-      form: (Major).(Minor).(Patch).(BuildNumber)
-    * AbstractionsAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the
-      version reported to user if they open the assembly properties. It *must not* change within
-      major versions in order for minor versions to be considered backwards compatible via strong
-      naming. It must be in the form: (Major).0.0.0
-  -->
-
-  <!--
-    Import guard: set on first import so that subsequent imports of this file are skipped.
-    Directory.Packages.props imports all Versions.props early in Package mode; the guard
-    prevents each csproj's own conditional import from re-importing and re-evaluating
-    version properties.
-  -->
-  <PropertyGroup>
-    <AbstractionsVersionsImported>true</AbstractionsVersionsImported>
-  </PropertyGroup>
-
-  <!-- Set up the default version for fallback if a version is not provided -->
-  <PropertyGroup>
-    <!--
-      This is the *next* version to release of Abstractions. Update this when the next version is
-      decided.
-      @TODO: Determine how versions should be updated in release branches vs main
-    -->
-    <AbstractionsVersionDefault>7.1.0-preview2</AbstractionsVersionDefault>
-  </PropertyGroup>
-
-  <!-- Determine file version and package version based on what was provided. -->
-  <Choose>
-    <When Condition="'$(AbstractionsPackageVersion)' != ''">
-      <!--
-        When a package version is provided, it supercedes all other choices. It will be used as the
-        package version and the file version will be based on it. This situation is used for
-        local developer scenarios and (@TODO:) old build pipelines that stored their version
-        information in the pipeline yaml.
-      -->
-      <PropertyGroup>
-        <AbstractionsFileVersion>$(AbstractionsPackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</AbstractionsFileVersion>
-      </PropertyGroup>
-    </When>
-
-    <When Condition="'$(BuildNumber)' != '' AND '$(BuildNumber)' != '0'">
-      <!--
-        When a build number is provided, the default version is used as the base of the package and
-        file versions.
-
-        If a build suffix is provided, this is appended to the package version. This is meant to be
-        used by automated pre-release systems to indicate the source of the build.
-
-        If a build suffix is not provided, no pre-release tag will be added to package version. If
-        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
-        will be retained for the package version, but will be stripped off for the file version
-        (letters are not allowed in file/assembly versions). This is meant to be used by official
-        build pipelines to generate production-ready builds.
-      -->
-      <PropertyGroup>
-        <AbstractionsPackageVersion Condition="'$(BuildSuffix)' != ''">$(AbstractionsVersionDefault)-$(BuildSuffix)$(BuildNumber)</AbstractionsPackageVersion>
-        <AbstractionsPackageVersion Condition="'$(BuildSuffix)' == ''">$(AbstractionsVersionDefault)</AbstractionsPackageVersion>
-
-        <AbstractionsFileVersion>$(AbstractionsVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AbstractionsFileVersion>
-      </PropertyGroup>
-    </When>
-
-    <Otherwise>
-      <!--
-        When a build number or package number are not provided, the build is expected to be a pre-
-        release version. In this case, a suffix is appended to the default version, and 0 is used
-        for the build number in the file version. This is meant to be used by developers that
-        want a quick build without supplying any parameters.
-      -->
-      <PropertyGroup>
-        <AbstractionsPackageVersion>$(AbstractionsVersionDefault)-dev</AbstractionsPackageVersion>
-        <AbstractionsFileVersion>$(AbstractionsVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AbstractionsFileVersion>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <!--
-    Finally, we take the file version and break off the major version to determine the assembly
-    version.
-
-    IMPORTANT: This must always be major.0.0.0 for assembly-level backwards compatibility.
-  -->
-  <PropertyGroup>
-    <AbstractionsAssemblyVersion>$(AbstractionsFileVersion.Split('.')[0]).0.0.0</AbstractionsAssemblyVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
index 52b1da7ba7..1a2e61f645 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
@@ -798,7 +798,7 @@ private IPublicClientApplication CreateClientAppInstance(PublicClientAppKey publ
             {
                 ClientId = publicClientAppKey.ApplicationClientId,
                 ClientName = typeof(ActiveDirectoryAuthenticationProvider).FullName,
-                ClientVersion = Extensions.Azure.ThisAssembly.InformationalVersion,
+                ClientVersion = Extensions.Azure.ThisAssembly.FileVersion,
                 RedirectUri = publicClientAppKey.RedirectUri,
             })
             // The Authority contains the tenant-specific Entra ID endpoint, e.g.
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
index b9a3b82c27..da0a4cb4c7 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj
@@ -22,14 +22,13 @@
   </ItemGroup>
 
   <!-- Versioning ====================================================== -->
-  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
-       in Package mode).  The guard property inside Versions.props makes this a no-op on the
-       second import. -->
-  <Import Project="Versions.props" Condition="'$(AzureVersionsImported)' != 'true'" />
+  <!-- This package is part of the SqlClient family and shares the SqlClient version.  The
+       SqlClient* version properties are provided by src/Directory.Build.props, which imports the
+       canonical Microsoft.Data.SqlClient/Versions.props for every project. -->
   <PropertyGroup>
-    <AssemblyVersion>$(AzureAssemblyVersion)</AssemblyVersion>
-    <FileVersion>$(AzureFileVersion)</FileVersion>
-    <Version>$(AzurePackageVersion)</Version>
+    <AssemblyVersion>$(SqlClientAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(SqlClientFileVersion)</FileVersion>
+    <Version>$(SqlClientPackageVersion)</Version>
   </PropertyGroup>
 
   <!-- Strong name signing ============================================= -->
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
deleted file mode 100644
index a7762cbbc0..0000000000
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props
+++ /dev/null
@@ -1,94 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    This file contains versioning information for the Microsoft.Data.SqlClient.Extensions.Azure package.
-    We will calculate three different version variables, used for different purposes:
-
-    * AzureAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the
-      version reported to user if they open the assembly properties. It *must not* change within
-      major versions in order for minor versions to be considered backwards compatible via strong
-      naming. It must be in the form: (Major).0.0.0
-    * AzurePackageVersion - this will be used as the <Version> property, the version of the
-      NuGet package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
-    * AzureFileVersion - this will be used as the <FileVersion> property. It should be in the
-      form: (Major).(Minor).(Patch).(BuildNumber)
-  -->
-
-  <!--
-    Import guard: set on first import so that subsequent imports of this file are skipped.
-    Directory.Packages.props imports all Versions.props early in Package mode; the guard
-    prevents each csproj's own conditional import from re-importing and re-evaluating
-    version properties.
-  -->
-  <PropertyGroup>
-    <AzureVersionsImported>true</AzureVersionsImported>
-  </PropertyGroup>
-
-  <!-- Set up the default version for fallback if a version is not provided -->
-  <PropertyGroup>
-    <!--
-      This is the *next* version to release of Azure. Update this when the next version is decided.
-      @TODO: Determine how versions should be updated in release branches vs main
-    -->
-    <AzureVersionDefault>7.1.0-preview2</AzureVersionDefault>
-  </PropertyGroup>
-
-  <!-- Determine file version and package version based on what was provided. -->
-  <Choose>
-    <When Condition="'$(AzurePackageVersion)' != ''">
-      <!--
-        When a package version is provided, it supercedes all other choices. It will be used as the
-        package version and the file version will be based on it. This situation is used for
-        local developer scenarios and (@TODO:) old build pipelines that stored their version
-        information in the pipeline yaml.
-      -->
-      <PropertyGroup>
-        <AzureFileVersion>$(AzurePackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</AzureFileVersion>
-      </PropertyGroup>
-    </When>
-
-    <When Condition="'$(BuildNumber)' != '' AND '$(BuildNumber)' != '0'">
-      <!--
-        When a build number is provided, the default version is used as the base of the package and
-        file versions.
-
-        If a build suffix is provided, this is appended to the package version. This is meant to be
-        used by automated pre-release systems to indicate the source of the build.
-
-        If a build suffix is not provided, no pre-release tag will be added to package version. If
-        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
-        will be retained for the package version, but will be stripped off for the file version
-        (letters are not allowed in file/assembly versions). This is meant to be used by official
-        build pipelines to generate production-ready builds.
-      -->
-      <PropertyGroup>
-        <AzurePackageVersion Condition="'$(BuildSuffix)' != ''">$(AzureVersionDefault)-$(BuildSuffix)$(BuildNumber)</AzurePackageVersion>
-        <AzurePackageVersion Condition="'$(BuildSuffix)' == ''">$(AzureVersionDefault)</AzurePackageVersion>
-
-        <AzureFileVersion>$(AzureVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AzureFileVersion>
-      </PropertyGroup>
-    </When>
-
-    <Otherwise>
-      <!--
-        When a build number or package number are not provided, the build is expected to be a pre-
-        release version. In this case, a suffix is appended to the default version, and 0 is used
-        for the build number in the file version. This is meant to be used by developers that
-        want a quick build without supplying any parameters.
-      -->
-      <PropertyGroup>
-        <AzurePackageVersion>$(AzureVersionDefault)-dev</AzurePackageVersion>
-        <AzureFileVersion>$(AzureVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</AzureFileVersion>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <!--
-    Finally, we take the file version and break off the major version to determine the assembly
-    version.
-
-    IMPORTANT: This must always be major.0.0.0 for assembly-level backwards compatibility.
-  -->
-  <PropertyGroup>
-    <AzureAssemblyVersion>$(AzureFileVersion.Split('.')[0]).0.0.0</AzureAssemblyVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj
index d1c3e0fc5c..d83b8ae577 100644
--- a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj
+++ b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj
@@ -24,14 +24,13 @@
   </ItemGroup>
 
   <!-- Versioning ====================================================== -->
-  <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
-       in Package mode).  The guard property inside Versions.props makes this a no-op on the
-       second import. -->
-  <Import Project="Versions.props" Condition="'$(LoggingVersionsImported)' != 'true'" />
+  <!-- This package is part of the SqlClient family and shares the SqlClient version.  The
+       SqlClient* version properties are provided by src/Directory.Build.props, which imports the
+       canonical Microsoft.Data.SqlClient/Versions.props for every project. -->
   <PropertyGroup>
-    <AssemblyVersion>$(LoggingAssemblyVersion)</AssemblyVersion>
-    <FileVersion>$(LoggingFileVersion)</FileVersion>
-    <Version>$(LoggingPackageVersion)</Version>
+    <AssemblyVersion>$(SqlClientAssemblyVersion)</AssemblyVersion>
+    <FileVersion>$(SqlClientFileVersion)</FileVersion>
+    <Version>$(SqlClientPackageVersion)</Version>
   </PropertyGroup>
 
   <!-- Strong name signing ============================================= -->
diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props b/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
deleted file mode 100644
index 3810bd91ae..0000000000
--- a/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props
+++ /dev/null
@@ -1,95 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    This file contains versioning information for the Microsoft.Data.SqlClient.Internal.Logging package.
-    We will calculate three different version variables, used for different purposes:
-
-    * LoggingPackageVersion - this will be used as the <Version> property, the version of the
-      NuGet package. It should be in the form: (Major).(Minor).(Patch)[-(Suffix)(BuildNumber)]
-    * LoggingFileVersion - this will be used as the <FileVersion> property. It should be in the
-      form: (Major).(Minor).(Patch).(BuildNumber)
-    * LoggingAssemblyVersion - this will be used as the <AssemblyVersion> property. This is the
-      version reported to user if they open the assembly properties. It *must not* change within
-      major versions in order for minor versions to be considered backwards compatible via strong
-      naming. It must be in the form: (Major).0.0.0
-  -->
-
-  <!--
-    Import guard: set on first import so that subsequent imports of this file are skipped.
-    Directory.Packages.props imports all Versions.props early in Package mode; the guard
-    prevents each csproj's own conditional import from re-importing and re-evaluating
-    version properties.
-  -->
-  <PropertyGroup>
-    <LoggingVersionsImported>true</LoggingVersionsImported>
-  </PropertyGroup>
-
-  <!-- Set up the default version for fallback if a version is not provided -->
-  <PropertyGroup>
-    <!--
-      This is the *next* version to release of Logging. Update this when the next version is
-      decided.
-      @TODO: Determine how versions should be updated in release branches vs main
-    -->
-    <LoggingVersionDefault>7.1.0-preview2</LoggingVersionDefault>
-  </PropertyGroup>
-
-  <!-- Determine file version and package version based on what was provided. -->
-  <Choose>
-    <When Condition="'$(LoggingPackageVersion)' != ''">
-      <!--
-        When a package version is provided, it supercedes all other choices. It will be used as the
-        package version and the file version will be based on it. This situation is used for
-        local developer scenarios and (@TODO:) old build pipelines that stored their version
-        information in the pipeline yaml.
-      -->
-      <PropertyGroup>
-        <LoggingFileVersion>$(LoggingPackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</LoggingFileVersion>
-      </PropertyGroup>
-    </When>
-
-    <When Condition="'$(BuildNumber)' != '' AND '$(BuildNumber)' != '0'">
-      <!--
-        When a build number is provided, the default version is used as the base of the package and
-        file versions.
-
-        If a build suffix is provided, this is appended to the package version. This is meant to be
-        used by automated pre-release systems to indicate the source of the build.
-
-        If a build suffix is not provided, no pre-release tag will be added to package version. If
-        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
-        will be retained for the package version, but will be stripped off for the file version
-        (letters are not allowed in file/assembly versions). This is meant to be used by official
-        build pipelines to generate production-ready builds.
-      -->
-      <PropertyGroup>
-        <LoggingPackageVersion Condition="'$(BuildSuffix)' != ''">$(LoggingVersionDefault)-$(BuildSuffix)$(BuildNumber)</LoggingPackageVersion>
-        <LoggingPackageVersion Condition="'$(BuildSuffix)' == ''">$(LoggingVersionDefault)</LoggingPackageVersion>
-
-        <LoggingFileVersion>$(LoggingVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</LoggingFileVersion>
-      </PropertyGroup>
-    </When>
-
-    <Otherwise>
-      <!--
-        When a build number or package number are not provided, the build is expected to be a pre-
-        release version. In this case, a suffix is appended to the default version, and 0 is used
-        for the build number in the file version. This is meant to be used by developers that
-        want a quick build without supplying any parameters.
-      -->
-      <PropertyGroup>
-        <LoggingPackageVersion>$(LoggingVersionDefault)-dev</LoggingPackageVersion>
-        <LoggingFileVersion>$(LoggingVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</LoggingFileVersion>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <!--
-    Finally, we take the file version and break off the major version to determine the assembly
-    version.
-
-    IMPORTANT: This must always be major.0.0.0 for assembly-level backwards compatibility.
-  -->
-  <PropertyGroup>
-    <LoggingAssemblyVersion>$(LoggingFileVersion.Split('.')[0]).0.0.0</LoggingAssemblyVersion>
-  </PropertyGroup>
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/Versions.props b/src/Microsoft.Data.SqlClient/Versions.props
index 7c8dd25305..f67997a10f 100644
--- a/src/Microsoft.Data.SqlClient/Versions.props
+++ b/src/Microsoft.Data.SqlClient/Versions.props
@@ -14,10 +14,13 @@
   -->
 
   <!--
-    Import guard: set on first import so that subsequent imports of this file are skipped.
-    Directory.Packages.props imports all Versions.props early in Package mode; the guard
-    prevents each csproj's own conditional import from re-importing and re-evaluating
-    version properties.
+    This is the canonical version file for the entire SqlClient *family* of packages.  All family
+    packages (Internal.Logging, Extensions.Abstractions, Microsoft.Data.SqlClient, Extensions.Azure,
+    and the AlwaysEncrypted.AzureKeyVaultProvider) share these SqlClient* version properties
+    (package, file, and assembly).  Microsoft.SqlServer.Server is versioned separately.
+
+    Import guard: set on first import so that subsequent conditional imports of this file are
+    skipped. Without the guard, MSBuild ignores the duplicate import but emits warning MSB4011.
   -->
   <PropertyGroup>
     <SqlClientVersionsImported>true</SqlClientVersionsImported>
@@ -26,10 +29,11 @@
   <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
     <!--
-      This is the *next* version to release of SqlClient. Update this after a version is released.
+      This is the *next* version to release of the SqlClient family.  Update this after a version
+      is released.  Every SqlClient family package uses this version.
       @TODO: Determine how versions should be updated in release branches vs main
     -->
-    <SqlClientVersionDefault>7.1.0-preview2</SqlClientVersionDefault>
+    <SqlClientNextVersion>7.1.0-preview3</SqlClientNextVersion>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
@@ -37,12 +41,22 @@
     <When Condition="'$(SqlClientPackageVersion)' != ''">
       <!--
         When a package version is provided, it supercedes all other choices. It will be used as the
-        package version and the file version will be based on it. This situation is used for
-        local developer scenarios and (@TODO:) old build pipelines that stored their version
-        information in the pipeline yaml.
+        package version and the file version will be based on it.
       -->
       <PropertyGroup>
-        <SqlClientFileVersion>$(SqlClientPackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</SqlClientFileVersion>
+        <SqlClientPackageVersionBase>$(SqlClientPackageVersion.Split('-')[0])</SqlClientPackageVersionBase>
+        <!--
+          Package versions cannot be used directly as file versions because a prerelease suffix is
+          not valid in a file version. Start with the suffix-free package base and append the
+          configured file-version build number, which converts a three-part package version such as
+          1.2.3-preview1 to 1.2.3.42.
+
+          A revision-enabled pipeline supplies a four-part package base such as 1.2.3.42. That base
+          is already a complete file version, so the following conditional assignment overrides the
+          fallback instead of producing an invalid five-part version.
+        -->
+        <SqlClientFileVersion>$(SqlClientPackageVersionBase).$(FileVersionBuildNumber)</SqlClientFileVersion>
+        <SqlClientFileVersion Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(SqlClientPackageVersionBase)', '^\d+\.\d+\.\d+\.\d+$'))">$(SqlClientPackageVersionBase)</SqlClientFileVersion>
       </PropertyGroup>
     </When>
 
@@ -61,10 +75,10 @@
         build pipelines to generate production-ready builds.
       -->
       <PropertyGroup>
-        <SqlClientPackageVersion Condition="'$(BuildSuffix)' != ''">$(SqlClientVersionDefault)-$(BuildSuffix)$(BuildNumber)</SqlClientPackageVersion>
-        <SqlClientPackageVersion Condition="'$(BuildSuffix)' == ''">$(SqlClientVersionDefault)</SqlClientPackageVersion>
+        <SqlClientPackageVersion Condition="'$(BuildSuffix)' != ''">$(SqlClientNextVersion)-$(BuildSuffix)$(BuildNumber)</SqlClientPackageVersion>
+        <SqlClientPackageVersion Condition="'$(BuildSuffix)' == ''">$(SqlClientNextVersion)</SqlClientPackageVersion>
 
-        <SqlClientFileVersion>$(SqlClientVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</SqlClientFileVersion>
+        <SqlClientFileVersion>$(SqlClientNextVersion.Split('-')[0]).$(FileVersionBuildNumber)</SqlClientFileVersion>
       </PropertyGroup>
     </When>
 
@@ -76,8 +90,8 @@
         want a quick build without supplying any parameters.
       -->
       <PropertyGroup>
-        <SqlClientPackageVersion>$(SqlClientVersionDefault)-dev</SqlClientPackageVersion>
-        <SqlClientFileVersion>$(SqlClientVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</SqlClientFileVersion>
+        <SqlClientPackageVersion>$(SqlClientNextVersion)-dev</SqlClientPackageVersion>
+        <SqlClientFileVersion>$(SqlClientNextVersion.Split('-')[0]).$(FileVersionBuildNumber)</SqlClientFileVersion>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 7194f0e8db..b1e20685a1 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -96,8 +96,6 @@
 
     <AbstractionsProjectPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj</AbstractionsProjectPath>
     <LoggingProjectPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj</LoggingProjectPath>
-    <AbstractionsVersionsPropsPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props</AbstractionsVersionsPropsPath>
-    <LoggingVersionsPropsPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props</LoggingVersionsPropsPath>
     <SqlServerVersionsPropsPath>$(RepoRoot)/src/Microsoft.SqlServer.Server/Versions.props</SqlServerVersionsPropsPath>
 
     <!-- Properties consumed by the SDK NuGet pack task (NuGet.Build.Tasks.Pack.targets). -->
@@ -141,13 +139,11 @@
   </PropertyGroup>
 
   <!--
-    Conditionally import sibling Versions.props files to obtain their calculated package
-    version values for nuspec dependency token expansion.
+    Conditionally import the Microsoft.SqlServer.Server Versions.props to obtain its calculated
+    package version for nuspec dependency token expansion.  The SqlClient family version (used for
+    the Abstractions and Logging dependencies) is already imported globally by
+    src/Directory.Build.props, so only the separately-versioned SqlServer props is needed here.
   -->
-  <Import Project="$(AbstractionsVersionsPropsPath)"
-    Condition="'$(AbstractionsPackageVersion)' == '' AND Exists('$(AbstractionsVersionsPropsPath)')" />
-  <Import Project="$(LoggingVersionsPropsPath)"
-    Condition="'$(LoggingPackageVersion)' == '' AND Exists('$(LoggingVersionsPropsPath)')" />
   <Import Project="$(SqlServerVersionsPropsPath)"
     Condition="'$(SqlServerPackageVersion)' == '' AND Exists('$(SqlServerVersionsPropsPath)')" />
 
@@ -191,27 +187,25 @@
 
     <!-- Check for empty sibling package versions. -->
     <PropertyGroup>
-      <_AbstractionsPackageVersionTrimmed>$([System.String]::Copy('$(AbstractionsPackageVersion)').Trim())</_AbstractionsPackageVersionTrimmed>
-      <_LoggingPackageVersionTrimmed>$([System.String]::Copy('$(LoggingPackageVersion)').Trim())</_LoggingPackageVersionTrimmed>
+      <_SqlClientPackageVersionTrimmed>$([System.String]::Copy('$(SqlClientPackageVersion)').Trim())</_SqlClientPackageVersionTrimmed>
       <_SqlServerPackageVersionTrimmed>$([System.String]::Copy('$(SqlServerPackageVersion)').Trim())</_SqlServerPackageVersionTrimmed>
     </PropertyGroup>
-    <Error Condition="'$(_AbstractionsPackageVersionTrimmed)' == ''"
-      Text="AbstractionsPackageVersion is required for SqlClient packaging. When packing via build.proj, set -p:PackageVersionAbstractions=&lt;version&gt;; when packing the project directly, set -p:AbstractionsPackageVersion=&lt;version&gt;; otherwise ensure the Abstractions Versions.props import can resolve a value." />
-    <Error Condition="'$(_LoggingPackageVersionTrimmed)' == ''"
-      Text="LoggingPackageVersion is required for SqlClient packaging. When packing via build.proj, set -p:PackageVersionLogging=&lt;version&gt;; when packing the project directly, set -p:LoggingPackageVersion=&lt;version&gt;; otherwise ensure the Logging Versions.props import can resolve a value." />
+    <Error Condition="'$(_SqlClientPackageVersionTrimmed)' == ''"
+      Text="SqlClientPackageVersion is required for SqlClient packaging.  The Abstractions and Logging dependencies are part of the SqlClient family and share this version.  When packing via build.proj, set -p:PackageVersionSqlClient=&lt;version&gt;; when packing the project directly, set -p:SqlClientPackageVersion=&lt;version&gt;; otherwise ensure the SqlClient Versions.props import can resolve a value." />
     <Error Condition="'$(_SqlServerPackageVersionTrimmed)' == ''"
       Text="SqlServerPackageVersion is required for SqlClient packaging. When packing via build.proj, set -p:PackageVersionSqlServer=&lt;version&gt;; when packing the project directly, set -p:SqlServerPackageVersion=&lt;version&gt;; otherwise ensure the SqlServer Versions.props import can resolve a value." />
 
     <!-- Expand the SqlClientPackNuspec template with computed version ranges. -->
     <PropertyGroup>
       <!-- Compute version ranges: [floor, (floor.Major+1).0.0) — ceiling derived from floor.
+           The Abstractions and Logging dependencies belong to the SqlClient family and share the
+           SqlClient version, so they use the single SqlClientVersionRange token in the nuspec.
            Use trimmed values to guard against whitespace passed via -p: arguments. -->
-      <_AbstractionsVersionRange>[$(_AbstractionsPackageVersionTrimmed), $([MSBuild]::Add($(_AbstractionsPackageVersionTrimmed.Split('.')[0]), 1)).0.0)</_AbstractionsVersionRange>
-      <_LoggingVersionRange>[$(_LoggingPackageVersionTrimmed), $([MSBuild]::Add($(_LoggingPackageVersionTrimmed.Split('.')[0]), 1)).0.0)</_LoggingVersionRange>
+      <_SqlClientVersionRange>[$(_SqlClientPackageVersionTrimmed), $([MSBuild]::Add($(_SqlClientPackageVersionTrimmed.Split('.')[0]), 1)).0.0)</_SqlClientVersionRange>
       <_SqlServerVersionRange>[$(_SqlServerPackageVersionTrimmed), $([MSBuild]::Add($(_SqlServerPackageVersionTrimmed.Split('.')[0]), 1)).0.0)</_SqlServerVersionRange>
     </PropertyGroup>
     <PropertyGroup>
-      <_SqlClientPackNuspecExpandedText>$([System.IO.File]::ReadAllText('$(SqlClientPackNuspecTemplatePath)').Replace('$AbstractionsVersionRange$','$(_AbstractionsVersionRange)').Replace('$LoggingVersionRange$','$(_LoggingVersionRange)').Replace('$SqlServerVersionRange$','$(_SqlServerVersionRange)').Replace('$SniVersionRange$','$(SniVersionRange)'))</_SqlClientPackNuspecExpandedText>
+      <_SqlClientPackNuspecExpandedText>$([System.IO.File]::ReadAllText('$(SqlClientPackNuspecTemplatePath)').Replace('$SqlClientVersionRange$','$(_SqlClientVersionRange)').Replace('$SqlServerVersionRange$','$(_SqlServerVersionRange)').Replace('$SniVersionRange$','$(SniVersionRange)'))</_SqlClientPackNuspecExpandedText>
     </PropertyGroup>
     <WriteLinesToFile File="$(SqlClientPackNuspecGeneratedPath)"
                       Lines="$(_SqlClientPackNuspecExpandedText)"
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
index 676f86f3bd..09a556d84a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
@@ -38,8 +38,8 @@
       <group targetFramework="net462">
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
         <dependency id="Microsoft.Bcl.TimeProvider" version="8.0.1" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsVersionRange$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$SqlClientVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$SqlClientVersionRange$" />
         <dependency id="Microsoft.Data.SqlClient.SNI" version="$SniVersionRange$" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
@@ -57,8 +57,8 @@
       </group>
       <group targetFramework="net8.0">
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsVersionRange$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$SqlClientVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$SqlClientVersionRange$" />
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="$SniVersionRange$" exclude="Compile" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
@@ -70,8 +70,8 @@
       </group>
       <group targetFramework="net9.0">
         <dependency id="Microsoft.Bcl.Cryptography" version="9.0.18" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsVersionRange$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$SqlClientVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$SqlClientVersionRange$" />
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="$SniVersionRange$" exclude="Compile" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.18" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
@@ -84,8 +84,8 @@
       <group targetFramework="netstandard2.0">
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
         <dependency id="Microsoft.Bcl.TimeProvider" version="8.0.1" />
-        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsVersionRange$" />
-        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$LoggingVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$SqlClientVersionRange$" />
+        <dependency id="Microsoft.Data.SqlClient.Internal.Logging" version="$SqlClientVersionRange$" />
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="$SniVersionRange$" exclude="Compile" />
         <dependency id="Microsoft.Extensions.Caching.Memory" version="8.0.1" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index b4a7eb54df..1fdce82d24 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -837,7 +837,7 @@ internal static Version GetAssemblyVersion()
             // NOTE: Using lazy thread-safety since we don't care if two threads both happen to update the value at the same time
             if (s_systemDataVersion is null)
             {
-                s_systemDataVersion = new Version(ThisAssembly.InformationalVersion);
+                s_systemDataVersion = new Version(ThisAssembly.FileVersion);
             }
 
             return s_systemDataVersion;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlDiagnosticListener.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlDiagnosticListener.cs
index 9ed25cc8d8..40e4bb63d9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlDiagnosticListener.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlDiagnosticListener.cs
@@ -246,7 +246,7 @@ public void WriteConnectionOpenAfter(
                     Stopwatch.GetTimestamp(),
                     sqlConnection.ClientConnectionId,
                     sqlConnection,
-                    ThisAssembly.InformationalVersion,
+                    ThisAssembly.FileVersion,
                     sqlConnection.Statistics?.GetDictionary()
                 )
             );
@@ -269,7 +269,7 @@ public Guid WriteConnectionOpenBefore(SqlConnection sqlConnection, [CallerMember
                     operation,
                     Stopwatch.GetTimestamp(),
                     sqlConnection,
-                    ThisAssembly.InformationalVersion
+                    ThisAssembly.FileVersion
                 )
             );
 
@@ -297,7 +297,7 @@ public void WriteConnectionOpenError(
                     Stopwatch.GetTimestamp(),
                     sqlConnection.ClientConnectionId,
                     sqlConnection,
-                    ThisAssembly.InformationalVersion,
+                    ThisAssembly.FileVersion,
                     ex
                 )
             );
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
index 63cd220d6c..d8820c3ce9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
@@ -144,7 +144,7 @@ static UserAgent()
             MaxLenOverall,
             PayloadVersion,
             DriverName,
-            ThisAssembly.NuGetPackageVersion,
+            ThisAssembly.PackageVersion,
             RuntimeInformation.ProcessArchitecture,
             osType,
             RuntimeInformation.OSDescription,
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Program.cs b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Program.cs
index da1ce59316..c391ea0364 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Program.cs
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Runner/Program.cs
@@ -256,19 +256,10 @@ private static string GetMdsVersion()
                 return "<unknown>";
             }
 
-            // Look for the NuGetPackageVersion field, which is available in
-            // newer MDS packages.
-            var field = type.GetField(
-                "NuGetPackageVersion",
-                BindingFlags.NonPublic | BindingFlags.Static);
-
-            // If not present, use the older assembly file version field.
-            if (field is null)
-            {
-                field = type.GetField(
-                    "InformationalVersion",
-                    BindingFlags.NonPublic | BindingFlags.Static);
-            }
+            // Prefer PackageVersion, falling back to FileVersion.
+            var field =
+                type.GetField("PackageVersion", BindingFlags.NonPublic | BindingFlags.Static)
+                ?? type.GetField("FileVersion", BindingFlags.NonPublic | BindingFlags.Static);
 
             if (field is null)
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs
index 8331fdb654..80b826700e 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs
@@ -78,7 +78,7 @@ public void Value_Runtime_Parts()
         Assert.Equal(7, parts.Length);
         Assert.Equal("1", parts[0]);
         Assert.Equal("MS-MDS", parts[1]);
-        Assert.Equal(ThisAssembly.NuGetPackageVersion, parts[2]);
+        Assert.Equal(ThisAssembly.PackageVersion, parts[2]);
 
         // Architecture must be non-empty and 10 characters or less.
         Assert.True(parts[3] == "Unknown" || parts[3].Length > 0);
diff --git a/src/Microsoft.SqlServer.Server/Versions.props b/src/Microsoft.SqlServer.Server/Versions.props
index 2a35868c7d..e03f8d2967 100644
--- a/src/Microsoft.SqlServer.Server/Versions.props
+++ b/src/Microsoft.SqlServer.Server/Versions.props
@@ -14,10 +14,9 @@
   -->
 
   <!--
-    Import guard: set on first import so that subsequent imports of this file are skipped.
-    Directory.Packages.props imports all Versions.props early in Package mode; the guard
-    prevents each csproj's own conditional import from re-importing and re-evaluating
-    version properties.
+    Import guard: set on first import so that subsequent conditional imports of this file are
+    skipped. Directory.Packages.props imports this file early in Package mode; without the guard,
+    MSBuild ignores the duplicate csproj import but emits warning MSB4011.
   -->
   <PropertyGroup>
     <SqlServerVersionsImported>true</SqlServerVersionsImported>
@@ -25,12 +24,11 @@
 
   <!-- Set up the default version for fallback if a version is not provided -->
   <PropertyGroup>
-    <!--
-      This is the *next* version to release of SqlServer. Update this when the next version is
-      decided.
-      @TODO: Determine how versions should be updated in release branches vs main
-    -->
-    <SqlServerVersionDefault>1.0.0</SqlServerVersionDefault>
+    <!-- Last version shipped to NuGet. Update after each release. -->
+    <SqlServerPublishedVersion>1.0.0</SqlServerPublishedVersion>
+
+    <!-- This is the *next* version to release of SqlServer. Update this after each release. -->
+    <SqlServerNextVersion>1.1.0-preview1</SqlServerNextVersion>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->
@@ -38,12 +36,22 @@
     <When Condition="'$(SqlServerPackageVersion)' != ''">
       <!--
         When a package version is provided, it supercedes all other choices. It will be used as the
-        package version and the file version will be based on it. This situation is used for
-        local developer scenarios and (@TODO:) old build pipelines that stored their version
-        information in the pipeline yaml.
+        package version and the file version will be based on it.
       -->
       <PropertyGroup>
-        <SqlServerFileVersion>$(SqlServerPackageVersion.Split('-')[0]).$(FileVersionBuildNumber)</SqlServerFileVersion>
+        <SqlServerPackageVersionBase>$(SqlServerPackageVersion.Split('-')[0])</SqlServerPackageVersionBase>
+        <!--
+          Package versions cannot be used directly as file versions because a prerelease suffix is
+          not valid in a file version. Start with the suffix-free package base and append the
+          configured file-version build number, which converts a three-part package version such as
+          1.2.3-preview1 to 1.2.3.42.
+
+          A revision-enabled pipeline supplies a four-part package base such as 1.2.3.42. That base
+          is already a complete file version, so the following conditional assignment overrides the
+          fallback instead of producing an invalid five-part version.
+        -->
+        <SqlServerFileVersion>$(SqlServerPackageVersionBase).$(FileVersionBuildNumber)</SqlServerFileVersion>
+        <SqlServerFileVersion Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(SqlServerPackageVersionBase)', '^\d+\.\d+\.\d+\.\d+$'))">$(SqlServerPackageVersionBase)</SqlServerFileVersion>
       </PropertyGroup>
     </When>
 
@@ -62,10 +70,10 @@
         build pipelines to generate production-ready builds.
       -->
       <PropertyGroup>
-        <SqlServerPackageVersion Condition="'$(BuildSuffix)' != ''">$(SqlServerVersionDefault)-$(BuildSuffix)$(BuildNumber)</SqlServerPackageVersion>
-        <SqlServerPackageVersion Condition="'$(BuildSuffix)' == ''">$(SqlServerVersionDefault)</SqlServerPackageVersion>
+        <SqlServerPackageVersion Condition="'$(BuildSuffix)' != ''">$(SqlServerNextVersion)-$(BuildSuffix)$(BuildNumber)</SqlServerPackageVersion>
+        <SqlServerPackageVersion Condition="'$(BuildSuffix)' == ''">$(SqlServerNextVersion)</SqlServerPackageVersion>
 
-        <SqlServerFileVersion>$(SqlServerVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</SqlServerFileVersion>
+        <SqlServerFileVersion>$(SqlServerNextVersion.Split('-')[0]).$(FileVersionBuildNumber)</SqlServerFileVersion>
       </PropertyGroup>
     </When>
 
@@ -77,8 +85,8 @@
         want a quick build without supplying any parameters.
       -->
       <PropertyGroup>
-        <SqlServerPackageVersion>$(SqlServerVersionDefault)-dev</SqlServerPackageVersion>
-        <SqlServerFileVersion>$(SqlServerVersionDefault.Split('-')[0]).$(FileVersionBuildNumber)</SqlServerFileVersion>
+        <SqlServerPackageVersion>$(SqlServerNextVersion)-dev</SqlServerPackageVersion>
+        <SqlServerFileVersion>$(SqlServerNextVersion.Split('-')[0]).$(FileVersionBuildNumber)</SqlServerFileVersion>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/tools/targets/GenerateThisAssemblyCs.targets b/tools/targets/GenerateThisAssemblyCs.targets
index 6ed66d74ed..29844fbce3 100644
--- a/tools/targets/GenerateThisAssemblyCs.targets
+++ b/tools/targets/GenerateThisAssemblyCs.targets
@@ -8,9 +8,6 @@
 
     <PropertyGroup>
 
-      <!-- If an AssemblyFileVersion was provided, use that. Otherwise, use the FileVersion -->
-      <AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">$(FileVersion)</AssemblyFileVersion>
-
       <!-- Put the ThisAssembly class in the assembly's name namespace by default. -->
       <ThisAssemblyNamespace Condition="'$(ThisAssemblyNamespace)' == ''">$(AssemblyName)</ThisAssemblyNamespace>
 
@@ -22,8 +19,8 @@ namespace $(ThisAssemblyNamespace)
 {
     internal static class ThisAssembly
     {
-        internal const string InformationalVersion = "$(AssemblyFileVersion)"%3B
-        internal const string NuGetPackageVersion = "$(Version)"%3B
+        internal const string FileVersion = "$(FileVersion)"%3B
+        internal const string PackageVersion = "$(Version)"%3B
     }
 }
       </ThisAssemblyCsContents>

From 194b3cb2219a710f97e2b90712be858a16170eb3 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 20 Aug 2026 13:29:27 -0700
Subject: [PATCH 236/298] Fix AccessTokenCallback TNIR behavior and make
 SspiContextProvider mutually exclusive with token auth (#4520)

* Treat AccessTokenCallback like AccessToken for TNIR and pool keys

On .NET Framework the driver disables Transparent Network IP Resolution by
default whenever federated authentication is in use, unless the caller
explicitly specified the TransparentNetworkIPResolution keyword. However,
ShouldDisableTnir only tested _accessTokenInBytes (SqlConnection.AccessToken)
and ignored _accessTokenCallback (SqlConnection.AccessTokenCallback), so the two
token-supplying APIs behaved differently. Raised in review discussion on #4493.

Changes:

* Add SqlConnectionInternal.IsAccessTokenProvided, a single source of truth for
  "the caller supplied a token, either literally or via a callback", and use it
  in all three places that previously inlined the field checks (ShouldDisableTnir
  plus two spots in TdsParser.ConsumePreLoginHandshake). The duplicated,
  hand-written expression is what allowed the two paths to drift apart.

* Fix the AccessToken, AccessTokenCallback and SspiContextProvider setters, which
  each rebuilt the ConnectionPoolKey with the sibling authentication values
  hard-coded to null. Setting SspiContextProvider silently dropped a previously
  assigned access token or callback from the pool key, so it never reached the
  internal connection even though the public property still reported it as set.
  These now preserve sibling state, matching the ConnectionString setter.
  (AccessToken and AccessTokenCallback are already mutually exclusive, so that
  pairing was benign; SspiContextProvider is not.)

* Expose ShouldDisableTnir as internal static so it can be unit tested, and add
  coverage for the TNIR decision matrix and for pool-key preservation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 5368f578-219b-40a6-92a9-4742b56edbe6

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>

* Address review feedback on TNIR/pool-key fix

* Fully qualify the SqlConnection crefs on ShouldDisableTnir so they match the
  form already used on IsAccessTokenProvided.

* Rename TestShouldDisableTnirWithAccessToken to
  TestShouldDisableTnirWithCallerSuppliedToken, since the parameter is
  isAccessTokenProvided and the case covers both AccessToken and
  AccessTokenCallback.

* Assign a real non-null SspiContextProvider in the pool-key test instead of
  null, via a minimal TestSspiContextProvider stub, so the test matches its name
  and exercises the setter the way callers actually do.

* Add SspiContextProviderIsPreservedInPoolKeyWhenAccessTokenStateIsSet, the
  reciprocal case: assigning a token must not drop a configured
  SspiContextProvider from the pool key. Both pool-key tests were verified to
  fail when the SqlConnection.cs fix is reverted.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 5368f578-219b-40a6-92a9-4742b56edbe6

* Make SspiContextProvider mutually exclusive with token authentication

SSPI is an alternative to token-based authentication, not a complement to
it. Previously the SspiContextProvider setter silently coexisted with
AccessToken/AccessTokenCallback, leaving the connection in an ambiguous
authentication state.

Both token setters now throw when a context provider is already set, and
the SspiContextProvider setter throws when either token property is
already set. The setters continue to pass the sibling values through when
building the ConnectionPoolKey: with the new validation those values are
guaranteed null when a non-null value is assigned, so it only matters on
the clearing path, where the remaining authentication state must survive.

Also scope the IsAccessTokenProvided remark to the call sites where the
token and callback paths are genuinely equivalent. Login feature-extension
negotiation must keep testing the fields individually because they select
different federated authentication library types (MSAL vs SecurityToken),
and the previous wording invited a cleanup that would break fedauth login.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 5368f578-219b-40a6-92a9-4742b56edbe6

* Close SspiContextProvider clone/Credential gaps and cover token detection through open

- Copy _sspiContextProvider in the SqlConnection copy constructor. Clone retains
  the source PoolGroup, so a clone previously reported no provider while its pool
  key still carried one, and would accept an AccessToken that the new
  mutual-exclusivity validation should have rejected.
- Preserve _sspiContextProvider in the Credential setter's pool key rebuild,
  removing the last property/pool-key divergence.
- Add an end-to-end regression test that opens with AccessTokenCallback against a
  simulated server signalling FEDAUTHREQUIRED, through both Open and OpenAsync.
  The server rejects a mismatched Login7 echo, so the test fails if
  IsAccessTokenProvided stops accounting for the callback.
- Record the TNIR decision LoginNoFailover actually applied so the .NET Framework
  test can assert the wiring, not just the pure ShouldDisableTnir helper.
- Extend the ShouldDisableTnir theory to cover an explicit
  TransparentNetworkIPResolution=false.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Document SspiContextProvider / access token mutual exclusivity

Setting SspiContextProvider alongside AccessToken or AccessTokenCallback
used to succeed silently and now throws InvalidOperationException, so the
public docs need to say so.

- Add an <exception> element to SspiContextProvider, which previously had
  none, covering both the new mutual-exclusivity throw and the pre-existing
  throw when the connection is already open.
- Add a remarks paragraph to SspiContextProvider explaining that SSPI is an
  alternative to token-based authentication, that the throw fires in either
  assignment order, and that assigning null clears without throwing.
- Name the new SspiContextProvider conflict in the AccessToken and
  AccessTokenCallback remarks, which previously said only "among others".

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Copilot-Session: 5368f578-219b-40a6-92a9-4742b56edbe6
---
 .../SqlConnection.xml                         |  33 ++-
 .../src/Microsoft/Data/Common/AdapterUtil.cs  |   6 +
 .../Connection/SqlConnectionInternal.cs       |  62 ++++-
 .../Microsoft/Data/SqlClient/SqlConnection.cs |  71 +++++-
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |   6 +-
 .../src/Resources/Strings.Designer.cs         |  18 ++
 .../src/Resources/Strings.resx                |   6 +
 .../SqlClient/SqlConnectionOptionsTest.cs     |  45 ++++
 .../SimulatedServerTests/ConnectionTests.cs   | 236 ++++++++++++++++++
 9 files changed, 470 insertions(+), 13 deletions(-)

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
index 55b60b6120..fbe0f653fa 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@@ -263,7 +263,13 @@ The following example creates a <xref:Microsoft.Data.SqlClient.SqlCommand> and a
         <para>
           This property is mutually exclusive with the
           <see cref="P:Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback" />
-          property, among others.
+          and
+          <see cref="P:Microsoft.Data.SqlClient.SqlConnection.SspiContextProvider" />
+          properties, among others. Setting this property when
+          <see cref="P:Microsoft.Data.SqlClient.SqlConnection.SspiContextProvider" />
+          is already set throws
+          <see cref="T:System.InvalidOperationException" />, because SSPI is an
+          alternative to token-based authentication.
         </para>
       </remarks>
     </AccessToken>
@@ -361,7 +367,13 @@ The following example creates a <xref:Microsoft.Data.SqlClient.SqlCommand> and a
         <para>
           This property is mutually exclusive with the
           <see cref="P:Microsoft.Data.SqlClient.SqlConnection.AccessToken" />
-          property, among others.
+          and
+          <see cref="P:Microsoft.Data.SqlClient.SqlConnection.SspiContextProvider" />
+          properties, among others. Setting this property when
+          <see cref="P:Microsoft.Data.SqlClient.SqlConnection.SspiContextProvider" />
+          is already set throws
+          <see cref="T:System.InvalidOperationException" />, because SSPI is an
+          alternative to token-based authentication.
         </para>
       </remarks>
     </AccessTokenCallback>
@@ -2221,10 +2233,27 @@ The following sample tries to open a connection to an invalid database to simula
       <value>
         An <see cref="T:Microsoft.Data.SqlClient.SspiContextProvider" /> instance.
       </value>
+      <exception cref="T:System.InvalidOperationException">
+        The <see cref="P:Microsoft.Data.SqlClient.SqlConnection.SspiContextProvider" />
+        is set while the
+        <see cref="P:Microsoft.Data.SqlClient.SqlConnection.AccessToken" /> or
+        <see cref="P:Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback" />
+        property is already set, or the connection is open.
+      </exception>
       <remarks>
         <para>
           The SspiContextProvider is a part of the connection pool key. Care should be taken when using this property to ensure the implementation returns a stable identity per resource.
         </para>
+        <para>
+          SSPI is an alternative to token-based authentication, so this property
+          is mutually exclusive with the
+          <see cref="P:Microsoft.Data.SqlClient.SqlConnection.AccessToken" /> and
+          <see cref="P:Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback" />
+          properties. Setting this property when either of those is already set
+          throws <see cref="T:System.InvalidOperationException" />, and setting
+          either of those while this property is set throws as well. Assigning
+          <see langword="null" /> clears the property and never throws.
+        </para>
       </remarks>
     </SspiContextProvider>
     <State>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index 1fdce82d24..e2e73b55b1 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -1487,6 +1487,12 @@ internal static Exception InvalidMixedUsageOfAccessTokenCallbackAndAuthenticatio
 
         internal static Exception InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity()
             => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity));
+
+        internal static Exception InvalidMixedUsageOfAccessTokenAndSspiContextProvider()
+            => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider));
+
+        internal static Exception InvalidMixedUsageOfSspiContextProviderAndAccessToken()
+            => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken));
         #endregion
 
         internal static readonly IntPtr s_ptrZero = IntPtr.Zero;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index e43c3ecebe..ec210e407a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -146,6 +146,42 @@ internal class SqlConnectionInternal : DbConnectionInternal, IDisposable
         // @TODO: Probably a good idea to introduce a delegate type
         internal readonly Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> _accessTokenCallback;
 
+        /// <summary>
+        /// True when the caller supplied a federated authentication access token directly, either
+        /// as a literal token via <see cref="global::Microsoft.Data.SqlClient.SqlConnection.AccessToken"/> or as a token provider
+        /// via <see cref="global::Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback"/>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Use this property wherever the only question is whether the caller supplied a token at
+        /// all, and the two paths are equivalent: the prelogin FEDAUTHREQUIRED handshake, server
+        /// certificate validation, and Transparent Network IP Resolution. Those all key off the
+        /// authentication <em>mode</em>, so treating the two paths differently would be a bug.
+        /// </para>
+        /// <para>
+        /// Do <b>not</b> use this property where the two paths diverge. Login feature-extension
+        /// negotiation must keep testing the fields individually because they select different
+        /// federated authentication library types: <c>_accessTokenCallback</c> requests
+        /// <see cref="TdsEnums.FedAuthLibrary.MSAL"/>, while <c>_accessTokenInBytes</c> requests
+        /// <see cref="TdsEnums.FedAuthLibrary.SecurityToken"/> and carries the token bytes.
+        /// </para>
+        /// </remarks>
+        internal bool IsAccessTokenProvided =>
+            _accessTokenInBytes != null || _accessTokenCallback != null;
+
+        #if NETFRAMEWORK
+        /// <summary>
+        /// The Transparent Network IP Resolution decision applied by the most recent
+        /// <see cref="LoginNoFailover"/> call, or <see langword="null"/> if login has not run.
+        /// </summary>
+        /// <remarks>
+        /// Exposed for tests. <see cref="ShouldDisableTnir"/> is pure and can be tested directly,
+        /// but that leaves the wiring, in particular that <see cref="IsAccessTokenProvided"/> is
+        /// the value fed into it, unverified. This records the decision that was actually used.
+        /// </remarks>
+        internal bool? TnirDisabledDuringLogin { get; private set; }
+        #endif
+
         // @TODO: Should be private and accessed via internal property
         // @TODO: Rename to match naming conventions
         internal bool _cleanSQLDNSCaching = false;
@@ -3189,7 +3225,10 @@ private void LoginNoFailover(
             #if NET
             bool isParallel = connectionOptions.MultiSubnetFailover;
             #else
-            bool disableTnir = ShouldDisableTnir(connectionOptions);
+            bool disableTnir = ShouldDisableTnir(
+                connectionOptions,
+                isAccessTokenProvided: IsAccessTokenProvided);
+            TnirDisabledDuringLogin = disableTnir;
             bool isParallel = connectionOptions.MultiSubnetFailover ||
                               (connectionOptions.TransparentNetworkIPResolution && !disableTnir);
             #endif
@@ -3999,12 +4038,29 @@ private void ResolveExtendedServerName(ServerInfo serverInfo, bool aliasLookup,
         }
 
         #if NETFRAMEWORK
-        private bool ShouldDisableTnir(SqlConnectionOptions connectionOptions)
+        /// <summary>
+        /// Determines whether Transparent Network IP Resolution (TNIR) should be disabled for this
+        /// connection attempt.
+        /// </summary>
+        /// <param name="connectionOptions">The parsed connection options.</param>
+        /// <param name="isAccessTokenProvided">
+        /// True when the caller supplied a federated authentication access token directly, either
+        /// via <see cref="global::Microsoft.Data.SqlClient.SqlConnection.AccessToken"/> or
+        /// <see cref="global::Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback"/>.
+        /// </param>
+        /// <returns>
+        /// True when TNIR should be disabled. TNIR is disabled by default for Azure SQL endpoints
+        /// and for federated authentication, but an explicit
+        /// <c>TransparentNetworkIPResolution</c> keyword always takes precedence.
+        /// </returns>
+        internal static bool ShouldDisableTnir(
+            SqlConnectionOptions connectionOptions,
+            bool isAccessTokenProvided)
         {
             bool isAzureEndPoint = ADP.IsAzureSqlServerEndpoint(connectionOptions.DataSource);
 
             // @TODO: Turn into a HashSet and just check the list instead of this MESS.
-            bool isFedAuthEnabled = _accessTokenInBytes != null ||
+            bool isFedAuthEnabled = isAccessTokenProvided ||
                                     #pragma warning disable 0618 // Type or member is obsolete
                                     connectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryPassword ||
                                     #pragma warning restore 0618 // Type or member is obsolete
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index c86b30525a..b8b693132e 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -262,6 +262,13 @@ private SqlConnection(SqlConnection connection)
 
             _accessToken = connection._accessToken;
             _accessTokenCallback = connection._accessTokenCallback;
+
+            // CopyFrom retains the source PoolGroup, and therefore the source ConnectionPoolKey.
+            // The provider must be copied along with it, otherwise the clone would authenticate
+            // with a provider that its public property does not report, and would let the caller
+            // set AccessToken/AccessTokenCallback without tripping the mutual-exclusivity checks.
+            _sspiContextProvider = connection._sspiContextProvider;
+
             CacheConnectionStringProperties();
         }
 
@@ -763,8 +770,16 @@ public string AccessToken
                     CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessToken(ConnectionOptions);
                 }
 
-                // Need to call ConnectionString_Set to do proper pool group check
-                ConnectionString_Set(new ConnectionPoolKey(_connectionString, credential: _credential, accessToken: value, accessTokenCallback: null, sspiContextProvider: null));
+                // Need to call ConnectionString_Set to do proper pool group check.
+                // AccessTokenCallback and SspiContextProvider are mutually exclusive with AccessToken
+                // (validated above), so they are always null here when a token is supplied. Passing the
+                // current values through matters only when the token is being cleared.
+                ConnectionString_Set(new ConnectionPoolKey(
+                    _connectionString,
+                    credential: _credential,
+                    accessToken: value,
+                    accessTokenCallback: _accessTokenCallback,
+                    sspiContextProvider: _sspiContextProvider));
                 _accessToken = value;
             }
         }
@@ -787,7 +802,12 @@ public Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticati
                     CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback(ConnectionOptions);
                 }
 
-                ConnectionString_Set(new ConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: value, sspiContextProvider: null));
+                ConnectionString_Set(new ConnectionPoolKey(
+                    _connectionString,
+                    credential: _credential,
+                    accessToken: _accessToken,
+                    accessTokenCallback: value,
+                    sspiContextProvider: _sspiContextProvider));
                 _accessTokenCallback = value;
             }
         }
@@ -804,7 +824,21 @@ public SspiContextProvider SspiContextProvider
                     throw ADP.OpenConnectionPropertySet(nameof(SspiContextProvider), InnerConnection.State);
                 }
 
-                ConnectionString_Set(new ConnectionPoolKey(_connectionString, credential: _credential, accessToken: null, accessTokenCallback: null, sspiContextProvider: value));
+                if (value != null)
+                {
+                    // SSPI is an alternative to token-based authentication, so the two are mutually exclusive.
+                    CheckAndThrowOnInvalidCombinationOfConnectionOptionAndSspiContextProvider();
+                }
+
+                // Because SSPI and token authentication are mutually exclusive (validated above), the token
+                // state is always null when a provider is supplied. Passing the current values through
+                // matters only when the provider is being cleared, where any token state must survive.
+                ConnectionString_Set(new ConnectionPoolKey(
+                    _connectionString,
+                    credential: _credential,
+                    accessToken: _accessToken,
+                    accessTokenCallback: _accessTokenCallback,
+                    sspiContextProvider: value));
                 _sspiContextProvider = value;
             }
         }
@@ -1101,7 +1135,12 @@ public SqlCredential Credential
                 _credential = value;
 
                 // Need to call ConnectionString_Set to do proper pool group check
-                ConnectionString_Set(new ConnectionPoolKey(_connectionString, _credential, accessToken: _accessToken, accessTokenCallback: _accessTokenCallback, sspiContextProvider: null));
+                ConnectionString_Set(new ConnectionPoolKey(
+                    _connectionString,
+                    _credential,
+                    accessToken: _accessToken,
+                    accessTokenCallback: _accessTokenCallback,
+                    sspiContextProvider: _sspiContextProvider));
             }
         }
 
@@ -1157,6 +1196,11 @@ private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessToken(S
             {
                 throw ADP.InvalidMixedUsageOfAccessTokenAndTokenCallback();
             }
+
+            if (_sspiContextProvider != null)
+            {
+                throw ADP.InvalidMixedUsageOfAccessTokenAndSspiContextProvider();
+            }
         }
 
         // CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCallback: check if the usage of AccessTokenCallback has any conflict
@@ -1179,6 +1223,23 @@ private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCa
             {
                 throw ADP.InvalidMixedUsageOfAccessTokenAndTokenCallback();
             }
+
+            if (_sspiContextProvider != null)
+            {
+                throw ADP.InvalidMixedUsageOfAccessTokenAndSspiContextProvider();
+            }
+        }
+
+        // CheckAndThrowOnInvalidCombinationOfConnectionOptionAndSspiContextProvider: SSPI is an alternative to
+        //  token-based authentication, so a context provider cannot be combined with AccessToken or
+        //  AccessTokenCallback. If there is any conflict, it throws InvalidOperationException.
+        //  This is to be used by the setter of the SspiContextProvider property.
+        private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndSspiContextProvider()
+        {
+            if (_accessToken != null || _accessTokenCallback != null)
+            {
+                throw ADP.InvalidMixedUsageOfSspiContextProviderAndAccessToken();
+            }
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/DbProviderFactory/*' />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index 8a4186e299..d8c904f1e0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -1179,10 +1179,10 @@ private PreLoginHandshakeStatus ConsumePreLoginHandshake(
 
                         // We must NOT use the response for the FEDAUTHREQUIRED PreLogin option, if the connection string option
                         // was not using the new Authentication keyword or in other words, if Authentication=NotSpecified
-                        // Or AccessToken is not null, mean token based authentication is used.
+                        // Or an access token was supplied (AccessToken/AccessTokenCallback), which means token-based authentication is used.
                         if ((_connHandler.ConnectionOptions != null
                             && _connHandler.ConnectionOptions.Authentication != SqlAuthenticationMethod.NotSpecified)
-                            || _connHandler._accessTokenInBytes != null || _connHandler._accessTokenCallback != null)
+                            || _connHandler.IsAccessTokenProvided)
                         {
                             fedAuthRequired = payload[payloadOffset] == 0x01 ? true : false;
                         }
@@ -1219,7 +1219,7 @@ private PreLoginHandshakeStatus ConsumePreLoginHandshake(
 
                 // Validate Certificate if Trust Server Certificate=false and Encryption forced (EncryptionOptions.ON) from Server.
                 bool shouldValidateServerCert = (_encryptionOption == EncryptionOptions.ON && !trustServerCert) ||
-                    ((_connHandler._accessTokenInBytes != null || _connHandler._accessTokenCallback != null) && !trustServerCert);
+                    (_connHandler.IsAccessTokenProvided && !trustServerCert);
 
                 uint info = (shouldValidateServerCert ? TdsEnums.SNI_SSL_VALIDATE_CERTIFICATE : 0)
                     | TdsEnums.SNI_SSL_USE_SCHANNEL_CACHE;
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index 1fadc67306..e54719f10c 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -483,6 +483,24 @@ internal static string ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSe
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set..
+        /// </summary>
+        internal static string ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider {
+            get {
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set..
+        /// </summary>
+        internal static string ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken {
+            get {
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cannot set the AccessTokenCallback property if &apos;Authentication=Active Directory Default&apos; has been specified in the connection string..
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
index bd30563594..4db82789c4 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Cannot set the AccessTokenCallback property if the 'Integrated Security' connection string keyword has been set to 'true' or 'SSPI'.</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Cannot set the AccessTokenCallback property if 'Authentication=Active Directory Default' has been specified in the connection string.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
index 8b0dddae45..11b4ed8637 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
@@ -5,6 +5,9 @@
 using System;
 using Microsoft.Data.SqlClient.Tests.Common;
 using Xunit;
+#if NETFRAMEWORK
+using SqlConnectionInternal = global::Microsoft.Data.SqlClient.Connection.SqlConnectionInternal;
+#endif
 
 namespace Microsoft.Data.SqlClient.UnitTests.Microsoft.Data.SqlClient
 {
@@ -63,6 +66,48 @@ public void TestDefaultTnir(string dataSource, bool? tnirEnabledInConnString, bo
             // Assert
             Assert.Equal(expectedValue, connectionString.TransparentNetworkIPResolution);
         }
+
+        /// <summary>
+        /// TNIR is disabled by default whenever federated authentication is in play, including when
+        /// the token is supplied directly through <c>AccessToken</c> or <c>AccessTokenCallback</c>,
+        /// unless the user explicitly specified the TNIR keyword.
+        /// </summary>
+        [Theory]
+        // Non-Azure endpoint, no explicit TNIR keyword, no token: TNIR stays enabled.
+        [InlineData("my.test.server", false, null, false)]
+        // Non-Azure endpoint, no explicit TNIR keyword, token supplied: TNIR is disabled.
+        [InlineData("my.test.server", true, null, true)]
+        // Azure endpoint always disables TNIR when the keyword is absent.
+        [InlineData("test.database.windows.net", false, null, true)]
+        [InlineData("test.database.windows.net", true, null, true)]
+        // An explicit TNIR keyword always wins, regardless of access token or endpoint. Note that
+        // this method only decides whether the default is overridden; an explicit false is honoured
+        // by the caller through SqlConnectionOptions.TransparentNetworkIPResolution itself.
+        [InlineData("my.test.server", true, true, false)]
+        [InlineData("test.database.windows.net", true, true, false)]
+        [InlineData("test.database.windows.net", false, true, false)]
+        [InlineData("my.test.server", true, false, false)]
+        [InlineData("my.test.server", false, false, false)]
+        [InlineData("test.database.windows.net", true, false, false)]
+        [InlineData("test.database.windows.net", false, false, false)]
+        public void TestShouldDisableTnirWithCallerSuppliedToken(
+            string dataSource,
+            bool isAccessTokenProvided,
+            bool? tnirInConnString,
+            bool expectedValue)
+        {
+            SqlConnectionStringBuilder builder = new() { DataSource = dataSource };
+            if (tnirInConnString.HasValue)
+            {
+                builder.TransparentNetworkIPResolution = tnirInConnString.Value;
+            }
+
+            SqlConnectionOptions connectionOptions = new(builder.ConnectionString);
+
+            Assert.Equal(
+                expectedValue,
+                SqlConnectionInternal.ShouldDisableTnir(connectionOptions, isAccessTokenProvided));
+        }
 #endif
         /// <summary>
         /// Test MSF values when set through connection string and through app context switch.
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index a082c8c7e6..f797797758 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Buffers;
 using System.Data;
 using System.Data.Common;
 using System.Diagnostics;
@@ -764,6 +765,241 @@ public void ConnectionTestAccessTokenCallbackCombinations()
             }
         }
 
+        private static Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> CreateStubCallback() =>
+            (ctx, token) => Task.FromResult(new SqlAuthenticationToken("invalid", DateTimeOffset.MaxValue));
+
+        private static async Task OpenConnection(SqlConnection connection, bool openAsync)
+        {
+            if (openAsync)
+            {
+                await connection.OpenAsync();
+            }
+            else
+            {
+                connection.Open();
+            }
+        }
+
+        /// <summary>
+        /// When the server signals FEDAUTHREQUIRED in its pre-login response, a caller-supplied
+        /// token must cause the client to honour that response and echo it back in the Login7
+        /// federated authentication feature extension. The simulated server rejects a mismatched
+        /// echo, so this fails if <c>SqlConnectionInternal.IsAccessTokenProvided</c> stops
+        /// accounting for <see cref="SqlConnection.AccessTokenCallback"/>.
+        /// </summary>
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task AccessTokenCallbackHonorsPreLoginFedAuthRequired(bool openAsync)
+        {
+            using TdsServer server = new(new TdsServerArguments()
+            {
+                FedAuthRequiredPreLoginOption = TdsPreLoginFedAuthRequiredOption.FedAuthRequired,
+            });
+            server.Start();
+
+            string connectionString = new SqlConnectionStringBuilder()
+            {
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false,
+            }.ConnectionString;
+
+            using SqlConnection connection = new(connectionString)
+            {
+                AccessTokenCallback = CreateStubCallback(),
+            };
+
+            await OpenConnection(connection, openAsync);
+
+            Assert.Equal(ConnectionState.Open, connection.State);
+
+#if NETFRAMEWORK
+            // Transparent Network IP Resolution is disabled by default whenever the caller supplies
+            // a token. Asserting on the decision LoginNoFailover actually applied covers the wiring
+            // that a direct test of ShouldDisableTnir cannot.
+            Assert.True(GetTnirDisabledDuringLogin(connection));
+
+            using SqlConnection baseline = new(connectionString);
+            await OpenConnection(baseline, openAsync);
+            Assert.False(GetTnirDisabledDuringLogin(baseline));
+
+            static bool? GetTnirDisabledDuringLogin(SqlConnection connection) =>
+                ((global::Microsoft.Data.SqlClient.Connection.SqlConnectionInternal)connection.InnerConnection)
+                    .TnirDisabledDuringLogin;
+#endif
+        }
+
+        /// <summary>
+        /// Minimal concrete <see cref="SspiContextProvider"/> so tests can assign a non-null value.
+        /// Never used to authenticate, so <see cref="GenerateContext"/> is not exercised.
+        /// </summary>
+        private sealed class TestSspiContextProvider : SspiContextProvider
+        {
+            protected override bool GenerateContext(
+                ReadOnlySpan<byte> incomingBlob,
+                IBufferWriter<byte> outgoingBlobWriter,
+                SspiAuthenticationParameters authParams)
+                => throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// <see cref="ICloneable.Clone"/> retains the source connection's pool group, and therefore
+        /// its pool key. It must copy <see cref="SqlConnection.SspiContextProvider"/> too, otherwise
+        /// the clone reports no provider while its pool key still carries one, and accepts an access
+        /// token that the mutual-exclusivity validation would have rejected.
+        /// </summary>
+        [Fact]
+        public void CloneCopiesSspiContextProvider()
+        {
+            using SqlConnection source = new("Data Source=localhost");
+            SspiContextProvider provider = new TestSspiContextProvider();
+            source.SspiContextProvider = provider;
+
+            using SqlConnection clone = (SqlConnection)((ICloneable)source).Clone();
+
+            Assert.Same(provider, clone.SspiContextProvider);
+            Assert.Same(provider, clone.PoolGroup.PoolKey.SspiContextProvider);
+            Assert.Throws<InvalidOperationException>(() => clone.AccessToken = "token");
+        }
+
+        /// <summary>
+        /// The <see cref="SqlConnection.Credential"/> setter also rebuilds the pool key, so it must
+        /// preserve <see cref="SqlConnection.SspiContextProvider"/> rather than dropping it and
+        /// leaving the property and the pool key disagreeing.
+        /// </summary>
+        [Fact]
+        public void CredentialSetterPreservesSspiContextProviderInPoolKey()
+        {
+            SecureString password = new();
+            password.MakeReadOnly();
+
+            using SqlConnection conn = new("Data Source=localhost");
+            SspiContextProvider provider = new TestSspiContextProvider();
+            conn.SspiContextProvider = provider;
+
+            conn.Credential = new SqlCredential("user", password);
+
+            Assert.Same(provider, conn.SspiContextProvider);
+            Assert.Same(provider, conn.PoolGroup.PoolKey.SspiContextProvider);
+        }
+
+        /// <summary>
+        /// SSPI is an alternative to token-based authentication, so <see cref="SqlConnection.SspiContextProvider"/>
+        /// is mutually exclusive with both <see cref="SqlConnection.AccessToken"/> and
+        /// <see cref="SqlConnection.AccessTokenCallback"/>, in either assignment order.
+        /// </summary>
+        [Fact]
+        public void SspiContextProviderAndAccessTokenStateAreMutuallyExclusive()
+        {
+            Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> callback =
+                (ctx, token) => Task.FromResult(new SqlAuthenticationToken("invalid", DateTimeOffset.MaxValue));
+
+            // Token first, then provider.
+            using (SqlConnection conn = new("Data Source=localhost"))
+            {
+                conn.AccessToken = "token";
+                Assert.Throws<InvalidOperationException>(
+                    () => conn.SspiContextProvider = new TestSspiContextProvider());
+            }
+
+            using (SqlConnection conn = new("Data Source=localhost"))
+            {
+                conn.AccessTokenCallback = callback;
+                Assert.Throws<InvalidOperationException>(
+                    () => conn.SspiContextProvider = new TestSspiContextProvider());
+            }
+
+            // Provider first, then token.
+            using (SqlConnection conn = new("Data Source=localhost"))
+            {
+                conn.SspiContextProvider = new TestSspiContextProvider();
+                Assert.Throws<InvalidOperationException>(() => conn.AccessToken = "token");
+            }
+
+            using (SqlConnection conn = new("Data Source=localhost"))
+            {
+                conn.SspiContextProvider = new TestSspiContextProvider();
+                Assert.Throws<InvalidOperationException>(() => conn.AccessTokenCallback = callback);
+            }
+        }
+
+        /// <summary>
+        /// Clearing one authentication property must not drop the others from the connection pool key.
+        /// The setters rebuild the key on every assignment, and previously hard-coded the sibling
+        /// values to null, so clearing one property silently discarded another that was still set.
+        /// </summary>
+        [Fact]
+        public void ClearingOneAuthPropertyPreservesTheOthersInPoolKey()
+        {
+            Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> callback =
+                (ctx, token) => Task.FromResult(new SqlAuthenticationToken("invalid", DateTimeOffset.MaxValue));
+
+            // Clearing the provider must not discard an access token.
+            using (SqlConnection conn = new("Data Source=localhost"))
+            {
+                conn.AccessToken = "token";
+                conn.SspiContextProvider = null;
+
+                Assert.Equal("token", conn.AccessToken);
+                Assert.Equal("token", conn.PoolGroup.PoolKey.AccessToken);
+            }
+
+            // Clearing the provider must not discard an access token callback.
+            using (SqlConnection conn = new("Data Source=localhost"))
+            {
+                conn.AccessTokenCallback = callback;
+                conn.SspiContextProvider = null;
+
+                Assert.Same(callback, conn.AccessTokenCallback);
+                Assert.Same(callback, conn.PoolGroup.PoolKey.AccessTokenCallback);
+            }
+
+            // Clearing token state must not discard a context provider.
+            using (SqlConnection conn = new("Data Source=localhost"))
+            {
+                SspiContextProvider provider = new TestSspiContextProvider();
+                conn.SspiContextProvider = provider;
+                conn.AccessToken = null;
+
+                Assert.Same(provider, conn.SspiContextProvider);
+                Assert.Same(provider, conn.PoolGroup.PoolKey.SspiContextProvider);
+            }
+
+            using (SqlConnection conn = new("Data Source=localhost"))
+            {
+                SspiContextProvider provider = new TestSspiContextProvider();
+                conn.SspiContextProvider = provider;
+                conn.AccessTokenCallback = null;
+
+                Assert.Same(provider, conn.SspiContextProvider);
+                Assert.Same(provider, conn.PoolGroup.PoolKey.SspiContextProvider);
+            }
+        }
+
+        /// <summary>
+        /// <see cref="SqlConnection.AccessToken"/> and <see cref="SqlConnection.AccessTokenCallback"/>
+        /// are mutually exclusive, so neither setter can ever clobber a live value of the other.
+        /// </summary>
+        [Fact]
+        public void AccessTokenAndAccessTokenCallbackAreMutuallyExclusive()
+        {
+            Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> callback =
+                (ctx, token) => Task.FromResult(new SqlAuthenticationToken("invalid", DateTimeOffset.MaxValue));
+
+            using (SqlConnection conn = new("Data Source=localhost"))
+            {
+                conn.AccessTokenCallback = callback;
+                Assert.Throws<InvalidOperationException>(() => conn.AccessToken = "token");
+            }
+
+            using (SqlConnection conn = new("Data Source=localhost"))
+            {
+                conn.AccessToken = "token";
+                Assert.Throws<InvalidOperationException>(() => conn.AccessTokenCallback = callback);
+            }
+        }
+
         [Theory]
         [InlineData(9, 0, 2047)] // SQL Server 2005
         [InlineData(10, 0, 2531)] // SQL Server 2008

From 5acab90b1d190ce0bc35fb50268cbf1ba4c966dc Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 21 Aug 2026 03:02:09 -0700
Subject: [PATCH 237/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4554)

Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com>
---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx  | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx     | 3 +++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx     | 3 +++
 .../src/Resources/Strings.zh-Hans.resx                         | 3 +++
 .../src/Resources/Strings.zh-Hant.resx                         | 3 +++
 13 files changed, 39 insertions(+)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index d1ef4e9294..dce0620cf0 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>Ověření podpisu sestavy enklávy se nezdařilo. Podpis sestavy neodpovídá podpisu vypočítanému pomocí kořenového certifikátu HGS. Ověřte mapování DNS pro koncový bod. Další podrobnosti najdete na https://go.microsoft.com/fwlink/?linkid=2160553. Pokud je to správně, obraťte se na oddělení služeb zákazníkům.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Sestava enklávy přijatá z SQL Server nemá správný formát. Obraťte se na služby zákaznické podpory.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index 0e537db191..5858e0fc82 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>Fehler bei der Signaturüberprüfung des Enclave-Berichts. Die Berichtssignatur stimmt nicht mit der Signatur überein, die mit dem HGS-Stammzertifikat berechnet wurde. Überprüfen Sie die DNS-Zuordnung für den Endpunkt – Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=2160553. Wenn sie korrekt ist, wenden Sie sich an den Kundensupport.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Der von SQL Server empfangene Enclavebericht weist nicht das richtige Format auf. Wenden Sie sich an den Kundensupport.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index 0fec878a2d..7f424217c3 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>Error de comprobación de firma del informe de enclave. La firma del informe no coincide con la firma calculada mediante el certificado raíz de HGS. Compruebe la asignación de DNS del punto de conexión. Vea https://go.microsoft.com/fwlink/?linkid=2160553 para más detalles. Si es correcta, póngase en contacto con el servicio de atención al cliente.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>El informe de enclave recibido desde SQL Server no tiene el formato correcto. Póngase en contacto con el servicio de atención al cliente.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index 696399ef5b..f91cd91912 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>La vérification de signature du rapport d'enclave a échoué. La signature de rapport ne correspond pas à la signature calculée à l'aide du certificat racine SGH - consultez https://go.microsoft.com/fwlink/?linkid=2160553 pour plus d’informations. Vérifiez le mappage DNS pour le point de terminaison. S'il est correct, contactez le service client.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Le rapport d'enclave envoyé par SQL Server n'a pas un format correct. Contactez le service client.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 25f2a7701e..02d373a410 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>La verifica della firma del report dell'enclave non è riuscita. La firma del report non corrisponde alla firma calcolata usando il certificato radice HGS. Verificare il mapping DNS per l'endpoint - vedere https://go.microsoft.com/fwlink/?linkid=2160553 per altri dettagli. Se è corretto, contattare il Servizio Supporto Tecnico Clienti.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Il formato del report dell'enclave ricevuto da SQL Server non è corretto. Contattare il Servizio Supporto Tecnico Clienti.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index fb05f0b8a7..4188d2741f 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>エンクレーブ レポートの署名の検証に失敗しました。レポートの署名が、HGS ルート証明書を使用して計算された署名と一致しません。エンドポイントの DNS マッピングをご確認ください。詳細については、https://go.microsoft.com/fwlink/?linkid=2160553 を参照してください。適切である場合、カスタマー サポート サービスにお問い合わせください。</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>SQL Server から受信したエンクレーブ レポートの形式が適切ではありません。カスタマー サポート サービスにお問い合わせください。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index ffeb4e23ae..f5321f4372 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>enclave 보고서의 서명을 확인하지 못했습니다. 보고서 서명이 HGS 루트 인증서를 사용하여 계산된 서명과 일치하지 않습니다. 엔드포인트에 대한 DNS 매핑을 확인하세요. 자세한 내용은 https://go.microsoft.com/fwlink/?linkid=2160553을 확인 하세요. 올바른 경우 고객 지원 서비스에 문의하세요.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>SQL Server에서 수신된 enclave 보고서의 형식이 잘못되었습니다. 고객 지원 서비스에 문의하세요.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index 560a35849a..e6f5c2cd56 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>Weryfikacja podpisu w raporcie enklawy zakończyła się niepowodzeniem. Podpis raportu jest niezgodny z podpisem obliczonym przy użyciu certyfikatu głównego usługi Ochrona hosta. Sprawdź mapowanie DNS dla punktu końcowego — zobacz https://go.microsoft.com/fwlink/?linkid=2160553, aby uzyskać więcej szczegółów. Jeśli to ustawienie jest poprawne, skontaktuj się z Działem Obsługi Klienta.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Raport enklawy odebrany z systemu SQL Server nie ma prawidłowego formatu. Skontaktuj się z Działem Obsługi Klienta.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 3eeb3cefbe..4b7cc95b81 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>A verificação da assinatura do relatório do enclave falhou. A assinatura do relatório não corresponde à assinatura calculada usando o certificado raiz HGS. Verifique o mapeamento DNS para o ponto de extremidade - consulte https://go.microsoft.com/fwlink/?linkid=2160553 para mais detalhes. Se estiver correto, entre em contato com os Serviços de Suporte ao Cliente.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>O relatório de enclave recebido do SQL Server não está no formato correto. Entre em contato com os Serviços de Atendimento ao Cliente.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 1c307da3df..8f5a5b3aee 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>Проверка подписи отчета анклава не пройдена. Подпись отчета не соответствует подписи, вычисленной с помощью корневого сертификата HGS. Проверьте сопоставление DNS для конечной точки — см. https://go.microsoft.com/fwlink/?linkid=2160553 для получения дополнительных сведений. Если оно верно, обратитесь в службу поддержки пользователей.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Полученный с SQL Server отчет анклава имеет неправильный формат. Обратитесь в службу поддержки пользователей.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index c0cbc0f800..51518869b5 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>Kapanım raporunun imza doğrulaması başarısız oldu. Rapor imzası, HGS kök sertifikası kullanılarak hesaplanan imzayla eşleşmiyor. Uç nokta için DNS eşlemesini doğrulayın - daha fazla için bkz. https://go.microsoft.com/fwlink/?linkid=2160553. Doğruysa Müşteri Destek Hizmetleri'ne başvurun.</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>SQL Server'dan alınan kapanım raporu doğru biçimde değil. Müşteri Destek Hizmetleri'ne başvurun.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index e615033f84..815e32f32a 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>无法验证 enclave 报告的签名。报告签名与使用 HGS 根证书计算出的签名不匹配。请验证终结点的 DNS 映射 - 有关 更多 详细信息，请 参阅 https://go.microsoft.com/fwlink/?linkid=2160553。如果正确，请联系客户支持服务。</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>从 SQL Server 收到的 enclave 报告的格式不正确。请联系客户支持服务。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index 91e1acec6d..d63bf45075 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -1968,6 +1968,9 @@
   <data name="VerifyEnclaveReportFailed" xml:space="preserve">
     <value>驗證記憶體保護區報表的簽章失敗。報表的簽章與使用 HGS 根憑證計算所得的簽章不符。請驗證端點的 DNS 對應 - 請參閱 https://go.microsoft.com/fwlink/?linkid=2160553 尋求 詳細 資訊。若其正確，請連絡客戶支援服務。</value>
   </data>
+  <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
+    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+  </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>從 SQL Server 收到的記憶體保護區報表的格式不正確。請連絡客戶支援服務。</value>
   </data>

From 89ceebc398a98415a0ae8ce376479335ebe34425 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 21 Aug 2026 08:53:44 -0700
Subject: [PATCH 238/298] Fix Entra ID tenant parsing for multi-segment STSURL
 authorities (#4521)

* Fix tenant parsing for multi-segment STSURL authorities

Fixes #4496

The Dataverse/Dynamics 365 TDS endpoint returns an ADAL v1 style STSURL
("https://login.microsoftonline.com/{tenantId}/oauth2/authorize") in the
FEDAUTHINFO token. AcquireTokenAsync split the authority at the last '/',
so the tenant was parsed as the literal "authorize" and the authority host
became ".../oauth2/", causing authentication to fail.

The tenant is now taken from the first path segment of the authority URL,
ignoring trailing endpoint suffixes, and the normalized authority (host +
tenant) is used for the MSAL public client application.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: b4e906c9-daf3-46f8-83e7-ef805d81fdfb

* Require an absolute HTTPS authority with a tenant

Entra ID authorities (and therefore the STSURL in FEDAUTHINFO) are always
absolute HTTPS URLs, and both MSAL's WithAuthority and Azure.Identity's
AuthorityHost require an absolute URI, so the legacy last-separator split
could never produce a working credential for anything else. Replace the
fallback with TryParseAuthority, which rejects such authorities up front
with a clear AuthenticationException instead of failing obscurely later.

Also stop re-wrapping AuthenticationException in the generic catch block.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: b4e906c9-daf3-46f8-83e7-ef805d81fdfb

* Rename authority locals and TokenCredentialKey fields for clarity

Address review feedback:

- The 'audience' local no longer held the last path segment after the
  parsing fix; it holds the tenant that is passed to Azure.Identity as
  TenantId. Rename the locals and the TokenCredentialKey fields to
  authorityHost/tenant so the names match what they carry, and refresh
  the surrounding comment accordingly.
- Add a 'consumers' placeholder case to AuthorityParsingTests, which the
  TryParseAuthority documentation already calls out.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: b4e906c9-daf3-46f8-83e7-ef805d81fdfb

* Use Uri.Segments to extract the tenant

Address review feedback: let the Uri class handle URI decomposition
instead of doing string manipulation on AbsolutePath.

Segments[0] is always the leading "/", so the tenant is Segments[1].
Segments retain their trailing separator when further segments follow,
so the value is trimmed. The non-empty check is kept to reject an empty
leading segment (e.g. "https://host//oauth2/authorize"), which would
otherwise yield an authority with no tenant; a test covers this.

Also fix a "DefaultAzureCredenial" typo in a comment touched by the
previous commit.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: b4e906c9-daf3-46f8-83e7-ef805d81fdfb

* Normalize the password cache key and cover the remaining gaps

Address review feedback:

- GetAccountPwCacheKey keyed on the raw parameters.Authority, so two
  STSURL spellings of the same tenant produced separate password-cache
  entries. It now takes the normalized authority, consistent with the
  rest of this change. The userId parameter is nullable to preserve the
  previous concatenation behavior.
- Add a test asserting AcquireTokenAsync surfaces the authority
  AuthenticationException unwrapped, so reordering the catch blocks
  can't silently regress it back to "Unexpected error". Verified the
  test fails when the pass-through catch is removed.
- Add http:// cases to the rejection theory so the HTTPS requirement is
  pinned by a test, and rename the theory accordingly.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: b4e906c9-daf3-46f8-83e7-ef805d81fdfb

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: b4e906c9-daf3-46f8-83e7-ef805d81fdfb
---
 .../ActiveDirectoryAuthenticationProvider.cs  | 176 ++++++++++++++----
 .../Azure/test/AuthorityParsingTests.cs       | 172 +++++++++++++++++
 2 files changed, 308 insertions(+), 40 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient.Extensions/Azure/test/AuthorityParsingTests.cs

diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
index 1a2e61f645..3bdce5c751 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
@@ -222,43 +222,51 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
             string[] scopes = [scope];
             TokenRequestContext tokenRequestContext = new(scopes);
 
-            // We split audience from Authority URL here. Audience can be one of
+            // We split the tenant from the Authority URL here. The tenant can be one of
             // the following:
             //
-            //   - The Entra ID authority audience enumeration
             //   - The tenant ID, which can be:
             //     - A GUID (the ID of your Entra ID instance), for
             //       single-tenant applications
             //     - A domain name associated with your Entra ID instance (also
             //       for single-tenant applications)
-            //   - One of these placeholders as a tenant ID in place of the
-            //     Entra ID authority audience enumeration:
+            //   - One of these placeholders, which select an Entra ID authority
+            //     audience instead of a specific tenant:
             //     - `organizations` for a multitenant application
             //     - `consumers` to sign in users only with their personal
             //       accounts
             //     - `common` to sign in users with their work and school
             //       accounts or their personal Microsoft accounts
             //
-            // MSAL will throw a meaningful exception if you specify both the
-            // Entra ID authority audience and the tenant ID.
-            //
-            // If you don't specify an audience, your app will target Entra ID
-            // and personal Microsoft accounts as an audience.  (That is, it
-            // will behave as though `common` were specified.)
+            // If no tenant is specified, the app targets Entra ID and personal
+            // Microsoft accounts as an audience.  (That is, it behaves as though
+            // `common` were specified.)  We always have a tenant here, because the
+            // server supplies one in the STSURL.
             //
             // More information:
             //
             //   https://docs.microsoft.com/azure/active-directory/develop/msal-client-application-configuration
+            //
+            // The authority URL provided by the server may be a bare tenant endpoint
+            // ("https://login.microsoftonline.com/{tenantId}") or an ADAL v1 style endpoint
+            // ("https://login.microsoftonline.com/{tenantId}/oauth2/authorize"), so the tenant is
+            // taken from the first path segment rather than the last.
+
+            if (!TryParseAuthority(parameters.Authority, out string authorityHost, out string tenant, out string msalAuthority))
+            {
+                throw new Extensions.Azure.AuthenticationException(
+                    parameters.AuthenticationMethod,
+                    $"The authority '{parameters.Authority}' is not a valid Entra ID authority. " +
+                    "Expected an absolute HTTPS URL containing a tenant, " +
+                    "e.g. 'https://login.microsoftonline.com/<tenant>'.");
+            }
 
-            int separatorIndex = parameters.Authority.LastIndexOf('/');
-            string authority = parameters.Authority.Remove(separatorIndex + 1);
-            string audience = parameters.Authority.Substring(separatorIndex + 1);
             string? clientId = string.IsNullOrWhiteSpace(parameters.UserId) ? null : parameters.UserId;
 
             if (parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryDefault)
             {
-                // Cache DefaultAzureCredenial based on scope, authority, audience, and clientId
-                TokenCredentialKey tokenCredentialKey = new(typeof(DefaultAzureCredential), authority, scope, audience, clientId);
+                // Cache DefaultAzureCredential based on scope, authority host, tenant, and clientId
+                TokenCredentialKey tokenCredentialKey = new(typeof(DefaultAzureCredential), authorityHost, scope, tenant, clientId);
                 AccessToken accessToken = await GetTokenAsync(tokenCredentialKey, string.Empty, tokenRequestContext, cts.Token).ConfigureAwait(false);
                 SqlClientEventSource.Log.TryTraceEvent("AcquireTokenAsync | Acquired access token for Default auth mode. Expiry Time: {0}", accessToken.ExpiresOn);
                 return new SqlAuthenticationToken(accessToken.Token, accessToken.ExpiresOn);
@@ -266,8 +274,8 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
 
             if (parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryManagedIdentity || parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryMSI)
             {
-                // Cache ManagedIdentityCredential based on scope, authority, and clientId
-                TokenCredentialKey tokenCredentialKey = new(typeof(ManagedIdentityCredential), authority, scope, string.Empty, clientId);
+                // Cache ManagedIdentityCredential based on scope, authority host, and clientId
+                TokenCredentialKey tokenCredentialKey = new(typeof(ManagedIdentityCredential), authorityHost, scope, string.Empty, clientId);
                 AccessToken accessToken = await GetTokenAsync(tokenCredentialKey, string.Empty, tokenRequestContext, cts.Token).ConfigureAwait(false);
                 SqlClientEventSource.Log.TryTraceEvent("AcquireTokenAsync | Acquired access token for Managed Identity auth mode. Expiry Time: {0}", accessToken.ExpiresOn);
                 return new SqlAuthenticationToken(accessToken.Token, accessToken.ExpiresOn);
@@ -275,8 +283,8 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
 
             if (parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryServicePrincipal)
             {
-                // Cache ClientSecretCredential based on scope, authority, audience, and clientId
-                TokenCredentialKey tokenCredentialKey = new(typeof(ClientSecretCredential), authority, scope, audience, clientId);
+                // Cache ClientSecretCredential based on scope, authority host, tenant, and clientId
+                TokenCredentialKey tokenCredentialKey = new(typeof(ClientSecretCredential), authorityHost, scope, tenant, clientId);
                 string password = parameters.Password is null ? string.Empty : parameters.Password;
                 AccessToken accessToken = await GetTokenAsync(tokenCredentialKey, password, tokenRequestContext, cts.Token).ConfigureAwait(false);
                 SqlClientEventSource.Log.TryTraceEvent("AcquireTokenAsync | Acquired access token for Active Directory Service Principal auth mode. Expiry Time: {0}", accessToken.ExpiresOn);
@@ -285,8 +293,8 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
 
             if (parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryWorkloadIdentity)
             {
-                // Cache WorkloadIdentityCredential based on authority and clientId
-                TokenCredentialKey tokenCredentialKey = new(typeof(WorkloadIdentityCredential), authority, string.Empty, string.Empty, clientId);
+                // Cache WorkloadIdentityCredential based on authority host and clientId
+                TokenCredentialKey tokenCredentialKey = new(typeof(WorkloadIdentityCredential), authorityHost, string.Empty, string.Empty, clientId);
                 // If either tenant id, client id, or the token file path are not specified when fetching the token,
                 // a CredentialUnavailableException will be thrown instead
                 AccessToken accessToken = await GetTokenAsync(tokenCredentialKey, string.Empty, tokenRequestContext, cts.Token).ConfigureAwait(false);
@@ -316,9 +324,9 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
 
             PublicClientAppKey pcaKey =
             #if NETFRAMEWORK
-                new(parameters.Authority, redirectUri, _applicationClientId, _iWin32WindowFunc);
+                new(msalAuthority, redirectUri, _applicationClientId, _iWin32WindowFunc);
             #else
-                new(parameters.Authority, redirectUri, _applicationClientId);
+                new(msalAuthority, redirectUri, _applicationClientId);
             #endif
 
             AuthenticationResult? result = null;
@@ -356,7 +364,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
             else if (parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryPassword)
             #pragma warning restore CS0618 // Type or member is obsolete
             {
-                string pwCacheKey = GetAccountPwCacheKey(parameters);
+                string pwCacheKey = GetAccountPwCacheKey(msalAuthority, parameters.UserId);
                 object? previousPw = s_accountPwCache.Get(pwCacheKey);
                 string password = parameters.Password is null ? string.Empty : parameters.Password;
                 byte[] currPwHash = GetHash(password);
@@ -435,6 +443,11 @@ previousPw is byte[] previousPwBytes &&
 
             return new SqlAuthenticationToken(result.AccessToken, result.ExpiresOn);
         }
+        catch (Extensions.Azure.AuthenticationException)
+        {
+            // Already shaped for the caller; don't re-wrap it below.
+            throw;
+        }
         catch (MsalException ex)
         {
             // Check for an explicitly retryable error.
@@ -533,6 +546,70 @@ or AuthenticationRequiredException
         }
     }
 
+    /// <summary>
+    /// Splits an Entra ID authority URL (the STSURL provided by the server in the FEDAUTHINFO TDS
+    /// token) into the authority host and the tenant.
+    /// </summary>
+    /// <param name="authorityUrl">
+    /// The authority URL, e.g. <c>https://login.microsoftonline.com/{tenantId}</c>. Some services
+    /// (for example the Dataverse/Dynamics 365 TDS endpoint) return an ADAL v1 style URL such as
+    /// <c>https://login.microsoftonline.com/{tenantId}/oauth2/authorize</c>.
+    /// </param>
+    /// <param name="authorityHost">
+    /// Receives the authority host with a trailing slash, e.g. <c>https://login.microsoftonline.com/</c>.
+    /// </param>
+    /// <param name="tenant">
+    /// Receives the tenant (the first path segment of the authority URL), which may be a tenant id,
+    /// a domain name, or one of the <c>common</c>/<c>organizations</c>/<c>consumers</c> placeholders.
+    /// </param>
+    /// <param name="msalAuthority">
+    /// Receives the normalized authority (host + tenant) suitable for MSAL's <c>WithAuthority</c>.
+    /// </param>
+    /// <returns>
+    /// <c>true</c> if the authority URL is a well-formed, absolute HTTPS URL carrying a tenant
+    /// segment; otherwise <c>false</c>.
+    /// </returns>
+    /// <remarks>
+    /// <para>
+    /// The tenant is taken from the first path segment rather than the last so that trailing
+    /// endpoint suffixes (<c>/oauth2/authorize</c>, <c>/oauth2/v2.0/token</c>, etc.) are ignored.
+    /// </para>
+    /// <para>
+    /// Entra ID authorities are always absolute HTTPS URLs, so anything else is rejected rather
+    /// than guessed at. Both MSAL (<c>WithAuthority</c>) and Azure.Identity
+    /// (<c>TokenCredentialOptions.AuthorityHost</c>) require an absolute URI as well, so an
+    /// unparseable authority cannot produce a working credential.
+    /// </para>
+    /// </remarks>
+    internal static bool TryParseAuthority(
+        string authorityUrl,
+        out string authorityHost,
+        out string tenant,
+        out string msalAuthority)
+    {
+        if (Uri.TryCreate(authorityUrl, UriKind.Absolute, out Uri? uri) &&
+            uri.Scheme == Uri.UriSchemeHttps &&
+            uri.Segments.Length > 1)
+        {
+            // Segments[0] is always the leading "/", so the tenant is Segments[1]. Each segment
+            // keeps its trailing separator when further segments follow, e.g. the segments of
+            // "/{tenant}/oauth2/authorize" are [ "/", "{tenant}/", "oauth2/", "authorize" ].
+            tenant = uri.Segments[1].TrimEnd('/');
+
+            if (tenant.Length > 0)
+            {
+                authorityHost = uri.GetLeftPart(UriPartial.Authority) + "/";
+                msalAuthority = authorityHost + tenant;
+                return true;
+            }
+        }
+
+        authorityHost = string.Empty;
+        tenant = string.Empty;
+        msalAuthority = string.Empty;
+        return false;
+    }
+
     private static async Task<AuthenticationResult?> TryAcquireTokenSilent(IPublicClientApplication app, SqlAuthenticationParameters parameters,
         string[] scopes, CancellationTokenSource cts)
     {
@@ -760,9 +837,18 @@ private static async Task<AccessToken> GetTokenAsync(TokenCredentialKey tokenCre
         return await tokenCredentialInstance._tokenCredential.GetTokenAsync(tokenRequestContext, cancellationToken);
     }
 
-    private static string GetAccountPwCacheKey(SqlAuthenticationParameters parameters)
+    /// <summary>
+    /// Builds the cache key used to remember which password was last validated for an account.
+    /// </summary>
+    /// <param name="msalAuthority">
+    /// The normalized authority (host + tenant) from <see cref="TryParseAuthority"/>. The
+    /// normalized form is used so that two spellings of the same tenant (for example a bare
+    /// tenant endpoint and an OAuth v1 <c>/oauth2/authorize</c> endpoint) share a single entry.
+    /// </param>
+    /// <param name="userId">The user id being authenticated, which may be null.</param>
+    private static string GetAccountPwCacheKey(string msalAuthority, string? userId)
     {
-        return parameters.Authority + "+" + parameters.UserId;
+        return msalAuthority + "+" + userId;
     }
 
     private static byte[] GetHash(string input)
@@ -864,8 +950,8 @@ private static TokenCredentialData CreateTokenCredentialInstance(TokenCredential
         {
             DefaultAzureCredentialOptions defaultAzureCredentialOptions = new()
             {
-                AuthorityHost = new Uri(tokenCredentialKey._authority),
-                TenantId = tokenCredentialKey._audience,
+                AuthorityHost = new Uri(tokenCredentialKey._authorityHost),
+                TenantId = tokenCredentialKey._tenant,
                 ExcludeInteractiveBrowserCredential = true // Force disabled, even though it's disabled by default to respect driver specifications.
             };
 
@@ -909,23 +995,23 @@ private static TokenCredentialData CreateTokenCredentialInstance(TokenCredential
                 : ManagedIdentityId.FromUserAssignedClientId(tokenCredentialKey._clientId);
             ManagedIdentityCredentialOptions managedIdentityCredentialOptions = new(managedIdentityId)
             {
-                AuthorityHost = new Uri(tokenCredentialKey._authority)
+                AuthorityHost = new Uri(tokenCredentialKey._authorityHost)
             };
 
             return new TokenCredentialData(new ManagedIdentityCredential(managedIdentityCredentialOptions), GetHash(secret));
         }
         else if (tokenCredentialKey._tokenCredentialType == typeof(ClientSecretCredential))
         {
-            TokenCredentialOptions tokenCredentialOptions = new() { AuthorityHost = new Uri(tokenCredentialKey._authority) };
+            TokenCredentialOptions tokenCredentialOptions = new() { AuthorityHost = new Uri(tokenCredentialKey._authorityHost) };
 
-            return new TokenCredentialData(new ClientSecretCredential(tokenCredentialKey._audience, tokenCredentialKey._clientId, secret, tokenCredentialOptions), GetHash(secret));
+            return new TokenCredentialData(new ClientSecretCredential(tokenCredentialKey._tenant, tokenCredentialKey._clientId, secret, tokenCredentialOptions), GetHash(secret));
         }
         else if (tokenCredentialKey._tokenCredentialType == typeof(WorkloadIdentityCredential))
         {
             // The WorkloadIdentityCredentialOptions object initialization populates its instance members
             // from the environment variables AZURE_TENANT_ID, AZURE_CLIENT_ID, AZURE_FEDERATED_TOKEN_FILE,
             // and AZURE_ADDITIONALLY_ALLOWED_TENANTS. AZURE_CLIENT_ID may be overridden by the User Id.
-            WorkloadIdentityCredentialOptions options = new() { AuthorityHost = new Uri(tokenCredentialKey._authority) };
+            WorkloadIdentityCredentialOptions options = new() { AuthorityHost = new Uri(tokenCredentialKey._authorityHost) };
 
             if (tokenCredentialKey._clientId is not null)
             {
@@ -1005,17 +1091,27 @@ public TokenCredentialData(TokenCredential tokenCredential, byte[] secretHash)
     internal class TokenCredentialKey
     {
         public readonly Type _tokenCredentialType;
-        public readonly string _authority;
+
+        /// <summary>The authority host with a trailing slash, e.g. "https://login.microsoftonline.com/".</summary>
+        public readonly string _authorityHost;
+
         public readonly string _scope;
-        public readonly string _audience;
+
+        /// <summary>
+        /// The tenant, which may be a tenant id, a domain name, or one of the
+        /// `common` / `organizations` / `consumers` placeholders. Empty when the credential
+        /// type doesn't take a tenant.
+        /// </summary>
+        public readonly string _tenant;
+
         public readonly string? _clientId;
 
-        public TokenCredentialKey(Type tokenCredentialType, string authority, string scope, string audience, string? clientId)
+        public TokenCredentialKey(Type tokenCredentialType, string authorityHost, string scope, string tenant, string? clientId)
         {
             _tokenCredentialType = tokenCredentialType;
-            _authority = authority;
+            _authorityHost = authorityHost;
             _scope = scope;
-            _audience = audience;
+            _tenant = tenant;
             _clientId = clientId;
         }
 
@@ -1024,15 +1120,15 @@ public override bool Equals(object? obj)
             if (obj != null && obj is TokenCredentialKey tcKey)
             {
                 return _tokenCredentialType == tcKey._tokenCredentialType
-                    && string.CompareOrdinal(_authority, tcKey._authority) == 0
+                    && string.CompareOrdinal(_authorityHost, tcKey._authorityHost) == 0
                     && string.CompareOrdinal(_scope, tcKey._scope) == 0
-                    && string.CompareOrdinal(_audience, tcKey._audience) == 0
+                    && string.CompareOrdinal(_tenant, tcKey._tenant) == 0
                     && string.CompareOrdinal(_clientId, tcKey._clientId) == 0
                 ;
             }
             return false;
         }
 
-        public override int GetHashCode() => Tuple.Create(_tokenCredentialType, _authority, _scope, _audience, _clientId).GetHashCode();
+        public override int GetHashCode() => Tuple.Create(_tokenCredentialType, _authorityHost, _scope, _tenant, _clientId).GetHashCode();
     }
 }
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AuthorityParsingTests.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AuthorityParsingTests.cs
new file mode 100644
index 0000000000..cbbd56e3d1
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AuthorityParsingTests.cs
@@ -0,0 +1,172 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Extensions.Azure.Test;
+
+/// <summary>
+/// Tests for splitting the STSURL supplied by the server in the FEDAUTHINFO TDS token into an
+/// authority host and a tenant.
+/// </summary>
+/// <remarks>
+/// The cases below only cover authority shapes that Entra ID actually documents:
+/// https://learn.microsoft.com/entra/identity-platform/authentication-national-cloud
+/// </remarks>
+public class AuthorityParsingTests
+{
+    private const string Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
+
+    public static TheoryData<string, string, string, string> AuthorityData => new()
+    {
+        // Azure SQL / Fabric style authority.
+        {
+            $"https://login.microsoftonline.com/{Tenant}",
+            "https://login.microsoftonline.com/",
+            Tenant,
+            $"https://login.microsoftonline.com/{Tenant}"
+        },
+        // Trailing slash.
+        {
+            $"https://login.microsoftonline.com/{Tenant}/",
+            "https://login.microsoftonline.com/",
+            Tenant,
+            $"https://login.microsoftonline.com/{Tenant}"
+        },
+        // v1.0 authorize endpoint, as returned by the Dataverse / Dynamics 365 TDS endpoint.
+        {
+            $"https://login.microsoftonline.com/{Tenant}/oauth2/authorize",
+            "https://login.microsoftonline.com/",
+            Tenant,
+            $"https://login.microsoftonline.com/{Tenant}"
+        },
+        // v2.0 token endpoint.
+        {
+            $"https://login.microsoftonline.com/{Tenant}/oauth2/v2.0/token",
+            "https://login.microsoftonline.com/",
+            Tenant,
+            $"https://login.microsoftonline.com/{Tenant}"
+        },
+        // US Government cloud.
+        {
+            $"https://login.microsoftonline.us/{Tenant}/oauth2/authorize",
+            "https://login.microsoftonline.us/",
+            Tenant,
+            $"https://login.microsoftonline.us/{Tenant}"
+        },
+        // Microsoft Azure operated by 21Vianet.
+        {
+            $"https://login.partner.microsoftonline.cn/{Tenant}",
+            "https://login.partner.microsoftonline.cn/",
+            Tenant,
+            $"https://login.partner.microsoftonline.cn/{Tenant}"
+        },
+        // Domain-name tenant.
+        {
+            "https://login.microsoftonline.com/contoso.onmicrosoft.com",
+            "https://login.microsoftonline.com/",
+            "contoso.onmicrosoft.com",
+            "https://login.microsoftonline.com/contoso.onmicrosoft.com"
+        },
+        // Placeholder tenant.
+        {
+            "https://login.microsoftonline.com/common/oauth2/authorize",
+            "https://login.microsoftonline.com/",
+            "common",
+            "https://login.microsoftonline.com/common"
+        },
+        {
+            "https://login.microsoftonline.com/organizations",
+            "https://login.microsoftonline.com/",
+            "organizations",
+            "https://login.microsoftonline.com/organizations"
+        },
+        {
+            "https://login.microsoftonline.com/consumers",
+            "https://login.microsoftonline.com/",
+            "consumers",
+            "https://login.microsoftonline.com/consumers"
+        },
+    };
+
+    [Theory]
+    [MemberData(nameof(AuthorityData))]
+    public void TryParseAuthority_SplitsHostAndTenant(
+        string authorityUrl,
+        string expectedHost,
+        string expectedTenant,
+        string expectedMsalAuthority)
+    {
+        Assert.True(ActiveDirectoryAuthenticationProvider.TryParseAuthority(
+            authorityUrl,
+            out string host,
+            out string tenant,
+            out string msalAuthority));
+
+        Assert.Equal(expectedHost, host);
+        Assert.Equal(expectedTenant, tenant);
+        Assert.Equal(expectedMsalAuthority, msalAuthority);
+    }
+
+    [Theory]
+    // A tenant is required; an authority without one cannot yield a usable credential.
+    [InlineData("https://login.microsoftonline.com")]
+    [InlineData("https://login.microsoftonline.com/")]
+    // An empty leading path segment leaves no tenant to authenticate against.
+    [InlineData("https://login.microsoftonline.com//oauth2/authorize")]
+    // Entra ID authorities are always HTTPS; other schemes are rejected.
+    [InlineData("http://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47")]
+    [InlineData("http://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/authorize")]
+    // The server may omit the STSURL entirely.
+    [InlineData("")]
+    public void TryParseAuthority_RejectsInvalidAuthority(string authorityUrl)
+    {
+        Assert.False(ActiveDirectoryAuthenticationProvider.TryParseAuthority(
+            authorityUrl,
+            out string host,
+            out string tenant,
+            out string msalAuthority));
+
+        Assert.Equal(string.Empty, host);
+        Assert.Equal(string.Empty, tenant);
+        Assert.Equal(string.Empty, msalAuthority);
+    }
+
+    /// <summary>
+    /// A malformed authority must surface as an <see cref="AuthenticationException"/> describing
+    /// the bad authority, rather than being re-wrapped as "Unexpected error" by the catch-all in
+    /// <c>AcquireTokenAsync</c>. This pins the ordering of the catch blocks.
+    /// </summary>
+    [Theory]
+    [InlineData(SqlAuthenticationMethod.ActiveDirectoryServicePrincipal)]
+    [InlineData(SqlAuthenticationMethod.ActiveDirectoryDefault)]
+    [InlineData(SqlAuthenticationMethod.ActiveDirectoryManagedIdentity)]
+    [InlineData(SqlAuthenticationMethod.ActiveDirectoryWorkloadIdentity)]
+    [InlineData(SqlAuthenticationMethod.ActiveDirectoryInteractive)]
+    public async Task AcquireTokenAsync_MalformedAuthority_ThrowsUnwrappedAuthenticationException(
+        SqlAuthenticationMethod method)
+    {
+        // No tenant, so the authority can't be parsed. The provider must fail before it attempts
+        // any network call, so this test needs no live endpoint.
+        const string BadAuthority = "https://login.microsoftonline.com/";
+
+        SqlAuthenticationParameters parameters = new(
+            authenticationMethod: method,
+            serverName: "test-server",
+            databaseName: "test-database",
+            resource: "https://database.windows.net/",
+            authority: BadAuthority,
+            userId: "test-user",
+            password: "test-password",
+            connectionId: Guid.NewGuid(),
+            connectionTimeout: 30);
+
+        ActiveDirectoryAuthenticationProvider provider = new();
+
+        AuthenticationException ex = await Assert.ThrowsAsync<AuthenticationException>(
+            () => provider.AcquireTokenAsync(parameters));
+
+        // The message identifies the offending authority, and is not the generic catch-all text.
+        Assert.Contains(BadAuthority, ex.Message, StringComparison.Ordinal);
+        Assert.DoesNotContain("Unexpected error", ex.Message, StringComparison.Ordinal);
+    }
+}

From 2787d94903da283faea2115d02ceb9237767ade2 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 21 Aug 2026 10:03:39 -0700
Subject: [PATCH 239/298] Implement async APIs in Always Encrypted Azure Key
 Vault provider (#4540)

* Implement async APIs in Azure Key Vault key store provider

Overrides the four async SqlColumnEncryptionKeyStoreProvider APIs in
SqlColumnEncryptionAzureKeyVaultProvider with truly asynchronous Azure Key
Vault SDK calls, so Always Encrypted async paths no longer block on HTTP I/O
(issue #3672, spec phase 2A).

- AzureSqlKeyCryptographer: async counterparts for AddKey, SignData,
  VerifyData, WrapKey and UnwrapKey, all propagating a CancellationToken.
  AddKeyAsync fetches before locking so no lock is held during network I/O.
- LocalCache: GetOrCreateAsync with an async factory, mirroring sync semantics
  (TTL bypass, compaction, expiration) without holding a lock during I/O.
- SqlColumnEncryptionAzureKeyVaultProvider: async overrides for encrypt,
  decrypt, sign and verify. Blob parse/build logic extracted into shared
  helpers so sync and async paths stay identical. Sync behavior is unchanged.
- AsyncEventScope: reference-type event scope, since SqlClientEventScope is a
  ref struct and cannot cross an await boundary.
- Tests: async round-trip, sync/async interoperability, cache behavior,
  cancellation and argument validation coverage in the AKV manual tests.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Drop AsyncEventScope in favor of scope id tracking

The reference-type scope wrapper only existed because SqlClientEventScope is a
ref struct. Tracking the scope id in a try/finally achieves the same tracing
without a new type or an allocation per async call.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Align async AKV provider behavior with the sync path

Addresses review feedback on sync/async behavioral parity:

- LocalCache.GetOrCreateAsync now gates concurrent misses per key, so a burst
  of concurrent decryptions of the same key issues a single Azure Key Vault
  request instead of one per caller. Misses for different keys still proceed
  in parallel, cancellation stays per caller, and a failed or cancelled owner
  lets the next waiter retry with its own token.
- AzureSqlKeyCryptographer.AddKeyAsync double-checks under the semaphore and
  fetches while holding it, mirroring the deduplication of AddKey. Previously
  the semaphore only guarded a ConcurrentDictionary write, and a token
  cancelled mid-flight discarded an already fetched key.
- LocalCache.GetOrCreate compacts on Count >= maxSize rather than ==, so a
  count that overshoots the limit cannot disable compaction permanently.
- The async overrides observe the cancellation token before validating
  arguments, matching SqlColumnEncryptionKeyStoreProvider.
- Documented that async argument validation failures surface through the
  returned task rather than being thrown synchronously.
- Tests for concurrent decryption deduplication and for cancellation taking
  precedence over argument validation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Fix thread blocking and gate leak in async AKV provider paths

Follow-up to the async provider work, addressing defects found while auditing
it for performance and compatibility problems.

AddKeyAsync held _keyDictionarySemaphore across the awaited Azure Key Vault
fetch. That semaphore is shared with the synchronous AddKey, so a synchronous
caller blocked a thread pool thread for the duration of an asynchronous network
round trip, which risks thread pool starvation. The semaphore is also global, so
fetching one key serialized fetching every other key. The asynchronous path now
uses its own per key gate and leaves the synchronous path on its original
semaphore. A synchronous and an asynchronous caller may both fetch the same key,
which yields an identical result, and this matches the deliberate absence of
cross path deduplication in LocalCache.

LocalCache.GetOrCreateAsync published its gate before awaiting it, and the
try/finally that removed the gate began after the await. A cancelled wait
therefore left the gate behind permanently, and the gate dictionary is not
bounded by the cache size limit. A loop of a thousand pre-cancelled calls on
distinct keys retained a thousand gates. The gate lifetime is now managed by
KeyedAsyncLock, which removes the gate when a wait is abandoned and cleans up
through a disposable releaser.

The per key gating logic now lives in KeyedAsyncLock rather than being repeated,
so the release and cleanup ordering is defined in one place.

GetCryptographyClient used TryGetValue followed by TryAdd, so concurrent callers
could each use a different CryptographyClient instance for the same key. It now
uses GetOrAdd, and all callers observe the instance that wins the race.

Also documents that gating is bypassed when caching is disabled, and adds a
regression test asserting that cancelled asynchronous decryptions do not
accumulate creation gates.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Remove duplicated and unreachable code in AKV provider

EncryptColumnEncryptionKeyAsync repeated the body of ValidateSignature inline,
including both of its trace messages, so a change to one would have silently
diverged from the other. The logic now lives in ValidateSignatureAsync next to
its synchronous counterpart.

ParseEncryptedColumnEncryptionKey carried a null check on a buffer that had just
been allocated with new byte[], which no execution can reach. The check moved
into the helper when the parsing logic was extracted, and is now dropped.
ADP.NullHashFound is left in place because removing it would also strip the
associated resource string for no functional gain.

Neither change alters behavior. Comparing every statement of the original
synchronous encrypt and decrypt paths against the current file confirms all of
them are preserved except the unreachable null check and a dead store to a
position variable that was never read after its final update.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Make the gate cleanup test meaningful and cover async sign and verify

CancelledAsyncDecryptionsDoNotAccumulateCreationGates cancelled its token before
calling DecryptColumnEncryptionKeyAsync. Cancellation is observed before the
cache is reached, so no gate was ever created and the assertion held trivially.
The test now has one caller take the gate and hold it across the key vault round
trip while other callers queue behind it and are cancelled while waiting, which
is the path where an abandoned wait could strand a gate.

ExceptionTestAKVStore covered argument validation for the asynchronous encrypt
and decrypt members only. Adds the same coverage for the asynchronous sign and
verify members, mirroring the existing SignInvalidAKVPath cases.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Validate signature argument in sync and async verify paths

VerifyColumnMasterKeyMetadata and VerifyColumnMasterKeyMetadataAsync now reject
a null or empty signature with ArgumentNullException/ArgumentException instead of
deferring the failure to the Azure Key Vault SDK. Both overloads validate
identically so the sync and async surfaces stay in parity.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: ff71f86b-9c50-45f7-b79f-5aaaf7f98289

* Document best-effort deduplication and make releaser disposal idempotent

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Add unit test project for the AKV provider covering KeyedAsyncLock

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Expose provider internals to tests only in unsigned builds

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Target net10.0 in the AKV provider test project

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: ff71f86b-9c50-45f7-b79f-5aaaf7f98289
---
 BUILDGUIDE.md                                 |   1 +
 build.proj                                    |  49 ++-
 eng/pipelines/pr/stages/test-stages.yml       |  15 +
 .../src/AzureSqlKeyCryptographer.cs           | 150 ++++++-
 .../src/KeyedAsyncLock.cs                     | 126 ++++++
 .../src/LocalCache.cs                         |  80 +++-
 ...waysEncrypted.AzureKeyVaultProvider.csproj |  11 +
 ...qlColumnEncryptionAzureKeyVaultProvider.cs | 402 +++++++++++++++---
 .../test/Directory.Packages.props             |  11 +
 .../test/KeyedAsyncLockTest.cs                | 291 +++++++++++++
 ...ncrypted.AzureKeyVaultProvider.Test.csproj |  49 +++
 src/Microsoft.Data.SqlClient.slnx             |   1 +
 .../AlwaysEncrypted/AKVUnitTests.cs           | 252 +++++++++++
 .../AlwaysEncrypted/ExceptionTestAKVStore.cs  | 105 +++++
 14 files changed, 1475 insertions(+), 68 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/KeyedAsyncLock.cs
 create mode 100644 src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/Directory.Packages.props
 create mode 100644 src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/KeyedAsyncLockTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.Test.csproj

diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 11787304b5..341c9b0661 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -157,6 +157,7 @@ dotnet build -t:<test_target> [optional_parameters]
 |----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------|
 | `Test`                     | Runs all tests in the repository for all platforms supported by the host OS. _This will take a considerable amount of time and is not recommended_. |
 | `TestAbstractions`         | Runs all tests for Microsoft.Data.SqlClient.Extensions.Abstractions                                                                                 |
+| `TestAkvProvider`          | Runs the unit test project for Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.                                                      |
 | `TestAzure`                | Runs all tests for Microsoft.Data.SqlClient.Extensions.Azure                                                                                        |
 | `TestSqlClient`            | Runs all tests for Microsoft.Data.SqlClient.                                                                                                        |
 | `TestSqlClientFunctional`  | Runs the "functional" test project for Microsoft.Data.SqlClient. These are a mix of unit and integration tests against live servers.                |
diff --git a/build.proj b/build.proj
index 9883656f50..3eb78ec047 100644
--- a/build.proj
+++ b/build.proj
@@ -399,7 +399,7 @@
     environments. Please consider running project specific test targets or specific test sets within
     the project.
   -->
-  <Target Name="Test" DependsOnTargets="TestAbstractions;TestAzure;TestSqlClient" />
+  <Target Name="Test" DependsOnTargets="TestAbstractions;TestAzure;TestAkvProvider;TestSqlClient" />
 
   <!-- ================================================================= -->
   <!-- Microsoft.Data.SqlClient Targets -->
@@ -736,6 +736,7 @@
   <PropertyGroup>
     <AkvProviderSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/</AkvProviderSrcRoot>
     <AkvProviderProjectPath>$(AkvProviderSrcRoot)src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj</AkvProviderProjectPath>
+    <AkvProviderTestProjectPath>$(AkvProviderSrcRoot)test/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.Test.csproj</AkvProviderTestProjectPath>
     <AkvProviderArtifactRoot>$(RepoRoot)artifacts/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/$(Configuration)/</AkvProviderArtifactRoot>
   </PropertyGroup>
 
@@ -806,9 +807,37 @@
       SkipUnchangedFiles="true" />
   </Target>
 
+  <!-- TestAkvProvider: Runs Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider unit tests -->
+  <Target Name="TestAkvProvider">
+    <PropertyGroup>
+      <!--
+        Note: These tests exclusively use project references, so neither ReferenceType nor any
+        package version arguments are specified in this command.
+      -->
+      <LogFilePrefix>AkvProviderTests-$(OS)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
+
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" test "$(AkvProviderTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(TestBlameArgument)
+        $(TestCodeCoverageArgument)
+        $(TestFiltersArgument)
+        $(TestFrameworkArgument)
+        --results-directory "$(TestResultsFolderPath)"
+        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Importance="High" Text=">>> Running tests for AKV Provider"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
   <!-- ================================================================= -->
   <!-- Microsoft.Data.SqlClient.Extensions.Abstractions Targets -->
-
   <PropertyGroup>
     <AbstractionsSrcRoot>$(RepoRoot)src/Microsoft.Data.SqlClient.Extensions/Abstractions/</AbstractionsSrcRoot>
     <AbstractionsProjectPath>$(AbstractionsSrcRoot)src/Abstractions.csproj</AbstractionsProjectPath>
@@ -1152,7 +1181,21 @@
   </PropertyGroup>
 
   <!-- BuildTests: Builds all test projects for all supported OS combinations. -->
-  <Target Name="BuildTests" DependsOnTargets="BuildAbstractionsTests;BuildSqlClientTestsUnit;BuildSqlClientTestsFunctional;BuildSqlClientTestsManual;BuildSqlClientTestsPerformance;BuildSqlClientTestsStress;BuildAzureTests" />
+  <Target Name="BuildTests" DependsOnTargets="BuildAbstractionsTests;BuildAkvProviderTests;BuildSqlClientTestsUnit;BuildSqlClientTestsFunctional;BuildSqlClientTestsManual;BuildSqlClientTestsPerformance;BuildSqlClientTestsStress;BuildAzureTests" />
+
+  <!-- BuildAkvProviderTests: Builds the AKV Provider test project (OS-agnostic). -->
+  <Target Name="BuildAkvProviderTests">
+    <PropertyGroup>
+      <DotnetCommand>
+        "$(DotnetPath)dotnet" build "$(AkvProviderTestProjectPath)"
+        -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text=">>> Building AKV Provider Tests"/>
+    <Message Text="    Command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
 
   <!-- BuildAbstractionsTests: Builds the Abstractions test project (OS-agnostic). -->
   <Target Name="BuildAbstractionsTests">
diff --git a/eng/pipelines/pr/stages/test-stages.yml b/eng/pipelines/pr/stages/test-stages.yml
index f28bf6b9e9..0ad9921ec6 100644
--- a/eng/pipelines/pr/stages/test-stages.yml
+++ b/eng/pipelines/pr/stages/test-stages.yml
@@ -155,6 +155,21 @@ stages:
               packageShortName: "Azure"
               testDisplayName: "azure"
 
+          # TestAkvProvider
+          - template: /eng/pipelines/pr/jobs/test-buildproj-job.yml@self
+            parameters:
+              buildConfiguration: ${{ parameters.buildConfiguration }}
+              buildSuffix: ${{ parameters.buildSuffix }}
+              dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+              platformDisplayName: ${{ platform.displayName }}
+              platformDotnet: ${{ platform.dotnet }}
+              platformImage: ${{ platform.image }}
+              poolName: ${{ parameters.poolName }}
+              testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
+
+              packageShortName: "AkvProvider"
+              testDisplayName: "akvprovider"
+
           # TestSqlClientFunctional
           - template: /eng/pipelines/pr/jobs/test-buildproj-job.yml@self
             parameters:
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/AzureSqlKeyCryptographer.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/AzureSqlKeyCryptographer.cs
index 5f1182fb63..758ebb45a1 100644
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/AzureSqlKeyCryptographer.cs
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/AzureSqlKeyCryptographer.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
+using System.Threading.Tasks;
 using static Azure.Security.KeyVault.Keys.Cryptography.SignatureAlgorithm;
 using Microsoft.Data.SqlClient.Internal;
 
@@ -32,9 +33,17 @@ internal sealed class AzureSqlKeyCryptographer : IDisposable
 
         /// <summary>
         /// SemaphoreSlim to ensure thread safety when accessing the key dictionary or making network calls to Azure Key Vault to fetch keys.
+        /// Used by the synchronous path only. The asynchronous path uses <see cref="_keyFetchLock"/> so that a synchronous caller
+        /// never blocks a thread waiting on an asynchronous, network bound fetch.
         /// </summary>
         private SemaphoreSlim _keyDictionarySemaphore = new(1, 1);
 
+        /// <summary>
+        /// Gates concurrent asynchronous fetches of the same key, so that only one caller retrieves a given key from
+        /// Azure Key Vault. Fetches of different keys are not serialized against one another.
+        /// </summary>
+        private readonly KeyedAsyncLock<string> _keyFetchLock = new();
+
         /// <summary>
         /// Holds references to the Azure Key Vault CryptographyClient objects and maps them to their corresponding Azure Key Vault Key Identifier (URI).
         /// </summary>
@@ -89,6 +98,47 @@ internal void AddKey(string keyIdentifierUri)
             }
         }
 
+        /// <summary>
+        /// Asynchronously adds the key, specified by the Key Identifier URI, to the cache.
+        /// Validates the key type and fetches the key from Azure Key Vault if it is not already cached.
+        /// </summary>
+        /// <param name="keyIdentifierUri">The key vault key identifier URI</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        /// <remarks>
+        /// Mirrors the deduplication of the synchronous path: only one caller fetches a given key from Azure Key Vault.
+        /// The gate is per key and is only ever awaited, so no thread is blocked while a fetch is in flight and fetches of
+        /// different keys proceed in parallel. The gate is deliberately not shared with the synchronous path, because a
+        /// synchronous caller blocking on a gate held across an awaited network call would consume a thread pool thread for
+        /// the duration of that call. A synchronous and an asynchronous caller may therefore both fetch the same key; the
+        /// result is identical and the last write wins.
+        /// </remarks>
+        internal async Task AddKeyAsync(string keyIdentifierUri, CancellationToken cancellationToken = default)
+        {
+            if (_keyDictionary.ContainsKey(keyIdentifierUri))
+            {
+                return;
+            }
+
+            using (await _keyFetchLock.AcquireAsync(keyIdentifierUri, cancellationToken).ConfigureAwait(false))
+            {
+                // Another caller may have fetched the key while this one waited for the gate.
+                if (_keyDictionary.ContainsKey(keyIdentifierUri))
+                {
+                    return;
+                }
+
+                ParseAKVPath(keyIdentifierUri, out Uri vaultUri, out string keyName, out string keyVersion);
+
+                // Fetch the KeyClient for the Key vault URI.
+                KeyClient keyClient = GetOrCreateKeyClient(vaultUri);
+
+                // Fetch the key from Azure Key Vault.
+                KeyVaultKey key = await FetchKeyFromKeyVaultAsync(keyClient, keyName, keyVersion, cancellationToken).ConfigureAwait(false);
+
+                _keyDictionary.AddOrUpdate(keyIdentifierUri, key, (k, v) => key);
+            }
+        }
+
         /// <summary>
         /// Returns the key specified by the Key Identifier URI
         /// </summary>
@@ -133,6 +183,34 @@ internal bool VerifyData(byte[] message, byte[] signature, string keyIdentifierU
             return cryptographyClient.VerifyData(RS256, message, signature).IsValid;
         }
 
+        /// <summary>
+        /// Asynchronously generates a signature based on the RSA PKCS#v1.5 scheme using a specified Azure Key Vault Key URL.
+        /// </summary>
+        /// <param name="message">The data to sign</param>
+        /// <param name="keyIdentifierUri">The key vault key identifier URI</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        internal async Task<byte[]> SignDataAsync(byte[] message, string keyIdentifierUri, CancellationToken cancellationToken = default)
+        {
+            CryptographyClient cryptographyClient = GetCryptographyClient(keyIdentifierUri);
+            SignResult result = await cryptographyClient.SignDataAsync(RS256, message, cancellationToken).ConfigureAwait(false);
+            return result.Signature;
+        }
+
+        /// <summary>
+        /// Asynchronously verifies a signature based on the RSA PKCS#v1.5 scheme using a specified Azure Key Vault Key URL.
+        /// </summary>
+        /// <param name="message">The signed data</param>
+        /// <param name="signature">The signature to verify</param>
+        /// <param name="keyIdentifierUri">The key vault key identifier URI</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        internal async Task<bool> VerifyDataAsync(byte[] message, byte[] signature, string keyIdentifierUri, CancellationToken cancellationToken = default)
+        {
+            CryptographyClient cryptographyClient = GetCryptographyClient(keyIdentifierUri);
+            SqlClientEventSource.Log.TryTraceEvent("Sending request to verify data");
+            VerifyResult result = await cryptographyClient.VerifyDataAsync(RS256, message, signature, cancellationToken).ConfigureAwait(false);
+            return result.IsValid;
+        }
+
         internal byte[] UnwrapKey(KeyWrapAlgorithm keyWrapAlgorithm, byte[] encryptedKey, string keyIdentifierUri)
         {
             CryptographyClient cryptographyClient = GetCryptographyClient(keyIdentifierUri);
@@ -147,6 +225,43 @@ internal byte[] WrapKey(KeyWrapAlgorithm keyWrapAlgorithm, byte[] key, string ke
             return cryptographyClient.WrapKey(keyWrapAlgorithm, key).EncryptedKey;
         }
 
+        /// <summary>
+        /// Asynchronously unwraps the given encrypted key using the specified Azure Key Vault key.
+        /// </summary>
+        /// <param name="keyWrapAlgorithm">The key wrap algorithm</param>
+        /// <param name="encryptedKey">The encrypted key to unwrap</param>
+        /// <param name="keyIdentifierUri">The key vault key identifier URI</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        internal async Task<byte[]> UnwrapKeyAsync(KeyWrapAlgorithm keyWrapAlgorithm, byte[] encryptedKey, string keyIdentifierUri, CancellationToken cancellationToken = default)
+        {
+            CryptographyClient cryptographyClient = GetCryptographyClient(keyIdentifierUri);
+            SqlClientEventSource.Log.TryTraceEvent("Sending request to unwrap key.");
+            UnwrapResult result = await cryptographyClient.UnwrapKeyAsync(keyWrapAlgorithm, encryptedKey, cancellationToken).ConfigureAwait(false);
+            return result.Key;
+        }
+
+        /// <summary>
+        /// Asynchronously wraps the given key using the specified Azure Key Vault key.
+        /// </summary>
+        /// <param name="keyWrapAlgorithm">The key wrap algorithm</param>
+        /// <param name="key">The key to wrap</param>
+        /// <param name="keyIdentifierUri">The key vault key identifier URI</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        internal async Task<byte[]> WrapKeyAsync(KeyWrapAlgorithm keyWrapAlgorithm, byte[] key, string keyIdentifierUri, CancellationToken cancellationToken = default)
+        {
+            CryptographyClient cryptographyClient = GetCryptographyClient(keyIdentifierUri);
+            SqlClientEventSource.Log.TryTraceEvent("Sending request to wrap key.");
+            WrapResult result = await cryptographyClient.WrapKeyAsync(keyWrapAlgorithm, key, cancellationToken).ConfigureAwait(false);
+            return result.EncryptedKey;
+        }
+
+        /// <summary>
+        /// Returns the CryptographyClient for the given key identifier URI, creating it if necessary.
+        /// </summary>
+        /// <remarks>
+        /// Concurrent callers may each construct a client, but all of them observe the single instance that wins the
+        /// race, so a key is never used through two different clients.
+        /// </remarks>
         private CryptographyClient GetCryptographyClient(string keyIdentifierUri)
         {
             if (_cryptoClientDictionary.TryGetValue(keyIdentifierUri, out CryptographyClient client))
@@ -154,9 +269,9 @@ private CryptographyClient GetCryptographyClient(string keyIdentifierUri)
                 return client;
             }
 
-            CryptographyClient cryptographyClient = new(GetKey(keyIdentifierUri).Id, TokenCredential);
-            _cryptoClientDictionary.TryAdd(keyIdentifierUri, cryptographyClient);
-            return cryptographyClient;
+            return _cryptoClientDictionary.GetOrAdd(
+                keyIdentifierUri,
+                uri => new CryptographyClient(GetKey(uri).Id, TokenCredential));
         }
 
         /// <summary>
@@ -171,6 +286,35 @@ private KeyVaultKey FetchKeyFromKeyVault(KeyClient keyClient, string keyName, st
 
             Azure.Response<KeyVaultKey> keyResponse = keyClient?.GetKey(keyName, keyVersion);
 
+            return ValidateKeyResponse(keyResponse, keyName, keyVersion);
+        }
+
+        /// <summary>
+        /// Asynchronously fetches the column master key from the Azure Key Vault.
+        /// </summary>
+        /// <param name="keyClient">The KeyClient instance</param>
+        /// <param name="keyName">The name of the Azure Key Vault key</param>
+        /// <param name="keyVersion">The version of the Azure Key Vault key</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        private async Task<KeyVaultKey> FetchKeyFromKeyVaultAsync(KeyClient keyClient, string keyName, string keyVersion, CancellationToken cancellationToken)
+        {
+            SqlClientEventSource.Log.TryTraceEvent("Fetching key name={0}", keyName);
+
+            Azure.Response<KeyVaultKey> keyResponse = keyClient is null
+                ? null
+                : await keyClient.GetKeyAsync(keyName, keyVersion, cancellationToken).ConfigureAwait(false);
+
+            return ValidateKeyResponse(keyResponse, keyName, keyVersion);
+        }
+
+        /// <summary>
+        /// Validates the response received from Azure Key Vault and ensures the returned key is an RSA key.
+        /// </summary>
+        /// <param name="keyResponse">The response returned by Azure Key Vault</param>
+        /// <param name="keyName">The name of the Azure Key Vault key</param>
+        /// <param name="keyVersion">The version of the Azure Key Vault key</param>
+        private static KeyVaultKey ValidateKeyResponse(Azure.Response<KeyVaultKey> keyResponse, string keyName, string keyVersion)
+        {
             // Handle the case where the key response is null or contains an error
             // This can happen if the key does not exist or if there is an issue with the KeyClient.
             // In such cases, we log the error and throw an exception.
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/KeyedAsyncLock.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/KeyedAsyncLock.cs
new file mode 100644
index 0000000000..1f019f4e60
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/KeyedAsyncLock.cs
@@ -0,0 +1,126 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
+{
+    /// <summary>
+    /// Provides best-effort deduplication scoped to an individual key, so that concurrent callers asking
+    /// for the same key are normally serialized while callers asking for different keys proceed in parallel.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Exclusion is deliberately best-effort rather than guaranteed. Gates are reclaimed once nobody holds
+    /// or waits on them, so a caller sitting between fetching a gate and waiting on it can acquire a gate
+    /// that has just been reclaimed while a later caller creates a fresh one for the same key. Two callers
+    /// can therefore run the guarded work concurrently for one key. This is acceptable only where the
+    /// guarded work is idempotent and duplicating it is merely wasteful, which is the case for the key
+    /// store fetches this type guards. Do not reuse it where exclusion must be absolute.
+    /// </para>
+    /// <para>
+    /// The lock is only ever awaited, never blocked on, so no thread is held while the work it guards is
+    /// in flight. It must not be combined with a synchronous wait on the same gate: doing so would block a
+    /// thread pool thread for the duration of an asynchronous, potentially network bound, operation.
+    /// </para>
+    /// <para>
+    /// Cancellation applies to the caller requesting it and never to the work already in flight. A caller
+    /// whose wait is cancelled simply gives up its place in line.
+    /// </para>
+    /// <para>
+    /// Gates are removed once no caller holds or waits on them, so the number of retained gates is bounded
+    /// by the number of keys being acquired concurrently rather than by the number of distinct keys seen.
+    /// The gates themselves are never disposed, which is safe because <see cref="SemaphoreSlim"/> only
+    /// allocates a disposable wait handle when <see cref="SemaphoreSlim.AvailableWaitHandle"/> is used.
+    /// </para>
+    /// </remarks>
+    internal sealed class KeyedAsyncLock<TKey>
+    {
+        private readonly ConcurrentDictionary<TKey, SemaphoreSlim> _gates = new();
+
+        /// <summary>
+        /// Gets the number of gates currently retained. Used by tests to verify that gates do not accumulate.
+        /// </summary>
+        internal int GateCount => _gates.Count;
+
+        /// <summary>
+        /// Asynchronously acquires the lock for the specified key.
+        /// </summary>
+        /// <param name="key">The key to lock.</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the wait.</param>
+        /// <returns>A value that releases the lock when disposed.</returns>
+        internal async Task<Releaser> AcquireAsync(TKey key, CancellationToken cancellationToken)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            SemaphoreSlim gate = _gates.GetOrAdd(key, static _ => new SemaphoreSlim(1, 1));
+
+            try
+            {
+                await gate.WaitAsync(cancellationToken).ConfigureAwait(false);
+            }
+            catch
+            {
+                // The gate was published before the wait, so an abandoned wait must not leave it behind.
+                RemoveIfUnused(key, gate);
+                throw;
+            }
+
+            return new Releaser(this, key, gate);
+        }
+
+        /// <summary>
+        /// Removes the gate for the specified key if no caller holds or waits on it. A caller that fetched
+        /// this instance just before removal may still acquire it, which at worst allows the guarded work
+        /// to run twice and never produces an incorrect result.
+        /// </summary>
+        private void RemoveIfUnused(TKey key, SemaphoreSlim gate)
+        {
+            if (gate.CurrentCount == 1)
+            {
+                // ConcurrentDictionary.TryRemove(KeyValuePair) is not available on netstandard2.0, so the
+                // explicitly implemented ICollection member is used to remove only a matching entry.
+                ICollection<KeyValuePair<TKey, SemaphoreSlim>> gates = _gates;
+                gates.Remove(new KeyValuePair<TKey, SemaphoreSlim>(key, gate));
+            }
+        }
+
+        /// <summary>
+        /// Releases a lock acquired from <see cref="KeyedAsyncLock{TKey}"/>. Disposal is idempotent, so a
+        /// second disposal cannot inflate the gate's count and hand the key to two callers at once.
+        /// </summary>
+        internal sealed class Releaser : IDisposable
+        {
+            private readonly KeyedAsyncLock<TKey> _owner;
+            private readonly TKey _key;
+            private SemaphoreSlim _gate;
+
+            internal Releaser(KeyedAsyncLock<TKey> owner, TKey key, SemaphoreSlim gate)
+            {
+                _owner = owner;
+                _key = key;
+                _gate = gate;
+            }
+
+            /// <summary>
+            /// Releases the lock and discards its gate if no other caller is using it.
+            /// </summary>
+            public void Dispose()
+            {
+                SemaphoreSlim gate = Interlocked.Exchange(ref _gate, null);
+                if (gate is null)
+                {
+                    return;
+                }
+
+                gate.Release();
+                _owner.RemoveIfUnused(_key, gate);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/LocalCache.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/LocalCache.cs
index 12c896feb0..5965c427ef 100644
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/LocalCache.cs
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/LocalCache.cs
@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Memory;
 using static System.Math;
 using Microsoft.Data.SqlClient.Internal;
@@ -26,6 +28,12 @@ internal class LocalCache<TKey, TValue>
 
         private readonly int _maxSize;
 
+        /// <summary>
+        /// Gates concurrent asynchronous creation of the same cache entry, so that a burst of
+        /// concurrent misses for one key results in a single invocation of the create delegate.
+        /// </summary>
+        private readonly KeyedAsyncLock<TKey> _entryCreationLock = new();
+
         /// <summary>
         /// Sets an absolute expiration time, relative to now.
         /// </summary>
@@ -36,6 +44,12 @@ internal class LocalCache<TKey, TValue>
         /// </summary>
         internal int Count => _cache.Count;
 
+        /// <summary>
+        /// Gets the number of asynchronous creation gates currently retained.
+        /// Used in unit tests to verify that gates do not accumulate.
+        /// </summary>
+        internal int EntryCreationGateCount => _entryCreationLock.GateCount;
+
         /// <summary>
         /// Constructs a new <see cref="LocalCache{TKey, TValue}">LocalCache</see> object.
         /// </summary>
@@ -69,7 +83,7 @@ internal TValue GetOrCreate(TKey key, Func<TValue> createItem)
             if (!_cache.TryGetValue(key, out TValue cacheEntry))
             {
                 SqlClientEventSource.Log.TryTraceEvent("Cached entry not found, creating new entry.");
-                if (_cache.Count == _maxSize)
+                if (_cache.Count >= _maxSize)
                 {
                     _cache.Compact(Max(0.10, 1.0 / _maxSize));
                 }
@@ -91,6 +105,70 @@ internal TValue GetOrCreate(TKey key, Func<TValue> createItem)
             return cacheEntry;
         }
 
+        /// <summary>
+        /// Asynchronous counterpart of <see cref="GetOrCreate(TKey, Func{TValue})"/>. Looks for the cache entry that maps to the
+        /// <paramref name="key"/> value. If it exists (cache hit) it will simply be returned. Otherwise, the
+        /// <paramref name="createItem"/> delegate function will be awaited to create the value. It will then get stored in the
+        /// cache and set the time-to-live before getting returned.
+        /// </summary>
+        /// <param name="key">The key for the cache entry.</param>
+        /// <param name="createItem">The delegate function that will asynchronously create the cache entry if it does not exist.</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the wait for another caller's creation of the entry.</param>
+        /// <returns>The cache entry.</returns>
+        /// <remarks>
+        /// Concurrent misses for the same key are gated so that only one caller invokes <paramref name="createItem"/>; the others
+        /// await that caller and then observe the cached value. The gate is per key, so misses for different keys proceed in
+        /// parallel, and no lock is held by a blocked thread. Cancellation applies only to the caller requesting it: if the caller
+        /// that owns the gate is cancelled, the next waiter creates the entry using its own cancellation token.
+        /// <para>
+        /// When caching is disabled the gate is bypassed, because there is no entry for a waiting caller to observe and gating
+        /// would serialize callers without saving any work. Callers therefore reach the create delegate in parallel.
+        /// </para>
+        /// </remarks>
+        internal async Task<TValue> GetOrCreateAsync(TKey key, Func<Task<TValue>> createItem, CancellationToken cancellationToken = default)
+        {
+            if (TimeToLive <= TimeSpan.Zero)
+            {
+                SqlClientEventSource.Log.TryTraceEvent("Key caching found disabled, fetching key information.");
+                return await createItem().ConfigureAwait(false);
+            }
+
+            if (_cache.TryGetValue(key, out TValue cacheEntry))
+            {
+                SqlClientEventSource.Log.TryTraceEvent("Cached entry found.");
+                return cacheEntry;
+            }
+
+            using (await _entryCreationLock.AcquireAsync(key, cancellationToken).ConfigureAwait(false))
+            {
+                // Another caller may have created the entry while this one waited for the gate.
+                if (_cache.TryGetValue(key, out cacheEntry))
+                {
+                    SqlClientEventSource.Log.TryTraceEvent("Cached entry found.");
+                    return cacheEntry;
+                }
+
+                SqlClientEventSource.Log.TryTraceEvent("Cached entry not found, creating new entry.");
+
+                cacheEntry = await createItem().ConfigureAwait(false);
+
+                if (_cache.Count >= _maxSize)
+                {
+                    _cache.Compact(Max(0.10, 1.0 / _maxSize));
+                }
+
+                MemoryCacheEntryOptions cacheEntryOptions = new()
+                {
+                    AbsoluteExpirationRelativeToNow = TimeToLive
+                };
+
+                _cache.Set(key, cacheEntry, cacheEntryOptions);
+                SqlClientEventSource.Log.TryTraceEvent("Entry added to local cache.");
+
+                return cacheEntry;
+            }
+        }
+
         /// <summary>
         /// Determines whether the <see cref="LocalCache{TKey, TValue}">LocalCache</see> contains the specified key.
         /// Used in unit tests to verify that the cache contains the expected entries.
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
index e2636ac11e..4c2c1827fc 100644
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
@@ -11,6 +11,17 @@
     <RootNamespace>Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider</RootNamespace>
   </PropertyGroup>
 
+  <!-- Strong name signing ============================================= -->
+  <!-- This is done in Directory.Build.props -->
+  <!--
+    Internals are exposed to the unit test assembly only in unsigned builds. A strong-named
+    assembly cannot grant friend access without the friend's public key, so an unconditional
+    grant would break signed builds. This matches the sibling packages.
+  -->
+  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
+    <InternalsVisibleTo Include="$(AssemblyName).Test" />
+  </ItemGroup>
+
   <!-- Versioning ====================================================== -->
   <!-- This package is part of the SqlClient family and shares the SqlClient version.  The
        SqlClient* version properties are provided by src/Directory.Build.props, which imports the
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/SqlColumnEncryptionAzureKeyVaultProvider.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/SqlColumnEncryptionAzureKeyVaultProvider.cs
index 9f716e81fb..3d1acae176 100644
--- a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/SqlColumnEncryptionAzureKeyVaultProvider.cs
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/SqlColumnEncryptionAzureKeyVaultProvider.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using Azure.Core;
 using Azure.Security.KeyVault.Keys.Cryptography;
 using static Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.Validator;
@@ -150,6 +151,36 @@ public override byte[] SignColumnMasterKeyMetadata(string masterKeyPath, bool al
             return KeyCryptographer.SignData(message, masterKeyPath);
         }
 
+        /// <summary>
+        /// Asynchronously uses an asymmetric key identified by the key path to sign the master key metadata consisting of
+        /// (masterKeyPath, allowEnclaveComputations bit, providerName).
+        /// </summary>
+        /// <param name="masterKeyPath">Complete path of an asymmetric key. Path format is specific to a key store provider.</param>
+        /// <param name="allowEnclaveComputations">Boolean indicating whether this key can be sent to a trusted enclave</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        /// <returns>The signature of the master key metadata</returns>
+        /// <remarks>
+        /// Argument validation failures are reported through the returned task rather than thrown synchronously.
+        /// </remarks>
+        public override async Task<byte[]> SignColumnMasterKeyMetadataAsync(string masterKeyPath, bool allowEnclaveComputations, CancellationToken cancellationToken = default)
+        {
+            long scopeId = SqlClientEventSource.Log.TryScopeEnterEvent(nameof(SqlColumnEncryptionAzureKeyVaultProvider));
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                ValidateNonEmptyAKVPath(masterKeyPath, isSystemOp: false);
+
+                // Also validates key is of RSA type.
+                await KeyCryptographer.AddKeyAsync(masterKeyPath, cancellationToken).ConfigureAwait(false);
+                byte[] message = CompileMasterKeyMetadata(masterKeyPath, allowEnclaveComputations);
+                return await KeyCryptographer.SignDataAsync(message, masterKeyPath, cancellationToken).ConfigureAwait(false);
+            }
+            finally
+            {
+                LeaveScope(scopeId);
+            }
+        }
+
         /// <summary>
         /// Uses an asymmetric key identified by the key path to verify the master key metadata consisting of (masterKeyPath, allowEnclaveComputations bit, providerName).
         /// </summary>
@@ -161,6 +192,8 @@ public override bool VerifyColumnMasterKeyMetadata(string masterKeyPath, bool al
         {
             using var _ = SqlClientEventScope.Create(nameof(SqlColumnEncryptionAzureKeyVaultProvider));
             ValidateNonEmptyAKVPath(masterKeyPath, isSystemOp: true);
+            ValidateNotNull(signature, nameof(signature));
+            ValidateNotEmpty(signature, nameof(signature));
 
             var key = Tuple.Create(masterKeyPath, allowEnclaveComputations, ToHexString(signature));
             return GetOrCreateSignatureVerificationResult(key, VerifyColumnMasterKeyMetadata);
@@ -174,6 +207,47 @@ bool VerifyColumnMasterKeyMetadata()
             }
         }
 
+        /// <summary>
+        /// Asynchronously uses an asymmetric key identified by the key path to verify the master key metadata consisting of
+        /// (masterKeyPath, allowEnclaveComputations bit, providerName).
+        /// </summary>
+        /// <param name="masterKeyPath">Complete path of an asymmetric key. Path format is specific to a key store provider.</param>
+        /// <param name="allowEnclaveComputations">Boolean indicating whether this key can be sent to trusted enclave</param>
+        /// <param name="signature">Signature for the master key metadata</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        /// <returns>Boolean indicating whether the master key metadata can be verified based on the provided signature</returns>
+        /// <remarks>
+        /// Argument validation failures are reported through the returned task rather than thrown synchronously.
+        /// </remarks>
+        public override async Task<bool> VerifyColumnMasterKeyMetadataAsync(string masterKeyPath, bool allowEnclaveComputations, byte[] signature, CancellationToken cancellationToken = default)
+        {
+            long scopeId = SqlClientEventSource.Log.TryScopeEnterEvent(nameof(SqlColumnEncryptionAzureKeyVaultProvider));
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                ValidateNonEmptyAKVPath(masterKeyPath, isSystemOp: true);
+                ValidateNotNull(signature, nameof(signature));
+                ValidateNotEmpty(signature, nameof(signature));
+
+                Tuple<string, bool, string> key = Tuple.Create(masterKeyPath, allowEnclaveComputations, ToHexString(signature));
+                return await _columnMasterKeyMetadataSignatureVerificationCache
+                    .GetOrCreateAsync(key, VerifyColumnMasterKeyMetadataAsync, cancellationToken)
+                    .ConfigureAwait(false);
+            }
+            finally
+            {
+                LeaveScope(scopeId);
+            }
+
+            async Task<bool> VerifyColumnMasterKeyMetadataAsync()
+            {
+                // Also validates key is of RSA type.
+                await KeyCryptographer.AddKeyAsync(masterKeyPath, cancellationToken).ConfigureAwait(false);
+                byte[] message = CompileMasterKeyMetadata(masterKeyPath, allowEnclaveComputations);
+                return await KeyCryptographer.VerifyDataAsync(message, signature, masterKeyPath, cancellationToken).ConfigureAwait(false);
+            }
+        }
+
         /// <summary>
         /// This function uses the asymmetric key specified by the key path
         /// and decrypts an encrypted CEK with RSA encryption algorithm.
@@ -201,62 +275,150 @@ byte[] DecryptEncryptionKey()
 
                 int keySizeInBytes = KeyCryptographer.GetKeySize(masterKeyPath);
 
-                // Get key path length
-                int currentIndex = s_firstVersion.Length;
-                ushort keyPathLength = BitConverter.ToUInt16(encryptedColumnEncryptionKey, currentIndex);
-                currentIndex += sizeof(ushort);
-
-                // Get ciphertext length
-                ushort cipherTextLength = BitConverter.ToUInt16(encryptedColumnEncryptionKey, currentIndex);
-                currentIndex += sizeof(ushort);
-
-                // Skip KeyPath
-                // KeyPath exists only for troubleshooting purposes and doesnt need validation.
-                currentIndex += keyPathLength;
+                ParseEncryptedColumnEncryptionKey(
+                    encryptedColumnEncryptionKey,
+                    masterKeyPath,
+                    keySizeInBytes,
+                    out byte[] cipherText,
+                    out byte[] signature,
+                    out byte[] message);
 
-                // validate the ciphertext length
-                if (cipherTextLength != keySizeInBytes)
-                {
-                    SqlClientEventSource.Log.TryTraceEvent("Cipher Text length: {0}", cipherTextLength);
-                    SqlClientEventSource.Log.TryTraceEvent("keySizeInBytes: {0}", keySizeInBytes);
-                    throw ADP.InvalidCipherTextLength(cipherTextLength, keySizeInBytes, masterKeyPath);
-                }
-
-                // Validate the signature length
-                int signatureLength = encryptedColumnEncryptionKey.Length - currentIndex - cipherTextLength;
-                if (signatureLength != keySizeInBytes)
+                if (!KeyCryptographer.VerifyData(message, signature, masterKeyPath))
                 {
-                    SqlClientEventSource.Log.TryTraceEvent("Signature length: {0}", signatureLength);
-                    SqlClientEventSource.Log.TryTraceEvent("keySizeInBytes: {0}", keySizeInBytes);
-                    throw ADP.InvalidSignatureLengthTemplate(signatureLength, keySizeInBytes, masterKeyPath);
+                    SqlClientEventSource.Log.TryTraceEvent("Signature could not be verified.");
+                    throw ADP.InvalidSignatureTemplate(masterKeyPath);
                 }
+                return KeyCryptographer.UnwrapKey(s_keyWrapAlgorithm, cipherText, masterKeyPath);
+            }
+        }
 
-                // Get ciphertext
-                byte[] cipherText = new byte[cipherTextLength];
-                Array.Copy(encryptedColumnEncryptionKey, currentIndex, cipherText, 0, cipherTextLength);
+        /// <summary>
+        /// Asynchronously uses the asymmetric key specified by the key path
+        /// and decrypts an encrypted CEK with the RSA encryption algorithm.
+        /// </summary>
+        /// <param name="masterKeyPath">Complete path of an asymmetric key in Azure Key Vault</param>
+        /// <param name="encryptionAlgorithm">Asymmetric Key Encryption Algorithm</param>
+        /// <param name="encryptedColumnEncryptionKey">Encrypted Column Encryption Key</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        /// <returns>Plain text column encryption key</returns>
+        /// <remarks>
+        /// Argument validation failures are reported through the returned task rather than thrown synchronously.
+        /// </remarks>
+        public override async Task<byte[]> DecryptColumnEncryptionKeyAsync(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey, CancellationToken cancellationToken = default)
+        {
+            long scopeId = SqlClientEventSource.Log.TryScopeEnterEvent(nameof(SqlColumnEncryptionAzureKeyVaultProvider));
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // Validate the input parameters
+                ValidateNonEmptyAKVPath(masterKeyPath, isSystemOp: true);
+                ValidateEncryptionAlgorithm(encryptionAlgorithm, isSystemOp: true);
+                ValidateNotNull(encryptedColumnEncryptionKey, nameof(encryptedColumnEncryptionKey));
+                ValidateNotEmpty(encryptedColumnEncryptionKey, nameof(encryptedColumnEncryptionKey));
+                ValidateVersionByte(encryptedColumnEncryptionKey[0], s_firstVersion[0]);
+
+                return await _columnEncryptionKeyCache
+                    .GetOrCreateAsync(ToHexString(encryptedColumnEncryptionKey), DecryptEncryptionKeyAsync, cancellationToken)
+                    .ConfigureAwait(false);
+            }
+            finally
+            {
+                LeaveScope(scopeId);
+            }
 
-                currentIndex += cipherTextLength;
+            async Task<byte[]> DecryptEncryptionKeyAsync()
+            {
+                // Also validates whether the key is RSA one or not and then get the key size
+                await KeyCryptographer.AddKeyAsync(masterKeyPath, cancellationToken).ConfigureAwait(false);
 
-                // Get signature
-                byte[] signature = new byte[signatureLength];
-                Buffer.BlockCopy(encryptedColumnEncryptionKey, currentIndex, signature, 0, signatureLength);
+                int keySizeInBytes = KeyCryptographer.GetKeySize(masterKeyPath);
 
-                // Compute the message to validate the signature
-                byte[] message = new byte[encryptedColumnEncryptionKey.Length - signatureLength];
-                Buffer.BlockCopy(encryptedColumnEncryptionKey, 0, message, 0, encryptedColumnEncryptionKey.Length - signatureLength);
+                ParseEncryptedColumnEncryptionKey(
+                    encryptedColumnEncryptionKey,
+                    masterKeyPath,
+                    keySizeInBytes,
+                    out byte[] cipherText,
+                    out byte[] signature,
+                    out byte[] message);
 
-                if (message == null)
-                {
-                    throw ADP.NullHashFound();
-                }
+                bool isSignatureValid = await KeyCryptographer
+                    .VerifyDataAsync(message, signature, masterKeyPath, cancellationToken)
+                    .ConfigureAwait(false);
 
-                if (!KeyCryptographer.VerifyData(message, signature, masterKeyPath))
+                if (!isSignatureValid)
                 {
                     SqlClientEventSource.Log.TryTraceEvent("Signature could not be verified.");
                     throw ADP.InvalidSignatureTemplate(masterKeyPath);
                 }
-                return KeyCryptographer.UnwrapKey(s_keyWrapAlgorithm, cipherText, masterKeyPath);
+
+                return await KeyCryptographer
+                    .UnwrapKeyAsync(s_keyWrapAlgorithm, cipherText, masterKeyPath, cancellationToken)
+                    .ConfigureAwait(false);
+            }
+        }
+
+        /// <summary>
+        /// Validates and splits the encrypted column encryption key blob into its cipher text, signature and
+        /// signed message components.
+        /// </summary>
+        /// <param name="encryptedColumnEncryptionKey">Encrypted Column Encryption Key</param>
+        /// <param name="masterKeyPath">Complete path of an asymmetric key in Azure Key Vault</param>
+        /// <param name="keySizeInBytes">The size of the column master key, in bytes</param>
+        /// <param name="cipherText">The encrypted column encryption key</param>
+        /// <param name="signature">The signature over the blob</param>
+        /// <param name="message">The portion of the blob covered by the signature</param>
+        private static void ParseEncryptedColumnEncryptionKey(
+            byte[] encryptedColumnEncryptionKey,
+            string masterKeyPath,
+            int keySizeInBytes,
+            out byte[] cipherText,
+            out byte[] signature,
+            out byte[] message)
+        {
+            // Get key path length
+            int currentIndex = s_firstVersion.Length;
+            ushort keyPathLength = BitConverter.ToUInt16(encryptedColumnEncryptionKey, currentIndex);
+            currentIndex += sizeof(ushort);
+
+            // Get ciphertext length
+            ushort cipherTextLength = BitConverter.ToUInt16(encryptedColumnEncryptionKey, currentIndex);
+            currentIndex += sizeof(ushort);
+
+            // Skip KeyPath
+            // KeyPath exists only for troubleshooting purposes and doesnt need validation.
+            currentIndex += keyPathLength;
+
+            // validate the ciphertext length
+            if (cipherTextLength != keySizeInBytes)
+            {
+                SqlClientEventSource.Log.TryTraceEvent("Cipher Text length: {0}", cipherTextLength);
+                SqlClientEventSource.Log.TryTraceEvent("keySizeInBytes: {0}", keySizeInBytes);
+                throw ADP.InvalidCipherTextLength(cipherTextLength, keySizeInBytes, masterKeyPath);
+            }
+
+            // Validate the signature length
+            int signatureLength = encryptedColumnEncryptionKey.Length - currentIndex - cipherTextLength;
+            if (signatureLength != keySizeInBytes)
+            {
+                SqlClientEventSource.Log.TryTraceEvent("Signature length: {0}", signatureLength);
+                SqlClientEventSource.Log.TryTraceEvent("keySizeInBytes: {0}", keySizeInBytes);
+                throw ADP.InvalidSignatureLengthTemplate(signatureLength, keySizeInBytes, masterKeyPath);
             }
+
+            // Get ciphertext
+            cipherText = new byte[cipherTextLength];
+            Array.Copy(encryptedColumnEncryptionKey, currentIndex, cipherText, 0, cipherTextLength);
+
+            currentIndex += cipherTextLength;
+
+            // Get signature
+            signature = new byte[signatureLength];
+            Buffer.BlockCopy(encryptedColumnEncryptionKey, currentIndex, signature, 0, signatureLength);
+
+            // Compute the message to validate the signature
+            message = new byte[encryptedColumnEncryptionKey.Length - signatureLength];
+            Buffer.BlockCopy(encryptedColumnEncryptionKey, 0, message, 0, encryptedColumnEncryptionKey.Length - signatureLength);
         }
 
         /// <summary>
@@ -280,17 +442,8 @@ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string e
             KeyCryptographer.AddKey(masterKeyPath);
             int keySizeInBytes = KeyCryptographer.GetKeySize(masterKeyPath);
 
-            // Construct the encryptedColumnEncryptionKey
-            // Format is 
-            //          s_firstVersion + keyPathLength + ciphertextLength + keyPath + ciphertext + signature
-
-            // Get the Unicode encoded bytes of cultureinvariant lower case masterKeyPath
-            byte[] masterKeyPathBytes = Encoding.Unicode.GetBytes(masterKeyPath.ToLowerInvariant());
-            byte[] keyPathLength = BitConverter.GetBytes((short)masterKeyPathBytes.Length);
-
             // Encrypt the plain text
             byte[] cipherText = KeyCryptographer.WrapKey(s_keyWrapAlgorithm, columnEncryptionKey, masterKeyPath);
-            byte[] cipherTextLength = BitConverter.GetBytes((short)cipherText.Length);
 
             if (cipherText.Length != keySizeInBytes)
             {
@@ -299,6 +452,113 @@ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string e
                 throw ADP.CipherTextLengthMismatch();
             }
 
+            byte[] message = BuildEncryptedColumnEncryptionKeyMessage(masterKeyPath, cipherText);
+
+            // Sign the message
+            byte[] signature = KeyCryptographer.SignData(message, masterKeyPath);
+
+            if (signature.Length != keySizeInBytes)
+            {
+                throw ADP.HashLengthMismatch();
+            }
+
+            ValidateSignature(masterKeyPath, message, signature);
+
+            return ConcatenateMessageAndSignature(message, signature);
+        }
+
+        /// <summary>
+        /// Asynchronously uses the asymmetric key specified by the key path
+        /// and encrypts a CEK with the RSA encryption algorithm.
+        /// </summary>
+        /// <param name="masterKeyPath">Complete path of an asymmetric key in Azure Key Vault</param>
+        /// <param name="encryptionAlgorithm">Asymmetric Key Encryption Algorithm</param>
+        /// <param name="columnEncryptionKey">The plaintext column encryption key.</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        /// <returns>Encrypted column encryption key</returns>
+        /// <remarks>
+        /// Argument validation failures are reported through the returned task rather than thrown synchronously.
+        /// </remarks>
+        public override async Task<byte[]> EncryptColumnEncryptionKeyAsync(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey, CancellationToken cancellationToken = default)
+        {
+            long scopeId = SqlClientEventSource.Log.TryScopeEnterEvent(nameof(SqlColumnEncryptionAzureKeyVaultProvider));
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // Validate the input parameters
+                ValidateNonEmptyAKVPath(masterKeyPath, isSystemOp: true);
+                ValidateEncryptionAlgorithm(encryptionAlgorithm, isSystemOp: true);
+                ValidateNotNull(columnEncryptionKey, nameof(columnEncryptionKey));
+                ValidateNotEmpty(columnEncryptionKey, nameof(columnEncryptionKey));
+
+                // Also validates whether the key is RSA one or not and then get the key size
+                await KeyCryptographer.AddKeyAsync(masterKeyPath, cancellationToken).ConfigureAwait(false);
+                int keySizeInBytes = KeyCryptographer.GetKeySize(masterKeyPath);
+
+                // Encrypt the plain text
+                byte[] cipherText = await KeyCryptographer
+                    .WrapKeyAsync(s_keyWrapAlgorithm, columnEncryptionKey, masterKeyPath, cancellationToken)
+                    .ConfigureAwait(false);
+
+                if (cipherText.Length != keySizeInBytes)
+                {
+                    SqlClientEventSource.Log.TryTraceEvent("Cipher Text length: {0}", cipherText.Length);
+                    SqlClientEventSource.Log.TryTraceEvent("keySizeInBytes: {0}", keySizeInBytes);
+                    throw ADP.CipherTextLengthMismatch();
+                }
+
+                byte[] message = BuildEncryptedColumnEncryptionKeyMessage(masterKeyPath, cipherText);
+
+                // Sign the message
+                byte[] signature = await KeyCryptographer
+                    .SignDataAsync(message, masterKeyPath, cancellationToken)
+                    .ConfigureAwait(false);
+
+                if (signature.Length != keySizeInBytes)
+                {
+                    throw ADP.HashLengthMismatch();
+                }
+
+                await ValidateSignatureAsync(masterKeyPath, message, signature, cancellationToken).ConfigureAwait(false);
+
+                return ConcatenateMessageAndSignature(message, signature);
+            }
+            finally
+            {
+                LeaveScope(scopeId);
+            }
+        }
+
+        /// <summary>
+        /// Leaves the event source scope entered by an async method.
+        /// </summary>
+        /// <param name="scopeId">The scope identifier returned when the scope was entered.</param>
+        /// <remarks>
+        /// <see cref="SqlClientEventScope"/> is a <c>ref struct</c> and cannot be held across an <c>await</c>
+        /// boundary, so async methods track the scope identifier directly.
+        /// </remarks>
+        private static void LeaveScope(long scopeId)
+        {
+            if (scopeId != 0)
+            {
+                SqlClientEventSource.Log.TryScopeLeaveEvent(scopeId);
+            }
+        }
+
+        /// <summary>
+        /// Builds the signed portion of the encrypted column encryption key blob:
+        /// version + keyPathLength + ciphertextLength + keyPath + ciphertext
+        /// </summary>
+        /// <param name="masterKeyPath">Complete path of an asymmetric key in Azure Key Vault</param>
+        /// <param name="cipherText">The encrypted column encryption key</param>
+        private static byte[] BuildEncryptedColumnEncryptionKeyMessage(string masterKeyPath, byte[] cipherText)
+        {
+            // Get the Unicode encoded bytes of cultureinvariant lower case masterKeyPath
+            byte[] masterKeyPathBytes = Encoding.Unicode.GetBytes(masterKeyPath.ToLowerInvariant());
+            byte[] keyPathLength = BitConverter.GetBytes((short)masterKeyPathBytes.Length);
+            byte[] cipherTextLength = BitConverter.GetBytes((short)cipherText.Length);
+
             // Compute message
             // SHA-2-256(version + keyPathLength + ciphertextLength + keyPath + ciphertext) 
             int messageLength = s_firstVersion.Length + keyPathLength.Length + cipherTextLength.Length + masterKeyPathBytes.Length + cipherText.Length;
@@ -318,18 +578,17 @@ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string e
             position += masterKeyPathBytes.Length;
 
             Buffer.BlockCopy(cipherText, 0, message, position, cipherText.Length);
-            position += cipherText.Length;
-
-            // Sign the message
-            byte[] signature = KeyCryptographer.SignData(message, masterKeyPath);
-
-            if (signature.Length != keySizeInBytes)
-            {
-                throw ADP.HashLengthMismatch();
-            }
 
-            ValidateSignature(masterKeyPath, message, signature);
+            return message;
+        }
 
+        /// <summary>
+        /// Appends the signature to the signed message to produce the encrypted column encryption key blob.
+        /// </summary>
+        /// <param name="message">The signed portion of the blob</param>
+        /// <param name="signature">The signature over the message</param>
+        private static byte[] ConcatenateMessageAndSignature(byte[] message, byte[] signature)
+        {
             byte[] retval = new byte[message.Length + signature.Length];
             Buffer.BlockCopy(message, 0, retval, 0, message.Length);
             Buffer.BlockCopy(signature, 0, retval, message.Length, signature.Length);
@@ -386,6 +645,27 @@ private void ValidateSignature(string masterKeyPath, byte[] message, byte[] sign
             SqlClientEventSource.Log.TryTraceEvent("Signature verified successfully.");
         }
 
+        /// <summary>
+        /// Asynchronous counterpart of <see cref="ValidateSignature(string, byte[], byte[])"/>.
+        /// </summary>
+        /// <param name="masterKeyPath">Complete path of an asymmetric key in Azure Key Vault</param>
+        /// <param name="message">The signed message</param>
+        /// <param name="signature">The signature to verify</param>
+        /// <param name="cancellationToken">Token used to request cancellation of the operation</param>
+        private async Task ValidateSignatureAsync(string masterKeyPath, byte[] message, byte[] signature, CancellationToken cancellationToken)
+        {
+            bool isSignatureValid = await KeyCryptographer
+                .VerifyDataAsync(message, signature, masterKeyPath, cancellationToken)
+                .ConfigureAwait(false);
+
+            if (!isSignatureValid)
+            {
+                SqlClientEventSource.Log.TryTraceEvent("Signature could not be verified.");
+                throw ADP.InvalidSignature();
+            }
+            SqlClientEventSource.Log.TryTraceEvent("Signature verified successfully.");
+        }
+
         private byte[] CompileMasterKeyMetadata(string masterKeyPath, bool allowEnclaveComputations)
         {
             string masterkeyMetadata = ProviderName + masterKeyPath + allowEnclaveComputations;
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/Directory.Packages.props b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/Directory.Packages.props
new file mode 100644
index 0000000000..4145484108
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/Directory.Packages.props
@@ -0,0 +1,11 @@
+<Project>
+  <!--
+    This file exists because the shared test package versions (xunit, Test.Sdk,
+    etc.) live in the SqlClient tests Directory.Packages.props rather than the
+    repo root.  Without this file, NuGet's CPM directory walk would resolve to
+    the repo-root props and miss the test-only versions.  Importing the
+    SqlClient tests props brings in both the shared test dependencies and
+    (transitively) the root production dependencies.
+  -->
+  <Import Project="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Directory.Packages.props" />
+</Project>
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/KeyedAsyncLockTest.cs b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/KeyedAsyncLockTest.cs
new file mode 100644
index 0000000000..e862cf0529
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/KeyedAsyncLockTest.cs
@@ -0,0 +1,291 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.Test
+{
+    /// <summary>
+    /// Unit tests for <see cref="KeyedAsyncLock{TKey}"/>.
+    /// </summary>
+    /// <remarks>
+    /// Every test that depends on a caller reaching a particular point uses an explicit
+    /// <see cref="TaskCompletionSource{TResult}"/> handshake rather than a delay, so the tests are
+    /// deterministic rather than timing dependent.
+    /// </remarks>
+    public class KeyedAsyncLockTest
+    {
+        /// <summary>
+        /// Bounds how long a test will wait for an expected signal before failing, so a regression
+        /// surfaces as a failure rather than a hung test run.
+        /// </summary>
+        private static readonly TimeSpan Timeout = TimeSpan.FromSeconds(30);
+
+        [Fact]
+        public async Task AcquireAsync_UncontendedAcquisition_Succeeds()
+        {
+            KeyedAsyncLock<string> sut = new();
+
+            using (await sut.AcquireAsync("key", CancellationToken.None))
+            {
+                Assert.Equal(1, sut.GateCount);
+            }
+
+            Assert.Equal(0, sut.GateCount);
+        }
+
+        [Fact]
+        public async Task AcquireAsync_SameKeyHeld_BlocksSecondCallerUntilReleased()
+        {
+            KeyedAsyncLock<string> sut = new();
+
+            KeyedAsyncLock<string>.Releaser first = await sut.AcquireAsync("key", CancellationToken.None);
+
+            Task<KeyedAsyncLock<string>.Releaser> second = sut.AcquireAsync("key", CancellationToken.None);
+            Assert.False(second.IsCompleted, "The second caller must wait while the first holds the key.");
+
+            first.Dispose();
+
+            using (await WithTimeout(second))
+            {
+                Assert.Equal(1, sut.GateCount);
+            }
+
+            Assert.Equal(0, sut.GateCount);
+        }
+
+        [Fact]
+        public async Task AcquireAsync_DifferentKeys_DoNotBlockEachOther()
+        {
+            KeyedAsyncLock<string> sut = new();
+
+            using (await sut.AcquireAsync("first", CancellationToken.None))
+            using (await sut.AcquireAsync("second", CancellationToken.None))
+            {
+                Assert.Equal(2, sut.GateCount);
+            }
+
+            Assert.Equal(0, sut.GateCount);
+        }
+
+        [Fact]
+        public async Task AcquireAsync_ConcurrentCallersOnOneKey_NeverOverlap()
+        {
+            const int callerCount = 32;
+
+            KeyedAsyncLock<string> sut = new();
+            int active = 0;
+            int maxActive = 0;
+
+            async Task Contend()
+            {
+                using (await sut.AcquireAsync("key", CancellationToken.None))
+                {
+                    int current = Interlocked.Increment(ref active);
+                    InterlockedMax(ref maxActive, current);
+
+                    // Yield inside the guarded region so an overlap would be observed rather than
+                    // hidden by the work completing synchronously.
+                    await Task.Yield();
+
+                    Interlocked.Decrement(ref active);
+                }
+            }
+
+            await WithTimeout(Task.WhenAll(Enumerable.Range(0, callerCount).Select(_ => Task.Run(Contend))));
+
+            Assert.Equal(1, maxActive);
+            Assert.Equal(0, sut.GateCount);
+        }
+
+        [Fact]
+        public async Task AcquireAsync_AlreadyCancelledToken_ThrowsWithoutCreatingGate()
+        {
+            KeyedAsyncLock<string> sut = new();
+            using CancellationTokenSource cts = new();
+            cts.Cancel();
+
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(
+                () => sut.AcquireAsync("key", cts.Token));
+
+            Assert.Equal(0, sut.GateCount);
+        }
+
+        [Fact]
+        public async Task AcquireAsync_CancelledWhileWaiting_ThrowsAndLeavesNoGate()
+        {
+            KeyedAsyncLock<string> sut = new();
+            using CancellationTokenSource cts = new();
+
+            KeyedAsyncLock<string>.Releaser holder = await sut.AcquireAsync("key", CancellationToken.None);
+
+            Task waiter = sut.AcquireAsync("key", cts.Token);
+            cts.Cancel();
+
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(() => WithTimeout(waiter));
+
+            // The holder still owns the gate, so it must not have been reclaimed by the abandoned wait.
+            Assert.Equal(1, sut.GateCount);
+
+            holder.Dispose();
+
+            Assert.Equal(0, sut.GateCount);
+        }
+
+        [Fact]
+        public async Task AcquireAsync_ManyCancelledWaiters_DoNotAccumulateGates()
+        {
+            const int waiterCount = 64;
+
+            KeyedAsyncLock<string> sut = new();
+            using CancellationTokenSource cts = new();
+
+            KeyedAsyncLock<string>.Releaser holder = await sut.AcquireAsync("key", CancellationToken.None);
+
+            Task[] waiters = Enumerable
+                .Range(0, waiterCount)
+                .Select(_ => sut.AcquireAsync("key", cts.Token))
+                .Cast<Task>()
+                .ToArray();
+
+            cts.Cancel();
+
+            // Every waiter must fault; none may acquire the key while it is held.
+            foreach (Task waiter in waiters)
+            {
+                await Assert.ThrowsAnyAsync<OperationCanceledException>(() => WithTimeout(waiter));
+            }
+
+            holder.Dispose();
+
+            Assert.Equal(0, sut.GateCount);
+        }
+
+        [Fact]
+        public async Task AcquireAsync_CancellationOfWaiter_DoesNotDisturbWorkInFlight()
+        {
+            KeyedAsyncLock<string> sut = new();
+            using CancellationTokenSource cts = new();
+
+            KeyedAsyncLock<string>.Releaser holder = await sut.AcquireAsync("key", CancellationToken.None);
+
+            Task cancelled = sut.AcquireAsync("key", cts.Token);
+            Task<KeyedAsyncLock<string>.Releaser> survivor = sut.AcquireAsync("key", CancellationToken.None);
+
+            cts.Cancel();
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(() => WithTimeout(cancelled));
+
+            Assert.False(survivor.IsCompleted, "Cancelling one waiter must not hand the key to another.");
+
+            holder.Dispose();
+
+            using (await WithTimeout(survivor))
+            {
+                Assert.Equal(1, sut.GateCount);
+            }
+
+            Assert.Equal(0, sut.GateCount);
+        }
+
+        [Fact]
+        public async Task Releaser_DisposedTwice_DoesNotHandKeyToTwoCallers()
+        {
+            KeyedAsyncLock<string> sut = new();
+
+            KeyedAsyncLock<string>.Releaser releaser = await sut.AcquireAsync("key", CancellationToken.None);
+            releaser.Dispose();
+            releaser.Dispose();
+
+            // A second release would have raised the gate's count, letting two callers in at once.
+            using (await sut.AcquireAsync("key", CancellationToken.None))
+            {
+                Task<KeyedAsyncLock<string>.Releaser> blocked = sut.AcquireAsync("key", CancellationToken.None);
+                Assert.False(blocked.IsCompleted, "Repeated disposal must not permit concurrent acquisition.");
+            }
+        }
+
+        [Fact]
+        public async Task AcquireAsync_GuardedWork_RunsOncePerKeyUnderContention()
+        {
+            const int keyCount = 8;
+            const int callersPerKey = 8;
+
+            KeyedAsyncLock<string> sut = new();
+            ConcurrentDictionary<string, string> results = new();
+            ConcurrentDictionary<string, int> invocations = new();
+
+            async Task<string> GetOrCreate(string key)
+            {
+                if (results.TryGetValue(key, out string existing))
+                {
+                    return existing;
+                }
+
+                using (await sut.AcquireAsync(key, CancellationToken.None))
+                {
+                    if (results.TryGetValue(key, out existing))
+                    {
+                        return existing;
+                    }
+
+                    invocations.AddOrUpdate(key, 1, static (_, count) => count + 1);
+
+                    // Simulate an awaited round trip so callers genuinely queue behind the gate.
+                    await Task.Yield();
+
+                    string created = "value:" + key;
+                    results[key] = created;
+                    return created;
+                }
+            }
+
+            Task<string>[] callers = Enumerable
+                .Range(0, keyCount)
+                .SelectMany(keyIndex => Enumerable
+                    .Range(0, callersPerKey)
+                    .Select(_ => Task.Run(() => GetOrCreate("key" + keyIndex))))
+                .ToArray();
+
+            string[] values = await WithTimeout(Task.WhenAll(callers));
+
+            Assert.Equal(keyCount, invocations.Count);
+            Assert.All(invocations.Values, count => Assert.Equal(1, count));
+            Assert.All(values, Assert.NotNull);
+            Assert.Equal(0, sut.GateCount);
+        }
+
+        private static async Task<T> WithTimeout<T>(Task<T> task)
+        {
+            await WithTimeout((Task)task).ConfigureAwait(false);
+            return await task.ConfigureAwait(false);
+        }
+
+        private static async Task WithTimeout(Task task)
+        {
+            Task completed = await Task.WhenAny(task, Task.Delay(Timeout)).ConfigureAwait(false);
+            Assert.True(ReferenceEquals(completed, task), "Timed out waiting for the operation to complete.");
+
+            await task.ConfigureAwait(false);
+        }
+
+        private static void InterlockedMax(ref int target, int value)
+        {
+            int current = Volatile.Read(ref target);
+            while (value > current)
+            {
+                int observed = Interlocked.CompareExchange(ref target, value, current);
+                if (observed == current)
+                {
+                    return;
+                }
+
+                current = observed;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.Test.csproj b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.Test.csproj
new file mode 100644
index 0000000000..ba59c67559
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.Test.csproj
@@ -0,0 +1,49 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- General Properties ============================================== -->
+  <PropertyGroup>
+    <AssemblyName>Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.Test</AssemblyName>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <!-- Compiler Options ================================================ -->
+  <PropertyGroup>
+    <RootNamespace>Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.Test</RootNamespace>
+  </PropertyGroup>
+
+  <!-- Global Usings =================================================== -->
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+  <!-- Embedded resources and content files ============================ -->
+  <ItemGroup>
+    <Content Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>xunit.runner.json</TargetPath>
+    </Content>
+  </ItemGroup>
+
+  <!-- References ====================================================== -->
+  <!-- Test Target Reference -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
+  </ItemGroup>
+
+  <!-- Other References -->
+  <ItemGroup>
+    <!--
+      The provider targets netstandard2.0 and resolves Microsoft.Extensions.Caching.Memory 8.x,
+      while the driver reference assembly resolves 9.x. Referencing it directly here selects a
+      single version for the test assembly and avoids an NU1605 downgrade error.
+    -->
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="xunit.runner.console" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
index 62e0612395..9c03addd51 100644
--- a/src/Microsoft.Data.SqlClient.slnx
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -138,6 +138,7 @@
   </Folder>
   <Folder Name="/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/">
     <Project Path="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
+    <Project Path="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/test/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.Test.csproj" />
   </Folder>
   <Folder Name="/src/Microsoft.Data.SqlClient.Extensions.Abstractions/">
     <Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs
index c8c3820978..d292abcba3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/AKVUnitTests.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
@@ -197,6 +198,248 @@ public void CekCacheShouldBeDisabledWhenCustomProviderIsRegisteredGlobally()
             }
         }
 
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task EncryptAndDecryptColumnEncryptionKeyAsyncRoundTrips()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(DataTestUtility.GetTokenCredential());
+
+            byte[] encryptedCek = await akvProvider.EncryptColumnEncryptionKeyAsync(
+                _fixture.GeneratedKeyUri, EncryptionAlgorithm, s_columnEncryptionKey);
+            byte[] decryptedCek = await akvProvider.DecryptColumnEncryptionKeyAsync(
+                _fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedCek);
+
+            Assert.Equal(s_columnEncryptionKey, decryptedCek);
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task AsyncAndSyncEncryptedKeysAreInterchangeable()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(DataTestUtility.GetTokenCredential());
+
+            byte[] syncEncryptedCek = akvProvider.EncryptColumnEncryptionKey(
+                _fixture.GeneratedKeyUri, EncryptionAlgorithm, s_columnEncryptionKey);
+            byte[] asyncDecryptedCek = await akvProvider.DecryptColumnEncryptionKeyAsync(
+                _fixture.GeneratedKeyUri, EncryptionAlgorithm, syncEncryptedCek);
+            Assert.Equal(s_columnEncryptionKey, asyncDecryptedCek);
+
+            byte[] asyncEncryptedCek = await akvProvider.EncryptColumnEncryptionKeyAsync(
+                _fixture.GeneratedKeyUri, EncryptionAlgorithm, s_columnEncryptionKey);
+            byte[] syncDecryptedCek = akvProvider.DecryptColumnEncryptionKey(
+                _fixture.GeneratedKeyUri, EncryptionAlgorithm, asyncEncryptedCek);
+            Assert.Equal(s_columnEncryptionKey, syncDecryptedCek);
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task SignAndVerifyColumnMasterKeyMetadataAsyncRoundTrips()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(DataTestUtility.GetTokenCredential());
+
+            byte[] signature = await akvProvider.SignColumnMasterKeyMetadataAsync(_fixture.GeneratedKeyUri, true);
+            Assert.True(await akvProvider.VerifyColumnMasterKeyMetadataAsync(_fixture.GeneratedKeyUri, true, signature));
+
+            // Signatures produced by the sync path must verify on the async path and vice versa.
+            byte[] syncSignature = akvProvider.SignColumnMasterKeyMetadata(_fixture.GeneratedKeyUri, false);
+            Assert.True(await akvProvider.VerifyColumnMasterKeyMetadataAsync(_fixture.GeneratedKeyUri, false, syncSignature));
+            Assert.True(akvProvider.VerifyColumnMasterKeyMetadata(_fixture.GeneratedKeyUri, true, signature));
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task DecryptedCekIsCachedDuringAsyncDecryption()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(new SqlClientCustomTokenCredential());
+            byte[] plaintextKey1 = { 1, 2, 3 };
+            byte[] plaintextKey2 = { 0, 1, 2, 3 };
+            byte[] encryptedKey1 = await akvProvider.EncryptColumnEncryptionKeyAsync(_fixture.GeneratedKeyUri, EncryptionAlgorithm, plaintextKey1);
+            byte[] encryptedKey2 = await akvProvider.EncryptColumnEncryptionKeyAsync(_fixture.GeneratedKeyUri, EncryptionAlgorithm, plaintextKey2);
+
+            byte[] decryptedKey1 = await akvProvider.DecryptColumnEncryptionKeyAsync(_fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedKey1);
+            Assert.Equal(plaintextKey1, decryptedKey1);
+            Assert.Equal(1, GetCacheCount(cekCacheName, akvProvider));
+            Assert.True(CekCacheContainsKey(encryptedKey1, akvProvider));
+
+            // A repeated decryption of the same encrypted key must be served from the cache.
+            decryptedKey1 = await akvProvider.DecryptColumnEncryptionKeyAsync(_fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedKey1);
+            Assert.Equal(plaintextKey1, decryptedKey1);
+            Assert.Equal(1, GetCacheCount(cekCacheName, akvProvider));
+
+            byte[] decryptedKey2 = await akvProvider.DecryptColumnEncryptionKeyAsync(_fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedKey2);
+            Assert.Equal(plaintextKey2, decryptedKey2);
+            Assert.Equal(2, GetCacheCount(cekCacheName, akvProvider));
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task CekCacheIsSharedBetweenSyncAndAsyncDecryption()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(new SqlClientCustomTokenCredential());
+            byte[] plaintextKey = { 1, 2, 3 };
+            byte[] encryptedKey = akvProvider.EncryptColumnEncryptionKey(_fixture.GeneratedKeyUri, EncryptionAlgorithm, plaintextKey);
+
+            akvProvider.DecryptColumnEncryptionKey(_fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedKey);
+            Assert.Equal(1, GetCacheCount(cekCacheName, akvProvider));
+
+            byte[] decryptedKey = await akvProvider.DecryptColumnEncryptionKeyAsync(_fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedKey);
+            Assert.Equal(plaintextKey, decryptedKey);
+            Assert.Equal(1, GetCacheCount(cekCacheName, akvProvider));
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task CekCachingIsDisabledForAsyncDecryptionWhenTtlIsZero()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(new SqlClientCustomTokenCredential());
+            akvProvider.ColumnEncryptionKeyCacheTtl = TimeSpan.Zero;
+            byte[] plaintextKey = { 1, 2, 3 };
+            byte[] encryptedKey = await akvProvider.EncryptColumnEncryptionKeyAsync(_fixture.GeneratedKeyUri, EncryptionAlgorithm, plaintextKey);
+
+            byte[] decryptedKey = await akvProvider.DecryptColumnEncryptionKeyAsync(_fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedKey);
+
+            Assert.Equal(plaintextKey, decryptedKey);
+            Assert.Equal(0, GetCacheCount(cekCacheName, akvProvider));
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task SignatureVerificationResultIsCachedDuringAsyncVerification()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(new SqlClientCustomTokenCredential());
+            byte[] signature = await akvProvider.SignColumnMasterKeyMetadataAsync(_fixture.GeneratedKeyUri, true);
+            byte[] signatureWithoutEnclave = await akvProvider.SignColumnMasterKeyMetadataAsync(_fixture.GeneratedKeyUri, false);
+
+            Assert.True(await akvProvider.VerifyColumnMasterKeyMetadataAsync(_fixture.GeneratedKeyUri, true, signature));
+            Assert.Equal(1, GetCacheCount(signatureVerificationResultCacheName, akvProvider));
+
+            Assert.True(await akvProvider.VerifyColumnMasterKeyMetadataAsync(_fixture.GeneratedKeyUri, true, signature));
+            Assert.Equal(1, GetCacheCount(signatureVerificationResultCacheName, akvProvider));
+
+            Assert.True(await akvProvider.VerifyColumnMasterKeyMetadataAsync(_fixture.GeneratedKeyUri, false, signatureWithoutEnclave));
+            Assert.Equal(2, GetCacheCount(signatureVerificationResultCacheName, akvProvider));
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task CancelledAsyncDecryptionsDoNotAccumulateCreationGates()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(new SqlClientCustomTokenCredential());
+            byte[] plaintextKey = { 1, 2, 3 };
+
+            // A gate is only created once a caller reaches the cache, so the cancellation being
+            // exercised here must happen while a caller waits on a gate another caller holds.
+            // Each iteration uses a distinct cache key, so a gate that is abandoned rather than
+            // removed would accumulate without bound.
+            for (int i = 0; i < 20; i++)
+            {
+                byte[] encryptedKey = akvProvider.EncryptColumnEncryptionKey(
+                    _fixture.GeneratedKeyUri, EncryptionAlgorithm, plaintextKey);
+
+                // The first caller takes the gate and holds it for the duration of the key vault
+                // round trip. It is not cancelled, so it always creates the entry.
+                Task<byte[]> gateOwner = Task.Run(() => akvProvider.DecryptColumnEncryptionKeyAsync(
+                    _fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedKey));
+
+                // The remaining callers queue behind it and are cancelled while waiting.
+                using CancellationTokenSource cts = new();
+                Task<byte[]>[] waiters = new Task<byte[]>[8];
+                for (int j = 0; j < waiters.Length; j++)
+                {
+                    waiters[j] = Task.Run(() => akvProvider.DecryptColumnEncryptionKeyAsync(
+                        _fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedKey, cts.Token));
+                }
+
+                cts.Cancel();
+
+                // A waiter either observed the cancellation or completed first; both are valid.
+                foreach (Task<byte[]> waiter in waiters)
+                {
+                    try
+                    {
+                        Assert.Equal(plaintextKey, await waiter);
+                    }
+                    catch (OperationCanceledException)
+                    {
+                    }
+                }
+
+                Assert.Equal(plaintextKey, await gateOwner);
+            }
+
+            Assert.Equal(0, GetEntryCreationGateCount(cekCacheName, akvProvider));
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task ConcurrentAsyncDecryptionOfSameKeyIsDeduplicated()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(new SqlClientCustomTokenCredential());
+            byte[] plaintextKey = { 1, 2, 3 };
+            byte[] encryptedKey = akvProvider.EncryptColumnEncryptionKey(_fixture.GeneratedKeyUri, EncryptionAlgorithm, plaintextKey);
+
+            Task<byte[]>[] decryptions = new Task<byte[]>[32];
+            for (int i = 0; i < decryptions.Length; i++)
+            {
+                decryptions[i] = Task.Run(() => akvProvider.DecryptColumnEncryptionKeyAsync(
+                    _fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedKey));
+            }
+
+            byte[][] decryptedKeys = await Task.WhenAll(decryptions);
+
+            foreach (byte[] decryptedKey in decryptedKeys)
+            {
+                Assert.Equal(plaintextKey, decryptedKey);
+            }
+
+            // Concurrent misses for the same key must collapse into a single cache entry.
+            Assert.Equal(1, GetCacheCount(cekCacheName, akvProvider));
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task AsyncApisHonorCancellationToken()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(new SqlClientCustomTokenCredential());
+            byte[] encryptedKey = akvProvider.EncryptColumnEncryptionKey(
+                _fixture.GeneratedKeyUri, EncryptionAlgorithm, s_columnEncryptionKey);
+            byte[] signature = akvProvider.SignColumnMasterKeyMetadata(_fixture.GeneratedKeyUri, true);
+
+            using CancellationTokenSource cts = new();
+            cts.Cancel();
+
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(
+                () => akvProvider.EncryptColumnEncryptionKeyAsync(
+                    _fixture.GeneratedKeyUri, EncryptionAlgorithm, s_columnEncryptionKey, cts.Token));
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(
+                () => akvProvider.DecryptColumnEncryptionKeyAsync(
+                    _fixture.GeneratedKeyUri, EncryptionAlgorithm, encryptedKey, cts.Token));
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(
+                () => akvProvider.SignColumnMasterKeyMetadataAsync(
+                    _fixture.GeneratedKeyUri, true, cts.Token));
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(
+                () => akvProvider.VerifyColumnMasterKeyMetadataAsync(
+                    _fixture.GeneratedKeyUri, true, signature, cts.Token));
+
+            // Cancellation is observed before argument validation, matching the base class.
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(
+                () => akvProvider.DecryptColumnEncryptionKeyAsync(
+                    "https://my-key-vault.vault.azure.net/keys", EncryptionAlgorithm, encryptedKey, cts.Token));
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task AsyncApisValidateMasterKeyPath()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider akvProvider = new(new SqlClientCustomTokenCredential());
+            string invalidKeyPath = "https://my-key-vault.vault.azure.net/keys";
+
+            ArgumentException ex1 = await Assert.ThrowsAsync<ArgumentException>(
+                () => akvProvider.EncryptColumnEncryptionKeyAsync(invalidKeyPath, EncryptionAlgorithm, s_columnEncryptionKey));
+            Assert.Contains($"Invalid url specified: '{invalidKeyPath}'", ex1.Message);
+
+            ArgumentException ex2 = await Assert.ThrowsAsync<ArgumentException>(
+                () => akvProvider.DecryptColumnEncryptionKeyAsync(invalidKeyPath, EncryptionAlgorithm, s_columnEncryptionKey));
+            Assert.Contains($"Invalid url specified: '{invalidKeyPath}'", ex2.Message);
+
+            ArgumentException ex3 = await Assert.ThrowsAsync<ArgumentException>(
+                () => akvProvider.SignColumnMasterKeyMetadataAsync(invalidKeyPath, true));
+            Assert.Contains($"Invalid url specified: '{invalidKeyPath}'", ex3.Message);
+
+            ArgumentException ex4 = await Assert.ThrowsAsync<ArgumentException>(
+                () => akvProvider.VerifyColumnMasterKeyMetadataAsync(invalidKeyPath, true, s_columnEncryptionKey));
+            Assert.Contains($"Invalid url specified: '{invalidKeyPath}'", ex4.Message);
+        }
+
         private static int GetCacheCount(string cacheName, SqlColumnEncryptionAzureKeyVaultProvider akvProvider)
         {
             var cacheInstance = GetCacheInstance(cacheName, akvProvider);
@@ -206,6 +449,15 @@ private static int GetCacheCount(string cacheName, SqlColumnEncryptionAzureKeyVa
             return countValue;
         }
 
+        private static int GetEntryCreationGateCount(string cacheName, SqlColumnEncryptionAzureKeyVaultProvider akvProvider)
+        {
+            var cacheInstance = GetCacheInstance(cacheName, akvProvider);
+            Type cacheType = cacheInstance.GetType();
+            PropertyInfo gateCountProperty = cacheType.GetProperty(
+                "EntryCreationGateCount", BindingFlags.Instance | BindingFlags.NonPublic);
+            return (int)gateCountProperty.GetValue(cacheInstance);
+        }
+
         private static bool CekCacheContainsKey(byte[] encryptedCek, SqlColumnEncryptionAzureKeyVaultProvider akvProvider)
         {
             var cacheInstance = GetCacheInstance("_columnEncryptionKeyCache", akvProvider);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs
index 9f006c3f55..75f5e59701 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionTestAKVStore.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Security.Cryptography;
+using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider;
 using Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted.Setup;
 using Xunit;
@@ -58,6 +59,110 @@ public void EmptyColumnEncryptionKey()
             Assert.Matches($@"Internal error. Empty 'columnEncryptionKey' specified.", ex1.Message);
         }
 
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task VerifyRejectsNullOrEmptySignature()
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider azureKeyProvider = new SqlColumnEncryptionAzureKeyVaultProvider(
+                new SqlClientCustomTokenCredential());
+
+            string nullMessage = $@"Value cannot be null.\s+\(?Parameter (name: )?'?signature('\))?";
+            string emptyMessage = $@"Internal error. Empty 'signature' specified.";
+
+            Exception syncNull = Assert.Throws<ArgumentNullException>(
+                () => azureKeyProvider.VerifyColumnMasterKeyMetadata(_fixture.AkvKeyUrl, true, null));
+            Assert.Matches(nullMessage, syncNull.Message);
+
+            Exception syncEmpty = Assert.Throws<ArgumentException>(
+                () => azureKeyProvider.VerifyColumnMasterKeyMetadata(_fixture.AkvKeyUrl, true, new byte[] { }));
+            Assert.Matches(emptyMessage, syncEmpty.Message);
+
+            Exception asyncNull = await Assert.ThrowsAsync<ArgumentNullException>(
+                () => azureKeyProvider.VerifyColumnMasterKeyMetadataAsync(_fixture.AkvKeyUrl, true, null));
+            Assert.Matches(nullMessage, asyncNull.Message);
+
+            Exception asyncEmpty = await Assert.ThrowsAsync<ArgumentException>(
+                () => azureKeyProvider.VerifyColumnMasterKeyMetadataAsync(_fixture.AkvKeyUrl, true, new byte[] { }));
+            Assert.Matches(emptyMessage, asyncEmpty.Message);
+        }
+
+        [InlineData(null)]
+        [InlineData("")]
+        [InlineData(" ")]
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task SignAndVerifyAsyncRejectInvalidAKVPath(string masterKeyPath)
+        {
+            SqlColumnEncryptionAzureKeyVaultProvider azureKeyProvider = new SqlColumnEncryptionAzureKeyVaultProvider(
+                new SqlClientCustomTokenCredential());
+
+            ArgumentException signException = await Assert.ThrowsAnyAsync<ArgumentException>(
+                () => azureKeyProvider.SignColumnMasterKeyMetadataAsync(masterKeyPath, false));
+
+            ArgumentException verifyException = await Assert.ThrowsAnyAsync<ArgumentException>(
+                () => azureKeyProvider.VerifyColumnMasterKeyMetadataAsync(masterKeyPath, false, encryptedCek));
+
+            // The message is not anchored, so it matches whether or not the operation is flagged as
+            // a system operation and prefixes the text with "Internal error.".
+            string expectedMessage = masterKeyPath == null
+                ? "Azure Key Vault key path cannot be null."
+                : "Invalid Azure Key Vault key path specified";
+
+            Assert.Matches(expectedMessage, signException.Message);
+            Assert.Matches(expectedMessage, verifyException.Message);
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task AsyncApisValidateArguments()
+        {
+            ArgumentException ex1 = await Assert.ThrowsAsync<ArgumentException>(
+                () => _fixture.AkvStoreProvider.DecryptColumnEncryptionKeyAsync(_fixture.AkvKeyUrl, BadMasterKeyEncAlgo, cek));
+            Assert.Matches($@"Invalid key encryption algorithm specified: 'BadMasterKeyAlgorithm'. Expected value: 'RSA_OAEP' or 'RSA-OAEP'.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?", ex1.Message);
+
+            ArgumentNullException ex2 = await Assert.ThrowsAsync<ArgumentNullException>(
+                () => _fixture.AkvStoreProvider.EncryptColumnEncryptionKeyAsync(_fixture.AkvKeyUrl, null, cek));
+            Assert.Matches($@"Internal error. Key encryption algorithm cannot be null.\s+\(?Parameter (name: )?'?encryptionAlgorithm('\))?", ex2.Message);
+
+            ArgumentException ex3 = await Assert.ThrowsAsync<ArgumentException>(
+                () => _fixture.AkvStoreProvider.EncryptColumnEncryptionKeyAsync(_fixture.AkvKeyUrl, MasterKeyEncAlgo, new byte[] { }));
+            Assert.Matches($@"Internal error. Empty 'columnEncryptionKey' specified.", ex3.Message);
+
+            ArgumentNullException ex4 = await Assert.ThrowsAsync<ArgumentNullException>(
+                () => _fixture.AkvStoreProvider.DecryptColumnEncryptionKeyAsync(_fixture.AkvKeyUrl, MasterKeyEncAlgo, null));
+            Assert.Matches($@"Value cannot be null.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?", ex4.Message);
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task AsyncDecryptionRejectsInvalidAlgorithmVersion()
+        {
+            byte[] encryptedCekLocal = ColumnEncryptionKey.GenerateInvalidEncryptedCek(encryptedCek, ColumnEncryptionKey.ECEKCorruption.ALGORITHM_VERSION);
+
+            ArgumentException ex = await Assert.ThrowsAsync<ArgumentException>(
+                () => _fixture.AkvStoreProvider.DecryptColumnEncryptionKeyAsync(_fixture.AkvKeyUrl, MasterKeyEncAlgo, encryptedCekLocal));
+            Assert.Matches($@"Specified encrypted column encryption key contains an invalid encryption algorithm version '10'. Expected version is '01'.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?", ex.Message);
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task AsyncDecryptionRejectsInvalidSignature()
+        {
+            byte[] encryptedCekLocal = ColumnEncryptionKey.GenerateInvalidEncryptedCek(encryptedCek, ColumnEncryptionKey.ECEKCorruption.SIGNATURE);
+            string errorMessage =
+                $@"The specified encrypted column encryption key signature does not match the signature computed with the column master key \(Asymmetric key in Azure Key Vault\) in '{_fixture.AkvKeyUrl}'. The encrypted column encryption key may be corrupt, or the specified path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+
+            ArgumentException ex = await Assert.ThrowsAsync<ArgumentException>(
+                () => _fixture.AkvStoreProvider.DecryptColumnEncryptionKeyAsync(_fixture.AkvKeyUrl, MasterKeyEncAlgo, encryptedCekLocal));
+            Assert.Matches(errorMessage, ex.Message);
+        }
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
+        public async Task AsyncDecryptionRejectsInvalidCipherTextLength()
+        {
+            byte[] encryptedCekLocal = ColumnEncryptionKey.GenerateInvalidEncryptedCek(encryptedCek, ColumnEncryptionKey.ECEKCorruption.CEK_LENGTH);
+            string errorMessage = $@"The specified encrypted column encryption key's ciphertext length: 251 does not match the ciphertext length: 256 when using column master key \(Azure Key Vault key\) in '{_fixture.AkvKeyUrl}'. The encrypted column encryption key may be corrupt, or the specified Azure Key Vault key path may be incorrect.\s+\(?Parameter (name: )?'?encryptedColumnEncryptionKey('\))?";
+
+            ArgumentException ex = await Assert.ThrowsAsync<ArgumentException>(
+                () => _fixture.AkvStoreProvider.DecryptColumnEncryptionKeyAsync(_fixture.AkvKeyUrl, MasterKeyEncAlgo, encryptedCekLocal));
+            Assert.Matches(errorMessage, ex.Message);
+        }
+
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsAKVSetupAvailable))]
         public void NullColumnEncryptionKey()
         {

From 2215543ab7ea8502b9cd901b66b4c33901bc1fb7 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Fri, 21 Aug 2026 14:57:09 -0500
Subject: [PATCH 240/298] [Perf] Bypass SqlBulkCopy Graph Column Mapping if Not
 Copying Graph Tables (#4535)

* :robot: Only perform graph column mapping if bulk copy includes graph tables.

* Fix for failing manual test

* Fix for the other manual test failure

* Addressing PR comments (round 1)

* Next round of comments.
---
 .../Microsoft/Data/SqlClient/SqlBulkCopy.cs   | 140 +++++++++---
 .../ManualTests/BulkCopy/CopyAllFromReader.cs |   6 +-
 .../ManualTests/BulkCopy/SqlGraphTables.cs    | 203 ++++++++++++++++++
 .../SqlClient/SqlBulkCopyCacheMetadataTest.cs |  30 +++
 4 files changed, 341 insertions(+), 38 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
index 44c74fc3f0..c9c95380ae 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -82,6 +82,8 @@ internal BulkCopySimpleResultSet()
             _results = new List<Result>();
         }
 
+        internal int Count => _results.Count;
+
         internal Result this[int idx] => _results[idx];
 
         // Callback function for the tdsparser
@@ -151,11 +153,12 @@ public SourceColumnMetadata(ValueMethod method, bool isSqlType, bool isDataFeed)
             public readonly bool IsDataFeed;
         }
 
-        // The initial query will return three tables.
+        // The initial query will return four result sets, but the column aliases result set will
+        // be empty when not required.
         // Transaction count has only one value in one column and one row
         // MetaData has n columns but no rows
         // Collation has 4 columns and n rows
-        // Column aliases has 3 columns and n rows
+        // Column aliases has 2 columns and n rows
 
         private const int MetaDataResultId = 1;
 
@@ -191,6 +194,7 @@ public SourceColumnMetadata(ValueMethod method, bool isSqlType, bool isDataFeed)
 
         private SqlBulkCopyColumnMappingCollection _columnMappings;
         private SqlBulkCopyColumnMappingCollection _localColumnMappings;
+        private bool _localColumnMappingsResolveAliases;
 
         private SqlConnection _connection;
         private SqlTransaction _internalTransaction;
@@ -244,6 +248,7 @@ private int RowNumber
 
         // Metadata caching fields for CacheMetadata option
         internal BulkCopySimpleResultSet CachedMetadata { get; private set; }
+        private bool _cachedMetadataResolveAliases;
         // Per-operation clone of the destination table metadata, used when CacheMetadata is
         // enabled so that column-pruning in AnalyzeTargetAndCreateUpdateBulkCommand does not
         // mutate the cached BulkCopySimpleResultSet.
@@ -373,6 +378,7 @@ public string DestinationTableName
                 }
 
                 CachedMetadata = null;
+                _cachedMetadataResolveAliases = false;
                 _destinationTableName = value;
             }
         }
@@ -484,6 +490,45 @@ private string CreateInitialQuery()
             string objectName = ADP.BuildMultiPartName(parts);
             string escapedObjectName = SqlServerEscapeHelper.EscapeStringAsLiteral(objectName);
             string catalogNameStringLiteral = CatalogName is null ? null : SqlServerEscapeHelper.EscapeStringAsLiteral(CatalogName);
+            string createColumnAliasesTableQuery = """
+
+CREATE TABLE #Column_Aliases
+(
+    [Canonical_Column_Name] SYSNAME,
+    [Canonical_Column_Id] INT,
+    [Aliased_Column_Name] SYSNAME
+)
+""";
+            string populateColumnAliasesQuery = _localColumnMappingsResolveAliases
+                ? $"""
+
+        EXEC sp_executesql N'
+        INSERT INTO #Column_Aliases ([Canonical_Column_Name], [Canonical_Column_Id], [Aliased_Column_Name])
+            SELECT [name], [column_id], ''$to_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 8
+        UNION ALL
+            SELECT [name], [column_id], ''$from_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 5
+        UNION ALL
+            SELECT [name], [column_id], ''$edge_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 2 AND [name] LIKE ''$edge[_]id[_]%''
+        UNION ALL
+            SELECT [name], [column_id], ''$node_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 2 AND [name] LIKE ''$node[_]id[_]%''',
+        N'@Object_ID INT', @Object_ID = @Object_ID
+"""
+                : string.Empty;
+            string removeShadowedColumnAliasesQuery = _localColumnMappingsResolveAliases
+                ? $"""
+
+    DELETE FROM #Column_Aliases
+    WHERE [Aliased_Column_Name] IN (SELECT [name] FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID)
+"""
+                : string.Empty;
+            string selectColumnAliasesQuery = """
+
+SELECT [Canonical_Column_Name], [Aliased_Column_Name]
+FROM #Column_Aliases
+ORDER BY [Canonical_Column_Id] ASC
+
+DROP TABLE #Column_Aliases
+""";
             // Specify the column names explicitly. This is to ensure that we can map to hidden
             // columns (e.g. columns in temporal tables.) If the target table doesn't exist,
             // OBJECT_ID will return NULL and @Column_Names will remain non-null. The subsequent
@@ -543,13 +588,7 @@ private string CreateInitialQuery()
 DECLARE @Column_Name_Query NVARCHAR(MAX);
 DECLARE @Column_Names NVARCHAR(MAX) = NULL;
 DECLARE @Has_Sys_All_Columns_Permissions INT = HAS_PERMS_BY_NAME('{catalogNameStringLiteral}.[sys].[all_columns]', 'OBJECT', 'SELECT');
-
-CREATE TABLE #Column_Aliases
-(
-    [Canonical_Column_Name] SYSNAME,
-    [Canonical_Column_Id] INT,
-    [Aliased_Column_Name] SYSNAME
-)
+{createColumnAliasesTableQuery}
 
 IF CAST(SERVERPROPERTY('EngineEdition') AS INT) = 6
 BEGIN
@@ -567,17 +606,7 @@ IF CAST(SERVERPROPERTY('EngineEdition') AS INT) = 6
     IF EXISTS (SELECT TOP 1 * FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = OBJECT_ID('{catalogNameStringLiteral}.[sys].[all_columns]') AND [name] = 'graph_type')
     BEGIN
         SET @Column_Name_Query_FILTER = N'WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) NOT IN (1, 3, 4, 6, 7)';
-
-        EXEC sp_executesql N'
-        INSERT INTO #Column_Aliases ([Canonical_Column_Name], [Canonical_Column_Id], [Aliased_Column_Name])
-            SELECT [name], [column_id], ''$to_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 8
-        UNION ALL
-            SELECT [name], [column_id], ''$from_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 5
-        UNION ALL
-            SELECT [name], [column_id], ''$edge_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 2 AND [name] LIKE ''$edge[_]id[_]%''
-        UNION ALL
-            SELECT [name], [column_id], ''$node_id'' FROM {catalogNameStringLiteral}.[sys].[all_columns] WHERE [object_id] = @Object_ID AND COALESCE([graph_type], 0) = 2 AND [name] LIKE ''$node[_]id[_]%''',
-        N'@Object_ID INT', @Object_ID = @Object_ID
+{populateColumnAliasesQuery}
     END
     ELSE
     BEGIN
@@ -586,9 +615,7 @@ UNION ALL
     SET @Column_Name_Query = @Column_Name_Query_SELECT + ' FROM {catalogNameStringLiteral}.[sys].[all_columns] ' + @Column_Name_Query_FILTER + ' ' + @Column_Name_Query_SORT + ';'
 
     EXEC sp_executesql @Column_Name_Query, N'@Object_ID INT, @Column_Names NVARCHAR(MAX) OUTPUT', @Object_ID = @Object_ID, @Column_Names = @Column_Names OUTPUT;
-
-    DELETE FROM #Column_Aliases
-    WHERE [Aliased_Column_Name] IN (SELECT [name] FROM {CatalogName}.[sys].[all_columns] WHERE [object_id] = @Object_ID)
+{removeShadowedColumnAliasesQuery}
 END
 
 SELECT @Column_Names = COALESCE(@Column_Names, '*');
@@ -598,12 +625,7 @@ WHERE [Aliased_Column_Name] IN (SELECT [name] FROM {CatalogName}.[sys].[all_colu
 SET FMTONLY OFF;
 
 EXEC {CatalogName}..{TableCollationsStoredProc} N'{SchemaName}.{TableName}';
-
-SELECT [Canonical_Column_Name], [Aliased_Column_Name]
-FROM #Column_Aliases
-ORDER BY [Canonical_Column_Id] ASC
-
-DROP TABLE #Column_Aliases
+{selectColumnAliasesQuery}
 """;
         }
 
@@ -614,7 +636,7 @@ DROP TABLE #Column_Aliases
         private Task<BulkCopySimpleResultSet> CreateAndExecuteInitialQueryAsync(out BulkCopySimpleResultSet result)
         {
             // Check if we have valid cached metadata for the current destination table
-            if (CachedMetadata != null)
+            if (IsCachedMetadataValid())
             {
                 SqlClientEventSource.Log.TryTraceEvent("SqlBulkCopy.CreateAndExecuteInitialQueryAsync | Info | Using cached metadata for table '{0}'", _destinationTableName);
                 result = CachedMetadata;
@@ -655,11 +677,18 @@ private Task<BulkCopySimpleResultSet> CreateAndExecuteInitialQueryAsync(out Bulk
             }
         }
 
+        internal bool IsCachedMetadataValid()
+        {
+            return CachedMetadata != null
+                && (!_localColumnMappingsResolveAliases || _cachedMetadataResolveAliases);
+        }
+
         private void CacheMetadataIfEnabled(BulkCopySimpleResultSet result)
         {
             if (IsCopyOption(SqlBulkCopyOptions.CacheMetadata))
             {
                 CachedMetadata = result;
+                _cachedMetadataResolveAliases = _localColumnMappingsResolveAliases;
                 SqlClientEventSource.Log.TryTraceEvent("SqlBulkCopy.CacheMetadataIfEnabled | Info | Cached metadata for table '{0}'", _destinationTableName);
             }
         }
@@ -1068,6 +1097,7 @@ private void WriteMetaData(BulkCopySimpleResultSet internalResults)
         public void ClearCachedMetadata()
         {
             CachedMetadata = null;
+            _cachedMetadataResolveAliases = false;
             SqlClientEventSource.Log.TryTraceEvent("SqlBulkCopy.ClearCachedMetadata | Info | Metadata cache cleared");
         }
 
@@ -1092,6 +1122,7 @@ private void Dispose(bool disposing)
                 _columnMappings = null;
                 _parser = null;
                 CachedMetadata = null;
+                _cachedMetadataResolveAliases = false;
                 _operationMetaData = null;
                 try
                 {
@@ -1632,6 +1663,39 @@ private void AppendColumnNameAndTypeName(StringBuilder query, string columnName,
             query.Append(typeName);
         }
 
+        private void ResetLocalColumnMappings()
+        {
+            _localColumnMappings = null;
+            _localColumnMappingsResolveAliases = false;
+        }
+
+        private bool ShouldResolveColumnAliases()
+        {
+            if (_localColumnMappings is null)
+            {
+                return false;
+            }
+
+            for (int i = 0; i < _localColumnMappings.Count; i++)
+            {
+                if (IsGraphColumnAlias(_localColumnMappings[i].DestinationColumn))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool IsGraphColumnAlias(string name)
+        {
+            string unquotedName = UnquotedName(name);
+            return string.Equals(unquotedName, "$node_id", StringComparison.OrdinalIgnoreCase)
+                || string.Equals(unquotedName, "$edge_id", StringComparison.OrdinalIgnoreCase)
+                || string.Equals(unquotedName, "$from_id", StringComparison.OrdinalIgnoreCase)
+                || string.Equals(unquotedName, "$to_id", StringComparison.OrdinalIgnoreCase);
+        }
+
         private string UnquotedName(string name)
         {
             if (string.IsNullOrEmpty(name))
@@ -2328,6 +2392,11 @@ private void WriteRowSourceToServerCommon(int columnCount)
             if (_localColumnMappings.Count > 0)
             {
                 _localColumnMappings.ValidateCollection();
+                foreach (SqlBulkCopyColumnMapping bulkCopyColumn in _localColumnMappings)
+                {
+                    bulkCopyColumn.MappedDestinationColumn = null;
+                }
+
                 foreach (SqlBulkCopyColumnMapping bulkCopyColumn in _localColumnMappings)
                 {
                     if (bulkCopyColumn._internalSourceColumnOrdinal == -1)
@@ -2343,6 +2412,8 @@ private void WriteRowSourceToServerCommon(int columnCount)
                 _localColumnMappings.CreateDefaultMapping(columnCount);
             }
 
+            _localColumnMappingsResolveAliases = ShouldResolveColumnAliases();
+
             // perf: If the user specified all column ordinals we do not need to get a schematable
             if (unspecifiedColumnOrdinals)
             {
@@ -3057,7 +3128,7 @@ private void WriteToServerInternalRestContinuedAsync(BulkCopySimpleResultSet int
                             // Bulk copy task is completed at this moment.
                             if (task.IsCanceled)
                             {
-                                sqlBulkCopy._localColumnMappings = null;
+                                sqlBulkCopy.ResetLocalColumnMappings();
                                 try
                                 {
                                     sqlBulkCopy.CleanUpStateObject();
@@ -3069,11 +3140,12 @@ private void WriteToServerInternalRestContinuedAsync(BulkCopySimpleResultSet int
                             }
                             else if (task.Exception != null)
                             {
+                                sqlBulkCopy.ResetLocalColumnMappings();
                                 source.SetException(task.Exception.InnerException);
                             }
                             else
                             {
-                                sqlBulkCopy._localColumnMappings = null;
+                                sqlBulkCopy.ResetLocalColumnMappings();
                                 try
                                 {
                                     sqlBulkCopy.CleanUpStateObject(isCancelRequested: false);
@@ -3098,7 +3170,7 @@ private void WriteToServerInternalRestContinuedAsync(BulkCopySimpleResultSet int
                 }
                 else
                 {
-                    _localColumnMappings = null;
+                    ResetLocalColumnMappings();
 
                     try
                     {
@@ -3117,7 +3189,7 @@ private void WriteToServerInternalRestContinuedAsync(BulkCopySimpleResultSet int
             }
             catch (Exception ex) when (ADP.IsCatchableExceptionType(ex))
             {
-                _localColumnMappings = null;
+                ResetLocalColumnMappings();
 
                 try
                 {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
index fd6b06bafb..7c82e6dd21 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
@@ -45,10 +45,8 @@ public void Test()
                         using (DbDataReader reader = srcCmd.ExecuteReader())
                         {
                             IDictionary stats;
-                            long expectedIduCount = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 2 : 1;
                             long expectedSelectCount = DataTestUtility.IsAzureSynapse ? 4 : 13;
                             long expectedSelectRows = DataTestUtility.IsAzureSynapse ? 4 : 15;
-                            long expectedTransactions = DataTestUtility.IsAzureSynapse || DataTestUtility.IsAtLeastSQL2017() ? 2 : 1;
                             using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                             {
                                 bulkcopy.DestinationTableName = dstTable;
@@ -69,12 +67,12 @@ public void Test()
 
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersReceived"], "Unexpected BuffersReceived value.");
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersSent"], "Unexpected BuffersSent value.");
-                            DataTestUtility.AssertEqualsWithDescription(expectedIduCount, stats["IduCount"], "Unexpected IduCount value.");
+                            DataTestUtility.AssertEqualsWithDescription((long)0, stats["IduCount"], "Unexpected IduCount value.");
                             DataTestUtility.AssertEqualsWithDescription(expectedSelectCount, stats["SelectCount"], "Unexpected SelectCount value.");
                             DataTestUtility.AssertEqualsWithDescription((long)3, stats["ServerRoundtrips"], "Unexpected ServerRoundtrips value.");
                             DataTestUtility.AssertEqualsWithDescription(expectedSelectRows, stats["SelectRows"], "Unexpected SelectRows value.");
                             DataTestUtility.AssertEqualsWithDescription((long)2, stats["SumResultSets"], "Unexpected SumResultSets value.");
-                            DataTestUtility.AssertEqualsWithDescription(expectedTransactions, stats["Transactions"], "Unexpected Transactions value.");
+                            DataTestUtility.AssertEqualsWithDescription((long)0, stats["Transactions"], "Unexpected Transactions value.");
                         }
                     }
                 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs
index 12353e8695..39e99a5b1d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SqlGraphTables.cs
@@ -12,6 +12,39 @@ namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
     [Trait("Set", "2")]
     public class SqlGraphTables
     {
+        /// <summary>
+        /// Verifies that copying to a SQL Graph table without graph aliases in the mappings does not
+        /// require alias resolution.
+        /// </summary>
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAtLeastSQL2017))]
+        public void WriteToServer_CopyToSqlGraphNodeTableBySourceOrdinal_Succeeds()
+        {
+            string connectionString = DataTestUtility.TCPConnectionString;
+
+            using SqlConnection dstConn = new(connectionString);
+            using DataTable nodes = new()
+            {
+                Columns = { new DataColumn("Name", typeof(string)) }
+            };
+
+            dstConn.Open();
+
+            for (int i = 0; i < 5; i++)
+            {
+                nodes.Rows.Add($"Name {i}");
+            }
+
+            using Table dstNodeTable = new(dstConn, "SqlGraphNodeTableByOrdinal", "([Name] VARCHAR(100)) AS NODE");
+            using SqlBulkCopy nodeCopy = new(dstConn);
+
+            nodeCopy.DestinationTableName = dstNodeTable.Name;
+            nodeCopy.ColumnMappings.Add(0, "Name");
+            nodeCopy.WriteToServer(nodes);
+
+            using SqlCommand verifyCommand = new($"SELECT COUNT(*) FROM {dstNodeTable.Name}", dstConn);
+            Assert.Equal(5, (int)verifyCommand.ExecuteScalar());
+        }
+
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAtLeastSQL2017))]
         public void WriteToServer_CopyToSqlGraphNodeTable_Succeeds()
         {
@@ -170,5 +203,175 @@ public void WriteToServer_CopyToTableWithSameNameAsColumnAlias_Succeeds()
                 }
             }
         }
+
+        /// <summary>
+        /// Reuses one SqlBulkCopy after graph alias mappings have been resolved, then changes those
+        /// mappings to ordinary destination columns. This guards against stale resolved graph
+        /// canonical names being reused on the next operation.
+        /// </summary>
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAtLeastSQL2017))]
+        public void WriteToServer_ReuseAfterAliasMappingsThenOrdinaryMappings_Succeeds()
+        {
+            string connectionString = DataTestUtility.TCPConnectionString;
+
+            using SqlConnection dstConn = new(connectionString);
+            dstConn.Open();
+
+            using Table srcNodeTable = new(dstConn, "SqlGraph_ReuseAliasFirstNodes", "(Id INT PRIMARY KEY IDENTITY(1,1), [Name] VARCHAR(100)) AS NODE");
+            using Table dstEdgeTable = new(dstConn, "SqlGraph_ReuseAliasFirstEdges", "([Description] VARCHAR(100)) AS EDGE");
+            using Table dstNormalTable = new(dstConn, "SqlGraph_ReuseAliasFirstNormal", "([Description] VARCHAR(100), [ToId] NVARCHAR(MAX) NOT NULL, [FromId] NVARCHAR(MAX) NOT NULL)");
+            using DataTable edges = CreateEdgeSourceData(dstConn, srcNodeTable.Name);
+
+            using SqlBulkCopy edgeCopy = new(dstConn);
+            edgeCopy.ColumnMappings.Add("Description", "Description");
+            edgeCopy.ColumnMappings.Add("ToId", "$to_id");
+            edgeCopy.ColumnMappings.Add("FromId", "$from_id");
+
+            edgeCopy.DestinationTableName = dstEdgeTable.Name;
+            edgeCopy.WriteToServer(edges);
+
+            edgeCopy.ColumnMappings[0].SourceColumn = "Description";
+            edgeCopy.ColumnMappings[1].DestinationColumn = "ToId";
+            edgeCopy.ColumnMappings[2].DestinationColumn = "FromId";
+            edgeCopy.DestinationTableName = dstNormalTable.Name;
+            edgeCopy.WriteToServer(edges);
+
+            VerifyNormalEdgeData(dstConn, dstNormalTable.Name, edges);
+        }
+
+        /// <summary>
+        /// Reuses one SqlBulkCopy after ordinary mappings, then changes those mappings to graph
+        /// aliases. This ensures alias-resolution bypass state is recomputed for each operation.
+        /// </summary>
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAtLeastSQL2017))]
+        public void WriteToServer_ReuseAfterOrdinaryMappingsThenAliasMappings_Succeeds()
+        {
+            string connectionString = DataTestUtility.TCPConnectionString;
+
+            using SqlConnection dstConn = new(connectionString);
+            dstConn.Open();
+
+            using Table srcNodeTable = new(dstConn, "SqlGraph_ReuseOrdinaryFirstNodes", "(Id INT PRIMARY KEY IDENTITY(1,1), [Name] VARCHAR(100)) AS NODE");
+            using Table dstNormalTable = new(dstConn, "SqlGraph_ReuseOrdinaryFirstNormal", "([Description] VARCHAR(100), [ToId] NVARCHAR(MAX) NOT NULL, [FromId] NVARCHAR(MAX) NOT NULL)");
+            using Table dstEdgeTable = new(dstConn, "SqlGraph_ReuseOrdinaryFirstEdges", "([Description] VARCHAR(100)) AS EDGE");
+            using DataTable edges = CreateEdgeSourceData(dstConn, srcNodeTable.Name);
+
+            using SqlBulkCopy edgeCopy = new(dstConn);
+            edgeCopy.ColumnMappings.Add("Description", "Description");
+            edgeCopy.ColumnMappings.Add("ToId", "ToId");
+            edgeCopy.ColumnMappings.Add("FromId", "FromId");
+
+            edgeCopy.DestinationTableName = dstNormalTable.Name;
+            edgeCopy.WriteToServer(edges);
+
+            edgeCopy.ColumnMappings[0].SourceColumn = "Description";
+            edgeCopy.ColumnMappings[1].DestinationColumn = "$to_id";
+            edgeCopy.ColumnMappings[2].DestinationColumn = "$from_id";
+            edgeCopy.DestinationTableName = dstEdgeTable.Name;
+            edgeCopy.WriteToServer(edges);
+
+            VerifyGraphEdgeData(dstConn, dstEdgeTable.Name, edges);
+        }
+
+        /// <summary>
+        /// Exercises CacheMetadata with graph alias mappings against a real SQL Graph edge table,
+        /// including reuse of the cached alias result set on a later operation.
+        /// </summary>
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsAtLeastSQL2017))]
+        public void WriteToServer_CacheMetadataWithSqlGraphAliasMappings_Succeeds()
+        {
+            string connectionString = DataTestUtility.TCPConnectionString;
+
+            using SqlConnection dstConn = new(connectionString);
+            dstConn.Open();
+
+            using Table srcNodeTable = new(dstConn, "SqlGraph_CacheAliasNodes", "(Id INT PRIMARY KEY IDENTITY(1,1), [Name] VARCHAR(100)) AS NODE");
+            using Table dstEdgeTable = new(dstConn, "SqlGraph_CacheAliasEdges", "([Description] VARCHAR(100)) AS EDGE");
+            using DataTable edges = CreateEdgeSourceData(dstConn, srcNodeTable.Name);
+
+            using SqlBulkCopy cachedCopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
+
+            cachedCopy.DestinationTableName = dstEdgeTable.Name;
+            cachedCopy.ColumnMappings.Add("Description", "Description");
+            cachedCopy.ColumnMappings.Add("ToId", "$to_id");
+            cachedCopy.ColumnMappings.Add("FromId", "$from_id");
+            cachedCopy.WriteToServer(edges);
+            VerifyGraphEdgeData(dstConn, dstEdgeTable.Name, edges);
+
+            cachedCopy.ColumnMappings[0].SourceColumn = "Description";
+            cachedCopy.ColumnMappings[1].DestinationColumn = "$to_id";
+            cachedCopy.ColumnMappings[2].DestinationColumn = "$from_id";
+            cachedCopy.WriteToServer(edges);
+            VerifyGraphEdgeRowCount(dstConn, dstEdgeTable.Name, edges.Rows.Count * 2);
+        }
+
+        private static DataTable CreateEdgeSourceData(SqlConnection connection, string nodeTableName)
+        {
+            using SqlCommand insertSampleNodes = new($"INSERT INTO {nodeTableName} ([Name]) VALUES ('A'), ('B'), ('C')", connection);
+            insertSampleNodes.ExecuteNonQuery();
+
+            DataTable edges = new()
+            {
+                Columns =
+                {
+                    new DataColumn("Description", typeof(string)),
+                    new DataColumn("ToId", typeof(string)),
+                    new DataColumn("FromId", typeof(string))
+                }
+            };
+
+            using SqlCommand nodeQuery = new($"SELECT $node_id FROM {nodeTableName} ORDER BY Id", connection);
+            using SqlDataReader reader = nodeQuery.ExecuteReader();
+            Assert.True(reader.Read());
+            string firstNodeId = reader.GetString(0);
+
+            Assert.True(reader.Read());
+            string secondNodeId = reader.GetString(0);
+            edges.Rows.Add("First edge", firstNodeId, secondNodeId);
+
+            Assert.True(reader.Read());
+            string thirdNodeId = reader.GetString(0);
+            edges.Rows.Add("Second edge", secondNodeId, thirdNodeId);
+
+            return edges;
+        }
+
+        private static void VerifyGraphEdgeData(SqlConnection connection, string edgeTableName, DataTable expectedEdges)
+        {
+            using SqlCommand verificationCommand = new($"SELECT [Description], $to_id, $from_id FROM {edgeTableName} ORDER BY [Description]", connection);
+            using SqlDataReader reader = verificationCommand.ExecuteReader();
+
+            foreach (DataRow expectedRow in expectedEdges.Select(filterExpression: null, sort: "Description"))
+            {
+                Assert.True(reader.Read());
+                Assert.Equal(expectedRow["Description"], reader.GetString(0));
+                Assert.Equal(expectedRow["ToId"], reader.GetString(1));
+                Assert.Equal(expectedRow["FromId"], reader.GetString(2));
+            }
+
+            Assert.False(reader.Read());
+        }
+
+        private static void VerifyNormalEdgeData(SqlConnection connection, string tableName, DataTable expectedEdges)
+        {
+            using SqlCommand verificationCommand = new($"SELECT [Description], [ToId], [FromId] FROM {tableName} ORDER BY [Description]", connection);
+            using SqlDataReader reader = verificationCommand.ExecuteReader();
+
+            foreach (DataRow expectedRow in expectedEdges.Select(filterExpression: null, sort: "Description"))
+            {
+                Assert.True(reader.Read());
+                Assert.Equal(expectedRow["Description"], reader.GetString(0));
+                Assert.Equal(expectedRow["ToId"], reader.GetString(1));
+                Assert.Equal(expectedRow["FromId"], reader.GetString(2));
+            }
+
+            Assert.False(reader.Read());
+        }
+
+        private static void VerifyGraphEdgeRowCount(SqlConnection connection, string edgeTableName, int expectedRows)
+        {
+            using SqlCommand countCommand = new($"SELECT COUNT(*) FROM {edgeTableName}", connection);
+            Assert.Equal(expectedRows, (int)countCommand.ExecuteScalar());
+        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlBulkCopyCacheMetadataTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlBulkCopyCacheMetadataTest.cs
index 90aa4a8f5e..5eef28c471 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlBulkCopyCacheMetadataTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlBulkCopyCacheMetadataTest.cs
@@ -18,6 +18,20 @@ private static void SetCachedMetadata(SqlBulkCopy bulkCopy, BulkCopySimpleResult
                 .SetValue(bulkCopy, value);
         }
 
+        private static void SetResolveColumnAliases(SqlBulkCopy bulkCopy, bool value)
+        {
+            typeof(SqlBulkCopy)
+                .GetField("_localColumnMappingsResolveAliases", BindingFlags.Instance | BindingFlags.NonPublic)!
+                .SetValue(bulkCopy, value);
+        }
+
+        private static void SetCachedMetadataResolveAliases(SqlBulkCopy bulkCopy, bool value)
+        {
+            typeof(SqlBulkCopy)
+                .GetField("_cachedMetadataResolveAliases", BindingFlags.Instance | BindingFlags.NonPublic)!
+                .SetValue(bulkCopy, value);
+        }
+
         [Fact]
         public void CacheMetadata_FlagValue_IsCorrect()
         {
@@ -117,6 +131,22 @@ public void DestinationTableName_Change_ClearsCachedMetadata()
             Assert.Null(bulkCopy.CachedMetadata);
         }
 
+        [Theory]
+        [InlineData(false, false, true)]
+        [InlineData(false, true, true)]
+        [InlineData(true, false, false)]
+        [InlineData(true, true, true)]
+        public void IsCachedMetadataValid_DependsOnOperationAndCachedAliasResolution(bool resolveAliases, bool cachedMetadataResolveAliases, bool expected)
+        {
+            using SqlBulkCopy bulkCopy = new(new SqlConnection(), SqlBulkCopyOptions.CacheMetadata, null);
+
+            SetCachedMetadata(bulkCopy, new BulkCopySimpleResultSet());
+            SetCachedMetadataResolveAliases(bulkCopy, cachedMetadataResolveAliases);
+            SetResolveColumnAliases(bulkCopy, resolveAliases);
+
+            Assert.Equal(expected, bulkCopy.IsCachedMetadataValid());
+        }
+
         [Fact]
         public void Constructor_WithCacheMetadataOption_Succeeds()
         {

From c16adb7a11674b66f9e9ca5e5a38e768ce8d5ff3 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Fri, 21 Aug 2026 13:52:45 -0700
Subject: [PATCH 241/298] Channel Pool: Reclaim leaked connections (#4529)

* Reclaim emancipated connections in ChannelDbConnectionPool

A SqlConnection that is garbage collected without ever being closed or disposed
leaves its internal connection "emancipated": still tracked by the pool, but
with no owner that could ever return it. WaitHandleDbConnectionPool sweeps for
these before waiting for a free connection; ChannelDbConnectionPool did not, so
an emancipated connection permanently occupied a pool slot. At MaxPoolSize that
meant every subsequent Open timed out -- forever, not just once.

GetInternalConnection now performs the same sweep just before parking on the
idle channel. This is deliberately confined to the slow path: it is
O(MaxPoolSize) and allocates a snapshot, so it must not run on the hot acquire
path.

The sweep takes the connection lock with Monitor.TryEnter rather than Enter.
IsEmancipated has to be read under that lock to avoid racing PrePush/PostPop,
but a connection that is currently locked is being actively handed out or
returned and therefore is not emancipated anyway, so skipping it costs nothing
and keeps the sweep from blocking the caller. Only PrePush happens under the
lock; deactivation, which can make server round trips, is deferred until all
locks are released.

Deactivating and routing a returned connection is now factored out of
ReturnInternalConnection into DeactivateAndRouteConnection so reclamation can
share it. Reclamation must not go through ReturnInternalConnection itself
because it has already performed the PrePush and there is no owning object left
to validate against.

Tests:

- Added ConnectionPoolVersionScope, which flips the pool version switch and
  clears all pools on both entry and exit. Clearing is required because a pool
  binds to its implementation at creation time, so without it pools leak across
  tests.
- Parameterized ReclaimEmancipatedOnOpenTest and MaxPoolWaitForConnectionTest by
  pool version. ReclaimEmancipatedOnOpenTest fails against ChannelDbConnectionPool
  without this fix.
- Three pool-exhaustion unit tests let their owning SqlConnections go out of
  scope, so reclamation could legitimately hand the "should time out" waiter a
  connection. They now keep the owners alive, which is what they meant anyway.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Sweep for emancipated connections while callers are parked

ChannelDbConnectionPool only reclaimed emancipated connections inline, on
the caller's own thread, immediately before parking on the idle channel. A
connection becomes emancipated when its owning SqlConnection is collected
without being closed, and that can only be observed after a GC. If the GC
lands after the caller has already parked, nothing sweeps again: every
caller is blocked on the channel, so the pool stays saturated until an
unrelated caller arrives to run its own inline sweep. With all callers
parked, that never happens and they all fail on their connect timeout.

The sweep cannot simply be retried on the parked caller's thread. Channels
guarantee FIFO delivery to ReadAsync callers, which the pool relies on for
fairness, so a caller that cancelled its read to re-sweep would rejoin at
the back of the queue behind callers that arrived later. The trigger has to
come from off-thread.

PoolReclaimer adds a demand-driven timer for that. Callers register around
their parked wait, the timer arms on the first registration and disarms on
the last, so a pool that is not blocking pays nothing beyond the ~100 bytes
of a disarmed timer, which is not in the timer queue's list and does not
lengthen any tick. It is separate from PoolPruner rather than folded into
it: a merged timer would have to run at the faster of the two cadences, and
the prune interval is derived from the idle timeout and stretches to 288s
at the default, so merging would multiply prune-driven ticks by ~28x.

The reclaimer is built for every pool configuration, unlike the pruner,
which is null for a fixed-size pool or a zero idle timeout. A connection
can leak in any configuration, and a fixed-size pool is where a leaked slot
hurts most.

The sweep runs one-shot and re-arms at the end of each callback so a slow
sweep cannot overlap the next, sweeps outside its lock because reclamation
can make server round trips, and swallows exceptions because a throwing
timer callback would tear down the process. The timer is created via
ADP.UnsafeCreateTimer so it does not capture the execution context of
whichever caller happens to park first, which would otherwise pin that
caller's async locals for the lifetime of the pool.

The one-second cadence is far tighter than the legacy pool's background
reclaim, which rides a randomized 2-4 minute cleanup wait and is too slow
to rescue a caller inside a 15 second connect timeout. Sweeping only while
callers are parked is what makes the tighter cadence affordable.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Walk pool slots without allocating a snapshot list

ConnectionPoolSlots.Snapshot copied every occupied slot into a new List
sized to the pool's full capacity, and the reclaim sweep was its only
caller. The copy bought nothing: the backing array has a fixed capacity and
is never reallocated, and the snapshot was just a sequence of the same
per-slot volatile reads an in-place walk performs, so it offered no
consistency guarantee beyond the best-effort one already documented.

What it did cost was a list per sweep even when nothing was emancipated,
roughly 800 bytes at the default MaxPoolSize of 100. That was tolerable
when the sweep only ran inline on a caller about to park. It is less so now
that the reclaim timer sweeps once a second for as long as any caller is
parked, which is exactly when the pool is under pressure.

Replaced with a struct enumerator so the sweep's foreach allocates nothing
and the backing array stays private to the collection.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Count reclaimed connections and align reclaim traces

Rebasing onto the pool instrumentation work makes two things available that
the reclaim path was missing.

The metrics seam now exists, so the sweep emits ReclaimedConnectionRequest
the way WaitHandleDbConnectionPool does. Previously the
number-of-reclaimed-connections counter always read zero under pool V2,
which made a leaking application look healthy on exactly the counter that
would have identified it.

The trace call sites also predate the new pool trace message format, so
they still used the legacy prov-prefixed form. Converted the sweep,
reclaimer and shutdown messages to match their neighbours.

Adds a parity test asserting both pool implementations report identical
counters when a leaked connection is reclaimed. It drives the sweep the
same way for both, by capping the pool at one connection, leaking it and
requesting another, so it asserts observable behaviour rather than an
internal entry point. The counters agree exactly, including a shared quirk
now pinned by the test: reclamation emits no soft disconnect, so
activeSoftConnections drifts up by one for every leaked connection.

Also makes the parked-caller test deterministic. It relied on the leaked
owner surviving until the second caller parked, but any test running in
parallel could collect it first, in which case the caller's inline sweep
succeeded and it never parked. The owner is now rooted in a GCHandle that
the test frees at the exact point it wants emancipation to become
observable. A local cannot express that: in a Debug build its stack slot
roots the object for the rest of the method even once it is assigned null.
That also removes the thread-pool headroom workaround added earlier, which
was aimed at a starvation theory the diagnostics disproved.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review feedback on reclaim sweep

Correct the Shutdown comment: ITimer.Dispose does not wait for an
in-flight callback, so disposing the reclaimer only narrows the window.
What actually prevents a late sweep from stranding a connection is the
ordering below it, so name that instead.

Drop the per-sweep entry trace and the per-connection reclaim trace in
favor of a single summary trace carrying the count, emitted only when
something was reclaimed. The sweep runs once per second for as long as
any caller is parked, so an entry trace floods the stream of a pool that
is merely busy.

Document why the slot walk is safe without a collection-level lock,
unlike the legacy pool's scan under lock (_objectList).

Assert that ExitParkedWait is balanced, so a park site missing its
EnterParkedWait surfaces in test runs rather than silently
under-counting.

Note that a reclaimed connection can inline a woken caller's
continuation on the timer thread, delaying the next sweep, and that
ParkedWaiters counts sync callers still queued for the sync-over-async
semaphore.

Cover the sync park path end to end. It blocks the calling thread inside
ReadChannelSyncOverAsync rather than awaiting the channel, so it is a
genuinely different path from ReadAsync. Both end-to-end tests were
verified to fail with the sweep stubbed out.

Also remove a stale comment claiming the sweep allocates a snapshot.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* update comments

* Route reclamation through ReturnInternalConnection

Reclamation returned a leaked connection by calling the deactivate/route
helper directly, skipping the soft disconnect that ReturnInternalConnection
emits. A checkout is counted, so a leaked connection was counted as checked
out forever and counted again each time it was re-vended, drifting
activeSoftConnections up on every leak.

Routing the return through ReturnInternalConnection instead of duplicating
part of it keeps the accounting in one place. That means the sweep can no
longer claim the connection itself, because ReturnInternalConnection re-takes
the connection lock to call PrePush and PrePush throws on a second push.

Gate the sweep to close that gap. The sweep now selects under the per-
connection lock and returns after releasing it, so something has to guarantee
nothing claims the connection in between. Of the paths that move the pooled
count, only a second sweep can reach an emancipated connection: a handout
needs it in the idle channel, a normal return needs a live owner,
DelegatedTransactionEnded is gated on a flag IsEmancipated already excludes,
and Clear only drains the idle channel. So excluding concurrent sweeps is
sufficient.

TryEnter rather than Enter, so no thread ever waits on the gate. A saturated
pool previously ran one O(MaxPoolSize) walk per waiting caller over the same
slots; now a caller that arrives mid-sweep skips its walk and parks, and the
in-flight sweep's connection is waiting in the channel when it does. It also
matters that nobody blocks here because the gate is held across deactivation,
which can make server round trips.

WaitHandleDbConnectionPool has the same accounting hole. Left as-is and
tracked by #4555, so the parity test now asserts the drift for that pool and
the corrected value for this one.

Also move the Reclaimer property in with the other properties, and fix the
indentation of the reclaim summary trace.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Inline DeactivateAndRouteConnection into its only caller

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Drop the inline reclaim sweep, leaving reclamation to the timer

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Count reclaims only on success and tolerate a failed return

Replace the hand-rolled slot enumerator with an iterator method.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Drop the vacuous reclaimer construction test

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Share the reclamation tests across both pool implementations

Reclaiming a leaked connection is behavior both pools owe, so the tests for it
should not be written against one of them. Extract the pool construction and
leak helpers into PoolTestHarness and add DbConnectionPoolReclamationTest, a
theory over (implementation, sync/async) that asserts only what a caller can
observe, driving whichever mechanism a pool uses by advancing a fake clock.

ChannelDbConnectionPoolReclaimTimerTest becomes PoolReclaimerTest and keeps
only the timer arm/disarm bookkeeping, which has no shared counterpart.

Serving a connection leaked after the request began stays channel-only:
WaitHandle stops reclaiming once it gives up on the creation mutex, so it
times out with a recoverable slot sitting there.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Note why the reclaimer is internal rather than private

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Trim the sweep gate comment

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Lead the sweep walk comment with the IsEmancipated lock requirement

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Use SpinUntil in the test harness and prune the new comments

WaitFor and AdvanceUntil rolled their own sleep loops; both go through
SpinWait.SpinUntil now. AdvanceUntil spins in short slices rather than passing
the whole timeout, so the fake clock only moves while the condition is unmet.

The PoolReclaimer class doc still said the pool sweeps inline before parking,
which stopped being true when that sweep was removed.

Dropped comments that restate the code or repeat a doc a line or two away, and
condensed the slot-walk and enumerator docs to the arguments that aren't
evident from the code.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Keep the shared harness to pool construction

The leak-specific helpers only a couple of reclamation tests use were crowding
out the part every pool test actually wants. CheckOutAndRootOwner, WaitFor and
AdvanceUntil move to their callers; AdvanceUntil is duplicated rather than
shared, which is cheaper than a harness nobody can skim.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Remove misleading reclaimer comparison

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Remove redundant reclaimer comment

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Remove unnecessary callback lock

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Remove unnecessary connection keep-alive

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Remove remaining connection keep-alives

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Keep pool test owners alive

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Combine reclamation reuse coverage

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Align legacy pool return nullability

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Restore reclaimer callback guard

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Avoid allocations while walking pool slots

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../ConnectionPool/ChannelDbConnectionPool.cs | 164 ++++++++++-
 .../ConnectionPool/ConnectionPoolSlots.cs     |  44 +++
 .../ConnectionPool/IDbConnectionPool.cs       |   8 +-
 .../SqlClient/ConnectionPool/PoolReclaimer.cs | 256 ++++++++++++++++++
 .../Common/ConnectionPoolVersionScope.cs      |  62 +++++
 .../ConnectionPoolTest/ConnectionPoolTest.cs  |  15 +-
 .../ChannelDbConnectionPoolTest.cs            |  32 ++-
 .../ConnectionPool/ConnectionPoolSlotsTest.cs |  29 ++
 .../DbConnectionPoolInstrumentationTest.cs    | 179 +++++++-----
 .../DbConnectionPoolReclamationTest.cs        | 254 +++++++++++++++++
 .../ConnectionPool/PoolReclaimerTest.cs       | 153 +++++++++++
 .../ConnectionPool/PoolTestHarness.cs         | 149 ++++++++++
 .../TransactedConnectionPoolTest.cs           |   2 +-
 13 files changed, 1263 insertions(+), 84 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolReclaimer.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/ConnectionPoolVersionScope.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolReclamationTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/PoolReclaimerTest.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/PoolTestHarness.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index 09fe3a1c2d..a547ce0fd4 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data.Common;
 using System.Diagnostics;
@@ -74,6 +75,13 @@ internal sealed class ChannelDbConnectionPool : IDbConnectionPool, IDisposable
 
         private readonly int _instanceId = Interlocked.Increment(ref _instanceCount);
 
+        /// <summary>
+        /// Serializes emancipated-connection sweeps. Held for the duration of a sweep, including the
+        /// routing of every reclaimed connection, so that a connection this sweep has selected
+        /// cannot be claimed by another sweep before it is returned.
+        /// </summary>
+        private readonly object _reclaimSweepGate = new();
+
         /// <summary>
         /// Tracks all connections currently managed by this pool, whether idle or busy.
         /// Only updated rarely - when physical connections are opened/closed - but is read in perf-sensitive contexts.
@@ -201,6 +209,8 @@ internal ChannelDbConnectionPool(
                 Pruner = new PoolPruner(this, PoolGroupOptions.IdleTimeout);
             }
 
+            Reclaimer = new PoolReclaimer(this, _timeProvider);
+
             State = Running;
 
             SqlClientEventSource.Log.TryPoolerTraceEvent(
@@ -290,6 +300,13 @@ public ConcurrentDictionary<
         /// </summary>
         private bool HasTransactionAffinity => PoolGroupOptions.HasTransactionAffinity;
 
+        /// <summary>
+        /// Drives background sweeps for emancipated connections. Unlike <see cref="Pruner"/> this is
+        /// always present, since reclamation applies to every pool configuration. Internal rather
+        /// than private so tests can drive the timer bookkeeping directly.
+        /// </summary>
+        internal PoolReclaimer Reclaimer { get; }
+
         /// <summary>
         /// The most recently launched warmup/replenishment loop task, exposed so tests can await a
         /// warmup pass to a deterministic completion instead of polling pool counters. May be null
@@ -540,7 +557,7 @@ public DbConnectionInternal ReplaceConnection(
         }
 
         /// <inheritdoc />
-        public void ReturnInternalConnection(DbConnectionInternal connection, DbConnection owningObject)
+        public void ReturnInternalConnection(DbConnectionInternal connection, DbConnection? owningObject)
         {
             Metrics.SoftDisconnectRequest();
 
@@ -765,6 +782,19 @@ public void Shutdown()
                     "ChannelDbConnectionPool.Shutdown | INFO | {0}, Pruner.Dispose threw, continuing shutdown: {1}", Id, ex);
             }
 
+            // Best effort: ITimer.Dispose does not wait for a sweep already in flight. Late
+            // reclaims are handled by _idleChannel.Complete() below, after which connections are
+            // destroyed rather than pooled.
+            try
+            {
+                Reclaimer.Dispose();
+            }
+            catch (Exception ex)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.Shutdown | INFO | {0}, Reclaimer.Dispose threw, continuing shutdown: {1}", Id, ex);
+            }
+
             // Dispose the error state so its exit timer is released. Otherwise a timer scheduled
             // during the blocking period would keep this pool reachable and continue firing
             // callbacks/logging after shutdown.
@@ -1347,7 +1377,7 @@ private void RemoveConnection(DbConnectionInternal connection)
 
             // Removing a connection from the pool opens a free slot.
             // Write a null to the idle connection channel to wake up a waiter, who can now open a new
-            // connection. Statement order is important since we have synchronous completions on the channel.
+            // connection.
             _idleChannel.TryWrite(null);
 
             connection.Dispose();
@@ -1483,13 +1513,24 @@ private async Task<DbConnectionInternal> GetInternalConnection(
                     // If we're at max capacity and couldn't open a connection. Block on the idle channel with a
                     // timeout. Note that Channels guarantee fair FIFO behavior to callers of ReadAsync
                     // (first-come, first-served), which is crucial to us.
-                    if (async)
-                    {
-                        connection ??= await _idleChannel.ReadAsync(cancellationToken).ConfigureAwait(false);
-                    }
-                    else
+                    //
+                    // Registering with the reclaimer is what keeps a leaked connection from stranding
+                    // us here forever; it sweeps on a timer while anyone is parked and routes what it
+                    // reclaims back through this channel. Sweeping inline instead would cost an
+                    // O(MaxPoolSize) walk on every saturated acquire in applications that never leak.
+                    if (connection is null)
                     {
-                        connection ??= ReadChannelSyncOverAsync(cancellationToken);
+                        Reclaimer.EnterParkedWait();
+                        try
+                        {
+                            connection = async
+                                ? await _idleChannel.ReadAsync(cancellationToken).ConfigureAwait(false)
+                                : ReadChannelSyncOverAsync(cancellationToken);
+                        }
+                        finally
+                        {
+                            Reclaimer.ExitParkedWait();
+                        }
                     }
                 }
                 catch (OperationCanceledException)
@@ -1526,6 +1567,113 @@ private async Task<DbConnectionInternal> GetInternalConnection(
             return connection;
         }
 
+        /// <summary>
+        /// Reclaims connections whose owning <see cref="DbConnection"/> has been garbage collected
+        /// without being closed or disposed. Such connections are still tracked by the pool but can
+        /// never be returned by their owner, so without this sweep they would leak pool slots.
+        /// </summary>
+        internal void ReclaimEmancipatedConnections()
+        {
+            // One sweep at a time, so nothing else can claim a connection between the point it is
+            // found emancipated and the PrePush that claims it. TryEnter rather than Enter: whatever
+            // the in-flight sweep reclaims lands in the idle channel either way.
+            bool sweeping = false;
+            try
+            {
+                Monitor.TryEnter(_reclaimSweepGate, ref sweeping);
+                if (!sweeping)
+                {
+                    return;
+                }
+
+                SweepEmancipatedConnections();
+            }
+            finally
+            {
+                if (sweeping)
+                {
+                    Monitor.Exit(_reclaimSweepGate);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Body of <see cref="ReclaimEmancipatedConnections"/>. Must be called with
+        /// <see cref="_reclaimSweepGate"/> held.
+        /// </summary>
+        private void SweepEmancipatedConnections()
+        {
+            List<DbConnectionInternal>? reclaimed = null;
+
+            // No collection-level lock, unlike WaitHandleDbConnectionPool's scan under lock
+            // (_objectList): each slot is read individually, so the walk can see a slot that was
+            // concurrently emptied or refilled. Safe here because a connection is only emancipated
+            // while checked out, and a checked-out connection is not in the idle channel, so neither
+            // the pruner nor Clear can remove it underneath us. A concurrently replaced slot costs
+            // this sweep a miss, never a connection resurrected after removal.
+            foreach (DbConnectionInternal connection in _connectionSlots)
+            {
+                // IsEmancipated is only stable under the connection lock, which guards the
+                // PrePush/PostPop that move it in and out of the pool. TryEnter rather than Enter: a
+                // connection someone else holds is mid-handout or mid-return, so it is not
+                // emancipated anyway and blocking on it would only stall that caller.
+                bool locked = false;
+                try
+                {
+                    Monitor.TryEnter(connection, ref locked);
+
+                    if (locked && connection.IsEmancipated)
+                    {
+                        (reclaimed ??= new List<DbConnectionInternal>()).Add(connection);
+                    }
+                }
+                finally
+                {
+                    if (locked)
+                    {
+                        Monitor.Exit(connection);
+                    }
+                }
+            }
+
+            if (reclaimed is null)
+            {
+                return;
+            }
+
+            int returned = 0;
+            foreach (DbConnectionInternal connection in reclaimed)
+            {
+                try
+                {
+                    connection.DetachCurrentTransactionIfEnded();
+                    ReturnInternalConnection(connection, owningObject: null);
+                }
+                catch (Exception ex)
+                {
+                    // One connection failing to return must not strand the rest of the sweep.
+                    SqlClientEventSource.Log.TryPoolerTraceEvent(
+                        "ChannelDbConnectionPool.ReclaimEmancipatedConnections | ERR | {0}, Connection {1}, Return threw: {2}.",
+                        Id,
+                        connection.ObjectID,
+                        ex);
+
+                    continue;
+                }
+
+                Metrics.ReclaimedConnectionRequest();
+                returned++;
+            }
+
+            if (returned > 0)
+            {
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "ChannelDbConnectionPool.ReclaimEmancipatedConnections | INFO | {0}, Reclaimed {1} emancipated connection(s).",
+                    Id,
+                    returned);
+            }
+        }
+
         /// <summary>
         /// Performs a blocking synchronous read from the idle connection channel.
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs
index b9465ec93c..7a8eb631f1 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ConnectionPoolSlots.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using Microsoft.Data.ProviderBase;
@@ -204,6 +205,49 @@ internal bool TryReplace(DbConnectionInternal oldConnection, DbConnectionInterna
             return false;
         }
 
+        /// <summary>
+        /// Enumerates the connections currently tracked by this collection. Best-effort: slots are
+        /// read individually, so a caller must tolerate entries that have since left the pool, and an
+        /// entry added during the walk may or may not be seen. Intended for infrequent bookkeeping
+        /// passes, not for hot paths.
+        /// </summary>
+        public Enumerator GetEnumerator() => new(_connections);
+
+        /// <summary>
+        /// Enumerates the non-null slots without allocating an iterator state machine.
+        /// </summary>
+        internal struct Enumerator
+        {
+            private readonly DbConnectionInternal?[] _connections;
+            private int _index;
+            private DbConnectionInternal? _current;
+
+            internal Enumerator(DbConnectionInternal?[] connections)
+            {
+                _connections = connections;
+                _index = -1;
+                _current = null;
+            }
+
+            public DbConnectionInternal Current => _current!;
+
+            public bool MoveNext()
+            {
+                while (++_index < _connections.Length)
+                {
+                    DbConnectionInternal? connection = Volatile.Read(ref _connections[_index]);
+                    if (connection is not null)
+                    {
+                        _current = connection;
+                        return true;
+                    }
+                }
+
+                _current = null;
+                return false;
+            }
+        }
+
         /// <summary>
         /// Attempts to reserve a spot in the collection.
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
index ec30b4efa6..178eb03a15 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/IDbConnectionPool.cs
@@ -156,8 +156,12 @@ internal interface IDbConnectionPool
         /// Returns an internal connection to the pool.
         /// </summary>
         /// <param name="obj">The internal connection to return to the pool.</param>
-        /// <param name="owningObject">The connection that currently owns this internal connection. Used to verify ownership.</param>
-        void ReturnInternalConnection(DbConnectionInternal obj, DbConnection owningObject);
+        /// <param name="owningObject">
+        /// The connection that currently owns this internal connection. Used to verify ownership.
+        /// Null when the pool is reclaiming an emancipated connection, whose owner was garbage
+        /// collected without closing it; the ownership check then asserts that no owner is alive.
+        /// </param>
+        void ReturnInternalConnection(DbConnectionInternal obj, DbConnection? owningObject);
 
         /// <summary>
         /// Puts an internal connection from a transacted pool back into the general pool.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolReclaimer.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolReclaimer.cs
new file mode 100644
index 0000000000..ffd4884346
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/PoolReclaimer.cs
@@ -0,0 +1,256 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Microsoft.Data.Common;
+using Microsoft.Data.SqlClient.Internal;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.ConnectionPool
+{
+    /// <summary>
+    /// Drives background sweeps for emancipated connections in <see cref="ChannelDbConnectionPool"/>
+    /// while callers are parked waiting for a connection.
+    /// <para>
+    /// A connection becomes emancipated when its owning <see cref="System.Data.Common.DbConnection"/>
+    /// is garbage collected without ever being closed or disposed. Emancipation only becomes
+    /// observable once the collector has run, which routinely happens after a caller has already
+    /// parked, so a single sweep at request time cannot cover it. Without a background sweep every
+    /// parked caller would wait out its full timeout even though a pool slot was recoverable the
+    /// whole time.
+    /// </para>
+    /// <para>
+    /// The sweep cannot run on the parked caller's own thread. <see cref="ChannelDbConnectionPool"/>
+    /// relies on the FIFO ordering that <c>Channel</c> guarantees to readers, so a parked caller that
+    /// cancelled its read in order to re-sweep would lose its place in line to callers that arrived
+    /// later. The sweep therefore runs on a timer callback instead.
+    /// </para>
+    /// <para>
+    /// The timer is demand-driven: it is armed when the first caller parks and disarmed when the last
+    /// one leaves, so a pool with no blocked callers never wakes the process. This mirrors the
+    /// approach taken for the connection factory's pruning timer (issue #1881).
+    /// </para>
+    /// </summary>
+    internal sealed class PoolReclaimer : IDisposable
+    {
+        /// <summary>
+        /// Interval between sweeps while at least one caller is parked.
+        /// <para>
+        /// Chosen relative to the connect timeout rather than to any pool sizing option: the value
+        /// bounds how long a parked caller can wait beyond the point at which its connection became
+        /// reclaimable, so it only has to be small compared to the default 15 second connect timeout.
+        /// It is not worth going lower, because emancipation only becomes observable after a garbage
+        /// collection and sweeping faster than the collector produces new information just burns CPU.
+        /// </para>
+        /// </summary>
+        internal static readonly TimeSpan SweepInterval = TimeSpan.FromSeconds(1);
+
+        private readonly ChannelDbConnectionPool _pool;
+
+        /// <summary>
+        /// One-shot timer that triggers a sweep. Re-armed at the end of each callback rather than
+        /// being created as a periodic timer, so a sweep that runs longer than
+        /// <see cref="SweepInterval"/> can never overlap with the next one.
+        /// </summary>
+        private readonly ITimer _timer;
+
+        /// <summary>
+        /// Guards every state transition of this instance, including all
+        /// <see cref="ITimer.Change(TimeSpan, TimeSpan)"/> calls.
+        /// </summary>
+        private readonly object _lock = new();
+
+        /// <summary>
+        /// Number of callers currently parked waiting on the pool's idle channel. The timer is armed
+        /// exactly while this is non-zero.
+        /// </summary>
+        private int _parkedWaiters;
+
+        /// <summary>
+        /// Whether the timer is currently armed. Tracked explicitly rather than being inferred from
+        /// <see cref="_parkedWaiters"/> so an in-flight callback can tell that it was disarmed while
+        /// it was running and decline to re-arm itself.
+        /// </summary>
+        private bool _armed;
+
+        /// <summary>
+        /// Whether <see cref="Dispose"/> has run. Once set, the timer is never armed again.
+        /// </summary>
+        private bool _disposed;
+
+        /// <summary>
+        /// Creates a reclaimer for the given pool. The timer is created disarmed; it is armed on
+        /// demand by <see cref="EnterParkedWait"/>.
+        /// </summary>
+        /// <param name="pool">The owning connection pool.</param>
+        /// <param name="timeProvider">
+        /// Time source used to create the timer. Tests inject a fake provider so sweeps can be driven
+        /// deterministically without real waits.
+        /// </param>
+        internal PoolReclaimer(ChannelDbConnectionPool pool, TimeProvider timeProvider)
+        {
+            _pool = pool;
+
+            // The execution context is deliberately not captured. The timer is armed by whichever
+            // caller happens to park first, and capturing that caller's context would pin its async
+            // locals (and any impersonation context) for as long as this pool-scoped timer lives.
+            _timer = ADP.UnsafeCreateTimer(
+                timeProvider,
+                static reclaimer => reclaimer.OnSweepCallback(),
+                this,
+                Timeout.InfiniteTimeSpan,
+                Timeout.InfiniteTimeSpan);
+        }
+
+        #region Internal test surface
+
+        /// <summary>Whether the sweep timer is currently armed. Exposed for unit tests.</summary>
+        internal bool IsTimerEnabled
+        {
+            get
+            {
+                lock (_lock)
+                {
+                    return _armed;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Number of callers currently registered as parked. Exposed for unit tests.
+        /// <para>
+        /// Not an exact count of callers sitting on the idle channel. On the synchronous path
+        /// registration happens before <c>ReadChannelSyncOverAsync</c> takes the process-wide
+        /// sync-over-async semaphore, so a caller counts as parked while it is still queued for that
+        /// semaphore. The effect is only that the timer arms slightly early, which is harmless: the
+        /// caller is blocked either way, and a sweep that runs before it reaches the channel simply
+        /// finds nothing.
+        /// </para>
+        /// </summary>
+        internal int ParkedWaiters
+        {
+            get
+            {
+                lock (_lock)
+                {
+                    return _parkedWaiters;
+                }
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Registers a caller that is about to park on the pool's idle channel, arming the sweep
+        /// timer if this is the only parked caller. Must be paired with <see cref="ExitParkedWait"/>
+        /// in a finally block so a cancelled or timed out wait still releases its registration.
+        /// </summary>
+        internal void EnterParkedWait()
+        {
+            lock (_lock)
+            {
+                _parkedWaiters++;
+
+                if (_armed || _disposed)
+                {
+                    return;
+                }
+
+                _armed = true;
+                _timer.Change(SweepInterval, Timeout.InfiniteTimeSpan);
+
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "PoolReclaimer.EnterParkedWait | INFO | {0}, Sweep timer started.", _pool.Id);
+            }
+        }
+
+        /// <summary>
+        /// Unregisters a caller that is no longer parked, disarming the sweep timer once the last
+        /// one leaves so an unblocked pool does not keep waking the process.
+        /// </summary>
+        internal void ExitParkedWait()
+        {
+            lock (_lock)
+            {
+                Debug.Assert(_parkedWaiters > 0, "ExitParkedWait called without a matching EnterParkedWait.");
+
+                if (_parkedWaiters > 0)
+                {
+                    _parkedWaiters--;
+                }
+
+                if (_parkedWaiters != 0 || !_armed)
+                {
+                    return;
+                }
+
+                _armed = false;
+                _timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
+
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "PoolReclaimer.ExitParkedWait | INFO | {0}, Sweep timer stopped, no parked waiters.", _pool.Id);
+            }
+        }
+
+        /// <summary>
+        /// Timer callback that sweeps the pool for emancipated connections and re-arms itself while
+        /// callers remain parked. Reclaimed connections are routed back to the idle channel, which
+        /// wakes a parked caller.
+        /// </summary>
+        internal void OnSweepCallback()
+        {
+            lock (_lock)
+            {
+                if (!_armed || _disposed)
+                {
+                    return;
+                }
+            }
+
+            // Sweep outside the lock: reclamation deactivates connections, which can make server
+            // round trips, and must not block EnterParkedWait/ExitParkedWait on the hot path.
+            try
+            {
+                if (_pool.IsRunning)
+                {
+                    _pool.ReclaimEmancipatedConnections();
+                }
+            }
+            catch (Exception ex)
+            {
+                // A timer callback must never throw: an unhandled exception on the timer's thread
+                // would tear down the process. A failed sweep is not fatal to the pool, so trace it
+                // and let the next sweep try again.
+                SqlClientEventSource.Log.TryPoolerTraceEvent(
+                    "PoolReclaimer.OnSweepCallback | ERR | {0}, Sweep threw, continuing: {1}.", _pool.Id, ex);
+            }
+
+            lock (_lock)
+            {
+                // Re-check rather than re-arming unconditionally: ExitParkedWait may have disarmed
+                // the timer while the sweep above was running, in which case there is no longer
+                // anyone to wake and re-arming would resurrect a timer that is meant to be idle.
+                if (_armed && !_disposed)
+                {
+                    _timer.Change(SweepInterval, Timeout.InfiniteTimeSpan);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Stops the sweep timer and releases resources. Safe to call multiple times.
+        /// </summary>
+        public void Dispose()
+        {
+            lock (_lock)
+            {
+                _disposed = true;
+                _armed = false;
+                _timer.Dispose();
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/ConnectionPoolVersionScope.cs b/src/Microsoft.Data.SqlClient/tests/Common/ConnectionPoolVersionScope.cs
new file mode 100644
index 0000000000..73cf652a71
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/ConnectionPoolVersionScope.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Tests.Common;
+
+/// <summary>
+/// Selects the connection pool implementation (<c>WaitHandleDbConnectionPool</c> or
+/// <c>ChannelDbConnectionPool</c>) for the duration of a test.
+///
+/// A pool is bound to an implementation when it is created, so simply flipping the
+/// <c>UseConnectionPoolV2</c> switch is not enough: pools created before the switch was flipped
+/// keep their original implementation, and pools created inside the scope would otherwise outlive
+/// it and leak the chosen implementation into unrelated tests. This scope therefore clears all
+/// pools both on entry and on exit.
+///
+/// This follows the RAII pattern; construct it at the start of a test and dispose it at the end.
+/// Like <see cref="LocalAppContextSwitchesHelper"/>, it manipulates global state and enforces a
+/// single-instance policy, so it must not be held for longer than necessary.
+/// </summary>
+public sealed class ConnectionPoolVersionScope : IDisposable
+{
+    private readonly LocalAppContextSwitchesHelper _switches;
+
+    /// <summary>
+    /// Clears all existing pools and selects the requested pool implementation.
+    /// </summary>
+    /// <param name="usePoolV2">
+    /// True to use <c>ChannelDbConnectionPool</c>; false to use <c>WaitHandleDbConnectionPool</c>.
+    /// </param>
+    public ConnectionPoolVersionScope(bool usePoolV2)
+    {
+        _switches = new LocalAppContextSwitchesHelper();
+
+        try
+        {
+            SqlConnection.ClearAllPools();
+            _switches.UseConnectionPoolV2 = usePoolV2;
+        }
+        catch
+        {
+            _switches.Dispose();
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// Clears all pools created under the selected implementation and restores the original
+    /// switch values.
+    /// </summary>
+    public void Dispose()
+    {
+        try
+        {
+            SqlConnection.ClearAllPools();
+        }
+        finally
+        {
+            _switches.Dispose();
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
index 4b63ff655f..a3ae028a5d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
@@ -150,8 +150,7 @@ public static void AccessTokenConnectionPoolingTest()
         [ClassData(typeof(ConnectionPoolConnectionStringAndPoolVersionProvider))]
         public static void ClearAllPoolsTest(string connectionString, bool usePoolV2)
         {
-            using LocalAppContextSwitchesHelper switchesHelper = new();
-            switchesHelper.UseConnectionPoolV2 = usePoolV2;
+            using ConnectionPoolVersionScope poolVersion = new(usePoolV2);
 
             SqlConnection.ClearAllPools();
             Assert.True(0 == ConnectionPoolWrapper.AllConnectionPools().Length, "Pools exist after clearing all pools");
@@ -178,9 +177,11 @@ public static void ClearAllPoolsTest(string connectionString, bool usePoolV2)
         /// NOTE: 'emancipated' means that the internal connection's SqlConnection has fallen out of scope and has no references, but was not explicitly disposed\closed
         /// </summary>
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [ClassData(typeof(ConnectionPoolConnectionStringProvider))]
-        public static void ReclaimEmancipatedOnOpenTest(string connectionString)
+        [ClassData(typeof(ConnectionPoolConnectionStringAndPoolVersionProvider))]
+        public static void ReclaimEmancipatedOnOpenTest(string connectionString, bool usePoolV2)
         {
+            using ConnectionPoolVersionScope poolVersion = new(usePoolV2);
+
             string newConnectionString = (new SqlConnectionStringBuilder(connectionString) { MaxPoolSize = 1 }).ConnectionString;
             SqlConnection.ClearAllPools();
 
@@ -205,9 +206,11 @@ public static void ReclaimEmancipatedOnOpenTest(string connectionString)
         /// Tests if, when max pool size is reached, Open() will block until a connection becomes available
         /// </summary>
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [ClassData(typeof(ConnectionPoolConnectionStringProvider))]
-        public static void MaxPoolWaitForConnectionTest(string connectionString)
+        [ClassData(typeof(ConnectionPoolConnectionStringAndPoolVersionProvider))]
+        public static void MaxPoolWaitForConnectionTest(string connectionString, bool usePoolV2)
         {
+            using ConnectionPoolVersionScope poolVersion = new(usePoolV2);
+
             string newConnectionString = (new SqlConnectionStringBuilder(connectionString) { MaxPoolSize = 1 }).ConnectionString;
             SqlConnection.ClearAllPools();
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index c545685c9e..d647ab0914 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Data.Common;
 using System.Threading;
 using System.Threading.RateLimiting;
@@ -252,10 +253,16 @@ public async Task GetConnectionMaxPoolSize_ShouldReuseAfterConnectionReleased()
                 out DbConnectionInternal? firstConnection
             );
 
+            // The owning connections must stay reachable for the duration of the test. If they were
+            // collected, their internal connections would become emancipated and the pool would be
+            // entitled to reclaim them, which would defeat the pool-exhaustion this test relies on.
+            List<SqlConnection> owningConnections = new();
             for (int i = 1; i < pool.PoolGroupOptions.MaxPoolSize; i++)
             {
+                SqlConnection owningConnection = new();
+                owningConnections.Add(owningConnection);
                 var completed = pool.TryGetConnection(
-                    new SqlConnection(),
+                    owningConnection,
                     taskCompletionSource: null,
                     TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
@@ -282,6 +289,8 @@ out DbConnectionInternal? extraConnection
 
             // Assert
             Assert.Equal(firstConnection, extraConnection);
+
+            GC.KeepAlive(owningConnections);
         }
 
         /// <summary>
@@ -351,10 +360,16 @@ public async Task GetConnectionMaxPoolSize_ShouldRespectOrderOfRequest()
                 out DbConnectionInternal? firstConnection
             );
 
+            // The owning connections must stay reachable for the duration of the test. If they were
+            // collected, their internal connections would become emancipated and the pool would be
+            // entitled to reclaim them, which would defeat the pool exhaustion this test relies on.
+            List<SqlConnection> owningConnections = new();
             for (int i = 1; i < pool.PoolGroupOptions.MaxPoolSize; i++)
             {
+                SqlConnection owningConnection = new();
+                owningConnections.Add(owningConnection);
                 var completed = pool.TryGetConnection(
-                    new SqlConnection(),
+                    owningConnection,
                     taskCompletionSource: null,
                     TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
@@ -404,6 +419,8 @@ out DbConnectionInternal? failedConnection
             // Assert
             Assert.Equal(firstConnection, recycledConnection);
             await Assert.ThrowsAsync<InvalidOperationException>(async () => await failedTask);
+
+            GC.KeepAlive(owningConnections);
         }
 
         /// <summary>
@@ -425,10 +442,16 @@ public async Task GetConnectionAsyncMaxPoolSize_ShouldRespectOrderOfRequest()
                 out DbConnectionInternal? firstConnection
             );
 
+            // The owning connections must stay reachable for the duration of the test. If they were
+            // collected, their internal connections would become emancipated and the pool would be
+            // entitled to reclaim them, which would defeat the pool exhaustion this test relies on.
+            List<SqlConnection> owningConnections = new();
             for (int i = 1; i < pool.PoolGroupOptions.MaxPoolSize; i++)
             {
+                SqlConnection owningConnection = new();
+                owningConnections.Add(owningConnection);
                 var completed = pool.TryGetConnection(
-                    new SqlConnection(),
+                    owningConnection,
                     taskCompletionSource: null,
                     TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                     out DbConnectionInternal? internalConnection
@@ -466,6 +489,8 @@ out DbConnectionInternal? failedConnection
             // Assert
             Assert.Equal(firstConnection, recycledConnection);
             await Assert.ThrowsAsync<InvalidOperationException>(async () => failedConnection = await failedCompletionSource.Task);
+
+            GC.KeepAlive(owningConnections);
         }
 
         /// <summary>
@@ -2401,4 +2426,3 @@ public void GetConnection_TimeoutTimerReflectsPoolWaitTime()
         #endregion
     }
 }
-
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs
index 53390068fb..f6b26bcb14 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ConnectionPoolSlotsTest.cs
@@ -225,6 +225,35 @@ public void Add_MultipleConnections_IncrementsReservationCountCorrectly()
             Assert.Equal(1, createCallbackCount2);
         }
 
+        [Fact]
+        public void GetEnumerator_ReturnsTrackedConnections()
+        {
+            // Arrange
+            var poolSlots = new ConnectionPoolSlots(3);
+            DbConnectionInternal first = poolSlots.Add(
+                createCallback: () => new MockDbConnectionInternal(),
+                cleanupCallback: (conn) => { })!;
+            DbConnectionInternal second = poolSlots.Add(
+                createCallback: () => new MockDbConnectionInternal(),
+                cleanupCallback: (conn) => { })!;
+
+            // Act
+            int count = 0;
+            bool sawFirst = false;
+            bool sawSecond = false;
+            foreach (DbConnectionInternal connection in poolSlots)
+            {
+                count++;
+                sawFirst |= connection == first;
+                sawSecond |= connection == second;
+            }
+
+            // Assert
+            Assert.Equal(2, count);
+            Assert.True(sawFirst);
+            Assert.True(sawSecond);
+        }
+
         [Fact]
         public void TryRemove_ExistingConnection_ReturnsTrueAndDecrementsReservationCount()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolInstrumentationTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolInstrumentationTest.cs
index 25d98b351e..845a7d95bc 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolInstrumentationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolInstrumentationTest.cs
@@ -5,7 +5,9 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+using System.Diagnostics;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Transactions;
@@ -19,6 +21,7 @@
 using Xunit;
 
 using static Microsoft.Data.SqlClient.UnitTests.ConnectionPool.ChannelDbConnectionPoolTest;
+using static Microsoft.Data.SqlClient.UnitTests.ConnectionPool.PoolTestHarness;
 
 namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
 {
@@ -30,45 +33,10 @@ namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
     /// </summary>
     public class DbConnectionPoolInstrumentationTest
     {
-        /// <summary>
-        /// Identifies which pool implementation a parameterized metric test exercises.
-        /// </summary>
-        public enum PoolImplementation
-        {
-            /// <summary>The legacy <see cref="WaitHandleDbConnectionPool"/>.</summary>
-            WaitHandle,
-
-            /// <summary>The <see cref="ChannelDbConnectionPool"/>.</summary>
-            Channel,
-        }
-
-        /// <summary>
-        /// Builds the pool group shared by both pool implementations.
-        /// </summary>
-        private static DbConnectionPoolGroup ConstructPoolGroup(
-            string connectionString,
-            int maxPoolSize,
-            int minPoolSize,
-            int idleTimeout)
-        {
-            DbConnectionPoolGroupOptions poolGroupOptions = new(
-                poolByIdentity: false,
-                minPoolSize: minPoolSize,
-                maxPoolSize: maxPoolSize,
-                creationTimeout: 15,
-                loadBalanceTimeout: 0,
-                hasTransactionAffinity: true,
-                idleTimeout: idleTimeout);
-
-            return new DbConnectionPoolGroup(
-                new SqlConnectionOptions(connectionString),
-                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
-                poolGroupOptions);
-        }
-
         /// <summary>
         /// Builds the requested pool implementation behind the shared pool interface, reporting to
-        /// the supplied metrics instance.
+        /// the supplied metrics instance. Keeps this class's argument order over
+        /// <see cref="PoolTestHarness.ConstructPool"/>, which every test here shares.
         /// </summary>
         private static IDbConnectionPool ConstructPool(
             PoolImplementation implementation,
@@ -77,32 +45,17 @@ private static IDbConnectionPool ConstructPool(
             string connectionString = "Data Source=localhost;",
             int maxPoolSize = 50,
             int minPoolSize = 0,
-            int idleTimeout = 0)
-        {
-            DbConnectionPoolGroup poolGroup = ConstructPoolGroup(connectionString, maxPoolSize, minPoolSize, idleTimeout);
-
-            return implementation switch
-            {
-                PoolImplementation.WaitHandle => new WaitHandleDbConnectionPool(
-                    connectionFactory,
-                    poolGroup,
-                    DbConnectionPoolIdentity.NoIdentity,
-                    new DbConnectionPoolProviderInfo(),
-                    timeProvider: new FakeTimeProvider(),
-                    metrics: metrics),
-
-                PoolImplementation.Channel => new ChannelDbConnectionPool(
-                    connectionFactory,
-                    poolGroup,
-                    DbConnectionPoolIdentity.NoIdentity,
-                    new DbConnectionPoolProviderInfo(),
-                    connectionCreationRateLimiter: null,
-                    timeProvider: new FakeTimeProvider(),
-                    metrics: metrics),
-
-                _ => throw new ArgumentOutOfRangeException(nameof(implementation)),
-            };
-        }
+            int idleTimeout = 0,
+            FakeTimeProvider? timeProvider = null)
+            => PoolTestHarness.ConstructPool(
+                implementation,
+                connectionFactory,
+                metrics,
+                timeProvider,
+                connectionString,
+                maxPoolSize,
+                minPoolSize,
+                idleTimeout);
 
         /// <summary>
         /// Asserts the exact value of every counter a pool is responsible for. Any counter not named
@@ -733,6 +686,106 @@ public void IdleSweepOfTransactionRoot_CountsStasisExitOnReturnToPool()
                 stasisConnections: 0);
         }
 
+        /// <summary>
+        /// Verifies that a connection whose owner was collected without being closed is reclaimed
+        /// and counted, in both pool implementations.
+        /// </summary>
+        /// <remarks>
+        /// This covers the counters only. The reclamation behavior itself is asserted by
+        /// <see cref="DbConnectionPoolReclamationTest"/>.
+        ///
+        /// The two pools agree on every counter except activeSoftConnections; see the assertion
+        /// below.
+        /// </remarks>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle)]
+        [InlineData(PoolImplementation.Channel)]
+        public void EmancipatedConnection_IsReclaimedAndCounted(PoolImplementation implementation)
+        {
+            // Arrange
+            FakeSqlClientMetrics metrics = new();
+            FakeTimeProvider fakeTime = new();
+            IDbConnectionPool pool = ConstructPool(
+                implementation,
+                metrics,
+                new SuccessfulSqlConnectionFactory(metrics),
+                maxPoolSize: 1,
+                timeProvider: fakeTime);
+
+            DbConnectionInternal leaked = CheckOutAndAbandonOwner(pool);
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 1,
+                pooledConnections: 1,
+                activeConnections: 1);
+
+            CollectAbandonedOwners();
+            Assert.True(leaked.IsEmancipated);
+
+            // Act - the pool's only slot is occupied by a connection nobody can return, so this
+            // request can only be served by reclaiming it.
+            DbConnectionInternal? reclaimed = null;
+            Exception? failure = null;
+            SqlConnection waitingOwner = new();
+            Thread caller = new(() =>
+            {
+                try
+                {
+                    Assert.True(pool.TryGetConnection(
+                        waitingOwner,
+                        null,
+                        TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                        out reclaimed));
+                }
+                catch (Exception ex)
+                {
+                    failure = ex;
+                }
+            })
+            {
+                IsBackground = true,
+                Name = nameof(EmancipatedConnection_IsReclaimedAndCounted)
+            };
+            caller.Start();
+
+            AdvanceUntil(fakeTime, () => caller.Join(TimeSpan.Zero), "the caller should be served by the reclaimed connection");
+            Assert.Null(failure);
+
+            // Assert - the same physical connection was handed out again, with no second connect.
+            // The two pools disagree on softDisconnects: the channel pool routes reclamation
+            // through ReturnInternalConnection, so the leaked checkout is balanced and
+            // activeSoftConnections settles back to one. WaitHandle reclaims without that
+            // accounting, so its gauge drifts up by one per leaked connection. Tracked by #4555;
+            // asserted here so the drift is pinned rather than assumed.
+            Assert.Same(leaked, reclaimed);
+            AssertCounters(
+                metrics,
+                hardConnects: 1,
+                softConnects: 2,
+                softDisconnects: implementation == PoolImplementation.Channel ? 1 : 0,
+                pooledConnections: 1,
+                reclaimedConnections: 1,
+                activeConnections: 1);
+
+            GC.KeepAlive(waitingOwner);
+        }
+
+        /// <summary>
+        /// Advances <paramref name="time"/> until <paramref name="condition"/> holds, failing the
+        /// test if it does not. Lets a counter assertion wait on a pool that only reclaims from a
+        /// timer without naming which pool that is.
+        /// </summary>
+        private static void AdvanceUntil(FakeTimeProvider time, Func<bool> condition, string because)
+        {
+            Stopwatch stopwatch = Stopwatch.StartNew();
+            while (!SpinWait.SpinUntil(condition, TimeSpan.FromMilliseconds(50)))
+            {
+                Assert.True(stopwatch.Elapsed < TimeSpan.FromSeconds(30), because);
+                time.Advance(TimeSpan.FromSeconds(1));
+            }
+        }
+
         #region Test classes
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolReclamationTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolReclamationTest.cs
new file mode 100644
index 0000000000..508f0afbd6
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/DbConnectionPoolReclamationTest.cs
@@ -0,0 +1,254 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Extensions.Time.Testing;
+using Xunit;
+
+using static Microsoft.Data.SqlClient.UnitTests.ConnectionPool.PoolTestHarness;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Behavior both pool implementations owe around emancipated connections: a connection whose
+    /// owning <see cref="SqlConnection"/> was collected without being closed must not permanently
+    /// occupy a pool slot.
+    /// </summary>
+    /// <remarks>
+    /// These tests are deliberately black-box. The pools reclaim by different means, and which one
+    /// is used is not part of the contract: <see cref="WaitHandleDbConnectionPool"/> sweeps inline
+    /// when a request finds it saturated, while <see cref="ChannelDbConnectionPool"/> sweeps from a
+    /// background timer. Tests drive both through <see cref="AdvanceUntil"/> and assert only what a
+    /// caller can observe. The channel pool's timer mechanics are covered separately by
+    /// <see cref="PoolReclaimerTest"/>.
+    /// </remarks>
+    public class DbConnectionPoolReclamationTest
+    {
+        /// <summary>
+        /// How long a saturated caller is willing to wait for a connection. The pool group default
+        /// is 15ms, which is too short for a caller to observably block.
+        /// </summary>
+        private const int PoolWaitMs = 30_000;
+
+        /// <summary>
+        /// How long a test waits for a cross-thread transition before failing. Generous, because it
+        /// is only ever reached when something is actually broken.
+        /// </summary>
+        private static readonly TimeSpan WaitTimeout = TimeSpan.FromSeconds(30);
+
+        /// <summary>
+        /// The pool's only slot is held by a leaked connection, so the request can only be served by
+        /// reclaiming it. Without reclamation the caller waits out its entire timeout even though a
+        /// slot is recoverable.
+        /// </summary>
+        [Theory]
+        [InlineData(PoolImplementation.WaitHandle, false)]
+        [InlineData(PoolImplementation.WaitHandle, true)]
+        [InlineData(PoolImplementation.Channel, false)]
+        [InlineData(PoolImplementation.Channel, true)]
+        public void SaturatedRequest_IsServedByReclaimingLeakedConnection(PoolImplementation implementation, bool async)
+        {
+            FakeSqlClientMetrics metrics = new();
+            FakeTimeProvider fakeTime = new();
+            IDbConnectionPool pool = ConstructPool(
+                implementation,
+                new ChannelDbConnectionPoolTest.SuccessfulSqlConnectionFactory(metrics),
+                metrics,
+                fakeTime,
+                maxPoolSize: 1,
+                creationTimeout: PoolWaitMs);
+
+            DbConnectionInternal leaked = CheckOutAndAbandonOwner(pool);
+            CollectAbandonedOwners();
+            Assert.True(leaked.IsEmancipated);
+
+            DbConnectionInternal? served = RequestConnection(pool, async, fakeTime, out SqlConnection waitingOwner);
+
+            Assert.Same(leaked, served);
+            Assert.Equal(1, metrics.ReclaimedConnections);
+            Assert.Equal(1, metrics.HardConnects);
+            GC.KeepAlive(waitingOwner);
+        }
+
+        /// <summary>
+        /// The connection becomes collectable only after the caller is already waiting, so a pool
+        /// that reclaims once at request time cannot see it. Reclamation has to keep looking for as
+        /// long as someone is blocked.
+        /// </summary>
+        /// <remarks>
+        /// Channel-only, because this is the gap the sweep timer closes.
+        /// <see cref="WaitHandleDbConnectionPool"/> reclaims only while it is still trying to create
+        /// a connection; once it gives up on the creation mutex it waits on the semaphore alone and
+        /// never looks again, so the caller times out with a recoverable slot sitting there.
+        /// </remarks>
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void WaitingCaller_IsServed_WhenConnectionIsLeakedAfterTheRequestBegins(bool async)
+        {
+            FakeTimeProvider fakeTime = new();
+            IDbConnectionPool pool = ConstructPool(
+                PoolImplementation.Channel,
+                timeProvider: fakeTime,
+                maxPoolSize: 1,
+                creationTimeout: PoolWaitMs);
+
+            DbConnectionInternal leaked = CheckOutAndRootOwner(pool, out GCHandle leakedOwnerRoot);
+
+            DbConnectionInternal? served = null;
+            Exception? failure = null;
+            SqlConnection waitingOwner = new();
+            Thread caller = new(() =>
+            {
+                try
+                {
+                    served = RequestAndWait(pool, waitingOwner, async);
+                }
+                catch (Exception ex)
+                {
+                    failure = ex;
+                }
+            })
+            {
+                IsBackground = true,
+                Name = nameof(WaitingCaller_IsServed_WhenConnectionIsLeakedAfterTheRequestBegins)
+            };
+            caller.Start();
+
+            WaitFor(
+                () => (caller.ThreadState & System.Threading.ThreadState.WaitSleepJoin) != 0,
+                "the caller should block waiting for a connection");
+
+            // Only now does the abandoned owner become collectable.
+            leakedOwnerRoot.Free();
+            CollectAbandonedOwners();
+            Assert.True(leaked.IsEmancipated);
+
+            AdvanceUntil(fakeTime, () => caller.Join(TimeSpan.Zero), "the waiting caller should be served by reclamation");
+
+            Assert.Null(failure);
+            Assert.Same(leaked, served);
+            GC.KeepAlive(waitingOwner);
+        }
+
+        /// <summary>
+        /// Issues a request on a background thread and drives the clock until it completes, so the
+        /// caller can block on a pool that only reclaims from a timer.
+        /// </summary>
+        private static DbConnectionInternal? RequestConnection(
+            IDbConnectionPool pool,
+            bool async,
+            FakeTimeProvider fakeTime,
+            out SqlConnection owner)
+        {
+            DbConnectionInternal? connection = null;
+            Exception? failure = null;
+            SqlConnection waitingOwner = new();
+            Thread caller = new(() =>
+            {
+                try
+                {
+                    connection = RequestAndWait(pool, waitingOwner, async);
+                }
+                catch (Exception ex)
+                {
+                    failure = ex;
+                }
+            })
+            {
+                IsBackground = true,
+                Name = nameof(RequestConnection)
+            };
+            caller.Start();
+
+            AdvanceUntil(fakeTime, () => caller.Join(TimeSpan.Zero), "the caller should be served by reclamation");
+
+            Assert.Null(failure);
+            owner = waitingOwner;
+            return connection;
+        }
+
+        /// <summary>
+        /// Checks out a connection and roots its owner in a <see cref="GCHandle"/>, so the test
+        /// decides exactly when the connection becomes emancipated by freeing the handle. Same
+        /// non-inlining requirement as <see cref="CheckOutAndAbandonOwner"/>.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static DbConnectionInternal CheckOutAndRootOwner(IDbConnectionPool pool, out GCHandle ownerRoot)
+        {
+            SqlConnection owner = new();
+            ownerRoot = GCHandle.Alloc(owner);
+
+            Assert.True(pool.TryGetConnection(
+                owner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? connection));
+
+            Assert.NotNull(connection);
+            return connection!;
+        }
+
+        /// <summary>
+        /// Spins until <paramref name="condition"/> holds, failing the test if it does not. Used to
+        /// observe a background caller reaching a blocking wait, which is a cross-thread transition
+        /// and cannot be awaited directly.
+        /// </summary>
+        private static void WaitFor(Func<bool> condition, string because)
+            => Assert.True(SpinWait.SpinUntil(condition, WaitTimeout), because);
+
+        /// <summary>
+        /// Requests a connection over the sync or async path and blocks until it is served, so both
+        /// paths present the same shape to a test.
+        /// </summary>
+        private static DbConnectionInternal RequestAndWait(IDbConnectionPool pool, SqlConnection owner, bool async)
+        {
+            TaskCompletionSource<DbConnectionInternal>? completion = async ? new() : null;
+
+            bool completed = pool.TryGetConnection(
+                owner,
+                completion,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(30)),
+                out DbConnectionInternal? connection);
+
+            if (completed)
+            {
+                Assert.NotNull(connection);
+                return connection!;
+            }
+
+            // The async path hands the request off to the completion source rather than blocking.
+            Assert.True(async);
+            return completion!.Task.GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// Advances <paramref name="time"/> until <paramref name="condition"/> holds, failing the
+        /// test if it does not.
+        /// </summary>
+        /// <remarks>
+        /// Lets a test assert that a pool eventually reclaims without knowing what drives it.
+        /// WaitHandle reclaims inline when a request finds the pool saturated, so the condition is
+        /// typically already true on the first check; the channel pool needs its sweep timer to
+        /// fire. Spun in short slices rather than passing the whole timeout, so the clock only moves
+        /// while the condition is unmet.
+        /// </remarks>
+        private static void AdvanceUntil(FakeTimeProvider time, Func<bool> condition, string because)
+        {
+            Stopwatch stopwatch = Stopwatch.StartNew();
+            while (!SpinWait.SpinUntil(condition, TimeSpan.FromMilliseconds(50)))
+            {
+                Assert.True(stopwatch.Elapsed < WaitTimeout, because);
+                time.Advance(TimeSpan.FromSeconds(1));
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/PoolReclaimerTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/PoolReclaimerTest.cs
new file mode 100644
index 0000000000..a9201ef40a
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/PoolReclaimerTest.cs
@@ -0,0 +1,153 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Xunit;
+
+using static Microsoft.Data.SqlClient.UnitTests.ConnectionPool.PoolTestHarness;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Unit tests for <see cref="PoolReclaimer"/>, the demand-driven timer that sweeps emancipated
+    /// connections for <see cref="ChannelDbConnectionPool"/>.
+    /// </summary>
+    /// <remarks>
+    /// These are deliberately white-box: they drive the reclaimer's arm/disarm bookkeeping directly
+    /// because it has no observable effect other than the reclamation it produces, and that is
+    /// covered for both pool implementations by <see cref="DbConnectionPoolReclamationTest"/>.
+    /// </remarks>
+    public class PoolReclaimerTest
+    {
+        private static ChannelDbConnectionPool ConstructChannelPool(int maxPoolSize = 50)
+            => (ChannelDbConnectionPool)ConstructPool(PoolImplementation.Channel, maxPoolSize: maxPoolSize);
+
+        /// <summary>
+        /// The timer is demand-driven: armed by the first parked caller and disarmed by the last one
+        /// to leave, so a pool with no blocked callers never wakes the process.
+        /// </summary>
+        [Fact]
+        public void EnterAndExitParkedWait_ArmsAndDisarmsTimer()
+        {
+            PoolReclaimer reclaimer = ConstructChannelPool().Reclaimer;
+
+            reclaimer.EnterParkedWait();
+            Assert.True(reclaimer.IsTimerEnabled);
+            Assert.Equal(1, reclaimer.ParkedWaiters);
+
+            reclaimer.ExitParkedWait();
+            Assert.False(reclaimer.IsTimerEnabled);
+            Assert.Equal(0, reclaimer.ParkedWaiters);
+        }
+
+        /// <summary>
+        /// With several callers parked, the timer stays armed until the last one leaves. Disarming
+        /// on the first departure would strand the callers still waiting.
+        /// </summary>
+        [Fact]
+        public void ExitParkedWait_WithOtherWaitersRemaining_KeepsTimerArmed()
+        {
+            PoolReclaimer reclaimer = ConstructChannelPool().Reclaimer;
+
+            reclaimer.EnterParkedWait();
+            reclaimer.EnterParkedWait();
+            reclaimer.EnterParkedWait();
+            Assert.Equal(3, reclaimer.ParkedWaiters);
+
+            reclaimer.ExitParkedWait();
+            Assert.True(reclaimer.IsTimerEnabled);
+            reclaimer.ExitParkedWait();
+            Assert.True(reclaimer.IsTimerEnabled);
+
+            reclaimer.ExitParkedWait();
+            Assert.False(reclaimer.IsTimerEnabled);
+        }
+
+        /// <summary>
+        /// After the timer has been disarmed and re-armed, it must still fire. This guards the
+        /// one-shot re-arm bookkeeping, where losing the armed flag would silently stop all
+        /// subsequent sweeps.
+        /// </summary>
+        [Fact]
+        public void EnterParkedWait_AfterFullDrain_ReArmsTimer()
+        {
+            PoolReclaimer reclaimer = ConstructChannelPool().Reclaimer;
+
+            reclaimer.EnterParkedWait();
+            reclaimer.ExitParkedWait();
+            Assert.False(reclaimer.IsTimerEnabled);
+
+            reclaimer.EnterParkedWait();
+            Assert.True(reclaimer.IsTimerEnabled);
+        }
+
+        /// <summary>
+        /// A sweep callback that was already scheduled when the last caller left must not run. The
+        /// pool is no longer blocked, so there is nobody to wake and no reason to pay for the sweep.
+        /// </summary>
+        [Fact]
+        public void OnSweepCallback_WhenDisarmed_DoesNotSweep()
+        {
+            ChannelDbConnectionPool pool = ConstructChannelPool(maxPoolSize: 1);
+            DbConnectionInternal connection = CheckOutAndAbandonOwner(pool);
+            CollectAbandonedOwners();
+            Assert.True(connection.IsEmancipated);
+
+            // Never armed, so this stands in for a callback that raced with the last exit.
+            pool.Reclaimer.OnSweepCallback();
+
+            Assert.Equal(0, pool.IdleCount);
+            Assert.True(connection.IsEmancipated);
+        }
+
+        /// <summary>
+        /// A sweep reclaims an emancipated connection and routes it back to the idle channel, which
+        /// is what makes it visible to a parked caller.
+        /// </summary>
+        [Fact]
+        public void OnSweepCallback_WhenArmed_ReclaimsEmancipatedConnection()
+        {
+            ChannelDbConnectionPool pool = ConstructChannelPool(maxPoolSize: 1);
+            DbConnectionInternal connection = CheckOutAndAbandonOwner(pool);
+            CollectAbandonedOwners();
+            Assert.True(connection.IsEmancipated);
+            Assert.Equal(0, pool.IdleCount);
+
+            pool.Reclaimer.EnterParkedWait();
+            try
+            {
+                pool.Reclaimer.OnSweepCallback();
+            }
+            finally
+            {
+                pool.Reclaimer.ExitParkedWait();
+            }
+
+            Assert.Equal(1, pool.IdleCount);
+        }
+
+        /// <summary>
+        /// Shutting the pool down releases the timer. Otherwise a scheduled sweep would keep the
+        /// pool reachable and could route a connection back into the channel after the shutdown
+        /// drain had already passed it.
+        /// </summary>
+        [Fact]
+        public void Shutdown_DisposesReclaimer()
+        {
+            ChannelDbConnectionPool pool = ConstructChannelPool();
+            pool.Reclaimer.EnterParkedWait();
+            Assert.True(pool.Reclaimer.IsTimerEnabled);
+
+            pool.Shutdown();
+
+            Assert.False(pool.Reclaimer.IsTimerEnabled);
+
+            // Arming after disposal must be a no-op rather than resurrecting the timer.
+            pool.Reclaimer.EnterParkedWait();
+            Assert.False(pool.Reclaimer.IsTimerEnabled);
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/PoolTestHarness.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/PoolTestHarness.cs
new file mode 100644
index 0000000000..388b0f2842
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/PoolTestHarness.cs
@@ -0,0 +1,149 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.Data.SqlClient.Diagnostics;
+using Microsoft.Extensions.Time.Testing;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ConnectionPool
+{
+    /// <summary>
+    /// Which pool implementation a test is running against. Tests that assert behavior both pools
+    /// owe should be a <see cref="TheoryAttribute"/> over this, so the two cannot silently diverge.
+    /// </summary>
+    public enum PoolImplementation
+    {
+        /// <summary>The legacy <see cref="WaitHandleDbConnectionPool"/>.</summary>
+        WaitHandle,
+
+        /// <summary>The <see cref="ChannelDbConnectionPool"/>.</summary>
+        Channel,
+    }
+
+    /// <summary>
+    /// Pool construction shared by the connection pool test classes, written against
+    /// <see cref="IDbConnectionPool"/> so a test can run against either implementation. Helpers that
+    /// only a few tests need live with those tests instead.
+    /// </summary>
+    internal static class PoolTestHarness
+    {
+        /// <summary>
+        /// Builds the requested pool implementation behind the shared pool interface.
+        /// </summary>
+        /// <param name="implementation">Which pool to construct.</param>
+        /// <param name="connectionFactory">
+        /// Factory the pool creates connections with. Defaults to one that always succeeds.
+        /// </param>
+        /// <param name="metrics">Metrics sink, or null for the pool's default.</param>
+        /// <param name="creationTimeout">
+        /// How long, in milliseconds, a caller waits for a pooled connection to free up. The default
+        /// matches the pool group default and is short enough that a saturated wait times out almost
+        /// immediately; raise it in tests that need a caller to genuinely block.
+        /// </param>
+        /// <param name="timeProvider">
+        /// Time source, or null for a fresh <see cref="FakeTimeProvider"/>. Pass one in to drive
+        /// timer-based pool behavior deterministically; see <see cref="AdvanceUntil"/>.
+        /// </param>
+        internal static IDbConnectionPool ConstructPool(
+            PoolImplementation implementation,
+            SqlConnectionFactory? connectionFactory = null,
+            ISqlClientMetrics? metrics = null,
+            TimeProvider? timeProvider = null,
+            string connectionString = "Data Source=localhost;",
+            int maxPoolSize = 50,
+            int minPoolSize = 0,
+            int idleTimeout = 0,
+            int creationTimeout = 15)
+        {
+            connectionFactory ??= new ChannelDbConnectionPoolTest.SuccessfulSqlConnectionFactory();
+            timeProvider ??= new FakeTimeProvider();
+
+            DbConnectionPoolGroup poolGroup = ConstructPoolGroup(connectionString, maxPoolSize, minPoolSize, idleTimeout, creationTimeout);
+
+            return implementation switch
+            {
+                PoolImplementation.WaitHandle => new WaitHandleDbConnectionPool(
+                    connectionFactory,
+                    poolGroup,
+                    DbConnectionPoolIdentity.NoIdentity,
+                    new DbConnectionPoolProviderInfo(),
+                    timeProvider: timeProvider,
+                    metrics: metrics),
+
+                PoolImplementation.Channel => new ChannelDbConnectionPool(
+                    connectionFactory,
+                    poolGroup,
+                    DbConnectionPoolIdentity.NoIdentity,
+                    new DbConnectionPoolProviderInfo(),
+                    connectionCreationRateLimiter: null,
+                    timeProvider: timeProvider,
+                    metrics: metrics),
+
+                _ => throw new ArgumentOutOfRangeException(nameof(implementation)),
+            };
+        }
+
+        /// <summary>
+        /// Builds a pool group with the given sizing, for tests that construct a pool directly.
+        /// </summary>
+        internal static DbConnectionPoolGroup ConstructPoolGroup(
+            string connectionString = "Data Source=localhost;",
+            int maxPoolSize = 50,
+            int minPoolSize = 0,
+            int idleTimeout = 0,
+            int creationTimeout = 15)
+        {
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: minPoolSize,
+                maxPoolSize: maxPoolSize,
+                creationTimeout: creationTimeout,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: idleTimeout);
+
+            return new DbConnectionPoolGroup(
+                new SqlConnectionOptions(connectionString),
+                new ConnectionPoolKey("TestDataSource", credential: null, accessToken: null, accessTokenCallback: null, sspiContextProvider: null),
+                poolGroupOptions);
+        }
+
+        /// <summary>
+        /// Checks out a connection and abandons its owning <see cref="SqlConnection"/>, returning
+        /// only the internal connection. Marked <see cref="MethodImplOptions.NoInlining"/> so the
+        /// owner's stack slot is guaranteed to be gone when the caller collects: in Debug builds
+        /// locals stay alive to the end of their enclosing method, so the owner has to be confined
+        /// to a frame that has already been popped.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        internal static DbConnectionInternal CheckOutAndAbandonOwner(IDbConnectionPool pool)
+        {
+            SqlConnection owner = new();
+            Assert.True(pool.TryGetConnection(
+                owner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? connection));
+
+            Assert.NotNull(connection);
+            return connection!;
+        }
+
+        /// <summary>
+        /// Forces collection of an abandoned owner so its connection becomes emancipated.
+        /// </summary>
+        internal static void CollectAbandonedOwners()
+        {
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+            GC.Collect();
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
index 6866fb1fa2..cc9610932a 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/TransactedConnectionPoolTest.cs
@@ -699,7 +699,7 @@ public DbConnectionInternal ReplaceConnection(DbConnection owningObject, DbConne
             throw new NotImplementedException();
         }
 
-        public void ReturnInternalConnection(DbConnectionInternal obj, DbConnection owningObject)
+        public void ReturnInternalConnection(DbConnectionInternal obj, DbConnection? owningObject)
         {
             throw new NotImplementedException();
         }

From f2de4d6b4fcae57b7fcdceaa2322e8e23582ab43 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Mon, 24 Aug 2026 11:52:12 +0530
Subject: [PATCH 242/298] Update SNI package reference to 7.1.0-preview3 for
 MDS v7.1.0-preview3 (#4564)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: c7425f3e-f6b8-439b-b74f-e25f8406fbf6
---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e9be34705f..03ad924f6d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -52,7 +52,7 @@
   -->
   <PropertyGroup>
     <!-- SNI version (external package, version declared once here) -->
-    <SniVersion>6.0.2</SniVersion>
+    <SniVersion>7.1.0-preview3.26226.3</SniVersion>
     <SniVersionRange>[$(SniVersion), $([MSBuild]::Add($(SniVersion.Split('.')[0]), 1)).0.0)</SniVersionRange>
   </PropertyGroup>
 

From 8c9511f817395d35be0f665770ef46dc7b2d28e2 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Mon, 24 Aug 2026 13:49:50 +0100
Subject: [PATCH 243/298] Implement performance benchmarks for Always Encrypted
 scenarios (#4502)

* Create new RAII types for CMK and CEK objects

* Designate certain types as compatible with Always Encrypted

* Refactor DataTypeReaderRunner

* Replace X hardcoded test methods with a single ParamsSource.
* Merge DataTypeReaderRunner and its async variant together.
* Implement base class, and two child classes - one for AlwaysEncrypted, one for plaintext.
* Move the connection open and the table setup logic out of the benchmark code.

* Refactor AsyncLargeDataReadRunner

This was actually running both sync and async tests.
* Implement base class, and two child classes - one for AlwaysEncrypted, one for plaintext.
* Expand test to cover CommandBehavior.Default and SequentialAccess.
* Include GetFieldValue and GetFieldValueAsync.
* Move repeated allocation of the buffer out of the main ReadLargeDataSync_GetBytes benchmark loop.

* Documentation/style changes

* File-scoped namespaces.
* Remove references to removed benchmarks.

* Honour MdsPackageVersion in TestCommon package reference

PerformanceTests now references TestCommon. In Package mode the perf
pipeline pins a released MDS baseline via -p:MdsPackageVersion, but
TestCommon ignored that property and resolved the CPM-managed
in-development version instead. That version is not published, so
restore failed with NU1102 and the mismatch produced an NU1605
downgrade error.

Apply the same conditional VersionOverride pattern used by
PerformanceTests, including the 7.1.0-preview1.26124.5 transitive
dependency pins.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 82c3df83-8f5b-487a-b57a-31d5acb40abe

* Fix in-process timeout failure in large data read benchmarks

The large data read benchmarks failed with:

  System.InvalidOperationException: Benchmark
  Plaintext.ReadLargeDataSync_GetBytes ... takes too long to run.
  Prefer to use out-of-process toolchains for long-running benchmarks.

BenchmarkDotNet's in-process executor aborts a benchmark case after a
hard-coded 5 minute default. A single case here reads up to 20 MB per
operation across 20 iterations, plus the extra iterations that
MemoryDiagnoser and ThreadingDiagnoser each add, so it exceeds that.

Switching to an out-of-process toolchain (BenchmarkDotNet's own
suggestion) is not viable for this suite. The AppContext switches set in
Program.SetupConfigurations - managed SNI, connection pool V2, optimized
async behaviour - only apply to the process running Main. An
out-of-process toolchain spawns a generated host where they revert to
their defaults, so the benchmarks would silently measure the wrong code
paths.

Instead, add two optional per-benchmark knobs to runnerconfig.jsonc and
apply them to the two large data read runners:

  TimeoutMinutes - overrides the in-process execution timeout (30
    minutes here); omitted elsewhere, so other benchmarks keep the
    BenchmarkDotNet default.
  RunStrategy - selects the BenchmarkDotNet RunStrategy. The large data
    read runners use Monitoring, which skips the harness-overhead
    measurement Throughput performs; that measurement is meaningless
    when a single operation takes seconds.

Their IterationCount also drops from 20 to 5, since network-bound 20 MB
reads gain little statistical value from the extra iterations.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 82c3df83-8f5b-487a-b57a-31d5acb40abe

* Move ReadBufferBytes to Plaintext derived class

This was never used by Always Encrypted.

* Use the existing SqlDataReader extension methods to flush the result set

* Reorder members by visibility

* Force SqlDataExtensions to explicitly flush the row data

* Replace Params with Arguments

This eliminates a number of unnecessary benchmark runs

* Lift Always Encrypted definition values to constants

* Calculate DefaultValue and EncryptionSupported properties

* Remove VersionOverride for TestCommon

---------

Co-authored-by: Cheena Malhotra <cmalhotra@microsoft.com>
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 82c3df83-8f5b-487a-b57a-31d5acb40abe
---
 BUILDGUIDE.md                                 |   2 +-
 eng/pipelines/perf/README.md                  |   2 +-
 eng/pipelines/perf/scripts/run-perf-tests.sh  |   2 +-
 .../ColumnMasterKeyCertificateFixture.cs      |   4 +
 .../DatabaseObjects/ColumnEncryptionKey.cs    |  62 ++++++
 .../DatabaseObjects/ColumnMasterKey.cs        | 179 ++++++++++++++++++
 ...Microsoft.Data.SqlClient.TestCommon.csproj |  13 +-
 .../tests/Common/SqlDataReaderExtensions.cs   |   6 +-
 .../AsyncLargeDataReadRunner.cs               | 119 ------------
 .../DataTypeReaderAsyncRunner.cs              | 130 -------------
 .../BenchmarkRunners/DataTypeReaderRunner.cs  | 126 ------------
 .../DataTypeReaderRunner/AlwaysEncrypted.cs   |  53 ++++++
 .../DataTypeReaderRunnerBase.cs               |  87 +++++++++
 .../DataTypeReaderRunner/Plaintext.cs         |  27 +++
 .../LargeDataReadRunner/AlwaysEncrypted.cs    |  58 ++++++
 .../LargeDataReadRunnerBase.cs                |  99 ++++++++++
 .../LargeDataReadRunner/Plaintext.cs          |  75 ++++++++
 .../Config/BenchmarkConfig.cs                 |  33 +++-
 .../tests/PerformanceTests/Config/Config.cs   |  42 +++-
 .../PerformanceTests/Config/DataTypes.cs      |  10 +-
 .../PerformanceTests/DBFramework/Column.cs    |  27 ++-
 ...oft.Data.SqlClient.PerformanceTests.csproj |   2 +
 .../tests/PerformanceTests/Program.cs         |   9 +-
 .../tests/PerformanceTests/datatypes.json     |   2 +-
 .../tests/PerformanceTests/runnerconfig.jsonc |  39 +++-
 25 files changed, 806 insertions(+), 402 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnEncryptionKey.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnMasterKey.cs
 delete mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/AsyncLargeDataReadRunner.cs
 delete mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderAsyncRunner.cs
 delete mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/AlwaysEncrypted.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/DataTypeReaderRunnerBase.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/Plaintext.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/AlwaysEncrypted.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/LargeDataReadRunnerBase.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/Plaintext.cs

diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 341c9b0661..72daa88ea8 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -494,7 +494,7 @@ The top-level flags control global runner behavior:
 | `WaitForProfiler` | Pauses at startup and prints the process ID so you can attach an external profiler (e.g. `dotnet-trace`) before benchmarks run. |
 | `UseNativeMemoryAndETWProfiler` | Attaches the `NativeMemoryProfiler` and `EtwProfiler` BenchmarkDotNet diagnosers. Windows only; has no effect on other OSes. |
 
-Some benchmarks (e.g. `DataTypeReaderRunner`, `DataTypeReaderAsyncRunner`) also
+Some benchmarks (e.g. `DataTypeReaderRunner`) also
 read per-type test values from `datatypes.json` in the `PerformanceTests`
 directory. Like `runnerconfig.jsonc`, this file's location can be overridden
 with the `DATATYPES_CONFIG` environment variable.
diff --git a/eng/pipelines/perf/README.md b/eng/pipelines/perf/README.md
index 09ad48788f..be925f5431 100644
--- a/eng/pipelines/perf/README.md
+++ b/eng/pipelines/perf/README.md
@@ -209,7 +209,7 @@ supplies the isolated dedicated host, the tuned SQL instance, and the disjoint c
 | Client CPU pin | Pins the benchmark process to `PERF_CLIENT_CPUS` (`taskset` on Linux, `ProcessorAffinity` on Windows). |
 | Fail loud | Preflight `SELECT 1` before any pass, **and** a post-pass guard that fails the run if a pass produced **zero** benchmark results — so an empty comparison can never be reported green. |
 | Warm-up | Touches the target DB in the preflight to warm the buffer pool / plan cache before the first measured benchmark. |
-| Allocator tuning (Linux) | Exports `MALLOC_MMAP_THRESHOLD_=128MiB` and `MALLOC_TRIM_THRESHOLD_=-1` so large-buffer benches (`AsyncLargeDataRead`, `SqlBulkCopy`) stop re-`mmap`ing per iteration. |
+| Allocator tuning (Linux) | Exports `MALLOC_MMAP_THRESHOLD_=128MiB` and `MALLOC_TRIM_THRESHOLD_=-1` so large-buffer benches (`LargeDataRead`, `SqlBulkCopy`) stop re-`mmap`ing per iteration. |
 | Network tuning (Linux) | Best-effort `sysctl` to widen the ephemeral port range and enable `tcp_tw_reuse` for churn benches (`ConnectionPoolStress`, `ParallelAsyncConnection`). Never fails the run. |
 | Diagnostics | Writes `results/diagnostics/`: SQL instance config (MAXDOP, memory, affinity, tempdb files, `@@VERSION`), host CPU topology, and per-pass CPU-clock/thermal telemetry (before/after each pass). |
 | Regression gate | `failOnRegression` threads `--fail-on-regression`; only a **candidate-slower** delta past the threshold fails, and in interleaved mode only after best-of-N confirmation. Default off. |
diff --git a/eng/pipelines/perf/scripts/run-perf-tests.sh b/eng/pipelines/perf/scripts/run-perf-tests.sh
index ee9961fd09..8d05340342 100755
--- a/eng/pipelines/perf/scripts/run-perf-tests.sh
+++ b/eng/pipelines/perf/scripts/run-perf-tests.sh
@@ -288,7 +288,7 @@ DIAG_DIR="${RESULTS_DIR}/diagnostics"
 mkdir -p "${DIAG_DIR}"
 
 # --- §2.8 Allocator tuning (exported so the 'dotnet run' children inherit it) ---------------------
-# Large-buffer benches (AsyncLargeDataRead, SqlBulkCopy) re-mmap a big buffer every iteration under
+# Large-buffer benches (LargeDataRead, SqlBulkCopy) re-mmap a big buffer every iteration under
 # glibc malloc; keep those allocations on the heap and stop trimming freed pages so they are reused,
 # which removes a major source of per-iteration variance.
 export MALLOC_MMAP_THRESHOLD_="${MALLOC_MMAP_THRESHOLD_:-134217728}"   # 128 MiB
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs
index c4fbbad613..d396251103 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs
@@ -22,6 +22,8 @@ public ColumnMasterKeyCertificateFixture()
 
     public X509Certificate2? ColumnMasterKeyCertificate { get; }
 
+    public string? ColumnMasterKeyCertificatePath { get; }
+
     protected ColumnMasterKeyCertificateFixture(bool createCertificate)
     {
         if (createCertificate)
@@ -29,6 +31,8 @@ protected ColumnMasterKeyCertificateFixture(bool createCertificate)
             ColumnMasterKeyCertificate = CreateCertificate(nameof(ColumnMasterKeyCertificate), Array.Empty<string>(), Array.Empty<string>());
 
             AddToStore(ColumnMasterKeyCertificate, StoreLocation.CurrentUser, StoreName.My);
+
+            ColumnMasterKeyCertificatePath = $"{StoreLocation.CurrentUser}/{StoreName.My}/{ColumnMasterKeyCertificate.Thumbprint}";
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnEncryptionKey.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnEncryptionKey.cs
new file mode 100644
index 0000000000..af402428b0
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnEncryptionKey.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Security.Cryptography;
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// A column encryption key, created at the start of its scope and dropped when disposed.
+/// </summary>
+public sealed class ColumnEncryptionKey : DatabaseObject<ColumnMasterKey>
+{
+    private const int PlaintextKeyLength = 32;
+
+    private const string DefinitionTemplate = "CREATE COLUMN ENCRYPTION KEY {0} WITH VALUES" +
+        " (COLUMN_MASTER_KEY = {1}, ALGORITHM = 'RSA_OAEP', ENCRYPTED_VALUE = 0x{2})";
+
+    private ColumnMasterKey ColumnMasterKey => State;
+
+    /// <summary>
+    /// Initializes a new instance of the ColumnEncryptionKey class using the specified SQL connection,
+    /// name and a column master key.
+    /// </summary>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="namePrefix">The column encryption key name.</param>
+    /// <param name="cmkOrigin">The column master key which backs this encryption key.</param>
+    public ColumnEncryptionKey(SqlConnection connection, string namePrefix, ColumnMasterKey cmkOrigin)
+        : base(connection, GenerateLongName(namePrefix), definition: DefinitionTemplate,
+            state: cmkOrigin, shouldCreate: true, shouldDrop: true)
+    {
+    }
+
+    protected override void CreateObject(string definition)
+    {
+        string encryptedValue;
+
+        using (RandomNumberGenerator rnd = RandomNumberGenerator.Create())
+        {
+            byte[] randomPlaintext = new byte[PlaintextKeyLength];
+            byte[] encryptedPlaintext;
+
+            rnd.GetBytes(randomPlaintext);
+            encryptedPlaintext = ColumnMasterKey.Encrypt(randomPlaintext);
+
+            encryptedValue = BitConverter.ToString(encryptedPlaintext).Replace("-", "");
+        }
+
+        definition = string.Format(definition, Name, ColumnMasterKey.Name, encryptedValue);
+        using SqlCommand createCommand = new(definition, Connection);
+
+        createCommand.ExecuteNonQuery();
+    }
+
+    protected override void DropObject()
+    {
+        using SqlCommand dropCommand = new($"IF EXISTS (SELECT 1 FROM sys.column_encryption_keys where name = @Name) DROP COLUMN ENCRYPTION KEY {Name}", Connection);
+        dropCommand.Parameters.AddWithValue("@Name", UnescapedName);
+
+        dropCommand.ExecuteNonQuery();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnMasterKey.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnMasterKey.cs
new file mode 100644
index 0000000000..de607c0f68
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnMasterKey.cs
@@ -0,0 +1,179 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text;
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// A column master key, created at the start of its scope and dropped when disposed.
+/// </summary>
+public abstract class ColumnMasterKey : DatabaseObject<ColumnMasterKey.CreationParameters>
+{
+    private const string DefinitionTemplate = "CREATE COLUMN MASTER KEY {0} WITH (KEY_STORE_PROVIDER_NAME = '{1}', KEY_PATH = '{2}'{3})";
+
+    public sealed class CreationParameters
+    {
+        public SqlColumnEncryptionKeyStoreProvider Provider { get; }
+
+        public string ProviderName { get; }
+
+        public string KeyPath { get; }
+
+        public bool AllowEnclaveComputations { get; }
+
+        internal CreationParameters(SqlColumnEncryptionKeyStoreProvider provider,
+            string providerName,
+            string keyPath,
+            bool allowEnclaveComputations)
+        {
+            Provider = provider;
+            ProviderName = providerName;
+            KeyPath = keyPath;
+            AllowEnclaveComputations = allowEnclaveComputations;
+        }
+    }
+
+    protected ColumnMasterKey(SqlConnection connection, string namePrefix, CreationParameters creationParameters)
+        : base(connection, name: GenerateLongName(namePrefix), definition: DefinitionTemplate,
+            state: creationParameters, shouldCreate: true, shouldDrop: true)
+    {
+    }
+
+    protected override void CreateObject(string definition)
+    {
+        string enclaveStatement;
+
+        if (State.AllowEnclaveComputations)
+        {
+            byte[] signature = State.Provider.SignColumnMasterKeyMetadata(State.KeyPath, State.AllowEnclaveComputations);
+            string signatureString = BitConverter.ToString(signature).Replace("-", "");
+
+            enclaveStatement = ", ENCLAVE_COMPUTATIONS (SIGNATURE = 0x" + signatureString + ")";
+        }
+        else
+        {
+            enclaveStatement = string.Empty;
+        }
+
+        definition = string.Format(definition, Name, State.ProviderName, State.KeyPath, enclaveStatement);
+
+        using SqlCommand createCommand = new(definition, Connection);
+
+        createCommand.ExecuteNonQuery();
+    }
+
+    protected override void DropObject()
+    {
+        using SqlCommand dropCommand = new($"IF EXISTS (SELECT 1 FROM sys.column_master_keys where name = @Name) DROP COLUMN MASTER KEY {Name}", Connection);
+        dropCommand.Parameters.AddWithValue("@Name", UnescapedName);
+
+        dropCommand.ExecuteNonQuery();
+    }
+
+    public byte[] Encrypt(byte[] columnEncryptionKey) =>
+        State.Provider.EncryptColumnEncryptionKey(State.KeyPath, "RSA_OAEP", columnEncryptionKey);
+
+    public byte[] Decrypt(byte[] encryptedColumnEncryptionKey) =>
+        State.Provider.DecryptColumnEncryptionKey(State.KeyPath, "RSA_OAEP", encryptedColumnEncryptionKey);
+}
+
+/// <summary>
+/// A column master key backed by a Cryptographic Service Provider. Created at the start of its
+/// scope and dropped when disposed.
+/// </summary>
+public sealed class CspProviderBackedColumnMasterKey : ColumnMasterKey
+{
+    /// <summary>
+    /// Initializes a new instance of the CspProviderBackedColumnMasterKey class using the specified
+    /// SQL connection, name and a certificate containing a CSP-backed private key.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// If a column master key with the specified name already exists, it will be dropped automatically
+    /// before creation.
+    /// </para>
+    /// <para>
+    /// This column master key will be backed by the <see cref="SqlColumnEncryptionCspProvider"/> class.
+    /// </para>
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="namePrefix">The column master key name.</param>
+    /// <param name="cspProvider">The certificate to wrap. Must contain a CSP-backed private key.</param>
+    /// <param name="allowEnclaveComputations"><c>true</c> to enable enclave computations.</param>
+    public CspProviderBackedColumnMasterKey(SqlConnection connection, string namePrefix,
+        CspCertificateFixture cspProvider, bool allowEnclaveComputations)
+        : base(connection, namePrefix, GenerateCreationParameters(cspProvider, allowEnclaveComputations))
+    {
+    }
+
+    private static CreationParameters GenerateCreationParameters(CspCertificateFixture cspProvider, bool allowEnclaveComputations) =>
+        new(provider: new SqlColumnEncryptionCspProvider(),
+            providerName: SqlColumnEncryptionCspProvider.ProviderName,
+            cspProvider.CspKeyPath ?? throw new InvalidOperationException("Certificate lacks a CSP key."),
+            allowEnclaveComputations);
+}
+
+/// <summary>
+/// A column master key backed by a certificate. Created at the start of its scope and dropped when disposed.
+/// </summary>
+public sealed class CertificateBackedColumnMasterKey : ColumnMasterKey
+{
+    /// <summary>
+    /// Initializes a new instance of the CertificateBackedColumnMasterKey class using the specified
+    /// SQL connection, name and a certificate.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// If a column master key with the specified name already exists, it will be dropped automatically
+    /// before creation.
+    /// </para>
+    /// <para>
+    /// This column master key will be backed by the <see cref="SqlColumnEncryptionCertificateStoreProvider"/>
+    /// class.
+    /// </para>
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="namePrefix">The column master key name.</param>
+    /// <param name="cspCertificate">The certificate to wrap. Must contain a private key.</param>
+    /// <param name="allowEnclaveComputations"><c>true</c> to enable enclave computations.</param>
+    public CertificateBackedColumnMasterKey(SqlConnection connection, string namePrefix,
+        CspCertificateFixture cspCertificate, bool allowEnclaveComputations)
+        : base(connection, namePrefix, GenerateCreationParameters(cspCertificate.CspCertificatePath, allowEnclaveComputations))
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the ColumnMasterKey class using the specified SQL connection,
+    /// name and a certificate.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// If a column master key with the specified name already exists, it will be dropped automatically
+    /// before creation.
+    /// </para>
+    /// <para>
+    /// This column master key will be backed by the <see cref="SqlColumnEncryptionCertificateStoreProvider"/>
+    /// class.
+    /// </para>
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="namePrefix">The column master key name.</param>
+    /// <param name="cmkCertificate">The certificate to wrap. Must contain a private key.</param>
+    /// <param name="allowEnclaveComputations"><c>true</c> to enable enclave computations.</param>
+    public CertificateBackedColumnMasterKey(SqlConnection connection, string namePrefix,
+        ColumnMasterKeyCertificateFixture cmkCertificate, bool allowEnclaveComputations)
+        : base(connection, namePrefix, GenerateCreationParameters(
+                cmkCertificate.ColumnMasterKeyCertificatePath
+                    ?? throw new InvalidOperationException("Certificate has not been created."),
+                allowEnclaveComputations))
+    {
+    }
+
+    private static CreationParameters GenerateCreationParameters(string certificatePath, bool allowEnclaveComputations) =>
+        new(provider: new SqlColumnEncryptionCertificateStoreProvider(),
+            providerName: SqlColumnEncryptionCertificateStoreProvider.ProviderName,
+            certificatePath,
+            allowEnclaveComputations);
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index de44a0c64b..b46b464428 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -37,8 +37,19 @@
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj"
                       Condition="'$(ReferenceType)' != 'Package'" />
+    <!-- In Package mode the perf pipeline can pin a specific released MDS version (e.g. a     -->
+    <!-- performance baseline) by passing -p:MdsPackageVersion=<version>. That property flows  -->
+    <!-- to every project in the build, so this project must honour it too; otherwise the      -->
+    <!-- CPM-managed (unpublished, in-development) version is used here and restore fails with -->
+    <!-- NU1102/NU1605 for consumers that pinned an older baseline. Under Central Package      -->
+    <!-- Management a plain Version is ignored, so VersionOverride is used; when                -->
+    <!-- MdsPackageVersion is empty the CPM-managed version applies. The two Includes are       -->
+    <!-- mutually exclusive on whether MdsPackageVersion was provided.                          -->
     <PackageReference Include="Microsoft.Data.SqlClient"
-                      Condition="'$(ReferenceType)' == 'Package'" />
+                      Condition="'$(ReferenceType)' == 'Package' and '$(MdsPackageVersion)' == ''" />
+    <PackageReference Include="Microsoft.Data.SqlClient"
+                      Condition="'$(ReferenceType)' == 'Package' and '$(MdsPackageVersion)' != ''"
+                      VersionOverride="$(MdsPackageVersion)" />
   </ItemGroup>
 
   <!-- References for netfx -->
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/SqlDataReaderExtensions.cs b/src/Microsoft.Data.SqlClient/tests/Common/SqlDataReaderExtensions.cs
index 8851cb5210..daa690ce2d 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/SqlDataReaderExtensions.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/SqlDataReaderExtensions.cs
@@ -45,7 +45,8 @@ public static void FlushResultSet(this SqlDataReader dataReader)
         {
             while (dataReader.Read())
             {
-                // Discard results.
+                // Read all row data and discard.
+                _ = dataReader.IsDBNull(0);
             }
         }
 
@@ -58,7 +59,8 @@ public static async Task FlushResultSetAsync(this SqlDataReader dataReader)
         {
             while (await dataReader.ReadAsync())
             {
-                // Discard results.
+                // Read all row data and discard.
+                _ = await dataReader.IsDBNullAsync(0);
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/AsyncLargeDataReadRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/AsyncLargeDataReadRunner.cs
deleted file mode 100644
index 851b5b8d66..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/AsyncLargeDataReadRunner.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Data;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-
-namespace Microsoft.Data.SqlClient.PerformanceTests
-{
-    /// <summary>
-    /// Benchmarks for sync vs async reading of large VARBINARY(MAX) values.
-    /// Reproduces issues #593 and #1562.
-    /// </summary>
-    public class AsyncLargeDataReadRunner : BaseRunner
-    {
-        private string _tableName;
-        private string _connectionString;
-
-        /// <summary>
-        /// Size of the data to read in bytes.
-        /// </summary>
-        [Params(1_048_576, 5_242_880, 10_485_760, 20_971_520)]
-        public int DataSizeBytes { get; set; }
-
-        /// <summary>
-        /// Size of the client-side read buffer used to drain the VARBINARY(MAX) column.
-        /// Kept small (8 KB) and large (1 MB) to observe whether buffer size relative to
-        /// the payload materially changes throughput.
-        /// </summary>
-        [Params(8_192, 1_048_576)]
-        public int ReadBufferBytes { get; set; }
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            _connectionString = s_config.ConnectionString;
-            string machineHash = ((uint)Environment.MachineName.GetHashCode()).ToString("x8");
-            _tableName = $"[perf_AsyncLargeData_{machineHash}_{Guid.NewGuid():N}]";
-
-            using var conn = new SqlConnection(_connectionString);
-            conn.Open();
-
-            using var createCmd = new SqlCommand(
-                $"CREATE TABLE {_tableName} (Id INT IDENTITY PRIMARY KEY, Data VARBINARY(MAX))", conn);
-            createCmd.ExecuteNonQuery();
-
-            // Generate the payload entirely server-side via CRYPT_GEN_RANDOM so we don't
-            // allocate a multi-megabyte byte[] on the client and don't ship the payload
-            // over the wire just to seed the benchmark.
-            using var insertCmd = new SqlCommand(
-                $@"INSERT INTO {_tableName} (Data)
-                   SELECT SUBSTRING(
-                       CONVERT(
-                           varbinary(max),
-                           REPLICATE(
-                               CONVERT(varchar(max), CRYPT_GEN_RANDOM(8000), 2),
-                               (@dataSizeBytes + 7999) / 8000
-                           ),
-                           2
-                       ),
-                       1,
-                       @dataSizeBytes
-                   );", conn);
-            insertCmd.Parameters.Add("@dataSizeBytes", SqlDbType.Int).Value = DataSizeBytes;
-            insertCmd.ExecuteNonQuery();
-        }
-
-        [GlobalCleanup]
-        public void Cleanup()
-        {
-            using var conn = new SqlConnection(_connectionString);
-            conn.Open();
-            using var cmd = new SqlCommand($"DROP TABLE IF EXISTS {_tableName}", conn);
-            cmd.ExecuteNonQuery();
-            SqlConnection.ClearAllPools();
-        }
-
-        [Benchmark]
-        public void ReadLargeDataSync()
-        {
-            using var conn = new SqlConnection(_connectionString);
-            conn.Open();
-            using var cmd = new SqlCommand($"SELECT Data FROM {_tableName}", conn);
-            using var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess);
-            while (reader.Read())
-            {
-                byte[] buffer = new byte[ReadBufferBytes];
-                long offset = 0;
-                long bytesRead;
-                do
-                {
-                    bytesRead = reader.GetBytes(0, offset, buffer, 0, buffer.Length);
-                    offset += bytesRead;
-                } while (bytesRead > 0);
-            }
-        }
-
-        [Benchmark]
-        public async Task ReadLargeDataAsync()
-        {
-            using var conn = new SqlConnection(_connectionString);
-            await conn.OpenAsync();
-            using var cmd = new SqlCommand($"SELECT Data FROM {_tableName}", conn);
-            using var reader = await cmd.ExecuteReaderAsync(CommandBehavior.SequentialAccess);
-            while (await reader.ReadAsync())
-            {
-                using var stream = reader.GetStream(0);
-                byte[] buffer = new byte[ReadBufferBytes];
-                int bytesRead;
-                do
-                {
-                    bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length);
-                } while (bytesRead > 0);
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderAsyncRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderAsyncRunner.cs
deleted file mode 100644
index b74a277258..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderAsyncRunner.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-using static Microsoft.Data.SqlClient.PerformanceTests.Constants;
-
-namespace Microsoft.Data.SqlClient.PerformanceTests
-{
-    public class DataTypeReaderAsyncRunner : BaseRunner
-    {
-        private static long s_rowCount;
-        private static string _query(string name) => $"SELECT * FROM {name}";
-
-        [GlobalSetup]
-        public static void Setup()
-        {
-            s_rowCount = s_config.Benchmarks.DataTypeReaderRunnerConfig.RowCount;
-        }
-
-        [GlobalCleanup]
-        public static void Dispose()
-        {
-            SqlConnection.ClearAllPools();
-        }
-
-        [IterationCleanup]
-        public static void ResetConnection()
-        {
-            SqlConnection.ClearAllPools();
-        }
-
-        private static async Task RunBenchmarkAsync(DataType type)
-        {
-            using SqlConnection sqlConnection = new(s_config.ConnectionString);
-            sqlConnection.Open();
-            Table t = Table.Build(nameof(SqlCommandRunner))
-                .AddColumn(new Column(type))
-                .CreateTable(sqlConnection)
-                .InsertBulkRows(s_rowCount, sqlConnection);
-            try
-            {
-                using SqlCommand sqlCommand = new(_query(t.Name), sqlConnection);
-                using SqlDataReader reader = await sqlCommand.ExecuteReaderAsync();
-                while (await reader.ReadAsync())
-                { }
-            }
-            finally
-            {
-                t.DropTable(sqlConnection);
-            }
-        }
-
-        [Benchmark]
-        public static Task BitAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_bit]);
-
-        [Benchmark]
-        public static Task IntAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_int]);
-
-        [Benchmark]
-        public static Task TinyIntAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_tinyint]);
-
-        [Benchmark]
-        public static Task SmallIntAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_smallint]);
-
-        [Benchmark]
-        public static Task BigIntAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_bigint]);
-
-        [Benchmark]
-        public static Task MoneyAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_money]);
-
-        [Benchmark]
-        public static Task SmallMoneyAsync() => RunBenchmarkAsync(s_datatypes.Numerics[n_smallmoney]);
-
-        [Benchmark]
-        public static Task DecimalAsync() => RunBenchmarkAsync(s_datatypes.Decimals[d_decimal]);
-
-        [Benchmark]
-        public static Task NumericAsync() => RunBenchmarkAsync(s_datatypes.Decimals[d_numeric]);
-
-        [Benchmark]
-        public static Task FloatAsync() => RunBenchmarkAsync(s_datatypes.Decimals[d_float]);
-
-        [Benchmark]
-        public static Task RealAsync() => RunBenchmarkAsync(s_datatypes.Decimals[d_real]);
-
-        [Benchmark]
-        public static Task DateAsync() => RunBenchmarkAsync(s_datatypes.DateTimes[t_date]);
-
-        [Benchmark]
-        public static Task DatetimeAsync() => RunBenchmarkAsync(s_datatypes.DateTimes[t_datetime]);
-
-        [Benchmark]
-        public static Task Datetime2Async() => RunBenchmarkAsync(s_datatypes.DateTimes[t_datetime2]);
-
-        [Benchmark]
-        public static Task TimeAsync() => RunBenchmarkAsync(s_datatypes.DateTimes[t_time]);
-
-        [Benchmark]
-        public static Task SmallDateTimeAsync() => RunBenchmarkAsync(s_datatypes.DateTimes[t_smalldatetime]);
-
-        [Benchmark]
-        public static Task DateTimeOffsetAsync() => RunBenchmarkAsync(s_datatypes.DateTimes[t_datetimeoffset]);
-
-        [Benchmark]
-        public static Task CharAsync() => RunBenchmarkAsync(s_datatypes.Characters[c_char]);
-
-        [Benchmark]
-        public static Task NCharAsync() => RunBenchmarkAsync(s_datatypes.Characters[c_nchar]);
-
-        [Benchmark]
-        public static Task BinaryAsync() => RunBenchmarkAsync(s_datatypes.Binary[b_binary]);
-
-        [Benchmark]
-        public static Task VarCharAsync() => RunBenchmarkAsync(s_datatypes.MaxTypes[m_varchar]);
-
-        [Benchmark]
-        public static Task NVarCharAsync() => RunBenchmarkAsync(s_datatypes.MaxTypes[m_nvarchar]);
-
-        [Benchmark]
-        public static Task VarBinaryAsync() => RunBenchmarkAsync(s_datatypes.MaxTypes[m_varbinary]);
-
-        [Benchmark]
-        public static Task UniqueIdentifierAsync() => RunBenchmarkAsync(s_datatypes.Others[o_uniqueidentifier]);
-
-        [Benchmark]
-        public static Task XmlAsync() => RunBenchmarkAsync(s_datatypes.Others[o_xml]);
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner.cs
deleted file mode 100644
index 00834425c8..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using BenchmarkDotNet.Attributes;
-using static Microsoft.Data.SqlClient.PerformanceTests.Constants;
-
-namespace Microsoft.Data.SqlClient.PerformanceTests
-{
-    public class DataTypeReaderRunner : BaseRunner
-    {
-        private static SqlConnection s_sqlConnection;
-        private static long s_rowCount;
-
-        private static string _query(string name) => $"SELECT * FROM {name}";
-
-        [GlobalSetup]
-        public static void Setup()
-        {
-            s_sqlConnection = new(s_config.ConnectionString);
-            s_sqlConnection.Open();
-            s_rowCount = s_config.Benchmarks.DataTypeReaderRunnerConfig.RowCount;
-        }
-
-        [GlobalCleanup]
-        public static void Dispose()
-        {
-            s_sqlConnection.Close();
-            SqlConnection.ClearAllPools();
-        }
-
-        private static void RunBenchmark(DataType type)
-        {
-            Table t = Table.Build(nameof(SqlCommandRunner))
-                .AddColumn(new Column(type))
-                .CreateTable(s_sqlConnection)
-                .InsertBulkRows(s_rowCount, s_sqlConnection);
-            try
-            {
-                using SqlCommand sqlCommand = new(_query(t.Name), s_sqlConnection);
-                using SqlDataReader reader = sqlCommand.ExecuteReader();
-                while (reader.Read())
-                { }
-            }
-            finally
-            {
-                t.DropTable(s_sqlConnection);
-            }
-        }
-
-        [Benchmark]
-        public static void Bit() => RunBenchmark(s_datatypes.Numerics[n_bit]);
-
-        [Benchmark]
-        public static void Int() => RunBenchmark(s_datatypes.Numerics[n_int]);
-
-        [Benchmark]
-        public static void TinyInt() => RunBenchmark(s_datatypes.Numerics[n_tinyint]);
-
-        [Benchmark]
-        public static void SmallInt() => RunBenchmark(s_datatypes.Numerics[n_smallint]);
-
-        [Benchmark]
-        public static void BigInt() => RunBenchmark(s_datatypes.Numerics[n_bigint]);
-
-        [Benchmark]
-        public static void Money() => RunBenchmark(s_datatypes.Numerics[n_money]);
-
-        [Benchmark]
-        public static void SmallMoney() => RunBenchmark(s_datatypes.Numerics[n_smallmoney]);
-
-        [Benchmark]
-        public static void Decimal() => RunBenchmark(s_datatypes.Decimals[d_decimal]);
-
-        [Benchmark]
-        public static void Numeric() => RunBenchmark(s_datatypes.Decimals[d_numeric]);
-
-        [Benchmark]
-        public static void Float() => RunBenchmark(s_datatypes.Decimals[d_float]);
-
-        [Benchmark]
-        public static void Real() => RunBenchmark(s_datatypes.Decimals[d_real]);
-
-        [Benchmark]
-        public static void Date() => RunBenchmark(s_datatypes.DateTimes[t_date]);
-
-        [Benchmark]
-        public static void Datetime() => RunBenchmark(s_datatypes.DateTimes[t_datetime]);
-
-        [Benchmark]
-        public static void Datetime2() => RunBenchmark(s_datatypes.DateTimes[t_datetime2]);
-
-        [Benchmark]
-        public static void Time() => RunBenchmark(s_datatypes.DateTimes[t_time]);
-
-        [Benchmark]
-        public static void SmallDateTime() => RunBenchmark(s_datatypes.DateTimes[t_smalldatetime]);
-
-        [Benchmark]
-        public static void DateTimeOffset() => RunBenchmark(s_datatypes.DateTimes[t_datetimeoffset]);
-
-        [Benchmark]
-        public static void Char() => RunBenchmark(s_datatypes.Characters[c_char]);
-
-        [Benchmark]
-        public static void NChar() => RunBenchmark(s_datatypes.Characters[c_nchar]);
-
-        [Benchmark]
-        public static void Binary() => RunBenchmark(s_datatypes.Binary[b_binary]);
-
-        [Benchmark]
-        public static void VarChar() => RunBenchmark(s_datatypes.MaxTypes[m_varchar]);
-
-        [Benchmark]
-        public static void NVarChar() => RunBenchmark(s_datatypes.MaxTypes[m_nvarchar]);
-
-        [Benchmark]
-        public static void VarBinary() => RunBenchmark(s_datatypes.MaxTypes[m_varbinary]);
-
-        [Benchmark]
-        public static void UniqueIdentifier() => RunBenchmark(s_datatypes.Others[o_uniqueidentifier]);
-
-        [Benchmark]
-        public static void Xml() => RunBenchmark(s_datatypes.Others[o_xml]);
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/AlwaysEncrypted.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/AlwaysEncrypted.cs
new file mode 100644
index 0000000000..9bcc20549d
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/AlwaysEncrypted.cs
@@ -0,0 +1,53 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests.BenchmarkRunners.DataTypeReaderRunner;
+
+public class AlwaysEncrypted : DataTypeReaderRunnerBase
+{
+    private ColumnMasterKeyCertificateFixture _cmkCertificate;
+    private ColumnMasterKey _masterKey;
+    private ColumnEncryptionKey _encryptionKey;
+
+    public override IEnumerable<DataType> ExecutedTypes => AvailableTypes.Where(t => t.EncryptionSupported);
+
+    protected override RunnerJob Configuration => s_config.Benchmarks.AlwaysEncryptedDataTypeReaderRunnerConfig;
+
+    protected override SqlConnection OpenConnection()
+    {
+        SqlConnectionStringBuilder builder = new(s_config.ConnectionString)
+        {
+            ColumnEncryptionSetting = SqlConnectionColumnEncryptionSetting.Enabled
+        };
+        SqlConnection conn = new(builder.ToString());
+
+        conn.Open();
+        return conn;
+    }
+
+    protected override Table CreateTable()
+    {
+        _cmkCertificate = new ColumnMasterKeyCertificateFixture();
+        _masterKey = new CertificateBackedColumnMasterKey(_connection, nameof(_masterKey), _cmkCertificate, false);
+        _encryptionKey = new ColumnEncryptionKey(_connection, nameof(AlwaysEncrypted), _masterKey);
+
+        return Table.Build(Type.Name)
+            .AddColumn(new Column(Type, encryptionKey: _encryptionKey))
+            .CreateTable(_connection);
+    }
+
+    protected override void OnCleanup()
+    {
+        using (_cmkCertificate)
+        using (_masterKey)
+        using (_encryptionKey)
+        {
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/DataTypeReaderRunnerBase.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/DataTypeReaderRunnerBase.cs
new file mode 100644
index 0000000000..56c6487533
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/DataTypeReaderRunnerBase.cs
@@ -0,0 +1,87 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+using Microsoft.Data.SqlClient.Tests.Common;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests.BenchmarkRunners.DataTypeReaderRunner;
+
+public abstract class DataTypeReaderRunnerBase : BaseRunner
+{
+    protected SqlConnection _connection;
+    protected Table _table;
+
+    public abstract IEnumerable<DataType> ExecutedTypes { get; }
+
+    [ParamsSource(nameof(ExecutedTypes))]
+    public DataType Type { get; set; }
+
+    protected IEnumerable<DataType> AvailableTypes =>
+        s_datatypes.Others
+            .Concat(s_datatypes.Numerics)
+            .Concat(s_datatypes.Decimals)
+            .Concat(s_datatypes.DateTimes)
+            .Concat(s_datatypes.Characters)
+            .Concat(s_datatypes.Binary)
+            .Concat(s_datatypes.MaxTypes);
+
+    protected abstract RunnerJob Configuration { get; }
+
+    protected abstract SqlConnection OpenConnection();
+
+    protected abstract Table CreateTable();
+
+    protected virtual void OnCleanup() { }
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        long rowCount = Configuration.RowCount;
+
+        _connection = OpenConnection();
+
+        _table = CreateTable()
+            .InsertBulkRows(rowCount, _connection);
+    }
+
+    [GlobalCleanup]
+    public void Cleanup()
+    {
+        using (_connection)
+        {
+            _table.DropTable(_connection);
+
+            OnCleanup();
+        }
+
+        SqlConnection.ClearAllPools();
+    }
+
+    [IterationCleanup]
+    public void ResetConnection()
+    {
+        SqlConnection.ClearAllPools();
+    }
+
+    [Benchmark]
+    public async Task ReadAsync()
+    {
+        await using SqlCommand sqlCommand = new($"SELECT * FROM {_table.Name}", _connection);
+        await using SqlDataReader reader = await sqlCommand.ExecuteReaderAsync();
+
+        await reader.FlushResultSetAsync();
+    }
+
+    [Benchmark]
+    public void Read()
+    {
+        using SqlCommand sqlCommand = new($"SELECT * FROM {_table.Name}", _connection);
+        using SqlDataReader reader = sqlCommand.ExecuteReader();
+
+        reader.FlushResultSet();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/Plaintext.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/Plaintext.cs
new file mode 100644
index 0000000000..e3d8829896
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/DataTypeReaderRunner/Plaintext.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests.BenchmarkRunners.DataTypeReaderRunner;
+
+public class Plaintext : DataTypeReaderRunnerBase
+{
+    public override IEnumerable<DataType> ExecutedTypes => AvailableTypes;
+
+    protected override RunnerJob Configuration => s_config.Benchmarks.DataTypeReaderRunnerConfig;
+
+    protected override SqlConnection OpenConnection()
+    {
+        SqlConnection conn = new(s_config.ConnectionString);
+
+        conn.Open();
+        return conn;
+    }
+
+    protected override Table CreateTable() =>
+        Table.Build(Type.Name)
+            .AddColumn(new Column(Type))
+            .CreateTable(_connection);
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/AlwaysEncrypted.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/AlwaysEncrypted.cs
new file mode 100644
index 0000000000..09e789767e
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/AlwaysEncrypted.cs
@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Data;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests.BenchmarkRunners.LargeDataReadRunner;
+
+public class AlwaysEncrypted : LargeDataReadRunnerBase
+{
+    private ColumnMasterKeyCertificateFixture _cmkCertificate;
+    private ColumnMasterKey _masterKey;
+    private ColumnEncryptionKey _encryptionKey;
+
+    public override IEnumerable<CommandBehavior> ExecutedCommandBehaviors => [CommandBehavior.Default];
+
+    protected override SqlConnection OpenConnection()
+    {
+        SqlConnectionStringBuilder builder = new(s_config.ConnectionString)
+        {
+            ColumnEncryptionSetting = SqlConnectionColumnEncryptionSetting.Enabled
+        };
+        SqlConnection conn = new(builder.ToString());
+
+        conn.Open();
+        return conn;
+    }
+
+    protected override Tests.Common.Fixtures.DatabaseObjects.Table CreateTable()
+    {
+        _cmkCertificate = new ColumnMasterKeyCertificateFixture();
+        _masterKey = new CertificateBackedColumnMasterKey(_connection, nameof(_masterKey), _cmkCertificate, false);
+        _encryptionKey = new ColumnEncryptionKey(_connection, nameof(AlwaysEncrypted), _masterKey);
+
+        return new Tests.Common.Fixtures.DatabaseObjects.Table(_connection, nameof(AlwaysEncrypted),
+            "(" +
+            "Id INT IDENTITY PRIMARY KEY," +
+            "Data VARBINARY(MAX) ENCRYPTED WITH" +
+            "(" +
+            $"COLUMN_ENCRYPTION_KEY = {_encryptionKey.Name}," +
+            "ENCRYPTION_TYPE = DETERMINISTIC," +
+            "ALGORITHM = 'AEAD_AES_256_CBC_HMAC_SHA_256'" +
+            ")" +
+            ")");
+    }
+
+    protected override void OnCleanup()
+    {
+        using (_cmkCertificate)
+        using (_masterKey)
+        using (_encryptionKey)
+        {
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/LargeDataReadRunnerBase.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/LargeDataReadRunnerBase.cs
new file mode 100644
index 0000000000..f34be9f546
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/LargeDataReadRunnerBase.cs
@@ -0,0 +1,99 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlTypes;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests.BenchmarkRunners.LargeDataReadRunner;
+
+/// <summary>
+/// Benchmarks for sync vs async reading of large VARBINARY(MAX) values.
+/// Reproduces issues #593 and #1562.
+/// </summary>
+public abstract class LargeDataReadRunnerBase : BaseRunner
+{
+    protected SqlConnection _connection;
+    protected Tests.Common.Fixtures.DatabaseObjects.Table _table;
+
+    public abstract IEnumerable<CommandBehavior> ExecutedCommandBehaviors { get; }
+
+    /// <summary>
+    /// Size of the data to read in bytes.
+    /// </summary>
+    [Params(1_048_576, 5_242_880, 10_485_760, 20_971_520)]
+    public int DataSizeBytes { get; set; }
+
+    /// <summary>
+    /// CommandBehavior to use when executing the reader.
+    /// SequentialAccess is expected to be faster for large payloads. Default is included
+    /// to facilitate comparison with Always Encrypted (which doesn't support SequentialAccess.)
+    /// </summary>
+    [ParamsSource(nameof(ExecutedCommandBehaviors))]
+    public CommandBehavior CommandBehavior { get; set; }
+
+    protected abstract SqlConnection OpenConnection();
+
+    protected abstract Tests.Common.Fixtures.DatabaseObjects.Table CreateTable();
+
+    protected virtual void OnCleanup() { }
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        _connection = OpenConnection();
+
+        _table = CreateTable();
+
+        // Cannot generate the payload server-side (and avoid a multi-megabyte byte[] allocation
+        // on the client) because Always Encrypted values must be generated client-side.
+        using SqlCommand insertCmd = new($"INSERT INTO {_table.Name} (Data) VALUES (@data)", _connection);
+        insertCmd.Parameters.Add("@data", SqlDbType.VarBinary, -1).Value = new byte[DataSizeBytes];
+        insertCmd.ExecuteNonQuery();
+    }
+
+    [GlobalCleanup]
+    public void Cleanup()
+    {
+        using (_connection)
+        {
+            try
+            {
+                _table.Dispose();
+            }
+            finally
+            {
+                OnCleanup();
+            }
+        }
+
+        SqlConnection.ClearAllPools();
+    }
+
+    [Benchmark]
+    public void ReadLargeDataSync_GetFieldValue()
+    {
+        using SqlCommand cmd = new($"SELECT Data FROM {_table.Name}", _connection);
+        using SqlDataReader reader = cmd.ExecuteReader(CommandBehavior);
+
+        while (reader.Read())
+        {
+            _ = reader.GetFieldValue<SqlBinary>(0);
+        }
+    }
+
+    [Benchmark]
+    public async Task ReadLargeDataAsync_GetFieldValue()
+    {
+        await using SqlCommand cmd = new($"SELECT Data FROM {_table.Name}", _connection);
+        await using SqlDataReader reader = await cmd.ExecuteReaderAsync(CommandBehavior);
+
+        while (await reader.ReadAsync())
+        {
+            _ = await reader.GetFieldValueAsync<SqlBinary>(0);
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/Plaintext.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/Plaintext.cs
new file mode 100644
index 0000000000..17ea039de1
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/LargeDataReadRunner/Plaintext.cs
@@ -0,0 +1,75 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests.BenchmarkRunners.LargeDataReadRunner;
+
+public class Plaintext : LargeDataReadRunnerBase
+{
+    public override IEnumerable<CommandBehavior> ExecutedCommandBehaviors =>
+        [CommandBehavior.Default, CommandBehavior.SequentialAccess];
+
+    /// <summary>
+    /// Size of the client-side read buffer used to drain the VARBINARY(MAX) column.
+    /// Kept small (8 KB) and large (1 MB) to observe whether buffer size relative to
+    /// the payload materially changes throughput.
+    /// </summary>
+    public IEnumerable<int> ReadBufferBytes => [8_192, 1_048_576];
+
+    protected override SqlConnection OpenConnection()
+    {
+        SqlConnection conn = new(s_config.ConnectionString);
+
+        conn.Open();
+        return conn;
+    }
+
+    protected override Tests.Common.Fixtures.DatabaseObjects.Table CreateTable() =>
+        new(_connection, nameof(Plaintext), "(Id INT IDENTITY PRIMARY KEY, Data VARBINARY(MAX))");
+
+    [Benchmark]
+    [ArgumentsSource(nameof(ReadBufferBytes))]
+    public void ReadLargeDataSync_GetBytes(int readBufferBytes)
+    {
+        using SqlCommand cmd = new($"SELECT Data FROM {_table.Name}", _connection);
+        using SqlDataReader reader = cmd.ExecuteReader(CommandBehavior);
+        byte[] buffer = new byte[readBufferBytes];
+
+        while (reader.Read())
+        {
+            long offset = 0;
+            long bytesRead;
+            do
+            {
+                bytesRead = reader.GetBytes(0, offset, buffer, 0, buffer.Length);
+                offset += bytesRead;
+            } while (bytesRead > 0);
+        }
+    }
+
+    [Benchmark]
+    [ArgumentsSource(nameof(ReadBufferBytes))]
+    public async Task ReadLargeDataAsync_GetStream(int readBufferBytes)
+    {
+        await using SqlCommand cmd = new($"SELECT Data FROM {_table.Name}", _connection);
+        await using SqlDataReader reader = await cmd.ExecuteReaderAsync(CommandBehavior);
+        byte[] buffer = new byte[readBufferBytes];
+
+        while (await reader.ReadAsync())
+        {
+            await using Stream stream = reader.GetStream(0);
+            int bytesRead;
+
+            do
+            {
+                bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length);
+            } while (bytesRead > 0);
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs
index 9a53f97651..01fd580651 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/BenchmarkConfig.cs
@@ -2,11 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Engines;
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Exporters.Json;
 using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Toolchains;
 using BenchmarkDotNet.Toolchains.InProcess.Emit;
 #if WINDOWS
 using BenchmarkDotNet.Diagnostics.Windows;
@@ -25,6 +28,32 @@ public static class BenchmarkConfig
         /// </summary>
         public static bool UseNativeMemoryAndEtwProfiler { get; set; }
 
+        /// <summary>
+        /// Builds the in-process toolchain for a benchmark, honouring
+        /// <see cref="RunnerJob.TimeoutMinutes"/>.
+        ///
+        /// The in-process toolchain is required (rather than merely convenient): the
+        /// AppContext switches applied in <see cref="Program.SetupConfigurations"/> only
+        /// affect the process that runs Main, so an out-of-process toolchain would run the
+        /// benchmarks with those switches at their default values.
+        /// </summary>
+        private static IToolchain BuildToolchain(RunnerJob runnerJob) =>
+            runnerJob.TimeoutMinutes > 0
+                ? new InProcessEmitToolchain(
+                    TimeSpan.FromMinutes(runnerJob.TimeoutMinutes),
+                    logOutput: true)
+                : InProcessEmitToolchain.Instance;
+
+        /// <summary>
+        /// Resolves the configured <see cref="RunStrategy"/> name, defaulting to
+        /// <see cref="RunStrategy.Throughput"/> when unset or unrecognised.
+        /// </summary>
+        private static RunStrategy ResolveRunStrategy(RunnerJob runnerJob) =>
+            !string.IsNullOrWhiteSpace(runnerJob.RunStrategy)
+            && Enum.TryParse(runnerJob.RunStrategy, ignoreCase: true, out RunStrategy strategy)
+                ? strategy
+                : RunStrategy.Throughput;
+
         public static ManualConfig s_instance(RunnerJob runnerJob)
         {
             ManualConfig config = DefaultConfig.Instance
@@ -37,13 +66,13 @@ public static ManualConfig s_instance(RunnerJob runnerJob)
                 // pipeline can translate results into the Kusto performance-results schema.
                 .AddExporter(JsonExporter.Full)
                 .AddJob(
-                    Job.MediumRun.WithToolchain(InProcessEmitToolchain.Instance)
+                    Job.MediumRun.WithToolchain(BuildToolchain(runnerJob))
                     .WithLaunchCount(runnerJob.LaunchCount)
                     .WithInvocationCount(runnerJob.InvocationCount)
                     .WithIterationCount(runnerJob.IterationCount)
                     .WithWarmupCount(runnerJob.WarmupCount)
                     .WithUnrollFactor(1)
-                    .WithStrategy(BenchmarkDotNet.Engines.RunStrategy.Throughput)
+                    .WithStrategy(ResolveRunStrategy(runnerJob))
                     .WithEnvironmentVariable("COMPlus_gcServer", "1")
                 )
                 .WithOptions(ConfigOptions.JoinSummary);
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
index 2bbd1f1c23..7b136c6f2c 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -59,8 +59,9 @@ public class Benchmarks
         public RunnerJob SqlCommandRunnerConfig;
         public RunnerJob SqlBulkCopyRunnerConfig;
         public RunnerJob DataTypeReaderRunnerConfig;
-        public RunnerJob DataTypeReaderAsyncRunnerConfig;
-        public RunnerJob AsyncLargeDataReadRunnerConfig;
+        public RunnerJob AlwaysEncryptedDataTypeReaderRunnerConfig;
+        public RunnerJob LargeDataReadRunnerConfig;
+        public RunnerJob AlwaysEncryptedLargeDataReadRunnerConfig;
         public RunnerJob MarsOverheadRunnerConfig;
         public RunnerJob ParallelAsyncConnectionRunnerConfig;
         public RunnerJob CancellationTokenReadAsyncRunnerConfig;
@@ -80,5 +81,40 @@ public class RunnerJob
         public int InvocationCount;
         public int WarmupCount;
         public long RowCount;
+
+        /// <summary>
+        /// Per-benchmark execution timeout, in minutes, for the in-process toolchain.
+        ///
+        /// BenchmarkDotNet's in-process executor aborts a benchmark case that exceeds its
+        /// timeout with "takes too long to run. Prefer to use out-of-process toolchains for
+        /// long-running benchmarks." The built-in default is 5 minutes, which is not enough
+        /// for benchmarks whose single operation is inherently slow (for example reading a
+        /// 20 MB VARBINARY(MAX) value 20 times, plus the additional iterations that
+        /// MemoryDiagnoser and ThreadingDiagnoser each add).
+        ///
+        /// Switching to an out-of-process toolchain - BenchmarkDotNet's own suggestion - is
+        /// deliberately NOT an option for this suite: the AppContext switches configured in
+        /// <see cref="Program.SetupConfigurations"/> (managed SNI, connection pool V2,
+        /// optimized async behaviour) only apply to the process that runs Main. An
+        /// out-of-process toolchain spawns a generated host where those switches revert to
+        /// their defaults, so the benchmark would silently measure the wrong code paths.
+        ///
+        /// When 0 or negative, BenchmarkDotNet's default timeout is used.
+        /// </summary>
+        public int TimeoutMinutes;
+
+        /// <summary>
+        /// BenchmarkDotNet <see cref="BenchmarkDotNet.Engines.RunStrategy"/> name to use for
+        /// this benchmark, for example "Throughput" or "Monitoring".
+        ///
+        /// "Throughput" (the default) is designed for fast operations and spends extra
+        /// iterations measuring and subtracting harness overhead. For benchmarks whose single
+        /// operation takes seconds, that overhead measurement is pure cost and is dwarfed by
+        /// the operation itself, so "Monitoring" - which skips it and simply runs the
+        /// requested iterations - is both faster and more appropriate.
+        ///
+        /// When null or empty, "Throughput" is used.
+        /// </summary>
+        public string RunStrategy;
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/DataTypes.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/DataTypes.cs
index 54b59a1015..05ae30e3a4 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/DataTypes.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/DataTypes.cs
@@ -1,7 +1,8 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Linq;
 using static Microsoft.Data.SqlClient.PerformanceTests.Constants;
 
 namespace Microsoft.Data.SqlClient.PerformanceTests
@@ -47,11 +48,17 @@ public static DataTypes Load()
     /// </summary>
     public class DataType
     {
+        /// <summary>
+        /// Always Encrypted scenarios do not support types with one of these names.
+        /// </summary>
+        private static readonly string[] s_unsupportedEncryptionTypes = ["xml"];
+
         /// <summary>
         /// Default value of all datatypes
         /// </summary>
         public object DefaultValue;
         public string Name;
+        public bool EncryptionSupported => !s_unsupportedEncryptionTypes.Contains(Name, System.StringComparer.OrdinalIgnoreCase);
 
         public override string ToString() => Name;
     }
@@ -121,6 +128,7 @@ public class ValueFormatType : DataType
     public class MaxLengthValueType : DataType
     {
         public int MaxLength;
+        public bool CharacterType => Name?.Contains("char", System.StringComparison.OrdinalIgnoreCase) ?? false;
     }
 
     public class MaxLengthBinaryType : MaxLengthValueType
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/DBFramework/Column.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/DBFramework/Column.cs
index 3caed947c9..bd6cfe7c64 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/DBFramework/Column.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/DBFramework/Column.cs
@@ -1,29 +1,44 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
 using System.Text;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 
 namespace Microsoft.Data.SqlClient.PerformanceTests
 {
     public class Column
     {
+        private const string AlwaysEncryptedEncryptionType = "DETERMINISTIC";
+        private const string AlwaysEncryptedAlgorithm = "AEAD_AES_256_CBC_HMAC_SHA_256";
+        private const string AlwaysEncryptedCharacterCollation = "Latin1_General_BIN2";
+
         public string Name;
         public DataType Type;
         public object Value;
+        public ColumnEncryptionKey EncryptionKey;
 
-        public Column(DataType type, string prefix = null, object value = null)
+        public Column(DataType type, string prefix = null, object value = null, ColumnEncryptionKey encryptionKey = null)
         {
             Type = type;
             Name = (prefix ?? "c_") + type.Name;
             Value = value ?? Type.DefaultValue;
+            EncryptionKey = Type.EncryptionSupported ? encryptionKey : null;
         }
 
-        public string QueryString
-        {
-            get => new StringBuilder(Name).Append(' ').Append(Type.ToString()).ToString();
-        }
+        public string QueryString =>
+            EncryptionKey is null
+                ? $"{Name} {Type}"
+                : $"{Name} {Type} {EncryptedCollation}ENCRYPTED WITH " +
+                    $"(COLUMN_ENCRYPTION_KEY = {EncryptionKey.Name}," +
+                    $"ENCRYPTION_TYPE = {AlwaysEncryptedEncryptionType}," +
+                    $"ALGORITHM = '{AlwaysEncryptedAlgorithm}')";
+
+        private string EncryptedCollation =>
+            Type is MaxLengthValueType maxLengthValueType && maxLengthValueType.CharacterType
+                ? $"COLLATE {AlwaysEncryptedCharacterCollation} "
+                : string.Empty;
 
         public DataColumn AsDataColumn() => new(Name);
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
index 77fb6130dc..1acb981002 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
@@ -74,6 +74,8 @@
   <!-- Other references -->
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
+
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
   </ItemGroup>
 
   <!-- NativeMemoryProfiler relies on ETW and is only supported on Windows. -->
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
index bf42ebaf75..b5ef4d76c6 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -42,9 +42,10 @@ public BenchmarkUnit(string name, Func<Benchmarks, RunnerJob> selector, Type run
             new BenchmarkUnit("SqlConnection", b => b.SqlConnectionRunnerConfig, typeof(SqlConnectionRunner)),
             new BenchmarkUnit("SqlCommand", b => b.SqlCommandRunnerConfig, typeof(SqlCommandRunner)),
             new BenchmarkUnit("SqlBulkCopy", b => b.SqlBulkCopyRunnerConfig, typeof(SqlBulkCopyRunner)),
-            new BenchmarkUnit("DataTypeReader", b => b.DataTypeReaderRunnerConfig, typeof(DataTypeReaderRunner)),
-            new BenchmarkUnit("DataTypeReaderAsync", b => b.DataTypeReaderAsyncRunnerConfig, typeof(DataTypeReaderAsyncRunner)),
-            new BenchmarkUnit("AsyncLargeDataRead", b => b.AsyncLargeDataReadRunnerConfig, typeof(AsyncLargeDataReadRunner)),
+            new BenchmarkUnit("DataTypeReader", b => b.DataTypeReaderRunnerConfig, typeof(BenchmarkRunners.DataTypeReaderRunner.Plaintext)),
+            new BenchmarkUnit("AlwaysEncryptedDataTypeReader", b => b.AlwaysEncryptedDataTypeReaderRunnerConfig, typeof(BenchmarkRunners.DataTypeReaderRunner.AlwaysEncrypted)),
+            new BenchmarkUnit("LargeDataRead", b => b.LargeDataReadRunnerConfig, typeof(BenchmarkRunners.LargeDataReadRunner.Plaintext)),
+            new BenchmarkUnit("AlwaysEncryptedLargeDataRead", b => b.AlwaysEncryptedLargeDataReadRunnerConfig, typeof(BenchmarkRunners.LargeDataReadRunner.AlwaysEncrypted)),
             new BenchmarkUnit("MarsOverhead", b => b.MarsOverheadRunnerConfig, typeof(MarsOverheadRunner)),
             new BenchmarkUnit("ParallelAsyncConnection", b => b.ParallelAsyncConnectionRunnerConfig, typeof(ParallelAsyncConnectionRunner)),
             new BenchmarkUnit("CancellationTokenReadAsync", b => b.CancellationTokenReadAsyncRunnerConfig, typeof(CancellationTokenReadAsyncRunner)),
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/datatypes.json b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/datatypes.json
index f99664c86b..fd83e7ff8f 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/datatypes.json
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/datatypes.json
@@ -1,4 +1,4 @@
-{
+{
     "Numerics": [
         {
             "Name": "bit",
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
index 5777db9652..5df16e3ff5 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
@@ -22,6 +22,17 @@
     // This section contains the configuration for each benchmark.
     // You can enable/disable benchmarks and configure the number of iterations, invocations, 
     // warmup runs, and row count for each benchmark.
+    //
+    // Two optional per-benchmark settings are available for slow benchmarks:
+    //   "TimeoutMinutes" - overrides BenchmarkDotNet's 5 minute in-process execution timeout.
+    //                      Omit (or set 0) to keep the default. Benchmarks that exceed it fail
+    //                      with "takes too long to run. Prefer to use out-of-process
+    //                      toolchains for long-running benchmarks." Note that switching to an
+    //                      out-of-process toolchain is NOT viable for this suite, because the
+    //                      AppContext switches above only apply to the process running Main.
+    //   "RunStrategy"    - "Throughput" (default) or "Monitoring". Use "Monitoring" when a
+    //                      single operation takes seconds, to skip the harness-overhead
+    //                      measurement that "Throughput" performs.
     "Benchmarks": {
         "SqlConnectionRunnerConfig": {
             "Enabled": true,
@@ -55,7 +66,7 @@
             "WarmupCount": 1,
             "RowCount": 1000
         },
-        "DataTypeReaderAsyncRunnerConfig": {
+        "AlwaysEncryptedDataTypeReaderRunnerConfig": {
             "Enabled": true,
             "LaunchCount": 1,
             "IterationCount": 20,
@@ -63,13 +74,33 @@
             "WarmupCount": 1,
             "RowCount": 1000
         },
-        "AsyncLargeDataReadRunnerConfig": {
+        // The large-data read benchmarks move up to 20 MB per operation, so a single
+        // operation takes seconds rather than microseconds. Three settings account for that:
+        //   IterationCount is reduced (20 network-bound iterations add little statistical
+        //     value over 5, but cost 4x the wall time);
+        //   RunStrategy is "Monitoring" so BenchmarkDotNet skips the harness-overhead
+        //     measurement that "Throughput" performs, which is meaningless at this scale;
+        //   TimeoutMinutes raises the in-process executor's 5 minute default, which these
+        //     benchmarks otherwise exceed and fail with "takes too long to run".
+        "LargeDataReadRunnerConfig": {
             "Enabled": true,
             "LaunchCount": 1,
-            "IterationCount": 20,
+            "IterationCount": 5,
             "InvocationCount": 1,
             "WarmupCount": 1,
-            "RowCount": 0
+            "RowCount": 0,
+            "RunStrategy": "Monitoring",
+            "TimeoutMinutes": 30
+        },
+        "AlwaysEncryptedLargeDataReadRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 5,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 0,
+            "RunStrategy": "Monitoring",
+            "TimeoutMinutes": 30
         },
         "MarsOverheadRunnerConfig": {
             "Enabled": true,

From 70543994c0d9d29ee025510da41fa77296752ef3 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Mon, 24 Aug 2026 14:17:39 +0100
Subject: [PATCH 244/298] Fix | Write DateOnly instances to sql_variant columns
 of table-valued parameters as date values (#4439)

* Correct DateOnly transport as sql_variant fields in TVPs

Instances of DateOnly stored within a SqlDataRecord field of type Variant will now be sent as dates, not datetimes.

By extension: sending DateOnly instances with values outside the acceptable range for a datetime will no longer throw overflow exceptions.

* Code review

Ensure that SqlDataRecord.GetSqlValue doesn't return a DateOnly instance.

Apply the same pattern as SqlDataReader - directly expose the original variant type metadata, and base the decision on that.

* Code review - style nit
---
 .../Data/SqlClient/Server/SqlDataRecord.cs    |  6 +++
 .../Data/SqlClient/Server/SqlRecordBuffer.cs  |  2 +-
 .../Data/SqlClient/Server/ValueUtilsSmi.cs    | 39 ++++++++++++++++---
 .../SQL/ParameterTest/DateTimeVariantTests.cs | 19 ++-------
 4 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs
index 6825139a15..72051fec39 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs
@@ -477,6 +477,12 @@ internal void ThrowIfInvalidOrdinal(int ordinal)
             }
         }
 
+        internal SmiMetaData GetVariantInternalMetaData(int ordinal)
+        {
+            ThrowIfInvalidOrdinal(ordinal);
+            return _recordBuffer.GetVariantType(ordinal);
+        }
+
         /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/System.Data.IDataRecord.GetData/*' />
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         IDataReader System.Data.IDataRecord.GetData(int ordinal) => throw ADP.NotSupported();
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlRecordBuffer.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlRecordBuffer.cs
index d8e9dc94c6..bb9bdbc446 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlRecordBuffer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlRecordBuffer.cs
@@ -463,7 +463,7 @@ internal SmiMetaData VariantType
             }
             set
             {
-                Debug.Assert(value != null && (value.SqlDbType == SqlDbType.Money || value.SqlDbType == SqlDbType.NVarChar),
+                Debug.Assert(value != null && (value.SqlDbType is SqlDbType.Money or SqlDbType.NVarChar or SqlDbType.Date),
                     "Invalid metadata");
 
                 _metadata = value;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs
index 94338c8dfb..1fc31c287a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs
@@ -1504,7 +1504,7 @@ value is DataFeed
                     }
 #if NET
                 case ExtendedClrTypeCode.DateOnly:
-                    SetDateTime_Checked(setters, ordinal, metaData, ((DateOnly)value).ToDateTime(new TimeOnly(0, 0)));
+                    SetDate_Checked(setters, ordinal, metaData, ((DateOnly)value).ToDateTime(new TimeOnly(0, 0)));
                     break;
                 case ExtendedClrTypeCode.TimeOnly:
                     SetTimeSpan_Checked(setters, ordinal, metaData, ((TimeOnly)value).ToTimeSpan());
@@ -2033,9 +2033,35 @@ internal static void FillCompatibleSettersFromRecord(SmiTypedGetterSetter setter
                             SetSqlXml_Unchecked(setters, i, record.GetSqlXml(i));    // perf improvement?
                             break;
                         case SqlDbType.Variant:
-                            object o = record.GetSqlValue(i);
+                            SmiMetaData variantMetadata = record.GetVariantInternalMetaData(i);
+                            SqlBuffer.StorageType storageType;
+                            object o;
+
+                            // We cannot transport a DateOnly instance using the GetSqlValue method. This is because
+                            // GetSqlValue will return a SqlDateTime, which has a much tighter range of expected
+                            // values (so trying to send DateOnly.MinValue will overflow.) Instead, use GetValue (which
+                            // will return a DateTime, with identical ranges of expected values.)
+                            if (variantMetadata.SqlDbType is SqlDbType.Date)
+                            {
+                                storageType = SqlBuffer.StorageType.Date;
+                                o = record.GetValue(i);
+                            }
+                            else
+                            {
+                                storageType = SqlBuffer.StorageType.Empty;
+                                o = record.GetSqlValue(i);
+                            }
+
                             ExtendedClrTypeCode typeCode = MetaDataUtilsSmi.DetermineExtendedTypeCode(o);
-                            SetCompatibleValueV200(setters, i, metaData[i], o, typeCode, 0, null /* no peekahead */);
+
+                            if (storageType is not SqlBuffer.StorageType.Empty)
+                            {
+                                SetCompatibleValueV200(setters, i, metaData[i], o, typeCode, 0, null /* no peekahead */, storageType);
+                            }
+                            else
+                            {
+                                SetCompatibleValueV200(setters, i, metaData[i], o, typeCode, 0, null /* no peekahead */);
+                            }
                             break;
                         case SqlDbType.Udt:
                             Debug.Assert(CanAccessSetterDirectly(metaData[i], ExtendedClrTypeCode.SqlBytes));
@@ -3135,8 +3161,11 @@ private static void SetDateTime2_Unchecked(ITypedSettersV3 setters, int ordinal,
 
         private static void SetDate_Unchecked(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DateTime value)
         {
-            Debug.Assert(metaData.SqlDbType == SqlDbType.Variant, "Invalid type. This should be called only when the type is variant.");
-            setters.SetVariantMetaData(ordinal, SmiMetaData.DefaultDate);
+            if (metaData.SqlDbType == SqlDbType.Variant)
+            {
+                setters.SetVariantMetaData(ordinal, SmiMetaData.DefaultDate);
+            }
+
             setters.SetDateTime(ordinal, value);
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
index 3d84e0ff2c..e968295b5a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -987,12 +987,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
         {
             #if NET
             yield return new object[] { DateOnly.MinValue, "date",
-                new Dictionary<TestVariations, ExceptionChecker> {
-                    { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
-                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
-                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
-                    { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
-                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }},
+                new Dictionary<TestVariations, ExceptionChecker>(),
                 new Dictionary<TestVariations, object>()
                 {
                     { TestVariations.TestSimpleParameter_Type, new DateTime(0) },
@@ -1014,12 +1009,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
                 },
                 new Dictionary<TestVariations, string>()};
             yield return new object[] { DateOnly.MaxValue, "date",
-                new Dictionary<TestVariations, ExceptionChecker> {
-                    { TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
-                    { TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
-                    { TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
-                    { TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
-                    { TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }},
+                new Dictionary<TestVariations, ExceptionChecker>(),
                 new Dictionary<TestVariations, object>()
                 {
                     { TestVariations.TestSimpleParameter_Type, new DateTime(3155378112000000000) },
@@ -1040,9 +1030,6 @@ public static IEnumerable<object[]> GetParameterCombinations()
                     { TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(3155378112000000000) }
                 },
                 new Dictionary<TestVariations, string>()
-                {
-                    {TestVariations.TestSqlDataRecordParameterToTVP_Variant, "datetime"}
-                }
             };
             #endif
             yield return new object[] { DateTime.MinValue, "date",

From 51af56e921f5a9e656100bd3725d9926645d9228 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 24 Aug 2026 09:22:28 -0700
Subject: [PATCH 245/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4574)

Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com>
---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx  | 6 ++++++
 .../src/Resources/Strings.pt-BR.resx                        | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx  | 6 ++++++
 src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx  | 6 ++++++
 .../src/Resources/Strings.zh-Hans.resx                      | 6 ++++++
 .../src/Resources/Strings.zh-Hant.resx                      | 6 ++++++
 13 files changed, 78 insertions(+)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index dce0620cf0..34d634bdbf 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Pokud je klíčové slovo Integrated Security připojovacího řetězce nastavené na hodnotu true nebo SSPI, nejde nastavit vlastnost AccessTokenCallback.</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Pokud je v připojovacím řetězci nastavená možnost Authentication=Active Directory Default, nejde nastavit vlastnost AccessTokenCallback.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index 5858e0fc82..6bc166a5e2 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>AccessTokenCallback-Eigenschaft kann nicht festgelegt werden, wenn das Schlüsselwort für Verbindungszeichenfolgen 'Integrated Security' auf 'true' oder 'SSPI' gesetzt wurde.</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Die Eigenschaft AccessTokenCallback kann nicht festgelegt werden, wenn in der Verbindungszeichenfolge "Authentication=Active Directory Default" angegeben wurde.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index 7f424217c3..4a01d217c6 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>No se puede establecer la propiedad AccessTokenCallback si la palabra clave de cadena de conexión "Integrated Security" se ha establecido en "true" o "SSPI".</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>No se puede establecer la propiedad AccessTokenCallback si se ha especificado 'Authentication=Active Directory Default' en la cadena de conexión.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index f91cd91912..83e45033db 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Impossible de définir la propriété AccessTokenCallback si le mot clé de chaîne de connexion « Sécurité intégrée » a été défini sur « true » ou « SSPI ».</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Impossible de définir la propriété AccessTokenCallback si 'Authentication=Active Directory Default' a été spécifié dans la chaîne de connexion.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 02d373a410..14b486dc50 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Non è possibile impostare la proprietà AccessTokenCallback se la parola chiave della stringa di connessione 'Integrated Security' è stata impostata su 'true' o 'SSPI'.</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Impossibile impostare la proprietà AccessTokenCallback se nella stringa di connessione è stato specificato 'Authentication=Active Directory Default'.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index 4188d2741f..a9e1fdd397 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>'Integrated Security' 接続文字列キーワードが 'true' または 'SSPI' に設定されている場合、AccessTokenCallback プロパティを設定できません。</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>接続文字列に 'Authentication=Active Directory Default' が指定されている場合、AccessTokenCallback プロパティを設定できません。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index f5321f4372..fa0c101704 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>'Integrated Security' 연결 문자열 키워드가 'true' 또는 'SSPI'로 설정된 경우 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>연결 문자열에 'Authentication=Active Directory Default'가 지정된 경우 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index e6f5c2cd56..35b7be3700 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Nie można ustawić właściwości AccessTokenCallback, jeśli słowo kluczowe parametrów połączenia „Integrated Security” ma wartość „true” lub „SSPI”.</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Nie można ustawić właściwości AccessTokenCallback, jeśli w parametrach połączenia określono wartość „Authentication=Active Directory Default”.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 4b7cc95b81..80bf559671 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Não é possível definir a propriedade AccessTokenCallback se a palavra-chave da cadeia de conexão 'Integrated Security' tiver sido definida como 'true' ou 'SSPI'.</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Não é possível definir a propriedade AccessTokenCallback se 'Authentication=Active Directory Default' tiver sido especificado na cadeia de conexão.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 8f5a5b3aee..7bc5188c6b 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Если ключевому слову строки подключения "Integrated Security" задано значение "true" или "SSPI", свойство "AccessTokenCallback" задать не удастся.</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Если в строке подключения указан параметр "Authentication=Active Directory Default", свойство AccessTokenCallback задать не удастся.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index 51518869b5..3aba0485f1 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>'Integrated Security' bağlantı dizesi anahtar sözcüğü 'true' veya 'SSPI' olarak ayarlanmışsa AccessTokenCallback özelliği ayarlanamaz.</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Bağlantı dizesinde 'Authentication=Active Directory Default' belirtilmişse AccessTokenCallback özelliği ayarlanamaz.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 815e32f32a..3930e26e5d 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>如果 "Integrated Security" 连接字符串关键字设置为 "true" 或 "SSPI"，则无法设置 AccessTokenCallback 属性。</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>如果在连接字符串中指定了 "Authentication=Active Directory Default"，则无法设置 AccessTokenCallback 属性。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index d63bf45075..2dd7493460 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -2082,6 +2082,12 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>如果 'Integrated Security' 連接字串關鍵字已設定為 'true' 或 'SSPI'，就不能設定 AccessTokenCallback 屬性。</value>
   </data>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
+    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+  </data>
+  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
+    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>如果已在連接字串中指定 'Authentication=Active Directory Default'，就不能設定 AccessTokenCallback 屬性。</value>
   </data>

From 8acf068cfc0b4147b014968671e635f119ec4ed5 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 24 Aug 2026 09:26:49 -0700
Subject: [PATCH 246/298] Fix | Perform ServerCertificate pin validation to
 verify with server provided cert (#4445)

* Server Certificate validation changes

* Address comments

* Address review feedback: reorder pin check after policy checks

- Perform ServerCertificate pin validation after chain/name policy error
  handling, making the additive semantics explicit in control flow.
- Extract ValidateCertificatePin/LoadValidationCertificate helpers so the
  loaded pin certificate lives in a narrow 'using' scope (no try/finally).
- Guard against a null server certificate in the pin path.
- Clarify method docs on the policyErrors relationship and reword the
  no-pin fast-path trace message.
- Replace ambiguous 'platform trust' wording in docs with chain-and-name
  validation, and note that pinning does not itself confer trust.
- Add TempCertFile disposable test helper and a null-server-cert regression
  test for the policyErrors == None case.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Revert to minimal design: pin always consulted, fail closed on load error

Restores the original semantic where an exact ServerCertificate match
satisfies certificate validation. The only behavior changes remain:

- The policyErrors == None fast path now also requires that no
  ServerCertificate was supplied, so a configured certificate is always
  compared against the one presented by the server.
- A ServerCertificate that cannot be loaded/parsed now fails the
  connection instead of being silently ignored.

Also keeps the non-design fixes: the loaded certificate is disposed via a
narrow using scope, and a null server certificate throws
AuthenticationException instead of NullReferenceException.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review: dedicated string, RemoteCertificateNotAvailable guard, safe Dispose

- Add SQL_ServerCertificateNotAvailable so the failure names the option in
  play rather than reusing the generic policy-error text.
- A matching ServerCertificate no longer satisfies validation when
  RemoteCertificateNotAvailable is reported. The flag and a null serverCert
  are expected to agree, but both are now checked so the contradictory
  combination cannot be accepted via comparison. Documented the
  relationship on the method.
- Guard TempCertFile.Dispose so a cleanup failure cannot mask a real
  assertion failure.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../SqlConnection.xml                         |   2 +-
 .../SqlConnectionStringBuilder.xml            |   7 +
 .../SqlClient/ManagedSni/SniCommon.netcore.cs | 151 ++++++----
 .../src/Resources/Strings.Designer.cs         |  18 ++
 .../src/Resources/Strings.resx                |   6 +
 ...iCommonValidateSslServerCertificateTest.cs | 284 ++++++++++++++++++
 6 files changed, 411 insertions(+), 57 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniCommonValidateSslServerCertificateTest.cs

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
index fbe0f653fa..cf6aa3f084 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@@ -1015,7 +1015,7 @@ The following table lists the valid names for keyword values within the <xref:Mi
 |Failover Partner|N/A|The name of the failover partner server where database mirroring is configured.<br /><br /> If the value of this key is "", then **Initial Catalog** must be present, and its value must not be "".<br /><br /> The server name can be 128 characters or less.<br /><br /> If you specify a failover partner but the failover partner server is not configured for database mirroring and the primary server (specified with the Server keyword) is not available, then the connection will fail.<br /><br /> If you specify a failover partner and the primary server is not configured for database mirroring, the connection to the primary server (specified with the Server keyword) will succeed if the primary server is available.|  
 |Failover Partner SPN<br /><br /> -or-<br /><br /> FailoverPartnerSPN|N/A|The SPN for the failover partner. The default value is an empty string, which causes SqlClient to use the default, driver-generated SPN.<br /><br /> (Only available in v5.0+)|  
 |Host Name In Certificate<br /><br /> -or-<br /><br />HostNameInCertificate|N/A|The host name to use when validating the server certificate. When not specified, the server name from the Data Source is used for certificate validation.<br /><br /> (Only available in v5.0+)|
-|Server Certificate<br /><br /> -or-<br /><br />ServerCertificate|N/A|The path to a certificate file to match against the SQL Server TLS/SSL certificate. The accepted certificate formats are PEM, DER, and CER. If specified, the SQL Server certificate is checked by verifying if the ServerCertificate provided is an exact match.<br /><br /> (Only available in v5.1+)|
+|Server Certificate<br /><br /> -or-<br /><br />ServerCertificate|N/A|The path to a certificate file to match against the SQL Server TLS/SSL certificate. The accepted certificate formats are PEM, DER, and CER. If specified, the SQL Server certificate is checked by verifying if the ServerCertificate provided is an exact match.<br /><br />When specified, this comparison is always performed, including when the certificate already passes the usual chain-and-name validation. If the presented certificate does not match, or the file cannot be loaded or parsed, the TLS handshake fails; a configured `ServerCertificate` is never silently ignored.<br /><br />Certificate validation itself can be disabled by `TrustServerCertificate=true` (except with `Encrypt=strict`, where validation is always performed). When validation is disabled, `ServerCertificate` is not consulted.<br /><br /> (Only available in v5.1+)|
 |Initial Catalog<br /><br /> -or-<br /><br /> Database|N/A|The name of the database.<br /><br /> The database name can be 128 characters or less.|  
 |Integrated Security<br /><br /> -or-<br /><br /> Trusted_Connection|'false'|When `false`, User ID and Password are specified in the connection. When `true`, the current Windows account credentials are used for authentication.<br /><br /> Recognized values are `true`, `false`, `yes`, `no`, and `sspi` (strongly recommended), which is equivalent to `true`.<br /><br /> If User ID and Password are specified and Integrated Security is set to true, the User ID and Password will be ignored and Integrated Security will be used.<br /><br /> <xref:Microsoft.Data.SqlClient.SqlCredential> is a more secure way to specify credentials for a connection that uses SQL Server Authentication (`Integrated Security=false`).|  
 |IP Address Preference<br /><br /> -or-<br /><br /> IPAddressPreference|IPv4First|The IP address family preference when establishing TCP connections. If `Transparent Network IP Resolution` (in .NET Framework) or `Multi Subnet Failover` is set to true, this setting has no effect. Supported values include:<br /><br /> `IPAddressPreference=IPv4First`<br /><br />`IPAddressPreference=IPv6First`<br /><br />`IPAddressPreference=UsePlatformDefault`|  
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
index 4014bd1450..4257e7e5b7 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
@@ -1332,6 +1332,13 @@ Database = AdventureWorks
           <![CDATA[  
 This property corresponds to the "Server Certificate" and "ServerCertificate" keys within the connection string.  
 
+> [!NOTE]
+> When `ServerCertificate` is specified, the certificate presented by the server is always compared against the certificate loaded from this path, including when the presented certificate already passes chain-and-name validation. An exact match satisfies certificate validation.
+>
+> If the presented certificate does not match, or the file cannot be loaded or parsed, the TLS handshake fails; a configured `ServerCertificate` is never silently ignored.
+>
+> Certificate validation itself can be disabled by `TrustServerCertificate=true` (except with `Encrypt=strict`, where validation is always performed). When validation is disabled, `ServerCertificate` is not consulted.
+
 ]]>
         </format>
       </remarks>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniCommon.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniCommon.netcore.cs
index c2d3e0073c..5a5877ea94 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniCommon.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniCommon.netcore.cs
@@ -48,6 +48,20 @@ internal class SniCommon
         /// Certificate validation and chain trust validations are done by SSLStream class [System.Net.Security.SecureChannel.VerifyRemoteCertificate method]
         /// This method is called as a result of callback for SSL Stream Certificate validation.
         /// </summary>
+        /// <remarks>
+        /// When <paramref name="validationCertFileName"/> is supplied, the presented server
+        /// certificate is always compared against it, even when <paramref name="policyErrors"/> is
+        /// <see cref="SslPolicyErrors.None"/>. An exact match satisfies certificate validation. A
+        /// configured certificate that cannot be loaded or parsed, or that does not match, fails
+        /// the connection; it is never silently ignored.
+        /// <para>
+        /// The one condition a match does not satisfy is a missing server certificate. SslStream
+        /// reports that as <see cref="SslPolicyErrors.RemoteCertificateNotAvailable"/> and passes a
+        /// null <paramref name="serverCert"/>; the two are expected to agree, but both are checked
+        /// so that neither an absent certificate nor the contradictory combination can be accepted
+        /// on the basis of a comparison.
+        /// </para>
+        /// </remarks>
         /// <param name="connectionId">Connection ID/GUID for tracing</param>
         /// <param name="targetServerName">Server that client is expecting to connect to</param>
         /// <param name="hostNameInCertificate">Optional hostname to use for server certificate validation</param>
@@ -59,14 +73,14 @@ internal static bool ValidateSslServerCertificate(Guid connectionId, string targ
         {
             using (SqlClientSNIEventScope.Create(nameof(SniCommon)))
             {
-                if (policyErrors == SslPolicyErrors.None)
+                // When a pin is configured, require it to match even if the platform trusts the cert.
+                if (string.IsNullOrEmpty(validationCertFileName) && policyErrors == SslPolicyErrors.None)
                 {
-                    SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.INFO, "Connection Id {0}, targetServerName {1}, SSL Server certificate not validated as PolicyErrors set to None.", args0: connectionId, args1: targetServerName);
+                    SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.INFO, "Connection Id {0}, targetServerName {1}, SSL Server certificate has no policy errors and no ServerCertificate was supplied; skipping certificate comparison.", args0: connectionId, args1: targetServerName);
                     return true;
                 }
 
                 string serverNameToValidate;
-                X509Certificate validationCertificate = null;
                 if (!string.IsNullOrEmpty(hostNameInCertificate))
                 {
                     serverNameToValidate = hostNameInCertificate;
@@ -78,23 +92,19 @@ internal static bool ValidateSslServerCertificate(Guid connectionId, string targ
 
                 if (!string.IsNullOrEmpty(validationCertFileName))
                 {
-                    try
+                    // There is no trustworthy certificate to compare against when the server
+                    // presented none. SslStream reports that as RemoteCertificateNotAvailable, and
+                    // serverCert is null in that case; both are checked because a matching
+                    // ServerCertificate must never satisfy validation when the presented
+                    // certificate is absent or cannot be relied upon.
+                    if (serverCert is null || policyErrors.HasFlag(SslPolicyErrors.RemoteCertificateNotAvailable))
                     {
-#if NET9_0_OR_GREATER
-                        validationCertificate = X509CertificateLoader.LoadCertificateFromFile(validationCertFileName);
-#else
-                        validationCertificate = new X509Certificate(validationCertFileName);
-#endif
-                    }
-                    catch (Exception e)
-                    {
-                        // if this fails, then fall back to the HostNameInCertificate or TargetServer validation.
-                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniTcpHandle), EventType.INFO, "Connection Id {0}, Exception occurred loading specified ServerCertificate: {1}, treating it as if ServerCertificate has not been specified.", args0: connectionId, args1: e.Message);
+                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, ServerCertificate was specified but the server presented no certificate. Certificate validation failed.", args0: connectionId);
+                        throw ADP.SSLCertificateAuthenticationException(Strings.SQL_ServerCertificateNotAvailable);
                     }
-                }
 
-                if (validationCertificate != null)
-                {
+                    using X509Certificate validationCertificate = LoadValidationCertificate(connectionId, validationCertFileName);
+
                     if (serverCert.GetRawCertData().AsSpan().SequenceEqual(validationCertificate.GetRawCertData().AsSpan()))
                     {
                         SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.INFO, "Connection Id {0}, ServerCertificate matches the certificate provided by the server. Certificate validation passed.", args0: connectionId);
@@ -102,65 +112,94 @@ internal static bool ValidateSslServerCertificate(Guid connectionId, string targ
                     }
                     else
                     {
-                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.INFO, "Connection Id {0}, ServerCertificate doesn't match the certificate provided by the server. Certificate validation failed.", args0: connectionId);
+                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, ServerCertificate doesn't match the certificate provided by the server. Certificate validation failed.", args0: connectionId);
                         throw ADP.SSLCertificateAuthenticationException(Strings.SQL_RemoteCertificateDoesNotMatchServerCertificate);
                     }
                 }
-                else
+
+                // If we get to this point then there is a ssl policy flag.
+                StringBuilder messageBuilder = new();
+                if (policyErrors.HasFlag(SslPolicyErrors.RemoteCertificateNotAvailable))
                 {
-                    // If we get to this point then there is a ssl policy flag.
-                    StringBuilder messageBuilder = new();
-                    if (policyErrors.HasFlag(SslPolicyErrors.RemoteCertificateNotAvailable))
-                    {
-                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, targetServerName {1}, SSL Server certificate not validated as PolicyErrors set to RemoteCertificateNotAvailable.", args0: connectionId, args1: targetServerName);
-                        messageBuilder.AppendLine(Strings.SQL_RemoteCertificateNotAvailable);
-                    }
+                    SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, targetServerName {1}, SSL Server certificate not validated as PolicyErrors set to RemoteCertificateNotAvailable.", args0: connectionId, args1: targetServerName);
+                    messageBuilder.AppendLine(Strings.SQL_RemoteCertificateNotAvailable);
+                }
 
-                    if (policyErrors.HasFlag(SslPolicyErrors.RemoteCertificateChainErrors))
-                    {
-                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, targetServerName {0}, SslPolicyError {1}, SSL Policy certificate chain has errors.", args0: connectionId, args1: targetServerName, args2: policyErrors);
-
-                        // get the chain status from the certificate
-                        X509Certificate2 cert2 = serverCert as X509Certificate2;
-                        X509Chain chain = new();
-                        chain.ChainPolicy.RevocationMode = X509RevocationMode.Offline;
-                        StringBuilder chainStatusInformation = new();
-                        bool chainIsValid = chain.Build(cert2);
-                        Debug.Assert(!chainIsValid, "RemoteCertificateChainError flag is detected, but certificate chain is valid.");
-                        if (!chainIsValid)
-                        {
-                            foreach (X509ChainStatus chainStatus in chain.ChainStatus)
-                            {
-                                chainStatusInformation.Append($"{chainStatus.StatusInformation}, [Status: {chainStatus.Status}]");
-                                chainStatusInformation.AppendLine();
-                            }
-                        }
-                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, targetServerName {1}, SslPolicyError {2}, SSL Policy certificate chain has errors. ChainStatus {3}", args0: connectionId, args1: targetServerName, args2: policyErrors, args3: chainStatusInformation);
-                        messageBuilder.AppendFormat(Strings.SQL_RemoteCertificateChainErrors, chainStatusInformation);
-                        messageBuilder.AppendLine();
-                    }
+                if (policyErrors.HasFlag(SslPolicyErrors.RemoteCertificateChainErrors))
+                {
+                    SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, targetServerName {0}, SslPolicyError {1}, SSL Policy certificate chain has errors.", args0: connectionId, args1: targetServerName, args2: policyErrors);
 
-                    if (policyErrors.HasFlag(SslPolicyErrors.RemoteCertificateNameMismatch))
+                    // get the chain status from the certificate
+                    X509Certificate2 cert2 = serverCert as X509Certificate2;
+                    X509Chain chain = new();
+                    chain.ChainPolicy.RevocationMode = X509RevocationMode.Offline;
+                    StringBuilder chainStatusInformation = new();
+                    bool chainIsValid = chain.Build(cert2);
+                    Debug.Assert(!chainIsValid, "RemoteCertificateChainError flag is detected, but certificate chain is valid.");
+                    if (!chainIsValid)
                     {
-                        X509Certificate2 cert2 = serverCert as X509Certificate2;
-                        if (!cert2.MatchesHostname(serverNameToValidate))
+                        foreach (X509ChainStatus chainStatus in chain.ChainStatus)
                         {
-                            SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, serverNameToValidate {1}, Target Server name or HNIC does not match the Subject/SAN in Certificate.", args0: connectionId, args1: serverNameToValidate);
-                            messageBuilder.AppendLine(Strings.SQL_RemoteCertificateNameMismatch);
+                            chainStatusInformation.Append($"{chainStatus.StatusInformation}, [Status: {chainStatus.Status}]");
+                            chainStatusInformation.AppendLine();
                         }
                     }
+                    SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, targetServerName {1}, SslPolicyError {2}, SSL Policy certificate chain has errors. ChainStatus {3}", args0: connectionId, args1: targetServerName, args2: policyErrors, args3: chainStatusInformation);
+                    messageBuilder.AppendFormat(Strings.SQL_RemoteCertificateChainErrors, chainStatusInformation);
+                    messageBuilder.AppendLine();
+                }
 
-                    if (messageBuilder.Length > 0)
+                if (policyErrors.HasFlag(SslPolicyErrors.RemoteCertificateNameMismatch))
+                {
+                    X509Certificate2 cert2 = serverCert as X509Certificate2;
+                    if (!cert2.MatchesHostname(serverNameToValidate))
                     {
-                        throw ADP.SSLCertificateAuthenticationException(messageBuilder.ToString());
+                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, serverNameToValidate {1}, Target Server name or HNIC does not match the Subject/SAN in Certificate.", args0: connectionId, args1: serverNameToValidate);
+                        messageBuilder.AppendLine(Strings.SQL_RemoteCertificateNameMismatch);
                     }
                 }
 
+                if (messageBuilder.Length > 0)
+                {
+                    throw ADP.SSLCertificateAuthenticationException(messageBuilder.ToString());
+                }
+
                 SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.INFO, "Connection Id {0}, certificate with subject: {1}, validated successfully.", args0: connectionId, args1: serverCert.Subject);
                 return true;
             }
         }
 
+        /// <summary>
+        /// Loads the certificate specified by the <c>ServerCertificate</c> option, failing closed
+        /// when it cannot be loaded or parsed.
+        /// </summary>
+        /// <param name="connectionId">Connection ID/GUID for tracing</param>
+        /// <param name="validationCertFileName">Path to the X.509 certificate file</param>
+        /// <exception cref="System.Security.Authentication.AuthenticationException">
+        /// Thrown when the file cannot be loaded or parsed.
+        /// </exception>
+        private static X509Certificate LoadValidationCertificate(Guid connectionId, string validationCertFileName)
+        {
+            try
+            {
+#if NET9_0_OR_GREATER
+                return X509CertificateLoader.LoadCertificateFromFile(validationCertFileName);
+#else
+                return new X509Certificate(validationCertFileName);
+#endif
+            }
+            catch (Exception e)
+            {
+                // Fail closed: the caller explicitly asked us to compare against a specific
+                // certificate, so if we cannot load / parse it we must not fall back to validating
+                // by host name alone. The exception details are traced separately; the user-facing
+                // message identifies the configured file path so operators can locate the
+                // misconfiguration.
+                SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniCommon), EventType.ERR, "Connection Id {0}, Exception occurred loading specified ServerCertificate '{1}': {2}. Failing certificate validation.", args0: connectionId, args1: validationCertFileName, args2: e.Message);
+                throw ADP.SSLCertificateAuthenticationException(StringsHelper.GetString(Strings.SQL_ServerCertificateFileLoadFailed, validationCertFileName));
+            }
+        }
+
         internal static IPAddress[] GetDnsIpAddresses(string serverName, TimeoutTimer timeout)
         {
             IPAddress[] ipAddresses = GetDnsIpAddresses(serverName);
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index e54719f10c..c8f18d38bc 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -3894,6 +3894,24 @@ internal static string SQL_ScaleValueOutOfRange {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The certificate file specified by the &apos;ServerCertificate&apos; option could not be loaded or parsed: &apos;{0}&apos;..
+        /// </summary>
+        internal static string SQL_ServerCertificateFileLoadFailed {
+            get {
+                return ResourceManager.GetString("SQL_ServerCertificateFileLoadFailed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The &apos;ServerCertificate&apos; option was specified, but the server did not present a certificate that could be compared against it..
+        /// </summary>
+        internal static string SQL_ServerCertificateNotAvailable {
+            get {
+                return ResourceManager.GetString("SQL_ServerCertificateNotAvailable", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cannot set the Credential property if &apos;Authentication=Active Directory Device Code Flow&apos; has been specified in the connection string..
         /// </summary>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
index 4db82789c4..57cbf80016 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>The certificate provided by the server does not match the certificate provided by the ServerCertificate option.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Invalid attempt to get JsonDocument on column '{0}'. JsonDocument is only supported for columns of type json.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniCommonValidateSslServerCertificateTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniCommonValidateSslServerCertificateTest.cs
new file mode 100644
index 0000000000..5f76a33602
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/SniCommonValidateSslServerCertificateTest.cs
@@ -0,0 +1,284 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+
+using System;
+using System.IO;
+using System.Net.Security;
+using System.Security.Authentication;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using Microsoft.Data.SqlClient.ManagedSni;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ManagedSni
+{
+    /// <summary>
+    /// Tests for <see cref="SniCommon.ValidateSslServerCertificate"/> to ensure
+    /// that when a caller supplies a <c>ServerCertificate</c>, the driver always compares it
+    /// against the certificate presented by the server — including when the platform reported
+    /// no policy errors — and fails closed when the configured file cannot be loaded.
+    ///
+    /// The tests exercise the shared helper directly.
+    /// </summary>
+    public class SniCommonValidateSslServerCertificateTest
+    {
+        /// <summary>
+        /// When a ServerCertificate pin is supplied and the presented server certificate
+        /// does not match the pin, validation must fail — even if the platform reported
+        /// <see cref="SslPolicyErrors.None"/>.  This is the security invariant the pin
+        /// exists to enforce.
+        /// </summary>
+        [Fact]
+        public void ValidateSslServerCertificate_MismatchedPin_PolicyNone_Throws()
+        {
+            using X509Certificate2 serverCert = CreateSelfSignedCertificate("server.contoso.com");
+            using X509Certificate2 pinCert = CreateSelfSignedCertificate("other.contoso.com");
+            using TempCertFile pinFile = new(pinCert);
+
+            Assert.Throws<AuthenticationException>(() =>
+                SniCommon.ValidateSslServerCertificate(
+                    connectionId: Guid.NewGuid(),
+                    targetServerName: "server.contoso.com",
+                    hostNameInCertificate: null,
+                    serverCert: serverCert,
+                    validationCertFileName: pinFile.Path,
+                    policyErrors: SslPolicyErrors.None));
+        }
+
+        /// <summary>
+        /// When a ServerCertificate pin is supplied and the presented server certificate
+        /// matches the pin exactly, validation succeeds (assuming no policy errors).
+        /// </summary>
+        [Fact]
+        public void ValidateSslServerCertificate_MatchingPin_PolicyNone_ReturnsTrue()
+        {
+            using X509Certificate2 serverCert = CreateSelfSignedCertificate("server.contoso.com");
+            using TempCertFile pinFile = new(serverCert);
+
+            bool result = SniCommon.ValidateSslServerCertificate(
+                connectionId: Guid.NewGuid(),
+                targetServerName: "server.contoso.com",
+                hostNameInCertificate: null,
+                serverCert: serverCert,
+                validationCertFileName: pinFile.Path,
+                policyErrors: SslPolicyErrors.None);
+
+            Assert.True(result);
+        }
+
+        /// <summary>
+        /// An exact ServerCertificate match satisfies validation, which is the purpose of the
+        /// option: the caller has told us precisely which certificate to accept.  This preserves
+        /// the long-standing behavior for servers whose certificate would otherwise fail chain
+        /// validation (for example a self-signed or private-CA certificate).
+        /// </summary>
+        [Fact]
+        public void ValidateSslServerCertificate_MatchingPin_ChainErrors_ReturnsTrue()
+        {
+            using X509Certificate2 serverCert = CreateSelfSignedCertificate("server.contoso.com");
+            using TempCertFile pinFile = new(serverCert);
+
+            bool result = SniCommon.ValidateSslServerCertificate(
+                connectionId: Guid.NewGuid(),
+                targetServerName: "server.contoso.com",
+                hostNameInCertificate: null,
+                serverCert: serverCert,
+                validationCertFileName: pinFile.Path,
+                policyErrors: SslPolicyErrors.RemoteCertificateChainErrors);
+
+            Assert.True(result);
+        }
+
+        /// <summary>
+        /// A ServerCertificate mismatch fails even when the platform reported a policy error that
+        /// would otherwise be evaluated, because the caller's explicit choice of certificate takes
+        /// precedence.
+        /// </summary>
+        [Fact]
+        public void ValidateSslServerCertificate_MismatchedPin_ChainErrors_Throws()
+        {
+            using X509Certificate2 serverCert = CreateSelfSignedCertificate("server.contoso.com");
+            using X509Certificate2 pinCert = CreateSelfSignedCertificate("other.contoso.com");
+            using TempCertFile pinFile = new(pinCert);
+
+            Assert.Throws<AuthenticationException>(() =>
+                SniCommon.ValidateSslServerCertificate(
+                    connectionId: Guid.NewGuid(),
+                    targetServerName: "server.contoso.com",
+                    hostNameInCertificate: null,
+                    serverCert: serverCert,
+                    validationCertFileName: pinFile.Path,
+                    policyErrors: SslPolicyErrors.RemoteCertificateChainErrors));
+        }
+
+        /// <summary>
+        /// When a ServerCertificate pin is supplied but the server did not present a
+        /// certificate at all (<see cref="SslPolicyErrors.RemoteCertificateNotAvailable"/>,
+        /// <c>serverCert == null</c>), the helper must fail with an
+        /// <see cref="AuthenticationException"/> — not a <see cref="NullReferenceException"/>
+        /// from attempting to dereference the missing server certificate during comparison.
+        /// </summary>
+        [Fact]
+        public void ValidateSslServerCertificate_Pin_NullServerCert_NotAvailable_Throws()
+        {
+            using X509Certificate2 pinCert = CreateSelfSignedCertificate("server.contoso.com");
+            using TempCertFile pinFile = new(pinCert);
+
+            Assert.Throws<AuthenticationException>(() =>
+                SniCommon.ValidateSslServerCertificate(
+                    connectionId: Guid.NewGuid(),
+                    targetServerName: "server.contoso.com",
+                    hostNameInCertificate: null,
+                    serverCert: null,
+                    validationCertFileName: pinFile.Path,
+                    policyErrors: SslPolicyErrors.RemoteCertificateNotAvailable));
+        }
+
+        /// <summary>
+        /// A matching ServerCertificate must not satisfy validation when the platform reported
+        /// <see cref="SslPolicyErrors.RemoteCertificateNotAvailable"/>, even if a non-null
+        /// certificate was somehow also handed to the callback.  The two are expected to agree,
+        /// but the contradictory combination must fail closed rather than let a comparison stand
+        /// in for a certificate the platform said was unavailable.
+        /// </summary>
+        [Fact]
+        public void ValidateSslServerCertificate_MatchingPin_NotAvailable_Throws()
+        {
+            using X509Certificate2 serverCert = CreateSelfSignedCertificate("server.contoso.com");
+            using TempCertFile pinFile = new(serverCert);
+
+            Assert.Throws<AuthenticationException>(() =>
+                SniCommon.ValidateSslServerCertificate(
+                    connectionId: Guid.NewGuid(),
+                    targetServerName: "server.contoso.com",
+                    hostNameInCertificate: null,
+                    serverCert: serverCert,
+                    validationCertFileName: pinFile.Path,
+                    policyErrors: SslPolicyErrors.RemoteCertificateNotAvailable));
+        }
+
+        /// <summary>
+        /// Defense in depth: a null server certificate is normally reported through
+        /// <see cref="SslPolicyErrors.RemoteCertificateNotAvailable"/>, but should the two ever
+        /// disagree, the comparison must still fail with an <see cref="AuthenticationException"/>
+        /// rather than a <see cref="NullReferenceException"/>.
+        /// </summary>
+        [Fact]
+        public void ValidateSslServerCertificate_Pin_NullServerCert_PolicyNone_Throws()
+        {
+            using X509Certificate2 pinCert = CreateSelfSignedCertificate("server.contoso.com");
+            using TempCertFile pinFile = new(pinCert);
+
+            Assert.Throws<AuthenticationException>(() =>
+                SniCommon.ValidateSslServerCertificate(
+                    connectionId: Guid.NewGuid(),
+                    targetServerName: "server.contoso.com",
+                    hostNameInCertificate: null,
+                    serverCert: null,
+                    validationCertFileName: pinFile.Path,
+                    policyErrors: SslPolicyErrors.None));
+        }
+
+        /// <summary>
+        /// When no ServerCertificate pin is supplied, the historical short-circuit is
+        /// preserved: <see cref="SslPolicyErrors.None"/> means the platform already
+        /// validated the certificate, so the helper returns true.  This guards against
+        /// unintended breakage of the pin-less path.
+        /// </summary>
+        [Fact]
+        public void ValidateSslServerCertificate_NoPin_PolicyNone_ReturnsTrue()
+        {
+            using X509Certificate2 serverCert = CreateSelfSignedCertificate("server.contoso.com");
+
+            bool result = SniCommon.ValidateSslServerCertificate(
+                connectionId: Guid.NewGuid(),
+                targetServerName: "server.contoso.com",
+                hostNameInCertificate: null,
+                serverCert: serverCert,
+                validationCertFileName: null,
+                policyErrors: SslPolicyErrors.None);
+
+            Assert.True(result);
+        }
+
+        /// <summary>
+        /// When a ServerCertificate pin is supplied but the file cannot be loaded
+        /// (missing file, corrupt bytes, wrong format, etc.), validation must fail
+        /// closed rather than silently ignoring the option and falling back to host name
+        /// validation.  The caller explicitly asked us to compare against a specific
+        /// certificate, so we cannot accept the connection on any weaker basis.
+        /// </summary>
+        [Fact]
+        public void ValidateSslServerCertificate_UnreadablePinFile_PolicyNone_Throws()
+        {
+            using X509Certificate2 serverCert = CreateSelfSignedCertificate("server.contoso.com");
+
+            string missingPath = Path.Combine(
+                Path.GetTempPath(),
+                "SqlClient_MissingPin_" + Guid.NewGuid().ToString("N") + ".cer");
+
+            Assert.False(File.Exists(missingPath));
+
+            Assert.Throws<AuthenticationException>(() =>
+                SniCommon.ValidateSslServerCertificate(
+                    connectionId: Guid.NewGuid(),
+                    targetServerName: "server.contoso.com",
+                    hostNameInCertificate: null,
+                    serverCert: serverCert,
+                    validationCertFileName: missingPath,
+                    policyErrors: SslPolicyErrors.None));
+        }
+
+        private static X509Certificate2 CreateSelfSignedCertificate(string subjectCommonName)
+        {
+            using RSA rsa = RSA.Create(2048);
+            CertificateRequest request = new(
+                $"CN={subjectCommonName}",
+                rsa,
+                HashAlgorithmName.SHA256,
+                RSASignaturePadding.Pkcs1);
+
+            DateTimeOffset notBefore = DateTimeOffset.UtcNow.AddMinutes(-5);
+            DateTimeOffset notAfter = notBefore.AddHours(1);
+            return request.CreateSelfSigned(notBefore, notAfter);
+        }
+
+        /// <summary>
+        /// Writes a certificate to a temporary file for use as a <c>ServerCertificate</c> pin and
+        /// deletes it on disposal.
+        /// </summary>
+        private sealed class TempCertFile : IDisposable
+        {
+            public string Path { get; }
+
+            public TempCertFile(X509Certificate2 cert)
+            {
+                Path = System.IO.Path.Combine(
+                    System.IO.Path.GetTempPath(),
+                    "SqlClient_Pin_" + Guid.NewGuid().ToString("N") + ".cer");
+                File.WriteAllBytes(Path, cert.Export(X509ContentType.Cert));
+            }
+
+            public void Dispose()
+            {
+                try
+                {
+                    File.Delete(Path);
+                }
+                catch (IOException)
+                {
+                    // Best effort: a cleanup failure must not mask the assertion failure that
+                    // caused the test to unwind through this Dispose.
+                }
+                catch (UnauthorizedAccessException)
+                {
+                }
+            }
+        }
+    }
+}
+
+#endif

From 3473f48fe39f7ecf3e4952a15458178a8fa09524 Mon Sep 17 00:00:00 2001
From: David Levy <dlevy@microsoft.com>
Date: Tue, 25 Aug 2026 01:28:45 -0500
Subject: [PATCH 247/298] docs: correct TransparentNetworkIPResolution behavior
 wording (Fixes #4489) (#4493)

* docs: correct TNIR behavior wording on SqlConnection.ConnectionString and SqlConnectionStringBuilder

Fixes #4489

* docs: drop inaccurate 'trying one address at a time' TNIR claim

TransparentNetworkResolutionState alternates between SequentialMode and ParallelMode across attempts; the driver does not uniformly try one address at a time. Reverts that single sub-change and keeps the rest of the TNIR docs correction.

* docs: address low-confidence Copilot review on TNIR remarks

- Drop '(the default)' from the summary sentence: TNIR is auto-disabled when the keyword is absent for Azure SQL/Entra/AccessToken, so calling 'true' the effective default is misleading.

- Expand the Entra ID Authentication list to the full connection-string values (Active Directory Password, Active Directory Integrated, ...), which are the strings the parser accepts (DbConnectionStringUtilities.cs).

- Scope 'The value of this key must be true/false/yes/no' to .NET Framework, matching the preceding paragraph that says the keyword is unrecognized on modern .NET.

* docs: refine TNIR 500 ms floor wording and drop SR resource name

- '500 ms floor on the first attempt' misrepresents the code: the floor is applied when SqlConnectionInternal sets isFirstTransparentAttempt (attemptNumber == 1), which corresponds to TransparentNetworkResolutionState.SequentialMode in TdsParser.Connect. Reword to 'a 500 ms minimum on the sequential-mode attempt'.

- Drop the '(KeywordNotSupported)' parenthetical from the modern-.NET paragraph: that's an SR resource key, not the public exception type.

* docs: align TNIR behavior for access token callbacks
---
 .../SqlConnection.xml                         |  2 +-
 .../SqlConnectionStringBuilder.xml            | 29 +++++--------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
index cf6aa3f084..05f3c774b0 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@@ -1033,7 +1033,7 @@ The following table lists the valid names for keyword values within the <xref:Mi
 |Replication|'false'|`true` if replication is supported using the connection.|  
 |Server SPN<br /><br /> -or-<br /><br /> ServerSPN|N/A|The SPN for the data source. The default value is an empty string, which causes SqlClient to use the default, driver-generated SPN.<br /><br /> (Only available in v5.0+)|  
 |Transaction Binding|Implicit Unbind|Controls connection association with an enlisted `System.Transactions` transaction.<br /><br /> Possible values are:<br /><br /> `Transaction Binding=Implicit Unbind;`<br /><br /> `Transaction Binding=Explicit Unbind;`<br /><br /> Implicit Unbind causes the connection to detach from the transaction when it ends. After detaching, additional requests on the connection are performed in autocommit mode. The `System.Transactions.Transaction.Current` property is not checked when executing requests while the transaction is active. After the transaction has ended, additional requests are performed in autocommit mode.<br /><br /> If the system ends the transaction (in the scope of a using block) before the last command completes, it will throw <xref:System.InvalidOperationException>.<br /><br /> Explicit Unbind causes the connection to remain attached to the transaction until the connection is closed or an explicit `SqlConnection.TransactionEnlist(null)` is called. Beginning in .NET Framework 4.0, changes to Implicit Unbind make Explicit Unbind obsolete. An `InvalidOperationException` is thrown if `Transaction.Current` is not the enlisted transaction or if the enlisted transaction is not active.|  
-|Transparent Network IP Resolution<br /><br /> -or-<br /><br />TransparentNetworkIPResolution|See description.|When the value of this key is set to `true`, the application is required to retrieve all IP addresses for a particular DNS entry and attempt to connect with the first one in the list. If the connection is not established within 0.5 seconds, the application will try to connect to all others in parallel. When the first answers, the application will establish the connection with the respondent IP address.<br /><br /> If the `MultiSubnetFailover` key is set to `true`, `TransparentNetworkIPResolution` is ignored.<br /><br /> If the `Failover Partner` key is set, `TransparentNetworkIPResolution` is ignored.<br /><br /> The value of this key must be `true`, `false`, `yes`, or `no`.<br /><br /> A value of `yes` is treated the same as a value of `true`.<br /><br /> A value of `no` is treated the same as a value of `false`.<br /><br /> The default values are as follows:<br /><br /> <ul><li>`false` when:<br /><br /> <ul><li>Connecting to Azure SQL Database where the data source ends with:<br /><br /> <ul><li>.database.chinacloudapi.cn</li><li>.database.usgovcloudapi.net</li><li>.database.cloudapi.de</li><li>.database.windows.net</li><li>.database.fabric.microsoft.com</li></ul></li><li>`Authentication` is 'Active Directory Password' or 'Active Directory Integrated'</li></ul></li><li>`true` in all other cases.</li></ul>|  
+|Transparent Network IP Resolution<br /><br /> -or-<br /><br />TransparentNetworkIPResolution|See description.|On .NET Framework, when the value of this key is set to `true`, the driver runs multiple connect rounds across the DNS-resolved IP addresses, with progressively larger per-attempt timeouts and a 500 ms minimum on the sequential-mode attempt, until a connection succeeds or the overall `Connect Timeout` is reached.<br /><br /> If the `MultiSubnetFailover` key is set to `true`, `TransparentNetworkIPResolution` is ignored.<br /><br /> If the `Failover Partner` key is set, `TransparentNetworkIPResolution` is ignored.<br /><br /> On .NET Framework, if `TransparentNetworkIPResolution` isn't specified in the connection string, the driver automatically disables TNIR when the data source is an Azure SQL endpoint (`.database.windows.net`, `.database.cloudapi.de`, `.database.usgovcloudapi.net`, `.database.chinacloudapi.cn`, or `.database.fabric.microsoft.com`), when the `Authentication` key is set to any Microsoft Entra ID method (`Active Directory Password`, `Active Directory Integrated`, `Active Directory Interactive`, `Active Directory Service Principal`, `Active Directory Device Code Flow`, `Active Directory Managed Identity`, `Active Directory MSI`, `Active Directory Default`, or `Active Directory Workload Identity`), or when the <xref:Microsoft.Data.SqlClient.SqlConnection.AccessToken> or <xref:Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback> property is set on the <xref:Microsoft.Data.SqlClient.SqlConnection>. For these automatic conditions, an explicit `TransparentNetworkIPResolution` value bypasses the automatic behavior: `True` enables TNIR, and `False` disables TNIR unconditionally. To restore the automatic behavior, remove the keyword from the connection string.<br /><br /> On .NET (Core, .NET 5+), `TransparentNetworkIPResolution` isn't a recognized connection-string keyword. Setting it (with any value) throws `ArgumentException` when the driver parses the connection string.<br /><br /> On .NET Framework, the value of this key must be `true`, `false`, `yes`, or `no`.<br /><br /> A value of `yes` is treated the same as a value of `true`.<br /><br /> A value of `no` is treated the same as a value of `false`.|
 |Trust Server Certificate<br /><br /> -or-<br /><br />TrustServerCertificate|'false'|When set to `true`, TLS is used to encrypt the channel when bypassing walking the certificate chain to validate trust. If TrustServerCertificate is set to `true` and Encrypt is set to `false`, the channel is not encrypted. Recognized values are `true`, `false`, `yes`, and `no`. For more information, see [Connection String Syntax](https://learn.microsoft.com/sql/connect/ado-net/connection-string-syntax).|  
 |Type System Version|N/A|A string value that indicates the type system the application expects. The functionality available to a client application is dependent on the version of SQL Server and the compatibility level of the database. Explicitly setting the type system version that the client application was written for avoids potential problems that could cause an application to break if a different version of SQL Server is used. **Note:**  The type system version cannot be set for common language runtime (CLR) code executing in-process in SQL Server. For more information, see [SQL Server Common Language Runtime Integration](https://learn.microsoft.com/dotnet/framework/data/adonet/sql/sql-server-common-language-runtime-integration). <br /><br /> Possible values are:<br /><br /> `Type System Version=SQL Server 2012;`<br /><br /> `Type System Version=SQL Server 2008;`<br /><br /> `Type System Version=SQL Server 2005;`<br /><br /> `Type System Version=Latest;`<br /><br /> `Type System Version=SQL Server 2012;` specifies that the application will require version 11.0.0.0 of Microsoft.SqlServer.Types.dll. The other `Type System Version` settings will require version 10.0.0.0 of Microsoft.SqlServer.Types.dll.<br /><br /> `Latest` is obsolete and should not be used. `Latest` is equivalent to `Type System Version=SQL Server 2008;`.|  
 |User ID<br /><br /> -or-<br /><br /> UID<br /><br /> -or-<br /><br /> User|N/A|The SQL Server login account. Not recommended. To maintain a high level of security, we strongly recommend that you use the `Integrated Security` or `Trusted_Connection` keywords instead. <xref:Microsoft.Data.SqlClient.SqlCredential> is a more secure way to specify credentials for a connection that uses SQL Server Authentication.<br /><br /> The user ID must be 128 characters or less.|  
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
index 4257e7e5b7..1387196677 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
@@ -1410,7 +1410,7 @@ This property corresponds to the "ServerSPN" and "Server SPN" keys within the co
     </TransactionBinding>
     <TransparentNetworkIPResolution>
       <summary>
-        When the value of this key is set to <see langword="true" />, the application is required to retrieve all IP addresses for a particular DNS entry and attempt to connect with the first one in the list. If the connection is not established within 0.5 seconds, the application will try to connect to all others in parallel. When the first answers, the application will establish the connection with the respondent IP address.
+        On .NET Framework, when the value of this key is set to <see langword="true" />, the driver runs multiple connect rounds across the DNS-resolved IP addresses, with progressively larger per-attempt timeouts and a 500 ms minimum on the sequential-mode attempt, until a connection succeeds or the overall <c>Connect Timeout</c> is reached.
       </summary>
       <value>
         A boolean value.
@@ -1423,32 +1423,17 @@ This property corresponds to the "ServerSPN" and "Server SPN" keys within the co
           If the <c>Failover Partner</c> key is set, <c>Transparent Network IP Resolution</c> is ignored.
         </para>
         <para>
-          The value of this key must be <c>true</c>, <c>false</c>, <c>yes</c>, or <c>no</c>.
+          On .NET Framework, if <c>TransparentNetworkIPResolution</c> isn't specified in the connection string, the driver automatically disables TNIR when the data source is an Azure SQL endpoint (<c>.database.windows.net</c>, <c>.database.cloudapi.de</c>, <c>.database.usgovcloudapi.net</c>, <c>.database.chinacloudapi.cn</c>, or <c>.database.fabric.microsoft.com</c>), when the <c>Authentication</c> key is set to any Microsoft Entra ID method (<c>Active Directory Password</c>, <c>Active Directory Integrated</c>, <c>Active Directory Interactive</c>, <c>Active Directory Service Principal</c>, <c>Active Directory Device Code Flow</c>, <c>Active Directory Managed Identity</c>, <c>Active Directory MSI</c>, <c>Active Directory Default</c>, or <c>Active Directory Workload Identity</c>), or when the <see cref="P:Microsoft.Data.SqlClient.SqlConnection.AccessToken" /> or <see cref="P:Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback" /> property is set on the <see cref="T:Microsoft.Data.SqlClient.SqlConnection" />. For these automatic conditions, an explicit <c>TransparentNetworkIPResolution</c> value bypasses the automatic behavior: <c>True</c> enables TNIR, and <c>False</c> disables TNIR unconditionally. To restore the automatic behavior, remove the keyword from the connection string.
         </para>
         <para>
-          A value of <c>yes</c> is treated the same as a value of <c>true</c>. A value of <c>no</c> is treated the same as a value of <c>false</c>.
+          On .NET (Core, .NET 5+), <c>TransparentNetworkIPResolution</c> isn't a recognized connection-string keyword. Setting it (with any value) throws <c>ArgumentException</c> when the driver parses the connection string.
         </para>
         <para>
-          This key defaults to <c>false</c> when:
+          On .NET Framework, the value of this key must be <c>true</c>, <c>false</c>, <c>yes</c>, or <c>no</c>.
+        </para>
+        <para>
+          A value of <c>yes</c> is treated the same as a value of <c>true</c>. A value of <c>no</c> is treated the same as a value of <c>false</c>.
         </para>
-        <list type="bullet">
-          <item>
-            <description>
-              Connecting to Azure SQL Database where the data source ends with:
-              <list type="bullet">
-                <item><description>.database.chinacloudapi.cn</description></item>
-                <item><description>.database.usgovcloudapi.net</description></item>
-                <item><description>.database.cloudapi.de</description></item>
-                <item><description>.database.windows.net</description></item>
-                <item><description>.database.fabric.microsoft.com</description></item>
-              </list>
-            </description>
-          </item>
-          <item><description>
-            <c>Authentication</c> is 'Active Directory Password' or 'Active Directory Integrated'
-          </description></item>
-          <item><description>Otherwise it defaults to <c>true</c>.</description></item>
-        </list>
       </remarks>
     </TransparentNetworkIPResolution>
     <TrustServerCertificate>

From 678556d802747b837da942c85a586e9530da9524 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Tue, 25 Aug 2026 03:19:05 -0500
Subject: [PATCH 248/298] Remove OS-Specific Builds (#4474)

* Make TDS.Endpoint OS-agnostic

* WIP

* Make performance tests OS agnostic

* Remove os-specific kerberos building

* Drop windows_nt/unix from folder paths in the nuspec

* Some remaining junk. Want to test it now.

* Fix name of property in build.proj

* Reinstate windows-specific behavior when building/running perf tests.
---
 build.proj                                    | 203 ++----------------
 .../ci/kerberos/build-and-test-steps.yml      |  10 +-
 .../sqlclient-ci-kerberos-pipeline.yml        |   2 -
 .../Azure/test/Azure.Test.csproj              |   8 +-
 .../src/Microsoft.Data.SqlClient.csproj       |  25 +--
 .../src/Microsoft.Data.SqlClient.nuspec       | 108 +++++-----
 ...Microsoft.Data.SqlClient.TestCommon.csproj |   8 +-
 .../CustomRetryLogicProvider.csproj           |   8 +-
 ...soft.Data.SqlClient.FunctionalTests.csproj |   8 +-
 ...icrosoft.Data.SqlClient.ManualTests.csproj |   8 +-
 ...oft.Data.SqlClient.PerformanceTests.csproj |  20 +-
 .../tests/PerformanceTests/Program.cs         |   8 +-
 .../tests/PerformanceTests/runnerconfig.jsonc |   4 +-
 .../tests/StressTests/Directory.Build.props   |   8 +-
 .../tests/TestUdts/Address/Address.csproj     |   8 +-
 .../tests/TestUdts/Circle/Circle.csproj       |   8 +-
 .../tests/TestUdts/Shapes/Shapes.csproj       |   8 +-
 .../TestUdts/Utf8String/Utf8String.csproj     |   8 +-
 .../Microsoft.Data.SqlClient.UnitTests.csproj |  22 +-
 .../TDS/TDS.EndPoint/SSPI/SSPIContext.Unix.cs | 109 ----------
 ...{SSPIContext.Windows.cs => SSPIContext.cs} |  26 +++
 .../TDS/TDS.EndPoint/TDS.EndPoint.csproj      |  47 ----
 22 files changed, 139 insertions(+), 525 deletions(-)
 delete mode 100644 src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/SSPIContext.Unix.cs
 rename src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/{SSPIContext.Windows.cs => SSPIContext.cs} (96%)

diff --git a/build.proj b/build.proj
index 3eb78ec047..c29dec53a1 100644
--- a/build.proj
+++ b/build.proj
@@ -139,7 +139,7 @@
 
     <!--
       ReferenceType
-      Applies to:     BuildSqlClient, BuildSqlClientUnix, BuildSqlClientWindows
+      Applies to:     BuildSqlClient, BuildSqlClientImpl
       Description:    Determines how to build SqlClient. If set to "Project", any cross-project
                       references (eg, Abstractions from SqlClient) will be made as project
                       references. If set to "Package", package references will be made instead. When
@@ -426,7 +426,7 @@
 
   <!-- Build SqlClient Targets =============================================== -->
   <!-- BuildSqlClient: Builds all binaries for SqlClient -->
-  <Target Name="BuildSqlClient" DependsOnTargets="BuildSqlClientUnix;BuildSqlClientWindows;BuildSqlClientRef;BuildSqlClientNotSupported" />
+  <Target Name="BuildSqlClient" DependsOnTargets="BuildSqlClientImpl;BuildSqlClientRef;BuildSqlClientNotSupported" />
 
   <!--
     BuildSqlClientNotSupported: Builds a version of the SqlClient assemblies that always throws
@@ -509,16 +509,15 @@
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
-  <!-- BuildSqlClientUnix: Builds all unix-specific SqlClient binaries -->
+  <!-- BuildSqlClientImpl: Builds implementation assemblies of SqlClient -->
   <PropertyGroup>
-    <BuildSqlClientUnixDependsOn Condition="'$(ReferenceType.ToLower())' == 'package' AND '$(SkipDependencyPack)' != 'true'">PackLogging;PackAbstractions;PackSqlServer</BuildSqlClientUnixDependsOn>
+    <BuildSqlClientImplDependsOn Condition="'$(ReferenceType.ToLower())' == 'package' AND '$(SkipDependencyPack)' != 'true'">PackLogging;PackAbstractions;PackSqlServer</BuildSqlClientImplDependsOn>
   </PropertyGroup>
-  <Target Name="BuildSqlClientUnix" DependsOnTargets="$(BuildSqlClientUnixDependsOn)">
+  <Target Name="BuildSqlClientImpl" DependsOnTargets="$(BuildSqlClientImplDependsOn)">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build $(SqlClientProjectPath)
         -p:Configuration=$(Configuration)
-        -p:TargetOs=Unix
         $(SigningKeyPathArgument)
 
         <!-- Versioning arguments -->
@@ -534,36 +533,7 @@
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
 
-    <Message Importance="High" Text=">>> Building SqlClient for Unix"/>
-    <Message Text="    Command: $(DotnetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <!-- BuildSqlClientWindows: Builds all windows-specific SqlClient binaries -->
-  <PropertyGroup>
-    <BuildSqlClientWindowsDependsOn Condition="'$(ReferenceType.ToLower())' == 'package' AND '$(SkipDependencyPack)' != 'true'">PackLogging;PackAbstractions;PackSqlServer</BuildSqlClientWindowsDependsOn>
-  </PropertyGroup>
-  <Target Name="BuildSqlClientWindows" DependsOnTargets="$(BuildSqlClientWindowsDependsOn)">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build $(SqlClientProjectPath)
-        -p:Configuration=$(Configuration)
-        -p:TargetOs=Windows_NT
-        $(SigningKeyPathArgument)
-
-        <!-- Versioning Arguments -->
-        $(BuildNumberArgument)
-        $(BuildSuffixArgument)
-        $(PackageVersionSqlClientArgument)
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionSqlServerArgument)
-      </DotnetCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient for Windows"/>
+    <Message Importance="High" Text=">>> Building SqlClient Implementation"/>
     <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
@@ -1212,14 +1182,11 @@
   </Target>
 
   <!-- BuildSqlClientTestsUnit ================================================= -->
-  <Target Name="BuildSqlClientTestsUnit" DependsOnTargets="BuildSqlClientTestsUnitUnix;BuildSqlClientTestsUnitWindows" />
-
-  <Target Name="BuildSqlClientTestsUnitUnix">
+  <Target Name="BuildSqlClientTestsUnit">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(SqlClientUnitTestProjectPath)"
         -p:Configuration=$(Configuration)
-        -p:TargetOs=Unix
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -1229,60 +1196,17 @@
       </DotnetCommand>
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient Unit Tests for Unix"/>
-    <Message Text="    Command: $(DotnetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <Target Name="BuildSqlClientTestsUnitWindows">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build "$(SqlClientUnitTestProjectPath)"
-        -p:Configuration=$(Configuration)
-        -p:TargetOs=Windows_NT
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(TestSigningKeyPathArgument)
-        $(PackageVersionSqlClientArgument)
-        $(PackageVersionSqlServerArgument)
-      </DotnetCommand>
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient Unit Tests for Windows"/>
+    <Message Importance="High" Text=">>> Building SqlClient Unit Tests"/>
     <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- BuildSqlClientTestsFunctional =========================================== -->
-  <Target Name="BuildSqlClientTestsFunctional" DependsOnTargets="BuildSqlClientTestsFunctionalUnix;BuildSqlClientTestsFunctionalWindows" />
-
-  <Target Name="BuildSqlClientTestsFunctionalUnix">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build "$(SqlClientFunctionalTestProjectPath)"
-        -p:Configuration=$(Configuration)
-        -p:TargetOs=Unix
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-        $(PackageVersionSqlClientArgument)
-      </DotnetCommand>
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient Functional Tests for Unix"/>
-    <Message Text="    Command: $(DotnetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <Target Name="BuildSqlClientTestsFunctionalWindows">
+  <Target Name="BuildSqlClientTestsFunctional">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(SqlClientFunctionalTestProjectPath)"
         -p:Configuration=$(Configuration)
-        -p:TargetOs=Windows_NT
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -1292,41 +1216,17 @@
       </DotnetCommand>
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient Functional Tests for Windows"/>
+    <Message Importance="High" Text=">>> Building SqlClient Functional Tests"/>
     <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- BuildSqlClientTestsManual =============================================== -->
-  <Target Name="BuildSqlClientTestsManual" DependsOnTargets="BuildSqlClientTestsManualUnix;BuildSqlClientTestsManualWindows" />
-
-  <Target Name="BuildSqlClientTestsManualUnix">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build "$(SqlClientManualTestProjectPath)"
-        -p:Configuration=$(Configuration)
-        -p:TargetOs=Unix
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-        $(PackageVersionSqlClientArgument)
-        $(PackageVersionSqlServerArgument)
-      </DotnetCommand>
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient Manual Tests for Unix"/>
-    <Message Text="    Command: $(DotnetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <Target Name="BuildSqlClientTestsManualWindows">
+  <Target Name="BuildSqlClientTestsManual">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(SqlClientManualTestProjectPath)"
         -p:Configuration=$(Configuration)
-        -p:TargetOs=Windows_NT
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -1337,20 +1237,17 @@
       </DotnetCommand>
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient Manual Tests for Windows"/>
+    <Message Importance="High" Text=">>> Building SqlClient Manual Tests"/>
     <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- BuildSqlClientTestsPerformance ========================================== -->
-  <Target Name="BuildSqlClientTestsPerformance" DependsOnTargets="BuildSqlClientTestsPerformanceUnix;BuildSqlClientTestsPerformanceWindows" />
-
-  <Target Name="BuildSqlClientTestsPerformanceUnix">
+  <Target Name="BuildSqlClientTestsPerformance">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(SqlClientPerformanceTestProjectPath)"
         -p:Configuration=$(Configuration)
-        -p:TargetOs=Unix
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -1360,40 +1257,17 @@
       </DotnetCommand>
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient Performance Tests for Unix"/>
-    <Message Text="    Command: $(DotnetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <Target Name="BuildSqlClientTestsPerformanceWindows">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build "$(SqlClientPerformanceTestProjectPath)"
-        -p:Configuration=$(Configuration)
-        -p:TargetOs=Windows_NT
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-        $(PackageVersionSqlClientArgument)
-      </DotnetCommand>
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient Performance Tests for Windows"/>
+    <Message Importance="High" Text=">>> Building SqlClient Performance Tests"/>
     <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- BuildSqlClientTestsStress =============================================== -->
-  <Target Name="BuildSqlClientTestsStress" DependsOnTargets="BuildSqlClientTestsStressUnix;BuildSqlClientTestsStressWindows" />
-
-  <Target Name="BuildSqlClientTestsStressUnix">
+  <Target Name="BuildSqlClientTestsStress">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(SqlClientStressTestProjectPath)"
         -p:Configuration=$(Configuration)
-        -p:TargetOs=Unix
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -1403,58 +1277,17 @@
       </DotnetCommand>
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient Stress Tests for Unix"/>
-    <Message Text="    Command: $(DotnetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <Target Name="BuildSqlClientTestsStressWindows">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build "$(SqlClientStressTestProjectPath)"
-        -p:Configuration=$(Configuration)
-        -p:TargetOs=Windows_NT
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionAbstractionsArgument)
-        $(PackageVersionLoggingArgument)
-        $(PackageVersionSqlClientArgument)
-      </DotnetCommand>
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Importance="High" Text=">>> Building SqlClient Stress Tests for Windows"/>
+    <Message Importance="High" Text=">>> Building SqlClient Stress Tests"/>
     <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
 
   <!-- BuildAzureTests ========================================================= -->
-  <Target Name="BuildAzureTests" DependsOnTargets="BuildAzureTestsUnix;BuildAzureTestsWindows" />
-
-  <Target Name="BuildAzureTestsUnix">
-    <PropertyGroup>
-      <DotnetCommand>
-        "$(DotnetPath)dotnet" build "$(AzureTestProjectPath)"
-        -p:Configuration=$(Configuration)
-        -p:TargetOs=Unix
-
-        <!-- Reference Type Arguments -->
-        $(ReferenceTypeArgument)
-        $(PackageVersionSqlClientArgument)
-      </DotnetCommand>
-      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
-    </PropertyGroup>
-    <Message Importance="High" Text=">>> Building Azure Tests for Unix"/>
-    <Message Text="    Command: $(DotnetCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-  </Target>
-
-  <Target Name="BuildAzureTestsWindows">
+  <Target Name="BuildAzureTests">
     <PropertyGroup>
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(AzureTestProjectPath)"
         -p:Configuration=$(Configuration)
-        -p:TargetOs=Windows_NT
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -1462,7 +1295,7 @@
       </DotnetCommand>
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
     </PropertyGroup>
-    <Message Importance="High" Text=">>> Building Azure Tests for Windows"/>
+    <Message Importance="High" Text=">>> Building Azure Tests"/>
     <Message Text="    Command: $(DotnetCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
   </Target>
diff --git a/eng/pipelines/ci/kerberos/build-and-test-steps.yml b/eng/pipelines/ci/kerberos/build-and-test-steps.yml
index 307c93f978..dbb3b5e1e2 100644
--- a/eng/pipelines/ci/kerberos/build-and-test-steps.yml
+++ b/eng/pipelines/ci/kerberos/build-and-test-steps.yml
@@ -7,8 +7,6 @@
 # Shared build-and-test steps used by both the Windows and Linux Kerberos jobs.
 #
 # Parameters:
-#   buildTarget   — The build.proj target that builds SqlClient for the current
-#                   OS (e.g. BuildSqlClientWindows or BuildSqlClientUnix).
 #   testFramework — The TFM to test against (e.g. net9.0, net462).
 #   testRunTitle  — Title for the published test results (displayed in the ADO
 #                   Tests tab).
@@ -17,10 +15,6 @@
 
 parameters:
 
-  # build.proj target to build SqlClient for the current OS.
-  - name: buildTarget
-    type: string
-
   # TFM to pass to the test targets (-p:TestFramework).
   - name: testFramework
     type: string
@@ -39,7 +33,7 @@ steps:
   # Build
   # ---------------------------------------------------------------------------
 
-  # Build the given target.
+  # Build SqlClient.
   #
   # The test stages build as part of their targets, but this separate step isolates build failures
   # so we can fail fast before running tests. Retries are enabled intentionally (1 attempt for
@@ -52,7 +46,7 @@ steps:
       command: build
       projects: build.proj
       arguments: >-
-        -t:${{ parameters.buildTarget }}
+        -t:BuildSqlClient
         -p:Configuration=Release
 
   # ---------------------------------------------------------------------------
diff --git a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
index b8c28c604d..6bdea0157f 100644
--- a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
+++ b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
@@ -182,7 +182,6 @@ stages:
           # --- Build and test ---
           - template: /eng/pipelines/ci/kerberos/build-and-test-steps.yml@self
             parameters:
-              buildTarget: BuildSqlClientWindows
               testFramework: $(testFramework)
               testRunTitle: Windows-$(testFramework)-ManagedSNI_$(managedSNI)
               artifactName: $(testFramework)-ManagedSNI_$(managedSNI)-$(System.JobId)
@@ -271,7 +270,6 @@ stages:
           # --- Build and test ---
           - template: /eng/pipelines/ci/kerberos/build-and-test-steps.yml@self
             parameters:
-              buildTarget: BuildSqlClientUnix
               testFramework: $(testFramework)
               testRunTitle: Linux-$(testFramework)
               artifactName: $(testFramework)-linux-$(System.JobId)
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
index 5d6780414b..79372ca2d8 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
@@ -10,13 +10,7 @@
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Compiler Options ================================================ -->
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index b1e20685a1..c81f18031b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -4,30 +4,9 @@
     <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
   </PropertyGroup>
 
-  <!-- OS Constants ==================================================== -->
-  <PropertyGroup>
-    <!-- If the TargetOs was not specified (as is the case during IDE development), the build     -->
-    <!-- should target the host OS.                                                               -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- The following lines are provided for developer convenience. Many IDEs will automatically -->
-    <!-- hide code that is excluded via pre-compiler directives, making it difficult to edit in   -->
-    <!-- the IDE when on the wrong OS. To ease this, uncomment one of the following lines to      -->
-    <!-- force one OS or another. This is only for development usage. Do not commit these lines   -->
-    <!-- uncommented. -->
-    <!--<TargetOs>Unix</TargetOs>-->
-    <!--<TargetOs>Windows_NT</TargetOs>-->
-
-    <NormalizedTargetOs>$(TargetOs.ToLower())</NormalizedTargetOs>
-  </PropertyGroup>
-
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
-
-    <!-- We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if -->
-    <!-- we are building for Windows.                                                              -->
-    <TargetFrameworks Condition="'$(NormalizedTargetOs)' == 'windows_nt'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Compiler Options ================================================ -->
@@ -84,7 +63,7 @@
     <!-- MSBuild will add the target framework to the end of this path by default. Telling it not -->
     <!-- to is possible but requires also specifying the IntermediateOutputPath. So while it      -->
     <!-- would be nice to have a flat directory structure, it's more hassle than its worth.       -->
-    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(ReferenceType)-$(Configuration)/$(NormalizedTargetOs)/</OutputPath>
+    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(ReferenceType)-$(Configuration)/</OutputPath>
   </PropertyGroup>
 
   <!-- NuGet Package Config ============================================ -->
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
index 09a556d84a..9a0cf9e885 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.nuspec
@@ -136,24 +136,24 @@
 
     <!-- Lib Binaries ================================================== -->
     <!-- lib/net462 - These contain the implementation -->
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.dll" target="lib\net462\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.pdb" target="lib\net462\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.xml" target="lib\net462\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.dll" target="lib\net462\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.pdb" target="lib\net462\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.xml" target="lib\net462\" exclude="" />
 
     <!-- lib/net462 Localized Resources -->
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\cs\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\de\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\es\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\fr\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\it\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ja\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ko\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pl\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pt-BR\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ru\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\tr\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hans\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hant\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\cs\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\de\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\es\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\fr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\it\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ja\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ko\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pl\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\pt-BR\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\ru\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\tr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hans\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hant\" exclude="" />
 
     <!-- lib/net8.0 - These are PlatformNotSupportedException assemblies -->
     <file src="Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.dll" target="lib\net8.0\" exclude="" />
@@ -161,20 +161,19 @@
     <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.xml" target="lib\net8.0\" exclude="" />
 
     <!-- lib/net8.0 Localized Resources -->
-    <!-- Note: although these come from windows_nt, they will work on any OS -->
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\cs\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\de\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\es\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\fr\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\it\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ja\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ko\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pl\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pt-BR\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ru\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\tr\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hans\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hant\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\cs\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\de\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\es\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\fr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\it\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ja\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ko\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pl\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\pt-BR\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\ru\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\tr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hans\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hant\" exclude="" />
 
     <!-- lib/net9.0 - These are PlatformNotSupportedException assemblies -->
     <file src="Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.dll" target="lib\net9.0\" exclude="" />
@@ -182,20 +181,19 @@
     <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.xml" target="lib\net9.0\" exclude="" />
 
     <!-- lib/net9.0 Localized Resources -->
-    <!-- Note: although these come from windows_nt, they will work on any OS -->
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\cs\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\de\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\es\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\fr\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\it\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ja\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ko\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pl\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pt-BR\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ru\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\tr\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hans\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hant\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\cs\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\de\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\es\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\fr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\fr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\it\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\it\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\ja\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ja\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\ko\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ko\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\pl\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pl\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\pt-BR\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\pt-BR\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\ru\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\ru\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\tr\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hans\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hant\" exclude="" />
 
     <!-- lib/netstandard2.0 - These are PlatformNotSupportedException assemblies -->
     <file src="Microsoft.Data.SqlClient.notsupported\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.dll" target="lib\netstandard2.0\" exclude="" />
@@ -220,25 +218,27 @@
     <file src="Microsoft.Data.SqlClient.ref\$ReferenceType$-$Configuration$\netstandard2.0\Microsoft.Data.SqlClient.xml" target="ref\netstandard2.0\" exclude="" />
 
     <!-- Runtime Binaries ============================================== -->
+    <!-- @TODO: This is a temporary measure - removing the not support DLLs will come next -->
+
     <!-- runtimes/win/lib/net462 -->
     <!-- @TODO: We include the impl version in the lib folder - is the runtimes version necessary? -->
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net462\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net462\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net462\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net462\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net462\" exclude="" />
 
     <!-- runtimes/unix/lib/net8.0 -->
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net8.0\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net8.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
 
     <!-- runtimes/win/lib/net8.0 -->
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net8.0\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net8.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net8.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net8.0\" exclude="" />
 
     <!-- runtimes/unix/lib/net9.0 -->
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net9.0\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\unix\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net9.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net9.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net9.0\" exclude="" />
 
     <!-- runtimes/win/lib/net9.0 -->
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net9.0\" exclude="" />
-    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\windows_nt\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net9.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net9.0\" exclude="" />
+    <file src="Microsoft.Data.SqlClient\$ReferenceType$-$Configuration$\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net9.0\" exclude="" />
   </files>
 </package>
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index b46b464428..46f1dafb1d 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -23,13 +23,7 @@
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- References ====================================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
index ca037a50bf..9522076415 100644
--- a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
@@ -6,13 +6,7 @@
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- References ====================================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
index c681d91dc7..e22d6430d9 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -8,13 +8,7 @@
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Links to internal project files ================================= -->
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index be691606ce..e8dc221092 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -8,13 +8,7 @@
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Links to Resources/etc ========================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
index 1acb981002..aced0f5bf0 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
@@ -7,6 +7,16 @@
     <StartupObject>Microsoft.Data.SqlClient.PerformanceTests.Program</StartupObject>
   </PropertyGroup>
 
+  <!-- OS Constants ==================================================== -->
+  <!--
+      The WINDOWS constant is only defined when using OS-specific TFMs, so we need to explicitly
+      define it when we are building on Windows. This constant is used to gate inclusion of the
+      memory usage analyzer.
+  -->
+  <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
+    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
+  </PropertyGroup>
+
   <!-- Items to remove -->
   <ItemGroup>
     <EmbeddedResource Remove="BenchmarkDotNet.Artifacts\**" />
@@ -74,15 +84,9 @@
   <!-- Other references -->
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows"
+                      Condition="'$(OS)' == 'Windows_NT'" />
 
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
   </ItemGroup>
-
-  <!-- NativeMemoryProfiler relies on ETW and is only supported on Windows. -->
-  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
-  </ItemGroup>
-  <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
-    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
-  </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
index b5ef4d76c6..5a0d303e97 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
@@ -131,7 +131,7 @@ private static bool IsHarnessControlled() =>
 
         private void SetupConfigurations()
         {
-            // If the config file specifies to use managed SNI on Windows, 
+            // If the config file specifies to use managed SNI on Windows,
             // enable the appropriate AppContext switch to use the managed SNI implementation.
             if (_config.UseManagedSniOnWindows)
             {
@@ -146,8 +146,8 @@ private void SetupConfigurations()
                 "Switch.Microsoft.Data.SqlClient.UseConnectionPoolV2",
                 _config.UseConnectionPoolV2);
 
-            // If the config file specifies to use optimized async behavior, 
-            // enable packet multiplexing feature and other optimizations in SqlClient 
+            // If the config file specifies to use optimized async behavior,
+            // enable packet multiplexing feature and other optimizations in SqlClient
             // by setting the appropriate AppContext switches.
             if(_config.UseOptimizedAsyncBehaviour)
             {
@@ -160,7 +160,7 @@ private void SetupConfigurations()
             // diagnosers when building each benchmark's ManualConfig.
             BenchmarkConfig.UseNativeMemoryAndEtwProfiler = _config.UseNativeMemoryAndETWProfiler;
 
-            // If the config file specifies to wait for a profiler, 
+            // If the config file specifies to wait for a profiler,
             // display the process ID and wait for user input before starting the benchmarks.
             // Skipped under harness-controlled execution (PERF_LIST_BENCHMARKS / PERF_BENCHMARK):
             // those modes run unattended, so blocking on Console.ReadKey() would hang automation.
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
index 5df16e3ff5..0ecc44e957 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
@@ -8,7 +8,7 @@
     // first time a pool is created), so comparing the two pools requires two runs:
     // once with this flag false (legacy) and once true (new). See issue #3356.
     "UseConnectionPoolV2": false,
-    // Enable this flag to enable optimized async behavior in SqlClient. 
+    // Enable this flag to enable optimized async behavior in SqlClient.
     // This is useful for benchmarking packet multiplexing and async performance improvements.
     "UseOptimizedAsyncBehaviour": true,
     // Enable this flag to get prompted to attach a profiler when running the performance tests.
@@ -20,7 +20,7 @@
     // Note: This flag cannot be enabled on non-Windows OSes as the NativeMemoryProfiler is not supported on non-Windows OSes.
     "UseNativeMemoryAndETWProfiler": false,
     // This section contains the configuration for each benchmark.
-    // You can enable/disable benchmarks and configure the number of iterations, invocations, 
+    // You can enable/disable benchmarks and configure the number of iterations, invocations,
     // warmup runs, and row count for each benchmark.
     //
     // Two optional per-benchmark settings are available for slow benchmarks:
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
index 93c1f10d93..42f1e2c1a7 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
@@ -11,13 +11,7 @@
     <StressRoot>$(MSBuildThisFileDirectory)</StressRoot>
 
     <!-- Target the same frameworks that the rest of the SqlClient tests do. -->
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
 
     <!--
       Use the latest C# language version, regardless of what a particular target framework claims to
diff --git a/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj
index 03575285d9..5c305d0028 100644
--- a/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/TestUdts/Address/Address.csproj
@@ -6,13 +6,7 @@
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj
index e19c8b40a5..d2bcf8c7e8 100644
--- a/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/TestUdts/Circle/Circle.csproj
@@ -6,13 +6,7 @@
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj
index d8c2d66253..594304b37d 100644
--- a/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/TestUdts/Shapes/Shapes.csproj
@@ -6,13 +6,7 @@
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj
index cc41b9fb47..2752cb37ff 100644
--- a/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/TestUdts/Utf8String/Utf8String.csproj
@@ -6,13 +6,7 @@
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index 04afcf3910..4111f701f4 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -9,13 +9,7 @@
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-
-    <!-- Default TargetOs to host OS if not specified (eg, during IDE development). -->
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
-
-    <!-- Add net462 when targeting Windows. Building net462 is supported on any host OS. -->
-    <TargetFrameworks Condition="'$(TargetOs)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Embedded resources and content files  =========================== -->
@@ -56,13 +50,15 @@
     compile asset and reference the runtime DLL directly so the compiler can see internals.
 
     TODO: This is fragile, depending on our SqlClient NuGet package layout and supported TFMs.  It
-    is only necessary because we produce ref and not-supported assemblies and package them.  By
-    default, the compiler will use the ref assemblies if present, which we must explicitly override
-    as explained above.
+        is only necessary because we produce ref and not-supported assemblies and package them.  By
+        default, the compiler will use the ref assemblies if present, which we must explicitly override
+        as explained above.
+  -->
+  <!--
+    @TODO: This is a hack for now, the windows and unix nuget files are the same, so we just pick
+        one and use it for all scenarios. Remove this silliness when unsupported binaries are removed
   -->
   <PropertyGroup Condition="'$(ReferenceType)' == 'Package'">
-    <_SqlClientRid Condition="'$(TargetOs)' != 'Windows_NT'">unix</_SqlClientRid>
-    <_SqlClientRid Condition="'$(TargetOs)' == 'Windows_NT'">win</_SqlClientRid>
     <!-- Map test TFM to the closest available package TFM (package ships net8.0/net9.0/net462) -->
     <_SqlClientPackageTfm Condition="'$(TargetFramework)' == 'net8.0'">net8.0</_SqlClientPackageTfm>
     <_SqlClientPackageTfm Condition="'$(TargetFramework)' == 'net462'">net462</_SqlClientPackageTfm>
@@ -80,7 +76,7 @@
          exposed via InternalsVisibleTo.  The path uses $(PkgMicrosoft_Data_SqlClient) generated
          above to locate the runtime DLL inside the NuGet package layout. -->
     <Reference Include="Microsoft.Data.SqlClient"
-               HintPath="$(PkgMicrosoft_Data_SqlClient)/runtimes/$(_SqlClientRid)/lib/$(_SqlClientPackageTfm)/Microsoft.Data.SqlClient.dll" />
+               HintPath="$(PkgMicrosoft_Data_SqlClient)/runtimes/win/lib/$(_SqlClientPackageTfm)/Microsoft.Data.SqlClient.dll" />
     <PackageReference Include="Microsoft.SqlServer.Server" />
   </ItemGroup>
 
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/SSPIContext.Unix.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/SSPIContext.Unix.cs
deleted file mode 100644
index 3221d9cbcd..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/SSPIContext.Unix.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-using System.Security.Principal;
-
-namespace Microsoft.SqlServer.TDS.EndPoint.SSPI
-{
-    /// <summary>
-    /// SSPI context
-    /// </summary>
-    public class SSPIContext : IDisposable
-    {
-        /// <summary>
-        /// FInalizer
-        /// </summary>
-        ~SSPIContext()
-        {
-            // Indicate that we're being destructed
-            Dispose(false);
-        }
-
-        /// <summary>
-        /// Create SSPI context for server
-        /// </summary>
-        public static SSPIContext CreateServer()
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <summary>
-        /// Create SSPI context for client
-        /// </summary>
-        public static SSPIContext CreateClient()
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <summary>
-        /// Initialize authentication sequence for the server
-        /// </summary>
-        /// <param name="clientToken">Token received from the client</param>
-        /// <returns>Token to be sent to the client in response</returns>
-        public SSPIResponse StartServerAuthentication(byte[] clientToken)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <summary>
-        /// Continue authentication sequence for the server
-        /// </summary>
-        /// <param name="clientToken">Token received from the client</param>
-        /// <returns>Token to be sent to the client in response</returns>
-        public SSPIResponse ContinueServerAuthentication(byte[] clientToken)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <summary>
-        /// Initialize authentication sequence for the client
-        /// </summary>
-        /// <returns>Token to be sent to the server</returns>
-        public SSPIResponse StartClientAuthentication(string targetMachine, uint targetPort)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <summary>
-        /// Initialize authentication sequence for the client
-        /// </summary>
-        /// <param name="clientToken">Payload received from the server</param>
-        /// <returns>Token to be sent to the server</returns>
-        public SSPIResponse ContinueClientAuthentication(byte[] clientToken)
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <summary>
-        /// Return identity of the party on the other end
-        /// </summary>
-        /// <returns></returns>
-        public IIdentity GetRemoteIdentity()
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <summary>
-        /// Dispose
-        /// </summary>
-        public void Dispose()
-        {
-            // Indicate that we're disposing
-            Dispose(true);
-        }
-
-        /// <summary>
-        /// Dispose the instance
-        /// </summary>
-        /// <param name="bIsDisposing"></param>
-        protected void Dispose(bool bIsDisposing)
-        {
-            
-        }
-    }
-}
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/SSPIContext.Windows.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/SSPIContext.cs
similarity index 96%
rename from src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/SSPIContext.Windows.cs
rename to src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/SSPIContext.cs
index 37f93d9f42..3d4174a6c3 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/SSPIContext.Windows.cs
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/SSPI/SSPIContext.cs
@@ -45,11 +45,21 @@ public class SSPIContext : IDisposable
         /// </summary>
         private int _maxTokenBufferSize;
 
+        private static void ThrowIfNotWindows()
+        {
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                throw new PlatformNotSupportedException("SSPI authentication is only supported on Windows.");
+            }
+        }
+
         /// <summary>
         /// Default constructor
         /// </summary>
         private SSPIContext()
         {
+            ThrowIfNotWindows();
+
             // Prepare a list of packages
             IList<string> packages = new List<string>();
 
@@ -126,6 +136,8 @@ private SSPIContext()
         /// </summary>
         public static SSPIContext CreateServer()
         {
+            ThrowIfNotWindows();
+
             // Create an instance of the context
             SSPIContext context = new SSPIContext();
 
@@ -150,6 +162,8 @@ public static SSPIContext CreateServer()
         /// </summary>
         public static SSPIContext CreateClient()
         {
+            ThrowIfNotWindows();
+
             // Create an instance of the context
             SSPIContext context = new SSPIContext();
 
@@ -176,6 +190,8 @@ public static SSPIContext CreateClient()
         /// <returns>Token to be sent to the client in response</returns>
         public SSPIResponse StartServerAuthentication(byte[] clientToken)
         {
+            ThrowIfNotWindows();
+
             // Wrap client token with the security buffer
             SecBufferDesc clientSecBuffer = new SecBufferDesc(clientToken);
 
@@ -236,6 +252,8 @@ public SSPIResponse StartServerAuthentication(byte[] clientToken)
         /// <returns>Token to be sent to the client in response</returns>
         public SSPIResponse ContinueServerAuthentication(byte[] clientToken)
         {
+            ThrowIfNotWindows();
+
             // Wrap client token with the security buffer
             SecBufferDesc clientSecBuffer = new SecBufferDesc(clientToken);
 
@@ -295,6 +313,8 @@ public SSPIResponse ContinueServerAuthentication(byte[] clientToken)
         /// <returns>Token to be sent to the server</returns>
         public SSPIResponse StartClientAuthentication(string targetMachine, uint targetPort)
         {
+            ThrowIfNotWindows();
+
             // Save the server we're authenticating against
             _targetMachineSPN = string.Format("MSSQLSvc/{0}:{1}", targetMachine, targetPort);
 
@@ -350,6 +370,8 @@ public SSPIResponse StartClientAuthentication(string targetMachine, uint targetP
         /// <returns>Token to be sent to the server</returns>
         public SSPIResponse ContinueClientAuthentication(byte[] clientToken)
         {
+            ThrowIfNotWindows();
+
             // Wrap client token with the security buffer
             SecBufferDesc serverSecBuffer = new SecBufferDesc(clientToken);
 
@@ -414,6 +436,8 @@ public SSPIResponse ContinueClientAuthentication(byte[] clientToken)
         /// <returns></returns>
         public IIdentity GetRemoteIdentity()
         {
+            ThrowIfNotWindows();
+
             IntPtr token = IntPtr.Zero;
 
             // Delegate into security API
@@ -434,6 +458,8 @@ public IIdentity GetRemoteIdentity()
         /// </summary>
         public void Dispose()
         {
+            ThrowIfNotWindows();
+
             // Indicate that we're disposing
             Dispose(true);
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
index aaede5846b..cd68ab9016 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
@@ -12,53 +12,6 @@
     <AssemblyOriginatorKeyFile>$(TestSigningKeyPath)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="FederatedAuthentication\FederatedAuthenticationTicketService.cs" />
-    <Compile Include="FederatedAuthentication\IFederatedAuthenticationTicket.cs" />
-    <Compile Include="FederatedAuthentication\Rps.cs" />
-    <Compile Include="FederatedAuthentication\RpsTicket.cs" />
-    <Compile Include="ITDSClientContext.cs" />
-    <Compile Include="ITDSServerSession.cs" />
-    <Compile Include="SSPI\SecBuffer.cs" />
-    <Compile Include="SSPI\SecBufferDescType.cs" />
-    <Compile Include="SSPI\SecConstants.cs" />
-    <Compile Include="SSPI\SecBufferDesc.cs" />
-    <Compile Include="SSPI\SecBufferType.cs" />
-    <Compile Include="SSPI\SecContextRequirements.cs" />
-    <Compile Include="SSPI\SecDataRepresentation.cs" />
-    <Compile Include="SSPI\SecPgkCredentials.cs" />
-    <Compile Include="SSPI\SecPkgInfo.cs" />
-    <Compile Include="SSPI\SecResult.cs" />
-    <Compile Include="SSPI\SecurityHandle.cs" />
-    <Compile Include="SSPI\SecurityInteger.cs" />
-    <Compile Include="PlaceholderStream.cs" />
-    <Compile Include="SSPI\SSPIResponse.cs" />
-    <Compile Include="TDSClientEndPoint.cs" />
-    <Compile Include="ITDSClient.cs" />
-    <Compile Include="ITDSServer.cs" />
-    <Compile Include="TDSClientParser.cs" />
-    <Compile Include="TDSEndPointInfo.cs" />
-    <Compile Include="TDSEndPointTransportType.cs" />
-    <Compile Include="TDSParser.cs" />
-    <Compile Include="TDSServerEndPoint.cs" />
-    <Compile Include="TDSServerEndPointConnection.cs" />
-    <Compile Include="TDSServerParser.cs" />
-  </ItemGroup>
-
-  <!-- Windows Only Files -->
-  <ItemGroup Condition="'$(TargetOs)' == 'Windows_NT'">
-    <Compile Include="SSPI\SSPIContext.Windows.cs" />
-    <Compile Include="SSPI\SecurityWrapper.cs" />
-  </ItemGroup>
-
-  <!-- Unix Only Files -->
-  <ItemGroup Condition="'$(TargetOs)' != 'Windows_NT'">
-    <Compile Include="SSPI\SSPIContext.Unix.cs" />
-  </ItemGroup>
-
   <!-- References ====================================================== -->
   <ItemGroup>
     <PackageReference Include="System.Security.Principal.Windows" />

From c57f3a952de9a91ca24a4b9ab1aefa1def93d10e Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 25 Aug 2026 07:46:09 -0700
Subject: [PATCH 249/298] Tests | Fix TVP query hint test timeouts against
 shared Azure SQL DB (#4593)

---
 .../Fixtures/DatabaseObjects/DatabaseUser.cs  |   8 +-
 .../Fixtures/DatabaseObjects/ServerLogin.cs   |   8 +-
 .../DatabaseObjects/StoredProcedure.cs        |   8 +-
 .../Common/Fixtures/DatabaseObjects/Table.cs  |   8 +-
 .../DatabaseObjects/UserDefinedType.cs        |  11 +-
 .../SQL/ParameterTest/TvpQueryHintsTests.cs   | 131 +++++++++++++-----
 6 files changed, 135 insertions(+), 39 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs
index bc94bc78ef..a757e9c9e0 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs
@@ -35,7 +35,13 @@ protected override void CreateObject(string definition)
 
     protected override void DropObject()
     {
-        using SqlCommand dropCommand = new($"IF USER_ID('{UnescapedName}') IS NOT NULL DROP USER {Name}", Connection);
+        // NOTE: The name is passed to USER_ID() as a parameter rather than being interpolated into
+        //   a string literal, because it embeds Environment.UserName/MachineName (see
+        //   DatabaseObject.GenerateLongName) and an apostrophe in either would break the batch.
+        //   The identifier in DROP USER is already bracket-quoted by GenerateLongName.
+        using SqlCommand dropCommand = new($"IF USER_ID(@name) IS NOT NULL DROP USER {Name}", Connection);
+
+        dropCommand.Parameters.AddWithValue("@name", UnescapedName);
 
         ExecuteCommandInDatabase(dropCommand);
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs
index 154899e9b3..ce264a9d14 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs
@@ -92,7 +92,13 @@ protected override void CreateObject(string definition)
 
     protected override void DropObject()
     {
-        using SqlCommand dropCommand = new($"IF SUSER_ID('{UnescapedName}') IS NOT NULL DROP LOGIN {Name}", Connection);
+        // NOTE: The name is passed to SUSER_ID() as a parameter rather than being interpolated into
+        //   a string literal, because it embeds Environment.UserName/MachineName (see
+        //   DatabaseObject.GenerateLongName) and an apostrophe in either would break the batch.
+        //   The identifier in DROP LOGIN is already bracket-quoted by GenerateLongName.
+        using SqlCommand dropCommand = new($"IF SUSER_ID(@name) IS NOT NULL DROP LOGIN {Name}", Connection);
+
+        dropCommand.Parameters.AddWithValue("@name", UnescapedName);
 
         dropCommand.ExecuteNonQuery();
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs
index d1b60612d1..0ebbd6cb5e 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs
@@ -34,7 +34,13 @@ protected override void CreateObject(string definition)
 
     protected override void DropObject()
     {
-        using SqlCommand dropCommand = new($"IF (OBJECT_ID('{Name}') IS NOT NULL) DROP PROCEDURE {Name}", Connection);
+        // NOTE: The name is passed to OBJECT_ID() as a parameter rather than being interpolated
+        //   into a string literal, because it embeds Environment.UserName/MachineName (see
+        //   DatabaseObject.GenerateLongName) and an apostrophe in either would break the batch.
+        //   The identifier in DROP PROCEDURE is already bracket-quoted by GenerateLongName.
+        using SqlCommand dropCommand = new($"IF (OBJECT_ID(@name) IS NOT NULL) DROP PROCEDURE {Name}", Connection);
+
+        dropCommand.Parameters.AddWithValue("@name", Name);
 
         dropCommand.ExecuteNonQuery();
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs
index 2838ae2272..42d07a8fba 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs
@@ -34,7 +34,13 @@ protected override void CreateObject(string definition)
 
     protected override void DropObject()
     {
-        using SqlCommand dropCommand = new($"IF (OBJECT_ID('{Name}') IS NOT NULL) DROP TABLE {Name}", Connection);
+        // NOTE: The name is passed to OBJECT_ID() as a parameter rather than being interpolated
+        //   into a string literal, because it embeds Environment.UserName/MachineName (see
+        //   DatabaseObject.GenerateLongName) and an apostrophe in either would break the batch.
+        //   The identifier in DROP TABLE is already bracket-quoted by GenerateLongName.
+        using SqlCommand dropCommand = new($"IF (OBJECT_ID(@name) IS NOT NULL) DROP TABLE {Name}", Connection);
+
+        dropCommand.Parameters.AddWithValue("@name", Name);
 
         dropCommand.ExecuteNonQuery();
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs
index 6d536d7550..be68e649dd 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs
@@ -34,7 +34,16 @@ protected override void CreateObject(string definition)
 
     protected override void DropObject()
     {
-        using SqlCommand dropCommand = new($"IF (OBJECT_ID('{Name}') IS NOT NULL) DROP TYPE {Name}", Connection);
+        // NOTE: User-defined types live in sys.types, not sys.objects, so OBJECT_ID() always
+        //   returns NULL for them. Using it here silently skipped every drop and leaked the type
+        //   into the (shared) test database. TYPE_ID() is the correct lookup.
+        // NOTE: The name is passed to TYPE_ID() as a parameter rather than being interpolated into
+        //   a string literal, because it embeds Environment.UserName/MachineName (see
+        //   DatabaseObject.GenerateLongName) and an apostrophe in either would break the batch.
+        //   The identifier in DROP TYPE is already bracket-quoted by GenerateLongName.
+        using SqlCommand dropCommand = new($"IF (TYPE_ID(@typeName) IS NOT NULL) DROP TYPE {Name}", Connection);
+
+        dropCommand.Parameters.AddWithValue("@typeName", Name);
 
         dropCommand.ExecuteNonQuery();
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs
index 545a19a165..0efc5ec017 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs
@@ -6,58 +6,121 @@
 using System.Collections.Generic;
 using System.Data;
 using Microsoft.Data.SqlClient.Server;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
     /// <summary>
-    /// Tests for TVP query hints (sort order, uniqueness, default columns).
+    /// Creates the table type and stored procedure used by <see cref="TvpQueryHintsTests"/> exactly
+    /// once for the whole test class.
     /// </summary>
-    [Trait("Set", "3")]
-    public sealed class TvpQueryHintsTests : IDisposable
+    /// <remarks>
+    /// Every test in the class needs an identically shaped table type and procedure, so creating them
+    /// per test only multiplies the amount of DDL issued against the (shared) test database. On Azure
+    /// SQL Database the resulting schema-modification lock contention was enough to push
+    /// CREATE/DROP TYPE and CREATE/DROP PROCEDURE past the default 30 second command timeout, which
+    /// showed up as sporadic "Execution Timeout Expired" failures in the manual test legs. Sharing a
+    /// single type/procedure via a class fixture cuts the DDL statement count by 5x, and the extended
+    /// command timeout below absorbs the contention that remains.
+    /// </remarks>
+    public sealed class TvpQueryHintsFixture : IDisposable
     {
-        private readonly SqlConnection _conn;
-        private readonly SqlCommand _cmd;
-        private readonly SqlParameter _param;
-        private readonly string _procName;
-        private readonly string _typeName;
+        /// <summary>
+        /// Command timeout (in seconds) applied to every command issued on <see cref="Connection"/>.
+        /// Deliberately generous: DDL against a shared Azure SQL Database can block for a long time
+        /// behind concurrently executing test legs.
+        /// </summary>
+        private const int CommandTimeoutSeconds = 120;
+
+        private readonly UserDefinedType _tableType;
+        private readonly StoredProcedure _procedure;
 
-        public TvpQueryHintsTests()
+        public SqlConnection Connection { get; }
+
+        public string ProcedureName => _procedure.Name;
+
+        public TvpQueryHintsFixture()
         {
-            Guid randomizer = Guid.NewGuid();
-            _typeName = string.Format("dbo.[QHint_{0}]", randomizer);
-            _procName = string.Format("dbo.[QHint_Proc_{0}]", randomizer);
-            string createTypeSql = string.Format(
-                    "CREATE TYPE {0} AS TABLE("
+            SqlConnectionStringBuilder builder = new(DataTestUtility.TCPConnectionString)
+            {
+                CommandTimeout = CommandTimeoutSeconds
+            };
+
+            Connection = new SqlConnection(builder.ConnectionString);
+
+            // Partial construction must not leak the objects created so far, otherwise a transient
+            // failure here would orphan a type in the shared database.
+            try
+            {
+                Connection.Open();
+
+                _tableType = new UserDefinedType(Connection, "QHint",
+                    "TABLE("
                         + " c1 Int DEFAULT -1,"
                         + " c2 NVarChar(40) DEFAULT N'DEFUALT',"
                         + " c3 DateTime DEFAULT '1/1/2006',"
-                        + " c4 Int DEFAULT -1)",
-                        _typeName);
-            string createProcSql = string.Format(
-                    "CREATE PROC {0}(@tvp {1} READONLY) AS SELECT TOP(2) * FROM @tvp ORDER BY c1", _procName, _typeName);
-
-            _conn = new SqlConnection(DataTestUtility.TCPConnectionString);
-            _conn.Open();
+                        + " c4 Int DEFAULT -1)");
+
+                try
+                {
+                    _procedure = new StoredProcedure(Connection, "QHint_Proc",
+                        $"(@tvp {_tableType.Name} READONLY) AS SELECT TOP(2) * FROM @tvp ORDER BY c1");
+                }
+                catch
+                {
+                    _tableType.Dispose();
+                    throw;
+                }
+            }
+            catch
+            {
+                Connection.Dispose();
+                throw;
+            }
+        }
 
-            _cmd = new SqlCommand(createTypeSql, _conn);
-            _cmd.ExecuteNonQuery();
+        public void Dispose()
+        {
+            // Each step runs even if an earlier one fails, so a transient error while dropping the
+            // procedure cannot leave the type (or the connection) behind.
+            try
+            {
+                _procedure.Dispose();
+            }
+            finally
+            {
+                try
+                {
+                    _tableType.Dispose();
+                }
+                finally
+                {
+                    Connection.Dispose();
+                }
+            }
+        }
+    }
 
-            _cmd.CommandText = createProcSql;
-            _cmd.ExecuteNonQuery();
+    /// <summary>
+    /// Tests for TVP query hints (sort order, uniqueness, default columns).
+    /// </summary>
+    [Trait("Set", "3")]
+    public sealed class TvpQueryHintsTests : IClassFixture<TvpQueryHintsFixture>, IDisposable
+    {
+        private readonly SqlCommand _cmd;
+        private readonly SqlParameter _param;
 
-            _cmd.CommandText = _procName;
-            _cmd.CommandType = CommandType.StoredProcedure;
+        public TvpQueryHintsTests(TvpQueryHintsFixture fixture)
+        {
+            _cmd = new SqlCommand(fixture.ProcedureName, fixture.Connection)
+            {
+                CommandType = CommandType.StoredProcedure
+            };
             _param = _cmd.Parameters.Add("@tvp", SqlDbType.Structured);
         }
 
-        public void Dispose()
-        {
-            string dropSql = string.Format("DROP PROC {0}; DROP TYPE {1}", _procName, _typeName);
-            using SqlCommand cmd = new(dropSql, _conn);
-            cmd.ExecuteNonQuery();
-            _conn.Dispose();
-        }
+        public void Dispose() => _cmd.Dispose();
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public void SortOrderSimple()

From f218648bb06ccd25caf611f461a1a769169e31e5 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 25 Aug 2026 20:26:36 -0700
Subject: [PATCH 250/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4586)

Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com>
---
 .../src/Resources/Strings.cs.resx                         | 8 +++++++-
 .../src/Resources/Strings.de.resx                         | 8 +++++++-
 .../src/Resources/Strings.es.resx                         | 8 +++++++-
 .../src/Resources/Strings.fr.resx                         | 8 +++++++-
 .../src/Resources/Strings.it.resx                         | 8 +++++++-
 .../src/Resources/Strings.ja.resx                         | 8 +++++++-
 .../src/Resources/Strings.ko.resx                         | 8 +++++++-
 .../src/Resources/Strings.pl.resx                         | 8 +++++++-
 .../src/Resources/Strings.pt-BR.resx                      | 8 +++++++-
 .../src/Resources/Strings.ru.resx                         | 8 +++++++-
 .../src/Resources/Strings.tr.resx                         | 8 +++++++-
 .../src/Resources/Strings.zh-Hans.resx                    | 8 +++++++-
 .../src/Resources/Strings.zh-Hant.resx                    | 8 +++++++-
 13 files changed, 91 insertions(+), 13 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index 34d634bdbf..2e7d1b25e1 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -1969,7 +1969,7 @@
     <value>Ověření podpisu sestavy enklávy se nezdařilo. Podpis sestavy neodpovídá podpisu vypočítanému pomocí kořenového certifikátu HGS. Ověřte mapování DNS pro koncový bod. Další podrobnosti najdete na https://go.microsoft.com/fwlink/?linkid=2160553. Pokud je to správně, obraťte se na oddělení služeb zákazníkům.</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>Ověření identity enklávy se nezdařilo, protože podepsaná sestava enklávy nebyla svázána s veřejným klíčem enklávy použitým k vytvoření relace. Veřejný klíč enklávy musí odpovídat hodnotě potvrzené podepsanou sestavou – další podrobnosti najdete na https://go.microsoft.com/fwlink/?linkid=2160553. Pokud je to správně, obraťte se na oddělení služeb zákazníkům.</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Sestava enklávy přijatá z SQL Server nemá správný formát. Obraťte se na služby zákaznické podpory.</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>Certifikát poskytnutý serverem neodpovídá certifikátu poskytnutému možností ServerCertificate.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Neplatný pokus o získání třídy JsonDocument ve sloupci {0}. Třída JsonDocument se podporuje jenom pro sloupce typu json.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index 6bc166a5e2..d45e4cd4a7 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -1969,7 +1969,7 @@
     <value>Fehler bei der Signaturüberprüfung des Enclave-Berichts. Die Berichtssignatur stimmt nicht mit der Signatur überein, die mit dem HGS-Stammzertifikat berechnet wurde. Überprüfen Sie die DNS-Zuordnung für den Endpunkt – Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=2160553. Wenn sie korrekt ist, wenden Sie sich an den Kundensupport.</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>Der Enklavennachweis ist fehlgeschlagen, weil der signierte Enklavenbericht nicht an den öffentlichen Enklavenschlüssel gebunden wurde, der zum Einrichten der Sitzung verwendet wurde. Der öffentliche Enclave-Schlüssel muss mit dem Wert übereinstimmen, für den vom signierten Bericht ein Commit ausgeführt wurde. Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=2160553. Wenn sie korrekt ist, wenden Sie sich an den Kundensupport.</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Der von SQL Server empfangene Enclavebericht weist nicht das richtige Format auf. Wenden Sie sich an den Kundensupport.</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>Das vom Server bereitgestellte Zertifikat stimmt nicht mit dem Zertifikat überein, das über die ServerCertificate-Option bereitgestellt wurde.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Ungültiger Versuch, „JsonDocument“ für Spalte „{0}“ abzurufen. „JsonDocument“ wird nur für Spalten vom Typ JSON unterstützt.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index 4a01d217c6..e4c0b3a2f0 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -1969,7 +1969,7 @@
     <value>Error de comprobación de firma del informe de enclave. La firma del informe no coincide con la firma calculada mediante el certificado raíz de HGS. Compruebe la asignación de DNS del punto de conexión. Vea https://go.microsoft.com/fwlink/?linkid=2160553 para más detalles. Si es correcta, póngase en contacto con el servicio de atención al cliente.</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>Error de atestación de enclave porque el informe de enclave firmado no se enlazaba a la clave pública del enclave usada para establecer la sesión. La clave pública del enclave debe coincidir con el valor confirmado por el informe firmado. Consulte https://go.microsoft.com/fwlink/?linkid=2160553 para obtener más detalles. Si es correcto, póngase en contacto con los servicios de soporte al cliente.</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>El informe de enclave recibido desde SQL Server no tiene el formato correcto. Póngase en contacto con el servicio de atención al cliente.</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>El certificado proporcionado por el servidor no coincide con el certificado proporcionado por la opción ServerCertificate.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Intento no válido de obtener JsonDocument en la columna '{0}'. JsonDocument solo se admite para columnas de tipo json.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index 83e45033db..c44a428c01 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -1969,7 +1969,7 @@
     <value>La vérification de signature du rapport d'enclave a échoué. La signature de rapport ne correspond pas à la signature calculée à l'aide du certificat racine SGH - consultez https://go.microsoft.com/fwlink/?linkid=2160553 pour plus d’informations. Vérifiez le mappage DNS pour le point de terminaison. S'il est correct, contactez le service client.</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>L’attestation d’enclave a échoué, car le rapport d’enclave signé n’était pas lié à la clé publique de l’enclave utilisée pour établir la session. La clé publique de l’enclave doit correspondre à la valeur engagée par le rapport signé – consultez https://go.microsoft.com/fwlink/?linkid=2160553 pour plus de détails. S'il est correct, contactez le service clientèle.</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Le rapport d'enclave envoyé par SQL Server n'a pas un format correct. Contactez le service client.</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>Le certificat fourni par le serveur ne correspond pas au certificat fourni par l’option ServerCertificate.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Tentative non valide d’obtention de JsonDocument sur la colonne « {0} ». JsonDocument est uniquement pris en charge pour les colonnes de type JSON.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 14b486dc50..027eb90eec 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -1969,7 +1969,7 @@
     <value>La verifica della firma del report dell'enclave non è riuscita. La firma del report non corrisponde alla firma calcolata usando il certificato radice HGS. Verificare il mapping DNS per l'endpoint - vedere https://go.microsoft.com/fwlink/?linkid=2160553 per altri dettagli. Se è corretto, contattare il Servizio Supporto Tecnico Clienti.</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>L'attestazione dell'enclave non è riuscita perché il report firmato dell'enclave non è stato vincolato alla chiave pubblica dell'enclave usata per stabilire la sessione. La chiave pubblica dell'enclave deve corrispondere al valore a cui fa riferimento il report firmato: per altri dettagli, vedere https://go.microsoft.com/fwlink/?linkid=2160553. Se è corretto, contattare il Servizio Supporto Tecnico Clienti.</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Il formato del report dell'enclave ricevuto da SQL Server non è corretto. Contattare il Servizio Supporto Tecnico Clienti.</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>Il certificato fornito dal server non corrisponde al certificato fornito dall'opzione ServerCertificate.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Tentativo non valido di ottenere JsonDocument nella colonna '{0}'. JsonDocument è supportato solo per colonne di tipo JSON.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index a9e1fdd397..91a5d34724 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -1969,7 +1969,7 @@
     <value>エンクレーブ レポートの署名の検証に失敗しました。レポートの署名が、HGS ルート証明書を使用して計算された署名と一致しません。エンドポイントの DNS マッピングをご確認ください。詳細については、https://go.microsoft.com/fwlink/?linkid=2160553 を参照してください。適切である場合、カスタマー サポート サービスにお問い合わせください。</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>署名付きエンクレーブ レポートが、セッションの確立に使用されたエンクレーブ公開キーにバインドされていなかったため、エンクレーブの構成証明に失敗しました。エンクレーブ公開キーは、署名付きレポートでコミットされた値と一致している必要があります。詳細については、https://go.microsoft.com/fwlink/?linkid=2160553 を参照してください。正しい場合は、カスタマー サポート サービスにお問い合わせください。</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>SQL Server から受信したエンクレーブ レポートの形式が適切ではありません。カスタマー サポート サービスにお問い合わせください。</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>サーバーによって提供された証明書が、ServerCertificate オプションで指定された証明書と一致しません。</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>列 '{0}' で JsonDocument を取得しようとしましたが無効です。JsonDocument は json 型の列でのみサポートされています。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index fa0c101704..341808855b 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -1969,7 +1969,7 @@
     <value>enclave 보고서의 서명을 확인하지 못했습니다. 보고서 서명이 HGS 루트 인증서를 사용하여 계산된 서명과 일치하지 않습니다. 엔드포인트에 대한 DNS 매핑을 확인하세요. 자세한 내용은 https://go.microsoft.com/fwlink/?linkid=2160553을 확인 하세요. 올바른 경우 고객 지원 서비스에 문의하세요.</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>서명된 엔클레이브 보고서가 세션을 설정하는 데 사용된 엔클레이브 공개 키에 바인딩되지 않아 엔클레이브 증명이 실패했습니다. 엔클레이브 공개 키는 서명된 보고서에 커밋된 값과 일치해야 합니다. 자세한 내용은 https://go.microsoft.com/fwlink/?linkid=2160553을 참조하세요. 올바른 경우 고객 지원 서비스에 문의하세요.</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>SQL Server에서 수신된 enclave 보고서의 형식이 잘못되었습니다. 고객 지원 서비스에 문의하세요.</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>서버에서 제공하는 인증서가 ServerCertificate 옵션에서 제공하는 인증서와 일치하지 않습니다.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>열 '{0}'의 JsonDocument를 가져오려는 시도가 잘못되었습니다. JsonDocument는 json 형식의 열에 대해서만 지원됩니다.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index 35b7be3700..20ed6212a8 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -1969,7 +1969,7 @@
     <value>Weryfikacja podpisu w raporcie enklawy zakończyła się niepowodzeniem. Podpis raportu jest niezgodny z podpisem obliczonym przy użyciu certyfikatu głównego usługi Ochrona hosta. Sprawdź mapowanie DNS dla punktu końcowego — zobacz https://go.microsoft.com/fwlink/?linkid=2160553, aby uzyskać więcej szczegółów. Jeśli to ustawienie jest poprawne, skontaktuj się z Działem Obsługi Klienta.</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>Zaświadczanie enklawy nie powiodło się, ponieważ podpisany raport enklawy nie został powiązany z kluczem publicznym enklawy używanym do ustanowienia sesji. Klucz publiczny enklawy musi być zgodny z wartością zatwierdzoną przez podpisany raport — zobacz https://go.microsoft.com/fwlink/?linkid=2160553, aby uzyskać więcej szczegółów. Jeśli to ustawienie jest poprawne, skontaktuj się z Działem Obsługi Klienta.</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Raport enklawy odebrany z systemu SQL Server nie ma prawidłowego formatu. Skontaktuj się z Działem Obsługi Klienta.</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>Certyfikat dostarczony przez serwer nie jest zgodny z certyfikatem dostarczonym przez opcję ServerCertificate.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Nieprawidłowa próba pobrania pliku JsonDocument w kolumnie „{0}”. Obiekt JsonDocument jest obsługiwany tylko w przypadku kolumn typu JSON.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 80bf559671..4d9aef99e2 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -1969,7 +1969,7 @@
     <value>A verificação da assinatura do relatório do enclave falhou. A assinatura do relatório não corresponde à assinatura calculada usando o certificado raiz HGS. Verifique o mapeamento DNS para o ponto de extremidade - consulte https://go.microsoft.com/fwlink/?linkid=2160553 para mais detalhes. Se estiver correto, entre em contato com os Serviços de Suporte ao Cliente.</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>O atestado do enclave falhou porque o relatório assinado do enclave não se vinculou à chave pública do enclave usada para estabelecer a sessão. A chave pública do enclave deve corresponder ao valor registrado no relatório assinado - consulte https://go.microsoft.com/fwlink/?linkid=2160553 para obter mais detalhes. Se correto, entre em contato com os Serviços de Atendimento ao Cliente.</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>O relatório de enclave recebido do SQL Server não está no formato correto. Entre em contato com os Serviços de Atendimento ao Cliente.</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>O certificado fornecido pelo servidor não corresponde ao certificado fornecido pela opção ServerCertificate.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Tentativa inválida de obter JsonDocument na coluna ''{0}''. Só há suporte para JsonDocument em colunas do tipo json.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 7bc5188c6b..64840d8907 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -1969,7 +1969,7 @@
     <value>Проверка подписи отчета анклава не пройдена. Подпись отчета не соответствует подписи, вычисленной с помощью корневого сертификата HGS. Проверьте сопоставление DNS для конечной точки — см. https://go.microsoft.com/fwlink/?linkid=2160553 для получения дополнительных сведений. Если оно верно, обратитесь в службу поддержки пользователей.</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>Аттестация анклава завершилась сбоем, так как подписанный отчет анклава не был привязан к открытому ключу анклава, использованному для установления сеанса. Открытый ключ анклава должен совпадать со значением, зафиксированным в подписанном отчете; подробнее см. по ссылке https://go.microsoft.com/fwlink/?linkid=2160553. Если это верно, обратитесь в службу поддержки клиентов.</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>Полученный с SQL Server отчет анклава имеет неправильный формат. Обратитесь в службу поддержки пользователей.</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>Сертификат, предоставленный сервером, не совпадает с сертификатом, указанным в параметре ServerCertificate.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Недопустимая попытка получить JsonDocument для столбца "{0}". JsonDocument поддерживается только для столбцов типа JSON.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index 3aba0485f1..6422118ce5 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -1969,7 +1969,7 @@
     <value>Kapanım raporunun imza doğrulaması başarısız oldu. Rapor imzası, HGS kök sertifikası kullanılarak hesaplanan imzayla eşleşmiyor. Uç nokta için DNS eşlemesini doğrulayın - daha fazla için bkz. https://go.microsoft.com/fwlink/?linkid=2160553. Doğruysa Müşteri Destek Hizmetleri'ne başvurun.</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>İmzalı kapanım raporu oturum oluşturulurken kullanılan kapanım ortak anahtarına bağlanmadığı için, kapanım kanıtlaması başarısız oldu. Kapanım ortak anahtarı, imzalı rapor tarafından işlenen değerle eşleşmelidir - diğer ayrıntılar için bkz. see https://go.microsoft.com/fwlink/?linkid=2160553. Doğruysa, Müşteri Destek Hizmetleri'ne başvurun.</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>SQL Server'dan alınan kapanım raporu doğru biçimde değil. Müşteri Destek Hizmetleri'ne başvurun.</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>Sunucu tarafından sağlanan sertifika, ServerCertificate seçeneği tarafından sağlanan sertifikayla eşleşmiyor.</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>'{0}' sütununda JsonDocument alma denemesi geçersiz. JsonDocument yalnızca json türündeki sütunlar için desteklenir.</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 3930e26e5d..2ad7516e12 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -1969,7 +1969,7 @@
     <value>无法验证 enclave 报告的签名。报告签名与使用 HGS 根证书计算出的签名不匹配。请验证终结点的 DNS 映射 - 有关 更多 详细信息，请 参阅 https://go.microsoft.com/fwlink/?linkid=2160553。如果正确，请联系客户支持服务。</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>Enclave 证明失败，因为已签名的 enclave 报表未绑定到用于建立会话的 enclave 公钥。Enclave 公钥必须与该签名报表提交的值匹配 - 有关详细信息，请参阅 https://go.microsoft.com/fwlink/?linkid=2160553。如果正确，请联系客户支持服务。</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>从 SQL Server 收到的 enclave 报告的格式不正确。请联系客户支持服务。</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>服务器提供的证书与 ServerCertificate 选项提供的证书不匹配。</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>在列 ‘{0}’ 上获取 JsonDocument 的尝试无效。只有 json 类型的列支持 JsonDocument。</value>
   </data>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index 2dd7493460..73005d95dd 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -1969,7 +1969,7 @@
     <value>驗證記憶體保護區報表的簽章失敗。報表的簽章與使用 HGS 根憑證計算所得的簽章不符。請驗證端點的 DNS 對應 - 請參閱 https://go.microsoft.com/fwlink/?linkid=2160553 尋求 詳細 資訊。若其正確，請連絡客戶支援服務。</value>
   </data>
   <data name="VerifyEnclaveKeyBindingFailed" xml:space="preserve">
-    <value>Enclave attestation failed because the signed enclave report did not bind to the enclave public key used to establish the session. The enclave public key must match the value committed to by the signed report - see https://go.microsoft.com/fwlink/?linkid=2160553 for more details. If correct, contact Customer Support Services.</value>
+    <value>記憶體保護區證明失敗，因為已簽署的記憶體保護區報表未繫結至用來建立工作階段的記憶體保護區公開金鑰。記憶體保護區公開金鑰必須符合已簽署報表所認可的值 - 如需詳細資料，請參閱 https://go.microsoft.com/fwlink/?linkid=2160553。若其正確，請連絡客戶支援服務。</value>
   </data>
   <data name="VerifyEnclaveReportFormatFailed" xml:space="preserve">
     <value>從 SQL Server 收到的記憶體保護區報表的格式不正確。請連絡客戶支援服務。</value>
@@ -2136,6 +2136,12 @@
   <data name="SQL_RemoteCertificateDoesNotMatchServerCertificate" xml:space="preserve">
     <value>伺服器提供的憑證不符合 ServerCertificate 選項所提供的憑證。</value>
   </data>
+  <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
+    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+  </data>
+  <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
+    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+  </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>在資料行 '{0}' 上取得 JsonDocument 的嘗試無效。JsonDocument 僅支援 JSON 類型的資料行。</value>
   </data>

From 8499d91181dff6eb8e63bb20064ce54155b51cc7 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 26 Aug 2026 03:29:23 -0700
Subject: [PATCH 251/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4600)

Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com>
---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx    | 4 ++--
 .../src/Resources/Strings.zh-Hans.resx                        | 4 ++--
 .../src/Resources/Strings.zh-Hant.resx                        | 4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index 2e7d1b25e1..4e20d68eeb 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -2083,10 +2083,10 @@
     <value>Pokud je klíčové slovo Integrated Security připojovacího řetězce nastavené na hodnotu true nebo SSPI, nejde nastavit vlastnost AccessTokenCallback.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>Vlastnost AccessToken nebo AccessTokenCallback nelze nastavit, pokud je nastavená vlastnost SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>Vlastnost SspiContextProvider nelze nastavit, pokud je nastavená vlastnost AccessToken nebo AccessTokenCallback.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Pokud je v připojovacím řetězci nastavená možnost Authentication=Active Directory Default, nejde nastavit vlastnost AccessTokenCallback.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index d45e4cd4a7..07aa2c6b3f 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -2083,10 +2083,10 @@
     <value>AccessTokenCallback-Eigenschaft kann nicht festgelegt werden, wenn das Schlüsselwort für Verbindungszeichenfolgen 'Integrated Security' auf 'true' oder 'SSPI' gesetzt wurde.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>Die Eigenschaft AccessToken oder AccessTokenCallback kann nicht festgelegt werden, wenn die Eigenschaft SspiContextProvider bereits festgelegt wurde.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>Die Eigenschaft SspiContextProvider kann nicht festgelegt werden, wenn die Eigenschaft AccessToken oder AccessTokenCallback bereits festgelegt wurde.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Die Eigenschaft AccessTokenCallback kann nicht festgelegt werden, wenn in der Verbindungszeichenfolge "Authentication=Active Directory Default" angegeben wurde.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index e4c0b3a2f0..5d912814b4 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -2083,10 +2083,10 @@
     <value>No se puede establecer la propiedad AccessTokenCallback si la palabra clave de cadena de conexión "Integrated Security" se ha establecido en "true" o "SSPI".</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>No se puede establecer la propiedad AccessToken o AccessTokenCallback si ya se ha establecido la propiedad SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>No se puede establecer la propiedad SspiContextProvider si ya se ha establecido la propiedad AccessToken o AccessTokenCallback.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>No se puede establecer la propiedad AccessTokenCallback si se ha especificado 'Authentication=Active Directory Default' en la cadena de conexión.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index c44a428c01..c0082ed5d8 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -2083,10 +2083,10 @@
     <value>Impossible de définir la propriété AccessTokenCallback si le mot clé de chaîne de connexion « Sécurité intégrée » a été défini sur « true » ou « SSPI ».</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>Nous ne pouvons pas définir la propriété AccessToken ou AccessTokenCallback si la propriété SspiContextProvider a déjà été définie.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>Nous ne pouvons pas définir la propriété SspiContextProvider si la propriété AccessToken ou AccessTokenCallback a déjà été définie.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Impossible de définir la propriété AccessTokenCallback si 'Authentication=Active Directory Default' a été spécifié dans la chaîne de connexion.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 027eb90eec..4708501a33 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -2083,10 +2083,10 @@
     <value>Non è possibile impostare la proprietà AccessTokenCallback se la parola chiave della stringa di connessione 'Integrated Security' è stata impostata su 'true' o 'SSPI'.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>Non è possibile impostare la proprietà AccessToken o AccessTokenCallback se la proprietà SspiContextProvider è già stata impostata.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>Non è possibile impostare la proprietà SspiContextProvider se la proprietà AccessToken o AccessTokenCallback è già stata impostata.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Impossibile impostare la proprietà AccessTokenCallback se nella stringa di connessione è stato specificato 'Authentication=Active Directory Default'.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index 91a5d34724..e6d556d6d3 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -2083,10 +2083,10 @@
     <value>'Integrated Security' 接続文字列キーワードが 'true' または 'SSPI' に設定されている場合、AccessTokenCallback プロパティを設定できません。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>SspiContextProvider プロパティが設定されている場合は、AccessToken または AccessTokenCallback プロパティを設定できません。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>AccessToken または AccessTokenCallback プロパティが設定されている場合は、SspiContextProvider プロパティを設定できません。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>接続文字列に 'Authentication=Active Directory Default' が指定されている場合、AccessTokenCallback プロパティを設定できません。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index 341808855b..688a1bee60 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -2083,10 +2083,10 @@
     <value>'Integrated Security' 연결 문자열 키워드가 'true' 또는 'SSPI'로 설정된 경우 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>SspiContextProvider 속성이 설정된 경우 AccessToken 또는 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>AccessToken 또는 AccessTokenCallback 속성이 설정된 경우 SspiContextProvider 속성을 설정할 수 없습니다.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>연결 문자열에 'Authentication=Active Directory Default'가 지정된 경우 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index 20ed6212a8..d9656a1a8c 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -2083,10 +2083,10 @@
     <value>Nie można ustawić właściwości AccessTokenCallback, jeśli słowo kluczowe parametrów połączenia „Integrated Security” ma wartość „true” lub „SSPI”.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>Nie można ustawić właściwości AccessToken lub AccessTokenCallback, jeśli ustawiono właściwość SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>Nie można ustawić właściwości SspiContextProvider, jeśli ustawiono właściwość AccessToken lub AccessTokenCallback.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Nie można ustawić właściwości AccessTokenCallback, jeśli w parametrach połączenia określono wartość „Authentication=Active Directory Default”.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 4d9aef99e2..581068d864 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -2083,10 +2083,10 @@
     <value>Não é possível definir a propriedade AccessTokenCallback se a palavra-chave da cadeia de conexão 'Integrated Security' tiver sido definida como 'true' ou 'SSPI'.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>Não é possível definir a propriedade AccessToken ou AccessTokenCallback se a propriedade SspiContextProvider já tiver sido definida.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>Não é possível definir a propriedade SspiContextProvider se a propriedade AccessToken ou AccessTokenCallback já tiver sido definida.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Não é possível definir a propriedade AccessTokenCallback se 'Authentication=Active Directory Default' tiver sido especificado na cadeia de conexão.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 64840d8907..8b3cbff48a 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -2083,10 +2083,10 @@
     <value>Если ключевому слову строки подключения "Integrated Security" задано значение "true" или "SSPI", свойство "AccessTokenCallback" задать не удастся.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>Если задано свойство SspiContextProvider, свойства AccessToken или AccessTokenCallback настроить невозможно.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>Если заданы свойства AccessToken или AccessTokenCallback, свойство SspiContextProvider настроить невозможно.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Если в строке подключения указан параметр "Authentication=Active Directory Default", свойство AccessTokenCallback задать не удастся.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index 6422118ce5..650a21f087 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -2083,10 +2083,10 @@
     <value>'Integrated Security' bağlantı dizesi anahtar sözcüğü 'true' veya 'SSPI' olarak ayarlanmışsa AccessTokenCallback özelliği ayarlanamaz.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>AccessToken veya AccessTokenCallback özelliği, SspiContextProvider özelliği ayarlanmışsa ayarlanamaz.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>SspiContextProvider özelliği, AccessToken veya AccessTokenCallback özelliği ayarlanmışsa ayarlanamaz.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Bağlantı dizesinde 'Authentication=Active Directory Default' belirtilmişse AccessTokenCallback özelliği ayarlanamaz.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 2ad7516e12..77db610a7c 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -2083,10 +2083,10 @@
     <value>如果 "Integrated Security" 连接字符串关键字设置为 "true" 或 "SSPI"，则无法设置 AccessTokenCallback 属性。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>如果已设置 SspiContextProvider 属性，则无法设置 AccessToken 或 AccessTokenCallback 属性。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>如果已设置 AccessToken 或 AccessTokenCallback 属性，则无法设置 SspiContextProvider 属性。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>如果在连接字符串中指定了 "Authentication=Active Directory Default"，则无法设置 AccessTokenCallback 属性。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index 73005d95dd..f7d87d6908 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -2083,10 +2083,10 @@
     <value>如果 'Integrated Security' 連接字串關鍵字已設定為 'true' 或 'SSPI'，就不能設定 AccessTokenCallback 屬性。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
+    <value>如果已設定 SspiContextProvider 屬性，就不能設定 AccessToken 或 AccessTokenCallback 屬性。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+    <value>如果已設定 AccessToken 或 AccessTokenCallback 屬性，就不能設定 SspiContextProvider 屬性。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>如果已在連接字串中指定 'Authentication=Active Directory Default'，就不能設定 AccessTokenCallback 屬性。</value>

From f9e8579e7a9356a16547ad4034618ec0816bef89 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Thu, 27 Aug 2026 00:47:18 +0530
Subject: [PATCH 252/298] Restore the preview package version convention used
 by earlier releases (#4602)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 ...sqlclient-package-versions.instructions.md |  42 ++++--
 .../onebranch/scripts/compute-versions.ps1    | 124 ++++++++++++++++--
 .../scripts/tests/compute-versions.Tests.ps1  |  96 +++++++++++---
 .../stages/compute-versions-stage.yml         |   8 +-
 4 files changed, 229 insertions(+), 41 deletions(-)

diff --git a/.github/instructions/sqlclient-package-versions.instructions.md b/.github/instructions/sqlclient-package-versions.instructions.md
index 5aebcc6eb9..1692082a68 100644
--- a/.github/instructions/sqlclient-package-versions.instructions.md
+++ b/.github/instructions/sqlclient-package-versions.instructions.md
@@ -136,29 +136,47 @@ Each downstream build job receives:
 
 Since an explicit `<Pkg>PackageVersion` is provided, Versions.props hits Priority 1 — uses the value verbatim.
 
-#### Non-Official Test Publication Revisions
+#### Package Version Shapes: `addRevision`
 
-Both OneBranch pipelines expose `addRevision` (default `false`). Their human-readable run name
-remains `$(Year:YY)$(DayOfYear)$(Rev:.r)`, while version revisions come from globally unique
-`Build.BuildId`. The compute stage always maps `Build.BuildId` into the unsigned 16-bit file-version
-range before evaluating canonical file versions:
+Both OneBranch pipelines expose `addRevision` (default `false`), which selects between two mutually
+exclusive package version shapes. Their human-readable run name is `$(Year:YY)$(DayOfYear)$(Rev:.r)`,
+and the compute stage receives both that run name (as `Build.BuildNumber`) and the globally unique
+`Build.BuildId` (as the revision).
+
+**Default path — `addRevision: false`.** The pipeline run name is appended after any prerelease
+suffix, reproducing the shape shipped by earlier previews. `Build.BuildId` is not used:
+
+- `1.2.3` stays `1.2.3` — non-preview releases are never stamped with a build number
+- `1.2.3-preview1` becomes `1.2.3-preview1.<build_number>`, e.g. `7.1.0-preview3.26238.3`
+- The matching file version is `1.2.3.<date_segment>`, e.g. `7.1.0.26238`
+
+Note the asymmetry: the *package* version omits the build number for non-preview releases, but the
+*file* version always carries one in its fourth component. This keeps every shipped assembly
+date-encoded and traceable to the run that produced it, while preserving the released package
+version customers expect.
+
+**Opt-in path — `addRevision: true`.** Version revisions come from `Build.BuildId` instead, which is
+mapped into the unsigned 16-bit file-version range before canonical file versions are evaluated:
 
 ```text
 revision = ((Build.BuildId - 1) % 65535) + 1
 ```
 
-Build IDs `1` through `65535` therefore map directly; subsequent IDs wrap back through that range.
-The compute stage logs the mapping whenever wrapping occurs because the revision can then collide
-with an earlier run. When `addRevision` is enabled, the mapped value is inserted before any package
-prerelease suffix so package and file versions use the same revision:
+Build IDs `1` through `65535` map directly; subsequent IDs wrap back through that range. The compute
+stage logs the mapping whenever wrapping occurs because the revision can then collide with an earlier
+run. The mapped value is inserted before any package prerelease suffix so package and file versions
+use the same revision:
 
 - `1.2.3` becomes `1.2.3.<revision>`
 - `1.2.3-preview1` becomes `1.2.3.<revision>-preview1`
 - The matching file version is `1.2.3.<revision>`
 
-Only packages built in the current run are revised. When `buildSqlServer` is `false`, the effective
-SqlServer version remains `SqlServerPublishedVersion` so dependency restore continues to request the
-package that actually exists on NuGet.
+This shape exists for repeated test publishes of the same base version, where each run needs a
+distinct package version. `Build.BuildNumber` is not used on this path.
+
+Only packages built in the current run are revised or stamped. When `buildSqlServer` is `false`, the
+effective SqlServer version remains `SqlServerPublishedVersion` so dependency restore continues to
+request the package that actually exists on NuGet.
 
 An explicit four-part package version is also treated as the complete file version base by both
 canonical Versions.props files; they do not append `FileVersionBuildNumber` as a fifth component.
diff --git a/eng/pipelines/onebranch/scripts/compute-versions.ps1 b/eng/pipelines/onebranch/scripts/compute-versions.ps1
index 76568788a5..ca3eb2c9d9 100644
--- a/eng/pipelines/onebranch/scripts/compute-versions.ps1
+++ b/eng/pipelines/onebranch/scripts/compute-versions.ps1
@@ -12,16 +12,34 @@
     The published SqlServer version is needed when SqlServer is not built because downstream
     SqlClient projects restore that existing package from NuGet.
 
-    The supplied revision is mapped to the range 1 through 65535 before canonical versions
-    are evaluated so every file version has a valid fourth component. When AddRevision is true, that
-    same mapped value is inserted as the fourth numeric component of package versions built during
-    this run. Any prerelease suffix remains after the revision. For example, 1.2.3-preview1 with
-    revision 165500 becomes package version 1.2.3.34430-preview1 and file version 1.2.3.34430.
+    Two mutually exclusive package version shapes are supported:
+
+    When AddRevision is true, BuildNumber is ignored if specified. For non-preview releases, versions
+    will be 1.2.3.<revision>. For preview releases, versions will be 1.2.3.<revision>-previewX.
+
+    When AddRevision is false, BuildNumber must be specified. Non-preview versions will be 1.2.3, and
+    preview releases will be 1.2.3-previewX.<build_number>.
+
+    This asymmetry maintains the existing package versioning practice where previews include a
+    date-coded build number, but normal releases do not.
+
+    File versions are always four-part and always carry a build number in the fourth component, even
+    when the package version does not:
+
+      - AddRevision true. The fourth component is the mapped revision, so package and file versions
+        agree. A package version of 1.2.3.34430-preview1 has file version 1.2.3.34430.
+
+      - AddRevision false. The fourth component is the first segment of BuildNumber. A package
+        version of 1.2.3-preview1.26238.3 has file version 1.2.3.26238, and a stable package version
+        of 1.2.3 still has file version 1.2.3.26238. This keeps every file version date-encoded and
+        traceable back to the run that produced it.
 
-    Revisions above 65535 wrap through the valid unsigned 16-bit file-version range. The script logs
+    The supplied revision is mapped to the range 1 through 65535 before canonical versions
+    are evaluated so every file version has a valid fourth component. Revisions above 65535 wrap
+    through the valid unsigned 16-bit file-version range. When AddRevision is true the script logs
     the mapping because the revision may then collide with an earlier run. An unbuilt SqlServer
-    package is never revised because its effective version must continue to identify the package
-    that already exists on NuGet.
+    package is never revised or stamped with a build number because its effective version must
+    continue to identify the package that already exists on NuGet.
 
     The script emits these output variables for downstream stages:
       - VersionRevision
@@ -33,7 +51,13 @@
 
 .PARAMETER Revision
     Positive integer used to distinguish versions. Values above 65535 are wrapped into the unsigned
-    16-bit revision range.
+    16-bit revision range. Only consumed when AddRevision is true.
+
+.PARAMETER BuildNumber
+    Pipeline build number in the form <date>.<run>, such as 26238.3. Required when AddRevision is
+    false, and ignored when AddRevision is true. When required, it is appended to prerelease package
+    versions and its first segment becomes the file-version build number, so file versions remain
+    date-encoded.
 
 .PARAMETER BuildSqlServer
     Whether this run builds Microsoft.SqlServer.Server. When false, the effective SqlServer package
@@ -47,6 +71,17 @@
     dotnet executable to invoke. Defaults to the dotnet command resolved from PATH. This parameter
     primarily supports isolated testing and specialized agent configurations.
 
+.EXAMPLE
+    ./compute-versions.ps1 `
+        -ProjectPath ./build.proj `
+        -Revision 165500 `
+        -BuildNumber 26238.3 `
+        -BuildSqlServer $true `
+        -AddRevision $false
+
+    Computes versions for an official-style run that builds SqlServer. Prerelease package versions
+    become 7.1.0-preview3.26238.3 and file versions become 7.1.0.26238.
+
 .EXAMPLE
     ./compute-versions.ps1 `
         -ProjectPath ./build.proj `
@@ -55,7 +90,8 @@
         -AddRevision $true
 
     Computes versions for a run that builds SqlServer and appends mapped revision 34430 to both
-    package families and their file versions.
+    package families and their file versions. BuildNumber is not supplied because AddRevision is
+    true.
 
 .EXAMPLE
     ./compute-versions.ps1 `
@@ -83,6 +119,10 @@ param(
     [ValidateRange(1, [long]::MaxValue)]
     [long]$Revision,
 
+    [Parameter(HelpMessage = "Pipeline build number, such as 26238.3. Required when AddRevision is false.")]
+    [ValidatePattern("^$|^\d+\.\d+$")]
+    [string]$BuildNumber = "",
+
     [Parameter(Mandatory = $true, HelpMessage = "Whether Microsoft.SqlServer.Server is built in this run.")]
     [bool]$BuildSqlServer,
 
@@ -98,7 +138,7 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = "Stop"
 
 $wrappedRevision = (($Revision - 1) % 65535) + 1
-if ($Revision -gt 65535) {
+if ($AddRevision -and $Revision -gt 65535) {
     Write-Host "Revision $Revision exceeds the unsigned 16-bit limit and wrapped to $wrappedRevision; this revision may collide with an earlier run."
 }
 
@@ -196,6 +236,43 @@ function Add-VersionRevision {
     return $versionWithRevision
 }
 
+<#
+.SYNOPSIS
+    Appends a pipeline build number to a prerelease package version.
+
+.DESCRIPTION
+    Reproduces the version shape used by earlier previews, where the build number follows the
+    prerelease suffix, such as 7.1.0-preview3.26238.3. Stable versions are returned unchanged
+    because released packages are not stamped with a build number.
+
+.PARAMETER Version
+    Package version with a three-part numeric base and optional prerelease suffix.
+
+.PARAMETER BuildNumber
+    Pipeline build number to append.
+
+.OUTPUTS
+    The package version with the build number appended to its prerelease suffix, or the original
+    version when it carries no prerelease suffix.
+#>
+function Add-VersionBuildNumber {
+    param(
+        [string]$Version,
+        [string]$BuildNumber
+    )
+
+    $parts = $Version -split "-", 2
+    if ($parts[0] -notmatch "^\d+\.\d+\.\d+$") {
+        throw "Expected a three-part numeric version base, but received '$Version'."
+    }
+
+    if ($parts.Count -eq 2) {
+        return "$($parts[0])-$($parts[1]).$BuildNumber"
+    }
+
+    return $Version
+}
+
 <#
 .SYNOPSIS
     Emits an Azure DevOps job output variable for consumption by downstream stages.
@@ -232,6 +309,8 @@ $sqlServerPackageVersion = if ($BuildSqlServer) {
     $sqlServerVersions.PublishedVersion
 }
 
+$fileVersionBuildNumber = $null
+
 if ($AddRevision) {
     $sqlClientPackageVersion = Add-VersionRevision `
         -Version $sqlClientPackageVersion `
@@ -242,8 +321,29 @@ if ($AddRevision) {
             -Revision $wrappedRevision
     }
 
+    # The revision is already the fourth component of the package version, so it is also the
+    # file-version build number.
+    $fileVersionBuildNumber = $wrappedRevision
     Write-Host "Version revision: $wrappedRevision (input=$Revision)"
 }
+else {
+    if ([string]::IsNullOrWhiteSpace($BuildNumber)) {
+        throw "BuildNumber is required when AddRevision is false."
+    }
+
+    $fileVersionBuildNumber = $BuildNumber.Split(".")[0]
+
+    $sqlClientPackageVersion = Add-VersionBuildNumber `
+        -Version $sqlClientPackageVersion `
+        -BuildNumber $BuildNumber
+    if ($BuildSqlServer) {
+        $sqlServerPackageVersion = Add-VersionBuildNumber `
+            -Version $sqlServerPackageVersion `
+            -BuildNumber $BuildNumber
+    }
+
+    Write-Host "Version build number: $BuildNumber (file version build number=$fileVersionBuildNumber)"
+}
 
 Write-Host "Effective versions:"
 Write-Host "  SqlClient (family): $sqlClientPackageVersion"
@@ -251,4 +351,4 @@ Write-Host "  SqlServer:          $sqlServerPackageVersion"
 
 Set-PipelineOutputVariable -Name "SqlClientPackageVersion" -Value $sqlClientPackageVersion
 Set-PipelineOutputVariable -Name "SqlServerPackageVersion" -Value $sqlServerPackageVersion
-Set-PipelineOutputVariable -Name "VersionRevision" -Value $wrappedRevision
+Set-PipelineOutputVariable -Name "VersionRevision" -Value $fileVersionBuildNumber
diff --git a/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1 b/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
index 4e8a2f375a..ba109c4b71 100644
--- a/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
+++ b/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
@@ -8,9 +8,19 @@ BeforeAll {
     $projectPath = Join-Path $TestDrive 'build.proj'
     Set-Content -LiteralPath $projectPath -Value '<Project />'
 
+    # An arbitrary but well-formed pipeline build number, used only by the tests that exercise the
+    # path which consumes one. The script never reads the ambient build number; the pipeline passes
+    # $(Build.BuildNumber) as a parameter, so any well-formed value works here and a fixed one keeps
+    # the expected output deterministic. Assertions derive from these rather than repeating literals
+    # so the relationship between the two is visible.
+    $script:testBuildNumber = '26238.3'
+    $script:testBuildNumberPattern = [regex]::Escape($script:testBuildNumber)
+    $script:testFileVersionBuildNumber = $script:testBuildNumber.Split('.')[0]
+
     function Invoke-ComputeVersions {
         param(
             [long]$Revision = 42,
+            [string]$BuildNumber = '',
             [bool]$BuildSqlServer = $true,
             [bool]$AddRevision = $true
         )
@@ -18,27 +28,39 @@ BeforeAll {
         & $scriptPath `
             -ProjectPath $projectPath `
             -Revision $Revision `
+            -BuildNumber $BuildNumber `
             -BuildSqlServer $BuildSqlServer `
             -AddRevision $AddRevision *>&1 | Out-String
     }
 
-    function Set-SuccessfulDotnetMock {
+    # Alternates between the SqlClient and SqlServer GetVersions targets, which the script always
+    # invokes in that order.
+    function Set-DotnetMock {
+        param(
+            [string]$SqlClientPackageVersion = '7.1.0-preview3',
+            [string]$SqlServerPackageVersion = '1.1.0-preview1'
+        )
+
         $global:computeVersionsDotnetCallCount = 0
         Mock -CommandName 'dotnet' -MockWith {
             $global:LASTEXITCODE = 0
             $global:computeVersionsDotnetCallCount++
             if ($global:computeVersionsDotnetCallCount % 2 -eq 1) {
                 return @(
-                    '  PackageVersion: 7.1.0-preview3'
+                    "  PackageVersion: $SqlClientPackageVersion"
                     '  PublishedVersion: 7.0.0'
                 )
             }
 
             return @(
-                '  PackageVersion: 1.1.0-preview1'
+                "  PackageVersion: $SqlServerPackageVersion"
                 '  PublishedVersion: 1.0.0'
             )
-        }
+        }.GetNewClosure()
+    }
+
+    function Set-SuccessfulDotnetMock {
+        Set-DotnetMock
     }
 }
 
@@ -51,12 +73,12 @@ Describe 'compute-versions.ps1 Effective Versions' {
         Set-SuccessfulDotnetMock
     }
 
-    It 'emits canonical package versions and the revision when package revisioning is disabled' {
-        $output = Invoke-ComputeVersions -AddRevision $false
+    It 'appends the build number after the prerelease suffix when package revisioning is disabled' {
+        $output = Invoke-ComputeVersions -AddRevision $false -BuildNumber $script:testBuildNumber
 
-        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3'
-        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0-preview1'
-        $output | Should -Match 'VersionRevision;isOutput=true]42'
+        $output | Should -Match "SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3\.$script:testBuildNumberPattern"
+        $output | Should -Match "SqlServerPackageVersion;isOutput=true]1\.1\.0-preview1\.$script:testBuildNumberPattern"
+        $output | Should -Match "VersionRevision;isOutput=true]$script:testFileVersionBuildNumber"
     }
 
     It 'inserts the revision before prerelease suffixes for built packages' {
@@ -84,14 +106,47 @@ Describe 'compute-versions.ps1 Effective Versions' {
         $output | Should -Match 'VersionRevision;isOutput=true]1'
     }
 
-    It 'emits the wrapped revision when package revisioning is disabled' {
-        $output = Invoke-ComputeVersions -Revision 65536 -AddRevision $false
+    It 'emits the build number rather than the wrapped revision when package revisioning is disabled' {
+        $output = Invoke-ComputeVersions -Revision 65536 -AddRevision $false -BuildNumber $script:testBuildNumber
 
-        $output | Should -Match 'Revision 65536.*wrapped to 1'
         $output | Should -Not -Match 'task\.logissue type=warning'
-        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3'
-        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0-preview1'
-        $output | Should -Match 'VersionRevision;isOutput=true]1'
+        $output | Should -Not -Match 'wrapped to'
+        $output | Should -Match "SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3\.$script:testBuildNumberPattern"
+        $output | Should -Match "SqlServerPackageVersion;isOutput=true]1\.1\.0-preview1\.$script:testBuildNumberPattern"
+        $output | Should -Match "VersionRevision;isOutput=true]$script:testFileVersionBuildNumber"
+    }
+
+    It 'retains the published SqlServer package unstamped when SqlServer is not built' {
+        $output = Invoke-ComputeVersions -BuildSqlServer $false -AddRevision $false -BuildNumber $script:testBuildNumber
+
+        $output | Should -Match "SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3\.$script:testBuildNumberPattern"
+        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.0\.0'
+        $output | Should -Not -Match "SqlServerPackageVersion;isOutput=true]1\.0\.0\.$script:testFileVersionBuildNumber"
+    }
+
+    It 'omits the build number from non-preview package versions when package revisioning is disabled' {
+        Set-DotnetMock -SqlClientPackageVersion '7.1.0' -SqlServerPackageVersion '1.1.0'
+
+        $output = Invoke-ComputeVersions -AddRevision $false -BuildNumber $script:testBuildNumber
+
+        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0(\r?\n|$)'
+        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0(\r?\n|$)'
+        $output | Should -Not -Match "SqlClientPackageVersion;isOutput=true]7\.1\.0[\.-]$script:testFileVersionBuildNumber"
+        $output | Should -Not -Match "SqlServerPackageVersion;isOutput=true]1\.1\.0[\.-]$script:testFileVersionBuildNumber"
+
+        # The file version is still stamped so every build produces a distinct, date-encoded
+        # file version even for non-preview releases.
+        $output | Should -Match "VersionRevision;isOutput=true]$script:testFileVersionBuildNumber"
+    }
+
+    It 'revises non-preview package versions when package revisioning is enabled' {
+        Set-DotnetMock -SqlClientPackageVersion '7.1.0' -SqlServerPackageVersion '1.1.0'
+
+        $output = Invoke-ComputeVersions
+
+        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0\.42'
+        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0\.42'
+        $output | Should -Match 'VersionRevision;isOutput=true]42'
     }
 }
 
@@ -100,6 +155,17 @@ Describe 'compute-versions.ps1 Error Handling' {
         { Invoke-ComputeVersions -Revision 0 } | Should -Throw
     }
 
+    It 'requires a build number when package revisioning is disabled' {
+        Set-SuccessfulDotnetMock
+
+        { Invoke-ComputeVersions -AddRevision $false } |
+            Should -Throw '*BuildNumber is required when AddRevision is false*'
+    }
+
+    It 'rejects a malformed build number' {
+        { Invoke-ComputeVersions -AddRevision $false -BuildNumber 'not-a-build-number' } | Should -Throw
+    }
+
     It 'throws when a GetVersions target fails' {
         Mock -CommandName 'dotnet' -MockWith {
             $global:LASTEXITCODE = 1
diff --git a/eng/pipelines/onebranch/stages/compute-versions-stage.yml b/eng/pipelines/onebranch/stages/compute-versions-stage.yml
index 5017d17a54..11e2187e57 100644
--- a/eng/pipelines/onebranch/stages/compute-versions-stage.yml
+++ b/eng/pipelines/onebranch/stages/compute-versions-stage.yml
@@ -17,8 +17,11 @@
 #   - Microsoft.SqlServer.Server is versioned separately: it uses its "next" version when it is
 #     being built this run, or its "published" (last shipped to NuGet) version when it is not built
 #     (so the SqlClient family depends on the most recently published SqlServer package).
-#   - Runs can append the Build.BuildId revision to packages built in that run, reducing
-#     collisions when repeatedly publishing the same base version for testing.
+#   - Runs use their "next" version from Versions.props. By default the pipeline build number is
+#     appended to prerelease package versions (7.1.0-preview3.26238.3) and its date segment becomes
+#     the file-version build number (7.1.0.26238), matching the shape shipped by earlier previews.
+#     Runs can instead append the Build.BuildId revision, reducing collisions when repeatedly
+#     publishing the same base version for testing.
 #   - Versions are extracted via build.proj GetVersions* targets by parsing stdout.
 #
 # This stage MUST run before all build stages so they can consume computed versions.
@@ -78,5 +81,6 @@ stages:
               arguments: >-
                 -ProjectPath "$(Build.SourcesDirectory)/build.proj"
                 -Revision "$(Build.BuildId)"
+                -BuildNumber "$(Build.BuildNumber)"
                 -BuildSqlServer $${{ parameters.buildSqlServer }}
                 -AddRevision $${{ parameters.addRevision }}

From 630f235bc3ed2af1222100e1210b5c55e767ca0e Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Thu, 27 Aug 2026 02:06:09 +0530
Subject: [PATCH 253/298] [v7.1.0-preview3] Release Notes (#4565)

* Add release notes for 7.1.0-preview3

Adds release notes for Microsoft.Data.SqlClient 7.1.0-preview3 and its
four aligned companion packages, updates the per-version README index
tables, and adds the corresponding CHANGELOG entry.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: c7425f3e-f6b8-439b-b74f-e25f8406fbf6

* Capture remaining closed 7.1.0-preview3 milestone items in release notes

Adds coverage for milestone items that closed after the initial draft:

- #4529 leaked-connection reclamation in ChannelDbConnectionPool
- #4535 SqlBulkCopy graph column alias mapping bypass
- #4521 / #4496 Entra ID tenant parsing for multi-segment STSURL authorities
- #4540 async key store provider APIs in the AzureKeyVaultProvider

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: c485150e-f46e-4c55-8d06-e0491a10e7e8

* Add #4439 and #4445 to 7.1.0-preview3 release notes

Both are user-facing fixes merged into the preview3 milestone that were
not yet captured in the release notes or CHANGELOG:

- #4439: DateOnly values in sql_variant TVP columns were sent as datetime
  instead of date, overflowing for values outside the datetime range.
- #4445: ServerCertificate pin validation was skipped when the platform
  reported no TLS policy errors, and an unloadable certificate file fell
  back to host-name validation instead of failing closed.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8c691319-4c66-40f6-a88e-b453937052f1

* Add #4474 to 7.1.0-preview3 cross-platform build notes

PR #4474 (Remove OS-Specific Builds) removed OS-specific build targets
and output paths, and rewrote the MDS nuspec to source a single
OS-agnostic assembly for both the win and unix runtime folders.

Verified the nuspec change is src-path-only: all 52 file entries have
identical target= values before and after, so the produced package
layout is unchanged.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8c691319-4c66-40f6-a88e-b453937052f1

* Clarify #4536 allocation fix applies to the default async read path

Addresses review feedback on PR #4565: the PacketData node-reuse fix is
not gated behind UseCompatibilityAsyncBehaviour or any other AppContext
switch, and the perf validation was measured on the default path.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8c691319-4c66-40f6-a88e-b453937052f1

* Scope preview3 release notes to customer-facing changes

Remove entries with no customer-visible effect, and reframe entries that
led with implementation detail rather than customer impact.

Removed:
- #3862 ConnectionCapabilities consolidation - internal refactor; the
  GetSchema("DataTypes") fix it enables is deferred to a later PR.
- #3700/#3741 SSRP scaffolding - adds no parsing code and no behavior change.
- #4517 CodeQL findings - PKCS#1 half is suppression comments for declared
  false positives; the SHA-1 removal is a no-op in practice.
- #4421 Extensions.Azure APIScan remediation - no public API change and
  managed-identity behavior preserved exactly; the removed assignment was
  already a no-op. Extensions.Azure now has no Changed section.

Promoted:
- #4504 counter fixes moved from a pool V2 sub-bullet into Fixed. These
  affect the default pool that customers use without opting in, and the
  previous text understated them as two fixes limited to Count.

Reframed:
- Cross-platform build collapsed to the one customer-visible outcome
  (trimming on Linux/macOS); package contents were always unchanged.
- #4528 now leads with the allocation regression rather than call-site count.
- AKV cache fixes now lead with symptoms (unbounded signature cache growth,
  duplicate CryptographyClient per key) rather than GetOrCreate/GetOrAdd.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8c691319-4c66-40f6-a88e-b453937052f1

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: c7425f3e-f6b8-439b-b74f-e25f8406fbf6
Copilot-Session: c485150e-f46e-4c55-8d06-e0491a10e7e8
Copilot-Session: 8c691319-4c66-40f6-a88e-b453937052f1
---
 CHANGELOG.md                                  |  95 +++++++++++
 release-notes/7.1/7.1.0-preview3.md           | 161 ++++++++++++++++++
 release-notes/7.1/README.md                   |   1 +
 .../Abstractions/7.1/7.1.0-preview3.md        |  19 +++
 .../Extensions/Abstractions/7.1/README.md     |   1 +
 .../Extensions/Azure/7.1/7.1.0-preview3.md    |  39 +++++
 release-notes/Extensions/Azure/7.1/README.md  |   1 +
 .../Internal/Logging/7.1/7.1.0-preview3.md    |  22 +++
 release-notes/Internal/Logging/7.1/README.md  |   1 +
 .../7.1/7.1.0-preview3.md                     |  49 ++++++
 .../AzureKeyVaultProvider/7.1/README.md       |   1 +
 11 files changed, 390 insertions(+)
 create mode 100644 release-notes/7.1/7.1.0-preview3.md
 create mode 100644 release-notes/Extensions/Abstractions/7.1/7.1.0-preview3.md
 create mode 100644 release-notes/Extensions/Azure/7.1/7.1.0-preview3.md
 create mode 100644 release-notes/Internal/Logging/7.1/7.1.0-preview3.md
 create mode 100644 release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview3.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f15b44925..dd60021553 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,101 @@ 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).
 
+## [Preview Release 7.1.0-preview3] - 2026-08-26
+
+This update brings the following changes since the [7.1.0-preview2](release-notes/7.1/7.1.0-preview2.md) release.
+See the [full release notes](release-notes/7.1/7.1.0-preview3.md) for detailed descriptions.
+
+> **Important — package version alignment:** Starting with the [7.0.2](release-notes/7.0/7.0.2.md) release, the `Microsoft.Data.SqlClient` driver and its companion packages share a single aligned version. Preview 3 of the `7.1` line continues this alignment; the following packages now ship together as `7.1.0-preview3`:
+>
+> - `Microsoft.Data.SqlClient`
+> - `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
+> - `Microsoft.Data.SqlClient.Extensions.Azure`
+> - `Microsoft.Data.SqlClient.Extensions.Abstractions`
+> - `Microsoft.Data.SqlClient.Internal.Logging`
+>
+> (`Microsoft.SqlServer.Server` continues to version independently and remains at `1.0.0`.)
+>
+> Applications that reference `Microsoft.Data.SqlClient.Extensions.Azure` must upgrade it to `7.1.0-preview3` when upgrading `Microsoft.Data.SqlClient` to `7.1.0-preview3`.
+>
+> **Compatibility guarantee:** All aligned assemblies ship with `FileVersion 7.1.0.x` and `AssemblyVersion 7.0.0.0`. The `AssemblyVersion` is unchanged from [7.0.2](release-notes/7.0/7.0.2.md), so upgrading from `7.0.2` to `7.1.0-preview3` does **not** require any new .NET Framework strong-name binding redirects.
+
+### Added
+
+- Added four `virtual` asynchronous counterparts to the synchronous methods on `SqlColumnEncryptionKeyStoreProvider` — `DecryptColumnEncryptionKeyAsync`, `EncryptColumnEncryptionKeyAsync`, `SignColumnMasterKeyMetadataAsync`, and `VerifyColumnMasterKeyMetadataAsync` — each accepting an optional `CancellationToken`. The default implementations delegate to the existing synchronous methods, so existing custom providers are unaffected. These APIs are introduced for provider authors but are not consumed by the driver yet; a future release will enable their use from the driver's own asynchronous APIs.
+  ([#3673](https://github.com/dotnet/SqlClient/pull/3673))
+
+- Implemented those four asynchronous APIs in `SqlColumnEncryptionAzureKeyVaultProvider`, calling the Azure SDK's own asynchronous methods and flowing the supplied `CancellationToken`. Concurrent cache misses for the same key are gated so a burst of callers issues a single Key Vault request. See the [AKV release notes](release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview3.md) for the `VerifyColumnMasterKeyMetadata` signature-validation behavior change and the 7.1 runtime requirement.
+  ([#4540](https://github.com/dotnet/SqlClient/pull/4540))
+
+- Substantially expanded `ChannelDbConnectionPool` (the opt-in pool behind `Switch.Microsoft.Data.SqlClient.UseConnectionPoolV2`) to parity with the default pool: transaction support, broken-connection replacement, leaked-connection reclamation, background warmup and replenishment to `Min Pool Size`, idle pruning driven by `Connection Idle Timeout`, optional connection-creation rate limiting, and metrics/tracing parity. Default pooling behavior is unchanged.
+  ([#4395](https://github.com/dotnet/SqlClient/pull/4395),
+   [#4396](https://github.com/dotnet/SqlClient/pull/4396),
+   [#4429](https://github.com/dotnet/SqlClient/pull/4429),
+   [#4452](https://github.com/dotnet/SqlClient/pull/4452),
+   [#4463](https://github.com/dotnet/SqlClient/pull/4463),
+   [#4487](https://github.com/dotnet/SqlClient/pull/4487),
+   [#4504](https://github.com/dotnet/SqlClient/pull/4504),
+   [#4529](https://github.com/dotnet/SqlClient/pull/4529))
+
+### Changed
+
+- The driver now builds a single cross-platform assembly. Package structure and contents are unchanged, and Windows-only native SNI types now trim cleanly on Linux and macOS.
+  ([#4207](https://github.com/dotnet/SqlClient/pull/4207),
+   [#4465](https://github.com/dotnet/SqlClient/pull/4465),
+   [#4474](https://github.com/dotnet/SqlClient/pull/4474))
+
+- Reduced managed allocations in the async read path by restoring reuse of `PacketData` nodes via a bounded free list on `StateSnapshot`. This applies to the default async read path and is not gated behind any AppContext switch.
+  ([#4536](https://github.com/dotnet/SqlClient/pull/4536))
+
+- Operations no longer allocate a formatted trace string when `SqlClientEventSource` tracing is disabled, recovering a memory regression against the 6.1.6 baseline. Trace output with tracing enabled is unchanged.
+  ([#4528](https://github.com/dotnet/SqlClient/pull/4528))
+
+- Updated centrally managed dependency versions for the `net9.0` target framework to `9.0.18`, and added `System.Threading.RateLimiting` to the packaged dependency metadata. Non-`net9.0` targets keep their existing `8.0.x` pins.
+  ([#4507](https://github.com/dotnet/SqlClient/pull/4507))
+
+- Updated the `Microsoft.Data.SqlClient.SNI` and `Microsoft.Data.SqlClient.SNI.runtime` dependencies to `7.1.0-preview3.26226.3`.
+  ([#4564](https://github.com/dotnet/SqlClient/pull/4564))
+
+- Bypassed SQL Graph column alias mapping in `SqlBulkCopy` when neither the source nor destination table contains graph pseudo-columns, recovering a bulk copy performance regression. Graph table bulk copy behavior is unchanged.
+  ([#4535](https://github.com/dotnet/SqlClient/pull/4535))
+
+- Re-shipped `Microsoft.Data.SqlClient.Extensions.Azure` as `7.1.0-preview3`, fixing Entra ID tenant parsing for multi-segment authorities. See [release notes](release-notes/Extensions/Azure/7.1/7.1.0-preview3.md).
+
+- Re-shipped `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` as `7.1.0-preview3` with new asynchronous key store provider APIs, and `Microsoft.Data.SqlClient.Extensions.Abstractions` and `Microsoft.Data.SqlClient.Internal.Logging` as `7.1.0-preview3` (version alignment only, no functional changes). See release notes for [AKV](release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview3.md), [Abstractions](release-notes/Extensions/Abstractions/7.1/7.1.0-preview3.md), and [Logging](release-notes/Internal/Logging/7.1/7.1.0-preview3.md).
+
+### Fixed
+
+- Fixed Always Encrypted VSM/HGS enclave attestation not verifying that the enclave public key used to establish the session matches the key committed to by the signed attestation report.
+  ([#4532](https://github.com/dotnet/SqlClient/pull/4532))
+
+- Fixed a `SqlConnectionFactory` timer that woke the process every 30 seconds for the lifetime of the application even when no connection pools existed, including with `Pooling=False` and after `ClearAllPools()`.
+  ([#4479](https://github.com/dotnet/SqlClient/pull/4479))
+
+- Fixed connection pool performance counter defects affecting the default pool as well as pool V2. `active-soft-connects` and `number-of-active-connections` could go negative after a failed connection activation, and several gauges drifted upward permanently after a broken connection was replaced.
+  ([#4504](https://github.com/dotnet/SqlClient/pull/4504))
+
+- Fixed `OverflowException` when sending large `decimal` values as a parameter with explicit `Precision` and `Scale`, which primarily affected Always Encrypted scenarios.
+  ([#4443](https://github.com/dotnet/SqlClient/pull/4443))
+
+- Fixed a TDS stream error when passing a `DateOnly` value as a parameter with `SqlDbType.Variant`.
+  ([#4294](https://github.com/dotnet/SqlClient/pull/4294))
+
+- Fixed `DateOnly` values written to a `sql_variant` column of a table-valued parameter being sent as `datetime` instead of `date`, which also caused an overflow for values out of `datetime` range.
+  ([#4439](https://github.com/dotnet/SqlClient/pull/4439))
+
+- Fixed the `ServerCertificate` connection-string keyword not being honored when the platform reported no TLS policy errors, and made an unloadable certificate file fail closed instead of silently falling back to host-name validation.
+  ([#4445](https://github.com/dotnet/SqlClient/pull/4445))
+
+- Fixed `SqlConnection.AccessTokenCallback` not disabling Transparent Network IP Resolution by default, unlike `SqlConnection.AccessToken`, along with a related connection pool key defect.
+  ([#4520](https://github.com/dotnet/SqlClient/pull/4520))
+
+- Fixed several async entry points in `SqlBulkCopy`, `SqlDataReader`, and `SqlCommand` that captured fatal exceptions such as `OutOfMemoryException` into faulted `Task`s instead of letting them propagate.
+  ([#4437](https://github.com/dotnet/SqlClient/pull/4437))
+
+- Fixed `Authentication=Active Directory Service Principal` (and the other Entra ID flows) failing against endpoints that return a multi-segment authority such as the Dataverse / Dynamics 365 TDS endpoint; the tenant id is now taken from the first path segment of the STSURL authority instead of the last. Ships in `Microsoft.Data.SqlClient.Extensions.Azure`.
+  ([#4521](https://github.com/dotnet/SqlClient/pull/4521))
+
 ## [Preview Release 7.1.0-preview2] - 2026-07-09
 
 This update brings the following changes since the [7.1.0-preview1](release-notes/7.1/7.1.0-preview1.md) release.
diff --git a/release-notes/7.1/7.1.0-preview3.md b/release-notes/7.1/7.1.0-preview3.md
new file mode 100644
index 0000000000..69dfd88bde
--- /dev/null
+++ b/release-notes/7.1/7.1.0-preview3.md
@@ -0,0 +1,161 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview3 - 2026-08-26
+
+This update brings the following changes since the [7.1.0-preview2](7.1.0-preview2.md) release:
+
+> **Important — package version alignment:** Starting with the [7.0.2](../7.0/7.0.2.md) release, the `Microsoft.Data.SqlClient` driver and its companion packages share a single aligned version. Preview 3 of the `7.1` line continues this alignment; the following packages ship together as `7.1.0-preview3`:
+>
+> - `Microsoft.Data.SqlClient`
+> - `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
+> - `Microsoft.Data.SqlClient.Extensions.Azure`
+> - `Microsoft.Data.SqlClient.Extensions.Abstractions`
+> - `Microsoft.Data.SqlClient.Internal.Logging`
+>
+> (`Microsoft.SqlServer.Server` continues to version independently and remains at `1.0.0`.)
+>
+> Applications must reference the same versions of `Microsoft.Data.SqlClient` and its extensions for best compatibility. In particular, applications that reference `Microsoft.Data.SqlClient.Extensions.Azure` must upgrade it to `7.1.0-preview3` when upgrading `Microsoft.Data.SqlClient` to `7.1.0-preview3`.
+>
+> **Compatibility guarantee:** All aligned assemblies ship with `FileVersion 7.1.0.x` and `AssemblyVersion 7.0.0.0`. The `AssemblyVersion` is unchanged from [7.0.2](../7.0/7.0.2.md), so upgrading from `7.0.2` to `7.1.0-preview3` does **not** require any new .NET Framework strong-name binding redirects.
+
+### Added
+
+#### Asynchronous Key Store Provider APIs for Always Encrypted
+
+*What Changed:*
+
+- Added four `virtual` asynchronous counterparts to the existing synchronous methods on the `SqlColumnEncryptionKeyStoreProvider` abstract base class: `DecryptColumnEncryptionKeyAsync`, `EncryptColumnEncryptionKeyAsync`, `SignColumnMasterKeyMetadataAsync`, and `VerifyColumnMasterKeyMetadataAsync`. Each takes an optional `CancellationToken`. The default implementations delegate to the existing synchronous methods, so providers that do not override them continue to work unchanged.
+  ([#3672](https://github.com/dotnet/SqlClient/issues/3672), [#3673](https://github.com/dotnet/SqlClient/pull/3673))
+
+*Who Benefits:*
+
+- Authors of custom column encryption key store providers — particularly those backed by network-bound key stores such as HSMs or cloud key vaults — can now implement genuinely asynchronous key operations, and callers that resolve column encryption keys directly through a provider can await them instead of blocking a thread on synchronous I/O.
+
+*Impact:*
+
+- Purely additive. Because the new methods are `virtual` with a synchronous fallback, existing providers compile and run without modification.
+- **Introduced, but not yet consumed by the driver.** These APIs are added to the public surface in this release so that provider authors can begin implementing them, but `Microsoft.Data.SqlClient` does not call them yet — the driver's own column encryption key resolution path (`SqlSecurityUtility`) still invokes the synchronous provider methods on both the synchronous and asynchronous command paths. Overriding the asynchronous methods therefore does not by itself remove blocking key-store I/O from `ExecuteReaderAsync` and friends. **A future release will enable their use from the driver's own asynchronous APIs.**
+- The in-box `SqlColumnEncryptionAzureKeyVaultProvider` overrides all four methods in this release. See the [AzureKeyVaultProvider 7.1.0-preview3](../add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview3.md) release notes. ([#4540](https://github.com/dotnet/SqlClient/pull/4540))
+
+#### Connection Pool V2 Feature Completeness
+
+*What Changed:*
+
+- Substantially expanded `ChannelDbConnectionPool`, the opt-in pool implementation gated behind the `Switch.Microsoft.Data.SqlClient.UseConnectionPoolV2` AppContext switch, bringing it to parity with the default `WaitHandleDbConnectionPool`:
+  - **Transaction support** — implemented `PutObjectFromTransactedPool` and `TransactionEnded` (previously `NotImplementedException`), and reworked connection return to mirror the reference pool's deactivate-then-route behavior. ([#4487](https://github.com/dotnet/SqlClient/pull/4487))
+  - **Connection replacement** — implemented replacement of broken connections during command execution, with atomic slot replacement in `ConnectionPoolSlots`. ([#4429](https://github.com/dotnet/SqlClient/pull/4429))
+  - **Background warmup and replenishment** — the pool now pre-creates connections up to `Min Pool Size` on startup and replenishes automatically whenever it drops below the minimum. ([#4452](https://github.com/dotnet/SqlClient/pull/4452))
+  - **Idle pruning** — the pruning window is now derived from the `Connection Idle Timeout` value rather than a hard-coded interval. Defaults are unchanged. ([#4463](https://github.com/dotnet/SqlClient/pull/4463))
+  - **Connection-creation rate limiting** — an optional `ConcurrencyLimiter` can throttle new physical connection creation; when a permit is denied the caller waits for an existing connection instead of forcing another open. ([#4395](https://github.com/dotnet/SqlClient/pull/4395), [#4396](https://github.com/dotnet/SqlClient/pull/4396))
+  - **Leaked connection reclamation** — the pool now reclaims leaked connections (connections whose owning `SqlConnection` was garbage collected without being closed) both inline on the requesting thread and, while callers are waiting, from a demand-driven `PoolReclaimer` timer. The `number-of-reclaimed-connections` counter, which previously always read zero under pool V2, is now emitted. ([#4529](https://github.com/dotnet/SqlClient/pull/4529))
+  - **Metrics and tracing parity** — the pool now emits the same pooled/free connection and soft/hard connect/disconnect counters as the default pool, and traces at comparable fidelity. ([#4504](https://github.com/dotnet/SqlClient/pull/4504))
+
+*Who Benefits:*
+
+- Applications evaluating the V2 connection pool can now exercise transaction-enlisted workloads, broken-connection recovery, leaked-connection reclamation, and pool warmup, and can observe the pool through the existing performance counters and EventSource traces.
+
+*Impact:*
+
+- No change to default behavior. `ChannelDbConnectionPool` is used only when `Switch.Microsoft.Data.SqlClient.UseConnectionPoolV2` is enabled; the default pool remains `WaitHandleDbConnectionPool`.
+- This work also surfaced connection pool performance counter defects that affect the **default** pool, which are listed under *Fixed* below.
+
+### Changed
+
+- Windows-only native SNI types are now removed cleanly by the IL trimmer on Linux and macOS, and `LocalAppContextSwitches.UseManagedNetworking` is now substituted for a constant (an `ILLink.Substitutions.xml` naming defect previously prevented this). The driver now builds a single OS-agnostic assembly for all platforms; the structure and contents of the NuGet package are unchanged. ([#4207](https://github.com/dotnet/SqlClient/pull/4207), [#4239](https://github.com/dotnet/SqlClient/issues/4239), [#4465](https://github.com/dotnet/SqlClient/pull/4465), [#4474](https://github.com/dotnet/SqlClient/pull/4474))
+- Reduced managed allocations in the async read path by restoring reuse of `PacketData` linked-list nodes via a bounded free list on `StateSnapshot`, recovering an allocation regression against the 6.1.6 baseline. This applies to the default async read path and is not gated behind any AppContext switch; `SqlCommand/ExecuteReaderAsync` returns from +120.9% allocated against the 6.1.6 baseline to +0.1%. ([#4536](https://github.com/dotnet/SqlClient/pull/4536))
+- `SqlBulkCopy` no longer builds SQL Graph column alias mapping tables when the source and destination tables contain no graph pseudo-columns (`$edge_id`, `$to_id`, `$from_id`, `$node_id`), recovering a bulk copy performance regression introduced with graph column alias support in [#3677](https://github.com/dotnet/SqlClient/pull/3677). Graph table bulk copy behavior is unchanged. ([#4535](https://github.com/dotnet/SqlClient/pull/4535))
+- Operations no longer allocate a formatted trace string when `SqlClientEventSource` tracing is disabled, recovering a memory regression against the 6.1.6 baseline. Trace output with tracing enabled is unchanged. ([#4528](https://github.com/dotnet/SqlClient/pull/4528))
+- Updated centrally managed dependency versions for the `net9.0` target framework to `9.0.18`, and added `System.Threading.RateLimiting` to the packaged dependency metadata. Non-`net9.0` targets keep their existing `8.0.x` pins. ([#4507](https://github.com/dotnet/SqlClient/pull/4507))
+- Updated the `Microsoft.Data.SqlClient.SNI` and `Microsoft.Data.SqlClient.SNI.runtime` dependencies to `7.1.0-preview3.26226.3`. ([#4564](https://github.com/dotnet/SqlClient/pull/4564))
+
+### Fixed
+
+- Fixed Always Encrypted VSM/HGS enclave attestation not verifying that the enclave public key used to establish the session matches the key committed to by the signed attestation report. The provider now compares `SHA-256(enclave public key)` against the report's `EnclaveData` using a fixed-time comparison, and rejects attestation when the data is missing, malformed, or mismatched. ([#4532](https://github.com/dotnet/SqlClient/pull/4532))
+- Fixed a `SqlConnectionFactory` timer that woke the process every 30 seconds for the lifetime of the application even when no connection pools existed — including with `Pooling=False` and after `ClearAllPools()`. The pruning timer is now armed on demand and disarmed once there is nothing left to prune. A missing .NET Framework unload hook was also added. ([#1881](https://github.com/dotnet/SqlClient/issues/1881), [#4479](https://github.com/dotnet/SqlClient/pull/4479))
+- Fixed connection pool performance counter defects affecting the **default** pool as well as pool V2. `active-soft-connects` and `number-of-active-connections` could go negative after a failed connection activation, and `active-soft-connects`, `active-hard-connections`, and `number-of-pooled-connections` drifted upward permanently after a broken connection was replaced. Because these are gauges, an unmatched increment or decrement never recovered for the lifetime of the process. ([#4504](https://github.com/dotnet/SqlClient/pull/4504))
+- Fixed `OverflowException` when sending large `decimal` values (for example `decimal.MaxValue`) as a parameter with explicit `Precision` and `Scale`, which primarily affected Always Encrypted scenarios where both must always be set. ([#1655](https://github.com/dotnet/SqlClient/issues/1655), [#4443](https://github.com/dotnet/SqlClient/pull/4443))
+- Fixed a TDS stream error when passing a `DateOnly` value as a parameter with `SqlDbType.Variant`; the required `sql_variant` write paths were missing. (net8.0/net9.0 only) ([#3953](https://github.com/dotnet/SqlClient/issues/3953), [#4294](https://github.com/dotnet/SqlClient/pull/4294))
+- Fixed `DateOnly` values written to a `sql_variant` column of a table-valued parameter being sent as `datetime` instead of `date`. Besides being incorrect, this caused an overflow for `DateOnly` values that are valid for `date` but out of range for `datetime`. Reading continues to return `DateTime` instances by default, for backwards compatibility. (net8.0/net9.0 only — .NET Framework has no `DateOnly` type) ([#3934](https://github.com/dotnet/SqlClient/issues/3934), [#4439](https://github.com/dotnet/SqlClient/pull/4439))
+- Fixed the `ServerCertificate` connection-string keyword not being honored when the platform reported no TLS policy errors. The configured certificate is now always compared against the certificate presented by the server, matching the documented exact-match semantic. If the configured file cannot be loaded or parsed, the connection now fails closed with an `SSLCertificateAuthenticationException` naming the path, rather than silently falling back to host-name validation. A null server certificate now throws `AuthenticationException` instead of `NullReferenceException`. Connections that do not set `ServerCertificate`, and those whose configured certificate matches, are unaffected. ([#4445](https://github.com/dotnet/SqlClient/pull/4445))
+- Fixed `SqlConnection.AccessTokenCallback` not disabling Transparent Network IP Resolution by default, unlike `SqlConnection.AccessToken`. Also fixed a related defect in how the authentication setters build the connection pool key, and made `SspiContextProvider` mutually exclusive with token-based authentication. (net462 only for the TNIR behavior) ([#4520](https://github.com/dotnet/SqlClient/pull/4520))
+- Fixed several async entry points in `SqlBulkCopy`, `SqlDataReader.InvokeAsyncCall`, `SqlCommand.Reader`, and `SqlCommand.Xml` that captured fatal exceptions such as `OutOfMemoryException` into faulted `Task`s instead of letting them propagate. ([#4437](https://github.com/dotnet/SqlClient/pull/4437))
+- Fixed `Authentication=Active Directory Service Principal` (and the interactive, password, integrated, and device-code flows) failing against endpoints such as the Dataverse / Dynamics 365 TDS endpoint, which return a multi-segment Entra ID authority (`https://login.microsoftonline.com/{tenantId}/oauth2/authorize`) in the TDS `FEDAUTHINFO` token. The tenant id is now taken from the first path segment of the authority instead of the last. This fix ships in `Microsoft.Data.SqlClient.Extensions.Azure`; see its [7.1.0-preview3](../Extensions/Azure/7.1/7.1.0-preview3.md) release notes. ([#4496](https://github.com/dotnet/SqlClient/issues/4496), [#4521](https://github.com/dotnet/SqlClient/pull/4521))
+### Companion package release notes
+
+- [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 7.1.0-preview3](../add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview3.md)
+- [Microsoft.Data.SqlClient.Extensions.Azure 7.1.0-preview3](../Extensions/Azure/7.1/7.1.0-preview3.md)
+- [Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview3](../Extensions/Abstractions/7.1/7.1.0-preview3.md)
+- [Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview3](../Internal/Logging/7.1/7.1.0-preview3.md)
+
+## Target Platform Support
+
+- .NET Framework 4.6.2+ (Windows x86, Windows x64, Windows ARM64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM, Windows ARM64, Linux, macOS)
+
+### Dependencies
+
+#### .NET 9.0
+
+- Microsoft.Bcl.Cryptography 9.0.18
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview3
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview3
+- Microsoft.Data.SqlClient.SNI.runtime 7.1.0-preview3.26226.3
+- Microsoft.Extensions.Caching.Memory 9.0.18
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.18
+- System.Security.Cryptography.Pkcs 9.0.18
+- System.Threading.RateLimiting 9.0.18
+
+#### .NET 8.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview3
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview3
+- Microsoft.Data.SqlClient.SNI.runtime 7.1.0-preview3.26226.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Threading.RateLimiting 8.0.0
+
+#### .NET Standard 2.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Bcl.TimeProvider 8.0.1
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview3
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview3
+- Microsoft.Data.SqlClient.SNI.runtime 7.1.0-preview3.26226.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+- System.Threading.RateLimiting 8.0.0
+
+#### .NET Framework 4.6.2+
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Bcl.TimeProvider 8.0.1
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview3
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview3
+- Microsoft.Data.SqlClient.SNI 7.1.0-preview3.26226.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- System.Buffers 4.6.1
+- System.Data.Common 4.3.0
+- System.Diagnostics.DiagnosticSource 10.0.3
+- System.Memory 4.6.3
+- System.Runtime.InteropServices.RuntimeInformation 4.3.0
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+- System.Threading.RateLimiting 8.0.0
+- System.ValueTuple 4.6.2
diff --git a/release-notes/7.1/README.md b/release-notes/7.1/README.md
index 843ba62b36..0b7de8156d 100644
--- a/release-notes/7.1/README.md
+++ b/release-notes/7.1/README.md
@@ -6,3 +6,4 @@ The following Microsoft.Data.SqlClient 7.1 releases have been shipped:
 |:-------------|:---------------|:----------------------------------:|
 | 2026-04-29   | 7.1.0-preview1 | [Release Notes](7.1.0-preview1.md) |
 | 2026-07-09   | 7.1.0-preview2 | [Release Notes](7.1.0-preview2.md) |
+| 2026-08-26   | 7.1.0-preview3 | [Release Notes](7.1.0-preview3.md) |
diff --git a/release-notes/Extensions/Abstractions/7.1/7.1.0-preview3.md b/release-notes/Extensions/Abstractions/7.1/7.1.0-preview3.md
new file mode 100644
index 0000000000..c76a2af5f7
--- /dev/null
+++ b/release-notes/Extensions/Abstractions/7.1/7.1.0-preview3.md
@@ -0,0 +1,19 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview3 - 2026-08-26
+
+This release continues version-alignment of `Microsoft.Data.SqlClient.Extensions.Abstractions` with the core `Microsoft.Data.SqlClient` driver version (`7.1.0-preview3`). The previous release of this package was [7.1.0-preview2](7.1.0-preview2.md).
+
+There are no functional or API changes in this release. See the core [Microsoft.Data.SqlClient 7.1.0-preview3](../../../7.1/7.1.0-preview3.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** This package's version continues to track the core `Microsoft.Data.SqlClient` driver version. See the [7.0.2 release notes](../../../7.0/7.0.2.md) for the initial alignment announcement. This assembly ships with `FileVersion 7.1.0.x`. The `AssemblyVersion 7.0.0.0` remains unchanged from the `7.0.2` release.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview3
diff --git a/release-notes/Extensions/Abstractions/7.1/README.md b/release-notes/Extensions/Abstractions/7.1/README.md
index 133eb71b32..9d1374bdb6 100644
--- a/release-notes/Extensions/Abstractions/7.1/README.md
+++ b/release-notes/Extensions/Abstractions/7.1/README.md
@@ -6,3 +6,4 @@ The following `Microsoft.Data.SqlClient.Extensions.Abstractions`
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
 | 2026-07-09 | 7.1.0-preview2 | [Release Notes](7.1.0-preview2.md) |
+| 2026-08-26 | 7.1.0-preview3 | [Release Notes](7.1.0-preview3.md) |
diff --git a/release-notes/Extensions/Azure/7.1/7.1.0-preview3.md b/release-notes/Extensions/Azure/7.1/7.1.0-preview3.md
new file mode 100644
index 0000000000..c7fb0b952f
--- /dev/null
+++ b/release-notes/Extensions/Azure/7.1/7.1.0-preview3.md
@@ -0,0 +1,39 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview3 - 2026-08-26
+
+This release fixes Entra ID tenant parsing for multi-segment authorities, and continues version-alignment of `Microsoft.Data.SqlClient.Extensions.Azure` with the core `Microsoft.Data.SqlClient` driver version (`7.1.0-preview3`). The previous release of this package was [7.1.0-preview2](7.1.0-preview2.md). See the core [Microsoft.Data.SqlClient 7.1.0-preview3](../../../7.1/7.1.0-preview3.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** This package's version continues to track the core `Microsoft.Data.SqlClient` driver version. See the [7.0.2 release notes](../../../7.0/7.0.2.md) for the initial alignment announcement. This assembly ships with `FileVersion 7.1.0.x`. The `AssemblyVersion 7.0.0.0` remains unchanged from the `7.0.2` release.
+
+### Fixed
+
+- Fixed Entra ID tenant parsing for multi-segment STSURL authorities. Endpoints such as the Dataverse / Dynamics 365 TDS endpoint return an OAuth v1 style authority (`https://login.microsoftonline.com/{tenantId}/oauth2/authorize`) in the TDS `FEDAUTHINFO` token. `ActiveDirectoryAuthenticationProvider.AcquireTokenAsync` split that authority at the **last** `/`, so the credential received the literal string `"authorize"` as its tenant id and connections failed with `ClientSecretCredential authentication failed`. The tenant is now taken from the **first** path segment, so trailing endpoint suffixes (`/oauth2/authorize`, `/oauth2/v2.0/token`, ...) are ignored, and the normalized authority is used for the MSAL-based interactive, password, integrated, and device-code flows as well. An unparseable authority now raises a clear `AuthenticationException` naming the offending value, and provider-raised authentication errors are no longer re-wrapped as "Unexpected error". Behavior is unchanged for the bare `https://login.microsoftonline.com/{tenantId}` authority sent by Azure SQL, Fabric, and Synapse. There are no public API changes.
+  ([#4496](https://github.com/dotnet/SqlClient/issues/4496), [#4521](https://github.com/dotnet/SqlClient/pull/4521))
+
+## Target Platform Support
+
+- .NET Standard 2.0
+- .NET Framework 4.6.2+
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.51.1
+- Azure.Identity 1.18.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview3
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+
+#### .NET Framework 4.6.2+
+
+- Azure.Core 1.51.1
+- Azure.Identity 1.18.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.1.0-preview3
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
diff --git a/release-notes/Extensions/Azure/7.1/README.md b/release-notes/Extensions/Azure/7.1/README.md
index 3acdf3d45c..b3f93b7931 100644
--- a/release-notes/Extensions/Azure/7.1/README.md
+++ b/release-notes/Extensions/Azure/7.1/README.md
@@ -6,3 +6,4 @@ The following `Microsoft.Data.SqlClient.Extensions.Azure`
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
 | 2026-07-09 | 7.1.0-preview2 | [Release Notes](7.1.0-preview2.md) |
+| 2026-08-26 | 7.1.0-preview3 | [Release Notes](7.1.0-preview3.md) |
diff --git a/release-notes/Internal/Logging/7.1/7.1.0-preview3.md b/release-notes/Internal/Logging/7.1/7.1.0-preview3.md
new file mode 100644
index 0000000000..0c434cb632
--- /dev/null
+++ b/release-notes/Internal/Logging/7.1/7.1.0-preview3.md
@@ -0,0 +1,22 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview3 - 2026-08-26
+
+> **Note:** This package is for internal use by other Microsoft.Data.SqlClient packages only
+> and should not be referenced directly by application code.
+
+This release continues version-alignment of `Microsoft.Data.SqlClient.Internal.Logging` with the core `Microsoft.Data.SqlClient` driver version (`7.1.0-preview3`). The previous release of this package was [7.1.0-preview2](7.1.0-preview2.md).
+
+There are no functional or API changes in this release. See the core [Microsoft.Data.SqlClient 7.1.0-preview3](../../../7.1/7.1.0-preview3.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** This package's version continues to track the core `Microsoft.Data.SqlClient` driver version. See the [7.0.2 release notes](../../../7.0/7.0.2.md) for the initial alignment announcement. This assembly ships with `FileVersion 7.1.0.x`. The `AssemblyVersion 7.0.0.0` remains unchanged from the `7.0.2` release.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- None
diff --git a/release-notes/Internal/Logging/7.1/README.md b/release-notes/Internal/Logging/7.1/README.md
index f0c0f8c274..25caeccaba 100644
--- a/release-notes/Internal/Logging/7.1/README.md
+++ b/release-notes/Internal/Logging/7.1/README.md
@@ -9,3 +9,4 @@ The following `Microsoft.Data.SqlClient.Internal.Logging`
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
 | 2026-07-09 | 7.1.0-preview2 | [Release Notes](7.1.0-preview2.md) |
+| 2026-08-26 | 7.1.0-preview3 | [Release Notes](7.1.0-preview3.md) |
diff --git a/release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview3.md b/release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview3.md
new file mode 100644
index 0000000000..4316a15dfc
--- /dev/null
+++ b/release-notes/add-ons/AzureKeyVaultProvider/7.1/7.1.0-preview3.md
@@ -0,0 +1,49 @@
+# Release Notes
+
+## Preview Release 7.1.0-preview3 - 2026-08-26
+
+This release adds asynchronous key store provider APIs and continues version-alignment of `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` with the core `Microsoft.Data.SqlClient` driver version (`7.1.0-preview3`). The previous release of this package was [7.1.0-preview2](7.1.0-preview2.md).
+
+See the core [Microsoft.Data.SqlClient 7.1.0-preview3](../../../7.1/7.1.0-preview3.md) release notes for the driver-family changes shipped alongside this version.
+
+> **Version alignment:** This package's version continues to track the core `Microsoft.Data.SqlClient` driver version. See the [7.0.2 release notes](../../../7.0/7.0.2.md) for the initial alignment announcement. This assembly ships with `FileVersion 7.1.0.x`. The `AssemblyVersion 7.0.0.0` remains unchanged from the `7.0.2` release.
+
+### Added
+
+#### Asynchronous key store provider APIs
+
+*What Changed:*
+
+- `SqlColumnEncryptionAzureKeyVaultProvider` now overrides the four asynchronous key store provider methods introduced on the base class in [#3673](https://github.com/dotnet/SqlClient/pull/3673): `EncryptColumnEncryptionKeyAsync`, `DecryptColumnEncryptionKeyAsync`, `SignColumnMasterKeyMetadataAsync`, and `VerifyColumnMasterKeyMetadataAsync`. These call the Azure SDK's own asynchronous methods and flow the supplied `CancellationToken` to them, rather than completing synchronous work on a returned task.
+- Concurrent cache misses for the same key are gated so a burst of callers issues a single Key Vault request. The gate is only ever awaited, so no thread blocks, and misses for different keys still proceed in parallel.
+  ([#4540](https://github.com/dotnet/SqlClient/pull/4540))
+
+*Who Benefits:*
+
+- Applications using Always Encrypted with Azure Key Vault can await column encryption key operations rather than blocking a thread pool thread on network-bound key vault I/O, when they call the provider directly.
+
+*Impact:*
+
+- No public API was removed or changed. The column encryption key and signature caches are shared between the synchronous and asynchronous paths, so a key resolved by one is visible to the other.
+- **Introduced, but not yet consumed by the driver.** `Microsoft.Data.SqlClient`'s own key resolution path still invokes the synchronous provider methods on both synchronous and asynchronous command execution, so these overrides do not by themselves make Always Encrypted query execution non-blocking. **A future release will enable their use from the driver's own asynchronous APIs.** See the core [7.1.0-preview3](../../../7.1/7.1.0-preview3.md) release notes.
+- **Behavior change:** `VerifyColumnMasterKeyMetadata` and `VerifyColumnMasterKeyMetadataAsync` now reject a null or empty `signature` with `ArgumentNullException` / `ArgumentException` instead of passing it through to the Azure SDK. In-product callers are unaffected because `SqlSecurityUtility.VerifyColumnMasterKeySignature` already rejects those values upstream.
+- **Runtime requirement:** this version requires `Microsoft.Data.SqlClient` 7.1.0-preview3 or later at runtime, because the overridden methods only exist on the 7.1 base class. The NuGet dependency floor covers restore, but downgrading the driver below 7.1 at runtime produces a `TypeLoadException`, since assembly versions unify at `major.0.0.0`.
+
+### Fixed
+
+- Fixed the 2000-entry column master key signature cache being able to stop compacting and grow unbounded. `LocalCache.GetOrCreate` compacted only when `Count == maxSize`, and under concurrency that equality test could be stepped past, permanently disabling compaction. It now compacts on `Count >= maxSize`. ([#4540](https://github.com/dotnet/SqlClient/pull/4540))
+- Fixed concurrent callers ending up with different `CryptographyClient` instances for the same key, which produced redundant clients and duplicated Key Vault handshakes. `GetCryptographyClient` now uses `GetOrAdd` instead of `TryGetValue` followed by `TryAdd`. ([#4540](https://github.com/dotnet/SqlClient/pull/4540))
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.51.1
+- Azure.Security.KeyVault.Keys 4.9.0
+- Microsoft.Data.SqlClient 7.1.0-preview3
+- Microsoft.Data.SqlClient.Internal.Logging 7.1.0-preview3
+- Microsoft.Extensions.Caching.Memory 8.0.1
diff --git a/release-notes/add-ons/AzureKeyVaultProvider/7.1/README.md b/release-notes/add-ons/AzureKeyVaultProvider/7.1/README.md
index 9fda87ae8f..07fffc069b 100644
--- a/release-notes/add-ons/AzureKeyVaultProvider/7.1/README.md
+++ b/release-notes/add-ons/AzureKeyVaultProvider/7.1/README.md
@@ -6,3 +6,4 @@ The following `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
 | 2026-07-09 | 7.1.0-preview2 | [Release Notes](7.1.0-preview2.md) |
+| 2026-08-26 | 7.1.0-preview3 | [Release Notes](7.1.0-preview3.md) |

From 22158732ffaa84fd52083ef7cd1f548332db245d Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Thu, 27 Aug 2026 22:08:26 +0530
Subject: [PATCH 254/298] Fix | Apply READ_COMMITTED_SNAPSHOT OFF automatically
 for Azure test DB (#4601)

* Fix | Apply READ_COMMITTED_SNAPSHOT OFF automatically for Azure test DB

createNorthwindAzureDb.sql carried the ALTER DATABASE ... SET
READ_COMMITTED_SNAPSHOT OFF statement commented out, behind a
"RUN THIS SCRIPT MANUALLY" header, because it required the database to
have no other connections. createNorthwindDb.sql applies the equivalent
settings unconditionally.

Azure SQL Database enables READ_COMMITTED_SNAPSHOT (RCSI) by default.
Under RCSI a READ COMMITTED reader returns the last committed row version
instead of blocking on an uncommitted writer, so transaction tests that
assert a lock timeout fail with "No exception was thrown". This surfaced
when a new Azure test database was provisioned and the manual step was
missed.

Make the statements live so a newly provisioned Azure database cannot
drift:

- Use WITH ROLLBACK IMMEDIATE, which removes the "no other connection
  should exist" caveat that made this a manual step.
- Target CURRENT instead of a hard-coded [Northwind], so the settings
  apply to whichever database is being provisioned.
- Also set ALLOW_SNAPSHOT_ISOLATION OFF, matching createNorthwindDb.sql.

Verified by re-running CI against a database with these settings applied
and unmodified test code: TransactionTest.TestMain went from 78 failures
(all on Azure legs) to 0.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 64c36c69-2ea8-44cb-8b82-2830a741b6ea

* Remove duplicated snapshot-isolation ALTER block

Addresses review feedback: the ALTER statements were accidentally
emitted twice. The second WITH ROLLBACK IMMEDIATE could terminate
sessions that reconnected after the first batch, repeating a disruptive
operation for no benefit.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 64c36c69-2ea8-44cb-8b82-2830a741b6ea

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 64c36c69-2ea8-44cb-8b82-2830a741b6ea
---
 TESTGUIDE.md                             |  4 +++-
 tools/testsql/createNorthwindAzureDb.sql | 22 ++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/TESTGUIDE.md b/TESTGUIDE.md
index 791d4a7bcc..c813db0345 100644
--- a/TESTGUIDE.md
+++ b/TESTGUIDE.md
@@ -184,7 +184,9 @@ For a basic local SQL Server run, prepare:
 - A SQL Server instance that the test machine can reach.
 - Shared Memory, TCP, and Named Pipes protocols enabled when testing local Windows SQL Server scenarios.
 - The `NORTHWIND` database created from [tools/testsql/createNorthwindDb.sql](tools/testsql/createNorthwindDb.sql). For
-  Azure SQL, use [tools/testsql/createNorthwindAzureDb.sql](tools/testsql/createNorthwindAzureDb.sql).
+  Azure SQL, use [tools/testsql/createNorthwindAzureDb.sql](tools/testsql/createNorthwindAzureDb.sql). Both scripts turn
+  `READ_COMMITTED_SNAPSHOT` and `ALLOW_SNAPSHOT_ISOLATION` off, which some transaction tests rely on. Azure SQL Database
+  enables `READ_COMMITTED_SNAPSHOT` by default, so run the script against the database rather than setting it up by hand.
 - The `UdtTestDb` database created from [tools/testsql/createUdtTestDb.sql](tools/testsql/createUdtTestDb.sql) if you
   want UDT tests to run.
 - A login or integrated-security principal with permissions to create and drop the temporary objects used by the tests.
diff --git a/tools/testsql/createNorthwindAzureDb.sql b/tools/testsql/createNorthwindAzureDb.sql
index 7ec22dfe65..8e7deaf27a 100644
--- a/tools/testsql/createNorthwindAzureDb.sql
+++ b/tools/testsql/createNorthwindAzureDb.sql
@@ -1,7 +1,21 @@
-/******* RUN THIS SCRIPT MANUALLY *******/
-/******* IN order to run below script no other connection should exist with Azure DB *******/
---ALTER DATABASE [Northwind] SET READ_COMMITTED_SNAPSHOT OFF 
---GO
+/*********************************************************************************/
+/*
+    Azure SQL Database enables READ_COMMITTED_SNAPSHOT (RCSI) by default, unlike
+    SQL Server. Under RCSI a READ COMMITTED reader returns the last committed row
+    version instead of blocking on an uncommitted writer, which silently changes
+    the behaviour tests depend on. Turn it off to match createNorthwindDb.sql.
+
+    WITH ROLLBACK IMMEDIATE terminates other sessions, so this no longer requires
+    the database to be free of connections.
+
+    CURRENT is used so the statements apply to whichever database is being
+    provisioned, rather than a hard-coded name.
+*/
+/*********************************************************************************/
+ALTER DATABASE CURRENT SET READ_COMMITTED_SNAPSHOT OFF WITH ROLLBACK IMMEDIATE;
+GO
+ALTER DATABASE CURRENT SET ALLOW_SNAPSHOT_ISOLATION OFF;
+GO
 /*********************************************************************************/
 
 ALTER DATABASE SCOPED CONFIGURATION SET MAXDOP = 0;

From 9449c98b10a30488c7cb8a6e24ddd2eb43e74558 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 31 Aug 2026 09:33:44 -0700
Subject: [PATCH 255/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4607)

Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com>
---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx    | 4 ++--
 src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx    | 4 ++--
 .../src/Resources/Strings.zh-Hans.resx                        | 4 ++--
 .../src/Resources/Strings.zh-Hant.resx                        | 4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index 4e20d68eeb..f85eda7d30 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -2137,10 +2137,10 @@
     <value>Certifikát poskytnutý serverem neodpovídá certifikátu poskytnutému možností ServerCertificate.</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>Soubor certifikátu určený možností 'ServerCertificate' se nepodařilo načíst ani parsovat: '{0}'.</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>Byla zadána možnost 'ServerCertificate', ale server nepředložil certifikát, který by s ním bylo možné porovnat.</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Neplatný pokus o získání třídy JsonDocument ve sloupci {0}. Třída JsonDocument se podporuje jenom pro sloupce typu json.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index 07aa2c6b3f..7dcd133277 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -2137,10 +2137,10 @@
     <value>Das vom Server bereitgestellte Zertifikat stimmt nicht mit dem Zertifikat überein, das über die ServerCertificate-Option bereitgestellt wurde.</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>Die mit der Option „ServerCertificate“ angegebene Zertifikatdatei konnte nicht geladen oder geparst werden: '{0}'.</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>Die Option „ServerCertificate“ wurde angegeben, aber der Server hat kein Zertifikat bereitgestellt, mit dem es verglichen werden kann.</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Ungültiger Versuch, „JsonDocument“ für Spalte „{0}“ abzurufen. „JsonDocument“ wird nur für Spalten vom Typ JSON unterstützt.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index 5d912814b4..3471a75894 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -2137,10 +2137,10 @@
     <value>El certificado proporcionado por el servidor no coincide con el certificado proporcionado por la opción ServerCertificate.</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>No se pudo cargar ni analizar el archivo de certificado especificado por la opción "ServerCertificate": "{0}".</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>Se especificó la opción 'ServerCertificate', pero el servidor no presentó un certificado que se pudiera comparar con él.</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Intento no válido de obtener JsonDocument en la columna '{0}'. JsonDocument solo se admite para columnas de tipo json.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index c0082ed5d8..d73673efbb 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -2137,10 +2137,10 @@
     <value>Le certificat fourni par le serveur ne correspond pas au certificat fourni par l’option ServerCertificate.</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>Le fichier de certificat spécifié par l’option « ServerCertificate » n’a pas pu être chargé ou analysé : « {0} ».</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>L’option « ServerCertificate » a été spécifiée, mais le serveur n’a présenté aucun certificat qui puisse être comparé à celui-ci.</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Tentative non valide d’obtention de JsonDocument sur la colonne « {0} ». JsonDocument est uniquement pris en charge pour les colonnes de type JSON.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 4708501a33..1e2e6764d5 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -2137,10 +2137,10 @@
     <value>Il certificato fornito dal server non corrisponde al certificato fornito dall'opzione ServerCertificate.</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>Non è possibile caricare o analizzare il file del certificato specificato dall'opzione 'ServerCertificate: '{0}'.</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>È stata specificata l'opzione 'ServerCertificate', ma il server non ha presentato un certificato confrontabile con essa.</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Tentativo non valido di ottenere JsonDocument nella colonna '{0}'. JsonDocument è supportato solo per colonne di tipo JSON.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index e6d556d6d3..6e762be388 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -2137,10 +2137,10 @@
     <value>サーバーによって提供された証明書が、ServerCertificate オプションで指定された証明書と一致しません。</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>'ServerCertificate' オプションで指定された証明書ファイルを読み込むことも解析することもできませんでした: '{0}'。</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>'ServerCertificate' オプションが指定されましたが、サーバーから、このオプションと照合できる証明書が提示されませんでした。</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>列 '{0}' で JsonDocument を取得しようとしましたが無効です。JsonDocument は json 型の列でのみサポートされています。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index 688a1bee60..ccca396df1 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -2137,10 +2137,10 @@
     <value>서버에서 제공하는 인증서가 ServerCertificate 옵션에서 제공하는 인증서와 일치하지 않습니다.</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>'ServerCertificate' 옵션으로 지정된 인증서 파일을 로드하거나 구문 분석할 수 없습니다. '{0}'.</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>'ServerCertificate' 옵션이 지정되었지만 서버에서 비교할 수 있는 인증서를 제공하지 않았습니다.</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>열 '{0}'의 JsonDocument를 가져오려는 시도가 잘못되었습니다. JsonDocument는 json 형식의 열에 대해서만 지원됩니다.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index d9656a1a8c..9a2f4e6f96 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -2137,10 +2137,10 @@
     <value>Certyfikat dostarczony przez serwer nie jest zgodny z certyfikatem dostarczonym przez opcję ServerCertificate.</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>Nie można załadować lub przeanalizować pliku certyfikatu określonego przez opcję „ServerCertificate”: „{0}”.</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>Określono opcję „ServerCertificate”, ale serwer nie przedstawia certyfikatu, który można porównać z nim.</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Nieprawidłowa próba pobrania pliku JsonDocument w kolumnie „{0}”. Obiekt JsonDocument jest obsługiwany tylko w przypadku kolumn typu JSON.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 581068d864..2e7593f6fd 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -2137,10 +2137,10 @@
     <value>O certificado fornecido pelo servidor não corresponde ao certificado fornecido pela opção ServerCertificate.</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>O arquivo de certificado especificado pela opção ''ServerCertificate'' não pôde ser carregado ou analisado: ''{0}''.</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>A opção ''ServerCertificate'' foi especificada, mas o servidor não apresentou um certificado que pudesse ser comparado com ele.</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Tentativa inválida de obter JsonDocument na coluna ''{0}''. Só há suporte para JsonDocument em colunas do tipo json.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 8b3cbff48a..17f0d5ba7e 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -2137,10 +2137,10 @@
     <value>Сертификат, предоставленный сервером, не совпадает с сертификатом, указанным в параметре ServerCertificate.</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>Не удалось загрузить или проанализировать файл сертификата, указанный параметром "ServerCertificate": "{0}".</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>Параметр "ServerCertificate" был указан, но сервер не представил сертификат, с которым можно было бы его сравнить.</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>Недопустимая попытка получить JsonDocument для столбца "{0}". JsonDocument поддерживается только для столбцов типа JSON.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index 650a21f087..f874f78401 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -2137,10 +2137,10 @@
     <value>Sunucu tarafından sağlanan sertifika, ServerCertificate seçeneği tarafından sağlanan sertifikayla eşleşmiyor.</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>'ServerCertificate' seçeneğiyle belirtilen sertifika dosyası yüklenemedi veya ayrıştırılamadı: '{0}'.</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>'ServerCertificate' seçeneği belirtildi, ancak sunucu bununla karşılaştırılabilecek bir sertifika sunmadı.</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>'{0}' sütununda JsonDocument alma denemesi geçersiz. JsonDocument yalnızca json türündeki sütunlar için desteklenir.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 77db610a7c..5a5ebe15a6 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -2137,10 +2137,10 @@
     <value>服务器提供的证书与 ServerCertificate 选项提供的证书不匹配。</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>无法加载或解析 "ServerCertificate" 选项指定的证书文件: "{0}"。</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>已指定 "ServerCertificate" 选项，但服务器未提供可与其比较的证书。</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>在列 ‘{0}’ 上获取 JsonDocument 的尝试无效。只有 json 类型的列支持 JsonDocument。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index f7d87d6908..9b0d8fd673 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -2137,10 +2137,10 @@
     <value>伺服器提供的憑證不符合 ServerCertificate 選項所提供的憑證。</value>
   </data>
   <data name="SQL_ServerCertificateFileLoadFailed" xml:space="preserve">
-    <value>The certificate file specified by the 'ServerCertificate' option could not be loaded or parsed: '{0}'.</value>
+    <value>無法載入或剖析 'ServerCertificate' 選項所指定的憑證檔案: '{0}'。</value>
   </data>
   <data name="SQL_ServerCertificateNotAvailable" xml:space="preserve">
-    <value>The 'ServerCertificate' option was specified, but the server did not present a certificate that could be compared against it.</value>
+    <value>已指定 'ServerCertificate' 選項，但伺服器未提供可與其比對的憑證。</value>
   </data>
   <data name="SQL_JsonDocumentNotSupportedOnColumnType" xml:space="preserve">
     <value>在資料行 '{0}' 上取得 JsonDocument 的嘗試無效。JsonDocument 僅支援 JSON 類型的資料行。</value>

From f9fb0c92598e8af8b2dabfdebdd168b6724a32f5 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 31 Aug 2026 20:23:55 -0300
Subject: [PATCH 256/298] Make code coverage artifact names unique per attempt
 (#4616)

---
 eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml b/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
index 95c0ac0f3c..e4e28d4803 100644
--- a/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
@@ -112,12 +112,13 @@ jobs:
           displayName: '[Debug] Show Disk Usage'
 
       # Publish the Cobertura XML coverage file as a pipeline artifact for
-      # debugging purposes.
+      # debugging purposes. Pipeline artifact names must be unique within a
+      # build, so include the attempt numbers to allow this job to be rerun.
       - task: PublishPipelineArtifact@1
         displayName: Publish Cobertura XML Artifact
         inputs:
           targetPath: $(workingDir)/merge
-          artifact: Cobertura Merge Results
+          artifact: Cobertura Merge Results $(System.StageAttempt)-$(System.JobAttempt)
 
       # Publish the Cobertura reports to the pipeline to be viewed in the Azure
       # DevOps pipeline run UI.

From 7a8d455f1208a0241401f4dd6ad4f1c644313b4b Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 1 Sep 2026 11:14:31 -0700
Subject: [PATCH 257/298] Deprecate TransparentNetworkIPResolution (#4576)

* Deprecate TransparentNetworkIPResolution

Partially implements #4494 (deprecation only; no default changes).

- Mark SqlConnectionStringBuilder.TransparentNetworkIPResolution obsolete
  in both the implementation and the reference assembly, pointing callers
  at MultiSubnetFailover and noting that TNIR is .NET Framework-only.
- Suppress the resulting obsolete warnings at the internal call sites in
  SqlConnectionStringBuilder and in tests that exercise the keyword.
- Document the deprecation in the SqlConnection and
  SqlConnectionStringBuilder doc snippets.

Connection string defaults are intentionally unchanged in this version:
TransparentNetworkIPResolution still defaults to true on .NET Framework
and MultiSubnetFailover still defaults to false. Flipping those defaults
and adding the associated compatibility switches is deferred.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review feedback: annotate CS0618 suppressions and use xref for ArgumentException

- Add the existing '// Obsolete properties' rationale comment to the two new
  CS0618 suppressions around TransparentNetworkIPResolution so the intent
  matches the neighbouring ConnectionReset suppressions.
- Use <xref:System.ArgumentException> instead of a backtick literal in the
  SqlConnection.xml keyword table, matching the file's existing convention.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 108f631b-430f-40a3-bd20-74f19527c192

* Suppress CS0618 for TNIR usages in SqlConnectionOptionsTest (net462)

The net462 legs failed to build with CS0618 because SqlConnectionOptionsTest
sets SqlConnectionStringBuilder.TransparentNetworkIPResolution in two
netfx-gated tests. These usages arrived on main after this branch was cut,
so they were missing the suppressions applied to the other test files.

Merged main into the branch so the build matches what CI compiles, and
wrapped both call sites in the same '#pragma warning disable 618' pattern
used elsewhere.

Verified locally by building net462 with -p:TargetOs=Windows_NT for the
UnitTests, FunctionalTests and ManualTests projects: all clean with 0
warnings. Confirmed the check is faithful by removing the pragmas and
reproducing the exact CS0618 errors CI reported.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 108f631b-430f-40a3-bd20-74f19527c192

* Fix indentation of TNIR assignment in SqlConnectionOptionsTest

The pragma-wrapped assignment lost its block-scope indentation, making it
inconsistent with the matching tnirInConnString block below. The diff
against main is now purely additive.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 108f631b-430f-40a3-bd20-74f19527c192

* Use xref for ArgumentException in TNIR keyword docs

Matches the convention used elsewhere in SqlConnection.xml so the type
reference stays linkable in generated docs.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 108f631b-430f-40a3-bd20-74f19527c192

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 108f631b-430f-40a3-bd20-74f19527c192
---
 doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml   | 2 +-
 .../SqlConnectionStringBuilder.xml                        | 3 +++
 .../ref/Microsoft.Data.SqlClient.cs                       | 1 +
 .../Data/SqlClient/SqlConnectionStringBuilder.cs          | 5 +++++
 .../Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs  | 4 ++++
 .../SimulatedServerTests/ConnectionFailoverTests.cs       | 8 ++++++++
 .../SimulatedServerTests/ConnectionRoutingTests.cs        | 4 ++++
 .../UnitTests/SimulatedServerTests/ConnectionTests.cs     | 8 ++++++++
 .../SimulatedServerTests/SNICloseDeadlockTest.cs          | 6 ++++++
 .../SNICloseHandshakeCancellationTest.cs                  | 2 ++
 .../SimulatedServerTests/SNICloseRaceDeadlockTest.cs      | 2 ++
 11 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
index 05f3c774b0..5f88a1498e 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@@ -1033,7 +1033,7 @@ The following table lists the valid names for keyword values within the <xref:Mi
 |Replication|'false'|`true` if replication is supported using the connection.|  
 |Server SPN<br /><br /> -or-<br /><br /> ServerSPN|N/A|The SPN for the data source. The default value is an empty string, which causes SqlClient to use the default, driver-generated SPN.<br /><br /> (Only available in v5.0+)|  
 |Transaction Binding|Implicit Unbind|Controls connection association with an enlisted `System.Transactions` transaction.<br /><br /> Possible values are:<br /><br /> `Transaction Binding=Implicit Unbind;`<br /><br /> `Transaction Binding=Explicit Unbind;`<br /><br /> Implicit Unbind causes the connection to detach from the transaction when it ends. After detaching, additional requests on the connection are performed in autocommit mode. The `System.Transactions.Transaction.Current` property is not checked when executing requests while the transaction is active. After the transaction has ended, additional requests are performed in autocommit mode.<br /><br /> If the system ends the transaction (in the scope of a using block) before the last command completes, it will throw <xref:System.InvalidOperationException>.<br /><br /> Explicit Unbind causes the connection to remain attached to the transaction until the connection is closed or an explicit `SqlConnection.TransactionEnlist(null)` is called. Beginning in .NET Framework 4.0, changes to Implicit Unbind make Explicit Unbind obsolete. An `InvalidOperationException` is thrown if `Transaction.Current` is not the enlisted transaction or if the enlisted transaction is not active.|  
-|Transparent Network IP Resolution<br /><br /> -or-<br /><br />TransparentNetworkIPResolution|See description.|On .NET Framework, when the value of this key is set to `true`, the driver runs multiple connect rounds across the DNS-resolved IP addresses, with progressively larger per-attempt timeouts and a 500 ms minimum on the sequential-mode attempt, until a connection succeeds or the overall `Connect Timeout` is reached.<br /><br /> If the `MultiSubnetFailover` key is set to `true`, `TransparentNetworkIPResolution` is ignored.<br /><br /> If the `Failover Partner` key is set, `TransparentNetworkIPResolution` is ignored.<br /><br /> On .NET Framework, if `TransparentNetworkIPResolution` isn't specified in the connection string, the driver automatically disables TNIR when the data source is an Azure SQL endpoint (`.database.windows.net`, `.database.cloudapi.de`, `.database.usgovcloudapi.net`, `.database.chinacloudapi.cn`, or `.database.fabric.microsoft.com`), when the `Authentication` key is set to any Microsoft Entra ID method (`Active Directory Password`, `Active Directory Integrated`, `Active Directory Interactive`, `Active Directory Service Principal`, `Active Directory Device Code Flow`, `Active Directory Managed Identity`, `Active Directory MSI`, `Active Directory Default`, or `Active Directory Workload Identity`), or when the <xref:Microsoft.Data.SqlClient.SqlConnection.AccessToken> or <xref:Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback> property is set on the <xref:Microsoft.Data.SqlClient.SqlConnection>. For these automatic conditions, an explicit `TransparentNetworkIPResolution` value bypasses the automatic behavior: `True` enables TNIR, and `False` disables TNIR unconditionally. To restore the automatic behavior, remove the keyword from the connection string.<br /><br /> On .NET (Core, .NET 5+), `TransparentNetworkIPResolution` isn't a recognized connection-string keyword. Setting it (with any value) throws `ArgumentException` when the driver parses the connection string.<br /><br /> On .NET Framework, the value of this key must be `true`, `false`, `yes`, or `no`.<br /><br /> A value of `yes` is treated the same as a value of `true`.<br /><br /> A value of `no` is treated the same as a value of `false`.|
+|Transparent Network IP Resolution<br /><br /> -or-<br /><br />TransparentNetworkIPResolution|See description.|**Deprecated.** Use `Multi Subnet Failover` instead.<br /><br /> On .NET Framework, when the value of this key is set to `true`, the driver runs multiple connect rounds across the DNS-resolved IP addresses, with progressively larger per-attempt timeouts and a 500 ms minimum on the sequential-mode attempt, until a connection succeeds or the overall `Connect Timeout` is reached.<br /><br /> If the `MultiSubnetFailover` key is set to `true`, `TransparentNetworkIPResolution` is ignored.<br /><br /> If the `Failover Partner` key is set, `TransparentNetworkIPResolution` is ignored.<br /><br /> On .NET Framework, if `TransparentNetworkIPResolution` isn't specified in the connection string, the driver automatically disables TNIR when the data source is an Azure SQL endpoint (`.database.windows.net`, `.database.cloudapi.de`, `.database.usgovcloudapi.net`, `.database.chinacloudapi.cn`, or `.database.fabric.microsoft.com`), when the `Authentication` key is set to any Microsoft Entra ID method (`Active Directory Password`, `Active Directory Integrated`, `Active Directory Interactive`, `Active Directory Service Principal`, `Active Directory Device Code Flow`, `Active Directory Managed Identity`, `Active Directory MSI`, `Active Directory Default`, or `Active Directory Workload Identity`), or when the <xref:Microsoft.Data.SqlClient.SqlConnection.AccessToken> or <xref:Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback> property is set on the <xref:Microsoft.Data.SqlClient.SqlConnection>. For these automatic conditions, an explicit `TransparentNetworkIPResolution` value bypasses the automatic behavior: `True` enables TNIR, and `False` disables TNIR unconditionally. To restore the automatic behavior, remove the keyword from the connection string.<br /><br /> On .NET (Core, .NET 5+), `TransparentNetworkIPResolution` isn't a recognized connection-string keyword. Setting it (with any value) throws <xref:System.ArgumentException> when the driver parses the connection string.<br /><br /> On .NET Framework, the value of this key must be `true`, `false`, `yes`, or `no`.<br /><br /> A value of `yes` is treated the same as a value of `true`.<br /><br /> A value of `no` is treated the same as a value of `false`.|
 |Trust Server Certificate<br /><br /> -or-<br /><br />TrustServerCertificate|'false'|When set to `true`, TLS is used to encrypt the channel when bypassing walking the certificate chain to validate trust. If TrustServerCertificate is set to `true` and Encrypt is set to `false`, the channel is not encrypted. Recognized values are `true`, `false`, `yes`, and `no`. For more information, see [Connection String Syntax](https://learn.microsoft.com/sql/connect/ado-net/connection-string-syntax).|  
 |Type System Version|N/A|A string value that indicates the type system the application expects. The functionality available to a client application is dependent on the version of SQL Server and the compatibility level of the database. Explicitly setting the type system version that the client application was written for avoids potential problems that could cause an application to break if a different version of SQL Server is used. **Note:**  The type system version cannot be set for common language runtime (CLR) code executing in-process in SQL Server. For more information, see [SQL Server Common Language Runtime Integration](https://learn.microsoft.com/dotnet/framework/data/adonet/sql/sql-server-common-language-runtime-integration). <br /><br /> Possible values are:<br /><br /> `Type System Version=SQL Server 2012;`<br /><br /> `Type System Version=SQL Server 2008;`<br /><br /> `Type System Version=SQL Server 2005;`<br /><br /> `Type System Version=Latest;`<br /><br /> `Type System Version=SQL Server 2012;` specifies that the application will require version 11.0.0.0 of Microsoft.SqlServer.Types.dll. The other `Type System Version` settings will require version 10.0.0.0 of Microsoft.SqlServer.Types.dll.<br /><br /> `Latest` is obsolete and should not be used. `Latest` is equivalent to `Type System Version=SQL Server 2008;`.|  
 |User ID<br /><br /> -or-<br /><br /> UID<br /><br /> -or-<br /><br /> User|N/A|The SQL Server login account. Not recommended. To maintain a high level of security, we strongly recommend that you use the `Integrated Security` or `Trusted_Connection` keywords instead. <xref:Microsoft.Data.SqlClient.SqlCredential> is a more secure way to specify credentials for a connection that uses SQL Server Authentication.<br /><br /> The user ID must be 128 characters or less.|  
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
index 1387196677..ffeb1ad240 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
@@ -1416,6 +1416,9 @@ This property corresponds to the "ServerSPN" and "Server SPN" keys within the co
         A boolean value.
       </value>
       <remarks>
+        <para>
+          This property is obsolete. Use <see cref="P:Microsoft.Data.SqlClient.SqlConnectionStringBuilder.MultiSubnetFailover" /> instead.
+        </para>
         <para>
           If the <c>Multi Subnet Failover</c> key is set to <c>true</c>, <c>Transparent Network IP Resolution</c> is ignored.
         </para>
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
index a5e3f1a473..266d0b9a1d 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
@@ -1492,6 +1492,7 @@ public override void Clear() { }
 
     #if NETFRAMEWORK
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/TransparentNetworkIPResolution/*'/>
+    [System.ObsoleteAttribute("TransparentNetworkIPResolution has been deprecated and is only supported on .NET Framework. Use MultiSubnetFailover instead.")]
     [System.ComponentModel.DisplayNameAttribute("Transparent Network IP Resolution")]
     [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
     public bool TransparentNetworkIPResolution { get { throw null; } set { } }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
index 4038dbb295..bb4871ed4a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs
@@ -411,7 +411,9 @@ private object GetAt(Keywords index)
                     return ConnectionReset;
 #pragma warning restore 618
                 case Keywords.TransparentNetworkIPResolution:
+#pragma warning disable 618 // Obsolete properties
                     return TransparentNetworkIPResolution;
+#pragma warning restore 618
                 case Keywords.NetworkLibrary:
                     return NetworkLibrary;
 #endif
@@ -1083,7 +1085,9 @@ public override object this[string keyword]
                             NetworkLibrary = ConvertToString(value);
                             break;
                         case Keywords.TransparentNetworkIPResolution:
+#pragma warning disable 618 // Obsolete properties
                             TransparentNetworkIPResolution = ConvertToBoolean(value);
+#pragma warning restore 618
                             break;
 #endif
                         default:
@@ -1879,6 +1883,7 @@ public bool ConnectionReset
         }
 
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/TransparentNetworkIPResolution/*' />
+        [Obsolete("TransparentNetworkIPResolution has been deprecated and is only supported on .NET Framework. Use MultiSubnetFailover instead.")]
         [DisplayName(DbConnectionStringKeywords.TransparentNetworkIpResolution)]
         [ResCategory(nameof(Strings.DataCategory_Source))]
         [ResDescription(nameof(Strings.DbConnectionString_TransparentNetworkIPResolution))]
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
index 11b4ed8637..4c15a65789 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionOptionsTest.cs
@@ -59,7 +59,9 @@ public void TestDefaultTnir(string dataSource, bool? tnirEnabledInConnString, bo
             builder.DataSource = dataSource;
             if (tnirEnabledInConnString.HasValue)
             {
+#pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 builder.TransparentNetworkIPResolution = tnirEnabledInConnString.Value;
+#pragma warning restore 618
             }
             SqlConnectionOptions connectionString = new(builder.ConnectionString);
 
@@ -99,7 +101,9 @@ public void TestShouldDisableTnirWithCallerSuppliedToken(
             SqlConnectionStringBuilder builder = new() { DataSource = dataSource };
             if (tnirInConnString.HasValue)
             {
+#pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 builder.TransparentNetworkIPResolution = tnirInConnString.Value;
+#pragma warning restore 618
             }
 
             SqlConnectionOptions connectionOptions = new(builder.ConnectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index ba1a852626..216a131ad8 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -129,7 +129,9 @@ public void NetworkError_TriggersFailover_ClearsPool()
                 InitialCatalog = "test",
                 MultiSubnetFailover = false,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = false,
+                #pragma warning restore 618
 #endif
             };
 
@@ -199,7 +201,9 @@ public void NetworkTimeout_ShouldFail()
                 Encrypt = false,
                 MultiSubnetFailover = false,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = false,
+                #pragma warning restore 618
 #endif
             };
             using SqlConnection connection = new(builder.ConnectionString);
@@ -246,7 +250,9 @@ public void NetworkDelay_ShouldConnectToPrimary()
                 Pooling = false, // Disable pooling to ensure a fresh connection attempt is made
                 MultiSubnetFailover = false,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = false,
+                #pragma warning restore 618
 #endif
             };
             using SqlConnection connection = new(builder.ConnectionString);
@@ -388,7 +394,9 @@ public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFai
                 FailoverPartner = $"localhost,{failoverServer.EndPoint.Port}", // User provided failover partner
                 Encrypt = false,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = false,
+                #pragma warning restore 618
 #endif
             };
             using SqlConnection connection = new(builder.ConnectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
index 262770f563..918f7228f3 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs
@@ -136,7 +136,9 @@ public void NetworkDelayAtRoutedLocation_RetryDisabled_ShouldSucceed(bool multiS
                 Encrypt = false,
                 MultiSubnetFailover = multiSubnetFailoverEnabled,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = multiSubnetFailoverEnabled,
+                #pragma warning restore 618
 #endif
             };
             using SqlConnection connection = new(builder.ConnectionString);
@@ -190,7 +192,9 @@ public void NetworkTimeoutAtRoutedLocation_RetryDisabled_ShouldFail()
                 Encrypt = false,
                 MultiSubnetFailover = false,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = false
+                #pragma warning restore 618
 #endif
             };
             using SqlConnection connection = new(builder.ConnectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index f797797758..1a48ccd293 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -111,7 +111,9 @@ public async Task TransientFault_RetryEnabled_ShouldSucceed_Async(uint errorCode
                 DataSource = "localhost," + server.EndPoint.Port,
                 Encrypt = SqlConnectionEncryptOption.Optional,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = false
+                #pragma warning restore 618
 #endif
             };
 
@@ -252,7 +254,9 @@ public async Task NetworkError_RetryEnabled_ShouldSucceed_Async(bool multiSubnet
                 Pooling = false, // Disable pooling to ensure a fresh connection attempt is made
                 MultiSubnetFailover = multiSubnetFailoverEnabled,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = multiSubnetFailoverEnabled
+                #pragma warning restore 618
 #endif
             };
 
@@ -290,7 +294,9 @@ public async Task NetworkDelay_RetryDisabled_Async(bool multiSubnetFailoverEnabl
                 Encrypt = SqlConnectionEncryptOption.Optional,
                 MultiSubnetFailover = multiSubnetFailoverEnabled,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = multiSubnetFailoverEnabled,
+                #pragma warning restore 618
 #endif
             };
 
@@ -338,7 +344,9 @@ public void NetworkDelay_RetryDisabled(bool multiSubnetFailoverEnabled)
                 ConnectTimeout = 5,
                 MultiSubnetFailover = multiSubnetFailoverEnabled,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = multiSubnetFailoverEnabled,
+                #pragma warning restore 618
 #endif
             };
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseDeadlockTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseDeadlockTest.cs
index 465e284b6d..fa333e9215 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseDeadlockTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseDeadlockTest.cs
@@ -119,7 +119,9 @@ public void CloseOrDispose_WithPendingAsyncRead_DoesNotDeadlock(bool disposeInst
             // pool.
             Pooling = false,
 #if NETFRAMEWORK
+            #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
             TransparentNetworkIPResolution = false,
+            #pragma warning restore 618
 #endif
         };
 
@@ -292,7 +294,9 @@ public void CloseOrDispose_DuringPreLoginHandshake_DoesNotDeadlock(bool disposeI
             ConnectRetryCount = 0,
             Pooling = false,
 #if NETFRAMEWORK
+            #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
             TransparentNetworkIPResolution = false,
+            #pragma warning restore 618
 #endif
         };
 
@@ -502,7 +506,9 @@ public void CloseOrDispose_DuringTlsHandshake_DoesNotDeadlock(bool disposeInstea
             ConnectRetryCount = 0,
             Pooling = false,
 #if NETFRAMEWORK
+            #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
             TransparentNetworkIPResolution = false,
+            #pragma warning restore 618
 #endif
         };
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseHandshakeCancellationTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseHandshakeCancellationTest.cs
index 9a41c2f3c7..b11b5ed291 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseHandshakeCancellationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseHandshakeCancellationTest.cs
@@ -119,7 +119,9 @@ public void CancelOpenAsyncDuringTlsHandshake_DoesNotDeadlock()
             ConnectRetryCount = 0,
             Pooling = false,
 #if NETFRAMEWORK
+            #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
             TransparentNetworkIPResolution = false,
+            #pragma warning restore 618
 #endif
         };
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseRaceDeadlockTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseRaceDeadlockTest.cs
index 27ab3a7516..78a099bba4 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseRaceDeadlockTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/SNICloseRaceDeadlockTest.cs
@@ -106,7 +106,9 @@ public void ResponseCompletionRacesClose_DoesNotDeadlock(bool disposeInsteadOfCl
                 // connection (reaching SNIClose) instead of returning it to the pool.
                 Pooling = false,
 #if NETFRAMEWORK
+                #pragma warning disable 618 // TransparentNetworkIPResolution is obsolete
                 TransparentNetworkIPResolution = false,
+                #pragma warning restore 618
 #endif
             };
 

From 1ff4ebaf6970cc8a056574bf3bad2576208c52c5 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 1 Sep 2026 11:15:25 -0700
Subject: [PATCH 258/298] Upgrade checkout actions to Node 24 (#4575)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/auto-assign-pr.yml | 2 +-
 .github/workflows/verify-aw-lock.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-assign-pr.yml b/.github/workflows/auto-assign-pr.yml
index ba5654969f..aab463f2e2 100644
--- a/.github/workflows/auto-assign-pr.yml
+++ b/.github/workflows/auto-assign-pr.yml
@@ -23,7 +23,7 @@ jobs:
       PR_REVIEWER_POOL: ${{ vars.PR_REVIEWER_POOL }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           sparse-checkout: |
             .github/scripts/auto-assign-pr.js
diff --git a/.github/workflows/verify-aw-lock.yml b/.github/workflows/verify-aw-lock.yml
index 1381792980..c020335650 100644
--- a/.github/workflows/verify-aw-lock.yml
+++ b/.github/workflows/verify-aw-lock.yml
@@ -13,7 +13,7 @@ jobs:
   verify:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install gh-aw extension
         uses: github/gh-aw-actions/setup-cli@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9

From 7f82574972a400852245a6b48f1ff9eb93958581 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 1 Sep 2026 11:35:00 -0700
Subject: [PATCH 259/298] Fix malformed UNC pipe path for IPv6 literals in
 managed SNI (#4558)

* Reject IPv6 literal host names on the Named Pipes path in managed SNI

A UNC path host component may never contain a colon, so an IPv6 literal
server name composes a malformed pipe path such as \\::1\pipe\sql\query.
Handing that to the OS sends the SMB redirector into an SMB session setup
whose SPNEGO/NegoEx target name embeds the IPv6 literal, which can fault
LSASS on Windows and force a reboot.

Managed SNI defaults to TCP when no protocol prefix is given, so this is
reachable only when Named Pipes is selected explicitly (np:::1) or via a
UNC pipe path (\\::1\pipe\sql\query). Validate the host component in both
DataSource.InferNamedPipesInformation branches, plus a final safeguard in
SniProxy.CreateNpHandle, mirroring the native SNI fix.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address review feedback: use literal ':' and document test methods

- IsValidPipeHostName now compares against the literal ':' instead of the
  misleadingly named SemiColon constant.
- Add XML summaries to every test method in DataSourceNamedPipesTests,
  matching the convention used by the other ManagedSni unit tests.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Transcribe IPv6 literals to UNC form instead of rejecting them

Review feedback: rejecting IPv6 literals on the Named Pipes path blocked
addresses that would otherwise work. Windows defines a UNC transcription
for exactly this case (MS-DTYP 2.2.57): replace ':' with '-' and '%' with
's', then append '.ipv6-literal.net', so 2001:db8::1 becomes
2001-db8--1.ipv6-literal.net.

DataSource.GetUncCompatibleHostName replaces IsValidPipeHostName and
applies that transcription at both Named Pipes host-assignment sites.
Colon-free hosts (host names, IPv4 literals, already-transcribed names)
pass through untouched, and a colon-bearing host with no IPv6
interpretation still fails cleanly. ServerName keeps the original literal
because it feeds SPN creation. CreateNpHandle keeps a colon check as a
final safeguard.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Normalize ServerName for bracketed IPv6 literals

Copilot review: for a bracketed IPv6 host such as np:[2001:db8::1] or
\\[2001:db8::1]\pipe\sql\query, PipeHostName was transcribed but
ServerName kept the brackets. ServerName feeds Dns.GetHostEntry and SPN
construction in SniProxy.GetSqlServerSPNs, neither of which accepts the
bracketed spelling, so lookup would fail and a malformed SPN such as
MSSQLSvc/[2001:db8::1] could be produced.

Factor the literal parsing into TryParseIPv6Literal, shared by the new
NormalizeHostName (unwraps brackets to the canonical unbracketed form)
and GetUncCompatibleHostName. Both Named Pipes host-assignment sites now
normalize ServerName alongside transcribing PipeHostName.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address IPv6 named pipe review feedback

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 1790b392-a88c-4aa2-a50b-90046a378db5

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 1790b392-a88c-4aa2-a50b-90046a378db5
---
 .../SqlClient/ManagedSni/SniProxy.netcore.cs  | 138 +++++++++++-
 .../ManagedSni/DataSourceNamedPipesTests.cs   | 212 ++++++++++++++++++
 2 files changed, 346 insertions(+), 4 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/DataSourceNamedPipesTests.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniProxy.netcore.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniProxy.netcore.cs
index de40956784..b5254cde75 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniProxy.netcore.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniProxy.netcore.cs
@@ -275,6 +275,17 @@ private static SniNpHandle CreateNpHandle(DataSource details, TimeoutTimer timeo
                 SniCommon.ReportSNIError(SniProviders.NP_PROV, 0, SniCommon.MultiSubnetFailoverWithNonTcpProtocol, Strings.SNI_ERROR_49);
                 return null;
             }
+
+            // Final safeguard: never hand a pipe path whose host component contains a colon to the
+            // OS. DataSource transcribes IPv6 literals during parsing, so anything still holding a
+            // colon here is malformed. See DataSource.GetUncCompatibleHostName for details.
+            if (string.IsNullOrEmpty(details.PipeHostName) || details.PipeHostName.IndexOf(':') != -1)
+            {
+                SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniProxy), EventType.ERR, "Invalid host name '{0}' for Named Pipes.", details.PipeHostName);
+                SniCommon.ReportSNIError(SniProviders.NP_PROV, 0, SniCommon.InvalidConnStringError, Strings.SNI_ERROR_25);
+                return null;
+            }
+
             return new SniNpHandle(details.PipeHostName, details.PipeName, timeout, tlsFirst, hostNameInCertificate, serverCertificateFilename);
         }
 
@@ -339,6 +350,7 @@ internal class DataSource
         private const string DefaultPipeName = "sql\\query";
         private const string InstancePrefix = "MSSQL$";
         private const string PathSeparator = "\\";
+        private const string IPv6LiteralHostSuffix = ".ipv6-literal.net";
 
         internal enum Protocol { TCP, NP, None, Admin };
 
@@ -632,7 +644,7 @@ private bool InferNamedPipesInformation()
                         {
                             // NamedPipeClientStream object will create the network path using PipeHostName and PipeName
                             // and can be seen in its _normalizedPipePath variable in the format \\servername\pipe\MSSQL$<instancename>\sql\query
-                            PipeHostName = ServerName = tokensByBackSlash[0];
+                            ServerName = tokensByBackSlash[0];
                             PipeName = $"{InstancePrefix}{tokensByBackSlash[1]}{PathSeparator}{DefaultPipeName}";
                         }
                         else
@@ -643,10 +655,23 @@ private bool InferNamedPipesInformation()
                     }
                     else
                     {
-                        PipeHostName = ServerName = _dataSourceAfterTrimmingProtocol;
+                        ServerName = _dataSourceAfterTrimmingProtocol;
                         PipeName = SniNpHandle.DefaultPipePath;
                     }
 
+                    // An IPv6 literal must be transcribed before it can appear in a UNC pipe path,
+                    // and ServerName must drop any brackets because it feeds DNS resolution and SPN
+                    // construction. See GetUncCompatibleHostName and NormalizeHostName for details.
+                    PipeHostName = GetUncCompatibleHostName(ServerName);
+                    if (PipeHostName is null)
+                    {
+                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniProxy), EventType.ERR, "Invalid host name '{0}' for Named Pipes.", ServerName);
+                        ReportSNIError(SniProviders.NP_PROV);
+                        return false;
+                    }
+
+                    ServerName = NormalizeHostName(ServerName);
+
                     InferLocalServerName();
                     return true;
                 }
@@ -700,10 +725,22 @@ private bool InferNamedPipesInformation()
                         InstanceName = PipeToken + PipeName;
                     }
 
-                    ServerName = IsLocalHost(host) ? Environment.MachineName : host;
+                    // An IPv6 literal must be transcribed before it can appear in a UNC pipe path.
+                    // See GetUncCompatibleHostName for details.
+                    string uncHost = GetUncCompatibleHostName(host);
+                    if (uncHost is null)
+                    {
+                        SqlClientEventSource.Log.TrySNITraceEvent(nameof(SniProxy), EventType.ERR, "Invalid host name '{0}' for Named Pipes.", host);
+                        ReportSNIError(SniProviders.NP_PROV);
+                        return false;
+                    }
+
+                    // ServerName drops any brackets because it feeds DNS resolution and SPN
+                    // construction, neither of which accepts the bracketed spelling.
+                    ServerName = IsLocalHost(host) ? Environment.MachineName : NormalizeHostName(host);
                     // Pipe hostname is the hostname after leading \\ which should be passed down as is to open Named Pipe.
                     // For Named Pipes the ServerName makes sense for SPN creation only.
-                    PipeHostName = host;
+                    PipeHostName = uncHost;
                 }
                 catch (UriFormatException)
                 {
@@ -729,6 +766,99 @@ private bool InferNamedPipesInformation()
 
         private static bool IsLocalHost(string serverName) =>
             ".".Equals(serverName) || "(local)".Equals(serverName) || "localhost".Equals(serverName);
+
+        /// <summary>
+        /// Attempts to interpret a host name as an IPv6 literal, accepting the bracketed form
+        /// (<c>[::1]</c>) that users may carry over from URL syntax.
+        /// </summary>
+        private static bool TryParseIPv6Literal(string hostName, out IPAddress address)
+        {
+            address = null;
+
+            // A colon is the only character that can make a host name an IPv6 literal, so anything
+            // without one (host names, IPv4 literals, already-transcribed names) is not a candidate.
+            if (string.IsNullOrEmpty(hostName) || hostName.IndexOf(':') == -1)
+            {
+                return false;
+            }
+
+            ReadOnlySpan<char> literal = hostName.AsSpan();
+            if (literal.Length > 2 && literal[0] == '[' && literal[literal.Length - 1] == ']')
+            {
+                literal = literal.Slice(1, literal.Length - 2);
+            }
+
+            return IPAddress.TryParse(literal, out address) &&
+                   address.AddressFamily == AddressFamily.InterNetworkV6;
+        }
+
+        /// <summary>
+        /// Returns the canonical form of a host name: a bracketed IPv6 literal is unwrapped to its
+        /// unbracketed form, and every other host name is returned unchanged.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="ServerName"/> feeds DNS resolution and SPN construction, neither of which
+        /// accepts the bracketed spelling, so the brackets must be dropped before it is used there.
+        /// </remarks>
+        internal static string NormalizeHostName(string hostName) =>
+            TryParseIPv6Literal(hostName, out IPAddress address) ? address.ToString() : hostName;
+
+        /// <summary>
+        /// Converts a host name into a form that can legally appear as the host component of a UNC
+        /// pipe path (<c>\\host\pipe\sql\query</c>), returning <see langword="null"/> if no such
+        /// form exists.
+        /// </summary>
+        /// <remarks>
+        /// A UNC host component may never contain a colon, so an IPv6 literal such as <c>::1</c>
+        /// cannot be used directly. Passing one through anyway composes a malformed path like
+        /// <c>\\::1\pipe\sql\query</c>, which sends the SMB redirector into an SMB session setup
+        /// whose SPNEGO/NegoEx target name embeds the IPv6 literal; that can fault LSASS on Windows
+        /// and force a reboot. See https://github.com/dotnet/SqlClient/issues/4523.
+        ///
+        /// Windows defines a transcription for exactly this case: replace each <c>:</c> with
+        /// <c>-</c> and each <c>%</c> (zone index) with <c>s</c>, then append
+        /// <c>.ipv6-literal.net</c>. For example <c>2001:db8::1</c> becomes
+        /// <c>2001-db8--1.ipv6-literal.net</c>. See
+        /// https://learn.microsoft.com/openspecs/windows_protocols/ms-dtyp/62e862f4-2a51-452e-8eeb-dc4ff5ee33cc.
+        ///
+        /// Host names without a colon (including IPv4 literals and already-transcribed
+        /// <c>.ipv6-literal.net</c> names) are returned unchanged. A colon-bearing host name that is
+        /// not a parseable IPv6 literal has no UNC form and is rejected.
+        /// </remarks>
+        internal static string GetUncCompatibleHostName(string hostName)
+        {
+            if (string.IsNullOrEmpty(hostName))
+            {
+                return null;
+            }
+
+            if (hostName.IndexOf(':') == -1)
+            {
+                return hostName;
+            }
+
+            if (!TryParseIPv6Literal(hostName, out IPAddress address))
+            {
+                return null;
+            }
+
+            string literal = address.ToString();
+            return string.Create(literal.Length + IPv6LiteralHostSuffix.Length, literal,
+                static (destination, value) =>
+                {
+                    for (int i = 0; i < value.Length; i++)
+                    {
+                        destination[i] = value[i] switch
+                        {
+                            ':' => '-',
+                            '%' => 's',
+                            _ => value[i]
+                        };
+                    }
+
+                    IPv6LiteralHostSuffix.AsSpan().CopyTo(destination.Slice(value.Length));
+                });
+        }
     }
 }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/DataSourceNamedPipesTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/DataSourceNamedPipesTests.cs
new file mode 100644
index 0000000000..b06fe7e56d
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/ManagedSni/DataSourceNamedPipesTests.cs
@@ -0,0 +1,212 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+
+using Microsoft.Data.SqlClient.ManagedSni;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.ManagedSni
+{
+    /// <summary>
+    /// Regression tests for Named Pipes data source parsing in <see cref="DataSource"/>.
+    ///
+    /// A UNC path host component may never contain a colon, so an IPv6 literal server name cannot
+    /// be used directly. Passing one through anyway composes a malformed pipe path such as
+    /// <c>\\::1\pipe\sql\query</c>, which sends the SMB redirector into an SMB session setup that
+    /// can fault LSASS on Windows and force a reboot. Windows instead defines a transcription for
+    /// this case (<c>2001:db8::1</c> becomes <c>2001-db8--1.ipv6-literal.net</c>), which the parser
+    /// now applies so IPv6 Named Pipes connections keep working.
+    ///
+    /// See: https://github.com/dotnet/SqlClient/issues/4523
+    /// and https://learn.microsoft.com/openspecs/windows_protocols/ms-dtyp/62e862f4-2a51-452e-8eeb-dc4ff5ee33cc
+    /// </summary>
+    public class DataSourceNamedPipesTests
+    {
+        /// <summary>
+        /// Verifies that an IPv6 literal host is transcribed to its <c>.ipv6-literal.net</c> UNC
+        /// form, covering both the <c>np:host</c> form and the <c>\\host\pipe\...</c> UNC form,
+        /// with and without brackets and with a zone index.
+        /// </summary>
+        [Theory]
+        [InlineData(@"np:::1", "--1.ipv6-literal.net")]
+        [InlineData(@"np:[::1]", "--1.ipv6-literal.net")]
+        [InlineData(@"np:2001:db8::1", "2001-db8--1.ipv6-literal.net")]
+        [InlineData(@"np:fe80::1%3", "fe80--1s3.ipv6-literal.net")]
+        [InlineData(@"\\::1\pipe\sql\query", "--1.ipv6-literal.net")]
+        [InlineData(@"np:\\::1\pipe\sql\query", "--1.ipv6-literal.net")]
+        [InlineData(@"np:\\[2001:db8::1]\pipe\MSSQL$MYINSTANCE\sql\query", "2001-db8--1.ipv6-literal.net")]
+        public void ParseServerName_NamedPipesWithIPv6Literal_IsTranscribedToUncForm(
+            string dataSource, string expectedPipeHostName)
+        {
+            DataSource details = DataSource.ParseServerName(dataSource);
+
+            Assert.NotNull(details);
+            Assert.Equal(DataSource.Protocol.NP, details.ResolvedProtocol);
+            Assert.Equal(expectedPipeHostName, details.PipeHostName);
+            // The pipe host name is what reaches the OS, so it must never carry a colon.
+            Assert.DoesNotContain(":", details.PipeHostName);
+        }
+
+        /// <summary>
+        /// Verifies that a colon-bearing host that is not a parseable IPv6 literal has no UNC form
+        /// and is therefore rejected, rather than composing a malformed pipe path.
+        /// </summary>
+        [Theory]
+        [InlineData(@"np:not:a:host")]
+        [InlineData(@"np:2001:db8:::::1")]
+        [InlineData(@"\\not:a:host\pipe\sql\query")]
+        public void ParseServerName_NamedPipesWithUnparseableColonHost_IsRejected(string dataSource)
+        {
+            Assert.Null(DataSource.ParseServerName(dataSource));
+        }
+
+        /// <summary>
+        /// Verifies that IPv6 transcription does not regress legitimate Named Pipes data sources:
+        /// IPv4 literals, <c>localhost</c>, <c>.</c>, named instances, and explicit UNC pipe paths
+        /// must still parse and yield an unchanged pipe host name.
+        /// </summary>
+        [Theory]
+        [InlineData(@"np:127.0.0.1", "127.0.0.1")]
+        [InlineData(@"np:localhost", "localhost")]
+        [InlineData(@"np:.", ".")]
+        [InlineData(@"np:server\instance", "server")]
+        [InlineData(@"\\127.0.0.1\pipe\sql\query", "127.0.0.1")]
+        [InlineData(@"\\.\pipe\MSSQL$MYINSTANCE\sql\query", ".")]
+        [InlineData(@"\\my-server\pipe\sql\query", "my-server")]
+        public void ParseServerName_NamedPipesWithValidHost_IsAccepted(
+            string dataSource, string expectedPipeHostName)
+        {
+            DataSource details = DataSource.ParseServerName(dataSource);
+
+            Assert.NotNull(details);
+            Assert.Equal(DataSource.Protocol.NP, details.ResolvedProtocol);
+            Assert.Equal(expectedPipeHostName, details.PipeHostName);
+            Assert.False(string.IsNullOrEmpty(details.PipeName));
+        }
+
+        /// <summary>
+        /// Verifies that a Named Pipes data source given without a UNC path still composes the
+        /// default pipe name, including the <c>MSSQL$&lt;instance&gt;</c> prefix for named instances.
+        /// These forms are asserted separately from the UNC forms because the UNC path builds its
+        /// pipe name with <see cref="System.IO.Path.DirectorySeparatorChar"/>, which is platform dependent.
+        /// </summary>
+        [Theory]
+        [InlineData(@"np:127.0.0.1", @"sql\query")]
+        [InlineData(@"np:localhost", @"sql\query")]
+        [InlineData(@"np:::1", @"sql\query")]
+        [InlineData(@"np:server\instance", @"MSSQL$instance\sql\query")]
+        public void ParseServerName_NamedPipesWithoutUncPath_ComposesDefaultPipeName(
+            string dataSource, string expectedPipeName)
+        {
+            DataSource details = DataSource.ParseServerName(dataSource);
+
+            Assert.NotNull(details);
+            Assert.Equal(expectedPipeName, details.PipeName);
+        }
+
+        /// <summary>
+        /// Verifies that an IPv6 literal is preserved (unbracketed) in <see cref="DataSource.ServerName"/>,
+        /// which feeds DNS resolution and SPN construction, while the pipe host name is transcribed.
+        /// The bracketed spelling must not survive into <see cref="DataSource.ServerName"/> because
+        /// neither DNS nor SPN construction accepts it.
+        /// </summary>
+        [Theory]
+        [InlineData(@"np:2001:db8::1")]
+        [InlineData(@"np:[2001:db8::1]")]
+        [InlineData(@"np:\\2001:db8::1\pipe\sql\query")]
+        [InlineData(@"np:\\[2001:db8::1]\pipe\sql\query")]
+        public void ParseServerName_NamedPipesWithIPv6Literal_PreservesUnbracketedServerNameForSpn(string dataSource)
+        {
+            DataSource details = DataSource.ParseServerName(dataSource);
+
+            Assert.NotNull(details);
+            Assert.Equal("2001:db8::1", details.ServerName);
+            Assert.Equal("2001-db8--1.ipv6-literal.net", details.PipeHostName);
+        }
+
+        /// <summary>
+        /// Verifies <see cref="DataSource.NormalizeHostName"/> unwraps bracketed IPv6 literals and
+        /// leaves every other host name untouched.
+        /// </summary>
+        [Theory]
+        [InlineData("[::1]", "::1")]
+        [InlineData("::1", "::1")]
+        [InlineData("[2001:db8::1]", "2001:db8::1")]
+        [InlineData("[fe80::1%3]", "fe80::1%3")]
+        [InlineData("localhost", "localhost")]
+        [InlineData("127.0.0.1", "127.0.0.1")]
+        [InlineData("not:a:host", "not:a:host")]
+        [InlineData("", "")]
+        public void NormalizeHostName_ReturnsExpected(string hostName, string expected)
+        {
+            Assert.Equal(expected, DataSource.NormalizeHostName(hostName));
+        }
+
+        /// <summary>
+        /// Without an explicit protocol prefix, managed SNI defaults to TCP, so an IPv6 literal
+        /// server name must continue to parse successfully and never reach the Named Pipes path.
+        /// </summary>
+        [Theory]
+        [InlineData("::1")]
+        [InlineData("[::1]")]
+        [InlineData("fe80::1")]
+        public void ParseServerName_IPv6LiteralWithoutProtocol_ResolvesToNonNamedPipes(string dataSource)
+        {
+            DataSource details = DataSource.ParseServerName(dataSource);
+
+            Assert.NotNull(details);
+            Assert.NotEqual(DataSource.Protocol.NP, details.ResolvedProtocol);
+            Assert.Equal(dataSource, details.ServerName);
+        }
+
+        /// <summary>
+        /// Verifies <see cref="DataSource.GetUncCompatibleHostName"/> directly: colon-free host names
+        /// pass through untouched, IPv6 literals are transcribed per MS-DTYP, and colon-bearing host
+        /// names with no IPv6 interpretation return <see langword="null"/>.
+        /// </summary>
+        [Theory]
+        [InlineData(".", ".")]
+        [InlineData("localhost", "localhost")]
+        [InlineData("127.0.0.1", "127.0.0.1")]
+        [InlineData("my-server.contoso.com", "my-server.contoso.com")]
+        [InlineData("--1.ipv6-literal.net", "--1.ipv6-literal.net")]
+        [InlineData("::1", "--1.ipv6-literal.net")]
+        [InlineData("[::1]", "--1.ipv6-literal.net")]
+        [InlineData("2001:db8::1", "2001-db8--1.ipv6-literal.net")]
+        [InlineData("::ffff:1.2.3.4", "--ffff-1.2.3.4.ipv6-literal.net")]
+        [InlineData("fe80::1%3", "fe80--1s3.ipv6-literal.net")]
+        public void GetUncCompatibleHostName_ReturnsExpected(string hostName, string expected)
+        {
+            Assert.Equal(expected, DataSource.GetUncCompatibleHostName(hostName));
+        }
+
+        /// <summary>
+        /// Verifies <see cref="DataSource.GetUncCompatibleHostName"/> returns <see langword="null"/>
+        /// for host names that contain a colon but have no IPv6 interpretation, and for empty input.
+        /// </summary>
+        [Theory]
+        [InlineData("not:a:host")]
+        [InlineData("2001:db8:::::1")]
+        [InlineData("[:]")]
+        [InlineData("")]
+        public void GetUncCompatibleHostName_UnconvertibleHost_ReturnsNull(string hostName)
+        {
+            Assert.Null(DataSource.GetUncCompatibleHostName(hostName));
+        }
+
+        /// <summary>
+        /// Verifies <see cref="DataSource.GetUncCompatibleHostName"/> returns <see langword="null"/>
+        /// for a null host name. Covered separately from the theory above because xUnit disallows
+        /// null theory data for a non-nullable string parameter.
+        /// </summary>
+        [Fact]
+        public void GetUncCompatibleHostName_Null_ReturnsNull()
+        {
+            Assert.Null(DataSource.GetUncCompatibleHostName(null));
+        }
+    }
+}
+
+#endif

From ab1f2e4ef5ba444ad9429f80822cb1fdb32c595c Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 1 Sep 2026 12:19:22 -0700
Subject: [PATCH 260/298] Pipelines | Move CI and PR pipelines to SQL Server
 2025 agent images (#4513)

* Move CI and PR pipelines to SQL Server 2025 agent images

Retire every SQL Server 2022 agent image in favour of the SQL Server 2025
equivalents:

  ADO-MMS22-SQL22 -> ADO-MMS25-SQL25
  ADO-UB22-SQL22  -> ADO-UB24-SQL25

This covers the CI test configurations, the PR pipeline platform list,
the Azure package integration test jobs (including the SQL root path,
which becomes SQL25RootPath), the Managed Instance jobs, the stress test
jobs, and the Linux enclave configuration.

Two notes on the change:

  - CI test stage names derive from the image keys, so stages such as
    Win22_Sql22 are now named Win25_Sql25.  Any branch policies or
    required status checks that reference the old stage names will need
    to be updated.

  - The Linux SQL configuration previously ran on both ADO-UB20-SQL22
    and ADO-UB22-SQL22.  We only have a single Ubuntu SQL 2025 image, so
    it now runs on ADO-UB24-SQL25 alone.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Clarify why the Linux enclave stage key is left unchanged

The Linux enclave image key doubles as the generated ADO stage name and is
referenced by branch policies and required status checks, so it is kept as-is.
The 'Sql19' suffix also remains accurate because these tests target a remote
Enclave-enabled SQL Server 2019; only the agent image moved to Ubuntu 24.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Install sqlcmd on Linux agents before configuring SQL Server

The SQL Server 2025 agent images ship the engine but not the command line
tools, so the Linux SQL configuration steps failed with:

  ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations.

Add a shared 'Install sqlcmd [Linux]' step that reuses an existing sqlcmd when
the image provides one and otherwise installs mssql-tools18, then publishes the
resolved path via the SqlCmdBin variable.  Both the PR and CI Linux
configuration steps now run it, and the CI step no longer hardcodes
/opt/mssql-tools/bin/sqlcmd, which does not exist on these images.

sqlcmd from mssql-tools18 encrypts by default, so the step also publishes
SqlCmdTrustArg ('-C') to trust the local server's self-signed certificate.
Without it every connection to localhost would fail certificate validation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d
---
 .../sqlclient-ci-managed-instance-stage.yml   |  8 +-
 .../ci/stress/sqlclient-ci-stress-stage.yml   |  4 +-
 .../steps/configure-sql-server-linux-step.yml | 14 +++-
 .../steps/configure-sql-server-win-step.yml   |  2 +-
 .../steps/install-sqlcmd-linux-step.yml       | 83 +++++++++++++++++++
 eng/pipelines/dotnet-sqlclient-ci-core.yml    | 52 ++++++------
 eng/pipelines/pr/sqlclient-pr-pipeline.yml    | 14 ++--
 .../steps/configure-sqlserver-linux-step.yml  | 36 ++++----
 .../configure-sqlserver-windows-step.yml      |  2 +-
 .../stages/build-azure-package-ci-stage.yml   | 12 +--
 10 files changed, 162 insertions(+), 65 deletions(-)
 create mode 100644 eng/pipelines/common/templates/steps/install-sqlcmd-linux-step.yml

diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml
index 114fef0061..b6a14c54a7 100644
--- a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml
+++ b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml
@@ -68,7 +68,7 @@ stages:
           operatingSystem: Windows
           runtime: ${{ runtime }}
           useManagedSNI: false
-          vmImage: ADO-MMS22-SQL22
+          vmImage: ADO-MMS25-SQL25
 
     - ${{ each runtime in parameters.netTestRuntimes }}:
       - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
@@ -81,7 +81,7 @@ stages:
           operatingSystem: Windows
           runtime: ${{ runtime }}
           useManagedSNI: false
-          vmImage: ADO-MMS22-SQL22
+          vmImage: ADO-MMS25-SQL25
 
       - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
         parameters:
@@ -93,7 +93,7 @@ stages:
           operatingSystem: Windows
           runtime: ${{ runtime }}
           useManagedSNI: true
-          vmImage: ADO-MMS22-SQL22
+          vmImage: ADO-MMS25-SQL25
 
     # ----------------------------------------------------------------------------------------------
     # Linux: one job per .NET runtime (managed SNI is always used on non-Windows).
@@ -108,4 +108,4 @@ stages:
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
           operatingSystem: Linux
           runtime: ${{ runtime }}
-          vmImage: ADO-UB22-SQL22
+          vmImage: ADO-UB24-SQL25
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
index 689d1a702b..3cbdb9d31e 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
@@ -89,7 +89,7 @@ stages:
           template: /eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml@self
           parameters:
             saPassword: $(saPassword)
-        vmImage: ADO-UB22-SQL22
+        vmImage: ADO-UB24-SQL25
 
     # ----------------------------------------------------------------------------------------------
     # Build and test on Windows
@@ -112,7 +112,7 @@ stages:
             saPassword: $(saPassword)
         # The Windows images include a suitable .NET Framework runtime, so we don't have to install
         # one explicitly.
-        vmImage: ADO-MMS22-SQL22
+        vmImage: ADO-MMS25-SQL25
 
     # ----------------------------------------------------------------------------------------------
     # Build and test on macOS.
diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml
index 15de459d50..a397108701 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml
@@ -16,8 +16,16 @@ parameters:
 
 steps:
 
+  # Make sure sqlcmd is available; the SQL Server images do not always ship it.
+  - template: /eng/pipelines/common/templates/steps/install-sqlcmd-linux-step.yml@self
+
   # Configure SQL Server.
   - bash: |
+      if [ -z "${SQLCMD_BIN:-}" ]; then
+        echo "ERROR: sqlcmd was not resolved by the 'Install sqlcmd [Linux]' step."
+        exit 1
+      fi
+
       sudo systemctl stop mssql-server
 
       # Password for the SA user (required)
@@ -39,10 +47,11 @@ steps:
       do
         echo Waiting for SQL Server to start...
         sleep 3s
-        /opt/mssql-tools/bin/sqlcmd \
+        "$SQLCMD_BIN" \
           -S localhost \
           -U SA \
           -P "$MSSQL_SA_PW" \
+          ${SQLCMD_TRUST_ARG:-} \
           -Q "SELECT @@VERSION" 2>/dev/null
         errstatus=$?
         ((counter++))
@@ -55,3 +64,6 @@ steps:
         exit $errstatus
       fi
     displayName: 'Configure SQL Server [Linux]'
+    env:
+      SQLCMD_BIN: $(SqlCmdBin)
+      SQLCMD_TRUST_ARG: $(SqlCmdTrustArg)
diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
index 5659d45de2..6980c1f33c 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
@@ -5,7 +5,7 @@
 #################################################################################
 
 # 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
+# 1ES Hosted Pool has images like ADO-MMS25-SQL25 that come with SQL Server 2025 pre-installed and
 # running.
 
 parameters:
diff --git a/eng/pipelines/common/templates/steps/install-sqlcmd-linux-step.yml b/eng/pipelines/common/templates/steps/install-sqlcmd-linux-step.yml
new file mode 100644
index 0000000000..d5e82f434b
--- /dev/null
+++ b/eng/pipelines/common/templates/steps/install-sqlcmd-linux-step.yml
@@ -0,0 +1,83 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Ensures the SQL Server command line tools are available on a Linux agent.
+#
+# The SQL Server images in our 1ES pool (for example ADO-UB24-SQL25) ship the SQL Server engine but
+# do not always ship the command line tools, so install them when they are missing.
+#
+# Sets two variables for the remaining steps in the job:
+#
+#   SqlCmdBin      - absolute path to the sqlcmd executable.
+#   SqlCmdTrustArg - '-C' when sqlcmd needs to be told to trust the server's self-signed
+#                    certificate, otherwise empty.
+
+steps:
+
+  - bash: |
+      set -u
+
+      if ! command -v sudo >/dev/null 2>&1; then
+        echo "ERROR: 'sudo' is required to install the SQL Server command line tools."
+        exit 1
+      fi
+
+      find_sqlcmd() {
+        if command -v sqlcmd >/dev/null 2>&1; then
+          command -v sqlcmd
+          return 0
+        fi
+        # mssql-tools default install locations.
+        local candidate
+        for candidate in /opt/mssql-tools18/bin/sqlcmd /opt/mssql-tools/bin/sqlcmd; do
+          if [ -x "$candidate" ]; then
+            echo "$candidate"
+            return 0
+          fi
+        done
+        return 1
+      }
+
+      if SQLCMD_BIN="$(find_sqlcmd)"; then
+        echo "Found existing sqlcmd at '$SQLCMD_BIN'."
+      else
+        echo "sqlcmd was not found; installing mssql-tools18..."
+
+        # The Microsoft package repository is usually already configured on these images (that is
+        # where the engine came from), so try a plain install first and only register the repository
+        # if that fails.
+        sudo apt-get update
+        if ! sudo env ACCEPT_EULA=Y apt-get install -y mssql-tools18 unixodbc-dev; then
+          # shellcheck disable=SC1091
+          . /etc/os-release
+          echo "Registering the Microsoft package repository for Ubuntu $VERSION_ID..."
+          curl -sSL -o /tmp/packages-microsoft-prod.deb \
+            "https://packages.microsoft.com/config/ubuntu/$VERSION_ID/packages-microsoft-prod.deb"
+          sudo dpkg -i /tmp/packages-microsoft-prod.deb
+          sudo apt-get update
+          sudo env ACCEPT_EULA=Y apt-get install -y mssql-tools18 unixodbc-dev
+        fi
+
+        if ! SQLCMD_BIN="$(find_sqlcmd)"; then
+          echo "ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations,"
+          echo "       and installing mssql-tools18 did not provide it."
+          exit 1
+        fi
+      fi
+
+      # sqlcmd from mssql-tools18 (and go-sqlcmd) encrypts by default, so it needs -C to trust the
+      # local server's self-signed certificate. The older mssql-tools build does not support -C.
+      case "$SQLCMD_BIN" in
+        */mssql-tools/bin/sqlcmd) SQLCMD_TRUST_ARG="" ;;
+        *)                        SQLCMD_TRUST_ARG="-C" ;;
+      esac
+
+      echo "Using sqlcmd '$SQLCMD_BIN' with trust argument '$SQLCMD_TRUST_ARG'."
+
+      # Publish for the remaining steps in this job.
+      echo "##vso[task.setvariable variable=SqlCmdBin]$SQLCMD_BIN"
+      echo "##vso[task.setvariable variable=SqlCmdTrustArg]$SQLCMD_TRUST_ARG"
+    displayName: 'Install sqlcmd [Linux]'
diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index 3e68e93325..c8c2f72b15 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -299,7 +299,7 @@ stages:
       testConfigurations:
         # SQL Server 2016 and 2017 on Windows Server 2022 (x64 only).
         # x86 testing is intentionally skipped for these legacy SQL versions
-        # because x86 support is already validated via SQL 2019 and 2022 images.
+        # because x86 support is already validated via SQL 2019 and 2025 images.
         ${{ if eq(parameters.runLegacySqlTests, true) }}:
           # Windows Server 22 with local SQL Server 2016, x64 build platform.
           windows_sql_16_x64:
@@ -407,11 +407,11 @@ stages:
             SQLRootPath: $(SQL19RootPath)
             enableLocalDB: true
 
-        # Windows Server 22 with local SQL Server 2022, x64 build platform.
-        windows_sql_22_x64:
+        # Windows Server 25 with local SQL Server 2025, x64 build platform.
+        windows_sql_25_x64:
           pool: ${{parameters.defaultPoolName }}
           images:
-            Win22_Sql22: ADO-MMS22-SQL22
+            Win25_Sql25: ADO-MMS25-SQL25
           TargetFrameworks: ${{parameters.targetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}
@@ -430,14 +430,14 @@ stages:
             LocalDbAppName: $(LocalDbAppName)
             LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
             AliasName: $(SQLAliasName)
-            SQLRootPath: $(SQL22RootPath)
+            SQLRootPath: $(SQL25RootPath)
             enableLocalDB: true
 
-        # Windows Server 22 with local SQL Server 2022, x86 build platform.
-        windows_sql_22_x86:
+        # Windows Server 25 with local SQL Server 2025, x86 build platform.
+        windows_sql_25_x86:
           pool: ${{parameters.defaultPoolName }}
           images:
-            Win22_Sql22_x86: ADO-MMS22-SQL22
+            Win25_Sql25_x86: ADO-MMS25-SQL25
           TargetFrameworks: [net462, net8.0, net9.0]
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}
@@ -457,14 +457,14 @@ stages:
             LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
             AliasName: $(SQLAliasName)
             x86TestTargetFrameworks: [net462, net8.0, net9.0]
-            SQLRootPath: $(SQL22RootPath)
+            SQLRootPath: $(SQL25RootPath)
             enableLocalDB: true
 
-        # Windows Server 22 with local SQL Server 2022 Named Instance, x64 build platform.
-        windows_sql_22_named_instance:
+        # Windows Server 25 with local SQL Server 2025 Named Instance, x64 build platform.
+        windows_sql_25_named_instance:
           pool: ${{parameters.defaultPoolName }}
           images:
-            Win22_Sql22_Named_Instance: ADO-MMS22-SQL22-WITH-NAMED-INSTANCE
+            Win25_Sql25_Named_Instance: ADO-MMS25-SQL25-WITH-NAMED-INSTANCE
           TargetFrameworks: ${{parameters.targetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}
@@ -476,7 +476,7 @@ stages:
             TCPConnectionString: $(SQL_TCP_INSTANCE_CONN_STRING)
             NPConnectionString: $(SQL_NP_INSTANCE_CONN_STRING)
             SupportsIntegratedSecurity: true
-            SQLRootPath: $(SQL22RootPath)
+            SQLRootPath: $(SQL25RootPath)
             instanceName: $(NamedInstance)
 
         # Windows Server 2022 and Windows 11, x64 build platform, with Azure SQL Server.
@@ -537,12 +537,11 @@ stages:
             LocalDbAppName: $(LocalDbAppName)
             LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
 
-        # Linux Ubuntu 20 and 22 with local SQL Server 2022, x64 build platform.
-        linux_ub20_22_sql_22:
+        # Linux Ubuntu 24 with local SQL Server 2025, x64 build platform.
+        linux_ub24_sql_25:
           pool: ${{parameters.defaultPoolName }}
           images:
-            Ubuntu20_Sql22: ADO-UB20-SQL22
-            Ubuntu22_Sql22: ADO-UB22-SQL22
+            Ubuntu24_Sql25: ADO-UB24-SQL25
           TargetFrameworks: ${{parameters.targetFrameworksUnix }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: [AnyCPU]
@@ -561,11 +560,11 @@ stages:
             LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
             AliasName: $(SQLAliasName)
 
-        # Linux Ubuntu 22 with Azure SQL Server, x64 build platform.
+        # Linux Ubuntu 24 with Azure SQL Server, x64 build platform.
         linux_azure_sql:
           pool: ${{parameters.defaultPoolName }}
           images:
-            Ubuntu22_Azure_Sql: ADO-UB22-SQL22
+            Ubuntu24_Azure_Sql: ADO-UB24-SQL25
           TargetFrameworks: ${{parameters.targetFrameworksUnix }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: [AnyCPU]
@@ -588,12 +587,12 @@ stages:
             LocalDbAppName: $(LocalDbAppName)
             LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
 
-        # macOS with local SQL Server 2022, x64 build platform.
-        mac_sql_22:
+        # macOS with local SQL Server 2025 (docker), x64 build platform.
+        mac_sql_25:
           pool: Azure Pipelines
           hostedPool: true
           images:
-            MacOSLatest_Sql22: macos-latest
+            MacOSLatest_Sql25: macos-latest
           TargetFrameworks: ${{parameters.targetFrameworksUnix }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: [AnyCPU]
@@ -642,11 +641,16 @@ stages:
               LocalDbAppName: $(LocalDbAppName)
               LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
 
-          # Linux Ubuntu 22 with remote Enclave-enabled SQL Server 2019, x64 build platform.
+          # Linux Ubuntu 24 with remote Enclave-enabled SQL Server 2019, x64 build platform.
           linux_enclave_sql:
             pool: ADO-CI-AE-1ES-Pool
             images:
-              Ubuntu20_Enclave_Sql19: ADO-UB22-Sql22
+              # NOTE: This key is also the generated stage name, and is
+              # referenced by branch policies / required status checks, so it is
+              # deliberately left unchanged.  The 'Sql19' suffix remains
+              # accurate: these tests target a remote Enclave-enabled SQL Server
+              # 2019.  Only the agent image has moved to Ubuntu 24.
+              Ubuntu20_Enclave_Sql19: ADO-UB24-SQL25
             TargetFrameworks: ${{parameters.targetFrameworksUnix }}
             netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
             buildPlatforms: [AnyCPU]
diff --git a/eng/pipelines/pr/sqlclient-pr-pipeline.yml b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
index b72e15ef53..4ab1a31f60 100644
--- a/eng/pipelines/pr/sqlclient-pr-pipeline.yml
+++ b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
@@ -70,32 +70,32 @@ parameters:
     default:
       - displayName: "windows_net462"
         dotnet: "net462"
-        image: "ADO-MMS22-SQL22"
+        image: "ADO-MMS25-SQL25"
         operatingSystem: "Windows"
       - displayName: "windows_net8"
         dotnet: "net8.0"
-        image: "ADO-MMS22-SQL22"
+        image: "ADO-MMS25-SQL25"
         operatingSystem: "Windows"
       - displayName: "windows_net9"
         dotnet: "net9.0"
-        image: "ADO-MMS22-SQL22"
+        image: "ADO-MMS25-SQL25"
         operatingSystem: "Windows"
       - displayName: "windows_net10"
         dotnet: "net10.0"
-        image: "ADO-MMS22-SQL22"
+        image: "ADO-MMS25-SQL25"
         operatingSystem: "Windows"
 
       - displayName: "linux_net8"
         dotnet: "net8.0"
-        image: "ADO-UB22-SQL22"
+        image: "ADO-UB24-SQL25"
         operatingSystem: "Linux"
       - displayName: "linux_net9"
         dotnet: "net9.0"
-        image: "ADO-UB22-SQL22"
+        image: "ADO-UB24-SQL25"
         operatingSystem: "Linux"
       - displayName: "linux_net10"
         dotnet: "net10.0"
-        image: "ADO-UB22-SQL22"
+        image: "ADO-UB24-SQL25"
         operatingSystem: "Linux"
 
 variables:
diff --git a/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml b/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml
index 8eb8cc40d6..df625dc35e 100644
--- a/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml
+++ b/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml
@@ -5,7 +5,7 @@
 #################################################################################
 
 # 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
+# Hosted Pool has images like ADO-UB24-SQL25 that come with SQL Server 2025 pre-installed and
 # running.
 
 parameters:
@@ -16,6 +16,9 @@ parameters:
 
 steps:
 
+  # Make sure sqlcmd is available; the SQL Server images do not always ship it.
+  - template: /eng/pipelines/common/templates/steps/install-sqlcmd-linux-step.yml@self
+
   # Configure SQL Server.
   - bash: |
       set -u
@@ -30,15 +33,8 @@ steps:
         exit 1
       fi
 
-      SQLCMD_BIN=""
-      if command -v sqlcmd >/dev/null 2>&1; then
-        SQLCMD_BIN="$(command -v sqlcmd)"
-      elif [ -x /opt/mssql-tools18/bin/sqlcmd ]; then
-        SQLCMD_BIN="/opt/mssql-tools18/bin/sqlcmd"
-      elif [ -x /opt/mssql-tools/bin/sqlcmd ]; then
-        SQLCMD_BIN="/opt/mssql-tools/bin/sqlcmd"
-      else
-        echo "ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations."
+      if [ -z "${SQLCMD_BIN:-}" ]; then
+        echo "ERROR: sqlcmd was not resolved by the 'Install sqlcmd [Linux]' step."
         exit 1
       fi
 
@@ -79,6 +75,7 @@ steps:
           -S localhost \
           -U SA \
           -P "$MSSQL_SA_PW" \
+          ${SQLCMD_TRUST_ARG:-} \
           -Q "SELECT @@VERSION" 2>/dev/null
         errstatus=$?
         ((counter++))
@@ -91,6 +88,9 @@ steps:
         exit $errstatus
       fi
     displayName: 'Configure SQL Server [Linux]'
+    env:
+      SQLCMD_BIN: $(SqlCmdBin)
+      SQLCMD_TRUST_ARG: $(SqlCmdTrustArg)
 
   - bash: |
       set -u
@@ -98,15 +98,8 @@ steps:
       SCRIPT_PATH="$(Build.SourcesDirectory)/tools/testsql/createNorthwindDb.sql"
       MSSQL_SA_PW="${{ parameters.saPassword }}"
 
-      SQLCMD_BIN=""
-      if command -v sqlcmd >/dev/null 2>&1; then
-        SQLCMD_BIN="$(command -v sqlcmd)"
-      elif [ -x /opt/mssql-tools18/bin/sqlcmd ]; then
-        SQLCMD_BIN="/opt/mssql-tools18/bin/sqlcmd"
-      elif [ -x /opt/mssql-tools/bin/sqlcmd ]; then
-        SQLCMD_BIN="/opt/mssql-tools/bin/sqlcmd"
-      else
-        echo "ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations."
+      if [ -z "${SQLCMD_BIN:-}" ]; then
+        echo "ERROR: sqlcmd was not resolved by the 'Install sqlcmd [Linux]' step."
         exit 1
       fi
 
@@ -114,6 +107,7 @@ steps:
         -S localhost \
         -U SA \
         -P "$MSSQL_SA_PW" \
+        ${SQLCMD_TRUST_ARG:-} \
         -Q "IF DB_ID(N'Northwind') IS NOT NULL BEGIN ALTER DATABASE [Northwind] SET SINGLE_USER WITH ROLLBACK IMMEDIATE; DROP DATABASE [Northwind]; END" \
         -b
 
@@ -121,7 +115,11 @@ steps:
         -S localhost \
         -U SA \
         -P "$MSSQL_SA_PW" \
+        ${SQLCMD_TRUST_ARG:-} \
         -i "$SCRIPT_PATH" \
         -b
     displayName: 'Create Northwind Database [Linux]'
     retryCountOnTaskFailure: 1
+    env:
+      SQLCMD_BIN: $(SqlCmdBin)
+      SQLCMD_TRUST_ARG: $(SqlCmdTrustArg)
diff --git a/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml b/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
index 8e07120b4b..405582d655 100644
--- a/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
+++ b/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
@@ -5,7 +5,7 @@
 #################################################################################
 
 # 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
+# 1ES Hosted Pool has images like ADO-MMS25-SQL25 that come with SQL Server 2025 pre-installed and
 # running.
 
 parameters:
diff --git a/eng/pipelines/stages/build-azure-package-ci-stage.yml b/eng/pipelines/stages/build-azure-package-ci-stage.yml
index 0713030b76..b907d2fcda 100644
--- a/eng/pipelines/stages/build-azure-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-azure-package-ci-stage.yml
@@ -47,8 +47,8 @@ parameters:
     #
     # Any pool specified here must contain images with the following names:
     #
-    #   - ADO-MMS22-SQL22
-    #   - ADO-UB22-SQL22
+    #   - ADO-MMS25-SQL25
+    #   - ADO-UB24-SQL25
     #
     default: $(ci_var_defaultPoolName)
 
@@ -187,7 +187,7 @@ stages:
             - template: /eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml@self
               parameters:
                 saPassword: $(saPassword)
-          vmImage: ADO-UB22-SQL22
+          vmImage: ADO-UB24-SQL25
 
       # ------------------------------------------------------------------------
       # Build and test on Windows
@@ -241,11 +241,11 @@ stages:
                 # These variables are from an Azure DevOps Library variable
                 # group.
                 fileStreamDirectory: $(FileStreamDirectory)
-                sqlRootPath: $(SQL22RootPath)
-          # The ADO-MMS22-SQL22 image includes a local SQL Server that supports
+                SQLRootPath: $(SQL25RootPath)
+          # The ADO-MMS25-SQL25 image includes a local SQL Server that supports
           # integrated security.
           supportsIntegratedSecurity: true
-          vmImage: ADO-MMS22-SQL22
+          vmImage: ADO-MMS25-SQL25
 
       # ------------------------------------------------------------------------
       # Build and test on macOS.

From ef2ca70e25c086e3b095b562e3ba983482e0376e Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Wed, 2 Sep 2026 13:45:40 +0530
Subject: [PATCH 261/298] Stop the localization pipeline from opening duplicate
 PRs (#4615)

* Add idempotent localization PR script to stop duplicate PRs

The scheduled Localization-CI pipeline opens a brand-new GitHub PR on
every run because its inline "Open PR on GitHub" step pushes a
timestamped branch (dev/automation/onelocbuild-<yyyyMMdd-HHmmss>) and
never checks whether an equivalent PR is already open. Four
byte-for-byte identical PRs (#4607, #4612, #4613, #4614) accumulated as
a result.

Add eng/pipelines/scripts/Open-LocalizationPr.ps1 as a reusable,
idempotent replacement for that inline step:

- Uses a stable branch name, rebuilt from the base branch each run, so
  no timestamped branch proliferation and no commit accumulation.
- Exits without pushing or calling the GitHub API when the localized
  resources are identical to the base branch.
- Skips the force-push when the remote branch already holds the exact
  same tree on top of the same base.
- Reuses an already-open pull request (PATCH) instead of opening a
  second one, and otherwise opens exactly one new PR.

Includes Pester v5 tests covering the de-duplication contract with git
and Invoke-RestMethod mocked.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cb6c5b07-fb77-43bc-a4aa-a9d39aa04438

* Add -DryRun switch to Open-LocalizationPr.ps1

Allows validating the pipeline wiring (paths, token scopes, OneLocBuild
output, existing-PR lookup) from a feature branch without pushing a
branch or creating/updating a pull request in the public repository.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cb6c5b07-fb77-43bc-a4aa-a9d39aa04438

* Address review feedback on Open-LocalizationPr

- Authenticate git via GIT_CONFIG_* environment config instead of embedding
  the token in the remote URL, so it never reaches .git/config, a process
  command line, or Invoke-Git exception messages. Cleared in the finally block.
- Read GitHub error bodies from $_.ErrorDetails first, since PowerShell 7
  exposes an HttpResponseMessage with no GetResponseStream(); keep the stream
  path as a Windows PowerShell fallback so 4xx bodies are no longer dropped.
- Replace the unconditional force-push with --force-with-lease pinned to the
  remote SHA observed earlier in the run, so an overlapping run fails instead
  of discarding a concurrent localization result.

Adds 4 tests (17 total, all passing).

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cb6c5b07-fb77-43bc-a4aa-a9d39aa04438

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cb6c5b07-fb77-43bc-a4aa-a9d39aa04438
---
 eng/pipelines/scripts/Open-LocalizationPr.ps1 | 454 ++++++++++++++++++
 .../tests/Open-LocalizationPr.Tests.ps1       | 357 ++++++++++++++
 eng/pipelines/scripts/tests/README.md         |  29 ++
 3 files changed, 840 insertions(+)
 create mode 100644 eng/pipelines/scripts/Open-LocalizationPr.ps1
 create mode 100644 eng/pipelines/scripts/tests/Open-LocalizationPr.Tests.ps1
 create mode 100644 eng/pipelines/scripts/tests/README.md

diff --git a/eng/pipelines/scripts/Open-LocalizationPr.ps1 b/eng/pipelines/scripts/Open-LocalizationPr.ps1
new file mode 100644
index 0000000000..0e7411ec7e
--- /dev/null
+++ b/eng/pipelines/scripts/Open-LocalizationPr.ps1
@@ -0,0 +1,454 @@
+<#
+.SYNOPSIS
+    Publishes OneLocBuild-generated localized resource files to GitHub as a
+    single, continuously-updated pull request.
+
+.DESCRIPTION
+    The Localization-CI pipeline regenerates the localized `Strings.*.resx`
+    files on every scheduled run. Because the generated content is identical
+    until a previous localization PR is merged, naively opening a new PR per
+    run produces a pile of byte-for-byte duplicate PRs.
+
+    This script makes the publish step idempotent:
+
+      1. Clones the target GitHub repository at the base branch.
+      2. Copies the freshly generated localized resource files into the clone.
+      3. If the content matches the base branch, exits without doing anything.
+      4. Otherwise commits onto a *stable* branch name, force-pushes it, and
+         reuses the existing open pull request if one is already present.
+
+    The net effect is at most one open localization PR at any time. Subsequent
+    runs refresh that PR in place instead of opening another one.
+
+.PARAMETER GitHubRepository
+    The target repository in "owner/repo" form. A trailing ".git" is tolerated
+    so the existing $(GitHubRepository) pipeline variable can be passed as-is.
+
+.PARAMETER AccessToken
+    A GitHub token with "contents: write" and "pull requests: write" on the
+    target repository. Defaults to the GITHUB_TOKEN environment variable.
+
+.PARAMETER SourceDirectory
+    The directory holding the OneLocBuild output. Localized files are resolved
+    relative to this path using ResourcesPath. Defaults to the current
+    directory.
+
+.PARAMETER WorkingDirectory
+    The directory the target repository is cloned into. Defaults to a new
+    "loc-pr-<guid>" folder under the system temp path, which is removed when
+    the script finishes.
+
+.PARAMETER BaseBranch
+    The branch the pull request targets. Defaults to "main".
+
+.PARAMETER BranchName
+    The stable branch the localized files are published to. Reusing one branch
+    name across runs is what allows the pull request to be reused. Defaults to
+    "dev/automation/onelocbuild".
+
+.PARAMETER ResourcesPath
+    Repository-relative path to the resources folder. Defaults to the
+    Microsoft.Data.SqlClient resources folder.
+
+.PARAMETER ResourceFilePattern
+    Filename pattern for the localized resource files to publish. Defaults to
+    "Strings.*.resx", which matches the localized files but not the English
+    "Strings.resx" source.
+
+.PARAMETER DryRun
+    Performs every read-only step - clone, copy, change detection and the
+    existing-pull-request lookup - but does not push the branch and does not
+    create or update a pull request. Use this to validate pipeline wiring
+    (paths, token scopes, OneLocBuild output) without publishing anything.
+
+.NOTES
+    Intended to be invoked from the internal Localization-CI pipeline. It is
+    safe to re-run: with no localization changes pending it is a no-op, and
+    with changes pending it converges on a single open pull request.
+#>
+
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the MIT license.
+# See the LICENSE file in the project root for more information.
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory)]
+    [string]$GitHubRepository,
+
+    [string]$AccessToken = $env:GITHUB_TOKEN,
+
+    [string]$SourceDirectory = (Get-Location).Path,
+
+    [string]$WorkingDirectory,
+
+    [string]$BaseBranch = 'main',
+
+    [string]$BranchName = 'dev/automation/onelocbuild',
+
+    [string]$ResourcesPath = 'src/Microsoft.Data.SqlClient/src/Resources',
+
+    [string]$ResourceFilePattern = 'Strings.*.resx',
+
+    [switch]$DryRun
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+# Several git invocations below use the exit code as a signal (for example
+# "git diff --cached --quiet" returns 1 when there are staged changes). On
+# PowerShell 7.3+ that would otherwise be turned into a terminating error.
+$PSNativeCommandUseErrorActionPreference = $false
+
+$PrTitle = '[Scheduled Run] Localized resource files from OneLocBuild'
+
+#region Helper Functions
+
+function Get-RepositorySlug {
+    <#
+    .SYNOPSIS
+        Normalizes a repository reference into "owner/repo" form.
+    #>
+    param(
+        [Parameter(Mandatory)][AllowEmptyString()][string]$Repository
+    )
+
+    $slug = $Repository.Trim().TrimEnd('/')
+    if ($slug.EndsWith('.git', [StringComparison]::OrdinalIgnoreCase)) {
+        $slug = $slug.Substring(0, $slug.Length - 4)
+    }
+
+    if ($slug -notmatch '^[^/\s]+/[^/\s]+$') {
+        throw "GitHubRepository must be in 'owner/repo' form, but was '$Repository'."
+    }
+
+    return $slug
+}
+
+function Get-PullRequestBody {
+    <#
+    .SYNOPSIS
+        Builds the pull request description.
+    #>
+    param(
+        [Parameter(Mandatory)][string]$Branch,
+        [Parameter(Mandatory)][datetime]$UpdatedUtc
+    )
+
+    $timestamp = $UpdatedUtc.ToString('yyyy-MM-dd HH:mm')
+
+    return @"
+Automated PR created from the OneLocBuild scheduled pipeline run.
+
+Contains updated localized ``Strings.*.resx`` resource files.
+
+This pull request is refreshed in place by every scheduled localization run, so
+there is only ever one open localization PR. Merging it lets the next run start
+from a clean base; leaving it open simply keeps it up to date.
+
+- Branch: ``$Branch``
+- Last updated: $timestamp UTC
+"@
+}
+
+function Invoke-GitHubApi {
+    <#
+    .SYNOPSIS
+        Calls a GitHub REST API endpoint, surfacing the response body on error.
+    #>
+    param(
+        [Parameter(Mandatory)][string]$Uri,
+        [string]$Method = 'GET',
+        [object]$Body = $null,
+        [Parameter(Mandatory)][hashtable]$Headers
+    )
+
+    $params = @{
+        Uri     = $Uri
+        Method  = $Method
+        Headers = $Headers
+    }
+
+    if ($null -ne $Body) {
+        $params['Body'] = ($Body | ConvertTo-Json -Depth 10 -Compress)
+        $params['ContentType'] = 'application/json'
+    }
+
+    try {
+        return Invoke-RestMethod @params -ErrorAction Stop
+    }
+    catch {
+        $status = $null
+        $responseBody = ''
+
+        # PowerShell 7 already carries the response body on the error record and
+        # exposes an HttpResponseMessage, which has no GetResponseStream(). Windows
+        # PowerShell leaves ErrorDetails empty but does expose the stream, so try
+        # the error record first and keep the stream as a fallback.
+        if ($null -ne $_.ErrorDetails -and -not [string]::IsNullOrWhiteSpace($_.ErrorDetails.Message)) {
+            $responseBody = $_.ErrorDetails.Message
+        }
+
+        if ($_.Exception.PSObject.Properties.Name -contains 'Response' -and $null -ne $_.Exception.Response) {
+            $status = $_.Exception.Response.StatusCode.value__
+
+            if ([string]::IsNullOrWhiteSpace($responseBody)) {
+                try {
+                    $stream = $_.Exception.Response.GetResponseStream()
+                    if ($null -ne $stream) {
+                        $reader = New-Object System.IO.StreamReader($stream)
+                        try { $responseBody = $reader.ReadToEnd() } finally { $reader.Dispose() }
+                    }
+                }
+                catch {
+                    # No readable stream (PowerShell 7) or it was already consumed;
+                    # the status code alone is still useful.
+                }
+            }
+        }
+
+        Write-Host "##vso[task.logissue type=error]GitHub API $Method $Uri failed (HTTP $status)."
+        if ($responseBody) {
+            Write-Host "##vso[task.logissue type=error]Response: $responseBody"
+        }
+
+        throw
+    }
+}
+
+function Invoke-Git {
+    <#
+    .SYNOPSIS
+        Runs a git command and throws if it reports failure.
+    #>
+    param(
+        [Parameter(Mandatory, ValueFromRemainingArguments)][string[]]$Arguments
+    )
+
+    & git @Arguments
+    if ($LASTEXITCODE -ne 0) {
+        throw "git $($Arguments -join ' ') failed with exit code $LASTEXITCODE."
+    }
+}
+
+#endregion
+
+#region Validation
+
+if ([string]::IsNullOrWhiteSpace($AccessToken)) {
+    throw 'A GitHub access token is required. Set GITHUB_TOKEN or pass -AccessToken.'
+}
+
+$repoSlug = Get-RepositorySlug -Repository $GitHubRepository
+$repoOwner = $repoSlug.Split('/')[0]
+
+$sourceResources = Join-Path $SourceDirectory $ResourcesPath
+if (-not (Test-Path -LiteralPath $sourceResources)) {
+    throw "Localized resources folder not found at '$sourceResources'."
+}
+
+$localizedFiles = @(Get-ChildItem -Path $sourceResources -Filter $ResourceFilePattern -File)
+if ($localizedFiles.Count -eq 0) {
+    throw "No files matching '$ResourceFilePattern' were found in '$sourceResources'. Did the OneLocBuild step run?"
+}
+
+$ownedWorkingDirectory = $false
+if ([string]::IsNullOrWhiteSpace($WorkingDirectory)) {
+    $WorkingDirectory = Join-Path ([System.IO.Path]::GetTempPath()) "loc-pr-$([guid]::NewGuid().ToString('n'))"
+    $ownedWorkingDirectory = $true
+}
+
+$headers = @{
+    'Authorization'        = "Bearer $AccessToken"
+    'Accept'               = 'application/vnd.github+json'
+    'X-GitHub-Api-Version' = '2022-11-28'
+    'User-Agent'           = 'SqlClient-DevOps'
+}
+
+#endregion
+
+Write-Host '=== Publish localized resources to GitHub ==='
+Write-Host "Repository : $repoSlug"
+Write-Host "Base       : $BaseBranch"
+Write-Host "Branch     : $BranchName"
+Write-Host "Resources  : $($localizedFiles.Count) file(s) from $sourceResources"
+if ($DryRun) {
+    Write-Host 'Mode       : DRY RUN (no push, no pull request changes)'
+}
+Write-Host ''
+
+$originalLocation = Get-Location
+
+try {
+    #region Clone and stage
+
+    if (Test-Path -LiteralPath $WorkingDirectory) {
+        Remove-Item -LiteralPath $WorkingDirectory -Recurse -Force
+    }
+
+    # Authenticate through git's environment-based config rather than the remote
+    # URL, so the token never lands in .git/config, on a process command line, or
+    # in Invoke-Git's exception messages. GIT_CONFIG_* is honoured by git 2.31+
+    # and applies to clone, fetch and push alike.
+    $basicAuth = [Convert]::ToBase64String(
+        [Text.Encoding]::ASCII.GetBytes("x-access-token:$AccessToken"))
+    $env:GIT_CONFIG_COUNT = '1'
+    $env:GIT_CONFIG_KEY_0 = 'http.https://github.com/.extraheader'
+    $env:GIT_CONFIG_VALUE_0 = "AUTHORIZATION: basic $basicAuth"
+    $cloneUrl = "https://github.com/$repoSlug.git"
+
+    Write-Host "Cloning $repoSlug@$BaseBranch..."
+    Invoke-Git clone --branch $BaseBranch --quiet $cloneUrl $WorkingDirectory
+
+    Set-Location -LiteralPath $WorkingDirectory
+
+    Invoke-Git config user.email 'sqlclient@microsoft.com'
+    Invoke-Git config user.name 'SqlClient DevOps'
+
+    $baseSha = (& git rev-parse HEAD).Trim()
+    Write-Host "Base HEAD  : $baseSha"
+
+    # Fetch the automation branch if it already exists so we can tell an actual
+    # content change apart from a re-run that would produce an identical commit.
+    & git fetch origin "refs/heads/${BranchName}:refs/remotes/origin/$BranchName" --quiet 2>&1 | Out-Null
+    $remoteBranchSha = (& git rev-parse --verify --quiet "refs/remotes/origin/$BranchName")
+    $remoteBranchExists = -not [string]::IsNullOrWhiteSpace($remoteBranchSha)
+
+    if ($remoteBranchExists) {
+        Write-Host "Branch HEAD: $($remoteBranchSha.Trim())"
+    }
+
+    $targetResources = Join-Path $WorkingDirectory $ResourcesPath
+    if (-not (Test-Path -LiteralPath $targetResources)) {
+        throw "Resources folder '$ResourcesPath' does not exist in $repoSlug@$BaseBranch."
+    }
+
+    Copy-Item -Path (Join-Path $sourceResources $ResourceFilePattern) -Destination $targetResources -Force
+
+    Invoke-Git add --all -- $ResourcesPath
+
+    & git diff --cached --quiet
+    if ($LASTEXITCODE -eq 0) {
+        Write-Host ''
+        Write-Host "No localization changes relative to '$BaseBranch'. Nothing to publish."
+        exit 0
+    }
+
+    #endregion
+
+    #region Commit and push
+
+    Write-Host ''
+    Write-Host "Committing localized resources onto '$BranchName'..."
+
+    # Always rebuild the branch from the current base so the pull request stays
+    # mergeable, rather than accumulating commits run over run.
+    Invoke-Git checkout -B $BranchName --quiet
+    Invoke-Git commit --quiet --message $PrTitle
+
+    $newTree = (& git rev-parse 'HEAD^{tree}').Trim()
+
+    $branchUpToDate = $false
+    if ($remoteBranchExists) {
+        $remoteTree = (& git rev-parse "refs/remotes/origin/$BranchName^{tree}" 2>$null)
+        $remoteParent = (& git rev-parse --verify --quiet "refs/remotes/origin/$BranchName^")
+
+        $branchUpToDate =
+            $null -ne $remoteTree -and
+            $remoteTree.Trim() -eq $newTree -and
+            $null -ne $remoteParent -and
+            $remoteParent.Trim() -eq $baseSha
+    }
+
+    if ($branchUpToDate) {
+        Write-Host "Branch '$BranchName' already has these exact changes on top of '$BaseBranch'. Skipping push."
+    }
+    elseif ($DryRun) {
+        Write-Host "[DryRun] Would push '$BranchName' to $repoSlug."
+    }
+    else {
+        # Pin the push to the remote SHA observed above so an overlapping run that
+        # already updated the branch makes this push fail loudly, instead of
+        # silently discarding the other run's localization result.
+        $pushArgs = @('push', 'origin', "${BranchName}:refs/heads/$BranchName", '--quiet')
+        if ($remoteBranchExists) {
+            $pushArgs += "--force-with-lease=refs/heads/${BranchName}:$($remoteBranchSha.Trim())"
+        }
+
+        Invoke-Git @pushArgs
+        Write-Host "Pushed '$BranchName'."
+    }
+
+    #endregion
+
+    #region Create or reuse the pull request
+
+    Write-Host ''
+    Write-Host 'Checking for an existing open pull request...'
+
+    $encodedHead = [Uri]::EscapeDataString("${repoOwner}:$BranchName")
+    $encodedBase = [Uri]::EscapeDataString($BaseBranch)
+    $listUri = "https://api.github.com/repos/$repoSlug/pulls?state=open&head=$encodedHead&base=$encodedBase"
+
+    $openPrs = @(Invoke-GitHubApi -Uri $listUri -Headers $headers)
+    $existingPr = $openPrs | Select-Object -First 1
+
+    $body = Get-PullRequestBody -Branch $BranchName -UpdatedUtc ([datetime]::UtcNow)
+
+    if ($existingPr) {
+        $prNumber = $existingPr.number
+
+        if ($DryRun) {
+            Write-Host "[DryRun] Would refresh open PR #$prNumber ($($existingPr.html_url))."
+        }
+        else {
+            Write-Host "Reusing open PR #$prNumber - refreshing its description."
+
+            $patchUri = "https://api.github.com/repos/$repoSlug/pulls/$prNumber"
+            Invoke-GitHubApi -Uri $patchUri -Method 'PATCH' -Headers $headers -Body @{
+                title = $PrTitle
+                body  = $body
+            } | Out-Null
+
+            Write-Host "Pull request updated: $($existingPr.html_url)"
+        }
+    }
+    elseif ($DryRun) {
+        Write-Host "[DryRun] No open pull request found. Would create one ($BranchName -> $BaseBranch)."
+    }
+    else {
+        Write-Host 'No open pull request found. Creating one...'
+
+        $createUri = "https://api.github.com/repos/$repoSlug/pulls"
+        $newPr = Invoke-GitHubApi -Uri $createUri -Method 'POST' -Headers $headers -Body @{
+            title = $PrTitle
+            head  = $BranchName
+            base  = $BaseBranch
+            body  = $body
+        }
+
+        Write-Host "Pull request created: $($newPr.html_url)"
+    }
+
+    #endregion
+
+    Write-Host ''
+    if ($DryRun) {
+        Write-Host '=== Done (dry run - nothing was published) ==='
+    }
+    else {
+        Write-Host '=== Done ==='
+    }
+}
+finally {
+    Set-Location -LiteralPath $originalLocation
+
+    Remove-Item Env:\GIT_CONFIG_COUNT -ErrorAction SilentlyContinue
+    Remove-Item Env:\GIT_CONFIG_KEY_0 -ErrorAction SilentlyContinue
+    Remove-Item Env:\GIT_CONFIG_VALUE_0 -ErrorAction SilentlyContinue
+
+    if ($ownedWorkingDirectory -and (Test-Path -LiteralPath $WorkingDirectory)) {
+        Remove-Item -LiteralPath $WorkingDirectory -Recurse -Force -ErrorAction SilentlyContinue
+    }
+}
diff --git a/eng/pipelines/scripts/tests/Open-LocalizationPr.Tests.ps1 b/eng/pipelines/scripts/tests/Open-LocalizationPr.Tests.ps1
new file mode 100644
index 0000000000..9f99666c9a
--- /dev/null
+++ b/eng/pipelines/scripts/tests/Open-LocalizationPr.Tests.ps1
@@ -0,0 +1,357 @@
+<#
+.SYNOPSIS
+    Pester tests for Open-LocalizationPr.ps1.
+
+.DESCRIPTION
+    These tests focus on the de-duplication behaviour: a scheduled run must
+    reuse the existing open localization pull request rather than opening a new
+    one, and must do nothing at all when there is no localization delta.
+
+    'git' and 'Invoke-RestMethod' are mocked, so no network or repository
+    access is required.
+#>
+
+BeforeAll {
+    $global:scriptPath = Join-Path $PSScriptRoot '..' 'Open-LocalizationPr.ps1'
+    $global:resourcesPath = 'src/Microsoft.Data.SqlClient/src/Resources'
+
+    function New-TempDirectoryPath {
+        return Join-Path ([System.IO.Path]::GetTempPath()) "loc-test-$([guid]::NewGuid().ToString('n'))"
+    }
+
+    function New-SourceTree {
+        $root = New-TempDirectoryPath
+        $resources = Join-Path $root $global:resourcesPath
+        New-Item -ItemType Directory -Path $resources -Force | Out-Null
+
+        foreach ($culture in @('de', 'fr', 'ja')) {
+            Set-Content -Path (Join-Path $resources "Strings.$culture.resx") -Value '<root />'
+        }
+
+        return $root
+    }
+
+    function Get-RestCallCount {
+        param(
+            [Parameter(Mandatory)][string]$Method,
+            [Parameter(Mandatory)][string]$UriPattern
+        )
+
+        return @($global:restCalls | Where-Object { $_.Method -eq $Method -and $_.Uri -like $UriPattern }).Count
+    }
+
+    function Get-RestCallsTo {
+        param(
+            [Parameter(Mandatory)][string]$Method,
+            [Parameter(Mandatory)][string]$UriPattern
+        )
+
+        return , @($global:restCalls | Where-Object { $_.Method -eq $Method -and $_.Uri -like $UriPattern })
+    }
+}
+
+Describe 'Open-LocalizationPr.ps1' {
+
+    BeforeAll {
+        Mock -CommandName 'git' -MockWith {
+            $joined = $args -join ' '
+            $global:gitCalls += $joined
+            $global:LASTEXITCODE = 0
+
+            if ($joined -like 'clone*') {
+                # Stand in for a real clone so the script finds the expected layout.
+                New-Item -ItemType Directory -Force -Path (Join-Path $global:workDir $global:resourcesPath) | Out-Null
+                return
+            }
+
+            if ($joined -like 'diff --cached --quiet*') {
+                $global:LASTEXITCODE = $global:diffExitCode
+                return
+            }
+
+            if ($joined -like 'rev-parse HEAD^{tree}*') { return $global:localTree }
+            if ($joined -like 'rev-parse HEAD*') { return $global:baseSha }
+            if ($joined -like 'rev-parse *origin/*^{tree}*') { return $global:remoteTree }
+            if ($joined -like 'rev-parse *origin/*^') { return $global:remoteParent }
+            if ($joined -like 'rev-parse *origin/*') { return $global:remoteSha }
+
+            return $null
+        }
+
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            $global:restCalls += @{ Method = $Method; Uri = $Uri; Body = $Body }
+
+            if ($Method -eq 'GET') {
+                return $global:openPullRequests
+            }
+
+            return @{ number = 999; html_url = 'https://github.com/dotnet/SqlClient/pull/999' }
+        }
+    }
+
+    BeforeEach {
+        $global:gitCalls = @()
+        $global:restCalls = @()
+        $global:diffExitCode = 1          # by default, there is a localization delta
+        $global:baseSha = 'base000000'
+        $global:localTree = 'tree111111'
+        $global:remoteSha = $null         # by default, the branch does not exist yet
+        $global:remoteTree = $null
+        $global:remoteParent = $null
+        $global:openPullRequests = @()
+
+        $global:sourceDir = New-SourceTree
+        $global:workDir = New-TempDirectoryPath
+    }
+
+    AfterEach {
+        foreach ($path in @($global:sourceDir, $global:workDir)) {
+            if ($path -and (Test-Path -LiteralPath $path)) {
+                Remove-Item -LiteralPath $path -Recurse -Force -ErrorAction SilentlyContinue
+            }
+        }
+    }
+
+    Context 'Input validation' {
+
+        It 'Requires an access token' {
+            { & $global:scriptPath -GitHubRepository 'dotnet/SqlClient' -AccessToken '' -SourceDirectory $global:sourceDir } |
+                Should -Throw '*access token is required*'
+        }
+
+        It 'Rejects a repository that is not in owner/repo form' {
+            { & $global:scriptPath -GitHubRepository 'SqlClient' -AccessToken 'token' -SourceDirectory $global:sourceDir } |
+                Should -Throw "*'owner/repo' form*"
+        }
+
+        It 'Fails when the localized resources are missing' {
+            Remove-Item -Path (Join-Path $global:sourceDir $global:resourcesPath 'Strings.*.resx') -Force
+
+            { & $global:scriptPath -GitHubRepository 'dotnet/SqlClient' -AccessToken 'token' -SourceDirectory $global:sourceDir } |
+                Should -Throw '*Did the OneLocBuild step run?*'
+        }
+    }
+
+    Context 'When there is no localization delta' {
+
+        It 'Does not push a branch or touch the GitHub API' {
+            $global:diffExitCode = 0
+
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            $global:restCalls.Count | Should -Be 0
+            @($global:gitCalls | Where-Object { $_ -like 'push*' }).Count | Should -Be 0
+            @($global:gitCalls | Where-Object { $_ -like 'commit*' }).Count | Should -Be 0
+        }
+    }
+
+    Context 'When a localization pull request is already open' {
+
+        BeforeEach {
+            $global:openPullRequests = @(
+                @{ number = 4612; html_url = 'https://github.com/dotnet/SqlClient/pull/4612' }
+            )
+        }
+
+        It 'Updates the existing pull request instead of opening another one' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            (Get-RestCallCount -Method 'POST' -UriPattern '*/pulls') | Should -Be 0
+            (Get-RestCallCount -Method 'PATCH' -UriPattern '*/pulls/4612') | Should -Be 1
+        }
+
+        It 'Looks the pull request up by the stable head branch' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            $lookups = Get-RestCallsTo -Method 'GET' -UriPattern '*/pulls?*'
+            $lookups.Count | Should -Be 1
+            $lookups[0].Uri | Should -BeLike '*state=open*'
+            $lookups[0].Uri | Should -BeLike '*dotnet%3Adev%2Fautomation%2Fonelocbuild*'
+        }
+    }
+
+    Context 'When no localization pull request is open' {
+
+        It 'Creates exactly one pull request' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            (Get-RestCallCount -Method 'POST' -UriPattern '*/repos/dotnet/SqlClient/pulls') | Should -Be 1
+        }
+
+        It 'Pushes a stable branch name rather than a timestamped one' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            $push = @($global:gitCalls | Where-Object { $_ -like 'push*' })
+            $push.Count | Should -Be 1
+            $push[0] | Should -BeLike '*dev/automation/onelocbuild:refs/heads/dev/automation/onelocbuild*'
+            $push[0] | Should -Not -Match 'onelocbuild-\d'
+        }
+
+        It 'Normalizes a repository value that carries a .git suffix' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient.git' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            (Get-RestCallCount -Method 'POST' -UriPattern 'https://api.github.com/repos/dotnet/SqlClient/pulls') |
+                Should -Be 1
+        }
+    }
+
+    Context 'When the branch already carries the identical change' {
+
+        BeforeEach {
+            $global:remoteSha = 'remote0000'
+            $global:remoteTree = $global:localTree
+            $global:remoteParent = $global:baseSha
+            $global:openPullRequests = @(
+                @{ number = 4612; html_url = 'https://github.com/dotnet/SqlClient/pull/4612' }
+            )
+        }
+
+        It 'Skips the force-push but still keeps the pull request current' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            @($global:gitCalls | Where-Object { $_ -like 'push*' }).Count | Should -Be 0
+            (Get-RestCallCount -Method 'PATCH' -UriPattern '*/pulls/4612') | Should -Be 1
+            (Get-RestCallCount -Method 'POST' -UriPattern '*/pulls') | Should -Be 0
+        }
+    }
+
+    Context 'When pushing over an existing remote branch' {
+
+        BeforeEach {
+            $global:remoteSha = 'remote0000'
+            $global:remoteTree = 'differenttree'
+            $global:remoteParent = 'staleparent'
+            $global:openPullRequests = @(
+                @{ number = 4612; html_url = 'https://github.com/dotnet/SqlClient/pull/4612' }
+            )
+        }
+
+        It 'Leases the push against the observed remote SHA' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            $push = @($global:gitCalls | Where-Object { $_ -like 'push*' })
+            $push.Count | Should -Be 1
+            $push[0] | Should -BeLike '*--force-with-lease=refs/heads/dev/automation/onelocbuild:remote0000*'
+            $push[0] | Should -Not -Match '(^|\s)--force(\s|$)'
+        }
+    }
+
+    Context 'When the remote branch does not exist yet' {
+
+        It 'Pushes without forcing' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            $push = @($global:gitCalls | Where-Object { $_ -like 'push*' })
+            $push.Count | Should -Be 1
+            $push[0] | Should -Not -Match '--force'
+        }
+    }
+
+    Context 'Credential handling' {
+
+        It 'Keeps the access token out of the git remote URL' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'super-secret-token-value' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            $global:gitCalls | Should -Not -Match 'super-secret-token-value'
+            @($global:gitCalls | Where-Object { $_ -like 'clone*' })[0] |
+                Should -BeLike '*https://github.com/dotnet/SqlClient.git*'
+        }
+
+        It 'Clears the git credential environment afterwards' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir
+
+            $env:GIT_CONFIG_COUNT | Should -BeNullOrEmpty
+            $env:GIT_CONFIG_VALUE_0 | Should -BeNullOrEmpty
+        }
+    }
+
+    Context 'When running in dry-run mode' {
+
+        It 'Neither pushes nor creates a pull request' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir `
+                -DryRun
+
+            @($global:gitCalls | Where-Object { $_ -like 'push*' }).Count | Should -Be 0
+            (Get-RestCallCount -Method 'POST' -UriPattern '*/pulls') | Should -Be 0
+            (Get-RestCallCount -Method 'PATCH' -UriPattern '*/pulls/*') | Should -Be 0
+        }
+
+        It 'Still performs the existing pull request lookup' {
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir `
+                -DryRun
+
+            (Get-RestCallCount -Method 'GET' -UriPattern '*/pulls?*') | Should -Be 1
+        }
+
+        It 'Does not update an existing pull request' {
+            $global:remoteSha = 'remote0000'
+            $global:remoteTree = 'differenttree'
+            $global:remoteParent = 'oldbase000'
+            $global:openPullRequests = @(
+                @{ number = 4612; html_url = 'https://github.com/dotnet/SqlClient/pull/4612' }
+            )
+
+            & $global:scriptPath `
+                -GitHubRepository 'dotnet/SqlClient' `
+                -AccessToken 'token' `
+                -SourceDirectory $global:sourceDir `
+                -WorkingDirectory $global:workDir `
+                -DryRun
+
+            @($global:gitCalls | Where-Object { $_ -like 'push*' }).Count | Should -Be 0
+            (Get-RestCallCount -Method 'PATCH' -UriPattern '*/pulls/4612') | Should -Be 0
+        }
+    }
+}
diff --git a/eng/pipelines/scripts/tests/README.md b/eng/pipelines/scripts/tests/README.md
new file mode 100644
index 0000000000..8906214afd
--- /dev/null
+++ b/eng/pipelines/scripts/tests/README.md
@@ -0,0 +1,29 @@
+# Pipeline Script Tests
+
+Pester tests for the PowerShell helpers under `eng/pipelines/scripts/`.
+
+## Prerequisites
+
+These tests require **Pester v5 or later**:
+
+```powershell
+Install-Module Pester -MinimumVersion 5.0 -Scope CurrentUser -Force -SkipPublisherCheck
+```
+
+## Running the tests
+
+```powershell
+Import-Module Pester -MinimumVersion 5.0
+Invoke-Pester ./eng/pipelines/scripts/tests/
+```
+
+Add `-Output Detailed` to see per-test results.
+
+## Test files
+
+| File | Covers |
+| ---- | ------ |
+| `Open-LocalizationPr.Tests.ps1` | `Open-LocalizationPr.ps1` — de-duplication of the scheduled localization pull request. |
+
+`git` and `Invoke-RestMethod` are mocked, so the tests never touch the network
+or a real repository.

From 83656896d793e3130541f3e6dc7b2f0464fd4ac8 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 2 Sep 2026 04:47:05 -0700
Subject: [PATCH 262/298] Add .NET 10 test coverage to the CI-SqlClient
 pipeline (#4514)

Introduce primaryTargetFrameworks and primaryTargetFrameworksUnix, which
apply only to the primary test configurations: local SQL Server 2025 and
Azure SQL, on both Windows and Linux.  Those configurations now run
net10.0 in addition to the existing target frameworks.

Restricting .NET 10 to the primary configurations keeps the added agent
cost bounded rather than multiplying it across every legacy SQL Server
image.  The other pipelines that extend the CI core pin the new
parameters to their existing target framework lists, so their behaviour
is unchanged.

Note that the driver itself only targets net462, net8.0, and net9.0, so
the net10.0 test assemblies resolve the net9.0 driver build.  These jobs
therefore validate the driver on the .NET 10 runtime rather than
validating a .NET 10 build of the driver.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d
---
 eng/pipelines/dotnet-sqlclient-ci-core.yml    | 28 ++++++++++++---
 ...qlclient-ci-package-reference-pipeline.yml |  5 +++
 ...qlclient-ci-project-reference-pipeline.yml | 35 ++++++++++++++++---
 .../sqlclient-pr-package-ref-pipeline.yml     |  5 +++
 .../sqlclient-pr-project-ref-pipeline.yml     |  5 +++
 5 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index c8c2f72b15..335e98b575 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -25,6 +25,26 @@ parameters:
     type: object
     default: [net8.0, net9.0, net10.0]
 
+  # The target frameworks to build and run tests for on Windows, for the
+  # primary test configurations (local SQL Server 2025 and Azure SQL).
+  #
+  # These configurations carry the broadest coverage, so newer runtimes are
+  # validated here first before being enabled across every configuration.
+  #
+  # Note: The driver does not ship a net10.0 target framework, so net10.0 test
+  # assemblies resolve the net9.0 driver build.  Including net10.0 here
+  # validates the driver running on the .NET 10 runtime.
+  #
+  - name: primaryTargetFrameworks
+    type: object
+    default: [net462, net8.0, net9.0, net10.0]
+
+  # The target frameworks to build and run tests for on Unix, for the primary
+  # test configurations (local SQL Server 2025 and Azure SQL).
+  - name: primaryTargetFrameworksUnix
+    type: object
+    default: [net8.0, net9.0, net10.0]
+
   # Netcore Version for Test Utilities
   - name: netcoreVersionTestUtils
     type: object
@@ -412,7 +432,7 @@ stages:
           pool: ${{parameters.defaultPoolName }}
           images:
             Win25_Sql25: ADO-MMS25-SQL25
-          TargetFrameworks: ${{parameters.targetFrameworks }}
+          TargetFrameworks: ${{parameters.primaryTargetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}
           testSets: ${{parameters.testSets }}
@@ -485,7 +505,7 @@ stages:
           images:
             Win22_Azure_Sql: ADO-MMS22-SQL19
             Win11_Azure_Sql: ADO-CI-Win11
-          TargetFrameworks: ${{parameters.targetFrameworks }}
+          TargetFrameworks: ${{parameters.primaryTargetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}
           testSets: ${{parameters.testSets }}
@@ -542,7 +562,7 @@ stages:
           pool: ${{parameters.defaultPoolName }}
           images:
             Ubuntu24_Sql25: ADO-UB24-SQL25
-          TargetFrameworks: ${{parameters.targetFrameworksUnix }}
+          TargetFrameworks: ${{parameters.primaryTargetFrameworksUnix }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: [AnyCPU]
           testSets: ${{parameters.testSets }}
@@ -565,7 +585,7 @@ stages:
           pool: ${{parameters.defaultPoolName }}
           images:
             Ubuntu24_Azure_Sql: ADO-UB24-SQL25
-          TargetFrameworks: ${{parameters.targetFrameworksUnix }}
+          TargetFrameworks: ${{parameters.primaryTargetFrameworksUnix }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: [AnyCPU]
           testSets: ${{parameters.testSets }}
diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
index c7fa90860f..74fa022a6c 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
@@ -175,6 +175,11 @@ extends:
     dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
     targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
+    # Keep the primary (SQL 2025 / Azure SQL) configurations on the same set of
+    # target frameworks as everything else.  Only the CI-SqlClient pipeline
+    # opts in to the broader .NET 10.0 coverage on those configurations.
+    primaryTargetFrameworks: ${{ parameters.targetFrameworks }}
+    primaryTargetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
     testJobTimeout: ${{ parameters.testJobTimeout }}
     testSets: ${{ parameters.testSets }}
     useManagedSNI: ${{ parameters.useManagedSNI }}
diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
index 54a1b0e639..ce4db1ce3c 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
@@ -113,8 +113,9 @@ parameters:
   # These are _not_ the target frameworks to build the driver packages for.
   #
   # Note: We are excluding .NET 10.0 here to avoid consuming too many resources
-  # during PR pipeline runs, and until we update our 1ES images to include
-  # Visual Studio 2026 (18.0) whose MSBuild SDK supports .NET 10.
+  # across every SQL Server image.  .NET 10.0 coverage is provided by the
+  # primaryTargetFrameworks parameter below, which applies to the SQL Server
+  # 2025 and Azure SQL configurations.
   #
   - name: targetFrameworks
     displayName: Target Frameworks on Windows
@@ -126,14 +127,38 @@ parameters:
   # These are _not_ the target frameworks to build the driver packages for.
   #
   # Note: We are excluding .NET 10.0 here to avoid consuming too many resources
-  # during PR pipeline runs, and until we update our 1ES images to include
-  # Visual Studio 2026 (18.0) whose MSBuild SDK supports .NET 10.
+  # across every SQL Server image.  .NET 10.0 coverage is provided by the
+  # primaryTargetFrameworksUnix parameter below, which applies to the SQL
+  # Server 2025 and Azure SQL configurations.
   #
   - name: targetFrameworksUnix
     displayName: Target Frameworks on Unix
     type: object
     default: [net8.0, net9.0]
 
+  # The target frameworks used by the primary test configurations (local SQL
+  # Server 2025 and Azure SQL) on Windows.
+  #
+  # net10.0 is included here so that unit, functional, and manual tests get
+  # .NET 10 coverage without paying for it on every legacy SQL Server image.
+  #
+  # Note: The driver itself does not ship a net10.0 target framework, so the
+  # net10.0 test assemblies resolve the net9.0 driver build.  These jobs
+  # therefore validate the driver running on the .NET 10 runtime, rather than
+  # a net10.0 build of the driver.
+  #
+  - name: primaryTargetFrameworks
+    displayName: Target Frameworks on Windows (SQL 2025 and Azure SQL)
+    type: object
+    default: [net462, net8.0, net9.0, net10.0]
+
+  # The target frameworks used by the primary test configurations (local SQL
+  # Server 2025 and Azure SQL) on Unix.
+  - name: primaryTargetFrameworksUnix
+    displayName: Target Frameworks on Unix (SQL 2025 and Azure SQL)
+    type: object
+    default: [net8.0, net9.0, net10.0]
+
   # The timeout, in minutes, for each test job.
   - name: testJobTimeout
     displayName: Test job timeout (in minutes)
@@ -175,6 +200,8 @@ extends:
     dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
     targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
+    primaryTargetFrameworks: ${{ parameters.primaryTargetFrameworks }}
+    primaryTargetFrameworksUnix: ${{ parameters.primaryTargetFrameworksUnix }}
     testJobTimeout: ${{ parameters.testJobTimeout }}
     testSets: ${{ parameters.testSets }}
     useManagedSNI: ${{ parameters.useManagedSNI }}
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index cb25fe1f4e..abb0ef5f39 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -135,6 +135,11 @@ extends:
     debug: ${{ parameters.debug }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
     targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
+    # Keep the primary (SQL 2025 / Azure SQL) configurations on the same set of
+    # target frameworks as everything else.  Only the CI-SqlClient pipeline
+    # opts in to the broader .NET 10.0 coverage on those configurations.
+    primaryTargetFrameworks: ${{ parameters.targetFrameworks }}
+    primaryTargetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
     testJobTimeout: ${{ parameters.testJobTimeout }}
     testSets: ${{ parameters.testSets }}
     useManagedSNI: ${{ parameters.useManagedSNI }}
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index b2a5edf4e4..f9578e6548 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -135,6 +135,11 @@ extends:
     debug: ${{ parameters.debug }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
     targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
+    # Keep the primary (SQL 2025 / Azure SQL) configurations on the same set of
+    # target frameworks as everything else.  Only the CI-SqlClient pipeline
+    # opts in to the broader .NET 10.0 coverage on those configurations.
+    primaryTargetFrameworks: ${{ parameters.targetFrameworks }}
+    primaryTargetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
     testJobTimeout: ${{ parameters.testJobTimeout }}
     testSets: ${{ parameters.testSets }}
     useManagedSNI: ${{ parameters.useManagedSNI }}

From bdc6546ee29be4150c3b6798aa064bbbe2696edd Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 3 Sep 2026 12:06:16 -0300
Subject: [PATCH 263/298] Trigger Kerberos CI from package pipeline (#4499)

* Trigger Kerberos tests from package pipeline

* Restructure Kerberos and MI test pipelines

* Avoid tag fetches in upstream alignment checkout (#4499)

* Use current images for MI and Kerberos tests

* Address PR 4499 pipeline review feedback

* Remove Kerberos code coverage stage

* Secure Kerberos teardown credentials (#4499)

* Fix downstream package version resolution
---
 .../ci/kerberos/build-and-test-steps.yml      | 138 --------
 eng/pipelines/ci/kerberos/linux-init-step.yml | 117 ------
 .../ci/kerberos/linux-setup-step.yml          | 110 ++++++
 ...eanup-step.yml => linux-teardown-step.yml} |  11 +-
 .../ci/kerberos/sqlclient-ci-kerberos-job.yml | 132 +++++++
 .../sqlclient-ci-kerberos-pipeline.yml        | 332 ++++--------------
 .../kerberos/sqlclient-ci-kerberos-stages.yml | 107 ++++++
 .../ci/kerberos/windows-setup-step.yml        |  52 +++
 .../sqlclient-ci-managed-instance-job.yml     |   7 -
 ...sqlclient-ci-managed-instance-pipeline.yml |  13 +-
 .../sqlclient-ci-managed-instance-stage.yml   | 111 ------
 .../sqlclient-ci-managed-instance-stages.yml  | 100 ++++++
 .../ci/stress/sqlclient-ci-stress-job.yml     |  10 +-
 .../stress/sqlclient-ci-stress-pipeline.yml   |  10 +-
 .../steps/align-source-with-upstream-step.yml |   8 +
 .../steps/download-driver-packages-step.yml   |  27 +-
 .../common/steps/download-driver-packages.ps1 |  76 ++--
 17 files changed, 633 insertions(+), 728 deletions(-)
 delete mode 100644 eng/pipelines/ci/kerberos/build-and-test-steps.yml
 delete mode 100644 eng/pipelines/ci/kerberos/linux-init-step.yml
 create mode 100644 eng/pipelines/ci/kerberos/linux-setup-step.yml
 rename eng/pipelines/ci/kerberos/{linux-cleanup-step.yml => linux-teardown-step.yml} (77%)
 create mode 100644 eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml
 create mode 100644 eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-stages.yml
 create mode 100644 eng/pipelines/ci/kerberos/windows-setup-step.yml
 delete mode 100644 eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml
 create mode 100644 eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml

diff --git a/eng/pipelines/ci/kerberos/build-and-test-steps.yml b/eng/pipelines/ci/kerberos/build-and-test-steps.yml
deleted file mode 100644
index dbb3b5e1e2..0000000000
--- a/eng/pipelines/ci/kerberos/build-and-test-steps.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# Shared build-and-test steps used by both the Windows and Linux Kerberos jobs.
-#
-# Parameters:
-#   testFramework — The TFM to test against (e.g. net9.0, net462).
-#   testRunTitle  — Title for the published test results (displayed in the ADO
-#                   Tests tab).
-#   artifactName  — Name of the published pipeline artifact that carries the
-#                   test results and coverage files.
-
-parameters:
-
-  # TFM to pass to the test targets (-p:TestFramework).
-  - name: testFramework
-    type: string
-
-  # Title shown in the ADO Tests tab for this run.
-  - name: testRunTitle
-    type: string
-
-  # Pipeline artifact name for test results and coverage.
-  - name: artifactName
-    type: string
-
-steps:
-
-  # ---------------------------------------------------------------------------
-  # Build
-  # ---------------------------------------------------------------------------
-
-  # Build SqlClient.
-  #
-  # The test stages build as part of their targets, but this separate step isolates build failures
-  # so we can fail fast before running tests. Retries are enabled intentionally (1 attempt for
-  # build, 2 attempts for test steps) to reduce transient infrastructure-related failures.
-  #
-  - task: DotNetCoreCLI@2
-    displayName: Build SqlClient
-    retryCountOnTaskFailure: 1
-    inputs:
-      command: build
-      projects: build.proj
-      arguments: >-
-        -t:BuildSqlClient
-        -p:Configuration=Release
-
-  # ---------------------------------------------------------------------------
-  # Run tests in separate steps to permit focused retries.
-  # ---------------------------------------------------------------------------
-
-  # Run the Unit Test suite.
-  - task: DotNetCoreCLI@2
-    displayName: Run Unit Tests (${{ parameters.testFramework }})
-    retryCountOnTaskFailure: 2
-    inputs:
-      command: build
-      projects: build.proj
-      arguments: >-
-        -t:TestSqlClientUnit
-        -p:TestFramework=${{ parameters.testFramework }}
-        -p:Configuration=Release
-
-  # Run the Functional Test suite.
-  - task: DotNetCoreCLI@2
-    displayName: Run Functional Tests (${{ parameters.testFramework }})
-    retryCountOnTaskFailure: 2
-    inputs:
-      command: build
-      projects: build.proj
-      arguments: >-
-        -t:TestSqlClientFunctional
-        -p:TestFramework=${{ parameters.testFramework }}
-        -p:Configuration=Release
-
-  # Run the Manual Test suite.
-  - task: DotNetCoreCLI@2
-    displayName: Run Manual Tests (${{ parameters.testFramework }})
-    retryCountOnTaskFailure: 2
-    inputs:
-      command: build
-      projects: build.proj
-      arguments: >-
-        -t:TestSqlClientManual
-        -p:TestFramework=${{ parameters.testFramework }}
-        -p:Configuration=Release
-
-  # ---------------------------------------------------------------------------
-  # Publish results & coverage
-  # ---------------------------------------------------------------------------
-
-  # Publish the TRX test results to the pipeline run.
-  - task: PublishTestResults@2
-    displayName: Publish Test Results
-    condition: succeededOrFailed()
-    inputs:
-      testResultsFormat: VSTest
-      # build.proj defines TestResultsFolderPath which defaults to
-      # $(Build.SourcesDirectory)/test_results, so we look there for the results and coverage files.
-      testResultsFiles:  $(Build.SourcesDirectory)/test_results/**/*.trx
-      mergeTestResults: true
-      testRunTitle: ${{ parameters.testRunTitle }}
-      buildConfiguration: Release
-
-  # Azure Pipelines task conditions do not support path existence checks directly,
-  # so compute this once and gate later steps on the variable.
-  - pwsh: |
-      $resultsDir = "$(Build.SourcesDirectory)/test_results"
-      if (Test-Path -LiteralPath $resultsDir) {
-        Write-Host "##vso[task.setvariable variable=HasTestResultsDir]true"
-      }
-      else {
-        Write-Host "##vso[task.setvariable variable=HasTestResultsDir]false"
-      }
-    displayName: Detect test_results directory
-    condition: succeededOrFailed()
-
-  # Give our coverage files a unique name to make it clear where they originated when we download
-  # the artifacts from all jobs in the merge stage.
-  - pwsh: |
-      cd $(Build.SourcesDirectory)/test_results
-      Get-ChildItem -Filter "*.coverage" -Recurse |
-        Rename-Item -NewName { "${{ parameters.testFramework }}" + $_.Name }
-    displayName: Rename coverage files
-    condition: and(succeededOrFailed(), eq(variables['HasTestResultsDir'], 'true'))
-
-  # Publish TRX test results and coverage files as pipeline artifacts.  The merge stage needs the
-  # coverage files from all of the jobs.
-  - task: PublishPipelineArtifact@1
-    displayName: Publish Test Artifacts
-    condition: and(succeededOrFailed(), eq(variables['HasTestResultsDir'], 'true'))
-    inputs:
-      targetPath: $(Build.SourcesDirectory)/test_results
-      artifact: ${{ parameters.artifactName }}
diff --git a/eng/pipelines/ci/kerberos/linux-init-step.yml b/eng/pipelines/ci/kerberos/linux-init-step.yml
deleted file mode 100644
index c0c4603232..0000000000
--- a/eng/pipelines/ci/kerberos/linux-init-step.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-
-# This template joins a Linux agent to an Active Directory domain using Kerberos
-# and acquires a TGT (Ticket-Granting Ticket) for the specified domain user.
-#
-# Prerequisites:
-#   - The agent must be running on Ubuntu/Debian (uses apt-get).
-#   - The domain controller must be reachable from the agent network.
-#
-# After this step completes successfully, the agent will have:
-#   - Kerberos packages installed (krb5-user, realmd, sssd, adcli, etc.)
-#   - Hostname set to FQDN within the domain
-#   - NTP synchronized with the domain controller
-#   - Machine joined to the AD domain
-#   - A valid Kerberos TGT for the specified user
-
-parameters:
-
-  # The Active Directory domain to join (e.g. mydomain.contoso.com).
-  - name: kerberosDomain
-    type: string
-
-  # The Organizational Unit in which to place the computer account.
-  - name: kerberosDomainOU
-    type: string
-
-  # The domain user account to authenticate with (sAMAccountName, without @realm).
-  - name: kerberosDomainUser
-    type: string
-
-  # The password for the domain user account.
-  - name: kerberosDomainPassword
-    type: string
-
-steps:
-
-  - bash: |
-      set -euo pipefail
-
-      DOMAIN="${{ parameters.kerberosDomain }}"
-      DOMAIN_OU="${{ parameters.kerberosDomainOU }}"
-      DOMAIN_USER="${{ parameters.kerberosDomainUser }}"
-      DOMAIN_PASSWORD="${{ parameters.kerberosDomainPassword }}"
-      DOMAIN_UPPER=$(echo "$DOMAIN" | tr '[:lower:]' '[:upper:]')
-
-      echo "Domain:   $DOMAIN"
-      echo "Realm:    $DOMAIN_UPPER"
-      echo "User:     $DOMAIN_USER"
-      echo "OU:       $DOMAIN_OU"
-
-      if [ -z "$DOMAIN_PASSWORD" ]; then
-        echo "##vso[task.logissue type=error]KerberosDomainPassword is empty"
-        exit 1
-      fi
-
-      # -----------------------------------------------------------------------
-      # Install Kerberos and AD integration packages
-      # -----------------------------------------------------------------------
-      echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
-
-      sudo apt-get -y update
-      sudo apt-get install -y dialog apt-utils
-      sudo apt-get install -y \
-        krb5-user samba sssd sssd-tools libnss-sss libpam-sss \
-        ntp ntpdate realmd adcli
-
-      # -----------------------------------------------------------------------
-      # Set the hostname to FQDN within the domain
-      # -----------------------------------------------------------------------
-      CURRENT_HOSTNAME="$(hostname)"
-      if [ "$CURRENT_HOSTNAME" = "$DOMAIN" ] || [[ "$CURRENT_HOSTNAME" == *".$DOMAIN" ]]; then
-        echo "Hostname already uses domain suffix '.$DOMAIN': $CURRENT_HOSTNAME"
-      else
-        sudo hostnamectl set-hostname "$CURRENT_HOSTNAME.$DOMAIN"
-      fi
-
-      # -----------------------------------------------------------------------
-      # Synchronize time with the domain controller (required for Kerberos)
-      # -----------------------------------------------------------------------
-      if ! sudo grep -Fqx "server $DOMAIN" /etc/ntp.conf; then
-        echo "server $DOMAIN" | sudo tee -a /etc/ntp.conf
-      fi
-      sudo systemctl stop ntp
-      sudo ntpdate "$DOMAIN"
-      sudo systemctl start ntp
-
-      # -----------------------------------------------------------------------
-      # Configure Kerberos realm
-      # -----------------------------------------------------------------------
-      echo "[libdefaults]
-              default_realm = $DOMAIN_UPPER
-              rdns = false" | sudo tee /etc/krb5.conf
-
-      # -----------------------------------------------------------------------
-      # Discover and join the domain
-      # -----------------------------------------------------------------------
-      sudo realm discover "$DOMAIN_UPPER"
-
-      echo "$DOMAIN_PASSWORD" | sudo realm join --verbose "$DOMAIN_UPPER" \
-        -U "$DOMAIN_USER@$DOMAIN_UPPER" \
-        --computer-ou "OU=$DOMAIN_OU"
-
-      realm list
-
-      # -----------------------------------------------------------------------
-      # Acquire a Kerberos TGT
-      # -----------------------------------------------------------------------
-      echo "$DOMAIN_PASSWORD" | kinit "$DOMAIN_USER@$DOMAIN_UPPER"
-
-      klist
-      sudo ip addr
-      sudo ip route
-    displayName: Initialize Kerberos (domain join + kinit)
diff --git a/eng/pipelines/ci/kerberos/linux-setup-step.yml b/eng/pipelines/ci/kerberos/linux-setup-step.yml
new file mode 100644
index 0000000000..c5de26b3ba
--- /dev/null
+++ b/eng/pipelines/ci/kerberos/linux-setup-step.yml
@@ -0,0 +1,110 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# Configures a Linux agent, joins it to the domain, acquires a Kerberos ticket, and verifies SQL
+# connectivity before running integration tests.
+
+parameters:
+
+  - name: kerberosDomain
+    type: string
+
+  - name: kerberosDomainOU
+    type: string
+
+  - name: kerberosDomainUser
+    type: string
+
+  - name: kerberosDomainPassword
+    type: string
+
+steps:
+
+  - pwsh: |
+      $jdata = Get-Content -Raw "config.default.jsonc" | ConvertFrom-Json
+      foreach ($p in $jdata) {
+          $p.TCPConnectionString = $env:REMOTE_TCP_CONN_STRING
+          $p.NPConnectionString = $env:REMOTE_NP_CONN_STRING
+          $p.SupportsIntegratedSecurity = $true
+      }
+      $jdata | Add-Member -NotePropertyName "KerberosDomainUser" -NotePropertyValue $env:KERBEROS_DOMAIN_USER -Force
+      $jdata | Add-Member -NotePropertyName "KerberosDomainPassword" -NotePropertyValue $env:KERBEROS_DOMAIN_PASSWORD -Force
+      $jdata | ConvertTo-Json | Set-Content "config.jsonc"
+    workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
+    displayName: Update test config.jsonc (Kerberos)
+    env:
+      REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
+      REMOTE_NP_CONN_STRING: $(REMOTE_NP_CONN_STRING)
+      KERBEROS_DOMAIN_USER: ${{ parameters.kerberosDomainUser }}
+      KERBEROS_DOMAIN_PASSWORD: ${{ parameters.kerberosDomainPassword }}
+
+  - bash: |
+      set -euo pipefail
+
+      DOMAIN="${{ parameters.kerberosDomain }}"
+      DOMAIN_OU="${{ parameters.kerberosDomainOU }}"
+      DOMAIN_USER="${{ parameters.kerberosDomainUser }}"
+      DOMAIN_UPPER=$(echo "$DOMAIN" | tr '[:lower:]' '[:upper:]')
+
+      echo "Domain:   $DOMAIN"
+      echo "Realm:    $DOMAIN_UPPER"
+      echo "User:     $DOMAIN_USER"
+      echo "OU:       $DOMAIN_OU"
+
+      if [ -z "${DOMAIN_PASSWORD:-}" ]; then
+        echo "##vso[task.logissue type=error]KerberosDomainPassword is empty"
+        exit 1
+      fi
+
+      echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
+
+      sudo apt-get -y update
+      sudo apt-get install -y dialog apt-utils
+      sudo apt-get install -y \
+        krb5-user samba sssd sssd-tools libnss-sss libpam-sss \
+        ntp ntpdate realmd adcli
+
+      CURRENT_HOSTNAME="$(hostname)"
+      if [ "$CURRENT_HOSTNAME" = "$DOMAIN" ] || [[ "$CURRENT_HOSTNAME" == *".$DOMAIN" ]]; then
+        echo "Hostname already uses domain suffix '.$DOMAIN': $CURRENT_HOSTNAME"
+      else
+        sudo hostnamectl set-hostname "$CURRENT_HOSTNAME.$DOMAIN"
+      fi
+
+      if ! sudo grep -Fqx "server $DOMAIN" /etc/ntp.conf; then
+        echo "server $DOMAIN" | sudo tee -a /etc/ntp.conf
+      fi
+      sudo systemctl stop ntp
+      sudo ntpdate "$DOMAIN"
+      sudo systemctl start ntp
+
+      echo "[libdefaults]
+              default_realm = $DOMAIN_UPPER
+              rdns = false" | sudo tee /etc/krb5.conf
+
+      sudo realm discover "$DOMAIN_UPPER"
+
+      echo "$DOMAIN_PASSWORD" | sudo realm join --verbose "$DOMAIN_UPPER" \
+        -U "$DOMAIN_USER@$DOMAIN_UPPER" \
+        --computer-ou "OU=$DOMAIN_OU"
+
+      realm list
+
+      echo "$DOMAIN_PASSWORD" | kinit "$DOMAIN_USER@$DOMAIN_UPPER"
+
+      klist
+      sudo ip addr
+      sudo ip route
+    displayName: Initialize Kerberos (domain join + kinit)
+    env:
+      DOMAIN_PASSWORD: ${{ parameters.kerberosDomainPassword }}
+
+  - pwsh: |
+      Install-Module -Name SqlServer -Force -Confirm:$false
+      Import-Module SqlServer
+      Invoke-Sqlcmd -Query "SELECT @@VERSION, @@SERVERNAME" -ConnectionString $env:REMOTE_TCP_CONN_STRING
+    displayName: Verify SQL connectivity
+    env:
+      REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
\ No newline at end of file
diff --git a/eng/pipelines/ci/kerberos/linux-cleanup-step.yml b/eng/pipelines/ci/kerberos/linux-teardown-step.yml
similarity index 77%
rename from eng/pipelines/ci/kerberos/linux-cleanup-step.yml
rename to eng/pipelines/ci/kerberos/linux-teardown-step.yml
index d3491bb337..df01baffc0 100644
--- a/eng/pipelines/ci/kerberos/linux-cleanup-step.yml
+++ b/eng/pipelines/ci/kerberos/linux-teardown-step.yml
@@ -4,9 +4,9 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# This template leaves the Active Directory domain and destroys Kerberos
-# credentials.  It should be referenced at the end of any job that called
-# linux-init-step.yml.
+# This template tears down the Linux Kerberos environment by leaving the Active Directory domain
+# and destroying credentials. It should be referenced at the end of any job that called
+# linux-setup-step.yml.
 #
 # All steps use condition: always() so that cleanup runs even when previous
 # steps fail.
@@ -32,14 +32,15 @@ steps:
 
       DOMAIN="${{ parameters.kerberosDomain }}"
       DOMAIN_USER="${{ parameters.kerberosDomainUser }}"
-      DOMAIN_PASSWORD="${{ parameters.kerberosDomainPassword }}"
       DOMAIN_UPPER=$(echo "$DOMAIN" | tr '[:lower:]' '[:upper:]')
 
       # Leave the domain
-      echo "$DOMAIN_PASSWORD" | sudo realm leave "$DOMAIN_UPPER" --verbose \
+      echo "${DOMAIN_PASSWORD:-}" | sudo realm leave "$DOMAIN_UPPER" --verbose \
         -U "$DOMAIN_USER@$DOMAIN_UPPER" || true
 
       # Destroy the TGT and credential cache
       kdestroy || true
     displayName: Clean up Kerberos (domain leave + kdestroy)
     condition: always()
+    env:
+      DOMAIN_PASSWORD: ${{ parameters.kerberosDomainPassword }}
diff --git a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml
new file mode 100644
index 0000000000..f6a1b680e7
--- /dev/null
+++ b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml
@@ -0,0 +1,132 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# Runs the Kerberos integration tests for one OS, runtime, and SNI configuration using the exact
+# packages produced by the triggering sqlclient-ci-package pipeline.
+
+parameters:
+
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  - name: debug
+    type: boolean
+
+  - name: displayName
+    type: string
+
+  - name: dotnetVerbosity
+    type: string
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
+  - name: jobNameSuffix
+    type: string
+
+  - name: operatingSystem
+    type: string
+    values:
+      - Linux
+      - Windows
+
+  - name: poolName
+    type: string
+
+  - name: runtime
+    type: string
+
+  - name: useManagedSNI
+    type: boolean
+    default: false
+
+  - name: vmImage
+    type: string
+
+jobs:
+  - job: kerberos_tests_job_${{ parameters.jobNameSuffix }}
+    displayName: ${{ parameters.displayName }}
+    timeoutInMinutes: 90
+
+    workspace:
+      clean: all
+
+    pool:
+      name: ${{ parameters.poolName }}
+      demands:
+        - ImageOverride -equals ${{ parameters.vmImage }}
+
+    steps:
+
+      # Align source with the commit that produced the upstream packages while retaining the
+      # pipeline definitions from the commit at which this run was queued.
+      - template: /eng/pipelines/common/steps/align-source-with-upstream-step.yml@self
+
+      - template: /eng/pipelines/common/steps/download-driver-packages-step.yml@self
+
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
+        parameters:
+          debug: ${{ parameters.debug }}
+          runtimes: [8.x, 9.x, 10.x]
+
+      - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
+
+      - task: NuGetAuthenticate@1
+        displayName: Authenticate NuGet feeds
+
+      - ${{ if eq(parameters.operatingSystem, 'Windows') }}:
+        - template: /eng/pipelines/ci/kerberos/windows-setup-step.yml@self
+          parameters:
+            useManagedSNI: ${{ parameters.useManagedSNI }}
+
+      - ${{ if eq(parameters.operatingSystem, 'Linux') }}:
+        - template: /eng/pipelines/ci/kerberos/linux-setup-step.yml@self
+          parameters:
+            kerberosDomain: $(KerberosDomain)
+            kerberosDomainOU: $(KerberosDomainOU)
+            kerberosDomainUser: $(KerberosDomainUser)
+            kerberosDomainPassword: $(KerberosDomainPassword)
+
+      # UnitTests and FunctionalTests cover environment-independent SPN, SSPI, and connection
+      # string behavior in normal CI. Run only ManualTests that use the Kerberos environment.
+      - task: DotNetCoreCLI@2
+        displayName: Run Kerberos Integration Tests
+        retryCountOnTaskFailure: 2
+        inputs:
+          command: build
+          projects: build.proj
+          arguments: >-
+            --verbosity ${{ parameters.dotnetVerbosity }}
+            -t:TestSqlClientManual
+            -p:TestFramework=${{ parameters.runtime }}
+            -p:TestSet=3
+            -p:TestFilters="category!=failing&category!=flaky&category!=interactive&(FullyQualifiedName~KerberosTests|FullyQualifiedName~IntegratedAuthenticationTest|FullyQualifiedName~InstanceNameTest)"
+            -p:ReferenceType=Package
+            -p:Configuration=${{ parameters.buildConfiguration }}
+            -p:PackageVersionSqlClient=$(sqlClientPackageVersion)
+            -p:PackageVersionSqlServer=$(sqlServerPackageVersion)
+
+      - task: PublishTestResults@2
+        displayName: Publish Test Results
+        condition: succeededOrFailed()
+        inputs:
+          testResultsFormat: VSTest
+          testResultsFiles: $(Build.SourcesDirectory)/test_results/**/*.trx
+          mergeTestResults: true
+          testRunTitle: ${{ parameters.displayName }}
+          buildConfiguration: ${{ parameters.buildConfiguration }}
+
+      - ${{ if eq(parameters.operatingSystem, 'Linux') }}:
+        - template: /eng/pipelines/ci/kerberos/linux-teardown-step.yml@self
+          parameters:
+            kerberosDomain: $(KerberosDomain)
+            kerberosDomainUser: $(KerberosDomainUser)
+            kerberosDomainPassword: $(KerberosDomainPassword)
\ No newline at end of file
diff --git a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
index 6bdea0157f..28ce2a2ed6 100644
--- a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
+++ b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
@@ -1,55 +1,63 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
 
-# =============================================================================
-# sqlclient-ci-kerberos-pipeline
-# =============================================================================
-# Daily Kerberos authentication test pipeline for Microsoft.Data.SqlClient.
-# Replaces the Classic "Test-SqlClient-Kerberos-Azure" pipeline.
+# Kerberos authentication integration tests for Microsoft.Data.SqlClient. The tests consume the
+# packages produced by sqlclient-ci-package and run on domain-connected Windows and Linux agents.
 #
-# Schedule: daily at 07:00 UTC on internal/main.
-#
-# Job breakdown (10 total):
-#   Stage: windows           → 7 jobs  (net462 + net8/9/10 × NativeSNI/ManagedSNI)
-#   Stage: linux             → 3 jobs  (net8, net9, net10 — ManagedSNI only)
-#   Stage: Merge-Code-Coverage → 1 job
-#
-# Shared steps:
-#   Build and test steps are defined in build-and-test-steps.yml and reused
-#   by both stages. Each stage passes its OS-specific build target and the
-#   per-job testFramework matrix variable.
-#
-# Required ADO variable groups (link in pipeline UI):
-#   - kv-sqldrivers-shared    (provides the agent-at-sqldrv-ad secret)
-#
-# Variables defined in this file (no pipeline UI configuration needed):
-#   - KerberosDomain          sqldrv.ad
-#   - KerberosDomainOU        agents
-#   - KerberosDomainUser      agent
-#   - KerberosDomainPassword  $(agent-at-sqldrv-ad) from kv-sqldrivers-shared
-#   - REMOTE_TCP_CONN_STRING  TCP connection string to sqldrv-sql22
-#   - REMOTE_NP_CONN_STRING   Named Pipe connection string to sqldrv-sql22
-# =============================================================================
-
-trigger: none   # Scheduled runs only — no CI trigger
-pr: none        # Not triggered by PRs
-
-schedules:
-  - cron: '0 7 * * *'
-    displayName: Daily run (07:00 UTC)
-    branches:
-      include:
-        - internal/main
-    always: true
+# Job breakdown:
+#   - Windows: net462 with native SNI, plus net8/9/10 with native and managed SNI (7 jobs).
+#   - Linux: net8/9/10 with managed SNI (3 jobs).
 
 name: $(date:yyyyMMdd)$(rev:.r)
 
+# Do not trigger this pipeline for PRs or commits.
+trigger: none
+pr: none
+
+# The resource branch filter limits completion triggers to the intended upstream branch. Because
+# both pipelines use the same repository, an eligible run executes this YAML from the triggering
+# package run's branch and commit, preserving branch-specific pipeline definitions.
+resources:
+  pipelines:
+    - pipeline: sqlclient-ci-package
+      source: sqlclient-ci-package
+      trigger:
+        branches:
+          include:
+            - internal/main
+
+parameters:
+
+  - name: buildConfiguration
+    displayName: Test Build Configuration
+    type: string
+    default: Release
+    values:
+      - Debug
+      - Release
+
+  - name: debug
+    displayName: Enable debug output
+    type: boolean
+    default: false
+
+  - name: dotnetVerbosity
+    displayName: dotnet CLI Verbosity
+    type: string
+    default: normal
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
 variables:
-  # Our Kerberos environment doesn't change often, so we can define these variables here rather than
-  # in the Pipeline UI or in Libraries.
+
+  # Kerberos environment settings shared by all jobs. KerberosDomainPassword resolves from the
+  # kv-sqldrivers-shared variable group imported by each OS stage.
   - name: KerberosDomain
     value: sqldrv.ad
 
@@ -60,7 +68,7 @@ variables:
     value: agent
 
   - name: KerberosDomainPassword
-    value: $(agent-at-sqldrv-ad)   # Secret from kv-sqldrivers-shared variable group
+    value: $(agent-at-sqldrv-ad)
 
   - name: REMOTE_TCP_CONN_STRING
     value: Data Source=tcp:sqldrv-sql22.sqldrv.ad\sql2022;Initial Catalog=Northwind;Integrated Security=true;Encrypt=false;TrustServerCertificate=true
@@ -68,229 +76,9 @@ variables:
   - name: REMOTE_NP_CONN_STRING
     value: Data Source=np:sqldrv-sql22.sqldrv.ad\sql2022;Initial Catalog=Northwind;Integrated Security=true;Encrypt=false;TrustServerCertificate=true
 
-# =============================================================================
-# STAGES
-# =============================================================================
 stages:
-
-  # ===========================================================================
-  # Stage 1 - Windows (7 jobs = net462 + 3 TFs × 2 ManagedSNI)
-  # ===========================================================================
-  - stage: windows
-    displayName: Windows
-    dependsOn: []
-    variables:
-      # KerberosDomainPassword expands at runtime in this stage from the agent-at-sqldrv-ad secret
-      # exposed by this variable group.
-      - group: kv-sqldrivers-shared
-    jobs:
-      - job: windows
-        displayName: Windows
-        timeoutInMinutes: 90
-        workspace:
-          clean: all    # Purge obj/artifacts from prior runs on self-hosted agents
-        strategy:
-          matrix:
-            # Azure Pipelines exposes matrix variables as environment variables for each step.
-            # Do not use the name targetFramework here: MSBuild imports environment variables as
-            # properties, and TargetFramework would leak into dotnet build build.proj, forcing
-            # transitive project references onto an invalid TFM (for example SqlServer.Server -> net9.0).
-            net462_NativeSNI:
-              testFramework: net462
-              managedSNI: 'false'
-            net8_NativeSNI:
-              testFramework: net8.0
-              managedSNI: 'false'
-            net8_ManagedSNI:
-              testFramework: net8.0
-              managedSNI: 'true'
-            net9_NativeSNI:
-              testFramework: net9.0
-              managedSNI: 'false'
-            net9_ManagedSNI:
-              testFramework: net9.0
-              managedSNI: 'true'
-            net10_NativeSNI:
-              testFramework: net10.0
-              managedSNI: 'false'
-            net10_ManagedSNI:
-              testFramework: net10.0
-              managedSNI: 'true'
-        pool:
-          name: ADO-Trusted-Domain-Win-WestUS2
-          demands:
-            - ImageOverride -equals ADO-MMS22-SQL19
-        steps:
-
-          - checkout: self
-            clean: true
-            fetchDepth: 1
-            fetchTags: false
-
-          - template: /eng/pipelines/common/steps/install-dotnet.yml@self
-            parameters:
-              runtimes: [8.x, 9.x]
-
-          # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets
-          # such as _CheckPwshToolRestored that run during the SqlClient ref project build.
-          - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
-
-          # --- Update test configuration ---
-          # Uses runtime variables from the matrix ($(managedSNI)) so we use
-          # inline PowerShell instead of the shared config template which
-          # requires compile-time parameters.
-          - pwsh: |
-              $managedSni = [System.Convert]::ToBoolean($env:MANAGED_SNI)
-              $jdata = Get-Content -Raw "config.default.jsonc" | ConvertFrom-Json
-              foreach ($p in $jdata) {
-                  $p.TCPConnectionString       = $env:REMOTE_TCP_CONN_STRING
-                  $p.NPConnectionString        = $env:REMOTE_NP_CONN_STRING
-                  $p.SupportsIntegratedSecurity = $true
-                  $p.UseManagedSNIOnWindows    = $managedSni
-              }
-              $jdata | ConvertTo-Json | Set-Content "config.jsonc"
-            workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
-            displayName: Update test config.jsonc
-            env:
-              REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
-              REMOTE_NP_CONN_STRING: $(REMOTE_NP_CONN_STRING)
-              MANAGED_SNI: $(managedSNI)
-
-          # --- Prepare Windows services ---
-          - powershell: |
-              $svc = Get-Service -Name SQLBrowser -ErrorAction SilentlyContinue
-              if ($null -ne $svc) {
-                  Set-Service -StartupType Automatic SQLBrowser
-                  if ($svc.Status -ne 'Running') { Start-Service SQLBrowser }
-                  Get-Service SQLBrowser | Select-Object Name, StartType, Status
-              }
-            displayName: Start SQL Server Browser
-
-          - powershell: |
-              Set-DtcNetworkSetting -DtcName "Local" `
-                -InboundTransactionsEnabled $true `
-                -OutboundTransactionsEnabled $true `
-                -RemoteClientAccessEnabled $true `
-                -Confirm:$false
-
-              Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (RPC)"      | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
-              Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (RPC-EPMAP)" | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
-              Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (TCP-Out)"   | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
-              Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (TCP-In)"    | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
-            displayName: Enable Network DTC Access
-
-          # --- Build and test ---
-          - template: /eng/pipelines/ci/kerberos/build-and-test-steps.yml@self
-            parameters:
-              testFramework: $(testFramework)
-              testRunTitle: Windows-$(testFramework)-ManagedSNI_$(managedSNI)
-              artifactName: $(testFramework)-ManagedSNI_$(managedSNI)-$(System.JobId)
-
-  # ===========================================================================
-  # Stage 2 - Linux - .NET Core + Kerberos (3 jobs = 3 TFs)
-  # ===========================================================================
-  - stage: linux
-    displayName: Linux
-    dependsOn: []
-    variables:
-      # KerberosDomainPassword expands at runtime in this stage from the agent-at-sqldrv-ad secret
-      # exposed by this variable group.
-      - group: kv-sqldrivers-shared
-    jobs:
-      - job: linux
-        displayName: Linux
-        timeoutInMinutes: 90
-        workspace:
-          clean: all    # Purge leftovers on self-hosted agents to reduce cross-run flakiness
-        strategy:
-          matrix:
-            net8:
-              testFramework: net8.0
-            net9:
-              testFramework: net9.0
-            net10:
-              testFramework: net10.0
-        pool:
-          name: ADO-Trusted-Linux-WestUS2
-          demands:
-            - ImageOverride -equals ADO-UB20-SQL22
-
-        steps:
-
-          - checkout: self
-            clean: true
-            fetchDepth: 1
-            fetchTags: false
-
-          # --- Install .NET SDK and runtimes ---
-          - template: /eng/pipelines/common/steps/install-dotnet.yml@self
-            parameters:
-              runtimes: [8.x, 9.x]
-
-          # Restore dotnet local tools (pwsh, apicompat, etc.). Required by build.proj targets
-          # such as _CheckPwshToolRestored that run during the SqlClient ref project build.
-          - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
-
-          # --- Update test configuration (with Kerberos credentials) ---
-          - pwsh: |
-              $jdata = Get-Content -Raw "config.default.jsonc" | ConvertFrom-Json
-              foreach ($p in $jdata) {
-                  $p.TCPConnectionString       = $env:REMOTE_TCP_CONN_STRING
-                  $p.NPConnectionString        = $env:REMOTE_NP_CONN_STRING
-                  $p.SupportsIntegratedSecurity = $true
-              }
-              $jdata | Add-Member -NotePropertyName "KerberosDomainUser"     -NotePropertyValue $env:KERBEROS_DOMAIN_USER     -Force
-              $jdata | Add-Member -NotePropertyName "KerberosDomainPassword" -NotePropertyValue $env:KERBEROS_DOMAIN_PASSWORD -Force
-              $jdata | ConvertTo-Json | Set-Content "config.jsonc"
-            workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
-            displayName: Update test config.jsonc (Kerberos)
-            env:
-              REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
-              REMOTE_NP_CONN_STRING: $(REMOTE_NP_CONN_STRING)
-              KERBEROS_DOMAIN_USER: $(KerberosDomainUser)
-              KERBEROS_DOMAIN_PASSWORD: $(KerberosDomainPassword)
-
-          # --- Kerberos domain join ---
-          - template: /eng/pipelines/ci/kerberos/linux-init-step.yml@self
-            parameters:
-              kerberosDomain: $(KerberosDomain)
-              kerberosDomainOU: $(KerberosDomainOU)
-              kerberosDomainUser: $(KerberosDomainUser)
-              kerberosDomainPassword: $(KerberosDomainPassword)
-
-          # --- Verify SQL connectivity ---
-          - pwsh: |
-              Install-Module -Name SqlServer -Force -Confirm:$false
-              Import-Module SqlServer
-              Invoke-Sqlcmd -Query "SELECT @@VERSION, @@SERVERNAME" -ConnectionString $env:REMOTE_TCP_CONN_STRING
-            displayName: Verify SQL connectivity
-            env:
-              REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
-
-          # --- Build and test ---
-          - template: /eng/pipelines/ci/kerberos/build-and-test-steps.yml@self
-            parameters:
-              testFramework: $(testFramework)
-              testRunTitle: Linux-$(testFramework)
-              artifactName: $(testFramework)-linux-$(System.JobId)
-
-          # --- Kerberos cleanup (always runs) ---
-          - template: /eng/pipelines/ci/kerberos/linux-cleanup-step.yml@self
-            parameters:
-              kerberosDomain: $(KerberosDomain)
-              kerberosDomainUser: $(KerberosDomainUser)
-              kerberosDomainPassword: $(KerberosDomainPassword)
-
-  # ===========================================================================
-  # Stage 3 — Merge Code Coverage (1 job)
-  # ===========================================================================
-  - stage: merge
-    displayName: Merge Code Coverage
-    dependsOn:
-      - windows
-      - linux
-    condition: succeeded()
-    jobs:
-      - template: /eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml@self
-        parameters:
-          upload: false
+  - template: /eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-stages.yml@self
+    parameters:
+      buildConfiguration: ${{ parameters.buildConfiguration }}
+      debug: ${{ parameters.debug }}
+      dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-stages.yml b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-stages.yml
new file mode 100644
index 0000000000..86c1b95cc9
--- /dev/null
+++ b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-stages.yml
@@ -0,0 +1,107 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# Defines separate Windows and Linux Kerberos test stages.
+
+parameters:
+
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  - name: debug
+    type: boolean
+
+  - name: dotnetVerbosity
+    type: string
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
+  - name: netFrameworkTestRuntimes
+    type: object
+    default: [net462]
+
+  - name: netTestRuntimes
+    type: object
+    default: [net8.0, net9.0, net10.0]
+
+stages:
+
+  - stage: windows
+    displayName: Windows
+    dependsOn: []
+    variables:
+      - group: kv-sqldrivers-shared
+    jobs:
+
+      # .NET Framework uses native SNI.
+      - ${{ each runtime in parameters.netFrameworkTestRuntimes }}:
+        - template: /eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml@self
+          parameters:
+            buildConfiguration: ${{ parameters.buildConfiguration }}
+            debug: ${{ parameters.debug }}
+            displayName: 'Win : Native SNI : ${{ runtime }}'
+            dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+            jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
+            operatingSystem: Windows
+            poolName: ADO-Trusted-Domain-Win-WestUS2
+            runtime: ${{ runtime }}
+            useManagedSNI: false
+            vmImage: ADO-Win25
+
+      # .NET runs with both native and managed SNI.
+      - ${{ each runtime in parameters.netTestRuntimes }}:
+        - template: /eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml@self
+          parameters:
+            buildConfiguration: ${{ parameters.buildConfiguration }}
+            debug: ${{ parameters.debug }}
+            displayName: 'Win : Native SNI : ${{ runtime }}'
+            dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+            jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
+            operatingSystem: Windows
+            poolName: ADO-Trusted-Domain-Win-WestUS2
+            runtime: ${{ runtime }}
+            useManagedSNI: false
+            vmImage: ADO-Win25
+
+        - template: /eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml@self
+          parameters:
+            buildConfiguration: ${{ parameters.buildConfiguration }}
+            debug: ${{ parameters.debug }}
+            displayName: 'Win : Managed SNI : ${{ runtime }}'
+            dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+            jobNameSuffix: windows_managed_sni_${{ replace(runtime, '.', '_') }}
+            operatingSystem: Windows
+            poolName: ADO-Trusted-Domain-Win-WestUS2
+            runtime: ${{ runtime }}
+            useManagedSNI: true
+            vmImage: ADO-Win25
+
+  - stage: linux
+    displayName: Linux
+    dependsOn: []
+    variables:
+      - group: kv-sqldrivers-shared
+    jobs:
+
+      # Managed SNI is always used on non-Windows platforms.
+      - ${{ each runtime in parameters.netTestRuntimes }}:
+        - template: /eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml@self
+          parameters:
+            buildConfiguration: ${{ parameters.buildConfiguration }}
+            debug: ${{ parameters.debug }}
+            displayName: 'Linux : ${{ runtime }}'
+            dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+            jobNameSuffix: linux_${{ replace(runtime, '.', '_') }}
+            operatingSystem: Linux
+            poolName: ADO-Trusted-Linux-WestUS2
+            runtime: ${{ runtime }}
+            vmImage: ADO-UB24
diff --git a/eng/pipelines/ci/kerberos/windows-setup-step.yml b/eng/pipelines/ci/kerberos/windows-setup-step.yml
new file mode 100644
index 0000000000..9a736f68b9
--- /dev/null
+++ b/eng/pipelines/ci/kerberos/windows-setup-step.yml
@@ -0,0 +1,52 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# Configures a domain-connected Windows agent for Kerberos integration tests.
+
+parameters:
+
+  - name: useManagedSNI
+    type: boolean
+
+steps:
+
+  - pwsh: |
+      $managedSni = [System.Convert]::ToBoolean($env:MANAGED_SNI)
+      $jdata = Get-Content -Raw "config.default.jsonc" | ConvertFrom-Json
+      foreach ($p in $jdata) {
+          $p.TCPConnectionString = $env:REMOTE_TCP_CONN_STRING
+          $p.NPConnectionString = $env:REMOTE_NP_CONN_STRING
+          $p.SupportsIntegratedSecurity = $true
+          $p.UseManagedSNIOnWindows = $managedSni
+      }
+      $jdata | ConvertTo-Json | Set-Content "config.jsonc"
+    workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities
+    displayName: Update test config.jsonc
+    env:
+      REMOTE_TCP_CONN_STRING: $(REMOTE_TCP_CONN_STRING)
+      REMOTE_NP_CONN_STRING: $(REMOTE_NP_CONN_STRING)
+      MANAGED_SNI: '${{ parameters.useManagedSNI }}'
+
+  - powershell: |
+      $svc = Get-Service -Name SQLBrowser -ErrorAction SilentlyContinue
+      if ($null -ne $svc) {
+          Set-Service -StartupType Automatic SQLBrowser
+          if ($svc.Status -ne 'Running') { Start-Service SQLBrowser }
+          Get-Service SQLBrowser | Select-Object Name, StartType, Status
+      }
+    displayName: Start SQL Server Browser
+
+  - powershell: |
+      Set-DtcNetworkSetting -DtcName "Local" `
+        -InboundTransactionsEnabled $true `
+        -OutboundTransactionsEnabled $true `
+        -RemoteClientAccessEnabled $true `
+        -Confirm:$false
+
+      Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (RPC)"      | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
+      Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (RPC-EPMAP)" | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
+      Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (TCP-Out)"   | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
+      Get-NetFirewallRule -DisplayName "Distributed Transaction Coordinator (TCP-In)"    | Set-NetFirewallRule -Profile Domain -Action Allow -Enabled True
+    displayName: Enable Network DTC Access
\ No newline at end of file
diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml
index 68f59f00c1..0141650535 100644
--- a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml
+++ b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml
@@ -104,12 +104,7 @@ jobs:
       # Download the SqlClient driver packages published by the triggering sqlclient-ci-package
       # pipeline, stage them into the local NuGet feed, and resolve their exact versions into the
       # sqlClient/sqlServer/abstractions/logging/azure PackageVersion variables.
-      #
-      # sqlServerVersionOverride pins Microsoft.SqlServer.Server to the released stable 1.0.0 to
-      # avoid an NU1605 downgrade against the >= 1.0.0 dependency from Microsoft.SqlServer.Types.
       - template: /eng/pipelines/common/steps/download-driver-packages-step.yml@self
-        parameters:
-          sqlServerVersionOverride: 1.0.0
 
       # Install the .NET SDK and the runtimes needed to execute the test frameworks.
       - template: /eng/pipelines/common/steps/install-dotnet.yml@self
@@ -170,8 +165,6 @@ jobs:
             -p:TestSet=123
             -p:ReferenceType=Package
             -p:Configuration=${{ parameters.buildConfiguration }}
-            -p:PackageVersionAbstractions=$(abstractionsPackageVersion)
-            -p:PackageVersionLogging=$(loggingPackageVersion)
             -p:PackageVersionSqlClient=$(sqlClientPackageVersion)
             -p:PackageVersionSqlServer=$(sqlServerPackageVersion)
             -p:TestResultsFolderPath=TestResults
diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml
index d579d11994..83acbd34d0 100644
--- a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml
+++ b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml
@@ -22,7 +22,9 @@ name: $(DayOfYear)$(Rev:rr)
 pr: none
 trigger: none
 
-# Trigger this pipeline after successful runs of the sqlclient-ci-package pipeline.
+# The resource branch filter limits completion triggers to the intended upstream branch. Because
+# both pipelines use the same repository, an eligible run executes this YAML from the triggering
+# package run's branch and commit, preserving branch-specific pipeline definitions.
 resources:
   pipelines:
 
@@ -37,7 +39,10 @@ resources:
     # added to the project, this resource will fail to resolve and the folder path must be added.
     - pipeline: sqlclient-ci-package
       source: sqlclient-ci-package
-      trigger: true
+      trigger:
+        branches:
+          include:
+            - internal/main
 
 # Pipeline parameters, visible in the Azure DevOps UI.
 parameters:
@@ -76,9 +81,9 @@ parameters:
 # The stages to run.
 stages:
 
-  # Run the Managed Instance tests. The .NET and .NET Framework runtimes are defaulted by the stage
+  # Run the Managed Instance tests. The .NET and .NET Framework runtimes are defaulted by the stages
   # template, which runs both native and managed SNI for .NET on Windows.
-  - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml@self
+  - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml@self
     parameters:
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml
deleted file mode 100644
index b6a14c54a7..0000000000
--- a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stage.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-####################################################################################################
-# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
-# file to you under the MIT license.  See the LICENSE file in the project root for more information.
-####################################################################################################
-
-# This stage builds and runs the SqlClient Unit, Functional, and Manual test suites against an Azure
-# SQL Managed Instance, building the test projects in "Package" mode against the NuGet packages
-# produced by the sqlclient-ci-package pipeline.
-#
-# It fans out to one job per OS:
-#
-#   - Windows: one native-SNI job per .NET Framework runtime, plus native- and managed-SNI jobs per
-#     .NET runtime.
-#   - Linux: one job per .NET runtime (managed SNI is always used on non-Windows).
-#
-# This template defines a stage named 'managed_instance_tests_stage'.
-
-parameters:
-
-  # The type of build to produce (Debug or Release).
-  - name: buildConfiguration
-    type: string
-    values:
-      - Debug
-      - Release
-
-  # True to enable debugging steps.
-  - name: debug
-    type: boolean
-
-  # The verbosity level for the dotnet CLI commands.
-  - name: dotnetVerbosity
-    type: string
-    values:
-      - quiet
-      - minimal
-      - normal
-      - detailed
-      - diagnostic
-
-  # The list of .NET (core) runtimes to test against.  The same set is used on every OS.
-  - name: netTestRuntimes
-    type: object
-    default: [net8.0, net9.0, net10.0]
-
-  # The list of .NET Framework runtimes to test against on Windows.
-  - name: netFrameworkTestRuntimes
-    type: object
-    default: [net462]
-
-stages:
-  - stage: managed_instance_tests_stage
-    displayName: Run Managed Instance Tests
-
-    jobs:
-
-    # ----------------------------------------------------------------------------------------------
-    # Windows: .NET Framework uses native SNI; .NET runs with both native and managed SNI.
-
-    - ${{ each runtime in parameters.netFrameworkTestRuntimes }}:
-      - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
-        parameters:
-          buildConfiguration: ${{ parameters.buildConfiguration }}
-          debug: ${{ parameters.debug }}
-          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-          displayName: 'Win : Native SNI : ${{ runtime }}'
-          jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
-          operatingSystem: Windows
-          runtime: ${{ runtime }}
-          useManagedSNI: false
-          vmImage: ADO-MMS25-SQL25
-
-    - ${{ each runtime in parameters.netTestRuntimes }}:
-      - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
-        parameters:
-          buildConfiguration: ${{ parameters.buildConfiguration }}
-          debug: ${{ parameters.debug }}
-          displayName: 'Win : Native SNI : ${{ runtime }}'
-          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-          jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
-          operatingSystem: Windows
-          runtime: ${{ runtime }}
-          useManagedSNI: false
-          vmImage: ADO-MMS25-SQL25
-
-      - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
-        parameters:
-          buildConfiguration: ${{ parameters.buildConfiguration }}
-          debug: ${{ parameters.debug }}
-          displayName: 'Win : Managed SNI : ${{ runtime }}'
-          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-          jobNameSuffix: windows_managed_sni_${{ replace(runtime, '.', '_') }}
-          operatingSystem: Windows
-          runtime: ${{ runtime }}
-          useManagedSNI: true
-          vmImage: ADO-MMS25-SQL25
-
-    # ----------------------------------------------------------------------------------------------
-    # Linux: one job per .NET runtime (managed SNI is always used on non-Windows).
-
-    - ${{ each runtime in parameters.netTestRuntimes }}:
-      - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
-        parameters:
-          buildConfiguration: ${{ parameters.buildConfiguration }}
-          debug: ${{ parameters.debug }}
-          displayName: 'Linux : ${{ runtime }}'
-          jobNameSuffix: linux_${{ replace(runtime, '.', '_') }}
-          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-          operatingSystem: Linux
-          runtime: ${{ runtime }}
-          vmImage: ADO-UB24-SQL25
diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml
new file mode 100644
index 0000000000..e96aef1bc3
--- /dev/null
+++ b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml
@@ -0,0 +1,100 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# Defines separate Windows and Linux stages that run ManualTests against Azure SQL Managed Instance
+# using the packages produced by sqlclient-ci-package.
+
+parameters:
+
+  - name: buildConfiguration
+    type: string
+    values:
+      - Debug
+      - Release
+
+  - name: debug
+    type: boolean
+
+  - name: dotnetVerbosity
+    type: string
+    values:
+      - quiet
+      - minimal
+      - normal
+      - detailed
+      - diagnostic
+
+  - name: netTestRuntimes
+    type: object
+    default: [net8.0, net9.0, net10.0]
+
+  - name: netFrameworkTestRuntimes
+    type: object
+    default: [net462]
+
+stages:
+
+  - stage: windows
+    displayName: Windows
+    dependsOn: []
+    jobs:
+
+      # .NET Framework uses native SNI.
+      - ${{ each runtime in parameters.netFrameworkTestRuntimes }}:
+        - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
+          parameters:
+            buildConfiguration: ${{ parameters.buildConfiguration }}
+            debug: ${{ parameters.debug }}
+            dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+            displayName: 'Win : Native SNI : ${{ runtime }}'
+            jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
+            operatingSystem: Windows
+            runtime: ${{ runtime }}
+            useManagedSNI: false
+            vmImage: ADO-Win25
+
+      # .NET runs with both native and managed SNI.
+      - ${{ each runtime in parameters.netTestRuntimes }}:
+        - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
+          parameters:
+            buildConfiguration: ${{ parameters.buildConfiguration }}
+            debug: ${{ parameters.debug }}
+            displayName: 'Win : Native SNI : ${{ runtime }}'
+            dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+            jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
+            operatingSystem: Windows
+            runtime: ${{ runtime }}
+            useManagedSNI: false
+            vmImage: ADO-Win25
+
+        - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
+          parameters:
+            buildConfiguration: ${{ parameters.buildConfiguration }}
+            debug: ${{ parameters.debug }}
+            displayName: 'Win : Managed SNI : ${{ runtime }}'
+            dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+            jobNameSuffix: windows_managed_sni_${{ replace(runtime, '.', '_') }}
+            operatingSystem: Windows
+            runtime: ${{ runtime }}
+            useManagedSNI: true
+            vmImage: ADO-Win25
+
+  - stage: linux
+    displayName: Linux
+    dependsOn: []
+    jobs:
+
+      # Managed SNI is always used on non-Windows platforms.
+      - ${{ each runtime in parameters.netTestRuntimes }}:
+        - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
+          parameters:
+            buildConfiguration: ${{ parameters.buildConfiguration }}
+            debug: ${{ parameters.debug }}
+            displayName: 'Linux : ${{ runtime }}'
+            jobNameSuffix: linux_${{ replace(runtime, '.', '_') }}
+            dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
+            operatingSystem: Linux
+            runtime: ${{ runtime }}
+            vmImage: ADO-UB24
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
index efd4f233cf..d70ce90c33 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
@@ -141,7 +141,7 @@ jobs:
         value: >-
           -p:ReferenceType=Package
           -p:SqlClientPackageVersion=$(sqlClientPackageVersion)
-          -p:AzurePackageVersion=$(azurePackageVersion)
+          -p:AzurePackageVersion=$(sqlClientPackageVersion)
 
       # dotnet CLI options for build.
       - name: dotnetBuildOpts
@@ -209,14 +209,8 @@ jobs:
 
       # Download the SqlClient driver packages published by the triggering sqlclient-ci-package
       # pipeline, stage them into the local NuGet feed, and resolve their exact versions.  The
-      # sqlClientPackageVersion and azurePackageVersion variables are consumed by the referenceArgs
-      # variable above.
-      #
-      # sqlServerVersionOverride pins Microsoft.SqlServer.Server to the released stable 1.0.0 to
-      # avoid an NU1605 downgrade against the >= 1.0.0 dependency from Microsoft.SqlServer.Types.
+      # sqlClientPackageVersion variable is consumed by the referenceArgs variable above.
       - template: /eng/pipelines/common/steps/download-driver-packages-step.yml@self
-        parameters:
-          sqlServerVersionOverride: 1.0.0
 
       # Authenticate with NuGet feeds so that upstream packages (e.g. runtime host packs) can be
       # fetched through the ADO Artifacts feed.
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
index 74283a8128..74403bd743 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
@@ -21,7 +21,9 @@ name: $(DayOfYear)$(Rev:rr)
 pr: none
 trigger: none
 
-# Trigger this pipeline after successful runs of the sqlclient-ci-package pipeline.
+# The resource branch filters limit completion triggers to the intended upstream branches. Because
+# both pipelines use the same repository, an eligible run executes this YAML from the triggering
+# package run's branch and commit, preserving branch-specific pipeline definitions.
 #
 # The pipeline identifiers are displayed in the Azure DevOps UI, so it is helpful if they indicate
 # the project, folder, and pipeline name, hence the verbose values below.
@@ -44,7 +46,11 @@ resources:
     # per-project approach instead of this single shared definition).
     - pipeline: sqlclient-ci-package
       source: sqlclient-ci-package
-      trigger: true
+      trigger:
+        branches:
+          include:
+            - main
+            - internal/main
 
 # Pipeline parameters, visible in the Azure DevOps UI.
 parameters:
diff --git a/eng/pipelines/common/steps/align-source-with-upstream-step.yml b/eng/pipelines/common/steps/align-source-with-upstream-step.yml
index 11ad2742b7..39249d572d 100644
--- a/eng/pipelines/common/steps/align-source-with-upstream-step.yml
+++ b/eng/pipelines/common/steps/align-source-with-upstream-step.yml
@@ -36,6 +36,8 @@ steps:
   - checkout: self
     clean: true
     fetchDepth: 0
+    fetchTags: false
+    persistCredentials: true
 
   # Align the working-tree source with the commit that built the upstream artifacts, so the projects
   # compile against the matching (internal) API surface.  When the upstream commit is unavailable
@@ -43,8 +45,14 @@ steps:
   - pwsh: |
       $ErrorActionPreference = 'Stop'
       $sha = "$(resources.pipeline.${{ parameters.upstreamPipeline }}.sourceCommit)"
+      if ($sha -notmatch '\A[0-9a-fA-F]{40}\z') {
+        throw "Invalid ${{ parameters.upstreamPipeline }} commit SHA: '$sha'."
+      }
       $pipelineSourceSha = git rev-parse HEAD
       if ($LASTEXITCODE -ne 0) { throw "Failed to resolve the queued pipeline commit." }
+      Write-Host "Fetching ${{ parameters.upstreamPipeline }} commit $sha"
+      git fetch --no-tags origin $sha
+      if ($LASTEXITCODE -ne 0) { throw "Failed to fetch upstream commit $sha." }
       Write-Host "Aligning source to ${{ parameters.upstreamPipeline }} commit $sha"
       git checkout --force $sha
       if ($LASTEXITCODE -ne 0) { throw "Failed to check out upstream commit $sha." }
diff --git a/eng/pipelines/common/steps/download-driver-packages-step.yml b/eng/pipelines/common/steps/download-driver-packages-step.yml
index aed4456d31..807affea13 100644
--- a/eng/pipelines/common/steps/download-driver-packages-step.yml
+++ b/eng/pipelines/common/steps/download-driver-packages-step.yml
@@ -5,14 +5,12 @@
 
 # This template downloads the SqlClient driver packages published by the sqlclient-ci-package
 # pipeline, copies them into the local NuGet feed (packages/), and resolves the exact package
-# versions from the .nupkg filenames.  The resolved versions are exposed as job-scoped pipeline
-# variables for use by downstream build/test steps:
+# versions from the .nupkg filenames.  Required SqlClient-family packages are validated to share
+# one version.  The resolved versions are exposed as job-scoped pipeline variables for use by
+# downstream build/test steps:
 #
-#   sqlClientPackageVersion     Microsoft.Data.SqlClient
-#   sqlServerPackageVersion     Microsoft.SqlServer.Server
-#   abstractionsPackageVersion  Microsoft.Data.SqlClient.Extensions.Abstractions
-#   loggingPackageVersion       Microsoft.Data.SqlClient.Internal.Logging
-#   azurePackageVersion         Microsoft.Data.SqlClient.Extensions.Azure
+#   sqlClientPackageVersion  SqlClient family
+#   sqlServerPackageVersion  Microsoft.SqlServer.Server
 #
 # The consuming pipeline MUST declare the triggering pipeline as a resource whose alias matches the
 # pipelineResource parameter, e.g.:
@@ -42,16 +40,6 @@ parameters:
     type: string
     default: $(Build.SourcesDirectory)/packages
 
-  # Optional override for the Microsoft.SqlServer.Server version.  When set, this value is used for
-  # the sqlServerPackageVersion variable instead of the version resolved from the artifact .nupkg
-  # filename.  Temporary workaround: the CI 'X.Y.Z-ci' prerelease of Microsoft.SqlServer.Server is
-  # treated as a downgrade of the '>= X.Y.Z' stable dependency that Microsoft.SqlServer.Types pulls
-  # in (NU1605); passing the released stable version avoids the downgrade.  Overall package
-  # versioning is being addressed separately.
-  - name: sqlServerVersionOverride
-    type: string
-    default: ''
-
 steps:
 
   # Download the SqlClient driver packages published by the triggering pipeline into the pipeline
@@ -60,8 +48,8 @@ steps:
     artifact: ${{ parameters.artifactName }}
     displayName: Download SqlClient Driver Packages
 
-  # Copy the downloaded packages into the local NuGet feed and resolve the exact package versions
-  # from the .nupkg filenames, exposing each as a pipeline variable.
+  # Copy the downloaded packages into the local NuGet feed, validate the SqlClient family version,
+  # and expose the two independently versioned package units as pipeline variables.
   - task: PowerShell@2
     displayName: Stage Packages and Resolve Versions
     inputs:
@@ -71,4 +59,3 @@ steps:
       arguments: >-
         -FeedPath "${{ parameters.feedPath }}"
         -ArtifactDirectory "$(Pipeline.Workspace)/${{ parameters.pipelineResource }}/${{ parameters.artifactName }}"
-        -SqlServerVersionOverride "${{ parameters.sqlServerVersionOverride }}"
diff --git a/eng/pipelines/common/steps/download-driver-packages.ps1 b/eng/pipelines/common/steps/download-driver-packages.ps1
index 39f7a38493..4392508991 100644
--- a/eng/pipelines/common/steps/download-driver-packages.ps1
+++ b/eng/pipelines/common/steps/download-driver-packages.ps1
@@ -4,14 +4,12 @@
 
 .DESCRIPTION
     Copies the .nupkg and .snupkg files downloaded from an upstream SqlClient package artifact into
-    a local NuGet feed. It then resolves package versions from the .nupkg filenames and emits Azure
-    Pipelines logging commands that create these job-scoped variables for downstream tasks:
+    a local NuGet feed. It resolves package versions from the .nupkg filenames, verifies that all
+    required SqlClient-family packages share one version, and emits Azure Pipelines logging commands
+    that create these job-scoped variables for downstream tasks:
 
-      sqlClientPackageVersion     Microsoft.Data.SqlClient
-      sqlServerPackageVersion     Microsoft.SqlServer.Server
-      abstractionsPackageVersion  Microsoft.Data.SqlClient.Extensions.Abstractions
-      loggingPackageVersion       Microsoft.Data.SqlClient.Internal.Logging
-      azurePackageVersion         Microsoft.Data.SqlClient.Extensions.Azure
+      sqlClientPackageVersion  SqlClient family
+      sqlServerPackageVersion  Microsoft.SqlServer.Server
 
     Every required .nupkg must be present in ArtifactDirectory. Symbol packages are optional. The
     script stops on missing required packages, copy failures, and ambiguous filesystem errors.
@@ -24,10 +22,6 @@
     Directory containing the .nupkg files downloaded from the upstream pipeline artifact. Optional
     .snupkg files in this directory are copied when present.
 
-.PARAMETER SqlServerVersionOverride
-    Optional version to expose as sqlServerPackageVersion instead of resolving the version from the
-    Microsoft.SqlServer.Server .nupkg filename. The package itself is still required and staged.
-
 .EXAMPLE
     ./download-driver-packages.ps1 `
         -FeedPath 'C:\agent\_work\1\s\packages' `
@@ -35,14 +29,6 @@
 
     Stages all driver packages and resolves every version from its package filename.
 
-.EXAMPLE
-    ./download-driver-packages.ps1 `
-        -FeedPath '/agent/_work/1/s/packages' `
-        -ArtifactDirectory '/agent/_work/1/sqlclient-ci-package/SqlClient-Driver-Packages' `
-        -SqlServerVersionOverride '1.0.0'
-
-    Stages all packages but exposes 1.0.0 as sqlServerPackageVersion.
-
 .OUTPUTS
     None. Results are emitted as Azure Pipelines task.setvariable logging commands.
 
@@ -61,9 +47,7 @@ param(
     [string]$FeedPath,
 
     [Parameter(Mandatory)]
-    [string]$ArtifactDirectory,
-
-    [string]$SqlServerVersionOverride = ''
+    [string]$ArtifactDirectory
 )
 
 Set-StrictMode -Version Latest
@@ -94,47 +78,51 @@ function Resolve-PackageVersion {
     return [regex]::Match($packages[0].Name, $Pattern).Groups[1].Value
 }
 
-# Patterns are anchored so the Microsoft.Data.SqlClient package does not also match extension
-# packages whose IDs begin with Microsoft.Data.SqlClient.
-$packages = @(
+# Patterns are anchored so Microsoft.Data.SqlClient does not also match family packages whose IDs
+# begin with Microsoft.Data.SqlClient.
+$sqlClientFamilyPackages = @(
     @{
-        Variable = 'sqlClientPackageVersion'
         Name = 'Microsoft.Data.SqlClient'
         Pattern = '^Microsoft\.Data\.SqlClient\.(\d[^\/]*)\.nupkg$'
     },
     @{
-        Variable = 'sqlServerPackageVersion'
-        Name = 'Microsoft.SqlServer.Server'
-        Pattern = '^Microsoft\.SqlServer\.Server\.(\d[^\/]*)\.nupkg$'
-    },
-    @{
-        Variable = 'abstractionsPackageVersion'
         Name = 'Microsoft.Data.SqlClient.Extensions.Abstractions'
         Pattern = '^Microsoft\.Data\.SqlClient\.Extensions\.Abstractions\.(\d[^\/]*)\.nupkg$'
     },
     @{
-        Variable = 'loggingPackageVersion'
         Name = 'Microsoft.Data.SqlClient.Internal.Logging'
         Pattern = '^Microsoft\.Data\.SqlClient\.Internal\.Logging\.(\d[^\/]*)\.nupkg$'
     },
     @{
-        Variable = 'azurePackageVersion'
         Name = 'Microsoft.Data.SqlClient.Extensions.Azure'
         Pattern = '^Microsoft\.Data\.SqlClient\.Extensions\.Azure\.(\d[^\/]*)\.nupkg$'
+    },
+    @{
+        Name = 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
+        Pattern = '^Microsoft\.Data\.SqlClient\.AlwaysEncrypted\.AzureKeyVaultProvider\.(\d[^\/]*)\.nupkg$'
     }
 )
 
-foreach ($package in $packages) {
-    $artifactVersion = Resolve-PackageVersion $ArtifactDirectory $package.Pattern $package.Name
+$sqlClientPackageVersion = Resolve-PackageVersion `
+    $ArtifactDirectory `
+    $sqlClientFamilyPackages[0].Pattern `
+    $sqlClientFamilyPackages[0].Name
 
-    if ($package.Variable -eq 'sqlServerPackageVersion' -and
-        -not [string]::IsNullOrWhiteSpace($SqlServerVersionOverride)) {
-        $version = $SqlServerVersionOverride
-        Write-Host "Overriding $($package.Name) version from $artifactVersion to $version"
-    } else {
-        $version = $artifactVersion
-        Write-Host "Resolved $($package.Name) version: $version"
+foreach ($package in $sqlClientFamilyPackages) {
+    $version = Resolve-PackageVersion $ArtifactDirectory $package.Pattern $package.Name
+
+    if ($version -ne $sqlClientPackageVersion) {
+        throw "$($package.Name) version $version does not match SqlClient family version $sqlClientPackageVersion"
     }
 
-    Write-Host "##vso[task.setvariable variable=$($package.Variable)]$version"
+    Write-Host "Validated $($package.Name) version: $version"
 }
+
+$sqlServerPackageVersion = Resolve-PackageVersion `
+    $ArtifactDirectory `
+    '^Microsoft\.SqlServer\.Server\.(\d[^\/]*)\.nupkg$' `
+    'Microsoft.SqlServer.Server'
+
+Write-Host "Resolved Microsoft.SqlServer.Server version: $sqlServerPackageVersion"
+Write-Host "##vso[task.setvariable variable=sqlClientPackageVersion]$sqlClientPackageVersion"
+Write-Host "##vso[task.setvariable variable=sqlServerPackageVersion]$sqlServerPackageVersion"

From 5c82580e463c8d5ea81fe4b31c84007c34799fee Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 3 Sep 2026 09:21:38 -0700
Subject: [PATCH 264/298] Clarify Entra authority URL parsing (#4630)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../ActiveDirectoryAuthenticationProvider.cs  | 59 +++++++---------
 .../Azure/test/AuthorityParsingTests.cs       | 70 +++++++++----------
 2 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
index 3bdce5c751..cbb0371bec 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs
@@ -252,7 +252,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
             // ("https://login.microsoftonline.com/{tenantId}/oauth2/authorize"), so the tenant is
             // taken from the first path segment rather than the last.
 
-            if (!TryParseAuthority(parameters.Authority, out string authorityHost, out string tenant, out string msalAuthority))
+            if (!TryParseAuthority(parameters.Authority, out string authorityUrl, out string tenant))
             {
                 throw new Extensions.Azure.AuthenticationException(
                     parameters.AuthenticationMethod,
@@ -266,7 +266,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
             if (parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryDefault)
             {
                 // Cache DefaultAzureCredential based on scope, authority host, tenant, and clientId
-                TokenCredentialKey tokenCredentialKey = new(typeof(DefaultAzureCredential), authorityHost, scope, tenant, clientId);
+                TokenCredentialKey tokenCredentialKey = new(typeof(DefaultAzureCredential), authorityUrl, scope, tenant, clientId);
                 AccessToken accessToken = await GetTokenAsync(tokenCredentialKey, string.Empty, tokenRequestContext, cts.Token).ConfigureAwait(false);
                 SqlClientEventSource.Log.TryTraceEvent("AcquireTokenAsync | Acquired access token for Default auth mode. Expiry Time: {0}", accessToken.ExpiresOn);
                 return new SqlAuthenticationToken(accessToken.Token, accessToken.ExpiresOn);
@@ -275,7 +275,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
             if (parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryManagedIdentity || parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryMSI)
             {
                 // Cache ManagedIdentityCredential based on scope, authority host, and clientId
-                TokenCredentialKey tokenCredentialKey = new(typeof(ManagedIdentityCredential), authorityHost, scope, string.Empty, clientId);
+                TokenCredentialKey tokenCredentialKey = new(typeof(ManagedIdentityCredential), authorityUrl, scope, string.Empty, clientId);
                 AccessToken accessToken = await GetTokenAsync(tokenCredentialKey, string.Empty, tokenRequestContext, cts.Token).ConfigureAwait(false);
                 SqlClientEventSource.Log.TryTraceEvent("AcquireTokenAsync | Acquired access token for Managed Identity auth mode. Expiry Time: {0}", accessToken.ExpiresOn);
                 return new SqlAuthenticationToken(accessToken.Token, accessToken.ExpiresOn);
@@ -284,7 +284,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
             if (parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryServicePrincipal)
             {
                 // Cache ClientSecretCredential based on scope, authority host, tenant, and clientId
-                TokenCredentialKey tokenCredentialKey = new(typeof(ClientSecretCredential), authorityHost, scope, tenant, clientId);
+                TokenCredentialKey tokenCredentialKey = new(typeof(ClientSecretCredential), authorityUrl, scope, tenant, clientId);
                 string password = parameters.Password is null ? string.Empty : parameters.Password;
                 AccessToken accessToken = await GetTokenAsync(tokenCredentialKey, password, tokenRequestContext, cts.Token).ConfigureAwait(false);
                 SqlClientEventSource.Log.TryTraceEvent("AcquireTokenAsync | Acquired access token for Active Directory Service Principal auth mode. Expiry Time: {0}", accessToken.ExpiresOn);
@@ -294,7 +294,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
             if (parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryWorkloadIdentity)
             {
                 // Cache WorkloadIdentityCredential based on authority host and clientId
-                TokenCredentialKey tokenCredentialKey = new(typeof(WorkloadIdentityCredential), authorityHost, string.Empty, string.Empty, clientId);
+                TokenCredentialKey tokenCredentialKey = new(typeof(WorkloadIdentityCredential), authorityUrl, string.Empty, string.Empty, clientId);
                 // If either tenant id, client id, or the token file path are not specified when fetching the token,
                 // a CredentialUnavailableException will be thrown instead
                 AccessToken accessToken = await GetTokenAsync(tokenCredentialKey, string.Empty, tokenRequestContext, cts.Token).ConfigureAwait(false);
@@ -322,11 +322,12 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
                 #endif
                 : s_systemBrowserRedirectUri;
 
+            string msalAuthorityUrl = authorityUrl + tenant;
             PublicClientAppKey pcaKey =
             #if NETFRAMEWORK
-                new(msalAuthority, redirectUri, _applicationClientId, _iWin32WindowFunc);
+                new(msalAuthorityUrl, redirectUri, _applicationClientId, _iWin32WindowFunc);
             #else
-                new(msalAuthority, redirectUri, _applicationClientId);
+                new(msalAuthorityUrl, redirectUri, _applicationClientId);
             #endif
 
             AuthenticationResult? result = null;
@@ -364,7 +365,7 @@ public override async Task<SqlAuthenticationToken> AcquireTokenAsync(SqlAuthenti
             else if (parameters.AuthenticationMethod == SqlAuthenticationMethod.ActiveDirectoryPassword)
             #pragma warning restore CS0618 // Type or member is obsolete
             {
-                string pwCacheKey = GetAccountPwCacheKey(msalAuthority, parameters.UserId);
+                string pwCacheKey = GetAccountPwCacheKey(msalAuthorityUrl, parameters.UserId);
                 object? previousPw = s_accountPwCache.Get(pwCacheKey);
                 string password = parameters.Password is null ? string.Empty : parameters.Password;
                 byte[] currPwHash = GetHash(password);
@@ -547,26 +548,23 @@ or AuthenticationRequiredException
     }
 
     /// <summary>
-    /// Splits an Entra ID authority URL (the STSURL provided by the server in the FEDAUTHINFO TDS
-    /// token) into the authority host and the tenant.
+    /// Splits the STSURL provided by the server in the FEDAUTHINFO TDS token into the Entra ID
+    /// authority URL and tenant.
     /// </summary>
-    /// <param name="authorityUrl">
-    /// The authority URL, e.g. <c>https://login.microsoftonline.com/{tenantId}</c>. Some services
+    /// <param name="stsUrl">
+    /// The STSURL, e.g. <c>https://login.microsoftonline.com/{tenantId}</c>. Some services
     /// (for example the Dataverse/Dynamics 365 TDS endpoint) return an ADAL v1 style URL such as
     /// <c>https://login.microsoftonline.com/{tenantId}/oauth2/authorize</c>.
     /// </param>
-    /// <param name="authorityHost">
-    /// Receives the authority host with a trailing slash, e.g. <c>https://login.microsoftonline.com/</c>.
+    /// <param name="authorityUrl">
+    /// Receives the authority URL with a trailing slash, e.g. <c>https://login.microsoftonline.com/</c>.
     /// </param>
     /// <param name="tenant">
     /// Receives the tenant (the first path segment of the authority URL), which may be a tenant id,
     /// a domain name, or one of the <c>common</c>/<c>organizations</c>/<c>consumers</c> placeholders.
     /// </param>
-    /// <param name="msalAuthority">
-    /// Receives the normalized authority (host + tenant) suitable for MSAL's <c>WithAuthority</c>.
-    /// </param>
     /// <returns>
-    /// <c>true</c> if the authority URL is a well-formed, absolute HTTPS URL carrying a tenant
+    /// <c>true</c> if the STSURL is a well-formed, absolute HTTPS URL carrying a tenant
     /// segment; otherwise <c>false</c>.
     /// </returns>
     /// <remarks>
@@ -577,17 +575,16 @@ or AuthenticationRequiredException
     /// <para>
     /// Entra ID authorities are always absolute HTTPS URLs, so anything else is rejected rather
     /// than guessed at. Both MSAL (<c>WithAuthority</c>) and Azure.Identity
-    /// (<c>TokenCredentialOptions.AuthorityHost</c>) require an absolute URI as well, so an
+    /// (<c>TokenCredentialOptions.AuthorityHost</c>) require an absolute URL as well, so an
     /// unparseable authority cannot produce a working credential.
     /// </para>
     /// </remarks>
     internal static bool TryParseAuthority(
-        string authorityUrl,
-        out string authorityHost,
-        out string tenant,
-        out string msalAuthority)
+        string stsUrl,
+        out string authorityUrl,
+        out string tenant)
     {
-        if (Uri.TryCreate(authorityUrl, UriKind.Absolute, out Uri? uri) &&
+        if (Uri.TryCreate(stsUrl, UriKind.Absolute, out Uri? uri) &&
             uri.Scheme == Uri.UriSchemeHttps &&
             uri.Segments.Length > 1)
         {
@@ -598,15 +595,13 @@ internal static bool TryParseAuthority(
 
             if (tenant.Length > 0)
             {
-                authorityHost = uri.GetLeftPart(UriPartial.Authority) + "/";
-                msalAuthority = authorityHost + tenant;
+                authorityUrl = uri.GetLeftPart(UriPartial.Authority) + "/";
                 return true;
             }
         }
 
-        authorityHost = string.Empty;
+        authorityUrl = string.Empty;
         tenant = string.Empty;
-        msalAuthority = string.Empty;
         return false;
     }
 
@@ -840,15 +835,15 @@ private static async Task<AccessToken> GetTokenAsync(TokenCredentialKey tokenCre
     /// <summary>
     /// Builds the cache key used to remember which password was last validated for an account.
     /// </summary>
-    /// <param name="msalAuthority">
-    /// The normalized authority (host + tenant) from <see cref="TryParseAuthority"/>. The
+    /// <param name="msalAuthorityUrl">
+    /// The normalized MSAL authority URL (authority URL + tenant). The
     /// normalized form is used so that two spellings of the same tenant (for example a bare
     /// tenant endpoint and an OAuth v1 <c>/oauth2/authorize</c> endpoint) share a single entry.
     /// </param>
     /// <param name="userId">The user id being authenticated, which may be null.</param>
-    private static string GetAccountPwCacheKey(string msalAuthority, string? userId)
+    private static string GetAccountPwCacheKey(string msalAuthorityUrl, string? userId)
     {
-        return msalAuthority + "+" + userId;
+        return msalAuthorityUrl + "+" + userId;
     }
 
     private static byte[] GetHash(string input)
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AuthorityParsingTests.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AuthorityParsingTests.cs
index cbbd56e3d1..bd97f3926d 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AuthorityParsingTests.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AuthorityParsingTests.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Data.SqlClient.Extensions.Azure.Test;
 
 /// <summary>
 /// Tests for splitting the STSURL supplied by the server in the FEDAUTHINFO TDS token into an
-/// authority host and a tenant.
+/// authority URL and a tenant.
 /// </summary>
 /// <remarks>
 /// The cases below only cover authority shapes that Entra ID actually documents:
@@ -16,97 +16,93 @@ public class AuthorityParsingTests
 {
     private const string Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
 
-    public static TheoryData<string, string, string, string> AuthorityData => new()
+    /// <summary>
+    /// Provides documented STSURL shapes and their expected authority URL and tenant.
+    /// </summary>
+    public static TheoryData<string, string, string> AuthorityData => new()
     {
         // Azure SQL / Fabric style authority.
         {
             $"https://login.microsoftonline.com/{Tenant}",
             "https://login.microsoftonline.com/",
-            Tenant,
-            $"https://login.microsoftonline.com/{Tenant}"
+            Tenant
         },
         // Trailing slash.
         {
             $"https://login.microsoftonline.com/{Tenant}/",
             "https://login.microsoftonline.com/",
-            Tenant,
-            $"https://login.microsoftonline.com/{Tenant}"
+            Tenant
         },
         // v1.0 authorize endpoint, as returned by the Dataverse / Dynamics 365 TDS endpoint.
         {
             $"https://login.microsoftonline.com/{Tenant}/oauth2/authorize",
             "https://login.microsoftonline.com/",
-            Tenant,
-            $"https://login.microsoftonline.com/{Tenant}"
+            Tenant
         },
         // v2.0 token endpoint.
         {
             $"https://login.microsoftonline.com/{Tenant}/oauth2/v2.0/token",
             "https://login.microsoftonline.com/",
-            Tenant,
-            $"https://login.microsoftonline.com/{Tenant}"
+            Tenant
         },
         // US Government cloud.
         {
             $"https://login.microsoftonline.us/{Tenant}/oauth2/authorize",
             "https://login.microsoftonline.us/",
-            Tenant,
-            $"https://login.microsoftonline.us/{Tenant}"
+            Tenant
         },
         // Microsoft Azure operated by 21Vianet.
         {
             $"https://login.partner.microsoftonline.cn/{Tenant}",
             "https://login.partner.microsoftonline.cn/",
-            Tenant,
-            $"https://login.partner.microsoftonline.cn/{Tenant}"
+            Tenant
         },
         // Domain-name tenant.
         {
             "https://login.microsoftonline.com/contoso.onmicrosoft.com",
             "https://login.microsoftonline.com/",
-            "contoso.onmicrosoft.com",
-            "https://login.microsoftonline.com/contoso.onmicrosoft.com"
+            "contoso.onmicrosoft.com"
         },
         // Placeholder tenant.
         {
             "https://login.microsoftonline.com/common/oauth2/authorize",
             "https://login.microsoftonline.com/",
-            "common",
-            "https://login.microsoftonline.com/common"
+            "common"
         },
         {
             "https://login.microsoftonline.com/organizations",
             "https://login.microsoftonline.com/",
-            "organizations",
-            "https://login.microsoftonline.com/organizations"
+            "organizations"
         },
         {
             "https://login.microsoftonline.com/consumers",
             "https://login.microsoftonline.com/",
-            "consumers",
-            "https://login.microsoftonline.com/consumers"
+            "consumers"
         },
     };
 
+    /// <summary>
+    /// Verifies each supported STSURL shape yields the authority URL and first path segment tenant.
+    /// </summary>
     [Theory]
     [MemberData(nameof(AuthorityData))]
-    public void TryParseAuthority_SplitsHostAndTenant(
-        string authorityUrl,
-        string expectedHost,
-        string expectedTenant,
-        string expectedMsalAuthority)
+    public void TryParseAuthority_SplitsAuthorityUrlAndTenant(
+        string stsUrl,
+        string expectedAuthorityUrl,
+        string expectedTenant)
     {
         Assert.True(ActiveDirectoryAuthenticationProvider.TryParseAuthority(
-            authorityUrl,
-            out string host,
-            out string tenant,
-            out string msalAuthority));
+            stsUrl,
+            out string authorityUrl,
+            out string tenant));
 
-        Assert.Equal(expectedHost, host);
+        Assert.Equal(expectedAuthorityUrl, authorityUrl);
         Assert.Equal(expectedTenant, tenant);
-        Assert.Equal(expectedMsalAuthority, msalAuthority);
     }
 
+    /// <summary>
+    /// Verifies invalid STSURLs are rejected without returning partial authority data.
+    /// </summary>
     [Theory]
     // A tenant is required; an authority without one cannot yield a usable credential.
     [InlineData("https://login.microsoftonline.com")]
@@ -122,13 +118,11 @@ public void TryParseAuthority_RejectsInvalidAuthority(string authorityUrl)
     {
         Assert.False(ActiveDirectoryAuthenticationProvider.TryParseAuthority(
             authorityUrl,
-            out string host,
-            out string tenant,
-            out string msalAuthority));
+            out string parsedAuthorityUrl,
+            out string tenant));
 
-        Assert.Equal(string.Empty, host);
+        Assert.Equal(string.Empty, parsedAuthorityUrl);
         Assert.Equal(string.Empty, tenant);
-        Assert.Equal(string.Empty, msalAuthority);
     }
 
     /// <summary>

From 97d2a21b0a5802e9259fd04e54815620f74499fb Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 3 Sep 2026 10:37:42 -0700
Subject: [PATCH 265/298] Address AccessToken authentication feedback (#4629)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Microsoft.Data.SqlClient/SqlConnection.xml   |  5 +++--
 .../src/Microsoft/Data/Common/AdapterUtil.cs     |  7 ++-----
 .../Microsoft/Data/SqlClient/SqlConnection.cs    |  6 +++---
 .../src/Resources/Strings.Designer.cs            | 15 +++------------
 .../src/Resources/Strings.resx                   |  7 ++-----
 .../SimulatedServerTests/ConnectionTests.cs      | 16 ++++++++++++----
 6 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
index 5f88a1498e..2db0e08549 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@@ -262,10 +262,11 @@ The following example creates a <xref:Microsoft.Data.SqlClient.SqlCommand> and a
         </para>
         <para>
           This property is mutually exclusive with the
-          <see cref="P:Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback" />
+          <see cref="P:Microsoft.Data.SqlClient.SqlConnection.AccessTokenCallback" />,
+          <see cref="P:Microsoft.Data.SqlClient.SqlConnection.Credential" />,
           and
           <see cref="P:Microsoft.Data.SqlClient.SqlConnection.SspiContextProvider" />
-          properties, among others. Setting this property when
+          properties. Setting this property when
           <see cref="P:Microsoft.Data.SqlClient.SqlConnection.SspiContextProvider" />
           is already set throws
           <see cref="T:System.InvalidOperationException" />, because SSPI is an
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index e2e73b55b1..f9410a5c39 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -1488,11 +1488,8 @@ internal static Exception InvalidMixedUsageOfAccessTokenCallbackAndAuthenticatio
         internal static Exception InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity()
             => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity));
 
-        internal static Exception InvalidMixedUsageOfAccessTokenAndSspiContextProvider()
-            => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider));
-
-        internal static Exception InvalidMixedUsageOfSspiContextProviderAndAccessToken()
-            => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken));
+        internal static Exception InvalidMixedUsageOfAccessTokenProperties()
+            => InvalidOperation(StringsHelper.GetString(Strings.ADP_InvalidMixedUsageOfAccessTokenProperties));
         #endregion
 
         internal static readonly IntPtr s_ptrZero = IntPtr.Zero;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index b8b693132e..7368798bb8 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -1199,7 +1199,7 @@ private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessToken(S
 
             if (_sspiContextProvider != null)
             {
-                throw ADP.InvalidMixedUsageOfAccessTokenAndSspiContextProvider();
+                throw ADP.InvalidMixedUsageOfAccessTokenProperties();
             }
         }
 
@@ -1226,7 +1226,7 @@ private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndAccessTokenCa
 
             if (_sspiContextProvider != null)
             {
-                throw ADP.InvalidMixedUsageOfAccessTokenAndSspiContextProvider();
+                throw ADP.InvalidMixedUsageOfAccessTokenProperties();
             }
         }
 
@@ -1238,7 +1238,7 @@ private void CheckAndThrowOnInvalidCombinationOfConnectionOptionAndSspiContextPr
         {
             if (_accessToken != null || _accessTokenCallback != null)
             {
-                throw ADP.InvalidMixedUsageOfSspiContextProviderAndAccessToken();
+                throw ADP.InvalidMixedUsageOfAccessTokenProperties();
             }
         }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
index c8f18d38bc..27327a1272 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
@@ -484,20 +484,11 @@ internal static string ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSe
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set..
+        ///   Looks up a localized string similar to Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider..
         /// </summary>
-        internal static string ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider {
+        internal static string ADP_InvalidMixedUsageOfAccessTokenProperties {
             get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set..
-        /// </summary>
-        internal static string ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken {
-            get {
-                return ResourceManager.GetString("ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken", resourceCulture);
+                return ResourceManager.GetString("ADP_InvalidMixedUsageOfAccessTokenProperties", resourceCulture);
             }
         }
         
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
index 57cbf80016..6e8a93705b 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Cannot set the AccessTokenCallback property if the 'Integrated Security' connection string keyword has been set to 'true' or 'SSPI'.</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Cannot set the AccessToken or AccessTokenCallback property if the SspiContextProvider property has been set.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Cannot set the SspiContextProvider property if the AccessToken or AccessTokenCallback property has been set.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Cannot set the AccessTokenCallback property if 'Authentication=Active Directory Default' has been specified in the connection string.</value>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index 1a48ccd293..4432ca3f6c 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -902,33 +902,41 @@ public void SspiContextProviderAndAccessTokenStateAreMutuallyExclusive()
         {
             Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> callback =
                 (ctx, token) => Task.FromResult(new SqlAuthenticationToken("invalid", DateTimeOffset.MaxValue));
+            string expectedMessage = global::Microsoft.Data.StringsHelper.GetString(
+                global::System.Strings.ADP_InvalidMixedUsageOfAccessTokenProperties);
 
             // Token first, then provider.
             using (SqlConnection conn = new("Data Source=localhost"))
             {
                 conn.AccessToken = "token";
-                Assert.Throws<InvalidOperationException>(
+                InvalidOperationException exception = Assert.Throws<InvalidOperationException>(
                     () => conn.SspiContextProvider = new TestSspiContextProvider());
+                Assert.Equal(expectedMessage, exception.Message);
             }
 
             using (SqlConnection conn = new("Data Source=localhost"))
             {
                 conn.AccessTokenCallback = callback;
-                Assert.Throws<InvalidOperationException>(
+                InvalidOperationException exception = Assert.Throws<InvalidOperationException>(
                     () => conn.SspiContextProvider = new TestSspiContextProvider());
+                Assert.Equal(expectedMessage, exception.Message);
             }
 
             // Provider first, then token.
             using (SqlConnection conn = new("Data Source=localhost"))
             {
                 conn.SspiContextProvider = new TestSspiContextProvider();
-                Assert.Throws<InvalidOperationException>(() => conn.AccessToken = "token");
+                InvalidOperationException exception = Assert.Throws<InvalidOperationException>(
+                    () => conn.AccessToken = "token");
+                Assert.Equal(expectedMessage, exception.Message);
             }
 
             using (SqlConnection conn = new("Data Source=localhost"))
             {
                 conn.SspiContextProvider = new TestSspiContextProvider();
-                Assert.Throws<InvalidOperationException>(() => conn.AccessTokenCallback = callback);
+                InvalidOperationException exception = Assert.Throws<InvalidOperationException>(
+                    () => conn.AccessTokenCallback = callback);
+                Assert.Equal(expectedMessage, exception.Message);
             }
         }
 

From baf2e6bc6fbd967fb9a5ac985a7d8e750822579a Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 3 Sep 2026 16:42:29 -0300
Subject: [PATCH 266/298] Validate PR milestone against the target branch
 (#4610)

---
 .github/scripts/check-milestone-branch.sh     | 210 ++++++++++++
 .../recheck-milestones-for-release-branch.sh  | 150 +++++++++
 .github/scripts/tests/README.md               |  12 +-
 .../scripts/tests/check-milestone-branch.bats | 317 ++++++++++++++++++
 ...recheck-milestones-for-release-branch.bats | 228 +++++++++++++
 .github/workflows/check-milestone.yml         |  51 ++-
 .github/workflows/recheck-milestones.yml      |  65 ++++
 7 files changed, 1029 insertions(+), 4 deletions(-)
 create mode 100755 .github/scripts/check-milestone-branch.sh
 create mode 100755 .github/scripts/recheck-milestones-for-release-branch.sh
 create mode 100644 .github/scripts/tests/check-milestone-branch.bats
 create mode 100644 .github/scripts/tests/recheck-milestones-for-release-branch.bats
 create mode 100644 .github/workflows/recheck-milestones.yml

diff --git a/.github/scripts/check-milestone-branch.sh b/.github/scripts/check-milestone-branch.sh
new file mode 100755
index 0000000000..3be77eec59
--- /dev/null
+++ b/.github/scripts/check-milestone-branch.sh
@@ -0,0 +1,210 @@
+#!/usr/bin/env bash
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# check-milestone-branch.sh
+#
+# Validates that a pull request's milestone is consistent with the branch the
+# pull request targets.
+#
+# OVERVIEW
+# --------
+# Milestones in this repository are named "<major>.<minor>.<patch>", optionally
+# with a pre-release suffix (e.g. "7.0.3", "8.0.0-preview1"). Every milestone
+# therefore maps to a candidate release branch:
+#
+#     <major>.<minor>.<patch>  ->  release/<major>.<minor>
+#
+# Release branches and configured milestones determine where the work belongs:
+#
+#   * The branch EXISTS  -> that version has already forked off the default
+#     branch and is in servicing. Changes for it go to release/<major>.<minor>.
+#
+#   * The branch DOES NOT exist, and this is the earliest configured milestone
+#     series without a release branch -> that version is in development on the
+#     default branch. Changes for it go to the default branch.
+#
+#   * Any other series -> the default branch carries exactly one development
+#     line, so a later series is not active yet and an earlier series is no
+#     longer in development. Neither may target the default branch.
+#
+# This rule is self-maintaining: no hard-coded version list needs updating when
+# a new release branch is cut.
+#
+# VALIDATION MATRIX
+# -----------------
+#   Target branch            Release branch exists?   Result
+#   -----------------------  -----------------------  ----------------------
+#   release/<major>.<minor>  n/a (it is the target)   pass
+#   another release/*        n/a                      fail (mismatch)
+#   default branch           no, active line               pass
+#   default branch           no, later configured line     fail (not active yet)
+#   default branch           no, earlier configured line   fail (no longer in development)
+#   default branch           no active line configured     fail (milestone missing)
+#   default branch           yes                      fail (needs servicing branch)
+#   anything else            n/a                      skipped (integration branch)
+#
+# Pull requests into long-lived integration branches (e.g. "dev/paul/foo") are
+# skipped, because the milestone is enforced when that branch is merged into
+# the default branch or a release branch.
+#
+# Milestones that don't parse as "<major>.<minor>.<patch>" are skipped with a
+# notice rather than failing the build.
+#
+# REQUIRED ENVIRONMENT VARIABLES
+# ------------------------------
+#   MILESTONE_TITLE    The PR's milestone title (e.g. "7.0.3").
+#   BASE_REF           The branch the PR targets (e.g. "main", "release/7.0").
+#   DEFAULT_BRANCH     The repository's default branch (e.g. "main").
+#   GITHUB_REPOSITORY  Owner/repo (e.g. "dotnet/SqlClient"). Set automatically by Actions.
+#   GH_TOKEN           GitHub token for API calls (gh CLI auth).
+#
+# OUTPUTS
+# -------
+#   Emits ::notice:: on success/skip and ::error:: on failure.
+#   Exits 0 when the milestone and target branch agree (or the check is
+#   skipped), and 1 when they conflict.
+#
+# USAGE
+#   Called from the check-milestone.yml workflow. Can also be run locally:
+#
+#     export MILESTONE_TITLE="7.0.3"
+#     export BASE_REF="main"
+#     export DEFAULT_BRANCH="main"
+#     export GITHUB_REPOSITORY="dotnet/SqlClient"
+#     bash .github/scripts/check-milestone-branch.sh
+#
+#################################################################################
+set -euo pipefail
+
+# -- Runtime help -------------------------------------------------------------
+if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
+  # Print the header comment block (between the license banner and the
+  # closing banner), stripping the leading '# ' prefix.
+  awk '/^#{2,}$/ { n++; next } n == 2 { sub(/^# ?/, ""); print }' "$0"
+  exit 0
+fi
+
+# -- Input validation ---------------------------------------------------------
+: "${MILESTONE_TITLE:?MILESTONE_TITLE environment variable is required}"
+: "${BASE_REF:?BASE_REF environment variable is required}"
+: "${DEFAULT_BRANCH:?DEFAULT_BRANCH environment variable is required}"
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY environment variable is required}"
+
+# -- Derive the candidate release branch from the milestone -------------------
+# Accepts "X.Y.Z" with an optional pre-release/build suffix, e.g. "8.0.0-preview1".
+if [[ "${MILESTONE_TITLE}" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)([-+].*)?$ ]]; then
+  MAJOR="${BASH_REMATCH[1]}"
+  MINOR="${BASH_REMATCH[2]}"
+  PATCH="${BASH_REMATCH[3]}"
+else
+  echo "::notice::Milestone '${MILESTONE_TITLE}' is not in 'major.minor.patch' form; skipping the target branch check."
+  exit 0
+fi
+
+RELEASE_BRANCH="release/${MAJOR}.${MINOR}"
+
+# -- Skip integration branches ------------------------------------------------
+# Only the default branch and release branches carry milestone semantics.
+if [[ "${BASE_REF}" != "${DEFAULT_BRANCH}" && "${BASE_REF}" != release/* ]]; then
+  echo "::notice::PR targets integration branch '${BASE_REF}'; skipping the milestone/branch check."
+  exit 0
+fi
+
+# -- Validate a release branch target -----------------------------------------
+# The target branch itself proves which version is being serviced, so no branch
+# listing is needed here.
+if [[ "${BASE_REF}" == release/* ]]; then
+  if [[ "${BASE_REF}" != "${RELEASE_BRANCH}" ]]; then
+    echo "::error::Milestone '${MILESTONE_TITLE}' belongs to '${RELEASE_BRANCH}', but this PR targets '${BASE_REF}'. Retarget the PR or assign the milestone that matches '${BASE_REF}'."
+    exit 1
+  fi
+
+  echo "::notice::Milestone '${MILESTONE_TITLE}' matches target branch '${BASE_REF}'."
+  exit 0
+fi
+
+# -- Validate a default branch target -----------------------------------------
+# 'matching-refs' returns only refs under the given prefix, so this is a single
+# cheap call regardless of how many topic branches the repository has.
+if ! RELEASE_REFS=$(gh api "repos/${GITHUB_REPOSITORY}/git/matching-refs/heads/release/" \
+    --jq '.[].ref' 2>&1); then
+  echo "::error::Unable to list release branches for '${GITHUB_REPOSITORY}': ${RELEASE_REFS}"
+  exit 1
+fi
+
+if grep -qxF "refs/heads/${RELEASE_BRANCH}" <<< "${RELEASE_REFS}"; then
+  echo "::error::Milestone '${MILESTONE_TITLE}' is a servicing release owned by '${RELEASE_BRANCH}', but this PR targets '${DEFAULT_BRANCH}'. Either retarget the PR to '${RELEASE_BRANCH}', or assign an in-development milestone and add the 'Hotfix ${MAJOR}.${MINOR}.${PATCH}' label so the change is cherry-picked after merge."
+  exit 1
+fi
+
+if ! MILESTONES=$(gh api --paginate "repos/${GITHUB_REPOSITORY}/milestones?state=all&per_page=100" \
+    --jq '.[].title' 2>&1); then
+  echo "::error::Unable to list milestones for '${GITHUB_REPOSITORY}': ${MILESTONES}"
+  exit 1
+fi
+
+ACTIVE_MAJOR=""
+ACTIVE_MINOR=""
+LATEST_RELEASE_MAJOR=""
+LATEST_RELEASE_MINOR=""
+while IFS= read -r release_ref; do
+  if [[ ! "${release_ref}" =~ ^refs/heads/release/([0-9]+)\.([0-9]+)$ ]]; then
+    continue
+  fi
+
+  release_major="${BASH_REMATCH[1]}"
+  release_minor="${BASH_REMATCH[2]}"
+  if [[ -z "${LATEST_RELEASE_MAJOR}" ]] ||
+      (( 10#${release_major} > 10#${LATEST_RELEASE_MAJOR} )) ||
+      (( 10#${release_major} == 10#${LATEST_RELEASE_MAJOR} && 10#${release_minor} > 10#${LATEST_RELEASE_MINOR} )); then
+    LATEST_RELEASE_MAJOR="${release_major}"
+    LATEST_RELEASE_MINOR="${release_minor}"
+  fi
+done <<< "${RELEASE_REFS}"
+
+while IFS= read -r milestone; do
+  if [[ ! "${milestone}" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)([-+].*)?$ ]]; then
+    continue
+  fi
+
+  candidate_major="${BASH_REMATCH[1]}"
+  candidate_minor="${BASH_REMATCH[2]}"
+  candidate_branch="release/${candidate_major}.${candidate_minor}"
+  if grep -qxF "refs/heads/${candidate_branch}" <<< "${RELEASE_REFS}"; then
+    continue
+  fi
+
+  if [[ -n "${LATEST_RELEASE_MAJOR}" ]] &&
+      { (( 10#${candidate_major} < 10#${LATEST_RELEASE_MAJOR} )) ||
+        (( 10#${candidate_major} == 10#${LATEST_RELEASE_MAJOR} && 10#${candidate_minor} <= 10#${LATEST_RELEASE_MINOR} )); }; then
+    continue
+  fi
+
+  if [[ -z "${ACTIVE_MAJOR}" ]] ||
+      (( 10#${candidate_major} < 10#${ACTIVE_MAJOR} )) ||
+      (( 10#${candidate_major} == 10#${ACTIVE_MAJOR} && 10#${candidate_minor} < 10#${ACTIVE_MINOR} )); then
+    ACTIVE_MAJOR="${candidate_major}"
+    ACTIVE_MINOR="${candidate_minor}"
+  fi
+done <<< "${MILESTONES}"
+
+if [[ -z "${ACTIVE_MAJOR}" ]]; then
+  echo "::error::No configured milestone series is newer than the newest release branch, so no development line is active on '${DEFAULT_BRANCH}'. Create the milestone for the next version before targeting '${DEFAULT_BRANCH}' with '${MILESTONE_TITLE}'."
+  exit 1
+fi
+
+if (( 10#${MAJOR} != 10#${ACTIVE_MAJOR} || 10#${MINOR} != 10#${ACTIVE_MINOR} )); then
+  if (( 10#${MAJOR} > 10#${ACTIVE_MAJOR} ||
+        (10#${MAJOR} == 10#${ACTIVE_MAJOR} && 10#${MINOR} > 10#${ACTIVE_MINOR}) )); then
+    echo "::error::Milestone '${MILESTONE_TITLE}' is for a later development line, but the ${ACTIVE_MAJOR}.${ACTIVE_MINOR} milestone series remains active on '${DEFAULT_BRANCH}' until 'release/${ACTIVE_MAJOR}.${ACTIVE_MINOR}' is cut. Assign a milestone from the active ${ACTIVE_MAJOR}.${ACTIVE_MINOR} line."
+  else
+    echo "::error::Milestone '${MILESTONE_TITLE}' is for the ${MAJOR}.${MINOR} line, which is no longer in development on '${DEFAULT_BRANCH}'; the active line is ${ACTIVE_MAJOR}.${ACTIVE_MINOR}. Assign a milestone from the active ${ACTIVE_MAJOR}.${ACTIVE_MINOR} line."
+  fi
+  exit 1
+fi
+
+echo "::notice::Milestone '${MILESTONE_TITLE}' is still in development (no '${RELEASE_BRANCH}' branch); targeting '${DEFAULT_BRANCH}' is correct."
diff --git a/.github/scripts/recheck-milestones-for-release-branch.sh b/.github/scripts/recheck-milestones-for-release-branch.sh
new file mode 100755
index 0000000000..b48ceb4ad6
--- /dev/null
+++ b/.github/scripts/recheck-milestones-for-release-branch.sh
@@ -0,0 +1,150 @@
+#!/usr/bin/env bash
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# recheck-milestones-for-release-branch.sh
+#
+# Re-runs the milestone check for open pull requests whose result can change
+# when a release branch is created.
+#
+# OVERVIEW
+# --------
+# check-milestone-branch.sh decides where a milestone belongs by asking whether
+# release/<major>.<minor> exists and which configured milestone series is the
+# earliest one without a release branch. Cutting a branch therefore moves its
+# X.Y.* milestones into servicing and can make the next series active.
+#
+# Creating a branch emits no pull request activity, so an already-open PR keeps
+# whatever result it last recorded. This script closes that gap by re-running
+# every semantic-version-milestoned PR targeting the default branch. That covers
+# both the newly serviced series and any later series whose eligibility changes.
+#
+# Re-running is enough because check-milestone-branch.sh queries the live list
+# of release branches. The replayed event payload still carries the correct
+# milestone and base branch, since the check re-runs on every 'milestoned' and
+# 'edited' activity, so the newest run always reflects the current PR state.
+#
+# LIMITATION
+# ----------
+# A re-run replays the original run's commit, which means it executes the
+# workflow definition and script as they existed then. Only the release branch
+# lookup is evaluated live.
+#
+# So a pull request whose most recent milestone check predates the arrival of
+# the target-branch rule will replay the older check, pass it, and keep its
+# stale result. This is transitional: any pull request with activity after the
+# rule shipped has a run that contains it. It is not detected here, because
+# distinguishing a stale replay costs an extra API call per pull request and
+# the window closes on its own. After the first release branch is cut following
+# a change to the check itself, review the affected pull requests by hand.
+#
+# REQUIRED ENVIRONMENT VARIABLES
+# ------------------------------
+#   RELEASE_BRANCH     The branch that was just created (e.g. "release/7.1").
+#   DEFAULT_BRANCH     The repository's default branch (e.g. "main").
+#   WORKFLOW_FILE      Workflow file name to re-run (e.g. "check-milestone.yml").
+#   GITHUB_REPOSITORY  Owner/repo (e.g. "dotnet/SqlClient"). Set automatically by Actions.
+#   GH_TOKEN           GitHub token for API calls. Needs 'actions: write'.
+#
+# OUTPUTS
+# -------
+#   Emits ::notice:: per PR re-run and ::warning:: for any PR that could not be
+#   re-run. Exits 1 if at least one re-run failed, so the failure is visible in
+#   the Actions UI; a maintainer can then re-run those checks by hand.
+#
+# USAGE
+#   Called from the recheck-milestones.yml workflow. Can also be run locally:
+#
+#     export RELEASE_BRANCH="release/7.1"
+#     export DEFAULT_BRANCH="main"
+#     export WORKFLOW_FILE="check-milestone.yml"
+#     export GITHUB_REPOSITORY="dotnet/SqlClient"
+#     bash .github/scripts/recheck-milestones-for-release-branch.sh
+#
+#################################################################################
+# 'set -e' is deliberately omitted: one PR failing to re-run must not abandon
+# the rest. Failures are tracked explicitly and reported at the end.
+set -uo pipefail
+
+# -- Runtime help -------------------------------------------------------------
+if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
+  # Print the header comment block (between the license banner and the
+  # closing banner), stripping the leading '# ' prefix.
+  awk '/^#{2,}$/ { n++; next } n == 2 { sub(/^# ?/, ""); print }' "$0"
+  exit 0
+fi
+
+# -- Input validation ---------------------------------------------------------
+: "${RELEASE_BRANCH:?RELEASE_BRANCH environment variable is required}"
+: "${DEFAULT_BRANCH:?DEFAULT_BRANCH environment variable is required}"
+: "${WORKFLOW_FILE:?WORKFLOW_FILE environment variable is required}"
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY environment variable is required}"
+
+if [[ ! "${RELEASE_BRANCH}" =~ ^release/[0-9]+\.[0-9]+$ ]]; then
+  echo "::notice::'${RELEASE_BRANCH}' is not a 'release/<major>.<minor>' branch; nothing to reconcile."
+  exit 0
+fi
+
+# -- Find open PRs whose result can change -------------------------------------
+if ! OPEN_PRS=$(gh pr list --repo "${GITHUB_REPOSITORY}" --base "${DEFAULT_BRANCH}" \
+    --state open --limit 500 --json number,headRefOid,milestone \
+    --jq '.[] | select(.milestone != null) | "\(.number) \(.headRefOid) \(.milestone.title)"' 2>&1); then
+  echo "::error::Unable to list open pull requests for '${GITHUB_REPOSITORY}': ${OPEN_PRS}"
+  exit 1
+fi
+
+FAILED=0
+MATCHED=0
+
+while read -r NUMBER HEAD_SHA MILESTONE_TITLE; do
+  [[ -n "${NUMBER}" ]] || continue
+
+  # Same milestone grammar as check-milestone-branch.sh.
+  [[ "${MILESTONE_TITLE}" =~ ^[0-9]+\.[0-9]+\.[0-9]+([-+].*)?$ ]] || continue
+
+  MATCHED=$((MATCHED + 1))
+
+  RUNS=$(gh api \
+    "repos/${GITHUB_REPOSITORY}/actions/workflows/${WORKFLOW_FILE}/runs?head_sha=${HEAD_SHA}&per_page=100" \
+    2>/dev/null)
+
+  # One head commit can back PRs against several bases, so prefer the run that
+  # names this PR rather than just the newest run for the SHA.
+  RUN_ID=$(jq -r --argjson pr "${NUMBER}" \
+    '([.workflow_runs[] | select(any(.pull_requests[]?; .number == $pr))] | first | .id) // empty' \
+    <<< "${RUNS}" 2>/dev/null)
+
+  # 'pull_requests' is empty for runs from forked repositories, so fall back to
+  # the newest run for the SHA when the association is unavailable.
+  if [[ -z "${RUN_ID}" ]]; then
+    RUN_ID=$(jq -r '.workflow_runs[0].id // empty' <<< "${RUNS}" 2>/dev/null)
+  fi
+
+  if [[ -z "${RUN_ID}" ]]; then
+    echo "::warning::PR #${NUMBER} (milestone '${MILESTONE_TITLE}') has no milestone check run to re-run; re-check it manually."
+    FAILED=$((FAILED + 1))
+    continue
+  fi
+
+  if gh run rerun "${RUN_ID}" --repo "${GITHUB_REPOSITORY}" >/dev/null 2>&1; then
+    echo "::notice::Re-ran the milestone check for PR #${NUMBER} (milestone '${MILESTONE_TITLE}', run ${RUN_ID})."
+  else
+    echo "::warning::Could not re-run the milestone check for PR #${NUMBER} (run ${RUN_ID}); re-check it manually."
+    FAILED=$((FAILED + 1))
+  fi
+done <<< "${OPEN_PRS}"
+
+if [[ "${MATCHED}" -eq 0 ]]; then
+  echo "::notice::No open PR targeting '${DEFAULT_BRANCH}' carries a semantic-version milestone."
+  exit 0
+fi
+
+if [[ "${FAILED}" -gt 0 ]]; then
+  echo "::error::${FAILED} of ${MATCHED} affected pull requests could not be re-checked automatically."
+  exit 1
+fi
+
+echo "::notice::Re-checked ${MATCHED} pull request(s) affected by '${RELEASE_BRANCH}'."
diff --git a/.github/scripts/tests/README.md b/.github/scripts/tests/README.md
index 9aac1c6c88..9a4ea68906 100644
--- a/.github/scripts/tests/README.md
+++ b/.github/scripts/tests/README.md
@@ -1,7 +1,9 @@
-# Cherry-Pick Workflow Tests
+# GitHub Actions Script Tests
 
 This directory contains tests for the shell scripts used by the
-[cherry-pick-hotfix](./../../../.github/workflows/cherry-pick-hotfix.yml) GitHub Actions workflow.
+[cherry-pick-hotfix](./../../../.github/workflows/cherry-pick-hotfix.yml),
+[check-milestone](./../../../.github/workflows/check-milestone.yml) and
+[recheck-milestones](./../../../.github/workflows/recheck-milestones.yml) GitHub Actions workflows.
 These tests are intended to be run manually by developers when they are changing the associated
 scripts, and not as part of any CI runs.
 
@@ -85,6 +87,8 @@ bats .github/scripts/tests/
 ```bash
 bats .github/scripts/tests/extract-hotfix-versions.bats
 bats .github/scripts/tests/cherry-pick-to-release.bats
+bats .github/scripts/tests/check-milestone-branch.bats
+bats .github/scripts/tests/recheck-milestones-for-release-branch.bats
 ```
 
 ### Run a specific test by name
@@ -112,10 +116,12 @@ bats --formatter pretty .github/scripts/tests/
 | ---- | ----- | ------ |
 | `extract-hotfix-versions.bats` | 18 | Label parsing, version extraction, matrix JSON output, edge cases (malformed labels, duplicates, `labeled` vs `closed` events) |
 | `cherry-pick-to-release.bats` | 15 | Branch derivation, already-applied detection, clean cherry-pick, conflict handling, milestone lookup, PR creation, duplicate skip logic |
+| `check-milestone-branch.bats` | 26 | Milestone version parsing, state-independent active development-line selection, rejection of earlier and later series on the default branch, fail-closed handling when no series is active, release-branch derivation, default-branch vs release-branch validation, integration-branch and non-semver skips, API invocation assertions, API failure handling |
+| `recheck-milestones-for-release-branch.bats` | 17 | Release-branch name parsing, matching open PRs by milestone, run lookup by head SHA and PR association, fork fallback, re-run invocation, and failure reporting |
 
 ## How the Tests Work
 
-Both test files use the same general approach:
+All test files use the same general approach:
 
 1. **`setup()`** creates a temporary directory and populates it with mock `git` and `gh` executables
    — simple shell scripts that echo predetermined responses. Environment variables (`VERSION`,
diff --git a/.github/scripts/tests/check-milestone-branch.bats b/.github/scripts/tests/check-milestone-branch.bats
new file mode 100644
index 0000000000..813605a012
--- /dev/null
+++ b/.github/scripts/tests/check-milestone-branch.bats
@@ -0,0 +1,317 @@
+#!/usr/bin/env bats
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# Tests for check-milestone-branch.sh
+#
+# Run with:  bats .github/scripts/tests/check-milestone-branch.bats
+#
+# Dependencies: bats-core (https://github.com/bats-core/bats-core)
+#
+#################################################################################
+
+# Path to the script under test (relative to repo root).
+SCRIPT=".github/scripts/check-milestone-branch.sh"
+
+# ── Helpers ──────────────────────────────────────────────────────────────────
+
+setup() {
+  STUB_DIR="$(mktemp -d)"
+  export PATH="${STUB_DIR}:${PATH}"
+
+  # Defaults — individual tests override as needed.
+  export MILESTONE_TITLE="7.1.0"
+  export BASE_REF="main"
+  export DEFAULT_BRANCH="main"
+  export GITHUB_REPOSITORY="dotnet/SqlClient"
+  export GH_TOKEN="fake-token"
+  export MOCK_MILESTONES=$'1.0.0\n2.0.1\n7.1.0\n8.0.0-preview1\n8.0.0-preview2\n8.0.0'
+
+  mock_release_branches "release/6.1" "release/7.0"
+}
+
+teardown() {
+  rm -rf "${STUB_DIR}"
+}
+
+# Install a 'gh' mock that reports the given release branches.
+mock_release_branches() {
+  local refs=""
+  local branch
+  for branch in "$@"; do
+    refs+="refs/heads/${branch}"$'\n'
+  done
+
+  cat > "${STUB_DIR}/gh" <<MOCK
+#!/usr/bin/env bash
+echo "GH: \$*" >> "${STUB_DIR}/gh.log"
+if [[ "\$*" == *"/milestones"* ]]; then
+  printf '%s' "\${MOCK_MILESTONES}"
+else
+  printf '%s' '${refs}'
+fi
+MOCK
+  chmod +x "${STUB_DIR}/gh"
+}
+
+# Install a 'gh' mock that fails, simulating an API error.
+mock_gh_failure() {
+  cat > "${STUB_DIR}/gh" <<MOCK
+#!/usr/bin/env bash
+echo "GH: \$*" >> "${STUB_DIR}/gh.log"
+echo "HTTP 403: rate limit exceeded" >&2
+exit 1
+MOCK
+  chmod +x "${STUB_DIR}/gh"
+}
+
+# Install a 'gh' mock that lists branches but fails when milestones are queried.
+mock_milestone_failure() {
+  cat > "${STUB_DIR}/gh" <<MOCK
+#!/usr/bin/env bash
+echo "GH: \$*" >> "${STUB_DIR}/gh.log"
+if [[ "\$*" == *"/milestones"* ]]; then
+  echo "HTTP 403: resource not accessible by integration" >&2
+  exit 1
+fi
+printf '%s' 'refs/heads/release/6.1
+refs/heads/release/7.0
+'
+MOCK
+  chmod +x "${STUB_DIR}/gh"
+}
+
+# ── --help flag ──────────────────────────────────────────────────────────────
+
+@test "prints help text with --help" {
+  run bash "${SCRIPT}" --help
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"VALIDATION MATRIX"* ]]
+  [[ "$output" == *"REQUIRED ENVIRONMENT VARIABLES"* ]]
+}
+
+@test "prints help text with -h" {
+  run bash "${SCRIPT}" -h
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"VALIDATION MATRIX"* ]]
+}
+
+# ── Input validation ─────────────────────────────────────────────────────────
+
+@test "fails when MILESTONE_TITLE is unset" {
+  unset MILESTONE_TITLE
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"MILESTONE_TITLE"* ]]
+}
+
+@test "fails when BASE_REF is unset" {
+  unset BASE_REF
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"BASE_REF"* ]]
+}
+
+@test "fails when DEFAULT_BRANCH is unset" {
+  unset DEFAULT_BRANCH
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"DEFAULT_BRANCH"* ]]
+}
+
+@test "fails when GITHUB_REPOSITORY is unset" {
+  unset GITHUB_REPOSITORY
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"GITHUB_REPOSITORY"* ]]
+}
+
+# ── Default branch targets ───────────────────────────────────────────────────
+
+@test "passes when in-development milestone targets the default branch" {
+  export MILESTONE_TITLE="7.1.0"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"::notice::"* ]]
+  [[ "$output" == *"still in development"* ]]
+}
+
+@test "fails when a later milestone targets the default branch before the active release branch is cut" {
+  export MILESTONE_TITLE="8.0.0-preview1"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"7.1 milestone series"* ]]
+  [[ "$output" == *"release/7.1"* ]]
+}
+
+@test "closed milestone state does not change the active development line" {
+  export MILESTONE_TITLE="8.0.0-preview1"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"7.1 milestone series"* ]]
+  [[ "$output" != *"1.0.0"* ]]
+  grep -qF "milestones?state=all" "${STUB_DIR}/gh.log"
+}
+
+@test "fails when an earlier milestone series targets the default branch" {
+  export MILESTONE_TITLE="1.0.0"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"no longer in development"* ]]
+  [[ "$output" == *"active line is 7.1"* ]]
+}
+
+@test "fails when no configured milestone series is active" {
+  mock_release_branches "release/7.0"
+  export MOCK_MILESTONES=$'1.0.0'
+  export MILESTONE_TITLE="1.0.0"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"no development line is active"* ]]
+}
+
+@test "passes when a later milestone targets the default branch after the active release branch is cut" {
+  mock_release_branches "release/6.1" "release/7.0" "release/7.1"
+  export MILESTONE_TITLE="8.0.0-preview1"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"still in development"* ]]
+}
+
+@test "fails when a serviced milestone targets the default branch" {
+  export MILESTONE_TITLE="7.0.3"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"::error::"* ]]
+  [[ "$output" == *"release/7.0"* ]]
+  [[ "$output" == *"Hotfix 7.0.3"* ]]
+}
+
+@test "honours a non-'main' default branch" {
+  export MILESTONE_TITLE="7.1.0"
+  export BASE_REF="master"
+  export DEFAULT_BRANCH="master"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"targeting 'master' is correct"* ]]
+}
+
+# ── API invocation ───────────────────────────────────────────────────────────
+
+@test "queries the release refs endpoint with the expected arguments" {
+  export MILESTONE_TITLE="7.1.0"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  grep -qF "GH: api repos/dotnet/SqlClient/git/matching-refs/heads/release/ --jq .[].ref" "${STUB_DIR}/gh.log"
+  grep -qF "GH: api --paginate repos/dotnet/SqlClient/milestones?state=all&per_page=100 --jq .[].title" "${STUB_DIR}/gh.log"
+}
+
+@test "does not call the API when the PR targets a release branch" {
+  export MILESTONE_TITLE="7.0.3"
+  export BASE_REF="release/7.0"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [ ! -f "${STUB_DIR}/gh.log" ]
+}
+
+# ── Release branch targets ───────────────────────────────────────────────────
+
+@test "passes when the milestone matches the target release branch" {
+  export MILESTONE_TITLE="7.0.3"
+  export BASE_REF="release/7.0"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"matches target branch 'release/7.0'"* ]]
+}
+
+@test "fails when the milestone belongs to a different release branch" {
+  export MILESTONE_TITLE="7.0.3"
+  export BASE_REF="release/6.1"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"::error::"* ]]
+  [[ "$output" == *"belongs to 'release/7.0'"* ]]
+}
+
+@test "fails when an in-development milestone targets a release branch" {
+  export MILESTONE_TITLE="7.1.0"
+  export BASE_REF="release/7.0"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"belongs to 'release/7.1'"* ]]
+}
+
+@test "passes when a newly cut release branch matches the milestone" {
+  mock_release_branches "release/6.1" "release/7.0" "release/7.1"
+  export MILESTONE_TITLE="7.1.0"
+  export BASE_REF="release/7.1"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"matches target branch 'release/7.1'"* ]]
+}
+
+@test "fails on the default branch once the release branch is cut" {
+  mock_release_branches "release/6.1" "release/7.0" "release/7.1"
+  export MILESTONE_TITLE="7.1.0"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"release/7.1"* ]]
+}
+
+# ── Skipped cases ────────────────────────────────────────────────────────────
+
+@test "skips integration branch targets" {
+  export MILESTONE_TITLE="7.0.3"
+  export BASE_REF="dev/paul/some-feature"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"integration branch"* ]]
+}
+
+@test "skips milestones that are not major.minor.patch" {
+  export MILESTONE_TITLE="vNext"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"not in 'major.minor.patch' form"* ]]
+}
+
+@test "skips two-part milestone titles" {
+  export MILESTONE_TITLE="1.0 Hotfix 2"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"not in 'major.minor.patch' form"* ]]
+}
+
+# ── API failures ─────────────────────────────────────────────────────────────
+
+@test "fails when the branch listing API call fails" {
+  mock_gh_failure
+  export MILESTONE_TITLE="7.0.3"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"Unable to list release branches"* ]]
+}
+
+@test "fails when the milestone listing API call fails" {
+  mock_milestone_failure
+  export MILESTONE_TITLE="7.1.0"
+  export BASE_REF="main"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"Unable to list milestones"* ]]
+}
diff --git a/.github/scripts/tests/recheck-milestones-for-release-branch.bats b/.github/scripts/tests/recheck-milestones-for-release-branch.bats
new file mode 100644
index 0000000000..0d48388f33
--- /dev/null
+++ b/.github/scripts/tests/recheck-milestones-for-release-branch.bats
@@ -0,0 +1,228 @@
+#!/usr/bin/env bats
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# Tests for recheck-milestones-for-release-branch.sh
+#
+# Run with:  bats .github/scripts/tests/recheck-milestones-for-release-branch.bats
+#
+# Dependencies: bats-core (https://github.com/bats-core/bats-core)
+#
+#################################################################################
+
+# Path to the script under test (relative to repo root).
+SCRIPT=".github/scripts/recheck-milestones-for-release-branch.sh"
+
+# ── Helpers ──────────────────────────────────────────────────────────────────
+
+setup() {
+  STUB_DIR="$(mktemp -d)"
+  export PATH="${STUB_DIR}:${PATH}"
+
+  # Defaults — individual tests override as needed.
+  export RELEASE_BRANCH="release/7.1"
+  export DEFAULT_BRANCH="main"
+  export WORKFLOW_FILE="check-milestone.yml"
+  export GITHUB_REPOSITORY="dotnet/SqlClient"
+  export GH_TOKEN="fake-token"
+
+  # Open PRs as "<number> <headSha> <milestone>", one per line.
+  mock_gh "100 aaa111 7.1.0
+101 bbb222 8.0.0-preview1
+102 ccc333 7.1.0-preview3"
+
+  # Default: one run per head SHA, correctly associated with its PR.
+  set_runs aaa111 '{"workflow_runs":[{"id":"run-aaa111","pull_requests":[{"number":100}]}]}'
+  set_runs bbb222 '{"workflow_runs":[{"id":"run-bbb222","pull_requests":[{"number":101}]}]}'
+  set_runs ccc333 '{"workflow_runs":[{"id":"run-ccc333","pull_requests":[{"number":102}]}]}'
+}
+
+teardown() {
+  rm -rf "${STUB_DIR}"
+}
+
+# Register the workflow-runs response for a given head SHA.
+set_runs() {
+  printf '%s' "$2" > "${STUB_DIR}/runs-$1.json"
+}
+
+# Install a 'gh' mock. $1 is the 'pr list' output; 'api' serves the JSON
+# registered by set_runs, and 'run rerun' succeeds unless RERUN_FAILS is set.
+mock_gh() {
+  cat > "${STUB_DIR}/gh" <<MOCK
+#!/usr/bin/env bash
+echo "GH: \$*" >> "${STUB_DIR}/gh.log"
+case "\$1" in
+  pr)
+    printf '%s\n' '${1}'
+    ;;
+  api)
+    sha="\$(sed -n 's/.*head_sha=\([^&]*\).*/\1/p' <<< "\$2")"
+    if [[ -n "\${NO_RUN_FOUND:-}" || ! -f "${STUB_DIR}/runs-\${sha}.json" ]]; then
+      echo '{"workflow_runs":[]}'
+    else
+      cat "${STUB_DIR}/runs-\${sha}.json"
+    fi
+    ;;
+  run)
+    [[ -z "\${RERUN_FAILS:-}" ]] || exit 1
+    ;;
+esac
+MOCK
+  chmod +x "${STUB_DIR}/gh"
+}
+
+# Install a 'gh' mock whose 'pr list' call fails.
+mock_pr_list_failure() {
+  cat > "${STUB_DIR}/gh" <<'MOCK'
+#!/usr/bin/env bash
+echo "HTTP 403: rate limit exceeded" >&2
+exit 1
+MOCK
+  chmod +x "${STUB_DIR}/gh"
+}
+
+# ── --help flag ──────────────────────────────────────────────────────────────
+
+@test "prints help text with --help" {
+  run bash "${SCRIPT}" --help
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"REQUIRED ENVIRONMENT VARIABLES"* ]]
+}
+
+# ── Input validation ─────────────────────────────────────────────────────────
+
+@test "fails when RELEASE_BRANCH is unset" {
+  unset RELEASE_BRANCH
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"RELEASE_BRANCH"* ]]
+}
+
+@test "fails when DEFAULT_BRANCH is unset" {
+  unset DEFAULT_BRANCH
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"DEFAULT_BRANCH"* ]]
+}
+
+@test "fails when WORKFLOW_FILE is unset" {
+  unset WORKFLOW_FILE
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"WORKFLOW_FILE"* ]]
+}
+
+@test "fails when GITHUB_REPOSITORY is unset" {
+  unset GITHUB_REPOSITORY
+  run bash "${SCRIPT}"
+  [ "$status" -ne 0 ]
+  [[ "$output" == *"GITHUB_REPOSITORY"* ]]
+}
+
+# ── Branch name parsing ──────────────────────────────────────────────────────
+
+@test "skips branches that are not release/<major>.<minor>" {
+  export RELEASE_BRANCH="dev/paul/some-feature"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"nothing to reconcile"* ]]
+  [ ! -f "${STUB_DIR}/gh.log" ]
+}
+
+@test "skips a release branch with a patch component" {
+  export RELEASE_BRANCH="release/7.1.0"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"nothing to reconcile"* ]]
+}
+
+# ── Matching and re-running ──────────────────────────────────────────────────
+
+@test "re-runs all semver-milestoned PRs affected by active-line transitions" {
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"PR #100"* ]]
+  [[ "$output" == *"PR #102"* ]]
+  [[ "$output" == *"PR #101"* ]]
+  [[ "$output" == *"Re-checked 3 pull request(s)"* ]]
+}
+
+@test "queries open PRs against the default branch" {
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  grep -qF "GH: pr list --repo dotnet/SqlClient --base main --state open" "${STUB_DIR}/gh.log"
+}
+
+@test "looks up the run by the PR head sha and re-runs it" {
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  grep -qF "head_sha=aaa111" "${STUB_DIR}/gh.log"
+  grep -qF "GH: run rerun run-aaa111 --repo dotnet/SqlClient" "${STUB_DIR}/gh.log"
+}
+
+@test "picks the run belonging to this PR when a head sha backs several PRs" {
+  # The newest run for the SHA belongs to a different PR against another base.
+  set_runs aaa111 '{"workflow_runs":[
+    {"id":"run-other","pull_requests":[{"number":999}]},
+    {"id":"run-aaa111","pull_requests":[{"number":100}]}
+  ]}'
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  grep -qF "GH: run rerun run-aaa111 --repo dotnet/SqlClient" "${STUB_DIR}/gh.log"
+  ! grep -qF "run rerun run-other" "${STUB_DIR}/gh.log"
+}
+
+@test "falls back to the newest run when the PR association is missing" {
+  # Runs from forked repositories carry an empty 'pull_requests' array.
+  set_runs aaa111 '{"workflow_runs":[
+    {"id":"run-newest","pull_requests":[]},
+    {"id":"run-older","pull_requests":[]}
+  ]}'
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"PR #100"* ]]
+  grep -qF "GH: run rerun run-newest --repo dotnet/SqlClient" "${STUB_DIR}/gh.log"
+}
+
+@test "reports when no open PR carries a matching milestone" {
+  export RELEASE_BRANCH="release/6.1"
+  mock_gh "200 ddd444 vNext"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"No open PR targeting 'main' carries a semantic-version milestone"* ]]
+}
+
+@test "ignores PRs whose milestone is not major.minor.patch" {
+  mock_gh "200 ddd444 vNext"
+  run bash "${SCRIPT}"
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"No open PR"* ]]
+}
+
+# ── Failure handling ─────────────────────────────────────────────────────────
+
+@test "warns and fails when a PR has no run to re-run" {
+  export NO_RUN_FOUND=1
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"has no milestone check run to re-run"* ]]
+  [[ "$output" == *"3 of 3 affected pull requests"* ]]
+}
+
+@test "warns and fails when a re-run cannot be started" {
+  export RERUN_FAILS=1
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"Could not re-run the milestone check for PR #100"* ]]
+}
+
+@test "fails when the PR listing API call fails" {
+  mock_pr_list_failure
+  run bash "${SCRIPT}"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"Unable to list open pull requests"* ]]
+}
diff --git a/.github/workflows/check-milestone.yml b/.github/workflows/check-milestone.yml
index da4681fd7b..8d64ae5f13 100644
--- a/.github/workflows/check-milestone.yml
+++ b/.github/workflows/check-milestone.yml
@@ -1,14 +1,45 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# Check Milestone
+#
+# Validates that every pull request has an open milestone assigned, and that
+# the milestone is consistent with the branch the PR targets.
+#
+# Milestones map to release branches by major.minor:
+#
+#   * "7.0.3" -> release/7.0 exists -> the PR must target release/7.0.
+#   * "7.1.0" -> release/7.1 does not exist and it is the earliest configured
+#     unbranched series -> the PR must target main.
+#   * "8.0.0-preview1" -> release/8.0 does not exist, but 7.1 is still the
+#     active unbranched series -> the PR cannot target main yet.
+#
+# See .github/scripts/check-milestone-branch.sh for the full rule set.
+#
+# Cutting release/X.Y flips the expected target for X.Y.* milestones but emits
+# no pull request activity. recheck-milestones.yml reconciles the already open
+# PRs that the new branch invalidates.
+#
+#################################################################################
+
 name: Check Milestone
 
 on:
   pull_request:
-    types: [opened, edited, synchronize, milestoned, demilestoned]
+    # The 'edited' type covers base branch changes, so retargeting a PR (manually,
+    # or automatically when a stacked PR's parent merges) re-runs this check.
+    types: [opened, reopened, edited, synchronize, milestoned, demilestoned]
 
 jobs:
   check-milestone:
     name: Validate milestone
     runs-on: ubuntu-latest
     permissions:
+      contents: read
+      issues: read
       pull-requests: read
     steps:
       - name: Check milestone is set
@@ -22,3 +53,21 @@ jobs:
         run: |
           echo "::error::Milestone '${{ github.event.pull_request.milestone.title }}' is ${{ github.event.pull_request.milestone.state }}. Please assign an open milestone."
           exit 1
+
+      - name: Checkout scripts
+        if: github.event.pull_request.milestone != null
+        uses: actions/checkout@v6
+        with:
+          # Only the scripts directory is needed; skip full history.
+          sparse-checkout: .github/scripts
+          sparse-checkout-cone-mode: false
+
+      - name: Check milestone matches target branch
+        if: github.event.pull_request.milestone != null
+        env:
+          # Pass PR data via env to avoid script injection from milestone text.
+          MILESTONE_TITLE: ${{ github.event.pull_request.milestone.title }}
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
+          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: bash "${GITHUB_WORKSPACE}/.github/scripts/check-milestone-branch.sh"
diff --git a/.github/workflows/recheck-milestones.yml b/.github/workflows/recheck-milestones.yml
new file mode 100644
index 0000000000..679b76f144
--- /dev/null
+++ b/.github/workflows/recheck-milestones.yml
@@ -0,0 +1,65 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+#
+# Recheck Milestones
+#
+# Reconciles open pull requests when a release branch is cut.
+#
+# check-milestone.yml decides where a milestone belongs by asking whether
+# release/<major>.<minor> exists and which milestone series is active on the
+# default branch. Creating a release branch can invalidate X.Y.* pull requests
+# and make the next series eligible, but emits no pull request activity, so
+# already open pull requests would otherwise keep their previous verdicts.
+#
+# This lives in its own workflow so that check-milestone.yml stays purely pull
+# request scoped, and so the elevated 'actions: write' permission needed to
+# re-run checks is isolated from the PR gate.
+#
+# A re-run replays the original run's commit, so a pull request whose last
+# milestone check predates a change to the check itself replays the older
+# version and keeps its stale result. See the LIMITATION section in
+# .github/scripts/recheck-milestones-for-release-branch.sh.
+#
+# See .github/scripts/recheck-milestones-for-release-branch.sh for the details.
+#
+#################################################################################
+
+name: Recheck Milestones
+
+# 'create' has no branch filter, so every branch creation starts a run of this
+# workflow. The guard below skips the job for anything but release/*, which is
+# why this is kept out of check-milestone.yml.
+on: [create]
+
+jobs:
+  recheck-open-prs:
+    name: Re-check open PRs after a release branch is cut
+    if: github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/')
+    runs-on: ubuntu-latest
+    permissions:
+      # 'actions: write' is needed to re-run the affected milestone checks.
+      actions: write
+      contents: read
+      pull-requests: read
+    steps:
+      - name: Checkout scripts
+        uses: actions/checkout@v6
+        with:
+          # A 'create' run defaults to the new branch; pin the default branch so
+          # the script is read from a known-good copy.
+          ref: ${{ github.event.repository.default_branch }}
+          # Only the scripts directory is needed; skip full history.
+          sparse-checkout: .github/scripts
+          sparse-checkout-cone-mode: false
+
+      - name: Re-check affected pull requests
+        env:
+          # Pass the ref via env to avoid script injection from branch names.
+          RELEASE_BRANCH: ${{ github.event.ref }}
+          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+          WORKFLOW_FILE: check-milestone.yml
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: bash "${GITHUB_WORKSPACE}/.github/scripts/recheck-milestones-for-release-branch.sh"

From 5575a98b5448aa31a490149503b8831491dc0e85 Mon Sep 17 00:00:00 2001
From: Malcolm Daigle <mdaigle@microsoft.com>
Date: Thu, 3 Sep 2026 22:20:29 -0700
Subject: [PATCH 267/298] Add perf experiment pipeline and fix v2 connection
 pool regressions (#4543)

---
 .../connection-pooling.instructions.md        |   7 -
 eng/pipelines/perf/README.md                  | 138 +++++++++-
 eng/pipelines/perf/scripts/interleave_perf.py |  35 ++-
 eng/pipelines/perf/scripts/run-perf-tests.ps1 | 128 +++++++--
 eng/pipelines/perf/scripts/run-perf-tests.sh  | 134 ++++++++-
 .../perf/sqlclient-perf-experiment.yml        | 239 ++++++++++++++++
 .../ConnectionPool/ChannelDbConnectionPool.cs | 142 ++++++----
 .../ConnectionPoolChurnRunner.cs              |  83 +++++-
 .../ConnectionPoolContentionRunner.cs         |  75 ++++-
 .../ConnectionPoolRampRunner.cs               | 177 ++++++++++++
 .../ConnectionPoolStressRunner.cs             | 183 +++++++++++--
 .../ConnectionPoolThreadPoolPressureRunner.cs | 256 ++++++++++++++++++
 .../tests/PerformanceTests/Config/Config.cs   |   2 +
 .../tests/PerformanceTests/Program.cs         |   2 +
 .../tests/PerformanceTests/runnerconfig.jsonc |  18 ++
 .../ChannelDbConnectionPoolTest.cs            | 196 +++++++++++++-
 16 files changed, 1681 insertions(+), 134 deletions(-)
 create mode 100644 eng/pipelines/perf/sqlclient-perf-experiment.yml
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolRampRunner.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolThreadPoolPressureRunner.cs

diff --git a/.github/instructions/connection-pooling.instructions.md b/.github/instructions/connection-pooling.instructions.md
index 6464fdedd0..95019b996d 100644
--- a/.github/instructions/connection-pooling.instructions.md
+++ b/.github/instructions/connection-pooling.instructions.md
@@ -124,13 +124,6 @@ private readonly ChannelWriter<DbConnectionInternal?> _idleConnectionWriter;
 await _idleConnectionReader.WaitToReadAsync(token);
 ```
 
-### Sync Over Async Protection
-```csharp
-// Prevent thread pool starvation
-private static SemaphoreSlim _syncOverAsyncSemaphore = 
-    new(Math.Max(1, Environment.ProcessorCount / 2));
-```
-
 ## Best Practices
 
 ### Application Design
diff --git a/eng/pipelines/perf/README.md b/eng/pipelines/perf/README.md
index be925f5431..b7165cfc06 100644
--- a/eng/pipelines/perf/README.md
+++ b/eng/pipelines/perf/README.md
@@ -12,7 +12,8 @@ database.
 | ---- | ------- |
 | `sqlclient-perf-pipeline.yml` | The main (manual/nightly) pipeline. Extends `v1/Perf.Test.Job.yml@PerfTemplates`. Baseline = released NuGet package; ingests into Kusto. |
 | `sqlclient-perf-pr-pipeline.yml` | PR pipeline. Same template, same scripts, same options; baseline = **`main` branch source**; **no Kusto ingestion**. |
-| `scripts/run-perf-tests.sh` | Linux on-VM entry point: install SDK, create DB, run benchmarks (interleaved or sequential), compare. Baseline is either a released package (`--baseline-version`) or another git ref's source (`--baseline-source-ref`). |
+| `sqlclient-perf-experiment.yml` | Experiment pipeline. Same template, same scripts; both passes build the **same source** and differ only in one runner-config switch; **no Kusto ingestion**. |
+| `scripts/run-perf-tests.sh` | Linux on-VM entry point: install SDK, create DB, run benchmarks (interleaved or sequential), compare. Baseline is a released package (`--baseline-version`), another git ref's source (`--baseline-source-ref`), or the same source with one runner-config switch flipped off (`--switch-under-test`). |
 | `scripts/run-perf-tests.ps1` | Windows equivalent (ProcessorAffinity instead of `taskset`). |
 | `scripts/interleave_perf.py` | Interleaved + best-of-N orchestrator: runs each unit baseline↔candidate back-to-back and confirms regressions across N passes. |
 | `scripts/compare_perf.py` | Compares baseline vs current BenchmarkDotNet JSON → delta (md + json). Reused by the orchestrator. |
@@ -151,6 +152,122 @@ the comparison (and one removed by the PR as `removed`) instead of failing the r
 share the single generated runner config (`RUNNER_CONFIG` / `DATATYPES_CONFIG` env vars), so
 connection string and behaviour flags are identical on both sides.
 
+## Experiment pipeline (`sqlclient-perf-experiment.yml`)
+
+The three perf pipelines are the same benchmarks, template and scripts pointed at three different
+questions. Two of them vary the **source** under measurement; the third varies the **config**:
+
+| Question | Pipeline | Baseline | Current |
+| --- | --- | --- | --- |
+| Has this branch regressed against a released package? | `sqlclient-perf-pipeline.yml` | released NuGet package | queued branch |
+| Does my PR regress the branch it merges into? | `sqlclient-perf-pr-pipeline.yml` | `main` source | queued branch |
+| What does this switch cost or buy? | `sqlclient-perf-experiment.yml` | queued branch, switch **off** | queued branch, switch **on** |
+
+`sqlclient-perf-experiment.yml` picks one runner-config switch via the `switchUnderTest`
+queue-time parameter (`UseConnectionPoolV2`, `UseOptimizedAsyncBehaviour` or
+`UseManagedSniOnWindows`) and runs the baseline pass with it `false` and the current pass with it
+`true`. Both passes measure the **same commit** — the branch the run is queued on — so queue it on a
+PR branch to ask "what does this switch do to my change?", or on `main` to ask "what does it do to
+`main`?".
+
+Two passes are required because these are `AppContext` switches latched process-wide (for example
+`UseConnectionPoolV2` is read and cached the first time a connection pool is created), so they cannot
+be toggled between benchmarks within a single process. The pipeline wires that into the existing
+comparison machinery — interleaved best-of-N or sequential, via `benchmarkRunMode` — instead of two
+ad hoc manual runs.
+
+Switch-pipeline parameters that differ from the tables above:
+
+| Parameter | Default | Description |
+| --------- | ------- | ----------- |
+| `switchUnderTest` | `UseConnectionPoolV2` | The single switch to A/B. Baseline forces it `false`, current forces it `true`. |
+| `failIfSwitchSlower` | `false` | Maps onto the scripts' `--fail-on-regression` gate, but means something different here: "switch on is slower" is usually the *result* you queued the run to measure, not a defect. Enable it only when asserting the switch must not be a slowdown (e.g. before flipping its default). |
+| `testTimeoutMinutes` | `180` | Same as the main pipeline, not the PR pipeline's `210`: both sides are the same source, so only **one** driver build is needed. |
+
+The pipeline deliberately does **not** expose `baselineVersion` / `baselineSourceRef` (the run
+scripts reject combining those with `--switch-under-test`, since a simultaneous source change would
+make the delta unattributable), nor the `useManagedSniOnWindows` / `useOptimizedAsyncBehaviour` /
+`useConnectionPoolV2` flags. Every switch except the one under test stays at its checked-in
+`runnerconfig.jsonc` value, so the measured difference is attributable to exactly one variable.
+
+### Why these runs are never ingested into Kusto
+
+This mode has its own pipeline file, rather than being a flag on the other two, specifically so that
+"never ingested" is structural rather than a conditional someone can flip. Ingesting a switch
+experiment would corrupt the perf database three ways:
+
+* **`DerivedRunId` collision.** The ID is `driver|commit|pipelineRunId`. The other two pipelines keep
+  their two rows distinct because the baseline row carries a *different* commit (`v7.0.2`, or the
+  baseline ref's sha). Here both passes are the same commit in the same pipeline run, so both rows
+  would derive the same ID.
+* **`PerfRun.Config` is stamped once per run.** `translate_results_to_kusto.sh` builds one
+  `--config-override` set from the queue-time `CFG_*` values and reuses it for both the baseline and
+  current rows. That is correct when the config genuinely is shared, but it means the two rows could
+  not record the differing switch values that are the entire point of the experiment.
+* **Trend pollution.** No field marks a row as an experiment — `RunType` is already
+  `Sequential`/`Interweaved` — so the switch-on pass would be indistinguishable from an ordinary
+  measurement of the branch and would distort the very trends the other two pipelines exist to
+  protect.
+
+The comparison report and the raw BenchmarkDotNet artifacts are published as usual, and the build is
+tagged `Switch <name>` so experiments are identifiable in the ADO build list.
+
+### Designing benchmarks for switch experiments
+
+A switch experiment flips behaviour on purpose, so a benchmark that measures that behaviour will
+report a regression even when the change is working. `UseConnectionPoolV2` is the motivating example:
+`ChannelDbConnectionPool` opens physical connections concurrently, where `WaitHandleDbConnectionPool`
+serialises growth behind a `Semaphore(1, 1)`. `ConnectionPoolStressRunner` used to call
+`ClearAllPools()` in `[IterationCleanup]`, so every iteration was a cold-start burst in which the
+extra parallel opens had nothing to amortise against, and the runner reported the trade-off as a loss
+because that was the only thing it could measure.
+
+That is a benchmark defect rather than something to explain away, so the runner now pre-warms the
+pool to full capacity in `[GlobalSetup]` and no longer clears it between iterations. Establishing a
+connection costs milliseconds while a pooled checkout costs microseconds, so any creation left in the
+measured body swamps the pool cost the runner exists to measure. Keep that separation in mind when
+adding a pool benchmark: warm the pool first unless connection establishment is precisely the thing
+under test.
+
+The pipeline has no way to mark a result as acceptable, and deliberately so: a mute is only as good
+as the reasoning behind it, and that reasoning belongs in the pull request where a reviewer can
+challenge it. Prefer instead to fix the benchmark, or add one that measures the intended behaviour
+directly. `ConnectionPoolRampRunner` was added for exactly this reason: it keeps the cold pool but
+makes every caller *hold* its connection until all of them have connected, so the pool genuinely needs
+N physical connections and the only variable left is how fast it can open them. That rewards
+concurrent creation instead of penalising it, and it isolates cold start now that the stress runner no
+longer conflates it with checkout cost.
+
+The same principle applies to how a benchmark schedules its workers. A sync `Open()` that has to
+wait blocks whichever thread it runs on, so a pool whose waiter wake-up needs a queued continuation
+stalls when every threadpool thread is already blocked; the wake-up waits on thread injection. On
+the TFMs the perf project builds (net8.0-net10.0) the runtime is told about cooperative blocking and
+compensates quickly, so that stall is tens to a few hundred milliseconds, and that is the only
+expectation these benchmarks validate. On net462 the `Task` wait never notifies the pool, so the
+wake-up falls to starvation detection and hill climbing and is materially slower; the pool carries no
+framework guards and the driver still ships net462, so that path is live but unmeasured here.
+Threadpool threads are the realistic case, because sync database
+calls in ASP.NET run on them, and they are the only configuration in which that stall is visible.
+Benchmarks therefore keep threadpool threads as the default and add dedicated-thread variants
+alongside rather than instead:
+
+- `ConnectionPoolContentionRunner.SteadyStateOpenQueryCloseDedicatedThreads` runs the existing
+  workload on dedicated threads. A regression in both variants points at the pool; a regression in
+  only the threadpool variant points at the waiter wake path.
+- `ConnectionPoolThreadPoolPressureRunner` pins the threadpool floor via `[Params]`, below the worker
+  count (starved) and above it (control), so the effect is reproducible instead of depending on
+  hill-climbing timing.
+
+This failure mode is tail latency, not a shifted median, so compare distributions. Aggregating with
+a per-configuration minimum hides it completely.
+
+Note what those benchmarks are for. Saturating the thread pool with blocked synchronous calls is an
+application configuration problem, not a pool defect: an application should keep its parallelism
+below the thread pool's worker count so newly queued work still runs promptly, and pre-warming the
+thread pool is the application's responsibility rather than the driver's. These benchmarks exist to
+characterise where that boundary sits and to catch it moving, so a delta here is a prompt to check
+the boundary has not shifted rather than a bug to fix.
+
 ## Two-pass build model
 
 The `PerformanceTests` project references Microsoft.Data.SqlClient two ways, selected by MSBuild:
@@ -162,6 +279,9 @@ The `PerformanceTests` project references Microsoft.Data.SqlClient two ways, sel
 - **Baseline (source)**: no reference switching at all — the baseline ref's own copy of the perf
   project is built from `../sqlclient-perf-baseline-src`, keeping its default `ProjectReference` to
   that ref's driver source. Used by the PR pipeline.
+- **Baseline (switch experiment)**: no second build at all — `--switch-under-test` measures one
+  source tree twice, so the scripts build the `current` variant once and point both passes at it,
+  differing only in the runner config each pass is handed. Used by the experiment pipeline.
 
 The VM's `NuGet.config` exposes only the governed feed, and CPM rejects multiple unmapped sources
 (`NU1507`). The baseline pass therefore restores through a **dedicated single-source config**
@@ -210,7 +330,7 @@ supplies the isolated dedicated host, the tuned SQL instance, and the disjoint c
 | Fail loud | Preflight `SELECT 1` before any pass, **and** a post-pass guard that fails the run if a pass produced **zero** benchmark results — so an empty comparison can never be reported green. |
 | Warm-up | Touches the target DB in the preflight to warm the buffer pool / plan cache before the first measured benchmark. |
 | Allocator tuning (Linux) | Exports `MALLOC_MMAP_THRESHOLD_=128MiB` and `MALLOC_TRIM_THRESHOLD_=-1` so large-buffer benches (`LargeDataRead`, `SqlBulkCopy`) stop re-`mmap`ing per iteration. |
-| Network tuning (Linux) | Best-effort `sysctl` to widen the ephemeral port range and enable `tcp_tw_reuse` for churn benches (`ConnectionPoolStress`, `ParallelAsyncConnection`). Never fails the run. |
+| Network tuning (Linux) | Best-effort `sysctl` to widen the ephemeral port range and enable `tcp_tw_reuse` for churn benches (`ConnectionPoolStress`, `ConnectionPoolRamp`, `ConnectionPoolThreadPoolPressure`, `ParallelAsyncConnection`). Never fails the run. |
 | Diagnostics | Writes `results/diagnostics/`: SQL instance config (MAXDOP, memory, affinity, tempdb files, `@@VERSION`), host CPU topology, and per-pass CPU-clock/thermal telemetry (before/after each pass). |
 | Regression gate | `failOnRegression` threads `--fail-on-regression`; only a **candidate-slower** delta past the threshold fails, and in interleaved mode only after best-of-N confirmation. Default off. |
 | Interleaving | In `interleaved` mode the harness runs **one benchmark unit at a time, baseline then candidate back-to-back**, so both sides see the same host state (see below). |
@@ -323,6 +443,18 @@ translated NDJSON as the `perf-kusto-payloads` artifact for manual/backfill inge
 3. After the run, review the **run summary** (comparison, labelled `<ref>@<short-sha>`) and the
    `perf-results` artifact. The build is tagged **`Baseline <ref>`**.
 
+### Running the experiment pipeline
+
+1. Open the **experiment** performance test pipeline (`sqlclient-perf-experiment.yml`) in Azure
+   DevOps and select **Run pipeline**.
+2. Choose the branch whose behaviour you want to measure — `main` to characterise the switch on its
+   own, or a PR branch to characterise it against that change — and pick `switchUnderTest`. There is
+   no baseline selector: the baseline *is* this branch with the switch off. No Kusto configuration is
+   involved; these results are never ingested (see [Why these runs are never ingested into
+   Kusto](#why-these-runs-are-never-ingested-into-kusto)).
+3. After the run, review the **run summary** (comparison, labelled `<Switch>=false`) and the
+   `perf-results` artifact. The build is tagged **`Switch <name>`**.
+
 ## Troubleshooting
 
 | Symptom | Likely cause / fix |
@@ -331,6 +463,8 @@ translated NDJSON as the `perf-kusto-payloads` artifact for manual/backfill inge
 | Baseline restore fails to find MDS | `baselineVersion` isn't a published NuGet.org version, or the VM has no outbound access to `api.nuget.org`. |
 | Baseline pass fails to compile: `CS1061 ... does not contain a definition for <member>` | A benchmark calls an MDS API newer than `baselineVersion`. Guard it with the `MDS_GE_<major>` constants and add an older fallback — see [Benchmarks must compile against the oldest baseline](#benchmarks-must-compile-against-the-oldest-baseline). |
 | No comparison / summary | The baseline pass was skipped (empty `baselineVersion` / `baselineSourceRef`) or one pass produced no `*-report-full.json`. |
+| `--switch-under-test is mutually exclusive with --baseline-version and --baseline-source-ref` | A switch experiment was combined with a source baseline. The experiment pipeline never does this; if you are invoking the scripts directly, clear the baseline selector — varying source and config at once makes the delta unattributable. |
+| Switch experiment shows a ~0% delta everywhere | Expected for benchmarks the switch does not touch. If *every* benchmark is flat, check the run log's `Switch A/B` line actually names the switch, and that the switch is one the driver reads at startup via the runner config. |
 | Baseline source ref not found (PR pipeline) | `baselineSourceRef` is not a branch on `origin`, and the fallback `git clone --branch <ref>` of `baselineRepoUrl` also failed (ref does not exist there, or the VM has no outbound access to the remote). The reason git gave is echoed into the build log and saved to `<results>/diagnostics/git-*.log`. |
 | `Fetching baseline ref ... from the checkout's origin` is the last line, then the job stalls | Should no longer happen. The checkout is copied to the VM without credentials (ADO's checkout task defaults to `persistCredentials: false`), so a fetch from an authenticated `origin` used to sit on a `Username for ...` prompt forever. All network git calls now run with `GIT_TERMINAL_PROMPT=0`, no credential helper, stdin closed, and a `GIT_NET_TIMEOUT_SECS` (default 300s) hard timeout, so this fails in under a second and falls back to cloning `baselineRepoUrl`. A fetch failure here is expected and harmless on ADO. |
 | Ingestion step skipped | `enableKustoIngestion` is `false`, or `KustoClusterUri`, `KustoDatabase` or `KustoServiceConnection` (from `ADX Cluster Variables`) is empty (expected until the cluster is provisioned). |
diff --git a/eng/pipelines/perf/scripts/interleave_perf.py b/eng/pipelines/perf/scripts/interleave_perf.py
index 167002fb8f..6522adced1 100644
--- a/eng/pipelines/perf/scripts/interleave_perf.py
+++ b/eng/pipelines/perf/scripts/interleave_perf.py
@@ -101,17 +101,22 @@ def apply_affinity(proc, cpus):
 # --------------------------------------------------------------------------------------------------
 # Running one unit and collecting its artifacts.
 # --------------------------------------------------------------------------------------------------
-def run_unit_process(exe_dir, assembly, unit, cwd, cpus, log_path):
+def run_unit_process(exe_dir, assembly, unit, cwd, cpus, log_path, env_overrides=None):
     """Run one benchmark *unit* from the build at *exe_dir* in *cwd*.
 
     Returns the subprocess return code.  Kept as a small seam so tests can substitute
-    a fake runner.
+    a fake runner.  *env_overrides*, when given, is applied on top of the inherited
+    environment (e.g. a per-variant RUNNER_CONFIG so baseline and current can run with
+    different SqlClient behaviour flags, such as comparing the legacy vs new connection
+    pool from the SAME build).
     """
     os.makedirs(cwd, exist_ok=True)
     cmd = ["dotnet", os.path.join(exe_dir, assembly)]
     env = dict(os.environ)
     env["PERF_BENCHMARK"] = unit
     env.pop("PERF_LIST_BENCHMARKS", None)
+    if env_overrides:
+        env.update(env_overrides)
 
     with open(log_path, "w", encoding="utf-8") as log:
         proc = subprocess.Popen(cmd, cwd=cwd, env=env, stdout=log,
@@ -154,12 +159,18 @@ def collect_results(cwd, dest):
 class Runner:
     """Holds the invariant run parameters and performs interleaved unit passes."""
 
-    def __init__(self, baseline_dir, current_dir, assembly, work_dir, cpus):
+    def __init__(self, baseline_dir, current_dir, assembly, work_dir, cpus,
+                 baseline_runner_config=None, current_runner_config=None):
         self.baseline_dir = baseline_dir
         self.current_dir = current_dir
         self.assembly = assembly
         self.work_dir = work_dir
         self.cpus = cpus
+        # Optional per-variant RUNNER_CONFIG override (e.g. --switch-under-test needs baseline
+        # and current to run with different SqlClient behaviour flags even though they share the
+        # same build). None means "no override" -> both variants use the ambient RUNNER_CONFIG.
+        self.baseline_runner_config = baseline_runner_config
+        self.current_runner_config = current_runner_config
 
     def list_units(self):
         cmd = ["dotnet", os.path.join(self.current_dir, self.assembly)]
@@ -175,7 +186,11 @@ def _run_one(self, variant, exe_dir, unit, rep, agg_dir):
             shutil.rmtree(cwd)
         os.makedirs(cwd, exist_ok=True)
         log_path = os.path.join(cwd, "run.log")
-        rc = run_unit_process(exe_dir, self.assembly, unit, cwd, self.cpus, log_path)
+        runner_config = (self.baseline_runner_config if variant == "baseline"
+                         else self.current_runner_config)
+        env_overrides = {"RUNNER_CONFIG": runner_config} if runner_config else None
+        rc = run_unit_process(exe_dir, self.assembly, unit, cwd, self.cpus, log_path,
+                              env_overrides=env_overrides)
         if rc != 0:
             _tail(log_path)
             raise RuntimeError(f"benchmark unit '{unit}' ({variant}, rep {rep}) failed (exit {rc}).")
@@ -353,6 +368,14 @@ def main(argv=None):
     parser.add_argument("--reps", type=int, default=3,
                         help="Total interleaved passes for a flagged unit (best-of-N). 1 disables confirmation.")
     parser.add_argument("--baseline-version", default="baseline")
+    parser.add_argument("--baseline-runner-config", default=None,
+                        help="Override RUNNER_CONFIG for baseline-variant subprocesses only "
+                             "(e.g. to force a different SqlClient behaviour flag for the "
+                             "baseline, such as comparing the legacy vs new connection pool "
+                             "from the same build). Omit to use the ambient RUNNER_CONFIG for "
+                             "both variants (default behaviour).")
+    parser.add_argument("--current-runner-config", default=None,
+                        help="Override RUNNER_CONFIG for current-variant subprocesses only.")
     parser.add_argument("--client-cpus", default=os.environ.get("PERF_CLIENT_CPUS", ""),
                         help="CPU set to pin the benchmark client to, e.g. '16-31'.")
     parser.add_argument("--fail-on-regression", action="store_true",
@@ -376,7 +399,9 @@ def main(argv=None):
 
     runner = Runner(os.path.abspath(args.baseline_exe_dir),
                     os.path.abspath(args.current_exe_dir),
-                    args.assembly, work_dir, cpus)
+                    args.assembly, work_dir, cpus,
+                    baseline_runner_config=args.baseline_runner_config,
+                    current_runner_config=args.current_runner_config)
 
     units = runner.list_units()
     if not units:
diff --git a/eng/pipelines/perf/scripts/run-perf-tests.ps1 b/eng/pipelines/perf/scripts/run-perf-tests.ps1
index c91239eb80..2b3f9bed40 100644
--- a/eng/pipelines/perf/scripts/run-perf-tests.ps1
+++ b/eng/pipelines/perf/scripts/run-perf-tests.ps1
@@ -54,7 +54,17 @@ param(
     [ValidateSet("", "true", "false")]
     [string]$UseOptimizedAsyncBehaviour = "",
     [ValidateSet("", "true", "false")]
-    [string]$UseConnectionPoolV2 = ""
+    [string]$UseConnectionPoolV2 = "",
+    # Alternative to -BaselineVersion/-BaselineSourceRef: an A/B experiment on ONE runner-config
+    # switch. Both passes build the SAME source; only the named switch differs (baseline=false,
+    # current=true), which is the only way to compare a switch whose value is latched process-wide
+    # (e.g. UseConnectionPoolV2 is read and cached the first time a pool is created). Mutually
+    # exclusive with the other two baseline selectors, and overrides the matching -Use* flag (which
+    # would otherwise be ambiguous: one value cannot describe two passes).  ValidateSet restricts it
+    # to switches this script knows how to stamp, so a typo fails fast at binding time instead of
+    # silently writing an inert key and reporting a meaningless zero-delta comparison.
+    [ValidateSet("", "UseConnectionPoolV2", "UseOptimizedAsyncBehaviour", "UseManagedSniOnWindows")]
+    [string]$SwitchUnderTest = ""
 )
 
 $ErrorActionPreference = "Stop"
@@ -128,6 +138,7 @@ Write-Host "  Results dir     : $ResultsDir"
 Write-Host "  Run mode        : $RunMode (confirmation runs: $ConfirmationRuns)"
 Write-Host "  Baseline ver    : $(if ($BaselineVersion) { $BaselineVersion } else { '<none, current-only>' })"
 Write-Host "  Baseline ref    : $(if ($BaselineSourceRef) { $BaselineSourceRef } else { '<none>' })"
+Write-Host "  Switch A/B      : $(if ($SwitchUnderTest) { "$SwitchUnderTest (baseline=false vs current=true)" } else { '<none>' })"
 Write-Host "  SQL_SERVER      : $SqlServer"
 Write-Host "  PERF_CLIENT_CPUS: $($env:PERF_CLIENT_CPUS)"
 Write-Host "  PERF_SQL_CPUS   : $($env:PERF_SQL_CPUS)"
@@ -141,6 +152,32 @@ if (-not (Test-Path $PerfProject)) {
 if ((-not [string]::IsNullOrEmpty($BaselineVersion)) -and (-not [string]::IsNullOrEmpty($BaselineSourceRef))) {
     throw "-BaselineVersion and -BaselineSourceRef are mutually exclusive."
 }
+if ((-not [string]::IsNullOrEmpty($SwitchUnderTest)) -and ((-not [string]::IsNullOrEmpty($BaselineVersion)) -or (-not [string]::IsNullOrEmpty($BaselineSourceRef)))) {
+    throw "-SwitchUnderTest is mutually exclusive with -BaselineVersion and -BaselineSourceRef: it compares the SAME source build with one switch flipped, so mixing in a source change would make the delta unattributable."
+}
+# UseManagedSniOnWindows only selects an implementation on Windows.  PowerShell Core also runs on
+# Linux, so check the host rather than assume this script implies Windows: off-Windows both passes
+# use managed SNI and the experiment reports a ~0% delta that reads as "the switch is free".
+# $IsWindows is undefined on Windows PowerShell 5.1, which is itself Windows-only, so null is Windows.
+if ($SwitchUnderTest -eq "UseManagedSniOnWindows") {
+    $onWindows = if ($null -eq (Get-Variable -Name IsWindows -ErrorAction SilentlyContinue)) { $true } else { $IsWindows }
+    if (-not $onWindows) {
+        throw "-SwitchUnderTest UseManagedSniOnWindows is Windows-only; elsewhere managed SNI is always used, so baseline and current would be identical. Re-run this experiment on the Windows platform."
+    }
+}
+# -SwitchUnderTest forces its switch explicitly for each pass (baseline=false, current=true), so a
+# separately-supplied -Use* flag for that SAME switch would be silently overridden; warn rather than
+# let that go unnoticed.  Other -Use* flags still apply normally to both passes.
+$conflictingFlag = ""
+$conflictingFlagValue = switch ($SwitchUnderTest) {
+    "UseConnectionPoolV2"        { $conflictingFlag = "-UseConnectionPoolV2";        $UseConnectionPoolV2 }
+    "UseOptimizedAsyncBehaviour" { $conflictingFlag = "-UseOptimizedAsyncBehaviour"; $UseOptimizedAsyncBehaviour }
+    "UseManagedSniOnWindows"     { $conflictingFlag = "-UseManagedSniOnWindows";     $UseManagedSniOnWindows }
+    default                      { "" }
+}
+if (-not [string]::IsNullOrEmpty($conflictingFlagValue)) {
+    Write-Warning "$conflictingFlag=$conflictingFlagValue is ignored when -SwitchUnderTest is $SwitchUnderTest (baseline forces false, current forces true)."
+}
 if ([string]::IsNullOrEmpty($SqlPassword)) {
     throw "SQL_PASSWORD environment variable is not set (expected from the perf template)."
 }
@@ -302,20 +339,11 @@ $env:RUNNER_CONFIG = $RunnerConfig
 # It needs no per-run modification, so point the env var at the checked-in file directly.
 $env:DATATYPES_CONFIG = Join-Path $PerfDir "datatypes.json"
 
-$srcConfig = Join-Path $PerfDir "runnerconfig.jsonc"
-$rawConfig = Get-Content $srcConfig -Raw
-# Strip // line comments so ConvertFrom-Json accepts the .jsonc content.
-$rawConfig = ($rawConfig -split "`n" | ForEach-Object { $_ -replace '(?m)^\s*//.*$', '' }) -join "`n"
-$cfg = ConvertFrom-Json $rawConfig
-
 # SqlClient connection-string values may be wrapped in double quotes; doubling any embedded double
 # quote lets a password containing ';', '=', spaces or single quotes be parsed as a single literal
 # value instead of corrupting the connection string.
 $escapedPassword = '"' + ($SqlPassword -replace '"', '""') + '"'
-$cfg.ConnectionString = "Server=tcp:$SqlServer,1433;User ID=sa;Password=$escapedPassword;Initial Catalog=$DbName;TrustServerCertificate=True;Encrypt=False;"
-# Apply the optional SqlClient behaviour overrides supplied by the pipeline.  An empty value leaves
-# the checked-in default untouched; otherwise the flag is forced to the requested boolean so the
-# benchmarks run with (and PerfRun.Config records) exactly the requested behaviour.
+
 function Set-CfgBool {
     param($Config, [string]$Name, [string]$Value)
     if (-not [string]::IsNullOrEmpty($Value)) {
@@ -324,11 +352,51 @@ function Set-CfgBool {
         else { $Config | Add-Member -NotePropertyName $Name -NotePropertyValue $b }
     }
 }
-Set-CfgBool $cfg "UseManagedSniOnWindows" $UseManagedSniOnWindows
-Set-CfgBool $cfg "UseOptimizedAsyncBehaviour" $UseOptimizedAsyncBehaviour
-Set-CfgBool $cfg "UseConnectionPoolV2" $UseConnectionPoolV2
-$cfg | ConvertTo-Json -Depth 10 | Set-Content -Path $RunnerConfig -Encoding UTF8
-Write-Host "Wrote runner config to $RunnerConfig (Server=tcp:$SqlServer,1433; Initial Catalog=$DbName)"
+
+# Write-RunnerConfig <dst> [switchName] [switchValue]
+# Writes one runner config (checked-in runnerconfig.jsonc + injected connection string + behaviour
+# overrides) to <dst>. When <switchName> is given, that config key is forced to <switchValue>
+# ("true"/"false") regardless of the corresponding -Use* parameter -- used by -SwitchUnderTest, which
+# needs a different value for the same switch in each pass. With no switch name the config is built
+# purely from the -Use* parameters, exactly as before.
+function Write-RunnerConfig {
+    param([string]$Dst, [string]$SwitchName = "", [string]$SwitchValue = "")
+    $srcConfig = Join-Path $PerfDir "runnerconfig.jsonc"
+    $rawConfig = Get-Content $srcConfig -Raw
+    # Strip // line comments so ConvertFrom-Json accepts the .jsonc content.
+    $rawConfig = ($rawConfig -split "`n" | ForEach-Object { $_ -replace '(?m)^\s*//.*$', '' }) -join "`n"
+    $cfg = ConvertFrom-Json $rawConfig
+
+    $cfg.ConnectionString = "Server=tcp:$SqlServer,1433;User ID=sa;Password=$escapedPassword;Initial Catalog=$DbName;TrustServerCertificate=True;Encrypt=False;"
+    # Apply the optional SqlClient behaviour overrides supplied by the pipeline.  An empty value
+    # leaves the checked-in default untouched; otherwise the flag is forced to the requested boolean
+    # so the benchmarks run with (and PerfRun.Config records) exactly the requested behaviour. The
+    # switch-under-test override (when this config names one) takes precedence over the matching
+    # -Use* parameter, so a single checked-in template can be stamped out per pass with that one
+    # switch flipped and everything else identical.
+    $sniValue   = if ($SwitchName -eq "UseManagedSniOnWindows")     { $SwitchValue } else { $UseManagedSniOnWindows }
+    $asyncValue = if ($SwitchName -eq "UseOptimizedAsyncBehaviour") { $SwitchValue } else { $UseOptimizedAsyncBehaviour }
+    $poolValue  = if ($SwitchName -eq "UseConnectionPoolV2")        { $SwitchValue } else { $UseConnectionPoolV2 }
+    Set-CfgBool $cfg "UseManagedSniOnWindows" $sniValue
+    Set-CfgBool $cfg "UseOptimizedAsyncBehaviour" $asyncValue
+    Set-CfgBool $cfg "UseConnectionPoolV2" $poolValue
+    $cfg | ConvertTo-Json -Depth 10 | Set-Content -Path $Dst -Encoding UTF8
+    Write-Host "Wrote runner config to $Dst (Server=tcp:$SqlServer,1433; Initial Catalog=$DbName)"
+}
+
+Write-RunnerConfig -Dst $RunnerConfig
+
+# -SwitchUnderTest needs two DIFFERENT runner configs (baseline runs the switch off, current runs it
+# on), so stamp out two more copies here alongside the shared one above.  Everything else in them is
+# identical, so any measured delta is attributable to the switch alone.
+$BaselineRunnerConfig = ""
+$CurrentRunnerConfig = ""
+if (-not [string]::IsNullOrEmpty($SwitchUnderTest)) {
+    $BaselineRunnerConfig = Join-Path $RepoRoot "perf-runnerconfig-baseline.json"
+    $CurrentRunnerConfig = Join-Path $RepoRoot "perf-runnerconfig-current.json"
+    Write-RunnerConfig -Dst $BaselineRunnerConfig -SwitchName $SwitchUnderTest -SwitchValue "false"
+    Write-RunnerConfig -Dst $CurrentRunnerConfig -SwitchName $SwitchUnderTest -SwitchValue "true"
+}
 
 ####################################################################################################
 # 4 & 5. Run the benchmarks, pinned to the reserved client CPU set.
@@ -688,6 +756,11 @@ if (-not [string]::IsNullOrEmpty($BaselineVersion)) {
     $baselineSource = Initialize-BaselineSource -Ref $BaselineSourceRef
     $BaselineLabel = $baselineSource.Label
     $BaselineProject = $baselineSource.Project
+} elseif (-not [string]::IsNullOrEmpty($SwitchUnderTest)) {
+    # Switch A/B: SAME source/project for both passes ($BaselineProject/$BaselineBuildArgs are
+    # already the candidate's, set above), so only the runner config differs (see
+    # $BaselineRunnerConfig/$CurrentRunnerConfig written above: the named switch off vs on).
+    $BaselineLabel = "$SwitchUnderTest=false"
 }
 
 # Record the resolved baseline label (for a source baseline this is '<ref>@<sha>') in the results
@@ -704,8 +777,17 @@ if ((-not [string]::IsNullOrEmpty($BaselineLabel)) -and ($RunMode -eq "interleav
     # orchestrator run one unit at a time (baseline then candidate) and confirm any flagged
     # regression across N passes before it counts toward the gate.
     ####################################################################################################
-    $baselineExeDir = Build-Variant "baseline" $BaselineProject $BaselineBuildArgs
-    $currentExeDir = Build-Variant "current" $PerfProject @()
+    if (-not [string]::IsNullOrEmpty($SwitchUnderTest)) {
+        # Switch A/B measures one build against itself with a switch flipped, so building the same
+        # project twice would just burn several minutes producing identical bits.  Build once and
+        # point both variants at it; the orchestrator runs each variant in its own working directory
+        # (rep<N>/<variant>/<unit>), so a shared exe dir cannot cross-contaminate their artifacts.
+        $currentExeDir = Build-Variant "current" $PerfProject @()
+        $baselineExeDir = $currentExeDir
+    } else {
+        $baselineExeDir = Build-Variant "baseline" $BaselineProject $BaselineBuildArgs
+        $currentExeDir = Build-Variant "current" $PerfProject @()
+    }
 
     $interleaveArgs = @(
         "--baseline-exe-dir", $baselineExeDir,
@@ -717,6 +799,12 @@ if ((-not [string]::IsNullOrEmpty($BaselineLabel)) -and ($RunMode -eq "interleav
         "--baseline-version", $BaselineLabel,
         "--client-cpus", "$($env:PERF_CLIENT_CPUS)"
     )
+    # -SwitchUnderTest: baseline and current subprocesses need DIFFERENT RUNNER_CONFIG values (the
+    # switch off vs on), even though both are otherwise the same build/env; every other baseline
+    # flavour keeps sharing the single ambient RUNNER_CONFIG set above.
+    if (-not [string]::IsNullOrEmpty($SwitchUnderTest)) {
+        $interleaveArgs += @("--baseline-runner-config", $BaselineRunnerConfig, "--current-runner-config", $CurrentRunnerConfig)
+    }
     if ($FailOnRegression) {
         Write-Host "Regression gate ENABLED: a CONFIRMED candidate-slower regression (> $RegressionThreshold%) will fail the run."
         $interleaveArgs += "--fail-on-regression"
@@ -726,7 +814,11 @@ if ((-not [string]::IsNullOrEmpty($BaselineLabel)) -and ($RunMode -eq "interleav
 
 } elseif (-not [string]::IsNullOrEmpty($BaselineLabel)) {
     # --- Legacy sequential path: full baseline pass, then full candidate pass, then compare -------
+    # -SwitchUnderTest needs a different RUNNER_CONFIG per pass; every other baseline flavour
+    # keeps using the single ambient RUNNER_CONFIG set above (unchanged behaviour).
+    if (-not [string]::IsNullOrEmpty($SwitchUnderTest)) { $env:RUNNER_CONFIG = $BaselineRunnerConfig }
     Invoke-PerfPass "baseline" $BaselineProject $BaselineBuildArgs
+    if (-not [string]::IsNullOrEmpty($SwitchUnderTest)) { $env:RUNNER_CONFIG = $CurrentRunnerConfig }
     Invoke-PerfPass "current" $PerfProject @()
 
     Write-Host "Comparing current branch against baseline $BaselineLabel ..."
diff --git a/eng/pipelines/perf/scripts/run-perf-tests.sh b/eng/pipelines/perf/scripts/run-perf-tests.sh
index 8d05340342..c0b485dc9b 100755
--- a/eng/pipelines/perf/scripts/run-perf-tests.sh
+++ b/eng/pipelines/perf/scripts/run-perf-tests.sh
@@ -65,10 +65,22 @@ confirmationRuns="3"
 useManagedSniOnWindows=""
 useOptimizedAsyncBehaviour=""
 useConnectionPoolV2=""
+# Alternative to --baseline-version/--baseline-source-ref: an A/B experiment on ONE runner-config
+# switch.  Both passes build the SAME source; only the named switch differs (baseline=false,
+# current=true), which is the only way to compare a switch whose value is latched process-wide (e.g.
+# UseConnectionPoolV2 is read and cached the first time a pool is created).  Mutually exclusive with
+# the other two baseline selectors, and overrides the matching --use-* flag (which would otherwise be
+# ambiguous: one value cannot describe two passes).
+switchUnderTest=""
+# Runner-config switches this script is allowed to A/B.  Restricted to a known list so a typo fails
+# fast here instead of silently writing an inert key into the runner config and reporting a
+# meaningless zero-delta comparison.
+SUPPORTED_SWITCHES=("UseConnectionPoolV2" "UseOptimizedAsyncBehaviour" "UseManagedSniOnWindows")
 
 usage() {
     echo "Usage: $0 [--configuration <cfg>] [--framework <tfm>] [--results-subdir <dir>]" \
-         "[--baseline-version <ver> | --baseline-source-ref <ref> [--baseline-repo-url <url>]]" \
+         "[--baseline-version <ver> | --baseline-source-ref <ref> [--baseline-repo-url <url>] |" \
+         "--switch-under-test <${SUPPORTED_SWITCHES[*]}>]" \
          "[--regression-threshold <pct>] [--fail-on-regression]" \
          "[--run-mode interleaved|sequential] [--confirmation-runs <N>]" \
          "[--use-managed-sni-on-windows true|false] [--use-optimized-async-behaviour true|false]" \
@@ -83,6 +95,7 @@ while [[ $# -gt 0 ]]; do
         --baseline-version) baselineVersion="$2"; shift 2 ;;
         --baseline-source-ref) baselineSourceRef="$2"; shift 2 ;;
         --baseline-repo-url) baselineRepoUrl="$2"; shift 2 ;;
+        --switch-under-test) switchUnderTest="$2"; shift 2 ;;
         --regression-threshold) regressionThreshold="$2"; shift 2 ;;
         --fail-on-regression) failOnRegression="true"; shift 1 ;;
         --run-mode) runMode="$2"; shift 2 ;;
@@ -103,12 +116,33 @@ case "${runMode}" in
     *) echo "ERROR: --run-mode must be 'interleaved' or 'sequential' (got '${runMode}')." >&2
        usage; exit 2 ;;
 esac
-# The two baseline selectors describe different builds of the same "baseline" pass, so requesting
-# both is always a mistake; fail fast rather than silently honouring one of them.
+# The three baseline selectors describe different builds/configs of the same "baseline" pass, so
+# requesting more than one is always a mistake; fail fast rather than silently honouring one of them.
 if [[ -n "${baselineVersion}" && -n "${baselineSourceRef}" ]]; then
     echo "ERROR: --baseline-version and --baseline-source-ref are mutually exclusive." >&2
     usage; exit 2
 fi
+if [[ -n "${switchUnderTest}" && ( -n "${baselineVersion}" || -n "${baselineSourceRef}" ) ]]; then
+    echo "ERROR: --switch-under-test is mutually exclusive with --baseline-version and --baseline-source-ref: it compares the SAME source build with one switch flipped, so mixing in a source change would make the delta unattributable." >&2
+    usage; exit 2
+fi
+if [[ -n "${switchUnderTest}" ]]; then
+    switchSupported="false"
+    for supported in "${SUPPORTED_SWITCHES[@]}"; do
+        [[ "${switchUnderTest}" == "${supported}" ]] && switchSupported="true"
+    done
+    if [[ "${switchSupported}" != "true" ]]; then
+        echo "ERROR: --switch-under-test must be one of: ${SUPPORTED_SWITCHES[*]} (got '${switchUnderTest}')." >&2
+        usage; exit 2
+    fi
+    # UseManagedSniOnWindows only selects an implementation on Windows.  This is the bash entry
+    # point, so both passes here would run identical managed SNI and the experiment would spend
+    # hours to report a ~0% delta that looks like "the switch is free" rather than "not applicable".
+    if [[ "${switchUnderTest}" == "UseManagedSniOnWindows" ]]; then
+        echo "ERROR: --switch-under-test UseManagedSniOnWindows is Windows-only; on Linux managed SNI is always used, so baseline and current would be identical. Re-run this experiment on the Windows platform." >&2
+        exit 2
+    fi
+fi
 if ! [[ "${confirmationRuns}" =~ ^[0-9]+$ ]] || [[ "${confirmationRuns}" -lt 1 ]]; then
     echo "ERROR: --confirmation-runs must be a positive integer (got '${confirmationRuns}')." >&2
     usage; exit 2
@@ -123,6 +157,18 @@ validate_bool() {  # $1 = flag name (for the message), $2 = value
 validate_bool use-managed-sni-on-windows "${useManagedSniOnWindows}"
 validate_bool use-optimized-async-behaviour "${useOptimizedAsyncBehaviour}"
 validate_bool use-connection-pool-v2 "${useConnectionPoolV2}"
+# --switch-under-test forces its switch explicitly for each pass (baseline=false, current=true), so a
+# separately-supplied --use-* flag for that SAME switch would be silently overridden; warn rather
+# than let that go unnoticed.  Other --use-* flags still apply normally to both passes.
+case "${switchUnderTest}" in
+    UseConnectionPoolV2)       conflictingValue="${useConnectionPoolV2}";       conflictingFlag="--use-connection-pool-v2" ;;
+    UseOptimizedAsyncBehaviour) conflictingValue="${useOptimizedAsyncBehaviour}"; conflictingFlag="--use-optimized-async-behaviour" ;;
+    UseManagedSniOnWindows)    conflictingValue="${useManagedSniOnWindows}";    conflictingFlag="--use-managed-sni-on-windows" ;;
+    *)                         conflictingValue="";                            conflictingFlag="" ;;
+esac
+if [[ -n "${conflictingValue}" ]]; then
+    echo "WARNING: ${conflictingFlag} is ignored when --switch-under-test is ${switchUnderTest} (baseline forces false, current forces true)." >&2
+fi
 
 ####################################################################################################
 # Resolve paths
@@ -148,6 +194,7 @@ echo "  Framework      : ${framework}"
 echo "  Results dir    : ${RESULTS_DIR}"
 echo "  Baseline ver   : ${baselineVersion:-<none, current-only>}"
 echo "  Baseline ref   : ${baselineSourceRef:-<none>}"
+echo "  Switch A/B     : ${switchUnderTest:-<none>}${switchUnderTest:+ (baseline=false vs current=true)}"
 echo "  Run mode       : ${runMode} (confirmation runs: ${confirmationRuns})"
 echo "  SQL_SERVER     : ${SQL_SERVER:-<unset, will default to localhost>}"
 echo "  PERF_CLIENT_CPUS: ${PERF_CLIENT_CPUS:-<unset>}"
@@ -295,7 +342,8 @@ export MALLOC_MMAP_THRESHOLD_="${MALLOC_MMAP_THRESHOLD_:-134217728}"   # 128 MiB
 export MALLOC_TRIM_THRESHOLD_="${MALLOC_TRIM_THRESHOLD_:--1}"          # never trim
 
 # --- §2.9 Network tuning (best-effort; needs privilege, so it must never fail the run) ------------
-# Connection-churn benches (ConnectionPoolStress, ParallelAsyncConnection) exhaust ephemeral ports;
+# Connection-churn benches (ConnectionPoolStress, ConnectionPoolRamp,
+# ConnectionPoolThreadPoolPressure, ParallelAsyncConnection) exhaust ephemeral ports;
 # widen the range and allow TIME_WAIT reuse so socket setup latency stays stable.  'sudo -n' keeps
 # this non-interactive: on a VM without passwordless sudo it fails immediately instead of blocking
 # on a password prompt, then we fall back to a non-sudo sysctl (and finally give up quietly).
@@ -358,10 +406,20 @@ export PERF_CFG_USE_MANAGED_SNI="${useManagedSniOnWindows}"
 export PERF_CFG_USE_OPTIMIZED_ASYNC="${useOptimizedAsyncBehaviour}"
 export PERF_CFG_USE_CONNECTION_POOL_V2="${useConnectionPoolV2}"
 
-python3 - "$PERF_DIR/runnerconfig.jsonc" "$RUNNER_CONFIG" <<'PY'
+# write_runner_config <dst> [switch_name] [switch_value]
+# Writes one runner config (checked-in runnerconfig.jsonc + injected connection string + behaviour
+# overrides) to <dst>.  When <switch_name> is given, that config key is forced to <switch_value>
+# ("true"/"false") regardless of the corresponding PERF_CFG_* value -- used by --switch-under-test,
+# which needs a different value for the same switch in each pass.  With no switch name the config is
+# built purely from the PERF_CFG_* values, exactly as before.
+write_runner_config() {
+    local dst="$1"
+    local switch_name="${2:-}"
+    local switch_value="${3:-}"
+    python3 - "$PERF_DIR/runnerconfig.jsonc" "$dst" "$switch_name" "$switch_value" <<'PY'
 import json, os, re, sys
 
-src, dst = sys.argv[1], sys.argv[2]
+src, dst, switch_name, switch_value = sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4]
 
 with open(src, "r", encoding="utf-8-sig") as fh:
     text = fh.read()
@@ -387,13 +445,16 @@ cfg["ConnectionString"] = (
 
 # Apply the optional SqlClient behaviour overrides supplied by the pipeline.  An empty value leaves
 # the checked-in default untouched; otherwise the flag is forced to the requested boolean so the
-# benchmarks run with (and PerfRun.Config records) exactly the requested behaviour.
+# benchmarks run with (and PerfRun.Config records) exactly the requested behaviour.  The
+# switch-under-test override (when this config names one) takes precedence over the corresponding
+# PERF_CFG_* value, so a single checked-in template can be stamped out per pass with that one switch
+# flipped and everything else identical.
 for env_name, cfg_key in (
     ("PERF_CFG_USE_MANAGED_SNI", "UseManagedSniOnWindows"),
     ("PERF_CFG_USE_OPTIMIZED_ASYNC", "UseOptimizedAsyncBehaviour"),
     ("PERF_CFG_USE_CONNECTION_POOL_V2", "UseConnectionPoolV2"),
 ):
-    val = os.environ.get(env_name, "")
+    val = switch_value if cfg_key == switch_name else os.environ.get(env_name, "")
     if val != "":
         cfg[cfg_key] = (val.lower() == "true")
 
@@ -402,6 +463,21 @@ with open(dst, "w", encoding="utf-8") as fh:
 
 print(f"Wrote runner config to {dst} (Server=tcp:{server},1433; Initial Catalog={db})")
 PY
+}
+
+write_runner_config "${RUNNER_CONFIG}"
+
+# --switch-under-test needs two DIFFERENT runner configs (baseline runs the switch off, current runs
+# it on), so stamp out two more copies here alongside the shared one above.  Everything else in them
+# is identical, so any measured delta is attributable to the switch alone.
+BASELINE_RUNNER_CONFIG=""
+CURRENT_RUNNER_CONFIG=""
+if [[ -n "${switchUnderTest}" ]]; then
+    BASELINE_RUNNER_CONFIG="${REPO_ROOT}/perf-runnerconfig-baseline.json"
+    CURRENT_RUNNER_CONFIG="${REPO_ROOT}/perf-runnerconfig-current.json"
+    write_runner_config "${BASELINE_RUNNER_CONFIG}" "${switchUnderTest}" "false"
+    write_runner_config "${CURRENT_RUNNER_CONFIG}" "${switchUnderTest}" "true"
+fi
 
 ####################################################################################################
 # 4 & 5. Run the benchmarks, pinned to the reserved client CPU set.
@@ -686,6 +762,11 @@ elif [[ -n "${baselineSourceRef}" ]]; then
     prepare_baseline_source "${baselineSourceRef}"
     baselineLabel="${BASELINE_SRC_LABEL}"
     baselineProject="${BASELINE_PERF_PROJECT}"
+elif [[ -n "${switchUnderTest}" ]]; then
+    # Switch A/B: SAME source/project for both passes (baselineProject/baselineBuildArgs are already
+    # the candidate's, set above), so only the runner config differs (see BASELINE_RUNNER_CONFIG /
+    # CURRENT_RUNNER_CONFIG written above: the named switch off vs on).
+    baselineLabel="${switchUnderTest}=false"
 fi
 
 # Record the resolved baseline label (for a source baseline this is '<ref>@<sha>') in the results
@@ -702,12 +783,24 @@ if [[ -n "${baselineLabel}" && "${runMode}" == "interleaved" ]]; then
     # orchestrator run one unit at a time (baseline then candidate) and confirm any flagged
     # regression across N passes before it counts toward the gate.
     ################################################################################################
-    build_variant "baseline" "${baselineProject}" ${baselineBuildArgs[@]+"${baselineBuildArgs[@]}"}
-    build_variant "current" "${PERF_PROJECT}"
+    if [[ -n "${switchUnderTest}" ]]; then
+        # Switch A/B measures one build against itself with a switch flipped, so building the same
+        # project twice would just burn several minutes producing identical bits.  Build once and
+        # point both variants at it; the orchestrator runs each variant in its own working directory
+        # (rep<N>/<variant>/<unit>), so a shared exe dir cannot cross-contaminate their artifacts.
+        build_variant "current" "${PERF_PROJECT}"
+        baselineExeDir="${REPO_ROOT}/perf-build-current"
+        currentExeDir="${REPO_ROOT}/perf-build-current"
+    else
+        build_variant "baseline" "${baselineProject}" ${baselineBuildArgs[@]+"${baselineBuildArgs[@]}"}
+        build_variant "current" "${PERF_PROJECT}"
+        baselineExeDir="${REPO_ROOT}/perf-build-baseline"
+        currentExeDir="${REPO_ROOT}/perf-build-current"
+    fi
 
     interleave_args=(
-        --baseline-exe-dir "${REPO_ROOT}/perf-build-baseline"
-        --current-exe-dir "${REPO_ROOT}/perf-build-current"
+        --baseline-exe-dir "${baselineExeDir}"
+        --current-exe-dir "${currentExeDir}"
         --assembly "PerformanceTests.dll"
         --results-dir "${RESULTS_DIR}"
         --threshold "${regressionThreshold}"
@@ -715,6 +808,15 @@ if [[ -n "${baselineLabel}" && "${runMode}" == "interleaved" ]]; then
         --baseline-version "${baselineLabel}"
         --client-cpus "${PERF_CLIENT_CPUS:-}"
     )
+    # --switch-under-test: baseline and current subprocesses need DIFFERENT RUNNER_CONFIG values (the
+    # switch off vs on), even though both are otherwise the same build/env; every other baseline
+    # flavour keeps sharing the single ambient RUNNER_CONFIG set above.
+    if [[ -n "${switchUnderTest}" ]]; then
+        interleave_args+=(
+            --baseline-runner-config "${BASELINE_RUNNER_CONFIG}"
+            --current-runner-config "${CURRENT_RUNNER_CONFIG}"
+        )
+    fi
     if [[ "${failOnRegression}" == "true" ]]; then
         echo "Regression gate ENABLED: a CONFIRMED candidate-slower regression (> ${regressionThreshold}%) will fail the run."
         interleave_args+=(--fail-on-regression)
@@ -724,7 +826,15 @@ if [[ -n "${baselineLabel}" && "${runMode}" == "interleaved" ]]; then
 
 elif [[ -n "${baselineLabel}" ]]; then
     # --- Legacy sequential path: full baseline pass, then full candidate pass, then compare -------
+    # --switch-under-test needs a different RUNNER_CONFIG per pass; every other baseline flavour
+    # keeps using the single ambient RUNNER_CONFIG exported above (unchanged behaviour).
+    if [[ -n "${switchUnderTest}" ]]; then
+        export RUNNER_CONFIG="${BASELINE_RUNNER_CONFIG}"
+    fi
     run_pass "baseline" "${baselineProject}" ${baselineBuildArgs[@]+"${baselineBuildArgs[@]}"}
+    if [[ -n "${switchUnderTest}" ]]; then
+        export RUNNER_CONFIG="${CURRENT_RUNNER_CONFIG}"
+    fi
     run_pass "current" "${PERF_PROJECT}"
 
     echo "Comparing current branch against baseline ${baselineLabel} ..."
diff --git a/eng/pipelines/perf/sqlclient-perf-experiment.yml b/eng/pipelines/perf/sqlclient-perf-experiment.yml
new file mode 100644
index 0000000000..80cf11320c
--- /dev/null
+++ b/eng/pipelines/perf/sqlclient-perf-experiment.yml
@@ -0,0 +1,239 @@
+####################################################################################################
+# Licensed to the .NET Foundation under one or more agreements.  The .NET Foundation licenses this
+# file to you under the MIT license.  See the LICENSE file in the project root for more information.
+####################################################################################################
+
+# SqlClient Switch Experiment Performance pipeline.
+#
+# Third sibling of sqlclient-perf-pipeline.yml and sqlclient-perf-pr-pipeline.yml.  It runs the SAME
+# benchmarks, on the SAME Perf Test Lab extends template (v1/Perf.Test.Job.yml@PerfTemplates),
+# through the SAME on-VM scripts.  What differs is the QUESTION it answers:
+#
+#   * perf pipeline     - "has this branch regressed against a released package?"   (source varies)
+#   * perf-pr pipeline  - "has this PR regressed the branch it merges into?"        (source varies)
+#   * THIS pipeline     - "what does this AppContext/runner switch cost or buy?"    (CONFIG varies)
+#
+# Both passes here build the SAME source (whatever branch the run is queued on); only ONE runner
+# config switch differs between them - baseline runs it OFF, current runs it ON.  Two separate
+# processes are required because these switches are latched process-wide (e.g. UseConnectionPoolV2 is
+# read and cached the first time a connection pool is created), so they cannot be toggled between
+# benchmarks inside a single run.  Queue this pipeline on a PR branch to ask "what does the switch do
+# to my change?", or on main to ask "what does the switch do to main?".
+#
+#   * No Kusto - switch-experiment results are NEVER ingested into the perf database, and this is why
+#                the mode lives in its own pipeline rather than as a flag on the other two:
+#                  - both PerfRun rows would share one DerivedRunId (driver|commit|pipelineRunId),
+#                    because both passes are the same commit in the same pipeline run;
+#                  - PerfRun.Config is stamped once per run, so the two rows could not record the
+#                    differing switch values that are the entire point of the experiment;
+#                  - nothing marks a row as an experiment, so the switch-ON pass would be
+#                    indistinguishable from an ordinary measurement of the branch and would distort
+#                    the very trends the other two pipelines exist to protect.
+#                Having no ADX variable group and no translate/ingest steps in this file makes that
+#                exclusion structural rather than a conditional someone can flip by accident.
+#                The comparison report and the raw BenchmarkDotNet artifacts are still published.
+#
+# Everything else - platform/VM provisioning, benchmark run model, noise controls - is identical to
+# the other two pipelines; see eng/pipelines/perf/README.md.
+
+# Set the pipeline run name to the day-of-year and the daily run counter.
+name: $(DayOfYear)$(Rev:rr)
+
+# Manual/queue-time only.  A full perf run occupies a dedicated host for hours, and a switch
+# experiment is an investigation someone opts into deliberately, never an automatic gate.
+pr: none
+trigger: none
+
+parameters:
+
+  # The single runner-config switch under test.  Baseline runs it false, current runs it true, so the
+  # reported delta is "what turning this switch ON does".  Restricted to the switches the run scripts
+  # know how to stamp into the runner config; the scripts re-validate and fail fast on anything else.
+  #
+  # UseManagedSniOnWindows additionally requires platform=windows.  ADO cannot cross-validate two
+  # queue-time parameters here (this pipeline extends a template, so there is no step to check it
+  # before the job starts), so the run scripts reject that combination as their first action.
+  - name: switchUnderTest
+    displayName: Switch under test (baseline=off vs current=on)
+    type: string
+    default: UseConnectionPoolV2
+    values:
+      - UseConnectionPoolV2
+      - UseOptimizedAsyncBehaviour
+      - UseManagedSniOnWindows
+
+  # Target OS for the perf VM and the benchmark client.
+  - name: platform
+    displayName: Platform
+    type: string
+    default: linux
+    values:
+      - linux
+      - windows
+
+  # The .NET runtime the benchmarks are executed against.  Must be one of the target frameworks of
+  # the PerformanceTests project (net8.0/net9.0/net10.0).
+  - name: dotnetFramework
+    displayName: .NET Framework (TFM)
+    type: string
+    default: net9.0
+    values:
+      - net8.0
+      - net9.0
+      - net10.0
+
+  # Maximum time (minutes) the template waits for the benchmark run on the VM before timing out.
+  # Matches the nightly pipeline rather than the PR pipeline: both passes here share ONE build (the
+  # source is identical on both sides), so there is no second driver build to pay for.
+  - name: testTimeoutMinutes
+    displayName: Test Timeout (minutes)
+    type: number
+    default: 180
+
+  # Percent difference (switch-on vs switch-off mean) the comparison flags.
+  - name: regressionThreshold
+    displayName: Difference Threshold (%)
+    type: number
+    default: 10
+
+  # Whether a confirmed "switch ON is slower than switch OFF" result should FAIL the run.
+  #
+  # NOTE: this maps onto the run scripts' --fail-on-regression gate, but it does NOT mean the same
+  # thing as it does in the other two pipelines.  There, a regression means the branch got worse and
+  # failing is a quality gate.  Here it is a RESULT: the switch made things slower.  That is often
+  # exactly what you queued the run to find out, so this defaults to false and should only be enabled
+  # when you are asserting "this switch must not be a slowdown" (e.g. before flipping its default).
+  - name: failIfSwitchSlower
+    displayName: Fail run if the switch is slower
+    type: boolean
+    default: false
+
+  # Benchmark run model (wiki 339 §2.2/§2.3/§2.6):
+  #   interleaved -> run one benchmark unit at a time, switch-off and switch-on back-to-back, and
+  #                  confirm any flagged difference across N passes (best-of-N).  Noise-resistant
+  #                  default, and especially valuable here because the two passes are otherwise
+  #                  identical, so any systematic drift between them is pure measurement noise.
+  #   sequential  -> legacy: run the whole switch-off suite, then the whole switch-on suite, compare.
+  - name: benchmarkRunMode
+    displayName: Benchmark run mode
+    type: string
+    default: interleaved
+    values:
+      - interleaved
+      - sequential
+
+  # Best-of-N: total interleaved passes for a flagged unit before a difference is confirmed
+  # (1 disables confirmation).  Only used when benchmarkRunMode = interleaved.
+  - name: confirmationRuns
+    displayName: Confirmation runs (best-of-N)
+    type: number
+    default: 3
+
+# Fixed (non-configurable) constants for this pipeline.  These are intentionally NOT parameters or
+# library variables: they are invariant for the SqlClient perf pipelines.
+#   * buildConfiguration = Release            - perf numbers are only meaningful in Release.
+#   * sourcesSubDir       = dotnet-sqlclient  - folder 'self' checks out into under the template's
+#                                               MULTI-REPO checkout ($(Build.SourcesDirectory)/<repo>);
+#                                               must match the ADO repository name.
+#
+# The other pipelines additionally expose UseManagedSniOnWindows / UseOptimizedAsyncBehaviour /
+# UseConnectionPoolV2 as queue-time flags applied to BOTH passes.  This pipeline deliberately does
+# not: an experiment that varies one switch while others are also moved off their checked-in defaults
+# produces a delta nobody can attribute.  Every switch except the one under test is therefore left at
+# its runnerconfig.jsonc default (which is what those parameters' defaults already are).
+#
+# NOTE: like sqlclient-perf-pr-pipeline.yml, this pipeline does NOT reference the 'ADX Cluster
+# Variables' group and has no translate/ingest steps.  See the header comment for why that is
+# structural here rather than conditional.
+variables:
+
+  # Pre-computed testScriptArgs chunks.  The Windows entry point is PowerShell and binds
+  # '-PascalCase' params, while the Linux one is bash and parses '--kebab-case' flags, so the
+  # argument STYLE differs by platform.  Assembling the final args from these per-platform chunks
+  # keeps the single testScriptArgs below readable.  No baseline-selector args appear here at all:
+  # --switch-under-test IS the baseline selector for this pipeline, and the run scripts reject it
+  # being combined with --baseline-version / --baseline-source-ref.
+  - ${{ if eq(parameters.platform, 'windows') }}:
+    - name: PerfArgsCommon
+      value: '-Configuration Release -Framework ${{ parameters.dotnetFramework }} -ResultsSubdir perf-results -RegressionThreshold ${{ parameters.regressionThreshold }} -RunMode ${{ parameters.benchmarkRunMode }} -ConfirmationRuns ${{ parameters.confirmationRuns }} -SwitchUnderTest ${{ parameters.switchUnderTest }}'
+  - ${{ else }}:
+    - name: PerfArgsCommon
+      value: '--configuration Release --framework ${{ parameters.dotnetFramework }} --results-subdir perf-results --regression-threshold ${{ parameters.regressionThreshold }} --run-mode ${{ parameters.benchmarkRunMode }} --confirmation-runs ${{ parameters.confirmationRuns }} --switch-under-test ${{ parameters.switchUnderTest }}'
+
+  # Gate flag, only when the run is asserting the switch must not be a slowdown.
+  - ${{ if and(eq(parameters.platform, 'windows'), eq(parameters.failIfSwitchSlower, true)) }}:
+    - name: PerfArgsFail
+      value: '-FailOnRegression'
+  - ${{ elseif eq(parameters.failIfSwitchSlower, true) }}:
+    - name: PerfArgsFail
+      value: '--fail-on-regression'
+  - ${{ else }}:
+    - name: PerfArgsFail
+      value: ''
+
+# Reference the PerfTest repository that hosts the reusable extends template.  Driver-team projects
+# have been onboarded with the Agent Pools and Service Connections required to consume it.
+resources:
+  repositories:
+    - repository: PerfTemplates
+      type: git
+      name: InternalDriverTools/PerfTest
+      ref: refs/heads/main
+
+# Consume the Perf Test Lab template.  The template defines the whole job/stage structure; we only
+# pass parameters into it.
+extends:
+  template: v1/Perf.Test.Job.yml@PerfTemplates
+  parameters:
+    platform: ${{ parameters.platform }}
+
+    # The entire driver source tree is copied to the VM so the benchmarks (which reference
+    # Microsoft.Data.SqlClient as a project) can be built from source against the current commit.
+    # Under the template's multi-repo checkout, 'self' lands in a repo-named subfolder.
+    testRootDir: $(Build.SourcesDirectory)/dotnet-sqlclient
+
+    # Entry-point script (relative to testRootDir), selected by platform.  Linux uses bash, Windows
+    # uses PowerShell, per the template's .sh/.ps1 convention.  Same scripts as the other two perf
+    # pipelines: the switch experiment is just a different baseline selector.
+    ${{ if eq(parameters.platform, 'windows') }}:
+      testScript: eng/pipelines/perf/scripts/run-perf-tests.ps1
+    ${{ else }}:
+      testScript: eng/pipelines/perf/scripts/run-perf-tests.sh
+
+    # Arguments forwarded to the script.  The script also reads SQL_SERVER, SQL_PASSWORD and
+    # PERF_CLIENT_CPUS directly from the VM session environment (injected by the template).  Empty
+    # chunks collapse to harmless extra spaces that both PowerShell and bash arg parsing ignore.
+    testScriptArgs: '$(PerfArgsCommon) $(PerfArgsFail)'
+
+    # Subfolder (relative to testRootDir on the VM) the script writes results into.  The template
+    # copies this VM folder back to the agent, but always lands it at a fixed location:
+    # $(Build.ArtifactStagingDirectory)/results (and publishes it as the 'perf-results' artifact).
+    testResultsSubDir: perf-results
+
+    testTimeoutMinutes: ${{ parameters.testTimeoutMinutes }}
+    jobName: SqlClientPerfExperiment
+
+    # Post-test steps run on the agent after results have been copied back.  The template already
+    # publishes the results artifact and attaches any top-level results/*.md as run summaries; this
+    # step additionally surfaces the BenchmarkDotNet markdown reports in the build log.  There is no
+    # Kusto translation/ingestion here by design - see the header comment.
+    steps:
+      # Tag the build with the switch that was measured, so switch experiments are identifiable at a
+      # glance in the ADO build list and are never mistaken for an ordinary baseline comparison.
+      # Unlike the PR pipeline there is nothing to read back from the VM: the switch name is fixed at
+      # queue time, and both passes are the commit the run was queued on.
+      # NOTE: the tag intentionally has no ':' - build tags are placed in the request URL path and a
+      # colon trips ADO's "potentially dangerous Request.Path" filter.
+      - bash: |
+          echo "##vso[build.addbuildtag]Switch ${{ parameters.switchUnderTest }}"
+        displayName: 'Tag build with switch under test'
+        condition: succeededOrFailed()
+
+      - task: Bash@3
+        displayName: 'Show performance results'
+        condition: succeededOrFailed()
+        inputs:
+          targetType: filePath
+          filePath: $(Build.SourcesDirectory)/dotnet-sqlclient/eng/pipelines/perf/scripts/show_perf_results.sh
+        env:
+          RESULTS_DIR: $(Build.ArtifactStagingDirectory)/results
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
index a547ce0fd4..9017f3f920 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/ChannelDbConnectionPool.cs
@@ -62,12 +62,6 @@ namespace Microsoft.Data.SqlClient.ConnectionPool
     internal sealed class ChannelDbConnectionPool : IDbConnectionPool, IDisposable
     {
         #region Fields
-        // Limits synchronous operations which depend on async operations on managed
-        // threads from blocking on all available threads, which would stop async tasks
-        // from being scheduled and cause deadlocks. Use ProcessorCount/2 as a balance
-        // between sync and async tasks.
-        private static SemaphoreSlim _syncOverAsyncSemaphore = new(Math.Max(1, Environment.ProcessorCount / 2));
-
         /// <summary>
         /// Tracks the number of instances of this class. Used to generate unique IDs for each instance.
         /// </summary>
@@ -939,11 +933,23 @@ public bool TryGetConnection(
             if (taskCompletionSource is null)
             {
                 // We're on the caller's thread, so the ambient transaction is directly observable.
+                Transaction? currentTransaction = ADP.GetCurrentTransaction();
+
+                // Fast path: when the pool can satisfy the request immediately, do it here rather
+                // than entering GetInternalConnection, which allocates a Task<DbConnectionInternal>
+                // and a timer-backed CancellationTokenSource before it knows whether it will ever
+                // need to wait. See TryGetPooledConnectionInline.
+                connection = TryGetPooledConnectionInline(owningObject, currentTransaction);
+                if (connection is not null)
+                {
+                    return true;
+                }
+
                 var task = GetInternalConnection(
                         owningObject,
                         async: false,
                         timeout,
-                        ADP.GetCurrentTransaction());
+                        currentTransaction);
 
                 // When running synchronously, we are guaranteed that the task is already completed.
                 // We don't need to guard the managed threadpool at this spot because we pass the async flag as false
@@ -975,29 +981,21 @@ public bool TryGetConnection(
             //
             // The ambient transaction is captured by the caller, on the caller's thread, and handed
             // to us in the TaskCompletionSource's AsyncState (see SqlConnection.InternalOpenAsync).
-            //
-            // We must not read Transaction.Current inside the Task.Run below. A
-            // TransactionScope created with TransactionScopeAsyncFlowOption.Enabled stores the
-            // transaction in an AsyncLocal, which does flow onto the pool's worker thread, so that
-            // would appear to work. But Enabled is not the default: a plain TransactionScope keeps
-            // the transaction in thread-static storage, which does not flow, and reading
-            // Transaction.Current on the worker would silently fail to enlist. The WaitHandle pool
-            // enlists correctly in that case, so this is also a compatibility requirement.
-            // AsyncState is correct under both options.
-            //
-            // This does not make the suppressed-flow pattern work -- the caller's own scope is
-            // still broken past the first await -- but it keeps the connection in the transaction
-            // the caller intended rather than silently running outside it.
-            //
-            // Note that we deliberately do not assign Transaction.Current on the thread pool
-            // thread either. That assignment writes to thread-static storage which is *not* unwound
-            // when the ExecutionContext is restored, so it would outlive this open and be observed
-            // by unrelated work later scheduled onto the same thread pool thread -- including the
-            // login-time auto-enlistment that non-pooled connections perform against
-            // Transaction.Current. The WaitHandle pool can get away with assigning it because it
-            // processes pending opens on a dedicated non-thread-pool thread.
+            // Do not read Transaction.Current in the Task.Run below: a plain TransactionScope keeps
+            // the transaction in thread-static storage, which does not flow to the worker, so the
+            // enlistment would silently be skipped. Do not assign Transaction.Current there either;
+            // that storage is not unwound afterwards and would leak into later work on that thread.
             Transaction? ambientTransaction = taskCompletionSource.Task.AsyncState as Transaction;
 
+            // Fast path: return true rather than completing the TaskCompletionSource, so
+            // InternalOpenAsync takes its sync branch and skips a thread pool dispatch.
+            DbConnectionInternal? pooled = TryGetPooledConnectionInline(owningObject, ambientTransaction);
+            if (pooled is not null)
+            {
+                connection = pooled;
+                return true;
+            }
+
             Task.Run(async () =>
             {
                 if (taskCompletionSource.Task.IsCompleted)
@@ -1431,6 +1429,66 @@ private void RemoveConnection(DbConnectionInternal connection)
             return null;
         }
 
+        /// <summary>
+        /// Attempts to satisfy a connection request from connections the pool already holds,
+        /// without blocking, waiting, or opening a physical connection.
+        /// </summary>
+        /// <remarks>
+        /// The fast path shared by the sync and async entry points of
+        /// <see cref="TryGetConnection"/>: it tries the transacted store, then the idle channel, and
+        /// returns null if neither can satisfy the request. It is kept separate from
+        /// <see cref="GetInternalConnection"/> because that method allocates a
+        /// <see cref="Task{TResult}"/> and a timer-backed <see cref="CancellationTokenSource"/> even
+        /// when it completes synchronously. It never calls
+        /// <see cref="OpenNewInternalConnection"/>, which would block on network I/O.
+        /// </remarks>
+        /// <param name="owningConnection">The DbConnection that will own this internal connection.</param>
+        /// <param name="ambientTransaction">The ambient transaction captured on the caller's thread,
+        /// or null when the caller is not inside a transaction.</param>
+        /// <returns>An activated connection ready to be handed to the caller, or null when the pool
+        /// cannot satisfy the request without waiting or opening.</returns>
+        /// <exception cref="Exception">
+        /// Propagates any exception from activating or enlisting the connection. The connection is
+        /// returned to the pool before the exception escapes (see <see cref="PrepareConnection"/>).
+        /// </exception>
+        private DbConnectionInternal? TryGetPooledConnectionInline(
+            DbConnection owningConnection,
+            Transaction? ambientTransaction)
+        {
+            // When automatic enlistment is disabled the connection must never be bound to the
+            // ambient transaction, so we neither consult the transacted store nor hand the
+            // transaction to activation. Mirrors GetInternalConnection.
+            Transaction? transaction = HasTransactionAffinity ? ambientTransaction : null;
+
+            DbConnectionInternal? connection = null;
+
+            // A connection already enlisted in our transaction is always preferred, since reusing
+            // it avoids promoting the transaction to a distributed one.
+            if (transaction is not null)
+            {
+                connection = GetFromTransactedPool(transaction);
+            }
+
+            // GetIdleConnection only returns connections that passed IsLiveConnection, and
+            // GetFromTransactedPool has already probed liveness, so no further validation is
+            // needed here. GetInternalConnection re-checks after its channel wait because that
+            // wait can hand back a connection that bypassed both filters.
+            connection ??= GetIdleConnection();
+
+            if (connection is null)
+            {
+                return null;
+            }
+
+            // Counted before activation for the same reason as GetInternalConnection: if
+            // PrepareConnection fails it returns the connection to the pool, which emits the
+            // matching soft disconnect. Counting after would leave that disconnect unpaired and
+            // drive the active-soft-connects gauge negative.
+            Metrics.SoftConnectRequest();
+            PrepareConnection(owningConnection, connection, transaction);
+            return connection;
+        }
+
         /// <summary>
         /// Gets an internal connection from the pool, either by retrieving an idle connection or opening a new one.
         /// </summary>
@@ -1681,30 +1739,10 @@ private void SweepEmancipatedConnections()
         /// <returns>The connection read from the channel.</returns>
         private DbConnectionInternal? ReadChannelSyncOverAsync(CancellationToken cancellationToken)
         {
-            // If there are no connections in the channel, then ReadAsync will block until one is available.
-            // Channels doesn't offer a sync API, so running ReadAsync synchronously on this thread may spawn
-            // additional new async work items in the managed thread pool if there are no items available in the
-            // channel. We need to ensure that we don't block all available managed threads with these child
-            // tasks or we could deadlock. Prefer to block the current user-owned thread, and limit throughput
-            // to the managed threadpool.
-
-            _syncOverAsyncSemaphore.Wait(cancellationToken);
-            try
-            {
-                ConfiguredValueTaskAwaitable<DbConnectionInternal?>.ConfiguredValueTaskAwaiter awaiter =
-                    _idleChannel.ReadAsync(cancellationToken).ConfigureAwait(false).GetAwaiter();
-                using ManualResetEventSlim mres = new ManualResetEventSlim(false, 0);
-
-                // Cancellation happens through the ReadAsync call, which will complete the task.
-                // Even a failed task will complete and set the ManualResetEventSlim.
-                awaiter.UnsafeOnCompleted(() => mres.Set());
-                mres.Wait(CancellationToken.None);
-                return awaiter.GetResult();
-            }
-            finally
-            {
-                _syncOverAsyncSemaphore.Release();
-            }
+            // Channel has no blocking read. Block on the Task rather than an opaque primitive: the
+            // idle channel is created without AllowSynchronousContinuations, so the completing
+            // continuation is queued, and Task blocking lets the thread pool inject a worker to run it.
+            return _idleChannel.ReadAsync(cancellationToken).AsTask().GetAwaiter().GetResult();
         }
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolChurnRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolChurnRunner.cs
index ca1930e451..d2b94cea14 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolChurnRunner.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolChurnRunner.cs
@@ -20,6 +20,22 @@ namespace Microsoft.Data.SqlClient.PerformanceTests
     /// concern for the new ChannelDbConnectionPool, which aims to avoid extra allocations
     /// on the hot path (issue #3356).
     ///
+    /// This overlaps <see cref="ConnectionPoolStressRunner.RapidFireOpenCloseAsync"/> in shape —
+    /// the inner loop is identical — but not in purpose, and the two are not
+    /// interchangeable. Being single-threaded, this runner has no scheduling or wake-up
+    /// component, which makes it far more sensitive: its sync and async variants have
+    /// agreed to within 0.3 percentage points, whereas the concurrent runner's own
+    /// duplicate-workload parameter pairs have disagreed by around 20. Use this one to
+    /// decide whether per-checkout cost or allocation moved, and the concurrent runner to
+    /// decide whether hand-off between threads moved. A regression there with a flat result
+    /// here points at scheduling rather than at the checkout path.
+    ///
+    /// Adding a Parallelism=1 case to that runner would not replace this one. Its
+    /// <c>[Params]</c> are class-wide, so a single-threaded row would also be generated for
+    /// benchmarks it makes meaningless (<c>MixedSyncAsyncContention</c> would have no sync
+    /// worker left to mix in), and this runner's higher operation count and separate
+    /// iteration settings are what keep the signal clean.
+    ///
     /// The pool implementation (legacy vs V2) is a process-level choice — see the remarks
     /// on <see cref="ConnectionPoolStressRunner"/>. Run twice (UseConnectionPoolV2 false
     /// then true) to compare.
@@ -36,6 +52,27 @@ public class ConnectionPoolChurnRunner : BaseRunner
         [Params(1000)]
         public int OpsPerInvocation { get; set; }
 
+        /// <summary>
+        /// How many idle connections the pool holds while the single caller churns against it.
+        /// </summary>
+        /// <remarks>
+        /// This is not a redundant axis, because the two pools order idle connections
+        /// differently: the legacy pool pops from a <c>ConcurrentStack</c> (LIFO) while the V2
+        /// pool reads from an unbounded <c>Channel</c> (FIFO). At depth 1 that difference is
+        /// invisible, since both hand back the only connection there is. At a realistic depth
+        /// the legacy pool keeps returning the connection just released — one hot object — while
+        /// the V2 pool cycles through every idle connection in turn, touching all of their
+        /// buffers and parser state. Depth is therefore the axis that exposes reuse locality,
+        /// and measuring only depth 1 would hide it entirely.
+        ///
+        /// The middle depth is what makes the axis diagnostic rather than merely directional.
+        /// Depths 1 and 100 alone show only that reuse locality degrades somewhere in between;
+        /// they cannot distinguish a threshold (cost appears once the pool exceeds some working
+        /// set) from a gradient (cost grows smoothly with depth). Those imply different fixes.
+        /// </remarks>
+        [Params(1, 10, 100)]
+        public int PoolDepth { get; set; }
+
         private string _connectionString;
 
         [GlobalSetup]
@@ -51,16 +88,48 @@ public void Setup()
             {
                 Pooling = true,
                 MaxPoolSize = 100,
-                // Pre-warm a single connection so the very first checkout is served from
-                // the pool rather than establishing a physical connection.
-                MinPoolSize = 1
+                // Pin the floor at the requested depth so pruning cannot shrink the pool back
+                // down mid-run and change what the benchmark is measuring.
+                MinPoolSize = PoolDepth,
+                // Matches ConnectionPoolStressRunner. At the larger PoolDepth, setup establishes
+                // a hundred physical connections back to back, and the default 15s is tight for
+                // that against a loaded remote server.
+                ConnectTimeout = 60
             };
             _connectionString = builder.ConnectionString;
 
-            // Force the pool to exist and hold at least one idle connection.
-            using var warm = new SqlConnection(_connectionString);
-            warm.Open();
-            warm.Close();
+            PrewarmPool();
+        }
+
+        /// <summary>
+        /// Fills the pool with <see cref="PoolDepth"/> idle connections before measurement, so
+        /// every measured open is a pure checkout.
+        /// </summary>
+        /// <remarks>
+        /// All connections are opened before any is released. Releasing as we go would let the
+        /// pool hand the same idle connection straight back and create only one, which would
+        /// silently collapse every depth to 1. <c>MinPoolSize</c> alone is not enough either:
+        /// both pools backfill it on a background task, so the first measured iteration would
+        /// otherwise still be racing that warm-up.
+        /// </remarks>
+        private void PrewarmPool()
+        {
+            var warm = new SqlConnection[PoolDepth];
+            try
+            {
+                for (int i = 0; i < warm.Length; i++)
+                {
+                    warm[i] = new SqlConnection(_connectionString);
+                    warm[i].Open();
+                }
+            }
+            finally
+            {
+                foreach (var conn in warm)
+                {
+                    conn?.Dispose();
+                }
+            }
         }
 
         [GlobalCleanup]
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolContentionRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolContentionRunner.cs
index 899d25f64c..2dbd6f94c8 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolContentionRunner.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolContentionRunner.cs
@@ -30,6 +30,14 @@ namespace Microsoft.Data.SqlClient.PerformanceTests
     /// remarks on <see cref="ConnectionPoolStressRunner"/>. Run twice (UseConnectionPoolV2
     /// false then true) to compare.
     ///
+    /// Each sync workload is measured twice, once on threadpool threads
+    /// (<see cref="SteadyStateOpenQueryClose"/>) and once on dedicated threads
+    /// (<see cref="SteadyStateOpenQueryCloseDedicatedThreads"/>). Threadpool threads are the
+    /// realistic case, since sync database calls in ASP.NET run on them, and they are the
+    /// only configuration that can expose a waiter wake path which depends on the
+    /// threadpool having a free thread. Dedicated threads isolate the pool's own cost. The
+    /// pair separates a pool regression from a scheduling one.
+    ///
     /// Related issues: #601, #979, #3356
     /// </summary>
     public class ConnectionPoolContentionRunner : BaseRunner
@@ -41,13 +49,24 @@ public class ConnectionPoolContentionRunner : BaseRunner
         public int Parallelism { get; set; }
 
         /// <summary>
-        /// Maximum pool size, exercised across three regimes relative to
-        /// <see cref="Parallelism"/>: larger than the worker count (idle spare
-        /// connections, no contention), equal to it (fully subscribed, no contention), and
-        /// smaller than it (pool exhaustion forces workers to wait for a connection to be
-        /// returned — back-pressure).
+        /// Maximum pool size, exercised across the full demand/capacity ladder relative to
+        /// <see cref="Parallelism"/>: larger than the worker count (idle spare connections, no
+        /// contention), equal to it (fully subscribed, no contention), and progressively smaller
+        /// than it (pool exhaustion forces workers to wait for a connection to be returned —
+        /// back-pressure).
         /// </summary>
-        [Params(100, 50, 10)]
+        /// <remarks>
+        /// At <see cref="Parallelism"/> 50 these give demand/capacity ratios of 0.25, 0.5, 1, 2
+        /// and 5. The intermediate over-subscribed step (ratio 2) is deliberate: back-pressure
+        /// regressions show up only once demand exceeds capacity, and without a point between
+        /// "fully subscribed" and "five times over" there is no way to tell how quickly the cost
+        /// grows once the pool starts running dry.
+        ///
+        /// 200 is included because it is the most commonly configured explicit Max Pool Size in
+        /// production, so the least-contended row corresponds to a real deployment rather than
+        /// only to the driver default.
+        /// </remarks>
+        [Params(200, 100, 50, 25, 10)]
         public int MaxPoolSize { get; set; }
 
         /// <summary>
@@ -114,6 +133,50 @@ public Task SteadyStateOpenQueryClose()
             return Task.WhenAll(tasks);
         }
 
+        /// <summary>
+        /// Same workload as <see cref="SteadyStateOpenQueryClose"/>, but driven by dedicated
+        /// threads instead of threadpool threads.
+        ///
+        /// Read the two together. A sync <c>Open()</c> that has to wait blocks whichever
+        /// thread it is running on. On threadpool threads that competes with the threadpool
+        /// itself, because a pool implementation whose waiter wake-up depends on a queued
+        /// continuation cannot make progress while every thread is blocked in a wait: the
+        /// wake-up is stuck behind thread injection. On the TFMs this project builds the
+        /// runtime notifies the pool of cooperative blocking and compensates quickly, so the
+        /// stall is tens to a few hundred milliseconds; that is the expectation measured here.
+        /// On net462 the Task wait never notifies the pool, so the wake-up waits on starvation
+        /// detection and hill climbing instead. That path is live, since the pool carries no
+        /// framework guards and the driver still ships net462, but this suite cannot measure it.
+        /// Dedicated threads remove that coupling, so this variant measures the pool's
+        /// intrinsic checkout/return cost with the scheduler taken out of the picture.
+        ///
+        /// A regression in both points at the pool itself. A regression only in the
+        /// threadpool variant points at the waiter wake path and shows up as tail latency
+        /// rather than a shifted median, so compare the distribution and not just the mean.
+        /// </summary>
+        [Benchmark]
+        public Task SteadyStateOpenQueryCloseDedicatedThreads()
+        {
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                tasks[i] = Task.Factory.StartNew(() =>
+                {
+                    for (int op = 0; op < OpsPerWorker; op++)
+                    {
+                        using var conn = new SqlConnection(_connectionString);
+                        conn.Open();
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = "SELECT 1";
+                        _ = cmd.ExecuteScalar();
+                        // Dispose returns the connection to the pool.
+                    }
+                }, TaskCreationOptions.LongRunning);
+            }
+
+            return Task.WhenAll(tasks);
+        }
+
         [Benchmark]
         public Task SteadyStateOpenQueryCloseAsync()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolRampRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolRampRunner.cs
new file mode 100644
index 0000000000..344884fbc3
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolRampRunner.cs
@@ -0,0 +1,177 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Measures how quickly a cold pool can ramp up to N physical connections when N
+    /// callers arrive simultaneously and all of them need a connection at the same time.
+    ///
+    /// This is the workload the ChannelDbConnectionPool (V2) was designed for. The legacy
+    /// WaitHandleDbConnectionPool guards creation with a <c>Semaphore(1, 1)</c>, so a cold
+    /// burst of N callers establishes physical connections one at a time: total latency is
+    /// roughly N x connect latency. V2 has no such gate, so the opens overlap and total
+    /// latency approaches a single connect.
+    ///
+    /// Contrast with <see cref="ConnectionPoolStressRunner.RapidFireOpenCloseAsync"/>, which also
+    /// starts from a cold pool but releases each connection immediately. Because nothing is
+    /// held, one physical connection can satisfy every caller in turn, so that benchmark
+    /// rewards a pool that grows as slowly as possible and penalizes concurrent creation.
+    /// Holding each connection until every caller has one removes that artifact: the pool
+    /// genuinely needs N connections, and the only variable left is how fast it can open
+    /// them.
+    ///
+    /// <see cref="MaxPoolSize"/> is always larger than <see cref="Parallelism"/> so no
+    /// caller ever waits for a connection to be returned. Back-pressure on a saturated pool
+    /// is covered separately by <see cref="ConnectionPoolContentionRunner"/>.
+    ///
+    /// The pool implementation (legacy vs V2) is a process-level choice - see the remarks on
+    /// <see cref="ConnectionPoolStressRunner"/>. Run twice (UseConnectionPoolV2 false then
+    /// true) to compare.
+    ///
+    /// Related issue: #3356
+    /// </summary>
+    public class ConnectionPoolRampRunner : BaseRunner
+    {
+        /// <summary>
+        /// Number of callers that arrive simultaneously against a cold pool. Each one holds
+        /// its connection until all of them have connected, so the pool must open exactly
+        /// this many physical connections.
+        /// </summary>
+        [Params(10, 25, 50, 100)]
+        public int Parallelism { get; set; }
+
+        /// <summary>
+        /// Max pool size. Deliberately larger than every <see cref="Parallelism"/> value so
+        /// the ramp is never bounded by pool capacity.
+        /// </summary>
+        [Params(200)]
+        public int MaxPoolSize { get; set; }
+
+        private string _connectionString;
+
+        /// <summary>
+        /// Upper bound on the rendezvous wait. The rendezvous is released on the failure path
+        /// too, so this should never be reached; it exists so that a bug in the barrier fails
+        /// the run quickly instead of hanging the perf pipeline indefinitely.
+        /// </summary>
+        private static readonly TimeSpan s_rampTimeout = TimeSpan.FromMinutes(2);
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            Console.WriteLine(
+                "[ConnectionPoolRampRunner] Pool implementation: " +
+                (s_config.UseConnectionPoolV2
+                    ? "ChannelDbConnectionPool (V2)"
+                    : "WaitHandleDbConnectionPool (legacy)"));
+
+            var builder = new SqlConnectionStringBuilder(s_config.ConnectionString)
+            {
+                Pooling = true,
+                MaxPoolSize = MaxPoolSize,
+                // No pre-warming: every iteration must establish its own connections.
+                MinPoolSize = 0,
+                ConnectTimeout = 60
+            };
+            _connectionString = builder.ConnectionString;
+        }
+
+        [IterationSetup]
+        public void IterationSetup()
+        {
+            // Start every iteration from a cold pool so the measurement is the ramp itself.
+            SqlConnection.ClearAllPools();
+        }
+
+        [GlobalCleanup]
+        public void Cleanup() => SqlConnection.ClearAllPools();
+
+        /// <summary>
+        /// Async cold-start ramp. All callers open concurrently and hold until the last one
+        /// has connected.
+        /// </summary>
+        [Benchmark]
+        public async Task ColdStartRampAsync()
+        {
+            using var allConnected = new CountdownEvent(Parallelism);
+            var release = new TaskCompletionSource<bool>(
+                TaskCreationOptions.RunContinuationsAsynchronously);
+
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                tasks[i] = Task.Run(async () =>
+                {
+                    using var conn = new SqlConnection(_connectionString);
+                    try
+                    {
+                        await conn.OpenAsync();
+                    }
+                    finally
+                    {
+                        // Signal from a finally so a caller that fails to open still counts as
+                        // arrived. Otherwise the countdown never reaches zero, the release is
+                        // never set, and every other caller awaits forever.
+                        if (allConnected.Signal())
+                        {
+                            release.TrySetResult(true);
+                        }
+                    }
+
+                    // Hold the connection until every caller has one, forcing the pool to
+                    // grow to Parallelism physical connections.
+                    await release.Task.WaitAsync(s_rampTimeout);
+                    // Dispose returns the connection to the pool.
+                });
+            }
+
+            await Task.WhenAll(tasks);
+        }
+
+        /// <summary>
+        /// Sync cold-start ramp. Uses dedicated threads rather than thread pool threads so
+        /// the measurement reflects pool ramp latency rather than thread pool injection
+        /// delay, which would otherwise dominate once the callers block.
+        /// </summary>
+        [Benchmark]
+        public void ColdStartRamp()
+        {
+            using var allConnected = new CountdownEvent(Parallelism);
+
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                tasks[i] = Task.Factory.StartNew(() =>
+                {
+                    using var conn = new SqlConnection(_connectionString);
+                    try
+                    {
+                        conn.Open();
+                    }
+                    finally
+                    {
+                        // See ColdStartRampAsync: signalling from a finally keeps a failed
+                        // open from stranding every other caller in Wait().
+                        allConnected.Signal();
+                    }
+
+                    if (!allConnected.Wait(s_rampTimeout))
+                    {
+                        throw new TimeoutException(
+                            $"Cold-start ramp did not reach {Parallelism} connections within {s_rampTimeout}.");
+                    }
+                    // Dispose returns the connection to the pool.
+                }, TaskCreationOptions.LongRunning);
+            }
+
+            Task.WaitAll(tasks);
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolStressRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolStressRunner.cs
index 9dad6f41d0..e65e08d22f 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolStressRunner.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolStressRunner.cs
@@ -10,12 +10,20 @@ namespace Microsoft.Data.SqlClient.PerformanceTests
 {
     /// <summary>
     /// Stress-tests the connection pool with randomized parallel access patterns:
-    /// - Massive concurrent open/close churn
+    /// - Massive concurrent open/close churn, both sync and async
     /// - Randomized hold durations simulating real workloads
     /// - Mixed sync/async callers competing for pooled connections
     /// - Connection reuse with interleaved queries
     /// - Pool exhaustion and recovery under pressure
     ///
+    /// The pool is pre-warmed to full capacity in <see cref="Setup"/> and is deliberately
+    /// <em>not</em> cleared between iterations, so these benchmarks measure steady-state
+    /// checkout and return rather than physical connection establishment. Establishing
+    /// connections costs orders of magnitude more than a pooled checkout (milliseconds versus
+    /// microseconds), so leaving any creation in the measured body swamps the pool cost this
+    /// class exists to measure. Cold-start behaviour is covered separately and deliberately by
+    /// <see cref="ConnectionPoolRampRunner"/>.
+    ///
     /// Related issues: #601, #979, #3356
     /// </summary>
     public class ConnectionPoolStressRunner : BaseRunner
@@ -23,24 +31,59 @@ public class ConnectionPoolStressRunner : BaseRunner
         private string _connectionString;
         private string _tableName;
 
+        /// <summary>
+        /// Total checkouts performed by <see cref="RapidFireOpenCloseAsync"/> and
+        /// <see cref="RapidFireOpenCloseSync"/>, held constant across every <see cref="Parallelism"/>
+        /// and <see cref="MaxPoolSize"/> combination so a spread between cells reflects the pool,
+        /// not a different amount of work. Divides evenly by both Parallelism values.
+        /// </summary>
+        private const int RapidFireCheckouts = 1000;
+
         /// <summary>
         /// Number of concurrent tasks hammering the pool.
         /// </summary>
-        [Params(10, 20, 25)]
+        /// <remarks>
+        /// Two values spanning 5x rather than a tighter cluster. Every benchmark here runs at
+        /// every <see cref="MaxPoolSize"/>, so this axis is multiplied across seven benchmarks
+        /// and intermediate values buy far less than they cost — adjacent values in a narrow
+        /// range mostly re-measure the same regime.
+        /// </remarks>
+        [Params(10, 50)]
         public int Parallelism { get; set; }
 
         /// <summary>
         /// Max pool size — controls how many physical connections the pool can hold.
-        /// When Parallelism exceeds this, tasks must wait for a free connection.
         /// </summary>
+        /// <remarks>
+        /// The pool is pre-warmed to this many connections and pinned there by an equal
+        /// <c>Min Pool Size</c>, so this is the number of connections actually resident for the
+        /// whole run rather than just a ceiling. The limit itself is only reached by
+        /// <see cref="PoolExhaustionRecovery"/>, which deliberately oversubscribes it, and by the
+        /// fully-subscribed corner where <see cref="Parallelism"/> equals this value. Everywhere
+        /// else the pool never saturates, so this parameter mostly varies how many idle
+        /// connections the checkout path is choosing among; treat a spread between two
+        /// MaxPoolSize values at the same Parallelism as a noise estimate rather than a real
+        /// effect. The fully-subscribed corner is the exception — there the spread is a real
+        /// effect, because one side has idle spares to choose from and the other has none.
+        ///
+        /// This reading holds for every benchmark here except
+        /// <see cref="PoolExhaustionRecovery"/>, whose task count is <c>MaxPoolSize +
+        /// Parallelism</c>: at Parallelism 10 the two cells run 60 and 110 tasks, so their spread
+        /// is mostly the extra work. That coupling is intrinsic, since exhausting the pool means
+        /// first saturating it. Elsewhere, do not make a benchmark body's operation count a
+        /// function of MaxPoolSize, or the spread stops being a noise estimate there too.
+        /// </remarks>
         [Params(50, 100)]
         public int MaxPoolSize { get; set; }
 
         [GlobalSetup]
         public void Setup()
         {
+            // Pin Min Pool Size to Max Pool Size so the pool holds full capacity for the whole
+            // run: pruning cannot shrink it back down, and no benchmark body has to establish a
+            // physical connection.
             _connectionString = s_config.ConnectionString +
-                $";Pooling=True;Max Pool Size={MaxPoolSize};Min Pool Size=5;Connect Timeout=60";
+                $";Pooling=True;Max Pool Size={MaxPoolSize};Min Pool Size={MaxPoolSize};Connect Timeout=60";
 
             // Create a small table for query workloads.
             // Hash the machine name instead of using it verbatim: hostnames can be long enough
@@ -48,22 +91,55 @@ public void Setup()
             // than using Math.Abs, which throws OverflowException when the hash is int.MinValue.
             string machineHash = ((uint)Environment.MachineName.GetHashCode()).ToString("x8");
             _tableName = $"[perf_PoolStress_{machineHash}_{Guid.NewGuid():N}]";
-            using var conn = new SqlConnection(_connectionString);
-            conn.Open();
-            using var cmd = new SqlCommand(
-                $"CREATE TABLE {_tableName} (Id INT IDENTITY PRIMARY KEY, Val INT)", conn);
-            cmd.ExecuteNonQuery();
 
-            // Seed a few rows so SELECT queries return data
-            using var insert = new SqlCommand(
-                $"INSERT INTO {_tableName} (Val) VALUES (1),(2),(3),(4),(5)", conn);
-            insert.ExecuteNonQuery();
+            // Scoped so this connection is back in the pool before PrewarmPool runs: that method
+            // holds MaxPoolSize connections at once, so an extra live one would hit the cap and
+            // block until Connect Timeout.
+            {
+                using var conn = new SqlConnection(_connectionString);
+                conn.Open();
+                using var cmd = new SqlCommand(
+                    $"CREATE TABLE {_tableName} (Id INT IDENTITY PRIMARY KEY, Val INT)", conn);
+                cmd.ExecuteNonQuery();
+
+                // Seed a few rows so SELECT queries return data
+                using var insert = new SqlCommand(
+                    $"INSERT INTO {_tableName} (Val) VALUES (1),(2),(3),(4),(5)", conn);
+                insert.ExecuteNonQuery();
+            }
+
+            PrewarmPool();
         }
 
-        [IterationCleanup]
-        public void IterationCleanup()
+        /// <summary>
+        /// Fills the pool to <see cref="MaxPoolSize"/> live connections before any measurement
+        /// starts, so benchmark bodies only ever exercise checkout and return.
+        /// </summary>
+        /// <remarks>
+        /// Every connection is opened before any is released. Releasing as we go would let the
+        /// pool hand the same idle connection back repeatedly and create only one, which is the
+        /// whole failure this is meant to avoid. <c>Min Pool Size</c> alone is not enough either:
+        /// it is backfilled lazily, so the first measured iteration would still pay for creation.
+        /// </remarks>
+        private void PrewarmPool()
         {
-            SqlConnection.ClearAllPools();
+            var warm = new SqlConnection[MaxPoolSize];
+            try
+            {
+                for (int i = 0; i < warm.Length; i++)
+                {
+                    warm[i] = new SqlConnection(_connectionString);
+                    warm[i].Open();
+                }
+            }
+            finally
+            {
+                // Returns them all to the pool; Min Pool Size keeps them resident from here on.
+                foreach (var conn in warm)
+                {
+                    conn?.Dispose();
+                }
+            }
         }
 
         [GlobalCleanup]
@@ -79,14 +155,31 @@ public void Cleanup()
 
         /// <summary>
         /// Pure open/close churn — every task opens a pooled connection, immediately closes it,
-        /// and repeats. Measures raw pool checkout/return throughput under contention.
-        /// The per-task loop count scales with MaxPoolSize so total checkouts stay proportional
-        /// to pool capacity regardless of how the [Params] values change.
+        /// and repeats. With the pool pre-warmed to full capacity, every open is a pure checkout,
+        /// so this measures the pool's acquire/return path under concurrency.
         /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Because nothing happens between checkout and return, the tasks stay phase-locked and
+        /// the idle channel oscillates around empty even though the pool is full. That makes this
+        /// benchmark unusually sensitive to how a returned connection is handed to a waiting
+        /// caller: under the V2 pool an inline <c>TryRead</c> miss parks the caller in
+        /// <c>ReadAsync</c>, so it resumes on a threadpool continuation. Read it as a
+        /// zero-hold-time worst case for wake-up scheduling, not as typical application
+        /// behaviour: real callers do some work while holding a connection, which decorrelates
+        /// returns from checkouts and lets the fast path hit.
+        /// </para>
+        /// <para>
+        /// Compare against <see cref="ConnectionPoolChurnRunner"/> for the same loop with no
+        /// concurrency, and <see cref="ConnectionPoolContentionRunner"/> for concurrency with a
+        /// realistic hold time. A regression here alongside flat or improved results in those two
+        /// indicates a change in wake-up scheduling rather than in checkout cost.
+        /// </para>
+        /// </remarks>
         [Benchmark]
-        public async Task RapidFireOpenClose()
+        public async Task RapidFireOpenCloseAsync()
         {
-            int iterationsPerTask = Math.Max(20, MaxPoolSize / Math.Max(1, Parallelism) * 4);
+            int iterationsPerTask = RapidFireCheckouts / Parallelism;
             var tasks = new Task[Parallelism];
             for (int i = 0; i < Parallelism; i++)
             {
@@ -103,6 +196,43 @@ public async Task RapidFireOpenClose()
             await Task.WhenAll(tasks);
         }
 
+        /// <summary>
+        /// Sync counterpart to <see cref="RapidFireOpenCloseAsync"/>: the same zero-hold churn, but
+        /// every checkout goes through the blocking <c>Open()</c> path.
+        /// </summary>
+        /// <remarks>
+        /// Worth measuring separately because the two paths diverge inside the pool. The V2 pool
+        /// has no synchronous channel read, so a sync caller that misses the inline fast path has
+        /// to run the async wait synchronously, which is a materially different cost from
+        /// awaiting it. At <see cref="Parallelism"/> 10 the pool has idle spares throughout, so
+        /// that cell measures concurrent sync checkout on the fast path. At Parallelism 50 with
+        /// <see cref="MaxPoolSize"/> 50 the pool is fully subscribed and the zero-hold loop can
+        /// drain the idle channel, so that cell is this class's coverage of the synchronous
+        /// wake path.
+        ///
+        /// Workers run on threadpool threads deliberately: sync database calls in ASP.NET run
+        /// there, so that is the configuration whose behaviour actually matters.
+        /// </remarks>
+        [Benchmark]
+        public async Task RapidFireOpenCloseSync()
+        {
+            int iterationsPerTask = RapidFireCheckouts / Parallelism;
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                tasks[i] = Task.Run(() =>
+                {
+                    for (int j = 0; j < iterationsPerTask; j++)
+                    {
+                        using var conn = new SqlConnection(_connectionString);
+                        conn.Open();
+                        // immediate return to pool
+                    }
+                });
+            }
+            await Task.WhenAll(tasks);
+        }
+
         /// <summary>
         /// Randomized hold — each task opens a connection, holds it for a random duration
         /// (0-50ms), optionally runs a query, then returns it. Simulates realistic mixed
@@ -214,11 +344,18 @@ public async Task MultiCommandReuse()
         /// wait. Measures how well the pool handles back-pressure when all connections are
         /// checked out and callers are queued.
         /// </summary>
+        /// <remarks>
+        /// <see cref="Parallelism"/> sets how far the pool is oversubscribed, and so how deep
+        /// the queue of waiting callers gets. It is the queue depth rather than the concurrency
+        /// level here, because saturating the pool already takes <see cref="MaxPoolSize"/>
+        /// tasks before any caller has to wait at all.
+        /// </remarks>
         [Benchmark]
         public async Task PoolExhaustionRecovery()
         {
-            // Ensure we exceed pool capacity
-            int taskCount = Math.Max(Parallelism, MaxPoolSize * 2);
+            // Saturate the pool, then oversubscribe it by Parallelism so exactly that many
+            // callers are queued waiting for a connection to come back.
+            int taskCount = MaxPoolSize + Parallelism;
             var tasks = new Task[taskCount];
             for (int i = 0; i < taskCount; i++)
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolThreadPoolPressureRunner.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolThreadPoolPressureRunner.cs
new file mode 100644
index 0000000000..d898800da9
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/BenchmarkRunners/ConnectionPoolThreadPoolPressureRunner.cs
@@ -0,0 +1,256 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+
+namespace Microsoft.Data.SqlClient.PerformanceTests
+{
+    /// <summary>
+    /// Measures a saturated pool driven by sync callers on threadpool threads, with the
+    /// threadpool's minimum worker count pinned so the result is reproducible.
+    ///
+    /// A sync <c>Open()</c> against a saturated pool blocks its thread. When those threads
+    /// are threadpool threads, a pool whose waiter wake-up requires a queued continuation
+    /// cannot make progress: every thread is blocked in a wait, so the wake-up sits in the
+    /// queue until the threadpool injects another thread. On the TFMs this project builds the
+    /// runtime is told about cooperative blocking and compensates quickly, so stalls are tens
+    /// to a few hundred milliseconds. net462 has no equivalent notification and is slower, but
+    /// this suite does not build it, so that path is not measured here.
+    ///
+    /// <see cref="ConnectionPoolContentionRunner"/> covers the same shape at the default
+    /// threadpool floor, which makes it dependent on hill-climbing timing and therefore
+    /// noisy. Pinning the floor turns that into a controlled comparison:
+    ///
+    /// - <see cref="MinWorkerThreads"/> below <see cref="Parallelism"/> guarantees the
+    ///   threadpool starts starved, so the wake path is exercised on every run.
+    /// - <see cref="MinWorkerThreads"/> above <see cref="Parallelism"/> pre-creates enough
+    ///   threads that injection never gates progress. This is the control: a pool that only
+    ///   regresses in the starved configuration has a wake-path problem, not a throughput
+    ///   problem.
+    ///
+    /// The effect is tail latency, not a shifted median, so compare distributions rather
+    /// than means alone.
+    ///
+    /// A regression here is largely a statement about application configuration rather than a
+    /// pool defect, but the starved configuration is not exotic: the default minimum is
+    /// <see cref="Environment.ProcessorCount"/>, which honours cgroup CPU quotas, so a service
+    /// in a 1-2 vCPU container runs with a floor of 1 or 2. This runner exists to characterise
+    /// where that boundary is and to catch it moving, not to drive the delta to zero.
+    ///
+    /// The pool implementation (legacy vs V2) is a process-level choice - see the remarks on
+    /// <see cref="ConnectionPoolStressRunner"/>. Run twice (UseConnectionPoolV2 false then
+    /// true) to compare.
+    ///
+    /// Related issue: #3356
+    /// </summary>
+    public class ConnectionPoolThreadPoolPressureRunner : BaseRunner
+    {
+        /// <summary>
+        /// Number of concurrent sync workers. Also the reference point for the non-starved
+        /// control in <see cref="MinWorkerThreadsValues"/>, so it is a constant rather than a
+        /// literal on the attribute.
+        /// </summary>
+        private const int WorkerParallelism = 50;
+
+        /// <summary>
+        /// Number of concurrent sync workers, all running on threadpool threads.
+        /// </summary>
+        [Params(WorkerParallelism)]
+        public int Parallelism { get; set; }
+
+        /// <summary>
+        /// Max pool size. Deliberately smaller than <see cref="Parallelism"/> so most
+        /// workers must block waiting for a connection to be returned. Without that
+        /// back-pressure nobody waits and the wake path is never exercised.
+        /// </summary>
+        [Params(10)]
+        public int MaxPoolSize { get; set; }
+
+        /// <summary>
+        /// Threadpool minimum worker thread count, pinned for the duration of the run.
+        /// </summary>
+        /// <remarks>
+        /// Sourced from <see cref="MinWorkerThreadsValues"/> rather than fixed constants,
+        /// because this number is only meaningful relative to
+        /// <see cref="Environment.ProcessorCount"/> — see that property for why.
+        /// </remarks>
+        [ParamsSource(nameof(MinWorkerThreadsValues))]
+        public int MinWorkerThreads { get; set; }
+
+        /// <summary>
+        /// The minimum worker counts to sweep, expressed as multiples of
+        /// <see cref="Environment.ProcessorCount"/>.
+        /// </summary>
+        /// <remarks>
+        /// Fixed constants would not survive a change of machine. The processor count is both
+        /// the value this parameter displaces (it is the runtime's own default floor) and the
+        /// size of the runtime's immediate cooperative-blocking injection budget, so the same
+        /// absolute number means "starved" on one host and "generous" on another. A constant
+        /// chosen to starve a 16-core benchmark machine would quietly stop starving anything on
+        /// a 4-core developer box, and the benchmark would keep reporting numbers that no longer
+        /// measure the wake path.
+        ///
+        /// The multiples map onto real deployments: a quarter of the processor count stands in
+        /// for the default floor of a 2-4 vCPU container, 1x is the runtime default that almost
+        /// every application actually runs, and 2x is the most common explicit multiplier in
+        /// shipped code.
+        ///
+        /// The control is the exception: it is pinned to twice <see cref="WorkerParallelism"/>
+        /// rather than a processor multiple, because a processor multiple is not guaranteed to
+        /// clear it. On a 4-core host <c>ProcessorCount * 8</c> is 32, below the 50 workers, so
+        /// every case would be starved and the sweep would have no non-starved baseline to
+        /// compare against. Taking the larger of the two keeps the processor-relative scaling on
+        /// hosts where it is already sufficient.
+        ///
+        /// Floored at 1 because <c>SetMinThreads</c> rejects 0, and de-duplicated because the
+        /// lower multiples collapse together on very small hosts.
+        /// </remarks>
+        public static IEnumerable<int> MinWorkerThreadsValues =>
+            new[]
+            {
+                Environment.ProcessorCount / 4,
+                Environment.ProcessorCount,
+                Environment.ProcessorCount * 2,
+                Math.Max(Environment.ProcessorCount * 8, WorkerParallelism * 2),
+            }
+            .Select(static value => Math.Max(1, value))
+            .Distinct();
+
+        /// <summary>
+        /// Number of open/query/close operations each worker performs per invocation.
+        /// </summary>
+        [Params(20)]
+        public int OpsPerWorker { get; set; }
+
+        private string _connectionString;
+        private int _originalMinWorkerThreads;
+        private int _originalMinCompletionPortThreads;
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            Console.WriteLine(
+                "[ConnectionPoolThreadPoolPressureRunner] Pool implementation: " +
+                (s_config.UseConnectionPoolV2
+                    ? "ChannelDbConnectionPool (V2)"
+                    : "WaitHandleDbConnectionPool (legacy)"));
+
+            ThreadPool.GetMinThreads(
+                out _originalMinWorkerThreads, out _originalMinCompletionPortThreads);
+            SetMinWorkerThreads(MinWorkerThreads, _originalMinCompletionPortThreads);
+
+            var builder = new SqlConnectionStringBuilder(s_config.ConnectionString)
+            {
+                Pooling = true,
+                MaxPoolSize = MaxPoolSize,
+                MinPoolSize = 0
+            };
+            _connectionString = builder.ConnectionString;
+        }
+
+        [GlobalCleanup]
+        public void Cleanup()
+        {
+            // Restoring matters beyond this benchmark: the floor is process-wide, so leaving it
+            // raised would silently change the conditions for every runner that follows in the
+            // same process.
+            SetMinWorkerThreads(
+                _originalMinWorkerThreads, _originalMinCompletionPortThreads);
+        }
+
+        /// <summary>
+        /// Pins the threadpool worker floor, failing loudly if it does not take effect.
+        ///
+        /// <see cref="MinWorkerThreads"/> is the only variable this benchmark manipulates, so a
+        /// refused or clamped request would leave every configuration running at the same floor
+        /// and produce a comparison that looks valid but measures nothing. The return value alone
+        /// is not sufficient evidence, so the value is also read back.
+        /// </summary>
+        private static void SetMinWorkerThreads(int workerThreads, int completionPortThreads)
+        {
+            if (!ThreadPool.SetMinThreads(workerThreads, completionPortThreads))
+            {
+                throw new InvalidOperationException(
+                    $"ThreadPool.SetMinThreads({workerThreads}, {completionPortThreads}) was refused. " +
+                    "The threadpool floor is this benchmark's independent variable, so the run would " +
+                    "otherwise report a comparison that did not actually vary it.");
+            }
+
+            ThreadPool.GetMinThreads(out int actualWorkerThreads, out _);
+            if (actualWorkerThreads != workerThreads)
+            {
+                throw new InvalidOperationException(
+                    $"ThreadPool.SetMinThreads({workerThreads}, ...) reported success but the floor " +
+                    $"read back as {actualWorkerThreads}. The runtime clamped the request, so this " +
+                    "configuration would not measure the intended threadpool pressure.");
+            }
+        }
+
+        [IterationSetup]
+        public void IterationSetup()
+        {
+            // Warm the pool to MaxPoolSize so the measured run reflects steady-state
+            // checkout/return rather than first-time physical connection establishment.
+            WarmPool(MaxPoolSize);
+        }
+
+        [IterationCleanup]
+        public void IterationCleanup()
+        {
+            using var conn = new SqlConnection(_connectionString);
+            SqlConnection.ClearPool(conn);
+        }
+
+        [Benchmark]
+        public Task SaturatedSyncOpenOnThreadPool()
+        {
+            var tasks = new Task[Parallelism];
+            for (int i = 0; i < Parallelism; i++)
+            {
+                tasks[i] = Task.Run(() =>
+                {
+                    for (int op = 0; op < OpsPerWorker; op++)
+                    {
+                        using var conn = new SqlConnection(_connectionString);
+                        conn.Open();
+                        using var cmd = conn.CreateCommand();
+                        cmd.CommandText = "SELECT 1";
+                        _ = cmd.ExecuteScalar();
+                        // Dispose returns the connection to the pool.
+                    }
+                });
+            }
+
+            return Task.WhenAll(tasks);
+        }
+
+        private void WarmPool(int count)
+        {
+            var conns = new SqlConnection[count];
+            try
+            {
+                for (int i = 0; i < count; i++)
+                {
+                    conns[i] = new SqlConnection(_connectionString);
+                    conns[i].Open();
+                }
+            }
+            finally
+            {
+                // Close and dispose every connection so they return to the pool and
+                // are not retained until GC (which would add allocation/GC noise).
+                for (int i = 0; i < count; i++)
+                {
+                    conns[i]?.Close();
+                    conns[i]?.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
index 7b136c6f2c..41d756c200 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Config/Config.cs
@@ -71,6 +71,8 @@ public class Benchmarks
         public RunnerJob ConnectionPoolStressRunnerConfig;
         public RunnerJob ConnectionPoolContentionRunnerConfig;
         public RunnerJob ConnectionPoolChurnRunnerConfig;
+        public RunnerJob ConnectionPoolRampRunnerConfig;
+        public RunnerJob ConnectionPoolThreadPoolPressureRunnerConfig;
     }
 
     public class RunnerJob
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
index 5a0d303e97..e326766f29 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Program.cs
@@ -55,6 +55,8 @@ public BenchmarkUnit(string name, Func<Benchmarks, RunnerJob> selector, Type run
             new BenchmarkUnit("ConnectionPoolStress", b => b.ConnectionPoolStressRunnerConfig, typeof(ConnectionPoolStressRunner)),
             new BenchmarkUnit("ConnectionPoolContention", b => b.ConnectionPoolContentionRunnerConfig, typeof(ConnectionPoolContentionRunner)),
             new BenchmarkUnit("ConnectionPoolChurn", b => b.ConnectionPoolChurnRunnerConfig, typeof(ConnectionPoolChurnRunner)),
+            new BenchmarkUnit("ConnectionPoolRamp", b => b.ConnectionPoolRampRunnerConfig, typeof(ConnectionPoolRampRunner)),
+            new BenchmarkUnit("ConnectionPoolThreadPoolPressure", b => b.ConnectionPoolThreadPoolPressureRunnerConfig, typeof(ConnectionPoolThreadPoolPressureRunner)),
         };
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
index 0ecc44e957..37bf73e960 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/runnerconfig.jsonc
@@ -173,6 +173,24 @@
             "InvocationCount": 1,
             "WarmupCount": 1,
             "RowCount": 0
+        },
+        "ConnectionPoolRampRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 15,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 0
+        },
+        // Measures tail latency from threadpool starvation, so it needs more iterations
+        // than the others: a stall shows up in the distribution, not in the median.
+        "ConnectionPoolThreadPoolPressureRunnerConfig": {
+            "Enabled": true,
+            "LaunchCount": 1,
+            "IterationCount": 25,
+            "InvocationCount": 1,
+            "WarmupCount": 1,
+            "RowCount": 0
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index d647ab0914..01321a35a6 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -235,6 +235,101 @@ out DbConnectionInternal? internalConnection
             Assert.Equal(pool.PoolGroupOptions.MaxPoolSize, pool.Count);
         }
 
+        /// <summary>
+        /// Verifies that an asynchronous request satisfied by an already-idle connection is
+        /// completed inline on the caller's thread, rather than being dispatched to the thread pool.
+        /// </summary>
+        /// <remarks>
+        /// The fast path must report completion by returning true with the connection, exactly as
+        /// WaitHandleDbConnectionPool does on its inline hit. Completing the TaskCompletionSource
+        /// and returning false would look equivalent but is not: it sends
+        /// SqlConnection.InternalOpenAsync down its asynchronous branch, which allocates an
+        /// OpenAsyncRetry and schedules ContinueWith(..., TaskScheduler.Default), costing a thread
+        /// pool dispatch even though the result is already available. Asserting that the
+        /// TaskCompletionSource is left untouched is what pins that down.
+        /// </remarks>
+        [Fact]
+        public void GetConnectionAsync_WithIdleConnection_ShouldCompleteInline()
+        {
+            // Arrange: take a connection and return it, leaving one connection idle in the pool.
+            var pool = ConstructPool(SuccessfulConnectionFactory);
+            SqlConnection owningConnection = new();
+
+            pool.TryGetConnection(
+                owningConnection,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? pooledConnection
+            );
+            Assert.NotNull(pooledConnection);
+            pool.ReturnInternalConnection(pooledConnection, owningConnection);
+
+            // Act
+            TaskCompletionSource<DbConnectionInternal> taskCompletionSource = new();
+            SqlConnection secondOwner = new();
+            var completed = pool.TryGetConnection(
+                secondOwner,
+                taskCompletionSource,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? internalConnection
+            );
+
+            // Assert: the request is reported as completed and the connection is handed back
+            // directly, matching WaitHandleDbConnectionPool's inline hit. This is what lets
+            // SqlConnection.InternalOpenAsync take its synchronous branch and skip the
+            // OpenAsyncRetry allocation and the ContinueWith thread pool dispatch.
+            Assert.True(completed);
+            Assert.Equal(pooledConnection, internalConnection);
+
+            // The fast path must also activate the connection and assign ownership, exactly as the
+            // full path does. Without this the pool would hand back an unowned, unactivated
+            // connection and the assertions above would still pass.
+            Assert.Same(secondOwner, internalConnection!.Owner);
+
+            // The TaskCompletionSource must be left alone; the caller abandons it on a
+            // synchronous completion.
+            Assert.False(taskCompletionSource.Task.IsCompleted);
+
+            // The idle connection was reused rather than a second one being opened.
+            Assert.Equal(1, pool.Count);
+        }
+
+        /// <summary>
+        /// Verifies that a synchronous request satisfied by an already-idle connection returns that
+        /// connection inline.
+        /// </summary>
+        [Fact]
+        public void GetConnection_WithIdleConnection_ShouldReturnInline()
+        {
+            // Arrange: take a connection and return it, leaving one connection idle in the pool.
+            var pool = ConstructPool(SuccessfulConnectionFactory);
+            SqlConnection owningConnection = new();
+
+            pool.TryGetConnection(
+                owningConnection,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? pooledConnection
+            );
+            Assert.NotNull(pooledConnection);
+            pool.ReturnInternalConnection(pooledConnection, owningConnection);
+
+            // Act
+            SqlConnection secondOwner = new();
+            var completed = pool.TryGetConnection(
+                secondOwner,
+                taskCompletionSource: null,
+                TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
+                out DbConnectionInternal? internalConnection
+            );
+
+            // Assert
+            Assert.True(completed);
+            Assert.Equal(pooledConnection, internalConnection);
+            Assert.Same(secondOwner, internalConnection!.Owner);
+            Assert.Equal(1, pool.Count);
+        }
+
         /// <summary>
         /// Verifies that a waiting synchronous caller reuses a connection that is returned to an
         /// exhausted pool instead of creating a new physical connection.
@@ -652,10 +747,19 @@ public void StressTestAsync()
                         TimeoutTimer.StartNew(TimeSpan.FromSeconds(15)),
                         out DbConnectionInternal? internalConnection
                     );
-                    internalConnection = await taskCompletionSource.Task;
-                    pool.ReturnInternalConnection(internalConnection, owningObject);
+
+                    // A request satisfied from the pool's existing connections completes inline,
+                    // returning the connection directly and leaving the TaskCompletionSource
+                    // untouched. Only fall back to awaiting it when the request was handed off.
+                    // This mirrors how the pool's callers consume TryGetConnection.
+                    if (!completed)
+                    {
+                        internalConnection = await taskCompletionSource.Task;
+                    }
 
                     Assert.NotNull(internalConnection);
+
+                    pool.ReturnInternalConnection(internalConnection, owningObject);
                 });
                 tasks.Add(t);
             }
@@ -2282,6 +2386,94 @@ protected override DbConnectionInternal CreateConnection(
 
         #endregion
 
+        #region Saturated Sync Wait Tests
+
+        /// <summary>
+        /// Verifies that the saturated synchronous checkout path makes forward progress when every
+        /// waiter is blocked in <c>ReadChannelSyncOverAsync</c> on a threadpool thread. This is the
+        /// net462 guard for that path, where the wake-up gets no cooperative-blocking notification;
+        /// it asserts liveness only, since the frameworks legitimately differ on latency.
+        /// </summary>
+        [Fact]
+        public void SyncCheckout_WhenSaturatedOnThreadPoolThreads_AllWaitersMakeProgress()
+        {
+            // Arrange
+            const int MaxPoolSize = 4;
+            ThreadPool.GetMinThreads(out int minWorker, out _);
+
+            // More blocked waiters than the pool can serve AND than the threadpool floor, so the
+            // wake path is exercised rather than every worker simply getting its own thread.
+            // Deliberately uncapped: any ceiling would silently stop saturating on a host whose
+            // floor already exceeds it, turning this into a no-op exactly where it matters most.
+            int workerCount = minWorker + MaxPoolSize + 8;
+
+            var poolGroupOptions = new DbConnectionPoolGroupOptions(
+                poolByIdentity: false,
+                minPoolSize: 0,
+                maxPoolSize: MaxPoolSize,
+                // Generous: a healthy run finishes far inside this, while a genuinely stuck wake
+                // path still fails the test rather than hanging the suite forever.
+                creationTimeout: 60,
+                loadBalanceTimeout: 0,
+                hasTransactionAffinity: true,
+                idleTimeout: 0);
+            var pool = ConstructPool(SuccessfulConnectionFactory, poolGroupOptions: poolGroupOptions);
+
+            using var startGate = new ManualResetEventSlim(initialState: false);
+            var acquired = new ConcurrentBag<bool>();
+            var failures = new ConcurrentBag<Exception>();
+            var workers = new Task[workerCount];
+
+            // Act: release every worker at once so they pile onto the pool together.
+            for (int i = 0; i < workerCount; i++)
+            {
+                workers[i] = Task.Factory.StartNew(
+                    () =>
+                    {
+                        try
+                        {
+                            startGate.Wait();
+                            bool got = pool.TryGetConnection(
+                                new SqlConnection(),
+                                taskCompletionSource: null,
+                                TimeoutTimer.StartNew(TimeSpan.FromSeconds(60)),
+                                out DbConnectionInternal? connection);
+
+                            acquired.Add(got && connection is not null);
+
+                            // Return promptly: with MaxPoolSize connections shared by every worker,
+                            // each return is what wakes the next waiter.
+                            if (connection is not null)
+                            {
+                                pool.ReturnInternalConnection(connection, connection.Owner);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            failures.Add(ex);
+                        }
+                    },
+                    CancellationToken.None,
+                    // LongRunning would hand each worker a dedicated thread, which is precisely the
+                    // starvation this test needs to reproduce. Keep them on threadpool threads.
+                    TaskCreationOptions.None,
+                    TaskScheduler.Default);
+            }
+
+            startGate.Set();
+
+            // Assert
+            Assert.True(
+                Task.WaitAll(workers, TimeSpan.FromSeconds(120)),
+                $"Saturated sync checkout did not drain: {acquired.Count} of {workerCount} workers " +
+                "finished. The waiter wake path is not making progress on this framework.");
+            Assert.Empty(failures);
+            Assert.Equal(workerCount, acquired.Count);
+            Assert.DoesNotContain(false, acquired);
+        }
+
+        #endregion
+
         #region Connection Timeout Awareness Tests
 
         /// <summary>

From faa131ea6f405511b4cf98d4e3f99e2c697eadf1 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 4 Sep 2026 08:27:56 -0300
Subject: [PATCH 268/298] Enable SDL Roslyn analysis (incl. internal IA*
 analyzers) in the OneBranch build (#4464)

---
 .config/guardian/.gdnbaselines                | 669 +++++++++++++++++-
 Directory.Packages.props                      |  18 +
 NuGet.analysis.config                         |  50 ++
 NuGet.config                                  |  42 +-
 build.proj                                    | 122 ++++
 .../templates/steps/override-sni-version.yml  |  13 +
 .../onebranch/jobs/build-buildproj-job.yml    |   4 +-
 .../onebranch/sqlclient-non-official.yml      |  60 +-
 .../onebranch/sqlclient-official.yml          |  59 +-
 .../steps/roslyn-analyzers-buildproj-step.yml | 171 ++++-
 .../variables/onebranch-variables.yml         |  13 +-
 src/Directory.Build.props                     |  65 ++
 src/Directory.Build.targets                   |  21 +
 .../Microsoft.Data.SqlClient.csproj           |   6 +-
 .../TDS/TDS.EndPoint/TDS.EndPoint.csproj      |   1 -
 tools/PackageCompatibility/NuGet.config       |  35 +
 16 files changed, 1306 insertions(+), 43 deletions(-)
 create mode 100644 NuGet.analysis.config
 create mode 100644 src/Directory.Build.targets

diff --git a/.config/guardian/.gdnbaselines b/.config/guardian/.gdnbaselines
index 10698219a1..e5c5ff89b2 100644
--- a/.config/guardian/.gdnbaselines
+++ b/.config/guardian/.gdnbaselines
@@ -8,7 +8,7 @@
     "default": {
       "name": "default",
       "createdDate": "2026-07-23 11:29:23Z",
-      "lastUpdatedDate": "2026-07-23 11:29:23Z"
+      "lastUpdatedDate": "2026-08-28 14:33:24Z"
     }
   },
   "results": {
@@ -103,10 +103,15 @@
         "0d5b851e97bdb0eb8931e6f326718a657f9cd46092eb8a2a2d414be2147a797c",
         "e6c0cd6ef2433a42c95a2939cce740019ecda3fcfde64a3a0f21661e6ff27f71"
       ],
+      "target": "src/Microsoft.Data.SqlClient/tests/ManualTests/makepfxcert.ps1",
+      "line": 145,
+      "uriBaseId": "file:///D:/a/_work/1/s/",
       "memberOf": [
         "default"
       ],
-      "createdDate": "2026-07-23 11:29:23Z"
+      "tool": "psscriptanalyzer",
+      "ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
+      "createdDate": "2026-08-28 12:58:19Z"
     },
     "27cf35f7df3f630fab489573ec19318f563e042424ca30625e9fe08407d74bdf": {
       "signature": "27cf35f7df3f630fab489573ec19318f563e042424ca30625e9fe08407d74bdf",
@@ -119,6 +124,664 @@
         "default"
       ],
       "createdDate": "2026-07-23 11:29:23Z"
+    },
+    "1e0989a7cdd65afb10dd3787a2ed33e9f737e6dd049524edbf76ba1daadf6ef8": {
+      "signature": "1e0989a7cdd65afb10dd3787a2ed33e9f737e6dd049524edbf76ba1daadf6ef8",
+      "alternativeSignatures": [
+        "47067564034219f2cf40604fcd1beadb34ebe1b960cc75600796c8a0f4565604"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Utils.cs",
+      "line": 72,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 14:17:20Z"
+    },
+    "e5cd66384b36741191c98844947e6b857140c09b2c352b180664f8b4829c3e4c": {
+      "signature": "e5cd66384b36741191c98844947e6b857140c09b2c352b180664f8b4829c3e4c",
+      "alternativeSignatures": [
+        "07fc741e29b6f1d01d84d3290b8c53dc7f22036a8313d1f41acdca253aa3e254"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Resources/StringsHelper.cs",
+      "line": 90,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "281a106076dd3d70aefcd230a90cef542f52488fb3ce164c94b213ededa12da5": {
+      "signature": "281a106076dd3d70aefcd230a90cef542f52488fb3ce164c94b213ededa12da5",
+      "alternativeSignatures": [
+        "42cf7833cc5d63447162200f8926b57746ad3f6f2bd43318f0e606f022933c3e"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/AzureAttestationBasedEnclaveProvider.cs",
+      "line": 215,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "fcda2db01b63d59f5a4aa73cb780405887f4616f26f9e23dfae52195cab4994e": {
+      "signature": "fcda2db01b63d59f5a4aa73cb780405887f4616f26f9e23dfae52195cab4994e",
+      "alternativeSignatures": [
+        "9134dead4de902cc02f5f2e7785d84b422f31847f237ba6bcbaeb823e228fd7d"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/EnclaveProviderBase.cs",
+      "line": 170,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "4ff2eb551fd17b4d3239b89cf97bfb09507cdfb631cb4787adc3a4f195e8bac7": {
+      "signature": "4ff2eb551fd17b4d3239b89cf97bfb09507cdfb631cb4787adc3a4f195e8bac7",
+      "alternativeSignatures": [
+        "3b7985cbb5123ba5b91edc3e36a952d1f9d579943820f3c3e870095c7e264cc4"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/NoneAttestationEnclaveProvider.cs",
+      "line": 43,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "8f3e9755a800f590583d9e7ea2028c5d23ee2008450af7d55daea17d5fbecfa5": {
+      "signature": "8f3e9755a800f590583d9e7ea2028c5d23ee2008450af7d55daea17d5fbecfa5",
+      "alternativeSignatures": [
+        "4531f356921a98edacfca7c32eb389b459c02014ea3db2d2d899ce65a87d52ca"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256EncryptionKey.cs",
+      "line": 94,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "6ba87c464ec17dc52c0304f5cee224f8d3233507a79211916901a7b9d0d0908c": {
+      "signature": "6ba87c464ec17dc52c0304f5cee224f8d3233507a79211916901a7b9d0d0908c",
+      "alternativeSignatures": [
+        "fcd1d28e2fe4772861caa303138474dc79869cc77079f79b55eda1612a4c4693"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs",
+      "line": 353,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "ffe242f34f321ccf4d2e727c9812baaf006e4ad122d314e02dd287f388b5b176": {
+      "signature": "ffe242f34f321ccf4d2e727c9812baaf006e4ad122d314e02dd287f388b5b176",
+      "alternativeSignatures": [
+        "ca2f6e8136bafc65dc12eb6236123ee0877de7a1b48e810c36b7feae643b9654"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs",
+      "line": 1049,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "b73abd622849352bbe6c5188f106d4a2f9a1c4f650b7d2ba8f383653909a9479": {
+      "signature": "b73abd622849352bbe6c5188f106d4a2f9a1c4f650b7d2ba8f383653909a9479",
+      "alternativeSignatures": [
+        "636e8fa98391919cfbd7f27792cac5c7806dbd7ec3ab0506b27fbbe52ee9cd8b"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientPermission.netfx.cs",
+      "line": 144,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1309",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "cdbeec94358c58eb2960ea291f7f804e5d24e15807bc5b4a5ce259782727cd9a": {
+      "signature": "cdbeec94358c58eb2960ea291f7f804e5d24e15807bc5b4a5ce259782727cd9a",
+      "alternativeSignatures": [
+        "8fa2f809347c794dbb3659a25cb2ea3a15df3a64a86f5a78f72b39c63f6b8319"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs",
+      "line": 2336,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "01c8d80a7268d44c7d8e478f887e804d8819cc2382ad1d845a415d97ead39d2e": {
+      "signature": "01c8d80a7268d44c7d8e478f887e804d8819cc2382ad1d845a415d97ead39d2e",
+      "alternativeSignatures": [
+        "00aae68e847dfaed6240e67d9f0d1f5f64b9a0343c185c69f7dae148ebf2dc35"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionEncryptOption.cs",
+      "line": 57,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1304",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "5ef60ae6fdf13d9fcebe7631af27f7ea23d3f198215a19c8752bf5f8cdee8dc9": {
+      "signature": "5ef60ae6fdf13d9fcebe7631af27f7ea23d3f198215a19c8752bf5f8cdee8dc9",
+      "alternativeSignatures": [
+        "17d62daf6be556a78b7a342be79f5038d7f1831851722a69398b996cecd57bd8"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionEncryptOption.cs",
+      "line": 108,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1309",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "f99754da199aaa7a5e510552f0b4e851029c149dced1d5196eba374b03f0450d": {
+      "signature": "f99754da199aaa7a5e510552f0b4e851029c149dced1d5196eba374b03f0450d",
+      "alternativeSignatures": [
+        "2852f83af1a5eacc738153cae383e7e216179f3573e9082879dddb48e32a260c"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs",
+      "line": 1638,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1309",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "3dc0ef1e00dd1aed1bd9b6a2e9c06c4f8b24bf368419a2928feaab51252a3b47": {
+      "signature": "3dc0ef1e00dd1aed1bd9b6a2e9c06c4f8b24bf368419a2928feaab51252a3b47",
+      "alternativeSignatures": [
+        "6a46ad5f8328cb647c28327bb4260335dab6e381ee816f60e371f3f3c4f348b0"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.cs",
+      "line": 1640,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "d0e489f06819d4a2e78e99be8aedb5d683f8c787cfc07d5c25689bc4e4e3f5f6": {
+      "signature": "d0e489f06819d4a2e78e99be8aedb5d683f8c787cfc07d5c25689bc4e4e3f5f6",
+      "alternativeSignatures": [
+        "524203b79cc017dc30443712f932710574a9a39d5f7251a4c9354f3cdd21b36b"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.Debug.cs",
+      "line": 59,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1309",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "6d1f24e834de7bf17aa69abdd0fe79751a4afcc083253e84b577c813a19f46fb": {
+      "signature": "6d1f24e834de7bf17aa69abdd0fe79751a4afcc083253e84b577c813a19f46fb",
+      "alternativeSignatures": [
+        "9b805fc1d43486b21ec75d68dd2e4b19d5e7af7c954c546389307bd689a2930b"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionOptions.Debug.cs",
+      "line": 59,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1304",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "d245c0ad54d0229b6ea7a194bd42c40011b734ee5ef92dfce42c9a40096c906d": {
+      "signature": "d245c0ad54d0229b6ea7a194bd42c40011b734ee5ef92dfce42c9a40096c906d",
+      "alternativeSignatures": [
+        "472b266989720cacdc2666a97234830e954f84346ba13ee028d9f0dbac3d5d82"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs",
+      "line": 2801,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "68fc925a125fdb6381d42edaaae658cb5c23c5bbef262cbb569215d839e3a9b3": {
+      "signature": "68fc925a125fdb6381d42edaaae658cb5c23c5bbef262cbb569215d839e3a9b3",
+      "alternativeSignatures": [
+        "1a6475a1a8210fd0e0d4807a4c5d4e1017da257dbfa97b17c8e3382c1684a34a"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs",
+      "line": 644,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA2219",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "df9958d713606f4b2d800a8f5b33e4839cde7d9e7514f732e0b999f4e7df0cb0": {
+      "signature": "df9958d713606f4b2d800a8f5b33e4839cde7d9e7514f732e0b999f4e7df0cb0",
+      "alternativeSignatures": [
+        "b44a5e32ae614b1bdda97a1a634dad5a4ab4ede29b463dd3196f309db10e1d15"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependency.cs",
+      "line": 1222,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "e318e84cf65f756c454457b437010a21fac2f27f2fa7378c3befc809b97369be": {
+      "signature": "e318e84cf65f756c454457b437010a21fac2f27f2fa7378c3befc809b97369be",
+      "alternativeSignatures": [
+        "d8118425a1409e87f5983a840ac22cc663a7ab494bb914b312f7b32adb84d5f5"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlEnums.cs",
+      "line": 1134,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "467568c2128c495889d899ef783ccca652f3b355aa8fe815d4da1b55b6deab95": {
+      "signature": "467568c2128c495889d899ef783ccca652f3b355aa8fe815d4da1b55b6deab95",
+      "alternativeSignatures": [
+        "8962958e2e5e468cc56038a04d02476e352bf6f1d48104f51c13990d364b0c64"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlException.cs",
+      "line": 164,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "727c936839845e9a68ff00fbc69abb5a132769506d3cfe87692612a2addac855": {
+      "signature": "727c936839845e9a68ff00fbc69abb5a132769506d3cfe87692612a2addac855",
+      "alternativeSignatures": [
+        "2450ed8367a7fac65b41524a145bf097f2dee5794752124fefa3a635057946bd"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs",
+      "line": 114,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1309",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "8c6b44ec1f44fbe00469a48beb3f9eee61c8e31e237c53ba372a1abfc5ea481f": {
+      "signature": "8c6b44ec1f44fbe00469a48beb3f9eee61c8e31e237c53ba372a1abfc5ea481f",
+      "alternativeSignatures": [
+        "7a3c05145c302720ca6feadabcacbb11303442b2289fb06796e21b713fd63717"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs",
+      "line": 572,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "8a5592e024f45a9bdce3315e108cccfafe99b184dbcb4e50d59d783fa3db3942": {
+      "signature": "8a5592e024f45a9bdce3315e108cccfafe99b184dbcb4e50d59d783fa3db3942",
+      "alternativeSignatures": [
+        "929389afe5818dcc5113299f0e0263eca26ef989785742ac7e46b088d5cae598"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs",
+      "line": 2364,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "770e1d8ef5a06c9b4b552dc9c8bf000f572d633bf11ded7e749b3ac9c07d208b": {
+      "signature": "770e1d8ef5a06c9b4b552dc9c8bf000f572d633bf11ded7e749b3ac9c07d208b",
+      "alternativeSignatures": [
+        "4cd0e3d7087eaa0eaf05bec58d32fd71b660033f7bf3984392998d0b9946fb47"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSecurityUtility.cs",
+      "line": 389,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1309",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "8502b61241cdbfac98f7c84b8c16d4d4ec0ea2185018d9fce710e2bac445e8b0": {
+      "signature": "8502b61241cdbfac98f7c84b8c16d4d4ec0ea2185018d9fce710e2bac445e8b0",
+      "alternativeSignatures": [
+        "afed061c02d7b602c516f09952197b58c6c1cdfa0e07ee3625af48287869b2c5"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs",
+      "line": 1749,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1309",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "a83b0d426733a42a34b4569643e60513b598035d6807fa8cda6f4a3501084929": {
+      "signature": "a83b0d426733a42a34b4569643e60513b598035d6807fa8cda6f4a3501084929",
+      "alternativeSignatures": [
+        "3614422f0f09ab4fff1a0195a4f40acd53bf55e4781153ced9d736a801fc6aa4"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs",
+      "line": 1875,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "d36be8dd5189d09c4b5db9176bda7628839f0ba608f31ba449f1203ca9c30c09": {
+      "signature": "d36be8dd5189d09c4b5db9176bda7628839f0ba608f31ba449f1203ca9c30c09",
+      "alternativeSignatures": [
+        "fcf7dc6efdfecd535087f2361d43cfa599cbe83b52717beb36c052dadbbc5a5d"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs",
+      "line": 2309,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "b19ca78715cc12a2051b38a495f41c060259e46d893be38e6dba447e8a87cc02": {
+      "signature": "b19ca78715cc12a2051b38a495f41c060259e46d893be38e6dba447e8a87cc02",
+      "alternativeSignatures": [
+        "efc4d3f86b80b0d8392e7fa74b15ca51411078ed8f249b0f30911036530bc0b4"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs",
+      "line": 3918,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1304",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "119b9514aeb84d5e34b5d7b1520378d4a2d017902d7d1bd572404f1b3186c59c": {
+      "signature": "119b9514aeb84d5e34b5d7b1520378d4a2d017902d7d1bd572404f1b3186c59c",
+      "alternativeSignatures": [
+        "57389b1211c68b1c8ed21fb3439d1dd9bd8a8e25677ed63b1db38ff7bd3b0c6b"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs",
+      "line": 4403,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "533d9dc25ef8183859aeed955b720d435e3035702b3b7c10d12204170815ec04": {
+      "signature": "533d9dc25ef8183859aeed955b720d435e3035702b3b7c10d12204170815ec04",
+      "alternativeSignatures": [
+        "55c532f39c15ec069c540c661f1ccb7371ee8c03f74fad4515d9cd94db8bcca1"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs",
+      "line": 100,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "90dd8eeec55b68eaf94f971d1af06723d22efc0f7cb5fd15870765e6e6602ff9": {
+      "signature": "90dd8eeec55b68eaf94f971d1af06723d22efc0f7cb5fd15870765e6e6602ff9",
+      "alternativeSignatures": [
+        "ac02e05713e85c6086fc30c51a7083a159329f0a222c9d0be513e6da9fda0300"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProvider.cs",
+      "line": 84,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "f1c711a9df14d19ac6682356d6648111a1e3c2ae051812e8f04a7466df045aa4": {
+      "signature": "f1c711a9df14d19ac6682356d6648111a1e3c2ae051812e8f04a7466df045aa4",
+      "alternativeSignatures": [
+        "1e752a5b4246f05f58da2adde778eb3eb46238ad51a6a2013d3fd9d80aaf5422"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProviderBase.cs",
+      "line": 488,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "d159ab04bf10a650f1f43064602246acfa671e4f1f7ba07faf5620ab13043926": {
+      "signature": "d159ab04bf10a650f1f43064602246acfa671e4f1f7ba07faf5620ab13043926",
+      "alternativeSignatures": [
+        "74e1a9e9972040959e4176eb8dc981d8394545eaf86f30e059f9814f545bea67"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/ConnectionString/DbConnectionString.netfx.cs",
+      "line": 374,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "761ae24086cbfbeb9667e20ab45b174613bd156d0dc7bde56a37571db11cd779": {
+      "signature": "761ae24086cbfbeb9667e20ab45b174613bd156d0dc7bde56a37571db11cd779",
+      "alternativeSignatures": [
+        "1793d6a0e1d5ee495ced5ce18af4bb1c6f1635ce89d6dfe9d840b84673ccbe7a"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs",
+      "line": 4130,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "92759af0d8bc9a56339a09bfb5ae1e0adbe2c0aa7697911d0f14941ba65a1e67": {
+      "signature": "92759af0d8bc9a56339a09bfb5ae1e0adbe2c0aa7697911d0f14941ba65a1e67",
+      "alternativeSignatures": [
+        "f20cbad7a6ed702f47f5d26f6e56844ce9f1e5a7d03152361b1818d4aef03058"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolAuthenticationContextKey.cs",
+      "line": 83,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1309",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "8409f840dce0e042b55250ce12045afaabc1e2e48f443e43ec0e493517e3e38d": {
+      "signature": "8409f840dce0e042b55250ce12045afaabc1e2e48f443e43ec0e493517e3e38d",
+      "alternativeSignatures": [
+        "b607bb6c9aded6c9d9d1da95e9f49b9a17ec42880fe59156cfca1d2f088fec35"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniCommon.netcore.cs",
+      "line": 148,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "1152991aab5d089b6b086e389b075de228b319c82a577dae0afe850956202b12": {
+      "signature": "1152991aab5d089b6b086e389b075de228b319c82a577dae0afe850956202b12",
+      "alternativeSignatures": [
+        "95a2b83edbb49524b5834cba58e1c1670ad5397cca2bc8ed4912f02c7b885acd"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniProxy.netcore.cs",
+      "line": 150,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "66052c0cd9b0dade1d5d86703650fa9c8d46f7977b60148aea67f371393e32b3": {
+      "signature": "66052c0cd9b0dade1d5d86703650fa9c8d46f7977b60148aea67f371393e32b3",
+      "alternativeSignatures": [
+        "d67c06a92599b72202abeed718e385e4621947195fc3affc730a1066b55f5cb6"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniProxy.netcore.cs",
+      "line": 731,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1309",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "f236b2c674fc8574908a9b254e10d9a78f4df86278d9cfe52f5b4d072689829b": {
+      "signature": "f236b2c674fc8574908a9b254e10d9a78f4df86278d9cfe52f5b4d072689829b",
+      "alternativeSignatures": [
+        "fabdb2e276df6d043b029af9a40c831c8f9f7131dec81706dd664cd5d913f32e"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SniTcpHandle.netcore.cs",
+      "line": 658,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "424ec1510b6c1352e0731f19bd7a6c03f1da3bab869fa520046b0080cb7b5d70": {
+      "signature": "424ec1510b6c1352e0731f19bd7a6c03f1da3bab869fa520046b0080cb7b5d70",
+      "alternativeSignatures": [
+        "4dac74c5b9483f0a4b1f7e76f91002aa485fd1b83b19d5823169b0c15eaace8b"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ManagedSni/SsrpClient.netcore.cs",
+      "line": 80,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "76482116b8cae39bdad9b92782ab216ff958f6578405f93879733326a4283bfe": {
+      "signature": "76482116b8cae39bdad9b92782ab216ff958f6578405f93879733326a4283bfe",
+      "alternativeSignatures": [
+        "a815e32ff0ad176d42719f84cb015df61c89e9539fecbf58da169993e789b682"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs",
+      "line": 308,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:55:54Z"
+    },
+    "dd455bea13e4bd70696d1b0f4c890ca1ea42e18643bbe6b572989d84ac188f06": {
+      "signature": "dd455bea13e4bd70696d1b0f4c890ca1ea42e18643bbe6b572989d84ac188f06",
+      "alternativeSignatures": [
+        "0444dab1ebebce0b0e0bfb453d8513e9e8108aad22055bd038c873a8a8bc1f0e"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient.Extensions/Azure/src/ActiveDirectoryAuthenticationProvider.cs",
+      "line": 629,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1309",
+      "createdDate": "2026-08-28 13:36:06Z"
+    },
+    "09526af76b9a6ad21a4841ea50bb51e72925789c5f0f733650ac946cc44060a9": {
+      "signature": "09526af76b9a6ad21a4841ea50bb51e72925789c5f0f733650ac946cc44060a9",
+      "alternativeSignatures": [
+        "2a3fb00242d533ee3253b91c42ba7882b9c35ada1635e3470c481c6b43baa0e6"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.netstandard.cs",
+      "line": 61,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:10:07Z"
+    },
+    "6fec84f5f9e3087c484965319896c91b033557b8bcef7761b0ae74e1baf0ad7d": {
+      "signature": "6fec84f5f9e3087c484965319896c91b033557b8bcef7761b0ae74e1baf0ad7d",
+      "alternativeSignatures": [
+        "efa9c07656c41d1d2367a89a7146fda28f3b584e2654693b4954d40bfafecb8f"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.netstandard.cs",
+      "line": 73,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:10:07Z"
+    },
+    "1de5740b9e122c2d8bda4bfe66c94764a6192376f753a7234bac91e1fc28e5f6": {
+      "signature": "1de5740b9e122c2d8bda4bfe66c94764a6192376f753a7234bac91e1fc28e5f6",
+      "alternativeSignatures": [
+        "14c7177139597c2ab94cf632b76bc03c4f2c252691b30a7ba69957e047b400c4"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.SqlServer.Server/StringsHelper.netstandard.cs",
+      "line": 130,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:10:07Z"
+    },
+    "0ca59be802da38e82370950b24300deae99834aa9a3cee38e064d1f17c5942a9": {
+      "signature": "0ca59be802da38e82370950b24300deae99834aa9a3cee38e064d1f17c5942a9",
+      "alternativeSignatures": [
+        "26425ecc80bd3289865ce79ae6471c4ab21cde25acc1cf2067717fbf6d600a6a"
+      ],
+      "target": "file:///C:/__w/1/s/src/Microsoft.Data.SqlClient.Internal/Logging/src/SqlClientEventSource.cs",
+      "line": 1995,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1305",
+      "createdDate": "2026-08-28 13:09:32Z"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 03ad924f6d..e28a1301a5 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -108,6 +108,24 @@
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
   </ItemGroup>
 
+  <!-- ===================================================================== -->
+  <!-- Internal SDL analyzers (private ADO.Net pipelines only) -->
+  <!--
+    Microsoft.Internal.Analyzers provides the internal "IA*" SDL Roslyn rules. The package is
+    Microsoft-internal and confidential: it is restored ONLY from an internal NuGet feed, ONLY by
+    the private ADO.Net project pipelines, and ONLY when EnableAnalyzers and InternalAnalyzers are
+    both true (see the InternalAnalyzers block in src/Directory.Build.props). Public builds and
+    public CI never set those flags, so the version below is only declared for the private analysis
+    pass and is never seen by a public build.
+
+    The version is supplied by the private pipeline via the InternalAnalyzersVersion
+    property. There is intentionally NO default: the pipeline pins the exact version, and an
+    unset value fails restore rather than silently drifting.
+  -->
+  <ItemGroup Condition="'$(EnableAnalyzers)' == 'true' AND '$(InternalAnalyzers)' == 'true'">
+    <PackageVersion Include="Microsoft.Internal.Analyzers" Version="$(InternalAnalyzersVersion)" />
+  </ItemGroup>
+
   <!-- ===================================================================== -->
   <!-- SqlServer Dependencies -->
 
diff --git a/NuGet.analysis.config b/NuGet.analysis.config
new file mode 100644
index 0000000000..1ba52a93d3
--- /dev/null
+++ b/NuGet.analysis.config
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!-- Analysis builds select this file explicitly. Keep governed and local in sync with NuGet.config. -->
+  <packageSources>
+    <clear />
+
+    <!-- Local contains packages produced by this repository for cross-package development and CI. -->
+    <add key="local" value="packages/" />
+
+    <!-- Governed contains vetted external dependencies and published SqlClient packages. -->
+    <add key="governed" value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
+
+    <!-- Internal analyzers contains private Microsoft analyzer packages used only by analysis builds. -->
+    <add key="internal-analyzers" value="%INTERNAL_ANALYZERS_FEED%" />
+  </packageSources>
+  <packageSourceMapping>
+    <!-- Only packages produced by this repository may be restored from the local feed. -->
+    <packageSource key="local">
+      <package pattern="Microsoft.Data.SqlClient" />
+      <package pattern="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Abstractions" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Azure" />
+      <package pattern="Microsoft.Data.SqlClient.Internal.Logging" />
+      <package pattern="Microsoft.SqlServer.Server" />
+    </packageSource>
+    <!--
+      NuGet uses the most specific matching pattern to determine eligible sources. Because local
+      uses exact package IDs, governed must repeat them; otherwise those packages could only restore
+      from local and would not fall back to governed when no local artifact is available. The "*"
+      pattern makes governed eligible for every other dependency.
+    -->
+    <packageSource key="governed">
+      <package pattern="*" />
+      <package pattern="Microsoft.Data.SqlClient" />
+      <package pattern="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Abstractions" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Azure" />
+      <package pattern="Microsoft.Data.SqlClient.Internal.Logging" />
+      <package pattern="Microsoft.SqlServer.Server" />
+    </packageSource>
+    <!--
+      Use the Microsoft.Internal.* prefix instead of only Microsoft.Internal.Analyzers so companion
+      or transitive packages in the same internal namespace also restore from this feed. This prefix
+      is more specific than the governed/local "*" patterns, so NuGet gives it precedence.
+    -->
+    <packageSource key="internal-analyzers">
+      <package pattern="Microsoft.Internal.*" />
+    </packageSource>
+  </packageSourceMapping>
+</configuration>
diff --git a/NuGet.config b/NuGet.config
index a16ff70302..5bdc9722d5 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,19 +5,43 @@
     <clear />
 
     <!--
-      We do not use the public nuget.org feed. Instead, we use a governed feed maintained by our
-      SqlClientDrivers ADO organization. Packages must be individually vetted and added to this
-      feed manually before they will be available for consumption by our builds.
+      Local contains packages produced by this repository. Developers and pipelines use it to test
+      packages together before they are published, such as SqlClient with a newly built Abstractions.
+    -->
+    <add key="local" value="packages/" />
+
+    <!--
+      Governed is the vetted upstream source for all external dependencies and published SqlClient
+      packages. We do not use nuget.org directly; packages must be approved and added to this feed.
 
       https://sqlclientdrivers.visualstudio.com/public/_artifacts/feed/sqlclient
     -->
     <add key="governed" value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
-
+  </packageSources>
+  <packageSourceMapping>
+    <!-- Only packages produced by this repository may be restored from the local feed. -->
+    <packageSource key="local">
+      <package pattern="Microsoft.Data.SqlClient" />
+      <package pattern="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Abstractions" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Azure" />
+      <package pattern="Microsoft.Data.SqlClient.Internal.Logging" />
+      <package pattern="Microsoft.SqlServer.Server" />
+    </packageSource>
     <!--
-      This package source is used by developers and our pipelines builds when we need to reference
-      packages that are not available on the public nuget.org feed, for example to test MDS that
-      depends on a version of Abstractions that was just built in the workspace.
+      NuGet uses the most specific matching pattern to determine eligible sources. Because local
+      uses exact package IDs, governed must repeat them; otherwise those packages could only restore
+      from local and would not fall back to governed when no local artifact is available. The "*"
+      pattern makes governed eligible for every other dependency.
     -->
-    <add key="local" value="packages/" />
-  </packageSources>
+    <packageSource key="governed">
+      <package pattern="*" />
+      <package pattern="Microsoft.Data.SqlClient" />
+      <package pattern="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Abstractions" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Azure" />
+      <package pattern="Microsoft.Data.SqlClient.Internal.Logging" />
+      <package pattern="Microsoft.SqlServer.Server" />
+    </packageSource>
+  </packageSourceMapping>
 </configuration>
diff --git a/build.proj b/build.proj
index c29dec53a1..31795fc6a7 100644
--- a/build.proj
+++ b/build.proj
@@ -176,6 +176,112 @@
     -->
     <SkipDependencyPack Condition="'$(SkipDependencyPack)' == ''">false</SkipDependencyPack>
 
+    <!--
+      IsolatedBuildPath
+      Applies to:     Build* targets (driver and extension projects)
+      Description:    When set, redirects each project's binary output (bin) to an isolated
+                      location instead of the repo's artifacts/ folder, and forces a full
+                      (non-incremental) compile. This lets a build run at any time without
+                      clobbering existing real build output - for example, an analysis pass that
+                      only needs to compile the code and must not disturb a real build's output.
+
+                      * bin is redirected under "$(IsolatedBuildPath)/bin/" via ArtifactPath. Each
+                        project's OutputPath already appends a project-specific subfolder, so the
+                        projects do not collide and the real artifacts/ folder is left untouched.
+                      * The intermediate (obj) directory is intentionally left at its default,
+                        per-project location. MSBuild resolves the default relative obj/ against
+                        each project's own directory, which keeps intermediates separate for the
+                        multiple projects that make up a package (for example the ref, src, and
+                        notsupported projects of the driver). Pointing every project at a single
+                        shared obj/ under the isolated path makes those projects overwrite each
+                        other's restore assets and fail. The non-incremental switch guarantees a
+                        full recompile regardless of any pre-existing intermediate output.
+
+                      NOTE: Even though an isolated build shares the default obj/ with a prior real
+                      build, it does not perturb that real build's output. The non-incremental switch
+                      does not run Clean or delete anything; it disables the incremental/up-to-date
+                      checks and forces a full recompile so the analyzers see every source file. Real
+                      output is safe because bin is redirected to $(IsolatedBuildPath): the isolated
+                      build only ever writes to the isolated bin, never to the real artifacts/ bin.
+                      The recompile just rewrites the shared obj/ intermediates, which is harmless
+                      because nothing downstream consumes obj/.
+      Default value:  [blank] (normal artifacts/ location and incremental build are used)
+      Example:        C:\agent\_temp\isolated-build
+    -->
+    <IsolatedBuildPath Condition="'$(IsolatedBuildPath)' == ''" />
+    <IsolatedBuildArgument Condition="'$(IsolatedBuildPath)' != ''">
+      --no-incremental
+      -p:ArtifactPath="$(IsolatedBuildPath)/bin/"
+    </IsolatedBuildArgument>
+
+    <!--
+      EnableAnalyzers
+      Applies to:     Build* targets (driver and extension projects)
+      Description:    When true, turns on the full set of Roslyn analyzers for every project that is
+                      compiled and makes each project emit a per-project SARIF v1 log (see the
+                      EnableAnalyzers block in src/Directory.Build.props).
+
+                      The flag is forwarded to each project's own "dotnet build" invocation via
+                      EnableAnalyzersArgument. This forwarding is required because .NET [Roslyn]
+                      analyzers are compiler-integrated: they must run in the leaf compile, and each
+                      leaf compile is a separate "dotnet build" process that build.proj launches with
+                      an <Exec> - it does not inherit properties from this orchestrating build.
+
+                      Independent of IsolatedBuildPath. Analysis is normally run together with
+                      IsolatedBuildPath so the analyzer build does not disturb real build output, but
+                      the two properties can be set independently.
+      Default value:  false
+      Allowed values: (true|false)
+    -->
+    <EnableAnalyzers Condition="'$(EnableAnalyzers)' == ''">false</EnableAnalyzers>
+    <EnableAnalyzersArgument Condition="'$(EnableAnalyzers.ToLower())' == 'true'">
+      -p:EnableAnalyzers=true
+    </EnableAnalyzersArgument>
+
+    <!--
+      InternalAnalyzers
+      Applies to:     Build* targets (driver and extension projects)
+      Description:    When true (and EnableAnalyzers is also true), additionally runs the internal
+                      Microsoft.Internal.Analyzers ("IA*") Roslyn rules (see the InternalAnalyzers
+                      block in src/Directory.Build.props). The Microsoft.Internal.Analyzers package
+                      is Microsoft-internal and confidential, so this flag is set ONLY by the private
+                      ADO.Net project pipelines, which have access to an internal NuGet feed. The
+                      public build and public CI never set it.
+
+                      Like EnableAnalyzers, it is forwarded into each leaf "dotnet build" (it is
+                      appended to EnableAnalyzersArgument) because the analyzers are
+                      compiler-integrated and must run in the leaf compile.
+      Default value:  false
+      Allowed values: (true|false)
+    -->
+    <InternalAnalyzers Condition="'$(InternalAnalyzers)' == ''">false</InternalAnalyzers>
+    <EnableAnalyzersArgument Condition="'$(EnableAnalyzers.ToLower())' == 'true' AND '$(InternalAnalyzers.ToLower())' == 'true'">$(EnableAnalyzersArgument)
+      -p:InternalAnalyzers=true
+    </EnableAnalyzersArgument>
+
+    <!--
+      InternalAnalyzersNugetConfig
+      Applies to:     Build* targets, only when InternalAnalyzers is true
+      Description:    Path to the analysis NuGet.config that adds the internal feed hosting
+                      Microsoft.Internal.Analyzers. It is forwarded into each leaf "dotnet build"
+                      as -p:RestoreConfigFile.
+      Default value:  [blank]
+    -->
+    <EnableAnalyzersArgument Condition="'$(EnableAnalyzers.ToLower())' == 'true' AND '$(InternalAnalyzers.ToLower())' == 'true' AND '$(InternalAnalyzersNugetConfig)' != ''">$(EnableAnalyzersArgument)
+      -p:RestoreConfigFile="$(InternalAnalyzersNugetConfig)"
+    </EnableAnalyzersArgument>
+
+    <!--
+      InternalAnalyzersVersion
+      Applies to:     Build* targets, only when InternalAnalyzers is true
+      Description:    Version of the Microsoft.Internal.Analyzers package to restore. It has no
+                      default (see Directory.Packages.props); the private ADO.Net pipeline pins it.
+      Default value:  [blank]
+    -->
+    <EnableAnalyzersArgument Condition="'$(EnableAnalyzers.ToLower())' == 'true' AND '$(InternalAnalyzers.ToLower())' == 'true' AND '$(InternalAnalyzersVersion)' != ''">$(EnableAnalyzersArgument)
+      -p:InternalAnalyzersVersion=$(InternalAnalyzersVersion)
+    </EnableAnalyzersArgument>
+
     <!--
       SigningKeyPath
       Applies to:     Build*, Pack* (driver targets only)
@@ -459,6 +565,8 @@
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(SqlClientNotSupportedProjectPath)"
         -p:Configuration=$(Configuration)
+        $(IsolatedBuildArgument)
+        $(EnableAnalyzersArgument)
         -p:GenApiPath="@(GenApiArtifactPath->'%(FullPath)')"
         $(SigningKeyPathArgument)
 
@@ -489,6 +597,8 @@
       <DotnetCommand>
         "$(DotnetPath)dotnet" build $(SqlClientRefProjectPath)
         -p:Configuration=$(Configuration)
+        $(IsolatedBuildArgument)
+        $(EnableAnalyzersArgument)
         $(SigningKeyPathArgument)
 
         <!-- Versioning arguments -->
@@ -518,6 +628,8 @@
       <DotnetCommand>
         "$(DotnetPath)dotnet" build $(SqlClientProjectPath)
         -p:Configuration=$(Configuration)
+        $(IsolatedBuildArgument)
+        $(EnableAnalyzersArgument)
         $(SigningKeyPathArgument)
 
         <!-- Versioning arguments -->
@@ -719,6 +831,8 @@
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(AkvProviderProjectPath)"
         -p:Configuration=$(Configuration)
+        $(IsolatedBuildArgument)
+        $(EnableAnalyzersArgument)
         $(SigningKeyPathArgument)
 
         <!--Versioning arguments -->
@@ -824,6 +938,8 @@
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(AbstractionsProjectPath)"
         -p:Configuration=$(Configuration)
+        $(IsolatedBuildArgument)
+        $(EnableAnalyzersArgument)
         $(SigningKeyPathArgument)
 
         <!-- Versioning arguments -->
@@ -927,6 +1043,8 @@
       <DotnetCommand>
         "$(DotnetPath)dotnet" build "$(AzureProjectPath)"
         -p:Configuration=$(Configuration)
+        $(IsolatedBuildArgument)
+        $(EnableAnalyzersArgument)
         $(SigningKeyPathArgument)
 
         <!-- Versioning arguments -->
@@ -1027,6 +1145,8 @@
       <DotnetCommand>
         "$(DotnetPath)dotnet" build $(LoggingProjectPath)
         -p:Configuration=$(Configuration)
+        $(IsolatedBuildArgument)
+        $(EnableAnalyzersArgument)
         $(SigningKeyPathArgument)
 
         <!-- Versioning arguments -->
@@ -1091,6 +1211,8 @@
       <DotnetCommand>
         "$(DotnetPath)dotnet" build $(SqlServerProjectPath)
         -p:Configuration=$(Configuration)
+        $(IsolatedBuildArgument)
+        $(EnableAnalyzersArgument)
         $(SigningKeyPathArgument)
 
         <!--Versioning arguments -->
diff --git a/eng/pipelines/common/templates/steps/override-sni-version.yml b/eng/pipelines/common/templates/steps/override-sni-version.yml
index 3b275262c3..b3496b9f1f 100644
--- a/eng/pipelines/common/templates/steps/override-sni-version.yml
+++ b/eng/pipelines/common/templates/steps/override-sni-version.yml
@@ -42,6 +42,19 @@ steps:
       # add the new package source
       $packageSources.AppendChild($newSource)
 
+      # Exact mappings take precedence over the governed feed's wildcard, ensuring validation SNI
+      # packages are restored from this source. Both package IDs are externally produced and are
+      # therefore intentionally not eligible for the repository's local feed.
+      $packageSourceMapping = $xml.SelectSingleNode('//ns:packageSourceMapping', $nsm)
+      $newMapping = $xml.CreateElement("packageSource")
+      $newMapping.SetAttribute("key","SNIValidation")
+      foreach ($packageId in @("Microsoft.Data.SqlClient.SNI", "Microsoft.Data.SqlClient.SNI.runtime")) {
+        $package = $xml.CreateElement("package")
+        $package.SetAttribute("pattern", $packageId)
+        $newMapping.AppendChild($package)
+      }
+      $packageSourceMapping.AppendChild($newMapping)
+
       # save the xml file
       $xml.Save($NugetCfg)
       type $NugetCfg
diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index f773ec5e7e..d60ed634c0 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -149,7 +149,9 @@ jobs:
       # such as _CheckPwshToolRestored that run during RoslynAnalyzers and Build.
       - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
-      # Perform Roslyn analysis before building, since this step will clobber build output.
+      # Run Roslyn analysis. This step is self-contained: it performs its own build into an
+      # isolated output location, so it can run at any point in the job without clobbering the
+      # real build output below.
       - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml@self
         parameters:
           dependencyArguments: $(sqlServerVersionArgument)
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index 7eb7bfc6cc..6316c9654e 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -94,8 +94,29 @@ extends:
 
   parameters:
     featureFlags:
+      # WindowsHostVersion selects the Windows *host VM* that our Windows build container runs on.
+      # This is a separate layer from the container image itself (WindowsContainerImage in
+      # onebranch-variables.yml): the host is the outer machine running the Docker engine, and the
+      # container is where our build steps actually execute.
+      #
+      # These two must be kept compatible.  Windows containers can only run on a host whose OS
+      # version is compatible with the container's base image.  A mismatch (e.g. a 2025 container on
+      # a 2022 host) fails to start the container unless Hyper-V isolation is forced.
+      WindowsHostVersion:
+        Version: 2025
+
+      # We do NOT set a LinuxHostVersion.  Unlike Windows, Linux containers share the host kernel,
+      # so there is no host/container OS-version compatibility requirement to satisfy -- our Linux
+      # build image (LinuxContainerImage in onebranch-variables.yml) runs on the default OneBranch
+      # Linux host regardless of its distribution.
+
+      # CDPx is OneBranch's predecessor build system.  When EnableCDPxPAT is true (the OneBranch
+      # default), the governed templates inject a legacy CDPx Personal Access Token and its
+      # associated NuGet / Azure Artifacts authentication variables (CDP_DEFAULT_CLIENT_PAT,
+      # VSS_NUGET_ACCESSTOKEN, VSS_NUGET_URI_PREFIXES, etc.) into the build and Docker jobs so
+      # package restore against Azure DevOps feeds works without explicit auth.  We don't rely on
+      # that legacy CDPx package-authentication path, so we disable it.
       EnableCDPxPAT: false
-      WindowsHostVersion: 1ESWindows2022
 
     release:
       # This indicates the pipeline category to deploy Box products.  See:
@@ -119,6 +140,34 @@ extends:
     #
     globalSdl:
 
+      # BREAK SEVERITY
+      #
+      # The SDL analyzer tasks never fail on findings; they only fail if the tool itself crashes or
+      # is misconfigured.  The build break comes from the Post Analysis (Guardian Break) task, which
+      # reads the tool logs and fails when a finding meets or exceeds a minimum severity threshold.
+      # See https://aka.ms/gdn-azdo-break.
+      #
+      # Guardian normalises every finding to Error, Warning or Note.  The threshold is cumulative,
+      # so a lower name is STRICTER, not looser:
+      #
+      #   Error    break on Error                     <-- Guardian's default
+      #   Warning  break on Error + Warning
+      #   Note     break on Error + Warning + Note
+      #
+      # Two knobs control it, in increasing order of precedence:
+      #
+      #   globalSdl.severity           threshold for every tool (maps to GdnBreakPolicyMinSev)
+      #   globalSdl.<tool>.severity    per-tool override of the global threshold
+      #   ob_sdl_<tool>_severity       per-job variable; overrides both of the above
+      #
+      # We omit `severity` everywhere and keep the Error-only default.  OneBranch accepts ONLY
+      # Error, Warning or Note at this layer -- there is no explicit "Default" value to write, so
+      # inheriting the default requires omitting the key.  Consequently, spelling out
+      # `severity: Error` on a tool is NOT equivalent to omitting it: it pins that tool to Error
+      # even if globalSdl.severity is later tightened.
+      #
+      # https://eng.ms/docs/products/onebranch/securitycompliancegovernanceandpolicies/sdlforcontainerizedworkflows/customizesdlforcontainerbuilds
+
       # Snapshot of the SDL analyzer findings that pre-existed the breakOnSdlError rollout, so
       # builds only break on NEW findings.  Generated from the SDL analysis artifacts of a full
       # non-official run and kept under .config/ alongside the other SDL tool configs
@@ -198,7 +247,13 @@ extends:
         break: ${{ parameters.breakOnSdlError }}
 
       roslyn:
-        # Note, requires RoslynAnalyzers task to be added as a separate step
+        # Enabling Roslyn SDL analysis here requires that our .NET builds _produce_ Roslyn findings.
+        # You will see this in the separate Roslyn build task.
+        #
+        # Note that the Roslyn-specific Guardian collector/sanitizer requires SARIF v1, so our
+        # analysis build deliberately emits v1. Other, generic Guardian tooling expects SARIF v2 and
+        # may log processing errors (for example, Post Analysis's SDL artifact report) even though
+        # Roslyn collection and Guardian policy ingestion succeed.
         enabled: true
         break: ${{ parameters.breakOnSdlError }}
 
@@ -235,6 +290,7 @@ extends:
         #   TSA here does not by itself force breaking -- breakOnSdlError is what controls whether
         #   findings fail the build.
         enabled: false
+        # Keep this in sync with Official even though TSA is disabled here.
         configFile: '$(REPO_ROOT)/.config/tsaoptions.json'
 
     stages:
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 38a8a75496..00ec4f3f74 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -108,8 +108,29 @@ extends:
 
   parameters:
     featureFlags:
+      # WindowsHostVersion selects the Windows *host VM* that our Windows build container runs on.
+      # This is a separate layer from the container image itself (WindowsContainerImage in
+      # onebranch-variables.yml): the host is the outer machine running the Docker engine, and the
+      # container is where our build steps actually execute.
+      #
+      # These two must be kept compatible.  Windows containers can only run on a host whose OS
+      # version is compatible with the container's base image.  A mismatch (e.g. a 2025 container on
+      # a 2022 host) fails to start the container unless Hyper-V isolation is forced.
+      WindowsHostVersion:
+        Version: 2025
+
+      # We do NOT set a LinuxHostVersion.  Unlike Windows, Linux containers share the host kernel,
+      # so there is no host/container OS-version compatibility requirement to satisfy -- our Linux
+      # build image (LinuxContainerImage in onebranch-variables.yml) runs on the default OneBranch
+      # Linux host regardless of its distribution.
+
+      # CDPx is OneBranch's predecessor build system.  When EnableCDPxPAT is true (the OneBranch
+      # default), the governed templates inject a legacy CDPx Personal Access Token and its
+      # associated NuGet / Azure Artifacts authentication variables (CDP_DEFAULT_CLIENT_PAT,
+      # VSS_NUGET_ACCESSTOKEN, VSS_NUGET_URI_PREFIXES, etc.) into the build and Docker jobs so
+      # package restore against Azure DevOps feeds works without explicit auth.  We don't rely on
+      # that legacy CDPx package-authentication path, so we disable it.
       EnableCDPxPAT: false
-      WindowsHostVersion: 1ESWindows2022
 
     release:
       # This indicates the pipeline category to deploy Box products.  See:
@@ -133,6 +154,34 @@ extends:
     #
     globalSdl:
 
+      # BREAK SEVERITY
+      #
+      # The SDL analyzer tasks never fail on findings; they only fail if the tool itself crashes or
+      # is misconfigured.  The build break comes from the Post Analysis (Guardian Break) task, which
+      # reads the tool logs and fails when a finding meets or exceeds a minimum severity threshold.
+      # See https://aka.ms/gdn-azdo-break.
+      #
+      # Guardian normalises every finding to Error, Warning or Note.  The threshold is cumulative,
+      # so a lower name is STRICTER, not looser:
+      #
+      #   Error    break on Error                     <-- Guardian's default
+      #   Warning  break on Error + Warning
+      #   Note     break on Error + Warning + Note
+      #
+      # Two knobs control it, in increasing order of precedence:
+      #
+      #   globalSdl.severity           threshold for every tool (maps to GdnBreakPolicyMinSev)
+      #   globalSdl.<tool>.severity    per-tool override of the global threshold
+      #   ob_sdl_<tool>_severity       per-job variable; overrides both of the above
+      #
+      # We omit `severity` everywhere and keep the Error-only default.  OneBranch accepts ONLY
+      # Error, Warning or Note at this layer -- there is no explicit "Default" value to write, so
+      # inheriting the default requires omitting the key.  Consequently, spelling out
+      # `severity: Error` on a tool is NOT equivalent to omitting it: it pins that tool to Error
+      # even if globalSdl.severity is later tightened.
+      #
+      # https://eng.ms/docs/products/onebranch/securitycompliancegovernanceandpolicies/sdlforcontainerizedworkflows/customizesdlforcontainerbuilds
+
       # Snapshot of the SDL analyzer findings that pre-existed the breakOnSdlError rollout, so
       # builds only break on NEW findings.  Generated from the SDL analysis artifacts of a full
       # non-official run and kept under .config/ alongside the other SDL tool configs
@@ -212,7 +261,13 @@ extends:
         break: ${{ parameters.breakOnSdlError }}
 
       roslyn:
-        # Note, requires RoslynAnalyzers task to be added as a separate step
+        # Enabling Roslyn SDL analysis here requires that our .NET builds _produce_ Roslyn findings.
+        # You will see this in the separate Roslyn build task.
+        #
+        # Note that the Roslyn-specific Guardian collector/sanitizer requires SARIF v1, so our
+        # analysis build deliberately emits v1. Other, generic Guardian tooling expects SARIF v2 and
+        # may log processing errors (for example, Post Analysis's SDL artifact report) even though
+        # Roslyn collection and Guardian policy ingestion succeed.
         enabled: true
         break: ${{ parameters.breakOnSdlError }}
 
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
index 9e640b00df..9f58773174 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
@@ -4,13 +4,111 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# This template defines a step to run Roslyn Analyzers on the SqlClient build. It uses the
-# RoslynAnalyzers@3 task from the Secure Development Team's SDL extension:
+# This template runs Roslyn Analyzers (SDL) against a build.proj target using the RoslynAnalyzers@3
+# task from the Secure Development Team's SDL extension, in "Copy Logs Only" mode:
 #
 # https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-mohanb/security-integration/guardian-wiki/sdl-azdo-extension/roslyn-analyzers-build-task
 #
-# GOTCHA: This step will clobber any existing build output. It should be run _before_ any build
-# steps that perform versioning or signing.
+# PROVENANCE: Every statement in this file about how the RoslynAnalyzers task behaves is current as
+#   of task version v3 (RoslynAnalyzers@3, 3.289.0) and was verified against concrete evidence -- the
+#   actual pipeline run logs, the task definition (task.json / inputMap.json), the gdn-task-lib task
+#   source, and the Guardian RoslynAnalyzers CLI binaries (Microsoft.Guardian.RoslynAnalyzers*.dll).
+#   Re-verify these claims if the task's major version changes.
+#
+# HOW IT WORKS (integrated analyzers + Copy Logs Only):
+#   .NET [Roslyn] security analyzers are compiler-integrated: they only run as part of the actual
+#   csc/vbc compilation. build.proj is an orchestrator -- each package's real compile happens in a
+#   separate "dotnet build <project>.csproj" that build.proj launches with an <Exec> task. That is
+#   the crux: anything the RoslynAnalyzers task appends to an *outer* "dotnet build build.proj"
+#   command (its auto/manual "re-run the build" modes) is an MSBuild global property, and global
+#   properties do NOT cross an <Exec> into a child "dotnet build" process. So an injected analyzer
+#   would only ever see build.proj (which compiles nothing) and never the real projects, producing
+#   zero results. That is exactly why earlier auto/manual-mode attempts collected 0 SARIF logs.
+#
+#   Instead we use the task's documented "Copy Logs Only" alternative -- integrate the analyzers into
+#   the build itself, then have the task only collect the results:
+#     1. This step runs its own isolated "dotnet build build.proj -t:Build<Package>" with
+#        EnableAnalyzers=true. build.proj forwards that flag into every leaf "dotnet build" it execs
+#        (via EnableAnalyzersArgument), and src/Directory.Build.props -- which every product project
+#        imports -- reacts by enabling the full analyzer set and setting ErrorLog to a per-project
+#        "*.csproj.<guid>.sarif" log. src/Directory.Build.targets verifies that each leaf compile
+#        produced its configured log. Because the analyzers and verification are enabled on the leaf
+#        projects themselves, they run inside the real compiles regardless of the <Exec> boundary.
+#     2. The RoslynAnalyzers@3 task then runs in Copy Logs Only mode (copyLogsOnly: true) and simply
+#        collects and sanitizes those *.csproj.*.sarif and *.vbproj.*.sarif logs from
+#        logRootDirectory for SDL/Guardian compliance. It performs no build and no compiler re-run,
+#        so none of the msBuildVersion /
+#        msBuildArchitecture / Visual-Studio-setup concerns apply -- the task never needs MSBuild,
+#        so it is inherently agnostic to the container's VS/MSBuild version (e.g. MSBuild 18 on the
+#        ltsc2025/vse2026 image).
+#
+#   EnableAnalyzers and IsolatedBuildPath are independent build.proj properties. We set both here:
+#   EnableAnalyzers turns analysis on; IsolatedBuildPath keeps this analysis build from disturbing
+#   real build output (see ISOLATION).
+#
+# WHAT THE TASK ITSELF INJECTS (v3), AND HOW THIS TEMPLATE COVERS IT:
+#   In its build-driving modes the task appends five MSBuild properties to the compile command and
+#   injects the analyzers via user-profile ImportBefore/ImportAfter files. This template enables the
+#   analyzers on the leaf projects instead, reproducing the effects that matter. Item by item:
+#
+#   | Task injection (v3)                    | Purpose                             | How this template covers it                       |
+#   |----------------------------------------|-------------------------------------|---------------------------------------------------|
+#   | /p:Features=                           | Turns on Roslyn IOperation +        | latest-recommended: SDK 18 Roslyn has IOperation  |
+#   |   "IOperation,flow-analysis"           | dataflow so the taint/crypto        | on by default, so these rules run. Add            |
+#   |                                        | security rules (CA3xxx/CA5xxx) run. | <Features>flow-analysis</Features> to             |
+#   |                                        |                                     | Directory.Build.props if any go missing.          |
+#   | /p:CodeAnalysisRuleSet=                | Selects the exact SDL rule IDs +    | AnalysisLevel=latest-recommended. This is the     |
+#   |   ...Sdl.Recommended.Warning.ruleset   | severities; disables non-SDL rules. | SDK's own "recommended" mode, NOT the private SDL |
+#   |                                        |                                     | ruleset, so complete overlap is not guaranteed;   |
+#   |                                        |                                     | see the CAVEAT in Directory.Build.props. The      |
+#   |                                        |                                     | internal IA* rules need the                       |
+#   |                                        |                                     | Microsoft.Internal.Analyzers package, which is    |
+#   |                                        |                                     | Microsoft-internal-only and MUST NOT be added to  |
+#   |                                        |                                     | the public governed feed, so they are not         |
+#   |                                        |                                     | reproduced here. See NOTE ON THE INTERNAL IA*     |
+#   |                                        |                                     | RULES below.                                      |
+#   | /p:TreatWarningsAsErrors=false         | Record every diagnostic instead of  | <TreatWarningsAsErrors>false</...> in the         |
+#   |                                        | failing at the first one.           | EnableAnalyzers block of Directory.Build.props.   |
+#   |                                        |                                     | Warning-clean compilation is still enforced by    |
+#   |                                        |                                     | the ordinary build later in each job, which does  |
+#   |                                        |                                     | run with TreatWarningsAsErrors=true.              |
+#   | /p:RunCodeAnalysis=false               | Disables legacy *binary* FxCop      | Already false by default in SDK-style projects;   |
+#   |                                        | (not the Roslyn analyzers).         | we never enable it.                               |
+#   | /p:GdnRoslynAnalyzersRunId=<guid>      | Gates the injected props/targets so | Not needed. We enable analyzers directly on the   |
+#   |                                        | they apply only to this build.      | leaf projects, so there is no global injection to |
+#   |                                        |                                     | gate (see the note below).                        |
+#   | ImportBefore *.props / ImportAfter     | Adds the analyzer assemblies and    | Analyzers: EnableNETAnalyzers +                   |
+#   |   *.targets under %LOCALAPPDATA%\...\  | sets ErrorLog=<per-project>.sarif.  | latest-recommended (no EnforceCodeStyleInBuild).  |
+#   |   MSBuild\Current                      |                                     | ErrorLog: we set                                  |
+#   |                                        |                                     | <ErrorLog>$(MSBuildProjectFullPath)....sarif</>   |
+#   |                                        |                                     | (SARIF v1 -- NO version=2; see the sanitizer      |
+#   |                                        |                                     | note in Directory.Build.props).                   |
+#
+#   WHY THE TASK'S OWN INJECTION YIELDS 0 SARIF THROUGH build.proj: the ImportAfter *.targets live in
+#   the user profile, so they ARE imported by build.proj's inner "dotnet build <csproj>" execs -- but
+#   they self-gate on $(GdnRoslynAnalyzersRunId), and that property (like CodeAnalysisRuleSet and
+#   Features) is passed only on the OUTER "dotnet build build.proj" command and does not cross the
+#   <Exec> into the child compiles. So the injected targets no-op in the real compiles. Enabling the
+#   analyzers on the leaf projects (EnableAnalyzers) removes that gate entirely.
+#
+# NOTE ON THE INTERNAL IA* RULES:
+#   The SDL-recommended ruleset also contains internal IA* ("Internal Analyzers") rules that ship in
+#   the Microsoft.Internal.Analyzers package. That package is Microsoft-internal and confidential: it
+#   is NOT on nuget.org, and it MUST NOT be added to this repo's governed feed
+#   (sqlclientdrivers.pkgs.visualstudio.com/public/...), which is PUBLIC-scoped -- doing so would
+#   leak internal tooling and breach its internal-use license. So the leaf-project analysis above
+#   (AnalysisLevel=latest-recommended) covers the CA* rules but NOT the IA* rules.
+#
+#   The IA* rules can only be run from the PRIVATE ADO.Net project pipelines, where a Microsoft-
+#   internal NuGet feed is reachable. NuGet.analysis.config adds that feed using an environment-
+#   variable placeholder and maps Microsoft.Internal.* exclusively to it. Only these analysis builds
+#   select that config, allowing Microsoft.Internal.Analyzers to be restored and used without
+#   changing the normal NuGet.config.
+#
+# ISOLATION:
+#   This template is self-contained and safe to run at any point in a job -- before or after a real
+#   build -- because the analysis build writes its binaries to a separate location and never touches
+#   the real build output, using the IsolatedBuildPath build.proj property.
 
 parameters:
   # Optional arguments to pass to msbuild to indicate what version of dependencies should be used.
@@ -31,41 +129,70 @@ parameters:
       - SqlClient
       - SqlServer
 
+  # The three parameters below mirror build-buildproj-step.yml so the analysis build resolves the
+  # same package versions as the real build.
+  #
   # Version revision translated to build.proj's BuildNumber property at this boundary.
   - name: revision
     type: string
 
   #  Suffix appended to "PackageVersion" to form the build.proj msbuild property that stamps this
-  #  package's version.  build.proj recognizes only two such properties: PackageVersionSqlClient
-  #  (shared by the entire SqlClient family: Logging, Abstractions, SqlClient, Azure, and the AKV
-  #  Provider) and PackageVersionSqlServer (Microsoft.SqlServer.Server).  Provided by the caller.
-  #  Examples:  'SqlClient' -> -p:PackageVersionSqlClient=7.1.0-preview3
-  #             'SqlServer' -> -p:PackageVersionSqlServer=1.0.0
+  #  package's version.  See build-buildproj-step.yml for the full explanation.
   - name: versionPropertySuffix
     type: string
 
   #  Version to stamp on the package.  Combined with versionPropertySuffix to form the msbuild
   #  argument, e.g. -p:PackageVersionSqlClient=7.1.0-preview3.
-  #  Always required — compute up-front via the compute-versions stage.
   - name: packageVersion
     type: string
 
 steps:
-  # GOTCHA: If there are any blank lines in msbuildCommandLine, it will consider it "multiple
-  #         arguments" and fail. So, don't split msBuildCommandLine into multiple blocks.
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
-    displayName: 'Roslyn Analyzers - build.proj Build${{ parameters.packageShortName }}'
+  # Step 1: Authenticate to the internal Azure Artifacts feed so the leaf restores can pull
+  # Microsoft.Internal.Analyzers. NuGetAuthenticate sets up the Azure Artifacts credential provider
+  # for feeds the build identity can access in this organization.
+  - task: NuGetAuthenticate@1
+    displayName: 'Internal analyzers: authenticate internal feed'
+
+  # Step 2: Isolated analysis build. Compiles the package with EnableAnalyzers=true so that every leaf
+  # "dotnet build" that build.proj execs turns on the full Roslyn analyzer set and verifies its SARIF.
+  - task: DotNetCoreCLI@2
+    displayName: 'Build for Roslyn analysis - build.proj Build${{ parameters.packageShortName }}'
     inputs:
-      msBuildArchitecture: x64
-      msBuildCommandLine: >-
-        msbuild
-        $(REPO_ROOT)/build.proj
+      command: build
+      projects: '$(REPO_ROOT)/build.proj'
+      arguments: >-
         -t:Build${{ parameters.packageShortName }}
         -p:Configuration=Release
         -p:ReferenceType=Package
         -p:SkipDependencyPack=true
-        -p:BuildNumber=${{ parameters.revision }}
-        -p:PackageVersion${{ parameters.versionPropertySuffix }}=${{ parameters.packageVersion }}
+        -p:BuildNumber="${{ parameters.revision }}"
+        -p:PackageVersion${{ parameters.versionPropertySuffix }}="${{ parameters.packageVersion }}"
+        -p:IsolatedBuildPath="$(Agent.TempDirectory)/roslyn"
+        -p:EnableAnalyzers=true
+        -p:InternalAnalyzers=true
+        -p:InternalAnalyzersNugetConfig="$(REPO_ROOT)/NuGet.analysis.config"
+        -p:InternalAnalyzersVersion=$(InternalAnalyzersVersion)
         ${{ parameters.dependencyArguments }}
-      msBuildVersion: 17.0
-      setupCommandLinePicker: vs2022
+    env:
+      # dotnet restore expands this environment variable into the NuGet feed URL for
+      # Microsoft.Internal.Analyzers.
+      INTERNAL_ANALYZERS_FEED: $(InternalAnalyzersFeed)
+
+  # Step 3: List every SARIF file that the collector will ingest.
+  - pwsh: |
+      $sarifFiles = @(Get-ChildItem -Path '$(REPO_ROOT)' -Recurse -File -Include '*.csproj.*.sarif', '*.vbproj.*.sarif' | Sort-Object FullName)
+      Write-Host "Roslyn collector will ingest $($sarifFiles.Count) SARIF file(s):"
+      $sarifFiles | ForEach-Object { Write-Host "  $($_.FullName)" }
+    displayName: 'List Roslyn SARIF files for collection'
+
+  # Step 4: Collect the analysis results. In Copy Logs Only mode the task does not build or re-run
+  # the compiler -- it just gathers and sanitizes the *.csproj.*.sarif and *.vbproj.*.sarif logs
+  # produced by Step 2 and hands them to Guardian/SDL.
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
+    displayName: 'Roslyn Analyzers (collect) - build.proj Build${{ parameters.packageShortName }}'
+    inputs:
+      copyLogsOnly: true
+      # Root to search for the *.csproj.*.sarif and *.vbproj.*.sarif logs. The analysis build wrote
+      # them next to each project under the repo checkout; the collector globs this directory
+      # recursively.
+      logRootDirectory: '$(REPO_ROOT)'
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index fb671961cc..f4ae94431c 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -32,6 +32,15 @@ variables:
   # SymbolsUploadAccount
   - group: 'symbols-variables-v3'
 
+  # These variables point the SDL Roslyn analysis step at the internal Microsoft.Internal.Analyzers
+  # package (the "IA*" rules). The package is Microsoft-internal and confidential, so the feed URL
+  # and pinned version live in this ADO.Net-project variable group rather than in the repo. Consumed
+  # by eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml.
+  #
+  # InternalAnalyzersFeed
+  # InternalAnalyzersVersion
+  - group: 'internal-analyzers-variables-v1'
+
   # Well-Known Variables ###################################################
 
   # Directory where downloaded pipeline artifacts (NuGet packages from earlier
@@ -60,10 +69,12 @@ variables:
     value: '6.10'
 
   # OneBranch supplies a variety of container images we must use for our jobs.
+  #
+  # https://eng.ms/docs/products/onebranch/infrastructureandimages/containerimages/containerimages
 
   # Windows jobs use this image.
   - name: WindowsContainerImage
-    value: onebranch.azurecr.io/windows/ltsc2022/vse2022:latest
+    value: onebranch.azurecr.io/windows/ltsc2025/vse2026:latest
 
   # Linux jobs use this image.
   - name: LinuxContainerImage
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 2c4b54b5d0..857bc1b65c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -32,6 +32,71 @@
     <!-- <WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors> -->
   </PropertyGroup>
 
+  <!-- Roslyn Analysis ========================================================================= -->
+  <!--
+    When EnableAnalyzers is set, run as many Roslyn analyzers as possible and emit a per-project
+    SARIF v1 log. Official builds will process these logs via the RoslynAnalyzers task in "Copy Logs
+    Only" mode.
+  -->
+  <PropertyGroup Condition="'$(EnableAnalyzers)' == 'true'">
+    <RunAnalyzers>true</RunAnalyzers>
+    <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <!--
+      Run the SDK's "recommended" rule set at the latest level.
+
+      CAVEAT: this is the SDK's own AnalysisMode named "recommended"; it is NOT the same rule set as
+      Guardian's private Sdl.Recommended.Warning.ruleset, and the two are not guaranteed to overlap
+      completely. The alternative, latest-all, is a strict superset of the SDL rule set and so cannot
+      under-report, but it also enables a large volume of rules with no SDL value. We accept the
+      narrower set here to keep the findings actionable. If an SDL-required CA3xxx/CA5xxx rule is
+      ever found missing from the collected SARIF, either raise this to latest-all or acquire a copy
+      of Sdl.Recommended.Warning.ruleset and point CodeAnalysisRuleSet at it.
+    -->
+    <AnalysisLevel>latest-recommended</AnalysisLevel>
+    <!--
+      IDE code-style (IDExxxx) rules ship in the SDK and are configured by our .editorconfig files.
+      They carry no SDL value and add substantial volume to the SARIF logs, so we leave them off.
+      Set this to true locally when you specifically want a code-style pass.
+    -->
+    <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
+    <!--
+      Emit one uniquely-named SARIF log per project for the RoslynAnalyzers "Copy Logs Only"
+      collector.   It globs *.csproj.*.sarif, and $(MSBuildProjectFullPath) ends in .csproj, so
+      "$(MSBuildProjectFullPath).<guid>.sarif" matches; the GUID avoids collisions across the
+      multiple target frameworks a single project builds.
+
+      IMPORTANT: Do NOT append ",version=2". The Guardian Roslyn sanitizer deserializes each log as
+      SARIF v1.
+    -->
+    <ErrorLog>$(MSBuildProjectFullPath).$([System.Guid]::NewGuid().ToString()).sarif</ErrorLog>
+    <!--
+      Disable promoting Warnings to Errors, which would cause the analysis build to fail on any
+      Roslyn findings, and possibly inhibit full analysis.  This is how the Guardian RoslynAnalyzers
+      task behaves, so we aren't introducing any new risk.
+
+      This has no effect on normal builds, which still use TreatWarningsAsErrors=true as set above.
+      Genuine compiler errors still fail the build.
+    -->
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <!-- Internal Analysis (IA* rules) - private ADO.Net pipelines only ========================== -->
+  <!--
+    When InternalAnalyzers is set (by the private ADO.Net pipeline), additionally reference the
+    Microsoft.Internal.Analyzers package so the internal "IA*" rules run inside the analysis pass
+    and contribute to the per-project SARIF log.
+
+    This is deliberately gated on EnableAnalyzers as well as InternalAnalyzers, so it only takes
+    effect as part of the analysis pass above.
+
+    PrivateAssets="all" keeps it a build-only analyzer that never flows into the shipped NuGet
+    package's dependency graph.
+  -->
+  <ItemGroup Condition="'$(EnableAnalyzers)' == 'true' AND '$(InternalAnalyzers)' == 'true'">
+    <PackageReference Include="Microsoft.Internal.Analyzers" PrivateAssets="all" IncludeAssets="analyzers" />
+  </ItemGroup>
+
   <!-- Versioning ====================================================== -->
   <!--
     Versions for packages are assigned in the project's Versions.props file. Below, we provide
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
new file mode 100644
index 0000000000..553de3ef2c
--- /dev/null
+++ b/src/Directory.Build.targets
@@ -0,0 +1,21 @@
+<!--
+  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this
+  file to you under the MIT license.
+-->
+<Project>
+  <!--
+    Confirm that, when analysis is enabled, the build produced the SARIF file(s) that we expect.
+    Each src/ project that is built should produce a SARIF log whose path is specified by the
+    ErrorLog property defined in src/Directory.Build.props.  We perform this check here, rather
+    than post-build, because the build.proj targets may build multiple projects, and the SARIF paths
+    are difficult to predict.
+  -->
+  <Target Name="VerifyRoslynAnalysisLog"
+          AfterTargets="CoreCompile"
+          Condition="'$(EnableAnalyzers)' == 'true'">
+    <Error Condition="'$(ErrorLog)' == ''"
+           Text="Roslyn analysis did not configure an ErrorLog for $(MSBuildProjectFullPath)." />
+    <Error Condition="'$(ErrorLog)' != '' AND !Exists('$(ErrorLog)')"
+           Text="Roslyn analysis did not produce the expected SARIF log: $(ErrorLog)" />
+  </Target>
+</Project>
diff --git a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
index a9474613e6..62a4ef14e0 100644
--- a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
@@ -88,12 +88,14 @@
 
   <!-- Build Output ==================================================== -->
   <PropertyGroup>
+    <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
+
     <!--
       MSBuild will add the target framework to the end of this path by default. Telling it not to
       is possible but also requires specifying the IntermediateOutputPath. So while it would be
       nice to have a flatter directory structure, it's more hassle than its worth.
     -->
-    <OutputPath>$(RepoRoot)artifacts/$(AssemblyName).notsupported/$(ReferenceType)-$(Configuration)/</OutputPath>
+    <OutputPath>$(ArtifactPath)$(AssemblyName).notsupported/$(ReferenceType)-$(Configuration)/</OutputPath>
   </PropertyGroup>
 
   <!-- References ====================================================== -->
@@ -105,7 +107,7 @@
   -->
   <PropertyGroup>
     <RefProjectPath>$(RepoRoot)src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj</RefProjectPath>
-    <RefArtifactPath>$(RepoRoot)artifacts/Microsoft.Data.SqlClient.ref/$(ReferenceType)-$(Configuration)/$(TargetFramework)/Microsoft.Data.SqlClient.dll</RefArtifactPath>
+    <RefArtifactPath>$(ArtifactPath)Microsoft.Data.SqlClient.ref/$(ReferenceType)-$(Configuration)/$(TargetFramework)/Microsoft.Data.SqlClient.dll</RefArtifactPath>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(RefProjectPath)"
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
index cd68ab9016..97b98c8425 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
@@ -3,7 +3,6 @@
     <RootNamespace>Microsoft.SqlServer.TDS.EndPoint</RootNamespace>
     <AssemblyName>Microsoft.SqlServer.TDS.EndPoint</AssemblyName>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
   </PropertyGroup>
 
   <!-- Sign when a test key is provided so signed test assemblies can reference this. -->
diff --git a/tools/PackageCompatibility/NuGet.config b/tools/PackageCompatibility/NuGet.config
index 1c814bbc3c..0d35132d82 100644
--- a/tools/PackageCompatibility/NuGet.config
+++ b/tools/PackageCompatibility/NuGet.config
@@ -10,4 +10,39 @@
     -->
     <add key="local" value="packages/" />
   </packageSources>
+
+  <!--
+    DO NOT DELETE THIS SECTION.  The <clear /> in <packageSources> above only discards inherited
+    SOURCES; package source mappings are merged from ancestor NuGet.config files independently.  The
+    repo root config maps "*" to its "governed" source, which this project clears away, so without
+    the <clear /> below every restore here would find zero eligible sources and fail with NU1100 /
+    NU1101.  Verify with "dotnet nuget config get all" from this directory.
+  -->
+  <packageSourceMapping>
+    <clear />
+    <!--
+      NuGet uses the most specific matching pattern to decide which sources are eligible.  Because
+      local uses exact package IDs, nuget.org must repeat them; otherwise those packages could only
+      restore from local and would not fall back to nuget.org when no local artifact is available.
+      The "*" pattern makes nuget.org eligible for every other dependency.
+    -->
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+      <package pattern="Microsoft.Data.SqlClient" />
+      <package pattern="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Abstractions" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Azure" />
+      <package pattern="Microsoft.Data.SqlClient.Internal.Logging" />
+      <package pattern="Microsoft.SqlServer.Server" />
+    </packageSource>
+    <!-- Only packages produced by this repository may be restored from the local feed. -->
+    <packageSource key="local">
+      <package pattern="Microsoft.Data.SqlClient" />
+      <package pattern="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Abstractions" />
+      <package pattern="Microsoft.Data.SqlClient.Extensions.Azure" />
+      <package pattern="Microsoft.Data.SqlClient.Internal.Logging" />
+      <package pattern="Microsoft.SqlServer.Server" />
+    </packageSource>
+  </packageSourceMapping>
 </configuration>

From 92eb8b46b0e70251b3af0c6af3a19a411521dd64 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Fri, 4 Sep 2026 12:21:38 -0700
Subject: [PATCH 269/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4645)

Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com>
---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx | 7 ++-----
 src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx | 7 ++-----
 src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx | 7 ++-----
 src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx | 7 ++-----
 src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx | 7 ++-----
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx | 7 ++-----
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx | 7 ++-----
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx | 7 ++-----
 .../src/Resources/Strings.pt-BR.resx                       | 7 ++-----
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx | 7 ++-----
 src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx | 7 ++-----
 .../src/Resources/Strings.zh-Hans.resx                     | 7 ++-----
 .../src/Resources/Strings.zh-Hant.resx                     | 7 ++-----
 13 files changed, 26 insertions(+), 65 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index f85eda7d30..d333b05fd5 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Pokud je klíčové slovo Integrated Security připojovacího řetězce nastavené na hodnotu true nebo SSPI, nejde nastavit vlastnost AccessTokenCallback.</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Vlastnost AccessToken nebo AccessTokenCallback nelze nastavit, pokud je nastavená vlastnost SspiContextProvider.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Vlastnost SspiContextProvider nelze nastavit, pokud je nastavená vlastnost AccessToken nebo AccessTokenCallback.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Pokud je v připojovacím řetězci nastavená možnost Authentication=Active Directory Default, nejde nastavit vlastnost AccessTokenCallback.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index 7dcd133277..36003faa0f 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>AccessTokenCallback-Eigenschaft kann nicht festgelegt werden, wenn das Schlüsselwort für Verbindungszeichenfolgen 'Integrated Security' auf 'true' oder 'SSPI' gesetzt wurde.</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Die Eigenschaft AccessToken oder AccessTokenCallback kann nicht festgelegt werden, wenn die Eigenschaft SspiContextProvider bereits festgelegt wurde.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Die Eigenschaft SspiContextProvider kann nicht festgelegt werden, wenn die Eigenschaft AccessToken oder AccessTokenCallback bereits festgelegt wurde.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Die Eigenschaft AccessTokenCallback kann nicht festgelegt werden, wenn in der Verbindungszeichenfolge "Authentication=Active Directory Default" angegeben wurde.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index 3471a75894..f24a37eff9 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>No se puede establecer la propiedad AccessTokenCallback si la palabra clave de cadena de conexión "Integrated Security" se ha establecido en "true" o "SSPI".</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>No se puede establecer la propiedad AccessToken o AccessTokenCallback si ya se ha establecido la propiedad SspiContextProvider.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>No se puede establecer la propiedad SspiContextProvider si ya se ha establecido la propiedad AccessToken o AccessTokenCallback.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>No se puede establecer la propiedad AccessTokenCallback si se ha especificado 'Authentication=Active Directory Default' en la cadena de conexión.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index d73673efbb..32a65bfc0d 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Impossible de définir la propriété AccessTokenCallback si le mot clé de chaîne de connexion « Sécurité intégrée » a été défini sur « true » ou « SSPI ».</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Nous ne pouvons pas définir la propriété AccessToken ou AccessTokenCallback si la propriété SspiContextProvider a déjà été définie.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Nous ne pouvons pas définir la propriété SspiContextProvider si la propriété AccessToken ou AccessTokenCallback a déjà été définie.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Impossible de définir la propriété AccessTokenCallback si 'Authentication=Active Directory Default' a été spécifié dans la chaîne de connexion.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 1e2e6764d5..4109e2f808 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Non è possibile impostare la proprietà AccessTokenCallback se la parola chiave della stringa di connessione 'Integrated Security' è stata impostata su 'true' o 'SSPI'.</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Non è possibile impostare la proprietà AccessToken o AccessTokenCallback se la proprietà SspiContextProvider è già stata impostata.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Non è possibile impostare la proprietà SspiContextProvider se la proprietà AccessToken o AccessTokenCallback è già stata impostata.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Impossibile impostare la proprietà AccessTokenCallback se nella stringa di connessione è stato specificato 'Authentication=Active Directory Default'.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index 6e762be388..b0ff96812b 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>'Integrated Security' 接続文字列キーワードが 'true' または 'SSPI' に設定されている場合、AccessTokenCallback プロパティを設定できません。</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>SspiContextProvider プロパティが設定されている場合は、AccessToken または AccessTokenCallback プロパティを設定できません。</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>AccessToken または AccessTokenCallback プロパティが設定されている場合は、SspiContextProvider プロパティを設定できません。</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>接続文字列に 'Authentication=Active Directory Default' が指定されている場合、AccessTokenCallback プロパティを設定できません。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index ccca396df1..62433d0ea0 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>'Integrated Security' 연결 문자열 키워드가 'true' 또는 'SSPI'로 설정된 경우 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>SspiContextProvider 속성이 설정된 경우 AccessToken 또는 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>AccessToken 또는 AccessTokenCallback 속성이 설정된 경우 SspiContextProvider 속성을 설정할 수 없습니다.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>연결 문자열에 'Authentication=Active Directory Default'가 지정된 경우 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index 9a2f4e6f96..c410e654a0 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Nie można ustawić właściwości AccessTokenCallback, jeśli słowo kluczowe parametrów połączenia „Integrated Security” ma wartość „true” lub „SSPI”.</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Nie można ustawić właściwości AccessToken lub AccessTokenCallback, jeśli ustawiono właściwość SspiContextProvider.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Nie można ustawić właściwości SspiContextProvider, jeśli ustawiono właściwość AccessToken lub AccessTokenCallback.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Nie można ustawić właściwości AccessTokenCallback, jeśli w parametrach połączenia określono wartość „Authentication=Active Directory Default”.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 2e7593f6fd..31d3ffc029 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Não é possível definir a propriedade AccessTokenCallback se a palavra-chave da cadeia de conexão 'Integrated Security' tiver sido definida como 'true' ou 'SSPI'.</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Não é possível definir a propriedade AccessToken ou AccessTokenCallback se a propriedade SspiContextProvider já tiver sido definida.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Não é possível definir a propriedade SspiContextProvider se a propriedade AccessToken ou AccessTokenCallback já tiver sido definida.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Não é possível definir a propriedade AccessTokenCallback se 'Authentication=Active Directory Default' tiver sido especificado na cadeia de conexão.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index 17f0d5ba7e..d5d4039980 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>Если ключевому слову строки подключения "Integrated Security" задано значение "true" или "SSPI", свойство "AccessTokenCallback" задать не удастся.</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>Если задано свойство SspiContextProvider, свойства AccessToken или AccessTokenCallback настроить невозможно.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>Если заданы свойства AccessToken или AccessTokenCallback, свойство SspiContextProvider настроить невозможно.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Если в строке подключения указан параметр "Authentication=Active Directory Default", свойство AccessTokenCallback задать не удастся.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index f874f78401..c62b087f11 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>'Integrated Security' bağlantı dizesi anahtar sözcüğü 'true' veya 'SSPI' olarak ayarlanmışsa AccessTokenCallback özelliği ayarlanamaz.</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>AccessToken veya AccessTokenCallback özelliği, SspiContextProvider özelliği ayarlanmışsa ayarlanamaz.</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>SspiContextProvider özelliği, AccessToken veya AccessTokenCallback özelliği ayarlanmışsa ayarlanamaz.</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Bağlantı dizesinde 'Authentication=Active Directory Default' belirtilmişse AccessTokenCallback özelliği ayarlanamaz.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 5a5ebe15a6..69ab4523bc 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>如果 "Integrated Security" 连接字符串关键字设置为 "true" 或 "SSPI"，则无法设置 AccessTokenCallback 属性。</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>如果已设置 SspiContextProvider 属性，则无法设置 AccessToken 或 AccessTokenCallback 属性。</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>如果已设置 AccessToken 或 AccessTokenCallback 属性，则无法设置 SspiContextProvider 属性。</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>如果在连接字符串中指定了 "Authentication=Active Directory Default"，则无法设置 AccessTokenCallback 属性。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index 9b0d8fd673..a5fc02dd7b 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -2082,11 +2082,8 @@
   <data name="ADP_InvalidMixedUsageOfAccessTokenCallbackAndIntegratedSecurity" xml:space="preserve">
     <value>如果 'Integrated Security' 連接字串關鍵字已設定為 'true' 或 'SSPI'，就不能設定 AccessTokenCallback 屬性。</value>
   </data>
-  <data name="ADP_InvalidMixedUsageOfAccessTokenAndSspiContextProvider" xml:space="preserve">
-    <value>如果已設定 SspiContextProvider 屬性，就不能設定 AccessToken 或 AccessTokenCallback 屬性。</value>
-  </data>
-  <data name="ADP_InvalidMixedUsageOfSspiContextProviderAndAccessToken" xml:space="preserve">
-    <value>如果已設定 AccessToken 或 AccessTokenCallback 屬性，就不能設定 SspiContextProvider 屬性。</value>
+  <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
+    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>如果已在連接字串中指定 'Authentication=Active Directory Default'，就不能設定 AccessTokenCallback 屬性。</value>

From 9eeb13857d0da81f38d675b5a98b3151a83c67d4 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Mon, 7 Sep 2026 19:54:47 +0530
Subject: [PATCH 270/298] Use official name for US English locale (#4646)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml
index ae7dbdd931..6559612464 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml
@@ -505,7 +505,7 @@ The following example creates multiple instances of <xref:Microsoft.Data.SqlClie
           {
               SqlParameter parameter = new SqlParameter("pName", SqlDbType.VarChar);
               parameter.LocaleId = 1033;
-              // English - United States
+              // English (United States)
           }
         </code>
       </remarks>

From dc5f8ff39418d14ff833a3d0e577bc0d2a55652e Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Tue, 8 Sep 2026 21:00:49 +0530
Subject: [PATCH 271/298] Resolve PoliCheck severity 2 findings (#4658)

Replace inaccessible wording in an internal comment and exclude the Northwind SqlDataAdapter snippet where Country is a required schema identifier.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .config/PolicheckExclusions.xml                                 | 2 +-
 .../src/Microsoft/Data/SqlClient/SqlCommand.cs                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.config/PolicheckExclusions.xml b/.config/PolicheckExclusions.xml
index a4269513d1..e1129013ba 100644
--- a/.config/PolicheckExclusions.xml
+++ b/.config/PolicheckExclusions.xml
@@ -1,5 +1,5 @@
 <PoliCheckExclusions>
     <Exclusion Type="FolderPathStart">SRC/MICROSOFT.DATA.SQLCLIENT/TESTS</Exclusion>
     <Exclusion Type="FileType">.YML|.MD|.SQL</Exclusion>
-    <Exclusion Type="FileName">NOTICE.TXT|SQLDATAADAPTER.CS</Exclusion>
+    <Exclusion Type="FileName">NOTICE.TXT|SQLDATAADAPTER.CS|SQLDATAADAPTER.XML</Exclusion>
 </PoliCheckExclusions>
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
index 294310a08f..c90ac4520d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -1306,7 +1306,7 @@ public void ResetCommandTimeout()
         #region Internal Methods
 
         // @TODO: This is only called by SqlCommandBuilder, it should live there. EXCEPT for the one call to ValidateCommand and setting _parameters at the end. Is that really necessary?
-        // @TODO: This also an crazy long method.
+        // @TODO: This method is also excessively long.
         internal void DeriveParameters()
         {
             switch (CommandType)

From 5a33febcea3ff2ebd0ab53baa080287b57739a35 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Tue, 8 Sep 2026 23:03:00 +0530
Subject: [PATCH 272/298] Test worldwide text encoding round trips (#4662)

Add multilingual Unicode and UTF-8 coverage for parameters, readers, streaming, and bulk copy across sync and async paths.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../BulkCopy/TestBulkCopyWithUTF8.cs          |  41 +++-
 .../GlobalizationEncodingTests.cs             | 217 ++++++++++++++++++
 2 files changed, 246 insertions(+), 12 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/GlobalizationTest/GlobalizationEncodingTests.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs
index 21cf670ae7..daa63c7d03 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TestBulkCopyWithUTF8.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Data;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
 using Xunit;
@@ -17,11 +18,10 @@ namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
     [Trait("Set", "2")]
     public sealed class TestBulkCopyWithUtf8 : IDisposable
     {
-        private static string s_sourceTable = DataTestUtility.GetShortName("SourceTableForUTF8Data");
-        private static string s_destinationTable = DataTestUtility.GetShortName("DestinationTableForUTF8Data");
-        private static string s_testValue = "test";
-        private static byte[] s_testValueInUtf8Bytes = new byte[] { 0x74, 0x65, 0x73, 0x74 };
-        private static readonly string s_insertQuery = $"INSERT INTO {s_sourceTable} VALUES('{s_testValue}')";
+        private static readonly string s_sourceTable = DataTestUtility.GetShortName("SourceTableForUTF8Data");
+        private static readonly string s_destinationTable = DataTestUtility.GetShortName("DestinationTableForUTF8Data");
+        private static readonly string s_testValue = GlobalizationTestData.CreatePacketSpanningText();
+        private static readonly byte[] s_testValueInUtf8Bytes = Encoding.UTF8.GetBytes(s_testValue);
 
         /// <summary>
         /// Constructor: Initializes and populates source and destination tables required for the tests.
@@ -37,7 +37,7 @@ public TestBulkCopyWithUtf8()
 
             using SqlConnection sourceConnection = new SqlConnection(GetConnectionString(true));
             sourceConnection.Open();
-            SetupTables(sourceConnection, s_sourceTable, s_destinationTable, s_insertQuery);
+            SetupTables(sourceConnection, s_sourceTable, s_destinationTable);
         }
 
         /// <summary>
@@ -61,11 +61,14 @@ public void Dispose()
         /// <summary>
         /// Builds a connection string with or without Multiple Active Result Sets (MARS) property.
         /// </summary>
+        /// <param name="enableMars">Whether Multiple Active Result Sets is enabled.</param>
+        /// <returns>A connection string configured with a small packet size for boundary coverage.</returns>
         private string GetConnectionString(bool enableMars)
         {
             return new SqlConnectionStringBuilder(DataTestUtility.TCPConnectionString)
             {
-                MultipleActiveResultSets = enableMars
+                MultipleActiveResultSets = enableMars,
+                PacketSize = 512
             }.ConnectionString;
         }
 
@@ -73,14 +76,18 @@ private string GetConnectionString(bool enableMars)
         /// Creates source and destination tables with a varchar(max) column with a collation setting
         /// that stores the data in UTF8 encoding and inserts the data in the source table.
         /// </summary>
-        private void SetupTables(SqlConnection connection, string sourceTable, string destinationTable, string insertQuery)
+        /// <param name="connection">The open connection used to create and populate the tables.</param>
+        /// <param name="sourceTable">The source table name.</param>
+        /// <param name="destinationTable">The destination table name.</param>
+        private void SetupTables(SqlConnection connection, string sourceTable, string destinationTable)
         {
             string columnDefinition = "(str_col varchar(max) COLLATE Latin1_General_100_CS_AS_KS_WS_SC_UTF8)";
             DataTestUtility.CreateTable(connection, sourceTable, columnDefinition);
             DataTestUtility.CreateTable(connection, destinationTable, columnDefinition);
             using SqlCommand insertCommand = connection.CreateCommand();
-            insertCommand.CommandText = insertQuery;
-            Helpers.TryExecute(insertCommand, insertQuery);
+            insertCommand.CommandText = $"INSERT INTO {sourceTable} VALUES(@value)";
+            insertCommand.Parameters.Add(new SqlParameter("@value", SqlDbType.NVarChar, -1) { Value = s_testValue });
+            insertCommand.ExecuteNonQuery();
         }
 
         /// <summary>
@@ -105,6 +112,11 @@ public void BulkCopy_Utf8Data_ShouldMatchSource(bool isMarsEnabled, bool enableS
             using SqlConnection destinationConnection = new SqlConnection(connectionString);
             destinationConnection.Open();
 
+            using (SqlCommand sourceVerifyCommand = new SqlCommand($"SELECT CAST(str_col AS varbinary(max)) FROM {s_sourceTable}", sourceConnection))
+            {
+                Assert.Equal(s_testValueInUtf8Bytes, sourceVerifyCommand.ExecuteScalar());
+            }
+
             // Read data from source table
             using SqlCommand sourceDataCommand = new SqlCommand($"SELECT str_col FROM {s_sourceTable}", sourceConnection);
             using SqlDataReader reader = sourceDataCommand.ExecuteReader(CommandBehavior.SequentialAccess);
@@ -135,7 +147,7 @@ public void BulkCopy_Utf8Data_ShouldMatchSource(bool isMarsEnabled, bool enableS
             Assert.Equal(1, Convert.ToInt16(countCommand.ExecuteScalar()));
 
             // Read the data from destination table as varbinary to verify the UTF-8 byte sequence
-            using SqlCommand verifyCommand = new SqlCommand($"SELECT cast(str_col as varbinary) FROM {s_destinationTable}", destinationConnection);
+            using SqlCommand verifyCommand = new SqlCommand($"SELECT CAST(str_col AS varbinary(max)) FROM {s_destinationTable}", destinationConnection);
             using SqlDataReader verifyReader = verifyCommand.ExecuteReader(CommandBehavior.SequentialAccess);
 
             // Verify that we have data in the destination table
@@ -170,6 +182,11 @@ public async Task BulkCopy_Utf8Data_ShouldMatchSource_Async(bool isMarsEnabled,
             using SqlConnection destinationConnection = new SqlConnection(connectionString);
             await destinationConnection.OpenAsync();
 
+            using (SqlCommand sourceVerifyCommand = new SqlCommand($"SELECT CAST(str_col AS varbinary(max)) FROM {s_sourceTable}", sourceConnection))
+            {
+                Assert.Equal(s_testValueInUtf8Bytes, await sourceVerifyCommand.ExecuteScalarAsync());
+            }
+
             // Read data from source table
             using SqlCommand sourceDataCommand = new SqlCommand($"SELECT str_col FROM {s_sourceTable}", sourceConnection);
             using SqlDataReader reader = await sourceDataCommand.ExecuteReaderAsync(CommandBehavior.SequentialAccess);
@@ -200,7 +217,7 @@ public async Task BulkCopy_Utf8Data_ShouldMatchSource_Async(bool isMarsEnabled,
             Assert.Equal(1, Convert.ToInt16(await countCommand.ExecuteScalarAsync()));
 
             // Read the data from destination table as varbinary to verify the UTF-8 byte sequence
-            using SqlCommand verifyCommand = new SqlCommand($"SELECT cast(str_col as varbinary) FROM {s_destinationTable}", destinationConnection);
+            using SqlCommand verifyCommand = new SqlCommand($"SELECT CAST(str_col AS varbinary(max)) FROM {s_destinationTable}", destinationConnection);
             using SqlDataReader verifyReader = await verifyCommand.ExecuteReaderAsync(CommandBehavior.SequentialAccess);
 
             // Verify that we have data in the destination table
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/GlobalizationTest/GlobalizationEncodingTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/GlobalizationTest/GlobalizationEncodingTests.cs
new file mode 100644
index 0000000000..f2ba885b1f
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/GlobalizationTest/GlobalizationEncodingTests.cs
@@ -0,0 +1,217 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests
+{
+    /// <summary>
+    /// Provides representative worldwide text for encoding validation tests.
+    /// </summary>
+    internal static class GlobalizationTestData
+    {
+        internal const string RepresentativeText =
+            "Latin: Caf\u00E9 / Cafe\u0301 | " +
+            "Arabic: \u0627\u0644\u0639\u064E\u0631\u064E\u0628\u0650\u064A\u064E\u0651\u0629 | " +
+            "Devanagari: \u0939\u093F\u0928\u094D\u0926\u0940 | " +
+            "Thai: \u0E20\u0E32\u0E29\u0E32\u0E44\u0E17\u0E22 | " +
+            "CJK: \u65E5\u672C\u8A9E \u4E2D\u6587 \uD55C\uAD6D\uC5B4 | " +
+            "Supplementary: \uD83D\uDE00 \uD834\uDD1E | " +
+            "Emoji sequence: \uD83D\uDC69\uD83C\uDFFD\u200D\uD83D\uDCBB";
+
+        /// <summary>
+        /// Repeats the representative text so reads span TDS packets and internal character buffers.
+        /// </summary>
+        internal static string CreatePacketSpanningText()
+        {
+            StringBuilder value = new();
+            for (int i = 0; i < 16; i++)
+            {
+                value.Append(RepresentativeText);
+            }
+
+            return value.ToString();
+        }
+    }
+
+    /// <summary>
+    /// Validates exact worldwide text preservation through parameters, SQL Server storage, and reader APIs.
+    /// </summary>
+    [Trait("Set", "3")]
+    public static class GlobalizationEncodingTests
+    {
+        /// <summary>
+        /// Verifies normal and streamed Unicode parameters round-trip exactly through buffered and sequential
+        /// readers on synchronous and asynchronous paths.
+        /// </summary>
+        /// <param name="useAsync">Whether command and reader operations use asynchronous APIs.</param>
+        /// <param name="streamInput">Whether the input parameter is supplied through a <see cref="StringReader"/>.</param>
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        [InlineData(false, false)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(true, true)]
+        public static async Task UnicodeParameterAndReaderRoundTrip_PreservesWorldwideText(bool useAsync, bool streamInput)
+        {
+            string expected = GlobalizationTestData.CreatePacketSpanningText();
+            SqlConnectionStringBuilder connectionString = new(DataTestUtility.TCPConnectionString)
+            {
+                PacketSize = 512
+            };
+
+            using SqlConnection connection = new(connectionString.ConnectionString);
+            if (useAsync)
+            {
+                await connection.OpenAsync();
+            }
+            else
+            {
+                connection.Open();
+            }
+
+            using Table table = new(connection, nameof(UnicodeParameterAndReaderRoundTrip_PreservesWorldwideText), "(Value nvarchar(max) NOT NULL)");
+            using StringReader inputReader = new(expected);
+            using (SqlCommand insert = new($"INSERT INTO {table.Name} (Value) VALUES (@value)", connection))
+            {
+                insert.Parameters.Add(new SqlParameter("@value", SqlDbType.NVarChar, -1)
+                {
+                    Value = streamInput ? inputReader : expected
+                });
+
+                if (useAsync)
+                {
+                    await insert.ExecuteNonQueryAsync();
+                }
+                else
+                {
+                    insert.ExecuteNonQuery();
+                }
+            }
+
+            string query = $"SELECT Value FROM {table.Name}";
+            string directValue = await ReadDirectValue(connection, query, useAsync);
+            string streamedValue = await ReadStreamedValue(connection, query, useAsync);
+
+            Assert.Equal(expected, directValue);
+            Assert.Equal(expected, streamedValue);
+            Assert.Equal(expected.Length, directValue.Length);
+            Assert.Equal(expected.Length, streamedValue.Length);
+        }
+
+        /// <summary>
+        /// Verifies a UTF-8-collated varchar value returns exact worldwide text and the expected UTF-8 bytes
+        /// on synchronous and asynchronous paths.
+        /// </summary>
+        /// <param name="useAsync">Whether command and reader operations use asynchronous APIs.</param>
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsUTF8Supported))]
+        [InlineData(false)]
+        [InlineData(true)]
+        public static async Task Utf8VarcharRoundTrip_PreservesWorldwideTextAndBytes(bool useAsync)
+        {
+            string expected = GlobalizationTestData.CreatePacketSpanningText();
+            SqlConnectionStringBuilder connectionString = new(DataTestUtility.TCPConnectionString)
+            {
+                PacketSize = 512
+            };
+            using SqlConnection connection = new(connectionString.ConnectionString);
+            if (useAsync)
+            {
+                await connection.OpenAsync();
+            }
+            else
+            {
+                connection.Open();
+            }
+
+            using Table table = new(
+                connection,
+                nameof(Utf8VarcharRoundTrip_PreservesWorldwideTextAndBytes),
+                "(Value varchar(max) COLLATE Latin1_General_100_CS_AS_KS_WS_SC_UTF8 NOT NULL)");
+            using (SqlCommand insert = new($"INSERT INTO {table.Name} (Value) VALUES (@value)", connection))
+            {
+                insert.Parameters.Add(new SqlParameter("@value", SqlDbType.NVarChar, -1) { Value = expected });
+                if (useAsync)
+                {
+                    await insert.ExecuteNonQueryAsync();
+                }
+                else
+                {
+                    insert.ExecuteNonQuery();
+                }
+            }
+
+            using SqlCommand select = new($"SELECT Value, CONVERT(varbinary(max), Value) FROM {table.Name}", connection);
+            using SqlDataReader reader = useAsync
+                ? await select.ExecuteReaderAsync(CommandBehavior.SequentialAccess)
+                : select.ExecuteReader(CommandBehavior.SequentialAccess);
+            bool hasRow = useAsync ? await reader.ReadAsync() : reader.Read();
+
+            Assert.True(hasRow);
+            Assert.Equal(expected, reader.GetString(0));
+            Assert.Equal(Encoding.UTF8.GetBytes(expected), reader.GetFieldValue<byte[]>(1));
+            Assert.False(useAsync ? await reader.ReadAsync() : reader.Read());
+        }
+
+        /// <summary>
+        /// Reads a string through the standard buffered reader path.
+        /// </summary>
+        /// <param name="connection">The open SQL connection used to execute the query.</param>
+        /// <param name="query">The query that returns one string value.</param>
+        /// <param name="useAsync">Whether command and reader operations use asynchronous APIs.</param>
+        /// <returns>The string returned by SQL Server.</returns>
+        private static async Task<string> ReadDirectValue(SqlConnection connection, string query, bool useAsync)
+        {
+            using SqlCommand command = new(query, connection);
+            using SqlDataReader reader = useAsync
+                ? await command.ExecuteReaderAsync()
+                : command.ExecuteReader();
+            bool hasRow = useAsync ? await reader.ReadAsync() : reader.Read();
+
+            Assert.True(hasRow);
+            string result = reader.GetString(0);
+            Assert.False(useAsync ? await reader.ReadAsync() : reader.Read());
+            return result;
+        }
+
+        /// <summary>
+        /// Reads a string through sequential <see cref="TextReader"/> calls with a small buffer so character
+        /// sequences cross read boundaries.
+        /// </summary>
+        /// <param name="connection">The open SQL connection used to execute the query.</param>
+        /// <param name="query">The query that returns one string value.</param>
+        /// <param name="useAsync">Whether command and reader operations use asynchronous APIs.</param>
+        /// <returns>The string returned by SQL Server.</returns>
+        private static async Task<string> ReadStreamedValue(SqlConnection connection, string query, bool useAsync)
+        {
+            using SqlCommand command = new(query, connection);
+            using SqlDataReader reader = useAsync
+                ? await command.ExecuteReaderAsync(CommandBehavior.SequentialAccess)
+                : command.ExecuteReader(CommandBehavior.SequentialAccess);
+            bool hasRow = useAsync ? await reader.ReadAsync() : reader.Read();
+
+            Assert.True(hasRow);
+            using TextReader textReader = reader.GetTextReader(0);
+            char[] buffer = new char[3];
+            StringBuilder result = new();
+            int charsRead;
+            do
+            {
+                charsRead = useAsync
+                    ? await textReader.ReadAsync(buffer, 0, buffer.Length)
+                    : textReader.Read(buffer, 0, buffer.Length);
+                result.Append(buffer, 0, charsRead);
+            }
+            while (charsRead != 0);
+
+            Assert.False(useAsync ? await reader.ReadAsync() : reader.Read());
+            return result.ToString();
+        }
+    }
+}

From b29753b86ca0ce21fadbecf19ffb51d3a8974245 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 8 Sep 2026 14:59:56 -0300
Subject: [PATCH 273/298] Pipelines | Use per-package APIScan name/version
 pairs (#4637)

* Pipelines | Use per-package APIScan name/version pairs

Each of our NuGet packages is now registered with APIScan under its own
name/version pair, so stop attributing every scan to a single global
Microsoft.Data.SqlClient / 6.10 registration.

- Reinstate the per-job ob_sdl_apiscan_softwareName and
  ob_sdl_apiscan_versionNumber variables in build-buildproj-job, driven by
  packageFullName and a new apiScanSoftwareVersion parameter.
- Remove softwareName/versionNumber from the globalSdl.apiscan blocks so the
  build job template is the single place the pair is specified.
- Replace ApiScanSoftwareVersion with ApiScanVersionSqlClient (7.1, this
  branch targets the 7.1.0 release) and ApiScanVersionSqlServer (1.0).
- Disable APIScan on validate-signed-package-job, which produces no
  assemblies and previously relied on the global registration.
- Update the SDL section of the OneBranch pipeline design instructions.

* Derive APIScan versions from package versions

* Log APIScan versions during version computation
---
 .../onebranch-pipeline-design.instructions.md | 10 ++++--
 .../onebranch/jobs/build-buildproj-job.yml    | 12 ++++++-
 .../jobs/validate-signed-package-job.yml      |  5 +++
 .../onebranch/scripts/compute-versions.ps1    | 33 +++++++++++++++++++
 .../scripts/tests/compute-versions.Tests.ps1  |  4 +++
 .../onebranch/sqlclient-non-official.yml      | 14 +++-----
 .../onebranch/sqlclient-official.yml          | 14 +++-----
 .../onebranch/stages/build-stages.yml         | 16 +++++++++
 .../variables/onebranch-variables.yml         |  5 ---
 9 files changed, 84 insertions(+), 29 deletions(-)

diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index 0b647b6be0..272369dfb5 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -108,7 +108,8 @@ When `isPreview` is true, pipeline resolves `effective*Version` variables to pre
 
 - Variable chain: pipeline YAML → `variables/onebranch-variables.yml` → `variables/common-variables.yml`
 - All package versions (GA, preview, assembly file) centralized in `variables/common-variables.yml`
-- `effective*Version` pipeline variables map to selected version set based on `isPreview`
+- The `compute_versions` stage reads canonical versions from MSBuild and publishes effective package,
+  file-build, and APIScan registration versions for downstream stages
 - Artifact name variables defined in `variables/onebranch-variables.yml` following `drop_<stageName>_<jobName>` pattern
 - `assemblyBuildNumber` derived from first segment of `Build.BuildNumber` only (16-bit limit)
 - When adding a new package, add GA version, preview version, and assembly file version entries
@@ -128,8 +129,11 @@ Variable groups:
 ## SDL and Compliance
 
 - TSA: enabled only in official pipeline; disabled in non-official to avoid spurious alerts
-- ApiScan: enabled in both; currently `break: false` pending package registration
-- Each build job sets `ob_sdl_apiscan_softwareFolder` to `$(JOB_OUTPUT)/assemblies` and `ob_sdl_apiscan_symbolsFolder` to `$(JOB_OUTPUT)/symbols`
+- ApiScan: enabled in both; `break` follows the `breakOnSdlError` parameter
+- Each package is registered with APIScan under its own name/version pair, so the `globalSdl.apiscan` blocks deliberately omit `softwareName`/`versionNumber`. `build-buildproj-job.yml` is the single place they are set, via `ob_sdl_apiscan_softwareName` (the package's `packageFullName`) and `ob_sdl_apiscan_versionNumber` (the `apiScanSoftwareVersion` parameter)
+- `compute-versions.ps1` derives APIScan registration versions as major.minor from the effective canonical package versions and publishes them as stage outputs. A package name/version pair must still be registered with APIScan before releasing a new major.minor. Consume these as runtime `$(...)` references so values such as `1.0` remain strings rather than being coerced to numbers by template expressions
+- Jobs that produce no assemblies (symbol publishing, signed-package validation, version computation) set `ob_sdl_apiscan_enabled: false` rather than reporting a name/version
+- Each build job also sets `ob_sdl_apiscan_softwareFolder` and `ob_sdl_apiscan_symbolsFolder` to its per-package `apiScan/<package>/dlls` and `apiScan/<package>/pdbs` paths
 - CodeQL, SBOM, Policheck (`break: true`): enabled in both pipelines
 - asyncSdl `enabled: false` in both; individual sub-tools (CredScan, BinSkim, Armory, Roslyn) configured underneath
 - Policheck exclusions: `$(REPO_ROOT)\.config\PolicheckExclusions.xml`
diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index d60ed634c0..f750ed4b91 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -17,6 +17,12 @@ parameters:
   - name: apiScanPdbPath
     type: string
 
+  # The APIScan registration version for the package being built. This is the major.minor value
+  # derived from the canonical package version by the compute_versions stage. The package's
+  # name/version pair must already be registered with APIScan before the build runs.
+  - name: apiScanSoftwareVersion
+    type: string
+
   # True to enable ESRP malware scanning and code signing steps, which should not be run on
   # non-official pipelines as they access production resources. If true, Signing* parameters must
   # be provided.
@@ -112,9 +118,13 @@ jobs:
 
       ob_outputDirectory: '$(JOB_OUTPUT)'
 
-      # APIScan per-job configuration for the DLL and PDB folders.
+      # APIScan per-job configuration.  This job template is the single place where the APIScan
+      # software name and version are set; the pipelines' globalSdl blocks deliberately leave them
+      # unset so that every scan is attributed to the package it actually covers.
       ob_sdl_apiscan_softwareFolder: ${{ parameters.apiScanDllPath }}
       ob_sdl_apiscan_symbolsFolder: ${{ parameters.apiScanPdbPath }}
+      ob_sdl_apiscan_softwareName: ${{ parameters.packageFullName }}
+      ob_sdl_apiscan_versionNumber: ${{ parameters.apiScanSoftwareVersion }}
 
     steps:
       - template: /eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self
diff --git a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
index afa5aa5918..476bb5de30 100644
--- a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
@@ -48,6 +48,11 @@ jobs:
 
     variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
 
+      # This job installs and inspects an already-built package rather than producing assemblies,
+      # so it has no APIScan software name/version to report. The build jobs scan those assemblies.
+      - name: ob_sdl_apiscan_enabled
+        value: false
+
       # Path within the downloaded artifact where NuGet packages are located.
       - name: artifactPath
         value: '$(Pipeline.Workspace)\${{ parameters.artifactName }}'
diff --git a/eng/pipelines/onebranch/scripts/compute-versions.ps1 b/eng/pipelines/onebranch/scripts/compute-versions.ps1
index ca3eb2c9d9..93e8d318aa 100644
--- a/eng/pipelines/onebranch/scripts/compute-versions.ps1
+++ b/eng/pipelines/onebranch/scripts/compute-versions.ps1
@@ -45,6 +45,8 @@
       - VersionRevision
       - SqlClientPackageVersion
       - SqlServerPackageVersion
+      - SqlClientApiScanVersion
+      - SqlServerApiScanVersion
 
 .PARAMETER ProjectPath
     Absolute or relative path to the repository build.proj file.
@@ -273,6 +275,28 @@ function Add-VersionBuildNumber {
     return $Version
 }
 
+<#
+.SYNOPSIS
+    Extracts the major.minor components from a package version.
+
+.PARAMETER Version
+    Package version beginning with a numeric major.minor pair.
+
+.OUTPUTS
+    The major.minor version pair.
+#>
+function Get-MajorMinorVersion {
+    param(
+        [string]$Version
+    )
+
+    if ($Version -notmatch "^(\d+)\.(\d+)(?:\.|-|$)") {
+        throw "Unable to derive a major.minor version from package version '$Version'."
+    }
+
+    return "$($Matches[1]).$($Matches[2])"
+}
+
 <#
 .SYNOPSIS
     Emits an Azure DevOps job output variable for consumption by downstream stages.
@@ -349,6 +373,15 @@ Write-Host "Effective versions:"
 Write-Host "  SqlClient (family): $sqlClientPackageVersion"
 Write-Host "  SqlServer:          $sqlServerPackageVersion"
 
+$sqlClientApiScanVersion = Get-MajorMinorVersion -Version $sqlClientPackageVersion
+$sqlServerApiScanVersion = Get-MajorMinorVersion -Version $sqlServerPackageVersion
+
+Write-Host "APIScan registration versions:"
+Write-Host "  SqlClient (family): $sqlClientApiScanVersion"
+Write-Host "  SqlServer:          $sqlServerApiScanVersion"
+
 Set-PipelineOutputVariable -Name "SqlClientPackageVersion" -Value $sqlClientPackageVersion
 Set-PipelineOutputVariable -Name "SqlServerPackageVersion" -Value $sqlServerPackageVersion
+Set-PipelineOutputVariable -Name "SqlClientApiScanVersion" -Value $sqlClientApiScanVersion
+Set-PipelineOutputVariable -Name "SqlServerApiScanVersion" -Value $sqlServerApiScanVersion
 Set-PipelineOutputVariable -Name "VersionRevision" -Value $fileVersionBuildNumber
diff --git a/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1 b/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
index ba109c4b71..cd38e6bb66 100644
--- a/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
+++ b/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
@@ -78,6 +78,9 @@ Describe 'compute-versions.ps1 Effective Versions' {
 
         $output | Should -Match "SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3\.$script:testBuildNumberPattern"
         $output | Should -Match "SqlServerPackageVersion;isOutput=true]1\.1\.0-preview1\.$script:testBuildNumberPattern"
+        $output | Should -Match 'SqlClientApiScanVersion;isOutput=true]7\.1'
+        $output | Should -Match 'SqlServerApiScanVersion;isOutput=true]1\.1'
+        $output | Should -Match 'APIScan registration versions:\s+SqlClient \(family\): 7\.1\s+SqlServer:\s+1\.1'
         $output | Should -Match "VersionRevision;isOutput=true]$script:testFileVersionBuildNumber"
     }
 
@@ -93,6 +96,7 @@ Describe 'compute-versions.ps1 Effective Versions' {
 
         $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0\.42-preview3'
         $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.0\.0'
+        $output | Should -Match 'SqlServerApiScanVersion;isOutput=true]1\.0'
         $output | Should -Not -Match 'SqlServerPackageVersion;isOutput=true]1\.0\.0\.42'
     }
 
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index 6316c9654e..3ec9bdbc75 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -193,16 +193,10 @@ extends:
         # Use pre-release mode for non-official pipelines.
         modeType: prerelease
 
-        # We have a single "name" registered with APIScan for all of our packages.
-        #
-        # https://eng.ms/docs/products/apiscan/onboard/requirements/registersoftware
-        #
-        softwareName: Microsoft.Data.SqlClient
-
-        # Similar to the software name, we have a single version registered as well.  This has
-        # nothing to do with the NuGet package version.  It is purely an APIScan registration
-        # value that points to our backend configuration.
-        versionNumber: $(ApiScanSoftwareVersion)
+        # The APIScan software name and version are NOT set here.  Each package is registered with
+        # APIScan under its own name/version pair, so every build job sets ob_sdl_apiscan_softwareName
+        # and ob_sdl_apiscan_versionNumber for the package it builds (see build-buildproj-job.yml).
+        # Jobs that produce no assemblies disable APIScan instead, via ob_sdl_apiscan_enabled.
 
         # We want the standard level of logging.
         verbosityLevel: standard
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 00ec4f3f74..2bc98a655b 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -207,16 +207,10 @@ extends:
         # Use release mode for official pipelines.
         modeType: release
 
-        # We have a single "name" registered with APIScan for all of our packages.
-        #
-        # https://eng.ms/docs/products/apiscan/onboard/requirements/registersoftware
-        #
-        softwareName: Microsoft.Data.SqlClient
-
-        # Similar to the software name, we have a single version registered as well.  This has
-        # nothing to do with the NuGet package version.  It is purely an APIScan registration
-        # value that points to our backend configuration.
-        versionNumber: $(ApiScanSoftwareVersion)
+        # The APIScan software name and version are NOT set here.  Each package is registered with
+        # APIScan under its own name/version pair, so every build job sets ob_sdl_apiscan_softwareName
+        # and ob_sdl_apiscan_versionNumber for the package it builds (see build-buildproj-job.yml).
+        # Jobs that produce no assemblies disable APIScan instead, via ob_sdl_apiscan_enabled.
 
         # We want the standard level of logging.
         verbosityLevel: standard
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index 49c6616b85..98e656004b 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -86,6 +86,10 @@ stages:
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
       - name: sqlServerPackageVersion
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
+      - name: sqlClientApiScanVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientApiScanVersion'] ]
+      - name: sqlServerApiScanVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerApiScanVersion'] ]
 
     jobs:
       # Build Microsoft.Data.SqlClient.Internal.Logging
@@ -93,6 +97,7 @@ stages:
         parameters:
           apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Internal.Logging/dlls'
           apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Internal.Logging/pdbs'
+          apiScanSoftwareVersion: '$(sqlClientApiScanVersion)'
           shouldSignPackage: ${{ parameters.isOfficial }}
           signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
           signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
@@ -115,6 +120,7 @@ stages:
           parameters:
             apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.SqlServer.Server/dlls'
             apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.SqlServer.Server/pdbs'
+            apiScanSoftwareVersion: '$(sqlServerApiScanVersion)'
             shouldSignPackage: ${{ parameters.isOfficial }}
             signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
             signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
@@ -146,6 +152,8 @@ stages:
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.VersionRevision'] ]
       - name: sqlClientPackageVersion
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+      - name: sqlClientApiScanVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientApiScanVersion'] ]
 
     jobs:
       # Build Microsoft.Data.SqlClient.Extensions.Abstractions
@@ -153,6 +161,7 @@ stages:
         parameters:
           apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Abstractions/dlls'
           apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Abstractions/pdbs'
+          apiScanSoftwareVersion: '$(sqlClientApiScanVersion)'
           shouldSignPackage: ${{ parameters.isOfficial }}
           signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
           signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
@@ -189,6 +198,8 @@ stages:
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
       - name: sqlServerPackageVersion
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
+      - name: sqlClientApiScanVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientApiScanVersion'] ]
 
     jobs:
       # Build Microsoft.Data.SqlClient
@@ -196,6 +207,7 @@ stages:
         parameters:
           apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/dlls'
           apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient/pdbs'
+          apiScanSoftwareVersion: '$(sqlClientApiScanVersion)'
           shouldSignPackage: ${{ parameters.isOfficial }}
           signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
           signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
@@ -233,6 +245,7 @@ stages:
         parameters:
           apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Azure/dlls'
           apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.Extensions.Azure/pdbs'
+          apiScanSoftwareVersion: '$(sqlClientApiScanVersion)'
           shouldSignPackage: ${{ parameters.isOfficial }}
           signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
           signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
@@ -271,12 +284,15 @@ stages:
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
       - name: sqlServerPackageVersion
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
+      - name: sqlClientApiScanVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientApiScanVersion'] ]
 
     jobs:
       - template: /eng/pipelines/onebranch/jobs/build-buildproj-job.yml@self
         parameters:
           apiScanDllPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/dlls'
           apiScanPdbPath: '$(REPO_ROOT)/apiScan/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/pdbs'
+          apiScanSoftwareVersion: '$(sqlClientApiScanVersion)'
           shouldSignPackage: ${{ parameters.isOfficial }}
           signingAppRegistrationClientId: '${{ parameters.signingAppRegistrationClientId }}'
           signingAppRegistrationTenantId: '${{ parameters.signingAppRegistrationTenantId }}'
diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml
index f4ae94431c..b6d4ce7d5c 100644
--- a/eng/pipelines/onebranch/variables/onebranch-variables.yml
+++ b/eng/pipelines/onebranch/variables/onebranch-variables.yml
@@ -63,11 +63,6 @@ variables:
   - name: Packaging.EnableSBOMSigning
     value: true
 
-  # Keep this as a runtime variable reference in globalSdl.apiscan.versionNumber. Passing the
-  # quoted value directly through an Azure template expression perturbs '6.10' to the number 6.1.
-  - name: ApiScanSoftwareVersion
-    value: '6.10'
-
   # OneBranch supplies a variety of container images we must use for our jobs.
   #
   # https://eng.ms/docs/products/onebranch/infrastructureandimages/containerimages/containerimages

From 7c5daeb228a44114fe7d9608c71826c7bf95da7c Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Wed, 9 Sep 2026 01:25:54 +0530
Subject: [PATCH 274/298] Fix | Scope configurable retry logic assembly
 resolution to opt-in callers (#4547)

* Scope configurable retry logic assembly resolution

SqlConfigurableRetryLogicLoader subscribed a handler to
AssemblyLoadContext.Default.Resolving in its constructor and never removed
it. Because SqlConfigurableRetryLogicManager builds that loader on the
default RetryLogicProvider path, simply reading
SqlCommand.RetryLogicProvider or SqlConnection.RetryLogicProvider installed
a permanent, process-wide assembly resolution hook.

The hook then participated in resolving every assembly the host application
failed to find, even though the application had not configured any custom
retry logic type. It also probed Environment.CurrentDirectory, which is
ambient process state unrelated to where the application's binaries live,
so assemblies could be resolved from an unintended location.

Applications observed this as load failures, and in #2214 as a stack
overflow, originating inside SqlClient for assemblies unrelated to
SqlClient.

Changes:

- Probe AppContext.BaseDirectory instead of Environment.CurrentDirectory.
- Subscribe the resolving handler only for the duration of the Type.GetType
  call in LoadType, and remove it in a finally block.
- Skip type resolution entirely when no retryLogicType is configured.
  retryLogicType is optional while retryMethod is required, so
  configurations selecting a built-in retry method previously still ran the
  custom type resolution path.

Together these mean the handler is never installed unless the application
explicitly configured a custom retry logic type, and is gone again as soon
as that type has been resolved.

Only .NET is affected; the .NET Framework code path does not use
AssemblyLoadContext.

Refs #2214, #2134

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e8018b20-0e43-4de9-93dd-c8080a81a801

* Test | Address review feedback on retry logic assembly probing tests

Replaces the internals-based assertions in the configurable retry logic
regression tests with a behavioural probe, and restores the UTF-8 BOM that
was dropped from the functional test file.

The unit test previously read AssemblyLoadContext's private _resolving
field to check whether a handler was still subscribed. That reflects into
runtime internals we do not own, so the value cannot simply be exposed
internally as review suggested. The functional test took a different but
also problematic approach, mutating Environment.CurrentDirectory, which is
process-wide state and unsafe under parallel test execution.

Both now plant a file that is not a valid assembly in the loader's probing
directory (AppContext.BaseDirectory) under a name no other component could
request, then assert that Assembly.Load reports it as not found. A
subscribed handler would locate that file and surface
BadImageFormatException instead, so the assertion discriminates cleanly
while observing only public behaviour and touching no shared process state.

Verified by temporarily reintroducing the unconditional subscription: all
four unit tests and the functional test fail, and pass again once removed.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e8018b20-0e43-4de9-93dd-c8080a81a801

* Test | Cover the successful retry logic type resolution path

The existing tests only covered the code paths where the assembly probing
handler is never subscribed. The path that legitimately subscribes it, a
configured custom retry logic type that actually resolves, was untested, so
nothing verified that the handler is removed again afterwards.

Add a test that resolves a retry logic factory out of the loader's probing
directory and asserts that no probing handler remains subscribed once the
loader has been constructed. An invocation counter on the factory confirms the
configured type really was resolved and used, rather than the loader silently
falling back to the built-in factory.

Verified the test is sensitive to both behaviours it covers: pointing the
loader's probing directory elsewhere makes it fail, and restoring the
unconditional handler subscription makes it fail.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e8018b20-0e43-4de9-93dd-c8080a81a801

* Test | Widen probe file cleanup to non-IO failures

File.Delete can fail with UnauthorizedAccessException as well as IOException.
Catching only the latter meant a cleanup failure could surface as a test
failure that had nothing to do with the behaviour under test.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e8018b20-0e43-4de9-93dd-c8080a81a801

* Keep retry logic assembly probing active during provider construction

Addresses review feedback that scoping the assembly resolving handler to type
resolution alone could break existing consumers whose configured retryLogicType
has private dependencies.

The handler is now subscribed before LoadType and removed only after
CreateInstance has run the configured type's constructor and invoked its retry
method, so dependency loads triggered during construction are still resolved.

Adds Switch.Microsoft.Data.SqlClient.UseLegacyRetryLogicAssemblyResolution as an
escape hatch that restores the process-lifetime handler. The switch restores
lifetime only; the probing directory remains AppContext.BaseDirectory, so it
cannot re-enable the binary planting vector.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e8018b20-0e43-4de9-93dd-c8080a81a801

* Treat a whitespace-only retryLogicType as not configured

A whitespace value has no type to resolve, so it previously installed the
resolving handler, attempted resolution and then fell back to the built-in
factory. Skipping the subscription reaches the same provider without changing
assembly resolution behavior on the application's behalf.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e8018b20-0e43-4de9-93dd-c8080a81a801

* Remove the UseLegacyRetryLogicAssemblyResolution app context switch

The switch restored the process-lifetime assembly resolving handler for the
one case that scoping cannot cover: a custom retry logic provider whose
private dependency is first touched after the provider has been constructed.

Shipping a supported way to permanently reinstate a process-wide handler on
AssemblyLoadContext.Default works against the point of the change. The driver
should not be altering assembly resolution for the whole application on
behalf of configurable retry logic, and an affected provider has a simple fix
of its own: reference the dependency normally so it lands in deps.json, or
register a resolving handler in the application.

The handler is now always subscribed only while a configured provider is
being resolved and constructed, and only when a custom retry logic type has
been configured.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e8018b20-0e43-4de9-93dd-c8080a81a801

* Refactor retry assembly resolution subscription

Encapsulate the temporary AssemblyLoadContext resolving handler in an
IDisposable subscription so cleanup is tied to a using scope. Remove the
handler immediately when custom type resolution falls back to the built-in
factory, and add direct unit coverage for disposal.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e8018b20-0e43-4de9-93dd-c8080a81a801

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e8018b20-0e43-4de9-93dd-c8080a81a801
---
 .../SqlConfigurableRetryLogicLoader.cs        | 159 ++++---
 .../SqlConfigurableRetryLogicTest.cs          |  46 +++
 .../SqlConfigurableRetryLogicLoaderTest.cs    | 388 ++++++++++++++++++
 3 files changed, 547 insertions(+), 46 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConfigurableRetryLogicLoaderTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs
index 96eadb9d56..df556a49ba 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Reliability/SqlConfigurableRetryLogicLoader.cs
@@ -50,14 +50,6 @@ public SqlConfigurableRetryLogicLoader(
             string cnnSectionName = SqlConfigurableRetryConnectionSection.Name,
             string cmdSectionName = SqlConfigurableRetryCommandSection.Name)
         {
-            #if NET
-            // Just only one subscription to this event is required.
-            // This class isn't supposed to be called more than one time;
-            // SqlConfigurableRetryLogicManager manages a single instance of this class.
-            System.Runtime.Loader.AssemblyLoadContext.Default.Resolving -= Default_Resolving;
-            System.Runtime.Loader.AssemblyLoadContext.Default.Resolving += Default_Resolving;
-            #endif
-            
             AssignProviders(connectionRetryConfigs == null ? null : CreateRetryLogicProvider(cnnSectionName, connectionRetryConfigs),
                             commandRetryConfigs == null ? null : CreateRetryLogicProvider(cmdSectionName, commandRetryConfigs));
         }
@@ -119,44 +111,70 @@ private static SqlRetryLogicBaseProvider ResolveRetryLogicProvider(string config
                 throw new ArgumentNullException(nameof(retryMethod), StringsHelper.GetString(Strings.SQLCR_RetryMethodNullOrEmpty));
             }
 
-            Type type = null;
-            try
-            {
-                // Resolve a Type object from the given type name
-                // Different implementation in .NET Framework & .NET Core
-                type = LoadType(configurableRetryType);
-            }
-            catch (Exception e)
-            {
-                // Try to use 'SqlConfigurableRetryFactory' as a default type to discover retry methods
-                // if there is a problem, resolve using the 'configurableRetryType' type.
-                type = typeof(SqlConfigurableRetryFactory);
-                SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> Unable to load the '{2}' type; Trying to use the internal `{3}` type: {4}",
-                                                       TypeName, methodName, configurableRetryType, type.FullName, e);
-            }
+            Type type;
 
-            // Run the function by using the resolved values to get the SqlRetryLogicBaseProvider object
-            try
+            // Whitespace is treated the same as unset: there is no type to resolve, so the
+            // resolving handler must not be installed for it.
+            bool customRetryTypeConfigured = !string.IsNullOrWhiteSpace(configurableRetryType);
+
+            // Keep the handler subscribed across both type resolution and provider construction.
+            // Invoking the configured type's constructor and retry method can load that assembly's
+            // private dependencies after LoadType has returned.
+            using (AssemblyResolutionSubscription subscription = new(customRetryTypeConfigured))
             {
-                // Create an instance from the discovered type by its default constructor
-                object result = CreateInstance(type, retryMethod, option);
+                if (!customRetryTypeConfigured)
+                {
+                    // No custom retry logic type was configured, so there is nothing to resolve and
+                    // the built-in factory is used to discover the requested retry method.
+                    type = typeof(SqlConfigurableRetryFactory);
+                    SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> No custom retry logic type is configured; Using the internal `{2}` type.",
+                                                           TypeName, methodName, type.FullName);
+                }
+                else
+                {
+                    try
+                    {
+                        // Resolve a Type object from the given type name
+                        // Different implementation in .NET Framework & .NET Core
+                        type = LoadType(configurableRetryType);
+                    }
+                    catch (Exception e)
+                    {
+                        // The custom type will not be constructed, so the built-in fallback no
+                        // longer needs the custom assembly resolution handler.
+                        subscription.Dispose();
+
+                        // Try to use 'SqlConfigurableRetryFactory' as a default type to discover retry methods
+                        // if there is a problem, resolve using the 'configurableRetryType' type.
+                        type = typeof(SqlConfigurableRetryFactory);
+                        SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> Unable to load the '{2}' type; Trying to use the internal `{3}` type: {4}",
+                                                               TypeName, methodName, configurableRetryType, type.FullName, e);
+                    }
+                }
 
-                if (result is SqlRetryLogicBaseProvider provider)
+                // Run the function by using the resolved values to get the SqlRetryLogicBaseProvider object
+                try
                 {
-                    SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> The created instace is a {2} type.",
-                                                           TypeName, methodName, typeof(SqlRetryLogicBaseProvider).FullName);
-                    provider.Retrying += OnRetryingEvent;
-                    return provider;
+                    // Create an instance from the discovered type by its default constructor
+                    object result = CreateInstance(type, retryMethod, option);
+
+                    if (result is SqlRetryLogicBaseProvider provider)
+                    {
+                        SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> The created instace is a {2} type.",
+                                                               TypeName, methodName, typeof(SqlRetryLogicBaseProvider).FullName);
+                        provider.Retrying += OnRetryingEvent;
+                        return provider;
+                    }
+                }
+                catch (Exception e)
+                {
+                    // In order to invoke a function dynamically, any type of exception can occur here;
+                    // The main exception and its stack trace will be accessible through the inner exception.
+                    // i.e: Opening a connection or executing a command while invoking a function 
+                    // runs the application to the `TargetInvocationException`.
+                    // And using an isolated zone like a specific AppDomain results in an infinite loop.
+                    throw new InvalidOperationException(StringsHelper.GetString(Strings.SQLCR_RetryMethodException, type.FullName, retryMethod), e);
                 }
-            }
-            catch (Exception e)
-            {
-                // In order to invoke a function dynamically, any type of exception can occur here;
-                // The main exception and its stack trace will be accessible through the inner exception.
-                // i.e: Opening a connection or executing a command while invoking a function 
-                // runs the application to the `TargetInvocationException`.
-                // And using an isolated zone like a specific AppDomain results in an infinite loop.
-                throw new InvalidOperationException(StringsHelper.GetString(Strings.SQLCR_RetryMethodException, type.FullName, retryMethod), e);
             }
 
             SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> Unable to resolve a valid provider; Returns `null`.", TypeName, methodName);
@@ -334,13 +352,53 @@ private static ICollection<int> SplitErrorNumberList(string list)
         }
         
         #region Type Resolution
-        
+
+        internal sealed class AssemblyResolutionSubscription : IDisposable
+        {
+            #if NET
+            private bool _isSubscribed;
+            #endif
+
+            internal AssemblyResolutionSubscription(bool subscribe)
+            {
+            #if NET
+                if (subscribe)
+                {
+                    AssemblyLoadContext.Default.Resolving += Default_Resolving;
+                    _isSubscribed = true;
+                }
+            #endif
+            }
+
+            public void Dispose()
+            {
+            #if NET
+                if (_isSubscribed)
+                {
+                    AssemblyLoadContext.Default.Resolving -= Default_Resolving;
+                    _isSubscribed = false;
+                }
+            #endif
+            }
+        }
+
         #if NET
+        /// <summary>
+        /// The directory that user-supplied configurable retry logic assemblies are probed from.
+        /// </summary>
+        /// <remarks>
+        /// This is deliberately the application base directory rather than the current working
+        /// directory. The working directory is ambient process state that can be changed at any
+        /// time and is not necessarily related to where the application's binaries live, so
+        /// probing it can load assemblies from an unintended and untrusted location.
+        /// </remarks>
+        private static string ProbingDirectory => AppContext.BaseDirectory;
+
         private static Assembly AssemblyResolver(AssemblyName arg)
         {
             string methodName = nameof(AssemblyResolver);
 
-            string fullPath = MakeFullPath(Environment.CurrentDirectory, arg.Name);
+            string fullPath = MakeFullPath(ProbingDirectory, arg.Name);
             SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> Looking for '{2}' assembly by '{3}' full path."
                 , TypeName, methodName, arg, fullPath);
 
@@ -348,13 +406,19 @@ private static Assembly AssemblyResolver(AssemblyName arg)
         }
         
         /// <summary>
-        /// Load assemblies on request.
+        /// Load dependencies of a user-supplied configurable retry logic assembly on request.
         /// </summary>
+        /// <remarks>
+        /// This handler is only subscribed while a configured retry logic provider is being
+        /// resolved and constructed, and only when a custom retry logic type has been configured.
+        /// It must not remain subscribed to <see cref="AssemblyLoadContext.Default"/> after that,
+        /// because doing so changes assembly resolution behavior for the entire application.
+        /// </remarks>
         private static Assembly Default_Resolving(AssemblyLoadContext arg1, AssemblyName arg2)
         {
             string methodName = nameof(Default_Resolving);
 
-            string target = MakeFullPath(Environment.CurrentDirectory, arg2.Name);
+            string target = MakeFullPath(ProbingDirectory, arg2.Name);
             SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> Looking for '{2}' assembly that is requested by '{3}' ALC from '{4}' path."
                 , TypeName, methodName, arg2, arg1, target);
 
@@ -371,7 +435,10 @@ private static Type LoadType(string fullyQualifiedName)
             string methodName = nameof(LoadType);
             SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> Entry point.", TypeName, methodName);
 
-            var result = Type.GetType(fullyQualifiedName, AssemblyResolver, TypeResolver);
+            Type result;
+
+            result = Type.GetType(fullyQualifiedName, AssemblyResolver, TypeResolver);
+
             if (result != null)
             {
                 SqlClientEventSource.Log.TryTraceEvent("<sc.{0}.{1}|INFO> The '{2}' type is resolved.",
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConfigurableRetryLogicTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConfigurableRetryLogicTest.cs
index b04115b191..b24a32e804 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConfigurableRetryLogicTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConfigurableRetryLogicTest.cs
@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -80,5 +82,49 @@ public void ValidateRetryParameters()
             option.AuthorizedSqlCondition = null;
             SqlConfigurableRetryFactory.CreateIncrementalRetryProvider(option);
         }
+
+#if NET
+        /// <summary>
+        /// Regression test: triggering the configurable retry logic loader through its normal
+        /// entry points must not leave a process-wide
+        /// <see cref="System.Runtime.Loader.AssemblyLoadContext.Default"/> resolving handler
+        /// installed. Such a handler participates in resolution of every assembly the host
+        /// application fails to find, and serves them out of this component's probing directory,
+        /// which can load code from an unintended location.
+        /// </summary>
+        [Fact]
+        public void RetryLogicProviderDoesNotLeaveAssemblyProbingEnabled()
+        {
+            // Touch the default retry logic providers to force SqlConfigurableRetryLogicLoader
+            // construction via its normal code path.
+            Assert.NotNull(new SqlCommand().RetryLogicProvider);
+            Assert.NotNull(new SqlConnection().RetryLogicProvider);
+
+            // A file that is not a valid assembly, planted in the loader's probing directory
+            // under a name no other component could be asking for. If a handler is still
+            // subscribed it finds this file and fails with BadImageFormatException. With correct
+            // behavior the runtime never looks here and reports the assembly as simply not found.
+            string assemblySimpleName = "MdsProbeAssembly_" + Guid.NewGuid().ToString("N");
+            string plantedFile = Path.Combine(AppContext.BaseDirectory, assemblySimpleName + ".dll");
+
+            File.WriteAllText(plantedFile, "not an assembly");
+            try
+            {
+                Assert.Throws<FileNotFoundException>(
+                    () => Assembly.Load(new AssemblyName(assemblySimpleName)));
+            }
+            finally
+            {
+                try
+                {
+                    File.Delete(plantedFile);
+                }
+                catch (IOException)
+                {
+                    // Best effort cleanup.
+                }
+            }
+        }
+#endif
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConfigurableRetryLogicLoaderTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConfigurableRetryLogicLoaderTest.cs
new file mode 100644
index 0000000000..d4ef506991
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConfigurableRetryLogicLoaderTest.cs
@@ -0,0 +1,388 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Loader;
+using Microsoft.Data.SqlClient.Tests.Common;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests;
+
+/// <summary>
+/// Unit tests validating that <see cref="SqlConfigurableRetryLogicLoader"/> never leaves a
+/// process-wide assembly resolving handler attached to
+/// <see cref="AssemblyLoadContext.Default"/>.
+/// </summary>
+/// <remarks>
+/// A handler left attached there participates in resolution of every assembly the host
+/// application fails to find, not just the retry logic assembly the loader was interested in.
+/// That silently changes assembly loading behaviour for code that never opted in to this
+/// feature, and can serve unrelated assemblies out of this component's probing directory.
+/// </remarks>
+[Collection(AppContextSwitchTestCollection.Name)]
+public class SqlConfigurableRetryLogicLoaderTest
+{
+    /// <summary>
+    /// The default code path: no configuration at all. The loader must not subscribe to the
+    /// default load context.
+    /// </summary>
+    [Fact]
+    public void Constructor_WithNoConfiguration_DoesNotLeaveAssemblyProbingEnabled()
+    {
+        _ = new SqlConfigurableRetryLogicLoader(null, null);
+
+        AssertNoAssemblyProbingHandlerInstalled();
+    }
+
+    /// <summary>
+    /// A configuration that supplies only a retry method, which is the documented way to select
+    /// one of the built-in retry providers. No custom type is being requested, so no assembly
+    /// resolution is required and no handler may be subscribed - not even transiently.
+    /// </summary>
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("   ")]
+    public void Constructor_WithoutRetryLogicType_DoesNotLeaveAssemblyProbingEnabled(string? retryLogicType)
+    {
+        TestRetryConnectionSection section = CreateSection(retryLogicType);
+
+        SqlConfigurableRetryLogicLoader loader = new(section, null);
+
+        // The built-in factory still resolves the requested method.
+        Assert.NotNull(loader.ConnectionProvider);
+        AssertNoAssemblyProbingHandlerInstalled();
+    }
+
+    /// <summary>
+    /// A configuration that requests a custom retry logic type legitimately needs assembly
+    /// resolution, but the handler must be removed again once type resolution has finished.
+    /// </summary>
+    [Fact]
+    public void Constructor_WithUnresolvableRetryLogicType_DoesNotLeaveAssemblyProbingEnabled()
+    {
+        TestRetryConnectionSection section =
+            CreateSection("Some.Namespace.NoSuchType, Some.Assembly.That.Does.Not.Exist");
+
+        SqlConfigurableRetryLogicLoader loader = new(section, null);
+
+        // Resolution fails and falls back to the built-in factory rather than throwing.
+        Assert.NotNull(loader.ConnectionProvider);
+        AssertNoAssemblyProbingHandlerInstalled();
+    }
+
+    /// <summary>
+    /// The path a custom retry logic type is actually resolved on. This is the only path that
+    /// legitimately installs the probing handler, and it must be removed again once resolution
+    /// has finished.
+    /// </summary>
+    /// <remarks>
+    /// The retry logic type is resolved out of this test assembly, which is reached through the
+    /// loader's probing directory rather than through normal assembly resolution. The invocation
+    /// counter confirms the configured type really was resolved and used, so this is exercising
+    /// the successful branch of type resolution rather than silently falling back to the built-in
+    /// factory.
+    /// </remarks>
+    [Fact]
+    public void Constructor_WithResolvableRetryLogicType_DoesNotLeaveAssemblyProbingEnabled()
+    {
+        RunWithProbedRetryLogicFactory(loader =>
+        {
+            Assert.NotNull(loader.ConnectionProvider);
+            AssertNoAssemblyProbingHandlerInstalled();
+        });
+    }
+
+    /// <summary>
+    /// The probing handler must stay subscribed until the configured provider has been fully
+    /// constructed, not just until the type has been resolved.
+    /// </summary>
+    /// <remarks>
+    /// Instantiating the configured type and invoking its retry method can trigger loads of that
+    /// assembly's private dependencies, and those loads happen after type resolution has already
+    /// returned. Unsubscribing too early would break providers that depend on that behaviour. The
+    /// factory method records the state of the handler at the moment it runs, which is inside the
+    /// window that has to remain open.
+    /// </remarks>
+    [Fact]
+    public void RetryLogicTypeResolution_KeepsAssemblyProbingEnabledWhileProviderIsConstructed()
+    {
+        string probeAssemblyName = NewProbeAssemblyName();
+        string plantedFile = PlantProbeFile(probeAssemblyName);
+
+        ProbedRetryLogicFactory.ProbeAssemblyName = probeAssemblyName;
+        ProbedRetryLogicFactory.ProbingHandlerInstalledDuringInvocation = null;
+
+        try
+        {
+            RunWithProbedRetryLogicFactory(loader =>
+            {
+                Assert.NotNull(loader.ConnectionProvider);
+
+                Assert.True(
+                    ProbedRetryLogicFactory.ProbingHandlerInstalledDuringInvocation,
+                    "The assembly probing handler was not subscribed while the configured retry " +
+                    "logic provider was being constructed.");
+            });
+
+            // ...and it must be gone again afterwards.
+            AssertNoAssemblyProbingHandlerInstalled();
+        }
+        finally
+        {
+            ProbedRetryLogicFactory.ProbeAssemblyName = null;
+            ProbedRetryLogicFactory.ProbingHandlerInstalledDuringInvocation = null;
+            DeleteProbeFile(plantedFile);
+        }
+    }
+
+    /// <summary>
+    /// Disposing an <see cref="SqlConfigurableRetryLogicLoader.AssemblyResolutionSubscription"/>
+    /// removes its handler from the default assembly load context.
+    /// </summary>
+    [Fact]
+    public void AssemblyResolutionSubscription_DisposeRemovesAssemblyProbingHandler()
+    {
+        string subscribedProbeName = NewProbeAssemblyName();
+        string subscribedProbeFile = PlantProbeFile(subscribedProbeName);
+        string disposedProbeName = NewProbeAssemblyName();
+        string disposedProbeFile = PlantProbeFile(disposedProbeName);
+
+        try
+        {
+            using SqlConfigurableRetryLogicLoader.AssemblyResolutionSubscription subscription =
+                new(subscribe: true);
+
+            Assert.True(IsProbingHandlerInstalled(subscribedProbeName));
+
+            subscription.Dispose();
+
+            Assert.False(IsProbingHandlerInstalled(disposedProbeName));
+        }
+        finally
+        {
+            DeleteProbeFile(subscribedProbeFile);
+            DeleteProbeFile(disposedProbeFile);
+        }
+    }
+
+    /// <summary>
+    /// Builds a configuration that resolves <see cref="ProbedRetryLogicFactory"/> out of this test
+    /// assembly through the loader's probing directory, constructs a loader from it, and hands the
+    /// loader to <paramref name="assert"/>.
+    /// </summary>
+    private static void RunWithProbedRetryLogicFactory(Action<SqlConfigurableRetryLogicLoader> assert)
+    {
+        Assembly testAssembly = typeof(SqlConfigurableRetryLogicLoaderTest).Assembly;
+        string assemblySimpleName = testAssembly.GetName().Name!;
+
+        // The loader probes for '<simple name>.dll'. The test assembly's file name does not
+        // necessarily match its simple name, so make a copy that does.
+        string probePath = Path.Combine(AppContext.BaseDirectory, assemblySimpleName + ".dll");
+        bool copied = false;
+        if (!File.Exists(probePath))
+        {
+            File.Copy(testAssembly.Location, probePath);
+            copied = true;
+        }
+
+        try
+        {
+            TestRetryConnectionSection section = CreateSection(
+                $"{typeof(ProbedRetryLogicFactory).FullName}, {assemblySimpleName}");
+            section.RetryMethod = nameof(ProbedRetryLogicFactory.CreateProbedRetryProvider);
+
+            ProbedRetryLogicFactory.InvocationCount = 0;
+
+            SqlConfigurableRetryLogicLoader loader = new(section, null);
+
+            Assert.Equal(1, ProbedRetryLogicFactory.InvocationCount);
+
+            assert(loader);
+        }
+        finally
+        {
+            if (copied)
+            {
+                DeleteProbeFile(probePath);
+            }
+        }
+    }
+
+    private static TestRetryConnectionSection CreateSection(string? retryLogicType) =>
+        new()
+        {
+            RetryLogicType = retryLogicType!,
+            RetryMethod = nameof(SqlConfigurableRetryFactory.CreateFixedRetryProvider),
+            NumberOfTries = 2,
+            DeltaTime = TimeSpan.FromSeconds(1),
+            MinTimeInterval = TimeSpan.Zero,
+            MaxTimeInterval = TimeSpan.FromSeconds(10),
+        };
+
+    /// <summary>
+    /// Asserts that a failed assembly load is not served out of the loader's probing directory,
+    /// which can only happen while a resolving handler installed by
+    /// <see cref="SqlConfigurableRetryLogicLoader"/> is subscribed to
+    /// <see cref="AssemblyLoadContext.Default"/>.
+    /// </summary>
+    /// <remarks>
+    /// A file that is not a valid assembly is planted in the probing directory under a name no
+    /// other component could be asking for. If a handler is still subscribed it finds that file
+    /// and tries to load it, which surfaces as <see cref="BadImageFormatException"/>. With no
+    /// handler subscribed the runtime never looks there and reports the assembly as simply not
+    /// found. This asserts the behaviour that actually matters to a host application rather than
+    /// inspecting loader or runtime internals.
+    /// </remarks>
+    private static void AssertNoAssemblyProbingHandlerInstalled()
+    {
+        string assemblySimpleName = NewProbeAssemblyName();
+        string plantedFile = PlantProbeFile(assemblySimpleName);
+
+        try
+        {
+            Assert.False(
+                IsProbingHandlerInstalled(assemblySimpleName),
+                "A resolving handler that probes the loader's probing directory is subscribed to " +
+                "the default assembly load context.");
+        }
+        finally
+        {
+            DeleteProbeFile(plantedFile);
+        }
+    }
+
+    /// <summary>
+    /// Reports whether a resolving handler that serves assemblies out of the loader's probing
+    /// directory is currently subscribed to <see cref="AssemblyLoadContext.Default"/>.
+    /// </summary>
+    /// <remarks>
+    /// This distinguishes the two states using only public behaviour, which is what actually
+    /// matters to a host application. With such a handler subscribed the planted file is found
+    /// and an attempt is made to load it, which fails as
+    /// <see cref="BadImageFormatException"/> because it is not a valid assembly. With no such
+    /// handler subscribed the runtime never looks in that directory and reports the assembly as
+    /// simply not found.
+    /// </remarks>
+    internal static bool IsProbingHandlerInstalled(string assemblySimpleName)
+    {
+        try
+        {
+            Assembly.Load(new AssemblyName(assemblySimpleName));
+
+            // Unreachable: the planted file is deliberately not a valid assembly, so a handler
+            // that found it cannot have loaded it successfully.
+            return true;
+        }
+        catch (BadImageFormatException)
+        {
+            return true;
+        }
+        catch (FileNotFoundException)
+        {
+            return false;
+        }
+    }
+
+    private static string NewProbeAssemblyName() =>
+        "MdsProbeAssembly_" + Guid.NewGuid().ToString("N");
+
+    /// <summary>
+    /// Plants a file that is not a valid assembly in the loader's probing directory, under a
+    /// name no other component could be asking for.
+    /// </summary>
+    private static string PlantProbeFile(string assemblySimpleName)
+    {
+        // The probing directory is the application base directory, which for a test run is the
+        // directory the test assembly was loaded from.
+        string plantedFile = Path.Combine(AppContext.BaseDirectory, assemblySimpleName + ".dll");
+
+        File.WriteAllText(plantedFile, "not an assembly");
+
+        return plantedFile;
+    }
+
+    /// <summary>
+    /// Removes a planted probe file. Cleanup failures are ignored so that a test reports on
+    /// product behaviour rather than on the state of the file system.
+    /// </summary>
+    private static void DeleteProbeFile(string plantedFile)
+    {
+        try
+        {
+            File.Delete(plantedFile);
+        }
+        catch (IOException)
+        {
+            // The file is in use, most likely because it was successfully loaded as an assembly
+            // and is therefore locked for the lifetime of the process.
+        }
+        catch (UnauthorizedAccessException)
+        {
+            // The file is read only, or the caller lacks permission to delete it.
+        }
+    }
+
+    private sealed class TestRetryConnectionSection : ISqlConfigurableRetryConnectionSection
+    {
+        public TimeSpan DeltaTime { get; set; }
+
+        public TimeSpan MaxTimeInterval { get; set; }
+
+        public TimeSpan MinTimeInterval { get; set; }
+
+        public int NumberOfTries { get; set; }
+
+        public string RetryLogicType { get; set; } = string.Empty;
+
+        public string RetryMethod { get; set; } = string.Empty;
+
+        public string TransientErrors { get; set; } = string.Empty;
+    }
+}
+
+/// <summary>
+/// A retry logic factory that is resolved through the loader's probing directory rather than
+/// through normal assembly resolution, so tests can tell a successful custom type resolution
+/// apart from a silent fallback to the built-in factory.
+/// </summary>
+/// <remarks>
+/// This has to be a public, non-nested type because the loader discovers candidates by
+/// enumerating the resolved assembly's exported types.
+/// </remarks>
+public static class ProbedRetryLogicFactory
+{
+    internal static int InvocationCount;
+
+    /// <summary>
+    /// When set to the simple name of a planted probe assembly, the factory method records whether
+    /// the loader's probing handler was subscribed at the moment it ran.
+    /// </summary>
+    internal static string? ProbeAssemblyName;
+
+    /// <summary>
+    /// The state of the loader's probing handler at the moment the factory method last ran, or null
+    /// if it was not recorded.
+    /// </summary>
+    internal static bool? ProbingHandlerInstalledDuringInvocation;
+
+    public static SqlRetryLogicBaseProvider CreateProbedRetryProvider(SqlRetryLogicOption option)
+    {
+        InvocationCount++;
+
+        if (ProbeAssemblyName is not null)
+        {
+            ProbingHandlerInstalledDuringInvocation =
+                SqlConfigurableRetryLogicLoaderTest.IsProbingHandlerInstalled(ProbeAssemblyName);
+        }
+
+        return SqlConfigurableRetryFactory.CreateFixedRetryProvider(option);
+    }
+}
+
+#endif

From 246ec7bd85d23b5bb4f0d35ea2cc3ea9e5163c22 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 8 Sep 2026 17:06:20 -0700
Subject: [PATCH 275/298] Pipelines | Move CI and PR jobs off Microsoft-hosted
 agents (#4515)

* Move CI and PR pipelines to SQL Server 2025 agent images

Retire every SQL Server 2022 agent image in favour of the SQL Server 2025
equivalents:

  ADO-MMS22-SQL22 -> ADO-MMS25-SQL25
  ADO-UB22-SQL22  -> ADO-UB24-SQL25

This covers the CI test configurations, the PR pipeline platform list,
the Azure package integration test jobs (including the SQL root path,
which becomes SQL25RootPath), the Managed Instance jobs, the stress test
jobs, and the Linux enclave configuration.

Two notes on the change:

  - CI test stage names derive from the image keys, so stages such as
    Win22_Sql22 are now named Win25_Sql25.  Any branch policies or
    required status checks that reference the old stage names will need
    to be updated.

  - The Linux SQL configuration previously ran on both ADO-UB20-SQL22
    and ADO-UB22-SQL22.  We only have a single Ubuntu SQL 2025 image, so
    it now runs on ADO-UB24-SQL25 alone.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Clarify why the Linux enclave stage key is left unchanged

The Linux enclave image key doubles as the generated ADO stage name and is
referenced by branch policies and required status checks, so it is kept as-is.
The 'Sql19' suffix also remains accurate because these tests target a remote
Enclave-enabled SQL Server 2019; only the agent image moved to Ubuntu 24.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Install sqlcmd on Linux agents before configuring SQL Server

The SQL Server 2025 agent images ship the engine but not the command line
tools, so the Linux SQL configuration steps failed with:

  ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations.

Add a shared 'Install sqlcmd [Linux]' step that reuses an existing sqlcmd when
the image provides one and otherwise installs mssql-tools18, then publishes the
resolved path via the SqlCmdBin variable.  Both the PR and CI Linux
configuration steps now run it, and the CI step no longer hardcodes
/opt/mssql-tools/bin/sqlcmd, which does not exist on these images.

sqlcmd from mssql-tools18 encrypts by default, so the step also publishes
SqlCmdTrustArg ('-C') to trust the local server's self-signed certificate.
Without it every connection to localhost would fail certificate validation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Add .NET 10 test coverage to the CI-SqlClient pipeline

Introduce primaryTargetFrameworks and primaryTargetFrameworksUnix, which
apply only to the primary test configurations: local SQL Server 2025 and
Azure SQL, on both Windows and Linux.  Those configurations now run
net10.0 in addition to the existing target frameworks.

Restricting .NET 10 to the primary configurations keeps the added agent
cost bounded rather than multiplying it across every legacy SQL Server
image.  The other pipelines that extend the CI core pin the new
parameters to their existing target framework lists, so their behaviour
is unchanged.

Note that the driver itself only targets net462, net8.0, and net9.0, so
the net10.0 test assemblies resolve the net9.0 driver build.  These jobs
therefore validate the driver on the .NET 10 runtime rather than
validating a .NET 10 build of the driver.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Move CI and PR jobs off Microsoft-hosted agents

All jobs that previously ran on the Microsoft-hosted 'Azure Pipelines'
pool now run on our 1ES pools, with the sole exception of macOS jobs,
since our 1ES pools do not offer macOS images.

  - Parameterize the pool name and image for the secrets, pack,
    verify-nuget, and code-coverage jobs in both the CI and PR
    pipelines, defaulting to the 1ES pool with a Linux image (or a
    Windows image, for verify-nuget).
  - Point the Abstractions package Linux and Windows test jobs at
    ADO-UB24-SQL25 and ADO-MMS25-SQL25.
  - Drop the redundant hosted Linux and Windows Azure package test jobs.
    The self-hosted integration jobs already cover the same runtimes,
    and additionally exercise a local SQL Server.
  - Pass explicit pool names from the stress and Kerberos pipelines,
    which reuse these templates but do not import the CI build
    variables.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Move the CI package pipeline to the SQL Server 2025 agent images

The nightly package build pipeline still offered ADO-UB24 and ADO-Win25
as its agentImage choices.  Move it onto the same images the rest of CI
now uses: ADO-UB24-SQL25 and ADO-MMS25-SQL25.

The job only runs build.proj Pack, so it does not depend on the SQL
Server instance these images carry.  Aligning them means we maintain one
set of agent images rather than two.

Note that both ADO-1ES-Pool and ADO-CI-1ES-Pool must publish these
images before this merges, since the pool is chosen based on whether the
build is internal or public.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Move the GitHub sync pipeline off the hosted ubuntu-latest agent

This was the last job outside of macOS still running on a
Microsoft-hosted agent.  Move it to ADO-UB24-SQL25 on the 1ES pool,
selecting the pool based on the project the way the stress and package
pipelines do.

The job runs a PowerShell script with pwsh, which the ADO-UB24-SQL25
image already provides -- the stress job relies on the same thing
without installing PowerShell first.

After this change, the only remaining Microsoft-hosted jobs are the
macOS ones, since our 1ES pools do not offer macOS images.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Support both 1ES and hosted pools in parameterized job templates

The pack, secrets, coverage and NuGet verification templates now take
poolName/vmImage parameters, but selected the image with a 1ES imageOverride
demand unconditionally.  That breaks if a caller (or a variable group that has
not been migrated yet) still points poolName at the hosted 'Azure Pipelines'
pool, which requires vmImage instead.

Use the same conditional pool block the test-* job templates already use, so
these templates work with either pool type.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Move CI and PR pipelines to SQL Server 2025 agent images

Retire every SQL Server 2022 agent image in favour of the SQL Server 2025
equivalents:

  ADO-MMS22-SQL22 -> ADO-MMS25-SQL25
  ADO-UB22-SQL22  -> ADO-UB24-SQL25

This covers the CI test configurations, the PR pipeline platform list,
the Azure package integration test jobs (including the SQL root path,
which becomes SQL25RootPath), the Managed Instance jobs, the stress test
jobs, and the Linux enclave configuration.

Two notes on the change:

  - CI test stage names derive from the image keys, so stages such as
    Win22_Sql22 are now named Win25_Sql25.  Any branch policies or
    required status checks that reference the old stage names will need
    to be updated.

  - The Linux SQL configuration previously ran on both ADO-UB20-SQL22
    and ADO-UB22-SQL22.  We only have a single Ubuntu SQL 2025 image, so
    it now runs on ADO-UB24-SQL25 alone.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Clarify why the Linux enclave stage key is left unchanged

The Linux enclave image key doubles as the generated ADO stage name and is
referenced by branch policies and required status checks, so it is kept as-is.
The 'Sql19' suffix also remains accurate because these tests target a remote
Enclave-enabled SQL Server 2019; only the agent image moved to Ubuntu 24.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Install sqlcmd on Linux agents before configuring SQL Server

The SQL Server 2025 agent images ship the engine but not the command line
tools, so the Linux SQL configuration steps failed with:

  ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations.

Add a shared 'Install sqlcmd [Linux]' step that reuses an existing sqlcmd when
the image provides one and otherwise installs mssql-tools18, then publishes the
resolved path via the SqlCmdBin variable.  Both the PR and CI Linux
configuration steps now run it, and the CI step no longer hardcodes
/opt/mssql-tools/bin/sqlcmd, which does not exist on these images.

sqlcmd from mssql-tools18 encrypts by default, so the step also publishes
SqlCmdTrustArg ('-C') to trust the local server's self-signed certificate.
Without it every connection to localhost would fail certificate validation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Add .NET 10 test coverage to the CI-SqlClient pipeline

Introduce primaryTargetFrameworks and primaryTargetFrameworksUnix, which
apply only to the primary test configurations: local SQL Server 2025 and
Azure SQL, on both Windows and Linux.  Those configurations now run
net10.0 in addition to the existing target frameworks.

Restricting .NET 10 to the primary configurations keeps the added agent
cost bounded rather than multiplying it across every legacy SQL Server
image.  The other pipelines that extend the CI core pin the new
parameters to their existing target framework lists, so their behaviour
is unchanged.

Note that the driver itself only targets net462, net8.0, and net9.0, so
the net10.0 test assemblies resolve the net9.0 driver build.  These jobs
therefore validate the driver on the .NET 10 runtime rather than
validating a .NET 10 build of the driver.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Move CI and PR pipelines to SQL Server 2025 agent images

Retire every SQL Server 2022 agent image in favour of the SQL Server 2025
equivalents:

  ADO-MMS22-SQL22 -> ADO-MMS25-SQL25
  ADO-UB22-SQL22  -> ADO-UB24-SQL25

This covers the CI test configurations, the PR pipeline platform list,
the Azure package integration test jobs (including the SQL root path,
which becomes SQL25RootPath), the Managed Instance jobs, the stress test
jobs, and the Linux enclave configuration.

Two notes on the change:

  - CI test stage names derive from the image keys, so stages such as
    Win22_Sql22 are now named Win25_Sql25.  Any branch policies or
    required status checks that reference the old stage names will need
    to be updated.

  - The Linux SQL configuration previously ran on both ADO-UB20-SQL22
    and ADO-UB22-SQL22.  We only have a single Ubuntu SQL 2025 image, so
    it now runs on ADO-UB24-SQL25 alone.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Clarify why the Linux enclave stage key is left unchanged

The Linux enclave image key doubles as the generated ADO stage name and is
referenced by branch policies and required status checks, so it is kept as-is.
The 'Sql19' suffix also remains accurate because these tests target a remote
Enclave-enabled SQL Server 2019; only the agent image moved to Ubuntu 24.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Install sqlcmd on Linux agents before configuring SQL Server

The SQL Server 2025 agent images ship the engine but not the command line
tools, so the Linux SQL configuration steps failed with:

  ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations.

Add a shared 'Install sqlcmd [Linux]' step that reuses an existing sqlcmd when
the image provides one and otherwise installs mssql-tools18, then publishes the
resolved path via the SqlCmdBin variable.  Both the PR and CI Linux
configuration steps now run it, and the CI step no longer hardcodes
/opt/mssql-tools/bin/sqlcmd, which does not exist on these images.

sqlcmd from mssql-tools18 encrypts by default, so the step also publishes
SqlCmdTrustArg ('-C') to trust the local server's self-signed certificate.
Without it every connection to localhost would fail certificate validation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Add .NET 10 test coverage to the CI-SqlClient pipeline

Introduce primaryTargetFrameworks and primaryTargetFrameworksUnix, which
apply only to the primary test configurations: local SQL Server 2025 and
Azure SQL, on both Windows and Linux.  Those configurations now run
net10.0 in addition to the existing target frameworks.

Restricting .NET 10 to the primary configurations keeps the added agent
cost bounded rather than multiplying it across every legacy SQL Server
image.  The other pipelines that extend the CI core pin the new
parameters to their existing target framework lists, so their behaviour
is unchanged.

Note that the driver itself only targets net462, net8.0, and net9.0, so
the net10.0 test assemblies resolve the net9.0 driver build.  These jobs
therefore validate the driver on the .NET 10 runtime rather than
validating a .NET 10 build of the driver.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Move agent configuration to pipeline roots

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Move CI and PR pipelines to SQL Server 2025 agent images

Retire every SQL Server 2022 agent image in favour of the SQL Server 2025
equivalents:

  ADO-MMS22-SQL22 -> ADO-MMS25-SQL25
  ADO-UB22-SQL22  -> ADO-UB24-SQL25

This covers the CI test configurations, the PR pipeline platform list,
the Azure package integration test jobs (including the SQL root path,
which becomes SQL25RootPath), the Managed Instance jobs, the stress test
jobs, and the Linux enclave configuration.

Two notes on the change:

  - CI test stage names derive from the image keys, so stages such as
    Win22_Sql22 are now named Win25_Sql25.  Any branch policies or
    required status checks that reference the old stage names will need
    to be updated.

  - The Linux SQL configuration previously ran on both ADO-UB20-SQL22
    and ADO-UB22-SQL22.  We only have a single Ubuntu SQL 2025 image, so
    it now runs on ADO-UB24-SQL25 alone.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Clarify why the Linux enclave stage key is left unchanged

The Linux enclave image key doubles as the generated ADO stage name and is
referenced by branch policies and required status checks, so it is kept as-is.
The 'Sql19' suffix also remains accurate because these tests target a remote
Enclave-enabled SQL Server 2019; only the agent image moved to Ubuntu 24.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Install sqlcmd on Linux agents before configuring SQL Server

The SQL Server 2025 agent images ship the engine but not the command line
tools, so the Linux SQL configuration steps failed with:

  ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations.

Add a shared 'Install sqlcmd [Linux]' step that reuses an existing sqlcmd when
the image provides one and otherwise installs mssql-tools18, then publishes the
resolved path via the SqlCmdBin variable.  Both the PR and CI Linux
configuration steps now run it, and the CI step no longer hardcodes
/opt/mssql-tools/bin/sqlcmd, which does not exist on these images.

sqlcmd from mssql-tools18 encrypts by default, so the step also publishes
SqlCmdTrustArg ('-C') to trust the local server's self-signed certificate.
Without it every connection to localhost would fail certificate validation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Add .NET 10 test coverage to the CI-SqlClient pipeline

Introduce primaryTargetFrameworks and primaryTargetFrameworksUnix, which
apply only to the primary test configurations: local SQL Server 2025 and
Azure SQL, on both Windows and Linux.  Those configurations now run
net10.0 in addition to the existing target frameworks.

Restricting .NET 10 to the primary configurations keeps the added agent
cost bounded rather than multiplying it across every legacy SQL Server
image.  The other pipelines that extend the CI core pin the new
parameters to their existing target framework lists, so their behaviour
is unchanged.

Note that the driver itself only targets net462, net8.0, and net9.0, so
the net10.0 test assemblies resolve the net9.0 driver build.  These jobs
therefore validate the driver on the .NET 10 runtime rather than
validating a .NET 10 build of the driver.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Move CI and PR pipelines to SQL Server 2025 agent images

Retire every SQL Server 2022 agent image in favour of the SQL Server 2025
equivalents:

  ADO-MMS22-SQL22 -> ADO-MMS25-SQL25
  ADO-UB22-SQL22  -> ADO-UB24-SQL25

This covers the CI test configurations, the PR pipeline platform list,
the Azure package integration test jobs (including the SQL root path,
which becomes SQL25RootPath), the Managed Instance jobs, the stress test
jobs, and the Linux enclave configuration.

Two notes on the change:

  - CI test stage names derive from the image keys, so stages such as
    Win22_Sql22 are now named Win25_Sql25.  Any branch policies or
    required status checks that reference the old stage names will need
    to be updated.

  - The Linux SQL configuration previously ran on both ADO-UB20-SQL22
    and ADO-UB22-SQL22.  We only have a single Ubuntu SQL 2025 image, so
    it now runs on ADO-UB24-SQL25 alone.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Clarify why the Linux enclave stage key is left unchanged

The Linux enclave image key doubles as the generated ADO stage name and is
referenced by branch policies and required status checks, so it is kept as-is.
The 'Sql19' suffix also remains accurate because these tests target a remote
Enclave-enabled SQL Server 2019; only the agent image moved to Ubuntu 24.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Install sqlcmd on Linux agents before configuring SQL Server

The SQL Server 2025 agent images ship the engine but not the command line
tools, so the Linux SQL configuration steps failed with:

  ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations.

Add a shared 'Install sqlcmd [Linux]' step that reuses an existing sqlcmd when
the image provides one and otherwise installs mssql-tools18, then publishes the
resolved path via the SqlCmdBin variable.  Both the PR and CI Linux
configuration steps now run it, and the CI step no longer hardcodes
/opt/mssql-tools/bin/sqlcmd, which does not exist on these images.

sqlcmd from mssql-tools18 encrypts by default, so the step also publishes
SqlCmdTrustArg ('-C') to trust the local server's self-signed certificate.
Without it every connection to localhost would fail certificate validation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Add .NET 10 test coverage to the CI-SqlClient pipeline

Introduce primaryTargetFrameworks and primaryTargetFrameworksUnix, which
apply only to the primary test configurations: local SQL Server 2025 and
Azure SQL, on both Windows and Linux.  Those configurations now run
net10.0 in addition to the existing target frameworks.

Restricting .NET 10 to the primary configurations keeps the added agent
cost bounded rather than multiplying it across every legacy SQL Server
image.  The other pipelines that extend the CI core pin the new
parameters to their existing target framework lists, so their behaviour
is unchanged.

Note that the driver itself only targets net462, net8.0, and net9.0, so
the net10.0 test assemblies resolve the net9.0 driver build.  These jobs
therefore validate the driver on the .NET 10 runtime rather than
validating a .NET 10 build of the driver.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Move CI and PR pipelines to SQL Server 2025 agent images

Retire every SQL Server 2022 agent image in favour of the SQL Server 2025
equivalents:

  ADO-MMS22-SQL22 -> ADO-MMS25-SQL25
  ADO-UB22-SQL22  -> ADO-UB24-SQL25

This covers the CI test configurations, the PR pipeline platform list,
the Azure package integration test jobs (including the SQL root path,
which becomes SQL25RootPath), the Managed Instance jobs, the stress test
jobs, and the Linux enclave configuration.

Two notes on the change:

  - CI test stage names derive from the image keys, so stages such as
    Win22_Sql22 are now named Win25_Sql25.  Any branch policies or
    required status checks that reference the old stage names will need
    to be updated.

  - The Linux SQL configuration previously ran on both ADO-UB20-SQL22
    and ADO-UB22-SQL22.  We only have a single Ubuntu SQL 2025 image, so
    it now runs on ADO-UB24-SQL25 alone.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Clarify why the Linux enclave stage key is left unchanged

The Linux enclave image key doubles as the generated ADO stage name and is
referenced by branch policies and required status checks, so it is kept as-is.
The 'Sql19' suffix also remains accurate because these tests target a remote
Enclave-enabled SQL Server 2019; only the agent image moved to Ubuntu 24.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Install sqlcmd on Linux agents before configuring SQL Server

The SQL Server 2025 agent images ship the engine but not the command line
tools, so the Linux SQL configuration steps failed with:

  ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations.

Add a shared 'Install sqlcmd [Linux]' step that reuses an existing sqlcmd when
the image provides one and otherwise installs mssql-tools18, then publishes the
resolved path via the SqlCmdBin variable.  Both the PR and CI Linux
configuration steps now run it, and the CI step no longer hardcodes
/opt/mssql-tools/bin/sqlcmd, which does not exist on these images.

sqlcmd from mssql-tools18 encrypts by default, so the step also publishes
SqlCmdTrustArg ('-C') to trust the local server's self-signed certificate.
Without it every connection to localhost would fail certificate validation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Add .NET 10 test coverage to the CI-SqlClient pipeline

Introduce primaryTargetFrameworks and primaryTargetFrameworksUnix, which
apply only to the primary test configurations: local SQL Server 2025 and
Azure SQL, on both Windows and Linux.  Those configurations now run
net10.0 in addition to the existing target frameworks.

Restricting .NET 10 to the primary configurations keeps the added agent
cost bounded rather than multiplying it across every legacy SQL Server
image.  The other pipelines that extend the CI core pin the new
parameters to their existing target framework lists, so their behaviour
is unchanged.

Note that the driver itself only targets net462, net8.0, and net9.0, so
the net10.0 test assemblies resolve the net9.0 driver build.  These jobs
therefore validate the driver on the .NET 10 runtime rather than
validating a .NET 10 build of the driver.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Flow the CI pool name down from the pipeline root

Review feedback: the pool name was specified in two different ways, and
deep templates read it straight out of a variable group.

Every CI stage and job template now takes the pool name as a required
parameter, threaded down from 'defaultPoolName' in
dotnet-sqlclient-ci-core.yml.  That leaves exactly one reference to
$(ci_var_defaultPoolName) per CI pipeline root, mirroring how the PR
pipeline references $(PoolNameDefault) once at its root.

Both roots now document where their variable comes from and why the two
pipeline families use different variable groups.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Move CI and PR pipelines to SQL Server 2025 agent images

Retire every SQL Server 2022 agent image in favour of the SQL Server 2025
equivalents:

  ADO-MMS22-SQL22 -> ADO-MMS25-SQL25
  ADO-UB22-SQL22  -> ADO-UB24-SQL25

This covers the CI test configurations, the PR pipeline platform list,
the Azure package integration test jobs (including the SQL root path,
which becomes SQL25RootPath), the Managed Instance jobs, the stress test
jobs, and the Linux enclave configuration.

Two notes on the change:

  - CI test stage names derive from the image keys, so stages such as
    Win22_Sql22 are now named Win25_Sql25.  Any branch policies or
    required status checks that reference the old stage names will need
    to be updated.

  - The Linux SQL configuration previously ran on both ADO-UB20-SQL22
    and ADO-UB22-SQL22.  We only have a single Ubuntu SQL 2025 image, so
    it now runs on ADO-UB24-SQL25 alone.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Clarify why the Linux enclave stage key is left unchanged

The Linux enclave image key doubles as the generated ADO stage name and is
referenced by branch policies and required status checks, so it is kept as-is.
The 'Sql19' suffix also remains accurate because these tests target a remote
Enclave-enabled SQL Server 2019; only the agent image moved to Ubuntu 24.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Install sqlcmd on Linux agents before configuring SQL Server

The SQL Server 2025 agent images ship the engine but not the command line
tools, so the Linux SQL configuration steps failed with:

  ERROR: 'sqlcmd' was not found on PATH or in the standard mssql-tools locations.

Add a shared 'Install sqlcmd [Linux]' step that reuses an existing sqlcmd when
the image provides one and otherwise installs mssql-tools18, then publishes the
resolved path via the SqlCmdBin variable.  Both the PR and CI Linux
configuration steps now run it, and the CI step no longer hardcodes
/opt/mssql-tools/bin/sqlcmd, which does not exist on these images.

sqlcmd from mssql-tools18 encrypts by default, so the step also publishes
SqlCmdTrustArg ('-C') to trust the local server's self-signed certificate.
Without it every connection to localhost would fail certificate validation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Add .NET 10 test coverage to the CI-SqlClient pipeline

Introduce primaryTargetFrameworks and primaryTargetFrameworksUnix, which
apply only to the primary test configurations: local SQL Server 2025 and
Azure SQL, on both Windows and Linux.  Those configurations now run
net10.0 in addition to the existing target frameworks.

Restricting .NET 10 to the primary configurations keeps the added agent
cost bounded rather than multiplying it across every legacy SQL Server
image.  The other pipelines that extend the CI core pin the new
parameters to their existing target framework lists, so their behaviour
is unchanged.

Note that the driver itself only targets net462, net8.0, and net9.0, so
the net10.0 test assemblies resolve the net9.0 driver build.  These jobs
therefore validate the driver on the .NET 10 runtime rather than
validating a .NET 10 build of the driver.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Pipelines | Restore SQL Server 2022 coverage in the CI test matrix (#4587)

* Restore SQL Server 2022 coverage in the CI test matrix

Adds back windows_sql_22_x64 (ADO-MMS22-SQL22) and linux_ub22_sql_22
(ADO-UB22-SQL22) to the CI-SqlClient test configurations, so moving the
primary configurations to SQL Server 2025 does not drop SQL Server 2022
coverage entirely.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Gate SQL Server 2022 test configurations to CI pipelines only

Groups windows_sql_22_x64 and linux_ub22_sql_22 under a single
runSql22Tests conditional (mirroring the existing legacy SQL block) and
opts the PR pipelines out, so PR validation stays on SQL Server 2019,
2025 and Azure SQL.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Add .NET 10 test coverage to the CI-SqlClient pipeline

Introduce primaryTargetFrameworks and primaryTargetFrameworksUnix, which
apply only to the primary test configurations: local SQL Server 2025 and
Azure SQL, on both Windows and Linux.  Those configurations now run
net10.0 in addition to the existing target frameworks.

Restricting .NET 10 to the primary configurations keeps the added agent
cost bounded rather than multiplying it across every legacy SQL Server
image.  The other pipelines that extend the CI core pin the new
parameters to their existing target framework lists, so their behaviour
is unchanged.

Note that the driver itself only targets net462, net8.0, and net9.0, so
the net10.0 test assemblies resolve the net9.0 driver build.  These jobs
therefore validate the driver on the .NET 10 runtime rather than
validating a .NET 10 build of the driver.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d

* Rename the Linux enclave stage key to match its Ubuntu 24 agent

The key doubles as the generated stage name, and it still said Ubuntu20 after
the agent moved to Ubuntu 24.  A comment previously justified leaving it alone
by claiming branch policies and required status checks referenced it, but that
is not the case: the ADO branch policies reference pipeline definition ids, the
GitHub 'Main' ruleset defines no required status check contexts, and no policy
or ruleset mentions the stage name.  Stage names surface only in check-run
names, so the rename is safe.

Rename it to Ubuntu24_Enclave_Sql19 and keep a one-line note that the 'Sql19'
suffix names the remote Enclave-enabled SQL Server 2019 under test rather than
the agent image.

* Select agent images from the pool name in every job template

Four job templates each decided differently whether to select an image with
'vmImage' (Microsoft-hosted) or an imageOverride demand (1ES): a hostedPool
boolean, a poolName comparison, and a startsWith(vmImage, 'macos') check.  The
stress job additionally picked its own pool name from the ADO project.

Unify all four on the poolName comparison already used by the package test
jobs, so the invariant "the hosted 'Azure Pipelines' pool is used only for
macos-latest" is visible at each call site:

  pool:
    name: ${{ parameters.poolName }}
    ${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
      vmImage: ${{ parameters.vmImage }}
    ${{ else }}:
      demands:
        - imageOverride -equals ${{ parameters.vmImage }}

Drop the hostedPool parameter and its plumbing, give the stress job a poolName
parameter flowed down from its pipeline root, and hardcode 'Azure Pipelines' at
the three macOS call sites instead of routing it through an azurePoolName
parameter that no caller ever set.

Also rename the test configuration keys in the CI core pipeline to an
<os>_<sql> form, and split the combined Windows Azure SQL configuration into
separate Windows Server 2025 and Windows 11 configurations.

* Standardize the pool parameter name and clarify pool terminology

Rename the 'adoPoolName' stage parameter to 'poolName'.  The name existed to
distinguish it from a sibling 'azurePoolName' parameter, but that sibling is
gone now that the macOS jobs name the Microsoft-hosted pool directly, and three
of the five build stages that used 'adoPoolName' never had a sibling to
disambiguate from.  Every pool parameter in eng/pipelines is now 'poolName'.

Document, on each job template that selects an image, that the pool name is
compared at template-expansion time, so the Microsoft-hosted pool must be named
by the literal 'Azure Pipelines' rather than a $(...) macro.

Replace the ambiguous term 'hosted pool' with 'Microsoft-hosted Azure Pipelines
pool', since every pool is hosted somewhere, and reword the SQL Server setup
step headers from '1ES Hosted Pool' to '1ES pools'.  Refresh the stale
ADO-UB20-SQL22 example in the CI Linux setup step to ADO-UB24-SQL25.

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Copilot-Session: 10246002-c950-42a7-adf5-1698f9af4b3d
---
 .../ci/stress/sqlclient-ci-stress-job.yml     |  34 ++-
 .../stress/sqlclient-ci-stress-pipeline.yml   |   6 +
 .../ci/stress/sqlclient-ci-stress-stage.yml   |  12 +-
 .../templates/jobs/ci-build-nugets-job.yml    |  11 +-
 .../templates/jobs/ci-code-coverage-job.yml   |  19 +-
 .../templates/jobs/ci-run-tests-job.yml       |  15 +-
 .../templates/stages/ci-run-tests-stage.yml   |   2 -
 .../steps/configure-sql-server-linux-step.yml |   4 +-
 .../steps/configure-sql-server-win-step.yml   |   2 +-
 eng/pipelines/dotnet-sqlclient-ci-core.yml    | 194 ++++++++++++++----
 eng/pipelines/github-sync-pipeline.yml        |   7 +-
 .../jobs/pack-abstractions-package-ci-job.yml |  19 +-
 .../jobs/pack-azure-package-ci-job.yml        |  19 +-
 .../jobs/pack-logging-package-ci-job.yml      |  19 +-
 .../jobs/pack-sqlserver-package-ci-job.yml    |  19 +-
 .../jobs/test-abstractions-package-ci-job.yml |   4 +
 .../jobs/test-azure-package-ci-job.yml        |   4 +
 eng/pipelines/pr/sqlclient-pr-pipeline.yml    |  17 ++
 .../pr/stages/collect-coverage-stage.yml      |  13 +-
 .../pr/stages/generate-secrets-stage.yml      |  16 +-
 eng/pipelines/pr/stages/pack-stage.yml        |  13 +-
 .../steps/configure-sqlserver-linux-step.yml  |   4 +-
 .../configure-sqlserver-windows-step.yml      |   2 +-
 .../sqlclient-pr-package-ref-pipeline.yml     |   3 +
 .../sqlclient-pr-project-ref-pipeline.yml     |   3 +
 .../build-abstractions-package-ci-stage.yml   |  24 ++-
 .../stages/build-azure-package-ci-stage.yml   |  78 ++-----
 .../stages/build-logging-package-ci-stage.yml |   9 +
 .../build-sqlclient-package-ci-stage.yml      |   9 +
 .../build-sqlserver-package-ci-stage.yml      |   9 +
 .../stages/compute-versions-ci-stage.yml      |  17 +-
 .../stages/generate-secrets-ci-stage.yml      |  21 +-
 .../stages/verify-nuget-packages-ci-stage.yml |  19 +-
 33 files changed, 476 insertions(+), 171 deletions(-)

diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
index d70ce90c33..5b46f6c3fa 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
@@ -71,12 +71,17 @@ parameters:
   - name: sqlSetupStep
     type: step
 
-  # The pool VM image to use.  Both the internal (ADO-1ES-Pool) and public (ADO-CI-1ES-Pool) pools
-  # must provide an image with this name.
+  # The name of the pool to run in.
   #
-  # NOTE: This value is evaluated at template-expansion (compile) time to select the pool, so it
-  # must be a literal and must not contain any runtime expressions (e.g. $(...) macros or
-  # $[...] runtime expressions).
+  # Supplied by the caller so that the pool name flows down from the pipeline root.
+  #
+  # NOTE: This value is compared at template-expansion (compile) time to choose between 'vmImage'
+  # and an imageOverride demand, so the Microsoft-hosted 'Azure Pipelines' pool must be named by
+  # that exact literal, not by a $(...) macro or $[...] runtime expression.
+  - name: poolName
+    type: string
+
+  # The pool VM image to use, which must exist in the specified pool.
   - name: vmImage
     type: string
 
@@ -89,11 +94,6 @@ jobs:
 
     variables:
 
-      # Whether this is an internal (ADO.Net project) or public (Public project) build.  Evaluated
-      # at compile time so it can drive template expressions below.
-      - name: isInternalBuild
-        value: ${{ eq(variables['System.TeamProject'], 'ADO.Net') }}
-
       # Import the variable group that provides SQL Server build properties used by the
       # shared configure-sql-server-*-step.yml templates (e.g. x64AliasRegistryPath,
       # x86AliasRegistryPath, SQLAliasName, SQLAliasPort).
@@ -162,18 +162,14 @@ jobs:
       - name: stressTestOpts
         value: --assembly SqlClient.Stress.Tests --console
 
-    # Select the pool based on the requested image:
-    #   - macOS images run on the Microsoft-hosted 'Azure Pipelines' pool (no 1ES macOS images).
-    #   - All other images run on the 1ES pool for the current ADO project, matched via imageOverride.
     pool:
-      ${{ if startsWith(parameters.vmImage, 'macos') }}:
-        name: 'Azure Pipelines'
+      name: ${{ parameters.poolName }}
+
+      # Images provided by Azure Pipelines must be selected using 'vmImage'.
+      ${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
         vmImage: ${{ parameters.vmImage }}
+      # Images provided by 1ES must be selected using a demand.
       ${{ else }}:
-        ${{ if eq(variables.isInternalBuild, true) }}:
-          name: ADO-1ES-Pool
-        ${{ else }}:
-          name: ADO-CI-1ES-Pool
         demands:
           - imageOverride -equals ${{ parameters.vmImage }}
 
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
index 74403bd743..57d52d8e4a 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
@@ -89,6 +89,9 @@ parameters:
       - detailed
       - diagnostic
 
+variables:
+  - template: /eng/pipelines/libraries/ci-build-variables.yml@self
+
 # The stages to run.
 stages:
 
@@ -96,10 +99,13 @@ stages:
   - template: /eng/pipelines/stages/generate-secrets-ci-stage.yml@self
     parameters:
       debug: ${{ parameters.debug }}
+      poolName: $(ci_var_defaultPoolName)
+      vmImage: ADO-UB24
 
   # Run the stress tests.
   - template: /eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml@self
     parameters:
+      poolName: $(ci_var_defaultPoolName)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
       warnOnTestFailure: ${{ parameters.warnOnTestFailure }}
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
index 3cbdb9d31e..0a1916594d 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
@@ -20,6 +20,12 @@
 
 parameters:
 
+  # The name of the pool to use for jobs that require customized VM images.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline root.
+  - name: poolName
+    type: string
+
   # The type of build to produce (Debug or Release)
   - name: buildConfiguration
     type: string
@@ -89,6 +95,7 @@ stages:
           template: /eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml@self
           parameters:
             saPassword: $(saPassword)
+        poolName: ${{ parameters.poolName }}
         vmImage: ADO-UB24-SQL25
 
     # ----------------------------------------------------------------------------------------------
@@ -112,6 +119,7 @@ stages:
             saPassword: $(saPassword)
         # The Windows images include a suitable .NET Framework runtime, so we don't have to install
         # one explicitly.
+        poolName: ${{ parameters.poolName }}
         vmImage: ADO-MMS25-SQL25
 
     # ----------------------------------------------------------------------------------------------
@@ -133,5 +141,7 @@ stages:
           template: /eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml@self
           parameters:
             saPassword: $(saPassword)
-        # A macOS vmImage name routes this job to the Microsoft-hosted 'Azure Pipelines' pool.
+        # Our 1ES pools do not offer macOS images, so this job runs on the Microsoft-hosted
+        # 'Azure Pipelines' pool.
+        poolName: Azure Pipelines
         vmImage: macos-latest
diff --git a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
index 95d5d0b7d0..5840663f5c 100644
--- a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
@@ -19,15 +19,18 @@ parameters:
       # Reference sibling packages as C# projects.
       - Project
 
-  # The name of Azure Pipelines pool to use.
+  # The name of the 1ES pool to use.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
   - name: poolName
     type: string
-    default: $(ci_var_defaultPoolName)
 
-  # The name of the Azure Pipelines image to use within the pool.
+  # The imageOverride capability required from the 1ES pool.
   - name: imageOverride
     type: string
-    default: ADO-MMS22-SQL19
+    default: ADO-Win25
 
   # The name of the Abstractions pipeline artifact to download when referenceType is 'Package'.
   - name: abstractionsArtifactsName
diff --git a/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml b/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
index e4e28d4803..63c74a8013 100644
--- a/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
@@ -19,13 +19,28 @@ parameters:
   - name: upload
     type: boolean
 
+  # The name of the 1ES pool to run in.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+    default: ADO-UB24
+
 jobs:
   - job: publish_code_coverage
     displayName: Publish Code Coverage
 
     pool:
-      name: Azure Pipelines
-      vmImage: ubuntu-latest
+      name: ${{ parameters.poolName }}
+
+      demands:
+        - imageOverride -equals ${{ parameters.vmImage }}
 
     variables:
       # Use a temp directory that is cleaned up after each job runs.  This helps
diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
index 4752e09e43..ba028f1502 100644
--- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
@@ -56,12 +56,6 @@ parameters:
     type: boolean
     default: false
 
-  # True if this job will run in a generic Azure Pipelines hosted pool; false to run in a custom 1ES
-  # pool.
-  - name: hostedPool
-    type: boolean
-    default: false
-
   # The VM image to use, which must exist in the specified pool.
   - name: image
     type: string
@@ -110,6 +104,10 @@ parameters:
       - Release
 
   # The name of the Azure Pipelines pool to use.
+  #
+  # NOTE: This value is compared at template-expansion (compile) time to choose between 'vmImage'
+  # and an imageOverride demand, so the Microsoft-hosted 'Azure Pipelines' pool must be named by
+  # that exact literal, not by a $(...) macro or $[...] runtime expression.
   - name: poolName
     type: string
 
@@ -157,8 +155,11 @@ jobs:
 
   pool:
     name: '${{ parameters.poolName }}'
-    ${{ if eq(parameters.hostedPool, true) }}:
+
+    # Images provided by Azure Pipelines must be selected using 'vmImage'.
+    ${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
       vmImage: ${{ parameters.image }}
+    # Images provided by 1ES must be selected using a demand.
     ${{ else }}:
       demands:
       - imageOverride -equals ${{ parameters.image }}
diff --git a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
index 7ed67c1af9..1cda6c7580 100644
--- a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
+++ b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
@@ -106,7 +106,6 @@ stages:
                   referenceType: ${{ parameters.referenceType }}
                   timeout: ${{ parameters.testJobTimeout }}
                   poolName: ${{ config.value.pool }}
-                  hostedPool: ${{ eq(config.value.hostedPool, true) }}
                   image: ${{ image.value }}
                   jobDisplayName: ${{ format('{0}_{1}_{2}', replace(targetFramework, '.', '_'), platform, testSet) }}
                   configProperties: ${{ config.value.configProperties }}
@@ -137,7 +136,6 @@ stages:
                     referenceType: ${{ parameters.referenceType }}
                     timeout: ${{ parameters.testJobTimeout }}
                     poolName: ${{ config.value.pool }}
-                    hostedPool: ${{ eq(config.value.hostedPool, true) }}
                     image: ${{ image.value }}
                     ${{if eq(usemanagedSNI, 'true') }}:
                       jobDisplayName: ${{ format('{0}_{1}_{2}_{3}', replace(targetFramework, '.', '_'), platform, 'ManagedSNI', testSet) }}
diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml
index a397108701..bafb9eda1c 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml
@@ -4,8 +4,8 @@
 # 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
+# This step configures an existing SQL Server running on the local Linux host.  For example, our
+# 1ES pools have images like ADO-UB24-SQL25 that come with SQL Server 2025 pre-installed and
 # running.
 
 parameters:
diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
index 6980c1f33c..cd691cc4a2 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-win-step.yml
@@ -5,7 +5,7 @@
 #################################################################################
 
 # This step configures an existing SQL Server running on the local Windows host.  For example, our
-# 1ES Hosted Pool has images like ADO-MMS25-SQL25 that come with SQL Server 2025 pre-installed and
+# 1ES pools have images like ADO-MMS25-SQL25 that come with SQL Server 2025 pre-installed and
 # running.
 
 parameters:
diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index 335e98b575..9b53b6a85a 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -94,6 +94,18 @@ parameters:
       - Debug
       - Release
 
+  # The name of the 1ES pool that all CI jobs run in.
+  #
+  # This is the single place in the CI pipelines where the pool name is read
+  # from a variable group; every stage and job below receives it as a
+  # parameter so that the value flows down from here.
+  #
+  # 'ci_var_defaultPoolName' is defined in the 'ADO Build properties' variable
+  # group (see /eng/pipelines/libraries/ci-build-variables.yml), for both the
+  # Public and ADO.Net projects.  The PR pipelines are configured from a
+  # different variable group and use '$(PoolNameDefault)' instead; see
+  # /eng/pipelines/pr/sqlclient-pr-pipeline.yml.
+  #
   - name: defaultPoolName
     type: string
     default: $(ci_var_defaultPoolName)
@@ -114,6 +126,15 @@ parameters:
     type: boolean
     default: true
 
+  # If true, run manual tests against SQL Server 2022.
+  #
+  # The primary test configurations run against SQL Server 2025, so SQL Server
+  # 2022 is CI-only coverage.  PR pipelines disable it to keep validation fast.
+  #
+  - name: runSql22Tests
+    type: boolean
+    default: true
+
   # Build suffix appended to the prerelease tag. PR pipelines pass 'pr',
   # CI pipelines pass 'ci'. Official builds leave this empty.
   - name: buildSuffix
@@ -148,16 +169,17 @@ variables:
     value: SqlServer.Artifacts
 
 stages:
-  # Compute all package versions up-front. Downstream stages consume these via
-  # Each build/test stage computes the versions it needs directly from the
-  # compute_versions_ci stage outputs, so no version parameters are passed here.
+  # Compute all package versions up front. Build and test stages consume the
+  # compute_versions_ci outputs directly, so no version parameters are passed here.
   - template: /eng/pipelines/stages/compute-versions-ci-stage.yml@self
     parameters:
+      poolName: ${{ parameters.defaultPoolName }}
       buildSuffix: ${{ parameters.buildSuffix }}
 
   # Generate secrets used throughout the pipeline.
   - template: /eng/pipelines/stages/generate-secrets-ci-stage.yml@self
     parameters:
+      poolName: ${{ parameters.defaultPoolName }}
       debug: ${{ parameters.debug }}
 
   # Build the SqlServer package, and publish it to the pipeline artifacts
@@ -165,6 +187,7 @@ stages:
   # generation stage since it has no package dependencies.
   - template: /eng/pipelines/stages/build-sqlserver-package-ci-stage.yml@self
     parameters:
+      poolName: ${{ parameters.defaultPoolName }}
       sqlServerArtifactsName: $(sqlServerArtifactsName)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
@@ -175,6 +198,7 @@ stages:
   # generation stage since it has no package dependencies.
   - template: /eng/pipelines/stages/build-logging-package-ci-stage.yml@self
     parameters:
+      poolName: ${{ parameters.defaultPoolName }}
       loggingArtifactsName: $(loggingArtifactsName)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
@@ -187,6 +211,7 @@ stages:
   # Abstractions has a package dependency on Logging.
   - template: /eng/pipelines/stages/build-abstractions-package-ci-stage.yml@self
     parameters:
+      poolName: ${{ parameters.defaultPoolName }}
       abstractionsArtifactsName: $(abstractionsArtifactsName)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
@@ -205,6 +230,7 @@ stages:
   #
   - template: /eng/pipelines/stages/build-sqlclient-package-ci-stage.yml@self
     parameters:
+      poolName: ${{ parameters.defaultPoolName }}
       abstractionsArtifactsName: $(abstractionsArtifactsName)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       loggingArtifactsName: $(loggingArtifactsName)
@@ -225,6 +251,7 @@ stages:
   # given artifact name.
   - template: /eng/pipelines/stages/build-azure-package-ci-stage.yml@self
     parameters:
+      poolName: ${{ parameters.defaultPoolName }}
       abstractionsArtifactsName: $(abstractionsArtifactsName)
       azureArtifactsName: $(azureArtifactsName)
       buildConfiguration: ${{ parameters.buildConfiguration }}
@@ -248,6 +275,7 @@ stages:
   # published as pipeline artifacts.
   - template: /eng/pipelines/stages/verify-nuget-packages-ci-stage.yml@self
     parameters:
+      poolName: ${{ parameters.defaultPoolName }}
       abstractionsArtifactsName: $(abstractionsArtifactsName)
       azureArtifactsName: $(azureArtifactsName)
       loggingArtifactsName: $(loggingArtifactsName)
@@ -295,6 +323,7 @@ stages:
           - template: /eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml@self
             parameters:
               debug: ${{ parameters.debug }}
+              poolName: ${{ parameters.defaultPoolName }}
               # We only want to upload coverage results to CodeCov from certain
               # pipelines.  We use the pipeline name (Build.DefinitionName) to
               # choose.  This is a predefined variable that is available at
@@ -316,13 +345,14 @@ stages:
 
       # Configuration of test jobs.  Each entry in this object will become a test job, and the
       # properties of each entry will be supplied as parameters to the test job template.
+      #
+      # The OS architecture is assumed to be x64 unless otherwise noted.
+      #
       testConfigurations:
-        # SQL Server 2016 and 2017 on Windows Server 2022 (x64 only).
-        # x86 testing is intentionally skipped for these legacy SQL versions
-        # because x86 support is already validated via SQL 2019 and 2025 images.
+        # SQL Server 2016 and 2017 on Windows Server 2022.
         ${{ if eq(parameters.runLegacySqlTests, true) }}:
-          # Windows Server 22 with local SQL Server 2016, x64 build platform.
-          windows_sql_16_x64:
+          # Windows Server 22 with local SQL Server 2016.
+          win22_sql16:
             pool: ${{parameters.defaultPoolName }}
             images:
               Win22_Sql16: ADO-MMS22-SQL16
@@ -347,8 +377,8 @@ stages:
               SQLRootPath: $(SQL16RootPath)
               enableLocalDB: true
 
-          # Windows Server 22 with local SQL Server 2017, x64 build platform.
-          windows_sql_17_x64:
+          # Windows Server 22 with local SQL Server 2017.
+          win22_sql17:
             pool: ${{parameters.defaultPoolName }}
             images:
               Win22_Sql17: ADO-MMS22-SQL17
@@ -373,8 +403,8 @@ stages:
               SQLRootPath: $(SQL17RootPath)
               enableLocalDB: true
 
-        # Windows Server 22 with local SQL Server 2019, x64 build platform.
-        windows_sql_19_x64:
+        # Windows Server 22 with local SQL Server 2019.
+        win22_sql19:
           pool: ${{parameters.defaultPoolName }}
           images:
             Win22_Sql19: ADO-MMS22-SQL19
@@ -400,8 +430,8 @@ stages:
             SQLRootPath: $(SQL19RootPath)
             enableLocalDB: true
 
-        # Windows Server 22 with local SQL Server 2019, x86 build platform.
-        windows_sql_19_x86:
+        # Windows Server 22 with local SQL Server 2019, x86.
+        win22_sql19_x86:
           pool: ${{parameters.defaultPoolName }}
           images:
             Win22_Sql19_x86: ADO-MMS22-SQL19
@@ -427,8 +457,8 @@ stages:
             SQLRootPath: $(SQL19RootPath)
             enableLocalDB: true
 
-        # Windows Server 25 with local SQL Server 2025, x64 build platform.
-        windows_sql_25_x64:
+        # Windows Server 25 with local SQL Server 2025.
+        win25_sql25:
           pool: ${{parameters.defaultPoolName }}
           images:
             Win25_Sql25: ADO-MMS25-SQL25
@@ -453,8 +483,8 @@ stages:
             SQLRootPath: $(SQL25RootPath)
             enableLocalDB: true
 
-        # Windows Server 25 with local SQL Server 2025, x86 build platform.
-        windows_sql_25_x86:
+        # Windows Server 25 with local SQL Server 2025, x86.
+        win25_sql25_x86:
           pool: ${{parameters.defaultPoolName }}
           images:
             Win25_Sql25_x86: ADO-MMS25-SQL25
@@ -480,8 +510,8 @@ stages:
             SQLRootPath: $(SQL25RootPath)
             enableLocalDB: true
 
-        # Windows Server 25 with local SQL Server 2025 Named Instance, x64 build platform.
-        windows_sql_25_named_instance:
+        # Windows Server 25 with local SQL Server 2025 Named Instance.
+        win25_sql25_named_instance:
           pool: ${{parameters.defaultPoolName }}
           images:
             Win25_Sql25_Named_Instance: ADO-MMS25-SQL25-WITH-NAMED-INSTANCE
@@ -499,12 +529,11 @@ stages:
             SQLRootPath: $(SQL25RootPath)
             instanceName: $(NamedInstance)
 
-        # Windows Server 2022 and Windows 11, x64 build platform, with Azure SQL Server.
-        windows_azure_sql:
+        # Windows Server 2025, x64 build platform, with Azure SQL Server.
+        win25_azure_sql:
           pool: ${{parameters.defaultPoolName }}
           images:
-            Win22_Azure_Sql: ADO-MMS22-SQL19
-            Win11_Azure_Sql: ADO-CI-Win11
+            Win25_Azure_Sql: ADO-Win25
           TargetFrameworks: ${{parameters.primaryTargetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}
@@ -530,11 +559,38 @@ stages:
             LocalDbAppName: $(LocalDbAppName)
             LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
 
+        # Windows 11, x64 build platform, with Azure SQL Server.
+        win11_azure_sql:
+          pool: ${{parameters.defaultPoolName }}
+          images:
+            Win11_Azure_Sql: ADO-CI-Win11
+          TargetFrameworks: ${{parameters.targetFrameworks }}
+          netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
+          buildPlatforms: ${{parameters.buildPlatforms }}
+          testSets: ${{parameters.testSets }}
+          useManagedSNI: ${{parameters.useManagedSNI }}
+          configSqlFor: azure
+          operatingSystem: Windows
+          configProperties:
+            TCPConnectionString: $(AZURE_DB_TCP_CONN_STRING)
+            NPConnectionString: $(AZURE_DB_NP_CONN_STRING)
+            AADAuthorityURL: $(AADAuthorityURL)
+            ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
+              AADPasswordConnectionString: $(AAD_PASSWORD_CONN_STR)
+              AADServicePrincipalSecret: $(AADServicePrincipalSecret)
+            AADServicePrincipalId: $(AADServicePrincipalId)
+            AzureKeyVaultUrl: $(AzureKeyVaultUrl)
+            AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
+            SupportsIntegratedSecurity: false
+            UserManagedIdentityClientId: $(UserManagedIdentityClientId)
+            LocalDbAppName: $(LocalDbAppName)
+            LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
+
         # Windows 11 on ARM64 with Azure SQL Server.
-        windows_azure_arm64_sql:
+        win11_azure_sql_arm64:
           pool: ADO-CI-PUBLIC-ARM64-1ES-EUS-POOL
           images:
-            Win11_ARM64_Azure_Sql: ADO-WIN11-ARM64
+            Win11_Azure_Sql_ARM64: ADO-WIN11-ARM64
           TargetFrameworks: ${{parameters.targetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}
@@ -557,8 +613,8 @@ stages:
             LocalDbAppName: $(LocalDbAppName)
             LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
 
-        # Linux Ubuntu 24 with local SQL Server 2025, x64 build platform.
-        linux_ub24_sql_25:
+        # Linux Ubuntu 24 with local SQL Server 2025.
+        linux_ub24_sql25:
           pool: ${{parameters.defaultPoolName }}
           images:
             Ubuntu24_Sql25: ADO-UB24-SQL25
@@ -580,11 +636,67 @@ stages:
             LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
             AliasName: $(SQLAliasName)
 
-        # Linux Ubuntu 24 with Azure SQL Server, x64 build platform.
-        linux_azure_sql:
+        # SQL Server 2022 coverage, on Windows and Linux.
+        #
+        # The primary configurations run against SQL Server 2025, so these keep
+        # SQL Server 2022 in the matrix.  They are grouped under a single
+        # conditional so that PR pipelines can opt out of them as a unit.
+        ${{ if eq(parameters.runSql22Tests, true) }}:
+          # Windows Server 22 with local SQL Server 2022.
+          win22_sql22:
+            pool: ${{parameters.defaultPoolName }}
+            images:
+              Win22_Sql22: ADO-MMS22-SQL22
+            TargetFrameworks: ${{parameters.targetFrameworks }}
+            netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
+            buildPlatforms: ${{parameters.buildPlatforms }}
+            testSets: ${{parameters.testSets }}
+            useManagedSNI: ${{parameters.useManagedSNI }}
+            configSqlFor: local
+            operatingSystem: Windows
+            # config.jsonc properties
+            configProperties:
+              TCPConnectionString: $(SQL_TCP_CONN_STRING)
+              NPConnectionString: $(SQL_NP_CONN_STRING)
+              AzureKeyVaultUrl: $(AzureKeyVaultUrl)
+              AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
+              SupportsIntegratedSecurity: true
+              UserManagedIdentityClientId: $(UserManagedIdentityClientId)
+              FileStreamDirectory: $(FileStreamDirectory)
+              LocalDbAppName: $(LocalDbAppName)
+              LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
+              AliasName: $(SQLAliasName)
+              SQLRootPath: $(SQL22RootPath)
+              enableLocalDB: true
+
+          # Linux Ubuntu 22 with local SQL Server 2022.
+          linux_ub22_sql22:
+            pool: ${{parameters.defaultPoolName }}
+            images:
+              Ubuntu22_Sql22: ADO-UB22-SQL22
+            TargetFrameworks: ${{parameters.targetFrameworksUnix }}
+            netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
+            buildPlatforms: [AnyCPU]
+            testSets: ${{parameters.testSets }}
+            useManagedSNI: [true]
+            configSqlFor: local
+            operatingSystem: Linux
+            configProperties:
+              TCPConnectionString: $(SQL_TCP_CONN_STRING)
+              NPConnectionString: $(SQL_NP_CONN_STRING)
+              AzureKeyVaultUrl: $(AzureKeyVaultUrl)
+              AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
+              SupportsIntegratedSecurity: false
+              UserManagedIdentityClientId: $(UserManagedIdentityClientId)
+              LocalDbAppName: $(LocalDbAppName)
+              LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
+              AliasName: $(SQLAliasName)
+
+        # Linux Ubuntu 24 with Azure SQL Server.
+        linux_ub24_azure_sql:
           pool: ${{parameters.defaultPoolName }}
           images:
-            Ubuntu24_Azure_Sql: ADO-UB24-SQL25
+            Ubuntu24_Azure_Sql: ADO-UB24
           TargetFrameworks: ${{parameters.primaryTargetFrameworksUnix }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: [AnyCPU]
@@ -608,9 +720,8 @@ stages:
             LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
 
         # macOS with local SQL Server 2025 (docker), x64 build platform.
-        mac_sql_25:
+        mac_sql25:
           pool: Azure Pipelines
-          hostedPool: true
           images:
             MacOSLatest_Sql25: macos-latest
           TargetFrameworks: ${{parameters.targetFrameworksUnix }}
@@ -633,11 +744,11 @@ stages:
         # Only run these tests if explicitly enabled, and if we're not a forked repo (which won't
         # have access to the necessary Library secrets).
         ${{ if and(eq(parameters.runAlwaysEncryptedTests, true), eq(variables['System.PullRequest.IsFork'], 'False')) }}:
-          # Windows Server 22 with remote Enclave-enabled SQL Server 2019, x64 build platform.
-          windows_enclave_sql:
+          # Windows Server 22 with remote Enclave-enabled SQL Server 2019.
+          win22_enclave_sql19:
             pool: ADO-CI-AE-1ES-Pool
             images:
-              Win22_Enclave_Sql19: ADO-MMS22-SQL19
+              Win22_Enclave_Sql19: ADO-Win25
             TargetFrameworks: ${{parameters.targetFrameworks }}
             netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
             buildPlatforms: ${{parameters.buildPlatforms }}
@@ -661,16 +772,11 @@ stages:
               LocalDbAppName: $(LocalDbAppName)
               LocalDbSharedInstanceName: $(LocalDbSharedInstanceName)
 
-          # Linux Ubuntu 24 with remote Enclave-enabled SQL Server 2019, x64 build platform.
-          linux_enclave_sql:
+          # Linux Ubuntu 24 with remote Enclave-enabled SQL Server 2019.
+          linux_ub24_enclave_sql19:
             pool: ADO-CI-AE-1ES-Pool
             images:
-              # NOTE: This key is also the generated stage name, and is
-              # referenced by branch policies / required status checks, so it is
-              # deliberately left unchanged.  The 'Sql19' suffix remains
-              # accurate: these tests target a remote Enclave-enabled SQL Server
-              # 2019.  Only the agent image has moved to Ubuntu 24.
-              Ubuntu20_Enclave_Sql19: ADO-UB24-SQL25
+              Ubuntu24_Enclave_Sql19: ADO-UB24
             TargetFrameworks: ${{parameters.targetFrameworksUnix }}
             netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
             buildPlatforms: [AnyCPU]
diff --git a/eng/pipelines/github-sync-pipeline.yml b/eng/pipelines/github-sync-pipeline.yml
index 699270f4de..6d186a10b1 100644
--- a/eng/pipelines/github-sync-pipeline.yml
+++ b/eng/pipelines/github-sync-pipeline.yml
@@ -57,11 +57,16 @@ parameters:
     type: string
     default: internal/main
 
+variables:
+  - template: /eng/pipelines/libraries/ci-build-variables.yml@self
+
 jobs:
   - job: SyncGitHub
     displayName: Sync GitHub to ADO
     pool:
-      vmImage: 'ubuntu-latest'
+      name: $(ci_var_defaultPoolName)
+      demands:
+        - imageOverride -equals ADO-UB24
 
     steps:
       # Check out the ADO repo with full history so we can compare branches.
diff --git a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
index 8bf43bd997..bbd80cc3f9 100644
--- a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
@@ -67,6 +67,19 @@ parameters:
       # Reference sibling packages as C# projects.
       - Project
 
+  # The name of the 1ES pool to run in.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+    default: ADO-UB24
+
 jobs:
 
   - job: pack_abstractions_package_job
@@ -75,8 +88,10 @@ jobs:
     dependsOn: ${{ parameters.dependsOn }}
 
     pool:
-      name: Azure Pipelines
-      vmImage: ubuntu-latest
+      name: ${{ parameters.poolName }}
+
+      demands:
+        - imageOverride -equals ${{ parameters.vmImage }}
 
     variables:
 
diff --git a/eng/pipelines/jobs/pack-azure-package-ci-job.yml b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
index 38eaf58fe9..b626dd14a5 100644
--- a/eng/pipelines/jobs/pack-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
@@ -73,6 +73,19 @@ parameters:
       # Reference sibling packages as C# projects.
       - Project
 
+  # The name of the 1ES pool to run in.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+    default: ADO-UB24
+
 jobs:
 
   - job: pack_azure_package_job
@@ -81,8 +94,10 @@ jobs:
     dependsOn: ${{ parameters.dependsOn }}
 
     pool:
-      name: Azure Pipelines
-      vmImage: ubuntu-latest
+      name: ${{ parameters.poolName }}
+
+      demands:
+        - imageOverride -equals ${{ parameters.vmImage }}
 
     variables:
 
diff --git a/eng/pipelines/jobs/pack-logging-package-ci-job.yml b/eng/pipelines/jobs/pack-logging-package-ci-job.yml
index 0f0faa1859..03fde36308 100644
--- a/eng/pipelines/jobs/pack-logging-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-logging-package-ci-job.yml
@@ -50,6 +50,19 @@ parameters:
     - detailed
     - diagnostic
 
+  # The name of the 1ES pool to run in.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+    default: ADO-UB24
+
 jobs:
 
   - job: pack_logging_package_job
@@ -58,8 +71,10 @@ jobs:
     dependsOn: ${{ parameters.dependsOn }}
 
     pool:
-      name: Azure Pipelines
-      vmImage: ubuntu-latest
+      name: ${{ parameters.poolName }}
+
+      demands:
+        - imageOverride -equals ${{ parameters.vmImage }}
 
     variables:
 
diff --git a/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml b/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
index 4f619b3f1b..c869026812 100644
--- a/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
@@ -49,6 +49,19 @@ parameters:
     - detailed
     - diagnostic
 
+  # The name of the 1ES pool to run in.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+    default: ADO-UB24
+
 jobs:
 
   - job: pack_sqlserver_package_job
@@ -57,8 +70,10 @@ jobs:
     dependsOn: ${{ parameters.dependsOn }}
 
     pool:
-      name: Azure Pipelines
-      vmImage: ubuntu-latest
+      name: ${{ parameters.poolName }}
+
+      demands:
+        - imageOverride -equals ${{ parameters.vmImage }}
 
     variables:
 
diff --git a/eng/pipelines/jobs/test-abstractions-package-ci-job.yml b/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
index 83366b52a9..1cdf04c0be 100644
--- a/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
@@ -58,6 +58,10 @@ parameters:
     default: []
 
   # The name of the Azure Pipelines pool to use.
+  #
+  # NOTE: This value is compared at template-expansion (compile) time to choose between 'vmImage'
+  # and an imageOverride demand, so the Microsoft-hosted 'Azure Pipelines' pool must be named by
+  # that exact literal, not by a $(...) macro or $[...] runtime expression.
   - name: poolName
     type: string
 
diff --git a/eng/pipelines/jobs/test-azure-package-ci-job.yml b/eng/pipelines/jobs/test-azure-package-ci-job.yml
index 104401b585..cedd26e056 100644
--- a/eng/pipelines/jobs/test-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-azure-package-ci-job.yml
@@ -98,6 +98,10 @@ parameters:
     default: []
 
   # The name of the Azure Pipelines pool to use.
+  #
+  # NOTE: This value is compared at template-expansion (compile) time to choose between 'vmImage'
+  # and an imageOverride demand, so the Microsoft-hosted 'Azure Pipelines' pool must be named by
+  # that exact literal, not by a $(...) macro or $[...] runtime expression.
   - name: poolName
     type: string
 
diff --git a/eng/pipelines/pr/sqlclient-pr-pipeline.yml b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
index 4ab1a31f60..5ad15f5474 100644
--- a/eng/pipelines/pr/sqlclient-pr-pipeline.yml
+++ b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
@@ -103,6 +103,17 @@ variables:
   - template: /eng/pipelines/pr/variables/pr-variables.yml@self
 
 stages:
+  # NOTE: '$(PoolNameDefault)' comes from the 'sqlclient-testconfig-v1'
+  # variable group, which is imported by
+  # /eng/pipelines/pr/variables/pr-variables.yml (included above).  It is
+  # referenced here, at the pipeline root, and passed down to every stage as a
+  # parameter, so that no template reads the pool name from a variable group
+  # directly.
+  #
+  # The CI pipelines are configured from a different variable group and use
+  # '$(ci_var_defaultPoolName)' instead; see
+  # /eng/pipelines/dotnet-sqlclient-ci-core.yml.
+
   # Stage 1a: Build and pack all projects in the repository
   - template: /eng/pipelines/pr/stages/pack-stage.yml@self
     parameters:
@@ -110,11 +121,15 @@ stages:
       buildSuffix: pr
       stageName: ${{ variables.stageNamePack }}
       packArtifactBaseName: ${{ variables.packArtifactBaseName }}
+      poolName: $(PoolNameDefault)
+      vmImage: ADO-UB24
 
   # Stage 1b: Generate secrets
   - template: /eng/pipelines/pr/stages/generate-secrets-stage.yml@self
     parameters:
       stageName: ${{ variables.stageNameSecrets }}
+      poolName: $(PoolNameDefault)
+      vmImage: ADO-UB24
 
   # Stage 2: Execute tests and collect code coverage
   - template: /eng/pipelines/pr/stages/test-stages.yml@self
@@ -144,6 +159,8 @@ stages:
   - template: /eng/pipelines/pr/stages/collect-coverage-stage.yml@self
     parameters:
       coverageArtifactBaseName: ${{ variables.coverageArtifactBaseName }}
+      poolName: $(PoolNameDefault)
+      vmImage: ADO-UB24
       dependsOn:
         - ${{ each platform in parameters.platforms }}:
             - "test_${{ platform.displayName }}"
diff --git a/eng/pipelines/pr/stages/collect-coverage-stage.yml b/eng/pipelines/pr/stages/collect-coverage-stage.yml
index 9a0328ec50..a81b4bb1be 100644
--- a/eng/pipelines/pr/stages/collect-coverage-stage.yml
+++ b/eng/pipelines/pr/stages/collect-coverage-stage.yml
@@ -16,6 +16,14 @@ parameters:
   - name: coverageArtifactBaseName
     type: string
 
+  # The name of the 1ES pool to run in.
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+
 stages:
   - stage: collect_code_coverage
     displayName: "Collect code coverage"
@@ -26,7 +34,10 @@ stages:
         displayName: "Collect Code Coverage"
 
         pool:
-          vmImage: ubuntu-latest
+          name: ${{ parameters.poolName }}
+
+          demands:
+            - imageOverride -equals ${{ parameters.vmImage }}
 
         variables:
 
diff --git a/eng/pipelines/pr/stages/generate-secrets-stage.yml b/eng/pipelines/pr/stages/generate-secrets-stage.yml
index 20a81fe626..bd7d2d6a5c 100644
--- a/eng/pipelines/pr/stages/generate-secrets-stage.yml
+++ b/eng/pipelines/pr/stages/generate-secrets-stage.yml
@@ -30,6 +30,14 @@ parameters:
   - name: stageName
     type: string
 
+  # The name of the 1ES pool to run in.
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+
 stages:
 
   # The stage downstream stages must depend on to ensure the secrets are generated before they are
@@ -45,9 +53,11 @@ stages:
       - job: secrets_job
         displayName: Generate Secrets
         pool:
-          # We don't need anything special, so use the standard Microsoft-hosted Ubuntu image, which
-          # is typically very fast to spin up.
-          vmImage: ubuntu-latest
+          # This job has no special image requirements, so use a minimal Linux image.
+          name: ${{ parameters.poolName }}
+
+          demands:
+            - imageOverride -equals ${{ parameters.vmImage }}
 
         steps:
 
diff --git a/eng/pipelines/pr/stages/pack-stage.yml b/eng/pipelines/pr/stages/pack-stage.yml
index 2b43c8632a..8da436f445 100644
--- a/eng/pipelines/pr/stages/pack-stage.yml
+++ b/eng/pipelines/pr/stages/pack-stage.yml
@@ -42,6 +42,14 @@ parameters:
   - name: packArtifactBaseName
     type: string
 
+  # The name of the 1ES pool to run in.
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+
 stages:
   - stage: ${{ parameters.stageName }}
     displayName: Build and Pack Projects
@@ -52,7 +60,10 @@ stages:
         displayName: Build and Pack Projects
 
         pool:
-          vmImage: 'ubuntu-latest'
+          name: ${{ parameters.poolName }}
+
+          demands:
+            - imageOverride -equals ${{ parameters.vmImage }}
 
         steps:
           # Install dotnet
diff --git a/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml b/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml
index df625dc35e..c240b8525f 100644
--- a/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml
+++ b/eng/pipelines/pr/steps/configure-sqlserver-linux-step.yml
@@ -4,8 +4,8 @@
 # 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-UB24-SQL25 that come with SQL Server 2025 pre-installed and
+# This step configures an existing SQL Server running on the local Linux host.  For example, our
+# 1ES pools have images like ADO-UB24-SQL25 that come with SQL Server 2025 pre-installed and
 # running.
 
 parameters:
diff --git a/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml b/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
index 405582d655..cf66c1e9c3 100644
--- a/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
+++ b/eng/pipelines/pr/steps/configure-sqlserver-windows-step.yml
@@ -5,7 +5,7 @@
 #################################################################################
 
 # This step configures an existing SQL Server running on the local Windows host.  For example, our
-# 1ES Hosted Pool has images like ADO-MMS25-SQL25 that come with SQL Server 2025 pre-installed and
+# 1ES pools have images like ADO-MMS25-SQL25 that come with SQL Server 2025 pre-installed and
 # running.
 
 parameters:
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index abb0ef5f39..7623f83ce4 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -145,6 +145,9 @@ extends:
     useManagedSNI: ${{ parameters.useManagedSNI }}
     # Legacy SQL Server tests (2016/2017) run in CI only, not on PRs.
     runLegacySqlTests: false
+    # SQL Server 2022 coverage runs in CI only.  PR validation covers SQL
+    # Server 2019, 2025 and Azure SQL.
+    runSql22Tests: false
     # Don't run the AE tests in Debug mode; they rarely succeed.
     ${{ if eq(parameters.buildConfiguration, 'Debug') }}:
       runAlwaysEncryptedTests: false
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index f9578e6548..74309ae643 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -145,6 +145,9 @@ extends:
     useManagedSNI: ${{ parameters.useManagedSNI }}
     # Legacy SQL Server tests (2016/2017) run in CI only, not on PRs.
     runLegacySqlTests: false
+    # SQL Server 2022 coverage runs in CI only.  PR validation covers SQL
+    # Server 2019, 2025 and Azure SQL.
+    runSql22Tests: false
     # Don't run the AE tests in Debug mode; they rarely succeed.
     ${{ if eq(parameters.buildConfiguration, 'Debug') }}:
       runAlwaysEncryptedTests: false
diff --git a/eng/pipelines/stages/build-abstractions-package-ci-stage.yml b/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
index 3df0ef9843..3342bfca01 100644
--- a/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
@@ -35,6 +35,19 @@ parameters:
     type: object
     default: []
 
+  # The name of the pool to use for jobs that require customized VM images.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  # Any pool specified here must contain images with the following names:
+  #
+  #   - ADO-Win25
+  #   - ADO-UB24
+  #
+  - name: poolName
+    type: string
+
   # The type of build to produce (Release or Debug)
   - name: buildConfiguration
     type: string
@@ -105,8 +118,8 @@ stages:
           jobNameSuffix: linux
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
-          poolName: Azure Pipelines
-          vmImage: ubuntu-latest
+          poolName: ${{ parameters.poolName }}
+          vmImage: ADO-UB24
 
       # ------------------------------------------------------------------------
       # Build and test on Windows
@@ -120,8 +133,8 @@ stages:
           jobNameSuffix: windows
           netFrameworkRuntimes: [net462]
           netRuntimes: [net8.0, net9.0, net10.0]
-          poolName: Azure Pipelines
-          vmImage: windows-latest
+          poolName: ${{ parameters.poolName }}
+          vmImage: ADO-Win25
 
       # ------------------------------------------------------------------------
       # Build and test on macOS.
@@ -135,6 +148,8 @@ stages:
           jobNameSuffix: macos
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
+          # Our 1ES pools do not offer macOS images, so this job runs on the Microsoft-hosted
+          # 'Azure Pipelines' pool.
           poolName: Azure Pipelines
           vmImage: macos-latest
 
@@ -143,6 +158,7 @@ stages:
 
       - template: /eng/pipelines/jobs/pack-abstractions-package-ci-job.yml@self
         parameters:
+          poolName: ${{ parameters.poolName }}
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
           # The version is computed by this stage (see the packageVersion variable above).
           packageVersion: $(packageVersion)
diff --git a/eng/pipelines/stages/build-azure-package-ci-stage.yml b/eng/pipelines/stages/build-azure-package-ci-stage.yml
index b907d2fcda..79930f665e 100644
--- a/eng/pipelines/stages/build-azure-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-azure-package-ci-stage.yml
@@ -40,29 +40,23 @@ parameters:
     default: []
 
   # The name of the pool to use for jobs that require customized VM images.
-  - name: adoPoolName
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  # Any pool specified here must contain images with the following names:
+  #
+  #   - ADO-MMS25-SQL25
+  #   - ADO-UB24-SQL25
+  #
+  - name: poolName
     type: string
-    # This variable should be defined in AzureDevOps Library variable groups,
-    # for both the Public and ADO.Net projects.
-    #
-    # Any pool specified here must contain images with the following names:
-    #
-    #   - ADO-MMS25-SQL25
-    #   - ADO-UB24-SQL25
-    #
-    default: $(ci_var_defaultPoolName)
 
   # The name of the pipeline artifacts to publish.
   - name: azureArtifactsName
     type: string
     default: Azure.Artifacts
 
-  # The name of the general Azure pool to use for jobs that don't require
-  # customized VM images.
-  - name: azurePoolName
-    type: string
-    default: Azure Pipelines
-
   # The type of build to produce (Release or Debug)
   - name: buildConfiguration
     type: string
@@ -144,25 +138,6 @@ stages:
       # ------------------------------------------------------------------------
       # Build and test on Linux.
 
-      - template: /eng/pipelines/jobs/test-azure-package-ci-job.yml@self
-        parameters:
-          abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-          packageVersion: $(packageVersion)
-          buildConfiguration: ${{ parameters.buildConfiguration }}
-          debug: ${{ parameters.debug }}
-          displayNamePrefix: Linux
-          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-          jobNameSuffix: linux
-          loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-          mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-          sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-          sqlServerPackageVersion: $(sqlServerPackageVersion)
-          netFrameworkRuntimes: []
-          netRuntimes: [net8.0, net9.0, net10.0]
-          poolName: ${{ parameters.azurePoolName }}
-          referenceType: ${{ parameters.referenceType }}
-          vmImage: ubuntu-latest
-
       # Use our 1ES ADO pool for comprehensive testing.
       - template: /eng/pipelines/jobs/test-azure-package-ci-job.yml@self
         parameters:
@@ -179,7 +154,7 @@ stages:
           sqlServerPackageVersion: $(sqlServerPackageVersion)
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
-          poolName: ${{ parameters.adoPoolName }}
+          poolName: ${{ parameters.poolName }}
           referenceType: ${{ parameters.referenceType }}
           saPassword: $(saPassword)
           # The image includes a SQL Server instance that we must configure.
@@ -192,26 +167,6 @@ stages:
       # ------------------------------------------------------------------------
       # Build and test on Windows
 
-      # Use the Azure Pipelines pool for basic testing.
-      - template: /eng/pipelines/jobs/test-azure-package-ci-job.yml@self
-        parameters:
-          abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
-          packageVersion: $(packageVersion)
-          buildConfiguration: ${{ parameters.buildConfiguration }}
-          debug: ${{ parameters.debug }}
-          displayNamePrefix: Win
-          dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-          jobNameSuffix: windows
-          loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
-          mdsArtifactsName: ${{ parameters.mdsArtifactsName }}
-          sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
-          sqlServerPackageVersion: $(sqlServerPackageVersion)
-          netFrameworkRuntimes: [net462]
-          netRuntimes: [net8.0, net9.0, net10.0]
-          poolName: ${{ parameters.azurePoolName }}
-          referenceType: ${{ parameters.referenceType }}
-          vmImage: windows-latest
-
       # Use our 1ES ADO pool for comprehensive testing.
       - template: /eng/pipelines/jobs/test-azure-package-ci-job.yml@self
         parameters:
@@ -228,7 +183,7 @@ stages:
           sqlServerPackageVersion: $(sqlServerPackageVersion)
           netFrameworkRuntimes: [net462]
           netRuntimes: [net8.0, net9.0, net10.0]
-          poolName: ${{ parameters.adoPoolName }}
+          poolName: ${{ parameters.poolName }}
           referenceType: ${{ parameters.referenceType }}
           saPassword: $(saPassword)
           # The image includes a SQL Server instance that we must configure.
@@ -266,17 +221,18 @@ stages:
           sqlServerPackageVersion: $(sqlServerPackageVersion)
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
-          poolName: ${{ parameters.azurePoolName }}
+          # Our 1ES pools do not offer macOS images, so this job runs on the Microsoft-hosted
+          # 'Azure Pipelines' pool.
+          poolName: Azure Pipelines
           referenceType: ${{ parameters.referenceType }}
           vmImage: macos-latest
 
-      # We do not currently have any images in our 1ES ADO pools for macOS.
-
       # ------------------------------------------------------------------------
       # Create and publish the NuGet package.
 
       - template: /eng/pipelines/jobs/pack-azure-package-ci-job.yml@self
         parameters:
+          poolName: ${{ parameters.poolName }}
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
           packageVersion: $(packageVersion)
           azureArtifactsName: ${{ parameters.azureArtifactsName }}
@@ -285,9 +241,7 @@ stages:
           dependsOn:
             # We depend on all of the test jobs to ensure the tests pass before
             # producing the NuGet package.
-            - test_azure_package_job_linux
             - test_azure_package_job_linux_integration
-            - test_azure_package_job_windows
             - test_azure_package_job_windows_integration
             - test_azure_package_job_macos
           dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
diff --git a/eng/pipelines/stages/build-logging-package-ci-stage.yml b/eng/pipelines/stages/build-logging-package-ci-stage.yml
index b9d5feb082..9b421b821a 100644
--- a/eng/pipelines/stages/build-logging-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-logging-package-ci-stage.yml
@@ -25,6 +25,14 @@
 
 parameters:
 
+  # The name of the 1ES pool to run in.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
   # Additional stages we depend on, if any.
   - name: additionalDependsOn
     type: object
@@ -84,6 +92,7 @@ stages:
 
       - template: /eng/pipelines/jobs/pack-logging-package-ci-job.yml@self
         parameters:
+          poolName: ${{ parameters.poolName }}
           loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
           # The version is computed by this stage (see the packageVersion variable above).
           packageVersion: $(packageVersion)
diff --git a/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml b/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
index 70fa122d5f..1895f4e593 100644
--- a/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
@@ -18,6 +18,14 @@ parameters:
     type: string
     default: Abstractions.Artifacts
 
+  # The name of the 1ES pool to run in. Hosted Azure Pipelines pools are not supported.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
   # Additional stages we depend on, if any.
   - name: additionalDependsOn
     type: object
@@ -84,6 +92,7 @@ stages:
     jobs:
     - template: /eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml@self
       parameters:
+        poolName: ${{ parameters.poolName }}
         buildConfiguration: ${{ parameters.buildConfiguration }}
         referenceType: ${{ parameters.referenceType }}
         abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
diff --git a/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml b/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
index 3a1417185d..633e3bc3f1 100644
--- a/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
@@ -25,6 +25,14 @@
 
 parameters:
 
+  # The name of the 1ES pool to run in.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
   # Additional stages we depend on, if any.
   - name: additionalDependsOn
     type: object
@@ -77,6 +85,7 @@ stages:
     jobs:
       - template: /eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml@self
         parameters:
+          poolName: ${{ parameters.poolName }}
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
diff --git a/eng/pipelines/stages/compute-versions-ci-stage.yml b/eng/pipelines/stages/compute-versions-ci-stage.yml
index 9171582cd2..d508ba51ed 100644
--- a/eng/pipelines/stages/compute-versions-ci-stage.yml
+++ b/eng/pipelines/stages/compute-versions-ci-stage.yml
@@ -19,6 +19,19 @@
 # This stage MUST run before all build stages so they can consume computed versions.
 
 parameters:
+  # The name of the 1ES pool to run in.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+    default: ADO-UB24
+
   # Build suffix appended to prerelease tag (e.g. 'ci' or 'pr').
   - name: buildSuffix
     type: string
@@ -32,7 +45,9 @@ stages:
       - job: compute_versions_job
         displayName: "Extract versions from Versions.props"
         pool:
-          vmImage: ubuntu-latest
+          name: ${{ parameters.poolName }}
+          demands:
+            - imageOverride -equals ${{ parameters.vmImage }}
 
         steps:
           # Install the global.json-pinned .NET SDK before running any dotnet build, so this stage
diff --git a/eng/pipelines/stages/generate-secrets-ci-stage.yml b/eng/pipelines/stages/generate-secrets-ci-stage.yml
index eaf61e1f60..d6f38f8f85 100644
--- a/eng/pipelines/stages/generate-secrets-ci-stage.yml
+++ b/eng/pipelines/stages/generate-secrets-ci-stage.yml
@@ -31,6 +31,19 @@ parameters:
     type: boolean
     default: false
 
+  # The name of the 1ES pool to run in.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+    default: ADO-UB24
+
 stages:
 
   # The stage downstream stages must depend on to ensure the secrets are generated before they are
@@ -48,9 +61,11 @@ stages:
       - job: secrets_job
         displayName: Generate Secrets
         pool:
-          # We don't need anything special, so use the standard Microsoft-hosted Ubuntu image, which
-          # is typically very fast to spin up.
-          vmImage: ubuntu-latest
+          # This job has no special image requirements, so use a minimal Linux image.
+          name: ${{ parameters.poolName }}
+
+          demands:
+            - imageOverride -equals ${{ parameters.vmImage }}
 
         steps:
 
diff --git a/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml b/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml
index 3dccd61989..06d43769fd 100644
--- a/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml
+++ b/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml
@@ -38,6 +38,19 @@ parameters:
     type: string
     default: SqlServer.Artifacts
 
+  # The name of the 1ES pool to run in.
+  #
+  # Supplied by the caller so that the pool name flows down from the pipeline
+  # root, rather than being read from a variable group at this depth.
+  #
+  - name: poolName
+    type: string
+
+  # The name of the VM image to run on, within the pool.
+  - name: vmImage
+    type: string
+    default: ADO-Win25
+
 stages:
 
   - stage: verify_nuget_packages_stage
@@ -55,8 +68,10 @@ stages:
         displayName: Verify NuGet Package Metadata
 
         pool:
-          name: Azure Pipelines
-          vmImage: windows-latest
+          name: ${{ parameters.poolName }}
+
+          demands:
+            - imageOverride -equals ${{ parameters.vmImage }}
 
         variables:
           # The directory where all package artifacts will be downloaded.

From ce9f01b8b1583b2ab80b51de7021b3c01e1298bc Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Tue, 8 Sep 2026 21:36:10 -0300
Subject: [PATCH 276/298] Install the macOS docker CLI from a Homebrew bottle
 instead of source-building it (#4661)

---
 .../steps/configure-sql-server-macos-step.yml |  48 ++--
 .../scripts/Install-DockerCli.macos.ps1       | 225 ++++++++++++++++++
 .../tests/Install-DockerCli.macos.Tests.ps1   | 194 +++++++++++++++
 eng/pipelines/scripts/tests/README.md         |   5 +-
 4 files changed, 455 insertions(+), 17 deletions(-)
 create mode 100644 eng/pipelines/scripts/Install-DockerCli.macos.ps1
 create mode 100644 eng/pipelines/scripts/tests/Install-DockerCli.macos.Tests.ps1

diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
index 89b5e9f738..772433ba3a 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
@@ -29,21 +29,33 @@ steps:
       export PS4='+ [$(date "+%Y-%m-%d %H:%M:%S")] '
       set -x
 
-      # Install Docker CLI (not Desktop — Colima provides the daemon) and SQLCMD tools.
+      # Install Colima (which provides the Docker daemon, since Docker Desktop is
+      # not available here), the docker CLI, and sqlcmd.
       brew install colima
-      brew install docker
-      brew tap microsoft/mssql-release https://github.com/Microsoft/homebrew-mssql-release
-      brew update
-      # Homebrew 5.2+ requires explicit trust for third-party taps.  Run this
-      # after 'brew update' so the trust command is available even if the runner
-      # image shipped an older Homebrew version.
-      brew trust microsoft/mssql-release
-      HOMEBREW_ACCEPT_EULA=Y brew install mssql-tools18
-
-      # Fail fast if sqlcmd was not installed (e.g. tap-trust or formula error).
-      # Without this check the script would loop for ~6 minutes trying to connect.
+
+      # Homebrew ships no Intel macOS bottle for the current docker formula, so
+      # 'brew install docker' compiles the CLI (and builds Go to do it), which
+      # takes minutes and often exhausts the step timeout.  Install the newest
+      # bottled version directly instead.
+      DOCKER_CLI_DIR="$HOME/.docker-cli/bin"
+      if ! pwsh -NoProfile -File "$(Build.SourcesDirectory)/eng/pipelines/scripts/Install-DockerCli.macos.ps1" -DestinationPath "$DOCKER_CLI_DIR"; then
+        echo "ERROR: Failed to install the docker CLI."
+        exit 1
+      fi
+      # prependpath only affects later steps, so fix PATH for this one as well.
+      export PATH="$DOCKER_CLI_DIR:$PATH"
+
+      # go-sqlcmd, rather than mssql-tools18 from the microsoft/mssql-release
+      # tap.  That tap pins an openssl@3 formula that has no Intel bottle, so
+      # installing it compiled openssl from source and cost 12.5 minutes of the
+      # step budget.  go-sqlcmd is a single bottled Go binary with no openssl
+      # dependency, and accepts the same flags used below.
+      brew install sqlcmd
+
+      # Fail fast if sqlcmd was not installed.  Without this check the script
+      # would loop for ~6 minutes trying to connect.
       if ! command -v sqlcmd &>/dev/null; then
-        echo "ERROR: sqlcmd is not on PATH after brew install. Check the mssql-tools18 installation above."
+        echo "ERROR: sqlcmd is not on PATH after 'brew install sqlcmd'."
         exit 1
       fi
 
@@ -82,8 +94,8 @@ steps:
       fi
 
       # Point the docker CLI at Colima's daemon socket.  Colima normally sets an
-      # active docker context, but the standalone docker CLI (installed above via
-      # 'brew install docker') can default to unix:///var/run/docker.sock, which
+      # active docker context, but the standalone docker CLI installed above can
+      # default to unix:///var/run/docker.sock, which
       # does not exist on macOS without Docker Desktop.  This caused every
       # 'docker pull' to fail instantly with:
       #   failed to connect to the docker API at unix:///var/run/docker.sock
@@ -231,3 +243,9 @@ steps:
       fi
 
     displayName: 'Configure SQL Server [macOS]'
+    # Well above a healthy run, but low enough that a wedged install or Colima
+    # boot fails here instead of consuming the whole test job.  Measured worst
+    # case is ~24 minutes: Colima boot ~6, the SQL image pull ~10 (7 of which is
+    # extraction inside the VM), and up to 6 more waiting for SQL to accept
+    # connections.
+    timeoutInMinutes: 40
diff --git a/eng/pipelines/scripts/Install-DockerCli.macos.ps1 b/eng/pipelines/scripts/Install-DockerCli.macos.ps1
new file mode 100644
index 0000000000..bdaf588e5c
--- /dev/null
+++ b/eng/pipelines/scripts/Install-DockerCli.macos.ps1
@@ -0,0 +1,225 @@
+<#
+.SYNOPSIS
+    Installs the docker CLI on an Intel macOS agent from a Homebrew bottle.
+
+.DESCRIPTION
+    Homebrew ships no Intel macOS bottle for the current docker formula, so
+    'brew install docker' compiles the CLI - and builds Go in order to do it -
+    which takes minutes and routinely exhausts the pipeline step timeout.
+
+    This installs the newest docker version that *is* bottled for Intel macOS,
+    read from Homebrew's own OCI registry on ghcr.io. Bottles are
+    content-addressed, so the download is verified against the digest the
+    registry advertises rather than a checksum pinned here that someone has to
+    remember to bump. Nothing is downloaded from outside Homebrew, and the
+    result is exactly what 'brew install' would have produced.
+
+    Only the docker CLI is handled this way. colima and lima still install
+    through brew: their bottles carry payloads outside bin/ and colima depends
+    on lima at runtime, so neither can be installed by lifting a single binary.
+
+.PARAMETER DestinationPath
+    Directory the docker binary is written to. Prepended to PATH for subsequent
+    pipeline steps.
+
+.NOTES
+    Intel macOS only. On any other architecture this fails rather than
+    installing a binary the agent cannot run.
+#>
+param(
+    [string]$DestinationPath = (Join-Path -Path $HOME -ChildPath '.docker-cli/bin')
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+# tar's exit code is checked explicitly below so the failure carries the member
+# path rather than PowerShell's generic native-command error.
+$PSNativeCommandUseErrorActionPreference = $false
+
+$Registry = 'https://ghcr.io'
+$RegistryRepository = 'homebrew/core/docker'
+
+# Newest first. A bottle built for an older macOS still runs on a newer one, so
+# any of these work on the current agents.
+$PreferredCodenames = @('sequoia', 'sonoma', 'ventura')
+
+#region Helper Functions
+
+function Get-RegistryToken {
+    <#
+    .SYNOPSIS
+        An anonymous pull token for the formula's registry repository.
+    #>
+
+    $uri = "$Registry/token?service=ghcr.io&scope=repository:${RegistryRepository}:pull"
+    return (Invoke-RestMethod -Uri $uri -MaximumRetryCount 3 -RetryIntervalSec 5).token
+}
+
+function Get-BottleVersion {
+    <#
+    .SYNOPSIS
+        Every docker version tag in the registry, newest first.
+    #>
+    param(
+        [Parameter(Mandatory)][string]$Token
+    )
+
+    $uri = "$Registry/v2/$RegistryRepository/tags/list?n=1000"
+    $tags = @()
+
+    while ($uri) {
+        $response = Invoke-RestMethod `
+            -Uri $uri `
+            -Headers @{ Authorization = "Bearer $Token" } `
+            -MaximumRetryCount 3 -RetryIntervalSec 5 `
+            -ResponseHeadersVariable 'responseHeaders'
+
+        $tags += $response.tags
+
+        # ghcr.io orders tags lexically, which puts the newest on the last page.
+        $link = if ($responseHeaders.ContainsKey('Link')) { @($responseHeaders['Link'])[0] } else { $null }
+        $uri = if ($link -match '<([^>]+)>') { $Registry + $Matches[1] } else { $null }
+    }
+
+    return $tags |
+        Where-Object { $_ -match '^\d+\.\d+\.\d+(-\d+)?$' } |
+        Sort-Object -Property { [version]($_ -replace '-', '.') } -Descending
+}
+
+function Get-BottleRefName {
+    <#
+    .SYNOPSIS
+        The bottle ref name an OCI index entry advertises, or $null.
+    #>
+    param(
+        [Parameter(Mandatory)]$IndexEntry
+    )
+
+    $annotations = $IndexEntry.PSObject.Properties['annotations']
+    if (-not $annotations) { return $null }
+
+    $refName = $annotations.Value.PSObject.Properties['org.opencontainers.image.ref.name']
+    if (-not $refName) { return $null }
+
+    return $refName.Value
+}
+
+function Find-Bottle {
+    <#
+    .SYNOPSIS
+        The newest given version carrying an Intel macOS bottle, with that
+        bottle's manifest digest.
+    #>
+    param(
+        [Parameter(Mandatory)][string]$Token,
+        [Parameter(Mandatory)][string[]]$Version
+    )
+
+    $headers = @{
+        Authorization = "Bearer $Token"
+        Accept        = 'application/vnd.oci.image.index.v1+json'
+    }
+
+    foreach ($candidate in $Version) {
+        $index = Invoke-RestMethod `
+            -Uri "$Registry/v2/$RegistryRepository/manifests/$candidate" `
+            -Headers $headers `
+            -MaximumRetryCount 3 -RetryIntervalSec 5
+
+        foreach ($codename in $PreferredCodenames) {
+            foreach ($entry in $index.manifests) {
+                # The index already belongs to this version, so only the
+                # platform component needs matching. Splitting on '.' is what
+                # keeps 'sonoma' from also matching 'arm64_sonoma', and rejects
+                # the linux and ':all' refs outright.
+                $ref = Get-BottleRefName -IndexEntry $entry
+                if ($ref -and ($ref.Split('.') -contains $codename)) {
+                    return [pscustomobject]@{
+                        Version = $candidate
+                        Digest  = $entry.digest
+                        Ref     = $ref
+                    }
+                }
+            }
+        }
+    }
+
+    throw "No Intel macOS docker bottle in any of the $($Version.Count) published versions."
+}
+
+function Save-BottleBlob {
+    <#
+    .SYNOPSIS
+        Downloads a bottle archive and verifies it against its layer digest.
+    #>
+    param(
+        [Parameter(Mandatory)][string]$Token,
+        [Parameter(Mandatory)][string]$ManifestDigest,
+        [Parameter(Mandatory)][string]$Path
+    )
+
+    $manifest = Invoke-RestMethod `
+        -Uri "$Registry/v2/$RegistryRepository/manifests/$ManifestDigest" `
+        -Headers @{
+            Authorization = "Bearer $Token"
+            Accept        = 'application/vnd.oci.image.manifest.v1+json'
+        } `
+        -MaximumRetryCount 3 -RetryIntervalSec 5
+
+    $layerDigest = $manifest.layers[0].digest
+
+    Invoke-WebRequest `
+        -Uri "$Registry/v2/$RegistryRepository/blobs/$layerDigest" `
+        -Headers @{ Authorization = "Bearer $Token" } `
+        -MaximumRetryCount 3 -RetryIntervalSec 5 `
+        -OutFile $Path
+
+    $expected = $layerDigest -replace '^sha256:', ''
+    $actual = (Get-FileHash -Path $Path -Algorithm SHA256).Hash
+
+    # -ne is case-insensitive, so Get-FileHash's uppercase output compares equal.
+    if ($actual -ne $expected) {
+        throw "Bottle digest mismatch: expected $expected, got $actual."
+    }
+}
+
+#endregion Helper Functions
+
+$architecture = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture
+if ($architecture -ne 'X64') {
+    throw "This installs an Intel macOS bottle, but the agent architecture is $architecture."
+}
+
+$token = Get-RegistryToken
+# Every version scanned costs a registry round-trip (~0.2s), but the whole list
+# is walked rather than a fixed window: Homebrew has stopped publishing Intel
+# bottles, so the newest usable version sinks further down the list over time.
+$versions = @(Get-BottleVersion -Token $token)
+$bottle = Find-Bottle -Token $token -Version $versions
+
+$archive = Join-Path ([System.IO.Path]::GetTempPath()) "docker-bottle-$([guid]::NewGuid().ToString('n')).tar.gz"
+
+try {
+    Save-BottleBlob -Token $token -ManifestDigest $bottle.Digest -Path $archive
+
+    New-Item -ItemType Directory -Path $DestinationPath -Force | Out-Null
+
+    # Homebrew keeps the cellar directory at the plain version even for a
+    # revision build, so the '29.7.2-1' bottle unpacks from 'docker/29.7.2'.
+    $cellarVersion = $bottle.Version -replace '-\d+$', ''
+    $member = "docker/$cellarVersion/bin/docker"
+
+    # Naming the one member we want is what keeps the rest of the archive - an
+    # anonymous download - from ever being written to disk.
+    tar -xz -f $archive -C $DestinationPath --strip-components 3 $member
+    if ($LASTEXITCODE -ne 0) {
+        throw "Extracting $member from the docker bottle failed (tar exit $LASTEXITCODE)."
+    }
+}
+finally {
+    Remove-Item -LiteralPath $archive -Force -ErrorAction SilentlyContinue
+}
+
+Write-Host "Installed docker $($bottle.Version) ($($bottle.Ref)) to $DestinationPath"
+Write-Host "##vso[task.prependpath]$DestinationPath"
diff --git a/eng/pipelines/scripts/tests/Install-DockerCli.macos.Tests.ps1 b/eng/pipelines/scripts/tests/Install-DockerCli.macos.Tests.ps1
new file mode 100644
index 0000000000..08fdcb8076
--- /dev/null
+++ b/eng/pipelines/scripts/tests/Install-DockerCli.macos.Tests.ps1
@@ -0,0 +1,194 @@
+<#
+.SYNOPSIS
+    Pester tests for Install-DockerCli.macos.ps1.
+
+.DESCRIPTION
+    These cover the bottle selection rules, which are the part that fails by
+    silently installing the wrong artifact rather than by crashing: picking the
+    newest version that is actually bottled for Intel, never taking an arm64,
+    linux or ':all' bottle, and reading a revision build out of the unrevised
+    cellar directory.
+
+    'Invoke-RestMethod', 'Invoke-WebRequest' and 'tar' are mocked, so the tests
+    need no network and no macOS.
+#>
+
+BeforeAll {
+    $global:scriptPath = Join-Path $PSScriptRoot '..' 'Install-DockerCli.macos.ps1'
+
+    # A stand-in for the bottle archive. The script verifies what it downloads
+    # against the digest the registry advertises, so the tests have to advertise
+    # this content's real hash.
+    $global:blobBytes = [System.Text.Encoding]::UTF8.GetBytes('not-really-a-bottle')
+    $blobHash = (
+        [System.Security.Cryptography.SHA256]::HashData($global:blobBytes) |
+            ForEach-Object { $_.ToString('x2') }
+    ) -join ''
+    $global:blobDigest = "sha256:$blobHash"
+
+    function New-Index {
+        <#
+        .SYNOPSIS
+            An OCI image index annotated with the given bottle ref names.
+        #>
+        param([string[]]$RefName)
+
+        return [pscustomobject]@{
+            manifests = @(
+                $RefName | ForEach-Object {
+                    [pscustomobject]@{
+                        digest      = "sha256:digest-$_"
+                        annotations = [pscustomobject]@{ 'org.opencontainers.image.ref.name' = $_ }
+                    }
+                }
+            )
+        }
+    }
+
+    function Get-TarMember {
+        <#
+        .SYNOPSIS
+            The archive member the script asked tar to extract.
+        #>
+        return @($global:tarArgs)[-1]
+    }
+}
+
+Describe 'Install-DockerCli.macos.ps1' -Skip:([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -ne 'X64') {
+
+    BeforeAll {
+        Mock -CommandName 'Invoke-RestMethod' -MockWith {
+            if ($Uri -like '*/token?*') {
+                return [pscustomobject]@{ token = 'test-token' }
+            }
+
+            if ($Uri -like '*/tags/list*') {
+                if ($ResponseHeadersVariable) {
+                    Set-Variable -Name $ResponseHeadersVariable -Value @{} -Scope Global
+                }
+                return [pscustomobject]@{ tags = $global:tags }
+            }
+
+            if ($Uri -like '*/manifests/sha256:*') {
+                $global:manifestRequests += $Uri
+                return [pscustomobject]@{
+                    layers = @([pscustomobject]@{ digest = $global:advertisedDigest })
+                }
+            }
+
+            $version = $Uri -replace '.*/manifests/', ''
+            if (-not $global:refsByVersion.ContainsKey($version)) {
+                throw "Unexpected manifest request for '$version'."
+            }
+            return New-Index -RefName $global:refsByVersion[$version]
+        }
+
+        Mock -CommandName 'Invoke-WebRequest' -MockWith {
+            [System.IO.File]::WriteAllBytes($OutFile, $global:blobBytes)
+        }
+
+        Mock -CommandName 'tar' -MockWith {
+            $global:tarArgs = $args
+            $global:LASTEXITCODE = 0
+        }
+    }
+
+    BeforeEach {
+        $global:tags = @('29.7.2')
+        $global:refsByVersion = @{ '29.7.2' = @('29.7.2.sonoma') }
+        $global:advertisedDigest = $global:blobDigest
+        $global:manifestRequests = @()
+        $global:tarArgs = @()
+
+        $global:destination = Join-Path ([System.IO.Path]::GetTempPath()) "docker-cli-test-$([guid]::NewGuid().ToString('n'))"
+    }
+
+    AfterEach {
+        if (Test-Path -LiteralPath $global:destination) {
+            Remove-Item -LiteralPath $global:destination -Recurse -Force -ErrorAction SilentlyContinue
+        }
+    }
+
+    Context 'Version selection' {
+
+        It 'Takes the newest version that is bottled for Intel' {
+            $global:tags = @('29.7.2', '29.8.0')
+            $global:refsByVersion = @{
+                '29.8.0' = @('29.8.0.arm64_sequoia', '29.8.0.x86_64_linux')
+                '29.7.2' = @('29.7.2.sonoma')
+            }
+
+            & $global:scriptPath -DestinationPath $global:destination
+
+            Get-TarMember | Should -Be 'docker/29.7.2/bin/docker'
+        }
+
+        It 'Ignores tags that are not versions' {
+            $global:tags = @('latest', '29.7', '29.7.2-beta', '29.7.2')
+
+            & $global:scriptPath -DestinationPath $global:destination
+
+            Get-TarMember | Should -Be 'docker/29.7.2/bin/docker'
+        }
+
+        It 'Keeps scanning past a long run of arm64-only versions' {
+            # Homebrew has stopped publishing Intel bottles, so the newest usable
+            # version sinks further down the list with every docker release. A
+            # fixed scan window would eventually stop reaching it.
+            $global:tags = @('29.7.2') + (0..19 | ForEach-Object { "30.$_.0" })
+            $global:refsByVersion = @{ '29.7.2' = @('29.7.2.sonoma') }
+            foreach ($i in 0..19) {
+                $global:refsByVersion["30.$i.0"] = @("30.$i.0.arm64_sequoia", "30.$i.0.x86_64_linux")
+            }
+
+            & $global:scriptPath -DestinationPath $global:destination
+
+            Get-TarMember | Should -Be 'docker/29.7.2/bin/docker'
+        }
+
+        It 'Ranks a revision build above its base version' {
+            $global:tags = @('29.7.2', '29.7.2-1')
+            $global:refsByVersion = @{
+                '29.7.2-1' = @('29.7.2.sonoma.1')
+                '29.7.2'   = @('29.7.2.sonoma')
+            }
+
+            & $global:scriptPath -DestinationPath $global:destination
+
+            # Homebrew keeps the cellar directory at the plain version, so the
+            # revision must not leak into the member path.
+            Get-TarMember | Should -Be 'docker/29.7.2/bin/docker'
+            $global:manifestRequests | Should -Contain 'https://ghcr.io/v2/homebrew/core/docker/manifests/sha256:digest-29.7.2.sonoma.1'
+        }
+    }
+
+    Context 'Platform selection' {
+
+        It 'Prefers the newest macOS codename that is bottled' {
+            $global:refsByVersion = @{ '29.7.2' = @('29.7.2.ventura', '29.7.2.sonoma') }
+
+            & $global:scriptPath -DestinationPath $global:destination
+
+            $global:manifestRequests | Should -Contain 'https://ghcr.io/v2/homebrew/core/docker/manifests/sha256:digest-29.7.2.sonoma'
+        }
+
+        It 'Never selects an arm64, linux or :all bottle' {
+            $global:refsByVersion = @{
+                '29.7.2' = @('29.7.2.arm64_sonoma', '29.7.2.arm64_linux', '29.7.2.x86_64_linux', '29.7.2.all')
+            }
+
+            { & $global:scriptPath -DestinationPath $global:destination } |
+                Should -Throw '*No Intel macOS docker bottle*'
+        }
+    }
+
+    Context 'Download integrity' {
+
+        It 'Fails when the bottle does not match the advertised digest' {
+            $global:advertisedDigest = 'sha256:' + ('0' * 64)
+
+            { & $global:scriptPath -DestinationPath $global:destination } |
+                Should -Throw '*digest mismatch*'
+        }
+    }
+}
diff --git a/eng/pipelines/scripts/tests/README.md b/eng/pipelines/scripts/tests/README.md
index 8906214afd..70534a9ed1 100644
--- a/eng/pipelines/scripts/tests/README.md
+++ b/eng/pipelines/scripts/tests/README.md
@@ -24,6 +24,7 @@ Add `-Output Detailed` to see per-test results.
 | File | Covers |
 | ---- | ------ |
 | `Open-LocalizationPr.Tests.ps1` | `Open-LocalizationPr.ps1` — de-duplication of the scheduled localization pull request. |
+| `Install-DockerCli.macos.Tests.ps1` | `Install-DockerCli.macos.ps1` — Homebrew bottle selection for the macOS docker CLI. |
 
-`git` and `Invoke-RestMethod` are mocked, so the tests never touch the network
-or a real repository.
+`git`, `tar`, `Invoke-RestMethod` and `Invoke-WebRequest` are mocked, so the
+tests never touch the network or a real repository.

From 849e37b4b222a15e151e28b80b22ae8e4fce5f6e Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Wed, 9 Sep 2026 13:14:56 +0530
Subject: [PATCH 277/298] Add bidi text preservation coverage (#4656)

* Add bidi text preservation coverage

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Address directionality test review

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 46c00f98-d1ca-4b28-a221-6328e7d4f1ef

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 46c00f98-d1ca-4b28-a221-6328e7d4f1ef
---
 .../GlobalizationTest/DirectionalityTest.cs   | 251 ++++++++++++++++++
 1 file changed, 251 insertions(+)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/GlobalizationTest/DirectionalityTest.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/GlobalizationTest/DirectionalityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/GlobalizationTest/DirectionalityTest.cs
new file mode 100644
index 0000000000..f18cc94d06
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/GlobalizationTest/DirectionalityTest.cs
@@ -0,0 +1,251 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.ManualTesting.Tests;
+
+/// <summary>
+/// Verifies that SqlClient preserves the logical UTF-16 representation of bidirectional text.
+/// Visual direction, shaping, and mirroring are responsibilities of the consuming UI.
+/// </summary>
+[Trait("Set", "3")]
+public sealed class DirectionalityTest
+{
+    private static readonly string[] s_bidiText =
+    {
+        "\u0645\u0631\u062D\u0628\u0627 Microsoft 01 - \u0639\u0627\u0644\u0645 \U0001F310",
+        "\u05E9\u05DC\u05D5\u05DD Microsoft 01 - \u05E2\u05D5\u05DC\u05DD \U0001F310"
+    };
+
+    /// <summary>
+    /// Ensures mixed Arabic/Hebrew, Latin, numeric, punctuation, and supplementary characters
+    /// round-trip unchanged through parameters, readers, sequential streaming, and bulk copy.
+    /// </summary>
+    [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task BidiText_RoundTripsWithoutTransformation(bool async)
+    {
+        using SqlConnection setupConnection = new(DataTestUtility.TCPConnectionString);
+        await OpenConnection(setupConnection, async);
+
+        using Table sourceTable = new(
+            setupConnection,
+            "DirectionalitySource",
+            "(Id int NOT NULL, Value nvarchar(max) NOT NULL)");
+        using Table destinationTable = new(
+            setupConnection,
+            "DirectionalityDestination",
+            "(Id int NOT NULL, Value nvarchar(max) NOT NULL)");
+
+        await InsertValues(setupConnection, sourceTable.Name, async);
+        await VerifyOrdinaryReader(setupConnection, sourceTable.Name, async);
+        await VerifyGetChars(setupConnection, sourceTable.Name, async);
+        await VerifyTextReader(setupConnection, sourceTable.Name, async);
+        await CopyValues(sourceTable.Name, destinationTable.Name, async);
+        await VerifyOrdinaryReader(setupConnection, destinationTable.Name, async);
+    }
+
+    /// <summary>
+    /// Opens a connection through the requested synchronous or asynchronous API.
+    /// </summary>
+    /// <param name="connection">The connection to open.</param>
+    /// <param name="async">Whether to use the asynchronous API.</param>
+    /// <returns>A task representing the open operation.</returns>
+    private static async Task OpenConnection(SqlConnection connection, bool async)
+    {
+        if (async)
+        {
+            await connection.OpenAsync();
+        }
+        else
+        {
+            connection.Open();
+        }
+    }
+
+    /// <summary>
+    /// Inserts the bidi samples through explicitly typed Unicode parameters.
+    /// </summary>
+    /// <param name="connection">The open connection used to insert the samples.</param>
+    /// <param name="tableName">The table that receives the samples.</param>
+    /// <param name="async">Whether to use asynchronous command execution.</param>
+    /// <returns>A task representing the insert operations.</returns>
+    private static async Task InsertValues(SqlConnection connection, string tableName, bool async)
+    {
+        using SqlCommand command = new($"INSERT INTO {tableName} (Id, Value) VALUES (@id, @value)", connection);
+        SqlParameter idParameter = command.Parameters.Add("@id", SqlDbType.Int);
+        SqlParameter valueParameter = command.Parameters.Add("@value", SqlDbType.NVarChar, -1);
+
+        for (int index = 0; index < s_bidiText.Length; index++)
+        {
+            idParameter.Value = index;
+            valueParameter.Value = s_bidiText[index];
+
+            if (async)
+            {
+                await command.ExecuteNonQueryAsync();
+            }
+            else
+            {
+                command.ExecuteNonQuery();
+            }
+        }
+    }
+
+    /// <summary>
+    /// Reads complete strings through ordinary reader accessors and compares their UTF-16 content.
+    /// </summary>
+    /// <param name="connection">The open connection used to read the samples.</param>
+    /// <param name="tableName">The table containing the samples.</param>
+    /// <param name="async">Whether to use asynchronous reader APIs.</param>
+    /// <returns>A task representing the verification operation.</returns>
+    private static async Task VerifyOrdinaryReader(SqlConnection connection, string tableName, bool async)
+    {
+        using SqlCommand command = new($"SELECT Id, Value FROM {tableName} ORDER BY Id", connection);
+        using SqlDataReader reader = async
+            ? await command.ExecuteReaderAsync()
+            : command.ExecuteReader();
+
+        for (int index = 0; index < s_bidiText.Length; index++)
+        {
+            bool hasRow = async ? await reader.ReadAsync() : reader.Read();
+            Assert.True(hasRow);
+            Assert.Equal(index, reader.GetInt32(0));
+            AssertOrdinalEqual(s_bidiText[index], reader.GetString(1));
+            string fieldValue = async
+                ? await reader.GetFieldValueAsync<string>(1)
+                : reader.GetFieldValue<string>(1);
+            AssertOrdinalEqual(s_bidiText[index], fieldValue);
+        }
+
+        Assert.False(async ? await reader.ReadAsync() : reader.Read());
+    }
+
+    /// <summary>
+    /// Reads one UTF-16 code unit at a time to cover direction and surrogate boundaries in GetChars.
+    /// </summary>
+    /// <param name="connection">The open connection used to read the samples.</param>
+    /// <param name="tableName">The table containing the samples.</param>
+    /// <param name="async">Whether to use asynchronous reader execution.</param>
+    /// <returns>A task representing the verification operation.</returns>
+    private static async Task VerifyGetChars(SqlConnection connection, string tableName, bool async)
+    {
+        using SqlCommand command = new($"SELECT Value FROM {tableName} ORDER BY Id", connection);
+        using SqlDataReader reader = async
+            ? await command.ExecuteReaderAsync(CommandBehavior.SequentialAccess)
+            : command.ExecuteReader(CommandBehavior.SequentialAccess);
+
+        for (int index = 0; index < s_bidiText.Length; index++)
+        {
+            bool hasRow = async ? await reader.ReadAsync() : reader.Read();
+            Assert.True(hasRow);
+
+            StringBuilder result = new();
+            char[] buffer = new char[1];
+            long dataIndex = 0;
+            long charsRead;
+            do
+            {
+                charsRead = reader.GetChars(0, dataIndex, buffer, 0, buffer.Length);
+                result.Append(buffer, 0, (int)charsRead);
+                dataIndex += charsRead;
+            }
+            while (charsRead != 0);
+
+            AssertOrdinalEqual(s_bidiText[index], result.ToString());
+        }
+    }
+
+    /// <summary>
+    /// Reads bidi text through the sequential TextReader using small sync or async buffer operations.
+    /// </summary>
+    /// <param name="connection">The open connection used to read the samples.</param>
+    /// <param name="tableName">The table containing the samples.</param>
+    /// <param name="async">Whether to use asynchronous reader and text operations.</param>
+    /// <returns>A task representing the verification operation.</returns>
+    private static async Task VerifyTextReader(SqlConnection connection, string tableName, bool async)
+    {
+        using SqlCommand command = new($"SELECT Value FROM {tableName} ORDER BY Id", connection);
+        using SqlDataReader reader = async
+            ? await command.ExecuteReaderAsync(CommandBehavior.SequentialAccess)
+            : command.ExecuteReader(CommandBehavior.SequentialAccess);
+
+        for (int index = 0; index < s_bidiText.Length; index++)
+        {
+            bool hasRow = async ? await reader.ReadAsync() : reader.Read();
+            Assert.True(hasRow);
+
+            using TextReader textReader = reader.GetTextReader(0);
+            StringBuilder result = new();
+            char[] buffer = new char[2];
+            int charsRead;
+            do
+            {
+                charsRead = async
+                    ? await textReader.ReadAsync(buffer, 0, buffer.Length)
+                    : textReader.Read(buffer, 0, buffer.Length);
+                result.Append(buffer, 0, charsRead);
+            }
+            while (charsRead != 0);
+
+            AssertOrdinalEqual(s_bidiText[index], result.ToString());
+        }
+    }
+
+    /// <summary>
+    /// Copies the Unicode rows through streaming SqlBulkCopy using the requested execution mode.
+    /// </summary>
+    /// <param name="sourceTableName">The table containing the source rows.</param>
+    /// <param name="destinationTableName">The table receiving the copied rows.</param>
+    /// <param name="async">Whether to use asynchronous reader and bulk-copy APIs.</param>
+    /// <returns>A task representing the copy operation.</returns>
+    private static async Task CopyValues(string sourceTableName, string destinationTableName, bool async)
+    {
+        using SqlConnection sourceConnection = new(DataTestUtility.TCPConnectionString);
+        using SqlConnection destinationConnection = new(DataTestUtility.TCPConnectionString);
+        await OpenConnection(sourceConnection, async);
+        await OpenConnection(destinationConnection, async);
+
+        using SqlCommand command = new($"SELECT Id, Value FROM {sourceTableName} ORDER BY Id", sourceConnection);
+        using SqlDataReader reader = async
+            ? await command.ExecuteReaderAsync(CommandBehavior.SequentialAccess)
+            : command.ExecuteReader(CommandBehavior.SequentialAccess);
+        using SqlBulkCopy bulkCopy = new(destinationConnection)
+        {
+            DestinationTableName = destinationTableName,
+            EnableStreaming = true
+        };
+        bulkCopy.ColumnMappings.Add(0, 0);
+        bulkCopy.ColumnMappings.Add(1, 1);
+
+        if (async)
+        {
+            await bulkCopy.WriteToServerAsync(reader);
+        }
+        else
+        {
+            bulkCopy.WriteToServer(reader);
+        }
+    }
+
+    /// <summary>
+    /// Compares strings ordinally so the assertion checks logical storage rather than visual rendering.
+    /// </summary>
+    /// <param name="expected">The original UTF-16 string.</param>
+    /// <param name="actual">The round-tripped UTF-16 string.</param>
+    private static void AssertOrdinalEqual(string expected, string actual)
+    {
+        Assert.True(
+            string.Equals(expected, actual, StringComparison.Ordinal),
+            $"Expected and actual UTF-16 values differ. Expected length: {expected.Length}; actual length: {actual?.Length}.");
+    }
+}

From a869e6db0951b480ad6b7f6ed6d2fdee79f228dd Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 9 Sep 2026 07:43:45 -0300
Subject: [PATCH 278/298] Disable legacy package-reference pipelines on main
 (#4647)

---
 .../dotnet-sqlclient-ci-package-reference-pipeline.yml    | 4 +++-
 eng/pipelines/sqlclient-pr-package-ref-pipeline.yml       | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
index 74fa022a6c..a1b5f14216 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
@@ -59,7 +59,9 @@ trigger:
   branches:
     include:
       # GitHub main and release branches.
-      - main
+      #
+      # GOTCHA: Currently disabled on main due to limited resources.
+      #- main
       - release/*
 
       # ADO main and release branches.
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index 7623f83ce4..f4427f82e8 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -34,9 +34,11 @@ pr:
   branches:
     include:
       # GitHub repo branch targets that will trigger PR validation builds.
-      - dev/*
-      - feat/*
-      - main
+      #
+      # GOTCHA: Currently disabled on all but release/* due to limited resources.
+      #- dev/*
+      #- feat/*
+      #- main
       - release/*
 
   paths:

From 87d48199332f83fa0a7ea72a6e277d9edb717e3b Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 9 Sep 2026 12:48:02 -0300
Subject: [PATCH 279/298] Pipelines | Pre-compute all OneBranch package and
 file versions (#4652)

* Pipelines | Pre-compute all OneBranch package and file versions

Make the compute-versions stage the single source of every version the
OneBranch build jobs consume, so nothing is re-derived downstream.

- Remove the addRevision mode entirely.  Package versions now have a single
  shape driven by the pipeline build number, and the 16-bit revision wrapping,
  the four-part package base handling, and the Build.BuildId plumbing are gone.

- Move package version stamping out of PowerShell and into Versions.props.
  BuildSuffix now does what it always documented: it turns a stable base into a
  prerelease.  Any version carrying a prerelease tag, from either source, is
  stamped with the build number; released versions are left untouched.

- Publish SqlClient and SqlServer file versions from the compute-versions stage
  and pass them into the build jobs, which previously received a raw build
  number and re-derived the file version through MSBuild.  build.proj gains
  opt-in FileVersion* arguments, so PR/CI and local builds are unchanged.

- Fix SBOM metadata, which reported the pipeline run number as the version of a
  single hardcoded package name.  Each build job now supplies the name and
  computed version of the package it produces, and jobs that publish no
  packages disable SBOM generation instead.

* Add version composition target tests for PR 4652

* Fix version extraction example for PR 4652

* Validate computed file version component count for PR 4652

* Require four-part numeric file versions for PR 4652

* Disable SBOM generation in non-producing jobs for PR 4652
---
 .../onebranch-pipeline-design.instructions.md |   1 +
 ...sqlclient-package-versions.instructions.md |  56 +--
 build.proj                                    |  83 +++-
 .../onebranch/jobs/build-buildproj-job.yml    |  18 +-
 .../jobs/publish-nuget-package-job.yml        |   5 +
 .../onebranch/jobs/publish-symbols-job.yml    |   3 +
 .../jobs/validate-signed-package-job.yml      |   4 +
 .../onebranch/scripts/compute-versions.ps1    | 229 +++--------
 .../onebranch/scripts/tests/README.md         |   5 +-
 .../scripts/tests/compute-versions.Tests.ps1  | 354 ++++++++++++++----
 .../onebranch/sqlclient-non-official.yml      |  16 +-
 .../onebranch/sqlclient-official.yml          |  15 +-
 .../onebranch/stages/build-stages.yml         |  30 +-
 .../stages/compute-versions-stage.yml         |  20 +-
 .../onebranch/steps/build-buildproj-step.yml  |   6 +-
 .../onebranch/steps/pack-buildproj-step.yml   |   6 +-
 .../steps/roslyn-analyzers-buildproj-step.yml |   9 +-
 .../onebranch/variables/package-variables.yml |  17 -
 src/Microsoft.Data.SqlClient/Versions.props   |  37 +-
 src/Microsoft.SqlServer.Server/Versions.props |  36 +-
 20 files changed, 529 insertions(+), 421 deletions(-)

diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index 272369dfb5..7a24fd3799 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -135,6 +135,7 @@ Variable groups:
 - Jobs that produce no assemblies (symbol publishing, signed-package validation, version computation) set `ob_sdl_apiscan_enabled: false` rather than reporting a name/version
 - Each build job also sets `ob_sdl_apiscan_softwareFolder` and `ob_sdl_apiscan_symbolsFolder` to its per-package `apiScan/<package>/dlls` and `apiScan/<package>/pdbs` paths
 - CodeQL, SBOM, Policheck (`break: true`): enabled in both pipelines
+- SBOM package name/version are resolvable **only** from the pipeline's `globalSdl.sbom` block — OneBranch's artifact-publishing path reads `globalSdl.sbom.packageName`/`packageVersion` directly and has no per-job equivalent (the `templateContext.sdl.sbom` override only applies to the native 1ES Stages entry point, which this repo does not use). Because the pipeline produces six differently-named and independently-versioned packages, `globalSdl.sbom` indirects through the `$(sbomPackageName)` / `$(sbomPackageVersion)` variables, which each build job sets to its own `packageFullName` and computed `packageVersion`. Jobs that publish no packages (version computation, symbol publishing) set `ob_sdl_sbom_enabled: false` alongside their existing APIScan/BinSkim opt-outs, so the variables never need pipeline-level defaults
 - asyncSdl `enabled: false` in both; individual sub-tools (CredScan, BinSkim, Armory, Roslyn) configured underneath
 - Policheck exclusions: `$(REPO_ROOT)\.config\PolicheckExclusions.xml`
 - CredScan suppressions: `$(REPO_ROOT)/.config/CredScanSuppressions.json`
diff --git a/.github/instructions/sqlclient-package-versions.instructions.md b/.github/instructions/sqlclient-package-versions.instructions.md
index 1692082a68..691367d9de 100644
--- a/.github/instructions/sqlclient-package-versions.instructions.md
+++ b/.github/instructions/sqlclient-package-versions.instructions.md
@@ -40,7 +40,7 @@ Each `Versions.props` uses a 3-tier `<Choose>` block:
 | Priority | Condition | PackageVersion | FileVersion |
 |----------|-----------|----------------|-------------|
 | 1 | `<Pkg>PackageVersion` explicitly provided | Used as-is | Strip prerelease + append BuildNumber |
-| 2 | `BuildNumber` provided (non-zero) | `NextVersion[-BuildSuffix+BuildNumber]` | `NextVersion.Split('-')[0].BuildNumber` |
+| 2 | `BuildNumber` provided (non-zero) | `NextVersion[-BuildSuffix]`, then `.BuildNumber` appended if that carries a prerelease tag | `NextVersion.Split('-')[0].BuildNumber` |
 | 3 | Nothing provided | `NextVersion-dev` | `NextVersion.Split('-')[0].0` |
 
 For every family package, `<Pkg>` is `SqlClient` (e.g. `-p:SqlClientPackageVersion=...`); for
@@ -79,7 +79,7 @@ Microsoft.SqlServer.Server it is `SqlServer`.
 
 - Versions computed in `compute-versions-ci-stage.yml` (runs `GetVersions*` targets with `-p:BuildSuffix=pr -p:BuildNumber=...`)
 - Falls into Priority 2 with BuildSuffix present.
-- **Result:** `7.1.0-preview1-pr15401` / FileVersion `7.1.0.15401`
+- **Result:** `7.1.0-preview1-pr.15401` / FileVersion `7.1.0.15401`
 - Dependencies are project references — all packages built together in-tree.
 
 **Mode:** Package (PR package-ref validation)
@@ -93,7 +93,7 @@ Microsoft.SqlServer.Server it is `SqlServer`.
 
 Same structure as PR but passes `buildSuffix: 'ci'` explicitly.
 
-- **Result:** `7.1.0-preview1-ci15401` / FileVersion `7.1.0.15401`
+- **Result:** `7.1.0-preview1-ci.15401` / FileVersion `7.1.0.15401`
 
 ### OneBranch Pipeline (official)
 
@@ -104,8 +104,8 @@ Uses the full `compute-versions-stage.yml` machinery:
 #### Step A: Compute Versions (dedicated early stage)
 
 1. Runs the `GetVersionsSqlClient` and `GetVersionsSqlServer` MSBuild targets against `build.proj`.
-2. Each target calls `dotnet build <project> -getProperty:<Pkg>PackageVersion` with `BuildNumber` but **no BuildSuffix**.
-3. Falls into Priority 2 without BuildSuffix → `PackageVersion = NextVersion` as-is (e.g. `7.1.0-preview1`).
+2. Each target calls `dotnet build <project> -getProperty:<Pkg>PackageVersion` and `-getProperty:<Pkg>FileVersion` with `BuildNumber` but **no BuildSuffix**.
+3. Falls into Priority 2 without BuildSuffix. `NextVersion` already carries a prerelease tag on `main`, so the build number is appended (e.g. `7.1.0-preview1.26238.3`); on a release branch the stable `NextVersion` is used as-is (e.g. `7.1.0`).
 4. `GetVersionsSqlServer` also extracts `SqlServerPublishedVersion` (the SqlClient family has no published version).
 
 #### Step B: Resolve Effective Versions
@@ -136,15 +136,12 @@ Each downstream build job receives:
 
 Since an explicit `<Pkg>PackageVersion` is provided, Versions.props hits Priority 1 — uses the value verbatim.
 
-#### Package Version Shapes: `addRevision`
+#### Package Version Shapes
 
-Both OneBranch pipelines expose `addRevision` (default `false`), which selects between two mutually
-exclusive package version shapes. Their human-readable run name is `$(Year:YY)$(DayOfYear)$(Rev:.r)`,
-and the compute stage receives both that run name (as `Build.BuildNumber`) and the globally unique
-`Build.BuildId` (as the revision).
-
-**Default path — `addRevision: false`.** The pipeline run name is appended after any prerelease
-suffix, reproducing the shape shipped by earlier previews. `Build.BuildId` is not used:
+Both OneBranch pipelines use the human-readable run name `$(Year:YY)$(DayOfYear)$(Rev:.r)`, which the
+compute stage receives as `Build.BuildNumber`. That run name drives the single supported package
+version shape: it is appended after any prerelease suffix, reproducing the shape shipped by earlier
+previews.
 
 - `1.2.3` stays `1.2.3` — non-preview releases are never stamped with a build number
 - `1.2.3-preview1` becomes `1.2.3-preview1.<build_number>`, e.g. `7.1.0-preview3.26238.3`
@@ -152,34 +149,15 @@ suffix, reproducing the shape shipped by earlier previews. `Build.BuildId` is no
 
 Note the asymmetry: the *package* version omits the build number for non-preview releases, but the
 *file* version always carries one in its fourth component. This keeps every shipped assembly
-date-encoded and traceable to the run that produced it, while preserving the released package
-version customers expect.
-
-**Opt-in path — `addRevision: true`.** Version revisions come from `Build.BuildId` instead, which is
-mapped into the unsigned 16-bit file-version range before canonical file versions are evaluated:
-
-```text
-revision = ((Build.BuildId - 1) % 65535) + 1
-```
-
-Build IDs `1` through `65535` map directly; subsequent IDs wrap back through that range. The compute
-stage logs the mapping whenever wrapping occurs because the revision can then collide with an earlier
-run. The mapped value is inserted before any package prerelease suffix so package and file versions
-use the same revision:
-
-- `1.2.3` becomes `1.2.3.<revision>`
-- `1.2.3-preview1` becomes `1.2.3.<revision>-preview1`
-- The matching file version is `1.2.3.<revision>`
-
-This shape exists for repeated test publishes of the same base version, where each run needs a
-distinct package version. `Build.BuildNumber` is not used on this path.
+date-encoded, while preserving the released package version customers expect.
 
-Only packages built in the current run are revised or stamped. When `buildSqlServer` is `false`, the
-effective SqlServer version remains `SqlServerPublishedVersion` so dependency restore continues to
-request the package that actually exists on NuGet.
+The file version's fourth component is only the *date* segment of the run name, because a four-part
+file version cannot hold the full `<date>.<run>` value. Repeated runs on the same day therefore share
+a file version even though their package versions differ.
 
-An explicit four-part package version is also treated as the complete file version base by both
-canonical Versions.props files; they do not append `FileVersionBuildNumber` as a fifth component.
+Only packages built in the current run are stamped. When `buildSqlServer` is `false`, the effective
+SqlServer version remains `SqlServerPublishedVersion` so dependency restore continues to request the
+package that actually exists on NuGet.
 
 #### Summary
 
diff --git a/build.proj b/build.proj
index 31795fc6a7..2e19233b2a 100644
--- a/build.proj
+++ b/build.proj
@@ -96,6 +96,21 @@
       packages — use PackageVersionSqlClient (below) to set the version for the entire family.
     -->
 
+    <!--
+      SqlClientNextVersion
+      Applies to:     GetVersionsSqlClient
+      Description:    Overrides the source-declared base version used to calculate the SqlClient
+                      family package and file versions. BuildNumber and BuildSuffix are applied to
+                      this value by Versions.props. An explicit PackageVersionSqlClient remains
+                      higher precedence for build and pack targets.
+      Default value:  The value declared in src/Microsoft.Data.SqlClient/Versions.props
+      Example:        7.1.0-preview3
+    -->
+    <SqlClientNextVersion Condition="'$(SqlClientNextVersion)' == ''" />
+    <SqlClientNextVersionArgument Condition="'$(SqlClientNextVersion)' != ''">
+      -p:SqlClientNextVersion=$(SqlClientNextVersion)
+    </SqlClientNextVersionArgument>
+
     <!--
       PackageVersionSqlClient
       Applies to:
@@ -120,6 +135,36 @@
       -p:SqlClientPackageVersion=$(PackageVersionSqlClient)
     </PackageVersionSqlClientArgument>
 
+    <!--
+      FileVersionSqlClient
+      Applies to:     The same targets as PackageVersionSqlClient.
+      Description:    Specifies the assembly file version stamped on the SqlClient *family*.  When
+                      omitted, Versions.props derives it from the package version and BuildNumber.
+                      Supply it to stamp a pre-computed value instead, so no consumer has to
+                      re-derive it.  The assembly version is always derived from this value.
+      Default value:  [blank]
+      Example:        7.1.0.26238
+    -->
+    <FileVersionSqlClient Condition="'$(FileVersionSqlClient)' == ''" />
+    <FileVersionSqlClientArgument Condition="'$(FileVersionSqlClient)' != ''">
+      -p:SqlClientFileVersion=$(FileVersionSqlClient)
+    </FileVersionSqlClientArgument>
+
+    <!--
+      SqlServerNextVersion
+      Applies to:     GetVersionsSqlServer
+      Description:    Overrides the source-declared base version used to calculate the
+                      Microsoft.SqlServer.Server package and file versions. BuildNumber and
+                      BuildSuffix are applied to this value by Versions.props. An explicit
+                      PackageVersionSqlServer remains higher precedence for build and pack targets.
+      Default value:  The value declared in src/Microsoft.SqlServer.Server/Versions.props
+      Example:        1.1.0-preview1
+    -->
+    <SqlServerNextVersion Condition="'$(SqlServerNextVersion)' == ''" />
+    <SqlServerNextVersionArgument Condition="'$(SqlServerNextVersion)' != ''">
+      -p:SqlServerNextVersion=$(SqlServerNextVersion)
+    </SqlServerNextVersionArgument>
+
     <!--
       PackageVersionSqlServer
       Applies to:
@@ -137,6 +182,20 @@
       -p:SqlServerPackageVersion=$(PackageVersionSqlServer)
     </PackageVersionSqlServerArgument>
 
+    <!--
+      FileVersionSqlServer
+      Applies to:     The same targets as PackageVersionSqlServer.
+      Description:    Specifies the assembly file version stamped on Microsoft.SqlServer.Server.
+                      When omitted, Versions.props derives it from the package version and
+                      BuildNumber.  Supply it to stamp a pre-computed value instead.
+      Default value:  [blank]
+      Example:        1.1.0.26238
+    -->
+    <FileVersionSqlServer Condition="'$(FileVersionSqlServer)' == ''" />
+    <FileVersionSqlServerArgument Condition="'$(FileVersionSqlServer)' != ''">
+      -p:SqlServerFileVersion=$(FileVersionSqlServer)
+    </FileVersionSqlServerArgument>
+
     <!--
       ReferenceType
       Applies to:     BuildSqlClient, BuildSqlClientImpl
@@ -451,20 +510,20 @@
        Usage:
          dotnet build build.proj -t:GetVersionsSqlClient -v:m -nologo -p:BuildNumber=1234
          # stdout contains:
-         #   PackageVersion: 7.1.0-preview1
+         #   PackageVersion: 7.1.0-preview1.1234
          #   FileVersion: 7.1.0.1234
   -->
 
   <Target Name="GetVersionsSqlClient">
     <PropertyGroup>
-      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlClientProjectPath)" -getProperty:SqlClientPackageVersion $(BuildNumberArgument) $(BuildSuffixArgument)</_Cmd>
+      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlClientProjectPath)" -getProperty:SqlClientPackageVersion $(BuildNumberArgument) $(BuildSuffixArgument) $(SqlClientNextVersionArgument)</_Cmd>
       <_Cmd>$([System.Text.RegularExpressions.Regex]::Replace($(_Cmd), "\s+", " "))</_Cmd>
     </PropertyGroup>
     <Exec Command="$(_Cmd)" ConsoleToMsBuild="true" StandardOutputImportance="High">
       <Output TaskParameter="ConsoleOutput" PropertyName="_PackageVersion" />
     </Exec>
     <PropertyGroup>
-      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlClientProjectPath)" -getProperty:SqlClientFileVersion $(BuildNumberArgument) $(BuildSuffixArgument)</_Cmd>
+      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlClientProjectPath)" -getProperty:SqlClientFileVersion $(BuildNumberArgument) $(BuildSuffixArgument) $(SqlClientNextVersionArgument)</_Cmd>
       <_Cmd>$([System.Text.RegularExpressions.Regex]::Replace($(_Cmd), "\s+", " "))</_Cmd>
     </PropertyGroup>
     <Exec Command="$(_Cmd)" ConsoleToMsBuild="true" StandardOutputImportance="High">
@@ -476,7 +535,7 @@
 
   <Target Name="GetVersionsSqlServer">
     <PropertyGroup>
-      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlServerProjectPath)" -getProperty:SqlServerPackageVersion $(BuildNumberArgument) $(BuildSuffixArgument)</_Cmd>
+      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlServerProjectPath)" -getProperty:SqlServerPackageVersion $(BuildNumberArgument) $(BuildSuffixArgument) $(SqlServerNextVersionArgument)</_Cmd>
       <_Cmd>$([System.Text.RegularExpressions.Regex]::Replace($(_Cmd), "\s+", " "))</_Cmd>
     </PropertyGroup>
     <Exec Command="$(_Cmd)" ConsoleToMsBuild="true" StandardOutputImportance="High">
@@ -486,7 +545,7 @@
       <Output TaskParameter="ConsoleOutput" PropertyName="_PublishedVersion" />
     </Exec>
     <PropertyGroup>
-      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlServerProjectPath)" -getProperty:SqlServerFileVersion $(BuildNumberArgument) $(BuildSuffixArgument)</_Cmd>
+      <_Cmd>"$(DotnetPath)dotnet" build "$(SqlServerProjectPath)" -getProperty:SqlServerFileVersion $(BuildNumberArgument) $(BuildSuffixArgument) $(SqlServerNextVersionArgument)</_Cmd>
       <_Cmd>$([System.Text.RegularExpressions.Regex]::Replace($(_Cmd), "\s+", " "))</_Cmd>
     </PropertyGroup>
     <Exec Command="$(_Cmd)" ConsoleToMsBuild="true" StandardOutputImportance="High">
@@ -574,6 +633,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -605,6 +665,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
@@ -636,6 +697,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -679,6 +741,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -839,6 +902,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
@@ -866,6 +930,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -946,6 +1011,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -972,6 +1038,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -1051,6 +1118,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
@@ -1077,6 +1145,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -1153,6 +1222,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -1176,6 +1246,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlClientArgument)
+        $(FileVersionSqlClientArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -1219,6 +1290,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlServerArgument)
+        $(FileVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -1242,6 +1314,7 @@
         $(BuildNumberArgument)
         $(BuildSuffixArgument)
         $(PackageVersionSqlServerArgument)
+        $(FileVersionSqlServerArgument)
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->
       <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index f750ed4b91..824776575d 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -66,8 +66,9 @@ parameters:
     type: object
     default: []
 
-  # Positive unsigned 16-bit revision used by build.proj to derive assembly file versions.
-  - name: revision
+  # Assembly file version to stamp (required). Pre-computed by the compute-versions stage so no
+  # build job re-derives it. The assembly version is derived from this by Versions.props.
+  - name: fileVersion
     type: string
 
   # The full name of the package. This is used in the job name, and to form DLL and PDB filenames
@@ -126,6 +127,13 @@ jobs:
       ob_sdl_apiscan_softwareName: ${{ parameters.packageFullName }}
       ob_sdl_apiscan_versionNumber: ${{ parameters.apiScanSoftwareVersion }}
 
+      # SBOM identity for this job's artifact.  OneBranch reads the SBOM package name/version only
+      # from the pipeline's globalSdl block, which has no per-job form, so that block indirects
+      # through these variables and each build job supplies its own values.  Jobs that publish no
+      # packages set ob_sdl_sbom_enabled to false instead.
+      sbomPackageName: ${{ parameters.packageFullName }}
+      sbomPackageVersion: ${{ parameters.packageVersion }}
+
     steps:
       - template: /eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self
 
@@ -166,7 +174,7 @@ jobs:
         parameters:
           dependencyArguments: $(sqlServerVersionArgument)
           packageShortName: ${{ parameters.packageShortName }}
-          revision: ${{ parameters.revision }}
+          fileVersion: ${{ parameters.fileVersion }}
           versionPropertySuffix: ${{ parameters.versionPropertySuffix }}
           packageVersion: ${{ parameters.packageVersion }}
 
@@ -176,7 +184,7 @@ jobs:
           buildConfiguration: Release
           dependencyArguments: $(sqlServerVersionArgument)
           packageShortName: ${{ parameters.packageShortName }}
-          revision: ${{ parameters.revision }}
+          fileVersion: ${{ parameters.fileVersion }}
           versionPropertySuffix: ${{ parameters.versionPropertySuffix }}
           packageVersion: ${{ parameters.packageVersion }}
 
@@ -224,7 +232,7 @@ jobs:
           dependencyArguments: $(sqlServerVersionArgument)
           packageFullName: ${{ parameters.packageFullName }}
           packageShortName: ${{ parameters.packageShortName }}
-          revision: ${{ parameters.revision }}
+          fileVersion: ${{ parameters.fileVersion }}
           versionPropertySuffix: ${{ parameters.versionPropertySuffix }}
           packageVersion: ${{ parameters.packageVersion }}
 
diff --git a/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml b/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
index cf7dd6a56b..e63c72bf58 100644
--- a/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/publish-nuget-package-job.yml
@@ -74,6 +74,11 @@ jobs:
       - name: ob_outputDirectory
         value: $(JOB_OUTPUT)
 
+      # This job republishes an already-built package, whose SBOM came from its build job. It sets
+      # no sbomPackage* values, so leaving SBOM enabled would emit one with unresolved macros.
+      - name: ob_sdl_sbom_enabled
+        value: false
+
       - name: artifactPath
         value: $(Pipeline.Workspace)/${{ parameters.artifactName }}
 
diff --git a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
index af59e54fc2..ab45b5f4c8 100644
--- a/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
+++ b/eng/pipelines/onebranch/jobs/publish-symbols-job.yml
@@ -64,6 +64,9 @@ jobs:
         value: false
       - name: ob_sdl_binskim_enabled
         value: false
+      # No packages are published here, so there is nothing to describe in an SBOM.
+      - name: ob_sdl_sbom_enabled
+        value: false
       # Path where the downloaded artifact will be placed.
       - name: artifactPath
         value: '$(Pipeline.Workspace)/${{ parameters.packageFullName }}'
diff --git a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
index 476bb5de30..818b902cf7 100644
--- a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
+++ b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
@@ -53,6 +53,10 @@ jobs:
       - name: ob_sdl_apiscan_enabled
         value: false
 
+      # Likewise it produces no package, and sets no sbomPackage* values for globalSdl to resolve.
+      - name: ob_sdl_sbom_enabled
+        value: false
+
       # Path within the downloaded artifact where NuGet packages are located.
       - name: artifactPath
         value: '$(Pipeline.Workspace)\${{ parameters.artifactName }}'
diff --git a/eng/pipelines/onebranch/scripts/compute-versions.ps1 b/eng/pipelines/onebranch/scripts/compute-versions.ps1
index 93e8d318aa..4bce0b1495 100644
--- a/eng/pipelines/onebranch/scripts/compute-versions.ps1
+++ b/eng/pipelines/onebranch/scripts/compute-versions.ps1
@@ -12,63 +12,39 @@
     The published SqlServer version is needed when SqlServer is not built because downstream
     SqlClient projects restore that existing package from NuGet.
 
-    Two mutually exclusive package version shapes are supported:
-
-    When AddRevision is true, BuildNumber is ignored if specified. For non-preview releases, versions
-    will be 1.2.3.<revision>. For preview releases, versions will be 1.2.3.<revision>-previewX.
-
-    When AddRevision is false, BuildNumber must be specified. Non-preview versions will be 1.2.3, and
-    preview releases will be 1.2.3-previewX.<build_number>.
-
-    This asymmetry maintains the existing package versioning practice where previews include a
-    date-coded build number, but normal releases do not.
+    Package versions take a single shape, produced by Versions.props from the pipeline build number.
+    Preview versions carry the full build number after the prerelease suffix, such as
+    1.2.3-preview1.26238.3. Stable versions are left exactly as declared in Versions.props, such as
+    1.2.3, because released packages are not stamped with a build number.
 
     File versions are always four-part and always carry a build number in the fourth component, even
-    when the package version does not:
-
-      - AddRevision true. The fourth component is the mapped revision, so package and file versions
-        agree. A package version of 1.2.3.34430-preview1 has file version 1.2.3.34430.
-
-      - AddRevision false. The fourth component is the first segment of BuildNumber. A package
-        version of 1.2.3-preview1.26238.3 has file version 1.2.3.26238, and a stable package version
-        of 1.2.3 still has file version 1.2.3.26238. This keeps every file version date-encoded and
-        traceable back to the run that produced it.
+    when the package version does not. Versions.props derives that component from the date segment of
+    BuildNumber, so a package version of 1.2.3-preview1.26238.3 has file version 1.2.3.26238, and a
+    stable package version of 1.2.3 still has file version 1.2.3.26238. That segment is date-coded,
+    so repeated runs on the same day share a file version even though their package versions differ.
 
-    The supplied revision is mapped to the range 1 through 65535 before canonical versions
-    are evaluated so every file version has a valid fourth component. Revisions above 65535 wrap
-    through the valid unsigned 16-bit file-version range. When AddRevision is true the script logs
-    the mapping because the revision may then collide with an earlier run. An unbuilt SqlServer
-    package is never revised or stamped with a build number because its effective version must
-    continue to identify the package that already exists on NuGet.
+    An unbuilt SqlServer package is never stamped with a build number because its effective version
+    must continue to identify the package that already exists on NuGet.
 
     The script emits these output variables for downstream stages:
-      - VersionRevision
       - SqlClientPackageVersion
+      - SqlClientFileVersion
       - SqlServerPackageVersion
+      - SqlServerFileVersion
       - SqlClientApiScanVersion
       - SqlServerApiScanVersion
 
 .PARAMETER ProjectPath
     Absolute or relative path to the repository build.proj file.
 
-.PARAMETER Revision
-    Positive integer used to distinguish versions. Values above 65535 are wrapped into the unsigned
-    16-bit revision range. Only consumed when AddRevision is true.
-
 .PARAMETER BuildNumber
-    Pipeline build number in the form <date>.<run>, such as 26238.3. Required when AddRevision is
-    false, and ignored when AddRevision is true. When required, it is appended to prerelease package
-    versions and its first segment becomes the file-version build number, so file versions remain
-    date-encoded.
+    Pipeline build number in the form <date>.<run>, such as 26238.3. Versions.props appends it to
+    prerelease package versions and derives the file-version build number from its date segment.
 
 .PARAMETER BuildSqlServer
     Whether this run builds Microsoft.SqlServer.Server. When false, the effective SqlServer package
     version is its last published version and its file version is not consumed downstream.
 
-.PARAMETER AddRevision
-    Whether to insert the revision into package versions built during this run.
-    Defaults to false in both top-level OneBranch pipelines.
-
 .PARAMETER DotnetPath
     dotnet executable to invoke. Defaults to the dotnet command resolved from PATH. This parameter
     primarily supports isolated testing and specialized agent configurations.
@@ -76,33 +52,19 @@
 .EXAMPLE
     ./compute-versions.ps1 `
         -ProjectPath ./build.proj `
-        -Revision 165500 `
         -BuildNumber 26238.3 `
-        -BuildSqlServer $true `
-        -AddRevision $false
+        -BuildSqlServer $true
 
-    Computes versions for an official-style run that builds SqlServer. Prerelease package versions
-    become 7.1.0-preview3.26238.3 and file versions become 7.1.0.26238.
+    Computes versions for a run that builds SqlServer. Prerelease package versions become
+    7.1.0-preview3.26238.3 and file versions become 7.1.0.26238.
 
 .EXAMPLE
     ./compute-versions.ps1 `
         -ProjectPath ./build.proj `
-        -Revision 165500 `
-        -BuildSqlServer $true `
-        -AddRevision $true
-
-    Computes versions for a run that builds SqlServer and appends mapped revision 34430 to both
-    package families and their file versions. BuildNumber is not supplied because AddRevision is
-    true.
-
-.EXAMPLE
-    ./compute-versions.ps1 `
-        -ProjectPath ./build.proj `
-        -Revision 165500 `
-        -BuildSqlServer $false `
-        -AddRevision $true
+        -BuildNumber 26238.3 `
+        -BuildSqlServer $false
 
-    Revises the SqlClient family versions while retaining SqlServerPublishedVersion for dependency
+    Stamps the SqlClient family versions while retaining SqlServerPublishedVersion for dependency
     restore because SqlServer is not built in this run.
 
 .NOTES
@@ -117,20 +79,13 @@ param(
     [ValidateScript({ Test-Path -LiteralPath $_ -PathType Leaf })]
     [string]$ProjectPath,
 
-    [Parameter(Mandatory = $true, HelpMessage = "Positive integer version revision.")]
-    [ValidateRange(1, [long]::MaxValue)]
-    [long]$Revision,
-
-    [Parameter(HelpMessage = "Pipeline build number, such as 26238.3. Required when AddRevision is false.")]
-    [ValidatePattern("^$|^\d+\.\d+$")]
-    [string]$BuildNumber = "",
+    [Parameter(Mandatory = $true, HelpMessage = "Pipeline build number, such as 26238.3.")]
+    [ValidatePattern("^\d+\.\d+$")]
+    [string]$BuildNumber,
 
     [Parameter(Mandatory = $true, HelpMessage = "Whether Microsoft.SqlServer.Server is built in this run.")]
     [bool]$BuildSqlServer,
 
-    [Parameter(Mandatory = $true, HelpMessage = "Whether to append the revision to built package versions.")]
-    [bool]$AddRevision,
-
     [Parameter(HelpMessage = "dotnet executable to invoke.")]
     [ValidateNotNullOrEmpty()]
     [string]$DotnetPath = "dotnet"
@@ -139,11 +94,6 @@ param(
 Set-StrictMode -Version Latest
 $ErrorActionPreference = "Stop"
 
-$wrappedRevision = (($Revision - 1) % 65535) + 1
-if ($AddRevision -and $Revision -gt 65535) {
-    Write-Host "Revision $Revision exceeds the unsigned 16-bit limit and wrapped to $wrappedRevision; this revision may collide with an earlier run."
-}
-
 <#
 .SYNOPSIS
     Extracts the first value associated with a labeled GetVersions target output line.
@@ -179,7 +129,7 @@ function Get-LabeledValue {
     GetVersions target suffix: SqlClient or SqlServer.
 
 .OUTPUTS
-    An object containing PackageVersion and PublishedVersion.
+    An object containing PackageVersion, FileVersion, and PublishedVersion.
 #>
 function Get-CanonicalVersions {
     param(
@@ -188,93 +138,28 @@ function Get-CanonicalVersions {
     )
 
     $output = & $DotnetPath build $ProjectPath `
-        -t:"GetVersions${Label}" -v:m -nologo -p:BuildNumber=$wrappedRevision 2>&1
+        -t:"GetVersions${Label}" -v:m -nologo -p:BuildNumber=$BuildNumber 2>&1
     if ($LASTEXITCODE -ne 0) {
         throw ($output -join [Environment]::NewLine)
     }
 
     $packageVersion = Get-LabeledValue -Output $output -Label "PackageVersion"
+    $fileVersion = Get-LabeledValue -Output $output -Label "FileVersion"
     $publishedVersion = Get-LabeledValue -Output $output -Label "PublishedVersion"
     if ([string]::IsNullOrWhiteSpace($packageVersion)) {
         throw "Failed to extract PackageVersion for ${Label}.`n$($output -join [Environment]::NewLine)"
     }
+    if ([string]::IsNullOrWhiteSpace($fileVersion)) {
+        throw "Failed to extract FileVersion for ${Label}.`n$($output -join [Environment]::NewLine)"
+    }
 
     [pscustomobject]@{
         PackageVersion = $packageVersion
+        FileVersion = $fileVersion
         PublishedVersion = $publishedVersion
     }
 }
 
-<#
-.SYNOPSIS
-    Inserts a numeric revision before a package version's prerelease suffix.
-
-.PARAMETER Version
-    Package version with a three-part numeric base and optional prerelease suffix.
-
-.PARAMETER Revision
-    Revision in the unsigned 16-bit file-version range.
-
-.OUTPUTS
-    A four-part package version preserving the original prerelease suffix.
-#>
-function Add-VersionRevision {
-    param(
-        [string]$Version,
-        [ValidateRange(1, 65535)]
-        [int]$Revision
-    )
-
-    $parts = $Version -split "-", 2
-    if ($parts[0] -notmatch "^\d+\.\d+\.\d+$") {
-        throw "Expected a three-part numeric version base, but received '$Version'."
-    }
-
-    $versionWithRevision = "$($parts[0]).$Revision"
-    if ($parts.Count -eq 2) {
-        return "$versionWithRevision-$($parts[1])"
-    }
-
-    return $versionWithRevision
-}
-
-<#
-.SYNOPSIS
-    Appends a pipeline build number to a prerelease package version.
-
-.DESCRIPTION
-    Reproduces the version shape used by earlier previews, where the build number follows the
-    prerelease suffix, such as 7.1.0-preview3.26238.3. Stable versions are returned unchanged
-    because released packages are not stamped with a build number.
-
-.PARAMETER Version
-    Package version with a three-part numeric base and optional prerelease suffix.
-
-.PARAMETER BuildNumber
-    Pipeline build number to append.
-
-.OUTPUTS
-    The package version with the build number appended to its prerelease suffix, or the original
-    version when it carries no prerelease suffix.
-#>
-function Add-VersionBuildNumber {
-    param(
-        [string]$Version,
-        [string]$BuildNumber
-    )
-
-    $parts = $Version -split "-", 2
-    if ($parts[0] -notmatch "^\d+\.\d+\.\d+$") {
-        throw "Expected a three-part numeric version base, but received '$Version'."
-    }
-
-    if ($parts.Count -eq 2) {
-        return "$($parts[0])-$($parts[1]).$BuildNumber"
-    }
-
-    return $Version
-}
-
 <#
 .SYNOPSIS
     Extracts the major.minor components from a package version.
@@ -316,14 +201,18 @@ function Set-PipelineOutputVariable {
     Write-Host "##vso[task.setvariable variable=${Name};isOutput=true]$Value"
 }
 
-Write-Host "Extracting versions with revision=$Revision (wrapped=$wrappedRevision)..."
+Write-Host "Extracting versions with build number $BuildNumber..."
 $sqlClientVersions = Get-CanonicalVersions -Label "SqlClient"
 $sqlServerVersions = Get-CanonicalVersions -Label "SqlServer"
 
-Write-Host "  SqlClient: pkg=$($sqlClientVersions.PackageVersion)"
-Write-Host "  SqlServer: pkg=$($sqlServerVersions.PackageVersion) pub=$($sqlServerVersions.PublishedVersion)"
+Write-Host "  SqlClient: pkg=$($sqlClientVersions.PackageVersion) file=$($sqlClientVersions.FileVersion)"
+Write-Host "  SqlServer: pkg=$($sqlServerVersions.PackageVersion) file=$($sqlServerVersions.FileVersion) pub=$($sqlServerVersions.PublishedVersion)"
 
 $sqlClientPackageVersion = $sqlClientVersions.PackageVersion
+$sqlClientFileVersion = $sqlClientVersions.FileVersion
+
+# An unbuilt SqlServer resolves to its published version, which no build job stamps, so it has no
+# effective file version.
 $sqlServerPackageVersion = if ($BuildSqlServer) {
     $sqlServerVersions.PackageVersion
 } else {
@@ -332,46 +221,11 @@ $sqlServerPackageVersion = if ($BuildSqlServer) {
     }
     $sqlServerVersions.PublishedVersion
 }
-
-$fileVersionBuildNumber = $null
-
-if ($AddRevision) {
-    $sqlClientPackageVersion = Add-VersionRevision `
-        -Version $sqlClientPackageVersion `
-        -Revision $wrappedRevision
-    if ($BuildSqlServer) {
-        $sqlServerPackageVersion = Add-VersionRevision `
-            -Version $sqlServerPackageVersion `
-            -Revision $wrappedRevision
-    }
-
-    # The revision is already the fourth component of the package version, so it is also the
-    # file-version build number.
-    $fileVersionBuildNumber = $wrappedRevision
-    Write-Host "Version revision: $wrappedRevision (input=$Revision)"
-}
-else {
-    if ([string]::IsNullOrWhiteSpace($BuildNumber)) {
-        throw "BuildNumber is required when AddRevision is false."
-    }
-
-    $fileVersionBuildNumber = $BuildNumber.Split(".")[0]
-
-    $sqlClientPackageVersion = Add-VersionBuildNumber `
-        -Version $sqlClientPackageVersion `
-        -BuildNumber $BuildNumber
-    if ($BuildSqlServer) {
-        $sqlServerPackageVersion = Add-VersionBuildNumber `
-            -Version $sqlServerPackageVersion `
-            -BuildNumber $BuildNumber
-    }
-
-    Write-Host "Version build number: $BuildNumber (file version build number=$fileVersionBuildNumber)"
-}
+$sqlServerFileVersion = if ($BuildSqlServer) { $sqlServerVersions.FileVersion } else { "" }
 
 Write-Host "Effective versions:"
-Write-Host "  SqlClient (family): $sqlClientPackageVersion"
-Write-Host "  SqlServer:          $sqlServerPackageVersion"
+Write-Host "  SqlClient (family): $sqlClientPackageVersion (file $sqlClientFileVersion)"
+Write-Host "  SqlServer:          $sqlServerPackageVersion (file $sqlServerFileVersion)"
 
 $sqlClientApiScanVersion = Get-MajorMinorVersion -Version $sqlClientPackageVersion
 $sqlServerApiScanVersion = Get-MajorMinorVersion -Version $sqlServerPackageVersion
@@ -381,7 +235,8 @@ Write-Host "  SqlClient (family): $sqlClientApiScanVersion"
 Write-Host "  SqlServer:          $sqlServerApiScanVersion"
 
 Set-PipelineOutputVariable -Name "SqlClientPackageVersion" -Value $sqlClientPackageVersion
+Set-PipelineOutputVariable -Name "SqlClientFileVersion" -Value $sqlClientFileVersion
 Set-PipelineOutputVariable -Name "SqlServerPackageVersion" -Value $sqlServerPackageVersion
+Set-PipelineOutputVariable -Name "SqlServerFileVersion" -Value $sqlServerFileVersion
 Set-PipelineOutputVariable -Name "SqlClientApiScanVersion" -Value $sqlClientApiScanVersion
 Set-PipelineOutputVariable -Name "SqlServerApiScanVersion" -Value $sqlServerApiScanVersion
-Set-PipelineOutputVariable -Name "VersionRevision" -Value $fileVersionBuildNumber
diff --git a/eng/pipelines/onebranch/scripts/tests/README.md b/eng/pipelines/onebranch/scripts/tests/README.md
index bda88d58a1..3585312d53 100644
--- a/eng/pipelines/onebranch/scripts/tests/README.md
+++ b/eng/pipelines/onebranch/scripts/tests/README.md
@@ -31,7 +31,7 @@ Invoke-Pester ./publish-symbols.Tests.ps1 -Output Detailed
 
 | Area                  | What's tested                                                    |
 | --------------------- | ---------------------------------------------------------------- |
-| Version computation   | Canonical output parsing, revisions, wrapping, effective package selection, and failures |
+| Version computation   | Canonical output parsing, effective package selection, target version composition, and failures |
 | Parameter validation  | Empty strings rejected for all mandatory parameters              |
 | URL construction      | Base URL, register URL, request URL built from parameters        |
 | Request bodies        | Registration body, default publish flags, flag overrides         |
@@ -41,5 +41,6 @@ Invoke-Pester ./publish-symbols.Tests.ps1 -Output Detailed
 ## Notes
 
 - All external calls (`az`, `Invoke-RestMethod`) are mocked — no network access or Azure credentials are required.
-- Version tests mock `dotnet`, so they do not invoke MSBuild or require a restored repository.
+- Script-level version tests mock `dotnet`; package-composition tests invoke the real MSBuild
+  `GetVersionsSqlClient` and `GetVersionsSqlServer` targets.
 - Tests validate scripts in the parent directory relative to this directory.
diff --git a/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1 b/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
index cd38e6bb66..7a9e9779cb 100644
--- a/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
+++ b/eng/pipelines/onebranch/scripts/tests/compute-versions.Tests.ps1
@@ -4,7 +4,9 @@
 #>
 
 BeforeAll {
+    $script:repoRoot = Resolve-Path (Join-Path $PSScriptRoot '..' '..' '..' '..' '..')
     $scriptPath = Join-Path $PSScriptRoot '..' 'compute-versions.ps1'
+    $buildProjectPath = Resolve-Path (Join-Path $script:repoRoot 'build.proj')
     $projectPath = Join-Path $TestDrive 'build.proj'
     Set-Content -LiteralPath $projectPath -Value '<Project />'
 
@@ -19,26 +21,23 @@ BeforeAll {
 
     function Invoke-ComputeVersions {
         param(
-            [long]$Revision = 42,
-            [string]$BuildNumber = '',
-            [bool]$BuildSqlServer = $true,
-            [bool]$AddRevision = $true
+            [string]$BuildNumber = $script:testBuildNumber,
+            [bool]$BuildSqlServer = $true
         )
 
         & $scriptPath `
             -ProjectPath $projectPath `
-            -Revision $Revision `
             -BuildNumber $BuildNumber `
-            -BuildSqlServer $BuildSqlServer `
-            -AddRevision $AddRevision *>&1 | Out-String
+            -BuildSqlServer $BuildSqlServer *>&1 | Out-String
     }
 
     # Alternates between the SqlClient and SqlServer GetVersions targets, which the script always
-    # invokes in that order.
+    # invokes in that order.  The versions returned here are already stamped, because Versions.props
+    # applies the build number before the script ever sees them.
     function Set-DotnetMock {
         param(
-            [string]$SqlClientPackageVersion = '7.1.0-preview3',
-            [string]$SqlServerPackageVersion = '1.1.0-preview1'
+            [string]$SqlClientPackageVersion = "7.1.0-preview3.$script:testBuildNumber",
+            [string]$SqlServerPackageVersion = "1.1.0-preview1.$script:testBuildNumber"
         )
 
         $global:computeVersionsDotnetCallCount = 0
@@ -48,12 +47,14 @@ BeforeAll {
             if ($global:computeVersionsDotnetCallCount % 2 -eq 1) {
                 return @(
                     "  PackageVersion: $SqlClientPackageVersion"
+                    '  FileVersion: 7.1.0.26238'
                     '  PublishedVersion: 7.0.0'
                 )
             }
 
             return @(
                 "  PackageVersion: $SqlServerPackageVersion"
+                '  FileVersion: 1.1.0.26238'
                 '  PublishedVersion: 1.0.0'
             )
         }.GetNewClosure()
@@ -62,6 +63,90 @@ BeforeAll {
     function Set-SuccessfulDotnetMock {
         Set-DotnetMock
     }
+
+    function Invoke-VersionTarget {
+        param(
+            [Parameter(Mandatory)]
+            [string]$Target,
+
+            [Parameter(Mandatory)]
+            [string]$NextVersionProperty,
+
+            [Parameter(Mandatory)]
+            [string]$BaseVersion,
+
+            [string]$BuildSuffix
+        )
+
+        $arguments = @(
+            'build'
+            $buildProjectPath
+            "-t:$Target"
+            '-v:m'
+            '-nologo'
+            "-p:BuildNumber=$script:testBuildNumber"
+            "-p:$NextVersionProperty=$BaseVersion"
+        )
+        if ($BuildSuffix) {
+            $arguments += "-p:BuildSuffix=$BuildSuffix"
+        }
+
+        $output = & dotnet @arguments 2>&1 | Out-String
+        if ($LASTEXITCODE -ne 0) {
+            throw "$Target failed with exit code ${LASTEXITCODE}:`n$output"
+        }
+
+        $output
+    }
+
+    # Drives PrepareForBuild rather than the validation target directly, because the hook point is
+    # itself the thing under test: a check wired after the compile would pass a direct invocation.
+    # An explicit target framework is required, as PrepareForBuild is not valid on the outer
+    # cross-targeting build.
+    function Invoke-VersionValidation {
+        param(
+            [Parameter(Mandatory)]
+            [string]$ProjectPath,
+
+            [Parameter(Mandatory)]
+            [string]$TargetFramework,
+
+            [string[]]$Properties = @()
+        )
+
+        $arguments = @(
+            'build'
+            $ProjectPath
+            '-f'
+            $TargetFramework
+            '-t:PrepareForBuild'
+            '-v:m'
+            '-nologo'
+        ) + $Properties
+
+        $output = & dotnet @arguments 2>&1 | Out-String
+        [pscustomobject]@{ ExitCode = $LASTEXITCODE; Output = $output }
+    }
+
+    function Invoke-BuildProjTarget {
+        param(
+            [Parameter(Mandatory)]
+            [string]$Target,
+
+            [string[]]$Properties = @()
+        )
+
+        $arguments = @(
+            'build'
+            $buildProjectPath
+            "-t:$Target"
+            '-v:m'
+            '-nologo'
+        ) + $Properties
+
+        $output = & dotnet @arguments 2>&1 | Out-String
+        [pscustomobject]@{ ExitCode = $LASTEXITCODE; Output = $output }
+    }
 }
 
 AfterAll {
@@ -73,101 +158,218 @@ Describe 'compute-versions.ps1 Effective Versions' {
         Set-SuccessfulDotnetMock
     }
 
-    It 'appends the build number after the prerelease suffix when package revisioning is disabled' {
-        $output = Invoke-ComputeVersions -AddRevision $false -BuildNumber $script:testBuildNumber
+    It 'forwards the stamped prerelease versions from Versions.props' {
+        $output = Invoke-ComputeVersions
 
         $output | Should -Match "SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3\.$script:testBuildNumberPattern"
         $output | Should -Match "SqlServerPackageVersion;isOutput=true]1\.1\.0-preview1\.$script:testBuildNumberPattern"
         $output | Should -Match 'SqlClientApiScanVersion;isOutput=true]7\.1'
         $output | Should -Match 'SqlServerApiScanVersion;isOutput=true]1\.1'
         $output | Should -Match 'APIScan registration versions:\s+SqlClient \(family\): 7\.1\s+SqlServer:\s+1\.1'
-        $output | Should -Match "VersionRevision;isOutput=true]$script:testFileVersionBuildNumber"
-    }
-
-    It 'inserts the revision before prerelease suffixes for built packages' {
-        $output = Invoke-ComputeVersions
-
-        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0\.42-preview3'
-        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0\.42-preview1'
+        $output | Should -Match 'SqlClientFileVersion;isOutput=true]7\.1\.0\.26238'
+        $output | Should -Match 'SqlServerFileVersion;isOutput=true]1\.1\.0\.26238'
     }
 
     It 'retains the published SqlServer package when SqlServer is not built' {
         $output = Invoke-ComputeVersions -BuildSqlServer $false
 
-        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0\.42-preview3'
+        $output | Should -Match "SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3\.$script:testBuildNumberPattern"
         $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.0\.0'
         $output | Should -Match 'SqlServerApiScanVersion;isOutput=true]1\.0'
-        $output | Should -Not -Match 'SqlServerPackageVersion;isOutput=true]1\.0\.0\.42'
-    }
-
-    It 'wraps revisions above 65535 and logs the mapping as information' {
-        $output = Invoke-ComputeVersions -Revision 65536
-
-        $output | Should -Match 'Revision 65536.*wrapped to 1'
-        $output | Should -Not -Match 'task\.logissue type=warning'
-        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0\.1-preview3'
-        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0\.1-preview1'
-        $output | Should -Match 'VersionRevision;isOutput=true]1'
-    }
-
-    It 'emits the build number rather than the wrapped revision when package revisioning is disabled' {
-        $output = Invoke-ComputeVersions -Revision 65536 -AddRevision $false -BuildNumber $script:testBuildNumber
-
-        $output | Should -Not -Match 'task\.logissue type=warning'
-        $output | Should -Not -Match 'wrapped to'
-        $output | Should -Match "SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3\.$script:testBuildNumberPattern"
-        $output | Should -Match "SqlServerPackageVersion;isOutput=true]1\.1\.0-preview1\.$script:testBuildNumberPattern"
-        $output | Should -Match "VersionRevision;isOutput=true]$script:testFileVersionBuildNumber"
-    }
+        $output | Should -Not -Match "SqlServerPackageVersion;isOutput=true]1\.0\.0[\.-]$script:testFileVersionBuildNumber"
 
-    It 'retains the published SqlServer package unstamped when SqlServer is not built' {
-        $output = Invoke-ComputeVersions -BuildSqlServer $false -AddRevision $false -BuildNumber $script:testBuildNumber
-
-        $output | Should -Match "SqlClientPackageVersion;isOutput=true]7\.1\.0-preview3\.$script:testBuildNumberPattern"
-        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.0\.0'
-        $output | Should -Not -Match "SqlServerPackageVersion;isOutput=true]1\.0\.0\.$script:testFileVersionBuildNumber"
+        # An unbuilt SqlServer is never stamped, so it has no effective file version.
+        $output | Should -Match 'SqlServerFileVersion;isOutput=true](\r?\n|$)'
     }
 
-    It 'omits the build number from non-preview package versions when package revisioning is disabled' {
+    It 'forwards unstamped non-preview package versions' {
         Set-DotnetMock -SqlClientPackageVersion '7.1.0' -SqlServerPackageVersion '1.1.0'
 
-        $output = Invoke-ComputeVersions -AddRevision $false -BuildNumber $script:testBuildNumber
+        $output = Invoke-ComputeVersions
 
         $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0(\r?\n|$)'
         $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0(\r?\n|$)'
         $output | Should -Not -Match "SqlClientPackageVersion;isOutput=true]7\.1\.0[\.-]$script:testFileVersionBuildNumber"
         $output | Should -Not -Match "SqlServerPackageVersion;isOutput=true]1\.1\.0[\.-]$script:testFileVersionBuildNumber"
 
-        # The file version is still stamped so every build produces a distinct, date-encoded
-        # file version even for non-preview releases.
-        $output | Should -Match "VersionRevision;isOutput=true]$script:testFileVersionBuildNumber"
+        # The file version is still stamped so every build produces a date-encoded file version even
+        # for non-preview releases.
+        $output | Should -Match 'SqlClientFileVersion;isOutput=true]7\.1\.0\.26238'
     }
+}
 
-    It 'revises non-preview package versions when package revisioning is enabled' {
-        Set-DotnetMock -SqlClientPackageVersion '7.1.0' -SqlServerPackageVersion '1.1.0'
-
-        $output = Invoke-ComputeVersions
-
-        $output | Should -Match 'SqlClientPackageVersion;isOutput=true]7\.1\.0\.42'
-        $output | Should -Match 'SqlServerPackageVersion;isOutput=true]1\.1\.0\.42'
-        $output | Should -Match 'VersionRevision;isOutput=true]42'
+Describe 'GetVersions target package composition' {
+    It '<Target> composes <Case> package and file versions' -ForEach @(
+        @{
+            Target = 'GetVersionsSqlClient'; NextVersionProperty = 'SqlClientNextVersion'
+            BaseVersion = '7.1.0'; BuildSuffix = ''; ExpectedPackageVersion = '7.1.0'
+            ExpectedFileVersion = '7.1.0.26238'; Case = 'a stable base without a suffix'
+        }
+        @{
+            Target = 'GetVersionsSqlClient'; NextVersionProperty = 'SqlClientNextVersion'
+            BaseVersion = '7.1.0'; BuildSuffix = 'ci'; ExpectedPackageVersion = '7.1.0-ci.26238.3'
+            ExpectedFileVersion = '7.1.0.26238'; Case = 'a stable base with a suffix'
+        }
+        @{
+            Target = 'GetVersionsSqlClient'; NextVersionProperty = 'SqlClientNextVersion'
+            BaseVersion = '7.1.0-preview3'; BuildSuffix = ''; ExpectedPackageVersion = '7.1.0-preview3.26238.3'
+            ExpectedFileVersion = '7.1.0.26238'; Case = 'a prerelease base without a suffix'
+        }
+        @{
+            Target = 'GetVersionsSqlClient'; NextVersionProperty = 'SqlClientNextVersion'
+            BaseVersion = '7.1.0-preview3'; BuildSuffix = 'ci'; ExpectedPackageVersion = '7.1.0-preview3-ci.26238.3'
+            ExpectedFileVersion = '7.1.0.26238'; Case = 'a prerelease base with a suffix'
+        }
+        @{
+            Target = 'GetVersionsSqlServer'; NextVersionProperty = 'SqlServerNextVersion'
+            BaseVersion = '1.1.0'; BuildSuffix = ''; ExpectedPackageVersion = '1.1.0'
+            ExpectedFileVersion = '1.1.0.26238'; Case = 'a stable base without a suffix'
+        }
+        @{
+            Target = 'GetVersionsSqlServer'; NextVersionProperty = 'SqlServerNextVersion'
+            BaseVersion = '1.1.0'; BuildSuffix = 'ci'; ExpectedPackageVersion = '1.1.0-ci.26238.3'
+            ExpectedFileVersion = '1.1.0.26238'; Case = 'a stable base with a suffix'
+        }
+        @{
+            Target = 'GetVersionsSqlServer'; NextVersionProperty = 'SqlServerNextVersion'
+            BaseVersion = '1.1.0-preview1'; BuildSuffix = ''; ExpectedPackageVersion = '1.1.0-preview1.26238.3'
+            ExpectedFileVersion = '1.1.0.26238'; Case = 'a prerelease base without a suffix'
+        }
+        @{
+            Target = 'GetVersionsSqlServer'; NextVersionProperty = 'SqlServerNextVersion'
+            BaseVersion = '1.1.0-preview1'; BuildSuffix = 'ci'; ExpectedPackageVersion = '1.1.0-preview1-ci.26238.3'
+            ExpectedFileVersion = '1.1.0.26238'; Case = 'a prerelease base with a suffix'
+        }
+    ) {
+        $output = Invoke-VersionTarget `
+            -Target $Target `
+            -NextVersionProperty $NextVersionProperty `
+            -BaseVersion $BaseVersion `
+            -BuildSuffix $BuildSuffix
+
+        $output | Should -Match "PackageVersion:\s+$([regex]::Escape($ExpectedPackageVersion))(\r?\n|$)"
+        $output | Should -Match "FileVersion:\s+$([regex]::Escape($ExpectedFileVersion))(\r?\n|$)"
     }
 }
 
-Describe 'compute-versions.ps1 Error Handling' {
-    It 'rejects a non-positive revision' {
-        { Invoke-ComputeVersions -Revision 0 } | Should -Throw
+Describe 'File version component validation' {
+    It 'rejects a four-part <Property>' -ForEach @(
+        @{
+            Product = 'SqlClient'; Property = 'SqlClientPackageVersion'
+            RelativeProject = 'src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj'
+            TargetFramework = 'net8.0'
+            Properties = @('-p:SqlClientPackageVersion=7.1.0.123')
+            ExpectedFileVersion = '7.1.0.123.0'
+        }
+        @{
+            Product = 'SqlClient'; Property = 'SqlClientNextVersion'
+            RelativeProject = 'src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj'
+            TargetFramework = 'net8.0'
+            Properties = @('-p:SqlClientNextVersion=7.1.0.123', '-p:BuildNumber=1234')
+            ExpectedFileVersion = '7.1.0.123.1234'
+        }
+        @{
+            Product = 'SqlServer'; Property = 'SqlServerPackageVersion'
+            RelativeProject = 'src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj'
+            TargetFramework = 'netstandard2.0'
+            Properties = @('-p:SqlServerPackageVersion=1.1.0.123')
+            ExpectedFileVersion = '1.1.0.123.0'
+        }
+        @{
+            Product = 'SqlServer'; Property = 'SqlServerNextVersion'
+            RelativeProject = 'src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj'
+            TargetFramework = 'netstandard2.0'
+            Properties = @('-p:SqlServerNextVersion=1.1.0.123', '-p:BuildNumber=1234')
+            ExpectedFileVersion = '1.1.0.123.1234'
+        }
+    ) {
+        $result = Invoke-VersionValidation `
+            -ProjectPath (Join-Path $script:repoRoot $RelativeProject) `
+            -TargetFramework $TargetFramework `
+            -Properties $Properties
+
+        $result.ExitCode | Should -Not -Be 0
+        $result.Output | Should -Match ([regex]::Escape("${Product}FileVersion '$ExpectedFileVersion' is not a four-part numeric version"))
     }
 
-    It 'requires a build number when package revisioning is disabled' {
-        Set-SuccessfulDotnetMock
+    It 'rejects an externally supplied <Description> file version for <Product>' -ForEach @(
+        @{
+            Product = 'SqlClient'; Description = 'short'
+            RelativeProject = 'src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj'
+            TargetFramework = 'net8.0'
+            FileVersion = '1.2'
+        }
+        @{
+            Product = 'SqlClient'; Description = 'non-numeric'
+            RelativeProject = 'src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj'
+            TargetFramework = 'net8.0'
+            FileVersion = 'abc'
+        }
+        @{
+            Product = 'SqlServer'; Description = 'short'
+            RelativeProject = 'src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj'
+            TargetFramework = 'netstandard2.0'
+            FileVersion = '1.2'
+        }
+        @{
+            Product = 'SqlServer'; Description = 'non-numeric'
+            RelativeProject = 'src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj'
+            TargetFramework = 'netstandard2.0'
+            FileVersion = 'abc'
+        }
+    ) {
+        $result = Invoke-VersionValidation `
+            -ProjectPath (Join-Path $script:repoRoot $RelativeProject) `
+            -TargetFramework $TargetFramework `
+            -Properties @("-p:${Product}FileVersion=$FileVersion")
+
+        $result.ExitCode | Should -Not -Be 0
+        $result.Output | Should -Match ([regex]::Escape("${Product}FileVersion '$FileVersion' is not a four-part numeric version"))
+    }
 
-        { Invoke-ComputeVersions -AddRevision $false } |
-            Should -Throw '*BuildNumber is required when AddRevision is false*'
+    It 'accepts the declared <Product> version' -ForEach @(
+        @{
+            Product = 'SqlClient'
+            RelativeProject = 'src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj'
+            TargetFramework = 'net8.0'
+        }
+        @{
+            Product = 'SqlServer'
+            RelativeProject = 'src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj'
+            TargetFramework = 'netstandard2.0'
+        }
+    ) {
+        $result = Invoke-VersionValidation `
+            -ProjectPath (Join-Path $script:repoRoot $RelativeProject) `
+            -TargetFramework $TargetFramework `
+            -Properties @("-p:BuildNumber=$script:testBuildNumber")
+
+        $result.ExitCode | Should -Be 0
     }
+}
 
+Describe 'build.proj file version wrappers' {
+    # A malformed value is used so the leaf project reports it by name, which proves the wrapper
+    # forwarded it verbatim without paying for a full compile.
+    It 'forwards <Wrapper> through <Target>' -ForEach @(
+        @{ Product = 'SqlClient'; Wrapper = 'FileVersionSqlClient'; Target = 'BuildLogging' }
+        @{ Product = 'SqlServer'; Wrapper = 'FileVersionSqlServer'; Target = 'BuildSqlServer' }
+    ) {
+        $result = Invoke-BuildProjTarget -Target $Target -Properties @("-p:$Wrapper=1.2")
+
+        $result.ExitCode | Should -Not -Be 0
+        $result.Output | Should -Match ([regex]::Escape("${Product}FileVersion '1.2' is not a four-part numeric version"))
+    }
+}
+
+Describe 'compute-versions.ps1 Error Handling' {
     It 'rejects a malformed build number' {
-        { Invoke-ComputeVersions -AddRevision $false -BuildNumber 'not-a-build-number' } | Should -Throw
+        { Invoke-ComputeVersions -BuildNumber 'not-a-build-number' } | Should -Throw
+    }
+
+    It 'requires a build number' {
+        # Bound as empty rather than omitted; omitting a mandatory parameter prompts interactively.
+        { Invoke-ComputeVersions -BuildNumber '' } | Should -Throw
     }
 
     It 'throws when a GetVersions target fails' {
@@ -188,18 +390,12 @@ Describe 'compute-versions.ps1 Error Handling' {
         { Invoke-ComputeVersions } | Should -Throw '*Failed to extract PackageVersion*'
     }
 
-    It 'throws when a revised package does not have a three-part numeric base' {
-        $global:computeVersionsDotnetCallCount = 0
+    It 'throws when a FileVersion label is absent' {
         Mock -CommandName 'dotnet' -MockWith {
             $global:LASTEXITCODE = 0
-            $global:computeVersionsDotnetCallCount++
-            if ($global:computeVersionsDotnetCallCount -eq 1) {
-                return @('PackageVersion: 7.1-preview3')
-            }
-
-            return @('PackageVersion: 1.1.0-preview1', 'PublishedVersion: 1.0.0')
+            return 'PackageVersion: 7.1.0-preview3.26238.3'
         }
 
-        { Invoke-ComputeVersions } | Should -Throw "*Expected a three-part numeric version base*"
+        { Invoke-ComputeVersions } | Should -Throw '*Failed to extract FileVersion*'
     }
 }
diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml
index 3ec9bdbc75..88231ed15b 100644
--- a/eng/pipelines/onebranch/sqlclient-non-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-non-official.yml
@@ -28,13 +28,6 @@ parameters:
     type: boolean
     default: false
 
-  # Append the Build.BuildId revision to package and file versions to reduce collisions when
-  # repeatedly publishing tests to symbol servers or the NuGet test feed.
-  - name: addRevision
-    displayName: Use the build ID as the revision version
-    type: boolean
-    default: false
-
   # True to publish symbols to private and public servers.
   - name: publishSymbols
     displayName: Publish symbols
@@ -256,8 +249,12 @@ extends:
 
       sbom:
         enabled: true
-        packageName: 'Microsoft.Data.SqlClient'
-        packageVersion: '$(Build.BuildNumber)'
+        # OneBranch resolves these from globalSdl only -- there is no per-job form -- so they
+        # indirect through variables that each build job sets to the package it produces.  Jobs
+        # that publish no packages disable SBOM via ob_sdl_sbom_enabled rather than defaulting
+        # these.  See build-buildproj-job.yml.
+        packageName: '$(sbomPackageName)'
+        packageVersion: '$(sbomPackageVersion)'
 
       tsa:
         # TSA (Trust Services Automation) files SDL analysis findings as Azure DevOps bug work
@@ -297,7 +294,6 @@ extends:
 
       - template: /eng/pipelines/onebranch/stages/compute-versions-stage.yml@self
         parameters:
-          addRevision: ${{ parameters.addRevision }}
           buildSqlServer: ${{ parameters.buildSqlServer }}
 
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 2bc98a655b..40b08c76c0 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -37,12 +37,6 @@ parameters:
     type: boolean
     default: false
 
-  # Append the Build.BuildId revision to package and file versions.
-  - name: addRevision
-    displayName: Use the build ID as the revision version
-    type: boolean
-    default: false
-
   # True to publish symbols to private and public servers.
   - name: publishSymbols
     displayName: Publish symbols
@@ -270,8 +264,12 @@ extends:
 
       sbom:
         enabled: true
-        packageName: 'Microsoft.Data.SqlClient'
-        packageVersion: '$(Build.BuildNumber)'
+        # OneBranch resolves these from globalSdl only -- there is no per-job form -- so they
+        # indirect through variables that each build job sets to the package it produces.  Jobs
+        # that publish no packages disable SBOM via ob_sdl_sbom_enabled rather than defaulting
+        # these.  See build-buildproj-job.yml.
+        packageName: '$(sbomPackageName)'
+        packageVersion: '$(sbomPackageVersion)'
 
       tsa:
         # TSA (Trust Services Automation) files SDL analysis findings as Azure DevOps bug work
@@ -306,7 +304,6 @@ extends:
 
       - template: /eng/pipelines/onebranch/stages/compute-versions-stage.yml@self
         parameters:
-          addRevision: ${{ parameters.addRevision }}
           buildSqlServer: ${{ parameters.buildSqlServer }}
 
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index 98e656004b..afd1907859 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -80,8 +80,10 @@ stages:
     dependsOn: compute_versions
 
     variables:
-      - name: versionRevision
-        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.VersionRevision'] ]
+      - name: sqlClientFileVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientFileVersion'] ]
+      - name: sqlServerFileVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerFileVersion'] ]
       - name: sqlClientPackageVersion
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
       - name: sqlServerPackageVersion
@@ -107,7 +109,7 @@ stages:
           signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
 
           dependencies: []
-          revision: '$(versionRevision)'
+          fileVersion: '$(sqlClientFileVersion)'
           packageFullName: 'Microsoft.Data.SqlClient.Internal.Logging'
           packageShortName: 'Logging'
           versionPropertySuffix: 'SqlClient'
@@ -130,7 +132,7 @@ stages:
             signingEsrpConnectedServiceName: '${{ parameters.signingEsrpConnectedServiceName }}'
 
             dependencies: []
-            revision: '$(versionRevision)'
+            fileVersion: '$(sqlServerFileVersion)'
             packageFullName: 'Microsoft.SqlServer.Server'
             packageShortName: 'SqlServer'
             versionPropertySuffix: 'SqlServer'
@@ -148,8 +150,8 @@ stages:
       - build_independent
 
     variables:
-      - name: versionRevision
-        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.VersionRevision'] ]
+      - name: sqlClientFileVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientFileVersion'] ]
       - name: sqlClientPackageVersion
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
       - name: sqlClientApiScanVersion
@@ -174,7 +176,7 @@ stages:
             - artifactName: '${{ parameters.loggingArtifactsName }}'
               shortName: 'Logging'
               version: '$(sqlClientPackageVersion)'
-          revision: '$(versionRevision)'
+          fileVersion: '$(sqlClientFileVersion)'
           packageFullName: 'Microsoft.Data.SqlClient.Extensions.Abstractions'
           packageShortName: 'Abstractions'
           versionPropertySuffix: 'SqlClient'
@@ -192,8 +194,8 @@ stages:
       - build_abstractions
 
     variables:
-      - name: versionRevision
-        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.VersionRevision'] ]
+      - name: sqlClientFileVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientFileVersion'] ]
       - name: sqlClientPackageVersion
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
       - name: sqlServerPackageVersion
@@ -234,7 +236,7 @@ stages:
               - artifactName: ''
                 shortName: 'SqlServer'
                 version: '$(sqlServerPackageVersion)'
-          revision: '$(versionRevision)'
+          fileVersion: '$(sqlClientFileVersion)'
           packageFullName: 'Microsoft.Data.SqlClient'
           packageShortName: 'SqlClient'
           versionPropertySuffix: 'SqlClient'
@@ -261,7 +263,7 @@ stages:
             - artifactName: '${{ parameters.loggingArtifactsName }}'
               shortName: 'Logging'
               version: '$(sqlClientPackageVersion)'
-          revision: '$(versionRevision)'
+          fileVersion: '$(sqlClientFileVersion)'
           packageFullName: 'Microsoft.Data.SqlClient.Extensions.Azure'
           packageShortName: 'Azure'
           versionPropertySuffix: 'SqlClient'
@@ -278,8 +280,8 @@ stages:
       - build_dependent
 
     variables:
-      - name: versionRevision
-        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.VersionRevision'] ]
+      - name: sqlClientFileVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientFileVersion'] ]
       - name: sqlClientPackageVersion
         value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
       - name: sqlServerPackageVersion
@@ -322,7 +324,7 @@ stages:
               - artifactName: ''
                 shortName: 'SqlServer'
                 version: '$(sqlServerPackageVersion)'
-          revision: '$(versionRevision)'
+          fileVersion: '$(sqlClientFileVersion)'
           packageFullName: 'Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider'
           packageShortName: 'AkvProvider'
           versionPropertySuffix: 'SqlClient'
diff --git a/eng/pipelines/onebranch/stages/compute-versions-stage.yml b/eng/pipelines/onebranch/stages/compute-versions-stage.yml
index 11e2187e57..9514c0d56e 100644
--- a/eng/pipelines/onebranch/stages/compute-versions-stage.yml
+++ b/eng/pipelines/onebranch/stages/compute-versions-stage.yml
@@ -17,20 +17,14 @@
 #   - Microsoft.SqlServer.Server is versioned separately: it uses its "next" version when it is
 #     being built this run, or its "published" (last shipped to NuGet) version when it is not built
 #     (so the SqlClient family depends on the most recently published SqlServer package).
-#   - Runs use their "next" version from Versions.props. By default the pipeline build number is
-#     appended to prerelease package versions (7.1.0-preview3.26238.3) and its date segment becomes
-#     the file-version build number (7.1.0.26238), matching the shape shipped by earlier previews.
-#     Runs can instead append the Build.BuildId revision, reducing collisions when repeatedly
-#     publishing the same base version for testing.
+#   - Runs use their "next" version from Versions.props. The pipeline build number is appended to
+#     prerelease package versions (7.1.0-preview3.26238.3) and its date segment becomes the
+#     file-version build number (7.1.0.26238), matching the shape shipped by earlier previews.
 #   - Versions are extracted via build.proj GetVersions* targets by parsing stdout.
 #
 # This stage MUST run before all build stages so they can consume computed versions.
 
 parameters:
-  # Whether to append the Build.BuildId revision to package and file versions.
-  - name: addRevision
-    type: boolean
-
   # Whether Microsoft.SqlServer.Server is being built this run.  This drives the SqlServer version
   # selection (next when built, published when not); the SqlClient family always uses its next
   # version.  When SqlServer is not built, the SqlClient family depends on the published SqlServer
@@ -54,6 +48,8 @@ stages:
           ob_sdl_apiscan_enabled: false
           ob_sdl_binskim_break: false
           ob_sdl_binskim_enabled: false
+          # No packages are published here, so there is nothing to describe in an SBOM.
+          ob_sdl_sbom_enabled: false
 
         steps:
           - pwsh: |
@@ -69,8 +65,8 @@ stages:
           # may run during the GetVersions* evaluation.
           - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
-          # Extract canonical versions, resolve the effective built/published values, optionally
-          # add the run revision, and publish the downstream stage output variables.
+          # Extract canonical versions, resolve the effective built/published values, and publish
+          # the downstream stage output variables.
           - task: PowerShell@2
             displayName: "Compute Effective Versions"
             name: "versions"
@@ -80,7 +76,5 @@ stages:
               filePath: $(Build.SourcesDirectory)/eng/pipelines/onebranch/scripts/compute-versions.ps1
               arguments: >-
                 -ProjectPath "$(Build.SourcesDirectory)/build.proj"
-                -Revision "$(Build.BuildId)"
                 -BuildNumber "$(Build.BuildNumber)"
                 -BuildSqlServer $${{ parameters.buildSqlServer }}
-                -AddRevision $${{ parameters.addRevision }}
diff --git a/eng/pipelines/onebranch/steps/build-buildproj-step.yml b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
index 5cfc809772..961b972f8c 100644
--- a/eng/pipelines/onebranch/steps/build-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/build-buildproj-step.yml
@@ -37,8 +37,8 @@ parameters:
       - SqlClient
       - SqlServer
 
-  # Version revision translated to build.proj's BuildNumber property at this boundary.
-  - name: revision
+  # Pre-computed assembly file version, translated to build.proj's FileVersion* property here.
+  - name: fileVersion
     type: string
 
   #  Suffix appended to "PackageVersion" to form the build.proj msbuild property that stamps this
@@ -75,7 +75,7 @@ steps:
         -p:ReferenceType=Package
         -p:SkipDependencyPack=true
         -p:SigningKeyPath="$(keyFile.secureFilePath)"
-        -p:BuildNumber="${{ parameters.revision }}"
+        -p:FileVersion${{ parameters.versionPropertySuffix }}="${{ parameters.fileVersion }}"
         -p:PackageVersion${{ parameters.versionPropertySuffix }}="${{ parameters.packageVersion }}"
         ${{ parameters.dependencyArguments }}
 
diff --git a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
index 4960872d7b..b8ee6e72dd 100644
--- a/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/pack-buildproj-step.yml
@@ -49,8 +49,8 @@ parameters:
       - SqlClient
       - SqlServer
 
-  # Version revision translated to build.proj's BuildNumber property at this boundary.
-  - name: revision
+  # Pre-computed assembly file version, translated to build.proj's FileVersion* property here.
+  - name: fileVersion
     type: string
 
   #  Suffix appended to "PackageVersion" to form the build.proj msbuild property that stamps this
@@ -79,7 +79,7 @@ steps:
         -p:Configuration=${{ parameters.buildConfiguration }}
         -p:PackBuild=false
         -p:ReferenceType=Package
-        -p:BuildNumber="${{ parameters.revision }}"
+        -p:FileVersion${{ parameters.versionPropertySuffix }}="${{ parameters.fileVersion }}"
         -p:PackageVersion${{ parameters.versionPropertySuffix }}="${{ parameters.packageVersion }}"
         ${{ parameters.dependencyArguments }}
 
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
index 9f58773174..6e9b0e8106 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-buildproj-step.yml
@@ -129,11 +129,8 @@ parameters:
       - SqlClient
       - SqlServer
 
-  # The three parameters below mirror build-buildproj-step.yml so the analysis build resolves the
-  # same package versions as the real build.
-  #
-  # Version revision translated to build.proj's BuildNumber property at this boundary.
-  - name: revision
+  # Pre-computed assembly file version, translated to build.proj's FileVersion* property here.
+  - name: fileVersion
     type: string
 
   #  Suffix appended to "PackageVersion" to form the build.proj msbuild property that stamps this
@@ -165,7 +162,7 @@ steps:
         -p:Configuration=Release
         -p:ReferenceType=Package
         -p:SkipDependencyPack=true
-        -p:BuildNumber="${{ parameters.revision }}"
+        -p:FileVersion${{ parameters.versionPropertySuffix }}="${{ parameters.fileVersion }}"
         -p:PackageVersion${{ parameters.versionPropertySuffix }}="${{ parameters.packageVersion }}"
         -p:IsolatedBuildPath="$(Agent.TempDirectory)/roslyn"
         -p:EnableAnalyzers=true
diff --git a/eng/pipelines/onebranch/variables/package-variables.yml b/eng/pipelines/onebranch/variables/package-variables.yml
index 62afca6605..65fd0867d0 100644
--- a/eng/pipelines/onebranch/variables/package-variables.yml
+++ b/eng/pipelines/onebranch/variables/package-variables.yml
@@ -7,23 +7,6 @@
 # This file contains variables that relate to the various packages that are produced via the
 # OneBranch official/non-official pipelines. They are grouped by the packages they represent.
 #
-# VERSION STRATEGY
-# ================
-# Package versions are computed by Versions.props using one input:
-#   - BuildNumber   ($(Build.BuildNumber), provided by ADO)
-#
-# The SqlClient *family* (Internal.Logging, Extensions.Abstractions, Microsoft.Data.SqlClient,
-# Extensions.Azure, and the AlwaysEncrypted.AzureKeyVaultProvider) shares a single version defined
-# by SqlClientNextVersion in src/Microsoft.Data.SqlClient/Versions.props.  Microsoft.SqlServer.Server
-# is versioned separately by SqlServerNextVersion.
-#
-# The *NextVersion properties define the base version:
-#   - On main:           X.Y.Z-preview1  → official produces "X.Y.Z-preview1"
-#   - On release/X.Y:    X.Y.Z           → official produces "X.Y.Z"
-#
-# No per-package version variables are needed here — Versions.props is the single source.
-# Downstream stages obtain the computed versions via the compute-versions stage.
-#
 # ARTIFACT NAMING
 # ===============
 # OneBranch automatically publishes pipeline artifacts from all jobs named as:
diff --git a/src/Microsoft.Data.SqlClient/Versions.props b/src/Microsoft.Data.SqlClient/Versions.props
index f67997a10f..38df551f3b 100644
--- a/src/Microsoft.Data.SqlClient/Versions.props
+++ b/src/Microsoft.Data.SqlClient/Versions.props
@@ -31,7 +31,6 @@
     <!--
       This is the *next* version to release of the SqlClient family.  Update this after a version
       is released.  Every SqlClient family package uses this version.
-      @TODO: Determine how versions should be updated in release branches vs main
     -->
     <SqlClientNextVersion>7.1.0-preview3</SqlClientNextVersion>
   </PropertyGroup>
@@ -50,13 +49,8 @@
           not valid in a file version. Start with the suffix-free package base and append the
           configured file-version build number, which converts a three-part package version such as
           1.2.3-preview1 to 1.2.3.42.
-
-          A revision-enabled pipeline supplies a four-part package base such as 1.2.3.42. That base
-          is already a complete file version, so the following conditional assignment overrides the
-          fallback instead of producing an invalid five-part version.
         -->
         <SqlClientFileVersion>$(SqlClientPackageVersionBase).$(FileVersionBuildNumber)</SqlClientFileVersion>
-        <SqlClientFileVersion Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(SqlClientPackageVersionBase)', '^\d+\.\d+\.\d+\.\d+$'))">$(SqlClientPackageVersionBase)</SqlClientFileVersion>
       </PropertyGroup>
     </When>
 
@@ -65,18 +59,24 @@
         When a build number is provided, the default version is used as the base of the package and
         file versions.
 
-        If a build suffix is provided, this is appended to the package version. This is meant to be
-        used by automated pre-release systems to indicate the source of the build.
+        If a build suffix is provided, it is appended as a prerelease tag. This is meant to be used
+        by automated pre-release systems to indicate the source of the build.
 
-        If a build suffix is not provided, no pre-release tag will be added to package version. If
-        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
-        will be retained for the package version, but will be stripped off for the file version
-        (letters are not allowed in file/assembly versions). This is meant to be used by official
-        build pipelines to generate production-ready builds.
+        The build number is then appended to any version carrying a prerelease tag — whether that
+        tag came from the declared version or from the build suffix — so every automated run
+        produces a distinct package version (eg, "7.0.0-preview1" becomes
+        "7.0.0-preview1.26238.3"). A version with no prerelease tag is left exactly as declared,
+        because released packages are not stamped with a build number. The tag is always stripped
+        for the file version (letters are not allowed in file/assembly versions). This is meant to
+        be used by official build pipelines to generate production-ready builds.
       -->
       <PropertyGroup>
-        <SqlClientPackageVersion Condition="'$(BuildSuffix)' != ''">$(SqlClientNextVersion)-$(BuildSuffix)$(BuildNumber)</SqlClientPackageVersion>
-        <SqlClientPackageVersion Condition="'$(BuildSuffix)' == ''">$(SqlClientNextVersion)</SqlClientPackageVersion>
+        <_SqlClientCandidateVersion>$(SqlClientNextVersion)</_SqlClientCandidateVersion>
+        <_SqlClientCandidateVersion Condition="'$(BuildSuffix)' != ''">$(SqlClientNextVersion)-$(BuildSuffix)</_SqlClientCandidateVersion>
+
+        <!-- A dash means a prerelease tag is present, from either source. -->
+        <SqlClientPackageVersion Condition="$(_SqlClientCandidateVersion.Contains('-'))">$(_SqlClientCandidateVersion).$(BuildNumber)</SqlClientPackageVersion>
+        <SqlClientPackageVersion Condition="!$(_SqlClientCandidateVersion.Contains('-'))">$(_SqlClientCandidateVersion)</SqlClientPackageVersion>
 
         <SqlClientFileVersion>$(SqlClientNextVersion.Split('-')[0]).$(FileVersionBuildNumber)</SqlClientFileVersion>
       </PropertyGroup>
@@ -105,4 +105,11 @@
   <PropertyGroup>
     <SqlClientAssemblyVersion>$(SqlClientFileVersion.Split('.')[0]).0.0.0</SqlClientAssemblyVersion>
   </PropertyGroup>
+
+  <!-- FileVersionSqlClient overrides everything computed above, so validate the final value. -->
+  <Target Name="ValidateSqlClientFileVersion" BeforeTargets="PrepareForBuild">
+    <Error
+      Condition="!$([System.Text.RegularExpressions.Regex]::IsMatch('$(SqlClientFileVersion)', '^\d+\.\d+\.\d+\.\d+$'))"
+      Text="SqlClientFileVersion '$(SqlClientFileVersion)' is not a four-part numeric version (major.minor.build.revision). Check FileVersionSqlClient, SqlClientPackageVersion ('$(SqlClientPackageVersion)') and SqlClientNextVersion ('$(SqlClientNextVersion)')." />
+  </Target>
 </Project>
diff --git a/src/Microsoft.SqlServer.Server/Versions.props b/src/Microsoft.SqlServer.Server/Versions.props
index e03f8d2967..a83b5d246a 100644
--- a/src/Microsoft.SqlServer.Server/Versions.props
+++ b/src/Microsoft.SqlServer.Server/Versions.props
@@ -45,13 +45,8 @@
           not valid in a file version. Start with the suffix-free package base and append the
           configured file-version build number, which converts a three-part package version such as
           1.2.3-preview1 to 1.2.3.42.
-
-          A revision-enabled pipeline supplies a four-part package base such as 1.2.3.42. That base
-          is already a complete file version, so the following conditional assignment overrides the
-          fallback instead of producing an invalid five-part version.
         -->
         <SqlServerFileVersion>$(SqlServerPackageVersionBase).$(FileVersionBuildNumber)</SqlServerFileVersion>
-        <SqlServerFileVersion Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(SqlServerPackageVersionBase)', '^\d+\.\d+\.\d+\.\d+$'))">$(SqlServerPackageVersionBase)</SqlServerFileVersion>
       </PropertyGroup>
     </When>
 
@@ -60,18 +55,24 @@
         When a build number is provided, the default version is used as the base of the package and
         file versions.
 
-        If a build suffix is provided, this is appended to the package version. This is meant to be
-        used by automated pre-release systems to indicate the source of the build.
+        If a build suffix is provided, it is appended as a prerelease tag. This is meant to be used
+        by automated pre-release systems to indicate the source of the build.
 
-        If a build suffix is not provided, no pre-release tag will be added to package version. If
-        the default version already has a pre-release tag added to it (eg, "7.0.0-preview1") this
-        will be retained for the package version, but will be stripped off for the file version
-        (letters are not allowed in file/assembly versions). This is meant to be used by official
-        build pipelines to generate production-ready builds.
+        The build number is then appended to any version carrying a prerelease tag — whether that
+        tag came from the declared version or from the build suffix — so every automated run
+        produces a distinct package version (eg, "1.1.0-preview1" becomes
+        "1.1.0-preview1.26238.3"). A version with no prerelease tag is left exactly as declared,
+        because released packages are not stamped with a build number. The tag is always stripped
+        for the file version (letters are not allowed in file/assembly versions). This is meant to
+        be used by official build pipelines to generate production-ready builds.
       -->
       <PropertyGroup>
-        <SqlServerPackageVersion Condition="'$(BuildSuffix)' != ''">$(SqlServerNextVersion)-$(BuildSuffix)$(BuildNumber)</SqlServerPackageVersion>
-        <SqlServerPackageVersion Condition="'$(BuildSuffix)' == ''">$(SqlServerNextVersion)</SqlServerPackageVersion>
+        <_SqlServerCandidateVersion>$(SqlServerNextVersion)</_SqlServerCandidateVersion>
+        <_SqlServerCandidateVersion Condition="'$(BuildSuffix)' != ''">$(SqlServerNextVersion)-$(BuildSuffix)</_SqlServerCandidateVersion>
+
+        <!-- A dash means a prerelease tag is present, from either source. -->
+        <SqlServerPackageVersion Condition="$(_SqlServerCandidateVersion.Contains('-'))">$(_SqlServerCandidateVersion).$(BuildNumber)</SqlServerPackageVersion>
+        <SqlServerPackageVersion Condition="!$(_SqlServerCandidateVersion.Contains('-'))">$(_SqlServerCandidateVersion)</SqlServerPackageVersion>
 
         <SqlServerFileVersion>$(SqlServerNextVersion.Split('-')[0]).$(FileVersionBuildNumber)</SqlServerFileVersion>
       </PropertyGroup>
@@ -100,4 +101,11 @@
   <PropertyGroup>
     <SqlServerAssemblyVersion>$(SqlServerFileVersion.Split('.')[0]).0.0.0</SqlServerAssemblyVersion>
   </PropertyGroup>
+
+  <!-- FileVersionSqlServer overrides everything computed above, so validate the final value. -->
+  <Target Name="ValidateSqlServerFileVersion" BeforeTargets="PrepareForBuild">
+    <Error
+      Condition="!$([System.Text.RegularExpressions.Regex]::IsMatch('$(SqlServerFileVersion)', '^\d+\.\d+\.\d+\.\d+$'))"
+      Text="SqlServerFileVersion '$(SqlServerFileVersion)' is not a four-part numeric version (major.minor.build.revision). Check FileVersionSqlServer, SqlServerPackageVersion ('$(SqlServerPackageVersion)') and SqlServerNextVersion ('$(SqlServerNextVersion)')." />
+  </Target>
 </Project>

From 76ce4329434ec0ea6f648267c70732970d688f09 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 9 Sep 2026 09:25:28 -0700
Subject: [PATCH 280/298] [Scheduled Run] Localized resource files from
 OneLocBuild (#4651)

Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com>
---
 src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx   | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx      | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx | 2 +-
 src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
index d333b05fd5..bd22fd385c 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
@@ -2083,7 +2083,7 @@
     <value>Pokud je klíčové slovo Integrated Security připojovacího řetězce nastavené na hodnotu true nebo SSPI, nejde nastavit vlastnost AccessTokenCallback.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>Nelze nastavit více než jednu z vlastností AccessToken, AccessTokenCallback nebo SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Pokud je v připojovacím řetězci nastavená možnost Authentication=Active Directory Default, nejde nastavit vlastnost AccessTokenCallback.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
index 36003faa0f..5570cfa5f4 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -2083,7 +2083,7 @@
     <value>AccessTokenCallback-Eigenschaft kann nicht festgelegt werden, wenn das Schlüsselwort für Verbindungszeichenfolgen 'Integrated Security' auf 'true' oder 'SSPI' gesetzt wurde.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>Es kann nur eine der Eigenschaften AccessToken, AccessTokenCallback oder SspiContextProvider festgelegt werden.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Die Eigenschaft AccessTokenCallback kann nicht festgelegt werden, wenn in der Verbindungszeichenfolge "Authentication=Active Directory Default" angegeben wurde.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
index f24a37eff9..1f84064549 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -2083,7 +2083,7 @@
     <value>No se puede establecer la propiedad AccessTokenCallback si la palabra clave de cadena de conexión "Integrated Security" se ha establecido en "true" o "SSPI".</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>No se puede establecer más de una de las propiedades AccessToken, AccessTokenCallback o SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>No se puede establecer la propiedad AccessTokenCallback si se ha especificado 'Authentication=Active Directory Default' en la cadena de conexión.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
index 32a65bfc0d..537c0dd0cf 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -2083,7 +2083,7 @@
     <value>Impossible de définir la propriété AccessTokenCallback si le mot clé de chaîne de connexion « Sécurité intégrée » a été défini sur « true » ou « SSPI ».</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>Nous ne pouvons pas définir plus d’une des propriétés AccessToken, AccessTokenCallback ou SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Impossible de définir la propriété AccessTokenCallback si 'Authentication=Active Directory Default' a été spécifié dans la chaîne de connexion.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
index 4109e2f808..8310513c43 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -2083,7 +2083,7 @@
     <value>Non è possibile impostare la proprietà AccessTokenCallback se la parola chiave della stringa di connessione 'Integrated Security' è stata impostata su 'true' o 'SSPI'.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>Non è possibile impostare più di una delle proprietà AccessToken, AccessTokenCallback o SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Impossibile impostare la proprietà AccessTokenCallback se nella stringa di connessione è stato specificato 'Authentication=Active Directory Default'.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
index b0ff96812b..f24fe2d297 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -2083,7 +2083,7 @@
     <value>'Integrated Security' 接続文字列キーワードが 'true' または 'SSPI' に設定されている場合、AccessTokenCallback プロパティを設定できません。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>AccessToken、AccessTokenCallback、 SspiContextProvider のプロパティを 2 つ以上設定することはできません。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>接続文字列に 'Authentication=Active Directory Default' が指定されている場合、AccessTokenCallback プロパティを設定できません。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
index 62433d0ea0..ab87cea583 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -2083,7 +2083,7 @@
     <value>'Integrated Security' 연결 문자열 키워드가 'true' 또는 'SSPI'로 설정된 경우 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>AccessToken, AccessTokenCallback 또는 SspiContextProvider 속성 중 두 개 이상을 설정할 수 없습니다.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>연결 문자열에 'Authentication=Active Directory Default'가 지정된 경우 AccessTokenCallback 속성을 설정할 수 없습니다.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
index c410e654a0..dcc088af86 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pl.resx
@@ -2083,7 +2083,7 @@
     <value>Nie można ustawić właściwości AccessTokenCallback, jeśli słowo kluczowe parametrów połączenia „Integrated Security” ma wartość „true” lub „SSPI”.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>Nie można ustawić więcej niż jednej właściwości AccessToken, AccessTokenCallback lub SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Nie można ustawić właściwości AccessTokenCallback, jeśli w parametrach połączenia określono wartość „Authentication=Active Directory Default”.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
index 31d3ffc029..458096ee2a 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.pt-BR.resx
@@ -2083,7 +2083,7 @@
     <value>Não é possível definir a propriedade AccessTokenCallback se a palavra-chave da cadeia de conexão 'Integrated Security' tiver sido definida como 'true' ou 'SSPI'.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>Não é possível definir mais de uma das propriedades AccessToken, AccessTokenCallback ou SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Não é possível definir a propriedade AccessTokenCallback se 'Authentication=Active Directory Default' tiver sido especificado na cadeia de conexão.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
index d5d4039980..4a14f91101 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ru.resx
@@ -2083,7 +2083,7 @@
     <value>Если ключевому слову строки подключения "Integrated Security" задано значение "true" или "SSPI", свойство "AccessTokenCallback" задать не удастся.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>Не удается установить несколько свойств AccessToken, AccessTokenCallback или SspiContextProvider.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Если в строке подключения указан параметр "Authentication=Active Directory Default", свойство AccessTokenCallback задать не удастся.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
index c62b087f11..60698762e5 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.tr.resx
@@ -2083,7 +2083,7 @@
     <value>'Integrated Security' bağlantı dizesi anahtar sözcüğü 'true' veya 'SSPI' olarak ayarlanmışsa AccessTokenCallback özelliği ayarlanamaz.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>AccessToken, AccessTokenCallback veya SspiContextProvider özelliklerinden birden fazlası ayarlanamaz.</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>Bağlantı dizesinde 'Authentication=Active Directory Default' belirtilmişse AccessTokenCallback özelliği ayarlanamaz.</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
index 69ab4523bc..2c6388df6e 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hans.resx
@@ -2083,7 +2083,7 @@
     <value>如果 "Integrated Security" 连接字符串关键字设置为 "true" 或 "SSPI"，则无法设置 AccessTokenCallback 属性。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>只能设置以下属性其中之一: AccessToken、AccessTokenCallback 或 SspiContextProvider。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>如果在连接字符串中指定了 "Authentication=Active Directory Default"，则无法设置 AccessTokenCallback 属性。</value>
diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
index a5fc02dd7b..d71c496a85 100644
--- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
+++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.zh-Hant.resx
@@ -2083,7 +2083,7 @@
     <value>如果 'Integrated Security' 連接字串關鍵字已設定為 'true' 或 'SSPI'，就不能設定 AccessTokenCallback 屬性。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAccessTokenProperties" xml:space="preserve">
-    <value>Cannot set more than one of the properties AccessToken, AccessTokenCallback, or SspiContextProvider.</value>
+    <value>AccessToken、AccessTokenCallback 或 SspiContextProvider 這些屬性中，不能設定超過一個。</value>
   </data>
   <data name="ADP_InvalidMixedUsageOfAuthenticationAndTokenCallback" xml:space="preserve">
     <value>如果已在連接字串中指定 'Authentication=Active Directory Default'，就不能設定 AccessTokenCallback 屬性。</value>

From 88a591a401994bbbd9f20356778e0b6209561d5a Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 9 Sep 2026 13:30:01 -0300
Subject: [PATCH 281/298] Categorize Entra integrated test as interactive
 (#4510)

---
 .../ado-pipelines.instructions.md             |  2 +-
 .github/instructions/testing.instructions.md  | 16 +++++++--------
 .../triage-pipeline-failures.prompt.md        |  4 ++--
 TESTGUIDE.md                                  |  5 +++++
 build.proj                                    | 20 +++++++++++++++++++
 .../jobs/test-azure-package-ci-job.yml        |  7 -------
 .../stages/build-azure-package-ci-stage.yml   |  3 ---
 .../Azure/test/AADConnectionTest.cs           | 17 +++-------------
 .../test/ActiveDirectoryInteractiveTests.cs   |  2 +-
 .../Azure/test/Config.cs                      |  8 ++++----
 .../tests/FunctionalTests/LocalizationTest.cs |  2 +-
 .../FunctionalTests/SqlDataRecordTest.cs      |  2 +-
 .../ManualTests/AlwaysEncrypted/ApiShould.cs  |  4 ++--
 ...llFromReaderConnectionCloseOnEventAsync.cs |  2 +-
 .../SQL/AdapterTest/AdapterTest.cs            |  2 +-
 .../SQL/AsyncTest/AsyncTimeoutTest.cs         |  2 +-
 .../ConnectionPoolTest/ConnectionPoolTest.cs  |  2 +-
 .../ConnectionPoolTest/TransactionPoolTest.cs |  2 +-
 .../SQL/DataReaderTest/DataReaderTest.cs      |  2 +-
 .../SQL/DataStreamTest/DataStreamTest.cs      |  2 +-
 .../MarsSessionPoolingTest.cs                 |  6 +++---
 .../SQL/ParameterTest/DateTimeVariantTests.cs |  2 +-
 .../SQL/ParameterTest/ParametersTest.cs       | 10 +++++-----
 .../ParameterTest/SqlVariantParameterTests.cs |  6 +++---
 .../StreamInputParameterTests.cs              |  2 +-
 .../ParameterTest/TvpColumnBoundariesTests.cs |  2 +-
 .../SqlNotificationTest.cs                    |  2 +-
 .../DistributedTransactionTest.cs             |  2 +-
 .../SQL/UdtTest/SqlServerTypesTest.cs         |  8 ++++----
 .../WeakRefTestYukonSpecific.cs               |  2 +-
 .../TracingTests/DiagnosticTest.cs            |  2 +-
 .../ManualTests/TracingTests/MetricsTest.cs   |  4 ++--
 .../ChannelDbConnectionPoolTest.cs            |  2 +-
 .../WaitHandleDbConnectionPoolShutdownTest.cs |  2 +-
 ...itHandleDbConnectionPoolTransactionTest.cs |  2 +-
 .../ConnectionFailoverTests.cs                |  6 +++---
 .../SimulatedServerTests/ConnectionTests.cs   |  4 ++--
 .../config.default.jsonc                      |  6 ++++++
 38 files changed, 93 insertions(+), 83 deletions(-)

diff --git a/.github/instructions/ado-pipelines.instructions.md b/.github/instructions/ado-pipelines.instructions.md
index 3e5a66af78..4fd07cfc88 100644
--- a/.github/instructions/ado-pipelines.instructions.md
+++ b/.github/instructions/ado-pipelines.instructions.md
@@ -93,7 +93,7 @@ Test filters — default excludes `failing` and `flaky` categories:
 - `nonwindowstests` / `nonlinuxtests` — OS-specific exclusions
 
 Flaky test quarantine:
-- Quarantined tests (`[Trait("Category", "flaky")]`) run in separate steps after main tests
+- Quarantined tests (`[Trait("category", "flaky")]`) run in separate steps after main tests
 - Main test runs are not blocked by flaky failures
 - No code coverage collected for flaky runs
 - Configured in `common/templates/steps/build-and-run-tests-netcore-step.yml`, `build-and-run-tests-netfx-step.yml`, and `run-all-tests-step.yml`
diff --git a/.github/instructions/testing.instructions.md b/.github/instructions/testing.instructions.md
index df6b909f8a..9f4032e070 100644
--- a/.github/instructions/testing.instructions.md
+++ b/.github/instructions/testing.instructions.md
@@ -69,7 +69,7 @@ Copy `config.default.jsonc` to `config.jsonc` and configure:
 ## Test Categories and Attributes
 
 ### Category Exclusions
-Use `[Trait("Category", "...")]` (xUnit, used in both ManualTests and UnitTests) to mark test categories and exclusions:
+Use `[Trait("category", "...")]` (xUnit, used in both ManualTests and UnitTests) to mark test categories and exclusions:
 
 | Category | Excluded On | Description |
 |----------|-------------|-------------|
@@ -82,7 +82,7 @@ Use `[Trait("Category", "...")]` (xUnit, used in both ManualTests and UnitTests)
 | `flaky` | All platforms (quarantine) | Intermittently failing tests (see Quarantine Zone below) |
 
 ### Flaky Test Quarantine Zone
-Tests that intermittently fail are quarantined with `[Trait("Category", "flaky")]`. Quarantined tests:
+Tests that intermittently fail are quarantined with `[Trait("category", "flaky")]`. Quarantined tests:
 - Are **excluded** from regular test runs by the default filter: `category!=failing&category!=flaky`
 - Run in **separate quarantine pipeline steps** to track their status without blocking CI
 - Do **not** collect code coverage
@@ -96,16 +96,16 @@ Tests that intermittently fail are quarantined with `[Trait("Category", "flaky")
 **How to quarantine:**
 ```csharp
 // For unit tests (xUnit Trait)
-[Trait("Category", "flaky")]
+[Trait("category", "flaky")]
 public class FlakyConnectionTests { ... }
 
 // For individual test methods
-[Trait("Category", "flaky")]
+[Trait("category", "flaky")]
 [ConditionalFact(...)]
 public async Task OpenAsync_TimingDependent_MayFail() { ... }
 ```
 
-**How to un-quarantine:** Remove the `[Trait("Category", "flaky")]` attribute once the root cause is fixed and the test passes consistently.
+**How to un-quarantine:** Remove the `[Trait("category", "flaky")]` attribute once the root cause is fixed and the test passes consistently.
 
 ### Test Timeout Enforcement
 All test runs use `--blame-hang-timeout 10m` to kill tests that hang for more than 10 minutes. This is configured in `build.proj` and applied to all test targets. If a test is expected to run longer than 10 minutes, it must be restructured or split.
@@ -120,11 +120,11 @@ This can be overridden via build property: `dotnet build build.proj -t:TestSqlCl
 ### Test Attributes
 ```csharp
 // Platform-specific exclusion
-[Trait("Category", "nonlinuxtests")]
+[Trait("category", "nonlinuxtests")]
 public void TestWindowsSpecificFeature() { ... }
 
 // Skip on .NET Framework
-[Trait("Category", "nonnetfxtests")]
+[Trait("category", "nonnetfxtests")]
 public void TestNetCoreOnlyFeature() { ... }
 
 // Conditional skip based on test configuration
@@ -132,7 +132,7 @@ public void TestNetCoreOnlyFeature() { ... }
 public void TestRequiresDatabase() { ... }
 
 // Quarantined flaky test
-[Trait("Category", "flaky")]
+[Trait("category", "flaky")]
 [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
 public void TestIntermittentlyFails() { ... }
 ```
diff --git a/.github/prompts/triage-pipeline-failures.prompt.md b/.github/prompts/triage-pipeline-failures.prompt.md
index c4ff676d17..98c223c3d5 100644
--- a/.github/prompts/triage-pipeline-failures.prompt.md
+++ b/.github/prompts/triage-pipeline-failures.prompt.md
@@ -150,7 +150,7 @@ immediately-preceding in-scope build (the parent commit). A failure present befo
 
 ## Step 7 — Check quarantine status before acting
 
-A test is already quarantined if it carries `[Trait("Category", "flaky")]`; those run
+A test is already quarantined if it carries `[Trait("category", "flaky")]`; those run
 in a separate, non-blocking quarantine step (`TestFilters="category=flaky"`) while the
 regular step excludes `category!=failing&category!=flaky&category!=interactive`.
 
@@ -175,7 +175,7 @@ the user which items to act on.
 For each item the user approves:
 
 1. Prefer a **deterministic fix** that removes the race/isolation/timing dependency.
-2. Otherwise **quarantine**: add `[Trait("Category", "flaky")]` plus a comment holding
+2. Otherwise **quarantine**: add `[Trait("category", "flaky")]` plus a comment holding
    the observed failure signature (test name, assertion, key stack frames) and the
    root-cause reasoning. Mirror the style of existing quarantine comments in the test suite.
 3. Cover both sync and async variants when the API has both.
diff --git a/TESTGUIDE.md b/TESTGUIDE.md
index c813db0345..206092b597 100644
--- a/TESTGUIDE.md
+++ b/TESTGUIDE.md
@@ -220,6 +220,7 @@ Update `config.jsonc` for your environment before running manual tests. The most
   "NPConnectionString": "Data Source=np:localhost;Database=Northwind;Integrated Security=true;Encrypt=false;",
   "EnclaveEnabled": false,
   "TracingEnabled": false,
+  "SupportsEntraIntegrated": false,
   "SupportsIntegratedSecurity": true
 }
 ```
@@ -247,6 +248,9 @@ dotnet build -t:TestSqlClientManual -p:TestSet=2
 
 ## Configuration Properties
 
+`SupportsEntraIntegrated` applies to Azure SQL Database, Azure SQL Managed Instance, and SQL Server
+2022 or later configured for Microsoft Entra authentication through Azure Arc.
+
 | Property                         | Description                                                                                 | Example or notes                                                                       |
 |----------------------------------|---------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------|
 | `TCPConnectionString`            | Connection string for a TCP-enabled SQL Server or Azure SQL database.                       | `Data Source=tcp:localhost;Database=Northwind;Integrated Security=true;Encrypt=false;` |
@@ -262,6 +266,7 @@ dotnet build -t:TestSqlClientManual -p:TestSet=2
 | `AADServicePrincipalSecret`      | Optional application secret for service-principal authentication tests.                     | Keep this only in local, ignored config files or secure pipeline variables.            |
 | `AzureKeyVaultURL`               | Optional Azure Key Vault URL for Always Encrypted tests.                                    | `https://<keyvaultname>.vault.azure.net/`                                              |
 | `AzureKeyVaultTenantId`          | Optional Entra ID tenant ID for Azure Key Vault tests.                                      | Tenant ID GUID.                                                                        |
+| `SupportsEntraIntegrated`        | Whether the target supports Entra Integrated authentication for the Windows identity.       | `true` or `false`; defaults to `false`. See supported targets above.                   |
 | `SupportsIntegratedSecurity`     | Whether the user running tests has integrated-security access to the target SQL Server.     | `true` or `false`.                                                                     |
 | `LocalDbAppName`                 | Optional LocalDB instance name. Empty disables LocalDB testing.                             | `MSSQLLocalDB` or another local instance.                                              |
 | `LocalDbSharedInstanceName`      | Optional shared LocalDB instance name.                                                      | Used only when testing shared LocalDB.                                                 |
diff --git a/build.proj b/build.proj
index 2e19233b2a..4dfef2b77b 100644
--- a/build.proj
+++ b/build.proj
@@ -401,6 +401,26 @@
     </TestCodeCoverageArgument>
 
     <!--
+      ============================================================================================
+      TRAIT CASING CONVENTION - read this before adding a trait or a filter anywhere in the repo.
+
+      Always use a lower-case "category" key AND lower-case values, both in [Trait(...)] attributes
+      in test code and in every filter expression (here and under eng/pipelines).
+
+      Why it matters: xunit.runner.visualstudio (2.8.2) resolves the filter's *property name*
+      against the set of trait keys discovered in the assembly using a case-SENSITIVE lookup, but
+      only on the execution path.  Test discovery (the "list tests" path) is case-INSENSITIVE.  So a
+      casing mismatch lists correctly and then silently misbehaves when the tests actually run:
+      "category!=x" matches everything and "category=x" matches nothing.  Trait *values* are always
+      compared case-insensitively, so only the key casing is dangerous.
+
+      The failure is per-assembly, which is why it hid for so long: it only surfaces when no test in
+      that assembly declares a lower-case "category" key.  Microsoft.DotNet.XUnitExtensions injects
+      one via [ActiveIssue], [OuterLoop], [PlatformSpecific] and friends, which masked the problem
+      in most of our test assemblies until Azure.Test - which uses none of those attributes - ran
+      its excluded "interactive" test in CI.
+      ============================================================================================
+
       TestFilters
       Applies to:     Test* targets
       Description:    Filter to use to include or exclude any tests. If not specified, this defaults
diff --git a/eng/pipelines/jobs/test-azure-package-ci-job.yml b/eng/pipelines/jobs/test-azure-package-ci-job.yml
index cedd26e056..5319fba0c3 100644
--- a/eng/pipelines/jobs/test-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-azure-package-ci-job.yml
@@ -125,12 +125,6 @@ parameters:
     type: stepList
     default: []
 
-  # True if the VM image includes a local SQL Server that supports connections
-  # via integrated security.
-  - name: supportsIntegratedSecurity
-    type: boolean
-    default: false
-
   # The pool VM image to use.
   - name: vmImage
     type: string
@@ -257,7 +251,6 @@ jobs:
           AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
           # macOS doesn't support managed identities.
           ManagedIdentitySupported: ${{ not(eq(parameters.vmImage, 'macos-latest')) }}
-          SupportsIntegratedSecurity: ${{ parameters.supportsIntegratedSecurity }}
           TCPConnectionString: $(AZURE_DB_TCP_CONN_STRING)
           UserManagedIdentityClientId: $(UserManagedIdentityClientId)
           WorkloadIdentityFederationServiceConnectionId: $(WorkloadIdentityFederationServiceConnectionId)
diff --git a/eng/pipelines/stages/build-azure-package-ci-stage.yml b/eng/pipelines/stages/build-azure-package-ci-stage.yml
index 79930f665e..fed69e339e 100644
--- a/eng/pipelines/stages/build-azure-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-azure-package-ci-stage.yml
@@ -197,9 +197,6 @@ stages:
                 # group.
                 fileStreamDirectory: $(FileStreamDirectory)
                 SQLRootPath: $(SQL25RootPath)
-          # The ADO-MMS25-SQL25 image includes a local SQL Server that supports
-          # integrated security.
-          supportsIntegratedSecurity: true
           vmImage: ADO-MMS25-SQL25
 
       # ------------------------------------------------------------------------
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs
index a8060354d4..063db64d84 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/AADConnectionTest.cs
@@ -85,22 +85,11 @@ public static void ActiveDirectoryDefaultMustPass()
         ConnectAndDisconnect(connStr);
     }
 
-    // This test works on main in the existing jobs (like Win22_Sql22), but
-    // fails in the Azure project tests on a similar agent/image:
-    //
-    //   Failed Microsoft.Data.SqlClient.Extensions.Azure.Test.AADConnectionTest.ADIntegratedUsingSSPI [59 ms]
-    //   Error Message:
-    //     Microsoft.Data.SqlClient.SqlException : Failed to authenticate the user NT Authority\Anonymous Logon in Active Directory (Authentication=ActiveDirectoryIntegrated).
-    //   Error code 0xget_user_name_failed
-    //   Failed to acquire access token for ActiveDirectoryIntegrated: Failed to get user name.
-    //
-    // ActiveIssue tests can be filtered out of test runs on the dotnet CLI
-    // using the filter "category != failing".
-    //
-    [ActiveIssue("https://sqlclientdrivers.visualstudio.com/ADO.Net/_workitems/edit/45941")]
+    // This test requires a Windows identity configured for Entra Integrated authentication
+    // to the target Azure SQL database, which is distinct from SQL Server integrated security.
     [ConditionalFact(
         typeof(Config),
-        nameof(Config.SupportsIntegratedSecurity),
+        nameof(Config.SupportsEntraIntegrated),
         nameof(Config.HasTcpConnectionString))]
     public static void ADIntegratedUsingSSPI()
     {
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/ActiveDirectoryInteractiveTests.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/ActiveDirectoryInteractiveTests.cs
index 9240d83b40..9f858a4d2b 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/ActiveDirectoryInteractiveTests.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/ActiveDirectoryInteractiveTests.cs
@@ -16,7 +16,7 @@ public ActiveDirectoryInteractiveTests(ITestOutputHelper output)
     }
 
     [Fact]
-    [Trait("Category", "Interactive")]
+    [Trait("category", "interactive")]
     public async Task TestConnection()
     {
         string connectionString = new SqlConnectionStringBuilder()
diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs
index 1f0587685e..92237bb59e 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Config.cs
@@ -38,7 +38,7 @@ internal static class Config
 
     internal static bool AdoPool { get; } = false;
     internal static bool DebugEmit { get; } = false;
-    internal static bool IntegratedSecuritySupported { get; } = false;
+    internal static bool EntraIntegratedSupported { get; } = false;
     internal static bool ManagedIdentitySupported { get; } = false;
     // @TODO Remove PasswordConnectionString from config; AAD Password auth is deprecated
     internal static string PasswordConnectionString { get; } = string.Empty;
@@ -73,7 +73,7 @@ internal static bool IsAzureSqlServer() =>
     internal static bool OnWindows() => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
     internal static bool OnUnix() => OnLinux() || OnMacOS();
 
-    internal static bool SupportsIntegratedSecurity() => IntegratedSecuritySupported;
+    internal static bool SupportsEntraIntegrated() => EntraIntegratedSupported;
     internal static bool SupportsManagedIdentity() => ManagedIdentitySupported;
     internal static bool SupportsSystemAssignedManagedIdentity() => SystemAssignedManagedIdentitySupported;
 
@@ -115,7 +115,7 @@ static Config()
             // The sample file is copied to the build output directory as
             // config.jsonc by the TestUtilities project file.
             //
-            IntegratedSecuritySupported = GetBool(root, "SupportsIntegratedSecurity");
+            EntraIntegratedSupported = GetBool(root, "SupportsEntraIntegrated");
             ManagedIdentitySupported = GetBool(root, "ManagedIdentitySupported");
             PasswordConnectionString = GetString(root, "AADPasswordConnectionString");
             ServicePrincipalId = GetString(root, "AADServicePrincipalId");
@@ -160,7 +160,7 @@ string Base64Encode(string s)
             Console.WriteLine(
                 $"  DebugEmit:                              {DebugEmit}");
             Console.WriteLine(
-                $"  IntegratedSecuritySupported:            {IntegratedSecuritySupported}");
+                $"  EntraIntegratedSupported:               {EntraIntegratedSupported}");
             Console.WriteLine(
                 $"  ManagedIdentitySupported:               {ManagedIdentitySupported}");
             Console.WriteLine(
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs
index 250c009b27..b55f63dc09 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs
@@ -40,7 +40,7 @@ public class LocalizationTest
         [InlineData("ru-RU")]
         [InlineData("zh-Hans")]
         [InlineData("zh-Hant")]
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         public void Localization_Tests(string culture)
         {
             string localized = GetLocalizedErrorMessage(culture);
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs
index b051f2cc26..c39f733a86 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlDataRecordTest.cs
@@ -334,7 +334,7 @@ public void GetChar_ThrowsNotSupported()
 
         [Theory]
         #if NETFRAMEWORK
-        [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+        [Trait("category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
         #endif
         [MemberData(
             nameof(GetUdtTypeTestData.Get),
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
index 8ecb3c840c..49a6eecc55 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs
@@ -1999,7 +1999,7 @@ public void TestBeginAndEndExecuteReaderWithAsyncCallback(string connection, Com
             }
         }
 
-        [Trait("Category", "flaky")] // System.AggregateException : One or more errors occurred. (Assert.ThrowsAny() Failure: No exception was thrown
+        [Trait("category", "flaky")] // System.AggregateException : One or more errors occurred. (Assert.ThrowsAny() Failure: No exception was thrown
                                      // Expected: typeof(System.Exception))
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsTargetReadyForAeWithKeyStore))]
         [ClassData(typeof(AEConnectionStringProviderWithExecutionMethod))]
@@ -2232,7 +2232,7 @@ public void TestSqlCommandCancel(string connection, string value)
         // fixed CancelAfter window races a real, network-latency-dependent Always Encrypted
         // query and the exact-message assertion flakes. Quarantine it only for non-DEBUG
         // builds; under DEBUG the failpoint keeps it deterministic and gating.
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
 #endif
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsTargetReadyForAeWithKeyStore))]
         [ClassData(typeof(AEConnectionStringProviderWithCancellationTime))]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
index e48bf5906a..b1a3397ba6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
     [Trait("Set", "2")]
     public class CopyAllFromReaderConnectionClosedOnEventAsync
     {
-        [Trait("Category", "flaky")] // Hangs and crashes on occasion
+        [Trait("category", "flaky")] // Hangs and crashes on occasion
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
         public void Test()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
index 960f3ee822..d9c86e8eff 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs
@@ -109,7 +109,7 @@ public void SimpleFillTest()
         // TODO Synapse: Remove Northwind dependency by creating required tables in setup.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         // https://github.com/dotnet/SqlClient/issues/4135
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         public void FillShouldAllowRetryLogicProviderToBeInvoked()
         {
             int maxRetries = 3;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs
index 1c0abdc5d7..69753aed41 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AsyncTest/AsyncTimeoutTest.cs
@@ -29,7 +29,7 @@ public enum AsyncAPI
         // Synapse: WAITFOR DELAY not supported [Parse error at line: 1, column: 1: Incorrect syntax near 'WAITFOR'.]
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [ClassData(typeof(AsyncTimeoutTestVariations))]
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         public static void TestDelayedAsyncTimeout(AsyncAPI api, string commonObj, int delayPeriod, bool marsEnabled) =>
             RunTest(api, commonObj, delayPeriod, marsEnabled);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
index a3ae028a5d..1e46f0f744 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/ConnectionPoolTest.cs
@@ -65,7 +65,7 @@ public static class ConnectionPoolTest
         /// </summary>
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         [ClassData(typeof(ConnectionPoolConnectionStringProvider))]
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         public static void BasicConnectionPoolingTest(string connectionString)
         {
             SqlConnection.ClearAllPools();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs
index 381d35bf02..e474493b30 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionPoolTest/TransactionPoolTest.cs
@@ -86,7 +86,7 @@ public static void BasicTransactionPoolTest(string connectionString)
         //     Expected: 2
         //     Actual:   3
         //     at Microsoft.Data.SqlClient.ManualTesting.Tests.TransactionPoolTest.TransactionCleanupTest(String connectionString) in TransactionPoolTest.cs:line 101
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [ClassData(typeof(ConnectionPoolConnectionStringProvider))]
         public static void TransactionCleanupTest(string connectionString)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
index 2a2132dbcb..65d17b8497 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
@@ -966,7 +966,7 @@ public _Row(int id, Guid documentIdentificationId, string name, string value)
         // reading 21 rows that include several nvarchar(max) values tens-of-thousands of characters
         // long.  With small packet sizes the large strings require many network round-trips, and on
         // non-Windows platforms the managed SNI layer is used which adds further overhead.
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         public static async Task CanReadAwkwardDataLengths()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
index a3330a371b..6ee68d192e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
@@ -201,7 +201,7 @@ public static void GetXmlReader_ReturnsXmlReaderCorrectly(string connectionStrin
         // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
         [MemberData(nameof(ConnectionStrings), DisableDiscoveryEnumeration = true)]
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         public static void ReadStream_ReadsStreamDataCorrectly(string connectionString)
         {
             ReadStream(connectionString);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
index 2fca930559..18b08c8b07 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/MARSSessionPoolingTest/MarsSessionPoolingTest.cs
@@ -192,7 +192,7 @@ public void ExecuteReader_DisposeReader(CommandType commandType)
             }
         }
 
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
@@ -228,7 +228,7 @@ public void ExecuteReader_GarbageCollectReader(CommandType commandType)
             }
         }
 
-        [Trait("Category", "flaky")] // Assert.Equal() Failure: Values differ
+        [Trait("category", "flaky")] // Assert.Equal() Failure: Values differ
                                      // Expected: 5
                                      // Actual:   4
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
@@ -301,7 +301,7 @@ public void ExecuteReader_CloseConnection(CommandType commandType)
             }
         }
 
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse), nameof(DataTestUtility.IsNotManagedInstance))]
         [InlineData(CommandType.Text)]
         [InlineData(CommandType.StoredProcedure)]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
index e968295b5a..510a2d0608 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
@@ -52,7 +52,7 @@ public TestResult(object value, string baseTypeName)
     /// Tests for DateTime variant parameters with different date/time types.
     /// </summary>
     [Trait("Set", "3")]
-    [Trait("Category", "flaky")]
+    [Trait("category", "flaky")]
     public class DateTimeVariantTests
     {
         private static void RunTest(
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
index 01bbf586fc..1bb9b23824 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs
@@ -244,7 +244,7 @@ public static void Test_WithGuidValue_ShouldReturnGuid()
         }
 
         // Synapse: Parse error at line: 1, column: 8: Incorrect syntax near 'TYPE'.
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void TestParametersWithDatatablesTVPInsert()
         {
@@ -287,7 +287,7 @@ public static void TestParametersWithDatatablesTVPInsert()
 
 #if !NETFRAMEWORK
         // Synapse: Parse error at line: 1, column: 8: Incorrect syntax near 'TYPE'.
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void TestParametersWithSqlRecordsTVPInsert()
         {
@@ -344,7 +344,7 @@ public static void TestParametersWithSqlRecordsTVPInsert()
             Assert.Equal(2, count);
         }
 
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void TestDateOnlyTVPDataTable_CommandSP()
         {
@@ -379,7 +379,7 @@ public static void TestDateOnlyTVPDataTable_CommandSP()
             cmd.ExecuteNonQuery();
         }
 
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void TestDateOnlyTVPSqlDataRecord_CommandSP()
         {
@@ -596,7 +596,7 @@ public static void TestScaledDecimalParameter_BulkCopy(string connectionString,
 
         // Synapse: Parse error at line: 2, column: 8: Incorrect syntax near 'TYPE'.
         // Enumeration is disabled to prevent generating empty test set when connection strings are not setup.
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(TestScaledDecimalParameter_Data), DisableDiscoveryEnumeration = true)]
         public static void TestScaledDecimalTVP_CommandSP(string connectionString, bool truncateScaledDecimal)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
index a6d5b741ed..546bd632ed 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/SqlVariantParameterTests.cs
@@ -211,7 +211,7 @@ public void SqlType_BulkCopyFromDataTable_RoundTripsCorrectly(object paramValue,
         /// </summary>
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(BulkCopySqlTypeTestData), DisableDiscoveryEnumeration = true)]
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         public void SqlType_BulkCopyFromDataRow_RoundTripsCorrectly(object paramValue, string expectedTypeName, string expectedBaseTypeName)
         {
             // Arrange
@@ -259,7 +259,7 @@ public void SqlType_BulkCopyFromDataRow_RoundTripsCorrectly(object paramValue, s
         /// <summary>
         /// Round trip sql_variant value using TVP with a SqlMetaData/SqlDataRecord source.
         /// </summary>
-        [Trait("Category", "flaky")] // Doesn't work well on Azure.
+        [Trait("category", "flaky")] // Doesn't work well on Azure.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(SqlTypeTestData), DisableDiscoveryEnumeration = true)]
         public void SqlType_TvpFromSqlMetaData_RoundTripsCorrectly(object paramValue, string expectedTypeName, string expectedBaseTypeName)
@@ -306,7 +306,7 @@ public void SqlType_TvpFromSqlMetaData_RoundTripsCorrectly(object paramValue, st
         /// <summary>
         /// Round trip sql_variant value using TVP with a SqlDataReader source.
         /// </summary>
-        [Trait("Category", "flaky")] // Doesn't work well on Azure.
+        [Trait("category", "flaky")] // Doesn't work well on Azure.
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         [MemberData(nameof(SqlTypeTestData), DisableDiscoveryEnumeration = true)]
         public void SqlType_TvpFromSqlDataReader_RoundTripsCorrectly(object paramValue, string expectedTypeName, string expectedBaseTypeName)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs
index 5e8bfa5841..882cc98ab1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParameterTests.cs
@@ -26,7 +26,7 @@ public StreamInputParameterTests()
             _connStr = DataTestUtility.TCPConnectionString;
         }
 
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public void StreamInputParameterTest()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs
index 81851902a5..a6d3c587db 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpColumnBoundariesTests.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
     [Collection("ParameterBaselineTests")]
     public class TvpColumnBoundariesTests
     {
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public void TvpColumnBoundariesTest()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
index 3701b503a3..97bae04165 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
@@ -144,7 +144,7 @@ public void Test_SingleDependency_Stopped()
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         public void Test_SingleDependency_AllDefaults_SqlAuth()
         {
             Assert.True(SqlDependency.Start(_startConnectionString), "Failed to start listener.");
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs
index 7d1098ccad..c2db8c126b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs
@@ -51,7 +51,7 @@ public async Task Delegated_transaction_deadlock_in_SinglePhaseCommit()
         **/
         private static bool s_EnlistedTransactionPreservedWhilePooledCondition => DataTestUtility.AreConnStringsSetup() && DataTestUtility.IsNotX86Architecture && DataTestUtility.IsNotManagedInstance();
 
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalFact(nameof(s_EnlistedTransactionPreservedWhilePooledCondition), Timeout = 10000)]
         public async Task Test_EnlistedTransactionPreservedWhilePooled()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
index 712d1ec2c6..1220f32fe2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
@@ -37,7 +37,7 @@ public static class SqlServerTypesTest
         // Synapse: Parse error at line: 1, column: 48: Incorrect syntax near 'hierarchyid'.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         #if NETFRAMEWORK
-        [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+        [Trait("category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
         #endif
         public static void GetSchemaTableTest()
         {
@@ -66,7 +66,7 @@ public static void GetSchemaTableTest()
         // Synapse: Parse error at line: 1, column: 48: Incorrect syntax near 'hierarchyid'.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         #if NETFRAMEWORK
-        [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+        [Trait("category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
         #endif
         public static void GetValueTest()
         {
@@ -227,7 +227,7 @@ void ActAndAssert(int index, string expectedHexString)
         // Synapse: Parse error at line: 1, column: 41: Incorrect syntax near 'hierarchyid'.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         #if NETFRAMEWORK
-        [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+        [Trait("category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
         #endif
         public static void TestUdtSchemaMetadata()
         {
@@ -384,7 +384,7 @@ private static string GetUdtName(Type udtClrType)
         // Synapse: Parse error at line: 1, column: 8: Incorrect syntax near 'geometry'.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         #if NETFRAMEWORK
-        [Trait("Category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
+        [Trait("category", "signed")] // Requires strong-name signed Microsoft.SqlServer.Server
         #endif
         public static void TestSqlServerTypesInsertAndRead()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs
index 864d1a5447..6b76e1f116 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/WeakRefTestYukonSpecific/WeakRefTestYukonSpecific.cs
@@ -19,7 +19,7 @@ public static class WeakRefTestYukonSpecific
 
         // TODO Synapse: Remove dependency on Northwind database
         [ActiveIssue("6643", TestPlatforms.AnyUnix)]
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public static void TestReaderMars()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs
index eb64eecce8..440d16581f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/DiagnosticTest.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests
 {
     // TODO(ADO-39873): Re-enable these tests after addressing their flakiness.
     [Trait("Set", "3")]
-    [Trait("Category", "flaky")]
+    [Trait("category", "flaky")]
     // Serialized execution: DiagnosticListener is global state, so these tests
     // must not run in parallel with each other.
     [Collection("DiagnosticTests")]
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
index 6d37051821..63eb1995a8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/TracingTests/MetricsTest.cs
@@ -178,7 +178,7 @@ public void StasisCounters_Functional()
             Assert.Equal(0, SqlClientEventSourceProps.StasisConnections);
         }
 
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
         public void TransactedConnectionPool_VerifyActiveConnectionCounters()
         {
@@ -280,7 +280,7 @@ public void ReclaimedConnectionsCounter_Functional()
         }
 
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         public void ConnectionPoolGroupsCounter_Functional()
         {
             SqlConnection.ClearAllPools();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
index 01321a35a6..e9cb9adaa4 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/ChannelDbConnectionPoolTest.cs
@@ -2503,7 +2503,7 @@ public void SyncCheckout_WhenSaturatedOnThreadPoolThreads_AllWaitersMakeProgress
         //     The test running when the crash occurred:
         //     Microsoft.Data.SqlClient.UnitTests.ConnectionPool.ChannelDbConnectionPoolTest.ConcurrentCallers_ShouldTimeoutIndependently
         //     testhost_7576_20260724T235829_hangdump.dmp
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [Fact]
         public async Task ConcurrentCallers_ShouldTimeoutIndependently()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
index 4ec6370d88..17ed3e63f8 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolShutdownTest.cs
@@ -161,7 +161,7 @@ public void TryGetConnection_Async_AfterShutdown_ShortCircuits_NoPendingOpenSche
         }
 
         // Shutdown wakes up a thread parked in WaitHandle.WaitAny.
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         //     Failed Microsoft.Data.SqlClient.UnitTests.ConnectionPool.WaitHandleDbConnectionPoolShutdownTest.Shutdown_UnblocksSyncWaiter [5 s]
         // ##[error]EXEC(0,0): Error Message:
         // EXEC : error Message:  [D:\a\_work\1\s\build.proj]
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
index 5230f9e22e..2579343dda 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/ConnectionPool/WaitHandleDbConnectionPoolTransactionTest.cs
@@ -651,7 +651,7 @@ public void PoolSaturation_BlocksUntilConnectionAvailable()
     //       ----- Inner Stack Trace -----
     //        at Microsoft.Data.SqlClient.UnitTests.ConnectionPool.WaitHandleDbConnectionPoolTransactionTest.<>c__DisplayClass29_0.<TwoThreads_SharedTransaction_AccessSameTransactedEntry>b__1() in WaitHandleDbConnectionPoolTransactionTest.cs:line 670
     //        at System.Threading.Tasks.Task.InnerInvoke()
-    [Trait("Category", "flaky")]
+    [Trait("category", "flaky")]
     [Fact]
     public void TwoThreads_SharedTransaction_AccessSameTransactedEntry()
     {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
index 216a131ad8..7eeb5df3d8 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs
@@ -37,7 +37,7 @@ public class ConnectionFailoverTests
         //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_NoFailover_DoesNotClearPool(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 72
         //      at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)
         //      at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr)
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -305,7 +305,7 @@ public void NetworkDelay_ShouldConnectToPrimary()
         //        at Microsoft.Data.SqlClient.SqlConnection.Open(SqlConnectionOverrides overrides)
         //        at Microsoft.Data.SqlClient.SqlConnection.Open()
         //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFailoverPartner() in ConnectionFailoverTests.cs:line 304
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [Fact]
         public void NetworkError_WithUserProvidedPartner_RetryDisabled_ShouldConnectToFailoverPartner()
         {
@@ -813,7 +813,7 @@ public async Task TransientFault_WithUserProvidedPartner_Async_ShouldConnectToPr
         //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(UInt32 errorCode) in D:\a\_work\1\s\src\Microsoft.Data.SqlClient\tests\UnitTests\SimulatedServerTests\ConnectionFailoverTests.cs:line 777
         //      at InvokeStub_ConnectionFailoverTests.TransientFault_WithUserProvidedPartner_Pooling_ShouldNotClearPool_NotFailover(Object, Span`1)
         //      at System.Reflection.MethodBaseInvoker.InvokeWithOneArg(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index 4432ca3f6c..0a7b633748 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -92,7 +92,7 @@ public async Task RequestEncryption_ServerDoesNotSupportEncryption_ShouldFail()
         //     at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.OnError(...)
         //     at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.CompleteLogin(Boolean enlistOK)
         //     at Microsoft.Data.SqlClient.Connection.SqlConnectionInternal.LoginNoFailover(...)
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [Theory]
         [InlineData(40613)]
         [InlineData(42108)]
@@ -233,7 +233,7 @@ public void TransientFault_RetryDisabled_ShouldFail(uint errorCode)
         //        at Microsoft.Data.SqlClient.SqlConnectionFactory.CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, TimeoutTimer timeout)
         //        at Microsoft.Data.SqlClient.SqlConnectionFactory.<>c__DisplayClass41_0.<CreateReplaceConnectionContinuation>b__0(Task`1 _)
         //        at Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests.ConnectionTests.NetworkError_RetryEnabled_ShouldSucceed_Async(Boolean multiSubnetFailoverEnabled)
-        [Trait("Category", "flaky")]
+        [Trait("category", "flaky")]
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc
index b2200b03c0..0a34397660 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc
@@ -19,6 +19,11 @@
     "AADServicePrincipalSecret": "",
     "AzureKeyVaultURL": "",
     "AzureKeyVaultTenantId": "",
+    // True if the environment supports Entra Integrated authentication.
+    "SupportsEntraIntegrated": false,
+    // True if the environment supports Windows Integrated authentication.
+    //
+    // TODO: Default values should be empty/false.
     "SupportsIntegratedSecurity": true,
     "LocalDbAppName": "",
     "LocalDbSharedInstanceName": "",
@@ -30,6 +35,7 @@
     "IsDNSCachingSupportedCR": false,
     "IsDNSCachingSupportedTR": false,
     "EnclaveAzureDatabaseConnString": "",
+    // TODO: Default values should be empty/false.
     "ManagedIdentitySupported": true,
     "UserManagedIdentityClientId": "",
     "PowerShellPath": "",

From 8b19e3ab4d0fe043c1f47739f2a27e154a2d93fd Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Wed, 9 Sep 2026 10:44:55 -0700
Subject: [PATCH 282/298] Tests Cleanup | Fix resource leaks in test suites
 (#4595)

---
 .../Fixtures/AzureKeyVaultKeyFixtureBase.cs   |  38 +-
 .../Common/Fixtures/CertificateFixtureBase.cs | 108 +++-
 .../ColumnEncryptionCertificateFixture.cs     |  38 +-
 .../ColumnMasterKeyCertificateFixture.cs      |  20 +-
 .../Common/Fixtures/CspCertificateFixture.cs  |  18 +-
 .../DatabaseObjects/ColumnEncryptionKey.cs    |   2 +-
 .../DatabaseObjects/ColumnMasterKey.cs        |   2 +-
 .../DatabaseObjects/DatabaseObject.cs         | 168 +++++-
 .../Fixtures/DatabaseObjects/DatabaseUser.cs  |   2 +-
 .../DatabaseObjects/ExistingObject.cs         |  20 +
 .../DatabaseObjects/NameIsVerbatim.cs         |  20 +
 .../DatabaseObjects/ScalarFunction.cs         |  68 +++
 .../Common/Fixtures/DatabaseObjects/Schema.cs |  65 +++
 .../Fixtures/DatabaseObjects/ServerLogin.cs   |   2 +-
 .../DatabaseObjects/StoredProcedure.cs        |  22 +-
 .../Common/Fixtures/DatabaseObjects/Table.cs  |  42 +-
 .../Fixtures/DatabaseObjects/TemporalTable.cs |  88 +++
 .../DatabaseObjects/UserDefinedType.cs        |   2 +-
 .../EnclaveAzureDatabaseTests.cs              |  50 +-
 .../AlwaysEncrypted/ExceptionsGenericError.cs | 100 +++-
 .../AlwaysEncrypted/SqlNullValues.cs          |  97 +++-
 .../TestFixtures/ConversionTestFixture.cs     |  38 +-
 .../TestFixtures/SQLSetupStrategy.cs          |  76 ++-
 .../SQLSetupStrategyAzureKeyVault.cs          |  47 +-
 .../SQLSetupStrategyCertStoreProvider.cs      |   2 +-
 .../TestFixtures/Setup/ColumnEncryptionKey.cs |  10 +-
 .../TestFixtures/Setup/ColumnMasterKey.cs     |  10 +-
 .../TestFixtures/Setup/Table.cs               |  14 +-
 .../SqlSetupStrategyCspProvider.cs            |  45 +-
 .../tests/ManualTests/BulkCopy/Bug84548.cs    |  97 ++--
 .../tests/ManualTests/BulkCopy/Bug85007.cs    | 144 +++--
 .../tests/ManualTests/BulkCopy/Bug903514.cs   |  25 +-
 .../tests/ManualTests/BulkCopy/Bug98182.cs    |  52 +-
 .../ManualTests/BulkCopy/CacheMetadata.cs     | 529 ++++++++----------
 .../ManualTests/BulkCopy/CheckConstraints.cs  |  61 +-
 .../ManualTests/BulkCopy/ColumnCollation.cs   |  22 +-
 .../ManualTests/BulkCopy/CopyAllFromReader.cs |  83 ++-
 .../BulkCopy/CopyAllFromReader1.cs            |  44 +-
 .../BulkCopy/CopyAllFromReaderAsync.cs        |  43 +-
 .../BulkCopy/CopyAllFromReaderCancelAsync.cs  |  37 +-
 .../CopyAllFromReaderConnectionCloseAsync.cs  |  41 +-
 ...llFromReaderConnectionCloseOnEventAsync.cs |  59 +-
 .../BulkCopy/CopyMultipleReaders.cs           |  62 +-
 .../BulkCopy/CopySomeFromDatatable.cs         |  77 ++-
 .../BulkCopy/CopySomeFromDatatableAsync.cs    |  73 ++-
 .../BulkCopy/CopySomeFromReader.cs            |  44 +-
 .../BulkCopy/CopySomeFromRowArray.cs          |  58 +-
 .../BulkCopy/CopySomeFromRowArrayAsync.cs     |  64 +--
 .../ManualTests/BulkCopy/CopyVariants.cs      |  95 ++--
 .../ManualTests/BulkCopy/CopyWithEvent.cs     |  66 +--
 .../ManualTests/BulkCopy/CopyWithEvent1.cs    |  52 +-
 .../BulkCopy/CopyWithEventAsync.cs            |  72 ++-
 .../DataConversionErrorMessageTest.cs         |  21 +-
 .../DestinationTableNameWithSpecialChar.cs    |  53 +-
 .../BulkCopy/ErrorOnRowsMarkedAsDeleted.cs    |  18 +-
 .../tests/ManualTests/BulkCopy/FireTrigger.cs |  69 +--
 .../tests/ManualTests/BulkCopy/Helpers.cs     |  36 +-
 .../BulkCopy/HiddenTargetColumn.cs            |  54 +-
 .../BulkCopy/InvalidAccessFromEvent.cs        |  49 +-
 .../tests/ManualTests/BulkCopy/KeepNulls.cs   |  44 +-
 .../BulkCopy/MissingTargetColumn.cs           |  42 +-
 .../BulkCopy/MissingTargetColumns.cs          |  42 +-
 .../BulkCopy/MissingTargetTable.cs            |   1 -
 .../BulkCopy/OrderHintTransaction.cs          |   2 +-
 .../BulkCopy/SpecialCharacterNames.cs         |  37 +-
 .../tests/ManualTests/BulkCopy/TableLock.cs   |  45 +-
 .../tests/ManualTests/BulkCopy/Transaction.cs |  44 +-
 .../ManualTests/BulkCopy/Transaction1.cs      |  50 +-
 .../ManualTests/BulkCopy/Transaction2.cs      |  60 +-
 .../ManualTests/BulkCopy/Transaction3.cs      |  50 +-
 .../ManualTests/BulkCopy/Transaction4.cs      |  36 +-
 .../BulkCopy/TransactionTestAsync.cs          |  48 +-
 .../ManualTests/BulkCopy/UnprivilegedLogin.cs |  55 +-
 .../CertificateTestWithTdsServer.cs           |  69 ++-
 .../SQL/ConnectivityTests/ConnectivityTest.cs |  21 +-
 .../SQL/JsonTest/JsonBulkCopyTest.cs          |  33 +-
 .../ParallelTransactionsTest.cs               |  54 +-
 .../ManualTests/SQL/ParameterTest/TvpTest.cs  |  69 ++-
 .../SqlCredentialTest/SqlCredentialTest.cs    |  28 +-
 .../SqlNotificationTest.cs                    |  37 +-
 .../SQL/TransactionTest/TransactionTest.cs    |  21 +-
 .../SQL/VectorTest/NativeVectorTestsBase.cs   |  40 +-
 .../VectorBackwardCompatTestBase.cs           |  54 +-
 ...EncryptionKeyCertificateBaselineFixture.cs |  21 +-
 84 files changed, 2573 insertions(+), 1844 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ExistingObject.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/NameIsVerbatim.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ScalarFunction.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Schema.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/TemporalTable.cs

diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs
index b2232b3f69..8feb0e38f0 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/AzureKeyVaultKeyFixtureBase.cs
@@ -75,18 +75,38 @@ public void Dispose()
 
     protected virtual void Dispose(bool disposing)
     {
-        foreach (KeyVaultKey key in _createdKeys)
+        try
         {
-            try
-            {
-                _keyClient.StartDeleteKey(key.Name).WaitForCompletion();
-            }
-            catch (Exception)
+            foreach (KeyVaultKey key in _createdKeys)
             {
-                continue;
+                try
+                {
+                    _keyClient.StartDeleteKey(key.Name).WaitForCompletion();
+                }
+                catch (Exception)
+                {
+                    continue;
+                }
+
+                // A deleted key remains in a soft-deleted state (and continues to consume the name)
+                // until it is purged or the retention period expires. Purging is best-effort: the
+                // test principal may not have permission, and the vault may have purge protection
+                // enabled, in which case the soft-deleted key simply expires on its own.
+                try
+                {
+                    _keyClient.PurgeDeletedKey(key.Name);
+                }
+                catch (Exception)
+                {
+                    continue;
+                }
             }
-        }
 
-        _randomGenerator.Dispose();
+            _createdKeys.Clear();
+        }
+        finally
+        {
+            _randomGenerator.Dispose();
+        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CertificateFixtureBase.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CertificateFixtureBase.cs
index 5081bc8b18..88b3a2c7b4 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CertificateFixtureBase.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CertificateFixtureBase.cs
@@ -50,7 +50,23 @@ public CertificateStoreContext(StoreLocation location, StoreName name)
 
     private readonly List<CertificateStoreContext> _certificateStoreModifications = new List<CertificateStoreContext>();
 
+    /// <summary>
+    /// Every certificate handed out by <see cref="CreateCertificate"/>. Certificates are created with
+    /// <see cref="X509KeyStorageFlags.PersistKeySet"/>, which writes the private key to a key container on
+    /// disk. Removing the certificate from a store does not remove that container, so the containers must
+    /// be deleted explicitly or they accumulate indefinitely across test runs.
+    /// </summary>
+    private readonly List<X509Certificate2> _createdCertificates = new List<X509Certificate2>();
+
     protected X509Certificate2 CreateCertificate(string subjectName, IEnumerable<string> dnsNames, IEnumerable<string> ipAddresses, bool forceCsp = false)
+    {
+        X509Certificate2 certificate = CreateCertificateCore(subjectName, dnsNames, ipAddresses, forceCsp);
+
+        _createdCertificates.Add(certificate);
+        return certificate;
+    }
+
+    private X509Certificate2 CreateCertificateCore(string subjectName, IEnumerable<string> dnsNames, IEnumerable<string> ipAddresses, bool forceCsp = false)
     {
         // This will always generate a certificate with:
         // * Start date: 24hrs ago
@@ -281,21 +297,45 @@ public void Dispose()
 
     protected virtual void Dispose(bool disposing)
     {
+        // Collect everything that needs disposing before touching any of it: removal from a store and
+        // deletion of the persisted key are both best-effort, but the handles must always be released.
+        List<X509Certificate2> certificates = new List<X509Certificate2>(_createdCertificates);
+
+        // Remove the certificates from any store they were added to. This must happen before the
+        // certificates are disposed, because a disposed certificate cannot be matched against a store.
         foreach (CertificateStoreContext storeContext in _certificateStoreModifications)
         {
             using X509Store store = new X509Store(storeContext.Name, storeContext.Location);
 
+            bool opened;
             try
             {
                 store.Open(OpenFlags.ReadWrite);
+                opened = true;
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                continue;
+                // Every certificate destined for this store is about to be skipped, so this is the
+                // only chance to say so. Without it the certificates leak across runs with no trace.
+                Console.WriteLine(
+                    $"Failed to open certificate store '{storeContext.Name}' in '{storeContext.Location}' " +
+                    $"for cleanup; {storeContext.Certificates.Count} certificate(s) may be left behind. {ex}");
+
+                opened = false;
             }
 
             foreach (X509Certificate2 cert in storeContext.Certificates)
             {
+                if (!certificates.Contains(cert))
+                {
+                    certificates.Add(cert);
+                }
+
+                if (!opened)
+                {
+                    continue;
+                }
+
                 try
                 {
                     if (store.Certificates.Contains(cert))
@@ -303,15 +343,75 @@ protected virtual void Dispose(bool disposing)
                         store.Remove(cert);
                     }
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
+                    // Same reasoning as the store-open failure above: report the leak rather than
+                    // letting the certificate linger in the store silently.
+                    Console.WriteLine(
+                        $"Failed to remove certificate '{cert.Subject}' from store '{storeContext.Name}' " +
+                        $"in '{storeContext.Location}'; it may be left behind. {ex}");
+
                     continue;
                 }
+            }
+
+            storeContext.Certificates.Clear();
+        }
+
+        _certificateStoreModifications.Clear();
 
+        foreach (X509Certificate2 cert in certificates)
+        {
+            DeletePersistedPrivateKey(cert);
+
+            try
+            {
                 cert.Dispose();
             }
+            catch (Exception)
+            {
+                // Nothing further can be done about a certificate that refuses to release its handle.
+            }
+        }
 
-            storeContext.Certificates.Clear();
+        _createdCertificates.Clear();
+    }
+
+    /// <summary>
+    /// Deletes the on-disk key container backing a certificate's private key, if there is one.
+    /// </summary>
+    /// <remarks>
+    /// This is best-effort: the certificate may have no private key, the key may be ephemeral, or the
+    /// current user may lack permission to delete it (for example, for a machine-scoped key).
+    /// </remarks>
+    private static void DeletePersistedPrivateKey(X509Certificate2 certificate)
+    {
+        try
+        {
+            if (!certificate.HasPrivateKey)
+            {
+                return;
+            }
+
+            using RSA? privateKey = certificate.GetRSAPrivateKey();
+
+            switch (privateKey)
+            {
+                case RSACryptoServiceProvider csp:
+                    csp.PersistKeyInCsp = false;
+                    break;
+#if NET
+                case RSACng cng:
+                    cng.Key.Delete();
+                    break;
+#endif
+                default:
+                    break;
+            }
+        }
+        catch (Exception)
+        {
+            // Best-effort; a stale key container is preferable to failing the test run during cleanup.
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnEncryptionCertificateFixture.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnEncryptionCertificateFixture.cs
index c5b527c690..ff2dc0719b 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnEncryptionCertificateFixture.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnEncryptionCertificateFixture.cs
@@ -28,29 +28,41 @@ public sealed class ColumnEncryptionCertificateFixture : CertificateFixtureBase
 
     public ColumnEncryptionCertificateFixture()
     {
-        PrimaryColumnEncryptionCertificate = CreateCertificate(nameof(PrimaryColumnEncryptionCertificate), Array.Empty<string>(), Array.Empty<string>());
-        SecondaryColumnEncryptionCertificate = CreateCertificate(nameof(SecondaryColumnEncryptionCertificate), Array.Empty<string>(), Array.Empty<string>());
-        _currentUserCertificate = CreateCertificate(nameof(_currentUserCertificate), Array.Empty<string>(), Array.Empty<string>());
-        using (X509Certificate2 createdCertificate = CreateCertificate(nameof(CertificateWithoutPrivateKey), Array.Empty<string>(), Array.Empty<string>()))
+        // NOTE: If this constructor throws, xUnit never calls Dispose, so any certificate already
+        //   placed in a store (and its persisted key container) would be leaked.
+        try
         {
+            PrimaryColumnEncryptionCertificate = CreateCertificate(nameof(PrimaryColumnEncryptionCertificate), Array.Empty<string>(), Array.Empty<string>());
+            SecondaryColumnEncryptionCertificate = CreateCertificate(nameof(SecondaryColumnEncryptionCertificate), Array.Empty<string>(), Array.Empty<string>());
+            _currentUserCertificate = CreateCertificate(nameof(_currentUserCertificate), Array.Empty<string>(), Array.Empty<string>());
+
+            // NOTE: The source certificate is intentionally not disposed here; it is tracked by the base
+            //   fixture, which deletes its persisted key container and disposes it on cleanup.
+            X509Certificate2 createdCertificate = CreateCertificate(nameof(CertificateWithoutPrivateKey), Array.Empty<string>(), Array.Empty<string>());
+
             // This will strip the private key away from the created certificate
 #if NET9_0_OR_GREATER
-                CertificateWithoutPrivateKey = X509CertificateLoader.LoadCertificate(createdCertificate.Export(X509ContentType.Cert));
+            CertificateWithoutPrivateKey = X509CertificateLoader.LoadCertificate(createdCertificate.Export(X509ContentType.Cert));
 #else
             CertificateWithoutPrivateKey = new X509Certificate2(createdCertificate.Export(X509ContentType.Cert));
 #endif
             AddToStore(CertificateWithoutPrivateKey, StoreLocation.CurrentUser, StoreName.My);
-        }
 
-        AddToStore(PrimaryColumnEncryptionCertificate, StoreLocation.CurrentUser, StoreName.My);
-        AddToStore(SecondaryColumnEncryptionCertificate, StoreLocation.CurrentUser, StoreName.My);
-        AddToStore(_currentUserCertificate, StoreLocation.CurrentUser, StoreName.My);
+            AddToStore(PrimaryColumnEncryptionCertificate, StoreLocation.CurrentUser, StoreName.My);
+            AddToStore(SecondaryColumnEncryptionCertificate, StoreLocation.CurrentUser, StoreName.My);
+            AddToStore(_currentUserCertificate, StoreLocation.CurrentUser, StoreName.My);
 
-        if (IsAdmin)
-        {
-            _localMachineCertificate = CreateCertificate(nameof(_localMachineCertificate), Array.Empty<string>(), Array.Empty<string>());
+            if (IsAdmin)
+            {
+                _localMachineCertificate = CreateCertificate(nameof(_localMachineCertificate), Array.Empty<string>(), Array.Empty<string>());
 
-            AddToStore(_localMachineCertificate, StoreLocation.LocalMachine, StoreName.My);
+                AddToStore(_localMachineCertificate, StoreLocation.LocalMachine, StoreName.My);
+            }
+        }
+        catch
+        {
+            Dispose();
+            throw;
         }
     }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs
index d396251103..5cb70cc27a 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/ColumnMasterKeyCertificateFixture.cs
@@ -28,11 +28,21 @@ protected ColumnMasterKeyCertificateFixture(bool createCertificate)
     {
         if (createCertificate)
         {
-            ColumnMasterKeyCertificate = CreateCertificate(nameof(ColumnMasterKeyCertificate), Array.Empty<string>(), Array.Empty<string>());
-
-            AddToStore(ColumnMasterKeyCertificate, StoreLocation.CurrentUser, StoreName.My);
-
-            ColumnMasterKeyCertificatePath = $"{StoreLocation.CurrentUser}/{StoreName.My}/{ColumnMasterKeyCertificate.Thumbprint}";
+            // NOTE: If this constructor throws, xUnit never calls Dispose, so the certificate placed in
+            //   the store (and its persisted key container) would be leaked.
+            try
+            {
+                ColumnMasterKeyCertificate = CreateCertificate(nameof(ColumnMasterKeyCertificate), Array.Empty<string>(), Array.Empty<string>());
+
+                AddToStore(ColumnMasterKeyCertificate, StoreLocation.CurrentUser, StoreName.My);
+
+                ColumnMasterKeyCertificatePath = $"{StoreLocation.CurrentUser}/{StoreName.My}/{ColumnMasterKeyCertificate.Thumbprint}";
+            }
+            catch
+            {
+                Dispose();
+                throw;
+            }
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CspCertificateFixture.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CspCertificateFixture.cs
index 4d46032ce2..ac8e847656 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CspCertificateFixture.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/CspCertificateFixture.cs
@@ -19,12 +19,22 @@ public class CspCertificateFixture : CertificateFixtureBase
 {
     public CspCertificateFixture()
     {
-        CspCertificate = CreateCertificate(nameof(CspCertificate), Array.Empty<string>(), Array.Empty<string>(), true);
+        // NOTE: If this constructor throws, xUnit never calls Dispose, so the certificate placed in the
+        //   store (and its persisted CSP key container) would be leaked.
+        try
+        {
+            CspCertificate = CreateCertificate(nameof(CspCertificate), Array.Empty<string>(), Array.Empty<string>(), true);
 
-        AddToStore(CspCertificate, StoreLocation.CurrentUser, StoreName.My);
+            AddToStore(CspCertificate, StoreLocation.CurrentUser, StoreName.My);
 
-        CspCertificatePath = $"{StoreLocation.CurrentUser}/{StoreName.My}/{CspCertificate.Thumbprint}";
-        CspKeyPath = GetCspPathFromCertificate();
+            CspCertificatePath = $"{StoreLocation.CurrentUser}/{StoreName.My}/{CspCertificate.Thumbprint}";
+            CspKeyPath = GetCspPathFromCertificate();
+        }
+        catch
+        {
+            Dispose();
+            throw;
+        }
     }
 
     public X509Certificate2 CspCertificate { get; }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnEncryptionKey.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnEncryptionKey.cs
index af402428b0..bdad3fbdd5 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnEncryptionKey.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnEncryptionKey.cs
@@ -27,7 +27,7 @@ public sealed class ColumnEncryptionKey : DatabaseObject<ColumnMasterKey>
     /// <param name="cmkOrigin">The column master key which backs this encryption key.</param>
     public ColumnEncryptionKey(SqlConnection connection, string namePrefix, ColumnMasterKey cmkOrigin)
         : base(connection, GenerateLongName(namePrefix), definition: DefinitionTemplate,
-            state: cmkOrigin, shouldCreate: true, shouldDrop: true)
+            state: cmkOrigin)
     {
     }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnMasterKey.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnMasterKey.cs
index de607c0f68..0802cbbe53 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnMasterKey.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ColumnMasterKey.cs
@@ -37,7 +37,7 @@ internal CreationParameters(SqlColumnEncryptionKeyStoreProvider provider,
 
     protected ColumnMasterKey(SqlConnection connection, string namePrefix, CreationParameters creationParameters)
         : base(connection, name: GenerateLongName(namePrefix), definition: DefinitionTemplate,
-            state: creationParameters, shouldCreate: true, shouldDrop: true)
+            state: creationParameters)
     {
     }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
index a74da79697..a93df61fca 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseObject.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Text;
 
 namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
@@ -16,7 +17,7 @@ namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 /// </typeparam>
 public abstract class DatabaseObject<TState> : IDisposable
 {
-    private readonly bool _shouldDrop;
+    private bool _disposed;
 
     protected SqlConnection Connection { get; }
 
@@ -26,20 +27,51 @@ public abstract class DatabaseObject<TState> : IDisposable
 
     public string UnescapedName => Name.Substring(1, Name.Length - 2).Replace("]]", "]");
 
-    protected DatabaseObject(SqlConnection connection, string name, string definition, TState state, bool shouldCreate, bool shouldDrop)
+    protected DatabaseObject(SqlConnection connection, string name, string definition, TState state)
     {
-        _shouldDrop = shouldDrop;
-
         Connection = connection;
         State = state;
         Name = name;
 
-        if (shouldCreate)
+        EnsureConnectionOpen();
+
+        // Remove any object left behind by an earlier run before creating this one. Best-effort:
+        // if it cannot be removed, CREATE will report the collision far more clearly than a drop
+        // failure would.
+        TryDrop();
+
+        try
         {
-            EnsureConnectionOpen();
-            DropObject();
             CreateObject(definition);
         }
+        catch
+        {
+            // CREATE can fail *after* the server has created the object: a command timeout or a
+            // dropped connection reports failure for a statement that may already have committed.
+            // Every generated name embeds a GUID, so anything left behind is orphaned forever in
+            // the (shared) test database. Unwind through Dispose so that cleanup lives in exactly
+            // one place, then let the original failure surface.
+            Dispose();
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// Adopts an object that already exists, so that it is dropped when this instance is disposed.
+    /// Nothing is created.
+    /// </summary>
+    /// <remarks>
+    /// Necessary for objects the server creates as a side effect of creating something else, which
+    /// therefore have no CREATE statement of their own but still have to be dropped. The temporal
+    /// history table behind <see cref="TemporalTable"/> is the motivating case.
+    /// </remarks>
+    protected DatabaseObject(SqlConnection connection, string name, TState state, ExistingObject _)
+    {
+        Connection = connection;
+        State = state;
+        Name = name;
+
+        EnsureConnectionOpen();
     }
 
     private void EnsureConnectionOpen()
@@ -251,22 +283,127 @@ public static string GenerateShortName(string prefix, bool escape = true)
     /// </summary>
     /// <remarks>
     /// By the time this is called, <see cref="Connection"/> will be open.
-    /// Must not throw an exception if the object does not exist.
+    ///
+    /// Implementations must be safe to call more than once and must not throw when the object does
+    /// not exist. They are not required to be exception-free beyond that: the guard against a
+    /// leftover object is inherently racy (the existence check and the DROP are separate
+    /// statements), and the connection itself can fail at any moment. <see cref="TryDrop"/> owns
+    /// that problem — it retries on a fresh connection and reports anything it cannot remove — so
+    /// no failure from here ever escapes to a caller.
     /// </remarks>
     protected abstract void DropObject();
 
+    /// <remarks>
+    /// Idempotent, and never throws. These objects are overwhelmingly consumed via <c>using</c>, so
+    /// a throwing <c>Dispose</c> would surface in place of an exception already in flight and
+    /// replace a real test failure with a cleanup error — the very "cleanup masks the real failure"
+    /// problem these types exist to remove. A drop that cannot be completed is reported by
+    /// <see cref="TryDropAfterReconnect"/> instead, which identifies the object and where it lives
+    /// so the leak stays actionable without destroying the diagnosis of the failure that caused it.
+    /// </remarks>
     public void Dispose()
     {
-        if (_shouldDrop)
+        if (_disposed)
         {
-            EnsureConnectionOpen();
-            DropObject();
+            return;
         }
+
+        _disposed = true;
+
+        TryDrop();
+
         // This explicitly does not drop the wrapped SqlConnection; this is sometimes
         // used in a loop to create multiple UDTs.
 
         GC.SuppressFinalize(this);
     }
+
+    /// <summary>
+    /// Drops the object, swallowing any failure.
+    /// </summary>
+    /// <remarks>
+    /// The drop is all that stands between a failed run and an object orphaned forever in the
+    /// shared test database, so it gets one retry on a healthy connection before giving up. A
+    /// failure is never propagated: this runs either during <see cref="Dispose"/> or on a path
+    /// already unwinding because of a more interesting failure, and in both cases a cleanup error
+    /// must not replace the exception in flight.
+    /// </remarks>
+    private void TryDrop()
+    {
+        try
+        {
+            EnsureConnectionOpen();
+            DropObject();
+        }
+        catch
+        {
+            try
+            {
+                TryDropAfterReconnect();
+            }
+            catch
+            {
+                // Nothing left to try, and nowhere to report it: even the reporting path failed.
+                // Swallowing is the whole point — see the remarks above.
+            }
+        }
+    }
+
+    /// <summary>
+    /// Re-attempts the drop on a healthy connection.
+    /// </summary>
+    /// <returns><c>true</c> if the object was dropped; otherwise <c>false</c>.</returns>
+    /// <remarks>
+    /// A drop usually fails because <see cref="Connection"/> itself has gone bad: a command timeout
+    /// can leave it unusable, and a transport failure kills it outright. Closing and reopening
+    /// returns the broken connection to the pool and acquires a healthy one, which is the difference
+    /// between a transient blip and an object orphaned forever in the shared test database.
+    ///
+    /// This deliberately reuses the existing <see cref="SqlConnection"/> rather than constructing a
+    /// new one from its connection string: `Persist Security Info` defaults to false, so the password
+    /// is no longer readable from <see cref="SqlConnection.ConnectionString"/> once it has been
+    /// opened, and a copy would fail to authenticate.
+    /// </remarks>
+    private bool TryDropAfterReconnect()
+    {
+        // Captured before the reconnect attempt: once the connection has been closed or disposed
+        // these can throw, and this is the only record the leak will leave.
+        string location = DescribeLocation();
+
+        try
+        {
+            Connection.Close();
+            Connection.Open();
+            DropObject();
+
+            return true;
+        }
+        catch (Exception ex)
+        {
+            // This is the last chance to remove the object, and no caller propagates the failure,
+            // so this report is the only trace the leak will leave. It names the object *and*
+            // where it lives, so a human or agent can drop it manually without having to work out
+            // which server and database the run was pointed at.
+            Console.WriteLine($"Failed to drop {GetType().Name} '{Name}' {location}; it may be orphaned there. {ex}");
+
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Describes where the object lives, for the leak report.
+    /// </summary>
+    private string DescribeLocation()
+    {
+        try
+        {
+            return $"on data source '{Connection.DataSource}', database '{Connection.Database}'";
+        }
+        catch (Exception ex)
+        {
+            return $"on an unknown data source ({ex.GetType().Name} reading the connection)";
+        }
+    }
 }
 
 /// <summary>
@@ -275,8 +412,13 @@ public void Dispose()
 /// </summary>
 public abstract class DatabaseObject : DatabaseObject<object?>
 {
-    protected DatabaseObject(SqlConnection connection, string name, string definition, bool shouldCreate, bool shouldDrop)
-        : base(connection, name, definition, state: null, shouldCreate, shouldDrop)
+    protected DatabaseObject(SqlConnection connection, string name, string definition)
+        : base(connection, name, definition, state: null)
+    {
+    }
+
+    protected DatabaseObject(SqlConnection connection, string name, ExistingObject adopt)
+        : base(connection, name, state: null, adopt)
     {
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs
index a757e9c9e0..20182d1ba3 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/DatabaseUser.cs
@@ -22,7 +22,7 @@ public sealed class DatabaseUser : DatabaseObject<string>
     /// <param name="database">The name of the database where the user will be created.</param>
     /// <param name="login">The server login which the database user will be associated with.</param>
     public DatabaseUser(SqlConnection connection, string database, ServerLogin login)
-        : base(connection, login.Name, $"FOR LOGIN {login.Name}", state: database, shouldCreate: true, shouldDrop: true)
+        : base(connection, login.Name, $"FOR LOGIN {login.Name}", state: database)
     {
     }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ExistingObject.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ExistingObject.cs
new file mode 100644
index 0000000000..93ea622ae8
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ExistingObject.cs
@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// Selects the constructor that adopts an object which already exists on the server, rather than
+/// creating one.
+/// </summary>
+/// <remarks>
+/// The distinction — create this object, or take ownership of one that is already there — cannot be
+/// expressed in the signature, since both take the same arguments. A discriminator states it at the
+/// call site, which a <c>bool</c> would not; the corresponding public entry point is the
+/// <c>AdoptExisting</c> factory.
+/// </remarks>
+public enum ExistingObject
+{
+    Adopt
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/NameIsVerbatim.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/NameIsVerbatim.cs
new file mode 100644
index 0000000000..1ad15651e7
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/NameIsVerbatim.cs
@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// Distinguishes a constructor that takes a caller-supplied name verbatim from the prefix-based
+/// one, which would otherwise have an identical signature.
+/// </summary>
+/// <remarks>
+/// The two overloads differ only in how the string is interpreted — as a name or as a prefix to
+/// generate one from — which the type system cannot express. This makes the private constructor
+/// unambiguous without inventing a parameter that carries no meaning; the corresponding public
+/// entry point is the <c>WithName</c> factory, where the distinction is stated in the name.
+/// </remarks>
+internal enum NameIsVerbatim
+{
+    Yes
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ScalarFunction.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ScalarFunction.cs
new file mode 100644
index 0000000000..4044241e76
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ScalarFunction.cs
@@ -0,0 +1,68 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// A transient scalar user-defined function, created at the start of its scope and dropped when
+/// disposed.
+/// </summary>
+public sealed class ScalarFunction : DatabaseObject
+{
+    /// <summary>
+    /// Initializes a new instance of the ScalarFunction class using the specified SQL connection,
+    /// name prefix and definition.
+    /// </summary>
+    /// <remarks>
+    /// If a function with the specified name already exists, it will be dropped automatically
+    /// before creation.
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="prefix">The prefix for the function name.</param>
+    /// <param name="definition">The SQL definition of the function, following the function name.</param>
+    public ScalarFunction(SqlConnection connection, string prefix, string definition)
+        : base(connection, GenerateLongName(prefix), definition)
+    {
+    }
+
+    private ScalarFunction(SqlConnection connection, string name, string definition, NameIsVerbatim _)
+        : base(connection, name, definition)
+    {
+    }
+
+    /// <summary>
+    /// Creates a function using the caller-supplied name verbatim, instead of generating one.
+    /// </summary>
+    /// <remarks>
+    /// Prefer the prefix-based constructor: generated names embed a GUID and so cannot collide
+    /// between concurrent test runs against a shared database. This overload exists for the
+    /// minority of tests that must control the name exactly, for example because the same function
+    /// has to be created and addressed over several different connections.
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="name">The function name, already quoted/escaped by the caller if it needs to be.</param>
+    /// <param name="definition">The SQL definition of the function, following the function name.</param>
+    public static ScalarFunction WithName(SqlConnection connection, string name, string definition)
+        => new(connection, name, definition, NameIsVerbatim.Yes);
+
+    protected override void CreateObject(string definition)
+    {
+        using SqlCommand createCommand = new($"CREATE FUNCTION {Name} {definition}", Connection);
+
+        createCommand.ExecuteNonQuery();
+    }
+
+    protected override void DropObject()
+    {
+        // NOTE: The name is passed to OBJECT_ID() as a parameter rather than being interpolated
+        //   into a string literal, because it may embed Environment.UserName/MachineName (see
+        //   DatabaseObject.GenerateLongName) and an apostrophe in either would break the batch.
+        //   The identifier in DROP FUNCTION is already bracket-quoted.
+        using SqlCommand dropCommand = new($"IF (OBJECT_ID(@name) IS NOT NULL) DROP FUNCTION {Name}", Connection);
+
+        dropCommand.Parameters.AddWithValue("@name", Name);
+
+        dropCommand.ExecuteNonQuery();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Schema.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Schema.cs
new file mode 100644
index 0000000000..7f316520b5
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Schema.cs
@@ -0,0 +1,65 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// A transient schema, created at the start of its scope and dropped when disposed.
+/// </summary>
+/// <remarks>
+/// A schema can only be dropped once it is empty, so any object created inside it must be
+/// declared after the schema and therefore disposed before it.
+/// </remarks>
+public sealed class Schema : DatabaseObject
+{
+    /// <summary>
+    /// Initializes a new instance of the Schema class using the specified SQL connection and name prefix.
+    /// </summary>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="prefix">The prefix for the schema name.</param>
+    public Schema(SqlConnection connection, string prefix)
+        : base(connection, GenerateLongName(prefix), definition: string.Empty)
+    {
+    }
+
+    private Schema(SqlConnection connection, string name, NameIsVerbatim _)
+        : base(connection, name, definition: string.Empty)
+    {
+    }
+
+    /// <summary>
+    /// Creates a schema using the caller-supplied name verbatim, instead of generating one.
+    /// </summary>
+    /// <remarks>
+    /// Prefer the prefix-based constructor. This overload exists for tests in which the name
+    /// itself is under test, for example one containing special characters.
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="name">The schema name, already quoted/escaped by the caller if it needs to be.</param>
+    public static Schema WithName(SqlConnection connection, string name)
+        => new(connection, name, NameIsVerbatim.Yes);
+
+    protected override void CreateObject(string definition)
+    {
+        // NOTE: CREATE SCHEMA must be the first statement in its batch, so it cannot be guarded
+        //   by an IF the way the other objects are. The base class drops before creating, which
+        //   covers the (vanishingly unlikely) case of a name collision.
+        using SqlCommand createCommand = new($"CREATE SCHEMA {Name}", Connection);
+
+        createCommand.ExecuteNonQuery();
+    }
+
+    protected override void DropObject()
+    {
+        // NOTE: The name is passed to SCHEMA_ID() as a parameter rather than being interpolated
+        //   into a string literal, because it may embed Environment.UserName/MachineName (see
+        //   DatabaseObject.GenerateLongName) and an apostrophe in either would break the batch.
+        //   The identifier in DROP SCHEMA is already bracket-quoted.
+        using SqlCommand dropCommand = new($"IF (SCHEMA_ID(@name) IS NOT NULL) DROP SCHEMA {Name}", Connection);
+
+        dropCommand.Parameters.AddWithValue("@name", UnescapedName);
+
+        dropCommand.ExecuteNonQuery();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs
index ce264a9d14..721cad1b3b 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/ServerLogin.cs
@@ -26,7 +26,7 @@ public ServerLogin(SqlConnection connection, string namePrefix, string? defaultD
     }
 
     private ServerLogin(SqlConnection connection, string namePrefix, string password, string? defaultDatabase)
-        : base(connection, namePrefix, GenerateDefinition(password, defaultDatabase), state: password, shouldCreate: true, shouldDrop: true)
+        : base(connection, namePrefix, GenerateDefinition(password, defaultDatabase), state: password)
     {
     }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs
index 0ebbd6cb5e..826c2ccc10 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/StoredProcedure.cs
@@ -21,10 +21,30 @@ public sealed class StoredProcedure : DatabaseObject
     /// <param name="prefix">The stored procedure name. Can begin with '#' or '##' to indicate a temporary procedure.</param>
     /// <param name="definition">The SQL definition of the stored procedure.</param>
     public StoredProcedure(SqlConnection connection, string prefix, string definition)
-        : base(connection, GenerateLongName(prefix), definition, shouldCreate: true, shouldDrop: true)
+        : base(connection, GenerateLongName(prefix), definition)
     {
     }
 
+    private StoredProcedure(SqlConnection connection, string name, string definition, NameIsVerbatim _)
+        : base(connection, name, definition)
+    {
+    }
+
+    /// <summary>
+    /// Creates a stored procedure using the caller-supplied name verbatim, instead of generating one.
+    /// </summary>
+    /// <remarks>
+    /// Prefer the prefix-based constructor: generated names embed a GUID and so cannot collide
+    /// between concurrent test runs against a shared database. This overload exists for the
+    /// minority of tests that must control the name exactly, for example because the same
+    /// procedure has to be created and addressed over several different connections.
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="name">The procedure name, already quoted/escaped by the caller if it needs to be.</param>
+    /// <param name="definition">The SQL definition of the stored procedure.</param>
+    public static StoredProcedure WithName(SqlConnection connection, string name, string definition)
+        => new(connection, name, definition, NameIsVerbatim.Yes);
+
     protected override void CreateObject(string definition)
     {
         using SqlCommand createCommand = new($"CREATE PROCEDURE {Name} {definition}", Connection);
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs
index 42d07a8fba..b628c3b0fd 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/Table.cs
@@ -21,10 +21,50 @@ public sealed class Table : DatabaseObject
     /// <param name="prefix">The prefix for the table name. Can begin with '#' or '##' to indicate a temporary table.</param>
     /// <param name="definition">The SQL definition describing the structure of the table, including columns and data types.</param>
     public Table(SqlConnection connection, string prefix, string definition)
-        : base(connection, GenerateLongName(prefix), definition, shouldCreate: true, shouldDrop: true)
+        : base(connection, GenerateLongName(prefix), definition)
     {
     }
 
+    private Table(SqlConnection connection, string name, string definition, NameIsVerbatim _)
+        : base(connection, name, definition)
+    {
+    }
+
+    private Table(SqlConnection connection, string name, ExistingObject adopt)
+        : base(connection, name, adopt)
+    {
+    }
+
+    /// <summary>
+    /// Creates a table using the caller-supplied name verbatim, instead of generating one.
+    /// </summary>
+    /// <remarks>
+    /// Prefer the prefix-based constructor: generated names embed a GUID and so cannot collide
+    /// between concurrent test runs against a shared database. This overload exists for the
+    /// minority of tests that must control the name exactly - either because the name itself is
+    /// under test (for example, one containing special characters), or because the same table has
+    /// to be addressed through several different connections.
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="name">The table name, already quoted/escaped by the caller if it needs to be.</param>
+    /// <param name="definition">The SQL definition describing the structure of the table, including columns and data types.</param>
+    public static Table WithName(SqlConnection connection, string name, string definition)
+        => new(connection, name, definition, NameIsVerbatim.Yes);
+
+    /// <summary>
+    /// Adopts a table that already exists, so that it is dropped when the returned instance is
+    /// disposed. No table is created.
+    /// </summary>
+    /// <remarks>
+    /// For tables the server creates as a side effect of creating something else, and which
+    /// therefore have no CREATE statement of their own but must still be dropped — the history
+    /// table behind a <see cref="TemporalTable"/> being the motivating case.
+    /// </remarks>
+    /// <param name="connection">The SQL connection used to drop the table.</param>
+    /// <param name="name">The table name, already quoted/escaped by the caller if it needs to be.</param>
+    public static Table AdoptExisting(SqlConnection connection, string name)
+        => new(connection, name, ExistingObject.Adopt);
+
     protected override void CreateObject(string definition)
     {
         using SqlCommand createCommand = new($"CREATE TABLE {Name} {definition}", Connection);
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/TemporalTable.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/TemporalTable.cs
new file mode 100644
index 0000000000..6c225938b8
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/TemporalTable.cs
@@ -0,0 +1,88 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+
+/// <summary>
+/// A transient system-versioned (temporal) table, created at the start of its scope and dropped —
+/// together with its history table — when disposed.
+/// </summary>
+/// <remarks>
+/// A temporal table cannot be dropped directly. System versioning has to be switched off first,
+/// which severs the link to the history table and leaves that table behind as an ordinary one that
+/// must then be dropped in its own right. That history table is created by the server as a side
+/// effect, so it is <see cref="Table.AdoptExisting">adopted</see> rather than created: this type
+/// owns it and drops it, but never issues a CREATE for it.
+/// </remarks>
+public sealed class TemporalTable : DatabaseObject
+{
+    /// <summary>
+    /// The history table backing this temporal table. Dropped along with it.
+    /// </summary>
+    public Table HistoryTable { get; }
+
+    /// <summary>
+    /// Initializes a new system-versioned table and adopts the history table created alongside it.
+    /// </summary>
+    /// <param name="connection">The SQL connection used to interact with the database.</param>
+    /// <param name="prefix">The prefix for the table name.</param>
+    /// <param name="historyPrefix">
+    /// The prefix for the history table name. SYSTEM_VERSIONING requires a schema-qualified history
+    /// table, so the generated name is qualified with <c>[dbo]</c>.
+    /// </param>
+    /// <param name="columns">
+    /// The column definitions, including the PERIOD FOR SYSTEM_TIME clause, in parentheses. The
+    /// SYSTEM_VERSIONING option naming the history table is appended automatically.
+    /// </param>
+    public TemporalTable(SqlConnection connection, string prefix, string historyPrefix, string columns)
+        : this(connection, GenerateLongName(prefix), $"[dbo].{GenerateLongName(historyPrefix)}", columns, NameIsVerbatim.Yes)
+    {
+    }
+
+    private TemporalTable(SqlConnection connection, string name, string historyName, string columns, NameIsVerbatim _)
+        : base(connection, name, $"{columns} WITH (SYSTEM_VERSIONING = ON (HISTORY_TABLE = {historyName}))")
+    {
+        // Adopted only once the CREATE above has succeeded, since that statement is what brings the
+        // history table into existence. If it throws, the base constructor disposes this instance,
+        // and the null check in DropObject keeps that path safe.
+        HistoryTable = Table.AdoptExisting(connection, historyName);
+    }
+
+    protected override void CreateObject(string definition)
+    {
+        using SqlCommand createCommand = new($"CREATE TABLE {Name} {definition}", Connection);
+
+        createCommand.ExecuteNonQuery();
+    }
+
+    protected override void DropObject()
+    {
+        // NOTE: The name is passed to OBJECT_ID() as a parameter rather than being interpolated
+        //   into a string literal, because it embeds Environment.UserName/MachineName (see
+        //   DatabaseObject.GenerateLongName) and an apostrophe in either would break the batch.
+        //   The identifier in ALTER/DROP TABLE is already bracket-quoted by GenerateLongName.
+        //
+        //   Ordering is load-bearing: SYSTEM_VERSIONING must be switched off before the period can
+        //   be dropped, and the period before the table itself.
+        using (SqlCommand dropCommand = new($"""
+            IF (OBJECT_ID(@name) IS NOT NULL)
+            BEGIN
+                ALTER TABLE {Name} SET (SYSTEM_VERSIONING = OFF);
+                ALTER TABLE {Name} DROP PERIOD FOR SYSTEM_TIME;
+                DROP TABLE {Name};
+            END
+            """, Connection))
+        {
+            dropCommand.Parameters.AddWithValue("@name", Name);
+
+            dropCommand.ExecuteNonQuery();
+        }
+
+        // Only reachable once versioning is off, which is what turns the history table back into an
+        // ordinary droppable one. Null both during the pre-emptive drop the base constructor runs
+        // before CREATE, and while it unwinds a failed CREATE — in neither case is there an adopted
+        // history table to drop.
+        HistoryTable?.Dispose();
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs
index be68e649dd..95c9f8ebf0 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Fixtures/DatabaseObjects/UserDefinedType.cs
@@ -21,7 +21,7 @@ public sealed class UserDefinedType : DatabaseObject
     /// <param name="prefix">The type name.</param>
     /// <param name="definition">The SQL definition of the type.</param>
     public UserDefinedType(SqlConnection connection, string prefix, string definition)
-        : base(connection, "[dbo]." + GenerateLongName(prefix), definition, shouldCreate: true, shouldDrop: true)
+        : base(connection, "[dbo]." + GenerateLongName(prefix), definition)
     {
     }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs
index 4de82d39b7..7fca0a7abb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/EnclaveAzureDatabaseTests.cs
@@ -50,14 +50,25 @@ public EnclaveAzureDatabaseTests(AzureKeyVaultKeyFixture keyVaultKeyFixture)
                 connStrings.Add(connString1.ToString());
                 connStrings.Add(connString2.ToString());
 
-                foreach (string connString in connStrings)
+                // NOTE: If creation fails part way through (for example on the second database), this
+                //   constructor never returns, so xUnit never calls Dispose and the keys created so far
+                //   would be leaked. Their names embed a GUID, so nothing would ever reclaim them.
+                try
                 {
-                    using (SqlConnection connection = new SqlConnection(connString))
+                    foreach (string connString in connStrings)
                     {
-                        connection.Open();
-                        databaseObjects.ForEach(o => o.Create(connection));
+                        using (SqlConnection connection = new SqlConnection(connString))
+                        {
+                            connection.Open();
+                            databaseObjects.ForEach(o => o.Create(connection));
+                        }
                     }
                 }
+                catch
+                {
+                    Dispose();
+                    throw;
+                }
             }
         }
 
@@ -162,13 +173,36 @@ public void Dispose()
         {
             if (DataTestUtility.IsEnclaveAzureDatabaseSetup())
             {
-                databaseObjects.Reverse();
+                // NOTE: Reverse a copy - reversing the field in place would restore creation order if
+                //   this ever ran twice, dropping the master key before the encryption key that depends
+                //   on it. Every drop is best-effort so that one failure cannot leak the rest.
+                List<DbObject> objectsToDrop = new List<DbObject>(databaseObjects);
+                objectsToDrop.Reverse();
+
                 foreach (string connStr in connStrings)
                 {
-                    using (SqlConnection sqlConnection = new SqlConnection(connStr))
+                    try
+                    {
+                        using (SqlConnection sqlConnection = new SqlConnection(connStr))
+                        {
+                            sqlConnection.Open();
+
+                            foreach (DbObject databaseObject in objectsToDrop)
+                            {
+                                try
+                                {
+                                    databaseObject.Drop(sqlConnection);
+                                }
+                                catch (Exception ex)
+                                {
+                                    Console.WriteLine($"{nameof(EnclaveAzureDatabaseTests)}: failed to drop '{databaseObject.Name}': {ex.Message}");
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
                     {
-                        sqlConnection.Open();
-                        databaseObjects.ForEach(o => o.Drop(sqlConnection));
+                        Console.WriteLine($"{nameof(EnclaveAzureDatabaseTests)}: cleanup connection failed: {ex.Message}");
                     }
                 }
             }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs
index 00e45951db..a7cac6b476 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ExceptionsGenericError.cs
@@ -3,7 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Data;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
@@ -116,64 +118,100 @@ public sealed class ExceptionGenericErrorFixture : IDisposable
         static public string encryptedTableName;
         static public string encryptedProcedureName;
 
+        private readonly List<IDisposable> _databaseObjects = new();
+        private readonly List<SqlConnection> _connections = new();
+
         public ExceptionGenericErrorFixture()
         {
             SqlConnection.ColumnEncryptionQueryMetadataCacheEnabled = false;
-            CreateAndPopulateSimpleTable();
+
+            // NOTE: If setup fails part way through, this constructor never returns, so xUnit never
+            //   calls Dispose and the objects created so far would be leaked. Their names embed a
+            //   GUID, so anything left behind stays in the shared test database forever.
+            try
+            {
+                CreateAndPopulateSimpleTable();
+            }
+            catch
+            {
+                Dispose();
+                throw;
+            }
         }
 
         private void CreateAndPopulateSimpleTable()
         {
             encryptedTableName = DatabaseHelper.GenerateUniqueName("encrypted");
             encryptedProcedureName = DatabaseHelper.GenerateUniqueName("encrypted");
+
+            // The same table and procedure name has to exist behind every AE connection string, so
+            //   the objects are created with an explicit name rather than a generated one, and the
+            //   connection each was created on is held open for the lifetime of the fixture.
             foreach (string connectionStr in DataTestUtility.AEConnStringsSetup)
             {
-                using (SqlConnection conn = CertificateUtility.GetOpenConnection(false, new SqlConnectionStringBuilder(connectionStr)))
+                SqlConnection conn = CertificateUtility.GetOpenConnection(false, new SqlConnectionStringBuilder(connectionStr));
+                _connections.Add(conn);
+
+                _databaseObjects.Add(Table.WithName(conn, encryptedTableName, "(c1 int)"));
+
+                using (SqlCommand cmdInsert = new SqlCommand($"insert into {encryptedTableName} values(1)", conn))
                 {
-                    using (SqlCommand cmdCreate = new SqlCommand($"create table {encryptedTableName}(c1 int)", conn))
-                    {
-                        cmdCreate.CommandType = CommandType.Text;
-                        cmdCreate.ExecuteNonQuery();
-                    }
-                    using (SqlCommand cmdInsert = new SqlCommand($"insert into {encryptedTableName} values(1)", conn))
-                    {
-                        cmdInsert.CommandType = CommandType.Text;
-                        cmdInsert.ExecuteNonQuery();
-                    }
-                    using (SqlCommand cmdCreateProc = new SqlCommand($"create procedure {encryptedProcedureName}(@c1 int) as insert into {encryptedTableName} values (@c1)", conn))
-                    {
-                        cmdCreateProc.CommandType = CommandType.Text;
-                        cmdCreateProc.ExecuteNonQuery();
-                    }
+                    cmdInsert.CommandType = CommandType.Text;
+                    cmdInsert.ExecuteNonQuery();
                 }
+
+                _databaseObjects.Add(StoredProcedure.WithName(
+                    conn, encryptedProcedureName, $"(@c1 int) as insert into {encryptedTableName} values (@c1)"));
             }
         }
 
         public void Dispose()
         {
             // Do NOT remove certificate for concurrent consistency. Certificates are used for other test cases as well.
-            foreach (string connectionStr in DataTestUtility.AEConnStringsSetup)
+
+            // Disposed in reverse creation order so that each procedure is dropped before the table
+            //   it writes into.
+            for (int i = _databaseObjects.Count - 1; i >= 0; i--)
             {
-                SqlConnectionStringBuilder sb = new SqlConnectionStringBuilder(connectionStr);
-                using (SqlConnection conn = CertificateUtility.GetOpenConnection(false, sb))
+                DisposeSafely(_databaseObjects[i]);
+            }
+            _databaseObjects.Clear();
+
+            foreach (SqlConnection conn in _connections)
+            {
+                DisposeSafely(conn);
+            }
+            _connections.Clear();
+
+            // Only use traceoff for non-sysadmin role accounts, Azure accounts does not have the permission.
+            if (DataTestUtility.IsNotAzureServer())
+            {
+                foreach (string connectionStr in DataTestUtility.AEConnStringsSetup)
                 {
-                    using (SqlCommand cmd = new SqlCommand($"drop table {encryptedTableName}", conn))
+                    try
                     {
-                        cmd.CommandType = CommandType.Text;
-                        cmd.ExecuteNonQuery();
-
-                        cmd.CommandText = $"drop procedure {encryptedProcedureName}";
-                        cmd.ExecuteNonQuery();
+                        CertificateUtility.ChangeServerTceSetting(true, new SqlConnectionStringBuilder(connectionStr));
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"{nameof(ExceptionGenericErrorFixture)}: failed to reset TCE setting: {ex.Message}");
                     }
                 }
+            }
+        }
 
-                // Only use traceoff for non-sysadmin role accounts, Azure accounts does not have the permission.
-                if (DataTestUtility.IsNotAzureServer())
-                {
-                    CertificateUtility.ChangeServerTceSetting(true, sb);
-                }
+        private static void DisposeSafely(IDisposable disposable)
+        {
+            try
+            {
+                disposable.Dispose();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"{nameof(ExceptionGenericErrorFixture)}: cleanup failed: {ex.Message}");
             }
         }
+
     }
 }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs
index f409a7db77..0ae70c5aca 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlNullValues.cs
@@ -7,6 +7,9 @@
 using System.Collections.Generic;
 using System.Data;
 using Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted.Setup;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
+// NOTE: Aliased because the AE test fixtures declare their own Table type alongside the shared one.
+using SetupTable = Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted.Setup.Table;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
@@ -16,6 +19,8 @@ public sealed class SqlNullValuesTests : IClassFixture<SQLSetupStrategyCertStore
     {
         private SQLSetupStrategy fixture;
         private readonly string tableName;
+        private readonly List<IDisposable> _databaseObjects = new();
+        private readonly List<SqlConnection> _connections = new();
         private string UdfName = DatabaseHelper.GenerateUniqueName("SqlNullValuesRetVal");
         private string UdfNameNotNull = DatabaseHelper.GenerateUniqueName("SqlNullValuesRetValNotNull");
 
@@ -26,35 +31,47 @@ public SqlNullValuesTests(SQLSetupStrategyCertStoreProvider context)
             // Disable the cache to avoid false failures.
             SqlConnection.ColumnEncryptionQueryMetadataCacheEnabled = false;
 
-            foreach (string connStr in DataTestUtility.AEConnStringsSetup)
+            // NOTE: If setup fails part way through, this constructor never returns, so xUnit never calls
+            //   Dispose and the functions created so far (whose names embed a GUID) would be leaked.
+            try
             {
-                // Insert data and create functions for SqlNullValues test.
-                using (SqlConnection sqlConnection = new SqlConnection(connStr))
+                foreach (string connStr in DataTestUtility.AEConnStringsSetup)
                 {
-                    sqlConnection.Open();
-
-                    using (SqlCommand cmd = new SqlCommand(string.Format("INSERT INTO [{0}] (c1) VALUES (@c1)", tableName), sqlConnection, null, SqlCommandColumnEncryptionSetting.Enabled))
+                    // Insert data and create functions for SqlNullValues test.
+                    using (SqlConnection sqlConnection = new SqlConnection(connStr))
                     {
-                        SqlParameter param = cmd.Parameters.Add("@c1", SqlDbType.Int);
-                        param.Value = DBNull.Value;
-                        cmd.ExecuteNonQuery();
+                        sqlConnection.Open();
 
-                        param.Value = 10;
-                        cmd.ExecuteNonQuery();
-                    }
+                        using (SqlCommand cmd = new SqlCommand(string.Format("INSERT INTO [{0}] (c1) VALUES (@c1)", tableName), sqlConnection, null, SqlCommandColumnEncryptionSetting.Enabled))
+                        {
+                            SqlParameter param = cmd.Parameters.Add("@c1", SqlDbType.Int);
+                            param.Value = DBNull.Value;
+                            cmd.ExecuteNonQuery();
 
-                    string sql1 = $"CREATE FUNCTION {UdfName}() RETURNS INT AS \n BEGIN \n RETURN (SELECT c1 FROM [{tableName}] WHERE c1 IS NULL)\n END";
-                    string sql2 = $"CREATE FUNCTION {UdfNameNotNull}() RETURNS INT AS \n BEGIN \n RETURN (SELECT c1 FROM [{tableName}] WHERE c1 IS NOT NULL)\n END";
-                    using (SqlCommand cmd = sqlConnection.CreateCommand())
-                    {
-                        cmd.CommandText = sql1;
-                        cmd.ExecuteNonQuery();
+                            param.Value = 10;
+                            cmd.ExecuteNonQuery();
+                        }
 
-                        cmd.CommandText = sql2;
-                        cmd.ExecuteNonQuery();
                     }
+
+                    // The same function names have to exist behind every AE connection string, so
+                    //   they are created with an explicit name rather than a generated one, and the
+                    //   connection each was created on is held open until cleanup.
+                    SqlConnection functionConnection = new SqlConnection(connStr);
+                    functionConnection.Open();
+                    _connections.Add(functionConnection);
+
+                    _databaseObjects.Add(ScalarFunction.WithName(functionConnection, UdfName,
+                        $"() RETURNS INT AS \n BEGIN \n RETURN (SELECT c1 FROM [{tableName}] WHERE c1 IS NULL)\n END"));
+                    _databaseObjects.Add(ScalarFunction.WithName(functionConnection, UdfNameNotNull,
+                        $"() RETURNS INT AS \n BEGIN \n RETURN (SELECT c1 FROM [{tableName}] WHERE c1 IS NOT NULL)\n END"));
                 }
             }
+            catch
+            {
+                Dispose();
+                throw;
+            }
         }
 
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.IsTargetReadyForAeWithKeyStore))]
@@ -156,15 +173,45 @@ public void NullValueTests(string connString, ConnStringColumnEncryptionSetting
 
         public void Dispose()
         {
+            for (int i = _databaseObjects.Count - 1; i >= 0; i--)
+            {
+                TryCleanup(_databaseObjects[i].Dispose);
+            }
+            _databaseObjects.Clear();
+
+            foreach (SqlConnection connection in _connections)
+            {
+                TryCleanup(connection.Dispose);
+            }
+            _connections.Clear();
+
             foreach (string connStrAE in DataTestUtility.AEConnStringsSetup)
             {
-                using (SqlConnection sqlConnection = new SqlConnection(connStrAE))
+                try
                 {
-                    sqlConnection.Open();
-                    Table.DeleteData(fixture.SqlNullValuesTable.Name, sqlConnection);
-                    DataTestUtility.DropFunction(sqlConnection, UdfName);
-                    DataTestUtility.DropFunction(sqlConnection, UdfNameNotNull);
+                    using (SqlConnection sqlConnection = new SqlConnection(connStrAE))
+                    {
+                        sqlConnection.Open();
+
+                        TryCleanup(() => SetupTable.DeleteData(fixture.SqlNullValuesTable.Name, sqlConnection));
+                    }
                 }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"{nameof(SqlNullValuesTests)}: cleanup connection failed: {ex.Message}");
+                }
+            }
+        }
+
+        private static void TryCleanup(Action cleanupAction)
+        {
+            try
+            {
+                cleanupAction();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"{nameof(SqlNullValuesTests)}: cleanup step failed: {ex.Message}");
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/ConversionTestFixture.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/ConversionTestFixture.cs
index abae589981..7b34a6314e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/ConversionTestFixture.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/ConversionTestFixture.cs
@@ -46,16 +46,38 @@ public ConversionTestFixture()
                 _columnMasterKey,
                 _certStoreProvider);
 
-            foreach (string connectionStr in DataTestUtility.AEConnStringsSetup)
+            // NOTE: If creation fails part way through (for example on the second connection string),
+            //   this constructor never returns, so xUnit never disposes the fixture and the keys
+            //   created so far would be leaked into the shared test database forever. Dispose
+            //   explicitly before rethrowing; the drops are guarded, so dropping a key that was
+            //   never created is a no-op.
+            try
             {
-                SqlConnectionStringBuilder connectionString = new SqlConnectionStringBuilder(connectionStr);
-                // The AE setup often fails with a connect timeout here; ensure a reasonable minimum.
-                connectionString.ConnectTimeout = Math.Max(connectionString.ConnectTimeout, 30);
+                foreach (string connectionStr in DataTestUtility.AEConnStringsSetup)
+                {
+                    SqlConnectionStringBuilder connectionString = new SqlConnectionStringBuilder(connectionStr);
+                    // The AE setup often fails with a connect timeout here; ensure a reasonable minimum.
+                    connectionString.ConnectTimeout = Math.Max(connectionString.ConnectTimeout, 30);
+
+                    using SqlConnection sqlConnection = new SqlConnection(connectionString.ConnectionString);
+                    sqlConnection.Open();
+                    _columnMasterKey.Create(sqlConnection);
+                    ColumnEncryptionKey.Create(sqlConnection);
+                }
+            }
+            catch
+            {
+                try
+                {
+                    Dispose();
+                }
+                catch (Exception disposeException)
+                {
+                    Console.WriteLine(
+                        $"ConversionTestFixture: cleanup after failed setup did not complete: {disposeException.Message}");
+                }
 
-                using SqlConnection sqlConnection = new SqlConnection(connectionString.ConnectionString);
-                sqlConnection.Open();
-                _columnMasterKey.Create(sqlConnection);
-                ColumnEncryptionKey.Create(sqlConnection);
+                throw;
             }
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategy.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategy.cs
index 9929db55d8..5cf8a7b22b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategy.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategy.cs
@@ -69,6 +69,38 @@ protected SQLSetupStrategy(string customKeyPath)
             ColumnMasterKeyPath = customKeyPath;
         }
 
+        /// <summary>
+        /// Runs the supplied setup action, disposing this fixture if the action throws.
+        /// </summary>
+        /// <remarks>
+        /// Derived types perform their setup from their constructors. When a constructor throws,
+        /// xUnit never receives the instance and therefore never disposes it, so every column master
+        /// key, column encryption key and table created before the failure would be leaked into the
+        /// (shared, long lived) test database. Because the object names embed a GUID, those leaks are
+        /// permanent and accumulate on every run, eventually exhausting SQL Server's per-database
+        /// object identifiers (error 3807).
+        /// </remarks>
+        protected void SetupOrCleanUp(Action setupAction)
+        {
+            try
+            {
+                setupAction();
+            }
+            catch
+            {
+                try
+                {
+                    Dispose();
+                }
+                catch (Exception disposeException)
+                {
+                    Console.WriteLine($"{GetType().Name}: cleanup after failed setup did not complete: {disposeException}");
+                }
+
+                throw;
+            }
+        }
+
         internal virtual void SetupDatabase()
         {
             foreach (string value in DataTestUtility.AEConnStringsSetup)
@@ -274,16 +306,48 @@ protected List<Table> CreateTables(IList<ColumnEncryptionKey> columnEncryptionKe
 
         protected override void Dispose(bool disposing)
         {
-            databaseObjects.Reverse();
-            foreach (string value in DataTestUtility.AEConnStringsSetup)
+            try
             {
-                using (SqlConnection sqlConnection = new SqlConnection(value))
+                foreach (string value in DataTestUtility.AEConnStringsSetup)
                 {
-                    sqlConnection.Open();
-                    databaseObjects.ForEach(o => o.Drop(sqlConnection));
+                    try
+                    {
+                        using (SqlConnection sqlConnection = new SqlConnection(value))
+                        {
+                            sqlConnection.Open();
+
+                            // NOTE: Objects are dropped in reverse creation order so that dependants
+                            //   (tables) are removed before their dependencies (keys). A local copy is
+                            //   reversed rather than the field itself, so that repeated disposal (which
+                            //   can happen when setup fails) does not restore the original order.
+                            List<DbObject> objectsToDrop = new List<DbObject>(databaseObjects);
+                            objectsToDrop.Reverse();
+
+                            foreach (DbObject databaseObject in objectsToDrop)
+                            {
+                                // Each drop is best-effort: one failure must not prevent the remaining
+                                // objects from being dropped, or the certificate from being removed.
+                                try
+                                {
+                                    databaseObject.Drop(sqlConnection);
+                                }
+                                catch (Exception ex)
+                                {
+                                    Console.WriteLine($"{GetType().Name}: failed to drop '{databaseObject.Name}': {ex.Message}");
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"{GetType().Name}: failed to clean up database objects: {ex.Message}");
+                    }
                 }
             }
-            base.Dispose(disposing);
+            finally
+            {
+                base.Dispose(disposing);
+            }
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyAzureKeyVault.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyAzureKeyVault.cs
index f1ebc3a93e..eac615af55 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyAzureKeyVault.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyAzureKeyVault.cs
@@ -35,8 +35,12 @@ public SQLSetupStrategyAzureKeyVault() : base()
             {
                 RegisterGlobalProviders(AkvStoreProvider);
             }
-            SetupAzureKeyVault();
-            SetupDatabase();
+
+            SetupOrCleanUp(() =>
+            {
+                SetupAzureKeyVault();
+                SetupDatabase();
+            });
         }
 
         public static void RegisterGlobalProviders(SqlColumnEncryptionAzureKeyVaultProvider akvProvider)
@@ -109,18 +113,39 @@ internal override void SetupDatabase()
 
         protected override void Dispose(bool disposing)
         {
-            base.Dispose(disposing);
-
-            foreach (string keyName in _akvKeyNames)
+            try
             {
-                try
-                {
-                    _keyClient.StartDeleteKey(keyName);
-                }
-                catch (Exception)
+                base.Dispose(disposing);
+            }
+            finally
+            {
+                foreach (string keyName in _akvKeyNames)
                 {
-                    continue;
+                    try
+                    {
+                        // NOTE: The deletion is awaited so that the key is actually removed before the
+                        //   process exits; StartDeleteKey only begins the (long running) operation.
+                        _keyClient.StartDeleteKey(keyName).WaitForCompletion();
+
+                        // A deleted key stays soft-deleted (still consuming its name and vault quota)
+                        // until purged. Purging is best-effort: the principal may lack permission, or
+                        // the vault may have purge protection enabled.
+                        try
+                        {
+                            _keyClient.PurgeDeletedKey(keyName);
+                        }
+                        catch (Exception ex)
+                        {
+                            Console.WriteLine($"{nameof(SQLSetupStrategyAzureKeyVault)}: failed to purge AKV key '{keyName}': {ex.Message}");
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"{nameof(SQLSetupStrategyAzureKeyVault)}: failed to delete AKV key '{keyName}': {ex.Message}");
+                    }
                 }
+
+                _akvKeyNames.Clear();
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyCertStoreProvider.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyCertStoreProvider.cs
index db935a5fed..eb2b6c3e32 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyCertStoreProvider.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SQLSetupStrategyCertStoreProvider.cs
@@ -16,7 +16,7 @@ public class SQLSetupStrategyCertStoreProvider : SQLSetupStrategy
         public SQLSetupStrategyCertStoreProvider() : base()
         {
             CertStoreProvider = new SqlColumnEncryptionCertificateStoreProvider();
-            SetupDatabase();
+            SetupOrCleanUp(SetupDatabase);
         }
 
         internal override void SetupDatabase()
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnEncryptionKey.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnEncryptionKey.cs
index f9b008ddbf..90379e7bbf 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnEncryptionKey.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnEncryptionKey.cs
@@ -43,12 +43,20 @@ WITH VALUES (
 
         public override void Drop(SqlConnection sqlConnection)
         {
-            string sql = $"DROP COLUMN ENCRYPTION KEY [{Name}]";
+            // NOTE: The drop is guarded so that cleanup is idempotent. An unguarded DROP throws when
+            //   the key was never created (for example when setup failed part way through), which
+            //   would abort the enclosing drop loop and leak every remaining object.
+            // NOTE: T-SQL cannot parameterize an identifier, so the name is parameterized in the
+            //   guard - where it is compared as a string - but must be interpolated into the DROP
+            //   itself. The interpolated identifier is bracket-quoted, and the value only ever
+            //   comes from the test's own generated name.
+            string sql = $"IF EXISTS (SELECT 1 FROM sys.column_encryption_keys WHERE name = @name) DROP COLUMN ENCRYPTION KEY [{Name}]";
 
             using (SqlCommand command = sqlConnection.CreateCommand())
             {
                 command.CommandText = sql;
                 command.CommandTimeout = 60;
+                command.Parameters.AddWithValue("@name", Name);
                 command.ExecuteNonQuery();
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnMasterKey.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnMasterKey.cs
index 2e8d67b95c..5de2bf4d1f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnMasterKey.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/ColumnMasterKey.cs
@@ -50,12 +50,20 @@ public override void Create(SqlConnection sqlConnection)
 
         public override void Drop(SqlConnection sqlConnection)
         {
-            string sql = $"DROP COLUMN MASTER KEY [{Name}];";
+            // NOTE: The drop is guarded so that cleanup is idempotent. An unguarded DROP throws when
+            //   the key was never created (for example when setup failed part way through), which
+            //   would abort the enclosing drop loop and leak every remaining object.
+            // NOTE: T-SQL cannot parameterize an identifier, so the name is parameterized in the
+            //   guard - where it is compared as a string - but must be interpolated into the DROP
+            //   itself. The interpolated identifier is bracket-quoted, and the value only ever
+            //   comes from the test's own generated name.
+            string sql = $"IF EXISTS (SELECT 1 FROM sys.column_master_keys WHERE name = @name) DROP COLUMN MASTER KEY [{Name}];";
 
             using (SqlCommand command = sqlConnection.CreateCommand())
             {
                 command.CommandText = sql;
                 command.CommandTimeout = 60;
+                command.Parameters.AddWithValue("@name", Name);
                 command.ExecuteNonQuery();
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/Table.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/Table.cs
index b18e5a0ae8..70def1b1d4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/Table.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/Table.cs
@@ -12,11 +12,23 @@ protected Table(string name) : base(name)
 
         public override void Drop(SqlConnection sqlConnection)
         {
-            string sql = $"DROP TABLE [{Name}];";
+            // NOTE: The drop is guarded so that cleanup is idempotent. An unguarded DROP throws when
+            //   the object was never created (for example when setup failed part way through), which
+            //   would abort the enclosing drop loop and leak every remaining object.
+            // NOTE: Both the lookup and the DROP are schema-qualified to [dbo] to match the CREATE
+            //   TABLE statements in the derived classes. An unqualified name resolves against the
+            //   connection's default schema, so if that is not dbo the guard would return NULL and
+            //   silently skip the drop, leaking the table.
+            // NOTE: T-SQL cannot parameterize an identifier, so the name is parameterized in the
+            //   guard - where it is compared as a string - but must be interpolated into the DROP
+            //   itself. The interpolated identifier is bracket-quoted, and the value only ever
+            //   comes from the test's own generated name.
+            string sql = $"IF (OBJECT_ID(@name) IS NOT NULL) DROP TABLE [dbo].[{Name}];";
 
             using (SqlCommand command = sqlConnection.CreateCommand())
             {
                 command.CommandText = sql;
+                command.Parameters.AddWithValue("@name", $"[dbo].[{Name}]");
                 command.ExecuteNonQuery();
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SqlSetupStrategyCspProvider.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SqlSetupStrategyCspProvider.cs
index 08cdfe48ec..da6b06d5d8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SqlSetupStrategyCspProvider.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/SqlSetupStrategyCspProvider.cs
@@ -27,7 +27,7 @@ public SQLSetupStrategyCspProvider(CspParameters cspParameters)
             _cspKeyParameters.Add(cspParameters);
 
             CspProvider = new SqlColumnEncryptionCspProvider();
-            SetupDatabase();
+            SetupOrCleanUp(SetupDatabase);
         }
 
         public SqlColumnEncryptionCspProvider CspProvider { get; }
@@ -50,28 +50,35 @@ internal override void SetupDatabase()
 
         protected override void Dispose(bool disposing)
         {
-            foreach (CspParameters cspParameters in _cspKeyParameters)
+            try
             {
-                try
+                foreach (CspParameters cspParameters in _cspKeyParameters)
                 {
-                    // Create a new instance of RSACryptoServiceProvider.  
-                    // Pass the CspParameters class to use the  
-                    // key in the container.
-                    using RSACryptoServiceProvider rsaAlg = new RSACryptoServiceProvider(cspParameters);
-
-                    // Delete the key entry in the container.
-                    rsaAlg.PersistKeyInCsp = false;
-
-                    // Call Clear to release resources and delete the key from the container.
-                    rsaAlg.Clear();
-                }
-                catch (Exception)
-                {
-                    continue;
+                    try
+                    {
+                        // Create a new instance of RSACryptoServiceProvider.  
+                        // Pass the CspParameters class to use the  
+                        // key in the container.
+                        using RSACryptoServiceProvider rsaAlg = new RSACryptoServiceProvider(cspParameters);
+
+                        // Delete the key entry in the container.
+                        rsaAlg.PersistKeyInCsp = false;
+
+                        // Call Clear to release resources and delete the key from the container.
+                        rsaAlg.Clear();
+                    }
+                    catch (Exception)
+                    {
+                        continue;
+                    }
                 }
-            }
 
-            base.Dispose(disposing);
+                _cspKeyParameters.Clear();
+            }
+            finally
+            {
+                base.Dispose(disposing);
+            }
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs
index fad361ff9e..5c8257999b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug84548.cs
@@ -4,6 +4,7 @@
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,73 +17,57 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string targettable = DataTestUtility.GetShortName("SqlBulkCopyTest_Bug84548", false);
-            string targetCustomerTable = targettable + "_customer";
 
-            using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
-            {
-                dstConn.Open();
-                try
-                {
-                    Helpers.TryExecute(dstCmd, "CREATE TABLE [" + targetCustomerTable + "] ([CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, CONSTRAINT [PK_" + targetCustomerTable + "] PRIMARY KEY CLUSTERED (CustomerID) ON [PRIMARY]) ON [PRIMARY]");
+            using SqlConnection dstConn = new SqlConnection(dstConstr);
+            dstConn.Open();
 
-                    Helpers.TryExecute(dstCmd,
-                        "CREATE TABLE [" + targettable + "] ([OrderID] [int] NOT NULL , " +
-                        " [CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NULL , " +
-                        " CONSTRAINT [PK_" + targettable + "] PRIMARY KEY  CLUSTERED " +
-                        " (" +
-                        "  [OrderID]" +
-                        " )  ON [PRIMARY] ," +
-                        " CONSTRAINT [FK_" + targettable + "_Customers] FOREIGN KEY " +
-                        " (" +
-                        "  [CustomerID]" +
-                        " ) REFERENCES [" + targetCustomerTable + "] (" +
-                        " [CustomerID]" +
-                        " )" +
-                        ") ON [PRIMARY]");
+            // The order table takes a foreign key on the customer table, so it must be dropped first.
+            // Disposal runs in reverse declaration order, which gives that for free.
+            using Table customerTable = new Table(dstConn, "SqlBulkCopyTest_Bug84548_customer",
+                "([CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,"
+                    + " PRIMARY KEY CLUSTERED (CustomerID) ON [PRIMARY]) ON [PRIMARY]");
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    {
-                        srcConn.Open();
+            using Table orderTable = new Table(dstConn, "SqlBulkCopyTest_Bug84548",
+                "([OrderID] [int] NOT NULL,"
+                    + " [CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,"
+                    + " PRIMARY KEY CLUSTERED ([OrderID]) ON [PRIMARY],"
+                    + $" FOREIGN KEY ([CustomerID]) REFERENCES {customerTable.Name} ([CustomerID])"
+                    + ") ON [PRIMARY]");
 
-                        // First copy the customer ID list across
-                        SqlCommand customerCommand = new SqlCommand("SELECT CustomerID from Customers", srcConn);
-                        using (DbDataReader reader = customerCommand.ExecuteReader())
-                        {
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = targetCustomerTable;
-                                bulkcopy.WriteToServer(reader);
-                            }
-                        }
+            using (SqlConnection srcConn = new SqlConnection(srcConstr))
+            {
+                srcConn.Open();
 
-                        SqlCommand srcCmd = new SqlCommand("select OrderID, CustomerID from Orders where OrderId = 10643", srcConn);
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        {
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = targettable;
-                                SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                // First copy the customer ID list across
+                using SqlCommand customerCommand = new SqlCommand("SELECT CustomerID from Customers", srcConn);
+                using (DbDataReader reader = customerCommand.ExecuteReader())
+                {
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                    {
+                        bulkcopy.DestinationTableName = customerTable.Name;
+                        bulkcopy.WriteToServer(reader);
+                    }
+                }
 
-                                ColumnMappings.Add("OrderID", "OrderID");
-                                ColumnMappings.Add("CustomerID", "CustomerID");
+                using SqlCommand srcCmd = new SqlCommand("select OrderID, CustomerID from Orders where OrderId = 10643", srcConn);
+                using (DbDataReader reader = srcCmd.ExecuteReader())
+                {
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                    {
+                        bulkcopy.DestinationTableName = orderTable.Name;
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                                bulkcopy.WriteToServer(reader);
+                        ColumnMappings.Add("OrderID", "OrderID");
+                        ColumnMappings.Add("CustomerID", "CustomerID");
 
-                                DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 1, "Unexpected number of rows.");
-                            }
-                        }
+                        bulkcopy.WriteToServer(reader);
+
+                        DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 1, "Unexpected number of rows.");
                     }
-                    Helpers.VerifyResults(dstConn, targettable, 2, 1);
-                }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + targettable);
-                    Helpers.TryExecute(dstCmd, "drop table " + targetCustomerTable);
                 }
             }
+
+            Helpers.VerifyResults(dstConn, orderTable.Name, 2, 1);
         }
     }
 }
-
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs
index b3de348137..53501c3819 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug85007.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,99 +17,90 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Bug85007", false);
-            string targetCustomerTable = dstTable + "_customer";
-
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
-                {
-                    Helpers.TryExecute(dstCmd, "CREATE TABLE [" + targetCustomerTable + "] ([CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, CONSTRAINT [PK_" + targetCustomerTable + "] PRIMARY KEY CLUSTERED (CustomerID) ON [PRIMARY]) ON [PRIMARY]");
+                // Declared before the order table so it is dropped last: the order table holds a
+                //   foreign key referencing it.
+                using Table targetCustomerTable = new(dstConn, "SqlBulkCopyTest_Bug85007_customer",
+                    "([CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, PRIMARY KEY CLUSTERED (CustomerID) ON [PRIMARY]) ON [PRIMARY]");
 
-                    Helpers.TryExecute(dstCmd,
-                        "CREATE TABLE [" + dstTable + "] (" +
-                        "    [OrderID] [int] IDENTITY (1, 1) NOT NULL ," +
-                        "    [CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
-                        "    [EmployeeID] [int] NULL ," +
-                        "    [OrderDate] [datetime] NULL ," +
-                        "    [RequiredDate] [datetime] NULL ," +
-                        "    [ShippedDate] [datetime] NULL ," +
-                        "    [ShipVia] [int] NULL ," +
-                        "    [Freight] [money] NULL CONSTRAINT [DF_" + dstTable + "_Freight] DEFAULT (0)," +
-                        "    [ShipName] [nvarchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
-                        "    [ShipAddress] [nvarchar] (60) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
-                        "    [ShipCity] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
-                        "    [ShipRegion] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
-                        "    [ShipPostalCode] [nvarchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
-                        "    [ShipCountry] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
-                        "    CONSTRAINT [PK_" + dstTable + "] PRIMARY KEY  CLUSTERED " +
-                        "    (" +
-                        "        [OrderID]" +
-                        "    )  ON [PRIMARY] ," +
-                        "    CONSTRAINT [FK_" + dstTable + "_Customers] FOREIGN KEY " +
-                        "    (" +
-                        "        [CustomerID]" +
-                        "    ) REFERENCES [" + targetCustomerTable + "] (" +
-                        "        [CustomerID]" +
-                        "    )" +
-                        ") ON [PRIMARY]");
+                using Table dstTable = new(dstConn, "SqlBulkCopyTest_Bug85007",
+                "(" +
+                "    [OrderID] [int] IDENTITY (1, 1) NOT NULL ," +
+                "    [CustomerID] [nchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
+                "    [EmployeeID] [int] NULL ," +
+                "    [OrderDate] [datetime] NULL ," +
+                "    [RequiredDate] [datetime] NULL ," +
+                "    [ShippedDate] [datetime] NULL ," +
+                "    [ShipVia] [int] NULL ," +
+                "    [Freight] [money] NULL DEFAULT (0)," +
+                "    [ShipName] [nvarchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
+                "    [ShipAddress] [nvarchar] (60) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
+                "    [ShipCity] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
+                "    [ShipRegion] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
+                "    [ShipPostalCode] [nvarchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
+                "    [ShipCountry] [nvarchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ," +
+                "    PRIMARY KEY  CLUSTERED " +
+                "    (" +
+                "        [OrderID]" +
+                "    )  ON [PRIMARY] ," +
+                "    FOREIGN KEY " +
+                "    (" +
+                "        [CustomerID]" +
+                "    ) REFERENCES " + targetCustomerTable.Name + " (" +
+                "        [CustomerID]" +
+                "    )" +
+                ") ON [PRIMARY]");
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand customerCmd = new SqlCommand("SELECT CustomerID from Customers", srcConn))
-                    {
-                        srcConn.Open();
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand customerCmd = new SqlCommand("SELECT CustomerID from Customers", srcConn))
+                {
+                    srcConn.Open();
 
-                        // First copy the customer ID list across
-                        using (DbDataReader reader = customerCmd.ExecuteReader())
+                    // First copy the customer ID list across
+                    using (DbDataReader reader = customerCmd.ExecuteReader())
+                    {
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                         {
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = targetCustomerTable;
-                                bulkcopy.WriteToServer(reader);
-                            }
+                            bulkcopy.DestinationTableName = targetCustomerTable.Name;
+                            bulkcopy.WriteToServer(reader);
                         }
+                    }
 
-                        SqlCommand srcCmd = new SqlCommand("select * from orders", srcConn);
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        {
+                    using SqlCommand srcCmd = new SqlCommand("select * from orders", srcConn);
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    {
 
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = dstTable;
-                                bulkcopy.BatchSize = 6;
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                        {
+                            bulkcopy.DestinationTableName = dstTable.Name;
+                            bulkcopy.BatchSize = 6;
 
-                                SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                                ColumnMappings.Add("OrderID", "OrderID");
-                                ColumnMappings.Add("CustomerID", "CustomerID");
-                                ColumnMappings.Add("EmployeeID", "EmployeeID");
-                                ColumnMappings.Add("RequiredDate", "RequiredDate");
-                                ColumnMappings.Add("ShippedDate", "ShippedDate");
-                                ColumnMappings.Add("ShipVia", "ShipVia");
-                                ColumnMappings.Add("Freight", "Freight");
-                                ColumnMappings.Add("ShipName", "ShipName");
-                                ColumnMappings.Add("ShipAddress", "ShipAddress");
-                                ColumnMappings.Add("ShipCity", "ShipCity");
-                                ColumnMappings.Add("ShipRegion", "ShipRegion");
-                                ColumnMappings.Add("ShipPostalCode", "ShipPostalCode");
-                                ColumnMappings.Add("ShipCountry", "ShipCountry");
+                            ColumnMappings.Add("OrderID", "OrderID");
+                            ColumnMappings.Add("CustomerID", "CustomerID");
+                            ColumnMappings.Add("EmployeeID", "EmployeeID");
+                            ColumnMappings.Add("RequiredDate", "RequiredDate");
+                            ColumnMappings.Add("ShippedDate", "ShippedDate");
+                            ColumnMappings.Add("ShipVia", "ShipVia");
+                            ColumnMappings.Add("Freight", "Freight");
+                            ColumnMappings.Add("ShipName", "ShipName");
+                            ColumnMappings.Add("ShipAddress", "ShipAddress");
+                            ColumnMappings.Add("ShipCity", "ShipCity");
+                            ColumnMappings.Add("ShipRegion", "ShipRegion");
+                            ColumnMappings.Add("ShipPostalCode", "ShipPostalCode");
+                            ColumnMappings.Add("ShipCountry", "ShipCountry");
 
-                                bulkcopy.WriteToServer(reader);
+                            bulkcopy.WriteToServer(reader);
 
-                                DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 830, "Unexpected number of rows.");
-                            }
-                            Helpers.VerifyResults(dstConn, dstTable, 14, 830);
+                            DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 830, "Unexpected number of rows.");
                         }
+                        Helpers.VerifyResults(dstConn, dstTable.Name, 14, 830);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                    Helpers.TryExecute(dstCmd, "drop table " + targetCustomerTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs
index d720fd9ebc..d07f9d8cac 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug903514.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,25 +17,13 @@ public class Bug903514
         public void Test()
         {
             string constr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Bug903514", false);
-            using (SqlConnection dstConn = new SqlConnection(constr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
-            {
-                dstConn.Open();
-
-                Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 varchar(7000))");
-            }
+            using SqlConnection dstConn = new SqlConnection(constr);
+            dstConn.Open();
 
-            DoBulkCopy(constr, dstTable, 2);
-            DoBulkCopy(constr, dstTable, 0);
+            using Table dstTable = new(dstConn, "SqlBulkCopyTest_Bug903514", "(col1 int, col2 varchar(7000))");
 
-            using (SqlConnection dstConn = new SqlConnection(constr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
-            {
-                dstConn.Open();
-
-                Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-            }
+            DoBulkCopy(constr, dstTable.Name, 2);
+            DoBulkCopy(constr, dstTable.Name, 0);
         }
 
         private static void DoBulkCopy(string dstConstr, string dstTable, int timeout)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs
index f611e2e3b1..f9764b8de4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Bug98182.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -19,51 +20,38 @@ public void Test()
             string srctable = "[" + dstTable + " src]";
             dstTable = "[" + dstTable + "]";
 
-            string[] epilogue = {
-                "create table " + srctable + "([col 1] int primary key, [col 2] text)",
-                "insert into " + srctable + " values (33, 'Michael')",
-                "create table " + dstTable + "([col 1] int primary key, [col 2] text)",
-            };
-            string[] prologue = {
-                "drop table  " + srctable,
-                "drop table  " + dstTable,
-            };
-
             using (SqlConnection dstConn = new SqlConnection(constr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                try
+
+                using Table srcTableObject = Table.WithName(dstConn, srctable, "([col 1] int primary key, [col 2] text)");
+                using Table dstTableObject = Table.WithName(dstConn, dstTable, "([col 1] int primary key, [col 2] text)");
+
+                Helpers.TryExecute(dstCmd, "insert into " + srctable + " values (33, 'Michael')");
+
+                using (SqlConnection srcConn = new SqlConnection(constr))
+                using (SqlCommand srcCmd = new SqlCommand(string.Format("select * from {0} ", srctable), srcConn))
                 {
-                    Helpers.ProcessCommandBatch(typeof(SqlConnection), constr, epilogue);
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(constr))
-                    using (SqlCommand srcCmd = new SqlCommand(string.Format("select * from {0} ", srctable), srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
                     {
-                        srcConn.Open();
-
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                         {
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = dstTable;
+                            bulkcopy.DestinationTableName = dstTable;
 
-                                SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
-                                ColumnMappings.Add("[col 1]", "col 1");
-                                ColumnMappings.Add("col 2", "[col 2]");
+                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                            ColumnMappings.Add("[col 1]", "col 1");
+                            ColumnMappings.Add("col 2", "[col 2]");
 
-                                bulkcopy.WriteToServer(reader);
+                            bulkcopy.WriteToServer(reader);
 
-                                DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 1, "Unexpected number of rows.");
-                            }
-                            Helpers.VerifyResults(dstConn, dstTable, 2, 1);
+                            DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 1, "Unexpected number of rows.");
                         }
+                        Helpers.VerifyResults(dstConn, dstTable, 2, 1);
                     }
                 }
-                finally
-                {
-                    Helpers.ProcessCommandBatch(typeof(SqlConnection), constr, prologue);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs
index 7443a99734..dc72a41a14 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CacheMetadata.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -6,6 +6,7 @@
 using System.Data;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -14,7 +15,7 @@ namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
     public class CacheMetadata
     {
         private static readonly string sourceTable = "employees";
-        private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10))";
+        private static readonly string tableDefinition = "(col1 int, col2 nvarchar(20), col3 nvarchar(10))";
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
 
         // Test that CacheMetadata option works for multiple WriteToServer calls to the same table.
@@ -23,55 +24,46 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadata", false);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using SqlConnection dstConn = new(dstConstr);
             using SqlCommand dstCmd = dstConn.CreateCommand();
             dstConn.Open();
 
-            try
+            using Table dstTable = new(dstConn, "SqlBulkCopyTest_CacheMetadata", tableDefinition);
+
+            using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
+            bulkcopy.DestinationTableName = dstTable.Name;
+
+            // First WriteToServer: metadata is queried and cached.
+            using (SqlConnection srcConn = new(srcConstr))
+            {
+                srcConn.Open();
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = srcCmd.ExecuteReader();
+                bulkcopy.WriteToServer(reader);
+            }
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 5);
+
+            // Second WriteToServer: should reuse cached metadata.
+            using (SqlConnection srcConn = new(srcConstr))
             {
-                Helpers.TryExecute(dstCmd, initialQuery);
-
-                using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
-                bulkcopy.DestinationTableName = dstTable;
-
-                // First WriteToServer: metadata is queried and cached.
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    srcConn.Open();
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = srcCmd.ExecuteReader();
-                    bulkcopy.WriteToServer(reader);
-                }
-                Helpers.VerifyResults(dstConn, dstTable, 3, 5);
-
-                // Second WriteToServer: should reuse cached metadata.
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    srcConn.Open();
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = srcCmd.ExecuteReader();
-                    bulkcopy.WriteToServer(reader);
-                }
-                Helpers.VerifyResults(dstConn, dstTable, 3, 10);
-
-                // Third WriteToServer: should still reuse cached metadata.
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    srcConn.Open();
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = srcCmd.ExecuteReader();
-                    bulkcopy.WriteToServer(reader);
-                }
-                Helpers.VerifyResults(dstConn, dstTable, 3, 15);
+                srcConn.Open();
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = srcCmd.ExecuteReader();
+                bulkcopy.WriteToServer(reader);
             }
-            finally
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 10);
+
+            // Third WriteToServer: should still reuse cached metadata.
+            using (SqlConnection srcConn = new(srcConstr))
             {
-                Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+                srcConn.Open();
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = srcCmd.ExecuteReader();
+                bulkcopy.WriteToServer(reader);
             }
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 15);
         }
     }
 
@@ -79,7 +71,7 @@ public void Test()
     public class CacheMetadataInvalidate
     {
         private static readonly string sourceTable = "employees";
-        private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10))";
+        private static readonly string tableDefinition = "(col1 int, col2 nvarchar(20), col3 nvarchar(10))";
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
 
         // Test that ClearCachedMetadata forces a fresh metadata query.
@@ -88,47 +80,38 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataInvalidate", false);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using SqlConnection dstConn = new(dstConstr);
             using SqlCommand dstCmd = dstConn.CreateCommand();
             dstConn.Open();
 
-            try
+            using Table dstTable = new(dstConn, "SqlBulkCopyTest_CacheMetadataInvalidate", tableDefinition);
+
+            using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
+            bulkcopy.DestinationTableName = dstTable.Name;
+
+            // First WriteToServer: metadata is queried and cached.
+            using (SqlConnection srcConn = new(srcConstr))
             {
-                Helpers.TryExecute(dstCmd, initialQuery);
-
-                using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
-                bulkcopy.DestinationTableName = dstTable;
-
-                // First WriteToServer: metadata is queried and cached.
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    srcConn.Open();
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = srcCmd.ExecuteReader();
-                    bulkcopy.WriteToServer(reader);
-                }
-                Helpers.VerifyResults(dstConn, dstTable, 3, 5);
-
-                // Invalidate the cache and write again: should still succeed after re-querying metadata.
-                bulkcopy.ClearCachedMetadata();
-
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    srcConn.Open();
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = srcCmd.ExecuteReader();
-                    bulkcopy.WriteToServer(reader);
-                }
-                Helpers.VerifyResults(dstConn, dstTable, 3, 10);
+                srcConn.Open();
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = srcCmd.ExecuteReader();
+                bulkcopy.WriteToServer(reader);
             }
-            finally
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 5);
+
+            // Invalidate the cache and write again: should still succeed after re-querying metadata.
+            bulkcopy.ClearCachedMetadata();
+
+            using (SqlConnection srcConn = new(srcConstr))
             {
-                Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+                srcConn.Open();
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = srcCmd.ExecuteReader();
+                bulkcopy.WriteToServer(reader);
             }
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 10);
         }
     }
 
@@ -136,7 +119,7 @@ public void Test()
     public class CacheMetadataDestinationChange
     {
         private static readonly string sourceTable = "employees";
-        private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10))";
+        private static readonly string tableDefinition = "(col1 int, col2 nvarchar(20), col3 nvarchar(10))";
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
 
         // Test that changing DestinationTableName invalidates the cache and works correctly with a new table.
@@ -145,50 +128,38 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable1 = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataDstChange0", false);
-            string dstTable2 = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataDstChange1", false);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
-            string initialQuery1 = string.Format(initialQueryTemplate, dstTable1);
-            string initialQuery2 = string.Format(initialQueryTemplate, dstTable2);
 
             using SqlConnection dstConn = new(dstConstr);
             using SqlCommand dstCmd = dstConn.CreateCommand();
             dstConn.Open();
 
-            try
+            using Table dstTable1 = new(dstConn, "SqlBulkCopyTest_CacheMetadataDstChange0", tableDefinition);
+            using Table dstTable2 = new(dstConn, "SqlBulkCopyTest_CacheMetadataDstChange1", tableDefinition);
+
+            using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
+
+            // Write to first table.
+            bulkcopy.DestinationTableName = dstTable1.Name;
+            using (SqlConnection srcConn = new(srcConstr))
             {
-                Helpers.TryExecute(dstCmd, initialQuery1);
-                Helpers.TryExecute(dstCmd, initialQuery2);
-
-                using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
-
-                // Write to first table.
-                bulkcopy.DestinationTableName = dstTable1;
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    srcConn.Open();
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = srcCmd.ExecuteReader();
-                    bulkcopy.WriteToServer(reader);
-                }
-                Helpers.VerifyResults(dstConn, dstTable1, 3, 5);
-
-                // Change destination table: cache should be invalidated automatically.
-                bulkcopy.DestinationTableName = dstTable2;
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    srcConn.Open();
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = srcCmd.ExecuteReader();
-                    bulkcopy.WriteToServer(reader);
-                }
-                Helpers.VerifyResults(dstConn, dstTable2, 3, 5);
+                srcConn.Open();
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = srcCmd.ExecuteReader();
+                bulkcopy.WriteToServer(reader);
             }
-            finally
+            Helpers.VerifyResults(dstConn, dstTable1.Name, 3, 5);
+
+            // Change destination table: cache should be invalidated automatically.
+            bulkcopy.DestinationTableName = dstTable2.Name;
+            using (SqlConnection srcConn = new(srcConstr))
             {
-                Helpers.TryDropTable(dstConstr, dstTable1);
-                Helpers.TryDropTable(dstConstr, dstTable2);
+                srcConn.Open();
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = srcCmd.ExecuteReader();
+                bulkcopy.WriteToServer(reader);
             }
+            Helpers.VerifyResults(dstConn, dstTable2.Name, 3, 5);
         }
     }
 
@@ -196,7 +167,7 @@ public void Test()
     public class CacheMetadataWithoutFlag
     {
         private static readonly string sourceTable = "employees";
-        private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10))";
+        private static readonly string tableDefinition = "(col1 int, col2 nvarchar(20), col3 nvarchar(10))";
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
 
         // Test that without the CacheMetadata flag, multiple writes still work (no regression).
@@ -205,60 +176,49 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataNoFlag", false);
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using SqlConnection dstConn = new(dstConstr);
             using SqlCommand dstCmd = dstConn.CreateCommand();
             dstConn.Open();
 
-            try
+            using Table dstTable = new(dstConn, "SqlBulkCopyTest_CacheMetadataNoFlag", tableDefinition);
+
+            using SqlBulkCopy bulkcopy = new(dstConn);
+            bulkcopy.DestinationTableName = dstTable.Name;
+
+            // First WriteToServer without CacheMetadata.
+            using (SqlConnection srcConn = new(srcConstr))
             {
-                Helpers.TryExecute(dstCmd, initialQuery);
-
-                using SqlBulkCopy bulkcopy = new(dstConn);
-                bulkcopy.DestinationTableName = dstTable;
-
-                // First WriteToServer without CacheMetadata.
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    srcConn.Open();
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = srcCmd.ExecuteReader();
-                    bulkcopy.WriteToServer(reader);
-                }
-                Helpers.VerifyResults(dstConn, dstTable, 3, 5);
-
-                // Second WriteToServer without CacheMetadata.
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    srcConn.Open();
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = srcCmd.ExecuteReader();
-                    bulkcopy.WriteToServer(reader);
-                }
-                Helpers.VerifyResults(dstConn, dstTable, 3, 10);
+                srcConn.Open();
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = srcCmd.ExecuteReader();
+                bulkcopy.WriteToServer(reader);
             }
-            finally
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 5);
+
+            // Second WriteToServer without CacheMetadata.
+            using (SqlConnection srcConn = new(srcConstr))
             {
-                Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+                srcConn.Open();
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = srcCmd.ExecuteReader();
+                bulkcopy.WriteToServer(reader);
             }
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 10);
         }
     }
 
     [Trait("Set", "2")]
     public class CacheMetadataWithDataTable
     {
-        private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(50), col3 nvarchar(50))";
+        private static readonly string tableDefinition = "(col1 int, col2 nvarchar(50), col3 nvarchar(50))";
 
         // Test that CacheMetadata works with DataTable source as well as IDataReader.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
         public void Test()
         {
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataDT", false);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using DataTable sourceData = new();
             sourceData.Columns.Add("col1", typeof(int));
@@ -272,32 +232,25 @@ public void Test()
             using SqlCommand dstCmd = dstConn.CreateCommand();
             dstConn.Open();
 
-            try
-            {
-                Helpers.TryExecute(dstCmd, initialQuery);
+            using Table dstTable = new(dstConn, "SqlBulkCopyTest_CacheMetadataDT", tableDefinition);
 
-                using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
-                bulkcopy.DestinationTableName = dstTable;
+            using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
+            bulkcopy.DestinationTableName = dstTable.Name;
 
-                // First WriteToServer with DataTable: metadata is queried and cached.
-                bulkcopy.WriteToServer(sourceData);
-                Helpers.VerifyResults(dstConn, dstTable, 3, 3);
+            // First WriteToServer with DataTable: metadata is queried and cached.
+            bulkcopy.WriteToServer(sourceData);
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 3);
 
-                // Second WriteToServer with DataTable: should reuse cached metadata.
-                bulkcopy.WriteToServer(sourceData);
-                Helpers.VerifyResults(dstConn, dstTable, 3, 6);
-            }
-            finally
-            {
-                Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-            }
+            // Second WriteToServer with DataTable: should reuse cached metadata.
+            bulkcopy.WriteToServer(sourceData);
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 6);
         }
     }
 
     [Trait("Set", "2")]
     public class CacheMetadataColumnMappingsChange
     {
-        private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(50), col3 nvarchar(50))";
+        private static readonly string tableDefinition = "(col1 int, col2 nvarchar(50), col3 nvarchar(50))";
 
         // Test that changing ColumnMappings between WriteToServer calls works correctly with CacheMetadata.
         // The cached metadata describes the destination table schema, not the column mappings,
@@ -306,8 +259,6 @@ public class CacheMetadataColumnMappingsChange
         public void Test()
         {
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataColMap", false);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using DataTable sourceData = new DataTable();
             sourceData.Columns.Add("id", typeof(int));
@@ -320,52 +271,45 @@ public void Test()
             using SqlCommand dstCmd = dstConn.CreateCommand();
             dstConn.Open();
 
-            try
+            using Table dstTable = new(dstConn, "SqlBulkCopyTest_CacheMetadataColMap", tableDefinition);
+
+            using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
+            bulkcopy.DestinationTableName = dstTable.Name;
+
+            // First write: map firstName -> col2, lastName -> col3.
+            bulkcopy.ColumnMappings.Add("id", "col1");
+            bulkcopy.ColumnMappings.Add("firstName", "col2");
+            bulkcopy.ColumnMappings.Add("lastName", "col3");
+            bulkcopy.WriteToServer(sourceData);
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 2);
+
+            // Verify first mapping: col2 should contain firstName values.
+            using (SqlCommand verifyCmd = new("select col2 from " + dstTable.Name + " where col1 = 1", dstConn))
             {
-                Helpers.TryExecute(dstCmd, initialQuery);
-
-                using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
-                bulkcopy.DestinationTableName = dstTable;
-
-                // First write: map firstName -> col2, lastName -> col3.
-                bulkcopy.ColumnMappings.Add("id", "col1");
-                bulkcopy.ColumnMappings.Add("firstName", "col2");
-                bulkcopy.ColumnMappings.Add("lastName", "col3");
-                bulkcopy.WriteToServer(sourceData);
-                Helpers.VerifyResults(dstConn, dstTable, 3, 2);
-
-                // Verify first mapping: col2 should contain firstName values.
-                using (SqlCommand verifyCmd = new("select col2 from " + dstTable + " where col1 = 1", dstConn))
-                {
-                    object result = verifyCmd.ExecuteScalar();
-                    Assert.Equal("Alice", result);
-                }
-
-                // Change mappings: swap col2 and col3 targets.
-                bulkcopy.ColumnMappings.Clear();
-                bulkcopy.ColumnMappings.Add("id", "col1");
-                bulkcopy.ColumnMappings.Add("firstName", "col3");
-                bulkcopy.ColumnMappings.Add("lastName", "col2");
-                bulkcopy.WriteToServer(sourceData);
-                Helpers.VerifyResults(dstConn, dstTable, 3, 4);
-
-                // Verify second mapping: col3 should now contain firstName values for the new rows.
-                using (SqlCommand verifyCmd = new("select col3 from " + dstTable + " where col1 = 1 order by col2", dstConn))
-                {
-                    using SqlDataReader reader = verifyCmd.ExecuteReader();
-
-                    // First row (from first write): col3 = "Smith" (lastName).
-                    Assert.True(reader.Read());
-                    Assert.Equal("Smith", reader.GetString(0));
-
-                    // Second row (from second write): col3 = "Alice" (firstName).
-                    Assert.True(reader.Read());
-                    Assert.Equal("Alice", reader.GetString(0));
-                }
+                object result = verifyCmd.ExecuteScalar();
+                Assert.Equal("Alice", result);
             }
-            finally
+
+            // Change mappings: swap col2 and col3 targets.
+            bulkcopy.ColumnMappings.Clear();
+            bulkcopy.ColumnMappings.Add("id", "col1");
+            bulkcopy.ColumnMappings.Add("firstName", "col3");
+            bulkcopy.ColumnMappings.Add("lastName", "col2");
+            bulkcopy.WriteToServer(sourceData);
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 4);
+
+            // Verify second mapping: col3 should now contain firstName values for the new rows.
+            using (SqlCommand verifyCmd = new("select col3 from " + dstTable.Name + " where col1 = 1 order by col2", dstConn))
             {
-                Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+                using SqlDataReader reader = verifyCmd.ExecuteReader();
+
+                // First row (from first write): col3 = "Smith" (lastName).
+                Assert.True(reader.Read());
+                Assert.Equal("Smith", reader.GetString(0));
+
+                // Second row (from second write): col3 = "Alice" (firstName).
+                Assert.True(reader.Read());
+                Assert.Equal("Alice", reader.GetString(0));
             }
         }
     }
@@ -373,7 +317,7 @@ public void Test()
     [Trait("Set", "2")]
     public class CacheMetadataColumnSubsetChange
     {
-        private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(50), col3 nvarchar(50))";
+        private static readonly string tableDefinition = "(col1 int, col2 nvarchar(50), col3 nvarchar(50))";
 
         // Test that mapping a subset of columns on the first call, then all columns on the
         // second call, works correctly with CacheMetadata. This verifies that null-pruning of
@@ -383,8 +327,6 @@ public class CacheMetadataColumnSubsetChange
         public void Test()
         {
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataSubset", false);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using DataTable sourceData = new DataTable();
             sourceData.Columns.Add("id", typeof(int));
@@ -397,39 +339,32 @@ public void Test()
             using SqlCommand dstCmd = dstConn.CreateCommand();
             dstConn.Open();
 
-            try
-            {
-                Helpers.TryExecute(dstCmd, initialQuery);
-
-                using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
-                bulkcopy.DestinationTableName = dstTable;
-
-                // First write: map only col1 and col2 (col3 is unmatched and will be pruned).
-                bulkcopy.ColumnMappings.Add("id", "col1");
-                bulkcopy.ColumnMappings.Add("firstName", "col2");
-                bulkcopy.WriteToServer(sourceData);
-                Helpers.VerifyResults(dstConn, dstTable, 3, 2);
-
-                // Second write: map all three columns including col3.
-                // Without the clone fix, this would fail because col3 metadata was
-                // permanently nulled in the cache during the first call.
-                bulkcopy.ColumnMappings.Clear();
-                bulkcopy.ColumnMappings.Add("id", "col1");
-                bulkcopy.ColumnMappings.Add("firstName", "col2");
-                bulkcopy.ColumnMappings.Add("lastName", "col3");
-                bulkcopy.WriteToServer(sourceData);
-                Helpers.VerifyResults(dstConn, dstTable, 3, 4);
-
-                // Verify col3 has the expected data from the second write.
-                using (SqlCommand verifyCmd = new("select col3 from " + dstTable + " where col1 = 1 and col3 is not null", dstConn))
-                {
-                    object result = verifyCmd.ExecuteScalar();
-                    Assert.Equal("Smith", result);
-                }
-            }
-            finally
+            using Table dstTable = new(dstConn, "SqlBulkCopyTest_CacheMetadataSubset", tableDefinition);
+
+            using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
+            bulkcopy.DestinationTableName = dstTable.Name;
+
+            // First write: map only col1 and col2 (col3 is unmatched and will be pruned).
+            bulkcopy.ColumnMappings.Add("id", "col1");
+            bulkcopy.ColumnMappings.Add("firstName", "col2");
+            bulkcopy.WriteToServer(sourceData);
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 2);
+
+            // Second write: map all three columns including col3.
+            // Without the clone fix, this would fail because col3 metadata was
+            // permanently nulled in the cache during the first call.
+            bulkcopy.ColumnMappings.Clear();
+            bulkcopy.ColumnMappings.Add("id", "col1");
+            bulkcopy.ColumnMappings.Add("firstName", "col2");
+            bulkcopy.ColumnMappings.Add("lastName", "col3");
+            bulkcopy.WriteToServer(sourceData);
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 4);
+
+            // Verify col3 has the expected data from the second write.
+            using (SqlCommand verifyCmd = new("select col3 from " + dstTable.Name + " where col1 = 1 and col3 is not null", dstConn))
             {
-                Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+                object result = verifyCmd.ExecuteScalar();
+                Assert.Equal("Smith", result);
             }
         }
     }
@@ -438,7 +373,7 @@ public void Test()
     public class CacheMetadataAsync
     {
         private static readonly string sourceTable = "employees";
-        private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10))";
+        private static readonly string tableDefinition = "(col1 int, col2 nvarchar(20), col3 nvarchar(10))";
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
 
         // Test that CacheMetadata works correctly with WriteToServerAsync.
@@ -447,77 +382,66 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataAsync", false);
-            Task t = TestAsync(srcConstr, dstConstr, dstTable);
+            Task t = TestAsync(srcConstr, dstConstr);
             t.Wait();
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
-        private static async Task TestAsync(string srcConstr, string dstConstr, string dstTable)
+        private static async Task TestAsync(string srcConstr, string dstConstr)
         {
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using SqlConnection dstConn = new(dstConstr);
             using SqlCommand dstCmd = dstConn.CreateCommand();
             dstConn.Open();
 
-            try
+            using Table dstTable = new(dstConn, "SqlBulkCopyTest_CacheMetadataAsync", tableDefinition);
+
+            using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
+            bulkcopy.DestinationTableName = dstTable.Name;
+
+            // First WriteToServerAsync: metadata is queried and cached.
+            using (SqlConnection srcConn = new(srcConstr))
             {
-                Helpers.TryExecute(dstCmd, initialQuery);
-
-                using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata, null);
-                bulkcopy.DestinationTableName = dstTable;
-
-                // First WriteToServerAsync: metadata is queried and cached.
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    await srcConn.OpenAsync().ConfigureAwait(false);
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = await srcCmd.ExecuteReaderAsync().ConfigureAwait(false);
-                    await bulkcopy.WriteToServerAsync(reader).ConfigureAwait(false);
-                }
-                Helpers.VerifyResults(dstConn, dstTable, 3, 5);
-
-                // Second WriteToServerAsync: should reuse cached metadata.
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    await srcConn.OpenAsync().ConfigureAwait(false);
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = await srcCmd.ExecuteReaderAsync().ConfigureAwait(false);
-                    await bulkcopy.WriteToServerAsync(reader).ConfigureAwait(false);
-                }
-                Helpers.VerifyResults(dstConn, dstTable, 3, 10);
-
-                // Third WriteToServerAsync: should still reuse cached metadata.
-                using (SqlConnection srcConn = new(srcConstr))
-                {
-                    await srcConn.OpenAsync().ConfigureAwait(false);
-                    using SqlCommand srcCmd = new(sourceQuery, srcConn);
-                    using IDataReader reader = await srcCmd.ExecuteReaderAsync().ConfigureAwait(false);
-                    await bulkcopy.WriteToServerAsync(reader).ConfigureAwait(false);
-                }
-                Helpers.VerifyResults(dstConn, dstTable, 3, 15);
+                await srcConn.OpenAsync().ConfigureAwait(false);
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = await srcCmd.ExecuteReaderAsync().ConfigureAwait(false);
+                await bulkcopy.WriteToServerAsync(reader).ConfigureAwait(false);
             }
-            finally
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 5);
+
+            // Second WriteToServerAsync: should reuse cached metadata.
+            using (SqlConnection srcConn = new(srcConstr))
+            {
+                await srcConn.OpenAsync().ConfigureAwait(false);
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = await srcCmd.ExecuteReaderAsync().ConfigureAwait(false);
+                await bulkcopy.WriteToServerAsync(reader).ConfigureAwait(false);
+            }
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 10);
+
+            // Third WriteToServerAsync: should still reuse cached metadata.
+            using (SqlConnection srcConn = new(srcConstr))
             {
-                Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+                await srcConn.OpenAsync().ConfigureAwait(false);
+                using SqlCommand srcCmd = new(sourceQuery, srcConn);
+                using IDataReader reader = await srcCmd.ExecuteReaderAsync().ConfigureAwait(false);
+                await bulkcopy.WriteToServerAsync(reader).ConfigureAwait(false);
             }
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 15);
         }
     }
 
     [Trait("Set", "2")]
     public class CacheMetadataCombinedWithKeepNulls
     {
-        private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(50) default 'DefaultVal', col3 nvarchar(50))";
+        private static readonly string tableDefinition = "(col1 int, col2 nvarchar(50) default 'DefaultVal', col3 nvarchar(50))";
 
         // Test that CacheMetadata works correctly when combined with other SqlBulkCopyOptions.
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
         public void Test()
         {
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CacheMetadataKeepNulls", false);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using DataTable sourceData = new();
             sourceData.Columns.Add("col1", typeof(int));
@@ -530,33 +454,26 @@ public void Test()
             using SqlCommand dstCmd = dstConn.CreateCommand();
             dstConn.Open();
 
-            try
-            {
-                Helpers.TryExecute(dstCmd, initialQuery);
+            using Table dstTable = new(dstConn, "SqlBulkCopyTest_CacheMetadataKeepNulls", tableDefinition);
 
-                using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata | SqlBulkCopyOptions.KeepNulls, null);
-                bulkcopy.DestinationTableName = dstTable;
-                bulkcopy.ColumnMappings.Add("col1", "col1");
-                bulkcopy.ColumnMappings.Add("col2", "col2");
-                bulkcopy.ColumnMappings.Add("col3", "col3");
+            using SqlBulkCopy bulkcopy = new(dstConn, SqlBulkCopyOptions.CacheMetadata | SqlBulkCopyOptions.KeepNulls, null);
+            bulkcopy.DestinationTableName = dstTable.Name;
+            bulkcopy.ColumnMappings.Add("col1", "col1");
+            bulkcopy.ColumnMappings.Add("col2", "col2");
+            bulkcopy.ColumnMappings.Add("col3", "col3");
 
-                // First write with CacheMetadata | KeepNulls.
-                bulkcopy.WriteToServer(sourceData);
-                Helpers.VerifyResults(dstConn, dstTable, 3, 2);
+            // First write with CacheMetadata | KeepNulls.
+            bulkcopy.WriteToServer(sourceData);
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 2);
 
-                // Verify nulls were kept (not replaced by default values).
-                using SqlCommand verifyCmd = new("select col2 from " + dstTable + " where col1 = 1", dstConn);
-                object result = verifyCmd.ExecuteScalar();
-                Assert.Equal(System.DBNull.Value, result);
+            // Verify nulls were kept (not replaced by default values).
+            using SqlCommand verifyCmd = new("select col2 from " + dstTable.Name + " where col1 = 1", dstConn);
+            object result = verifyCmd.ExecuteScalar();
+            Assert.Equal(System.DBNull.Value, result);
 
-                // Second write should reuse cached metadata.
-                bulkcopy.WriteToServer(sourceData);
-                Helpers.VerifyResults(dstConn, dstTable, 3, 4);
-            }
-            finally
-            {
-                Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-            }
+            // Second write should reuse cached metadata.
+            bulkcopy.WriteToServer(sourceData);
+            Helpers.VerifyResults(dstConn, dstTable.Name, 3, 4);
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs
index ede548f9cf..f99b37c98a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CheckConstraints.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -15,54 +16,44 @@ public class CheckConstraints
         public void Test()
         {
             string constr = DataTestUtility.TCPConnectionString;
-            string srctable = DataTestUtility.GetShortName("SqlBulkCopyTest_Extensionsrc", false);
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Extensiondst", false);
             using (SqlConnection dstConn = new SqlConnection(constr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                try
-                {
-                    // create the source table
-                    Helpers.TryExecute(dstCmd, "create table " + srctable + " (col1 int , col2 int, col3 text)");
-                    Helpers.TryExecute(dstCmd, "insert into " + srctable + " values (33, 498, 'Michael')");
-                    Helpers.TryExecute(dstCmd, "insert into " + srctable + " values (34, 499, 'Astrid')");
-                    Helpers.TryExecute(dstCmd, "insert into " + srctable + " values (65, 500, 'alles Käse')");
 
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int primary key, col2 int CONSTRAINT CK_" + dstTable + " CHECK (col2 < 500), col3 text)");
+                using Table srctable = new(dstConn, "SqlBulkCopyTest_Extensionsrc", "(col1 int , col2 int, col3 text)");
+                using Table dstTable = new(dstConn, "SqlBulkCopyTest_Extensiondst", "(col1 int primary key, col2 int CHECK (col2 < 500), col3 text)");
+
+                Helpers.TryExecute(dstCmd, "insert into " + srctable.Name + " values (33, 498, 'Michael')");
+                Helpers.TryExecute(dstCmd, "insert into " + srctable.Name + " values (34, 499, 'Astrid')");
+                Helpers.TryExecute(dstCmd, "insert into " + srctable.Name + " values (65, 500, 'alles Käse')");
 
-                    using (SqlConnection srcConn = new SqlConnection(constr))
-                    using (SqlCommand srcCmd = new SqlCommand("select * from " + srctable, srcConn))
+                using (SqlConnection srcConn = new SqlConnection(constr))
+                using (SqlCommand srcCmd = new SqlCommand("select * from " + srctable.Name, srcConn))
+                {
+                    srcConn.Open();
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
                     {
-                        srcConn.Open();
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                        try
                         {
-                            try
+                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.CheckConstraints, null))
                             {
-                                using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.CheckConstraints, null))
-                                {
-                                    bulkcopy.DestinationTableName = dstTable;
-                                    SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                                bulkcopy.DestinationTableName = dstTable.Name;
+                                SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                                    ColumnMappings.Add("col1", "col1");
-                                    ColumnMappings.Add("col2", "col2");
-                                    ColumnMappings.Add("col3", "col3");
-                                    bulkcopy.WriteToServer(reader);
-                                }
-                            }
-                            catch (SqlException sqlEx)
-                            {
-                                // Error 547 == The %ls statement conflicted with the %ls constraint "%.*ls".
-                                DataTestUtility.AssertEqualsWithDescription(547, sqlEx.Number, "Unexpected error number.");
+                                ColumnMappings.Add("col1", "col1");
+                                ColumnMappings.Add("col2", "col2");
+                                ColumnMappings.Add("col3", "col3");
+                                bulkcopy.WriteToServer(reader);
                             }
                         }
+                        catch (SqlException sqlEx)
+                        {
+                            // Error 547 == The %ls statement conflicted with the %ls constraint "%.*ls".
+                            DataTestUtility.AssertEqualsWithDescription(547, sqlEx.Number, "Unexpected error number.");
+                        }
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                    Helpers.TryExecute(dstCmd, "drop table " + srctable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs
index 4cffae2fb2..9ffebcd0a2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ColumnCollation.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -15,14 +16,12 @@ public class ColumnCollation
         public void Test()
         {
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_ColumnCollation", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                Helpers.TryExecute(dstCmd, "create table " + dstTable + " (name_jp varchar(20) collate Japanese_CI_AS, " +
-                    "name_ru varchar(20) collate Cyrillic_General_CI_AS)");
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_ColumnCollation",
+                    "(name_jp varchar(20) collate Japanese_CI_AS, name_ru varchar(20) collate Cyrillic_General_CI_AS)");
 
                 string s_jp = "江戸糸あやつり人形";
                 string s_ru = "проверка";
@@ -37,11 +36,11 @@ public void Test()
 
                 using (SqlBulkCopy bcp = new SqlBulkCopy(dstConn))
                 {
-                    bcp.DestinationTableName = dstTable;
+                    bcp.DestinationTableName = dstTable.Name;
                     bcp.WriteToServer(table);
                 }
 
-                using (SqlDataReader reader = (new SqlCommand("select * from  " + dstTable, dstConn)).ExecuteReader())
+                using (SqlDataReader reader = (new SqlCommand("select * from  " + dstTable.Name, dstConn)).ExecuteReader())
                 {
                     while (reader.Read())
                     {
@@ -54,16 +53,7 @@ public void Test()
                             "Unexpected value: " + reader["name_ru"]);
                     }
                 }
-
-            }
-
-            using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
-            {
-                dstConn.Open();
-                Helpers.TryExecute(dstCmd, "drop table " + dstTable);
             }
         }
-
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
index 7c82e6dd21..6113fadcb1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -6,6 +6,7 @@
 using System.Data.Common;
 using System.Diagnostics;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -13,73 +14,61 @@ namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
     [Trait("Set", "2")]
     public class CopyAllFromReader
     {
-        private static readonly string destinationTable = null;
         private static readonly string sourceTable = "employees";
-        private static readonly string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10))";
+        private const string TableDefinition = "(col1 int, col2 nvarchar(20), col3 nvarchar(10))";
         private static readonly string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
         public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopyAllFromReader", false);
             Debug.Assert((int)SqlBulkCopyOptions.UseInternalTransaction == 1 << 5, "Compiler screwed up the options");
 
-            dstTable = destinationTable != null ? destinationTable : dstTable;
-
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_CopyAllFromReader", TableDefinition);
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, initialQuery);
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
-                    {
-                        srcConn.Open();
+                    srcConn.Open();
 
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    {
+                        IDictionary stats;
+                        long expectedSelectCount = DataTestUtility.IsAzureSynapse ? 4 : 13;
+                        long expectedSelectRows = DataTestUtility.IsAzureSynapse ? 4 : 15;
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                         {
-                            IDictionary stats;
-                            long expectedSelectCount = DataTestUtility.IsAzureSynapse ? 4 : 13;
-                            long expectedSelectRows = DataTestUtility.IsAzureSynapse ? 4 : 15;
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = dstTable;
-                                dstConn.StatisticsEnabled = true;
-                                bulkcopy.WriteToServer(reader);
-                                dstConn.StatisticsEnabled = false;
-                                stats = dstConn.RetrieveStatistics();
-                            }
-                            Helpers.VerifyResults(dstConn, dstTable, 3, 5);
+                            bulkcopy.DestinationTableName = dstTable.Name;
+                            dstConn.StatisticsEnabled = true;
+                            bulkcopy.WriteToServer(reader);
+                            dstConn.StatisticsEnabled = false;
+                            stats = dstConn.RetrieveStatistics();
+                        }
+                        Helpers.VerifyResults(dstConn, dstTable.Name, 3, 5);
 
-                            Assert.True(0 < (long)stats["BytesReceived"], "BytesReceived is non-positive.");
-                            Assert.True(0 < (long)stats["BytesSent"], "BytesSent is non-positive.");
-                            DataTestUtility.AssertEqualsWithDescription((long)0, (long)stats["UnpreparedExecs"], "Non-zero UnpreparedExecs value: " + (long)stats["UnpreparedExecs"]);
-                            DataTestUtility.AssertEqualsWithDescription((long)0, (long)stats["PreparedExecs"], "Non-zero PreparedExecs value: " + (long)stats["PreparedExecs"]);
-                            DataTestUtility.AssertEqualsWithDescription((long)0, (long)stats["Prepares"], "Non-zero Prepares value: " + (long)stats["Prepares"]);
-                            DataTestUtility.AssertEqualsWithDescription((long)0, (long)stats["CursorOpens"], "Non-zero CursorOpens value: " + (long)stats["CursorOpens"]);
-                            DataTestUtility.AssertEqualsWithDescription((long)0, (long)stats["IduRows"], "Non-zero IduRows value: " + (long)stats["IduRows"]);
+                        Assert.True(0 < (long)stats["BytesReceived"], "BytesReceived is non-positive.");
+                        Assert.True(0 < (long)stats["BytesSent"], "BytesSent is non-positive.");
+                        DataTestUtility.AssertEqualsWithDescription((long)0, (long)stats["UnpreparedExecs"], "Non-zero UnpreparedExecs value: " + (long)stats["UnpreparedExecs"]);
+                        DataTestUtility.AssertEqualsWithDescription((long)0, (long)stats["PreparedExecs"], "Non-zero PreparedExecs value: " + (long)stats["PreparedExecs"]);
+                        DataTestUtility.AssertEqualsWithDescription((long)0, (long)stats["Prepares"], "Non-zero Prepares value: " + (long)stats["Prepares"]);
+                        DataTestUtility.AssertEqualsWithDescription((long)0, (long)stats["CursorOpens"], "Non-zero CursorOpens value: " + (long)stats["CursorOpens"]);
+                        DataTestUtility.AssertEqualsWithDescription((long)0, (long)stats["IduRows"], "Non-zero IduRows value: " + (long)stats["IduRows"]);
 
-                            DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersReceived"], "Unexpected BuffersReceived value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersSent"], "Unexpected BuffersSent value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)0, stats["IduCount"], "Unexpected IduCount value.");
-                            DataTestUtility.AssertEqualsWithDescription(expectedSelectCount, stats["SelectCount"], "Unexpected SelectCount value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)3, stats["ServerRoundtrips"], "Unexpected ServerRoundtrips value.");
-                            DataTestUtility.AssertEqualsWithDescription(expectedSelectRows, stats["SelectRows"], "Unexpected SelectRows value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)2, stats["SumResultSets"], "Unexpected SumResultSets value.");
-                            DataTestUtility.AssertEqualsWithDescription((long)0, stats["Transactions"], "Unexpected Transactions value.");
-                        }
+                        DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersReceived"], "Unexpected BuffersReceived value.");
+                        DataTestUtility.AssertEqualsWithDescription((long)3, stats["BuffersSent"], "Unexpected BuffersSent value.");
+                        DataTestUtility.AssertEqualsWithDescription((long)0, stats["IduCount"], "Unexpected IduCount value.");
+                        DataTestUtility.AssertEqualsWithDescription(expectedSelectCount, stats["SelectCount"], "Unexpected SelectCount value.");
+                        DataTestUtility.AssertEqualsWithDescription((long)3, stats["ServerRoundtrips"], "Unexpected ServerRoundtrips value.");
+                        DataTestUtility.AssertEqualsWithDescription(expectedSelectRows, stats["SelectRows"], "Unexpected SelectRows value.");
+                        DataTestUtility.AssertEqualsWithDescription((long)2, stats["SumResultSets"], "Unexpected SumResultSets value.");
+                        DataTestUtility.AssertEqualsWithDescription((long)0, stats["Transactions"], "Unexpected Transactions value.");
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs
index 78bc18f17a..0b731df803 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReader1.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,43 +17,34 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopyAllFromReader1", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                try
-                {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_CopyAllFromReader1", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 5 * from employees", srcConn))
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 5 * from employees", srcConn))
+                {
+                    srcConn.Open();
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
                     {
-                        srcConn.Open();
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                         {
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = dstTable;
-                                SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                            bulkcopy.DestinationTableName = dstTable.Name;
+                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                                ColumnMappings.Add("EmployeeID", "col1");
-                                ColumnMappings.Add("LastName", "col2");
-                                ColumnMappings.Add("FirstName", "col3");
+                            ColumnMappings.Add("EmployeeID", "col1");
+                            ColumnMappings.Add("LastName", "col2");
+                            ColumnMappings.Add("FirstName", "col3");
 
-                                bulkcopy.WriteToServer(reader);
+                            bulkcopy.WriteToServer(reader);
 
-                                DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 5, "Unexpected number of rows.");
-                                DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied64, (long)5, "Unexpected number of rows.");
-                            }
-                            Helpers.VerifyResults(dstConn, dstTable, 3, 5);
+                            DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 5, "Unexpected number of rows.");
+                            DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied64, (long)5, "Unexpected number of rows.");
                         }
+                        Helpers.VerifyResults(dstConn, dstTable.Name, 3, 5);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs
index d9cc530472..ba1c4f0bbf 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderAsync.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -18,56 +19,46 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest1", false);
             // Use this semaphore to ensure that results are written to the log in the correct order
             SemaphoreSlim outputSemaphore = new SemaphoreSlim(0, 1);
 
-            Task t = TestAsync(srcConstr, dstConstr, dstTable, outputSemaphore);
+            Task t = TestAsync(srcConstr, dstConstr, outputSemaphore);
             outputSemaphore.Release();
             t.Wait();
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
-        private static async Task TestAsync(string srcConstr, string dstConstr, string dstTable, SemaphoreSlim outputSemaphore)
+        private static async Task TestAsync(string srcConstr, string dstConstr, SemaphoreSlim outputSemaphore)
         {
-            string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10))";
             string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
             string srcTable = "employees";
 
             string sourceQuery = string.Format(sourceQueryTemplate, srcTable);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_AsyncTest1", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, initialQuery);
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
+                    srcConn.Open();
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
                     {
-                        srcConn.Open();
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                         {
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = dstTable;
+                            bulkcopy.DestinationTableName = dstTable.Name;
 
-                                await bulkcopy.WriteToServerAsync(reader);
-                                await outputSemaphore.WaitAsync();
+                            await bulkcopy.WriteToServerAsync(reader);
+                            await outputSemaphore.WaitAsync();
 
-                                DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 5, "Unexpected number of rows.");
-                                DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied64, (long)5, "Unexpected number of rows.");
-                            }
-                            Helpers.VerifyResults(dstConn, dstTable, 3, 5);
+                            DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied, 5, "Unexpected number of rows.");
+                            DataTestUtility.AssertEqualsWithDescription(bulkcopy.RowsCopied64, (long)5, "Unexpected number of rows.");
                         }
+                        Helpers.VerifyResults(dstConn, dstTable.Name, 3, 5);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs
index 4329f7f5f4..0ed67a7aba 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderCancelAsync.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -7,6 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -20,47 +21,37 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest5", false);
             cts = new CancellationTokenSource();
             cts.Cancel();
-            Task t = TestAsync(srcConstr, dstConstr, dstTable, cts.Token);
+            Task t = TestAsync(srcConstr, dstConstr, cts.Token);
             DataTestUtility.AssertThrowsInner<AggregateException, TaskCanceledException>(() => t.Wait());
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
-        private static async Task TestAsync(string srcConstr, string dstConstr, string dstTable, CancellationToken ctoken)
+        private static async Task TestAsync(string srcConstr, string dstConstr, CancellationToken ctoken)
         {
-            string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10))";
             string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
             string srcTable = "employees";
 
             string sourceQuery = string.Format(sourceQueryTemplate, srcTable);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_AsyncTest5", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, initialQuery);
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
-                    {
-                        srcConn.Open();
+                    srcConn.Open();
 
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                        {
-                            bulkcopy.DestinationTableName = dstTable;
-                            await bulkcopy.WriteToServerAsync(reader, ctoken);
-                        }
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                    {
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        await bulkcopy.WriteToServerAsync(reader, ctoken);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
 
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs
index 44b9c89dd7..daf14f4c95 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseAsync.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -6,6 +6,7 @@
 using System.Data.Common;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -18,46 +19,38 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest6", false);
-            Task t = TestAsync(srcConstr, dstConstr, dstTable);
+            Task t = TestAsync(srcConstr, dstConstr);
             DataTestUtility.AssertThrowsInner<AggregateException, InvalidOperationException>(() => t.Wait());
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
-        private static async Task TestAsync(string srcConstr, string dstConstr, string dstTable)
+        private static async Task TestAsync(string srcConstr, string dstConstr)
         {
-            string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10))";
+            string tableDefinition = "(col1 int, col2 nvarchar(20), col3 nvarchar(10))";
             string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
             string sourceTable = "employees";
 
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                try
+
+                using Table dstTable = new(dstConn, "SqlBulkCopyTest_AsyncTest6", tableDefinition);
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, initialQuery);
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
-                    {
-                        srcConn.Open();
+                    srcConn.Open();
 
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                        {
-                            bulkcopy.DestinationTableName = dstTable;
-                            dstConn.Close();
-                            await bulkcopy.WriteToServerAsync(reader);
-                        }
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                    {
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        dstConn.Close();
+                        await bulkcopy.WriteToServerAsync(reader);
                     }
                 }
-                finally
-                {
-                    Helpers.TryDropTable(dstConstr, dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
index b1a3397ba6..78e75a4f37 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyAllFromReaderConnectionCloseOnEventAsync.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -6,6 +6,7 @@
 using System.Data.Common;
 using System.IO;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -19,55 +20,47 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest7", false);
 #if DEBUG
-            string initialQueryTemplate = "create table {0} (col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 varchar(8000))";
+            string tableDefinition = "(col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 varchar(8000))";
             string sourceQuery = "select EmployeeID, LastName, FirstName, REPLICATE('a', 8000) from employees";
-            string initialQuery = string.Format(initialQueryTemplate, dstTable);
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+
+                using Table dstTable = new(dstConn, "SqlBulkCopyTest_AsyncTest7", tableDefinition);
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, initialQuery);
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
-                    {
-                        srcConn.Open();
+                    srcConn.Open();
 
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    {
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                         {
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = dstTable;
+                            bulkcopy.DestinationTableName = dstTable.Name;
 
-                                // Close the bulk copy's connection when it notifies us
-                                bulkcopy.NotifyAfter = 1;
-                                bulkcopy.SqlRowsCopied += (sender, e) =>
-                                {
-                                    dstConn.Close();
-                                };
+                            // Close the bulk copy's connection when it notifies us
+                            bulkcopy.NotifyAfter = 1;
+                            bulkcopy.SqlRowsCopied += (sender, e) =>
+                            {
+                                dstConn.Close();
+                            };
 
-                                using (AsyncDebugScope debugScope = new AsyncDebugScope())
-                                {
-                                    // Force all writes to pend, this will guarantee that we will go through the correct code path
-                                    debugScope.ForceAsyncWriteDelay = 1;
+                            using (AsyncDebugScope debugScope = new AsyncDebugScope())
+                            {
+                                // Force all writes to pend, this will guarantee that we will go through the correct code path
+                                debugScope.ForceAsyncWriteDelay = 1;
 
-                                    // Check that the copying fails
-                                    string message = string.Format(SystemDataResourceManager.Instance.ADP_OpenConnectionRequired, "WriteToServer", SystemDataResourceManager.Instance.ADP_ConnectionStateMsg_Closed);
-                                    DataTestUtility.AssertThrowsInnerWithAlternate<AggregateException, InvalidOperationException, IOException>(() => bulkcopy.WriteToServerAsync(reader).Wait(5000), innerExceptionMessage: message);
-                                }
+                                // Check that the copying fails
+                                string message = string.Format(SystemDataResourceManager.Instance.ADP_OpenConnectionRequired, "WriteToServer", SystemDataResourceManager.Instance.ADP_ConnectionStateMsg_Closed);
+                                DataTestUtility.AssertThrowsInnerWithAlternate<AggregateException, InvalidOperationException, IOException>(() => bulkcopy.WriteToServerAsync(reader).Wait(5000), innerExceptionMessage: message);
                             }
                         }
                     }
                 }
-                finally
-                {
-                    Helpers.TryDropTable(dstConstr, dstTable);
-                }
             }
 #endif
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs
index 043c0f75f5..7a670d207b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyMultipleReaders.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,53 +17,44 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopyMultipleReaders", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_CopyMultipleReaders", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = srcConn.CreateCommand())
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = srcConn.CreateCommand())
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                     {
-                        srcConn.Open();
-
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        srcCmd.CommandText = "select EmployeeID, LastName from employees where LastName < 'E%'";
+                        using (DbDataReader reader = srcCmd.ExecuteReader())
                         {
-                            bulkcopy.DestinationTableName = dstTable;
-                            srcCmd.CommandText = "select EmployeeID, LastName from employees where LastName < 'E%'";
-                            using (DbDataReader reader = srcCmd.ExecuteReader())
-                            {
-                                bulkcopy.WriteToServer(reader);
-                            }
-                            DataTestUtility.AssertEqualsWithDescription(0, bulkcopy.ColumnMappings.Count, "Unexpected ColumnMappings count.");
-
-                            srcCmd.CommandText = "select EmployeeID, LastName, FirstName from employees where LastName > 'D%'";
-                            using (DbDataReader reader = srcCmd.ExecuteReader())
-                            {
-                                bulkcopy.WriteToServer(reader);
-                            }
-                            DataTestUtility.AssertEqualsWithDescription(0, bulkcopy.ColumnMappings.Count, "Unexpected ColumnMappings count.");
+                            bulkcopy.WriteToServer(reader);
+                        }
+                        DataTestUtility.AssertEqualsWithDescription(0, bulkcopy.ColumnMappings.Count, "Unexpected ColumnMappings count.");
 
-                            srcCmd.CommandText = "select EmployeeID, FirstName from employees where LastName < 'E%'";
-                            using (DbDataReader reader = srcCmd.ExecuteReader())
-                            {
-                                bulkcopy.WriteToServer(reader);
-                            }
-                            DataTestUtility.AssertEqualsWithDescription(0, bulkcopy.ColumnMappings.Count, "Unexpected ColumnMappings count.");
+                        srcCmd.CommandText = "select EmployeeID, LastName, FirstName from employees where LastName > 'D%'";
+                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                        {
+                            bulkcopy.WriteToServer(reader);
+                        }
+                        DataTestUtility.AssertEqualsWithDescription(0, bulkcopy.ColumnMappings.Count, "Unexpected ColumnMappings count.");
 
-                            Helpers.VerifyResults(dstConn, dstTable, 3, 15);
+                        srcCmd.CommandText = "select EmployeeID, FirstName from employees where LastName < 'E%'";
+                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                        {
+                            bulkcopy.WriteToServer(reader);
                         }
+                        DataTestUtility.AssertEqualsWithDescription(0, bulkcopy.ColumnMappings.Count, "Unexpected ColumnMappings count.");
+
+                        Helpers.VerifyResults(dstConn, dstTable.Name, 3, 15);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs
index 324ddad5c8..55b7f34152 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatable.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,64 +17,56 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopySomeFromDataTable", false);
             DataSet dataset;
             SqlDataAdapter adapter;
             DataTable datatable;
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
-                {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 datetime)");
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select * from employees", srcConn))
-                    {
-                        srcConn.Open();
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_CopySomeFromDataTable", "(col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 datetime)");
 
-                        dataset = new DataSet("MyDataSet");
-                        adapter = new SqlDataAdapter(srcCmd);
-                        adapter.Fill(dataset);
-                        datatable = dataset.Tables[0];
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select * from employees", srcConn))
+                {
+                    srcConn.Open();
 
-                        string columnname;
+                    dataset = new DataSet("MyDataSet");
+                    adapter = new SqlDataAdapter(srcCmd);
+                    adapter.Fill(dataset);
+                    datatable = dataset.Tables[0];
 
-                        foreach (DataColumn column in datatable.Columns)
-                        {
-                            columnname = column.ColumnName;
-                        }
+                    string columnname;
 
-                        datatable.Rows[0].BeginEdit();
-                        datatable.Rows[0][0] = 333;
-                        datatable.Rows[0].EndEdit();
+                    foreach (DataColumn column in datatable.Columns)
+                    {
+                        columnname = column.ColumnName;
+                    }
 
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                        {
-                            bulkcopy.DestinationTableName = dstTable;
-                            bulkcopy.BatchSize = 7;
+                    datatable.Rows[0].BeginEdit();
+                    datatable.Rows[0][0] = 333;
+                    datatable.Rows[0].EndEdit();
 
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                    {
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        bulkcopy.BatchSize = 7;
 
-                            ColumnMappings.Add(0, "col1");
-                            ColumnMappings.Add(1, "col2");
-                            ColumnMappings.Add(2, "col3");
-                            bulkcopy.WriteToServer(datatable, DataRowState.Unchanged);
-                            datatable.Rows.GetEnumerator().Reset();
-                            bulkcopy.WriteToServer(datatable, DataRowState.Modified);
-                            datatable.Rows.GetEnumerator().Reset();
-                            bulkcopy.WriteToServer(datatable, DataRowState.Deleted);
-                            bulkcopy.Close();
-                        }
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                        Helpers.VerifyResults(dstConn, dstTable, 4, 18);
+                        ColumnMappings.Add(0, "col1");
+                        ColumnMappings.Add(1, "col2");
+                        ColumnMappings.Add(2, "col3");
+                        bulkcopy.WriteToServer(datatable, DataRowState.Unchanged);
+                        datatable.Rows.GetEnumerator().Reset();
+                        bulkcopy.WriteToServer(datatable, DataRowState.Modified);
+                        datatable.Rows.GetEnumerator().Reset();
+                        bulkcopy.WriteToServer(datatable, DataRowState.Deleted);
+                        bulkcopy.Close();
                     }
-                }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+
+                    Helpers.VerifyResults(dstConn, dstTable.Name, 4, 18);
                 }
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs
index 7a5eb6d8e7..65531fc03c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromDatatableAsync.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -18,69 +19,61 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest3", false);
             // Use this semaphore to ensure that results are written to the log in the correct order
             SemaphoreSlim outputSemaphore = new SemaphoreSlim(0, 1);
 
-            Task t = TestAsync(srcConstr, dstConstr, dstTable, outputSemaphore);
+            Task t = TestAsync(srcConstr, dstConstr, outputSemaphore);
             outputSemaphore.Release();
             t.Wait();
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
-        private static async Task TestAsync(string srcConstr, string dstConstr, string dstTable, SemaphoreSlim outputSemaphore)
+        private static async Task TestAsync(string srcConstr, string dstConstr, SemaphoreSlim outputSemaphore)
         {
             DataSet dataset;
             SqlDataAdapter adapter;
             DataTable datatable;
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
-                {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 datetime)");
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select * from employees", srcConn))
-                    {
-                        srcConn.Open();
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_AsyncTest3", "(col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 datetime)");
 
-                        dataset = new DataSet("MyDataSet");
-                        adapter = new SqlDataAdapter(srcCmd);
-                        adapter.Fill(dataset);
-                        datatable = dataset.Tables[0];
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select * from employees", srcConn))
+                {
+                    srcConn.Open();
 
-                        datatable.Rows[0].BeginEdit();
-                        datatable.Rows[0][0] = 333;
-                        datatable.Rows[0].EndEdit();
+                    dataset = new DataSet("MyDataSet");
+                    adapter = new SqlDataAdapter(srcCmd);
+                    adapter.Fill(dataset);
+                    datatable = dataset.Tables[0];
 
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                        {
-                            bulkcopy.DestinationTableName = dstTable;
-                            bulkcopy.BatchSize = 7;
+                    datatable.Rows[0].BeginEdit();
+                    datatable.Rows[0][0] = 333;
+                    datatable.Rows[0].EndEdit();
 
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                    {
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        bulkcopy.BatchSize = 7;
 
-                            ColumnMappings.Add(0, "col1");
-                            ColumnMappings.Add(1, "col2");
-                            ColumnMappings.Add(2, "col3");
-                            bulkcopy.WriteToServer(datatable, DataRowState.Unchanged);
-                            datatable.Rows.GetEnumerator().Reset();
-                            await bulkcopy.WriteToServerAsync(datatable, DataRowState.Modified);
-                            datatable.Rows.GetEnumerator().Reset();
-                            await bulkcopy.WriteToServerAsync(datatable, DataRowState.Deleted);
-                            bulkcopy.Close();
-                        }
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                        await outputSemaphore.WaitAsync();
-                        Helpers.VerifyResults(dstConn, dstTable, 4, 18);
+                        ColumnMappings.Add(0, "col1");
+                        ColumnMappings.Add(1, "col2");
+                        ColumnMappings.Add(2, "col3");
+                        bulkcopy.WriteToServer(datatable, DataRowState.Unchanged);
+                        datatable.Rows.GetEnumerator().Reset();
+                        await bulkcopy.WriteToServerAsync(datatable, DataRowState.Modified);
+                        datatable.Rows.GetEnumerator().Reset();
+                        await bulkcopy.WriteToServerAsync(datatable, DataRowState.Deleted);
+                        bulkcopy.Close();
                     }
-                }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+
+                    await outputSemaphore.WaitAsync();
+                    Helpers.VerifyResults(dstConn, dstTable.Name, 4, 18);
                 }
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs
index 9d52892baf..02d101f4e9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromReader.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,45 +17,36 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopySomeFromReader", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_CopySomeFromReader", "(col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 datetime)");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select * from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 datetime)");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select * from employees", srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
                     {
-                        srcConn.Open();
-
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                         {
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = dstTable;
-                                bulkcopy.BatchSize = 6;
+                            bulkcopy.DestinationTableName = dstTable.Name;
+                            bulkcopy.BatchSize = 6;
 
-                                SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                                ColumnMappings.Add("EmployeeID", "col1");
-                                ColumnMappings.Add("BirthDate", "col4");
-                                ColumnMappings.Add("FirstName", "col2");
-                                ColumnMappings.Add("LastName", "col3");
+                            ColumnMappings.Add("EmployeeID", "col1");
+                            ColumnMappings.Add("BirthDate", "col4");
+                            ColumnMappings.Add("FirstName", "col2");
+                            ColumnMappings.Add("LastName", "col3");
 
-                                bulkcopy.WriteToServer(reader);
-                            }
-                            Helpers.VerifyResults(dstConn, dstTable, 4, 9);
+                            bulkcopy.WriteToServer(reader);
                         }
+                        Helpers.VerifyResults(dstConn, dstTable.Name, 4, 9);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs
index be48bf4351..4e6aa12cda 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArray.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,55 +17,46 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopySomeFromRowArray", false);
             DataSet dataset;
             SqlDataAdapter adapter;
             DataTable datatable;
             DataRow[] rows;
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_CopySomeFromRowArray", "(col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 datetime)");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select * from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 datetime)");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select * from employees", srcConn))
+                    dataset = new DataSet("MyDataSet");
+                    adapter = new SqlDataAdapter(srcCmd);
+                    adapter.Fill(dataset);
+                    datatable = dataset.Tables[0];
+                    rows = new DataRow[datatable.Rows.Count];
+                    for (int i = 0; i < rows.Length; i++)
                     {
-                        srcConn.Open();
-
-                        dataset = new DataSet("MyDataSet");
-                        adapter = new SqlDataAdapter(srcCmd);
-                        adapter.Fill(dataset);
-                        datatable = dataset.Tables[0];
-                        rows = new DataRow[datatable.Rows.Count];
-                        for (int i = 0; i < rows.Length; i++)
-                        {
-                            rows[i] = datatable.Rows[i];
-                        }
+                        rows[i] = datatable.Rows[i];
+                    }
 
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                        {
-                            bulkcopy.DestinationTableName = dstTable;
-                            bulkcopy.BatchSize = 4;
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                    {
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        bulkcopy.BatchSize = 4;
 
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                            ColumnMappings.Add(0, "col1");
-                            ColumnMappings.Add(2, "col3");
+                        ColumnMappings.Add(0, "col1");
+                        ColumnMappings.Add(2, "col3");
 
-                            bulkcopy.WriteToServer(rows);
-                            bulkcopy.Close();
-                        }
-                        Helpers.VerifyResults(dstConn, dstTable, 4, 9);
+                        bulkcopy.WriteToServer(rows);
+                        bulkcopy.Close();
                     }
-                }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+                    Helpers.VerifyResults(dstConn, dstTable.Name, 4, 9);
                 }
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs
index b74144fc77..184e109c7f 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopySomeFromRowArrayAsync.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -18,17 +19,16 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest2", false);
             // Use this semaphore to ensure that results are written to the log in the correct order
             SemaphoreSlim outputSemaphore = new SemaphoreSlim(0, 1);
 
-            Task t = TestAsync(srcConstr, dstConstr, dstTable, outputSemaphore);
+            Task t = TestAsync(srcConstr, dstConstr, outputSemaphore);
             outputSemaphore.Release();
             t.Wait();
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
-        private static async Task TestAsync(string srcConstr, string dstConstr, string dstTable, SemaphoreSlim outputSemaphore)
+        private static async Task TestAsync(string srcConstr, string dstConstr, SemaphoreSlim outputSemaphore)
         {
             DataSet dataset;
             SqlDataAdapter adapter;
@@ -36,49 +36,41 @@ private static async Task TestAsync(string srcConstr, string dstConstr, string d
             DataRow[] rows;
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_AsyncTest2", "(col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 datetime)");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select * from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10), col4 datetime)");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select * from employees", srcConn))
+                    dataset = new DataSet("MyDataSet");
+                    adapter = new SqlDataAdapter(srcCmd);
+                    adapter.Fill(dataset);
+                    datatable = dataset.Tables[0];
+                    rows = new DataRow[datatable.Rows.Count];
+                    for (int i = 0; i < rows.Length; i++)
                     {
-                        srcConn.Open();
-
-                        dataset = new DataSet("MyDataSet");
-                        adapter = new SqlDataAdapter(srcCmd);
-                        adapter.Fill(dataset);
-                        datatable = dataset.Tables[0];
-                        rows = new DataRow[datatable.Rows.Count];
-                        for (int i = 0; i < rows.Length; i++)
-                        {
-                            rows[i] = datatable.Rows[i];
-                        }
+                        rows[i] = datatable.Rows[i];
+                    }
 
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                        {
-                            bulkcopy.DestinationTableName = dstTable;
-                            bulkcopy.BatchSize = 4;
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                    {
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        bulkcopy.BatchSize = 4;
 
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                            ColumnMappings.Add(0, "col1");
-                            ColumnMappings.Add(2, "col3");
+                        ColumnMappings.Add(0, "col1");
+                        ColumnMappings.Add(2, "col3");
 
-                            await bulkcopy.WriteToServerAsync(rows);
-                            bulkcopy.Close();
-                        }
-                        await outputSemaphore.WaitAsync();
-                        Helpers.VerifyResults(dstConn, dstTable, 4, 9);
+                        await bulkcopy.WriteToServerAsync(rows);
+                        bulkcopy.Close();
                     }
-                }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+                    await outputSemaphore.WaitAsync();
+                    Helpers.VerifyResults(dstConn, dstTable.Name, 4, 9);
                 }
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs
index d690f849ca..f0654c57a7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyVariants.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -15,68 +16,60 @@ public class CopyVariants
         public void Test()
         {
             string constr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Variants", false);
-            string[] prologue =
-            {
-                "create table " + dstTable + "_src (col_1 int primary key, col_2 sql_variant)",
-
-                "insert into " + dstTable + "_src values (0, null)",
-                "insert into " + dstTable + "_src values (1, convert(int, 0))",
-                "insert into " + dstTable + "_src values (2, convert(smallint, -32768))",
-                "insert into " + dstTable + "_src values (3, convert(real, 2.2))",
-                "insert into " + dstTable + "_src values (4, convert(float, -3303.33303))",
-                "insert into " + dstTable + "_src values (5, convert(decimal(28,4), 44404.4404))",
-                "insert into " + dstTable + "_src values (6, convert(money, $555505.5505) )",
-                "insert into " + dstTable + "_src values (7, convert(smallmoney, $-6.6606) )",
-                "insert into " + dstTable + "_src values (8, convert(bit, 1) )",
-                "insert into " + dstTable + "_src values (9, convert(tinyint, 8) )",
-                "insert into " + dstTable + "_src values (10, convert(uniqueidentifier, '00000000-0000-0000-0000-000000000009') )",
-                "insert into " + dstTable + "_src values (11, convert(varbinary(756), 0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0A) )",
-                "insert into " + dstTable + "_src values (12, convert(varchar(756), '111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101') )",
-                "insert into " + dstTable + "_src values (13, convert(nvarchar(756), N'???a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a?????') )",
-                "insert into " + dstTable + "_src values (14, convert(datetime, {ts '2003-01-11 12:54:01.133'}) )",
-                "insert into " + dstTable + "_src values (15, convert(bigint, 444444444444404) )",
-                "insert into " + dstTable + "_src values (16, convert(int, -555505) )",
-                "insert into " + dstTable + "_src values (17, convert(smallint, 16) )",
-                "insert into " + dstTable + "_src values (18, convert(real, 777707.7) )",
-                "insert into " + dstTable + "_src values (19, convert(float, -888888808.88018) )",
-                "insert into " + dstTable + "_src values (20, convert(decimal(28,4), 99999999999999999909.9019) )",
-
-                "create table " + dstTable + "_dst (col_1 int primary key, col_2 sql_variant)",
-            };
 
             using (SqlConnection dstConn = new SqlConnection(constr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table srcTable = new(dstConn, "SqlBulkCopyTest_Variants_src", "(col_1 int primary key, col_2 sql_variant)");
+                using Table dstTable = new(dstConn, "SqlBulkCopyTest_Variants_dst", "(col_1 int primary key, col_2 sql_variant)");
+
+                string[] prologue =
                 {
-                    foreach (string cmdtext in prologue)
-                    {
-                        Helpers.TryExecute(dstCmd, cmdtext);
-                    }
-                    using (SqlConnection srcConn = new SqlConnection(constr))
-                    using (SqlCommand srcCmd = new SqlCommand("select * from " + dstTable + "_src", srcConn))
-                    {
-                        srcConn.Open();
+                    "insert into " + srcTable.Name + " values (0, null)",
+                    "insert into " + srcTable.Name + " values (1, convert(int, 0))",
+                    "insert into " + srcTable.Name + " values (2, convert(smallint, -32768))",
+                    "insert into " + srcTable.Name + " values (3, convert(real, 2.2))",
+                    "insert into " + srcTable.Name + " values (4, convert(float, -3303.33303))",
+                    "insert into " + srcTable.Name + " values (5, convert(decimal(28,4), 44404.4404))",
+                    "insert into " + srcTable.Name + " values (6, convert(money, $555505.5505) )",
+                    "insert into " + srcTable.Name + " values (7, convert(smallmoney, $-6.6606) )",
+                    "insert into " + srcTable.Name + " values (8, convert(bit, 1) )",
+                    "insert into " + srcTable.Name + " values (9, convert(tinyint, 8) )",
+                    "insert into " + srcTable.Name + " values (10, convert(uniqueidentifier, '00000000-0000-0000-0000-000000000009') )",
+                    "insert into " + srcTable.Name + " values (11, convert(varbinary(756), 0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0A) )",
+                    "insert into " + srcTable.Name + " values (12, convert(varchar(756), '111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101') )",
+                    "insert into " + srcTable.Name + " values (13, convert(nvarchar(756), N'???a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a???????????????????????????????üböuaäZßABCÄboÜOUÖvrhÃã??z?????????????????z?????????A?????a?????') )",
+                    "insert into " + srcTable.Name + " values (14, convert(datetime, {ts '2003-01-11 12:54:01.133'}) )",
+                    "insert into " + srcTable.Name + " values (15, convert(bigint, 444444444444404) )",
+                    "insert into " + srcTable.Name + " values (16, convert(int, -555505) )",
+                    "insert into " + srcTable.Name + " values (17, convert(smallint, 16) )",
+                    "insert into " + srcTable.Name + " values (18, convert(real, 777707.7) )",
+                    "insert into " + srcTable.Name + " values (19, convert(float, -888888808.88018) )",
+                    "insert into " + srcTable.Name + " values (20, convert(decimal(28,4), 99999999999999999909.9019) )",
+
+                };
 
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                foreach (string cmdtext in prologue)
+                {
+                    Helpers.TryExecute(dstCmd, cmdtext);
+                }
+                using (SqlConnection srcConn = new SqlConnection(constr))
+                using (SqlCommand srcCmd = new SqlCommand("select * from " + srcTable.Name, srcConn))
+                {
+                    srcConn.Open();
+
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    {
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                         {
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = dstTable + "_dst";
-                                bulkcopy.WriteToServer(reader);
-                            }
-                            Helpers.VerifyResults(dstConn, dstTable + "_dst", 2, 21);
+                            bulkcopy.DestinationTableName = dstTable.Name;
+                            bulkcopy.WriteToServer(reader);
                         }
+                        Helpers.VerifyResults(dstConn, dstTable.Name, 2, 21);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable + "_src");
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable + "_dst");
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs
index fedfde00b9..80d51af2e8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -24,62 +25,53 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopyWithEvent", false);
             DataSet dataset;
             SqlDataAdapter adapter;
             DataTable datatable;
             DataRow[] rows;
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_CopyWithEvent", "(orderid int, customerid nchar(5), rdate datetime, freight money, shipname nvarchar(40))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 100 * from orders", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (orderid int, customerid nchar(5), rdate datetime, freight money, shipname nvarchar(40))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 100 * from orders", srcConn))
+                    dataset = new DataSet("MyDataSet");
+                    adapter = new SqlDataAdapter(srcCmd);
+                    adapter.Fill(dataset);
+                    datatable = dataset.Tables[0];
+                    rows = new DataRow[datatable.Rows.Count];
+                    for (int i = 0; i < rows.Length; i++)
                     {
-                        srcConn.Open();
-
-                        dataset = new DataSet("MyDataSet");
-                        adapter = new SqlDataAdapter(srcCmd);
-                        adapter.Fill(dataset);
-                        datatable = dataset.Tables[0];
-                        rows = new DataRow[datatable.Rows.Count];
-                        for (int i = 0; i < rows.Length; i++)
-                        {
-                            rows[i] = datatable.Rows[i];
-                        }
+                        rows[i] = datatable.Rows[i];
                     }
+                }
 
-                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                    {
+                using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                {
 
-                        bulkcopy.SqlRowsCopied += new SqlRowsCopiedEventHandler(OnRowCopied);
+                    bulkcopy.SqlRowsCopied += new SqlRowsCopiedEventHandler(OnRowCopied);
 
-                        bulkcopy.DestinationTableName = dstTable;
-                        bulkcopy.NotifyAfter = 50;
+                    bulkcopy.DestinationTableName = dstTable.Name;
+                    bulkcopy.NotifyAfter = 50;
 
-                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                    SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                        ColumnMappings.Add(0, "orderid");
-                        ColumnMappings.Add(1, "customerid");
-                        ColumnMappings.Add(4, "rdate");
-                        ColumnMappings.Add(7, "freight");
-                        ColumnMappings.Add(8, "shipname");
+                    ColumnMappings.Add(0, "orderid");
+                    ColumnMappings.Add(1, "customerid");
+                    ColumnMappings.Add(4, "rdate");
+                    ColumnMappings.Add(7, "freight");
+                    ColumnMappings.Add(8, "shipname");
 
-                        bulkcopy.WriteToServer(rows);
-                        bulkcopy.SqlRowsCopied -= new SqlRowsCopiedEventHandler(OnRowCopied);
-                    }
-                    Helpers.VerifyResults(dstConn, dstTable, 5, 100);
-                }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+                    bulkcopy.WriteToServer(rows);
+                    bulkcopy.SqlRowsCopied -= new SqlRowsCopiedEventHandler(OnRowCopied);
                 }
+                Helpers.VerifyResults(dstConn, dstTable.Name, 5, 100);
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs
index 4388594033..63adeb7f41 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEvent1.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -38,48 +39,39 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_CopyWithEvent1", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_CopyWithEvent1", "(orderid int, customerid nchar(5), rdate datetime, freight money, shipname nvarchar(40))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 100 * from orders", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (orderid int, customerid nchar(5), rdate datetime, freight money, shipname nvarchar(40))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 100 * from orders", srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, null))
                     {
-                        srcConn.Open();
-
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, null))
-                        {
-                            bulkcopy.SqlRowsCopied += new SqlRowsCopiedEventHandler(OnRowCopied);
+                        bulkcopy.SqlRowsCopied += new SqlRowsCopiedEventHandler(OnRowCopied);
 
-                            bulkcopy.DestinationTableName = dstTable;
-                            bulkcopy.NotifyAfter = 50;
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        bulkcopy.NotifyAfter = 50;
 
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                            ColumnMappings.Add("OrderID", "orderid");
-                            ColumnMappings.Add("CustomerID", "customerid");
-                            ColumnMappings.Add("RequiredDate", "rdate");
-                            ColumnMappings.Add("Freight", "freight");
-                            ColumnMappings.Add("ShipName", "shipname");
+                        ColumnMappings.Add("OrderID", "orderid");
+                        ColumnMappings.Add("CustomerID", "customerid");
+                        ColumnMappings.Add("RequiredDate", "rdate");
+                        ColumnMappings.Add("Freight", "freight");
+                        ColumnMappings.Add("ShipName", "shipname");
 
-                            bulkcopy.NotifyAfter = 3;
-                            DataTestUtility.AssertThrows<OperationAbortedException>(() => bulkcopy.WriteToServer(reader));
-                            bulkcopy.SqlRowsCopied -= new SqlRowsCopiedEventHandler(OnRowCopied);
-                            bulkcopy.Close();
-                        }
+                        bulkcopy.NotifyAfter = 3;
+                        DataTestUtility.AssertThrows<OperationAbortedException>(() => bulkcopy.WriteToServer(reader));
+                        bulkcopy.SqlRowsCopied -= new SqlRowsCopiedEventHandler(OnRowCopied);
+                        bulkcopy.Close();
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs
index f552b0610b..1428aa7683 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/CopyWithEventAsync.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -26,17 +27,16 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_AsyncTest4", false);
             // Use this semaphore to ensure that results are written to the log in the correct order
             SemaphoreSlim outputSemaphore = new SemaphoreSlim(0, 1);
 
-            Task t = TestAsync(srcConstr, dstConstr, dstTable, outputSemaphore);
+            Task t = TestAsync(srcConstr, dstConstr, outputSemaphore);
             outputSemaphore.Release();
             t.Wait();
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
-        private static async Task TestAsync(string srcConstr, string dstConstr, string dstTable, SemaphoreSlim outputSemaphore)
+        private static async Task TestAsync(string srcConstr, string dstConstr, SemaphoreSlim outputSemaphore)
         {
             DataSet dataset;
             SqlDataAdapter adapter;
@@ -44,56 +44,48 @@ private static async Task TestAsync(string srcConstr, string dstConstr, string d
             DataRow[] rows;
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_AsyncTest4", "(orderid int, customerid nchar(5), rdate datetime, freight money, shipname nvarchar(40))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 100 * from orders", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (orderid int, customerid nchar(5), rdate datetime, freight money, shipname nvarchar(40))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 100 * from orders", srcConn))
+                    dataset = new DataSet("MyDataSet");
+                    adapter = new SqlDataAdapter(srcCmd);
+                    adapter.Fill(dataset);
+                    datatable = dataset.Tables[0];
+                    rows = new DataRow[datatable.Rows.Count];
+                    for (int i = 0; i < rows.Length; i++)
                     {
-                        srcConn.Open();
-
-                        dataset = new DataSet("MyDataSet");
-                        adapter = new SqlDataAdapter(srcCmd);
-                        adapter.Fill(dataset);
-                        datatable = dataset.Tables[0];
-                        rows = new DataRow[datatable.Rows.Count];
-                        for (int i = 0; i < rows.Length; i++)
-                        {
-                            rows[i] = datatable.Rows[i];
-                        }
+                        rows[i] = datatable.Rows[i];
                     }
+                }
 
-                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                    {
+                using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                {
 
-                        bulkcopy.SqlRowsCopied += new SqlRowsCopiedEventHandler(OnRowCopied);
+                    bulkcopy.SqlRowsCopied += new SqlRowsCopiedEventHandler(OnRowCopied);
 
-                        bulkcopy.DestinationTableName = dstTable;
-                        bulkcopy.NotifyAfter = 50;
+                    bulkcopy.DestinationTableName = dstTable.Name;
+                    bulkcopy.NotifyAfter = 50;
 
-                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                    SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                        ColumnMappings.Add(0, "orderid");
-                        ColumnMappings.Add(1, "customerid");
-                        ColumnMappings.Add(4, "rdate");
-                        ColumnMappings.Add(7, "freight");
-                        ColumnMappings.Add(8, "shipname");
+                    ColumnMappings.Add(0, "orderid");
+                    ColumnMappings.Add(1, "customerid");
+                    ColumnMappings.Add(4, "rdate");
+                    ColumnMappings.Add(7, "freight");
+                    ColumnMappings.Add(8, "shipname");
 
-                        await bulkcopy.WriteToServerAsync(rows);
-                        bulkcopy.SqlRowsCopied -= new SqlRowsCopiedEventHandler(OnRowCopied);
-                    }
-                    await outputSemaphore.WaitAsync();
-                    Helpers.VerifyResults(dstConn, dstTable, 5, 100);
-                }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
+                    await bulkcopy.WriteToServerAsync(rows);
+                    bulkcopy.SqlRowsCopied -= new SqlRowsCopiedEventHandler(OnRowCopied);
                 }
+                await outputSemaphore.WaitAsync();
+                Helpers.VerifyResults(dstConn, dstTable.Name, 5, 100);
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs
index 11c4a262a1..1ffa69e5c4 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DataConversionErrorMessageTest.cs
@@ -70,7 +70,9 @@ private void DropTable(SqlConnection sqlConnection, string targetTable)
             using (var command = new SqlCommand())
             {
                 command.Connection = sqlConnection;
-                command.CommandText = string.Format("DROP TABLE {0}", targetTable);
+                // NOTE: The drop is guarded so that cleanup is idempotent; the table name embeds a
+                //   GUID, so an unguarded drop that throws would leave it behind forever.
+                command.CommandText = string.Format("IF (OBJECT_ID('{0}') IS NOT NULL) DROP TABLE {0}", targetTable);
                 command.CommandType = CommandType.Text;
                 command.ExecuteNonQuery();
             }
@@ -79,10 +81,19 @@ private void DropTable(SqlConnection sqlConnection, string targetTable)
 
         public void Dispose()
         {
-            DropTable(Connection, TableName);
-
-            Connection.Close();
-            Connection.Dispose();
+            try
+            {
+                DropTable(Connection, TableName);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"{nameof(InitialDatabase)}: failed to drop '{TableName}': {ex.Message}");
+            }
+            finally
+            {
+                Connection.Close();
+                Connection.Dispose();
+            }
         }
     }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs
index 230d450f80..1406ae382a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/DestinationTableNameWithSpecialChar.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -26,52 +27,36 @@ public void Test()
                 "[dbo]." + "[" + dsttable + "]",    // [dbo].[@sometablename]
             };
 
-            string[] epilogue =
-            {
-                "create table " + srctable + "([col1] int)",
-                "insert into " + srctable + " values (33)",
-                "create table [" + dsttable + "]([col1] int)",
-            };
-
-            string[] prologue =
-            {
-                "drop table " + srctable,
-                "drop table [" + dsttable + "]",
-            };
-
             using (SqlConnection dstConn = new SqlConnection(constr))
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                try
+
+                using Table srcTableObject = Table.WithName(dstConn, srctable, "([col1] int)");
+                using Table dstTableObject = Table.WithName(dstConn, "[" + dsttable + "]", "([col1] int)");
+
+                Helpers.TryExecute(dstCmd, "insert into " + srctable + " values (33)");
+
+                using (SqlConnection srcConn = new SqlConnection(constr))
+                using (SqlCommand srcCmd = new SqlCommand(string.Format("select * from {0} ", srctable), srcConn))
                 {
-                    Helpers.ProcessCommandBatch(typeof(SqlConnection), constr, epilogue);
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(constr))
-                    using (SqlCommand srcCmd = new SqlCommand(string.Format("select * from {0} ", srctable), srcConn))
+                    int expRows = 1;
+                    foreach (string dsttablename in dsttablecombo)
                     {
-                        srcConn.Open();
-
-                        int expRows = 1;
-                        foreach (string dsttablename in dsttablecombo)
+                        using (DbDataReader reader = srcCmd.ExecuteReader())
                         {
-                            using (DbDataReader reader = srcCmd.ExecuteReader())
+                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                             {
-                                using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                                {
-                                    bulkcopy.DestinationTableName = dsttablename;
-                                    bulkcopy.WriteToServer(reader);
-                                }
-                                Helpers.VerifyResults(dstConn, "[" + dsttable + "]", 1, expRows);
+                                bulkcopy.DestinationTableName = dsttablename;
+                                bulkcopy.WriteToServer(reader);
                             }
-                            expRows++;
+                            Helpers.VerifyResults(dstConn, "[" + dsttable + "]", 1, expRows);
                         }
+                        expRows++;
                     }
                 }
-                finally
-                {
-                    Helpers.ProcessCommandBatch(typeof(SqlConnection), constr, prologue);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs
index 3ac8636467..8d1b2e90fc 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/ErrorOnRowsMarkedAsDeleted.cs
@@ -102,7 +102,7 @@ private static void RunCase(SqlConnection conn, string caseName, SqlBulkCopyInpu
             }
 
             // create SQL table with one int field, similar to the above DataTable
-            SqlCommand cmd = conn.CreateCommand();
+            using SqlCommand cmd = conn.CreateCommand();
             cmd.CommandText = "CREATE TABLE [" + tableName + "] (IntVal int)";
             cmd.ExecuteNonQuery();
 
@@ -145,10 +145,18 @@ private static void RunCase(SqlConnection conn, string caseName, SqlBulkCopyInpu
             }
             finally
             {
-                // delete the table
-                cmd = conn.CreateCommand();
-                cmd.CommandText = "DROP TABLE [" + tableName + "]";
-                cmd.ExecuteNonQuery();
+                // Best-effort: this runs while a test failure may already be propagating, so a
+                // failed drop must not surface in its place. The table is named instead.
+                try
+                {
+                    using SqlCommand dropCmd = conn.CreateCommand();
+                    dropCmd.CommandText = "IF (OBJECT_ID('[" + tableName + "]') IS NOT NULL) DROP TABLE [" + tableName + "]";
+                    dropCmd.ExecuteNonQuery();
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"Failed to drop table '{tableName}'; it may be orphaned in the test database. {ex}");
+                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs
index 6353197634..bf030ecfff 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/FireTrigger.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,22 +17,6 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_FireTrigger", false);
-            string dstTable1 = dstTable + "_1"; // this table will receive a value if the trigger fires!
-            string trigger = dstTable + "_2";
-            string[] prologue =
-            {
-                "create table " + dstTable + "(col1 int, col2 nvarchar(20), col3 nvarchar(10))",
-                "create table " + dstTable1 + "  (col1 int);",
-                "create trigger " + trigger + "  on " + dstTable + " for INSERT as insert into " + dstTable1 + "  values (333)"
-            };
-            string[] epilogue =
-            {
-                "drop table " + dstTable1 + " ",
-                "drop trigger " + trigger + " ",
-                "drop table " + dstTable
-            };
-
             string sourceTable = "employees";
             string sourceQueryTemplate = "select top 5 EmployeeID, LastName, FirstName from {0}";
             string sourceQuery = string.Format(sourceQueryTemplate, sourceTable);
@@ -40,41 +25,43 @@ public void Test()
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                Helpers.ProcessCommandBatch(dstCmd, prologue);
 
-                try
+                // Dropping a table also drops the triggers defined on it, so the trigger below
+                //   needs no separate cleanup. dstTable is declared last so that it - and its
+                //   trigger - are dropped before the table the trigger writes into.
+                using Table dstTable1 = new(dstConn, "SqlBulkCopyTest_FireTrigger_1", "(col1 int)");
+                using Table dstTable = new(dstConn, "SqlBulkCopyTest_FireTrigger", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+
+                Helpers.TryExecute(dstCmd,
+                    "create trigger " + DataTestUtility.GetShortName("SqlBulkCopyTest_FireTrigger_2", false) +
+                    " on " + dstTable.Name + " for INSERT as insert into " + dstTable1.Name + " values (333)");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
                 {
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand(sourceQuery, srcConn))
+                    srcConn.Open();
+
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
                     {
-                        srcConn.Open();
+                        SqlBulkCopyOptions option = SqlBulkCopyOptions.FireTriggers;
 
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, option, null))
                         {
-                            SqlBulkCopyOptions option = SqlBulkCopyOptions.FireTriggers;
-
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, option, null))
-                            {
-                                bulkcopy.DestinationTableName = dstTable;
-                                bulkcopy.WriteToServer(reader);
-                            }
+                            bulkcopy.DestinationTableName = dstTable.Name;
+                            bulkcopy.WriteToServer(reader);
                         }
+                    }
 
-                        dstCmd.CommandText = "select top 2 * from " + dstTable1 + " ";
-                        using (DbDataReader reader2 = dstCmd.ExecuteReader())
-                        {
-                            Assert.True(reader2.Read(), "Failed to read!");
+                    dstCmd.CommandText = "select top 2 * from " + dstTable1.Name;
+                    using (DbDataReader reader2 = dstCmd.ExecuteReader())
+                    {
+                        Assert.True(reader2.Read(), "Failed to read!");
 
-                            Assert.True(reader2[0] is int, "Unexpected Field(0) type: " + reader2[0].GetType());
+                        Assert.True(reader2[0] is int, "Unexpected Field(0) type: " + reader2[0].GetType());
 
-                            Assert.True((int)(reader2[0]) == 333, "Unexpected Field(0) value: " + reader2[0]);
-                        }
+                        Assert.True((int)(reader2[0]) == 333, "Unexpected Field(0) value: " + reader2[0]);
                     }
                 }
-                finally
-                {
-                    Helpers.ProcessCommandBatch(dstCmd, epilogue);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Helpers.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Helpers.cs
index 274750bc09..0a447da8b8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Helpers.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Helpers.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -10,40 +10,6 @@ namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
 {
     public class Helpers
     {
-        internal static void ProcessCommandBatch(Type connType, string constr, string[] batch)
-        {
-            if (batch.Length > 0)
-            {
-                object[] activatorArgs = new object[1];
-                activatorArgs[0] = constr;
-                using (DbConnection conn = (DbConnection)Activator.CreateInstance(connType, activatorArgs))
-                {
-                    conn.Open();
-                    DbCommand cmd = conn.CreateCommand();
-
-                    ProcessCommandBatch(cmd, batch);
-                }
-            }
-        }
-
-        internal static void ProcessCommandBatch(DbCommand cmd, string[] batch)
-        {
-            foreach (string cmdtext in batch)
-            {
-                Helpers.TryExecute(cmd, cmdtext);
-            }
-        }
-
-        public static int TryDropTable(string dstConstr, string tableName)
-        {
-            using (SqlConnection dropConn = new SqlConnection(dstConstr))
-            using (SqlCommand dropCmd = dropConn.CreateCommand())
-            {
-                dropConn.Open();
-                return Helpers.TryExecute(dropCmd, "drop table " + tableName);
-            }
-        }
-
         public static int TryExecute(DbCommand cmd, string strText)
         {
             cmd.CommandText = strText;
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs
index 0f18df215e..08c7204127 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/HiddenTargetColumn.cs
@@ -4,6 +4,7 @@
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -15,17 +16,13 @@ public class HiddenTargetColumn
         public void WriteToServer_CopyToHiddenTargetColumn_ThrowsSqlException()
         {
             string connectionString = DataTestUtility.TCPConnectionString;
-            string destinationTable = DataTestUtility.GetShortName("HiddenTargetColumn");
-            string destinationHistoryTable = DataTestUtility.GetShortName("HiddenTargetColumn_History");
 
             using (SqlConnection dstConn = new SqlConnection(connectionString))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
-                {
-                    DataTestUtility.CreateTable(dstConn, destinationTable, $"""
+                // Drops the history table as well as the table itself, in the required order.
+                using TemporalTable destinationTable = new(dstConn, "HiddenTargetColumn", "HiddenTargetColumn_History", """
 (
     Column1 int primary key not null,
     Column2 nvarchar(10) not null,
@@ -34,42 +31,31 @@ Column2 nvarchar(10) not null,
     ValidTo datetime2 generated always as row end hidden not null,
     period for system_time (ValidFrom, ValidTo)
 )
-with (system_versioning = on(history_table = dbo.{destinationHistoryTable}));
 """);
 
-                    using (SqlConnection srcConn = new SqlConnection(connectionString))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, FirstName, LastName, HireDate, sysdatetime() as CurrentDate from employees", srcConn))
-                    {
-                        srcConn.Open();
+                using (SqlConnection srcConn = new SqlConnection(connectionString))
+                using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, FirstName, LastName, HireDate, sysdatetime() as CurrentDate from employees", srcConn))
+                {
+                    srcConn.Open();
 
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                        {
-                            bulkcopy.DestinationTableName = destinationTable;
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
+                    {
+                        bulkcopy.DestinationTableName = destinationTable.Name;
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                            ColumnMappings.Add("EmployeeID", "Column1");
-                            ColumnMappings.Add("LastName", "Column2");
-                            ColumnMappings.Add("FirstName", "Employee's First Name");
-                            ColumnMappings.Add("HireDate", "ValidFrom");
-                            ColumnMappings.Add("CurrentDate", "ValidTo");
+                        ColumnMappings.Add("EmployeeID", "Column1");
+                        ColumnMappings.Add("LastName", "Column2");
+                        ColumnMappings.Add("FirstName", "Employee's First Name");
+                        ColumnMappings.Add("HireDate", "ValidFrom");
+                        ColumnMappings.Add("CurrentDate", "ValidTo");
 
-                            SqlException sqlEx = Assert.Throws<SqlException>(() => bulkcopy.WriteToServer(reader));
+                        SqlException sqlEx = Assert.Throws<SqlException>(() => bulkcopy.WriteToServer(reader));
 
-                            Assert.Equal(13536, sqlEx.Number);
-                            Assert.StartsWith("Cannot insert an explicit value into a GENERATED ALWAYS column in table", sqlEx.Message);
-                        }
+                        Assert.Equal(13536, sqlEx.Number);
+                        Assert.StartsWith("Cannot insert an explicit value into a GENERATED ALWAYS column in table", sqlEx.Message);
                     }
                 }
-                finally
-                {
-                    DataTestUtility.RunNonQuery(connectionString, $"""
-alter table {destinationTable} set (system_versioning = off);
-alter table {destinationTable} drop period for system_time;
-""");
-                    DataTestUtility.DropTable(dstConn, destinationTable);
-                    DataTestUtility.DropTable(dstConn, destinationHistoryTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs
index 19bdf2193e..12411f52b5 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/InvalidAccessFromEvent.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -54,9 +55,7 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_InvalidAccessFromEvent", false);
             _dstConstr = dstConstr;
-            _dstTable = dstTable;
 
             DataSet dataset;
             SqlDataAdapter adapter;
@@ -77,30 +76,26 @@ public void Test()
                 _dstConn.Open();
                 _dstcmd = _dstConn.CreateCommand();
 
-                try
-                {
-                    Helpers.TryExecute(_dstcmd, "create table " + dstTable + " (orderid int, customerid nchar(5), rdate datetime, freight money, shipname nvarchar(40))");
-                    _dstcmd.CommandText = "truncate table " + dstTable;
-
-                    expectedErrorMsg = SystemDataResourceManager.Instance.SQL_ConnectionLockedForBcpEvent;
-                    InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedRollback));
-                    InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedCommit));
-                    InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedChangeDatabase));
-                    InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedExecute));
-                    InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedBulkCopy));
-
-                    // this will close the connect which is valid so it must be the last test!
-                    expectedErrorMsg = string.Format(
-                        SystemDataResourceManager.Instance.ADP_OpenConnectionRequired,
-                        "WriteToServer",
-                        SystemDataResourceManager.Instance.ADP_ConnectionStateMsg_Closed);
-                    InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedClose));
-                }
-                finally
-                {
-                    // the original connection is probably trashed
-                    Helpers.TryDropTable(dstConstr, dstTable);
-                }
+                // Table disposal falls back to a fresh connection, which matters here because the
+                //   test deliberately leaves the original connection unusable.
+                using Table dstTable = new(_dstConn, "SqlBulkCopyTest_InvalidAccessFromEvent",
+                    "(orderid int, customerid nchar(5), rdate datetime, freight money, shipname nvarchar(40))");
+                _dstTable = dstTable.Name;
+                _dstcmd.CommandText = "truncate table " + dstTable.Name;
+
+                expectedErrorMsg = SystemDataResourceManager.Instance.SQL_ConnectionLockedForBcpEvent;
+                InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedRollback));
+                InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedCommit));
+                InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedChangeDatabase));
+                InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedExecute));
+                InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedBulkCopy));
+
+                // this will close the connect which is valid so it must be the last test!
+                expectedErrorMsg = string.Format(
+                    SystemDataResourceManager.Instance.ADP_OpenConnectionRequired,
+                    "WriteToServer",
+                    SystemDataResourceManager.Instance.ADP_ConnectionStateMsg_Closed);
+                InnerTest(new SqlRowsCopiedEventHandler(OnRowCopiedClose));
             }
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs
index 5228c1a35d..4e0c663610 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/KeepNulls.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,42 +17,33 @@ public void Test()
         {
             string srcconstr = DataTestUtility.TCPConnectionString;
             string dstconstr = DataTestUtility.TCPConnectionString;
-            string srctable = DataTestUtility.GetShortName("SqlBulkCopyTest_KeepNulls0", false);
-            string dsttable = DataTestUtility.GetShortName("SqlBulkCopyTest_KeepNulls1", false);
             using SqlConnection destConn = new(dstconstr);
             destConn.Open();
 
             using SqlCommand dstcmd = destConn.CreateCommand();
-            Helpers.TryExecute(dstcmd, "create table " + srctable + " (col1 int, col2 text, col3 text)");
-            Helpers.TryExecute(dstcmd, "insert into " + srctable + "(col1, col3) values (1, 'Michael')");
-            Helpers.TryExecute(dstcmd, "insert into " + srctable + "(col1, col2, col3) values (2, 'Quark', 'Astrid')");
-            Helpers.TryExecute(dstcmd, "insert into " + srctable + "(col1, col2) values (66, 'K�se');");
 
-            Helpers.TryExecute(dstcmd, "create table " + dsttable + " (col1 int identity(1,1), col2 text default 'Jogurt', col3 text)");
+            using Table srctable = new(destConn, "SqlBulkCopyTest_KeepNulls0", "(col1 int, col2 text, col3 text)");
+            using Table dsttable = new(destConn, "SqlBulkCopyTest_KeepNulls1", "(col1 int identity(1,1), col2 text default 'Jogurt', col3 text)");
+
+            Helpers.TryExecute(dstcmd, "insert into " + srctable.Name + "(col1, col3) values (1, 'Michael')");
+            Helpers.TryExecute(dstcmd, "insert into " + srctable.Name + "(col1, col2, col3) values (2, 'Quark', 'Astrid')");
+            Helpers.TryExecute(dstcmd, "insert into " + srctable.Name + "(col1, col2) values (66, 'K�se');");
 
             using SqlConnection sourceConn = new(srcconstr);
             sourceConn.Open();
 
-            using SqlCommand srccmd = new("select * from " + srctable, sourceConn);
+            using SqlCommand srccmd = new("select * from " + srctable.Name, sourceConn);
             using IDataReader reader = srccmd.ExecuteReader();
 
-            try
-            {
-                using SqlBulkCopy bulkcopy = new(destConn, SqlBulkCopyOptions.KeepNulls, null);
-                bulkcopy.DestinationTableName = dsttable;
-                SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
-                ColumnMappings.Add("col1", "col1");
-                ColumnMappings.Add("col2", "col2");
-                ColumnMappings.Add("col3", "col3");
-
-                bulkcopy.WriteToServer(reader);
-                Helpers.VerifyResults(destConn, dsttable, 3, 3);
-            }
-            finally
-            {
-                Helpers.TryDropTable(dstconstr, srctable);
-                Helpers.TryDropTable(dstconstr, dsttable);
-            }
+            using SqlBulkCopy bulkcopy = new(destConn, SqlBulkCopyOptions.KeepNulls, null);
+            bulkcopy.DestinationTableName = dsttable.Name;
+            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+            ColumnMappings.Add("col1", "col1");
+            ColumnMappings.Add("col2", "col2");
+            ColumnMappings.Add("col3", "col3");
+
+            bulkcopy.WriteToServer(reader);
+            Helpers.VerifyResults(destConn, dsttable.Name, 3, 3);
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs
index ac5651f34f..85c0a4431b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumn.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -17,42 +18,33 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_MissingTargetColumn", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_MissingTargetColumn", "(col1 int, col3 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col3 nvarchar(10))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                     {
-                        srcConn.Open();
-
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                        {
-                            bulkcopy.DestinationTableName = dstTable;
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                            ColumnMappings.Add("EmployeeID", "col1");
-                            ColumnMappings.Add("LastName", "col2"); // this column does not exist
-                            ColumnMappings.Add("FirstName", "col3");
+                        ColumnMappings.Add("EmployeeID", "col1");
+                        ColumnMappings.Add("LastName", "col2"); // this column does not exist
+                        ColumnMappings.Add("FirstName", "col3");
 
-                            string errorMsg = SystemDataResourceManager.Instance.SQL_BulkLoadNonMatchingColumnName;
-                            errorMsg = string.Format(errorMsg, "col2");
+                        string errorMsg = SystemDataResourceManager.Instance.SQL_BulkLoadNonMatchingColumnName;
+                        errorMsg = string.Format(errorMsg, "col2");
 
-                            DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: errorMsg);
-                        }
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: errorMsg);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs
index 2728b1efb4..d1f035f1bd 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetColumns.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -17,42 +18,33 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_MissingTargetColumns", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_MissingTargetColumns", "(col1 int, col2 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(10))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                     {
-                        srcConn.Open();
-
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                        {
-                            bulkcopy.DestinationTableName = dstTable;
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                            ColumnMappings.Add("EmployeeID", "col1");
-                            ColumnMappings.Add("LastName", "col3"); // this column does not exist
-                            ColumnMappings.Add("FirstName", "col4"); // this column does not exist
+                        ColumnMappings.Add("EmployeeID", "col1");
+                        ColumnMappings.Add("LastName", "col3"); // this column does not exist
+                        ColumnMappings.Add("FirstName", "col4"); // this column does not exist
 
-                            string errorMsg = SystemDataResourceManager.Instance.SQL_BulkLoadNonMatchingColumnName;
-                            errorMsg = string.Format(errorMsg, "col3,col4");
+                        string errorMsg = SystemDataResourceManager.Instance.SQL_BulkLoadNonMatchingColumnName;
+                        errorMsg = string.Format(errorMsg, "col3,col4");
 
-                            DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: errorMsg);
-                        }
+                        DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: errorMsg);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs
index af103c1c0a..a8d255224e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/MissingTargetTable.cs
@@ -19,7 +19,6 @@ public void Test()
             string dstConstr = DataTestUtility.TCPConnectionString;
             string targetTable = DataTestUtility.GetShortName("@SqlBulkCopyTest_MissingTargetTable", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs
index e8a0571467..3e8b70facc 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/OrderHintTransaction.cs
@@ -27,7 +27,7 @@ public void Test()
             using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                SqlTransaction txn = dstConn.BeginTransaction();
+                using SqlTransaction txn = dstConn.BeginTransaction();
                 dstCmd.Transaction = txn;
                 Helpers.TryExecute(dstCmd, initialQuery);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs
index 1c10feebad..f1d82e71c1 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/SpecialCharacterNames.cs
@@ -1,8 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -28,36 +29,30 @@ public void Test()
             dstTable = EscapeIdentifier(dstTable);
 
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                // The table is not currently created inside the schema, but it is declared second so
+                // that it is dropped first regardless: a schema cannot be dropped while it still
+                // contains objects.
+                using Schema schema = Schema.WithName(dstConn, dstschema);
+                using Table table = Table.WithName(dstConn, dstTable, "(orderid int, customerid nchar(5))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 2 orderid, customerid from orders", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create schema " + dstschema);
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (orderid int, customerid nchar(5))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 2 orderid, customerid from orders", srcConn))
+                    using (SqlDataReader srcreader = srcCmd.ExecuteReader())
                     {
-                        srcConn.Open();
-
-                        using (SqlDataReader srcreader = srcCmd.ExecuteReader())
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
                         {
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn))
-                            {
-                                bulkcopy.DestinationTableName = dstTable;
+                            bulkcopy.DestinationTableName = dstTable;
 
-                                bulkcopy.WriteToServer(srcreader);
-                            }
+                            bulkcopy.WriteToServer(srcreader);
                         }
-                        Helpers.VerifyResults(dstConn, dstTable, 2, 2);
                     }
-                }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                    Helpers.TryExecute(dstCmd, "drop schema " + dstschema);
+                    Helpers.VerifyResults(dstConn, dstTable, 2, 2);
                 }
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs
index 69c090d655..f542edc215 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TableLock.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,41 +17,33 @@ public void Test()
         {
             string srcconstr = DataTestUtility.TCPConnectionString;
             string dstconstr = DataTestUtility.TCPConnectionString;
-            string srctable = DataTestUtility.GetShortName("SqlBulkCopyTest_TableLock0", false);
-            string dsttable = DataTestUtility.GetShortName("SqlBulkCopyTest_TableLock1", false);
             using SqlConnection destConn = new(dstconstr);
             destConn.Open();
 
             using SqlCommand dstcmd = destConn.CreateCommand();
-            Helpers.TryExecute(dstcmd, "create table " + srctable + " (col1 int, col2 text, col3 text)");
-            Helpers.TryExecute(dstcmd, "insert into " + srctable + "(col1, col3) values (1, 'Michael')");
-            Helpers.TryExecute(dstcmd, "insert into " + srctable + "(col1, col2, col3) values (2, 'Quark', 'Astrid')");
-            Helpers.TryExecute(dstcmd, "insert into " + srctable + "(col1, col2) values (66, 'K�se');");
 
-            Helpers.TryExecute(dstcmd, "create table " + dsttable + " (col1 int identity(1,1), col2 text default 'Jogurt', col3 text)");
+            using Table srctable = new(destConn, "SqlBulkCopyTest_TableLock0", "(col1 int, col2 text, col3 text)");
+            using Table dsttable = new(destConn, "SqlBulkCopyTest_TableLock1", "(col1 int identity(1,1), col2 text default 'Jogurt', col3 text)");
+
+            Helpers.TryExecute(dstcmd, "insert into " + srctable.Name + "(col1, col3) values (1, 'Michael')");
+            Helpers.TryExecute(dstcmd, "insert into " + srctable.Name + "(col1, col2, col3) values (2, 'Quark', 'Astrid')");
+            Helpers.TryExecute(dstcmd, "insert into " + srctable.Name + "(col1, col2) values (66, 'K�se');");
 
             using SqlConnection sourceConn = new(srcconstr);
             sourceConn.Open();
 
-            using SqlCommand srccmd = new SqlCommand("select * from " + srctable, sourceConn);
+            using SqlCommand srccmd = new SqlCommand("select * from " + srctable.Name, sourceConn);
             using IDataReader reader = srccmd.ExecuteReader();
-            try
-            {
-                using SqlBulkCopy bulkcopy = new(destConn, SqlBulkCopyOptions.TableLock, null);
-                bulkcopy.DestinationTableName = dsttable;
-                SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
-                ColumnMappings.Add("col1", "col1");
-                ColumnMappings.Add("col2", "col2");
-                ColumnMappings.Add("col3", "col3");
-
-                bulkcopy.WriteToServer(reader);
-                Helpers.VerifyResults(destConn, dsttable, 3, 3);
-            }
-            finally
-            {
-                Helpers.TryDropTable(dstconstr, srctable);
-                Helpers.TryDropTable(dstconstr, dsttable);
-            }
+
+            using SqlBulkCopy bulkcopy = new(destConn, SqlBulkCopyOptions.TableLock, null);
+            bulkcopy.DestinationTableName = dsttable.Name;
+            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+            ColumnMappings.Add("col1", "col1");
+            ColumnMappings.Add("col2", "col2");
+            ColumnMappings.Add("col3", "col3");
+
+            bulkcopy.WriteToServer(reader);
+            Helpers.VerifyResults(destConn, dsttable.Name, 3, 3);
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs
index b5f5e32b53..1df72a8dee 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -17,43 +18,34 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Transaction0", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_Transaction0", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, null))
                     {
-                        srcConn.Open();
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, null))
+                        using SqlTransaction myTrans = dstConn.BeginTransaction();
+                        try
                         {
-                            bulkcopy.DestinationTableName = dstTable;
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
-
-                            SqlTransaction myTrans = dstConn.BeginTransaction();
-                            try
-                            {
-                                DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader));
-                            }
-                            finally
-                            {
-                                myTrans.Rollback();
-                            }
+                            DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader));
+                        }
+                        finally
+                        {
+                            myTrans.Rollback();
                         }
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs
index 665b5a5108..863be57734 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction1.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -17,47 +18,38 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Transaction1", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_Transaction1", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, null))
                     {
-                        srcConn.Open();
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, null))
-                        {
-                            bulkcopy.DestinationTableName = dstTable;
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                        using SqlCommand myCmd = dstConn.CreateCommand();
+                        myCmd.CommandText = "begin transaction";
+                        myCmd.ExecuteNonQuery();
 
-                            SqlCommand myCmd = dstConn.CreateCommand();
-                            myCmd.CommandText = "begin transaction";
+                        try
+                        {
+                            DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader));
+                        }
+                        finally
+                        {
+                            myCmd.CommandText = "rollback transaction";
                             myCmd.ExecuteNonQuery();
-
-                            try
-                            {
-                                DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader));
-                            }
-                            finally
-                            {
-                                myCmd.CommandText = "rollback transaction";
-                                myCmd.ExecuteNonQuery();
-                            }
                         }
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs
index 9c3f69e28a..a99ff3607a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction2.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -16,54 +17,45 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Transaction2", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_Transaction2", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
                     {
-                        srcConn.Open();
-
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
+                        using SqlTransaction myTrans = dstConn.BeginTransaction();
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.Default, myTrans))
                         {
-                            SqlTransaction myTrans = dstConn.BeginTransaction();
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.Default, myTrans))
-                            {
-                                bulkcopy.DestinationTableName = dstTable;
-                                SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                            bulkcopy.DestinationTableName = dstTable.Name;
+                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                                try
-                                {
-                                    bulkcopy.WriteToServer(reader);
-                                    SqlCommand myCmd = dstConn.CreateCommand();
-                                    myCmd.CommandText = "select * from " + dstTable;
-                                    myCmd.Transaction = myTrans;
-                                    using (DbDataReader reader1 = myCmd.ExecuteReader())
-                                    {
-                                        Assert.True(reader1.HasRows, "Expected reader to have rows.");
-                                    }
-                                }
-                                finally
+                            try
+                            {
+                                bulkcopy.WriteToServer(reader);
+                                using SqlCommand myCmd = dstConn.CreateCommand();
+                                myCmd.CommandText = "select * from " + dstTable.Name;
+                                myCmd.Transaction = myTrans;
+                                using (DbDataReader reader1 = myCmd.ExecuteReader())
                                 {
-                                    myTrans.Rollback();
+                                    Assert.True(reader1.HasRows, "Expected reader to have rows.");
                                 }
                             }
-
-                            Helpers.CheckTableRows(dstConn, dstTable, false);
+                            finally
+                            {
+                                myTrans.Rollback();
+                            }
                         }
+
+                        Helpers.CheckTableRows(dstConn, dstTable.Name, false);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs
index f28aaad8c3..4735e7aa3c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction3.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -17,48 +18,39 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Transaction3", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
 
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_Transaction3", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (SqlConnection conn3 = new SqlConnection(srcConstr))
                     {
-                        srcConn.Open();
-
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (SqlConnection conn3 = new SqlConnection(srcConstr))
+                        conn3.Open();
+                        // Start a local transaction on the wrong connection.
+                        using SqlTransaction myTrans = conn3.BeginTransaction();
+                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.Default, myTrans))
                         {
-                            conn3.Open();
-                            // Start a local transaction on the wrong connection.
-                            SqlTransaction myTrans = conn3.BeginTransaction();
-                            using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.Default, myTrans))
-                            {
-                                SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
-                                bulkcopy.DestinationTableName = dstTable;
+                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
+                            bulkcopy.DestinationTableName = dstTable.Name;
 
-                                string exceptionMsg = SystemDataResourceManager.Instance.ADP_TransactionConnectionMismatch;
-                                DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: exceptionMsg);
+                            string exceptionMsg = SystemDataResourceManager.Instance.ADP_TransactionConnectionMismatch;
+                            DataTestUtility.AssertThrows<InvalidOperationException>(() => bulkcopy.WriteToServer(reader), exceptionMessage: exceptionMsg);
 
-                                SqlCommand myCmd = dstConn.CreateCommand();
-                                myCmd.CommandText = "select * from " + dstTable;
-                                myCmd.Transaction = myTrans;
+                            using SqlCommand myCmd = dstConn.CreateCommand();
+                            myCmd.CommandText = "select * from " + dstTable.Name;
+                            myCmd.Transaction = myTrans;
 
-                                DataTestUtility.AssertThrows<InvalidOperationException>(() => myCmd.ExecuteReader(), exceptionMessage: exceptionMsg);
-                            }
+                            DataTestUtility.AssertThrows<InvalidOperationException>(() => myCmd.ExecuteReader(), exceptionMessage: exceptionMsg);
                         }
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs
index 2c48368483..7e86f8b640 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/Transaction4.cs
@@ -1,10 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Data.Common;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -17,35 +18,26 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_Transaction4", false);
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_Transaction4", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (SqlConnection conn3 = new SqlConnection(srcConstr))
                     {
-                        srcConn.Open();
-
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (SqlConnection conn3 = new SqlConnection(srcConstr))
-                        {
-                            conn3.Open();
-                            // Start a local transaction on the wrong connection.
-                            SqlTransaction myTrans = conn3.BeginTransaction();
-                            string errorMsg = SystemDataResourceManager.Instance.SQL_BulkLoadConflictingTransactionOption;
-                            DataTestUtility.AssertThrows<ArgumentException>(() => new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, myTrans), exceptionMessage: errorMsg);
-                        }
+                        conn3.Open();
+                        // Start a local transaction on the wrong connection.
+                        using SqlTransaction myTrans = conn3.BeginTransaction();
+                        string errorMsg = SystemDataResourceManager.Instance.SQL_BulkLoadConflictingTransactionOption;
+                        DataTestUtility.AssertThrows<ArgumentException>(() => new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, myTrans), exceptionMessage: errorMsg);
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs
index 537f68d8f0..76ce1f9ffd 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/TransactionTestAsync.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -6,6 +6,7 @@
 using System.Data.Common;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient.ManualTesting.Tests;
+using Microsoft.Data.SqlClient.Tests.Common.Fixtures.DatabaseObjects;
 using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTests.BulkCopy
@@ -18,49 +19,40 @@ public void Test()
         {
             string srcConstr = DataTestUtility.TCPConnectionString;
             string dstConstr = DataTestUtility.TCPConnectionString;
-            string dstTable = DataTestUtility.GetShortName("SqlBulkCopyTest_TransactionTestAsync", false);
-            Task t = TestAsync(srcConstr, dstConstr, dstTable);
+            Task t = TestAsync(srcConstr, dstConstr);
             DataTestUtility.AssertThrowsInner<AggregateException, InvalidOperationException>(() => t.Wait());
             Assert.True(t.IsCompleted, "Task did not complete! Status: " + t.Status);
         }
 
-        private static async Task TestAsync(string srcConstr, string dstConstr, string dstTable)
+        private static async Task TestAsync(string srcConstr, string dstConstr)
         {
             using (SqlConnection dstConn = new SqlConnection(dstConstr))
-            using (SqlCommand dstCmd = dstConn.CreateCommand())
             {
                 dstConn.Open();
-                try
+                using Table dstTable = new Table(dstConn, "SqlBulkCopyTest_TransactionTestAsync", "(col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+
+                using (SqlConnection srcConn = new SqlConnection(srcConstr))
+                using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
                 {
-                    Helpers.TryExecute(dstCmd, "create table " + dstTable + " (col1 int, col2 nvarchar(20), col3 nvarchar(10))");
+                    srcConn.Open();
 
-                    using (SqlConnection srcConn = new SqlConnection(srcConstr))
-                    using (SqlCommand srcCmd = new SqlCommand("select top 5 EmployeeID, LastName, FirstName from employees", srcConn))
+                    using (DbDataReader reader = srcCmd.ExecuteReader())
+                    using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, null))
                     {
-                        srcConn.Open();
+                        bulkcopy.DestinationTableName = dstTable.Name;
+                        SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
 
-                        using (DbDataReader reader = srcCmd.ExecuteReader())
-                        using (SqlBulkCopy bulkcopy = new SqlBulkCopy(dstConn, SqlBulkCopyOptions.UseInternalTransaction, null))
+                        using SqlTransaction myTrans = dstConn.BeginTransaction();
+                        try
                         {
-                            bulkcopy.DestinationTableName = dstTable;
-                            SqlBulkCopyColumnMappingCollection ColumnMappings = bulkcopy.ColumnMappings;
-
-                            SqlTransaction myTrans = dstConn.BeginTransaction();
-                            try
-                            {
-                                await bulkcopy.WriteToServerAsync(reader);
-                            }
-                            finally
-                            {
-                                myTrans.Rollback();
-                            }
+                            await bulkcopy.WriteToServerAsync(reader);
+                        }
+                        finally
+                        {
+                            myTrans.Rollback();
                         }
                     }
                 }
-                finally
-                {
-                    Helpers.TryExecute(dstCmd, "drop table " + dstTable);
-                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs
index 7fd5b36237..f78ea7334d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/BulkCopy/UnprivilegedLogin.cs
@@ -52,19 +52,33 @@ public UnprivilegedLogin()
         // the actual tests. The user associated with the latter connection will be denied SELECT permissions
         // over master.sys.all_columns.
         _managementConnection = new SqlConnection(DataTestUtility.TCPConnectionString);
-        _managementConnection.Open();
 
-        _unprivilegedLogin = new ServerLogin(_managementConnection, nameof(UnprivilegedLogin), _managementConnection.Database);
-        _unprivilegedAppUser = new DatabaseUser(_managementConnection, _managementConnection.Database, _unprivilegedLogin);
-        _unprivilegedMasterUser = new DatabaseUser(_managementConnection, "master", _unprivilegedLogin);
-
-        using (SqlCommand permissionsModificationCommand = _managementConnection.CreateCommand())
+        // NOTE: If setup fails part way through, this constructor never returns, so xUnit never calls
+        //   Dispose and the connection plus the login/users created so far would be leaked. A server
+        //   login in particular is instance-wide, so it survives long after the test database is
+        //   recreated. Opening the connection is inside the try for the same reason: a failed Open
+        //   still leaves a SqlConnection instance that nothing else will ever dispose.
+        try
         {
-            permissionsModificationCommand.CommandText = $"DENY SELECT ON [master].[sys].[all_columns] TO {_unprivilegedMasterUser.Name}";
-            permissionsModificationCommand.ExecuteNonQuery();
+            _managementConnection.Open();
+
+            _unprivilegedLogin = new ServerLogin(_managementConnection, nameof(UnprivilegedLogin), _managementConnection.Database);
+            _unprivilegedAppUser = new DatabaseUser(_managementConnection, _managementConnection.Database, _unprivilegedLogin);
+            _unprivilegedMasterUser = new DatabaseUser(_managementConnection, "master", _unprivilegedLogin);
+
+            using (SqlCommand permissionsModificationCommand = _managementConnection.CreateCommand())
+            {
+                permissionsModificationCommand.CommandText = $"DENY SELECT ON [master].[sys].[all_columns] TO {_unprivilegedMasterUser.Name}";
+                permissionsModificationCommand.ExecuteNonQuery();
 
-            permissionsModificationCommand.CommandText = $"DENY SELECT ON [{_managementConnection.Database}].[sys].[all_columns] TO {_unprivilegedAppUser.Name}";
-            permissionsModificationCommand.ExecuteNonQuery();
+                permissionsModificationCommand.CommandText = $"DENY SELECT ON [{_managementConnection.Database}].[sys].[all_columns] TO {_unprivilegedAppUser.Name}";
+                permissionsModificationCommand.ExecuteNonQuery();
+            }
+        }
+        catch
+        {
+            Dispose();
+            throw;
         }
 
         SqlConnectionStringBuilder tcpConnectionBuilder = new(DataTestUtility.TCPConnectionString)
@@ -205,9 +219,24 @@ public void BulkCopyWithoutMetadataPermission_FailsWhenUsingAliases()
 
     public void Dispose()
     {
-        _unprivilegedAppUser?.Dispose();
-        _unprivilegedMasterUser?.Dispose();
-        _unprivilegedLogin?.Dispose();
+        // Each drop is best-effort: a failure to remove one object must not prevent the others (in
+        // particular the instance-wide server login) from being removed.
+        DisposeSafely(_unprivilegedAppUser);
+        DisposeSafely(_unprivilegedMasterUser);
+        DisposeSafely(_unprivilegedLogin);
+
         _managementConnection?.Dispose();
     }
+
+    private static void DisposeSafely(IDisposable? disposable)
+    {
+        try
+        {
+            disposable?.Dispose();
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"{nameof(UnprivilegedLogin)}: cleanup failed: {ex.Message}");
+        }
+    }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs
index 828a87d63e..0dbb7cca8a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/CertificateTestWithTdsServer.cs
@@ -64,7 +64,18 @@ public CertificateTestWithTdsServer()
                 Directory.CreateDirectory(s_fullPathToClientCert);
             }
 
-            RunPowershellScript(s_fullPathToPowershellScript);
+            // NOTE: The setup script installs a certificate into the LocalMachine root store and writes
+            //   the scratch files. If it fails part way through, xUnit never calls Dispose, so run the
+            //   cleanup here to avoid leaving the certificate behind.
+            try
+            {
+                RunPowershellScript(s_fullPathToPowershellScript);
+            }
+            catch
+            {
+                Dispose();
+                throw;
+            }
         }
 
         private static bool IsLocalHost()
@@ -254,18 +265,43 @@ private X509Certificate2 GetEncryptionCertificate(string fileName, string? passw
 
         private void RemoveCertificate()
         {
-            string thumbprint = File.ReadAllText(s_fullPathTothumbprint);
-            using X509Store certStore = new(StoreName.Root, StoreLocation.LocalMachine);
-            certStore.Open(OpenFlags.ReadWrite);
-            X509Certificate2Collection certCollection = certStore.Certificates.Find(X509FindType.FindByThumbprint, thumbprint, false);
-            if (certCollection.Count > 0)
+            // NOTE: Each step is independent. Previously a missing thumbprint file (or a failed store
+            //   removal) aborted the whole cleanup, leaving the certificate in the LocalMachine root
+            //   store and the scratch directory on disk.
+            try
+            {
+                if (File.Exists(s_fullPathTothumbprint))
+                {
+                    string thumbprint = File.ReadAllText(s_fullPathTothumbprint);
+                    using X509Store certStore = new(StoreName.Root, StoreLocation.LocalMachine);
+                    certStore.Open(OpenFlags.ReadWrite);
+                    X509Certificate2Collection certCollection = certStore.Certificates.Find(X509FindType.FindByThumbprint, thumbprint, false);
+                    if (certCollection.Count > 0)
+                    {
+                        certStore.Remove(certCollection[0]);
+                    }
+                    certStore.Close();
+                }
+            }
+            catch (Exception ex)
             {
-                certStore.Remove(certCollection[0]);
+                Console.WriteLine($"{nameof(CertificateTestWithTdsServer)}: failed to remove certificate: {ex.Message}");
             }
-            certStore.Close();
 
-            File.Delete(s_fullPathTothumbprint);
-            Directory.Delete(s_fullPathToClientCert, true);
+            TryCleanup(() => File.Delete(s_fullPathTothumbprint));
+            TryCleanup(() => Directory.Delete(s_fullPathToClientCert, true));
+        }
+
+        private static void TryCleanup(Action cleanupAction)
+        {
+            try
+            {
+                cleanupAction();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"{nameof(CertificateTestWithTdsServer)}: cleanup step failed: {ex.Message}");
+            }
         }
 
         private static void RemoveForceEncryptionFromRegistryPath(string registryPath)
@@ -292,8 +328,17 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposing && !string.IsNullOrEmpty(s_fullPathTothumbprint))
                 {
-                    RemoveCertificate();
-                    RemoveForceEncryptionFromRegistryPath(ForceEncryptionRegistryPath);
+                    // NOTE: The registry/service reset must run even if certificate removal fails,
+                    //   otherwise the SQL Server instance is left with ForceEncryption enabled and a
+                    //   reference to a certificate that may no longer exist.
+                    try
+                    {
+                        RemoveCertificate();
+                    }
+                    finally
+                    {
+                        RemoveForceEncryptionFromRegistryPath(ForceEncryptionRegistryPath);
+                    }
                 }
             }
             else
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs
index fbbee8db26..3b42d7b1c8 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/ConnectivityTest.cs
@@ -24,10 +24,10 @@ public static class ConnectivityTest
         private static readonly string s_dbConnectionString = new SqlConnectionStringBuilder(s_connectionString) { InitialCatalog = s_databaseName }.ConnectionString;
         private static readonly string s_createDatabaseCmd = $"CREATE DATABASE {s_databaseName}";
         private static readonly string s_createTableCmd = $"CREATE TABLE {s_tableName} (NAME NVARCHAR(40), AGE INT)";
-        private static readonly string s_alterDatabaseSingleCmd = $"ALTER DATABASE {s_databaseName} SET SINGLE_USER WITH ROLLBACK IMMEDIATE;";
-        private static readonly string s_alterDatabaseMultiCmd = $"ALTER DATABASE {s_databaseName} SET MULTI_USER WITH ROLLBACK IMMEDIATE;";
+        private static readonly string s_alterDatabaseSingleCmd = $"IF (EXISTS(SELECT 1 FROM sys.databases WHERE name = '{s_databaseName}')) ALTER DATABASE {s_databaseName} SET SINGLE_USER WITH ROLLBACK IMMEDIATE;";
+        private static readonly string s_alterDatabaseMultiCmd = $"IF (EXISTS(SELECT 1 FROM sys.databases WHERE name = '{s_databaseName}')) ALTER DATABASE {s_databaseName} SET MULTI_USER WITH ROLLBACK IMMEDIATE;";
         private static readonly string s_selectTableCmd = $"SELECT COUNT(*) FROM {s_tableName}";
-        private static readonly string s_dropDatabaseCmd = $"DROP DATABASE {s_databaseName}";
+        private static readonly string s_dropDatabaseCmd = $"IF (EXISTS(SELECT 1 FROM sys.databases WHERE name = '{s_databaseName}')) DROP DATABASE {s_databaseName}";
 
         // Synapse: Stored procedure sp_who2 does not exist or is not supported.
         // Synapse: SqlConnection.ServerProcessId is always retrieved as 0.
@@ -263,8 +263,19 @@ public static void ConnectionKilledTest()
             }
             finally
             {
-                // Kill all the connections, set Database to SINGLE_USER Mode and drop Database
-                DataTestUtility.RunNonQuery(s_connectionString, s_alterDatabaseSingleCmd, 4);
+                // Kill all the connections, set Database to SINGLE_USER Mode and drop Database.
+                // NOTE: The database name embeds a GUID, so failing to drop it leaks a database that
+                //   nothing will ever reclaim. Switching to SINGLE_USER is only an optimization to
+                //   evict other sessions, so its failure must not prevent the drop from running.
+                try
+                {
+                    DataTestUtility.RunNonQuery(s_connectionString, s_alterDatabaseSingleCmd, 4);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"{nameof(ConnectionKilledTest)}: failed to set '{s_databaseName}' to SINGLE_USER: {ex.Message}");
+                }
+
                 DataTestUtility.RunNonQuery(s_connectionString, s_dropDatabaseCmd, 4);
             }
         }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
index 4e5fa29c7d..629ce3785e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/JsonTest/JsonBulkCopyTest.cs
@@ -15,7 +15,7 @@
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.SQL.JsonTest
 {
     [Trait("Set", "3")]
-    public class JsonBulkCopyTest
+    public class JsonBulkCopyTest : IDisposable
     {
         private readonly ITestOutputHelper _output;
         private static readonly string _generatedJsonFile = DataTestUtility.GetShortName("randomRecords");
@@ -28,6 +28,37 @@ public JsonBulkCopyTest(ITestOutputHelper output)
             _output = output;
         }
 
+        /// <summary>
+        /// Drops the tables and removes the scratch files created by the tests.
+        /// </summary>
+        /// <remarks>
+        /// The table names embed a GUID, so without this the tests left two tables behind in the
+        /// shared test database on every run.
+        /// </remarks>
+        public void Dispose()
+        {
+            try
+            {
+                if (DataTestUtility.AreConnStringsSetup() && DataTestUtility.IsJsonSupported)
+                {
+                    using SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString);
+                    connection.Open();
+
+                    DataTestUtility.DropTable(connection, _sourceTableName);
+                    DataTestUtility.DropTable(connection, _destinationTableName);
+                }
+            }
+            catch (Exception ex)
+            {
+                _output.WriteLine($"{nameof(JsonBulkCopyTest)}: failed to drop test tables: {ex.Message}");
+            }
+            finally
+            {
+                DeleteFile(_generatedJsonFile);
+                DeleteFile(_outputFile);
+            }
+        }
+
         public static IEnumerable<object[]> JsonBulkCopyTestData()
         {
             yield return new object[] { CommandBehavior.Default, false, 30, 10 };
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs
index 6f3f74fe4e..4f59823b79 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParallelTransactionsTest/ParallelTransactionsTest.cs
@@ -43,25 +43,21 @@ private static void BasicParallelTest(string connectionString, string tempTableN
                 SqlTransaction trans2 = connection.BeginTransaction();
                 SqlTransaction trans3 = connection.BeginTransaction();
 
-                SqlCommand com1 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
+                using SqlCommand com1 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
                 com1.Transaction = trans1;
                 com1.ExecuteNonQuery();
 
-                SqlCommand com2 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
+                using SqlCommand com2 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
                 com2.Transaction = trans2;
                 com2.ExecuteNonQuery();
 
-                SqlCommand com3 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
+                using SqlCommand com3 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
                 com3.Transaction = trans3;
                 com3.ExecuteNonQuery();
 
                 trans1.Rollback();
                 trans2.Rollback();
                 trans3.Rollback();
-
-                com1.Dispose();
-                com2.Dispose();
-                com3.Dispose();
             }
         }
 
@@ -100,15 +96,15 @@ private static void MultipleExecutesInSameTransactionTest(string connectionStrin
                 SqlTransaction trans2 = connection.BeginTransaction();
                 SqlTransaction trans3 = connection.BeginTransaction();
 
-                SqlCommand com1 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
+                using SqlCommand com1 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
                 com1.Transaction = trans1;
                 com1.ExecuteNonQuery();
 
-                SqlCommand com2 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
+                using SqlCommand com2 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
                 com2.Transaction = trans2;
                 com2.ExecuteNonQuery();
 
-                SqlCommand com3 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
+                using SqlCommand com3 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
                 com3.Transaction = trans3;
                 com3.ExecuteNonQuery();
 
@@ -116,15 +112,14 @@ private static void MultipleExecutesInSameTransactionTest(string connectionStrin
                 trans2.Rollback();
                 trans3.Rollback();
 
-                com1.Dispose();
-                com2.Dispose();
-                com3.Dispose();
-
-                SqlCommand com4 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
+                using SqlCommand com4 = new SqlCommand("select top 1 EmployeeID from " + tempTableName, connection);
                 com4.Transaction = trans1;
-                SqlDataReader reader4 = com4.ExecuteReader();
-                reader4.Dispose();
-                com4.Dispose();
+                using (SqlDataReader reader4 = com4.ExecuteReader())
+                {
+                    // Scoped deliberately: MARS is off here, so the reader must be closed before
+                    // the rollback below, which would otherwise fail on a connection that still
+                    // has an open reader.
+                }
 
                 trans1.Rollback();
             }
@@ -138,7 +133,7 @@ private static string CreateTempTable(string connectionString)
             using (var conn = new SqlConnection(connectionString))
             {
                 conn.Open();
-                SqlCommand cmd = new SqlCommand(string.Format("SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country into {0} from Employees", tempTableName), conn);
+                using SqlCommand cmd = new SqlCommand(string.Format("SELECT EmployeeID, LastName, FirstName, Title, Address, City, Region, PostalCode, Country into {0} from Employees", tempTableName), conn);
                 cmd.ExecuteNonQuery();
                 cmd.CommandText = string.Format("alter table {0} add constraint EmployeeID_{1} primary key (EmployeeID)", tempTableName, uniqueKey);
                 cmd.ExecuteNonQuery();
@@ -147,13 +142,26 @@ private static string CreateTempTable(string connectionString)
             return tempTableName;
         }
 
+        /// <remarks>
+        /// Best-effort: both callers invoke this from a <c>finally</c>, so a throw here would surface
+        /// in place of the failure that is already propagating and hide the real test result. The
+        /// table is named on failure so the leak stays attributable.
+        /// </remarks>
         private static void DropTempTable(string connectionString, string tempTableName)
         {
-            using (SqlConnection con1 = new SqlConnection(connectionString))
+            try
             {
-                con1.Open();
-                SqlCommand cmd = new SqlCommand("Drop table " + tempTableName, con1);
-                cmd.ExecuteNonQuery();
+                using (SqlConnection con1 = new SqlConnection(connectionString))
+                {
+                    con1.Open();
+                    using SqlCommand cmd = new SqlCommand(
+                        string.Format("IF (OBJECT_ID('{0}') IS NOT NULL) DROP TABLE {0}", tempTableName), con1);
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Failed to drop temp table '{tempTableName}'; it may be orphaned in the test database. {ex}");
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs
index a8baee786c..2373171a04 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpTest.cs
@@ -295,26 +295,16 @@ private void TestTVPPermutations(SteStructuredTypeBoundaries bounds, bool runOnl
                     continue;
                 }
 
-                // Send list of SqlDataRecords as value
-                Console.WriteLine("------IEnumerable<SqlDataRecord>---------");
+                // NOTE: The server objects created above (a table type and a stored procedure) must be
+                //   dropped even when the body below throws. Their names are unique per permutation,
+                //   so anything left behind stays in the shared test database forever.
                 try
                 {
-                    param.Value = CreateListOfRecords(tvpPerm, baseValues);
-                    ExecuteAndVerify(cmd, tvpPerm, baseValues, null);
-                }
-                catch (ArgumentException ae)
-                {
-                    // some argument exceptions expected and should be swallowed
-                    Console.WriteLine("Argument exception in value setup: {0}", ae.Message);
-                }
-
-                if (!runOnlyDataRecordTest)
-                {
-                    // send DbDataReader
-                    Console.WriteLine("------DbDataReader---------");
+                    // Send list of SqlDataRecords as value
+                    Console.WriteLine("------IEnumerable<SqlDataRecord>---------");
                     try
                     {
-                        param.Value = new TvpRestartableReader(CreateListOfRecords(tvpPerm, baseValues));
+                        param.Value = CreateListOfRecords(tvpPerm, baseValues);
                         ExecuteAndVerify(cmd, tvpPerm, baseValues, null);
                     }
                     catch (ArgumentException ae)
@@ -323,17 +313,35 @@ private void TestTVPPermutations(SteStructuredTypeBoundaries bounds, bool runOnl
                         Console.WriteLine("Argument exception in value setup: {0}", ae.Message);
                     }
 
-                    // send datasets
-                    Console.WriteLine("------DataTables---------");
-                    foreach (DataTable d in dtList)
+                    if (!runOnlyDataRecordTest)
                     {
-                        param.Value = d;
-                        ExecuteAndVerify(cmd, tvpPerm, null, d);
+                        // send DbDataReader
+                        Console.WriteLine("------DbDataReader---------");
+                        try
+                        {
+                            param.Value = new TvpRestartableReader(CreateListOfRecords(tvpPerm, baseValues));
+                            ExecuteAndVerify(cmd, tvpPerm, baseValues, null);
+                        }
+                        catch (ArgumentException ae)
+                        {
+                            // some argument exceptions expected and should be swallowed
+                            Console.WriteLine("Argument exception in value setup: {0}", ae.Message);
+                        }
+
+                        // send datasets
+                        Console.WriteLine("------DataTables---------");
+                        foreach (DataTable d in dtList)
+                        {
+                            param.Value = d;
+                            ExecuteAndVerify(cmd, tvpPerm, null, d);
+                        }
                     }
                 }
-
-                // And clean up
-                DropServerObjects(tvpPerm);
+                finally
+                {
+                    // And clean up
+                    DropServerObjects(tvpPerm);
+                }
 
                 iter++;
             }
@@ -892,11 +900,20 @@ private bool DoesRowMatchMetadata(object[] row, DataTable table)
 
         private void DropServerObjects(StePermutation tvpPerm)
         {
-            string dropText = "DROP PROC " + GetProcName(tvpPerm) + "; DROP TYPE " + GetTypeName(tvpPerm);
             using SqlConnection conn = new(_connStr);
             conn.Open();
 
-            SqlCommand cmd = new(dropText, conn);
+            // NOTE: The procedure and the type are dropped by separate, individually guarded commands.
+            //   Previously both drops shared a single batch, so when the procedure did not exist (the
+            //   CREATE PROC step failed after CREATE TYPE succeeded) the batch aborted on the first
+            //   statement and the table type was leaked into the shared test database.
+            DropServerObject(conn, "DROP PROC IF EXISTS " + GetProcName(tvpPerm));
+            DropServerObject(conn, "DROP TYPE IF EXISTS " + GetTypeName(tvpPerm));
+        }
+
+        private static void DropServerObject(SqlConnection conn, string dropText)
+        {
+            using SqlCommand cmd = new(dropText, conn);
             try
             {
                 cmd.ExecuteNonQuery();
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs
index 38295bd953..628ebfefe6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCredentialTest/SqlCredentialTest.cs
@@ -198,18 +198,36 @@ private static void CreateTestUser(string username, string password)
         private static void DropTestUser(string username)
         {
             // Removes a created test user.
-            string dropUserCmd = $"IF EXISTS (SELECT * FROM sys.schemas WHERE name = '{username}') BEGIN DROP SCHEMA {username} END;"
-                                + $"IF EXISTS (SELECT * FROM sys.database_principals WHERE type = 'S' AND name = '{username}') BEGIN DROP USER {username} END;"
-                                + $"DROP LOGIN {username}";
+            // NOTE: Each statement runs independently and is guarded so that a failure to drop the
+            //   schema or database user does not leak the login, which is instance-wide and would
+            //   otherwise survive well beyond the test run.
+            string[] dropStatements =
+            {
+                $"IF EXISTS (SELECT * FROM sys.schemas WHERE name = '{username}') BEGIN DROP SCHEMA {username} END;",
+                $"IF EXISTS (SELECT * FROM sys.database_principals WHERE type = 'S' AND name = '{username}') BEGIN DROP USER {username} END;",
+                $"IF EXISTS (SELECT * FROM sys.server_principals WHERE name = '{username}') BEGIN DROP LOGIN {username} END;",
+            };
 
             // Pool must be cleared to prevent DROP LOGIN failure.
             SqlConnection.ClearAllPools();
 
             using (var conn = new SqlConnection(DataTestUtility.TCPConnectionString))
-            using (var cmd = new SqlCommand(dropUserCmd, conn))
+            using (var cmd = new SqlCommand(string.Empty, conn))
             {
                 conn.Open();
-                cmd.ExecuteNonQuery();
+
+                foreach (string statement in dropStatements)
+                {
+                    try
+                    {
+                        cmd.CommandText = statement;
+                        cmd.ExecuteNonQuery();
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"{nameof(SqlCredentialTest)}: cleanup statement failed ({statement}): {ex.Message}");
+                    }
+                }
             }
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
index 97bae04165..275a5b4bbf 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlNotificationTest/SqlNotificationTest.cs
@@ -31,7 +31,19 @@ public SqlNotificationTest()
 
             _schemaQueue = $"[{_queueName}]";
 
-            Setup();
+            // NOTE: If setup fails part way through (for example the queue is created but the service
+            //   is not), this constructor never returns, so xUnit never calls Dispose and the objects
+            //   created so far would be leaked. Their names embed a GUID and xUnit creates one
+            //   instance per test method, so those leaks accumulate quickly.
+            try
+            {
+                Setup();
+            }
+            catch
+            {
+                Cleanup();
+                throw;
+            }
         }
 
         public void Dispose()
@@ -310,10 +322,13 @@ private static string[] CreateSqlSetupStatements(string tableName, string queueN
 
         private static string[] CreateSqlCleanupStatements(string tableName, string queueName, string serviceName)
         {
+            // NOTE: Every statement is guarded so that cleanup is idempotent and so that a failure to
+            //   remove one object does not leave the others (in particular the Service Broker queue
+            //   and service) behind in the shared test database.
             return new string[] {
-                string.Format("DROP TABLE {0}", tableName),
-                string.Format("DROP SERVICE [{0}]", serviceName),
-                string.Format("DROP QUEUE {0}", queueName)
+                string.Format("IF (OBJECT_ID('{0}') IS NOT NULL) DROP TABLE {0}", tableName),
+                string.Format("IF EXISTS (SELECT 1 FROM sys.services WHERE name = '{0}') DROP SERVICE [{0}]", serviceName),
+                string.Format("IF (OBJECT_ID('{0}') IS NOT NULL) DROP QUEUE {0}", queueName)
             };
         }
 
@@ -324,7 +339,19 @@ private void Setup()
 
         private void Cleanup()
         {
-            RunSQL(CreateSqlCleanupStatements(_tableName, _schemaQueue, _serviceName));
+            // Each statement is executed independently: one failure must not prevent the remaining
+            // objects from being dropped.
+            foreach (string statement in CreateSqlCleanupStatements(_tableName, _schemaQueue, _serviceName))
+            {
+                try
+                {
+                    RunSQL(statement);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"{nameof(SqlNotificationTest)}: cleanup statement failed ({statement}): {ex.Message}");
+                }
+            }
         }
 
         private int RunSQL(params string[] stmts)
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs
index 9aea760e56..91742465e3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs
@@ -174,11 +174,28 @@ private void DropTempTables()
             {
                 using (var conn = new SqlConnection(_connectionString))
                 {
-                    SqlCommand command = new SqlCommand(
-                            string.Format("DROP TABLE [{0}]; DROP TABLE [{1}]", _tempTableName1, _tempTableName2), conn);
                     conn.Open();
+
+                    // NOTE: The drops are guarded and issued separately. Previously they shared a
+                    //   single unguarded batch, so a failure to drop the first table also leaked
+                    //   the second one.
+                    DropTempTable(conn, _tempTableName1);
+                    DropTempTable(conn, _tempTableName2);
+                }
+            }
+
+            private static void DropTempTable(SqlConnection connection, string tableName)
+            {
+                try
+                {
+                    using SqlCommand command = new SqlCommand(
+                        string.Format("IF (OBJECT_ID('[{0}]') IS NOT NULL) DROP TABLE [{0}]", tableName), connection);
                     command.ExecuteNonQuery();
                 }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"TransactionTest: failed to drop table '{tableName}': {ex.Message}");
+                }
             }
 
             public void ResetTables()
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorTestsBase.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorTestsBase.cs
index 5c9970f6ed..a69a943e3d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorTestsBase.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/NativeVectorTestsBase.cs
@@ -110,11 +110,16 @@ public NativeVectorTestsBase()
 
             _connectionString = DataTestUtility.TCPConnectionString;
             _managementConnection = new SqlConnection(_connectionString);
-            _vectorTable = new Table(_managementConnection, "VectorTestTable", tableDefinition);
-            _bulkCopySourceTable = new Table(_managementConnection, "VectorBulkCopyTestTable", tableDefinition);
-            _vectorProcedure = new StoredProcedure(_managementConnection,
-                prefix: "VectorsAsVarcharSp",
-                definition: $@"
+
+            // NOTE: If this constructor throws, xUnit never calls Dispose, so any object already created
+            //   (each of which has a GUID-based name) would be left in the database permanently.
+            try
+            {
+                _vectorTable = new Table(_managementConnection, "VectorTestTable", tableDefinition);
+                _bulkCopySourceTable = new Table(_managementConnection, "VectorBulkCopyTestTable", tableDefinition);
+                _vectorProcedure = new StoredProcedure(_managementConnection,
+                    prefix: "VectorsAsVarcharSp",
+                    definition: $@"
                 {VectorParameterName} vector({vectorDimensions}, {TestDataInstance.SqlServerTypeName}),   -- Input: Serialized TElement[] as JSON string
                 {VectorOutputParameterName} vector({vectorDimensions}, {TestDataInstance.SqlServerTypeName}) OUTPUT  -- Output: Echoed back from latest inserted row
                 AS
@@ -130,6 +135,12 @@ public NativeVectorTestsBase()
                 FROM {_vectorTable.Name}
                 ORDER BY Id DESC;
                 END;");
+            }
+            catch
+            {
+                Dispose();
+                throw;
+            }
 
             _selectCommand = $"SELECT {VectorColumnName} FROM {_vectorTable.Name} ORDER BY Id DESC";
             _insertCommand = $"INSERT INTO {_vectorTable.Name} ({VectorColumnName}) VALUES ({VectorParameterName})";
@@ -150,15 +161,28 @@ protected virtual void Dispose(bool disposing)
 
             if (disposing)
             {
-                _vectorProcedure?.Dispose();
-                _bulkCopySourceTable?.Dispose();
-                _vectorTable?.Dispose();
+                // Each drop is best-effort: failing to drop one object must not leak the others.
+                DisposeSafely(_vectorProcedure);
+                DisposeSafely(_bulkCopySourceTable);
+                DisposeSafely(_vectorTable);
                 _managementConnection?.Dispose();
             }
 
             _disposed = true;
         }
 
+        private static void DisposeSafely(IDisposable? disposable)
+        {
+            try
+            {
+                disposable?.Dispose();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"{nameof(NativeVectorTestsBase<TElement, TTestData>)}: cleanup failed: {ex.Message}");
+            }
+        }
+
         ~NativeVectorTestsBase() =>
             Dispose(false);
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorBackwardCompatTestBase.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorBackwardCompatTestBase.cs
index 1b2d4c792f..03298d3e37 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorBackwardCompatTestBase.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/VectorTest/VectorBackwardCompatTestBase.cs
@@ -47,15 +47,22 @@ protected VectorBackwardCompatTestBase(
         {
             Output = output;
             _connection = new SqlConnection(s_connectionString);
-            _connection.Open();
 
-            _vectorTable = new Table(_connection, namePrefix + "TestTable",
-                $"(Id INT PRIMARY KEY IDENTITY, VectorData {columnDefinition} NULL)");
+            // NOTE: If this constructor throws, xUnit never calls Dispose, so the connection and the
+            //   objects created so far (each with a GUID-based name) would be left behind permanently.
+            //   Opening the connection is inside the try for the same reason: a failed Open still
+            //   leaves a SqlConnection instance that nothing else will ever dispose.
+            try
+            {
+                _connection.Open();
+
+                _vectorTable = new Table(_connection, namePrefix + "TestTable",
+                    $"(Id INT PRIMARY KEY IDENTITY, VectorData {columnDefinition} NULL)");
 
-            _bulkCopySrcTable = new Table(_connection, namePrefix + "BulkCopyTestTable",
-                "(Id INT PRIMARY KEY IDENTITY, VectorData varchar(max) NULL)");
+                _bulkCopySrcTable = new Table(_connection, namePrefix + "BulkCopyTestTable",
+                    "(Id INT PRIMARY KEY IDENTITY, VectorData varchar(max) NULL)");
 
-            string storedProcBody = $@"
+                string storedProcBody = $@"
                 @InputVectorJson VARCHAR(MAX),   -- Input: Serialized float[] as JSON string
                 @OutputVectorJson VARCHAR(MAX) OUTPUT  -- Output: Echoed back from latest inserted row
                 AS
@@ -72,7 +79,13 @@ @OutputVectorJson VARCHAR(MAX) OUTPUT  -- Output: Echoed back from latest insert
                 ORDER BY Id DESC;
                 END;";
 
-            _storedProc = new StoredProcedure(_connection, namePrefix + "AsVarcharSp", storedProcBody);
+                _storedProc = new StoredProcedure(_connection, namePrefix + "AsVarcharSp", storedProcBody);
+            }
+            catch
+            {
+                Dispose();
+                throw;
+            }
 
             _selectCmdString = $"SELECT VectorData FROM {_vectorTable.Name} ORDER BY Id DESC";
             _insertCmdString = $"INSERT INTO {_vectorTable.Name} (VectorData) VALUES (@VectorData)";
@@ -80,13 +93,32 @@ @OutputVectorJson VARCHAR(MAX) OUTPUT  -- Output: Echoed back from latest insert
 
         public void Dispose()
         {
-            // RAII objects drop themselves on Dispose in reverse order.
-            _storedProc?.Dispose();
-            _bulkCopySrcTable?.Dispose();
-            _vectorTable?.Dispose();
+            // RAII objects drop themselves on Dispose in reverse order. Each drop is best-effort so
+            // that one failure cannot leak the remaining objects.
+            DisposeSafely(_storedProc);
+            DisposeSafely(_bulkCopySrcTable);
+            DisposeSafely(_vectorTable);
             _connection?.Dispose();
         }
 
+        // NOTE: This file is not in a nullable annotations context, so the parameter is annotated
+        //   under a scoped `#nullable enable`. The nullability is not incidental: on the
+        //   constructor-failure path Dispose runs with some of these fields still null, so accepting
+        //   null is the contract rather than a defensive afterthought.
+#nullable enable
+        private static void DisposeSafely(IDisposable? disposable)
+#nullable restore
+        {
+            try
+            {
+                disposable?.Dispose();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"{nameof(VectorBackwardCompatTestBase)}: cleanup failed: {ex.Message}");
+            }
+        }
+
         #region Shared Helpers
 
         /// <summary>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Fixtures/AlwaysEncrypted/NativeColumnEncryptionKeyCertificateBaselineFixture.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Fixtures/AlwaysEncrypted/NativeColumnEncryptionKeyCertificateBaselineFixture.cs
index d0cfc2a842..8994316343 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Fixtures/AlwaysEncrypted/NativeColumnEncryptionKeyCertificateBaselineFixture.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Fixtures/AlwaysEncrypted/NativeColumnEncryptionKeyCertificateBaselineFixture.cs
@@ -51,15 +51,28 @@ public NativeColumnEncryptionKeyCertificateBaselineFixture()
         : base()
     {
         byte[] nativeCertificateBaseline = Resources.AlwaysEncrypted_NativeColumnEncryptionKeyBaseline_Certificate;
+
+        // NOTE: The certificate is deliberately not disposed here. It is owned by the base fixture, which
+        //   removes it from the store on cleanup - and a disposed certificate cannot be matched against a
+        //   store, so disposing it early left it behind in the current user's store permanently.
 #if NET9_0_OR_GREATER
-        using X509Certificate2 certificate = X509CertificateLoader.LoadPkcs12(nativeCertificateBaseline, NativeCertificatePassword,
+        X509Certificate2 certificate = X509CertificateLoader.LoadPkcs12(nativeCertificateBaseline, NativeCertificatePassword,
             keyStorageFlags: X509KeyStorageFlags.PersistKeySet);
 #else
-        using X509Certificate2 certificate = new(nativeCertificateBaseline, NativeCertificatePassword,
+        X509Certificate2 certificate = new(nativeCertificateBaseline, NativeCertificatePassword,
             X509KeyStorageFlags.PersistKeySet);
 #endif
 
-        Thumbprint = certificate.Thumbprint;
-        AddToStore(certificate, StoreLocation.CurrentUser, StoreName.My);
+        try
+        {
+            Thumbprint = certificate.Thumbprint;
+            AddToStore(certificate, StoreLocation.CurrentUser, StoreName.My);
+        }
+        catch
+        {
+            Dispose();
+            certificate.Dispose();
+            throw;
+        }
     }
 }

From 96b79aceed9de3e53c5974b4b76c0afe75727939 Mon Sep 17 00:00:00 2001
From: Edward Neal <55035479+edwardneal@users.noreply.github.com>
Date: Thu, 10 Sep 2026 08:22:23 +0100
Subject: [PATCH 283/298] Documentation | Correct SqlDataRecord, SqlMetaData
 documentation (#4440)

* Correct SqlMetaData documentation

* Correct SqlDataRecord documentation

* First round of review feedback

* Correct comments in SqlDataRecord.cs code (and identical snippet in docs.)
* Grammar fix in SqlMetaData.xml.
* Place summary/remarks/example tags in the correct order.
* Use correct syntax for a reference to IEnumerable<SqlDataRecord>.

* Second round of review feedback
---
 doc/samples/SqlDataRecord.cs                  | 56 +++++++++----------
 doc/samples/SqlMetaData.cs                    | 19 ++++---
 .../SqlDataRecord.xml                         | 32 ++++++-----
 .../SqlMetaData.xml                           | 27 +++++----
 4 files changed, 71 insertions(+), 63 deletions(-)

diff --git a/doc/samples/SqlDataRecord.cs b/doc/samples/SqlDataRecord.cs
index f81de5b850..18981dc7db 100644
--- a/doc/samples/SqlDataRecord.cs
+++ b/doc/samples/SqlDataRecord.cs
@@ -2,10 +2,9 @@
 namespace SqlDataRecordCS;
 
 using System;
+using System.Collections.Generic;
 using System.Data;
-using System.Data.Sql;
-using System.Data.SqlTypes;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 public sealed partial class SqlDataRecordTester
 {
@@ -13,41 +12,40 @@ private SqlDataRecordTester()
    {
    }
 
-[SqlProcedure]
-public static void CallTestMethods()
-{
-   CreateNewRecord();
-   CreateNewRecord1();
-
-}
-
 //<Snippet1>
+//using System;
+//using System.Collections.Generic;
+//using System.Data;
 //using Microsoft.Data.SqlClient.Server;
 
-[SqlProcedure]
-public static void CreateNewRecord()
+// Stream rows to SQL Server as a table-valued parameter.
+public static IEnumerable<SqlDataRecord> GetRecords()
 {
-
-   // Variables.
-   SqlDataRecord record;    
+    // Re-use a single SqlDataRecord instance rather than allocating a new one for each row.
+    // Each row's values are read before SqlCommand advances to the next one.
+    SqlDataRecord record;
       
-   // Create a new record with the column metadata. The constructor is 
-   // able to accept a variable number of parameters. 
-   record = new SqlDataRecord(new SqlMetaData[] { new SqlMetaData("Column1", SqlDbType.NVarChar, 12), 
+    // Create a new record with the column metadata. The constructor is 
+    // able to accept a variable number of parameters. 
+    record = new SqlDataRecord(new SqlMetaData[] { new SqlMetaData("Column1", SqlDbType.NVarChar, 12), 
                                                   new SqlMetaData("Column2", SqlDbType.Int), 
                                                   new SqlMetaData("Column3", SqlDbType.DateTime) });
 
-   // Set the record fields.
-   record.SetString(0, "Hello World!");
-   record.SetInt32(1, 42);
-   record.SetDateTime(2, DateTime.Now);
+    // Set the record fields.
+    record.SetString(0, "Hello World!");
+    record.SetInt32(1, 42);
+    record.SetDateTime(2, DateTime.Now);
 
-   // Send the record to the calling program.
-   SqlContext.Pipe.Send(record);
+    // Stream the first record to SQL Server.
+    yield return record;
+
+    // Set the fields of the second record and stream it to SQL Server.
+    record.SetInt32(1, 0);
+    yield return record;
 }
 //</Snippet1>
 
-public static void CreateNewRecord1()
+public static void CreateNewRecord()
 {
 
 //<Snippet2>
@@ -65,15 +63,11 @@ public static void CreateNewRecord1()
 // Create a new record with the column metadata.      
 record = new SqlDataRecord(new SqlMetaData[] { column1Info, 
                                                   column2Info });
-//</Snippet2>
-
 // Set the record fields.
 record.SetString(0, "Hello World!");
 record.SetInt32(1, 42);
 
-// Send the record to the calling program.
-SqlContext.Pipe.Send(record);
-   
+//</Snippet2>
 }
 }
 #endif
diff --git a/doc/samples/SqlMetaData.cs b/doc/samples/SqlMetaData.cs
index c23cf363b7..fd6e2fff6b 100644
--- a/doc/samples/SqlMetaData.cs
+++ b/doc/samples/SqlMetaData.cs
@@ -2,10 +2,9 @@
 namespace SqlMetaDataCS;
 
 using System;
+using System.Collections.Generic;
 using System.Data;
-using System.Data.Sql;
-using System.Data.SqlTypes;
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 public sealed partial class SqlMetaDataTester
 {
@@ -14,10 +13,12 @@ private SqlMetaDataTester()
     }
 
     //<Snippet1>
+    // using System;
+    // using System.Collections.Generic;
+    // using System.Data;
     // using Microsoft.Data.SqlClient.Server;
 
-    [SqlProcedure]
-    public static void CreateNewRecord()
+    public static IEnumerable<SqlDataRecord> ReturnNewRecords()
     {
         // Variables.
         SqlMetaData column1Info;
@@ -35,13 +36,15 @@ public static void CreateNewRecord()
                                                   column2Info,
                                                   column3Info });
 
-        // Set the record fields.
+        // Set the fields of the first record and stream it to SQL Server.
         record.SetString(0, "Hello World!");
         record.SetInt32(1, 42);
         record.SetDateTime(2, DateTime.Now);
+        yield return record;
 
-        // Send the record to the calling program.
-        SqlContext.Pipe.Send(record);
+        // Set the fields of the second record and stream it to SQL Server.
+        record.SetInt32(1, 0);
+        yield return record;
     }
     //</Snippet1>
 
diff --git a/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml b/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml
index 7b0af6f6c9..c8b69e73c9 100644
--- a/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml
@@ -1,4 +1,4 @@
-<docs>
+<docs>
   <members name="SqlDataRecord">
     <SqlDataRecord>
       <summary>
@@ -6,25 +6,28 @@
       </summary>
       <remarks>
         <para>
-          This class is used together with <see cref="T:Microsoft.SqlServer.Server.SqlPipe" /> to send result sets to the client from managed code stored-procedures.
+          This class describes a single row of a table-valued parameter. Construct one from an array of <see cref="T:Microsoft.Data.SqlClient.Server.SqlMetaData" /> objects which describe the column metadata of the record, populate it with the <b>Set&lt;Type&gt;</b> methods, include it in an <c>IEnumerable&lt;SqlDataRecord&gt;</c> and assign that <c>IEnumerable&lt;SqlDataRecord&gt;</c> to <see cref="P:Microsoft.Data.SqlClient.SqlParameter.Value" />.
         </para>
         <para>
-          When writing common language runtime (CLR) applications, you should re-use existing <b>SqlDataRecord</b> objects instead of creating new ones every time. Creating many new <b>SqlDataRecord</b> objects could severely deplete memory and adversely affect performance.
+          For best performance when sending multiple rows, re-use a single <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> instance across an <c>IEnumerable&lt;SqlDataRecord&gt;</c> iterator: set new column values and <see langword="yield return" /> the same instance for each row. <see cref="T:Microsoft.Data.SqlClient.SqlCommand" /> will read each record before advancing to the next.
         </para>
       </remarks>
       <example>
         <para>
-          The following example shows how to create several <see cref="T:Microsoft.Data.SqlClient.Server.SqlMetaData" /> objects, which describe the column metadata of a record, and creating a <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" />. The column values of the <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> are set and the <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> is sent to the calling program by using the <see cref="T:Microsoft.SqlServer.Server.SqlContext" /> class.
+          The following example shows how to create several <see cref="T:Microsoft.Data.SqlClient.Server.SqlMetaData" /> objects describing the column metadata of a record, then to create a re-usable <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> instance. The column values of the <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> are set and the same <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> can be used to stream multiple rows to SQL Server as a table-valued parameter.
         </para>
         <!-- SqlDataRecord #1 -->
         <code language="c#">
+          using System;
+          using System.Collections.Generic;
+          using System.Data;
           using Microsoft.Data.SqlClient.Server;
-          
-          [Microsoft.Data.SqlClient.Server.SqlProcedure]
-          public static void CreateNewRecord()
+
+          // Stream rows to SQL Server as a table-valued parameter.
+          public static IEnumerable&lt;SqlDataRecord&gt; CreateNewRecord()
           {
-          
-             // Variables.
+             // Re-use a single SqlDataRecord instance rather than allocating a new one for each row.
+             // Each row's values are read before SqlCommand advances to the next one.
              SqlDataRecord record;    
                 
              // Create a new record with the column metadata. The constructor is 
@@ -38,8 +41,12 @@
              record.SetInt32(1, 42);
              record.SetDateTime(2, DateTime.Now);
           
-             // Send the record to the calling program.
-             SqlContext.Pipe.Send(record);
+             // Stream the first record to SQL Server.
+             yield return record;
+
+             // Set the fields of the second record and stream it to SQL Server.
+             record.SetInt32(1, 0);
+             yield return record;
           }
         </code>
       </example>
@@ -75,9 +82,6 @@
           // Set the record fields.
           record.SetString(0, "Hello World!");
           record.SetInt32(1, 42);
-          
-          // Send the record to the calling program.
-          SqlContext.Pipe.Send(record);
         </code>
       </example>
       <exception cref="T:System.ArgumentNullException">
diff --git a/doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml b/doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml
index cbabfd8cb0..492e85e46b 100644
--- a/doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml
@@ -1,19 +1,24 @@
-<docs>
+<docs>
   <members name="SqlMetaData">
     <SqlMetaData>
       <summary>
-        Specifies and retrieves metadata information from parameters and columns of <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> objects. This class cannot be inherited.
+        Specifies the metadata information of a column used by a <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> object. This class cannot be inherited.
       </summary>
+      <remarks>
+        <see cref="T:Microsoft.Data.SqlClient.Server.SqlMetaData" /> instances are typically built once and reused to construct many <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> objects which are streamed to SQL Server as a table-valued parameter. For more information, see <see href="https://learn.microsoft.com/sql/connect/ado-net/sql/table-valued-parameters">Table-Valued Parameters</see>.
+      </remarks>
       <example>
         <para>
-          The following example shows the creation of several <see cref="T:Microsoft.Data.SqlClient.Server.SqlMetaData" /> objects, which describe the column metadata of a record, and the creation of a <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" />. The column values of the <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> are set and the <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> is sent to the calling program using the <see cref="T:Microsoft.SqlServer.Server.SqlContext" /> class.
+          The following example shows the creation of several <see cref="T:Microsoft.Data.SqlClient.Server.SqlMetaData" /> objects, which describe the column metadata of a record, and the generation of a stream of <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> records. These <see cref="T:Microsoft.Data.SqlClient.Server.SqlDataRecord" /> records can be streamed to SQL Server as a table-valued parameter by assigning the return value of the method to the <see cref="P:Microsoft.Data.SqlClient.SqlParameter.Value" /> property.
         </para>
         <!-- SqlMetaData #1 -->
         <code language="c#">
+          using System;
+          using System.Collections.Generic;
+          using System.Data;
           using Microsoft.Data.SqlClient.Server;
-      
-          [Microsoft.Data.SqlClient.Server.SqlProcedure]
-          public static void CreateNewRecord()
+
+          public static IEnumerable&lt;SqlDataRecord&gt; ReturnNewRecords()
           {
               // Variables.
               SqlMetaData column1Info;
@@ -32,13 +37,15 @@
                 column2Info,
                 column3Info });
       
-              // Set the record fields.
+              // Set the fields of the first record and stream it to SQL Server.
               record.SetString(0, "Hello World!");
               record.SetInt32(1, 42);
               record.SetDateTime(2, DateTime.Now);
+              yield return record;
       
-              // Send the record to the calling program.
-              SqlContext.Pipe.Send(record);
+              // Set the fields of the second record and stream it to SQL Server.
+              record.SetInt32(1, 0);
+              yield return record;
           }
         </code>
       </example>
@@ -456,7 +463,7 @@
         The SQL Server type name for <paramref name="userDefinedType" />.
       </param>
       <summary>
-        Initializes a new instance of the <see cref="T:Microsoft.Data.SqlClient.Server.SqlMetaData" /> class with the specified column name, user-defined type (UDT), and SQLServer type.
+        Initializes a new instance of the <see cref="T:Microsoft.Data.SqlClient.Server.SqlMetaData" /> class with the specified column name, user-defined type (UDT), and SQL Server type.
       </summary>
     </ctorNameDbTypeUserDefinedTypeServerTypeName>
     <ctorNameDbTypeMaxLengthLocaleCompareOptions>

From 5b34b39fa1480b5327e4582ff3222e510247b5ee Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Thu, 10 Sep 2026 14:51:13 +0530
Subject: [PATCH 284/298] Fix | Preserve delegated transactions when resetting
 a pooled connection (#4557)

* Fix | Preserve delegated transactions when resetting a pooled connection

Fixes #4001

A connection can be tied to a transaction in one of two mutually exclusive
ways on this code path:

  - It is the *root* of a delegated transaction. The transaction has been
    delegated down to this connection, so IsTransactionRoot is true and
    EnlistedTransaction is null.
  - It merely *enlisted* in a transaction owned elsewhere, so
    EnlistedTransaction is set and IsTransactionRoot is false.

Before #3019, ResetConnection() only preserved the transaction for the
delegated-root case, which missed the enlisted case (#2970). PR #3019
replaced that check with `EnlistedTransaction is not null` rather than
adding to it, which fixed #2970 but silently dropped the delegated-root case.

The result is that a connection returned to the pool while it is still the
root of a live delegated transaction has its server-side transaction reset
out from under System.Transactions. When the TransactionScope later rolls
back, SqlDelegatedTransaction.Rollback fails and dooms the connection. With
a small pool the same doomed physical connection is handed straight back
out, producing "The requested operation cannot be completed because the
connection has been broken."

Preserve the transaction when either condition holds. This is a strict
superset of both the pre-#3019 and post-#3019 behavior, so it cannot
regress either issue.

Verified against the reporter's repro on both the WaitHandle and V2
(channel) connection pools, and against the full manual TransactionTest
suite (9/9 passing).

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cadc8f9e-e4ac-4074-92ef-88e90df96091

* Docs | Add root cause analysis note for #4001

Records the delegated-root vs enlisted-participant distinction that this bug
turns on, why #3019 swapped one case for the other rather than covering both,
and why the union condition cannot reintroduce #2970.

Also records the result of mutation testing the manual TransactionTest suite:
the suite passes against the pre-#3019 condition (which carries #2970) and
against the #3019 condition (which carries #4001), so it does not currently
guard this line. The 9/9 pass rate is evidence of no collateral damage, not
evidence that the fix works.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cadc8f9e-e4ac-4074-92ef-88e90df96091

* Docs | Trim RCA note for #4001

Drops the alternative-approach rationale, the residual-risk discussion, and
the failed-reproduction-variants section, and renumbers the remainder.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cadc8f9e-e4ac-4074-92ef-88e90df96091

* Tests | Add regression tests for delegated transaction reset (#4001)

Extract the reset-time transaction preservation predicate into an internal
testable helper, ShouldPreserveTransactionOnReset, and pin its full truth
table with unit tests.

This also restores the Is2008OrNewer guard that the original one-line fix
dropped. Preserving a delegated transaction root across a reset is only
valid on SQL Server 2008 and newer; SQL Server 2005 is still an accepted
TDS version, so the guard is load bearing.

The tests were mutation tested against three buggy variants of the
predicate -- the #3019 condition (reintroduces #4001), the pre-#3019
condition (reintroduces #2970), and the union without the 2008 guard --
and each one is caught. This follows the existing precedent of
ResolveLoginTimeout / SqlConnectionInternalTimeoutTests.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cadc8f9e-e4ac-4074-92ef-88e90df96091

* Docs | Correct and expand the RCA note for #4001

Fixes two factual errors flagged in review:

- A delegated transaction root does not always have a null
  EnlistedTransaction. The property is set unconditionally on enlistment;
  null is specific to the transient half state left behind by
  DetachCurrentTransactionIfEnded.
- Is2008OrNewer is not vestigial. SQL Server 2005 is still an accepted TDS
  version, so the guard can be false.

Also documents the new regression tests, why an end-to-end reproduction was
abandoned in favour of a helper level test, and removes an inaccurate claim
that the new condition is a strict superset of the pre-#3019 one.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cadc8f9e-e4ac-4074-92ef-88e90df96091

* Tests | Make the reset predicate theory genuinely exhaustive

The unpooled block enumerated only four of its eight input combinations
while the doc comment claimed exhaustive coverage. Add the missing four so
all sixteen combinations of the four booleans are pinned, and state the
count explicitly.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cadc8f9e-e4ac-4074-92ef-88e90df96091

* Docs | Hyphenate server-side in reset predicate docs

Compound adjective. Comment-only change, no behavior impact.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cadc8f9e-e4ac-4074-92ef-88e90df96091

* Fix | Drop unsupported server-version guard from reset predicate

The restored Is2008OrNewer guard reinstated only half of a retired safety
mechanism. Pre-#3019, IsNonPoolableTransactionRoot both suppressed the
preserve bit and routed the connection into pool stasis; being parked is
what made the plain reset harmless. #3019 removed the property, and both
pools now route on EnlistedTransaction alone, so a delegated root with a
null EnlistedTransaction returns to the general pool. Suppressing the
preserve bit without the stasis routing therefore reproduces #4001 on
SQL Server 2005 -- which is below the supported floor of 2012 anyway.

Predicate is now isPooled && (isTransactionRoot || hasEnlistedTransaction).
Tests simplified from 19 to 11; both bug mutants still fail.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cadc8f9e-e4ac-4074-92ef-88e90df96091

* Tests | Remove duplicate reset predicate facts

Keep the regression context beside the corresponding exhaustive theory rows
instead of repeating those cases as separate facts.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cadc8f9e-e4ac-4074-92ef-88e90df96091

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: cadc8f9e-e4ac-4074-92ef-88e90df96091
---
 .../4001-delegated-transaction-reset.md       | 322 ++++++++++++++++++
 .../Connection/SqlConnectionInternal.cs       |  78 ++++-
 ...ConnectionInternalResetTransactionTests.cs |  81 +++++
 3 files changed, 476 insertions(+), 5 deletions(-)
 create mode 100644 doc/design-notes/4001-delegated-transaction-reset.md
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalResetTransactionTests.cs

diff --git a/doc/design-notes/4001-delegated-transaction-reset.md b/doc/design-notes/4001-delegated-transaction-reset.md
new file mode 100644
index 0000000000..79d24fb04c
--- /dev/null
+++ b/doc/design-notes/4001-delegated-transaction-reset.md
@@ -0,0 +1,322 @@
+# Root cause analysis: #4001 — pooled connection broken after `TransactionScope` rollback
+
+| | |
+|---|---|
+| **Issue** | [#4001](https://github.com/dotnet/SqlClient/issues/4001) |
+| **Regressed by** | [#3019](https://github.com/dotnet/SqlClient/pull/3019) (`0322d44c7`), shipped in 6.1.0 |
+| **Affected** | 6.1.0 → 6.1.6, `main` |
+| **Last good** | 6.0.5 |
+| **Code** | `SqlConnectionInternal.ResetConnection()` |
+
+This note records why the bug happens, why the previous fix caused it, why the new
+condition cannot reintroduce the issue that fix was addressing, and — importantly —
+what the existing test suite does and does not actually verify.
+
+---
+
+## 1. Background: two ways a connection can be "in" a transaction
+
+This distinction is the crux of the entire bug.
+
+When a connection participates in a `TransactionScope`, it ends up in one of **two
+distinct** states. They overlap, but neither implies the other.
+
+### Delegated root — "I *own* this transaction"
+
+Only one connection is involved, so `System.Transactions` delegates the transaction
+down to SQL Server rather than paying for a distributed coordinator. The transaction
+lives **on** the connection.
+
+- `IsTransactionRoot` → `true`
+- `EnlistedTransaction` → set at first, then **cleared** later (see below)
+
+`IsTransactionRoot` is not a stored flag. It is derived:
+
+```csharp
+internal bool IsTransactionRoot => DelegatedTransaction?.IsActive == true;
+```
+
+Enlistment sets `EnlistedTransaction` unconditionally, so a *freshly* delegated root
+has both. But once the transaction is no longer `Active`,
+`DbConnectionInternal.DetachCurrentTransactionIfEnded` clears `EnlistedTransaction`:
+
+```csharp
+transactionIsDead = enlistedTransaction.TransactionInformation.Status != TransactionStatus.Active;
+if (transactionIsDead) { DetachTransaction(enlistedTransaction, true); }
+```
+
+The delegated transaction, meanwhile, can still report `IsActive == true`. That
+transient **half-state** — root, but no `EnlistedTransaction` — is precisely the state
+issue #4001 reproduces in.
+
+### Enlisted participant — "I *joined* someone else's transaction"
+
+Multiple resources are involved, so a coordinator (MSDTC) owns the transaction and
+each connection enlists in it.
+
+- `IsTransactionRoot` → `false`
+- `EnlistedTransaction` → set
+
+### The trap
+
+Neither field subsumes the other: a delegated root can have a `null`
+`EnlistedTransaction`, and an enlisted participant is never a root. Any check that
+tests only one of these fields silently misses the other case — and does so with no
+exception at the point of the mistake.
+
+---
+
+## 2. Where the damage occurs
+
+When a connection is closed it returns to the pool and is **reset** — wiped clean for
+the next consumer. If a transaction is still in flight, that reset must *preserve* it.
+The entire decision is one boolean:
+
+```csharp
+_parser.PrepareResetConnection(preserveTransaction);
+```
+
+Pass `false` while a transaction is genuinely live, and the TDS reset destroys the
+server-side transaction **while `System.Transactions` still believes it exists**.
+
+The failure then surfaces later, some distance from the cause:
+
+1. `TransactionScope` disposes and rolls back.
+2. `SqlDelegatedTransaction.Rollback` asks the server to roll back a transaction the
+   server no longer has.
+3. The rollback fails, and SqlClient calls `DoomThisConnection()`.
+4. The physical connection is now permanently marked broken.
+5. With a small pool (the report used `MaxPoolSize=1`) that same doomed connection is
+   immediately handed back out.
+6. The next caller gets:
+
+> `InvalidOperationException: The requested operation cannot be completed because the connection has been broken.`
+
+The exception names the connection, not the reset that ruined it. That distance
+between cause and symptom is what makes this class of bug hard to trace.
+
+---
+
+## 3. What PR #3019 actually changed
+
+The relevant diff from `0322d44c7`:
+
+```diff
+- _parser.PrepareResetConnection(IsTransactionRoot && !IsNonPoolableTransactionRoot);
++ _parser.PrepareResetConnection(EnlistedTransaction is not null && Pool is not null);
+```
+
+The old helper was:
+
+```csharp
+internal protected override bool IsNonPoolableTransactionRoot
+    => IsTransactionRoot && (!Is2008OrNewer || Pool == null);
+```
+
+Substituting, the pre-#3019 condition was:
+
+```csharp
+IsTransactionRoot && Is2008OrNewer && Pool != null
+```
+
+The `Is2008OrNewer` term is **deliberately not carried forward**, for two reasons.
+
+First, it is outside the support matrix. The term is `false` for exactly one server
+version — SQL Server 2005 — and the driver's supported floor is SQL Server 2012.
+
+Second, and more importantly, **it was never safe on its own.** `IsNonPoolableTransactionRoot`
+had two jobs, not one. Besides suppressing the preserve bit, it also drove pool routing:
+`DbConnectionPool` sent any connection it flagged into *stasis* rather than back into the
+pool. Being parked is what made a plain reset harmless — the connection was never handed
+to another caller. #3019 deleted the property entirely, and today's pools route on
+`EnlistedTransaction` alone. A delegated root with a `null` `EnlistedTransaction` now goes
+straight back to the **general** pool.
+
+Reinstating only the suppression half would therefore reset a live delegated transaction
+*and* hand the connection out again — #4001 exactly, just narrowed to SQL Server 2005.
+Half of a retired safety mechanism is worse than none of it.
+
+So the two conditions were:
+
+| | Question it asked | Covered | Missed |
+|---|---|---|---|
+| **Pre-#3019** | "Am I the *owner*?" | delegated root | enlisted → **#2970** |
+| **#3019** | "Am I *enlisted*?" | enlisted | delegated root → **#4001** |
+
+**#3019 swapped one case for the other rather than covering both.** It genuinely fixed
+#2970, and it traded it for #4001. Both conditions were half-right; neither was wrong
+about the case it did cover.
+
+This reframes the fix: the goal is not to undo #3019, it is to finish it.
+
+---
+
+## 4. The fix
+
+The predicate is extracted into a helper so it can be tested directly:
+
+```csharp
+internal static bool ShouldPreserveTransactionOnReset(
+    bool isPooled,
+    bool isTransactionRoot,
+    bool hasEnlistedTransaction)
+{
+    if (!isPooled)
+    {
+        return false;
+    }
+
+    return isTransactionRoot || hasEnlistedTransaction;
+}
+```
+
+This is `OLD || NEW`: each arm answers one of the two questions from section 1, so the
+predicate is `true` wherever either predecessor was.
+
+---
+
+## 5. Why this cannot reintroduce #2970
+
+This is the question that matters most, and it is answerable by inspection rather than
+by testing. Every reachable state, for a pooled connection:
+
+| `IsTransactionRoot` | `EnlistedTransaction` | Pre-#3019 | #3019 | **This fix** |
+|:---:|:---:|:---:|:---:|:---:|
+| `false` | `null` | `false` | `false` | `false` |
+| **`true`** | **`null`** | ✅ `true` | ❌ `false` ← **#4001** | ✅ **`true`** |
+| **`false`** | **set** | ❌ `false` ← **#2970** | ✅ `true` | ✅ **`true`** |
+| `true` | set | `true` | `true` | `true` |
+
+Read the **#2970 row**. That is the row PR #3019 was created to fix, and this fix still
+evaluates `true` there. It is untouched.
+
+Reintroducing #2970 would require that cell to flip to `false`, and `A || B` cannot
+evaluate `false` while `B` is `true`. The guarantee is structural, not empirical.
+
+Because each arm reproduces its original predecessor exactly, the condition returns
+`true` wherever either predecessor did, and never returns `false` where one of them
+returned `true`.
+
+---
+
+## 6. How the root cause was established
+
+The cause was **proven at runtime, not inferred**. The driver was temporarily
+instrumented at the reset site and at `DoomThisConnection()`. The captured state at the
+critical reset:
+
+```
+[RESET] obj=4  preserve=False  root=False  deleg=null         enlisted=null  pool=set
+[RESET] obj=7  preserve=False  root=False  deleg=null         enlisted=null  pool=set
+[RESET] obj=7  preserve=False  root=True   deleg=active=True  enlisted=null  pool=set   <-- old: true, new: false
+[DOOM]  obj=7
+   at Microsoft.Data.SqlClient.SqlDelegatedTransaction.Rollback(...)
+   at System.Transactions.Transaction.Rollback()
+   at System.Transactions.TransactionScope.InternalDispose()
+   at System.Transactions.TransactionScope.Dispose()
+[FAIL] Bug reproduced
+```
+
+The third reset is the bug caught in the act: `root=True`, `deleg.IsActive=True`,
+`enlisted=null`, and `preserve=False`. A live delegated transaction being discarded.
+
+This mattered, because **the initial hypothesis was wrong.** The first theory was that
+#3019 had made the condition *too broad*, and a narrowing fix was written on that
+basis. It did not work. The instrumentation showed the opposite — #3019 had *narrowed*
+the condition, not widened it — and the fix was rewritten accordingly. Without runtime
+evidence this would have been fixed in the wrong direction.
+
+All instrumentation was removed before commit.
+
+---
+
+## 7. What the existing tests actually verify
+
+This section is deliberately blunt, because the intuitive answer is wrong.
+
+### Bisection
+
+Against the reporter's reproduction (NHibernate 5.5.2, `MaxPoolSize=1`,
+`TransactionScope` with a failed DTC promotion):
+
+**6.0.5 ✅ · 6.1.0 ❌ · 6.1.1 ❌ · 6.1.4 ❌ · `main` ❌**
+
+This places the regression in the 6.1.0 window, consistent with #3019.
+
+### Both pool implementations, both directions
+
+| | without fix | with fix |
+|---|---|---|
+| `WaitHandleDbConnectionPool` (default) | ❌ reproduces | ✅ passes |
+| `ChannelDbConnectionPool` (`UseConnectionPoolV2`) | ❌ reproduces | ✅ passes |
+
+The **left-hand column is the load-bearing one.** It was produced by stashing the fix
+and rebuilding. Without it, a pass on the V2 pool could simply mean V2 never reaches
+this code path, which would prove nothing.
+
+(V2 in released 6.1.4 throws `NotImplementedException`, so only `main` was testable.)
+
+### Mutation testing of the manual suite
+
+`--filter "FullyQualifiedName~TransactionTest"` reports **9/9 passing** with the fix.
+That number is easy to over-read, so the suite was mutation-tested: the condition was
+replaced with each known-buggy variant and the suite re-run.
+
+| Condition compiled in | Bug it contains | Suite result |
+|---|---|---|
+| Pre-#3019 (`IsTransactionRoot && Pool is not null`) | **#2970** | **9/9 passed** |
+| #3019 (`EnlistedTransaction is not null && Pool is not null`) | **#4001** | **9/9 passed** |
+| This fix (union) | none | 9/9 passed |
+
+**The suite passes on all three.** It does not detect either bug, and therefore does
+not guard this line at all in this environment.
+
+`Test_EnlistedTransactionPreservedWhilePooled` — the test added by #3019 specifically
+to cover #2970 — is tagged `[Trait("Category", "flaky")]` and passes against code that
+carries the #2970 bug.
+
+The practical conclusion: **the 9/9 result is evidence of no collateral damage, not
+evidence that the fix works.**
+
+### The regression test that was added
+
+An end-to-end reproduction was attempted extensively and abandoned. The `#4001` state
+requires a narrow simultaneity — the transaction's status already non-`Active` (so
+`DetachCurrentTransactionIfEnded` has cleared `EnlistedTransaction`) while
+`DelegatedTransaction.IsActive` is still `true` — and which of two teardown paths in
+`SqlDelegatedTransaction` wins is a race:
+
+- `TransactionEnded` sets `_active = false` and *immediately* calls
+  `DoomThisConnection()`. If this path runs first, the delegate is already inactive
+  before any reset, so the state is never observed.
+- `Rollback`, driven from `TransactionScope.Dispose`, sets `_active = false` *after* the
+  reset. This is the ordering the reporter hit.
+
+Roughly twenty harness variants — varying pool size, pool implementation, promotion
+success, explicit rollback, and parking the delegate in the transacted pool ahead of the
+enlistment — consistently drove the first path. A test built on that race would be
+flaky, which is the same defect `Test_EnlistedTransactionPreservedWhilePooled` already
+demonstrates.
+
+Instead the predicate was extracted into
+`SqlConnectionInternal.ShouldPreserveTransactionOnReset` and pinned directly by
+`SqlConnectionInternalResetTransactionTests`, following the existing precedent of
+`ResolveLoginTimeout` / `SqlConnectionInternalTimeoutTests`. The tests were themselves
+mutation-tested:
+
+| Condition compiled into the helper | Bug it contains | New tests |
+|---|---|---|
+| `hasEnlistedTransaction` (#3019) | **#4001** | ❌ 1 failed |
+| `isTransactionRoot` (pre-#3019) | **#2970** | ❌ 1 failed |
+| The shipped condition | none | ✅ 8 passed |
+
+This satisfies "fails before the change, passes after" for **both** regressions, and
+does so deterministically and without a server.
+
+---
+
+## 8. Related
+
+- **#2970** — the issue #3019 was fixing. Fully preserved by this change (section 5).
+- **#2285** — reports the same exception with no reproduction. Plausibly the same root
+  cause, though unconfirmed.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index ec210e407a..fdf6f07f70 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -3973,11 +3973,14 @@ internal override void ResetConnection()
 
             if (_fResetConnection)
             {
-                // Pooled connections that are enlisted in a transaction must have their transaction
-                // preserved when resetting the connection state. Otherwise, future uses of the connection
-                // from the pool will execute outside the transaction, in auto-commit mode.
-                // https://github.com/dotnet/SqlClient/issues/2970
-                _parser.PrepareResetConnection(EnlistedTransaction is not null && Pool is not null);
+                // Pooled connections that are tied to a transaction must have that transaction
+                // preserved when resetting the connection state. Otherwise, future uses of the
+                // connection from the pool will execute outside the transaction, in auto-commit
+                // mode. See ShouldPreserveTransactionOnReset for the full rationale.
+                _parser.PrepareResetConnection(ShouldPreserveTransactionOnReset(
+                    isPooled: Pool is not null,
+                    isTransactionRoot: IsTransactionRoot,
+                    hasEnlistedTransaction: EnlistedTransaction is not null));
 
                 // Reset dictionary values, since calling reset will not send us env_changes.
                 CurrentDatabase = _originalDatabase;
@@ -3985,6 +3988,71 @@ internal override void ResetConnection()
             }
         }
 
+        /// <summary>
+        /// Decides whether a connection reset must preserve the server-side transaction, i.e.
+        /// whether <c>ST_RESET_CONNECTION_PRESERVE_TRANSACTION</c> should be sent instead of a
+        /// plain <c>ST_RESET_CONNECTION</c>.
+        /// </summary>
+        /// <param name="isPooled">Whether this connection belongs to a pool.</param>
+        /// <param name="isTransactionRoot">
+        /// Whether this connection is the root of a delegated transaction, i.e.
+        /// <see cref="IsTransactionRoot"/>.
+        /// </param>
+        /// <param name="hasEnlistedTransaction">
+        /// Whether this connection has a non-null <see cref="DbConnectionInternal.EnlistedTransaction"/>.
+        /// </param>
+        /// <remarks>
+        /// <para>
+        /// A pooled connection can be tied to a transaction in two independent ways, and both
+        /// must be preserved across a reset:
+        /// </para>
+        /// <list type="bullet">
+        /// <item>
+        /// It is the <b>root of a delegated transaction</b>: the transaction was delegated to
+        /// this connection, so it lives on the server session this connection owns. Missing this
+        /// case resets the server-side transaction out from under System.Transactions, which
+        /// later breaks the connection while it is being recycled through the pool.
+        /// See https://github.com/dotnet/SqlClient/issues/4001.
+        /// </item>
+        /// <item>
+        /// It has <b>enlisted in a transaction</b>, so <c>EnlistedTransaction</c> is set. Missing
+        /// this case causes subsequent uses of the connection to run outside the transaction, in
+        /// auto-commit mode. See https://github.com/dotnet/SqlClient/issues/2970.
+        /// </item>
+        /// </list>
+        /// <para>
+        /// These two conditions overlap but neither implies the other. A freshly delegated root
+        /// has both flags set, because enlistment sets <c>EnlistedTransaction</c> unconditionally.
+        /// However, once the transaction is no longer <c>Active</c>,
+        /// <c>DetachCurrentTransactionIfEnded</c> clears <c>EnlistedTransaction</c> while the
+        /// delegated transaction can still report itself as active. That transient half-state is
+        /// root-only, and it is exactly the state issue #4001 reproduces in.
+        /// </para>
+        /// <para>
+        /// There is deliberately no server-version guard here. Before
+        /// https://github.com/dotnet/SqlClient/pull/3019, a delegated root on a pre-2008 server
+        /// was excluded via <c>IsNonPoolableTransactionRoot</c>, but that property also routed
+        /// such connections into stasis rather than back into the pool, which is what made
+        /// suppressing the preserve bit safe. #3019 removed the property, and neither pool puts a
+        /// poolable root into stasis today, so a version guard would now return the connection to
+        /// the general pool with its transaction silently reset. That is issue #4001 again.
+        /// SQL Server 2005 is also outside the supported matrix.
+        /// </para>
+        /// </remarks>
+        internal static bool ShouldPreserveTransactionOnReset(
+            bool isPooled,
+            bool isTransactionRoot,
+            bool hasEnlistedTransaction)
+        {
+            // A connection with no pool is not recycled, so there is nothing to preserve for.
+            if (!isPooled)
+            {
+                return false;
+            }
+
+            return isTransactionRoot || hasEnlistedTransaction;
+        }
+
         private void ResolveExtendedServerName(ServerInfo serverInfo, bool aliasLookup, SqlConnectionOptions options)
         {
             // @TODO: Invert to save on indentation
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalResetTransactionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalResetTransactionTests.cs
new file mode 100644
index 0000000000..dcf7262e78
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionInternalResetTransactionTests.cs
@@ -0,0 +1,81 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Data.SqlClient.Connection;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests;
+
+/// <summary>
+/// Verifies <see cref="SqlConnectionInternal.ShouldPreserveTransactionOnReset"/>, which decides
+/// whether a pooled connection is reset with <c>ST_RESET_CONNECTION_PRESERVE_TRANSACTION</c>
+/// rather than a plain <c>ST_RESET_CONNECTION</c>.
+///
+/// Getting this predicate wrong has caused two separate regressions, in opposite directions:
+/// <list type="bullet">
+///   <item>
+///   Testing only <c>IsTransactionRoot</c> misses connections that merely enlisted in someone
+///   else's transaction, so they are reset and subsequently run in auto-commit mode
+///   (https://github.com/dotnet/SqlClient/issues/2970).
+///   </item>
+///   <item>
+///   Testing only <c>EnlistedTransaction</c> misses delegated transaction roots, whose
+///   server-side transaction is then reset out from under System.Transactions, corrupting the
+///   connection as it is recycled through the pool
+///   (https://github.com/dotnet/SqlClient/issues/4001).
+///   </item>
+/// </list>
+///
+/// Both conditions must therefore be honored. Asserting against the extracted predicate covers
+/// every combination deterministically, including state combinations that are transient and
+/// racy to stage against a live server.
+/// </summary>
+public class SqlConnectionInternalResetTransactionTests
+{
+    /// <summary>
+    /// Exhaustively pins the predicate over all eight combinations of its three boolean inputs.
+    ///
+    /// The expectations encode two rules:
+    /// <list type="number">
+    ///   <item>An unpooled connection is never recycled, so nothing is ever preserved.</item>
+    ///   <item>A pooled connection tied to a transaction in either way must be preserved.</item>
+    /// </list>
+    /// </summary>
+    [Theory]
+    // An unpooled connection is destroyed rather than recycled, so there is no subsequent use to
+    // protect and its transaction must not be preserved, regardless of any other state.
+    [InlineData(false, false, false, false)]
+    [InlineData(false, false, true, false)]
+    [InlineData(false, true, false, false)]
+    [InlineData(false, true, true, false)]
+    // Pooled, no transaction of any kind: nothing to preserve.
+    [InlineData(true, false, false, false)]
+    // Regression guard for #2970: an implementation keyed only on IsTransactionRoot returns false
+    // for a pooled connection enlisted in a transaction it does not own.
+    [InlineData(true, false, true, true)]
+    // Regression guard for #4001: an implementation keyed only on EnlistedTransaction returns
+    // false in this transient half-state, after the enlistment is detached but while the delegated
+    // transaction still reports itself as active.
+    [InlineData(true, true, false, true)]
+    // Pooled connection that is both a delegated root and has an EnlistedTransaction. This is
+    // the common state immediately after enlistment, since enlistment sets EnlistedTransaction
+    // unconditionally.
+    [InlineData(true, true, true, true)]
+    public void ShouldPreserveTransactionOnReset_CoversBothTransactionOwnershipModes(
+        bool isPooled,
+        bool isTransactionRoot,
+        bool hasEnlistedTransaction,
+        bool expected)
+    {
+        // Act
+        bool actual = SqlConnectionInternal.ShouldPreserveTransactionOnReset(
+            isPooled: isPooled,
+            isTransactionRoot: isTransactionRoot,
+            hasEnlistedTransaction: hasEnlistedTransaction);
+
+        // Assert
+        Assert.Equal(expected, actual);
+    }
+
+}

From 9e42a9a60ccb8783cfcc2eb754b9252ae33c4c93 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 10 Sep 2026 07:57:11 -0300
Subject: [PATCH 285/298] Pipelines | Validate every package the OneBranch
 build produces (#4655)

* Derive APIScan versions from package versions

* Pipelines | Pre-compute all OneBranch package and file versions

Make the compute-versions stage the single source of every version the
OneBranch build jobs consume, so nothing is re-derived downstream.

- Remove the addRevision mode entirely.  Package versions now have a single
  shape driven by the pipeline build number, and the 16-bit revision wrapping,
  the four-part package base handling, and the Build.BuildId plumbing are gone.

- Move package version stamping out of PowerShell and into Versions.props.
  BuildSuffix now does what it always documented: it turns a stable base into a
  prerelease.  Any version carrying a prerelease tag, from either source, is
  stamped with the build number; released versions are left untouched.

- Publish SqlClient and SqlServer file versions from the compute-versions stage
  and pass them into the build jobs, which previously received a raw build
  number and re-derived the file version through MSBuild.  build.proj gains
  opt-in FileVersion* arguments, so PR/CI and local builds are unchanged.

- Fix SBOM metadata, which reported the pipeline run number as the version of a
  single hardcoded package name.  Each build job now supplies the name and
  computed version of the package it produces, and jobs that publish no
  packages disable SBOM generation instead.

* Pipelines | Validate every package the OneBranch build produces

Re-enable the package validation stage, which had been commented out pending the
version pre-computation that landed in the previous change, and widen it from one
package to all six.

- Add a package_validation stage that depends on all four build stages.  Every
  package is downloaded into one tree and validated together so PackageValidator
  can apply its cross-package rules: the SqlClient family must share a single
  version, and their inter-package dependency ranges must agree.  Validating one
  package at a time would silently skip all of those findings.

- Assert the versions the compute-versions stage already published, rather than
  re-deriving them.  The family version is applied as a wildcard expectation, so
  a mismatch in any one package is caught along with the case where every package
  is consistently wrong; Microsoft.SqlServer.Server overrides it by id.  When
  SqlServer is not built its expectations are omitted entirely, because the
  validator rejects an expectation whose value is empty.

- Gate on error and missing-symbols always, plus package-unsigned on official
  runs.  missing-symbols is a warning and package-unsigned is info, so neither is
  covered by the error severity and both must be named explicitly.  Non-official
  runs are deliberately unsigned, so gating them on package-unsigned would always
  fail.

- Make the release stage depend on package validation, so a package that fails
  validation is never published.

- Replace the SqlClient-only validate-signed-package-job, which checked one
  package, could not detect missing files, indexed extracted content positionally,
  and depended on a hardcoded sn.exe path.  Authenticode and NuGet signature
  verification now cover every produced package.

Step and job logic lives in scripts with Pester coverage rather than inline YAML,
matching compute-versions and publish-symbols.

* Pipelines | Disable Roslyn SDL analysis in the package validation job

1ES auto-injects the RoslynAnalyzers task into any job containing a DotNetCoreCLI build task, and drives the build itself. The validation job's only compile is PackageValidator, a build-time tool that never ships, and the injected run is launched from the host where the container's dotnet does not exist, so it failed with exit code 17 and failed the job even though package validation passed.

* Pipelines | Fail fast on validator errors and normalize FailOn tokens

Addresses review feedback on PR #4655.

The JSON-report invocation of PackageValidator ignored its exit code, so a
validator crash produced a misleading report artifact and let the gated run
obscure the real cause.  Capture and check the code before writing the
success message or reaching the gate.

FailOn arrives from the pipeline as a single comma-joined token, which
PowerShell -File argument mode does not split into an array.  Normalize the
parameter by splitting, trimming, and dropping empties, and quote the YAML
argument so the value is one token in every invocation mode.

* Pipelines | Gate package validation on dependency and strong-name findings

Addresses review feedback on PR #4655.

The error severity covers only error-severity findings, so the warning and
info categories this job exists to catch were slipping through the gate.
dependency-inconsistency is a warning, and mismatched family dependency
ranges are precisely what validating the whole drop at once is meant to
find, so gate it on every run.

delay-signed is a warning and unsigned is info.  Non-official builds have no
access to the real strong-name key and are delay-signed by design, so gate
those two on official runs only, alongside package-unsigned.

* Pipelines | Gate strong-name findings on every run, not just official

Addresses review feedback on PR #4655.

The previous split assumed non-official builds cannot strong-name sign, but
build-buildproj-step.yml downloads netfxKeypair.snk and passes SigningKeyPath
unconditionally, so every OneBranch build signs with the real key.  Run
26251.2 confirms it: 59 of 59 implementation assemblies reported Signed on a
non-official run, with no delay-signed or unsigned findings.

Gating delay-signed and unsigned only on official runs therefore left the one
signing type the pipeline always applies unvalidated on PR builds, where a
regression that drops the key would go unnoticed.  Gate both everywhere.

package-unsigned stays official-only.  NuGet package signing is an ESRP step
condition on shouldSignPackage, so non-official packages genuinely carry no
.signature.p7s.

* Pipelines | Clarify that the reporting validator run is ungated, not infallible

Addresses PR #4655 review feedback: the first PackageValidator invocation is
ungated so the JSON report survives a failing run, but it still fails the step
when the validator itself errors.
---
 .../onebranch-pipeline-design.instructions.md |  17 +-
 .../onebranch/jobs/validate-packages-job.yml  | 206 +++++++++
 .../jobs/validate-signed-package-job.yml      | 395 ------------------
 .../onebranch/scripts/tests/README.md         |   6 +
 .../scripts/tests/validate-packages.Tests.ps1 | 188 +++++++++
 .../verify-assembly-signatures.Tests.ps1      | 149 +++++++
 .../tests/verify-package-signatures.Tests.ps1 |  87 ++++
 .../onebranch/scripts/validate-packages.ps1   | 213 ++++++++++
 .../scripts/verify-assembly-signatures.ps1    |  99 +++++
 .../scripts/verify-package-signatures.ps1     |  72 ++++
 .../onebranch/stages/build-stages.yml         |  53 ++-
 .../onebranch/stages/release-stages.yml       |   4 +
 .../steps/validate-packages-step.yml          |  80 ++++
 13 files changed, 1159 insertions(+), 410 deletions(-)
 create mode 100644 eng/pipelines/onebranch/jobs/validate-packages-job.yml
 delete mode 100644 eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
 create mode 100644 eng/pipelines/onebranch/scripts/tests/validate-packages.Tests.ps1
 create mode 100644 eng/pipelines/onebranch/scripts/tests/verify-assembly-signatures.Tests.ps1
 create mode 100644 eng/pipelines/onebranch/scripts/tests/verify-package-signatures.Tests.ps1
 create mode 100644 eng/pipelines/onebranch/scripts/validate-packages.ps1
 create mode 100644 eng/pipelines/onebranch/scripts/verify-assembly-signatures.ps1
 create mode 100644 eng/pipelines/onebranch/scripts/verify-package-signatures.ps1
 create mode 100644 eng/pipelines/onebranch/steps/validate-packages-step.yml

diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index 7a24fd3799..75ea6ea303 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -34,7 +34,7 @@ Defined in `stages/build-stages.yml`. Four build stages plus validation, ordered
 - **`build_abstractions`** (Stage 2) — Abstractions; `dependsOn: build_independent`; downloads Logging artifact
 - **`build_dependent`** (Stage 3) — SqlClient and Extensions.Azure in parallel; `dependsOn: build_abstractions`; downloads Abstractions + Logging artifacts
 - **`build_addons`** (Stage 4) — AKV Provider; `dependsOn: build_dependent`; downloads SqlClient + Abstractions + Logging artifacts
-- **`sqlclient_package_validation`** — Validates signed SqlClient package; `dependsOn: build_dependent`; runs in parallel with Stage 4
+- **`package_validation`** (Stage 5) — Validates every package produced by the run; `dependsOn` all four build stages plus `compute_versions`
 
 Each build job copies PDB files into `$(JOB_OUTPUT)/symbols/` so they are included in the auto-published pipeline artifact alongside the NuGet packages in `$(JOB_OUTPUT)/packages/`.
 
@@ -46,7 +46,7 @@ Stage conditional rules:
 ## Job Templates
 
 - **`build-buildproj-job.yml`** — Shared build.proj-driven package job used for all shipped packages. Flow: build via `build.proj` → optional ESRP DLL signing → pack via `build.proj` → optional ESRP NuGet signing → copy outputs for APIScan/artifacts
-- **`validate-signed-package-job.yml`** — Validates signed MDS package (signature, strong names, folder structure, target frameworks)
+- **`validate-packages-job.yml`** — Validates every package produced by the run. Downloads all package artifacts into one tree and validates them together, so `tools/PackageValidator` can apply its cross-package rules (the SqlClient family must share one version, and inter-package dependency ranges must agree); validating per package would silently skip those findings. Runs on Windows because Authenticode verification has no Linux equivalent
 - **`publish-nuget-package-job.yml`** — Reusable release job using OneBranch `templateContext.type: releaseJob` with `inputs` for artifact download; pushes via `NuGetCommand@2`
 - **`publish-symbols-job.yml`** — Reusable symbols job: downloads a build artifact, locates PDBs under `symbols/`, and invokes `publish-symbols-step.yml`
 
@@ -56,6 +56,19 @@ When adding a new package to the OneBranch flow:
 - Add version variables to `variables/common-variables.yml`
 - Add artifact name variables to `variables/onebranch-variables.yml`
 
+## Package Validation Stage
+
+- Defined in `stages/build-stages.yml`; produces stage `package_validation`
+- Consumes the package and file versions published by `compute_versions` and asserts the produced packages carry exactly those values, so nothing is re-derived
+- All packages are validated together in one job so `tools/PackageValidator` can apply cross-package rules; the SqlServer artifact and its expectations are conditional on `buildSqlServer`
+- Expectations use the validator's `[id=]value` form: the SqlClient family version is applied as a wildcard (proving the family agrees, and catching the case where all packages are consistently wrong), with `Microsoft.SqlServer.Server` as a per-id override
+- When SqlServer is not built its expectations are **omitted entirely** rather than passed empty — the validator rejects an expectation with an empty value
+- Gate categories are derived from `isOfficial`: `error`, `missing-symbols`, `dependency-inconsistency`, `delay-signed`, and `unsigned` always, plus `package-unsigned` on official runs only. The `error` severity covers only error-severity findings, so each warning/info category must be named explicitly — `missing-symbols`, `dependency-inconsistency`, and `delay-signed` are warnings, and `unsigned` and `package-unsigned` are info. Strong-name signing is unconditional in `build-buildproj-step.yml`, so the two strong-name categories gate everywhere; NuGet package signing is ESRP and official-only, so `package-unsigned` would fire on every non-official run
+- The validator runs twice: once with `--json` and no gate so the report exists even for a failing run, then once human-readable with the gate so failures appear in the job log
+- Signature verification (`dotnet nuget verify --all`, Authenticode) runs on official builds only, and verifies that signatures are *trusted* — PackageValidator reports only their presence, from metadata
+- The release stage `dependsOn: package_validation`, so a package that fails validation is never published
+- Step and job logic lives in `scripts/validate-packages.ps1`, `scripts/verify-package-signatures.ps1`, and `scripts/verify-assembly-signatures.ps1`, each with Pester tests under `scripts/tests/`
+
 ## Symbols Publishing Stage
 
 - Defined in `stages/publish-symbols-stage.yml`; produces stage `publish_symbols`
diff --git a/eng/pipelines/onebranch/jobs/validate-packages-job.yml b/eng/pipelines/onebranch/jobs/validate-packages-job.yml
new file mode 100644
index 0000000000..f1501c7d1d
--- /dev/null
+++ b/eng/pipelines/onebranch/jobs/validate-packages-job.yml
@@ -0,0 +1,206 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Validates every NuGet package produced by this run.
+#
+# All packages are downloaded into a single tree and validated together in one job, rather than one
+# job per package, so that PackageValidator can apply its cross-package rules: the SqlClient family
+# must share a single version, and their inter-package dependency ranges must agree.
+#
+# The job runs on Windows because Authenticode verification has no equivalent on the Linux agents.
+# PackageValidator itself is cross-platform, so only the signature checks are OS-bound.
+
+parameters:
+  # Package Parameters -----------------------------------------------------
+
+  - name: abstractionsArtifactsName
+    type: string
+
+  - name: akvProviderArtifactsName
+    type: string
+
+  - name: azureArtifactsName
+    type: string
+
+  - name: loggingArtifactsName
+    type: string
+
+  - name: sqlClientArtifactsName
+    type: string
+
+  - name: sqlServerArtifactsName
+    type: string
+
+  # Version Parameters -----------------------------------------------------
+  # Pre-computed by the compute-versions stage.  Validation asserts the produced packages carry
+  # exactly these versions, so nothing here is re-derived.
+
+  - name: sqlClientPackageVersion
+    type: string
+
+  - name: sqlClientFileVersion
+    type: string
+
+  - name: sqlServerPackageVersion
+    type: string
+
+  - name: sqlServerFileVersion
+    type: string
+
+  # Behaviour Parameters ---------------------------------------------------
+
+  # Whether Microsoft.SqlServer.Server was built this run.  When false there is no SqlServer
+  # artifact to download and no SqlServer package in the drop to validate.
+  - name: buildSqlServer
+    type: boolean
+
+  # True for official builds, which sign their packages and assemblies.  Signature verification is
+  # skipped otherwise, because non-official runs deliberately produce unsigned output.
+  - name: isOfficial
+    type: boolean
+
+jobs:
+  - job: validate_packages
+    displayName: 'Validate Packages'
+
+    pool:
+      type: windows
+
+    # 1ES auto-injects Roslyn into any job holding a DotNetCoreCLI build task, which here is only
+    # the PackageValidator tool build -- never shipped, so out of SDL scope.
+    templateContext:
+      sdl:
+        roslyn:
+          enabled: false
+
+    variables:
+      - name: ob_outputDirectory
+        value: '$(JOB_OUTPUT)'
+
+      # This job inspects already-built packages and produces no assemblies, so it has nothing for
+      # APIScan or BinSkim to scan and no shipping component to describe in an SBOM.  The build
+      # jobs cover all three for the packages they produce.
+      - name: ob_sdl_apiscan_enabled
+        value: false
+      - name: ob_sdl_binskim_enabled
+        value: false
+      - name: ob_sdl_sbom_enabled
+        value: false
+
+      # Every package artifact is downloaded beneath this root, each into its own subdirectory so
+      # that identically-named files from different packages cannot collide.
+      - name: packagesRoot
+        value: '$(Pipeline.Workspace)/validate-packages'
+
+      - name: extractRoot
+        value: '$(Pipeline.Workspace)/validate-extract'
+
+    steps:
+      - template: /eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self
+
+      # Only the packages themselves are needed, not the full build output each artifact carries.
+      - task: DownloadPipelineArtifact@2
+        displayName: 'Download Packages - Logging'
+        inputs:
+          artifactName: '${{ parameters.loggingArtifactsName }}'
+          targetPath: '$(packagesRoot)/Logging'
+          patterns: '**/*.*nupkg'
+
+      - task: DownloadPipelineArtifact@2
+        displayName: 'Download Packages - Abstractions'
+        inputs:
+          artifactName: '${{ parameters.abstractionsArtifactsName }}'
+          targetPath: '$(packagesRoot)/Abstractions'
+          patterns: '**/*.*nupkg'
+
+      - task: DownloadPipelineArtifact@2
+        displayName: 'Download Packages - SqlClient'
+        inputs:
+          artifactName: '${{ parameters.sqlClientArtifactsName }}'
+          targetPath: '$(packagesRoot)/SqlClient'
+          patterns: '**/*.*nupkg'
+
+      - task: DownloadPipelineArtifact@2
+        displayName: 'Download Packages - Azure'
+        inputs:
+          artifactName: '${{ parameters.azureArtifactsName }}'
+          targetPath: '$(packagesRoot)/Azure'
+          patterns: '**/*.*nupkg'
+
+      - task: DownloadPipelineArtifact@2
+        displayName: 'Download Packages - AkvProvider'
+        inputs:
+          artifactName: '${{ parameters.akvProviderArtifactsName }}'
+          targetPath: '$(packagesRoot)/AkvProvider'
+          patterns: '**/*.*nupkg'
+
+      - ${{ if eq(parameters.buildSqlServer, true) }}:
+        - task: DownloadPipelineArtifact@2
+          displayName: 'Download Packages - SqlServer'
+          inputs:
+            artifactName: '${{ parameters.sqlServerArtifactsName }}'
+            targetPath: '$(packagesRoot)/SqlServer'
+            patterns: '**/*.*nupkg'
+
+      # PackageValidator targets net10.0, which the repo's global.json already pins.
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
+
+      - template: /eng/pipelines/onebranch/steps/validate-packages-step.yml@self
+        parameters:
+          packagesPath: '$(packagesRoot)'
+          reportPath: '$(JOB_OUTPUT)/validation/package-validation.json'
+          sqlClientPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
+          sqlClientFileVersion: '${{ parameters.sqlClientFileVersion }}'
+          # Omitted when SqlServer is not built: its package is absent from the drop, and the
+          # validator rejects an expectation with an empty value.
+          ${{ if eq(parameters.buildSqlServer, true) }}:
+            sqlServerPackageVersion: '${{ parameters.sqlServerPackageVersion }}'
+            sqlServerFileVersion: '${{ parameters.sqlServerFileVersion }}'
+          # The error severity covers only error-severity findings, so every warning/info category
+          # this job relies on must be named explicitly: missing-symbols, dependency-inconsistency
+          # and delay-signed are warnings, and unsigned and package-unsigned are info.
+          #
+          # Strong-name signing is unconditional in build-buildproj-step.yml, so delay-signed and
+          # unsigned gate on every run.  NuGet package signing is ESRP and runs on official builds
+          # only, so package-unsigned would fire on every non-official build.
+          ${{ if eq(parameters.isOfficial, true) }}:
+            failOn:
+              - error
+              - missing-symbols
+              - dependency-inconsistency
+              - delay-signed
+              - unsigned
+              - package-unsigned
+          ${{ else }}:
+            failOn:
+              - error
+              - missing-symbols
+              - dependency-inconsistency
+              - delay-signed
+              - unsigned
+
+      # Signature verification, official builds only.  PackageValidator reports strong-name and
+      # NuGet signature *presence* cross-platform; these steps additionally verify that the
+      # signatures are trusted, which requires the Windows trust store.
+      - ${{ if eq(parameters.isOfficial, true) }}:
+        - task: PowerShell@2
+          displayName: 'Verify NuGet package signatures'
+          inputs:
+            targetType: filePath
+            pwsh: true
+            filePath: $(REPO_ROOT)/eng/pipelines/onebranch/scripts/verify-package-signatures.ps1
+            arguments: >-
+              -PackagesPath "$(packagesRoot)"
+
+        - task: PowerShell@2
+          displayName: 'Verify assembly Authenticode signatures'
+          inputs:
+            targetType: filePath
+            pwsh: true
+            filePath: $(REPO_ROOT)/eng/pipelines/onebranch/scripts/verify-assembly-signatures.ps1
+            arguments: >-
+              -PackagesPath "$(packagesRoot)"
+              -ExtractPath "$(extractRoot)"
diff --git a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
deleted file mode 100644
index 818b902cf7..0000000000
--- a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
+++ /dev/null
@@ -1,395 +0,0 @@
-#################################################################################
-# Licensed to the .NET Foundation under one or more agreements.                 #
-# The .NET Foundation licenses this file to you under the MIT license.          #
-# See the LICENSE file in the project root for more information.                #
-#################################################################################
-parameters:
-  # The name of the pipeline artifact to download that contains the SqlClient NuGet package.
-  - name: artifactName
-    type: string
-
-  # List of versions of dotnet that are *allowed to exist* in the NuGet package. Separators do not
-  # matter as the folders in lib, runtime, etc are simply checked to see if they exist in this
-  # string.
-  - name: expectedDotnetVersions
-    type: string
-    default: 'net462;net8.0;net9.0;netstandard2.0'
-
-  # Expected file version of the assemblies within the package. This should be of the form:
-  # (major).(minor).(patch).(buildNumber)
-  - name: expectedFileVersion
-    type: string
-
-  # List of folders that are *allowed to exist* in the NuGet package. Separators do not matter as
-  # the folders are simply checked to see if they exist in this string.
-  - name: expectedFolderNames
-    type: string
-    default: 'lib;ref;runtimes'
-
-  # Expected NuGet package version. Used to build the installation path. This should be of the
-  # form: (major).(minor).(patch)[-preview(preview_number)]
-  - name: expectedPackageVersion
-    type: string
-
-  # True if this build is an official build. This will be used to gate some checks
-  # that only apply to official builds, such as signature verification.
-  - name: isOfficial
-    type: boolean
-
-jobs:
-  - job: validate_nuget_package
-    displayName: "Validate NuGet package"
-
-    pool:
-      type: windows # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
-      isCustom: true
-      name: ADO-1ES-Pool
-      vmImage: "ADO-MMS22-SQL19"
-
-    variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
-
-      # This job installs and inspects an already-built package rather than producing assemblies,
-      # so it has no APIScan software name/version to report. The build jobs scan those assemblies.
-      - name: ob_sdl_apiscan_enabled
-        value: false
-
-      # Likewise it produces no package, and sets no sbomPackage* values for globalSdl to resolve.
-      - name: ob_sdl_sbom_enabled
-        value: false
-
-      # Path within the downloaded artifact where NuGet packages are located.
-      - name: artifactPath
-        value: '$(Pipeline.Workspace)\${{ parameters.artifactName }}'
-
-      # Path to the SqlClient NuGet package after installation. This path will only exist once the package
-      # been installed.
-      - name: nugetPackageInstallPath
-        value: '$(Pipeline.Workspace)\nugetPackageInstalls\Microsoft.Data.SqlClient.${{ parameters.expectedPackageVersion }}'
-
-      # Root folder where NuGet package will be installed locally
-      - name: nugetPackageInstallRoot
-        value: '$(Pipeline.Workspace)\nugetPackageInstalls'
-
-    steps:
-      - template: '/eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self'
-
-      - task: NuGetToolInstaller@1
-        displayName: "Install NuGet"
-
-      - powershell: |
-          echo "> 1. List all local cache directory paths"
-          nuget locals all -List
-
-          echo "> 2. Clear all files from local cache directories"
-          nuget locals all -Clear
-        displayName: "Clear local cache"
-
-      # Download NuGet packages from the specified build artifact.
-      - download: current
-        artifact: ${{ parameters.artifactName }}
-        patterns: "**/*.*nupkg"
-        displayName: "Download NuGet Package"
-
-      # Verify secure signatures on the NuGet packages.
-      # NOTE: Packages will only be signed if the build is official.
-      - ${{ if eq(parameters.isOfficial, true) }}:
-          - powershell: |
-              # Propagate parameters to PS variables #######################
-              $artifactPath = "${{ variables.artifactPath }}"
-              echo "artifactPath= $artifactPath"
-
-              # Discover packages ##########################################
-              $packageFiles = Get-ChildItem -Path $artifactPath -Recurse -File -Include *.nupkg,*.snupkg
-              if ($packageFiles.Count -eq 0)
-              {
-                Write-Error "No NuGet package files were found under '$artifactPath'."
-              }
-
-              # Verify package signatures ##################################
-              echo "> 1. Verify signature of source package(s)"
-              $packageFiles | Where-Object { $_.Extension -eq ".nupkg" } | ForEach-Object {
-                nuget verify -All $_.FullName
-              }
-
-              echo "> 2. Verify signature of symbols package(s)"
-              $packageFiles | Where-Object { $_.Extension -eq ".snupkg" } | ForEach-Object {
-                nuget verify -All $_.FullName
-              }
-            displayName: "Verify nuget signature"
-
-      # Install NuGet package to the temporary directory
-      - powershell: |
-          # Propagate pipeline to PS variables #############################
-          $artifactPath = "${{ variables.artifactPath }}"
-          echo "artifactPath= $artifactPath"
-
-          $expectedPackageVersion = "${{ parameters.expectedPackageVersion }}"
-          echo "expectedPackageVersion= $expectedPackageVersion"
-
-          $nugetPackageInstallRoot = "${{ variables.nugetPackageInstallRoot }}"
-          echo "nugetPackageInstallRoot= $nugetPackageInstallRoot"
-
-          # Find the SqlClient NuGet package ###############################
-          Get-ChildItem "$artifactPath" -Recurse
-
-          $packagePaths = @(Get-ChildItem -Path $artifactPath -Recurse -File -Filter "Microsoft.Data.SqlClient.$expectedPackageVersion.nupkg")
-          if ($packagePaths.Count -eq 0)
-          {
-            Write-Error "Unable to find Microsoft.Data.SqlClient.$expectedPackageVersion.nupkg under '$artifactPath'."
-          }
-          if ($packagePaths.Count -gt 1)
-          {
-            Write-Error "Multiple Microsoft.Data.SqlClient.$expectedPackageVersion.nupkg files were found under '$artifactPath'."
-          }
-
-          $packageSource = Split-Path -Path $packagePaths[0].FullName -Parent
-          echo "Found package path: $($packagePaths[0].FullName)"
-          echo "Using package source: $packageSource"
-
-          # Install NuGet Package ##########################################
-          echo "> 1. Installing Microsoft.Data.SqlClient NuGet package..."
-          Install-Package `
-            -Name "Microsoft.Data.SqlClient" `
-            -Source "$packageSource" `
-            -Destination $nugetPackageInstallRoot `
-            -Force `
-            -SkipDependencies
-
-          echo "> 2. Listing contents of installed Microsoft.Data.SqlClient NuGet package:"
-          Write-Host $nugetPackageInstallRoot
-          Get-ChildItem $nugetPackageInstallRoot
-        displayName: "Install NuGet Package"
-
-      # Find all DLL files in the installed NuGet package, verify each is signed with a strong name
-      - powershell: |
-          # Propagate pipeline to PS variables #############################
-          $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
-          echo "nugetPackageInstallPath= $nugetPackageInstallPath"
-
-          # Verify strong name signing #####################################
-          echo "> 1. Verifying strong name signing of DLLs ..."
-
-          # @TODO: This path seems brittle to VS upgrades, can we make it more flexible?
-          $snPath = "C:\Program Files (x86)\Microsoft SDKs\Windows\*\bin\NETFX 4.8.1 Tools\sn.exe"
-
-          $dllFiles = Get-ChildItem -Path $nugetPackageInstallPath -Recurse -Filter *.dll
-          $badDlls = @()
-          foreach ($file in $dllFiles)
-          {
-            # Run sn.exe to verify the strong name on each dll
-            $result = & $snPath -vf $file.FullName
-            Write-OutPut $result
-
-            # if the dll is not valid, it would be delay signed or test-signed which is not meant for production
-            if($result[$result.Length-1] -notlike "* is valid")
-            {
-              $badDlls += $result[$result.Length-1]
-            }
-          }
-          if($badDlls.Count -gt 0)
-          {
-            Write-OutPut "Error: Invalid dlls are detected. Check the list below:"
-            foreach($dll in $badDlls)
-            {
-              Write-Output $dll
-            }
-            Exit -1
-          }
-          Write-Host "Strong name has been verified for all dlls"
-        displayName: "Verify assembly strong names"
-
-      # Validate that the folders in the nuget are expected
-      # @TODO: This does not verify we are not missing any folders, only that the folders that
-      #    exist are expected to exist.
-      - powershell: |
-          # Propagate pipeline to PS variables #############################
-          $expectedFolderNames = "${{ parameters.expectedFolderNames }}"
-          echo "expectedFolderNames= $expectedFolderNames"
-
-          $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
-          echo "nugetPackageInstallPath= $nugetPackageInstallPath"
-
-          # Verify folders are expected ####################################
-          Get-ChildItem -Path $nugetPackageInstallPath -Directory  | select Name | foreach {
-            if($expectedFolderNames.contains($_.Name)){
-              Write-Host expected folder name verfied: $_.Name
-            }
-          }
-        displayName: "Verify NuGet Root Folder Structure"
-
-      # Validate that the folders within the root folders of the nuget are expected
-      # @TODO: This does not verify we are not missing any folders, only that the folders that
-      #    exist are expected to exist.
-      - powershell: |
-          # Propagate pipeline to PS variables #############################
-          $expectedDotnetVersions = "${{ parameters.expectedDotnetVersions }}"
-          echo "expectedDotnetVersions= $expectedDotnetVersions"
-
-          $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
-          echo "nugetPackageInstallPath= $nugetPackageInstallPath"
-
-          # Verify folders are expected ####################################
-          # Checks the version of DotNetFramework and DotNet
-          $countErr = 0
-          $countPass = 0
-          $excludNamesFromRuntimeFolder = 'lib','win','unix'
-
-          Get-ChildItem -Path $nugetPackageInstallPath -Directory | foreach {
-            $parentname=$_.Name
-            Write-Host $_.FullName -ForegroundColor yellow
-
-            if($_.Name -ne 'runtimes') {
-              Get-ChildItem -Path $_.FullName -Directory | select Name | foreach {
-                if($expectedDotnetVersions.Contains($_.Name)){
-                  Write-Host "`tExpected version verified in $parentname": $_.Name -ForegroundColor green
-                  $countPass += 1
-                }
-                else{
-                  Write-Host "`tUnexpected version detected in $parentname": $_.Name
-                  $countErr += 1
-                }
-              }
-            }
-
-            elseif ($_.Name -eq 'runtimes'){
-              Get-ChildItem -Depth 3 -Path $_.FullName -Exclude $excludNamesFromRuntimeFolder -Directory | foreach{
-                if('${{ parameters.expectedDotnetVersions }}'.Contains($_.Name)){
-                  Write-Host "`tExpected version verfied in $parentname": $_.Name
-                  $countPass += 1
-                }
-                else{
-                  Write-Host "`tUnexpected version detected": $_.Name -ForegroundColor Red
-                  $countErr += 1
-                }
-              }
-            }
-            else{
-              Write-Host "`tUnknown folder " $_.Name -ForegroundColor Red
-              Exit -1
-            }
-          }
-
-          Write-Host "_______________"
-          Write-Host "Expected: $countPass"
-          Write-Host "Unexpected: $countErr"
-          Write-Host "_______________"
-          if ($countErr -ne 0)
-          {
-            Write-Host "Unexpected versions are detected!" -ForegroundColor Red
-            Exit -1
-          }
-        displayName: "Verify NuGet DotNet Versions "
-
-      - powershell: |
-          # Propagate pipeline to PS variables #############################
-          $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
-          echo "nugetPackageInstallPath= $nugetPackageInstallPath"
-
-          # Verify DLL Hierarchy ###########################################
-          foreach( $folderName in (Get-ChildItem -Path $nugetPackageInstallPath -Directory).Name)
-          {
-            # List all Childerns of the Path
-            Get-ChildItem -Path $nugetPackageInstallPath\$folderName -Recurse -File
-            $subFiles = Get-ChildItem -Path $nugetPackageInstallPath\$folderName -Recurse -File
-
-            foreach($file in $subFiles)
-            {
-              if($subFiles[0].Name -like "*.dll" )
-              {
-                Write-Host $subFiles[0].Name  -ForegroundColor Green
-                Write-Host $subFiles[1].Name  -ForegroundColor Green
-                if(($folderName -eq 'lib') -or ($folderName -eq 'ref'))
-                {
-                  if($subFiles[2].Name -like "*.dll")
-                  {
-                    Write-Host $subFiles[2].Name  -ForegroundColor Green
-                  }
-                  else
-                  {
-                    $subFiles[2].Name
-                    Write-Host "Expected file pattern for localization did not match to *.dll" -ForegroundColor Red
-                    Exit -1
-                  }
-                }
-              }
-              else
-              {
-                $subFiles[0].Name
-                $subFiles[1].Name
-                Write-Host "Expected file pattern did not match to *.dll" -ForegroundColor Red
-                Exit -1
-              }
-            }
-          }
-        displayName: 'Verify all DLLs unzipped match "expected" hierarchy'
-
-      # Verify that all DLLs are authenticode signed
-      # NOTE: This signing is only performed on official builds.
-      - ${{ if eq(parameters.isOfficial, true) }}:
-          - powershell: |
-              # Propagate pipeline to PS variables #############################
-              $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
-              echo "nugetPackageInstallPath= $nugetPackageInstallPath"
-
-              # Verify authenticode signature of DLLs ##########################
-              $dlls = Get-ChildItem -Path $nugetPackageInstallPath -Recurse -Include *.dll
-              foreach ($status in $dlls | Get-AuthenticodeSignature)
-              {
-                  if ($status.Status -eq "Valid")
-                  {
-                      Write-Host $status.Status $status.Path
-                  }
-                  else
-                  {
-                      Write-Host "dll status of '$status.Path' is not valid!" -ForegroundColor Red
-                      $status
-                      Exit -1
-                  }
-              }
-            displayName: "Verify all dlls status are Valid"
-
-      - powershell: |
-          # Propagate pipeline to PS variables #############################
-          $expectedFileVersion = "${{ parameters.expectedFileVersion }}"
-          echo "expectedFileVersion= $expectedFileVersion"
-
-          $expectedPackageVersion = "${{ parameters.expectedPackageVersion }}"
-          echo "expectedPackageVersion= $expectedPackageVersion"
-
-          $nugetPackageInstallPath = "${{ variables.nugetPackageInstallPath }}"
-          echo "nugetPackageInstallPath= $nugetPackageInstallPath"
-
-          # Validate ProductVersion and FileVersion fields #################
-          $failed = 0
-          foreach ( $pVersion in Get-ChildItem *.dll -Path $nugetPackageInstallPath -Recurse | ForEach-Object versioninfo )
-          {
-              if ($pVersion.ProductVersion -Like $expectedPackageVersion + '*')
-              {
-                  Write-Host -ForegroundColor Green "Correct ProductVersion detected for $($pVersion.FileName): $($pVersion.ProductVersion)"
-              }
-              else
-              {
-                    Write-Host -ForegroundColor Red "Wrong ProductVersion detected for $($pVersion.FileName); expected: $expectedPackageVersion; found: $($pVersion.ProductVersion)"
-                    $failed = 1
-              }
-
-              if ($pVersion.FileVersion -eq $expectedFileVersion)
-              {
-                  Write-Host -ForegroundColor Green "Correct FileVersion detected for $($pVersion.FileName): $($pVersion.FileVersion)"
-              }
-              else
-              {
-                  Write-Host -ForegroundColor Red "Wrong FileVersion detected for $($pVersion.FileName); expected $expectedFileVersion; found: $($pVersion.FileVersion)"
-                  $failed = 1
-              }
-
-              # @TODO: We should do a check for assembly version here.
-          }
-
-          if ($failed -ne 0)
-          {
-              Exit -1
-          }
-
-          Get-ChildItem *.dll -Path $nugetPackageInstallPath  -Recurse | ForEach-Object VersionInfo | Format-List
-        displayName: 'Verify "File Version" matches expected values for DLLs'
diff --git a/eng/pipelines/onebranch/scripts/tests/README.md b/eng/pipelines/onebranch/scripts/tests/README.md
index 3585312d53..b2ea3754c1 100644
--- a/eng/pipelines/onebranch/scripts/tests/README.md
+++ b/eng/pipelines/onebranch/scripts/tests/README.md
@@ -37,10 +37,16 @@ Invoke-Pester ./publish-symbols.Tests.ps1 -Output Detailed
 | Request bodies        | Registration body, default publish flags, flag overrides         |
 | Error handling        | Token failure, registration failure, publish failure, status failure — all verify expanded URI in error message |
 | Status validation     | Detects Failed/Cancelled results, respects PublishToInternal/PublishToPublic flags, passes on Succeeded/Pending |
+| Package validation    | Wildcard vs per-id version expectations, SqlServer omitted when unbuilt, gate tokens, report written before gating, exit-code handling |
+| Package signatures    | Every package and symbol package verified, all failures reported before throwing |
+| Assembly signatures   | Package expansion, native binaries under `runtimes/` included, stale expansions replaced, all unsigned assemblies reported |
 
 ## Notes
 
 - All external calls (`az`, `Invoke-RestMethod`) are mocked — no network access or Azure credentials are required.
 - Script-level version tests mock `dotnet`; package-composition tests invoke the real MSBuild
   `GetVersionsSqlClient` and `GetVersionsSqlServer` targets.
+- `Get-AuthenticodeSignature` is Windows-only, so the assembly-signature tests declare a stub when
+  it is absent. Only the signature lookup is substituted; package expansion and reporting run for
+  real against packages built in the test's temporary directory.
 - Tests validate scripts in the parent directory relative to this directory.
diff --git a/eng/pipelines/onebranch/scripts/tests/validate-packages.Tests.ps1 b/eng/pipelines/onebranch/scripts/tests/validate-packages.Tests.ps1
new file mode 100644
index 0000000000..626dd2dca9
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/tests/validate-packages.Tests.ps1
@@ -0,0 +1,188 @@
+<#
+.SYNOPSIS
+    Pester tests for validate-packages.ps1.
+#>
+
+BeforeAll {
+    $scriptPath = Join-Path $PSScriptRoot '..' 'validate-packages.ps1'
+
+    # Stands in for the built PackageValidator.dll; the script only checks that it exists.
+    $script:validatorPath = Join-Path $TestDrive 'PackageValidator.dll'
+    Set-Content -LiteralPath $script:validatorPath -Value 'stub'
+
+    $script:packagesPath = Join-Path $TestDrive 'packages'
+    New-Item -ItemType Directory -Force -Path $script:packagesPath | Out-Null
+    Set-Content -LiteralPath (Join-Path $script:packagesPath 'Microsoft.Data.SqlClient.7.1.0.nupkg') -Value 'stub'
+    Set-Content -LiteralPath (Join-Path $script:packagesPath 'Microsoft.SqlServer.Server.1.1.0.nupkg') -Value 'stub'
+
+    $script:reportPath = Join-Path $TestDrive 'out' 'report.json'
+
+    function Invoke-ValidatePackages {
+        param(
+            [string]$PackagesPath = $script:packagesPath,
+            [string]$ValidatorPath = $script:validatorPath,
+            [string]$SqlClientPackageVersion = '7.1.0-preview3.26238.3',
+            [string]$SqlClientFileVersion = '7.1.0.26238',
+            [string]$SqlServerPackageVersion = '',
+            [string]$SqlServerFileVersion = '',
+            [string[]]$FailOn = @('error')
+        )
+
+        & $scriptPath `
+            -ValidatorPath $ValidatorPath `
+            -PackagesPath $PackagesPath `
+            -ReportPath $script:reportPath `
+            -SqlClientPackageVersion $SqlClientPackageVersion `
+            -SqlClientFileVersion $SqlClientFileVersion `
+            -SqlServerPackageVersion $SqlServerPackageVersion `
+            -SqlServerFileVersion $SqlServerFileVersion `
+            -FailOn $FailOn `
+            -DotnetPath 'dotnet' *>&1 | Out-String
+    }
+
+    # Captures the arguments of each invocation so tests can assert on what the validator was
+    # asked to do, and controls the exit code of each run.
+    function Set-DotnetMock {
+        param(
+            [int]$GateExitCode = 0,
+            [int]$ReportExitCode = 0
+        )
+
+        $global:validatePackagesInvocations = @()
+        Mock -CommandName 'dotnet' -MockWith {
+            $global:validatePackagesInvocations += , @($args)
+            # The first run carries --json and never gates; the second applies the gate.
+            if ($args -contains '--json') {
+                $global:LASTEXITCODE = $ReportExitCode
+                return '{ "packages": [], "summary": {} }'
+            }
+
+            $global:LASTEXITCODE = $GateExitCode
+            return 'validator output'
+        }.GetNewClosure()
+    }
+}
+
+AfterAll {
+    Remove-Variable -Name 'validatePackagesInvocations' -Scope Global -ErrorAction SilentlyContinue
+}
+
+Describe 'validate-packages.ps1 Expectations' {
+    BeforeEach {
+        Set-DotnetMock
+    }
+
+    It 'applies the SqlClient family versions as wildcard expectations' {
+        Invoke-ValidatePackages | Out-Null
+
+        $gateArgs = $global:validatePackagesInvocations | Where-Object { $_ -notcontains '--json' } | Select-Object -First 1
+        $gateArgs | Should -Contain '*=7.1.0-preview3.26238.3'
+        $gateArgs | Should -Contain '*=7.1.0.26238'
+    }
+
+    It 'omits SqlServer expectations when its versions are not supplied' {
+        Invoke-ValidatePackages | Out-Null
+
+        $gateArgs = $global:validatePackagesInvocations | Where-Object { $_ -notcontains '--json' } | Select-Object -First 1
+        ($gateArgs -join ' ') | Should -Not -Match 'Microsoft\.SqlServer\.Server='
+    }
+
+    It 'adds SqlServer expectations as a per-id override when supplied' {
+        Invoke-ValidatePackages -SqlServerPackageVersion '1.1.0-preview1.26238.3' -SqlServerFileVersion '1.1.0.26238' | Out-Null
+
+        $gateArgs = $global:validatePackagesInvocations | Where-Object { $_ -notcontains '--json' } | Select-Object -First 1
+        $gateArgs | Should -Contain 'Microsoft.SqlServer.Server=1.1.0-preview1.26238.3'
+        $gateArgs | Should -Contain 'Microsoft.SqlServer.Server=1.1.0.26238'
+    }
+
+    It 'passes each gate token as its own --fail-on argument' {
+        Invoke-ValidatePackages -FailOn @('error', 'missing-symbols', 'package-unsigned') | Out-Null
+
+        $gateArgs = $global:validatePackagesInvocations | Where-Object { $_ -notcontains '--json' } | Select-Object -First 1
+        $joined = $gateArgs -join ' '
+        $joined | Should -Match '--fail-on error'
+        $joined | Should -Match '--fail-on missing-symbols'
+        $joined | Should -Match '--fail-on package-unsigned'
+    }
+
+    It 'splits a single comma-separated gate token, as an Azure Pipelines argument line supplies it' {
+        Invoke-ValidatePackages -FailOn 'error, missing-symbols' | Out-Null
+
+        $gateArgs = $global:validatePackagesInvocations | Where-Object { $_ -notcontains '--json' } | Select-Object -First 1
+        $joined = $gateArgs -join ' '
+        $joined | Should -Match '--fail-on error'
+        $joined | Should -Match '--fail-on missing-symbols'
+        $joined | Should -Not -Match 'error,'
+    }
+
+    It 'writes the JSON report before applying the gate' {
+        Invoke-ValidatePackages | Out-Null
+
+        # The reporting run must come first so the report survives a failing gate.
+        $firstInvocation = $global:validatePackagesInvocations | Select-Object -First 1
+        $firstInvocation | Should -Contain '--json'
+        Test-Path -LiteralPath $script:reportPath | Should -BeTrue
+    }
+
+    It 'does not gate the reporting run' {
+        Invoke-ValidatePackages -FailOn @('error') | Out-Null
+
+        $reportArgs = $global:validatePackagesInvocations | Where-Object { $_ -contains '--json' } | Select-Object -First 1
+        ($reportArgs -join ' ') | Should -Not -Match '--fail-on'
+    }
+}
+
+Describe 'validate-packages.ps1 Exit Codes' {
+    It 'succeeds when the validator reports no gating findings' {
+        Set-DotnetMock -GateExitCode 0
+
+        $output = Invoke-ValidatePackages
+        $output | Should -Match 'Package validation passed'
+    }
+
+    It 'fails when a gate is tripped' {
+        Set-DotnetMock -GateExitCode 2
+
+        { Invoke-ValidatePackages -FailOn @('error', 'missing-symbols') } |
+            Should -Throw '*matched the gate (error, missing-symbols)*'
+    }
+
+    It 'reports an unexpected validator failure distinctly from a tripped gate' {
+        Set-DotnetMock -GateExitCode 1
+
+        { Invoke-ValidatePackages } | Should -Throw '*exited unexpectedly with code 1*'
+    }
+
+    It 'fails the reporting run before gating so the real cause is not obscured' {
+        Set-DotnetMock -ReportExitCode 1
+
+        { Invoke-ValidatePackages } | Should -Throw '*failed while writing the JSON report (exit code 1)*'
+
+        # The gating run must not have been reached.
+        $global:validatePackagesInvocations.Count | Should -Be 1
+    }
+}
+
+Describe 'validate-packages.ps1 Error Handling' {
+    BeforeEach {
+        Set-DotnetMock
+    }
+
+    It 'throws when the validator is missing' {
+        { Invoke-ValidatePackages -ValidatorPath (Join-Path $TestDrive 'absent.dll') } |
+            Should -Throw '*PackageValidator was not found*'
+    }
+
+    It 'throws when no packages are found' {
+        $empty = Join-Path $TestDrive 'empty'
+        New-Item -ItemType Directory -Force -Path $empty | Out-Null
+
+        { Invoke-ValidatePackages -PackagesPath $empty } | Should -Throw '*No .nupkg files were found*'
+    }
+
+    It 'rejects a half-supplied SqlServer expectation' {
+        # Supplying only one would assert a package version without its file version.
+        { Invoke-ValidatePackages -SqlServerPackageVersion '1.1.0' } |
+            Should -Throw '*must be supplied together*'
+    }
+}
diff --git a/eng/pipelines/onebranch/scripts/tests/verify-assembly-signatures.Tests.ps1 b/eng/pipelines/onebranch/scripts/tests/verify-assembly-signatures.Tests.ps1
new file mode 100644
index 0000000000..4d4946a5fb
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/tests/verify-assembly-signatures.Tests.ps1
@@ -0,0 +1,149 @@
+<#
+.SYNOPSIS
+    Pester tests for verify-assembly-signatures.ps1.
+
+.NOTES
+    Get-AuthenticodeSignature is a Windows-only cmdlet, so a stub is declared when it is absent.
+    This lets the tests run on any platform while still exercising the script's real expansion and
+    reporting logic; only the signature lookup itself is substituted.
+#>
+
+BeforeAll {
+    $scriptPath = Join-Path $PSScriptRoot '..' 'verify-assembly-signatures.ps1'
+
+    if (-not (Get-Command 'Get-AuthenticodeSignature' -ErrorAction SilentlyContinue)) {
+        function Get-AuthenticodeSignature {
+            param([Parameter(Mandatory = $true)][string[]]$FilePath)
+            throw 'stub must be mocked'
+        }
+    }
+
+    Add-Type -AssemblyName System.IO.Compression.FileSystem
+
+    # Builds a real .nupkg so the script's expansion path is genuinely exercised.
+    function New-TestPackage {
+        param(
+            [string]$Name,
+            [string[]]$AssemblyPaths = @('lib/net8.0/Test.dll'),
+            [string[]]$OtherPaths = @()
+        )
+
+        $staging = Join-Path $TestDrive "staging-$Name"
+        if (Test-Path -LiteralPath $staging) { Remove-Item -LiteralPath $staging -Recurse -Force }
+        New-Item -ItemType Directory -Force -Path $staging | Out-Null
+
+        foreach ($relative in ($AssemblyPaths + $OtherPaths)) {
+            $full = Join-Path $staging $relative
+            New-Item -ItemType Directory -Force -Path (Split-Path -Parent $full) | Out-Null
+            Set-Content -LiteralPath $full -Value 'stub'
+        }
+
+        $packagePath = Join-Path $script:packagesPath "$Name.nupkg"
+        if (Test-Path -LiteralPath $packagePath) { Remove-Item -LiteralPath $packagePath -Force }
+        [System.IO.Compression.ZipFile]::CreateFromDirectory($staging, $packagePath)
+        return $packagePath
+    }
+
+    function Invoke-VerifyAssemblySignatures {
+        param(
+            [string]$PackagesPath = $script:packagesPath,
+            [string]$ExtractPath = $script:extractPath
+        )
+
+        & $scriptPath -PackagesPath $PackagesPath -ExtractPath $ExtractPath *>&1 | Out-String
+    }
+}
+
+AfterAll {
+    Remove-Variable -Name 'verifyAssemblySeen' -Scope Global -ErrorAction SilentlyContinue
+}
+
+Describe 'verify-assembly-signatures.ps1' {
+    BeforeEach {
+        $script:packagesPath = Join-Path $TestDrive 'packages'
+        $script:extractPath = Join-Path $TestDrive 'extract'
+        foreach ($path in @($script:packagesPath, $script:extractPath)) {
+            if (Test-Path -LiteralPath $path) { Remove-Item -LiteralPath $path -Recurse -Force }
+            New-Item -ItemType Directory -Force -Path $path | Out-Null
+        }
+    }
+
+    It 'expands packages and verifies every assembly they contain' {
+        New-TestPackage -Name 'PackageOne' -AssemblyPaths @('lib/net8.0/One.dll') | Out-Null
+        New-TestPackage -Name 'PackageTwo' -AssemblyPaths @('lib/net8.0/Two.dll', 'runtimes/win-x64/native/sni.dll') | Out-Null
+        Mock -CommandName 'Get-AuthenticodeSignature' -MockWith {
+            $FilePath | ForEach-Object { [pscustomobject]@{ Path = $_; Status = 'Valid' } }
+        }
+
+        $output = Invoke-VerifyAssemblySignatures
+        $output | Should -Match 'All 3 assemblies are Authenticode signed'
+    }
+
+    It 'finds native binaries under runtimes, not just managed assemblies' {
+        New-TestPackage -Name 'PackageOne' -AssemblyPaths @('runtimes/win-arm64/native/sni.dll') | Out-Null
+        $global:verifyAssemblySeen = @()
+        Mock -CommandName 'Get-AuthenticodeSignature' -MockWith {
+            $global:verifyAssemblySeen = $FilePath
+            $FilePath | ForEach-Object { [pscustomobject]@{ Path = $_; Status = 'Valid' } }
+        }
+
+        Invoke-VerifyAssemblySignatures | Out-Null
+        ($global:verifyAssemblySeen -join ';') | Should -Match 'sni\.dll'
+    }
+
+    It 'ignores non-assembly content' {
+        New-TestPackage -Name 'PackageOne' -AssemblyPaths @('lib/net8.0/One.dll') -OtherPaths @('README.md', 'lib/net8.0/One.xml') | Out-Null
+        Mock -CommandName 'Get-AuthenticodeSignature' -MockWith {
+            $FilePath | ForEach-Object { [pscustomobject]@{ Path = $_; Status = 'Valid' } }
+        }
+
+        $output = Invoke-VerifyAssemblySignatures
+        $output | Should -Match 'All 1 assemblies are Authenticode signed'
+    }
+
+    It 'fails when an assembly is not validly signed' {
+        New-TestPackage -Name 'PackageOne' -AssemblyPaths @('lib/net8.0/One.dll', 'lib/net8.0/Two.dll') | Out-Null
+        Mock -CommandName 'Get-AuthenticodeSignature' -MockWith {
+            $index = 0
+            $FilePath | ForEach-Object {
+                $status = if ($index -eq 0) { 'Valid' } else { 'NotSigned' }
+                $index++
+                [pscustomobject]@{ Path = $_; Status = $status }
+            }
+        }
+
+        { Invoke-VerifyAssemblySignatures } | Should -Throw '*failed for 1 of 2 assemblies*'
+    }
+
+    It 'reports every unsigned assembly rather than stopping at the first' {
+        New-TestPackage -Name 'PackageOne' -AssemblyPaths @('lib/net8.0/One.dll', 'lib/net8.0/Two.dll') | Out-Null
+        Mock -CommandName 'Get-AuthenticodeSignature' -MockWith {
+            $FilePath | ForEach-Object { [pscustomobject]@{ Path = $_; Status = 'NotSigned' } }
+        }
+
+        { Invoke-VerifyAssemblySignatures } | Should -Throw '*failed for 2 of 2 assemblies*'
+    }
+
+    It 'replaces a previous expansion so stale content cannot be verified' {
+        New-TestPackage -Name 'PackageOne' -AssemblyPaths @('lib/net8.0/One.dll', 'lib/net8.0/Stale.dll') | Out-Null
+        Mock -CommandName 'Get-AuthenticodeSignature' -MockWith {
+            $FilePath | ForEach-Object { [pscustomobject]@{ Path = $_; Status = 'Valid' } }
+        }
+        Invoke-VerifyAssemblySignatures | Out-Null
+
+        # Repack the same package id with fewer assemblies; the stale one must not linger.
+        New-TestPackage -Name 'PackageOne' -AssemblyPaths @('lib/net8.0/One.dll') | Out-Null
+        $output = Invoke-VerifyAssemblySignatures
+        $output | Should -Match 'All 1 assemblies are Authenticode signed'
+    }
+
+    It 'throws when no packages are found' {
+        { Invoke-VerifyAssemblySignatures } | Should -Throw '*No .nupkg files were found*'
+    }
+
+    It 'throws when packages contain no assemblies' {
+        New-TestPackage -Name 'PackageOne' -AssemblyPaths @() -OtherPaths @('README.md') | Out-Null
+
+        { Invoke-VerifyAssemblySignatures } | Should -Throw '*No assemblies were found*'
+    }
+}
diff --git a/eng/pipelines/onebranch/scripts/tests/verify-package-signatures.Tests.ps1 b/eng/pipelines/onebranch/scripts/tests/verify-package-signatures.Tests.ps1
new file mode 100644
index 0000000000..cadc1831a4
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/tests/verify-package-signatures.Tests.ps1
@@ -0,0 +1,87 @@
+<#
+.SYNOPSIS
+    Pester tests for verify-package-signatures.ps1.
+#>
+
+BeforeAll {
+    $scriptPath = Join-Path $PSScriptRoot '..' 'verify-package-signatures.ps1'
+
+    $script:packagesPath = Join-Path $TestDrive 'packages'
+    New-Item -ItemType Directory -Force -Path (Join-Path $script:packagesPath 'SqlClient') | Out-Null
+    New-Item -ItemType Directory -Force -Path (Join-Path $script:packagesPath 'SqlServer') | Out-Null
+
+    # Symbol packages are signed too, so both extensions must be picked up, and the nested layout
+    # mirrors how each artifact is downloaded into its own subdirectory.
+    Set-Content -LiteralPath (Join-Path $script:packagesPath 'SqlClient' 'Microsoft.Data.SqlClient.7.1.0.nupkg') -Value 'stub'
+    Set-Content -LiteralPath (Join-Path $script:packagesPath 'SqlClient' 'Microsoft.Data.SqlClient.7.1.0.snupkg') -Value 'stub'
+    Set-Content -LiteralPath (Join-Path $script:packagesPath 'SqlServer' 'Microsoft.SqlServer.Server.1.1.0.nupkg') -Value 'stub'
+
+    function Invoke-VerifyPackageSignatures {
+        param([string]$PackagesPath = $script:packagesPath)
+
+        & $scriptPath -PackagesPath $PackagesPath -DotnetPath 'dotnet' *>&1 | Out-String
+    }
+
+    # Fails verification only for packages whose name matches, so tests can make a subset unsigned.
+    function Set-DotnetMock {
+        param([string]$FailPattern = '')
+
+        $global:verifyPackageInvocations = @()
+        Mock -CommandName 'dotnet' -MockWith {
+            $global:verifyPackageInvocations += , @($args)
+            $target = $args[-1]
+            if ($FailPattern -and $target -match $FailPattern) {
+                $global:LASTEXITCODE = 1
+                return "unsigned"
+            }
+
+            $global:LASTEXITCODE = 0
+            return "verified"
+        }.GetNewClosure()
+    }
+}
+
+AfterAll {
+    Remove-Variable -Name 'verifyPackageInvocations' -Scope Global -ErrorAction SilentlyContinue
+}
+
+Describe 'verify-package-signatures.ps1' {
+    It 'verifies every package and symbol package found' {
+        Set-DotnetMock
+
+        $output = Invoke-VerifyPackageSignatures
+        $output | Should -Match 'All 3 package signature\(s\) verified'
+        $global:verifyPackageInvocations.Count | Should -Be 3
+    }
+
+    It 'invokes dotnet nuget verify with --all' {
+        Set-DotnetMock
+
+        Invoke-VerifyPackageSignatures | Out-Null
+
+        $first = $global:verifyPackageInvocations | Select-Object -First 1
+        ($first -join ' ') | Should -Match 'nuget verify --all'
+    }
+
+    It 'fails when a package signature does not verify' {
+        Set-DotnetMock -FailPattern 'SqlServer'
+
+        { Invoke-VerifyPackageSignatures } | Should -Throw '*Microsoft.SqlServer.Server.1.1.0.nupkg*'
+    }
+
+    It 'checks every package before failing so all failures are reported' {
+        Set-DotnetMock -FailPattern '\.nupkg$'
+
+        # Two of the three files are .nupkg; both must appear rather than only the first.
+        { Invoke-VerifyPackageSignatures } | Should -Throw '*failed for 2 of 3 package(s)*'
+        $global:verifyPackageInvocations.Count | Should -Be 3
+    }
+
+    It 'throws when no packages are found' {
+        Set-DotnetMock
+        $empty = Join-Path $TestDrive 'empty'
+        New-Item -ItemType Directory -Force -Path $empty | Out-Null
+
+        { Invoke-VerifyPackageSignatures -PackagesPath $empty } | Should -Throw '*No package files were found*'
+    }
+}
diff --git a/eng/pipelines/onebranch/scripts/validate-packages.ps1 b/eng/pipelines/onebranch/scripts/validate-packages.ps1
new file mode 100644
index 0000000000..af5149c9f5
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/validate-packages.ps1
@@ -0,0 +1,213 @@
+<#
+.SYNOPSIS
+    Runs the PackageValidator tool over the NuGet packages produced by a OneBranch build.
+
+.DESCRIPTION
+    Invokes tools/PackageValidator once for a whole directory of packages rather than once per
+    package, because its most valuable checks are cross-package: every package in the SqlClient
+    family must carry the same version, and their inter-package dependency ranges must agree.
+    Validating one package at a time would silently skip all of those findings.
+
+    The validator runs twice over the same inputs. The first run writes a machine-readable report
+    and never gates, so the report exists even when validation fails. The second run renders the
+    human-readable report and applies the gate, so a failing build shows its findings in its own
+    log rather than only in an artifact.
+
+    Expected versions are supplied by the caller rather than derived here. The compute-versions
+    stage already computes every version the build stamps, and re-deriving them would reintroduce
+    the drift this validation exists to catch.
+
+    Microsoft.SqlServer.Server is versioned separately from the SqlClient family, so its expected
+    versions are applied as a per-id override of the family wildcard. When it is not built in a
+    run, its package is absent from the drop and its expectations must be omitted entirely: the
+    validator rejects an expectation whose value is empty.
+
+.PARAMETER ValidatorPath
+    Path to the built PackageValidator.dll. Invoked through the managed assembly rather than the
+    native apphost so the same command works regardless of agent OS.
+
+.PARAMETER PackagesPath
+    Directory scanned recursively for .nupkg files. Sibling .snupkg files must sit beside their
+    .nupkg for symbol matching to resolve, which is how the build jobs publish them.
+
+.PARAMETER ReportPath
+    Path of the JSON report to write. Parent directories are created as needed.
+
+.PARAMETER SqlClientPackageVersion
+    Package version expected of every package in the SqlClient family, applied as a wildcard.
+    Pointing every package at one value is what proves they agree, and also catches the case where
+    all of them are consistently wrong.
+
+.PARAMETER SqlClientFileVersion
+    Assembly file version expected of every assembly in the SqlClient family.
+
+.PARAMETER SqlServerPackageVersion
+    Package version expected of Microsoft.SqlServer.Server. Omit when SqlServer is not built.
+
+.PARAMETER SqlServerFileVersion
+    Assembly file version expected of Microsoft.SqlServer.Server. Omit when SqlServer is not built.
+
+.PARAMETER FailOn
+    Finding severities and/or categories that fail the build. Run the validator with --help to see
+    the available categories. Note that missing-symbols is a warning and package-unsigned is info,
+    so neither is covered by the error severity and both must be named explicitly.
+
+    Accepts either an array or a single comma-separated string, because an Azure Pipelines task
+    argument line collapses to one token and PowerShell's -File mode does not split it.
+
+.PARAMETER DotnetPath
+    dotnet executable to invoke. Defaults to the dotnet command resolved from PATH. This parameter
+    primarily supports isolated testing.
+
+.EXAMPLE
+    ./validate-packages.ps1 `
+        -ValidatorPath ./PackageValidator.dll `
+        -PackagesPath ./packages `
+        -ReportPath ./out/report.json `
+        -SqlClientPackageVersion 7.1.0-preview3.26238.3 `
+        -SqlClientFileVersion 7.1.0.26238 `
+        -FailOn error,missing-symbols
+
+    Validates a family-only drop, failing on any error and on missing symbols.
+
+.NOTES
+    File Name : validate-packages.ps1
+    Requires  : PowerShell 7+ and the repository-pinned .NET SDK.
+    Called by : validate-packages-step.yml
+
+    PackageValidator exit codes:
+      0 - No gating findings.
+      1 - The validator itself failed.
+      2 - A --fail-on gate was tripped.
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true, HelpMessage = "Path to the built PackageValidator.dll.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$ValidatorPath,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Directory scanned recursively for .nupkg files.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$PackagesPath,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Path of the JSON report to write.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$ReportPath,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Package version expected of the SqlClient family.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$SqlClientPackageVersion,
+
+    [Parameter(Mandatory = $true, HelpMessage = "File version expected of the SqlClient family.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$SqlClientFileVersion,
+
+    [Parameter(HelpMessage = "Package version expected of Microsoft.SqlServer.Server, when built.")]
+    [string]$SqlServerPackageVersion = "",
+
+    [Parameter(HelpMessage = "File version expected of Microsoft.SqlServer.Server, when built.")]
+    [string]$SqlServerFileVersion = "",
+
+    [Parameter(Mandatory = $true, HelpMessage = "Severities and/or categories that fail the build.")]
+    [ValidateNotNullOrEmpty()]
+    [string[]]$FailOn,
+
+    [Parameter(HelpMessage = "dotnet executable to invoke.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$DotnetPath = "dotnet"
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = "Stop"
+
+# Split on commas so a single "error,missing-symbols" token behaves like a two-element array.
+$failOnTokens = @($FailOn -split ',' | ForEach-Object { $_.Trim() } | Where-Object { $_ })
+if ($failOnTokens.Count -eq 0) {
+    throw "FailOn must name at least one severity or category."
+}
+
+Write-Host "=== Validate Packages Parameters ==="
+Write-Host "ValidatorPath:           ${ValidatorPath}"
+Write-Host "PackagesPath:            ${PackagesPath}"
+Write-Host "ReportPath:              ${ReportPath}"
+Write-Host "SqlClientPackageVersion: ${SqlClientPackageVersion}"
+Write-Host "SqlClientFileVersion:    ${SqlClientFileVersion}"
+Write-Host "SqlServerPackageVersion: ${SqlServerPackageVersion}"
+Write-Host "SqlServerFileVersion:    ${SqlServerFileVersion}"
+Write-Host "FailOn:                  $($failOnTokens -join ', ')"
+Write-Host "===================================="
+
+if (-not (Test-Path -LiteralPath $ValidatorPath)) {
+    throw "PackageValidator was not found at '${ValidatorPath}'."
+}
+
+$packages = @(Get-ChildItem -Path $PackagesPath -Recurse -File -Filter *.nupkg -ErrorAction SilentlyContinue)
+if ($packages.Count -eq 0) {
+    throw "No .nupkg files were found under '${PackagesPath}'."
+}
+
+Write-Host "Validating $($packages.Count) package(s):"
+$packages | ForEach-Object { Write-Host "  $($_.Name)" }
+
+# A bare value applies to every package; an id=value pair overrides it for that package only.
+$expectations = @(
+    "--expect-package-version", "*=${SqlClientPackageVersion}"
+    "--expect-file-version", "*=${SqlClientFileVersion}"
+)
+
+# Both SqlServer versions travel together: supplying only one would assert half a package.
+$hasSqlServerPackageVersion = -not [string]::IsNullOrWhiteSpace($SqlServerPackageVersion)
+$hasSqlServerFileVersion = -not [string]::IsNullOrWhiteSpace($SqlServerFileVersion)
+if ($hasSqlServerPackageVersion -ne $hasSqlServerFileVersion) {
+    throw "SqlServerPackageVersion and SqlServerFileVersion must be supplied together, or not at all."
+}
+
+if ($hasSqlServerPackageVersion) {
+    $expectations += @(
+        "--expect-package-version", "Microsoft.SqlServer.Server=${SqlServerPackageVersion}"
+        "--expect-file-version", "Microsoft.SqlServer.Server=${SqlServerFileVersion}"
+    )
+}
+
+$gate = @()
+foreach ($token in $failOnTokens) {
+    $gate += @("--fail-on", $token)
+}
+
+Write-Host "Expectations: $($expectations -join ' ')"
+Write-Host "Gate:         $($gate -join ' ')"
+
+$reportDirectory = Split-Path -Parent $ReportPath
+if ($reportDirectory) {
+    New-Item -ItemType Directory -Force -Path $reportDirectory | Out-Null
+}
+
+# Reported before gating so the JSON exists even for a failing run.
+& $DotnetPath $ValidatorPath $PackagesPath --json @expectations |
+    Set-Content -LiteralPath $ReportPath -Encoding utf8
+$reportExitCode = $LASTEXITCODE
+
+# This run is ungated, so any non-zero code means the validator itself failed and the report it
+# produced cannot be trusted.  Fail here rather than let the gated run obscure the real cause.
+if ($reportExitCode -ne 0) {
+    throw "PackageValidator failed while writing the JSON report (exit code ${reportExitCode})."
+}
+
+Write-Host "Wrote JSON report to ${ReportPath}"
+
+Write-Host ""
+Write-Host "=== Package validation report ==="
+& $DotnetPath $ValidatorPath $PackagesPath @expectations @gate
+$exitCode = $LASTEXITCODE
+
+if ($exitCode -eq 0) {
+    Write-Host ""
+    Write-Host "Package validation passed."
+}
+elseif ($exitCode -eq 2) {
+    throw "Package validation failed: one or more findings matched the gate ($($failOnTokens -join ', '))."
+}
+else {
+    throw "PackageValidator exited unexpectedly with code ${exitCode}."
+}
diff --git a/eng/pipelines/onebranch/scripts/verify-assembly-signatures.ps1 b/eng/pipelines/onebranch/scripts/verify-assembly-signatures.ps1
new file mode 100644
index 0000000000..76c1495602
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/verify-assembly-signatures.ps1
@@ -0,0 +1,99 @@
+<#
+.SYNOPSIS
+    Verifies that every assembly shipped inside an official build's NuGet packages is Authenticode
+    signed.
+
+.DESCRIPTION
+    Expands each .nupkg beneath a directory and checks the Authenticode signature of every assembly
+    it contains, including native binaries under runtimes/.
+
+    Packages are expanded rather than installed through NuGet so that every produced package is
+    covered without resolving dependencies, and so that the check does not depend on any single
+    package id.
+
+    This complements PackageValidator, which reports strong-name state from assembly metadata
+    cross-platform. Authenticode verification requires the Windows trust store, so this script runs
+    only on Windows agents and only for official builds; non-official builds deliberately produce
+    unsigned assemblies.
+
+    Every assembly is checked before failing, so a single run reports all unsigned assemblies
+    rather than stopping at the first.
+
+.PARAMETER PackagesPath
+    Directory scanned recursively for .nupkg files to expand.
+
+.PARAMETER ExtractPath
+    Directory the packages are expanded into. Each package is expanded into its own subdirectory so
+    that identically-named assemblies from different packages cannot collide. Existing content for
+    a package is replaced.
+
+.EXAMPLE
+    ./verify-assembly-signatures.ps1 -PackagesPath ./packages -ExtractPath ./extract
+
+    Expands every package beneath ./packages and verifies the signature of each assembly.
+
+.NOTES
+    File Name : verify-assembly-signatures.ps1
+    Requires  : PowerShell 7+ on Windows (Get-AuthenticodeSignature).
+    Called by : validate-packages-job.yml
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true, HelpMessage = "Directory scanned recursively for .nupkg files.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$PackagesPath,
+
+    [Parameter(Mandatory = $true, HelpMessage = "Directory the packages are expanded into.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$ExtractPath
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = "Stop"
+
+Write-Host "=== Verify Assembly Signatures Parameters ==="
+Write-Host "PackagesPath: ${PackagesPath}"
+Write-Host "ExtractPath:  ${ExtractPath}"
+Write-Host "============================================="
+
+$packages = @(Get-ChildItem -Path $PackagesPath -Recurse -File -Filter *.nupkg -ErrorAction SilentlyContinue)
+if ($packages.Count -eq 0) {
+    throw "No .nupkg files were found under '${PackagesPath}'."
+}
+
+New-Item -ItemType Directory -Force -Path $ExtractPath | Out-Null
+
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+foreach ($package in $packages) {
+    $destination = Join-Path $ExtractPath $package.BaseName
+    if (Test-Path -LiteralPath $destination) {
+        Remove-Item -LiteralPath $destination -Recurse -Force
+    }
+
+    Write-Host "Expanding $($package.Name)"
+    [System.IO.Compression.ZipFile]::ExtractToDirectory($package.FullName, $destination)
+}
+
+$assemblies = @(Get-ChildItem -Path $ExtractPath -Recurse -File -Filter *.dll)
+if ($assemblies.Count -eq 0) {
+    throw "No assemblies were found under '${ExtractPath}'."
+}
+
+# Every assembly is checked before throwing so one run reports all failures.
+$unsigned = @()
+foreach ($signature in @(Get-AuthenticodeSignature -FilePath $assemblies.FullName)) {
+    if ($signature.Status -eq "Valid") {
+        Write-Host "  OK   $($signature.Path)"
+    }
+    else {
+        Write-Host "  FAIL $($signature.Path) - $($signature.Status)"
+        $unsigned += $signature.Path
+    }
+}
+
+if ($unsigned.Count -gt 0) {
+    throw "Authenticode verification failed for $($unsigned.Count) of $($assemblies.Count) assemblies."
+}
+
+Write-Host "All $($assemblies.Count) assemblies are Authenticode signed."
diff --git a/eng/pipelines/onebranch/scripts/verify-package-signatures.ps1 b/eng/pipelines/onebranch/scripts/verify-package-signatures.ps1
new file mode 100644
index 0000000000..74fa864c07
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/verify-package-signatures.ps1
@@ -0,0 +1,72 @@
+<#
+.SYNOPSIS
+    Verifies the NuGet signatures of every package produced by an official OneBranch build.
+
+.DESCRIPTION
+    Runs `dotnet nuget verify --all` over every .nupkg and .snupkg found beneath a directory,
+    confirming that each carries a valid, trusted signature.
+
+    This complements PackageValidator, which reports signature *presence* from package metadata
+    cross-platform. Establishing that a signature is trusted requires the platform trust store,
+    which is why this runs separately and only on official builds. Non-official builds deliberately
+    produce unsigned packages, so verifying them would always fail.
+
+    Every package is verified before failing, so a single run reports all unsigned packages rather
+    than stopping at the first.
+
+.PARAMETER PackagesPath
+    Directory scanned recursively for .nupkg and .snupkg files.
+
+.PARAMETER DotnetPath
+    dotnet executable to invoke. Defaults to the dotnet command resolved from PATH. This parameter
+    primarily supports isolated testing.
+
+.EXAMPLE
+    ./verify-package-signatures.ps1 -PackagesPath ./packages
+
+    Verifies every package and symbol package beneath ./packages.
+
+.NOTES
+    File Name : verify-package-signatures.ps1
+    Requires  : PowerShell 7+ and the repository-pinned .NET SDK.
+    Called by : validate-packages-job.yml
+#>
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true, HelpMessage = "Directory scanned recursively for package files.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$PackagesPath,
+
+    [Parameter(HelpMessage = "dotnet executable to invoke.")]
+    [ValidateNotNullOrEmpty()]
+    [string]$DotnetPath = "dotnet"
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = "Stop"
+
+Write-Host "=== Verify Package Signatures Parameters ==="
+Write-Host "PackagesPath: ${PackagesPath}"
+Write-Host "============================================"
+
+$packages = @(Get-ChildItem -Path $PackagesPath -Recurse -File -Include *.nupkg, *.snupkg -ErrorAction SilentlyContinue)
+if ($packages.Count -eq 0) {
+    throw "No package files were found under '${PackagesPath}'."
+}
+
+# Every package is checked before throwing so one run reports all failures.
+$failed = @()
+foreach ($package in $packages) {
+    Write-Host "Verifying $($package.Name)"
+    & $DotnetPath nuget verify --all $package.FullName
+    if ($LASTEXITCODE -ne 0) {
+        $failed += $package.Name
+    }
+}
+
+if ($failed.Count -gt 0) {
+    throw "NuGet signature verification failed for $($failed.Count) of $($packages.Count) package(s): $($failed -join ', ')"
+}
+
+Write-Host "All $($packages.Count) package signature(s) verified."
diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml
index afd1907859..34f88bd9b3 100644
--- a/eng/pipelines/onebranch/stages/build-stages.yml
+++ b/eng/pipelines/onebranch/stages/build-stages.yml
@@ -331,17 +331,44 @@ stages:
           packageVersion: '$(sqlClientPackageVersion)'
 
   # ====================================================================
-  # Validation
-  # @TODO: Update validate-signed-package-job to compute expected versions from
-  # Versions.props (same as build jobs) instead of receiving them as parameters.
+  # Stage 5: Validation
+  # Validates every package produced by this run, together, so that
+  # cross-package rules (shared family version, dependency agreement)
+  # are actually exercised.  Depends on all build stages.
   # ====================================================================
-  # - stage: sqlclient_package_validation
-  #     displayName: "SqlClient Package Validation"
-  #     dependsOn: build_dependent
-  #     jobs:
-  #       - template: /eng/pipelines/onebranch/jobs/validate-signed-package-job.yml@self
-  #         parameters:
-  #           artifactName: '${{ parameters.sqlClientArtifactsName }}'
-  #           expectedFileVersion: <computed>
-  #           expectedPackageVersion: <computed>
-  #           isOfficial: ${{ parameters.isOfficial }}
+  - stage: package_validation
+    displayName: "Validate Packages"
+    dependsOn:
+      - compute_versions
+      - build_independent
+      - build_abstractions
+      - build_dependent
+      - build_addons
+
+    variables:
+      - name: sqlClientPackageVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientPackageVersion'] ]
+      - name: sqlClientFileVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlClientFileVersion'] ]
+      - name: sqlServerPackageVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerPackageVersion'] ]
+      - name: sqlServerFileVersion
+        value: $[ stageDependencies.compute_versions.compute_versions_job.outputs['versions.SqlServerFileVersion'] ]
+
+    jobs:
+      - template: /eng/pipelines/onebranch/jobs/validate-packages-job.yml@self
+        parameters:
+          abstractionsArtifactsName: '${{ parameters.abstractionsArtifactsName }}'
+          akvProviderArtifactsName: '${{ parameters.akvProviderArtifactsName }}'
+          azureArtifactsName: '${{ parameters.azureArtifactsName }}'
+          loggingArtifactsName: '${{ parameters.loggingArtifactsName }}'
+          sqlClientArtifactsName: '${{ parameters.sqlClientArtifactsName }}'
+          sqlServerArtifactsName: '${{ parameters.sqlServerArtifactsName }}'
+
+          sqlClientPackageVersion: '$(sqlClientPackageVersion)'
+          sqlClientFileVersion: '$(sqlClientFileVersion)'
+          sqlServerPackageVersion: '$(sqlServerPackageVersion)'
+          sqlServerFileVersion: '$(sqlServerFileVersion)'
+
+          buildSqlServer: ${{ parameters.buildSqlServer }}
+          isOfficial: ${{ parameters.isOfficial }}
diff --git a/eng/pipelines/onebranch/stages/release-stages.yml b/eng/pipelines/onebranch/stages/release-stages.yml
index d160c8906f..7ee8023cd9 100644
--- a/eng/pipelines/onebranch/stages/release-stages.yml
+++ b/eng/pipelines/onebranch/stages/release-stages.yml
@@ -112,6 +112,10 @@ stages:
       ${{ else }}:
         displayName: Release to NuGet Test
       dependsOn:
+        # Nothing is published unless every produced package passed validation.  This stage also
+        # depends on all four build stages, but we keep the complete list here anyway to prevent
+        # regressions if package validation changes its dependencies.
+        - package_validation
         - ${{ if or(parameters.releaseSqlServer, parameters.releaseSqlClient) }}:
           - build_independent
         - ${{ if parameters.releaseSqlClient }}:
diff --git a/eng/pipelines/onebranch/steps/validate-packages-step.yml b/eng/pipelines/onebranch/steps/validate-packages-step.yml
new file mode 100644
index 0000000000..173df4d7ed
--- /dev/null
+++ b/eng/pipelines/onebranch/steps/validate-packages-step.yml
@@ -0,0 +1,80 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+# Builds and runs tools/PackageValidator over a directory of produced NuGet packages.
+#
+# The validator is invoked once for the whole directory rather than once per package, because its
+# most valuable checks are cross-package: it confirms that every package in the SqlClient family
+# carries the same version and that their inter-package dependency ranges agree.  Running it per
+# package would silently skip all of those findings.
+#
+# Two invocations are made over the same inputs.  The first writes a machine-readable report and is
+# ungated, so the artifact exists even for a failing run.  It still fails the step if the validator
+# itself errors, because the report it produced could not then be trusted.  The second renders the
+# human-readable report and applies the gate, so a failed build shows the findings in its own log.
+
+parameters:
+  # Directory scanned recursively for .nupkg files.  Sibling .snupkg files must sit beside their
+  # .nupkg for symbol matching to resolve, which is how the build jobs publish them.
+  - name: packagesPath
+    type: string
+
+  # Path of the JSON report to write.
+  - name: reportPath
+    type: string
+
+  # Expected versions shared by the whole SqlClient family (Logging, Abstractions, SqlClient,
+  # Azure, AkvProvider), applied as wildcard expectations.  Pointing every package at the same
+  # value is what proves they agree, and also catches every package being consistently wrong.
+  - name: sqlClientPackageVersion
+    type: string
+
+  - name: sqlClientFileVersion
+    type: string
+
+  # Expected versions for the separately-versioned Microsoft.SqlServer.Server, applied as a per-id
+  # override of the family wildcard.  Left empty when SqlServer is not built this run: its package
+  # is then absent from the drop, and the validator rejects an expectation with an empty value.
+  - name: sqlServerPackageVersion
+    type: string
+    default: ''
+
+  - name: sqlServerFileVersion
+    type: string
+    default: ''
+
+  # Finding severities and/or categories that fail the build.  Run the validator with --help to
+  # see the full set of categories.
+  - name: failOn
+    type: object
+    default:
+      - error
+
+steps:
+  - task: DotNetCoreCLI@2
+    displayName: 'build.proj - BuildPackageValidator'
+    inputs:
+      command: build
+      projects: '$(REPO_ROOT)/build.proj'
+      arguments: >-
+        -t:BuildPackageValidator
+        -p:Configuration=Release
+
+  - task: PowerShell@2
+    displayName: 'Validate NuGet packages'
+    inputs:
+      targetType: filePath
+      pwsh: true
+      filePath: $(REPO_ROOT)/eng/pipelines/onebranch/scripts/validate-packages.ps1
+      arguments: >-
+        -ValidatorPath "$(REPO_ROOT)/tools/PackageValidator/src/bin/Release/net10.0/PackageValidator.dll"
+        -PackagesPath "${{ parameters.packagesPath }}"
+        -ReportPath "${{ parameters.reportPath }}"
+        -SqlClientPackageVersion "${{ parameters.sqlClientPackageVersion }}"
+        -SqlClientFileVersion "${{ parameters.sqlClientFileVersion }}"
+        -SqlServerPackageVersion "${{ parameters.sqlServerPackageVersion }}"
+        -SqlServerFileVersion "${{ parameters.sqlServerFileVersion }}"
+        -FailOn "${{ join(',', parameters.failOn) }}"

From 872566322e2d38b7c8e75e68af7b6944754375e6 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 10 Sep 2026 09:53:19 -0300
Subject: [PATCH 286/298] Pipelines | Name the agent image parameter poolImage
 everywhere and require it (#4626)

* Name the agent image parameter poolImage everywhere and require it

The image parameter was spelled five different ways across the pipeline
templates - vmImage, image, agentImage, imageOverride and platformImage - so a
reader had to check each template to learn what to pass.  Rename all twenty
declarations, references and call-site keys to 'poolImage', alongside the
'poolName' parameter it accompanies.

Remove the image defaults from the nineteen templates that have callers, and
pass the value explicitly at the nine call sites that had been inheriting one.
A default meant a template silently picked an agent image that its caller never
mentioned, which is easy to miss when auditing which images a pool must
provide.  Every call site now names its image.

The queue-time parameter on the CI package pipeline keeps its default, since it
has no caller to supply one, and the default lets a manual run pick a Windows
agent when that is what we want to validate.

This does not change which image any job runs on.  All 38 call sites resolve to
the same image as before, whether they previously passed a value or inherited a
default.

Note that ADO's own 'vmImage' pool keyword and the 'imageOverride' demand
capability keep their names; only our parameters are renamed.

* Fixed botched rebase conflict resolution.

* Pipelines | Finish the vmImage -> poolImage rename in kerberos and MI templates

Complete the rename started in PR #4626 so template expansion matches the
renamed declarations:

- sqlclient-ci-kerberos-job.yml: rename the vmImage parameter to poolImage
  and update the ImageOverride demand.
- sqlclient-ci-kerberos-stages.yml: rename all four call-site keys.
- sqlclient-ci-managed-instance-stages.yml: rename all four call-site keys
  to match the already-renamed poolImage parameter.

Addresses review feedback on PR #4626.
---
 .../ci/kerberos/sqlclient-ci-kerberos-job.yml  | 13 +++++++++----
 .../kerberos/sqlclient-ci-kerberos-stages.yml  |  8 ++++----
 .../sqlclient-ci-managed-instance-job.yml      |  4 ++--
 .../sqlclient-ci-managed-instance-stages.yml   |  8 ++++----
 .../package/sqlclient-ci-package-pipeline.yml  |  9 ++++++---
 .../ci/stress/sqlclient-ci-stress-job.yml      |  6 +++---
 .../ci/stress/sqlclient-ci-stress-pipeline.yml |  2 +-
 .../ci/stress/sqlclient-ci-stress-stage.yml    |  6 +++---
 .../templates/jobs/ci-build-nugets-job.yml     |  7 +++----
 .../templates/jobs/ci-code-coverage-job.yml    |  5 ++---
 .../common/templates/jobs/ci-run-tests-job.yml |  8 ++++----
 .../templates/stages/ci-run-tests-stage.yml    |  4 ++--
 eng/pipelines/dotnet-sqlclient-ci-core.yml     |  4 ++++
 .../jobs/pack-abstractions-package-ci-job.yml  |  5 ++---
 .../jobs/pack-azure-package-ci-job.yml         |  5 ++---
 .../jobs/pack-logging-package-ci-job.yml       |  5 ++---
 .../jobs/pack-sqlserver-package-ci-job.yml     |  5 ++---
 .../jobs/test-abstractions-package-ci-job.yml  |  6 +++---
 .../jobs/test-azure-package-ci-job.yml         |  8 ++++----
 eng/pipelines/pr/jobs/test-buildproj-job.yml   |  4 ++--
 .../pr/jobs/test-sqlclientmanual-job.yml       |  4 ++--
 eng/pipelines/pr/sqlclient-pr-pipeline.yml     |  6 +++---
 .../pr/stages/collect-coverage-stage.yml       |  4 ++--
 .../pr/stages/generate-secrets-stage.yml       |  4 ++--
 eng/pipelines/pr/stages/pack-stage.yml         |  8 ++------
 eng/pipelines/pr/stages/test-stages.yml        | 18 +++++++++---------
 .../build-abstractions-package-ci-stage.yml    |  7 ++++---
 .../stages/build-azure-package-ci-stage.yml    |  7 ++++---
 .../stages/build-logging-package-ci-stage.yml  |  1 +
 .../build-sqlclient-package-ci-stage.yml       |  1 +
 .../build-sqlserver-package-ci-stage.yml       |  1 +
 .../stages/compute-versions-ci-stage.yml       |  5 ++---
 .../stages/generate-secrets-ci-stage.yml       |  5 ++---
 .../stages/verify-nuget-packages-ci-stage.yml  |  5 ++---
 34 files changed, 101 insertions(+), 97 deletions(-)

diff --git a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml
index f6a1b680e7..0a8efa104c 100644
--- a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml
+++ b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml
@@ -38,6 +38,14 @@ parameters:
       - Linux
       - Windows
 
+  # The pool VM image to use.  The pool named by poolName must provide an image with this name.
+  #
+  # NOTE: This value is evaluated at template-expansion (compile) time to select the pool image, so
+  # it must be a literal and must not contain any runtime expressions (e.g. $(...) macros or
+  # $[...] runtime expressions).
+  - name: poolImage
+    type: string
+
   - name: poolName
     type: string
 
@@ -48,9 +56,6 @@ parameters:
     type: boolean
     default: false
 
-  - name: vmImage
-    type: string
-
 jobs:
   - job: kerberos_tests_job_${{ parameters.jobNameSuffix }}
     displayName: ${{ parameters.displayName }}
@@ -62,7 +67,7 @@ jobs:
     pool:
       name: ${{ parameters.poolName }}
       demands:
-        - ImageOverride -equals ${{ parameters.vmImage }}
+        - ImageOverride -equals ${{ parameters.poolImage }}
 
     steps:
 
diff --git a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-stages.yml b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-stages.yml
index 86c1b95cc9..90269805c9 100644
--- a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-stages.yml
+++ b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-stages.yml
@@ -52,10 +52,10 @@ stages:
             dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
             jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
             operatingSystem: Windows
+            poolImage: ADO-Win25
             poolName: ADO-Trusted-Domain-Win-WestUS2
             runtime: ${{ runtime }}
             useManagedSNI: false
-            vmImage: ADO-Win25
 
       # .NET runs with both native and managed SNI.
       - ${{ each runtime in parameters.netTestRuntimes }}:
@@ -67,10 +67,10 @@ stages:
             dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
             jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
             operatingSystem: Windows
+            poolImage: ADO-Win25
             poolName: ADO-Trusted-Domain-Win-WestUS2
             runtime: ${{ runtime }}
             useManagedSNI: false
-            vmImage: ADO-Win25
 
         - template: /eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-job.yml@self
           parameters:
@@ -80,10 +80,10 @@ stages:
             dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
             jobNameSuffix: windows_managed_sni_${{ replace(runtime, '.', '_') }}
             operatingSystem: Windows
+            poolImage: ADO-Win25
             poolName: ADO-Trusted-Domain-Win-WestUS2
             runtime: ${{ runtime }}
             useManagedSNI: true
-            vmImage: ADO-Win25
 
   - stage: linux
     displayName: Linux
@@ -102,6 +102,6 @@ stages:
             dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
             jobNameSuffix: linux_${{ replace(runtime, '.', '_') }}
             operatingSystem: Linux
+            poolImage: ADO-UB24
             poolName: ADO-Trusted-Linux-WestUS2
             runtime: ${{ runtime }}
-            vmImage: ADO-UB24
diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml
index 0141650535..3d74f55e0d 100644
--- a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml
+++ b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml
@@ -72,7 +72,7 @@ parameters:
   # NOTE: This value is evaluated at template-expansion (compile) time to select the pool image, so
   # it must be a literal and must not contain any runtime expressions (e.g. $(...) macros or
   # $[...] runtime expressions).
-  - name: vmImage
+  - name: poolImage
     type: string
 
 jobs:
@@ -93,7 +93,7 @@ jobs:
     pool:
       name: Managed-Instance-pool
       demands:
-        - imageOverride -equals ${{ parameters.vmImage }}
+        - imageOverride -equals ${{ parameters.poolImage }}
 
     steps:
 
diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml
index e96aef1bc3..2176ff7c87 100644
--- a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml
+++ b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-stages.yml
@@ -51,9 +51,9 @@ stages:
             displayName: 'Win : Native SNI : ${{ runtime }}'
             jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
             operatingSystem: Windows
+            poolImage: ADO-Win25
             runtime: ${{ runtime }}
             useManagedSNI: false
-            vmImage: ADO-Win25
 
       # .NET runs with both native and managed SNI.
       - ${{ each runtime in parameters.netTestRuntimes }}:
@@ -65,9 +65,9 @@ stages:
             dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
             jobNameSuffix: windows_native_sni_${{ replace(runtime, '.', '_') }}
             operatingSystem: Windows
+            poolImage: ADO-Win25
             runtime: ${{ runtime }}
             useManagedSNI: false
-            vmImage: ADO-Win25
 
         - template: /eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-job.yml@self
           parameters:
@@ -77,9 +77,9 @@ stages:
             dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
             jobNameSuffix: windows_managed_sni_${{ replace(runtime, '.', '_') }}
             operatingSystem: Windows
+            poolImage: ADO-Win25
             runtime: ${{ runtime }}
             useManagedSNI: true
-            vmImage: ADO-Win25
 
   - stage: linux
     displayName: Linux
@@ -96,5 +96,5 @@ stages:
             jobNameSuffix: linux_${{ replace(runtime, '.', '_') }}
             dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
             operatingSystem: Linux
+            poolImage: ADO-UB24
             runtime: ${{ runtime }}
-            vmImage: ADO-UB24
diff --git a/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml b/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
index ada32431b2..8526379bad 100644
--- a/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
+++ b/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
@@ -40,8 +40,11 @@ parameters:
 
   # The agent image to use for the build.  This must exist in both the ADO-1ES-Pool and
   # ADO-CI-1ES-Pool agent pools.
-  - name: agentImage
-    displayName: Agent Image
+  #
+  # This keeps a default so that manual runs can pick a Windows agent when that is what we
+  # want to validate.
+  - name: poolImage
+    displayName: Pool Image
     type: string
     default: ADO-UB24
     values:
@@ -98,7 +101,7 @@ jobs:
       ${{ else }}:
         name: ADO-CI-1ES-Pool
       demands:
-        - ImageOverride -equals ${{ parameters.agentImage }}
+        - ImageOverride -equals ${{ parameters.poolImage }}
 
     steps:
 
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
index 5b46f6c3fa..d7a064523e 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-job.yml
@@ -82,7 +82,7 @@ parameters:
     type: string
 
   # The pool VM image to use, which must exist in the specified pool.
-  - name: vmImage
+  - name: poolImage
     type: string
 
 jobs:
@@ -167,11 +167,11 @@ jobs:
 
       # Images provided by Azure Pipelines must be selected using 'vmImage'.
       ${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
-        vmImage: ${{ parameters.vmImage }}
+        vmImage: ${{ parameters.poolImage }}
       # Images provided by 1ES must be selected using a demand.
       ${{ else }}:
         demands:
-          - imageOverride -equals ${{ parameters.vmImage }}
+          - imageOverride -equals ${{ parameters.poolImage }}
 
     steps:
 
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
index 57d52d8e4a..1e91534728 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
@@ -100,7 +100,7 @@ stages:
     parameters:
       debug: ${{ parameters.debug }}
       poolName: $(ci_var_defaultPoolName)
-      vmImage: ADO-UB24
+      poolImage: ADO-UB24
 
   # Run the stress tests.
   - template: /eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml@self
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
index 0a1916594d..6f8ce4aa6d 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml
@@ -96,7 +96,7 @@ stages:
           parameters:
             saPassword: $(saPassword)
         poolName: ${{ parameters.poolName }}
-        vmImage: ADO-UB24-SQL25
+        poolImage: ADO-UB24-SQL25
 
     # ----------------------------------------------------------------------------------------------
     # Build and test on Windows
@@ -120,7 +120,7 @@ stages:
         # The Windows images include a suitable .NET Framework runtime, so we don't have to install
         # one explicitly.
         poolName: ${{ parameters.poolName }}
-        vmImage: ADO-MMS25-SQL25
+        poolImage: ADO-MMS25-SQL25
 
     # ----------------------------------------------------------------------------------------------
     # Build and test on macOS.
@@ -144,4 +144,4 @@ stages:
         # Our 1ES pools do not offer macOS images, so this job runs on the Microsoft-hosted
         # 'Azure Pipelines' pool.
         poolName: Azure Pipelines
-        vmImage: macos-latest
+        poolImage: macos-latest
diff --git a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
index 5840663f5c..ce8c58b743 100644
--- a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
@@ -27,10 +27,9 @@ parameters:
   - name: poolName
     type: string
 
-  # The imageOverride capability required from the 1ES pool.
-  - name: imageOverride
+  # The name of the VM image to run on, within the pool.
+  - name: poolImage
     type: string
-    default: ADO-Win25
 
   # The name of the Abstractions pipeline artifact to download when referenceType is 'Package'.
   - name: abstractionsArtifactsName
@@ -86,7 +85,7 @@ jobs:
   pool:
     name: ${{parameters.poolName }}
     demands:
-    - imageOverride -equals ${{ parameters.imageOverride }}
+    - imageOverride -equals ${{ parameters.poolImage }}
 
   variables:
     - template: /eng/pipelines/libraries/ci-build-variables.yml@self
diff --git a/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml b/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
index 63c74a8013..0b71bbaa5e 100644
--- a/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
@@ -28,9 +28,8 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
-    default: ADO-UB24
 
 jobs:
   - job: publish_code_coverage
@@ -40,7 +39,7 @@ jobs:
       name: ${{ parameters.poolName }}
 
       demands:
-        - imageOverride -equals ${{ parameters.vmImage }}
+        - imageOverride -equals ${{ parameters.poolImage }}
 
     variables:
       # Use a temp directory that is cleaned up after each job runs.  This helps
diff --git a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
index ba028f1502..86ee3806fd 100644
--- a/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
@@ -57,7 +57,7 @@ parameters:
     default: false
 
   # The VM image to use, which must exist in the specified pool.
-  - name: image
+  - name: poolImage
     type: string
 
   # The display name for this job.
@@ -147,7 +147,7 @@ parameters:
     type: string
 
 jobs:
-- job: ${{ format('{0}', coalesce(parameters.jobDisplayName, parameters.image, 'unknown_image')) }}
+- job: ${{ format('{0}', coalesce(parameters.jobDisplayName, parameters.poolImage, 'unknown_image')) }}
 
   # Some of our tests take longer than the default 60 minutes to run on some
   # OSes and configurations.
@@ -158,11 +158,11 @@ jobs:
 
     # Images provided by Azure Pipelines must be selected using 'vmImage'.
     ${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
-      vmImage: ${{ parameters.image }}
+      vmImage: ${{ parameters.poolImage }}
     # Images provided by 1ES must be selected using a demand.
     ${{ else }}:
       demands:
-      - imageOverride -equals ${{ parameters.image }}
+      - imageOverride -equals ${{ parameters.poolImage }}
 
   variables:
     - name: dotnetx86RootPath
diff --git a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
index 1cda6c7580..29e0042569 100644
--- a/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
+++ b/eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
@@ -106,7 +106,7 @@ stages:
                   referenceType: ${{ parameters.referenceType }}
                   timeout: ${{ parameters.testJobTimeout }}
                   poolName: ${{ config.value.pool }}
-                  image: ${{ image.value }}
+                  poolImage: ${{ image.value }}
                   jobDisplayName: ${{ format('{0}_{1}_{2}', replace(targetFramework, '.', '_'), platform, testSet) }}
                   configProperties: ${{ config.value.configProperties }}
                   abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
@@ -136,7 +136,7 @@ stages:
                     referenceType: ${{ parameters.referenceType }}
                     timeout: ${{ parameters.testJobTimeout }}
                     poolName: ${{ config.value.pool }}
-                    image: ${{ image.value }}
+                    poolImage: ${{ image.value }}
                     ${{if eq(usemanagedSNI, 'true') }}:
                       jobDisplayName: ${{ format('{0}_{1}_{2}_{3}', replace(targetFramework, '.', '_'), platform, 'ManagedSNI', testSet) }}
                     ${{ else }}:
diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index 9b53b6a85a..3102b9f8a2 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -174,12 +174,14 @@ stages:
   - template: /eng/pipelines/stages/compute-versions-ci-stage.yml@self
     parameters:
       poolName: ${{ parameters.defaultPoolName }}
+      poolImage: ADO-UB24
       buildSuffix: ${{ parameters.buildSuffix }}
 
   # Generate secrets used throughout the pipeline.
   - template: /eng/pipelines/stages/generate-secrets-ci-stage.yml@self
     parameters:
       poolName: ${{ parameters.defaultPoolName }}
+      poolImage: ADO-UB24
       debug: ${{ parameters.debug }}
 
   # Build the SqlServer package, and publish it to the pipeline artifacts
@@ -276,6 +278,7 @@ stages:
   - template: /eng/pipelines/stages/verify-nuget-packages-ci-stage.yml@self
     parameters:
       poolName: ${{ parameters.defaultPoolName }}
+      poolImage: ADO-Win25
       abstractionsArtifactsName: $(abstractionsArtifactsName)
       azureArtifactsName: $(azureArtifactsName)
       loggingArtifactsName: $(loggingArtifactsName)
@@ -324,6 +327,7 @@ stages:
             parameters:
               debug: ${{ parameters.debug }}
               poolName: ${{ parameters.defaultPoolName }}
+              poolImage: ADO-UB24
               # We only want to upload coverage results to CodeCov from certain
               # pipelines.  We use the pipeline name (Build.DefinitionName) to
               # choose.  This is a predefined variable that is available at
diff --git a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
index bbd80cc3f9..3b01faddc5 100644
--- a/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-abstractions-package-ci-job.yml
@@ -76,9 +76,8 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
-    default: ADO-UB24
 
 jobs:
 
@@ -91,7 +90,7 @@ jobs:
       name: ${{ parameters.poolName }}
 
       demands:
-        - imageOverride -equals ${{ parameters.vmImage }}
+        - imageOverride -equals ${{ parameters.poolImage }}
 
     variables:
 
diff --git a/eng/pipelines/jobs/pack-azure-package-ci-job.yml b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
index b626dd14a5..884d4a5c32 100644
--- a/eng/pipelines/jobs/pack-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-azure-package-ci-job.yml
@@ -82,9 +82,8 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
-    default: ADO-UB24
 
 jobs:
 
@@ -97,7 +96,7 @@ jobs:
       name: ${{ parameters.poolName }}
 
       demands:
-        - imageOverride -equals ${{ parameters.vmImage }}
+        - imageOverride -equals ${{ parameters.poolImage }}
 
     variables:
 
diff --git a/eng/pipelines/jobs/pack-logging-package-ci-job.yml b/eng/pipelines/jobs/pack-logging-package-ci-job.yml
index 03fde36308..1adcf3ac1d 100644
--- a/eng/pipelines/jobs/pack-logging-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-logging-package-ci-job.yml
@@ -59,9 +59,8 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
-    default: ADO-UB24
 
 jobs:
 
@@ -74,7 +73,7 @@ jobs:
       name: ${{ parameters.poolName }}
 
       demands:
-        - imageOverride -equals ${{ parameters.vmImage }}
+        - imageOverride -equals ${{ parameters.poolImage }}
 
     variables:
 
diff --git a/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml b/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
index c869026812..54938389a5 100644
--- a/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
+++ b/eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml
@@ -58,9 +58,8 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
-    default: ADO-UB24
 
 jobs:
 
@@ -73,7 +72,7 @@ jobs:
       name: ${{ parameters.poolName }}
 
       demands:
-        - imageOverride -equals ${{ parameters.vmImage }}
+        - imageOverride -equals ${{ parameters.poolImage }}
 
     variables:
 
diff --git a/eng/pipelines/jobs/test-abstractions-package-ci-job.yml b/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
index 1cdf04c0be..c706ca0c57 100644
--- a/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-abstractions-package-ci-job.yml
@@ -66,7 +66,7 @@ parameters:
     type: string
 
   # The pool VM image to use.
-  - name: vmImage
+  - name: poolImage
     type: string
 
 jobs:
@@ -78,11 +78,11 @@ jobs:
 
       # Images provided by Azure Pipelines must be selected using 'vmImage'.
       ${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
-        vmImage: ${{ parameters.vmImage }}
+        vmImage: ${{ parameters.poolImage }}
       # Images provided by 1ES must be selected using a demand.
       ${{ else }}:
         demands:
-          - imageOverride -equals ${{ parameters.vmImage }}
+          - imageOverride -equals ${{ parameters.poolImage }}
 
     variables:
 
diff --git a/eng/pipelines/jobs/test-azure-package-ci-job.yml b/eng/pipelines/jobs/test-azure-package-ci-job.yml
index 5319fba0c3..e927eb6e6e 100644
--- a/eng/pipelines/jobs/test-azure-package-ci-job.yml
+++ b/eng/pipelines/jobs/test-azure-package-ci-job.yml
@@ -126,7 +126,7 @@ parameters:
     default: []
 
   # The pool VM image to use.
-  - name: vmImage
+  - name: poolImage
     type: string
 
 jobs:
@@ -138,11 +138,11 @@ jobs:
 
       # Images provided by Azure Pipelines must be selected using 'vmImage'.
       ${{ if eq(parameters.poolName, 'Azure Pipelines') }}:
-        vmImage: ${{ parameters.vmImage }}
+        vmImage: ${{ parameters.poolImage }}
       # Images provided by 1ES must be selected using a demand.
       ${{ else }}:
         demands:
-          - imageOverride -equals ${{ parameters.vmImage }}
+          - imageOverride -equals ${{ parameters.poolImage }}
 
     variables:
 
@@ -250,7 +250,7 @@ jobs:
           AADServicePrincipalId: $(AADServicePrincipalId)
           AzureKeyVaultTenantId: $(AzureKeyVaultTenantId)
           # macOS doesn't support managed identities.
-          ManagedIdentitySupported: ${{ not(eq(parameters.vmImage, 'macos-latest')) }}
+          ManagedIdentitySupported: ${{ not(eq(parameters.poolImage, 'macos-latest')) }}
           TCPConnectionString: $(AZURE_DB_TCP_CONN_STRING)
           UserManagedIdentityClientId: $(UserManagedIdentityClientId)
           WorkloadIdentityFederationServiceConnectionId: $(WorkloadIdentityFederationServiceConnectionId)
diff --git a/eng/pipelines/pr/jobs/test-buildproj-job.yml b/eng/pipelines/pr/jobs/test-buildproj-job.yml
index c232513e1f..1e9a93fdab 100644
--- a/eng/pipelines/pr/jobs/test-buildproj-job.yml
+++ b/eng/pipelines/pr/jobs/test-buildproj-job.yml
@@ -45,7 +45,7 @@ parameters:
     type: string
 
   # Name of the image in the customized ADO pool to use to execute this job.
-  - name: platformImage
+  - name: poolImage
     type: string
 
   # Name of the pool to use for jobs that require customized VM images.
@@ -89,7 +89,7 @@ jobs:
     pool:
       name: ${{ parameters.poolName }}
       demands:
-        - imageOverride -equals ${{ parameters.platformImage }}
+        - imageOverride -equals ${{ parameters.poolImage }}
 
     steps:
       # Install dotnet and the runtime that will run the tests (if it is not netframework)
diff --git a/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml b/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
index 38b49695fe..3b975aa46b 100644
--- a/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
+++ b/eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
@@ -49,7 +49,7 @@ parameters:
     type: string
 
   # Name of the image in the customized ADO pool to use to execute this job.
-  - name: platformImage
+  - name: poolImage
     type: string
 
   # General name of the operating system that will be used to execute the job.
@@ -132,7 +132,7 @@ jobs:
     pool:
       name: ${{ parameters.poolName }}
       demands:
-        - imageOverride -equals ${{ parameters.platformImage }}
+        - imageOverride -equals ${{ parameters.poolImage }}
 
     variables:
       # Bring the generated SA password from the secrets stage into scope for this test stage.
diff --git a/eng/pipelines/pr/sqlclient-pr-pipeline.yml b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
index 5ad15f5474..640c448c13 100644
--- a/eng/pipelines/pr/sqlclient-pr-pipeline.yml
+++ b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
@@ -122,14 +122,14 @@ stages:
       stageName: ${{ variables.stageNamePack }}
       packArtifactBaseName: ${{ variables.packArtifactBaseName }}
       poolName: $(PoolNameDefault)
-      vmImage: ADO-UB24
+      poolImage: ADO-UB24
 
   # Stage 1b: Generate secrets
   - template: /eng/pipelines/pr/stages/generate-secrets-stage.yml@self
     parameters:
       stageName: ${{ variables.stageNameSecrets }}
       poolName: $(PoolNameDefault)
-      vmImage: ADO-UB24
+      poolImage: ADO-UB24
 
   # Stage 2: Execute tests and collect code coverage
   - template: /eng/pipelines/pr/stages/test-stages.yml@self
@@ -160,7 +160,7 @@ stages:
     parameters:
       coverageArtifactBaseName: ${{ variables.coverageArtifactBaseName }}
       poolName: $(PoolNameDefault)
-      vmImage: ADO-UB24
+      poolImage: ADO-UB24
       dependsOn:
         - ${{ each platform in parameters.platforms }}:
             - "test_${{ platform.displayName }}"
diff --git a/eng/pipelines/pr/stages/collect-coverage-stage.yml b/eng/pipelines/pr/stages/collect-coverage-stage.yml
index a81b4bb1be..9fa4c1828a 100644
--- a/eng/pipelines/pr/stages/collect-coverage-stage.yml
+++ b/eng/pipelines/pr/stages/collect-coverage-stage.yml
@@ -21,7 +21,7 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
 
 stages:
@@ -37,7 +37,7 @@ stages:
           name: ${{ parameters.poolName }}
 
           demands:
-            - imageOverride -equals ${{ parameters.vmImage }}
+            - imageOverride -equals ${{ parameters.poolImage }}
 
         variables:
 
diff --git a/eng/pipelines/pr/stages/generate-secrets-stage.yml b/eng/pipelines/pr/stages/generate-secrets-stage.yml
index bd7d2d6a5c..f936594e1a 100644
--- a/eng/pipelines/pr/stages/generate-secrets-stage.yml
+++ b/eng/pipelines/pr/stages/generate-secrets-stage.yml
@@ -35,7 +35,7 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
 
 stages:
@@ -57,7 +57,7 @@ stages:
           name: ${{ parameters.poolName }}
 
           demands:
-            - imageOverride -equals ${{ parameters.vmImage }}
+            - imageOverride -equals ${{ parameters.poolImage }}
 
         steps:
 
diff --git a/eng/pipelines/pr/stages/pack-stage.yml b/eng/pipelines/pr/stages/pack-stage.yml
index 8da436f445..a142eac5e9 100644
--- a/eng/pipelines/pr/stages/pack-stage.yml
+++ b/eng/pipelines/pr/stages/pack-stage.yml
@@ -47,7 +47,7 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
 
 stages:
@@ -63,7 +63,7 @@ stages:
           name: ${{ parameters.poolName }}
 
           demands:
-            - imageOverride -equals ${{ parameters.vmImage }}
+            - imageOverride -equals ${{ parameters.poolImage }}
 
         steps:
           # Install dotnet
@@ -147,7 +147,3 @@ stages:
             artifact: ${{ parameters.packArtifactBaseName }}_attempt$(System.JobAttempt)
             displayName: Publish Build Output
             condition: succeededOrFailed()
-
-
-
-
diff --git a/eng/pipelines/pr/stages/test-stages.yml b/eng/pipelines/pr/stages/test-stages.yml
index 0ad9921ec6..ce4c5c32f8 100644
--- a/eng/pipelines/pr/stages/test-stages.yml
+++ b/eng/pipelines/pr/stages/test-stages.yml
@@ -133,7 +133,7 @@ stages:
               dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
-              platformImage: ${{ platform.image }}
+              poolImage: ${{ platform.image }}
               poolName: ${{ parameters.poolName }}
               testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
@@ -148,7 +148,7 @@ stages:
               dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
-              platformImage: ${{ platform.image }}
+              poolImage: ${{ platform.image }}
               poolName: ${{ parameters.poolName }}
               testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
@@ -163,7 +163,7 @@ stages:
               dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
-              platformImage: ${{ platform.image }}
+              poolImage: ${{ platform.image }}
               poolName: ${{ parameters.poolName }}
               testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
@@ -178,7 +178,7 @@ stages:
               dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
-              platformImage: ${{ platform.image }}
+              poolImage: ${{ platform.image }}
               poolName: ${{ parameters.poolName }}
               testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
@@ -197,7 +197,7 @@ stages:
 
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
-              platformImage: ${{ platform.image }}
+              poolImage: ${{ platform.image }}
               platformOperatingSystem: ${{ platform.operatingSystem }}
               poolName: ${{ parameters.poolName }}
 
@@ -232,7 +232,7 @@ stages:
 
                 platformDisplayName: ${{ platform.displayName }}
                 platformDotnet: ${{ platform.dotnet }}
-                platformImage: ${{ platform.image }}
+                poolImage: ${{ platform.image }}
                 platformOperatingSystem: ${{ platform.operatingSystem }}
                 poolName: ${{ parameters.poolName }}
 
@@ -261,7 +261,7 @@ stages:
 
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
-              platformImage: ${{ platform.image }}
+              poolImage: ${{ platform.image }}
               platformOperatingSystem: ${{ platform.operatingSystem }}
               poolName: ${{ parameters.poolName }}
 
@@ -290,7 +290,7 @@ stages:
 
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
-              platformImage: ${{ platform.image }}
+              poolImage: ${{ platform.image }}
               platformOperatingSystem: ${{ platform.operatingSystem }}
               poolName: ${{ parameters.poolName }}
 
@@ -316,7 +316,7 @@ stages:
               dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
               platformDisplayName: ${{ platform.displayName }}
               platformDotnet: ${{ platform.dotnet }}
-              platformImage: ${{ platform.image }}
+              poolImage: ${{ platform.image }}
               poolName: ${{ parameters.poolName }}
               testResultsArtifactBaseName: ${{ parameters.testResultsArtifactBaseName }}
 
diff --git a/eng/pipelines/stages/build-abstractions-package-ci-stage.yml b/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
index 3342bfca01..03fac7ae8e 100644
--- a/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-abstractions-package-ci-stage.yml
@@ -119,7 +119,7 @@ stages:
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.poolName }}
-          vmImage: ADO-UB24
+          poolImage: ADO-UB24
 
       # ------------------------------------------------------------------------
       # Build and test on Windows
@@ -134,7 +134,7 @@ stages:
           netFrameworkRuntimes: [net462]
           netRuntimes: [net8.0, net9.0, net10.0]
           poolName: ${{ parameters.poolName }}
-          vmImage: ADO-Win25
+          poolImage: ADO-Win25
 
       # ------------------------------------------------------------------------
       # Build and test on macOS.
@@ -151,7 +151,7 @@ stages:
           # Our 1ES pools do not offer macOS images, so this job runs on the Microsoft-hosted
           # 'Azure Pipelines' pool.
           poolName: Azure Pipelines
-          vmImage: macos-latest
+          poolImage: macos-latest
 
       # ------------------------------------------------------------------------
       # Create and publish the NuGet package.
@@ -159,6 +159,7 @@ stages:
       - template: /eng/pipelines/jobs/pack-abstractions-package-ci-job.yml@self
         parameters:
           poolName: ${{ parameters.poolName }}
+          poolImage: ADO-UB24
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
           # The version is computed by this stage (see the packageVersion variable above).
           packageVersion: $(packageVersion)
diff --git a/eng/pipelines/stages/build-azure-package-ci-stage.yml b/eng/pipelines/stages/build-azure-package-ci-stage.yml
index fed69e339e..1f502a5fee 100644
--- a/eng/pipelines/stages/build-azure-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-azure-package-ci-stage.yml
@@ -162,7 +162,7 @@ stages:
             - template: /eng/pipelines/common/templates/steps/configure-sql-server-linux-step.yml@self
               parameters:
                 saPassword: $(saPassword)
-          vmImage: ADO-UB24-SQL25
+          poolImage: ADO-UB24-SQL25
 
       # ------------------------------------------------------------------------
       # Build and test on Windows
@@ -197,7 +197,7 @@ stages:
                 # group.
                 fileStreamDirectory: $(FileStreamDirectory)
                 SQLRootPath: $(SQL25RootPath)
-          vmImage: ADO-MMS25-SQL25
+          poolImage: ADO-MMS25-SQL25
 
       # ------------------------------------------------------------------------
       # Build and test on macOS.
@@ -222,7 +222,7 @@ stages:
           # 'Azure Pipelines' pool.
           poolName: Azure Pipelines
           referenceType: ${{ parameters.referenceType }}
-          vmImage: macos-latest
+          poolImage: macos-latest
 
       # ------------------------------------------------------------------------
       # Create and publish the NuGet package.
@@ -230,6 +230,7 @@ stages:
       - template: /eng/pipelines/jobs/pack-azure-package-ci-job.yml@self
         parameters:
           poolName: ${{ parameters.poolName }}
+          poolImage: ADO-UB24
           abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
           packageVersion: $(packageVersion)
           azureArtifactsName: ${{ parameters.azureArtifactsName }}
diff --git a/eng/pipelines/stages/build-logging-package-ci-stage.yml b/eng/pipelines/stages/build-logging-package-ci-stage.yml
index 9b421b821a..62b52480c9 100644
--- a/eng/pipelines/stages/build-logging-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-logging-package-ci-stage.yml
@@ -93,6 +93,7 @@ stages:
       - template: /eng/pipelines/jobs/pack-logging-package-ci-job.yml@self
         parameters:
           poolName: ${{ parameters.poolName }}
+          poolImage: ADO-UB24
           loggingArtifactsName: ${{ parameters.loggingArtifactsName }}
           # The version is computed by this stage (see the packageVersion variable above).
           packageVersion: $(packageVersion)
diff --git a/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml b/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
index 1895f4e593..f7eb9d6f1a 100644
--- a/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-sqlclient-package-ci-stage.yml
@@ -93,6 +93,7 @@ stages:
     - template: /eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml@self
       parameters:
         poolName: ${{ parameters.poolName }}
+        poolImage: ADO-Win25
         buildConfiguration: ${{ parameters.buildConfiguration }}
         referenceType: ${{ parameters.referenceType }}
         abstractionsArtifactsName: ${{ parameters.abstractionsArtifactsName }}
diff --git a/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml b/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
index 633e3bc3f1..f62a6eb166 100644
--- a/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
+++ b/eng/pipelines/stages/build-sqlserver-package-ci-stage.yml
@@ -86,6 +86,7 @@ stages:
       - template: /eng/pipelines/jobs/pack-sqlserver-package-ci-job.yml@self
         parameters:
           poolName: ${{ parameters.poolName }}
+          poolImage: ADO-UB24
           buildConfiguration: ${{ parameters.buildConfiguration }}
           debug: ${{ parameters.debug }}
           sqlServerArtifactsName: ${{ parameters.sqlServerArtifactsName }}
diff --git a/eng/pipelines/stages/compute-versions-ci-stage.yml b/eng/pipelines/stages/compute-versions-ci-stage.yml
index d508ba51ed..ada6a8844b 100644
--- a/eng/pipelines/stages/compute-versions-ci-stage.yml
+++ b/eng/pipelines/stages/compute-versions-ci-stage.yml
@@ -28,9 +28,8 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
-    default: ADO-UB24
 
   # Build suffix appended to prerelease tag (e.g. 'ci' or 'pr').
   - name: buildSuffix
@@ -47,7 +46,7 @@ stages:
         pool:
           name: ${{ parameters.poolName }}
           demands:
-            - imageOverride -equals ${{ parameters.vmImage }}
+            - imageOverride -equals ${{ parameters.poolImage }}
 
         steps:
           # Install the global.json-pinned .NET SDK before running any dotnet build, so this stage
diff --git a/eng/pipelines/stages/generate-secrets-ci-stage.yml b/eng/pipelines/stages/generate-secrets-ci-stage.yml
index d6f38f8f85..5e54a5d1b1 100644
--- a/eng/pipelines/stages/generate-secrets-ci-stage.yml
+++ b/eng/pipelines/stages/generate-secrets-ci-stage.yml
@@ -40,9 +40,8 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
-    default: ADO-UB24
 
 stages:
 
@@ -65,7 +64,7 @@ stages:
           name: ${{ parameters.poolName }}
 
           demands:
-            - imageOverride -equals ${{ parameters.vmImage }}
+            - imageOverride -equals ${{ parameters.poolImage }}
 
         steps:
 
diff --git a/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml b/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml
index 06d43769fd..d16b4a5838 100644
--- a/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml
+++ b/eng/pipelines/stages/verify-nuget-packages-ci-stage.yml
@@ -47,9 +47,8 @@ parameters:
     type: string
 
   # The name of the VM image to run on, within the pool.
-  - name: vmImage
+  - name: poolImage
     type: string
-    default: ADO-Win25
 
 stages:
 
@@ -71,7 +70,7 @@ stages:
           name: ${{ parameters.poolName }}
 
           demands:
-            - imageOverride -equals ${{ parameters.vmImage }}
+            - imageOverride -equals ${{ parameters.poolImage }}
 
         variables:
           # The directory where all package artifacts will be downloaded.

From fde91ee8af60b7c7fc40fb4edbf632998bdd6d55 Mon Sep 17 00:00:00 2001
From: priyankatiwari08 <prtiwar@microsoft.com>
Date: Thu, 10 Sep 2026 21:25:21 +0530
Subject: [PATCH 287/298] Use automatic model selection in issue auto-triage
 workflow (#4659)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .gitattributes                          |    2 +-
 .github/aw/actions-lock.json            |    6 +-
 .github/workflows/issue-triage.lock.yml | 1033 ++++++++++++++---------
 .github/workflows/issue-triage.md       |    2 +
 .github/workflows/verify-aw-lock.yml    |    4 +-
 5 files changed, 640 insertions(+), 407 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index a1d79dfeee..ab4f136a23 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,4 @@
 * text=auto
 
 # Treat workflow lock files as generated
-.github/workflows/*.lock.yml linguist-generated=true merge=ours
+.github/workflows/*.lock.yml linguist-generated=true
diff --git a/.github/aw/actions-lock.json b/.github/aw/actions-lock.json
index 64a0a0a93a..cdcb39f6a2 100644
--- a/.github/aw/actions-lock.json
+++ b/.github/aw/actions-lock.json
@@ -5,10 +5,10 @@
       "version": "v9.0.0",
       "sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
     },
-    "github/gh-aw-actions/setup@v0.80.9": {
+    "github/gh-aw-actions/setup@v0.88.2": {
       "repo": "github/gh-aw-actions/setup",
-      "version": "v0.80.9",
-      "sha": "8c7d04ebf1ece56cd381446125da3e0f6896294a"
+      "version": "v0.88.2",
+      "sha": "9271a1804551c0dc4fb0085a97979950aa2f8489"
     }
   }
 }
diff --git a/.github/workflows/issue-triage.lock.yml b/.github/workflows/issue-triage.lock.yml
index 886e8e2e63..d1ef3b2e67 100644
--- a/.github/workflows/issue-triage.lock.yml
+++ b/.github/workflows/issue-triage.lock.yml
@@ -1,15 +1,15 @@
-# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"c9a288bea873cc74dd33e81e0f5784e167d990ee0e2645c1722106b45ae1f77d","body_hash":"99b21e9ba167d3bfbcfaeb3b04c515fc42b56679f0ee175c119bc5843f034d31","compiler_version":"v0.80.9","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.63"}}
-# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/cache/restore","sha":"27d5ce7f107fe9357f9df03efb73ab90386fccae","version":"v5.0.5"},{"repo":"actions/cache/save","sha":"27d5ce7f107fe9357f9df03efb73ab90386fccae","version":"v5.0.5"},{"repo":"actions/checkout","sha":"9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0","version":"v7.0.0"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"8c7d04ebf1ece56cd381446125da3e0f6896294a","version":"v0.80.9"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.27.7","digest":"sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.27.7@sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.7","digest":"sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.7@sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.27.7","digest":"sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.27.7@sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.27","digest":"sha256:fe984bddde4ec05d756d9043edb0a32912e6b7b72f6a121b1082f29221421cc7","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.27@sha256:fe984bddde4ec05d756d9043edb0a32912e6b7b72f6a121b1082f29221421cc7"},{"image":"ghcr.io/github/gh-aw-node","digest":"sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b","pinned_image":"ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b"},{"image":"ghcr.io/github/github-mcp-server:v1.4.0","digest":"sha256:2afb26356481d1a350e14544a6e160f7f7ec1561a1ea309b823665abf0309036","pinned_image":"ghcr.io/github/github-mcp-server:v1.4.0@sha256:2afb26356481d1a350e14544a6e160f7f7ec1561a1ea309b823665abf0309036"}]}
-# This file was automatically generated by gh-aw (v0.80.9). DO NOT EDIT. To debug this workflow, load the skill at https://github.com/github/gh-aw/blob/main/debug.md
+# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"8b81a4840372af279438b0250d6ae7168fa2e0a2f82ae8cd52d714f18a83d425","body_hash":"99b21e9ba167d3bfbcfaeb3b04c515fc42b56679f0ee175c119bc5843f034d31","compiler_version":"v0.88.2","strict":true,"agent_id":"copilot","agent_model":"auto","engine_versions":{"copilot":"1.0.80"}}
+# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_DEFAULT_OTLP_HEADERS","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/cache/restore","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/cache/save","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/checkout","sha":"3d3c42e5aac5ba805825da76410c181273ba90b1","version":"v7.0.1"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"9271a1804551c0dc4fb0085a97979950aa2f8489","version":"v0.88.2"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.28.12","digest":"sha256:390051be4ed1847f774fd8980b61d3a3523574c0175d00c3fc7cdf2002a88202","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.28.12@sha256:390051be4ed1847f774fd8980b61d3a3523574c0175d00c3fc7cdf2002a88202"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.28.12","digest":"sha256:d7d533d87c80d87ff91ac0e21e9299055c3beedff1536262b97ed700fb065a32","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.28.12@sha256:d7d533d87c80d87ff91ac0e21e9299055c3beedff1536262b97ed700fb065a32"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.28.12","digest":"sha256:52c34aca98d2a6833c329f1505912a6949c4fda16618c010c979bd59ea99254f","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.28.12@sha256:52c34aca98d2a6833c329f1505912a6949c4fda16618c010c979bd59ea99254f"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.4.15","digest":"sha256:60cd97533e93d8e7be36b979c0f08a70846189bda6190f28bbd6d427bc0d9b6e","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.4.15@sha256:60cd97533e93d8e7be36b979c0f08a70846189bda6190f28bbd6d427bc0d9b6e"},{"image":"ghcr.io/github/gh-aw-node","digest":"sha256:bac2192f6374d6262116399b34fc5e143d576f82719e90a18261cae7480f4d4e","pinned_image":"ghcr.io/github/gh-aw-node@sha256:bac2192f6374d6262116399b34fc5e143d576f82719e90a18261cae7480f4d4e"},{"image":"ghcr.io/github/github-mcp-server:v1.11.0","digest":"sha256:fbec75de11c255213fa08d80fb166abe73d851fff631c51c0079872967720699","pinned_image":"ghcr.io/github/github-mcp-server:v1.11.0@sha256:fbec75de11c255213fa08d80fb166abe73d851fff631c51c0079872967720699"}],"mcp_servers":[{"name":"github","tools":["get_commit","get_file_contents","get_latest_release","get_me","get_pull_request","get_pull_request_comments","get_pull_request_diff","get_pull_request_files","get_pull_request_review_comments","get_pull_request_reviews","get_pull_request_status","get_release_by_tag","get_tag","issue_read","list_branches","list_commits","list_issue_types","list_issues","list_pull_requests","list_releases","list_starred_repositories","list_tags","pull_request_read","search_code","search_issues","search_pull_requests","search_repositories"]},{"name":"safeoutputs","tools":["add_comment","add_labels","missing_data","missing_tool","noop","remove_labels"]}]}
+# This file was automatically generated by gh-aw (v0.88.2). DO NOT EDIT. To debug this workflow, load the skill at https://github.com/github/gh-aw/blob/main/debug.md
 #
-#    ___                   _   _      
-#   / _ \                 | | (_)     
-#  | |_| | __ _  ___ _ __ | |_ _  ___ 
+#    ___                   _   _
+#   / _ \                 | | (_)
+#  | |_| | __ _  ___ _ __ | |_ _  ___
 #  |  _  |/ _` |/ _ \ '_ \| __| |/ __|
-#  | | | | (_| |  __/ | | | |_| | (__ 
+#  | | | | (_| |  __/ | | | |_| | (__
 #  \_| |_/\__, |\___|_| |_|\__|_|\___|
 #          __/ |
-#  _    _ |___/ 
+#  _    _ |___/
 # | |  | |                / _| |
 # | |  | | ___ _ __ _  __| |_| | _____      ____
 # | |/\| |/ _ \ '__| |/ /|  _| |/ _ \ \ /\ / / ___|
@@ -26,45 +26,55 @@
 #
 # Secrets used:
 #   - COPILOT_GITHUB_TOKEN
+#   - GH_AW_DEFAULT_OTLP_HEADERS
 #   - GH_AW_GITHUB_MCP_SERVER_TOKEN
 #   - GH_AW_GITHUB_TOKEN
 #   - GITHUB_TOKEN
 #
 # Custom actions used:
-#   - actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-#   - actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-#   - actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+#   - actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+#   - actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+#   - actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 #   - actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
 #   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-#   - actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+#   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 (source v9)
 #   - actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-#   - github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
+#   - github/gh-aw-actions/setup@9271a1804551c0dc4fb0085a97979950aa2f8489 # v0.88.2
 #
 # Container images used:
-#   - ghcr.io/github/gh-aw-firewall/agent:0.27.7@sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c
-#   - ghcr.io/github/gh-aw-firewall/api-proxy:0.27.7@sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6
-#   - ghcr.io/github/gh-aw-firewall/squid:0.27.7@sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96
-#   - ghcr.io/github/gh-aw-mcpg:v0.3.27@sha256:fe984bddde4ec05d756d9043edb0a32912e6b7b72f6a121b1082f29221421cc7
-#   - ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b
-#   - ghcr.io/github/github-mcp-server:v1.4.0@sha256:2afb26356481d1a350e14544a6e160f7f7ec1561a1ea309b823665abf0309036
+#   - ghcr.io/github/gh-aw-firewall/agent:0.28.12@sha256:390051be4ed1847f774fd8980b61d3a3523574c0175d00c3fc7cdf2002a88202
+#   - ghcr.io/github/gh-aw-firewall/api-proxy:0.28.12@sha256:d7d533d87c80d87ff91ac0e21e9299055c3beedff1536262b97ed700fb065a32
+#   - ghcr.io/github/gh-aw-firewall/squid:0.28.12@sha256:52c34aca98d2a6833c329f1505912a6949c4fda16618c010c979bd59ea99254f
+#   - ghcr.io/github/gh-aw-mcpg:v0.4.15@sha256:60cd97533e93d8e7be36b979c0f08a70846189bda6190f28bbd6d427bc0d9b6e
+#   - ghcr.io/github/gh-aw-node@sha256:bac2192f6374d6262116399b34fc5e143d576f82719e90a18261cae7480f4d4e
+#   - ghcr.io/github/github-mcp-server:v1.11.0@sha256:fbec75de11c255213fa08d80fb166abe73d851fff631c51c0079872967720699
 
 name: "SqlClient Issue Auto-Triage"
 on:
   issue_comment:
     types:
-    - created
+      - created
   issues:
     types:
-    - opened
-  # roles: all # Roles processed as role check in pre-activation job
+      - opened
+# roles: all # Roles processed as role check in pre-activation job
 
 permissions: {}
 
 concurrency:
   group: "gh-aw-${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}"
+  queue: max
 
 run-name: "SqlClient Issue Auto-Triage"
 
+env:
+  OTEL_EXPORTER_OTLP_ENDPOINT: ${{ vars.GH_AW_DEFAULT_OTLP_ENDPOINT }}
+  OTEL_SERVICE_NAME: gh-aw.issue-triage
+  OTEL_RESOURCE_ATTRIBUTES: 'gh-aw.workflow.name=SqlClient%20Issue%20Auto-Triage,gh-aw.repository=${{ github.repository }},gh-aw.run.id=${{ github.run_id }},github.run_id=${{ github.run_id }},gh-aw.engine.id=copilot'
+  OTEL_EXPORTER_OTLP_HEADERS: ${{ secrets.GH_AW_DEFAULT_OTLP_HEADERS }}
+  GH_AW_OTLP_ENDPOINTS: '[{"url":"${{ vars.GH_AW_DEFAULT_OTLP_ENDPOINT }}","headers":"${{ secrets.GH_AW_DEFAULT_OTLP_HEADERS }}"}]'
+  GH_AW_OTLP_IF_MISSING: ignore
+
 jobs:
   activation:
     if: >
@@ -87,16 +97,19 @@ jobs:
       contents: read
     env:
       GH_AW_MAX_DAILY_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_DAILY_AI_CREDITS || '5000' }}
+      GH_AW_RUNTIME_FEATURES: ${{ vars.GH_AW_RUNTIME_FEATURES }}
     outputs:
       body: ${{ steps.sanitized.outputs.body }}
       comment_id: ""
       comment_repo: ""
       daily_ai_credits_exceeded: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_exceeded == 'true' }}
+      daily_ai_credits_guardrail_status: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_guardrail_status || '' }}
       daily_ai_credits_threshold: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_threshold || '' }}
       daily_ai_credits_total_effective_tokens: ${{ steps.daily-effective-workflow-guardrail.outputs.daily_ai_credits_total_effective_tokens || '' }}
       engine_id: ${{ steps.generate_aw_info.outputs.engine_id }}
       lockdown_check_failed: ${{ steps.generate_aw_info.outputs.lockdown_check_failed == 'true' }}
       model: ${{ steps.generate_aw_info.outputs.model }}
+      oauth_token_check_failed: ${{ steps.check-oauth-tokens.outputs.oauth_token_check_failed == 'true' }}
       setup-parent-span-id: ${{ steps.setup.outputs.parent-span-id || steps.setup.outputs.span-id }}
       setup-span-id: ${{ steps.setup.outputs.span-id }}
       setup-trace-id: ${{ steps.setup.outputs.trace-id }}
@@ -106,7 +119,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
+        uses: github/gh-aw-actions/setup@9271a1804551c0dc4fb0085a97979950aa2f8489 # v0.88.2
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -114,40 +127,45 @@ jobs:
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.63"
-          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AWF_VERSION: "v0.28.12"
           GH_AW_INFO_ENGINE_ID: "copilot"
+      - name: Mask OTLP telemetry headers
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/mask_otlp_headers.sh"
       - name: Generate agentic run info
         id: generate_aw_info
         env:
           GH_AW_INFO_ENGINE_ID: "copilot"
           GH_AW_INFO_ENGINE_NAME: "GitHub Copilot CLI"
-          GH_AW_INFO_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'claude-sonnet-4.6' }}
-          GH_AW_INFO_VERSION: "1.0.63"
-          GH_AW_INFO_AGENT_VERSION: "1.0.63"
-          GH_AW_INFO_CLI_VERSION: "v0.80.9"
+          GH_AW_INFO_MODEL: "auto"
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AGENT_VERSION: "1.0.80"
+          GH_AW_INFO_CLI_VERSION: "v0.88.2"
           GH_AW_INFO_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_INFO_EXPERIMENTAL: "false"
           GH_AW_INFO_SUPPORTS_TOOLS_ALLOWLIST: "true"
           GH_AW_INFO_STAGED: "false"
           GH_AW_INFO_ALLOWED_DOMAINS: '["defaults"]'
           GH_AW_INFO_FIREWALL_ENABLED: "true"
-          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_AWF_VERSION: "v0.28.12"
           GH_AW_INFO_AWMG_VERSION: ""
           GH_AW_INFO_FIREWALL_TYPE: "squid"
+          GH_AW_INFO_AGENT_RUNTIME: ""
           GH_AW_COMPILED_STRICT: "true"
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/generate_aw_info.cjs');
+            const { main } = require(path.join(actionsDir, 'generate_aw_info.cjs'));
             await main(core, context);
       - name: Restore daily AIC usage cache
         id: restore-daily-aic-cache
         if: ${{ env.GH_AW_MAX_DAILY_AI_CREDITS != '' }}
         continue-on-error: true
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           key: agentic-workflow-usage-issuetriage-${{ github.run_id }}
           restore-keys: agentic-workflow-usage-issuetriage-
@@ -163,9 +181,11 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/restore_aic_usage_cache_fallback.cjs');
+            const { main } = require(path.join(actionsDir, 'restore_aic_usage_cache_fallback.cjs'));
             await main();
       - name: Check daily workflow token guardrail
         id: daily-effective-workflow-guardrail
@@ -183,32 +203,38 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/check_daily_aic_workflow_guardrail.cjs');
+            const { main } = require(path.join(actionsDir, 'check_daily_aic_workflow_guardrail.cjs'));
             await main();
+      - name: Check for OAuth tokens
+        id: check-oauth-tokens
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/check_oauth_tokens.sh"
+        env:
+          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
+          GH_AW_GITHUB_TOKEN: ${{ secrets.GH_AW_GITHUB_TOKEN }}
+          GH_AW_GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN }}
       - name: Checkout .github and .agents folders
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
           sparse-checkout: |
             .github
             .agents
-            .antigravity
             .claude
             .codex
-            .crush
             .gemini
-            .opencode
             .pi
           sparse-checkout-cone-mode: true
           fetch-depth: 1
       - name: Save agent config folders for base branch restoration
         env:
-          GH_AW_AGENT_FOLDERS: ".agents .antigravity .claude .codex .crush .gemini .github .opencode .pi"
-          GH_AW_AGENT_FILES: ".crush.json AGENTS.md ANTIGRAVITY.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
-        # poutine:ignore untrusted_checkout_exec
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/save_base_github_folders.sh"
+          GH_AW_AGENT_FOLDERS: ".agents .github"
+          GH_AW_AGENT_FILES: "AGENTS.md"
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/save_base_github_folders.sh"
       - name: Check workflow lock file
         id: check-lock-file
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -217,35 +243,47 @@ jobs:
           GH_AW_CONTEXT_WORKFLOW_REF: "${{ github.workflow_ref }}"
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/check_workflow_timestamp_api.cjs');
+            const { main } = require(path.join(actionsDir, 'check_workflow_timestamp_api.cjs'));
             await main();
       - name: Check compile-agentic version
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          GH_AW_COMPILED_VERSION: "v0.80.9"
+          GH_AW_COMPILED_VERSION: "v0.88.2"
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/check_version_updates.cjs');
+            const { main } = require(path.join(actionsDir, 'check_version_updates.cjs'));
             await main();
       - name: Compute current body text
         id: sanitized
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
+          GH_AW_ALLOWED_DOMAINS: "api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,s.symcb.com,s.symcd.com,security.ubuntu.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/compute_text.cjs');
+            const { main } = require(path.join(actionsDir, 'compute_text.cjs'));
             await main();
+      - name: Log runtime features
+        if: ${{ contains(toJSON(vars), '"GH_AW_RUNTIME_FEATURES":') }}
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/log_runtime_features_summary.sh"
       - name: Create prompt with built-in context
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_ACTIONS_DIR: ${{ runner.temp }}/gh-aw/actions
+          GH_AW_PROMPT: ${{ runner.temp }}/gh-aw/aw-prompts/prompt.txt
           GH_AW_SAFE_OUTPUTS: ${{ runner.temp }}/gh-aw/safeoutputs/outputs.jsonl
+          GH_AW_PROMPT_CONFIG: "{\"items\":[{\"content_env\":\"GH_AW_PROMPT_CONTENT_0000\"},{\"file\":\"xpia.md\"},{\"file\":\"temp_folder_prompt.md\"},{\"file\":\"markdown.md\"},{\"file\":\"safe_outputs_prompt.md\"},{\"content_env\":\"GH_AW_PROMPT_CONTENT_0001\"},{\"content_env\":\"GH_AW_PROMPT_CONTENT_0002\"},{\"file\":\"mcp_cli_tools_with_safeoutputs_prompt.md\"},{\"content_env\":\"GH_AW_PROMPT_CONTENT_0003\"},{\"file\":\"github_mcp_tools_with_safeoutputs_prompt.md\"},{\"file\":\"pr_context_prompt.md\",\"condition_env\":\"GH_AW_INCLUDE_PR_CONTEXT\"},{\"content_env\":\"GH_AW_PROMPT_CONTENT_0004\"},{\"content_env\":\"GH_AW_PROMPT_CONTENT_0005\"}]}"
           GH_AW_EXPR_1A3A194A: ${{ github.event.discussion.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'discussion' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
           GH_AW_EXPR_463A214A: ${{ github.event.pull_request.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'pull_request' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
           GH_AW_EXPR_802A9F6A: ${{ github.event.issue.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'issue' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
@@ -254,78 +292,36 @@ jobs:
           GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
           GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
           GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
-          GH_AW_IS_PR_COMMENT: ${{ github.event.issue.pull_request && 'true' || '' }}
-        # poutine:ignore untrusted_checkout_exec
-        run: |
-          bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
-          {
-          cat << 'GH_AW_PROMPT_09a4b5a8a8b33a81_EOF'
-          <system>
-          GH_AW_PROMPT_09a4b5a8a8b33a81_EOF
-          cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
-          cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
-          cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
-          cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_09a4b5a8a8b33a81_EOF'
-          <safe-output-tools>
-          Tools: add_comment, add_labels, remove_labels, missing_tool, missing_data, noop
-          </safe-output-tools>
-          GH_AW_PROMPT_09a4b5a8a8b33a81_EOF
-          cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          cat << 'GH_AW_PROMPT_09a4b5a8a8b33a81_EOF'
-          <github-context>
-          The following GitHub context information is available for this workflow:
-          {{#if github.actor}}
-          - **actor**: __GH_AW_GITHUB_ACTOR__
-          {{/if}}
-          {{#if github.repository}}
-          - **repository**: __GH_AW_GITHUB_REPOSITORY__
-          {{/if}}
-          {{#if github.workspace}}
-          - **workspace**: __GH_AW_GITHUB_WORKSPACE__
-          {{/if}}
-          {{#if github.event.issue.number || (github.aw.context.item_type == 'issue' && github.aw.context.item_number)}}
-          - **issue-number**: #__GH_AW_EXPR_802A9F6A__
-          {{/if}}
-          {{#if github.event.discussion.number || (github.aw.context.item_type == 'discussion' && github.aw.context.item_number)}}
-          - **discussion-number**: #__GH_AW_EXPR_1A3A194A__
-          {{/if}}
-          {{#if github.event.pull_request.number || (github.aw.context.item_type == 'pull_request' && github.aw.context.item_number)}}
-          - **pull-request-number**: #__GH_AW_EXPR_463A214A__
-          {{/if}}
-          {{#if github.event.comment.id || github.aw.context.comment_id}}
-          - **comment-id**: __GH_AW_EXPR_FF1D34CE__
-          {{/if}}
-          {{#if github.run_id}}
-          - **workflow-run-id**: __GH_AW_GITHUB_RUN_ID__
-          {{/if}}
-          </github-context>
-          
-          GH_AW_PROMPT_09a4b5a8a8b33a81_EOF
-          cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
-          fi
-          cat << 'GH_AW_PROMPT_09a4b5a8a8b33a81_EOF'
-          </system>
-          {{#runtime-import .github/workflows/issue-triage.md}}
-          GH_AW_PROMPT_09a4b5a8a8b33a81_EOF
-          } > "$GH_AW_PROMPT"
+          GH_AW_INCLUDE_PR_CONTEXT: ${{ (github.event_name == 'issue_comment' && github.event.issue.pull_request != null) || github.event_name == 'pull_request_review_comment' || github.event_name == 'pull_request_review' }}
+          GH_AW_PROMPT_CONTENT_0000: "<system>\n"
+          GH_AW_PROMPT_CONTENT_0001: "<safe-output-tools>\nTools: add_comment, add_labels, remove_labels, missing_tool, missing_data, noop\n"
+          GH_AW_PROMPT_CONTENT_0002: "</safe-output-tools>\n"
+          GH_AW_PROMPT_CONTENT_0003: "<github-context>\nThe following GitHub context information is available for this workflow:\n{{#if github.actor}}\n- **actor**: __GH_AW_GITHUB_ACTOR__\n{{/if}}\n{{#if github.repository}}\n- **repository**: __GH_AW_GITHUB_REPOSITORY__\n{{/if}}\n{{#if github.workspace}}\n- **workspace**: __GH_AW_GITHUB_WORKSPACE__\n{{/if}}\n{{#if github.event.issue.number || (github.aw.context.item_type == 'issue' && github.aw.context.item_number)}}\n- **issue-number**: #__GH_AW_EXPR_802A9F6A__\n{{/if}}\n{{#if github.event.discussion.number || (github.aw.context.item_type == 'discussion' && github.aw.context.item_number)}}\n- **discussion-number**: #__GH_AW_EXPR_1A3A194A__\n{{/if}}\n{{#if github.event.pull_request.number || (github.aw.context.item_type == 'pull_request' && github.aw.context.item_number)}}\n- **pull-request-number**: #__GH_AW_EXPR_463A214A__\n{{/if}}\n{{#if github.event.comment.id || github.aw.context.comment_id}}\n- **comment-id**: __GH_AW_EXPR_FF1D34CE__\n{{/if}}\n{{#if github.run_id}}\n- **workflow-run-id**: __GH_AW_GITHUB_RUN_ID__\n{{/if}}\n</github-context>\n\n"
+          GH_AW_PROMPT_CONTENT_0004: "</system>\n"
+          GH_AW_PROMPT_CONTENT_0005: "{{#runtime-import .github/workflows/issue-triage.md}}\n"
+        with:
+          script: |
+            const { setupGlobals } = require(process.env.GH_AW_ACTIONS_DIR + '/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(process.env.GH_AW_ACTIONS_DIR + '/create_prompt.cjs');
+            await main(core);
       - name: Interpolate variables and render templates
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_PROMPT: ${{ runner.temp }}/gh-aw/aw-prompts/prompt.txt
           GH_AW_ENGINE_ID: "copilot"
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/interpolate_prompt.cjs');
+            const { main } = require(path.join(actionsDir, 'interpolate_prompt.cjs'));
             await main();
       - name: Substitute placeholders
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
+          GH_AW_PROMPT: ${{ runner.temp }}/gh-aw/aw-prompts/prompt.txt
           GH_AW_EXPR_1A3A194A: ${{ github.event.discussion.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'discussion' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
           GH_AW_EXPR_463A214A: ${{ github.event.pull_request.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'pull_request' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
           GH_AW_EXPR_802A9F6A: ${{ github.event.issue.number || (fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_type == 'issue' && fromJSON(github.event.inputs.aw_context || github.event.client_payload.aw_context || '{}').item_number) }}
@@ -334,15 +330,17 @@ jobs:
           GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
           GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
           GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
-          GH_AW_IS_PR_COMMENT: ${{ github.event.issue.pull_request && 'true' || '' }}
-          GH_AW_MCP_CLI_SERVERS_LIST: '- `safeoutputs` — run `safeoutputs --help` to see available tools'
+          GH_AW_INCLUDE_PR_CONTEXT: ${{ (github.event_name == 'issue_comment' && github.event.issue.pull_request != null) || github.event_name == 'pull_request_review_comment' || github.event_name == 'pull_request_review' }}
+          GH_AW_MCP_CLI_SERVERS_LIST: "- `github` — run `github --help` to see available tools\n- `safeoutputs` — run `safeoutputs --help` to see available tools"
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            
-            const substitutePlaceholders = require('${{ runner.temp }}/gh-aw/actions/substitute_placeholders.cjs');
-            
+
+            const substitutePlaceholders = require(path.join(actionsDir, 'substitute_placeholders.cjs'));
+
             // Call the substitution function
             return await substitutePlaceholders({
               file: process.env.GH_AW_PROMPT,
@@ -355,22 +353,26 @@ jobs:
                 GH_AW_GITHUB_REPOSITORY: process.env.GH_AW_GITHUB_REPOSITORY,
                 GH_AW_GITHUB_RUN_ID: process.env.GH_AW_GITHUB_RUN_ID,
                 GH_AW_GITHUB_WORKSPACE: process.env.GH_AW_GITHUB_WORKSPACE,
-                GH_AW_IS_PR_COMMENT: process.env.GH_AW_IS_PR_COMMENT,
+                GH_AW_INCLUDE_PR_CONTEXT: process.env.GH_AW_INCLUDE_PR_CONTEXT,
                 GH_AW_MCP_CLI_SERVERS_LIST: process.env.GH_AW_MCP_CLI_SERVERS_LIST
               }
             });
       - name: Validate prompt placeholders
         env:
-          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
-        # poutine:ignore untrusted_checkout_exec
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/validate_prompt_placeholders.sh"
+          GH_AW_PROMPT: ${{ runner.temp }}/gh-aw/aw-prompts/prompt.txt
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/validate_prompt_placeholders.sh"
       - name: Print prompt
         env:
-          GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
-        # poutine:ignore untrusted_checkout_exec
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/print_prompt_summary.sh"
+          GH_AW_PROMPT: ${{ runner.temp }}/gh-aw/aw-prompts/prompt.txt
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/print_prompt_summary.sh"
+      - name: Stage prompt files for artifact upload
+        run: |
+          mkdir -p /tmp/gh-aw/aw-prompts
+          cp -a "${RUNNER_TEMP}/gh-aw/aw-prompts/." /tmp/gh-aw/aw-prompts/
       - name: Upload activation artifact
-        if: success()
+        if: success() || failure()
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: activation
@@ -397,12 +399,20 @@ jobs:
       contents: read
       issues: read
       pull-requests: read
+    timeout-minutes: 60
     env:
       DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
       GH_AW_ASSETS_ALLOWED_EXTS: ""
       GH_AW_ASSETS_BRANCH: ""
       GH_AW_ASSETS_MAX_SIZE_KB: 0
       GH_AW_MCP_LOG_DIR: /tmp/gh-aw/mcp-logs/safeoutputs
+      GH_AW_PR_HEAD_BASE_BRANCH: ""
+      GH_AW_PR_HEAD_BASE_PR_NUMBER: ""
+      GH_AW_PR_HEAD_BASE_REF: ""
+      GH_AW_PR_HEAD_BASE_REPO: ""
+      GH_AW_PR_HEAD_BASE_SHA: ""
+      GH_AW_PR_HEAD_REPO: ""
+      GH_AW_RUNTIME_FEATURES: ${{ vars.GH_AW_RUNTIME_FEATURES }}
       GH_AW_WORKFLOW_ID_SANITIZED: issuetriage
     outputs:
       agentic_engine_timeout: ${{ steps.detect-agent-errors.outputs.agentic_engine_timeout || 'false' }}
@@ -412,8 +422,13 @@ jobs:
       checkout_pr_success: ${{ steps.checkout-pr.outputs.checkout_pr_success || 'true' }}
       effective_tokens: ${{ steps.parse-mcp-gateway.outputs.effective_tokens }}
       has_patch: ${{ steps.collect_output.outputs.has_patch }}
+      http_400_response_error: ${{ steps.detect-agent-errors.outputs.http_400_response_error || 'false' }}
       inference_access_error: ${{ steps.detect-agent-errors.outputs.inference_access_error || 'false' }}
+      invocation_cap_exceeded: ${{ steps.detect-agent-errors.outputs.invocation_cap_exceeded || 'false' }}
+      max_cache_misses_exceeded: ${{ steps.detect-agent-errors.outputs.max_cache_misses_exceeded || 'false' }}
       mcp_policy_error: ${{ steps.detect-agent-errors.outputs.mcp_policy_error || 'false' }}
+      missing_model_pricing_error: ${{ steps.detect-agent-errors.outputs.missing_model_pricing_error || 'false' }}
+      missing_model_pricing_model_name: ${{ steps.detect-agent-errors.outputs.missing_model_pricing_model_name || '' }}
       model: ${{ needs.activation.outputs.model }}
       model_not_supported_error: ${{ steps.detect-agent-errors.outputs.model_not_supported_error || 'false' }}
       output: ${{ steps.collect_output.outputs.output }}
@@ -421,11 +436,12 @@ jobs:
       setup-parent-span-id: ${{ steps.setup.outputs.parent-span-id || steps.setup.outputs.span-id }}
       setup-span-id: ${{ steps.setup.outputs.span-id }}
       setup-trace-id: ${{ steps.setup.outputs.trace-id }}
+      shell_expansion_guard_rejected: ${{ steps.detect-agent-errors.outputs.shell_expansion_guard_rejected || 'false' }}
       unknown_model_ai_credits: ${{ steps.parse-mcp-gateway.outputs.unknown_model_ai_credits || 'false' }}
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
+        uses: github/gh-aw-actions/setup@9271a1804551c0dc4fb0085a97979950aa2f8489 # v0.88.2
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -434,19 +450,28 @@ jobs:
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.63"
-          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AWF_VERSION: "v0.28.12"
           GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Set runtime paths
         id: set-runtime-paths
+        env:
+          GH_AW_RUNNER_TOOL_CACHE: ${{ runner.tool_cache }}
         run: |
+          if [ -z "${RUNNER_TOOL_CACHE:-}" ]; then
+            echo "RUNNER_TOOL_CACHE=${GH_AW_RUNNER_TOOL_CACHE}" >> "$GITHUB_ENV"
+          fi
           {
             echo "GH_AW_SAFE_OUTPUTS=${RUNNER_TEMP}/gh-aw/safeoutputs/outputs.jsonl"
             echo "GH_AW_SAFE_OUTPUTS_CONFIG_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/config.json"
             echo "GH_AW_SAFE_OUTPUTS_TOOLS_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/tools.json"
           } >> "$GITHUB_OUTPUT"
+      - name: Mask OTLP telemetry headers
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/mask_otlp_headers.sh"
+      - name: Check OTLP telemetry configuration
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/check_otlp_default_credentials.sh"
       - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Create gh-aw temp directory
@@ -455,6 +480,11 @@ jobs:
         run: bash "${RUNNER_TEMP}/gh-aw/actions/configure_gh_for_ghe.sh"
         env:
           GH_TOKEN: ${{ github.token }}
+      - name: Download activation artifact
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: activation
+          path: /tmp/gh-aw
       - name: Configure Git credentials
         env:
           GITHUB_REPOSITORY: ${{ github.repository }}
@@ -471,16 +501,32 @@ jobs:
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/checkout_pr_branch.cjs');
+            const { main } = require(path.join(actionsDir, 'checkout_pr_branch.cjs'));
             await main();
       - name: Install GitHub Copilot CLI
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.63
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh"
         env:
           GH_HOST: github.com
+          GH_AW_COMPILED_VERSION: v0.88.2
       - name: Install AWF binary
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.27.7
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.28.12 --rootless
+      - name: Determine automatic lockdown mode for GitHub MCP Server
+        id: determine-automatic-lockdown
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 (source v9)
+        env:
+          GH_AW_GITHUB_TOKEN: ${{ secrets.GH_AW_GITHUB_TOKEN }}
+          GH_AW_GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN }}
+          GH_AW_GITHUB_MIN_INTEGRITY: 'none'
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const determineAutomaticLockdown = require(path.join(actionsDir, 'determine_automatic_lockdown.cjs'));
+            await determineAutomaticLockdown(github, context, core);
       - name: Parse integrity filter lists
         id: parse-guard-vars
         env:
@@ -488,16 +534,11 @@ jobs:
           GH_AW_TRUSTED_USERS_VAR: ${{ vars.GH_AW_GITHUB_TRUSTED_USERS || '' }}
           GH_AW_APPROVAL_LABELS_VAR: ${{ vars.GH_AW_GITHUB_APPROVAL_LABELS || '' }}
         run: bash "${RUNNER_TEMP}/gh-aw/actions/parse_guard_list.sh"
-      - name: Download activation artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: activation
-          path: /tmp/gh-aw
       - name: Restore agent config folders from base branch
         if: steps.checkout-pr.outcome == 'success'
         env:
-          GH_AW_AGENT_FOLDERS: ".agents .antigravity .claude .codex .crush .gemini .github .opencode .pi"
-          GH_AW_AGENT_FILES: ".crush.json AGENTS.md ANTIGRAVITY.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
+          GH_AW_AGENT_FOLDERS: ".agents .github"
+          GH_AW_AGENT_FILES: "AGENTS.md"
         run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_base_github_folders.sh"
       - name: Restore inline sub-agents from activation artifact
         env:
@@ -509,15 +550,26 @@ jobs:
           GH_AW_SKILL_DIR: ".github/skills"
         run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_inline_skills.sh"
       - name: Download container images
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.27.7@sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c ghcr.io/github/gh-aw-firewall/api-proxy:0.27.7@sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6 ghcr.io/github/gh-aw-firewall/squid:0.27.7@sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96 ghcr.io/github/gh-aw-mcpg:v0.3.27@sha256:fe984bddde4ec05d756d9043edb0a32912e6b7b72f6a121b1082f29221421cc7 ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b ghcr.io/github/github-mcp-server:v1.4.0@sha256:2afb26356481d1a350e14544a6e160f7f7ec1561a1ea309b823665abf0309036
-      - name: Generate Safe Outputs Config
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.28.12@sha256:390051be4ed1847f774fd8980b61d3a3523574c0175d00c3fc7cdf2002a88202 ghcr.io/github/gh-aw-firewall/api-proxy:0.28.12@sha256:d7d533d87c80d87ff91ac0e21e9299055c3beedff1536262b97ed700fb065a32 ghcr.io/github/gh-aw-firewall/squid:0.28.12@sha256:52c34aca98d2a6833c329f1505912a6949c4fda16618c010c979bd59ea99254f ghcr.io/github/gh-aw-mcpg:v0.4.15@sha256:60cd97533e93d8e7be36b979c0f08a70846189bda6190f28bbd6d427bc0d9b6e ghcr.io/github/gh-aw-node@sha256:bac2192f6374d6262116399b34fc5e143d576f82719e90a18261cae7480f4d4e ghcr.io/github/github-mcp-server:v1.11.0@sha256:fbec75de11c255213fa08d80fb166abe73d851fff631c51c0079872967720699
+      - name: Prepare Safe Outputs Directories
         run: |
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_723da9f6aa534eb7_EOF'
-          {"add_comment":{"hide_older_comments":true,"max":1},"add_labels":{"allowed":["Auto-Triage: Waiting for Author"],"max":1},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"false"},"remove_labels":{"allowed":["Auto-Triage: Waiting for Author"],"max":1},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_723da9f6aa534eb7_EOF
+      - name: Generate Safe Outputs Config
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_FILE_ROOT: "${{ runner.temp }}/gh-aw"
+          GH_AW_FILE_CONFIG: "{\"files\":[{\"path\":\"safeoutputs/config.json\",\"content_env\":\"GH_AW_SAFE_OUTPUTS_CONFIG\"}]}"
+          GH_AW_SAFE_OUTPUTS_CONFIG: "{\"add_comment\":{\"hide_older_comments\":true,\"max\":1},\"add_labels\":{\"allowed\":[\"Auto-Triage: Waiting for Author\"],\"max\":1},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"false\"},\"remove_labels\":{\"allowed\":[\"Auto-Triage: Waiting for Author\"],\"max\":1},\"report_incomplete\":{}}"
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'create_files.cjs'));
+            await main();
       - name: Generate Safe Outputs Tools
         env:
           GH_AW_TOOLS_META_JSON: |
@@ -541,9 +593,18 @@ jobs:
                     "sanitize": true,
                     "maxLength": 65000
                   },
+                  "comment_id": {
+                    "optionalPositiveInteger": true
+                  },
                   "item_number": {
                     "issueOrPRNumber": true
                   },
+                  "pr": {
+                    "issueOrPRNumber": true
+                  },
+                  "pr_number": {
+                    "issueOrPRNumber": true
+                  },
                   "reply_to_id": {
                     "type": "string",
                     "maxLength": 256
@@ -551,6 +612,16 @@ jobs:
                   "repo": {
                     "type": "string",
                     "maxLength": 256
+                  },
+                  "target": {
+                    "type": "string",
+                    "enum": [
+                      "status"
+                    ]
+                  },
+                  "temporary_id": {
+                    "type": "string",
+                    "pattern": "^#?aw_[A-Za-z0-9_]{3,12}$"
                   }
                 }
               },
@@ -562,10 +633,7 @@ jobs:
                   },
                   "labels": {
                     "required": true,
-                    "type": "array",
-                    "itemType": "string",
-                    "itemSanitize": true,
-                    "itemMaxLength": 128
+                    "type": "array"
                   },
                   "repo": {
                     "type": "string",
@@ -638,10 +706,7 @@ jobs:
                   },
                   "labels": {
                     "required": true,
-                    "type": "array",
-                    "itemType": "string",
-                    "itemSanitize": true,
-                    "itemMaxLength": 128
+                    "type": "array"
                   },
                   "repo": {
                     "type": "string",
@@ -669,56 +734,68 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/generate_safe_outputs_tools.cjs');
+            const { main } = require(path.join(actionsDir, 'generate_safe_outputs_tools.cjs'));
             await main();
       - name: Start MCP Gateway
         id: start-mcp-gateway
         env:
+          GH_AW_POLICY_ALLOW_CREATE_PULL_REQUEST: ${{ vars.GH_AW_POLICY_ALLOW_CREATE_PULL_REQUEST || 'true' }}
           GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
           GH_AW_SAFE_OUTPUTS_CONFIG_PATH: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS_CONFIG_PATH }}
           GH_AW_SAFE_OUTPUTS_TOOLS_PATH: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS_TOOLS_PATH }}
+          GH_AW_SINK_VISIBILITY: ${{ steps.determine-automatic-lockdown.outputs.visibility }}
           GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -eo pipefail
           mkdir -p "${RUNNER_TEMP}/gh-aw/mcp-config"
-          
+          if [ -n "${GITHUB_EVENT_PATH:-}" ] && [ -r "${GITHUB_EVENT_PATH}" ]; then
+            GH_AW_SAFEOUTPUTS_EVENT_PATH="${RUNNER_TEMP}/gh-aw/safeoutputs/github_event.json"
+            cp "${GITHUB_EVENT_PATH}" "${GH_AW_SAFEOUTPUTS_EVENT_PATH}"
+            export GITHUB_EVENT_PATH="${GH_AW_SAFEOUTPUTS_EVENT_PATH}"
+          fi
+
           # Export gateway environment variables for MCP config and gateway script
           export MCP_GATEWAY_PORT="8080"
-          export MCP_GATEWAY_DOMAIN="host.docker.internal"
+          export MCP_GATEWAY_DOMAIN="awmg-mcpg"
           export MCP_GATEWAY_HOST_DOMAIN="localhost"
-          MCP_GATEWAY_API_KEY=$(openssl rand -base64 45 | tr -d '/+=')
-          echo "::add-mask::${MCP_GATEWAY_API_KEY}"
-          export MCP_GATEWAY_API_KEY
+          MCP_GATEWAY_AGENT_ID=$(openssl rand -base64 45 | tr -d '/+=')
+          echo "::add-mask::${MCP_GATEWAY_AGENT_ID}"
+          export MCP_GATEWAY_AGENT_ID
           export MCP_GATEWAY_PAYLOAD_DIR="/tmp/gh-aw/mcp-payloads"
           mkdir -p "${MCP_GATEWAY_PAYLOAD_DIR}"
           export MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD="524288"
+          export MCP_GATEWAY_ALLOWED_MOUNT_ROOTS="${GITHUB_WORKSPACE}:rw,${RUNNER_TEMP}/gh-aw:ro,${RUNNER_TEMP}/gh-aw/safeoutputs:rw,/opt:ro,/tmp:rw,/usr/bin/gh:ro"
+          export GH_AW_PR_HEAD_BASE_BRANCH="${GH_AW_PR_HEAD_BASE_BRANCH:-}"
+          export GH_AW_PR_HEAD_BASE_SHA="${GH_AW_PR_HEAD_BASE_SHA:-}"
+          export GH_AW_PR_HEAD_BASE_REPO="${GH_AW_PR_HEAD_BASE_REPO:-}"
+          export GH_AW_PR_HEAD_BASE_PR_NUMBER="${GH_AW_PR_HEAD_BASE_PR_NUMBER:-}"
+          export GH_AW_PR_HEAD_BASE_REF="${GH_AW_PR_HEAD_BASE_REF:-}"
+          export GH_AW_PR_HEAD_REPO="${GH_AW_PR_HEAD_REPO:-}"
           export DEBUG="*"
-          
+
           export GH_AW_ENGINE="copilot"
           MCP_GATEWAY_UID=$(id -u 2>/dev/null || echo '0')
           MCP_GATEWAY_GID=$(id -g 2>/dev/null || echo '0')
-          case "${DOCKER_HOST:-}" in
-            unix://* ) DOCKER_SOCK_PATH="${DOCKER_HOST#unix://}" ;;
-            /* ) DOCKER_SOCK_PATH="$DOCKER_HOST" ;;
-            * ) DOCKER_SOCK_PATH=/var/run/docker.sock ;;
-          esac
-          DOCKER_SOCK_GID=$(stat -c '%g' "$DOCKER_SOCK_PATH" 2>/dev/null || echo '0')
-          export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --name awmg-mcpg --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v '"${DOCKER_SOCK_PATH}"':/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DOCKER_HOST=unix:///var/run/docker.sock -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e RUNNER_TEMP -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw -v '"${RUNNER_TEMP}"'/gh-aw/safeoutputs:'"${RUNNER_TEMP}"'/gh-aw/safeoutputs:rw ghcr.io/github/gh-aw-mcpg:v0.3.27'
-          
+          source "${RUNNER_TEMP}/gh-aw/actions/resolve_docker_socket_gid.sh"
+          export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network bridge -p 127.0.0.1:'"${MCP_GATEWAY_PORT}"':'"${MCP_GATEWAY_PORT}"' --name awmg-mcpg --add-host host.docker.internal:host-gateway --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v '"${DOCKER_SOCK_PATH}"':/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_AGENT_ID -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DOCKER_HOST=unix:///var/run/docker.sock -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_PR_HEAD_BASE_BRANCH -e GH_AW_PR_HEAD_BASE_SHA -e GH_AW_PR_HEAD_BASE_REPO -e GH_AW_PR_HEAD_BASE_PR_NUMBER -e GH_AW_PR_HEAD_BASE_REF -e GH_AW_PR_HEAD_REPO -e GH_AW_POLICY_ALLOW_CREATE_PULL_REQUEST -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GH_AW_SINK_VISIBILITY -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e RUNNER_TEMP -e RUNNER_TOOL_CACHE -e MCP_GATEWAY_ALLOWED_MOUNT_ROOTS -e GITHUB_AW_OTEL_TRACE_ID -e GITHUB_AW_OTEL_PARENT_SPAN_ID -e OTEL_EXPORTER_OTLP_HEADERS -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw -v '"${RUNNER_TEMP}"'/gh-aw/safeoutputs:'"${RUNNER_TEMP}"'/gh-aw/safeoutputs:rw ghcr.io/github/gh-aw-mcpg:v0.4.15'
+
           mkdir -p "$HOME/.copilot"
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_4b806ec8e0233008_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_137b94c134aafdc9_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
               "github": {
                 "type": "stdio",
-                "container": "ghcr.io/github/github-mcp-server:v1.4.0",
+                "container": "ghcr.io/github/github-mcp-server:v1.11.0",
                 "env": {
-                  "GITHUB_HOST": "\${GITHUB_SERVER_URL}",
-                  "GITHUB_PERSONAL_ACCESS_TOKEN": "\${GITHUB_MCP_SERVER_TOKEN}",
+                  "GITHUB_FEATURES": "fields_param",
+                  "GITHUB_HOST": "${GITHUB_SERVER_URL}",
+                  "GITHUB_PERSONAL_ACCESS_TOKEN": "${GITHUB_MCP_SERVER_TOKEN}",
                   "GITHUB_READ_ONLY": "1",
                   "GITHUB_TOOLSETS": "context,repos,issues,pull_requests"
                 },
@@ -749,7 +826,17 @@ jobs:
                   "GH_AW_SAFE_OUTPUTS": "\${GH_AW_SAFE_OUTPUTS}",
                   "GH_AW_SAFE_OUTPUTS_CONFIG_PATH": "\${GH_AW_SAFE_OUTPUTS_CONFIG_PATH}",
                   "GH_AW_SAFE_OUTPUTS_TOOLS_PATH": "\${GH_AW_SAFE_OUTPUTS_TOOLS_PATH}",
+                  "GH_AW_POLICY_ALLOW_CREATE_PULL_REQUEST": "\${GH_AW_POLICY_ALLOW_CREATE_PULL_REQUEST}",
+                  "GH_AW_PR_HEAD_BASE_BRANCH": "\${GH_AW_PR_HEAD_BASE_BRANCH}",
+                  "GH_AW_PR_HEAD_BASE_SHA": "\${GH_AW_PR_HEAD_BASE_SHA}",
+                  "GH_AW_PR_HEAD_BASE_REPO": "\${GH_AW_PR_HEAD_BASE_REPO}",
+                  "GH_AW_PR_HEAD_BASE_PR_NUMBER": "\${GH_AW_PR_HEAD_BASE_PR_NUMBER}",
+                  "GH_AW_PR_HEAD_BASE_REF": "\${GH_AW_PR_HEAD_BASE_REF}",
+                  "GH_AW_PR_HEAD_REPO": "\${GH_AW_PR_HEAD_REPO}",
+                  "GITHUB_EVENT_NAME": "\${GITHUB_EVENT_NAME}",
+                  "GITHUB_EVENT_PATH": "\${GITHUB_EVENT_PATH}",
                   "GITHUB_REPOSITORY": "\${GITHUB_REPOSITORY}",
+                  "GITHUB_SHA": "\${GITHUB_SHA}",
                   "GITHUB_TOKEN": "\${GITHUB_TOKEN}",
                   "GITHUB_WORKSPACE": "\${GITHUB_WORKSPACE}",
                   "RUNNER_TEMP": "\${RUNNER_TEMP}"
@@ -758,7 +845,8 @@ jobs:
                   "write-sink": {
                     "accept": [
                       "*"
-                    ]
+                    ],
+                    "sink-visibility": "${GH_AW_SINK_VISIBILITY}"
                   }
                 }
               }
@@ -766,24 +854,32 @@ jobs:
             "gateway": {
               "port": $MCP_GATEWAY_PORT,
               "domain": "${MCP_GATEWAY_DOMAIN}",
-              "apiKey": "${MCP_GATEWAY_API_KEY}",
-              "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
+              "agentId": "${MCP_GATEWAY_AGENT_ID}",
+              "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}",
+              "startupTimeout": 120,
+              "opentelemetry": {
+                "endpoint": "${OTEL_EXPORTER_OTLP_ENDPOINT}",
+                "traceId": "${GITHUB_AW_OTEL_TRACE_ID}",
+                "spanId": "${GITHUB_AW_OTEL_PARENT_SPAN_ID}"
+              }
             }
           }
-          GH_AW_MCP_CONFIG_4b806ec8e0233008_EOF
+          GH_AW_MCP_CONFIG_137b94c134aafdc9_EOF
       - name: Mount MCP servers as CLIs
         id: mount-mcp-clis
         continue-on-error: true
         env:
-          MCP_GATEWAY_API_KEY: ${{ steps.start-mcp-gateway.outputs.gateway-api-key }}
+          MCP_GATEWAY_AGENT_ID: ${{ steps.start-mcp-gateway.outputs.gateway-agent-id }}
           MCP_GATEWAY_DOMAIN: ${{ steps.start-mcp-gateway.outputs.gateway-domain }}
           MCP_GATEWAY_PORT: ${{ steps.start-mcp-gateway.outputs.gateway-port }}
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/mount_mcp_as_cli.cjs');
+            const { main } = require(path.join(actionsDir, 'mount_mcp_as_cli.cjs'));
             await main();
       - name: Clean credentials
         continue-on-error: true
@@ -795,44 +891,64 @@ jobs:
       - name: Execute GitHub Copilot CLI
         id: agentic_execution
         # Copilot CLI tool arguments (sorted):
-        timeout-minutes: 20
+        # --allow-tool github
+        # --allow-tool safeoutputs
+        # --allow-tool shell(cat)
+        # --allow-tool shell(date)
+        # --allow-tool shell(echo)
+        # --allow-tool shell(find)
+        # --allow-tool shell(github:*)
+        # --allow-tool shell(grep)
+        # --allow-tool shell(head)
+        # --allow-tool shell(ls)
+        # --allow-tool shell(printf)
+        # --allow-tool shell(pwd)
+        # --allow-tool shell(safeoutputs:*)
+        # --allow-tool shell(sort)
+        # --allow-tool shell(tail)
+        # --allow-tool shell(uniq)
+        # --allow-tool shell(wc)
+        # --allow-tool shell(yq)
+        # --allow-tool write
+        timeout-minutes: ${{ fromJSON(vars.GH_AW_DEFAULT_TIMEOUT_MINUTES || '20') }}
         run: |
           set -o pipefail
           printf '%s' "$(date +%s%3N)" > /tmp/gh-aw/agent_cli_start_ms.txt
-          trap 'rm -f "$HOME/.copilot/settings.json"' EXIT
+          trap 'gh_aw_exit_code=$?; mkdir -p /tmp/gh-aw >/dev/null 2>&1 || true; printf "%s" "$gh_aw_exit_code" > /tmp/gh-aw/agent_execution_exit_code.txt || true; rm -f "$HOME/.copilot/settings.json"; if [ "$gh_aw_exit_code" -ne 0 ]; then echo "::error::Agent execution exited with code $gh_aw_exit_code"; fi' EXIT
           mkdir -p "$HOME/.copilot"
           printf '%s' '{"builtInAgents":{"rubberDuck":false}}' > "$HOME/.copilot/settings.json"
           export XDG_CONFIG_HOME="$HOME"
           export GH_AW_MCP_CONFIG="$HOME/.copilot/mcp-config.json"
+          GH_AW_COPILOT_SRC="$(command -v copilot 2>/dev/null || true)"
+          if [ -z "$GH_AW_COPILOT_SRC" ] || [ ! -x "$GH_AW_COPILOT_SRC" ]; then
+            echo "GitHub Copilot CLI executable not found on PATH after installation" >&2
+            exit 127
+          fi
+          GH_AW_COPILOT_BIN="${RUNNER_TEMP}/gh-aw/bin/copilot"
+          mkdir -p "${RUNNER_TEMP}/gh-aw/bin"
+          if [ "$GH_AW_COPILOT_SRC" != "$GH_AW_COPILOT_BIN" ]; then
+            cp "$GH_AW_COPILOT_SRC" "$GH_AW_COPILOT_BIN"
+          fi
+          chmod 755 "$GH_AW_COPILOT_BIN"
+
           touch /tmp/gh-aw/agent-step-summary.md
           GH_AW_NODE_BIN=$(command -v node 2>/dev/null || true)
           export GH_AW_NODE_BIN
           export COPILOT_API_KEY="$COPILOT_DUMMY_BYOK"
           (umask 177 && touch /tmp/gh-aw/agent-stdio.log)
           GH_AW_MAX_AI_CREDITS="${GH_AW_MAX_AI_CREDITS:-1000}"
-          printf '%s\n' "{\"\$schema\":\"https://github.com/github/gh-aw-firewall/releases/download/v0.27.7/awf-config.schema.json\",\"network\":{\"allowDomains\":[\"api.business.githubcopilot.com\",\"api.enterprise.githubcopilot.com\",\"api.github.com\",\"api.githubcopilot.com\",\"api.individual.githubcopilot.com\",\"api.snapcraft.io\",\"archive.ubuntu.com\",\"azure.archive.ubuntu.com\",\"crl.geotrust.com\",\"crl.globalsign.com\",\"crl.identrust.com\",\"crl.sectigo.com\",\"crl.thawte.com\",\"crl.usertrust.com\",\"crl.verisign.com\",\"crl3.digicert.com\",\"crl4.digicert.com\",\"crls.ssl.com\",\"github.com\",\"host.docker.internal\",\"json-schema.org\",\"json.schemastore.org\",\"keyserver.ubuntu.com\",\"ocsp.digicert.com\",\"ocsp.geotrust.com\",\"ocsp.globalsign.com\",\"ocsp.identrust.com\",\"ocsp.sectigo.com\",\"ocsp.ssl.com\",\"ocsp.thawte.com\",\"ocsp.usertrust.com\",\"ocsp.verisign.com\",\"packagecloud.io\",\"packages.cloud.google.com\",\"packages.microsoft.com\",\"ppa.launchpad.net\",\"raw.githubusercontent.com\",\"registry.npmjs.org\",\"s.symcb.com\",\"s.symcd.com\",\"security.ubuntu.com\",\"telemetry.enterprise.githubcopilot.com\",\"ts-crl.ws.symantec.com\",\"ts-ocsp.ws.symantec.com\",\"www.googleapis.com\"]},\"apiProxy\":{\"enabled\":true,\"enableTokenSteering\":true,\"maxRuns\":500,\"maxAiCredits\":${GH_AW_MAX_AI_CREDITS},\"maxCacheMisses\":5,\"models\":{\"agent\":[\"sonnet-6x\",\"gpt-5.5\",\"gpt-5.4\",\"gpt-5.3\",\"gemini-pro\",\"any\"],\"antigravity\":[\"copilot/antigravity*\",\"google/antigravity*\",\"gemini/antigravity*\"],\"any\":[\"copilot/*\",\"anthropic/*\",\"openai/*\",\"google/*\",\"gemini/*\"],\"claude\":[\"agent\"],\"codex\":[\"agent\"],\"coding\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\",\"gpt-5-codex\"],\"computer-use\":[\"copilot/*computer-use*\",\"google/*computer-use*\",\"gemini/*computer-use*\",\"openai/*computer-use*\"],\"copilot\":[\"agent\"],\"deep-research\":[\"copilot/deep-research*\",\"copilot/o3-deep-research*\",\"copilot/o4-mini-deep-research*\",\"google/deep-research*\",\"gemini/deep-research*\",\"openai/o3-deep-research*\",\"openai/o4-mini-deep-research*\"],\"gemini\":[\"agent\"],\"gemini-3-flash\":[\"copilot/gemini-3*flash*\",\"google/gemini-3*flash*\",\"gemini/gemini-3*flash*\"],\"gemini-3-pro\":[\"copilot/gemini-3*pro*\",\"google/gemini-3*pro*\",\"google/nano-banana*\",\"gemini/gemini-3*pro*\"],\"gemini-3.1-flash\":[\"copilot/gemini-3.1*flash*\",\"google/gemini-3.1*flash*\",\"gemini/gemini-3.1*flash*\"],\"gemini-3.1-pro\":[\"copilot/gemini-3.1*pro*\",\"google/gemini-3.1*pro*\",\"gemini/gemini-3.1*pro*\"],\"gemini-3.5-flash\":[\"copilot/gemini-3.5*flash*\",\"google/gemini-3.5*flash*\",\"gemini/gemini-3.5*flash*\"],\"gemini-flash\":[\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"],\"gemini-flash-lite\":[\"copilot/gemini-*flash*lite*\",\"google/gemini-*flash*lite*\",\"gemini/gemini-*flash*lite*\"],\"gemini-pro\":[\"copilot/gemini-*pro*\",\"google/gemini-*pro*\",\"gemini/gemini-*pro*\"],\"gemma\":[\"copilot/gemma*\",\"google/gemma*\",\"gemini/gemma*\"],\"gpt-5\":[\"copilot/gpt-5*\",\"openai/gpt-5*\"],\"gpt-5-codex\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\"],\"gpt-5-mini\":[\"copilot/gpt-5*mini*\",\"openai/gpt-5*mini*\"],\"gpt-5-nano\":[\"copilot/gpt-5*nano*\",\"openai/gpt-5*nano*\"],\"gpt-5-pro\":[\"copilot/gpt-5*pro*\",\"openai/gpt-5*pro*\"],\"gpt-5.1\":[\"copilot/gpt-5.1*\",\"openai/gpt-5.1*\"],\"gpt-5.2\":[\"copilot/gpt-5.2*\",\"openai/gpt-5.2*\"],\"gpt-5.3\":[\"copilot/gpt-5.3*\",\"openai/gpt-5.3*\"],\"gpt-5.4\":[\"copilot/gpt-5.4*\",\"openai/gpt-5.4*\"],\"gpt-5.5\":[\"copilot/gpt-5.5*\",\"openai/gpt-5.5*\"],\"haiku\":[\"copilot/*haiku*\",\"anthropic/*haiku*\"],\"image-generation\":[\"copilot/gpt-image*\",\"openai/gpt-image*\",\"openai/chatgpt-image*\",\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"google/imagen*\"],\"large\":[\"sonnet\",\"gpt-5-pro\",\"gpt-5\",\"gemini-pro\"],\"mai-code\":[\"copilot/MAI-Code*\",\"copilot/mai-code*\",\"openai/MAI-Code*\"],\"mini\":[\"haiku\",\"gpt-5-mini\",\"gpt-5-nano\",\"gemini-flash-lite\"],\"nano-banana\":[\"copilot/nano-banana*\",\"google/nano-banana*\",\"gemini/nano-banana*\"],\"opus\":[\"copilot/*opus*\",\"anthropic/*opus*\"],\"opusplan\":[\"opus?effort=high\"],\"reasoning\":[\"copilot/o1*\",\"copilot/o3*\",\"copilot/o4*\",\"openai/o1*\",\"openai/o3*\",\"openai/o4*\"],\"robotics\":[\"copilot/*robotics*\",\"google/*robotics*\",\"gemini/*robotics*\"],\"small\":[\"mini\"],\"small-agent\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash\"],\"sonnet\":[\"copilot/*sonnet*\",\"anthropic/*sonnet*\"],\"sonnet-6x\":[\"copilot/*sonnet-4.5*\",\"copilot/*sonnet-4.6*\",\"copilot/*sonnet-4-5-*\",\"anthropic/*sonnet-4-5-*\",\"copilot/*sonnet-4-6*\",\"anthropic/*sonnet-4-6*\"],\"summarization\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash-lite\",\"mini\"],\"vision\":[\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"]}},\"container\":{\"imageTag\":\"0.27.7,squid=sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96,agent=sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c,api-proxy=sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6,cli-proxy=sha256:4757f198a3fa20f88bdbe70be7ae1a05f127d9c0a9e96a5d6460ef40c08fc83d\"}}" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+          if [[ ! "$GH_AW_MAX_AI_CREDITS" =~ ^[0-9]+$ ]]; then
+            GH_AW_MAX_AI_CREDITS="1000"
+          fi
+          printf '%s\n' "{\"\$schema\":\"https://github.com/github/gh-aw-firewall/releases/download/v0.28.12/awf-config.schema.json\",\"network\":{\"allowDomains\":[\"api.snapcraft.io\",\"archive.ubuntu.com\",\"azure.archive.ubuntu.com\",\"crl.geotrust.com\",\"crl.globalsign.com\",\"crl.identrust.com\",\"crl.sectigo.com\",\"crl.thawte.com\",\"crl.usertrust.com\",\"crl.verisign.com\",\"crl3.digicert.com\",\"crl4.digicert.com\",\"crls.ssl.com\",\"json-schema.org\",\"json.schemastore.org\",\"keyserver.ubuntu.com\",\"ocsp.digicert.com\",\"ocsp.geotrust.com\",\"ocsp.globalsign.com\",\"ocsp.identrust.com\",\"ocsp.sectigo.com\",\"ocsp.ssl.com\",\"ocsp.thawte.com\",\"ocsp.usertrust.com\",\"ocsp.verisign.com\",\"packagecloud.io\",\"packages.cloud.google.com\",\"packages.microsoft.com\",\"ppa.launchpad.net\",\"s.symcb.com\",\"s.symcd.com\",\"security.ubuntu.com\",\"ts-crl.ws.symantec.com\",\"ts-ocsp.ws.symantec.com\",\"www.googleapis.com\"],\"isolation\":true,\"topologyAttach\":[\"awmg-mcpg\"]},\"apiProxy\":{\"enabled\":true,\"enableTokenSteering\":true,\"maxRuns\":500,\"maxAiCredits\":${GH_AW_MAX_AI_CREDITS},\"maxCacheMisses\":5,\"models\":{\"agent\":[\"sonnet-6x\",\"gpt-5.4\",\"gpt-5.5\",\"gpt-5.6\",\"gpt-5.3\",\"gemini-pro\",\"any\"],\"antigravity\":[\"copilot/antigravity*\",\"google/antigravity*\",\"gemini/antigravity*\"],\"any\":[\"copilot/*\",\"anthropic/*\",\"openai/*\",\"google/*\",\"gemini/*\"],\"auto\":[\"copilot/auto\",\"large\"],\"claude\":[\"agent\"],\"codex\":[\"agent\"],\"coding\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\",\"gpt-5-codex\",\"kimi\"],\"computer-use\":[\"copilot/*computer-use*\",\"google/*computer-use*\",\"gemini/*computer-use*\",\"openai/*computer-use*\"],\"copilot\":[\"agent\"],\"deep-research\":[\"copilot/deep-research*\",\"copilot/o3-deep-research*\",\"copilot/o4-mini-deep-research*\",\"google/deep-research*\",\"gemini/deep-research*\",\"openai/o3-deep-research*\",\"openai/o4-mini-deep-research*\"],\"detection\":[\"small\"],\"evals\":[\"small\"],\"fable\":[\"copilot/*fable*\",\"anthropic/*fable*\"],\"gemini\":[\"agent\"],\"gemini-3-flash\":[\"copilot/gemini-3*flash*\",\"google/gemini-3*flash*\",\"gemini/gemini-3*flash*\"],\"gemini-3-pro\":[\"copilot/gemini-3*pro*\",\"google/gemini-3*pro*\",\"google/nano-banana*\",\"gemini/gemini-3*pro*\"],\"gemini-3.1-flash\":[\"copilot/gemini-3.1*flash*\",\"google/gemini-3.1*flash*\",\"gemini/gemini-3.1*flash*\"],\"gemini-3.1-pro\":[\"copilot/gemini-3.1*pro*\",\"google/gemini-3.1*pro*\",\"gemini/gemini-3.1*pro*\"],\"gemini-3.5-flash\":[\"copilot/gemini-3.5*flash*\",\"google/gemini-3.5*flash*\",\"gemini/gemini-3.5*flash*\"],\"gemini-3.6-flash\":[\"copilot/gemini-3.6*flash*\",\"google/gemini-3.6*flash*\",\"gemini/gemini-3.6*flash*\"],\"gemini-3.7-flash\":[\"copilot/gemini-3.7*flash*\",\"google/gemini-3.7*flash*\",\"gemini/gemini-3.7*flash*\"],\"gemini-flash\":[\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"],\"gemini-flash-lite\":[\"copilot/gemini-*flash*lite*\",\"google/gemini-*flash*lite*\",\"gemini/gemini-*flash*lite*\"],\"gemini-omni\":[\"copilot/gemini-omni*\",\"google/gemini-omni*\",\"gemini/gemini-omni*\"],\"gemini-pro\":[\"copilot/gemini-*pro*\",\"google/gemini-*pro*\",\"gemini/gemini-*pro*\"],\"gemma\":[\"copilot/gemma*\",\"google/gemma*\",\"gemini/gemma*\"],\"gpt-5\":[\"copilot/gpt-5*\",\"openai/gpt-5*\"],\"gpt-5-codex\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\"],\"gpt-5-mini\":[\"copilot/gpt-5*mini*\",\"openai/gpt-5*mini*\"],\"gpt-5-nano\":[\"copilot/gpt-5*nano*\",\"openai/gpt-5*nano*\"],\"gpt-5-pro\":[\"copilot/gpt-5*pro*\",\"openai/gpt-5*pro*\"],\"gpt-5.1\":[\"copilot/gpt-5.1*\",\"openai/gpt-5.1*\"],\"gpt-5.2\":[\"copilot/gpt-5.2*\",\"openai/gpt-5.2*\"],\"gpt-5.3\":[\"copilot/gpt-5.3*\",\"openai/gpt-5.3*\"],\"gpt-5.4\":[\"copilot/gpt-5.4*\",\"openai/gpt-5.4*\"],\"gpt-5.5\":[\"copilot/gpt-5.5*\",\"openai/gpt-5.5*\"],\"gpt-5.6\":[\"copilot/gpt-5.6*\",\"openai/gpt-5.6*\"],\"grok\":[\"copilot/*grok*\",\"openai/*grok*\"],\"haiku\":[\"copilot/*haiku*\",\"anthropic/*haiku*\"],\"image-generation\":[\"copilot/gpt-image*\",\"openai/gpt-image*\",\"openai/chatgpt-image*\",\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"google/imagen*\"],\"kimi\":[\"copilot/kimi*\",\"openai/kimi*\"],\"kiwi\":[\"copilot/kiwi*\",\"openai/kiwi*\"],\"large\":[\"sonnet\",\"gpt-5-pro\",\"gpt-5\",\"gemini-pro\"],\"lyria\":[\"google/lyria*\",\"gemini/lyria*\",\"copilot/lyria*\"],\"mai-code\":[\"copilot/MAI-Code*\",\"copilot/mai-code*\",\"openai/MAI-Code*\"],\"mai-code-1-flash-picker\":[\"copilot/MAI-Code-1-Flash-picker*\",\"copilot/mai-code-1-flash-picker*\",\"openai/MAI-Code-1-Flash-picker*\"],\"mini\":[\"haiku\",\"gpt-5-mini\",\"gpt-5-nano\",\"gemini-flash-lite\"],\"nano-banana\":[\"copilot/nano-banana*\",\"google/nano-banana*\",\"gemini/nano-banana*\"],\"opus\":[\"copilot/*opus*\",\"anthropic/*opus*\"],\"opusplan\":[\"opus?effort=high\"],\"raptor-mini\":[\"copilot/raptor*\",\"openai/raptor*\"],\"reasoning\":[\"copilot/o1*\",\"copilot/o3*\",\"copilot/o4*\",\"openai/o1*\",\"openai/o3*\",\"openai/o4*\"],\"robotics\":[\"copilot/*robotics*\",\"google/*robotics*\",\"gemini/*robotics*\"],\"small\":[\"mini\"],\"small-agent\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash\"],\"sonnet\":[\"copilot/*sonnet*\",\"anthropic/*sonnet*\"],\"sonnet-6x\":[\"copilot/*sonnet-4.5*\",\"copilot/*sonnet-4.6*\",\"copilot/*sonnet-5*\",\"copilot/*sonnet-4-5-*\",\"anthropic/*sonnet-4-5-*\",\"copilot/*sonnet-4-6*\",\"anthropic/*sonnet-4-6*\",\"anthropic/*sonnet-5*\"],\"summarization\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash-lite\",\"mini\"],\"veo\":[\"google/veo*\",\"gemini/veo*\"],\"vision\":[\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"]}},\"container\":{\"imageTag\":\"0.28.12,squid=sha256:52c34aca98d2a6833c329f1505912a6949c4fda16618c010c979bd59ea99254f,agent=sha256:390051be4ed1847f774fd8980b61d3a3523574c0175d00c3fc7cdf2002a88202,api-proxy=sha256:d7d533d87c80d87ff91ac0e21e9299055c3beedff1536262b97ed700fb065a32,cli-proxy=sha256:5250629d48eaedfedf2e948785228e8da29eec2a83cbab58ea0751c14a7b021d\"},\"logging\":{\"proxyLogsDir\":\"/tmp/gh-aw/sandbox/firewall/logs\",\"auditDir\":\"/tmp/gh-aw/sandbox/firewall/audit\"}}" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
           cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
           export GH_AW_MODELS_JSON_PATH="/tmp/gh-aw/models.json"
           GH_AW_DOCKER_HOST=""
           if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
             GH_AW_DOCKER_HOST="${DOCKER_HOST}"
           fi
-          GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS=""
           if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
-            GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS="--docker-host-path-prefix /tmp/gh-aw"
-            python3 - <<'PY'
-          import json,os,subprocess as sp
-          from pathlib import Path
-          try:
-           p=Path(os.environ["RUNNER_TEMP"])/"gh-aw"/"awf-config.json"
-           c=json.loads(p.read_text())
-           c["chroot"]={"binariesSourcePath":"/tmp/gh-aw","identity":{"user":sp.check_output(["id","-un"],text=True).strip(),"uid":int(sp.check_output(["id","-u"],text=True)),"gid":int(sp.check_output(["id","-g"],text=True)),"home":"/tmp/gh-aw/home"}}
-           out=json.dumps(c,separators=(",",":"),ensure_ascii=False)+"\n"
-           p.write_text(out)
-           Path("/tmp/gh-aw/awf-config.json").write_text(out)
-          except Exception as e:
-           raise SystemExit(f"chroot config patch failed: {e}") from e
-          PY
+            GH_AW_CHROOT_BINARIES_SOURCE_PATH="${RUNNER_TEMP}/gh-aw" GH_AW_CHROOT_IDENTITY_HOME="${RUNNER_TEMP}/gh-aw/home" node "${RUNNER_TEMP}/gh-aw/actions/patch_awf_chroot_config.cjs"
           fi
           GH_AW_TOOL_CACHE_MOUNT=""
           GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"
@@ -841,22 +957,28 @@ jobs:
               GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"
             fi
           fi
-          # shellcheck disable=SC1003,SC2086
-          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"} ${GH_AW_DOCKER_HOST:+--docker-host "$GH_AW_DOCKER_HOST"} ${GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS} --env-all --exclude-env COPILOT_GITHUB_TOKEN --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_API_KEY --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
-            -- /bin/bash -c 'set +o histexpand; export PATH="${RUNNER_TEMP}/gh-aw/mcp-cli/bin:$PATH" && : "${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"; GH_AW_TOOL_CACHE="$RUNNER_TOOL_CACHE"; export PATH="$(find "$GH_AW_TOOL_CACHE" -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; GH_AW_NPM_GLOBAL_ROOT="$(npm root -g 2>/dev/null || true)"; if [ -n "$GH_AW_NPM_GLOBAL_ROOT" ]; then export NODE_PATH="${GH_AW_NPM_GLOBAL_ROOT}${NODE_PATH:+:${NODE_PATH}}"; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --allow-all-paths --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/agent-stdio.log
+          # shellcheck disable=SC1003,SC2016,SC2086
+          GH_AW_AWF_ENGINE_NAME=copilot \
+          GH_AW_AWF_HARNESS_MARKER='[copilot-harness]' \
+          GH_AW_AWF_LOG_FILE=/tmp/gh-aw/agent-stdio.log \
+          GH_AW_AWF_ATTEMPT_LOG_NAME=copilot \
+          bash "${RUNNER_TEMP}/gh-aw/actions/run_awf_with_startup_retries.sh" -- \
+            awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"} ${GH_AW_DOCKER_HOST:+--docker-host "$GH_AW_DOCKER_HOST"} --env-all --exclude-env ACTIONS_ID_TOKEN_REQUEST_TOKEN --exclude-env ACTIONS_ID_TOKEN_REQUEST_URL --exclude-env COPILOT_GITHUB_TOKEN --exclude-env GITHUB_MCP_SERVER_TOKEN --exclude-env MCP_GATEWAY_AGENT_ID --mount /tmp/gh-aw:/tmp/gh-aw:rw --log-level info --skip-pull \
+            -- /bin/bash -c 'set +o histexpand; export PATH="${RUNNER_TEMP}/gh-aw/mcp-cli/bin:$PATH" && : "${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"; GH_AW_TOOL_CACHE="$RUNNER_TOOL_CACHE"; export PATH="$(find "$GH_AW_TOOL_CACHE" -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true; [ -n "$ERLANG_HOME" ] && export PATH="$ERLANG_HOME/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; GH_AW_NPM_GLOBAL_ROOT="$(npm root -g 2>/dev/null || true)"; if [ -n "$GH_AW_NPM_GLOBAL_ROOT" ]; then export NODE_PATH="${GH_AW_NPM_GLOBAL_ROOT}${NODE_PATH:+:${NODE_PATH}}"; fi; "$GH_AW_NODE_EXEC" "${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs" "${RUNNER_TEMP}/gh-aw/bin/copilot" --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-tool github --allow-tool safeoutputs --allow-tool '\''shell(cat)'\'' --allow-tool '\''shell(date)'\'' --allow-tool '\''shell(echo)'\'' --allow-tool '\''shell(find)'\'' --allow-tool '\''shell(github:*)'\'' --allow-tool '\''shell(grep)'\'' --allow-tool '\''shell(head)'\'' --allow-tool '\''shell(ls)'\'' --allow-tool '\''shell(printf)'\'' --allow-tool '\''shell(pwd)'\'' --allow-tool '\''shell(safeoutputs:*)'\'' --allow-tool '\''shell(sort)'\'' --allow-tool '\''shell(tail)'\'' --allow-tool '\''shell(uniq)'\'' --allow-tool '\''shell(wc)'\'' --allow-tool '\''shell(yq)'\'' --allow-tool write --allow-all-paths --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt'
         env:
           AWF_REFLECT_ENABLED: 1
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
           COPILOT_DUMMY_BYOK: dummy-byok-key-for-offline-mode
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'claude-sonnet-4.6' }}
+          COPILOT_MODEL: auto
+          GH_AW_LLM_PROVIDER: github
           GH_AW_MAX_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_MAX_AI_CREDITS || '1000' }}
           GH_AW_MAX_TURNS: ${{ vars.GH_AW_DEFAULT_MAX_TURNS || '' }}
           GH_AW_PHASE: agent
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
           GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
-          GH_AW_TIMEOUT_MINUTES: 20
-          GH_AW_VERSION: v0.80.9
+          GH_AW_TIMEOUT_MINUTES: ${{ fromJSON(vars.GH_AW_DEFAULT_TIMEOUT_MINUTES || '20') }}
+          GH_AW_VERSION: v0.88.2
           GITHUB_API_URL: ${{ github.api_url }}
           GITHUB_AW: true
           GITHUB_COPILOT_INTEGRATION_ID: agentic-workflows
@@ -876,7 +998,18 @@ jobs:
         if: always()
         id: detect-agent-errors
         continue-on-error: true
-        run: node "${RUNNER_TEMP}/gh-aw/actions/detect_agent_errors.cjs"
+        env:
+          GH_AW_AGENTIC_EXECUTION_OUTCOME: ${{ steps.agentic_execution.outcome }}
+          GH_AW_ENGINE_STEP_TIMEOUT_MINUTES: ${{ fromJSON(vars.GH_AW_DEFAULT_TIMEOUT_MINUTES || '20') }}
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'detect_agent_errors.cjs'));
+            await main();
       - name: Configure Git credentials
         env:
           GITHUB_REPOSITORY: ${{ github.repository }}
@@ -892,7 +1025,7 @@ jobs:
         continue-on-error: true
         env:
           MCP_GATEWAY_PORT: ${{ steps.start-mcp-gateway.outputs.gateway-port }}
-          MCP_GATEWAY_API_KEY: ${{ steps.start-mcp-gateway.outputs.gateway-api-key }}
+          MCP_GATEWAY_AGENT_ID: ${{ steps.start-mcp-gateway.outputs.gateway-agent-id }}
           GATEWAY_PID: ${{ steps.start-mcp-gateway.outputs.gateway-pid }}
         run: |
           bash "${RUNNER_TEMP}/gh-aw/actions/stop_mcp_gateway.sh" "$GATEWAY_PID"
@@ -901,9 +1034,11 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/redact_secrets.cjs');
+            const { main } = require(path.join(actionsDir, 'redact_secrets.cjs'));
             await main();
         env:
           GH_AW_SECRET_NAMES: 'COPILOT_GITHUB_TOKEN,GH_AW_GITHUB_MCP_SERVER_TOKEN,GH_AW_GITHUB_TOKEN,GITHUB_TOKEN'
@@ -927,25 +1062,30 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
-          GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
+          GH_AW_ALLOWED_DOMAINS: "api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,s.symcb.com,s.symcd.com,security.ubuntu.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_API_URL: ${{ github.api_url }}
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/collect_ndjson_output.cjs');
+            const { main } = require(path.join(actionsDir, 'collect_ndjson_output.cjs'));
             await main();
       - name: Parse agent logs for step summary
         if: always()
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: /tmp/gh-aw/sandbox/agent/logs/
+          GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_copilot_log.cjs');
+            const { main } = require(path.join(actionsDir, 'parse_copilot_log.cjs'));
             await main();
       - name: Parse MCP Gateway logs for step summary
         if: always()
@@ -953,34 +1093,29 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_mcp_gateway_log.cjs');
+            const { main } = require(path.join(actionsDir, 'parse_mcp_gateway_log.cjs'));
             await main();
       - name: Print firewall logs
         if: always()
         continue-on-error: true
         env:
           AWF_LOGS_DIR: /tmp/gh-aw/sandbox/firewall/logs
-        run: |
-          # Fix permissions on firewall logs/audit dirs so they can be uploaded as artifacts
-          # AWF runs with sudo, creating files owned by root
-          sudo chmod -R a+rX /tmp/gh-aw/sandbox/firewall 2>/dev/null || true
-          # Only run awf logs summary if awf command exists (it may not be installed if workflow failed before install step)
-          if command -v awf &> /dev/null; then
-            awf logs summary | tee -a "$GITHUB_STEP_SUMMARY"
-          else
-            echo 'AWF binary not installed, skipping firewall log summary'
-          fi
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/print_firewall_logs.sh" --rootless
       - name: Parse token usage for step summary
         if: always()
         continue-on-error: true
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_token_usage.cjs');
+            const { main } = require(path.join(actionsDir, 'parse_token_usage.cjs'));
             await main();
       - name: Print AWF reflect summary
         if: always()
@@ -988,16 +1123,41 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/awf_reflect_summary.cjs');
+            const { main } = require(path.join(actionsDir, 'awf_reflect_summary.cjs'));
             await main();
+      - name: Generate observability summary
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'generate_observability_summary.cjs'));
+            await main(core);
       - name: Write agent output placeholder if missing
         if: always()
         run: |
           if [ ! -f /tmp/gh-aw/agent_output.json ]; then
             echo '{"items":[]}' > /tmp/gh-aw/agent_output.json
           fi
+      # Small dedicated copy of the agent output so safe-output processing
+      # survives a failed or timed-out upload of the larger agent artifact
+      - name: Upload agent output fallback artifact
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: agent-output-fallback
+          path: |
+            /tmp/gh-aw/agent_output.json
+            /tmp/gh-aw/safeoutputs.jsonl
+          if-no-files-found: ignore
       - name: Upload agent artifacts
         if: always()
         continue-on-error: true
@@ -1016,6 +1176,8 @@ jobs:
             /tmp/gh-aw/pre-agent-audit.txt
             /tmp/gh-aw/agent/
             /tmp/gh-aw/github_rate_limits.jsonl
+            /tmp/gh-aw/otel.jsonl
+            /tmp/gh-aw/otlp-export-errors.jsonl
             /tmp/gh-aw/safeoutputs.jsonl
             /tmp/gh-aw/agent_output.json
             /tmp/gh-aw/aw-*.patch
@@ -1034,17 +1196,20 @@ jobs:
       - safe_outputs
     if: >
       always() && (needs.agent.result != 'skipped' || needs.activation.outputs.lockdown_check_failed == 'true' ||
-      needs.activation.outputs.stale_lock_file_failed == 'true' || needs.activation.outputs.daily_ai_credits_exceeded == 'true')
+      needs.activation.outputs.oauth_token_check_failed == 'true' || needs.activation.outputs.stale_lock_file_failed == 'true' ||
+      needs.activation.outputs.daily_ai_credits_exceeded == 'true')
     runs-on: ubuntu-slim
     environment: issue-triage
     permissions:
-      contents: read
+      actions: read
       issues: write
       pull-requests: write
     concurrency:
       group: "gh-aw-conclusion-issue-triage"
       cancel-in-progress: false
       queue: max
+    env:
+      GH_AW_RUNTIME_FEATURES: ${{ vars.GH_AW_RUNTIME_FEATURES }}
     outputs:
       incomplete_count: ${{ steps.report_incomplete.outputs.incomplete_count }}
       noop_message: ${{ steps.noop.outputs.noop_message }}
@@ -1053,7 +1218,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
+        uses: github/gh-aw-actions/setup@9271a1804551c0dc4fb0085a97979950aa2f8489 # v0.88.2
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -1062,15 +1227,16 @@ jobs:
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.63"
-          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AWF_VERSION: "v0.28.12"
           GH_AW_INFO_ENGINE_ID: "copilot"
       - name: Download agent output artifact
         id: download-agent-output
         continue-on-error: true
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          name: agent
+          pattern: "{agent,agent-output-fallback}"
+          merge-multiple: true
           path: /tmp/gh-aw/
       - name: Setup agent output environment variable
         id: setup-agent-output-env
@@ -1078,32 +1244,29 @@ jobs:
         run: |
           mkdir -p /tmp/gh-aw/
           find "/tmp/gh-aw/" -type f -print
-          echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+          if [ -f "/tmp/gh-aw/agent_output.json" ]; then
+            echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Download detection artifact
+        id: download-detection-artifact
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: detection
+          path: /tmp/gh-aw/threat-detection/
+      - name: Download Safe Outputs Items Manifest
+        id: download-safe-outputs-manifest
+        if: always()
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: safe-outputs-items
+          merge-multiple: true
+          path: /tmp/gh-aw/
       - name: Collect usage artifact files
         if: always()
         continue-on-error: true
-        run: |
-          mkdir -p /tmp/gh-aw/usage/agent /tmp/gh-aw/usage/detection
-          echo "Usage artifact source file status:"
-          for file in /tmp/gh-aw/aw_info.json /tmp/gh-aw/aw-info.jsonl /tmp/gh-aw/agent_usage.jsonl /tmp/gh-aw/detection_usage.jsonl /tmp/gh-aw/github_rate_limits.jsonl /tmp/gh-aw/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/threat-detection/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/threat-detection/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/threat-detection/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl; do
-            [ -f "$file" ] && echo "FOUND: $file" || echo "MISSING: $file"
-          done
-          [ -f /tmp/gh-aw/aw_info.json ] && cp /tmp/gh-aw/aw_info.json /tmp/gh-aw/usage/aw_info.json || true
-          [ -f /tmp/gh-aw/aw-info.jsonl ] && cp /tmp/gh-aw/aw-info.jsonl /tmp/gh-aw/usage/aw-info.jsonl || true
-          [ -f /tmp/gh-aw/agent_usage.jsonl ] && cp /tmp/gh-aw/agent_usage.jsonl /tmp/gh-aw/usage/agent_usage.jsonl || true
-          [ -f /tmp/gh-aw/detection_usage.jsonl ] && cp /tmp/gh-aw/detection_usage.jsonl /tmp/gh-aw/usage/detection_usage.jsonl || true
-          [ -f /tmp/gh-aw/github_rate_limits.jsonl ] && cp /tmp/gh-aw/github_rate_limits.jsonl /tmp/gh-aw/usage/github_rate_limits.jsonl || true
-          [ -f /tmp/gh-aw/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/agent/token_usage.jsonl || true
-          [ -f /tmp/gh-aw/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/agent/token_usage.jsonl || true
-          [ -f /tmp/gh-aw/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/agent/token_usage.jsonl || true
-          [ -f /tmp/gh-aw/threat-detection/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/threat-detection/sandbox/firewall-audit-logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/detection/token_usage.jsonl || true
-          [ -f /tmp/gh-aw/threat-detection/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/threat-detection/sandbox/firewall/logs/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/detection/token_usage.jsonl || true
-          [ -f /tmp/gh-aw/threat-detection/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl ] && cp /tmp/gh-aw/threat-detection/sandbox/firewall/audit/api-proxy-logs/token-usage.jsonl /tmp/gh-aw/usage/detection/token_usage.jsonl || true
-          [ -f /tmp/gh-aw/usage/agent/token_usage.jsonl ] || : > /tmp/gh-aw/usage/agent/token_usage.jsonl
-          [ -f /tmp/gh-aw/usage/detection/token_usage.jsonl ] || : > /tmp/gh-aw/usage/detection/token_usage.jsonl
-          mkdir -p /tmp/gh-aw/usage/activity
-          node ${{ runner.temp }}/gh-aw/actions/generate_usage_activity_summary.cjs
-          find /tmp/gh-aw/usage -type f -print | sort
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/collect_usage_artifact_files.sh"
       - name: Upload usage artifact
         if: always()
         continue-on-error: true
@@ -1113,8 +1276,12 @@ jobs:
           path: |
             /tmp/gh-aw/usage/aw_info.json
             /tmp/gh-aw/usage/aw-info.jsonl
+            /tmp/gh-aw/usage/agent_usage.json
             /tmp/gh-aw/usage/agent_usage.jsonl
             /tmp/gh-aw/usage/detection_usage.jsonl
+            /tmp/gh-aw/usage/evals.jsonl
+            /tmp/gh-aw/usage/graders/grader_manifest.json
+            /tmp/gh-aw/usage/graders/grader_results.json
             /tmp/gh-aw/usage/github_rate_limits.jsonl
             /tmp/gh-aw/usage/agent/token_usage.jsonl
             /tmp/gh-aw/usage/detection/token_usage.jsonl
@@ -1124,7 +1291,7 @@ jobs:
         id: restore-daily-aic-cache-conclusion
         if: always()
         continue-on-error: true
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           key: agentic-workflow-usage-issuetriage-${{ github.run_id }}
           restore-keys: agentic-workflow-usage-issuetriage-
@@ -1137,15 +1304,17 @@ jobs:
         with:
           github-token: ${{ github.token }}
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/write_daily_aic_usage_cache.cjs');
+            const { main } = require(path.join(actionsDir, 'write_daily_aic_usage_cache.cjs'));
             await main();
       - name: Save daily AIC usage cache
         id: save-daily-aic-cache
         if: always()
         continue-on-error: true
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           key: agentic-workflow-usage-issuetriage-${{ github.run_id }}
           path: /tmp/gh-aw/agentic-workflow-usage-cache.jsonl
@@ -1177,9 +1346,11 @@ jobs:
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/handle_noop_message.cjs');
+            const { main } = require(path.join(actionsDir, 'handle_noop_message.cjs'));
             await main();
       - name: Log detection run
         id: detection_runs
@@ -1194,9 +1365,11 @@ jobs:
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/handle_detection_runs.cjs');
+            const { main } = require(path.join(actionsDir, 'handle_detection_runs.cjs'));
             await main();
       - name: Record missing tool
         id: missing_tool
@@ -1209,9 +1382,11 @@ jobs:
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/missing_tool.cjs');
+            const { main } = require(path.join(actionsDir, 'missing_tool.cjs'));
             await main();
       - name: Record incomplete
         id: report_incomplete
@@ -1224,9 +1399,11 @@ jobs:
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/report_incomplete_handler.cjs');
+            const { main } = require(path.join(actionsDir, 'report_incomplete_handler.cjs'));
             await main();
       - name: Handle agent failure
         id: handle_agent_failure
@@ -1239,7 +1416,7 @@ jobs:
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
           GH_AW_WORKFLOW_ID: "issue-triage"
-          GH_AW_ACTION_FAILURE_ISSUE_EXPIRES_HOURS: "168"
+          GH_AW_ACTION_FAILURE_ISSUE_EXPIRES_HOURS: "0"
           GH_AW_ENGINE_ID: "copilot"
           GH_AW_CHECKOUT_PR_SUCCESS: ${{ needs.agent.outputs.checkout_pr_success }}
           GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens || '' }}
@@ -1252,8 +1429,14 @@ jobs:
           GH_AW_MCP_POLICY_ERROR: ${{ needs.agent.outputs.mcp_policy_error }}
           GH_AW_AGENTIC_ENGINE_TIMEOUT: ${{ needs.agent.outputs.agentic_engine_timeout }}
           GH_AW_MODEL_NOT_SUPPORTED_ERROR: ${{ needs.agent.outputs.model_not_supported_error }}
+          GH_AW_HTTP_400_RESPONSE_ERROR: ${{ needs.agent.outputs.http_400_response_error }}
+          GH_AW_MAX_CACHE_MISSES_EXCEEDED: ${{ needs.agent.outputs.max_cache_misses_exceeded }}
+          GH_AW_MISSING_MODEL_PRICING_ERROR: ${{ needs.agent.outputs.missing_model_pricing_error }}
+          GH_AW_MISSING_MODEL_PRICING_MODEL_NAME: ${{ needs.agent.outputs.missing_model_pricing_model_name }}
+          GH_AW_SHELL_EXPANSION_GUARD_REJECTED: ${{ needs.agent.outputs.shell_expansion_guard_rejected }}
           GH_AW_ENGINE_API_HOSTS: "api.enterprise.githubcopilot.com,api.githubcopilot.com,api.business.githubcopilot.com,api.individual.githubcopilot.com"
           GH_AW_LOCKDOWN_CHECK_FAILED: ${{ needs.activation.outputs.lockdown_check_failed }}
+          GH_AW_OAUTH_TOKEN_CHECK_FAILED: ${{ needs.activation.outputs.oauth_token_check_failed }}
           GH_AW_STALE_LOCK_FILE_FAILED: ${{ needs.activation.outputs.stale_lock_file_failed }}
           GH_AW_DAILY_AI_CREDITS_EXCEEDED: ${{ needs.activation.outputs.daily_ai_credits_exceeded }}
           GH_AW_DAILY_AI_CREDITS_TOTAL_EFFECTIVE_TOKENS: ${{ needs.activation.outputs.daily_ai_credits_total_effective_tokens }}
@@ -1262,25 +1445,48 @@ jobs:
           GH_AW_FAILURE_REPORT_AS_ISSUE: "true"
           GH_AW_MISSING_TOOL_REPORT_AS_FAILURE: "true"
           GH_AW_MISSING_DATA_REPORT_AS_FAILURE: "true"
-          GH_AW_TIMEOUT_MINUTES: "20"
+          GH_AW_TIMEOUT_MINUTES: "${{ fromJSON(vars.GH_AW_DEFAULT_TIMEOUT_MINUTES || '20') }}"
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'handle_agent_failure.cjs'));
+            await main();
+      - name: Report failed jobs
+        id: report_failed_jobs
+        if: always()
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
+          GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/${{ github.repository }}/blob/${{ github.ref_name }}/.github/workflows/issue-triage.md"
+          GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          GH_AW_REPORT_FAILED_JOBS: "true"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/handle_agent_failure.cjs');
+            const { main } = require(path.join(actionsDir, 'report_failed_jobs.cjs'));
             await main();
 
   detection:
     needs:
       - activation
       - agent
-    if: >
-      always() && needs.agent.result != 'skipped' && (needs.agent.outputs.output_types != '' || needs.agent.outputs.has_patch == 'true')
+    if: always() && needs.agent.result != 'skipped'
     runs-on: ubuntu-latest
     environment: issue-triage
     permissions:
       contents: read
+    timeout-minutes: 10
+    env:
+      GH_AW_RUNTIME_FEATURES: ${{ vars.GH_AW_RUNTIME_FEATURES }}
     outputs:
       aic: ${{ steps.parse_detection_token_usage.outputs.aic }}
       detection_conclusion: ${{ steps.detection_conclusion.outputs.conclusion }}
@@ -1289,7 +1495,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
+        uses: github/gh-aw-actions/setup@9271a1804551c0dc4fb0085a97979950aa2f8489 # v0.88.2
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -1298,15 +1504,22 @@ jobs:
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.63"
-          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AWF_VERSION: "v0.28.12"
           GH_AW_INFO_ENGINE_ID: "copilot"
+      - name: Download activation artifact
+        continue-on-error: true
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: activation
+          path: /tmp/gh-aw
       - name: Download agent output artifact
         id: download-agent-output
         continue-on-error: true
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          name: agent
+          pattern: "{agent,agent-output-fallback}"
+          merge-multiple: true
           path: /tmp/gh-aw/
       - name: Setup agent output environment variable
         id: setup-agent-output-env
@@ -1314,10 +1527,12 @@ jobs:
         run: |
           mkdir -p /tmp/gh-aw/
           find "/tmp/gh-aw/" -type f -print
-          echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+          if [ -f "/tmp/gh-aw/agent_output.json" ]; then
+            echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+          fi
       - name: Checkout repository for patch context
         if: needs.agent.outputs.has_patch == 'true'
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       # --- Threat Detection ---
@@ -1326,7 +1541,7 @@ jobs:
           rm -rf /tmp/gh-aw/sandbox/firewall/logs
           rm -rf /tmp/gh-aw/sandbox/firewall/audit
       - name: Download container images
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.27.7@sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c ghcr.io/github/gh-aw-firewall/api-proxy:0.27.7@sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6 ghcr.io/github/gh-aw-firewall/squid:0.27.7@sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/download_docker_images.sh" ghcr.io/github/gh-aw-firewall/agent:0.28.12@sha256:390051be4ed1847f774fd8980b61d3a3523574c0175d00c3fc7cdf2002a88202 ghcr.io/github/gh-aw-firewall/api-proxy:0.28.12@sha256:d7d533d87c80d87ff91ac0e21e9299055c3beedff1536262b97ed700fb065a32 ghcr.io/github/gh-aw-firewall/squid:0.28.12@sha256:52c34aca98d2a6833c329f1505912a6949c4fda16618c010c979bd59ea99254f
       - name: Check if detection needed
         id: detection_guard
         if: always()
@@ -1350,21 +1565,7 @@ jobs:
       - name: Prepare threat detection files
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         run: |
-          mkdir -p /tmp/gh-aw/threat-detection/aw-prompts
-          rm -f /tmp/gh-aw/agent_usage.json
-          cp /tmp/gh-aw/aw-prompts/prompt.txt /tmp/gh-aw/threat-detection/aw-prompts/prompt.txt 2>/dev/null || true
-          if [ ! -s /tmp/gh-aw/threat-detection/aw-prompts/prompt.txt ]; then
-            echo "::warning::ERR_VALIDATION: Missing or empty detection context prompt at /tmp/gh-aw/threat-detection/aw-prompts/prompt.txt. Ensure the agent artifact includes /tmp/gh-aw/aw-prompts/prompt.txt. Detection will continue with fallback workflow context."
-          fi
-          cp /tmp/gh-aw/agent_output.json /tmp/gh-aw/threat-detection/agent_output.json 2>/dev/null || true
-          for f in /tmp/gh-aw/aw-*.patch; do
-            [ -f "$f" ] && cp "$f" /tmp/gh-aw/threat-detection/ 2>/dev/null || true
-          done
-          for f in /tmp/gh-aw/aw-*.bundle; do
-            [ -f "$f" ] && cp "$f" /tmp/gh-aw/threat-detection/ 2>/dev/null || true
-          done
-          echo "Prepared threat detection files:"
-          ls -la /tmp/gh-aw/threat-detection/ 2>/dev/null || true
+          bash "${RUNNER_TEMP}/gh-aw/actions/prepare_threat_detection_files.sh"
       - name: Setup threat detection
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -1372,83 +1573,52 @@ jobs:
           WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           WORKFLOW_DESCRIPTION: "No description provided"
           HAS_PATCH: ${{ needs.agent.outputs.has_patch }}
+          GH_AW_DETECTION_CONTINUE_ON_ERROR: "true"
+          GH_AW_DETECTION_SKIP_PROMPT_SUMMARY: "true"
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/setup_threat_detection.cjs');
+            const { main } = require(path.join(actionsDir, 'setup_threat_detection.cjs'));
             await main();
       - name: Ensure threat-detection directory and log
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         run: |
           mkdir -p /tmp/gh-aw/threat-detection
           touch /tmp/gh-aw/threat-detection/detection.log
-      - name: Setup Node.js
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
-        with:
-          node-version: '24'
-          package-manager-cache: false
+      - name: Install AWF binary
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.28.12 --rootless
       - name: Install GitHub Copilot CLI
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.63
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh"
         env:
           GH_HOST: github.com
-      - name: Install AWF binary
-        run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.27.7
-      - name: Execute GitHub Copilot CLI
+          GH_AW_COMPILED_VERSION: v0.88.2
+      - name: Install threat-detect binary
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         continue-on-error: true
-        id: detection_agentic_execution
-        # Copilot CLI tool arguments (sorted):
-        timeout-minutes: 20
         run: |
-          set -o pipefail
-          printf '%s' "$(date +%s%3N)" > /tmp/gh-aw/agent_cli_start_ms.txt
-          trap 'rm -f "$HOME/.copilot/settings.json"' EXIT
-          mkdir -p "$HOME/.copilot"
-          printf '%s' '{"builtInAgents":{"rubberDuck":false}}' > "$HOME/.copilot/settings.json"
-          export XDG_CONFIG_HOME="$HOME"
-          touch /tmp/gh-aw/agent-step-summary.md
-          GH_AW_NODE_BIN=$(command -v node 2>/dev/null || true)
-          export GH_AW_NODE_BIN
-          export COPILOT_API_KEY="$COPILOT_DUMMY_BYOK"
-          (umask 177 && touch /tmp/gh-aw/threat-detection/detection.log)
-          GH_AW_MAX_AI_CREDITS="${GH_AW_MAX_AI_CREDITS:-400}"
-          printf '%s\n' "{\"\$schema\":\"https://github.com/github/gh-aw-firewall/releases/download/v0.27.7/awf-config.schema.json\",\"network\":{\"allowDomains\":[\"api.business.githubcopilot.com\",\"api.enterprise.githubcopilot.com\",\"api.github.com\",\"api.githubcopilot.com\",\"api.individual.githubcopilot.com\",\"github.com\",\"host.docker.internal\",\"registry.npmjs.org\",\"telemetry.enterprise.githubcopilot.com\"]},\"apiProxy\":{\"enabled\":true,\"enableTokenSteering\":true,\"maxRuns\":500,\"maxAiCredits\":${GH_AW_MAX_AI_CREDITS},\"maxCacheMisses\":5},\"container\":{\"imageTag\":\"0.27.7,squid=sha256:deb1d4e19de62d51cee0508057a596a19315c3423ada4d675cad136dc8037c96,agent=sha256:aae231e4635c8999d039c132f1602d3df850fe9b84a00aa2b5ac981179b5661c,api-proxy=sha256:009caf2e3d88fa77b64e9a03a95a228fc58db0f1701c6d324b29ba5a3c7c79b6,cli-proxy=sha256:4757f198a3fa20f88bdbe70be7ae1a05f127d9c0a9e96a5d6460ef40c08fc83d\"}}" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
-          cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
-          export GH_AW_MODELS_JSON_PATH="/tmp/gh-aw/models.json"
-          GH_AW_DOCKER_HOST=""
-          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
-            GH_AW_DOCKER_HOST="${DOCKER_HOST}"
-          fi
-          GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS=""
-          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
-            GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS="--docker-host-path-prefix /tmp/gh-aw"
-            _GH_AW_CHROOT_JSON=$(jq -c --arg src /tmp/gh-aw --arg user "$(id -un)" --argjson uid "$(id -u)" --argjson gid "$(id -g)" --arg home /tmp/gh-aw/home '.chroot={"binariesSourcePath":$src,"identity":{"user":$user,"uid":$uid,"gid":$gid,"home":$home}}' "${RUNNER_TEMP}/gh-aw/awf-config.json") || { echo "chroot config patch failed" >&2; exit 1; }
-            printf '%s\n' "$_GH_AW_CHROOT_JSON" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
-            printf '%s\n' "$_GH_AW_CHROOT_JSON" > "/tmp/gh-aw/awf-config.json"
-          fi
-          GH_AW_TOOL_CACHE_MOUNT=""
-          GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"
-          if [ -d "$GH_AW_TOOL_CACHE" ]; then
-            if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then
-              GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"
-            fi
-          fi
-          # shellcheck disable=SC1003,SC2086
-          sudo -E awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"} ${GH_AW_DOCKER_HOST:+--docker-host "$GH_AW_DOCKER_HOST"} ${GH_AW_DOCKER_HOST_PATH_PREFIX_ARGS} --env-all --exclude-env COPILOT_GITHUB_TOKEN --log-level info --proxy-logs-dir /tmp/gh-aw/sandbox/firewall/logs --audit-dir /tmp/gh-aw/sandbox/firewall/audit --enable-host-access --allow-host-ports 80,443,8080 --skip-pull \
-            -- /bin/bash -c 'set +o histexpand; : "${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"; GH_AW_TOOL_CACHE="$RUNNER_TOOL_CACHE"; export PATH="$(find "$GH_AW_TOOL_CACHE" -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true && GH_AW_NODE_EXEC="${GH_AW_NODE_BIN:-}"; if [ -z "$GH_AW_NODE_EXEC" ] || [ ! -x "$GH_AW_NODE_EXEC" ]; then GH_AW_NODE_EXEC="$(command -v node 2>/dev/null || true)"; fi; if [ -z "$GH_AW_NODE_EXEC" ]; then echo "node runtime missing on this runner — check runtimes.node in workflow YAML" >&2; exit 127; fi; GH_AW_NPM_GLOBAL_ROOT="$(npm root -g 2>/dev/null || true)"; if [ -n "$GH_AW_NPM_GLOBAL_ROOT" ]; then export NODE_PATH="${GH_AW_NPM_GLOBAL_ROOT}${NODE_PATH:+:${NODE_PATH}}"; fi; "$GH_AW_NODE_EXEC" ${RUNNER_TEMP}/gh-aw/actions/copilot_harness.cjs /usr/local/bin/copilot --add-dir /tmp/gh-aw/ --log-level all --log-dir /tmp/gh-aw/sandbox/agent/logs/ --disable-builtin-mcps --no-ask-user --allow-all-tools --add-dir "${GITHUB_WORKSPACE}" --prompt-file /tmp/gh-aw/aw-prompts/prompt.txt' 2>&1 | tee -a /tmp/gh-aw/threat-detection/detection.log
+          bash "${RUNNER_TEMP}/gh-aw/actions/install_threat_detect_binary.sh" v0.5.1
+      - name: Execute threat detection with AWF
+        id: detection_agentic_execution
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        continue-on-error: true
+        timeout-minutes: 10
         env:
           AWF_REFLECT_ENABLED: 1
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
           COPILOT_DUMMY_BYOK: dummy-byok-key-for-offline-mode
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_DETECTION_COPILOT || vars.GH_AW_DEFAULT_MODEL_COPILOT || 'claude-sonnet-4.6' }}
+          COPILOT_MODEL: auto
+          GH_AW_HARNESS_MAX_RETRIES: 0
+          GH_AW_LLM_PROVIDER: github
           GH_AW_MAX_AI_CREDITS: ${{ vars.GH_AW_DEFAULT_DETECTION_MAX_AI_CREDITS || '400' }}
           GH_AW_MAX_TURNS: ${{ vars.GH_AW_DEFAULT_MAX_TURNS || '' }}
           GH_AW_PHASE: detection
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
-          GH_AW_TIMEOUT_MINUTES: 20
-          GH_AW_VERSION: v0.80.9
+          GH_AW_TIMEOUT_MINUTES: 10
+          GH_AW_VERSION: v0.88.2
           GITHUB_API_URL: ${{ github.api_url }}
           GITHUB_AW: true
           GITHUB_COPILOT_INTEGRATION_ID: agentic-workflows
@@ -1463,58 +1633,105 @@ jobs:
           GIT_COMMITTER_NAME: github-actions[bot]
           RUNNER_TEMP: ${{ runner.temp }}
           TRACEPARENT: ${{ env.GITHUB_AW_OTEL_TRACE_ID != '' && env.GITHUB_AW_OTEL_PARENT_SPAN_ID != '' && format('00-{0}-{1}-01', env.GITHUB_AW_OTEL_TRACE_ID, env.GITHUB_AW_OTEL_PARENT_SPAN_ID) || '' }}
-      - name: Parse threat detection token usage for step summary
-        id: parse_detection_token_usage
-        if: always()
+          WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
+          WORKFLOW_DESCRIPTION: "No description provided"
+          HAS_PATCH: ${{ needs.agent.outputs.has_patch }}
+          GH_AW_DETECTION_CONTINUE_ON_ERROR: "true"
+        run: |
+          set -o pipefail
+          printf '%s' "$(date +%s%3N)" > /tmp/gh-aw/agent_cli_start_ms.txt
+          GH_AW_COPILOT_SRC="$(command -v copilot 2>/dev/null || true)"
+          if [ -z "$GH_AW_COPILOT_SRC" ] || [ ! -x "$GH_AW_COPILOT_SRC" ]; then
+            echo "GitHub Copilot CLI executable not found on PATH after installation" >&2
+            exit 127
+          fi
+          GH_AW_COPILOT_BIN="${RUNNER_TEMP}/gh-aw/bin/copilot"
+          mkdir -p "${RUNNER_TEMP}/gh-aw/bin"
+          if [ "$GH_AW_COPILOT_SRC" != "$GH_AW_COPILOT_BIN" ]; then
+            cp "$GH_AW_COPILOT_SRC" "$GH_AW_COPILOT_BIN"
+          fi
+          chmod 755 "$GH_AW_COPILOT_BIN"
+
+          (umask 177 && touch /tmp/gh-aw/threat-detection/detection.log)
+          GH_AW_MAX_AI_CREDITS="${GH_AW_MAX_AI_CREDITS:-400}"
+          if [[ ! "$GH_AW_MAX_AI_CREDITS" =~ ^[0-9]+$ ]]; then
+            GH_AW_MAX_AI_CREDITS="400"
+          fi
+          printf '%s\n' "{\"\$schema\":\"https://github.com/github/gh-aw-firewall/releases/download/v0.28.12/awf-config.schema.json\",\"apiProxy\":{\"enabled\":true,\"enableTokenSteering\":true,\"maxRuns\":500,\"maxAiCredits\":${GH_AW_MAX_AI_CREDITS},\"maxCacheMisses\":5,\"models\":{\"agent\":[\"sonnet-6x\",\"gpt-5.4\",\"gpt-5.5\",\"gpt-5.6\",\"gpt-5.3\",\"gemini-pro\",\"any\"],\"antigravity\":[\"copilot/antigravity*\",\"google/antigravity*\",\"gemini/antigravity*\"],\"any\":[\"copilot/*\",\"anthropic/*\",\"openai/*\",\"google/*\",\"gemini/*\"],\"auto\":[\"copilot/auto\",\"large\"],\"claude\":[\"agent\"],\"codex\":[\"agent\"],\"coding\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\",\"gpt-5-codex\",\"kimi\"],\"computer-use\":[\"copilot/*computer-use*\",\"google/*computer-use*\",\"gemini/*computer-use*\",\"openai/*computer-use*\"],\"copilot\":[\"agent\"],\"deep-research\":[\"copilot/deep-research*\",\"copilot/o3-deep-research*\",\"copilot/o4-mini-deep-research*\",\"google/deep-research*\",\"gemini/deep-research*\",\"openai/o3-deep-research*\",\"openai/o4-mini-deep-research*\"],\"detection\":[\"small\"],\"evals\":[\"small\"],\"fable\":[\"copilot/*fable*\",\"anthropic/*fable*\"],\"gemini\":[\"agent\"],\"gemini-3-flash\":[\"copilot/gemini-3*flash*\",\"google/gemini-3*flash*\",\"gemini/gemini-3*flash*\"],\"gemini-3-pro\":[\"copilot/gemini-3*pro*\",\"google/gemini-3*pro*\",\"google/nano-banana*\",\"gemini/gemini-3*pro*\"],\"gemini-3.1-flash\":[\"copilot/gemini-3.1*flash*\",\"google/gemini-3.1*flash*\",\"gemini/gemini-3.1*flash*\"],\"gemini-3.1-pro\":[\"copilot/gemini-3.1*pro*\",\"google/gemini-3.1*pro*\",\"gemini/gemini-3.1*pro*\"],\"gemini-3.5-flash\":[\"copilot/gemini-3.5*flash*\",\"google/gemini-3.5*flash*\",\"gemini/gemini-3.5*flash*\"],\"gemini-3.6-flash\":[\"copilot/gemini-3.6*flash*\",\"google/gemini-3.6*flash*\",\"gemini/gemini-3.6*flash*\"],\"gemini-3.7-flash\":[\"copilot/gemini-3.7*flash*\",\"google/gemini-3.7*flash*\",\"gemini/gemini-3.7*flash*\"],\"gemini-flash\":[\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"],\"gemini-flash-lite\":[\"copilot/gemini-*flash*lite*\",\"google/gemini-*flash*lite*\",\"gemini/gemini-*flash*lite*\"],\"gemini-omni\":[\"copilot/gemini-omni*\",\"google/gemini-omni*\",\"gemini/gemini-omni*\"],\"gemini-pro\":[\"copilot/gemini-*pro*\",\"google/gemini-*pro*\",\"gemini/gemini-*pro*\"],\"gemma\":[\"copilot/gemma*\",\"google/gemma*\",\"gemini/gemma*\"],\"gpt-5\":[\"copilot/gpt-5*\",\"openai/gpt-5*\"],\"gpt-5-codex\":[\"copilot/gpt-5*codex*\",\"openai/gpt-5*codex*\"],\"gpt-5-mini\":[\"copilot/gpt-5*mini*\",\"openai/gpt-5*mini*\"],\"gpt-5-nano\":[\"copilot/gpt-5*nano*\",\"openai/gpt-5*nano*\"],\"gpt-5-pro\":[\"copilot/gpt-5*pro*\",\"openai/gpt-5*pro*\"],\"gpt-5.1\":[\"copilot/gpt-5.1*\",\"openai/gpt-5.1*\"],\"gpt-5.2\":[\"copilot/gpt-5.2*\",\"openai/gpt-5.2*\"],\"gpt-5.3\":[\"copilot/gpt-5.3*\",\"openai/gpt-5.3*\"],\"gpt-5.4\":[\"copilot/gpt-5.4*\",\"openai/gpt-5.4*\"],\"gpt-5.5\":[\"copilot/gpt-5.5*\",\"openai/gpt-5.5*\"],\"gpt-5.6\":[\"copilot/gpt-5.6*\",\"openai/gpt-5.6*\"],\"grok\":[\"copilot/*grok*\",\"openai/*grok*\"],\"haiku\":[\"copilot/*haiku*\",\"anthropic/*haiku*\"],\"image-generation\":[\"copilot/gpt-image*\",\"openai/gpt-image*\",\"openai/chatgpt-image*\",\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"google/imagen*\"],\"kimi\":[\"copilot/kimi*\",\"openai/kimi*\"],\"kiwi\":[\"copilot/kiwi*\",\"openai/kiwi*\"],\"large\":[\"sonnet\",\"gpt-5-pro\",\"gpt-5\",\"gemini-pro\"],\"lyria\":[\"google/lyria*\",\"gemini/lyria*\",\"copilot/lyria*\"],\"mai-code\":[\"copilot/MAI-Code*\",\"copilot/mai-code*\",\"openai/MAI-Code*\"],\"mai-code-1-flash-picker\":[\"copilot/MAI-Code-1-Flash-picker*\",\"copilot/mai-code-1-flash-picker*\",\"openai/MAI-Code-1-Flash-picker*\"],\"mini\":[\"haiku\",\"gpt-5-mini\",\"gpt-5-nano\",\"gemini-flash-lite\"],\"nano-banana\":[\"copilot/nano-banana*\",\"google/nano-banana*\",\"gemini/nano-banana*\"],\"opus\":[\"copilot/*opus*\",\"anthropic/*opus*\"],\"opusplan\":[\"opus?effort=high\"],\"raptor-mini\":[\"copilot/raptor*\",\"openai/raptor*\"],\"reasoning\":[\"copilot/o1*\",\"copilot/o3*\",\"copilot/o4*\",\"openai/o1*\",\"openai/o3*\",\"openai/o4*\"],\"robotics\":[\"copilot/*robotics*\",\"google/*robotics*\",\"gemini/*robotics*\"],\"small\":[\"mini\"],\"small-agent\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash\"],\"sonnet\":[\"copilot/*sonnet*\",\"anthropic/*sonnet*\"],\"sonnet-6x\":[\"copilot/*sonnet-4.5*\",\"copilot/*sonnet-4.6*\",\"copilot/*sonnet-5*\",\"copilot/*sonnet-4-5-*\",\"anthropic/*sonnet-4-5-*\",\"copilot/*sonnet-4-6*\",\"anthropic/*sonnet-4-6*\",\"anthropic/*sonnet-5*\"],\"summarization\":[\"haiku\",\"gpt-5-mini\",\"gemini-flash-lite\",\"mini\"],\"veo\":[\"google/veo*\",\"gemini/veo*\"],\"vision\":[\"copilot/gemini-*image*\",\"google/gemini-*image*\",\"gemini/gemini-*image*\",\"copilot/gemini-*flash*\",\"google/gemini-*flash*\",\"gemini/gemini-*flash*\"]}},\"container\":{\"imageTag\":\"0.28.12,squid=sha256:52c34aca98d2a6833c329f1505912a6949c4fda16618c010c979bd59ea99254f,agent=sha256:390051be4ed1847f774fd8980b61d3a3523574c0175d00c3fc7cdf2002a88202,api-proxy=sha256:d7d533d87c80d87ff91ac0e21e9299055c3beedff1536262b97ed700fb065a32,cli-proxy=sha256:5250629d48eaedfedf2e948785228e8da29eec2a83cbab58ea0751c14a7b021d\"},\"logging\":{\"proxyLogsDir\":\"/tmp/gh-aw/sandbox/firewall/logs\",\"auditDir\":\"/tmp/gh-aw/sandbox/firewall/audit\"}}" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+          cp "${RUNNER_TEMP}/gh-aw/awf-config.json" /tmp/gh-aw/awf-config.json
+          export GH_AW_MODELS_JSON_PATH="/tmp/gh-aw/models.json"
+          GH_AW_DOCKER_HOST=""
+          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
+            GH_AW_DOCKER_HOST="${DOCKER_HOST}"
+          fi
+          if [[ "${DOCKER_HOST:-}" =~ ^tcp:// ]]; then
+            _GH_AW_CHROOT_JSON=$(jq -c --arg src "${RUNNER_TEMP}/gh-aw" --arg user "$(id -un)" --argjson uid "$(id -u)" --argjson gid "$(id -g)" --arg home "${RUNNER_TEMP}/gh-aw/home" '.chroot={"binariesSourcePath":$src,"identity":{"user":$user,"uid":$uid,"gid":$gid,"home":$home}}' "${RUNNER_TEMP}/gh-aw/awf-config.json") || { echo "chroot config patch failed" >&2; exit 1; }
+            printf '%s\n' "$_GH_AW_CHROOT_JSON" > "${RUNNER_TEMP}/gh-aw/awf-config.json"
+          fi
+          GH_AW_TOOL_CACHE_MOUNT=""
+          GH_AW_TOOL_CACHE="${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"
+          if [ -d "$GH_AW_TOOL_CACHE" ]; then
+            if [[ "$GH_AW_TOOL_CACHE" != /opt/* ]]; then
+              GH_AW_TOOL_CACHE_MOUNT="$GH_AW_TOOL_CACHE:$GH_AW_TOOL_CACHE:ro"
+            fi
+          fi
+          # shellcheck disable=SC1003,SC2016,SC2086
+          awf --config "${RUNNER_TEMP}/gh-aw/awf-config.json" --container-workdir "${GITHUB_WORKSPACE}" --mount "${RUNNER_TEMP}/gh-aw:${RUNNER_TEMP}/gh-aw:ro" --mount "${RUNNER_TEMP}/gh-aw:/host${RUNNER_TEMP}/gh-aw:ro" ${GH_AW_TOOL_CACHE_MOUNT:+--mount "$GH_AW_TOOL_CACHE_MOUNT"} ${GH_AW_DOCKER_HOST:+--docker-host "$GH_AW_DOCKER_HOST"} --env-all --exclude-env ACTIONS_ID_TOKEN_REQUEST_TOKEN --exclude-env ACTIONS_ID_TOKEN_REQUEST_URL --exclude-env COPILOT_GITHUB_TOKEN --mount /tmp/gh-aw:/tmp/gh-aw:rw --mount /tmp/gh-aw/threat-detection:/tmp/gh-aw/threat-detection:rw --log-level info --skip-pull \
+            -- /bin/bash -c 'set +o histexpand; export PATH="${RUNNER_TEMP}/gh-aw/bin:$PATH" && : "${RUNNER_TOOL_CACHE:?RUNNER_TOOL_CACHE must be set}"; GH_AW_TOOL_CACHE="$RUNNER_TOOL_CACHE"; export PATH="$(find "$GH_AW_TOOL_CACHE" -maxdepth 5 -type d -name bin 2>/dev/null | tr '\''\n'\'' '\'':'\'')$PATH"; [ -n "$GOROOT" ] && export PATH="$GOROOT/bin:$PATH" || true; [ -n "$ERLANG_HOME" ] && export PATH="$ERLANG_HOME/bin:$PATH" || true && threat-detect --engine copilot --output /tmp/gh-aw/threat-detection/detection_result.json /tmp/gh-aw/threat-detection' 2>&1 | tee -a /tmp/gh-aw/threat-detection/detection.log
+      - name: Render detection log
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
         continue-on-error: true
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-        env:
-          GH_AW_TOKEN_USAGE_SUMMARY_TITLE: Threat Detection Token Usage
         with:
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_token_usage.cjs');
+            const { main } = require(path.join(actionsDir, 'render_detection_log.cjs'));
             await main();
-      - name: Upload threat detection log
+      - name: Copy detection firewall logs
+        if: always() && steps.detection_guard.outputs.run_detection == 'true'
+        continue-on-error: true
+        run: |
+          mkdir -p /tmp/gh-aw/threat-detection/sandbox/firewall
+          if [ -d /tmp/gh-aw/sandbox/firewall/logs ]; then mkdir -p /tmp/gh-aw/threat-detection/sandbox/firewall/logs && cp -r /tmp/gh-aw/sandbox/firewall/logs/. /tmp/gh-aw/threat-detection/sandbox/firewall/logs/; fi
+          if [ -d /tmp/gh-aw/sandbox/firewall/audit ]; then mkdir -p /tmp/gh-aw/threat-detection/sandbox/firewall/audit && cp -r /tmp/gh-aw/sandbox/firewall/audit/. /tmp/gh-aw/threat-detection/sandbox/firewall/audit/; fi
+      - name: Upload threat detection artifact
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: detection
-          path: /tmp/gh-aw/threat-detection/detection.log
+          path: |
+            /tmp/gh-aw/threat-detection/detection_result.json
+            /tmp/gh-aw/threat-detection/sandbox/firewall/logs/
+            /tmp/gh-aw/threat-detection/sandbox/firewall/audit/
           if-no-files-found: ignore
-      - name: Parse and conclude threat detection
-        id: detection_conclusion
+      - name: Parse threat detection token usage for step summary
+        id: parse_detection_token_usage
         if: always()
         continue-on-error: true
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_AW_TOKEN_USAGE_SUMMARY_TITLE: Threat Detection Token Usage
+        with:
+          script: |
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require(path.join(actionsDir, 'parse_token_usage.cjs'));
+            await main();
+      - name: Conclude threat detection
+        id: detection_conclusion
+        if: always()
+        continue-on-error: true
         env:
           RUN_DETECTION: ${{ steps.detection_guard.outputs.run_detection }}
           DETECTION_AGENTIC_EXECUTION_OUTCOME: ${{ steps.detection_agentic_execution.outcome }}
           GH_AW_DETECTION_CONTINUE_ON_ERROR: "true"
-        with:
-          script: |
-            try {
-              const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
-              setupGlobals(core, github, context, exec, io, getOctokit);
-              const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_threat_detection_results.cjs');
-              await main();
-            } catch (loadErr) {
-              const continueOnError = process.env.GH_AW_DETECTION_CONTINUE_ON_ERROR !== 'false';
-              const detectionExecutionFailed = process.env.DETECTION_AGENTIC_EXECUTION_OUTCOME === 'failure';
-              const msg = 'ERR_SYSTEM: \u274C Unexpected error loading threat detection module: ' + (loadErr && loadErr.message ? loadErr.message : String(loadErr));
-              core.error(msg);
-              core.setOutput('reason', 'parse_error');
-              if (continueOnError && !detectionExecutionFailed) {
-                core.warning('\u26A0\uFE0F ' + msg);
-                core.setOutput('conclusion', 'warning');
-                core.setOutput('success', 'false');
-              } else {
-                core.setOutput('conclusion', 'failure');
-                core.setOutput('success', 'false');
-                core.setFailed(msg);
-              }
-            }
+        run: |
+          bash "${RUNNER_TEMP}/gh-aw/actions/conclude_threat_detection.sh" /tmp/gh-aw/threat-detection/detection_result.json
 
   safe_outputs:
     needs:
@@ -1525,7 +1742,6 @@ jobs:
     runs-on: ubuntu-slim
     environment: issue-triage
     permissions:
-      contents: read
       issues: write
       pull-requests: write
     timeout-minutes: 45
@@ -1538,8 +1754,8 @@ jobs:
       GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
       GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens }}
       GH_AW_ENGINE_ID: "copilot"
-      GH_AW_ENGINE_MODEL: ${{ needs.agent.outputs.model }}
-      GH_AW_ENGINE_VERSION: "1.0.63"
+      GH_AW_ENGINE_MODEL: "auto"
+      GH_AW_RUNTIME_FEATURES: ${{ vars.GH_AW_RUNTIME_FEATURES }}
       GH_AW_THREAT_DETECTION_AIC: ${{ needs.detection.outputs.aic }}
       GH_AW_WORKFLOW_ID: "issue-triage"
       GH_AW_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
@@ -1551,12 +1767,20 @@ jobs:
       comment_url: ${{ steps.process_safe_outputs.outputs.comment_url }}
       create_discussion_error_count: ${{ steps.process_safe_outputs.outputs.create_discussion_error_count }}
       create_discussion_errors: ${{ steps.process_safe_outputs.outputs.create_discussion_errors }}
+      process_safe_outputs_items_applied: ${{ steps.process_safe_outputs.outputs.items_applied }}
+      process_safe_outputs_items_cancelled: ${{ steps.process_safe_outputs.outputs.items_cancelled }}
+      process_safe_outputs_items_deferred: ${{ steps.process_safe_outputs.outputs.items_deferred }}
+      process_safe_outputs_items_failed: ${{ steps.process_safe_outputs.outputs.items_failed }}
+      process_safe_outputs_items_skipped: ${{ steps.process_safe_outputs.outputs.items_skipped }}
+      process_safe_outputs_items_succeeded: ${{ steps.process_safe_outputs.outputs.items_succeeded }}
+      process_safe_outputs_items_warnings: ${{ steps.process_safe_outputs.outputs.items_warnings }}
       process_safe_outputs_processed_count: ${{ steps.process_safe_outputs.outputs.processed_count }}
+      process_safe_outputs_status: ${{ steps.process_safe_outputs.outputs.status }}
       process_safe_outputs_temporary_id_map: ${{ steps.process_safe_outputs.outputs.temporary_id_map }}
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
+        uses: github/gh-aw-actions/setup@9271a1804551c0dc4fb0085a97979950aa2f8489 # v0.88.2
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -1565,15 +1789,18 @@ jobs:
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "SqlClient Issue Auto-Triage"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage.lock.yml@${{ github.ref }}
-          GH_AW_INFO_VERSION: "1.0.63"
-          GH_AW_INFO_AWF_VERSION: "v0.27.7"
+          GH_AW_INFO_VERSION: "1.0.80"
+          GH_AW_INFO_AWF_VERSION: "v0.28.12"
           GH_AW_INFO_ENGINE_ID: "copilot"
+      - name: Mask OTLP telemetry headers
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/mask_otlp_headers.sh"
       - name: Download agent output artifact
         id: download-agent-output
         continue-on-error: true
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          name: agent
+          pattern: "{agent,agent-output-fallback}"
+          merge-multiple: true
           path: /tmp/gh-aw/
       - name: Setup agent output environment variable
         id: setup-agent-output-env
@@ -1581,7 +1808,9 @@ jobs:
         run: |
           mkdir -p /tmp/gh-aw/
           find "/tmp/gh-aw/" -type f -print
-          echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+          if [ -f "/tmp/gh-aw/agent_output.json" ]; then
+            echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
+          fi
       - name: Configure GH_HOST for enterprise compatibility
         id: ghes-host-config
         shell: bash
@@ -1597,16 +1826,18 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_COMMENT_ID: ${{ needs.activation.outputs.comment_id }}
-          GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
+          GH_AW_ALLOWED_DOMAINS: "api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,s.symcb.com,s.symcd.com,security.ubuntu.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_API_URL: ${{ github.api_url }}
           GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"hide_older_comments\":true,\"max\":1},\"add_labels\":{\"allowed\":[\"Auto-Triage: Waiting for Author\"],\"max\":1},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"false\"},\"remove_labels\":{\"allowed\":[\"Auto-Triage: Waiting for Author\"],\"max\":1},\"report_incomplete\":{}}"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
-            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            const path = require('path');
+            const actionsDir = path.join(process.env.RUNNER_TEMP, 'gh-aw', 'actions');
+            const { setupGlobals } = require(path.join(actionsDir, 'setup_globals.cjs'));
             setupGlobals(core, github, context, exec, io, getOctokit);
-            const { main } = require('${{ runner.temp }}/gh-aw/actions/safe_output_handler_manager.cjs');
+            const { main } = require(path.join(actionsDir, 'process_safe_outputs.cjs'));
             await main();
       - name: Upload Safe Outputs Items
         if: always()
@@ -1616,5 +1847,5 @@ jobs:
           path: |
             /tmp/gh-aw/safe-output-items.jsonl
             /tmp/gh-aw/temporary-id-map.json
+            /tmp/gh-aw/safe-output-errors.json
           if-no-files-found: ignore
-
diff --git a/.github/workflows/issue-triage.md b/.github/workflows/issue-triage.md
index ef157d7f62..100d8baf54 100644
--- a/.github/workflows/issue-triage.md
+++ b/.github/workflows/issue-triage.md
@@ -41,6 +41,7 @@ if: |
    ))
 
 engine: copilot
+model: auto
 
 environment: issue-triage
 
@@ -50,6 +51,7 @@ permissions:
   pull-requests: read
 
 tools:
+  bash: [cat, find, grep]
   github:
     min-integrity: none
 
diff --git a/.github/workflows/verify-aw-lock.yml b/.github/workflows/verify-aw-lock.yml
index c020335650..eb3cc2e608 100644
--- a/.github/workflows/verify-aw-lock.yml
+++ b/.github/workflows/verify-aw-lock.yml
@@ -16,9 +16,9 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Install gh-aw extension
-        uses: github/gh-aw-actions/setup-cli@8c7d04ebf1ece56cd381446125da3e0f6896294a # v0.80.9
+        uses: github/gh-aw-actions/setup-cli@9271a1804551c0dc4fb0085a97979950aa2f8489 # v0.88.2
         with:
-          version: v0.80.9
+          version: v0.88.2
 
       - name: Recompile agentic workflows
         run: gh aw compile

From 95eda3c9922d00670b22c360d36a0347887a01e0 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 10 Sep 2026 13:01:18 -0300
Subject: [PATCH 288/298] Pipelines | Read the general-purpose pool name from
 one shared variable group (#4627)

* Read the general-purpose pool name from one shared variable group

The pool name was configured three different ways: the CI pipelines read
'ci_var_defaultPoolName' from 'ADO Build properties', the PR pipeline read
'PoolNameDefault' from 'sqlclient-testconfig-v1', and the package pipeline
hardcoded ADO-1ES-Pool or ADO-CI-1ES-Pool based on which project it ran in.
Three sources for one value, and the package pipeline's copy had to be edited
by hand whenever the pool changed.

Add a 'sqlclient_pipeline_config' variable group to both the ADO.Net and Public
projects, holding 'general_purpose_pool_name' set to that project's pool, and
read it at every pipeline root.  The name says general-purpose deliberately: we
also use special-purpose pools for Always Encrypted, ARM64, Kerberos and
Managed Instance jobs, which are still named directly and could get their own
variables later.

This also removes the project-name check that chose the package pipeline's
pool, so 'isInternalBuild' now serves only the signing key argument.

No existing variable group is modified.  'ci_var_defaultPoolName' and
'PoolNameDefault' keep their current values; they are simply no longer read.

* Rename the variable group to sqlclient-pipeline-config-v1

Match the naming convention used by the other groups in these projects, such as
sqlclient-testconfig-v1 and symbols-variables-v3: dashes rather than
underscores, and a version suffix.

The group was renamed in place in both the ADO.Net and Public projects, so its
contents and its pipeline authorization are unchanged.

* Keep the pool variable group at pipeline root scope

Addresses review feedback on PR #4627.

ci-build-nugets-job.yml imported ci-build-variables.yml at job scope, which
meant the sqlclient-pipeline-config-v1 group was loaded below the pipeline
root. The import was redundant: that job is only reachable from
dotnet-sqlclient-ci-core.yml, which already imports the same template at its
root, so localFeedPath and packagePath were already in scope. It was also the
only job template in the repo importing a shared variables file. Remove it so
ci-build-variables.yml is imported at pipeline root only.

Also reword the defaultPoolName parameter comment to "most CI jobs", since
the Always Encrypted, ARM64, and macOS jobs use special-purpose pools.
---
 .../ci/package/sqlclient-ci-package-pipeline.yml   |  8 ++++----
 .../ci/stress/sqlclient-ci-stress-pipeline.yml     |  4 ++--
 .../common/templates/jobs/ci-build-nugets-job.yml  |  3 ---
 eng/pipelines/dotnet-sqlclient-ci-core.yml         | 14 +++++++-------
 eng/pipelines/github-sync-pipeline.yml             |  2 +-
 eng/pipelines/libraries/ci-build-variables.yml     |  1 +
 eng/pipelines/pr/sqlclient-pr-pipeline.yml         | 13 ++++++-------
 eng/pipelines/pr/variables/pr-variables.yml        |  3 +++
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml b/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
index 8526379bad..41cb134047 100644
--- a/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
+++ b/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
@@ -79,6 +79,9 @@ parameters:
       - diagnostic
 
 variables:
+  # Provides 'general_purpose_pool_name', the 1ES pool that hosts most jobs in this project.
+  - group: sqlclient-pipeline-config-v1
+
   # Whether this is an internal (ADO.Net project) or public (Public project) build.
   - name: isInternalBuild
     value: ${{ eq(variables['System.TeamProject'], 'ADO.Net') }}
@@ -96,10 +99,7 @@ jobs:
     displayName: Build NuGet Packages
 
     pool:
-      ${{ if eq(variables.isInternalBuild, true) }}:
-        name: ADO-1ES-Pool
-      ${{ else }}:
-        name: ADO-CI-1ES-Pool
+      name: $(general_purpose_pool_name)
       demands:
         - ImageOverride -equals ${{ parameters.poolImage }}
 
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
index 1e91534728..813faa09f9 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
@@ -99,13 +99,13 @@ stages:
   - template: /eng/pipelines/stages/generate-secrets-ci-stage.yml@self
     parameters:
       debug: ${{ parameters.debug }}
-      poolName: $(ci_var_defaultPoolName)
+      poolName: $(general_purpose_pool_name)
       poolImage: ADO-UB24
 
   # Run the stress tests.
   - template: /eng/pipelines/ci/stress/sqlclient-ci-stress-stage.yml@self
     parameters:
-      poolName: $(ci_var_defaultPoolName)
+      poolName: $(general_purpose_pool_name)
       buildConfiguration: ${{ parameters.buildConfiguration }}
       debug: ${{ parameters.debug }}
       warnOnTestFailure: ${{ parameters.warnOnTestFailure }}
diff --git a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
index ce8c58b743..9b7a88e6cc 100644
--- a/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
+++ b/eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml
@@ -87,9 +87,6 @@ jobs:
     demands:
     - imageOverride -equals ${{ parameters.poolImage }}
 
-  variables:
-    - template: /eng/pipelines/libraries/ci-build-variables.yml@self
-
   steps:
   - ${{ if eq(parameters.debug, true)}}:
     - powershell: |
diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml
index 3102b9f8a2..8910ccac33 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-core.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-core.yml
@@ -94,21 +94,21 @@ parameters:
       - Debug
       - Release
 
-  # The name of the 1ES pool that all CI jobs run in.
+  # The name of the general-purpose 1ES pool that most CI jobs run in.
   #
   # This is the single place in the CI pipelines where the pool name is read
   # from a variable group; every stage and job below receives it as a
   # parameter so that the value flows down from here.
   #
-  # 'ci_var_defaultPoolName' is defined in the 'ADO Build properties' variable
-  # group (see /eng/pipelines/libraries/ci-build-variables.yml), for both the
-  # Public and ADO.Net projects.  The PR pipelines are configured from a
-  # different variable group and use '$(PoolNameDefault)' instead; see
-  # /eng/pipelines/pr/sqlclient-pr-pipeline.yml.
+  # 'general_purpose_pool_name' is defined in the 'sqlclient-pipeline-config-v1'
+  # variable group (see /eng/pipelines/libraries/ci-build-variables.yml), for
+  # both the Public and ADO.Net projects, and names each project's own pool.
+  # Special-purpose pools, such as the Always Encrypted and ARM64 pools used
+  # below, are still named directly.
   #
   - name: defaultPoolName
     type: string
-    default: $(ci_var_defaultPoolName)
+    default: $(general_purpose_pool_name)
 
   # The timeout, in minutes, for each test job.
   - name: testJobTimeout
diff --git a/eng/pipelines/github-sync-pipeline.yml b/eng/pipelines/github-sync-pipeline.yml
index 6d186a10b1..eb8c3081c6 100644
--- a/eng/pipelines/github-sync-pipeline.yml
+++ b/eng/pipelines/github-sync-pipeline.yml
@@ -64,7 +64,7 @@ jobs:
   - job: SyncGitHub
     displayName: Sync GitHub to ADO
     pool:
-      name: $(ci_var_defaultPoolName)
+      name: $(general_purpose_pool_name)
       demands:
         - imageOverride -equals ADO-UB24
 
diff --git a/eng/pipelines/libraries/ci-build-variables.yml b/eng/pipelines/libraries/ci-build-variables.yml
index 5486fa9da5..774be86113 100644
--- a/eng/pipelines/libraries/ci-build-variables.yml
+++ b/eng/pipelines/libraries/ci-build-variables.yml
@@ -9,6 +9,7 @@
 # The buildSuffix itself is set by each pipeline via the core template parameter.
 
 variables:
+  - group: sqlclient-pipeline-config-v1
   - group: ADO Build properties
   - group: ADO Test Configuration Properties
 
diff --git a/eng/pipelines/pr/sqlclient-pr-pipeline.yml b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
index 640c448c13..eab08243e8 100644
--- a/eng/pipelines/pr/sqlclient-pr-pipeline.yml
+++ b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
@@ -103,15 +103,14 @@ variables:
   - template: /eng/pipelines/pr/variables/pr-variables.yml@self
 
 stages:
-  # NOTE: '$(PoolNameDefault)' comes from the 'sqlclient-testconfig-v1'
+  # NOTE: '$(general_purpose_pool_name)' comes from the 'sqlclient-pipeline-config-v1'
   # variable group, which is imported by
   # /eng/pipelines/pr/variables/pr-variables.yml (included above).  It is
   # referenced here, at the pipeline root, and passed down to every stage as a
   # parameter, so that no template reads the pool name from a variable group
   # directly.
   #
-  # The CI pipelines are configured from a different variable group and use
-  # '$(ci_var_defaultPoolName)' instead; see
+  # The same variable group and variable are used by the CI pipelines; see
   # /eng/pipelines/dotnet-sqlclient-ci-core.yml.
 
   # Stage 1a: Build and pack all projects in the repository
@@ -121,14 +120,14 @@ stages:
       buildSuffix: pr
       stageName: ${{ variables.stageNamePack }}
       packArtifactBaseName: ${{ variables.packArtifactBaseName }}
-      poolName: $(PoolNameDefault)
+      poolName: $(general_purpose_pool_name)
       poolImage: ADO-UB24
 
   # Stage 1b: Generate secrets
   - template: /eng/pipelines/pr/stages/generate-secrets-stage.yml@self
     parameters:
       stageName: ${{ variables.stageNameSecrets }}
-      poolName: $(PoolNameDefault)
+      poolName: $(general_purpose_pool_name)
       poolImage: ADO-UB24
 
   # Stage 2: Execute tests and collect code coverage
@@ -137,7 +136,7 @@ stages:
       buildConfiguration: Debug
       buildSuffix: pr
       dotnetVerbosity: ${{ parameters.dotnetVerbosity }}
-      poolName: $(PoolNameDefault)
+      poolName: $(general_purpose_pool_name)
       stageNamePack: ${{ variables.stageNamePack }}
       stageNameSecrets: ${{ variables.stageNameSecrets }}
       testResultsArtifactBaseName: ${{ variables.testResultsArtifactBaseName }}
@@ -159,7 +158,7 @@ stages:
   - template: /eng/pipelines/pr/stages/collect-coverage-stage.yml@self
     parameters:
       coverageArtifactBaseName: ${{ variables.coverageArtifactBaseName }}
-      poolName: $(PoolNameDefault)
+      poolName: $(general_purpose_pool_name)
       poolImage: ADO-UB24
       dependsOn:
         - ${{ each platform in parameters.platforms }}:
diff --git a/eng/pipelines/pr/variables/pr-variables.yml b/eng/pipelines/pr/variables/pr-variables.yml
index 5d856c4859..3e97ccb8ac 100644
--- a/eng/pipelines/pr/variables/pr-variables.yml
+++ b/eng/pipelines/pr/variables/pr-variables.yml
@@ -23,6 +23,9 @@ variables:
   # UserManagedIdentityClientId
   - group: sqlclient-testconfig-v1
 
+  # Provides 'general_purpose_pool_name', the 1ES pool that hosts most jobs in this project.
+  - group: sqlclient-pipeline-config-v1
+
   # General Variables ======================================================
 
   # Name to use for the packaging stage. This is to ensure that the packaging stage and the test

From a4b8485bd4d9ac75a0463aea8982fb31ebe732c4 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 10 Sep 2026 09:02:33 -0700
Subject: [PATCH 289/298] Validate localized SqlClient resources in OneBranch
 builds (#4635)

* Add localization validation to OneBranch pipelines

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Run localization validation in SqlClient build

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Allow approved localization value matches

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: b28f059a-cfb7-4fa1-95b7-0947e3c965a1

* Harden localization validation

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: b28f059a-cfb7-4fa1-95b7-0947e3c965a1

* Handle localization handback delay

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: b28f059a-cfb7-4fa1-95b7-0947e3c965a1

* Honor warning-only allowlist validation

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: b28f059a-cfb7-4fa1-95b7-0947e3c965a1

* Always enforce localization validation

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: b28f059a-cfb7-4fa1-95b7-0947e3c965a1

* Clarify localization validation docs

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: b28f059a-cfb7-4fa1-95b7-0947e3c965a1

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: b28f059a-cfb7-4fa1-95b7-0947e3c965a1
---
 .config/LocalizationValidationAllowlist.json  | 110 ++++++++++
 .../onebranch-pipeline-design.instructions.md |   6 +-
 .../onebranch/jobs/build-buildproj-job.yml    |   5 +
 .../onebranch/scripts/tests/README.md         |   1 +
 .../tests/validate-localization.Tests.ps1     | 190 ++++++++++++++++++
 .../scripts/validate-localization.ps1         | 180 +++++++++++++++++
 .../steps/validate-localization-step.yml      |  16 ++
 7 files changed, 507 insertions(+), 1 deletion(-)
 create mode 100644 .config/LocalizationValidationAllowlist.json
 create mode 100644 eng/pipelines/onebranch/scripts/tests/validate-localization.Tests.ps1
 create mode 100644 eng/pipelines/onebranch/scripts/validate-localization.ps1
 create mode 100644 eng/pipelines/onebranch/steps/validate-localization-step.yml

diff --git a/.config/LocalizationValidationAllowlist.json b/.config/LocalizationValidationAllowlist.json
new file mode 100644
index 0000000000..0a3cbfea6b
--- /dev/null
+++ b/.config/LocalizationValidationAllowlist.json
@@ -0,0 +1,110 @@
+{
+  "_comment": [
+    "These culture/key pairs intentionally match the English source text.",
+    "Each pair was verified in the internal LCL source as localized (Stat=Loc, Orig=New). Remove an entry when its localized value changes."
+  ],
+  "AllowedEnglishValueMatches": {
+    "Strings.cs.resx": [
+      "ADP_InvalidMultipartName",
+      "DataCategory_Data",
+      "DataCategory_InfoMessage",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId",
+      "SqlMisc_NullString"
+    ],
+    "Strings.de.resx": [
+      "ADP_InvalidMultipartName",
+      "DataCategory_Pooling",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId"
+    ],
+    "Strings.es.resx": [
+      "ADP_InvalidMultipartName",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId",
+      "SQL_ExErrorNumberStateClass"
+    ],
+    "Strings.fr.resx": [
+      "DataCategory_InfoMessage",
+      "DataCategory_Notification",
+      "DataCategory_Source",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SqlMisc_NullString"
+    ],
+    "Strings.it.resx": [
+      "ADP_InvalidMultipartName",
+      "DataCategory_InfoMessage",
+      "DataCategory_Pooling",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId",
+      "SQL_ExErrorNumberStateClass",
+      "SqlMisc_NullString"
+    ],
+    "Strings.ja.resx": [
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId"
+    ],
+    "Strings.ko.resx": [
+      "ADP_InvalidMultipartName",
+      "DataCategory_InfoMessage",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId",
+      "SQL_ExErrorNumberStateClass",
+      "SqlMisc_NullString"
+    ],
+    "Strings.pl.resx": [
+      "DataCategory_InfoMessage",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId",
+      "SqlMisc_NullString"
+    ],
+    "Strings.pt-BR.resx": [
+      "ADP_InvalidMultipartName",
+      "DataCategory_InfoMessage",
+      "DataCategory_Pooling",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId",
+      "SQL_ExErrorNumberStateClass"
+    ],
+    "Strings.ru.resx": [
+      "ADP_InvalidMultipartName",
+      "DataCategory_InfoMessage",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId",
+      "SQL_ExOriginalClientConnectionId"
+    ],
+    "Strings.tr.resx": [
+      "ADP_InvalidMultipartName",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId",
+      "SqlMisc_NullString"
+    ],
+    "Strings.zh-Hans.resx": [
+      "DataCategory_InfoMessage",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId",
+      "SQL_ExErrorNumberStateClass",
+      "SqlMisc_NullString"
+    ],
+    "Strings.zh-Hant.resx": [
+      "DataCategory_InfoMessage",
+      "DataCategory_StatementCompleted",
+      "DataCategory_Xml",
+      "SQL_ExClientConnectionId",
+      "SQL_ExErrorNumberStateClass",
+      "SqlMisc_NullString"
+    ]
+  }
+}
diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index 75ea6ea303..7d42d279e7 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -26,9 +26,13 @@ Respect this graph when modifying build stages:
 5. `Microsoft.Data.SqlClient.Extensions.Azure` — depends on Abstractions + Logging
 6. `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` — depends on SqlClient + Abstractions + Logging
 
+## Localization Validation
+
+The SqlClient build job runs `steps/validate-localization-step.yml` before building the driver. Validation always fails the build for missing or obsolete keys, empty localized values whose English value is non-empty, and untranslated resources. Approved identical translations are listed by culture and resource key in `.config/LocalizationValidationAllowlist.json`.
+
 ## Build Stages
 
-Defined in `stages/build-stages.yml`. Four build stages plus validation, ordered by dependency:
+Defined in `stages/build-stages.yml`. Four build stages plus package validation are ordered by dependency:
 
 - **`build_independent`** (Stage 1) — Logging and SqlServer.Server in parallel; no inter-package dependencies
 - **`build_abstractions`** (Stage 2) — Abstractions; `dependsOn: build_independent`; downloads Logging artifact
diff --git a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
index 824776575d..6576627a6a 100644
--- a/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
+++ b/eng/pipelines/onebranch/jobs/build-buildproj-job.yml
@@ -137,6 +137,11 @@ jobs:
     steps:
       - template: /eng/pipelines/onebranch/steps/script-output-environment-variables-step.yml@self
 
+      # Localized resources ship with the SqlClient driver. Validate them before analysis and
+      # building so missing or untranslated strings fail every SqlClient build.
+      - ${{ if eq(parameters.packageShortName, 'SqlClient') }}:
+        - template: /eng/pipelines/onebranch/steps/validate-localization-step.yml@self
+
       - ${{ each package in parameters.dependencies }}:
           # Build the dependency version arguments passed to the build/pack/analysis steps.  The
           # SqlClient family shares a single version via Central Package Management, and those steps
diff --git a/eng/pipelines/onebranch/scripts/tests/README.md b/eng/pipelines/onebranch/scripts/tests/README.md
index b2ea3754c1..593c7768d6 100644
--- a/eng/pipelines/onebranch/scripts/tests/README.md
+++ b/eng/pipelines/onebranch/scripts/tests/README.md
@@ -32,6 +32,7 @@ Invoke-Pester ./publish-symbols.Tests.ps1 -Output Detailed
 | Area                  | What's tested                                                    |
 | --------------------- | ---------------------------------------------------------------- |
 | Version computation   | Canonical output parsing, effective package selection, target version composition, and failures |
+| Localization validation | Missing, obsolete, or empty strings, English-value matches, and culture-specific allowlisting |
 | Parameter validation  | Empty strings rejected for all mandatory parameters              |
 | URL construction      | Base URL, register URL, request URL built from parameters        |
 | Request bodies        | Registration body, default publish flags, flag overrides         |
diff --git a/eng/pipelines/onebranch/scripts/tests/validate-localization.Tests.ps1 b/eng/pipelines/onebranch/scripts/tests/validate-localization.Tests.ps1
new file mode 100644
index 0000000000..5f27b883d3
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/tests/validate-localization.Tests.ps1
@@ -0,0 +1,190 @@
+<#
+.SYNOPSIS
+    Pester tests for validate-localization.ps1.
+#>
+
+BeforeAll {
+    $scriptPath = Join-Path $PSScriptRoot '..' 'validate-localization.ps1'
+
+    function Set-ResourceFile {
+        param(
+            [Parameter(Mandatory)][string]$Path,
+            [Parameter(Mandatory)][hashtable]$Strings
+        )
+
+        $document = [System.Xml.XmlDocument]::new()
+        $root = $document.CreateElement('root')
+        $null = $document.AppendChild($root)
+        foreach ($entry in $Strings.GetEnumerator()) {
+            $data = $document.CreateElement('data')
+            $data.SetAttribute('name', $entry.Key)
+
+            $value = $document.CreateElement('value')
+            $value.InnerText = $entry.Value
+            $null = $data.AppendChild($value)
+            $null = $root.AppendChild($data)
+        }
+
+        $document.Save($Path)
+    }
+
+    function New-ResourcesDirectory {
+        $path = Join-Path $TestDrive ([guid]::NewGuid().ToString('n'))
+        New-Item -ItemType Directory -Path $path | Out-Null
+        return $path
+    }
+}
+
+Describe 'validate-localization.ps1' {
+    It 'accepts complete localized files with translated values' {
+        $resources = New-ResourcesDirectory
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello'; Farewell = 'Goodbye' }
+        Set-ResourceFile (Join-Path $resources 'Strings.fr.resx') @{ Greeting = 'Bonjour'; Farewell = 'Au revoir' }
+
+        { & $scriptPath -ResourcesDirectory $resources } | Should -Not -Throw
+    }
+
+    It 'fails when a localized file is missing an English key' {
+        $resources = New-ResourcesDirectory
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello'; Farewell = 'Goodbye' }
+        Set-ResourceFile (Join-Path $resources 'Strings.de.resx') @{ Greeting = 'Hallo' }
+
+        { & $scriptPath -ResourcesDirectory $resources } |
+            Should -Throw '*Localization validation failed with 1 error. Review the preceding errors.*'
+    }
+
+    It 'fails when a localized value matches a non-empty English value' {
+        $resources = New-ResourcesDirectory
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello'; Unused = '' }
+        Set-ResourceFile (Join-Path $resources 'Strings.ja.resx') @{ Greeting = 'Hello'; Unused = '' }
+
+        { & $scriptPath -ResourcesDirectory $resources } |
+            Should -Throw '*Localization validation failed with 1 error. Review the preceding errors.*'
+    }
+
+    It 'fails when no localized resource files exist' {
+        $resources = New-ResourcesDirectory
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello' }
+
+        { & $scriptPath -ResourcesDirectory $resources } |
+            Should -Throw '*No localized Strings.*.resx files were found*'
+    }
+
+    It 'fails when a non-empty English string has an empty localized value' {
+        $resources = New-ResourcesDirectory
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello' }
+        Set-ResourceFile (Join-Path $resources 'Strings.es.resx') @{ Greeting = ' ' }
+
+        { & $scriptPath -ResourcesDirectory $resources } |
+            Should -Throw '*Localization validation failed with 1 error. Review the preceding errors.*'
+    }
+
+    It 'accepts empty localized values when the English value is also empty' {
+        $resources = New-ResourcesDirectory
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Unused = '' }
+        Set-ResourceFile (Join-Path $resources 'Strings.ko.resx') @{ Unused = '' }
+
+        { & $scriptPath -ResourcesDirectory $resources } | Should -Not -Throw
+    }
+
+    It 'fails when a resource data element has no value' {
+        $resources = New-ResourcesDirectory
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello' }
+        Set-ResourceFile (Join-Path $resources 'Strings.fr.resx') @{ Greeting = 'Bonjour' }
+        [xml]$localized = Get-Content -LiteralPath (Join-Path $resources 'Strings.fr.resx')
+        $valueNode = $localized.SelectSingleNode('/root/data/value')
+        $null = $valueNode.ParentNode.RemoveChild($valueNode)
+        $localized.Save((Join-Path $resources 'Strings.fr.resx'))
+
+        { & $scriptPath -ResourcesDirectory $resources } |
+            Should -Throw '*contains a <data> element without a name or value*'
+    }
+
+    It 'accepts an approved English-value match from the allowlist' {
+        $resources = New-ResourcesDirectory
+        $allowlist = Join-Path $resources 'allowlist.json'
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello' }
+        Set-ResourceFile (Join-Path $resources 'Strings.fr.resx') @{ Greeting = 'Hello' }
+        @{ AllowedEnglishValueMatches = @{ 'Strings.fr.resx' = @('Greeting') } } |
+            ConvertTo-Json -Depth 5 |
+            Set-Content -LiteralPath $allowlist
+
+        { & $scriptPath -ResourcesDirectory $resources -AllowlistPath $allowlist } |
+            Should -Not -Throw
+    }
+
+    It 'does not allowlist a missing localized key' {
+        $resources = New-ResourcesDirectory
+        $allowlist = Join-Path $resources 'allowlist.json'
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello'; Farewell = 'Goodbye' }
+        Set-ResourceFile (Join-Path $resources 'Strings.fr.resx') @{ Greeting = 'Bonjour' }
+        @{ AllowedEnglishValueMatches = @{ 'Strings.fr.resx' = @('Farewell') } } |
+            ConvertTo-Json -Depth 5 |
+            Set-Content -LiteralPath $allowlist
+
+        { & $scriptPath -ResourcesDirectory $resources -AllowlistPath $allowlist } |
+            Should -Throw '*Localization validation failed with 1 error. Review the preceding errors.*'
+    }
+
+    It 'rejects allowlist for unknown resource keys' {
+        $resources = New-ResourcesDirectory
+        $allowlist = Join-Path $resources 'allowlist.json'
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello' }
+        Set-ResourceFile (Join-Path $resources 'Strings.fr.resx') @{ Greeting = 'Bonjour' }
+        @{ AllowedEnglishValueMatches = @{ 'Strings.fr.resx' = @('Unknown') } } |
+            ConvertTo-Json -Depth 5 |
+            Set-Content -LiteralPath $allowlist
+
+        { & $scriptPath -ResourcesDirectory $resources -AllowlistPath $allowlist } |
+            Should -Throw '*Localization validation failed with 1 error. Review the preceding errors.*'
+    }
+
+    It 'scopes approved English-value matches to one localized file' {
+        $resources = New-ResourcesDirectory
+        $allowlist = Join-Path $resources 'allowlist.json'
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello' }
+        Set-ResourceFile (Join-Path $resources 'Strings.de.resx') @{ Greeting = 'Hello' }
+        Set-ResourceFile (Join-Path $resources 'Strings.fr.resx') @{ Greeting = 'Hello' }
+        @{ AllowedEnglishValueMatches = @{ 'Strings.de.resx' = @('Greeting') } } |
+            ConvertTo-Json -Depth 5 |
+            Set-Content -LiteralPath $allowlist
+
+        { & $scriptPath -ResourcesDirectory $resources -AllowlistPath $allowlist } |
+            Should -Throw '*Localization validation failed with 1 error. Review the preceding errors.*'
+    }
+
+    It 'fails when a localized file contains a key absent from Strings.resx' {
+        $resources = New-ResourcesDirectory
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello' }
+        Set-ResourceFile (Join-Path $resources 'Strings.fr.resx') @{ Greeting = 'Bonjour'; Obsolete = 'Ancien' }
+
+        { & $scriptPath -ResourcesDirectory $resources } |
+            Should -Throw '*Localization validation failed with 1 error. Review the preceding errors.*'
+    }
+
+    It 'rejects an allowlist entry after the localized value is translated' {
+        $resources = New-ResourcesDirectory
+        $allowlist = Join-Path $resources 'allowlist.json'
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Greeting = 'Hello' }
+        Set-ResourceFile (Join-Path $resources 'Strings.fr.resx') @{ Greeting = 'Bonjour' }
+        @{ AllowedEnglishValueMatches = @{ 'Strings.fr.resx' = @('Greeting') } } |
+            ConvertTo-Json -Depth 5 |
+            Set-Content -LiteralPath $allowlist
+
+        { & $scriptPath -ResourcesDirectory $resources -AllowlistPath $allowlist } |
+            Should -Throw '*Localization validation failed with 1 error. Review the preceding errors.*'
+    }
+
+    It 'rejects allowlist entries for empty English values' {
+        $resources = New-ResourcesDirectory
+        $allowlist = Join-Path $resources 'allowlist.json'
+        Set-ResourceFile (Join-Path $resources 'Strings.resx') @{ Unused = '' }
+        Set-ResourceFile (Join-Path $resources 'Strings.fr.resx') @{ Unused = '' }
+        @{ AllowedEnglishValueMatches = @{ 'Strings.fr.resx' = @('Unused') } } |
+            ConvertTo-Json -Depth 5 |
+            Set-Content -LiteralPath $allowlist
+
+        { & $scriptPath -ResourcesDirectory $resources -AllowlistPath $allowlist } |
+            Should -Throw '*does not have a non-empty English value*'
+    }
+}
diff --git a/eng/pipelines/onebranch/scripts/validate-localization.ps1 b/eng/pipelines/onebranch/scripts/validate-localization.ps1
new file mode 100644
index 0000000000..1922c78c5b
--- /dev/null
+++ b/eng/pipelines/onebranch/scripts/validate-localization.ps1
@@ -0,0 +1,180 @@
+<#
+.SYNOPSIS
+    Validates localized Strings.*.resx files against Strings.resx.
+
+.PARAMETER ResourcesDirectory
+    Directory containing the English and localized Strings.resx files.
+
+.PARAMETER AllowlistPath
+    Optional JSON file containing approved English-value matches grouped by localized filename.
+#>
+
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the MIT license.
+# See the LICENSE file in the project root for more information.
+
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory)]
+    [ValidateNotNullOrEmpty()]
+    [string]$ResourcesDirectory,
+
+    [string]$AllowlistPath
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+function Get-ResourceStrings {
+    param([Parameter(Mandatory)][string]$Path)
+
+    $document = [System.Xml.Linq.XDocument]::Load($Path)
+    $strings = [System.Collections.Generic.Dictionary[string, string]]::new([System.StringComparer]::Ordinal)
+    foreach ($data in $document.Root.Elements('data')) {
+        $name = $data.Attribute('name')
+        $value = $data.Element('value')
+        if ($null -eq $name -or $null -eq $value) {
+            throw "Resource file '$Path' contains a <data> element without a name or value."
+        }
+
+        if ($strings.ContainsKey($name.Value)) {
+            throw "Resource file '$Path' contains duplicate key '$($name.Value)'."
+        }
+
+        $strings.Add($name.Value, $value.Value)
+    }
+
+    return $strings
+}
+
+# Discover the neutral English resource and every culture-specific resource. The English file is
+# the source of truth for the required key set and value-comparison checks below.
+$resourcesPath = (Resolve-Path -LiteralPath $ResourcesDirectory).Path
+$englishPath = Join-Path $resourcesPath 'Strings.resx'
+if (-not (Test-Path -LiteralPath $englishPath -PathType Leaf)) {
+    throw "English resource file '$englishPath' was not found."
+}
+
+$localizedFiles = @(Get-ChildItem -LiteralPath $resourcesPath -Filter 'Strings.*.resx' -File | Sort-Object Name)
+if ($localizedFiles.Count -eq 0) {
+    throw "No localized Strings.*.resx files were found in '$resourcesPath'."
+}
+
+$englishStrings = Get-ResourceStrings -Path $englishPath
+$localizedFilesByName = [System.Collections.Generic.Dictionary[string, System.IO.FileInfo]]::new([System.StringComparer]::Ordinal)
+foreach ($localizedFile in $localizedFiles) {
+    $localizedFilesByName.Add($localizedFile.Name, $localizedFile)
+}
+
+# Load culture/key-specific exceptions for translations intentionally identical to English. The
+# configuration is validated against the current resources so stale filenames and keys fail the
+# build instead of silently weakening future validation.
+$failures = [System.Collections.Generic.List[string]]::new()
+$allowedEnglishMatches = [System.Collections.Generic.Dictionary[string, System.Collections.Generic.HashSet[string]]]::new([System.StringComparer]::Ordinal)
+if (-not [string]::IsNullOrWhiteSpace($AllowlistPath)) {
+    if (-not (Test-Path -LiteralPath $AllowlistPath -PathType Leaf)) {
+        throw "Localization allowlist file '$AllowlistPath' was not found."
+    }
+
+    $configuration = Get-Content -LiteralPath $AllowlistPath -Raw | ConvertFrom-Json
+    $englishValueMatchesProperty = $configuration.PSObject.Properties['AllowedEnglishValueMatches']
+    if ($null -eq $englishValueMatchesProperty) {
+        throw "Localization allowlist file '$AllowlistPath' must define 'AllowedEnglishValueMatches'."
+    }
+
+    foreach ($fileProperty in $englishValueMatchesProperty.Value.PSObject.Properties) {
+        if (-not $localizedFilesByName.ContainsKey($fileProperty.Name)) {
+            $failures.Add("Localization allowlist file references unknown resource file '$($fileProperty.Name)'.")
+            continue
+        }
+
+        $keys = [System.Collections.Generic.HashSet[string]]::new([System.StringComparer]::Ordinal)
+        foreach ($key in @($fileProperty.Value)) {
+            if ([string]::IsNullOrWhiteSpace($key)) {
+                throw "Localization allowlist file contains an empty resource key for '$($fileProperty.Name)'."
+            }
+            if (-not $englishStrings.ContainsKey($key)) {
+                $failures.Add("Localization allowlist file references unknown resource key '$key' for '$($fileProperty.Name)'.")
+                continue
+            }
+            if ([string]::IsNullOrEmpty($englishStrings[$key])) {
+                throw "Localization allowlist key '$key' for '$($fileProperty.Name)' does not have a non-empty English value."
+            }
+            if (-not $keys.Add($key)) {
+                throw "Localization allowlist file contains duplicate key '$key' for '$($fileProperty.Name)'."
+            }
+        }
+        $allowedEnglishMatches.Add($fileProperty.Name, $keys)
+    }
+}
+
+$allowedMatchCount = 0
+foreach ($localizedFile in $localizedFiles) {
+    $localizedStrings = Get-ResourceStrings -Path $localizedFile.FullName
+
+    # Validate the key sets in both directions, then compare every non-empty English value with
+    # its localized value. Empty neutral values may remain empty because they contain no text to
+    # translate.
+    $missingOrEmptyKeys = [System.Collections.Generic.List[string]]::new()
+    $localizedOnlyKeys = [System.Collections.Generic.List[string]]::new()
+    $englishMatches = [System.Collections.Generic.List[string]]::new()
+    $staleAllowlistKeys = [System.Collections.Generic.List[string]]::new()
+
+    foreach ($localizedKey in $localizedStrings.Keys) {
+        if (-not $englishStrings.ContainsKey($localizedKey)) {
+            $localizedOnlyKeys.Add($localizedKey)
+        }
+    }
+
+    foreach ($entry in $englishStrings.GetEnumerator()) {
+        if (-not $localizedStrings.ContainsKey($entry.Key) -or
+            (-not [string]::IsNullOrEmpty($entry.Value) -and
+                [string]::IsNullOrWhiteSpace($localizedStrings[$entry.Key]))) {
+            $missingOrEmptyKeys.Add($entry.Key)
+        }
+        elseif (-not [string]::IsNullOrEmpty($entry.Value) -and
+            [System.StringComparer]::Ordinal.Equals($entry.Value, $localizedStrings[$entry.Key])) {
+            if ($allowedEnglishMatches.ContainsKey($localizedFile.Name) -and
+                $allowedEnglishMatches[$localizedFile.Name].Contains($entry.Key)) {
+                $allowedMatchCount++
+            }
+            else {
+                $englishMatches.Add($entry.Key)
+            }
+        }
+        # An allowlist entry must be removed after its localized value changes; otherwise a future
+        # regression to the English value could be hidden by an obsolete exception.
+        elseif ($allowedEnglishMatches.ContainsKey($localizedFile.Name) -and
+            $allowedEnglishMatches[$localizedFile.Name].Contains($entry.Key)) {
+            $staleAllowlistKeys.Add($entry.Key)
+        }
+    }
+
+    if ($missingOrEmptyKeys.Count -gt 0) {
+        $missingOrEmptyKeys.Sort([System.StringComparer]::Ordinal)
+        $failures.Add("$($localizedFile.Name): missing keys or empty values: $($missingOrEmptyKeys -join ', ')")
+    }
+    if ($localizedOnlyKeys.Count -gt 0) {
+        $localizedOnlyKeys.Sort([System.StringComparer]::Ordinal)
+        $failures.Add("$($localizedFile.Name): keys not found in Strings.resx: $($localizedOnlyKeys -join ', ')")
+    }
+    if ($englishMatches.Count -gt 0) {
+        $englishMatches.Sort([System.StringComparer]::Ordinal)
+        $failures.Add("$($localizedFile.Name): untranslated values match Strings.resx: $($englishMatches -join ', ')")
+    }
+    if ($staleAllowlistKeys.Count -gt 0) {
+        $staleAllowlistKeys.Sort([System.StringComparer]::Ordinal)
+        $failures.Add("$($localizedFile.Name): allowlist entries no longer match Strings.resx: $($staleAllowlistKeys -join ', ')")
+    }
+}
+
+if ($failures.Count -gt 0) {
+    foreach ($failure in $failures) {
+        Write-Host "##vso[task.logissue type=error]$failure"
+    }
+    $errorNoun = if ($failures.Count -eq 1) { 'error' } else { 'errors' }
+    throw "Localization validation failed with $($failures.Count) $errorNoun. Review the preceding errors."
+}
+
+$fileNoun = if ($localizedFiles.Count -eq 1) { 'file' } else { 'files' }
+Write-Host "Localization validation passed for $($localizedFiles.Count) localized $fileNoun. Resource keys checked: $($englishStrings.Count); approved English-value matches allowlisted: $allowedMatchCount."
diff --git a/eng/pipelines/onebranch/steps/validate-localization-step.yml b/eng/pipelines/onebranch/steps/validate-localization-step.yml
new file mode 100644
index 0000000000..8cb590f6d0
--- /dev/null
+++ b/eng/pipelines/onebranch/steps/validate-localization-step.yml
@@ -0,0 +1,16 @@
+#################################################################################
+# Licensed to the .NET Foundation under one or more agreements.                 #
+# The .NET Foundation licenses this file to you under the MIT license.          #
+# See the LICENSE file in the project root for more information.                #
+#################################################################################
+
+steps:
+  - task: PowerShell@2
+    displayName: 'Validate localized resources'
+    inputs:
+      targetType: filePath
+      pwsh: true
+      filePath: $(Build.SourcesDirectory)/eng/pipelines/onebranch/scripts/validate-localization.ps1
+      arguments: >-
+        -ResourcesDirectory "$(Build.SourcesDirectory)/src/Microsoft.Data.SqlClient/src/Resources"
+        -AllowlistPath "$(Build.SourcesDirectory)/.config/LocalizationValidationAllowlist.json"

From 5579c13a990b712e58ac678ed14da2ce17295bd2 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 10 Sep 2026 13:10:30 -0300
Subject: [PATCH 290/298] Capture real diagnostics and retry the SQL Server
 container on macOS CI (#4667)

---
 .../steps/configure-sql-server-macos-step.yml | 172 ++++++++++++------
 .../steps/publish-test-results-step.yml       |  15 +-
 2 files changed, 130 insertions(+), 57 deletions(-)

diff --git a/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml b/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
index 772433ba3a..0ffeb4f2ab 100644
--- a/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
+++ b/eng/pipelines/common/templates/steps/configure-sql-server-macos-step.yml
@@ -141,84 +141,143 @@ steps:
       # Password for the SA user (required)
       MSSQL_SA_PW="${{ parameters.saPassword }}"
 
-      # Start the container and fail fast (with diagnostics) if it does not launch,
-      # rather than silently falling through to the connection-wait loop.
-      if ! docker run --platform linux/amd64 -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$MSSQL_SA_PW" -p 1433:1433 -p 1434:1434 --name sql1 --hostname sql1 -d mcr.microsoft.com/mssql/server:2025-latest; then
-        echo "ERROR: Failed to start the sql1 container."
-        docker ps -a --filter "name=^/sql1$"
-        exit 1
-      fi
+      # Collect everything needed to diagnose a container that crashed or never
+      # became ready.
+      #
+      # The mssql dump collector (paldumper) writes hundreds of
+      # "find: '/proc/N/...': Permission denied" lines to the container's stderr
+      # whenever sqlservr faults.  That noise used to fill the entire captured
+      # window and hide the actual SQL Server error, so it is filtered out here
+      # and both the head and the tail of the log are printed.
+      dumpSqlDiagnostics()
+      {
+        set +x
+
+        echo "--- Container status ---"
+        docker ps -a --filter "name=^/sql1$" || true
 
-      sleep 10
+        echo "--- Container state ---"
+        docker inspect sql1 --format 'ExitCode={{.State.ExitCode}} OOMKilled={{.State.OOMKilled}} Error="{{.State.Error}}" StartedAt={{.State.StartedAt}} FinishedAt={{.State.FinishedAt}}' || true
 
-      docker ps -a
+        echo "--- SQL Server errorlog (last 80 lines) ---"
+        # docker cp works against a stopped container, so this survives a crash.
+        if docker cp sql1:/var/opt/mssql/log/errorlog "$SQL_ERRORLOG" 2>/dev/null; then
+          tail -80 "$SQL_ERRORLOG"
+        else
+          echo "(errorlog not available)"
+        fi
 
-      # Connect to the SQL Server container and get its version.
-      #
-      # With Rosetta 2 emulation, SQL Server starts much faster than under full
-      # QEMU emulation, but it can still take a minute or two.  We allow up to
-      # 6 minutes (72 attempts × 5 seconds) as a generous upper bound.
+        echo "--- Container logs, dump-collector noise filtered (first 60 lines) ---"
+        docker logs sql1 2>&1 | grep -vE "^(find|dmesg|timeout): " | head -60 || true
+        echo "--- Container logs, dump-collector noise filtered (last 40 lines) ---"
+        docker logs sql1 2>&1 | grep -vE "^(find|dmesg|timeout): " | tail -40 || true
 
-      # Wait 5 seconds between attempts.
-      delay=5
+        echo "--- sqlcmd errors ---"
+        cat "$SQLCMD_ERRORS" 2>/dev/null || echo "(none)"
 
-      # Try up to 72 times (~6 minutes) to connect.
-      maxAttempts=72
+        echo "--- Host capacity ---"
+        echo "hw.ncpu=$(sysctl -n hw.ncpu 2>/dev/null) hw.memsize=$(sysctl -n hw.memsize 2>/dev/null)"
+        vm_stat || true
 
-      # Attempt counter.
-      attempt=1
+        echo "--- Guest capacity ---"
+        colima ssh -- free -m || true
 
-      # Flag to indicate when SQL Server is ready to accept connections.
-      ready=0
+        set -x
+      }
 
-      while [ $attempt -le $maxAttempts ]
+      SQL_ERRORLOG=$(Agent.TempDirectory)/mssql_errorlog
+
+      # Start SQL Server, retrying the whole container lifecycle.  sqlservr
+      # intermittently core dumps within a minute or two of starting on these
+      # agents (the container goes to "Exited (1)" while the readiness loop is
+      # still polling), which previously failed the entire step on the first
+      # occurrence.  Colima startup and the image pull already retry; the
+      # container did not.
+      runAttempts=3
+      sqlReady=0
+
+      for ((r=1; r<=runAttempts; r++))
       do
+        echo "Starting SQL Server container (attempt #$r of $runAttempts)..."
+
+        # Clear any container and sqlcmd output left behind by a prior attempt.
+        docker rm -f sql1 >/dev/null 2>&1 || true
+        : > "$SQLCMD_ERRORS"
+
+        if ! docker run --platform linux/amd64 -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$MSSQL_SA_PW" -p 1433:1433 -p 1434:1434 --name sql1 --hostname sql1 -d mcr.microsoft.com/mssql/server:2025-latest; then
+          echo "ERROR: Failed to start the sql1 container (attempt #$r of $runAttempts)."
+          dumpSqlDiagnostics
+          continue
+        fi
+
+        sleep 10
+
+        docker ps -a
 
-        echo "Waiting for SQL Server to start (attempt #$attempt of $maxAttempts)..."
+        # Connect to the SQL Server container and get its version.
+        #
+        # With Rosetta 2 emulation, SQL Server starts much faster than under full
+        # QEMU emulation, but it can still take a minute or two.  We allow up to
+        # 6 minutes (72 attempts × 5 seconds) as a generous upper bound.
 
-        # -C trusts the self-signed certificate inside the container.
-        sqlcmd -S 127.0.0.1 -No -C -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" >> $SQLCMD_ERRORS 2>&1
+        # Wait 5 seconds between attempts.
+        delay=5
 
-        # If the command was successful, then the SQL Server is ready.
-        if [ $? -eq 0 ]; then
-          ready=1
+        # Try up to 72 times (~6 minutes) to connect.
+        maxAttempts=72
+
+        # Attempt counter.
+        attempt=1
+
+        # Set when the container died before SQL Server accepted connections.
+        crashed=0
+
+        while [ $attempt -le $maxAttempts ]
+        do
+
+          echo "Waiting for SQL Server to start (attempt #$attempt of $maxAttempts)..."
+
+          # -C trusts the self-signed certificate inside the container.
+          if sqlcmd -S 127.0.0.1 -No -C -U sa -P "$MSSQL_SA_PW" -Q "SELECT @@VERSION" >> "$SQLCMD_ERRORS" 2>&1; then
+            sqlReady=1
+            break
+          fi
+
+          # Verify the container is still running; no point retrying if it crashed.
+          if ! docker ps --filter "name=^/sql1$" --filter "status=running" --format '{{.Names}}' | grep -Fxq 'sql1'; then
+            echo "ERROR: sql1 container is no longer running (attempt #$r of $runAttempts)."
+            crashed=1
+            break
+          fi
+
+          # Increment the attempt counter.
+          ((attempt++))
+
+          # Wait before trying again.
+          sleep $delay
+
+        done
+
+        if [ $sqlReady -eq 1 ]; then
           break
         fi
 
-        # Verify the container is still running; no point retrying if it crashed.
-        if ! docker ps --filter "name=^/sql1$" --filter "status=running" --format '{{.Names}}' | grep -Fxq 'sql1'; then
-          echo "ERROR: sql1 container is no longer running."
-          docker ps -a --filter "name=^/sql1$"
-          echo "--- Container logs ---"
-          docker logs sql1 2>&1 | tail -50
-          rm -f $SQLCMD_ERRORS
-          exit 1
+        if [ $crashed -ne 1 ]; then
+          echo "ERROR: Cannot connect to SQL Server after $maxAttempts attempts (attempt #$r of $runAttempts)."
         fi
 
-        # Increment the attempt counter.
-        ((attempt++))
-
-        # Wait before trying again.
-        sleep $delay
-
+        dumpSqlDiagnostics
       done
 
       # Is the SQL Server ready?
-      if [ $ready -eq 0 ]
+      if [ $sqlReady -ne 1 ]
       then
-        # No, so report the error(s) and exit.
-        echo "Cannot connect to SQL Server after $maxAttempts attempts; installation aborted."
-        echo "--- sqlcmd errors ---"
-        cat $SQLCMD_ERRORS
-        echo "--- Container status ---"
-        docker ps -a --filter "name=^/sql1$"
-        echo "--- Container logs (last 80 lines) ---"
-        docker logs sql1 2>&1 | tail -80
-        rm -f $SQLCMD_ERRORS
+        echo "ERROR: SQL Server did not become ready after $runAttempts container attempts; installation aborted."
+        rm -f "$SQLCMD_ERRORS" "$SQL_ERRORLOG"
         exit 1
       fi
 
-      rm -f $SQLCMD_ERRORS
+      rm -f "$SQLCMD_ERRORS" "$SQL_ERRORLOG"
 
       echo "Use sqlcmd to show which IP addresses are being listened on..."
       echo 0.0.0.0
@@ -247,5 +306,6 @@ steps:
     # boot fails here instead of consuming the whole test job.  Measured worst
     # case is ~24 minutes: Colima boot ~6, the SQL image pull ~10 (7 of which is
     # extraction inside the VM), and up to 6 more waiting for SQL to accept
-    # connections.
-    timeoutInMinutes: 40
+    # connections.  The container is now started up to 3 times, so the readiness
+    # wait can cost 18 minutes rather than 6 in the pathological case.
+    timeoutInMinutes: 55
diff --git a/eng/pipelines/common/templates/steps/publish-test-results-step.yml b/eng/pipelines/common/templates/steps/publish-test-results-step.yml
index 9cb356aa45..8e06e9dece 100644
--- a/eng/pipelines/common/templates/steps/publish-test-results-step.yml
+++ b/eng/pipelines/common/templates/steps/publish-test-results-step.yml
@@ -59,9 +59,22 @@ steps:
       Get-ChildItem -Filter "*.coverage" -Recurse
     displayName: '[Debug] List test result coverage files'
 
+# When an earlier step fails (e.g. SQL Server setup), no TestResults directory is
+# produced and PublishPipelineArtifact fails with "Path does not exist", adding a
+# second error that buries the real one.  Gate the publish on the directory
+# actually existing.
+- pwsh: |
+    $exists = Test-Path -Path 'TestResults' -PathType Container
+    if (-not $exists) {
+      Write-Host 'No TestResults directory was produced; skipping test artifact publish.'
+    }
+    Write-Host "##vso[task.setvariable variable=HasTestResults]$($exists.ToString().ToLowerInvariant())"
+  displayName: 'Check for test results'
+  condition: succeededOrFailed()
+
 - task: PublishPipelineArtifact@1
   displayName: 'Publish Test Artifacts'
   inputs:
     targetPath: TestResults
     artifact: '${{parameters.targetFramework }}WinAz$(System.JobId)'
-  condition: succeededOrFailed()
+  condition: and(succeededOrFailed(), eq(variables['HasTestResults'], 'true'))

From f2310e93f14c2589718551339b7fc7c33a72ca66 Mon Sep 17 00:00:00 2001
From: Benjamin Russell <russellben@microsoft.com>
Date: Thu, 10 Sep 2026 18:09:28 -0500
Subject: [PATCH 291/298] Hotfix Release Notes (#4672)

* Release notes for v6.1.7

* Release notes for v7.0.3
---
 CHANGELOG.md                                  |  59 +++++++++
 release-notes/6.1/6.1.7.md                    | 103 ++++++++++++++++
 release-notes/6.1/README.md                   |   1 +
 release-notes/7.0/7.0.3.md                    | 115 ++++++++++++++++++
 release-notes/7.0/README.md                   |   1 +
 .../Extensions/Abstractions/7.0/7.0.3.md      |  17 +++
 .../Extensions/Abstractions/7.0/README.md     |   1 +
 release-notes/Extensions/Azure/7.0/7.0.3.md   |  39 ++++++
 release-notes/Extensions/Azure/7.0/README.md  |   1 +
 release-notes/Internal/Logging/7.0/7.0.3.md   |  20 +++
 release-notes/Internal/Logging/7.0/README.md  |   1 +
 .../AzureKeyVaultProvider/7.0/7.0.3.md        |  21 ++++
 .../AzureKeyVaultProvider/7.0/README.md       |   1 +
 13 files changed, 380 insertions(+)
 create mode 100644 release-notes/6.1/6.1.7.md
 create mode 100644 release-notes/7.0/7.0.3.md
 create mode 100644 release-notes/Extensions/Abstractions/7.0/7.0.3.md
 create mode 100644 release-notes/Extensions/Azure/7.0/7.0.3.md
 create mode 100644 release-notes/Internal/Logging/7.0/7.0.3.md
 create mode 100644 release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.3.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd60021553..3901428151 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,65 @@ 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 7.0.3] - 2026-09-10
+
+### Changed
+
+- Updated the `Microsoft.Data.SqlClient.SNI` and `Microsoft.Data.SqlClient.SNI.runtime` dependencies to 6.0.3 (was 6.0.2).
+  ([#4599](https://github.com/dotnet/SqlClient/pull/4599))
+
+### Fixed
+
+- Fixed a `SqlBulkCopy` regression in environments where the application login cannot read `sys.all_columns`. Bulk copy now falls back to the earlier column-discovery behavior when that permission is unavailable. Support for hidden columns and SQL Graph column aliases still requires access to the metadata view.
+  ([#4370](https://github.com/dotnet/SqlClient/issues/4370), [#4306](https://github.com/dotnet/SqlClient/pull/4306), [#4402](https://github.com/dotnet/SqlClient/pull/4402))
+
+- Fixed a memory-allocation regression in connection and command operations caused by formatting diagnostic strings even when tracing was disabled. Also corrected trace messages that reported an incorrect object ID or could throw `FormatException` when traced values contained braces.
+  ([#4528](https://github.com/dotnet/SqlClient/pull/4528), [#4533](https://github.com/dotnet/SqlClient/pull/4533))
+
+- Fixed `ServerCertificate` validation on the managed SNI path so the configured certificate is compared against the server certificate even when the server certificate passes chain and host-name validation. When certificate validation is enabled, a missing, unreadable, or invalid certificate file, a certificate mismatch, or a missing server certificate now causes the TLS handshake to fail instead of bypassing the configured certificate check. (net8.0/net9.0 only)
+  ([#4445](https://github.com/dotnet/SqlClient/pull/4445), [#4583](https://github.com/dotnet/SqlClient/pull/4583))
+
+- Fixed Always Encrypted VSM/HGS enclave attestation to verify that the enclave public key used to establish a session matches the key committed to by the signed attestation report. Missing, malformed, or mismatched key-binding data now causes attestation to fail before the session secret is derived.
+  ([#4532](https://github.com/dotnet/SqlClient/pull/4532), [#4553](https://github.com/dotnet/SqlClient/pull/4553))
+
+- Fixed `SqlConnection.AccessTokenCallback` not disabling Transparent Network IP Resolution by default, making it consistent with `SqlConnection.AccessToken`. An explicitly configured `TransparentNetworkIPResolution` connection-string value still takes precedence. (net462 only)
+  ([#4520](https://github.com/dotnet/SqlClient/pull/4520), [#4561](https://github.com/dotnet/SqlClient/pull/4561))
+
+- Fixed authentication state handling so clearing `SqlConnection.AccessToken`, `AccessTokenCallback`, or `SspiContextProvider` preserves the other authentication values in the connection pool key. Cloning a connection or updating its credential also preserves its `SspiContextProvider`. Combining a non-null `SspiContextProvider` with `AccessToken` or `AccessTokenCallback` now throws `InvalidOperationException` instead of silently discarding authentication state; applications must use one authentication mechanism at a time.
+  ([#4520](https://github.com/dotnet/SqlClient/pull/4520), [#4561](https://github.com/dotnet/SqlClient/pull/4561), [#4644](https://github.com/dotnet/SqlClient/pull/4644))
+
+- Fixed configurable retry logic installing a permanent, process-wide assembly-resolution handler that could interfere with unrelated assembly loading. The handler is now active only while an explicitly configured custom retry provider is resolved and constructed, and probes `AppContext.BaseDirectory` instead of the current working directory. Place custom retry assemblies in the application base directory; dependencies loaded after provider construction must be resolvable through normal application dependency resolution or an application-provided handler. (net8.0/net9.0 only)
+  ([#2214](https://github.com/dotnet/SqlClient/issues/2214), [#4547](https://github.com/dotnet/SqlClient/pull/4547), [#4663](https://github.com/dotnet/SqlClient/pull/4663))
+
+### Companion packages
+
+- Released `Microsoft.Data.SqlClient.Extensions.Azure` 7.0.3 with the Entra ID authority parsing fix for Dataverse/Dynamics 365 connections. See [release notes](release-notes/Extensions/Azure/7.0/7.0.3.md).
+- Released version-aligned `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`, `Microsoft.Data.SqlClient.Extensions.Abstractions`, and `Microsoft.Data.SqlClient.Internal.Logging` 7.0.3 with no functional or API changes. See the [Azure Key Vault provider](release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.3.md), [Abstractions](release-notes/Extensions/Abstractions/7.0/7.0.3.md), and [Logging](release-notes/Internal/Logging/7.0/7.0.3.md) release notes.
+
+## [Stable Release 6.1.7] - 2026-09-10
+
+### Changed
+
+- Updated the `Microsoft.Data.SqlClient.SNI` and `Microsoft.Data.SqlClient.SNI.runtime` dependencies to 6.0.3 (was 6.0.2).
+  ([#4598](https://github.com/dotnet/SqlClient/pull/4598))
+
+### Fixed
+
+- Fixed `ServerCertificate` validation on the managed SNI path so the configured certificate is compared against the server certificate even when the server certificate passes chain and host-name validation. When certificate validation is enabled, a missing, unreadable, or invalid certificate file, a certificate mismatch, or a missing server certificate now causes the TLS handshake to fail instead of bypassing the configured certificate check. (net8.0/net9.0 only)
+  ([#4445](https://github.com/dotnet/SqlClient/pull/4445), [#4584](https://github.com/dotnet/SqlClient/pull/4584))
+
+- Fixed Always Encrypted VSM/HGS enclave attestation to verify that the enclave public key used to establish a session matches the key committed to by the signed attestation report. Missing, malformed, or mismatched key-binding data now causes attestation to fail before the session secret is derived.
+  ([#4532](https://github.com/dotnet/SqlClient/pull/4532), [#4552](https://github.com/dotnet/SqlClient/pull/4552))
+
+- Fixed `SqlConnection.AccessTokenCallback` not disabling Transparent Network IP Resolution by default, making it consistent with `SqlConnection.AccessToken`. An explicitly configured `TransparentNetworkIPResolution` connection-string value still takes precedence. (net462 only)
+  ([#4520](https://github.com/dotnet/SqlClient/pull/4520), [#4560](https://github.com/dotnet/SqlClient/pull/4560))
+
+- Fixed token authentication state handling so clearing `SqlConnection.AccessToken` preserves an existing `AccessTokenCallback` in the connection pool key, and clearing `AccessTokenCallback` preserves an existing `AccessToken`. Callback-based authentication now also follows the same prelogin server-certificate validation rules as an explicitly supplied access token.
+  ([#4520](https://github.com/dotnet/SqlClient/pull/4520), [#4560](https://github.com/dotnet/SqlClient/pull/4560))
+
+- Fixed configurable retry logic installing a permanent, process-wide assembly-resolution handler that could interfere with unrelated assembly loading. The handler is now active only while an explicitly configured custom retry provider is resolved and constructed, and probes `AppContext.BaseDirectory` instead of the current working directory. Place custom retry assemblies in the application base directory; dependencies loaded after provider construction must be resolvable through normal application dependency resolution or an application-provided handler. (net8.0/net9.0 only)
+  ([#2214](https://github.com/dotnet/SqlClient/issues/2214), [#4547](https://github.com/dotnet/SqlClient/pull/4547), [#4664](https://github.com/dotnet/SqlClient/pull/4664))
+
 ## [Preview Release 7.1.0-preview3] - 2026-08-26
 
 This update brings the following changes since the [7.1.0-preview2](release-notes/7.1/7.1.0-preview2.md) release.
diff --git a/release-notes/6.1/6.1.7.md b/release-notes/6.1/6.1.7.md
new file mode 100644
index 0000000000..6c46dc8b19
--- /dev/null
+++ b/release-notes/6.1/6.1.7.md
@@ -0,0 +1,103 @@
+# Release Notes
+
+## Stable Release 6.1.7 - 2026-09-10
+
+This update brings the following changes since the [6.1.6](6.1.6.md) release:
+
+### Changed
+
+- Updated the `Microsoft.Data.SqlClient.SNI` and `Microsoft.Data.SqlClient.SNI.runtime` dependencies to 6.0.3 (was 6.0.2).
+  ([#4598](https://github.com/dotnet/SqlClient/pull/4598))
+
+### Fixed
+
+- Fixed `ServerCertificate` validation on the managed SNI path so the configured certificate is compared against the server certificate even when the server certificate passes chain and host-name validation. When certificate validation is enabled, a missing, unreadable, or invalid certificate file, a certificate mismatch, or a missing server certificate now causes the TLS handshake to fail instead of bypassing the configured certificate check. (net8.0/net9.0 only)
+  ([#4445](https://github.com/dotnet/SqlClient/pull/4445), [#4584](https://github.com/dotnet/SqlClient/pull/4584))
+
+- Fixed Always Encrypted VSM/HGS enclave attestation to verify that the enclave public key used to establish a session matches the key committed to by the signed attestation report. Missing, malformed, or mismatched key-binding data now causes attestation to fail before the session secret is derived.
+  ([#4532](https://github.com/dotnet/SqlClient/pull/4532), [#4552](https://github.com/dotnet/SqlClient/pull/4552))
+
+- Fixed `SqlConnection.AccessTokenCallback` not disabling Transparent Network IP Resolution by default, making it consistent with `SqlConnection.AccessToken`. An explicitly configured `TransparentNetworkIPResolution` connection-string value still takes precedence. (net462 only)
+  ([#4520](https://github.com/dotnet/SqlClient/pull/4520), [#4560](https://github.com/dotnet/SqlClient/pull/4560))
+
+- Fixed token authentication state handling so clearing `SqlConnection.AccessToken` preserves an existing `AccessTokenCallback` in the connection pool key, and clearing `AccessTokenCallback` preserves an existing `AccessToken`. Callback-based authentication now also follows the same prelogin server-certificate validation rules as an explicitly supplied access token.
+  ([#4520](https://github.com/dotnet/SqlClient/pull/4520), [#4560](https://github.com/dotnet/SqlClient/pull/4560))
+
+- Fixed configurable retry logic installing a permanent, process-wide assembly-resolution handler that could interfere with unrelated assembly loading. The handler is now active only while an explicitly configured custom retry provider is resolved and constructed, and probes `AppContext.BaseDirectory` instead of the current working directory. Place custom retry assemblies in the application base directory; dependencies loaded after provider construction must be resolvable through normal application dependency resolution or an application-provided handler. (net8.0/net9.0 only)
+  ([#2214](https://github.com/dotnet/SqlClient/issues/2214), [#4547](https://github.com/dotnet/SqlClient/pull/4547), [#4664](https://github.com/dotnet/SqlClient/pull/4664))
+
+## Target Platform Support
+
+- .NET Framework 4.6.2+ (Windows x86, Windows x64, Windows ARM64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM64, Linux, macOS)
+- .NET Standard 2.0+ (Windows x86, Windows x64, Windows ARM64, Linux, macOS)
+
+### Dependencies
+
+#### .NET Framework 4.6.2
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI 6.0.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- System.Buffers 4.6.1
+- System.Data.Common 4.3.0
+- System.Diagnostics.DiagnosticSource 8.0.1
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Memory 4.6.3
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 8.0.6
+- System.Text.RegularExpressions 4.3.1
+
+#### .NET 8.0
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Diagnostics.DiagnosticSource 8.0.1
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Security.Cryptography.Pkcs 8.0.1
+
+#### .NET 9.0
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.3
+- Microsoft.Extensions.Caching.Memory 9.0.11
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.11
+- System.Diagnostics.DiagnosticSource 9.0.11
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Security.Cryptography.Pkcs 9.0.11
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.50.0
+- Azure.Identity 1.17.1
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+- Microsoft.IdentityModel.JsonWebTokens 7.7.1
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 7.7.1
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Diagnostics.DiagnosticSource 8.0.1
+- System.IdentityModel.Tokens.Jwt 7.7.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 8.0.6
diff --git a/release-notes/6.1/README.md b/release-notes/6.1/README.md
index e119d5baf1..b0e4a4be80 100644
--- a/release-notes/6.1/README.md
+++ b/release-notes/6.1/README.md
@@ -4,6 +4,7 @@ The following Microsoft.Data.SqlClient 6.1 stable releases have been shipped:
 
 | Release Date | Version | Notes |
 | :-- | :-- | :--: |
+| 2026-09-10 | 6.1.7 | [Release Notes](6.1.7.md) |
 | 2026-06-24 | 6.1.6 | [Release Notes](6.1.6.md) |
 | 2026-04-27 | 6.1.5 | [Release Notes](6.1.5.md) |
 | 2026-01-15 | 6.1.4 | [Release Notes](6.1.4.md) |
diff --git a/release-notes/7.0/7.0.3.md b/release-notes/7.0/7.0.3.md
new file mode 100644
index 0000000000..01dfdc6c03
--- /dev/null
+++ b/release-notes/7.0/7.0.3.md
@@ -0,0 +1,115 @@
+# Release Notes
+
+## Stable Release 7.0.3 - 2026-09-10
+
+This update brings the following changes since the [7.0.2](7.0.2.md) release:
+
+The core driver and its companion packages ship together as version `7.0.3`. Update the companion packages you use alongside the driver to `7.0.3`. Assembly versions remain `7.0.0.0`, unchanged from `7.0.2`.
+
+### Companion package release notes
+
+- [Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider 7.0.3](../add-ons/AzureKeyVaultProvider/7.0/7.0.3.md)
+- [Microsoft.Data.SqlClient.Extensions.Azure 7.0.3](../Extensions/Azure/7.0/7.0.3.md) — includes the Entra ID authority parsing fix for Dataverse/Dynamics 365 connections.
+- [Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.3](../Extensions/Abstractions/7.0/7.0.3.md)
+- [Microsoft.Data.SqlClient.Internal.Logging 7.0.3](../Internal/Logging/7.0/7.0.3.md)
+
+### Changed
+
+- Updated the `Microsoft.Data.SqlClient.SNI` and `Microsoft.Data.SqlClient.SNI.runtime` dependencies to 6.0.3 (was 6.0.2).
+  ([#4599](https://github.com/dotnet/SqlClient/pull/4599))
+
+### Fixed
+
+- Fixed a `SqlBulkCopy` regression in environments where the application login cannot read `sys.all_columns`. Bulk copy now falls back to the earlier column-discovery behavior when that permission is unavailable. Support for hidden columns and SQL Graph column aliases still requires access to the metadata view.
+  ([#4370](https://github.com/dotnet/SqlClient/issues/4370), [#4306](https://github.com/dotnet/SqlClient/pull/4306), [#4402](https://github.com/dotnet/SqlClient/pull/4402))
+
+- Fixed a memory-allocation regression in connection and command operations caused by formatting diagnostic strings even when tracing was disabled. Also corrected trace messages that reported an incorrect object ID or could throw `FormatException` when traced values contained braces.
+  ([#4528](https://github.com/dotnet/SqlClient/pull/4528), [#4533](https://github.com/dotnet/SqlClient/pull/4533))
+
+- Fixed `ServerCertificate` validation on the managed SNI path so the configured certificate is compared against the server certificate even when the server certificate passes chain and host-name validation. When certificate validation is enabled, a missing, unreadable, or invalid certificate file, a certificate mismatch, or a missing server certificate now causes the TLS handshake to fail instead of bypassing the configured certificate check. (net8.0/net9.0 only)
+  ([#4445](https://github.com/dotnet/SqlClient/pull/4445), [#4583](https://github.com/dotnet/SqlClient/pull/4583))
+
+- Fixed Always Encrypted VSM/HGS enclave attestation to verify that the enclave public key used to establish a session matches the key committed to by the signed attestation report. Missing, malformed, or mismatched key-binding data now causes attestation to fail before the session secret is derived.
+  ([#4532](https://github.com/dotnet/SqlClient/pull/4532), [#4553](https://github.com/dotnet/SqlClient/pull/4553))
+
+- Fixed `SqlConnection.AccessTokenCallback` not disabling Transparent Network IP Resolution by default, making it consistent with `SqlConnection.AccessToken`. An explicitly configured `TransparentNetworkIPResolution` connection-string value still takes precedence. (net462 only)
+  ([#4520](https://github.com/dotnet/SqlClient/pull/4520), [#4561](https://github.com/dotnet/SqlClient/pull/4561))
+
+- Fixed authentication state handling so clearing `SqlConnection.AccessToken`, `AccessTokenCallback`, or `SspiContextProvider` preserves the other authentication values in the connection pool key. Cloning a connection or updating its credential also preserves its `SspiContextProvider`. Combining a non-null `SspiContextProvider` with `AccessToken` or `AccessTokenCallback` now throws `InvalidOperationException` instead of silently discarding authentication state; applications must use one authentication mechanism at a time.
+  ([#4520](https://github.com/dotnet/SqlClient/pull/4520), [#4561](https://github.com/dotnet/SqlClient/pull/4561), [#4644](https://github.com/dotnet/SqlClient/pull/4644))
+
+- Fixed configurable retry logic installing a permanent, process-wide assembly-resolution handler that could interfere with unrelated assembly loading. The handler is now active only while an explicitly configured custom retry provider is resolved and constructed, and probes `AppContext.BaseDirectory` instead of the current working directory. Place custom retry assemblies in the application base directory; dependencies loaded after provider construction must be resolvable through normal application dependency resolution or an application-provided handler. (net8.0/net9.0 only)
+  ([#2214](https://github.com/dotnet/SqlClient/issues/2214), [#4547](https://github.com/dotnet/SqlClient/pull/4547), [#4663](https://github.com/dotnet/SqlClient/pull/4663))
+
+## Contributors
+
+We thank the following public contributors. Their efforts toward this project are very much appreciated.
+
+- [edwardneal](https://github.com/edwardneal)
+
+## Target Platform Support
+
+- .NET Framework 4.6.2+ (Windows x86, Windows x64, Windows ARM64)
+- .NET 8.0+ (Windows x86, Windows x64, Windows ARM, Windows ARM64, Linux, macOS)
+
+### Dependencies
+
+#### .NET 9.0
+
+- Microsoft.Bcl.Cryptography 9.0.13
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.3
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.3
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.3
+- Microsoft.Extensions.Caching.Memory 9.0.13
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 9.0.13
+- System.Security.Cryptography.Pkcs 9.0.13
+
+#### .NET 8.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.3
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.3
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+
+#### .NET Standard 2.0
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.3
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.3
+- Microsoft.Data.SqlClient.SNI.runtime 6.0.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- Microsoft.SqlServer.Server 1.0.0
+- System.Configuration.ConfigurationManager 8.0.1
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+
+#### .NET Framework 4.6.2+
+
+- Microsoft.Bcl.Cryptography 8.0.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.3
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.3
+- Microsoft.Data.SqlClient.SNI 6.0.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.IdentityModel.JsonWebTokens 8.16.0
+- Microsoft.IdentityModel.Protocols.OpenIdConnect 8.16.0
+- System.Buffers 4.6.1
+- System.Data.Common 4.3.0
+- System.Diagnostics.DiagnosticSource 10.0.3
+- System.Memory 4.6.3
+- System.Runtime.InteropServices.RuntimeInformation 4.3.0
+- System.Security.Cryptography.Pkcs 8.0.1
+- System.Text.Json 10.0.3
+- System.Threading.Channels 10.0.3
+- System.ValueTuple 4.6.2
diff --git a/release-notes/7.0/README.md b/release-notes/7.0/README.md
index aad84057e1..3057122559 100644
--- a/release-notes/7.0/README.md
+++ b/release-notes/7.0/README.md
@@ -4,6 +4,7 @@ The following Microsoft.Data.SqlClient 7.0 releases have been shipped:
 
 | Release Date | Version | Notes |
 | :-- | :-- | :--: |
+| 2026-09-10 | 7.0.3 | [Release Notes](7.0.3.md) |
 | 2026-06-24 | 7.0.2 | [Release Notes](7.0.2.md) |
 | 2026-04-23 | 7.0.1 | [Release Notes](7.0.1.md) |
 | 2026-03-17 | 7.0.0 | [Release Notes](7.0.0.md) |
diff --git a/release-notes/Extensions/Abstractions/7.0/7.0.3.md b/release-notes/Extensions/Abstractions/7.0/7.0.3.md
new file mode 100644
index 0000000000..6676a750aa
--- /dev/null
+++ b/release-notes/Extensions/Abstractions/7.0/7.0.3.md
@@ -0,0 +1,17 @@
+# Release Notes
+
+## Stable Release 7.0.3 - 2026-09-10
+
+This release version-aligns `Microsoft.Data.SqlClient.Extensions.Abstractions` with the core [Microsoft.Data.SqlClient 7.0.3](../../../7.0/7.0.3.md) driver. The previous release of this package was [7.0.2](7.0.2.md).
+
+There are no functional or API changes in this release. Its `AssemblyVersion` remains `7.0.0.0`, unchanged from `7.0.2`.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.3
diff --git a/release-notes/Extensions/Abstractions/7.0/README.md b/release-notes/Extensions/Abstractions/7.0/README.md
index 24f9eff90a..37fc312f2e 100644
--- a/release-notes/Extensions/Abstractions/7.0/README.md
+++ b/release-notes/Extensions/Abstractions/7.0/README.md
@@ -7,4 +7,5 @@ The following `Microsoft.Data.SqlClient.Extensions.Abstractions`
 
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
+| 2026-09-10 | 7.0.3 | [Release Notes](7.0.3.md) |
 | 2026-06-24 | 7.0.2 | [Release Notes](7.0.2.md) |
diff --git a/release-notes/Extensions/Azure/7.0/7.0.3.md b/release-notes/Extensions/Azure/7.0/7.0.3.md
new file mode 100644
index 0000000000..436930ac89
--- /dev/null
+++ b/release-notes/Extensions/Azure/7.0/7.0.3.md
@@ -0,0 +1,39 @@
+# Release Notes
+
+## Stable Release 7.0.3 - 2026-09-10
+
+This update brings the following changes since the [7.0.2](7.0.2.md) release of `Microsoft.Data.SqlClient.Extensions.Azure`.
+
+This package ships version-aligned with the core [Microsoft.Data.SqlClient 7.0.3](../../../7.0/7.0.3.md) driver. Its `AssemblyVersion` remains `7.0.0.0`, unchanged from `7.0.2`.
+
+### Fixed
+
+- Fixed Entra ID authentication failures when the server supplies an authority URL with an OAuth endpoint suffix, such as `https://login.microsoftonline.com/<tenant>/oauth2/authorize`. The provider now extracts the tenant from the first path segment and normalizes the authority used by Azure.Identity and MSAL, restoring authentication to Dataverse/Dynamics 365 TDS endpoints, including `Active Directory Service Principal` authentication. Malformed authority URLs now produce a clear authentication error. Bare tenant authority URLs used by Azure SQL and Fabric retain their existing behavior.
+  ([#4496](https://github.com/dotnet/SqlClient/issues/4496), [#4521](https://github.com/dotnet/SqlClient/pull/4521), [#4572](https://github.com/dotnet/SqlClient/pull/4572), [#4641](https://github.com/dotnet/SqlClient/pull/4641))
+
+## Target Platform Support
+
+- .NET Standard 2.0
+- .NET Framework 4.6.2+
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.51.1
+- Azure.Identity 1.18.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.3
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
+
+#### .NET Framework 4.6.2+
+
+- Azure.Core 1.51.1
+- Azure.Identity 1.18.0
+- Microsoft.Data.SqlClient.Extensions.Abstractions 7.0.3
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
+- Microsoft.Identity.Client 4.84.2
+- Microsoft.Identity.Client.Broker 4.84.2
diff --git a/release-notes/Extensions/Azure/7.0/README.md b/release-notes/Extensions/Azure/7.0/README.md
index 93b90c690d..b462b02a57 100644
--- a/release-notes/Extensions/Azure/7.0/README.md
+++ b/release-notes/Extensions/Azure/7.0/README.md
@@ -7,4 +7,5 @@ The following `Microsoft.Data.SqlClient.Extensions.Azure`
 
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
+| 2026-09-10 | 7.0.3 | [Release Notes](7.0.3.md) |
 | 2026-06-24 | 7.0.2 | [Release Notes](7.0.2.md) |
diff --git a/release-notes/Internal/Logging/7.0/7.0.3.md b/release-notes/Internal/Logging/7.0/7.0.3.md
new file mode 100644
index 0000000000..57dfbd1610
--- /dev/null
+++ b/release-notes/Internal/Logging/7.0/7.0.3.md
@@ -0,0 +1,20 @@
+# Release Notes
+
+## Stable Release 7.0.3 - 2026-09-10
+
+> **Note:** This package is for internal use by other Microsoft.Data.SqlClient packages only
+> and should not be referenced directly by application code.
+
+This release version-aligns `Microsoft.Data.SqlClient.Internal.Logging` with the core [Microsoft.Data.SqlClient 7.0.3](../../../7.0/7.0.3.md) driver. The previous release of this package was [7.0.2](7.0.2.md).
+
+There are no functional or API changes in this release. Its `AssemblyVersion` remains `7.0.0.0`, unchanged from `7.0.2`.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- None
diff --git a/release-notes/Internal/Logging/7.0/README.md b/release-notes/Internal/Logging/7.0/README.md
index 403c61db07..c4a5c3253b 100644
--- a/release-notes/Internal/Logging/7.0/README.md
+++ b/release-notes/Internal/Logging/7.0/README.md
@@ -10,4 +10,5 @@ The following `Microsoft.Data.SqlClient.Internal.Logging`
 
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
+| 2026-09-10 | 7.0.3 | [Release Notes](7.0.3.md) |
 | 2026-06-24 | 7.0.2 | [Release Notes](7.0.2.md) |
diff --git a/release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.3.md b/release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.3.md
new file mode 100644
index 0000000000..1864b0ce42
--- /dev/null
+++ b/release-notes/add-ons/AzureKeyVaultProvider/7.0/7.0.3.md
@@ -0,0 +1,21 @@
+# Release Notes
+
+## Stable Release 7.0.3 - 2026-09-10
+
+This release version-aligns `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider` with the core [Microsoft.Data.SqlClient 7.0.3](../../../7.0/7.0.3.md) driver. The previous release of this package was [7.0.2](7.0.2.md).
+
+There are no functional or API changes in this release. Its `AssemblyVersion` remains `7.0.0.0`, unchanged from `7.0.2`.
+
+## Target Platform Support
+
+- .NET Standard 2.0
+
+### Dependencies
+
+#### .NET Standard 2.0
+
+- Azure.Core 1.51.1
+- Azure.Security.KeyVault.Keys 4.9.0
+- Microsoft.Data.SqlClient 7.0.3
+- Microsoft.Data.SqlClient.Internal.Logging 7.0.3
+- Microsoft.Extensions.Caching.Memory 8.0.1
diff --git a/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md b/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md
index a51fe94635..febedc433b 100644
--- a/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md
+++ b/release-notes/add-ons/AzureKeyVaultProvider/7.0/README.md
@@ -5,6 +5,7 @@ The following `Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider`
 
 | Release Date | Description | Notes |
 | :-- | :-- | :--: |
+| 2026-09-10 | 7.0.3 | [Release Notes](7.0.3.md) |
 | 2026-06-24 | 7.0.2 | [Release Notes](7.0.2.md) |
 | 2026-03-17 | 7.0.0 | [Release Notes](7.0.0.md) |
 | 2026-03-05 | 7.0.0-preview1.26064.3 | [Release Notes](7.0.0-preview1.md) |

From e16e33ed9308efc7e6a21a1a9b376ccc44141532 Mon Sep 17 00:00:00 2001
From: Mahdigln <139457032+Mahdigln@users.noreply.github.com>
Date: Tue, 15 Sep 2026 02:04:59 +0330
Subject: [PATCH 292/298] Fix | GetSchema("DataTypes") does not report json
 type on Azure SQL (#4592) (#4682)

---
 .../SqlClient/SqlMetaDataFactory.DataTypes.cs |  8 +-
 .../Data/SqlClient/SqlMetaDataFactory.cs      |  4 +-
 .../SqlMetaDataFactoryDataTypesTest.cs        | 86 +++++++++++++++++++
 3 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlMetaDataFactoryDataTypesTest.cs

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.DataTypes.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.DataTypes.cs
index eba61969c3..55b3363261 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.DataTypes.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.DataTypes.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Data.SqlClient;
 
 internal sealed partial class SqlMetaDataFactory
 {
-    private static void LoadDataTypesDataTables(DataSet metaDataCollectionsDataSet)
+    private static void LoadDataTypesDataTables(DataSet metaDataCollectionsDataSet, bool jsonTypeSupported)
     {
         DataTable dataTypesDataTable = CreateDataTypesDataTable();
 
@@ -58,8 +58,10 @@ private static void LoadDataTypesDataTables(DataSet metaDataCollectionsDataSet)
             minimumVersion: "10.00.000.0");
 
         AddLongStringOrBinaryType(SqlDbType.Xml);
-        AddLongStringOrBinaryType(SqlDbTypeExtensions.Json, literalPrefix: "'", literalSuffix: "'",
-            minimumVersion: "17.00.000.0");
+        if (jsonTypeSupported)
+        {
+            AddLongStringOrBinaryType(SqlDbTypeExtensions.Json, literalPrefix: "'", literalSuffix: "'");
+        }
         AddLongStringOrBinaryType(SqlDbType.Text, literalPrefix: "'", literalSuffix: "'");
         AddLongStringOrBinaryType(SqlDbType.NText, literalPrefix: "N'", literalSuffix: "'");
         AddLongStringOrBinaryType(SqlDbType.Image, literalPrefix: "0x");
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
index bea2fa7e41..83eb6d857a 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlMetaDataFactory.cs
@@ -39,6 +39,7 @@ internal sealed partial class SqlMetaDataFactory : IDisposable
 
         private readonly DataSet _collectionDataSet;
         private readonly string _serverVersion;
+        private readonly bool _jsonTypeSupported;
 
         public SqlMetaDataFactory(Stream xmlStream, ConnectionCapabilities connectionCapabilities)
         {
@@ -47,6 +48,7 @@ public SqlMetaDataFactory(Stream xmlStream, ConnectionCapabilities connectionCap
             ADP.CheckArgumentNull(connectionCapabilities.ServerVersion, nameof(connectionCapabilities.ServerVersion));
 
             _serverVersion = connectionCapabilities.ServerVersion;
+            _jsonTypeSupported = connectionCapabilities.JsonType;
 
             _collectionDataSet = LoadDataSetFromXml(xmlStream);
         }
@@ -711,7 +713,7 @@ private DataSet LoadDataSetFromXml(Stream XmlStream)
                 Locale = CultureInfo.InvariantCulture
             };
 
-            LoadDataTypesDataTables(metaDataCollectionsDataSet);
+            LoadDataTypesDataTables(metaDataCollectionsDataSet, _jsonTypeSupported);
 
             XmlReaderSettings settings = new()
             {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlMetaDataFactoryDataTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlMetaDataFactoryDataTypesTest.cs
new file mode 100644
index 0000000000..4a0742e17d
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlMetaDataFactoryDataTypesTest.cs
@@ -0,0 +1,86 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Data;
+using System.Data.Common;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests;
+
+/// <summary>
+/// Tests that <see cref="SqlMetaDataFactory"/> correctly reports the <c>json</c> data type
+/// in the <c>DataTypes</c> schema collection based on <see cref="ConnectionCapabilities.JsonType"/>.
+/// </summary>
+public sealed class SqlMetaDataFactoryDataTypesTest
+{
+    private static Stream GetMetaDataXmlStream()
+    {
+        Assembly assembly = typeof(SqlConnection).Assembly;
+        Stream? stream = assembly.GetManifestResourceStream("Microsoft.Data.SqlClient.SqlMetaData.xml");
+        Assert.NotNull(stream);
+        return stream;
+    }
+
+    private static SqlMetaDataFactory CreateFactory(bool jsonTypeSupported)
+    {
+        Stream stream = GetMetaDataXmlStream();
+        ConnectionCapabilities capabilities = new()
+        {
+            TdsVersion = TdsEnums.TDS7X_VERSION,
+            ServerMajorVersion = 12,
+            ServerMinorVersion = 0,
+            ServerBuildNumber = 0,
+            JsonType = jsonTypeSupported
+        };
+        return new SqlMetaDataFactory(stream, capabilities);
+    }
+
+    private static bool DataTypesContainsJson(SqlMetaDataFactory factory)
+    {
+        FieldInfo? field = typeof(SqlMetaDataFactory)
+            .GetField("_collectionDataSet", BindingFlags.NonPublic | BindingFlags.Instance);
+        Assert.NotNull(field);
+
+        DataSet? dataSet = (DataSet?)field.GetValue(factory);
+        Assert.NotNull(dataSet);
+
+        DataTable? dataTypes = dataSet.Tables[DbMetaDataCollectionNames.DataTypes];
+        Assert.NotNull(dataTypes);
+
+        DataColumn? typeNameColumn = dataTypes.Columns[DbMetaDataColumnNames.TypeName];
+        Assert.NotNull(typeNameColumn);
+
+        return dataTypes.Rows
+            .Cast<DataRow>()
+            .Any(row => (string)row[typeNameColumn] == "json");
+    }
+
+    /// <summary>
+    /// Verifies that <c>json</c> appears in the DataTypes schema collection when
+    /// <see cref="ConnectionCapabilities.JsonType"/> is <see langword="true"/>.
+    /// </summary>
+    [Fact]
+    public void DataTypesTable_ContainsJson_WhenJsonTypeSupported()
+    {
+        using SqlMetaDataFactory factory = CreateFactory(jsonTypeSupported: true);
+
+        Assert.True(DataTypesContainsJson(factory));
+    }
+
+    /// <summary>
+    /// Verifies that <c>json</c> does not appear in the DataTypes schema collection when
+    /// <see cref="ConnectionCapabilities.JsonType"/> is <see langword="false"/>, covering
+    /// Azure SQL which always reports version 12.x regardless of json support.
+    /// </summary>
+    [Fact]
+    public void DataTypesTable_DoesNotContainJson_WhenJsonTypeNotSupported()
+    {
+        using SqlMetaDataFactory factory = CreateFactory(jsonTypeSupported: false);
+
+        Assert.False(DataTypesContainsJson(factory));
+    }
+}

From b67bede9545a69d53e7bd31bd35c733865290522 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 14 Sep 2026 22:03:41 -0700
Subject: [PATCH 293/298] Bump .NET SDK to 10.0.401 (#4686)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 global.json                            | 4 ++--
 tools/PackageCompatibility/global.json | 2 +-
 tools/PackageValidator/global.json     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/global.json b/global.json
index 650a5c0ddf..340837b5af 100644
--- a/global.json
+++ b/global.json
@@ -2,9 +2,9 @@
   "sdk":
   {
     // We currently require the .NET 10 SDK to build and test the project.
-    "version": "10.0.300",
+    "version": "10.0.401",
 
-    // Allow roll-forward within the 10.0.3xx feature band so servicing patches
+    // Allow roll-forward within the 10.0.4xx feature band so servicing patches
     // are picked up automatically without requiring a PR for each bump.
     "rollForward": "patch",
 
diff --git a/tools/PackageCompatibility/global.json b/tools/PackageCompatibility/global.json
index af3f080d1f..78c9dbe651 100644
--- a/tools/PackageCompatibility/global.json
+++ b/tools/PackageCompatibility/global.json
@@ -8,7 +8,7 @@
     // global.json lookup stops at the nearest file and does not merge with the repo-root file.
     // This subtree therefore needs to repeat the root SDK settings so commands run from
     // tools/PackageCompatibility keep using the same SDK behavior.
-    "version": "10.0.300",
+    "version": "10.0.401",
     "rollForward": "patch",
     "allowPrerelease": false
   }
diff --git a/tools/PackageValidator/global.json b/tools/PackageValidator/global.json
index a4b67c1ed4..bbf9d2a793 100644
--- a/tools/PackageValidator/global.json
+++ b/tools/PackageValidator/global.json
@@ -8,7 +8,7 @@
     // global.json lookup stops at the nearest file and does not merge with the repo-root file.
     // This subtree therefore needs to repeat the root SDK settings so commands run from
     // tools/PackageValidator keep using the same SDK behavior.
-    "version": "10.0.300",
+    "version": "10.0.401",
     "rollForward": "patch",
     "allowPrerelease": false
   }

From 8387aebd726ef59951127638bdbe2e277a546bca Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Mon, 14 Sep 2026 22:08:43 -0700
Subject: [PATCH 294/298] Move roadmap references to the GitHub wiki (#4681)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 CONTRIBUTING.md |  4 +--
 README.md       |  3 +-
 roadmap.md      | 92 -------------------------------------------------
 3 files changed, 4 insertions(+), 95 deletions(-)
 delete mode 100644 roadmap.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 13ee1ef83b..df139c5482 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -132,7 +132,7 @@ Security issues and bugs should be reported privately, via email, to the Microso
 ## Submitting Pull Requests
 
 - **New features from community PRs must be driven by creating a GitHub issue first.** Discuss the proposal in the issue before starting implementation. This helps avoid wasted effort and ensures alignment with project goals.
-- **Community contributions must not derail the project roadmap.** We prioritize features and fixes according to our published milestones. PRs that conflict with or distract from active roadmap items may be deferred.
+- **Community contributions must align with project priorities.** We prioritize features and fixes according to our [published milestones](https://github.com/dotnet/SqlClient/milestones). PRs that conflict with or distract from active work may be deferred.
 - **Our maintainers reserve the right to reject PRs** that do not meet the required criteria to qualify for review. This includes PRs that:
   - Lack a corresponding approved issue (i.e., an issue that has been reviewed, acknowledged, and agreed upon by maintainers — typically indicated by the **`PM Approved`** field being set to **`Approved`** in the GitHub Project board)
   - Introduce breaking changes without prior discussion
@@ -171,7 +171,7 @@ Some important caveats:
 
 ## Contribution Standards
 
-Project maintainers will merge changes that improve the product significantly and broadly and that align with the [Microsoft.Data.SqlClient roadmap](roadmap.md).
+Project maintainers will merge changes that improve the product significantly and broadly and that align with the [Microsoft.Data.SqlClient roadmap](https://github.com/dotnet/SqlClient/wiki/Roadmap).
 
 ### Requirements
 
diff --git a/README.md b/README.md
index 07374c727b..bf77802f15 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,9 @@ When targeting .NET on Windows, a package reference to [Microsoft.Data.SqlClient
 | Coding Style | [coding-style.md](/policy/coding-style.md) |
 | Contributing | [CONTRIBUTING.md](CONTRIBUTING.md) |
 | Copyright Information | [COPYRIGHT.md](COPYRIGHT.md) |
-| Roadmap | [roadmap.md](roadmap.md) |
+| Release Milestones | [GitHub milestones](https://github.com/dotnet/SqlClient/milestones) |
 | Review Process | [review-process.md](/policy/review-process.md) |
+| Roadmap | [SqlClient roadmap](https://github.com/dotnet/SqlClient/wiki/Roadmap) |
 | Support Policy | [SUPPORT.md](SUPPORT.md) |
 
 ## Our Featured Contributors
diff --git a/roadmap.md b/roadmap.md
deleted file mode 100644
index e41d19dc79..0000000000
--- a/roadmap.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Microsoft.Data.SqlClient Roadmap
-
-The Microsoft.Data.SqlClient roadmap communicates project priorities for evolving and extending the scope of the product. We encourage the community to work with us to improve the SqlClient driver for these scenarios and extend it for others.
-
-> **Last updated:** May 2026
->
-> This roadmap is a living document. Priorities and timelines may shift based on community feedback, engineering constraints, and business needs. We update this page regularly to reflect the current state of development.
-
----
-
-## Release Milestones
-
-For active release milestones, their target dates, and the changes included, see [SqlClient milestones](https://github.com/dotnet/SqlClient/milestones).
-
----
-
-## Current Focus Areas
-
-Our team is actively working on the following high-level themes. Features are tracked via [GitHub issues](https://github.com/dotnet/SqlClient/issues) where applicable — see the linked milestones for associated issue details.
-
-- **Active** — Currently in development
-- **Planned** — Committed for a future milestone with estimated delivery
-- **Backlog** — On our radar for future months, not yet scheduled
-
-### Performance & Reliability
-
-| Work Item(s) | Feature | Status | ETA |
-| ------------ | ------- | ------ | --- |
-| [#3356](https://github.com/dotnet/SqlClient/issues/3356) | Connection pool performance improvements | Active | July 2026 |
-| N/A | Performance benchmarking suite | Active | July 2026 |
-| [#422](https://github.com/dotnet/SqlClient/issues/422) | Phase 1 - Unix async performance — thread starvation in parallel `ExecuteReaderAsync` | Active | September 2026 |
-| TBD | Phase 2 - Async usage analysis and optimization | Planned | — |
-
-### New Data Type Support
-
-| Work Item(s) | Feature | Status | ETA |
-| ------------ | ------- | ------ | --- |
-| TBD | Vector subtype support — `float16` (`Half`) | Active | August 2026 |
-
-### Observability & Diagnostics
-
-| Work Item(s) | Feature | Status | ETA |
-| ------------ | ------- | ------ | --- |
-| [#2210](https://github.com/dotnet/SqlClient/issues/2210) [#2211](https://github.com/dotnet/SqlClient/issues/2211) | OpenTelemetry support | Planned | — |
-| N/A | Logging improvements | Planned | — |
-| TBD | Integrate with / expose MSAL logging | Planned | — |
-
-### API Improvements
-
-| Work Item(s) | Feature | Status | ETA |
-| ------------ | ------- | ------ | --- |
-| [#2353](https://github.com/dotnet/SqlClient/issues/2353) | Expose connection encryption information to clients | Planned | September 2026 |
-| [#26](https://github.com/dotnet/SqlClient/issues/26) | Throw `TaskCanceledException` instead of `SqlException` for cancellations | Planned | September 2026 |
-| [#113](https://github.com/dotnet/SqlClient/issues/113) | `BeginTransactionAsync` API on `SqlConnection` | Planned | — |
-
-### Security & Architecture
-
-| Feature | Status | ETA |
-| ------- | ------ | --- |
-| Security hardening activities | Active | Ongoing internally |
-
-### AI & Developer Tooling
-
-| Feature | Status | ETA |
-| ------- | ------ | --- |
-| `System.Data.SqlClient` → `Microsoft.Data.SqlClient` migration via Modernize with Copilot | Active | September 2026 |
-| Modernize SqlClient repository with AI | Active | Ongoing |
-
-### Engineering & Infrastructure
-
-| Feature | Status | ETA |
-| ------- | ------ | --- |
-| CI/CD pipeline redesign | Active | August 2026 |
-| Add SQL Server 2025 to test matrix | Planned | August 2026 |
-| Add .NET 10 to test matrix | Planned | August 2026 |
-| Converting existing traditional pipelines to YAML | Active | August 2026 |
-| Performance benchmarking pipeline (Internal) | Planned | September 2026 |
-
----
-
-## Released Versions
-
-- [Release Notes](release-notes/README.md) — Detailed release notes summarizing all changes and features released.
-- [GitHub Releases](https://github.com/dotnet/SqlClient/releases) — NuGet packages and changelog notes for each release.
-
----
-
-## Community Contributions & Feedback
-
-For information on how to contribute, see [CONTRIBUTING.md](CONTRIBUTING.md). For details on the PR tracking workflow, see [contributing-workflow.md](contributing-workflow.md).
-
-The best way to give feedback is to create issues in the [dotnet/SqlClient](https://github.com/dotnet/SqlClient) repo.

From 92f220956b07328054701a869f452cade51830c1 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Tue, 15 Sep 2026 06:02:58 -0700
Subject: [PATCH 295/298] Add application identity to USERAGENT payload (V2)
 (#4632)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../RegisteredApplication.xml                 | 147 +++++++++++++
 .../SqlConnection.xml                         |  50 +++++
 .../Microsoft.Data.SqlClient.csproj           |   7 +
 .../ref/Microsoft.Data.SqlClient.cs           |  37 ++++
 .../Connection/SqlConnectionInternal.cs       |  11 +-
 .../Data/SqlClient/RegisteredApplication.cs   |  41 ++++
 .../SqlClient/SqlClientDriverProperties.cs    |  75 +++++++
 .../Microsoft/Data/SqlClient/SqlConnection.cs |  29 +++
 .../Data/SqlClient/SqlConnectionFactory.cs    |   6 +-
 .../src/Microsoft/Data/SqlClient/TdsParser.cs |  13 +-
 .../Data/SqlClient/TdsParserHelperClasses.cs  |   1 +
 .../src/Microsoft/Data/SqlClient/UserAgent.cs | 150 ++++++++++++--
 .../SQL/SqlCommand/SqlCommandCancelTest.cs    |   8 +-
 .../SqlConnectionConcurrentOpenTests.cs       |  19 ++
 .../UnitTests/RegisteredApplicationTests.cs   | 161 +++++++++++++++
 .../SimulatedServerTests/ConnectionTests.cs   |  59 +++++-
 .../RegisteredApplicationPoolTests.cs         | 135 ++++++++++++
 .../tests/UnitTests/UserAgentTests.cs         | 193 +++++++++++++++---
 18 files changed, 1081 insertions(+), 61 deletions(-)
 create mode 100644 doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/RegisteredApplication.cs
 create mode 100644 src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientDriverProperties.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/RegisteredApplicationTests.cs
 create mode 100644 src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/RegisteredApplicationPoolTests.cs

diff --git a/doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml b/doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml
new file mode 100644
index 0000000000..58dc683dcb
--- /dev/null
+++ b/doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml
@@ -0,0 +1,147 @@
+<docs>
+  <members name="RegisteredApplication">
+    <RegisteredApplication>
+      <summary>
+        Specifies the known application identifiers that Microsoft.Data.SqlClient reports for user agent telemetry.
+      </summary>
+      <remarks>
+        <para>
+          Production applications that meet the bar are welcome to reserve an identifier here.
+        </para>
+        <para>
+          Identifier reservations are as follows:
+        </para>
+        <list type="bullet">
+          <item>
+            <description>0x0001-0x7FFF: Microsoft-defined large-scale applications.</description>
+          </item>
+          <item>
+            <description>0x8000-0xBFFF: Reserved for small-scale use.</description>
+          </item>
+          <item>
+            <description>0xC000-0xFFFF: Public and developer use.</description>
+          </item>
+        </list>
+        <para>
+          An unregistered identifier may still be reported by casting a value to this type.
+        </para>
+      </remarks>
+    </RegisteredApplication>
+    <Unknown>
+      <summary>
+        No application identity is reported. This is the default.
+      </summary>
+      <value>
+        0
+      </value>
+    </Unknown>
+    <EntityFrameworkCore>
+      <summary>
+        The Microsoft Entity Framework Core SQL Server provider.
+      </summary>
+      <value>
+        1
+      </value>
+    </EntityFrameworkCore>
+    <SemanticKernel>
+      <summary>
+        Microsoft Semantic Kernel.
+      </summary>
+      <value>
+        2
+      </value>
+    </SemanticKernel>
+    <ManagementStudio>
+      <summary>
+        Microsoft SQL Server Management Studio.
+      </summary>
+      <value>
+        3
+      </value>
+    </ManagementStudio>
+    <SqlManagementObjects>
+      <summary>
+        Microsoft SQL Server Management Objects.
+      </summary>
+      <value>
+        4
+      </value>
+    </SqlManagementObjects>
+    <DataTierApplicationFramework>
+      <summary>
+        Microsoft SQL Server Data-Tier Application Framework.
+      </summary>
+      <value>
+        5
+      </value>
+    </DataTierApplicationFramework>
+    <SqlToolsService>
+      <summary>
+        Microsoft SQL Tools Service.
+      </summary>
+      <value>
+        6
+      </value>
+    </SqlToolsService>
+    <AspNetCoreDistributedSqlServerCache>
+      <summary>
+        Microsoft ASP.NET Core distributed SQL Server cache.
+      </summary>
+      <value>
+        7
+      </value>
+    </AspNetCoreDistributedSqlServerCache>
+    <EntityFramework>
+      <summary>
+        Microsoft Entity Framework 6 SQL Server provider.
+      </summary>
+      <value>
+        8
+      </value>
+    </EntityFramework>
+    <AzureFunctionsSqlExtension>
+      <summary>
+        Microsoft Azure Functions SQL extension.
+      </summary>
+      <value>
+        9
+      </value>
+    </AzureFunctionsSqlExtension>
+    <OrleansAdoNet>
+      <summary>
+        Microsoft Orleans ADO.NET providers.
+      </summary>
+      <value>
+        10
+      </value>
+    </OrleansAdoNet>
+    <DurableTaskSqlServer>
+      <summary>
+        Microsoft Durable Task SQL Server provider.
+      </summary>
+      <value>
+        11
+      </value>
+    </DurableTaskSqlServer>
+    <SqlPackage>
+      <summary>
+        The <c>sqlpackage</c> command-line tool.
+      </summary>
+      <value>
+        12
+      </value>
+      <remarks>
+        <c>sqlpackage</c> is built on the Data-Tier Application Framework, but reports its own identifier so that
+        command-line use can be told apart from other callers of that framework.
+      </remarks>
+    </SqlPackage>
+    <DataApiBuilder>
+      <summary>
+        Microsoft Data API builder.
+      </summary>
+      <value>
+        13
+      </value>
+    </DataApiBuilder>
+  </members>
+</docs>
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
index 2db0e08549..7a9af8b6b4 100644
--- a/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
+++ b/doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@@ -2295,6 +2295,56 @@ The following sample tries to open a connection to an invalid database to simula
         </para>
       </remarks>
     </System.ICloneable.Clone>
+    <RegisteredApplication>
+      <summary>
+        Gets or sets the middleware application identity reported to the server for this connection.
+      </summary>
+      <value>
+        A <see cref="T:Microsoft.Data.SqlClient.RegisteredApplication" /> value. The default is
+        <see cref="F:Microsoft.Data.SqlClient.RegisteredApplication.Unknown" />.
+      </value>
+      <example>
+        <para>
+          Set the identity before opening the connection:
+        </para>
+        <code language="c#">
+          using Microsoft.Data.SqlClient;
+
+          using SqlConnection connection = new(connectionString)
+          {
+              RegisteredApplication = RegisteredApplication.EntityFrameworkCore
+          };
+          connection.Open();
+        </code>
+      </example>
+      <exception cref="T:System.InvalidOperationException">
+        The connection is opening or open. The identity is reported during login, so it must be set beforehand.
+      </exception>
+      <remarks>
+        <para>
+          This API is intended for registered applications that reserve an identifier in
+          <see cref="T:Microsoft.Data.SqlClient.RegisteredApplication" />. An unregistered identifier may be reported by
+          casting a value to that type.
+        </para>
+        <para>
+          This value is telemetry. It is supplied entirely by the client, which may report any identifier in range,
+          so it is not an authenticated identity and must not be used for authorization or any other security
+          decision.
+        </para>
+        <para>
+          The identity is sent once, during login, so it must be set before the connection is opened.
+        </para>
+        <para>
+          When pooling is enabled the value is reported only while establishing a new physical connection, and it is
+          not part of the pool key. A connection served from the pool therefore reports the identity of whichever
+          connection caused that physical connection to be created, and physical connections opened in the background
+          to satisfy <c>Min Pool Size</c> report
+          <see cref="F:Microsoft.Data.SqlClient.RegisteredApplication.Unknown" />. Applications that mix identities over one
+          connection string should treat this telemetry as indicative rather than exact, or disable pooling where an
+          exact attribution is required.
+        </para>
+      </remarks>
+    </RegisteredApplication>
     <WorkstationId>
       <summary>
         Gets a string that identifies the database client.
diff --git a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
index 62a4ef14e0..705182b8d5 100644
--- a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
@@ -72,6 +72,13 @@
     <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>
 
+  <!-- CLS Compliance ================================================== -->
+  <ItemGroup>
+    <AssemblyAttribute Include="System.CLSCompliantAttribute">
+      <_Parameter1>true</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
   <!-- Versioning ====================================================== -->
   <!-- Import our Versions.props unless it was already imported (e.g. by Directory.Packages.props
        in Package mode).  The guard property inside Versions.props makes this a no-op on the
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
index 266d0b9a1d..5a8ff5c0ae 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.cs
@@ -592,6 +592,40 @@ public void LogError(string type, string method, string message) { }
     public void LogInfo(string type, string method, string message) { }
 }
 
+/// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/RegisteredApplication/*' />
+[System.CLSCompliantAttribute(false)]
+public enum RegisteredApplication : ushort
+{
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/Unknown/*' />
+    Unknown = 0,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/EntityFrameworkCore/*' />
+    EntityFrameworkCore = 1,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/SemanticKernel/*' />
+    SemanticKernel = 2,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/ManagementStudio/*' />
+    ManagementStudio = 3,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/SqlManagementObjects/*' />
+    SqlManagementObjects = 4,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/DataTierApplicationFramework/*' />
+    DataTierApplicationFramework = 5,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/SqlToolsService/*' />
+    SqlToolsService = 6,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/AspNetCoreDistributedSqlServerCache/*' />
+    AspNetCoreDistributedSqlServerCache = 7,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/EntityFramework/*' />
+    EntityFramework = 8,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/AzureFunctionsSqlExtension/*' />
+    AzureFunctionsSqlExtension = 9,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/OrleansAdoNet/*' />
+    OrleansAdoNet = 10,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/DurableTaskSqlServer/*' />
+    DurableTaskSqlServer = 11,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/SqlPackage/*' />
+    SqlPackage = 12,
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/DataApiBuilder/*' />
+    DataApiBuilder = 13
+}
+
 /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/SqlClientMetaDataCollectionNames/*'/>
 public static class SqlClientMetaDataCollectionNames
 {
@@ -1010,6 +1044,9 @@ public SqlConnection() { }
     public SqlConnection(string connectionString) { }
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ctorConnectionStringCredential/*'/>
     public SqlConnection(string connectionString, Microsoft.Data.SqlClient.SqlCredential credential) { }
+    /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/RegisteredApplication/*' />
+    [System.CLSCompliantAttribute(false)]
+    public Microsoft.Data.SqlClient.RegisteredApplication RegisteredApplication { get { throw null; } set { } }
 
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/AccessToken/*'/>
     [System.ComponentModel.BrowsableAttribute(false)]
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
index fdf6f07f70..be8d9547ef 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs
@@ -306,6 +306,12 @@ internal class SqlConnectionInternal : DbConnectionInternal, IDisposable
 
         private bool _sessionRecoveryRequested;
 
+        /// <summary>
+        /// The middleware application identity of the <see cref="SqlConnection"/> that caused
+        /// this physical connection to be created. Reported once, at login.
+        /// </summary>
+        private readonly RegisteredApplication _registeredApplication;
+
         private int _threadIdOwningParserLock = -1;
 
         // @TODO: Rename to indicate this has to do with routing
@@ -344,12 +350,14 @@ internal SqlConnectionInternal(
             IDbConnectionPool pool = null,
             Func<SqlAuthenticationParameters, CancellationToken, Task<SqlAuthenticationToken>> accessTokenCallback = null,
             SspiContextProvider sspiContextProvider = null,
-            ISqlClientMetrics metrics = null)
+            ISqlClientMetrics metrics = null,
+            RegisteredApplication registeredApplication = RegisteredApplication.Unknown)
             : base(metrics)
         {
             Debug.Assert(connectionOptions is not null, "null connectionOptions");
 
             ConnectionOptions = connectionOptions;
+            _registeredApplication = registeredApplication;
 
             #if DEBUG
             if (reconnectSessionData != null)
@@ -3063,6 +3071,7 @@ private void Login(
             login.password = ConnectionOptions.Password;
             login.applicationName = ConnectionOptions.ApplicationName;
             login.language = _currentLanguage;
+            login.appId = _registeredApplication;
 
             if (!login.userInstance)
             {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/RegisteredApplication.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/RegisteredApplication.cs
new file mode 100644
index 0000000000..54aba7eaf8
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/RegisteredApplication.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient;
+
+/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/RegisteredApplication/*' />
+[System.CLSCompliant(false)]
+public enum RegisteredApplication : ushort
+{
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/Unknown/*' />
+    Unknown = 0,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/EntityFrameworkCore/*' />
+    EntityFrameworkCore = 1,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/SemanticKernel/*' />
+    SemanticKernel = 2,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/ManagementStudio/*' />
+    ManagementStudio = 3,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/SqlManagementObjects/*' />
+    SqlManagementObjects = 4,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/DataTierApplicationFramework/*' />
+    DataTierApplicationFramework = 5,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/SqlToolsService/*' />
+    SqlToolsService = 6,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/AspNetCoreDistributedSqlServerCache/*' />
+    AspNetCoreDistributedSqlServerCache = 7,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/EntityFramework/*' />
+    EntityFramework = 8,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/AzureFunctionsSqlExtension/*' />
+    AzureFunctionsSqlExtension = 9,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/OrleansAdoNet/*' />
+    OrleansAdoNet = 10,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/DurableTaskSqlServer/*' />
+    DurableTaskSqlServer = 11,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/SqlPackage/*' />
+    SqlPackage = 12,
+    /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/RegisteredApplication.xml' path='docs/members[@name="RegisteredApplication"]/DataApiBuilder/*' />
+    DataApiBuilder = 13
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientDriverProperties.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientDriverProperties.cs
new file mode 100644
index 0000000000..07378821e4
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlClientDriverProperties.cs
@@ -0,0 +1,75 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient;
+
+/// <summary>
+///   Driver-owned feature flags reported in the Driver Properties part of the
+///   USERAGENT login feature extension payload.
+/// </summary>
+/// <remarks>
+///   This part is driver-owned, so its meaning is defined entirely by
+///   Microsoft.Data.SqlClient and carries no cross-driver contract.  Other
+///   drivers use the same part for their own purposes.
+/// </remarks>
+[Flags]
+internal enum SqlClientDriverProperties : ulong
+{
+    /// <summary>No tracked features are enabled.</summary>
+    None = 0,
+
+    /// <summary>
+    ///   The connection pool V2 implementation
+    ///   (<c>Switch.Microsoft.Data.SqlClient.UseConnectionPoolV2</c>) is
+    ///   enabled.
+    /// </summary>
+    ConnectionPoolV2 = 1
+}
+
+/// <summary>
+///   Resolves the <see cref="SqlClientDriverProperties"/> flags that describe
+///   how this process is configured.
+/// </summary>
+internal static class SqlClientDriverPropertiesResolver
+{
+    /// <summary>
+    ///   The flags describing the current process.
+    /// </summary>
+    /// <remarks>
+    ///   The flags are sourced from process-wide switches, so this is stable
+    ///   for the life of the process.
+    /// </remarks>
+    internal static SqlClientDriverProperties Current =>
+        Resolve(LocalAppContextSwitches.UseConnectionPoolV2);
+
+    /// <summary>
+    ///   Maps the process configuration to the flags that describe it.
+    /// </summary>
+    /// <param name="useConnectionPoolV2">
+    ///   Whether the connection pool V2 implementation is enabled.
+    /// </param>
+    /// <returns>
+    ///   The flags describing the supplied configuration.
+    /// </returns>
+    /// <remarks>
+    ///   The mapping is kept separate from <see cref="Current"/> because the
+    ///   switches it reads are cached for the life of the process, which makes
+    ///   them impractical to vary in a test.
+    /// </remarks>
+    internal static SqlClientDriverProperties Resolve(bool useConnectionPoolV2)
+    {
+        SqlClientDriverProperties properties = SqlClientDriverProperties.None;
+
+        if (useConnectionPoolV2)
+        {
+            properties |= SqlClientDriverProperties.ConnectionPoolV2;
+        }
+
+        return properties;
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
index 7368798bb8..66b8df4564 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -262,6 +262,7 @@ private SqlConnection(SqlConnection connection)
 
             _accessToken = connection._accessToken;
             _accessTokenCallback = connection._accessTokenCallback;
+            RegisteredApplication = connection.RegisteredApplication;
 
             // CopyFrom retains the source PoolGroup, and therefore the source ConnectionPoolKey.
             // The provider must be copied along with it, otherwise the clone would authenticate
@@ -381,6 +382,34 @@ public static void RegisterColumnEncryptionKeyStoreProviders(IDictionary<string,
             }
         }
 
+        /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/RegisteredApplication/*' />
+        [CLSCompliant(false)]
+        public RegisteredApplication RegisteredApplication
+        {
+            get;
+            set
+            {
+                DbConnectionInternal connectionInternal = InnerConnection;
+                bool canSet = connectionInternal.AllowSetConnectionString;
+                if (canSet)
+                {
+                    // Reserve the closed state so Open cannot read the old value while this setter
+                    // publishes the new one.
+                    canSet = SetInnerConnectionFrom(DbConnectionClosedBusy.SingletonInstance, connectionInternal);
+                    if (canSet)
+                    {
+                        field = value;
+                        SetInnerConnectionTo(connectionInternal);
+                    }
+                }
+
+                if (!canSet)
+                {
+                    throw ADP.OpenConnectionPropertySet(nameof(RegisteredApplication), connectionInternal.State);
+                }
+            }
+        }
+
         /// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/RegisterColumnEncryptionKeyStoreProvidersOnConnection/*' />
         public void RegisterColumnEncryptionKeyStoreProvidersOnConnection(IDictionary<string, SqlColumnEncryptionKeyStoreProvider> customProviders)
         {
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
index c3b7bfd13b..e5c567d117 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
@@ -712,7 +712,8 @@ protected virtual DbConnectionInternal CreateConnection(
                         redirectedUserInstance: false,
                         applyTransientFaultHandling: applyTransientFaultHandling,
                         sspiContextProvider: key.SspiContextProvider,
-                        metrics: Metrics);
+                        metrics: Metrics,
+                        registeredApplication: sqlOwningConnection?.RegisteredApplication ?? RegisteredApplication.Unknown);
                     using (sseConnection)
                     {
                         // NOTE: Retrieve <UserInstanceName> here. This user instance name will be
@@ -774,7 +775,8 @@ protected virtual DbConnectionInternal CreateConnection(
                 pool,
                 key.AccessTokenCallback,
                 key.SspiContextProvider,
-                metrics: Metrics);
+                metrics: Metrics,
+                registeredApplication: sqlOwningConnection?.RegisteredApplication ?? RegisteredApplication.Unknown);
         }
 
         private static DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(SqlConnectionOptions connectionOptions)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
index d8c904f1e0..7c079cfee0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -1356,12 +1356,15 @@ internal void TdsLogin(
                 }
 
                 int feOffset = length;
+                // Capture the payload once so the length reserved below and the
+                // bytes written by WriteLoginData can never disagree.
+                ReadOnlyMemory<byte> userAgent = UserAgent.GetUcs2Bytes(rec.appId);
                 // calculate and reserve the required bytes for the featureEx
                 length = ApplyFeatureExData(
                     requestedFeatures,
                     recoverySessionData,
                     fedAuthFeatureExtensionData,
-                    UserAgent.Ucs2Bytes,
+                    userAgent,
                     useFeatureExt,
                     length
                     );
@@ -1380,7 +1383,8 @@ internal void TdsLogin(
                                length,
                                feOffset,
                                clientInterfaceName,
-                               sspiWriter is { } ? sspiWriter.WrittenSpan : ReadOnlySpan<byte>.Empty);
+                               sspiWriter is { } ? sspiWriter.WrittenSpan : ReadOnlySpan<byte>.Empty,
+                               userAgent);
             }
             finally
             {
@@ -9261,7 +9265,8 @@ private void WriteLoginData(SqlLogin rec,
                                     int length,
                                     int featureExOffset,
                                     string clientInterfaceName,
-                                    ReadOnlySpan<byte> outSSPI)
+                                    ReadOnlySpan<byte> outSSPI,
+                                    ReadOnlyMemory<byte> userAgent)
         {
             try
             {
@@ -9521,7 +9526,7 @@ private void WriteLoginData(SqlLogin rec,
                     requestedFeatures,
                     recoverySessionData,
                     fedAuthFeatureExtensionData,
-                    UserAgent.Ucs2Bytes,
+                    userAgent,
                     useFeatureExt,
                     length,
                     true
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs
index 6bcc3f2d41..fa59185462 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserHelperClasses.cs
@@ -124,6 +124,7 @@ internal sealed class SqlLogin
         internal bool readOnlyIntent = false;                            // read-only intent
         internal SqlCredential credential;                               // user id and password in SecureString
         internal SecureString newSecurePassword;
+        internal RegisteredApplication appId = RegisteredApplication.Unknown;              // middleware application identity
     }
 
     #nullable enable
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
index d8820c3ce9..fc7b8b403f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/UserAgent.cs
@@ -3,8 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
 
 #nullable enable
 
@@ -31,9 +33,15 @@ internal static class UserAgent
     ///     never larger than 256 characters.
     ///   </para>
     ///   <para>
-    ///     The format is pipe ('|') delimited into 7 parts:
+    ///     The format is pipe ('|') delimited into 9 parts:
     ///
-    ///     <code>1|MS-MDS|{Driver Version}|{Arch}|{OS Type}|{OS Info}|{Runtime Info}</code>
+    ///     <code>2|MS-MDS|{Driver Version}|{Arch}|{OS Type}|{OS Info}|{Runtime Info}|{App Id}|{Driver Properties}</code>
+    ///   </para>
+    ///   <para>
+    ///     This is the base value, whose <c>{App Id}</c> part is always
+    ///     <c>0</c>.  The payload actually sent at login carries the
+    ///     identifier set on the connection; see
+    ///     <see cref="GetUcs2Bytes">GetUcs2Bytes</see>.
     ///   </para>
     ///   <para>
     ///     The <c>{Driver Version}</c> part is the version of the driver,
@@ -76,6 +84,17 @@ internal static class UserAgent
     ///     Maximum length is 44 characters.
     ///   </para>
     ///   <para>
+    ///     The <c>{App Id}</c> part is the identifier of the application
+    ///     middleware using the driver, serialized as uppercase hexadecimal.
+    ///     It is always present; <c>0</c> means no application identity was
+    ///     reported. Maximum length is 4 characters.
+    ///   </para>
+    ///   <para>
+    ///     The <c>{Driver Properties}</c> part is a driver-owned feature flag
+    ///     value, serialized as uppercase hexadecimal. It is always present.
+    ///     Maximum length is 16 characters.
+    ///   </para>
+    ///   <para>
     ///     Any characters from the sourced values that are not one of the
     ///     following are replaced with underscore ('_'):
     ///     <list type="bullet">
@@ -108,6 +127,62 @@ internal static class UserAgent
 
     #region Helpers
 
+    /// <summary>
+    ///   <para>
+    ///     Returns the UCS-2 encoded payload reporting the given application
+    ///     identifier.
+    ///   </para>
+    ///   <para>
+    ///     When <paramref name="app"/> is
+    ///     <see cref="RegisteredApplication.Unknown"/>, <see cref="Ucs2Bytes"/> is
+    ///     returned, whose App Id part is <c>0</c>.
+    ///   </para>
+    /// </summary>
+    /// <param name="app">
+    ///   The application identifier set on the connection being logged in.
+    /// </param>
+    /// <returns>The UCS-2 encoded payload bytes.</returns>
+    internal static ReadOnlyMemory<byte> GetUcs2Bytes(RegisteredApplication app)
+    {
+        if (app == RegisteredApplication.Unknown)
+        {
+            return Ucs2Bytes;
+        }
+
+        // Most processes report a single application identifier, so a single
+        // cached entry serves every login.  The pair is cached behind one
+        // reference so readers never observe a torn ReadOnlyMemory<byte>.
+        AppPayload? cached = Volatile.Read(ref s_appPayload);
+        if (cached is not null && cached.App == app)
+        {
+            return cached.Ucs2Bytes;
+        }
+
+        ReadOnlyMemory<byte> bytes = Encoding.Unicode.GetBytes(BuildPayload(app));
+        Volatile.Write(ref s_appPayload, new AppPayload(app, bytes));
+
+        return bytes;
+    }
+
+    /// <summary>
+    ///   Build the payload string from the current runtime environment,
+    ///   reporting the given application identifier.
+    /// </summary>
+    /// <param name="app">The application identifier to report.</param>
+    /// <returns>The payload string value.</returns>
+    private static string BuildPayload(RegisteredApplication app) =>
+        Build(
+            MaxLenOverall,
+            PayloadVersion,
+            DriverName,
+            ThisAssembly.PackageVersion,
+            RuntimeInformation.ProcessArchitecture,
+            s_osType,
+            RuntimeInformation.OSDescription,
+            RuntimeInformation.FrameworkDescription,
+            (ushort)app,
+            (ulong)SqlClientDriverPropertiesResolver.Current);
+
     /// <summary>
     ///   Static construction builds the Client Interface Name.  All known
     ///   exceptions are consumed.
@@ -139,16 +214,11 @@ static UserAgent()
         }
 #endif
 
+        // Remember it for agent payloads built later.
+        s_osType = osType;
+
         // Build it!
-        Value = Build(
-            MaxLenOverall,
-            PayloadVersion,
-            DriverName,
-            ThisAssembly.PackageVersion,
-            RuntimeInformation.ProcessArchitecture,
-            osType,
-            RuntimeInformation.OSDescription,
-            RuntimeInformation.FrameworkDescription);
+        Value = BuildPayload(RegisteredApplication.Unknown);
 
         // Convert it to UCS-2 bytes.
         //
@@ -189,6 +259,13 @@ static UserAgent()
     /// <param name="runtimeInfo">
     ///   The value of the Runtime Info part.
     /// </param>
+    /// <param name="appId">
+    ///   The value of the App Id part, serialized as uppercase hexadecimal.
+    /// </param>
+    /// <param name="driverProperties">
+    ///   The value of the Driver Properties part, serialized as uppercase
+    ///   hexadecimal.
+    /// </param>
     /// <returns>
     ///   The payload string value, never null, never empty, and never longer
     ///   than <paramref name="maxLen"/>.
@@ -201,7 +278,9 @@ internal static string Build(
         Architecture arch,
         string osType,
         string osInfo,
-        string runtimeInfo)
+        string runtimeInfo,
+        ushort appId,
+        ulong driverProperties)
     {
         string result;
 
@@ -244,6 +323,14 @@ internal static string Build(
 
             // Add the Runtime Info, truncating to its max length.
             name.Append(Truncate(Clean(runtimeInfo), MaxLenRuntimeInfo));
+            name.Append('|');
+
+            // Add the App Id.
+            name.Append(FormatHex(appId));
+            name.Append('|');
+
+            // Add the Driver Properties.
+            name.Append(FormatHex(driverProperties));
 
             // Remember the name we've built up.
             result = name.ToString();
@@ -254,7 +341,8 @@ internal static string Build(
             // value.
             result =
                 $"{payloadVersion}|{driverName}|{Unknown}|{Unknown}|" +
-                $"{Unknown}|{Unknown}|{Unknown}";
+                $"{Unknown}|{Unknown}|{Unknown}|{FormatHex(appId)}|" +
+                $"{FormatHex(driverProperties)}";
         }
 
         // Truncate to our max length if necessary.
@@ -371,6 +459,14 @@ internal static string Clean(string? value)
         }
     }
 
+    /// <summary>
+    ///   Formats the given value as uppercase hexadecimal.
+    /// </summary>
+    /// <param name="value">The value to format.</param>
+    /// <returns>The formatted value.</returns>
+    internal static string FormatHex(ulong value) =>
+        value.ToString("X", CultureInfo.InvariantCulture);
+
     /// <summary>
     ///   Truncate the given value to the given max length, and return the
     ///   result.
@@ -398,7 +494,9 @@ internal static string Truncate(string value, ushort maxLength)
     #region Private Fields
 
     // Our payload format version.
-    private const string PayloadVersion = "1";
+    //
+    // Version 2 adds the App Id and Driver Properties parts.
+    private const string PayloadVersion = "2";
 
     // Our well-known .NET driver name.
     private const string DriverName = "MS-MDS";
@@ -428,5 +526,29 @@ internal static string Truncate(string value, ushort maxLength)
     // unknown, invalid, or when errors occur.
     private const string Unknown = "Unknown";
 
+    // The OS Type resolved during static construction, retained so payloads
+    // built later use the same value as Value.
+    private static readonly string s_osType;
+
+    // The payload for the most recently requested application identifier,
+    // built on first use.
+    private static AppPayload? s_appPayload;
+
+    /// <summary>
+    ///   Pairs a payload with the application identifier it was built for.
+    /// </summary>
+    private sealed class AppPayload
+    {
+        internal AppPayload(RegisteredApplication app, ReadOnlyMemory<byte> ucs2Bytes)
+        {
+            App = app;
+            Ucs2Bytes = ucs2Bytes;
+        }
+
+        internal RegisteredApplication App { get; }
+
+        internal ReadOnlyMemory<byte> Ucs2Bytes { get; }
+    }
+
     #endregion Private Fields
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
index 830f1bb733..7be39757a2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
@@ -329,7 +329,13 @@ private static void CancelAndDisposePreparedCommand(string constr)
                 try
                 {
                     // Generate a query with a large number of results.
-                    using (var command = new SqlCommand("select @P from sys.objects a cross join sys.objects b cross join sys.objects c cross join sys.objects d cross join sys.objects e cross join sys.objects f", connection))
+                    // The rows come from constant row sets rather than the system
+                    // catalog, so the scan cannot contend with concurrent DDL on
+                    // the shared test database.
+                    const string rows = "(values(0),(1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13),(14),(15))";
+                    string sql = $"select @P from {rows} a(n) cross join {rows} b(n) cross join {rows} c(n) " +
+                                 $"cross join {rows} d(n) cross join {rows} e(n) cross join {rows} f(n)";
+                    using (var command = new SqlCommand(sql, connection))
                     {
                         command.Parameters.Add(new SqlParameter("@P", SqlDbType.Int) { Value = expectedValue });
                         connection.Open();
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
index 17ac619a3e..7515878235 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionConcurrentOpenTests.cs
@@ -61,6 +61,25 @@ public void InnerConnection_InConnectingState_ReportsConnectingState()
             Assert.Equal(ConnectionState.Connecting, connection.State);
         }
 
+        /// <summary>
+        /// Verifies the registered application cannot change while a connection is opening and
+        /// that a rejected assignment preserves the original value.
+        /// </summary>
+        [Fact]
+        public void RegisteredApplication_WhenConnecting_ThrowsAndPreservesValue()
+        {
+            using var connection = new SqlConnection("Data Source=localhost")
+            {
+                RegisteredApplication = RegisteredApplication.EntityFrameworkCore,
+            };
+            ForceInnerConnection(connection, GetConnectingSingleton());
+
+            Assert.Throws<InvalidOperationException>(
+                () => connection.RegisteredApplication = RegisteredApplication.SemanticKernel);
+
+            Assert.Equal(RegisteredApplication.EntityFrameworkCore, connection.RegisteredApplication);
+        }
+
         [Fact]
         public void Open_WhenAlreadyConnecting_ThrowsInvalidOperation()
         {
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/RegisteredApplicationTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/RegisteredApplicationTests.cs
new file mode 100644
index 0000000000..e036ae84bd
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/RegisteredApplicationTests.cs
@@ -0,0 +1,161 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.Data.SqlClient;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests;
+
+/// <summary>
+/// Tests for the <see cref="RegisteredApplication"/> application identifier registry.
+/// </summary>
+public class RegisteredApplicationTests
+{
+    /// <summary>
+    /// Verifies the enum uses the 16-bit protocol width.
+    /// </summary>
+    [Fact]
+    public void UnderlyingType_Is_UShort()
+    {
+        Assert.Equal(typeof(ushort), Enum.GetUnderlyingType(typeof(RegisteredApplication)));
+    }
+
+    /// <summary>
+    /// Verifies the default value reports no application identity.
+    /// </summary>
+    [Fact]
+    public void Default_Is_Unknown()
+    {
+        Assert.Equal(RegisteredApplication.Unknown, default(RegisteredApplication));
+        Assert.Equal(0, (int)RegisteredApplication.Unknown);
+    }
+
+    /// <summary>
+    /// Verifies the reserved identifiers keep their assigned values, since
+    /// changing one would silently re-map an application's telemetry.
+    /// </summary>
+    [Theory]
+    [InlineData(RegisteredApplication.EntityFrameworkCore, 1)]
+    [InlineData(RegisteredApplication.SemanticKernel, 2)]
+    [InlineData(RegisteredApplication.ManagementStudio, 3)]
+    [InlineData(RegisteredApplication.SqlManagementObjects, 4)]
+    [InlineData(RegisteredApplication.DataTierApplicationFramework, 5)]
+    [InlineData(RegisteredApplication.SqlToolsService, 6)]
+    [InlineData(RegisteredApplication.AspNetCoreDistributedSqlServerCache, 7)]
+    [InlineData(RegisteredApplication.EntityFramework, 8)]
+    [InlineData(RegisteredApplication.AzureFunctionsSqlExtension, 9)]
+    [InlineData(RegisteredApplication.OrleansAdoNet, 10)]
+    [InlineData(RegisteredApplication.DurableTaskSqlServer, 11)]
+    [InlineData(RegisteredApplication.SqlPackage, 12)]
+    [InlineData(RegisteredApplication.DataApiBuilder, 13)]
+    public void Members_Have_Stable_Values(RegisteredApplication app, int expected)
+    {
+        Assert.Equal(expected, (int)app);
+    }
+
+    /// <summary>
+    /// Verifies an unregistered identifier can be reported by casting, which
+    /// keeps the API forward compatible with identifiers added later.
+    /// </summary>
+    [Fact]
+    public void Unregistered_Identifier_Is_Accepted()
+    {
+        RegisteredApplication app = (RegisteredApplication)0xC001;
+
+        Assert.False(Enum.IsDefined(typeof(RegisteredApplication), app));
+
+        using SqlConnection connection = new();
+        connection.RegisteredApplication = app;
+
+        Assert.Equal(app, connection.RegisteredApplication);
+    }
+
+    /// <summary>
+    /// Verifies the boundaries of the 16-bit identifier space are accepted,
+    /// since the payload reports the identifier in exactly 16 bits.
+    /// </summary>
+    [Theory]
+    [InlineData(0)]
+    [InlineData(ushort.MaxValue)]
+    public void Identifier_In_Range_Is_Accepted(int value)
+    {
+        using SqlConnection connection = new();
+
+        connection.RegisteredApplication = (RegisteredApplication)value;
+
+        Assert.Equal(value, (int)connection.RegisteredApplication);
+    }
+
+    /// <summary>
+    /// Verifies the connection reports no application identity until one is
+    /// assigned, and round-trips the value it is given.
+    /// </summary>
+    [Fact]
+    public void SqlConnection_RegisteredApplication_RoundTrips()
+    {
+        using SqlConnection connection = new();
+
+        Assert.Equal(RegisteredApplication.Unknown, connection.RegisteredApplication);
+
+        connection.RegisteredApplication = RegisteredApplication.SemanticKernel;
+
+        Assert.Equal(RegisteredApplication.SemanticKernel, connection.RegisteredApplication);
+    }
+
+    /// <summary>
+    /// Verifies a cloned connection keeps the application identity of the
+    /// connection it was cloned from, so cloning does not silently drop the
+    /// identity back to <see cref="RegisteredApplication.Unknown"/>.
+    /// </summary>
+    [Fact]
+    public void Clone_Preserves_RegisteredApplication()
+    {
+        using SqlConnection connection = new();
+        connection.RegisteredApplication = RegisteredApplication.SqlPackage;
+
+        using SqlConnection clone = (SqlConnection)((ICloneable)connection).Clone();
+
+        Assert.Equal(RegisteredApplication.SqlPackage, clone.RegisteredApplication);
+    }
+
+    /// <summary>
+    /// Verifies the driver properties part reports the connection pool V2 flag
+    /// when, and only when, that implementation is enabled.
+    /// </summary>
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void DriverProperties_Reports_ConnectionPoolV2(bool useConnectionPoolV2)
+    {
+        SqlClientDriverProperties expected = useConnectionPoolV2
+            ? SqlClientDriverProperties.ConnectionPoolV2
+            : SqlClientDriverProperties.None;
+
+        Assert.Equal(expected, SqlClientDriverPropertiesResolver.Resolve(useConnectionPoolV2));
+    }
+
+    /// <summary>
+    /// Verifies driver properties reserve 64 bits for feature flags.
+    /// </summary>
+    [Fact]
+    public void DriverProperties_UnderlyingType_Is_ULong()
+    {
+        Assert.Equal(typeof(ulong), Enum.GetUnderlyingType(typeof(SqlClientDriverProperties)));
+    }
+
+    /// <summary>
+    /// Verifies the flags reported for this process agree with the switch they
+    /// are derived from, so <see cref="SqlClientDriverPropertiesResolver.Current"/>
+    /// cannot drift from the mapping it delegates to.
+    /// </summary>
+    [Fact]
+    public void DriverProperties_Current_Matches_Switch()
+    {
+        SqlClientDriverProperties expected =
+            SqlClientDriverPropertiesResolver.Resolve(LocalAppContextSwitches.UseConnectionPoolV2);
+
+        Assert.Equal(expected, SqlClientDriverPropertiesResolver.Current);
+    }
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
index 0a7b633748..a8216d787f 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs
@@ -25,6 +25,7 @@
 
 namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests
 {
+    [Collection(SimulatedServerTestCollection.Name)]
     public class ConnectionTests
     {
         [Fact]
@@ -1178,15 +1179,20 @@ public void TestConnWithVectorFeatExtVersionNegotiation(bool expectedConnectionR
             }
         }
 
-        // Test that the driver sends the UserAgent feature extension when
-        // the context switch is enabled, and that the presence or absence of
-        // an ack from the server has no effect.
+        /// <summary>
+        /// Verifies that LOGIN7 sends the USERAGENT payload carrying the connection's application
+        /// identity, regardless of whether the server acknowledges the extension.
+        /// </summary>
+        /// <param name="sendAck">Whether the server acknowledges the USERAGENT extension.</param>
+        /// <param name="useAsync">Whether the connection opens asynchronously.</param>
         [Theory]
         // Allow the server to ack.
-        [InlineData(true)]
+        [InlineData(true, false)]
+        [InlineData(true, true)]
         // Don't allow the server to send an ack.
-        [InlineData(false)]
-        public void TestConnWithUserAgentFeatureExtension(bool sendAck)
+        [InlineData(false, false)]
+        [InlineData(false, true)]
+        public async Task TestConnWithUserAgentFeatureExtension(bool sendAck, bool useAsync)
         {
             // Start the test server.
             using TdsServer server = new();
@@ -1235,7 +1241,15 @@ public void TestConnWithUserAgentFeatureExtension(bool sendAck)
             }.ConnectionString;
 
             using var connection = new SqlConnection(connStr);
-            connection.Open();
+            connection.RegisteredApplication = RegisteredApplication.EntityFrameworkCore;
+            if (useAsync)
+            {
+                await connection.OpenAsync();
+            }
+            else
+            {
+                connection.Open();
+            }
 
             // Verify the connection itself succeeded
             Assert.Equal(ConnectionState.Open, connection.State);
@@ -1245,9 +1259,38 @@ public void TestConnWithUserAgentFeatureExtension(bool sendAck)
             Assert.True(firstFeatureIsUserAgent);
             Assert.True(tokenWasNotNull);
             Assert.True(dataLengthAtLeast1);
-            Assert.Equal(UserAgent.Ucs2Bytes.ToArray(), observedPayload);
+            Assert.Equal(UserAgent.GetUcs2Bytes(RegisteredApplication.EntityFrameworkCore).ToArray(), observedPayload);
 
             // TODO: Confirm the server sent an Ack by reading log message from SqlInternalConnectionTds
         }
+
+        /// <summary>
+        /// Verifies the application identity cannot be changed once the connection is open, since
+        /// it is only reported during login and the getter would otherwise report a value that was
+        /// never sent.
+        /// </summary>
+        [Fact]
+        public void RegisteredApplication_CannotBeSet_WhenConnectionIsOpen()
+        {
+            using TdsServer server = new();
+            server.Start();
+
+            var connStr = new SqlConnectionStringBuilder
+            {
+                DataSource = $"localhost,{server.EndPoint.Port}",
+                Encrypt = SqlConnectionEncryptOption.Optional,
+                Pooling = false,
+            }.ConnectionString;
+
+            using var connection = new SqlConnection(connStr);
+            connection.RegisteredApplication = RegisteredApplication.EntityFrameworkCore;
+            connection.Open();
+
+            Assert.Throws<InvalidOperationException>(
+                () => connection.RegisteredApplication = RegisteredApplication.SemanticKernel);
+
+            // The connection still reports the identity it logged in with.
+            Assert.Equal(RegisteredApplication.EntityFrameworkCore, connection.RegisteredApplication);
+        }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/RegisteredApplicationPoolTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/RegisteredApplicationPoolTests.cs
new file mode 100644
index 0000000000..4819429b18
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/RegisteredApplicationPoolTests.cs
@@ -0,0 +1,135 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Data.Common.ConnectionString;
+using Microsoft.Data.ProviderBase;
+using Microsoft.Data.SqlClient.ConnectionPool;
+using Microsoft.SqlServer.TDS;
+using Microsoft.SqlServer.TDS.Login7;
+using Microsoft.SqlServer.TDS.Servers;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.UnitTests.SimulatedServerTests;
+
+/// <summary>
+/// Verifies registered application attribution when physical connections are pooled.
+/// </summary>
+[Collection(SimulatedServerTestCollection.Name)]
+public class RegisteredApplicationPoolTests
+{
+    /// <summary>
+    /// Verifies application identity does not split pools and a reused physical connection keeps
+    /// the identity reported when that physical connection was created.
+    /// </summary>
+    [Fact]
+    public void DifferentRegisteredApplications_ReusePhysicalConnection_WithOriginalIdentity()
+    {
+        using TdsServer server = new();
+        server.EnableUserAgentFeatureExt = true;
+        var payloads = new ConcurrentQueue<byte[]>();
+        server.OnLogin7Validated = login => payloads.Enqueue(GetUserAgentPayload(login));
+        server.Start();
+
+        string connectionString = new SqlConnectionStringBuilder
+        {
+            DataSource = $"localhost,{server.EndPoint.Port}",
+            Encrypt = SqlConnectionEncryptOption.Optional,
+            Pooling = true,
+        }.ConnectionString;
+
+        using var firstConnection = new SqlConnection(connectionString)
+        {
+            RegisteredApplication = RegisteredApplication.EntityFrameworkCore,
+        };
+
+        try
+        {
+            firstConnection.Open();
+            firstConnection.Close();
+
+            using var secondConnection = new SqlConnection(connectionString)
+            {
+                RegisteredApplication = RegisteredApplication.SemanticKernel,
+            };
+            secondConnection.Open();
+
+            Assert.Equal(1, server.Login7Count);
+            Assert.Single(payloads);
+            Assert.True(payloads.TryDequeue(out byte[]? payload));
+            Assert.Equal(UserAgent.GetUcs2Bytes(RegisteredApplication.EntityFrameworkCore).ToArray(), payload);
+        }
+        finally
+        {
+            SqlConnection.ClearPool(firstConnection);
+        }
+    }
+
+    /// <summary>
+    /// Verifies a physical connection created by channel-pool background warmup reports the
+    /// unknown application because no logical connection owns the creation.
+    /// </summary>
+    [Fact]
+    public async Task MinPoolSizeBackgroundConnection_ReportsUnknownApplication()
+    {
+        using TdsServer server = new();
+        server.EnableUserAgentFeatureExt = true;
+        var payloads = new ConcurrentQueue<byte[]>();
+        server.OnLogin7Validated = login => payloads.Enqueue(GetUserAgentPayload(login));
+        server.Start();
+
+        string connectionString = new SqlConnectionStringBuilder
+        {
+            DataSource = $"localhost,{server.EndPoint.Port}",
+            Encrypt = SqlConnectionEncryptOption.Optional,
+            Pooling = true,
+            MinPoolSize = 1,
+            MaxPoolSize = 1,
+        }.ConnectionString;
+        var connectionOptions = new SqlConnectionOptions(connectionString);
+        var poolOptions = new DbConnectionPoolGroupOptions(
+            poolByIdentity: false,
+            minPoolSize: 1,
+            maxPoolSize: 1,
+            creationTimeout: 15,
+            loadBalanceTimeout: 0,
+            hasTransactionAffinity: true,
+            idleTimeout: 0);
+        var poolKey = new ConnectionPoolKey(
+            connectionString,
+            credential: null,
+            accessToken: null,
+            accessTokenCallback: null,
+            sspiContextProvider: null);
+        var poolGroup = new DbConnectionPoolGroup(connectionOptions, poolKey, poolOptions);
+        using var pool = new ChannelDbConnectionPool(
+            SqlConnectionFactory.Instance,
+            poolGroup,
+            DbConnectionPoolIdentity.NoIdentity,
+            new SqlConnectionPoolProviderInfo());
+
+        pool.Startup();
+        await pool.WarmupLoopTask!;
+
+        Assert.Equal(1, server.Login7Count);
+        Assert.Single(payloads);
+        Assert.True(payloads.TryDequeue(out byte[]? payload));
+        Assert.Equal(UserAgent.GetUcs2Bytes(RegisteredApplication.Unknown).ToArray(), payload);
+    }
+
+    /// <summary>
+    /// Extracts the USERAGENT extension payload from a validated LOGIN7 token.
+    /// </summary>
+    /// <param name="login">The validated LOGIN7 token.</param>
+    /// <returns>The USERAGENT payload bytes.</returns>
+    private static byte[] GetUserAgentPayload(TDSLogin7Token login) =>
+        login.FeatureExt
+            .OfType<TDSLogin7GenericOptionToken>()
+            .Single(option => option.FeatureID == TDSFeatureID.UserAgentSupport)
+            .Data
+            .ToArray();
+}
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs b/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs
index 80b826700e..fc242fa9d2 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/UserAgentTests.cs
@@ -72,11 +72,12 @@ public void Value_Runtime_Parts()
         //
         // The format should be:
         //
-        // 1|MS-MDS|{Driver Version}|{Arch}|{OS Type}|{OS Info}|{Runtime Info}
+        // 2|MS-MDS|{Driver Version}|{Arch}|{OS Type}|{OS Info}|{Runtime Info}|
+        // {App Id}|{Driver Properties}
         //
         var parts = value.Split('|');
-        Assert.Equal(7, parts.Length);
-        Assert.Equal("1", parts[0]);
+        Assert.Equal(9, parts.Length);
+        Assert.Equal("2", parts[0]);
         Assert.Equal("MS-MDS", parts[1]);
         Assert.Equal(ThisAssembly.PackageVersion, parts[2]);
 
@@ -116,6 +117,13 @@ public void Value_Runtime_Parts()
         // Runtime Info must be non-empty and 44 characters or less.
         Assert.True(parts[6] == "Unknown" || parts[6].Length > 0);
         Assert.True(parts[6].Length <= 44);
+
+        // App Id defaults to Unknown.
+        Assert.Equal("0", parts[7]);
+
+        // Driver Properties is an unpadded 64-bit hexadecimal value.
+        Assert.InRange(parts[8].Length, 1, 16);
+        Assert.Matches("^[0-9A-F]+$", parts[8]);
     }
 
     /// <summary>
@@ -149,6 +157,124 @@ public void Ucs2Bytes_Runtime_Parts()
         Assert.Equal(UserAgent.Value, value);
     }
 
+    /// <summary>
+    /// Test that the default payload is reused when no application identity is
+    /// set on the connection.
+    /// </summary>
+    [Fact]
+    public void GetUcs2Bytes_Unknown_App_Returns_Value()
+    {
+        var bytes = UserAgent.GetUcs2Bytes(RegisteredApplication.Unknown);
+
+        Assert.Equal(UserAgent.Ucs2Bytes.ToArray(), bytes.ToArray());
+        Assert.Equal(9, Decode(bytes).Split('|').Length);
+    }
+
+    /// <summary>
+    /// Test that an application identity is reported in the App Id part,
+    /// leaving the other parts unchanged.
+    /// </summary>
+    [Fact]
+    public void GetUcs2Bytes_App_Sets_App_Id()
+    {
+        string value = Decode(UserAgent.GetUcs2Bytes(RegisteredApplication.SemanticKernel));
+
+        _output.WriteLine($"UserAgent with app: {value}");
+
+        var parts = value.Split('|');
+        Assert.Equal(9, parts.Length);
+        Assert.Equal("2", parts[7]);
+
+        // Every other part matches the default payload.
+        var defaultParts = UserAgent.Value.Split('|');
+        for (int i = 0; i < parts.Length; ++i)
+        {
+            if (i != 7)
+            {
+                Assert.Equal(defaultParts[i], parts[i]);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Test that the payload for an application identity is built once and
+    /// reused across logins.
+    /// </summary>
+    [Fact]
+    public void GetUcs2Bytes_App_Reuses_Payload()
+    {
+        Assert.True(
+            UserAgent.GetUcs2Bytes(RegisteredApplication.ManagementStudio).Span.Overlaps(
+                UserAgent.GetUcs2Bytes(RegisteredApplication.ManagementStudio).Span));
+    }
+
+    /// <summary>
+    /// Test that Build() emits unpadded uppercase hexadecimal values.
+    /// </summary>
+    [Theory]
+    [InlineData((ushort)0, (ulong)0, "2|A|B|X64|C|D|E|0|0")]
+    [InlineData((ushort)7, (ulong)1, "2|A|B|X64|C|D|E|7|1")]
+    [InlineData((ushort)0x00AB, (ulong)0, "2|A|B|X64|C|D|E|AB|0")]
+    [InlineData(ushort.MaxValue, ulong.MaxValue, "2|A|B|X64|C|D|E|FFFF|FFFFFFFFFFFFFFFF")]
+    public void Build_App_Id_And_Driver_Properties(
+        ushort appId,
+        ulong driverProperties,
+        string expected)
+    {
+        Assert.Equal(
+            expected,
+            Build(
+                maxLen: 256,
+                payloadVersion: "2",
+                driverName: "A",
+                driverVersion: "B",
+                Architecture.X64,
+                osType: "C",
+                osInfo: "D",
+                runtimeInfo: "E",
+                appId: appId,
+                driverProperties: driverProperties));
+    }
+
+    /// <summary>
+    /// Calls the payload builder with optional defaults for the version 2 fields.
+    /// </summary>
+    /// <param name="maxLen">The maximum payload length.</param>
+    /// <param name="payloadVersion">The payload version.</param>
+    /// <param name="driverName">The driver name.</param>
+    /// <param name="driverVersion">The driver version.</param>
+    /// <param name="architecture">The process architecture.</param>
+    /// <param name="osType">The operating system type.</param>
+    /// <param name="osInfo">The operating system description.</param>
+    /// <param name="runtimeInfo">The runtime description.</param>
+    /// <param name="appId">The application identifier.</param>
+    /// <param name="driverProperties">The driver feature flags.</param>
+    /// <returns>The formatted payload.</returns>
+    private static string Build(
+        ushort maxLen,
+        string payloadVersion,
+        string driverName,
+        string driverVersion,
+        Architecture architecture,
+        string osType,
+        string osInfo,
+        string runtimeInfo,
+        ushort appId = 0,
+        ulong driverProperties = 0) =>
+        UserAgent.Build(
+            maxLen, payloadVersion, driverName, driverVersion, architecture, osType, osInfo, runtimeInfo,
+            appId, driverProperties);
+
+    /// <summary>
+    /// Decode a UCS-2 encoded payload back to its string form.
+    /// </summary>
+    private static string Decode(ReadOnlyMemory<byte> bytes) =>
+        #if NET
+        Encoding.Unicode.GetString(bytes.Span);
+        #else
+        Encoding.Unicode.GetString(bytes.ToArray());
+        #endif
+
     /// <summary>
     /// Test the Build() function when it truncates the overall length.
     /// </summary>
@@ -171,11 +297,14 @@ public void Ucs2Bytes_Runtime_Parts()
     [InlineData(13, "2|A|B|X64|C|D")]
     [InlineData(14, "2|A|B|X64|C|D|")]
     [InlineData(15, "2|A|B|X64|C|D|E")]
+    [InlineData(16, "2|A|B|X64|C|D|E|")]
+    [InlineData(20, "2|A|B|X64|C|D|E|0|0")]
+    [InlineData(25, "2|A|B|X64|C|D|E|0|0")]
     public void Build_Truncate_Overall(ushort maxLen, string expected)
     {
         Assert.Equal(
             expected,
-            UserAgent.Build(
+            Build(
                 maxLen,
                 payloadVersion: "2",
                 driverName: "A",
@@ -195,13 +324,13 @@ public void Build_Truncate_Payload_Version()
         // The payload version is longer than max length.
         Assert.Equal(
             "P",
-            UserAgent.Build(
+            Build(
                 1, "PV", "A", "B", Architecture.X64, "C", "D", "E"));
 
         // The payload version is longer than its per-field max length of 2.
         Assert.Equal(
-            "12|A|B|X64|C|D|E",
-            UserAgent.Build(
+            "12|A|B|X64|C|D|E|0|0",
+            Build(
                 128, "1234", "A", "B", Architecture.X64, "C", "D", "E"));
     }
 
@@ -214,13 +343,13 @@ public void Build_Truncate_Driver_Name()
         // The driver name is longer than max length.
         Assert.Equal(
             "2|DriverNa",
-            UserAgent.Build(
+            Build(
                 10, "2", "DriverName", "B", Architecture.X64, "C", "D", "E"));
 
         // The driver name is longer than its per-field max length of 12.
         Assert.Equal(
-            "2|LongDriverNa|B|X64|C|D|E",
-            UserAgent.Build(
+            "2|LongDriverNa|B|X64|C|D|E|0|0",
+            Build(
                 128, "2", "LongDriverName", "B", Architecture.X64, "C",
                 "D", "E"));
     }
@@ -234,14 +363,14 @@ public void Build_Truncate_Driver_Version()
         // The driver version is longer than max length.
         Assert.Equal(
             "2|A|DriverVe",
-            UserAgent.Build(
+            Build(
                 12, "2", "A", "DriverVersion", Architecture.X64, "C", "D",
                 "E"));
 
         // The driver version is longer than its per-field max length of 24.
         Assert.Equal(
-            "2|A|ReallyLongDriverVersionS|X64|C|D|E",
-            UserAgent.Build(
+            "2|A|ReallyLongDriverVersionS|X64|C|D|E|0|0",
+            Build(
                 128, "2", "A", "ReallyLongDriverVersionString",
                 Architecture.X64, "C", "D", "E"));
     }
@@ -255,7 +384,7 @@ public void Build_Truncate_Arch()
         // The Architecture puts the overall length over the max.
         Assert.Equal(
             "2|A|B|Arm6",
-            UserAgent.Build(
+            Build(
                 10, "2", "A", "B", Architecture.Arm64, "C", "D", "E"));
 
         // There are no Architecture enum values defined in .NET Framework
@@ -264,8 +393,8 @@ public void Build_Truncate_Arch()
         #if NET
         // The Architecture is longer than its per-field max length of 10.
         Assert.Equal(
-            "2|A|B|LoongArch6|C|D|E",
-            UserAgent.Build(
+            "2|A|B|LoongArch6|C|D|E|0|0",
+            Build(
                 128, "2", "A", "B", Architecture.LoongArch64, "C", "D", "E"));
         #endif
     }
@@ -279,13 +408,13 @@ public void Build_Truncate_OS_Type()
         // The OS Type puts the overall length over the max.
         Assert.Equal(
             "2|A|B|X64|LongOs",
-            UserAgent.Build(
+            Build(
                 16, "2", "A", "B", Architecture.X64, "LongOsName", "D", "E"));
 
         // The OS Type is longer than its per-field max length of 10.
         Assert.Equal(
-            "2|A|B|X64|VeryLongOs|D|E",
-            UserAgent.Build(
+            "2|A|B|X64|VeryLongOs|D|E|0|0",
+            Build(
                 128, "2", "A", "B", Architecture.X64, "VeryLongOsName", "D",
                 "E"));
     }
@@ -299,13 +428,13 @@ public void Build_Truncate_OS_Info()
         // The OS Info puts the overall length over the max.
         Assert.Equal(
             "2|A|B|X64|C|LongOsI",
-            UserAgent.Build(
+            Build(
                 19, "2", "A", "B", Architecture.X64, "C", "LongOsInfo", "E"));
 
         // The OS Type is longer than its per-field max length of 44.
         Assert.Equal(
-            "2|A|B|X64|C|01234567890123456789012345678901234567890123|E",
-            UserAgent.Build(
+            "2|A|B|X64|C|01234567890123456789012345678901234567890123|E|0|0",
+            Build(
                 128, "2", "A", "B", Architecture.X64, "C",
                 "01234567890123456789012345678901234567890123456789",
                 "E"));
@@ -320,14 +449,14 @@ public void Build_Truncate_Runtime_Info()
         // The Runtime Info puts the overall length over the max.
         Assert.Equal(
             "2|A|B|X64|C|D|LongRunt",
-            UserAgent.Build(
+            Build(
                 22, "2", "A", "B", Architecture.X64, "C", "D",
                 "LongRuntimeInfo"));
 
         // The Runtime Type is longer than its per-field max length of 44.
         Assert.Equal(
-            "2|A|B|X64|C|D|01234567890123456789012345678901234567890123",
-            UserAgent.Build(
+            "2|A|B|X64|C|D|01234567890123456789012345678901234567890123|0|0",
+            Build(
                 128, "2", "A", "B", Architecture.X64, "C", "D",
                 "01234567890123456789012345678901234567890123456789"));
     }
@@ -340,7 +469,7 @@ public void Build_Truncate_Runtime_Info()
     public void Build_Truncate_Most()
     {
         var name =
-            UserAgent.Build(
+            Build(
                 192,
                 // Payload version > 2 chars.
                 "1234",
@@ -357,7 +486,7 @@ public void Build_Truncate_Most()
                 "D01234567890123456789012345678901234567890123456789",
                 // Runtime Info > 44 chars.
                 "E01234567890123456789012345678901234567890123456789");
-        Assert.Equal(145, name.Length);
+        Assert.Equal(149, name.Length);
         Assert.Equal(
             "12|" +
             "A01234567890|" +
@@ -365,7 +494,8 @@ public void Build_Truncate_Most()
             "X64|" +
             "C012345678|" +
             "D0123456789012345678901234567890123456789012|" +
-            "E0123456789012345678901234567890123456789012",
+            "E0123456789012345678901234567890123456789012|" +
+            "0|0",
             name);
     }
 
@@ -380,7 +510,7 @@ public void Build_Truncate_Most()
     public void Build_Truncate_All()
     {
         var name =
-            UserAgent.Build(
+            Build(
                 192,
                 // Payload version > 2 chars.
                 "1234",
@@ -396,7 +526,7 @@ public void Build_Truncate_All()
                 "D01234567890123456789012345678901234567890123456789",
                 // Runtime Info > 44 chars.
                 "E01234567890123456789012345678901234567890123456789");
-        Assert.Equal(152, name.Length);
+        Assert.Equal(156, name.Length);
         Assert.Equal(
             "12|" +
             "A01234567890|" +
@@ -404,7 +534,8 @@ public void Build_Truncate_All()
             "LoongArch6|" +
             "C012345678|" +
             "D0123456789012345678901234567890123456789012|" +
-            "E0123456789012345678901234567890123456789012",
+            "E0123456789012345678901234567890123456789012|" +
+            "0|0",
             name);
     }
     #endif

From 02df8b01784e04bce504b024c9de93242f7806cd Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 16 Sep 2026 10:04:07 -0300
Subject: [PATCH 296/298] Update pipelines for the 7.1 branch (#4690)

---
 .../ado-pipelines.instructions.md             |  8 ++-
 .../onebranch-pipeline-design.instructions.md |  2 +-
 .../sqlclient-ci-kerberos-pipeline.yml        |  2 +-
 ...sqlclient-ci-managed-instance-pipeline.yml |  2 +-
 .../package/sqlclient-ci-package-pipeline.yml | 30 ++++++----
 .../stress/sqlclient-ci-stress-pipeline.yml   |  4 +-
 ...qlclient-ci-package-reference-pipeline.yml | 48 +++++++--------
 ...qlclient-ci-project-reference-pipeline.yml | 39 ++++++------
 eng/pipelines/github-sync-pipeline.yml        | 26 ++++----
 .../onebranch/sqlclient-official.yml          |  6 +-
 eng/pipelines/perf/README.md                  | 13 ++--
 .../perf/sqlclient-perf-pr-pipeline.yml       |  8 +--
 eng/pipelines/pr/sqlclient-pr-pipeline.yml    |  9 +--
 .../sqlclient-pr-package-ref-pipeline.yml     | 59 +++++++++----------
 .../sqlclient-pr-project-ref-pipeline.yml     |  9 +--
 15 files changed, 128 insertions(+), 137 deletions(-)

diff --git a/.github/instructions/ado-pipelines.instructions.md b/.github/instructions/ado-pipelines.instructions.md
index 4fd07cfc88..688b57981a 100644
--- a/.github/instructions/ado-pipelines.instructions.md
+++ b/.github/instructions/ado-pipelines.instructions.md
@@ -70,14 +70,16 @@ When adding a new build stage, respect the dependency graph and pass artifact na
 ## PR vs CI Pipeline Differences
 
 PR pipelines:
-- Trigger on PRs to `dev/*`, `feat/*`, `main`; exclude `eng/pipelines/onebranch/*` paths
+- Trigger on PRs targeting `release/7.1`; path filters vary by pipeline
+- Exception: the legacy `sqlclient-pr-package-ref-pipeline.yml` has an empty branch include list, so it has no PR trigger and is manual-queue only
 - Use reduced TFM matrix: `[net462, net8.0, net9.0]` (excludes net10.0)
 - Timeout: 90 minutes
 - Package-ref PR disables Always Encrypted tests in Debug config and also disables legacy SQL Server test legs to keep validation fast
 
 CI pipelines:
-- Trigger on push to `main` (GitHub) and `internal/main` (ADO) with `batch: true`
-- Scheduled weekday builds (see individual pipeline files for cron times)
+- Trigger on push to `release/7.1` (GitHub) and `internal/release/7.1` (ADO) with `batch: true`
+- Exception: the legacy `dotnet-sqlclient-ci-package-reference-pipeline.yml` has its GitHub `release/7.1` push entry commented out, so only the ADO push trigger is active; its GitHub daily schedule still runs
+- Scheduled daily builds are staggered to avoid main and other release-branch schedules (see individual pipeline files for cron times)
 - Full TFM matrix including net10.0 test legs and legacy SQL Server manual-test coverage
 
 ## Test Configuration
diff --git a/.github/instructions/onebranch-pipeline-design.instructions.md b/.github/instructions/onebranch-pipeline-design.instructions.md
index 7d42d279e7..02717a3a13 100644
--- a/.github/instructions/onebranch-pipeline-design.instructions.md
+++ b/.github/instructions/onebranch-pipeline-design.instructions.md
@@ -9,7 +9,7 @@ Rules and conventions for editing the OneBranch Azure DevOps YAML pipelines that
 
 ## Pipeline Variants
 
-- `sqlclient-official.yml` — Official pipeline; uses `OneBranch.Official.CrossPlat.yml`; runs on a daily schedule at 04:30 UTC on `internal/main`, with no activity-based trigger (`pr: none`, `trigger: none`)
+- `sqlclient-official.yml` — Official pipeline; uses `OneBranch.Official.CrossPlat.yml`; runs on a daily schedule at 23:00 UTC on `internal/release/7.1`, with no activity-based trigger (`pr: none`, `trigger: none`)
 - `sqlclient-non-official.yml` — Non-Official pipeline; uses `OneBranch.NonOfficial.CrossPlat.yml`; manual only (`pr: none`, `trigger: none`)
 - Both live under `eng/pipelines/onebranch/` and extend OneBranch governed templates
 - Never parameterize the OneBranch template name — hardcode it per pipeline for PRC compliance
diff --git a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
index 28ce2a2ed6..200a99c20d 100644
--- a/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
+++ b/eng/pipelines/ci/kerberos/sqlclient-ci-kerberos-pipeline.yml
@@ -26,7 +26,7 @@ resources:
       trigger:
         branches:
           include:
-            - internal/main
+            - internal/release/7.1
 
 parameters:
 
diff --git a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml
index 83acbd34d0..978e91fe12 100644
--- a/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml
+++ b/eng/pipelines/ci/managed-instance/sqlclient-ci-managed-instance-pipeline.yml
@@ -42,7 +42,7 @@ resources:
       trigger:
         branches:
           include:
-            - internal/main
+            - internal/release/7.1
 
 # Pipeline parameters, visible in the Azure DevOps UI.
 parameters:
diff --git a/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml b/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
index 41cb134047..5bd826b443 100644
--- a/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
+++ b/eng/pipelines/ci/package/sqlclient-ci-package-pipeline.yml
@@ -7,17 +7,17 @@
 # This pipeline builds all packages using the build.proj Pack target with ReferenceType=Package,
 # then publishes the resulting .nupkg and .snupkg files as a single pipeline artifact.
 #
-# It runs nightly at 00:20 UTC on GitHub dotnet/SqlClient main and ADO.Net dotnet-sqlclient
-# internal/main.
+# It runs daily at 13:00 UTC on GitHub dotnet/SqlClient release/7.1 and at 21:00 UTC on ADO.Net
+# dotnet-sqlclient internal/release/7.1.
 #
-# On internal/main the strong-name signing key is downloaded and used to sign assemblies during the
-# build.
+# On internal/release/7.1 the strong-name signing key is downloaded and used to sign assemblies
+# during the build.
 #
 # GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO.NET CI.  We distinguish the two
 # via branch filters:
 #
-#   - Only the GitHub repo has a 'main' branch.
-#   - Only the ADO repo has an 'internal/main' branch.
+#   - Only the GitHub repo has a 'release/7.1' branch.
+#   - Only the ADO repo has an 'internal/release/7.1' branch.
 
 name: $(DayOfYear)$(Rev:rr)
 
@@ -25,14 +25,22 @@ name: $(DayOfYear)$(Rev:rr)
 pr: none
 trigger: none
 
-# Nightly schedule at 00:20 UTC.
+# Stagger the GitHub and ADO builds so their downstream completion-triggered pipelines do not start
+# at the same time.
 schedules:
-  - cron: '20 0 * * *'
-    displayName: Nightly Build
+  - cron: '0 13 * * *'
+    displayName: 7.1 GitHub Daily Package Build (13:00 UTC)
     branches:
       include:
-        - main
-        - internal/main
+        - release/7.1
+
+    always: true
+
+  - cron: '0 21 * * *'
+    displayName: 7.1 ADO Daily Package Build (21:00 UTC)
+    branches:
+      include:
+        - internal/release/7.1
     always: true
 
 # Pipeline parameters visible in the Azure DevOps UI.
diff --git a/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
index 813faa09f9..d46f0d2633 100644
--- a/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
+++ b/eng/pipelines/ci/stress/sqlclient-ci-stress-pipeline.yml
@@ -49,8 +49,8 @@ resources:
       trigger:
         branches:
           include:
-            - main
-            - internal/main
+            - release/7.1
+            - internal/release/7.1
 
 # Pipeline parameters, visible in the Azure DevOps UI.
 parameters:
diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
index a1b5f14216..0b84885e2d 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
@@ -14,18 +14,20 @@
 # It runs via CI push triggers and schedules and uses the Release build
 # configuration:
 #
-#   - Commits to GitHub main and release/* branches
-#   - Commits to ADO internal/main and internal/release/* branches
-#   - Daily at 03:00 UTC on GitHub main
-#   - Daily at 07:00 UTC on ADO internal/main
+#   - GitHub CI push trigger disabled due to limited resources
+#   - Commits to the ADO internal/release/7.1 branch
+#   - Daily at 11:00 UTC on GitHub release/7.1
+#   - Daily at 19:00 UTC on ADO internal/release/7.1
 #
-# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI.  We are
-# able to define different triggers and schedules using branch filters:
+# GOTCHA: This pipeline definition is registered with GitHub _and_ ADO CI.  We
+# are able to define different triggers and schedules using branch filters:
 #
-#   - Only the GitHub repo has a 'main' branch, so its presence indicates that
-#     the pipeline run was triggered via GitHub.
+#   - The GitHub registration uses the release/7.1 branch filters.  Only its
+#     schedule is active; the CI push trigger is commented out below due to
+#     limited resources.
 #
-#   - Only the ADO repo has an 'internal/main' branch.
+#   - The ADO registration uses the internal/release/7.1 branch filters, for
+#     both the push trigger and the schedule.
 #
 # Changes are batched together to ensure that the pipline never runs
 # concurrently.
@@ -58,33 +60,31 @@ trigger:
 
   branches:
     include:
-      # GitHub main and release branches.
+      # GitHub release branch.
       #
-      # GOTCHA: Currently disabled on main due to limited resources.
-      #- main
-      - release/*
+      # GOTCHA: Currently disabled due to limited resources.
+      #- release/7.1
 
-      # ADO main and release branches.
-      - internal/main
-      - internal/release/*
+      # ADO release branch.
+      - internal/release/7.1
 
 # Trigger this pipeline on a schedule.
 schedules:
 
-  # GitHub main daily.
-  - cron: '0 3 * * *'
-    displayName: Daily Run (Release Config)
+  # GitHub release/7.1 daily.
+  - cron: '0 11 * * *'
+    displayName: 7.1 GitHub Package-Reference Daily Run (11:00 UTC)
     branches:
       include:
-      - main
+      - release/7.1
     always: true
 
-  # ADO internal/main daily.
-  - cron: '0 7 * * *'
-    displayName: Daily Run (Release Config)
+  # ADO internal/release/7.1 daily.
+  - cron: '0 19 * * *'
+    displayName: 7.1 ADO Package-Reference Daily Run (19:00 UTC)
     branches:
       include:
-      - internal/main
+      - internal/release/7.1
     always: true
 
 # Pipeline parameters, visible in the Azure DevOps UI.
diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
index ce4db1ce3c..7c25f28e60 100644
--- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
+++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
@@ -14,18 +14,17 @@
 # It runs via CI push triggers and schedules and uses the Release build
 # configuration:
 #
-#   - Commits to GitHub main and release/* branches
-#   - Commits to ADO internal/main and internal/release/* branches
-#   - Daily at 01:00 UTC on GitHub main
-#   - Daily at 05:00 UTC on ADO internal/main
+#   - Commits to the GitHub release/7.1 branch
+#   - Commits to the ADO internal/release/7.1 branch
+#   - Daily at 09:00 UTC on GitHub release/7.1
+#   - Daily at 17:00 UTC on ADO internal/release/7.1
 #
 # GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI.  We are
 # able to define different triggers and schedules using branch filters:
 #
-#   - Only the GitHub repo has a 'main' branch, so its presence indicates that
-#     the pipeline run was triggered via GitHub.
+#   - The GitHub registration uses the release/7.1 branch filters.
 #
-#   - Only the ADO repo has an 'internal/main' branch.
+#   - The ADO registration uses the internal/release/7.1 branch filters.
 #
 # Changes are batched together to ensure that the pipline never runs
 # concurrently.
@@ -58,31 +57,29 @@ trigger:
 
   branches:
     include:
-      # GitHub main and release branches.
-      - main
-      - release/*
+      # GitHub release branch.
+      - release/7.1
 
-      # ADO main and release branches.
-      - internal/main
-      - internal/release/*
+      # ADO release branch.
+      - internal/release/7.1
 
 # Trigger this pipeline on a schedule.
 schedules:
 
-  # GitHub main daily.
-  - cron: '0 1 * * *'
-    displayName: Daily Run (Release Config)
+  # GitHub release/7.1 daily.
+  - cron: '0 9 * * *'
+    displayName: 7.1 GitHub Project-Reference Daily Run (09:00 UTC)
     branches:
       include:
-      - main
+      - release/7.1
     always: true
 
-  # ADO internal/main daily.
-  - cron: '0 5 * * *'
-    displayName: Daily Run (Release Config)
+  # ADO internal/release/7.1 daily.
+  - cron: '0 17 * * *'
+    displayName: 7.1 ADO Project-Reference Daily Run (17:00 UTC)
     branches:
       include:
-      - internal/main
+      - internal/release/7.1
     always: true
 
 # Pipeline parameters, visible in the Azure DevOps UI.
diff --git a/eng/pipelines/github-sync-pipeline.yml b/eng/pipelines/github-sync-pipeline.yml
index eb8c3081c6..5e3d7c1d19 100644
--- a/eng/pipelines/github-sync-pipeline.yml
+++ b/eng/pipelines/github-sync-pipeline.yml
@@ -4,14 +4,14 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# This pipeline synchronizes the GitHub dotnet/SqlClient repository's main
+# This pipeline synchronizes the GitHub dotnet/SqlClient repository's release/7.1
 # branch into the internal ADO repository by:
 #
-#   1. Fetching the latest commits from GitHub main.
-#   2. Pushing them to a dev/autosync/github-main branch in ADO.
-#   3. Creating (or updating) a pull request targeting internal/main.
+#   1. Fetching the latest commits from GitHub release/7.1.
+#   2. Pushing them to a dev/autosync/github-release-7.1 branch in ADO.
+#   3. Creating (or updating) a pull request targeting internal/release/7.1.
 #
-# It runs on a daily schedule at 02:00 UTC and can also be triggered manually.
+# It runs on a daily schedule at 15:00 UTC and can also be triggered manually.
 # The pipeline does not auto-complete the PR — changes must be reviewed and
 # merged manually.
 #
@@ -35,11 +35,11 @@ pr: none
 
 # Trigger this pipeline on a daily schedule.
 schedules:
-  - cron: '0 2 * * *'
-    displayName: Daily GitHub Sync (02:00 UTC)
+  - cron: '0 15 * * *'
+    displayName: 7.1 Daily GitHub Sync (15:00 UTC)
     branches:
       include:
-        - internal/main
+        - internal/release/7.1
     always: true
 
 # Pipeline parameters, visible in the Azure DevOps UI.
@@ -49,20 +49,20 @@ parameters:
   - name: githubBranch
     displayName: GitHub Branch
     type: string
-    default: main
+    default: release/7.1
 
   # The ADO target branch to create the PR against.
   - name: targetBranch
     displayName: ADO Target Branch
     type: string
-    default: internal/main
+    default: internal/release/7.1
 
 variables:
   - template: /eng/pipelines/libraries/ci-build-variables.yml@self
 
 jobs:
   - job: SyncGitHub
-    displayName: Sync GitHub to ADO
+    displayName: Sync GitHub release/7.1 to ADO internal/release/7.1
     pool:
       name: $(general_purpose_pool_name)
       demands:
@@ -76,14 +76,14 @@ jobs:
 
       # Run the sync script.
       - task: PowerShell@2
-        displayName: Sync GitHub main to ADO
+        displayName: Sync GitHub release/7.1 to ADO
         inputs:
           filePath: $(Build.SourcesDirectory)/eng/pipelines/scripts/Sync-GitHubToAdo.ps1
           arguments: >-
             -GitHubRepoUrl "https://github.com/dotnet/SqlClient.git"
             -GitHubBranch "${{ parameters.githubBranch }}"
             -TargetBranch "${{ parameters.targetBranch }}"
-            -SyncBranchName "dev/autosync/github-${{ parameters.githubBranch }}"
+            -SyncBranchName "dev/autosync/github-${{ replace(parameters.githubBranch, '/', '-') }}"
             -AdoOrgUrl "$(System.CollectionUri)"
             -AdoProject "$(System.TeamProject)"
             -AdoRepoName "$(Build.Repository.Name)"
diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml
index 40b08c76c0..b8521fc0d7 100644
--- a/eng/pipelines/onebranch/sqlclient-official.yml
+++ b/eng/pipelines/onebranch/sqlclient-official.yml
@@ -13,11 +13,11 @@ trigger: none
 
 # We run this pipeline on a daily schedule.
 schedules:
-  - cron: "30 4 * * *"
-    displayName: Daily 04:30 UTC Build
+  - cron: "0 23 * * *"
+    displayName: 7.1 Daily Official Build (23:00 UTC)
     branches:
       include:
-        - internal/main
+        - internal/release/7.1
     always: true
 
 # These parameters are visible in the Azure DevOps pipeline UI when a new run is queued.
diff --git a/eng/pipelines/perf/README.md b/eng/pipelines/perf/README.md
index b7165cfc06..467f02b0f5 100644
--- a/eng/pipelines/perf/README.md
+++ b/eng/pipelines/perf/README.md
@@ -11,7 +11,7 @@ database.
 | Path | Purpose |
 | ---- | ------- |
 | `sqlclient-perf-pipeline.yml` | The main (manual/nightly) pipeline. Extends `v1/Perf.Test.Job.yml@PerfTemplates`. Baseline = released NuGet package; ingests into Kusto. |
-| `sqlclient-perf-pr-pipeline.yml` | PR pipeline. Same template, same scripts, same options; baseline = **`main` branch source**; **no Kusto ingestion**. |
+| `sqlclient-perf-pr-pipeline.yml` | PR pipeline. Same template, same scripts, same options; baseline = **`release/7.1` branch source**; **no Kusto ingestion**. |
 | `sqlclient-perf-experiment.yml` | Experiment pipeline. Same template, same scripts; both passes build the **same source** and differ only in one runner-config switch; **no Kusto ingestion**. |
 | `scripts/run-perf-tests.sh` | Linux on-VM entry point: install SDK, create DB, run benchmarks (interleaved or sequential), compare. Baseline is a released package (`--baseline-version`), another git ref's source (`--baseline-source-ref`), or the same source with one runner-config switch flipped off (`--switch-under-test`). |
 | `scripts/run-perf-tests.ps1` | Windows equivalent (ProcessorAffinity instead of `taskset`). |
@@ -107,7 +107,7 @@ pipeline. It differs in exactly two ways:
 | | `sqlclient-perf-pipeline.yml` | `sqlclient-perf-pr-pipeline.yml` |
 | --- | --- | --- |
 | Candidate | branch the run is queued on | branch the run is queued on (unchanged) |
-| Baseline | released NuGet package (`baselineVersion`, default `7.0.2`) | **source of another git ref** (`baselineSourceRef`, default `main`) |
+| Baseline | released NuGet package (`baselineVersion`, default `7.0.2`) | **source of another git ref** (`baselineSourceRef`, default `release/7.1`) |
 | Kusto | translates + (optionally) ingests | **never** — no ADX variable group, no translate/ingest steps |
 
 Both pipelines are **manual / queue-time only** (`pr: none`, `trigger: none`): a run occupies a
@@ -117,7 +117,7 @@ PR-only parameters (everything else is identical to the table above):
 
 | Parameter | Default | Description |
 | --------- | ------- | ----------- |
-| `baselineSourceRef` | `main` | Git ref of this repo whose **source** is the baseline. Empty = current-only (no baseline pass / comparison). |
+| `baselineSourceRef` | `release/7.1` | Git ref of this repo whose **source** is the baseline. Empty = current-only (no baseline pass / comparison). |
 | `baselineRepoUrl` | `https://github.com/dotnet/SqlClient.git` | Fallback remote used to obtain the baseline ref when the VM copy of the checkout cannot fetch it from its own `origin`. |
 | `testTimeoutMinutes` | `210` | Higher than the main pipeline's `180` because **both** sides are built from source. |
 
@@ -160,7 +160,7 @@ questions. Two of them vary the **source** under measurement; the third varies t
 | Question | Pipeline | Baseline | Current |
 | --- | --- | --- | --- |
 | Has this branch regressed against a released package? | `sqlclient-perf-pipeline.yml` | released NuGet package | queued branch |
-| Does my PR regress the branch it merges into? | `sqlclient-perf-pr-pipeline.yml` | `main` source | queued branch |
+| Does my PR regress the branch it merges into? | `sqlclient-perf-pr-pipeline.yml` | `release/7.1` source | queued branch |
 | What does this switch cost or buy? | `sqlclient-perf-experiment.yml` | queued branch, switch **off** | queued branch, switch **on** |
 
 `sqlclient-perf-experiment.yml` picks one runner-config switch via the `switchUnderTest`
@@ -437,9 +437,8 @@ translated NDJSON as the `perf-kusto-payloads` artifact for manual/backfill inge
 
 1. Open the **PR** performance test pipeline (`sqlclient-perf-pr-pipeline.yml`) in Azure DevOps and
    select **Run pipeline**.
-2. Choose the PR's branch to benchmark. Leave `baselineSourceRef` at `main` unless the PR targets a
-   different branch (e.g. a release branch). No Kusto configuration is involved — PR results are
-   never ingested.
+2. Choose the PR's branch to benchmark. Leave `baselineSourceRef` at `release/7.1` unless the PR
+   targets a different branch. No Kusto configuration is involved — PR results are never ingested.
 3. After the run, review the **run summary** (comparison, labelled `<ref>@<short-sha>`) and the
    `perf-results` artifact. The build is tagged **`Baseline <ref>`**.
 
diff --git a/eng/pipelines/perf/sqlclient-perf-pr-pipeline.yml b/eng/pipelines/perf/sqlclient-perf-pr-pipeline.yml
index c155c1acc3..95a5a88549 100644
--- a/eng/pipelines/perf/sqlclient-perf-pr-pipeline.yml
+++ b/eng/pipelines/perf/sqlclient-perf-pr-pipeline.yml
@@ -10,9 +10,9 @@
 # only differences are what it compares against and what it does with the results:
 #
 #   * Baseline    - the branch the run is queued on ("current") is compared against the SOURCE of
-#                   another ref of this repository (by default 'main'), NOT a released NuGet package.
-#                   Both sides are therefore built from source, which is what a PR author wants to
-#                   know: "does my change regress the branch I am merging into?"
+#                   another ref of this repository (by default 'release/7.1'), NOT a released NuGet
+#                   package.  Both sides are therefore built from source, which is what a PR author
+#                   wants to know: "does my change regress the branch I am merging into?"
 #   * No Kusto    - results are never ingested into the perf database (a PR run measures an unmerged
 #                   branch, so its numbers must not pollute the historical trend).  The comparison
 #                   and the raw BenchmarkDotNet artifacts are still published as pipeline artifacts.
@@ -64,7 +64,7 @@ parameters:
   - name: baselineSourceRef
     displayName: Baseline Source Ref (branch)
     type: string
-    default: main
+    default: release/7.1
 
   # Remote used to obtain the baseline ref when it cannot be fetched from the VM copy of the
   # checkout's own 'origin' (e.g. the source tree reached the VM without its .git directory, or
diff --git a/eng/pipelines/pr/sqlclient-pr-pipeline.yml b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
index eab08243e8..4d49527051 100644
--- a/eng/pipelines/pr/sqlclient-pr-pipeline.yml
+++ b/eng/pipelines/pr/sqlclient-pr-pipeline.yml
@@ -9,8 +9,7 @@
 # environments to provide complete coverage. Instead, this PR strikes a balance between complete
 # confidence and speed of PR validation.
 #
-# It is triggered by pushes to PRs that target the main, dev/*, feat/*, and release/* branches in
-# GitHub. The dev/* pattern includes dev/automation/* branches created by AI agents.
+# It is triggered by pushes to PRs that target the release/7.1 branch in GitHub.
 #
 # It maps to the "sqlclient-pr" pipeline in the Public ADO project:
 #    https://sqlclientdrivers.visualstudio.com/public/_build?definitionId=2281
@@ -25,11 +24,7 @@ name: $(DayOfYear)$(Rev:rr)
 pr:
   branches:
     include:
-      # GitHub repo branch targets that will trigger PR validation builds.
-      - dev/*
-      - feat/*
-      - main
-      - release/*
+      - release/7.1
 
   paths:
     include:
diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
index f4427f82e8..e08ad7e93e 100644
--- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
@@ -11,9 +11,7 @@
 #   - Microsoft.Data.SqlClient
 #   - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
 #
-# It is triggered by pushes to PRs that target the main, dev/*, feat/*, and
-# release/* branches in GitHub.  The dev/* pattern includes dev/automation/*
-# branches created by AI agents.
+# PR validation is disabled on the release/7.1 branch due to limited resources.
 #
 # It maps to the "PR-SqlClient-Package" pipeline in the Public project:
 #
@@ -25,39 +23,36 @@
 # Format $(DayOfYear)$(Rev:rr) yields e.g. 15401 (day 154, run 01) — always < 65535.
 name: $(DayOfYear)$(Rev:rr)
 
-# Trigger PR validation runs for all pushes to PRs that target the specified
-# branches.
+# PR validation is disabled due to limited resources.
 #
 # https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/github?view=azure-devops&tabs=yaml#pr-triggers
 #
-pr:
-  branches:
-    include:
-      # GitHub repo branch targets that will trigger PR validation builds.
-      #
-      # GOTCHA: Currently disabled on all but release/* due to limited resources.
-      #- dev/*
-      #- feat/*
-      #- main
-      - release/*
+pr: none
 
-  paths:
-    include:
-      - .azuredevops/*
-      - .config/*
-      - doc/*
-      - eng/pipelines/*
-      - src/*
-      - tools/*
-      - azurepipelines-coverage.yml
-      - build.proj
-      - Directory.Packages.props
-      - dotnet-tools.json
-      - global.json
-      - NuGet.config
-    exclude:
-      - eng/pipelines/ci/*
-      - eng/pipelines/onebranch/*
+# To re-enable PR validation on this branch, replace `pr: none` above with:
+#
+# pr:
+#   branches:
+#     include:
+#       - release/7.1
+#
+#   paths:
+#     include:
+#       - .azuredevops/*
+#       - .config/*
+#       - doc/*
+#       - eng/pipelines/*
+#       - src/*
+#       - tools/*
+#       - azurepipelines-coverage.yml
+#       - build.proj
+#       - Directory.Packages.props
+#       - dotnet-tools.json
+#       - global.json
+#       - NuGet.config
+#     exclude:
+#       - eng/pipelines/ci/*
+#       - eng/pipelines/onebranch/*
 
 # Do not trigger commit or schedule runs for this pipeline.
 trigger: none
diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
index 74309ae643..4f78dcbfe2 100644
--- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
+++ b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
@@ -11,9 +11,7 @@
 #   - Microsoft.Data.SqlClient
 #   - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
 #
-# It is triggered by pushes to PRs that target the main, dev/*, feat/*, and
-# release/* branches in GitHub.  The dev/* pattern includes dev/automation/*
-# branches created by AI agents.
+# It is triggered by pushes to PRs that target the release/7.1 branch in GitHub.
 #
 # It maps to the "PR-SqlClient-Project" pipeline in the Public project:
 #
@@ -34,10 +32,7 @@ pr:
   branches:
     include:
       # GitHub repo branch targets that will trigger PR validation builds.
-      - dev/*
-      - feat/*
-      - main
-      - release/*
+      - release/7.1
 
   paths:
     include:

From 3fded36cb9933d2fd30514597376e64f379a45ee Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 17 Sep 2026 08:28:44 -0300
Subject: [PATCH 297/298] Set versions for the 7.1.0 release (#4698)

---
 Directory.Packages.props                    | 2 +-
 src/Microsoft.Data.SqlClient/Versions.props | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e28a1301a5..ad71a41be4 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -52,7 +52,7 @@
   -->
   <PropertyGroup>
     <!-- SNI version (external package, version declared once here) -->
-    <SniVersion>7.1.0-preview3.26226.3</SniVersion>
+    <SniVersion>7.1.0</SniVersion>
     <SniVersionRange>[$(SniVersion), $([MSBuild]::Add($(SniVersion.Split('.')[0]), 1)).0.0)</SniVersionRange>
   </PropertyGroup>
 
diff --git a/src/Microsoft.Data.SqlClient/Versions.props b/src/Microsoft.Data.SqlClient/Versions.props
index 38df551f3b..4e5269cb71 100644
--- a/src/Microsoft.Data.SqlClient/Versions.props
+++ b/src/Microsoft.Data.SqlClient/Versions.props
@@ -32,7 +32,7 @@
       This is the *next* version to release of the SqlClient family.  Update this after a version
       is released.  Every SqlClient family package uses this version.
     -->
-    <SqlClientNextVersion>7.1.0-preview3</SqlClientNextVersion>
+    <SqlClientNextVersion>7.1.0</SqlClientNextVersion>
   </PropertyGroup>
 
   <!-- Determine file version and package version based on what was provided. -->

From 744f4f0aa264c751120e5b909e8591ec5754638f Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com>
Date: Thu, 17 Sep 2026 16:25:02 -0700
Subject: [PATCH 298/298] Fix release Source Link source-root mapping (#4711)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 src/Directory.Build.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 857bc1b65c..d9b9a7cdc8 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -141,7 +141,6 @@
           Condition="'$(SqlClientVersionsImported)' != 'true'" />
 
   <ItemGroup Condition="$(BuildForRelease) == 'true'">
-    <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
     <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
   </ItemGroup>